diff --git a/.github/ISSUE_TEMPLATE/40_bug-report.md b/.github/ISSUE_TEMPLATE/40_bug-report.md
index 4dfd19266d0..5c8611d47e6 100644
--- a/.github/ISSUE_TEMPLATE/40_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/40_bug-report.md
@@ -7,15 +7,29 @@ assignees: ''
 
 ---
 
-(you don't have to strictly follow this form)
+You have to provide the following information whenever possible.
 
 **Describe the bug**
+
 A clear and concise description of what works not as it is supposed to.
 
 **Does it reproduce on recent release?**
+
 [The list of releases](https://github.com/ClickHouse/ClickHouse/blob/master/utils/list-versions/version_date.tsv)
 
+**Enable crash reporting**
+
+If possible, change "enabled" to true in "send_crash_reports" section in `config.xml`:
+
+```
+<send_crash_reports>
+        <!-- Changing <enabled> to true allows sending crash reports to -->
+        <!-- the ClickHouse core developers team via Sentry https://sentry.io -->
+        <enabled>false</enabled>
+```
+
 **How to reproduce**
+
 * Which ClickHouse server version to use
 * Which interface to use, if matters
 * Non-default settings, if any
@@ -24,10 +38,13 @@ A clear and concise description of what works not as it is supposed to.
 * Queries to run that lead to unexpected result
 
 **Expected behavior**
+
 A clear and concise description of what you expected to happen.
 
 **Error message and/or stacktrace**
+
 If applicable, add screenshots to help explain your problem.
 
 **Additional context**
+
 Add any other context about the problem here.
diff --git a/.gitignore b/.gitignore
index d33dbf0600d..1db6e0a78c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 /docs/zh/single.md
 /docs/ja/single.md
 /docs/fa/single.md
+/docs/en/development/cmake-in-clickhouse.md
 
 # callgrind files
 callgrind.out.*
diff --git a/.gitmodules b/.gitmodules
index de7250166b8..2ccce88e5e4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,6 +17,7 @@
 [submodule "contrib/zlib-ng"]
 	path = contrib/zlib-ng
 	url = https://github.com/ClickHouse-Extras/zlib-ng.git
+	branch = clickhouse-new
 [submodule "contrib/googletest"]
 	path = contrib/googletest
 	url = https://github.com/google/googletest.git
@@ -133,7 +134,7 @@
 	url = https://github.com/unicode-org/icu.git
 [submodule "contrib/flatbuffers"]
 	path = contrib/flatbuffers
-	url = https://github.com/google/flatbuffers.git
+	url = https://github.com/ClickHouse-Extras/flatbuffers.git
 [submodule "contrib/libc-headers"]
 	path = contrib/libc-headers
 	url = https://github.com/ClickHouse-Extras/libc-headers.git
@@ -221,6 +222,13 @@
 [submodule "contrib/NuRaft"]
 	path = contrib/NuRaft
 	url = https://github.com/ClickHouse-Extras/NuRaft.git
+[submodule "contrib/nanodbc"]
+	path = contrib/nanodbc
+	url = https://github.com/ClickHouse-Extras/nanodbc.git
 [submodule "contrib/datasketches-cpp"]
 	path = contrib/datasketches-cpp
 	url = https://github.com/ClickHouse-Extras/datasketches-cpp.git
+
+[submodule "contrib/yaml-cpp"]
+	path = contrib/yaml-cpp
+	url = https://github.com/ClickHouse-Extras/yaml-cpp.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43531b60267..2eaecaa4c9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,295 @@
+## ClickHouse release 21.5, 2021-05-20
+
+#### Backward Incompatible Change
+
+* Change comparison of integers and floating point numbers when integer is not exactly representable in the floating point data type. In new version comparison will return false as the rounding error will occur. Example: `9223372036854775808.0 != 9223372036854775808`, because the number `9223372036854775808` is not representable as floating point number exactly (and `9223372036854775808.0` is rounded to `9223372036854776000.0`). But in previous version the comparison will return as the numbers are equal, because if the floating point number `9223372036854776000.0` get converted back to UInt64, it will yield `9223372036854775808`. For the reference, the Python programming language also treats these numbers as equal. But this behaviour was dependend on CPU model (different results on AMD64 and AArch64 for some out-of-range numbers), so we make the comparison more precise. It will treat int and float numbers equal only if int is represented in floating point type exactly. [#22595](https://github.com/ClickHouse/ClickHouse/pull/22595) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove support for `argMin` and `argMax` for single `Tuple` argument. The code was not memory-safe. The feature was added by mistake and it is confusing for people. These functions can be reintroduced under different names later. This fixes [#22384](https://github.com/ClickHouse/ClickHouse/issues/22384) and reverts [#17359](https://github.com/ClickHouse/ClickHouse/issues/17359). [#23393](https://github.com/ClickHouse/ClickHouse/pull/23393) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### New Feature
+
+* Added functions `dictGetChildren(dictionary, key)`, `dictGetDescendants(dictionary, key, level)`. Function `dictGetChildren` return all children as an array if indexes. It is a inverse transformation for `dictGetHierarchy`. Function `dictGetDescendants` return all descendants as if `dictGetChildren` was applied `level` times recursively. Zero `level` value is equivalent to infinity. Improved performance of `dictGetHierarchy`, `dictIsIn` functions. Closes [#14656](https://github.com/ClickHouse/ClickHouse/issues/14656). [#22096](https://github.com/ClickHouse/ClickHouse/pull/22096) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added function `dictGetOrNull`. It works like `dictGet`, but return `Null` in case key was not found in dictionary. Closes [#22375](https://github.com/ClickHouse/ClickHouse/issues/22375). [#22413](https://github.com/ClickHouse/ClickHouse/pull/22413) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added a table function `s3Cluster`, which allows to process files from `s3` in parallel on every node of a specified cluster. [#22012](https://github.com/ClickHouse/ClickHouse/pull/22012) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Added support for replicas and shards in MySQL/PostgreSQL table engine / table function. You can write `SELECT * FROM mysql('host{1,2}-{1|2}', ...)`. Closes [#20969](https://github.com/ClickHouse/ClickHouse/issues/20969). [#22217](https://github.com/ClickHouse/ClickHouse/pull/22217) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Added `ALTER TABLE ... FETCH PART ...` query. It's similar to `FETCH PARTITION`, but fetches only one part. [#22706](https://github.com/ClickHouse/ClickHouse/pull/22706) ([turbo jason](https://github.com/songenjie)).
+* Added a setting `max_distributed_depth` that limits the depth of recursive queries to `Distributed` tables. Closes [#20229](https://github.com/ClickHouse/ClickHouse/issues/20229). [#21942](https://github.com/ClickHouse/ClickHouse/pull/21942) ([flynn](https://github.com/ucasFL)).
+
+#### Performance Improvement
+
+* Improved performance of `intDiv` by dynamic dispatch for AVX2. This closes [#22314](https://github.com/ClickHouse/ClickHouse/issues/22314). [#23000](https://github.com/ClickHouse/ClickHouse/pull/23000) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improved performance of reading from `ArrowStream` input format for sources other then local file (e.g. URL). [#22673](https://github.com/ClickHouse/ClickHouse/pull/22673) ([nvartolomei](https://github.com/nvartolomei)).
+* Disabled compression by default when interacting with localhost (with clickhouse-client or server to server with distributed queries) via native protocol. It may improve performance of some import/export operations. This closes [#22234](https://github.com/ClickHouse/ClickHouse/issues/22234). [#22237](https://github.com/ClickHouse/ClickHouse/pull/22237) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Exclude values that does not belong to the shard from right part of IN section for distributed queries (under `optimize_skip_unused_shards_rewrite_in`, enabled by default, since it still requires `optimize_skip_unused_shards`). [#21511](https://github.com/ClickHouse/ClickHouse/pull/21511) ([Azat Khuzhin](https://github.com/azat)).
+* Improved performance of reading a subset of columns with File-like table engine and column-oriented format like Parquet, Arrow or ORC. This closes [#issue:20129](https://github.com/ClickHouse/ClickHouse/issues/20129). [#21302](https://github.com/ClickHouse/ClickHouse/pull/21302) ([keenwolf](https://github.com/keen-wolf)).
+* Allow to move more conditions to `PREWHERE` as it was before version 21.1 (adjustment of internal heuristics). Insufficient number of moved condtions could lead to worse performance. [#23397](https://github.com/ClickHouse/ClickHouse/pull/23397) ([Anton Popov](https://github.com/CurtizJ)).
+* Improved performance of ODBC connections and fixed all the outstanding issues from the backlog. Using `nanodbc` library instead of `Poco::ODBC`. Closes [#9678](https://github.com/ClickHouse/ClickHouse/issues/9678). Add support for DateTime64 and Decimal* for ODBC table engine. Closes [#21961](https://github.com/ClickHouse/ClickHouse/issues/21961). Fixed issue with cyrillic text being truncated. Closes [#16246](https://github.com/ClickHouse/ClickHouse/issues/16246). Added connection pools for odbc bridge. [#21972](https://github.com/ClickHouse/ClickHouse/pull/21972) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
+#### Improvement
+
+* Increase `max_uri_size` (the maximum size of URL in HTTP interface) to 1 MiB by default. This closes [#21197](https://github.com/ClickHouse/ClickHouse/issues/21197). [#22997](https://github.com/ClickHouse/ClickHouse/pull/22997) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Set `background_fetches_pool_size` to `8` that is better for production usage with frequent small insertions or slow ZooKeeper cluster. [#22945](https://github.com/ClickHouse/ClickHouse/pull/22945) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* FlatDictionary added `initial_array_size`, `max_array_size` options. [#22521](https://github.com/ClickHouse/ClickHouse/pull/22521) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add new setting `non_replicated_deduplication_window` for non-replicated MergeTree inserts deduplication. [#22514](https://github.com/ClickHouse/ClickHouse/pull/22514) ([alesapin](https://github.com/alesapin)).
+* Update paths to the `CatBoost` model configs in config reloading. [#22434](https://github.com/ClickHouse/ClickHouse/pull/22434) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added `Decimal256` type support in dictionaries. `Decimal256` is experimental feature. Closes [#20979](https://github.com/ClickHouse/ClickHouse/issues/20979). [#22960](https://github.com/ClickHouse/ClickHouse/pull/22960) ([Maksim Kita](https://github.com/kitaisreal)).
+* Enabled `async_socket_for_remote` by default (using less amount of OS threads for distributed queries). [#23683](https://github.com/ClickHouse/ClickHouse/pull/23683) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed `quantile(s)TDigest`. Added special handling of singleton centroids according to tdunning/t-digest 3.2+. Also a bug with over-compression of centroids in implementation of earlier version of the algorithm was fixed. [#23314](https://github.com/ClickHouse/ClickHouse/pull/23314) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Make function name `unhex` case insensitive for compatibility with MySQL. [#23229](https://github.com/ClickHouse/ClickHouse/pull/23229) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Implement functions `arrayHasAny`, `arrayHasAll`, `has`, `indexOf`, `countEqual` for generic case when types of array elements are different. In previous versions the functions `arrayHasAny`, `arrayHasAll` returned false and `has`, `indexOf`, `countEqual` thrown exception. Also add support for `Decimal` and big integer types in functions `has` and similar. This closes [#20272](https://github.com/ClickHouse/ClickHouse/issues/20272). [#23044](https://github.com/ClickHouse/ClickHouse/pull/23044) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Raised the threshold on max number of matches in result of the function `extractAllGroupsHorizontal`. [#23036](https://github.com/ClickHouse/ClickHouse/pull/23036) ([Vasily Nemkov](https://github.com/Enmk)).
+* Do not perform `optimize_skip_unused_shards` for cluster with one node. [#22999](https://github.com/ClickHouse/ClickHouse/pull/22999) ([Azat Khuzhin](https://github.com/azat)).
+* Added ability to run clickhouse-keeper (experimental drop-in replacement to ZooKeeper) with SSL. Config settings `keeper_server.tcp_port_secure` can be used for secure interaction between client and keeper-server. `keeper_server.raft_configuration.secure` can be used to enable internal secure communication between nodes. [#22992](https://github.com/ClickHouse/ClickHouse/pull/22992) ([alesapin](https://github.com/alesapin)).
+* Added ability to flush buffer only in background for `Buffer` tables. [#22986](https://github.com/ClickHouse/ClickHouse/pull/22986) ([Azat Khuzhin](https://github.com/azat)).
+* When selecting from MergeTree table with NULL in WHERE condition, in rare cases, exception was thrown. This closes [#20019](https://github.com/ClickHouse/ClickHouse/issues/20019). [#22978](https://github.com/ClickHouse/ClickHouse/pull/22978) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error handling in Poco HTTP Client for AWS. [#22973](https://github.com/ClickHouse/ClickHouse/pull/22973) ([kreuzerkrieg](https://github.com/kreuzerkrieg)).
+* Respect `max_part_removal_threads` for `ReplicatedMergeTree`. [#22971](https://github.com/ClickHouse/ClickHouse/pull/22971) ([Azat Khuzhin](https://github.com/azat)).
+* Fix obscure corner case of MergeTree settings inactive_parts_to_throw_insert = 0 with inactive_parts_to_delay_insert > 0. [#22947](https://github.com/ClickHouse/ClickHouse/pull/22947) ([Azat Khuzhin](https://github.com/azat)).
+* `dateDiff` now works with `DateTime64` arguments (even for values outside of `DateTime` range) [#22931](https://github.com/ClickHouse/ClickHouse/pull/22931) ([Vasily Nemkov](https://github.com/Enmk)).
+* MaterializeMySQL (experimental feature): added an ability to replicate MySQL databases containing views without failing. This is accomplished by ignoring the views. [#22760](https://github.com/ClickHouse/ClickHouse/pull/22760) ([Christian](https://github.com/cfroystad)).
+* Allow RBAC row policy via postgresql protocol. Closes [#22658](https://github.com/ClickHouse/ClickHouse/issues/22658). PostgreSQL protocol is enabled in configuration by default. [#22755](https://github.com/ClickHouse/ClickHouse/pull/22755) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add metric to track how much time is spend during waiting for Buffer layer lock. [#22725](https://github.com/ClickHouse/ClickHouse/pull/22725) ([Azat Khuzhin](https://github.com/azat)).
+* Allow to use CTE in VIEW definition. This closes [#22491](https://github.com/ClickHouse/ClickHouse/issues/22491). [#22657](https://github.com/ClickHouse/ClickHouse/pull/22657) ([Amos Bird](https://github.com/amosbird)).
+* Clear the rest of the screen and show cursor in `clickhouse-client` if previous program has left garbage in terminal. This closes [#16518](https://github.com/ClickHouse/ClickHouse/issues/16518). [#22634](https://github.com/ClickHouse/ClickHouse/pull/22634) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make `round` function to behave consistently on non-x86_64 platforms. Rounding half to nearest even (Banker's rounding) is used. [#22582](https://github.com/ClickHouse/ClickHouse/pull/22582) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Correctly check structure of blocks of data that are sending by Distributed tables. [#22325](https://github.com/ClickHouse/ClickHouse/pull/22325) ([Azat Khuzhin](https://github.com/azat)).
+* Allow publishing Kafka errors to a virtual column of Kafka engine, controlled by the `kafka_handle_error_mode` setting. [#21850](https://github.com/ClickHouse/ClickHouse/pull/21850) ([fastio](https://github.com/fastio)).
+* Add aliases `simpleJSONExtract/simpleJSONHas` to `visitParam/visitParamExtract{UInt, Int, Bool, Float, Raw, String}`. Fixes [#21383](https://github.com/ClickHouse/ClickHouse/issues/21383). [#21519](https://github.com/ClickHouse/ClickHouse/pull/21519) ([fastio](https://github.com/fastio)).
+* Add `clickhouse-library-bridge` for library dictionary source. Closes [#9502](https://github.com/ClickHouse/ClickHouse/issues/9502). [#21509](https://github.com/ClickHouse/ClickHouse/pull/21509) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Forbid to drop a column if it's referenced by materialized view. Closes [#21164](https://github.com/ClickHouse/ClickHouse/issues/21164). [#21303](https://github.com/ClickHouse/ClickHouse/pull/21303) ([flynn](https://github.com/ucasFL)).
+* Support dynamic interserver credentials (rotating credentials without downtime). [#14113](https://github.com/ClickHouse/ClickHouse/pull/14113) ([johnskopis](https://github.com/johnskopis)).
+* Add support for Kafka storage with `Arrow` and `ArrowStream` format messages. [#23415](https://github.com/ClickHouse/ClickHouse/pull/23415) ([Chao Ma](https://github.com/godliness)).
+* Fixed missing semicolon in exception message. The user may find this exception message unpleasant to read. [#23208](https://github.com/ClickHouse/ClickHouse/pull/23208) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed missing whitespace in some exception messages about `LowCardinality` type. [#23207](https://github.com/ClickHouse/ClickHouse/pull/23207) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Some values were formatted with alignment in center in table cells in `Markdown` format. Not anymore. [#23096](https://github.com/ClickHouse/ClickHouse/pull/23096) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Remove non-essential details from suggestions in clickhouse-client. This closes [#22158](https://github.com/ClickHouse/ClickHouse/issues/22158). [#23040](https://github.com/ClickHouse/ClickHouse/pull/23040) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Correct calculation of `bytes_allocated` field in system.dictionaries for sparse_hashed dictionaries. [#22867](https://github.com/ClickHouse/ClickHouse/pull/22867) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed approximate total rows accounting for reverse reading from MergeTree. [#22726](https://github.com/ClickHouse/ClickHouse/pull/22726) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the case when it was possible to configure dictionary with clickhouse source that was looking to itself that leads to infinite loop. Closes [#14314](https://github.com/ClickHouse/ClickHouse/issues/14314). [#22479](https://github.com/ClickHouse/ClickHouse/pull/22479) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### Bug Fix
+
+* Multiple fixes for hedged requests. Fixed an error `Can't initialize pipeline with empty pipe` for queries with `GLOBAL IN/JOIN` when the setting `use_hedged_requests` is enabled. Fixes [#23431](https://github.com/ClickHouse/ClickHouse/issues/23431). [#23805](https://github.com/ClickHouse/ClickHouse/pull/23805) ([Nikolai Kochetov](https://github.com/KochetovNicolai)). Fixed a race condition in hedged connections which leads to crash. This fixes [#22161](https://github.com/ClickHouse/ClickHouse/issues/22161). [#22443](https://github.com/ClickHouse/ClickHouse/pull/22443) ([Kruglov Pavel](https://github.com/Avogar)). Fix possible crash in case if `unknown packet` was received from remote query (with `async_socket_for_remote` enabled). Fixes [#21167](https://github.com/ClickHouse/ClickHouse/issues/21167). [#23309](https://github.com/ClickHouse/ClickHouse/pull/23309) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed the behavior when disabling `input_format_with_names_use_header ` setting discards all the input with CSVWithNames format. This fixes [#22406](https://github.com/ClickHouse/ClickHouse/issues/22406). [#23202](https://github.com/ClickHouse/ClickHouse/pull/23202) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed remote JDBC bridge timeout connection issue. Closes [#9609](https://github.com/ClickHouse/ClickHouse/issues/9609). [#23771](https://github.com/ClickHouse/ClickHouse/pull/23771) ([Maksim Kita](https://github.com/kitaisreal), [alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix the logic of initial load of `complex_key_hashed` if `update_field` is specified. Closes [#23800](https://github.com/ClickHouse/ClickHouse/issues/23800). [#23824](https://github.com/ClickHouse/ClickHouse/pull/23824) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fixed crash when `PREWHERE` and row policy filter are both in effect with empty result. [#23763](https://github.com/ClickHouse/ClickHouse/pull/23763) ([Amos Bird](https://github.com/amosbird)).
+* Avoid possible "Cannot schedule a task" error (in case some exception had been occurred) on INSERT into Distributed. [#23744](https://github.com/ClickHouse/ClickHouse/pull/23744) ([Azat Khuzhin](https://github.com/azat)).
+* Added an exception in case of completely the same values in both samples in aggregate function `mannWhitneyUTest`. This fixes [#23646](https://github.com/ClickHouse/ClickHouse/issues/23646). [#23654](https://github.com/ClickHouse/ClickHouse/pull/23654) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed server fault when inserting data through HTTP caused an exception. This fixes [#23512](https://github.com/ClickHouse/ClickHouse/issues/23512). [#23643](https://github.com/ClickHouse/ClickHouse/pull/23643) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fixed misinterpretation of some `LIKE` expressions with escape sequences. [#23610](https://github.com/ClickHouse/ClickHouse/pull/23610) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed restart / stop command hanging. Closes [#20214](https://github.com/ClickHouse/ClickHouse/issues/20214). [#23552](https://github.com/ClickHouse/ClickHouse/pull/23552) ([filimonov](https://github.com/filimonov)).
+* Fixed `COLUMNS` matcher in case of multiple JOINs in select query. Closes [#22736](https://github.com/ClickHouse/ClickHouse/issues/22736). [#23501](https://github.com/ClickHouse/ClickHouse/pull/23501) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fixed a crash when modifying column's default value when a column itself is used as `ReplacingMergeTree`'s parameter. [#23483](https://github.com/ClickHouse/ClickHouse/pull/23483) ([hexiaoting](https://github.com/hexiaoting)).
+* Fixed corner cases in vertical merges with `ReplacingMergeTree`. In rare cases they could lead to fails of merges with exceptions like `Incomplete granules are not allowed while blocks are granules size`. [#23459](https://github.com/ClickHouse/ClickHouse/pull/23459) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed bug that does not allow cast from empty array literal, to array with dimensions greater than 1, e.g. `CAST([] AS Array(Array(String)))`. Closes [#14476](https://github.com/ClickHouse/ClickHouse/issues/14476). [#23456](https://github.com/ClickHouse/ClickHouse/pull/23456) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fixed a bug when `deltaSum` aggregate function produced incorrect result after resetting the counter. [#23437](https://github.com/ClickHouse/ClickHouse/pull/23437) ([Russ Frank](https://github.com/rf)).
+* Fixed `Cannot unlink file` error on unsuccessful creation of ReplicatedMergeTree table with multidisk configuration. This closes [#21755](https://github.com/ClickHouse/ClickHouse/issues/21755). [#23433](https://github.com/ClickHouse/ClickHouse/pull/23433) ([tavplubix](https://github.com/tavplubix)).
+* Fixed incompatible constant expression generation during partition pruning based on virtual columns. This fixes https://github.com/ClickHouse/ClickHouse/pull/21401#discussion_r611888913. [#23366](https://github.com/ClickHouse/ClickHouse/pull/23366) ([Amos Bird](https://github.com/amosbird)).
+* Fixed a crash when setting join_algorithm is set to 'auto' and Join is performed with a Dictionary. Close [#23002](https://github.com/ClickHouse/ClickHouse/issues/23002). [#23312](https://github.com/ClickHouse/ClickHouse/pull/23312) ([Vladimir](https://github.com/vdimir)).
+* Don't relax NOT conditions during partition pruning. This fixes [#23305](https://github.com/ClickHouse/ClickHouse/issues/23305) and [#21539](https://github.com/ClickHouse/ClickHouse/issues/21539). [#23310](https://github.com/ClickHouse/ClickHouse/pull/23310) ([Amos Bird](https://github.com/amosbird)).
+* Fixed very rare race condition on background cleanup of old blocks. It might cause a block not to be deduplicated if it's too close to the end of deduplication window. [#23301](https://github.com/ClickHouse/ClickHouse/pull/23301) ([tavplubix](https://github.com/tavplubix)).
+* Fixed very rare (distributed) race condition between creation and removal of ReplicatedMergeTree tables. It might cause exceptions like `node doesn't exist` on attempt to create replicated table. Fixes [#21419](https://github.com/ClickHouse/ClickHouse/issues/21419). [#23294](https://github.com/ClickHouse/ClickHouse/pull/23294) ([tavplubix](https://github.com/tavplubix)).
+* Fixed simple key dictionary from DDL creation if primary key is not first attribute. Fixes [#23236](https://github.com/ClickHouse/ClickHouse/issues/23236). [#23262](https://github.com/ClickHouse/ClickHouse/pull/23262) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fixed reading from ODBC when there are many long column names in a table. Closes [#8853](https://github.com/ClickHouse/ClickHouse/issues/8853). [#23215](https://github.com/ClickHouse/ClickHouse/pull/23215) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* MaterializeMySQL (experimental feature): fixed `Not found column` error when selecting from `MaterializeMySQL` with condition on key column. Fixes [#22432](https://github.com/ClickHouse/ClickHouse/issues/22432). [#23200](https://github.com/ClickHouse/ClickHouse/pull/23200) ([tavplubix](https://github.com/tavplubix)).
+* Correct aliases handling if subquery was optimized to constant. Fixes [#22924](https://github.com/ClickHouse/ClickHouse/issues/22924). Fixes [#10401](https://github.com/ClickHouse/ClickHouse/issues/10401). [#23191](https://github.com/ClickHouse/ClickHouse/pull/23191) ([Maksim Kita](https://github.com/kitaisreal)).
+* Server might fail to start if `data_type_default_nullable` setting is enabled in default profile, it's fixed. Fixes [#22573](https://github.com/ClickHouse/ClickHouse/issues/22573). [#23185](https://github.com/ClickHouse/ClickHouse/pull/23185) ([tavplubix](https://github.com/tavplubix)).
+* Fixed a crash on shutdown which happened because of wrong accounting of current connections. [#23154](https://github.com/ClickHouse/ClickHouse/pull/23154) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed `Table .inner_id... doesn't exist` error when selecting from Materialized View after detaching it from Atomic database and attaching back. [#23047](https://github.com/ClickHouse/ClickHouse/pull/23047) ([tavplubix](https://github.com/tavplubix)).
+* Fix error `Cannot find column in ActionsDAG result` which may happen if subquery uses `untuple`. Fixes [#22290](https://github.com/ClickHouse/ClickHouse/issues/22290). [#22991](https://github.com/ClickHouse/ClickHouse/pull/22991) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix usage of constant columns of type `Map` with nullable values. [#22939](https://github.com/ClickHouse/ClickHouse/pull/22939) ([Anton Popov](https://github.com/CurtizJ)).
+* fixed `formatDateTime()` on `DateTime64` and "%C" format specifier fixed `toDateTime64()` for large values and non-zero scale. [#22937](https://github.com/ClickHouse/ClickHouse/pull/22937) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fixed a crash when using `mannWhitneyUTest` and `rankCorr` with window functions. This fixes [#22728](https://github.com/ClickHouse/ClickHouse/issues/22728). [#22876](https://github.com/ClickHouse/ClickHouse/pull/22876) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* LIVE VIEW (experimental feature): fixed possible hanging in concurrent DROP/CREATE of TEMPORARY LIVE VIEW in `TemporaryLiveViewCleaner`, [see](https://gist.github.com/vzakaznikov/0c03195960fc86b56bfe2bc73a90019e). [#22858](https://github.com/ClickHouse/ClickHouse/pull/22858) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed pushdown of `HAVING` in case, when filter column is used in aggregation. [#22763](https://github.com/ClickHouse/ClickHouse/pull/22763) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixed possible hangs in Zookeeper requests in case of OOM exception. Fixes [#22438](https://github.com/ClickHouse/ClickHouse/issues/22438). [#22684](https://github.com/ClickHouse/ClickHouse/pull/22684) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed wait for mutations on several replicas for ReplicatedMergeTree table engines. Previously, mutation/alter query may finish before mutation actually executed on other replicas. [#22669](https://github.com/ClickHouse/ClickHouse/pull/22669) ([alesapin](https://github.com/alesapin)).
+* Fixed exception for Log with nested types without columns in the SELECT clause. [#22654](https://github.com/ClickHouse/ClickHouse/pull/22654) ([Azat Khuzhin](https://github.com/azat)).
+* Fix unlimited wait for auxiliary AWS requests. [#22594](https://github.com/ClickHouse/ClickHouse/pull/22594) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Fixed a crash when client closes connection very early [#22579](https://github.com/ClickHouse/ClickHouse/issues/22579). [#22591](https://github.com/ClickHouse/ClickHouse/pull/22591) ([nvartolomei](https://github.com/nvartolomei)).
+* `Map` data type (experimental feature): fixed an incorrect formatting of function `map` in distributed queries. [#22588](https://github.com/ClickHouse/ClickHouse/pull/22588) ([foolchi](https://github.com/foolchi)).
+* Fixed deserialization of empty string without newline at end of TSV format. This closes [#20244](https://github.com/ClickHouse/ClickHouse/issues/20244). Possible workaround without version update: set `input_format_null_as_default` to zero. It was zero in old versions. [#22527](https://github.com/ClickHouse/ClickHouse/pull/22527) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fixed wrong cast of a column of `LowCardinality` type in Merge Join algorithm. Close [#22386](https://github.com/ClickHouse/ClickHouse/issues/22386), close [#22388](https://github.com/ClickHouse/ClickHouse/issues/22388). [#22510](https://github.com/ClickHouse/ClickHouse/pull/22510) ([Vladimir](https://github.com/vdimir)).
+* Buffer overflow (on read) was possible in `tokenbf_v1` full text index. The excessive bytes are not used but the read operation may lead to crash in rare cases. This closes [#19233](https://github.com/ClickHouse/ClickHouse/issues/19233). [#22421](https://github.com/ClickHouse/ClickHouse/pull/22421) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Do not limit HTTP chunk size. Fixes [#21907](https://github.com/ClickHouse/ClickHouse/issues/21907). [#22322](https://github.com/ClickHouse/ClickHouse/pull/22322) ([Ivan](https://github.com/abyss7)).
+* Fixed a bug, which leads to underaggregation of data in case of enabled `optimize_aggregation_in_order` and many parts in table. Slightly improve performance of aggregation with enabled `optimize_aggregation_in_order`. [#21889](https://github.com/ClickHouse/ClickHouse/pull/21889) ([Anton Popov](https://github.com/CurtizJ)).
+* Check if table function view is used as a column. This complements #20350. [#21465](https://github.com/ClickHouse/ClickHouse/pull/21465) ([Amos Bird](https://github.com/amosbird)).
+* Fix "unknown column" error for tables with `Merge` engine in queris with `JOIN` and aggregation. Closes [#18368](https://github.com/ClickHouse/ClickHouse/issues/18368), close [#22226](https://github.com/ClickHouse/ClickHouse/issues/22226). [#21370](https://github.com/ClickHouse/ClickHouse/pull/21370) ([Vladimir](https://github.com/vdimir)).
+* Fixed name clashes in pushdown optimization. It caused incorrect `WHERE` filtration after FULL JOIN. Close [#20497](https://github.com/ClickHouse/ClickHouse/issues/20497). [#20622](https://github.com/ClickHouse/ClickHouse/pull/20622) ([Vladimir](https://github.com/vdimir)).
+* Fixed very rare bug when quorum insert with `quorum_parallel=1` is not really "quorum" because of deduplication. [#18215](https://github.com/ClickHouse/ClickHouse/pull/18215) ([filimonov](https://github.com/filimonov) - reported, [alesapin](https://github.com/alesapin) - fixed).
+
+#### Build/Testing/Packaging Improvement
+
+* Run stateless tests in parallel in CI. [#22300](https://github.com/ClickHouse/ClickHouse/pull/22300) ([alesapin](https://github.com/alesapin)).
+* Simplify debian packages. This fixes [#21698](https://github.com/ClickHouse/ClickHouse/issues/21698). [#22976](https://github.com/ClickHouse/ClickHouse/pull/22976) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added support for ClickHouse build on Apple M1. [#21639](https://github.com/ClickHouse/ClickHouse/pull/21639) ([changvvb](https://github.com/changvvb)).
+* Fixed ClickHouse Keeper build for MacOS. [#22860](https://github.com/ClickHouse/ClickHouse/pull/22860) ([alesapin](https://github.com/alesapin)).
+* Fixed some tests on AArch64 platform. [#22596](https://github.com/ClickHouse/ClickHouse/pull/22596) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Added function alignment for possibly better performance. [#21431](https://github.com/ClickHouse/ClickHouse/pull/21431) ([Danila Kutenin](https://github.com/danlark1)).
+* Adjust some tests to output identical results on amd64 and aarch64 (qemu). The result was depending on implementation specific CPU behaviour. [#22590](https://github.com/ClickHouse/ClickHouse/pull/22590) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow query profiling only on x86_64. See [#15174](https://github.com/ClickHouse/ClickHouse/issues/15174#issuecomment-812954965) and [#15638](https://github.com/ClickHouse/ClickHouse/issues/15638#issuecomment-703805337). This closes [#15638](https://github.com/ClickHouse/ClickHouse/issues/15638). [#22580](https://github.com/ClickHouse/ClickHouse/pull/22580) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow building with unbundled xz (lzma) using `USE_INTERNAL_XZ_LIBRARY=OFF` CMake option. [#22571](https://github.com/ClickHouse/ClickHouse/pull/22571) ([Kfir Itzhak](https://github.com/mastertheknife)).
+* Enable bundled `openldap` on `ppc64le` [#22487](https://github.com/ClickHouse/ClickHouse/pull/22487) ([Kfir Itzhak](https://github.com/mastertheknife)).
+* Disable incompatible libraries (platform specific typically) on `ppc64le` [#22475](https://github.com/ClickHouse/ClickHouse/pull/22475) ([Kfir Itzhak](https://github.com/mastertheknife)).
+* Add Jepsen test in CI for clickhouse Keeper. [#22373](https://github.com/ClickHouse/ClickHouse/pull/22373) ([alesapin](https://github.com/alesapin)).
+* Build `jemalloc` with support for [heap profiling](https://github.com/jemalloc/jemalloc/wiki/Use-Case%3A-Heap-Profiling). [#22834](https://github.com/ClickHouse/ClickHouse/pull/22834) ([nvartolomei](https://github.com/nvartolomei)).
+* Avoid UB in `*Log` engines for rwlock unlock due to unlock from another thread. [#22583](https://github.com/ClickHouse/ClickHouse/pull/22583) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed UB by unlocking the rwlock of the TinyLog from the same thread. [#22560](https://github.com/ClickHouse/ClickHouse/pull/22560) ([Azat Khuzhin](https://github.com/azat)).
+
+
+## ClickHouse release 21.4
+
+### ClickHouse release 21.4.1 2021-04-12
+
+#### Backward Incompatible Change
+
+* The `toStartOfIntervalFunction` will align hour intervals to the midnight (in previous versions they were aligned to the start of unix epoch). For example, `toStartOfInterval(x, INTERVAL 11 HOUR)` will split every day into three intervals: `00:00:00..10:59:59`, `11:00:00..21:59:59` and `22:00:00..23:59:59`. This behaviour is more suited for practical needs. This closes [#9510](https://github.com/ClickHouse/ClickHouse/issues/9510). [#22060](https://github.com/ClickHouse/ClickHouse/pull/22060) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* `Age` and `Precision` in graphite rollup configs should increase from retention to retention. Now it's checked and the wrong config raises an exception. [#21496](https://github.com/ClickHouse/ClickHouse/pull/21496) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix `cutToFirstSignificantSubdomainCustom()`/`firstSignificantSubdomainCustom()` returning wrong result for 3+ level domains present in custom top-level domain list. For input domains matching these custom top-level domains, the third-level domain was considered to be the first significant one. This is now fixed. This change may introduce incompatibility if the function is used in e.g. the sharding key. [#21946](https://github.com/ClickHouse/ClickHouse/pull/21946) ([Azat Khuzhin](https://github.com/azat)).
+* Column `keys` in table `system.dictionaries` was replaced to columns `key.names` and `key.types`. Columns `key.names`, `key.types`, `attribute.names`, `attribute.types` from `system.dictionaries` table does not require dictionary to be loaded. [#21884](https://github.com/ClickHouse/ClickHouse/pull/21884) ([Maksim Kita](https://github.com/kitaisreal)).
+* Now replicas that are processing the `ALTER TABLE ATTACH PART[ITION]` command search in their `detached/` folders before fetching the data from other replicas. As an implementation detail, a new command `ATTACH_PART` is introduced in the replicated log. Parts are searched and compared by their checksums. [#18978](https://github.com/ClickHouse/ClickHouse/pull/18978) ([Mike Kot](https://github.com/myrrc)). **Note**:
+  * `ATTACH PART[ITION]` queries may not work during cluster upgrade.
+  * It's not possible to rollback to older ClickHouse version after executing `ALTER ... ATTACH` query in new version as the old servers would fail to pass the `ATTACH_PART` entry in the replicated log.
+* In this version, empty `<remote_url_allow_hosts></remote_url_allow_hosts>` will block all access to remote hosts while in previous versions it did nothing. If you want to keep old behaviour and you have empty `remote_url_allow_hosts` element in configuration file, remove it. [#20058](https://github.com/ClickHouse/ClickHouse/pull/20058) ([Vladimir Chebotarev](https://github.com/excitoon)).
+
+
+#### New Feature
+
+* Extended range of `DateTime64` to support dates from year 1925 to 2283. Improved support of `DateTime` around zero date (`1970-01-01`). [#9404](https://github.com/ClickHouse/ClickHouse/pull/9404) ([alexey-milovidov](https://github.com/alexey-milovidov), [Vasily Nemkov](https://github.com/Enmk)). Not every time and date functions are working for extended range of dates.
+* Added support of Kerberos authentication for preconfigured users and HTTP requests (GSS-SPNEGO). [#14995](https://github.com/ClickHouse/ClickHouse/pull/14995) ([Denis Glazachev](https://github.com/traceon)).
+* Add `prefer_column_name_to_alias` setting to use original column names instead of aliases. it is needed to be more compatible with common databases' aliasing rules. This is for [#9715](https://github.com/ClickHouse/ClickHouse/issues/9715) and [#9887](https://github.com/ClickHouse/ClickHouse/issues/9887). [#22044](https://github.com/ClickHouse/ClickHouse/pull/22044) ([Amos Bird](https://github.com/amosbird)).
+* Added functions `dictGetChildren(dictionary, key)`, `dictGetDescendants(dictionary, key, level)`. Function `dictGetChildren` return all children as an array if indexes. It is a inverse transformation for `dictGetHierarchy`. Function `dictGetDescendants` return all descendants as if `dictGetChildren` was applied `level` times recursively. Zero `level` value is equivalent to infinity. Closes [#14656](https://github.com/ClickHouse/ClickHouse/issues/14656). [#22096](https://github.com/ClickHouse/ClickHouse/pull/22096) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added `executable_pool` dictionary source. Close [#14528](https://github.com/ClickHouse/ClickHouse/issues/14528). [#21321](https://github.com/ClickHouse/ClickHouse/pull/21321) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added table function `dictionary`. It works the same way as `Dictionary` engine. Closes [#21560](https://github.com/ClickHouse/ClickHouse/issues/21560). [#21910](https://github.com/ClickHouse/ClickHouse/pull/21910) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support `Nullable` type for `PolygonDictionary` attribute. [#21890](https://github.com/ClickHouse/ClickHouse/pull/21890) ([Maksim Kita](https://github.com/kitaisreal)).
+* Functions `dictGet`, `dictHas` use current database name if it is not specified for dictionaries created with DDL. Closes [#21632](https://github.com/ClickHouse/ClickHouse/issues/21632). [#21859](https://github.com/ClickHouse/ClickHouse/pull/21859) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added function `dictGetOrNull`. It works like `dictGet`, but return `Null` in case key was not found in dictionary. Closes [#22375](https://github.com/ClickHouse/ClickHouse/issues/22375). [#22413](https://github.com/ClickHouse/ClickHouse/pull/22413) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added async update in `ComplexKeyCache`, `SSDCache`, `SSDComplexKeyCache` dictionaries. Added support for `Nullable` type in `Cache`, `ComplexKeyCache`, `SSDCache`, `SSDComplexKeyCache` dictionaries. Added support for multiple attributes fetch with `dictGet`, `dictGetOrDefault` functions. Fixes [#21517](https://github.com/ClickHouse/ClickHouse/issues/21517). [#20595](https://github.com/ClickHouse/ClickHouse/pull/20595) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support `dictHas` function for `RangeHashedDictionary`. Fixes [#6680](https://github.com/ClickHouse/ClickHouse/issues/6680). [#19816](https://github.com/ClickHouse/ClickHouse/pull/19816) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add function `timezoneOf` that returns the timezone name of `DateTime` or `DateTime64` data types. This does not close [#9959](https://github.com/ClickHouse/ClickHouse/issues/9959). Fix inconsistencies in function names: add aliases `timezone` and `timeZone` as well as `toTimezone` and `toTimeZone` and `timezoneOf` and `timeZoneOf`. [#22001](https://github.com/ClickHouse/ClickHouse/pull/22001) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add new optional clause `GRANTEES` for `CREATE/ALTER USER` commands. It specifies users or roles which are allowed to receive grants from this user on condition this user has also all required access granted with grant option. By default `GRANTEES ANY` is used which means a user with grant option can grant to anyone. Syntax: `CREATE USER ... GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]`. [#21641](https://github.com/ClickHouse/ClickHouse/pull/21641) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add new column `slowdowns_count` to `system.clusters`. When using hedged requests, it shows how many times we switched to another replica because this replica was responding slowly. Also show actual value of `errors_count` in `system.clusters`. [#21480](https://github.com/ClickHouse/ClickHouse/pull/21480) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add `_partition_id` virtual column for `MergeTree*` engines. Allow to prune partitions by `_partition_id`. Add `partitionID()` function to calculate partition id string. [#21401](https://github.com/ClickHouse/ClickHouse/pull/21401) ([Amos Bird](https://github.com/amosbird)).
+* Add function `isIPAddressInRange` to test if an IPv4 or IPv6 address is contained in a given CIDR network prefix. [#21329](https://github.com/ClickHouse/ClickHouse/pull/21329) ([PHO](https://github.com/depressed-pho)).
+* Added new SQL command `ALTER TABLE 'table_name' UNFREEZE [PARTITION 'part_expr'] WITH NAME 'backup_name'`. This command is needed to properly remove 'freezed' partitions from all disks. [#21142](https://github.com/ClickHouse/ClickHouse/pull/21142) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Supports implicit key type conversion for JOIN. [#19885](https://github.com/ClickHouse/ClickHouse/pull/19885) ([Vladimir](https://github.com/vdimir)).
+
+#### Experimental Feature
+
+* Support `RANGE OFFSET` frame (for window functions) for floating point types. Implement `lagInFrame`/`leadInFrame` window functions, which are analogous to `lag`/`lead`, but respect the window frame. They are identical when the frame is `between unbounded preceding and unbounded following`. This closes [#5485](https://github.com/ClickHouse/ClickHouse/issues/5485). [#21895](https://github.com/ClickHouse/ClickHouse/pull/21895) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Zero-copy replication for `ReplicatedMergeTree` over S3 storage. [#16240](https://github.com/ClickHouse/ClickHouse/pull/16240) ([ianton-ru](https://github.com/ianton-ru)).
+* Added possibility to migrate existing S3 disk to the schema with backup-restore capabilities. [#22070](https://github.com/ClickHouse/ClickHouse/pull/22070) ([Pavel Kovalenko](https://github.com/Jokser)).
+
+#### Performance Improvement
+
+* Supported parallel formatting in `clickhouse-local` and everywhere else. [#21630](https://github.com/ClickHouse/ClickHouse/pull/21630) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Support parallel parsing for `CSVWithNames` and `TSVWithNames` formats. This closes [#21085](https://github.com/ClickHouse/ClickHouse/issues/21085). [#21149](https://github.com/ClickHouse/ClickHouse/pull/21149) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Enable read with mmap IO for file ranges from 64 MiB (the settings `min_bytes_to_use_mmap_io`). It may lead to moderate performance improvement. [#22326](https://github.com/ClickHouse/ClickHouse/pull/22326) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add cache for files read with `min_bytes_to_use_mmap_io` setting. It makes significant (2x and more) performance improvement when the value of the setting is small by avoiding frequent mmap/munmap calls and the consequent page faults. Note that mmap IO has major drawbacks that makes it less reliable in production (e.g. hung or SIGBUS on faulty disks; less controllable memory usage). Nevertheless it is good in benchmarks. [#22206](https://github.com/ClickHouse/ClickHouse/pull/22206) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Avoid unnecessary data copy when using codec `NONE`. Please note that codec `NONE` is mostly useless - it's recommended to always use compression (`LZ4` is by default). Despite the common belief, disabling compression may not improve performance (the opposite effect is possible). The `NONE` codec is useful in some cases: - when data is uncompressable; - for synthetic benchmarks. [#22145](https://github.com/ClickHouse/ClickHouse/pull/22145) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Faster `GROUP BY` with small `max_rows_to_group_by` and `group_by_overflow_mode='any'`. [#21856](https://github.com/ClickHouse/ClickHouse/pull/21856) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Optimize performance of queries like `SELECT ... FINAL ... WHERE`. Now in queries with `FINAL` it's allowed to move to `PREWHERE` columns, which are in sorting key. [#21830](https://github.com/ClickHouse/ClickHouse/pull/21830) ([foolchi](https://github.com/foolchi)).
+* Improved performance by replacing `memcpy` to another implementation. This closes [#18583](https://github.com/ClickHouse/ClickHouse/issues/18583). [#21520](https://github.com/ClickHouse/ClickHouse/pull/21520) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve performance of aggregation in order of sorting key (with enabled setting `optimize_aggregation_in_order`). [#19401](https://github.com/ClickHouse/ClickHouse/pull/19401) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Improvement
+
+* Add connection pool for PostgreSQL table/database engine and dictionary source. Should fix [#21444](https://github.com/ClickHouse/ClickHouse/issues/21444). [#21839](https://github.com/ClickHouse/ClickHouse/pull/21839) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support non-default table schema for postgres storage/table-function. Closes [#21701](https://github.com/ClickHouse/ClickHouse/issues/21701). [#21711](https://github.com/ClickHouse/ClickHouse/pull/21711) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support replicas priority for postgres dictionary source. [#21710](https://github.com/ClickHouse/ClickHouse/pull/21710) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Introduce a new merge tree setting `min_bytes_to_rebalance_partition_over_jbod` which allows assigning new parts to different disks of a JBOD volume in a balanced way. [#16481](https://github.com/ClickHouse/ClickHouse/pull/16481) ([Amos Bird](https://github.com/amosbird)).
+* Added `Grant`, `Revoke` and `System` values of `query_kind` column for corresponding queries in `system.query_log`. [#21102](https://github.com/ClickHouse/ClickHouse/pull/21102) ([Vasily Nemkov](https://github.com/Enmk)).
+* Allow customizing timeouts for HTTP connections used for replication independently from other HTTP timeouts. [#20088](https://github.com/ClickHouse/ClickHouse/pull/20088) ([nvartolomei](https://github.com/nvartolomei)).
+* Better exception message in client in case of exception while server is writing blocks. In previous versions client may get misleading message like `Data compressed with different methods`. [#22427](https://github.com/ClickHouse/ClickHouse/pull/22427) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix error `Directory tmp_fetch_XXX already exists` which could happen after failed fetch part. Delete temporary fetch directory if it already exists. Fixes [#14197](https://github.com/ClickHouse/ClickHouse/issues/14197). [#22411](https://github.com/ClickHouse/ClickHouse/pull/22411) ([nvartolomei](https://github.com/nvartolomei)).
+* Fix MSan report for function `range` with `UInt256` argument (support for large integers is experimental). This closes [#22157](https://github.com/ClickHouse/ClickHouse/issues/22157). [#22387](https://github.com/ClickHouse/ClickHouse/pull/22387) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add `current_database` column to `system.processes` table. It contains the current database of the query. [#22365](https://github.com/ClickHouse/ClickHouse/pull/22365) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Add case-insensitive history search/navigation and subword movement features to `clickhouse-client`. [#22105](https://github.com/ClickHouse/ClickHouse/pull/22105) ([Amos Bird](https://github.com/amosbird)).
+* If tuple of NULLs, e.g. `(NULL, NULL)` is on the left hand side of `IN` operator with tuples of non-NULLs on the right hand side, e.g. `SELECT (NULL, NULL) IN ((0, 0), (3, 1))` return 0 instead of throwing an exception about incompatible types. The expression may also appear due to optimization of something like `SELECT (NULL, NULL) = (8, 0) OR (NULL, NULL) = (3, 2) OR (NULL, NULL) = (0, 0) OR (NULL, NULL) = (3, 1)`. This closes [#22017](https://github.com/ClickHouse/ClickHouse/issues/22017). [#22063](https://github.com/ClickHouse/ClickHouse/pull/22063) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Update used version of simdjson to 0.9.1. This fixes [#21984](https://github.com/ClickHouse/ClickHouse/issues/21984). [#22057](https://github.com/ClickHouse/ClickHouse/pull/22057) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Added case insensitive aliases for `CONNECTION_ID()` and `VERSION()` functions. This fixes [#22028](https://github.com/ClickHouse/ClickHouse/issues/22028). [#22042](https://github.com/ClickHouse/ClickHouse/pull/22042) ([Eugene Klimov](https://github.com/Slach)).
+* Add option `strict_increase` to `windowFunnel` function to calculate each event once (resolve [#21835](https://github.com/ClickHouse/ClickHouse/issues/21835)). [#22025](https://github.com/ClickHouse/ClickHouse/pull/22025) ([Vladimir](https://github.com/vdimir)).
+* If partition key of a `MergeTree` table does not include `Date` or `DateTime` columns but includes exactly one `DateTime64` column, expose its values in the `min_time` and `max_time` columns in `system.parts` and `system.parts_columns` tables. Add `min_time` and `max_time` columns to `system.parts_columns` table (these was inconsistency to the `system.parts` table). This closes [#18244](https://github.com/ClickHouse/ClickHouse/issues/18244). [#22011](https://github.com/ClickHouse/ClickHouse/pull/22011) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Supported `replication_alter_partitions_sync=1` setting in `clickhouse-copier` for moving partitions from helping table to destination. Decreased default timeouts. Fixes [#21911](https://github.com/ClickHouse/ClickHouse/issues/21911). [#21912](https://github.com/ClickHouse/ClickHouse/pull/21912) ([turbo jason](https://github.com/songenjie)).
+* Show path to data directory of `EmbeddedRocksDB` tables in system tables. [#21903](https://github.com/ClickHouse/ClickHouse/pull/21903) ([tavplubix](https://github.com/tavplubix)).
+* Add profile event `HedgedRequestsChangeReplica`, change read data timeout from sec to ms. [#21886](https://github.com/ClickHouse/ClickHouse/pull/21886) ([Kruglov Pavel](https://github.com/Avogar)).
+* DiskS3 (experimental feature under development). Fixed bug with the impossibility to move directory if the destination is not empty and cache disk is used. [#21837](https://github.com/ClickHouse/ClickHouse/pull/21837) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Better formatting for `Array` and `Map` data types in Web UI. [#21798](https://github.com/ClickHouse/ClickHouse/pull/21798) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Update clusters only if their configurations were updated. [#21685](https://github.com/ClickHouse/ClickHouse/pull/21685) ([Kruglov Pavel](https://github.com/Avogar)).
+* Propagate query and session settings for distributed DDL queries. Set `distributed_ddl_entry_format_version` to 2 to enable this. Added `distributed_ddl_output_mode` setting. Supported modes: `none`, `throw` (default), `null_status_on_timeout` and `never_throw`. Miscellaneous fixes and improvements for `Replicated` database engine. [#21535](https://github.com/ClickHouse/ClickHouse/pull/21535) ([tavplubix](https://github.com/tavplubix)).
+* If `PODArray` was instantiated with element size that is neither a fraction or a multiple of 16, buffer overflow was possible. No bugs in current releases exist. [#21533](https://github.com/ClickHouse/ClickHouse/pull/21533) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add `last_error_time`/`last_error_message`/`last_error_stacktrace`/`remote` columns for `system.errors`. [#21529](https://github.com/ClickHouse/ClickHouse/pull/21529) ([Azat Khuzhin](https://github.com/azat)).
+* Add aliases `simpleJSONExtract/simpleJSONHas` to `visitParam/visitParamExtract{UInt, Int, Bool, Float, Raw, String}`. Fixes #21383. [#21519](https://github.com/ClickHouse/ClickHouse/pull/21519) ([fastio](https://github.com/fastio)).
+* Add setting `optimize_skip_unused_shards_limit` to limit the number of sharding key values for `optimize_skip_unused_shards`. [#21512](https://github.com/ClickHouse/ClickHouse/pull/21512) ([Azat Khuzhin](https://github.com/azat)).
+* Improve `clickhouse-format` to not throw exception when there are extra spaces or comment after the last query, and throw exception early with readable message when format `ASTInsertQuery` with data . [#21311](https://github.com/ClickHouse/ClickHouse/pull/21311) ([flynn](https://github.com/ucasFL)).
+* Improve support of integer keys in data type `Map`. [#21157](https://github.com/ClickHouse/ClickHouse/pull/21157) ([Anton Popov](https://github.com/CurtizJ)).
+* MaterializeMySQL: attempt to reconnect to MySQL if the connection is lost. [#20961](https://github.com/ClickHouse/ClickHouse/pull/20961) ([Håvard Kvålen](https://github.com/havardk)).
+* Support more cases to rewrite `CROSS JOIN` to `INNER JOIN`. [#20392](https://github.com/ClickHouse/ClickHouse/pull/20392) ([Vladimir](https://github.com/vdimir)).
+* Do not create empty parts on INSERT when `optimize_on_insert` setting enabled. Fixes [#20304](https://github.com/ClickHouse/ClickHouse/issues/20304). [#20387](https://github.com/ClickHouse/ClickHouse/pull/20387) ([Kruglov Pavel](https://github.com/Avogar)).
+* `MaterializeMySQL`: add minmax skipping index for `_version` column. [#20382](https://github.com/ClickHouse/ClickHouse/pull/20382) ([Stig Bakken](https://github.com/stigsb)).
+* Add option `--backslash` for `clickhouse-format`, which can add a backslash at the end of each line of the formatted query. [#21494](https://github.com/ClickHouse/ClickHouse/pull/21494) ([flynn](https://github.com/ucasFL)).
+* Now clickhouse will not throw `LOGICAL_ERROR` exception when we try to mutate the already covered part. Fixes [#22013](https://github.com/ClickHouse/ClickHouse/issues/22013). [#22291](https://github.com/ClickHouse/ClickHouse/pull/22291) ([alesapin](https://github.com/alesapin)).
+
+#### Bug Fix
+
+* Remove socket from epoll before cancelling packet receiver in `HedgedConnections` to prevent possible race. Fixes [#22161](https://github.com/ClickHouse/ClickHouse/issues/22161). [#22443](https://github.com/ClickHouse/ClickHouse/pull/22443) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add (missing) memory accounting in parallel parsing routines. In previous versions OOM was possible when the resultset contains very large blocks of data. This closes [#22008](https://github.com/ClickHouse/ClickHouse/issues/22008). [#22425](https://github.com/ClickHouse/ClickHouse/pull/22425) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix exception which may happen when `SELECT` has constant `WHERE` condition and source table has columns which names are digits. [#22270](https://github.com/ClickHouse/ClickHouse/pull/22270) ([LiuNeng](https://github.com/liuneng1994)).
+* Fix query cancellation with `use_hedged_requests=0` and `async_socket_for_remote=1`. [#22183](https://github.com/ClickHouse/ClickHouse/pull/22183) ([Azat Khuzhin](https://github.com/azat)).
+* Fix uncaught exception in `InterserverIOHTTPHandler`. [#22146](https://github.com/ClickHouse/ClickHouse/pull/22146) ([Azat Khuzhin](https://github.com/azat)).
+* Fix docker entrypoint in case `http_port` is not in the config. [#22132](https://github.com/ClickHouse/ClickHouse/pull/22132) ([Ewout](https://github.com/devwout)).
+* Fix error `Invalid number of rows in Chunk` in `JOIN` with `TOTALS` and `arrayJoin`. Closes [#19303](https://github.com/ClickHouse/ClickHouse/issues/19303). [#22129](https://github.com/ClickHouse/ClickHouse/pull/22129) ([Vladimir](https://github.com/vdimir)).
+* Fix the background thread pool name which used to poll message from Kafka. The Kafka engine with the broken thread pool will not consume the message from message queue. [#22122](https://github.com/ClickHouse/ClickHouse/pull/22122) ([fastio](https://github.com/fastio)).
+* Fix waiting for `OPTIMIZE` and `ALTER` queries for `ReplicatedMergeTree` table engines. Now the query will not hang when the table was detached or restarted. [#22118](https://github.com/ClickHouse/ClickHouse/pull/22118) ([alesapin](https://github.com/alesapin)).
+* Disable `async_socket_for_remote`/`use_hedged_requests` for buggy Linux kernels. [#22109](https://github.com/ClickHouse/ClickHouse/pull/22109) ([Azat Khuzhin](https://github.com/azat)).
+* Docker entrypoint: avoid chown of `.` in case when `LOG_PATH` is empty. Closes [#22100](https://github.com/ClickHouse/ClickHouse/issues/22100). [#22102](https://github.com/ClickHouse/ClickHouse/pull/22102) ([filimonov](https://github.com/filimonov)).
+* The function `decrypt` was lacking a check for the minimal size of data encrypted in `AEAD` mode. This closes [#21897](https://github.com/ClickHouse/ClickHouse/issues/21897). [#22064](https://github.com/ClickHouse/ClickHouse/pull/22064) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* In rare case, merge for `CollapsingMergeTree` may create granule with `index_granularity + 1` rows. Because of this, internal check, added in [#18928](https://github.com/ClickHouse/ClickHouse/issues/18928) (affects 21.2 and 21.3), may fail with error `Incomplete granules are not allowed while blocks are granules size`. This error did not allow parts to merge. [#21976](https://github.com/ClickHouse/ClickHouse/pull/21976) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Reverted [#15454](https://github.com/ClickHouse/ClickHouse/issues/15454) that may cause significant increase in memory usage while loading external dictionaries of hashed type. This closes [#21935](https://github.com/ClickHouse/ClickHouse/issues/21935). [#21948](https://github.com/ClickHouse/ClickHouse/pull/21948) ([Maksim Kita](https://github.com/kitaisreal)).
+* Prevent hedged connections overlaps (`Unknown packet 9 from server` error). [#21941](https://github.com/ClickHouse/ClickHouse/pull/21941) ([Azat Khuzhin](https://github.com/azat)).
+* Fix reading the HTTP POST request with "multipart/form-data" content type in some cases. [#21936](https://github.com/ClickHouse/ClickHouse/pull/21936) ([Ivan](https://github.com/abyss7)).
+* Fix wrong `ORDER BY` results when a query contains window functions, and optimization for reading in primary key order is applied. Fixes [#21828](https://github.com/ClickHouse/ClickHouse/issues/21828). [#21915](https://github.com/ClickHouse/ClickHouse/pull/21915) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix deadlock in first catboost model execution. Closes [#13832](https://github.com/ClickHouse/ClickHouse/issues/13832). [#21844](https://github.com/ClickHouse/ClickHouse/pull/21844) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix incorrect query result (and possible crash) which could happen when `WHERE` or `HAVING` condition is pushed before `GROUP BY`. Fixes [#21773](https://github.com/ClickHouse/ClickHouse/issues/21773). [#21841](https://github.com/ClickHouse/ClickHouse/pull/21841) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Better error handling and logging in `WriteBufferFromS3`. [#21836](https://github.com/ClickHouse/ClickHouse/pull/21836) ([Pavel Kovalenko](https://github.com/Jokser)).
+* Fix possible crashes in aggregate functions with combinator `Distinct`, while using two-level aggregation. This is a follow-up fix of [#18365](https://github.com/ClickHouse/ClickHouse/pull/18365) . Can only reproduced in production env. [#21818](https://github.com/ClickHouse/ClickHouse/pull/21818) ([Amos Bird](https://github.com/amosbird)).
+* Fix scalar subquery index analysis. This fixes [#21717](https://github.com/ClickHouse/ClickHouse/issues/21717) , which was introduced in [#18896](https://github.com/ClickHouse/ClickHouse/pull/18896). [#21766](https://github.com/ClickHouse/ClickHouse/pull/21766) ([Amos Bird](https://github.com/amosbird)).
+* Fix bug for `ReplicatedMerge` table engines when `ALTER MODIFY COLUMN` query doesn't change the type of `Decimal` column if its size (32 bit or 64 bit) doesn't change. [#21728](https://github.com/ClickHouse/ClickHouse/pull/21728) ([alesapin](https://github.com/alesapin)).
+* Fix possible infinite waiting when concurrent `OPTIMIZE` and `DROP` are run for `ReplicatedMergeTree`. [#21716](https://github.com/ClickHouse/ClickHouse/pull/21716) ([Azat Khuzhin](https://github.com/azat)).
+* Fix function `arrayElement` with type `Map` for constant integer arguments. [#21699](https://github.com/ClickHouse/ClickHouse/pull/21699) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix SIGSEGV on not existing attributes from `ip_trie` with `access_to_key_from_attributes`. [#21692](https://github.com/ClickHouse/ClickHouse/pull/21692) ([Azat Khuzhin](https://github.com/azat)).
+* Server now start accepting connections only after `DDLWorker` and dictionaries initialization. [#21676](https://github.com/ClickHouse/ClickHouse/pull/21676) ([Azat Khuzhin](https://github.com/azat)).
+* Add type conversion for keys of tables of type `Join` (previously led to SIGSEGV). [#21646](https://github.com/ClickHouse/ClickHouse/pull/21646) ([Azat Khuzhin](https://github.com/azat)).
+* Fix distributed requests cancellation (for example simple select from multiple shards with limit, i.e. `select * from remote('127.{2,3}', system.numbers) limit 100`) with `async_socket_for_remote=1`. [#21643](https://github.com/ClickHouse/ClickHouse/pull/21643) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `fsync_part_directory` for horizontal merge. [#21642](https://github.com/ClickHouse/ClickHouse/pull/21642) ([Azat Khuzhin](https://github.com/azat)).
+* Remove unknown columns from joined table in `WHERE` for queries to external database engines (MySQL, PostgreSQL). close [#14614](https://github.com/ClickHouse/ClickHouse/issues/14614), close [#19288](https://github.com/ClickHouse/ClickHouse/issues/19288) (dup), close [#19645](https://github.com/ClickHouse/ClickHouse/issues/19645) (dup). [#21640](https://github.com/ClickHouse/ClickHouse/pull/21640) ([Vladimir](https://github.com/vdimir)).
+* `std::terminate` was called if there is an error writing data into s3. [#21624](https://github.com/ClickHouse/ClickHouse/pull/21624) ([Vladimir](https://github.com/vdimir)).
+* Fix possible error `Cannot find column` when `optimize_skip_unused_shards` is enabled and zero shards are used. [#21579](https://github.com/ClickHouse/ClickHouse/pull/21579) ([Azat Khuzhin](https://github.com/azat)).
+* In case if query has constant `WHERE` condition, and setting `optimize_skip_unused_shards` enabled, all shards may be skipped and query could return incorrect empty result. [#21550](https://github.com/ClickHouse/ClickHouse/pull/21550) ([Amos Bird](https://github.com/amosbird)).
+* Fix table function `clusterAllReplicas` returns wrong `_shard_num`. close [#21481](https://github.com/ClickHouse/ClickHouse/issues/21481). [#21498](https://github.com/ClickHouse/ClickHouse/pull/21498) ([flynn](https://github.com/ucasFL)).
+* Fix that S3 table holds old credentials after config update. [#21457](https://github.com/ClickHouse/ClickHouse/pull/21457) ([Grigory Pervakov](https://github.com/GrigoryPervakov)).
+* Fixed race on SSL object inside `SecureSocket` in Poco. [#21456](https://github.com/ClickHouse/ClickHouse/pull/21456) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Fix `Avro` format parsing for `Kafka`. Fixes [#21437](https://github.com/ClickHouse/ClickHouse/issues/21437). [#21438](https://github.com/ClickHouse/ClickHouse/pull/21438) ([Ilya Golshtein](https://github.com/ilejn)).
+* Fix receive and send timeouts and non-blocking read in secure socket. [#21429](https://github.com/ClickHouse/ClickHouse/pull/21429) ([Kruglov Pavel](https://github.com/Avogar)).
+* `force_drop_table` flag didn't work for `MATERIALIZED VIEW`, it's fixed. Fixes [#18943](https://github.com/ClickHouse/ClickHouse/issues/18943). [#20626](https://github.com/ClickHouse/ClickHouse/pull/20626) ([tavplubix](https://github.com/tavplubix)).
+* Fix name clashes in `PredicateRewriteVisitor`. It caused incorrect `WHERE` filtration after full join. Close [#20497](https://github.com/ClickHouse/ClickHouse/issues/20497). [#20622](https://github.com/ClickHouse/ClickHouse/pull/20622) ([Vladimir](https://github.com/vdimir)).
+
+#### Build/Testing/Packaging Improvement
+
+* Add [Jepsen](https://github.com/jepsen-io/jepsen) tests for ClickHouse Keeper. [#21677](https://github.com/ClickHouse/ClickHouse/pull/21677) ([alesapin](https://github.com/alesapin)).
+* Run stateless tests in parallel in CI. Depends on [#22181](https://github.com/ClickHouse/ClickHouse/issues/22181). [#22300](https://github.com/ClickHouse/ClickHouse/pull/22300) ([alesapin](https://github.com/alesapin)).
+* Enable status check for [SQLancer](https://github.com/sqlancer/sqlancer) CI run. [#22015](https://github.com/ClickHouse/ClickHouse/pull/22015) ([Ilya Yatsishin](https://github.com/qoega)).
+* Multiple preparations for PowerPC builds: Enable the bundled openldap on `ppc64le`. [#22487](https://github.com/ClickHouse/ClickHouse/pull/22487) ([Kfir Itzhak](https://github.com/mastertheknife)).  Enable compiling on `ppc64le` with Clang. [#22476](https://github.com/ClickHouse/ClickHouse/pull/22476) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix compiling boost on `ppc64le`. [#22474](https://github.com/ClickHouse/ClickHouse/pull/22474) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix CMake error about internal CMake variable `CMAKE_ASM_COMPILE_OBJECT` not set on `ppc64le`. [#22469](https://github.com/ClickHouse/ClickHouse/pull/22469) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix Fedora/RHEL/CentOS not finding `libclang_rt.builtins` on `ppc64le`. [#22458](https://github.com/ClickHouse/ClickHouse/pull/22458) ([Kfir Itzhak](https://github.com/mastertheknife)).  Enable building with `jemalloc` on `ppc64le`. [#22447](https://github.com/ClickHouse/ClickHouse/pull/22447) ([Kfir Itzhak](https://github.com/mastertheknife)). Fix ClickHouse's config embedding and cctz's timezone embedding on `ppc64le`. [#22445](https://github.com/ClickHouse/ClickHouse/pull/22445) ([Kfir Itzhak](https://github.com/mastertheknife)). Fixed compiling on `ppc64le` and use the correct instruction pointer register on `ppc64le`. [#22430](https://github.com/ClickHouse/ClickHouse/pull/22430) ([Kfir Itzhak](https://github.com/mastertheknife)).
+* Re-enable the S3 (AWS) library on `aarch64`. [#22484](https://github.com/ClickHouse/ClickHouse/pull/22484) ([Kfir Itzhak](https://github.com/mastertheknife)).
+* Add `tzdata` to Docker containers because reading `ORC` formats requires it. This closes [#14156](https://github.com/ClickHouse/ClickHouse/issues/14156). [#22000](https://github.com/ClickHouse/ClickHouse/pull/22000) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Introduce 2 arguments for `clickhouse-server` image Dockerfile: `deb_location` & `single_binary_location`. [#21977](https://github.com/ClickHouse/ClickHouse/pull/21977) ([filimonov](https://github.com/filimonov)).
+* Allow to use clang-tidy with release builds by enabling assertions if it is used. [#21914](https://github.com/ClickHouse/ClickHouse/pull/21914) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add llvm-12 binaries name to search in cmake scripts. Implicit constants conversions to mute clang warnings. Updated submodules to build with CMake 3.19. Mute recursion in macro expansion in `readpassphrase` library. Deprecated `-fuse-ld` changed to `--ld-path` for clang. [#21597](https://github.com/ClickHouse/ClickHouse/pull/21597) ([Ilya Yatsishin](https://github.com/qoega)).
+* Updating `docker/test/testflows/runner/dockerd-entrypoint.sh` to use Yandex dockerhub-proxy, because Docker Hub has enabled very restrictive rate limits [#21551](https://github.com/ClickHouse/ClickHouse/pull/21551) ([vzakaznikov](https://github.com/vzakaznikov)).
+* Fix macOS shared lib build. [#20184](https://github.com/ClickHouse/ClickHouse/pull/20184) ([nvartolomei](https://github.com/nvartolomei)).
+* Add `ctime` option to `zookeeper-dump-tree`. It allows to dump node creation time. [#21842](https://github.com/ClickHouse/ClickHouse/pull/21842) ([Ilya](https://github.com/HumanUser)).
+
+
 ## ClickHouse release 21.3 (LTS)
 
 ### ClickHouse release v21.3, 2021-03-12
@@ -26,7 +318,7 @@
 #### Experimental feature
 
 * Add experimental `Replicated` database engine. It replicates DDL queries across multiple hosts. [#16193](https://github.com/ClickHouse/ClickHouse/pull/16193) ([tavplubix](https://github.com/tavplubix)).
-* Introduce experimental support for window functions, enabled with `allow_experimental_functions = 1`. This is a preliminary, alpha-quality implementation that is not suitable for production use and will change in backward-incompatible ways in future releases. Please see [the documentation](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/sql-reference/window-functions/index.md#experimental-window-functions) for the list of supported features. [#20337](https://github.com/ClickHouse/ClickHouse/pull/20337) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Introduce experimental support for window functions, enabled with `allow_experimental_window_functions = 1`. This is a preliminary, alpha-quality implementation that is not suitable for production use and will change in backward-incompatible ways in future releases. Please see [the documentation](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/sql-reference/window-functions/index.md#experimental-window-functions) for the list of supported features. [#20337](https://github.com/ClickHouse/ClickHouse/pull/20337) ([Alexander Kuzmenkov](https://github.com/akuzm)).
 * Add the ability to backup/restore metadata files for DiskS3. [#18377](https://github.com/ClickHouse/ClickHouse/pull/18377) ([Pavel Kovalenko](https://github.com/Jokser)).
 
 #### Performance Improvement
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d716985c46..9c62748ff95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ option(FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION
 if(FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION)
     set(RECONFIGURE_MESSAGE_LEVEL FATAL_ERROR)
 else()
-    set(RECONFIGURE_MESSAGE_LEVEL STATUS)
+    set(RECONFIGURE_MESSAGE_LEVEL WARNING)
 endif()
 
 enable_language(C CXX ASM)
@@ -68,17 +68,30 @@ endif ()
 
 include (cmake/find/ccache.cmake)
 
-option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile too long or to take too much memory while compiling" OFF)
+# Take care to add prlimit in command line before ccache, or else ccache thinks that
+# prlimit is compiler, and clang++ is its input file, and refuses to work  with
+# multiple inputs, e.g in ccache log:
+# [2021-03-31T18:06:32.655327 36900] Command line: /usr/bin/ccache prlimit --as=10000000000 --data=5000000000 --cpu=600 /usr/bin/clang++-11 - ...... std=gnu++2a -MD -MT src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -MF src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o.d -o src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -c ../src/Storages/MergeTree/IMergeTreeDataPart.cpp
+#
+# [2021-03-31T18:06:32.656704 36900] Multiple input files: /usr/bin/clang++-11 and ../src/Storages/MergeTree/IMergeTreeDataPart.cpp
+#
+# Another way would be to use --ccache-skip option before clang++-11 to make
+# 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 (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)
+
     # gcc10/gcc10/clang -fsanitize=memory is too heavy
     if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)
        set (RLIMIT_DATA 10000000000)
     endif()
-    set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=600)
+
+    set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=${RLIMIT_CPU} ${CMAKE_CXX_COMPILER_LAUNCHER})
 endif ()
 
 if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
@@ -154,9 +167,10 @@ 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 NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
-    # Only for Linux, x86_64.
+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")
+    # 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")
@@ -244,12 +258,17 @@ endif()
 
 include(cmake/cpu_features.cmake)
 
-option(ARCH_NATIVE "Add -march=native compiler flag")
+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.
+set (COMPILER_FLAGS "${COMPILER_FLAGS} -fasynchronous-unwind-tables")
+
 if (${CMAKE_VERSION} VERSION_LESS "3.12.4")
     # CMake < 3.12 doesn't support setting 20 as a C++ standard version.
     # We will add C++ standard controlling flag in CMAKE_CXX_FLAGS manually for now.
@@ -277,6 +296,12 @@ if (COMPILER_GCC OR COMPILER_CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsized-deallocation")
 endif ()
 
+# falign-functions=32 prevents from random performance regressions with the code change. Thus, providing more stable
+# benchmarks.
+if (COMPILER_GCC OR COMPILER_CLANG)
+    set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=32")
+endif ()
+
 # Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc
 option(WITH_COVERAGE "Profile the resulting binary/binaries" OFF)
 
@@ -464,6 +489,7 @@ find_contrib_lib(double-conversion) # Must be before parquet
 include (cmake/find/ssl.cmake)
 include (cmake/find/ldap.cmake) # after ssl
 include (cmake/find/icu.cmake)
+include (cmake/find/xz.cmake)
 include (cmake/find/zlib.cmake)
 include (cmake/find/zstd.cmake)
 include (cmake/find/ltdl.cmake) # for odbc
@@ -474,10 +500,10 @@ include (cmake/find/krb5.cmake)
 include (cmake/find/libgsasl.cmake)
 include (cmake/find/cyrus-sasl.cmake)
 include (cmake/find/rdkafka.cmake)
+include (cmake/find/libuv.cmake) # for amqpcpp and cassandra
 include (cmake/find/amqpcpp.cmake)
 include (cmake/find/capnp.cmake)
 include (cmake/find/llvm.cmake)
-include (cmake/find/termcap.cmake) # for external static llvm
 include (cmake/find/h3.cmake)
 include (cmake/find/libxml2.cmake)
 include (cmake/find/brotli.cmake)
@@ -496,9 +522,11 @@ include (cmake/find/fast_float.cmake)
 include (cmake/find/rapidjson.cmake)
 include (cmake/find/fastops.cmake)
 include (cmake/find/odbc.cmake)
+include (cmake/find/nanodbc.cmake)
 include (cmake/find/rocksdb.cmake)
 include (cmake/find/libpqxx.cmake)
 include (cmake/find/nuraft.cmake)
+include (cmake/find/yaml-cpp.cmake)
 
 
 if(NOT USE_INTERNAL_PARQUET_LIBRARY)
@@ -565,6 +593,9 @@ 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/README.md b/README.md
index ea9f365a3c6..5677837815c 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,11 @@ ClickHouse® is an open-source column-oriented database management system that a
 * [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.
 * [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-nwwakmk4-xOJ6cdy0sJC3It8j348~IA) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
+* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-qfort0u8-TWqK4wIP0YSdoDE0btKa1w) 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.
+
+## Upcoming Events
+* [SF Bay Area ClickHouse Community Meetup (online)](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/events/278144089/) on 16 June 2021.
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 46bd57eda12..023dcaaccae 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -8,6 +8,7 @@ add_subdirectory (loggers)
 add_subdirectory (pcg-random)
 add_subdirectory (widechar_width)
 add_subdirectory (readpassphrase)
+add_subdirectory (bridge)
 
 if (USE_MYSQL)
     add_subdirectory (mysqlxx)
diff --git a/base/bridge/CMakeLists.txt b/base/bridge/CMakeLists.txt
new file mode 100644
index 00000000000..bcba43e8c2e
--- /dev/null
+++ b/base/bridge/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_library (bridge
+    IBridge.cpp
+)
+
+target_include_directories (daemon PUBLIC ..)
+target_link_libraries (bridge 
+    PRIVATE 
+	daemon
+	dbms
+	Poco::Data
+	Poco::Data::ODBC
+)
+
diff --git a/base/bridge/IBridge.cpp b/base/bridge/IBridge.cpp
new file mode 100644
index 00000000000..b2ec53158b1
--- /dev/null
+++ b/base/bridge/IBridge.cpp
@@ -0,0 +1,233 @@
+#include "IBridge.h"
+
+#include <IO/ReadHelpers.h>
+#include <boost/program_options.hpp>
+#include <Poco/Net/NetException.h>
+#include <Poco/Util/HelpFormatter.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Formats/registerFormats.h>
+#include <common/logger_useful.h>
+#include <Common/SensitiveDataMasker.h>
+#include <Server/HTTP/HTTPServer.h>
+
+#if USE_ODBC
+#    include <Poco/Data/ODBC/Connector.h>
+#endif
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
+namespace
+{
+    Poco::Net::SocketAddress makeSocketAddress(const std::string & host, UInt16 port, Poco::Logger * log)
+    {
+        Poco::Net::SocketAddress socket_address;
+        try
+        {
+            socket_address = Poco::Net::SocketAddress(host, port);
+        }
+        catch (const Poco::Net::DNSException & e)
+        {
+            const auto code = e.code();
+            if (code == EAI_FAMILY
+#if defined(EAI_ADDRFAMILY)
+                || code == EAI_ADDRFAMILY
+#endif
+            )
+            {
+                LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. If it is an IPv6 address and your host has disabled IPv6, then consider to specify IPv4 address to listen in <listen_host> element of configuration file. Example: <listen_host>0.0.0.0</listen_host>", host, e.code(), e.message());
+            }
+
+            throw;
+        }
+        return socket_address;
+    }
+
+    Poco::Net::SocketAddress socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, Poco::Logger * log)
+    {
+        auto address = makeSocketAddress(host, port, log);
+#if POCO_VERSION < 0x01080000
+        socket.bind(address, /* reuseAddress = */ true);
+#else
+        socket.bind(address, /* reuseAddress = */ true, /* reusePort = */ false);
+#endif
+
+        socket.listen(/* backlog = */ 64);
+
+        return address;
+    }
+}
+
+
+void IBridge::handleHelp(const std::string &, const std::string &)
+{
+    Poco::Util::HelpFormatter help_formatter(options());
+    help_formatter.setCommand(commandName());
+    help_formatter.setHeader("HTTP-proxy for odbc requests");
+    help_formatter.setUsage("--http-port <port>");
+    help_formatter.format(std::cerr);
+
+    stopOptionsProcessing();
+}
+
+
+void IBridge::defineOptions(Poco::Util::OptionSet & options)
+{
+    options.addOption(
+        Poco::Util::Option("http-port", "", "port to listen").argument("http-port", true) .binding("http-port"));
+
+    options.addOption(
+        Poco::Util::Option("listen-host", "", "hostname or address to listen, default 127.0.0.1").argument("listen-host").binding("listen-host"));
+
+    options.addOption(
+        Poco::Util::Option("http-timeout", "", "http timeout for socket, default 1800").argument("http-timeout").binding("http-timeout"));
+
+    options.addOption(
+        Poco::Util::Option("max-server-connections", "", "max connections to server, default 1024").argument("max-server-connections").binding("max-server-connections"));
+
+    options.addOption(
+        Poco::Util::Option("keep-alive-timeout", "", "keepalive timeout, default 10").argument("keep-alive-timeout").binding("keep-alive-timeout"));
+
+    options.addOption(
+        Poco::Util::Option("log-level", "", "sets log level, default info") .argument("log-level").binding("logger.level"));
+
+    options.addOption(
+        Poco::Util::Option("log-path", "", "log path for all logs, default console").argument("log-path").binding("logger.log"));
+
+    options.addOption(
+        Poco::Util::Option("err-log-path", "", "err log path for all logs, default no").argument("err-log-path").binding("logger.errorlog"));
+
+    options.addOption(
+        Poco::Util::Option("stdout-path", "", "stdout log path, default console").argument("stdout-path").binding("logger.stdout"));
+
+    options.addOption(
+        Poco::Util::Option("stderr-path", "", "stderr log path, default console").argument("stderr-path").binding("logger.stderr"));
+
+    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)));
+
+    ServerApplication::defineOptions(options); // NOLINT Don't need complex BaseDaemon's .xml config
+}
+
+
+void IBridge::initialize(Application & self)
+{
+    BaseDaemon::closeFDs();
+    is_help = config().has("help");
+
+    if (is_help)
+        return;
+
+    config().setString("logger", bridgeName());
+
+    /// Redirect stdout, stderr to specified files.
+    /// Some libraries and sanitizers write to stderr in case of errors.
+    const auto stdout_path = config().getString("logger.stdout", "");
+    if (!stdout_path.empty())
+    {
+        if (!freopen(stdout_path.c_str(), "a+", stdout))
+            throw Poco::OpenFileException("Cannot attach stdout to " + stdout_path);
+
+        /// Disable buffering for stdout.
+        setbuf(stdout, nullptr);
+    }
+    const auto stderr_path = config().getString("logger.stderr", "");
+    if (!stderr_path.empty())
+    {
+        if (!freopen(stderr_path.c_str(), "a+", stderr))
+            throw Poco::OpenFileException("Cannot attach stderr to " + stderr_path);
+
+        /// Disable buffering for stderr.
+        setbuf(stderr, nullptr);
+    }
+
+    buildLoggers(config(), logger(), self.commandName());
+
+    BaseDaemon::logRevision();
+
+    log = &logger();
+    hostname = config().getString("listen-host", "127.0.0.1");
+    port = config().getUInt("http-port");
+    if (port > 0xFFFF)
+        throw Exception("Out of range 'http-port': " + std::to_string(port), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+
+    http_timeout = config().getUInt64("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
+    max_server_connections = config().getUInt("max-server-connections", 1024);
+    keep_alive_timeout = config().getUInt64("keep-alive-timeout", 10);
+
+    initializeTerminationAndSignalProcessing();
+
+    ServerApplication::initialize(self); // NOLINT
+}
+
+
+void IBridge::uninitialize()
+{
+    BaseDaemon::uninitialize();
+}
+
+
+int IBridge::main(const std::vector<std::string> & /*args*/)
+{
+    if (is_help)
+        return Application::EXIT_OK;
+
+    registerFormats();
+    LOG_INFO(log, "Starting up {} on host: {}, port: {}", bridgeName(), hostname, port);
+
+    Poco::Net::ServerSocket socket;
+    auto address = socketBindListen(socket, hostname, port, log);
+    socket.setReceiveTimeout(http_timeout);
+    socket.setSendTimeout(http_timeout);
+
+    Poco::ThreadPool server_pool(3, max_server_connections);
+
+    Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams;
+    http_params->setTimeout(http_timeout);
+    http_params->setKeepAliveTimeout(keep_alive_timeout);
+
+    auto shared_context = Context::createShared();
+    auto context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
+
+    if (config().has("query_masking_rules"))
+        SensitiveDataMasker::setInstance(std::make_unique<SensitiveDataMasker>(config(), "query_masking_rules"));
+
+    auto server = HTTPServer(
+        context,
+        getHandlerFactoryPtr(context),
+        server_pool,
+        socket,
+        http_params);
+
+    SCOPE_EXIT({
+        LOG_DEBUG(log, "Received termination signal.");
+        LOG_DEBUG(log, "Waiting for current connections to close.");
+
+        server.stop();
+
+        for (size_t count : ext::range(1, 6))
+        {
+            if (server.currentConnections() == 0)
+                break;
+            LOG_DEBUG(log, "Waiting for {} connections, try {}", server.currentConnections(), count);
+            std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+        }
+    });
+
+    server.start();
+    LOG_INFO(log, "Listening http://{}", address.toString());
+
+    waitForTerminationRequest();
+    return Application::EXIT_OK;
+}
+
+}
diff --git a/base/bridge/IBridge.h b/base/bridge/IBridge.h
new file mode 100644
index 00000000000..c64003d9959
--- /dev/null
+++ b/base/bridge/IBridge.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandlerFactory.h>
+#include <daemon/BaseDaemon.h>
+
+#include <Poco/Logger.h>
+#include <Poco/Util/ServerApplication.h>
+
+
+namespace DB
+{
+
+/// Class represents base for clickhouse-odbc-bridge and clickhouse-library-bridge servers.
+/// Listens to incoming HTTP POST and GET requests on specified port and host.
+/// Has two handlers '/' for all incoming POST requests and /ping for GET request about service status.
+class IBridge : public BaseDaemon
+{
+
+public:
+    /// Define command line arguments
+    void defineOptions(Poco::Util::OptionSet & options) override;
+
+protected:
+    using HandlerFactoryPtr = std::shared_ptr<HTTPRequestHandlerFactory>;
+
+    void initialize(Application & self) override;
+
+    void uninitialize() override;
+
+    int main(const std::vector<std::string> & args) override;
+
+    virtual std::string bridgeName() const = 0;
+
+    virtual HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const = 0;
+
+    size_t keep_alive_timeout;
+
+private:
+    void handleHelp(const std::string &, const std::string &);
+
+    bool is_help;
+    std::string hostname;
+    size_t port;
+    std::string log_level;
+    size_t max_server_connections;
+    size_t http_timeout;
+
+    Poco::Logger * log;
+};
+}
diff --git a/src/Common/BorrowedObjectPool.h b/base/common/BorrowedObjectPool.h
similarity index 99%
rename from src/Common/BorrowedObjectPool.h
rename to base/common/BorrowedObjectPool.h
index d5263cf92a8..6a90a7e7122 100644
--- a/src/Common/BorrowedObjectPool.h
+++ b/base/common/BorrowedObjectPool.h
@@ -7,8 +7,7 @@
 #include <condition_variable>
 
 #include <common/defines.h>
-
-#include <Common/MoveOrCopyIfThrow.h>
+#include <common/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
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index 7dfb9bc10c0..e5e18669ebe 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/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/common/iostream_debug_helpers.h\"")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
 endif ()
 
@@ -45,7 +45,7 @@ if (USE_INTERNAL_CCTZ)
     set_source_files_properties(DateLUTImpl.cpp PROPERTIES COMPILE_DEFINITIONS USE_INTERNAL_CCTZ)
 endif()
 
-target_include_directories(common PUBLIC .. ${CMAKE_CURRENT_BINARY_DIR}/..)
+target_include_directories(common PUBLIC .. "${CMAKE_CURRENT_BINARY_DIR}/..")
 
 if (OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES)
     target_link_libraries(common PUBLIC -Wl,-U,_inside_main)
diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h
index 363f281584e..9e60181e802 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/common/DateLUTImpl.h
@@ -25,7 +25,7 @@
 
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #endif
@@ -1266,7 +1266,7 @@ public:
 };
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/base/common/DecomposedFloat.h b/base/common/DecomposedFloat.h
new file mode 100644
index 00000000000..078ba823c15
--- /dev/null
+++ b/base/common/DecomposedFloat.h
@@ -0,0 +1,216 @@
+#pragma once
+
+#include <cstdint>
+#include <cstddef>
+#include <cstring>
+#include <common/extended_types.h>
+
+
+/// Allows to check the internals of IEEE-754 floating point number.
+
+template <typename T> struct FloatTraits;
+
+template <>
+struct FloatTraits<float>
+{
+    using UInt = uint32_t;
+    static constexpr size_t bits = 32;
+    static constexpr size_t exponent_bits = 8;
+    static constexpr size_t mantissa_bits = bits - exponent_bits - 1;
+};
+
+template <>
+struct FloatTraits<double>
+{
+    using UInt = uint64_t;
+    static constexpr size_t bits = 64;
+    static constexpr size_t exponent_bits = 11;
+    static constexpr size_t mantissa_bits = bits - exponent_bits - 1;
+};
+
+
+/// x = sign * (2 ^ normalized_exponent) * (1 + mantissa * 2 ^ -mantissa_bits)
+/// x = sign * (2 ^ normalized_exponent + mantissa * 2 ^ (normalized_exponent - mantissa_bits))
+template <typename T>
+struct DecomposedFloat
+{
+    using Traits = FloatTraits<T>;
+
+    DecomposedFloat(T x)
+    {
+        memcpy(&x_uint, &x, sizeof(x));
+    }
+
+    typename Traits::UInt x_uint;
+
+    bool is_negative() const
+    {
+        return x_uint >> (Traits::bits - 1);
+    }
+
+    /// Returns 0 for both +0. and -0.
+    int sign() const
+    {
+        return (exponent() == 0 && mantissa() == 0)
+            ? 0
+            : (is_negative()
+                ? -1
+                : 1);
+    }
+
+    uint16_t exponent() const
+    {
+        return (x_uint >> (Traits::mantissa_bits)) & (((1ull << (Traits::exponent_bits + 1)) - 1) >> 1);
+    }
+
+    int16_t normalized_exponent() const
+    {
+        return int16_t(exponent()) - ((1ull << (Traits::exponent_bits - 1)) - 1);
+    }
+
+    uint64_t mantissa() const
+    {
+        return x_uint & ((1ull << Traits::mantissa_bits) - 1);
+    }
+
+    int64_t mantissa_with_sign() const
+    {
+        return is_negative() ? -mantissa() : mantissa();
+    }
+
+    /// NOTE Probably floating point instructions can be better.
+    bool is_integer_in_representable_range() const
+    {
+        return x_uint == 0
+            || (normalized_exponent() >= 0  /// The number is not less than one
+                /// The number is inside the range where every integer has exact representation in float
+                && normalized_exponent() <= static_cast<int16_t>(Traits::mantissa_bits)
+                /// After multiplying by 2^exp, the fractional part becomes zero, means the number is integer
+                && ((mantissa() & ((1ULL << (Traits::mantissa_bits - normalized_exponent())) - 1)) == 0));
+    }
+
+
+    /// Compare float with integer of arbitrary width (both signed and unsigned are supported). Assuming two's complement arithmetic.
+    /// Infinities are compared correctly. NaNs are treat similarly to infinities, so they can be less than all numbers.
+    /// (note that we need total order)
+    template <typename Int>
+    int compare(Int rhs)
+    {
+        if (rhs == 0)
+            return sign();
+
+        /// Different signs
+        if (is_negative() && rhs > 0)
+            return -1;
+        if (!is_negative() && rhs < 0)
+            return 1;
+
+        /// Fractional number with magnitude less than one
+        if (normalized_exponent() < 0)
+        {
+            if (!is_negative())
+                return rhs > 0 ? -1 : 1;
+            else
+                return rhs >= 0 ? -1 : 1;
+        }
+
+        /// The case of the most negative integer
+        if constexpr (is_signed_v<Int>)
+        {
+            if (rhs == std::numeric_limits<Int>::lowest())
+            {
+                assert(is_negative());
+
+                if (normalized_exponent() < static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>))
+                    return 1;
+                if (normalized_exponent() > static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>))
+                    return -1;
+
+                if (mantissa() == 0)
+                    return 0;
+                else
+                    return -1;
+            }
+        }
+
+        /// Too large number: abs(float) > abs(rhs). Also the case with infinities and NaN.
+        if (normalized_exponent() >= static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>))
+            return is_negative() ? -1 : 1;
+
+        using UInt = make_unsigned_t<Int>;
+        UInt uint_rhs = rhs < 0 ? -rhs : rhs;
+
+        /// Smaller octave: abs(rhs) < abs(float)
+        if (uint_rhs < (static_cast<UInt>(1) << normalized_exponent()))
+            return is_negative() ? -1 : 1;
+
+        /// Larger octave: abs(rhs) > abs(float)
+        if (normalized_exponent() + 1 < static_cast<int16_t>(8 * sizeof(Int) - is_signed_v<Int>)
+            && uint_rhs >= (static_cast<UInt>(1) << (normalized_exponent() + 1)))
+            return is_negative() ? 1 : -1;
+
+        /// The same octave
+        /// uint_rhs == 2 ^ normalized_exponent + mantissa * 2 ^ (normalized_exponent - mantissa_bits)
+
+        bool large_and_always_integer = normalized_exponent() >= static_cast<int16_t>(Traits::mantissa_bits);
+
+        typename Traits::UInt a = large_and_always_integer
+            ? mantissa() << (normalized_exponent() - Traits::mantissa_bits)
+            : mantissa() >> (Traits::mantissa_bits - normalized_exponent());
+
+        typename Traits::UInt b = uint_rhs - (static_cast<UInt>(1) << normalized_exponent());
+
+        if (a < b)
+            return is_negative() ? 1 : -1;
+        if (a > b)
+            return is_negative() ? -1 : 1;
+
+        /// Float has no fractional part means that the numbers are equal.
+        if (large_and_always_integer || (mantissa() & ((1ULL << (Traits::mantissa_bits - normalized_exponent())) - 1)) == 0)
+            return 0;
+        else
+            /// Float has fractional part means its abs value is larger.
+            return is_negative() ? -1 : 1;
+    }
+
+
+    template <typename Int>
+    bool equals(Int rhs)
+    {
+        return compare(rhs) == 0;
+    }
+
+    template <typename Int>
+    bool notEquals(Int rhs)
+    {
+        return compare(rhs) != 0;
+    }
+
+    template <typename Int>
+    bool less(Int rhs)
+    {
+        return compare(rhs) < 0;
+    }
+
+    template <typename Int>
+    bool greater(Int rhs)
+    {
+        return compare(rhs) > 0;
+    }
+
+    template <typename Int>
+    bool lessOrEquals(Int rhs)
+    {
+        return compare(rhs) <= 0;
+    }
+
+    template <typename Int>
+    bool greaterOrEquals(Int rhs)
+    {
+        return compare(rhs) >= 0;
+    }
+};
+
+
+using DecomposedFloat64 = DecomposedFloat<double>;
+using DecomposedFloat32 = DecomposedFloat<float>;
diff --git a/src/Common/MoveOrCopyIfThrow.h b/base/common/MoveOrCopyIfThrow.h
similarity index 100%
rename from src/Common/MoveOrCopyIfThrow.h
rename to base/common/MoveOrCopyIfThrow.h
diff --git a/base/common/ReplxxLineReader.cpp b/base/common/ReplxxLineReader.cpp
index fcd1610e589..7893e56d751 100644
--- a/base/common/ReplxxLineReader.cpp
+++ b/base/common/ReplxxLineReader.cpp
@@ -91,6 +91,10 @@ ReplxxLineReader::ReplxxLineReader(
     /// it also binded to M-p/M-n).
     rx.bind_key(Replxx::KEY::meta('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_NEXT, code); });
     rx.bind_key(Replxx::KEY::meta('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMPLETE_PREVIOUS, code); });
+    /// By default M-BACKSPACE is KILL_TO_WHITESPACE_ON_LEFT, while in readline it is backward-kill-word
+    rx.bind_key(Replxx::KEY::meta(Replxx::KEY::BACKSPACE), [this](char32_t code) { return rx.invoke(Replxx::ACTION::KILL_TO_BEGINING_OF_WORD, code); });
+    /// By default C-w is KILL_TO_BEGINING_OF_WORD, while in readline it is unix-word-rubout
+    rx.bind_key(Replxx::KEY::control('W'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::KILL_TO_WHITESPACE_ON_LEFT, code); });
 
     rx.bind_key(Replxx::KEY::meta('E'), [this](char32_t) { openEditor(); return Replxx::ACTION_RESULT::CONTINUE; });
 }
diff --git a/base/common/arithmeticOverflow.h b/base/common/arithmeticOverflow.h
index c170d214636..175e75a62f4 100644
--- a/base/common/arithmeticOverflow.h
+++ b/base/common/arithmeticOverflow.h
@@ -56,27 +56,33 @@ namespace common
     }
 
     template <>
-    inline bool addOverflow(__int128 x, __int128 y, __int128 & res)
+    inline bool addOverflow(Int128 x, Int128 y, Int128 & res)
     {
-        static constexpr __int128 min_int128 = minInt128();
-        static constexpr __int128 max_int128 = maxInt128();
         res = addIgnoreOverflow(x, y);
-        return (y > 0 && x > max_int128 - y) || (y < 0 && x < min_int128 - y);
+        return (y > 0 && x > std::numeric_limits<Int128>::max() - y) ||
+            (y < 0 && x < std::numeric_limits<Int128>::min() - y);
     }
 
     template <>
-    inline bool addOverflow(wInt256 x, wInt256 y, wInt256 & res)
+    inline bool addOverflow(UInt128 x, UInt128 y, UInt128 & res)
     {
         res = addIgnoreOverflow(x, y);
-        return (y > 0 && x > std::numeric_limits<wInt256>::max() - y) ||
-            (y < 0 && x < std::numeric_limits<wInt256>::min() - y);
+        return x > std::numeric_limits<UInt128>::max() - y;
     }
 
     template <>
-    inline bool addOverflow(wUInt256 x, wUInt256 y, wUInt256 & res)
+    inline bool addOverflow(Int256 x, Int256 y, Int256 & res)
     {
         res = addIgnoreOverflow(x, y);
-        return x > std::numeric_limits<wUInt256>::max() - y;
+        return (y > 0 && x > std::numeric_limits<Int256>::max() - y) ||
+            (y < 0 && x < std::numeric_limits<Int256>::min() - y);
+    }
+
+    template <>
+    inline bool addOverflow(UInt256 x, UInt256 y, UInt256 & res)
+    {
+        res = addIgnoreOverflow(x, y);
+        return x > std::numeric_limits<UInt256>::max() - y;
     }
 
     template <typename T>
@@ -104,24 +110,30 @@ namespace common
     }
 
     template <>
-    inline bool subOverflow(__int128 x, __int128 y, __int128 & res)
+    inline bool subOverflow(Int128 x, Int128 y, Int128 & res)
     {
-        static constexpr __int128 min_int128 = minInt128();
-        static constexpr __int128 max_int128 = maxInt128();
         res = subIgnoreOverflow(x, y);
-        return (y < 0 && x > max_int128 + y) || (y > 0 && x < min_int128 + y);
+        return (y < 0 && x > std::numeric_limits<Int128>::max() + y) ||
+            (y > 0 && x < std::numeric_limits<Int128>::min() + y);
     }
 
     template <>
-    inline bool subOverflow(wInt256 x, wInt256 y, wInt256 & res)
+    inline bool subOverflow(UInt128 x, UInt128 y, UInt128 & res)
     {
         res = subIgnoreOverflow(x, y);
-        return (y < 0 && x > std::numeric_limits<wInt256>::max() + y) ||
-            (y > 0 && x < std::numeric_limits<wInt256>::min() + y);
+        return x < y;
     }
 
     template <>
-    inline bool subOverflow(wUInt256 x, wUInt256 y, wUInt256 & res)
+    inline bool subOverflow(Int256 x, Int256 y, Int256 & res)
+    {
+        res = subIgnoreOverflow(x, y);
+        return (y < 0 && x > std::numeric_limits<Int256>::max() + y) ||
+            (y > 0 && x < std::numeric_limits<Int256>::min() + y);
+    }
+
+    template <>
+    inline bool subOverflow(UInt256 x, UInt256 y, UInt256 & res)
     {
         res = subIgnoreOverflow(x, y);
         return x < y;
@@ -151,36 +163,33 @@ namespace common
         return __builtin_smulll_overflow(x, y, &res);
     }
 
+    /// Overflow check is not implemented for big integers.
+
     template <>
-    inline bool mulOverflow(__int128 x, __int128 y, __int128 & res)
+    inline bool mulOverflow(Int128 x, Int128 y, Int128 & res)
     {
         res = mulIgnoreOverflow(x, y);
-        if (!x || !y)
-            return false;
-
-        unsigned __int128 a = (x > 0) ? x : -x;
-        unsigned __int128 b = (y > 0) ? y : -y;
-        return mulIgnoreOverflow(a, b) / b != a;
+        return false;
     }
 
     template <>
-    inline bool mulOverflow(wInt256 x, wInt256 y, wInt256 & res)
+    inline bool mulOverflow(Int256 x, Int256 y, Int256 & res)
     {
         res = mulIgnoreOverflow(x, y);
-        if (!x || !y)
-            return false;
-
-        wInt256 a = (x > 0) ? x : -x;
-        wInt256 b = (y > 0) ? y : -y;
-        return mulIgnoreOverflow(a, b) / b != a;
+        return false;
     }
 
     template <>
-    inline bool mulOverflow(wUInt256 x, wUInt256 y, wUInt256 & res)
+    inline bool mulOverflow(UInt128 x, UInt128 y, UInt128 & res)
     {
         res = mulIgnoreOverflow(x, y);
-        if (!x || !y)
-            return false;
-        return res / y != x;
+        return false;
+    }
+
+    template <>
+    inline bool mulOverflow(UInt256 x, UInt256 y, UInt256 & res)
+    {
+        res = mulIgnoreOverflow(x, y);
+        return false;
     }
 }
diff --git a/base/common/extended_types.h b/base/common/extended_types.h
index 2ae70c0f432..79209568ef5 100644
--- a/base/common/extended_types.h
+++ b/base/common/extended_types.h
@@ -5,16 +5,14 @@
 #include <common/types.h>
 #include <common/wide_integer.h>
 
-using Int128 = __int128;
 
-using wInt256 = wide::integer<256, signed>;
-using wUInt256 = wide::integer<256, unsigned>;
+using Int128 = wide::integer<128, signed>;
+using UInt128 = wide::integer<128, unsigned>;
+using Int256 = wide::integer<256, signed>;
+using UInt256 = wide::integer<256, unsigned>;
 
-static_assert(sizeof(wInt256) == 32);
-static_assert(sizeof(wUInt256) == 32);
-
-static constexpr __int128 minInt128() { return static_cast<unsigned __int128>(1) << 127; }
-static constexpr __int128 maxInt128() { return (static_cast<unsigned __int128>(1) << 127) - 1; }
+static_assert(sizeof(Int256) == 32);
+static_assert(sizeof(UInt256) == 32);
 
 /// The standard library type traits, such as std::is_arithmetic, with one exception
 /// (std::common_type), are "set in stone". Attempting to specialize them causes undefined behavior.
@@ -26,7 +24,7 @@ struct is_signed
 };
 
 template <> struct is_signed<Int128> { static constexpr bool value = true; };
-template <> struct is_signed<wInt256> { static constexpr bool value = true; };
+template <> struct is_signed<Int256> { static constexpr bool value = true; };
 
 template <typename T>
 inline constexpr bool is_signed_v = is_signed<T>::value;
@@ -37,7 +35,8 @@ struct is_unsigned
     static constexpr bool value = std::is_unsigned_v<T>;
 };
 
-template <> struct is_unsigned<wUInt256> { static constexpr bool value = true; };
+template <> struct is_unsigned<UInt128> { static constexpr bool value = true; };
+template <> struct is_unsigned<UInt256> { static constexpr bool value = true; };
 
 template <typename T>
 inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
@@ -51,8 +50,9 @@ struct is_integer
 };
 
 template <> struct is_integer<Int128> { static constexpr bool value = true; };
-template <> struct is_integer<wInt256> { static constexpr bool value = true; };
-template <> struct is_integer<wUInt256> { 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;
@@ -64,7 +64,11 @@ struct is_arithmetic
     static constexpr bool value = std::is_arithmetic_v<T>;
 };
 
-template <> struct is_arithmetic<__int128> { static constexpr bool value = true; };
+template <> struct is_arithmetic<Int128> { static constexpr bool value = true; };
+template <> struct is_arithmetic<UInt128> { static constexpr bool value = true; };
+template <> struct is_arithmetic<Int256> { static constexpr bool value = true; };
+template <> struct is_arithmetic<UInt256> { static constexpr bool value = true; };
+
 
 template <typename T>
 inline constexpr bool is_arithmetic_v = is_arithmetic<T>::value;
@@ -75,9 +79,10 @@ struct make_unsigned
     typedef std::make_unsigned_t<T> type;
 };
 
-template <> struct make_unsigned<Int128> { using type = unsigned __int128; };
-template <> struct make_unsigned<wInt256>  { using type = wUInt256; };
-template <> struct make_unsigned<wUInt256> { using type = wUInt256; };
+template <> struct make_unsigned<Int128> { using type = UInt128; };
+template <> struct make_unsigned<UInt128> { using type = UInt128; };
+template <> struct make_unsigned<Int256>  { using type = UInt256; };
+template <> struct make_unsigned<UInt256> { using type = UInt256; };
 
 template <typename T> using make_unsigned_t = typename make_unsigned<T>::type;
 
@@ -87,8 +92,10 @@ struct make_signed
     typedef std::make_signed_t<T> type;
 };
 
-template <> struct make_signed<wInt256>  { using type = wInt256; };
-template <> struct make_signed<wUInt256> { using type = wInt256; };
+template <> struct make_signed<Int128>  { using type = Int128; };
+template <> struct make_signed<UInt128> { using type = Int128; };
+template <> struct make_signed<Int256>  { using type = Int256; };
+template <> struct make_signed<UInt256> { using type = Int256; };
 
 template <typename T> using make_signed_t = typename make_signed<T>::type;
 
@@ -98,8 +105,10 @@ struct is_big_int
     static constexpr bool value = false;
 };
 
-template <> struct is_big_int<wInt256> { static constexpr bool value = true; };
-template <> struct is_big_int<wUInt256> { static constexpr bool value = true; };
+template <> struct is_big_int<Int128> { static constexpr bool value = true; };
+template <> struct is_big_int<UInt128> { static constexpr bool value = true; };
+template <> struct is_big_int<Int256> { static constexpr bool value = true; };
+template <> struct is_big_int<UInt256> { static constexpr bool value = true; };
 
 template <typename T>
 inline constexpr bool is_big_int_v = is_big_int<T>::value;
diff --git a/base/common/getThreadId.cpp b/base/common/getThreadId.cpp
index 700c51f21fc..054e9be9074 100644
--- a/base/common/getThreadId.cpp
+++ b/base/common/getThreadId.cpp
@@ -25,6 +25,10 @@ uint64_t getThreadId()
         current_tid = syscall(SYS_gettid); /// This call is always successful. - man gettid
 #elif defined(OS_FREEBSD)
         current_tid = pthread_getthreadid_np();
+#elif defined(OS_SUNOS)
+        // On Solaris-derived systems, this returns the ID of the LWP, analogous
+        // to a thread.
+        current_tid = static_cast<uint64_t>(pthread_self());
 #else
         if (0 != pthread_threadid_np(nullptr, &current_tid))
             throw std::logic_error("pthread_threadid_np returned error");
diff --git a/base/common/itoa.h b/base/common/itoa.h
index a02e7b68c05..4c86239de36 100644
--- a/base/common/itoa.h
+++ b/base/common/itoa.h
@@ -30,9 +30,8 @@
 #include <cstddef>
 #include <cstring>
 #include <type_traits>
+#include <common/extended_types.h>
 
-using int128_t = __int128;
-using uint128_t = unsigned __int128;
 
 namespace impl
 {
@@ -106,7 +105,7 @@ using UnsignedOfSize = typename SelectType
     uint16_t,
     uint32_t,
     uint64_t,
-    uint128_t
+    __uint128_t
 >::Result;
 
 /// Holds the result of dividing an unsigned N-byte variable by 10^N resulting in
@@ -313,7 +312,8 @@ namespace convert
     }
 }
 
-static inline int digits10(uint128_t x)
+template <typename T>
+static inline int digits10(T x)
 {
     if (x < 10ULL)
         return 1;
@@ -346,8 +346,11 @@ static inline int digits10(uint128_t x)
     return 12 + digits10(x / 1000000000000ULL);
 }
 
-static inline char * writeUIntText(uint128_t x, char * p)
+template <typename T>
+static inline char * writeUIntText(T x, char * p)
 {
+    static_assert(is_unsigned_v<T>);
+
     int len = digits10(x);
     auto pp = p + len;
     while (x >= 100)
@@ -370,14 +373,28 @@ static inline char * writeLeadingMinus(char * pos)
     return pos + 1;
 }
 
-static inline char * writeSIntText(int128_t x, char * pos)
+template <typename T>
+static inline char * writeSIntText(T x, char * pos)
 {
-    static constexpr int128_t min_int128 = uint128_t(1) << 127;
+    static_assert(std::is_same_v<T, Int128> || std::is_same_v<T, Int256>);
 
-    if (unlikely(x == min_int128))
+    using UnsignedT = make_unsigned_t<T>;
+    static constexpr T min_int = UnsignedT(1) << (sizeof(T) * 8 - 1);
+
+    if (unlikely(x == min_int))
     {
-        memcpy(pos, "-170141183460469231731687303715884105728", 40);
-        return pos + 40;
+        if constexpr (std::is_same_v<T, Int128>)
+        {
+            const char * res = "-170141183460469231731687303715884105728";
+            memcpy(pos, res, strlen(res));
+            return pos + strlen(res);
+        }
+        else if constexpr (std::is_same_v<T, Int256>)
+        {
+            const char * res = "-57896044618658097711785492504343953926634992332820282019728792003956564819968";
+            memcpy(pos, res, strlen(res));
+            return pos + strlen(res);
+        }
     }
 
     if (x < 0)
@@ -385,7 +402,7 @@ static inline char * writeSIntText(int128_t x, char * pos)
         x = -x;
         pos = writeLeadingMinus(pos);
     }
-    return writeUIntText(static_cast<uint128_t>(x), pos);
+    return writeUIntText(UnsignedT(x), pos);
 }
 
 }
@@ -403,13 +420,25 @@ inline char * itoa(char8_t i, char * p)
 }
 
 template <>
-inline char * itoa<uint128_t>(uint128_t i, char * p)
+inline char * itoa(UInt128 i, char * p)
 {
     return impl::writeUIntText(i, p);
 }
 
 template <>
-inline char * itoa<int128_t>(int128_t i, char * p)
+inline char * itoa(Int128 i, char * p)
+{
+    return impl::writeSIntText(i, p);
+}
+
+template <>
+inline char * itoa(UInt256 i, char * p)
+{
+    return impl::writeUIntText(i, p);
+}
+
+template <>
+inline char * itoa(Int256 i, char * p)
 {
     return impl::writeSIntText(i, p);
 }
diff --git a/base/common/strong_typedef.h b/base/common/strong_typedef.h
index 77b83bfa6e5..a1e2b253aa7 100644
--- a/base/common/strong_typedef.h
+++ b/base/common/strong_typedef.h
@@ -4,7 +4,8 @@
 #include <type_traits>
 #include <utility>
 
-template <class T, class Tag>
+
+template <typename T, typename Tag>
 struct StrongTypedef
 {
 private:
@@ -38,14 +39,16 @@ public:
 
     bool operator==(const Self & rhs) const { return t == rhs.t; }
     bool operator<(const Self & rhs) const { return t < rhs.t; }
+    bool operator>(const Self & rhs) const { return t > rhs.t; }
 
     T & toUnderType() { return t; }
     const T & toUnderType() const { return t; }
 };
 
+
 namespace std
 {
-    template <class T, class Tag>
+    template <typename T, typename Tag>
     struct hash<StrongTypedef<T, Tag>>
     {
         size_t operator()(const StrongTypedef<T, Tag> & x) const
diff --git a/base/common/throwError.h b/base/common/throwError.h
index b495a0fbc7a..dd352913e78 100644
--- a/base/common/throwError.h
+++ b/base/common/throwError.h
@@ -1,13 +1,15 @@
 #pragma once
+
 #include <stdexcept>
 
+
 /// Throw DB::Exception-like exception before its definition.
 /// DB::Exception derived from Poco::Exception derived from std::exception.
-/// DB::Exception generally cought as Poco::Exception. std::exception generally has other catch blocks and could lead to other outcomes.
+/// DB::Exception generally caught as Poco::Exception. std::exception generally has other catch blocks and could lead to other outcomes.
 /// DB::Exception is not defined yet. It'd better to throw Poco::Exception but we do not want to include any big header here, even <string>.
 /// So we throw some std::exception instead in the hope its catch block is the same as DB::Exception one.
 template <typename T>
-inline void throwError(const T & err)
+[[noreturn]] inline void throwError(const T & err)
 {
     throw std::runtime_error(err);
 }
diff --git a/base/common/time.h b/base/common/time.h
index 1bf588b7cb3..d0b8e94a9a5 100644
--- a/base/common/time.h
+++ b/base/common/time.h
@@ -2,7 +2,7 @@
 
 #include <time.h>
 
-#if defined (OS_DARWIN)
+#if defined (OS_DARWIN) || defined (OS_SUNOS)
 #    define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC
 #elif defined (OS_FREEBSD)
 #    define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_FAST
diff --git a/base/common/types.h b/base/common/types.h
index bd5c28fe73b..e178653f7c6 100644
--- a/base/common/types.h
+++ b/base/common/types.h
@@ -13,7 +13,12 @@ using char8_t = unsigned char;
 #endif
 
 /// This is needed for more strict aliasing. https://godbolt.org/z/xpJBSb https://stackoverflow.com/a/57453713
+#if !defined(PVS_STUDIO) /// But PVS-Studio does not treat it correctly.
 using UInt8 = char8_t;
+#else
+using UInt8 = uint8_t;
+#endif
+
 using UInt16 = uint16_t;
 using UInt32 = uint32_t;
 using UInt64 = uint64_t;
diff --git a/base/common/wide_integer.h b/base/common/wide_integer.h
index c9d1eaa32aa..419b4e4558c 100644
--- a/base/common/wide_integer.h
+++ b/base/common/wide_integer.h
@@ -58,9 +58,11 @@ public:
     using signed_base_type = int64_t;
 
     // ctors
-    constexpr integer() noexcept;
+    constexpr integer() noexcept = default;
+
     template <typename T>
     constexpr integer(T rhs) noexcept;
+
     template <typename T>
     constexpr integer(std::initializer_list<T> il) noexcept;
 
@@ -108,9 +110,9 @@ public:
     constexpr explicit operator bool() const noexcept;
 
     template <class T>
-    using __integral_not_wide_integer_class = typename std::enable_if<std::is_arithmetic<T>::value, T>::type;
+    using _integral_not_wide_integer_class = typename std::enable_if<std::is_arithmetic<T>::value, T>::type;
 
-    template <class T, class = __integral_not_wide_integer_class<T>>
+    template <class T, class = _integral_not_wide_integer_class<T>>
     constexpr operator T() const noexcept;
 
     constexpr operator long double() const noexcept;
@@ -119,25 +121,27 @@ public:
 
     struct _impl;
 
+    base_type items[_impl::item_count];
+
 private:
     template <size_t Bits2, typename Signed2>
     friend class integer;
 
     friend class std::numeric_limits<integer<Bits, signed>>;
     friend class std::numeric_limits<integer<Bits, unsigned>>;
-
-    base_type items[_impl::item_count];
 };
 
 template <typename T>
 static constexpr bool ArithmeticConcept() noexcept;
+
 template <class T1, class T2>
-using __only_arithmetic = typename std::enable_if<ArithmeticConcept<T1>() && ArithmeticConcept<T2>()>::type;
+using _only_arithmetic = typename std::enable_if<ArithmeticConcept<T1>() && ArithmeticConcept<T2>()>::type;
 
 template <typename T>
 static constexpr bool IntegralConcept() noexcept;
+
 template <class T, class T2>
-using __only_integer = typename std::enable_if<IntegralConcept<T>() && IntegralConcept<T2>()>::type;
+using _only_integer = typename std::enable_if<IntegralConcept<T>() && IntegralConcept<T2>()>::type;
 
 // Unary operators
 template <size_t Bits, typename Signed>
@@ -153,54 +157,55 @@ constexpr integer<Bits, Signed> operator+(const integer<Bits, Signed> & lhs) noe
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator*(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator*(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator/(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator/(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator+(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator+(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator-(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 std::common_type_t<Arithmetic, Arithmetic2> constexpr operator-(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator%(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator%(const Integral & rhs, const Integral2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator&(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator&(const Integral & rhs, const Integral2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator|(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator|(const Integral & rhs, const Integral2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>> constexpr
 operator^(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Integral, typename Integral2, class = __only_integer<Integral, Integral2>>
+template <typename Integral, typename Integral2, class = _only_integer<Integral, Integral2>>
 std::common_type_t<Integral, Integral2> constexpr operator^(const Integral & rhs, const Integral2 & lhs);
 
 // TODO: Integral
 template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator<<(const integer<Bits, Signed> & lhs, int n) noexcept;
+
 template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, int n) noexcept;
 
@@ -217,32 +222,32 @@ constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, In
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator<(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator<(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator>(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator<=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator<=(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator>=(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator==(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator==(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator!=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs);
-template <typename Arithmetic, typename Arithmetic2, class = __only_arithmetic<Arithmetic, Arithmetic2>>
+template <typename Arithmetic, typename Arithmetic2, class = _only_arithmetic<Arithmetic, Arithmetic2>>
 constexpr bool operator!=(const Arithmetic & rhs, const Arithmetic2 & lhs);
 
 }
diff --git a/base/common/wide_integer_impl.h b/base/common/wide_integer_impl.h
index 5b981326e25..725caec6a3e 100644
--- a/base/common/wide_integer_impl.h
+++ b/base/common/wide_integer_impl.h
@@ -5,6 +5,7 @@
 /// (See at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "throwError.h"
+
 #include <cmath>
 #include <cfloat>
 #include <cassert>
@@ -81,7 +82,7 @@ public:
             res.items[T::_impl::big(0)] = std::numeric_limits<typename wide::integer<Bits, Signed>::signed_base_type>::min();
             return res;
         }
-        return 0;
+        return wide::integer<Bits, Signed>(0);
     }
 
     static constexpr wide::integer<Bits, Signed> max() noexcept
@@ -176,7 +177,7 @@ struct integer<Bits, Signed>::_impl
     constexpr static bool is_negative(const integer<B, T> & n) noexcept
     {
         if constexpr (std::is_same_v<T, signed>)
-            return static_cast<signed_base_type>(n.items[big(0)]) < 0;
+            return static_cast<signed_base_type>(n.items[integer<B, T>::_impl::big(0)]) < 0;
         else
             return false;
     }
@@ -193,40 +194,36 @@ struct integer<Bits, Signed>::_impl
     template <size_t B, class S>
     constexpr static integer<B, S> make_positive(const integer<B, S> & n) noexcept
     {
-        return is_negative(n) ? operator_unary_minus(n) : n;
+        return is_negative(n) ? integer<B, S>(operator_unary_minus(n)) : n;
     }
 
     template <typename T>
     __attribute__((no_sanitize("undefined"))) constexpr static auto to_Integral(T f) noexcept
     {
-        if constexpr (std::is_same_v<T, __int128>)
-            return f;
-        else if constexpr (std::is_signed_v<T>)
+        if constexpr (std::is_signed_v<T>)
             return static_cast<int64_t>(f);
         else
             return static_cast<uint64_t>(f);
     }
 
     template <typename Integral>
-    constexpr static void wide_integer_from_bultin(integer<Bits, Signed> & self, Integral rhs) noexcept
+    constexpr static void wide_integer_from_builtin(integer<Bits, Signed> & self, Integral rhs) noexcept
     {
-        self.items[0] = _impl::to_Integral(rhs);
-        if constexpr (std::is_same_v<Integral, __int128>)
-            self.items[1] = rhs >> base_bits;
+        static_assert(sizeof(Integral) <= sizeof(base_type));
 
-        constexpr const unsigned start = (sizeof(Integral) == 16) ? 2 : 1;
+        self.items[0] = _impl::to_Integral(rhs);
 
         if constexpr (std::is_signed_v<Integral>)
         {
             if (rhs < 0)
             {
-                for (unsigned i = start; i < item_count; ++i)
+                for (size_t i = 1; i < item_count; ++i)
                     self.items[i] = -1;
                 return;
             }
         }
 
-        for (unsigned i = start; i < item_count; ++i)
+        for (size_t i = 1; i < item_count; ++i)
             self.items[i] = 0;
     }
 
@@ -239,7 +236,8 @@ struct integer<Bits, Signed>::_impl
      * a_(n - 1) = a_n * max_int + b2, a_n <= max_int <- base case.
      */
     template <class T>
-    constexpr static void set_multiplier(integer<Bits, Signed> & self, T t) noexcept {
+    constexpr static void set_multiplier(integer<Bits, Signed> & self, T t) noexcept
+    {
         constexpr uint64_t max_int = std::numeric_limits<uint64_t>::max();
 
         /// Implementation specific behaviour on overflow (if we don't check here, stack overflow will triggered in bigint_cast).
@@ -260,7 +258,8 @@ struct integer<Bits, Signed>::_impl
         self += static_cast<uint64_t>(t - alpha * static_cast<T>(max_int)); // += b_i
     }
 
-    constexpr static void wide_integer_from_bultin(integer<Bits, Signed>& self, double rhs) noexcept {
+    constexpr static void wide_integer_from_builtin(integer<Bits, Signed>& self, double rhs) noexcept
+    {
         constexpr int64_t max_int = std::numeric_limits<int64_t>::max();
         constexpr int64_t min_int = std::numeric_limits<int64_t>::min();
 
@@ -271,9 +270,13 @@ struct integer<Bits, Signed>::_impl
         /// As to_Integral does a static_cast to int64_t, it may result in UB.
         /// The necessary check here is that long double has enough significant (mantissa) bits to store the
         /// int64_t max value precisely.
+
+        //TODO Be compatible with Apple aarch64
+#if not (defined(__APPLE__) && defined(__aarch64__))
         static_assert(LDBL_MANT_DIG >= 64,
             "On your system long double has less than 64 precision bits,"
             "which may result in UB when initializing double from int64_t");
+#endif
 
         if ((rhs > 0 && rhs < static_cast<long double>(max_int)) || (rhs < 0 && rhs > static_cast<long double>(min_int)))
         {
@@ -379,13 +382,13 @@ struct integer<Bits, Signed>::_impl
             if (bit_shift)
                 lhs.items[big(items_shift)] |= std::numeric_limits<base_type>::max() << (base_bits - bit_shift);
 
-            for (unsigned i = item_count - items_shift; i < items_shift; ++i)
-                lhs.items[little(i)] = std::numeric_limits<base_type>::max();
+            for (unsigned i = 0; i < items_shift; ++i)
+                lhs.items[big(i)] = std::numeric_limits<base_type>::max();
         }
         else
         {
-            for (unsigned i = item_count - items_shift; i < items_shift; ++i)
-                lhs.items[little(i)] = 0;
+            for (unsigned i = 0; i < items_shift; ++i)
+                lhs.items[big(i)] = 0;
         }
 
         return lhs;
@@ -393,23 +396,23 @@ struct integer<Bits, Signed>::_impl
 
 private:
     template <typename T>
-    constexpr static base_type get_item(const T & x, unsigned number)
+    constexpr static base_type get_item(const T & x, unsigned idx)
     {
         if constexpr (IsWideInteger<T>::value)
         {
-            if (number < T::_impl::item_count)
-                return x.items[number];
+            if (idx < T::_impl::item_count)
+                return x.items[idx];
             return 0;
         }
         else
         {
             if constexpr (sizeof(T) <= sizeof(base_type))
             {
-                if (!number)
+                if (0 == idx)
                     return x;
             }
-            else if (number * sizeof(base_type) < sizeof(T))
-                return x >> (number * base_bits); // & std::numeric_limits<base_type>::max()
+            else if (idx * sizeof(base_type) < sizeof(T))
+                return x >> (idx * base_bits); // & std::numeric_limits<base_type>::max()
             return 0;
         }
     }
@@ -435,7 +438,7 @@ private:
 
         for (unsigned i = 1; i < item_count; ++i)
         {
-            if (underflows[i-1])
+            if (underflows[i - 1])
             {
                 base_type & res_item = res.items[little(i)];
                 if (res_item == 0)
@@ -468,7 +471,7 @@ private:
 
         for (unsigned i = 1; i < item_count; ++i)
         {
-            if (overflows[i-1])
+            if (overflows[i - 1])
             {
                 base_type & res_item = res.items[little(i)];
                 ++res_item;
@@ -528,6 +531,17 @@ private:
             res.items[little(2)] = r12 >> 64;
             return res;
         }
+        else if constexpr (Bits == 128 && sizeof(base_type) == 8)
+        {
+            using CompilerUInt128 = unsigned __int128;
+            CompilerUInt128 a = (CompilerUInt128(lhs.items[1]) << 64) + lhs.items[0];
+            CompilerUInt128 b = (CompilerUInt128(rhs.items[1]) << 64) + rhs.items[0];
+            CompilerUInt128 c = a * b;
+            integer<Bits, Signed> res;
+            res.items[0] = c;
+            res.items[1] = c >> 64;
+            return res;
+        }
         else
         {
             integer<Bits, Signed> res{};
@@ -653,7 +667,7 @@ public:
     }
 
     template <typename T>
-    constexpr static bool operator_more(const integer<Bits, Signed> & lhs, const T & rhs) noexcept
+    constexpr static bool operator_greater(const integer<Bits, Signed> & lhs, const T & rhs) noexcept
     {
         if constexpr (should_keep_size<T>())
         {
@@ -673,7 +687,7 @@ public:
         else
         {
             static_assert(IsWideInteger<T>::value);
-            return std::common_type_t<integer<Bits, Signed>, T>::_impl::operator_more(T(lhs), rhs);
+            return std::common_type_t<integer<Bits, Signed>, T>::_impl::operator_greater(T(lhs), rhs);
         }
     }
 
@@ -760,7 +774,6 @@ public:
         }
     }
 
-private:
     template <typename T>
     constexpr static bool is_zero(const T & x)
     {
@@ -777,46 +790,65 @@ private:
     }
 
     /// returns quotient as result and remainder in numerator.
-    template <typename T>
-    constexpr static T divide(T & numerator, T && denominator)
+    template <size_t Bits2>
+    constexpr static integer<Bits2, unsigned> divide(integer<Bits2, unsigned> & numerator, integer<Bits2, unsigned> denominator)
     {
-        if (is_zero(denominator))
-            throwError("divide by zero");
+        static_assert(std::is_unsigned_v<Signed>);
 
-        T & n = numerator;
-        T & d = denominator;
-        T x = 1;
-        T quotient = 0;
-
-        while (!operator_more(d, n) && operator_eq(operator_amp(shift_right(d, base_bits * item_count - 1), 1), 0))
+        if constexpr (Bits == 128 && sizeof(base_type) == 8)
         {
-            x = shift_left(x, 1);
-            d = shift_left(d, 1);
+            using CompilerUInt128 = unsigned __int128;
+
+            CompilerUInt128 a = (CompilerUInt128(numerator.items[1]) << 64) + numerator.items[0];
+            CompilerUInt128 b = (CompilerUInt128(denominator.items[1]) << 64) + denominator.items[0];
+            CompilerUInt128 c = a / b;
+
+            integer<Bits, Signed> res;
+            res.items[0] = c;
+            res.items[1] = c >> 64;
+
+            CompilerUInt128 remainder = a - b * c;
+            numerator.items[0] = remainder;
+            numerator.items[1] = remainder >> 64;
+
+            return res;
         }
 
-        while (!operator_eq(x, 0))
+        if (is_zero(denominator))
+            throwError("Division by zero");
+
+        integer<Bits2, unsigned> x = 1;
+        integer<Bits2, unsigned> quotient = 0;
+
+        while (!operator_greater(denominator, numerator) && is_zero(operator_amp(shift_right(denominator, Bits2 - 1), 1)))
         {
-            if (!operator_more(d, n))
+            x = shift_left(x, 1);
+            denominator = shift_left(denominator, 1);
+        }
+
+        while (!is_zero(x))
+        {
+            if (!operator_greater(denominator, numerator))
             {
-                n = operator_minus(n, d);
+                numerator = operator_minus(numerator, denominator);
                 quotient = operator_pipe(quotient, x);
             }
 
             x = shift_right(x, 1);
-            d = shift_right(d, 1);
+            denominator = shift_right(denominator, 1);
         }
 
         return quotient;
     }
 
-public:
     template <typename T>
     constexpr static auto operator_slash(const integer<Bits, Signed> & lhs, const T & rhs)
     {
         if constexpr (should_keep_size<T>())
         {
-            integer<Bits, Signed> numerator = make_positive(lhs);
-            integer<Bits, Signed> quotient = divide(numerator, make_positive(integer<Bits, Signed>(rhs)));
+            integer<Bits, unsigned> numerator = make_positive(lhs);
+            integer<Bits, unsigned> denominator = make_positive(integer<Bits, Signed>(rhs));
+            integer<Bits, unsigned> quotient = integer<Bits, unsigned>::_impl::divide(numerator, std::move(denominator));
 
             if (std::is_same_v<Signed, signed> && is_negative(rhs) != is_negative(lhs))
                 quotient = operator_unary_minus(quotient);
@@ -834,8 +866,9 @@ public:
     {
         if constexpr (should_keep_size<T>())
         {
-            integer<Bits, Signed> remainder = make_positive(lhs);
-            divide(remainder, make_positive(integer<Bits, Signed>(rhs)));
+            integer<Bits, unsigned> remainder = make_positive(lhs);
+            integer<Bits, unsigned> denominator = make_positive(integer<Bits, Signed>(rhs));
+            integer<Bits, unsigned>::_impl::divide(remainder, std::move(denominator));
 
             if (std::is_same_v<Signed, signed> && is_negative(lhs))
                 remainder = operator_unary_minus(remainder);
@@ -901,7 +934,7 @@ public:
                     ++c;
                 }
                 else
-                    throwError("invalid char from");
+                    throwError("Invalid char from");
             }
         }
         else
@@ -909,7 +942,7 @@ public:
             while (*c)
             {
                 if (*c < '0' || *c > '9')
-                    throwError("invalid char from");
+                    throwError("Invalid char from");
 
                 res = multiply(res, 10U);
                 res = plus(res, *c - '0');
@@ -926,11 +959,6 @@ public:
 
 // Members
 
-template <size_t Bits, typename Signed>
-constexpr integer<Bits, Signed>::integer() noexcept
-    : items{}
-{}
-
 template <size_t Bits, typename Signed>
 template <typename T>
 constexpr integer<Bits, Signed>::integer(T rhs) noexcept
@@ -939,7 +967,7 @@ constexpr integer<Bits, Signed>::integer(T rhs) noexcept
     if constexpr (IsWideInteger<T>::value)
         _impl::wide_integer_from_wide_integer(*this, rhs);
     else
-        _impl::wide_integer_from_bultin(*this, rhs);
+        _impl::wide_integer_from_builtin(*this, rhs);
 }
 
 template <size_t Bits, typename Signed>
@@ -952,10 +980,19 @@ 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
-            _impl::wide_integer_from_bultin(*this, *il.begin());
+            _impl::wide_integer_from_builtin(*this, *il.begin());
+    }
+    else if (il.size() == 0)
+    {
+        _impl::wide_integer_from_builtin(*this, 0);
     }
     else
-        _impl::wide_integer_from_bultin(*this, 0);
+    {
+        auto it = il.begin();
+        for (size_t i = 0; i < _impl::item_count; ++i)
+            if (it < il.end())
+                items[i] = *it;
+    }
 }
 
 template <size_t Bits, typename Signed>
@@ -970,7 +1007,7 @@ template <size_t Bits, typename Signed>
 template <typename T>
 constexpr integer<Bits, Signed> & integer<Bits, Signed>::operator=(T rhs) noexcept
 {
-    _impl::wide_integer_from_bultin(*this, rhs);
+    _impl::wide_integer_from_builtin(*this, rhs);
     return *this;
 }
 
@@ -1053,7 +1090,7 @@ constexpr integer<Bits, Signed> & integer<Bits, Signed>::operator>>=(int n) noex
 {
     if (static_cast<size_t>(n) >= Bits)
     {
-        if (is_negative(*this))
+        if (_impl::is_negative(*this))
             *this = -1;
         else
             *this = 0;
@@ -1103,16 +1140,17 @@ template <size_t Bits, typename Signed>
 template <class T, class>
 constexpr integer<Bits, Signed>::operator T() const noexcept
 {
-    if constexpr (std::is_same_v<T, __int128>)
-    {
-        static_assert(Bits >= 128);
-        return (__int128(items[1]) << 64) | items[0];
-    }
-    else
-    {
-        static_assert(std::numeric_limits<T>::is_integer);
-        return items[0];
-    }
+    static_assert(std::numeric_limits<T>::is_integer);
+
+    /// NOTE: memcpy will suffice, but unfortunately, this function is constexpr.
+
+    using UnsignedT = std::make_unsigned_t<T>;
+
+    UnsignedT res{};
+    for (unsigned i = 0; i < _impl::item_count && i < (sizeof(T) + sizeof(base_type) - 1) / sizeof(base_type); ++i)
+        res += UnsignedT(items[i]) << (sizeof(base_type) * 8 * i);
+
+    return res;
 }
 
 template <size_t Bits, typename Signed>
@@ -1276,7 +1314,7 @@ template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator<<(const integer<Bits, Signed> & lhs, int n) noexcept
 {
     if (static_cast<size_t>(n) >= Bits)
-        return 0;
+        return integer<Bits, Signed>(0);
     if (n <= 0)
         return lhs;
     return integer<Bits, Signed>::_impl::shift_left(lhs, n);
@@ -1285,7 +1323,7 @@ template <size_t Bits, typename Signed>
 constexpr integer<Bits, Signed> operator>>(const integer<Bits, Signed> & lhs, int n) noexcept
 {
     if (static_cast<size_t>(n) >= Bits)
-        return 0;
+        return integer<Bits, Signed>(0);
     if (n <= 0)
         return lhs;
     return integer<Bits, Signed>::_impl::shift_right(lhs, n);
@@ -1305,7 +1343,7 @@ constexpr bool operator<(const Arithmetic & lhs, const Arithmetic2 & rhs)
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs)
 {
-    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_more(lhs, rhs);
+    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_greater(lhs, rhs);
 }
 template <typename Arithmetic, typename Arithmetic2, class>
 constexpr bool operator>(const Arithmetic & lhs, const Arithmetic2 & rhs)
@@ -1328,7 +1366,7 @@ constexpr bool operator<=(const Arithmetic & lhs, const Arithmetic2 & rhs)
 template <size_t Bits, typename Signed, size_t Bits2, typename Signed2>
 constexpr bool operator>=(const integer<Bits, Signed> & lhs, const integer<Bits2, Signed2> & rhs)
 {
-    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_more(lhs, rhs)
+    return std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_greater(lhs, rhs)
         || std::common_type_t<integer<Bits, Signed>, integer<Bits2, Signed2>>::_impl::operator_eq(lhs, rhs);
 }
 template <typename Arithmetic, typename Arithmetic2, class>
diff --git a/base/common/wide_integer_to_string.h b/base/common/wide_integer_to_string.h
index 9908ef4be7a..8b794fe9bcb 100644
--- a/base/common/wide_integer_to_string.h
+++ b/base/common/wide_integer_to_string.h
@@ -1,9 +1,12 @@
 #pragma once
 
 #include <string>
+#include <ostream>
+#include <fmt/format.h>
 
 #include "wide_integer.h"
 
+
 namespace wide
 {
 
@@ -33,3 +36,34 @@ inline std::string to_string(const integer<Bits, Signed> & n)
 }
 
 }
+
+
+template <size_t Bits, typename Signed>
+std::ostream & operator<<(std::ostream & out, const wide::integer<Bits, Signed> & value)
+{
+    return out << to_string(value);
+}
+
+
+/// See https://fmt.dev/latest/api.html#formatting-user-defined-types
+template <size_t Bits, typename Signed>
+struct fmt::formatter<wide::integer<Bits, Signed>>
+{
+    constexpr auto parse(format_parse_context & ctx)
+    {
+        auto it = ctx.begin();
+        auto end = ctx.end();
+
+        /// Only support {}.
+        if (it != end && *it != '}')
+            throw format_error("invalid format");
+
+        return it;
+    }
+
+    template <typename FormatContext>
+    auto format(const wide::integer<Bits, Signed> & value, FormatContext & ctx)
+    {
+        return format_to(ctx.out(), "{}", to_string(value));
+    }
+};
diff --git a/base/common/ya.make.in b/base/common/ya.make.in
index b5c2bbc1717..3deb36a2c71 100644
--- a/base/common/ya.make.in
+++ b/base/common/ya.make.in
@@ -35,7 +35,7 @@ PEERDIR(
 CFLAGS(-g0)
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
+<? 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 83384038b7c..6aa65942445 100644
--- a/base/daemon/BaseDaemon.cpp
+++ b/base/daemon/BaseDaemon.cpp
@@ -26,8 +26,6 @@
 #include <Poco/Observer.h>
 #include <Poco/AutoPtr.h>
 #include <Poco/PatternFormatter.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Poco/Message.h>
 #include <Poco/Util/Application.h>
 #include <Poco/Exception.h>
@@ -59,6 +57,7 @@
 #include <Common/getExecutablePath.h>
 #include <Common/getHashOfLoadedBinary.h>
 #include <Common/Elf.h>
+#include <filesystem>
 
 #if !defined(ARCADIA_BUILD)
 #   include <Common/config_version.h>
@@ -70,6 +69,7 @@
 #endif
 #include <ucontext.h>
 
+namespace fs = std::filesystem;
 
 DB::PipeFDs signal_pipe;
 
@@ -437,11 +437,11 @@ static void sanitizerDeathCallback()
 
 static std::string createDirectory(const std::string & file)
 {
-    auto path = Poco::Path(file).makeParent();
-    if (path.toString().empty())
+    fs::path path = fs::path(file).parent_path();
+    if (path.empty())
         return "";
-    Poco::File(path).createDirectories();
-    return path.toString();
+    fs::create_directories(path);
+    return path;
 };
 
 
@@ -449,7 +449,7 @@ static bool tryCreateDirectories(Poco::Logger * logger, const std::string & path
 {
     try
     {
-        Poco::File(path).createDirectories();
+        fs::create_directories(path);
         return true;
     }
     catch (...)
@@ -468,9 +468,9 @@ void BaseDaemon::reloadConfiguration()
       *  instead of using files specified in config.xml.
       * (It's convenient to log in console when you start server without any command line parameters.)
       */
-    config_path = config().getString("config-file", "config.xml");
+    config_path = config().getString("config-file", getDefaultConfigFileName());
     DB::ConfigProcessor config_processor(config_path, false, true);
-    config_processor.setConfigPath(Poco::Path(config_path).makeParent().toString());
+    config_processor.setConfigPath(fs::path(config_path).parent_path());
     loaded_config = config_processor.loadConfig(/* allow_zk_includes = */ true);
 
     if (last_configuration != nullptr)
@@ -516,21 +516,28 @@ std::string BaseDaemon::getDefaultCorePath() const
     return "/opt/cores/";
 }
 
+std::string BaseDaemon::getDefaultConfigFileName() const
+{
+    return "config.xml";
+}
+
 void BaseDaemon::closeFDs()
 {
 #if defined(OS_FREEBSD) || defined(OS_DARWIN)
-    Poco::File proc_path{"/dev/fd"};
+    fs::path proc_path{"/dev/fd"};
 #else
-    Poco::File proc_path{"/proc/self/fd"};
+    fs::path proc_path{"/proc/self/fd"};
 #endif
-    if (proc_path.isDirectory()) /// Hooray, proc exists
+    if (fs::is_directory(proc_path)) /// Hooray, proc exists
     {
-        std::vector<std::string> fds;
-        /// in /proc/self/fd directory filenames are numeric file descriptors
-        proc_path.list(fds);
-        for (const auto & fd_str : fds)
+        /// in /proc/self/fd directory filenames are numeric file descriptors.
+        /// Iterate directory separately from closing fds to avoid closing iterated directory fd.
+        std::vector<int> fds;
+        for (const auto & path : fs::directory_iterator(proc_path))
+            fds.push_back(DB::parse<int>(path.path().filename()));
+
+        for (const auto & fd : fds)
         {
-            int fd = DB::parse<int>(fd_str);
             if (fd > 2 && fd != signal_pipe.fds_rw[0] && fd != signal_pipe.fds_rw[1])
                 ::close(fd);
         }
@@ -592,7 +599,7 @@ void BaseDaemon::initialize(Application & self)
     {
         /** When creating pid file and looking for config, will search for paths relative to the working path of the program when started.
           */
-        std::string path = Poco::Path(config().getString("application.path")).setFileName("").toString();
+        std::string path = fs::path(config().getString("application.path")).replace_filename("");
         if (0 != chdir(path.c_str()))
             throw Poco::Exception("Cannot change directory to " + path);
     }
@@ -640,7 +647,7 @@ void BaseDaemon::initialize(Application & self)
 
     std::string log_path = config().getString("logger.log", "");
     if (!log_path.empty())
-        log_path = Poco::Path(log_path).setFileName("").toString();
+        log_path = fs::path(log_path).replace_filename("");
 
     /** Redirect stdout, stderr to separate files in the log directory (or in the specified file).
       * Some libraries write to stderr in case of errors in debug mode,
@@ -703,8 +710,7 @@ void BaseDaemon::initialize(Application & self)
 
         tryCreateDirectories(&logger(), core_path);
 
-        Poco::File cores = core_path;
-        if (!(cores.exists() && cores.isDirectory()))
+        if (!(fs::exists(core_path) && fs::is_directory(core_path)))
         {
             core_path = !log_path.empty() ? log_path : "/opt/";
             tryCreateDirectories(&logger(), core_path);
diff --git a/base/daemon/BaseDaemon.h b/base/daemon/BaseDaemon.h
index 8b9d765cf2e..3d47d85a9f5 100644
--- a/base/daemon/BaseDaemon.h
+++ b/base/daemon/BaseDaemon.h
@@ -149,6 +149,8 @@ protected:
 
     virtual std::string getDefaultCorePath() const;
 
+    virtual std::string getDefaultConfigFileName() const;
+
     std::optional<DB::StatusFile> pid_file;
 
     std::atomic_bool is_cancelled{false};
diff --git a/base/daemon/SentryWriter.cpp b/base/daemon/SentryWriter.cpp
index 29430b65983..3571c64edd6 100644
--- a/base/daemon/SentryWriter.cpp
+++ b/base/daemon/SentryWriter.cpp
@@ -1,6 +1,5 @@
 #include <daemon/SentryWriter.h>
 
-#include <Poco/File.h>
 #include <Poco/Util/Application.h>
 #include <Poco/Util/LayeredConfiguration.h>
 
@@ -9,6 +8,7 @@
 #include <common/getMemoryAmount.h>
 #include <common/logger_useful.h>
 
+#include <Common/formatReadable.h>
 #include <Common/SymbolIndex.h>
 #include <Common/StackTrace.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
@@ -24,6 +24,7 @@
 #    include <stdio.h>
 #    include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace
 {
@@ -52,8 +53,7 @@ void setExtras()
     sentry_set_extra("physical_cpu_cores", sentry_value_new_int32(getNumberOfPhysicalCPUCores()));
 
     if (!server_data_path.empty())
-        sentry_set_extra("disk_free_space", sentry_value_new_string(formatReadableSizeWithBinarySuffix(
-            Poco::File(server_data_path).freeSpace()).c_str()));
+        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 *)
@@ -101,7 +101,7 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
     auto * logger = &Poco::Logger::get("SentryWriter");
     if (config.getBool("send_crash_reports.enabled", false))
     {
-        if (debug || (strlen(VERSION_OFFICIAL) > 0))
+        if (debug || (strlen(VERSION_OFFICIAL) > 0)) //-V560
         {
             enabled = true;
         }
@@ -109,12 +109,12 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
     if (enabled)
     {
         server_data_path = config.getString("path", "");
-        const std::filesystem::path & default_tmp_path = std::filesystem::path(config.getString("tmp_path", Poco::Path::temp())) / "sentry";
+        const std::filesystem::path & default_tmp_path = fs::path(config.getString("tmp_path", fs::temp_directory_path())) / "sentry";
         const std::string & endpoint
             = config.getString("send_crash_reports.endpoint");
         const std::string & temp_folder_path
             = config.getString("send_crash_reports.tmp_path", default_tmp_path);
-        Poco::File(temp_folder_path).createDirectories();
+        fs::create_directories(temp_folder_path);
 
         sentry_options_t * options = sentry_options_new();  /// will be freed by sentry_init or sentry_shutdown
         sentry_options_set_release(options, VERSION_STRING_SHORT);
diff --git a/base/ext/scope_guard_safe.h b/base/ext/scope_guard_safe.h
new file mode 100644
index 00000000000..55140213572
--- /dev/null
+++ b/base/ext/scope_guard_safe.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include <ext/scope_guard.h>
+#include <common/logger_useful.h>
+#include <Common/MemoryTracker.h>
+
+/// Same as SCOPE_EXIT() but block the MEMORY_LIMIT_EXCEEDED errors.
+///
+/// Typical example of SCOPE_EXIT_MEMORY() usage is when code under it may do
+/// some tiny allocations, that may fail under high memory pressure or/and low
+/// max_memory_usage (and related limits).
+///
+/// NOTE: it should be used with caution.
+#define SCOPE_EXIT_MEMORY(...) SCOPE_EXIT(                    \
+    MemoryTracker::LockExceptionInThread                      \
+                lock_memory_tracker(VariableContext::Global); \
+    __VA_ARGS__;                                              \
+)
+
+/// Same as SCOPE_EXIT() but try/catch/tryLogCurrentException any exceptions.
+///
+/// SCOPE_EXIT_SAFE() should be used in case the exception during the code
+/// under SCOPE_EXIT() is not "that fatal" and error message in log is enough.
+///
+/// Good example is calling CurrentThread::detachQueryIfNotDetached().
+///
+/// Anti-pattern is calling WriteBuffer::finalize() under SCOPE_EXIT_SAFE()
+/// (since finalize() can do final write and it is better to fail abnormally
+/// instead of ignoring write error).
+///
+/// NOTE: it should be used with double caution.
+#define SCOPE_EXIT_SAFE(...) SCOPE_EXIT(             \
+    try                                              \
+    {                                                \
+        __VA_ARGS__;                                 \
+    }                                                \
+    catch (...)                                      \
+    {                                                \
+        tryLogCurrentException(__PRETTY_FUNCTION__); \
+    }                                                \
+)
+
+/// Same as SCOPE_EXIT() but:
+/// - block the MEMORY_LIMIT_EXCEEDED errors,
+/// - try/catch/tryLogCurrentException any exceptions.
+///
+/// SCOPE_EXIT_MEMORY_SAFE() can be used when the error can be ignored, and in
+/// addition to SCOPE_EXIT_SAFE() it will also lock MEMORY_LIMIT_EXCEEDED to
+/// avoid such exceptions.
+///
+/// It does exists as a separate helper, since you do not need to lock
+/// MEMORY_LIMIT_EXCEEDED always (there are cases when code under SCOPE_EXIT does
+/// not do any allocations, while LockExceptionInThread increment atomic
+/// variable).
+///
+/// NOTE: it should be used with triple caution.
+#define SCOPE_EXIT_MEMORY_SAFE(...) SCOPE_EXIT(                   \
+    try                                                           \
+    {                                                             \
+        MemoryTracker::LockExceptionInThread                      \
+                    lock_memory_tracker(VariableContext::Global); \
+        __VA_ARGS__;                                              \
+    }                                                             \
+    catch (...)                                                   \
+    {                                                             \
+        tryLogCurrentException(__PRETTY_FUNCTION__);              \
+    }                                                             \
+)
diff --git a/base/glibc-compatibility/CMakeLists.txt b/base/glibc-compatibility/CMakeLists.txt
index e785e2ab2ce..8cba91de33f 100644
--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@@ -15,7 +15,7 @@ if (GLIBC_COMPATIBILITY)
 
     add_headers_and_sources(glibc_compatibility .)
     add_headers_and_sources(glibc_compatibility musl)
-    if (ARCH_ARM)
+    if (ARCH_AARCH64)
         list (APPEND glibc_compatibility_sources musl/aarch64/syscall.s musl/aarch64/longjmp.s)
         set (musl_arch_include_dir musl/aarch64)
     elseif (ARCH_AMD64)
diff --git a/base/glibc-compatibility/musl/lgamma.c b/base/glibc-compatibility/musl/lgamma.c
index fb9d105d0fa..5e959504e29 100644
--- a/base/glibc-compatibility/musl/lgamma.c
+++ b/base/glibc-compatibility/musl/lgamma.c
@@ -78,6 +78,9 @@
  *
  */
 
+// Disable warnings by PVS-Studio
+//-V::GA
+
 static const double
 pi  =  3.14159265358979311600e+00, /* 0x400921FB, 0x54442D18 */
 a0  =  7.72156649015328655494e-02, /* 0x3FB3C467, 0xE37DB0C8 */
diff --git a/base/glibc-compatibility/musl/lgammal.c b/base/glibc-compatibility/musl/lgammal.c
index b158748ce1f..775559f13b6 100644
--- a/base/glibc-compatibility/musl/lgammal.c
+++ b/base/glibc-compatibility/musl/lgammal.c
@@ -85,6 +85,9 @@
  *
  */
 
+// Disable warnings by PVS-Studio
+//-V::GA
+
 #include <stdint.h>
 #include <math.h>
 #include "libm.h"
diff --git a/base/glibc-compatibility/musl/libm.h b/base/glibc-compatibility/musl/libm.h
index 55520c2fb03..e5029318693 100644
--- a/base/glibc-compatibility/musl/libm.h
+++ b/base/glibc-compatibility/musl/libm.h
@@ -155,7 +155,7 @@ static inline long double fp_barrierl(long double x)
 static inline void fp_force_evalf(float x)
 {
 	volatile float y;
-	y = x;
+	y = x; //-V1001
 }
 #endif
 
@@ -164,7 +164,7 @@ static inline void fp_force_evalf(float x)
 static inline void fp_force_eval(double x)
 {
 	volatile double y;
-	y = x;
+	y = x; //-V1001
 }
 #endif
 
@@ -173,7 +173,7 @@ static inline void fp_force_eval(double x)
 static inline void fp_force_evall(long double x)
 {
 	volatile long double y;
-	y = x;
+	y = x; //-V1001
 }
 #endif
 
diff --git a/base/glibc-compatibility/musl/powf.c b/base/glibc-compatibility/musl/powf.c
index de8fab54554..35dc3611b94 100644
--- a/base/glibc-compatibility/musl/powf.c
+++ b/base/glibc-compatibility/musl/powf.c
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: MIT
  */
 
+// Disable warnings by PVS-Studio
+//-V::GA
+
 #include <math.h>
 #include <stdint.h>
 #include "libm.h"
diff --git a/base/loggers/CMakeLists.txt b/base/loggers/CMakeLists.txt
index 48868cf1e0d..22be002e069 100644
--- a/base/loggers/CMakeLists.txt
+++ b/base/loggers/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(loggers .)
 add_library(loggers ${loggers_sources} ${loggers_headers})
 target_link_libraries(loggers PRIVATE dbms clickhouse_common_io)
diff --git a/base/loggers/Loggers.cpp b/base/loggers/Loggers.cpp
index ed806741895..80e62d0a6d6 100644
--- a/base/loggers/Loggers.cpp
+++ b/base/loggers/Loggers.cpp
@@ -6,10 +6,11 @@
 #include "OwnFormattingChannel.h"
 #include "OwnPatternFormatter.h"
 #include <Poco/ConsoleChannel.h>
-#include <Poco/File.h>
 #include <Poco/Logger.h>
 #include <Poco/Net/RemoteSyslogChannel.h>
-#include <Poco/Path.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -20,11 +21,11 @@ namespace DB
 // TODO: move to libcommon
 static std::string createDirectory(const std::string & file)
 {
-    auto path = Poco::Path(file).makeParent();
-    if (path.toString().empty())
+    auto path = fs::path(file).parent_path();
+    if (path.empty())
         return "";
-    Poco::File(path).createDirectories();
-    return path.toString();
+    fs::create_directories(path);
+    return path;
 };
 
 void Loggers::setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority)
@@ -40,7 +41,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
             split->addTextLog(log, text_log_max_priority);
 
     auto current_logger = config.getString("logger", "");
-    if (config_logger == current_logger)
+    if (config_logger == current_logger) //-V1051
         return;
 
     config_logger = current_logger;
@@ -51,16 +52,26 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     /// Use extended interface of Channel for more comprehensive logging.
     split = new DB::OwnSplitChannel();
 
-    auto log_level = config.getString("logger.level", "trace");
+    auto log_level_string = config.getString("logger.level", "trace");
+
+    /// different channels (log, console, syslog) may have different loglevels configured
+    /// The maximum (the most verbose) of those will be used as default for Poco loggers
+    int max_log_level = 0;
+
     const auto log_path = config.getString("logger.log", "");
     if (!log_path.empty())
     {
         createDirectory(log_path);
-        std::cerr << "Logging " << log_level << " to " << log_path << std::endl;
+        std::cerr << "Logging " << log_level_string << " to " << log_path << std::endl;
+        auto log_level = Poco::Logger::parseLevel(log_level_string);
+        if (log_level > max_log_level)
+        {
+            max_log_level = log_level;
+        }
 
         // Set up two channel chains.
         log_file = new Poco::FileChannel;
-        log_file->setProperty(Poco::FileChannel::PROP_PATH, Poco::Path(log_path).absolute().toString());
+        log_file->setProperty(Poco::FileChannel::PROP_PATH, fs::weakly_canonical(log_path));
         log_file->setProperty(Poco::FileChannel::PROP_ROTATION, config.getRawString("logger.size", "100M"));
         log_file->setProperty(Poco::FileChannel::PROP_ARCHIVE, "number");
         log_file->setProperty(Poco::FileChannel::PROP_COMPRESS, config.getRawString("logger.compress", "true"));
@@ -69,9 +80,10 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
         log_file->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, log_file);
+        log->setLevel(log_level);
         split->addChannel(log);
     }
 
@@ -79,10 +91,19 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     if (!errorlog_path.empty())
     {
         createDirectory(errorlog_path);
+
+        // NOTE: we don't use notice & critical in the code, so in practice error log collects fatal & error & warning.
+        // (!) Warnings are important, they require attention and should never be silenced / ignored.
+        auto errorlog_level = Poco::Logger::parseLevel(config.getString("logger.errorlog_level", "notice"));
+        if (errorlog_level > max_log_level)
+        {
+            max_log_level = errorlog_level;
+        }
+
         std::cerr << "Logging errors to " << errorlog_path << std::endl;
 
         error_log_file = new Poco::FileChannel;
-        error_log_file->setProperty(Poco::FileChannel::PROP_PATH, Poco::Path(errorlog_path).absolute().toString());
+        error_log_file->setProperty(Poco::FileChannel::PROP_PATH, fs::weakly_canonical(errorlog_path));
         error_log_file->setProperty(Poco::FileChannel::PROP_ROTATION, config.getRawString("logger.size", "100M"));
         error_log_file->setProperty(Poco::FileChannel::PROP_ARCHIVE, "number");
         error_log_file->setProperty(Poco::FileChannel::PROP_COMPRESS, config.getRawString("logger.compress", "true"));
@@ -90,20 +111,22 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         error_log_file->setProperty(Poco::FileChannel::PROP_FLUSH, config.getRawString("logger.flush", "true"));
         error_log_file->setProperty(Poco::FileChannel::PROP_ROTATEONOPEN, config.getRawString("logger.rotateOnOpen", "false"));
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> errorlog = new DB::OwnFormattingChannel(pf, error_log_file);
-        errorlog->setLevel(Poco::Message::PRIO_NOTICE);
+        errorlog->setLevel(errorlog_level);
         errorlog->open();
         split->addChannel(errorlog);
     }
 
-    /// "dynamic_layer_selection" is needed only for Yandex.Metrika, that share part of ClickHouse code.
-    /// We don't need this configuration parameter.
-
-    if (config.getBool("logger.use_syslog", false) || config.getBool("dynamic_layer_selection", false))
+    if (config.getBool("logger.use_syslog", false))
     {
         //const std::string & cmd_name = commandName();
+        auto syslog_level = Poco::Logger::parseLevel(config.getString("logger.syslog_level", log_level_string));
+        if (syslog_level > max_log_level)
+        {
+            max_log_level = syslog_level;
+        }
 
         if (config.has("logger.syslog.address"))
         {
@@ -127,9 +150,11 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         }
         syslog_channel->open();
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this, OwnPatternFormatter::ADD_LAYER_TAG);
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter;
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, syslog_channel);
+        log->setLevel(syslog_level);
+
         split->addChannel(log);
     }
 
@@ -141,9 +166,17 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     {
         bool color_enabled = config.getBool("logger.color_terminal", color_logs_by_default);
 
-        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(this, OwnPatternFormatter::ADD_NOTHING, color_enabled);
+        auto console_log_level_string = config.getString("logger.console_log_level", log_level_string);
+        auto console_log_level = Poco::Logger::parseLevel(console_log_level_string);
+        if (console_log_level > max_log_level)
+        {
+            max_log_level = console_log_level;
+        }
+
+        Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(color_enabled);
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel);
-        logger.warning("Logging " + log_level + " to console");
+        logger.warning("Logging " + console_log_level_string + " to console");
+        log->setLevel(console_log_level);
         split->addChannel(log);
     }
 
@@ -152,17 +185,17 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     logger.setChannel(split);
 
     // Global logging level (it can be overridden for specific loggers).
-    logger.setLevel(log_level);
+    logger.setLevel(max_log_level);
 
     // Set level to all already created loggers
     std::vector<std::string> names;
     //logger_root = Logger::root();
     logger.root().names(names);
     for (const auto & name : names)
-        logger.root().get(name).setLevel(log_level);
+        logger.root().get(name).setLevel(max_log_level);
 
     // Attach to the root logger.
-    logger.root().setLevel(log_level);
+    logger.root().setLevel(max_log_level);
     logger.root().setChannel(logger.getChannel());
 
     // Explicitly specified log levels for specific loggers.
diff --git a/base/loggers/Loggers.h b/base/loggers/Loggers.h
index 9ed75046468..151c1d3566f 100644
--- a/base/loggers/Loggers.h
+++ b/base/loggers/Loggers.h
@@ -8,6 +8,7 @@
 #include <Interpreters/TextLog.h>
 #include "OwnSplitChannel.h"
 
+
 namespace Poco::Util
 {
     class AbstractConfiguration;
@@ -21,16 +22,8 @@ public:
     /// Close log files. On next log write files will be reopened.
     void closeLogs(Poco::Logger & logger);
 
-    std::optional<size_t> getLayer() const
-    {
-        return layer; /// layer set in inheritor class BaseDaemonApplication.
-    }
-
     void setTextLog(std::shared_ptr<DB::TextLog> log, int max_priority);
 
-protected:
-    std::optional<size_t> layer;
-
 private:
     Poco::AutoPtr<Poco::FileChannel> log_file;
     Poco::AutoPtr<Poco::FileChannel> error_log_file;
diff --git a/base/loggers/OwnFormattingChannel.h b/base/loggers/OwnFormattingChannel.h
index cd2e66279d7..2336dacad04 100644
--- a/base/loggers/OwnFormattingChannel.h
+++ b/base/loggers/OwnFormattingChannel.h
@@ -22,6 +22,9 @@ public:
 
     void setLevel(Poco::Message::Priority priority_) { priority = priority_; }
 
+    // Poco::Logger::parseLevel returns ints
+    void setLevel(int level) { priority = static_cast<Poco::Message::Priority>(level); }
+
     void open() override
     {
         if (pChannel)
diff --git a/base/loggers/OwnPatternFormatter.cpp b/base/loggers/OwnPatternFormatter.cpp
index 029d06ff949..e62039f4a27 100644
--- a/base/loggers/OwnPatternFormatter.cpp
+++ b/base/loggers/OwnPatternFormatter.cpp
@@ -13,31 +13,18 @@
 #include "Loggers.h"
 
 
-OwnPatternFormatter::OwnPatternFormatter(const Loggers * loggers_, OwnPatternFormatter::Options options_, bool color_)
-    : Poco::PatternFormatter(""), loggers(loggers_), options(options_), color(color_)
+OwnPatternFormatter::OwnPatternFormatter(bool color_)
+    : Poco::PatternFormatter(""), color(color_)
 {
 }
 
 
-void OwnPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text)
+void OwnPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const
 {
     DB::WriteBufferFromString wb(text);
 
     const Poco::Message & msg = msg_ext.base;
 
-    /// For syslog: tag must be before message and first whitespace.
-    /// This code is only used in Yandex.Metrika and unneeded in ClickHouse.
-    if ((options & ADD_LAYER_TAG) && loggers)
-    {
-        auto layer = loggers->getLayer();
-        if (layer)
-        {
-            writeCString("layer[", wb);
-            DB::writeIntText(*layer, wb);
-            writeCString("]: ", wb);
-        }
-    }
-
     /// Change delimiters in date for compatibility with old logs.
     DB::writeDateTimeText<'.', ':'>(msg_ext.time_seconds, wb);
 
diff --git a/base/loggers/OwnPatternFormatter.h b/base/loggers/OwnPatternFormatter.h
index 4aedcc04637..fba4f0964cb 100644
--- a/base/loggers/OwnPatternFormatter.h
+++ b/base/loggers/OwnPatternFormatter.h
@@ -24,20 +24,11 @@ class Loggers;
 class OwnPatternFormatter : public Poco::PatternFormatter
 {
 public:
-    /// ADD_LAYER_TAG is needed only for Yandex.Metrika, that share part of ClickHouse code.
-    enum Options
-    {
-        ADD_NOTHING = 0,
-        ADD_LAYER_TAG = 1 << 0
-    };
-
-    OwnPatternFormatter(const Loggers * loggers_, Options options_ = ADD_NOTHING, bool color_ = false);
+    OwnPatternFormatter(bool color_ = false);
 
     void format(const Poco::Message & msg, std::string & text) override;
-    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text);
+    void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;
 
 private:
-    const Loggers * loggers;
-    Options options;
     bool color;
 };
diff --git a/base/mysqlxx/CMakeLists.txt b/base/mysqlxx/CMakeLists.txt
index 849c58a8527..c5230c2b49f 100644
--- a/base/mysqlxx/CMakeLists.txt
+++ b/base/mysqlxx/CMakeLists.txt
@@ -14,8 +14,8 @@ add_library (mysqlxx
 target_include_directories (mysqlxx PUBLIC ..)
 
 if (USE_INTERNAL_MYSQL_LIBRARY)
-    target_include_directories (mysqlxx PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/include)
-    target_include_directories (mysqlxx PUBLIC ${ClickHouse_BINARY_DIR}/contrib/mariadb-connector-c/include)
+    target_include_directories (mysqlxx PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/include")
+    target_include_directories (mysqlxx PUBLIC "${ClickHouse_BINARY_DIR}/contrib/mariadb-connector-c/include")
 else ()
     set(PLATFORM_LIBRARIES ${CMAKE_DL_LIBS})
 
diff --git a/base/mysqlxx/Pool.h b/base/mysqlxx/Pool.h
index b6189663f55..530e2c78cf2 100644
--- a/base/mysqlxx/Pool.h
+++ b/base/mysqlxx/Pool.h
@@ -159,9 +159,9 @@ public:
       */
     Pool(const std::string & db_,
          const std::string & server_,
-         const std::string & user_ = "",
-         const std::string & password_ = "",
-         unsigned port_ = 0,
+         const std::string & user_,
+         const std::string & password_,
+         unsigned port_,
          const std::string & socket_ = "",
          unsigned connect_timeout_ = MYSQLXX_DEFAULT_TIMEOUT,
          unsigned rw_timeout_ = MYSQLXX_DEFAULT_RW_TIMEOUT,
diff --git a/base/mysqlxx/PoolWithFailover.cpp b/base/mysqlxx/PoolWithFailover.cpp
index 5e9f70f4ac1..e317ab7f228 100644
--- a/base/mysqlxx/PoolWithFailover.cpp
+++ b/base/mysqlxx/PoolWithFailover.cpp
@@ -2,7 +2,6 @@
 #include <ctime>
 #include <random>
 #include <thread>
-
 #include <mysqlxx/PoolWithFailover.h>
 
 
@@ -15,9 +14,12 @@ static bool startsWith(const std::string & s, const char * prefix)
 
 using namespace mysqlxx;
 
-PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & config_,
-                                   const std::string & config_name_, const unsigned default_connections_,
-                                   const unsigned max_connections_, const size_t max_tries_)
+PoolWithFailover::PoolWithFailover(
+        const Poco::Util::AbstractConfiguration & config_,
+        const std::string & config_name_,
+        const unsigned default_connections_,
+        const unsigned max_connections_,
+        const size_t max_tries_)
     : max_tries(max_tries_)
 {
     shareable = config_.getBool(config_name_ + ".share_connection", false);
@@ -59,16 +61,46 @@ PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & con
     }
 }
 
-PoolWithFailover::PoolWithFailover(const std::string & config_name_, const unsigned default_connections_,
-    const unsigned max_connections_, const size_t max_tries_)
-    : PoolWithFailover{
-        Poco::Util::Application::instance().config(), config_name_,
-        default_connections_, max_connections_, max_tries_}
+
+PoolWithFailover::PoolWithFailover(
+        const std::string & config_name_,
+        const unsigned default_connections_,
+        const unsigned max_connections_,
+        const size_t max_tries_)
+    : PoolWithFailover{Poco::Util::Application::instance().config(),
+            config_name_, default_connections_, max_connections_, max_tries_}
 {
 }
 
+
+PoolWithFailover::PoolWithFailover(
+        const std::string & database,
+        const RemoteDescription & addresses,
+        const std::string & user,
+        const std::string & password,
+        unsigned default_connections_,
+        unsigned max_connections_,
+        size_t max_tries_)
+    : max_tries(max_tries_)
+    , shareable(false)
+{
+    /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
+    for (const auto & [host, port] : addresses)
+    {
+        replicas_by_priority[0].emplace_back(std::make_shared<Pool>(database,
+            host, user, password, port,
+            /* socket_ = */ "",
+            MYSQLXX_DEFAULT_TIMEOUT,
+            MYSQLXX_DEFAULT_RW_TIMEOUT,
+            default_connections_,
+            max_connections_));
+    }
+}
+
+
 PoolWithFailover::PoolWithFailover(const PoolWithFailover & other)
-    : max_tries{other.max_tries}, shareable{other.shareable}
+    : max_tries{other.max_tries}
+    , shareable{other.shareable}
 {
     if (shareable)
     {
diff --git a/base/mysqlxx/PoolWithFailover.h b/base/mysqlxx/PoolWithFailover.h
index 029fc3ebad3..1c7a63e76c0 100644
--- a/base/mysqlxx/PoolWithFailover.h
+++ b/base/mysqlxx/PoolWithFailover.h
@@ -11,6 +11,8 @@
 namespace mysqlxx
 {
     /** MySQL connection pool with support of failover.
+      *
+      * For dictionary source:
       * Have information about replicas and their priorities.
       * Tries to connect to replica in an order of priority. When equal priority, choose replica with maximum time without connections.
       *
@@ -68,42 +70,60 @@ namespace mysqlxx
         using PoolPtr = std::shared_ptr<Pool>;
         using Replicas = std::vector<PoolPtr>;
 
-        /// [priority][index] -> replica.
+        /// [priority][index] -> replica. Highest priority is 0.
         using ReplicasByPriority = std::map<int, Replicas>;
-
         ReplicasByPriority replicas_by_priority;
 
         /// Number of connection tries.
         size_t max_tries;
         /// Mutex for set of replicas.
         std::mutex mutex;
-
         /// Can the Pool be shared
         bool shareable;
 
     public:
         using Entry = Pool::Entry;
+        using RemoteDescription = std::vector<std::pair<std::string, uint16_t>>;
 
         /**
-         * config_name           Name of parameter in configuration file.
+         * * Mysql dictionary sourse related params:
+         * config_name           Name of parameter in configuration file for dictionary source.
+         *
+         * * Mysql storage related parameters:
+         * replicas_description
+         *
+         * * Mutual parameters:
          * 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.
          */
-        PoolWithFailover(const std::string & config_name_,
+        PoolWithFailover(
+            const std::string & config_name_,
             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);
 
-        PoolWithFailover(const Poco::Util::AbstractConfiguration & config_,
+        PoolWithFailover(
+            const Poco::Util::AbstractConfiguration & config_,
             const std::string & config_name_,
             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);
 
+        PoolWithFailover(
+            const std::string & database,
+            const RemoteDescription & addresses,
+            const std::string & user,
+            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);
+
         PoolWithFailover(const PoolWithFailover & other);
 
         /** Allocates a connection to use. */
         Entry get();
     };
+
+    using PoolWithFailoverPtr = std::shared_ptr<PoolWithFailover>;
 }
diff --git a/base/pcg-random/pcg_extras.hpp b/base/pcg-random/pcg_extras.hpp
index b71e859a25f..39c91c4ecfa 100644
--- a/base/pcg-random/pcg_extras.hpp
+++ b/base/pcg-random/pcg_extras.hpp
@@ -447,69 +447,6 @@ inline SrcIter uneven_copy(SrcIter src_first,
                             std::integral_constant<bool, DEST_IS_SMALLER>{});
 }
 
-/* generate_to, fill in a fixed-size array of integral type using a SeedSeq
- * (actually works for any random-access iterator)
- */
-
-template <size_t size, typename SeedSeq, typename DestIter>
-inline void generate_to_impl(SeedSeq&& generator, DestIter dest,
-                             std::true_type)
-{
-    generator.generate(dest, dest+size);
-}
-
-template <size_t size, typename SeedSeq, typename DestIter>
-void generate_to_impl(SeedSeq&& generator, DestIter dest,
-                      std::false_type)
-{
-    typedef typename std::iterator_traits<DestIter>::value_type dest_t;
-    constexpr auto DEST_SIZE = sizeof(dest_t);
-    constexpr auto GEN_SIZE  = sizeof(uint32_t);
-
-    constexpr bool GEN_IS_SMALLER = GEN_SIZE < DEST_SIZE;
-    constexpr size_t FROM_ELEMS =
-        GEN_IS_SMALLER
-            ? size * ((DEST_SIZE+GEN_SIZE-1) / GEN_SIZE)
-            : (size + (GEN_SIZE / DEST_SIZE) - 1)
-                / ((GEN_SIZE / DEST_SIZE) + GEN_IS_SMALLER);
-                        //  this odd code ^^^^^^^^^^^^^^^^^ is work-around for
-                        //  a bug: http://llvm.org/bugs/show_bug.cgi?id=21287
-
-    if (FROM_ELEMS <= 1024) {
-        uint32_t buffer[FROM_ELEMS];
-        generator.generate(buffer, buffer+FROM_ELEMS);
-        uneven_copy(buffer, dest, dest+size);
-    } else {
-        uint32_t* buffer = static_cast<uint32_t*>(malloc(GEN_SIZE * FROM_ELEMS));
-        generator.generate(buffer, buffer+FROM_ELEMS);
-        uneven_copy(buffer, dest, dest+size);
-        free(static_cast<void*>(buffer));
-    }
-}
-
-template <size_t size, typename SeedSeq, typename DestIter>
-inline void generate_to(SeedSeq&& generator, DestIter dest)
-{
-    typedef typename std::iterator_traits<DestIter>::value_type dest_t;
-    constexpr bool IS_32BIT = sizeof(dest_t) == sizeof(uint32_t);
-
-    generate_to_impl<size>(std::forward<SeedSeq>(generator), dest,
-                           std::integral_constant<bool, IS_32BIT>{});
-}
-
-/* generate_one, produce a value of integral type using a SeedSeq
- * (optionally, we can have it produce more than one and pick which one
- * we want)
- */
-
-template <typename UInt, size_t i = 0UL, size_t N = i+1UL, typename SeedSeq>
-inline UInt generate_one(SeedSeq&& generator)
-{
-    UInt result[N];
-    generate_to<N>(std::forward<SeedSeq>(generator), result);
-    return result[i];
-}
-
 template <typename RngType>
 auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound)
         -> typename RngType::result_type
@@ -517,7 +454,7 @@ auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound)
     typedef typename RngType::result_type rtype;
     rtype threshold = (RngType::max() - RngType::min() + rtype(1) - upper_bound)
                     % upper_bound;
-    for (;;) {
+    for (;;) { //-V1044
         rtype r = rng() - RngType::min();
         if (r >= threshold)
             return r % upper_bound;
diff --git a/base/pcg-random/pcg_random.hpp b/base/pcg-random/pcg_random.hpp
index abf83a60ee1..d9d3519a4cf 100644
--- a/base/pcg-random/pcg_random.hpp
+++ b/base/pcg-random/pcg_random.hpp
@@ -928,7 +928,7 @@ struct rxs_m_xs_mixin {
         constexpr bitcount_t shift = bits - xtypebits;
         constexpr bitcount_t mask = (1 << opbits) - 1;
         bitcount_t rshift =
-            opbits ? bitcount_t(internal >> (bits - opbits)) & mask : 0;
+            opbits ? bitcount_t(internal >> (bits - opbits)) & mask : 0; //-V547
         internal ^= internal >> (opbits + rshift);
         internal *= mcg_multiplier<itype>::multiplier();
         xtype result = internal >> shift;
@@ -950,7 +950,7 @@ struct rxs_m_xs_mixin {
 
         internal *= mcg_unmultiplier<itype>::unmultiplier();
 
-        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0;
+        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0; //-V547
         internal = unxorshift(internal, bits, opbits + rshift);
 
         return internal;
@@ -975,7 +975,7 @@ struct rxs_m_mixin {
                                  :                    2;
         constexpr bitcount_t shift = bits - xtypebits;
         constexpr bitcount_t mask = (1 << opbits) - 1;
-        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0;
+        bitcount_t rshift = opbits ? (internal >> (bits - opbits)) & mask : 0; //-V547
         internal ^= internal >> (opbits + rshift);
         internal *= mcg_multiplier<itype>::multiplier();
         xtype result = internal >> shift;
@@ -1366,7 +1366,7 @@ void extended<table_pow2,advance_pow2,baseclass,extvalclass,kdd>::selfinit()
     //      - any strange correlations would only be apparent if we
     //        were to backstep the generator so that the base generator
     //        was generating the same values again
-    result_type xdiff = baseclass::operator()() - baseclass::operator()();
+    result_type xdiff = baseclass::operator()() - baseclass::operator()(); //-V501
     for (size_t i = 0; i < table_size; ++i) {
         data_[i] = baseclass::operator()() ^ xdiff;
     }
@@ -1643,22 +1643,22 @@ typedef setseq_base<pcg128_t, pcg128_t, xsl_rr_rr_mixin>
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std8 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std8 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                           oneseq_rxs_m_xs_8_8, kdd>;
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std16 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std16 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                            oneseq_rxs_m_xs_16_16, kdd>;
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std32 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std32 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                            oneseq_rxs_m_xs_32_32, kdd>;
 
 template <bitcount_t table_pow2, bitcount_t advance_pow2,
           typename BaseRNG, bool kdd = true>
-using ext_std64 = extended<table_pow2, advance_pow2, BaseRNG,
+using ext_std64 = pcg_detail::extended<table_pow2, advance_pow2, BaseRNG,
                            oneseq_rxs_m_xs_64_64, kdd>;
 
 
diff --git a/cmake/arch.cmake b/cmake/arch.cmake
index 9604ef62b31..60e0346dbbf 100644
--- a/cmake/arch.cmake
+++ b/cmake/arch.cmake
@@ -1,7 +1,7 @@
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
     set (ARCH_AMD64 1)
 endif ()
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
     set (ARCH_AARCH64 1)
 endif ()
 if (ARCH_AARCH64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index 9d74179902d..34de50e9f8a 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -1,9 +1,9 @@
 # This strings autochanged from release_lib.sh:
-SET(VERSION_REVISION 54450)
+SET(VERSION_REVISION 54452)
 SET(VERSION_MAJOR 21)
-SET(VERSION_MINOR 5)
+SET(VERSION_MINOR 7)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 3827789b3d8fd2021952e57e5110343d26daa1a1)
-SET(VERSION_DESCRIBE v21.5.1.1-prestable)
-SET(VERSION_STRING 21.5.1.1)
+SET(VERSION_GITHASH 976ccc2e908ac3bc28f763bfea8134ea0a121b40)
+SET(VERSION_DESCRIBE v21.7.1.1-prestable)
+SET(VERSION_STRING 21.7.1.1)
 # end of autochange
diff --git a/cmake/check_flags.cmake b/cmake/check_flags.cmake
new file mode 100644
index 00000000000..5a4ff472868
--- /dev/null
+++ b/cmake/check_flags.cmake
@@ -0,0 +1,6 @@
+include (CheckCXXCompilerFlag)
+include (CheckCCompilerFlag)
+
+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)
diff --git a/cmake/darwin/default_libs.cmake b/cmake/darwin/default_libs.cmake
index 79ac675f234..a6ee800d59b 100644
--- a/cmake/darwin/default_libs.cmake
+++ b/cmake/darwin/default_libs.cmake
@@ -1,11 +1,14 @@
 set (DEFAULT_LIBS "-nodefaultlibs")
 
-if (NOT COMPILER_CLANG)
-    message (FATAL_ERROR "Darwin build is supported only for Clang")
-endif ()
-
 set (DEFAULT_LIBS "${DEFAULT_LIBS} ${COVERAGE_OPTION} -lc -lm -lpthread -ldl")
 
+if (COMPILER_GCC)
+    set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc_eh")
+    if (ARCH_AARCH64)
+        set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc")
+    endif ()
+endif ()
+
 message(STATUS "Default libraries: ${DEFAULT_LIBS}")
 
 set(CMAKE_CXX_STANDARD_LIBRARIES ${DEFAULT_LIBS})
diff --git a/cmake/darwin/toolchain-aarch64.cmake b/cmake/darwin/toolchain-aarch64.cmake
new file mode 100644
index 00000000000..81398111495
--- /dev/null
+++ b/cmake/darwin/toolchain-aarch64.cmake
@@ -0,0 +1,14 @@
+set (CMAKE_SYSTEM_NAME "Darwin")
+set (CMAKE_SYSTEM_PROCESSOR "aarch64")
+set (CMAKE_C_COMPILER_TARGET "aarch64-apple-darwin")
+set (CMAKE_CXX_COMPILER_TARGET "aarch64-apple-darwin")
+set (CMAKE_ASM_COMPILER_TARGET "aarch64-apple-darwin")
+set (CMAKE_OSX_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/darwin-aarch64")
+
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
+
+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/find/amqpcpp.cmake b/cmake/find/amqpcpp.cmake
index 4191dce26bb..a4a58349508 100644
--- a/cmake/find/amqpcpp.cmake
+++ b/cmake/find/amqpcpp.cmake
@@ -1,3 +1,8 @@
+if (MISSING_INTERNAL_LIBUV_LIBRARY)
+    message (WARNING "Can't find internal libuv needed for AMQP-CPP library")
+    set (ENABLE_AMQPCPP OFF CACHE INTERNAL "")
+endif()
+
 option(ENABLE_AMQPCPP "Enalbe AMQP-CPP" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_AMQPCPP)
@@ -12,11 +17,13 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/CMakeLists.txt")
 endif ()
 
 set (USE_AMQPCPP 1)
-set (AMQPCPP_LIBRARY AMQP-CPP)
+set (AMQPCPP_LIBRARY amqp-cpp)
 
 set (AMQPCPP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/include")
 list (APPEND AMQPCPP_INCLUDE_DIR
-        "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/include"
+        "${LIBUV_INCLUDE_DIR}"
         "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
 
+list (APPEND AMQPCPP_LIBRARY  "${LIBUV_LIBRARY}")
+
 message (STATUS "Using AMQP-CPP=${USE_AMQPCPP}: ${AMQPCPP_INCLUDE_DIR} : ${AMQPCPP_LIBRARY}")
diff --git a/cmake/find/cassandra.cmake b/cmake/find/cassandra.cmake
index 037d6c3f131..b6e97ff5ef8 100644
--- a/cmake/find/cassandra.cmake
+++ b/cmake/find/cassandra.cmake
@@ -1,3 +1,8 @@
+if (MISSING_INTERNAL_LIBUV_LIBRARY)
+    message (WARNING "Disabling cassandra due to missing libuv")
+    set (ENABLE_CASSANDRA OFF CACHE INTERNAL "")
+endif()
+
 option(ENABLE_CASSANDRA "Enable Cassandra" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_CASSANDRA)
@@ -8,27 +13,22 @@ if (APPLE)
     set(CMAKE_MACOSX_RPATH ON)
 endif()
 
-if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libuv")
-    message (ERROR "submodule contrib/libuv is missing. to fix try run: \n git submodule update --init --recursive")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libuv needed for Cassandra")
-elseif (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
+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 (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal Cassandra")
-else()
-    set (LIBUV_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libuv")
-    set (CASSANDRA_INCLUDE_DIR
-            "${ClickHouse_SOURCE_DIR}/contrib/cassandra/include/")
-    if (MAKE_STATIC_LIBRARIES)
-        set (LIBUV_LIBRARY uv_a)
-        set (CASSANDRA_LIBRARY cassandra_static)
-    else()
-        set (LIBUV_LIBRARY uv)
-        set (CASSANDRA_LIBRARY cassandra)
-    endif()
-
-    set (USE_CASSANDRA 1)
-    set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
+    set (USE_CASSANDRA 0)
+    return()
 endif()
 
+set (USE_CASSANDRA 1)
+set (CASSANDRA_INCLUDE_DIR
+        "${ClickHouse_SOURCE_DIR}/contrib/cassandra/include/")
+if (MAKE_STATIC_LIBRARIES)
+    set (CASSANDRA_LIBRARY cassandra_static)
+else()
+    set (CASSANDRA_LIBRARY cassandra)
+endif()
+
+set (CASS_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
+
 message (STATUS "Using cassandra=${USE_CASSANDRA}: ${CASSANDRA_INCLUDE_DIR} : ${CASSANDRA_LIBRARY}")
-message (STATUS "Using libuv: ${LIBUV_ROOT_DIR} : ${LIBUV_LIBRARY}")
diff --git a/cmake/find/ccache.cmake b/cmake/find/ccache.cmake
index fea1f8b4c97..986c9cb5fe2 100644
--- a/cmake/find/ccache.cmake
+++ b/cmake/find/ccache.cmake
@@ -32,7 +32,9 @@ if (CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
    if (CCACHE_VERSION VERSION_GREATER "3.2.0" OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
       message(STATUS "Using ${CCACHE_FOUND} ${CCACHE_VERSION}")
 
-      set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_FOUND})
+      set (CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_FOUND} ${CMAKE_CXX_COMPILER_LAUNCHER})
+      set (CMAKE_C_COMPILER_LAUNCHER ${CCACHE_FOUND} ${CMAKE_C_COMPILER_LAUNCHER})
+
       set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_FOUND})
 
       # debian (debhelpers) set SOURCE_DATE_EPOCH environment variable, that is
diff --git a/cmake/find/ldap.cmake b/cmake/find/ldap.cmake
index 0dffa334e73..d8baea89429 100644
--- a/cmake/find/ldap.cmake
+++ b/cmake/find/ldap.cmake
@@ -64,7 +64,8 @@ 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 "darwin"  AND "${_system_processor}" STREQUAL "x86_64"  )
+        ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "x86_64"  ) OR
+        ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "aarch64"   )
     )
         set (_ldap_supported_platform TRUE)
     endif ()
diff --git a/cmake/find/libuv.cmake b/cmake/find/libuv.cmake
new file mode 100644
index 00000000000..f0023209309
--- /dev/null
+++ b/cmake/find/libuv.cmake
@@ -0,0 +1,22 @@
+if (OS_DARWIN AND COMPILER_GCC)
+    message (WARNING "libuv cannot be built with GCC in macOS due to a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93082")
+    SET(MISSING_INTERNAL_LIBUV_LIBRARY 1)
+    return()
+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")
+    SET(MISSING_INTERNAL_LIBUV_LIBRARY 1)
+    return()
+endif()
+
+if (MAKE_STATIC_LIBRARIES)
+    set (LIBUV_LIBRARY uv_a)
+else()
+    set (LIBUV_LIBRARY uv)
+endif()
+
+set (LIBUV_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libuv")
+set (LIBUV_INCLUDE_DIR "${LIBUV_ROOT_DIR}/include")
+
+message (STATUS "Using libuv: ${LIBUV_ROOT_DIR} : ${LIBUV_LIBRARY}")
diff --git a/cmake/find/llvm.cmake b/cmake/find/llvm.cmake
index e0ba1d9b039..816164bef10 100644
--- a/cmake/find/llvm.cmake
+++ b/cmake/find/llvm.cmake
@@ -1,108 +1,39 @@
-if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64)
+if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
     set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
 endif()
 
-option (ENABLE_EMBEDDED_COMPILER "Set to TRUE to enable support for 'compile_expressions' option for query execution" ${ENABLE_LIBRARIES})
-# Broken in macos. TODO: update clang, re-test, enable on Apple
-if (ENABLE_EMBEDDED_COMPILER AND NOT SPLIT_SHARED_LIBRARIES AND ARCH_AMD64 AND NOT (SANITIZE STREQUAL "undefined"))
-    option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library." ${NOT_UNBUNDLED})
-endif()
+option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ON)
 
 if (NOT ENABLE_EMBEDDED_COMPILER)
-    if(USE_INTERNAL_LLVM_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal LLVM library with ENABLE_EMBEDDED_COMPILER=OFF")
-    endif()
+    set (USE_EMBEDDED_COMPILER 0)
     return()
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt")
-    if (USE_INTERNAL_LLVM_LIBRARY)
-        message (WARNING "submodule contrib/llvm is missing. to fix try run: \n git submodule update --init --recursive")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't fidd internal LLVM library")
-    endif()
-    set (MISSING_INTERNAL_LLVM_LIBRARY 1)
+    message (${RECONFIGURE_MESSAGE_LEVEL} "submodule /contrib/llvm is missing. to fix try run: \n git submodule update --init --recursive")
 endif ()
 
-if (NOT USE_INTERNAL_LLVM_LIBRARY)
-    set (LLVM_PATHS "/usr/local/lib/llvm")
+set (USE_EMBEDDED_COMPILER 1)
 
-    foreach(llvm_v 10 9 8)
-        if (NOT LLVM_FOUND)
-            find_package (LLVM ${llvm_v} CONFIG PATHS ${LLVM_PATHS})
-        endif ()
-    endforeach ()
+set (LLVM_FOUND 1)
+set (LLVM_VERSION "12.0.0bundled")
+set (LLVM_INCLUDE_DIRS
+    "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/include"
+    "${ClickHouse_BINARY_DIR}/contrib/llvm/llvm/include"
+)
+set (LLVM_LIBRARY_DIRS "${ClickHouse_BINARY_DIR}/contrib/llvm/llvm")
 
-    if (LLVM_FOUND)
-        # Remove dynamically-linked zlib and libedit from LLVM's dependencies:
-        set_target_properties(LLVMSupport PROPERTIES INTERFACE_LINK_LIBRARIES "-lpthread;LLVMDemangle;${ZLIB_LIBRARIES}")
-        set_target_properties(LLVMLineEditor PROPERTIES INTERFACE_LINK_LIBRARIES "LLVMSupport")
-
-        option(LLVM_HAS_RTTI "Enable if LLVM was build with RTTI enabled" ON)
-        set (USE_EMBEDDED_COMPILER 1)
-    else()
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system LLVM")
-        set (USE_EMBEDDED_COMPILER 0)
-    endif()
-
-    if (LLVM_FOUND AND OS_LINUX AND USE_LIBCXX AND NOT FORCE_LLVM_WITH_LIBCXX)
-        message(WARNING "Option USE_INTERNAL_LLVM_LIBRARY is not set but the LLVM library from OS packages "
-                "in Linux is incompatible with libc++ ABI. LLVM Will be disabled. Force: -DFORCE_LLVM_WITH_LIBCXX=ON")
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Unsupported LLVM configuration, cannot enable LLVM")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    endif ()
-endif()
-
-if(NOT LLVM_FOUND AND NOT MISSING_INTERNAL_LLVM_LIBRARY)
-    if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-        message(WARNING "Option ENABLE_EMBEDDED_COMPILER is set but internal LLVM library cannot build if build directory is the same as source directory.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    elseif (SPLIT_SHARED_LIBRARIES)
-        # llvm-tablegen cannot find shared libraries that we build. Probably can be easily fixed.
-        message(WARNING "Option USE_INTERNAL_LLVM_LIBRARY is not compatible with SPLIT_SHARED_LIBRARIES. Build of LLVM will be disabled.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    elseif (NOT ARCH_AMD64)
-        # It's not supported yet, but you can help.
-        message(WARNING "Option USE_INTERNAL_LLVM_LIBRARY is only available for x86_64. Build of LLVM will be disabled.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    elseif (SANITIZE STREQUAL "undefined")
-        # llvm-tblgen, that is used during LLVM build, doesn't work with UBSan.
-        message(WARNING "Option USE_INTERNAL_LLVM_LIBRARY does not work with UBSan, because 'llvm-tblgen' tool from LLVM has undefined behaviour. Build of LLVM will be disabled.")
-        set (LLVM_FOUND 0)
-        set (USE_EMBEDDED_COMPILER 0)
-    else ()
-        set (USE_INTERNAL_LLVM_LIBRARY ON)
-        set (LLVM_FOUND 1)
-        set (USE_EMBEDDED_COMPILER 1)
-        set (LLVM_VERSION "9.0.0bundled")
-        set (LLVM_INCLUDE_DIRS
-            "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/include"
-            "${ClickHouse_BINARY_DIR}/contrib/llvm/llvm/include"
-        )
-        set (LLVM_LIBRARY_DIRS "${ClickHouse_BINARY_DIR}/contrib/llvm/llvm")
-    endif()
-endif()
-
-if (LLVM_FOUND)
-    message(STATUS "LLVM include Directory: ${LLVM_INCLUDE_DIRS}")
-    message(STATUS "LLVM library Directory: ${LLVM_LIBRARY_DIRS}")
-    message(STATUS "LLVM C++ compiler flags: ${LLVM_CXXFLAGS}")
-else()
-    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't enable LLVM")
-endif()
+message(STATUS "LLVM include Directory: ${LLVM_INCLUDE_DIRS}")
+message(STATUS "LLVM library Directory: ${LLVM_LIBRARY_DIRS}")
+message(STATUS "LLVM C++ compiler flags: ${LLVM_CXXFLAGS}")
 
 # This list was generated by listing all LLVM libraries, compiling the binary and removing all libraries while it still compiles.
 set (REQUIRED_LLVM_LIBRARIES
-LLVMOrcJIT
 LLVMExecutionEngine
 LLVMRuntimeDyld
 LLVMX86CodeGen
 LLVMX86Desc
 LLVMX86Info
-LLVMX86Utils
 LLVMAsmPrinter
 LLVMDebugInfoDWARF
 LLVMGlobalISel
diff --git a/cmake/find/nanodbc.cmake b/cmake/find/nanodbc.cmake
new file mode 100644
index 00000000000..894a2a60bad
--- /dev/null
+++ b/cmake/find/nanodbc.cmake
@@ -0,0 +1,16 @@
+if (NOT ENABLE_ODBC)
+    return ()
+endif ()
+
+if (NOT USE_INTERNAL_NANODBC_LIBRARY)
+    message (FATAL_ERROR "Only the bundled nanodbc library can be used")
+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")
+endif()
+
+set (NANODBC_LIBRARY nanodbc)
+set (NANODBC_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc/nanodbc")
+
+message (STATUS "Using nanodbc: ${NANODBC_INCLUDE_DIR} : ${NANODBC_LIBRARY}")
diff --git a/cmake/find/nuraft.cmake b/cmake/find/nuraft.cmake
index 7fa5251946e..4e5258e132f 100644
--- a/cmake/find/nuraft.cmake
+++ b/cmake/find/nuraft.cmake
@@ -11,7 +11,7 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/NuRaft/CMakeLists.txt")
     return()
 endif ()
 
-if (NOT OS_FREEBSD AND NOT OS_DARWIN)
+if (NOT OS_FREEBSD)
     set (USE_NURAFT 1)
     set (NURAFT_LIBRARY nuraft)
 
diff --git a/cmake/find/odbc.cmake b/cmake/find/odbc.cmake
index a23f0c831e9..c475e600c0d 100644
--- a/cmake/find/odbc.cmake
+++ b/cmake/find/odbc.cmake
@@ -50,4 +50,6 @@ if (NOT EXTERNAL_ODBC_LIBRARY_FOUND)
     set (USE_INTERNAL_ODBC_LIBRARY 1)
 endif ()
 
+set (USE_INTERNAL_NANODBC_LIBRARY 1)
+
 message (STATUS "Using unixodbc")
diff --git a/cmake/find/rocksdb.cmake b/cmake/find/rocksdb.cmake
index 968cdb52407..94278a603d7 100644
--- a/cmake/find/rocksdb.cmake
+++ b/cmake/find/rocksdb.cmake
@@ -1,3 +1,7 @@
+if (OS_DARWIN AND ARCH_AARCH64)
+    set (ENABLE_ROCKSDB OFF CACHE INTERNAL "")
+endif()
+
 option(ENABLE_ROCKSDB "Enable ROCKSDB" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_ROCKSDB)
diff --git a/cmake/find/termcap.cmake b/cmake/find/termcap.cmake
deleted file mode 100644
index 58454165785..00000000000
--- a/cmake/find/termcap.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-if (ENABLE_EMBEDDED_COMPILER AND NOT USE_INTERNAL_LLVM_LIBRARY AND USE_STATIC_LIBRARIES)
-    find_library (TERMCAP_LIBRARY tinfo)
-    if (NOT TERMCAP_LIBRARY)
-        find_library (TERMCAP_LIBRARY ncurses)
-    endif()
-    if (NOT TERMCAP_LIBRARY)
-        find_library (TERMCAP_LIBRARY termcap)
-    endif()
-
-    if (NOT TERMCAP_LIBRARY)
-        message (FATAL_ERROR "Statically Linking external LLVM requires termcap")
-    endif()
-
-    target_link_libraries(LLVMSupport INTERFACE ${TERMCAP_LIBRARY})
-
-    message (STATUS "Using termcap: ${TERMCAP_LIBRARY}")
-endif()
diff --git a/cmake/find/xz.cmake b/cmake/find/xz.cmake
new file mode 100644
index 00000000000..0d19859c6b1
--- /dev/null
+++ b/cmake/find/xz.cmake
@@ -0,0 +1,27 @@
+option (USE_INTERNAL_XZ_LIBRARY "Set to OFF to use system xz (lzma) library instead of bundled" ${NOT_UNBUNDLED})
+
+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 (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal xz (lzma) library")
+        set(USE_INTERNAL_XZ_LIBRARY 0)
+    endif()
+    set(MISSING_INTERNAL_XZ_LIBRARY 1)
+endif()
+
+if (NOT USE_INTERNAL_XZ_LIBRARY)
+    find_library (XZ_LIBRARY lzma)
+    find_path (XZ_INCLUDE_DIR NAMES lzma.h PATHS ${XZ_INCLUDE_PATHS})
+    if (NOT XZ_LIBRARY OR NOT XZ_INCLUDE_DIR)
+        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system xz (lzma) library")
+    endif ()
+endif ()
+
+if (XZ_LIBRARY AND XZ_INCLUDE_DIR)
+elseif (NOT MISSING_INTERNAL_XZ_LIBRARY)
+    set (USE_INTERNAL_XZ_LIBRARY 1)
+    set (XZ_LIBRARY liblzma)
+    set (XZ_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/xz/src/liblzma/api)
+endif ()
+
+message (STATUS "Using xz (lzma): ${XZ_INCLUDE_DIR} : ${XZ_LIBRARY}")
diff --git a/cmake/find/yaml-cpp.cmake b/cmake/find/yaml-cpp.cmake
new file mode 100644
index 00000000000..9b9d9bd39d6
--- /dev/null
+++ b/cmake/find/yaml-cpp.cmake
@@ -0,0 +1,9 @@
+option(USE_YAML_CPP "Enable yaml-cpp" ${ENABLE_LIBRARIES})
+
+if (NOT USE_YAML_CPP)
+    return()
+endif()
+
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/yaml-cpp")
+    message (ERROR "submodule contrib/yaml-cpp is missing. to fix try run: \n git submodule update --init --recursive")
+endif()
diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake
index 6c23ce8bc91..f60f7431389 100644
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@@ -40,7 +40,7 @@ if (SANITIZE)
         # RelWithDebInfo, and downgrade optimizations to -O1 but not to -Og, to
         # keep the binary size down.
         # TODO: try compiling with -Og and with ld.gold.
-        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/msan_suppressions.txt")
+        set (MSAN_FLAGS "-fsanitize=memory -fsanitize-memory-use-after-dtor -fsanitize-memory-track-origins -fno-optimize-sibling-calls -fsanitize-blacklist=${CMAKE_SOURCE_DIR}/tests/msan_suppressions.txt")
 
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} ${MSAN_FLAGS}")
diff --git a/cmake/target.cmake b/cmake/target.cmake
index 7174ca3c2a9..d1a0b8f9cbf 100644
--- a/cmake/target.cmake
+++ b/cmake/target.cmake
@@ -12,6 +12,9 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
     set (OS_DARWIN 1)
     add_definitions(-D OS_DARWIN)
+elseif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    set (OS_SUNOS 1)
+    add_definitions(-D OS_SUNOS)
 endif ()
 
 if (CMAKE_CROSSCOMPILING)
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 44fc3b3e530..8ff94ab867b 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -8,10 +8,13 @@ endif ()
 
 if (COMPILER_GCC)
     # Require minimum version of gcc
-    set (GCC_MINIMUM_VERSION 9)
+    set (GCC_MINIMUM_VERSION 10)
     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 ()
+
+    message (WARNING "GCC compiler is not officially supported for ClickHouse. You should migrate to clang.")
+
 elseif (COMPILER_CLANG)
     # Require minimum version of clang/apple-clang
     if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index a398c59e981..a85fe8963c7 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -171,6 +171,7 @@ elseif (COMPILER_GCC)
     add_cxx_compile_options(-Wtrampolines)
     # Obvious
     add_cxx_compile_options(-Wunused)
+    add_cxx_compile_options(-Wundef)
     # Warn if vector operation is not implemented via SIMD capabilities of the architecture
     add_cxx_compile_options(-Wvector-operation-performance)
     # XXX: libstdc++ has some of these for 3way compare
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 4aeb67a5085..c499da9d087 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -1,4 +1,3 @@
-# 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
@@ -11,8 +10,10 @@ else ()
 endif ()
 unset (_current_dir_name)
 
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+# Third-party libraries may have substandard code.
+# Also remove a possible source of nondeterminism.
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w -D__DATE__= -D__TIME__= -D__TIMESTAMP__=")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w -D__DATE__= -D__TIME__= -D__TIMESTAMP__=")
 
 if (WITH_COVERAGE)
   set (WITHOUT_COVERAGE_LIST ${WITHOUT_COVERAGE})
@@ -47,7 +48,15 @@ add_subdirectory (lz4-cmake)
 add_subdirectory (murmurhash)
 add_subdirectory (replxx-cmake)
 add_subdirectory (unixodbc-cmake)
-add_subdirectory (xz)
+add_subdirectory (nanodbc-cmake)
+
+if (USE_YAML_CPP)
+    add_subdirectory (yaml-cpp-cmake)
+endif()
+
+if (USE_INTERNAL_XZ_LIBRARY)
+    add_subdirectory (xz)
+endif()
 
 add_subdirectory (poco-cmake)
 add_subdirectory (croaring-cmake)
@@ -93,14 +102,8 @@ if (USE_INTERNAL_ZLIB_LIBRARY)
     add_subdirectory (${INTERNAL_ZLIB_NAME})
     # We should use same defines when including zlib.h as used when zlib compiled
     target_compile_definitions (zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
-    if (TARGET zlibstatic)
-        target_compile_definitions (zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP)
-    endif ()
     if (ARCH_AMD64 OR ARCH_AARCH64)
         target_compile_definitions (zlib PUBLIC X86_64 UNALIGNED_OK)
-        if (TARGET zlibstatic)
-            target_compile_definitions (zlibstatic PUBLIC X86_64 UNALIGNED_OK)
-        endif ()
     endif ()
 endif ()
 
@@ -206,11 +209,12 @@ elseif(GTEST_SRC_DIR)
     target_compile_definitions(gtest INTERFACE GTEST_HAS_POSIX_RE=0)
 endif()
 
-if (USE_EMBEDDED_COMPILER AND USE_INTERNAL_LLVM_LIBRARY)
+if (USE_EMBEDDED_COMPILER)
     # ld: unknown option: --color-diagnostics
     if (APPLE)
         set (LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL "")
     endif ()
+
     set (LLVM_ENABLE_EH 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_RTTI 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_PIC 0 CACHE INTERNAL "")
@@ -225,8 +229,6 @@ if (USE_EMBEDDED_COMPILER AND USE_INTERNAL_LLVM_LIBRARY)
 
     set (CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_bak})
     unset (CMAKE_CXX_STANDARD_bak)
-
-    target_include_directories(LLVMSupport SYSTEM BEFORE PRIVATE ${ZLIB_INCLUDE_DIR})
 endif ()
 
 if (USE_INTERNAL_LIBGSASL_LIBRARY)
diff --git a/contrib/NuRaft b/contrib/NuRaft
index 70468326ad5..2a1bf7d87b4 160000
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@@ -1 +1 @@
-Subproject commit 70468326ad5d72e9497944838484c591dae054ea
+Subproject commit 2a1bf7d87b4a03561fc66fbb49cee8a288983c5d
diff --git a/contrib/amqpcpp-cmake/CMakeLists.txt b/contrib/amqpcpp-cmake/CMakeLists.txt
index 4853983680e..4e8342af125 100644
--- a/contrib/amqpcpp-cmake/CMakeLists.txt
+++ b/contrib/amqpcpp-cmake/CMakeLists.txt
@@ -1,25 +1,25 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP")
 
 set (SRCS
-    ${LIBRARY_DIR}/src/array.cpp
-    ${LIBRARY_DIR}/src/channel.cpp
-    ${LIBRARY_DIR}/src/channelimpl.cpp
-    ${LIBRARY_DIR}/src/connectionimpl.cpp
-    ${LIBRARY_DIR}/src/deferredcancel.cpp
-    ${LIBRARY_DIR}/src/deferredconfirm.cpp
-    ${LIBRARY_DIR}/src/deferredconsumer.cpp
-    ${LIBRARY_DIR}/src/deferredextreceiver.cpp
-    ${LIBRARY_DIR}/src/deferredget.cpp
-    ${LIBRARY_DIR}/src/deferredpublisher.cpp
-    ${LIBRARY_DIR}/src/deferredreceiver.cpp
-    ${LIBRARY_DIR}/src/field.cpp
-    ${LIBRARY_DIR}/src/flags.cpp
-    ${LIBRARY_DIR}/src/linux_tcp/openssl.cpp
-    ${LIBRARY_DIR}/src/linux_tcp/tcpconnection.cpp
-    ${LIBRARY_DIR}/src/inbuffer.cpp
-    ${LIBRARY_DIR}/src/receivedframe.cpp
-    ${LIBRARY_DIR}/src/table.cpp
-    ${LIBRARY_DIR}/src/watchable.cpp
+    "${LIBRARY_DIR}/src/array.cpp"
+    "${LIBRARY_DIR}/src/channel.cpp"
+    "${LIBRARY_DIR}/src/channelimpl.cpp"
+    "${LIBRARY_DIR}/src/connectionimpl.cpp"
+    "${LIBRARY_DIR}/src/deferredcancel.cpp"
+    "${LIBRARY_DIR}/src/deferredconfirm.cpp"
+    "${LIBRARY_DIR}/src/deferredconsumer.cpp"
+    "${LIBRARY_DIR}/src/deferredextreceiver.cpp"
+    "${LIBRARY_DIR}/src/deferredget.cpp"
+    "${LIBRARY_DIR}/src/deferredpublisher.cpp"
+    "${LIBRARY_DIR}/src/deferredreceiver.cpp"
+    "${LIBRARY_DIR}/src/field.cpp"
+    "${LIBRARY_DIR}/src/flags.cpp"
+    "${LIBRARY_DIR}/src/linux_tcp/openssl.cpp"
+    "${LIBRARY_DIR}/src/linux_tcp/tcpconnection.cpp"
+    "${LIBRARY_DIR}/src/inbuffer.cpp"
+    "${LIBRARY_DIR}/src/receivedframe.cpp"
+    "${LIBRARY_DIR}/src/table.cpp"
+    "${LIBRARY_DIR}/src/watchable.cpp"
 )
 
 add_library(amqp-cpp ${SRCS})
@@ -39,7 +39,7 @@ target_compile_options (amqp-cpp
         -w
 )
 
-target_include_directories (amqp-cpp SYSTEM PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories (amqp-cpp SYSTEM PUBLIC "${LIBRARY_DIR}/include")
 
 target_link_libraries (amqp-cpp PUBLIC ssl)
 
diff --git a/contrib/antlr4-runtime b/contrib/antlr4-runtime
index a2fa7b76e2e..672643e9a42 160000
--- a/contrib/antlr4-runtime
+++ b/contrib/antlr4-runtime
@@ -1 +1 @@
-Subproject commit a2fa7b76e2ee16d2ad955e9214a90bbf79da66fc
+Subproject commit 672643e9a427ef803abf13bc8cb4989606553d64
diff --git a/contrib/antlr4-runtime-cmake/CMakeLists.txt b/contrib/antlr4-runtime-cmake/CMakeLists.txt
index 5baefdb1e29..4f639a33ebf 100644
--- a/contrib/antlr4-runtime-cmake/CMakeLists.txt
+++ b/contrib/antlr4-runtime-cmake/CMakeLists.txt
@@ -1,154 +1,154 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/antlr4-runtime)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/antlr4-runtime")
 
 set (SRCS
-    ${LIBRARY_DIR}/ANTLRErrorListener.cpp
-    ${LIBRARY_DIR}/ANTLRErrorStrategy.cpp
-    ${LIBRARY_DIR}/ANTLRFileStream.cpp
-    ${LIBRARY_DIR}/ANTLRInputStream.cpp
-    ${LIBRARY_DIR}/atn/AbstractPredicateTransition.cpp
-    ${LIBRARY_DIR}/atn/ActionTransition.cpp
-    ${LIBRARY_DIR}/atn/AmbiguityInfo.cpp
-    ${LIBRARY_DIR}/atn/ArrayPredictionContext.cpp
-    ${LIBRARY_DIR}/atn/ATN.cpp
-    ${LIBRARY_DIR}/atn/ATNConfig.cpp
-    ${LIBRARY_DIR}/atn/ATNConfigSet.cpp
-    ${LIBRARY_DIR}/atn/ATNDeserializationOptions.cpp
-    ${LIBRARY_DIR}/atn/ATNDeserializer.cpp
-    ${LIBRARY_DIR}/atn/ATNSerializer.cpp
-    ${LIBRARY_DIR}/atn/ATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/ATNState.cpp
-    ${LIBRARY_DIR}/atn/AtomTransition.cpp
-    ${LIBRARY_DIR}/atn/BasicBlockStartState.cpp
-    ${LIBRARY_DIR}/atn/BasicState.cpp
-    ${LIBRARY_DIR}/atn/BlockEndState.cpp
-    ${LIBRARY_DIR}/atn/BlockStartState.cpp
-    ${LIBRARY_DIR}/atn/ContextSensitivityInfo.cpp
-    ${LIBRARY_DIR}/atn/DecisionEventInfo.cpp
-    ${LIBRARY_DIR}/atn/DecisionInfo.cpp
-    ${LIBRARY_DIR}/atn/DecisionState.cpp
-    ${LIBRARY_DIR}/atn/EmptyPredictionContext.cpp
-    ${LIBRARY_DIR}/atn/EpsilonTransition.cpp
-    ${LIBRARY_DIR}/atn/ErrorInfo.cpp
-    ${LIBRARY_DIR}/atn/LexerAction.cpp
-    ${LIBRARY_DIR}/atn/LexerActionExecutor.cpp
-    ${LIBRARY_DIR}/atn/LexerATNConfig.cpp
-    ${LIBRARY_DIR}/atn/LexerATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/LexerChannelAction.cpp
-    ${LIBRARY_DIR}/atn/LexerCustomAction.cpp
-    ${LIBRARY_DIR}/atn/LexerIndexedCustomAction.cpp
-    ${LIBRARY_DIR}/atn/LexerModeAction.cpp
-    ${LIBRARY_DIR}/atn/LexerMoreAction.cpp
-    ${LIBRARY_DIR}/atn/LexerPopModeAction.cpp
-    ${LIBRARY_DIR}/atn/LexerPushModeAction.cpp
-    ${LIBRARY_DIR}/atn/LexerSkipAction.cpp
-    ${LIBRARY_DIR}/atn/LexerTypeAction.cpp
-    ${LIBRARY_DIR}/atn/LL1Analyzer.cpp
-    ${LIBRARY_DIR}/atn/LookaheadEventInfo.cpp
-    ${LIBRARY_DIR}/atn/LoopEndState.cpp
-    ${LIBRARY_DIR}/atn/NotSetTransition.cpp
-    ${LIBRARY_DIR}/atn/OrderedATNConfigSet.cpp
-    ${LIBRARY_DIR}/atn/ParseInfo.cpp
-    ${LIBRARY_DIR}/atn/ParserATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/PlusBlockStartState.cpp
-    ${LIBRARY_DIR}/atn/PlusLoopbackState.cpp
-    ${LIBRARY_DIR}/atn/PrecedencePredicateTransition.cpp
-    ${LIBRARY_DIR}/atn/PredicateEvalInfo.cpp
-    ${LIBRARY_DIR}/atn/PredicateTransition.cpp
-    ${LIBRARY_DIR}/atn/PredictionContext.cpp
-    ${LIBRARY_DIR}/atn/PredictionMode.cpp
-    ${LIBRARY_DIR}/atn/ProfilingATNSimulator.cpp
-    ${LIBRARY_DIR}/atn/RangeTransition.cpp
-    ${LIBRARY_DIR}/atn/RuleStartState.cpp
-    ${LIBRARY_DIR}/atn/RuleStopState.cpp
-    ${LIBRARY_DIR}/atn/RuleTransition.cpp
-    ${LIBRARY_DIR}/atn/SemanticContext.cpp
-    ${LIBRARY_DIR}/atn/SetTransition.cpp
-    ${LIBRARY_DIR}/atn/SingletonPredictionContext.cpp
-    ${LIBRARY_DIR}/atn/StarBlockStartState.cpp
-    ${LIBRARY_DIR}/atn/StarLoopbackState.cpp
-    ${LIBRARY_DIR}/atn/StarLoopEntryState.cpp
-    ${LIBRARY_DIR}/atn/TokensStartState.cpp
-    ${LIBRARY_DIR}/atn/Transition.cpp
-    ${LIBRARY_DIR}/atn/WildcardTransition.cpp
-    ${LIBRARY_DIR}/BailErrorStrategy.cpp
-    ${LIBRARY_DIR}/BaseErrorListener.cpp
-    ${LIBRARY_DIR}/BufferedTokenStream.cpp
-    ${LIBRARY_DIR}/CharStream.cpp
-    ${LIBRARY_DIR}/CommonToken.cpp
-    ${LIBRARY_DIR}/CommonTokenFactory.cpp
-    ${LIBRARY_DIR}/CommonTokenStream.cpp
-    ${LIBRARY_DIR}/ConsoleErrorListener.cpp
-    ${LIBRARY_DIR}/DefaultErrorStrategy.cpp
-    ${LIBRARY_DIR}/dfa/DFA.cpp
-    ${LIBRARY_DIR}/dfa/DFASerializer.cpp
-    ${LIBRARY_DIR}/dfa/DFAState.cpp
-    ${LIBRARY_DIR}/dfa/LexerDFASerializer.cpp
-    ${LIBRARY_DIR}/DiagnosticErrorListener.cpp
-    ${LIBRARY_DIR}/Exceptions.cpp
-    ${LIBRARY_DIR}/FailedPredicateException.cpp
-    ${LIBRARY_DIR}/InputMismatchException.cpp
-    ${LIBRARY_DIR}/InterpreterRuleContext.cpp
-    ${LIBRARY_DIR}/IntStream.cpp
-    ${LIBRARY_DIR}/Lexer.cpp
-    ${LIBRARY_DIR}/LexerInterpreter.cpp
-    ${LIBRARY_DIR}/LexerNoViableAltException.cpp
-    ${LIBRARY_DIR}/ListTokenSource.cpp
-    ${LIBRARY_DIR}/misc/InterpreterDataReader.cpp
-    ${LIBRARY_DIR}/misc/Interval.cpp
-    ${LIBRARY_DIR}/misc/IntervalSet.cpp
-    ${LIBRARY_DIR}/misc/MurmurHash.cpp
-    ${LIBRARY_DIR}/misc/Predicate.cpp
-    ${LIBRARY_DIR}/NoViableAltException.cpp
-    ${LIBRARY_DIR}/Parser.cpp
-    ${LIBRARY_DIR}/ParserInterpreter.cpp
-    ${LIBRARY_DIR}/ParserRuleContext.cpp
-    ${LIBRARY_DIR}/ProxyErrorListener.cpp
-    ${LIBRARY_DIR}/RecognitionException.cpp
-    ${LIBRARY_DIR}/Recognizer.cpp
-    ${LIBRARY_DIR}/RuleContext.cpp
-    ${LIBRARY_DIR}/RuleContextWithAltNum.cpp
-    ${LIBRARY_DIR}/RuntimeMetaData.cpp
-    ${LIBRARY_DIR}/support/Any.cpp
-    ${LIBRARY_DIR}/support/Arrays.cpp
-    ${LIBRARY_DIR}/support/CPPUtils.cpp
-    ${LIBRARY_DIR}/support/guid.cpp
-    ${LIBRARY_DIR}/support/StringUtils.cpp
-    ${LIBRARY_DIR}/Token.cpp
-    ${LIBRARY_DIR}/TokenSource.cpp
-    ${LIBRARY_DIR}/TokenStream.cpp
-    ${LIBRARY_DIR}/TokenStreamRewriter.cpp
-    ${LIBRARY_DIR}/tree/ErrorNode.cpp
-    ${LIBRARY_DIR}/tree/ErrorNodeImpl.cpp
-    ${LIBRARY_DIR}/tree/IterativeParseTreeWalker.cpp
-    ${LIBRARY_DIR}/tree/ParseTree.cpp
-    ${LIBRARY_DIR}/tree/ParseTreeListener.cpp
-    ${LIBRARY_DIR}/tree/ParseTreeVisitor.cpp
-    ${LIBRARY_DIR}/tree/ParseTreeWalker.cpp
-    ${LIBRARY_DIR}/tree/pattern/Chunk.cpp
-    ${LIBRARY_DIR}/tree/pattern/ParseTreeMatch.cpp
-    ${LIBRARY_DIR}/tree/pattern/ParseTreePattern.cpp
-    ${LIBRARY_DIR}/tree/pattern/ParseTreePatternMatcher.cpp
-    ${LIBRARY_DIR}/tree/pattern/RuleTagToken.cpp
-    ${LIBRARY_DIR}/tree/pattern/TagChunk.cpp
-    ${LIBRARY_DIR}/tree/pattern/TextChunk.cpp
-    ${LIBRARY_DIR}/tree/pattern/TokenTagToken.cpp
-    ${LIBRARY_DIR}/tree/TerminalNode.cpp
-    ${LIBRARY_DIR}/tree/TerminalNodeImpl.cpp
-    ${LIBRARY_DIR}/tree/Trees.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPath.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathLexer.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathLexerErrorListener.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathRuleAnywhereElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathRuleElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathTokenAnywhereElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathTokenElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathWildcardAnywhereElement.cpp
-    ${LIBRARY_DIR}/tree/xpath/XPathWildcardElement.cpp
-    ${LIBRARY_DIR}/UnbufferedCharStream.cpp
-    ${LIBRARY_DIR}/UnbufferedTokenStream.cpp
-    ${LIBRARY_DIR}/Vocabulary.cpp
-    ${LIBRARY_DIR}/WritableToken.cpp
+    "${LIBRARY_DIR}/ANTLRErrorListener.cpp"
+    "${LIBRARY_DIR}/ANTLRErrorStrategy.cpp"
+    "${LIBRARY_DIR}/ANTLRFileStream.cpp"
+    "${LIBRARY_DIR}/ANTLRInputStream.cpp"
+    "${LIBRARY_DIR}/atn/AbstractPredicateTransition.cpp"
+    "${LIBRARY_DIR}/atn/ActionTransition.cpp"
+    "${LIBRARY_DIR}/atn/AmbiguityInfo.cpp"
+    "${LIBRARY_DIR}/atn/ArrayPredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/ATN.cpp"
+    "${LIBRARY_DIR}/atn/ATNConfig.cpp"
+    "${LIBRARY_DIR}/atn/ATNConfigSet.cpp"
+    "${LIBRARY_DIR}/atn/ATNDeserializationOptions.cpp"
+    "${LIBRARY_DIR}/atn/ATNDeserializer.cpp"
+    "${LIBRARY_DIR}/atn/ATNSerializer.cpp"
+    "${LIBRARY_DIR}/atn/ATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/ATNState.cpp"
+    "${LIBRARY_DIR}/atn/AtomTransition.cpp"
+    "${LIBRARY_DIR}/atn/BasicBlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/BasicState.cpp"
+    "${LIBRARY_DIR}/atn/BlockEndState.cpp"
+    "${LIBRARY_DIR}/atn/BlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/ContextSensitivityInfo.cpp"
+    "${LIBRARY_DIR}/atn/DecisionEventInfo.cpp"
+    "${LIBRARY_DIR}/atn/DecisionInfo.cpp"
+    "${LIBRARY_DIR}/atn/DecisionState.cpp"
+    "${LIBRARY_DIR}/atn/EmptyPredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/EpsilonTransition.cpp"
+    "${LIBRARY_DIR}/atn/ErrorInfo.cpp"
+    "${LIBRARY_DIR}/atn/LexerAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerActionExecutor.cpp"
+    "${LIBRARY_DIR}/atn/LexerATNConfig.cpp"
+    "${LIBRARY_DIR}/atn/LexerATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/LexerChannelAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerCustomAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerIndexedCustomAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerModeAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerMoreAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerPopModeAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerPushModeAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerSkipAction.cpp"
+    "${LIBRARY_DIR}/atn/LexerTypeAction.cpp"
+    "${LIBRARY_DIR}/atn/LL1Analyzer.cpp"
+    "${LIBRARY_DIR}/atn/LookaheadEventInfo.cpp"
+    "${LIBRARY_DIR}/atn/LoopEndState.cpp"
+    "${LIBRARY_DIR}/atn/NotSetTransition.cpp"
+    "${LIBRARY_DIR}/atn/OrderedATNConfigSet.cpp"
+    "${LIBRARY_DIR}/atn/ParseInfo.cpp"
+    "${LIBRARY_DIR}/atn/ParserATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/PlusBlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/PlusLoopbackState.cpp"
+    "${LIBRARY_DIR}/atn/PrecedencePredicateTransition.cpp"
+    "${LIBRARY_DIR}/atn/PredicateEvalInfo.cpp"
+    "${LIBRARY_DIR}/atn/PredicateTransition.cpp"
+    "${LIBRARY_DIR}/atn/PredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/PredictionMode.cpp"
+    "${LIBRARY_DIR}/atn/ProfilingATNSimulator.cpp"
+    "${LIBRARY_DIR}/atn/RangeTransition.cpp"
+    "${LIBRARY_DIR}/atn/RuleStartState.cpp"
+    "${LIBRARY_DIR}/atn/RuleStopState.cpp"
+    "${LIBRARY_DIR}/atn/RuleTransition.cpp"
+    "${LIBRARY_DIR}/atn/SemanticContext.cpp"
+    "${LIBRARY_DIR}/atn/SetTransition.cpp"
+    "${LIBRARY_DIR}/atn/SingletonPredictionContext.cpp"
+    "${LIBRARY_DIR}/atn/StarBlockStartState.cpp"
+    "${LIBRARY_DIR}/atn/StarLoopbackState.cpp"
+    "${LIBRARY_DIR}/atn/StarLoopEntryState.cpp"
+    "${LIBRARY_DIR}/atn/TokensStartState.cpp"
+    "${LIBRARY_DIR}/atn/Transition.cpp"
+    "${LIBRARY_DIR}/atn/WildcardTransition.cpp"
+    "${LIBRARY_DIR}/BailErrorStrategy.cpp"
+    "${LIBRARY_DIR}/BaseErrorListener.cpp"
+    "${LIBRARY_DIR}/BufferedTokenStream.cpp"
+    "${LIBRARY_DIR}/CharStream.cpp"
+    "${LIBRARY_DIR}/CommonToken.cpp"
+    "${LIBRARY_DIR}/CommonTokenFactory.cpp"
+    "${LIBRARY_DIR}/CommonTokenStream.cpp"
+    "${LIBRARY_DIR}/ConsoleErrorListener.cpp"
+    "${LIBRARY_DIR}/DefaultErrorStrategy.cpp"
+    "${LIBRARY_DIR}/dfa/DFA.cpp"
+    "${LIBRARY_DIR}/dfa/DFASerializer.cpp"
+    "${LIBRARY_DIR}/dfa/DFAState.cpp"
+    "${LIBRARY_DIR}/dfa/LexerDFASerializer.cpp"
+    "${LIBRARY_DIR}/DiagnosticErrorListener.cpp"
+    "${LIBRARY_DIR}/Exceptions.cpp"
+    "${LIBRARY_DIR}/FailedPredicateException.cpp"
+    "${LIBRARY_DIR}/InputMismatchException.cpp"
+    "${LIBRARY_DIR}/InterpreterRuleContext.cpp"
+    "${LIBRARY_DIR}/IntStream.cpp"
+    "${LIBRARY_DIR}/Lexer.cpp"
+    "${LIBRARY_DIR}/LexerInterpreter.cpp"
+    "${LIBRARY_DIR}/LexerNoViableAltException.cpp"
+    "${LIBRARY_DIR}/ListTokenSource.cpp"
+    "${LIBRARY_DIR}/misc/InterpreterDataReader.cpp"
+    "${LIBRARY_DIR}/misc/Interval.cpp"
+    "${LIBRARY_DIR}/misc/IntervalSet.cpp"
+    "${LIBRARY_DIR}/misc/MurmurHash.cpp"
+    "${LIBRARY_DIR}/misc/Predicate.cpp"
+    "${LIBRARY_DIR}/NoViableAltException.cpp"
+    "${LIBRARY_DIR}/Parser.cpp"
+    "${LIBRARY_DIR}/ParserInterpreter.cpp"
+    "${LIBRARY_DIR}/ParserRuleContext.cpp"
+    "${LIBRARY_DIR}/ProxyErrorListener.cpp"
+    "${LIBRARY_DIR}/RecognitionException.cpp"
+    "${LIBRARY_DIR}/Recognizer.cpp"
+    "${LIBRARY_DIR}/RuleContext.cpp"
+    "${LIBRARY_DIR}/RuleContextWithAltNum.cpp"
+    "${LIBRARY_DIR}/RuntimeMetaData.cpp"
+    "${LIBRARY_DIR}/support/Any.cpp"
+    "${LIBRARY_DIR}/support/Arrays.cpp"
+    "${LIBRARY_DIR}/support/CPPUtils.cpp"
+    "${LIBRARY_DIR}/support/guid.cpp"
+    "${LIBRARY_DIR}/support/StringUtils.cpp"
+    "${LIBRARY_DIR}/Token.cpp"
+    "${LIBRARY_DIR}/TokenSource.cpp"
+    "${LIBRARY_DIR}/TokenStream.cpp"
+    "${LIBRARY_DIR}/TokenStreamRewriter.cpp"
+    "${LIBRARY_DIR}/tree/ErrorNode.cpp"
+    "${LIBRARY_DIR}/tree/ErrorNodeImpl.cpp"
+    "${LIBRARY_DIR}/tree/IterativeParseTreeWalker.cpp"
+    "${LIBRARY_DIR}/tree/ParseTree.cpp"
+    "${LIBRARY_DIR}/tree/ParseTreeListener.cpp"
+    "${LIBRARY_DIR}/tree/ParseTreeVisitor.cpp"
+    "${LIBRARY_DIR}/tree/ParseTreeWalker.cpp"
+    "${LIBRARY_DIR}/tree/pattern/Chunk.cpp"
+    "${LIBRARY_DIR}/tree/pattern/ParseTreeMatch.cpp"
+    "${LIBRARY_DIR}/tree/pattern/ParseTreePattern.cpp"
+    "${LIBRARY_DIR}/tree/pattern/ParseTreePatternMatcher.cpp"
+    "${LIBRARY_DIR}/tree/pattern/RuleTagToken.cpp"
+    "${LIBRARY_DIR}/tree/pattern/TagChunk.cpp"
+    "${LIBRARY_DIR}/tree/pattern/TextChunk.cpp"
+    "${LIBRARY_DIR}/tree/pattern/TokenTagToken.cpp"
+    "${LIBRARY_DIR}/tree/TerminalNode.cpp"
+    "${LIBRARY_DIR}/tree/TerminalNodeImpl.cpp"
+    "${LIBRARY_DIR}/tree/Trees.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPath.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathLexer.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathLexerErrorListener.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathRuleAnywhereElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathRuleElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathTokenAnywhereElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathTokenElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathWildcardAnywhereElement.cpp"
+    "${LIBRARY_DIR}/tree/xpath/XPathWildcardElement.cpp"
+    "${LIBRARY_DIR}/UnbufferedCharStream.cpp"
+    "${LIBRARY_DIR}/UnbufferedTokenStream.cpp"
+    "${LIBRARY_DIR}/Vocabulary.cpp"
+    "${LIBRARY_DIR}/WritableToken.cpp"
 )
 
 add_library (antlr4-runtime ${SRCS})
diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt
index 4b402a9db79..deefb244beb 100644
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@@ -2,69 +2,69 @@ set (CMAKE_CXX_STANDARD 17)
 
 # === thrift
 
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp")
 # contrib/thrift/lib/cpp/CMakeLists.txt
 set(thriftcpp_SOURCES
-        ${LIBRARY_DIR}/src/thrift/TApplicationException.cpp
-        ${LIBRARY_DIR}/src/thrift/TOutput.cpp
-        ${LIBRARY_DIR}/src/thrift/async/TAsyncChannel.cpp
-        ${LIBRARY_DIR}/src/thrift/async/TAsyncProtocolProcessor.cpp
-        ${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.h
-        ${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/ThreadManager.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/TimerManager.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Util.cpp
-        ${LIBRARY_DIR}/src/thrift/processor/PeekProcessor.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TBase64Utils.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TDebugProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TJSONProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TMultiplexedProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/protocol/TProtocol.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TTransportException.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TFDTransport.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TSimpleFileTransport.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/THttpTransport.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/THttpClient.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/THttpServer.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TSocket.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TSocketPool.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TServerSocket.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TTransportUtils.cpp
-        ${LIBRARY_DIR}/src/thrift/transport/TBufferTransports.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TConnectedClient.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TServerFramework.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TSimpleServer.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TThreadPoolServer.cpp
-        ${LIBRARY_DIR}/src/thrift/server/TThreadedServer.cpp
+        "${LIBRARY_DIR}/src/thrift/TApplicationException.cpp"
+        "${LIBRARY_DIR}/src/thrift/TOutput.cpp"
+        "${LIBRARY_DIR}/src/thrift/async/TAsyncChannel.cpp"
+        "${LIBRARY_DIR}/src/thrift/async/TAsyncProtocolProcessor.cpp"
+        "${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.h"
+        "${LIBRARY_DIR}/src/thrift/async/TConcurrentClientSyncInfo.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/ThreadManager.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/TimerManager.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Util.cpp"
+        "${LIBRARY_DIR}/src/thrift/processor/PeekProcessor.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TBase64Utils.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TDebugProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TJSONProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TMultiplexedProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/protocol/TProtocol.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TTransportException.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TFDTransport.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TSimpleFileTransport.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/THttpTransport.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/THttpClient.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/THttpServer.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TSocket.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TSocketPool.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TServerSocket.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TTransportUtils.cpp"
+        "${LIBRARY_DIR}/src/thrift/transport/TBufferTransports.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TConnectedClient.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TServerFramework.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TSimpleServer.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TThreadPoolServer.cpp"
+        "${LIBRARY_DIR}/src/thrift/server/TThreadedServer.cpp"
         )
 set(thriftcpp_threads_SOURCES
-        ${LIBRARY_DIR}/src/thrift/concurrency/ThreadFactory.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Thread.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Monitor.cpp
-        ${LIBRARY_DIR}/src/thrift/concurrency/Mutex.cpp
+        "${LIBRARY_DIR}/src/thrift/concurrency/ThreadFactory.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Thread.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Monitor.cpp"
+        "${LIBRARY_DIR}/src/thrift/concurrency/Mutex.cpp"
         )
 add_library(${THRIFT_LIBRARY} ${thriftcpp_SOURCES} ${thriftcpp_threads_SOURCES})
 set_target_properties(${THRIFT_LIBRARY} PROPERTIES CXX_STANDARD 14) # REMOVE after https://github.com/apache/thrift/pull/1641
-target_include_directories(${THRIFT_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp/src)
+target_include_directories(${THRIFT_LIBRARY} SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/thrift/lib/cpp/src")
 target_link_libraries (${THRIFT_LIBRARY} PRIVATE boost::headers_only)
 
 
 # === orc
 
-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_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_BUILD_SRC_DIR ${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/src)
-set(ORC_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/include)
+set(ORC_BUILD_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/src")
+set(ORC_BUILD_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/include")
 
-set(GOOGLE_PROTOBUF_DIR ${Protobuf_INCLUDE_DIR}/)
+set(GOOGLE_PROTOBUF_DIR "${Protobuf_INCLUDE_DIR}/")
 set(ORC_ADDITION_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR})
-set(ARROW_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src)
+set(ARROW_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src")
 
 set(PROTOBUF_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
-set(PROTO_DIR ${ORC_SOURCE_DIR}/../proto)
+set(PROTO_DIR "${ORC_SOURCE_DIR}/../proto")
 
 
 add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
@@ -75,9 +75,9 @@ add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
 
 
 # === flatbuffers
-set(FLATBUFFERS_SRC_DIR ${ClickHouse_SOURCE_DIR}/contrib/flatbuffers)
-set(FLATBUFFERS_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/flatbuffers)
-set(FLATBUFFERS_INCLUDE_DIR ${FLATBUFFERS_SRC_DIR}/include)
+set(FLATBUFFERS_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/flatbuffers")
+set(FLATBUFFERS_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/flatbuffers")
+set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_SRC_DIR}/include")
 
 # set flatbuffers CMake options
 if (MAKE_STATIC_LIBRARIES)
@@ -101,187 +101,187 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CXX11_FLAGS "-std=c++0x")
 endif ()
 
-include(${ClickHouse_SOURCE_DIR}/contrib/orc/cmake_modules/CheckSourceCompiles.cmake)
+include("${ClickHouse_SOURCE_DIR}/contrib/orc/cmake_modules/CheckSourceCompiles.cmake")
 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")
 
 
 set(ORC_SRCS
-        ${ARROW_SRC_DIR}/arrow/adapters/orc/adapter.cc
-        ${ARROW_SRC_DIR}/arrow/adapters/orc/adapter_util.cc
-        ${ORC_SOURCE_SRC_DIR}/Exceptions.cc
-        ${ORC_SOURCE_SRC_DIR}/OrcFile.cc
-        ${ORC_SOURCE_SRC_DIR}/Reader.cc
-        ${ORC_SOURCE_SRC_DIR}/ByteRLE.cc
-        ${ORC_SOURCE_SRC_DIR}/ColumnPrinter.cc
-        ${ORC_SOURCE_SRC_DIR}/ColumnReader.cc
-        ${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
-        ${ORC_SOURCE_SRC_DIR}/Statistics.cc
-        ${ORC_SOURCE_SRC_DIR}/StripeStream.cc
-        ${ORC_SOURCE_SRC_DIR}/Timezone.cc
-        ${ORC_SOURCE_SRC_DIR}/TypeImpl.cc
-        ${ORC_SOURCE_SRC_DIR}/Vector.cc
-        ${ORC_SOURCE_SRC_DIR}/Writer.cc
-        ${ORC_SOURCE_SRC_DIR}/io/InputStream.cc
-        ${ORC_SOURCE_SRC_DIR}/io/OutputStream.cc
-        ${ORC_ADDITION_SOURCE_DIR}/orc_proto.pb.cc
+        "${ARROW_SRC_DIR}/arrow/adapters/orc/adapter.cc"
+        "${ARROW_SRC_DIR}/arrow/adapters/orc/adapter_util.cc"
+        "${ORC_SOURCE_SRC_DIR}/Exceptions.cc"
+        "${ORC_SOURCE_SRC_DIR}/OrcFile.cc"
+        "${ORC_SOURCE_SRC_DIR}/Reader.cc"
+        "${ORC_SOURCE_SRC_DIR}/ByteRLE.cc"
+        "${ORC_SOURCE_SRC_DIR}/ColumnPrinter.cc"
+        "${ORC_SOURCE_SRC_DIR}/ColumnReader.cc"
+        "${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"
+        "${ORC_SOURCE_SRC_DIR}/Statistics.cc"
+        "${ORC_SOURCE_SRC_DIR}/StripeStream.cc"
+        "${ORC_SOURCE_SRC_DIR}/Timezone.cc"
+        "${ORC_SOURCE_SRC_DIR}/TypeImpl.cc"
+        "${ORC_SOURCE_SRC_DIR}/Vector.cc"
+        "${ORC_SOURCE_SRC_DIR}/Writer.cc"
+        "${ORC_SOURCE_SRC_DIR}/io/InputStream.cc"
+        "${ORC_SOURCE_SRC_DIR}/io/OutputStream.cc"
+        "${ORC_ADDITION_SOURCE_DIR}/orc_proto.pb.cc"
         )
 
 
 # === arrow
 
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow")
 
 configure_file("${LIBRARY_DIR}/util/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cpp/src/arrow/util/config.h")
 
 # arrow/cpp/src/arrow/CMakeLists.txt
 set(ARROW_SRCS
-        ${LIBRARY_DIR}/buffer.cc
-        ${LIBRARY_DIR}/builder.cc
-        ${LIBRARY_DIR}/chunked_array.cc
-        ${LIBRARY_DIR}/compare.cc
-        ${LIBRARY_DIR}/datum.cc
-        ${LIBRARY_DIR}/device.cc
-        ${LIBRARY_DIR}/extension_type.cc
-        ${LIBRARY_DIR}/memory_pool.cc
-        ${LIBRARY_DIR}/pretty_print.cc
-        ${LIBRARY_DIR}/record_batch.cc
-        ${LIBRARY_DIR}/result.cc
-        ${LIBRARY_DIR}/scalar.cc
-        ${LIBRARY_DIR}/sparse_tensor.cc
-        ${LIBRARY_DIR}/status.cc
-        ${LIBRARY_DIR}/table_builder.cc
-        ${LIBRARY_DIR}/table.cc
-        ${LIBRARY_DIR}/tensor.cc
-        ${LIBRARY_DIR}/type.cc
-        ${LIBRARY_DIR}/visitor.cc
+        "${LIBRARY_DIR}/buffer.cc"
+        "${LIBRARY_DIR}/builder.cc"
+        "${LIBRARY_DIR}/chunked_array.cc"
+        "${LIBRARY_DIR}/compare.cc"
+        "${LIBRARY_DIR}/datum.cc"
+        "${LIBRARY_DIR}/device.cc"
+        "${LIBRARY_DIR}/extension_type.cc"
+        "${LIBRARY_DIR}/memory_pool.cc"
+        "${LIBRARY_DIR}/pretty_print.cc"
+        "${LIBRARY_DIR}/record_batch.cc"
+        "${LIBRARY_DIR}/result.cc"
+        "${LIBRARY_DIR}/scalar.cc"
+        "${LIBRARY_DIR}/sparse_tensor.cc"
+        "${LIBRARY_DIR}/status.cc"
+        "${LIBRARY_DIR}/table_builder.cc"
+        "${LIBRARY_DIR}/table.cc"
+        "${LIBRARY_DIR}/tensor.cc"
+        "${LIBRARY_DIR}/type.cc"
+        "${LIBRARY_DIR}/visitor.cc"
 
-        ${LIBRARY_DIR}/array/array_base.cc
-        ${LIBRARY_DIR}/array/array_binary.cc
-        ${LIBRARY_DIR}/array/array_decimal.cc
-        ${LIBRARY_DIR}/array/array_dict.cc
-        ${LIBRARY_DIR}/array/array_nested.cc
-        ${LIBRARY_DIR}/array/array_primitive.cc
-        ${LIBRARY_DIR}/array/builder_adaptive.cc
-        ${LIBRARY_DIR}/array/builder_base.cc
-        ${LIBRARY_DIR}/array/builder_binary.cc
-        ${LIBRARY_DIR}/array/builder_decimal.cc
-        ${LIBRARY_DIR}/array/builder_dict.cc
-        ${LIBRARY_DIR}/array/builder_nested.cc
-        ${LIBRARY_DIR}/array/builder_primitive.cc
-        ${LIBRARY_DIR}/array/builder_union.cc
-        ${LIBRARY_DIR}/array/concatenate.cc
-        ${LIBRARY_DIR}/array/data.cc
-        ${LIBRARY_DIR}/array/diff.cc
-        ${LIBRARY_DIR}/array/util.cc
-        ${LIBRARY_DIR}/array/validate.cc
+        "${LIBRARY_DIR}/array/array_base.cc"
+        "${LIBRARY_DIR}/array/array_binary.cc"
+        "${LIBRARY_DIR}/array/array_decimal.cc"
+        "${LIBRARY_DIR}/array/array_dict.cc"
+        "${LIBRARY_DIR}/array/array_nested.cc"
+        "${LIBRARY_DIR}/array/array_primitive.cc"
+        "${LIBRARY_DIR}/array/builder_adaptive.cc"
+        "${LIBRARY_DIR}/array/builder_base.cc"
+        "${LIBRARY_DIR}/array/builder_binary.cc"
+        "${LIBRARY_DIR}/array/builder_decimal.cc"
+        "${LIBRARY_DIR}/array/builder_dict.cc"
+        "${LIBRARY_DIR}/array/builder_nested.cc"
+        "${LIBRARY_DIR}/array/builder_primitive.cc"
+        "${LIBRARY_DIR}/array/builder_union.cc"
+        "${LIBRARY_DIR}/array/concatenate.cc"
+        "${LIBRARY_DIR}/array/data.cc"
+        "${LIBRARY_DIR}/array/diff.cc"
+        "${LIBRARY_DIR}/array/util.cc"
+        "${LIBRARY_DIR}/array/validate.cc"
 
-        ${LIBRARY_DIR}/compute/api_scalar.cc
-        ${LIBRARY_DIR}/compute/api_vector.cc
-        ${LIBRARY_DIR}/compute/cast.cc
-        ${LIBRARY_DIR}/compute/exec.cc
-        ${LIBRARY_DIR}/compute/function.cc
-        ${LIBRARY_DIR}/compute/kernel.cc
-        ${LIBRARY_DIR}/compute/registry.cc
+        "${LIBRARY_DIR}/compute/api_scalar.cc"
+        "${LIBRARY_DIR}/compute/api_vector.cc"
+        "${LIBRARY_DIR}/compute/cast.cc"
+        "${LIBRARY_DIR}/compute/exec.cc"
+        "${LIBRARY_DIR}/compute/function.cc"
+        "${LIBRARY_DIR}/compute/kernel.cc"
+        "${LIBRARY_DIR}/compute/registry.cc"
 
-        ${LIBRARY_DIR}/compute/kernels/aggregate_basic.cc
-        ${LIBRARY_DIR}/compute/kernels/aggregate_mode.cc
-        ${LIBRARY_DIR}/compute/kernels/aggregate_var_std.cc
-        ${LIBRARY_DIR}/compute/kernels/codegen_internal.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_arithmetic.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_boolean.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_boolean.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_internal.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_nested.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_numeric.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_string.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_cast_temporal.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_compare.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_fill_null.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_nested.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_set_lookup.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_string.cc
-        ${LIBRARY_DIR}/compute/kernels/scalar_validity.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_hash.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_nested.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_selection.cc
-        ${LIBRARY_DIR}/compute/kernels/vector_sort.cc
-        ${LIBRARY_DIR}/compute/kernels/util_internal.cc
+        "${LIBRARY_DIR}/compute/kernels/aggregate_basic.cc"
+        "${LIBRARY_DIR}/compute/kernels/aggregate_mode.cc"
+        "${LIBRARY_DIR}/compute/kernels/aggregate_var_std.cc"
+        "${LIBRARY_DIR}/compute/kernels/codegen_internal.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_arithmetic.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_boolean.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_boolean.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_internal.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_nested.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_numeric.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_string.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_cast_temporal.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_compare.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_fill_null.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_nested.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_set_lookup.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_string.cc"
+        "${LIBRARY_DIR}/compute/kernels/scalar_validity.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_hash.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_nested.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_selection.cc"
+        "${LIBRARY_DIR}/compute/kernels/vector_sort.cc"
+        "${LIBRARY_DIR}/compute/kernels/util_internal.cc"
 
-        ${LIBRARY_DIR}/csv/chunker.cc
-        ${LIBRARY_DIR}/csv/column_builder.cc
-        ${LIBRARY_DIR}/csv/column_decoder.cc
-        ${LIBRARY_DIR}/csv/converter.cc
-        ${LIBRARY_DIR}/csv/options.cc
-        ${LIBRARY_DIR}/csv/parser.cc
-        ${LIBRARY_DIR}/csv/reader.cc
+        "${LIBRARY_DIR}/csv/chunker.cc"
+        "${LIBRARY_DIR}/csv/column_builder.cc"
+        "${LIBRARY_DIR}/csv/column_decoder.cc"
+        "${LIBRARY_DIR}/csv/converter.cc"
+        "${LIBRARY_DIR}/csv/options.cc"
+        "${LIBRARY_DIR}/csv/parser.cc"
+        "${LIBRARY_DIR}/csv/reader.cc"
 
-        ${LIBRARY_DIR}/ipc/dictionary.cc
-        ${LIBRARY_DIR}/ipc/feather.cc
-        ${LIBRARY_DIR}/ipc/message.cc
-        ${LIBRARY_DIR}/ipc/metadata_internal.cc
-        ${LIBRARY_DIR}/ipc/options.cc
-        ${LIBRARY_DIR}/ipc/reader.cc
-        ${LIBRARY_DIR}/ipc/writer.cc
+        "${LIBRARY_DIR}/ipc/dictionary.cc"
+        "${LIBRARY_DIR}/ipc/feather.cc"
+        "${LIBRARY_DIR}/ipc/message.cc"
+        "${LIBRARY_DIR}/ipc/metadata_internal.cc"
+        "${LIBRARY_DIR}/ipc/options.cc"
+        "${LIBRARY_DIR}/ipc/reader.cc"
+        "${LIBRARY_DIR}/ipc/writer.cc"
 
-        ${LIBRARY_DIR}/io/buffered.cc
-        ${LIBRARY_DIR}/io/caching.cc
-        ${LIBRARY_DIR}/io/compressed.cc
-        ${LIBRARY_DIR}/io/file.cc
-        ${LIBRARY_DIR}/io/interfaces.cc
-        ${LIBRARY_DIR}/io/memory.cc
-        ${LIBRARY_DIR}/io/slow.cc
+        "${LIBRARY_DIR}/io/buffered.cc"
+        "${LIBRARY_DIR}/io/caching.cc"
+        "${LIBRARY_DIR}/io/compressed.cc"
+        "${LIBRARY_DIR}/io/file.cc"
+        "${LIBRARY_DIR}/io/interfaces.cc"
+        "${LIBRARY_DIR}/io/memory.cc"
+        "${LIBRARY_DIR}/io/slow.cc"
 
-        ${LIBRARY_DIR}/tensor/coo_converter.cc
-        ${LIBRARY_DIR}/tensor/csf_converter.cc
-        ${LIBRARY_DIR}/tensor/csx_converter.cc
+        "${LIBRARY_DIR}/tensor/coo_converter.cc"
+        "${LIBRARY_DIR}/tensor/csf_converter.cc"
+        "${LIBRARY_DIR}/tensor/csx_converter.cc"
 
-        ${LIBRARY_DIR}/util/basic_decimal.cc
-        ${LIBRARY_DIR}/util/bit_block_counter.cc
-        ${LIBRARY_DIR}/util/bit_run_reader.cc
-        ${LIBRARY_DIR}/util/bit_util.cc
-        ${LIBRARY_DIR}/util/bitmap.cc
-        ${LIBRARY_DIR}/util/bitmap_builders.cc
-        ${LIBRARY_DIR}/util/bitmap_ops.cc
-        ${LIBRARY_DIR}/util/bpacking.cc
-        ${LIBRARY_DIR}/util/compression.cc
-        ${LIBRARY_DIR}/util/compression_lz4.cc
-        ${LIBRARY_DIR}/util/compression_snappy.cc
-        ${LIBRARY_DIR}/util/compression_zlib.cc
-        ${LIBRARY_DIR}/util/compression_zstd.cc
-        ${LIBRARY_DIR}/util/cpu_info.cc
-        ${LIBRARY_DIR}/util/decimal.cc
-        ${LIBRARY_DIR}/util/delimiting.cc
-        ${LIBRARY_DIR}/util/formatting.cc
-        ${LIBRARY_DIR}/util/future.cc
-        ${LIBRARY_DIR}/util/int_util.cc
-        ${LIBRARY_DIR}/util/io_util.cc
-        ${LIBRARY_DIR}/util/iterator.cc
-        ${LIBRARY_DIR}/util/key_value_metadata.cc
-        ${LIBRARY_DIR}/util/logging.cc
-        ${LIBRARY_DIR}/util/memory.cc
-        ${LIBRARY_DIR}/util/string_builder.cc
-        ${LIBRARY_DIR}/util/string.cc
-        ${LIBRARY_DIR}/util/task_group.cc
-        ${LIBRARY_DIR}/util/thread_pool.cc
-        ${LIBRARY_DIR}/util/time.cc
-        ${LIBRARY_DIR}/util/trie.cc
-        ${LIBRARY_DIR}/util/utf8.cc
-        ${LIBRARY_DIR}/util/value_parsing.cc
+        "${LIBRARY_DIR}/util/basic_decimal.cc"
+        "${LIBRARY_DIR}/util/bit_block_counter.cc"
+        "${LIBRARY_DIR}/util/bit_run_reader.cc"
+        "${LIBRARY_DIR}/util/bit_util.cc"
+        "${LIBRARY_DIR}/util/bitmap.cc"
+        "${LIBRARY_DIR}/util/bitmap_builders.cc"
+        "${LIBRARY_DIR}/util/bitmap_ops.cc"
+        "${LIBRARY_DIR}/util/bpacking.cc"
+        "${LIBRARY_DIR}/util/compression.cc"
+        "${LIBRARY_DIR}/util/compression_lz4.cc"
+        "${LIBRARY_DIR}/util/compression_snappy.cc"
+        "${LIBRARY_DIR}/util/compression_zlib.cc"
+        "${LIBRARY_DIR}/util/compression_zstd.cc"
+        "${LIBRARY_DIR}/util/cpu_info.cc"
+        "${LIBRARY_DIR}/util/decimal.cc"
+        "${LIBRARY_DIR}/util/delimiting.cc"
+        "${LIBRARY_DIR}/util/formatting.cc"
+        "${LIBRARY_DIR}/util/future.cc"
+        "${LIBRARY_DIR}/util/int_util.cc"
+        "${LIBRARY_DIR}/util/io_util.cc"
+        "${LIBRARY_DIR}/util/iterator.cc"
+        "${LIBRARY_DIR}/util/key_value_metadata.cc"
+        "${LIBRARY_DIR}/util/logging.cc"
+        "${LIBRARY_DIR}/util/memory.cc"
+        "${LIBRARY_DIR}/util/string_builder.cc"
+        "${LIBRARY_DIR}/util/string.cc"
+        "${LIBRARY_DIR}/util/task_group.cc"
+        "${LIBRARY_DIR}/util/thread_pool.cc"
+        "${LIBRARY_DIR}/util/time.cc"
+        "${LIBRARY_DIR}/util/trie.cc"
+        "${LIBRARY_DIR}/util/utf8.cc"
+        "${LIBRARY_DIR}/util/value_parsing.cc"
 
-        ${LIBRARY_DIR}/vendored/base64.cpp
+        "${LIBRARY_DIR}/vendored/base64.cpp"
         ${ORC_SRCS}
         )
 
@@ -298,21 +298,21 @@ if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY)
 endif ()
 
 add_definitions(-DARROW_WITH_LZ4)
-SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_lz4.cc ${ARROW_SRCS})
+SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_lz4.cc" ${ARROW_SRCS})
 
 if (ARROW_WITH_SNAPPY)
     add_definitions(-DARROW_WITH_SNAPPY)
-    SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_snappy.cc ${ARROW_SRCS})
+    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_snappy.cc" ${ARROW_SRCS})
 endif ()
 
 if (ARROW_WITH_ZLIB)
     add_definitions(-DARROW_WITH_ZLIB)
-    SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_zlib.cc ${ARROW_SRCS})
+    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zlib.cc" ${ARROW_SRCS})
 endif ()
 
 if (ARROW_WITH_ZSTD)
     add_definitions(-DARROW_WITH_ZSTD)
-    SET(ARROW_SRCS ${LIBRARY_DIR}/util/compression_zstd.cc ${ARROW_SRCS})
+    SET(ARROW_SRCS "${LIBRARY_DIR}/util/compression_zstd.cc" ${ARROW_SRCS})
 endif ()
 
 
@@ -327,8 +327,8 @@ if (USE_INTERNAL_PROTOBUF_LIBRARY)
     add_dependencies(${ARROW_LIBRARY} protoc)
 endif ()
 
-target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src)
-target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/cpp/src)
+target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src")
+target_include_directories(${ARROW_LIBRARY} SYSTEM PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/cpp/src")
 target_link_libraries(${ARROW_LIBRARY} PRIVATE ${DOUBLE_CONVERSION_LIBRARIES} ${Protobuf_LIBRARY})
 target_link_libraries(${ARROW_LIBRARY} PRIVATE lz4)
 if (ARROW_WITH_SNAPPY)
@@ -354,46 +354,46 @@ target_include_directories(${ARROW_LIBRARY} PRIVATE SYSTEM ${FLATBUFFERS_INCLUDE
 
 # === parquet
 
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/parquet)
-set(GEN_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/generated)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/parquet")
+set(GEN_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/generated")
 # arrow/cpp/src/parquet/CMakeLists.txt
 set(PARQUET_SRCS
-        ${LIBRARY_DIR}/arrow/path_internal.cc
-        ${LIBRARY_DIR}/arrow/reader.cc
-        ${LIBRARY_DIR}/arrow/reader_internal.cc
-        ${LIBRARY_DIR}/arrow/schema.cc
-        ${LIBRARY_DIR}/arrow/schema_internal.cc
-        ${LIBRARY_DIR}/arrow/writer.cc
-        ${LIBRARY_DIR}/bloom_filter.cc
-        ${LIBRARY_DIR}/column_reader.cc
-        ${LIBRARY_DIR}/column_scanner.cc
-        ${LIBRARY_DIR}/column_writer.cc
-        ${LIBRARY_DIR}/deprecated_io.cc
-        ${LIBRARY_DIR}/encoding.cc
-        ${LIBRARY_DIR}/encryption.cc
-        ${LIBRARY_DIR}/encryption_internal.cc
-        ${LIBRARY_DIR}/file_reader.cc
-        ${LIBRARY_DIR}/file_writer.cc
-        ${LIBRARY_DIR}/internal_file_decryptor.cc
-        ${LIBRARY_DIR}/internal_file_encryptor.cc
-        ${LIBRARY_DIR}/level_conversion.cc
-        ${LIBRARY_DIR}/level_comparison.cc
-        ${LIBRARY_DIR}/metadata.cc
-        ${LIBRARY_DIR}/murmur3.cc
-        ${LIBRARY_DIR}/platform.cc
-        ${LIBRARY_DIR}/printer.cc
-        ${LIBRARY_DIR}/properties.cc
-        ${LIBRARY_DIR}/schema.cc
-        ${LIBRARY_DIR}/statistics.cc
-        ${LIBRARY_DIR}/types.cc
+        "${LIBRARY_DIR}/arrow/path_internal.cc"
+        "${LIBRARY_DIR}/arrow/reader.cc"
+        "${LIBRARY_DIR}/arrow/reader_internal.cc"
+        "${LIBRARY_DIR}/arrow/schema.cc"
+        "${LIBRARY_DIR}/arrow/schema_internal.cc"
+        "${LIBRARY_DIR}/arrow/writer.cc"
+        "${LIBRARY_DIR}/bloom_filter.cc"
+        "${LIBRARY_DIR}/column_reader.cc"
+        "${LIBRARY_DIR}/column_scanner.cc"
+        "${LIBRARY_DIR}/column_writer.cc"
+        "${LIBRARY_DIR}/deprecated_io.cc"
+        "${LIBRARY_DIR}/encoding.cc"
+        "${LIBRARY_DIR}/encryption.cc"
+        "${LIBRARY_DIR}/encryption_internal.cc"
+        "${LIBRARY_DIR}/file_reader.cc"
+        "${LIBRARY_DIR}/file_writer.cc"
+        "${LIBRARY_DIR}/internal_file_decryptor.cc"
+        "${LIBRARY_DIR}/internal_file_encryptor.cc"
+        "${LIBRARY_DIR}/level_conversion.cc"
+        "${LIBRARY_DIR}/level_comparison.cc"
+        "${LIBRARY_DIR}/metadata.cc"
+        "${LIBRARY_DIR}/murmur3.cc"
+        "${LIBRARY_DIR}/platform.cc"
+        "${LIBRARY_DIR}/printer.cc"
+        "${LIBRARY_DIR}/properties.cc"
+        "${LIBRARY_DIR}/schema.cc"
+        "${LIBRARY_DIR}/statistics.cc"
+        "${LIBRARY_DIR}/types.cc"
 
-        ${GEN_LIBRARY_DIR}/parquet_constants.cpp
-        ${GEN_LIBRARY_DIR}/parquet_types.cpp
+        "${GEN_LIBRARY_DIR}/parquet_constants.cpp"
+        "${GEN_LIBRARY_DIR}/parquet_types.cpp"
         )
-#list(TRANSFORM PARQUET_SRCS PREPEND ${LIBRARY_DIR}/) # cmake 3.12
+#list(TRANSFORM PARQUET_SRCS PREPEND "${LIBRARY_DIR}/") # cmake 3.12
 add_library(${PARQUET_LIBRARY} ${PARQUET_SRCS})
-target_include_directories(${PARQUET_LIBRARY} SYSTEM PUBLIC ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src PRIVATE ${OPENSSL_INCLUDE_DIR})
-include(${ClickHouse_SOURCE_DIR}/contrib/thrift/build/cmake/ConfigureChecks.cmake) # makes config.h
+target_include_directories(${PARQUET_LIBRARY} SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src" "${CMAKE_CURRENT_SOURCE_DIR}/cpp/src" PRIVATE ${OPENSSL_INCLUDE_DIR})
+include("${ClickHouse_SOURCE_DIR}/contrib/thrift/build/cmake/ConfigureChecks.cmake") # makes config.h
 target_link_libraries(${PARQUET_LIBRARY} PUBLIC ${ARROW_LIBRARY} PRIVATE ${THRIFT_LIBRARY} boost::headers_only boost::regex ${OPENSSL_LIBRARIES})
 
 if (SANITIZE STREQUAL "undefined")
@@ -403,9 +403,9 @@ endif ()
 
 # === tools
 
-set(TOOLS_DIR ${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/tools/parquet)
+set(TOOLS_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/tools/parquet")
 set(PARQUET_TOOLS parquet_dump_schema parquet_reader parquet_scan)
 foreach (TOOL ${PARQUET_TOOLS})
-    add_executable(${TOOL} ${TOOLS_DIR}/${TOOL}.cc)
+    add_executable(${TOOL} "${TOOLS_DIR}/${TOOL}.cc")
     target_link_libraries(${TOOL} PRIVATE ${PARQUET_LIBRARY})
 endforeach ()
diff --git a/contrib/avro b/contrib/avro
index 92caca2d42f..1ee16d8c5a7 160000
--- a/contrib/avro
+++ b/contrib/avro
@@ -1 +1 @@
-Subproject commit 92caca2d42fc9a97e34e95f963593539d32ed331
+Subproject commit 1ee16d8c5a7808acff5cf0475f771195d9aa3faa
diff --git a/contrib/avro-cmake/CMakeLists.txt b/contrib/avro-cmake/CMakeLists.txt
index 052a19ee804..b56afd1598c 100644
--- a/contrib/avro-cmake/CMakeLists.txt
+++ b/contrib/avro-cmake/CMakeLists.txt
@@ -1,10 +1,10 @@
-set(AVROCPP_ROOT_DIR ${CMAKE_SOURCE_DIR}/contrib/avro/lang/c++)
-set(AVROCPP_INCLUDE_DIR ${AVROCPP_ROOT_DIR}/api)
-set(AVROCPP_SOURCE_DIR ${AVROCPP_ROOT_DIR}/impl)
+set(AVROCPP_ROOT_DIR "${CMAKE_SOURCE_DIR}/contrib/avro/lang/c++")
+set(AVROCPP_INCLUDE_DIR "${AVROCPP_ROOT_DIR}/api")
+set(AVROCPP_SOURCE_DIR "${AVROCPP_ROOT_DIR}/impl")
 
 set (CMAKE_CXX_STANDARD 17)
 
-if (EXISTS ${AVROCPP_ROOT_DIR}/../../share/VERSION.txt)
+if (EXISTS "${AVROCPP_ROOT_DIR}/../../share/VERSION.txt")
     file(READ "${AVROCPP_ROOT_DIR}/../../share/VERSION.txt"
         AVRO_VERSION)
 endif()
@@ -14,30 +14,30 @@ set (AVRO_VERSION_MAJOR ${AVRO_VERSION})
 set (AVRO_VERSION_MINOR "0")
 
 set (AVROCPP_SOURCE_FILES
-    ${AVROCPP_SOURCE_DIR}/Compiler.cc
-    ${AVROCPP_SOURCE_DIR}/Node.cc
-    ${AVROCPP_SOURCE_DIR}/LogicalType.cc
-    ${AVROCPP_SOURCE_DIR}/NodeImpl.cc
-    ${AVROCPP_SOURCE_DIR}/ResolverSchema.cc
-    ${AVROCPP_SOURCE_DIR}/Schema.cc
-    ${AVROCPP_SOURCE_DIR}/Types.cc
-    ${AVROCPP_SOURCE_DIR}/ValidSchema.cc
-    ${AVROCPP_SOURCE_DIR}/Zigzag.cc
-    ${AVROCPP_SOURCE_DIR}/BinaryEncoder.cc
-    ${AVROCPP_SOURCE_DIR}/BinaryDecoder.cc
-    ${AVROCPP_SOURCE_DIR}/Stream.cc
-    ${AVROCPP_SOURCE_DIR}/FileStream.cc
-    ${AVROCPP_SOURCE_DIR}/Generic.cc
-    ${AVROCPP_SOURCE_DIR}/GenericDatum.cc
-    ${AVROCPP_SOURCE_DIR}/DataFile.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/Symbol.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/ValidatingCodec.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/JsonCodec.cc
-    ${AVROCPP_SOURCE_DIR}/parsing/ResolvingDecoder.cc
-    ${AVROCPP_SOURCE_DIR}/json/JsonIO.cc
-    ${AVROCPP_SOURCE_DIR}/json/JsonDom.cc
-    ${AVROCPP_SOURCE_DIR}/Resolver.cc
-    ${AVROCPP_SOURCE_DIR}/Validator.cc
+    "${AVROCPP_SOURCE_DIR}/Compiler.cc"
+    "${AVROCPP_SOURCE_DIR}/Node.cc"
+    "${AVROCPP_SOURCE_DIR}/LogicalType.cc"
+    "${AVROCPP_SOURCE_DIR}/NodeImpl.cc"
+    "${AVROCPP_SOURCE_DIR}/ResolverSchema.cc"
+    "${AVROCPP_SOURCE_DIR}/Schema.cc"
+    "${AVROCPP_SOURCE_DIR}/Types.cc"
+    "${AVROCPP_SOURCE_DIR}/ValidSchema.cc"
+    "${AVROCPP_SOURCE_DIR}/Zigzag.cc"
+    "${AVROCPP_SOURCE_DIR}/BinaryEncoder.cc"
+    "${AVROCPP_SOURCE_DIR}/BinaryDecoder.cc"
+    "${AVROCPP_SOURCE_DIR}/Stream.cc"
+    "${AVROCPP_SOURCE_DIR}/FileStream.cc"
+    "${AVROCPP_SOURCE_DIR}/Generic.cc"
+    "${AVROCPP_SOURCE_DIR}/GenericDatum.cc"
+    "${AVROCPP_SOURCE_DIR}/DataFile.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/Symbol.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/ValidatingCodec.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/JsonCodec.cc"
+    "${AVROCPP_SOURCE_DIR}/parsing/ResolvingDecoder.cc"
+    "${AVROCPP_SOURCE_DIR}/json/JsonIO.cc"
+    "${AVROCPP_SOURCE_DIR}/json/JsonDom.cc"
+    "${AVROCPP_SOURCE_DIR}/Resolver.cc"
+    "${AVROCPP_SOURCE_DIR}/Validator.cc"
     )
 
 add_library (avrocpp ${AVROCPP_SOURCE_FILES})
@@ -63,7 +63,7 @@ target_compile_options(avrocpp PRIVATE ${SUPPRESS_WARNINGS})
 
 # create a symlink to include headers with <avro/...>
 ADD_CUSTOM_TARGET(avro_symlink_headers ALL
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${AVROCPP_ROOT_DIR}/include
-    COMMAND ${CMAKE_COMMAND} -E create_symlink ${AVROCPP_ROOT_DIR}/api ${AVROCPP_ROOT_DIR}/include/avro
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${AVROCPP_ROOT_DIR}/include"
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "${AVROCPP_ROOT_DIR}/api" "${AVROCPP_ROOT_DIR}/include/avro"
 )
 add_dependencies(avrocpp avro_symlink_headers)
diff --git a/contrib/aws-s3-cmake/CMakeLists.txt b/contrib/aws-s3-cmake/CMakeLists.txt
index 02dee91c70c..723ceac3991 100644
--- a/contrib/aws-s3-cmake/CMakeLists.txt
+++ b/contrib/aws-s3-cmake/CMakeLists.txt
@@ -1,8 +1,8 @@
-SET(AWS_S3_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3)
-SET(AWS_CORE_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-core)
-SET(AWS_CHECKSUMS_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws-checksums)
-SET(AWS_COMMON_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws-c-common)
-SET(AWS_EVENT_STREAM_LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/aws-c-event-stream)
+SET(AWS_S3_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3")
+SET(AWS_CORE_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-core")
+SET(AWS_CHECKSUMS_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-checksums")
+SET(AWS_COMMON_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-common")
+SET(AWS_EVENT_STREAM_LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aws-c-event-stream")
 
 OPTION(USE_AWS_MEMORY_MANAGEMENT "Aws memory management" OFF)
 configure_file("${AWS_CORE_LIBRARY_DIR}/include/aws/core/SDKConfig.h.in"
diff --git a/contrib/base64-cmake/CMakeLists.txt b/contrib/base64-cmake/CMakeLists.txt
index a295ee45b84..4ebb4e68728 100644
--- a/contrib/base64-cmake/CMakeLists.txt
+++ b/contrib/base64-cmake/CMakeLists.txt
@@ -1,11 +1,11 @@
-SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/base64)
+SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64")
 
-add_library(base64_scalar OBJECT ${LIBRARY_DIR}/turbob64c.c ${LIBRARY_DIR}/turbob64d.c)
-add_library(base64_ssse3 OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This file also contains code for ARM NEON
+add_library(base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c")
+add_library(base64_ssse3 OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This file also contains code for ARM NEON
 
 if (ARCH_AMD64)
-    add_library(base64_avx OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This is not a mistake. One file is compiled twice.
-    add_library(base64_avx2 OBJECT ${LIBRARY_DIR}/turbob64avx2.c)
+    add_library(base64_avx OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This is not a mistake. One file is compiled twice.
+    add_library(base64_avx2 OBJECT "${LIBRARY_DIR}/turbob64avx2.c")
 endif ()
 
 target_compile_options(base64_scalar PRIVATE -falign-loops)
diff --git a/contrib/boost b/contrib/boost
index ee24fa55bc4..1ccbb5a522a 160000
--- a/contrib/boost
+++ b/contrib/boost
@@ -1 +1 @@
-Subproject commit ee24fa55bc46e4d2ce7d0d052cc5a0d9b1be8c36
+Subproject commit 1ccbb5a522a571ce83b606dbc2e1011c42ecccfb
diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
index 0759935a7db..9f6c5b1255d 100644
--- a/contrib/boost-cmake/CMakeLists.txt
+++ b/contrib/boost-cmake/CMakeLists.txt
@@ -56,19 +56,19 @@ endif()
 
 if (NOT EXTERNAL_BOOST_FOUND)
     set (USE_INTERNAL_BOOST_LIBRARY 1)
-    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/boost)
+    set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/boost")
 
     # filesystem
 
     set (SRCS_FILESYSTEM
-        ${LIBRARY_DIR}/libs/filesystem/src/codecvt_error_category.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/operations.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/path_traits.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/path.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/portability.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/unique_path.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp
-        ${LIBRARY_DIR}/libs/filesystem/src/windows_file_codecvt.cpp
+        "${LIBRARY_DIR}/libs/filesystem/src/codecvt_error_category.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/operations.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/path_traits.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/path.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/portability.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/unique_path.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/utf8_codecvt_facet.cpp"
+        "${LIBRARY_DIR}/libs/filesystem/src/windows_file_codecvt.cpp"
     )
 
     add_library (_boost_filesystem ${SRCS_FILESYSTEM})
@@ -88,10 +88,10 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # iostreams
 
     set (SRCS_IOSTREAMS
-        ${LIBRARY_DIR}/libs/iostreams/src/file_descriptor.cpp
-        ${LIBRARY_DIR}/libs/iostreams/src/gzip.cpp
-        ${LIBRARY_DIR}/libs/iostreams/src/mapped_file.cpp
-        ${LIBRARY_DIR}/libs/iostreams/src/zlib.cpp
+        "${LIBRARY_DIR}/libs/iostreams/src/file_descriptor.cpp"
+        "${LIBRARY_DIR}/libs/iostreams/src/gzip.cpp"
+        "${LIBRARY_DIR}/libs/iostreams/src/mapped_file.cpp"
+        "${LIBRARY_DIR}/libs/iostreams/src/zlib.cpp"
     )
 
     add_library (_boost_iostreams ${SRCS_IOSTREAMS})
@@ -102,17 +102,17 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # program_options
 
     set (SRCS_PROGRAM_OPTIONS
-        ${LIBRARY_DIR}/libs/program_options/src/cmdline.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/config_file.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/convert.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/options_description.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/parsers.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/positional_options.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/split.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/utf8_codecvt_facet.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/value_semantic.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/variables_map.cpp
-        ${LIBRARY_DIR}/libs/program_options/src/winmain.cpp
+        "${LIBRARY_DIR}/libs/program_options/src/cmdline.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/config_file.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/convert.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/options_description.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/parsers.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/positional_options.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/split.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/utf8_codecvt_facet.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/value_semantic.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/variables_map.cpp"
+        "${LIBRARY_DIR}/libs/program_options/src/winmain.cpp"
     )
 
     add_library (_boost_program_options ${SRCS_PROGRAM_OPTIONS})
@@ -122,24 +122,24 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # regex
 
     set (SRCS_REGEX
-        ${LIBRARY_DIR}/libs/regex/src/c_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/cpp_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/cregex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/fileiter.cpp
-        ${LIBRARY_DIR}/libs/regex/src/icu.cpp
-        ${LIBRARY_DIR}/libs/regex/src/instances.cpp
-        ${LIBRARY_DIR}/libs/regex/src/internals.hpp
-        ${LIBRARY_DIR}/libs/regex/src/posix_api.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_debug.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_raw_buffer.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex_traits_defaults.cpp
-        ${LIBRARY_DIR}/libs/regex/src/regex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/static_mutex.cpp
-        ${LIBRARY_DIR}/libs/regex/src/usinstances.cpp
-        ${LIBRARY_DIR}/libs/regex/src/w32_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/wc_regex_traits.cpp
-        ${LIBRARY_DIR}/libs/regex/src/wide_posix_api.cpp
-        ${LIBRARY_DIR}/libs/regex/src/winstances.cpp
+        "${LIBRARY_DIR}/libs/regex/src/c_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/cpp_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/cregex.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/fileiter.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/icu.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/instances.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/internals.hpp"
+        "${LIBRARY_DIR}/libs/regex/src/posix_api.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex_debug.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex_raw_buffer.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex_traits_defaults.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/regex.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/static_mutex.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/usinstances.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/w32_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/wc_regex_traits.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/wide_posix_api.cpp"
+        "${LIBRARY_DIR}/libs/regex/src/winstances.cpp"
     )
 
     add_library (_boost_regex ${SRCS_REGEX})
@@ -149,7 +149,7 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # system
 
     set (SRCS_SYSTEM
-        ${LIBRARY_DIR}/libs/system/src/error_code.cpp
+        "${LIBRARY_DIR}/libs/system/src/error_code.cpp"
     )
 
     add_library (_boost_system ${SRCS_SYSTEM})
@@ -161,9 +161,9 @@ if (NOT EXTERNAL_BOOST_FOUND)
     SET(ASM_OPTIONS "-x assembler-with-cpp")
 
     set (SRCS_CONTEXT
-        ${LIBRARY_DIR}/libs/context/src/dummy.cpp
-        ${LIBRARY_DIR}/libs/context/src/execution_context.cpp
-        ${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp
+        "${LIBRARY_DIR}/libs/context/src/dummy.cpp"
+        "${LIBRARY_DIR}/libs/context/src/execution_context.cpp"
+        "${LIBRARY_DIR}/libs/context/src/posix/stack_traits.cpp"
     )
 
     if (SANITIZE AND (SANITIZE STREQUAL "address" OR SANITIZE STREQUAL "thread"))
@@ -176,33 +176,33 @@ if (NOT EXTERNAL_BOOST_FOUND)
         endif()
 
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-                ${LIBRARY_DIR}/libs/context/src/fiber.cpp
-                ${LIBRARY_DIR}/libs/context/src/continuation.cpp
+                "${LIBRARY_DIR}/libs/context/src/fiber.cpp"
+                "${LIBRARY_DIR}/libs/context/src/continuation.cpp"
         )
     endif()
     if (ARCH_ARM)
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S"
         )
     elseif (ARCH_PPC64LE)
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S"
         )
     elseif(OS_DARWIN)
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_macho_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_macho_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S"
         )
     else()
         set (SRCS_CONTEXT ${SRCS_CONTEXT}
-            ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_elf_gas.S
-            ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S
+            "${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_elf_gas.S"
+            "${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S"
         )
     endif()
 
@@ -213,9 +213,9 @@ if (NOT EXTERNAL_BOOST_FOUND)
     # coroutine
 
     set (SRCS_COROUTINE
-      ${LIBRARY_DIR}/libs/coroutine/detail/coroutine_context.cpp
-      ${LIBRARY_DIR}/libs/coroutine/exceptions.cpp
-      ${LIBRARY_DIR}/libs/coroutine/posix/stack_traits.cpp
+      "${LIBRARY_DIR}/libs/coroutine/detail/coroutine_context.cpp"
+      "${LIBRARY_DIR}/libs/coroutine/exceptions.cpp"
+      "${LIBRARY_DIR}/libs/coroutine/posix/stack_traits.cpp"
     )
     add_library (_boost_coroutine ${SRCS_COROUTINE})
     add_library (boost::coroutine ALIAS _boost_coroutine)
diff --git a/contrib/boringssl b/contrib/boringssl
index fd9ce1a0406..a6a2e2ab3e4 160000
--- a/contrib/boringssl
+++ b/contrib/boringssl
@@ -1 +1 @@
-Subproject commit fd9ce1a0406f571507068b9555d0b545b8a18332
+Subproject commit a6a2e2ab3e44d97ce98e51c558e989f211de7eb3
diff --git a/contrib/boringssl-cmake/CMakeLists.txt b/contrib/boringssl-cmake/CMakeLists.txt
index 017a8a64c0e..9d8c6ca6083 100644
--- a/contrib/boringssl-cmake/CMakeLists.txt
+++ b/contrib/boringssl-cmake/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 
 project(BoringSSL LANGUAGES C CXX)
 
-set(BORINGSSL_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/boringssl)
+set(BORINGSSL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/boringssl")
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(CLANG 1)
@@ -16,7 +16,7 @@ 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")
-  if(APPLE)
+  if(APPLE AND CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
   endif()
 
@@ -130,7 +130,7 @@ if(BUILD_SHARED_LIBS)
   set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 endif()
 
-include_directories(${BORINGSSL_SOURCE_DIR}/include)
+include_directories("${BORINGSSL_SOURCE_DIR}/include")
 
 set(
   CRYPTO_ios_aarch64_SOURCES
@@ -192,8 +192,8 @@ set(
   linux-arm/crypto/fipsmodule/sha512-armv4.S
   linux-arm/crypto/fipsmodule/vpaes-armv7.S
   linux-arm/crypto/test/trampoline-armv4.S
-  ${BORINGSSL_SOURCE_DIR}/crypto/curve25519/asm/x25519-asm-arm.S
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm_asm.S
+  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/asm/x25519-asm-arm.S"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm_asm.S"
 )
 
 set(
@@ -244,7 +244,7 @@ set(
   linux-x86_64/crypto/fipsmodule/x86_64-mont.S
   linux-x86_64/crypto/fipsmodule/x86_64-mont5.S
   linux-x86_64/crypto/test/trampoline-x86_64.S
-  ${BORINGSSL_SOURCE_DIR}/crypto/hrss/asm/poly_rq_mul.S
+  "${BORINGSSL_SOURCE_DIR}/crypto/hrss/asm/poly_rq_mul.S"
 )
 
 set(
@@ -348,300 +348,300 @@ add_library(
 
   ${CRYPTO_ARCH_SOURCES}
   err_data.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bitstr.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bool.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_d2i_fp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_dup.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_enum.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_gentm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_i2d_fp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_int.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_mbstr.c
-  ${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_strnid.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_time.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_type.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utctm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utf8.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_par.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn_pack.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_enum.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_int.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_string.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_dec.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_enc.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_fre.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_new.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_typ.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_utl.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/asn1/time_support.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/base64/base64.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/bio.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/bio_mem.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/connect.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/fd.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/file.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/hexdump.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bio/pair.c
-  ${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/bn_extra/bn_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/convert.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/buf/buf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/asn1_compat.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/ber.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbb.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbs.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/bytestring/unicode.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/chacha/chacha.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/cipher_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/derive_key.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesccm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesctrhmac.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesgcmsiv.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_chacha20poly1305.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_null.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc2.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc4.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_tls.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/tls_cbc.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cmac/cmac.c
-  ${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-arm-linux.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-intel.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/cpu-ppc64le.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/crypto.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/curve25519/curve25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/curve25519/spake25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/dh_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/params.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/digest_extra/digest_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_derive.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/hash_to_curve.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ecdh_extra/ecdh_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/ecdsa_extra/ecdsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/engine/engine.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/err/err.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/digestsign.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/evp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_ctx.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_dsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/pbkdf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/print.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/scrypt.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/evp/sign.c
-  ${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
-  ${BORINGSSL_SOURCE_DIR}/crypto/lhash/lhash.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/mem.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/obj/obj.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/obj/obj_xref.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_all.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_info.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_oth.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pk8.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pkey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_xaux.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/p5_pbev2.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_vec.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/pool/pool.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/deterministic.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/forkunsafe.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/fuchsia.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/passive.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/rand_extra.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/windows.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rc4/rc4.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/refcount_c11.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/refcount_lock.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_asn1.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_print.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/siphash/siphash.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/stack/stack.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread_none.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread_pthread.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/thread_win.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/trust_token/pmbtoken.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/trust_token/trust_token.c
-  ${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/rsa_pss.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_crl.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_req.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509a.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_att.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_cmp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_d2.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_def.c
-  ${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
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_txt.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_v3.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vfy.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vpm.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509cset.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509name.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509rset.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x509spki.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_algor.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_all.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_attrib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_crl.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_exten.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_info.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_name.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pkey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pubkey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_req.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_sig.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_spki.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_val.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509a.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_cache.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_data.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_map.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_node.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_tree.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akeya.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_alt.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bcons.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bitst.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_conf.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_cpols.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_crld.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_enum.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_extku.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_genn.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ia5.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_info.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_int.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_lib.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ncons.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ocsp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pci.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcia.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcons.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pmaps.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_prn.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_purp.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_skey.c
-  ${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_utl.c
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bitstr.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_bool.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_d2i_fp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_dup.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_enum.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_gentm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_i2d_fp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_int.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_mbstr.c"
+  "${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_strnid.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_time.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_type.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utctm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_utf8.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn1_par.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/asn_pack.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_enum.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_int.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/f_string.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_dec.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_enc.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_fre.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_new.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_typ.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/tasn_utl.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/time_support.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/base64/base64.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/bio.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/bio_mem.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/connect.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/fd.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/file.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/hexdump.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bio/pair.c"
+  "${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/bn_extra/bn_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/convert.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/buf/buf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/asn1_compat.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/ber.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbb.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/cbs.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/bytestring/unicode.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/chacha/chacha.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/cipher_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/derive_key.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesccm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesctrhmac.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_aesgcmsiv.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_chacha20poly1305.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_null.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc2.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_rc4.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/e_tls.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cipher_extra/tls_cbc.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cmac/cmac.c"
+  "${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-arm-linux.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-intel.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-ppc64le.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/crypto.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/curve25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/curve25519/spake25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/dh_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dh_extra/params.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/digest_extra/digest_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/dsa/dsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/ec_derive.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ec_extra/hash_to_curve.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ecdh_extra/ecdh_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/ecdsa_extra/ecdsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/engine/engine.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/err/err.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/digestsign.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/evp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/evp_ctx.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_dsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ec_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_ed25519_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_rsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/p_x25519_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/pbkdf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/print.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/scrypt.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/evp/sign.c"
+  "${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"
+  "${BORINGSSL_SOURCE_DIR}/crypto/lhash/lhash.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/mem.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/obj/obj.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/obj/obj_xref.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_all.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_info.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_oth.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pk8.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_pkey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pem/pem_xaux.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs7/pkcs7_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/p5_pbev2.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pkcs8/pkcs8_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_arm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/poly1305/poly1305_vec.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/pool/pool.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/deterministic.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/forkunsafe.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/fuchsia.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/passive.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/rand_extra.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rand_extra/windows.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rc4/rc4.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/refcount_c11.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/refcount_lock.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_asn1.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/rsa_extra/rsa_print.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/siphash/siphash.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/stack/stack.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread_none.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread_pthread.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/thread_win.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/pmbtoken.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/trust_token.c"
+  "${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/rsa_pss.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_crl.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_req.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_x509a.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_att.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_cmp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_d2.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_def.c"
+  "${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"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_txt.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_v3.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vfy.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_vpm.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509cset.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509name.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509rset.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509spki.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_algor.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_all.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_attrib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_crl.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_exten.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_info.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_name.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pkey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_pubkey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_req.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_sig.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_spki.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_val.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x_x509a.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_cache.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_data.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_map.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_node.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/pcy_tree.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_akeya.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_alt.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bcons.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_bitst.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_conf.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_cpols.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_crld.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_enum.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_extku.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_genn.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ia5.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_info.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_int.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_lib.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ncons.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_ocsp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pci.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcia.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pcons.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_pmaps.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_prn.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_purp.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_skey.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509v3/v3_utl.c"
 )
 
 add_library(
   ssl
 
-  ${BORINGSSL_SOURCE_DIR}/ssl/bio_ssl.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/d1_both.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/d1_lib.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/d1_pkt.cc
-  ${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/handoff.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/handshake.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/handshake_client.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/handshake_server.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/s3_both.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/s3_lib.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/s3_pkt.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_aead_ctx.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_asn1.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_buffer.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_cert.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_cipher.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_file.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_key_share.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_lib.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_privkey.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_session.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_stat.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/ssl_transcript.cc
-  ${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
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls13_server.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls_method.cc
-  ${BORINGSSL_SOURCE_DIR}/ssl/tls_record.cc
+  "${BORINGSSL_SOURCE_DIR}/ssl/bio_ssl.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/d1_both.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/d1_lib.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/d1_pkt.cc"
+  "${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/handoff.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/handshake.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/handshake_client.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/handshake_server.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/s3_both.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/s3_lib.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/s3_pkt.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_aead_ctx.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_asn1.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_buffer.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_cert.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_cipher.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_file.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_key_share.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_lib.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_privkey.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_session.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_stat.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/ssl_transcript.cc"
+  "${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"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls13_server.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls_method.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/tls_record.cc"
 
-  ${BORINGSSL_SOURCE_DIR}/decrepit/ssl/ssl_decrepit.c
-  ${BORINGSSL_SOURCE_DIR}/decrepit/cfb/cfb.c
+  "${BORINGSSL_SOURCE_DIR}/decrepit/ssl/ssl_decrepit.c"
+  "${BORINGSSL_SOURCE_DIR}/decrepit/cfb/cfb.c"
 )
 
 add_executable(
   bssl
 
-  ${BORINGSSL_SOURCE_DIR}/tool/args.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/ciphers.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/client.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/const.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/digest.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/fd.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/file.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/generate_ed25519.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/genrsa.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/pkcs12.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/rand.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/server.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/sign.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/speed.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/tool.cc
-  ${BORINGSSL_SOURCE_DIR}/tool/transport_common.cc
+  "${BORINGSSL_SOURCE_DIR}/tool/args.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/ciphers.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/client.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/const.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/digest.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/fd.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/file.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/generate_ed25519.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/genrsa.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/pkcs12.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/rand.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/server.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/sign.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/speed.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/tool.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/transport_common.cc"
 )
 
 target_link_libraries(ssl crypto)
@@ -655,7 +655,7 @@ if(WIN32)
   target_link_libraries(bssl ws2_32)
 endif()
 
-target_include_directories(crypto SYSTEM PUBLIC ${BORINGSSL_SOURCE_DIR}/include)
-target_include_directories(ssl SYSTEM PUBLIC ${BORINGSSL_SOURCE_DIR}/include)
+target_include_directories(crypto SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")
+target_include_directories(ssl SYSTEM PUBLIC "${BORINGSSL_SOURCE_DIR}/include")
 
 target_compile_options(crypto PRIVATE -Wno-gnu-anonymous-struct)
diff --git a/contrib/brotli-cmake/CMakeLists.txt b/contrib/brotli-cmake/CMakeLists.txt
index 4c5f584de9d..7293cae0665 100644
--- a/contrib/brotli-cmake/CMakeLists.txt
+++ b/contrib/brotli-cmake/CMakeLists.txt
@@ -1,41 +1,41 @@
-set(BROTLI_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/brotli/c)
-set(BROTLI_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/brotli/c)
+set(BROTLI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/brotli/c")
+set(BROTLI_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/brotli/c")
 
 set(SRCS
-    ${BROTLI_SOURCE_DIR}/enc/command.c
-    ${BROTLI_SOURCE_DIR}/enc/fast_log.c
-    ${BROTLI_SOURCE_DIR}/dec/bit_reader.c
-    ${BROTLI_SOURCE_DIR}/dec/state.c
-    ${BROTLI_SOURCE_DIR}/dec/huffman.c
-    ${BROTLI_SOURCE_DIR}/dec/decode.c
-    ${BROTLI_SOURCE_DIR}/enc/encode.c
-    ${BROTLI_SOURCE_DIR}/enc/dictionary_hash.c
-    ${BROTLI_SOURCE_DIR}/enc/cluster.c
-    ${BROTLI_SOURCE_DIR}/enc/entropy_encode.c
-    ${BROTLI_SOURCE_DIR}/enc/literal_cost.c
-    ${BROTLI_SOURCE_DIR}/enc/compress_fragment_two_pass.c
-    ${BROTLI_SOURCE_DIR}/enc/static_dict.c
-    ${BROTLI_SOURCE_DIR}/enc/compress_fragment.c
-    ${BROTLI_SOURCE_DIR}/enc/block_splitter.c
-    ${BROTLI_SOURCE_DIR}/enc/backward_references_hq.c
-    ${BROTLI_SOURCE_DIR}/enc/histogram.c
-    ${BROTLI_SOURCE_DIR}/enc/brotli_bit_stream.c
-    ${BROTLI_SOURCE_DIR}/enc/utf8_util.c
-    ${BROTLI_SOURCE_DIR}/enc/encoder_dict.c
-    ${BROTLI_SOURCE_DIR}/enc/backward_references.c
-    ${BROTLI_SOURCE_DIR}/enc/bit_cost.c
-    ${BROTLI_SOURCE_DIR}/enc/metablock.c
-    ${BROTLI_SOURCE_DIR}/enc/memory.c
-    ${BROTLI_SOURCE_DIR}/common/dictionary.c
-    ${BROTLI_SOURCE_DIR}/common/transform.c
-    ${BROTLI_SOURCE_DIR}/common/platform.c
-    ${BROTLI_SOURCE_DIR}/common/context.c
-    ${BROTLI_SOURCE_DIR}/common/constants.c
+    "${BROTLI_SOURCE_DIR}/enc/command.c"
+    "${BROTLI_SOURCE_DIR}/enc/fast_log.c"
+    "${BROTLI_SOURCE_DIR}/dec/bit_reader.c"
+    "${BROTLI_SOURCE_DIR}/dec/state.c"
+    "${BROTLI_SOURCE_DIR}/dec/huffman.c"
+    "${BROTLI_SOURCE_DIR}/dec/decode.c"
+    "${BROTLI_SOURCE_DIR}/enc/encode.c"
+    "${BROTLI_SOURCE_DIR}/enc/dictionary_hash.c"
+    "${BROTLI_SOURCE_DIR}/enc/cluster.c"
+    "${BROTLI_SOURCE_DIR}/enc/entropy_encode.c"
+    "${BROTLI_SOURCE_DIR}/enc/literal_cost.c"
+    "${BROTLI_SOURCE_DIR}/enc/compress_fragment_two_pass.c"
+    "${BROTLI_SOURCE_DIR}/enc/static_dict.c"
+    "${BROTLI_SOURCE_DIR}/enc/compress_fragment.c"
+    "${BROTLI_SOURCE_DIR}/enc/block_splitter.c"
+    "${BROTLI_SOURCE_DIR}/enc/backward_references_hq.c"
+    "${BROTLI_SOURCE_DIR}/enc/histogram.c"
+    "${BROTLI_SOURCE_DIR}/enc/brotli_bit_stream.c"
+    "${BROTLI_SOURCE_DIR}/enc/utf8_util.c"
+    "${BROTLI_SOURCE_DIR}/enc/encoder_dict.c"
+    "${BROTLI_SOURCE_DIR}/enc/backward_references.c"
+    "${BROTLI_SOURCE_DIR}/enc/bit_cost.c"
+    "${BROTLI_SOURCE_DIR}/enc/metablock.c"
+    "${BROTLI_SOURCE_DIR}/enc/memory.c"
+    "${BROTLI_SOURCE_DIR}/common/dictionary.c"
+    "${BROTLI_SOURCE_DIR}/common/transform.c"
+    "${BROTLI_SOURCE_DIR}/common/platform.c"
+    "${BROTLI_SOURCE_DIR}/common/context.c"
+    "${BROTLI_SOURCE_DIR}/common/constants.c"
 )
 
 add_library(brotli ${SRCS})
 
-target_include_directories(brotli PUBLIC ${BROTLI_SOURCE_DIR}/include)
+target_include_directories(brotli PUBLIC "${BROTLI_SOURCE_DIR}/include")
 
 if(M_LIBRARY)
     target_link_libraries(brotli PRIVATE ${M_LIBRARY})
diff --git a/contrib/capnproto-cmake/CMakeLists.txt b/contrib/capnproto-cmake/CMakeLists.txt
index 949481e7ef5..9f6e076cc7d 100644
--- a/contrib/capnproto-cmake/CMakeLists.txt
+++ b/contrib/capnproto-cmake/CMakeLists.txt
@@ -1,53 +1,53 @@
-set (CAPNPROTO_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/capnproto/c++/src)
+set (CAPNPROTO_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/capnproto/c++/src")
 
 set (CMAKE_CXX_STANDARD 17)
 
 set (KJ_SRCS
-    ${CAPNPROTO_SOURCE_DIR}/kj/array.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/common.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/debug.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/exception.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/io.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/memory.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/mutex.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/string.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/hash.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/table.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/thread.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/main.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/arena.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/test-helpers.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/units.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/encoding.c++
+    "${CAPNPROTO_SOURCE_DIR}/kj/array.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/common.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/debug.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/exception.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/io.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/memory.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/mutex.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/string.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/hash.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/table.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/thread.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/main.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/arena.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/test-helpers.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/units.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/encoding.c++"
 
-    ${CAPNPROTO_SOURCE_DIR}/kj/refcount.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/string-tree.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/time.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/filesystem.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-unix.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-win32.c++
-    ${CAPNPROTO_SOURCE_DIR}/kj/parse/char.c++
+    "${CAPNPROTO_SOURCE_DIR}/kj/refcount.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/string-tree.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/time.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/filesystem.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-unix.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/filesystem-disk-win32.c++"
+    "${CAPNPROTO_SOURCE_DIR}/kj/parse/char.c++"
 )
 
 add_library(kj ${KJ_SRCS})
 target_include_directories(kj SYSTEM PUBLIC ${CAPNPROTO_SOURCE_DIR})
 
 set (CAPNP_SRCS
-    ${CAPNPROTO_SOURCE_DIR}/capnp/c++.capnp.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/blob.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/arena.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/layout.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/list.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/any.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/message.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema.capnp.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/serialize.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/serialize-packed.c++
+    "${CAPNPROTO_SOURCE_DIR}/capnp/c++.capnp.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/blob.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/arena.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/layout.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/list.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/any.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/message.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema.capnp.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/serialize.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/serialize-packed.c++"
 
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema-loader.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/dynamic.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/stringify.c++
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema-loader.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/dynamic.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/stringify.c++"
 )
 
 add_library(capnp ${CAPNP_SRCS})
@@ -57,16 +57,16 @@ set_target_properties(capnp
 target_link_libraries(capnp PUBLIC kj)
 
 set (CAPNPC_SRCS
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/type-id.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/error-reporter.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/lexer.capnp.c++
-    ${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/node-translator.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/compiler/compiler.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/schema-parser.c++
-    ${CAPNPROTO_SOURCE_DIR}/capnp/serialize-text.c++
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/type-id.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/error-reporter.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/lexer.capnp.c++"
+    "${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/node-translator.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/compiler.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/schema-parser.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/serialize-text.c++"
 )
 
 add_library(capnpc ${CAPNPC_SRCS})
diff --git a/contrib/cassandra b/contrib/cassandra
index c097fb5c7e6..eb9b68dadbb 160000
--- a/contrib/cassandra
+++ b/contrib/cassandra
@@ -1 +1 @@
-Subproject commit c097fb5c7e63cc430016d9a8b240d8e63fbefa52
+Subproject commit eb9b68dadbb4417a2c132ad4a1c2fa76e65e6fc1
diff --git a/contrib/cctz-cmake/CMakeLists.txt b/contrib/cctz-cmake/CMakeLists.txt
index a3869478347..93413693796 100644
--- a/contrib/cctz-cmake/CMakeLists.txt
+++ b/contrib/cctz-cmake/CMakeLists.txt
@@ -40,23 +40,23 @@ endif()
 
 if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
     set(USE_INTERNAL_CCTZ_LIBRARY 1)
-    set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cctz)
+    set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cctz")
 
     set (SRCS
-        ${LIBRARY_DIR}/src/civil_time_detail.cc
-        ${LIBRARY_DIR}/src/time_zone_fixed.cc
-        ${LIBRARY_DIR}/src/time_zone_format.cc
-        ${LIBRARY_DIR}/src/time_zone_if.cc
-        ${LIBRARY_DIR}/src/time_zone_impl.cc
-        ${LIBRARY_DIR}/src/time_zone_info.cc
-        ${LIBRARY_DIR}/src/time_zone_libc.cc
-        ${LIBRARY_DIR}/src/time_zone_lookup.cc
-        ${LIBRARY_DIR}/src/time_zone_posix.cc
-        ${LIBRARY_DIR}/src/zone_info_source.cc
+        "${LIBRARY_DIR}/src/civil_time_detail.cc"
+        "${LIBRARY_DIR}/src/time_zone_fixed.cc"
+        "${LIBRARY_DIR}/src/time_zone_format.cc"
+        "${LIBRARY_DIR}/src/time_zone_if.cc"
+        "${LIBRARY_DIR}/src/time_zone_impl.cc"
+        "${LIBRARY_DIR}/src/time_zone_info.cc"
+        "${LIBRARY_DIR}/src/time_zone_libc.cc"
+        "${LIBRARY_DIR}/src/time_zone_lookup.cc"
+        "${LIBRARY_DIR}/src/time_zone_posix.cc"
+        "${LIBRARY_DIR}/src/zone_info_source.cc"
     )
 
     add_library (cctz ${SRCS})
-    target_include_directories (cctz PUBLIC ${LIBRARY_DIR}/include)
+    target_include_directories (cctz PUBLIC "${LIBRARY_DIR}/include")
 
     if (OS_FREEBSD)
         # yes, need linux, because bsd check inside linux in time_zone_libc.cc:24
@@ -73,8 +73,8 @@ if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
     # Build a libray with embedded tzdata
     if (OS_LINUX)
         # get the list of timezones from tzdata shipped with cctz
-        set(TZDIR ${LIBRARY_DIR}/testdata/zoneinfo)
-        file(STRINGS ${LIBRARY_DIR}/testdata/version TZDATA_VERSION)
+        set(TZDIR "${LIBRARY_DIR}/testdata/zoneinfo")
+        file(STRINGS "${LIBRARY_DIR}/testdata/version" TZDATA_VERSION)
         set_property(GLOBAL PROPERTY TZDATA_VERSION_PROP "${TZDATA_VERSION}")
         message(STATUS "Packaging with tzdata version: ${TZDATA_VERSION}")
 
@@ -100,15 +100,15 @@ if (NOT EXTERNAL_CCTZ_LIBRARY_FOUND OR NOT EXTERNAL_CCTZ_LIBRARY_WORKS)
             # PPC64LE fails to do this with objcopy, use ld or lld instead
             if (ARCH_PPC64LE)
                 add_custom_command(OUTPUT ${TZ_OBJ}
-                    COMMAND cp ${TZDIR}/${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}
+                    COMMAND cp "${TZDIR}/${TIMEZONE}" "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}"
                     COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${CMAKE_LINKER} -m elf64lppc -r -b binary -o ${TZ_OBJ} ${TIMEZONE_ID}
-                    COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID})
+                    COMMAND rm "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}")
             else()
                 add_custom_command(OUTPUT ${TZ_OBJ}
-                    COMMAND cp ${TZDIR}/${TIMEZONE} ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}
+                    COMMAND cp "${TZDIR}/${TIMEZONE}" "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}"
                     COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS}
                             --rename-section .data=.rodata,alloc,load,readonly,data,contents ${TIMEZONE_ID} ${TZ_OBJ}
-                    COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID})
+                    COMMAND rm "${CMAKE_CURRENT_BINARY_DIR}/${TIMEZONE_ID}")
             endif()
             set_source_files_properties(${TZ_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
         endforeach(TIMEZONE)
diff --git a/contrib/cppkafka b/contrib/cppkafka
index b06e64ef5bf..57a599d99c5 160000
--- a/contrib/cppkafka
+++ b/contrib/cppkafka
@@ -1 +1 @@
-Subproject commit b06e64ef5bffd636d918a742c689f69130c1dbab
+Subproject commit 57a599d99c540e647bcd0eb9ea77c523cca011b3
diff --git a/contrib/cppkafka-cmake/CMakeLists.txt b/contrib/cppkafka-cmake/CMakeLists.txt
index 9f512974948..0bc33ada529 100644
--- a/contrib/cppkafka-cmake/CMakeLists.txt
+++ b/contrib/cppkafka-cmake/CMakeLists.txt
@@ -1,25 +1,25 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/cppkafka)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cppkafka")
 
 set(SRCS
-    ${LIBRARY_DIR}/src/buffer.cpp
-    ${LIBRARY_DIR}/src/configuration_option.cpp
-    ${LIBRARY_DIR}/src/configuration.cpp
-    ${LIBRARY_DIR}/src/consumer.cpp
-    ${LIBRARY_DIR}/src/error.cpp
-    ${LIBRARY_DIR}/src/event.cpp
-    ${LIBRARY_DIR}/src/exceptions.cpp
-    ${LIBRARY_DIR}/src/group_information.cpp
-    ${LIBRARY_DIR}/src/kafka_handle_base.cpp
-    ${LIBRARY_DIR}/src/message_internal.cpp
-    ${LIBRARY_DIR}/src/message_timestamp.cpp
-    ${LIBRARY_DIR}/src/message.cpp
-    ${LIBRARY_DIR}/src/metadata.cpp
-    ${LIBRARY_DIR}/src/producer.cpp
-    ${LIBRARY_DIR}/src/queue.cpp
-    ${LIBRARY_DIR}/src/topic_configuration.cpp
-    ${LIBRARY_DIR}/src/topic_partition_list.cpp
-    ${LIBRARY_DIR}/src/topic_partition.cpp
-    ${LIBRARY_DIR}/src/topic.cpp
+    "${LIBRARY_DIR}/src/buffer.cpp"
+    "${LIBRARY_DIR}/src/configuration_option.cpp"
+    "${LIBRARY_DIR}/src/configuration.cpp"
+    "${LIBRARY_DIR}/src/consumer.cpp"
+    "${LIBRARY_DIR}/src/error.cpp"
+    "${LIBRARY_DIR}/src/event.cpp"
+    "${LIBRARY_DIR}/src/exceptions.cpp"
+    "${LIBRARY_DIR}/src/group_information.cpp"
+    "${LIBRARY_DIR}/src/kafka_handle_base.cpp"
+    "${LIBRARY_DIR}/src/message_internal.cpp"
+    "${LIBRARY_DIR}/src/message_timestamp.cpp"
+    "${LIBRARY_DIR}/src/message.cpp"
+    "${LIBRARY_DIR}/src/metadata.cpp"
+    "${LIBRARY_DIR}/src/producer.cpp"
+    "${LIBRARY_DIR}/src/queue.cpp"
+    "${LIBRARY_DIR}/src/topic_configuration.cpp"
+    "${LIBRARY_DIR}/src/topic_partition_list.cpp"
+    "${LIBRARY_DIR}/src/topic_partition.cpp"
+    "${LIBRARY_DIR}/src/topic.cpp"
 )
 
 add_library(cppkafka ${SRCS})
@@ -29,5 +29,5 @@ target_link_libraries(cppkafka
         ${RDKAFKA_LIBRARY}
         boost::headers_only
 )
-target_include_directories(cppkafka PRIVATE ${LIBRARY_DIR}/include/cppkafka)
-target_include_directories(cppkafka SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories(cppkafka PRIVATE "${LIBRARY_DIR}/include/cppkafka")
+target_include_directories(cppkafka SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")
diff --git a/contrib/croaring-cmake/CMakeLists.txt b/contrib/croaring-cmake/CMakeLists.txt
index 8a8ca62e051..f4a5d8a01dc 100644
--- a/contrib/croaring-cmake/CMakeLists.txt
+++ b/contrib/croaring-cmake/CMakeLists.txt
@@ -1,26 +1,26 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/croaring)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/croaring")
 
 set(SRCS
-    ${LIBRARY_DIR}/src/array_util.c
-    ${LIBRARY_DIR}/src/bitset_util.c
-    ${LIBRARY_DIR}/src/containers/array.c
-    ${LIBRARY_DIR}/src/containers/bitset.c
-    ${LIBRARY_DIR}/src/containers/containers.c
-    ${LIBRARY_DIR}/src/containers/convert.c
-    ${LIBRARY_DIR}/src/containers/mixed_intersection.c
-    ${LIBRARY_DIR}/src/containers/mixed_union.c
-    ${LIBRARY_DIR}/src/containers/mixed_equal.c
-    ${LIBRARY_DIR}/src/containers/mixed_subset.c
-    ${LIBRARY_DIR}/src/containers/mixed_negation.c
-    ${LIBRARY_DIR}/src/containers/mixed_xor.c
-    ${LIBRARY_DIR}/src/containers/mixed_andnot.c
-    ${LIBRARY_DIR}/src/containers/run.c
-    ${LIBRARY_DIR}/src/roaring.c
-    ${LIBRARY_DIR}/src/roaring_priority_queue.c
-    ${LIBRARY_DIR}/src/roaring_array.c)
+    "${LIBRARY_DIR}/src/array_util.c"
+    "${LIBRARY_DIR}/src/bitset_util.c"
+    "${LIBRARY_DIR}/src/containers/array.c"
+    "${LIBRARY_DIR}/src/containers/bitset.c"
+    "${LIBRARY_DIR}/src/containers/containers.c"
+    "${LIBRARY_DIR}/src/containers/convert.c"
+    "${LIBRARY_DIR}/src/containers/mixed_intersection.c"
+    "${LIBRARY_DIR}/src/containers/mixed_union.c"
+    "${LIBRARY_DIR}/src/containers/mixed_equal.c"
+    "${LIBRARY_DIR}/src/containers/mixed_subset.c"
+    "${LIBRARY_DIR}/src/containers/mixed_negation.c"
+    "${LIBRARY_DIR}/src/containers/mixed_xor.c"
+    "${LIBRARY_DIR}/src/containers/mixed_andnot.c"
+    "${LIBRARY_DIR}/src/containers/run.c"
+    "${LIBRARY_DIR}/src/roaring.c"
+    "${LIBRARY_DIR}/src/roaring_priority_queue.c"
+    "${LIBRARY_DIR}/src/roaring_array.c")
 
 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)
+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")
diff --git a/contrib/curl-cmake/CMakeLists.txt b/contrib/curl-cmake/CMakeLists.txt
index a24c9fa8765..1f7449af914 100644
--- a/contrib/curl-cmake/CMakeLists.txt
+++ b/contrib/curl-cmake/CMakeLists.txt
@@ -5,143 +5,143 @@ endif()
 set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
 
 set (SRCS
-    ${LIBRARY_DIR}/lib/file.c
-    ${LIBRARY_DIR}/lib/timeval.c
-    ${LIBRARY_DIR}/lib/base64.c
-    ${LIBRARY_DIR}/lib/hostip.c
-    ${LIBRARY_DIR}/lib/progress.c
-    ${LIBRARY_DIR}/lib/formdata.c
-    ${LIBRARY_DIR}/lib/cookie.c
-    ${LIBRARY_DIR}/lib/http.c
-    ${LIBRARY_DIR}/lib/sendf.c
-    ${LIBRARY_DIR}/lib/url.c
-    ${LIBRARY_DIR}/lib/dict.c
-    ${LIBRARY_DIR}/lib/if2ip.c
-    ${LIBRARY_DIR}/lib/speedcheck.c
-    ${LIBRARY_DIR}/lib/ldap.c
-    ${LIBRARY_DIR}/lib/version.c
-    ${LIBRARY_DIR}/lib/getenv.c
-    ${LIBRARY_DIR}/lib/escape.c
-    ${LIBRARY_DIR}/lib/mprintf.c
-    ${LIBRARY_DIR}/lib/telnet.c
-    ${LIBRARY_DIR}/lib/netrc.c
-    ${LIBRARY_DIR}/lib/getinfo.c
-    ${LIBRARY_DIR}/lib/transfer.c
-    ${LIBRARY_DIR}/lib/strcase.c
-    ${LIBRARY_DIR}/lib/easy.c
-    ${LIBRARY_DIR}/lib/security.c
-    ${LIBRARY_DIR}/lib/curl_fnmatch.c
-    ${LIBRARY_DIR}/lib/fileinfo.c
-    ${LIBRARY_DIR}/lib/wildcard.c
-    ${LIBRARY_DIR}/lib/krb5.c
-    ${LIBRARY_DIR}/lib/memdebug.c
-    ${LIBRARY_DIR}/lib/http_chunks.c
-    ${LIBRARY_DIR}/lib/strtok.c
-    ${LIBRARY_DIR}/lib/connect.c
-    ${LIBRARY_DIR}/lib/llist.c
-    ${LIBRARY_DIR}/lib/hash.c
-    ${LIBRARY_DIR}/lib/multi.c
-    ${LIBRARY_DIR}/lib/content_encoding.c
-    ${LIBRARY_DIR}/lib/share.c
-    ${LIBRARY_DIR}/lib/http_digest.c
-    ${LIBRARY_DIR}/lib/md4.c
-    ${LIBRARY_DIR}/lib/md5.c
-    ${LIBRARY_DIR}/lib/http_negotiate.c
-    ${LIBRARY_DIR}/lib/inet_pton.c
-    ${LIBRARY_DIR}/lib/strtoofft.c
-    ${LIBRARY_DIR}/lib/strerror.c
-    ${LIBRARY_DIR}/lib/amigaos.c
-    ${LIBRARY_DIR}/lib/hostasyn.c
-    ${LIBRARY_DIR}/lib/hostip4.c
-    ${LIBRARY_DIR}/lib/hostip6.c
-    ${LIBRARY_DIR}/lib/hostsyn.c
-    ${LIBRARY_DIR}/lib/inet_ntop.c
-    ${LIBRARY_DIR}/lib/parsedate.c
-    ${LIBRARY_DIR}/lib/select.c
-    ${LIBRARY_DIR}/lib/splay.c
-    ${LIBRARY_DIR}/lib/strdup.c
-    ${LIBRARY_DIR}/lib/socks.c
-    ${LIBRARY_DIR}/lib/curl_addrinfo.c
-    ${LIBRARY_DIR}/lib/socks_gssapi.c
-    ${LIBRARY_DIR}/lib/socks_sspi.c
-    ${LIBRARY_DIR}/lib/curl_sspi.c
-    ${LIBRARY_DIR}/lib/slist.c
-    ${LIBRARY_DIR}/lib/nonblock.c
-    ${LIBRARY_DIR}/lib/curl_memrchr.c
-    ${LIBRARY_DIR}/lib/imap.c
-    ${LIBRARY_DIR}/lib/pop3.c
-    ${LIBRARY_DIR}/lib/smtp.c
-    ${LIBRARY_DIR}/lib/pingpong.c
-    ${LIBRARY_DIR}/lib/rtsp.c
-    ${LIBRARY_DIR}/lib/curl_threads.c
-    ${LIBRARY_DIR}/lib/warnless.c
-    ${LIBRARY_DIR}/lib/hmac.c
-    ${LIBRARY_DIR}/lib/curl_rtmp.c
-    ${LIBRARY_DIR}/lib/openldap.c
-    ${LIBRARY_DIR}/lib/curl_gethostname.c
-    ${LIBRARY_DIR}/lib/gopher.c
-    ${LIBRARY_DIR}/lib/idn_win32.c
-    ${LIBRARY_DIR}/lib/http_proxy.c
-    ${LIBRARY_DIR}/lib/non-ascii.c
-    ${LIBRARY_DIR}/lib/asyn-thread.c
-    ${LIBRARY_DIR}/lib/curl_gssapi.c
-    ${LIBRARY_DIR}/lib/http_ntlm.c
-    ${LIBRARY_DIR}/lib/curl_ntlm_wb.c
-    ${LIBRARY_DIR}/lib/curl_ntlm_core.c
-    ${LIBRARY_DIR}/lib/curl_sasl.c
-    ${LIBRARY_DIR}/lib/rand.c
-    ${LIBRARY_DIR}/lib/curl_multibyte.c
-    ${LIBRARY_DIR}/lib/hostcheck.c
-    ${LIBRARY_DIR}/lib/conncache.c
-    ${LIBRARY_DIR}/lib/dotdot.c
-    ${LIBRARY_DIR}/lib/x509asn1.c
-    ${LIBRARY_DIR}/lib/http2.c
-    ${LIBRARY_DIR}/lib/smb.c
-    ${LIBRARY_DIR}/lib/curl_endian.c
-    ${LIBRARY_DIR}/lib/curl_des.c
-    ${LIBRARY_DIR}/lib/system_win32.c
-    ${LIBRARY_DIR}/lib/mime.c
-    ${LIBRARY_DIR}/lib/sha256.c
-    ${LIBRARY_DIR}/lib/setopt.c
-    ${LIBRARY_DIR}/lib/curl_path.c
-    ${LIBRARY_DIR}/lib/curl_ctype.c
-    ${LIBRARY_DIR}/lib/curl_range.c
-    ${LIBRARY_DIR}/lib/psl.c
-    ${LIBRARY_DIR}/lib/doh.c
-    ${LIBRARY_DIR}/lib/urlapi.c
-    ${LIBRARY_DIR}/lib/curl_get_line.c
-    ${LIBRARY_DIR}/lib/altsvc.c
-    ${LIBRARY_DIR}/lib/socketpair.c
-    ${LIBRARY_DIR}/lib/vauth/vauth.c
-    ${LIBRARY_DIR}/lib/vauth/cleartext.c
-    ${LIBRARY_DIR}/lib/vauth/cram.c
-    ${LIBRARY_DIR}/lib/vauth/digest.c
-    ${LIBRARY_DIR}/lib/vauth/digest_sspi.c
-    ${LIBRARY_DIR}/lib/vauth/krb5_gssapi.c
-    ${LIBRARY_DIR}/lib/vauth/krb5_sspi.c
-    ${LIBRARY_DIR}/lib/vauth/ntlm.c
-    ${LIBRARY_DIR}/lib/vauth/ntlm_sspi.c
-    ${LIBRARY_DIR}/lib/vauth/oauth2.c
-    ${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c
-    ${LIBRARY_DIR}/lib/vauth/spnego_sspi.c
-    ${LIBRARY_DIR}/lib/vtls/openssl.c
-    ${LIBRARY_DIR}/lib/vtls/gtls.c
-    ${LIBRARY_DIR}/lib/vtls/vtls.c
-    ${LIBRARY_DIR}/lib/vtls/nss.c
-    ${LIBRARY_DIR}/lib/vtls/polarssl.c
-    ${LIBRARY_DIR}/lib/vtls/polarssl_threadlock.c
-    ${LIBRARY_DIR}/lib/vtls/wolfssl.c
-    ${LIBRARY_DIR}/lib/vtls/schannel.c
-    ${LIBRARY_DIR}/lib/vtls/schannel_verify.c
-    ${LIBRARY_DIR}/lib/vtls/sectransp.c
-    ${LIBRARY_DIR}/lib/vtls/gskit.c
-    ${LIBRARY_DIR}/lib/vtls/mbedtls.c
-    ${LIBRARY_DIR}/lib/vtls/mesalink.c
-    ${LIBRARY_DIR}/lib/vtls/bearssl.c
-    ${LIBRARY_DIR}/lib/vquic/ngtcp2.c
-    ${LIBRARY_DIR}/lib/vquic/quiche.c
-    ${LIBRARY_DIR}/lib/vssh/libssh2.c
-    ${LIBRARY_DIR}/lib/vssh/libssh.c
+    "${LIBRARY_DIR}/lib/file.c"
+    "${LIBRARY_DIR}/lib/timeval.c"
+    "${LIBRARY_DIR}/lib/base64.c"
+    "${LIBRARY_DIR}/lib/hostip.c"
+    "${LIBRARY_DIR}/lib/progress.c"
+    "${LIBRARY_DIR}/lib/formdata.c"
+    "${LIBRARY_DIR}/lib/cookie.c"
+    "${LIBRARY_DIR}/lib/http.c"
+    "${LIBRARY_DIR}/lib/sendf.c"
+    "${LIBRARY_DIR}/lib/url.c"
+    "${LIBRARY_DIR}/lib/dict.c"
+    "${LIBRARY_DIR}/lib/if2ip.c"
+    "${LIBRARY_DIR}/lib/speedcheck.c"
+    "${LIBRARY_DIR}/lib/ldap.c"
+    "${LIBRARY_DIR}/lib/version.c"
+    "${LIBRARY_DIR}/lib/getenv.c"
+    "${LIBRARY_DIR}/lib/escape.c"
+    "${LIBRARY_DIR}/lib/mprintf.c"
+    "${LIBRARY_DIR}/lib/telnet.c"
+    "${LIBRARY_DIR}/lib/netrc.c"
+    "${LIBRARY_DIR}/lib/getinfo.c"
+    "${LIBRARY_DIR}/lib/transfer.c"
+    "${LIBRARY_DIR}/lib/strcase.c"
+    "${LIBRARY_DIR}/lib/easy.c"
+    "${LIBRARY_DIR}/lib/security.c"
+    "${LIBRARY_DIR}/lib/curl_fnmatch.c"
+    "${LIBRARY_DIR}/lib/fileinfo.c"
+    "${LIBRARY_DIR}/lib/wildcard.c"
+    "${LIBRARY_DIR}/lib/krb5.c"
+    "${LIBRARY_DIR}/lib/memdebug.c"
+    "${LIBRARY_DIR}/lib/http_chunks.c"
+    "${LIBRARY_DIR}/lib/strtok.c"
+    "${LIBRARY_DIR}/lib/connect.c"
+    "${LIBRARY_DIR}/lib/llist.c"
+    "${LIBRARY_DIR}/lib/hash.c"
+    "${LIBRARY_DIR}/lib/multi.c"
+    "${LIBRARY_DIR}/lib/content_encoding.c"
+    "${LIBRARY_DIR}/lib/share.c"
+    "${LIBRARY_DIR}/lib/http_digest.c"
+    "${LIBRARY_DIR}/lib/md4.c"
+    "${LIBRARY_DIR}/lib/md5.c"
+    "${LIBRARY_DIR}/lib/http_negotiate.c"
+    "${LIBRARY_DIR}/lib/inet_pton.c"
+    "${LIBRARY_DIR}/lib/strtoofft.c"
+    "${LIBRARY_DIR}/lib/strerror.c"
+    "${LIBRARY_DIR}/lib/amigaos.c"
+    "${LIBRARY_DIR}/lib/hostasyn.c"
+    "${LIBRARY_DIR}/lib/hostip4.c"
+    "${LIBRARY_DIR}/lib/hostip6.c"
+    "${LIBRARY_DIR}/lib/hostsyn.c"
+    "${LIBRARY_DIR}/lib/inet_ntop.c"
+    "${LIBRARY_DIR}/lib/parsedate.c"
+    "${LIBRARY_DIR}/lib/select.c"
+    "${LIBRARY_DIR}/lib/splay.c"
+    "${LIBRARY_DIR}/lib/strdup.c"
+    "${LIBRARY_DIR}/lib/socks.c"
+    "${LIBRARY_DIR}/lib/curl_addrinfo.c"
+    "${LIBRARY_DIR}/lib/socks_gssapi.c"
+    "${LIBRARY_DIR}/lib/socks_sspi.c"
+    "${LIBRARY_DIR}/lib/curl_sspi.c"
+    "${LIBRARY_DIR}/lib/slist.c"
+    "${LIBRARY_DIR}/lib/nonblock.c"
+    "${LIBRARY_DIR}/lib/curl_memrchr.c"
+    "${LIBRARY_DIR}/lib/imap.c"
+    "${LIBRARY_DIR}/lib/pop3.c"
+    "${LIBRARY_DIR}/lib/smtp.c"
+    "${LIBRARY_DIR}/lib/pingpong.c"
+    "${LIBRARY_DIR}/lib/rtsp.c"
+    "${LIBRARY_DIR}/lib/curl_threads.c"
+    "${LIBRARY_DIR}/lib/warnless.c"
+    "${LIBRARY_DIR}/lib/hmac.c"
+    "${LIBRARY_DIR}/lib/curl_rtmp.c"
+    "${LIBRARY_DIR}/lib/openldap.c"
+    "${LIBRARY_DIR}/lib/curl_gethostname.c"
+    "${LIBRARY_DIR}/lib/gopher.c"
+    "${LIBRARY_DIR}/lib/idn_win32.c"
+    "${LIBRARY_DIR}/lib/http_proxy.c"
+    "${LIBRARY_DIR}/lib/non-ascii.c"
+    "${LIBRARY_DIR}/lib/asyn-thread.c"
+    "${LIBRARY_DIR}/lib/curl_gssapi.c"
+    "${LIBRARY_DIR}/lib/http_ntlm.c"
+    "${LIBRARY_DIR}/lib/curl_ntlm_wb.c"
+    "${LIBRARY_DIR}/lib/curl_ntlm_core.c"
+    "${LIBRARY_DIR}/lib/curl_sasl.c"
+    "${LIBRARY_DIR}/lib/rand.c"
+    "${LIBRARY_DIR}/lib/curl_multibyte.c"
+    "${LIBRARY_DIR}/lib/hostcheck.c"
+    "${LIBRARY_DIR}/lib/conncache.c"
+    "${LIBRARY_DIR}/lib/dotdot.c"
+    "${LIBRARY_DIR}/lib/x509asn1.c"
+    "${LIBRARY_DIR}/lib/http2.c"
+    "${LIBRARY_DIR}/lib/smb.c"
+    "${LIBRARY_DIR}/lib/curl_endian.c"
+    "${LIBRARY_DIR}/lib/curl_des.c"
+    "${LIBRARY_DIR}/lib/system_win32.c"
+    "${LIBRARY_DIR}/lib/mime.c"
+    "${LIBRARY_DIR}/lib/sha256.c"
+    "${LIBRARY_DIR}/lib/setopt.c"
+    "${LIBRARY_DIR}/lib/curl_path.c"
+    "${LIBRARY_DIR}/lib/curl_ctype.c"
+    "${LIBRARY_DIR}/lib/curl_range.c"
+    "${LIBRARY_DIR}/lib/psl.c"
+    "${LIBRARY_DIR}/lib/doh.c"
+    "${LIBRARY_DIR}/lib/urlapi.c"
+    "${LIBRARY_DIR}/lib/curl_get_line.c"
+    "${LIBRARY_DIR}/lib/altsvc.c"
+    "${LIBRARY_DIR}/lib/socketpair.c"
+    "${LIBRARY_DIR}/lib/vauth/vauth.c"
+    "${LIBRARY_DIR}/lib/vauth/cleartext.c"
+    "${LIBRARY_DIR}/lib/vauth/cram.c"
+    "${LIBRARY_DIR}/lib/vauth/digest.c"
+    "${LIBRARY_DIR}/lib/vauth/digest_sspi.c"
+    "${LIBRARY_DIR}/lib/vauth/krb5_gssapi.c"
+    "${LIBRARY_DIR}/lib/vauth/krb5_sspi.c"
+    "${LIBRARY_DIR}/lib/vauth/ntlm.c"
+    "${LIBRARY_DIR}/lib/vauth/ntlm_sspi.c"
+    "${LIBRARY_DIR}/lib/vauth/oauth2.c"
+    "${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c"
+    "${LIBRARY_DIR}/lib/vauth/spnego_sspi.c"
+    "${LIBRARY_DIR}/lib/vtls/openssl.c"
+    "${LIBRARY_DIR}/lib/vtls/gtls.c"
+    "${LIBRARY_DIR}/lib/vtls/vtls.c"
+    "${LIBRARY_DIR}/lib/vtls/nss.c"
+    "${LIBRARY_DIR}/lib/vtls/polarssl.c"
+    "${LIBRARY_DIR}/lib/vtls/polarssl_threadlock.c"
+    "${LIBRARY_DIR}/lib/vtls/wolfssl.c"
+    "${LIBRARY_DIR}/lib/vtls/schannel.c"
+    "${LIBRARY_DIR}/lib/vtls/schannel_verify.c"
+    "${LIBRARY_DIR}/lib/vtls/sectransp.c"
+    "${LIBRARY_DIR}/lib/vtls/gskit.c"
+    "${LIBRARY_DIR}/lib/vtls/mbedtls.c"
+    "${LIBRARY_DIR}/lib/vtls/mesalink.c"
+    "${LIBRARY_DIR}/lib/vtls/bearssl.c"
+    "${LIBRARY_DIR}/lib/vquic/ngtcp2.c"
+    "${LIBRARY_DIR}/lib/vquic/quiche.c"
+    "${LIBRARY_DIR}/lib/vssh/libssh2.c"
+    "${LIBRARY_DIR}/lib/vssh/libssh.c"
 )
 
 add_library (curl ${SRCS})
@@ -154,8 +154,8 @@ target_compile_definitions (curl PRIVATE
     OS="${CMAKE_SYSTEM_NAME}"
 )
 target_include_directories (curl PUBLIC
-    ${LIBRARY_DIR}/include
-    ${LIBRARY_DIR}/lib
+    "${LIBRARY_DIR}/include"
+    "${LIBRARY_DIR}/lib"
     . # curl_config.h
 )
 
@@ -171,8 +171,8 @@ target_compile_options (curl PRIVATE -g0)
 # - sentry-native
 set (CURL_FOUND ON CACHE BOOL "")
 set (CURL_ROOT_DIR ${LIBRARY_DIR} CACHE PATH "")
-set (CURL_INCLUDE_DIR ${LIBRARY_DIR}/include CACHE PATH "")
-set (CURL_INCLUDE_DIRS ${LIBRARY_DIR}/include CACHE PATH "")
+set (CURL_INCLUDE_DIR "${LIBRARY_DIR}/include" CACHE PATH "")
+set (CURL_INCLUDE_DIRS "${LIBRARY_DIR}/include" CACHE PATH "")
 set (CURL_LIBRARY curl CACHE STRING "")
 set (CURL_LIBRARIES ${CURL_LIBRARY} CACHE STRING "")
 set (CURL_VERSION_STRING 7.67.0 CACHE STRING "")
diff --git a/contrib/cyrus-sasl b/contrib/cyrus-sasl
index 9995bf9d8e1..e6466edfd63 160000
--- a/contrib/cyrus-sasl
+++ b/contrib/cyrus-sasl
@@ -1 +1 @@
-Subproject commit 9995bf9d8e14f58934d9313ac64f13780d6dd3c9
+Subproject commit e6466edfd638cc5073debe941c53345b18a09512
diff --git a/contrib/cyrus-sasl-cmake/CMakeLists.txt b/contrib/cyrus-sasl-cmake/CMakeLists.txt
index 5003c9a21db..aa25a078718 100644
--- a/contrib/cyrus-sasl-cmake/CMakeLists.txt
+++ b/contrib/cyrus-sasl-cmake/CMakeLists.txt
@@ -1,23 +1,23 @@
-set(CYRUS_SASL_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/cyrus-sasl)
+set(CYRUS_SASL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/cyrus-sasl")
 
 add_library(${CYRUS_SASL_LIBRARY})
 
 target_sources(${CYRUS_SASL_LIBRARY} PRIVATE
-    ${CYRUS_SASL_SOURCE_DIR}/plugins/gssapi.c
-    # ${CYRUS_SASL_SOURCE_DIR}/plugins/gssapiv2_init.c
-    ${CYRUS_SASL_SOURCE_DIR}/common/plugin_common.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/common.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/canonusr.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/server.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/config.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/auxprop.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/saslutil.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/external.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/seterror.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/md5.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/dlopen.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/client.c
-    ${CYRUS_SASL_SOURCE_DIR}/lib/checkpw.c
+    "${CYRUS_SASL_SOURCE_DIR}/plugins/gssapi.c"
+    # "${CYRUS_SASL_SOURCE_DIR}/plugins/gssapiv2_init.c"
+    "${CYRUS_SASL_SOURCE_DIR}/common/plugin_common.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/common.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/canonusr.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/server.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/config.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/auxprop.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/saslutil.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/external.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/seterror.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/md5.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/dlopen.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/client.c"
+    "${CYRUS_SASL_SOURCE_DIR}/lib/checkpw.c"
 )
 
 target_include_directories(${CYRUS_SASL_LIBRARY} PUBLIC
@@ -26,16 +26,16 @@ target_include_directories(${CYRUS_SASL_LIBRARY} PUBLIC
 
 target_include_directories(${CYRUS_SASL_LIBRARY} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}  # for config.h
-    ${CYRUS_SASL_SOURCE_DIR}/plugins
+    "${CYRUS_SASL_SOURCE_DIR}/plugins"
     ${CYRUS_SASL_SOURCE_DIR}
-    ${CYRUS_SASL_SOURCE_DIR}/include
-    ${CYRUS_SASL_SOURCE_DIR}/lib
-    ${CYRUS_SASL_SOURCE_DIR}/sasldb
-    ${CYRUS_SASL_SOURCE_DIR}/common
-    ${CYRUS_SASL_SOURCE_DIR}/saslauthd
-    ${CYRUS_SASL_SOURCE_DIR}/sample
-    ${CYRUS_SASL_SOURCE_DIR}/utils
-    ${CYRUS_SASL_SOURCE_DIR}/tests
+    "${CYRUS_SASL_SOURCE_DIR}/include"
+    "${CYRUS_SASL_SOURCE_DIR}/lib"
+    "${CYRUS_SASL_SOURCE_DIR}/sasldb"
+    "${CYRUS_SASL_SOURCE_DIR}/common"
+    "${CYRUS_SASL_SOURCE_DIR}/saslauthd"
+    "${CYRUS_SASL_SOURCE_DIR}/sample"
+    "${CYRUS_SASL_SOURCE_DIR}/utils"
+    "${CYRUS_SASL_SOURCE_DIR}/tests"
 )
 
 target_compile_definitions(${CYRUS_SASL_LIBRARY} PUBLIC
@@ -52,15 +52,15 @@ target_compile_definitions(${CYRUS_SASL_LIBRARY} PUBLIC
     LIBSASL_EXPORTS=1
 )
 
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/sasl)
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sasl")
 
 file(COPY
-    ${CYRUS_SASL_SOURCE_DIR}/include/sasl.h
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/sasl
+    "${CYRUS_SASL_SOURCE_DIR}/include/sasl.h"
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sasl"
 )
 
 file(COPY
-    ${CYRUS_SASL_SOURCE_DIR}/include/prop.h
+    "${CYRUS_SASL_SOURCE_DIR}/include/prop.h"
     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/contrib/datasketches-cpp b/contrib/datasketches-cpp
index f915d35b2de..7d73d7610db 160000
--- a/contrib/datasketches-cpp
+++ b/contrib/datasketches-cpp
@@ -1 +1 @@
-Subproject commit f915d35b2de676683493c86c585141a1e1c83334
+Subproject commit 7d73d7610db31d4e1ecde0fb3a7ee90ef371207f
diff --git a/contrib/double-conversion-cmake/CMakeLists.txt b/contrib/double-conversion-cmake/CMakeLists.txt
index 0690731e1b1..c8bf1b34b8f 100644
--- a/contrib/double-conversion-cmake/CMakeLists.txt
+++ b/contrib/double-conversion-cmake/CMakeLists.txt
@@ -1,13 +1,13 @@
-SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/double-conversion)
+SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/double-conversion")
 
 add_library(double-conversion
-${LIBRARY_DIR}/double-conversion/bignum.cc
-${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc
-${LIBRARY_DIR}/double-conversion/cached-powers.cc
-${LIBRARY_DIR}/double-conversion/diy-fp.cc
-${LIBRARY_DIR}/double-conversion/double-conversion.cc
-${LIBRARY_DIR}/double-conversion/fast-dtoa.cc
-${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc
-${LIBRARY_DIR}/double-conversion/strtod.cc)
+"${LIBRARY_DIR}/double-conversion/bignum.cc"
+"${LIBRARY_DIR}/double-conversion/bignum-dtoa.cc"
+"${LIBRARY_DIR}/double-conversion/cached-powers.cc"
+"${LIBRARY_DIR}/double-conversion/diy-fp.cc"
+"${LIBRARY_DIR}/double-conversion/double-conversion.cc"
+"${LIBRARY_DIR}/double-conversion/fast-dtoa.cc"
+"${LIBRARY_DIR}/double-conversion/fixed-dtoa.cc"
+"${LIBRARY_DIR}/double-conversion/strtod.cc")
 
 target_include_directories(double-conversion SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}")
diff --git a/contrib/fastops-cmake/CMakeLists.txt b/contrib/fastops-cmake/CMakeLists.txt
index 0269d5603c2..fe7293c614b 100644
--- a/contrib/fastops-cmake/CMakeLists.txt
+++ b/contrib/fastops-cmake/CMakeLists.txt
@@ -1,18 +1,18 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/fastops)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/fastops")
 
 set(SRCS "")
 
 if(HAVE_AVX)
-    set (SRCS ${SRCS} ${LIBRARY_DIR}/fastops/avx/ops_avx.cpp)
-    set_source_files_properties(${LIBRARY_DIR}/fastops/avx/ops_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx -DNO_AVX2")
+    set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/avx/ops_avx.cpp")
+    set_source_files_properties("${LIBRARY_DIR}/fastops/avx/ops_avx.cpp" PROPERTIES COMPILE_FLAGS "-mavx -DNO_AVX2")
 endif()
 
 if(HAVE_AVX2)
-    set (SRCS ${SRCS} ${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp)
-    set_source_files_properties(${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
+    set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp")
+    set_source_files_properties("${LIBRARY_DIR}/fastops/avx2/ops_avx2.cpp" PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
 endif()
 
-set (SRCS ${SRCS} ${LIBRARY_DIR}/fastops/plain/ops_plain.cpp ${LIBRARY_DIR}/fastops/core/avx_id.cpp ${LIBRARY_DIR}/fastops/fastops.cpp)
+set (SRCS ${SRCS} "${LIBRARY_DIR}/fastops/plain/ops_plain.cpp" "${LIBRARY_DIR}/fastops/core/avx_id.cpp" "${LIBRARY_DIR}/fastops/fastops.cpp")
 
 add_library(fastops ${SRCS})
 
diff --git a/contrib/flatbuffers b/contrib/flatbuffers
index 6df40a24717..22e3ffc66d2 160000
--- a/contrib/flatbuffers
+++ b/contrib/flatbuffers
@@ -1 +1 @@
-Subproject commit 6df40a2471737b27271bdd9b900ab5f3aec746c7
+Subproject commit 22e3ffc66d2d7d72d1414390aa0f04ffd114a5a1
diff --git a/contrib/grpc b/contrib/grpc
index 8d558f03fe3..60c986e15ca 160000
--- a/contrib/grpc
+++ b/contrib/grpc
@@ -1 +1 @@
-Subproject commit 8d558f03fe370240081424fafa76cdc9301ea14b
+Subproject commit 60c986e15cae70aade721d26badabab1f822fdd6
diff --git a/contrib/h3-cmake/CMakeLists.txt b/contrib/h3-cmake/CMakeLists.txt
index 2911d7283f0..6b184a175b0 100644
--- a/contrib/h3-cmake/CMakeLists.txt
+++ b/contrib/h3-cmake/CMakeLists.txt
@@ -1,30 +1,30 @@
-set(H3_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib)
-set(H3_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/h3/src/h3lib)
+set(H3_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib")
+set(H3_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/h3/src/h3lib")
 
 set(SRCS
-${H3_SOURCE_DIR}/lib/algos.c
-${H3_SOURCE_DIR}/lib/baseCells.c
-${H3_SOURCE_DIR}/lib/bbox.c
-${H3_SOURCE_DIR}/lib/coordijk.c
-${H3_SOURCE_DIR}/lib/faceijk.c
-${H3_SOURCE_DIR}/lib/geoCoord.c
-${H3_SOURCE_DIR}/lib/h3Index.c
-${H3_SOURCE_DIR}/lib/h3UniEdge.c
-${H3_SOURCE_DIR}/lib/linkedGeo.c
-${H3_SOURCE_DIR}/lib/localij.c
-${H3_SOURCE_DIR}/lib/mathExtensions.c
-${H3_SOURCE_DIR}/lib/polygon.c
-${H3_SOURCE_DIR}/lib/vec2d.c
-${H3_SOURCE_DIR}/lib/vec3d.c
-${H3_SOURCE_DIR}/lib/vertex.c
-${H3_SOURCE_DIR}/lib/vertexGraph.c
+"${H3_SOURCE_DIR}/lib/algos.c"
+"${H3_SOURCE_DIR}/lib/baseCells.c"
+"${H3_SOURCE_DIR}/lib/bbox.c"
+"${H3_SOURCE_DIR}/lib/coordijk.c"
+"${H3_SOURCE_DIR}/lib/faceijk.c"
+"${H3_SOURCE_DIR}/lib/geoCoord.c"
+"${H3_SOURCE_DIR}/lib/h3Index.c"
+"${H3_SOURCE_DIR}/lib/h3UniEdge.c"
+"${H3_SOURCE_DIR}/lib/linkedGeo.c"
+"${H3_SOURCE_DIR}/lib/localij.c"
+"${H3_SOURCE_DIR}/lib/mathExtensions.c"
+"${H3_SOURCE_DIR}/lib/polygon.c"
+"${H3_SOURCE_DIR}/lib/vec2d.c"
+"${H3_SOURCE_DIR}/lib/vec3d.c"
+"${H3_SOURCE_DIR}/lib/vertex.c"
+"${H3_SOURCE_DIR}/lib/vertexGraph.c"
 )
 
-configure_file(${H3_SOURCE_DIR}/include/h3api.h.in ${H3_BINARY_DIR}/include/h3api.h)
+configure_file("${H3_SOURCE_DIR}/include/h3api.h.in" "${H3_BINARY_DIR}/include/h3api.h")
 
 add_library(h3 ${SRCS})
-target_include_directories(h3 SYSTEM PUBLIC ${H3_SOURCE_DIR}/include)
-target_include_directories(h3 SYSTEM PUBLIC ${H3_BINARY_DIR}/include)
+target_include_directories(h3 SYSTEM PUBLIC "${H3_SOURCE_DIR}/include")
+target_include_directories(h3 SYSTEM PUBLIC "${H3_BINARY_DIR}/include")
 target_compile_definitions(h3 PRIVATE H3_HAVE_VLA)
 if(M_LIBRARY)
     target_link_libraries(h3 PRIVATE ${M_LIBRARY})
diff --git a/contrib/hyperscan-cmake/CMakeLists.txt b/contrib/hyperscan-cmake/CMakeLists.txt
index 75c45ff7bf5..6a364da126d 100644
--- a/contrib/hyperscan-cmake/CMakeLists.txt
+++ b/contrib/hyperscan-cmake/CMakeLists.txt
@@ -40,211 +40,211 @@ endif ()
 if (NOT EXTERNAL_HYPERSCAN_LIBRARY_FOUND)
     set (USE_INTERNAL_HYPERSCAN_LIBRARY 1)
 
-    set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/hyperscan)
+    set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/hyperscan")
 
     set (SRCS
-        ${LIBRARY_DIR}/src/alloc.c
-        ${LIBRARY_DIR}/src/compiler/asserts.cpp
-        ${LIBRARY_DIR}/src/compiler/compiler.cpp
-        ${LIBRARY_DIR}/src/compiler/error.cpp
-        ${LIBRARY_DIR}/src/crc32.c
-        ${LIBRARY_DIR}/src/database.c
-        ${LIBRARY_DIR}/src/fdr/engine_description.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_compile_util.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_confirm_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr_engine_description.cpp
-        ${LIBRARY_DIR}/src/fdr/fdr.c
-        ${LIBRARY_DIR}/src/fdr/flood_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/teddy_compile.cpp
-        ${LIBRARY_DIR}/src/fdr/teddy_engine_description.cpp
-        ${LIBRARY_DIR}/src/fdr/teddy.c
-        ${LIBRARY_DIR}/src/grey.cpp
-        ${LIBRARY_DIR}/src/hs_valid_platform.c
-        ${LIBRARY_DIR}/src/hs_version.c
-        ${LIBRARY_DIR}/src/hs.cpp
-        ${LIBRARY_DIR}/src/hwlm/hwlm_build.cpp
-        ${LIBRARY_DIR}/src/hwlm/hwlm_literal.cpp
-        ${LIBRARY_DIR}/src/hwlm/hwlm.c
-        ${LIBRARY_DIR}/src/hwlm/noodle_build.cpp
-        ${LIBRARY_DIR}/src/hwlm/noodle_engine.c
-        ${LIBRARY_DIR}/src/nfa/accel_dfa_build_strat.cpp
-        ${LIBRARY_DIR}/src/nfa/accel.c
-        ${LIBRARY_DIR}/src/nfa/accelcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/castle.c
-        ${LIBRARY_DIR}/src/nfa/castlecompile.cpp
-        ${LIBRARY_DIR}/src/nfa/dfa_build_strat.cpp
-        ${LIBRARY_DIR}/src/nfa/dfa_min.cpp
-        ${LIBRARY_DIR}/src/nfa/gough.c
-        ${LIBRARY_DIR}/src/nfa/goughcompile_accel.cpp
-        ${LIBRARY_DIR}/src/nfa/goughcompile_reg.cpp
-        ${LIBRARY_DIR}/src/nfa/goughcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/lbr.c
-        ${LIBRARY_DIR}/src/nfa/limex_64.c
-        ${LIBRARY_DIR}/src/nfa/limex_accel.c
-        ${LIBRARY_DIR}/src/nfa/limex_compile.cpp
-        ${LIBRARY_DIR}/src/nfa/limex_native.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd128.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd256.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd384.c
-        ${LIBRARY_DIR}/src/nfa/limex_simd512.c
-        ${LIBRARY_DIR}/src/nfa/mcclellan.c
-        ${LIBRARY_DIR}/src/nfa/mcclellancompile_util.cpp
-        ${LIBRARY_DIR}/src/nfa/mcclellancompile.cpp
-        ${LIBRARY_DIR}/src/nfa/mcsheng_compile.cpp
-        ${LIBRARY_DIR}/src/nfa/mcsheng_data.c
-        ${LIBRARY_DIR}/src/nfa/mcsheng.c
-        ${LIBRARY_DIR}/src/nfa/mpv.c
-        ${LIBRARY_DIR}/src/nfa/mpvcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/nfa_api_dispatch.c
-        ${LIBRARY_DIR}/src/nfa/nfa_build_util.cpp
-        ${LIBRARY_DIR}/src/nfa/rdfa_graph.cpp
-        ${LIBRARY_DIR}/src/nfa/rdfa_merge.cpp
-        ${LIBRARY_DIR}/src/nfa/rdfa.cpp
-        ${LIBRARY_DIR}/src/nfa/repeat.c
-        ${LIBRARY_DIR}/src/nfa/repeatcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/sheng.c
-        ${LIBRARY_DIR}/src/nfa/shengcompile.cpp
-        ${LIBRARY_DIR}/src/nfa/shufti.c
-        ${LIBRARY_DIR}/src/nfa/shufticompile.cpp
-        ${LIBRARY_DIR}/src/nfa/tamarama.c
-        ${LIBRARY_DIR}/src/nfa/tamaramacompile.cpp
-        ${LIBRARY_DIR}/src/nfa/truffle.c
-        ${LIBRARY_DIR}/src/nfa/trufflecompile.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_anchored_acyclic.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_anchored_dots.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_asserts.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_builder.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_calc_components.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_cyclic_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_depth.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_dominators.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_edge_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_equivalence.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_execute.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_expr_info.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_extparam.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_fixed_width.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_fuzzy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_haig.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_holder.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_is_equal.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_lbr.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_limex_accel.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_limex.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_literal_analysis.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_literal_component.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_literal_decorated.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_mcclellan.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_misc_opt.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_netflow.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_prefilter.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_prune.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_puff.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_region_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_region.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_repeat.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_reports.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_restructuring.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_revacc.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_sep.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_small_literal_set.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_som_add_redundancy.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_som_util.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_som.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_split.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_squash.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_stop.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_uncalc_components.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_utf8.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_util.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_vacuous.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_violet.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng_width.cpp
-        ${LIBRARY_DIR}/src/nfagraph/ng.cpp
-        ${LIBRARY_DIR}/src/parser/AsciiComponentClass.cpp
-        ${LIBRARY_DIR}/src/parser/buildstate.cpp
-        ${LIBRARY_DIR}/src/parser/check_refs.cpp
-        ${LIBRARY_DIR}/src/parser/Component.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentAlternation.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentAssertion.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentAtomicGroup.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentBackReference.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentBoundary.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentByte.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentClass.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentCondReference.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentEmpty.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentEUS.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentRepeat.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentSequence.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentVisitor.cpp
-        ${LIBRARY_DIR}/src/parser/ComponentWordBoundary.cpp
-        ${LIBRARY_DIR}/src/parser/ConstComponentVisitor.cpp
-        ${LIBRARY_DIR}/src/parser/control_verbs.cpp
-        ${LIBRARY_DIR}/src/parser/logical_combination.cpp
-        ${LIBRARY_DIR}/src/parser/parse_error.cpp
-        ${LIBRARY_DIR}/src/parser/parser_util.cpp
-        ${LIBRARY_DIR}/src/parser/Parser.cpp
-        ${LIBRARY_DIR}/src/parser/prefilter.cpp
-        ${LIBRARY_DIR}/src/parser/shortcut_literal.cpp
-        ${LIBRARY_DIR}/src/parser/ucp_table.cpp
-        ${LIBRARY_DIR}/src/parser/unsupported.cpp
-        ${LIBRARY_DIR}/src/parser/utf8_validate.cpp
-        ${LIBRARY_DIR}/src/parser/Utf8ComponentClass.cpp
-        ${LIBRARY_DIR}/src/rose/block.c
-        ${LIBRARY_DIR}/src/rose/catchup.c
-        ${LIBRARY_DIR}/src/rose/init.c
-        ${LIBRARY_DIR}/src/rose/match.c
-        ${LIBRARY_DIR}/src/rose/program_runtime.c
-        ${LIBRARY_DIR}/src/rose/rose_build_add_mask.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_add.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_anchored.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_bytecode.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_castle.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_compile.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_convert.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_dedupe.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_engine_blob.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_exclusive.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_groups.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_infix.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_instructions.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_lit_accel.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_long_lit.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_lookaround.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_matchers.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_merge.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_misc.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_program.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_role_aliasing.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_scatter.cpp
-        ${LIBRARY_DIR}/src/rose/rose_build_width.cpp
-        ${LIBRARY_DIR}/src/rose/rose_in_util.cpp
-        ${LIBRARY_DIR}/src/rose/stream.c
-        ${LIBRARY_DIR}/src/runtime.c
-        ${LIBRARY_DIR}/src/scratch.c
-        ${LIBRARY_DIR}/src/smallwrite/smallwrite_build.cpp
-        ${LIBRARY_DIR}/src/som/slot_manager.cpp
-        ${LIBRARY_DIR}/src/som/som_runtime.c
-        ${LIBRARY_DIR}/src/som/som_stream.c
-        ${LIBRARY_DIR}/src/stream_compress.c
-        ${LIBRARY_DIR}/src/util/alloc.cpp
-        ${LIBRARY_DIR}/src/util/charreach.cpp
-        ${LIBRARY_DIR}/src/util/clique.cpp
-        ${LIBRARY_DIR}/src/util/compile_context.cpp
-        ${LIBRARY_DIR}/src/util/compile_error.cpp
-        ${LIBRARY_DIR}/src/util/cpuid_flags.c
-        ${LIBRARY_DIR}/src/util/depth.cpp
-        ${LIBRARY_DIR}/src/util/fatbit_build.cpp
-        ${LIBRARY_DIR}/src/util/multibit_build.cpp
-        ${LIBRARY_DIR}/src/util/multibit.c
-        ${LIBRARY_DIR}/src/util/report_manager.cpp
-        ${LIBRARY_DIR}/src/util/simd_utils.c
-        ${LIBRARY_DIR}/src/util/state_compress.c
-        ${LIBRARY_DIR}/src/util/target_info.cpp
-        ${LIBRARY_DIR}/src/util/ue2string.cpp
+        "${LIBRARY_DIR}/src/alloc.c"
+        "${LIBRARY_DIR}/src/compiler/asserts.cpp"
+        "${LIBRARY_DIR}/src/compiler/compiler.cpp"
+        "${LIBRARY_DIR}/src/compiler/error.cpp"
+        "${LIBRARY_DIR}/src/crc32.c"
+        "${LIBRARY_DIR}/src/database.c"
+        "${LIBRARY_DIR}/src/fdr/engine_description.cpp"
+        "${LIBRARY_DIR}/src/fdr/fdr_compile_util.cpp"
+        "${LIBRARY_DIR}/src/fdr/fdr_compile.cpp"
+        "${LIBRARY_DIR}/src/fdr/fdr_confirm_compile.cpp"
+        "${LIBRARY_DIR}/src/fdr/fdr_engine_description.cpp"
+        "${LIBRARY_DIR}/src/fdr/fdr.c"
+        "${LIBRARY_DIR}/src/fdr/flood_compile.cpp"
+        "${LIBRARY_DIR}/src/fdr/teddy_compile.cpp"
+        "${LIBRARY_DIR}/src/fdr/teddy_engine_description.cpp"
+        "${LIBRARY_DIR}/src/fdr/teddy.c"
+        "${LIBRARY_DIR}/src/grey.cpp"
+        "${LIBRARY_DIR}/src/hs_valid_platform.c"
+        "${LIBRARY_DIR}/src/hs_version.c"
+        "${LIBRARY_DIR}/src/hs.cpp"
+        "${LIBRARY_DIR}/src/hwlm/hwlm_build.cpp"
+        "${LIBRARY_DIR}/src/hwlm/hwlm_literal.cpp"
+        "${LIBRARY_DIR}/src/hwlm/hwlm.c"
+        "${LIBRARY_DIR}/src/hwlm/noodle_build.cpp"
+        "${LIBRARY_DIR}/src/hwlm/noodle_engine.c"
+        "${LIBRARY_DIR}/src/nfa/accel_dfa_build_strat.cpp"
+        "${LIBRARY_DIR}/src/nfa/accel.c"
+        "${LIBRARY_DIR}/src/nfa/accelcompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/castle.c"
+        "${LIBRARY_DIR}/src/nfa/castlecompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/dfa_build_strat.cpp"
+        "${LIBRARY_DIR}/src/nfa/dfa_min.cpp"
+        "${LIBRARY_DIR}/src/nfa/gough.c"
+        "${LIBRARY_DIR}/src/nfa/goughcompile_accel.cpp"
+        "${LIBRARY_DIR}/src/nfa/goughcompile_reg.cpp"
+        "${LIBRARY_DIR}/src/nfa/goughcompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/lbr.c"
+        "${LIBRARY_DIR}/src/nfa/limex_64.c"
+        "${LIBRARY_DIR}/src/nfa/limex_accel.c"
+        "${LIBRARY_DIR}/src/nfa/limex_compile.cpp"
+        "${LIBRARY_DIR}/src/nfa/limex_native.c"
+        "${LIBRARY_DIR}/src/nfa/limex_simd128.c"
+        "${LIBRARY_DIR}/src/nfa/limex_simd256.c"
+        "${LIBRARY_DIR}/src/nfa/limex_simd384.c"
+        "${LIBRARY_DIR}/src/nfa/limex_simd512.c"
+        "${LIBRARY_DIR}/src/nfa/mcclellan.c"
+        "${LIBRARY_DIR}/src/nfa/mcclellancompile_util.cpp"
+        "${LIBRARY_DIR}/src/nfa/mcclellancompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/mcsheng_compile.cpp"
+        "${LIBRARY_DIR}/src/nfa/mcsheng_data.c"
+        "${LIBRARY_DIR}/src/nfa/mcsheng.c"
+        "${LIBRARY_DIR}/src/nfa/mpv.c"
+        "${LIBRARY_DIR}/src/nfa/mpvcompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/nfa_api_dispatch.c"
+        "${LIBRARY_DIR}/src/nfa/nfa_build_util.cpp"
+        "${LIBRARY_DIR}/src/nfa/rdfa_graph.cpp"
+        "${LIBRARY_DIR}/src/nfa/rdfa_merge.cpp"
+        "${LIBRARY_DIR}/src/nfa/rdfa.cpp"
+        "${LIBRARY_DIR}/src/nfa/repeat.c"
+        "${LIBRARY_DIR}/src/nfa/repeatcompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/sheng.c"
+        "${LIBRARY_DIR}/src/nfa/shengcompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/shufti.c"
+        "${LIBRARY_DIR}/src/nfa/shufticompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/tamarama.c"
+        "${LIBRARY_DIR}/src/nfa/tamaramacompile.cpp"
+        "${LIBRARY_DIR}/src/nfa/truffle.c"
+        "${LIBRARY_DIR}/src/nfa/trufflecompile.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_anchored_acyclic.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_anchored_dots.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_asserts.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_builder.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_calc_components.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_cyclic_redundancy.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_depth.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_dominators.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_edge_redundancy.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_equivalence.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_execute.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_expr_info.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_extparam.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_fixed_width.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_fuzzy.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_haig.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_holder.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_is_equal.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_lbr.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_limex_accel.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_limex.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_literal_analysis.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_literal_component.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_literal_decorated.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_mcclellan.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_misc_opt.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_netflow.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_prefilter.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_prune.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_puff.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_redundancy.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_region_redundancy.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_region.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_repeat.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_reports.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_restructuring.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_revacc.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_sep.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_small_literal_set.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_som_add_redundancy.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_som_util.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_som.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_split.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_squash.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_stop.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_uncalc_components.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_utf8.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_util.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_vacuous.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_violet.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng_width.cpp"
+        "${LIBRARY_DIR}/src/nfagraph/ng.cpp"
+        "${LIBRARY_DIR}/src/parser/AsciiComponentClass.cpp"
+        "${LIBRARY_DIR}/src/parser/buildstate.cpp"
+        "${LIBRARY_DIR}/src/parser/check_refs.cpp"
+        "${LIBRARY_DIR}/src/parser/Component.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentAlternation.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentAssertion.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentAtomicGroup.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentBackReference.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentBoundary.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentByte.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentClass.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentCondReference.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentEmpty.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentEUS.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentRepeat.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentSequence.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentVisitor.cpp"
+        "${LIBRARY_DIR}/src/parser/ComponentWordBoundary.cpp"
+        "${LIBRARY_DIR}/src/parser/ConstComponentVisitor.cpp"
+        "${LIBRARY_DIR}/src/parser/control_verbs.cpp"
+        "${LIBRARY_DIR}/src/parser/logical_combination.cpp"
+        "${LIBRARY_DIR}/src/parser/parse_error.cpp"
+        "${LIBRARY_DIR}/src/parser/parser_util.cpp"
+        "${LIBRARY_DIR}/src/parser/Parser.cpp"
+        "${LIBRARY_DIR}/src/parser/prefilter.cpp"
+        "${LIBRARY_DIR}/src/parser/shortcut_literal.cpp"
+        "${LIBRARY_DIR}/src/parser/ucp_table.cpp"
+        "${LIBRARY_DIR}/src/parser/unsupported.cpp"
+        "${LIBRARY_DIR}/src/parser/utf8_validate.cpp"
+        "${LIBRARY_DIR}/src/parser/Utf8ComponentClass.cpp"
+        "${LIBRARY_DIR}/src/rose/block.c"
+        "${LIBRARY_DIR}/src/rose/catchup.c"
+        "${LIBRARY_DIR}/src/rose/init.c"
+        "${LIBRARY_DIR}/src/rose/match.c"
+        "${LIBRARY_DIR}/src/rose/program_runtime.c"
+        "${LIBRARY_DIR}/src/rose/rose_build_add_mask.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_add.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_anchored.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_bytecode.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_castle.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_compile.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_convert.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_dedupe.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_engine_blob.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_exclusive.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_groups.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_infix.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_instructions.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_lit_accel.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_long_lit.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_lookaround.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_matchers.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_merge.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_misc.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_program.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_role_aliasing.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_scatter.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_build_width.cpp"
+        "${LIBRARY_DIR}/src/rose/rose_in_util.cpp"
+        "${LIBRARY_DIR}/src/rose/stream.c"
+        "${LIBRARY_DIR}/src/runtime.c"
+        "${LIBRARY_DIR}/src/scratch.c"
+        "${LIBRARY_DIR}/src/smallwrite/smallwrite_build.cpp"
+        "${LIBRARY_DIR}/src/som/slot_manager.cpp"
+        "${LIBRARY_DIR}/src/som/som_runtime.c"
+        "${LIBRARY_DIR}/src/som/som_stream.c"
+        "${LIBRARY_DIR}/src/stream_compress.c"
+        "${LIBRARY_DIR}/src/util/alloc.cpp"
+        "${LIBRARY_DIR}/src/util/charreach.cpp"
+        "${LIBRARY_DIR}/src/util/clique.cpp"
+        "${LIBRARY_DIR}/src/util/compile_context.cpp"
+        "${LIBRARY_DIR}/src/util/compile_error.cpp"
+        "${LIBRARY_DIR}/src/util/cpuid_flags.c"
+        "${LIBRARY_DIR}/src/util/depth.cpp"
+        "${LIBRARY_DIR}/src/util/fatbit_build.cpp"
+        "${LIBRARY_DIR}/src/util/multibit_build.cpp"
+        "${LIBRARY_DIR}/src/util/multibit.c"
+        "${LIBRARY_DIR}/src/util/report_manager.cpp"
+        "${LIBRARY_DIR}/src/util/simd_utils.c"
+        "${LIBRARY_DIR}/src/util/state_compress.c"
+        "${LIBRARY_DIR}/src/util/target_info.cpp"
+        "${LIBRARY_DIR}/src/util/ue2string.cpp"
     )
 
     add_library (hyperscan ${SRCS})
@@ -259,9 +259,9 @@ if (NOT EXTERNAL_HYPERSCAN_LIBRARY_FOUND)
     target_include_directories (hyperscan
         PRIVATE
             common
-            ${LIBRARY_DIR}/include
+            "${LIBRARY_DIR}/include"
     )
-    target_include_directories (hyperscan SYSTEM PUBLIC ${LIBRARY_DIR}/src)
+    target_include_directories (hyperscan SYSTEM PUBLIC "${LIBRARY_DIR}/src")
     if (ARCH_AMD64)
         target_include_directories (hyperscan PRIVATE x86_64)
     endif ()
diff --git a/contrib/icu-cmake/CMakeLists.txt b/contrib/icu-cmake/CMakeLists.txt
index 884f5c3a336..26f3bb11006 100644
--- a/contrib/icu-cmake/CMakeLists.txt
+++ b/contrib/icu-cmake/CMakeLists.txt
@@ -1,447 +1,447 @@
-set(ICU_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/source)
-set(ICUDATA_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/icudata/)
+set(ICU_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/source")
+set(ICUDATA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/icudata/")
 
 set (CMAKE_CXX_STANDARD 17)
 
 # These lists of sources were generated from build log of the original ICU build system (configure + make).
 
 set(ICUUC_SOURCES
-${ICU_SOURCE_DIR}/common/errorcode.cpp
-${ICU_SOURCE_DIR}/common/putil.cpp
-${ICU_SOURCE_DIR}/common/umath.cpp
-${ICU_SOURCE_DIR}/common/utypes.cpp
-${ICU_SOURCE_DIR}/common/uinvchar.cpp
-${ICU_SOURCE_DIR}/common/umutex.cpp
-${ICU_SOURCE_DIR}/common/ucln_cmn.cpp
-${ICU_SOURCE_DIR}/common/uinit.cpp
-${ICU_SOURCE_DIR}/common/uobject.cpp
-${ICU_SOURCE_DIR}/common/cmemory.cpp
-${ICU_SOURCE_DIR}/common/charstr.cpp
-${ICU_SOURCE_DIR}/common/cstr.cpp
-${ICU_SOURCE_DIR}/common/udata.cpp
-${ICU_SOURCE_DIR}/common/ucmndata.cpp
-${ICU_SOURCE_DIR}/common/udatamem.cpp
-${ICU_SOURCE_DIR}/common/umapfile.cpp
-${ICU_SOURCE_DIR}/common/udataswp.cpp
-${ICU_SOURCE_DIR}/common/utrie_swap.cpp
-${ICU_SOURCE_DIR}/common/ucol_swp.cpp
-${ICU_SOURCE_DIR}/common/utrace.cpp
-${ICU_SOURCE_DIR}/common/uhash.cpp
-${ICU_SOURCE_DIR}/common/uhash_us.cpp
-${ICU_SOURCE_DIR}/common/uenum.cpp
-${ICU_SOURCE_DIR}/common/ustrenum.cpp
-${ICU_SOURCE_DIR}/common/uvector.cpp
-${ICU_SOURCE_DIR}/common/ustack.cpp
-${ICU_SOURCE_DIR}/common/uvectr32.cpp
-${ICU_SOURCE_DIR}/common/uvectr64.cpp
-${ICU_SOURCE_DIR}/common/ucnv.cpp
-${ICU_SOURCE_DIR}/common/ucnv_bld.cpp
-${ICU_SOURCE_DIR}/common/ucnv_cnv.cpp
-${ICU_SOURCE_DIR}/common/ucnv_io.cpp
-${ICU_SOURCE_DIR}/common/ucnv_cb.cpp
-${ICU_SOURCE_DIR}/common/ucnv_err.cpp
-${ICU_SOURCE_DIR}/common/ucnvlat1.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u7.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u8.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u16.cpp
-${ICU_SOURCE_DIR}/common/ucnv_u32.cpp
-${ICU_SOURCE_DIR}/common/ucnvscsu.cpp
-${ICU_SOURCE_DIR}/common/ucnvbocu.cpp
-${ICU_SOURCE_DIR}/common/ucnv_ext.cpp
-${ICU_SOURCE_DIR}/common/ucnvmbcs.cpp
-${ICU_SOURCE_DIR}/common/ucnv2022.cpp
-${ICU_SOURCE_DIR}/common/ucnvhz.cpp
-${ICU_SOURCE_DIR}/common/ucnv_lmb.cpp
-${ICU_SOURCE_DIR}/common/ucnvisci.cpp
-${ICU_SOURCE_DIR}/common/ucnvdisp.cpp
-${ICU_SOURCE_DIR}/common/ucnv_set.cpp
-${ICU_SOURCE_DIR}/common/ucnv_ct.cpp
-${ICU_SOURCE_DIR}/common/resource.cpp
-${ICU_SOURCE_DIR}/common/uresbund.cpp
-${ICU_SOURCE_DIR}/common/ures_cnv.cpp
-${ICU_SOURCE_DIR}/common/uresdata.cpp
-${ICU_SOURCE_DIR}/common/resbund.cpp
-${ICU_SOURCE_DIR}/common/resbund_cnv.cpp
-${ICU_SOURCE_DIR}/common/ucurr.cpp
-${ICU_SOURCE_DIR}/common/localebuilder.cpp
-${ICU_SOURCE_DIR}/common/localeprioritylist.cpp
-${ICU_SOURCE_DIR}/common/messagepattern.cpp
-${ICU_SOURCE_DIR}/common/ucat.cpp
-${ICU_SOURCE_DIR}/common/locmap.cpp
-${ICU_SOURCE_DIR}/common/uloc.cpp
-${ICU_SOURCE_DIR}/common/locid.cpp
-${ICU_SOURCE_DIR}/common/locutil.cpp
-${ICU_SOURCE_DIR}/common/locavailable.cpp
-${ICU_SOURCE_DIR}/common/locdispnames.cpp
-${ICU_SOURCE_DIR}/common/locdspnm.cpp
-${ICU_SOURCE_DIR}/common/loclikely.cpp
-${ICU_SOURCE_DIR}/common/locresdata.cpp
-${ICU_SOURCE_DIR}/common/lsr.cpp
-${ICU_SOURCE_DIR}/common/loclikelysubtags.cpp
-${ICU_SOURCE_DIR}/common/locdistance.cpp
-${ICU_SOURCE_DIR}/common/localematcher.cpp
-${ICU_SOURCE_DIR}/common/bytestream.cpp
-${ICU_SOURCE_DIR}/common/stringpiece.cpp
-${ICU_SOURCE_DIR}/common/bytesinkutil.cpp
-${ICU_SOURCE_DIR}/common/stringtriebuilder.cpp
-${ICU_SOURCE_DIR}/common/bytestriebuilder.cpp
-${ICU_SOURCE_DIR}/common/bytestrie.cpp
-${ICU_SOURCE_DIR}/common/bytestrieiterator.cpp
-${ICU_SOURCE_DIR}/common/ucharstrie.cpp
-${ICU_SOURCE_DIR}/common/ucharstriebuilder.cpp
-${ICU_SOURCE_DIR}/common/ucharstrieiterator.cpp
-${ICU_SOURCE_DIR}/common/dictionarydata.cpp
-${ICU_SOURCE_DIR}/common/edits.cpp
-${ICU_SOURCE_DIR}/common/appendable.cpp
-${ICU_SOURCE_DIR}/common/ustr_cnv.cpp
-${ICU_SOURCE_DIR}/common/unistr_cnv.cpp
-${ICU_SOURCE_DIR}/common/unistr.cpp
-${ICU_SOURCE_DIR}/common/unistr_case.cpp
-${ICU_SOURCE_DIR}/common/unistr_props.cpp
-${ICU_SOURCE_DIR}/common/utf_impl.cpp
-${ICU_SOURCE_DIR}/common/ustring.cpp
-${ICU_SOURCE_DIR}/common/ustrcase.cpp
-${ICU_SOURCE_DIR}/common/ucasemap.cpp
-${ICU_SOURCE_DIR}/common/ucasemap_titlecase_brkiter.cpp
-${ICU_SOURCE_DIR}/common/cstring.cpp
-${ICU_SOURCE_DIR}/common/ustrfmt.cpp
-${ICU_SOURCE_DIR}/common/ustrtrns.cpp
-${ICU_SOURCE_DIR}/common/ustr_wcs.cpp
-${ICU_SOURCE_DIR}/common/utext.cpp
-${ICU_SOURCE_DIR}/common/unistr_case_locale.cpp
-${ICU_SOURCE_DIR}/common/ustrcase_locale.cpp
-${ICU_SOURCE_DIR}/common/unistr_titlecase_brkiter.cpp
-${ICU_SOURCE_DIR}/common/ustr_titlecase_brkiter.cpp
-${ICU_SOURCE_DIR}/common/normalizer2impl.cpp
-${ICU_SOURCE_DIR}/common/normalizer2.cpp
-${ICU_SOURCE_DIR}/common/filterednormalizer2.cpp
-${ICU_SOURCE_DIR}/common/normlzr.cpp
-${ICU_SOURCE_DIR}/common/unorm.cpp
-${ICU_SOURCE_DIR}/common/unormcmp.cpp
-${ICU_SOURCE_DIR}/common/loadednormalizer2impl.cpp
-${ICU_SOURCE_DIR}/common/chariter.cpp
-${ICU_SOURCE_DIR}/common/schriter.cpp
-${ICU_SOURCE_DIR}/common/uchriter.cpp
-${ICU_SOURCE_DIR}/common/uiter.cpp
-${ICU_SOURCE_DIR}/common/patternprops.cpp
-${ICU_SOURCE_DIR}/common/uchar.cpp
-${ICU_SOURCE_DIR}/common/uprops.cpp
-${ICU_SOURCE_DIR}/common/ucase.cpp
-${ICU_SOURCE_DIR}/common/propname.cpp
-${ICU_SOURCE_DIR}/common/ubidi_props.cpp
-${ICU_SOURCE_DIR}/common/characterproperties.cpp
-${ICU_SOURCE_DIR}/common/ubidi.cpp
-${ICU_SOURCE_DIR}/common/ubidiwrt.cpp
-${ICU_SOURCE_DIR}/common/ubidiln.cpp
-${ICU_SOURCE_DIR}/common/ushape.cpp
-${ICU_SOURCE_DIR}/common/uscript.cpp
-${ICU_SOURCE_DIR}/common/uscript_props.cpp
-${ICU_SOURCE_DIR}/common/usc_impl.cpp
-${ICU_SOURCE_DIR}/common/unames.cpp
-${ICU_SOURCE_DIR}/common/utrie.cpp
-${ICU_SOURCE_DIR}/common/utrie2.cpp
-${ICU_SOURCE_DIR}/common/utrie2_builder.cpp
-${ICU_SOURCE_DIR}/common/ucptrie.cpp
-${ICU_SOURCE_DIR}/common/umutablecptrie.cpp
-${ICU_SOURCE_DIR}/common/bmpset.cpp
-${ICU_SOURCE_DIR}/common/unisetspan.cpp
-${ICU_SOURCE_DIR}/common/uset_props.cpp
-${ICU_SOURCE_DIR}/common/uniset_props.cpp
-${ICU_SOURCE_DIR}/common/uniset_closure.cpp
-${ICU_SOURCE_DIR}/common/uset.cpp
-${ICU_SOURCE_DIR}/common/uniset.cpp
-${ICU_SOURCE_DIR}/common/usetiter.cpp
-${ICU_SOURCE_DIR}/common/ruleiter.cpp
-${ICU_SOURCE_DIR}/common/caniter.cpp
-${ICU_SOURCE_DIR}/common/unifilt.cpp
-${ICU_SOURCE_DIR}/common/unifunct.cpp
-${ICU_SOURCE_DIR}/common/uarrsort.cpp
-${ICU_SOURCE_DIR}/common/brkiter.cpp
-${ICU_SOURCE_DIR}/common/ubrk.cpp
-${ICU_SOURCE_DIR}/common/brkeng.cpp
-${ICU_SOURCE_DIR}/common/dictbe.cpp
-${ICU_SOURCE_DIR}/common/filteredbrk.cpp
-${ICU_SOURCE_DIR}/common/rbbi.cpp
-${ICU_SOURCE_DIR}/common/rbbidata.cpp
-${ICU_SOURCE_DIR}/common/rbbinode.cpp
-${ICU_SOURCE_DIR}/common/rbbirb.cpp
-${ICU_SOURCE_DIR}/common/rbbiscan.cpp
-${ICU_SOURCE_DIR}/common/rbbisetb.cpp
-${ICU_SOURCE_DIR}/common/rbbistbl.cpp
-${ICU_SOURCE_DIR}/common/rbbitblb.cpp
-${ICU_SOURCE_DIR}/common/rbbi_cache.cpp
-${ICU_SOURCE_DIR}/common/serv.cpp
-${ICU_SOURCE_DIR}/common/servnotf.cpp
-${ICU_SOURCE_DIR}/common/servls.cpp
-${ICU_SOURCE_DIR}/common/servlk.cpp
-${ICU_SOURCE_DIR}/common/servlkf.cpp
-${ICU_SOURCE_DIR}/common/servrbf.cpp
-${ICU_SOURCE_DIR}/common/servslkf.cpp
-${ICU_SOURCE_DIR}/common/uidna.cpp
-${ICU_SOURCE_DIR}/common/usprep.cpp
-${ICU_SOURCE_DIR}/common/uts46.cpp
-${ICU_SOURCE_DIR}/common/punycode.cpp
-${ICU_SOURCE_DIR}/common/util.cpp
-${ICU_SOURCE_DIR}/common/util_props.cpp
-${ICU_SOURCE_DIR}/common/parsepos.cpp
-${ICU_SOURCE_DIR}/common/locbased.cpp
-${ICU_SOURCE_DIR}/common/cwchar.cpp
-${ICU_SOURCE_DIR}/common/wintz.cpp
-${ICU_SOURCE_DIR}/common/dtintrv.cpp
-${ICU_SOURCE_DIR}/common/ucnvsel.cpp
-${ICU_SOURCE_DIR}/common/propsvec.cpp
-${ICU_SOURCE_DIR}/common/ulist.cpp
-${ICU_SOURCE_DIR}/common/uloc_tag.cpp
-${ICU_SOURCE_DIR}/common/icudataver.cpp
-${ICU_SOURCE_DIR}/common/icuplug.cpp
-${ICU_SOURCE_DIR}/common/sharedobject.cpp
-${ICU_SOURCE_DIR}/common/simpleformatter.cpp
-${ICU_SOURCE_DIR}/common/unifiedcache.cpp
-${ICU_SOURCE_DIR}/common/uloc_keytype.cpp
-${ICU_SOURCE_DIR}/common/ubiditransform.cpp
-${ICU_SOURCE_DIR}/common/pluralmap.cpp
-${ICU_SOURCE_DIR}/common/static_unicode_sets.cpp
-${ICU_SOURCE_DIR}/common/restrace.cpp)
+"${ICU_SOURCE_DIR}/common/errorcode.cpp"
+"${ICU_SOURCE_DIR}/common/putil.cpp"
+"${ICU_SOURCE_DIR}/common/umath.cpp"
+"${ICU_SOURCE_DIR}/common/utypes.cpp"
+"${ICU_SOURCE_DIR}/common/uinvchar.cpp"
+"${ICU_SOURCE_DIR}/common/umutex.cpp"
+"${ICU_SOURCE_DIR}/common/ucln_cmn.cpp"
+"${ICU_SOURCE_DIR}/common/uinit.cpp"
+"${ICU_SOURCE_DIR}/common/uobject.cpp"
+"${ICU_SOURCE_DIR}/common/cmemory.cpp"
+"${ICU_SOURCE_DIR}/common/charstr.cpp"
+"${ICU_SOURCE_DIR}/common/cstr.cpp"
+"${ICU_SOURCE_DIR}/common/udata.cpp"
+"${ICU_SOURCE_DIR}/common/ucmndata.cpp"
+"${ICU_SOURCE_DIR}/common/udatamem.cpp"
+"${ICU_SOURCE_DIR}/common/umapfile.cpp"
+"${ICU_SOURCE_DIR}/common/udataswp.cpp"
+"${ICU_SOURCE_DIR}/common/utrie_swap.cpp"
+"${ICU_SOURCE_DIR}/common/ucol_swp.cpp"
+"${ICU_SOURCE_DIR}/common/utrace.cpp"
+"${ICU_SOURCE_DIR}/common/uhash.cpp"
+"${ICU_SOURCE_DIR}/common/uhash_us.cpp"
+"${ICU_SOURCE_DIR}/common/uenum.cpp"
+"${ICU_SOURCE_DIR}/common/ustrenum.cpp"
+"${ICU_SOURCE_DIR}/common/uvector.cpp"
+"${ICU_SOURCE_DIR}/common/ustack.cpp"
+"${ICU_SOURCE_DIR}/common/uvectr32.cpp"
+"${ICU_SOURCE_DIR}/common/uvectr64.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_bld.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_io.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_cb.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_err.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvlat1.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u7.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u8.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u16.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_u32.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvscsu.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvbocu.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_ext.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvmbcs.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv2022.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvhz.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_lmb.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvisci.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvdisp.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_set.cpp"
+"${ICU_SOURCE_DIR}/common/ucnv_ct.cpp"
+"${ICU_SOURCE_DIR}/common/resource.cpp"
+"${ICU_SOURCE_DIR}/common/uresbund.cpp"
+"${ICU_SOURCE_DIR}/common/ures_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/uresdata.cpp"
+"${ICU_SOURCE_DIR}/common/resbund.cpp"
+"${ICU_SOURCE_DIR}/common/resbund_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/ucurr.cpp"
+"${ICU_SOURCE_DIR}/common/localebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/localeprioritylist.cpp"
+"${ICU_SOURCE_DIR}/common/messagepattern.cpp"
+"${ICU_SOURCE_DIR}/common/ucat.cpp"
+"${ICU_SOURCE_DIR}/common/locmap.cpp"
+"${ICU_SOURCE_DIR}/common/uloc.cpp"
+"${ICU_SOURCE_DIR}/common/locid.cpp"
+"${ICU_SOURCE_DIR}/common/locutil.cpp"
+"${ICU_SOURCE_DIR}/common/locavailable.cpp"
+"${ICU_SOURCE_DIR}/common/locdispnames.cpp"
+"${ICU_SOURCE_DIR}/common/locdspnm.cpp"
+"${ICU_SOURCE_DIR}/common/loclikely.cpp"
+"${ICU_SOURCE_DIR}/common/locresdata.cpp"
+"${ICU_SOURCE_DIR}/common/lsr.cpp"
+"${ICU_SOURCE_DIR}/common/loclikelysubtags.cpp"
+"${ICU_SOURCE_DIR}/common/locdistance.cpp"
+"${ICU_SOURCE_DIR}/common/localematcher.cpp"
+"${ICU_SOURCE_DIR}/common/bytestream.cpp"
+"${ICU_SOURCE_DIR}/common/stringpiece.cpp"
+"${ICU_SOURCE_DIR}/common/bytesinkutil.cpp"
+"${ICU_SOURCE_DIR}/common/stringtriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/bytestriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/bytestrie.cpp"
+"${ICU_SOURCE_DIR}/common/bytestrieiterator.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstrie.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstriebuilder.cpp"
+"${ICU_SOURCE_DIR}/common/ucharstrieiterator.cpp"
+"${ICU_SOURCE_DIR}/common/dictionarydata.cpp"
+"${ICU_SOURCE_DIR}/common/edits.cpp"
+"${ICU_SOURCE_DIR}/common/appendable.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_cnv.cpp"
+"${ICU_SOURCE_DIR}/common/unistr.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_case.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_props.cpp"
+"${ICU_SOURCE_DIR}/common/utf_impl.cpp"
+"${ICU_SOURCE_DIR}/common/ustring.cpp"
+"${ICU_SOURCE_DIR}/common/ustrcase.cpp"
+"${ICU_SOURCE_DIR}/common/ucasemap.cpp"
+"${ICU_SOURCE_DIR}/common/ucasemap_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/cstring.cpp"
+"${ICU_SOURCE_DIR}/common/ustrfmt.cpp"
+"${ICU_SOURCE_DIR}/common/ustrtrns.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_wcs.cpp"
+"${ICU_SOURCE_DIR}/common/utext.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_case_locale.cpp"
+"${ICU_SOURCE_DIR}/common/ustrcase_locale.cpp"
+"${ICU_SOURCE_DIR}/common/unistr_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/ustr_titlecase_brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/normalizer2impl.cpp"
+"${ICU_SOURCE_DIR}/common/normalizer2.cpp"
+"${ICU_SOURCE_DIR}/common/filterednormalizer2.cpp"
+"${ICU_SOURCE_DIR}/common/normlzr.cpp"
+"${ICU_SOURCE_DIR}/common/unorm.cpp"
+"${ICU_SOURCE_DIR}/common/unormcmp.cpp"
+"${ICU_SOURCE_DIR}/common/loadednormalizer2impl.cpp"
+"${ICU_SOURCE_DIR}/common/chariter.cpp"
+"${ICU_SOURCE_DIR}/common/schriter.cpp"
+"${ICU_SOURCE_DIR}/common/uchriter.cpp"
+"${ICU_SOURCE_DIR}/common/uiter.cpp"
+"${ICU_SOURCE_DIR}/common/patternprops.cpp"
+"${ICU_SOURCE_DIR}/common/uchar.cpp"
+"${ICU_SOURCE_DIR}/common/uprops.cpp"
+"${ICU_SOURCE_DIR}/common/ucase.cpp"
+"${ICU_SOURCE_DIR}/common/propname.cpp"
+"${ICU_SOURCE_DIR}/common/ubidi_props.cpp"
+"${ICU_SOURCE_DIR}/common/characterproperties.cpp"
+"${ICU_SOURCE_DIR}/common/ubidi.cpp"
+"${ICU_SOURCE_DIR}/common/ubidiwrt.cpp"
+"${ICU_SOURCE_DIR}/common/ubidiln.cpp"
+"${ICU_SOURCE_DIR}/common/ushape.cpp"
+"${ICU_SOURCE_DIR}/common/uscript.cpp"
+"${ICU_SOURCE_DIR}/common/uscript_props.cpp"
+"${ICU_SOURCE_DIR}/common/usc_impl.cpp"
+"${ICU_SOURCE_DIR}/common/unames.cpp"
+"${ICU_SOURCE_DIR}/common/utrie.cpp"
+"${ICU_SOURCE_DIR}/common/utrie2.cpp"
+"${ICU_SOURCE_DIR}/common/utrie2_builder.cpp"
+"${ICU_SOURCE_DIR}/common/ucptrie.cpp"
+"${ICU_SOURCE_DIR}/common/umutablecptrie.cpp"
+"${ICU_SOURCE_DIR}/common/bmpset.cpp"
+"${ICU_SOURCE_DIR}/common/unisetspan.cpp"
+"${ICU_SOURCE_DIR}/common/uset_props.cpp"
+"${ICU_SOURCE_DIR}/common/uniset_props.cpp"
+"${ICU_SOURCE_DIR}/common/uniset_closure.cpp"
+"${ICU_SOURCE_DIR}/common/uset.cpp"
+"${ICU_SOURCE_DIR}/common/uniset.cpp"
+"${ICU_SOURCE_DIR}/common/usetiter.cpp"
+"${ICU_SOURCE_DIR}/common/ruleiter.cpp"
+"${ICU_SOURCE_DIR}/common/caniter.cpp"
+"${ICU_SOURCE_DIR}/common/unifilt.cpp"
+"${ICU_SOURCE_DIR}/common/unifunct.cpp"
+"${ICU_SOURCE_DIR}/common/uarrsort.cpp"
+"${ICU_SOURCE_DIR}/common/brkiter.cpp"
+"${ICU_SOURCE_DIR}/common/ubrk.cpp"
+"${ICU_SOURCE_DIR}/common/brkeng.cpp"
+"${ICU_SOURCE_DIR}/common/dictbe.cpp"
+"${ICU_SOURCE_DIR}/common/filteredbrk.cpp"
+"${ICU_SOURCE_DIR}/common/rbbi.cpp"
+"${ICU_SOURCE_DIR}/common/rbbidata.cpp"
+"${ICU_SOURCE_DIR}/common/rbbinode.cpp"
+"${ICU_SOURCE_DIR}/common/rbbirb.cpp"
+"${ICU_SOURCE_DIR}/common/rbbiscan.cpp"
+"${ICU_SOURCE_DIR}/common/rbbisetb.cpp"
+"${ICU_SOURCE_DIR}/common/rbbistbl.cpp"
+"${ICU_SOURCE_DIR}/common/rbbitblb.cpp"
+"${ICU_SOURCE_DIR}/common/rbbi_cache.cpp"
+"${ICU_SOURCE_DIR}/common/serv.cpp"
+"${ICU_SOURCE_DIR}/common/servnotf.cpp"
+"${ICU_SOURCE_DIR}/common/servls.cpp"
+"${ICU_SOURCE_DIR}/common/servlk.cpp"
+"${ICU_SOURCE_DIR}/common/servlkf.cpp"
+"${ICU_SOURCE_DIR}/common/servrbf.cpp"
+"${ICU_SOURCE_DIR}/common/servslkf.cpp"
+"${ICU_SOURCE_DIR}/common/uidna.cpp"
+"${ICU_SOURCE_DIR}/common/usprep.cpp"
+"${ICU_SOURCE_DIR}/common/uts46.cpp"
+"${ICU_SOURCE_DIR}/common/punycode.cpp"
+"${ICU_SOURCE_DIR}/common/util.cpp"
+"${ICU_SOURCE_DIR}/common/util_props.cpp"
+"${ICU_SOURCE_DIR}/common/parsepos.cpp"
+"${ICU_SOURCE_DIR}/common/locbased.cpp"
+"${ICU_SOURCE_DIR}/common/cwchar.cpp"
+"${ICU_SOURCE_DIR}/common/wintz.cpp"
+"${ICU_SOURCE_DIR}/common/dtintrv.cpp"
+"${ICU_SOURCE_DIR}/common/ucnvsel.cpp"
+"${ICU_SOURCE_DIR}/common/propsvec.cpp"
+"${ICU_SOURCE_DIR}/common/ulist.cpp"
+"${ICU_SOURCE_DIR}/common/uloc_tag.cpp"
+"${ICU_SOURCE_DIR}/common/icudataver.cpp"
+"${ICU_SOURCE_DIR}/common/icuplug.cpp"
+"${ICU_SOURCE_DIR}/common/sharedobject.cpp"
+"${ICU_SOURCE_DIR}/common/simpleformatter.cpp"
+"${ICU_SOURCE_DIR}/common/unifiedcache.cpp"
+"${ICU_SOURCE_DIR}/common/uloc_keytype.cpp"
+"${ICU_SOURCE_DIR}/common/ubiditransform.cpp"
+"${ICU_SOURCE_DIR}/common/pluralmap.cpp"
+"${ICU_SOURCE_DIR}/common/static_unicode_sets.cpp"
+"${ICU_SOURCE_DIR}/common/restrace.cpp")
 
 set(ICUI18N_SOURCES
-${ICU_SOURCE_DIR}/i18n/ucln_in.cpp
-${ICU_SOURCE_DIR}/i18n/fmtable.cpp
-${ICU_SOURCE_DIR}/i18n/format.cpp
-${ICU_SOURCE_DIR}/i18n/msgfmt.cpp
-${ICU_SOURCE_DIR}/i18n/umsg.cpp
-${ICU_SOURCE_DIR}/i18n/numfmt.cpp
-${ICU_SOURCE_DIR}/i18n/unum.cpp
-${ICU_SOURCE_DIR}/i18n/decimfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dcfmtsym.cpp
-${ICU_SOURCE_DIR}/i18n/fmtable_cnv.cpp
-${ICU_SOURCE_DIR}/i18n/choicfmt.cpp
-${ICU_SOURCE_DIR}/i18n/datefmt.cpp
-${ICU_SOURCE_DIR}/i18n/smpdtfmt.cpp
-${ICU_SOURCE_DIR}/i18n/reldtfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dtfmtsym.cpp
-${ICU_SOURCE_DIR}/i18n/udat.cpp
-${ICU_SOURCE_DIR}/i18n/dtptngen.cpp
-${ICU_SOURCE_DIR}/i18n/udatpg.cpp
-${ICU_SOURCE_DIR}/i18n/nfrs.cpp
-${ICU_SOURCE_DIR}/i18n/nfrule.cpp
-${ICU_SOURCE_DIR}/i18n/nfsubs.cpp
-${ICU_SOURCE_DIR}/i18n/rbnf.cpp
-${ICU_SOURCE_DIR}/i18n/numsys.cpp
-${ICU_SOURCE_DIR}/i18n/unumsys.cpp
-${ICU_SOURCE_DIR}/i18n/ucsdet.cpp
-${ICU_SOURCE_DIR}/i18n/ucal.cpp
-${ICU_SOURCE_DIR}/i18n/calendar.cpp
-${ICU_SOURCE_DIR}/i18n/gregocal.cpp
-${ICU_SOURCE_DIR}/i18n/timezone.cpp
-${ICU_SOURCE_DIR}/i18n/simpletz.cpp
-${ICU_SOURCE_DIR}/i18n/olsontz.cpp
-${ICU_SOURCE_DIR}/i18n/astro.cpp
-${ICU_SOURCE_DIR}/i18n/taiwncal.cpp
-${ICU_SOURCE_DIR}/i18n/buddhcal.cpp
-${ICU_SOURCE_DIR}/i18n/persncal.cpp
-${ICU_SOURCE_DIR}/i18n/islamcal.cpp
-${ICU_SOURCE_DIR}/i18n/japancal.cpp
-${ICU_SOURCE_DIR}/i18n/gregoimp.cpp
-${ICU_SOURCE_DIR}/i18n/hebrwcal.cpp
-${ICU_SOURCE_DIR}/i18n/indiancal.cpp
-${ICU_SOURCE_DIR}/i18n/chnsecal.cpp
-${ICU_SOURCE_DIR}/i18n/cecal.cpp
-${ICU_SOURCE_DIR}/i18n/coptccal.cpp
-${ICU_SOURCE_DIR}/i18n/dangical.cpp
-${ICU_SOURCE_DIR}/i18n/ethpccal.cpp
-${ICU_SOURCE_DIR}/i18n/coleitr.cpp
-${ICU_SOURCE_DIR}/i18n/coll.cpp
-${ICU_SOURCE_DIR}/i18n/sortkey.cpp
-${ICU_SOURCE_DIR}/i18n/bocsu.cpp
-${ICU_SOURCE_DIR}/i18n/ucoleitr.cpp
-${ICU_SOURCE_DIR}/i18n/ucol.cpp
-${ICU_SOURCE_DIR}/i18n/ucol_res.cpp
-${ICU_SOURCE_DIR}/i18n/ucol_sit.cpp
-${ICU_SOURCE_DIR}/i18n/collation.cpp
-${ICU_SOURCE_DIR}/i18n/collationsettings.cpp
-${ICU_SOURCE_DIR}/i18n/collationdata.cpp
-${ICU_SOURCE_DIR}/i18n/collationtailoring.cpp
-${ICU_SOURCE_DIR}/i18n/collationdatareader.cpp
-${ICU_SOURCE_DIR}/i18n/collationdatawriter.cpp
-${ICU_SOURCE_DIR}/i18n/collationfcd.cpp
-${ICU_SOURCE_DIR}/i18n/collationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/utf16collationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/utf8collationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/uitercollationiterator.cpp
-${ICU_SOURCE_DIR}/i18n/collationsets.cpp
-${ICU_SOURCE_DIR}/i18n/collationcompare.cpp
-${ICU_SOURCE_DIR}/i18n/collationfastlatin.cpp
-${ICU_SOURCE_DIR}/i18n/collationkeys.cpp
-${ICU_SOURCE_DIR}/i18n/rulebasedcollator.cpp
-${ICU_SOURCE_DIR}/i18n/collationroot.cpp
-${ICU_SOURCE_DIR}/i18n/collationrootelements.cpp
-${ICU_SOURCE_DIR}/i18n/collationdatabuilder.cpp
-${ICU_SOURCE_DIR}/i18n/collationweights.cpp
-${ICU_SOURCE_DIR}/i18n/collationruleparser.cpp
-${ICU_SOURCE_DIR}/i18n/collationbuilder.cpp
-${ICU_SOURCE_DIR}/i18n/collationfastlatinbuilder.cpp
-${ICU_SOURCE_DIR}/i18n/listformatter.cpp
-${ICU_SOURCE_DIR}/i18n/ulistformatter.cpp
-${ICU_SOURCE_DIR}/i18n/strmatch.cpp
-${ICU_SOURCE_DIR}/i18n/usearch.cpp
-${ICU_SOURCE_DIR}/i18n/search.cpp
-${ICU_SOURCE_DIR}/i18n/stsearch.cpp
-${ICU_SOURCE_DIR}/i18n/translit.cpp
-${ICU_SOURCE_DIR}/i18n/utrans.cpp
-${ICU_SOURCE_DIR}/i18n/esctrn.cpp
-${ICU_SOURCE_DIR}/i18n/unesctrn.cpp
-${ICU_SOURCE_DIR}/i18n/funcrepl.cpp
-${ICU_SOURCE_DIR}/i18n/strrepl.cpp
-${ICU_SOURCE_DIR}/i18n/tridpars.cpp
-${ICU_SOURCE_DIR}/i18n/cpdtrans.cpp
-${ICU_SOURCE_DIR}/i18n/rbt.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_data.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_pars.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_rule.cpp
-${ICU_SOURCE_DIR}/i18n/rbt_set.cpp
-${ICU_SOURCE_DIR}/i18n/nultrans.cpp
-${ICU_SOURCE_DIR}/i18n/remtrans.cpp
-${ICU_SOURCE_DIR}/i18n/casetrn.cpp
-${ICU_SOURCE_DIR}/i18n/titletrn.cpp
-${ICU_SOURCE_DIR}/i18n/tolowtrn.cpp
-${ICU_SOURCE_DIR}/i18n/toupptrn.cpp
-${ICU_SOURCE_DIR}/i18n/anytrans.cpp
-${ICU_SOURCE_DIR}/i18n/name2uni.cpp
-${ICU_SOURCE_DIR}/i18n/uni2name.cpp
-${ICU_SOURCE_DIR}/i18n/nortrans.cpp
-${ICU_SOURCE_DIR}/i18n/quant.cpp
-${ICU_SOURCE_DIR}/i18n/transreg.cpp
-${ICU_SOURCE_DIR}/i18n/brktrans.cpp
-${ICU_SOURCE_DIR}/i18n/regexcmp.cpp
-${ICU_SOURCE_DIR}/i18n/rematch.cpp
-${ICU_SOURCE_DIR}/i18n/repattrn.cpp
-${ICU_SOURCE_DIR}/i18n/regexst.cpp
-${ICU_SOURCE_DIR}/i18n/regextxt.cpp
-${ICU_SOURCE_DIR}/i18n/regeximp.cpp
-${ICU_SOURCE_DIR}/i18n/uregex.cpp
-${ICU_SOURCE_DIR}/i18n/uregexc.cpp
-${ICU_SOURCE_DIR}/i18n/ulocdata.cpp
-${ICU_SOURCE_DIR}/i18n/measfmt.cpp
-${ICU_SOURCE_DIR}/i18n/currfmt.cpp
-${ICU_SOURCE_DIR}/i18n/curramt.cpp
-${ICU_SOURCE_DIR}/i18n/currunit.cpp
-${ICU_SOURCE_DIR}/i18n/measure.cpp
-${ICU_SOURCE_DIR}/i18n/utmscale.cpp
-${ICU_SOURCE_DIR}/i18n/csdetect.cpp
-${ICU_SOURCE_DIR}/i18n/csmatch.cpp
-${ICU_SOURCE_DIR}/i18n/csr2022.cpp
-${ICU_SOURCE_DIR}/i18n/csrecog.cpp
-${ICU_SOURCE_DIR}/i18n/csrmbcs.cpp
-${ICU_SOURCE_DIR}/i18n/csrsbcs.cpp
-${ICU_SOURCE_DIR}/i18n/csrucode.cpp
-${ICU_SOURCE_DIR}/i18n/csrutf8.cpp
-${ICU_SOURCE_DIR}/i18n/inputext.cpp
-${ICU_SOURCE_DIR}/i18n/wintzimpl.cpp
-${ICU_SOURCE_DIR}/i18n/windtfmt.cpp
-${ICU_SOURCE_DIR}/i18n/winnmfmt.cpp
-${ICU_SOURCE_DIR}/i18n/basictz.cpp
-${ICU_SOURCE_DIR}/i18n/dtrule.cpp
-${ICU_SOURCE_DIR}/i18n/rbtz.cpp
-${ICU_SOURCE_DIR}/i18n/tzrule.cpp
-${ICU_SOURCE_DIR}/i18n/tztrans.cpp
-${ICU_SOURCE_DIR}/i18n/vtzone.cpp
-${ICU_SOURCE_DIR}/i18n/zonemeta.cpp
-${ICU_SOURCE_DIR}/i18n/standardplural.cpp
-${ICU_SOURCE_DIR}/i18n/upluralrules.cpp
-${ICU_SOURCE_DIR}/i18n/plurrule.cpp
-${ICU_SOURCE_DIR}/i18n/plurfmt.cpp
-${ICU_SOURCE_DIR}/i18n/selfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dtitvfmt.cpp
-${ICU_SOURCE_DIR}/i18n/dtitvinf.cpp
-${ICU_SOURCE_DIR}/i18n/udateintervalformat.cpp
-${ICU_SOURCE_DIR}/i18n/tmunit.cpp
-${ICU_SOURCE_DIR}/i18n/tmutamt.cpp
-${ICU_SOURCE_DIR}/i18n/tmutfmt.cpp
-${ICU_SOURCE_DIR}/i18n/currpinf.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof_impl.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof_build.cpp
-${ICU_SOURCE_DIR}/i18n/uspoof_conf.cpp
-${ICU_SOURCE_DIR}/i18n/smpdtfst.cpp
-${ICU_SOURCE_DIR}/i18n/ztrans.cpp
-${ICU_SOURCE_DIR}/i18n/zrule.cpp
-${ICU_SOURCE_DIR}/i18n/vzone.cpp
-${ICU_SOURCE_DIR}/i18n/fphdlimp.cpp
-${ICU_SOURCE_DIR}/i18n/fpositer.cpp
-${ICU_SOURCE_DIR}/i18n/ufieldpositer.cpp
-${ICU_SOURCE_DIR}/i18n/decNumber.cpp
-${ICU_SOURCE_DIR}/i18n/decContext.cpp
-${ICU_SOURCE_DIR}/i18n/alphaindex.cpp
-${ICU_SOURCE_DIR}/i18n/tznames.cpp
-${ICU_SOURCE_DIR}/i18n/tznames_impl.cpp
-${ICU_SOURCE_DIR}/i18n/tzgnames.cpp
-${ICU_SOURCE_DIR}/i18n/tzfmt.cpp
-${ICU_SOURCE_DIR}/i18n/compactdecimalformat.cpp
-${ICU_SOURCE_DIR}/i18n/gender.cpp
-${ICU_SOURCE_DIR}/i18n/region.cpp
-${ICU_SOURCE_DIR}/i18n/scriptset.cpp
-${ICU_SOURCE_DIR}/i18n/uregion.cpp
-${ICU_SOURCE_DIR}/i18n/reldatefmt.cpp
-${ICU_SOURCE_DIR}/i18n/quantityformatter.cpp
-${ICU_SOURCE_DIR}/i18n/measunit.cpp
-${ICU_SOURCE_DIR}/i18n/sharedbreakiterator.cpp
-${ICU_SOURCE_DIR}/i18n/scientificnumberformatter.cpp
-${ICU_SOURCE_DIR}/i18n/dayperiodrules.cpp
-${ICU_SOURCE_DIR}/i18n/nounit.cpp
-${ICU_SOURCE_DIR}/i18n/number_affixutils.cpp
-${ICU_SOURCE_DIR}/i18n/number_compact.cpp
-${ICU_SOURCE_DIR}/i18n/number_decimalquantity.cpp
-${ICU_SOURCE_DIR}/i18n/number_decimfmtprops.cpp
-${ICU_SOURCE_DIR}/i18n/number_fluent.cpp
-${ICU_SOURCE_DIR}/i18n/number_formatimpl.cpp
-${ICU_SOURCE_DIR}/i18n/number_grouping.cpp
-${ICU_SOURCE_DIR}/i18n/number_integerwidth.cpp
-${ICU_SOURCE_DIR}/i18n/number_longnames.cpp
-${ICU_SOURCE_DIR}/i18n/number_modifiers.cpp
-${ICU_SOURCE_DIR}/i18n/number_notation.cpp
-${ICU_SOURCE_DIR}/i18n/number_output.cpp
-${ICU_SOURCE_DIR}/i18n/number_padding.cpp
-${ICU_SOURCE_DIR}/i18n/number_patternmodifier.cpp
-${ICU_SOURCE_DIR}/i18n/number_patternstring.cpp
-${ICU_SOURCE_DIR}/i18n/number_rounding.cpp
-${ICU_SOURCE_DIR}/i18n/number_scientific.cpp
-${ICU_SOURCE_DIR}/i18n/number_utils.cpp
-${ICU_SOURCE_DIR}/i18n/number_asformat.cpp
-${ICU_SOURCE_DIR}/i18n/number_mapper.cpp
-${ICU_SOURCE_DIR}/i18n/number_multiplier.cpp
-${ICU_SOURCE_DIR}/i18n/number_currencysymbols.cpp
-${ICU_SOURCE_DIR}/i18n/number_skeletons.cpp
-${ICU_SOURCE_DIR}/i18n/number_capi.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-string-to-double.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-double-to-string.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-bignum-dtoa.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-bignum.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-cached-powers.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-fast-dtoa.cpp
-${ICU_SOURCE_DIR}/i18n/double-conversion-strtod.cpp
-${ICU_SOURCE_DIR}/i18n/string_segment.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_parsednumber.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_impl.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_symbols.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_decimal.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_scientific.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_currency.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_affixes.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_compositions.cpp
-${ICU_SOURCE_DIR}/i18n/numparse_validators.cpp
-${ICU_SOURCE_DIR}/i18n/numrange_fluent.cpp
-${ICU_SOURCE_DIR}/i18n/numrange_impl.cpp
-${ICU_SOURCE_DIR}/i18n/erarules.cpp
-${ICU_SOURCE_DIR}/i18n/formattedvalue.cpp
-${ICU_SOURCE_DIR}/i18n/formattedval_iterimpl.cpp
-${ICU_SOURCE_DIR}/i18n/formattedval_sbimpl.cpp
-${ICU_SOURCE_DIR}/i18n/formatted_string_builder.cpp)
+"${ICU_SOURCE_DIR}/i18n/ucln_in.cpp"
+"${ICU_SOURCE_DIR}/i18n/fmtable.cpp"
+"${ICU_SOURCE_DIR}/i18n/format.cpp"
+"${ICU_SOURCE_DIR}/i18n/msgfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/umsg.cpp"
+"${ICU_SOURCE_DIR}/i18n/numfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/unum.cpp"
+"${ICU_SOURCE_DIR}/i18n/decimfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dcfmtsym.cpp"
+"${ICU_SOURCE_DIR}/i18n/fmtable_cnv.cpp"
+"${ICU_SOURCE_DIR}/i18n/choicfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/datefmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/smpdtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/reldtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtfmtsym.cpp"
+"${ICU_SOURCE_DIR}/i18n/udat.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtptngen.cpp"
+"${ICU_SOURCE_DIR}/i18n/udatpg.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfrs.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/nfsubs.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbnf.cpp"
+"${ICU_SOURCE_DIR}/i18n/numsys.cpp"
+"${ICU_SOURCE_DIR}/i18n/unumsys.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucsdet.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucal.cpp"
+"${ICU_SOURCE_DIR}/i18n/calendar.cpp"
+"${ICU_SOURCE_DIR}/i18n/gregocal.cpp"
+"${ICU_SOURCE_DIR}/i18n/timezone.cpp"
+"${ICU_SOURCE_DIR}/i18n/simpletz.cpp"
+"${ICU_SOURCE_DIR}/i18n/olsontz.cpp"
+"${ICU_SOURCE_DIR}/i18n/astro.cpp"
+"${ICU_SOURCE_DIR}/i18n/taiwncal.cpp"
+"${ICU_SOURCE_DIR}/i18n/buddhcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/persncal.cpp"
+"${ICU_SOURCE_DIR}/i18n/islamcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/japancal.cpp"
+"${ICU_SOURCE_DIR}/i18n/gregoimp.cpp"
+"${ICU_SOURCE_DIR}/i18n/hebrwcal.cpp"
+"${ICU_SOURCE_DIR}/i18n/indiancal.cpp"
+"${ICU_SOURCE_DIR}/i18n/chnsecal.cpp"
+"${ICU_SOURCE_DIR}/i18n/cecal.cpp"
+"${ICU_SOURCE_DIR}/i18n/coptccal.cpp"
+"${ICU_SOURCE_DIR}/i18n/dangical.cpp"
+"${ICU_SOURCE_DIR}/i18n/ethpccal.cpp"
+"${ICU_SOURCE_DIR}/i18n/coleitr.cpp"
+"${ICU_SOURCE_DIR}/i18n/coll.cpp"
+"${ICU_SOURCE_DIR}/i18n/sortkey.cpp"
+"${ICU_SOURCE_DIR}/i18n/bocsu.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucoleitr.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol_res.cpp"
+"${ICU_SOURCE_DIR}/i18n/ucol_sit.cpp"
+"${ICU_SOURCE_DIR}/i18n/collation.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationsettings.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdata.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationtailoring.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdatareader.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdatawriter.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfcd.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/utf16collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/utf8collationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/uitercollationiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationsets.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationcompare.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfastlatin.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationkeys.cpp"
+"${ICU_SOURCE_DIR}/i18n/rulebasedcollator.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationroot.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationrootelements.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationdatabuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationweights.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationruleparser.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationbuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/collationfastlatinbuilder.cpp"
+"${ICU_SOURCE_DIR}/i18n/listformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/ulistformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/strmatch.cpp"
+"${ICU_SOURCE_DIR}/i18n/usearch.cpp"
+"${ICU_SOURCE_DIR}/i18n/search.cpp"
+"${ICU_SOURCE_DIR}/i18n/stsearch.cpp"
+"${ICU_SOURCE_DIR}/i18n/translit.cpp"
+"${ICU_SOURCE_DIR}/i18n/utrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/esctrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/unesctrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/funcrepl.cpp"
+"${ICU_SOURCE_DIR}/i18n/strrepl.cpp"
+"${ICU_SOURCE_DIR}/i18n/tridpars.cpp"
+"${ICU_SOURCE_DIR}/i18n/cpdtrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_data.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_pars.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_rule.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbt_set.cpp"
+"${ICU_SOURCE_DIR}/i18n/nultrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/remtrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/casetrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/titletrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/tolowtrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/toupptrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/anytrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/name2uni.cpp"
+"${ICU_SOURCE_DIR}/i18n/uni2name.cpp"
+"${ICU_SOURCE_DIR}/i18n/nortrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/quant.cpp"
+"${ICU_SOURCE_DIR}/i18n/transreg.cpp"
+"${ICU_SOURCE_DIR}/i18n/brktrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/regexcmp.cpp"
+"${ICU_SOURCE_DIR}/i18n/rematch.cpp"
+"${ICU_SOURCE_DIR}/i18n/repattrn.cpp"
+"${ICU_SOURCE_DIR}/i18n/regexst.cpp"
+"${ICU_SOURCE_DIR}/i18n/regextxt.cpp"
+"${ICU_SOURCE_DIR}/i18n/regeximp.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregex.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregexc.cpp"
+"${ICU_SOURCE_DIR}/i18n/ulocdata.cpp"
+"${ICU_SOURCE_DIR}/i18n/measfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/curramt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/measure.cpp"
+"${ICU_SOURCE_DIR}/i18n/utmscale.cpp"
+"${ICU_SOURCE_DIR}/i18n/csdetect.cpp"
+"${ICU_SOURCE_DIR}/i18n/csmatch.cpp"
+"${ICU_SOURCE_DIR}/i18n/csr2022.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrecog.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrmbcs.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrsbcs.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrucode.cpp"
+"${ICU_SOURCE_DIR}/i18n/csrutf8.cpp"
+"${ICU_SOURCE_DIR}/i18n/inputext.cpp"
+"${ICU_SOURCE_DIR}/i18n/wintzimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/windtfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/winnmfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/basictz.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/rbtz.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/tztrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/vtzone.cpp"
+"${ICU_SOURCE_DIR}/i18n/zonemeta.cpp"
+"${ICU_SOURCE_DIR}/i18n/standardplural.cpp"
+"${ICU_SOURCE_DIR}/i18n/upluralrules.cpp"
+"${ICU_SOURCE_DIR}/i18n/plurrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/plurfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/selfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtitvfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/dtitvinf.cpp"
+"${ICU_SOURCE_DIR}/i18n/udateintervalformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmutamt.cpp"
+"${ICU_SOURCE_DIR}/i18n/tmutfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/currpinf.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_build.cpp"
+"${ICU_SOURCE_DIR}/i18n/uspoof_conf.cpp"
+"${ICU_SOURCE_DIR}/i18n/smpdtfst.cpp"
+"${ICU_SOURCE_DIR}/i18n/ztrans.cpp"
+"${ICU_SOURCE_DIR}/i18n/zrule.cpp"
+"${ICU_SOURCE_DIR}/i18n/vzone.cpp"
+"${ICU_SOURCE_DIR}/i18n/fphdlimp.cpp"
+"${ICU_SOURCE_DIR}/i18n/fpositer.cpp"
+"${ICU_SOURCE_DIR}/i18n/ufieldpositer.cpp"
+"${ICU_SOURCE_DIR}/i18n/decNumber.cpp"
+"${ICU_SOURCE_DIR}/i18n/decContext.cpp"
+"${ICU_SOURCE_DIR}/i18n/alphaindex.cpp"
+"${ICU_SOURCE_DIR}/i18n/tznames.cpp"
+"${ICU_SOURCE_DIR}/i18n/tznames_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzgnames.cpp"
+"${ICU_SOURCE_DIR}/i18n/tzfmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/compactdecimalformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/gender.cpp"
+"${ICU_SOURCE_DIR}/i18n/region.cpp"
+"${ICU_SOURCE_DIR}/i18n/scriptset.cpp"
+"${ICU_SOURCE_DIR}/i18n/uregion.cpp"
+"${ICU_SOURCE_DIR}/i18n/reldatefmt.cpp"
+"${ICU_SOURCE_DIR}/i18n/quantityformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/measunit.cpp"
+"${ICU_SOURCE_DIR}/i18n/sharedbreakiterator.cpp"
+"${ICU_SOURCE_DIR}/i18n/scientificnumberformatter.cpp"
+"${ICU_SOURCE_DIR}/i18n/dayperiodrules.cpp"
+"${ICU_SOURCE_DIR}/i18n/nounit.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_affixutils.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_compact.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_decimalquantity.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_decimfmtprops.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_fluent.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_formatimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_grouping.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_integerwidth.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_longnames.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_modifiers.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_notation.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_output.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_padding.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_patternmodifier.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_patternstring.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_rounding.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_scientific.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_utils.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_asformat.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_mapper.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_multiplier.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_currencysymbols.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_skeletons.cpp"
+"${ICU_SOURCE_DIR}/i18n/number_capi.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-string-to-double.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-double-to-string.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum-dtoa.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-bignum.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-cached-powers.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-fast-dtoa.cpp"
+"${ICU_SOURCE_DIR}/i18n/double-conversion-strtod.cpp"
+"${ICU_SOURCE_DIR}/i18n/string_segment.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_parsednumber.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_symbols.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_decimal.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_scientific.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_currency.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_affixes.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_compositions.cpp"
+"${ICU_SOURCE_DIR}/i18n/numparse_validators.cpp"
+"${ICU_SOURCE_DIR}/i18n/numrange_fluent.cpp"
+"${ICU_SOURCE_DIR}/i18n/numrange_impl.cpp"
+"${ICU_SOURCE_DIR}/i18n/erarules.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedvalue.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedval_iterimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/formattedval_sbimpl.cpp"
+"${ICU_SOURCE_DIR}/i18n/formatted_string_builder.cpp")
 
-file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp CONTENT " ")
+file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp" CONTENT " ")
 enable_language(ASM)
 set(ICUDATA_SOURCES
-    ${ICUDATA_SOURCE_DIR}/icudt66l_dat.S
-    ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp # Without this cmake can incorrectly detects library type (OBJECT) instead of SHARED/STATIC
+    "${ICUDATA_SOURCE_DIR}/icudt66l_dat.S"
+    "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp" # Without this cmake can incorrectly detects library type (OBJECT) instead of SHARED/STATIC
 )
 
 # Note that we don't like any kind of binary plugins (because of runtime dependencies, vulnerabilities, ABI incompatibilities).
@@ -454,8 +454,8 @@ add_library(icudata ${ICUDATA_SOURCES})
 target_link_libraries(icuuc PRIVATE icudata)
 target_link_libraries(icui18n PRIVATE icuuc)
 
-target_include_directories(icuuc SYSTEM PUBLIC ${ICU_SOURCE_DIR}/common/)
-target_include_directories(icui18n SYSTEM PUBLIC ${ICU_SOURCE_DIR}/i18n/)
+target_include_directories(icuuc SYSTEM PUBLIC "${ICU_SOURCE_DIR}/common/")
+target_include_directories(icui18n SYSTEM PUBLIC "${ICU_SOURCE_DIR}/i18n/")
 
 target_compile_definitions(icuuc PRIVATE -DU_COMMON_IMPLEMENTATION)
 target_compile_definitions(icui18n PRIVATE -DU_I18N_IMPLEMENTATION)
diff --git a/contrib/jemalloc-cmake/CMakeLists.txt b/contrib/jemalloc-cmake/CMakeLists.txt
index 73afa99f1d8..140b7eb370b 100644
--- a/contrib/jemalloc-cmake/CMakeLists.txt
+++ b/contrib/jemalloc-cmake/CMakeLists.txt
@@ -1,10 +1,13 @@
-if (SANITIZE OR NOT (ARCH_AMD64 OR ARCH_ARM OR ARCH_PPC64LE) OR NOT (OS_LINUX OR OS_FREEBSD OR OS_DARWIN))
+if (SANITIZE OR NOT (
+    ((OS_LINUX OR OS_FREEBSD) AND (ARCH_AMD64 OR ARCH_ARM OR ARCH_PPC64LE)) OR
+    (OS_DARWIN AND CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+))
     if (ENABLE_JEMALLOC)
         message (${RECONFIGURE_MESSAGE_LEVEL}
-                 "jemalloc is disabled implicitly: it doesn't work with sanitizers and can only be used with x86_64, aarch64 or ppc64le on linux or freebsd.")
-    endif()
+                 "jemalloc is disabled implicitly: it doesn't work with sanitizers and can only be used with x86_64, aarch64, or ppc64le Linux or FreeBSD builds and RelWithDebInfo macOS builds.")
+    endif ()
     set (ENABLE_JEMALLOC OFF)
-else()
+else ()
     option (ENABLE_JEMALLOC "Enable jemalloc allocator" ${ENABLE_LIBRARIES})
 endif ()
 
@@ -34,9 +37,9 @@ if (OS_LINUX)
     # avoid spurious latencies and additional work associated with
     # MADV_DONTNEED. See
     # https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
-    set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:10000")
+    set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:5000,dirty_decay_ms:5000")
 else()
-    set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:10000")
+    set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:5000,dirty_decay_ms:5000")
 endif()
 # CACHE variable is empty, to allow changing defaults without necessity
 # to purge cache
@@ -49,46 +52,46 @@ message (STATUS "jemalloc malloc_conf: ${JEMALLOC_CONFIG_MALLOC_CONF}")
 set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/jemalloc")
 
 set (SRCS
-    ${LIBRARY_DIR}/src/arena.c
-    ${LIBRARY_DIR}/src/background_thread.c
-    ${LIBRARY_DIR}/src/base.c
-    ${LIBRARY_DIR}/src/bin.c
-    ${LIBRARY_DIR}/src/bitmap.c
-    ${LIBRARY_DIR}/src/ckh.c
-    ${LIBRARY_DIR}/src/ctl.c
-    ${LIBRARY_DIR}/src/div.c
-    ${LIBRARY_DIR}/src/extent.c
-    ${LIBRARY_DIR}/src/extent_dss.c
-    ${LIBRARY_DIR}/src/extent_mmap.c
-    ${LIBRARY_DIR}/src/hash.c
-    ${LIBRARY_DIR}/src/hook.c
-    ${LIBRARY_DIR}/src/jemalloc.c
-    ${LIBRARY_DIR}/src/large.c
-    ${LIBRARY_DIR}/src/log.c
-    ${LIBRARY_DIR}/src/malloc_io.c
-    ${LIBRARY_DIR}/src/mutex.c
-    ${LIBRARY_DIR}/src/mutex_pool.c
-    ${LIBRARY_DIR}/src/nstime.c
-    ${LIBRARY_DIR}/src/pages.c
-    ${LIBRARY_DIR}/src/prng.c
-    ${LIBRARY_DIR}/src/prof.c
-    ${LIBRARY_DIR}/src/rtree.c
-    ${LIBRARY_DIR}/src/sc.c
-    ${LIBRARY_DIR}/src/stats.c
-    ${LIBRARY_DIR}/src/sz.c
-    ${LIBRARY_DIR}/src/tcache.c
-    ${LIBRARY_DIR}/src/test_hooks.c
-    ${LIBRARY_DIR}/src/ticker.c
-    ${LIBRARY_DIR}/src/tsd.c
-    ${LIBRARY_DIR}/src/witness.c
-    ${LIBRARY_DIR}/src/safety_check.c
+    "${LIBRARY_DIR}/src/arena.c"
+    "${LIBRARY_DIR}/src/background_thread.c"
+    "${LIBRARY_DIR}/src/base.c"
+    "${LIBRARY_DIR}/src/bin.c"
+    "${LIBRARY_DIR}/src/bitmap.c"
+    "${LIBRARY_DIR}/src/ckh.c"
+    "${LIBRARY_DIR}/src/ctl.c"
+    "${LIBRARY_DIR}/src/div.c"
+    "${LIBRARY_DIR}/src/extent.c"
+    "${LIBRARY_DIR}/src/extent_dss.c"
+    "${LIBRARY_DIR}/src/extent_mmap.c"
+    "${LIBRARY_DIR}/src/hash.c"
+    "${LIBRARY_DIR}/src/hook.c"
+    "${LIBRARY_DIR}/src/jemalloc.c"
+    "${LIBRARY_DIR}/src/large.c"
+    "${LIBRARY_DIR}/src/log.c"
+    "${LIBRARY_DIR}/src/malloc_io.c"
+    "${LIBRARY_DIR}/src/mutex.c"
+    "${LIBRARY_DIR}/src/mutex_pool.c"
+    "${LIBRARY_DIR}/src/nstime.c"
+    "${LIBRARY_DIR}/src/pages.c"
+    "${LIBRARY_DIR}/src/prng.c"
+    "${LIBRARY_DIR}/src/prof.c"
+    "${LIBRARY_DIR}/src/rtree.c"
+    "${LIBRARY_DIR}/src/sc.c"
+    "${LIBRARY_DIR}/src/stats.c"
+    "${LIBRARY_DIR}/src/sz.c"
+    "${LIBRARY_DIR}/src/tcache.c"
+    "${LIBRARY_DIR}/src/test_hooks.c"
+    "${LIBRARY_DIR}/src/ticker.c"
+    "${LIBRARY_DIR}/src/tsd.c"
+    "${LIBRARY_DIR}/src/witness.c"
+    "${LIBRARY_DIR}/src/safety_check.c"
 )
 if (OS_DARWIN)
-    list(APPEND SRCS ${LIBRARY_DIR}/src/zone.c)
+    list(APPEND SRCS "${LIBRARY_DIR}/src/zone.c")
 endif ()
 
 add_library(jemalloc ${SRCS})
-target_include_directories(jemalloc PRIVATE ${LIBRARY_DIR}/include)
+target_include_directories(jemalloc PRIVATE "${LIBRARY_DIR}/include")
 target_include_directories(jemalloc SYSTEM PUBLIC include)
 
 set (JEMALLOC_INCLUDE_PREFIX)
@@ -116,17 +119,19 @@ endif ()
 configure_file(${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h.in
     ${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal/jemalloc_internal_defs.h)
 target_include_directories(jemalloc SYSTEM PRIVATE
-    ${CMAKE_CURRENT_BINARY_DIR}/${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal)
+    "${CMAKE_CURRENT_BINARY_DIR}/${JEMALLOC_INCLUDE_PREFIX}/jemalloc/internal")
 
 target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
 
 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
-    target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_DEBUG=1 -DJEMALLOC_PROF=1)
+    target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_DEBUG=1)
+endif ()
 
-    if (USE_UNWIND)
-        target_compile_definitions (jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
-        target_link_libraries (jemalloc PRIVATE unwind)
-    endif ()
+target_compile_definitions(jemalloc PRIVATE -DJEMALLOC_PROF=1)
+
+if (USE_UNWIND)
+    target_compile_definitions (jemalloc PRIVATE -DJEMALLOC_PROF_LIBUNWIND=1)
+    target_link_libraries (jemalloc PRIVATE unwind)
 endif ()
 
 target_compile_options(jemalloc PRIVATE -Wno-redundant-decls)
diff --git a/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
index c7c884d0eaa..5c0407db24a 100644
--- a/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_darwin_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -42,7 +42,7 @@
  * total number of bits in a pointer, e.g. on x64, for which the uppermost 16
  * bits are the same as bit 47.
  */
-#define LG_VADDR 48
+#define LG_VADDR 64
 
 /* Defined if C11 atomics are available. */
 #define JEMALLOC_C11_ATOMICS 1
@@ -101,11 +101,6 @@
  */
 #define JEMALLOC_HAVE_MACH_ABSOLUTE_TIME 1
 
-/*
- * Defined if clock_gettime(CLOCK_REALTIME, ...) is available.
- */
-#define JEMALLOC_HAVE_CLOCK_REALTIME 1
-
 /*
  * Defined if _malloc_thread_cleanup() exists.  At least in the case of
  * FreeBSD, pthread_key_create() allocates, which if used during malloc
@@ -181,14 +176,14 @@
 /* #undef LG_QUANTUM */
 
 /* One page is 2^LG_PAGE bytes. */
-#define LG_PAGE 16
+#define LG_PAGE 14
 
 /*
  * One huge page is 2^LG_HUGEPAGE bytes.  Note that this is defined even if the
  * system does not explicitly support huge pages; system calls that require
  * explicit huge page support are separately configured.
  */
-#define LG_HUGEPAGE 29
+#define LG_HUGEPAGE 21
 
 /*
  * If defined, adjacent virtual memory mappings with identical attributes
@@ -356,7 +351,7 @@
 /* #undef JEMALLOC_EXPORT */
 
 /* config.malloc_conf options string. */
-#define JEMALLOC_CONFIG_MALLOC_CONF "@JEMALLOC_CONFIG_MALLOC_CONF@"
+#define JEMALLOC_CONFIG_MALLOC_CONF ""
 
 /* If defined, jemalloc takes the malloc/free/etc. symbol names. */
 /* #undef JEMALLOC_IS_MALLOC */
diff --git a/contrib/krb5-cmake/CMakeLists.txt b/contrib/krb5-cmake/CMakeLists.txt
index fce7fbc582a..7c750ca12b6 100644
--- a/contrib/krb5-cmake/CMakeLists.txt
+++ b/contrib/krb5-cmake/CMakeLists.txt
@@ -3,465 +3,465 @@ if(NOT AWK_PROGRAM)
 	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)
+set(KRB5_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/krb5/src")
 
 set(ALL_SRCS
-    ${KRB5_SOURCE_DIR}/util/et/et_name.c
-    ${KRB5_SOURCE_DIR}/util/et/com_err.c
-    ${KRB5_SOURCE_DIR}/util/et/error_message.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_names.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_unwrap_aead.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_name_attr.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_glue.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_imp_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/gssd_pname_to_uid.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_authorize_localname.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_prf.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_acquire_cred_with_pw.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_cred_option.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_map_name_to_any.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_seal.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_delete_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_context_time.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_get_name_attr.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_mech_invoke.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_unwrap_iov.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_exp_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_init_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_accept_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_verify.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_sign.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_mechname.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_mechattr.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_complete_auth_token.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_wrap_aead.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_cred_oid.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_buffer.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_initialize.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_export_name_comp.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_context_option.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_acquire_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_acquire_cred_imp_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_imp_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_neg_mechs.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_export_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_oid_ops.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_context_oid.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_del_name_attr.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_decapsulate_token.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_compare_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_name_mapping.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_imp_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dup_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_export_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_wrap_iov.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_oid_set.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_unseal.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_store_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_buffer_set.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_canon_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dsp_status.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dsp_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dsp_name_ext.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_saslname.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_process_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_encapsulate_token.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_negoex.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/delete_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/lucid_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/duplicate_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/get_tkt_flags.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/set_allowable_enctypes.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5sealiov.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/gssapi_err_krb5.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/canon_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/inq_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/export_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/inq_names.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/prf.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5sealv3iov.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/store_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/import_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/export_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/naming_exts.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/s4u_gss_glue.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/rel_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5unsealiov.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/gssapi_krb5.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/disp_status.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/import_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5seal.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/accept_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/import_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/process_context_token.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/disp_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/wrap_size_limit.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/krb5_gss_glue.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_crypt.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/set_ccache.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/export_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/rel_oid.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/val_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/context_time.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/cred_store.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/iakerb.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/copy_ccache.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/init_sec_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/indicate_mechs.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/inq_context.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_seed.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_seqnum.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/compare_name.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/ser_sctx.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5sealv3.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/acquire_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5unseal.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/rel_cred.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_cksum.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/disp_com_err_status.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/gssapi_generic.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/rel_oid_set.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/oid_ops.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_buffer.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_buffer_set.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_set.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_token.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/gssapi_err_generic.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/disp_major_status.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_seqstate.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_errmap.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/rel_buffer.c
+    "${KRB5_SOURCE_DIR}/util/et/et_name.c"
+    "${KRB5_SOURCE_DIR}/util/et/com_err.c"
+    "${KRB5_SOURCE_DIR}/util/et/error_message.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_names.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_unwrap_aead.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_name_attr.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_glue.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_imp_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/gssd_pname_to_uid.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_authorize_localname.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_prf.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_acquire_cred_with_pw.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_cred_option.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_map_name_to_any.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_seal.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_delete_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_context_time.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_get_name_attr.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_mech_invoke.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_unwrap_iov.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_exp_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_init_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_accept_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_verify.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_sign.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_mechname.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_mechattr.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_complete_auth_token.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_wrap_aead.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_cred_oid.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_buffer.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_initialize.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_export_name_comp.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_context_option.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_acquire_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_acquire_cred_imp_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_imp_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_set_neg_mechs.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_export_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_oid_ops.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_inq_context_oid.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_del_name_attr.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_decapsulate_token.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_compare_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_name_mapping.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_imp_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dup_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_export_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_wrap_iov.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_rel_oid_set.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_unseal.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_store_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_buffer_set.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_canon_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dsp_status.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dsp_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_dsp_name_ext.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_saslname.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_process_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_encapsulate_token.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue/g_negoex.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/delete_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/lucid_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/duplicate_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/get_tkt_flags.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/set_allowable_enctypes.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5sealiov.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/gssapi_err_krb5.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/canon_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/inq_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/export_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/inq_names.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/prf.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5sealv3iov.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/store_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/import_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/export_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/naming_exts.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/s4u_gss_glue.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/rel_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5unsealiov.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/gssapi_krb5.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/disp_status.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/import_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5seal.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/accept_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/import_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/process_context_token.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/disp_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/wrap_size_limit.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/krb5_gss_glue.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_crypt.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/set_ccache.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/export_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/rel_oid.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/val_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/context_time.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/cred_store.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/iakerb.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/copy_ccache.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/init_sec_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/indicate_mechs.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/inq_context.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_seed.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_seqnum.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/compare_name.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/ser_sctx.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5sealv3.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/acquire_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/k5unseal.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/rel_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/util_cksum.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/disp_com_err_status.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/gssapi_generic.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/rel_oid_set.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/oid_ops.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_buffer.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_buffer_set.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_set.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_token.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/gssapi_err_generic.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/disp_major_status.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_seqstate.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/util_errmap.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/rel_buffer.c"
 
-    ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/spnego_mech.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_util.c
-    ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_ctx.c
+    "${KRB5_SOURCE_DIR}/lib/gssapi/spnego/spnego_mech.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_util.c"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_ctx.c"
 
-    # ${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_trace.c
+    # "${KRB5_SOURCE_DIR}/lib/gssapi/spnego/negoex_trace.c"
 
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prng.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_cmac.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/crc32.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_cbc.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enctype_util.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_etm.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/combine_keys.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/default_state.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/decrypt_iov.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_dk_cmac.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/etypes.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/old_api_glue.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/cksumtypes.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_cmac.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_old.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/decrypt.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_dk.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_des.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_unkeyed.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/crypto_length.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/block_size.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/string_to_key.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/verify_checksum.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/crypto_libinit.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/derive.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/random_to_key.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/verify_checksum_iov.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_confounder.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_length.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_hmac.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/make_checksum.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_des.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/coll_proof_cksum.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_rc4.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/cf2.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/aead.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/encrypt_iov.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/cksumtype_to_string.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/key.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_raw.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/keylengths.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_hmac_md5.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/keyed_cksum.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/keyed_checksum_types.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_aes2.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/state.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_dk_hmac.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/encrypt.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_etm.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/make_random_key.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/string_to_cksumtype.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/mandatory_sumtype.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/make_checksum_iov.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_rc4.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/valid_cksumtype.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/nfold.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prng_fortuna.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/encrypt_length.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/cmac.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/keyblocks.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_rc4.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_pbkdf2.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/aes.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/rc4.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des3.c
-    #${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/camellia.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/sha256.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/hmac.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/pbkdf2.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/init.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/stubs.c
-    # ${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_crc32.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_evp.c
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl/des/des_keys.c
-    ${KRB5_SOURCE_DIR}/util/support/fake-addrinfo.c
-    ${KRB5_SOURCE_DIR}/util/support/k5buf.c
-    ${KRB5_SOURCE_DIR}/util/support/hex.c
-    ${KRB5_SOURCE_DIR}/util/support/threads.c
-    ${KRB5_SOURCE_DIR}/util/support/utf8.c
-    ${KRB5_SOURCE_DIR}/util/support/hashtab.c
-    ${KRB5_SOURCE_DIR}/util/support/dir_filenames.c
-    ${KRB5_SOURCE_DIR}/util/support/base64.c
-    ${KRB5_SOURCE_DIR}/util/support/strerror_r.c
-    ${KRB5_SOURCE_DIR}/util/support/plugins.c
-    ${KRB5_SOURCE_DIR}/util/support/path.c
-    ${KRB5_SOURCE_DIR}/util/support/init-addrinfo.c
-    ${KRB5_SOURCE_DIR}/util/support/json.c
-    ${KRB5_SOURCE_DIR}/util/support/errors.c
-    ${KRB5_SOURCE_DIR}/util/support/utf8_conv.c
-    ${KRB5_SOURCE_DIR}/util/support/strlcpy.c
-    ${KRB5_SOURCE_DIR}/util/support/gmt_mktime.c
-    ${KRB5_SOURCE_DIR}/util/support/zap.c
-    ${KRB5_SOURCE_DIR}/util/support/bcmp.c
-    ${KRB5_SOURCE_DIR}/util/support/secure_getenv.c
-    ${KRB5_SOURCE_DIR}/util/profile/prof_tree.c
-    ${KRB5_SOURCE_DIR}/util/profile/prof_file.c
-    ${KRB5_SOURCE_DIR}/util/profile/prof_parse.c
-    ${KRB5_SOURCE_DIR}/util/profile/prof_get.c
-    ${KRB5_SOURCE_DIR}/util/profile/prof_set.c
-    ${KRB5_SOURCE_DIR}/util/profile/prof_err.c
-    ${KRB5_SOURCE_DIR}/util/profile/prof_init.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/fwd_tgt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/conv_creds.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/fast.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_adata.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_tick.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/enc_keyhelper.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_actx.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/init_ctx.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth2.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_princ.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/parse_host_string.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/pr_to_salt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_req.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/pac_sign.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_addrs.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/conv_princ.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_rep.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/str_conv.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/gic_opt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/recvauth.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_cksum.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ai_authdata.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_ctx.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/appdefault.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/bld_princ.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/in_tkt_sky.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_creds.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/auth_con.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_key.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/kdc_rep_dc.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_cred.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/gic_keytab.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_req_dec.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/set_realm.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_sam2.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/libdef_parse.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/privsafe.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_auth.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/val_renew.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/addr_order.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata_dec.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/walk_rtree.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/gen_subkey.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_auth.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/chpw.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_req.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/allow_weak.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_rep.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_priv.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/s4u_authdata.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_otp.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/init_keyblock.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_addr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/encrypt_tk.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/s4u_creds.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/srv_dec_tkt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_priv.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata_enc.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata_exp.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/decode_kdc.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/decrypt_tk.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/enc_helper.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_req_ext.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_key.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_encts.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/send_tgs.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_cksum.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/tgtname.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/encode_kdc.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_cred.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_safe.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_pkinit.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/srv_rcache.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/chk_trans.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/etype_list.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/get_creds.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_princ.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/gic_pwd.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/gen_save_subkey.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/vfy_increds.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/addr_comp.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/kfree.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/response_items.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/serialize.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/cammac_util.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/gc_via_tkt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_ctx.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/sendauth.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/addr_srch.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_safe.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_ec.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/bld_pr_ext.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/random_str.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/sname_match.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/princ_comp.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/get_in_tkt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/gen_seqnum.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/cp_key_cnt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_error.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_athctr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/deltat.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/get_etype_info.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/plugin.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/kerrs.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/vic_opt.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/unparse.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/parse.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_error.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/pac.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/valid_times.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_data.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb/padata.c
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prng.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_cmac.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/krb/crc32.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_cbc.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/enctype_util.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_etm.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/krb/combine_keys.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/default_state.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/decrypt_iov.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_dk_cmac.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/etypes.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/old_api_glue.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/cksumtypes.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_cmac.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_old.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/decrypt.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_dk.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_des.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_unkeyed.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/crypto_length.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/block_size.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/string_to_key.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/verify_checksum.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/crypto_libinit.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/derive.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/random_to_key.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/verify_checksum_iov.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_confounder.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_length.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_hmac.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/make_checksum.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_des.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prf.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/coll_proof_cksum.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_rc4.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/cf2.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/aead.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/encrypt_iov.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/cksumtype_to_string.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/key.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_raw.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/keylengths.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_hmac_md5.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/keyed_cksum.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/keyed_checksum_types.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_aes2.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/state.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_dk_hmac.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/encrypt.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/checksum_etm.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/make_random_key.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/string_to_cksumtype.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/mandatory_sumtype.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/make_checksum_iov.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_rc4.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/valid_cksumtype.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/nfold.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prng_fortuna.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/encrypt_length.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/cmac.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/keyblocks.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/prf_rc4.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb/s2k_pbkdf2.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/aes.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/rc4.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des3.c"
+    #"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/camellia.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/sha256.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/hmac.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/pbkdf2.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/init.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/stubs.c"
+    # "${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_crc32.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/hash_provider/hash_evp.c"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl/des/des_keys.c"
+    "${KRB5_SOURCE_DIR}/util/support/fake-addrinfo.c"
+    "${KRB5_SOURCE_DIR}/util/support/k5buf.c"
+    "${KRB5_SOURCE_DIR}/util/support/hex.c"
+    "${KRB5_SOURCE_DIR}/util/support/threads.c"
+    "${KRB5_SOURCE_DIR}/util/support/utf8.c"
+    "${KRB5_SOURCE_DIR}/util/support/hashtab.c"
+    "${KRB5_SOURCE_DIR}/util/support/dir_filenames.c"
+    "${KRB5_SOURCE_DIR}/util/support/base64.c"
+    "${KRB5_SOURCE_DIR}/util/support/strerror_r.c"
+    "${KRB5_SOURCE_DIR}/util/support/plugins.c"
+    "${KRB5_SOURCE_DIR}/util/support/path.c"
+    "${KRB5_SOURCE_DIR}/util/support/init-addrinfo.c"
+    "${KRB5_SOURCE_DIR}/util/support/json.c"
+    "${KRB5_SOURCE_DIR}/util/support/errors.c"
+    "${KRB5_SOURCE_DIR}/util/support/utf8_conv.c"
+    "${KRB5_SOURCE_DIR}/util/support/strlcpy.c"
+    "${KRB5_SOURCE_DIR}/util/support/gmt_mktime.c"
+    "${KRB5_SOURCE_DIR}/util/support/zap.c"
+    "${KRB5_SOURCE_DIR}/util/support/bcmp.c"
+    "${KRB5_SOURCE_DIR}/util/support/secure_getenv.c"
+    "${KRB5_SOURCE_DIR}/util/profile/prof_tree.c"
+    "${KRB5_SOURCE_DIR}/util/profile/prof_file.c"
+    "${KRB5_SOURCE_DIR}/util/profile/prof_parse.c"
+    "${KRB5_SOURCE_DIR}/util/profile/prof_get.c"
+    "${KRB5_SOURCE_DIR}/util/profile/prof_set.c"
+    "${KRB5_SOURCE_DIR}/util/profile/prof_err.c"
+    "${KRB5_SOURCE_DIR}/util/profile/prof_init.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/fwd_tgt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/conv_creds.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/fast.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_adata.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_tick.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/enc_keyhelper.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_actx.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/init_ctx.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth2.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_princ.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/parse_host_string.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/pr_to_salt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_req.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/pac_sign.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_addrs.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/conv_princ.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_rep.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/str_conv.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/gic_opt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/recvauth.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_cksum.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ai_authdata.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_ctx.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/appdefault.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/bld_princ.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/in_tkt_sky.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_creds.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/auth_con.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_key.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/kdc_rep_dc.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/gic_keytab.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_req_dec.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/set_realm.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_sam2.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/libdef_parse.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/privsafe.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_auth.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/val_renew.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/addr_order.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata_dec.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/walk_rtree.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/gen_subkey.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_auth.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/chpw.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_req.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/allow_weak.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_rep.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_priv.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/s4u_authdata.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_otp.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/init_keyblock.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_addr.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/encrypt_tk.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/s4u_creds.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/srv_dec_tkt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_priv.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata_enc.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata_exp.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/decode_kdc.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/decrypt_tk.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/enc_helper.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_req_ext.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_key.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_encts.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/send_tgs.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_cksum.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/tgtname.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/encode_kdc.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_cred.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_safe.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_pkinit.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/srv_rcache.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/chk_trans.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/etype_list.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/get_creds.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/ser_princ.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/gic_pwd.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/authdata.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/gen_save_subkey.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/vfy_increds.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/addr_comp.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/kfree.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/response_items.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/serialize.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/cammac_util.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/gc_via_tkt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_ctx.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/sendauth.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/addr_srch.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_safe.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/preauth_ec.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/bld_pr_ext.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/random_str.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/sname_match.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/princ_comp.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/get_in_tkt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/gen_seqnum.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/cp_key_cnt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/mk_error.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_athctr.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/deltat.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/get_etype_info.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/plugin.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/kerrs.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/vic_opt.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/unparse.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/parse.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/rd_error.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/pac.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/valid_times.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/copy_data.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb/padata.c"
 
 
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/thread_safe.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/krbfileio.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/toffset.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/hostaddr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/ustime.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/timeofday.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/ccdefname.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/full_ipadr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/read_pwd.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/trace.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_k5login.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_rule.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/localaddr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_dns.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_domain.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/sn2princ.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/net_write.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/gen_rname.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/net_read.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/accessor.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_profile.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/c_ustime.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/expand_path.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/port2ip.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/changepw.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/unlck_file.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/gen_port.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_an2ln.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/genaddrs.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/init_os_ctx.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/localauth.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/locate_kdc.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/prompter.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/ktdefname.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/realm_dom.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/dnssrv.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/mk_faddr.c
-    # ${KRB5_SOURCE_DIR}/lib/krb5/os/dnsglue.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/sendto_kdc.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_registry.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/write_msg.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_names.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/read_msg.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/os/lock_file.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_realm.c
-    # ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ser_cc.c
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/thread_safe.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/krbfileio.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/toffset.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/hostaddr.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/ustime.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/timeofday.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/ccdefname.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/full_ipadr.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/read_pwd.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/trace.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_k5login.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_rule.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/localaddr.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_dns.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_domain.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/sn2princ.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/net_write.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/gen_rname.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/net_read.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/accessor.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_profile.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/c_ustime.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/expand_path.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/port2ip.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/changepw.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/unlck_file.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/gen_port.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_an2ln.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/genaddrs.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/init_os_ctx.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/localauth.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/locate_kdc.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/prompter.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/ktdefname.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/realm_dom.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/dnssrv.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/mk_faddr.c"
+    # "${KRB5_SOURCE_DIR}/lib/krb5/os/dnsglue.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/sendto_kdc.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/hostrealm_registry.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/write_msg.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/localauth_names.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/read_msg.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os/lock_file.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_realm.c"
+    # "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ser_cc.c"
 
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccdefops.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_retr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_k5identity.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cccopy.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccfns.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_file.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccbase.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cccursor.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccdefault.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_memory.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccmarshal.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_hostname.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_dir.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_keyring.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_kcm.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktadd.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktbase.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktdefault.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/kt_memory.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktfns.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktremove.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/read_servi.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/kt_file.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/read_servi.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktfr_entry.c
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccdefops.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_retr.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_k5identity.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cccopy.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccfns.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_file.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccbase.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cccursor.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccdefault.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_memory.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccmarshal.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccselect_hostname.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_dir.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_keyring.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/cc_kcm.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktadd.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktbase.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktdefault.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/kt_memory.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktfns.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktremove.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/read_servi.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/kt_file.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/read_servi.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab/ktfr_entry.c"
 
 
 
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/k5e1_err.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kdb5_err.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/asn1_err.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb5_err.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb524_err.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kv5m_err.c
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/k5e1_err.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kdb5_err.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/asn1_err.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb5_err.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb524_err.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kv5m_err.c"
 
 
 
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_base.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_dfl.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_file2.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_none.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache/memrcache.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/unicode/ucdata/ucdata.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/unicode/ucstr.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/asn.1/asn1_encode.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/asn.1/asn1_k_encode.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/asn.1/ldap_key_seq.c
-    ${KRB5_SOURCE_DIR}/lib/krb5/krb5_libinit.c
+    "${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_base.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_dfl.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_file2.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/rcache/rc_none.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/rcache/memrcache.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/unicode/ucdata/ucdata.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/unicode/ucstr.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/asn.1/asn1_encode.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/asn.1/asn1_k_encode.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/asn.1/ldap_key_seq.c"
+    "${KRB5_SOURCE_DIR}/lib/krb5/krb5_libinit.c"
 )
 
 add_custom_command(
-    OUTPUT ${KRB5_SOURCE_DIR}/util/et/compile_et
+    OUTPUT "${KRB5_SOURCE_DIR}/util/et/compile_et"
     COMMAND /bin/sh
     ./config_script
     ./compile_et.sh
@@ -470,7 +470,7 @@ add_custom_command(
     sed
     >
     compile_et
-    DEPENDS ${KRB5_SOURCE_DIR}/util/et/compile_et.sh ${KRB5_SOURCE_DIR}/util/et/config_script
+    DEPENDS "${KRB5_SOURCE_DIR}/util/et/compile_et.sh" "${KRB5_SOURCE_DIR}/util/et/config_script"
     WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/util/et"
 )
 
@@ -497,8 +497,8 @@ function(preprocess_et out_var)
     get_filename_component(ET_PATH ${in_f} DIRECTORY)
 
     add_custom_command(OUTPUT ${F_C} ${F_H}
-      COMMAND perl ${KRB5_SOURCE_DIR}/util/et/compile_et -d "${KRB5_SOURCE_DIR}/util/et" ${in_f}
-      DEPENDS ${in_f} ${KRB5_SOURCE_DIR}/util/et/compile_et
+      COMMAND perl "${KRB5_SOURCE_DIR}/util/et/compile_et" -d "${KRB5_SOURCE_DIR}/util/et" ${in_f}
+      DEPENDS ${in_f} "${KRB5_SOURCE_DIR}/util/et/compile_et"
       WORKING_DIRECTORY ${ET_PATH}
       COMMENT "Creating preprocessed file ${F_C}"
       VERBATIM
@@ -509,7 +509,7 @@ function(preprocess_et out_var)
 endfunction()
 
 add_custom_command(
-    OUTPUT ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/error_map.h
+    OUTPUT "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/error_map.h"
     COMMAND perl
     -I../../../util
     ../../../util/gen-map.pl
@@ -525,27 +525,27 @@ add_custom_command(
 
 add_custom_target(
     ERROR_MAP_H
-    DEPENDS ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/error_map.h
+    DEPENDS "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/error_map.h"
     COMMENT "generating error_map.h"
     VERBATIM
 )
 
 add_custom_command(
-    OUTPUT ${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h
+    OUTPUT "${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h"
     COMMAND perl -w -I../../../util  ../../../util/gen.pl bimap errmap.h NAME=mecherrmap LEFT=OM_uint32 RIGHT=struct\ mecherror LEFTPRINT=print_OM_uint32 RIGHTPRINT=mecherror_print LEFTCMP=cmp_OM_uint32 RIGHTCMP=mecherror_cmp
     WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/lib/gssapi/generic"
 )
 
 add_custom_target(
     ERRMAP_H
-    DEPENDS ${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h
+    DEPENDS "${KRB5_SOURCE_DIR}/lib/gssapi/generic/errmap.h"
     COMMENT "generating errmap.h"
     VERBATIM
 )
 
 add_custom_target(
     KRB_5_H
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/krb5/krb5.h
+    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/krb5/krb5.h"
     COMMENT "generating krb5.h"
     VERBATIM
 )
@@ -563,12 +563,12 @@ preprocess_et(processed_et_files ${ET_FILES})
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
     add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.h ${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c
-        COMMAND mig -header kcmrpc.h -user kcmrpc.c -sheader /dev/null -server /dev/null -I${KRB5_SOURCE_DIR}/lib/krb5/ccache ${KRB5_SOURCE_DIR}/lib/krb5/ccache/kcmrpc.defs
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.h" "${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c"
+        COMMAND mig -header kcmrpc.h -user kcmrpc.c -sheader /dev/null -server /dev/null -I"${KRB5_SOURCE_DIR}/lib/krb5/ccache" "${KRB5_SOURCE_DIR}/lib/krb5/ccache/kcmrpc.defs"
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include_private"
     )
 
-    list(APPEND ALL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c)
+    list(APPEND ALL_SRCS "${CMAKE_CURRENT_BINARY_DIR}/include_private/kcmrpc.c")
 endif()
 
 target_sources(${KRB5_LIBRARY} PRIVATE
@@ -576,98 +576,98 @@ target_sources(${KRB5_LIBRARY} PRIVATE
 )
 
 file(MAKE_DIRECTORY
-    ${CMAKE_CURRENT_BINARY_DIR}/include/gssapi
+    "${CMAKE_CURRENT_BINARY_DIR}/include/gssapi"
 )
 
 file(GLOB GSSAPI_GENERIC_HEADERS
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/*.h
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic/gssapi.hin
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/*.h"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic/gssapi.hin"
 )
 
 file(COPY ${GSSAPI_GENERIC_HEADERS}
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/"
 )
 
 file(RENAME
-    ${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/gssapi.hin
-    ${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/gssapi.h
+    "${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/gssapi.hin"
+    "${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/gssapi.h"
 )
 
-file(COPY ${KRB5_SOURCE_DIR}/lib/gssapi/krb5/gssapi_krb5.h
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/
+file(COPY "${KRB5_SOURCE_DIR}/lib/gssapi/krb5/gssapi_krb5.h"
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include/gssapi/"
 )
 
-file(COPY ${KRB5_SOURCE_DIR}/util/et/com_err.h
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/
+file(COPY "${KRB5_SOURCE_DIR}/util/et/com_err.h"
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include/"
 )
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/osconf.h
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include_private/
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/osconf.h"
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include_private/"
 )
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/profile.h
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include_private/
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/profile.h"
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include_private/"
 )
 
 string(TOLOWER "${CMAKE_SYSTEM_NAME}" _system_name)
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/autoconf_${_system_name}.h
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include_private/
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/autoconf_${_system_name}.h"
+    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include_private/"
 )
 
 file(RENAME
-    ${CMAKE_CURRENT_BINARY_DIR}/include_private/autoconf_${_system_name}.h
-    ${CMAKE_CURRENT_BINARY_DIR}/include_private/autoconf.h
+    "${CMAKE_CURRENT_BINARY_DIR}/include_private/autoconf_${_system_name}.h"
+    "${CMAKE_CURRENT_BINARY_DIR}/include_private/autoconf.h"
 )
 
 file(MAKE_DIRECTORY
-    ${CMAKE_CURRENT_BINARY_DIR}/include/krb5
+    "${CMAKE_CURRENT_BINARY_DIR}/include/krb5"
 )
 
 SET(KRBHDEP
-    ${KRB5_SOURCE_DIR}/include/krb5/krb5.hin
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb5_err.h
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/k5e1_err.h
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kdb5_err.h
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kv5m_err.h
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb524_err.h
-    ${KRB5_SOURCE_DIR}/lib/krb5/error_tables/asn1_err.h
+    "${KRB5_SOURCE_DIR}/include/krb5/krb5.hin"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb5_err.h"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/k5e1_err.h"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kdb5_err.h"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/kv5m_err.h"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/krb524_err.h"
+    "${KRB5_SOURCE_DIR}/lib/krb5/error_tables/asn1_err.h"
 )
 
 # cmake < 3.18 does not have 'cat' command
 add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/krb5/krb5.h
-    COMMAND cat ${KRBHDEP} > ${CMAKE_CURRENT_BINARY_DIR}/include/krb5/krb5.h
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/krb5/krb5.h"
+    COMMAND cat ${KRBHDEP} > "${CMAKE_CURRENT_BINARY_DIR}/include/krb5/krb5.h"
     DEPENDS ${KRBHDEP}
 )
 
 
 
 target_include_directories(${KRB5_LIBRARY} PUBLIC
-    ${KRB5_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_BINARY_DIR}/include
+    "${KRB5_SOURCE_DIR}/include"
+    "${CMAKE_CURRENT_BINARY_DIR}/include"
 )
 
 target_include_directories(${KRB5_LIBRARY} PRIVATE
-    ${CMAKE_CURRENT_BINARY_DIR}/include_private # For autoconf.h and other generated headers.
+    "${CMAKE_CURRENT_BINARY_DIR}/include_private" # For autoconf.h and other generated headers.
     ${KRB5_SOURCE_DIR}
-    ${KRB5_SOURCE_DIR}/include
-    ${KRB5_SOURCE_DIR}/lib/gssapi/mechglue
-    ${KRB5_SOURCE_DIR}/lib/
-    ${KRB5_SOURCE_DIR}/lib/gssapi
-    ${KRB5_SOURCE_DIR}/lib/gssapi/generic
-    ${KRB5_SOURCE_DIR}/lib/gssapi/krb5
-    ${KRB5_SOURCE_DIR}/lib/gssapi/spnego
-    ${KRB5_SOURCE_DIR}/util/et
-    ${KRB5_SOURCE_DIR}/lib/crypto/openssl
-    ${KRB5_SOURCE_DIR}/lib/crypto/krb
-    ${KRB5_SOURCE_DIR}/util/profile
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccapi
-    ${KRB5_SOURCE_DIR}/lib/krb5/ccache
-    ${KRB5_SOURCE_DIR}/lib/krb5/keytab
-    ${KRB5_SOURCE_DIR}/lib/krb5/rcache
-    ${KRB5_SOURCE_DIR}/lib/krb5/unicode
-    ${KRB5_SOURCE_DIR}/lib/krb5/os
+    "${KRB5_SOURCE_DIR}/include"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/mechglue"
+    "${KRB5_SOURCE_DIR}/lib/"
+    "${KRB5_SOURCE_DIR}/lib/gssapi"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/generic"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/krb5"
+    "${KRB5_SOURCE_DIR}/lib/gssapi/spnego"
+    "${KRB5_SOURCE_DIR}/util/et"
+    "${KRB5_SOURCE_DIR}/lib/crypto/openssl"
+    "${KRB5_SOURCE_DIR}/lib/crypto/krb"
+    "${KRB5_SOURCE_DIR}/util/profile"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache/ccapi"
+    "${KRB5_SOURCE_DIR}/lib/krb5/ccache"
+    "${KRB5_SOURCE_DIR}/lib/krb5/keytab"
+    "${KRB5_SOURCE_DIR}/lib/krb5/rcache"
+    "${KRB5_SOURCE_DIR}/lib/krb5/unicode"
+    "${KRB5_SOURCE_DIR}/lib/krb5/os"
     # ${OPENSSL_INCLUDE_DIR}
 )
 
diff --git a/contrib/libcxx b/contrib/libcxx
index 8b80a151d12..2fa892f69ac 160000
--- a/contrib/libcxx
+++ b/contrib/libcxx
@@ -1 +1 @@
-Subproject commit 8b80a151d12b98ffe2d0c22f7cec12c3b9ff88d7
+Subproject commit 2fa892f69acbaa40f8a18c6484854a6183a34482
diff --git a/contrib/libcxx-cmake/CMakeLists.txt b/contrib/libcxx-cmake/CMakeLists.txt
index 3b5d53cd1c0..0cfb4191619 100644
--- a/contrib/libcxx-cmake/CMakeLists.txt
+++ b/contrib/libcxx-cmake/CMakeLists.txt
@@ -1,49 +1,49 @@
 include(CheckCXXCompilerFlag)
 
-set(LIBCXX_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcxx)
+set(LIBCXX_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcxx")
 
 set(SRCS
-${LIBCXX_SOURCE_DIR}/src/algorithm.cpp
-${LIBCXX_SOURCE_DIR}/src/any.cpp
-${LIBCXX_SOURCE_DIR}/src/atomic.cpp
-${LIBCXX_SOURCE_DIR}/src/barrier.cpp
-${LIBCXX_SOURCE_DIR}/src/bind.cpp
-${LIBCXX_SOURCE_DIR}/src/charconv.cpp
-${LIBCXX_SOURCE_DIR}/src/chrono.cpp
-${LIBCXX_SOURCE_DIR}/src/condition_variable.cpp
-${LIBCXX_SOURCE_DIR}/src/condition_variable_destructor.cpp
-${LIBCXX_SOURCE_DIR}/src/debug.cpp
-${LIBCXX_SOURCE_DIR}/src/exception.cpp
-${LIBCXX_SOURCE_DIR}/src/experimental/memory_resource.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/directory_iterator.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/int128_builtins.cpp
-${LIBCXX_SOURCE_DIR}/src/filesystem/operations.cpp
-${LIBCXX_SOURCE_DIR}/src/functional.cpp
-${LIBCXX_SOURCE_DIR}/src/future.cpp
-${LIBCXX_SOURCE_DIR}/src/hash.cpp
-${LIBCXX_SOURCE_DIR}/src/ios.cpp
-${LIBCXX_SOURCE_DIR}/src/ios.instantiations.cpp
-${LIBCXX_SOURCE_DIR}/src/iostream.cpp
-${LIBCXX_SOURCE_DIR}/src/locale.cpp
-${LIBCXX_SOURCE_DIR}/src/memory.cpp
-${LIBCXX_SOURCE_DIR}/src/mutex.cpp
-${LIBCXX_SOURCE_DIR}/src/mutex_destructor.cpp
-${LIBCXX_SOURCE_DIR}/src/new.cpp
-${LIBCXX_SOURCE_DIR}/src/optional.cpp
-${LIBCXX_SOURCE_DIR}/src/random.cpp
-${LIBCXX_SOURCE_DIR}/src/random_shuffle.cpp
-${LIBCXX_SOURCE_DIR}/src/regex.cpp
-${LIBCXX_SOURCE_DIR}/src/shared_mutex.cpp
-${LIBCXX_SOURCE_DIR}/src/stdexcept.cpp
-${LIBCXX_SOURCE_DIR}/src/string.cpp
-${LIBCXX_SOURCE_DIR}/src/strstream.cpp
-${LIBCXX_SOURCE_DIR}/src/system_error.cpp
-${LIBCXX_SOURCE_DIR}/src/thread.cpp
-${LIBCXX_SOURCE_DIR}/src/typeinfo.cpp
-${LIBCXX_SOURCE_DIR}/src/utility.cpp
-${LIBCXX_SOURCE_DIR}/src/valarray.cpp
-${LIBCXX_SOURCE_DIR}/src/variant.cpp
-${LIBCXX_SOURCE_DIR}/src/vector.cpp
+"${LIBCXX_SOURCE_DIR}/src/algorithm.cpp"
+"${LIBCXX_SOURCE_DIR}/src/any.cpp"
+"${LIBCXX_SOURCE_DIR}/src/atomic.cpp"
+"${LIBCXX_SOURCE_DIR}/src/barrier.cpp"
+"${LIBCXX_SOURCE_DIR}/src/bind.cpp"
+"${LIBCXX_SOURCE_DIR}/src/charconv.cpp"
+"${LIBCXX_SOURCE_DIR}/src/chrono.cpp"
+"${LIBCXX_SOURCE_DIR}/src/condition_variable.cpp"
+"${LIBCXX_SOURCE_DIR}/src/condition_variable_destructor.cpp"
+"${LIBCXX_SOURCE_DIR}/src/debug.cpp"
+"${LIBCXX_SOURCE_DIR}/src/exception.cpp"
+"${LIBCXX_SOURCE_DIR}/src/experimental/memory_resource.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/directory_iterator.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/int128_builtins.cpp"
+"${LIBCXX_SOURCE_DIR}/src/filesystem/operations.cpp"
+"${LIBCXX_SOURCE_DIR}/src/functional.cpp"
+"${LIBCXX_SOURCE_DIR}/src/future.cpp"
+"${LIBCXX_SOURCE_DIR}/src/hash.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ios.cpp"
+"${LIBCXX_SOURCE_DIR}/src/ios.instantiations.cpp"
+"${LIBCXX_SOURCE_DIR}/src/iostream.cpp"
+"${LIBCXX_SOURCE_DIR}/src/locale.cpp"
+"${LIBCXX_SOURCE_DIR}/src/memory.cpp"
+"${LIBCXX_SOURCE_DIR}/src/mutex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/mutex_destructor.cpp"
+"${LIBCXX_SOURCE_DIR}/src/new.cpp"
+"${LIBCXX_SOURCE_DIR}/src/optional.cpp"
+"${LIBCXX_SOURCE_DIR}/src/random.cpp"
+"${LIBCXX_SOURCE_DIR}/src/random_shuffle.cpp"
+"${LIBCXX_SOURCE_DIR}/src/regex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/shared_mutex.cpp"
+"${LIBCXX_SOURCE_DIR}/src/stdexcept.cpp"
+"${LIBCXX_SOURCE_DIR}/src/string.cpp"
+"${LIBCXX_SOURCE_DIR}/src/strstream.cpp"
+"${LIBCXX_SOURCE_DIR}/src/system_error.cpp"
+"${LIBCXX_SOURCE_DIR}/src/thread.cpp"
+"${LIBCXX_SOURCE_DIR}/src/typeinfo.cpp"
+"${LIBCXX_SOURCE_DIR}/src/utility.cpp"
+"${LIBCXX_SOURCE_DIR}/src/valarray.cpp"
+"${LIBCXX_SOURCE_DIR}/src/variant.cpp"
+"${LIBCXX_SOURCE_DIR}/src/vector.cpp"
 )
 
 add_library(cxx ${SRCS})
@@ -56,6 +56,11 @@ if (USE_UNWIND)
     target_compile_definitions(cxx PUBLIC -DSTD_EXCEPTION_HAS_STACK_TRACE=1)
 endif ()
 
+# Override the deduced attribute support that causes error.
+if (OS_DARWIN AND COMPILER_GCC)
+    add_compile_definitions(_LIBCPP_INIT_PRIORITY_MAX)
+endif ()
+
 target_compile_options(cxx PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-nostdinc++>)
 
 # Third party library may have substandard code.
diff --git a/contrib/libcxxabi-cmake/CMakeLists.txt b/contrib/libcxxabi-cmake/CMakeLists.txt
index 9d8b94dabf0..0bb5d663633 100644
--- a/contrib/libcxxabi-cmake/CMakeLists.txt
+++ b/contrib/libcxxabi-cmake/CMakeLists.txt
@@ -1,24 +1,24 @@
-set(LIBCXXABI_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcxxabi)
+set(LIBCXXABI_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libcxxabi")
 
 set(SRCS
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_stdexcept.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_virtual.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_thread_atexit.cpp
-${LIBCXXABI_SOURCE_DIR}/src/fallback_malloc.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_guard.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_default_handlers.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_personality.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_exception.cpp
-${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_demangle.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_exception.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_handlers.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_exception_storage.cpp
-${LIBCXXABI_SOURCE_DIR}/src/private_typeinfo.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_typeinfo.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_aux_runtime.cpp
-${LIBCXXABI_SOURCE_DIR}/src/cxa_vector.cpp
-${LIBCXXABI_SOURCE_DIR}/src/stdlib_new_delete.cpp
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_stdexcept.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_virtual.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_thread_atexit.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/fallback_malloc.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_guard.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_default_handlers.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_personality.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_exception.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/abort_message.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_demangle.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_exception.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_handlers.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_exception_storage.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/private_typeinfo.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_typeinfo.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_aux_runtime.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/cxa_vector.cpp"
+"${LIBCXXABI_SOURCE_DIR}/src/stdlib_new_delete.cpp"
 )
 
 add_library(cxxabi ${SRCS})
diff --git a/contrib/libhdfs3-cmake/CMake/Options.cmake b/contrib/libhdfs3-cmake/CMake/Options.cmake
index d7ccc8b6475..04ab823eedc 100644
--- a/contrib/libhdfs3-cmake/CMake/Options.cmake
+++ b/contrib/libhdfs3-cmake/CMake/Options.cmake
@@ -22,7 +22,7 @@ ADD_DEFINITIONS(-D_GLIBCXX_USE_NANOSLEEP)
 
 TRY_COMPILE(STRERROR_R_RETURN_INT
 	${CMAKE_CURRENT_BINARY_DIR}
-	${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileStrerror.cpp
+	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileStrerror.cpp"
     CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
 	OUTPUT_VARIABLE OUTPUT)
 
@@ -36,13 +36,13 @@ ENDIF(STRERROR_R_RETURN_INT)
 
 TRY_COMPILE(HAVE_STEADY_CLOCK
 	${CMAKE_CURRENT_BINARY_DIR}
-	${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileSteadyClock.cpp
+	"${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
+	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileNestedException.cpp"
     CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
 	OUTPUT_VARIABLE OUTPUT)
 
diff --git a/contrib/libhdfs3-cmake/CMakeLists.txt b/contrib/libhdfs3-cmake/CMakeLists.txt
index 60f4376bdea..c9b9179d5e6 100644
--- a/contrib/libhdfs3-cmake/CMakeLists.txt
+++ b/contrib/libhdfs3-cmake/CMakeLists.txt
@@ -24,9 +24,9 @@ else()
 endif()
 
 # project and source dir
-set(HDFS3_ROOT_DIR ${ClickHouse_SOURCE_DIR}/contrib/libhdfs3)
-set(HDFS3_SOURCE_DIR ${HDFS3_ROOT_DIR}/src)
-set(HDFS3_COMMON_DIR ${HDFS3_SOURCE_DIR}/common)
+set(HDFS3_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3")
+set(HDFS3_SOURCE_DIR "${HDFS3_ROOT_DIR}/src")
+set(HDFS3_COMMON_DIR "${HDFS3_SOURCE_DIR}/common")
 
 # module
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
@@ -35,165 +35,165 @@ include(Options)
 
 # source
 set(PROTO_FILES
-    #${HDFS3_SOURCE_DIR}/proto/encryption.proto
-    ${HDFS3_SOURCE_DIR}/proto/ClientDatanodeProtocol.proto
-    ${HDFS3_SOURCE_DIR}/proto/hdfs.proto
-    ${HDFS3_SOURCE_DIR}/proto/Security.proto
-    ${HDFS3_SOURCE_DIR}/proto/ProtobufRpcEngine.proto
-    ${HDFS3_SOURCE_DIR}/proto/ClientNamenodeProtocol.proto
-    ${HDFS3_SOURCE_DIR}/proto/IpcConnectionContext.proto
-    ${HDFS3_SOURCE_DIR}/proto/RpcHeader.proto
-    ${HDFS3_SOURCE_DIR}/proto/datatransfer.proto
+    #"${HDFS3_SOURCE_DIR}/proto/encryption.proto"
+    "${HDFS3_SOURCE_DIR}/proto/ClientDatanodeProtocol.proto"
+    "${HDFS3_SOURCE_DIR}/proto/hdfs.proto"
+    "${HDFS3_SOURCE_DIR}/proto/Security.proto"
+    "${HDFS3_SOURCE_DIR}/proto/ProtobufRpcEngine.proto"
+    "${HDFS3_SOURCE_DIR}/proto/ClientNamenodeProtocol.proto"
+    "${HDFS3_SOURCE_DIR}/proto/IpcConnectionContext.proto"
+    "${HDFS3_SOURCE_DIR}/proto/RpcHeader.proto"
+    "${HDFS3_SOURCE_DIR}/proto/datatransfer.proto"
     )
 
 if(USE_PROTOBUF)
     PROTOBUF_GENERATE_CPP(PROTO_SOURCES PROTO_HEADERS ${PROTO_FILES})
 endif()
 
-configure_file(${HDFS3_SOURCE_DIR}/platform.h.in ${CMAKE_CURRENT_BINARY_DIR}/platform.h)
+configure_file("${HDFS3_SOURCE_DIR}/platform.h.in" "${CMAKE_CURRENT_BINARY_DIR}/platform.h")
 
 set(SRCS
-    ${HDFS3_SOURCE_DIR}/network/TcpSocket.cpp
-    ${HDFS3_SOURCE_DIR}/network/DomainSocket.cpp
-    ${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.cpp
-    ${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.cpp
-    ${HDFS3_SOURCE_DIR}/client/Pipeline.cpp
-    ${HDFS3_SOURCE_DIR}/client/Hdfs.cpp
-    ${HDFS3_SOURCE_DIR}/client/Packet.cpp
-    ${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.cpp
-    ${HDFS3_SOURCE_DIR}/client/KerberosName.cpp
-    ${HDFS3_SOURCE_DIR}/client/PacketHeader.cpp
-    ${HDFS3_SOURCE_DIR}/client/LocalBlockReader.cpp
-    ${HDFS3_SOURCE_DIR}/client/UserInfo.cpp
-    ${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.cpp
-    ${HDFS3_SOURCE_DIR}/client/Permission.cpp
-    ${HDFS3_SOURCE_DIR}/client/FileSystemImpl.cpp
-    ${HDFS3_SOURCE_DIR}/client/DirectoryIterator.cpp
-    ${HDFS3_SOURCE_DIR}/client/FileSystemKey.cpp
-    ${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.cpp
-    ${HDFS3_SOURCE_DIR}/client/LeaseRenewer.cpp
-    ${HDFS3_SOURCE_DIR}/client/PeerCache.cpp
-    ${HDFS3_SOURCE_DIR}/client/InputStream.cpp
-    ${HDFS3_SOURCE_DIR}/client/FileSystem.cpp
-    ${HDFS3_SOURCE_DIR}/client/InputStreamImpl.cpp
-    ${HDFS3_SOURCE_DIR}/client/Token.cpp
-    ${HDFS3_SOURCE_DIR}/client/PacketPool.cpp
-    ${HDFS3_SOURCE_DIR}/client/OutputStream.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannel.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcAuth.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcConfig.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.cpp
-    ${HDFS3_SOURCE_DIR}/rpc/SaslClient.cpp
-    ${HDFS3_SOURCE_DIR}/server/Datanode.cpp
-    ${HDFS3_SOURCE_DIR}/server/LocatedBlocks.cpp
-    ${HDFS3_SOURCE_DIR}/server/NamenodeProxy.cpp
-    ${HDFS3_SOURCE_DIR}/server/NamenodeImpl.cpp
-    ${HDFS3_SOURCE_DIR}/server/NamenodeInfo.cpp
-    ${HDFS3_SOURCE_DIR}/common/WritableUtils.cpp
-    ${HDFS3_SOURCE_DIR}/common/ExceptionInternal.cpp
-    ${HDFS3_SOURCE_DIR}/common/SessionConfig.cpp
-    ${HDFS3_SOURCE_DIR}/common/StackPrinter.cpp
-    ${HDFS3_SOURCE_DIR}/common/Exception.cpp
-    ${HDFS3_SOURCE_DIR}/common/Logger.cpp
-    ${HDFS3_SOURCE_DIR}/common/CFileWrapper.cpp
-    ${HDFS3_SOURCE_DIR}/common/XmlConfig.cpp
-    ${HDFS3_SOURCE_DIR}/common/WriteBuffer.cpp
-    ${HDFS3_SOURCE_DIR}/common/HWCrc32c.cpp
-    ${HDFS3_SOURCE_DIR}/common/MappedFileWrapper.cpp
-    ${HDFS3_SOURCE_DIR}/common/Hash.cpp
-    ${HDFS3_SOURCE_DIR}/common/SWCrc32c.cpp
-    ${HDFS3_SOURCE_DIR}/common/Thread.cpp
+    "${HDFS3_SOURCE_DIR}/network/TcpSocket.cpp"
+    "${HDFS3_SOURCE_DIR}/network/DomainSocket.cpp"
+    "${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Pipeline.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Hdfs.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Packet.cpp"
+    "${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/KerberosName.cpp"
+    "${HDFS3_SOURCE_DIR}/client/PacketHeader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/LocalBlockReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/UserInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Permission.cpp"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/DirectoryIterator.cpp"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemKey.cpp"
+    "${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.cpp"
+    "${HDFS3_SOURCE_DIR}/client/LeaseRenewer.cpp"
+    "${HDFS3_SOURCE_DIR}/client/PeerCache.cpp"
+    "${HDFS3_SOURCE_DIR}/client/InputStream.cpp"
+    "${HDFS3_SOURCE_DIR}/client/FileSystem.cpp"
+    "${HDFS3_SOURCE_DIR}/client/InputStreamImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/client/Token.cpp"
+    "${HDFS3_SOURCE_DIR}/client/PacketPool.cpp"
+    "${HDFS3_SOURCE_DIR}/client/OutputStream.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannel.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcAuth.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcConfig.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/rpc/SaslClient.cpp"
+    "${HDFS3_SOURCE_DIR}/server/Datanode.cpp"
+    "${HDFS3_SOURCE_DIR}/server/LocatedBlocks.cpp"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeProxy.cpp"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeImpl.cpp"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeInfo.cpp"
+    "${HDFS3_SOURCE_DIR}/common/WritableUtils.cpp"
+    "${HDFS3_SOURCE_DIR}/common/ExceptionInternal.cpp"
+    "${HDFS3_SOURCE_DIR}/common/SessionConfig.cpp"
+    "${HDFS3_SOURCE_DIR}/common/StackPrinter.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Exception.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Logger.cpp"
+    "${HDFS3_SOURCE_DIR}/common/CFileWrapper.cpp"
+    "${HDFS3_SOURCE_DIR}/common/XmlConfig.cpp"
+    "${HDFS3_SOURCE_DIR}/common/WriteBuffer.cpp"
+    "${HDFS3_SOURCE_DIR}/common/HWCrc32c.cpp"
+    "${HDFS3_SOURCE_DIR}/common/MappedFileWrapper.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Hash.cpp"
+    "${HDFS3_SOURCE_DIR}/common/SWCrc32c.cpp"
+    "${HDFS3_SOURCE_DIR}/common/Thread.cpp"
 
-    ${HDFS3_SOURCE_DIR}/network/TcpSocket.h
-    ${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.h
-    ${HDFS3_SOURCE_DIR}/network/Socket.h
-    ${HDFS3_SOURCE_DIR}/network/DomainSocket.h
-    ${HDFS3_SOURCE_DIR}/network/Syscall.h
-    ${HDFS3_SOURCE_DIR}/client/InputStreamImpl.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystem.h
-    ${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.h
-    ${HDFS3_SOURCE_DIR}/client/InputStreamInter.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemImpl.h
-    ${HDFS3_SOURCE_DIR}/client/PacketPool.h
-    ${HDFS3_SOURCE_DIR}/client/Pipeline.h
-    ${HDFS3_SOURCE_DIR}/client/OutputStreamInter.h
-    ${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.h
-    ${HDFS3_SOURCE_DIR}/client/Token.h
-    ${HDFS3_SOURCE_DIR}/client/KerberosName.h
-    ${HDFS3_SOURCE_DIR}/client/DirectoryIterator.h
-    ${HDFS3_SOURCE_DIR}/client/hdfs.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemStats.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemKey.h
-    ${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.h
-    ${HDFS3_SOURCE_DIR}/client/Packet.h
-    ${HDFS3_SOURCE_DIR}/client/PacketHeader.h
-    ${HDFS3_SOURCE_DIR}/client/FileSystemInter.h
-    ${HDFS3_SOURCE_DIR}/client/LocalBlockReader.h
-    ${HDFS3_SOURCE_DIR}/client/TokenInternal.h
-    ${HDFS3_SOURCE_DIR}/client/InputStream.h
-    ${HDFS3_SOURCE_DIR}/client/PipelineAck.h
-    ${HDFS3_SOURCE_DIR}/client/BlockReader.h
-    ${HDFS3_SOURCE_DIR}/client/Permission.h
-    ${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.h
-    ${HDFS3_SOURCE_DIR}/client/LeaseRenewer.h
-    ${HDFS3_SOURCE_DIR}/client/UserInfo.h
-    ${HDFS3_SOURCE_DIR}/client/PeerCache.h
-    ${HDFS3_SOURCE_DIR}/client/OutputStream.h
-    ${HDFS3_SOURCE_DIR}/client/FileStatus.h
-    ${HDFS3_SOURCE_DIR}/client/DataTransferProtocol.h
-    ${HDFS3_SOURCE_DIR}/client/BlockLocation.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcConfig.h
-    ${HDFS3_SOURCE_DIR}/rpc/SaslClient.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcAuth.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcClient.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcCall.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannel.h
-    ${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.h
-    ${HDFS3_SOURCE_DIR}/server/BlockLocalPathInfo.h
-    ${HDFS3_SOURCE_DIR}/server/LocatedBlocks.h
-    ${HDFS3_SOURCE_DIR}/server/DatanodeInfo.h
-    ${HDFS3_SOURCE_DIR}/server/RpcHelper.h
-    ${HDFS3_SOURCE_DIR}/server/ExtendedBlock.h
-    ${HDFS3_SOURCE_DIR}/server/NamenodeInfo.h
-    ${HDFS3_SOURCE_DIR}/server/NamenodeImpl.h
-    ${HDFS3_SOURCE_DIR}/server/LocatedBlock.h
-    ${HDFS3_SOURCE_DIR}/server/NamenodeProxy.h
-    ${HDFS3_SOURCE_DIR}/server/Datanode.h
-    ${HDFS3_SOURCE_DIR}/server/Namenode.h
-    ${HDFS3_SOURCE_DIR}/common/XmlConfig.h
-    ${HDFS3_SOURCE_DIR}/common/Logger.h
-    ${HDFS3_SOURCE_DIR}/common/WriteBuffer.h
-    ${HDFS3_SOURCE_DIR}/common/HWCrc32c.h
-    ${HDFS3_SOURCE_DIR}/common/Checksum.h
-    ${HDFS3_SOURCE_DIR}/common/SessionConfig.h
-    ${HDFS3_SOURCE_DIR}/common/Unordered.h
-    ${HDFS3_SOURCE_DIR}/common/BigEndian.h
-    ${HDFS3_SOURCE_DIR}/common/Thread.h
-    ${HDFS3_SOURCE_DIR}/common/StackPrinter.h
-    ${HDFS3_SOURCE_DIR}/common/Exception.h
-    ${HDFS3_SOURCE_DIR}/common/WritableUtils.h
-    ${HDFS3_SOURCE_DIR}/common/StringUtil.h
-    ${HDFS3_SOURCE_DIR}/common/LruMap.h
-    ${HDFS3_SOURCE_DIR}/common/Function.h
-    ${HDFS3_SOURCE_DIR}/common/DateTime.h
-    ${HDFS3_SOURCE_DIR}/common/Hash.h
-    ${HDFS3_SOURCE_DIR}/common/SWCrc32c.h
-    ${HDFS3_SOURCE_DIR}/common/ExceptionInternal.h
-    ${HDFS3_SOURCE_DIR}/common/Memory.h
-    ${HDFS3_SOURCE_DIR}/common/FileWrapper.h
+    "${HDFS3_SOURCE_DIR}/network/TcpSocket.h"
+    "${HDFS3_SOURCE_DIR}/network/BufferedSocketReader.h"
+    "${HDFS3_SOURCE_DIR}/network/Socket.h"
+    "${HDFS3_SOURCE_DIR}/network/DomainSocket.h"
+    "${HDFS3_SOURCE_DIR}/network/Syscall.h"
+    "${HDFS3_SOURCE_DIR}/client/InputStreamImpl.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystem.h"
+    "${HDFS3_SOURCE_DIR}/client/ReadShortCircuitInfo.h"
+    "${HDFS3_SOURCE_DIR}/client/InputStreamInter.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemImpl.h"
+    "${HDFS3_SOURCE_DIR}/client/PacketPool.h"
+    "${HDFS3_SOURCE_DIR}/client/Pipeline.h"
+    "${HDFS3_SOURCE_DIR}/client/OutputStreamInter.h"
+    "${HDFS3_SOURCE_DIR}/client/RemoteBlockReader.h"
+    "${HDFS3_SOURCE_DIR}/client/Token.h"
+    "${HDFS3_SOURCE_DIR}/client/KerberosName.h"
+    "${HDFS3_SOURCE_DIR}/client/DirectoryIterator.h"
+    "${HDFS3_SOURCE_DIR}/client/hdfs.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemStats.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemKey.h"
+    "${HDFS3_SOURCE_DIR}/client/DataTransferProtocolSender.h"
+    "${HDFS3_SOURCE_DIR}/client/Packet.h"
+    "${HDFS3_SOURCE_DIR}/client/PacketHeader.h"
+    "${HDFS3_SOURCE_DIR}/client/FileSystemInter.h"
+    "${HDFS3_SOURCE_DIR}/client/LocalBlockReader.h"
+    "${HDFS3_SOURCE_DIR}/client/TokenInternal.h"
+    "${HDFS3_SOURCE_DIR}/client/InputStream.h"
+    "${HDFS3_SOURCE_DIR}/client/PipelineAck.h"
+    "${HDFS3_SOURCE_DIR}/client/BlockReader.h"
+    "${HDFS3_SOURCE_DIR}/client/Permission.h"
+    "${HDFS3_SOURCE_DIR}/client/OutputStreamImpl.h"
+    "${HDFS3_SOURCE_DIR}/client/LeaseRenewer.h"
+    "${HDFS3_SOURCE_DIR}/client/UserInfo.h"
+    "${HDFS3_SOURCE_DIR}/client/PeerCache.h"
+    "${HDFS3_SOURCE_DIR}/client/OutputStream.h"
+    "${HDFS3_SOURCE_DIR}/client/FileStatus.h"
+    "${HDFS3_SOURCE_DIR}/client/DataTransferProtocol.h"
+    "${HDFS3_SOURCE_DIR}/client/BlockLocation.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcConfig.h"
+    "${HDFS3_SOURCE_DIR}/rpc/SaslClient.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcAuth.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcClient.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcCall.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcContentWrapper.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcProtocolInfo.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcRemoteCall.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcServerInfo.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannel.h"
+    "${HDFS3_SOURCE_DIR}/rpc/RpcChannelKey.h"
+    "${HDFS3_SOURCE_DIR}/server/BlockLocalPathInfo.h"
+    "${HDFS3_SOURCE_DIR}/server/LocatedBlocks.h"
+    "${HDFS3_SOURCE_DIR}/server/DatanodeInfo.h"
+    "${HDFS3_SOURCE_DIR}/server/RpcHelper.h"
+    "${HDFS3_SOURCE_DIR}/server/ExtendedBlock.h"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeInfo.h"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeImpl.h"
+    "${HDFS3_SOURCE_DIR}/server/LocatedBlock.h"
+    "${HDFS3_SOURCE_DIR}/server/NamenodeProxy.h"
+    "${HDFS3_SOURCE_DIR}/server/Datanode.h"
+    "${HDFS3_SOURCE_DIR}/server/Namenode.h"
+    "${HDFS3_SOURCE_DIR}/common/XmlConfig.h"
+    "${HDFS3_SOURCE_DIR}/common/Logger.h"
+    "${HDFS3_SOURCE_DIR}/common/WriteBuffer.h"
+    "${HDFS3_SOURCE_DIR}/common/HWCrc32c.h"
+    "${HDFS3_SOURCE_DIR}/common/Checksum.h"
+    "${HDFS3_SOURCE_DIR}/common/SessionConfig.h"
+    "${HDFS3_SOURCE_DIR}/common/Unordered.h"
+    "${HDFS3_SOURCE_DIR}/common/BigEndian.h"
+    "${HDFS3_SOURCE_DIR}/common/Thread.h"
+    "${HDFS3_SOURCE_DIR}/common/StackPrinter.h"
+    "${HDFS3_SOURCE_DIR}/common/Exception.h"
+    "${HDFS3_SOURCE_DIR}/common/WritableUtils.h"
+    "${HDFS3_SOURCE_DIR}/common/StringUtil.h"
+    "${HDFS3_SOURCE_DIR}/common/LruMap.h"
+    "${HDFS3_SOURCE_DIR}/common/Function.h"
+    "${HDFS3_SOURCE_DIR}/common/DateTime.h"
+    "${HDFS3_SOURCE_DIR}/common/Hash.h"
+    "${HDFS3_SOURCE_DIR}/common/SWCrc32c.h"
+    "${HDFS3_SOURCE_DIR}/common/ExceptionInternal.h"
+    "${HDFS3_SOURCE_DIR}/common/Memory.h"
+    "${HDFS3_SOURCE_DIR}/common/FileWrapper.h"
     )
 
 # old kernels (< 3.17) doesn't have SYS_getrandom. Always use POSIX implementation to have better compatibility
-set_source_files_properties(${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp PROPERTIES COMPILE_FLAGS "-DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX=1")
+set_source_files_properties("${HDFS3_SOURCE_DIR}/rpc/RpcClient.cpp" PROPERTIES COMPILE_FLAGS "-DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX=1")
 
 # target
 add_library(hdfs3 ${SRCS} ${PROTO_SOURCES} ${PROTO_HEADERS})
diff --git a/contrib/libpq-cmake/CMakeLists.txt b/contrib/libpq-cmake/CMakeLists.txt
index 34c57799a8a..028fabe52b8 100644
--- a/contrib/libpq-cmake/CMakeLists.txt
+++ b/contrib/libpq-cmake/CMakeLists.txt
@@ -1,58 +1,58 @@
-set(LIBPQ_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libpq)
+set(LIBPQ_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpq")
 
 set(SRCS
-        ${LIBPQ_SOURCE_DIR}/fe-auth.c
-        ${LIBPQ_SOURCE_DIR}/fe-auth-scram.c
-        ${LIBPQ_SOURCE_DIR}/fe-connect.c
-        ${LIBPQ_SOURCE_DIR}/fe-exec.c
-        ${LIBPQ_SOURCE_DIR}/fe-lobj.c
-        ${LIBPQ_SOURCE_DIR}/fe-misc.c
-        ${LIBPQ_SOURCE_DIR}/fe-print.c
-        ${LIBPQ_SOURCE_DIR}/fe-protocol2.c
-        ${LIBPQ_SOURCE_DIR}/fe-protocol3.c
-        ${LIBPQ_SOURCE_DIR}/fe-secure.c
-        ${LIBPQ_SOURCE_DIR}/fe-secure-common.c
-        ${LIBPQ_SOURCE_DIR}/fe-secure-openssl.c
-        ${LIBPQ_SOURCE_DIR}/legacy-pqsignal.c
-        ${LIBPQ_SOURCE_DIR}/libpq-events.c
-        ${LIBPQ_SOURCE_DIR}/pqexpbuffer.c
+        "${LIBPQ_SOURCE_DIR}/fe-auth.c"
+        "${LIBPQ_SOURCE_DIR}/fe-auth-scram.c"
+        "${LIBPQ_SOURCE_DIR}/fe-connect.c"
+        "${LIBPQ_SOURCE_DIR}/fe-exec.c"
+        "${LIBPQ_SOURCE_DIR}/fe-lobj.c"
+        "${LIBPQ_SOURCE_DIR}/fe-misc.c"
+        "${LIBPQ_SOURCE_DIR}/fe-print.c"
+        "${LIBPQ_SOURCE_DIR}/fe-protocol2.c"
+        "${LIBPQ_SOURCE_DIR}/fe-protocol3.c"
+        "${LIBPQ_SOURCE_DIR}/fe-secure.c"
+        "${LIBPQ_SOURCE_DIR}/fe-secure-common.c"
+        "${LIBPQ_SOURCE_DIR}/fe-secure-openssl.c"
+        "${LIBPQ_SOURCE_DIR}/legacy-pqsignal.c"
+        "${LIBPQ_SOURCE_DIR}/libpq-events.c"
+        "${LIBPQ_SOURCE_DIR}/pqexpbuffer.c"
 
-        ${LIBPQ_SOURCE_DIR}/common/scram-common.c
-        ${LIBPQ_SOURCE_DIR}/common/sha2_openssl.c
-        ${LIBPQ_SOURCE_DIR}/common/md5.c
-        ${LIBPQ_SOURCE_DIR}/common/saslprep.c
-        ${LIBPQ_SOURCE_DIR}/common/unicode_norm.c
-        ${LIBPQ_SOURCE_DIR}/common/ip.c
-        ${LIBPQ_SOURCE_DIR}/common/jsonapi.c
-        ${LIBPQ_SOURCE_DIR}/common/wchar.c
-        ${LIBPQ_SOURCE_DIR}/common/base64.c
-        ${LIBPQ_SOURCE_DIR}/common/link-canary.c
-        ${LIBPQ_SOURCE_DIR}/common/fe_memutils.c
-        ${LIBPQ_SOURCE_DIR}/common/string.c
-        ${LIBPQ_SOURCE_DIR}/common/pg_get_line.c
-        ${LIBPQ_SOURCE_DIR}/common/stringinfo.c
-        ${LIBPQ_SOURCE_DIR}/common/psprintf.c
-        ${LIBPQ_SOURCE_DIR}/common/encnames.c
-        ${LIBPQ_SOURCE_DIR}/common/logging.c
+        "${LIBPQ_SOURCE_DIR}/common/scram-common.c"
+        "${LIBPQ_SOURCE_DIR}/common/sha2_openssl.c"
+        "${LIBPQ_SOURCE_DIR}/common/md5.c"
+        "${LIBPQ_SOURCE_DIR}/common/saslprep.c"
+        "${LIBPQ_SOURCE_DIR}/common/unicode_norm.c"
+        "${LIBPQ_SOURCE_DIR}/common/ip.c"
+        "${LIBPQ_SOURCE_DIR}/common/jsonapi.c"
+        "${LIBPQ_SOURCE_DIR}/common/wchar.c"
+        "${LIBPQ_SOURCE_DIR}/common/base64.c"
+        "${LIBPQ_SOURCE_DIR}/common/link-canary.c"
+        "${LIBPQ_SOURCE_DIR}/common/fe_memutils.c"
+        "${LIBPQ_SOURCE_DIR}/common/string.c"
+        "${LIBPQ_SOURCE_DIR}/common/pg_get_line.c"
+        "${LIBPQ_SOURCE_DIR}/common/stringinfo.c"
+        "${LIBPQ_SOURCE_DIR}/common/psprintf.c"
+        "${LIBPQ_SOURCE_DIR}/common/encnames.c"
+        "${LIBPQ_SOURCE_DIR}/common/logging.c"
 
-        ${LIBPQ_SOURCE_DIR}/port/snprintf.c
-        ${LIBPQ_SOURCE_DIR}/port/strlcpy.c
-        ${LIBPQ_SOURCE_DIR}/port/strerror.c
-        ${LIBPQ_SOURCE_DIR}/port/inet_net_ntop.c
-        ${LIBPQ_SOURCE_DIR}/port/getpeereid.c
-        ${LIBPQ_SOURCE_DIR}/port/chklocale.c
-        ${LIBPQ_SOURCE_DIR}/port/noblock.c
-        ${LIBPQ_SOURCE_DIR}/port/pg_strong_random.c
-        ${LIBPQ_SOURCE_DIR}/port/pgstrcasecmp.c
-        ${LIBPQ_SOURCE_DIR}/port/thread.c
-        ${LIBPQ_SOURCE_DIR}/port/path.c
-        ${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c
+        "${LIBPQ_SOURCE_DIR}/port/snprintf.c"
+        "${LIBPQ_SOURCE_DIR}/port/strlcpy.c"
+        "${LIBPQ_SOURCE_DIR}/port/strerror.c"
+        "${LIBPQ_SOURCE_DIR}/port/inet_net_ntop.c"
+        "${LIBPQ_SOURCE_DIR}/port/getpeereid.c"
+        "${LIBPQ_SOURCE_DIR}/port/chklocale.c"
+        "${LIBPQ_SOURCE_DIR}/port/noblock.c"
+        "${LIBPQ_SOURCE_DIR}/port/pg_strong_random.c"
+        "${LIBPQ_SOURCE_DIR}/port/pgstrcasecmp.c"
+        "${LIBPQ_SOURCE_DIR}/port/thread.c"
+        "${LIBPQ_SOURCE_DIR}/port/path.c"
+        "${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c"
         )
 
 add_library(libpq ${SRCS})
 
 target_include_directories (libpq PUBLIC ${LIBPQ_SOURCE_DIR})
-target_include_directories (libpq PUBLIC ${LIBPQ_SOURCE_DIR}/include)
-target_include_directories (libpq PRIVATE ${LIBPQ_SOURCE_DIR}/configs)
+target_include_directories (libpq PUBLIC "${LIBPQ_SOURCE_DIR}/include")
+target_include_directories (libpq PRIVATE "${LIBPQ_SOURCE_DIR}/configs")
 
 target_link_libraries (libpq PRIVATE ssl)
diff --git a/contrib/libpqxx-cmake/CMakeLists.txt b/contrib/libpqxx-cmake/CMakeLists.txt
index ed372951f82..4edef7bdd82 100644
--- a/contrib/libpqxx-cmake/CMakeLists.txt
+++ b/contrib/libpqxx-cmake/CMakeLists.txt
@@ -1,70 +1,70 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/libpqxx)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpqxx")
 
 set (SRCS
-    ${LIBRARY_DIR}/src/strconv.cxx
-    ${LIBRARY_DIR}/src/array.cxx
-    ${LIBRARY_DIR}/src/binarystring.cxx
-    ${LIBRARY_DIR}/src/connection.cxx
-    ${LIBRARY_DIR}/src/cursor.cxx
-    ${LIBRARY_DIR}/src/encodings.cxx
-    ${LIBRARY_DIR}/src/errorhandler.cxx
-    ${LIBRARY_DIR}/src/except.cxx
-    ${LIBRARY_DIR}/src/field.cxx
-    ${LIBRARY_DIR}/src/largeobject.cxx
-    ${LIBRARY_DIR}/src/notification.cxx
-    ${LIBRARY_DIR}/src/pipeline.cxx
-    ${LIBRARY_DIR}/src/result.cxx
-    ${LIBRARY_DIR}/src/robusttransaction.cxx
-    ${LIBRARY_DIR}/src/sql_cursor.cxx
-    ${LIBRARY_DIR}/src/stream_from.cxx
-    ${LIBRARY_DIR}/src/stream_to.cxx
-    ${LIBRARY_DIR}/src/subtransaction.cxx
-    ${LIBRARY_DIR}/src/transaction.cxx
-    ${LIBRARY_DIR}/src/transaction_base.cxx
-    ${LIBRARY_DIR}/src/row.cxx
-    ${LIBRARY_DIR}/src/util.cxx
-    ${LIBRARY_DIR}/src/version.cxx
+    "${LIBRARY_DIR}/src/strconv.cxx"
+    "${LIBRARY_DIR}/src/array.cxx"
+    "${LIBRARY_DIR}/src/binarystring.cxx"
+    "${LIBRARY_DIR}/src/connection.cxx"
+    "${LIBRARY_DIR}/src/cursor.cxx"
+    "${LIBRARY_DIR}/src/encodings.cxx"
+    "${LIBRARY_DIR}/src/errorhandler.cxx"
+    "${LIBRARY_DIR}/src/except.cxx"
+    "${LIBRARY_DIR}/src/field.cxx"
+    "${LIBRARY_DIR}/src/largeobject.cxx"
+    "${LIBRARY_DIR}/src/notification.cxx"
+    "${LIBRARY_DIR}/src/pipeline.cxx"
+    "${LIBRARY_DIR}/src/result.cxx"
+    "${LIBRARY_DIR}/src/robusttransaction.cxx"
+    "${LIBRARY_DIR}/src/sql_cursor.cxx"
+    "${LIBRARY_DIR}/src/stream_from.cxx"
+    "${LIBRARY_DIR}/src/stream_to.cxx"
+    "${LIBRARY_DIR}/src/subtransaction.cxx"
+    "${LIBRARY_DIR}/src/transaction.cxx"
+    "${LIBRARY_DIR}/src/transaction_base.cxx"
+    "${LIBRARY_DIR}/src/row.cxx"
+    "${LIBRARY_DIR}/src/util.cxx"
+    "${LIBRARY_DIR}/src/version.cxx"
 )
 
 # Need to explicitly include each header file, because in the directory include/pqxx there are also files
 # like just 'array'. So if including the whole directory with `target_include_directories`, it will make
 # conflicts with all includes of <array>.
 set (HDRS
-    ${LIBRARY_DIR}/include/pqxx/array.hxx
-    ${LIBRARY_DIR}/include/pqxx/binarystring.hxx
-    ${LIBRARY_DIR}/include/pqxx/composite.hxx
-    ${LIBRARY_DIR}/include/pqxx/connection.hxx
-    ${LIBRARY_DIR}/include/pqxx/cursor.hxx
-    ${LIBRARY_DIR}/include/pqxx/dbtransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/errorhandler.hxx
-    ${LIBRARY_DIR}/include/pqxx/except.hxx
-    ${LIBRARY_DIR}/include/pqxx/field.hxx
-    ${LIBRARY_DIR}/include/pqxx/isolation.hxx
-    ${LIBRARY_DIR}/include/pqxx/largeobject.hxx
-    ${LIBRARY_DIR}/include/pqxx/nontransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/notification.hxx
-    ${LIBRARY_DIR}/include/pqxx/pipeline.hxx
-    ${LIBRARY_DIR}/include/pqxx/prepared_statement.hxx
-    ${LIBRARY_DIR}/include/pqxx/result.hxx
-    ${LIBRARY_DIR}/include/pqxx/robusttransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/row.hxx
-    ${LIBRARY_DIR}/include/pqxx/separated_list.hxx
-    ${LIBRARY_DIR}/include/pqxx/strconv.hxx
-    ${LIBRARY_DIR}/include/pqxx/stream_from.hxx
-    ${LIBRARY_DIR}/include/pqxx/stream_to.hxx
-    ${LIBRARY_DIR}/include/pqxx/subtransaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/transaction.hxx
-    ${LIBRARY_DIR}/include/pqxx/transaction_base.hxx
-    ${LIBRARY_DIR}/include/pqxx/types.hxx
-    ${LIBRARY_DIR}/include/pqxx/util.hxx
-    ${LIBRARY_DIR}/include/pqxx/version.hxx
-    ${LIBRARY_DIR}/include/pqxx/zview.hxx
+    "${LIBRARY_DIR}/include/pqxx/array.hxx"
+    "${LIBRARY_DIR}/include/pqxx/binarystring.hxx"
+    "${LIBRARY_DIR}/include/pqxx/composite.hxx"
+    "${LIBRARY_DIR}/include/pqxx/connection.hxx"
+    "${LIBRARY_DIR}/include/pqxx/cursor.hxx"
+    "${LIBRARY_DIR}/include/pqxx/dbtransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/errorhandler.hxx"
+    "${LIBRARY_DIR}/include/pqxx/except.hxx"
+    "${LIBRARY_DIR}/include/pqxx/field.hxx"
+    "${LIBRARY_DIR}/include/pqxx/isolation.hxx"
+    "${LIBRARY_DIR}/include/pqxx/largeobject.hxx"
+    "${LIBRARY_DIR}/include/pqxx/nontransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/notification.hxx"
+    "${LIBRARY_DIR}/include/pqxx/pipeline.hxx"
+    "${LIBRARY_DIR}/include/pqxx/prepared_statement.hxx"
+    "${LIBRARY_DIR}/include/pqxx/result.hxx"
+    "${LIBRARY_DIR}/include/pqxx/robusttransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/row.hxx"
+    "${LIBRARY_DIR}/include/pqxx/separated_list.hxx"
+    "${LIBRARY_DIR}/include/pqxx/strconv.hxx"
+    "${LIBRARY_DIR}/include/pqxx/stream_from.hxx"
+    "${LIBRARY_DIR}/include/pqxx/stream_to.hxx"
+    "${LIBRARY_DIR}/include/pqxx/subtransaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/transaction.hxx"
+    "${LIBRARY_DIR}/include/pqxx/transaction_base.hxx"
+    "${LIBRARY_DIR}/include/pqxx/types.hxx"
+    "${LIBRARY_DIR}/include/pqxx/util.hxx"
+    "${LIBRARY_DIR}/include/pqxx/version.hxx"
+    "${LIBRARY_DIR}/include/pqxx/zview.hxx"
 )
 
 add_library(libpqxx ${SRCS} ${HDRS})
 
 target_link_libraries(libpqxx PUBLIC ${LIBPQ_LIBRARY})
-target_include_directories (libpqxx PRIVATE ${LIBRARY_DIR}/include)
+target_include_directories (libpqxx PRIVATE "${LIBRARY_DIR}/include")
 
 # crutch
 set(CM_CONFIG_H_IN "${LIBRARY_DIR}/include/pqxx/config.h.in")
diff --git a/contrib/librdkafka b/contrib/librdkafka
index cf11d0aa36d..43491d33ca2 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit cf11d0aa36d4738f2c9bf4377807661660f1be76
+Subproject commit 43491d33ca2826531d1e3cae70d4bf1e5249e3c9
diff --git a/contrib/librdkafka-cmake/CMakeLists.txt b/contrib/librdkafka-cmake/CMakeLists.txt
index 2b55b22cd2b..97b6a7e1ec5 100644
--- a/contrib/librdkafka-cmake/CMakeLists.txt
+++ b/contrib/librdkafka-cmake/CMakeLists.txt
@@ -1,83 +1,83 @@
-set(RDKAFKA_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src)
+set(RDKAFKA_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/src")
 
 set(SRCS
-  ${RDKAFKA_SOURCE_DIR}/crc32c.c
-#  ${RDKAFKA_SOURCE_DIR}/lz4.c
-#  ${RDKAFKA_SOURCE_DIR}/lz4frame.c
-#  ${RDKAFKA_SOURCE_DIR}/lz4hc.c
-  ${RDKAFKA_SOURCE_DIR}/rdaddr.c
-  ${RDKAFKA_SOURCE_DIR}/rdavl.c
-  ${RDKAFKA_SOURCE_DIR}/rdbuf.c
-  ${RDKAFKA_SOURCE_DIR}/rdcrc32.c
-  ${RDKAFKA_SOURCE_DIR}/rddl.c
-  ${RDKAFKA_SOURCE_DIR}/rdfnv1a.c
-  ${RDKAFKA_SOURCE_DIR}/rdgz.c
-  ${RDKAFKA_SOURCE_DIR}/rdhdrhistogram.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_admin.c # looks optional
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignment.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_aux.c # looks optional
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_background.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_broker.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_buf.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_cert.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_cgrp.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_conf.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_coord.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_error.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_event.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_feature.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_header.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_idempotence.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock_cgrp.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_mock_handlers.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_msg.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_reader.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_writer.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_offset.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_op.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_partition.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_pattern.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_plugin.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_queue.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_range_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_request.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c        # optionally included below
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c  # optionally included below
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c        # optionally included below
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c
-#  ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c               # optionally included below
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_topic.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_transport.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_txnmgr.c
-  ${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c
-  ${RDKAFKA_SOURCE_DIR}/rdlist.c
-  ${RDKAFKA_SOURCE_DIR}/rdlog.c
-  ${RDKAFKA_SOURCE_DIR}/rdmap.c
-  ${RDKAFKA_SOURCE_DIR}/rdmurmur2.c
-  ${RDKAFKA_SOURCE_DIR}/rdports.c
-  ${RDKAFKA_SOURCE_DIR}/rdrand.c
-  ${RDKAFKA_SOURCE_DIR}/rdregex.c
-  ${RDKAFKA_SOURCE_DIR}/rdstring.c
-  ${RDKAFKA_SOURCE_DIR}/rdunittest.c
-  ${RDKAFKA_SOURCE_DIR}/rdvarint.c
-  ${RDKAFKA_SOURCE_DIR}/rdxxhash.c
-  # ${RDKAFKA_SOURCE_DIR}/regexp.c
-  ${RDKAFKA_SOURCE_DIR}/snappy.c
-  ${RDKAFKA_SOURCE_DIR}/tinycthread.c
-  ${RDKAFKA_SOURCE_DIR}/tinycthread_extra.c
+  "${RDKAFKA_SOURCE_DIR}/crc32c.c"
+#  "${RDKAFKA_SOURCE_DIR}/lz4.c"
+#  "${RDKAFKA_SOURCE_DIR}/lz4frame.c"
+#  "${RDKAFKA_SOURCE_DIR}/lz4hc.c"
+  "${RDKAFKA_SOURCE_DIR}/rdaddr.c"
+  "${RDKAFKA_SOURCE_DIR}/rdavl.c"
+  "${RDKAFKA_SOURCE_DIR}/rdbuf.c"
+  "${RDKAFKA_SOURCE_DIR}/rdcrc32.c"
+  "${RDKAFKA_SOURCE_DIR}/rddl.c"
+  "${RDKAFKA_SOURCE_DIR}/rdfnv1a.c"
+  "${RDKAFKA_SOURCE_DIR}/rdgz.c"
+  "${RDKAFKA_SOURCE_DIR}/rdhdrhistogram.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_admin.c" # looks optional
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_assignment.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_aux.c" # looks optional
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_background.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_broker.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_buf.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_cert.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_cgrp.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_conf.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_coord.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_error.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_event.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_feature.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_header.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_idempotence.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_interceptor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_lz4.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_metadata.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_metadata_cache.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_mock.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_mock_cgrp.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_mock_handlers.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_msg.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_reader.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_msgset_writer.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_offset.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_op.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_partition.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_pattern.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_plugin.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_queue.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_range_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_request.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_roundrobin_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl.c"
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c"        # optionally included below
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c"  # optionally included below
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_plain.c"
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c"        # optionally included below
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_win32.c"
+#  "${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c"               # optionally included below
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_sticky_assignor.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_subscription.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_timer.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_topic.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_transport.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_txnmgr.c"
+  "${RDKAFKA_SOURCE_DIR}/rdkafka_zstd.c"
+  "${RDKAFKA_SOURCE_DIR}/rdlist.c"
+  "${RDKAFKA_SOURCE_DIR}/rdlog.c"
+  "${RDKAFKA_SOURCE_DIR}/rdmap.c"
+  "${RDKAFKA_SOURCE_DIR}/rdmurmur2.c"
+  "${RDKAFKA_SOURCE_DIR}/rdports.c"
+  "${RDKAFKA_SOURCE_DIR}/rdrand.c"
+  "${RDKAFKA_SOURCE_DIR}/rdregex.c"
+  "${RDKAFKA_SOURCE_DIR}/rdstring.c"
+  "${RDKAFKA_SOURCE_DIR}/rdunittest.c"
+  "${RDKAFKA_SOURCE_DIR}/rdvarint.c"
+  "${RDKAFKA_SOURCE_DIR}/rdxxhash.c"
+  # "${RDKAFKA_SOURCE_DIR}/regexp.c"
+  "${RDKAFKA_SOURCE_DIR}/snappy.c"
+  "${RDKAFKA_SOURCE_DIR}/tinycthread.c"
+  "${RDKAFKA_SOURCE_DIR}/tinycthread_extra.c"
 )
 
 if(${ENABLE_CYRUS_SASL})
@@ -96,28 +96,28 @@ if(OPENSSL_FOUND)
 endif()
 
 if(WITH_SSL)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c)
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_ssl.c")
 endif()
 
 if(WITH_SASL_CYRUS)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c) # needed to support Kerberos, requires cyrus-sasl
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_cyrus.c") # needed to support Kerberos, requires cyrus-sasl
 endif()
 
 if(WITH_SASL_SCRAM)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c)
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_scram.c")
 endif()
 
 if(WITH_SASL_OAUTHBEARER)
-  list(APPEND SRCS ${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c)
+  list(APPEND SRCS "${RDKAFKA_SOURCE_DIR}/rdkafka_sasl_oauthbearer.c")
 endif()
 
 add_library(rdkafka ${SRCS})
 target_compile_options(rdkafka PRIVATE -fno-sanitize=undefined)
 # target_include_directories(rdkafka SYSTEM PUBLIC include)
-target_include_directories(rdkafka SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)  # for "librdkafka/rdkafka.h"
+target_include_directories(rdkafka SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")  # for "librdkafka/rdkafka.h"
 target_include_directories(rdkafka SYSTEM PUBLIC ${RDKAFKA_SOURCE_DIR})         # Because weird logic with "include_next" is used.
-target_include_directories(rdkafka SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/auxdir)  # for "../config.h"
-target_include_directories(rdkafka SYSTEM PRIVATE ${ZSTD_INCLUDE_DIR}/common)   # Because wrong path to "zstd_errors.h" is used.
+target_include_directories(rdkafka SYSTEM PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/auxdir")  # for "../config.h"
+target_include_directories(rdkafka SYSTEM PRIVATE "${ZSTD_INCLUDE_DIR}/common")   # Because wrong path to "zstd_errors.h" is used.
 target_link_libraries(rdkafka PRIVATE lz4 ${ZLIB_LIBRARIES} ${ZSTD_LIBRARY})
 if(OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
     target_link_libraries(rdkafka PRIVATE ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
@@ -126,7 +126,7 @@ if(${ENABLE_CYRUS_SASL})
     target_link_libraries(rdkafka PRIVATE ${CYRUS_SASL_LIBRARY})
 endif()
 
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/auxdir)
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/auxdir")
 
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
diff --git a/contrib/librdkafka-cmake/config.h.in b/contrib/librdkafka-cmake/config.h.in
index 80b6ea61b6e..9fecb45e42d 100644
--- a/contrib/librdkafka-cmake/config.h.in
+++ b/contrib/librdkafka-cmake/config.h.in
@@ -66,7 +66,7 @@
 #cmakedefine WITH_SASL_OAUTHBEARER 1
 #cmakedefine WITH_SASL_CYRUS 1
 // crc32chw
-#if !defined(__PPC__) && (!defined(__aarch64__) || defined(__ARM_FEATURE_CRC32))
+#if !defined(__PPC__) && (!defined(__aarch64__) || defined(__ARM_FEATURE_CRC32)) && !(defined(__aarch64__) && defined(__APPLE__))
 #define WITH_CRC32C_HW 1
 #endif
 // regex
@@ -75,6 +75,8 @@
 #define HAVE_STRNDUP 1
 // strerror_r
 #define HAVE_STRERROR_R 1
+// rand_r
+#define HAVE_RAND_R 1
 
 #ifdef __APPLE__
 // pthread_setname_np
diff --git a/contrib/libunwind b/contrib/libunwind
index 8fe25d7dc70..a491c27b331 160000
--- a/contrib/libunwind
+++ b/contrib/libunwind
@@ -1 +1 @@
-Subproject commit 8fe25d7dc70f2a4ea38c3e5a33fa9d4199b67a5a
+Subproject commit a491c27b33109a842d577c0f7ac5f5f218859181
diff --git a/contrib/libunwind-cmake/CMakeLists.txt b/contrib/libunwind-cmake/CMakeLists.txt
index 3afff30eee7..1a9f5e50abd 100644
--- a/contrib/libunwind-cmake/CMakeLists.txt
+++ b/contrib/libunwind-cmake/CMakeLists.txt
@@ -1,27 +1,27 @@
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 
-set(LIBUNWIND_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libunwind)
+set(LIBUNWIND_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libunwind")
 
 set(LIBUNWIND_CXX_SOURCES
-    ${LIBUNWIND_SOURCE_DIR}/src/libunwind.cpp
-    ${LIBUNWIND_SOURCE_DIR}/src/Unwind-EHABI.cpp
-    ${LIBUNWIND_SOURCE_DIR}/src/Unwind-seh.cpp)
+    "${LIBUNWIND_SOURCE_DIR}/src/libunwind.cpp"
+    "${LIBUNWIND_SOURCE_DIR}/src/Unwind-EHABI.cpp"
+    "${LIBUNWIND_SOURCE_DIR}/src/Unwind-seh.cpp")
 if (APPLE)
-    set(LIBUNWIND_CXX_SOURCES ${LIBUNWIND_CXX_SOURCES} ${LIBUNWIND_SOURCE_DIR}/src/Unwind_AppleExtras.cpp)
+    set(LIBUNWIND_CXX_SOURCES ${LIBUNWIND_CXX_SOURCES} "${LIBUNWIND_SOURCE_DIR}/src/Unwind_AppleExtras.cpp")
 endif ()
 
 set(LIBUNWIND_C_SOURCES
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1.c
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1-gcc-ext.c
-    ${LIBUNWIND_SOURCE_DIR}/src/Unwind-sjlj.c
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1.c"
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindLevel1-gcc-ext.c"
+    "${LIBUNWIND_SOURCE_DIR}/src/Unwind-sjlj.c"
     # Use unw_backtrace to override libgcc's backtrace symbol for better ABI compatibility
     unwind-override.c)
 set_source_files_properties(${LIBUNWIND_C_SOURCES} PROPERTIES COMPILE_FLAGS "-std=c99")
 
 set(LIBUNWIND_ASM_SOURCES
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersRestore.S
-    ${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersSave.S)
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersRestore.S"
+    "${LIBUNWIND_SOURCE_DIR}/src/UnwindRegistersSave.S")
 
 # CMake doesn't pass the correct architecture for Apple prior to CMake 3.19 [1]
 # Workaround these two issues by compiling as C.
diff --git a/contrib/libxml2-cmake/CMakeLists.txt b/contrib/libxml2-cmake/CMakeLists.txt
index 068662c7213..8fda0399ea3 100644
--- a/contrib/libxml2-cmake/CMakeLists.txt
+++ b/contrib/libxml2-cmake/CMakeLists.txt
@@ -1,54 +1,54 @@
-set(LIBXML2_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libxml2)
-set(LIBXML2_BINARY_DIR ${ClickHouse_BINARY_DIR}/contrib/libxml2)
+set(LIBXML2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libxml2")
+set(LIBXML2_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libxml2")
 
 set(SRCS
-    ${LIBXML2_SOURCE_DIR}/SAX.c
-    ${LIBXML2_SOURCE_DIR}/entities.c
-    ${LIBXML2_SOURCE_DIR}/encoding.c
-    ${LIBXML2_SOURCE_DIR}/error.c
-    ${LIBXML2_SOURCE_DIR}/parserInternals.c
-    ${LIBXML2_SOURCE_DIR}/parser.c
-    ${LIBXML2_SOURCE_DIR}/tree.c
-    ${LIBXML2_SOURCE_DIR}/hash.c
-    ${LIBXML2_SOURCE_DIR}/list.c
-    ${LIBXML2_SOURCE_DIR}/xmlIO.c
-    ${LIBXML2_SOURCE_DIR}/xmlmemory.c
-    ${LIBXML2_SOURCE_DIR}/uri.c
-    ${LIBXML2_SOURCE_DIR}/valid.c
-    ${LIBXML2_SOURCE_DIR}/xlink.c
-    ${LIBXML2_SOURCE_DIR}/HTMLparser.c
-    ${LIBXML2_SOURCE_DIR}/HTMLtree.c
-    ${LIBXML2_SOURCE_DIR}/debugXML.c
-    ${LIBXML2_SOURCE_DIR}/xpath.c
-    ${LIBXML2_SOURCE_DIR}/xpointer.c
-    ${LIBXML2_SOURCE_DIR}/xinclude.c
-    ${LIBXML2_SOURCE_DIR}/nanohttp.c
-    ${LIBXML2_SOURCE_DIR}/nanoftp.c
-    ${LIBXML2_SOURCE_DIR}/DOCBparser.c
-    ${LIBXML2_SOURCE_DIR}/catalog.c
-    ${LIBXML2_SOURCE_DIR}/globals.c
-    ${LIBXML2_SOURCE_DIR}/threads.c
-    ${LIBXML2_SOURCE_DIR}/c14n.c
-    ${LIBXML2_SOURCE_DIR}/xmlstring.c
-    ${LIBXML2_SOURCE_DIR}/buf.c
-    ${LIBXML2_SOURCE_DIR}/xmlregexp.c
-    ${LIBXML2_SOURCE_DIR}/xmlschemas.c
-    ${LIBXML2_SOURCE_DIR}/xmlschemastypes.c
-    ${LIBXML2_SOURCE_DIR}/xmlunicode.c
-    ${LIBXML2_SOURCE_DIR}/triostr.c
-    #${LIBXML2_SOURCE_DIR}/trio.c
-    ${LIBXML2_SOURCE_DIR}/xmlreader.c
-    ${LIBXML2_SOURCE_DIR}/relaxng.c
-    ${LIBXML2_SOURCE_DIR}/dict.c
-    ${LIBXML2_SOURCE_DIR}/SAX2.c
-    ${LIBXML2_SOURCE_DIR}/xmlwriter.c
-    ${LIBXML2_SOURCE_DIR}/legacy.c
-    ${LIBXML2_SOURCE_DIR}/chvalid.c
-    ${LIBXML2_SOURCE_DIR}/pattern.c
-    ${LIBXML2_SOURCE_DIR}/xmlsave.c
-    ${LIBXML2_SOURCE_DIR}/xmlmodule.c
-    ${LIBXML2_SOURCE_DIR}/schematron.c
-    ${LIBXML2_SOURCE_DIR}/xzlib.c
+    "${LIBXML2_SOURCE_DIR}/SAX.c"
+    "${LIBXML2_SOURCE_DIR}/entities.c"
+    "${LIBXML2_SOURCE_DIR}/encoding.c"
+    "${LIBXML2_SOURCE_DIR}/error.c"
+    "${LIBXML2_SOURCE_DIR}/parserInternals.c"
+    "${LIBXML2_SOURCE_DIR}/parser.c"
+    "${LIBXML2_SOURCE_DIR}/tree.c"
+    "${LIBXML2_SOURCE_DIR}/hash.c"
+    "${LIBXML2_SOURCE_DIR}/list.c"
+    "${LIBXML2_SOURCE_DIR}/xmlIO.c"
+    "${LIBXML2_SOURCE_DIR}/xmlmemory.c"
+    "${LIBXML2_SOURCE_DIR}/uri.c"
+    "${LIBXML2_SOURCE_DIR}/valid.c"
+    "${LIBXML2_SOURCE_DIR}/xlink.c"
+    "${LIBXML2_SOURCE_DIR}/HTMLparser.c"
+    "${LIBXML2_SOURCE_DIR}/HTMLtree.c"
+    "${LIBXML2_SOURCE_DIR}/debugXML.c"
+    "${LIBXML2_SOURCE_DIR}/xpath.c"
+    "${LIBXML2_SOURCE_DIR}/xpointer.c"
+    "${LIBXML2_SOURCE_DIR}/xinclude.c"
+    "${LIBXML2_SOURCE_DIR}/nanohttp.c"
+    "${LIBXML2_SOURCE_DIR}/nanoftp.c"
+    "${LIBXML2_SOURCE_DIR}/DOCBparser.c"
+    "${LIBXML2_SOURCE_DIR}/catalog.c"
+    "${LIBXML2_SOURCE_DIR}/globals.c"
+    "${LIBXML2_SOURCE_DIR}/threads.c"
+    "${LIBXML2_SOURCE_DIR}/c14n.c"
+    "${LIBXML2_SOURCE_DIR}/xmlstring.c"
+    "${LIBXML2_SOURCE_DIR}/buf.c"
+    "${LIBXML2_SOURCE_DIR}/xmlregexp.c"
+    "${LIBXML2_SOURCE_DIR}/xmlschemas.c"
+    "${LIBXML2_SOURCE_DIR}/xmlschemastypes.c"
+    "${LIBXML2_SOURCE_DIR}/xmlunicode.c"
+    "${LIBXML2_SOURCE_DIR}/triostr.c"
+    #"${LIBXML2_SOURCE_DIR}/trio.c"
+    "${LIBXML2_SOURCE_DIR}/xmlreader.c"
+    "${LIBXML2_SOURCE_DIR}/relaxng.c"
+    "${LIBXML2_SOURCE_DIR}/dict.c"
+    "${LIBXML2_SOURCE_DIR}/SAX2.c"
+    "${LIBXML2_SOURCE_DIR}/xmlwriter.c"
+    "${LIBXML2_SOURCE_DIR}/legacy.c"
+    "${LIBXML2_SOURCE_DIR}/chvalid.c"
+    "${LIBXML2_SOURCE_DIR}/pattern.c"
+    "${LIBXML2_SOURCE_DIR}/xmlsave.c"
+    "${LIBXML2_SOURCE_DIR}/xmlmodule.c"
+    "${LIBXML2_SOURCE_DIR}/schematron.c"
+    "${LIBXML2_SOURCE_DIR}/xzlib.c"
 )
 add_library(libxml2 ${SRCS})
 
@@ -57,6 +57,6 @@ if(M_LIBRARY)
     target_link_libraries(libxml2 PRIVATE ${M_LIBRARY})
 endif()
 
-target_include_directories(libxml2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/linux_x86_64/include)
-target_include_directories(libxml2 PUBLIC ${LIBXML2_SOURCE_DIR}/include)
+target_include_directories(libxml2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/linux_x86_64/include")
+target_include_directories(libxml2 PUBLIC "${LIBXML2_SOURCE_DIR}/include")
 target_include_directories(libxml2 SYSTEM BEFORE PRIVATE ${ZLIB_INCLUDE_DIR})
diff --git a/contrib/llvm b/contrib/llvm
index 8f24d507c1c..e5751459412 160000
--- a/contrib/llvm
+++ b/contrib/llvm
@@ -1 +1 @@
-Subproject commit 8f24d507c1cfeec66d27f48fe74518fd278e2d25
+Subproject commit e5751459412bce1391fb7a2e9bbc01e131bf72f1
diff --git a/contrib/lz4-cmake/CMakeLists.txt b/contrib/lz4-cmake/CMakeLists.txt
index 72510d72534..77e00d4295b 100644
--- a/contrib/lz4-cmake/CMakeLists.txt
+++ b/contrib/lz4-cmake/CMakeLists.txt
@@ -33,5 +33,5 @@ if (NOT EXTERNAL_LZ4_LIBRARY_FOUND)
     if (SANITIZE STREQUAL "undefined")
         target_compile_options (lz4 PRIVATE -fno-sanitize=undefined)
     endif ()
-    target_include_directories(lz4 PUBLIC ${LIBRARY_DIR}/lib)
+    target_include_directories(lz4 PUBLIC "${LIBRARY_DIR}/lib")
 endif ()
diff --git a/contrib/mariadb-connector-c b/contrib/mariadb-connector-c
index f4476ee7311..5f4034a3a63 160000
--- a/contrib/mariadb-connector-c
+++ b/contrib/mariadb-connector-c
@@ -1 +1 @@
-Subproject commit f4476ee7311b35b593750f6ae2cbdb62a4006374
+Subproject commit 5f4034a3a6376416504f17186c55fe401c6d8e5e
diff --git a/contrib/nanodbc b/contrib/nanodbc
new file mode 160000
index 00000000000..9fc45967551
--- /dev/null
+++ b/contrib/nanodbc
@@ -0,0 +1 @@
+Subproject commit 9fc459675515d491401727ec67fca38db721f28c
diff --git a/contrib/nanodbc-cmake/CMakeLists.txt b/contrib/nanodbc-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..26a030c3995
--- /dev/null
+++ b/contrib/nanodbc-cmake/CMakeLists.txt
@@ -0,0 +1,18 @@
+if (NOT USE_INTERNAL_NANODBC_LIBRARY)
+    return ()
+endif ()
+
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nanodbc")
+
+if (NOT TARGET unixodbc)
+    message(FATAL_ERROR "Configuration error: unixodbc is not a target")
+endif()
+
+set (SRCS
+    "${LIBRARY_DIR}/nanodbc/nanodbc.cpp"
+)
+
+add_library(nanodbc ${SRCS})
+
+target_link_libraries (nanodbc PUBLIC unixodbc)
+target_include_directories (nanodbc SYSTEM PUBLIC "${LIBRARY_DIR}/")
diff --git a/contrib/nuraft-cmake/CMakeLists.txt b/contrib/nuraft-cmake/CMakeLists.txt
index 83137fe73bf..725e86195e1 100644
--- a/contrib/nuraft-cmake/CMakeLists.txt
+++ b/contrib/nuraft-cmake/CMakeLists.txt
@@ -1,30 +1,30 @@
-set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/NuRaft)
+set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/NuRaft")
 
 set(SRCS
-    ${LIBRARY_DIR}/src/handle_priority.cxx
-    ${LIBRARY_DIR}/src/buffer_serializer.cxx
-    ${LIBRARY_DIR}/src/peer.cxx
-    ${LIBRARY_DIR}/src/global_mgr.cxx
-    ${LIBRARY_DIR}/src/buffer.cxx
-    ${LIBRARY_DIR}/src/asio_service.cxx
-    ${LIBRARY_DIR}/src/handle_client_request.cxx
-    ${LIBRARY_DIR}/src/raft_server.cxx
-    ${LIBRARY_DIR}/src/snapshot.cxx
-    ${LIBRARY_DIR}/src/handle_commit.cxx
-    ${LIBRARY_DIR}/src/error_code.cxx
-    ${LIBRARY_DIR}/src/crc32.cxx
-    ${LIBRARY_DIR}/src/handle_snapshot_sync.cxx
-    ${LIBRARY_DIR}/src/stat_mgr.cxx
-    ${LIBRARY_DIR}/src/handle_join_leave.cxx
-    ${LIBRARY_DIR}/src/handle_user_cmd.cxx
-    ${LIBRARY_DIR}/src/handle_custom_notification.cxx
-    ${LIBRARY_DIR}/src/handle_vote.cxx
-    ${LIBRARY_DIR}/src/launcher.cxx
-    ${LIBRARY_DIR}/src/srv_config.cxx
-    ${LIBRARY_DIR}/src/snapshot_sync_req.cxx
-    ${LIBRARY_DIR}/src/handle_timeout.cxx
-    ${LIBRARY_DIR}/src/handle_append_entries.cxx
-    ${LIBRARY_DIR}/src/cluster_config.cxx
+    "${LIBRARY_DIR}/src/handle_priority.cxx"
+    "${LIBRARY_DIR}/src/buffer_serializer.cxx"
+    "${LIBRARY_DIR}/src/peer.cxx"
+    "${LIBRARY_DIR}/src/global_mgr.cxx"
+    "${LIBRARY_DIR}/src/buffer.cxx"
+    "${LIBRARY_DIR}/src/asio_service.cxx"
+    "${LIBRARY_DIR}/src/handle_client_request.cxx"
+    "${LIBRARY_DIR}/src/raft_server.cxx"
+    "${LIBRARY_DIR}/src/snapshot.cxx"
+    "${LIBRARY_DIR}/src/handle_commit.cxx"
+    "${LIBRARY_DIR}/src/error_code.cxx"
+    "${LIBRARY_DIR}/src/crc32.cxx"
+    "${LIBRARY_DIR}/src/handle_snapshot_sync.cxx"
+    "${LIBRARY_DIR}/src/stat_mgr.cxx"
+    "${LIBRARY_DIR}/src/handle_join_leave.cxx"
+    "${LIBRARY_DIR}/src/handle_user_cmd.cxx"
+    "${LIBRARY_DIR}/src/handle_custom_notification.cxx"
+    "${LIBRARY_DIR}/src/handle_vote.cxx"
+    "${LIBRARY_DIR}/src/launcher.cxx"
+    "${LIBRARY_DIR}/src/srv_config.cxx"
+    "${LIBRARY_DIR}/src/snapshot_sync_req.cxx"
+    "${LIBRARY_DIR}/src/handle_timeout.cxx"
+    "${LIBRARY_DIR}/src/handle_append_entries.cxx"
+    "${LIBRARY_DIR}/src/cluster_config.cxx"
 )
 
 
@@ -37,9 +37,9 @@ else()
     target_compile_definitions(nuraft PRIVATE USE_BOOST_ASIO=1 BOOST_ASIO_STANDALONE=1)
 endif()
 
-target_include_directories (nuraft SYSTEM PRIVATE ${LIBRARY_DIR}/include/libnuraft)
+target_include_directories (nuraft SYSTEM PRIVATE "${LIBRARY_DIR}/include/libnuraft")
 # for some reason include "asio.h" directly without "boost/" prefix.
-target_include_directories (nuraft SYSTEM PRIVATE ${ClickHouse_SOURCE_DIR}/contrib/boost/boost)
+target_include_directories (nuraft SYSTEM PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/boost/boost")
 
 target_link_libraries (nuraft PRIVATE boost::headers_only boost::coroutine)
 
@@ -47,4 +47,4 @@ if(OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
     target_link_libraries (nuraft PRIVATE ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
 endif()
 
-target_include_directories (nuraft SYSTEM PUBLIC ${LIBRARY_DIR}/include)
+target_include_directories (nuraft SYSTEM PUBLIC "${LIBRARY_DIR}/include")
diff --git a/contrib/openldap-cmake/CMakeLists.txt b/contrib/openldap-cmake/CMakeLists.txt
index b0a5f4048ff..0892403bb62 100644
--- a/contrib/openldap-cmake/CMakeLists.txt
+++ b/contrib/openldap-cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(OPENLDAP_SOURCE_DIR ${ClickHouse_SOURCE_DIR}/contrib/openldap)
+set(OPENLDAP_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/openldap")
 
 # How these lists were generated?
 # I compiled the original OpenLDAP with it's original build system and copied the list of source files from build commands.
@@ -12,9 +12,9 @@ set(OPENLDAP_VERSION_STRING "2.5.X")
 
 macro(mkversion _lib_name)
     add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c
-        COMMAND ${CMAKE_COMMAND} -E env bash -c "${OPENLDAP_SOURCE_DIR}/build/mkversion -v '${OPENLDAP_VERSION_STRING}' liblber.la > ${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c"
-        MAIN_DEPENDENCY ${OPENLDAP_SOURCE_DIR}/build/mkversion
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c"
+        COMMAND ${CMAKE_COMMAND} -E env bash -c "${OPENLDAP_SOURCE_DIR}/build/mkversion -v '${OPENLDAP_VERSION_STRING}' liblber.la > \"${CMAKE_CURRENT_BINARY_DIR}/${_lib_name}-version.c\""
+        MAIN_DEPENDENCY "${OPENLDAP_SOURCE_DIR}/build/mkversion"
         WORKING_DIRECTORY ${OPENLDAP_SOURCE_DIR}
         VERBATIM
     )
@@ -37,23 +37,23 @@ endif()
 set(_extra_build_dir "${CMAKE_CURRENT_SOURCE_DIR}/${_system_name}_${_system_processor}")
 
 set(_lber_srcs
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/assert.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/decode.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/encode.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/io.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/bprint.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/debug.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/memory.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/options.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/sockbuf.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/liblber/stdio.c
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/assert.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/decode.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/encode.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/io.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/bprint.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/debug.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/memory.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/options.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/sockbuf.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/liblber/stdio.c"
 )
 
 mkversion(lber)
 
 add_library(lber ${_libs_type}
     ${_lber_srcs}
-    ${CMAKE_CURRENT_BINARY_DIR}/lber-version.c
+    "${CMAKE_CURRENT_BINARY_DIR}/lber-version.c"
 )
 
 target_link_libraries(lber
@@ -62,8 +62,8 @@ target_link_libraries(lber
 
 target_include_directories(lber
     PRIVATE ${_extra_build_dir}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/liblber
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/include"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/liblber"
     PRIVATE ${OPENSSL_INCLUDE_DIR}
 )
 
@@ -72,78 +72,78 @@ target_compile_definitions(lber
 )
 
 set(_ldap_srcs
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/abandon.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/cancel.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/filter.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/free.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getdn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getentry.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/getvalues.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/init.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/lbase64.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/msctrl.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap/psearchctrl.c
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/abandon.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/cancel.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/filter.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/free.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getdn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getentry.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/getvalues.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/init.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/lbase64.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/msctrl.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap/psearchctrl.c"
 )
 
 mkversion(ldap)
 
 add_library(ldap ${_libs_type}
     ${_ldap_srcs}
-    ${CMAKE_CURRENT_BINARY_DIR}/ldap-version.c
+    "${CMAKE_CURRENT_BINARY_DIR}/ldap-version.c"
 )
 
 target_link_libraries(ldap
@@ -153,8 +153,8 @@ target_link_libraries(ldap
 
 target_include_directories(ldap
     PRIVATE ${_extra_build_dir}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/libldap
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/include"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap"
     PRIVATE ${OPENSSL_INCLUDE_DIR}
 )
 
@@ -163,16 +163,16 @@ target_compile_definitions(ldap
 )
 
 set(_ldap_r_specific_srcs
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/threads.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rdwr.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/tpool.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rq.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_posix.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_thr.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_nt.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_pth.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_stub.c
-    ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_debug.c
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/threads.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rdwr.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/tpool.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rq.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_posix.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_thr.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_nt.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_pth.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_stub.c"
+    "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_debug.c"
 )
 
 mkversion(ldap_r)
@@ -180,7 +180,7 @@ mkversion(ldap_r)
 add_library(ldap_r ${_libs_type}
     ${_ldap_r_specific_srcs}
     ${_ldap_srcs}
-    ${CMAKE_CURRENT_BINARY_DIR}/ldap_r-version.c
+    "${CMAKE_CURRENT_BINARY_DIR}/ldap_r-version.c"
 )
 
 target_link_libraries(ldap_r
@@ -190,9 +190,9 @@ target_link_libraries(ldap_r
 
 target_include_directories(ldap_r
     PRIVATE ${_extra_build_dir}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/include
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/libldap_r
-    PRIVATE ${OPENLDAP_SOURCE_DIR}/libraries/libldap
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/include"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r"
+    PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap"
     PRIVATE ${OPENSSL_INCLUDE_DIR}
 )
 
diff --git a/contrib/openldap-cmake/darwin_aarch64/include/lber_types.h b/contrib/openldap-cmake/darwin_aarch64/include/lber_types.h
new file mode 100644
index 00000000000..dbd59430527
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_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/darwin_aarch64/include/ldap_config.h b/contrib/openldap-cmake/darwin_aarch64/include/ldap_config.h
new file mode 100644
index 00000000000..89f7b40b884
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_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/darwin_aarch64/include/ldap_features.h b/contrib/openldap-cmake/darwin_aarch64/include/ldap_features.h
new file mode 100644
index 00000000000..f0cc7c3626f
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_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/darwin_aarch64/include/portable.h b/contrib/openldap-cmake/darwin_aarch64/include/portable.h
new file mode 100644
index 00000000000..fdf4e89017e
--- /dev/null
+++ b/contrib/openldap-cmake/darwin_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 */
+/* #undef GETHOSTBYADDR_R_NARGS */
+
+/* set to the number of arguments gethostbyname_r() expects */
+/* #undef GETHOSTBYNAME_R_NARGS */
+
+/* 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. */
+/* #undef HAVE_GETHOSTBYADDR_R */
+
+/* Define to 1 if you have the `gethostbyname_r' function. */
+/* #undef HAVE_GETHOSTBYNAME_R */
+
+/* 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. */
+/* #undef HAVE_LIBUTIL_H */
+
+/* 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. */
+/* #undef HAVE_MEMRCHR */
+
+/* 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. */
+/* #undef HAVE_PTHREAD_YIELD */
+
+/* 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. */
+#define HAVE_SGTTY_H 1
+
+/* 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/poco b/contrib/poco
index 83beecccb09..59945069080 160000
--- a/contrib/poco
+++ b/contrib/poco
@@ -1 +1 @@
-Subproject commit 83beecccb09eec0c9fd2669cacea03ede1d9f138
+Subproject commit 5994506908028612869fee627d68d8212dfe7c1e
diff --git a/contrib/poco-cmake/CMakeLists.txt b/contrib/poco-cmake/CMakeLists.txt
index 1d2dc7b873e..d173f35b9bf 100644
--- a/contrib/poco-cmake/CMakeLists.txt
+++ b/contrib/poco-cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/poco)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/poco")
 
 add_subdirectory (Crypto)
 add_subdirectory (Data)
diff --git a/contrib/poco-cmake/Crypto/CMakeLists.txt b/contrib/poco-cmake/Crypto/CMakeLists.txt
index 1685e96728b..e93ed5cf17d 100644
--- a/contrib/poco-cmake/Crypto/CMakeLists.txt
+++ b/contrib/poco-cmake/Crypto/CMakeLists.txt
@@ -1,35 +1,35 @@
 if (ENABLE_SSL)
     if (USE_INTERNAL_POCO_LIBRARY)
         set (SRCS
-            ${LIBRARY_DIR}/Crypto/src/Cipher.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherFactory.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/CipherKeyImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/CryptoException.cpp
-            ${LIBRARY_DIR}/Crypto/src/CryptoStream.cpp
-            ${LIBRARY_DIR}/Crypto/src/CryptoTransform.cpp
-            ${LIBRARY_DIR}/Crypto/src/DigestEngine.cpp
-            ${LIBRARY_DIR}/Crypto/src/ECDSADigestEngine.cpp
-            ${LIBRARY_DIR}/Crypto/src/ECKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/ECKeyImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/EVPPKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/KeyPair.cpp
-            ${LIBRARY_DIR}/Crypto/src/KeyPairImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/OpenSSLInitializer.cpp
-            ${LIBRARY_DIR}/Crypto/src/PKCS12Container.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSACipherImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSADigestEngine.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSAKey.cpp
-            ${LIBRARY_DIR}/Crypto/src/RSAKeyImpl.cpp
-            ${LIBRARY_DIR}/Crypto/src/X509Certificate.cpp
+            "${LIBRARY_DIR}/Crypto/src/Cipher.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherFactory.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CipherKeyImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CryptoException.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CryptoStream.cpp"
+            "${LIBRARY_DIR}/Crypto/src/CryptoTransform.cpp"
+            "${LIBRARY_DIR}/Crypto/src/DigestEngine.cpp"
+            "${LIBRARY_DIR}/Crypto/src/ECDSADigestEngine.cpp"
+            "${LIBRARY_DIR}/Crypto/src/ECKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/ECKeyImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/EVPPKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/KeyPair.cpp"
+            "${LIBRARY_DIR}/Crypto/src/KeyPairImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/OpenSSLInitializer.cpp"
+            "${LIBRARY_DIR}/Crypto/src/PKCS12Container.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSACipherImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSADigestEngine.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSAKey.cpp"
+            "${LIBRARY_DIR}/Crypto/src/RSAKeyImpl.cpp"
+            "${LIBRARY_DIR}/Crypto/src/X509Certificate.cpp"
         )
 
         add_library (_poco_crypto ${SRCS})
         add_library (Poco::Crypto ALIAS _poco_crypto)
 
         target_compile_options (_poco_crypto PRIVATE -Wno-newline-eof)
-        target_include_directories (_poco_crypto SYSTEM PUBLIC ${LIBRARY_DIR}/Crypto/include)
+        target_include_directories (_poco_crypto SYSTEM PUBLIC "${LIBRARY_DIR}/Crypto/include")
         target_link_libraries (_poco_crypto PUBLIC Poco::Foundation ssl crypto)
     else ()
         add_library (Poco::Crypto UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/Data/CMakeLists.txt b/contrib/poco-cmake/Data/CMakeLists.txt
index 1c185df8961..4fdd755b45d 100644
--- a/contrib/poco-cmake/Data/CMakeLists.txt
+++ b/contrib/poco-cmake/Data/CMakeLists.txt
@@ -1,40 +1,40 @@
 if (USE_INTERNAL_POCO_LIBRARY)
     set (SRCS
-        ${LIBRARY_DIR}/Data/src/AbstractBinder.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractBinding.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractExtraction.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractExtractor.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractPreparation.cpp
-        ${LIBRARY_DIR}/Data/src/AbstractPreparator.cpp
-        ${LIBRARY_DIR}/Data/src/ArchiveStrategy.cpp
-        ${LIBRARY_DIR}/Data/src/Bulk.cpp
-        ${LIBRARY_DIR}/Data/src/Connector.cpp
-        ${LIBRARY_DIR}/Data/src/DataException.cpp
-        ${LIBRARY_DIR}/Data/src/Date.cpp
-        ${LIBRARY_DIR}/Data/src/DynamicLOB.cpp
-        ${LIBRARY_DIR}/Data/src/Limit.cpp
-        ${LIBRARY_DIR}/Data/src/MetaColumn.cpp
-        ${LIBRARY_DIR}/Data/src/PooledSessionHolder.cpp
-        ${LIBRARY_DIR}/Data/src/PooledSessionImpl.cpp
-        ${LIBRARY_DIR}/Data/src/Position.cpp
-        ${LIBRARY_DIR}/Data/src/Range.cpp
-        ${LIBRARY_DIR}/Data/src/RecordSet.cpp
-        ${LIBRARY_DIR}/Data/src/Row.cpp
-        ${LIBRARY_DIR}/Data/src/RowFilter.cpp
-        ${LIBRARY_DIR}/Data/src/RowFormatter.cpp
-        ${LIBRARY_DIR}/Data/src/RowIterator.cpp
-        ${LIBRARY_DIR}/Data/src/Session.cpp
-        ${LIBRARY_DIR}/Data/src/SessionFactory.cpp
-        ${LIBRARY_DIR}/Data/src/SessionImpl.cpp
-        ${LIBRARY_DIR}/Data/src/SessionPool.cpp
-        ${LIBRARY_DIR}/Data/src/SessionPoolContainer.cpp
-        ${LIBRARY_DIR}/Data/src/SimpleRowFormatter.cpp
-        ${LIBRARY_DIR}/Data/src/SQLChannel.cpp
-        ${LIBRARY_DIR}/Data/src/Statement.cpp
-        ${LIBRARY_DIR}/Data/src/StatementCreator.cpp
-        ${LIBRARY_DIR}/Data/src/StatementImpl.cpp
-        ${LIBRARY_DIR}/Data/src/Time.cpp
-        ${LIBRARY_DIR}/Data/src/Transaction.cpp
+        "${LIBRARY_DIR}/Data/src/AbstractBinder.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractBinding.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractExtraction.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractExtractor.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractPreparation.cpp"
+        "${LIBRARY_DIR}/Data/src/AbstractPreparator.cpp"
+        "${LIBRARY_DIR}/Data/src/ArchiveStrategy.cpp"
+        "${LIBRARY_DIR}/Data/src/Bulk.cpp"
+        "${LIBRARY_DIR}/Data/src/Connector.cpp"
+        "${LIBRARY_DIR}/Data/src/DataException.cpp"
+        "${LIBRARY_DIR}/Data/src/Date.cpp"
+        "${LIBRARY_DIR}/Data/src/DynamicLOB.cpp"
+        "${LIBRARY_DIR}/Data/src/Limit.cpp"
+        "${LIBRARY_DIR}/Data/src/MetaColumn.cpp"
+        "${LIBRARY_DIR}/Data/src/PooledSessionHolder.cpp"
+        "${LIBRARY_DIR}/Data/src/PooledSessionImpl.cpp"
+        "${LIBRARY_DIR}/Data/src/Position.cpp"
+        "${LIBRARY_DIR}/Data/src/Range.cpp"
+        "${LIBRARY_DIR}/Data/src/RecordSet.cpp"
+        "${LIBRARY_DIR}/Data/src/Row.cpp"
+        "${LIBRARY_DIR}/Data/src/RowFilter.cpp"
+        "${LIBRARY_DIR}/Data/src/RowFormatter.cpp"
+        "${LIBRARY_DIR}/Data/src/RowIterator.cpp"
+        "${LIBRARY_DIR}/Data/src/Session.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionFactory.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionImpl.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionPool.cpp"
+        "${LIBRARY_DIR}/Data/src/SessionPoolContainer.cpp"
+        "${LIBRARY_DIR}/Data/src/SimpleRowFormatter.cpp"
+        "${LIBRARY_DIR}/Data/src/SQLChannel.cpp"
+        "${LIBRARY_DIR}/Data/src/Statement.cpp"
+        "${LIBRARY_DIR}/Data/src/StatementCreator.cpp"
+        "${LIBRARY_DIR}/Data/src/StatementImpl.cpp"
+        "${LIBRARY_DIR}/Data/src/Time.cpp"
+        "${LIBRARY_DIR}/Data/src/Transaction.cpp"
     )
 
     add_library (_poco_data ${SRCS})
@@ -43,7 +43,7 @@ if (USE_INTERNAL_POCO_LIBRARY)
     if (COMPILER_GCC)
         target_compile_options (_poco_data PRIVATE -Wno-deprecated-copy)
     endif ()
-    target_include_directories (_poco_data SYSTEM PUBLIC ${LIBRARY_DIR}/Data/include)
+    target_include_directories (_poco_data SYSTEM PUBLIC "${LIBRARY_DIR}/Data/include")
     target_link_libraries (_poco_data PUBLIC Poco::Foundation)
 else ()
     # NOTE: don't know why, but the GLOBAL is required here.
diff --git a/contrib/poco-cmake/Data/ODBC/CMakeLists.txt b/contrib/poco-cmake/Data/ODBC/CMakeLists.txt
index cd7c5ef2863..a3561304541 100644
--- a/contrib/poco-cmake/Data/ODBC/CMakeLists.txt
+++ b/contrib/poco-cmake/Data/ODBC/CMakeLists.txt
@@ -5,27 +5,27 @@ if (ENABLE_ODBC)
 
     if (USE_INTERNAL_POCO_LIBRARY)
         set (SRCS
-            ${LIBRARY_DIR}/Data/ODBC/src/Binder.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ConnectionHandle.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Connector.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/EnvironmentHandle.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Extractor.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ODBCException.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ODBCMetaColumn.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/ODBCStatementImpl.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Parameter.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Preparator.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/SessionImpl.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/TypeInfo.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Unicode.cpp
-            ${LIBRARY_DIR}/Data/ODBC/src/Utility.cpp
+            "${LIBRARY_DIR}/Data/ODBC/src/Binder.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ConnectionHandle.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Connector.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/EnvironmentHandle.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Extractor.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ODBCException.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ODBCMetaColumn.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/ODBCStatementImpl.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Parameter.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Preparator.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/SessionImpl.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/TypeInfo.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Unicode.cpp"
+            "${LIBRARY_DIR}/Data/ODBC/src/Utility.cpp"
         )
 
         add_library (_poco_data_odbc ${SRCS})
         add_library (Poco::Data::ODBC ALIAS _poco_data_odbc)
 
         target_compile_options (_poco_data_odbc PRIVATE -Wno-unused-variable)
-        target_include_directories (_poco_data_odbc SYSTEM PUBLIC ${LIBRARY_DIR}/Data/ODBC/include)
+        target_include_directories (_poco_data_odbc SYSTEM PUBLIC "${LIBRARY_DIR}/Data/ODBC/include")
         target_link_libraries (_poco_data_odbc PUBLIC Poco::Data unixodbc)
     else ()
         add_library (Poco::Data::ODBC UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/Foundation/CMakeLists.txt b/contrib/poco-cmake/Foundation/CMakeLists.txt
index f4647461ec0..a9a4933873c 100644
--- a/contrib/poco-cmake/Foundation/CMakeLists.txt
+++ b/contrib/poco-cmake/Foundation/CMakeLists.txt
@@ -2,27 +2,27 @@ if (USE_INTERNAL_POCO_LIBRARY)
     # Foundation (pcre)
 
     set (SRCS_PCRE
-        ${LIBRARY_DIR}/Foundation/src/pcre_config.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_byte_order.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_chartables.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_compile.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_exec.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_fullinfo.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_globals.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_maketables.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_newline.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_ord2utf8.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_study.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_tables.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_dfa_exec.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_get.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_jit_compile.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_refcount.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_string_utils.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_version.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_ucd.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_valid_utf8.c
-        ${LIBRARY_DIR}/Foundation/src/pcre_xclass.c
+        "${LIBRARY_DIR}/Foundation/src/pcre_config.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_byte_order.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_chartables.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_compile.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_exec.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_fullinfo.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_globals.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_maketables.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_newline.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_ord2utf8.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_study.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_tables.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_dfa_exec.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_get.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_jit_compile.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_refcount.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_string_utils.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_version.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_ucd.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_valid_utf8.c"
+        "${LIBRARY_DIR}/Foundation/src/pcre_xclass.c"
     )
 
     add_library (_poco_foundation_pcre ${SRCS_PCRE})
@@ -33,159 +33,159 @@ if (USE_INTERNAL_POCO_LIBRARY)
     # Foundation
 
     set (SRCS
-        ${LIBRARY_DIR}/Foundation/src/AbstractObserver.cpp
-        ${LIBRARY_DIR}/Foundation/src/ActiveDispatcher.cpp
-        ${LIBRARY_DIR}/Foundation/src/ArchiveStrategy.cpp
-        ${LIBRARY_DIR}/Foundation/src/Ascii.cpp
-        ${LIBRARY_DIR}/Foundation/src/ASCIIEncoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/AsyncChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/AtomicCounter.cpp
-        ${LIBRARY_DIR}/Foundation/src/Base32Decoder.cpp
-        ${LIBRARY_DIR}/Foundation/src/Base32Encoder.cpp
-        ${LIBRARY_DIR}/Foundation/src/Base64Decoder.cpp
-        ${LIBRARY_DIR}/Foundation/src/Base64Encoder.cpp
-        ${LIBRARY_DIR}/Foundation/src/BinaryReader.cpp
-        ${LIBRARY_DIR}/Foundation/src/BinaryWriter.cpp
-        ${LIBRARY_DIR}/Foundation/src/Bugcheck.cpp
-        ${LIBRARY_DIR}/Foundation/src/ByteOrder.cpp
-        ${LIBRARY_DIR}/Foundation/src/Channel.cpp
-        ${LIBRARY_DIR}/Foundation/src/Checksum.cpp
-        ${LIBRARY_DIR}/Foundation/src/Clock.cpp
-        ${LIBRARY_DIR}/Foundation/src/Condition.cpp
-        ${LIBRARY_DIR}/Foundation/src/Configurable.cpp
-        ${LIBRARY_DIR}/Foundation/src/ConsoleChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/CountingStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/DateTime.cpp
-        ${LIBRARY_DIR}/Foundation/src/DateTimeFormat.cpp
-        ${LIBRARY_DIR}/Foundation/src/DateTimeFormatter.cpp
-        ${LIBRARY_DIR}/Foundation/src/DateTimeParser.cpp
-        ${LIBRARY_DIR}/Foundation/src/Debugger.cpp
-        ${LIBRARY_DIR}/Foundation/src/DeflatingStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/DigestEngine.cpp
-        ${LIBRARY_DIR}/Foundation/src/DigestStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/DirectoryIterator.cpp
-        ${LIBRARY_DIR}/Foundation/src/DirectoryIteratorStrategy.cpp
-        ${LIBRARY_DIR}/Foundation/src/DirectoryWatcher.cpp
-        ${LIBRARY_DIR}/Foundation/src/Environment.cpp
-        ${LIBRARY_DIR}/Foundation/src/Error.cpp
-        ${LIBRARY_DIR}/Foundation/src/ErrorHandler.cpp
-        ${LIBRARY_DIR}/Foundation/src/Event.cpp
-        ${LIBRARY_DIR}/Foundation/src/EventArgs.cpp
-        ${LIBRARY_DIR}/Foundation/src/EventChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/Exception.cpp
-        ${LIBRARY_DIR}/Foundation/src/FIFOBufferStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/File.cpp
-        ${LIBRARY_DIR}/Foundation/src/FileChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/FileStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/FileStreamFactory.cpp
-        ${LIBRARY_DIR}/Foundation/src/Format.cpp
-        ${LIBRARY_DIR}/Foundation/src/Formatter.cpp
-        ${LIBRARY_DIR}/Foundation/src/FormattingChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/FPEnvironment.cpp
-        ${LIBRARY_DIR}/Foundation/src/Glob.cpp
-        ${LIBRARY_DIR}/Foundation/src/Hash.cpp
-        ${LIBRARY_DIR}/Foundation/src/HashStatistic.cpp
-        ${LIBRARY_DIR}/Foundation/src/HexBinaryDecoder.cpp
-        ${LIBRARY_DIR}/Foundation/src/HexBinaryEncoder.cpp
-        ${LIBRARY_DIR}/Foundation/src/InflatingStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/JSONString.cpp
-        ${LIBRARY_DIR}/Foundation/src/Latin1Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/Latin2Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/Latin9Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/LineEndingConverter.cpp
-        ${LIBRARY_DIR}/Foundation/src/LocalDateTime.cpp
-        ${LIBRARY_DIR}/Foundation/src/LogFile.cpp
-        ${LIBRARY_DIR}/Foundation/src/Logger.cpp
-        ${LIBRARY_DIR}/Foundation/src/LoggingFactory.cpp
-        ${LIBRARY_DIR}/Foundation/src/LoggingRegistry.cpp
-        ${LIBRARY_DIR}/Foundation/src/LogStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/Manifest.cpp
-        ${LIBRARY_DIR}/Foundation/src/MD4Engine.cpp
-        ${LIBRARY_DIR}/Foundation/src/MD5Engine.cpp
-        ${LIBRARY_DIR}/Foundation/src/MemoryPool.cpp
-        ${LIBRARY_DIR}/Foundation/src/MemoryStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/Message.cpp
-        ${LIBRARY_DIR}/Foundation/src/Mutex.cpp
-        ${LIBRARY_DIR}/Foundation/src/NamedEvent.cpp
-        ${LIBRARY_DIR}/Foundation/src/NamedMutex.cpp
-        ${LIBRARY_DIR}/Foundation/src/NestedDiagnosticContext.cpp
-        ${LIBRARY_DIR}/Foundation/src/Notification.cpp
-        ${LIBRARY_DIR}/Foundation/src/NotificationCenter.cpp
-        ${LIBRARY_DIR}/Foundation/src/NotificationQueue.cpp
-        ${LIBRARY_DIR}/Foundation/src/NullChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/NullStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/NumberFormatter.cpp
-        ${LIBRARY_DIR}/Foundation/src/NumberParser.cpp
-        ${LIBRARY_DIR}/Foundation/src/NumericString.cpp
-        ${LIBRARY_DIR}/Foundation/src/Path.cpp
-        ${LIBRARY_DIR}/Foundation/src/PatternFormatter.cpp
-        ${LIBRARY_DIR}/Foundation/src/Pipe.cpp
-        ${LIBRARY_DIR}/Foundation/src/PipeImpl.cpp
-        ${LIBRARY_DIR}/Foundation/src/PipeStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/PriorityNotificationQueue.cpp
-        ${LIBRARY_DIR}/Foundation/src/Process.cpp
-        ${LIBRARY_DIR}/Foundation/src/PurgeStrategy.cpp
-        ${LIBRARY_DIR}/Foundation/src/Random.cpp
-        ${LIBRARY_DIR}/Foundation/src/RandomStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/RefCountedObject.cpp
-        ${LIBRARY_DIR}/Foundation/src/RegularExpression.cpp
-        ${LIBRARY_DIR}/Foundation/src/RotateStrategy.cpp
-        ${LIBRARY_DIR}/Foundation/src/Runnable.cpp
-        ${LIBRARY_DIR}/Foundation/src/RWLock.cpp
-        ${LIBRARY_DIR}/Foundation/src/Semaphore.cpp
-        ${LIBRARY_DIR}/Foundation/src/SHA1Engine.cpp
-        ${LIBRARY_DIR}/Foundation/src/SharedLibrary.cpp
-        ${LIBRARY_DIR}/Foundation/src/SharedMemory.cpp
-        ${LIBRARY_DIR}/Foundation/src/SignalHandler.cpp
-        ${LIBRARY_DIR}/Foundation/src/SimpleFileChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/SortedDirectoryIterator.cpp
-        ${LIBRARY_DIR}/Foundation/src/SplitterChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/Stopwatch.cpp
-        ${LIBRARY_DIR}/Foundation/src/StreamChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/StreamConverter.cpp
-        ${LIBRARY_DIR}/Foundation/src/StreamCopier.cpp
-        ${LIBRARY_DIR}/Foundation/src/StreamTokenizer.cpp
-        ${LIBRARY_DIR}/Foundation/src/String.cpp
-        ${LIBRARY_DIR}/Foundation/src/StringTokenizer.cpp
-        ${LIBRARY_DIR}/Foundation/src/SynchronizedObject.cpp
-        ${LIBRARY_DIR}/Foundation/src/SyslogChannel.cpp
-        ${LIBRARY_DIR}/Foundation/src/Task.cpp
-        ${LIBRARY_DIR}/Foundation/src/TaskManager.cpp
-        ${LIBRARY_DIR}/Foundation/src/TaskNotification.cpp
-        ${LIBRARY_DIR}/Foundation/src/TeeStream.cpp
-        ${LIBRARY_DIR}/Foundation/src/TemporaryFile.cpp
-        ${LIBRARY_DIR}/Foundation/src/TextBufferIterator.cpp
-        ${LIBRARY_DIR}/Foundation/src/TextConverter.cpp
-        ${LIBRARY_DIR}/Foundation/src/TextEncoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/TextIterator.cpp
-        ${LIBRARY_DIR}/Foundation/src/Thread.cpp
-        ${LIBRARY_DIR}/Foundation/src/ThreadLocal.cpp
-        ${LIBRARY_DIR}/Foundation/src/ThreadPool.cpp
-        ${LIBRARY_DIR}/Foundation/src/ThreadTarget.cpp
-        ${LIBRARY_DIR}/Foundation/src/TimedNotificationQueue.cpp
-        ${LIBRARY_DIR}/Foundation/src/Timer.cpp
-        ${LIBRARY_DIR}/Foundation/src/Timespan.cpp
-        ${LIBRARY_DIR}/Foundation/src/Timestamp.cpp
-        ${LIBRARY_DIR}/Foundation/src/Timezone.cpp
-        ${LIBRARY_DIR}/Foundation/src/Token.cpp
-        ${LIBRARY_DIR}/Foundation/src/Unicode.cpp
-        ${LIBRARY_DIR}/Foundation/src/UnicodeConverter.cpp
-        ${LIBRARY_DIR}/Foundation/src/URI.cpp
-        ${LIBRARY_DIR}/Foundation/src/URIStreamFactory.cpp
-        ${LIBRARY_DIR}/Foundation/src/URIStreamOpener.cpp
-        ${LIBRARY_DIR}/Foundation/src/UTF16Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/UTF32Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/UTF8Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/UTF8String.cpp
-        ${LIBRARY_DIR}/Foundation/src/UUID.cpp
-        ${LIBRARY_DIR}/Foundation/src/UUIDGenerator.cpp
-        ${LIBRARY_DIR}/Foundation/src/Var.cpp
-        ${LIBRARY_DIR}/Foundation/src/VarHolder.cpp
-        ${LIBRARY_DIR}/Foundation/src/VarIterator.cpp
-        ${LIBRARY_DIR}/Foundation/src/Void.cpp
-        ${LIBRARY_DIR}/Foundation/src/Windows1250Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/Windows1251Encoding.cpp
-        ${LIBRARY_DIR}/Foundation/src/Windows1252Encoding.cpp
+        "${LIBRARY_DIR}/Foundation/src/AbstractObserver.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ActiveDispatcher.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ArchiveStrategy.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Ascii.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ASCIIEncoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/AsyncChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/AtomicCounter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Base32Decoder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Base32Encoder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Base64Decoder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Base64Encoder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/BinaryReader.cpp"
+        "${LIBRARY_DIR}/Foundation/src/BinaryWriter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Bugcheck.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ByteOrder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Channel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Checksum.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Clock.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Condition.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Configurable.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ConsoleChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/CountingStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DateTime.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DateTimeFormat.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DateTimeFormatter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DateTimeParser.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Debugger.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DeflatingStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DigestEngine.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DigestStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DirectoryIterator.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DirectoryIteratorStrategy.cpp"
+        "${LIBRARY_DIR}/Foundation/src/DirectoryWatcher.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Environment.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Error.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ErrorHandler.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Event.cpp"
+        "${LIBRARY_DIR}/Foundation/src/EventArgs.cpp"
+        "${LIBRARY_DIR}/Foundation/src/EventChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Exception.cpp"
+        "${LIBRARY_DIR}/Foundation/src/FIFOBufferStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/File.cpp"
+        "${LIBRARY_DIR}/Foundation/src/FileChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/FileStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/FileStreamFactory.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Format.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Formatter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/FormattingChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/FPEnvironment.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Glob.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Hash.cpp"
+        "${LIBRARY_DIR}/Foundation/src/HashStatistic.cpp"
+        "${LIBRARY_DIR}/Foundation/src/HexBinaryDecoder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/HexBinaryEncoder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/InflatingStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/JSONString.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Latin1Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Latin2Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Latin9Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/LineEndingConverter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/LocalDateTime.cpp"
+        "${LIBRARY_DIR}/Foundation/src/LogFile.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Logger.cpp"
+        "${LIBRARY_DIR}/Foundation/src/LoggingFactory.cpp"
+        "${LIBRARY_DIR}/Foundation/src/LoggingRegistry.cpp"
+        "${LIBRARY_DIR}/Foundation/src/LogStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Manifest.cpp"
+        "${LIBRARY_DIR}/Foundation/src/MD4Engine.cpp"
+        "${LIBRARY_DIR}/Foundation/src/MD5Engine.cpp"
+        "${LIBRARY_DIR}/Foundation/src/MemoryPool.cpp"
+        "${LIBRARY_DIR}/Foundation/src/MemoryStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Message.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Mutex.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NamedEvent.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NamedMutex.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NestedDiagnosticContext.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Notification.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NotificationCenter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NotificationQueue.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NullChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NullStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NumberFormatter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NumberParser.cpp"
+        "${LIBRARY_DIR}/Foundation/src/NumericString.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Path.cpp"
+        "${LIBRARY_DIR}/Foundation/src/PatternFormatter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Pipe.cpp"
+        "${LIBRARY_DIR}/Foundation/src/PipeImpl.cpp"
+        "${LIBRARY_DIR}/Foundation/src/PipeStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/PriorityNotificationQueue.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Process.cpp"
+        "${LIBRARY_DIR}/Foundation/src/PurgeStrategy.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Random.cpp"
+        "${LIBRARY_DIR}/Foundation/src/RandomStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/RefCountedObject.cpp"
+        "${LIBRARY_DIR}/Foundation/src/RegularExpression.cpp"
+        "${LIBRARY_DIR}/Foundation/src/RotateStrategy.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Runnable.cpp"
+        "${LIBRARY_DIR}/Foundation/src/RWLock.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Semaphore.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SHA1Engine.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SharedLibrary.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SharedMemory.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SignalHandler.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SimpleFileChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SortedDirectoryIterator.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SplitterChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Stopwatch.cpp"
+        "${LIBRARY_DIR}/Foundation/src/StreamChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/StreamConverter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/StreamCopier.cpp"
+        "${LIBRARY_DIR}/Foundation/src/StreamTokenizer.cpp"
+        "${LIBRARY_DIR}/Foundation/src/String.cpp"
+        "${LIBRARY_DIR}/Foundation/src/StringTokenizer.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SynchronizedObject.cpp"
+        "${LIBRARY_DIR}/Foundation/src/SyslogChannel.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Task.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TaskManager.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TaskNotification.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TeeStream.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TemporaryFile.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TextBufferIterator.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TextConverter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TextEncoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TextIterator.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Thread.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ThreadLocal.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ThreadPool.cpp"
+        "${LIBRARY_DIR}/Foundation/src/ThreadTarget.cpp"
+        "${LIBRARY_DIR}/Foundation/src/TimedNotificationQueue.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Timer.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Timespan.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Timestamp.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Timezone.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Token.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Unicode.cpp"
+        "${LIBRARY_DIR}/Foundation/src/UnicodeConverter.cpp"
+        "${LIBRARY_DIR}/Foundation/src/URI.cpp"
+        "${LIBRARY_DIR}/Foundation/src/URIStreamFactory.cpp"
+        "${LIBRARY_DIR}/Foundation/src/URIStreamOpener.cpp"
+        "${LIBRARY_DIR}/Foundation/src/UTF16Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/UTF32Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/UTF8Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/UTF8String.cpp"
+        "${LIBRARY_DIR}/Foundation/src/UUID.cpp"
+        "${LIBRARY_DIR}/Foundation/src/UUIDGenerator.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Var.cpp"
+        "${LIBRARY_DIR}/Foundation/src/VarHolder.cpp"
+        "${LIBRARY_DIR}/Foundation/src/VarIterator.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Void.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Windows1250Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Windows1251Encoding.cpp"
+        "${LIBRARY_DIR}/Foundation/src/Windows1252Encoding.cpp"
     )
 
     add_library (_poco_foundation ${SRCS})
@@ -221,7 +221,7 @@ if (USE_INTERNAL_POCO_LIBRARY)
             POCO_ENABLE_CPP11
             POCO_OS_FAMILY_UNIX
     )
-    target_include_directories (_poco_foundation SYSTEM PUBLIC ${LIBRARY_DIR}/Foundation/include)
+    target_include_directories (_poco_foundation SYSTEM PUBLIC "${LIBRARY_DIR}/Foundation/include")
     target_link_libraries (_poco_foundation PRIVATE Poco::Foundation::PCRE ${ZLIB_LIBRARIES})
 else ()
     add_library (Poco::Foundation UNKNOWN IMPORTED GLOBAL)
@@ -233,3 +233,10 @@ else ()
 
     message (STATUS "Using Poco::Foundation: ${LIBRARY_POCO_FOUNDATION} ${INCLUDE_POCO_FOUNDATION}")
 endif ()
+
+if(OS_DARWIN AND ARCH_AARCH64)
+    target_compile_definitions (_poco_foundation
+        PRIVATE
+            POCO_NO_STAT64
+    )
+endif()
diff --git a/contrib/poco-cmake/JSON/CMakeLists.txt b/contrib/poco-cmake/JSON/CMakeLists.txt
index 89054cf225d..7033b800d5d 100644
--- a/contrib/poco-cmake/JSON/CMakeLists.txt
+++ b/contrib/poco-cmake/JSON/CMakeLists.txt
@@ -2,7 +2,7 @@ if (USE_INTERNAL_POCO_LIBRARY)
     # Poco::JSON (pdjson)
 
     set (SRCS_PDJSON
-        ${LIBRARY_DIR}/JSON/src/pdjson.c
+        "${LIBRARY_DIR}/JSON/src/pdjson.c"
     )
 
     add_library (_poco_json_pdjson ${SRCS_PDJSON})
@@ -11,24 +11,24 @@ if (USE_INTERNAL_POCO_LIBRARY)
     # Poco::JSON
 
     set (SRCS
-        ${LIBRARY_DIR}/JSON/src/Array.cpp
-        ${LIBRARY_DIR}/JSON/src/Handler.cpp
-        ${LIBRARY_DIR}/JSON/src/JSONException.cpp
-        ${LIBRARY_DIR}/JSON/src/Object.cpp
-        ${LIBRARY_DIR}/JSON/src/ParseHandler.cpp
-        ${LIBRARY_DIR}/JSON/src/Parser.cpp
-        ${LIBRARY_DIR}/JSON/src/ParserImpl.cpp
-        ${LIBRARY_DIR}/JSON/src/PrintHandler.cpp
-        ${LIBRARY_DIR}/JSON/src/Query.cpp
-        ${LIBRARY_DIR}/JSON/src/Stringifier.cpp
-        ${LIBRARY_DIR}/JSON/src/Template.cpp
-        ${LIBRARY_DIR}/JSON/src/TemplateCache.cpp
+        "${LIBRARY_DIR}/JSON/src/Array.cpp"
+        "${LIBRARY_DIR}/JSON/src/Handler.cpp"
+        "${LIBRARY_DIR}/JSON/src/JSONException.cpp"
+        "${LIBRARY_DIR}/JSON/src/Object.cpp"
+        "${LIBRARY_DIR}/JSON/src/ParseHandler.cpp"
+        "${LIBRARY_DIR}/JSON/src/Parser.cpp"
+        "${LIBRARY_DIR}/JSON/src/ParserImpl.cpp"
+        "${LIBRARY_DIR}/JSON/src/PrintHandler.cpp"
+        "${LIBRARY_DIR}/JSON/src/Query.cpp"
+        "${LIBRARY_DIR}/JSON/src/Stringifier.cpp"
+        "${LIBRARY_DIR}/JSON/src/Template.cpp"
+        "${LIBRARY_DIR}/JSON/src/TemplateCache.cpp"
     )
 
     add_library (_poco_json ${SRCS})
     add_library (Poco::JSON ALIAS _poco_json)
 
-    target_include_directories (_poco_json SYSTEM PUBLIC ${LIBRARY_DIR}/JSON/include)
+    target_include_directories (_poco_json SYSTEM PUBLIC "${LIBRARY_DIR}/JSON/include")
     target_link_libraries (_poco_json PUBLIC Poco::Foundation Poco::JSON::Pdjson)
 else ()
     add_library (Poco::JSON UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/MongoDB/CMakeLists.txt b/contrib/poco-cmake/MongoDB/CMakeLists.txt
index 0d79f680a64..e3dce7ac5cd 100644
--- a/contrib/poco-cmake/MongoDB/CMakeLists.txt
+++ b/contrib/poco-cmake/MongoDB/CMakeLists.txt
@@ -1,32 +1,32 @@
 if (USE_INTERNAL_POCO_LIBRARY)
     set (SRCS
-        ${LIBRARY_DIR}/MongoDB/src/Array.cpp
-        ${LIBRARY_DIR}/MongoDB/src/Binary.cpp
-        ${LIBRARY_DIR}/MongoDB/src/Connection.cpp
-        ${LIBRARY_DIR}/MongoDB/src/Cursor.cpp
-        ${LIBRARY_DIR}/MongoDB/src/Database.cpp
-        ${LIBRARY_DIR}/MongoDB/src/DeleteRequest.cpp
-        ${LIBRARY_DIR}/MongoDB/src/Document.cpp
-        ${LIBRARY_DIR}/MongoDB/src/Element.cpp
-        ${LIBRARY_DIR}/MongoDB/src/GetMoreRequest.cpp
-        ${LIBRARY_DIR}/MongoDB/src/InsertRequest.cpp
-        ${LIBRARY_DIR}/MongoDB/src/JavaScriptCode.cpp
-        ${LIBRARY_DIR}/MongoDB/src/KillCursorsRequest.cpp
-        ${LIBRARY_DIR}/MongoDB/src/Message.cpp
-        ${LIBRARY_DIR}/MongoDB/src/MessageHeader.cpp
-        ${LIBRARY_DIR}/MongoDB/src/ObjectId.cpp
-        ${LIBRARY_DIR}/MongoDB/src/QueryRequest.cpp
-        ${LIBRARY_DIR}/MongoDB/src/RegularExpression.cpp
-        ${LIBRARY_DIR}/MongoDB/src/ReplicaSet.cpp
-        ${LIBRARY_DIR}/MongoDB/src/RequestMessage.cpp
-        ${LIBRARY_DIR}/MongoDB/src/ResponseMessage.cpp
-        ${LIBRARY_DIR}/MongoDB/src/UpdateRequest.cpp
+        "${LIBRARY_DIR}/MongoDB/src/Array.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/Binary.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/Connection.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/Cursor.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/Database.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/DeleteRequest.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/Document.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/Element.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/GetMoreRequest.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/InsertRequest.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/JavaScriptCode.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/KillCursorsRequest.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/Message.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/MessageHeader.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/ObjectId.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/QueryRequest.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/RegularExpression.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/ReplicaSet.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/RequestMessage.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/ResponseMessage.cpp"
+        "${LIBRARY_DIR}/MongoDB/src/UpdateRequest.cpp"
     )
 
     add_library (_poco_mongodb ${SRCS})
     add_library (Poco::MongoDB ALIAS _poco_mongodb)
 
-    target_include_directories (_poco_mongodb SYSTEM PUBLIC ${LIBRARY_DIR}/MongoDB/include)
+    target_include_directories (_poco_mongodb SYSTEM PUBLIC "${LIBRARY_DIR}/MongoDB/include")
     target_link_libraries (_poco_mongodb PUBLIC Poco::Net)
 else ()
     add_library (Poco::MongoDB UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/Net/CMakeLists.txt b/contrib/poco-cmake/Net/CMakeLists.txt
index 9bc06e52e05..45989af8d45 100644
--- a/contrib/poco-cmake/Net/CMakeLists.txt
+++ b/contrib/poco-cmake/Net/CMakeLists.txt
@@ -1,105 +1,105 @@
 if (USE_INTERNAL_POCO_LIBRARY)
     set (SRCS
-        ${LIBRARY_DIR}/Net/src/AbstractHTTPRequestHandler.cpp
-        ${LIBRARY_DIR}/Net/src/DatagramSocket.cpp
-        ${LIBRARY_DIR}/Net/src/DatagramSocketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/DialogSocket.cpp
-        ${LIBRARY_DIR}/Net/src/DNS.cpp
-        ${LIBRARY_DIR}/Net/src/FilePartSource.cpp
-        ${LIBRARY_DIR}/Net/src/FTPClientSession.cpp
-        ${LIBRARY_DIR}/Net/src/FTPStreamFactory.cpp
-        ${LIBRARY_DIR}/Net/src/HostEntry.cpp
-        ${LIBRARY_DIR}/Net/src/HTMLForm.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPAuthenticationParams.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPBasicCredentials.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPBufferAllocator.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPChunkedStream.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPClientSession.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPCookie.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPCredentials.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPDigestCredentials.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPFixedLengthStream.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPHeaderStream.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPIOStream.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPMessage.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPRequest.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPRequestHandler.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPRequestHandlerFactory.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPResponse.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServer.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerConnection.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerConnectionFactory.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerParams.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerRequest.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerRequestImpl.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerResponse.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerResponseImpl.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPServerSession.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPSession.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPSessionFactory.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPSessionInstantiator.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPStream.cpp
-        ${LIBRARY_DIR}/Net/src/HTTPStreamFactory.cpp
-        ${LIBRARY_DIR}/Net/src/ICMPClient.cpp
-        ${LIBRARY_DIR}/Net/src/ICMPEventArgs.cpp
-        ${LIBRARY_DIR}/Net/src/ICMPPacket.cpp
-        ${LIBRARY_DIR}/Net/src/ICMPPacketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/ICMPSocket.cpp
-        ${LIBRARY_DIR}/Net/src/ICMPSocketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/ICMPv4PacketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/IPAddress.cpp
-        ${LIBRARY_DIR}/Net/src/IPAddressImpl.cpp
-        ${LIBRARY_DIR}/Net/src/MailMessage.cpp
-        ${LIBRARY_DIR}/Net/src/MailRecipient.cpp
-        ${LIBRARY_DIR}/Net/src/MailStream.cpp
-        ${LIBRARY_DIR}/Net/src/MediaType.cpp
-        ${LIBRARY_DIR}/Net/src/MessageHeader.cpp
-        ${LIBRARY_DIR}/Net/src/MulticastSocket.cpp
-        ${LIBRARY_DIR}/Net/src/MultipartReader.cpp
-        ${LIBRARY_DIR}/Net/src/MultipartWriter.cpp
-        ${LIBRARY_DIR}/Net/src/NameValueCollection.cpp
-        ${LIBRARY_DIR}/Net/src/Net.cpp
-        ${LIBRARY_DIR}/Net/src/NetException.cpp
-        ${LIBRARY_DIR}/Net/src/NetworkInterface.cpp
-        ${LIBRARY_DIR}/Net/src/NTPClient.cpp
-        ${LIBRARY_DIR}/Net/src/NTPEventArgs.cpp
-        ${LIBRARY_DIR}/Net/src/NTPPacket.cpp
-        ${LIBRARY_DIR}/Net/src/NullPartHandler.cpp
-        ${LIBRARY_DIR}/Net/src/OAuth10Credentials.cpp
-        ${LIBRARY_DIR}/Net/src/OAuth20Credentials.cpp
-        ${LIBRARY_DIR}/Net/src/PartHandler.cpp
-        ${LIBRARY_DIR}/Net/src/PartSource.cpp
-        ${LIBRARY_DIR}/Net/src/PartStore.cpp
-        ${LIBRARY_DIR}/Net/src/PollSet.cpp
-        ${LIBRARY_DIR}/Net/src/POP3ClientSession.cpp
-        ${LIBRARY_DIR}/Net/src/QuotedPrintableDecoder.cpp
-        ${LIBRARY_DIR}/Net/src/QuotedPrintableEncoder.cpp
-        ${LIBRARY_DIR}/Net/src/RawSocket.cpp
-        ${LIBRARY_DIR}/Net/src/RawSocketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/RemoteSyslogChannel.cpp
-        ${LIBRARY_DIR}/Net/src/RemoteSyslogListener.cpp
-        ${LIBRARY_DIR}/Net/src/ServerSocket.cpp
-        ${LIBRARY_DIR}/Net/src/ServerSocketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/SMTPChannel.cpp
-        ${LIBRARY_DIR}/Net/src/SMTPClientSession.cpp
-        ${LIBRARY_DIR}/Net/src/Socket.cpp
-        ${LIBRARY_DIR}/Net/src/SocketAddress.cpp
-        ${LIBRARY_DIR}/Net/src/SocketAddressImpl.cpp
-        ${LIBRARY_DIR}/Net/src/SocketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/SocketNotification.cpp
-        ${LIBRARY_DIR}/Net/src/SocketNotifier.cpp
-        ${LIBRARY_DIR}/Net/src/SocketReactor.cpp
-        ${LIBRARY_DIR}/Net/src/SocketStream.cpp
-        ${LIBRARY_DIR}/Net/src/StreamSocket.cpp
-        ${LIBRARY_DIR}/Net/src/StreamSocketImpl.cpp
-        ${LIBRARY_DIR}/Net/src/StringPartSource.cpp
-        ${LIBRARY_DIR}/Net/src/TCPServer.cpp
-        ${LIBRARY_DIR}/Net/src/TCPServerConnection.cpp
-        ${LIBRARY_DIR}/Net/src/TCPServerConnectionFactory.cpp
-        ${LIBRARY_DIR}/Net/src/TCPServerDispatcher.cpp
-        ${LIBRARY_DIR}/Net/src/TCPServerParams.cpp
-        ${LIBRARY_DIR}/Net/src/WebSocket.cpp
-        ${LIBRARY_DIR}/Net/src/WebSocketImpl.cpp
+        "${LIBRARY_DIR}/Net/src/AbstractHTTPRequestHandler.cpp"
+        "${LIBRARY_DIR}/Net/src/DatagramSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/DatagramSocketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/DialogSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/DNS.cpp"
+        "${LIBRARY_DIR}/Net/src/FilePartSource.cpp"
+        "${LIBRARY_DIR}/Net/src/FTPClientSession.cpp"
+        "${LIBRARY_DIR}/Net/src/FTPStreamFactory.cpp"
+        "${LIBRARY_DIR}/Net/src/HostEntry.cpp"
+        "${LIBRARY_DIR}/Net/src/HTMLForm.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPAuthenticationParams.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPBasicCredentials.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPBufferAllocator.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPChunkedStream.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPClientSession.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPCookie.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPCredentials.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPDigestCredentials.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPFixedLengthStream.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPHeaderStream.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPIOStream.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPMessage.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPRequest.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPRequestHandler.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPRequestHandlerFactory.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPResponse.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServer.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerConnection.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerConnectionFactory.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerParams.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerRequest.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerRequestImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerResponse.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerResponseImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPServerSession.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPSession.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPSessionFactory.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPSessionInstantiator.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPStream.cpp"
+        "${LIBRARY_DIR}/Net/src/HTTPStreamFactory.cpp"
+        "${LIBRARY_DIR}/Net/src/ICMPClient.cpp"
+        "${LIBRARY_DIR}/Net/src/ICMPEventArgs.cpp"
+        "${LIBRARY_DIR}/Net/src/ICMPPacket.cpp"
+        "${LIBRARY_DIR}/Net/src/ICMPPacketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/ICMPSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/ICMPSocketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/ICMPv4PacketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/IPAddress.cpp"
+        "${LIBRARY_DIR}/Net/src/IPAddressImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/MailMessage.cpp"
+        "${LIBRARY_DIR}/Net/src/MailRecipient.cpp"
+        "${LIBRARY_DIR}/Net/src/MailStream.cpp"
+        "${LIBRARY_DIR}/Net/src/MediaType.cpp"
+        "${LIBRARY_DIR}/Net/src/MessageHeader.cpp"
+        "${LIBRARY_DIR}/Net/src/MulticastSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/MultipartReader.cpp"
+        "${LIBRARY_DIR}/Net/src/MultipartWriter.cpp"
+        "${LIBRARY_DIR}/Net/src/NameValueCollection.cpp"
+        "${LIBRARY_DIR}/Net/src/Net.cpp"
+        "${LIBRARY_DIR}/Net/src/NetException.cpp"
+        "${LIBRARY_DIR}/Net/src/NetworkInterface.cpp"
+        "${LIBRARY_DIR}/Net/src/NTPClient.cpp"
+        "${LIBRARY_DIR}/Net/src/NTPEventArgs.cpp"
+        "${LIBRARY_DIR}/Net/src/NTPPacket.cpp"
+        "${LIBRARY_DIR}/Net/src/NullPartHandler.cpp"
+        "${LIBRARY_DIR}/Net/src/OAuth10Credentials.cpp"
+        "${LIBRARY_DIR}/Net/src/OAuth20Credentials.cpp"
+        "${LIBRARY_DIR}/Net/src/PartHandler.cpp"
+        "${LIBRARY_DIR}/Net/src/PartSource.cpp"
+        "${LIBRARY_DIR}/Net/src/PartStore.cpp"
+        "${LIBRARY_DIR}/Net/src/PollSet.cpp"
+        "${LIBRARY_DIR}/Net/src/POP3ClientSession.cpp"
+        "${LIBRARY_DIR}/Net/src/QuotedPrintableDecoder.cpp"
+        "${LIBRARY_DIR}/Net/src/QuotedPrintableEncoder.cpp"
+        "${LIBRARY_DIR}/Net/src/RawSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/RawSocketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/RemoteSyslogChannel.cpp"
+        "${LIBRARY_DIR}/Net/src/RemoteSyslogListener.cpp"
+        "${LIBRARY_DIR}/Net/src/ServerSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/ServerSocketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/SMTPChannel.cpp"
+        "${LIBRARY_DIR}/Net/src/SMTPClientSession.cpp"
+        "${LIBRARY_DIR}/Net/src/Socket.cpp"
+        "${LIBRARY_DIR}/Net/src/SocketAddress.cpp"
+        "${LIBRARY_DIR}/Net/src/SocketAddressImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/SocketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/SocketNotification.cpp"
+        "${LIBRARY_DIR}/Net/src/SocketNotifier.cpp"
+        "${LIBRARY_DIR}/Net/src/SocketReactor.cpp"
+        "${LIBRARY_DIR}/Net/src/SocketStream.cpp"
+        "${LIBRARY_DIR}/Net/src/StreamSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/StreamSocketImpl.cpp"
+        "${LIBRARY_DIR}/Net/src/StringPartSource.cpp"
+        "${LIBRARY_DIR}/Net/src/TCPServer.cpp"
+        "${LIBRARY_DIR}/Net/src/TCPServerConnection.cpp"
+        "${LIBRARY_DIR}/Net/src/TCPServerConnectionFactory.cpp"
+        "${LIBRARY_DIR}/Net/src/TCPServerDispatcher.cpp"
+        "${LIBRARY_DIR}/Net/src/TCPServerParams.cpp"
+        "${LIBRARY_DIR}/Net/src/WebSocket.cpp"
+        "${LIBRARY_DIR}/Net/src/WebSocketImpl.cpp"
     )
 
     add_library (_poco_net ${SRCS})
@@ -125,7 +125,7 @@ if (USE_INTERNAL_POCO_LIBRARY)
             -Wno-deprecated
             -Wno-extra-semi
     )
-    target_include_directories (_poco_net SYSTEM PUBLIC ${LIBRARY_DIR}/Net/include)
+    target_include_directories (_poco_net SYSTEM PUBLIC "${LIBRARY_DIR}/Net/include")
     target_link_libraries (_poco_net PUBLIC Poco::Foundation)
 else ()
     add_library (Poco::Net UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/Net/SSL/CMakeLists.txt b/contrib/poco-cmake/Net/SSL/CMakeLists.txt
index 7cc71f441c7..4b3adacfb8f 100644
--- a/contrib/poco-cmake/Net/SSL/CMakeLists.txt
+++ b/contrib/poco-cmake/Net/SSL/CMakeLists.txt
@@ -1,39 +1,39 @@
 if (ENABLE_SSL)
     if (USE_INTERNAL_POCO_LIBRARY)
         set (SRCS
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/Context.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/HTTPSClientSession.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/KeyFileHandler.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/RejectCertificateHandler.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureServerSocket.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureStreamSocket.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/Session.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SSLException.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/SSLManager.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/Utility.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp
-            ${LIBRARY_DIR}/NetSSL_OpenSSL/src/X509Certificate.cpp
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/Context.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/HTTPSClientSession.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/KeyFileHandler.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/RejectCertificateHandler.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureServerSocket.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureSocketImpl.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureStreamSocket.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/Session.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SSLException.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/SSLManager.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/Utility.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp"
+            "${LIBRARY_DIR}/NetSSL_OpenSSL/src/X509Certificate.cpp"
         )
 
         add_library (_poco_net_ssl ${SRCS})
         add_library (Poco::Net::SSL ALIAS _poco_net_ssl)
 
-        target_include_directories (_poco_net_ssl SYSTEM PUBLIC ${LIBRARY_DIR}/NetSSL_OpenSSL/include)
+        target_include_directories (_poco_net_ssl SYSTEM PUBLIC "${LIBRARY_DIR}/NetSSL_OpenSSL/include")
         target_link_libraries (_poco_net_ssl PUBLIC Poco::Crypto Poco::Net Poco::Util)
     else ()
         add_library (Poco::Net::SSL UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/Redis/CMakeLists.txt b/contrib/poco-cmake/Redis/CMakeLists.txt
index 43d0009101c..b5892addd85 100644
--- a/contrib/poco-cmake/Redis/CMakeLists.txt
+++ b/contrib/poco-cmake/Redis/CMakeLists.txt
@@ -1,14 +1,14 @@
 if (USE_INTERNAL_POCO_LIBRARY)
     set (SRCS
-        ${LIBRARY_DIR}/Redis/src/Array.cpp
-        ${LIBRARY_DIR}/Redis/src/AsyncReader.cpp
-        ${LIBRARY_DIR}/Redis/src/Client.cpp
-        ${LIBRARY_DIR}/Redis/src/Command.cpp
-        ${LIBRARY_DIR}/Redis/src/Error.cpp
-        ${LIBRARY_DIR}/Redis/src/Exception.cpp
-        ${LIBRARY_DIR}/Redis/src/RedisEventArgs.cpp
-        ${LIBRARY_DIR}/Redis/src/RedisStream.cpp
-        ${LIBRARY_DIR}/Redis/src/Type.cpp
+        "${LIBRARY_DIR}/Redis/src/Array.cpp"
+        "${LIBRARY_DIR}/Redis/src/AsyncReader.cpp"
+        "${LIBRARY_DIR}/Redis/src/Client.cpp"
+        "${LIBRARY_DIR}/Redis/src/Command.cpp"
+        "${LIBRARY_DIR}/Redis/src/Error.cpp"
+        "${LIBRARY_DIR}/Redis/src/Exception.cpp"
+        "${LIBRARY_DIR}/Redis/src/RedisEventArgs.cpp"
+        "${LIBRARY_DIR}/Redis/src/RedisStream.cpp"
+        "${LIBRARY_DIR}/Redis/src/Type.cpp"
     )
 
     add_library (_poco_redis ${SRCS})
@@ -18,7 +18,7 @@ if (USE_INTERNAL_POCO_LIBRARY)
         target_compile_options (_poco_redis PRIVATE -Wno-deprecated-copy)
     endif ()
     target_compile_options (_poco_redis PRIVATE -Wno-shadow)
-    target_include_directories (_poco_redis SYSTEM PUBLIC ${LIBRARY_DIR}/Redis/include)
+    target_include_directories (_poco_redis SYSTEM PUBLIC "${LIBRARY_DIR}/Redis/include")
     target_link_libraries (_poco_redis PUBLIC Poco::Net)
 else ()
     add_library (Poco::Redis UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/Util/CMakeLists.txt b/contrib/poco-cmake/Util/CMakeLists.txt
index f5af3a5793c..e233e65cfea 100644
--- a/contrib/poco-cmake/Util/CMakeLists.txt
+++ b/contrib/poco-cmake/Util/CMakeLists.txt
@@ -1,38 +1,38 @@
 if (USE_INTERNAL_POCO_LIBRARY)
     set (SRCS
-        ${LIBRARY_DIR}/Util/src/AbstractConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/Application.cpp
-        ${LIBRARY_DIR}/Util/src/ConfigurationMapper.cpp
-        ${LIBRARY_DIR}/Util/src/ConfigurationView.cpp
-        ${LIBRARY_DIR}/Util/src/FilesystemConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/HelpFormatter.cpp
-        ${LIBRARY_DIR}/Util/src/IniFileConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/IntValidator.cpp
-        ${LIBRARY_DIR}/Util/src/JSONConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/LayeredConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/LoggingConfigurator.cpp
-        ${LIBRARY_DIR}/Util/src/LoggingSubsystem.cpp
-        ${LIBRARY_DIR}/Util/src/MapConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/Option.cpp
-        ${LIBRARY_DIR}/Util/src/OptionCallback.cpp
-        ${LIBRARY_DIR}/Util/src/OptionException.cpp
-        ${LIBRARY_DIR}/Util/src/OptionProcessor.cpp
-        ${LIBRARY_DIR}/Util/src/OptionSet.cpp
-        ${LIBRARY_DIR}/Util/src/PropertyFileConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/RegExpValidator.cpp
-        ${LIBRARY_DIR}/Util/src/ServerApplication.cpp
-        ${LIBRARY_DIR}/Util/src/Subsystem.cpp
-        ${LIBRARY_DIR}/Util/src/SystemConfiguration.cpp
-        ${LIBRARY_DIR}/Util/src/Timer.cpp
-        ${LIBRARY_DIR}/Util/src/TimerTask.cpp
-        ${LIBRARY_DIR}/Util/src/Validator.cpp
-        ${LIBRARY_DIR}/Util/src/XMLConfiguration.cpp
+        "${LIBRARY_DIR}/Util/src/AbstractConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/Application.cpp"
+        "${LIBRARY_DIR}/Util/src/ConfigurationMapper.cpp"
+        "${LIBRARY_DIR}/Util/src/ConfigurationView.cpp"
+        "${LIBRARY_DIR}/Util/src/FilesystemConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/HelpFormatter.cpp"
+        "${LIBRARY_DIR}/Util/src/IniFileConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/IntValidator.cpp"
+        "${LIBRARY_DIR}/Util/src/JSONConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/LayeredConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/LoggingConfigurator.cpp"
+        "${LIBRARY_DIR}/Util/src/LoggingSubsystem.cpp"
+        "${LIBRARY_DIR}/Util/src/MapConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/Option.cpp"
+        "${LIBRARY_DIR}/Util/src/OptionCallback.cpp"
+        "${LIBRARY_DIR}/Util/src/OptionException.cpp"
+        "${LIBRARY_DIR}/Util/src/OptionProcessor.cpp"
+        "${LIBRARY_DIR}/Util/src/OptionSet.cpp"
+        "${LIBRARY_DIR}/Util/src/PropertyFileConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/RegExpValidator.cpp"
+        "${LIBRARY_DIR}/Util/src/ServerApplication.cpp"
+        "${LIBRARY_DIR}/Util/src/Subsystem.cpp"
+        "${LIBRARY_DIR}/Util/src/SystemConfiguration.cpp"
+        "${LIBRARY_DIR}/Util/src/Timer.cpp"
+        "${LIBRARY_DIR}/Util/src/TimerTask.cpp"
+        "${LIBRARY_DIR}/Util/src/Validator.cpp"
+        "${LIBRARY_DIR}/Util/src/XMLConfiguration.cpp"
     )
 
     add_library (_poco_util ${SRCS})
     add_library (Poco::Util ALIAS _poco_util)
 
-    target_include_directories (_poco_util SYSTEM PUBLIC ${LIBRARY_DIR}/Util/include)
+    target_include_directories (_poco_util SYSTEM PUBLIC "${LIBRARY_DIR}/Util/include")
     target_link_libraries (_poco_util PUBLIC Poco::JSON Poco::XML)
 else ()
     add_library (Poco::Util UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/poco-cmake/XML/CMakeLists.txt b/contrib/poco-cmake/XML/CMakeLists.txt
index 448b7e22c7c..af801a65f03 100644
--- a/contrib/poco-cmake/XML/CMakeLists.txt
+++ b/contrib/poco-cmake/XML/CMakeLists.txt
@@ -2,101 +2,101 @@ if (USE_INTERNAL_POCO_LIBRARY)
     # Poco::XML (expat)
 
     set (SRCS_EXPAT
-        ${LIBRARY_DIR}/XML/src/xmlrole.c
-        ${LIBRARY_DIR}/XML/src/xmltok_impl.c
-        ${LIBRARY_DIR}/XML/src/xmltok_ns.c
-        ${LIBRARY_DIR}/XML/src/xmltok.c
+        "${LIBRARY_DIR}/XML/src/xmlrole.c"
+        "${LIBRARY_DIR}/XML/src/xmltok_impl.c"
+        "${LIBRARY_DIR}/XML/src/xmltok_ns.c"
+        "${LIBRARY_DIR}/XML/src/xmltok.c"
     )
 
     add_library (_poco_xml_expat ${SRCS_EXPAT})
     add_library (Poco::XML::Expat ALIAS _poco_xml_expat)
 
-    target_include_directories (_poco_xml_expat PUBLIC ${LIBRARY_DIR}/XML/include)
+    target_include_directories (_poco_xml_expat PUBLIC "${LIBRARY_DIR}/XML/include")
 
     # Poco::XML
 
     set (SRCS
-        ${LIBRARY_DIR}/XML/src/AbstractContainerNode.cpp
-        ${LIBRARY_DIR}/XML/src/AbstractNode.cpp
-        ${LIBRARY_DIR}/XML/src/Attr.cpp
-        ${LIBRARY_DIR}/XML/src/Attributes.cpp
-        ${LIBRARY_DIR}/XML/src/AttributesImpl.cpp
-        ${LIBRARY_DIR}/XML/src/AttrMap.cpp
-        ${LIBRARY_DIR}/XML/src/CDATASection.cpp
-        ${LIBRARY_DIR}/XML/src/CharacterData.cpp
-        ${LIBRARY_DIR}/XML/src/ChildNodesList.cpp
-        ${LIBRARY_DIR}/XML/src/Comment.cpp
-        ${LIBRARY_DIR}/XML/src/ContentHandler.cpp
-        ${LIBRARY_DIR}/XML/src/DeclHandler.cpp
-        ${LIBRARY_DIR}/XML/src/DefaultHandler.cpp
-        ${LIBRARY_DIR}/XML/src/Document.cpp
-        ${LIBRARY_DIR}/XML/src/DocumentEvent.cpp
-        ${LIBRARY_DIR}/XML/src/DocumentFragment.cpp
-        ${LIBRARY_DIR}/XML/src/DocumentType.cpp
-        ${LIBRARY_DIR}/XML/src/DOMBuilder.cpp
-        ${LIBRARY_DIR}/XML/src/DOMException.cpp
-        ${LIBRARY_DIR}/XML/src/DOMImplementation.cpp
-        ${LIBRARY_DIR}/XML/src/DOMObject.cpp
-        ${LIBRARY_DIR}/XML/src/DOMParser.cpp
-        ${LIBRARY_DIR}/XML/src/DOMSerializer.cpp
-        ${LIBRARY_DIR}/XML/src/DOMWriter.cpp
-        ${LIBRARY_DIR}/XML/src/DTDHandler.cpp
-        ${LIBRARY_DIR}/XML/src/DTDMap.cpp
-        ${LIBRARY_DIR}/XML/src/Element.cpp
-        ${LIBRARY_DIR}/XML/src/ElementsByTagNameList.cpp
-        ${LIBRARY_DIR}/XML/src/Entity.cpp
-        ${LIBRARY_DIR}/XML/src/EntityReference.cpp
-        ${LIBRARY_DIR}/XML/src/EntityResolver.cpp
-        ${LIBRARY_DIR}/XML/src/EntityResolverImpl.cpp
-        ${LIBRARY_DIR}/XML/src/ErrorHandler.cpp
-        ${LIBRARY_DIR}/XML/src/Event.cpp
-        ${LIBRARY_DIR}/XML/src/EventDispatcher.cpp
-        ${LIBRARY_DIR}/XML/src/EventException.cpp
-        ${LIBRARY_DIR}/XML/src/EventListener.cpp
-        ${LIBRARY_DIR}/XML/src/EventTarget.cpp
-        ${LIBRARY_DIR}/XML/src/InputSource.cpp
-        ${LIBRARY_DIR}/XML/src/LexicalHandler.cpp
-        ${LIBRARY_DIR}/XML/src/Locator.cpp
-        ${LIBRARY_DIR}/XML/src/LocatorImpl.cpp
-        ${LIBRARY_DIR}/XML/src/MutationEvent.cpp
-        ${LIBRARY_DIR}/XML/src/Name.cpp
-        ${LIBRARY_DIR}/XML/src/NamedNodeMap.cpp
-        ${LIBRARY_DIR}/XML/src/NamePool.cpp
-        ${LIBRARY_DIR}/XML/src/NamespaceStrategy.cpp
-        ${LIBRARY_DIR}/XML/src/NamespaceSupport.cpp
-        ${LIBRARY_DIR}/XML/src/Node.cpp
-        ${LIBRARY_DIR}/XML/src/NodeAppender.cpp
-        ${LIBRARY_DIR}/XML/src/NodeFilter.cpp
-        ${LIBRARY_DIR}/XML/src/NodeIterator.cpp
-        ${LIBRARY_DIR}/XML/src/NodeList.cpp
-        ${LIBRARY_DIR}/XML/src/Notation.cpp
-        ${LIBRARY_DIR}/XML/src/ParserEngine.cpp
-        ${LIBRARY_DIR}/XML/src/ProcessingInstruction.cpp
-        ${LIBRARY_DIR}/XML/src/QName.cpp
-        ${LIBRARY_DIR}/XML/src/SAXException.cpp
-        ${LIBRARY_DIR}/XML/src/SAXParser.cpp
-        ${LIBRARY_DIR}/XML/src/Text.cpp
-        ${LIBRARY_DIR}/XML/src/TreeWalker.cpp
-        ${LIBRARY_DIR}/XML/src/ValueTraits.cpp
-        ${LIBRARY_DIR}/XML/src/WhitespaceFilter.cpp
-        ${LIBRARY_DIR}/XML/src/XMLException.cpp
-        ${LIBRARY_DIR}/XML/src/XMLFilter.cpp
-        ${LIBRARY_DIR}/XML/src/XMLFilterImpl.cpp
-        ${LIBRARY_DIR}/XML/src/XMLReader.cpp
-        ${LIBRARY_DIR}/XML/src/XMLStreamParser.cpp
-        ${LIBRARY_DIR}/XML/src/XMLStreamParserException.cpp
-        ${LIBRARY_DIR}/XML/src/XMLString.cpp
-        ${LIBRARY_DIR}/XML/src/XMLWriter.cpp
+        "${LIBRARY_DIR}/XML/src/AbstractContainerNode.cpp"
+        "${LIBRARY_DIR}/XML/src/AbstractNode.cpp"
+        "${LIBRARY_DIR}/XML/src/Attr.cpp"
+        "${LIBRARY_DIR}/XML/src/Attributes.cpp"
+        "${LIBRARY_DIR}/XML/src/AttributesImpl.cpp"
+        "${LIBRARY_DIR}/XML/src/AttrMap.cpp"
+        "${LIBRARY_DIR}/XML/src/CDATASection.cpp"
+        "${LIBRARY_DIR}/XML/src/CharacterData.cpp"
+        "${LIBRARY_DIR}/XML/src/ChildNodesList.cpp"
+        "${LIBRARY_DIR}/XML/src/Comment.cpp"
+        "${LIBRARY_DIR}/XML/src/ContentHandler.cpp"
+        "${LIBRARY_DIR}/XML/src/DeclHandler.cpp"
+        "${LIBRARY_DIR}/XML/src/DefaultHandler.cpp"
+        "${LIBRARY_DIR}/XML/src/Document.cpp"
+        "${LIBRARY_DIR}/XML/src/DocumentEvent.cpp"
+        "${LIBRARY_DIR}/XML/src/DocumentFragment.cpp"
+        "${LIBRARY_DIR}/XML/src/DocumentType.cpp"
+        "${LIBRARY_DIR}/XML/src/DOMBuilder.cpp"
+        "${LIBRARY_DIR}/XML/src/DOMException.cpp"
+        "${LIBRARY_DIR}/XML/src/DOMImplementation.cpp"
+        "${LIBRARY_DIR}/XML/src/DOMObject.cpp"
+        "${LIBRARY_DIR}/XML/src/DOMParser.cpp"
+        "${LIBRARY_DIR}/XML/src/DOMSerializer.cpp"
+        "${LIBRARY_DIR}/XML/src/DOMWriter.cpp"
+        "${LIBRARY_DIR}/XML/src/DTDHandler.cpp"
+        "${LIBRARY_DIR}/XML/src/DTDMap.cpp"
+        "${LIBRARY_DIR}/XML/src/Element.cpp"
+        "${LIBRARY_DIR}/XML/src/ElementsByTagNameList.cpp"
+        "${LIBRARY_DIR}/XML/src/Entity.cpp"
+        "${LIBRARY_DIR}/XML/src/EntityReference.cpp"
+        "${LIBRARY_DIR}/XML/src/EntityResolver.cpp"
+        "${LIBRARY_DIR}/XML/src/EntityResolverImpl.cpp"
+        "${LIBRARY_DIR}/XML/src/ErrorHandler.cpp"
+        "${LIBRARY_DIR}/XML/src/Event.cpp"
+        "${LIBRARY_DIR}/XML/src/EventDispatcher.cpp"
+        "${LIBRARY_DIR}/XML/src/EventException.cpp"
+        "${LIBRARY_DIR}/XML/src/EventListener.cpp"
+        "${LIBRARY_DIR}/XML/src/EventTarget.cpp"
+        "${LIBRARY_DIR}/XML/src/InputSource.cpp"
+        "${LIBRARY_DIR}/XML/src/LexicalHandler.cpp"
+        "${LIBRARY_DIR}/XML/src/Locator.cpp"
+        "${LIBRARY_DIR}/XML/src/LocatorImpl.cpp"
+        "${LIBRARY_DIR}/XML/src/MutationEvent.cpp"
+        "${LIBRARY_DIR}/XML/src/Name.cpp"
+        "${LIBRARY_DIR}/XML/src/NamedNodeMap.cpp"
+        "${LIBRARY_DIR}/XML/src/NamePool.cpp"
+        "${LIBRARY_DIR}/XML/src/NamespaceStrategy.cpp"
+        "${LIBRARY_DIR}/XML/src/NamespaceSupport.cpp"
+        "${LIBRARY_DIR}/XML/src/Node.cpp"
+        "${LIBRARY_DIR}/XML/src/NodeAppender.cpp"
+        "${LIBRARY_DIR}/XML/src/NodeFilter.cpp"
+        "${LIBRARY_DIR}/XML/src/NodeIterator.cpp"
+        "${LIBRARY_DIR}/XML/src/NodeList.cpp"
+        "${LIBRARY_DIR}/XML/src/Notation.cpp"
+        "${LIBRARY_DIR}/XML/src/ParserEngine.cpp"
+        "${LIBRARY_DIR}/XML/src/ProcessingInstruction.cpp"
+        "${LIBRARY_DIR}/XML/src/QName.cpp"
+        "${LIBRARY_DIR}/XML/src/SAXException.cpp"
+        "${LIBRARY_DIR}/XML/src/SAXParser.cpp"
+        "${LIBRARY_DIR}/XML/src/Text.cpp"
+        "${LIBRARY_DIR}/XML/src/TreeWalker.cpp"
+        "${LIBRARY_DIR}/XML/src/ValueTraits.cpp"
+        "${LIBRARY_DIR}/XML/src/WhitespaceFilter.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLException.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLFilter.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLFilterImpl.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLReader.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLStreamParser.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLStreamParserException.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLString.cpp"
+        "${LIBRARY_DIR}/XML/src/XMLWriter.cpp"
 
         # expat
-        ${LIBRARY_DIR}/XML/src/xmlparse.cpp
+        "${LIBRARY_DIR}/XML/src/xmlparse.cpp"
     )
 
     add_library (_poco_xml ${SRCS})
     add_library (Poco::XML ALIAS _poco_xml)
 
     target_compile_options (_poco_xml PRIVATE -Wno-old-style-cast)
-    target_include_directories (_poco_xml SYSTEM PUBLIC ${LIBRARY_DIR}/XML/include)
+    target_include_directories (_poco_xml SYSTEM PUBLIC "${LIBRARY_DIR}/XML/include")
     target_link_libraries (_poco_xml PUBLIC Poco::Foundation Poco::XML::Expat)
 else ()
     add_library (Poco::XML UNKNOWN IMPORTED GLOBAL)
diff --git a/contrib/protobuf-cmake/CMakeLists.txt b/contrib/protobuf-cmake/CMakeLists.txt
index 1f8d9b02b3e..a4993030d04 100644
--- a/contrib/protobuf-cmake/CMakeLists.txt
+++ b/contrib/protobuf-cmake/CMakeLists.txt
@@ -14,4 +14,4 @@ add_subdirectory("${protobuf_SOURCE_DIR}/cmake" "${protobuf_BINARY_DIR}")
 
 # 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 
-set_property(TARGET libprotobuf PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${protobuf_SOURCE_DIR}/src)
+set_property(TARGET libprotobuf PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${protobuf_SOURCE_DIR}/src")
diff --git a/contrib/re2 b/contrib/re2
index 7cf8b88e8f7..13ebb377c6a 160000
--- a/contrib/re2
+++ b/contrib/re2
@@ -1 +1 @@
-Subproject commit 7cf8b88e8f70f97fd4926b56aa87e7f53b2717e0
+Subproject commit 13ebb377c6ad763ca61d12dd6f88b1126bd0b911
diff --git a/contrib/re2_st/re2_transform.cmake b/contrib/re2_st/re2_transform.cmake
index 2d50d9e8c2a..56a96f45630 100644
--- a/contrib/re2_st/re2_transform.cmake
+++ b/contrib/re2_st/re2_transform.cmake
@@ -1,7 +1,7 @@
 file (READ ${SOURCE_FILENAME} CONTENT)
 string (REGEX REPLACE "using re2::RE2;" "" CONTENT "${CONTENT}")
 string (REGEX REPLACE "using re2::LazyRE2;" "" CONTENT "${CONTENT}")
-string (REGEX REPLACE "namespace re2" "namespace re2_st" CONTENT "${CONTENT}")
+string (REGEX REPLACE "namespace re2 {" "namespace re2_st {" CONTENT "${CONTENT}")
 string (REGEX REPLACE "re2::" "re2_st::" CONTENT "${CONTENT}")
 string (REGEX REPLACE "\"re2/" "\"re2_st/" CONTENT "${CONTENT}")
 string (REGEX REPLACE "(.\\*?_H)" "\\1_ST" CONTENT "${CONTENT}")
diff --git a/contrib/replxx-cmake/CMakeLists.txt b/contrib/replxx-cmake/CMakeLists.txt
index df17e0ed646..07f24bae25d 100644
--- a/contrib/replxx-cmake/CMakeLists.txt
+++ b/contrib/replxx-cmake/CMakeLists.txt
@@ -62,7 +62,7 @@ if (NOT LIBRARY_REPLXX OR NOT INCLUDE_REPLXX OR NOT EXTERNAL_REPLXX_WORKS)
     )
 
     add_library (replxx ${SRCS})
-    target_include_directories(replxx SYSTEM PUBLIC ${LIBRARY_DIR}/include)
+    target_include_directories(replxx SYSTEM PUBLIC "${LIBRARY_DIR}/include")
 endif ()
 
 if (COMPILER_CLANG)
diff --git a/contrib/rocksdb b/contrib/rocksdb
index 54a0decabbc..07c77549a20 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit 54a0decabbcf4c0bb5cf7befa9c597f28289bff5
+Subproject commit 07c77549a20b63ff6981b400085eba36bb5c80c4
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index 77a30776a4a..bccc9ed5294 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -2,15 +2,6 @@
 set(ROCKSDB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb")
 list(APPEND CMAKE_MODULE_PATH "${ROCKSDB_SOURCE_DIR}/cmake/modules/")
 
-if (SANITIZE STREQUAL "undefined")
-    set(WITH_UBSAN ON)
-elseif (SANITIZE STREQUAL "address")
-    set(WITH_ASAN ON)
-elseif (SANITIZE STREQUAL "thread")
-    set(WITH_TSAN ON)
-endif()
-
-
 set(PORTABLE ON)
 ## always disable jemalloc for rocksdb by default
 ## because it introduces non-standard jemalloc APIs
@@ -40,7 +31,7 @@ endif()
 
 if(MSVC)
   option(WITH_XPRESS "build with windows built in compression" OFF)
-  include(${ROCKSDB_SOURCE_DIR}/thirdparty.inc)
+  include("${ROCKSDB_SOURCE_DIR}/thirdparty.inc")
 else()
   if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
     # FreeBSD has jemalloc as default malloc
@@ -71,55 +62,18 @@ else()
   if(WITH_ZSTD)
     add_definitions(-DZSTD)
     include_directories(${ZSTD_INCLUDE_DIR})
-    include_directories(${ZSTD_INCLUDE_DIR}/common)
-    include_directories(${ZSTD_INCLUDE_DIR}/dictBuilder)
-    include_directories(${ZSTD_INCLUDE_DIR}/deprecated)
+    include_directories("${ZSTD_INCLUDE_DIR}/common")
+    include_directories("${ZSTD_INCLUDE_DIR}/dictBuilder")
+    include_directories("${ZSTD_INCLUDE_DIR}/deprecated")
 
     list(APPEND THIRDPARTY_LIBS zstd)
   endif()
 endif()
 
-string(TIMESTAMP TS "%Y/%m/%d %H:%M:%S" UTC)
-set(GIT_DATE_TIME "${TS}" CACHE STRING "the time we first built rocksdb")
-
-find_package(Git)
-
-if(GIT_FOUND AND EXISTS "${ROCKSDB_SOURCE_DIR}/.git")
-  if(WIN32)
-    execute_process(COMMAND $ENV{COMSPEC} /C ${GIT_EXECUTABLE} -C ${ROCKSDB_SOURCE_DIR} rev-parse HEAD OUTPUT_VARIABLE GIT_SHA)
-  else()
-    execute_process(COMMAND ${GIT_EXECUTABLE} -C ${ROCKSDB_SOURCE_DIR} rev-parse HEAD OUTPUT_VARIABLE GIT_SHA)
-  endif()
-else()
-  set(GIT_SHA 0)
-endif()
-
-string(REGEX REPLACE "[^0-9a-f]+" "" GIT_SHA "${GIT_SHA}")
-
-set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/rocksdb_build_version.cc)
-configure_file(${ROCKSDB_SOURCE_DIR}/util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)
+set(BUILD_VERSION_CC rocksdb_build_version.cc)
 add_library(rocksdb_build_version OBJECT ${BUILD_VERSION_CC})
-target_include_directories(rocksdb_build_version PRIVATE
-  ${ROCKSDB_SOURCE_DIR}/util)
-if(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4800 /wd4996 /wd4351 /wd4100 /wd4204 /wd4324")
-else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wshadow -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -Wno-strict-aliasing")
-  if(MINGW)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format -fno-asynchronous-unwind-tables")
-    add_definitions(-D_POSIX_C_SOURCE=1)
-  endif()
-  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer")
-    include(CheckCXXCompilerFlag)
-    CHECK_CXX_COMPILER_FLAG("-momit-leaf-frame-pointer" HAVE_OMIT_LEAF_FRAME_POINTER)
-    if(HAVE_OMIT_LEAF_FRAME_POINTER)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -momit-leaf-frame-pointer")
-    endif()
-  endif()
-endif()
+
+target_include_directories(rocksdb_build_version PRIVATE "${ROCKSDB_SOURCE_DIR}/util")
 
 include(CheckCCompilerFlag)
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
@@ -142,14 +96,14 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
   endif(HAS_ALTIVEC)
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64|ARM64")
   CHECK_C_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC)
   if(HAS_ARMV8_CRC)
     message(STATUS " HAS_ARMV8_CRC yes")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function")
   endif(HAS_ARMV8_CRC)
-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm64|ARM64")
 
 
 include(CheckCXXSourceCompiles)
@@ -189,50 +143,7 @@ if(HAVE_THREAD_LOCAL)
   add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
 endif()
 
-option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
-if(FAIL_ON_WARNINGS)
-  if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-  else() # assume GCC
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-  endif()
-endif()
-
-option(WITH_ASAN "build with ASAN" OFF)
-if(WITH_ASAN)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-  if(WITH_JEMALLOC)
-    message(FATAL "ASAN does not work well with JeMalloc")
-  endif()
-endif()
-
-option(WITH_TSAN "build with TSAN" OFF)
-if(WITH_TSAN)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread -pie")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fPIC")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -fPIC")
-  if(WITH_JEMALLOC)
-    message(FATAL "TSAN does not work well with JeMalloc")
-  endif()
-endif()
-
-option(WITH_UBSAN "build with UBSAN" OFF)
-if(WITH_UBSAN)
-  add_definitions(-DROCKSDB_UBSAN_RUN)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined")
-  if(WITH_JEMALLOC)
-    message(FATAL "UBSAN does not work well with JeMalloc")
-  endif()
-endif()
-
-
-if(CMAKE_SYSTEM_NAME MATCHES "Cygwin")
-  add_definitions(-fno-builtin-memcmp -DCYGWIN)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(-DOS_MACOSX)
   if(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
     add_definitions(-DIOS_CROSS_COMPILE -DROCKSDB_LITE)
@@ -304,9 +215,9 @@ endif()
 
 include(CheckCXXSymbolExists)
 if(CMAKE_SYSTEM_NAME MATCHES "^FreeBSD")
-  check_cxx_symbol_exists(malloc_usable_size ${ROCKSDB_SOURCE_DIR}/malloc_np.h HAVE_MALLOC_USABLE_SIZE)
+  check_cxx_symbol_exists(malloc_usable_size "${ROCKSDB_SOURCE_DIR}/malloc_np.h" HAVE_MALLOC_USABLE_SIZE)
 else()
-  check_cxx_symbol_exists(malloc_usable_size ${ROCKSDB_SOURCE_DIR}/malloc.h HAVE_MALLOC_USABLE_SIZE)
+  check_cxx_symbol_exists(malloc_usable_size "${ROCKSDB_SOURCE_DIR}/malloc.h" HAVE_MALLOC_USABLE_SIZE)
 endif()
 if(HAVE_MALLOC_USABLE_SIZE)
   add_definitions(-DROCKSDB_MALLOC_USABLE_SIZE)
@@ -323,347 +234,316 @@ if(HAVE_AUXV_GETAUXVAL)
 endif()
 
 include_directories(${ROCKSDB_SOURCE_DIR})
-include_directories(${ROCKSDB_SOURCE_DIR}/include)
+include_directories("${ROCKSDB_SOURCE_DIR}/include")
 if(WITH_FOLLY_DISTRIBUTED_MUTEX)
-  include_directories(${ROCKSDB_SOURCE_DIR}/third-party/folly)
+  include_directories("${ROCKSDB_SOURCE_DIR}/third-party/folly")
 endif()
 find_package(Threads REQUIRED)
 
 # Main library source code
 
 set(SOURCES
-        ${ROCKSDB_SOURCE_DIR}/cache/cache.cc
-        ${ROCKSDB_SOURCE_DIR}/cache/clock_cache.cc
-        ${ROCKSDB_SOURCE_DIR}/cache/lru_cache.cc
-        ${ROCKSDB_SOURCE_DIR}/cache/sharded_cache.cc
-        ${ROCKSDB_SOURCE_DIR}/db/arena_wrapped_db_iter.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_addition.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_builder.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_cache.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_garbage.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_meta.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_format.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_sequential_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_writer.cc
-        ${ROCKSDB_SOURCE_DIR}/db/builder.cc
-        ${ROCKSDB_SOURCE_DIR}/db/c.cc
-        ${ROCKSDB_SOURCE_DIR}/db/column_family.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compacted_db_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_iterator.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_job.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_fifo.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_level.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_universal.cc
-        ${ROCKSDB_SOURCE_DIR}/db/compaction/sst_partitioner.cc
-        ${ROCKSDB_SOURCE_DIR}/db/convenience.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_filesnapshot.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_write.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_compaction_flush.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_files.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_open.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_debug.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_experimental.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_readonly.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_secondary.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_info_dumper.cc
-        ${ROCKSDB_SOURCE_DIR}/db/db_iter.cc
-        ${ROCKSDB_SOURCE_DIR}/db/dbformat.cc
-        ${ROCKSDB_SOURCE_DIR}/db/error_handler.cc
-        ${ROCKSDB_SOURCE_DIR}/db/event_helpers.cc
-        ${ROCKSDB_SOURCE_DIR}/db/experimental.cc
-        ${ROCKSDB_SOURCE_DIR}/db/external_sst_file_ingestion_job.cc
-        ${ROCKSDB_SOURCE_DIR}/db/file_indexer.cc
-        ${ROCKSDB_SOURCE_DIR}/db/flush_job.cc
-        ${ROCKSDB_SOURCE_DIR}/db/flush_scheduler.cc
-        ${ROCKSDB_SOURCE_DIR}/db/forward_iterator.cc
-        ${ROCKSDB_SOURCE_DIR}/db/import_column_family_job.cc
-        ${ROCKSDB_SOURCE_DIR}/db/internal_stats.cc
-        ${ROCKSDB_SOURCE_DIR}/db/logs_with_prep_tracker.cc
-        ${ROCKSDB_SOURCE_DIR}/db/log_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/db/log_writer.cc
-        ${ROCKSDB_SOURCE_DIR}/db/malloc_stats.cc
-        ${ROCKSDB_SOURCE_DIR}/db/memtable.cc
-        ${ROCKSDB_SOURCE_DIR}/db/memtable_list.cc
-        ${ROCKSDB_SOURCE_DIR}/db/merge_helper.cc
-        ${ROCKSDB_SOURCE_DIR}/db/merge_operator.cc
-        ${ROCKSDB_SOURCE_DIR}/db/output_validator.cc
-        ${ROCKSDB_SOURCE_DIR}/db/periodic_work_scheduler.cc
-        ${ROCKSDB_SOURCE_DIR}/db/range_del_aggregator.cc
-        ${ROCKSDB_SOURCE_DIR}/db/range_tombstone_fragmenter.cc
-        ${ROCKSDB_SOURCE_DIR}/db/repair.cc
-        ${ROCKSDB_SOURCE_DIR}/db/snapshot_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/db/table_cache.cc
-        ${ROCKSDB_SOURCE_DIR}/db/table_properties_collector.cc
-        ${ROCKSDB_SOURCE_DIR}/db/transaction_log_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/db/trim_history_scheduler.cc
-        ${ROCKSDB_SOURCE_DIR}/db/version_builder.cc
-        ${ROCKSDB_SOURCE_DIR}/db/version_edit.cc
-        ${ROCKSDB_SOURCE_DIR}/db/version_edit_handler.cc
-        ${ROCKSDB_SOURCE_DIR}/db/version_set.cc
-        ${ROCKSDB_SOURCE_DIR}/db/wal_edit.cc
-        ${ROCKSDB_SOURCE_DIR}/db/wal_manager.cc
-        ${ROCKSDB_SOURCE_DIR}/db/write_batch.cc
-        ${ROCKSDB_SOURCE_DIR}/db/write_batch_base.cc
-        ${ROCKSDB_SOURCE_DIR}/db/write_controller.cc
-        ${ROCKSDB_SOURCE_DIR}/db/write_thread.cc
-        ${ROCKSDB_SOURCE_DIR}/env/env.cc
-        ${ROCKSDB_SOURCE_DIR}/env/env_chroot.cc
-        ${ROCKSDB_SOURCE_DIR}/env/env_encryption.cc
-        ${ROCKSDB_SOURCE_DIR}/env/env_hdfs.cc
-        ${ROCKSDB_SOURCE_DIR}/env/file_system.cc
-        ${ROCKSDB_SOURCE_DIR}/env/file_system_tracer.cc
-        ${ROCKSDB_SOURCE_DIR}/env/mock_env.cc
-        ${ROCKSDB_SOURCE_DIR}/file/delete_scheduler.cc
-        ${ROCKSDB_SOURCE_DIR}/file/file_prefetch_buffer.cc
-        ${ROCKSDB_SOURCE_DIR}/file/file_util.cc
-        ${ROCKSDB_SOURCE_DIR}/file/filename.cc
-        ${ROCKSDB_SOURCE_DIR}/file/random_access_file_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/file/read_write_util.cc
-        ${ROCKSDB_SOURCE_DIR}/file/readahead_raf.cc
-        ${ROCKSDB_SOURCE_DIR}/file/sequence_file_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/file/sst_file_manager_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/file/writable_file_writer.cc
-        ${ROCKSDB_SOURCE_DIR}/logging/auto_roll_logger.cc
-        ${ROCKSDB_SOURCE_DIR}/logging/event_logger.cc
-        ${ROCKSDB_SOURCE_DIR}/logging/log_buffer.cc
-        ${ROCKSDB_SOURCE_DIR}/memory/arena.cc
-        ${ROCKSDB_SOURCE_DIR}/memory/concurrent_arena.cc
-        ${ROCKSDB_SOURCE_DIR}/memory/jemalloc_nodump_allocator.cc
-        ${ROCKSDB_SOURCE_DIR}/memory/memkind_kmem_allocator.cc
-        ${ROCKSDB_SOURCE_DIR}/memtable/alloc_tracker.cc
-        ${ROCKSDB_SOURCE_DIR}/memtable/hash_linklist_rep.cc
-        ${ROCKSDB_SOURCE_DIR}/memtable/hash_skiplist_rep.cc
-        ${ROCKSDB_SOURCE_DIR}/memtable/skiplistrep.cc
-        ${ROCKSDB_SOURCE_DIR}/memtable/vectorrep.cc
-        ${ROCKSDB_SOURCE_DIR}/memtable/write_buffer_manager.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/histogram.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/histogram_windowing.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/in_memory_stats_history.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/instrumented_mutex.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/iostats_context.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/perf_context.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/perf_level.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/persistent_stats_history.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/statistics.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_updater.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_util.cc
-        ${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_util_debug.cc
-        ${ROCKSDB_SOURCE_DIR}/options/cf_options.cc
-        ${ROCKSDB_SOURCE_DIR}/options/configurable.cc
-        ${ROCKSDB_SOURCE_DIR}/options/customizable.cc
-        ${ROCKSDB_SOURCE_DIR}/options/db_options.cc
-        ${ROCKSDB_SOURCE_DIR}/options/options.cc
-        ${ROCKSDB_SOURCE_DIR}/options/options_helper.cc
-        ${ROCKSDB_SOURCE_DIR}/options/options_parser.cc
-        ${ROCKSDB_SOURCE_DIR}/port/stack_trace.cc
-        ${ROCKSDB_SOURCE_DIR}/table/adaptive/adaptive_table_factory.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/binary_search_index_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_filter_block.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_builder.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_factory.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_iterator.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_builder.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefetcher.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefix_index.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/data_block_hash_index.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/data_block_footer.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/filter_block_reader_common.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/filter_policy.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/flush_block_policy.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/full_filter_block.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/hash_index_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/index_builder.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/index_reader_common.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/parsed_full_filter_block.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/partitioned_filter_block.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/partitioned_index_iterator.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/partitioned_index_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/reader_common.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_based/uncompression_dict_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/block_fetcher.cc
-        ${ROCKSDB_SOURCE_DIR}/table/cuckoo/cuckoo_table_builder.cc
-        ${ROCKSDB_SOURCE_DIR}/table/cuckoo/cuckoo_table_factory.cc
-        ${ROCKSDB_SOURCE_DIR}/table/cuckoo/cuckoo_table_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/format.cc
-        ${ROCKSDB_SOURCE_DIR}/table/get_context.cc
-        ${ROCKSDB_SOURCE_DIR}/table/iterator.cc
-        ${ROCKSDB_SOURCE_DIR}/table/merging_iterator.cc
-        ${ROCKSDB_SOURCE_DIR}/table/meta_blocks.cc
-        ${ROCKSDB_SOURCE_DIR}/table/persistent_cache_helper.cc
-        ${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_bloom.cc
-        ${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_builder.cc
-        ${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_factory.cc
-        ${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_index.cc
-        ${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_key_coding.cc
-        ${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/sst_file_dumper.cc
-        ${ROCKSDB_SOURCE_DIR}/table/sst_file_reader.cc
-        ${ROCKSDB_SOURCE_DIR}/table/sst_file_writer.cc
-        ${ROCKSDB_SOURCE_DIR}/table/table_factory.cc
-        ${ROCKSDB_SOURCE_DIR}/table/table_properties.cc
-        ${ROCKSDB_SOURCE_DIR}/table/two_level_iterator.cc
-        ${ROCKSDB_SOURCE_DIR}/test_util/sync_point.cc
-        ${ROCKSDB_SOURCE_DIR}/test_util/sync_point_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/test_util/testutil.cc
-        ${ROCKSDB_SOURCE_DIR}/test_util/transaction_test_util.cc
-        ${ROCKSDB_SOURCE_DIR}/tools/block_cache_analyzer/block_cache_trace_analyzer.cc
-        ${ROCKSDB_SOURCE_DIR}/tools/dump/db_dump_tool.cc
-        ${ROCKSDB_SOURCE_DIR}/tools/io_tracer_parser_tool.cc
-        ${ROCKSDB_SOURCE_DIR}/tools/ldb_cmd.cc
-        ${ROCKSDB_SOURCE_DIR}/tools/ldb_tool.cc
-        ${ROCKSDB_SOURCE_DIR}/tools/sst_dump_tool.cc
-        ${ROCKSDB_SOURCE_DIR}/tools/trace_analyzer_tool.cc
-        ${ROCKSDB_SOURCE_DIR}/trace_replay/trace_replay.cc
-        ${ROCKSDB_SOURCE_DIR}/trace_replay/block_cache_tracer.cc
-        ${ROCKSDB_SOURCE_DIR}/trace_replay/io_tracer.cc
-        ${ROCKSDB_SOURCE_DIR}/util/coding.cc
-        ${ROCKSDB_SOURCE_DIR}/util/compaction_job_stats_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/util/comparator.cc
-        ${ROCKSDB_SOURCE_DIR}/util/compression_context_cache.cc
-        ${ROCKSDB_SOURCE_DIR}/util/concurrent_task_limiter_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/util/crc32c.cc
-        ${ROCKSDB_SOURCE_DIR}/util/dynamic_bloom.cc
-        ${ROCKSDB_SOURCE_DIR}/util/hash.cc
-        ${ROCKSDB_SOURCE_DIR}/util/murmurhash.cc
-        ${ROCKSDB_SOURCE_DIR}/util/random.cc
-        ${ROCKSDB_SOURCE_DIR}/util/rate_limiter.cc
-        ${ROCKSDB_SOURCE_DIR}/util/slice.cc
-        ${ROCKSDB_SOURCE_DIR}/util/file_checksum_helper.cc
-        ${ROCKSDB_SOURCE_DIR}/util/status.cc
-        ${ROCKSDB_SOURCE_DIR}/util/string_util.cc
-        ${ROCKSDB_SOURCE_DIR}/util/thread_local.cc
-        ${ROCKSDB_SOURCE_DIR}/util/threadpool_imp.cc
-        ${ROCKSDB_SOURCE_DIR}/util/xxhash.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/backupable/backupable_db.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_compaction_filter.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db_impl_filesnapshot.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_dump_tool.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_file.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/cassandra/cassandra_compaction_filter.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/cassandra/format.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/cassandra/merge_operator.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/checkpoint/checkpoint_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/debug.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/env_mirror.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/env_timed.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/fault_injection_env.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/fault_injection_fs.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/leveldb_options/leveldb_options.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/memory/memory_util.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/bytesxor.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/max.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/put.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/sortlist.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/string_append/stringappend.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/string_append/stringappend2.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/uint64add.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/object_registry.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/option_change_migration/option_change_migration.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/options/options_util.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/block_cache_tier.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/block_cache_tier_file.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/block_cache_tier_metadata.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/persistent_cache_tier.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/volatile_tier_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/simulator_cache/cache_simulator.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/simulator_cache/sim_cache.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/table_properties_collectors/compact_on_deletion_collector.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/trace/file_trace_reader_writer.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/lock_manager.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/point/point_lock_tracker.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/point/point_lock_manager.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/optimistic_transaction_db_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/optimistic_transaction.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/pessimistic_transaction.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/pessimistic_transaction_db.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/snapshot_checker.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/transaction_base.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/transaction_db_mutex_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/transaction_util.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_prepared_txn.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_prepared_txn_db.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_unprepared_txn.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_unprepared_txn_db.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/ttl/db_ttl_impl.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/write_batch_with_index/write_batch_with_index.cc
-        ${ROCKSDB_SOURCE_DIR}/utilities/write_batch_with_index/write_batch_with_index_internal.cc
+        "${ROCKSDB_SOURCE_DIR}/cache/cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/cache/clock_cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/cache/lru_cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/cache/sharded_cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/arena_wrapped_db_iter.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_addition.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_garbage.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_meta.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_file_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_format.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_sequential_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/blob/blob_log_writer.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/c.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/column_family.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compacted_db_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/compaction.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_iterator.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_job.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_fifo.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_level.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/compaction_picker_universal.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/compaction/sst_partitioner.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/convenience.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_filesnapshot.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_write.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_compaction_flush.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_files.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_open.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_debug.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_experimental.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_readonly.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_impl/db_impl_secondary.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_info_dumper.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/db_iter.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/dbformat.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/error_handler.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/event_helpers.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/experimental.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/external_sst_file_ingestion_job.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/file_indexer.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/flush_job.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/flush_scheduler.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/forward_iterator.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/import_column_family_job.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/internal_stats.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/logs_with_prep_tracker.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/log_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/log_writer.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/malloc_stats.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/memtable.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/memtable_list.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/merge_helper.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/merge_operator.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/output_validator.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/periodic_work_scheduler.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/range_del_aggregator.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/range_tombstone_fragmenter.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/repair.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/snapshot_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/table_cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/table_properties_collector.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/transaction_log_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/trim_history_scheduler.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/version_builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/version_edit.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/version_edit_handler.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/version_set.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/wal_edit.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/wal_manager.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/write_batch.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/write_batch_base.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/write_controller.cc"
+        "${ROCKSDB_SOURCE_DIR}/db/write_thread.cc"
+        "${ROCKSDB_SOURCE_DIR}/env/env.cc"
+        "${ROCKSDB_SOURCE_DIR}/env/env_chroot.cc"
+        "${ROCKSDB_SOURCE_DIR}/env/env_encryption.cc"
+        "${ROCKSDB_SOURCE_DIR}/env/env_hdfs.cc"
+        "${ROCKSDB_SOURCE_DIR}/env/file_system.cc"
+        "${ROCKSDB_SOURCE_DIR}/env/file_system_tracer.cc"
+        "${ROCKSDB_SOURCE_DIR}/env/mock_env.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/delete_scheduler.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/file_prefetch_buffer.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/file_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/filename.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/random_access_file_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/read_write_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/readahead_raf.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/sequence_file_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/sst_file_manager_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/file/writable_file_writer.cc"
+        "${ROCKSDB_SOURCE_DIR}/logging/auto_roll_logger.cc"
+        "${ROCKSDB_SOURCE_DIR}/logging/event_logger.cc"
+        "${ROCKSDB_SOURCE_DIR}/logging/log_buffer.cc"
+        "${ROCKSDB_SOURCE_DIR}/memory/arena.cc"
+        "${ROCKSDB_SOURCE_DIR}/memory/concurrent_arena.cc"
+        "${ROCKSDB_SOURCE_DIR}/memory/jemalloc_nodump_allocator.cc"
+        "${ROCKSDB_SOURCE_DIR}/memory/memkind_kmem_allocator.cc"
+        "${ROCKSDB_SOURCE_DIR}/memtable/alloc_tracker.cc"
+        "${ROCKSDB_SOURCE_DIR}/memtable/hash_linklist_rep.cc"
+        "${ROCKSDB_SOURCE_DIR}/memtable/hash_skiplist_rep.cc"
+        "${ROCKSDB_SOURCE_DIR}/memtable/skiplistrep.cc"
+        "${ROCKSDB_SOURCE_DIR}/memtable/vectorrep.cc"
+        "${ROCKSDB_SOURCE_DIR}/memtable/write_buffer_manager.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/histogram.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/histogram_windowing.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/in_memory_stats_history.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/instrumented_mutex.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/iostats_context.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/perf_context.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/perf_level.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/persistent_stats_history.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/statistics.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_updater.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/monitoring/thread_status_util_debug.cc"
+        "${ROCKSDB_SOURCE_DIR}/options/cf_options.cc"
+        "${ROCKSDB_SOURCE_DIR}/options/configurable.cc"
+        "${ROCKSDB_SOURCE_DIR}/options/customizable.cc"
+        "${ROCKSDB_SOURCE_DIR}/options/db_options.cc"
+        "${ROCKSDB_SOURCE_DIR}/options/options.cc"
+        "${ROCKSDB_SOURCE_DIR}/options/options_helper.cc"
+        "${ROCKSDB_SOURCE_DIR}/options/options_parser.cc"
+        "${ROCKSDB_SOURCE_DIR}/port/stack_trace.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/adaptive/adaptive_table_factory.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/binary_search_index_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_filter_block.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_factory.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_iterator.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_based_table_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefetcher.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/block_prefix_index.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/data_block_hash_index.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/data_block_footer.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/filter_block_reader_common.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/filter_policy.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/flush_block_policy.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/full_filter_block.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/hash_index_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/index_builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/index_reader_common.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/parsed_full_filter_block.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/partitioned_filter_block.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/partitioned_index_iterator.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/partitioned_index_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/reader_common.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_based/uncompression_dict_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/block_fetcher.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/cuckoo/cuckoo_table_builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/cuckoo/cuckoo_table_factory.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/cuckoo/cuckoo_table_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/format.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/get_context.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/iterator.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/merging_iterator.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/meta_blocks.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/persistent_cache_helper.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_bloom.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_builder.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_factory.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_index.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_key_coding.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/sst_file_dumper.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/sst_file_reader.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/sst_file_writer.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/table_factory.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/table_properties.cc"
+        "${ROCKSDB_SOURCE_DIR}/table/two_level_iterator.cc"
+        "${ROCKSDB_SOURCE_DIR}/test_util/sync_point.cc"
+        "${ROCKSDB_SOURCE_DIR}/test_util/sync_point_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/test_util/testutil.cc"
+        "${ROCKSDB_SOURCE_DIR}/test_util/transaction_test_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/tools/block_cache_analyzer/block_cache_trace_analyzer.cc"
+        "${ROCKSDB_SOURCE_DIR}/tools/dump/db_dump_tool.cc"
+        "${ROCKSDB_SOURCE_DIR}/tools/io_tracer_parser_tool.cc"
+        "${ROCKSDB_SOURCE_DIR}/tools/ldb_cmd.cc"
+        "${ROCKSDB_SOURCE_DIR}/tools/ldb_tool.cc"
+        "${ROCKSDB_SOURCE_DIR}/tools/sst_dump_tool.cc"
+        "${ROCKSDB_SOURCE_DIR}/tools/trace_analyzer_tool.cc"
+        "${ROCKSDB_SOURCE_DIR}/trace_replay/trace_replay.cc"
+        "${ROCKSDB_SOURCE_DIR}/trace_replay/block_cache_tracer.cc"
+        "${ROCKSDB_SOURCE_DIR}/trace_replay/io_tracer.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/coding.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/compaction_job_stats_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/comparator.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/compression_context_cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/concurrent_task_limiter_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/crc32c.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/dynamic_bloom.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/hash.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/murmurhash.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/random.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/rate_limiter.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/slice.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/file_checksum_helper.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/status.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/string_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/thread_local.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/threadpool_imp.cc"
+        "${ROCKSDB_SOURCE_DIR}/util/xxhash.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/backupable/backupable_db.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_compaction_filter.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_db_impl_filesnapshot.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_dump_tool.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/blob_db/blob_file.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/cassandra/cassandra_compaction_filter.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/cassandra/format.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/cassandra/merge_operator.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/checkpoint/checkpoint_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/debug.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/env_mirror.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/env_timed.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/fault_injection_env.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/fault_injection_fs.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/leveldb_options/leveldb_options.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/memory/memory_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/bytesxor.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/max.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/put.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/sortlist.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/string_append/stringappend.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/string_append/stringappend2.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/merge_operators/uint64add.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/object_registry.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/option_change_migration/option_change_migration.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/options/options_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/block_cache_tier.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/block_cache_tier_file.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/block_cache_tier_metadata.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/persistent_cache_tier.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/persistent_cache/volatile_tier_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/simulator_cache/cache_simulator.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/simulator_cache/sim_cache.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/table_properties_collectors/compact_on_deletion_collector.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/trace/file_trace_reader_writer.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/lock_manager.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/point/point_lock_tracker.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/point/point_lock_manager.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/optimistic_transaction_db_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/optimistic_transaction.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/pessimistic_transaction.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/pessimistic_transaction_db.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/snapshot_checker.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/transaction_base.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/transaction_db_mutex_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/transaction_util.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_prepared_txn.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_prepared_txn_db.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_unprepared_txn.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/transactions/write_unprepared_txn_db.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/ttl/db_ttl_impl.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/write_batch_with_index/write_batch_with_index.cc"
+        "${ROCKSDB_SOURCE_DIR}/utilities/write_batch_with_index/write_batch_with_index_internal.cc"
         $<TARGET_OBJECTS:rocksdb_build_version>)
 
 if(HAVE_SSE42 AND NOT MSVC)
   set_source_files_properties(
-    ${ROCKSDB_SOURCE_DIR}/util/crc32c.cc
+    "${ROCKSDB_SOURCE_DIR}/util/crc32c.cc"
     PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul")
 endif()
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
   list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/util/crc32c_ppc.c
-    ${ROCKSDB_SOURCE_DIR}/util/crc32c_ppc_asm.S)
+    "${ROCKSDB_SOURCE_DIR}/util/crc32c_ppc.c"
+    "${ROCKSDB_SOURCE_DIR}/util/crc32c_ppc_asm.S")
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
 
 if(HAS_ARMV8_CRC)
   list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/util/crc32c_arm64.cc)
+    "${ROCKSDB_SOURCE_DIR}/util/crc32c_arm64.cc")
 endif(HAS_ARMV8_CRC)
 
-if(WIN32)
-  list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/port/win/io_win.cc
-    ${ROCKSDB_SOURCE_DIR}/port/win/env_win.cc
-    ${ROCKSDB_SOURCE_DIR}/port/win/env_default.cc
-    ${ROCKSDB_SOURCE_DIR}/port/win/port_win.cc
-    ${ROCKSDB_SOURCE_DIR}/port/win/win_logger.cc)
-  if(NOT MINGW)
-    # Mingw only supports std::thread when using
-    # posix threads.
-    list(APPEND SOURCES
-      ${ROCKSDB_SOURCE_DIR}/port/win/win_thread.cc)
-  endif()
-if(WITH_XPRESS)
-  list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/port/win/xpress_win.cc)
-endif()
-
-if(WITH_JEMALLOC)
-  list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/port/win/win_jemalloc.cc)
-endif()
-
-else()
-  list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/port/port_posix.cc
-    ${ROCKSDB_SOURCE_DIR}/env/env_posix.cc
-    ${ROCKSDB_SOURCE_DIR}/env/fs_posix.cc
-    ${ROCKSDB_SOURCE_DIR}/env/io_posix.cc)
-endif()
+list(APPEND SOURCES
+    "${ROCKSDB_SOURCE_DIR}/port/port_posix.cc"
+    "${ROCKSDB_SOURCE_DIR}/env/env_posix.cc"
+    "${ROCKSDB_SOURCE_DIR}/env/fs_posix.cc"
+    "${ROCKSDB_SOURCE_DIR}/env/io_posix.cc")
 
 if(WITH_FOLLY_DISTRIBUTED_MUTEX)
   list(APPEND SOURCES
-    ${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/detail/Futex.cpp
-    ${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/AtomicNotification.cpp
-    ${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/DistributedMutex.cpp
-    ${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/ParkingLot.cpp
-    ${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/WaitOptions.cpp)
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/detail/Futex.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/AtomicNotification.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/DistributedMutex.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/ParkingLot.cpp"
+    "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/WaitOptions.cpp")
 endif()
 
 set(ROCKSDB_STATIC_LIB rocksdb)
 
-if(WIN32)
-  set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
-else()
-  set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
 add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES})
 target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
   ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
diff --git a/contrib/rocksdb-cmake/rocksdb_build_version.cc b/contrib/rocksdb-cmake/rocksdb_build_version.cc
new file mode 100644
index 00000000000..8697652ae9f
--- /dev/null
+++ b/contrib/rocksdb-cmake/rocksdb_build_version.cc
@@ -0,0 +1,3 @@
+const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:0";
+const char* rocksdb_build_git_date = "rocksdb_build_git_date:2000-01-01";
+const char* rocksdb_build_compile_date = "2000-01-01";
diff --git a/contrib/simdjson b/contrib/simdjson
index 95b4870e20b..8df32cea335 160000
--- a/contrib/simdjson
+++ b/contrib/simdjson
@@ -1 +1 @@
-Subproject commit 95b4870e20be5f97d9dcf63b23b1c6f520c366c1
+Subproject commit 8df32cea3359cb30120795da6020b3b73da01d38
diff --git a/contrib/simdjson-cmake/CMakeLists.txt b/contrib/simdjson-cmake/CMakeLists.txt
index 2fb60b905da..d3bcf6c046c 100644
--- a/contrib/simdjson-cmake/CMakeLists.txt
+++ b/contrib/simdjson-cmake/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(SIMDJSON_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/simdjson/include")
 set(SIMDJSON_SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/simdjson/src")
-set(SIMDJSON_SRC ${SIMDJSON_SRC_DIR}/simdjson.cpp)
+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}")
diff --git a/contrib/stats-cmake/CMakeLists.txt b/contrib/stats-cmake/CMakeLists.txt
index a159e85a0e3..8279e49c3f0 100644
--- a/contrib/stats-cmake/CMakeLists.txt
+++ b/contrib/stats-cmake/CMakeLists.txt
@@ -1,7 +1,7 @@
 # The stats is a header-only library of probability density functions,
 # cumulative distribution functions, quantile functions, and random sampling methods.
-set(STATS_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/stats/include)
-set(GCEM_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/gcem/include)
+set(STATS_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/stats/include")
+set(GCEM_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/gcem/include")
 
 add_library(stats INTERFACE)
 
diff --git a/contrib/unixodbc-cmake/CMakeLists.txt b/contrib/unixodbc-cmake/CMakeLists.txt
index c971c4bdd89..c154533739c 100644
--- a/contrib/unixodbc-cmake/CMakeLists.txt
+++ b/contrib/unixodbc-cmake/CMakeLists.txt
@@ -2,7 +2,7 @@ if (NOT USE_INTERNAL_ODBC_LIBRARY)
     return()
 endif()
 
-set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/unixodbc)
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/unixodbc")
 
 # ltdl
 
@@ -10,14 +10,14 @@ set (SRCS_LTDL
     # This file is generated by 'libtool' inside libltdl directory and then removed.
     linux_x86_64/libltdl/libltdlcS.c
 
-    ${LIBRARY_DIR}/libltdl/lt__alloc.c
-    ${LIBRARY_DIR}/libltdl/lt__strl.c
-    ${LIBRARY_DIR}/libltdl/ltdl.c
-    ${LIBRARY_DIR}/libltdl/lt_dlloader.c
-    ${LIBRARY_DIR}/libltdl/slist.c
-    ${LIBRARY_DIR}/libltdl/lt_error.c
-    ${LIBRARY_DIR}/libltdl/loaders/dlopen.c
-    ${LIBRARY_DIR}/libltdl/loaders/preopen.c
+    "${LIBRARY_DIR}/libltdl/lt__alloc.c"
+    "${LIBRARY_DIR}/libltdl/lt__strl.c"
+    "${LIBRARY_DIR}/libltdl/ltdl.c"
+    "${LIBRARY_DIR}/libltdl/lt_dlloader.c"
+    "${LIBRARY_DIR}/libltdl/slist.c"
+    "${LIBRARY_DIR}/libltdl/lt_error.c"
+    "${LIBRARY_DIR}/libltdl/loaders/dlopen.c"
+    "${LIBRARY_DIR}/libltdl/loaders/preopen.c"
 )
 
 add_library (ltdl ${SRCS_LTDL})
@@ -26,8 +26,8 @@ target_include_directories(ltdl
     PRIVATE
         linux_x86_64/libltdl
     PUBLIC
-        ${LIBRARY_DIR}/libltdl
-        ${LIBRARY_DIR}/libltdl/libltdl
+        "${LIBRARY_DIR}/libltdl"
+        "${LIBRARY_DIR}/libltdl/libltdl"
 )
 target_compile_definitions(ltdl PRIVATE -DHAVE_CONFIG_H -DLTDL -DLTDLOPEN=libltdlc)
 target_compile_options(ltdl PRIVATE -Wno-constant-logical-operand -Wno-unknown-warning-option -O2)
@@ -35,238 +35,238 @@ target_compile_options(ltdl PRIVATE -Wno-constant-logical-operand -Wno-unknown-w
 # odbc
 
 set (SRCS
-    ${LIBRARY_DIR}/DriverManager/__attribute.c
-    ${LIBRARY_DIR}/DriverManager/__connection.c
-    ${LIBRARY_DIR}/DriverManager/__handles.c
-    ${LIBRARY_DIR}/DriverManager/__info.c
-    ${LIBRARY_DIR}/DriverManager/__stats.c
-    ${LIBRARY_DIR}/DriverManager/SQLAllocConnect.c
-    ${LIBRARY_DIR}/DriverManager/SQLAllocEnv.c
-    ${LIBRARY_DIR}/DriverManager/SQLAllocHandle.c
-    ${LIBRARY_DIR}/DriverManager/SQLAllocHandleStd.c
-    ${LIBRARY_DIR}/DriverManager/SQLAllocStmt.c
-    ${LIBRARY_DIR}/DriverManager/SQLBindCol.c
-    ${LIBRARY_DIR}/DriverManager/SQLBindParam.c
-    ${LIBRARY_DIR}/DriverManager/SQLBindParameter.c
-    ${LIBRARY_DIR}/DriverManager/SQLBrowseConnect.c
-    ${LIBRARY_DIR}/DriverManager/SQLBrowseConnectW.c
-    ${LIBRARY_DIR}/DriverManager/SQLBulkOperations.c
-    ${LIBRARY_DIR}/DriverManager/SQLCancel.c
-    ${LIBRARY_DIR}/DriverManager/SQLCancelHandle.c
-    ${LIBRARY_DIR}/DriverManager/SQLCloseCursor.c
-    ${LIBRARY_DIR}/DriverManager/SQLColAttribute.c
-    ${LIBRARY_DIR}/DriverManager/SQLColAttributes.c
-    ${LIBRARY_DIR}/DriverManager/SQLColAttributesW.c
-    ${LIBRARY_DIR}/DriverManager/SQLColAttributeW.c
-    ${LIBRARY_DIR}/DriverManager/SQLColumnPrivileges.c
-    ${LIBRARY_DIR}/DriverManager/SQLColumnPrivilegesW.c
-    ${LIBRARY_DIR}/DriverManager/SQLColumns.c
-    ${LIBRARY_DIR}/DriverManager/SQLColumnsW.c
-    ${LIBRARY_DIR}/DriverManager/SQLConnect.c
-    ${LIBRARY_DIR}/DriverManager/SQLConnectW.c
-    ${LIBRARY_DIR}/DriverManager/SQLCopyDesc.c
-    ${LIBRARY_DIR}/DriverManager/SQLDataSources.c
-    ${LIBRARY_DIR}/DriverManager/SQLDataSourcesW.c
-    ${LIBRARY_DIR}/DriverManager/SQLDescribeCol.c
-    ${LIBRARY_DIR}/DriverManager/SQLDescribeColW.c
-    ${LIBRARY_DIR}/DriverManager/SQLDescribeParam.c
-    ${LIBRARY_DIR}/DriverManager/SQLDisconnect.c
-    ${LIBRARY_DIR}/DriverManager/SQLDriverConnect.c
-    ${LIBRARY_DIR}/DriverManager/SQLDriverConnectW.c
-    ${LIBRARY_DIR}/DriverManager/SQLDrivers.c
-    ${LIBRARY_DIR}/DriverManager/SQLDriversW.c
-    ${LIBRARY_DIR}/DriverManager/SQLEndTran.c
-    ${LIBRARY_DIR}/DriverManager/SQLError.c
-    ${LIBRARY_DIR}/DriverManager/SQLErrorW.c
-    ${LIBRARY_DIR}/DriverManager/SQLExecDirect.c
-    ${LIBRARY_DIR}/DriverManager/SQLExecDirectW.c
-    ${LIBRARY_DIR}/DriverManager/SQLExecute.c
-    ${LIBRARY_DIR}/DriverManager/SQLExtendedFetch.c
-    ${LIBRARY_DIR}/DriverManager/SQLFetch.c
-    ${LIBRARY_DIR}/DriverManager/SQLFetchScroll.c
-    ${LIBRARY_DIR}/DriverManager/SQLForeignKeys.c
-    ${LIBRARY_DIR}/DriverManager/SQLForeignKeysW.c
-    ${LIBRARY_DIR}/DriverManager/SQLFreeConnect.c
-    ${LIBRARY_DIR}/DriverManager/SQLFreeEnv.c
-    ${LIBRARY_DIR}/DriverManager/SQLFreeHandle.c
-    ${LIBRARY_DIR}/DriverManager/SQLFreeStmt.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetConnectAttr.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetConnectAttrW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetConnectOption.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetConnectOptionW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetCursorName.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetCursorNameW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetData.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDescField.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDescFieldW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDescRec.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDescRecW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDiagField.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDiagFieldW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDiagRec.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetDiagRecW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetEnvAttr.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetFunctions.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetInfo.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetInfoW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetStmtAttr.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetStmtAttrW.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetStmtOption.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetTypeInfo.c
-    ${LIBRARY_DIR}/DriverManager/SQLGetTypeInfoW.c
-    ${LIBRARY_DIR}/DriverManager/SQLMoreResults.c
-    ${LIBRARY_DIR}/DriverManager/SQLNativeSql.c
-    ${LIBRARY_DIR}/DriverManager/SQLNativeSqlW.c
-    ${LIBRARY_DIR}/DriverManager/SQLNumParams.c
-    ${LIBRARY_DIR}/DriverManager/SQLNumResultCols.c
-    ${LIBRARY_DIR}/DriverManager/SQLParamData.c
-    ${LIBRARY_DIR}/DriverManager/SQLParamOptions.c
-    ${LIBRARY_DIR}/DriverManager/SQLPrepare.c
-    ${LIBRARY_DIR}/DriverManager/SQLPrepareW.c
-    ${LIBRARY_DIR}/DriverManager/SQLPrimaryKeys.c
-    ${LIBRARY_DIR}/DriverManager/SQLPrimaryKeysW.c
-    ${LIBRARY_DIR}/DriverManager/SQLProcedureColumns.c
-    ${LIBRARY_DIR}/DriverManager/SQLProcedureColumnsW.c
-    ${LIBRARY_DIR}/DriverManager/SQLProcedures.c
-    ${LIBRARY_DIR}/DriverManager/SQLProceduresW.c
-    ${LIBRARY_DIR}/DriverManager/SQLPutData.c
-    ${LIBRARY_DIR}/DriverManager/SQLRowCount.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetConnectAttr.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetConnectAttrW.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetConnectOption.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetConnectOptionW.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetCursorName.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetCursorNameW.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetDescField.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetDescFieldW.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetDescRec.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetEnvAttr.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetParam.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetPos.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetScrollOptions.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetStmtAttr.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetStmtAttrW.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetStmtOption.c
-    ${LIBRARY_DIR}/DriverManager/SQLSetStmtOptionW.c
-    ${LIBRARY_DIR}/DriverManager/SQLSpecialColumns.c
-    ${LIBRARY_DIR}/DriverManager/SQLSpecialColumnsW.c
-    ${LIBRARY_DIR}/DriverManager/SQLStatistics.c
-    ${LIBRARY_DIR}/DriverManager/SQLStatisticsW.c
-    ${LIBRARY_DIR}/DriverManager/SQLTablePrivileges.c
-    ${LIBRARY_DIR}/DriverManager/SQLTablePrivilegesW.c
-    ${LIBRARY_DIR}/DriverManager/SQLTables.c
-    ${LIBRARY_DIR}/DriverManager/SQLTablesW.c
-    ${LIBRARY_DIR}/DriverManager/SQLTransact.c
-    ${LIBRARY_DIR}/ini/_iniDump.c
-    ${LIBRARY_DIR}/ini/_iniObjectRead.c
-    ${LIBRARY_DIR}/ini/_iniPropertyRead.c
-    ${LIBRARY_DIR}/ini/_iniScanUntilObject.c
-    ${LIBRARY_DIR}/ini/iniAllTrim.c
-    ${LIBRARY_DIR}/ini/iniAppend.c
-    ${LIBRARY_DIR}/ini/iniClose.c
-    ${LIBRARY_DIR}/ini/iniCommit.c
-    ${LIBRARY_DIR}/ini/iniCursor.c
-    ${LIBRARY_DIR}/ini/iniDelete.c
-    ${LIBRARY_DIR}/ini/iniElement.c
-    ${LIBRARY_DIR}/ini/iniElementCount.c
-    ${LIBRARY_DIR}/ini/iniGetBookmark.c
-    ${LIBRARY_DIR}/ini/iniGotoBookmark.c
-    ${LIBRARY_DIR}/ini/iniObject.c
-    ${LIBRARY_DIR}/ini/iniObjectDelete.c
-    ${LIBRARY_DIR}/ini/iniObjectEOL.c
-    ${LIBRARY_DIR}/ini/iniObjectFirst.c
-    ${LIBRARY_DIR}/ini/iniObjectInsert.c
-    ${LIBRARY_DIR}/ini/iniObjectLast.c
-    ${LIBRARY_DIR}/ini/iniObjectNext.c
-    ${LIBRARY_DIR}/ini/iniObjectSeek.c
-    ${LIBRARY_DIR}/ini/iniObjectSeekSure.c
-    ${LIBRARY_DIR}/ini/iniObjectUpdate.c
-    ${LIBRARY_DIR}/ini/iniOpen.c
-    ${LIBRARY_DIR}/ini/iniProperty.c
-    ${LIBRARY_DIR}/ini/iniPropertyDelete.c
-    ${LIBRARY_DIR}/ini/iniPropertyEOL.c
-    ${LIBRARY_DIR}/ini/iniPropertyFirst.c
-    ${LIBRARY_DIR}/ini/iniPropertyInsert.c
-    ${LIBRARY_DIR}/ini/iniPropertyLast.c
-    ${LIBRARY_DIR}/ini/iniPropertyNext.c
-    ${LIBRARY_DIR}/ini/iniPropertySeek.c
-    ${LIBRARY_DIR}/ini/iniPropertySeekSure.c
-    ${LIBRARY_DIR}/ini/iniPropertyUpdate.c
-    ${LIBRARY_DIR}/ini/iniPropertyValue.c
-    ${LIBRARY_DIR}/ini/iniToUpper.c
-    ${LIBRARY_DIR}/ini/iniValue.c
-    ${LIBRARY_DIR}/log/_logFreeMsg.c
-    ${LIBRARY_DIR}/log/logClear.c
-    ${LIBRARY_DIR}/log/logClose.c
-    ${LIBRARY_DIR}/log/logOn.c
-    ${LIBRARY_DIR}/log/logOpen.c
-    ${LIBRARY_DIR}/log/logPeekMsg.c
-    ${LIBRARY_DIR}/log/logPopMsg.c
-    ${LIBRARY_DIR}/log/logPushMsg.c
-    ${LIBRARY_DIR}/lst/_lstAdjustCurrent.c
-    ${LIBRARY_DIR}/lst/_lstDump.c
-    ${LIBRARY_DIR}/lst/_lstFreeItem.c
-    ${LIBRARY_DIR}/lst/_lstNextValidItem.c
-    ${LIBRARY_DIR}/lst/_lstPrevValidItem.c
-    ${LIBRARY_DIR}/lst/_lstVisible.c
-    ${LIBRARY_DIR}/lst/lstAppend.c
-    ${LIBRARY_DIR}/lst/lstClose.c
-    ${LIBRARY_DIR}/lst/lstDelete.c
-    ${LIBRARY_DIR}/lst/lstEOL.c
-    ${LIBRARY_DIR}/lst/lstFirst.c
-    ${LIBRARY_DIR}/lst/lstGet.c
-    ${LIBRARY_DIR}/lst/lstGetBookMark.c
-    ${LIBRARY_DIR}/lst/lstGoto.c
-    ${LIBRARY_DIR}/lst/lstGotoBookMark.c
-    ${LIBRARY_DIR}/lst/lstInsert.c
-    ${LIBRARY_DIR}/lst/lstLast.c
-    ${LIBRARY_DIR}/lst/lstNext.c
-    ${LIBRARY_DIR}/lst/lstOpen.c
-    ${LIBRARY_DIR}/lst/lstOpenCursor.c
-    ${LIBRARY_DIR}/lst/lstPrev.c
-    ${LIBRARY_DIR}/lst/lstSeek.c
-    ${LIBRARY_DIR}/lst/lstSeekItem.c
-    ${LIBRARY_DIR}/lst/lstSet.c
-    ${LIBRARY_DIR}/lst/lstSetFreeFunc.c
-    ${LIBRARY_DIR}/odbcinst/_logging.c
-    ${LIBRARY_DIR}/odbcinst/_odbcinst_ConfigModeINI.c
-    ${LIBRARY_DIR}/odbcinst/_odbcinst_GetEntries.c
-    ${LIBRARY_DIR}/odbcinst/_odbcinst_GetSections.c
-    ${LIBRARY_DIR}/odbcinst/_odbcinst_SystemINI.c
-    ${LIBRARY_DIR}/odbcinst/_odbcinst_UserINI.c
-    ${LIBRARY_DIR}/odbcinst/_SQLDriverConnectPrompt.c
-    ${LIBRARY_DIR}/odbcinst/_SQLGetInstalledDrivers.c
-    ${LIBRARY_DIR}/odbcinst/_SQLWriteInstalledDrivers.c
-    ${LIBRARY_DIR}/odbcinst/ODBCINSTConstructProperties.c
-    ${LIBRARY_DIR}/odbcinst/ODBCINSTDestructProperties.c
-    ${LIBRARY_DIR}/odbcinst/ODBCINSTSetProperty.c
-    ${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperties.c
-    ${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperty.c
-    ${LIBRARY_DIR}/odbcinst/SQLConfigDataSource.c
-    ${LIBRARY_DIR}/odbcinst/SQLConfigDriver.c
-    ${LIBRARY_DIR}/odbcinst/SQLCreateDataSource.c
-    ${LIBRARY_DIR}/odbcinst/SQLGetAvailableDrivers.c
-    ${LIBRARY_DIR}/odbcinst/SQLGetConfigMode.c
-    ${LIBRARY_DIR}/odbcinst/SQLGetInstalledDrivers.c
-    ${LIBRARY_DIR}/odbcinst/SQLGetPrivateProfileString.c
-    ${LIBRARY_DIR}/odbcinst/SQLGetTranslator.c
-    ${LIBRARY_DIR}/odbcinst/SQLInstallDriverEx.c
-    ${LIBRARY_DIR}/odbcinst/SQLInstallDriverManager.c
-    ${LIBRARY_DIR}/odbcinst/SQLInstallerError.c
-    ${LIBRARY_DIR}/odbcinst/SQLInstallODBC.c
-    ${LIBRARY_DIR}/odbcinst/SQLInstallTranslatorEx.c
-    ${LIBRARY_DIR}/odbcinst/SQLManageDataSources.c
-    ${LIBRARY_DIR}/odbcinst/SQLPostInstallerError.c
-    ${LIBRARY_DIR}/odbcinst/SQLReadFileDSN.c
-    ${LIBRARY_DIR}/odbcinst/SQLRemoveDriver.c
-    ${LIBRARY_DIR}/odbcinst/SQLRemoveDriverManager.c
-    ${LIBRARY_DIR}/odbcinst/SQLRemoveDSNFromIni.c
-    ${LIBRARY_DIR}/odbcinst/SQLRemoveTranslator.c
-    ${LIBRARY_DIR}/odbcinst/SQLSetConfigMode.c
-    ${LIBRARY_DIR}/odbcinst/SQLValidDSN.c
-    ${LIBRARY_DIR}/odbcinst/SQLWriteDSNToIni.c
-    ${LIBRARY_DIR}/odbcinst/SQLWriteFileDSN.c
-    ${LIBRARY_DIR}/odbcinst/SQLWritePrivateProfileString.c
+    "${LIBRARY_DIR}/DriverManager/__attribute.c"
+    "${LIBRARY_DIR}/DriverManager/__connection.c"
+    "${LIBRARY_DIR}/DriverManager/__handles.c"
+    "${LIBRARY_DIR}/DriverManager/__info.c"
+    "${LIBRARY_DIR}/DriverManager/__stats.c"
+    "${LIBRARY_DIR}/DriverManager/SQLAllocConnect.c"
+    "${LIBRARY_DIR}/DriverManager/SQLAllocEnv.c"
+    "${LIBRARY_DIR}/DriverManager/SQLAllocHandle.c"
+    "${LIBRARY_DIR}/DriverManager/SQLAllocHandleStd.c"
+    "${LIBRARY_DIR}/DriverManager/SQLAllocStmt.c"
+    "${LIBRARY_DIR}/DriverManager/SQLBindCol.c"
+    "${LIBRARY_DIR}/DriverManager/SQLBindParam.c"
+    "${LIBRARY_DIR}/DriverManager/SQLBindParameter.c"
+    "${LIBRARY_DIR}/DriverManager/SQLBrowseConnect.c"
+    "${LIBRARY_DIR}/DriverManager/SQLBrowseConnectW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLBulkOperations.c"
+    "${LIBRARY_DIR}/DriverManager/SQLCancel.c"
+    "${LIBRARY_DIR}/DriverManager/SQLCancelHandle.c"
+    "${LIBRARY_DIR}/DriverManager/SQLCloseCursor.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColAttribute.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColAttributes.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColAttributesW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColAttributeW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColumnPrivileges.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColumnPrivilegesW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColumns.c"
+    "${LIBRARY_DIR}/DriverManager/SQLColumnsW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLConnect.c"
+    "${LIBRARY_DIR}/DriverManager/SQLConnectW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLCopyDesc.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDataSources.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDataSourcesW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDescribeCol.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDescribeColW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDescribeParam.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDisconnect.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDriverConnect.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDriverConnectW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDrivers.c"
+    "${LIBRARY_DIR}/DriverManager/SQLDriversW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLEndTran.c"
+    "${LIBRARY_DIR}/DriverManager/SQLError.c"
+    "${LIBRARY_DIR}/DriverManager/SQLErrorW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLExecDirect.c"
+    "${LIBRARY_DIR}/DriverManager/SQLExecDirectW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLExecute.c"
+    "${LIBRARY_DIR}/DriverManager/SQLExtendedFetch.c"
+    "${LIBRARY_DIR}/DriverManager/SQLFetch.c"
+    "${LIBRARY_DIR}/DriverManager/SQLFetchScroll.c"
+    "${LIBRARY_DIR}/DriverManager/SQLForeignKeys.c"
+    "${LIBRARY_DIR}/DriverManager/SQLForeignKeysW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLFreeConnect.c"
+    "${LIBRARY_DIR}/DriverManager/SQLFreeEnv.c"
+    "${LIBRARY_DIR}/DriverManager/SQLFreeHandle.c"
+    "${LIBRARY_DIR}/DriverManager/SQLFreeStmt.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetConnectAttr.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetConnectAttrW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetConnectOption.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetConnectOptionW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetCursorName.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetCursorNameW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetData.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDescField.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDescFieldW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDescRec.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDescRecW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDiagField.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDiagFieldW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDiagRec.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetDiagRecW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetEnvAttr.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetFunctions.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetInfo.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetInfoW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetStmtAttr.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetStmtAttrW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetStmtOption.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetTypeInfo.c"
+    "${LIBRARY_DIR}/DriverManager/SQLGetTypeInfoW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLMoreResults.c"
+    "${LIBRARY_DIR}/DriverManager/SQLNativeSql.c"
+    "${LIBRARY_DIR}/DriverManager/SQLNativeSqlW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLNumParams.c"
+    "${LIBRARY_DIR}/DriverManager/SQLNumResultCols.c"
+    "${LIBRARY_DIR}/DriverManager/SQLParamData.c"
+    "${LIBRARY_DIR}/DriverManager/SQLParamOptions.c"
+    "${LIBRARY_DIR}/DriverManager/SQLPrepare.c"
+    "${LIBRARY_DIR}/DriverManager/SQLPrepareW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLPrimaryKeys.c"
+    "${LIBRARY_DIR}/DriverManager/SQLPrimaryKeysW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLProcedureColumns.c"
+    "${LIBRARY_DIR}/DriverManager/SQLProcedureColumnsW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLProcedures.c"
+    "${LIBRARY_DIR}/DriverManager/SQLProceduresW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLPutData.c"
+    "${LIBRARY_DIR}/DriverManager/SQLRowCount.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetConnectAttr.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetConnectAttrW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetConnectOption.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetConnectOptionW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetCursorName.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetCursorNameW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetDescField.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetDescFieldW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetDescRec.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetEnvAttr.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetParam.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetPos.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetScrollOptions.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetStmtAttr.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetStmtAttrW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetStmtOption.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSetStmtOptionW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSpecialColumns.c"
+    "${LIBRARY_DIR}/DriverManager/SQLSpecialColumnsW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLStatistics.c"
+    "${LIBRARY_DIR}/DriverManager/SQLStatisticsW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLTablePrivileges.c"
+    "${LIBRARY_DIR}/DriverManager/SQLTablePrivilegesW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLTables.c"
+    "${LIBRARY_DIR}/DriverManager/SQLTablesW.c"
+    "${LIBRARY_DIR}/DriverManager/SQLTransact.c"
+    "${LIBRARY_DIR}/ini/_iniDump.c"
+    "${LIBRARY_DIR}/ini/_iniObjectRead.c"
+    "${LIBRARY_DIR}/ini/_iniPropertyRead.c"
+    "${LIBRARY_DIR}/ini/_iniScanUntilObject.c"
+    "${LIBRARY_DIR}/ini/iniAllTrim.c"
+    "${LIBRARY_DIR}/ini/iniAppend.c"
+    "${LIBRARY_DIR}/ini/iniClose.c"
+    "${LIBRARY_DIR}/ini/iniCommit.c"
+    "${LIBRARY_DIR}/ini/iniCursor.c"
+    "${LIBRARY_DIR}/ini/iniDelete.c"
+    "${LIBRARY_DIR}/ini/iniElement.c"
+    "${LIBRARY_DIR}/ini/iniElementCount.c"
+    "${LIBRARY_DIR}/ini/iniGetBookmark.c"
+    "${LIBRARY_DIR}/ini/iniGotoBookmark.c"
+    "${LIBRARY_DIR}/ini/iniObject.c"
+    "${LIBRARY_DIR}/ini/iniObjectDelete.c"
+    "${LIBRARY_DIR}/ini/iniObjectEOL.c"
+    "${LIBRARY_DIR}/ini/iniObjectFirst.c"
+    "${LIBRARY_DIR}/ini/iniObjectInsert.c"
+    "${LIBRARY_DIR}/ini/iniObjectLast.c"
+    "${LIBRARY_DIR}/ini/iniObjectNext.c"
+    "${LIBRARY_DIR}/ini/iniObjectSeek.c"
+    "${LIBRARY_DIR}/ini/iniObjectSeekSure.c"
+    "${LIBRARY_DIR}/ini/iniObjectUpdate.c"
+    "${LIBRARY_DIR}/ini/iniOpen.c"
+    "${LIBRARY_DIR}/ini/iniProperty.c"
+    "${LIBRARY_DIR}/ini/iniPropertyDelete.c"
+    "${LIBRARY_DIR}/ini/iniPropertyEOL.c"
+    "${LIBRARY_DIR}/ini/iniPropertyFirst.c"
+    "${LIBRARY_DIR}/ini/iniPropertyInsert.c"
+    "${LIBRARY_DIR}/ini/iniPropertyLast.c"
+    "${LIBRARY_DIR}/ini/iniPropertyNext.c"
+    "${LIBRARY_DIR}/ini/iniPropertySeek.c"
+    "${LIBRARY_DIR}/ini/iniPropertySeekSure.c"
+    "${LIBRARY_DIR}/ini/iniPropertyUpdate.c"
+    "${LIBRARY_DIR}/ini/iniPropertyValue.c"
+    "${LIBRARY_DIR}/ini/iniToUpper.c"
+    "${LIBRARY_DIR}/ini/iniValue.c"
+    "${LIBRARY_DIR}/log/_logFreeMsg.c"
+    "${LIBRARY_DIR}/log/logClear.c"
+    "${LIBRARY_DIR}/log/logClose.c"
+    "${LIBRARY_DIR}/log/logOn.c"
+    "${LIBRARY_DIR}/log/logOpen.c"
+    "${LIBRARY_DIR}/log/logPeekMsg.c"
+    "${LIBRARY_DIR}/log/logPopMsg.c"
+    "${LIBRARY_DIR}/log/logPushMsg.c"
+    "${LIBRARY_DIR}/lst/_lstAdjustCurrent.c"
+    "${LIBRARY_DIR}/lst/_lstDump.c"
+    "${LIBRARY_DIR}/lst/_lstFreeItem.c"
+    "${LIBRARY_DIR}/lst/_lstNextValidItem.c"
+    "${LIBRARY_DIR}/lst/_lstPrevValidItem.c"
+    "${LIBRARY_DIR}/lst/_lstVisible.c"
+    "${LIBRARY_DIR}/lst/lstAppend.c"
+    "${LIBRARY_DIR}/lst/lstClose.c"
+    "${LIBRARY_DIR}/lst/lstDelete.c"
+    "${LIBRARY_DIR}/lst/lstEOL.c"
+    "${LIBRARY_DIR}/lst/lstFirst.c"
+    "${LIBRARY_DIR}/lst/lstGet.c"
+    "${LIBRARY_DIR}/lst/lstGetBookMark.c"
+    "${LIBRARY_DIR}/lst/lstGoto.c"
+    "${LIBRARY_DIR}/lst/lstGotoBookMark.c"
+    "${LIBRARY_DIR}/lst/lstInsert.c"
+    "${LIBRARY_DIR}/lst/lstLast.c"
+    "${LIBRARY_DIR}/lst/lstNext.c"
+    "${LIBRARY_DIR}/lst/lstOpen.c"
+    "${LIBRARY_DIR}/lst/lstOpenCursor.c"
+    "${LIBRARY_DIR}/lst/lstPrev.c"
+    "${LIBRARY_DIR}/lst/lstSeek.c"
+    "${LIBRARY_DIR}/lst/lstSeekItem.c"
+    "${LIBRARY_DIR}/lst/lstSet.c"
+    "${LIBRARY_DIR}/lst/lstSetFreeFunc.c"
+    "${LIBRARY_DIR}/odbcinst/_logging.c"
+    "${LIBRARY_DIR}/odbcinst/_odbcinst_ConfigModeINI.c"
+    "${LIBRARY_DIR}/odbcinst/_odbcinst_GetEntries.c"
+    "${LIBRARY_DIR}/odbcinst/_odbcinst_GetSections.c"
+    "${LIBRARY_DIR}/odbcinst/_odbcinst_SystemINI.c"
+    "${LIBRARY_DIR}/odbcinst/_odbcinst_UserINI.c"
+    "${LIBRARY_DIR}/odbcinst/_SQLDriverConnectPrompt.c"
+    "${LIBRARY_DIR}/odbcinst/_SQLGetInstalledDrivers.c"
+    "${LIBRARY_DIR}/odbcinst/_SQLWriteInstalledDrivers.c"
+    "${LIBRARY_DIR}/odbcinst/ODBCINSTConstructProperties.c"
+    "${LIBRARY_DIR}/odbcinst/ODBCINSTDestructProperties.c"
+    "${LIBRARY_DIR}/odbcinst/ODBCINSTSetProperty.c"
+    "${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperties.c"
+    "${LIBRARY_DIR}/odbcinst/ODBCINSTValidateProperty.c"
+    "${LIBRARY_DIR}/odbcinst/SQLConfigDataSource.c"
+    "${LIBRARY_DIR}/odbcinst/SQLConfigDriver.c"
+    "${LIBRARY_DIR}/odbcinst/SQLCreateDataSource.c"
+    "${LIBRARY_DIR}/odbcinst/SQLGetAvailableDrivers.c"
+    "${LIBRARY_DIR}/odbcinst/SQLGetConfigMode.c"
+    "${LIBRARY_DIR}/odbcinst/SQLGetInstalledDrivers.c"
+    "${LIBRARY_DIR}/odbcinst/SQLGetPrivateProfileString.c"
+    "${LIBRARY_DIR}/odbcinst/SQLGetTranslator.c"
+    "${LIBRARY_DIR}/odbcinst/SQLInstallDriverEx.c"
+    "${LIBRARY_DIR}/odbcinst/SQLInstallDriverManager.c"
+    "${LIBRARY_DIR}/odbcinst/SQLInstallerError.c"
+    "${LIBRARY_DIR}/odbcinst/SQLInstallODBC.c"
+    "${LIBRARY_DIR}/odbcinst/SQLInstallTranslatorEx.c"
+    "${LIBRARY_DIR}/odbcinst/SQLManageDataSources.c"
+    "${LIBRARY_DIR}/odbcinst/SQLPostInstallerError.c"
+    "${LIBRARY_DIR}/odbcinst/SQLReadFileDSN.c"
+    "${LIBRARY_DIR}/odbcinst/SQLRemoveDriver.c"
+    "${LIBRARY_DIR}/odbcinst/SQLRemoveDriverManager.c"
+    "${LIBRARY_DIR}/odbcinst/SQLRemoveDSNFromIni.c"
+    "${LIBRARY_DIR}/odbcinst/SQLRemoveTranslator.c"
+    "${LIBRARY_DIR}/odbcinst/SQLSetConfigMode.c"
+    "${LIBRARY_DIR}/odbcinst/SQLValidDSN.c"
+    "${LIBRARY_DIR}/odbcinst/SQLWriteDSNToIni.c"
+    "${LIBRARY_DIR}/odbcinst/SQLWriteFileDSN.c"
+    "${LIBRARY_DIR}/odbcinst/SQLWritePrivateProfileString.c"
 )
 
 add_library (unixodbc ${SRCS})
@@ -280,7 +280,7 @@ target_include_directories (unixodbc
         linux_x86_64/private
     PUBLIC
         linux_x86_64
-        ${LIBRARY_DIR}/include
+        "${LIBRARY_DIR}/include"
 )
 target_compile_definitions (unixodbc PRIVATE -DHAVE_CONFIG_H)
 target_compile_options (unixodbc
diff --git a/contrib/yaml-cpp b/contrib/yaml-cpp
new file mode 160000
index 00000000000..0c86adac6d1
--- /dev/null
+++ b/contrib/yaml-cpp
@@ -0,0 +1 @@
+Subproject commit 0c86adac6d117ee2b4afcedb8ade19036ca0327d
diff --git a/contrib/yaml-cpp-cmake/CMakeLists.txt b/contrib/yaml-cpp-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..ed0287de110
--- /dev/null
+++ b/contrib/yaml-cpp-cmake/CMakeLists.txt
@@ -0,0 +1,39 @@
+set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/yaml-cpp)
+
+set (SRCS
+	${LIBRARY_DIR}/src/binary.cpp
+	${LIBRARY_DIR}/src/emitterutils.cpp
+	${LIBRARY_DIR}/src/null.cpp
+	${LIBRARY_DIR}/src/scantoken.cpp
+	${LIBRARY_DIR}/src/convert.cpp
+	${LIBRARY_DIR}/src/exceptions.cpp
+	${LIBRARY_DIR}/src/ostream_wrapper.cpp
+	${LIBRARY_DIR}/src/simplekey.cpp
+	${LIBRARY_DIR}/src/depthguard.cpp 
+	${LIBRARY_DIR}/src/exp.cpp
+	${LIBRARY_DIR}/src/parse.cpp
+	${LIBRARY_DIR}/src/singledocparser.cpp
+	${LIBRARY_DIR}/src/directives.cpp
+	${LIBRARY_DIR}/src/memory.cpp
+	${LIBRARY_DIR}/src/parser.cpp
+	${LIBRARY_DIR}/src/stream.cpp
+	${LIBRARY_DIR}/src/emit.cpp
+	${LIBRARY_DIR}/src/nodebuilder.cpp
+	${LIBRARY_DIR}/src/regex_yaml.cpp
+	${LIBRARY_DIR}/src/tag.cpp
+	${LIBRARY_DIR}/src/emitfromevents.cpp
+	${LIBRARY_DIR}/src/node.cpp
+	${LIBRARY_DIR}/src/scanner.cpp
+	${LIBRARY_DIR}/src/emitter.cpp
+	${LIBRARY_DIR}/src/node_data.cpp
+	${LIBRARY_DIR}/src/scanscalar.cpp
+	${LIBRARY_DIR}/src/emitterstate.cpp
+	${LIBRARY_DIR}/src/nodeevents.cpp
+	${LIBRARY_DIR}/src/scantag.cpp
+)
+
+add_library (yaml-cpp ${SRCS})
+
+
+target_include_directories(yaml-cpp PRIVATE ${LIBRARY_DIR}/include/yaml-cpp)
+target_include_directories(yaml-cpp SYSTEM BEFORE PUBLIC ${LIBRARY_DIR}/include)
diff --git a/contrib/zlib-ng b/contrib/zlib-ng
index 6fd1846c8b8..db232d30b4c 160000
--- a/contrib/zlib-ng
+++ b/contrib/zlib-ng
@@ -1 +1 @@
-Subproject commit 6fd1846c8b8f59436fe2dd752d0f316ddbb64df6
+Subproject commit db232d30b4c72fd58e6d7eae2d12cebf9c3d90db
diff --git a/contrib/zstd b/contrib/zstd
index 10f0e6993f9..a488ba114ec 160000
--- a/contrib/zstd
+++ b/contrib/zstd
@@ -1 +1 @@
-Subproject commit 10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee
+Subproject commit a488ba114ec17ea1054b9057c26a046fc122b3b6
diff --git a/contrib/zstd-cmake/CMakeLists.txt b/contrib/zstd-cmake/CMakeLists.txt
index 58a827761ea..226ee1a8067 100644
--- a/contrib/zstd-cmake/CMakeLists.txt
+++ b/contrib/zstd-cmake/CMakeLists.txt
@@ -39,108 +39,113 @@ function(GetLibraryVersion _content _outputVar1 _outputVar2 _outputVar3)
 endfunction()
 
 # Define library directory, where sources and header files are located
-SET(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/zstd/lib)
-INCLUDE_DIRECTORIES(BEFORE ${LIBRARY_DIR} ${LIBRARY_DIR}/common)
+SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/zstd/lib")
+INCLUDE_DIRECTORIES(BEFORE ${LIBRARY_DIR} "${LIBRARY_DIR}/common")
 
 # Read file content
-FILE(READ ${LIBRARY_DIR}/zstd.h HEADER_CONTENT)
+FILE(READ "${LIBRARY_DIR}/zstd.h" HEADER_CONTENT)
 
 # Parse version
 GetLibraryVersion("${HEADER_CONTENT}" LIBVER_MAJOR LIBVER_MINOR LIBVER_RELEASE)
 MESSAGE(STATUS "ZSTD VERSION ${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE}")
 
 # cd contrib/zstd/lib
-# find . -name '*.c' | grep -vP 'deprecated|legacy' | sort | sed 's/^\./        ${LIBRARY_DIR}/'
+# find . -name '*.c' | grep -vP 'deprecated|legacy' | sort | sed 's/^\./        "${LIBRARY_DIR}/"'
 SET(Sources
-        ${LIBRARY_DIR}/common/debug.c
-        ${LIBRARY_DIR}/common/entropy_common.c
-        ${LIBRARY_DIR}/common/error_private.c
-        ${LIBRARY_DIR}/common/fse_decompress.c
-        ${LIBRARY_DIR}/common/pool.c
-        ${LIBRARY_DIR}/common/threading.c
-        ${LIBRARY_DIR}/common/xxhash.c
-        ${LIBRARY_DIR}/common/zstd_common.c
-        ${LIBRARY_DIR}/compress/fse_compress.c
-        ${LIBRARY_DIR}/compress/hist.c
-        ${LIBRARY_DIR}/compress/huf_compress.c
-        ${LIBRARY_DIR}/compress/zstd_compress.c
-        ${LIBRARY_DIR}/compress/zstd_compress_literals.c
-        ${LIBRARY_DIR}/compress/zstd_compress_sequences.c
-        ${LIBRARY_DIR}/compress/zstd_double_fast.c
-        ${LIBRARY_DIR}/compress/zstd_fast.c
-        ${LIBRARY_DIR}/compress/zstd_lazy.c
-        ${LIBRARY_DIR}/compress/zstd_ldm.c
-        ${LIBRARY_DIR}/compress/zstdmt_compress.c
-        ${LIBRARY_DIR}/compress/zstd_opt.c
-        ${LIBRARY_DIR}/decompress/huf_decompress.c
-        ${LIBRARY_DIR}/decompress/zstd_ddict.c
-        ${LIBRARY_DIR}/decompress/zstd_decompress_block.c
-        ${LIBRARY_DIR}/decompress/zstd_decompress.c
-        ${LIBRARY_DIR}/dictBuilder/cover.c
-        ${LIBRARY_DIR}/dictBuilder/divsufsort.c
-        ${LIBRARY_DIR}/dictBuilder/fastcover.c
-        ${LIBRARY_DIR}/dictBuilder/zdict.c)
+        "${LIBRARY_DIR}/common/debug.c"
+        "${LIBRARY_DIR}/common/entropy_common.c"
+        "${LIBRARY_DIR}/common/error_private.c"
+        "${LIBRARY_DIR}/common/fse_decompress.c"
+        "${LIBRARY_DIR}/common/pool.c"
+        "${LIBRARY_DIR}/common/threading.c"
+        "${LIBRARY_DIR}/common/xxhash.c"
+        "${LIBRARY_DIR}/common/zstd_common.c"
+        "${LIBRARY_DIR}/compress/fse_compress.c"
+        "${LIBRARY_DIR}/compress/hist.c"
+        "${LIBRARY_DIR}/compress/huf_compress.c"
+        "${LIBRARY_DIR}/compress/zstd_compress.c"
+        "${LIBRARY_DIR}/compress/zstd_compress_literals.c"
+        "${LIBRARY_DIR}/compress/zstd_compress_sequences.c"
+        "${LIBRARY_DIR}/compress/zstd_compress_superblock.c"
+        "${LIBRARY_DIR}/compress/zstd_double_fast.c"
+        "${LIBRARY_DIR}/compress/zstd_fast.c"
+        "${LIBRARY_DIR}/compress/zstd_lazy.c"
+        "${LIBRARY_DIR}/compress/zstd_ldm.c"
+        "${LIBRARY_DIR}/compress/zstdmt_compress.c"
+        "${LIBRARY_DIR}/compress/zstd_opt.c"
+        "${LIBRARY_DIR}/decompress/huf_decompress.c"
+        "${LIBRARY_DIR}/decompress/zstd_ddict.c"
+        "${LIBRARY_DIR}/decompress/zstd_decompress_block.c"
+        "${LIBRARY_DIR}/decompress/zstd_decompress.c"
+        "${LIBRARY_DIR}/dictBuilder/cover.c"
+        "${LIBRARY_DIR}/dictBuilder/divsufsort.c"
+        "${LIBRARY_DIR}/dictBuilder/fastcover.c"
+        "${LIBRARY_DIR}/dictBuilder/zdict.c")
 
 # cd contrib/zstd/lib
-# find . -name '*.h' | grep -vP 'deprecated|legacy' | sort | sed 's/^\./        ${LIBRARY_DIR}/'
+# find . -name '*.h' | grep -vP 'deprecated|legacy' | sort | sed 's/^\./        "${LIBRARY_DIR}/"'
 SET(Headers
-        ${LIBRARY_DIR}/common/bitstream.h
-        ${LIBRARY_DIR}/common/compiler.h
-        ${LIBRARY_DIR}/common/cpu.h
-        ${LIBRARY_DIR}/common/debug.h
-        ${LIBRARY_DIR}/common/error_private.h
-        ${LIBRARY_DIR}/common/fse.h
-        ${LIBRARY_DIR}/common/huf.h
-        ${LIBRARY_DIR}/common/mem.h
-        ${LIBRARY_DIR}/common/pool.h
-        ${LIBRARY_DIR}/common/threading.h
-        ${LIBRARY_DIR}/common/xxhash.h
-        ${LIBRARY_DIR}/common/zstd_errors.h
-        ${LIBRARY_DIR}/common/zstd_internal.h
-        ${LIBRARY_DIR}/compress/hist.h
-        ${LIBRARY_DIR}/compress/zstd_compress_internal.h
-        ${LIBRARY_DIR}/compress/zstd_compress_literals.h
-        ${LIBRARY_DIR}/compress/zstd_compress_sequences.h
-        ${LIBRARY_DIR}/compress/zstd_cwksp.h
-        ${LIBRARY_DIR}/compress/zstd_double_fast.h
-        ${LIBRARY_DIR}/compress/zstd_fast.h
-        ${LIBRARY_DIR}/compress/zstd_lazy.h
-        ${LIBRARY_DIR}/compress/zstd_ldm.h
-        ${LIBRARY_DIR}/compress/zstdmt_compress.h
-        ${LIBRARY_DIR}/compress/zstd_opt.h
-        ${LIBRARY_DIR}/decompress/zstd_ddict.h
-        ${LIBRARY_DIR}/decompress/zstd_decompress_block.h
-        ${LIBRARY_DIR}/decompress/zstd_decompress_internal.h
-        ${LIBRARY_DIR}/dictBuilder/cover.h
-        ${LIBRARY_DIR}/dictBuilder/divsufsort.h
-        ${LIBRARY_DIR}/dictBuilder/zdict.h
-        ${LIBRARY_DIR}/zstd.h)
+        "${LIBRARY_DIR}/common/bitstream.h"
+        "${LIBRARY_DIR}/common/compiler.h"
+        "${LIBRARY_DIR}/common/cpu.h"
+        "${LIBRARY_DIR}/common/debug.h"
+        "${LIBRARY_DIR}/common/error_private.h"
+        "${LIBRARY_DIR}/common/fse.h"
+        "${LIBRARY_DIR}/common/huf.h"
+        "${LIBRARY_DIR}/common/mem.h"
+        "${LIBRARY_DIR}/common/pool.h"
+        "${LIBRARY_DIR}/common/threading.h"
+        "${LIBRARY_DIR}/common/xxhash.h"
+        "${LIBRARY_DIR}/common/zstd_deps.h"
+        "${LIBRARY_DIR}/common/zstd_internal.h"
+        "${LIBRARY_DIR}/common/zstd_trace.h"
+        "${LIBRARY_DIR}/compress/hist.h"
+        "${LIBRARY_DIR}/compress/zstd_compress_internal.h"
+        "${LIBRARY_DIR}/compress/zstd_compress_literals.h"
+        "${LIBRARY_DIR}/compress/zstd_compress_sequences.h"
+        "${LIBRARY_DIR}/compress/zstd_compress_superblock.h"
+        "${LIBRARY_DIR}/compress/zstd_cwksp.h"
+        "${LIBRARY_DIR}/compress/zstd_double_fast.h"
+        "${LIBRARY_DIR}/compress/zstd_fast.h"
+        "${LIBRARY_DIR}/compress/zstd_lazy.h"
+        "${LIBRARY_DIR}/compress/zstd_ldm_geartab.h"
+        "${LIBRARY_DIR}/compress/zstd_ldm.h"
+        "${LIBRARY_DIR}/compress/zstdmt_compress.h"
+        "${LIBRARY_DIR}/compress/zstd_opt.h"
+        "${LIBRARY_DIR}/decompress/zstd_ddict.h"
+        "${LIBRARY_DIR}/decompress/zstd_decompress_block.h"
+        "${LIBRARY_DIR}/decompress/zstd_decompress_internal.h"
+        "${LIBRARY_DIR}/dictBuilder/cover.h"
+        "${LIBRARY_DIR}/dictBuilder/divsufsort.h"
+        "${LIBRARY_DIR}/zdict.h"
+        "${LIBRARY_DIR}/zstd_errors.h"
+        "${LIBRARY_DIR}/zstd.h")
 
 SET(ZSTD_LEGACY_SUPPORT true)
 
 IF (ZSTD_LEGACY_SUPPORT)
-    SET(LIBRARY_LEGACY_DIR ${LIBRARY_DIR}/legacy)
+    SET(LIBRARY_LEGACY_DIR "${LIBRARY_DIR}/legacy")
     INCLUDE_DIRECTORIES(BEFORE ${LIBRARY_LEGACY_DIR})
     ADD_DEFINITIONS(-D ZSTD_LEGACY_SUPPORT=1)
 
     SET(Sources ${Sources}
-            ${LIBRARY_LEGACY_DIR}/zstd_v01.c
-            ${LIBRARY_LEGACY_DIR}/zstd_v02.c
-            ${LIBRARY_LEGACY_DIR}/zstd_v03.c
-            ${LIBRARY_LEGACY_DIR}/zstd_v04.c
-            ${LIBRARY_LEGACY_DIR}/zstd_v05.c
-            ${LIBRARY_LEGACY_DIR}/zstd_v06.c
-            ${LIBRARY_LEGACY_DIR}/zstd_v07.c)
+            "${LIBRARY_LEGACY_DIR}/zstd_v01.c"
+            "${LIBRARY_LEGACY_DIR}/zstd_v02.c"
+            "${LIBRARY_LEGACY_DIR}/zstd_v03.c"
+            "${LIBRARY_LEGACY_DIR}/zstd_v04.c"
+            "${LIBRARY_LEGACY_DIR}/zstd_v05.c"
+            "${LIBRARY_LEGACY_DIR}/zstd_v06.c"
+            "${LIBRARY_LEGACY_DIR}/zstd_v07.c")
 
     SET(Headers ${Headers}
-            ${LIBRARY_LEGACY_DIR}/zstd_legacy.h
-            ${LIBRARY_LEGACY_DIR}/zstd_v01.h
-            ${LIBRARY_LEGACY_DIR}/zstd_v02.h
-            ${LIBRARY_LEGACY_DIR}/zstd_v03.h
-            ${LIBRARY_LEGACY_DIR}/zstd_v04.h
-            ${LIBRARY_LEGACY_DIR}/zstd_v05.h
-            ${LIBRARY_LEGACY_DIR}/zstd_v06.h
-            ${LIBRARY_LEGACY_DIR}/zstd_v07.h)
+            "${LIBRARY_LEGACY_DIR}/zstd_legacy.h"
+            "${LIBRARY_LEGACY_DIR}/zstd_v01.h"
+            "${LIBRARY_LEGACY_DIR}/zstd_v02.h"
+            "${LIBRARY_LEGACY_DIR}/zstd_v03.h"
+            "${LIBRARY_LEGACY_DIR}/zstd_v04.h"
+            "${LIBRARY_LEGACY_DIR}/zstd_v05.h"
+            "${LIBRARY_LEGACY_DIR}/zstd_v06.h"
+            "${LIBRARY_LEGACY_DIR}/zstd_v07.h")
 ENDIF (ZSTD_LEGACY_SUPPORT)
 
 ADD_LIBRARY(zstd ${Sources} ${Headers})
diff --git a/debian/changelog b/debian/changelog
index be77dfdefe9..e1c46dae3a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-clickhouse (21.5.1.1) unstable; urgency=low
+clickhouse (21.7.1.1) unstable; urgency=low
 
   * Modified source code
 
- -- clickhouse-release <clickhouse-release@yandex-team.ru>  Fri, 02 Apr 2021 18:34:26 +0300
+ -- clickhouse-release <clickhouse-release@yandex-team.ru>  Thu, 20 May 2021 22:23:29 +0300
diff --git a/debian/clickhouse-client.postinst b/debian/clickhouse-client.postinst
deleted file mode 100644
index 480bf2f5c67..00000000000
--- a/debian/clickhouse-client.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-CLICKHOUSE_USER=${CLICKHOUSE_USER=clickhouse}
-
-mkdir -p /etc/clickhouse-client/conf.d
-
-#DEBHELPER#
diff --git a/debian/clickhouse-common-static.install b/debian/clickhouse-common-static.install
index 17c955a12a9..087a6dbba8f 100644
--- a/debian/clickhouse-common-static.install
+++ b/debian/clickhouse-common-static.install
@@ -1,5 +1,5 @@
 usr/bin/clickhouse
 usr/bin/clickhouse-odbc-bridge
+usr/bin/clickhouse-library-bridge
 usr/bin/clickhouse-extract-from-config
 usr/share/bash-completion/completions
-etc/security/limits.d/clickhouse.conf
diff --git a/debian/clickhouse-server.config b/debian/clickhouse-server.config
deleted file mode 100644
index 636ff7f4da7..00000000000
--- a/debian/clickhouse-server.config
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-test -f /usr/share/debconf/confmodule && . /usr/share/debconf/confmodule
-
-db_fget clickhouse-server/default-password seen || true
-password_seen="$RET"
-
-if [ "$1" = "reconfigure" ]; then
-    password_seen=false
-fi
-
-if [ "$password_seen" != "true" ]; then
-    db_input high clickhouse-server/default-password || true
-    db_go || true
-fi
-db_go || true
diff --git a/debian/clickhouse-server.postinst b/debian/clickhouse-server.postinst
index dc876f45954..419c13e3daf 100644
--- a/debian/clickhouse-server.postinst
+++ b/debian/clickhouse-server.postinst
@@ -23,11 +23,13 @@ if [ ! -f "/etc/debian_version" ]; then
 fi
 
 if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
+
+    ${CLICKHOUSE_GENERIC_PROGRAM} install --user "${CLICKHOUSE_USER}" --group "${CLICKHOUSE_GROUP}" --pid-path "${CLICKHOUSE_PIDDIR}" --config-path "${CLICKHOUSE_CONFDIR}" --binary-path "${CLICKHOUSE_BINDIR}" --log-path "${CLICKHOUSE_LOGDIR}" --data-path "${CLICKHOUSE_DATADIR}"
+
     if [ -x "/bin/systemctl" ] && [ -f /etc/systemd/system/clickhouse-server.service ] && [ -d /run/systemd/system ]; then
         # if old rc.d service present - remove it
         if [ -x "/etc/init.d/clickhouse-server" ] && [ -x "/usr/sbin/update-rc.d" ]; then
             /usr/sbin/update-rc.d clickhouse-server remove
-            echo "ClickHouse init script has migrated to systemd. Please manually stop old server and restart the service: sudo killall clickhouse-server && sleep 5 && sudo service clickhouse-server restart"
         fi
 
         /bin/systemctl daemon-reload
@@ -38,10 +40,8 @@ if [ "$1" = configure ] || [ -n "$not_deb_os" ]; then
             if [ -x "/usr/sbin/update-rc.d" ]; then
                 /usr/sbin/update-rc.d clickhouse-server defaults 19 19 >/dev/null || exit $?
             else
-                echo # TODO [ "$OS" = "rhel" ] || [ "$OS" = "centos" ] || [ "$OS" = "fedora" ]
+                echo # Other OS
             fi
         fi
     fi
-
-    ${CLICKHOUSE_GENERIC_PROGRAM} install --user "${CLICKHOUSE_USER}" --group "${CLICKHOUSE_GROUP}" --pid-path "${CLICKHOUSE_PIDDIR}" --config-path "${CLICKHOUSE_CONFDIR}" --binary-path "${CLICKHOUSE_BINDIR}" --log-path "${CLICKHOUSE_LOGDIR}" --data-path "${CLICKHOUSE_DATADIR}"
 fi
diff --git a/debian/clickhouse-server.preinst b/debian/clickhouse-server.preinst
deleted file mode 100644
index 3529aefa7da..00000000000
--- a/debian/clickhouse-server.preinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "upgrade" ]; then
-    # Return etc/cron.d/clickhouse-server to original state
-    service clickhouse-server disable_cron ||:
-fi
-
-#DEBHELPER#
diff --git a/debian/clickhouse-server.prerm b/debian/clickhouse-server.prerm
deleted file mode 100644
index 02e855a7125..00000000000
--- a/debian/clickhouse-server.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "upgrade" ] || [ "$1" = "remove" ]; then
-    # Return etc/cron.d/clickhouse-server to original state
-    service clickhouse-server disable_cron ||:
-fi
diff --git a/debian/clickhouse-server.templates b/debian/clickhouse-server.templates
deleted file mode 100644
index dd55824e15c..00000000000
--- a/debian/clickhouse-server.templates
+++ /dev/null
@@ -1,3 +0,0 @@
-Template: clickhouse-server/default-password
-Type: password
-Description: Enter password for default user:
diff --git a/debian/clickhouse.limits b/debian/clickhouse.limits
deleted file mode 100644
index aca44082c4e..00000000000
--- a/debian/clickhouse.limits
+++ /dev/null
@@ -1,2 +0,0 @@
-clickhouse	soft	nofile	262144
-clickhouse	hard	nofile	262144
diff --git a/debian/pbuilder-hooks/A00ccache b/debian/pbuilder-hooks/A00ccache
deleted file mode 100755
index 575358f31eb..00000000000
--- a/debian/pbuilder-hooks/A00ccache
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# set -x
-
-# CCACHEDIR - for pbuilder ; CCACHE_DIR - for ccache
-
-echo "CCACHEDIR=$CCACHEDIR CCACHE_DIR=$CCACHE_DIR SET_CCACHEDIR=$SET_CCACHEDIR"
-
-[ -z "$CCACHE_DIR" ] && export CCACHE_DIR=${CCACHEDIR:=${SET_CCACHEDIR=/var/cache/pbuilder/ccache}}
-
-if [ -n "$CCACHE_DIR" ]; then
-    mkdir -p $CCACHE_DIR $DISTCC_DIR ||:
-    chown -R $BUILDUSERID:$BUILDUSERID $CCACHE_DIR $DISTCC_DIR ||:
-    chmod -R a+rwx $CCACHE_DIR $DISTCC_DIR ||:
-fi
-
-[ $CCACHE_PREFIX = 'distcc' ] && mkdir -p $DISTCC_DIR && echo "localhost/`nproc`" >> $DISTCC_DIR/hosts && distcc --show-hosts
-
-df -h
-ccache --show-stats
-ccache --zero-stats
-ccache --max-size=${CCACHE_SIZE:=32G}
diff --git a/debian/pbuilder-hooks/A01xlocale b/debian/pbuilder-hooks/A01xlocale
deleted file mode 100755
index 0e90f4ee71c..00000000000
--- a/debian/pbuilder-hooks/A01xlocale
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# https://github.com/llvm-mirror/libcxx/commit/6e02e89f65ca1ca1d6ce30fbc557563164dd327e
-
-touch /usr/include/xlocale.h
diff --git a/debian/pbuilder-hooks/B00ccache-stat b/debian/pbuilder-hooks/B00ccache-stat
deleted file mode 100755
index fdf6db1b7e7..00000000000
--- a/debian/pbuilder-hooks/B00ccache-stat
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ccache --show-stats
diff --git a/debian/pbuilder-hooks/B90test-server b/debian/pbuilder-hooks/B90test-server
deleted file mode 100755
index e36c255f9fc..00000000000
--- a/debian/pbuilder-hooks/B90test-server
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-set -e
-set -x
-
-TEST_CONNECT=${TEST_CONNECT=1}
-TEST_SSL=${TEST_SSL=1}
-PACKAGE_INSTALL=${PACKAGE_INSTALL=1}
-TEST_PORT_RANDOM=${TEST_PORT_RANDOM=1}
-
-if [ "${PACKAGE_INSTALL}" ]; then
-    dpkg --auto-deconfigure -i /tmp/buildd/*.deb ||:
-    apt install -y -f --allow-downgrades ||:
-    dpkg -l | grep clickhouse ||:
-
-    # Second install to replace debian versions
-    dpkg --auto-deconfigure -i /tmp/buildd/*.deb ||:
-    dpkg -l | grep clickhouse ||:
-
-    # Some test references uses specific timezone
-    ln -fs /usr/share/zoneinfo/Europe/Moscow /etc/localtime
-    echo 'Europe/Moscow' > /etc/timezone
-    dpkg-reconfigure -f noninteractive tzdata
-fi
-
-mkdir -p /etc/clickhouse-server/config.d /etc/clickhouse-client/config.d
-
-if [ "${TEST_PORT_RANDOM}" ]; then
-    CLICKHOUSE_PORT_BASE=${CLICKHOUSE_PORT_BASE:=$(( ( RANDOM % 50000 ) + 10000 ))}
-    CLICKHOUSE_PORT_TCP=${CLICKHOUSE_PORT_TCP:=$(($CLICKHOUSE_PORT_BASE + 1))}
-    CLICKHOUSE_PORT_HTTP=${CLICKHOUSE_PORT_HTTP:=$(($CLICKHOUSE_PORT_BASE + 2))}
-    CLICKHOUSE_PORT_INTERSERVER=${CLICKHOUSE_PORT_INTERSERVER:=$(($CLICKHOUSE_PORT_BASE + 3))}
-    CLICKHOUSE_PORT_TCP_SECURE=${CLICKHOUSE_PORT_TCP_SECURE:=$(($CLICKHOUSE_PORT_BASE + 4))}
-    CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:=$(($CLICKHOUSE_PORT_BASE + 5))}
-fi
-
-export CLICKHOUSE_PORT_TCP=${CLICKHOUSE_PORT_TCP:=9000}
-export CLICKHOUSE_PORT_HTTP=${CLICKHOUSE_PORT_HTTP:=8123}
-export CLICKHOUSE_PORT_INTERSERVER=${CLICKHOUSE_PORT_INTERSERVER:=9009}
-export CLICKHOUSE_PORT_TCP_SECURE=${CLICKHOUSE_PORT_TCP_SECURE:=9440}
-export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:=8443}
-
-if [ "${TEST_CONNECT}" ]; then
-    [ "${TEST_PORT_RANDOM}" ] && echo "<yandex><http_port>${CLICKHOUSE_PORT_HTTP}</http_port><tcp_port>${CLICKHOUSE_PORT_TCP}</tcp_port><interserver_http_port>${CLICKHOUSE_PORT_INTERSERVER}</interserver_http_port></yandex>" > /etc/clickhouse-server/config.d/port.xml
-
-    if  [ "${TEST_SSL}" ]; then
-        CLICKHOUSE_SSL_CONFIG="<openSSL><client><verificationMode>none</verificationMode><invalidCertificateHandler><name>AcceptCertificateHandler</name></invalidCertificateHandler></client></openSSL>"
-        echo "<yandex><https_port>${CLICKHOUSE_PORT_HTTPS}</https_port><tcp_port_secure>${CLICKHOUSE_PORT_TCP_SECURE}</tcp_port_secure>${CLICKHOUSE_SSL_CONFIG}</yandex>" > /etc/clickhouse-server/config.d/ssl.xml
-        echo "<yandex><tcp_port>${CLICKHOUSE_PORT_TCP}</tcp_port><tcp_port_secure>${CLICKHOUSE_PORT_TCP_SECURE}</tcp_port_secure>${CLICKHOUSE_SSL_CONFIG}</yandex>" > /etc/clickhouse-client/config.xml
-        openssl dhparam -out /etc/clickhouse-server/dhparam.pem 256
-        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
-        chmod -f a+r /etc/clickhouse-server/* /etc/clickhouse-client/* ||:
-        CLIENT_ADD+="--secure --port ${CLICKHOUSE_PORT_TCP_SECURE}"
-    else
-        CLIENT_ADD+="--port ${CLICKHOUSE_PORT_TCP}"
-    fi
-
-    # For debug
-    # tail -n +1 -- /etc/clickhouse-server/*.xml /etc/clickhouse-server/config.d/*.xml ||:
-
-    function finish {
-        service clickhouse-server stop
-        tail -n 100 /var/log/clickhouse-server/*.log ||:
-        sleep 1
-        killall -9 clickhouse-server ||:
-    }
-    trap finish EXIT SIGINT SIGQUIT SIGTERM
-
-    service clickhouse-server start
-    sleep ${TEST_SERVER_STARTUP_WAIT:=5}
-    service clickhouse-server status
-
-    # TODO: remove me or make only on error:
-    tail -n100 /var/log/clickhouse-server/*.log ||:
-
-    clickhouse-client --port $CLICKHOUSE_PORT_TCP -q "SELECT * from system.build_options;"
-    clickhouse-client ${CLIENT_ADD} -q "SELECT toDateTime(1);"
-
-    ( [ "${TEST_RUN}" ] && clickhouse-test --queries /usr/share/clickhouse-test/queries --tmp /tmp/clickhouse-test/ ${TEST_OPT} ) || ${TEST_TRUE:=true}
-
-    service clickhouse-server stop
-
-fi
-
-# Test debug symbols
-# gdb -ex quit --args /usr/bin/clickhouse-server
diff --git a/debian/pbuilder-hooks/C99kill-make b/debian/pbuilder-hooks/C99kill-make
deleted file mode 100755
index 2068e75dc40..00000000000
--- a/debian/pbuilder-hooks/C99kill-make
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Try stop parallel build after timeout
-
-killall make gcc gcc-8 g++-8 gcc-9 g++-9 clang clang-6.0 clang++-6.0 clang-7 clang++-7 ||:
diff --git a/debian/rules b/debian/rules
index 8eb47e95389..73d1f3d3b34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,9 +113,6 @@ override_dh_install:
 	ln -sf clickhouse-server.docs debian/clickhouse-client.docs
 	ln -sf clickhouse-server.docs debian/clickhouse-common-static.docs
 
-	mkdir -p $(DESTDIR)/etc/security/limits.d
-	cp debian/clickhouse.limits $(DESTDIR)/etc/security/limits.d/clickhouse.conf
-
 	# systemd compatibility
 	mkdir -p $(DESTDIR)/etc/systemd/system/
 	cp debian/clickhouse-server.service $(DESTDIR)/etc/systemd/system/
diff --git a/debian/watch b/debian/watch
index 7ad4cedf713..ed3cab97ade 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
 version=4
 
 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)-stable\.tar\.gz%clickhouse-$1.tar.gz%" \
-   https://github.com/yandex/clickhouse/tags \
+   https://github.com/ClickHouse/ClickHouse/tags \
    (?:.*?/)?v?(\d[\d.]*)-stable\.tar\.gz debian uupdate
 
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index 2efba9735ae..79ac92f2277 100644
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.5.1.*
+ARG version=21.7.1.*
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
diff --git a/docker/images.json b/docker/images.json
index 303bd159ce4..e2e22468596 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -138,7 +138,8 @@
             "docker/test/stateless_unbundled",
             "docker/test/stateless_pytest",
             "docker/test/integration/base",
-            "docker/test/fuzzer"
+            "docker/test/fuzzer",
+            "docker/test/keeper-jepsen"
          ]
     },
     "docker/packager/unbundled": {
@@ -159,5 +160,9 @@
     "docker/test/sqlancer": {
         "name": "yandex/clickhouse-sqlancer-test",
         "dependent": []
+    },
+    "docker/test/keeper-jepsen": {
+        "name": "yandex/clickhouse-keeper-jepsen-test",
+        "dependent": []
     }
 }
diff --git a/docker/packager/README.md b/docker/packager/README.md
index 9fbc2d7f8b5..a745f6225fa 100644
--- a/docker/packager/README.md
+++ b/docker/packager/README.md
@@ -3,10 +3,10 @@ compilers and build settings. Correctly configured Docker daemon is single depen
 
 Usage:
 
-Build deb package with `gcc-9` in `debug` mode:
+Build deb package with `clang-11` in `debug` mode:
 ```
 $ mkdir deb/test_output
-$ ./packager --output-dir deb/test_output/ --package-type deb --compiler=gcc-9 --build-type=debug
+$ ./packager --output-dir deb/test_output/ --package-type deb --compiler=clang-11 --build-type=debug
 $ ls -l deb/test_output
 -rw-r--r-- 1 root root      3730 clickhouse-client_18.14.2+debug_all.deb
 -rw-r--r-- 1 root root  84221888 clickhouse-common-static_18.14.2+debug_amd64.deb
@@ -18,11 +18,11 @@ $ ls -l deb/test_output
 
 ```
 
-Build ClickHouse binary with `clang-10` and `address` sanitizer in `relwithdebuginfo`
+Build ClickHouse binary with `clang-11` and `address` sanitizer in `relwithdebuginfo`
 mode:
 ```
 $ mkdir $HOME/some_clickhouse
-$ ./packager --output-dir=$HOME/some_clickhouse --package-type binary --compiler=clang-10 --sanitizer=address
+$ ./packager --output-dir=$HOME/some_clickhouse --package-type binary --compiler=clang-11 --sanitizer=address
 $ ls -l $HOME/some_clickhouse
 -rwxr-xr-x 1 root root 787061952  clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-benchmark -> clickhouse
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 94c7f934f6e..56b2af5cf84 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -35,35 +35,27 @@ RUN apt-get update \
 RUN apt-get update \
     && apt-get install \
         bash \
-        cmake \
+        build-essential \
         ccache \
-        curl \
-        gcc-9 \
-        g++-9 \
-        clang-10 \
-        clang-tidy-10 \
-        lld-10 \
-        llvm-10 \
-        llvm-10-dev \
         clang-11 \
         clang-tidy-11 \
+        cmake \
+        curl \
+        g++-10 \
+        gcc-10 \
+        gdb \
+        git \
+        gperf \
+        libicu-dev \
+        libreadline-dev \
         lld-11 \
         llvm-11 \
         llvm-11-dev \
-        libicu-dev \
-        libreadline-dev \
+        moreutils \
         ninja-build \
-        gperf \
-        git \
-        opencl-headers \
-        ocl-icd-libopencl1 \
-        intel-opencl-icd \
-        tzdata \
-        gperf \
-        cmake \
-        gdb \
+        pigz \
         rename \
-        build-essential \
+        tzdata \
         --yes --no-install-recommends
 
 # This symlink required by gcc to find lld compiler
@@ -111,4 +103,4 @@ RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
 
 
 COPY build.sh /
-CMD ["/bin/bash", "/build.sh"]
+CMD ["bash", "-c", "/build.sh 2>&1 | ts"]
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index a42789c6186..cf74105fbbb 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -11,17 +11,28 @@ tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build/cmake/toolc
 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
 
+# Uncomment to debug ccache. Don't put ccache log in /output right away, or it
+# will be confusingly packed into the "performance" package.
+# export CCACHE_LOGFILE=/build/ccache.log
+# export CCACHE_DEBUG=1
+
 mkdir -p build/build_docker
 cd build/build_docker
-ccache --show-stats ||:
-ccache --zero-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
 rm -f CMakeCache.txt
 # Read cmake arguments into array (possibly empty)
 read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
 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 ||:
+ccache --show-stats ||:
+ccache --zero-stats ||:
+
 # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
 ninja $NINJA_FLAGS clickhouse-bundle
+
+ccache --show-config ||:
+ccache --show-stats ||:
+
 mv ./programs/clickhouse* /output
 mv ./src/unit_tests_dbms /output ||: # may not exist for some binary builds
 find . -name '*.so' -print -exec mv '{}' /output \;
@@ -65,8 +76,21 @@ then
     cp ../programs/server/config.xml /output/config
     cp ../programs/server/users.xml /output/config
     cp -r --dereference ../programs/server/config.d /output/config
-    tar -czvf "$COMBINED_OUTPUT.tgz" /output
+    tar -cv -I pigz -f "$COMBINED_OUTPUT.tgz" /output
     rm -r /output/*
     mv "$COMBINED_OUTPUT.tgz" /output
 fi
-ccache --show-stats ||:
+
+if [ "${CCACHE_DEBUG:-}" == "1" ]
+then
+    find . -name '*.ccache-*' -print0 \
+        | tar -c -I pixz -f /output/ccache-debug.txz --null -T -
+fi
+
+if [ -n "$CCACHE_LOGFILE" ]
+then
+    # Compress the log as well, or else the CI will try to compress all log
+    # 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 8fd89d60f85..2f1d28efe61 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -34,31 +34,25 @@ RUN curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb \
 # Libraries from OS are only needed to test the "unbundled" build (this is not used in production).
 RUN apt-get update \
     && apt-get install \
-        gcc-9 \
-        g++-9 \
+        alien \
         clang-11 \
         clang-tidy-11 \
+        cmake \
+        debhelper \
+        devscripts \
+        gdb  \
+        git \
+        gperf \
         lld-11 \
         llvm-11 \
         llvm-11-dev \
-        clang-10 \
-        clang-tidy-10 \
-        lld-10 \
-        llvm-10 \
-        llvm-10-dev \
+        moreutils \
         ninja-build \
         perl \
-        pkg-config \
-        devscripts \
-        debhelper \
-        git \
-        tzdata \
-        gperf \
-        alien \
-        cmake \
-        gdb  \
-        moreutils \
         pigz \
+        pixz \
+        pkg-config \
+        tzdata \
         --yes --no-install-recommends
 
 # NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
diff --git a/docker/packager/deb/build.sh b/docker/packager/deb/build.sh
index 6450e21d289..4e14574b738 100755
--- a/docker/packager/deb/build.sh
+++ b/docker/packager/deb/build.sh
@@ -2,10 +2,16 @@
 
 set -x -e
 
+# Uncomment to debug ccache.
+# export CCACHE_LOGFILE=/build/ccache.log
+# export CCACHE_DEBUG=1
+
+ccache --show-config ||:
 ccache --show-stats ||:
 ccache --zero-stats ||:
+
 read -ra ALIEN_PKGS <<< "${ALIEN_PKGS:-}"
-build/release --no-pbuilder "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
+build/release "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
 mv /*.deb /output
 mv -- *.changes /output
 mv -- *.buildinfo /output
@@ -22,5 +28,19 @@ then
     mv /build/obj-*/src/unit_tests_dbms /output/binary
   fi
 fi
+
+ccache --show-config ||:
 ccache --show-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
+
+if [ "${CCACHE_DEBUG:-}" == "1" ]
+then
+    find /build -name '*.ccache-*' -print0 \
+        | tar -c -I pixz -f /output/ccache-debug.txz --null -T -
+fi
+
+if [ -n "$CCACHE_LOGFILE" ]
+then
+    # Compress the log as well, or else the CI will try to compress all log
+    # 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/packager b/docker/packager/packager
index 65c03cc10e3..81474166cc9 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -143,8 +143,7 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
         cmake_flags.append('-DUSE_GTEST=1')
 
     if unbundled:
-        # TODO: fix build with ENABLE_RDKAFKA
-        cmake_flags.append('-DUNBUNDLED=1 -DUSE_INTERNAL_RDKAFKA_LIBRARY=1 -DENABLE_ARROW=0 -DENABLE_ORC=0 -DENABLE_PARQUET=0')
+        cmake_flags.append('-DUNBUNDLED=1 -DUSE_INTERNAL_RDKAFKA_LIBRARY=1 -DENABLE_ARROW=0 -DENABLE_AVRO=0 -DENABLE_ORC=0 -DENABLE_PARQUET=0')
 
     if split_binary:
         cmake_flags.append('-DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1')
@@ -155,6 +154,10 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
 
     if clang_tidy:
         cmake_flags.append('-DENABLE_CLANG_TIDY=1')
+        cmake_flags.append('-DENABLE_UTILS=1')
+        cmake_flags.append('-DUSE_GTEST=1')
+        cmake_flags.append('-DENABLE_TESTS=1')
+        cmake_flags.append('-DENABLE_EXAMPLES=1')
         # Don't stop on first error to find more clang-tidy errors in one run.
         result.append('NINJA_FLAGS=-k0')
 
@@ -182,9 +185,8 @@ if __name__ == "__main__":
     parser.add_argument("--clickhouse-repo-path", default=os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir))
     parser.add_argument("--output-dir", required=True)
     parser.add_argument("--build-type", choices=("debug", ""), default="")
-    parser.add_argument("--compiler", choices=("clang-10", "clang-10-darwin", "clang-10-aarch64", "clang-10-freebsd",
-                                               "clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd",
-                                               "gcc-9", "gcc-10"), default="gcc-9")
+    parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd",
+                                               "gcc-10"), default="clang-11")
     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 f640c595f14..4dd6dbc61d8 100644
--- a/docker/packager/unbundled/Dockerfile
+++ b/docker/packager/unbundled/Dockerfile
@@ -35,9 +35,6 @@ RUN apt-get update \
         libjemalloc-dev \
         libmsgpack-dev \
         libcurl4-openssl-dev \
-        opencl-headers \
-        ocl-icd-libopencl1 \
-        intel-opencl-icd \
         unixodbc-dev \
         odbcinst \
         tzdata \
diff --git a/docker/packager/unbundled/build.sh b/docker/packager/unbundled/build.sh
index 54575ab977c..c43c6b5071e 100755
--- a/docker/packager/unbundled/build.sh
+++ b/docker/packager/unbundled/build.sh
@@ -5,7 +5,7 @@ set -x -e
 ccache --show-stats ||:
 ccache --zero-stats ||:
 read -ra ALIEN_PKGS <<< "${ALIEN_PKGS:-}"
-build/release --no-pbuilder "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
+build/release "${ALIEN_PKGS[@]}" | ts '%Y-%m-%d %H:%M:%S'
 mv /*.deb /output
 mv -- *.changes /output
 mv -- *.buildinfo /output
@@ -13,4 +13,3 @@ mv /*.rpm /output ||: # if exists
 mv /*.tgz /output ||: # if exists
 
 ccache --show-stats ||:
-ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0 /usr/lib/libOpenCL.so ||:
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 05ca29f22d4..52dcb6caae5 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.5.1.*
+ARG version=21.7.1.*
 ARG gosu_ver=1.10
 
 # set non-empty deb_location_url url to create a docker image
@@ -64,6 +64,8 @@ RUN groupadd -r clickhouse --gid=101 \
                 clickhouse-client=$version \
                 clickhouse-server=$version ; \
        fi \
+    && wget --progress=bar:force:noscroll "https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-$(dpkg --print-architecture)" -O /bin/gosu \
+    && chmod +x /bin/gosu \
     && clickhouse-local -q 'SELECT * FROM system.build_options' \
     && rm -rf \
         /var/lib/apt/lists/* \
@@ -76,8 +78,6 @@ RUN groupadd -r clickhouse --gid=101 \
 # we need to allow "others" access to clickhouse folder, because docker container
 # can be started with arbitrary uid (openshift usecase)
 
-ADD https://github.com/tianon/gosu/releases/download/$gosu_ver/gosu-amd64 /bin/gosu
-
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
@@ -88,10 +88,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 
 COPY docker_related_config.xml /etc/clickhouse-server/config.d/
 COPY entrypoint.sh /entrypoint.sh
-
-RUN chmod +x \
-    /entrypoint.sh \
-    /bin/gosu
+RUN chmod +x /entrypoint.sh
 
 EXPOSE 9000 8123 9009
 VOLUME /var/lib/clickhouse
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index 976c46ebe27..9809a36395d 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.5.1.*
+ARG version=21.7.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 e8653c2122e..44b9d42d6a1 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -51,13 +51,13 @@ RUN apt-get update \
 # Sanitizer options for services (clickhouse-server)
 RUN echo "TSAN_OPTIONS='verbosity=1000 halt_on_error=1 history_size=7'" >> /etc/environment; \
   echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \
-  echo "MSAN_OPTIONS='abort_on_error=1'" >> /etc/environment; \
+  echo "MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'" >> /etc/environment; \
   echo "LSAN_OPTIONS='suppressions=/usr/share/clickhouse-test/config/lsan_suppressions.txt'" >> /etc/environment; \
   ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/llvm-symbolizer /usr/bin/llvm-symbolizer;
 # Sanitizer options for current shell (not current, but the one that will be spawned on "docker run")
 # (but w/o verbosity for TSAN, otherwise test.reference will not match)
 ENV TSAN_OPTIONS='halt_on_error=1 history_size=7'
 ENV UBSAN_OPTIONS='print_stacktrace=1'
-ENV MSAN_OPTIONS='abort_on_error=1'
+ENV MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'
 
 CMD sleep 1
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index c21a115289d..fc73a0df0ee 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -73,7 +73,7 @@ function start_server
         --path "$FASTTEST_DATA"
         --user_files_path "$FASTTEST_DATA/user_files"
         --top_level_domains_path "$FASTTEST_DATA/top_level_domains"
-        --keeper_server.log_storage_path "$FASTTEST_DATA/coordination"
+        --keeper_server.storage_path "$FASTTEST_DATA/coordination"
     )
     clickhouse-server "${opts[@]}" &>> "$FASTTEST_OUTPUT/server.log" &
     server_pid=$!
@@ -300,6 +300,7 @@ function run_tests
         01663_aes_msan                          # Depends on OpenSSL
         01667_aes_args_check                    # 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
@@ -307,10 +308,10 @@ function run_tests
         01354_order_by_tuple_collate_const
         01355_ilike
         01411_bayesian_ab_testing
-        01532_collate_in_low_cardinality
-        01533_collate_in_nullable
-        01542_collate_in_array
-        01543_collate_in_tuple
+        01798_uniq_theta_sketch
+        01799_long_uniq_theta_sketch
+        collate
+        collation
         _orc_
         arrow
         avro
@@ -365,35 +366,25 @@ function run_tests
 
         # JSON functions
         01666_blns
+
+        # Requires postgresql-client
+        01802_test_postgresql_protocol_with_row_policy
+
+        # Depends on AWS
+        01801_s3_cluster
+
+        # Depends on LLVM JIT
+        01072_nullable_jit
+        01852_jit_if
+        01865_jit_comparison_constant_result
+        01871_merge_tree_compile_expressions
     )
 
-    (time clickhouse-test --hung-check -j 8 --order=random --use-skip-list --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" -- "$FASTTEST_FOCUS" 2>&1 ||:) | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/test_log.txt"
-
-    # substr is to remove semicolon after test name
-    readarray -t FAILED_TESTS < <(awk '/\[ FAIL|TIMEOUT|ERROR \]/ { print substr($3, 1, length($3)-1) }' "$FASTTEST_OUTPUT/test_log.txt" | tee "$FASTTEST_OUTPUT/failed-parallel-tests.txt")
-
-    # We will rerun sequentially any tests that have failed during parallel run.
-    # They might have failed because there was some interference from other tests
-    # running concurrently. If they fail even in seqential mode, we will report them.
-    # FIXME All tests that require exclusive access to the server must be
-    # explicitly marked as `sequential`, and `clickhouse-test` must detect them and
-    # run them in a separate group after all other tests. This is faster and also
-    # explicit instead of guessing.
-    if [[ -n "${FAILED_TESTS[*]}" ]]
-    then
-        stop_server ||:
-
-        # Clean the data so that there is no interference from the previous test run.
-        rm -rf "$FASTTEST_DATA"/{{meta,}data,user_files,coordination} ||:
-
-        start_server
-
-        echo "Going to run again: ${FAILED_TESTS[*]}"
-
-        clickhouse-test --hung-check --order=random --no-long --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a "$FASTTEST_OUTPUT/test_log.txt"
-    else
-        echo "No failed tests"
-    fi
+    time clickhouse-test --hung-check -j 8 --order=random --use-skip-list \
+            --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" \
+            -- "$FASTTEST_FOCUS" 2>&1 \
+        | ts '%Y-%m-%d %H:%M:%S' \
+        | tee "$FASTTEST_OUTPUT/test_log.txt"
 }
 
 case "$stage" in
diff --git a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
index 1e82f137961..dd6b7467afc 100644
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@@ -14,11 +14,6 @@
                 <max_memory_usage>
                     <max>10G</max>
                 </max_memory_usage>
-
-                <!-- Not ready for production -->
-                <compile_expressions>
-                    <readonly />
-                </compile_expressions>
             </constraints>
         </default>
     </profiles>
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 4bd3fa717a2..670fc9e58b3 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -56,17 +56,19 @@ function watchdog
     sleep 3600
 
     echo "Fuzzing run has timed out"
-    killall clickhouse-client ||:
     for _ in {1..10}
     do
-        if ! pgrep -f clickhouse-client
+        # Only kill by pid the particular client that runs the fuzzing, or else
+        # we can kill some clickhouse-client processes this script starts later,
+        # e.g. for checking server liveness.
+        if ! kill $fuzzer_pid
         then
             break
         fi
         sleep 1
     done
 
-    killall -9 clickhouse-client ||:
+    kill -9 -- $fuzzer_pid ||:
 }
 
 function filter_exists
@@ -85,7 +87,7 @@ function fuzz
 {
     # 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="$(grep -P 'tests/queries/0_stateless/.*\.sql' ci-changed-files.txt | sed -r -e 's!^!ch/!' | sort -R)"
+    NEW_TESTS="$(sed -n 's!\(^tests/queries/0_stateless/.*\.sql\)$!ch/\1!p' 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)"
     if [[ -n "$NEW_TESTS" ]]
@@ -115,17 +117,49 @@ continue
 
     gdb -batch -command script.gdb -p "$(pidof clickhouse-server)" &
 
-    fuzzer_exit_code=0
     # SC2012: Use find instead of ls to better handle non-alphanumeric filenames. They are all alphanumeric.
     # SC2046: Quote this to prevent word splitting. Actually I need word splitting.
     # shellcheck disable=SC2012,SC2046
     clickhouse-client --query-fuzzer-runs=1000 --queries-file $(ls -1 ch/tests/queries/0_stateless/*.sql | sort -R) $NEW_TESTS_OPT \
         > >(tail -n 100000 > fuzzer.log) \
-        2>&1 \
-        || fuzzer_exit_code=$?
+        2>&1 &
+    fuzzer_pid=$!
+    echo "Fuzzer pid is $fuzzer_pid"
 
+    # Start a watchdog that should kill the fuzzer on timeout.
+    # The shell won't kill the child sleep when we kill it, so we have to put it
+    # into a separate process group so that we can kill them all.
+    set -m
+    watchdog &
+    watchdog_pid=$!
+    set +m
+    # Check that the watchdog has started.
+    kill -0 $watchdog_pid
+
+    # Wait for the fuzzer to complete.
+    # Note that the 'wait || ...' thing is required so that the script doesn't
+    # exit because of 'set -e' when 'wait' returns nonzero code.
+    fuzzer_exit_code=0
+    wait "$fuzzer_pid" || fuzzer_exit_code=$?
     echo "Fuzzer exit code is $fuzzer_exit_code"
 
+    kill -- -$watchdog_pid ||:
+
+    # If the server dies, most often the fuzzer returns code 210: connetion
+    # refused, and sometimes also code 32: attempt to read after eof. For
+    # simplicity, check again whether the server is accepting connections, using
+    # clickhouse-client. We don't check for existence of server process, because
+    # the process is still present while the server is terminating and not
+    # accepting the connections anymore.
+    if clickhouse-client --query "select 1 format Null"
+    then
+        server_died=0
+    else
+        echo "Server live check returns $?"
+        server_died=1
+    fi
+
+    # Stop the server.
     clickhouse-client --query "select elapsed, query from system.processes" ||:
     killall clickhouse-server ||:
     for _ in {1..10}
@@ -137,6 +171,41 @@ continue
         sleep 1
     done
     killall -9 clickhouse-server ||:
+
+    # Debug.
+    date
+    sleep 10
+    jobs
+    pstree -aspgT
+
+    # Make files with status and description we'll show for this check on Github.
+    task_exit_code=$fuzzer_exit_code
+    if [ "$server_died" == 1 ]
+    then
+        # The server has died.
+        task_exit_code=210
+        echo "failure" > status.txt
+        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: AddressSanitizer:.*\|SUMMARY: MemorySanitizer:.*\|SUMMARY: ThreadSanitizer:.*\|.*_LIBCPP_ASSERT.*" server.log > description.txt
+        then
+            echo "Lost connection to server. See the logs." > description.txt
+        fi
+    elif [ "$fuzzer_exit_code" == "143" ] || [ "$fuzzer_exit_code" == "0" ]
+    then
+        # Variants of a normal run:
+        # 0 -- fuzzing ended earlier than timeout.
+        # 143 -- SIGTERM -- the fuzzer was killed by timeout.
+        task_exit_code=0
+        echo "success" > status.txt
+        echo "OK" > description.txt
+    else
+        # The server was alive, but the fuzzer returned some error. Probably this
+        # is a problem in the fuzzer itself. Don't grep the server log in this
+        # case, because we will find a message about normal server termination
+        # (Received signal 15), which is confusing.
+        task_exit_code=$fuzzer_exit_code
+        echo "failure" > status.txt
+        echo "Fuzzer failed ($fuzzer_exit_code). See the logs." > description.txt
+    fi
 }
 
 case "$stage" in
@@ -165,50 +234,7 @@ case "$stage" in
     time configure
     ;&
 "fuzz")
-    # Start a watchdog that should kill the fuzzer on timeout.
-    # The shell won't kill the child sleep when we kill it, so we have to put it
-    # into a separate process group so that we can kill them all.
-    set -m
-    watchdog &
-    watchdog_pid=$!
-    set +m
-    # Check that the watchdog has started
-    kill -0 $watchdog_pid
-
-    fuzzer_exit_code=0
-    time fuzz || fuzzer_exit_code=$?
-    kill -- -$watchdog_pid ||:
-
-    # Debug
-    date
-    sleep 10
-    jobs
-    pstree -aspgT
-
-    # Make files with status and description we'll show for this check on Github
-    task_exit_code=$fuzzer_exit_code
-    if [ "$fuzzer_exit_code" == 143 ]
-    then
-        # SIGTERM -- the fuzzer was killed by timeout, which means a normal run.
-        echo "success" > status.txt
-        echo "OK" > description.txt
-        task_exit_code=0
-    elif [ "$fuzzer_exit_code" == 210 ]
-    then
-        # Lost connection to the server. This probably means that the server died
-        # with abort.
-        echo "failure" > status.txt
-        if ! grep -ao "Received signal.*\|Logical error.*\|Assertion.*failed\|Failed assertion.*\|.*runtime error: .*\|.*is located.*\|SUMMARY: MemorySanitizer:.*\|SUMMARY: ThreadSanitizer:.*\|.*_LIBCPP_ASSERT.*" server.log > description.txt
-        then
-            echo "Lost connection to server. See the logs." > description.txt
-        fi
-    else
-        # Something different -- maybe the fuzzer itself died? Don't grep the
-        # server log in this case, because we will find a message about normal
-        # server termination (Received signal 15), which is confusing.
-        echo "failure" > status.txt
-        echo "Fuzzer failed ($fuzzer_exit_code). See the logs." > description.txt
-    fi
+    time fuzz
     ;&
 "report")
 cat > report.html <<EOF ||:
diff --git a/docker/test/integration/base/Dockerfile b/docker/test/integration/base/Dockerfile
index 938d8d45ffd..1c962f1bf8f 100644
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@@ -19,7 +19,8 @@ RUN apt-get update \
         tar \
         krb5-user \
         iproute2 \
-        lsof
+        lsof \
+        g++
 RUN rm -rf \
         /var/lib/apt/lists/* \
         /var/cache/debconf \
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index e0e5e36a3d6..cff49a805fa 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -31,6 +31,7 @@ RUN apt-get update \
     software-properties-common \
     libkrb5-dev \
     krb5-user \
+    g++ \
     && rm -rf \
         /var/lib/apt/lists/* \
         /var/cache/debconf \
@@ -79,7 +80,8 @@ RUN python3 -m pip install \
     redis \
     tzlocal \
     urllib3 \
-    requests-kerberos
+    requests-kerberos \
+    pyhdfs
 
 COPY modprobe.sh /usr/local/bin/modprobe
 COPY dockerd-entrypoint.sh /usr/local/bin/
diff --git a/docker/test/integration/runner/compose/docker_compose_keeper.yml b/docker/test/integration/runner/compose/docker_compose_keeper.yml
new file mode 100644
index 00000000000..e11a13e6eab
--- /dev/null
+++ b/docker/test/integration/runner/compose/docker_compose_keeper.yml
@@ -0,0 +1,92 @@
+version: '2.3'
+services:
+    zoo1:
+        image: ${image:-yandex/clickhouse-integration-test}
+        restart: always
+        user: ${user:-}
+        volumes:
+            - type: bind
+              source: ${keeper_binary:-}
+              target: /usr/bin/clickhouse
+            - type: bind
+              source: ${keeper_config_dir1:-}
+              target: /etc/clickhouse-keeper
+            - type: bind
+              source: ${keeper_logs_dir1:-}
+              target: /var/log/clickhouse-keeper
+            - type: ${keeper_fs:-tmpfs}
+              source: ${keeper_db_dir1:-}
+              target: /var/lib/clickhouse-keeper
+        entrypoint: "clickhouse keeper --config=/etc/clickhouse-keeper/keeper_config1.xml --log-file=/var/log/clickhouse-keeper/clickhouse-keeper.log --errorlog-file=/var/log/clickhouse-keeper/clickhouse-keeper.err.log"
+        cap_add:
+            - SYS_PTRACE
+            - NET_ADMIN
+            - IPC_LOCK
+            - SYS_NICE
+        security_opt:
+            - label:disable
+        dns_opt:
+            - attempts:2
+            - timeout:1
+            - inet6
+            - rotate
+    zoo2:
+        image: ${image:-yandex/clickhouse-integration-test}
+        restart: always
+        user: ${user:-}
+        volumes:
+            - type: bind
+              source: ${keeper_binary:-}
+              target: /usr/bin/clickhouse
+            - type: bind
+              source: ${keeper_config_dir2:-}
+              target: /etc/clickhouse-keeper
+            - type: bind
+              source: ${keeper_logs_dir2:-}
+              target: /var/log/clickhouse-keeper
+            - type: ${keeper_fs:-tmpfs}
+              source: ${keeper_db_dir2:-}
+              target: /var/lib/clickhouse-keeper
+        entrypoint: "clickhouse keeper --config=/etc/clickhouse-keeper/keeper_config2.xml --log-file=/var/log/clickhouse-keeper/clickhouse-keeper.log --errorlog-file=/var/log/clickhouse-keeper/clickhouse-keeper.err.log"
+        cap_add:
+            - SYS_PTRACE
+            - NET_ADMIN
+            - IPC_LOCK
+            - SYS_NICE
+        security_opt:
+            - label:disable
+        dns_opt:
+            - attempts:2
+            - timeout:1
+            - inet6
+            - rotate
+    zoo3:
+        image: ${image:-yandex/clickhouse-integration-test}
+        restart: always
+        user: ${user:-}
+        volumes:
+            - type: bind
+              source: ${keeper_binary:-}
+              target: /usr/bin/clickhouse
+            - type: bind
+              source: ${keeper_config_dir3:-}
+              target: /etc/clickhouse-keeper
+            - type: bind
+              source: ${keeper_logs_dir3:-}
+              target: /var/log/clickhouse-keeper
+            - type: ${keeper_fs:-tmpfs}
+              source: ${keeper_db_dir3:-}
+              target: /var/lib/clickhouse-keeper
+        entrypoint: "clickhouse keeper --config=/etc/clickhouse-keeper/keeper_config3.xml --log-file=/var/log/clickhouse-keeper/clickhouse-keeper.log --errorlog-file=/var/log/clickhouse-keeper/clickhouse-keeper.err.log"
+        cap_add:
+            - SYS_PTRACE
+            - NET_ADMIN
+            - IPC_LOCK
+            - SYS_NICE
+        security_opt:
+            - label:disable
+        dns_opt:
+            - attempts:2
+            - timeout:1
+            - inet6
+            - rotate
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_8_0_for_materialize_mysql.yml b/docker/test/integration/runner/compose/docker_compose_mysql_8_0_for_materialize_mysql.yml
index 7c8a930c84e..93bfee35caf 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_8_0_for_materialize_mysql.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_8_0_for_materialize_mysql.yml
@@ -6,7 +6,7 @@ services:
         environment:
             MYSQL_ROOT_PASSWORD: clickhouse
         ports:
-            - 33308:3306
+            - 3309:3306
         command: --server_id=100 --log-bin='mysql-bin-1.log'
             --default_authentication_plugin='mysql_native_password'
             --default-time-zone='+3:00'
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml b/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml
new file mode 100644
index 00000000000..d0674362709
--- /dev/null
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml
@@ -0,0 +1,23 @@
+version: '2.3'
+services:
+    mysql2:
+        image: mysql:5.7
+        restart: always
+        environment:
+            MYSQL_ROOT_PASSWORD: clickhouse
+        ports:
+            - 3348:3306
+    mysql3:
+        image: mysql:5.7
+        restart: always
+        environment:
+            MYSQL_ROOT_PASSWORD: clickhouse
+        ports:
+            - 3388:3306
+    mysql4:
+        image: mysql:5.7
+        restart: always
+        environment:
+            MYSQL_ROOT_PASSWORD: clickhouse
+        ports:
+            - 3368:3306
diff --git a/docker/test/integration/runner/compose/docker_compose_postgres.yml b/docker/test/integration/runner/compose/docker_compose_postgres.yml
index 58ed97251fb..5657352e1b3 100644
--- a/docker/test/integration/runner/compose/docker_compose_postgres.yml
+++ b/docker/test/integration/runner/compose/docker_compose_postgres.yml
@@ -11,10 +11,3 @@ services:
             default:
                 aliases:
                     - postgre-sql.local
-    postgres2:
-        image: postgres
-        restart: always
-        environment:
-            POSTGRES_PASSWORD: mysecretpassword
-        ports:
-            - 5441:5432
diff --git a/docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml b/docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml
new file mode 100644
index 00000000000..d04c8a2f3a6
--- /dev/null
+++ b/docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml
@@ -0,0 +1,23 @@
+version: '2.3'
+services:
+    postgres2:
+        image: postgres
+        restart: always
+        environment:
+            POSTGRES_PASSWORD: mysecretpassword
+        ports:
+            - 5421:5432
+    postgres3:
+        image: postgres
+        restart: always
+        environment:
+            POSTGRES_PASSWORD: mysecretpassword
+        ports:
+            - 5441:5432
+    postgres4:
+        image: postgres
+        restart: always
+        environment:
+            POSTGRES_PASSWORD: mysecretpassword
+        ports:
+            - 5461:5432
diff --git a/docker/test/integration/runner/dockerd-entrypoint.sh b/docker/test/integration/runner/dockerd-entrypoint.sh
index c0255d3d706..4d25ca60c5e 100755
--- a/docker/test/integration/runner/dockerd-entrypoint.sh
+++ b/docker/test/integration/runner/dockerd-entrypoint.sh
@@ -1,6 +1,17 @@
 #!/bin/bash
 set -e
 
+mkdir -p /etc/docker/
+cat > /etc/docker/daemon.json << EOF
+{
+    "ipv6": true,
+    "fixed-cidr-v6": "fd00::/8",
+    "ip-forward": true,
+    "insecure-registries" : ["dockerhub-proxy.sas.yp-c.yandex.net:5000"],
+    "registry-mirrors" : ["http://dockerhub-proxy.sas.yp-c.yandex.net:5000"]
+}
+EOF
+
 dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &>/var/log/somefile &
 
 set +e
@@ -16,11 +27,16 @@ while true; do
 done
 set -e
 
+# cleanup for retry run if volume is not recreated
+docker kill "$(docker ps -aq)" || true
+docker rm "$(docker ps -aq)" || true
+
 echo "Start tests"
 export CLICKHOUSE_TESTS_SERVER_BIN_PATH=/clickhouse
 export CLICKHOUSE_TESTS_CLIENT_BIN_PATH=/clickhouse
 export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=/clickhouse-config
 export CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH=/clickhouse-odbc-bridge
+export CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH=/clickhouse-library-bridge
 
 export DOCKER_MYSQL_GOLANG_CLIENT_TAG=${DOCKER_MYSQL_GOLANG_CLIENT_TAG:=latest}
 export DOCKER_MYSQL_JAVA_CLIENT_TAG=${DOCKER_MYSQL_JAVA_CLIENT_TAG:=latest}
diff --git a/docker/test/keeper-jepsen/Dockerfile b/docker/test/keeper-jepsen/Dockerfile
new file mode 100644
index 00000000000..1a62d5e793f
--- /dev/null
+++ b/docker/test/keeper-jepsen/Dockerfile
@@ -0,0 +1,39 @@
+# docker build -t yandex/clickhouse-keeper-jepsen-test .
+FROM yandex/clickhouse-test-base
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV CLOJURE_VERSION=1.10.3.814
+
+# arguments
+ENV PR_TO_TEST=""
+ENV SHA_TO_TEST=""
+
+ENV NODES_USERNAME="root"
+ENV NODES_PASSWORD=""
+ENV TESTS_TO_RUN="30"
+ENV TIME_LIMIT="30"
+
+
+# volumes
+ENV NODES_FILE_PATH="/nodes.txt"
+ENV TEST_OUTPUT="/test_output"
+
+RUN mkdir "/root/.ssh"
+RUN touch "/root/.ssh/known_hosts"
+
+# install java
+RUN apt-get update && apt-get install default-jre default-jdk libjna-java libjna-jni ssh gnuplot graphviz --yes --no-install-recommends
+
+# install clojure
+RUN curl -O "https://download.clojure.org/install/linux-install-${CLOJURE_VERSION}.sh" && \
+    chmod +x "linux-install-${CLOJURE_VERSION}.sh" && \
+    bash "./linux-install-${CLOJURE_VERSION}.sh"
+
+# install leiningen
+RUN curl -O "https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein" && \
+    chmod +x ./lein && \
+    mv ./lein /usr/bin
+
+COPY run.sh /
+
+CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/keeper-jepsen/run.sh b/docker/test/keeper-jepsen/run.sh
new file mode 100644
index 00000000000..352585e16e3
--- /dev/null
+++ b/docker/test/keeper-jepsen/run.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+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_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
+
+
+if [ -z "$CLICKHOUSE_REPO_PATH" ]; then
+    CLICKHOUSE_REPO_PATH=ch
+    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
+    ls -lath ||:
+fi
+
+cd "$CLICKHOUSE_REPO_PATH/tests/jepsen.clickhouse-keeper"
+
+(lein run test-all --nodes-file "$NODES_FILE_PATH" --username "$NODES_USERNAME" --logging-json --password "$NODES_PASSWORD" --time-limit "$TIME_LIMIT" --concurrency 50 -r 50 --snapshot-distance 100 --stale-log-gap 100 --reserved-log-items 10 --lightweight-run  --clickhouse-source "$CLICKHOUSE_PACKAGE" -q --test-count "$TESTS_TO_RUN" || true) | tee "$TEST_OUTPUT/jepsen_run_all_tests.log"
+
+mv store "$TEST_OUTPUT/"
diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index 4507de16492..a027a94ab70 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -243,9 +243,12 @@ function run_tests
     profile_seconds_left=600
 
     # Run the tests.
+    total_tests=$(echo "$test_files" | wc -w)
+    current_test=0
     test_name="<none>"
     for test in $test_files
     do
+        echo "$current_test of $total_tests tests complete" > status.txt
         # Check that both servers are alive, and restart them if they die.
         clickhouse-client --port $LEFT_SERVER_PORT --query "select 1 format Null" \
             || { echo $test_name >> left-server-died.log ; restart ; }
@@ -273,6 +276,7 @@ function run_tests
         profile_seconds_left=$(awk -F'	' \
             'BEGIN { s = '$profile_seconds_left'; } /^profile-total/ { s -= $2 } END { print s }' \
             "$test_name-raw.tsv")
+        current_test=$((current_test + 1))
     done
 
     unset TIMEFORMAT
@@ -548,6 +552,63 @@ create table query_metric_stats_denorm engine File(TSVWithNamesAndTypes,
     order by test, query_index, metric_name
     ;
 " 2> >(tee -a analyze/errors.log 1>&2)
+
+# Fetch historical query variability thresholds from the CI database
+clickhouse-local --query "
+    left join file('analyze/report-thresholds.tsv', TSV,
+            'test text, report_threshold float') thresholds
+        on query_metric_stats.test = thresholds.test
+"
+
+if [ -v CHPC_DATABASE_URL ]
+then
+    set +x # Don't show password in the log
+    client=(clickhouse-client
+        # Surprisingly, clickhouse-client doesn't understand --host 127.0.0.1:9000
+        # so I have to extract host and port with clickhouse-local. I tried to use
+        # Poco URI parser to support this in the client, but it's broken and can't
+        # parse host:port.
+        $(clickhouse-local --query "with '${CHPC_DATABASE_URL}' as url select '--host ' || domain(url) || ' --port ' || toString(port(url)) format TSV")
+        --secure
+        --user "${CHPC_DATABASE_USER}"
+        --password "${CHPC_DATABASE_PASSWORD}"
+        --config "right/config/client_config.xml"
+        --database perftest
+        --date_time_input_format=best_effort)
+
+
+# Precision is going to be 1.5 times worse for PRs. How do I know it? I ran this:
+# SELECT quantilesExact(0., 0.1, 0.5, 0.75, 0.95, 1.)(p / m)
+# FROM
+# (
+#     SELECT
+#         quantileIf(0.95)(stat_threshold, pr_number = 0) AS m,
+#         quantileIf(0.95)(stat_threshold, (pr_number != 0) AND (abs(diff) < stat_threshold)) AS p
+#     FROM query_metrics_v2
+#     WHERE (event_date > (today() - toIntervalMonth(1))) AND (metric = 'client_time')
+#     GROUP BY
+#         test,
+#         query_index,
+#         query_display_name
+#     HAVING count(*) > 100
+# )
+# The file can be empty if the server is inaccessible, so we can't use TSVWithNamesAndTypes.
+    "${client[@]}" --query "
+            select test, query_index,
+                quantileExact(0.99)(abs(diff)) max_diff,
+                quantileExactIf(0.99)(stat_threshold, abs(diff) < stat_threshold) * 1.5 max_stat_threshold,
+                query_display_name
+            from query_metrics_v2
+            where event_date > now() - interval 1 month
+                and metric = 'client_time'
+                and pr_number = 0
+            group by test, query_index, query_display_name
+            having count(*) > 100
+            " > analyze/historical-thresholds.tsv
+else
+    touch analyze/historical-thresholds.tsv
+fi
+
 }
 
 # Analyze results
@@ -592,6 +653,26 @@ create view query_metric_stats as
             diff float, stat_threshold float')
     ;
 
+create table report_thresholds engine File(TSVWithNamesAndTypes, 'report/thresholds.tsv')
+    as select
+        query_display_names.test test, query_display_names.query_index query_index,
+        ceil(greatest(0.1, historical_thresholds.max_diff,
+            test_thresholds.report_threshold), 2) changed_threshold,
+        ceil(greatest(0.2, historical_thresholds.max_stat_threshold,
+            test_thresholds.report_threshold + 0.1), 2) unstable_threshold,
+        query_display_names.query_display_name query_display_name
+    from query_display_names
+    left join file('analyze/historical-thresholds.tsv', TSV,
+        'test text, query_index int, max_diff float, max_stat_threshold float,
+            query_display_name text') historical_thresholds
+    on query_display_names.test = historical_thresholds.test
+        and query_display_names.query_index = historical_thresholds.query_index
+        and query_display_names.query_display_name = historical_thresholds.query_display_name
+    left join file('analyze/report-thresholds.tsv', TSV,
+        'test text, report_threshold float') test_thresholds
+    on query_display_names.test = test_thresholds.test
+    ;
+
 -- Main statistics for queries -- query time as reported in query log.
 create table queries engine File(TSVWithNamesAndTypes, 'report/queries.tsv')
     as select
@@ -606,23 +687,23 @@ create table queries engine File(TSVWithNamesAndTypes, 'report/queries.tsv')
         -- uncaught regressions, because for the default 7 runs we do for PRs,
         -- the randomization distribution has only 16 values, so the max quantile
         -- is actually 0.9375.
-        abs(diff) > report_threshold        and abs(diff) >= stat_threshold as changed_fail,
-        abs(diff) > report_threshold - 0.05 and abs(diff) >= stat_threshold as changed_show,
+        abs(diff) > changed_threshold        and abs(diff) >= stat_threshold as changed_fail,
+        abs(diff) > changed_threshold - 0.05 and abs(diff) >= stat_threshold as changed_show,
 
-        not changed_fail and stat_threshold > report_threshold + 0.10 as unstable_fail,
-        not changed_show and stat_threshold > report_threshold - 0.05 as unstable_show,
+        not changed_fail and stat_threshold > unstable_threshold as unstable_fail,
+        not changed_show and stat_threshold > unstable_threshold - 0.05 as unstable_show,
 
         left, right, diff, stat_threshold,
-        if(report_threshold > 0, report_threshold, 0.10) as report_threshold,
         query_metric_stats.test test, query_metric_stats.query_index query_index,
-        query_display_name
+        query_display_names.query_display_name query_display_name
     from query_metric_stats
-    left join file('analyze/report-thresholds.tsv', TSV,
-            'test text, report_threshold float') thresholds
-        on query_metric_stats.test = thresholds.test
     left join query_display_names
         on query_metric_stats.test = query_display_names.test
             and query_metric_stats.query_index = query_display_names.query_index
+    left join report_thresholds
+        on query_display_names.test = report_thresholds.test
+            and query_display_names.query_index = report_thresholds.query_index
+            and query_display_names.query_display_name = report_thresholds.query_display_name
     -- 'server_time' is rounded down to ms, which might be bad for very short queries.
     -- Use 'client_time' instead.
     where metric_name = 'client_time'
@@ -885,7 +966,6 @@ create table all_query_metrics_tsv engine File(TSV, 'report/all-query-metrics.ts
     order by test, query_index;
 " 2> >(tee -a report/errors.log 1>&2)
 
-
 # Prepare source data for metrics and flamegraphs for queries that were profiled
 # by perf.py.
 for version in {right,left}
@@ -1015,6 +1095,7 @@ done
 wait
 
 # Create per-query flamegraphs
+touch report/query-files.txt
 IFS=$'\n'
 for version in {right,left}
 do
@@ -1149,20 +1230,21 @@ function upload_results
         return 0
     fi 
 
-    # Surprisingly, clickhouse-client doesn't understand --host 127.0.0.1:9000
-    # so I have to extract host and port with clickhouse-local. I tried to use
-    # Poco URI parser to support this in the client, but it's broken and can't
-    # parse host:port.
     set +x # Don't show password in the log
-    clickhouse-client \
-        $(clickhouse-local --query "with '${CHPC_DATABASE_URL}' as url select '--host ' || domain(url) || ' --port ' || toString(port(url)) format TSV") \
-        --secure \
-        --user "${CHPC_DATABASE_USER}" \
-        --password "${CHPC_DATABASE_PASSWORD}" \
-        --config "right/config/client_config.xml" \
-        --database perftest \
-        --date_time_input_format=best_effort \
-        --query "
+    client=(clickhouse-client
+        # Surprisingly, clickhouse-client doesn't understand --host 127.0.0.1:9000
+        # so I have to extract host and port with clickhouse-local. I tried to use
+        # Poco URI parser to support this in the client, but it's broken and can't
+        # parse host:port.
+        $(clickhouse-local --query "with '${CHPC_DATABASE_URL}' as url select '--host ' || domain(url) || ' --port ' || toString(port(url)) format TSV")
+        --secure
+        --user "${CHPC_DATABASE_USER}"
+        --password "${CHPC_DATABASE_PASSWORD}"
+        --config "right/config/client_config.xml"
+        --database perftest
+        --date_time_input_format=best_effort)
+
+    "${client[@]}" --query "
             insert into query_metrics_v2
             select
                 toDate(event_time) event_date,
@@ -1185,6 +1267,31 @@ function upload_results
             format TSV
             settings date_time_input_format='best_effort'
 " < report/all-query-metrics.tsv # Don't leave whitespace after INSERT: https://github.com/ClickHouse/ClickHouse/issues/16652
+
+    # Upload some run attributes. I use this weird form because it is the same
+    # form that can be used for historical data when you only have compare.log.
+    cat compare.log \
+        | sed -n '
+            s/.*Model name:[[:space:]]\+\(.*\)$/metric	lscpu-model-name	\1/p;
+            s/.*L1d cache:[[:space:]]\+\(.*\)$/metric	lscpu-l1d-cache	\1/p;
+            s/.*L1i cache:[[:space:]]\+\(.*\)$/metric	lscpu-l1i-cache	\1/p;
+            s/.*L2 cache:[[:space:]]\+\(.*\)$/metric	lscpu-l2-cache	\1/p;
+            s/.*L3 cache:[[:space:]]\+\(.*\)$/metric	lscpu-l3-cache	\1/p;
+            s/.*left_sha=\(.*\)$/old-sha	\1/p;
+            s/.*right_sha=\(.*\)/new-sha	\1/p' \
+        | awk '
+            BEGIN { FS = "\t"; OFS = "\t" }
+            /^old-sha/ { old_sha=$2 }
+            /^new-sha/ { new_sha=$2 }
+            /^metric/ { print old_sha, new_sha, $2, $3 }' \
+        | "${client[@]}" --query "INSERT INTO run_attributes_v1 FORMAT TSV"
+
+    # Grepping numactl results from log is too crazy, I'll just call it again.
+    "${client[@]}" --query "INSERT INTO run_attributes_v1 FORMAT TSV" <<EOF
+$REF_SHA	$SHA_TO_TEST	$(numactl --show | sed -n 's/^cpubind:[[:space:]]\+/numactl-cpubind	/p')
+$REF_SHA	$SHA_TO_TEST	$(numactl --hardware | sed -n 's/^available:[[:space:]]\+/numactl-available	/p')
+EOF
+
     set -x
 }
 
@@ -1267,3 +1374,4 @@ esac
 # Print some final debug info to help debug Weirdness, of which there is plenty.
 jobs
 pstree -apgT
+
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 31f5b739c6d..7b941f844de 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,6 +1,7 @@
 <yandex>
     <http_port remove="remove"/>
     <mysql_port remove="remove"/>
+    <postgresql_port remove="remove"/>
     <interserver_http_port remove="remove"/>
     <tcp_with_proxy_port remove="remove"/>
     <keeper_server remove="remove"/>
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 41bc7f777bf..2c06be9bb91 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
@@ -17,6 +17,12 @@
 
             <!-- 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 -->
+            <compile_expressions>0</compile_expressions>
         </default>
     </profiles>
     <users>
diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index 4727f485943..9628c512e83 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -44,7 +44,7 @@ parser.add_argument('--port', nargs='*', default=[9000], help="Space-separated l
 parser.add_argument('--runs', type=int, default=1, help='Number of query runs per server.')
 parser.add_argument('--max-queries', type=int, default=None, help='Test no more than this number of queries, chosen at random.')
 parser.add_argument('--queries-to-run', nargs='*', type=int, default=None, help='Space-separated list of indexes of queries to test.')
-parser.add_argument('--max-query-seconds', type=int, default=10, help='For how many seconds at most a query is allowed to run. The script finishes with error if this time is exceeded.')
+parser.add_argument('--max-query-seconds', type=int, default=15, help='For how many seconds at most a query is allowed to run. The script finishes with error if this time is exceeded.')
 parser.add_argument('--profile-seconds', type=int, default=0, help='For how many seconds to profile a query for which the performance has changed.')
 parser.add_argument('--long', action='store_true', help='Do not skip the tests tagged as long.')
 parser.add_argument('--print-queries', action='store_true', help='Print test queries and exit.')
@@ -66,7 +66,12 @@ reportStageEnd('parse')
 subst_elems = root.findall('substitutions/substitution')
 available_parameters = {} # { 'table': ['hits_10m', 'hits_100m'], ... }
 for e in subst_elems:
-    available_parameters[e.find('name').text] = [v.text for v in e.findall('values/value')]
+    name = e.find('name').text
+    values = [v.text for v in e.findall('values/value')]
+    if not values:
+        raise Exception(f'No values given for substitution {{{name}}}')
+
+    available_parameters[name] = values
 
 # Takes parallel lists of templates, substitutes them with all combos of
 # parameters. The set of parameters is determined based on the first list.
@@ -76,7 +81,10 @@ def substitute_parameters(query_templates, other_templates = []):
     query_results = []
     other_results = [[]] * (len(other_templates))
     for i, q in enumerate(query_templates):
-        keys = set(n for _, n, _, _ in string.Formatter().parse(q) if n)
+        # We need stable order of keys here, so that the order of substitutions
+        # is always the same, and the query indexes are consistent across test
+        # runs.
+        keys = sorted(set(n for _, n, _, _ in string.Formatter().parse(q) if n))
         values = [available_parameters[k] for k in keys]
         combos = itertools.product(*values)
         for c in combos:
@@ -265,8 +273,14 @@ for query_index in queries_to_run:
             prewarm_id = f'{query_prefix}.prewarm0'
 
             try:
-                # Will also detect too long queries during warmup stage
-                res = c.execute(q, query_id = prewarm_id, settings = {'max_execution_time': args.max_query_seconds})
+                # During the warmup runs, we will also:
+                # * detect queries that are exceedingly long, to fail fast,
+                # * collect profiler traces, which might be helpful for analyzing
+                #   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})
             except clickhouse_driver.errors.Error as e:
                 # Add query id to the exception to make debugging easier.
                 e.args = (prewarm_id, *e.args)
@@ -351,10 +365,11 @@ for query_index in queries_to_run:
         # For very short queries we have a special mode where we run them for at
         # least some time. The recommended lower bound of run time for "normal"
         # queries is about 0.1 s, and we run them about 10 times, giving the
-        # time per query per server of about one second. Use this value as a
-        # reference for "short" queries.
+        # time per query per server of about one second. Run "short" queries
+        # for longer time, because they have a high percentage of overhead and
+        # might give less stable results.
         if is_short[query_index]:
-            if server_seconds >= 2 * len(this_query_connections):
+            if server_seconds >= 8 * len(this_query_connections):
                 break
             # Also limit the number of runs, so that we don't go crazy processing
             # the results -- 'eqmed.sql' is really suboptimal.
diff --git a/docker/test/performance-comparison/report.py b/docker/test/performance-comparison/report.py
index 9d3ccabb788..dabf6b7b93d 100755
--- a/docker/test/performance-comparison/report.py
+++ b/docker/test/performance-comparison/report.py
@@ -446,11 +446,17 @@ if args.report == 'main':
                 attrs[3] = f'style="background: {color_bad}"'
             else:
                 attrs[3] = ''
+                # Just don't add the slightly unstable queries we don't consider
+                # errors. It's not clear what the user should do with them.
+                continue
 
             text += tableRow(r, attrs, anchor)
 
         text += tableEnd()
-        tables.append(text)
+
+        # Don't add an empty table.
+        if very_unstable_queries:
+            tables.append(text)
 
     add_unstable_queries()
 
@@ -520,12 +526,13 @@ if args.report == 'main':
     for t in tables:
         print(t)
 
-    print("""
+    print(f"""
     </div>
     <p class="links">
     <a href="all-queries.html">All queries</a>
     <a href="compare.log">Log</a>
     <a href="output.7z">Test output</a>
+    {os.getenv("CHPC_ADD_REPORT_LINKS") or ''}
     </p>
     </body>
     </html>
@@ -548,16 +555,15 @@ if args.report == 'main':
         message_array.append(str(slower_queries) + ' slower')
 
     if unstable_partial_queries:
-        unstable_queries += unstable_partial_queries
-        error_tests += unstable_partial_queries
+        very_unstable_queries += unstable_partial_queries
         status = 'failure'
 
-    if unstable_queries:
-        message_array.append(str(unstable_queries) + ' unstable')
-
-#    Disabled before fix.
-#    if very_unstable_queries:
-#        status = 'failure'
+    # Don't show mildly unstable queries, only the very unstable ones we
+    # treat as errors.
+    if very_unstable_queries:
+        error_tests += very_unstable_queries
+        status = 'failure'
+        message_array.append(str(very_unstable_queries) + ' unstable')
 
     error_tests += slow_average_tests
     if error_tests:
@@ -638,12 +644,13 @@ elif args.report == 'all-queries':
     for t in tables:
         print(t)
 
-    print("""
+    print(f"""
     </div>
     <p class="links">
     <a href="report.html">Main report</a>
     <a href="compare.log">Log</a>
     <a href="output.7z">Test output</a>
+    {os.getenv("CHPC_ADD_REPORT_LINKS") or ''}
     </p>
     </body>
     </html>
diff --git a/docker/test/pvs/Dockerfile b/docker/test/pvs/Dockerfile
index 382b486dda3..2983be2305f 100644
--- a/docker/test/pvs/Dockerfile
+++ b/docker/test/pvs/Dockerfile
@@ -41,6 +41,6 @@ CMD echo "Running PVS version $PKG_VERSION" && cd /repo_folder && pvs-studio-ana
     && cmake . -D"ENABLE_EMBEDDED_COMPILER"=OFF -D"USE_INTERNAL_PROTOBUF_LIBRARY"=OFF -D"USE_INTERNAL_GRPC_LIBRARY"=OFF \
     && 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; \
     plog-converter -a GA:1,2 -t fullhtml -o /test_output/pvs-studio-html-report pvs-studio.log; \
     plog-converter -a GA:1,2 -t tasklist -o /test_output/pvs-studio-task-report.txt pvs-studio.log
-
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index 253ca1b729a..b08b1b0bf0d 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -3,6 +3,7 @@ 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 wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
+
 RUN mkdir /sqlancer && \
 	cd /sqlancer && \
 	unzip /sqlancer.zip
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index 9e210dc92a2..8d865431570 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -21,14 +21,14 @@ function start()
         -- --path /var/lib/clickhouse1/ --logger.stderr /var/log/clickhouse-server/stderr1.log \
         --logger.log /var/log/clickhouse-server/clickhouse-server1.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server1.err.log \
         --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
-        --mysql_port 19004 \
+        --mysql_port 19004 --postgresql_port 19005 \
         --keeper_server.tcp_port 19181 --keeper_server.server_id 2
 
         sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server2/config.xml --daemon \
         -- --path /var/lib/clickhouse2/ --logger.stderr /var/log/clickhouse-server/stderr2.log \
         --logger.log /var/log/clickhouse-server/clickhouse-server2.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server2.err.log \
         --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
-        --mysql_port 29004 \
+        --mysql_port 29004 --postgresql_port 29005 \
         --keeper_server.tcp_port 29181 --keeper_server.server_id 3
     fi
 
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 61d1b2f4849..658ae1f27ba 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -28,7 +28,8 @@ RUN apt-get update -y \
             tree \
             unixodbc \
             wget \
-            mysql-client=5.7*
+            mysql-client=5.7* \
+            postgresql-client
 
 RUN pip3 install numpy scipy pandas
 
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index 20132eafb75..8440b1548a5 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -44,7 +44,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     -- --path /var/lib/clickhouse1/ --logger.stderr /var/log/clickhouse-server/stderr1.log \
     --logger.log /var/log/clickhouse-server/clickhouse-server1.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server1.err.log \
     --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
-    --mysql_port 19004 \
+    --mysql_port 19004 --postgresql_port 19005 \
     --keeper_server.tcp_port 19181 --keeper_server.server_id 2 \
     --macros.replica r2   # It doesn't work :(
 
@@ -52,7 +52,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     -- --path /var/lib/clickhouse2/ --logger.stderr /var/log/clickhouse-server/stderr2.log \
     --logger.log /var/log/clickhouse-server/clickhouse-server2.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server2.err.log \
     --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
-    --mysql_port 29004 \
+    --mysql_port 29004 --postgresql_port 29005 \
     --keeper_server.tcp_port 29181 --keeper_server.server_id 3 \
     --macros.shard s2   # It doesn't work :(
 
@@ -104,6 +104,29 @@ clickhouse-client -q "system flush logs" ||:
 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
+do
+    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 = '$trace_type'
+            group by trace
+            order by samples desc
+            settings allow_introspection_functions = 1
+            format TabSeparated" \
+        | pigz > "/test_output/trace-log-$trace_type-flamegraph.tsv.gz" &
+done
+
 wait ||:
 
 mv /var/log/clickhouse-server/stderr.log /test_output/ ||:
@@ -112,10 +135,13 @@ if [[ -n "$WITH_COVERAGE" ]] && [[ "$WITH_COVERAGE" -eq 1 ]]; then
 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/coordination.tar /var/lib/clickhouse/coordination ||:
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
     pigz < /var/log/clickhouse-server/clickhouse-server1.log > /test_output/clickhouse-server1.log.gz ||:
     pigz < /var/log/clickhouse-server/clickhouse-server2.log > /test_output/clickhouse-server2.log.gz ||:
     mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
     mv /var/log/clickhouse-server/stderr2.log /test_output/ ||:
+    tar -chf /test_output/coordination1.tar /var/lib/clickhouse1/coordination ||:
+    tar -chf /test_output/coordination2.tar /var/lib/clickhouse2/coordination ||:
 fi
diff --git a/docker/test/stateless_unbundled/Dockerfile b/docker/test/stateless_unbundled/Dockerfile
index 9efe08dbf23..c5463ac447d 100644
--- a/docker/test/stateless_unbundled/Dockerfile
+++ b/docker/test/stateless_unbundled/Dockerfile
@@ -14,9 +14,7 @@ RUN apt-get --allow-unauthenticated update -y \
             expect \
             gdb  \
             gperf \
-            gperf \
             heimdal-multidev \
-            intel-opencl-icd \
             libboost-filesystem-dev \
             libboost-iostreams-dev \
             libboost-program-options-dev \
@@ -50,9 +48,7 @@ RUN apt-get --allow-unauthenticated update -y \
             moreutils \
             ncdu \
             netcat-openbsd \
-            ocl-icd-libopencl1 \
             odbcinst \
-            opencl-headers \
             openssl \
             perl \
             pigz \
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 3594eead992..43a92fdeebe 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -20,6 +20,14 @@ function configure()
 
     # since we run clickhouse from root
     sudo chown root: /var/lib/clickhouse
+
+    # Set more frequent update period of asynchronous metrics to more frequently update information about real memory usage (less chance of OOM).
+    echo "<yandex><asynchronous_metrics_update_period_s>1</asynchronous_metrics_update_period_s></yandex>" \
+        > /etc/clickhouse-server/config.d/asynchronous_metrics_update_period_s.xml
+
+    # Set maximum memory usage as half of total memory (less chance of OOM).
+    echo "<yandex><max_server_memory_usage_to_ram_ratio>0.5</max_server_memory_usage_to_ram_ratio></yandex>" \
+        > /etc/clickhouse-server/config.d/max_server_memory_usage_to_ram_ratio.xml
 }
 
 function stop()
@@ -108,6 +116,11 @@ zgrep -Fav "ASan doesn't fully support makecontext/swapcontext functions" > /dev
     || echo -e 'No sanitizer asserts\tOK' >> /test_output/test_results.tsv
 rm -f /test_output/tmp
 
+# OOM
+zgrep -Fa " <Fatal> Application: Child process was terminated by signal 9" /var/log/clickhouse-server/clickhouse-server.log > /dev/null \
+    && echo -e 'OOM killer (or signal 9) in clickhouse-server.log\tFAIL' >> /test_output/test_results.tsv \
+    || echo -e 'No OOM messages in clickhouse-server.log\tOK' >> /test_output/test_results.tsv
+
 # Logical errors
 zgrep -Fa "Code: 49, e.displayText() = DB::Exception:" /var/log/clickhouse-server/clickhouse-server.log > /dev/null \
     && echo -e 'Logical error thrown (see clickhouse-server.log)\tFAIL' >> /test_output/test_results.tsv \
@@ -118,7 +131,7 @@ zgrep -Fa "########################################" /var/log/clickhouse-server/
     && echo -e 'Killed by signal (in clickhouse-server.log)\tFAIL' >> /test_output/test_results.tsv \
     || echo -e 'Not crashed\tOK' >> /test_output/test_results.tsv
 
-# It also checks for OOM or crash without stacktrace (printed by watchdog)
+# It also checks for crash without stacktrace (printed by watchdog)
 zgrep -Fa " <Fatal> " /var/log/clickhouse-server/clickhouse-server.log > /dev/null \
     && echo -e 'Fatal message in clickhouse-server.log\tFAIL' >> /test_output/test_results.tsv \
     || echo -e 'No fatal messages in clickhouse-server.log\tOK' >> /test_output/test_results.tsv
@@ -131,6 +144,7 @@ pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhous
 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 ||:
 
 # 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 25a705ecbd1..e59c87a8b68 100755
--- a/docker/test/stress/stress
+++ b/docker/test/stress/stress
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 from multiprocessing import cpu_count
-from subprocess import Popen, call, STDOUT
+from subprocess import Popen, call, check_output, STDOUT
 import os
 import sys
 import shutil
@@ -27,7 +27,7 @@ def get_options(i):
         options += " --db-engine=Ordinary"
 
     if i % 3 == 2:
-        options += ''' --db-engine="Replicated('/test/db/test_{}', 's1', 'r1')"'''.format(i)
+        options += ''' --client-option='allow_experimental_database_replicated=1' --db-engine="Replicated('/test/db/test_{}', 's1', 'r1')"'''.format(i)
 
     # If database name is not specified, new database is created for each functional test.
     # Run some threads with one database for all tests.
@@ -58,6 +58,10 @@ def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_t
         time.sleep(0.5)
     return pipes
 
+def compress_stress_logs(output_path, files_prefix):
+    cmd = f"cd {output_path} && tar -zcf stress_run_logs.tar.gz {files_prefix}* && rm {files_prefix}*"
+    check_output(cmd, shell=True)
+
 def prepare_for_hung_check():
     # FIXME this function should not exist, but...
 
@@ -85,10 +89,27 @@ def prepare_for_hung_check():
     # 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)
 
-    # Wait for last queries to finish if any, not longer than 120 seconds
+    # 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)
+    # 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)
+
+    # Wait for last queries to finish if any, not longer than 300 seconds
     call("""clickhouse client -q "select sleepEachRow((
-            select maxOrDefault(120 - elapsed) + 1 from system.processes where query not like '%from system.processes%' and elapsed < 120
-            ) / 120) from numbers(120) format Null" """, shell=True, stderr=STDOUT)
+            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)
+
+    # 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()
+        if int(output) == 0:
+            return False
+    except:
+        pass
+    return True
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO, format='%(asctime)s %(message)s')
@@ -99,7 +120,7 @@ if __name__ == "__main__":
     parser.add_argument("--server-log-folder", default='/var/log/clickhouse-server')
     parser.add_argument("--output-folder")
     parser.add_argument("--global-time-limit", type=int, default=3600)
-    parser.add_argument("--num-parallel", default=cpu_count())
+    parser.add_argument("--num-parallel", type=int, default=cpu_count())
     parser.add_argument('--hung-check', action='store_true', default=False)
 
     args = parser.parse_args()
@@ -118,13 +139,18 @@ if __name__ == "__main__":
         time.sleep(5)
 
     logging.info("All processes finished")
+
+    logging.info("Compressing stress logs")
+    compress_stress_logs(args.output_folder, "stress_test_run_")
+    logging.info("Logs compressed")
+
     if args.hung_check:
-        prepare_for_hung_check()
+        have_long_running_queries = prepare_for_hung_check()
         logging.info("Checking if some queries hung")
         cmd = "{} {} {}".format(args.test_cmd, "--hung-check", "00001_select_1")
         res = call(cmd, shell=True, stderr=STDOUT)
         hung_check_status = "No queries hung\tOK\n"
-        if res != 0:
+        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)
diff --git a/docker/test/testflows/runner/Dockerfile b/docker/test/testflows/runner/Dockerfile
index bd7eee4c166..9fa028fedca 100644
--- a/docker/test/testflows/runner/Dockerfile
+++ b/docker/test/testflows/runner/Dockerfile
@@ -35,10 +35,10 @@ 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.6.74 docker-compose docker dicttoxml kazoo tzlocal
+RUN pip3 install urllib3 testflows==1.6.90 docker-compose==1.29.1 docker==5.0.0 dicttoxml kazoo tzlocal python-dateutil numpy
 
 ENV DOCKER_CHANNEL stable
-ENV DOCKER_VERSION 17.09.1-ce
+ENV DOCKER_VERSION 20.10.6
 
 RUN set -eux; \
   \
@@ -73,5 +73,4 @@ RUN set -x \
 VOLUME /var/lib/docker
 EXPOSE 2375
 ENTRYPOINT ["dockerd-entrypoint.sh"]
-CMD ["sh", "-c", "python3 regression.py --no-color -o classic --local --clickhouse-binary-path ${CLICKHOUSE_TESTS_SERVER_BIN_PATH} --log test.log ${TESTFLOWS_OPTS}; cat test.log | tfs report results --format json > results.json; /usr/local/bin/process_testflows_result.py || echo -e 'failure\tCannot parse results' > check_status.tsv"]
-
+CMD ["sh", "-c", "python3 regression.py --no-color -o new-fails --local --clickhouse-binary-path ${CLICKHOUSE_TESTS_SERVER_BIN_PATH} --log test.log ${TESTFLOWS_OPTS}; cat test.log | tfs report results --format json > results.json; /usr/local/bin/process_testflows_result.py || echo -e 'failure\tCannot parse results' > check_status.tsv; find * -type f | grep _instances | grep clickhouse-server | xargs -n1 tar -rvf clickhouse_logs.tar; gzip -9 clickhouse_logs.tar"]
diff --git a/docs/en/commercial/cloud.md b/docs/en/commercial/cloud.md
index 91d2061c0af..a30d17828ab 100644
--- a/docs/en/commercial/cloud.md
+++ b/docs/en/commercial/cloud.md
@@ -31,8 +31,9 @@ toc_title: Cloud
 
 ## Alibaba Cloud {#alibaba-cloud}
 
-Alibaba Cloud Managed Service for ClickHouse [China Site](https://www.aliyun.com/product/clickhouse) (Will be available at international site at May, 2021) provides the following key features:
--   Highly reliable cloud disk storage engine based on Alibaba Cloud Apsara distributed system
+[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
@@ -40,6 +41,14 @@ Alibaba Cloud Managed Service for ClickHouse [China Site](https://www.aliyun.com
 -   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:
diff --git a/docs/en/commercial/index.md b/docs/en/commercial/index.md
index 0f69df62c7b..90e74d88ea8 100644
--- a/docs/en/commercial/index.md
+++ b/docs/en/commercial/index.md
@@ -14,4 +14,4 @@ Service categories:
 -   [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 doesn’t 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).
+    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/development/adding_test_queries.md b/docs/en/development/adding_test_queries.md
index 4770d48ebd4..95dfd076a12 100644
--- a/docs/en/development/adding_test_queries.md
+++ b/docs/en/development/adding_test_queries.md
@@ -1,6 +1,6 @@
 # How to add test queries to ClickHouse CI
 
-ClickHouse has hundreds (or even thousands) of features. Every commit get checked by a complex set of tests containing many thousands of test cases.
+ClickHouse has hundreds (or even thousands) of features. Every commit gets checked by a complex set of tests containing many thousands of test cases.
 
 The core functionality is very well tested, but some corner-cases and different combinations of features can be uncovered with ClickHouse CI.
 
@@ -105,13 +105,13 @@ clickhouse-client -nmT < tests/queries/0_stateless/01521_dummy_test.sql | tee te
 
 5) ensure everything is correct, if the test output is incorrect (due to some bug for example), adjust the reference file using text editor.
 
-####  How create good test
+####  How to create good test
 
 - test should be
 	- minimal - create only tables related to tested functionality, remove unrelated columns and parts of query
 	- fast - should not take longer than few seconds (better subseconds)
 	- correct - fails then feature is not working
-        - deteministic
+        - deterministic
 	- isolated / stateless 
 		- don't rely on some environment things
 		- don't rely on timing when possible 
@@ -120,11 +120,11 @@ clickhouse-client -nmT < tests/queries/0_stateless/01521_dummy_test.sql | tee te
 - don't switch databases (unless necessary)
 - you can create several table replicas on the same node if needed
 - you can use one of the test cluster definitions when needed (see system.clusters)
-- use `number` / `numbers_mt` / `zeros` / `zeros_mt` and similar for queries / to initialize data when appliable
+- use `number` / `numbers_mt` / `zeros` / `zeros_mt` and similar for queries / to initialize data when applicable
 - clean up the created objects after test and before the test (DROP IF EXISTS) - in case of some dirty state 
 - prefer sync mode of operations (mutations, merges, etc.)
 - use other SQL files in the `0_stateless` folder as an example
-- ensure the feature / feature combination you want to tests is not covered yet with existsing tests
+- ensure the feature / feature combination you want to test is not yet covered with existing tests
 
 #### Commit / push / create PR.
 
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index 4ef01f4e4fb..424052001fd 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -21,11 +21,11 @@ Various `IColumn` implementations (`ColumnUInt8`, `ColumnString`, and so on) are
 
 Nevertheless, it is possible to work with individual values as well. To represent an individual value, the `Field` is used. `Field` is just a discriminated union of `UInt64`, `Int64`, `Float64`, `String` and `Array`. `IColumn` has the `operator []` method to get the n-th value as a `Field`, and the `insert` method to append a `Field` to the end of a column. These methods are not very efficient, because they require dealing with temporary `Field` objects representing an individual value. There are more efficient methods, such as `insertFrom`, `insertRangeFrom`, and so on.
 
-`Field` doesn’t have enough information about a specific data type for a table. For example, `UInt8`, `UInt16`, `UInt32`, and `UInt64` are all represented as `UInt64` in a `Field`.
+`Field` does not have enough information about a specific data type for a table. For example, `UInt8`, `UInt16`, `UInt32`, and `UInt64` are all represented as `UInt64` in a `Field`.
 
 ## Leaky Abstractions {#leaky-abstractions}
 
-`IColumn` has methods for common relational transformations of data, but they don’t meet all needs. For example, `ColumnUInt64` doesn’t have a method to calculate the sum of two columns, and `ColumnString` doesn’t have a method to run a substring search. These countless routines are implemented outside of `IColumn`.
+`IColumn` has methods for common relational transformations of data, but they do not meet all needs. For example, `ColumnUInt64` does not have a method to calculate the sum of two columns, and `ColumnString` does not have a method to run a substring search. These countless routines are implemented outside of `IColumn`.
 
 Various functions on columns can be implemented in a generic, non-efficient way using `IColumn` methods to extract `Field` values, or in a specialized way using knowledge of inner memory layout of data in a specific `IColumn` implementation. It is implemented by casting functions to a specific `IColumn` type and deal with internal representation directly. For example, `ColumnUInt64` has the `getData` method that returns a reference to an internal array, then a separate routine reads or fills that array directly. We have “leaky abstractions” to allow efficient specializations of various routines.
 
@@ -35,7 +35,7 @@ Various functions on columns can be implemented in a generic, non-efficient way
 
 `IDataType` and `IColumn` are only loosely related to each other. Different data types can be represented in memory by the same `IColumn` implementations. For example, `DataTypeUInt32` and `DataTypeDateTime` are both represented by `ColumnUInt32` or `ColumnConstUInt32`. In addition, the same data type can be represented by different `IColumn` implementations. For example, `DataTypeUInt8` can be represented by `ColumnUInt8` or `ColumnConstUInt8`.
 
-`IDataType` only stores metadata. For instance, `DataTypeUInt8` doesn’t store anything at all (except virtual pointer `vptr`) and `DataTypeFixedString` stores just `N` (the size of fixed-size strings).
+`IDataType` only stores metadata. For instance, `DataTypeUInt8` does not store anything at all (except virtual pointer `vptr`) and `DataTypeFixedString` stores just `N` (the size of fixed-size strings).
 
 `IDataType` has helper methods for various data formats. Examples are methods to serialize a value with possible quoting, to serialize a value for JSON, and to serialize a value as part of the XML format. There is no direct correspondence to data formats. For example, the different data formats `Pretty` and `TabSeparated` can use the same `serializeTextEscaped` helper method from the `IDataType` interface.
 
@@ -43,7 +43,7 @@ Various functions on columns can be implemented in a generic, non-efficient way
 
 A `Block` is a container that represents a subset (chunk) of a table in memory. It is just a set of triples: `(IColumn, IDataType, column name)`. During query execution, data is processed by `Block`s. If we have a `Block`, we have data (in the `IColumn` object), we have information about its type (in `IDataType`) that tells us how to deal with that column, and we have the column name. It could be either the original column name from the table or some artificial name assigned for getting temporary results of calculations.
 
-When we calculate some function over columns in a block, we add another column with its result to the block, and we don’t touch columns for arguments of the function because operations are immutable. Later, unneeded columns can be removed from the block, but not modified. It is convenient for the elimination of common subexpressions.
+When we calculate some function over columns in a block, we add another column with its result to the block, and we do not touch columns for arguments of the function because operations are immutable. Later, unneeded columns can be removed from the block, but not modified. It is convenient for the elimination of common subexpressions.
 
 Blocks are created for every processed chunk of data. Note that for the same type of calculation, the column names and types remain the same for different blocks, and only column data changes. It is better to split block data from the block header because small block sizes have a high overhead of temporary strings for copying shared_ptrs and column names.
 
@@ -118,11 +118,11 @@ Interpreters are responsible for creating the query execution pipeline from an `
 
 There are ordinary functions and aggregate functions. For aggregate functions, see the next section.
 
-Ordinary functions don’t change the number of rows – they work as if they are processing each row independently. In fact, functions are not called for individual rows, but for `Block`’s of data to implement vectorized query execution.
+Ordinary functions do not change the number of rows – they work as if they are processing each row independently. In fact, functions are not called for individual rows, but for `Block`’s of data to implement vectorized query execution.
 
 There are some miscellaneous functions, like [blockSize](../sql-reference/functions/other-functions.md#function-blocksize), [rowNumberInBlock](../sql-reference/functions/other-functions.md#function-rownumberinblock), and [runningAccumulate](../sql-reference/functions/other-functions.md#runningaccumulate), that exploit block processing and violate the independence of rows.
 
-ClickHouse has strong typing, so there’s no implicit type conversion. If a function doesn’t support a specific combination of types, it throws an exception. But functions can work (be overloaded) for many different combinations of types. For example, the `plus` function (to implement the `+` operator) works for any combination of numeric types: `UInt8` + `Float32`, `UInt16` + `Int8`, and so on. Also, some variadic functions can accept any number of arguments, such as the `concat` function.
+ClickHouse has strong typing, so there’s no implicit type conversion. If a function does not support a specific combination of types, it throws an exception. But functions can work (be overloaded) for many different combinations of types. For example, the `plus` function (to implement the `+` operator) works for any combination of numeric types: `UInt8` + `Float32`, `UInt16` + `Int8`, and so on. Also, some variadic functions can accept any number of arguments, such as the `concat` function.
 
 Implementing a function may be slightly inconvenient because a function explicitly dispatches supported data types and supported `IColumns`. For example, the `plus` function has code generated by instantiation of a C++ template for each combination of numeric types, and constant or non-constant left and right arguments.
 
@@ -152,7 +152,7 @@ Internally, it is just a primitive multithreaded server without coroutines or fi
 
 The server initializes the `Context` class with the necessary environment for query execution: the list of available databases, users and access rights, settings, clusters, the process list, the query log, and so on. Interpreters use this environment.
 
-We maintain full backward and forward compatibility for the server TCP protocol: old clients can talk to new servers, and new clients can talk to old servers. But we don’t want to maintain it eternally, and we are removing support for old versions after about one year.
+We maintain full backward and forward compatibility for the server TCP protocol: old clients can talk to new servers, and new clients can talk to old servers. But we do not want to maintain it eternally, and we are removing support for old versions after about one year.
 
 !!! note "Note"
     For most external applications, we recommend using the HTTP interface because it is simple and easy to use. The TCP protocol is more tightly linked to internal data structures: it uses an internal format for passing blocks of data, and it uses custom framing for compressed data. We haven’t released a C library for that protocol because it requires linking most of the ClickHouse codebase, which is not practical.
@@ -169,13 +169,13 @@ There is no global query plan for distributed query execution. Each node has its
 
 `MergeTree` is a family of storage engines that supports indexing by primary key. The primary key can be an arbitrary tuple of columns or expressions. Data in a `MergeTree` table is stored in “parts”. Each part stores data in the primary key order, so data is ordered lexicographically by the primary key tuple. All the table columns are stored in separate `column.bin` files in these parts. The files consist of compressed blocks. Each block is usually from 64 KB to 1 MB of uncompressed data, depending on the average value size. The blocks consist of column values placed contiguously one after the other. Column values are in the same order for each column (the primary key defines the order), so when you iterate by many columns, you get values for the corresponding rows.
 
-The primary key itself is “sparse”. It doesn’t address every single row, but only some ranges of data. A separate `primary.idx` file has the value of the primary key for each N-th row, where N is called `index_granularity` (usually, N = 8192). Also, for each column, we have `column.mrk` files with “marks,” which are offsets to each N-th row in the data file. Each mark is a pair: the offset in the file to the beginning of the compressed block, and the offset in the decompressed block to the beginning of data. Usually, compressed blocks are aligned by marks, and the offset in the decompressed block is zero. Data for `primary.idx` always resides in memory, and data for `column.mrk` files is cached.
+The primary key itself is “sparse”. It does not address every single row, but only some ranges of data. A separate `primary.idx` file has the value of the primary key for each N-th row, where N is called `index_granularity` (usually, N = 8192). Also, for each column, we have `column.mrk` files with “marks,” which are offsets to each N-th row in the data file. Each mark is a pair: the offset in the file to the beginning of the compressed block, and the offset in the decompressed block to the beginning of data. Usually, compressed blocks are aligned by marks, and the offset in the decompressed block is zero. Data for `primary.idx` always resides in memory, and data for `column.mrk` files is cached.
 
 When we are going to read something from a part in `MergeTree`, we look at `primary.idx` data and locate ranges that could contain requested data, then look at `column.mrk` data and calculate offsets for where to start reading those ranges. Because of sparseness, excess data may be read. ClickHouse is not suitable for a high load of simple point queries, because the entire range with `index_granularity` rows must be read for each key, and the entire compressed block must be decompressed for each column. We made the index sparse because we must be able to maintain trillions of rows per single server without noticeable memory consumption for the index. Also, because the primary key is sparse, it is not unique: it cannot check the existence of the key in the table at INSERT time. You could have many rows with the same key in a table.
 
 When you `INSERT` a bunch of data into `MergeTree`, that bunch is sorted by primary key order and forms a new part. There are background threads that periodically select some parts and merge them into a single sorted part to keep the number of parts relatively low. That’s why it is called `MergeTree`. Of course, merging leads to “write amplification”. All parts are immutable: they are only created and deleted, but not modified. When SELECT is executed, it holds a snapshot of the table (a set of parts). After merging, we also keep old parts for some time to make a recovery after failure easier, so if we see that some merged part is probably broken, we can replace it with its source parts.
 
-`MergeTree` is not an LSM tree because it doesn’t contain “memtable” and “log”: inserted data is written directly to the filesystem. This makes it suitable only to INSERT data in batches, not by individual row and not very frequently – about once per second is ok, but a thousand times a second is not. We did it this way for simplicity’s sake, and because we are already inserting data in batches in our applications.
+`MergeTree` is not an LSM tree because it does not contain “memtable” and “log”: inserted data is written directly to the filesystem. This makes it suitable only to INSERT data in batches, not by individual row and not very frequently – about once per second is ok, but a thousand times a second is not. We did it this way for simplicity’s sake, and because we are already inserting data in batches in our applications.
 
 There are MergeTree engines that are doing additional work during background merges. Examples are `CollapsingMergeTree` and `AggregatingMergeTree`. This could be treated as special support for updates. Keep in mind that these are not real updates because users usually have no control over the time when background merges are executed, and data in a `MergeTree` table is almost always stored in more than one part, not in completely merged form.
 
@@ -185,7 +185,7 @@ Replication in ClickHouse can be configured on a per-table basis. You could have
 
 Replication is implemented in the `ReplicatedMergeTree` storage engine. The path in `ZooKeeper` is specified as a parameter for the storage engine. All tables with the same path in `ZooKeeper` become replicas of each other: they synchronize their data and maintain consistency. Replicas can be added and removed dynamically simply by creating or dropping a table.
 
-Replication uses an asynchronous multi-master scheme. You can insert data into any replica that has a session with `ZooKeeper`, and data is replicated to all other replicas asynchronously. Because ClickHouse doesn’t support UPDATEs, replication is conflict-free. As there is no quorum acknowledgment of inserts, just-inserted data might be lost if one node fails.
+Replication uses an asynchronous multi-master scheme. You can insert data into any replica that has a session with `ZooKeeper`, and data is replicated to all other replicas asynchronously. Because ClickHouse does not support UPDATEs, replication is conflict-free. As there is no quorum acknowledgment of inserts, just-inserted data might be lost if one node fails.
 
 Metadata for replication is stored in ZooKeeper. There is a replication log that lists what actions to do. Actions are: get part; merge parts; drop a partition, and so on. Each replica copies the replication log to its queue and then executes the actions from the queue. For example, on insertion, the “get the part” action is created in the log, and every replica downloads that part. Merges are coordinated between replicas to get byte-identical results. All parts are merged in the same way on all replicas. One of the leaders initiates a new merge first and writes “merge parts” actions to the log. Multiple replicas (or all) can be leaders at the same time. A replica can be prevented from becoming a leader using the `merge_tree` setting `replicated_can_become_leader`. The leaders are responsible for scheduling background merges.
 
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index 886e85bbf86..a862bdeb299 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -5,12 +5,13 @@ toc_title: Build on Mac OS X
 
 # How to Build ClickHouse on Mac OS X {#how-to-build-clickhouse-on-mac-os-x}
 
-Build should work on x86_64 (Intel) 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 recent Xcode's native AppleClang, or Homebrew's vanilla Clang or GCC compilers.
 
 ## Install Homebrew {#install-homebrew}
 
 ``` bash
-$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+# ...and follow the printed instructions on any additional steps required to complete the installation.
 ```
 
 ## Install Xcode and Command Line Tools {#install-xcode-and-command-line-tools}
@@ -19,11 +20,11 @@ Install the latest [Xcode](https://apps.apple.com/am/app/xcode/id497799835?mt=12
 
 Open it at least once to accept the end-user license agreement and automatically install the required components.
 
-Then, make sure that the latest Comman Line Tools are installed and selected in the system:
+Then, make sure that the latest Command Line Tools are installed and selected in the system:
 
 ``` bash
-$ sudo rm -rf /Library/Developer/CommandLineTools
-$ sudo xcode-select --install
+sudo rm -rf /Library/Developer/CommandLineTools
+sudo xcode-select --install
 ```
 
 Reboot.
@@ -31,14 +32,15 @@ Reboot.
 ## Install Required Compilers, Tools, and Libraries {#install-required-compilers-tools-and-libraries}
 
 ``` bash
-$ brew update
-$ brew install cmake ninja libtool gettext llvm gcc
+brew update
+brew install cmake ninja libtool gettext llvm gcc
 ```
 
 ## Checkout ClickHouse Sources {#checkout-clickhouse-sources}
 
 ``` bash
-$ git clone --recursive git@github.com:ClickHouse/ClickHouse.git # or https://github.com/ClickHouse/ClickHouse.git
+git clone --recursive git@github.com:ClickHouse/ClickHouse.git
+# ...alternatively, you can use https://github.com/ClickHouse/ClickHouse.git as the repo URL.
 ```
 
 ## Build ClickHouse {#build-clickhouse}
@@ -46,37 +48,37 @@ $ git clone --recursive git@github.com:ClickHouse/ClickHouse.git # or https://gi
 To build using Xcode's native AppleClang compiler:
 
 ``` bash
-$ cd ClickHouse
-$ rm -rf build
-$ mkdir build
-$ cd build
-$ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
-$ cmake --build . --config RelWithDebInfo
-$ cd ..
+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
-$ cd ClickHouse
-$ rm -rf build
-$ mkdir build
-$ cd build
-$ cmake -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER==$(brew --prefix llvm)/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
-$ cmake --build . --config RelWithDebInfo
-$ cd ..
+cd ClickHouse
+rm -rf build
+mkdir build
+cd build
+cmake -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm)/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake --build . --config RelWithDebInfo
+cd ..
 ```
 
 To build using Homebrew's vanilla GCC compiler:
 
 ``` 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 -DENABLE_JEMALLOC=OFF ..
-$ cmake --build . --config RelWithDebInfo
-$ cd ..
+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 --build . --config RelWithDebInfo
+cd ..
 ```
 
 ## Caveats {#caveats}
@@ -115,11 +117,18 @@ To do so, create the `/Library/LaunchDaemons/limit.maxfiles.plist` file with the
 Execute the following command:
 
 ``` bash
-$ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
+sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 ```
 
 Reboot.
 
 To check if it’s working, you can use `ulimit -n` command.
 
+## Run ClickHouse server:
+
+```
+cd ClickHouse
+./build/programs/clickhouse-server --config-file ./programs/server/config.xml
+```
+
 [Original article](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index 3181f26800d..8ef12221e8d 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -27,53 +27,20 @@ Or cmake3 instead of cmake on older systems.
 
 On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
-```bash 
+```bash
 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-gcc-10-for-builds}
+#### Use clang-11 for Builds
 
 ``` bash
 $ export CC=clang-11
 $ export CXX=clang++-11
 ```
 
-### Install GCC 10 {#install-gcc-10}
-
-We recommend building ClickHouse with clang-11, GCC-10 also supported, but it is not used for production builds.
-
-If you want to use GCC-10 there are several ways to install it.
-
-#### Install from Repository {#install-from-repository}
-
-On Ubuntu 19.10 or newer:
-
-    $ sudo apt-get update
-    $ sudo apt-get install gcc-10 g++-10
-
-#### Install from a PPA Package {#install-from-a-ppa-package}
-
-On older Ubuntu:
-
-``` bash
-$ sudo apt-get install software-properties-common
-$ sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-$ sudo apt-get update
-$ sudo apt-get install gcc-10 g++-10
-```
-
-#### Install from Sources {#install-from-sources}
-
-See [utils/ci/build-gcc-from-sources.sh](https://github.com/ClickHouse/ClickHouse/blob/master/utils/ci/build-gcc-from-sources.sh)
-
-#### Use GCC 10 for Builds {#use-gcc-10-for-builds}
-
-``` bash
-$ export CC=gcc-10
-$ export CXX=g++-10
-```
+Gcc can also be used though it is discouraged.
 
 ### Checkout ClickHouse Sources {#checkout-clickhouse-sources}
 
@@ -106,9 +73,9 @@ The build requires the following components:
 
 -   Git (is used only to checkout the sources, it’s not needed for the build)
 -   CMake 3.10 or newer
--   Ninja (recommended) or Make
--   C++ compiler: gcc 10 or clang 8 or newer
--   Linker: lld or gold (the classic GNU ld won’t work)
+-   Ninja
+-   C++ compiler: clang-11 or newer
+-   Linker: lld
 -   Python (is only used inside LLVM build and it is optional)
 
 If all the components are installed, you may build in the same way as the steps above.
@@ -116,7 +83,7 @@ If all the components are installed, you may build in the same way as the steps
 Example for Ubuntu Eoan:
 ``` bash
 sudo apt update
-sudo apt install git cmake ninja-build g++ python
+sudo apt install git cmake ninja-build clang++ python
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
 mkdir build && cd build
 cmake ../ClickHouse
@@ -125,7 +92,7 @@ ninja
 
 Example for OpenSUSE Tumbleweed:
 ``` bash
-sudo zypper install git cmake ninja gcc-c++ python lld
+sudo zypper install git cmake ninja clang-c++ python lld
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
 mkdir build && cd build
 cmake ../ClickHouse
@@ -135,7 +102,7 @@ ninja
 Example for Fedora Rawhide:
 ``` bash
 sudo yum update
-yum --nogpg install git cmake make gcc-c++ python3
+yum --nogpg install git cmake make clang-c++ python3
 git clone --recursive https://github.com/ClickHouse/ClickHouse.git
 mkdir build && cd build
 cmake ../ClickHouse
@@ -145,11 +112,11 @@ make -j $(nproc)
 
 ## How to Build ClickHouse Debian Package {#how-to-build-clickhouse-debian-package}
 
-### Install Git and Pbuilder {#install-git-and-pbuilder}
+### Install Git {#install-git}
 
 ``` bash
 $ sudo apt-get update
-$ sudo apt-get install git python pbuilder debhelper lsb-release fakeroot sudo debian-archive-keyring debian-keyring
+$ sudo apt-get install git python debhelper lsb-release fakeroot sudo debian-archive-keyring debian-keyring
 ```
 
 ### Checkout ClickHouse Sources {#checkout-clickhouse-sources-1}
@@ -167,7 +134,7 @@ $ ./release
 
 ## Faster builds for development
 
-Normally all tools of the ClickHouse bundle, such as `clickhouse-server`, `clickhouse-client` etc., are linked into a single static executable, `clickhouse`. This executable must be re-linked on every change, which might be slow. Two common ways to improve linking time are to use `lld` linker, and use the 'split' build configuration, which builds a separate binary for every tool, and further splits the code into serveral shared libraries. To enable these tweaks, pass the following flags to `cmake`:
+Normally all tools of the ClickHouse bundle, such as `clickhouse-server`, `clickhouse-client` etc., are linked into a single static executable, `clickhouse`. This executable must be re-linked on every change, which might be slow. Two common ways to improve linking time are to use `lld` linker, and use the 'split' build configuration, which builds a separate binary for every tool, and further splits the code into several shared libraries. To enable these tweaks, pass the following flags to `cmake`:
 
 ```
 -DCMAKE_C_FLAGS="--ld-path=lld" -DCMAKE_CXX_FLAGS="--ld-path=lld" -DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1
diff --git a/docs/en/development/cmake-in-clickhouse.md b/docs/en/development/cmake-in-clickhouse.md
deleted file mode 100644
index 6e6ac825587..00000000000
--- a/docs/en/development/cmake-in-clickhouse.md
+++ /dev/null
@@ -1,284 +0,0 @@
-# CMake in ClickHouse
-
-## TL; DR How to make ClickHouse compile and link faster?
-
-Developer only! This command will likely fulfill most of your needs. Run before calling `ninja`.
-
-```cmake
-cmake .. \
-    -DCMAKE_C_COMPILER=/bin/clang-10 \
-    -DCMAKE_CXX_COMPILER=/bin/clang++-10 \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DENABLE_CLICKHOUSE_ALL=OFF \
-    -DENABLE_CLICKHOUSE_SERVER=ON \
-    -DENABLE_CLICKHOUSE_CLIENT=ON \
-    -DUSE_STATIC_LIBRARIES=OFF \
-    -DSPLIT_SHARED_LIBRARIES=ON \
-    -DENABLE_LIBRARIES=OFF \
-    -DUSE_UNWIND=ON \
-    -DENABLE_UTILS=OFF \
-    -DENABLE_TESTS=OFF
-```
-
-## CMake files types
-
-1. ClickHouse's source CMake files (located in the root directory and in `/src`).
-2. Arch-dependent CMake files (located in `/cmake/*os_name*`).
-3. Libraries finders (search for contrib libraries, located in `/cmake/find`).
-3. Contrib build CMake files (used instead of libraries' own CMake files, located in `/cmake/modules`)
-
-## List of CMake flags
-
-* This list is auto-generated by [this Python script](https://github.com/clickhouse/clickhouse/blob/master/docs/tools/cmake_in_clickhouse_generator.py).
-* The flag name is a link to its position in the code.
-* If an option's default value is itself an option, it's also a link to its position in this list.
-### ClickHouse modes
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="enable-clickhouse-all"></a>[`ENABLE_CLICKHOUSE_ALL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L8) | `ON` | Enable all ClickHouse modes by default | The `clickhouse` binary is a multi purpose tool that contains multiple execution modes (client, server, etc.), each of them may be built and linked as a separate library. If you do not know what modes you need, turn this option OFF and enable SERVER and CLIENT only.  |
-| <a name="enable-clickhouse-benchmark"></a>[`ENABLE_CLICKHOUSE_BENCHMARK`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L18) | `ENABLE_CLICKHOUSE_ALL` | Queries benchmarking mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark/  |
-| <a name="enable-clickhouse-client"></a>[`ENABLE_CLICKHOUSE_CLIENT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L11) | `ENABLE_CLICKHOUSE_ALL` | Client mode (interactive tui/shell that connects to the server) |  |
-| <a name="enable-clickhouse-compressor"></a>[`ENABLE_CLICKHOUSE_COMPRESSOR`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L23) | `ENABLE_CLICKHOUSE_ALL` | Data compressor and decompressor | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-compressor/  |
-| <a name="enable-clickhouse-copier"></a>[`ENABLE_CLICKHOUSE_COPIER`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L26) | `ENABLE_CLICKHOUSE_ALL` | Inter-cluster data copying mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-copier/  |
-| <a name="enable-clickhouse-extract-from-config"></a>[`ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L20) | `ENABLE_CLICKHOUSE_ALL` | Configs processor (extract values etc.) |  |
-| <a name="enable-clickhouse-format"></a>[`ENABLE_CLICKHOUSE_FORMAT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L28) | `ENABLE_CLICKHOUSE_ALL` | Queries pretty-printer and formatter with syntax highlighting |  |
-| <a name="enable-clickhouse-git-import"></a>[`ENABLE_CLICKHOUSE_GIT_IMPORT`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L40) | `ENABLE_CLICKHOUSE_ALL` | A tool to analyze Git repositories | https://presentations.clickhouse.tech/matemarketing_2020/  |
-| <a name="enable-clickhouse-install"></a>[`ENABLE_CLICKHOUSE_INSTALL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L44) | `OFF` | Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only) |  |
-| <a name="enable-clickhouse-local"></a>[`ENABLE_CLICKHOUSE_LOCAL`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L15) | `ENABLE_CLICKHOUSE_ALL` | Local files fast processing mode | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-local/  |
-| <a name="enable-clickhouse-obfuscator"></a>[`ENABLE_CLICKHOUSE_OBFUSCATOR`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L32) | `ENABLE_CLICKHOUSE_ALL` | Table data obfuscator (convert real data to benchmark-ready one) | https://clickhouse.tech/docs/en/operations/utilities/clickhouse-obfuscator/  |
-| <a name="enable-clickhouse-odbc-bridge"></a>[`ENABLE_CLICKHOUSE_ODBC_BRIDGE`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L36) | `ENABLE_CLICKHOUSE_ALL` | HTTP-server working like a proxy to ODBC driver | https://clickhouse.tech/docs/en/operations/utilities/odbc-bridge/  |
-| <a name="enable-clickhouse-server"></a>[`ENABLE_CLICKHOUSE_SERVER`](https://github.com/clickhouse/clickhouse/blob/master/programs/CMakeLists.txt#L10) | `ENABLE_CLICKHOUSE_ALL` | Server mode (main mode) |  |
-
-### External libraries
-Note that ClickHouse uses forks of these libraries, see https://github.com/ClickHouse-Extras.
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="enable-amqpcpp"></a>[`ENABLE_AMQPCPP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/amqpcpp.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe AMQP-CPP |  |
-| <a name="enable-avro"></a>[`ENABLE_AVRO`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/avro.cmake#L2) | `ENABLE_LIBRARIES` | Enable Avro | Needed when using Apache Avro serialization format  |
-| <a name="enable-base"></a>[`ENABLE_BASE64`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/base64.cmake#L1) | `ENABLE_LIBRARIES` | Enable base64 |  |
-| <a name="enable-brotli"></a>[`ENABLE_BROTLI`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/brotli.cmake#L1) | `ENABLE_LIBRARIES` | Enable brotli |  |
-| <a name="enable-capnp"></a>[`ENABLE_CAPNP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/capnp.cmake#L1) | `ENABLE_LIBRARIES` | Enable Cap'n Proto |  |
-| <a name="enable-cassandra"></a>[`ENABLE_CASSANDRA`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cassandra.cmake#L1) | `ENABLE_LIBRARIES` | Enable Cassandra |  |
-| <a name="enable-ccache"></a>[`ENABLE_CCACHE`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ccache.cmake#L22) | `ENABLE_CCACHE_BY_DEFAULT` | Speedup re-compilations using ccache (external tool) | https://ccache.dev/  |
-| <a name="enable-clang-tidy"></a>[`ENABLE_CLANG_TIDY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/analysis.cmake#L2) | `OFF` | Use clang-tidy static analyzer | https://clang.llvm.org/extra/clang-tidy/  |
-| <a name="enable-curl"></a>[`ENABLE_CURL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/curl.cmake#L1) | `ENABLE_LIBRARIES` | Enable curl |  |
-| <a name="enable-embedded-compiler"></a>[`ENABLE_EMBEDDED_COMPILER`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L5) | `ENABLE_LIBRARIES` | Set to TRUE to enable support for 'compile_expressions' option for query execution |  |
-| <a name="enable-fastops"></a>[`ENABLE_FASTOPS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/fastops.cmake#L2) | `ENABLE_LIBRARIES` | Enable fast vectorized mathematical functions library by Mikhail Parakhin |  |
-| <a name="enable-gperf"></a>[`ENABLE_GPERF`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/gperf.cmake#L5) | `ENABLE_LIBRARIES` | Use gperf function hash generator tool |  |
-| <a name="enable-grpc"></a>[`ENABLE_GRPC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/grpc.cmake#L8) | `ENABLE_GRPC_DEFAULT` | Use gRPC |  |
-| <a name="enable-gsasl-library"></a>[`ENABLE_GSASL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libgsasl.cmake#L1) | `ENABLE_LIBRARIES` | Enable gsasl library |  |
-| <a name="enable-h"></a>[`ENABLE_H3`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/h3.cmake#L1) | `ENABLE_LIBRARIES` | Enable H3 |  |
-| <a name="enable-hdfs"></a>[`ENABLE_HDFS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/hdfs3.cmake#L2) | `ENABLE_LIBRARIES` | Enable HDFS |  |
-| <a name="enable-icu"></a>[`ENABLE_ICU`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/icu.cmake#L2) | `ENABLE_LIBRARIES` | Enable ICU |  |
-| <a name="enable-ldap"></a>[`ENABLE_LDAP`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ldap.cmake#L5) | `ENABLE_LIBRARIES` | Enable LDAP |  |
-| <a name="enable-libpqxx"></a>[`ENABLE_LIBPQXX`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libpqxx.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe libpqxx |  |
-| <a name="enable-msgpack"></a>[`ENABLE_MSGPACK`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/msgpack.cmake#L1) | `ENABLE_LIBRARIES` | Enable msgpack library |  |
-| <a name="enable-mysql"></a>[`ENABLE_MYSQL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/mysqlclient.cmake#L2) | `ENABLE_LIBRARIES` | Enable MySQL |  |
-| <a name="enable-nuraft"></a>[`ENABLE_NURAFT`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/nuraft.cmake#L1) | `ENABLE_LIBRARIES` | Enable NuRaft |  |
-| <a name="enable-odbc"></a>[`ENABLE_ODBC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/odbc.cmake#L1) | `ENABLE_LIBRARIES` | Enable ODBC library |  |
-| <a name="enable-orc"></a>[`ENABLE_ORC`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/orc.cmake#L1) | `ENABLE_LIBRARIES` | Enable ORC |  |
-| <a name="enable-parquet"></a>[`ENABLE_PARQUET`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/parquet.cmake#L2) | `ENABLE_LIBRARIES` | Enable parquet |  |
-| <a name="enable-protobuf"></a>[`ENABLE_PROTOBUF`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/protobuf.cmake#L1) | `ENABLE_LIBRARIES` | Enable protobuf |  |
-| <a name="enable-rapidjson"></a>[`ENABLE_RAPIDJSON`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rapidjson.cmake#L1) | `ENABLE_LIBRARIES` | Use rapidjson |  |
-| <a name="enable-rdkafka"></a>[`ENABLE_RDKAFKA`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rdkafka.cmake#L1) | `ENABLE_LIBRARIES` | Enable kafka |  |
-| <a name="enable-rocksdb"></a>[`ENABLE_ROCKSDB`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rocksdb.cmake#L1) | `ENABLE_LIBRARIES` | Enable ROCKSDB |  |
-| <a name="enable-s"></a>[`ENABLE_S3`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/s3.cmake#L2) | `ENABLE_LIBRARIES` | Enable S3 |  |
-| <a name="enable-ssl"></a>[`ENABLE_SSL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ssl.cmake#L3) | `ENABLE_LIBRARIES` | Enable ssl | Needed when securely connecting to an external server, e.g. clickhouse-client --host ... --secure  |
-| <a name="enable-stats"></a>[`ENABLE_STATS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/stats.cmake#L1) | `ENABLE_LIBRARIES` | Enalbe StatsLib library |  |
-
-
-### External libraries system/bundled mode
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="use-internal-avro-library"></a>[`USE_INTERNAL_AVRO_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/avro.cmake#L11) | `ON` | Set to FALSE to use system avro library instead of bundled |  |
-| <a name="use-internal-aws-s-library"></a>[`USE_INTERNAL_AWS_S3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/s3.cmake#L14) | `ON` | Set to FALSE to use system S3 instead of bundled (experimental set to OFF on your own risk) |  |
-| <a name="use-internal-brotli-library"></a>[`USE_INTERNAL_BROTLI_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/brotli.cmake#L12) | `USE_STATIC_LIBRARIES` | Set to FALSE to use system libbrotli library instead of bundled | Many system ship only dynamic brotly libraries, so we back off to bundled by default  |
-| <a name="use-internal-capnp-library"></a>[`USE_INTERNAL_CAPNP_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/capnp.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system capnproto library instead of bundled |  |
-| <a name="use-internal-curl"></a>[`USE_INTERNAL_CURL`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/curl.cmake#L10) | `NOT_UNBUNDLED` | Use internal curl library |  |
-| <a name="use-internal-grpc-library"></a>[`USE_INTERNAL_GRPC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/grpc.cmake#L25) | `NOT_UNBUNDLED` | Set to FALSE to use system gRPC library instead of bundled. (Experimental. Set to OFF on your own risk) | Normally we use the internal gRPC framework. You can set USE_INTERNAL_GRPC_LIBRARY to OFF to force using the external gRPC framework, which should be installed in the system in this case. The external gRPC framework can be installed in the system by running sudo apt-get install libgrpc++-dev protobuf-compiler-grpc  |
-| <a name="use-internal-gtest-library"></a>[`USE_INTERNAL_GTEST_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/gtest.cmake#L3) | `NOT_UNBUNDLED` | Set to FALSE to use system Google Test instead of bundled |  |
-| <a name="use-internal-h-library"></a>[`USE_INTERNAL_H3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/h3.cmake#L9) | `ON` | Set to FALSE to use system h3 library instead of bundled |  |
-| <a name="use-internal-hdfs-library"></a>[`USE_INTERNAL_HDFS3_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/hdfs3.cmake#L14) | `ON` | Set to FALSE to use system HDFS3 instead of bundled (experimental - set to OFF on your own risk) |  |
-| <a name="use-internal-icu-library"></a>[`USE_INTERNAL_ICU_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/icu.cmake#L15) | `NOT_UNBUNDLED` | Set to FALSE to use system ICU library instead of bundled |  |
-| <a name="use-internal-ldap-library"></a>[`USE_INTERNAL_LDAP_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ldap.cmake#L14) | `NOT_UNBUNDLED` | Set to FALSE to use system *LDAP library instead of bundled |  |
-| <a name="use-internal-libcxx-library"></a>[`USE_INTERNAL_LIBCXX_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cxx.cmake#L15) | `USE_INTERNAL_LIBCXX_LIBRARY_DEFAULT` | Disable to use system libcxx and libcxxabi libraries instead of bundled |  |
-| <a name="use-internal-libgsasl-library"></a>[`USE_INTERNAL_LIBGSASL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libgsasl.cmake#L12) | `USE_STATIC_LIBRARIES` | Set to FALSE to use system libgsasl library instead of bundled | when USE_STATIC_LIBRARIES we usually need to pick up hell a lot of dependencies for libgsasl  |
-| <a name="use-internal-libxml-library"></a>[`USE_INTERNAL_LIBXML2_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/libxml2.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system libxml2 library instead of bundled |  |
-| <a name="use-internal-llvm-library"></a>[`USE_INTERNAL_LLVM_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L8) | `NOT_UNBUNDLED` | Use bundled or system LLVM library. |  |
-| <a name="use-internal-msgpack-library"></a>[`USE_INTERNAL_MSGPACK_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/msgpack.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system msgpack library instead of bundled |  |
-| <a name="use-internal-mysql-library"></a>[`USE_INTERNAL_MYSQL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/mysqlclient.cmake#L15) | `NOT_UNBUNDLED` | Set to FALSE to use system mysqlclient library instead of bundled |  |
-| <a name="use-internal-odbc-library"></a>[`USE_INTERNAL_ODBC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/odbc.cmake#L22) | `NOT_UNBUNDLED` | Use internal ODBC library |  |
-| <a name="use-internal-orc-library"></a>[`USE_INTERNAL_ORC_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/orc.cmake#L11) | `ON` | Set to FALSE to use system ORC instead of bundled (experimental set to OFF on your own risk) |  |
-| <a name="use-internal-parquet-library"></a>[`USE_INTERNAL_PARQUET_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/parquet.cmake#L16) | `NOT_UNBUNDLED` | Set to FALSE to use system parquet library instead of bundled |  |
-| <a name="use-internal-poco-library"></a>[`USE_INTERNAL_POCO_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/poco.cmake#L1) | `ON` | Use internal Poco library |  |
-| <a name="use-internal-protobuf-library"></a>[`USE_INTERNAL_PROTOBUF_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/protobuf.cmake#L14) | `NOT_UNBUNDLED` | Set to FALSE to use system protobuf instead of bundled. (Experimental. Set to OFF on your own risk) | Normally we use the internal protobuf library. You can set USE_INTERNAL_PROTOBUF_LIBRARY to OFF to force using the external protobuf library, which should be installed in the system in this case. The external protobuf library can be installed in the system by running sudo apt-get install libprotobuf-dev protobuf-compiler libprotoc-dev  |
-| <a name="use-internal-rapidjson-library"></a>[`USE_INTERNAL_RAPIDJSON_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rapidjson.cmake#L9) | `NOT_UNBUNDLED` | Set to FALSE to use system rapidjson library instead of bundled |  |
-| <a name="use-internal-rdkafka-library"></a>[`USE_INTERNAL_RDKAFKA_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rdkafka.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system librdkafka instead of the bundled |  |
-| <a name="use-internal-re-library"></a>[`USE_INTERNAL_RE2_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/re2.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system re2 library instead of bundled [slower] |  |
-| <a name="use-internal-rocksdb-library"></a>[`USE_INTERNAL_ROCKSDB_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/rocksdb.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system ROCKSDB library instead of bundled |  |
-| <a name="use-internal-snappy-library"></a>[`USE_INTERNAL_SNAPPY_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/snappy.cmake#L10) | `NOT_UNBUNDLED` | Set to FALSE to use system snappy library instead of bundled |  |
-| <a name="use-internal-sparsehash-library"></a>[`USE_INTERNAL_SPARSEHASH_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/sparsehash.cmake#L1) | `ON` | Set to FALSE to use system sparsehash library instead of bundled |  |
-| <a name="use-internal-ssl-library"></a>[`USE_INTERNAL_SSL_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/ssl.cmake#L12) | `NOT_UNBUNDLED` | Set to FALSE to use system *ssl library instead of bundled |  |
-| <a name="use-internal-zlib-library"></a>[`USE_INTERNAL_ZLIB_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/zlib.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system zlib library instead of bundled |  |
-| <a name="use-internal-zstd-library"></a>[`USE_INTERNAL_ZSTD_LIBRARY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/zstd.cmake#L1) | `NOT_UNBUNDLED` | Set to FALSE to use system zstd library instead of bundled |  |
-
-
-### Other flags
-
-| Name | Default value | Description | Comment |
-|------|---------------|-------------|---------|
-| <a name="add-gdb-index-for-gold"></a>[`ADD_GDB_INDEX_FOR_GOLD`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L195) | `OFF` | Add .gdb-index to resulting binaries for gold linker. | Ignored if `lld` is used  |
-| <a name="arch-native"></a>[`ARCH_NATIVE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L248) | `OFF` | Add -march=native compiler flag |  |
-| <a name="clickhouse-split-binary"></a>[`CLICKHOUSE_SPLIT_BINARY`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L98) | `OFF` | Make several binaries (clickhouse-server, clickhouse-client etc.) instead of one bundled |  |
-| <a name="compiler-pipe"></a>[`COMPILER_PIPE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L235) | `ON` | -pipe compiler option | Less `/tmp` usage, more RAM usage.  |
-| <a name="enable-check-heavy-builds"></a>[`ENABLE_CHECK_HEAVY_BUILDS`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L69) | `OFF` | Don't allow C++ translation units to compile too long or to take too much memory while compiling |  |
-| <a name="enable-fuzzing"></a>[`ENABLE_FUZZING`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L115) | `OFF` | Fuzzy testing using libfuzzer | Implies `WITH_COVERAGE`  |
-| <a name="enable-libraries"></a>[`ENABLE_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L357) | `ON` | Enable all external libraries by default | Turns on all external libs like s3, kafka, ODBC, ...  |
-| <a name="enable-multitarget-code"></a>[`ENABLE_MULTITARGET_CODE`](https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L100) | `ON` | Enable platform-dependent code | ClickHouse developers may use platform-dependent code under some macro (e.g. `ifdef ENABLE_MULTITARGET`). If turned ON, this option defines such macro. See `src/Functions/TargetSpecific.h`  |
-| <a name="enable-tests"></a>[`ENABLE_TESTS`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L154) | `ON` | Provide unit_test_dbms target with Google.Test unit tests | If turned `ON`, assumes the user has either the system GTest library or the bundled one.  |
-| <a name="enable-thinlto"></a>[`ENABLE_THINLTO`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L313) | `ON` | Clang-specific link time optimization | https://clang.llvm.org/docs/ThinLTO.html Applies to clang only. Disabled when building with tests or sanitizers.  |
-| <a name="fail-on-unsupported-options-combination"></a>[`FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L32) | `ON` | Stop/Fail CMake configuration if some ENABLE_XXX option is defined (either ON or OFF)   but is not possible to satisfy | If turned off: e.g. when ENABLE_FOO is ON, but FOO tool was not found, the CMake will continue.  |
-| <a name="glibc-compatibility"></a>[`GLIBC_COMPATIBILITY`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L159) | `ON` | Enable compatibility with older glibc libraries. | Only for Linux, x86_64. Implies `ENABLE_FASTMEMCPY`  |
-| <a name="linker-name"></a>[`LINKER_NAME`](https://github.com/clickhouse/clickhouse/blob/master/cmake/tools.cmake#L44) | `OFF` | Linker name or full path | Example values: `lld-10`, `gold`.  |
-| <a name="llvm-has-rtti"></a>[`LLVM_HAS_RTTI`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/llvm.cmake#L40) | `ON` | Enable if LLVM was build with RTTI enabled |  |
-| <a name="make-static-libraries"></a>[`MAKE_STATIC_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L91) | `USE_STATIC_LIBRARIES` | Disable to make shared libraries |  |
-| <a name="parallel-compile-jobs"></a>[`PARALLEL_COMPILE_JOBS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L10) | `""` | Maximum number of concurrent compilation jobs | 1 if not set  |
-| <a name="parallel-link-jobs"></a>[`PARALLEL_LINK_JOBS`](https://github.com/clickhouse/clickhouse/blob/master/cmake/limit_jobs.cmake#L13) | `""` | Maximum number of concurrent link jobs | 1 if not set  |
-| <a name="sanitize"></a>[`SANITIZE`](https://github.com/clickhouse/clickhouse/blob/master/cmake/sanitize.cmake#L7) | `""` | Enable one of the code sanitizers | Possible values: - `address` (ASan) - `memory` (MSan) - `thread` (TSan) - `undefined` (UBSan) - "" (no sanitizing)  |
-| <a name="split-shared-libraries"></a>[`SPLIT_SHARED_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L96) | `OFF` | Keep all internal libraries as separate .so files | DEVELOPER ONLY. Faster linking if turned on.  |
-| <a name="strip-debug-symbols-functions"></a>[`STRIP_DEBUG_SYMBOLS_FUNCTIONS`](https://github.com/clickhouse/clickhouse/blob/master/src/Functions/CMakeLists.txt#L49) | `STRIP_DSF_DEFAULT` | Do not generate debugger info for ClickHouse functions | Provides faster linking and lower binary size. Tradeoff is the inability to debug some source files with e.g. gdb (empty stack frames and no local variables)."  |
-| <a name="unbundled"></a>[`UNBUNDLED`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L363) | `OFF` | Use system libraries instead of ones in contrib/ | 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. Useful for maintainers of OS packages.  |
-| <a name="use-include-what-you-use"></a>[`USE_INCLUDE_WHAT_YOU_USE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L418) | `OFF` | Automatically reduce unneeded includes in source code (external tool) | https://github.com/include-what-you-use/include-what-you-use  |
-| <a name="use-libcxx"></a>[`USE_LIBCXX`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/cxx.cmake#L1) | `NOT_UNBUNDLED` | Use libc++ and libc++abi instead of libstdc++ |  |
-| <a name="use-sentry"></a>[`USE_SENTRY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/sentry.cmake#L13) | `ENABLE_LIBRARIES` | Use Sentry |  |
-| <a name="use-simdjson"></a>[`USE_SIMDJSON`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/simdjson.cmake#L1) | `ENABLE_LIBRARIES` | Use simdjson |  |
-| <a name="use-snappy"></a>[`USE_SNAPPY`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/snappy.cmake#L1) | `ENABLE_LIBRARIES` | Enable snappy library |  |
-| <a name="use-static-libraries"></a>[`USE_STATIC_LIBRARIES`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L90) | `ON` | Disable to use shared libraries |  |
-| <a name="use-unwind"></a>[`USE_UNWIND`](https://github.com/clickhouse/clickhouse/blob/master/cmake/find/unwind.cmake#L1) | `ENABLE_LIBRARIES` | Enable libunwind (better stacktraces) |  |
-| <a name="werror"></a>[`WERROR`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L373) | `OFF` | Enable -Werror compiler option | Using system libs can cause a lot of warnings in includes (on macro expansion).  |
-| <a name="weverything"></a>[`WEVERYTHING`](https://github.com/clickhouse/clickhouse/blob/master/cmake/warnings.cmake#L22) | `ON` | Enable -Weverything option with some exceptions. | Add some warnings that are not available even with -Wall -Wextra -Wpedantic. Intended for exploration of new compiler warnings that may be found useful. Applies to clang only  |
-| <a name="with-coverage"></a>[`WITH_COVERAGE`](https://github.com/clickhouse/clickhouse/blob/master/CMakeLists.txt#L274) | `OFF` | Profile the resulting binary/binaries | Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc  |
-
-## Developer's guide for adding new CMake options
-
-### Don't be obvious. Be informative.
-
-Bad:
-```cmake
-option (ENABLE_TESTS "Enables testing" OFF)
-```
-
-This description is quite useless as is neither gives the viewer any additional information nor explains the option purpose.
-
-Better:
-
-```cmake
-option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
-```
-
-If the option's purpose can't be guessed by its name, or the purpose guess may be misleading, or option has some 
-pre-conditions, leave a comment above the `option()` line and explain what it does. 
-The best way would be linking the docs page (if it exists).
-The comment is parsed into a separate column (see below).
-
-Even better:
-
-```cmake
-# implies ${TESTS_ARE_ENABLED}
-# see tests/CMakeLists.txt for implementation detail.
-option(ENABLE_TESTS "Provide unit_test_dbms target with Google.test unit tests" OFF)
-```
-
-### If the option's state could produce unwanted (or unusual) result, explicitly warn the user.
-
-Suppose you have an option that may strip debug symbols from the ClickHouse's part.
-This can speed up the linking process, but produces a binary that cannot be debugged.
-In that case, prefer explicitly raising a warning telling the developer that he may be doing something wrong. 
-Also, such options should be disabled if applies.
-
-Bad:
-```cmake
-option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
-    "Do not generate debugger info for ClickHouse functions.
-    ${STRIP_DSF_DEFAULT})
-
-if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
-    target_compile_options(clickhouse_functions PRIVATE "-g0")
-endif()
-
-```
-Better:
-
-```cmake
-# Provides faster linking and lower binary size.
-# Tradeoff is the inability to debug some source files with e.g. gdb
-# (empty stack frames and no local variables)."
-option(STRIP_DEBUG_SYMBOLS_FUNCTIONS
-    "Do not generate debugger info for ClickHouse functions."
-    ${STRIP_DSF_DEFAULT})
-
-if (STRIP_DEBUG_SYMBOLS_FUNCTIONS)
-    message(WARNING "Not generating debugger info for ClickHouse functions")
-    target_compile_options(clickhouse_functions PRIVATE "-g0")
-endif()
-```
-
-### In the option's description, explain WHAT the option does rather than WHY it does something.
-
-The WHY explanation should be placed in the comment.
-You may find that the option's name is self-descriptive.
-
-Bad:
-
-```cmake
-option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
-```
-
-Better:
-
-```cmake
-# Only applicable for clang.
-# Turned off when building with tests or sanitizers.
-option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
-```
-
-### Don't assume other developers know as much as you do.
-
-In ClickHouse, there are many tools used that an ordinary developer may not know. If you are in doubt, give a link to
-the tool's docs. It won't take much of your time.
-
-Bad:
-
-```cmake
-option(ENABLE_THINLTO "Enable Thin LTO. Only applicable for clang. It's also suppressed when building with tests or sanitizers." ON)
-```
-
-Better (combined with the above hint):
-
-```cmake
-# https://clang.llvm.org/docs/ThinLTO.html
-# Only applicable for clang.
-# Turned off when building with tests or sanitizers.
-option(ENABLE_THINLTO "Clang-specific link time optimisation" ON).
-```
-
-Other example, bad:
-
-```cmake
-option (USE_INCLUDE_WHAT_YOU_USE "Use 'include-what-you-use' tool" OFF)
-```
-
-Better:
-
-```cmake
-# https://github.com/include-what-you-use/include-what-you-use
-option (USE_INCLUDE_WHAT_YOU_USE "Reduce unneeded #include s (external tool)" OFF)
-```
-
-### Prefer consistent default values.
-
-CMake allows you to pass a plethora of values representing boolean `true/false`, e.g. `1, ON, YES, ...`.
-Prefer the `ON/OFF` values, if possible.
diff --git a/docs/en/development/contrib.md b/docs/en/development/contrib.md
index 76a2f647231..64ca2387029 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -5,36 +5,87 @@ toc_title: Third-Party Libraries Used
 
 # Third-Party Libraries Used {#third-party-libraries-used}
 
-| Library             | License                                                                                                                                      |
-|---------------------|----------------------------------------------------------------------------------------------------------------------------------------------|
-| 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)                                  |
-| sentry-native       | [MIT License](https://github.com/getsentry/sentry-native/blob/master/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)                                                                    |
+The list of third-party libraries can be obtained by the following query:
+
+```
+SELECT library_name, license_type, license_path FROM system.licenses ORDER BY library_name COLLATE 'en'
+```
+
+[Example](https://gh-api.clickhouse.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 |
+| 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 |
diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index 5511e8e19c7..ac6d4a2b563 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -15,7 +15,7 @@ ClickHouse cannot work or build on a 32-bit system. You should acquire access to
 
 To start working with ClickHouse repository you will need a GitHub account.
 
-You probably already have one, but if you don’t, please register at https://github.com. In case you do not have SSH keys, you should generate them and then upload them on GitHub. It is required for sending over your patches. It is also possible to use the same SSH keys that you use with any other SSH servers - probably you already have those.
+You probably already have one, but if you do not, please register at https://github.com. In case you do not have SSH keys, you should generate them and then upload them on GitHub. It is required for sending over your patches. It is also possible to use the same SSH keys that you use with any other SSH servers - probably you already have those.
 
 Create a fork of ClickHouse repository. To do that please click on the “fork” button in the upper right corner at https://github.com/ClickHouse/ClickHouse. It will fork your own copy of ClickHouse/ClickHouse to your account.
 
@@ -131,17 +131,18 @@ ClickHouse uses several external libraries for building. All of them do not need
 
 ## C++ Compiler {#c-compiler}
 
-Compilers GCC starting from version 10 and Clang version 8 or above are supported for building ClickHouse.
+Compilers Clang starting from version 11 is supported for building ClickHouse.
 
-Official Yandex builds currently use GCC because it generates machine code of slightly better performance (yielding a difference of up to several percent according to our benchmarks). And Clang is more convenient for development usually. Though, our continuous integration (CI) platform runs checks for about a dozen of build combinations.
+Clang should be used instead of gcc. Though, our continuous integration (CI) platform runs checks for about a dozen of build combinations.
 
-To install GCC on Ubuntu run: `sudo apt install gcc g++`
+On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
-Check the version of gcc: `gcc --version`. If it is below 10, then follow the instruction here: https://clickhouse.tech/docs/en/development/build/#install-gcc-10.
+```bash
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+```
 
-Mac OS X build is supported only for Clang. Just run `brew install llvm`
+Mac OS X build is also supported. Just run `brew install llvm`
 
-If you decide to use Clang, you can also install `libc++` and `lld`, if you know what it is. Using `ccache` is also recommended.
 
 ## The Building Process {#the-building-process}
 
@@ -152,14 +153,7 @@ Now that you are ready to build ClickHouse we recommend you to create a separate
 
 You can have several different directories (build_release, build_debug, etc.) for different types of build.
 
-While inside the `build` directory, configure your build by running CMake. Before the first run, you need to define environment variables that specify compiler (version 10 gcc compiler in this example).
-
-Linux:
-
-    export CC=gcc-10 CXX=g++-10
-    cmake ..
-
-Mac OS X:
+While inside the `build` directory, configure your build by running CMake. Before the first run, you need to define environment variables that specify compiler.
 
     export CC=clang CXX=clang++
     cmake ..
diff --git a/docs/en/development/style.md b/docs/en/development/style.md
index 4c620c44aef..2151735c2f4 100644
--- a/docs/en/development/style.md
+++ b/docs/en/development/style.md
@@ -195,7 +195,7 @@ std::cerr << static_cast<int>(c) << std::endl;
 
 The same is true for small methods in any classes or structs.
 
-For templated classes and structs, don’t separate the method declarations from the implementation (because otherwise they must be defined in the same translation unit).
+For templated classes and structs, do not separate the method declarations from the implementation (because otherwise they must be defined in the same translation unit).
 
 **31.** You can wrap lines at 140 characters, instead of 80.
 
@@ -442,7 +442,7 @@ Use `RAII` and see above.
 
 **3.** Error handling.
 
-Use exceptions. In most cases, you only need to throw an exception, and don’t need to catch it (because of `RAII`).
+Use exceptions. In most cases, you only need to throw an exception, and do not need to catch it (because of `RAII`).
 
 In offline data processing applications, it’s often acceptable to not catch exceptions.
 
@@ -599,7 +599,7 @@ public:
 
 There is no need to use a separate `namespace` for application code.
 
-Small libraries don’t need this, either.
+Small libraries do not need this, either.
 
 For medium to large libraries, put everything in a `namespace`.
 
@@ -701,7 +701,7 @@ But other things being equal, cross-platform or portable code is preferred.
 
 **2.** Language: C++20 (see the list of available [C++20 features](https://en.cppreference.com/w/cpp/compiler_support#C.2B.2B20_features)).
 
-**3.** Compiler: `gcc`. At this time (August 2020), the code is compiled using version 9.3. (It can also be compiled using `clang 8`.)
+**3.** Compiler: `clang`. At this time (April 2021), the code is compiled using clang version 11. (It can also be compiled using `gcc` version 10, but it's untested and not suitable for production usage).
 
 The standard library is used (`libc++`).
 
@@ -711,7 +711,7 @@ The standard library is used (`libc++`).
 
 The CPU instruction set is the minimum supported set among our servers. Currently, it is SSE 4.2.
 
-**6.** Use `-Wall -Wextra -Werror` compilation flags.
+**6.** Use `-Wall -Wextra -Werror` compilation flags. Also `-Weverything` is used with few exceptions.
 
 **7.** Use static linking with all libraries except those that are difficult to connect to statically (see the output of the `ldd` command).
 
@@ -755,9 +755,9 @@ If there is a good solution already available, then use it, even if it means you
 
 (But be prepared to remove bad libraries from code.)
 
-**3.** You can install a library that isn’t in the packages, if the packages don’t have what you need or have an outdated version or the wrong type of compilation.
+**3.** You can install a library that isn’t in the packages, if the packages do not have what you need or have an outdated version or the wrong type of compilation.
 
-**4.** If the library is small and doesn’t have its own complex build system, put the source files in the `contrib` folder.
+**4.** If the library is small and does not have its own complex build system, put the source files in the `contrib` folder.
 
 **5.** Preference is always given to libraries that are already in use.
 
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index 7547497b9af..4231bda6c35 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -35,7 +35,7 @@ Tests should use (create, drop, etc) only tables in `test` database that is assu
 
 ### Choosing the Test Name
 
-The name of the test starts with a five-digit prefix followed by a descriptive name, such as `00422_hash_function_constexpr.sql`. To choose the prefix, find the largest prefix already present in the directory, and increment it by one. In the meantime, some other tests might be added with the same numeric prefix, but this is OK and doesn't lead to any problems, you don't have to change it later.
+The name of the test starts with a five-digit prefix followed by a descriptive name, such as `00422_hash_function_constexpr.sql`. To choose the prefix, find the largest prefix already present in the directory, and increment it by one. In the meantime, some other tests might be added with the same numeric prefix, but this is OK and does not lead to any problems, you don't have to change it later.
 
 Some tests are marked with `zookeeper`, `shard` or `long` in their names. `zookeeper` is for tests that are using ZooKeeper. `shard` is for tests that requires server to listen `127.0.0.*`; `distributed` or `global` have the same meaning. `long` is for tests that run slightly longer that one second. You can disable these groups of tests using `--no-zookeeper`, `--no-shard` and `--no-long` options, respectively. Make sure to add a proper prefix to your test name if it needs ZooKeeper or distributed queries.
 
@@ -51,7 +51,7 @@ Do not check for a particular wording of error message, it may change in the fut
 
 ### Testing a Distributed Query
 
-If you want to use distributed queries in functional tests, you can leverage `remote` table function with `127.0.0.{1..2}` addresses for the server to query itself; or you can use predefined test clusters in server configuration file like `test_shard_localhost`. Remember to add the words `shard` or `distributed` to the test name, so that it is ran in CI in correct configurations, where the server is configured to support distributed queries.
+If you want to use distributed queries in functional tests, you can leverage `remote` table function with `127.0.0.{1..2}` addresses for the server to query itself; or you can use predefined test clusters in server configuration file like `test_shard_localhost`. Remember to add the words `shard` or `distributed` to the test name, so that it is run in CI in correct configurations, where the server is configured to support distributed queries.
 
 
 ## Known Bugs {#known-bugs}
@@ -60,11 +60,11 @@ If we know some bugs that can be easily reproduced by functional tests, we place
 
 ## Integration Tests {#integration-tests}
 
-Integration tests allow to test ClickHouse in clustered configuration and ClickHouse interaction with other servers like MySQL, Postgres, MongoDB. They are useful to emulate network splits, packet drops, etc. These tests are run under Docker and create multiple containers with various software.
+Integration tests allow testing ClickHouse in clustered configuration and ClickHouse interaction with other servers like MySQL, Postgres, MongoDB. They are useful to emulate network splits, packet drops, etc. These tests are run under Docker and create multiple containers with various software.
 
 See `tests/integration/README.md` on how to run these tests.
 
-Note that integration of ClickHouse with third-party drivers is not tested. Also we currently don’t have integration tests with our JDBC and ODBC drivers.
+Note that integration of ClickHouse with third-party drivers is not tested. Also, we currently do not have integration tests with our JDBC and ODBC drivers.
 
 ## Unit Tests {#unit-tests}
 
@@ -123,7 +123,7 @@ Example with gdb:
 $ sudo -u clickhouse gdb --args /usr/bin/clickhouse server --config-file /etc/clickhouse-server/config.xml
 ```
 
-If the system clickhouse-server is already running and you don’t want to stop it, you can change port numbers in your `config.xml` (or override them in a file in `config.d` directory), provide appropriate data path, and run it.
+If the system clickhouse-server is already running and you do not want to stop it, you can change port numbers in your `config.xml` (or override them in a file in `config.d` directory), provide appropriate data path, and run it.
 
 `clickhouse` binary has almost no dependencies and works across wide range of Linux distributions. To quick and dirty test your changes on a server, you can simply `scp` your fresh built `clickhouse` binary to your server and then run it as in examples above.
 
@@ -161,7 +161,7 @@ $ clickhouse benchmark --concurrency 16 < queries.tsv
 
 Then leave it for a night or weekend and go take a rest.
 
-You should check that `clickhouse-server` doesn’t crash, memory footprint is bounded and performance not degrading over time.
+You should check that `clickhouse-server` does not crash, memory footprint is bounded and performance not degrading over time.
 
 Precise query execution timings are not recorded and not compared due to high variability of queries and environment.
 
@@ -230,7 +230,7 @@ Fuzzers are not built by default. To build fuzzers both `-DENABLE_FUZZING=1` and
 We recommend to disable Jemalloc while building fuzzers. Configuration used to integrate ClickHouse fuzzing to
 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 doesn’t die executing them.
+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/).
@@ -332,7 +332,7 @@ We run tests with Yandex internal CI and job automation system named “Sandbox
 
 Build jobs and tests are run in Sandbox on per commit basis. Resulting packages and test results are published in GitHub and can be downloaded by direct links. Artifacts are stored for several months. When you send a pull request on GitHub, we tag it as “can be tested” and our CI system will build ClickHouse packages (release, debug, with address sanitizer, etc) for you.
 
-We don’t use Travis CI due to the limit on time and computational power.
-We don’t use Jenkins. It was used before and now we are happy we are not using Jenkins.
+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-->
diff --git a/docs/en/engines/database-engines/atomic.md b/docs/en/engines/database-engines/atomic.md
index d8ad18daec2..4f5f69a5ab7 100644
--- a/docs/en/engines/database-engines/atomic.md
+++ b/docs/en/engines/database-engines/atomic.md
@@ -3,15 +3,52 @@ toc_priority: 32
 toc_title: Atomic
 ---
 
-
 # Atomic {#atomic}
 
-It supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHANGE TABLES t1 AND t2` 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 t1 AND t2](#exchange-tables) queries. `Atomic` database engine is used by default.
 
 ## Creating a Database {#creating-a-database}
 
-```sql
-CREATE DATABASE test ENGINE = Atomic;
+``` sql
+    CREATE DATABASE test[ ENGINE = Atomic];
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/database-engines/atomic/) <!--hide-->
+## Specifics and recommendations {#specifics-and-recommendations}
+
+### Table UUID {#table-uuid}
+
+All tables in database `Atomic` have persistent [UUID](../../sql-reference/data-types/uuid.md) and store data in directory `/clickhouse_path/store/xxx/xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy/`, where `xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy` is UUID of the table. 
+Usually, the UUID is generated automatically, but the user can also explicitly specify the UUID in the same way when creating the table (this is not recommended). To display the `SHOW CREATE` query with the UUID you can use setting [show_table_uuid_in_table_create_query_if_not_nil](../../operations/settings/settings.md#show_table_uuid_in_table_create_query_if_not_nil). For example:
+
+```sql
+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.
+
+### 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.
+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` query swaps tables atomically. So instead of this non-atomic operation:
+
+```sql
+RENAME TABLE new_table TO tmp, old_table TO new_table, tmp TO old_table;
+```
+you can use one atomic query:
+
+``` sql
+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.
+
+## See Also
+
+-   [system.databases](../../operations/system-tables/databases.md) system table
diff --git a/docs/en/engines/table-engines/index.md b/docs/en/engines/table-engines/index.md
index eb4fc583f88..13b3395e15b 100644
--- a/docs/en/engines/table-engines/index.md
+++ b/docs/en/engines/table-engines/index.md
@@ -82,8 +82,8 @@ Virtual column is an integral table engine attribute that is defined in the engi
 
 You shouldn’t specify virtual columns in the `CREATE TABLE` query and you can’t see them in `SHOW CREATE TABLE` and `DESCRIBE TABLE` query results. Virtual columns are also read-only, so you can’t insert data into virtual columns.
 
-To select data from a virtual column, you must specify its name in the `SELECT` query. `SELECT *` doesn’t return values from virtual columns.
+To select data from a virtual column, you must specify its name in the `SELECT` query. `SELECT *` does not return values from virtual columns.
 
-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 don’t recommend doing this. To help avoid conflicts, virtual column names are usually prefixed with an underscore.
+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-->
diff --git a/docs/en/engines/table-engines/integrations/kafka.md b/docs/en/engines/table-engines/integrations/kafka.md
index 2eebf5bdb92..a3a13f9d152 100644
--- a/docs/en/engines/table-engines/integrations/kafka.md
+++ b/docs/en/engines/table-engines/integrations/kafka.md
@@ -40,7 +40,7 @@ Required parameters:
 
 -   `kafka_broker_list` — A comma-separated list of brokers (for example, `localhost:9092`).
 -   `kafka_topic_list` — A list of Kafka topics.
--   `kafka_group_name` — A group of Kafka consumers. Reading margins are tracked for each group separately. If you don’t want messages to be duplicated in the cluster, use the same group name everywhere.
+-   `kafka_group_name` — A group of Kafka consumers. Reading margins are tracked for each group separately. If you do not want messages to be duplicated in the cluster, use the same group name everywhere.
 -   `kafka_format` — Message format. Uses the same notation as the SQL `FORMAT` function, such as `JSONEachRow`. For more information, see the [Formats](../../../interfaces/formats.md) section.
 
 Optional parameters:
diff --git a/docs/en/engines/table-engines/integrations/mysql.md b/docs/en/engines/table-engines/integrations/mysql.md
index 3847e7a9e0e..9bd12e97dd8 100644
--- a/docs/en/engines/table-engines/integrations/mysql.md
+++ b/docs/en/engines/table-engines/integrations/mysql.md
@@ -15,7 +15,12 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     name1 [type1] [DEFAULT|MATERIALIZED|ALIAS expr1] [TTL expr1],
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
     ...
-) ENGINE = MySQL('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause']);
+) ENGINE = MySQL('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause'])
+SETTINGS
+    [connection_pool_size=16, ]
+    [connection_max_tries=3, ]
+    [connection_auto_close=true ]
+;
 ```
 
 See a detailed description of the [CREATE TABLE](../../../sql-reference/statements/create/table.md#create-table-query) query.
diff --git a/docs/en/engines/table-engines/integrations/postgresql.md b/docs/en/engines/table-engines/integrations/postgresql.md
index ad5bebb3dea..4474b764d2e 100644
--- a/docs/en/engines/table-engines/integrations/postgresql.md
+++ b/docs/en/engines/table-engines/integrations/postgresql.md
@@ -94,10 +94,10 @@ postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
 INSERT 0 1
 
 postgresql> SELECT * FROM test;
- int_id | int_nullable | float | str  | float_nullable
---------+--------------+-------+------+----------------
-      1 |              |     2 | test |
-(1 row)
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
+ (1 row)
 ```
 
 Table in ClickHouse, retrieving data from the PostgreSQL table created above:
diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index 3d02aa13812..a27308b9b3f 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -11,34 +11,34 @@ This engine provides integration with [Amazon S3](https://aws.amazon.com/s3/) ec
 
 ``` sql
 CREATE TABLE s3_engine_table (name String, value UInt32) 
-ENGINE = S3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compression])
+ENGINE = S3(path, [aws_access_key_id, aws_secret_access_key,] format, [compression])
 ```
 
 **Engine parameters**
 
 -   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [below](#wildcards-in-path).
 -   `format` — The [format](../../../interfaces/formats.md#formats) of the file.
--   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
--   `compression` — Compression type. Supported values: none, gzip/gz, brotli/br, xz/LZMA, zstd/zst. Parameter is optional. By default, it will autodetect compression by file extension.
+-   `aws_access_key_id`, `aws_secret_access_key` - Long-term credentials for the [AWS](https://aws.amazon.com/) account user.  You can use these to authenticate your requests. Parameter is optional. If credentials are not specified, they are used from the configuration file. For more information see [Using S3 for Data Storage](../mergetree-family/mergetree.md#table_engine-mergetree-s3).
+-   `compression` — Compression type. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Parameter is optional. By default, it will autodetect compression by file extension.
 
-**Example:**
+**Example**
 
-**1.** Set up the `s3_engine_table` table:
+1. Set up the `s3_engine_table` table:
 
-```sql
-CREATE TABLE s3_engine_table (name String, value UInt32) ENGINE=S3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip')
+``` sql
+CREATE TABLE s3_engine_table (name String, value UInt32) ENGINE=S3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'gzip');
 ```
 
-**2.** Fill file:
+2. Fill file:
 
-```sql
-INSERT INTO s3_engine_table VALUES ('one', 1), ('two', 2), ('three', 3)
+``` sql
+INSERT INTO s3_engine_table VALUES ('one', 1), ('two', 2), ('three', 3);
 ```
 
-**3.** Query the data:
+3. Query the data:
 
-```sql
-SELECT * FROM s3_engine_table LIMIT 2
+``` sql
+SELECT * FROM s3_engine_table LIMIT 2;
 ```
 
 ```text
@@ -73,13 +73,63 @@ For more information about virtual columns see [here](../../../engines/table-eng
 
 Constructions with `{}` are similar to the [remote](../../../sql-reference/table-functions/remote.md) table function.
 
-## S3-related Settings {#s3-settings}
+**Example**
+
+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’
+
+There are several ways to make a table consisting of all six files:
+
+The first way:
+
+``` sql
+CREATE TABLE table_with_range (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}', 'CSV');
+```
+
+Another way:
+
+``` sql
+CREATE TABLE table_with_question_mark (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_?', 'CSV');
+```
+
+Table consists of all the files in both directories (all files should satisfy format and schema described in query):
+
+``` sql
+CREATE TABLE table_with_asterisk (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/*', 'CSV');
+```
+
+If the listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
+
+**Example**
+
+Create table with files named `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
+
+``` sql
+CREATE TABLE big_table (name String, value UInt32) ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV');
+```
+
+## Virtual Columns {#virtual-columns}
+
+-   `_path` — Path to the file.
+-   `_file` — Name of the file.
+
+**See Also**
+
+-   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+
+## S3-related settings {#settings}
 
 The following settings can be set before query execution or placed into configuration file.
 
--   `s3_max_single_part_upload_size` — The maximum size of object to upload using singlepart upload to S3. Default value is `64Mb`. 
+-   `s3_max_single_part_upload_size` — The maximum size of object to upload using singlepart upload to S3. Default value is `64Mb`.
 -   `s3_min_upload_part_size` — The minimum size of part to upload during multipart upload to [S3 Multipart upload](https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html). Default value is `512Mb`.
--   `s3_max_redirects` — Max number of S3 redirects hops allowed. Default value is `10`. 
+-   `s3_max_redirects` — Max number of S3 redirects hops allowed. Default value is `10`.
 
 Security consideration: if malicious user can specify arbitrary S3 URLs, `s3_max_redirects` must be set to zero to avoid [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery) attacks; or alternatively, `remote_host_filter` must be specified in server configuration.
 
@@ -89,7 +139,9 @@ The following settings can be specified in configuration file for given endpoint
 
 -   `endpoint` — Specifies prefix of an endpoint. Mandatory.
 -   `access_key_id` and `secret_access_key` — Specifies credentials to use with given endpoint. Optional.
--   `use_environment_credentials` — If set to `true`, S3 client will try to obtain credentials from environment variables and Amazon EC2 metadata for given endpoint. Optional, default value is `false`.
+-   `use_environment_credentials` — If set to `true`, S3 client will try to obtain credentials from environment variables and [Amazon EC2](https://en.wikipedia.org/wiki/Amazon_Elastic_Compute_Cloud) metadata for given endpoint. Optional, default value is `false`.
+-   `region` — Specifies S3 region name. Optional.
+-   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Optional, default value is `false`.
 -   `header` —  Adds specified HTTP header to a request to given endpoint. Optional, can be speficied multiple times.
 -   `server_side_encryption_customer_key_base64` — If specified, required headers for accessing S3 objects with SSE-C encryption will be set. Optional.
 
@@ -101,12 +153,15 @@ The following settings can be specified in configuration file for given endpoint
         <endpoint>https://storage.yandexcloud.net/my-test-bucket-768/</endpoint>
         <!-- <access_key_id>ACCESS_KEY_ID</access_key_id> -->
         <!-- <secret_access_key>SECRET_ACCESS_KEY</secret_access_key> -->
+        <!-- <region>us-west-1</region> -->
         <!-- <use_environment_credentials>false</use_environment_credentials> -->
+        <!-- <use_insecure_imds_request>false</use_insecure_imds_request> -->
         <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
         <!-- <server_side_encryption_customer_key_base64>BASE64-ENCODED-KEY</server_side_encryption_customer_key_base64> -->
     </endpoint-name>
 </s3>
 ```
+
 ## Usage {#usage-examples}
 
 Suppose we have several files in TSV format with the following URIs on HDFS:
@@ -149,8 +204,7 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_p
 CREATE TABLE big_table (name String, value UInt32) 
 ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV');
 ```
+
 ## See also
 
 -  [S3 table function](../../../sql-reference/table-functions/s3.md)
-
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/s3/) <!--hide-->
diff --git a/docs/en/engines/table-engines/log-family/index.md b/docs/en/engines/table-engines/log-family/index.md
index 1f6d88c20e3..8cdde239f44 100644
--- a/docs/en/engines/table-engines/log-family/index.md
+++ b/docs/en/engines/table-engines/log-family/index.md
@@ -38,7 +38,7 @@ Engines:
 
 ## Differences {#differences}
 
-The `TinyLog` engine is the simplest in the family and provides the poorest functionality and lowest efficiency. The `TinyLog` engine doesn’t support parallel data reading by several threads in a single query. It reads data slower than other engines in the family that support parallel reading from a single query and it uses almost as many file descriptors as the `Log` engine because it stores each column in a separate file. Use it only in simple scenarios.
+The `TinyLog` engine is the simplest in the family and provides the poorest functionality and lowest efficiency. The `TinyLog` engine does not support parallel data reading by several threads in a single query. It reads data slower than other engines in the family that support parallel reading from a single query and it uses almost as many file descriptors as the `Log` engine because it stores each column in a separate file. Use it only in simple scenarios.
 
 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.
 
diff --git a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 1a997b6b237..818830646cb 100644
--- a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -3,7 +3,7 @@ toc_priority: 35
 toc_title: AggregatingMergeTree
 ---
 
-# Aggregatingmergetree {#aggregatingmergetree}
+# AggregatingMergeTree {#aggregatingmergetree}
 
 The engine inherits from [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engines-mergetree), altering the logic for data parts merging. ClickHouse replaces all rows with the same primary key (or more accurately, with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md)) with a single row (within a one data part) that stores a combination of states of aggregate functions.
 
diff --git a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
index ea0b265d652..4ec976eda30 100644
--- a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -126,7 +126,7 @@ Also when there are at least 2 more “state” rows than “cancel” rows, or
 Thus, collapsing should not change the results of calculating statistics.
 Changes gradually collapsed so that in the end only the last state of almost every object left.
 
-The `Sign` is required because the merging algorithm doesn’t guarantee that all of the rows with the same sorting key will be in the same resulting data part and even on the same physical server. ClickHouse process `SELECT` queries with multiple threads, and it can not predict the order of rows in the result. The aggregation is required if there is a need to get completely “collapsed” data from `CollapsingMergeTree` table.
+The `Sign` is required because the merging algorithm does not guarantee that all of the rows with the same sorting key will be in the same resulting data part and even on the same physical server. ClickHouse process `SELECT` queries with multiple threads, and it can not predict the order of rows in the result. The aggregation is required if there is a need to get completely “collapsed” data from `CollapsingMergeTree` table.
 
 To finalize collapsing, write a query with `GROUP BY` clause and aggregate functions that account for the sign. For example, to calculate quantity, use `sum(Sign)` instead of `count()`. To calculate the sum of something, use `sum(Sign * x)` instead of `sum(x)`, and so on, and also add `HAVING sum(Sign) > 0`.
 
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 855d5fdadf4..535922875ef 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
@@ -33,6 +33,8 @@ ORDER BY (CounterID, StartDate, intHash32(UserID));
 
 In this example, we set partitioning by the event types that occurred during the current week.
 
+By default, the floating-point partition key is not supported. To use it enable the setting [allow_floating_point_partition_key](../../../operations/settings/merge-tree-settings.md#allow_floating_point_partition_key).
+
 When inserting new data to a table, this data is stored as a separate part (chunk) sorted by the primary key. In 10-15 minutes after inserting, the parts of the same partition are merged into the entire part.
 
 !!! info "Info"
diff --git a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
index 14df9ae130e..3ead798503d 100644
--- a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -7,7 +7,7 @@ toc_title: GraphiteMergeTree
 
 This engine is designed for thinning and aggregating/averaging (rollup) [Graphite](http://graphite.readthedocs.io/en/latest/index.html) data. It may be helpful to developers who want to use ClickHouse as a data store for Graphite.
 
-You can use any ClickHouse table engine to store the Graphite data if you don’t need rollup, but if you need a rollup use `GraphiteMergeTree`. The engine reduces the volume of storage and increases the efficiency of queries from Graphite.
+You can use any ClickHouse table engine to store the Graphite data if you do not need rollup, but if you need a rollup use `GraphiteMergeTree`. The engine reduces the volume of storage and increases the efficiency of queries from Graphite.
 
 The engine inherits properties from [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md).
 
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index a24b7229d17..e385b234cd8 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -17,7 +17,7 @@ Main features:
 
 -   Partitions can be used if the [partitioning key](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md) is specified.
 
-    ClickHouse supports certain operations with partitions that are more effective than general operations on the same data with the same result. ClickHouse also automatically cuts off the partition data where the partitioning key is specified in the query. This also improves query performance.
+    ClickHouse supports certain operations with partitions that are more effective than general operations on the same data with the same result. ClickHouse also automatically cuts off the partition data where the partitioning key is specified in the query.
 
 -   Data replication support.
 
@@ -64,7 +64,7 @@ For a description of parameters, see the [CREATE query description](../../../sql
 
     ClickHouse uses the sorting key as a primary key if the primary key is not defined obviously by the `PRIMARY KEY` clause.
 
-    Use the `ORDER BY tuple()` syntax, if you don’t need sorting. See [Selecting the Primary Key](#selecting-the-primary-key).
+    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.
 
@@ -162,7 +162,7 @@ Data parts can be stored in `Wide` or `Compact` format. In `Wide` format each co
 
 Data storing format is controlled by the `min_bytes_for_wide_part` and `min_rows_for_wide_part` settings of the table engine. If the number of bytes or rows in a data part is less then the corresponding setting's value, the part is stored in `Compact` format. Otherwise it is stored in `Wide` format. If none of these settings is set, data parts are stored in `Wide` format.
 
-Each data part is logically divided into granules. A granule is the smallest indivisible data set that ClickHouse reads when selecting data. ClickHouse doesn’t split rows or values, so each granule always contains an integer number of rows. The first row of a granule is marked with the value of the primary key for the row. For each data part, ClickHouse creates an index file that stores the marks. For each column, whether it’s in the primary key or not, ClickHouse also stores the same marks. These marks let you find data directly in column files.
+Each data part is logically divided into granules. A granule is the smallest indivisible data set that ClickHouse reads when selecting data. ClickHouse does not split rows or values, so each granule always contains an integer number of rows. The first row of a granule is marked with the value of the primary key for the row. For each data part, ClickHouse creates an index file that stores the marks. For each column, whether it’s in the primary key or not, ClickHouse also stores the same marks. These marks let you find data directly in column files.
 
 The granule size is restricted by the `index_granularity` and `index_granularity_bytes` settings of the table engine. The number of rows in a granule lays in the `[1, index_granularity]` range, depending on the size of the rows. The size of a granule can exceed `index_granularity_bytes` if the size of a single row is greater than the value of the setting. In this case, the size of the granule equals the size of the row.
 
@@ -191,9 +191,7 @@ Sparse indexes allow you to work with a very large number of table rows, because
 
 ClickHouse does not require a unique primary key. You can insert multiple rows with the same primary key.
 
-You can use `Nullable`-typed expressions in the `PRIMARY KEY` and `ORDER BY` clauses. To allow this feature, turn on the [allow_nullable_key](../../../operations/settings/settings.md#allow-nullable-key) setting.
-
-The [NULLS_LAST](../../../sql-reference/statements/select/order-by.md#sorting-of-special-values) principle applies for `NULL` values in the `ORDER BY` clause.
+You can use `Nullable`-typed expressions in the `PRIMARY KEY` and `ORDER BY` clauses but it is strongly discouraged. To allow this feature, turn on the [allow_nullable_key](../../../operations/settings/settings.md#allow-nullable-key) setting. The [NULLS_LAST](../../../sql-reference/statements/select/order-by.md#sorting-of-special-values) principle applies for `NULL` values in the `ORDER BY` clause.
 
 ### Selecting the Primary Key {#selecting-the-primary-key}
 
@@ -229,7 +227,7 @@ This feature is helpful when using the [SummingMergeTree](../../../engines/table
 
 In this case it makes sense to leave only a few columns in the primary key that will provide efficient range scans and add the remaining dimension columns to the sorting key tuple.
 
-[ALTER](../../../sql-reference/statements/alter/index.md) of the sorting key is a lightweight operation because when a new column is simultaneously added to the table and to the sorting key, existing data parts don’t need to be changed. Since the old sorting key is a prefix of the new sorting key and there is no data in the newly added column, the data is sorted by both the old and new sorting keys at the moment of table modification.
+[ALTER](../../../sql-reference/statements/alter/index.md) of the sorting key is a lightweight operation because when a new column is simultaneously added to the table and to the sorting key, existing data parts do not need to be changed. Since the old sorting key is a prefix of the new sorting key and there is no data in the newly added column, the data is sorted by both the old and new sorting keys at the moment of table modification.
 
 ### Use of Indexes and Partitions in Queries {#use-of-indexes-and-partitions-in-queries}
 
@@ -267,7 +265,7 @@ The key for partitioning by month allows reading only those data blocks which co
 
 Consider, for example, the days of the month. They form a [monotonic sequence](https://en.wikipedia.org/wiki/Monotonic_function) for one month, but not monotonic for more extended periods. This is a partially-monotonic sequence. If a user creates the table with partially-monotonic primary key, ClickHouse creates a sparse index as usual. When a user selects data from this kind of table, ClickHouse analyzes the query conditions. If the user wants to get data between two marks of the index and both these marks fall within one month, ClickHouse can use the index in this particular case because it can calculate the distance between the parameters of a query and index marks.
 
-ClickHouse cannot use an index if the values of the primary key in the query parameter range don’t represent a monotonic sequence. In this case, ClickHouse uses the full scan method.
+ClickHouse cannot use an index if the values of the primary key in the query parameter range do not represent a monotonic sequence. In this case, ClickHouse uses the full scan method.
 
 ClickHouse uses this logic not only for days of the month sequences, but for any primary key that represents a partially-monotonic sequence.
 
@@ -741,6 +739,7 @@ Configuration markup:
             <endpoint>https://storage.yandexcloud.net/my-bucket/root-path/</endpoint>
             <access_key_id>your_access_key_id</access_key_id>
             <secret_access_key>your_secret_access_key</secret_access_key>
+            <region></region>
             <server_side_encryption_customer_key_base64>your_base64_encoded_customer_key</server_side_encryption_customer_key_base64>
             <proxy>
                 <uri>http://proxy1</uri>
@@ -766,7 +765,9 @@ Required parameters:
 -   `secret_access_key` — S3 secret access key.
 
 Optional parameters:    
+-   `region` — S3 region name.
 -   `use_environment_credentials` — Reads AWS credentials from the Environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY and AWS_SESSION_TOKEN if they exist. Default value is `false`.
+-   `use_insecure_imds_request` — If set to `true`, S3 client will use insecure IMDS request while obtaining credentials from Amazon EC2 metadata. Default value is `false`.
 -   `proxy` — Proxy configuration for S3 endpoint. Each `uri` element inside `proxy` block should contain a proxy URL. 
 -   `connect_timeout_ms` — Socket connect timeout in milliseconds. Default value is `10 seconds`. 
 -   `request_timeout_ms` — Request timeout in milliseconds. Default value is `5 seconds`. 
diff --git a/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
index b82bc65afc2..ca0db24e640 100644
--- a/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -7,9 +7,9 @@ toc_title: ReplacingMergeTree
 
 The engine differs from [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engines-mergetree) in that it removes duplicate entries with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md) value (`ORDER BY` table section, not `PRIMARY KEY`).
 
-Data deduplication occurs only during a merge. Merging occurs in the background at an unknown time, so you can’t plan for it. Some of the data may remain unprocessed. Although you can run an unscheduled merge using the `OPTIMIZE` query, don’t count on using it, because the `OPTIMIZE` query will read and write a large amount of data.
+Data deduplication occurs only during a merge. Merging occurs in the background at an unknown time, so you can’t plan for it. Some of the data may remain unprocessed. Although you can run an unscheduled merge using the `OPTIMIZE` query, do not count on using it, because the `OPTIMIZE` query will read and write a large amount of data.
 
-Thus, `ReplacingMergeTree` is suitable for clearing out duplicate data in the background in order to save space, but it doesn’t guarantee the absence of duplicates.
+Thus, `ReplacingMergeTree` is suitable for clearing out duplicate data in the background in order to save space, but it does not guarantee the absence of duplicates.
 
 ## Creating a Table {#creating-a-table}
 
@@ -34,7 +34,7 @@ For a description of request parameters, see [statement description](../../../sq
 
 **ReplacingMergeTree Parameters**
 
--   `ver` — column with version. Type `UInt*`, `Date` or `DateTime`. Optional parameter.
+-   `ver` — column with the version number. Type `UInt*`, `Date`, `DateTime` or `DateTime64`. Optional parameter.
 
     When merging, `ReplacingMergeTree` from all the rows with the same sorting key leaves only one:
 
@@ -66,5 +66,3 @@ All of the parameters excepting `ver` have the same meaning as in `MergeTree`.
 -   `ver` - column with the version. Optional parameter. For a description, see the text above.
 
 </details>
-
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/replication.md b/docs/en/engines/table-engines/mergetree-family/replication.md
index ef34c8d3804..2db6686beb7 100644
--- a/docs/en/engines/table-engines/mergetree-family/replication.md
+++ b/docs/en/engines/table-engines/mergetree-family/replication.md
@@ -95,17 +95,19 @@ If ZooKeeper isn’t set in the config file, you can’t create replicated table
 
 ZooKeeper is not used in `SELECT` queries because replication does not affect the performance of `SELECT` and queries run just as fast as they do for non-replicated tables. When querying distributed replicated tables, ClickHouse behavior is controlled by the settings [max_replica_delay_for_distributed_queries](../../../operations/settings/settings.md#settings-max_replica_delay_for_distributed_queries) and [fallback_to_stale_replicas_for_distributed_queries](../../../operations/settings/settings.md#settings-fallback_to_stale_replicas_for_distributed_queries).
 
-For each `INSERT` query, approximately ten entries are added to ZooKeeper through several transactions. (To be more precise, this is for each inserted block of data; an INSERT query contains one block or one block per `max_insert_block_size = 1048576` rows.) This leads to slightly longer latencies for `INSERT` compared to non-replicated tables. But if you follow the recommendations to insert data in batches of no more than one `INSERT` per second, it doesn’t create any problems. The entire ClickHouse cluster used for coordinating one ZooKeeper cluster has a total of several hundred `INSERTs` per second. The throughput on data inserts (the number of rows per second) is just as high as for non-replicated data.
+For each `INSERT` query, approximately ten entries are added to ZooKeeper through several transactions. (To be more precise, this is for each inserted block of data; an INSERT query contains one block or one block per `max_insert_block_size = 1048576` rows.) This leads to slightly longer latencies for `INSERT` compared to non-replicated tables. But if you follow the recommendations to insert data in batches of no more than one `INSERT` per second, it does not create any problems. The entire ClickHouse cluster used for coordinating one ZooKeeper cluster has a total of several hundred `INSERTs` per second. The throughput on data inserts (the number of rows per second) is just as high as for non-replicated data.
 
 For very large clusters, you can use different ZooKeeper clusters for different shards. However, this hasn’t proven necessary on the Yandex.Metrica cluster (approximately 300 servers).
 
 Replication is asynchronous and multi-master. `INSERT` queries (as well as `ALTER`) can be sent to any available server. Data is inserted on the server where the query is run, and then it is copied to the other servers. Because it is asynchronous, recently inserted data appears on the other replicas with some latency. If part of the replicas are not available, the data is written when they become available. If a replica is available, the latency is the amount of time it takes to transfer the block of compressed data over the network. The number of threads performing background tasks for replicated tables can be set by [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size) setting.
 
+`ReplicatedMergeTree` engine uses a separate thread pool for replicated fetches. Size of the pool is limited by the [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size) setting which can be tuned with a server restart. 
+
 By default, an INSERT query waits for confirmation of writing the data from only one replica. If the data was successfully written to only one replica and the server with this replica ceases to exist, the stored data will be lost. To enable getting confirmation of data writes from multiple replicas, use the `insert_quorum` option.
 
 Each block of data is written atomically. The INSERT query is divided into blocks up to `max_insert_block_size = 1048576` rows. In other words, if the `INSERT` query has less than 1048576 rows, it is made atomically.
 
-Data blocks are deduplicated. For multiple writes of the same data block (data blocks of the same size containing the same rows in the same order), the block is only written once. The reason for this is in case of network failures when the client application doesn’t know if the data was written to the DB, so the `INSERT` query can simply be repeated. It doesn’t matter which replica INSERTs were sent to with identical data. `INSERTs` are idempotent. Deduplication parameters are controlled by [merge_tree](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-merge_tree) server settings.
+Data blocks are deduplicated. For multiple writes of the same data block (data blocks of the same size containing the same rows in the same order), the block is only written once. The reason for this is in case of network failures when the client application does not know if the data was written to the DB, so the `INSERT` query can simply be repeated. It does not matter which replica INSERTs were sent to with identical data. `INSERTs` are idempotent. Deduplication parameters are controlled by [merge_tree](../../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-merge_tree) server settings.
 
 During replication, only the source data to insert is transferred over the network. Further data transformation (merging) is coordinated and performed on all the replicas in the same way. This minimizes network usage, which means that replication works well when replicas reside in different datacenters. (Note that duplicating data in different datacenters is the main goal of replication.)
 
@@ -172,7 +174,7 @@ In this case, the path consists of the following parts:
 
 `{layer}-{shard}` is the shard identifier. In this example it consists of two parts, since the Yandex.Metrica cluster uses bi-level sharding. For most tasks, you can leave just the {shard} substitution, which will be expanded to the shard identifier.
 
-`table_name` is the name of the node for the table in ZooKeeper. It is a good idea to make it the same as the table name. It is defined explicitly, because in contrast to the table name, it doesn’t change after a RENAME query.
+`table_name` is the name of the node for the table in ZooKeeper. It is a good idea to make it the same as the table name. It is defined explicitly, because in contrast to the table name, it does not change after a RENAME query.
 *HINT*: you could add a database name in front of `table_name` as well. E.g. `db_name.table_name`
 
 The two built-in substitutions `{database}` and `{table}` can be used, they expand into the table name and the database name respectively (unless these macros are defined in the `macros` section). So the zookeeper path can be specified as `'/clickhouse/tables/{layer}-{shard}/{database}/{table}'`.
@@ -284,6 +286,7 @@ If the data in ZooKeeper was lost or damaged, you can save data by moving it to
 **See Also**
 
 -   [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)
 
 [Original article](https://clickhouse.tech/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 1f23e4daf51..9bfd1816d32 100644
--- a/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
@@ -7,7 +7,7 @@ toc_title: SummingMergeTree
 
 The engine inherits from [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engines-mergetree). The difference is that when merging data parts for `SummingMergeTree` tables ClickHouse replaces all the rows with the same primary key (or more accurately, with the same [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md)) with one row which contains summarized values for the columns with the numeric data type. If the sorting key is composed in a way that a single key value corresponds to large number of rows, this significantly reduces storage volume and speeds up data selection.
 
-We recommend to use the engine together with `MergeTree`. Store complete data in `MergeTree` table, and use `SummingMergeTree` for aggregated data storing, for example, when preparing reports. Such an approach will prevent you from losing valuable data due to an incorrectly composed primary key.
+We recommend using the engine together with `MergeTree`. Store complete data in `MergeTree` table, and use `SummingMergeTree` for aggregated data storing, for example, when preparing reports. Such an approach will prevent you from losing valuable data due to an incorrectly composed primary key.
 
 ## Creating a Table {#creating-a-table}
 
diff --git a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index b23139b402b..93c35344e24 100644
--- a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -133,7 +133,7 @@ When ClickHouse inserts data, it orders rows by the primary key. If the `Version
 
 ## Selecting Data {#selecting-data}
 
-ClickHouse doesn’t guarantee that all of the rows with the same primary key will be in the same resulting data part or even on the same physical server. This is true both for writing the data and for subsequent merging of the data parts. In addition, ClickHouse processes `SELECT` queries with multiple threads, and it cannot predict the order of rows in the result. This means that aggregation is required if there is a need to get completely “collapsed” data from a `VersionedCollapsingMergeTree` table.
+ClickHouse does not guarantee that all of the rows with the same primary key will be in the same resulting data part or even on the same physical server. This is true both for writing the data and for subsequent merging of the data parts. In addition, ClickHouse processes `SELECT` queries with multiple threads, and it cannot predict the order of rows in the result. This means that aggregation is required if there is a need to get completely “collapsed” data from a `VersionedCollapsingMergeTree` table.
 
 To finalize collapsing, write a query with a `GROUP BY` clause and aggregate functions that account for the sign. For example, to calculate quantity, use `sum(Sign)` instead of `count()`. To calculate the sum of something, use `sum(Sign * x)` instead of `sum(x)`, and add `HAVING sum(Sign) > 0`.
 
@@ -219,7 +219,7 @@ HAVING sum(Sign) > 0
 └─────────────────────┴───────────┴──────────┴─────────┘
 ```
 
-If we don’t need aggregation and want to force collapsing, we can use the `FINAL` modifier for the `FROM` clause.
+If we do not need aggregation and want to force collapsing, we can use the `FINAL` modifier for the `FROM` clause.
 
 ``` sql
 SELECT * FROM UAct FINAL
diff --git a/docs/en/engines/table-engines/special/buffer.md b/docs/en/engines/table-engines/special/buffer.md
index bf6c08f8f6c..cacb310a15c 100644
--- a/docs/en/engines/table-engines/special/buffer.md
+++ b/docs/en/engines/table-engines/special/buffer.md
@@ -18,11 +18,17 @@ Engine parameters:
 -   `num_layers` – Parallelism layer. Physically, the table will be represented as `num_layers` of independent buffers. Recommended value: 16.
 -   `min_time`, `max_time`, `min_rows`, `max_rows`, `min_bytes`, and `max_bytes` – Conditions for flushing data from the buffer.
 
+Optional engine parameters:
+
+-   `flush_time`, `flush_rows`, `flush_bytes` – Conditions for flushing data from the buffer, that will happen only in background (omitted or zero means no `flush*` parameters).
+
 Data is flushed from the buffer and written to the destination table if all the `min*` conditions or at least one `max*` condition are met.
 
--   `min_time`, `max_time` – Condition for the time in seconds from the moment of the first write to the buffer.
--   `min_rows`, `max_rows` – Condition for the number of rows in the buffer.
--   `min_bytes`, `max_bytes` – Condition for the number of bytes in the buffer.
+Also, if at least one `flush*` condition are met flush initiated in background, this is different from `max*`, since `flush*` allows you to configure background flushes separately to avoid adding latency for `INSERT` (into `Buffer`) queries.
+
+-   `min_time`, `max_time`, `flush_time` – Condition for the time in seconds from the moment of the first write to the buffer.
+-   `min_rows`, `max_rows`, `flush_rows` – Condition for the number of rows in the buffer.
+-   `min_bytes`, `max_bytes`, `flush_bytes` – Condition for the number of bytes in the buffer.
 
 During the write operation, data is inserted to a `num_layers` number of random buffers. Or, if the data part to insert is large enough (greater than `max_rows` or `max_bytes`), it is written directly to the destination table, omitting the buffer.
 
@@ -43,12 +49,12 @@ You can set empty strings in single quotation marks for the database and table n
 When reading from a Buffer table, data is processed both from the buffer and from the destination table (if there is one).
 Note that the Buffer tables does not support an index. In other words, data in the buffer is fully scanned, which might be slow for large buffers. (For data in a subordinate table, the index that it supports will be used.)
 
-If the set of columns in the Buffer table doesn’t match the set of columns in a subordinate table, a subset of columns that exist in both tables is inserted.
+If the set of columns in the Buffer table does not match the set of columns in a subordinate table, a subset of columns that exist in both tables is inserted.
 
-If the types don’t match for one of the columns in the Buffer table and a subordinate table, an error message is entered in the server log and the buffer is cleared.
-The same thing happens if the subordinate table doesn’t exist when the buffer is flushed.
+If the types do not match for one of the columns in the Buffer table and a subordinate table, an error message is entered in the server log, and the buffer is cleared.
+The same thing happens if the subordinate table does not exist when the buffer is flushed.
 
-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.
+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.
 
 If the server is restarted abnormally, the data in the buffer is lost.
 
@@ -64,6 +70,6 @@ Due to these disadvantages, we can only recommend using a Buffer table in rare c
 
 A Buffer table is used when too many INSERTs are received from a large number of servers over a unit of time and data can’t be buffered before insertion, which means the INSERTs can’t run fast enough.
 
-Note that it doesn’t 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”).
+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-->
diff --git a/docs/en/engines/table-engines/special/dictionary.md b/docs/en/engines/table-engines/special/dictionary.md
index a6d6f296673..d76adebe01e 100644
--- a/docs/en/engines/table-engines/special/dictionary.md
+++ b/docs/en/engines/table-engines/special/dictionary.md
@@ -94,4 +94,6 @@ select * from products limit 1;
 └───────────────┴─────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/dictionary/) <!--hide-->
+**See Also**
+
+-   [Dictionary function](../../../sql-reference/table-functions/dictionary.md#dictionary-function)
diff --git a/docs/en/engines/table-engines/special/distributed.md b/docs/en/engines/table-engines/special/distributed.md
index c47e0c27cd2..6de6602a216 100644
--- a/docs/en/engines/table-engines/special/distributed.md
+++ b/docs/en/engines/table-engines/special/distributed.md
@@ -25,7 +25,7 @@ The Distributed engine accepts parameters:
     -   [insert_distributed_sync](../../../operations/settings/settings.md#insert_distributed_sync) setting
     -   [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes) for the examples
 
-Also it accept the following settings:
+Also, it accepts the following settings:
 
 - `fsync_after_insert` - do the `fsync` for the file data after asynchronous insert to Distributed. Guarantees that the OS flushed the whole inserted data to a file **on the initiator node** disk.
 
@@ -124,7 +124,7 @@ Replicas are duplicating servers (in order to read all the data, you can access
 Cluster names must not contain dots.
 
 The parameters `host`, `port`, and optionally `user`, `password`, `secure`, `compression` are specified for each server:
-- `host` – The address of the remote server. You can use either the domain or the IPv4 or IPv6 address. If you specify the domain, the server makes a DNS request when it starts, and the result is stored as long as the server is running. If the DNS request fails, the server doesn’t start. If you change the DNS record, restart the server.
+- `host` – The address of the remote server. You can use either the domain or the IPv4 or IPv6 address. If you specify the domain, the server makes a DNS request when it starts, and the result is stored as long as the server is running. If the DNS request fails, the server does not start. If you change the DNS record, restart the server.
 - `port` – The TCP port for messenger activity (`tcp_port` in the config, usually set to 9000). Do not confuse it with http_port.
 - `user` – Name of the user for connecting to a remote server. Default value: default. This user must have access to connect to the specified server. Access is configured in the users.xml file. For more information, see the section [Access rights](../../../operations/access-rights.md).
 - `password` – The password for connecting to a remote server (not masked). Default value: empty string.
@@ -143,13 +143,13 @@ To view your clusters, use the `system.clusters` table.
 
 The Distributed engine allows working with a cluster like a local server. However, the cluster is inextensible: you must write its configuration in the server config file (even better, for all the cluster’s servers).
 
-The Distributed engine requires writing clusters to the config file. Clusters from the config file are updated on the fly, without restarting the server. If you need to send a query to an unknown set of shards and replicas each time, you don’t need to create a Distributed table – use the `remote` table function instead. See the section [Table functions](../../../sql-reference/table-functions/index.md).
+The Distributed engine requires writing clusters to the config file. Clusters from the config file are updated on the fly, without restarting the server. If you need to send a query to an unknown set of shards and replicas each time, you do not need to create a Distributed table – use the `remote` table function instead. See the section [Table functions](../../../sql-reference/table-functions/index.md).
 
 There are two methods for writing data to a cluster:
 
 First, you can define which servers to write which data to and perform the write directly on each shard. In other words, perform INSERT in the tables that the distributed table “looks at”. This is the most flexible solution as you can use any sharding scheme, which could be non-trivial due to the requirements of the subject area. This is also the most optimal solution since data can be written to different shards completely independently.
 
-Second, you can perform INSERT in a Distributed table. In this case, the table will distribute the inserted data across the servers itself. In order to write to a Distributed table, it must have a sharding key set (the last parameter). In addition, if there is only one shard, the write operation works without specifying the sharding key, since it doesn’t mean anything in this case.
+Second, you can perform INSERT in a Distributed table. In this case, the table will distribute the inserted data across the servers itself. In order to write to a Distributed table, it must have a sharding key set (the last parameter). In addition, if there is only one shard, the write operation works without specifying the sharding key, since it does not mean anything in this case.
 
 Each shard can have a weight defined in the config file. By default, the weight is equal to one. Data is distributed across shards in the amount proportional to the shard weight. For example, if there are two shards and the first has a weight of 9 while the second has a weight of 10, the first will be sent 9 / 19 parts of the rows, and the second will be sent 10 / 19.
 
@@ -165,7 +165,7 @@ The sharding expression can be any expression from constants and table columns t
 
 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.
 
-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 don’t 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 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.
 
 You should be concerned about the sharding scheme in the following cases:
 
diff --git a/docs/en/engines/table-engines/special/external-data.md b/docs/en/engines/table-engines/special/external-data.md
index 88d76b3805e..b5429ccad12 100644
--- a/docs/en/engines/table-engines/special/external-data.md
+++ b/docs/en/engines/table-engines/special/external-data.md
@@ -9,7 +9,7 @@ ClickHouse allows sending a server the data that is needed for processing a quer
 
 For example, if you have a text file with important user identifiers, you can upload it to the server along with a query that uses filtration by this list.
 
-If you need to run more than one query with a large volume of external data, don’t use this feature. It is better to upload the data to the DB ahead of time.
+If you need to run more than one query with a large volume of external data, do not use this feature. It is better to upload the data to the DB ahead of time.
 
 External data can be uploaded using the command-line client (in non-interactive mode), or using the HTTP interface.
 
diff --git a/docs/en/engines/table-engines/special/file.md b/docs/en/engines/table-engines/special/file.md
index 2acec40ef02..17eef2b4941 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 to specify 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.
 
diff --git a/docs/en/engines/table-engines/special/join.md b/docs/en/engines/table-engines/special/join.md
index 30dbec73939..4cd1c741352 100644
--- a/docs/en/engines/table-engines/special/join.md
+++ b/docs/en/engines/table-engines/special/join.md
@@ -28,7 +28,7 @@ See the detailed description of the [CREATE TABLE](../../../sql-reference/statem
 -   `join_type` – [JOIN type](../../../sql-reference/statements/select/join.md#select-join-types).
 -   `k1[, k2, ...]` – Key columns from the `USING` clause that the `JOIN` operation is made with.
 
-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 don’t match, ClickHouse doesn’t throw an exception and may return incorrect data.
+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}
 
diff --git a/docs/en/engines/table-engines/special/memory.md b/docs/en/engines/table-engines/special/memory.md
index a6c833ebdba..b6402c2030b 100644
--- a/docs/en/engines/table-engines/special/memory.md
+++ b/docs/en/engines/table-engines/special/memory.md
@@ -6,7 +6,7 @@ toc_title: Memory
 # Memory Table Engine {#memory}
 
 The Memory engine stores data in RAM, in uncompressed form. Data is stored in exactly the same form as it is received when read. In other words, reading from this table is completely free.
-Concurrent data access is synchronized. Locks are short: read and write operations don’t block each other.
+Concurrent data access is synchronized. Locks are short: read and write operations do not block each other.
 Indexes are not supported. Reading is parallelized.
 
 Maximal productivity (over 10 GB/sec) is reached on simple queries, because there is no reading from the disk, decompressing, or deserializing data. (We should note that in many cases, the productivity of the MergeTree engine is almost as high.)
diff --git a/docs/en/faq/general/columnar-database.md b/docs/en/faq/general/columnar-database.md
index 1c6a2bc2989..e30b4a94a87 100644
--- a/docs/en/faq/general/columnar-database.md
+++ b/docs/en/faq/general/columnar-database.md
@@ -22,4 +22,4 @@ Here is the illustration of the difference between traditional row-oriented syst
 **Columnar**
 ![Columnar](https://clickhouse.tech/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 don’t 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.
+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/dbms-naming.md b/docs/en/faq/general/dbms-naming.md
index 88a66659ab3..d4e87ff450a 100644
--- a/docs/en/faq/general/dbms-naming.md
+++ b/docs/en/faq/general/dbms-naming.md
@@ -6,7 +6,7 @@ toc_priority: 10
 
 # What Does “ClickHouse” Mean? {#what-does-clickhouse-mean}
 
-It’s a combination of “**Click**stream” and “Data ware**House**”. It comes from the original use case at Yandex.Metrica, where ClickHouse was supposed to keep records of all clicks by people from all over the Internet and it still does the job. You can read more about this use case on [ClickHouse history](../../introduction/history.md) page.
+It’s a combination of “**Click**stream” and “Data ware**House**”. It comes from the original use case at Yandex.Metrica, where ClickHouse was supposed to keep records of all clicks by people from all over the Internet, and it still does the job. You can read more about this use case on [ClickHouse history](../../introduction/history.md) page.
 
 This two-part meaning has two consequences:
 
diff --git a/docs/en/faq/general/ne-tormozit.md b/docs/en/faq/general/ne-tormozit.md
index 44fe686d670..17c5479fa6d 100644
--- a/docs/en/faq/general/ne-tormozit.md
+++ b/docs/en/faq/general/ne-tormozit.md
@@ -15,9 +15,9 @@ One of the following batches of those t-shirts was supposed to be given away on
 
 So, what does it mean? Here are some ways to translate *“не тормозит”*:
 
--   If you translate it literally, it’d be something like *“ClickHouse doesn’t press the brake pedal”*.
+-   If you translate it literally, it’d be something like *“ClickHouse does not press the brake pedal”*.
 -   If you’d want to express it as close to how it sounds to a Russian person with IT background, it’d be something like *“If your larger system lags, it’s not because it uses ClickHouse”*.
--   Shorter, but not so precise versions could be *“ClickHouse is not slow”*, *“ClickHouse doesn’t lag”* or just *“ClickHouse is fast”*.
+-   Shorter, but not so precise versions could be *“ClickHouse is not slow”*, *“ClickHouse does not lag”* or just *“ClickHouse is fast”*.
 
 If you haven’t seen one of those t-shirts in person, you can check them out online in many ClickHouse-related videos. For example, this one:
 
diff --git a/docs/en/faq/general/olap.md b/docs/en/faq/general/olap.md
index f023b8c3524..1f6df183f8c 100644
--- a/docs/en/faq/general/olap.md
+++ b/docs/en/faq/general/olap.md
@@ -31,7 +31,7 @@ All database management systems could be classified into two groups: OLAP (Onlin
 
 In practice OLAP and OLTP are not categories, it’s more like a spectrum. Most real systems usually focus on one of them but provide some solutions or workarounds if the opposite kind of workload is also desired. This situation often forces businesses to operate multiple storage systems integrated, which might be not so big deal but having more systems make it more expensive to maintain. So the trend of recent years is HTAP (**Hybrid Transactional/Analytical Processing**) when both kinds of the workload are handled equally well by a single database management system.
 
-Even if a DBMS started as a pure OLAP or pure OLTP, they are forced to move towards that HTAP direction to keep up with their competition. And ClickHouse is no exception, initially, it has been designed as [fast-as-possible OLAP system](../../faq/general/why-clickhouse-is-so-fast.md) and it still doesn’t have full-fledged transaction support, but some features like consistent read/writes and mutations for updating/deleting data had to be added.
+Even if a DBMS started as a pure OLAP or pure OLTP, they are forced to move towards that HTAP direction to keep up with their competition. And ClickHouse is no exception, initially, it has been designed as [fast-as-possible OLAP system](../../faq/general/why-clickhouse-is-so-fast.md) and it still does not have full-fledged transaction support, but some features like consistent read/writes and mutations for updating/deleting data had to be added.
 
 The fundamental trade-off between OLAP and OLTP systems remains:
 
diff --git a/docs/en/faq/general/who-is-using-clickhouse.md b/docs/en/faq/general/who-is-using-clickhouse.md
index 2ae07507123..b7ff867d726 100644
--- a/docs/en/faq/general/who-is-using-clickhouse.md
+++ b/docs/en/faq/general/who-is-using-clickhouse.md
@@ -6,9 +6,9 @@ toc_priority: 9
 
 # Who Is Using ClickHouse? {#who-is-using-clickhouse}
 
-Being an open-source product makes this question not so straightforward to answer. You don’t have to tell anyone if you want to start using ClickHouse, you just go grab source code or pre-compiled packages. There’s no contract to sign and the [Apache 2.0 license](https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE) allows for unconstrained software distribution.
+Being an open-source product makes this question not so straightforward to answer. You do not have to tell anyone if you want to start using ClickHouse, you just go grab source code or pre-compiled packages. There’s no contract to sign and the [Apache 2.0 license](https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE) allows for unconstrained software distribution.
 
-Also, the technology stack is often in a grey zone of what’s covered by an NDA. Some companies consider technologies they use as a competitive advantage even if they are open-source and don’t allow employees to share any details publicly. Some see some PR risks and allow employees to share implementation details only with their PR department approval.
+Also, the technology stack is often in a grey zone of what’s covered by an NDA. Some companies consider technologies they use as a competitive advantage even if they are open-source and do not allow employees to share any details publicly. Some see some PR risks and allow employees to share implementation details only with their PR department approval.
 
 So how to tell who is using ClickHouse?
 
diff --git a/docs/en/faq/index.md b/docs/en/faq/index.md
index 1ae71cf680c..1e9c3b8ae64 100644
--- a/docs/en/faq/index.md
+++ b/docs/en/faq/index.md
@@ -39,7 +39,7 @@ Question candidates:
 - How to kill a process (query) in ClickHouse?
 - How to implement pivot (like in pandas)?
 - How to remove the default ClickHouse user through users.d?
-- Importing MySQL dump to Clickhouse
+- Importing MySQL dump to ClickHouse
 - Window function workarounds (row_number, lag/lead, running diff/sum/average)
 ##}
 
diff --git a/docs/en/faq/operations/delete-old-data.md b/docs/en/faq/operations/delete-old-data.md
index fdf1f1f290e..32fc485e98a 100644
--- a/docs/en/faq/operations/delete-old-data.md
+++ b/docs/en/faq/operations/delete-old-data.md
@@ -12,7 +12,7 @@ The short answer is “yes”. ClickHouse has multiple mechanisms that allow fre
 
 ClickHouse allows to automatically drop values when some condition happens. This condition is configured as an expression based on any columns, usually just static offset for any timestamp column.
 
-The key advantage of this approach is that it doesn’t need any external system to trigger, once TTL is configured, data removal happens automatically in background.
+The key advantage of this approach is that it does not need any external system to trigger, once TTL is configured, data removal happens automatically in background.
 
 !!! note "Note"
     TTL can also be used to move data not only to [/dev/null](https://en.wikipedia.org/wiki/Null_device), but also between different storage systems, like from SSD to HDD.
@@ -21,7 +21,7 @@ More details on [configuring TTL](../../engines/table-engines/mergetree-family/m
 
 ## ALTER DELETE {#alter-delete}
 
-ClickHouse doesn’t have real-time point deletes like in [OLTP](https://en.wikipedia.org/wiki/Online_transaction_processing) databases. The closest thing to them are mutations. They are issued as `ALTER ... DELETE` or `ALTER ... UPDATE` queries to distinguish from normal `DELETE` or `UPDATE` as they are asynchronous batch operations, not immediate modifications. The rest of syntax after `ALTER TABLE` prefix is similar.
+ClickHouse does not have real-time point deletes like in [OLTP](https://en.wikipedia.org/wiki/Online_transaction_processing) databases. The closest thing to them are mutations. They are issued as `ALTER ... DELETE` or `ALTER ... UPDATE` queries to distinguish from normal `DELETE` or `UPDATE` as they are asynchronous batch operations, not immediate modifications. The rest of syntax after `ALTER TABLE` prefix is similar.
 
 `ALTER DELETE` can be issued to flexibly remove old data. If you need to do it regularly, the main downside will be the need to have an external system to submit the query. There are also some performance considerations since mutation rewrite complete parts even there’s only a single row to be deleted.
 
diff --git a/docs/en/faq/operations/production.md b/docs/en/faq/operations/production.md
index 77f7a76f2f9..52ca300ced0 100644
--- a/docs/en/faq/operations/production.md
+++ b/docs/en/faq/operations/production.md
@@ -25,7 +25,7 @@ Here’re some key points to get reasonable fidelity in a pre-production environ
     -   Don’t make it read-only with some frozen data.
     -   Don’t make it write-only with just copying data without building some typical reports.
     -   Don’t wipe it clean instead of applying schema migrations.
--   Use a sample of real production data and queries. Try to choose a sample that’s still representative and makes `SELECT` queries return reasonable results. Use obfuscation if your data is sensitive and internal policies don’t allow it to leave the production environment.
+-   Use a sample of real production data and queries. Try to choose a sample that’s still representative and makes `SELECT` queries return reasonable results. Use obfuscation if your data is sensitive and internal policies do not allow it to leave the production environment.
 -   Make sure that pre-production is covered by your monitoring and alerting software the same way as your production environment does.
 -   If your production spans across multiple datacenters or regions, make your pre-production does the same.
 -   If your production uses complex features like replication, distributed table, cascading materialize views, make sure they are configured similarly in pre-production.
@@ -61,8 +61,8 @@ For production use, there are two key options: `stable` and `lts`. Here is some
 
 -   `stable` is the kind of package we recommend by default. They are released roughly monthly (and thus provide new features with reasonable delay) and three latest stable releases are supported in terms of diagnostics and backporting of bugfixes.
 -   `lts` are released twice a year and are supported for a year after their initial release. You might prefer them over `stable` in the following cases:
-    -   Your company has some internal policies that don’t allow for frequent upgrades or using non-LTS software.
-    -   You are using ClickHouse in some secondary products that either doesn’t require any complex ClickHouse features and don’t have enough resources to keep it updated.
+    -   Your company has some internal policies that do not allow for frequent upgrades or using non-LTS software.
+    -   You are using ClickHouse in some secondary products that either does not require any complex ClickHouse features and do not have enough resources to keep it updated.
 
 Many teams who initially thought that `lts` is the way to go, often switch to `stable` anyway because of some recent feature that’s important for their product.
 
diff --git a/docs/en/getting-started/example-datasets/cell-towers.md b/docs/en/getting-started/example-datasets/cell-towers.md
index 76effdd4c62..7028b650ad1 100644
--- a/docs/en/getting-started/example-datasets/cell-towers.md
+++ b/docs/en/getting-started/example-datasets/cell-towers.md
@@ -3,31 +3,31 @@ toc_priority: 21
 toc_title: Cell Towers
 ---
 
-# Cell Towers
+# Cell Towers {#cell-towers}
 
 This dataset is from [OpenCellid](https://www.opencellid.org/) - The world's largest Open Database of Cell Towers.
 
-As of 2021 it contains more than 40 million records about cell towers (GSM, LTE, UMTS, etc.) around the world with their geographical coordinates and metadata (country code, network, etc).
+As of 2021, it contains more than 40 million records about cell towers (GSM, LTE, UMTS, etc.) around the world with their geographical coordinates and metadata (country code, network, etc).
 
-OpenCelliD Project is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License, and we redistribute a snapshot of this dataset under the terms of the same license. The up to date version of the dataset is available to download after sign in.
+OpenCelliD Project is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License, and we redistribute a snapshot of this dataset under the terms of the same license. The up-to-date version of the dataset is available to download after sign in.
 
 
-## Get the Dataset
+## Get the Dataset {#get-the-dataset}
 
-Download the snapshot of the dataset from Feb 2021: [https://datasets.clickhouse.tech/cell_towers.csv.xz] (729 MB).
+1. Download the snapshot of the dataset from February 2021: [https://datasets.clickhouse.tech/cell_towers.csv.xz] (729 MB).
 
-Optionally validate the integrity:
+2. Validate the integrity (optional step):
 ```
 md5sum cell_towers.csv.xz
 8cf986f4a0d9f12c6f384a0e9192c908  cell_towers.csv.xz
 ```
 
-Decompress it with the following command:
+3. Decompress it with the following command:
 ```
 xz -d cell_towers.csv.xz
 ```
 
-Create a table:
+4. Create a table:
 
 ```
 CREATE TABLE cell_towers
@@ -50,15 +50,15 @@ CREATE TABLE cell_towers
 ENGINE = MergeTree ORDER BY (radio, mcc, net, created);
 ```
 
-Insert the dataset:
+5. Insert the dataset:
 ```
 clickhouse-client --query "INSERT INTO cell_towers FORMAT CSVWithNames" < cell_towers.csv
 ```
 
+## Examples {#examples}
 
-## Run some queries
+1. A number of cell towers by type:
 
-Number of cell towers by type:
 ```
 SELECT radio, count() AS c FROM cell_towers GROUP BY radio ORDER BY c DESC
 
@@ -73,7 +73,8 @@ SELECT radio, count() AS c FROM cell_towers GROUP BY radio ORDER BY c DESC
 5 rows in set. Elapsed: 0.011 sec. Processed 43.28 million rows, 43.28 MB (3.83 billion rows/s., 3.83 GB/s.)
 ```
 
-Cell towers by mobile country code (MCC):
+2. Cell towers by [mobile country code (MCC)](https://en.wikipedia.org/wiki/Mobile_country_code):
+
 ```
 SELECT mcc, count() FROM cell_towers GROUP BY mcc ORDER BY count() DESC LIMIT 10
 
@@ -93,28 +94,28 @@ SELECT mcc, count() FROM cell_towers GROUP BY mcc ORDER BY count() DESC LIMIT 10
 10 rows in set. Elapsed: 0.019 sec. Processed 43.28 million rows, 86.55 MB (2.33 billion rows/s., 4.65 GB/s.)
 ```
 
-See the dictionary here: [https://en.wikipedia.org/wiki/Mobile_country_code](https://en.wikipedia.org/wiki/Mobile_country_code).
+So, the top countries are: the USA, Germany, and Russia.
 
-So, the top countries are USA, Germany and Russia.
-
-You may want to create an [External Dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts/) in ClickHouse to decode these values.
+You may want to create an [External Dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) in ClickHouse to decode these values.
 
 
-### Example of using `pointInPolygon` function
+## Use case {#use-case}
 
-Create a table where we will store polygons:
+Using `pointInPolygon` function.
+
+1. Create a table where we will store polygons:
 
 ```
 CREATE TEMPORARY TABLE moscow (polygon Array(Tuple(Float64, Float64)));
 ```
 
-This is a rough shape of Moscow (without "new Moscow"):
+2. This is a rough shape of Moscow (without "new Moscow"):
 
 ```
 INSERT INTO moscow VALUES ([(37.84172564285271, 55.78000432402266), (37.8381207618713, 55.775874525970494), (37.83979446823122, 55.775626746008065), (37.84243326983639, 55.77446586811748), (37.84262672750849, 55.771974101091104), (37.84153238623039, 55.77114545193181), (37.841124690460184, 55.76722010265554), (37.84239076983644, 55.76654891107098), (37.842283558197025, 55.76258709833121), (37.8421759312134, 55.758073999993734), (37.84198330422974, 55.75381499999371), (37.8416827275085, 55.749277102484484), (37.84157576190186, 55.74794544108413), (37.83897929098507, 55.74525257875241), (37.83739676451868, 55.74404373042019), (37.838732481460525, 55.74298009816793), (37.841183997352545, 55.743060321833575), (37.84097476190185, 55.73938799999373), (37.84048155819702, 55.73570799999372), (37.840095812164286, 55.73228210777237), (37.83983814285274, 55.73080491981639), (37.83846476321406, 55.729799917464675), (37.83835745269769, 55.72919751082619), (37.838636380279524, 55.72859509486539), (37.8395161005249, 55.727705075632784), (37.83897964285276, 55.722727886185154), (37.83862557539366, 55.72034817326636), (37.83559735744853, 55.71944437307499), (37.835370708803126, 55.71831419154461), (37.83738169402022, 55.71765218986692), (37.83823396494291, 55.71691750159089), (37.838056931213345, 55.71547311301385), (37.836812846557606, 55.71221445615604), (37.83522525396725, 55.709331054395555), (37.83269301586908, 55.70953687463627), (37.829667367706236, 55.70903403789297), (37.83311126588435, 55.70552351822608), (37.83058993121339, 55.70041317726053), (37.82983872750851, 55.69883771404813), (37.82934501586913, 55.69718947487017), (37.828926414016685, 55.69504441658371), (37.82876530422971, 55.69287499999378), (37.82894754100031, 55.690759754047335), (37.827697554878185, 55.68951421135665), (37.82447346292115, 55.68965045405069), (37.83136543914793, 55.68322046195302), (37.833554015869154, 55.67814012759211), (37.83544184655761, 55.67295011628339), (37.837480388885474, 55.6672498719639), (37.838960677246064, 55.66316274139358), (37.83926093121332, 55.66046999999383), (37.839025050262435, 55.65869897264431), (37.83670784390257, 55.65794084879904), (37.835656529083245, 55.65694309303843), (37.83704060449217, 55.65689306460552), (37.83696819873806, 55.65550363526252), (37.83760389616388, 55.65487847246661), (37.83687972750851, 55.65356745541324), (37.83515216004943, 55.65155951234079), (37.83312418518067, 55.64979413590619), (37.82801726983639, 55.64640836412121), (37.820614174591, 55.64164525405531), (37.818908190475426, 55.6421883258084), (37.81717543386075, 55.64112490388471), (37.81690987037274, 55.63916106913107), (37.815099354492155, 55.637925371757085), (37.808769150787356, 55.633798276884455), (37.80100123544311, 55.62873670012244), (37.79598013491824, 55.62554336109055), (37.78634567724606, 55.62033499605651), (37.78334147619623, 55.618768681480326), (37.77746201055901, 55.619855533402706), (37.77527329626457, 55.61909966711279), (37.77801986242668, 55.618770300976294), (37.778212973541216, 55.617257701952106), (37.77784818518065, 55.61574504433011), (37.77016867724609, 55.61148576294007), (37.760191219573976, 55.60599579539028), (37.75338926983641, 55.60227892751446), (37.746329965606634, 55.59920577639331), (37.73939925396728, 55.59631430313617), (37.73273665739439, 55.5935318803559), (37.7299954450912, 55.59350760316188), (37.7268679946899, 55.59469840523759), (37.72626726983634, 55.59229549697373), (37.7262673598022, 55.59081598950582), (37.71897193121335, 55.5877595845419), (37.70871550793456, 55.58393177431724), (37.700497489410374, 55.580917323756644), (37.69204305026244, 55.57778089778455), (37.68544477378839, 55.57815154690915), (37.68391050793454, 55.57472945079756), (37.678803592590306, 55.57328235936491), (37.6743402539673, 55.57255251445782), (37.66813862698363, 55.57216388774464), (37.617927457672096, 55.57505691895805), (37.60443099999999, 55.5757737568051), (37.599683515869145, 55.57749105910326), (37.59754177842709, 55.57796291823627), (37.59625834786988, 55.57906686095235), (37.59501783265684, 55.57746616444403), (37.593090671936025, 55.57671634534502), (37.587018007904, 55.577944600233785), (37.578692203704804, 55.57982895000019), (37.57327546607398, 55.58116294118248), (37.57385012109279, 55.581550362779), (37.57399562266922, 55.5820107079112), (37.5735356072979, 55.58226289171689), (37.57290393054962, 55.582393529795155), (37.57037722355653, 55.581919415056234), (37.5592298306885, 55.584471614867844), (37.54189249206543, 55.58867650795186), (37.5297256269836, 55.59158133551745), (37.517837865081766, 55.59443656218868), (37.51200186508174, 55.59635625174229), (37.506808949737554, 55.59907823904434), (37.49820432275389, 55.6062944994944), (37.494406071441674, 55.60967103463367), (37.494760001358024, 55.61066689753365), (37.49397137107085, 55.61220931698269), (37.49016528606031, 55.613417718449064), (37.48773249206542, 55.61530616333343), (37.47921386508177, 55.622640129112334), (37.470652153442394, 55.62993723476164), (37.46273446298218, 55.6368075123157), (37.46350692265317, 55.64068225239439), (37.46050283203121, 55.640794546982576), (37.457627470916734, 55.64118904154646), (37.450718034393326, 55.64690488145138), (37.44239252645875, 55.65397824729769), (37.434587576721185, 55.66053543155961), (37.43582144975277, 55.661693766520735), (37.43576786245721, 55.662755031737014), (37.430982915344174, 55.664610641628116), (37.428547447097685, 55.66778515273695), (37.42945134592044, 55.668633314343566), (37.42859571562949, 55.66948145750025), (37.4262836402282, 55.670813882451405), (37.418709037048295, 55.6811141674414), (37.41922139651101, 55.68235377885389), (37.419218771842885, 55.68359335082235), (37.417196501327446, 55.684375235224735), (37.41607020370478, 55.68540557585352), (37.415640857147146, 55.68686637150793), (37.414632153442334, 55.68903015131686), (37.413344899475064, 55.690896881757396), (37.41171432275391, 55.69264232162232), (37.40948282275393, 55.69455101638112), (37.40703674603271, 55.69638690385348), (37.39607169577025, 55.70451821283731), (37.38952706878662, 55.70942491932811), (37.387778313491815, 55.71149057784176), (37.39049275399779, 55.71419814298992), (37.385557272491454, 55.7155489617061), (37.38388335714726, 55.71849856042102), (37.378368238098155, 55.7292763261685), (37.37763597123337, 55.730845879211614), (37.37890062088197, 55.73167906388319), (37.37750451918789, 55.734703664681774), (37.375610832015965, 55.734851959522246), (37.3723813571472, 55.74105626086403), (37.37014935714723, 55.746115620904355), (37.36944173016362, 55.750883999993725), (37.36975304365541, 55.76335905525834), (37.37244070571134, 55.76432079697595), (37.3724259757175, 55.76636979670426), (37.369922155757884, 55.76735417953104), (37.369892695770275, 55.76823419316575), (37.370214730163575, 55.782312184391266), (37.370493611114505, 55.78436801120489), (37.37120164550783, 55.78596427165359), (37.37284851456452, 55.7874378183096), (37.37608325135799, 55.7886695054807), (37.3764587460632, 55.78947647305964), (37.37530000265506, 55.79146512926804), (37.38235915344241, 55.79899647809345), (37.384344043655396, 55.80113596939471), (37.38594269577028, 55.80322699999366), (37.38711208598329, 55.804919036911976), (37.3880239841309, 55.806610999993666), (37.38928977249147, 55.81001864976979), (37.39038389947512, 55.81348641242801), (37.39235781481933, 55.81983538336746), (37.393709457672124, 55.82417822811877), (37.394685720901464, 55.82792275755836), (37.39557615344238, 55.830447148154136), (37.39844478226658, 55.83167107969975), (37.40019761214057, 55.83151823557964), (37.400398790382326, 55.83264967594742), (37.39659544313046, 55.83322180909622), (37.39667059524539, 55.83402792148566), (37.39682089947515, 55.83638877400216), (37.39643489154053, 55.83861656112751), (37.3955338994751, 55.84072348043264), (37.392680272491454, 55.84502158126453), (37.39241188227847, 55.84659117913199), (37.392529730163616, 55.84816071336481), (37.39486835714723, 55.85288092980303), (37.39873052645878, 55.859893456073635), (37.40272161111449, 55.86441833633205), (37.40697072750854, 55.867579567544375), (37.410007082016016, 55.868369880337), (37.4120992989502, 55.86920843741314), (37.412668021163924, 55.87055369615854), (37.41482461111453, 55.87170587948249), (37.41862266137694, 55.873183961039565), (37.42413732540892, 55.874879126654704), (37.4312182698669, 55.875614937236705), (37.43111093783558, 55.8762723478417), (37.43332105622856, 55.87706546369396), (37.43385747619623, 55.87790681284802), (37.441303050262405, 55.88027084462084), (37.44747234260555, 55.87942070143253), (37.44716141796871, 55.88072960917233), (37.44769797085568, 55.88121221323979), (37.45204320500181, 55.882080694420715), (37.45673176190186, 55.882346110794586), (37.463383999999984, 55.88252729504517), (37.46682797486874, 55.88294937719063), (37.470014457672086, 55.88361266759345), (37.47751410450743, 55.88546991372396), (37.47860317658232, 55.88534929207307), (37.48165826025772, 55.882563306475106), (37.48316434442331, 55.8815803226785), (37.483831555817645, 55.882427612793315), (37.483182967125686, 55.88372791409729), (37.483092277908824, 55.88495581062434), (37.4855716508179, 55.8875561994203), (37.486440636245746, 55.887827444039566), (37.49014203439328, 55.88897899871799), (37.493210285705544, 55.890208937135604), (37.497512451065035, 55.891342397444696), (37.49780744510645, 55.89174030252967), (37.49940333499519, 55.89239745507079), (37.50018383334346, 55.89339220941865), (37.52421672750851, 55.903869074155224), (37.52977457672118, 55.90564076517974), (37.53503220370484, 55.90661661218259), (37.54042858064267, 55.90714113744566), (37.54320461007303, 55.905645048442985), (37.545686966066306, 55.906608607018505), (37.54743976120755, 55.90788552162358), (37.55796999999999, 55.90901557907218), (37.572711542327866, 55.91059395704873), (37.57942799999998, 55.91073854155573), (37.58502865872187, 55.91009969268444), (37.58739968913264, 55.90794809960554), (37.59131567193598, 55.908713267595054), (37.612687423278814, 55.902866854295375), (37.62348079629517, 55.90041967242986), (37.635797880950896, 55.898141151686396), (37.649487626983664, 55.89639275532968), (37.65619302513125, 55.89572360207488), (37.66294133862307, 55.895295577183965), (37.66874564418033, 55.89505457604897), (37.67375601586915, 55.89254677027454), (37.67744661901856, 55.8947775867987), (37.688347, 55.89450045676125), (37.69480554232789, 55.89422926332761), (37.70107096560668, 55.89322256101114), (37.705962965606716, 55.891763491662616), (37.711885134918205, 55.889110234998974), (37.71682005026245, 55.886577568759876), (37.7199315476074, 55.88458159806678), (37.72234560316464, 55.882281005794134), (37.72364385977171, 55.8809452036196), (37.725371142837474, 55.8809722706006), (37.727870902099546, 55.88037213862385), (37.73394330422971, 55.877941504088696), (37.745339592590376, 55.87208120378722), (37.75525267724611, 55.86703807949492), (37.76919976190188, 55.859821640197474), (37.827835219574, 55.82962968399116), (37.83341438888553, 55.82575289922351), (37.83652584655761, 55.82188784027888), (37.83809213491821, 55.81612575504693), (37.83605359521481, 55.81460347077685), (37.83632178569025, 55.81276696067908), (37.838623105812026, 55.811486181656385), (37.83912198147584, 55.807329380532785), (37.839079078033414, 55.80510270463816), (37.83965844708251, 55.79940712529036), (37.840581150787344, 55.79131399999368), (37.84172564285271, 55.78000432402266)]);
 ```
 
-Check how many cell towers are in Moscow:
+3. Check how many cell towers are in Moscow:
 
 ```
 SELECT count() FROM cell_towers WHERE pointInPolygon((lon, lat), (SELECT * FROM moscow))
@@ -128,6 +129,4 @@ SELECT count() FROM cell_towers WHERE pointInPolygon((lon, lat), (SELECT * FROM
 
 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=).
 
-Although you cannot create temporary tables there.
-
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/cell-towers/) <!--hide-->
+Although you cannot create temporary tables there.
\ No newline at end of file
diff --git a/docs/en/getting-started/example-datasets/ontime.md b/docs/en/getting-started/example-datasets/ontime.md
index 83673cdceb6..f18acc6fd50 100644
--- a/docs/en/getting-started/example-datasets/ontime.md
+++ b/docs/en/getting-started/example-datasets/ontime.md
@@ -21,120 +21,121 @@ echo https://transtats.bts.gov/PREZIP/On_Time_Reporting_Carrier_On_Time_Performa
 Creating a table:
 
 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```
 
 Loading data with multiple threads:
@@ -206,7 +207,7 @@ LIMIT 10;
 Q4. The number of delays by carrier for 2007
 
 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
 GROUP BY Carrier
@@ -220,29 +221,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year=2007
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year=2007
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 Better version of the same query:
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
 GROUP BY Carrier
@@ -256,29 +257,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year>=2000 AND Year<=2008
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year>=2000 AND Year<=2008
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 Better version of the same query:
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@@ -297,7 +298,7 @@ FROM
     from ontime
     WHERE DepDelay>10
     GROUP BY Year
-)
+) q
 JOIN
 (
     select
@@ -305,7 +306,7 @@ JOIN
         count(*) as c2
     from ontime
     GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```
 
@@ -340,7 +341,7 @@ Q10.
 
 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
    sum(ArrDelayMinutes>30) AS flights_delayed,
    round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
diff --git a/docs/en/getting-started/install.md b/docs/en/getting-started/install.md
index a8753de6abd..9a4848a3ef0 100644
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@@ -102,7 +102,9 @@ For non-Linux operating systems and for AArch64 CPU arhitecture, ClickHouse buil
 -   [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`
 
-After downloading, you can use the `clickhouse client` to connect to the server, or `clickhouse local` to process local data. To run `clickhouse server`, you have to additionally download [server](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/config.xml) and [users](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/users.xml) configuration files from GitHub.
+After downloading, you can use the `clickhouse client` to connect to the server, or `clickhouse local` to process local data.
+
+Run `sudo ./clickhouse install` if you want to install clickhouse system-wide (also with needed configuration files, configuring users etc.). After that run `clickhouse start` commands to start the clickhouse-server and `clickhouse-client` to connect to it. 
 
 These builds are not recommended for use in production environments because they are less thoroughly tested, but you can do so on your own risk. They also have only a subset of ClickHouse features available.
 
@@ -130,7 +132,7 @@ To start the server as a daemon, run:
 $ sudo service clickhouse-server start
 ```
 
-If you don’t have `service` command, run as
+If you do not have `service` command, run as
 
 ``` bash
 $ sudo /etc/init.d/clickhouse-server start
@@ -138,7 +140,7 @@ $ sudo /etc/init.d/clickhouse-server start
 
 See the logs in the `/var/log/clickhouse-server/` directory.
 
-If the server doesn’t start, check the configurations in the file `/etc/clickhouse-server/config.xml`.
+If the server does not start, check the configurations in the file `/etc/clickhouse-server/config.xml`.
 
 You can also manually launch the server from the console:
 
@@ -147,7 +149,7 @@ $ clickhouse-server --config-file=/etc/clickhouse-server/config.xml
 ```
 
 In this case, the log will be printed to the console, which is convenient during development.
-If the configuration file is in the current directory, you don’t need to specify the `--config-file` parameter. By default, it uses `./config.xml`.
+If the configuration file is in the current directory, you do not need to specify the `--config-file` parameter. By default, it uses `./config.xml`.
 
 ClickHouse supports access restriction settings. They are located in the `users.xml` file (next to `config.xml`).
 By default, access is allowed from anywhere for the `default` user, without a password. See `user/default/networks`.
diff --git a/docs/en/getting-started/tutorial.md b/docs/en/getting-started/tutorial.md
index fe697972dff..694a82e100e 100644
--- a/docs/en/getting-started/tutorial.md
+++ b/docs/en/getting-started/tutorial.md
@@ -105,7 +105,7 @@ Syntax for creating tables is way more complicated compared to databases (see [r
 2.  Table schema, i.e. list of columns and their [data types](../sql-reference/data-types/index.md).
 3.  [Table engine](../engines/table-engines/index.md) and its settings, which determines all the details on how queries to this table will be physically executed.
 
-Yandex.Metrica is a web analytics service, and sample dataset doesn’t cover its full functionality, so there are only two tables to create:
+Yandex.Metrica is a web analytics service, and sample dataset does not cover its full functionality, so there are only two tables to create:
 
 -   `hits` is a table with each action done by all users on all websites covered by the service.
 -   `visits` is a table that contains pre-built sessions instead of individual actions.
diff --git a/docs/en/guides/apply-catboost-model.md b/docs/en/guides/apply-catboost-model.md
index f614b121714..ec3ecc92141 100644
--- a/docs/en/guides/apply-catboost-model.md
+++ b/docs/en/guides/apply-catboost-model.md
@@ -20,7 +20,7 @@ For more information about training CatBoost models, see [Training and applying
 
 ## Prerequisites {#prerequisites}
 
-If you don’t have the [Docker](https://docs.docker.com/install/) yet, install it.
+If you do not have the [Docker](https://docs.docker.com/install/) yet, install it.
 
 !!! note "Note"
     [Docker](https://www.docker.com) is a software platform that allows you to create containers that isolate a CatBoost and ClickHouse installation from the rest of the system.
@@ -159,6 +159,9 @@ The fastest way to evaluate a CatBoost model is compile `libcatboostmodel.<so|dl
 <models_config>/home/catboost/models/*_model.xml</models_config>
 ```
 
+!!! note "Note"
+    You can change path to the CatBoost model configuration later without restarting server.
+
 ## 4. Run the Model Inference from SQL {#run-model-inference}
 
 For test model run the ClickHouse client `$ clickhouse client`.
diff --git a/docs/en/index.md b/docs/en/index.md
index 676fd444995..12e72ebdf3b 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -54,7 +54,7 @@ The higher the load on the system, the more important it is to customize the sys
 -   There is one large table per query. All tables are small, except for one.
 -   A query result is significantly smaller than the source data. In other words, data is filtered or aggregated, so the result fits in a single server’s RAM.
 
-It is easy to see that the OLAP scenario is very different from other popular scenarios (such as OLTP or Key-Value access). So it doesn’t make sense to try to use OLTP or a Key-Value DB for processing analytical queries if you want to get decent performance. For example, if you try to use MongoDB or Redis for analytics, you will get very poor performance compared to OLAP databases.
+It is easy to see that the OLAP scenario is very different from other popular scenarios (such as OLTP or Key-Value access). So it does not make sense to try to use OLTP or a Key-Value DB for processing analytical queries if you want to get decent performance. For example, if you try to use MongoDB or Redis for analytics, you will get very poor performance compared to OLAP databases.
 
 ## Why Column-Oriented Databases Work Better in the OLAP Scenario {#why-column-oriented-databases-work-better-in-the-olap-scenario}
 
@@ -80,15 +80,15 @@ For example, the query “count the number of records for each advertising platf
 
 ### CPU {#cpu}
 
-Since executing a query requires processing a large number of rows, it helps to dispatch all operations for entire vectors instead of for separate rows, or to implement the query engine so that there is almost no dispatching cost. If you don’t do this, with any half-decent disk subsystem, the query interpreter inevitably stalls the CPU. It makes sense to both store data in columns and process it, when possible, by columns.
+Since executing a query requires processing a large number of rows, it helps to dispatch all operations for entire vectors instead of for separate rows, or to implement the query engine so that there is almost no dispatching cost. If you do not do this, with any half-decent disk subsystem, the query interpreter inevitably stalls the CPU. It makes sense to both store data in columns and process it, when possible, by columns.
 
 There are two ways to do this:
 
-1.  A vector engine. All operations are written for vectors, instead of for separate values. This means you don’t need to call operations very often, and dispatching costs are negligible. Operation code contains an optimized internal cycle.
+1.  A vector engine. All operations are written for vectors, instead of for separate values. This means you do not need to call operations very often, and dispatching costs are negligible. Operation code contains an optimized internal cycle.
 
 2.  Code generation. The code generated for the query has all the indirect calls in it.
 
-This is not done in “normal” databases, because it doesn’t make sense when running simple queries. However, there are exceptions. For example, MemSQL uses code generation to reduce latency when processing SQL queries. (For comparison, analytical DBMSs require optimization of throughput, not latency.)
+This is not done in “normal” databases, because it does not make sense when running simple queries. However, there are exceptions. For example, MemSQL uses code generation to reduce latency when processing SQL queries. (For comparison, analytical DBMSs require optimization of throughput, not latency.)
 
 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.
 
diff --git a/docs/en/interfaces/cli.md b/docs/en/interfaces/cli.md
index 7e072e366dc..8457ea41857 100644
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@@ -66,7 +66,7 @@ When processing a query, the client shows:
 3.  The result in the specified format.
 4.  The number of lines in the result, the time passed, and the average speed of query processing.
 
-You can cancel a long query by pressing Ctrl+C. However, you will still need to wait for a little for the server to abort the request. It is not possible to cancel a query at certain stages. If you don’t wait and press Ctrl+C a second time, the client will exit.
+You can cancel a long query by pressing Ctrl+C. However, you will still need to wait for a little for the server to abort the request. It is not possible to cancel a query at certain stages. If you do not wait and press Ctrl+C a second time, the client will exit.
 
 The command-line client allows passing external data (external temporary tables) for querying. For more information, see the section “External data for query processing”.
 
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index 5987ba0f676..c616d843173 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -662,7 +662,7 @@ ClickHouse allows:
 -   Any order of key-value pairs in the object.
 -   Omitting some values.
 
-ClickHouse ignores spaces between elements and commas after the objects. You can pass all the objects in one line. You don’t have to separate them with line breaks.
+ClickHouse ignores spaces between elements and commas after the objects. You can pass all the objects in one line. You do not have to separate them with line breaks.
 
 **Omitted values processing**
 
@@ -770,9 +770,9 @@ SELECT * FROM json_each_row_nested
 
 ## Native {#native}
 
-The most efficient format. Data is written and read by blocks in binary format. For each block, the number of rows, number of columns, column names and types, and parts of columns in this block are recorded one after another. In other words, this format is “columnar” – it doesn’t convert columns to rows. This is the format used in the native interface for interaction between servers, for using the command-line client, and for C++ clients.
+The most efficient format. Data is written and read by blocks in binary format. For each block, the number of rows, number of columns, column names and types, and parts of columns in this block are recorded one after another. In other words, this format is “columnar” – it does not convert columns to rows. This is the format used in the native interface for interaction between servers, for using the command-line client, and for C++ clients.
 
-You can use this format to quickly generate dumps that can only be read by the ClickHouse DBMS. It doesn’t make sense to work with this format yourself.
+You can use this format to quickly generate dumps that can only be read by the ClickHouse DBMS. It does not make sense to work with this format yourself.
 
 ## Null {#null}
 
@@ -1039,7 +1039,7 @@ struct Message {
 }
 ```
 
-Deserialization is effective and usually doesn’t increase the system load.
+Deserialization is effective and usually does not increase the system load.
 
 See also [Format Schema](#formatschema).
 
@@ -1312,7 +1312,7 @@ ClickHouse supports configurable precision of the `Decimal` type. The `INSERT` q
 
 Unsupported ORC data types: `TIME32`, `FIXED_SIZE_BINARY`, `JSON`, `UUID`, `ENUM`.
 
-The data types of ClickHouse table columns don’t have to match the corresponding ORC data fields. When inserting data, ClickHouse interprets data types according to the table above and then [casts](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) the data to the data type set for the ClickHouse table column.
+The data types of ClickHouse table columns do not have to match the corresponding ORC data fields. When inserting data, ClickHouse interprets data types according to the table above and then [casts](../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) the data to the data type set for the ClickHouse table column.
 
 ### Inserting Data {#inserting-data-2}
 
diff --git a/docs/en/interfaces/http.md b/docs/en/interfaces/http.md
index 18533cfc6c2..dec3c839020 100644
--- a/docs/en/interfaces/http.md
+++ b/docs/en/interfaces/http.md
@@ -52,7 +52,7 @@ X-ClickHouse-Summary: {"read_rows":"0","read_bytes":"0","written_rows":"0","writ
 ```
 
 As you can see, curl is somewhat inconvenient in that spaces must be URL escaped.
-Although wget escapes everything itself, we don’t recommend using it because it doesn’t work well over HTTP 1.1 when using keep-alive and Transfer-Encoding: chunked.
+Although wget escapes everything itself, we do not recommend using it because it does not work well over HTTP 1.1 when using keep-alive and Transfer-Encoding: chunked.
 
 ``` bash
 $ echo 'SELECT 1' | curl 'http://localhost:8123/' --data-binary @-
@@ -146,7 +146,7 @@ Deleting the table.
 $ echo 'DROP TABLE t' | curl 'http://localhost:8123/' --data-binary @-
 ```
 
-For successful requests that don’t return a data table, an empty response body is returned.
+For successful requests that do not return a data table, an empty response body is returned.
 
 
 ## Compression {#compression}
@@ -273,7 +273,7 @@ Possible header fields:
 -   `written_rows` — Number of rows written.
 -   `written_bytes` — Volume of data written in bytes.
 
-Running requests don’t stop automatically if the HTTP connection is lost. Parsing and data formatting are performed on the server-side, and using the network might be ineffective.
+Running requests do not stop automatically if the HTTP connection is lost. Parsing and data formatting are performed on the server-side, and using the network might be ineffective.
 The optional ‘query_id’ parameter can be passed as the query ID (any string). For more information, see the section “Settings, replace_running_query”.
 
 The optional ‘quota_key’ parameter can be passed as the quota key (any string). For more information, see the section “Quotas”.
diff --git a/docs/en/interfaces/third-party/client-libraries.md b/docs/en/interfaces/third-party/client-libraries.md
index c08eec61b1c..835e3c6e98a 100644
--- a/docs/en/interfaces/third-party/client-libraries.md
+++ b/docs/en/interfaces/third-party/client-libraries.md
@@ -23,6 +23,7 @@ toc_title: Client Libraries
     -   [SeasClick C++ client](https://github.com/SeasX/SeasClick)
     -   [one-ck](https://github.com/lizhichao/one-ck)
     -   [glushkovds/phpclickhouse-laravel](https://packagist.org/packages/glushkovds/phpclickhouse-laravel)
+    -   [kolya7k ClickHouse PHP extension](https://github.com//kolya7k/clickhouse-php)
 -   Go
     -   [clickhouse](https://github.com/kshvakov/clickhouse/)
     -   [go-clickhouse](https://github.com/roistat/go-clickhouse)
@@ -41,6 +42,8 @@ toc_title: Client Libraries
 -   Ruby
     -   [ClickHouse (Ruby)](https://github.com/shlima/click_house)
     -   [clickhouse-activerecord](https://github.com/PNixx/clickhouse-activerecord)
+-   Rust
+    -   [Klickhouse](https://github.com/Protryon/klickhouse)
 -   R
     -   [clickhouse-r](https://github.com/hannesmuehleisen/clickhouse-r)
     -   [RClickHouse](https://github.com/IMSMWU/RClickHouse)
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index 5d14b3aa3cc..fffe0c87a53 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -169,19 +169,23 @@ Features:
 
 ### SeekTable {#seektable}
 
-[SeekTable](https://www.seektable.com) is a self-service BI tool for data exploration and operational reporting. SeekTable is available both as a cloud service and a self-hosted version. SeekTable reports may be embedded into any web-app.
+[SeekTable](https://www.seektable.com) is a self-service BI tool for data exploration and operational reporting. It is available both as a cloud service and a self-hosted version. Reports from SeekTable may be embedded into any web-app.
 
 Features:
 
 -   Business users-friendly reports builder.
 -   Powerful report parameters for SQL filtering and report-specific query customizations.
 -   Can connect to ClickHouse both with a native TCP/IP endpoint and a HTTP(S) interface (2 different drivers).
--   It is possible to use all power of CH SQL dialect in dimensions/measures definitions
+-   It is possible to use all power of ClickHouse SQL dialect in dimensions/measures definitions.
 -   [Web API](https://www.seektable.com/help/web-api-integration) for automated reports generation.
--   Supports reports development flow with account data [backup/restore](https://www.seektable.com/help/self-hosted-backup-restore), data models (cubes) / reports configuration is a human-readable XML and can be stored under version control.
+-   Supports reports development flow with account data [backup/restore](https://www.seektable.com/help/self-hosted-backup-restore); data models (cubes) / reports configuration is a human-readable XML and can be stored under version control system.
 
 SeekTable is [free](https://www.seektable.com/help/cloud-pricing) for personal/individual usage.
 
 [How to configure ClickHouse connection in SeekTable.](https://www.seektable.com/help/clickhouse-pivot-table)
 
+### Chadmin {#chadmin}
+
+[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-->
diff --git a/docs/en/introduction/adopters.md b/docs/en/introduction/adopters.md
index 012d86b1ef7..fa257a84173 100644
--- a/docs/en/introduction/adopters.md
+++ b/docs/en/introduction/adopters.md
@@ -13,6 +13,7 @@ toc_title: Adopters
 | <a href="https://2gis.ru" class="favicon">2gis</a> | Maps | Monitoring | — | — | [Talk in Russian, July 2019](https://youtu.be/58sPkXfq6nw) |
 | <a href="https://getadmiral.com/" class="favicon">Admiral</a> | Martech | Engagement Management | — | — | [Webinar Slides, June 2020](https://altinity.com/presentations/2020/06/16/big-data-in-real-time-how-clickhouse-powers-admirals-visitor-relationships-for-publishers) |
 | <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://altinity.com/" class="favicon">Altinity</a> | Cloud, SaaS | Main product | — | — | [Official Website](https://altinity.com/) |
@@ -47,7 +48,8 @@ toc_title: Adopters
 | <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://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) |
+| <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) |
+| <a href="https://www.eventbunker.io/" class="favicon">EventBunker.io</a> | Serverless Data Processing | — | — | — | [Tweet, April 2021](https://twitter.com/Halil_D_/status/1379839133472985091) |
 | <a href="https://fastnetmon.com/" class="favicon">FastNetMon</a> | DDoS Protection | Main Product | | — | [Official website](https://fastnetmon.com/docs-fnm-advanced/fastnetmon-advanced-traffic-persistency/) |
 | <a href="https://www.flipkart.com/" class="favicon">Flipkart</a> | e-Commerce | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=239) |
 | <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) |
@@ -75,7 +77,8 @@ toc_title: Adopters
 | <a href="https://tech.mymarilyn.ru" class="favicon">Marilyn</a> | Advertising | Statistics | — | — | [Talk in Russian, June 2017](https://www.youtube.com/watch?v=iXlIgx2khwc) |
 | <a href="https://mellodesign.ru/" class="favicon">Mello</a> | Marketing | Analytics | 1 server | — | [Article, Oct 2020](https://vc.ru/marketing/166180-razrabotka-tipovogo-otcheta-skvoznoy-analitiki) |
 | <a href="https://www.messagebird.com" class="favicon">MessageBird</a> | Telecommunications | Statistics | — | — | [Slides in English, November 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup20/messagebird.pdf) |
-| <a href="https://www.mindsdb.com/" class="favicon">MindsDB</a> | Machine Learning | Main Product | — | — | [Official Website](https://www.mindsdb.com/blog/machine-learning-models-as-tables-in-ch) |x
+| <a href="https://clarity.microsoft.com/" class="favicon">Microsoft</a> | Web Analytics | Clarity (Main Product) | — | — | [A question on GitHub](https://github.com/ClickHouse/ClickHouse/issues/21556) |
+| <a href="https://www.mindsdb.com/" class="favicon">MindsDB</a> | Machine Learning | Main Product | — | — | [Official Website](https://www.mindsdb.com/blog/machine-learning-models-as-tables-in-ch) |
 | <a href="https://mux.com/" class="favicon">MUX</a> | Online Video | Video Analytics | — | — | [Talk in English, August 2019](https://altinity.com/presentations/2019/8/13/how-clickhouse-became-the-default-analytics-database-for-mux/) |
 | <a href="https://www.mgid.com/" class="favicon">MGID</a> | Ad network | Web-analytics | — | — | [Blog post in Russian, April 2020](http://gs-studio.com/news-about-it/32777----clickhouse---c) |
 | <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) |
diff --git a/docs/en/introduction/distinctive-features.md b/docs/en/introduction/distinctive-features.md
index be7c2d2e7c1..ee9f9484c67 100644
--- a/docs/en/introduction/distinctive-features.md
+++ b/docs/en/introduction/distinctive-features.md
@@ -61,7 +61,7 @@ Unlike other database management systems, secondary indexes in ClickHouse does n
 
 ## Suitable for Online Queries {#suitable-for-online-queries}
 
-Most OLAP database management systems don’t aim for online queries with sub-second latencies. In alternative systems, report building time of tens of seconds or even minutes is often considered acceptable. Sometimes it takes even more which forces to prepare reports offline (in advance or by responding with “come back later”).
+Most OLAP database management systems do not aim for online queries with sub-second latencies. In alternative systems, report building time of tens of seconds or even minutes is often considered acceptable. Sometimes it takes even more which forces to prepare reports offline (in advance or by responding with “come back later”).
 
 In ClickHouse low latency means that queries can be processed without delay and without trying to prepare an answer in advance, right at the same moment while the user interface page is loading. In other words, online.
 
diff --git a/docs/en/operations/access-rights.md b/docs/en/operations/access-rights.md
index 32f8fdcb642..8d48218f417 100644
--- a/docs/en/operations/access-rights.md
+++ b/docs/en/operations/access-rights.md
@@ -31,7 +31,7 @@ To see all users, roles, profiles, etc. and all their grants use [SHOW ACCESS](.
 
 ## Usage {#access-control-usage}
 
-By default, the ClickHouse server provides the `default` user account which is not allowed using SQL-driven access control and account management but has all the rights and permissions. The `default` user account is used in any cases when the username is not defined, for example, at login from client or in distributed queries. In distributed query processing a default user account is used, if the configuration of the server or cluster doesn’t specify the [user and password](../engines/table-engines/special/distributed.md) properties.
+By default, the ClickHouse server provides the `default` user account which is not allowed using SQL-driven access control and account management but has all the rights and permissions. The `default` user account is used in any cases when the username is not defined, for example, at login from client or in distributed queries. In distributed query processing a default user account is used, if the configuration of the server or cluster does not specify the [user and password](../engines/table-engines/special/distributed.md) properties.
 
 If you just started using ClickHouse, consider the following scenario:
 
@@ -101,6 +101,9 @@ Privileges can be granted to a role by the [GRANT](../sql-reference/statements/g
 
 Row policy is a filter that defines which of the rows are available to a user or a role. Row policy contains filters for one particular table, as well as a list of roles and/or users which should use this row policy.
 
+!!! note "Warning"
+    Row policies makes sense only for users with readonly access. If user can modify table or copy partitions between tables, it defeats the restrictions of row policies.
+
 Management queries:
 
 -   [CREATE ROW POLICY](../sql-reference/statements/create/row-policy.md)
diff --git a/docs/en/operations/backup.md b/docs/en/operations/backup.md
index f4206f5d70c..9c8f5389ccd 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -5,7 +5,7 @@ toc_title: Data Backup
 
 # Data Backup {#data-backup}
 
-While [replication](../engines/table-engines/mergetree-family/replication.md) provides protection from hardware failures, it does not protect against human errors: accidental deletion of data, deletion of the wrong table or a table on the wrong cluster, and software bugs that result in incorrect data processing or data corruption. In many cases mistakes like these will affect all replicas. ClickHouse has built-in safeguards to prevent some types of mistakes — for example, by default [you can’t just drop tables with a MergeTree-like engine containing more than 50 Gb of data](server-configuration-parameters/settings.md#max-table-size-to-drop). However, these safeguards don’t cover all possible cases and can be circumvented.
+While [replication](../engines/table-engines/mergetree-family/replication.md) provides protection from hardware failures, it does not protect against human errors: accidental deletion of data, deletion of the wrong table or a table on the wrong cluster, and software bugs that result in incorrect data processing or data corruption. In many cases mistakes like these will affect all replicas. ClickHouse has built-in safeguards to prevent some types of mistakes — for example, by default [you can’t just drop tables with a MergeTree-like engine containing more than 50 Gb of data](server-configuration-parameters/settings.md#max-table-size-to-drop). However, these safeguards do not cover all possible cases and can be circumvented.
 
 In order to effectively mitigate possible human errors, you should carefully prepare a strategy for backing up and restoring your data **in advance**.
 
@@ -30,7 +30,7 @@ For smaller volumes of data, a simple `INSERT INTO ... SELECT ...` to remote tab
 
 ## Manipulations with Parts {#manipulations-with-parts}
 
-ClickHouse allows using the `ALTER TABLE ... FREEZE PARTITION ...` query to create a local copy of table partitions. This is implemented using hardlinks to the `/var/lib/clickhouse/shadow/` folder, so it usually does not consume extra disk space for old data. The created copies of files are not handled by ClickHouse server, so you can just leave them there: you will have a simple backup that doesn’t require any additional external system, but it will still be prone to hardware issues. For this reason, it’s better to remotely copy them to another location and then remove the local copies. Distributed filesystems and object stores are still a good options for this, but normal attached file servers with a large enough capacity might work as well (in this case the transfer will occur via the network filesystem or maybe [rsync](https://en.wikipedia.org/wiki/Rsync)).
+ClickHouse allows using the `ALTER TABLE ... FREEZE PARTITION ...` query to create a local copy of table partitions. This is implemented using hardlinks to the `/var/lib/clickhouse/shadow/` folder, so it usually does not consume extra disk space for old data. The created copies of files are not handled by ClickHouse server, so you can just leave them there: you will have a simple backup that does not require any additional external system, but it will still be prone to hardware issues. For this reason, it’s better to remotely copy them to another location and then remove the local copies. Distributed filesystems and object stores are still a good options for this, but normal attached file servers with a large enough capacity might work as well (in this case the transfer will occur via the network filesystem or maybe [rsync](https://en.wikipedia.org/wiki/Rsync)).
 Data can be restored from backup using the `ALTER TABLE ... ATTACH PARTITION ...`
 
 For more information about queries related to partition manipulations, see the [ALTER documentation](../sql-reference/statements/alter/partition.md#alter_manipulations-with-partitions).
diff --git a/docs/en/operations/configuration-files.md b/docs/en/operations/configuration-files.md
index 9864efd648a..96009c75af1 100644
--- a/docs/en/operations/configuration-files.md
+++ b/docs/en/operations/configuration-files.md
@@ -5,9 +5,9 @@ toc_title: Configuration Files
 
 # Configuration Files {#configuration_files}
 
-ClickHouse supports multi-file configuration management. The main server configuration file is `/etc/clickhouse-server/config.xml`. Other files must be in the `/etc/clickhouse-server/config.d` directory.
+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 format. Also, they should have the same root element, usually `<yandex>`.
+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.
 
 ## Override {#override}
 
@@ -32,7 +32,7 @@ Users configuration can be splitted into separate files similar to `config.xml`
 Directory name is defined as `users_config` setting without `.xml` postfix concatenated with `.d`.
 Directory `users.d` is used by default, as `users_config` defaults to `users.xml`.
 
-## Example {#example}
+## XML example {#example}
 
 For example, you can have separate config file for each user like this:
 
@@ -55,6 +55,70 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 </yandex>
 ```
 
+## YAML examples {#example}
+
+Here you can see default config written in YAML: [config.yaml.example](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/config.yaml.example).
+
+There are some differences between YAML and XML formats in terms of ClickHouse configurations. Here are some tips for writing a configuration in YAML format.
+
+You should use a Scalar node to write a key-value pair:
+``` yaml
+key: value
+```
+
+To create a node, containing other nodes you should use a Map:
+``` yaml
+map_key:
+  key1: val1
+  key2: val2
+  key3: val3
+```
+
+To create a list of values or nodes assigned to one tag you should use a Sequence:
+``` yaml
+seq_key:
+  - val1
+  - val2
+  - key1: val3
+  - map:
+      key2: val4
+      key3: val5
+```
+
+If you want to write an attribute for a Sequence or Map node, you should use a @ prefix before the attribute key. Note, that @ is reserved by YAML standard, so you should also to wrap it into double quotes:
+
+``` yaml
+map:
+  "@attr1": value1
+  "@attr2": value2
+  key: 123
+```
+
+From that Map we will get these XML nodes:
+
+``` xml
+<map attr1="value1" attr2="value2">
+    <key>123</key>
+</map>
+```
+
+You can also set attributes for Sequence:
+
+``` yaml
+seq:
+  - "@attr1": value1
+  - "@attr2": value2
+  - 123
+  - abc
+```
+
+So, we can get YAML config equal to this XML one:
+
+``` xml
+<seq attr1="value1" attr2="value2">123</seq>
+<seq attr1="value1" attr2="value2">abc</seq>
+```
+
 ## Implementation Details {#implementation-details}
 
 For each config file, the server also generates `file-preprocessed.xml` files when starting. These files contain all the completed substitutions and overrides, and they are intended for informational use. If ZooKeeper substitutions were used in the config files but ZooKeeper is not available on the server start, the server loads the configuration from the preprocessed file.
diff --git a/docs/en/operations/external-authenticators/ldap.md b/docs/en/operations/external-authenticators/ldap.md
index 1b65ecc968b..805d45e1b38 100644
--- a/docs/en/operations/external-authenticators/ldap.md
+++ b/docs/en/operations/external-authenticators/ldap.md
@@ -17,6 +17,7 @@ To define LDAP server you must add `ldap_servers` section to the `config.xml`.
 <yandex>
     <!- ... -->
     <ldap_servers>
+        <!- Typical LDAP server. -->
         <my_ldap_server>
             <host>localhost</host>
             <port>636</port>
@@ -31,6 +32,18 @@ To define LDAP server you must add `ldap_servers` section to the `config.xml`.
             <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>
+
+        <!- Typical Active Directory with configured user DN detection for further role mapping. -->
+        <my_ad_server>
+            <host>localhost</host>
+            <port>389</port>
+            <bind_dn>EXAMPLE\{user_name}</bind_dn>
+            <user_dn_detection>
+                <base_dn>CN=Users,DC=example,DC=com</base_dn>
+                <search_filter>(&amp;(objectClass=user)(sAMAccountName={user_name}))</search_filter>
+            </user_dn_detection>
+            <enable_tls>no</enable_tls>
+        </my_ad_server>
     </ldap_servers>
 </yandex>
 ```
@@ -43,6 +56,15 @@ Note, that you can define multiple LDAP servers inside the `ldap_servers` sectio
 - `port` — LDAP server port, default is `636` if `enable_tls` is set to `true`, `389` otherwise.
 - `bind_dn` — Template used to construct the DN to bind to.
     - The resulting DN will be constructed by replacing all `{user_name}` substrings of the template with the actual user name during each authentication attempt.
+- `user_dn_detection` - Section with LDAP search parameters for detecting the actual user DN of the bound user.
+    - This is mainly used in search filters for further role mapping when the server is Active Directory. The resulting user DN will be used when replacing `{user_dn}` substrings wherever they are allowed. By default, user DN is set equal to bind DN, but once search is performed, it will be updated with to the actual detected user DN value.
+        - `base_dn` - Template used to construct the base DN for the LDAP search.
+            - The resulting DN will be constructed by replacing all `{user_name}` and `{bind_dn}` substrings of the template with the actual user name and bind DN during the LDAP search.
+        - `scope` - Scope of the LDAP search.
+            - Accepted values are: `base`, `one_level`, `children`, `subtree` (the default).
+        - `search_filter` - Template used to construct the search filter for the LDAP search.
+            - The resulting filter will be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{base_dn}` substrings of the template with the actual user name, bind DN, and base DN during the LDAP search.
+            - Note, that the special characters must be escaped properly in XML.
 - `verification_cooldown` — A period of time, in seconds, after a successful bind attempt, during which the user will be assumed to be successfully authenticated for all consecutive requests without contacting the LDAP server.
     - Specify `0` (the default) to disable caching and force contacting the LDAP server for each authentication request.
 - `enable_tls` — A flag to trigger the use of the secure connection to the LDAP server.
@@ -107,7 +129,7 @@ Goes into `config.xml`.
 <yandex>
     <!- ... -->
     <user_directories>
-        <!- ... -->
+        <!- Typical LDAP server. -->
         <ldap>
             <server>my_ldap_server</server>
             <roles>
@@ -122,6 +144,18 @@ Goes into `config.xml`.
                 <prefix>clickhouse_</prefix>
             </role_mapping>
         </ldap>
+
+        <!- Typical Active Directory with role mapping that relies on the detected user DN. -->
+        <ldap>
+            <server>my_ad_server</server>
+            <role_mapping>
+                <base_dn>CN=Users,DC=example,DC=com</base_dn>
+                <attribute>CN</attribute>
+                <scope>subtree</scope>
+                <search_filter>(&amp;(objectClass=group)(member={user_dn}))</search_filter>
+                <prefix>clickhouse_</prefix>
+            </role_mapping>
+        </ldap>
     </user_directories>
 </yandex>
 ```
@@ -137,13 +171,13 @@ Note that `my_ldap_server` referred in the `ldap` section inside the `user_direc
     - When a user authenticates, while still bound to LDAP, an LDAP search is performed using `search_filter` and the name of the logged-in user. For each entry found during that search, the value of the specified attribute is extracted. For each attribute value that has the specified prefix, the prefix is removed, and the rest of the value becomes the name of a local role defined in ClickHouse, which is expected to be created beforehand by the [CREATE ROLE](../../sql-reference/statements/create/role.md#create-role-statement) statement.
     - There can be multiple `role_mapping` sections defined inside the same `ldap` section. All of them will be applied.
         - `base_dn` — Template used to construct the base DN for the LDAP search.
-           - The resulting DN will be constructed by replacing all `{user_name}` and `{bind_dn}` substrings of the template with the actual user name and bind DN during each LDAP search.
+            - The resulting DN will be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{user_dn}` substrings of the template with the actual user name, bind DN, and user DN during each LDAP search.
         - `scope` — Scope of the LDAP search.
             - Accepted values are: `base`, `one_level`, `children`, `subtree` (the default).
         - `search_filter` — Template used to construct the search filter for the LDAP search.
-            - The resulting filter will be constructed by replacing all `{user_name}`, `{bind_dn}` and `{base_dn}` substrings of the template with the actual user name, bind DN and base DN during each LDAP search.
+            - The resulting filter will be constructed by replacing all `{user_name}`, `{bind_dn}`, `{user_dn}`, and `{base_dn}` substrings of the template with the actual user name, bind DN, user DN, and base DN during each LDAP search.
             - Note, that the special characters must be escaped properly in XML.
-        - `attribute` — Attribute name whose values will be returned by the LDAP search.
+        - `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-->
diff --git a/docs/en/operations/optimizing-performance/sampling-query-profiler.md b/docs/en/operations/optimizing-performance/sampling-query-profiler.md
index 0c075180530..9244592d515 100644
--- a/docs/en/operations/optimizing-performance/sampling-query-profiler.md
+++ b/docs/en/operations/optimizing-performance/sampling-query-profiler.md
@@ -11,13 +11,13 @@ To use profiler:
 
 -   Setup the [trace_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-trace_log) section of the server configuration.
 
-    This section configures the [trace_log](../../operations/system-tables/trace_log.md#system_tables-trace_log) system table containing the results of the profiler functioning. It is configured by default. Remember that data in this table is valid only for a running server. After the server restart, ClickHouse doesn’t clean up the table and all the stored virtual memory address may become invalid.
+    This section configures the [trace_log](../../operations/system-tables/trace_log.md#system_tables-trace_log) system table containing the results of the profiler functioning. It is configured by default. Remember that data in this table is valid only for a running server. After the server restart, ClickHouse does not clean up the table and all the stored virtual memory address may become invalid.
 
 -   Setup the [query_profiler_cpu_time_period_ns](../../operations/settings/settings.md#query_profiler_cpu_time_period_ns) or [query_profiler_real_time_period_ns](../../operations/settings/settings.md#query_profiler_real_time_period_ns) settings. Both settings can be used simultaneously.
 
     These settings allow you to configure profiler timers. As these are the session settings, you can get different sampling frequency for the whole server, individual users or user profiles, for your interactive session, and for each individual query.
 
-The default sampling frequency is one sample per second and both CPU and real timers are enabled. This frequency allows collecting enough information about ClickHouse cluster. At the same time, working with this frequency, profiler doesn’t affect ClickHouse server’s performance. If you need to profile each individual query try to use higher sampling frequency.
+The default sampling frequency is one sample per second and both CPU and real timers are enabled. This frequency allows collecting enough information about ClickHouse cluster. At the same time, working with this frequency, profiler does not affect ClickHouse server’s performance. If you need to profile each individual query try to use higher sampling frequency.
 
 To analyze the `trace_log` system table:
 
diff --git a/docs/en/operations/performance-test.md b/docs/en/operations/performance-test.md
index ca805923ba9..a808ffd0a85 100644
--- a/docs/en/operations/performance-test.md
+++ b/docs/en/operations/performance-test.md
@@ -12,6 +12,7 @@ With this instruction you can run basic ClickHouse performance test on any serve
 3.  Copy the link to `clickhouse` binary for amd64 or aarch64.
 4.  ssh to the server and download it with wget:
 ```bash
+# These links are outdated, please obtain the fresh link from the "commits" page.
 # For amd64:
 wget https://clickhouse-builds.s3.yandex.net/0/e29c4c3cc47ab2a6c4516486c1b77d57e7d42643/clickhouse_build_check/gcc-10_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse
 # For aarch64:
diff --git a/docs/en/operations/quotas.md b/docs/en/operations/quotas.md
index 56c3eaf6455..bbea735cdba 100644
--- a/docs/en/operations/quotas.md
+++ b/docs/en/operations/quotas.md
@@ -72,7 +72,7 @@ The resource consumption calculated for each interval is output to the server lo
 </statbox>
 ```
 
-For the ‘statbox’ quota, restrictions are set for every hour and for every 24 hours (86,400 seconds). The time interval is counted, starting from an implementation-defined fixed moment in time. In other words, the 24-hour interval doesn’t necessarily begin at midnight.
+For the ‘statbox’ quota, restrictions are set for every hour and for every 24 hours (86,400 seconds). The time interval is counted, starting from an implementation-defined fixed moment in time. In other words, the 24-hour interval does not necessarily begin at midnight.
 
 When the interval ends, all collected values are cleared. For the next hour, the quota calculation starts over.
 
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index 0b45488ebf7..801a1d27add 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -100,6 +100,11 @@ 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.
+
+Default value: `480` (8 minute).
 
 ## default_database {#default-database}
 
@@ -125,6 +130,25 @@ Settings profiles are located in the file specified in the parameter `user_confi
 <default_profile>default</default_profile>
 ```
 
+## default_replica_path {#default_replica_path}
+
+The path to the table in ZooKeeper.
+
+**Example**
+
+``` xml
+<default_replica_path>/clickhouse/tables/{uuid}/{shard}</default_replica_path>
+```
+## default_replica_name {#default_replica_name}
+
+ The replica name in ZooKeeper.
+
+**Example**
+
+``` xml
+<default_replica_name>{replica}</default_replica_name>
+```
+
 ## dictionaries_config {#server_configuration_parameters-dictionaries_config}
 
 The path to the config file for external dictionaries.
@@ -321,7 +345,8 @@ Similar to `interserver_http_host`, except that this hostname can be used by oth
 The username and password used to authenticate during [replication](../../engines/table-engines/mergetree-family/replication.md) with the Replicated\* engines. These credentials are used only for communication between replicas and are unrelated to credentials for ClickHouse clients. The server is checking these credentials for connecting replicas and use the same credentials when connecting to other replicas. So, these credentials should be set the same for all replicas in a cluster.
 By default, the authentication is not used.
 
-**Note:** These credentials are common for replication through `HTTP` and `HTTPS`.
+!!! note "Note"
+    These credentials are common for replication through `HTTP` and `HTTPS`.
 
 This section contains the following parameters:
 
@@ -405,7 +430,7 @@ Keys for syslog:
     Default value: `LOG_USER` if `address` is specified, `LOG_DAEMON` otherwise.
 -   format – Message format. Possible values: `bsd` and `syslog.`
 
-## send_crash_reports {#server_configuration_parameters-logger}
+## send_crash_reports {#server_configuration_parameters-send_crash_reports}
 
 Settings for opt-in sending crash reports to the ClickHouse core developers team via [Sentry](https://sentry.io).
 Enabling it, especially in pre-production environments, is highly appreciated.
@@ -477,12 +502,12 @@ The default `max_server_memory_usage` value is calculated as `memory_amount * ma
 
 ## max_server_memory_usage_to_ram_ratio {#max_server_memory_usage_to_ram_ratio}
 
-Defines the fraction of total physical RAM amount, available to the Clickhouse server. If the server tries to utilize more, the memory is cut down to the appropriate amount. 
+Defines the fraction of total physical RAM amount, available to the ClickHouse server. If the server tries to utilize more, the memory is cut down to the appropriate amount. 
 
 Possible values:
 
 -   Positive double.
--   0 — The Clickhouse server can use all available RAM.
+-   0 — The ClickHouse server can use all available RAM.
 
 Default value: `0`.
 
@@ -801,7 +826,7 @@ Use the following parameters to configure logging:
 -   `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 doesn’t exist, ClickHouse will create it. If the structure of the query log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
+If the table does not exist, ClickHouse will create it. If the structure of the query log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
 
 **Example**
 
@@ -828,7 +853,7 @@ Use the following parameters to configure logging:
 -   `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 doesn’t exist, ClickHouse will create it. If the structure of the query thread log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
+If the table does not exist, ClickHouse will create it. If the structure of the query thread log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
 
 **Example**
 
@@ -1130,7 +1155,7 @@ This setting only applies to the `MergeTree` family. It can be specified:
 If `use_minimalistic_part_header_in_zookeeper = 1`, then [replicated](../../engines/table-engines/mergetree-family/replication.md) tables store the headers of the data parts compactly using a single `znode`. If the table contains many columns, this storage method significantly reduces the volume of the data stored in Zookeeper.
 
 !!! attention "Attention"
-    After applying `use_minimalistic_part_header_in_zookeeper = 1`, you can’t downgrade the ClickHouse server to a version that doesn’t support this setting. Be careful when upgrading ClickHouse on servers in a cluster. Don’t upgrade all the servers at once. It is safer to test new versions of ClickHouse in a test environment, or on just a few servers of a cluster.
+    After applying `use_minimalistic_part_header_in_zookeeper = 1`, you can’t downgrade the ClickHouse server to a version that does not support this setting. Be careful when upgrading ClickHouse on servers in a cluster. Don’t upgrade all the servers at once. It is safer to test new versions of ClickHouse in a test environment, or on just a few servers of a cluster.
 
       Data part headers already stored with this setting can't be restored to their previous (non-compact) representation.
 
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 77b68715ba9..10ea46098d4 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -56,6 +56,26 @@ Default value: 150.
 
 ClickHouse artificially executes `INSERT` longer (adds ‘sleep’) so that the background merge process can merge parts faster than they are added.
 
+## inactive_parts_to_throw_insert {#inactive-parts-to-throw-insert}
+
+If the number of inactive parts in a single partition more than the `inactive_parts_to_throw_insert` value, `INSERT` is interrupted with the "Too many inactive parts (N). Parts cleaning are processing significantly slower than inserts" exception.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 0 (unlimited).
+
+## inactive_parts_to_delay_insert {#inactive-parts-to-delay-insert}
+
+If the number of inactive parts in a single partition in the table at least that many the `inactive_parts_to_delay_insert` value, an `INSERT` artificially slows down. It is useful when a server fails to clean up parts quickly enough.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 0 (unlimited).
+
 ## max_delay_to_insert {#max-delay-to-insert}
 
 The value in seconds, which is used to calculate the `INSERT` delay, if the number of active parts in a single partition exceeds the [parts_to_delay_insert](#parts-to-delay-insert) value.
@@ -115,6 +135,39 @@ Default value: 604800 (1 week).
 
 Similar to [replicated_deduplication_window](#replicated-deduplication-window), `replicated_deduplication_window_seconds` specifies how long to store hash sums of blocks for insert deduplication. Hash sums older than `replicated_deduplication_window_seconds` are removed from Zookeeper, even if they are less than ` replicated_deduplication_window`.
 
+## replicated_fetches_http_connection_timeout {#replicated_fetches_http_connection_timeout}
+
+HTTP connection timeout (in seconds) for part fetch requests. Inherited from default profile [http_connection_timeout](./settings.md#http_connection_timeout) if not set explicitly.
+
+Possible values:
+
+-   Any positive integer.
+-   0 - Use value of `http_connection_timeout`.
+
+Default value: 0.
+
+## replicated_fetches_http_send_timeout {#replicated_fetches_http_send_timeout}
+
+HTTP send timeout (in seconds) for part fetch requests. Inherited from default profile [http_send_timeout](./settings.md#http_send_timeout) if not set explicitly.
+
+Possible values:
+
+-   Any positive integer.
+-   0 - Use value of `http_send_timeout`.
+
+Default value: 0.
+
+## replicated_fetches_http_receive_timeout {#replicated_fetches_http_receive_timeout}
+
+HTTP receive timeout (in seconds) for fetch part requests. Inherited from default profile [http_receive_timeout](./settings.md#http_receive_timeout) if not set explicitly.
+
+Possible values:
+
+-   Any positive integer.
+-   0 - Use value of `http_receive_timeout`.
+
+Default value: 0.
+
 ## old_parts_lifetime {#old-parts-lifetime}
 
 The time (in seconds) of storing inactive parts to protect against data loss during spontaneous server reboots.
@@ -198,4 +251,15 @@ Possible values:
 
 Default value: -1 (unlimited).
 
+## allow_floating_point_partition_key {#allow_floating_point_partition_key}
+
+Enables to allow floating-point number as a partition key.
+
+Possible values:
+
+-   0 — Floating-point partition key not allowed.
+-   1 — Floating-point partition key allowed.
+
+Default value: `0`.
+
 [Original article](https://clickhouse.tech/docs/en/operations/settings/merge_tree_settings/) <!--hide-->
diff --git a/docs/en/operations/settings/query-complexity.md b/docs/en/operations/settings/query-complexity.md
index 2ecf50762d5..d60aa170907 100644
--- a/docs/en/operations/settings/query-complexity.md
+++ b/docs/en/operations/settings/query-complexity.md
@@ -19,7 +19,7 @@ It can take one of two values: `throw` or `break`. Restrictions on aggregation (
 
 `break` – Stop executing the query and return the partial result, as if the source data ran out.
 
-`any (only for group_by_overflow_mode)` – Continuing aggregation for the keys that got into the set, but don’t add new keys to the set.
+`any (only for group_by_overflow_mode)` – Continuing aggregation for the keys that got into the set, but do not add new keys to the set.
 
 ## max_memory_usage {#settings_max_memory_usage}
 
@@ -27,7 +27,7 @@ The maximum amount of RAM to use for running a query on a single server.
 
 In the default configuration file, the maximum is 10 GB.
 
-The setting doesn’t consider the volume of available memory or the total volume of memory on the machine.
+The setting does not consider the volume of available memory or the total volume of memory on the machine.
 The restriction applies to a single query within a single server.
 You can use `SHOW PROCESSLIST` to see the current memory consumption for each query.
 Besides, the peak memory consumption is tracked for each query and written to the log.
@@ -288,7 +288,7 @@ Defines what action ClickHouse performs when any of the following join limits is
 Possible values:
 
 -   `THROW` — ClickHouse throws an exception and breaks operation.
--   `BREAK` — ClickHouse breaks operation and doesn’t throw an exception.
+-   `BREAK` — ClickHouse breaks operation and does not throw an exception.
 
 Default value: `THROW`.
 
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index a5c3902f8f2..10461eacbff 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -143,6 +143,16 @@ Possible values:
 
 Default value: 0.
 
+## http_max_uri_size {#http-max-uri-size}
+
+Sets the maximum URI length of an HTTP request.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: 1048576.
+
 ## send_progress_in_http_headers {#settings-send_progress_in_http_headers}
 
 Enables or disables `X-ClickHouse-Progress` HTTP response headers in `clickhouse-server` responses.
@@ -355,13 +365,37 @@ throws an exception.
 
 ## input_format_null_as_default {#settings-input-format-null-as-default}
 
-Enables or disables using default values if input data contain `NULL`, but the data type of the corresponding column in not `Nullable(T)` (for text input formats).
+Enables or disables the initialization of [NULL](../../sql-reference/syntax.md#null-literal) fields with [default values](../../sql-reference/statements/create/table.md#create-default-values), if data type of these fields is not [nullable](../../sql-reference/data-types/nullable.md#data_type-nullable).
+If column type is not nullable and this setting is disabled, then inserting `NULL` causes an exception. If column type is nullable, then `NULL` values are inserted as is, regardless of this setting.
+
+This setting is applicable to [INSERT ... VALUES](../../sql-reference/statements/insert-into.md) queries for text input formats.
+
+Possible values:
+
+-   0 — Inserting `NULL` into a not nullable column causes an exception.
+-   1 — `NULL` fields are initialized with default column values.
+
+Default value: `1`.
+
+## insert_null_as_default {#insert_null_as_default}
+
+Enables or disables the insertion of [default values](../../sql-reference/statements/create/table.md#create-default-values) instead of [NULL](../../sql-reference/syntax.md#null-literal) into columns with not [nullable](../../sql-reference/data-types/nullable.md#data_type-nullable) data type. 
+If column type is not nullable and this setting is disabled, then inserting `NULL` causes an exception. If column type is nullable, then `NULL` values are inserted as is, regardless of this setting.
+
+This setting is applicable to [INSERT ... SELECT](../../sql-reference/statements/insert-into.md#insert_query_insert-select) queries. Note that `SELECT` subqueries may be concatenated with `UNION ALL` clause.
+
+Possible values:
+
+-   0 — Inserting `NULL` into a not nullable column causes an exception.
+-   1 — Default column value is inserted instead of `NULL`.
+
+Default value: `1`.
 
 ## input_format_skip_unknown_fields {#settings-input-format-skip-unknown-fields}
 
 Enables or disables skipping insertion of extra data.
 
-When writing data, ClickHouse throws an exception if input data contain columns that do not exist in the target table. If skipping is enabled, ClickHouse doesn’t insert extra data and doesn’t throw an exception.
+When writing data, ClickHouse throws an exception if input data contain columns that do not exist in the target table. If skipping is enabled, ClickHouse does not insert extra data and does not throw an exception.
 
 Supported formats:
 
@@ -418,7 +452,7 @@ Default value: 1.
 
 Allows choosing a parser of the text representation of date and time.
 
-The setting doesn’t apply to [date and time functions](../../sql-reference/functions/date-time-functions.md).
+The setting does not apply to [date and time functions](../../sql-reference/functions/date-time-functions.md).
 
 Possible values:
 
@@ -445,15 +479,15 @@ Possible values:
 
 -   `simple` - Simple output format.
 
-    Clickhouse output date and time `YYYY-MM-DD hh:mm:ss` format. For example, `2019-08-20 10:18:56`. The calculation is performed according to the data type's time zone (if present) or server time zone.
+    ClickHouse output date and time `YYYY-MM-DD hh:mm:ss` format. For example, `2019-08-20 10:18:56`. The calculation is performed according to the data type's time zone (if present) or server time zone.
 
 -   `iso` - ISO output format.
 
-    Clickhouse output date and time in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ` format. For example, `2019-08-20T10:18:56Z`. Note that output is in UTC (`Z` means UTC).
+    ClickHouse output date and time in [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) `YYYY-MM-DDThh:mm:ssZ` format. For example, `2019-08-20T10:18:56Z`. Note that output is in UTC (`Z` means UTC).
 
 -   `unix_timestamp` - Unix timestamp output format.
 
-    Clickhouse output date and time in [Unix timestamp](https://en.wikipedia.org/wiki/Unix_time) format. For example `1566285536`.
+    ClickHouse output date and time in [Unix timestamp](https://en.wikipedia.org/wiki/Unix_time) format. For example `1566285536`.
 
 Default value: `simple`.
 
@@ -652,7 +686,7 @@ Default value: 8.
 
 ## merge_tree_max_rows_to_use_cache {#setting-merge-tree-max-rows-to-use-cache}
 
-If ClickHouse should read more than `merge_tree_max_rows_to_use_cache` rows in one query, it doesn’t use the cache of uncompressed blocks.
+If ClickHouse should read more than `merge_tree_max_rows_to_use_cache` rows in one query, it does not use the cache of uncompressed blocks.
 
 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.
 
@@ -664,7 +698,7 @@ Default value: 128 ✕ 8192.
 
 ## merge_tree_max_bytes_to_use_cache {#setting-merge-tree-max-bytes-to-use-cache}
 
-If ClickHouse should read more than `merge_tree_max_bytes_to_use_cache` bytes in one query, it doesn’t use the cache of uncompressed blocks.
+If ClickHouse should read more than `merge_tree_max_bytes_to_use_cache` bytes in one query, it does not use the cache of uncompressed blocks.
 
 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.
 
@@ -806,8 +840,8 @@ Result:
 The size of blocks (in a count of rows) to form for insertion into a table.
 This setting only applies in cases when the server forms the blocks.
 For example, for an INSERT via the HTTP interface, the server parses the data format and forms blocks of the specified size.
-But when using clickhouse-client, the client parses the data itself, and the ‘max_insert_block_size’ setting on the server doesn’t affect the size of the inserted blocks.
-The setting also doesn’t have a purpose when using INSERT SELECT, since data is inserted using the same blocks that are formed after SELECT.
+But when using clickhouse-client, the client parses the data itself, and the ‘max_insert_block_size’ setting on the server does not affect the size of the inserted blocks.
+The setting also does not have a purpose when using INSERT SELECT, since data is inserted using the same blocks that are formed after SELECT.
 
 Default value: 1,048,576.
 
@@ -854,8 +888,6 @@ For example, when reading from a table, if it is possible to evaluate expression
 
 Default value: the number of physical CPU cores.
 
-If less than one SELECT query is normally run on a server at a time, set this parameter to a value slightly less than the actual number of processor cores.
-
 For queries that are completed quickly because of a LIMIT, you can set a lower ‘max_threads’. For example, if the necessary number of entries are located in every block and max_threads = 8, then 8 blocks are retrieved, although it would have been enough to read just one.
 
 The smaller the `max_threads` value, the less memory is consumed.
@@ -879,7 +911,7 @@ Higher values will lead to higher memory usage.
 The maximum size of blocks of uncompressed data before compressing for writing to a table. By default, 1,048,576 (1 MiB). Specifying smaller block size generally leads to slightly reduced compression ratio, the compression and decompression speed increases slightly due to cache locality, and memory consumption is reduced.
 
 !!! note "Warning"
-    This is an expert-level setting, and you shouldn't change it if you're just getting started with Clickhouse.
+    This is an expert-level setting, and you shouldn't change it if you're just getting started with ClickHouse.
 
 Don’t confuse blocks for compression (a chunk of memory consisting of bytes) with blocks for query processing (a set of rows from a table).
 
@@ -896,7 +928,7 @@ We are writing a UInt32-type column (4 bytes per value). When writing 8192 rows,
 We are writing a URL column with the String type (average size of 60 bytes per value). When writing 8192 rows, the average will be slightly less than 500 KB of data. Since this is more than 65,536, a compressed block will be formed for each mark. In this case, when reading data from the disk in the range of a single mark, extra data won’t be decompressed.
 
 !!! note "Warning"
-    This is an expert-level setting, and you shouldn't change it if you're just getting started with Clickhouse.
+    This is an expert-level setting, and you shouldn't change it if you're just getting started with ClickHouse.
 
 ## max_query_size {#settings-max_query_size}
 
@@ -1010,7 +1042,7 @@ For queries that read at least a somewhat large volume of data (one million rows
 When using the HTTP interface, the ‘query_id’ parameter can be passed. This is any string that serves as the query identifier.
 If a query from the same user with the same ‘query_id’ already exists at this time, the behaviour depends on the ‘replace_running_query’ parameter.
 
-`0` (default) – Throw an exception (don’t allow the query to run if a query with the same ‘query_id’ is already running).
+`0` (default) – Throw an exception (do not allow the query to run if a query with the same ‘query_id’ is already running).
 
 `1` – Cancel the old query and start running the new one.
 
@@ -1069,7 +1101,7 @@ load_balancing = nearest_hostname
 The number of errors is counted for each replica. Every 5 minutes, the number of errors is integrally divided by 2. Thus, the number of errors is calculated for a recent time with exponential smoothing. If there is one replica with a minimal number of errors (i.e. errors occurred recently on the other replicas), the query is sent to it. If there are multiple replicas with the same minimal number of errors, the query is sent to the replica with a hostname that is most similar to the server’s hostname in the config file (for the number of different characters in identical positions, up to the minimum length of both hostnames).
 
 For instance, example01-01-1 and example01-01-2.yandex.ru are different in one position, while example01-01-1 and example01-02-2 differ in two places.
-This method might seem primitive, but it doesn’t require external data about network topology, and it doesn’t compare IP addresses, which would be complicated for our IPv6 addresses.
+This method might seem primitive, but it does not require external data about network topology, and it does not compare IP addresses, which would be complicated for our IPv6 addresses.
 
 Thus, if there are equivalent replicas, the closest one by name is preferred.
 We can also assume that when sending a query to the same server, in the absence of failures, a distributed query will also go to the same servers. So even if different data is placed on the replicas, the query will return mostly the same results.
@@ -1141,7 +1173,7 @@ Default value: `1`.
 
 This setting is useful for replicated tables with a sampling key. A query may be processed faster if it is executed on several servers in parallel. But the query performance may degrade in the following cases:
 
-- The position of the sampling key in the partitioning key doesn't allow efficient range scans.
+- The position of the sampling key in the partitioning key does not allow efficient range scans.
 - Adding a sampling key to the table makes filtering by other columns less efficient.
 - The sampling key is an expression that is expensive to calculate.
 - The cluster latency distribution has a long tail, so that querying more servers increases the query overall latency.
@@ -1163,7 +1195,7 @@ For testing, the value can be set to 0: compilation runs synchronously and the q
 If the value is 1 or more, compilation occurs asynchronously in a separate thread. The result will be used as soon as it is ready, including queries that are currently running.
 
 Compiled code is required for each different combination of aggregate functions used in the query and the type of keys in the GROUP BY clause.
-The results of the compilation are saved in the build directory in the form of .so files. There is no restriction on the number of compilation results since they don’t use very much space. Old results will be used after server restarts, except in the case of a server upgrade – in this case, the old results are deleted.
+The results of the compilation are saved in the build directory in the form of .so files. There is no restriction on the number of compilation results since they do not use very much space. Old results will be used after server restarts, except in the case of a server upgrade – in this case, the old results are deleted.
 
 ## output_format_json_quote_64bit_integers {#session_settings-output_format_json_quote_64bit_integers}
 
@@ -1497,7 +1529,7 @@ Possible values:
 
 -   1 — skipping enabled.
 
-    If a shard is unavailable, ClickHouse returns a result based on partial data and doesn’t report node availability issues.
+    If a shard is unavailable, ClickHouse returns a result based on partial data and does not report node availability issues.
 
 -   0 — skipping disabled.
 
@@ -1512,8 +1544,8 @@ 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).
--   2 - Same as 1 but apply `ORDER BY` and `LIMIT` on the initiator (can be used for queries with `ORDER BY` and/or `LIMIT`).
+-   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 possilbe 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`).
 
 **Example**
 
@@ -1565,6 +1597,17 @@ Possible values:
 
 Default value: 0
 
+## optimize_skip_unused_shards_rewrite_in {#optimize-skip-unused-shardslrewrite-in}
+
+Rewrite IN in query for remote shards to exclude values that does not belong to the shard (requires optimize_skip_unused_shards).
+
+Possible values:
+
+-   0 — Disabled.
+-   1 — Enabled.
+
+Default value: 1 (since it requires `optimize_skip_unused_shards` anyway, which `0` by default)
+
 ## allow_nondeterministic_optimize_skip_unused_shards {#allow-nondeterministic-optimize-skip-unused-shards}
 
 Allow nondeterministic (like `rand` or `dictGet`, since later has some caveats with updates) functions in sharding key.
@@ -1594,7 +1637,7 @@ Enables or disables query execution if [optimize_skip_unused_shards](#optimize-s
 
 Possible values:
 
--   0 — Disabled. ClickHouse doesn’t throw an exception.
+-   0 — Disabled. ClickHouse does not throw an exception.
 -   1 — Enabled. Query execution is disabled only if the table has a sharding key.
 -   2 — Enabled. Query execution is disabled regardless of whether a sharding key is defined for the table.
 
@@ -1739,7 +1782,7 @@ Default value: 0.
 Sets the priority ([nice](https://en.wikipedia.org/wiki/Nice_(Unix))) for threads that execute queries. The OS scheduler considers this priority when choosing the next thread to run on each available CPU core.
 
 !!! warning "Warning"
-    To use this setting, you need to set the `CAP_SYS_NICE` capability. The `clickhouse-server` package sets it up during installation. Some virtual environments don’t allow you to set the `CAP_SYS_NICE` capability. In this case, `clickhouse-server` shows a message about it at the start.
+    To use this setting, you need to set the `CAP_SYS_NICE` capability. The `clickhouse-server` package sets it up during installation. Some virtual environments do not allow you to set the `CAP_SYS_NICE` capability. In this case, `clickhouse-server` shows a message about it at the start.
 
 Possible values:
 
@@ -2015,6 +2058,16 @@ Possible values:
 
 Default value: 16.
 
+## background_fetches_pool_size {#background_fetches_pool_size}
+
+Sets the number of threads performing background fetches for [replicated](../../engines/table-engines/mergetree-family/replication.md) tables. This setting is applied at the ClickHouse server start and can’t be changed in a user session. For production usage with frequent small insertions or slow ZooKeeper cluster is recomended to use default value.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: 8.
+
 ## always_fetch_merged_part {#always_fetch_merged_part}
 
 Prohibits data parts merging in [Replicated\*MergeTree](../../engines/table-engines/mergetree-family/replication.md)-engine tables.
@@ -2024,7 +2077,7 @@ When merging is prohibited, the replica never merges parts and always downloads
 Possible values:
 
 -   0 — `Replicated*MergeTree`-engine tables merge data parts at the replica.
--   1 — `Replicated*MergeTree`-engine tables don’t merge data parts at the replica. The tables download merged data parts from other replicas.
+-   1 — `Replicated*MergeTree`-engine tables do not merge data parts at the replica. The tables download merged data parts from other replicas.
 
 Default value: 0.
 
@@ -2155,7 +2208,7 @@ Allows or restricts using the [LowCardinality](../../sql-reference/data-types/lo
 
 If usage of `LowCardinality` is restricted, ClickHouse server converts `LowCardinality`-columns to ordinary ones for `SELECT` queries, and convert ordinary columns to `LowCardinality`-columns for `INSERT` queries.
 
-This setting is required mainly for third-party clients which don’t support `LowCardinality` data type.
+This setting is required mainly for third-party clients which do not support `LowCardinality` data type.
 
 Possible values:
 
@@ -2643,7 +2696,7 @@ Possible values:
 
 -   `'DISTINCT'` — ClickHouse outputs rows as a result of combining queries removing duplicate rows.
 -   `'ALL'` — ClickHouse outputs all rows as a result of combining queries including duplicate rows.
--   `''` — Clickhouse generates an exception when used with `UNION`.
+-   `''` — ClickHouse generates an exception when used with `UNION`.
 
 Default value: `''`.
 
@@ -2787,6 +2840,28 @@ Possible values:
 
 Default value: `0`.
 
+## database_atomic_wait_for_drop_and_detach_synchronously {#database_atomic_wait_for_drop_and_detach_synchronously}
+
+Adds a modifier `SYNC` to all `DROP` and `DETACH` queries. 
+
+Possible values:
+
+-   0 — Queries will be executed with delay.
+-   1 — Queries will be executed without delay.
+
+Default value: `0`.
+
+## show_table_uuid_in_table_create_query_if_not_nil {#show_table_uuid_in_table_create_query_if_not_nil}
+
+Sets the `SHOW TABLE` query display.
+
+Possible values:
+
+-   0 — The query will be displayed without table UUID.
+-   1 — The query will be displayed with table UUID.
+
+Default value: `0`.
+
 ## allow_experimental_live_view {#allow-experimental-live-view}
 
 Allows creation of experimental [live views](../../sql-reference/statements/create/view.md#live-view).
@@ -2822,4 +2897,172 @@ Sets the interval in seconds after which periodically refreshed [live view](../.
 
 Default value: `60`.
 
+## http_connection_timeout {#http_connection_timeout}
+
+HTTP connection timeout (in seconds).
+
+Possible values:
+
+-   Any positive integer.
+-   0 - Disabled (infinite timeout).
+
+Default value: 1.
+
+## http_send_timeout {#http_send_timeout}
+
+HTTP send timeout (in seconds).
+
+Possible values:
+
+-   Any positive integer.
+-   0 - Disabled (infinite timeout).
+
+Default value: 1800.
+
+## http_receive_timeout {#http_receive_timeout}
+
+HTTP receive timeout (in seconds).
+
+Possible values:
+
+-   Any positive integer.
+-   0 - Disabled (infinite timeout).
+
+Default value: 1800.
+
+## check_query_single_value_result {#check_query_single_value_result}
+
+Defines the level of detail for the [CHECK TABLE](../../sql-reference/statements/check-table.md#checking-mergetree-tables) query result for `MergeTree` family engines .
+
+Possible values:
+
+-   0 — the query shows a check status for every individual data part of a table.
+-   1 — the query shows the general table check status.
+
+Default value: `0`.
+
+## prefer_column_name_to_alias {#prefer-column-name-to-alias}
+
+Enables or disables using the original column names instead of aliases in query expressions and clauses. It especially matters when alias is the same as the column name, see [Expression Aliases](../../sql-reference/syntax.md#notes-on-usage). Enable this setting to make aliases syntax rules in ClickHouse more compatible with most other database engines.
+
+Possible values:
+
+- 0 — The column name is substituted with the alias.
+- 1 — The column name is not substituted with the alias. 
+
+Default value: `0`.
+
+**Example**
+
+The difference between enabled and disabled:
+
+Query:
+
+```sql
+SET prefer_column_name_to_alias = 0;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Result:
+
+```text
+Received exception from server (version 21.5.1):
+Code: 184. DB::Exception: Received from localhost:9000. DB::Exception: Aggregate function avg(number) is found inside another aggregate function in query: While processing avg(number) AS number.
+```
+
+Query:
+
+```sql
+SET prefer_column_name_to_alias = 1;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Result:
+
+```text
+┌─number─┬─max(number)─┐
+│    4.5 │           9 │
+└────────┴─────────────┘
+```
+
+## limit {#limit}
+
+Sets the maximum number of rows to get from the query result. It adjusts the value set by the [LIMIT](../../sql-reference/statements/select/limit.md#limit-clause) clause, so that the limit, specified in the query, cannot exceed the limit, set by this setting.
+
+Possible values:
+
+-   0 — The number of rows is not limited.
+-   Positive integer.
+
+Default value: `0`.
+
+## offset {#offset}
+
+Sets the number of rows to skip before starting to return rows from the query. It adjusts the offset set by the [OFFSET](../../sql-reference/statements/select/offset.md#offset-fetch) clause, so that these two values are summarized.
+
+Possible values:
+
+-   0 — No rows are skipped .
+-   Positive integer.
+
+Default value: `0`.
+
+**Example**
+
+Input table:
+
+``` sql
+CREATE TABLE test (i UInt64) ENGINE = MergeTree() ORDER BY i;
+INSERT INTO test SELECT number FROM numbers(500);
+```
+
+Query:
+
+``` sql
+SET limit = 5;
+SET offset = 7;
+SELECT * FROM test LIMIT 10 OFFSET 100;
+```
+Result:
+
+``` text
+┌───i─┐
+│ 107 │
+│ 108 │
+│ 109 │
+└─────┘
+```
+
+## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+
+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).
+
+Possible values:
+
+-   0 — Functions with identical argument are not fused.
+-   1 — Functions with identical argument are fused.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
+SET optimize_fuse_sum_count_avg = 1;
+EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
+```
+
+Result:
+
+``` text
+SELECT
+    sum(a),
+    sumCount(b).1,
+    sumCount(b).2,
+    (sumCount(b).1) / (sumCount(b).2)    
+FROM fuse_tbl
+```
+
 [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/en/operations/system-tables/clusters.md b/docs/en/operations/system-tables/clusters.md
index cba52586e93..096eca12e7d 100644
--- a/docs/en/operations/system-tables/clusters.md
+++ b/docs/en/operations/system-tables/clusters.md
@@ -4,63 +4,68 @@ Contains information about clusters available in the config file and the servers
 
 Columns:
 
--   `cluster` (String) — The cluster name.
--   `shard_num` (UInt32) — The shard number in the cluster, starting from 1.
--   `shard_weight` (UInt32) — The relative weight of the shard when writing data.
--   `replica_num` (UInt32) — The replica number in the shard, starting from 1.
--   `host_name` (String) — The host name, as specified in the config.
--   `host_address` (String) — The host IP address obtained from DNS.
--   `port` (UInt16) — The port to use for connecting to the server.
--   `user` (String) — The name of the user for connecting to the server.
--   `errors_count` (UInt32) - number of times this host failed to reach replica.
--   `estimated_recovery_time` (UInt32) - seconds left until replica error count is zeroed and it is considered to be back to normal.
+-   `cluster` ([String](../../sql-reference/data-types/string.md)) — The cluster name.
+-   `shard_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The shard number in the cluster, starting from 1.
+-   `shard_weight` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The relative weight of the shard when writing data.
+-   `replica_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The replica number in the shard, starting from 1.
+-   `host_name` ([String](../../sql-reference/data-types/string.md)) — The host name, as specified in the config.
+-   `host_address` ([String](../../sql-reference/data-types/string.md)) — The host IP address obtained from DNS.
+-   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The port to use for connecting to the server.
+-   `is_local` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the host is local.
+-   `user` ([String](../../sql-reference/data-types/string.md)) — The name of the user for connecting to the server.
+-   `default_database` ([String](../../sql-reference/data-types/string.md)) — The default database name.
+-   `errors_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of times this host failed to reach replica.
+-   `slowdowns_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of slowdowns that led to changing replica when establishing a connection with hedged requests.
+-   `estimated_recovery_time` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Seconds remaining until the replica error count is zeroed and it is considered to be back to normal.
 
-Please note that `errors_count` is updated once per query to the cluster, but `estimated_recovery_time` is recalculated on-demand. So there could be a case of non-zero `errors_count` and zero `estimated_recovery_time`, that next query will zero `errors_count` and try to use replica as if it has no errors.
+**Example**
 
-**See also**
+Query:
+
+```sql
+SELECT * FROM system.clusters LIMIT 2 FORMAT Vertical;
+```
+
+Result:
+
+```text
+Row 1:
+──────
+cluster:                 test_cluster_two_shards
+shard_num:               1
+shard_weight:            1
+replica_num:             1
+host_name:               127.0.0.1
+host_address:            127.0.0.1
+port:                    9000
+is_local:                1
+user:                    default
+default_database:
+errors_count:            0
+slowdowns_count:         0
+estimated_recovery_time: 0
+
+Row 2:
+──────
+cluster:                 test_cluster_two_shards
+shard_num:               2
+shard_weight:            1
+replica_num:             1
+host_name:               127.0.0.2
+host_address:            127.0.0.2
+port:                    9000
+is_local:                0
+user:                    default
+default_database:
+errors_count:            0
+slowdowns_count:         0
+estimated_recovery_time: 0
+```
+
+**See Also**
 
 -   [Table engine Distributed](../../engines/table-engines/special/distributed.md)
 -   [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)
 
-**Example**
-
-```sql
-:) SELECT * FROM system.clusters LIMIT 2 FORMAT Vertical;
-```
-
-```text
-Row 1:
-──────
-cluster:                 test_cluster
-shard_num:               1
-shard_weight:            1
-replica_num:             1
-host_name:               clickhouse01
-host_address:            172.23.0.11
-port:                    9000
-is_local:                1
-user:                    default
-default_database:        
-errors_count:            0
-estimated_recovery_time: 0
-
-Row 2:
-──────
-cluster:                 test_cluster
-shard_num:               1
-shard_weight:            1
-replica_num:             2
-host_name:               clickhouse02
-host_address:            172.23.0.12
-port:                    9000
-is_local:                0
-user:                    default
-default_database:        
-errors_count:            0
-estimated_recovery_time: 0
-
-2 rows in set. Elapsed: 0.002 sec. 
-```
-
 [Original article](https://clickhouse.tech/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 92a6315d06b..9160dca9a1a 100644
--- a/docs/en/operations/system-tables/columns.md
+++ b/docs/en/operations/system-tables/columns.md
@@ -4,7 +4,9 @@ Contains information about columns in all the tables.
 
 You can use this table to get information similar to the [DESCRIBE TABLE](../../sql-reference/statements/misc.md#misc-describe-table) query, but for multiple tables at once.
 
-The `system.columns` table contains the following columns (the column type is shown in brackets):
+Columns from [temporary tables](../../sql-reference/statements/create/table.md#temporary-tables) are visible in the `system.columns` only in those session where they have been created. They are shown with the empty `database` field. 
+
+Columns:
 
 -   `database` ([String](../../sql-reference/data-types/string.md)) — Database name.
 -   `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
@@ -26,7 +28,7 @@ The `system.columns` table contains the following columns (the column type is sh
 **Example**
 
 ```sql
-:) select * from system.columns LIMIT 2 FORMAT Vertical;
+SELECT * FROM system.columns LIMIT 2 FORMAT Vertical;
 ```
 
 ```text
@@ -65,8 +67,6 @@ is_in_sorting_key:       0
 is_in_primary_key:       0
 is_in_sampling_key:      0
 compression_codec:       
-
-2 rows in set. Elapsed: 0.002 sec. 
 ```
 
 [Original article](https://clickhouse.tech/docs/en/operations/system_tables/columns) <!--hide-->
diff --git a/docs/en/operations/system-tables/dictionaries.md b/docs/en/operations/system-tables/dictionaries.md
index 3d3bbe2af4e..2bc1be51f19 100644
--- a/docs/en/operations/system-tables/dictionaries.md
+++ b/docs/en/operations/system-tables/dictionaries.md
@@ -21,6 +21,7 @@ Columns:
 -   `bytes_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Amount of RAM allocated for the dictionary.
 -   `query_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of queries since the dictionary was loaded or since the last successful reboot.
 -   `hit_rate` ([Float64](../../sql-reference/data-types/float.md)) — For cache dictionaries, the percentage of uses for which the value was in the cache.
+-   `found_rate` ([Float64](../../sql-reference/data-types/float.md)) — The percentage of uses for which the value was found.
 -   `element_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of items stored in the dictionary.
 -   `load_factor` ([Float64](../../sql-reference/data-types/float.md)) — Percentage filled in the dictionary (for a hashed dictionary, the percentage filled in the hash table).
 -   `source` ([String](../../sql-reference/data-types/string.md)) — Text describing the [data source](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) for the dictionary.
@@ -60,4 +61,4 @@ SELECT * FROM system.dictionaries
 └──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/dictionaries) <!--hide-->
\ No newline at end of file
+[Original article](https://clickhouse.tech/docs/en/operations/system_tables/dictionaries) <!--hide-->
diff --git a/docs/en/operations/system-tables/distribution_queue.md b/docs/en/operations/system-tables/distribution_queue.md
index fdc6a134da2..3b09c20874c 100644
--- a/docs/en/operations/system-tables/distribution_queue.md
+++ b/docs/en/operations/system-tables/distribution_queue.md
@@ -18,6 +18,10 @@ Columns:
 
 -   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in local files, in bytes.
 
+-   `broken_data_files` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Number of files that has been marked as broken (due to an error).
+
+-   `broken_data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Size of compressed data in broken files, in bytes.
+
 -   `last_exception` ([String](../../sql-reference/data-types/string.md)) — Text message about the last error that occurred (if any).
 
 **Example**
diff --git a/docs/en/operations/system-tables/index.md b/docs/en/operations/system-tables/index.md
index e66f082167e..ab3ba25493a 100644
--- a/docs/en/operations/system-tables/index.md
+++ b/docs/en/operations/system-tables/index.md
@@ -59,7 +59,7 @@ For collecting system metrics ClickHouse server uses:
 
 **procfs**
 
-If ClickHouse server doesn’t have `CAP_NET_ADMIN` capability, it tries to fall back to `ProcfsMetricsProvider`. `ProcfsMetricsProvider` allows collecting per-query system metrics (for CPU and I/O).
+If ClickHouse server does not have `CAP_NET_ADMIN` capability, it tries to fall back to `ProcfsMetricsProvider`. `ProcfsMetricsProvider` allows collecting per-query system metrics (for CPU and I/O).
 
 If procfs is supported and enabled on the system, ClickHouse server collects these metrics:
 
diff --git a/docs/en/operations/system-tables/one.md b/docs/en/operations/system-tables/one.md
index a85e01bc75a..51316dfbc44 100644
--- a/docs/en/operations/system-tables/one.md
+++ b/docs/en/operations/system-tables/one.md
@@ -2,7 +2,7 @@
 
 This table contains a single row with a single `dummy` UInt8 column containing the value 0.
 
-This table is used if a `SELECT` query doesn’t specify the `FROM` clause.
+This table is used if a `SELECT` query does not specify the `FROM` clause.
 
 This is similar to the `DUAL` table found in other DBMSs.
 
diff --git a/docs/en/operations/system-tables/parts.md b/docs/en/operations/system-tables/parts.md
index f02d1ebc114..5a4715a4513 100644
--- a/docs/en/operations/system-tables/parts.md
+++ b/docs/en/operations/system-tables/parts.md
@@ -26,7 +26,7 @@ Columns:
 
    -   `active` ([UInt8](../../sql-reference/data-types/int-uint.md)) – Flag that indicates whether the data part is active. If a data part is active, it’s used in a table. Otherwise, it’s deleted. Inactive data parts remain after merging.
 
--   `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint doesn’t work for adaptive granularity).
+-   `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint does not work for adaptive granularity).
 
 -   `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The number of rows.
 
@@ -66,7 +66,7 @@ Columns:
 
 -   `primary_key_bytes_in_memory_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The amount of memory (in bytes) reserved for primary key values.
 
--   `is_frozen` ([UInt8](../../sql-reference/data-types/int-uint.md)) – Flag that shows that a partition data backup exists. 1, the backup exists. 0, the backup doesn’t exist. For more details, see [FREEZE PARTITION](../../sql-reference/statements/alter/partition.md#alter_freeze-partition)
+-   `is_frozen` ([UInt8](../../sql-reference/data-types/int-uint.md)) – Flag that shows that a partition data backup exists. 1, the backup exists. 0, the backup does not exist. For more details, see [FREEZE PARTITION](../../sql-reference/statements/alter/partition.md#alter_freeze-partition)
 
 -   `database` ([String](../../sql-reference/data-types/string.md)) – Name of the database.
 
diff --git a/docs/en/operations/system-tables/parts_columns.md b/docs/en/operations/system-tables/parts_columns.md
index 5c3dd7155f7..293abb18a50 100644
--- a/docs/en/operations/system-tables/parts_columns.md
+++ b/docs/en/operations/system-tables/parts_columns.md
@@ -26,7 +26,7 @@ Columns:
 
 -   `active` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Flag that indicates whether the data part is active. If a data part is active, it’s used in a table. Otherwise, it’s deleted. Inactive data parts remain after merging.
 
--   `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint doesn’t work for adaptive granularity).
+-   `marks` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of marks. To get the approximate number of rows in a data part, multiply `marks` by the index granularity (usually 8192) (this hint does not work for adaptive granularity).
 
 -   `rows` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of rows.
 
diff --git a/docs/en/operations/system-tables/processes.md b/docs/en/operations/system-tables/processes.md
index a379fc4a07a..9ef3c648006 100644
--- a/docs/en/operations/system-tables/processes.md
+++ b/docs/en/operations/system-tables/processes.md
@@ -11,7 +11,7 @@ Columns:
 -   `bytes_read` (UInt64) – The number of uncompressed bytes read from the table. For distributed processing, on the requestor server, this is the total for all remote servers.
 -   `total_rows_approx` (UInt64) – The approximation of the total number of rows that should be read. For distributed processing, on the requestor server, this is the total for all remote servers. It can be updated during request processing, when new sources to process become known.
 -   `memory_usage` (UInt64) – Amount of RAM the request uses. It might not include some types of dedicated memory. See the [max_memory_usage](../../operations/settings/query-complexity.md#settings_max_memory_usage) setting.
--   `query` (String) – The query text. For `INSERT`, it doesn’t include the data to insert.
+-   `query` (String) – The query text. For `INSERT`, it does not include the data to insert.
 -   `query_id` (String) – Query ID, if defined.
 
 
diff --git a/docs/en/operations/system-tables/query_log.md b/docs/en/operations/system-tables/query_log.md
index 6cf87ee1f17..85f0679fe37 100644
--- a/docs/en/operations/system-tables/query_log.md
+++ b/docs/en/operations/system-tables/query_log.md
@@ -3,15 +3,15 @@
 Contains information about executed queries, for example, start time, duration of processing, error messages.
 
 !!! note "Note"
-    This table doesn’t contain the ingested data for `INSERT` queries.
+    This table does not contain the ingested data for `INSERT` queries.
 
 You can change settings of queries logging in the [query_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query-log) section of the server configuration.
 
-You can disable queries logging by setting [log_queries = 0](../../operations/settings/settings.md#settings-log-queries). We don’t recommend to turn off logging because information in this table is important for solving issues.
+You can disable queries logging by setting [log_queries = 0](../../operations/settings/settings.md#settings-log-queries). We do not recommend to turn off logging because information in this table is important for solving issues.
 
 The flushing period of data is set in `flush_interval_milliseconds` parameter of the [query_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query-log) server settings section. To force flushing, use the [SYSTEM FLUSH LOGS](../../sql-reference/statements/system.md#query_language-system-flush_logs) query.
 
-ClickHouse doesn’t delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
+ClickHouse does not delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
 
 The `system.query_log` table registers two kinds of queries:
 
@@ -37,8 +37,8 @@ Columns:
 -   `query_start_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Start time of query execution.
 -   `query_start_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — Start time of query execution with microsecond precision.
 -   `query_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of query execution in milliseconds.
--   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of rows read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_rows` includes the total number of rows read at all replicas. Each replica sends it’s `read_rows` value, and the server-initiator of the query summarizes all received and local values. The cache volumes don’t affect this value.
--   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of bytes read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_bytes` includes the total number of rows read at all replicas. Each replica sends it’s `read_bytes` value, and the server-initiator of the query summarizes all received and local values. The cache volumes don’t affect this value.
+-   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of rows read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_rows` includes the total number of rows read at all replicas. Each replica sends it’s `read_rows` value, and the server-initiator of the query summarizes all received and local values. The cache volumes do not affect this value.
+-   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Total number of bytes read from all tables and table functions participated in query. It includes usual subqueries, subqueries for `IN` and `JOIN`. For distributed queries `read_bytes` includes the total number of rows read at all replicas. Each replica sends it’s `read_bytes` value, and the server-initiator of the query summarizes all received and local values. The cache volumes do not affect this value.
 -   `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written rows. For other queries, the column value is 0.
 -   `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — For `INSERT` queries, the number of written bytes. For other queries, the column value is 0.
 -   `result_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of rows in a result of the `SELECT` query, or a number of rows in the `INSERT` query.
diff --git a/docs/en/operations/system-tables/query_thread_log.md b/docs/en/operations/system-tables/query_thread_log.md
index 0ae2e7d5d3b..296a33259b3 100644
--- a/docs/en/operations/system-tables/query_thread_log.md
+++ b/docs/en/operations/system-tables/query_thread_log.md
@@ -9,7 +9,7 @@ To start logging:
 
 The flushing period of data is set in `flush_interval_milliseconds` parameter of the [query_thread_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query_thread_log) server settings section. To force flushing, use the [SYSTEM FLUSH LOGS](../../sql-reference/statements/system.md#query_language-system-flush_logs) query.
 
-ClickHouse doesn’t delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
+ClickHouse does not delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
 
 Columns:
 
diff --git a/docs/en/operations/system-tables/replicas.md b/docs/en/operations/system-tables/replicas.md
index 8da68d2d2ab..63a2141e399 100644
--- a/docs/en/operations/system-tables/replicas.md
+++ b/docs/en/operations/system-tables/replicas.md
@@ -57,7 +57,7 @@ Columns:
     Note that writes can be performed to any replica that is available and has a session in ZK, regardless of whether it is a leader.
 -   `can_become_leader` (`UInt8`) - Whether the replica can be a leader.
 -   `is_readonly` (`UInt8`) - Whether the replica is in read-only mode.
-    This mode is turned on if the config doesn’t have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.
+    This mode is turned on if the config does not have sections with ZooKeeper, if an unknown error occurred when reinitializing sessions in ZooKeeper, and during session reinitialization in ZooKeeper.
 -   `is_session_expired` (`UInt8`) - the session with ZooKeeper has expired. Basically the same as `is_readonly`.
 -   `future_parts` (`UInt32`) - The number of data parts that will appear as the result of INSERTs or merges that haven’t been done yet.
 -   `parts_to_check` (`UInt32`) - The number of data parts in the queue for verification. A part is put in the verification queue if there is suspicion that it might be damaged.
@@ -84,7 +84,7 @@ The next 4 columns have a non-zero value only where there is an active session w
 -   `active_replicas` (`UInt8`) - The number of replicas of this table that have a session in ZooKeeper (i.e., the number of functioning replicas).
 
 If you request all the columns, the table may work a bit slowly, since several reads from ZooKeeper are made for each row.
-If you don’t request the last 4 columns (log_max_index, log_pointer, total_replicas, active_replicas), the table works quickly.
+If you do not request the last 4 columns (log_max_index, log_pointer, total_replicas, active_replicas), the table works quickly.
 
 For example, you can check that everything is working correctly like this:
 
@@ -118,7 +118,7 @@ WHERE
     OR active_replicas < total_replicas
 ```
 
-If this query doesn’t return anything, it means that everything is fine.
+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-->
 
diff --git a/docs/en/operations/system-tables/replication_queue.md b/docs/en/operations/system-tables/replication_queue.md
index f3e3a35f13b..965774b81bf 100644
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@@ -15,16 +15,16 @@ Columns:
 -   `node_name` ([String](../../sql-reference/data-types/string.md)) — Node name in ZooKeeper.
 
 -   `type` ([String](../../sql-reference/data-types/string.md)) — Type of the task in the queue, one of:
-    - `GET_PART`       - Get the part from another replica.
-    - `ATTACH_PART`    - Attach the part, possibly from our own replica (if found in `detached` folder). 
-    You may think of it as a `GET_PART` with some optimisations as they're nearly identical.
-    - `MERGE_PARTS`    - Merge the parts.
-    - `DROP_RANGE`     - Delete the parts in the specified partition in the specified number range.
-    - `CLEAR_COLUMN`   - NOTE: Deprecated. Drop specific column from specified partition.
-    - `CLEAR_INDEX`    - NOTE: Deprecated. Drop specific index from specified partition.
-    - `REPLACE_RANGE`  - Drop certain range of partitions and replace them by new ones
-    - `MUTATE_PART`    - Apply one or several mutations to the part.
-    - `ALTER_METADATA` - Apply alter modification according to global /metadata and /columns paths
+
+    -   `GET_PART` — Get the part from another replica.
+    -   `ATTACH_PART` — Attach the part, possibly from our own replica (if found in the `detached` folder). You may think of it as a `GET_PART` with some optimizations as they're nearly identical.
+    -   `MERGE_PARTS` — Merge the parts.
+    -   `DROP_RANGE` — Delete the parts in the specified partition in the specified number range.
+    -   `CLEAR_COLUMN` — NOTE: Deprecated. Drop specific column from specified partition.
+    -   `CLEAR_INDEX` — NOTE: Deprecated. Drop specific index from specified partition.
+    -   `REPLACE_RANGE` — Drop a certain range of parts and replace them with new ones.
+    -   `MUTATE_PART` — Apply one or several mutations to the part.
+    -   `ALTER_METADATA` — Apply alter modification according to global /metadata and /columns paths.
 
 -   `create_time` ([Datetime](../../sql-reference/data-types/datetime.md)) — Date and time when the task was submitted for execution.
 
@@ -77,7 +77,7 @@ parts_to_merge:         ['20201130_121373_121378_1','20201130_121379_121379_0','
 is_detach:              0
 is_currently_executing: 0
 num_tries:              36
-last_exception:         Code: 226, e.displayText() = DB::Exception: Marks file '/opt/clickhouse/data/merge/visits_v2/tmp_fetch_20201130_121373_121384_2/CounterID.mrk' doesn't exist (version 20.8.7.15 (official build))
+last_exception:         Code: 226, e.displayText() = DB::Exception: Marks file '/opt/clickhouse/data/merge/visits_v2/tmp_fetch_20201130_121373_121384_2/CounterID.mrk' does not exist (version 20.8.7.15 (official build))
 last_attempt_time:      2020-12-08 17:35:54
 num_postponed:          0
 postpone_reason:
diff --git a/docs/en/operations/system-tables/stack_trace.md b/docs/en/operations/system-tables/stack_trace.md
index 44b13047cc3..eb1824a6f66 100644
--- a/docs/en/operations/system-tables/stack_trace.md
+++ b/docs/en/operations/system-tables/stack_trace.md
@@ -6,6 +6,7 @@ To analyze stack frames, use the `addressToLine`, `addressToSymbol` and `demangl
 
 Columns:
 
+-   `thread_name` ([String](../../sql-reference/data-types/string.md)) — Thread name.
 -   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
 -   `query_id` ([String](../../sql-reference/data-types/string.md)) — Query identifier that can be used to get details about a query that was running from the [query_log](../system-tables/query_log.md) system table.
 -   `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — A [stack trace](https://en.wikipedia.org/wiki/Stack_trace) which represents a list of physical addresses where the called methods are stored.
@@ -21,12 +22,14 @@ SET allow_introspection_functions = 1;
 Getting symbols from ClickHouse object files:
 
 ``` sql
-WITH arrayMap(x -> demangle(addressToSymbol(x)), trace) AS all SELECT thread_id, query_id, arrayStringConcat(all, '\n') AS res FROM system.stack_trace LIMIT 1 \G
+WITH arrayMap(x -> demangle(addressToSymbol(x)), trace) AS all SELECT thread_name, thread_id, query_id, arrayStringConcat(all, '\n') AS res FROM system.stack_trace LIMIT 1 \G;
 ```
 
 ``` text
 Row 1:
 ──────
+thread_name: clickhouse-serv
+
 thread_id: 686
 query_id:  1a11f70b-626d-47c1-b948-f9c7b206395d
 res:       sigqueue
@@ -51,12 +54,14 @@ __clone
 Getting filenames and line numbers in ClickHouse source code:
 
 ``` sql
-WITH arrayMap(x -> addressToLine(x), trace) AS all, arrayFilter(x -> x LIKE '%/dbms/%', all) AS dbms SELECT thread_id, query_id, arrayStringConcat(notEmpty(dbms) ? dbms : all, '\n') AS res FROM system.stack_trace LIMIT 1 \G
+WITH arrayMap(x -> addressToLine(x), trace) AS all, arrayFilter(x -> x LIKE '%/dbms/%', all) AS dbms SELECT thread_name, thread_id, query_id, arrayStringConcat(notEmpty(dbms) ? dbms : all, '\n') AS res FROM system.stack_trace LIMIT 1 \G;
 ```
 
 ``` text
 Row 1:
 ──────
+thread_name: clickhouse-serv
+
 thread_id: 686
 query_id:  cad353e7-1c29-4b2e-949f-93e597ab7a54
 res:       /lib/x86_64-linux-gnu/libc-2.27.so
@@ -84,6 +89,3 @@ res:       /lib/x86_64-linux-gnu/libc-2.27.so
 -   [system.trace_log](../system-tables/trace_log.md) — Contains stack traces collected by the sampling query profiler.
 -   [arrayMap](../../sql-reference/functions/array-functions.md#array-map) — Description and usage example of the `arrayMap` function.
 -   [arrayFilter](../../sql-reference/functions/array-functions.md#array-filter) — Description and usage example of the `arrayFilter` function.
-
-
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/stack_trace) <!--hide-->
diff --git a/docs/en/operations/system-tables/tables.md b/docs/en/operations/system-tables/tables.md
index 6ad1425e032..480db3087f6 100644
--- a/docs/en/operations/system-tables/tables.md
+++ b/docs/en/operations/system-tables/tables.md
@@ -1,107 +1,120 @@
 # system.tables {#system-tables}
 
-Contains metadata of each table that the server knows about. Detached tables are not shown in `system.tables`.
+Contains metadata of each table that the server knows about. 
 
-This table contains the following columns (the column type is shown in brackets):
+[Detached](../../sql-reference/statements/detach.md) tables are not shown in `system.tables`.
 
--   `database` (String) — The name of the database the table is in.
+[Temporary tables](../../sql-reference/statements/create/table.md#temporary-tables) are visible in the `system.tables` only in those session where they have been created. They are shown with the empty `database` field and with the `is_temporary` flag switched on. 
 
--   `name` (String) — Table name.
+Columns:
 
--   `engine` (String) — Table engine name (without parameters).
+-   `database` ([String](../../sql-reference/data-types/string.md)) — The name of the database the table is in. 
 
--   `is_temporary` (UInt8) - Flag that indicates whether the table is temporary.
+-   `name` ([String](../../sql-reference/data-types/string.md)) — Table name. 
 
--   `data_path` (String) - Path to the table data in the file system.
+-   `engine` ([String](../../sql-reference/data-types/string.md)) — Table engine name (without parameters). 
 
--   `metadata_path` (String) - Path to the table metadata in the file system.
+-   `is_temporary` ([UInt8](../../sql-reference/data-types/int-uint.md)) - Flag that indicates whether the table is temporary. 
 
--   `metadata_modification_time` (DateTime) - Time of latest modification of the table metadata.
+-   `data_path` ([String](../../sql-reference/data-types/string.md)) - Path to the table data in the file system. 
 
--   `dependencies_database` (Array(String)) - Database dependencies.
+-   `metadata_path` ([String](../../sql-reference/data-types/string.md)) - Path to the table metadata in the file system. 
 
--   `dependencies_table` (Array(String)) - Table dependencies ([MaterializedView](../../engines/table-engines/special/materializedview.md) tables based on the current table).
+-   `metadata_modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) - Time of latest modification of the table metadata.
 
--   `create_table_query` (String) - The query that was used to create the table.
+-   `dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Database dependencies.
 
--   `engine_full` (String) - Parameters of the table engine.
+-   `dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) - Table dependencies ([MaterializedView](../../engines/table-engines/special/materializedview.md) tables based on the current table).
 
--   `partition_key` (String) - The partition key expression specified in the table.
+-   `create_table_query` ([String](../../sql-reference/data-types/string.md)) - The query that was used to create the table.
 
--   `sorting_key` (String) - The sorting key expression specified in the table.
+-   `engine_full` ([String](../../sql-reference/data-types/string.md)) - Parameters of the table engine. 
 
--   `primary_key` (String) - The primary key expression specified in the table.
+-   `partition_key` ([String](../../sql-reference/data-types/string.md)) - The partition key expression specified in the table. 
 
--   `sampling_key` (String) - The sampling key expression specified in the table.
+-   `sorting_key` ([String](../../sql-reference/data-types/string.md)) - The sorting key expression specified in the table. 
 
--   `storage_policy` (String) - The storage policy:
+-   `primary_key` ([String](../../sql-reference/data-types/string.md)) - The primary key expression specified in the table. 
+
+-   `sampling_key` ([String](../../sql-reference/data-types/string.md)) - The sampling key expression specified in the table. 
+
+-   `storage_policy` ([String](../../sql-reference/data-types/string.md)) - The storage policy:
 
     -   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
     -   [Distributed](../../engines/table-engines/special/distributed.md#distributed)
 
--   `total_rows` (Nullable(UInt64)) - Total number of rows, if it is possible to quickly determine exact number of rows in the table, otherwise `Null` (including underying `Buffer` table).
+-   `total_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows, if it is possible to quickly determine exact number of rows in the table, otherwise `NULL` (including underying `Buffer` table). 
 
--   `total_bytes` (Nullable(UInt64)) - Total number of bytes, if it is possible to quickly determine exact number of bytes for the table on storage, otherwise `Null` (**does not** includes any underlying storage).
+-   `total_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes, if it is possible to quickly determine exact number of bytes for the table on storage, otherwise `NULL` (does not includes any underlying storage). 
 
     -   If the table stores data on disk, returns used space on disk (i.e. compressed).
     -   If the table stores data in memory, returns approximated number of used bytes in memory.
 
--   `lifetime_rows` (Nullable(UInt64)) - Total number of rows INSERTed since server start (only for `Buffer` tables).
+-   `lifetime_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of rows INSERTed since server start (only for `Buffer` tables). 
+
+-   `lifetime_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - Total number of bytes INSERTed since server start (only for `Buffer` tables). 
+
+-   `comment` ([String](../../sql-reference/data-types/string.md)) - The comment for the table. 
 
--   `lifetime_bytes` (Nullable(UInt64)) - Total number of bytes INSERTed since server start (only for `Buffer` tables).
 
 The `system.tables` table is used in `SHOW TABLES` query implementation.
 
+**Example**
+
 ```sql
-:) SELECT * FROM system.tables LIMIT 2 FORMAT Vertical;
+SELECT * FROM system.tables LIMIT 2 FORMAT Vertical;
 ```
 
 ```text
 Row 1:
 ──────
-database:                   system
-name:                       aggregate_function_combinators
-uuid:                       00000000-0000-0000-0000-000000000000
-engine:                     SystemAggregateFunctionCombinators
+database:                   base
+name:                       t1
+uuid:                       81b1c20a-b7c6-4116-a2ce-7583fb6b6736
+engine:                     MergeTree
 is_temporary:               0
-data_paths:                 []
-metadata_path:              /var/lib/clickhouse/metadata/system/aggregate_function_combinators.sql
-metadata_modification_time: 1970-01-01 03:00:00
+data_paths:                 ['/var/lib/clickhouse/store/81b/81b1c20a-b7c6-4116-a2ce-7583fb6b6736/']
+metadata_path:              /var/lib/clickhouse/store/461/461cf698-fd0b-406d-8c01-5d8fd5748a91/t1.sql
+metadata_modification_time: 2021-01-25 19:14:32
 dependencies_database:      []
 dependencies_table:         []
-create_table_query:         
-engine_full:                
-partition_key:              
-sorting_key:                
-primary_key:                
-sampling_key:               
-storage_policy:             
-total_rows:                 ᴺᵁᴸᴸ
-total_bytes:                ᴺᵁᴸᴸ
+create_table_query:         CREATE TABLE base.t1 (`n` UInt64) ENGINE = MergeTree ORDER BY n SETTINGS index_granularity = 8192
+engine_full:                MergeTree ORDER BY n SETTINGS index_granularity = 8192
+partition_key:
+sorting_key:                n
+primary_key:                n
+sampling_key:
+storage_policy:             default
+total_rows:                 1
+total_bytes:                99
+lifetime_rows:              ᴺᵁᴸᴸ
+lifetime_bytes:             ᴺᵁᴸᴸ
+comment:
 
 Row 2:
 ──────
-database:                   system
-name:                       asynchronous_metrics
+database:                   default
+name:                       53r93yleapyears
 uuid:                       00000000-0000-0000-0000-000000000000
-engine:                     SystemAsynchronousMetrics
+engine:                     MergeTree
 is_temporary:               0
-data_paths:                 []
-metadata_path:              /var/lib/clickhouse/metadata/system/asynchronous_metrics.sql
-metadata_modification_time: 1970-01-01 03:00:00
+data_paths:                 ['/var/lib/clickhouse/data/default/53r93yleapyears/']
+metadata_path:              /var/lib/clickhouse/metadata/default/53r93yleapyears.sql
+metadata_modification_time: 2020-09-23 09:05:36
 dependencies_database:      []
 dependencies_table:         []
-create_table_query:         
-engine_full:                
-partition_key:              
-sorting_key:                
-primary_key:                
-sampling_key:               
-storage_policy:             
-total_rows:                 ᴺᵁᴸᴸ
-total_bytes:                ᴺᵁᴸᴸ
-
-2 rows in set. Elapsed: 0.004 sec. 
+create_table_query:         CREATE TABLE default.`53r93yleapyears` (`id` Int8, `febdays` Int8) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192
+engine_full:                MergeTree ORDER BY id SETTINGS index_granularity = 8192
+partition_key:
+sorting_key:                id
+primary_key:                id
+sampling_key:
+storage_policy:             default
+total_rows:                 2
+total_bytes:                155
+lifetime_rows:              ᴺᵁᴸᴸ
+lifetime_bytes:             ᴺᵁᴸᴸ
+comment:
 ```
 
 [Original article](https://clickhouse.tech/docs/en/operations/system_tables/tables) <!--hide-->
diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md
index b3b04795a60..e4c01a65d9d 100644
--- a/docs/en/operations/system-tables/trace_log.md
+++ b/docs/en/operations/system-tables/trace_log.md
@@ -20,10 +20,12 @@ Columns:
 
     When connecting to the server by `clickhouse-client`, you see the string similar to `Connected to ClickHouse server version 19.18.1 revision 54429.`. This field contains the `revision`, but not the `version` of a server.
 
--   `timer_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Timer type:
+-   `trace_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Trace type:
 
-    -   `Real` represents wall-clock time.
-    -   `CPU` represents CPU time.
+    -   `Real` represents collecting stack traces by wall-clock time.
+    -   `CPU` represents collecting stack traces by CPU time.
+    -   `Memory` represents collecting allocations and deallocations when memory allocation exceeds the subsequent watermark.
+    -   `MemorySample` represents collecting random allocations and deallocations.
 
 -   `thread_number` ([UInt32](../../sql-reference/data-types/int-uint.md)) — Thread identifier.
 
diff --git a/docs/en/operations/system-tables/zookeeper.md b/docs/en/operations/system-tables/zookeeper.md
index 82ace5e81dc..3b8db14934e 100644
--- a/docs/en/operations/system-tables/zookeeper.md
+++ b/docs/en/operations/system-tables/zookeeper.md
@@ -5,10 +5,10 @@ The query must either have a ‘path =’   condition or a `path IN`  condition
 
 The query `SELECT * FROM system.zookeeper WHERE path = '/clickhouse'` outputs data for all children on the `/clickhouse` node.
 To output data for all root nodes, write path = ‘/’.
-If the path specified in ‘path’ doesn’t exist, an exception will be thrown.
+If the path specified in ‘path’ does not exist, an exception will be thrown.
 
 The query `SELECT * FROM system.zookeeper WHERE path IN ('/', '/clickhouse')` outputs data for all children on the `/` and `/clickhouse` node.
-If in the specified ‘path’ collection has doesn't exist path, an exception will be thrown.
+If in the specified ‘path’ collection has does not exist path, an exception will be thrown.
 It can be used to do a batch of ZooKeeper path queries.
 
 Columns:
diff --git a/docs/en/operations/tips.md b/docs/en/operations/tips.md
index e62dea0b04e..0b74ae95b06 100644
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@@ -52,7 +52,7 @@ But for storing archives with rare queries, shelves will work.
 ## RAID {#raid}
 
 When using HDD, you can combine their RAID-10, RAID-5, RAID-6 or RAID-50.
-For Linux, software RAID is better (with `mdadm`). We don’t recommend using LVM.
+For Linux, software RAID is better (with `mdadm`). We do not recommend using LVM.
 When creating RAID-10, select the `far` layout.
 If your budget allows, choose RAID-10.
 
@@ -191,8 +191,9 @@ dynamicConfigFile=/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '}}' }}/conf/zoo.
 Java version:
 
 ``` text
-Java(TM) SE Runtime Environment (build 1.8.0_25-b17)
-Java HotSpot(TM) 64-Bit Server VM (build 25.25-b02, mixed mode)
+openjdk 11.0.5-shenandoah 2019-10-15
+OpenJDK Runtime Environment (build 11.0.5-shenandoah+10-adhoc.heretic.src)
+OpenJDK 64-Bit Server VM (build 11.0.5-shenandoah+10-adhoc.heretic.src, mixed mode)
 ```
 
 JVM parameters:
@@ -204,7 +205,7 @@ ZOOCFGDIR=/etc/$NAME/conf
 # TODO this is really ugly
 # How to find out, which jars are needed?
 # seems, that log4j requires the log4j.properties file to be in the classpath
-CLASSPATH="$ZOOCFGDIR:/usr/build/classes:/usr/build/lib/*.jar:/usr/share/zookeeper/zookeeper-3.5.1-metrika.jar:/usr/share/zookeeper/slf4j-log4j12-1.7.5.jar:/usr/share/zookeeper/slf4j-api-1.7.5.jar:/usr/share/zookeeper/servlet-api-2.5-20081211.jar:/usr/share/zookeeper/netty-3.7.0.Final.jar:/usr/share/zookeeper/log4j-1.2.16.jar:/usr/share/zookeeper/jline-2.11.jar:/usr/share/zookeeper/jetty-util-6.1.26.jar:/usr/share/zookeeper/jetty-6.1.26.jar:/usr/share/zookeeper/javacc.jar:/usr/share/zookeeper/jackson-mapper-asl-1.9.11.jar:/usr/share/zookeeper/jackson-core-asl-1.9.11.jar:/usr/share/zookeeper/commons-cli-1.2.jar:/usr/src/java/lib/*.jar:/usr/etc/zookeeper"
+CLASSPATH="$ZOOCFGDIR:/usr/build/classes:/usr/build/lib/*.jar:/usr/share/zookeeper-3.6.2/lib/audience-annotations-0.5.0.jar:/usr/share/zookeeper-3.6.2/lib/commons-cli-1.2.jar:/usr/share/zookeeper-3.6.2/lib/commons-lang-2.6.jar:/usr/share/zookeeper-3.6.2/lib/jackson-annotations-2.10.3.jar:/usr/share/zookeeper-3.6.2/lib/jackson-core-2.10.3.jar:/usr/share/zookeeper-3.6.2/lib/jackson-databind-2.10.3.jar:/usr/share/zookeeper-3.6.2/lib/javax.servlet-api-3.1.0.jar:/usr/share/zookeeper-3.6.2/lib/jetty-http-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-io-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-security-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-server-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-servlet-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jetty-util-9.4.24.v20191120.jar:/usr/share/zookeeper-3.6.2/lib/jline-2.14.6.jar:/usr/share/zookeeper-3.6.2/lib/json-simple-1.1.1.jar:/usr/share/zookeeper-3.6.2/lib/log4j-1.2.17.jar:/usr/share/zookeeper-3.6.2/lib/metrics-core-3.2.5.jar:/usr/share/zookeeper-3.6.2/lib/netty-buffer-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-codec-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-common-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-handler-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-resolver-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-transport-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-transport-native-epoll-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/netty-transport-native-unix-common-4.1.50.Final.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient_common-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient_hotspot-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/simpleclient_servlet-0.6.0.jar:/usr/share/zookeeper-3.6.2/lib/slf4j-api-1.7.25.jar:/usr/share/zookeeper-3.6.2/lib/slf4j-log4j12-1.7.25.jar:/usr/share/zookeeper-3.6.2/lib/snappy-java-1.1.7.jar:/usr/share/zookeeper-3.6.2/lib/zookeeper-3.6.2.jar:/usr/share/zookeeper-3.6.2/lib/zookeeper-jute-3.6.2.jar:/usr/share/zookeeper-3.6.2/lib/zookeeper-prometheus-metrics-3.6.2.jar:/usr/share/zookeeper-3.6.2/etc"
 
 ZOOCFG="$ZOOCFGDIR/zoo.cfg"
 ZOO_LOG_DIR=/var/log/$NAME
@@ -213,27 +214,17 @@ GROUP=zookeeper
 PIDDIR=/var/run/$NAME
 PIDFILE=$PIDDIR/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
-JAVA=/usr/bin/java
+JAVA=/usr/local/jdk-11/bin/java
 ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
 ZOO_LOG4J_PROP="INFO,ROLLINGFILE"
 JMXLOCALONLY=false
 JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '}}' }} \
     -Xmx{{ '{{' }} cluster.get('xmx','1G') {{ '}}' }} \
-    -Xloggc:/var/log/$NAME/zookeeper-gc.log \
-    -XX:+UseGCLogFileRotation \
-    -XX:NumberOfGCLogFiles=16 \
-    -XX:GCLogFileSize=16M \
+    -Xlog:safepoint,gc*=info,age*=debug:file=/var/log/$NAME/zookeeper-gc.log:time,level,tags:filecount=16,filesize=16M
     -verbose:gc \
-    -XX:+PrintGCTimeStamps \
-    -XX:+PrintGCDateStamps \
-    -XX:+PrintGCDetails
-    -XX:+PrintTenuringDistribution \
-    -XX:+PrintGCApplicationStoppedTime \
-    -XX:+PrintGCApplicationConcurrentTime \
-    -XX:+PrintSafepointStatistics \
-    -XX:+UseParNewGC \
-    -XX:+UseConcMarkSweepGC \
--XX:+CMSParallelRemarkEnabled"
+    -XX:+UseG1GC \
+    -Djute.maxbuffer=8388608 \
+    -XX:MaxGCPauseMillis=50"
 ```
 
 Salt init:
diff --git a/docs/en/operations/troubleshooting.md b/docs/en/operations/troubleshooting.md
index 39449afccef..f2695ce8437 100644
--- a/docs/en/operations/troubleshooting.md
+++ b/docs/en/operations/troubleshooting.md
@@ -55,7 +55,7 @@ If `clickhouse-server` start failed with a configuration error, you should see t
 2019.01.11 15:23:25.549505 [ 45 ] {} <Error> ExternalDictionaries: Failed reloading 'event2id' external dictionary: Poco::Exception. Code: 1000, e.code() = 111, e.displayText() = Connection refused, e.what() = Connection refused
 ```
 
-If you don’t see an error at the end of the file, look through the entire file starting from the string:
+If you do not see an error at the end of the file, look through the entire file starting from the string:
 
 ``` text
 <Information> Application: starting up.
@@ -79,7 +79,7 @@ Revision: 54413
 
 **See system.d logs**
 
-If you don’t find any useful information in `clickhouse-server` logs or there aren’t any logs, you can view `system.d` logs using the command:
+If you do not find any useful information in `clickhouse-server` logs or there aren’t any logs, you can view `system.d` logs using the command:
 
 ``` bash
 $ sudo journalctl -u clickhouse-server
diff --git a/docs/en/operations/update.md b/docs/en/operations/update.md
index 9fa9c44e130..dbcf9ae2b3e 100644
--- a/docs/en/operations/update.md
+++ b/docs/en/operations/update.md
@@ -15,7 +15,8 @@ $ sudo service clickhouse-server restart
 
 If you installed ClickHouse using something other than the recommended `deb` packages, use the appropriate update method.
 
-ClickHouse does not support a distributed update. The operation should be performed consecutively on each separate server. Do not update all the servers on a cluster simultaneously, or the cluster will be unavailable for some time.
+!!! note "Note"
+    You can update multiple servers at once as soon as there is no moment when all replicas of one shard are offline.    
 
 The upgrade of older version of ClickHouse to specific version:
 
@@ -28,7 +29,3 @@ $ sudo apt-get update
 $ sudo apt-get install clickhouse-server=xx.yy.a.b clickhouse-client=xx.yy.a.b clickhouse-common-static=xx.yy.a.b
 $ sudo service clickhouse-server restart
 ```
-
-
-
-
diff --git a/docs/en/operations/utilities/clickhouse-format.md b/docs/en/operations/utilities/clickhouse-format.md
new file mode 100644
index 00000000000..17948dce82d
--- /dev/null
+++ b/docs/en/operations/utilities/clickhouse-format.md
@@ -0,0 +1,98 @@
+---
+toc_priority: 65
+toc_title: clickhouse-format
+---
+
+# clickhouse-format {#clickhouse-format}
+
+Allows formatting input queries.
+
+Keys:
+
+- `--help` or`-h` — Produce help message.
+- `--hilite` — Add syntax highlight with ANSI terminal escape sequences.
+- `--oneline` — Format in single line.
+- `--quiet` or `-q` — Just check syntax, no output on success.
+- `--multiquery` or `-n` — Allow multiple queries in the same file.
+- `--obfuscate` — Obfuscate instead of formatting.
+- `--seed <string>` — Seed arbitrary string that determines the result of obfuscation.
+- `--backslash` — Add a backslash at the end of each line of the formatted query. Can be useful when you copy a query from web or somewhere else with multiple lines, and want to execute it in command line.
+
+## Examples {#examples} 
+
+1. Highlighting and single line:
+
+```bash
+$ clickhouse-format --oneline --hilite <<< "SELECT sum(number) FROM numbers(5);"
+```
+
+Result:
+
+```sql
+SELECT sum(number) FROM numbers(5)
+```
+
+2. Multiqueries: 
+
+```bash
+$ clickhouse-format -n <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+    
+Result:
+
+```text
+SELECT *
+FROM
+(
+    SELECT 1 AS x
+    UNION ALL
+    SELECT 1
+    UNION DISTINCT
+    SELECT 3
+)
+;
+```
+
+3. Obfuscating:
+
+```bash
+$ clickhouse-format --seed Hello --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+    
+Result:
+
+```text
+SELECT treasury_mammoth_hazelnut BETWEEN nutmeg AND span, CASE WHEN chive >= 116 THEN switching ELSE ANYTHING END;
+```
+   
+Same query and another seed string:
+
+```bash
+$ clickhouse-format --seed World --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+
+Result:
+
+```text
+SELECT horse_tape_summer BETWEEN folklore AND moccasins, CASE WHEN intestine >= 116 THEN nonconformist ELSE FORESTRY END;
+```
+
+4. Adding backslash:
+
+```bash
+$ clickhouse-format --backslash <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+
+Result:
+
+```text
+SELECT * \
+FROM  \
+( \
+    SELECT 1 AS x \
+    UNION ALL \
+    SELECT 1 \
+    UNION DISTINCT \
+    SELECT 3 \
+)
+``` 
diff --git a/docs/en/operations/utilities/clickhouse-obfuscator.md b/docs/en/operations/utilities/clickhouse-obfuscator.md
index 7fd608fcac0..b01a7624b56 100644
--- a/docs/en/operations/utilities/clickhouse-obfuscator.md
+++ b/docs/en/operations/utilities/clickhouse-obfuscator.md
@@ -1,42 +1,42 @@
-# ClickHouse obfuscator
-
-A simple tool for table data obfuscation.
-
-It reads an input table and produces an output table, that retains some properties of input, but contains different data.
-It allows publishing almost real production data for usage in benchmarks.
-
-It is designed to retain the following properties of data:
-- cardinalities of values (number of distinct values) for every column and every tuple of columns;
-- conditional cardinalities: number of distinct values of one column under the condition on the value of another column;
-- probability distributions of the absolute value of integers; the sign of signed integers; exponent and sign for floats;
-- probability distributions of the length of strings;
-- probability of zero values of numbers; empty strings and arrays, `NULL`s;
-
-- data compression ratio when compressed with LZ77 and entropy family of codecs;
-- continuity (magnitude of difference) of time values across the table; continuity of floating-point values;
-- date component of `DateTime` values;
-
-- UTF-8 validity of string values;
-- string values look natural.
-
-Most of the properties above are viable for performance testing:
-
-reading data, filtering, aggregatio, and sorting will work at almost the same speed
-as on original data due to saved cardinalities, magnitudes, compression ratios, etc.
-
-It works in a deterministic fashion: you define a seed value and the transformation is determined by input data and by seed.
-Some transformations are one to one and could be reversed, so you need to have a large seed and keep it in secret.
-
-It uses some cryptographic primitives to transform data but from the cryptographic point of view, it doesn't do it properly, that is why you should not consider the result as secure unless you have another reason. The result may retain some data you don't want to publish.
-
-
-It always leaves 0, 1, -1 numbers, dates, lengths of arrays, and null flags exactly as in source data.
-For example, you have a column `IsMobile` in your table with values 0 and 1. In transformed data, it will have the same value.
-
-So, the user will be able to count the exact ratio of mobile traffic.
-
-Let's give another example. When you have some private data in your table, like user email and you don't want to publish any single email address.
-If your table is large enough and contains multiple different emails and no email has a very high frequency than all others, it will anonymize all data. But if you have a small number of different values in a column, it can reproduce some of them.
-You should look at the working algorithm of this tool works, and fine-tune its command line parameters.
-
-This tool works fine only with an average amount of data (at least 1000s of rows).
+# ClickHouse obfuscator
+
+A simple tool for table data obfuscation.
+
+It reads an input table and produces an output table, that retains some properties of input, but contains different data.
+It allows publishing almost real production data for usage in benchmarks.
+
+It is designed to retain the following properties of data:
+- cardinalities of values (number of distinct values) for every column and every tuple of columns;
+- conditional cardinalities: number of distinct values of one column under the condition on the value of another column;
+- probability distributions of the absolute value of integers; the sign of signed integers; exponent and sign for floats;
+- probability distributions of the length of strings;
+- probability of zero values of numbers; empty strings and arrays, `NULL`s;
+
+- data compression ratio when compressed with LZ77 and entropy family of codecs;
+- continuity (magnitude of difference) of time values across the table; continuity of floating-point values;
+- date component of `DateTime` values;
+
+- UTF-8 validity of string values;
+- string values look natural.
+
+Most of the properties above are viable for performance testing:
+
+reading data, filtering, aggregatio, and sorting will work at almost the same speed
+as on original data due to saved cardinalities, magnitudes, compression ratios, etc.
+
+It works in a deterministic fashion: you define a seed value and the transformation is determined by input data and by seed.
+Some transformations are one to one and could be reversed, so you need to have a large seed and keep it in secret.
+
+It uses some cryptographic primitives to transform data but from the cryptographic point of view, it does not do it properly, that is why you should not consider the result as secure unless you have another reason. The result may retain some data you don't want to publish.
+
+
+It always leaves 0, 1, -1 numbers, dates, lengths of arrays, and null flags exactly as in source data.
+For example, you have a column `IsMobile` in your table with values 0 and 1. In transformed data, it will have the same value.
+
+So, the user will be able to count the exact ratio of mobile traffic.
+
+Let's give another example. When you have some private data in your table, like user email and you don't want to publish any single email address.
+If your table is large enough and contains multiple different emails and no email has a very high frequency than all others, it will anonymize all data. But if you have a small number of different values in a column, it can reproduce some of them.
+You should look at the working algorithm of this tool works, and fine-tune its command line parameters.
+
+This tool works fine only with an average amount of data (at least 1000s of rows).
diff --git a/docs/en/operations/utilities/index.md b/docs/en/operations/utilities/index.md
index fe5048f7044..4adbb299b1d 100644
--- a/docs/en/operations/utilities/index.md
+++ b/docs/en/operations/utilities/index.md
@@ -9,5 +9,8 @@ toc_title: Overview
 -   [clickhouse-local](../../operations/utilities/clickhouse-local.md) — Allows running SQL queries on data without stopping the ClickHouse server, similar to how `awk` does this.
 -   [clickhouse-copier](../../operations/utilities/clickhouse-copier.md) — Copies (and reshards) data from one cluster to another cluster.
 -   [clickhouse-benchmark](../../operations/utilities/clickhouse-benchmark.md) — Loads server with the custom queries and settings.
+-   [clickhouse-format](../../operations/utilities/clickhouse-format.md) — Enables formatting input queries.
+-   [ClickHouse obfuscator](../../operations/utilities/clickhouse-obfuscator.md) — Obfuscates data.
+-   [ClickHouse compressor](../../operations/utilities/clickhouse-compressor.md) — Compresses and decompresses data.
+-   [clickhouse-odbc-bridge](../../operations/utilities/odbc-bridge.md) — A proxy server for ODBC driver.
 
-[Original article](https://clickhouse.tech/docs/en/operations/utils/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/combinators.md b/docs/en/sql-reference/aggregate-functions/combinators.md
index cddef68d49c..3fc5121ebcc 100644
--- a/docs/en/sql-reference/aggregate-functions/combinators.md
+++ b/docs/en/sql-reference/aggregate-functions/combinators.md
@@ -27,11 +27,41 @@ Example 2: `uniqArray(arr)` – Counts the number of unique elements in all ‘a
 
 ## -SimpleState {#agg-functions-combinator-simplestate}
 
-If you apply this combinator, the aggregate function returns the same value but with a different type. This is an `SimpleAggregateFunction(...)` that can be stored in a table to work with [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) table engines.
+If you apply this combinator, the aggregate function returns the same value but with a different type. This is a [SimpleAggregateFunction(...)](../../sql-reference/data-types/simpleaggregatefunction.md) that can be stored in a table to work with [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) tables.
+
+**Syntax**
+
+``` sql
+<aggFunction>SimpleState(x)
+```
+
+**Arguments**
+
+-   `x` — Aggregate function parameters.
+
+**Returned values**
+
+The value of an aggregate function with the `SimpleAggregateFunction(...)` type.
+
+**Example**
+
+Query:
+
+``` sql
+WITH anySimpleState(number) AS c SELECT toTypeName(c), c FROM numbers(1);
+```
+
+Result:
+
+``` text
+┌─toTypeName(c)────────────────────────┬─c─┐
+│ SimpleAggregateFunction(any, UInt64) │ 0 │
+└──────────────────────────────────────┴───┘
+```
 
 ## -State {#agg-functions-combinator-state}
 
-If you apply this combinator, the aggregate function doesn’t return the resulting value (such as the number of unique values for the [uniq](../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) function), but an intermediate state of the aggregation (for `uniq`, this is the hash table for calculating the number of unique values). This is an `AggregateFunction(...)` that can be used for further processing or stored in a table to finish aggregating later.
+If you apply this combinator, the aggregate function does not return the resulting value (such as the number of unique values for the [uniq](../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) function), but an intermediate state of the aggregation (for `uniq`, this is the hash table for calculating the number of unique values). This is an `AggregateFunction(...)` that can be used for further processing or stored in a table to finish aggregating later.
 
 To work with these states, use:
 
@@ -47,7 +77,7 @@ If you apply this combinator, the aggregate function takes the intermediate aggr
 
 ## -MergeState {#aggregate_functions_combinators-mergestate}
 
-Merges the intermediate aggregation states in the same way as the -Merge combinator. However, it doesn’t return the resulting value, but an intermediate aggregation state, similar to the -State combinator.
+Merges the intermediate aggregation states in the same way as the -Merge combinator. However, it does not return the resulting value, but an intermediate aggregation state, similar to the -State combinator.
 
 ## -ForEach {#agg-functions-combinator-foreach}
 
@@ -62,7 +92,7 @@ Examples: `sum(DISTINCT x)`, `groupArray(DISTINCT x)`, `corrStableDistinct(DISTI
 
 Changes behavior of an aggregate function.
 
-If an aggregate function doesn’t have input values, with this combinator it returns the default value for its return data type. Applies to the aggregate functions that can take empty input data.
+If an aggregate function does not have input values, with this combinator it returns the default value for its return data type. Applies to the aggregate functions that can take empty input data.
 
 `-OrDefault` can be used with other combinators.
 
@@ -192,7 +222,7 @@ Lets you divide data into groups, and then separately aggregates the data in tho
 **Arguments**
 
 -   `start` — Starting value of the whole required interval for `resampling_key` values.
--   `stop` — Ending value of the whole required interval for `resampling_key` values. The whole interval doesn’t include the `stop` value `[start, stop)`.
+-   `stop` — Ending value of the whole required interval for `resampling_key` values. The whole interval does not include the `stop` value `[start, stop)`.
 -   `step` — Step for separating the whole interval into subintervals. The `aggFunction` is executed over each of those subintervals independently.
 -   `resampling_key` — Column whose values are used for separating data into intervals.
 -   `aggFunction_params` — `aggFunction` parameters.
@@ -249,4 +279,3 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
-
diff --git a/docs/en/sql-reference/aggregate-functions/parametric-functions.md b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
index b9d504241db..e82cb4882a0 100644
--- a/docs/en/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
@@ -9,7 +9,7 @@ Some aggregate functions can accept not only argument columns (used for compress
 
 ## histogram {#histogram}
 
-Calculates an adaptive histogram. It doesn’t guarantee precise results.
+Calculates an adaptive histogram. It does not guarantee precise results.
 
 ``` sql
 histogram(number_of_bins)(values)
@@ -79,7 +79,7 @@ FROM
 └────────┴───────┘
 ```
 
-In this case, you should remember that you don’t know the histogram bin borders.
+In this case, you should remember that you do not know the histogram bin borders.
 
 ## sequenceMatch(pattern)(timestamp, cond1, cond2, …) {#function-sequencematch}
 
@@ -114,7 +114,7 @@ Type: `UInt8`.
 
 -   `(?N)` — Matches the condition argument at position `N`. Conditions are numbered in the `[1, 32]` range. For example, `(?1)` matches the argument passed to the `cond1` parameter.
 
--   `.*` — Matches any number of events. You don’t need conditional arguments to match this element of the pattern.
+-   `.*` — Matches any number of events. You do not need conditional arguments to match this element of the pattern.
 
 -   `(?t operator value)` — Sets the time in seconds that should separate two events. For example, pattern `(?1)(?t>1800)(?2)` matches events that occur more than 1800 seconds from each other. An arbitrary number of any events can lay between these events. You can use the `>=`, `>`, `<`, `<=` operators.
 
@@ -172,7 +172,7 @@ SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 4) FROM
 
 ## sequenceCount(pattern)(time, cond1, cond2, …) {#function-sequencecount}
 
-Counts the number of event chains that matched the pattern. The function searches event chains that don’t overlap. It starts to search for the next chain after the current chain is matched.
+Counts the number of event chains that matched the pattern. The function searches event chains that do not overlap. It starts to search for the next chain after the current chain is matched.
 
 !!! warning "Warning"
     Events that occur at the same second may lay in the sequence in an undefined order affecting the result.
@@ -253,7 +253,7 @@ windowFunnel(window, [mode, [mode, ... ]])(timestamp, cond1, cond2, ..., condN)
 
 **Parameters**
 
--   `window` — Length of the sliding window, it is the time interval between first condition and 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`.
+-   `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_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.
@@ -312,7 +312,7 @@ FROM
     GROUP BY user_id
 )
 GROUP BY level
-ORDER BY level ASC
+ORDER BY level ASC;
 ```
 
 Result:
@@ -506,3 +506,256 @@ Solution: Write in the GROUP BY query SearchPhrase HAVING uniqUpTo(4)(UserID) >=
 ## sumMapFiltered(keys_to_keep)(keys, values) {#summapfilteredkeys-to-keepkeys-values}
 
 Same behavior as [sumMap](../../sql-reference/aggregate-functions/reference/summap.md#agg_functions-summap) except that an array of keys is passed as a parameter. This can be especially useful when working with a high cardinality of keys.
+
+## sequenceNextNode {#sequenceNextNode}
+
+Returns a value of next event that matched an event chain.
+
+_Experimental function, `SET allow_experimental_funnel_functions = 1` to enable it._
+
+**Syntax**
+
+``` sql
+sequenceNextNode(direction, base)(timestamp, event_column, base_condition, event1, event2, event3, ...)
+```
+
+**Parameters**
+-   `direction` - Used to navigate to directions.
+    - forward : Moving forward
+    - backward: Moving backward
+
+-   `base` - Used to set the base point.
+    - head : Set the base point to the first event
+    - tail : Set the base point to the last event
+    - first_match : Set the base point to the first matched event1
+    - last_match : Set the base point to the last matched event1
+    
+**Arguments**
+-   `timestamp` — Name of the column containing the timestamp. Data types supported: `Date`, `DateTime` and other unsigned integer types.
+-   `event_column` — Name of the column containing the value of the next event to be returned. Data types supported: `String` and `Nullable(String)`
+-   `base_condition` — Condition that the base point must fulfill.
+-   `cond` — Conditions describing the chain of events. `UInt8`
+
+**Returned value**
+-  `event_column[next_index]` - if the pattern is matched and next value exists.
+-  `NULL` - if the pattern isn’t matched or next value doesn't exist.
+
+Type: `Nullable(String)`.
+
+**Example**
+
+It can be used when events are A->B->C->E->F and you want to know the event following B->C, which is E.
+
+The query statement searching the event following A->B :
+
+``` sql
+CREATE TABLE test_flow (
+    dt DateTime, 
+    id int, 
+    page String)
+ENGINE = MergeTree() 
+PARTITION BY toYYYYMMDD(dt) 
+ORDER BY id;
+
+INSERT INTO test_flow VALUES (1, 1, 'A') (2, 1, 'B') (3, 1, 'C') (4, 1, 'E') (5, 1, 'F');
+
+SELECT id, sequenceNextNode('forward', 'head')(dt, page, page = 'A', page = 'A', page = 'B') as next_flow FROM test_flow GROUP BY id;
+```
+
+Result:
+
+``` text
+┌─id─┬─next_flow─┐
+│  1 │ C         │
+└────┴───────────┘
+```
+
+**Behavior for `forward` and `head`**
+
+```SQL
+ALTER TABLE test_flow DELETE WHERE 1 = 1 settings mutations_sync = 1;
+
+INSERT INTO test_flow VALUES (1, 1, 'Home') (2, 1, 'Gift') (3, 1, 'Exit');
+INSERT INTO test_flow VALUES (1, 2, 'Home') (2, 2, 'Home') (3, 2, 'Gift') (4, 2, 'Basket');
+INSERT INTO test_flow VALUES (1, 3, 'Gift') (2, 3, 'Home') (3, 3, 'Gift') (4, 3, 'Basket');
+```
+
+```SQL
+SELECT id, sequenceNextNode('forward', 'head')(dt, page, page = 'Home', page = 'Home', page = 'Gift') FROM test_flow GROUP BY id;
+ 
+                  dt   id   page
+ 1970-01-01 09:00:01    1   Home // Base point, Matched with Home
+ 1970-01-01 09:00:02    1   Gift // Matched with Gift
+ 1970-01-01 09:00:03    1   Exit // The result 
+
+ 1970-01-01 09:00:01    2   Home // Base point, Matched with Home
+ 1970-01-01 09:00:02    2   Home // Unmatched with Gift
+ 1970-01-01 09:00:03    2   Gift
+ 1970-01-01 09:00:04    2   Basket    
+ 
+ 1970-01-01 09:00:01    3   Gift // Base point, Unmatched with Home
+ 1970-01-01 09:00:02    3   Home      
+ 1970-01-01 09:00:03    3   Gift      
+ 1970-01-01 09:00:04    3   Basket    
+```
+
+**Behavior for `backward` and `tail`**
+
+```SQL
+SELECT id, sequenceNextNode('backward', 'tail')(dt, page, page = 'Basket', page = 'Basket', page = 'Gift') FROM test_flow GROUP BY id;
+
+                 dt   id   page
+1970-01-01 09:00:01    1   Home
+1970-01-01 09:00:02    1   Gift
+1970-01-01 09:00:03    1   Exit // Base point, Unmatched with Basket
+                                     
+1970-01-01 09:00:01    2   Home 
+1970-01-01 09:00:02    2   Home // The result 
+1970-01-01 09:00:03    2   Gift // Matched with Gift
+1970-01-01 09:00:04    2   Basket // Base point, Matched with Basket
+                                     
+1970-01-01 09:00:01    3   Gift
+1970-01-01 09:00:02    3   Home // The result 
+1970-01-01 09:00:03    3   Gift // Base point, Matched with Gift
+1970-01-01 09:00:04    3   Basket // Base point, Matched with Basket
+```
+
+
+**Behavior for `forward` and `first_match`**
+
+```SQL
+SELECT id, sequenceNextNode('forward', 'first_match')(dt, page, page = 'Gift', page = 'Gift') FROM test_flow GROUP BY id;
+
+                 dt   id   page
+1970-01-01 09:00:01    1   Home
+1970-01-01 09:00:02    1   Gift // Base point
+1970-01-01 09:00:03    1   Exit // The result
+                                     
+1970-01-01 09:00:01    2   Home 
+1970-01-01 09:00:02    2   Home 
+1970-01-01 09:00:03    2   Gift // Base point
+1970-01-01 09:00:04    2   Basket  The result
+                                     
+1970-01-01 09:00:01    3   Gift // Base point
+1970-01-01 09:00:02    3   Home // Thre result
+1970-01-01 09:00:03    3   Gift   
+1970-01-01 09:00:04    3   Basket    
+```
+
+```SQL
+SELECT id, sequenceNextNode('forward', 'first_match')(dt, page, page = 'Gift', page = 'Gift', page = 'Home') FROM test_flow GROUP BY id;
+
+                 dt   id   page
+1970-01-01 09:00:01    1   Home
+1970-01-01 09:00:02    1   Gift // Base point
+1970-01-01 09:00:03    1   Exit // Unmatched with Home
+                                     
+1970-01-01 09:00:01    2   Home 
+1970-01-01 09:00:02    2   Home 
+1970-01-01 09:00:03    2   Gift // Base point
+1970-01-01 09:00:04    2   Basket // Unmatched with Home
+                                     
+1970-01-01 09:00:01    3   Gift // Base point
+1970-01-01 09:00:02    3   Home // Matched with Home
+1970-01-01 09:00:03    3   Gift // The result
+1970-01-01 09:00:04    3   Basket    
+```
+
+
+**Behavior for `backward` and `last_match`**
+
+```SQL
+SELECT id, sequenceNextNode('backward', 'last_match')(dt, page, page = 'Gift', page = 'Gift') FROM test_flow GROUP BY id;
+
+                 dt   id   page
+1970-01-01 09:00:01    1   Home // The result
+1970-01-01 09:00:02    1   Gift // Base point
+1970-01-01 09:00:03    1   Exit 
+                                     
+1970-01-01 09:00:01    2   Home 
+1970-01-01 09:00:02    2   Home // The result
+1970-01-01 09:00:03    2   Gift // Base point
+1970-01-01 09:00:04    2   Basket    
+                                     
+1970-01-01 09:00:01    3   Gift 
+1970-01-01 09:00:02    3   Home // The result
+1970-01-01 09:00:03    3   Gift // Base point  
+1970-01-01 09:00:04    3   Basket    
+```
+
+```SQL
+SELECT id, sequenceNextNode('backward', 'last_match')(dt, page, page = 'Gift', page = 'Gift', page = 'Home') FROM test_flow GROUP BY id;
+
+                 dt   id   page
+1970-01-01 09:00:01    1   Home // Matched with Home, the result is null
+1970-01-01 09:00:02    1   Gift // Base point
+1970-01-01 09:00:03    1   Exit 
+                                     
+1970-01-01 09:00:01    2   Home // The result
+1970-01-01 09:00:02    2   Home // Matched with Home
+1970-01-01 09:00:03    2   Gift // Base point
+1970-01-01 09:00:04    2   Basket    
+                                     
+1970-01-01 09:00:01    3   Gift // The result
+1970-01-01 09:00:02    3   Home // Matched with Home
+1970-01-01 09:00:03    3   Gift // Base point  
+1970-01-01 09:00:04    3   Basket    
+```
+
+
+**Behavior for `base_condition`**
+
+```SQL
+CREATE TABLE test_flow_basecond
+(
+    `dt` DateTime,
+    `id` int,
+    `page` String,
+    `ref` String
+)
+ENGINE = MergeTree
+PARTITION BY toYYYYMMDD(dt)
+ORDER BY id
+
+INSERT INTO test_flow_basecond VALUES (1, 1, 'A', 'ref4') (2, 1, 'A', 'ref3') (3, 1, 'B', 'ref2') (4, 1, 'B', 'ref1');
+```
+
+```SQL
+SELECT id, sequenceNextNode('forward', 'head')(dt, page, ref = 'ref1', page = 'A') FROM test_flow_basecond GROUP BY id;
+
+                  dt   id   page   ref 
+ 1970-01-01 09:00:01    1   A      ref4 // The head can't be base point becasue the ref column of the head unmatched with 'ref1'.
+ 1970-01-01 09:00:02    1   A      ref3 
+ 1970-01-01 09:00:03    1   B      ref2 
+ 1970-01-01 09:00:04    1   B      ref1 
+ ```
+
+```SQL
+SELECT id, sequenceNextNode('backward', 'tail')(dt, page, ref = 'ref4', page = 'B') FROM test_flow_basecond GROUP BY id;
+
+                  dt   id   page   ref 
+ 1970-01-01 09:00:01    1   A      ref4
+ 1970-01-01 09:00:02    1   A      ref3 
+ 1970-01-01 09:00:03    1   B      ref2 
+ 1970-01-01 09:00:04    1   B      ref1 // The tail can't be base point becasue the ref column of the tail unmatched with 'ref4'.
+```
+
+```SQL
+SELECT id, sequenceNextNode('forward', 'first_match')(dt, page, ref = 'ref3', page = 'A') FROM test_flow_basecond GROUP BY id;
+
+                  dt   id   page   ref 
+ 1970-01-01 09:00:01    1   A      ref4 // This row can't be base point becasue the ref column unmatched with 'ref3'.
+ 1970-01-01 09:00:02    1   A      ref3 // Base point
+ 1970-01-01 09:00:03    1   B      ref2 // The result
+ 1970-01-01 09:00:04    1   B      ref1 
+```
+
+```SQL
+SELECT id, sequenceNextNode('backward', 'last_match')(dt, page, ref = 'ref2', page = 'B') FROM test_flow_basecond GROUP BY id;
+
+                  dt   id   page   ref 
+ 1970-01-01 09:00:01    1   A      ref4
+ 1970-01-01 09:00:02    1   A      ref3 // The result
+ 1970-01-01 09:00:03    1   B      ref2 // Base point
+ 1970-01-01 09:00:04    1   B      ref1 // This row can't be base point becasue the ref column unmatched with 'ref2'. 
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/argmax.md b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
index 72aa607a751..0630e2f585e 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmax.md
@@ -6,20 +6,12 @@ toc_priority: 106
 
 Calculates the `arg` value for a maximum `val` value. If there are several different values of `arg` for maximum values of `val`, returns the first of these values encountered.
 
-Tuple version of this function will return the tuple with the maximum `val` value. It is convenient for use with [SimpleAggregateFunction](../../../sql-reference/data-types/simpleaggregatefunction.md).
-
 **Syntax**
 
 ``` sql
 argMax(arg, val)
 ```
 
-or
-
-``` sql
-argMax(tuple(arg, val))
-```
-
 **Arguments**
 
 -   `arg` — Argument.
@@ -29,13 +21,7 @@ argMax(tuple(arg, val))
 
 -   `arg` value that corresponds to maximum `val` value.
 
-Type: matches `arg` type. 
-
-For tuple in the input:
-
--   Tuple `(arg, val)`, where `val` is the maximum value and `arg` is a corresponding value.
-
-Type: [Tuple](../../../sql-reference/data-types/tuple.md).
+Type: matches `arg` type.
 
 **Example**
 
@@ -52,15 +38,13 @@ Input table:
 Query:
 
 ``` sql
-SELECT argMax(user, salary), argMax(tuple(user, salary), salary), argMax(tuple(user, salary)) FROM salary;
+SELECT argMax(user, salary) FROM salary;
 ```
 
 Result:
 
 ``` text
-┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┬─argMax(tuple(user, salary))─┐
-│ director             │ ('director',5000)                   │ ('director',5000)           │
-└──────────────────────┴─────────────────────────────────────┴─────────────────────────────┘
+┌─argMax(user, salary)─┐
+│ director             │
+└──────────────────────┘
 ```
-
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmax/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/argmin.md b/docs/en/sql-reference/aggregate-functions/reference/argmin.md
index 7ddc38cd28a..a259a76b7d7 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/argmin.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/argmin.md
@@ -6,20 +6,12 @@ toc_priority: 105
 
 Calculates the `arg` value for a minimum `val` value. If there are several different values of `arg` for minimum values of `val`, returns the first of these values encountered.
 
-Tuple version of this function will return the tuple with the minimum `val` value. It is convenient for use with [SimpleAggregateFunction](../../../sql-reference/data-types/simpleaggregatefunction.md).
-
 **Syntax**
 
 ``` sql
 argMin(arg, val)
 ```
 
-or
-
-``` sql
-argMin(tuple(arg, val))
-```
-
 **Arguments**
 
 -   `arg` — Argument.
@@ -29,13 +21,7 @@ argMin(tuple(arg, val))
 
 -   `arg` value that corresponds to minimum `val` value.
 
-Type: matches `arg` type. 
-
-For tuple in the input:
-
--   Tuple `(arg, val)`, where `val` is the minimum value and `arg` is a corresponding value.
-
-Type: [Tuple](../../../sql-reference/data-types/tuple.md).
+Type: matches `arg` type.
 
 **Example**
 
@@ -52,15 +38,13 @@ Input table:
 Query:
 
 ``` sql
-SELECT argMin(user, salary), argMin(tuple(user, salary)) FROM salary;
+SELECT argMin(user, salary) FROM salary
 ```
 
 Result:
 
 ``` text
-┌─argMin(user, salary)─┬─argMin(tuple(user, salary))─┐
-│ worker               │ ('worker',1000)             │
-└──────────────────────┴─────────────────────────────┘
+┌─argMin(user, salary)─┐
+│ worker               │
+└──────────────────────┘
 ```
-
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmin/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/deltasum.md b/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
index e0c74576bb6..2945084db77 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/deltasum.md
@@ -6,6 +6,9 @@ toc_priority: 141
 
 Sums the arithmetic difference between consecutive rows. If the difference is negative, it is ignored.
 
+!!! info "Note"
+    The underlying data must be sorted for this function to work properly. If you would like to use this function in a [materialized view](../../../sql-reference/statements/create/view.md#materialized), you most likely want to use the [deltaSumTimestamp](../../../sql-reference/aggregate-functions/reference/deltasumtimestamp.md#agg_functions-deltasumtimestamp) method instead.
+
 **Syntax**
 
 ``` sql
diff --git a/docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
new file mode 100644
index 00000000000..241010c4761
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -0,0 +1,45 @@
+---
+toc_priority: 141
+---
+
+# deltaSumTimestamp {#agg_functions-deltasumtimestamp}
+
+Adds the difference between consecutive rows. If the difference is negative, it is ignored.
+
+This function is primarily for [materialized views](../../../sql-reference/statements/create/view.md#materialized) that are ordered by some time bucket-aligned timestamp, for example, a `toStartOfMinute` bucket. Because the rows in such a materialized view will all have the same timestamp, it is impossible for them to be merged in the "right" order. This function keeps track of the `timestamp` of the values it's seen, so it's possible to order the states correctly during merging.
+
+To calculate the delta sum across an ordered collection you can simply use the [deltaSum](../../../sql-reference/aggregate-functions/reference/deltasum.md#agg_functions-deltasum) function.
+
+**Syntax**
+
+``` sql
+deltaSumTimestamp(value, timestamp)
+```
+
+**Arguments**
+
+-   `value` — Input values, must be some [Integer](../../data-types/int-uint.md) type or [Float](../../data-types/float.md) type or a [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
+-   `timestamp` — The parameter for order values, must be some [Integer](../../data-types/int-uint.md) type or [Float](../../data-types/float.md) type or a [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
+
+**Returned value**
+
+-   Accumulated differences between consecutive values, ordered by the `timestamp` parameter.
+
+Type: [Integer](../../data-types/int-uint.md) or [Float](../../data-types/float.md) or [Date](../../data-types/date.md) or [DateTime](../../data-types/datetime.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT deltaSumTimestamp(value, timestamp) 
+FROM (SELECT number AS timestamp, [0, 4, 8, 3, 0, 0, 0, 1, 3, 5][number] AS value FROM numbers(1, 10));
+```
+
+Result:
+
+``` text
+┌─deltaSumTimestamp(value, timestamp)─┐
+│                                  13 │
+└─────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/max.md b/docs/en/sql-reference/aggregate-functions/reference/max.md
index c462dd590a6..25173a48906 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/max.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/max.md
@@ -4,4 +4,21 @@ toc_priority: 3
 
 # max {#agg_function-max}
 
-Calculates the maximum.
+Aggregate function that calculates the maximum across a group of values.
+
+Example:
+
+```
+SELECT max(salary) FROM employees;
+```
+
+```
+SELECT department, max(salary) FROM employees GROUP BY department;
+```
+
+If you need non-aggregate function to choose a maximum of two values, see `greatest`:
+
+```
+SELECT greatest(a, b) FROM table;
+```
+
diff --git a/docs/en/sql-reference/aggregate-functions/reference/min.md b/docs/en/sql-reference/aggregate-functions/reference/min.md
index 56b03468243..64b155857f8 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/min.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/min.md
@@ -4,4 +4,20 @@ toc_priority: 2
 
 ## min {#agg_function-min}
 
-Calculates the minimum.
+Aggregate function that calculates the minimum across a group of values.
+
+Example:
+
+```
+SELECT min(salary) FROM employees;
+```
+
+```
+SELECT department, min(salary) FROM employees GROUP BY department;
+```
+
+If you need non-aggregate function to choose a minimum of two values, see `least`:
+
+```
+SELECT least(a, b) FROM table;
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
index dcc665a68af..dd0d59978d1 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest.md
@@ -6,7 +6,7 @@ toc_priority: 207
 
 Computes an approximate [quantile](https://en.wikipedia.org/wiki/Quantile) of a numeric data sequence using the [t-digest](https://github.com/tdunning/t-digest/blob/master/docs/t-digest-paper/histo.pdf) algorithm.
 
-The maximum error is 1%. Memory consumption is `log(n)`, where `n` is a number of values. The result depends on the order of running the query, and is nondeterministic.
+Memory consumption is `log(n)`, where `n` is a number of values. The result depends on the order of running the query, and is nondeterministic.
 
 The performance of the function is lower than performance of [quantile](../../../sql-reference/aggregate-functions/reference/quantile.md#quantile) or [quantileTiming](../../../sql-reference/aggregate-functions/reference/quantiletiming.md#quantiletiming). In terms of the ratio of State size to precision, this function is much better than `quantile`.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
index 56ef598f7e7..70f30f3a480 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@@ -12,13 +12,16 @@ The result depends on the order of running the query, and is nondeterministic.
 
 When using multiple `quantile*` functions with different levels in a query, the internal states are not combined (that is, the query works less efficiently than it could). In this case, use the [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) function.
 
+!!! note "Note"
+    Using `quantileTDigestWeighted` [is not recommended for tiny data sets](https://github.com/tdunning/t-digest/issues/167#issuecomment-828650275) and can lead to significat error. In this case, consider possibility of using [`quantileTDigest`](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md) instead.
+
 **Syntax**
 
 ``` sql
-quantileTDigest(level)(expr)
+quantileTDigestWeighted(level)(expr, weight)
 ```
 
-Alias: `medianTDigest`.
+Alias: `medianTDigestWeighted`.
 
 **Arguments**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md
index 58ce6495a96..dd545c1a485 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletiming.md
@@ -6,7 +6,7 @@ toc_priority: 204
 
 With the determined precision computes the [quantile](https://en.wikipedia.org/wiki/Quantile) of a numeric data sequence.
 
-The result is deterministic (it doesn’t depend on the query processing order). The function is optimized for working with sequences which describe distributions like loading web pages times or backend response times.
+The result is deterministic (it does not depend on the query processing order). The function is optimized for working with sequences which describe distributions like loading web pages times or backend response times.
 
 When using multiple `quantile*` functions with different levels in a query, the internal states are not combined (that is, the query works less efficiently than it could). In this case, use the [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) function.
 
@@ -31,7 +31,7 @@ Alias: `medianTiming`.
 
 The calculation is accurate if:
 
--   Total number of values doesn’t exceed 5670.
+-   Total number of values does not exceed 5670.
 -   Total number of values exceeds 5670, but the page loading time is less than 1024ms.
 
 Otherwise, the result of the calculation is rounded to the nearest multiple of 16 ms.
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md b/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
index fb3b9dbf4d2..25846cde636 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
@@ -6,7 +6,7 @@ toc_priority: 205
 
 With the determined precision computes the [quantile](https://en.wikipedia.org/wiki/Quantile) of a numeric data sequence according to the weight of each sequence member.
 
-The result is deterministic (it doesn’t depend on the query processing order). The function is optimized for working with sequences which describe distributions like loading web pages times or backend response times.
+The result is deterministic (it does not depend on the query processing order). The function is optimized for working with sequences which describe distributions like loading web pages times or backend response times.
 
 When using multiple `quantile*` functions with different levels in a query, the internal states are not combined (that is, the query works less efficiently than it could). In this case, use the [quantiles](../../../sql-reference/aggregate-functions/reference/quantiles.md#quantiles) function.
 
@@ -33,7 +33,7 @@ Alias: `medianTimingWeighted`.
 
 The calculation is accurate if:
 
--   Total number of values doesn’t exceed 5670.
+-   Total number of values does not exceed 5670.
 -   Total number of values exceeds 5670, but the page loading time is less than 1024ms.
 
 Otherwise, the result of the calculation is rounded to the nearest multiple of 16 ms.
diff --git a/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md b/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md
index 55ee1b8289b..b364317c22b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/rankCorr.md
@@ -1,4 +1,8 @@
-## rankCorr {#agg_function-rankcorr}
+---
+toc_priority: 145
+---
+
+# rankCorr {#agg_function-rankcorr}
 
 Computes a rank correlation coefficient.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/sumcount.md b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
new file mode 100644
index 00000000000..80e87663f89
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
@@ -0,0 +1,46 @@
+---
+toc_priority: 144
+---
+
+# sumCount {#agg_function-sumCount}
+
+Calculates the sum of the numbers and counts the number of rows at the same time.
+
+**Syntax**
+
+``` sql
+sumCount(x)
+```
+
+**Arguments** 
+
+-   `x` — Input value, must be [Integer](../../../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 `(sum, count)`, where `sum` is the sum of numbers and `count` is the number of rows with not-NULL values.
+
+Type: [Tuple](../../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE s_table (x Int8) Engine = Log;
+INSERT INTO s_table SELECT number FROM numbers(0, 20);
+INSERT INTO s_table VALUES (NULL);
+SELECT sumCount(x) from s_table;
+```
+
+Result:
+
+``` text
+┌─sumCount(x)─┐
+│ (190,20)    │
+└─────────────┘
+```
+
+**See also**
+
+- [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg) setting.
diff --git a/docs/en/sql-reference/aggregate-functions/reference/topk.md b/docs/en/sql-reference/aggregate-functions/reference/topk.md
index b9bea013ea8..7e6d0db4946 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/topk.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/topk.md
@@ -12,7 +12,7 @@ Implements the [Filtered Space-Saving](http://www.l2f.inesc-id.pt/~fmmb/wiki/upl
 topK(N)(column)
 ```
 
-This function doesn’t provide a guaranteed result. In certain situations, errors might occur and it might return frequent values that aren’t the most frequent values.
+This function does not provide a guaranteed result. In certain situations, errors might occur and it might return frequent values that aren’t the most frequent values.
 
 We recommend using the `N < 10` value; performance is reduced with large `N` values. Maximum value of `N = 65536`.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniq.md b/docs/en/sql-reference/aggregate-functions/reference/uniq.md
index 7ba2cdc6cb8..598af24c0de 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniq.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniq.md
@@ -28,7 +28,7 @@ Function:
 
         This algorithm is very accurate and very efficient on the CPU. When the query contains several of these functions, using `uniq` is almost as fast as using other aggregate functions.
 
--   Provides the result deterministically (it doesn’t depend on the query processing order).
+-   Provides the result deterministically (it does not depend on the query processing order).
 
 We recommend using this function in almost all scenarios.
 
@@ -38,3 +38,4 @@ We recommend using this function in almost all scenarios.
 -   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
index 4434686ae61..623c43ae10c 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -32,7 +32,7 @@ Function:
 
         For a small number of distinct elements, an array is used. When the set size is larger, a hash table is used. For a larger number of elements, HyperLogLog is used, which will occupy a fixed amount of memory.
 
--   Provides the result deterministically (it doesn’t depend on the query processing order).
+-   Provides the result deterministically (it does not depend on the query processing order).
 
 !!! note "Note"
     Since it uses 32-bit hash for non-`String` type, the result will have very high error for cardinalities significantly larger than `UINT_MAX` (error will raise quickly after a few tens of billions of distinct values), hence in this case you should use [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
@@ -49,3 +49,4 @@ Compared to the [uniq](../../../sql-reference/aggregate-functions/reference/uniq
 -   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md b/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
index eee675016ee..e446258fbf7 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqexact.md
@@ -23,3 +23,4 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 -   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
 -   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqcombined)
 -   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniqhll12)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
index 5b23ea81eae..1d619ab7d93 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -26,14 +26,15 @@ Function:
 
 -   Uses the HyperLogLog algorithm to approximate the number of different argument values.
 
-        212 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
+        2^12 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
 
--   Provides the determinate result (it doesn’t depend on the query processing order).
+-   Provides the determinate result (it does not depend on the query processing order).
 
-We don’t recommend using this function. In most cases, use the [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) or [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined) function.
+We do not recommend using this function. In most cases, use the [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) or [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined) function.
 
 **See Also**
 
 -   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
 -   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
 -   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
+-   [uniqTheta](../../../sql-reference/aggregate-functions/reference/uniqthetasketch.md#agg_function-uniqthetasketch)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
new file mode 100644
index 00000000000..b5161462442
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -0,0 +1,39 @@
+---
+toc_priority: 195
+---
+
+# uniqTheta {#agg_function-uniqthetasketch}
+
+Calculates the approximate number of different argument values, using the [Theta Sketch Framework](https://datasketches.apache.org/docs/Theta/ThetaSketchFramework.html).
+
+``` sql
+uniqTheta(x[, ...])
+```
+
+**Arguments**
+
+The function takes a variable number of parameters. Parameters can be `Tuple`, `Array`, `Date`, `DateTime`, `String`, or numeric types.
+
+**Returned value**
+
+-   A [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
+
+**Implementation details**
+
+Function:
+
+-   Calculates a hash for all parameters in the aggregate, then uses it in calculations.
+
+-   Uses the [KMV](https://datasketches.apache.org/docs/Theta/InverseEstimate.html) algorithm to approximate the number of different argument values.
+
+        4096(2^12) 64-bit sketch are used. The size of the state is about 41 KB.
+
+-   The relative error is 3.125% (95% confidence), see the [relative error table](https://datasketches.apache.org/docs/Theta/ThetaErrorTable.html) for detail.
+
+**See Also**
+
+-   [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+-   [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined)
+-   [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64)
+-   [uniqHLL12](../../../sql-reference/aggregate-functions/reference/uniqhll12.md#agg_function-uniqhll12)
+-   [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact)
diff --git a/docs/en/sql-reference/data-types/date.md b/docs/en/sql-reference/data-types/date.md
index 886e93f433c..0cfac4d59fe 100644
--- a/docs/en/sql-reference/data-types/date.md
+++ b/docs/en/sql-reference/data-types/date.md
@@ -5,7 +5,7 @@ toc_title: Date
 
 # Date {#data_type-date}
 
-A date. Stored in two bytes as the number of days since 1970-01-01 (unsigned). Allows storing values from just after the beginning of the Unix Epoch to the upper threshold defined by a constant at the compilation stage (currently, this is until the year 2106, but the final fully-supported year is 2105).
+A date. Stored in two bytes as the number of days since 1970-01-01 (unsigned). Allows storing values from just after the beginning of the Unix Epoch to the upper threshold defined by a constant at the compilation stage (currently, this is until the year 2149, but the final fully-supported year is 2148).
 
 The date value is stored without the time zone.
 
diff --git a/docs/en/sql-reference/data-types/datetime.md b/docs/en/sql-reference/data-types/datetime.md
index d95abe57510..ed07f599b91 100644
--- a/docs/en/sql-reference/data-types/datetime.md
+++ b/docs/en/sql-reference/data-types/datetime.md
@@ -23,7 +23,7 @@ The point in time is saved as a [Unix timestamp](https://en.wikipedia.org/wiki/U
 
 Timezone agnostic unix timestamp is stored in tables, and the timezone is used to transform it to text format or back during data import/export or to make calendar calculations on the values (example: `toDate`, `toHour` functions et cetera). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata.
 
-A list of supported time zones can be found in the [IANA Time Zone Database](https://www.iana.org/time-zones) and also can be queried by `SELECT * FROM system.time_zones`.
+A list of supported time zones can be found in the [IANA Time Zone Database](https://www.iana.org/time-zones) and also can be queried by `SELECT * FROM system.time_zones`. [The list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) is also available at Wikipedia.
 
 You can explicitly set a time zone for `DateTime`-type columns when creating a table. Example: `DateTime('UTC')`. If the time zone isn’t set, ClickHouse uses the value of the [timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone) parameter in the server settings or the operating system settings at the moment of the ClickHouse server start.
 
diff --git a/docs/en/sql-reference/data-types/datetime64.md b/docs/en/sql-reference/data-types/datetime64.md
index 5cba8315090..1d3725b9fb3 100644
--- a/docs/en/sql-reference/data-types/datetime64.md
+++ b/docs/en/sql-reference/data-types/datetime64.md
@@ -9,7 +9,7 @@ Allows to store an instant in time, that can be expressed as a calendar date and
 
 Tick size (precision): 10<sup>-precision</sup> seconds
 
-Syntax:
+**Syntax:**
 
 ``` sql
 DateTime64(precision, [timezone])
@@ -17,9 +17,11 @@ 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.
+
 ## Examples {#examples}
 
-**1.** Creating a table with `DateTime64`-type column and inserting data into it:
+1. Creating a table with `DateTime64`-type column and inserting data into it:
 
 ``` sql
 CREATE TABLE dt
@@ -27,15 +29,15 @@ CREATE TABLE dt
     `timestamp` DateTime64(3, 'Europe/Moscow'),
     `event_id` UInt8
 )
-ENGINE = TinyLog
+ENGINE = TinyLog;
 ```
 
 ``` sql
-INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2)
+INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2);
 ```
 
 ``` sql
-SELECT * FROM dt
+SELECT * FROM dt;
 ```
 
 ``` text
@@ -45,13 +47,13 @@ SELECT * FROM dt
 └─────────────────────────┴──────────┘
 ```
 
--   When inserting datetime as an integer, it is treated as an appropriately scaled Unix Timestamp (UTC). `1546300800000` (with precision 3) represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Europe/Moscow` (UTC+3) timezone specified, when outputting as a string the value will be shown as `'2019-01-01 03:00:00'`
+-   When inserting datetime as an integer, it is treated as an appropriately scaled Unix Timestamp (UTC). `1546300800000` (with precision 3) represents `'2019-01-01 00:00:00'` UTC. However, as `timestamp` column has `Europe/Moscow` (UTC+3) timezone specified, when outputting as a string the value will be shown as `'2019-01-01 03:00:00'`.
 -   When inserting string value as datetime, it is treated as being in column timezone. `'2019-01-01 00:00:00'` will be treated as being in `Europe/Moscow` timezone and stored as `1546290000000`.
 
-**2.** Filtering on `DateTime64` values
+2. Filtering on `DateTime64` values
 
 ``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow')
+SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow');
 ```
 
 ``` text
@@ -60,12 +62,12 @@ SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europ
 └─────────────────────────┴──────────┘
 ```
 
-Unlike `DateTime`, `DateTime64` values are not converted from `String` automatically
+Unlike `DateTime`, `DateTime64` values are not converted from `String` automatically.
 
-**3.** Getting a time zone for a `DateTime64`-type value:
+3. Getting a time zone for a `DateTime64`-type value:
 
 ``` sql
-SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x
+SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x;
 ```
 
 ``` text
@@ -74,13 +76,13 @@ SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS
 └─────────────────────────┴────────────────────────────────┘
 ```
 
-**4.** Timezone conversion
+4. Timezone conversion
 
 ``` sql
 SELECT
 toDateTime64(timestamp, 3, 'Europe/London') as lon_time,
 toDateTime64(timestamp, 3, 'Europe/Moscow') as mos_time
-FROM dt
+FROM dt;
 ```
 
 ``` text
@@ -90,7 +92,7 @@ FROM dt
 └─────────────────────────┴─────────────────────────┘
 ```
 
-## See Also {#see-also}
+**See Also**
 
 -   [Type conversion functions](../../sql-reference/functions/type-conversion-functions.md)
 -   [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
diff --git a/docs/en/sql-reference/data-types/decimal.md b/docs/en/sql-reference/data-types/decimal.md
index b268f747165..af2655cd0c2 100644
--- a/docs/en/sql-reference/data-types/decimal.md
+++ b/docs/en/sql-reference/data-types/decimal.md
@@ -31,7 +31,7 @@ For example, Decimal32(4) can contain numbers from -99999.9999 to 99999.9999 wit
 
 Internally data is represented as normal signed integers with respective bit width. Real value ranges that can be stored in memory are a bit larger than specified above, which are checked only on conversion from a string.
 
-Because modern CPU’s do not support 128-bit integers natively, operations on Decimal128 are emulated. Because of this Decimal128 works significantly slower than Decimal32/Decimal64.
+Because modern CPUs do not support 128-bit integers natively, operations on Decimal128 are emulated. Because of this Decimal128 works significantly slower than Decimal32/Decimal64.
 
 ## Operations and Result Type {#operations-and-result-type}
 
diff --git a/docs/en/sql-reference/data-types/geo.md b/docs/en/sql-reference/data-types/geo.md
index 9ed328e0de6..50093053686 100644
--- a/docs/en/sql-reference/data-types/geo.md
+++ b/docs/en/sql-reference/data-types/geo.md
@@ -5,7 +5,7 @@ toc_title: Geo
 
 # Geo Data Types {#geo-data-types}
 
-Clickhouse supports data types for representing geographical objects — locations, lands, etc. 
+ClickHouse supports data types for representing geographical objects — locations, lands, etc. 
 
 !!! warning "Warning"
     Currently geo data types are an experimental feature. To work with them you must set `allow_experimental_geo_types = 1`.
diff --git a/docs/en/sql-reference/data-types/lowcardinality.md b/docs/en/sql-reference/data-types/lowcardinality.md
index e0a483973e6..5f0f400ce43 100644
--- a/docs/en/sql-reference/data-types/lowcardinality.md
+++ b/docs/en/sql-reference/data-types/lowcardinality.md
@@ -55,7 +55,7 @@ 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/).
+-   [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).
 
 [Original article](https://clickhouse.tech/docs/en/sql-reference/data-types/lowcardinality/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/nullable.md b/docs/en/sql-reference/data-types/nullable.md
index 2cf5e41867e..4207e389734 100644
--- a/docs/en/sql-reference/data-types/nullable.md
+++ b/docs/en/sql-reference/data-types/nullable.md
@@ -5,7 +5,7 @@ toc_title: Nullable
 
 # Nullable(typename) {#data_type-nullable}
 
-Allows to store special marker ([NULL](../../sql-reference/syntax.md)) that denotes “missing value” alongside normal values allowed by `TypeName`. For example, a `Nullable(Int8)` type column can store `Int8` type values, and the rows that don’t have a value will store `NULL`.
+Allows to store special marker ([NULL](../../sql-reference/syntax.md)) that denotes “missing value” alongside normal values allowed by `TypeName`. For example, a `Nullable(Int8)` type column can store `Int8` type values, and the rows that do not have a value will store `NULL`.
 
 For a `TypeName`, you can’t use composite data types [Array](../../sql-reference/data-types/array.md) and [Tuple](../../sql-reference/data-types/tuple.md). Composite data types can contain `Nullable` type values, such as `Array(Nullable(Int8))`.
 
diff --git a/docs/en/sql-reference/data-types/simpleaggregatefunction.md b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
index 244779c5ca8..8138d4a4103 100644
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@@ -1,6 +1,8 @@
 # SimpleAggregateFunction {#data-type-simpleaggregatefunction}
 
-`SimpleAggregateFunction(name, types_of_arguments…)` data type stores current value of the aggregate function, and does not store its full state as [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md) does. This optimization can be applied to functions for which the following property holds: the result of applying a function `f` to a row set `S1 UNION ALL S2` can be obtained by applying `f` to parts of the row set separately, and then again applying `f` to the results: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. This property guarantees that partial aggregation results are enough to compute the combined one, so we don’t have to store and process any extra data.
+`SimpleAggregateFunction(name, types_of_arguments…)` data type stores current value of the aggregate function, and does not store its full state as [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md) does. This optimization can be applied to functions for which the following property holds: the result of applying a function `f` to a row set `S1 UNION ALL S2` can be obtained by applying `f` to parts of the row set separately, and then again applying `f` to the results: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. This property guarantees that partial aggregation results are enough to compute the combined one, so we do not have to store and process any extra data.
+
+The common way to produce an aggregate function value is by calling the aggregate function with the [-SimpleState](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-simplestate) suffix.
 
 The following aggregate functions are supported:
 
@@ -18,8 +20,6 @@ The following aggregate functions are supported:
 -   [`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 "Note"
diff --git a/docs/en/sql-reference/data-types/string.md b/docs/en/sql-reference/data-types/string.md
index 42d8798c8a3..e72ce8f0b5a 100644
--- a/docs/en/sql-reference/data-types/string.md
+++ b/docs/en/sql-reference/data-types/string.md
@@ -12,7 +12,7 @@ When creating tables, numeric parameters for string fields can be set (e.g. `VAR
 
 ## Encodings {#encodings}
 
-ClickHouse doesn’t have the concept of encodings. Strings can contain an arbitrary set of bytes, which are stored and output as-is.
+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.
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 de6a780235f..c69dc4224e6 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
@@ -7,9 +7,9 @@ toc_title: Storing Dictionaries in Memory
 
 There are a variety of ways to store dictionaries in memory.
 
-We recommend [flat](#flat), [hashed](#dicts-external_dicts_dict_layout-hashed) and [complex_key_hashed](#complex-key-hashed). which provide optimal processing speed.
+We recommend [flat](#flat), [hashed](#dicts-external_dicts_dict_layout-hashed) and [complex_key_hashed](#complex-key-hashed), which provide optimal processing speed.
 
-Caching is not recommended because of potentially poor performance and difficulties in selecting optimal parameters. Read more in the section “[cache](#cache)”.
+Caching is not recommended because of potentially poor performance and difficulties in selecting optimal parameters. Read more in the section [cache](#cache).
 
 There are several ways to improve dictionary performance:
 
@@ -68,9 +68,9 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 
 The dictionary is completely stored in memory in the form of flat arrays. How much memory does the dictionary use? The amount is proportional to the size of the largest key (in space used).
 
-The dictionary key has the `UInt64` type and the value is limited to 500,000. If a larger key is discovered when creating the dictionary, ClickHouse throws an exception and does not create the dictionary.
+The dictionary key has the [UInt64](../../../sql-reference/data-types/int-uint.md) type and the value is limited to `max_array_size` (by default — 500,000). If a larger key is discovered when creating the dictionary, ClickHouse throws an exception and does not create the dictionary. Dictionary flat arrays initial size is controlled by `initial_array_size` setting (by default — 1024).
 
-All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
+All types of sources are supported. When updating, data (from a file or from a table) is read in it entirety.
 
 This method provides the best performance among all available methods of storing the dictionary.
 
@@ -78,21 +78,27 @@ Configuration example:
 
 ``` xml
 <layout>
-  <flat />
+  <flat>
+    <initial_array_size>50000</initial_array_size>
+    <max_array_size>5000000</max_array_size>
+  </flat>
 </layout>
 ```
 
 or
 
 ``` sql
-LAYOUT(FLAT())
+LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
 ```
 
 ### hashed {#dicts-external_dicts_dict_layout-hashed}
 
 The dictionary is completely stored in memory in the form of a hash table. The dictionary can contain any number of elements with any identifiers In practice, the number of keys can reach tens of millions of items.
 
-The hash table will be preallocated (this will make dictionary load faster), if the is approx number of total rows is known, this is supported only if the source is `clickhouse` without any `<where>` (since in case of `<where>` you can filter out too much rows and the dictionary will allocate too much memory, that will not be used eventually).
+If `preallocate` is `true` (default is `false`) the hash table will be preallocated (this will make the dictionary load faster). But note that you should use it only if:
+
+- The source support an approximate number of elements (for now it is supported only by the `ClickHouse` source).
+- There are no duplicates in the data (otherwise it may increase memory usage for the hashtable).
 
 All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
 
@@ -100,21 +106,23 @@ Configuration example:
 
 ``` xml
 <layout>
-  <hashed />
+  <hashed>
+    <preallocate>0</preallocate>
+  </hashed>
 </layout>
 ```
 
 or
 
 ``` sql
-LAYOUT(HASHED())
+LAYOUT(HASHED(PREALLOCATE 0))
 ```
 
 ### sparse_hashed {#dicts-external_dicts_dict_layout-sparse_hashed}
 
 Similar to `hashed`, but uses less memory in favor more CPU usage.
 
-It will be also preallocated so as `hashed`, note that it is even more significant for `sparse_hashed`.
+It will be also preallocated so as `hashed` (with `preallocate` set to `true`), and note that it is even more significant for `sparse_hashed`.
 
 Configuration example:
 
@@ -124,8 +132,10 @@ Configuration example:
 </layout>
 ```
 
+or
+
 ``` sql
-LAYOUT(SPARSE_HASHED())
+LAYOUT(SPARSE_HASHED([PREALLOCATE 0]))
 ```
 
 ### complex_key_hashed {#complex-key-hashed}
@@ -328,7 +338,7 @@ or
 
 ``` sql
 LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
-    PATH /var/lib/clickhouse/clickhouse_dictionaries/test_dict))
+    PATH ./user_files/test_dict))
 ```
 
 ### complex_key_ssd_cache {#complex-key-ssd-cache}
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index 081cc5b0b69..04901c1ad57 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -30,7 +30,7 @@ LIFETIME(300)
 
 Setting `<lifetime>0</lifetime>` (`LIFETIME(0)`) prevents dictionaries from updating.
 
-You can set a time interval for upgrades, and ClickHouse will choose a uniformly random time within this range. This is necessary in order to distribute the load on the dictionary source when upgrading on a large number of servers.
+You can set a time interval for updates, and ClickHouse will choose a uniformly random time within this range. This is necessary in order to distribute the load on the dictionary source when updating on a large number of servers.
 
 Example of settings:
 
@@ -54,7 +54,7 @@ LIFETIME(MIN 300 MAX 360)
 If `<min>0</min>` and `<max>0</max>`, ClickHouse does not reload the dictionary by timeout.
 In this case, ClickHouse can reload the dictionary earlier if the dictionary configuration file was changed or the `SYSTEM RELOAD DICTIONARY` command was executed.
 
-When upgrading the dictionaries, the ClickHouse server applies different logic depending on the type of [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md):
+When updating the dictionaries, the ClickHouse server applies different logic depending on the type of [source](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md):
 
 -   For a text file, it checks the time of modification. If the time differs from the previously recorded time, the dictionary is updated.
 -   For MySQL source, the time of modification is checked using a `SHOW TABLE STATUS` query (in case of MySQL 8 you need to disable meta-information caching in MySQL by `set global information_schema_stats_expiry=0`. 
@@ -86,3 +86,4 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
+For `Cache`, `ComplexKeyCache`, `SSDCache`, and `SSDComplexKeyCache` dictionaries both synchronious and asynchronious updates are supported. 
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index dc0b6e17198..41da56362e7 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -53,7 +53,7 @@ optional settings are available:
 or
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 SETTINGS(format_csv_allow_single_quotes = 0)
 ```
 
@@ -70,7 +70,7 @@ Types of sources (`source_type`):
     -   [MongoDB](#dicts-external_dicts_dict_sources-mongodb)
     -   [Redis](#dicts-external_dicts_dict_sources-redis)
     -   [Cassandra](#dicts-external_dicts_dict_sources-cassandra)
-    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)    
+    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)
 
 ## Local File {#dicts-external_dicts_dict_sources-local_file}
 
@@ -88,7 +88,7 @@ Example of settings:
 or
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 ```
 
 Setting fields:
@@ -98,6 +98,10 @@ Setting fields:
 
 When dictionary with source `FILE` is created via DDL command (`CREATE DICTIONARY ...`), the source file needs to be located in `user_files` directory, to prevent DB users accessing arbitrary file on ClickHouse node.
 
+**See Also**
+
+-   [Dictionary function](../../../sql-reference/table-functions/dictionary.md#dictionary-function)
+
 ## Executable File {#dicts-external_dicts_dict_sources-executable}
 
 Working with executable files depends on [how the dictionary is stored in memory](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md). If the dictionary is stored using `cache` and `complex_key_cache`, ClickHouse requests the necessary keys by sending a request to the executable file’s STDIN. Otherwise, ClickHouse starts executable file and treats its output as dictionary data.
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index dbf2fa67ac5..c6770b531f4 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -159,14 +159,14 @@ Configuration fields:
 | Tag                                                  | Description                                                                                                                                                                                                                                                                                                                                     | Required |
 |------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
 | `name`                                               | Column name.                                                                                                                                                                                                                                                                                                                                    | Yes      |
-| `type`                                               | ClickHouse data type.<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) is not supported.       | Yes      |
-| `null_value`                                         | Default value for a non-existing element.<br/>In the example, it is an empty string. You cannot use `NULL` in this field.                                                                                                                                                                                                                       | Yes      |
+| `type`                                               | ClickHouse data type.<br/>ClickHouse tries to cast value from dictionary to the specified data type. For example, for MySQL, the field might be `TEXT`, `VARCHAR`, or `BLOB` in the MySQL source table, but it can be uploaded as `String` in ClickHouse.<br/>[Nullable](../../../sql-reference/data-types/nullable.md) is currently supported for [Flat](external-dicts-dict-layout.md#flat), [Hashed](external-dicts-dict-layout.md#dicts-external_dicts_dict_layout-hashed), [ComplexKeyHashed](external-dicts-dict-layout.md#complex-key-hashed), [Direct](external-dicts-dict-layout.md#direct), [ComplexKeyDirect](external-dicts-dict-layout.md#complex-key-direct), [RangeHashed](external-dicts-dict-layout.md#range-hashed), [Polygon](external-dicts-dict-polygon.md), [Cache](external-dicts-dict-layout.md#cache), [ComplexKeyCache](external-dicts-dict-layout.md#complex-key-cache), [SSDCache](external-dicts-dict-layout.md#ssd-cache), [SSDComplexKeyCache](external-dicts-dict-layout.md#complex-key-ssd-cache) dictionaries. In [IPTrie](external-dicts-dict-layout.md#ip-trie) dictionaries `Nullable` types are not supported.       | Yes      |
+| `null_value`                                         | Default value for a non-existing element.<br/>In the example, it is an empty string. [NULL](../../syntax.md#null-literal) value can be used only for the `Nullable` types (see the previous line with types description).                                                                                                                                                                                                                       | Yes      |
 | `expression`                                         | [Expression](../../../sql-reference/syntax.md#syntax-expressions) that ClickHouse executes on the value.<br/>The expression can be a column name in the remote SQL database. Thus, you can use it to create an alias for the remote column.<br/><br/>Default value: no expression.                                                              | No       |
 | <a name="hierarchical-dict-attr"></a> `hierarchical` | If `true`, the attribute contains the value of a parent key for the current key. See [Hierarchical Dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md).<br/><br/>Default value: `false`.                                                                                               | No       |
 | `injective`                                          | Flag that shows whether the `id -> attribute` image is [injective](https://en.wikipedia.org/wiki/Injective_function).<br/>If `true`, ClickHouse can automatically place after the `GROUP BY` clause the requests to dictionaries with injection. Usually it significantly reduces the amount of such requests.<br/><br/>Default value: `false`. | No       |
 | `is_object_id`                                       | Flag that shows whether the query is executed for a MongoDB document by `ObjectID`.<br/><br/>Default value: `false`.                                                                                                                                                                                                                            | No       |
 
-## See Also {#see-also}
+**See Also**
 
 -   [Functions for working with external dictionaries](../../../sql-reference/functions/ext-dict-functions.md).
 
diff --git a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index 8217fb8da3a..d229336c58d 100644
--- a/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -43,7 +43,7 @@ The dictionary configuration file has the following format:
 
 You can [configure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md) any number of dictionaries in the same file.
 
-[DDL queries for dictionaries](../../../sql-reference/statements/create/dictionary.md) doesn’t require any additional records in server configuration. They allow to work with dictionaries as first-class entities, like tables or views.
+[DDL queries for dictionaries](../../../sql-reference/statements/create/dictionary.md) does not require any additional records in server configuration. They allow to work with dictionaries as first-class entities, like tables or views.
 
 !!! attention "Attention"
     You can convert values for a small dictionary by describing it in a `SELECT` query (see the [transform](../../../sql-reference/functions/other-functions.md) function). This functionality is not related to external dictionaries.
diff --git a/docs/en/sql-reference/dictionaries/index.md b/docs/en/sql-reference/dictionaries/index.md
index fa127dab103..22f4182a1c0 100644
--- a/docs/en/sql-reference/dictionaries/index.md
+++ b/docs/en/sql-reference/dictionaries/index.md
@@ -10,8 +10,6 @@ A dictionary is a mapping (`key -> attributes`) that is convenient for various t
 
 ClickHouse supports special functions for working with dictionaries that can be used in queries. It is easier and more efficient to use dictionaries with functions than a `JOIN` with reference tables.
 
-[NULL](../../sql-reference/syntax.md#null-literal) values can’t be stored in a dictionary.
-
 ClickHouse supports:
 
 -   [Built-in dictionaries](../../sql-reference/dictionaries/internal-dicts.md#internal_dicts) with a specific [set of functions](../../sql-reference/functions/ym-dict-functions.md).
diff --git a/docs/en/sql-reference/dictionaries/internal-dicts.md b/docs/en/sql-reference/dictionaries/internal-dicts.md
index 472351a19a4..9f142c4207d 100644
--- a/docs/en/sql-reference/dictionaries/internal-dicts.md
+++ b/docs/en/sql-reference/dictionaries/internal-dicts.md
@@ -31,7 +31,7 @@ You can also create these files yourself. The file format is as follows:
 
 -   region ID (`UInt32`)
 -   parent region ID (`UInt32`)
--   region type (`UInt8`): 1 - continent, 3 - country, 4 - federal district, 5 - region, 6 - city; other types don’t have values
+-   region type (`UInt8`): 1 - continent, 3 - country, 4 - federal district, 5 - region, 6 - city; other types do not have values
 -   population (`UInt32`) — optional column
 
 `regions_names_*.txt`: TabSeparated (no header), columns:
diff --git a/docs/en/sql-reference/functions/arithmetic-functions.md b/docs/en/sql-reference/functions/arithmetic-functions.md
index faa03dfc9d3..3187f13b5b9 100644
--- a/docs/en/sql-reference/functions/arithmetic-functions.md
+++ b/docs/en/sql-reference/functions/arithmetic-functions.md
@@ -70,7 +70,7 @@ Calculates a number with the reverse sign. The result is always signed.
 
 ## abs(a) {#arithm_func-abs}
 
-Calculates the absolute value of the number (a). That is, if a \< 0, it returns -a. For unsigned types it doesn’t do anything. For signed integer types, it returns an unsigned number.
+Calculates the absolute value of the number (a). That is, if a \< 0, it returns -a. For unsigned types it does not do anything. For signed integer types, it returns an unsigned number.
 
 ## gcd(a, b) {#gcda-b}
 
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index 499376a70d4..611f620ed9f 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -125,7 +125,7 @@ hasAll(set, subset)
 
 -   An empty array is a subset of any array.
 -   `Null` processed as a value.
--   Order of values in both of arrays doesn’t matter.
+-   Order of values in both of arrays does not matter.
 
 **Examples**
 
@@ -162,7 +162,7 @@ hasAny(array1, array2)
 **Peculiar properties**
 
 -   `Null` processed as a value.
--   Order of values in both of arrays doesn’t matter.
+-   Order of values in both of arrays does not matter.
 
 **Examples**
 
@@ -602,7 +602,7 @@ SELECT arraySort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 └────────────────────┘
 ```
 
-Here, the elements that are passed in the second array (\[2, 1\]) define a sorting key for the corresponding element from the source array (\[‘hello’, ‘world’\]), that is, \[‘hello’ –\> 2, ‘world’ –\> 1\]. Since the lambda function doesn’t use `x`, actual values of the source array don’t affect the order in the result. So, ‘hello’ will be the second element in the result, and ‘world’ will be the first.
+Here, the elements that are passed in the second array (\[2, 1\]) define a sorting key for the corresponding element from the source array (\[‘hello’, ‘world’\]), that is, \[‘hello’ –\> 2, ‘world’ –\> 1\]. Since the lambda function does not use `x`, actual values of the source array do not affect the order in the result. So, ‘hello’ will be the second element in the result, and ‘world’ will be the first.
 
 Other examples are shown below.
 
@@ -1544,3 +1544,52 @@ SELECT arrayCumSumNonNegative([1, 1, -4, 1]) AS res
 ```
 Note that the `arraySumNonNegative` is a [higher-order function](../../sql-reference/functions/index.md#higher-order-functions). You can pass a lambda function to it as the first argument.
 
+## arrayProduct {#arrayproduct}
+
+Multiplies elements of an [array](../../sql-reference/data-types/array.md).
+
+**Syntax**
+
+``` sql
+arrayProduct(arr)
+```
+
+**Arguments**
+
+-   `arr` — [Array](../../sql-reference/data-types/array.md) of numeric values.
+
+**Returned value**
+
+-   A product of array's elements.
+
+Type: [Float64](../../sql-reference/data-types/float.md).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT arrayProduct([1,2,3,4,5,6]) as res;
+```
+
+Result:
+
+``` text
+┌─res───┐
+│ 720   │
+└───────┘
+```
+
+Query:
+
+``` sql
+SELECT arrayProduct([toDecimal64(1,8), toDecimal64(2,8), toDecimal64(3,8)]) as res, toTypeName(res);
+```
+
+Return value type is always [Float64](../../sql-reference/data-types/float.md). Result:
+
+``` text
+┌─res─┬─toTypeName(arrayProduct(array(toDecimal64(1, 8), toDecimal64(2, 8), toDecimal64(3, 8))))─┐
+│ 6   │ Float64                                                                                  │
+└─────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/array-join.md b/docs/en/sql-reference/functions/array-join.md
index f35e0d10117..e87d0bca4bb 100644
--- a/docs/en/sql-reference/functions/array-join.md
+++ b/docs/en/sql-reference/functions/array-join.md
@@ -7,7 +7,7 @@ toc_title: arrayJoin
 
 This is a very unusual function.
 
-Normal functions don’t change a set of rows, but just change the values in each row (map).
+Normal functions do not change a set of rows, but just change the values in each row (map).
 Aggregate functions compress a set of rows (fold or reduce).
 The ‘arrayJoin’ function takes each row and generates a set of rows (unfold).
 
diff --git a/docs/en/sql-reference/functions/bit-functions.md b/docs/en/sql-reference/functions/bit-functions.md
index e07f28c0f24..57e55a7da56 100644
--- a/docs/en/sql-reference/functions/bit-functions.md
+++ b/docs/en/sql-reference/functions/bit-functions.md
@@ -228,7 +228,7 @@ bitCount(x)
 
 -   Number of bits set to one in the input number.
 
-The function doesn’t convert input value to a larger type ([sign extension](https://en.wikipedia.org/wiki/Sign_extension)). So, for example, `bitCount(toUInt8(-1)) = 8`.
+The function does not convert input value to a larger type ([sign extension](https://en.wikipedia.org/wiki/Sign_extension)). So, for example, `bitCount(toUInt8(-1)) = 8`.
 
 Type: `UInt8`.
 
diff --git a/docs/en/sql-reference/functions/bitmap-functions.md b/docs/en/sql-reference/functions/bitmap-functions.md
index 7ec400949e9..c695c894784 100644
--- a/docs/en/sql-reference/functions/bitmap-functions.md
+++ b/docs/en/sql-reference/functions/bitmap-functions.md
@@ -33,7 +33,7 @@ SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res);
 
 ``` text
 ┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
+│     │ AggregateFunction(groupBitmap, UInt8)        │
 └─────┴──────────────────────────────────────────────┘
 ```
 
@@ -140,7 +140,7 @@ bitmapContains(haystack, needle)
 
 **Returned values**
 
--   0 — If `haystack` doesn’t contain `needle`.
+-   0 — If `haystack` does not contain `needle`.
 -   1 — If `haystack` contains `needle`.
 
 Type: `UInt8`.
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 6b26dae4546..afbaed2b413 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -5,7 +5,7 @@ toc_title: Dates and Times
 
 # Functions for Working with Dates and Times {#functions-for-working-with-dates-and-times}
 
-Support for time zones
+Support for time zones.
 
 All functions for working with the date and time that have a logical use for the time zone can accept a second optional time zone argument. Example: Asia/Yekaterinburg. In this case, they use the specified time zone instead of the local (default) one.
 
@@ -23,13 +23,53 @@ SELECT
 └─────────────────────┴────────────┴────────────┴─────────────────────┘
 ```
 
+## timeZone {#timezone}
+
+Returns the timezone of the server.
+
+**Syntax** 
+
+``` sql
+timeZone()
+```
+
+Alias: `timezone`. 
+
+**Returned value**
+
+-   Timezone. 
+
+Type: [String](../../sql-reference/data-types/string.md).
+
 ## toTimeZone {#totimezone}
 
-Convert time or date and time to the specified time zone. The time zone is an attribute of the Date/DateTime types. The internal value (number of seconds) of the table field or of the resultset's column does not change, the column's type changes and its string representation changes accordingly.
+Converts time or date and time to the specified time zone. The time zone is an attribute of the `Date` and `DateTime` data types. The internal value (number of seconds) of the table field or of the resultset's column does not change, the column's type changes and its string representation changes accordingly.
+
+**Syntax** 
+
+``` sql
+toTimezone(value, timezone)
+```
+
+Alias: `toTimezone`.
+
+**Arguments** 
+
+-   `value` — Time or date and time. [DateTime64](../../sql-reference/data-types/datetime64.md).
+-   `timezone` — Timezone for the returned value. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   Date and time. 
+
+Type: [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Example**
+
+Query:
 
 ```sql
-SELECT
-    toDateTime('2019-01-01 00:00:00', 'UTC') AS time_utc,
+SELECT toDateTime('2019-01-01 00:00:00', 'UTC') AS time_utc,
     toTypeName(time_utc) AS type_utc,
     toInt32(time_utc) AS int32utc,
     toTimeZone(time_utc, 'Asia/Yekaterinburg') AS time_yekat,
@@ -40,6 +80,7 @@ SELECT
     toInt32(time_samoa) AS int32samoa
 FORMAT Vertical;
 ```
+Result:
 
 ```text
 Row 1:
@@ -57,6 +98,82 @@ int32samoa: 1546300800
 
 `toTimeZone(time_utc, 'Asia/Yekaterinburg')` changes the `DateTime('UTC')` type to `DateTime('Asia/Yekaterinburg')`. The value (Unixtimestamp) 1546300800 stays the same, but the string representation (the result of the toString() function) changes from `time_utc:   2019-01-01 00:00:00` to `time_yekat: 2019-01-01 05:00:00`.
 
+## timeZoneOf {#timezoneof}
+
+Returns the timezone name of [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md) data types.
+
+**Syntax** 
+
+``` sql
+timeZoneOf(value)
+```
+
+Alias: `timezoneOf`. 
+
+**Arguments**
+
+-   `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md). 
+
+**Returned value**
+
+-   Timezone name. 
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+Query:
+``` sql
+SELECT timezoneOf(now());
+```
+
+Result:
+``` text
+┌─timezoneOf(now())─┐
+│ Etc/UTC           │
+└───────────────────┘
+```
+
+## timeZoneOffset {#timezoneoffset}
+
+Returns a timezone offset in seconds from [UTC](https://en.wikipedia.org/wiki/Coordinated_Universal_Time). The function takes into account [daylight saving time](https://en.wikipedia.org/wiki/Daylight_saving_time) and historical timezone changes at the specified date and time.
+[IANA timezone database](https://www.iana.org/time-zones) is used to calculate the offset.
+
+**Syntax**
+
+``` sql
+timeZoneOffset(value)
+```
+
+Alias: `timezoneOffset`.
+
+**Arguments**
+
+-   `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md). 
+
+**Returned value**
+
+-   Offset from UTC in seconds. 
+
+Type: [Int32](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT toDateTime('2021-04-21 10:20:30', 'America/New_York') AS Time, toTypeName(Time) AS Type,
+       timeZoneOffset(Time) AS Offset_in_seconds, (Offset_in_seconds / 3600) AS Offset_in_hours;
+```
+
+Result:
+
+``` text
+┌────────────────Time─┬─Type─────────────────────────┬─Offset_in_seconds─┬─Offset_in_hours─┐
+│ 2021-04-21 10:20:30 │ DateTime('America/New_York') │            -14400 │              -4 │
+└─────────────────────┴──────────────────────────────┴───────────────────┴─────────────────┘
+```
+
 ## toYear {#toyear}
 
 Converts a date or date with time to a UInt16 number containing the year number (AD).
@@ -147,6 +264,9 @@ Result:
 └────────────────┘
 ```
 
+!!! attention "Attention"
+    The return type `toStartOf*` functions described below is `Date` or `DateTime`. Though these functions can take `DateTime64` as an argument, passing them a `DateTime64` that is out of normal range (years 1970 - 2105) will give incorrect result.
+
 ## toStartOfYear {#tostartofyear}
 
 Rounds down a date or date with time to the first day of the year.
@@ -340,7 +460,7 @@ For mode values with a meaning of “with 4 or more days this year,” weeks are
 
 -   Otherwise, it is the last week of the previous year, and the next week is week 1.
 
-For mode values with a meaning of “contains January 1”, the week contains January 1 is week 1. It doesn’t matter how many days in the new year the week contained, even if it contained only one day.
+For mode values with a meaning of “contains January 1”, the week contains January 1 is week 1. It does not matter how many days in the new year the week contained, even if it contained only one day.
 
 ``` sql
 toWeek(date, [, mode][, Timezone])
@@ -388,13 +508,13 @@ SELECT toDate('2016-12-27') AS date, toYearWeek(date) AS yearWeek0, toYearWeek(d
 
 Truncates date and time data to the specified part of date.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 date_trunc(unit, value[, timezone])
 ```
 
-Alias: `dateTrunc`. 
+Alias: `dateTrunc`.
 
 **Arguments**
 
@@ -457,13 +577,13 @@ Result:
 
 Adds the time interval or date interval to the provided date or date with time.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 date_add(unit, value, date)
 ```
 
-Aliases: `dateAdd`, `DATE_ADD`. 
+Aliases: `dateAdd`, `DATE_ADD`.
 
 **Arguments**
 
@@ -478,7 +598,7 @@ Aliases: `dateAdd`, `DATE_ADD`.
     - `month`
     - `quarter`
     - `year`
-	
+
 -   `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).  
 -   `date` — The date or date with time to which `value` is added. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
@@ -583,7 +703,7 @@ Aliases: `dateSub`, `DATE_SUB`.
     - `month`
     - `quarter`
     - `year`
-	
+
 -   `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).    
 -   `date` — The date or date with time from which `value` is subtracted. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
@@ -613,16 +733,16 @@ Result:
 
 Adds the specified time value with the provided date or date time value.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 timestamp_add(date, INTERVAL value unit)
 ```
 
-Aliases: `timeStampAdd`, `TIMESTAMP_ADD`. 
+Aliases: `timeStampAdd`, `TIMESTAMP_ADD`.
 
 **Arguments**
-    
+
 -   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 -   `value` — Value of interval to add. [Int](../../sql-reference/data-types/int-uint.md).
 -   `unit` — The type of interval to add. [String](../../sql-reference/data-types/string.md).
@@ -642,7 +762,7 @@ Aliases: `timeStampAdd`, `TIMESTAMP_ADD`.
 Date or date with time with the specified `value` expressed in `unit` added to `date`.
 
 Type: [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
-    
+
 **Example**
 
 Query:
@@ -663,13 +783,13 @@ Result:
 
 Subtracts the time interval from the provided date or date with time.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 timestamp_sub(unit, value, date)
 ```
 
-Aliases: `timeStampSub`, `TIMESTAMP_SUB`. 
+Aliases: `timeStampSub`, `TIMESTAMP_SUB`.
 
 **Arguments**
 
@@ -684,7 +804,7 @@ Aliases: `timeStampSub`, `TIMESTAMP_SUB`.
     - `month`
     - `quarter`
     - `year`
-	
+
 -   `value` — Value of interval to subtract. [Int](../../sql-reference/data-types/int-uint.md).   
 -   `date` — Date or date with time. [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
@@ -709,12 +829,12 @@ Result:
 │                                          2018-07-18 01:02:03 │
 └──────────────────────────────────────────────────────────────┘
 ```
-    
+
 ## now {#now}
 
-Returns the current date and time. 
+Returns the current date and time.
 
-**Syntax** 
+**Syntax**
 
 ``` sql
 now([timezone])
@@ -1069,4 +1189,3 @@ Result:
 │ 2020-01-01                         │
 └────────────────────────────────────┘
 ```
-
diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 6b72d3c2269..167afdabb80 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -87,8 +87,6 @@ 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 leading digit is zero.
 
-Example:
-
 **Example**
 
 Query:
@@ -151,10 +149,62 @@ Result:
 └──────────────────┘
 ```
 
-## unhex(str) {#unhexstr}
+## unhex {#unhexstr}
 
-Accepts a string containing any number of hexadecimal digits, and returns a string containing the corresponding bytes. Supports both uppercase and lowercase letters A-F. The number of hexadecimal digits does not have to be even. If it is odd, the last digit is interpreted as the least significant half of the 00-0F byte. If the argument string contains anything other than hexadecimal digits, some implementation-defined result is returned (an exception isn’t thrown).
-If you want to convert the result to a number, you can use the ‘reverse’ and ‘reinterpretAsType’ functions.
+Performs the opposite operation of [hex](#hex). It interprets each pair of hexadecimal 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 `unhex` is invoked from within the `clickhouse-client`, binary strings display using UTF-8. 
+
+Alias: `UNHEX`.
+
+**Syntax**
+
+``` sql
+unhex(arg)
+```
+
+**Arguments**
+
+-   `arg` — A string containing any number of hexadecimal digits. Type: [String](../../sql-reference/data-types/string.md).
+
+Supports both uppercase and lowercase letters `A-F`. The number of hexadecimal digits does not have to be even. If it is odd, the last digit is interpreted as the least significant half of the `00-0F` byte. If the argument string contains anything other than hexadecimal digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of hex(N) is not performed by unhex().
+
+**Returned value**
+
+-   A binary string (BLOB).
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+Query:
+``` sql
+SELECT unhex('303132'), UNHEX('4D7953514C');
+```
+
+Result:
+``` text
+┌─unhex('303132')─┬─unhex('4D7953514C')─┐
+│ 012             │ MySQL               │
+└─────────────────┴─────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT reinterpretAsUInt64(reverse(unhex('FFF'))) AS num;
+```
+
+Result:
+
+``` text
+┌──num─┐
+│ 4095 │
+└──────┘
+```
 
 ## UUIDStringToNum(str) {#uuidstringtonumstr}
 
@@ -171,4 +221,3 @@ Accepts an integer. Returns a string containing the list of powers of two that t
 ## bitmaskToArray(num) {#bitmasktoarraynum}
 
 Accepts an integer. Returns an array of UInt64 numbers containing the list of powers of two that total the source number when summed. Numbers in the array are in ascending order.
-
diff --git a/docs/en/sql-reference/functions/ext-dict-functions.md b/docs/en/sql-reference/functions/ext-dict-functions.md
index 5fc146f603f..7c0fe11ae64 100644
--- a/docs/en/sql-reference/functions/ext-dict-functions.md
+++ b/docs/en/sql-reference/functions/ext-dict-functions.md
@@ -4,27 +4,28 @@ toc_title: External Dictionaries
 ---
 
 !!! attention "Attention"
-    `dict_name` parameter must be fully qualified for dictionaries created with DDL queries. Eg. `<database>.<dict_name>`.
+    For dictionaries, created with [DDL queries](../../sql-reference/statements/create/dictionary.md), the `dict_name` parameter must be fully specified, like `<database>.<dict_name>`. Otherwise, the current database is used.
 
 # Functions for Working with External Dictionaries {#ext_dict_functions}
 
 For information on connecting and configuring external dictionaries, see [External dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
 
-## dictGet {#dictget}
+## dictGet, dictGetOrDefault, dictGetOrNull {#dictget}
 
-Retrieves a value from an external dictionary.
+Retrieves values from an external dictionary. 
 
 ``` sql
-dictGet('dict_name', 'attr_name', id_expr)
-dictGetOrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
+dictGet('dict_name', attr_names, id_expr)
+dictGetOrDefault('dict_name', attr_names, id_expr, default_value_expr)
+dictGetOrNull('dict_name', attr_name, id_expr)
 ```
 
 **Arguments**
 
 -   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
--   `attr_name` — Name of the column of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
+-   `attr_names` — Name of the column of the dictionary, [String literal](../../sql-reference/syntax.md#syntax-string-literal), or tuple of column names, [Tuple](../../sql-reference/data-types/tuple.md)([String literal](../../sql-reference/syntax.md#syntax-string-literal)).
 -   `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md) or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
--   `default_value_expr` — Value returned if the dictionary doesn’t contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning the value in the data type configured for the `attr_name` attribute.
+-   `default_value_expr` — Values returned if the dictionary does not contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) or [Tuple](../../sql-reference/data-types/tuple.md)([Expression](../../sql-reference/syntax.md#syntax-expressions)), returning the value (or values) in the data types configured for the `attr_names` attribute.
 
 **Returned value**
 
@@ -34,12 +35,13 @@ dictGetOrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 
         - `dictGet` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
         - `dictGetOrDefault` returns the value passed as the `default_value_expr` parameter.
+        - `dictGetOrNull` returns `NULL` in case key was not found in dictionary.
 
-ClickHouse throws an exception if it cannot parse the value of the attribute or the value doesn’t match the attribute data type.
+ClickHouse throws an exception if it cannot parse the value of the attribute or the value does not match the attribute data type.
 
-**Example**
+**Example for simple key dictionary**
 
-Create a text file `ext-dict-text.csv` containing the following:
+Create a text file `ext-dict-test.csv` containing the following:
 
 ``` text
 1,1
@@ -96,6 +98,130 @@ LIMIT 3
 └─────┴────────┘
 ```
 
+**Example for complex key dictionary**
+
+Create a text file `ext-dict-mult.csv` containing the following:
+
+``` text
+1,1,'1'
+2,2,'2'
+3,3,'3'
+```
+
+The first column is `id`, the second is `c1`, the third is `c2`.
+
+Configure the external dictionary:
+
+``` xml
+<yandex>
+    <dictionary>
+        <name>ext-dict-mult</name>
+        <source>
+            <file>
+                <path>/path-to/ext-dict-mult.csv</path>
+                <format>CSV</format>
+            </file>
+        </source>
+        <layout>
+            <flat />
+        </layout>
+        <structure>
+            <id>
+                <name>id</name>
+            </id>
+            <attribute>
+                <name>c1</name>
+                <type>UInt32</type>
+                <null_value></null_value>
+            </attribute>
+            <attribute>
+                <name>c2</name>
+                <type>String</type>
+                <null_value></null_value>
+            </attribute>            
+        </structure>
+        <lifetime>0</lifetime>
+    </dictionary>
+</yandex>
+```
+
+Perform the query:
+
+``` sql
+SELECT
+    dictGet('ext-dict-mult', ('c1','c2'), number) AS val,
+    toTypeName(val) AS type
+FROM system.numbers
+LIMIT 3;
+```
+
+``` text
+┌─val─────┬─type──────────────────┐
+│ (1,'1') │ Tuple(UInt8, String)  │
+│ (2,'2') │ Tuple(UInt8, String)  │
+│ (3,'3') │ Tuple(UInt8, String)  │
+└─────────┴───────────────────────┘
+```
+
+**Example for range key dictionary**
+
+Input table:
+
+```sql
+CREATE TABLE range_key_dictionary_source_table
+(
+    key UInt64,
+    start_date Date,
+    end_date Date,
+    value String,
+    value_nullable Nullable(String)
+)
+ENGINE = TinyLog();
+
+INSERT INTO range_key_dictionary_source_table VALUES(1, toDate('2019-05-20'), toDate('2019-05-20'), 'First', 'First');
+INSERT INTO range_key_dictionary_source_table VALUES(2, toDate('2019-05-20'), toDate('2019-05-20'), 'Second', NULL);
+INSERT INTO range_key_dictionary_source_table VALUES(3, toDate('2019-05-20'), toDate('2019-05-20'), 'Third', 'Third');
+```
+
+Create the external dictionary:
+
+```sql
+CREATE DICTIONARY range_key_dictionary
+(
+    key UInt64,
+    start_date Date,
+    end_date Date,
+    value String,
+    value_nullable Nullable(String)
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'range_key_dictionary_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN start_date MAX end_date);
+```
+
+Perform the query:
+
+``` sql
+SELECT
+    (number, toDate('2019-05-20')),
+    dictHas('range_key_dictionary', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', 'value', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', 'value_nullable', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', ('value', 'value_nullable'), number, toDate('2019-05-20'))
+FROM system.numbers LIMIT 5 FORMAT TabSeparated;
+```
+Result:
+
+``` text
+(0,'2019-05-20')        0       \N      \N      (NULL,NULL)
+(1,'2019-05-20')        1       First   First   ('First','First')
+(2,'2019-05-20')        0       \N      \N      (NULL,NULL)
+(3,'2019-05-20')        0       \N      \N      (NULL,NULL)
+(4,'2019-05-20')        0       \N      \N      (NULL,NULL)
+```
+
 **See Also**
 
 -   [External Dictionaries](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md)
@@ -162,6 +288,119 @@ dictIsIn('dict_name', child_id_expr, ancestor_id_expr)
 
 Type: `UInt8`.
 
+## dictGetChildren {#dictgetchildren}
+
+Returns first-level children as an array of indexes. It is the inverse transformation for [dictGetHierarchy](#dictgethierarchy).
+
+**Syntax** 
+
+``` sql
+dictGetChildren(dict_name, key)
+```
+
+**Arguments** 
+
+-   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal). 
+-   `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value. 
+
+**Returned values**
+
+-   First-level descendants for the key.
+
+Type: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Consider the hierarchic dictionary:
+
+``` text
+┌─id─┬─parent_id─┐
+│  1 │         0 │
+│  2 │         1 │
+│  3 │         1 │
+│  4 │         2 │
+└────┴───────────┘
+```
+
+First-level children:
+
+``` sql
+SELECT dictGetChildren('hierarchy_flat_dictionary', number) FROM system.numbers LIMIT 4;
+```
+
+``` text
+┌─dictGetChildren('hierarchy_flat_dictionary', number)─┐
+│ [1]                                                  │
+│ [2,3]                                                │
+│ [4]                                                  │
+│ []                                                   │
+└──────────────────────────────────────────────────────┘
+```
+
+## dictGetDescendant {#dictgetdescendant}
+
+Returns all descendants as if [dictGetChildren](#dictgetchildren) function was applied `level` times recursively.  
+
+**Syntax**
+
+``` sql
+dictGetDescendants(dict_name, key, level)
+```
+
+**Arguments** 
+
+-   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal). 
+-   `key` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md)-type value.
+-   `level` — Hierarchy level. If `level = 0` returns all descendants to the end. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   Descendants for the key.
+
+Type: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Consider the hierarchic dictionary:
+
+``` text
+┌─id─┬─parent_id─┐
+│  1 │         0 │
+│  2 │         1 │
+│  3 │         1 │
+│  4 │         2 │
+└────┴───────────┘
+```
+All descendants:
+
+``` sql
+SELECT dictGetDescendants('hierarchy_flat_dictionary', number) FROM system.numbers LIMIT 4;
+```
+
+``` text
+┌─dictGetDescendants('hierarchy_flat_dictionary', number)─┐
+│ [1,2,3,4]                                               │
+│ [2,3,4]                                                 │
+│ [4]                                                     │
+│ []                                                      │
+└─────────────────────────────────────────────────────────┘
+```
+
+First-level descendants:
+
+``` sql
+SELECT dictGetDescendants('hierarchy_flat_dictionary', number, 1) FROM system.numbers LIMIT 4;
+```
+
+``` text
+┌─dictGetDescendants('hierarchy_flat_dictionary', number, 1)─┐
+│ [1]                                                        │
+│ [2,3]                                                      │
+│ [4]                                                        │
+│ []                                                         │
+└────────────────────────────────────────────────────────────┘
+```
+
 ## Other Functions {#ext_dict_functions-other}
 
 ClickHouse supports specialized functions that convert dictionary attribute values to a specific data type regardless of the dictionary configuration.
@@ -190,7 +429,7 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 -   `dict_name` — Name of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
 -   `attr_name` — Name of the column of the dictionary. [String literal](../../sql-reference/syntax.md#syntax-string-literal).
 -   `id_expr` — Key value. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning a [UInt64](../../sql-reference/data-types/int-uint.md) or [Tuple](../../sql-reference/data-types/tuple.md)-type value depending on the dictionary configuration.
--   `default_value_expr` — Value returned if the dictionary doesn’t contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning the value in the data type configured for the `attr_name` attribute.
+-   `default_value_expr` — Value returned if the dictionary does not contain a row with the `id_expr` key. [Expression](../../sql-reference/syntax.md#syntax-expressions) returning the value in the data type configured for the `attr_name` attribute.
 
 **Returned value**
 
@@ -201,5 +440,4 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
         - `dictGet[Type]` returns the content of the `<null_value>` element specified for the attribute in the dictionary configuration.
         - `dictGet[Type]OrDefault` returns the value passed as the `default_value_expr` parameter.
 
-ClickHouse throws an exception if it cannot parse the value of the attribute or the value doesn’t match the attribute data type.
-
+ClickHouse throws an exception if it cannot parse the value of the attribute or the value does not match the attribute data type.
diff --git a/docs/en/sql-reference/functions/functions-for-nulls.md b/docs/en/sql-reference/functions/functions-for-nulls.md
index 5cc95fe298a..c06711b3cd2 100644
--- a/docs/en/sql-reference/functions/functions-for-nulls.md
+++ b/docs/en/sql-reference/functions/functions-for-nulls.md
@@ -224,7 +224,7 @@ assumeNotNull(x)
 **Returned values**
 
 -   The original value from the non-`Nullable` type, if it is not `NULL`.
--   The default value for the non-`Nullable` type if the original value was `NULL`.
+-   Implementation specific result if the original value was `NULL`.
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index c60067b06af..35a42c49a41 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -43,7 +43,7 @@ SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')
 ## MD5 {#hash_functions-md5}
 
 Calculates the MD5 from a string and returns the resulting set of bytes as FixedString(16).
-If you don’t need MD5 in particular, but you need a decent cryptographic 128-bit hash, use the ‘sipHash128’ function instead.
+If you do not need MD5 in particular, but you need a decent cryptographic 128-bit hash, use the ‘sipHash128’ function instead.
 If you want to get the same result as output by the md5sum utility, use lower(hex(MD5(s))).
 
 ## sipHash64 {#hash_functions-siphash64}
@@ -437,13 +437,13 @@ A [FixedString(16)](../../sql-reference/data-types/fixedstring.md) data type has
 **Example**
 
 ``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type;
+SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
+┌─MurmurHash3──────────────────────┬─type───┐
+│ 368A1A311CB7342253354B548E7E7E71 │ String │
+└──────────────────────────────────┴────────┘
 ```
 
 ## xxHash32, xxHash64 {#hash-functions-xxhash32}
diff --git a/docs/en/sql-reference/functions/index.md b/docs/en/sql-reference/functions/index.md
index 32408759b98..58e0994a11d 100644
--- a/docs/en/sql-reference/functions/index.md
+++ b/docs/en/sql-reference/functions/index.md
@@ -6,7 +6,7 @@ toc_title: Introduction
 
 # Functions {#functions}
 
-There are at least\* two types of functions - regular functions (they are just called “functions”) and aggregate functions. These are completely different concepts. Regular functions work as if they are applied to each row separately (for each row, the result of the function doesn’t depend on the other rows). Aggregate functions accumulate a set of values from various rows (i.e. they depend on the entire set of rows).
+There are at least\* two types of functions - regular functions (they are just called “functions”) and aggregate functions. These are completely different concepts. Regular functions work as if they are applied to each row separately (for each row, the result of the function does not depend on the other rows). Aggregate functions accumulate a set of values from various rows (i.e. they depend on the entire set of rows).
 
 In this section we discuss regular functions. For aggregate functions, see the section “Aggregate functions”.
 
@@ -14,7 +14,7 @@ In this section we discuss regular functions. For aggregate functions, see the s
 
 ## Strong Typing {#strong-typing}
 
-In contrast to standard SQL, ClickHouse has strong typing. In other words, it doesn’t make implicit conversions between types. Each function works for a specific set of types. This means that sometimes you need to use type conversion functions.
+In contrast to standard SQL, ClickHouse has strong typing. In other words, it does not make implicit conversions between types. Each function works for a specific set of types. This means that sometimes you need to use type conversion functions.
 
 ## Common Subexpression Elimination {#common-subexpression-elimination}
 
@@ -78,7 +78,7 @@ For example, in the query `SELECT f(sum(g(x))) FROM distributed_table GROUP BY h
 -   if a `distributed_table` has at least two shards, the functions ‘g’ and ‘h’ are performed on remote servers, and the function ‘f’ is performed on the requestor server.
 -   if a `distributed_table` has only one shard, all the ‘f’, ‘g’, and ‘h’ functions are performed on this shard’s server.
 
-The result of a function usually doesn’t depend on which server it is performed on. However, sometimes this is important.
+The result of a function usually does not depend on which server it is performed on. However, sometimes this is important.
 For example, functions that work with dictionaries use the dictionary that exists on the server they are running on.
 Another example is the `hostName` function, which returns the name of the server it is running on in order to make `GROUP BY` by servers in a `SELECT` query.
 
diff --git a/docs/en/sql-reference/functions/ip-address-functions.md b/docs/en/sql-reference/functions/ip-address-functions.md
index 0b5dd7160b8..137ebc2407d 100644
--- a/docs/en/sql-reference/functions/ip-address-functions.md
+++ b/docs/en/sql-reference/functions/ip-address-functions.md
@@ -48,7 +48,7 @@ LIMIT 10
 └────────────────┴───────┘
 ```
 
-Since using ‘xxx’ is highly unusual, this may be changed in the future. We recommend that you don’t rely on the exact format of this fragment.
+Since using ‘xxx’ is highly unusual, this may be changed in the future. We recommend that you do not rely on the exact format of this fragment.
 
 ### IPv6NumToString(x) {#ipv6numtostringx}
 
@@ -422,7 +422,7 @@ Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8')
+SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8');
 ```
 
 Result:
@@ -436,7 +436,7 @@ Result:
 Query:
 
 ``` sql
-SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16')
+SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16');
 ```
 
 Result:
diff --git a/docs/en/sql-reference/functions/json-functions.md b/docs/en/sql-reference/functions/json-functions.md
index ca6ef684faf..e731180c393 100644
--- a/docs/en/sql-reference/functions/json-functions.md
+++ b/docs/en/sql-reference/functions/json-functions.md
@@ -12,50 +12,64 @@ The following assumptions are made:
 1.  The field name (function argument) must be a constant.
 2.  The field name is somehow canonically encoded in JSON. For example: `visitParamHas('{"abc":"def"}', 'abc') = 1`, but `visitParamHas('{"\\u0061\\u0062\\u0063":"def"}', 'abc') = 0`
 3.  Fields are searched for on any nesting level, indiscriminately. If there are multiple matching fields, the first occurrence is used.
-4.  The JSON doesn’t have space characters outside of string literals.
+4.  The JSON does not have space characters outside of string literals.
 
 ## visitParamHas(params, name) {#visitparamhasparams-name}
 
-Checks whether there is a field with the ‘name’ name.
+Checks whether there is a field with the `name` name.
+
+Alias: `simpleJSONHas`.
 
 ## visitParamExtractUInt(params, name) {#visitparamextractuintparams-name}
 
-Parses UInt64 from the value of the field named ‘name’. If this is a string field, it tries to parse a number from the beginning of the string. If the field doesn’t exist, or it exists but doesn’t contain a number, it returns 0.
+Parses UInt64 from the value of the field named `name`. If this is a string field, it tries to parse a number from the beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns 0.
+
+Alias: `simpleJSONExtractUInt`.
 
 ## visitParamExtractInt(params, name) {#visitparamextractintparams-name}
 
 The same as for Int64.
 
+Alias: `simpleJSONExtractInt`.
+
 ## visitParamExtractFloat(params, name) {#visitparamextractfloatparams-name}
 
 The same as for Float64.
 
+Alias: `simpleJSONExtractFloat`.
+
 ## visitParamExtractBool(params, name) {#visitparamextractboolparams-name}
 
 Parses a true/false value. The result is UInt8.
 
+Alias: `simpleJSONExtractBool`.
+
 ## visitParamExtractRaw(params, name) {#visitparamextractrawparams-name}
 
 Returns the value of a field, including separators.
 
+Alias: `simpleJSONExtractRaw`.
+
 Examples:
 
 ``` sql
-visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"'
-visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}'
+visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"';
+visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}';
 ```
 
 ## visitParamExtractString(params, name) {#visitparamextractstringparams-name}
 
 Parses the string in double quotes. The value is unescaped. If unescaping failed, it returns an empty string.
 
+Alias: `simpleJSONExtractString`.
+
 Examples:
 
 ``` sql
-visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-visitParamExtractString('{"abc":"\\u263"}', 'abc') = ''
-visitParamExtractString('{"abc":"hello}', 'abc') = ''
+visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0';
+visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺';
+visitParamExtractString('{"abc":"\\u263"}', 'abc') = '';
+visitParamExtractString('{"abc":"hello}', 'abc') = '';
 ```
 
 There is currently no support for code points in the format `\uXXXX\uYYYY` that are not from the basic multilingual plane (they are converted to CESU-8 instead of UTF-8).
@@ -92,7 +106,7 @@ SELECT JSONHas('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4) = 0
 -   Positive integer = access the n-th member/key from the beginning.
 -   Negative integer = access the n-th member/key from the end.
 
-Minimum index of the element is 1. Thus the element 0 doesn’t exist.
+Minimum index of the element is 1. Thus the element 0 does not exist.
 
 You may use integers to access both JSON arrays and JSON objects.
 
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index c40aa3d1eae..8163650efab 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -696,10 +696,6 @@ Returns the server’s uptime in seconds.
 
 Returns the version of the server as a string.
 
-## timezone() {#timezone}
-
-Returns the timezone of the server.
-
 ## blockNumber {#blocknumber}
 
 Returns the sequence number of the data block where the row is located.
@@ -1192,6 +1188,109 @@ SELECT defaultValueOfTypeName('Nullable(Int8)')
 └──────────────────────────────────────────┘
 ```
 
+## indexHint {#indexhint}
+The function is intended for debugging and introspection purposes. The function ignores it's argument and always returns 1. Arguments are not even evaluated.
+
+But for the purpose of index analysis, the argument of this function is analyzed as if it was present directly without being wrapped inside `indexHint` function. This allows to select data in index ranges by the corresponding condition but without further filtering by this condition. The index in ClickHouse is sparse and using `indexHint` will yield more data than specifying the same condition directly.
+
+**Syntax**
+
+```sql
+SELECT * FROM table WHERE indexHint(<expression>)
+```
+
+**Returned value**
+
+1. Type: [Uint8](https://clickhouse.yandex/docs/en/data_types/int_uint/#diapazony-uint).
+
+**Example**
+
+Here is the example of test data from the table [ontime](../../getting-started/example-datasets/ontime.md).
+
+Input table:
+
+```sql
+SELECT count() FROM ontime
+```
+
+```text
+┌─count()─┐
+│ 4276457 │
+└─────────┘
+```
+
+The table has indexes on the fields `(FlightDate, (Year, FlightDate))`.
+
+Create a query, where the index is not used.
+
+Query:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime GROUP BY k ORDER BY k
+```
+
+ClickHouse processed the entire table (`Processed 4.28 million rows`).
+
+Result:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-01-01 │   13970 │
+│ 2017-01-02 │   15882 │
+........................
+│ 2017-09-28 │   16411 │
+│ 2017-09-29 │   16384 │
+│ 2017-09-30 │   12520 │
+└────────────┴─────────┘
+```
+
+To apply the index, select a specific date.
+
+Query:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime WHERE k = '2017-09-15' GROUP BY k ORDER BY k
+```
+
+By using the index, ClickHouse processed a significantly smaller number of rows (`Processed 32.74 thousand rows`).
+
+Result:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-15 │   16428 │
+└────────────┴─────────┘
+```
+
+Now wrap the expression `k = '2017-09-15'` into `indexHint` function.
+
+Query:
+
+```sql
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE indexHint(k = '2017-09-15')
+GROUP BY k
+ORDER BY k ASC
+```
+
+ClickHouse used the index in the same way as the previous time (`Processed 32.74 thousand rows`).
+The expression `k = '2017-09-15'` was not used when generating the result.
+In examle the `indexHint` function allows to see adjacent dates.
+
+Result:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-14 │    7071 │
+│ 2017-09-15 │   16428 │
+│ 2017-09-16 │    1077 │
+│ 2017-09-30 │    8167 │
+└────────────┴─────────┘
+```
+
 ## replicate {#other-functions-replicate}
 
 Creates an array with a single value.
@@ -1555,7 +1654,7 @@ joinGet(join_storage_table_name, `value_column`, join_keys)
 
 Returns list of values corresponded to list of keys.
 
-If certain doesn’t exist in source table then `0` or `null` will be returned based on [join_use_nulls](../../operations/settings/settings.md#join_use_nulls) setting.
+If certain does not exist in source table then `0` or `null` will be returned based on [join_use_nulls](../../operations/settings/settings.md#join_use_nulls) setting.
 
 More info about `join_use_nulls` in [Join operation](../../engines/table-engines/special/join.md).
 
@@ -1615,7 +1714,7 @@ Code: 395. DB::Exception: Received from localhost:9000. DB::Exception: Too many.
 
 ## identity {#identity}
 
-Returns the same value that was used as its argument. Used for debugging and testing, allows to cancel using index, and get the query performance of a full scan. When query is analyzed for possible use of index, the analyzer doesn’t look inside `identity` functions. Also constant folding is not applied too.
+Returns the same value that was used as its argument. Used for debugging and testing, allows to cancel using index, and get the query performance of a full scan. When query is analyzed for possible use of index, the analyzer does not look inside `identity` functions. Also constant folding is not applied too.
 
 **Syntax**
 
diff --git a/docs/en/sql-reference/functions/rounding-functions.md b/docs/en/sql-reference/functions/rounding-functions.md
index c0bd44a6467..5f74c6329d1 100644
--- a/docs/en/sql-reference/functions/rounding-functions.md
+++ b/docs/en/sql-reference/functions/rounding-functions.md
@@ -14,7 +14,7 @@ Returns the largest round number that is less than or equal to `x`. A round numb
 Examples: `floor(123.45, 1) = 123.4, floor(123.45, -1) = 120.`
 
 `x` is any numeric type. The result is a number of the same type.
-For integer arguments, it makes sense to round with a negative `N` value (for non-negative `N`, the function doesn’t do anything).
+For integer arguments, it makes sense to round with a negative `N` value (for non-negative `N`, the function does not do anything).
 If rounding causes overflow (for example, floor(-128, -1)), an implementation-specific result is returned.
 
 ## ceil(x\[, N\]), ceiling(x\[, N\]) {#ceilx-n-ceilingx-n}
diff --git a/docs/en/sql-reference/functions/splitting-merging-functions.md b/docs/en/sql-reference/functions/splitting-merging-functions.md
index bd7e209549c..2d384f1aa3c 100644
--- a/docs/en/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/en/sql-reference/functions/splitting-merging-functions.md
@@ -13,7 +13,7 @@ Returns an array of selected substrings. Empty substrings may be selected if the
 **Syntax**
 
 ``` sql
-splitByChar(<separator>, <s>)
+splitByChar(separator, s)
 ```
 
 **Arguments**
@@ -29,12 +29,12 @@ Returns an array of selected substrings. Empty substrings may be selected when:
 -   There are multiple consecutive separators;
 -   The original string `s` is empty.
 
-Type: [Array](../../sql-reference/data-types/array.md) of [String](../../sql-reference/data-types/string.md).
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
 **Example**
 
 ``` sql
-SELECT splitByChar(',', '1,2,3,abcde')
+SELECT splitByChar(',', '1,2,3,abcde');
 ```
 
 ``` text
@@ -50,7 +50,7 @@ Splits a string into substrings separated by a string. It uses a constant string
 **Syntax**
 
 ``` sql
-splitByString(<separator>, <s>)
+splitByString(separator, s)
 ```
 
 **Arguments**
@@ -62,7 +62,7 @@ splitByString(<separator>, <s>)
 
 Returns an array of selected substrings. Empty substrings may be selected when:
 
-Type: [Array](../../sql-reference/data-types/array.md) of [String](../../sql-reference/data-types/string.md).
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
 -   A non-empty separator occurs at the beginning or end of the string;
 -   There are multiple consecutive non-empty separators;
@@ -71,7 +71,7 @@ Type: [Array](../../sql-reference/data-types/array.md) of [String](../../sql-ref
 **Example**
 
 ``` sql
-SELECT splitByString(', ', '1, 2 3, 4,5, abcde')
+SELECT splitByString(', ', '1, 2 3, 4,5, abcde');
 ```
 
 ``` text
@@ -81,7 +81,7 @@ SELECT splitByString(', ', '1, 2 3, 4,5, abcde')
 ```
 
 ``` sql
-SELECT splitByString('', 'abcde')
+SELECT splitByString('', 'abcde');
 ```
 
 ``` text
@@ -90,6 +90,61 @@ SELECT splitByString('', 'abcde')
 └────────────────────────────┘
 ```
 
+## splitByRegexp(regexp, s) {#splitbyregexpseparator-s}
+
+Splits a string into substrings separated by a regular expression. It uses a regular expression string `regexp` as the separator. If the `regexp` is empty, it will split the string `s` into an array of single characters. If no match is found for this regular expression, the string `s` won't be split.
+
+**Syntax**
+
+``` sql
+splitByRegexp(regexp, s)
+```
+
+**Arguments**
+
+-   `regexp` — Regular expression. Constant. [String](../data-types/string.md) or [FixedString](../data-types/fixedstring.md).
+-   `s` — The string to split. [String](../../sql-reference/data-types/string.md).
+
+**Returned value(s)**
+
+Returns an array of selected substrings. Empty substrings may be selected when:
+
+-   A non-empty regular expression match occurs at the beginning or end of the string;
+-   There are multiple consecutive non-empty regular expression matches;
+-   The original string `s` is empty while the regular expression is not empty.
+
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT splitByRegexp('\\d+', 'a12bc23de345f');
+```
+
+Result:
+
+``` text
+┌─splitByRegexp('\\d+', 'a12bc23de345f')─┐
+│ ['a','bc','de','f']                    │
+└────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT splitByRegexp('', 'abcde');
+```
+
+Result:
+
+``` text
+┌─splitByRegexp('', 'abcde')─┐
+│ ['a','b','c','d','e']      │
+└────────────────────────────┘
+```
+
 ## 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.
@@ -102,7 +157,7 @@ Selects substrings of consecutive bytes from the ranges a-z and A-Z.Returns an a
 **Example**
 
 ``` sql
-SELECT alphaTokens('abca1abc')
+SELECT alphaTokens('abca1abc');
 ```
 
 ``` text
@@ -149,4 +204,3 @@ Result:
 │ [['abc','123'],['8','"hkl"']]                                         │
 └───────────────────────────────────────────────────────────────────────┘
 ```
-
diff --git a/docs/en/sql-reference/functions/string-functions.md b/docs/en/sql-reference/functions/string-functions.md
index 3d3caaf6e23..5074f478bc0 100644
--- a/docs/en/sql-reference/functions/string-functions.md
+++ b/docs/en/sql-reference/functions/string-functions.md
@@ -29,17 +29,17 @@ The function also works for arrays.
 
 ## lengthUTF8 {#lengthutf8}
 
-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 doesn’t throw an exception).
+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.
 
 ## char_length, CHAR_LENGTH {#char-length}
 
-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 doesn’t throw an exception).
+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.
 
 ## character_length, CHARACTER_LENGTH {#character-length}
 
-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 doesn’t throw an exception).
+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.
 
 ## lower, lcase {#lower}
@@ -53,14 +53,14 @@ Converts ASCII Latin symbols in a string to uppercase.
 ## lowerUTF8 {#lowerutf8}
 
 Converts a string to lowercase, assuming the string contains a set of bytes that make up a UTF-8 encoded text.
-It doesn’t detect the language. So for Turkish the result might not be exactly correct.
+It does not detect the language. So for Turkish the result might not be exactly correct.
 If the length of the UTF-8 byte sequence is different for upper and lower case of a code point, the result may be incorrect for this code point.
 If the string contains a set of bytes that is not UTF-8, then the behavior is undefined.
 
 ## upperUTF8 {#upperutf8}
 
 Converts a string to uppercase, assuming the string contains a set of bytes that make up a UTF-8 encoded text.
-It doesn’t detect the language. So for Turkish the result might not be exactly correct.
+It does not detect the language. So for Turkish the result might not be exactly correct.
 If the length of the UTF-8 byte sequence is different for upper and lower case of a code point, the result may be incorrect for this code point.
 If the string contains a set of bytes that is not UTF-8, then the behavior is undefined.
 
@@ -139,7 +139,7 @@ Reverses the string (as a sequence of bytes).
 
 ## reverseUTF8 {#reverseutf8}
 
-Reverses a sequence of Unicode code points, assuming that the string contains a set of bytes representing a UTF-8 text. Otherwise, it does something else (it doesn’t throw an exception).
+Reverses a sequence of Unicode code points, assuming that the string contains a set of bytes representing a UTF-8 text. Otherwise, it does something else (it does not throw an exception).
 
 ## format(pattern, s0, s1, …) {#format}
 
@@ -264,7 +264,7 @@ Returns a substring starting with the byte from the ‘offset’ index that is 
 
 ## substringUTF8(s, offset, length) {#substringutf8}
 
-The same as ‘substring’, but for Unicode code points. Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, it returns some result (it doesn’t throw an exception).
+The same as ‘substring’, but for Unicode code points. Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, it returns some result (it does not throw an exception).
 
 ## appendTrailingCharIfAbsent(s, c) {#appendtrailingcharifabsent}
 
@@ -305,7 +305,7 @@ SELECT startsWith('Spider-Man', 'Spi');
 **Returned values**
 
 -   1, if the string starts with the specified prefix.
--   0, if the string doesn’t start with the specified prefix.
+-   0, if the string does not start with the specified prefix.
 
 **Example**
 
@@ -363,7 +363,7 @@ Result:
 
 ## trimLeft {#trimleft}
 
-Removes all consecutive occurrences of common whitespace (ASCII character 32) from the beginning of a string. It doesn’t remove other kinds of whitespace characters (tab, no-break space, etc.).
+Removes all consecutive occurrences of common whitespace (ASCII character 32) from the beginning of a string. It does not remove other kinds of whitespace characters (tab, no-break space, etc.).
 
 **Syntax**
 
@@ -401,7 +401,7 @@ Result:
 
 ## trimRight {#trimright}
 
-Removes all consecutive occurrences of common whitespace (ASCII character 32) from the end of a string. It doesn’t remove other kinds of whitespace characters (tab, no-break space, etc.).
+Removes all consecutive occurrences of common whitespace (ASCII character 32) from the end of a string. It does not remove other kinds of whitespace characters (tab, no-break space, etc.).
 
 **Syntax**
 
@@ -439,7 +439,7 @@ Result:
 
 ## trimBoth {#trimboth}
 
-Removes all consecutive occurrences of common whitespace (ASCII character 32) from both ends of a string. It doesn’t remove other kinds of whitespace characters (tab, no-break space, etc.).
+Removes all consecutive occurrences of common whitespace (ASCII character 32) from both ends of a string. It does not remove other kinds of whitespace characters (tab, no-break space, etc.).
 
 **Syntax**
 
@@ -649,3 +649,65 @@ Result:
 -   [List of XML and HTML character entity references](https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references)
 
 
+
+## extractTextFromHTML {#extracttextfromhtml}
+
+A function to extract text from HTML or XHTML.
+It does not necessarily 100% conform to any of the HTML, XML or XHTML standards, but the implementation is reasonably accurate and it is fast. The rules are the following:
+
+1. Comments are skipped. Example: `<!-- test -->`. Comment must end with `-->`. Nested comments are not possible.
+Note: constructions like `<!-->` and `<!--->` are not valid comments in HTML but they are skipped by other rules.
+2. CDATA is pasted verbatim. Note: CDATA is XML/XHTML specific. But it is processed for "best-effort" approach.
+3. `script` and `style` elements are removed with all their content. Note: it is assumed that closing tag cannot appear inside content. For example, in JS string literal has to be escaped like `"<\/script>"`.
+Note: comments and CDATA are possible inside `script` or `style` - then closing tags are not searched inside CDATA. Example: `<script><![CDATA[</script>]]></script>`. But they are still searched inside comments. Sometimes it becomes complicated: `<script>var x = "<!--"; </script> var y = "-->"; alert(x + y);</script>`
+Note: `script` and `style` can be the names of XML namespaces - then they are not treated like usual `script` or `style` elements. Example: `<script:a>Hello</script:a>`.
+Note: whitespaces are possible after closing tag name: `</script >` but not before: `< / script>`.
+4. Other tags or tag-like elements are skipped without inner content. Example: `<a>.</a>`
+Note: it is expected that this HTML is illegal: `<a test=">"></a>`
+Note: it also skips something like tags: `<>`, `<!>`, etc.
+Note: tag without end is skipped to the end of input: `<hello   `
+5. HTML and XML entities are not decoded. They must be processed by separate function.
+6. Whitespaces in the text are collapsed or inserted by specific rules.
+    - Whitespaces at the beginning and at the end are removed.
+    - Consecutive whitespaces are collapsed.
+    - But if the text is separated by other elements and there is no whitespace, it is inserted.
+    - It may cause unnatural examples: `Hello<b>world</b>`, `Hello<!-- -->world` - there is no whitespace in HTML, but the function inserts it. Also consider: `Hello<p>world</p>`, `Hello<br>world`. This behavior is reasonable for data analysis, e.g. to convert HTML to a bag of words.
+7. Also note that correct handling of whitespaces requires the support of `<pre></pre>` and CSS `display` and `white-space` properties.
+
+**Syntax**
+
+``` sql
+extractTextFromHTML(x)
+```
+
+**Arguments**
+
+-   `x` — input text. [String](../../sql-reference/data-types/string.md). 
+
+**Returned value**
+
+-   Extracted text.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+The first example contains several tags and a comment and also shows whitespace processing.
+The second example shows `CDATA` and `script` tag processing.
+In the third example text is extracted from the full HTML response received by the [url](../../sql-reference/table-functions/url.md) function.
+
+Query:
+
+``` sql
+SELECT extractTextFromHTML(' <p> A text <i>with</i><b>tags</b>. <!-- comments --> </p> ');
+SELECT extractTextFromHTML('<![CDATA[The content within <b>CDATA</b>]]> <script>alert("Script");</script>');
+SELECT extractTextFromHTML(html) FROM url('http://www.donothingfor2minutes.com/', RawBLOB, 'html String');
+```
+
+Result:
+
+``` text
+A text with tags .
+The content within <b>CDATA</b>
+Do Nothing for 2 Minutes 2:00 &nbsp;
+```
diff --git a/docs/en/sql-reference/functions/string-search-functions.md b/docs/en/sql-reference/functions/string-search-functions.md
index 01b1dd2d004..551c4aee8f0 100644
--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@@ -126,7 +126,7 @@ Result:
 
 The same as [position](#position) returns the position (in bytes) of the found substring in the string, starting from 1. Use the function for a case-insensitive search.
 
-Works under the assumption that the string contains a set of bytes representing a single-byte encoded text. If this assumption is not met and a character can’t be represented using a single byte, the function doesn’t throw an exception and returns some unexpected result. If character can be represented using two bytes, it will use two bytes and so on.
+Works under the assumption that the string contains a set of bytes representing a single-byte encoded text. If this assumption is not met and a character can’t be represented using a single byte, the function does not throw an exception and returns some unexpected result. If character can be represented using two bytes, it will use two bytes and so on.
 
 **Syntax**
 
@@ -167,7 +167,7 @@ Result:
 
 Returns the position (in Unicode points) of the found substring in the string, starting from 1.
 
-Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, the function doesn’t throw an exception and returns some unexpected result. If character can be represented using two Unicode points, it will use two and so on.
+Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, the function does not throw an exception and returns some unexpected result. If character can be represented using two Unicode points, it will use two and so on.
 
 For a case-insensitive search, use the function [positionCaseInsensitiveUTF8](#positioncaseinsensitiveutf8).
 
@@ -242,7 +242,7 @@ Result:
 
 The same as [positionUTF8](#positionutf8), but is case-insensitive. Returns the position (in Unicode points) of the found substring in the string, starting from 1.
 
-Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, the function doesn’t throw an exception and returns some unexpected result. If character can be represented using two Unicode points, it will use two and so on.
+Works under the assumption that the string contains a set of bytes representing a UTF-8 encoded text. If this assumption is not met, the function does not throw an exception and returns some unexpected result. If character can be represented using two Unicode points, it will use two and so on.
 
 **Syntax**
 
@@ -349,7 +349,7 @@ For a case-insensitive search or/and in UTF-8 format use functions `multiSearchA
 
 Checks whether the string matches the `pattern` regular expression. A `re2` regular expression. The [syntax](https://github.com/google/re2/wiki/Syntax) of the `re2` regular expressions is more limited than the syntax of the Perl regular expressions.
 
-Returns 0 if it doesn’t match, or 1 if it matches.
+Returns 0 if it does not match, or 1 if it matches.
 
 Note that the backslash symbol (`\`) is used for escaping in the regular expression. The same symbol is used for escaping in string literals. So in order to escape the symbol in a regular expression, you must write two backslashes (\\) in a string literal.
 
@@ -391,11 +391,11 @@ The same as `multiFuzzyMatchAny`, but returns the array of all indices in any or
 
 ## extract(haystack, pattern) {#extracthaystack-pattern}
 
-Extracts a fragment of a string using a regular expression. If ‘haystack’ doesn’t match the ‘pattern’ regex, an empty string is returned. If the regex doesn’t contain subpatterns, it takes the fragment that matches the entire regex. Otherwise, it takes the fragment that matches the first subpattern.
+Extracts a fragment of a string using a regular expression. If ‘haystack’ does not match the ‘pattern’ regex, an empty string is returned. If the regex does not contain subpatterns, it takes the fragment that matches the entire regex. Otherwise, it takes the fragment that matches the first subpattern.
 
 ## extractAll(haystack, pattern) {#extractallhaystack-pattern}
 
-Extracts all the fragments of a string using a regular expression. If ‘haystack’ doesn’t match the ‘pattern’ regex, an empty string is returned. Returns an array of strings consisting of all matches to the regex. In general, the behavior is the same as the ‘extract’ function (it takes the first subpattern, or the entire expression if there isn’t a subpattern).
+Extracts all the fragments of a string using a regular expression. If ‘haystack’ does not match the ‘pattern’ regex, an empty string is returned. Returns an array of strings consisting of all matches to the regex. In general, the behavior is the same as the ‘extract’ function (it takes the first subpattern, or the entire expression if there isn’t a subpattern).
 
 ## extractAllGroupsHorizontal {#extractallgroups-horizontal}
 
@@ -419,7 +419,7 @@ extractAllGroupsHorizontal(haystack, pattern)
 
 -   Type: [Array](../../sql-reference/data-types/array.md).
 
-If `haystack` doesn’t match the `pattern` regex, an array of empty arrays is returned. 
+If `haystack` does not match the `pattern` regex, an array of empty arrays is returned. 
 
 **Example**
 
@@ -460,7 +460,7 @@ extractAllGroupsVertical(haystack, pattern)
 
 -   Type: [Array](../../sql-reference/data-types/array.md).
 
-If `haystack` doesn’t match the `pattern` regex, an empty array is returned. 
+If `haystack` does not match the `pattern` regex, an empty array is returned. 
 
 **Example**
 
@@ -513,7 +513,7 @@ ilike(haystack, pattern)
 **Arguments**
 
 -   `haystack` — Input string. [String](../../sql-reference/syntax.md#syntax-string-literal).
--   `pattern` — If `pattern` doesn't contain percent signs or underscores, then the `pattern` only represents the string itself. An underscore (`_`) in `pattern` stands for (matches) any single character. A percent sign (`%`) matches any sequence of zero or more characters.
+-   `pattern` — If `pattern` does not contain percent signs or underscores, then the `pattern` only represents the string itself. An underscore (`_`) in `pattern` stands for (matches) any single character. A percent sign (`%`) matches any sequence of zero or more characters.
 
 Some `pattern` examples:
 
@@ -527,7 +527,7 @@ Some `pattern` examples:
 **Returned values**
 
 -   True, if the string matches `pattern`.
--   False, if the string doesn't match `pattern`.
+-   False, if the string does not match `pattern`.
 
 **Example**
 
diff --git a/docs/en/sql-reference/functions/tuple-functions.md b/docs/en/sql-reference/functions/tuple-functions.md
index 86442835425..4189d0feeb5 100644
--- a/docs/en/sql-reference/functions/tuple-functions.md
+++ b/docs/en/sql-reference/functions/tuple-functions.md
@@ -153,7 +153,7 @@ Result:
 Can be used with [MinHash](../../sql-reference/functions/hash-functions.md#ngramminhash) functions for detection of semi-duplicate strings:
 
 ``` sql
-SELECT tupleHammingDistance(wordShingleMinHash(string), wordShingleMinHashCaseInsensitive(string)) as HammingDistance FROM (SELECT 'Clickhouse is a column-oriented database management system for online analytical processing of queries.' AS string);
+SELECT tupleHammingDistance(wordShingleMinHash(string), wordShingleMinHashCaseInsensitive(string)) as HammingDistance FROM (SELECT 'ClickHouse is a column-oriented database management system for online analytical processing of queries.' AS string);
 ```
 
 Result:
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index d8d13d81d97..661469e6901 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -373,7 +373,7 @@ This function accepts a number or date or date with time, and returns a FixedStr
 
 ## reinterpretAsUUID {#reinterpretasuuid}
 
-This function accepts 16 bytes string, and returns UUID containing bytes representing the corresponding value in network byte order (big-endian). If the string isn't long enough, the functions work as if the string is padded with the necessary number of null bytes to the end. If the string longer than 16 bytes, the extra bytes at the end are ignored. 
+Accepts 16 bytes string and returns UUID containing bytes representing the corresponding value in network byte order (big-endian). If the string isn't long enough, the function works as if the string is padded with the necessary number of null bytes to the end. If the string longer than 16 bytes, the extra bytes at the end are ignored. 
 
 **Syntax**
 
@@ -429,7 +429,24 @@ Result:
 
 ## reinterpret(x, T) {#type_conversion_function-reinterpret}
 
-Use the same source in-memory bytes sequence for `x` value and reinterpret it to destination type
+Uses the same source in-memory bytes sequence for `x` value and reinterprets it to destination type.
+
+**Syntax**
+
+``` sql
+reinterpret(x, type)
+```
+
+**Arguments**
+
+-   `x` — Any type. 
+-   `type` — Destination type. [String](../../sql-reference/data-types/string.md). 
+
+**Returned value**
+
+-   Destination type value.
+
+**Examples**
 
 Query:
 ```sql
@@ -448,11 +465,27 @@ Result:
 
 ## CAST(x, T) {#type_conversion_function-cast}
 
-Converts input value `x` to the `T` data type. Unlike to `reinterpret` function use external representation of `x` value. 
+Converts input value `x` to the `T` data type. Unlike to `reinterpret` function, type conversion is performed in a natural way.
 
 The syntax `CAST(x AS t)` is also supported.
 
-Note, that if value `x` does not fit the bounds of type T, the function overflows. For example, CAST(-1, 'UInt8') returns 255.
+!!! note "Note"
+    If value `x` does not fit the bounds of type `T`, the function overflows. For example, `CAST(-1, 'UInt8')` returns `255`.
+
+**Syntax**
+
+``` sql
+CAST(x, T)
+```
+
+**Arguments**
+
+-   `x` — Any type. 
+-   `T` — Destination type. [String](../../sql-reference/data-types/string.md).  
+
+**Returned value**
+
+-   Destination type value.
 
 **Examples**
 
@@ -460,9 +493,9 @@ Query:
 
 ```sql
 SELECT
-    cast(toInt8(-1), 'UInt8') AS cast_int_to_uint,
-    cast(toInt8(1), 'Float32') AS cast_int_to_float,
-    cast('1', 'UInt32') AS cast_string_to_int
+    CAST(toInt8(-1), 'UInt8') AS cast_int_to_uint,
+    CAST(toInt8(1), 'Float32') AS cast_int_to_float,
+    CAST('1', 'UInt32') AS cast_string_to_int;
 ```
 
 Result:
@@ -492,7 +525,7 @@ Result:
 └─────────────────────┴─────────────────────┴────────────┴─────────────────────┴───────────────────────────┘
 ```
 
-Conversion to FixedString(N) only works for arguments of type String or FixedString(N).
+Conversion to FixedString(N) only works for arguments of type [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
 
 Type conversion to [Nullable](../../sql-reference/data-types/nullable.md) and back is supported. 
 
@@ -1038,7 +1071,7 @@ Result:
 
 ## parseDateTime64BestEffort {#parsedatetime64besteffort}
 
-Same as [parseDateTimeBestEffort](#parsedatetimebesteffort) function but also parse milliseconds and microseconds and return `DateTime64(3)` or `DateTime64(6)` data types.
+Same as [parseDateTimeBestEffort](#parsedatetimebesteffort) function but also parse milliseconds and microseconds and returns [DateTime](../../sql-reference/functions/type-conversion-functions.md#data_type-datetime) data type.
 
 **Syntax**
 
@@ -1049,9 +1082,13 @@ parseDateTime64BestEffort(time_string [, precision [, time_zone]])
 **Parameters**
 
 -   `time_string` — String containing a date or date with time to convert. [String](../../sql-reference/data-types/string.md).
--   `precision` — `3` for milliseconds, `6` for microseconds. Default `3`. Optional [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `precision` — Required precision. `3` — for milliseconds, `6` — for microseconds. Default — `3`. Optional. [UInt8](../../sql-reference/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**
+
+-   `time_string` converted to the [DateTime](../../sql-reference/data-types/datetime.md) data type.
+
 **Examples**
 
 Query:
@@ -1064,7 +1101,7 @@ UNION ALL
 SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',6) AS a, toTypeName(a) AS t
 UNION ALL
 SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',3,'Europe/Moscow') AS a, toTypeName(a) AS t
-FORMAT PrettyCompactMonoBlcok
+FORMAT PrettyCompactMonoBlock;
 ```
 
 Result:
@@ -1131,12 +1168,14 @@ Result:
 
 ## toUnixTimestamp64Nano {#tounixtimestamp64nano}
 
-Converts a `DateTime64` to a `Int64` value with fixed sub-second precision.
-Input value is scaled up or down appropriately depending on it precision. Please note that output value is a timestamp in UTC, not in timezone of `DateTime64`.
+Converts a `DateTime64` to a `Int64` value with fixed sub-second precision. Input value is scaled up or down appropriately depending on it precision. 
+
+!!! info "Note"
+    The output value is a timestamp in UTC, not in the timezone of `DateTime64`.
 
 **Syntax**
 
-``` sql
+```sql
 toUnixTimestamp64Milli(value)
 ```
 
@@ -1152,7 +1191,7 @@ toUnixTimestamp64Milli(value)
 
 Query:
 
-``` sql
+```sql
 WITH toDateTime64('2019-09-16 19:20:12.345678910', 6) AS dt64
 SELECT toUnixTimestamp64Milli(dt64);
 ```
@@ -1298,4 +1337,3 @@ Result:
 │ 2,"good"                                  │
 └───────────────────────────────────────────┘
 ```
-
diff --git a/docs/en/sql-reference/functions/url-functions.md b/docs/en/sql-reference/functions/url-functions.md
index 9feb7a3c711..397ae45ec71 100644
--- a/docs/en/sql-reference/functions/url-functions.md
+++ b/docs/en/sql-reference/functions/url-functions.md
@@ -5,7 +5,7 @@ toc_title: URLs
 
 # Functions for Working with URLs {#functions-for-working-with-urls}
 
-All these functions don’t follow the RFC. They are maximally simplified for improved performance.
+All these functions do not follow the RFC. They are maximally simplified for improved performance.
 
 ## Functions that Extract Parts of a URL {#functions-that-extract-parts-of-a-url}
 
@@ -398,7 +398,7 @@ Result:
 
 ## Functions that Remove Part of a URL {#functions-that-remove-part-of-a-url}
 
-If the URL doesn’t have anything similar, the URL remains unchanged.
+If the URL does not have anything similar, the URL remains unchanged.
 
 ### cutWWW {#cutwww}
 
diff --git a/docs/en/sql-reference/functions/ym-dict-functions.md b/docs/en/sql-reference/functions/ym-dict-functions.md
index 941f75ff006..f947c81c7a9 100644
--- a/docs/en/sql-reference/functions/ym-dict-functions.md
+++ b/docs/en/sql-reference/functions/ym-dict-functions.md
@@ -136,7 +136,7 @@ In the Yandex geobase, the population might be recorded for child regions, but n
 
 ### regionIn(lhs, rhs\[, geobase\]) {#regioninlhs-rhs-geobase}
 
-Checks whether a ‘lhs’ region belongs to a ‘rhs’ region. Returns a UInt8 number equal to 1 if it belongs, or 0 if it doesn’t belong.
+Checks whether a ‘lhs’ region belongs to a ‘rhs’ region. Returns a UInt8 number equal to 1 if it belongs, or 0 if it does not belong.
 The relationship is reflexive – any region also belongs to itself.
 
 ### regionHierarchy(id\[, geobase\]) {#regionhierarchyid-geobase}
@@ -146,7 +146,7 @@ Example: `regionHierarchy(toUInt32(213)) = [213,1,3,225,10001,10000]`.
 
 ### 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.
+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 does not exist, an empty string is returned.
 
 `ua` and `uk` both mean Ukrainian.
 
diff --git a/docs/en/sql-reference/operators/in.md b/docs/en/sql-reference/operators/in.md
index 0abeabc7f57..3d8d2673468 100644
--- a/docs/en/sql-reference/operators/in.md
+++ b/docs/en/sql-reference/operators/in.md
@@ -208,10 +208,10 @@ and the temporary table `_data1` will be sent to every remote server with the qu
 
 This is more optimal than using the normal IN. However, keep the following points in mind:
 
-1.  When creating a temporary table, data is not made unique. To reduce the volume of data transmitted over the network, specify DISTINCT in the subquery. (You don’t need to do this for a normal IN.)
+1.  When creating a temporary table, data is not made unique. To reduce the volume of data transmitted over the network, specify DISTINCT in the subquery. (You do not need to do this for a normal IN.)
 2.  The temporary table will be sent to all the remote servers. Transmission does not account for network topology. For example, if 10 remote servers reside in a datacenter that is very remote in relation to the requestor server, the data will be sent 10 times over the channel to the remote datacenter. Try to avoid large data sets when using GLOBAL IN.
 3.  When transmitting data to remote servers, restrictions on network bandwidth are not configurable. You might overload the network.
-4.  Try to distribute data across servers so that you don’t need to use GLOBAL IN on a regular basis.
+4.  Try to distribute data across servers so that you do not need to use GLOBAL IN on a regular basis.
 5.  If you need to use GLOBAL IN often, plan the location of the ClickHouse cluster so that a single group of replicas resides in no more than one data center with a fast network between them, so that a query can be processed entirely within a single data center.
 
 It also makes sense to specify a local table in the `GLOBAL IN` clause, in case this local table is only available on the requestor server and you want to use data from it on remote servers.
@@ -236,4 +236,4 @@ where M is between 1 and 3 depending on which replica the local query is executi
 
 Therefore adding the max_parallel_replicas setting will only produce correct results if both tables have the same replication scheme and are sampled by UserID or a subkey of it. In particular, if local_table_2 does not have a sampling key, incorrect results will be produced. The same rule applies to JOIN.
 
-One workaround if local_table_2 doesn't meet the requirements, is to use `GLOBAL IN` or `GLOBAL JOIN`.
+One workaround if local_table_2 does not meet the requirements, is to use `GLOBAL IN` or `GLOBAL JOIN`.
diff --git a/docs/en/sql-reference/operators/index.md b/docs/en/sql-reference/operators/index.md
index e073d5f23f0..31fce7f72b3 100644
--- a/docs/en/sql-reference/operators/index.md
+++ b/docs/en/sql-reference/operators/index.md
@@ -250,7 +250,7 @@ The following operators do not have a priority since they are brackets:
 ## Associativity {#associativity}
 
 All binary operators have left associativity. For example, `1 + 2 + 3` is transformed to `plus(plus(1, 2), 3)`.
-Sometimes this doesn’t work the way you expect. For example, `SELECT 4 > 2 > 3` will result in 0.
+Sometimes this does not work the way you expect. For example, `SELECT 4 > 2 > 3` will result in 0.
 
 For efficiency, the `and` and `or` functions accept any number of arguments. The corresponding chains of `AND` and `OR` operators are transformed into a single call of these functions.
 
diff --git a/docs/en/sql-reference/statements/alter/column.md b/docs/en/sql-reference/statements/alter/column.md
index 3ece30be5b8..2e7cd1be952 100644
--- a/docs/en/sql-reference/statements/alter/column.md
+++ b/docs/en/sql-reference/statements/alter/column.md
@@ -39,7 +39,7 @@ Adds a new column to the table with the specified `name`, `type`, [`codec`](../.
 
 If the `IF NOT EXISTS` clause is included, the query won’t return an error if the column already exists. If you specify `AFTER name_after` (the name of another column), the column is added after the specified one in the list of table columns. If you want to add a column to the beginning of the table use the `FIRST` clause. Otherwise, the column is added to the end of the table. For a chain of actions, `name_after` can be the name of a column that is added in one of the previous actions.
 
-Adding a column just changes the table structure, without performing any actions with data. The data doesn’t appear on the disk after `ALTER`. If the data is missing for a column when reading from the table, it is filled in with default values (by performing the default expression if there is one, or using zeros or empty strings). The column appears on the disk after merging data parts (see [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)).
+Adding a column just changes the table structure, without performing any actions with data. The data does not appear on the disk after `ALTER`. If the data is missing for a column when reading from the table, it is filled in with default values (by performing the default expression if there is one, or using zeros or empty strings). The column appears on the disk after merging data parts (see [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)).
 
 This approach allows us to complete the `ALTER` query instantly, without increasing the volume of old data.
 
@@ -70,10 +70,13 @@ Added3  UInt32
 DROP COLUMN [IF EXISTS] name
 ```
 
-Deletes the column with the name `name`. If the `IF EXISTS` clause is specified, the query won’t return an error if the column doesn’t exist.
+Deletes the column with the name `name`. If the `IF EXISTS` clause is specified, the query won’t return an error if the column does not exist.
 
 Deletes data from the file system. Since this deletes entire files, the query is completed almost instantly.
 
+!!! warning "Warning"
+    You can’t delete a column if it is referenced by [materialized view](../../../sql-reference/statements/create/view.md#materialized). Otherwise, it returns an error.
+
 Example:
 
 ``` sql
@@ -86,7 +89,7 @@ ALTER TABLE visits DROP COLUMN browser
 RENAME COLUMN [IF EXISTS] name to new_name
 ```
 
-Renames the column `name` to `new_name`. If the `IF EXISTS` clause is specified, the query won’t return an error if the column doesn’t exist. Since renaming does not involve the underlying data, the query is completed almost instantly.
+Renames the column `name` to `new_name`. If the `IF EXISTS` clause is specified, the query won’t return an error if the column does not exist. Since renaming does not involve the underlying data, the query is completed almost instantly.
 
 **NOTE**: Columns specified in the key expression of the table (either with `ORDER BY` or `PRIMARY KEY`) cannot be renamed. Trying to change these columns will produce `SQL Error [524]`. 
 
@@ -104,7 +107,7 @@ CLEAR COLUMN [IF EXISTS] name IN PARTITION partition_name
 
 Resets all data in a column for a specified partition. Read more about setting the partition name in the section [How to specify the partition expression](#alter-how-to-specify-part-expr).
 
-If the `IF EXISTS` clause is specified, the query won’t return an error if the column doesn’t exist.
+If the `IF EXISTS` clause is specified, the query won’t return an error if the column does not exist.
 
 Example:
 
@@ -118,7 +121,7 @@ ALTER TABLE visits CLEAR COLUMN browser IN PARTITION tuple()
 COMMENT COLUMN [IF EXISTS] name 'comment'
 ```
 
-Adds a comment to the column. If the `IF EXISTS` clause is specified, the query won’t return an error if the column doesn’t exist.
+Adds a comment to the column. If the `IF EXISTS` clause is specified, the query won’t return an error if the column does not exist.
 
 Each column can have one comment. If a comment already exists for the column, a new comment overwrites the previous comment.
 
@@ -146,11 +149,11 @@ This query changes the `name` column properties:
 
 For examples of columns TTL modifying, see [Column TTL](../../../engines/table-engines/mergetree-family/mergetree.md#mergetree-column-ttl).
 
-If the `IF EXISTS` clause is specified, the query won’t return an error if the column doesn’t exist.
+If the `IF EXISTS` clause is specified, the query won’t return an error if the column does not exist.
 
 The query also can change the order of the columns using `FIRST | AFTER` clause, see [ADD COLUMN](#alter_add-column) description.
 
-When changing the type, values are converted as if the [toType](../../../sql-reference/functions/type-conversion-functions.md) functions were applied to them. If only the default expression is changed, the query doesn’t do anything complex, and is completed almost instantly.
+When changing the type, values are converted as if the [toType](../../../sql-reference/functions/type-conversion-functions.md) functions were applied to them. If only the default expression is changed, the query does not do anything complex, and is completed almost instantly.
 
 Example:
 
@@ -180,7 +183,7 @@ ALTER TABLE table_name MODIFY column_name REMOVE property;
 ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 ```
 
-## See Also
+**See Also**
 
 - [REMOVE TTL](ttl.md).
 
@@ -210,4 +213,4 @@ If the `ALTER` query is not sufficient to make the table changes you need, you c
 
 The `ALTER` query blocks all reads and writes for the table. In other words, if a long `SELECT` is running at the time of the `ALTER` query, the `ALTER` query will wait for it to complete. At the same time, all new queries to the same table will wait while this `ALTER` is running.
 
-For tables that don’t store data themselves (such as `Merge` and `Distributed`), `ALTER` just changes the table structure, and does not change the structure of subordinate tables. For example, when running ALTER for a `Distributed` table, you will also need to run `ALTER` for the tables on all remote servers.
+For tables that do not store data themselves (such as `Merge` and `Distributed`), `ALTER` just changes the table structure, and does not change the structure of subordinate tables. For example, when running ALTER for a `Distributed` table, you will also need to run `ALTER` for the tables on all remote servers.
diff --git a/docs/en/sql-reference/statements/alter/partition.md b/docs/en/sql-reference/statements/alter/partition.md
index 30d79b47c0a..36a6cfca0f9 100644
--- a/docs/en/sql-reference/statements/alter/partition.md
+++ b/docs/en/sql-reference/statements/alter/partition.md
@@ -17,7 +17,7 @@ The following operations with [partitions](../../../engines/table-engines/merget
 -   [CLEAR INDEX IN PARTITION](#alter_clear-index-partition) — Resets the specified secondary index in a partition.
 -   [FREEZE PARTITION](#alter_freeze-partition) — Creates a backup of a partition.
 -   [UNFREEZE PARTITION](#alter_unfreeze-partition) — Removes a backup of a partition.
--   [FETCH PARTITION](#alter_fetch-partition) — Downloads a partition from another server.
+-   [FETCH PARTITION\|PART](#alter_fetch-partition) — Downloads a part or partition from another server.
 -   [MOVE PARTITION\|PART](#alter_move-partition) — Move partition/data part to another disk or volume.
 
 <!-- -->
@@ -89,12 +89,10 @@ Read more about setting the partition expression in a section [How to specify th
 This query is replicated. The replica-initiator checks whether there is data in the `detached` directory. 
 If data exists, the query checks its integrity. If everything is correct, the query adds the data to the table.
 
-If the non-initiator replica, receiving the attach command, finds the part with the correct checksums in its own 
-`detached` folder, it attaches the data without fetching it from other replicas.
+If the non-initiator replica, receiving the attach command, finds the part with the correct checksums in its own `detached` folder, it attaches the data without fetching it from other replicas.
 If there is no part with the correct checksums, the data is downloaded from any replica having the part.
 
-You can put data to the `detached` directory on one replica and use the `ALTER ... ATTACH` query to add it to the 
-table on all replicas.
+You can put data to the `detached` directory on one replica and use the `ALTER ... ATTACH` query to add it to the table on all replicas.
 
 ## ATTACH PARTITION FROM {#alter_attach-partition-from}
 
@@ -102,8 +100,8 @@ table on all replicas.
 ALTER TABLE table2 ATTACH PARTITION partition_expr FROM table1
 ```
 
-This query copies the data partition from the `table1` to `table2`.
-Note that data won't be deleted neither from `table1` nor from `table2`.
+This query copies the data partition from `table1` to `table2`.
+Note that data will be deleted neither from `table1` nor from `table2`.
 
 For the query to run successfully, the following conditions must be met:
 
@@ -187,7 +185,7 @@ To restore data from a backup, do the following:
 2.  Copy the data from the `data/database/table/` directory inside the backup to the `/var/lib/clickhouse/data/database/table/detached/` directory.
 3.  Run `ALTER TABLE t ATTACH PARTITION` queries to add the data to a table.
 
-Restoring from a backup doesn’t require stopping the server.
+Restoring from a backup does not require stopping the server.
 
 For more information about backups and restoring data, see the [Data Backup](../../../operations/backup.md) section.
 
@@ -207,29 +205,35 @@ ALTER TABLE table_name CLEAR INDEX index_name IN PARTITION partition_expr
 
 The query works similar to `CLEAR COLUMN`, but it resets an index instead of a column data.
 
-## FETCH PARTITION {#alter_fetch-partition}
+## FETCH PARTITION|PART {#alter_fetch-partition}
 
 ``` sql
-ALTER TABLE table_name FETCH PARTITION partition_expr FROM 'path-in-zookeeper'
+ALTER TABLE table_name FETCH PARTITION|PART partition_expr FROM 'path-in-zookeeper'
 ```
 
 Downloads a partition from another server. This query only works for the replicated tables.
 
 The query does the following:
 
-1.  Downloads the partition from the specified shard. In ‘path-in-zookeeper’ you must specify a path to the shard in ZooKeeper.
+1.  Downloads the partition|part from the specified shard. In ‘path-in-zookeeper’ you must specify a path to the shard in ZooKeeper.
 2.  Then the query puts the downloaded data to the `detached` directory of the `table_name` table. Use the [ATTACH PARTITION\|PART](#alter_attach-partition) query to add the data to the table.
 
 For example:
 
+1. FETCH PARTITION
 ``` sql
 ALTER TABLE users FETCH PARTITION 201902 FROM '/clickhouse/tables/01-01/visits';
 ALTER TABLE users ATTACH PARTITION 201902;
 ```
+2. FETCH PART
+``` sql
+ALTER TABLE users FETCH PART 201901_2_2_0 FROM '/clickhouse/tables/01-01/visits';
+ALTER TABLE users ATTACH PART 201901_2_2_0;
+```
 
 Note that:
 
--   The `ALTER ... FETCH PARTITION` query isn’t replicated. It places the partition to the `detached` directory only on the local server.
+-   The `ALTER ... FETCH PARTITION|PART` query isn’t replicated. It places the part or partition to the `detached` directory only on the local server.
 -   The `ALTER TABLE ... ATTACH` query is replicated. It adds the data to all replicas. The data is added to one of the replicas from the `detached` directory, and to the others - from neighboring replicas.
 
 Before downloading, the system checks if the partition exists and the table structure matches. The most appropriate replica is selected automatically from the healthy replicas.
diff --git a/docs/en/sql-reference/statements/alter/ttl.md b/docs/en/sql-reference/statements/alter/ttl.md
index aa7ee838e10..9cd63d3b8fe 100644
--- a/docs/en/sql-reference/statements/alter/ttl.md
+++ b/docs/en/sql-reference/statements/alter/ttl.md
@@ -79,7 +79,7 @@ The `TTL` is no longer there, so the second row is not deleted:
 └───────────────────────┴─────────┴──────────────┘
 ```
 
-### See Also
+**See Also**
 
 - More about the [TTL-expression](../../../sql-reference/statements/create/table.md#ttl-expression).
 - Modify column [with TTL](../../../sql-reference/statements/alter/column.md#alter_modify-column).
diff --git a/docs/en/sql-reference/statements/alter/user.md b/docs/en/sql-reference/statements/alter/user.md
index b590bf4887d..73081bc8619 100644
--- a/docs/en/sql-reference/statements/alter/user.md
+++ b/docs/en/sql-reference/statements/alter/user.md
@@ -15,11 +15,23 @@ ALTER USER [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_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']}]
     [[ADD | DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
+    [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
 To use `ALTER USER` you must have the [ALTER USER](../../../sql-reference/statements/grant.md#grant-access-management) privilege.
 
+## GRANTEES Clause {#grantees}
+
+Specifies users or roles which are allowed to receive [privileges](../../../sql-reference/statements/grant.md#grant-privileges) from this user on the condition this user has also all required access granted with [GRANT OPTION](../../../sql-reference/statements/grant.md#grant-privigele-syntax). Options of the `GRANTEES` clause:
+
+-   `user` — Specifies a user this user can grant privileges to.
+-   `role` — Specifies a role this user can grant privileges to.
+-   `ANY` — This user can grant privileges to anyone. It's the default setting.
+-   `NONE` — This user can grant privileges to none.
+
+You can exclude any user or role by using the `EXCEPT` expression. For example, `ALTER USER user1 GRANTEES ANY EXCEPT user2`. It means if `user1` has some privileges granted with `GRANT OPTION` it will be able to grant those privileges to anyone except `user2`.
+
 ## Examples {#alter-user-examples}
 
 Set assigned roles as default:
@@ -43,3 +55,9 @@ Set all the assigned roles to default, excepting `role1` and `role2`:
 ``` sql
 ALTER USER user DEFAULT ROLE ALL EXCEPT role1, role2
 ```
+
+Allows the user with `john` account to grant his privileges to the user with `jack` account:
+
+``` sql
+ALTER USER john GRANTEES jack;
+```
diff --git a/docs/en/sql-reference/statements/attach.md b/docs/en/sql-reference/statements/attach.md
index ffb577a8839..01783e9cb2f 100644
--- a/docs/en/sql-reference/statements/attach.md
+++ b/docs/en/sql-reference/statements/attach.md
@@ -5,13 +5,14 @@ toc_title: ATTACH
 
 # ATTACH Statement {#attach}
 
-This query is exactly the same as [CREATE](../../sql-reference/statements/create/table.md), but
+Attaches the table, for example, when moving a database to another server. 
 
--   Instead of the word `CREATE` it uses the word `ATTACH`.
--   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.
+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.
 
-If the table was previously detached ([DETACH](../../sql-reference/statements/detach.md)), meaning that its structure is known, you can use shorthand without defining the structure.
+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.
+
+## Syntax Forms {#syntax-forms}
+### Attach Existing Table {#attach-existing-table}
 
 ``` sql
 ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
@@ -21,4 +22,38 @@ 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.
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/attach/) <!--hide-->
+### Сreate New Table And Attach Data {#create-new-table-and-attach-data}
+
+**With specify path to table data**
+
+```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:
+
+```sql
+DROP TABLE IF EXISTS test;
+INSERT INTO TABLE FUNCTION file('01188_attach/test/data.TSV', 'TSV', 's String, n UInt8') VALUES ('test', 42);
+ATTACH TABLE test FROM '01188_attach/test' (s String, n UInt8) ENGINE = File(TSV);
+SELECT * FROM test;
+```
+Result:
+
+```sql
+┌─s────┬──n─┐
+│ test │ 42 │
+└──────┴────┘
+```
+
+**With specify table UUID** (Only for `Atomic` database)
+
+```sql
+ATTACH TABLE name UUID '<uuid>' (col1 Type1, ...)
+```
+
+It creates new table with provided structure and attaches data from table with the specified UUID.
\ No newline at end of file
diff --git a/docs/en/sql-reference/statements/check-table.md b/docs/en/sql-reference/statements/check-table.md
index 450447acaf8..d40fe263b1a 100644
--- a/docs/en/sql-reference/statements/check-table.md
+++ b/docs/en/sql-reference/statements/check-table.md
@@ -28,11 +28,38 @@ The `CHECK TABLE` query supports the following table engines:
 
 Performed over the tables with another table engines causes an exception.
 
-Engines from the `*Log` family don’t provide automatic data recovery on failure. Use the `CHECK TABLE` query to track data loss in a timely manner.
+Engines from the `*Log` family do not provide automatic data recovery on failure. Use the `CHECK TABLE` query to track data loss in a timely manner.
 
-For `MergeTree` family engines, the `CHECK TABLE` query shows a check status for every individual data part of a table on the local server.
+## Checking the MergeTree Family Tables {#checking-mergetree-tables}
 
-**If the data is corrupted**
+For `MergeTree` family engines, if [check_query_single_value_result](../../operations/settings/settings.md#check_query_single_value_result) = 0, the `CHECK TABLE` query shows a check status for every individual data part of a table on the local server. 
+
+```sql
+SET check_query_single_value_result = 0;
+CHECK TABLE test_table;
+```
+
+```text
+┌─part_path─┬─is_passed─┬─message─┐
+│ all_1_4_1 │         1 │         │
+│ all_1_4_2 │         1 │         │
+└───────────┴───────────┴─────────┘
+```
+
+If `check_query_single_value_result` = 0, the `CHECK TABLE` query shows the general table check status.
+
+```sql
+SET check_query_single_value_result = 1;
+CHECK TABLE test_table;
+```
+
+```text
+┌─result─┐
+│      1 │
+└────────┘
+```
+
+## If the Data Is Corrupted {#if-data-is-corrupted}
 
 If the table is corrupted, you can copy the non-corrupted data to another table. To do this:
 
diff --git a/docs/en/sql-reference/statements/create/database.md b/docs/en/sql-reference/statements/create/database.md
index bdb31d44b0b..3c6f73d54db 100644
--- a/docs/en/sql-reference/statements/create/database.md
+++ b/docs/en/sql-reference/statements/create/database.md
@@ -15,7 +15,7 @@ CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster] [ENGINE = engine(..
 
 ### IF NOT EXISTS {#if-not-exists}
 
-If the `db_name` database already exists, then ClickHouse doesn’t create a new database and:
+If the `db_name` database already exists, then ClickHouse does not create a new database and:
 
 -   Doesn’t throw an exception if clause is specified.
 -   Throws an exception if clause isn’t specified.
diff --git a/docs/en/sql-reference/statements/create/row-policy.md b/docs/en/sql-reference/statements/create/row-policy.md
index cbe639c6fc5..1df7cc36995 100644
--- a/docs/en/sql-reference/statements/create/row-policy.md
+++ b/docs/en/sql-reference/statements/create/row-policy.md
@@ -5,39 +5,84 @@ toc_title: ROW POLICY
 
 # CREATE ROW POLICY {#create-row-policy-statement}
 
-Creates [filters for rows](../../../operations/access-rights.md#row-policy-management), which a user can read from a table.
+Creates a [row policy](../../../operations/access-rights.md#row-policy-management), i.e. a filter used to determine which rows a user can read from a table.
+
+!!! note "Warning"
+    Row policies makes sense only for users with readonly access. If user can modify table or copy partitions between tables, it defeats the restrictions of row policies.
 
 Syntax:
 
 ``` sql
 CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluster_name1] ON [db1.]table1 
         [, policy_name2 [ON CLUSTER cluster_name2] ON [db2.]table2 ...] 
+    [FOR SELECT] USING condition
     [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING condition]
     [TO {role1 [, role2 ...] | ALL | ALL EXCEPT role1 [, role2 ...]}]
 ```
 
-`ON CLUSTER` clause allows creating row policies on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
+## USING Clause {#create-row-policy-using}
 
-## AS Clause {#create-row-policy-as}
-
-Using this section you can create permissive or restrictive policies.
-
-Permissive policy grants access to rows. Permissive policies which apply to the same table are combined together using the boolean `OR` operator. Policies are permissive by default.
-
-Restrictive policy restricts access to rows. Restrictive policies which apply to the same table are combined together using the boolean `AND` operator.
-
-Restrictive policies apply to rows that passed the permissive filters. If you set restrictive policies but no permissive policies, the user can’t get any row from the table.
+Allows to specify a condition to filter rows. An user will see a row if the condition is calculated to non-zero for the row.
 
 ## TO Clause {#create-row-policy-to}
 
-In the section `TO` you can provide a mixed list of roles and users, for example, `CREATE ROW POLICY ... TO accountant, john@localhost`.
+In the section `TO` you can provide a list of users and roles this policy should work for. For example, `CREATE ROW POLICY ... TO accountant, john@localhost`.
 
-Keyword `ALL` means all the ClickHouse users including current user. Keywords `ALL EXCEPT` allow to exclude some users from the all users list, for example, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
+Keyword `ALL` means all the ClickHouse users including current user. Keyword `ALL EXCEPT` allow to exclude some users from the all users list, for example, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
 
-## Examples {#examples}
+!!! note "Note"
+    If there are no row policies defined for a table then any user can `SELECT` all the row from the table. Defining one or more row policies for the table makes the access to the table depending on the row policies no matter if those row policies are defined for the current user or not. For example, the following policy
+    
+    `CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter`
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO accountant, john@localhost`
+    forbids the users `mira` and `peter` to see the rows with `b != 1`, and any non-mentioned user (e.g., the user `paul`) will see no rows from `mydb.table1` at all.
+    
+    If that's not desirable it can't be fixed by adding one more row policy, like the following:
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO ALL EXCEPT mira`
+    `CREATE ROW POLICY pol2 ON mydb.table1 USING 1 TO ALL EXCEPT mira, peter`
+
+## AS Clause {#create-row-policy-as}
+
+It's allowed to have more than one policy enabled on the same table for the same user at the one time. So we need a way to combine the conditions from multiple policies.
+
+By default policies are combined using the boolean `OR` operator. For example, the following policies
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 TO peter, antonio
+```
+
+enables the user `peter` to see rows with either `b=1` or `c=2`.
+
+The `AS` clause specifies how policies should be combined with other policies. Policies can be either permissive or restrictive. By default policies are permissive, which means they are combined using the boolean `OR` operator.
+
+A policy can be defined as restrictive as an alternative. Restrictive policies are combined using the boolean `AND` operator.
+
+Here is the general formula:
+
+```
+row_is_visible = (one or more of the permissive policies' conditions are non-zero) AND
+                 (all of the restrictive policies's conditions are non-zero)
+```
+
+For example, the following policies
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
+```
+
+enables the user `peter` to see rows only if both `b=1` AND `c=2`.
+
+## ON CLUSTER Clause {#create-row-policy-on-cluster}
+
+Allows creating row policies on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
+
+
+## Examples
+
+`CREATE ROW POLICY filter1 ON mydb.mytable USING a<1000 TO accountant, john@localhost`
+
+`CREATE ROW POLICY filter2 ON mydb.mytable USING a<1000 AND b=5 TO ALL EXCEPT mira`
+
+`CREATE ROW POLICY filter3 ON mydb.mytable USING 1 TO admin`
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index b98888f7bfa..70ac9acd186 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -50,15 +50,32 @@ Creates a table with the same result as that of the [table function](../../../sq
 ### From SELECT query {#from-select-query}
 
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
+CREATE TABLE [IF NOT EXISTS] [db.]table_name[(name1 [type1], name2 [type2], ...)] ENGINE = engine AS SELECT ...
 ```
 
-Creates a table with a structure like the result of the `SELECT` query, with the `engine` engine, and fills it with data from SELECT.
+Creates a table with a structure like the result of the `SELECT` query, with the `engine` engine, and fills it with data from `SELECT`. Also you can explicitly specify columns description.
 
-In all cases, if `IF NOT EXISTS` is specified, the query won’t return an error if the table already exists. In this case, the query won’t do anything.
+If the table already exists and `IF NOT EXISTS` is specified, the query won’t do anything.
 
 There can be other clauses after the `ENGINE` clause in the query. See detailed documentation on how to create tables in the descriptions of [table engines](../../../engines/table-engines/index.md#table_engines).
 
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE t1 (x String) ENGINE = Memory AS SELECT 1;
+SELECT x, toTypeName(x) FROM t1;
+```
+
+Result:
+
+```text
+┌─x─┬─toTypeName(x)─┐
+│ 1 │ String        │
+└───┴───────────────┘
+```
+
 ## NULL Or NOT NULL Modifiers {#null-modifiers}
 
 `NULL` and `NOT NULL` modifiers after data type in column definition allow or do not allow it to be [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable).
@@ -79,13 +96,13 @@ If the default expression is defined, the column type is optional. If there isn
 
 If the data type and default expression are defined explicitly, this expression will be cast to the specified type using type casting functions. Example: `Hits UInt32 DEFAULT 0` means the same thing as `Hits UInt32 DEFAULT toUInt32(0)`.
 
-Default expressions may be defined as an arbitrary expression from table constants and columns. When creating and changing the table structure, it checks that expressions don’t contain loops. For INSERT, it checks that expressions are resolvable – that all columns they can be calculated from have been passed.
+Default expressions may be defined as an arbitrary expression from table constants and columns. When creating and changing the table structure, it checks that expressions do not contain loops. For INSERT, it checks that expressions are resolvable – that all columns they can be calculated from have been passed.
 
 ### DEFAULT {#default}
 
 `DEFAULT expr`
 
-Normal default value. If the INSERT query doesn’t specify the corresponding column, it will be filled in by computing the corresponding expression.
+Normal default value. If the INSERT query does not specify the corresponding column, it will be filled in by computing the corresponding expression.
 
 ### MATERIALIZED {#materialized}
 
@@ -217,14 +234,14 @@ High compression levels are useful for asymmetric scenarios, like compress once,
 
 ### Specialized Codecs {#create-query-specialized-codecs}
 
-These codecs are designed to make compression more effective by using specific features of data. Some of these codecs don’t compress data themself. Instead, they prepare the data for a common purpose codec, which compresses it better than without this preparation.
+These codecs are designed to make compression more effective by using specific features of data. Some of these codecs do not compress data themself. Instead, they prepare the data for a common purpose codec, which compresses it better than without this preparation.
 
 Specialized codecs:
 
 -   `Delta(delta_bytes)` — Compression approach in which raw values are replaced by the difference of two neighboring values, except for the first value that stays unchanged. Up to `delta_bytes` are used for storing delta values, so `delta_bytes` is the maximum size of raw values. Possible `delta_bytes` values: 1, 2, 4, 8. The default value for `delta_bytes` is `sizeof(type)` if equal to 1, 2, 4, or 8. In all other cases, it’s 1.
 -   `DoubleDelta` — Calculates delta of deltas and writes it in compact binary form. Optimal compression rates are achieved for monotonic sequences with a constant stride, such as time series data. Can be used with any fixed-width type. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. Uses 1 extra bit for 32-byte deltas: 5-bit prefixes instead of 4-bit prefixes. For additional information, see Compressing Time Stamps in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
 -   `Gorilla` — Calculates XOR between current and previous value and writes it in compact binary form. Efficient when storing a series of floating point values that change slowly, because the best compression rate is achieved when neighboring values are binary equal. Implements the algorithm used in Gorilla TSDB, extending it to support 64-bit types. For additional information, see Compressing Values in [Gorilla: A Fast, Scalable, In-Memory Time Series Database](http://www.vldb.org/pvldb/vol8/p1816-teller.pdf).
--   `T64` — Compression approach that crops unused high bits of values in integer data types (including `Enum`, `Date` and `DateTime`). At each step of its algorithm, codec takes a block of 64 values, puts them into 64x64 bit matrix, transposes it, crops the unused bits of values and returns the rest as a sequence. Unused bits are the bits, that don’t differ between maximum and minimum values in the whole data part for which the compression is used.
+-   `T64` — Compression approach that crops unused high bits of values in integer data types (including `Enum`, `Date` and `DateTime`). At each step of its algorithm, codec takes a block of 64 values, puts them into 64x64 bit matrix, transposes it, crops the unused bits of values and returns the rest as a sequence. Unused bits are the bits, that do not differ between maximum and minimum values in the whole data part for which the compression is used.
 
 `DoubleDelta` and `Gorilla` codecs are used in Gorilla TSDB as the components of its compressing algorithm. Gorilla approach is effective in scenarios when there is a sequence of slowly changing values with their timestamps. Timestamps are effectively compressed by the `DoubleDelta` codec, and values are effectively compressed by the `Gorilla` codec. For example, to get an effectively stored table, you can create it in the following configuration:
 
@@ -270,7 +287,7 @@ It’s possible to use tables with [ENGINE = Memory](../../../engines/table-engi
 !!!note "Note"
     This query is supported only for [Atomic](../../../engines/database-engines/atomic.md) database engine.
 
-If you need to delete some data from a table, you can create a new table and fill it with a `SELECT` statement that doesn't retrieve unwanted data, then drop the old table and rename the new one:
+If you need to delete some data from a table, you can create a new table and fill it with a `SELECT` statement that does not retrieve unwanted data, then drop the old table and rename the new one:
 
 ```sql
 CREATE TABLE myNewTable AS myOldTable;
@@ -287,7 +304,9 @@ REPLACE TABLE myOldTable SELECT * FROM myOldTable WHERE CounterID <12345;
 
 ### Syntax
 
-{CREATE [OR REPLACE]|REPLACE} TABLE [db.]table_name
+``` sql
+{CREATE [OR REPLACE] | REPLACE} TABLE [db.]table_name
+```
 
 All syntax forms for `CREATE` query also work for this query. `REPLACE` for a non-existent table will cause an error.
 
@@ -335,3 +354,39 @@ SELECT * FROM base.t1;
 │ 3 │
 └───┘
 ```
+
+## COMMENT Clause {#comment-table}
+
+You can add a comment to the table when you creating it.
+
+!!!note "Note"
+    The comment is supported for all table engines except [Kafka](../../../engines/table-engines/integrations/kafka.md), [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md) and [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md).
+	
+
+**Syntax**
+
+``` sql
+CREATE TABLE db.table_name
+(
+    name1 type1, name2 type2, ...
+)
+ENGINE = engine
+COMMENT 'Comment'
+```
+	
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE t1 (x String) ENGINE = Memory COMMENT 'The temporary table';
+SELECT name, comment FROM system.tables WHERE name = 't1';
+```
+
+Result:
+
+```text
+┌─name─┬─comment─────────────┐
+│ t1   │ The temporary table │
+└──────┴─────────────────────┘
+```
diff --git a/docs/en/sql-reference/statements/create/user.md b/docs/en/sql-reference/statements/create/user.md
index 49a4e3813a1..ad9f203b768 100644
--- a/docs/en/sql-reference/statements/create/user.md
+++ b/docs/en/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 [,...]]
+    [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
@@ -51,14 +52,26 @@ Another way of specifying host is to use `@` syntax following the username. Exam
 -   `CREATE USER mira@'192.168.%.%'` — Equivalent to the `HOST LIKE` syntax.
 
 !!! info "Warning"
-    ClickHouse treats `user_name@'address'` as a username as a whole. Thus, technically you can create multiple users with the same `user_name` and different constructions after `@`. However, we don’t recommend to do so.
+    ClickHouse treats `user_name@'address'` as a username as a whole. Thus, technically you can create multiple users with the same `user_name` and different constructions after `@`. However, we do not recommend to do so.
+
+	
+## GRANTEES Clause {#grantees}
+
+Specifies users or roles which are allowed to receive [privileges](../../../sql-reference/statements/grant.md#grant-privileges) from this user on the condition this user has also all required access granted with [GRANT OPTION](../../../sql-reference/statements/grant.md#grant-privigele-syntax). Options of the `GRANTEES` clause:
+
+-   `user` — Specifies a user this user can grant privileges to.
+-   `role` — Specifies a role this user can grant privileges to.
+-   `ANY` — This user can grant privileges to anyone. It's the default setting.
+-   `NONE` — This user can grant privileges to none.
+
+You can exclude any user or role by using the `EXCEPT` expression. For example, `CREATE USER user1 GRANTEES ANY EXCEPT user2`. It means if `user1` has some privileges granted with `GRANT OPTION` it will be able to grant those privileges to anyone except `user2`.
 
 ## Examples {#create-user-examples}
 
 Create the user account `mira` protected by the password `qwerty`:
 
 ``` sql
-CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty'
+CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty';
 ```
 
 `mira` should start client app at the host where the ClickHouse server runs.
@@ -66,13 +79,13 @@ CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty'
 Create the user account `john`, assign roles to it and make this roles default:
 
 ``` sql
-CREATE USER john DEFAULT ROLE role1, role2
+CREATE USER john DEFAULT ROLE role1, role2;
 ```
 
 Create the user account `john` and make all his future roles default:
 
 ``` sql
-CREATE USER user DEFAULT ROLE ALL
+CREATE USER john DEFAULT ROLE ALL;
 ```
 
 When some role is assigned to `john` in the future, it will become default automatically.
@@ -80,5 +93,11 @@ When some role is assigned to `john` in the future, it will become default autom
 Create the user account `john` and make all his future roles default excepting `role1` and `role2`:
 
 ``` sql
-CREATE USER john DEFAULT ROLE ALL EXCEPT role1, role2
+CREATE USER john DEFAULT ROLE ALL EXCEPT role1, role2;
+```
+
+Create the user account `john` and allow him to grant his privileges to the user with `jack` account:
+
+``` sql
+CREATE USER john GRANTEES jack;
 ```
diff --git a/docs/en/sql-reference/statements/create/view.md b/docs/en/sql-reference/statements/create/view.md
index 633db355d4a..4b51bb8b067 100644
--- a/docs/en/sql-reference/statements/create/view.md
+++ b/docs/en/sql-reference/statements/create/view.md
@@ -15,7 +15,7 @@ Syntax:
 CREATE [OR REPLACE] VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] AS SELECT ...
 ```
 
-Normal views don’t store any data. They just perform a read from another table on each access. In other words, a normal view is nothing more than a saved query. When reading from a view, this saved query is used as a subquery in the [FROM](../../../sql-reference/statements/select/from.md) clause.
+Normal views do not store any data. They just perform a read from another table on each access. In other words, a normal view is nothing more than a saved query. When reading from a view, this saved query is used as a subquery in the [FROM](../../../sql-reference/statements/select/from.md) clause.
 
 As an example, assume you’ve created a view:
 
@@ -50,9 +50,9 @@ 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 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.) doesn’t change the materialized view.
+    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 **don’t 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 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.
 
 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`.
 
@@ -229,7 +229,7 @@ WATCH lv
 ```
 
 ```
-Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv doesn't exist.. 
+Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv does not exist.. 
 ```
 
 ### Usage {#live-view-usage}
diff --git a/docs/en/sql-reference/statements/detach.md b/docs/en/sql-reference/statements/detach.md
index e9c9ed3693c..a181dd8deee 100644
--- a/docs/en/sql-reference/statements/detach.md
+++ b/docs/en/sql-reference/statements/detach.md
@@ -10,14 +10,14 @@ Makes the server "forget" about the existence of the table or materialized view.
 Syntax:
 
 ``` sql
-DETACH TABLE|VIEW [IF EXISTS] [db.]name [PERMANENTLY] [ON CLUSTER cluster]
+DETACH TABLE|VIEW [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. 
 
 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.
 
-`ATTACH MATERIALIZED VIEW` doesn't work with short syntax (without `SELECT`), but you can attach it using the `ATTACH TABLE` query.
+`ATTACH MATERIALIZED VIEW` does not work with short syntax (without `SELECT`), but you can attach it using the `ATTACH TABLE` query.
 
 Note that you can not detach permanently the table which is already detached (temporary). But you can attach it back and then detach permanently again. 
 
@@ -64,7 +64,7 @@ Result:
 
 ``` text
 Received exception from server (version 21.4.1):
-Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.test doesn't exist.
+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-->
diff --git a/docs/en/sql-reference/statements/drop.md b/docs/en/sql-reference/statements/drop.md
index 4317a20419e..90a2a46c7cf 100644
--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@@ -5,7 +5,7 @@ toc_title: DROP
 
 # DROP Statements {#drop}
 
-Deletes existing entity. If the `IF EXISTS` clause is specified, these queries don’t return an error if the entity doesn’t exist.
+Deletes existing entity. If the `IF EXISTS` clause is specified, these queries do not return an error if the entity does not exist.
 
 ## DROP DATABASE {#drop-database}
 
@@ -97,4 +97,4 @@ Syntax:
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-[Оriginal article](https://clickhouse.tech/docs/en/sql-reference/statements/drop/) <!--hide-->
\ No newline at end of file
+[Оriginal article](https://clickhouse.tech/docs/en/sql-reference/statements/drop/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/exists.md b/docs/en/sql-reference/statements/exists.md
index 3b0f4b66343..b7c4a487791 100644
--- a/docs/en/sql-reference/statements/exists.md
+++ b/docs/en/sql-reference/statements/exists.md
@@ -9,4 +9,4 @@ toc_title: EXISTS
 EXISTS [TEMPORARY] [TABLE|DICTIONARY] [db.]name [INTO OUTFILE filename] [FORMAT format]
 ```
 
-Returns a single `UInt8`-type column, which contains the single value `0` if the table or database doesn’t exist, or `1` if the table exists in the specified database.
+Returns a single `UInt8`-type column, which contains the single value `0` if the table or database does not exist, or `1` if the table exists in the specified database.
diff --git a/docs/en/sql-reference/statements/explain.md b/docs/en/sql-reference/statements/explain.md
index 3cca29801dd..f22f92c625a 100644
--- a/docs/en/sql-reference/statements/explain.md
+++ b/docs/en/sql-reference/statements/explain.md
@@ -5,7 +5,7 @@ toc_title: EXPLAIN
 
 # EXPLAIN Statement {#explain}
 
-Show the execution plan of a statement.
+Shows the execution plan of a statement.
 
 Syntax:
 
@@ -47,9 +47,9 @@ Union
 
 ### EXPLAIN AST {#explain-ast}
 
-Dump query AST.
+Dump query AST. Supports all types of queries, not only `SELECT`.
 
-Example:
+Examples:
 
 ```sql
 EXPLAIN AST SELECT 1;
@@ -63,9 +63,25 @@ SelectWithUnionQuery (children 1)
     Literal UInt64_1
 ```
 
+```sql
+EXPLAIN AST ALTER TABLE t1 DELETE WHERE date = today();
+```
+
+```sql
+  explain
+  AlterQuery  t1 (children 1)
+   ExpressionList (children 1)
+    AlterCommand 27 (children 1)
+     Function equals (children 1)
+      ExpressionList (children 2)
+       Identifier date
+       Function today (children 1)
+        ExpressionList
+```
+
 ### EXPLAIN SYNTAX {#explain-syntax}
 
-Return query after syntax optimizations.
+Returns query after syntax optimizations.
 
 Example:
 
@@ -88,15 +104,18 @@ FROM
 ) AS `--.s`
 CROSS JOIN system.numbers AS c
 ```
+
 ### EXPLAIN PLAN {#explain-plan}
 
 Dump query plan steps.
 
 Settings:
 
--  `header` — Print output header for step. Default: 0.
--  `description` — Print step description. Default: 1.
--  `actions` — Print detailed information about step actions. Default: 0.
+-   `header` — Prints output header for step. Default: 0.
+-   `description` — Prints step description. Default: 1.
+-   `indexes` — Shows used indexes, the number of filtered parts and the number of filtered granules for every index applied. Default: 0. Supported for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) tables.
+-   `actions` — Prints detailed information about step actions. Default: 0.
+-   `json` — Prints query plan steps as a row in [JSON](../../interfaces/formats.md#json) format. Default: 0. It is recommended to use [TSVRaw](../../interfaces/formats.md#tabseparatedraw) format to avoid unnecessary escaping.
 
 Example:
 
@@ -115,15 +134,234 @@ Union
 ```
 
 !!! note "Note"
-  Step and query cost estimation is not supported.
+    Step and query cost estimation is not supported.
+
+When `json = 1`, the query plan is represented in JSON format. Every node is a dictionary that always has the keys `Node Type` and `Plans`. `Node Type` is a string with a step name. `Plans` is an array with child step descriptions. Other optional keys may be added depending on node type and settings.
+
+Example:
+
+```sql
+EXPLAIN json = 1, description = 0 SELECT 1 UNION ALL SELECT 2 FORMAT TSVRaw;
+```
+
+```json
+[
+  {
+    "Plan": {
+      "Node Type": "Union",
+      "Plans": [
+        {
+          "Node Type": "Expression",
+          "Plans": [
+            {
+              "Node Type": "SettingQuotaAndLimits",
+              "Plans": [
+                {
+                  "Node Type": "ReadFromStorage"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "Node Type": "Expression",
+          "Plans": [
+            {
+              "Node Type": "SettingQuotaAndLimits",
+              "Plans": [
+                {
+                  "Node Type": "ReadFromStorage"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+```
+
+With `description` = 1, the `Description` key is added to the step:
+
+```json
+{
+  "Node Type": "ReadFromStorage",
+  "Description": "SystemOne"
+}
+```
+
+With `header` = 1, the `Header` key is added to the step as an array of columns.
+
+Example:
+
+```sql
+EXPLAIN json = 1, description = 0, header = 1 SELECT 1, 2 + dummy;
+```
+
+```json
+[
+  {
+    "Plan": {
+      "Node Type": "Expression",
+      "Header": [
+        {
+          "Name": "1",
+          "Type": "UInt8"
+        },
+        {
+          "Name": "plus(2, dummy)",
+          "Type": "UInt16"
+        }
+      ],
+      "Plans": [
+        {
+          "Node Type": "SettingQuotaAndLimits",
+          "Header": [
+            {
+              "Name": "dummy",
+              "Type": "UInt8"
+            }
+          ],
+          "Plans": [
+            {
+              "Node Type": "ReadFromStorage",
+              "Header": [
+                {
+                  "Name": "dummy",
+                  "Type": "UInt8"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+```
+  
+With `indexes` = 1, the `Indexes` key is added. It contains an array of used indexes. Each index is described as JSON with `Type` key (a string `MinMax`, `Partition`, `PrimaryKey` or `Skip`) and optional keys:
+
+-   `Name` — An index name (for now, is used only for `Skip` index).
+-   `Keys` — An array of columns used by the index.
+-   `Condition` — A string with condition used.
+-   `Description` — An index (for now, is used only for `Skip` index).
+-   `Initial Parts` — A number of parts before the index is applied.
+-   `Selected Parts` — A number of parts after the index is applied.
+-   `Initial Granules` — A number of granules before the index is applied.
+-   `Selected Granulesis` — A number of granules after the index is applied.
+
+Example:
+
+```json
+"Node Type": "ReadFromMergeTree",
+"Indexes": [
+  {
+    "Type": "MinMax",
+    "Keys": ["y"],
+    "Condition": "(y in [1, +inf))",
+    "Initial Parts": 5,
+    "Selected Parts": 4,
+    "Initial Granules": 12,
+    "Selected Granules": 11
+  },
+  {
+    "Type": "Partition",
+    "Keys": ["y", "bitAnd(z, 3)"],
+    "Condition": "and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +inf)), (bitAnd(z, 3) not in [1, 1])))",
+    "Initial Parts": 4,
+    "Selected Parts": 3,
+    "Initial Granules": 11,
+    "Selected Granules": 10
+  },
+  {
+    "Type": "PrimaryKey",
+    "Keys": ["x", "y"],
+    "Condition": "and((x in [11, +inf)), (y in [1, +inf)))",
+    "Initial Parts": 3,
+    "Selected Parts": 2,
+    "Initial Granules": 10,
+    "Selected Granules": 6
+  },
+  {
+    "Type": "Skip",
+    "Name": "t_minmax",
+    "Description": "minmax GRANULARITY 2",
+    "Initial Parts": 2,
+    "Selected Parts": 1,
+    "Initial Granules": 6,
+    "Selected Granules": 2
+  },
+  {
+    "Type": "Skip",
+    "Name": "t_set",
+    "Description": "set GRANULARITY 2",
+    "Initial Parts": 1,
+    "Selected Parts": 1,
+    "Initial Granules": 2,
+    "Selected Granules": 1
+  }
+]
+```
+
+With `actions` = 1, added keys depend on step type.
+
+Example:
+
+```sql
+EXPLAIN json = 1, actions = 1, description = 0 SELECT 1 FORMAT TSVRaw;
+```
+
+```json
+[
+  {
+    "Plan": {
+      "Node Type": "Expression",
+      "Expression": {
+        "Inputs": [],
+        "Actions": [
+          {
+            "Node Type": "Column",
+            "Result Type": "UInt8",
+            "Result Type": "Column",
+            "Column": "Const(UInt8)",
+            "Arguments": [],
+            "Removed Arguments": [],
+            "Result": 0
+          }
+        ],
+        "Outputs": [
+          {
+            "Name": "1",
+            "Type": "UInt8"
+          }
+        ],
+        "Positions": [0],
+        "Project Input": true
+      },
+      "Plans": [
+        {
+          "Node Type": "SettingQuotaAndLimits",
+          "Plans": [
+            {
+              "Node Type": "ReadFromStorage"
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+```
 
 ### EXPLAIN PIPELINE {#explain-pipeline}
 
 Settings:
 
--   `header` — Print header for each output port. Default: 0.
--   `graph` — Use DOT graph description language. Default: 0.
--   `compact` — Print graph in compact mode if graph is enabled. Default: 1.
+-   `header` — Prints header for each output port. Default: 0.
+-   `graph` — Prints a graph described in the [DOT](https://en.wikipedia.org/wiki/DOT_(graph_description_language)) graph description language. Default: 0.
+-   `compact` — Prints graph in compact mode if `graph` setting is enabled. Default: 1.
 
 Example:
 
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index 0afc9b5b95f..8ca2b25ce66 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -49,7 +49,7 @@ It means that `john` has the permission to execute:
 -   `SELECT x FROM db.table`.
 -   `SELECT y FROM db.table`.
 
-`john` can’t execute `SELECT z FROM db.table`. The `SELECT * FROM db.table` also is not available. Processing this query, ClickHouse doesn’t return any data, even `x` and `y`. The only exception is if a table contains only `x` and `y` columns. In this case ClickHouse returns all the data.
+`john` can’t execute `SELECT z FROM db.table`. The `SELECT * FROM db.table` also is not available. Processing this query, ClickHouse does not return any data, even `x` and `y`. The only exception is if a table contains only `x` and `y` columns. In this case ClickHouse returns all the data.
 
 Also `john` has the `GRANT OPTION` privilege, so it can grant other users with privileges of the same or smaller scope.
 
@@ -91,7 +91,7 @@ Hierarchy of privileges:
             -   `ALTER ADD CONSTRAINT`
             -   `ALTER DROP CONSTRAINT`
         -   `ALTER TTL`
-        -   `ALTER MATERIALIZE TTL`
+            -   `ALTER MATERIALIZE TTL`
         -   `ALTER SETTINGS`
         -   `ALTER MOVE PARTITION`
         -   `ALTER FETCH PARTITION`
@@ -102,9 +102,9 @@ Hierarchy of privileges:
 -   [CREATE](#grant-create)
     -   `CREATE DATABASE`
     -   `CREATE TABLE`
+        -   `CREATE TEMPORARY TABLE`
     -   `CREATE VIEW`
     -   `CREATE DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`
 -   [DROP](#grant-drop)
     -   `DROP DATABASE`
     -   `DROP TABLE`
@@ -150,7 +150,7 @@ Hierarchy of privileges:
     -   `SYSTEM RELOAD`
         -   `SYSTEM RELOAD CONFIG`
         -   `SYSTEM RELOAD DICTIONARY`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
+            -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
     -   `SYSTEM MERGES`
     -   `SYSTEM TTL MERGES`
     -   `SYSTEM FETCHES`
@@ -230,7 +230,7 @@ Consider the following privilege:
 GRANT SELECT(x,y) ON db.table TO john
 ```
 
-This privilege allows `john` to execute any `SELECT` query that involves data from the `x` and/or `y` columns in `db.table`, for example, `SELECT x FROM db.table`. `john` can’t execute `SELECT z FROM db.table`. The `SELECT * FROM db.table` also is not available. Processing this query, ClickHouse doesn’t return any data, even `x` and `y`. The only exception is if a table contains only `x` and `y` columns, in this case ClickHouse returns all the data.
+This privilege allows `john` to execute any `SELECT` query that involves data from the `x` and/or `y` columns in `db.table`, for example, `SELECT x FROM db.table`. `john` can’t execute `SELECT z FROM db.table`. The `SELECT * FROM db.table` also is not available. Processing this query, ClickHouse does not return any data, even `x` and `y`. The only exception is if a table contains only `x` and `y` columns, in this case ClickHouse returns all the data.
 
 ### INSERT {#grant-insert}
 
@@ -240,7 +240,7 @@ Privilege level: `COLUMN`.
 
 **Description**
 
-User granted with this privilege can execute `INSERT` queries over a specified list of columns in the specified table and database. If user includes other columns then specified a query doesn’t insert any data.
+User granted with this privilege can execute `INSERT` queries over a specified list of columns in the specified table and database. If user includes other columns then specified a query does not insert any data.
 
 **Example**
 
@@ -276,10 +276,10 @@ Allows executing [ALTER](../../sql-reference/statements/alter/index.md) queries
             -   `ALTER ADD CONSTRAINT`. Level: `TABLE`. Aliases: `ADD CONSTRAINT`
             -   `ALTER DROP CONSTRAINT`. Level: `TABLE`. Aliases: `DROP CONSTRAINT`
         -   `ALTER TTL`. Level: `TABLE`. Aliases: `ALTER MODIFY TTL`, `MODIFY TTL`
-        -   `ALTER MATERIALIZE TTL`. Level: `TABLE`. Aliases: `MATERIALIZE TTL`
+            -   `ALTER MATERIALIZE TTL`. Level: `TABLE`. Aliases: `MATERIALIZE TTL`
         -   `ALTER SETTINGS`. Level: `TABLE`. Aliases: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
         -   `ALTER MOVE PARTITION`. Level: `TABLE`. Aliases: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
-        -   `ALTER FETCH PARTITION`. Level: `TABLE`. Aliases: `FETCH PARTITION`
+        -   `ALTER FETCH PARTITION`. Level: `TABLE`. Aliases: `ALTER FETCH PART`, `FETCH PARTITION`, `FETCH PART`
         -   `ALTER FREEZE PARTITION`. Level: `TABLE`. Aliases: `FREEZE PARTITION`
     -   `ALTER VIEW` Level: `GROUP`
         -   `ALTER VIEW REFRESH`. Level: `VIEW`. Aliases: `ALTER LIVE VIEW REFRESH`, `REFRESH VIEW`
@@ -292,7 +292,7 @@ Examples of how this hierarchy is treated:
 
 **Notes**
 
--   The `MODIFY SETTING` privilege allows modifying table engine settings. It doesn’t affect settings or server configuration parameters.
+-   The `MODIFY SETTING` privilege allows modifying table engine settings. It does not affect settings or server configuration parameters.
 -   The `ATTACH` operation needs the [CREATE](#grant-create) privilege.
 -   The `DETACH` operation needs the [DROP](#grant-drop) privilege.
 -   To stop mutation by the [KILL MUTATION](../../sql-reference/statements/misc.md#kill-mutation) query, you need to have a privilege to start this mutation. For example, if you want to stop the `ALTER UPDATE` query, you need the `ALTER UPDATE`, `ALTER TABLE`, or `ALTER` privilege.
@@ -304,9 +304,9 @@ Allows executing [CREATE](../../sql-reference/statements/create/index.md) and [A
 -   `CREATE`. Level: `GROUP`
     -   `CREATE DATABASE`. Level: `DATABASE`
     -   `CREATE TABLE`. Level: `TABLE`
+        -   `CREATE TEMPORARY TABLE`. Level: `GLOBAL`
     -   `CREATE VIEW`. Level: `VIEW`
     -   `CREATE DICTIONARY`. Level: `DICTIONARY`
-    -   `CREATE TEMPORARY TABLE`. Level: `GLOBAL`
 
 **Notes**
 
@@ -316,7 +316,7 @@ Allows executing [CREATE](../../sql-reference/statements/create/index.md) and [A
 
 Allows executing [DROP](../../sql-reference/statements/misc.md#drop) and [DETACH](../../sql-reference/statements/misc.md#detach) queries according to the following hierarchy of privileges:
 
--   `DROP`. Level:
+-   `DROP`. Level: `GROUP`
     -   `DROP DATABASE`. Level: `DATABASE`
     -   `DROP TABLE`. Level: `TABLE`
     -   `DROP VIEW`. Level: `VIEW`
@@ -401,7 +401,7 @@ Allows a user to execute [SYSTEM](../../sql-reference/statements/system.md) quer
     -   `SYSTEM RELOAD`. Level: `GROUP`
         -   `SYSTEM RELOAD CONFIG`. Level: `GLOBAL`. Aliases: `RELOAD CONFIG`
         -   `SYSTEM RELOAD DICTIONARY`. Level: `GLOBAL`. Aliases: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
-        -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Level: `GLOBAL`. Aliases: R`ELOAD EMBEDDED DICTIONARIES`
+            -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Level: `GLOBAL`. Aliases: `RELOAD EMBEDDED DICTIONARIES`
     -   `SYSTEM MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
     -   `SYSTEM TTL MERGES`. Level: `TABLE`. Aliases: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
     -   `SYSTEM FETCHES`. Level: `TABLE`. Aliases: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
diff --git a/docs/en/sql-reference/statements/insert-into.md b/docs/en/sql-reference/statements/insert-into.md
index 66effcccc3f..db10ddd47c6 100644
--- a/docs/en/sql-reference/statements/insert-into.md
+++ b/docs/en/sql-reference/statements/insert-into.md
@@ -57,7 +57,7 @@ SELECT * FROM insert_select_testtable;
 
 In this example, we see that the second inserted row has `a` and `c` columns filled by the passed values, and `b` filled with value by default.
 
-If a list of columns doesn't include all existing columns, the rest of the columns are filled with:
+If a list of columns does not include all existing columns, the rest of the columns are filled with:
 
 -   The values calculated from the `DEFAULT` expressions specified in the table definition.
 -   Zeros and empty strings, if `DEFAULT` expressions are not defined.
@@ -105,6 +105,8 @@ However, you can delete old data using `ALTER TABLE ... DROP PARTITION`.
 
 `FORMAT` clause must be specified in the end of query if `SELECT` clause contains table function [input()](../../sql-reference/table-functions/input.md).
 
+To insert a default value instead of `NULL` into a column with not nullable data type, enable [insert_null_as_default](../../operations/settings/settings.md#insert_null_as_default) setting.   
+
 ### Performance Considerations {#performance-considerations}
 
 `INSERT` sorts the input data by primary key and splits them into partitions by a partition key. If you insert data into several partitions at once, it can significantly reduce the performance of the `INSERT` query. To avoid this:
diff --git a/docs/en/sql-reference/statements/kill.md b/docs/en/sql-reference/statements/kill.md
index 6aa09cca4ef..eab6f602c4a 100644
--- a/docs/en/sql-reference/statements/kill.md
+++ b/docs/en/sql-reference/statements/kill.md
@@ -31,7 +31,7 @@ KILL QUERY WHERE user='username' SYNC
 
 Read-only users can only stop their own queries.
 
-By default, the asynchronous version of queries is used (`ASYNC`), which doesn’t wait for confirmation that queries have stopped.
+By default, the asynchronous version of queries is used (`ASYNC`), which does not wait for confirmation that queries have stopped.
 
 The synchronous version (`SYNC`) waits for all queries to stop and displays information about each process as it stops.
 The response contains the `kill_status` column, which can take the following values:
diff --git a/docs/en/sql-reference/statements/optimize.md b/docs/en/sql-reference/statements/optimize.md
index 49a7404d76e..5eaf0558d7b 100644
--- a/docs/en/sql-reference/statements/optimize.md
+++ b/docs/en/sql-reference/statements/optimize.md
@@ -5,43 +5,52 @@ toc_title: OPTIMIZE
 
 # OPTIMIZE Statement {#misc_operations-optimize}
 
+This query tries to initialize an unscheduled merge of data parts for tables.
+
+!!! warning "Warning"
+    `OPTIMIZE` can’t fix the `Too many parts` error.
+
+**Syntax**
+
 ``` sql
 OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE [BY expression]]
 ```
 
-This query tries to initialize an unscheduled merge of data parts for tables with a table engine from the [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) family.
-
-The `OPTMIZE` query is also supported for the [MaterializedView](../../engines/table-engines/special/materializedview.md) and the [Buffer](../../engines/table-engines/special/buffer.md) engines. Other table engines aren’t supported.
+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).
 
--   If `OPTIMIZE` doesn’t perform a merge for any reason, it doesn’t notify the client. To enable notifications, use the [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) setting.
+-   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.
 
 
-### BY expression {#by-expression}
+## BY expression {#by-expression}
 
 If you want to perform deduplication on custom set of columns rather than on all, you can specify list of columns explicitly or use any combination of [`*`](../../sql-reference/statements/select/index.md#asterisk), [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) or [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier) expressions. The explictly written or implicitly expanded list of columns must include all columns specified in row ordering expression (both primary and sorting keys) and partitioning expression (partitioning key).
 
-Note that `*` behaves just like in `SELECT`: `MATERIALIZED`, and `ALIAS` columns are not used for expansion.
-Also, it is an error to specify empty list of columns, or write an expression that results in an empty list of columns, or deduplicate by an ALIAS column.
+!!! note "Note"
+    Notice that `*` behaves just like in `SELECT`: [MATERIALIZED](../../sql-reference/statements/create/table.md#materialized) and [ALIAS](../../sql-reference/statements/create/table.md#alias) columns are not used for expansion.
+    Also, it is an error to specify empty list of columns, or write an expression that results in an empty list of columns, or deduplicate by an `ALIAS` column.
+
+**Syntax**
 
 ``` sql
-OPTIMIZE TABLE table DEDUPLICATE; -- the old one
-OPTIMIZE TABLE table DEDUPLICATE BY *; -- not the same as the old one, excludes MATERIALIZED columns (see the note above)
+OPTIMIZE TABLE table DEDUPLICATE; -- all columns 
+OPTIMIZE TABLE table DEDUPLICATE BY *; -- excludes MATERIALIZED and ALIAS columns
+OPTIMIZE TABLE table DEDUPLICATE BY colX,colY,colZ;
 OPTIMIZE TABLE table DEDUPLICATE BY * EXCEPT colX;
 OPTIMIZE TABLE table DEDUPLICATE BY * EXCEPT (colX, colY);
-OPTIMIZE TABLE table DEDUPLICATE BY col1,col2,col3;
 OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex');
 OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex') EXCEPT colX;
 OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex') EXCEPT (colX, colY);
 ```
 
-**Example:**
+**Examples**
+
+Consider the table:
 
-A silly synthetic table.
 ``` sql
 CREATE TABLE example (
     primary_key Int32,
@@ -55,32 +64,129 @@ CREATE TABLE example (
 PARTITION BY partition_key
 ORDER BY (primary_key, secondary_key);
 ```
+``` sql
+INSERT INTO example (primary_key, secondary_key, value, partition_key) 
+VALUES (0, 0, 0, 0), (0, 0, 0, 0), (1, 1, 2, 2), (1, 1, 2, 3), (1, 1, 3, 3);
+```
+``` sql
+SELECT * FROM example;
+```
+Result:
+```
+
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+│           1 │             1 │     3 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+When columns for deduplication are not specified, all of them are taken into account. Row is removed only if all values in all columns are equal to corresponding values in previous row:
 
 ``` sql
--- The 'old' deduplicate, all columns are taken into account, i.e. row is removed only if all values in all columns are equal to corresponding values in previous row.
 OPTIMIZE TABLE example FINAL DEDUPLICATE;
 ```
-
 ``` sql
--- Deduplicate by all columns that are not `ALIAS` or `MATERIALIZED`: `primary_key`, `secondary_key`, `value`, `partition_key`, and `materialized_value` columns.
+SELECT * FROM example;
+```
+Result:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+│           1 │             1 │     3 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+When columns are specified implicitly, the table is deduplicated by all columns that are not `ALIAS` or `MATERIALIZED`. Considering the table above, these are `primary_key`, `secondary_key`, `value`, and `partition_key` columns:
+```sql
 OPTIMIZE TABLE example FINAL DEDUPLICATE BY *;
 ```
-
 ``` sql
--- Deduplicate by all columns that are not `ALIAS` or `MATERIALIZED` and explicitly not `materialized_value`: `primary_key`, `secondary_key`, `value`, and `partition_key` columns.
-OPTIMIZE TABLE example FINAL DEDUPLICATE BY * EXCEPT materialized_value;
+SELECT * FROM example;
+```
+Result:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+│           1 │             1 │     3 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
 ```
 
+Deduplicate by all columns that are not `ALIAS` or `MATERIALIZED` and explicitly not `value`: `primary_key`, `secondary_key`, and `partition_key` columns.
+
 ``` sql
--- Deduplicate explicitly by `primary_key`, `secondary_key`, and `partition_key` columns.
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY * EXCEPT value;
+```
+``` sql
+SELECT * FROM example;
+```
+Result:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+Deduplicate explicitly by `primary_key`, `secondary_key`, and `partition_key` columns:
+```sql
 OPTIMIZE TABLE example FINAL DEDUPLICATE BY primary_key, secondary_key, partition_key;
 ```
-
 ``` sql
--- Deduplicate by any column matching a regex: `primary_key`, `secondary_key`, and `partition_key` columns.
-OPTIMIZE TABLE example FINAL DEDUPLICATE BY COLUMNS('.*_key');
+SELECT * FROM example;
+```
+Result:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
 ```
 
-
-!!! warning "Warning"
-    `OPTIMIZE` can’t fix the “Too many parts” error.
+Deduplicate by any column matching a regex: `primary_key`, `secondary_key`, and `partition_key` columns:
+```sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY COLUMNS('.*_key');
+```
+``` sql
+SELECT * FROM example;
+```
+Result:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
diff --git a/docs/en/sql-reference/statements/rename.md b/docs/en/sql-reference/statements/rename.md
index 4f14ad016a3..4f454626493 100644
--- a/docs/en/sql-reference/statements/rename.md
+++ b/docs/en/sql-reference/statements/rename.md
@@ -5,10 +5,18 @@ toc_title: RENAME
 
 # RENAME Statement {#misc_operations-rename}
 
+## RENAME DATABASE {#misc_operations-rename_database}
+Renames database, support only for Atomic database engine
+
+```
+RENAME DATABASE atomic_database1 TO atomic_database2 [ON CLUSTER cluster]
+```
+
+## RENAME TABLE {#misc_operations-rename_table}
 Renames one or more tables.
 
 ``` sql
 RENAME TABLE [db11.]name11 TO [db12.]name12, [db21.]name21 TO [db22.]name22, ... [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 ... doesn't exist ..`.
+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 ..`.
diff --git a/docs/en/sql-reference/statements/select/from.md b/docs/en/sql-reference/statements/select/from.md
index 3ecb5096ab8..7c5ea732122 100644
--- a/docs/en/sql-reference/statements/select/from.md
+++ b/docs/en/sql-reference/statements/select/from.md
@@ -29,7 +29,7 @@ Now `SELECT` queries with `FINAL` are executed in parallel and slightly faster.
 
 ### Drawbacks {#drawbacks}
 
-Queries that use `FINAL` are executed slightly slower than similar queries that don’t, because:
+Queries that use `FINAL` are executed slightly slower than similar queries that do not, because:
 
 -   Data is merged during query execution.
 -   Queries with `FINAL` read primary key columns in addition to the columns specified in the query.
diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index a07c810fae8..e6affc07b78 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -208,7 +208,7 @@ This extra row is only produced in `JSON*`, `TabSeparated*`, and `Pretty*` forma
 
 ### Configuring Totals Processing {#configuring-totals-processing}
 
-By default, `totals_mode = 'before_having'`. In this case, ‘totals’ is calculated across all rows, including the ones that don’t pass through HAVING and `max_rows_to_group_by`.
+By default, `totals_mode = 'before_having'`. In this case, ‘totals’ is calculated across all rows, including the ones that do not pass through HAVING and `max_rows_to_group_by`.
 
 The other alternatives include only the rows that pass through HAVING in ‘totals’, and behave differently with the setting `max_rows_to_group_by` and `group_by_overflow_mode = 'any'`.
 
@@ -274,4 +274,4 @@ When merging data flushed to the disk, as well as when merging results from remo
 
 When external aggregation is enabled, if there was less than `max_bytes_before_external_group_by` of data (i.e. data was not flushed), the query runs just as fast as without external aggregation. If any temporary data was flushed, the run time will be several times longer (approximately three times).
 
-If you have an [ORDER BY](../../../sql-reference/statements/select/order-by.md) with a [LIMIT](../../../sql-reference/statements/select/limit.md) after `GROUP BY`, then the amount of used RAM depends on the amount of data in `LIMIT`, not in the whole table. But if the `ORDER BY` doesn’t have `LIMIT`, don’t forget to enable external sorting (`max_bytes_before_external_sort`).
+If you have an [ORDER BY](../../../sql-reference/statements/select/order-by.md) with a [LIMIT](../../../sql-reference/statements/select/limit.md) after `GROUP BY`, then the amount of used RAM depends on the amount of data in `LIMIT`, not in the whole table. But if the `ORDER BY` does not have `LIMIT`, do not forget to enable external sorting (`max_bytes_before_external_sort`).
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index ada4699c224..2f2ce943225 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -47,6 +47,7 @@ Specifics of each optional clause are covered in separate sections, which are li
 -   [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)
 -   [INTO OUTFILE clause](../../../sql-reference/statements/select/into-outfile.md)
 -   [FORMAT clause](../../../sql-reference/statements/select/format.md)
@@ -100,7 +101,7 @@ SELECT COLUMNS('a'), COLUMNS('c'), toTypeName(COLUMNS('c')) FROM col_names
 └────┴────┴────┴────────────────┘
 ```
 
-Each column returned by the `COLUMNS` expression is passed to the function as a separate argument. Also you can pass other arguments to the function if it supports them. Be careful when using functions. If a function doesn’t support the number of arguments you have passed to it, ClickHouse throws an exception.
+Each column returned by the `COLUMNS` expression is passed to the function as a separate argument. Also you can pass other arguments to the function if it supports them. Be careful when using functions. If a function does not support the number of arguments you have passed to it, ClickHouse throws an exception.
 
 For example:
 
@@ -110,12 +111,12 @@ SELECT COLUMNS('a') + COLUMNS('c') FROM col_names
 
 ``` text
 Received exception from server (version 19.14.1):
-Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of arguments for function plus doesn't match: passed 3, should be 2.
+Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of arguments for function plus does not match: passed 3, should be 2.
 ```
 
 In this example, `COLUMNS('a')` returns two columns: `aa` and `ab`. `COLUMNS('c')` returns the `bc` column. The `+` operator can’t apply to 3 arguments, so ClickHouse throws an exception with the relevant message.
 
-Columns that matched the `COLUMNS` expression can have different data types. If `COLUMNS` doesn’t match any columns and is the only expression in `SELECT`, ClickHouse throws an exception.
+Columns that matched the `COLUMNS` expression can have different data types. If `COLUMNS` does not match any columns and is the only expression in `SELECT`, ClickHouse throws an exception.
 
 ### Asterisk {#asterisk}
 
@@ -127,7 +128,7 @@ You can put an asterisk in any part of a query instead of an expression. When th
 -   When there is strong filtration on a small number of columns using `PREWHERE`.
 -   In subqueries (since columns that aren’t needed for the external query are excluded from subqueries).
 
-In all other cases, we don’t recommend using the asterisk, since it only gives you the drawbacks of a columnar DBMS instead of the advantages. In other words using the asterisk is not recommended.
+In all other cases, we do not recommend using the asterisk, since it only gives you the drawbacks of a columnar DBMS instead of the advantages. In other words using the asterisk is not recommended.
 
 ### Extreme Values {#extreme-values}
 
diff --git a/docs/en/sql-reference/statements/select/limit.md b/docs/en/sql-reference/statements/select/limit.md
index 4b25efbe95a..6ed38b2dd64 100644
--- a/docs/en/sql-reference/statements/select/limit.md
+++ b/docs/en/sql-reference/statements/select/limit.md
@@ -12,6 +12,9 @@ toc_title: LIMIT
 
 If there is no [ORDER BY](../../../sql-reference/statements/select/order-by.md) clause that explicitly sorts results, the choice of rows for the result may be arbitrary and non-deterministic.
 
+!!! note "Note"
+    The number of rows in the result set can also depend on the [limit](../../../operations/settings/settings.md#limit) setting.
+
 ## LIMIT … WITH TIES Modifier {#limit-with-ties}
 
 When you set `WITH TIES` modifier for `LIMIT n[,m]` and specify `ORDER BY expr_list`, you will get in result first `n` or `n,m` rows and all rows with same `ORDER BY` fields values equal to row at position `n` for `LIMIT n` and `m` for `LIMIT n,m`.
diff --git a/docs/en/sql-reference/statements/select/offset.md b/docs/en/sql-reference/statements/select/offset.md
new file mode 100644
index 00000000000..3efd916bcb8
--- /dev/null
+++ b/docs/en/sql-reference/statements/select/offset.md
@@ -0,0 +1,86 @@
+---
+toc_title: OFFSET
+---
+
+# OFFSET FETCH Clause {#offset-fetch}
+
+`OFFSET` and `FETCH` allow you to retrieve data by portions. They specify a row block which you want to get by a single query.
+
+``` sql
+OFFSET offset_row_count {ROW | ROWS}] [FETCH {FIRST | NEXT} fetch_row_count {ROW | ROWS} {ONLY | WITH TIES}]
+```
+
+The `offset_row_count` or `fetch_row_count` value can be a number or a literal constant. You can omit `fetch_row_count`; by default, it equals to 1.
+
+`OFFSET` specifies the number of rows to skip before starting to return rows from the query result set.
+
+The `FETCH` specifies the maximum number of rows that can be in the result of a query.
+
+The `ONLY` option is used to return rows that immediately follow the rows omitted by the `OFFSET`. In this case the `FETCH` is an alternative to the [LIMIT](../../../sql-reference/statements/select/limit.md) clause. For example, the following query
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 1 ROW FETCH FIRST 3 ROWS ONLY;
+```
+
+is identical to the query
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a LIMIT 3 OFFSET 1;
+```
+
+The `WITH TIES` option is used to return any additional rows that tie for the last place in the result set according to the `ORDER BY` clause. For example, if `fetch_row_count` is set to 5 but two additional rows match the values of the `ORDER BY` columns in the fifth row, the result set will contain seven rows.
+
+!!! note "Note"
+    According to the standard, the `OFFSET` clause must come before the `FETCH` clause if both are present.
+    
+!!! note "Note"
+    The real offset can also depend on the [offset](../../../operations/settings/settings.md#offset) setting.
+	
+## Examples {#examples}
+
+Input table:
+
+``` text
+┌─a─┬─b─┐
+│ 1 │ 1 │
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 1 │ 3 │
+│ 5 │ 4 │
+│ 0 │ 6 │
+│ 5 │ 7 │
+└───┴───┘
+```
+
+Usage of the `ONLY` option:
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS ONLY;
+```
+
+Result:
+
+``` text
+┌─a─┬─b─┐
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 5 │ 4 │
+└───┴───┘
+```
+
+Usage of the `WITH TIES` option:
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS WITH TIES;
+```
+
+Result:
+
+``` text
+┌─a─┬─b─┐
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 5 │ 4 │
+│ 5 │ 7 │
+└───┴───┘
+```
diff --git a/docs/en/sql-reference/statements/select/order-by.md b/docs/en/sql-reference/statements/select/order-by.md
index fb1df445db1..a8fec5cfa26 100644
--- a/docs/en/sql-reference/statements/select/order-by.md
+++ b/docs/en/sql-reference/statements/select/order-by.md
@@ -252,11 +252,11 @@ External sorting works much less effectively than sorting in RAM.
 
  If `ORDER BY` expression has a prefix that coincides with the table sorting key, you can optimize the query by using the [optimize_read_in_order](../../../operations/settings/settings.md#optimize_read_in_order) setting.  
  
- When the `optimize_read_in_order` setting is enabled, the Clickhouse server uses the table index and reads the data in order of the `ORDER BY` key. This allows to avoid reading all data in case of specified [LIMIT](../../../sql-reference/statements/select/limit.md). So queries on big data with small limit are processed faster.
+ When the `optimize_read_in_order` setting is enabled, the ClickHouse server uses the table index and reads the data in order of the `ORDER BY` key. This allows to avoid reading all data in case of specified [LIMIT](../../../sql-reference/statements/select/limit.md). So queries on big data with small limit are processed faster.
 
-Optimization works with both `ASC` and `DESC` and doesn't work together with [GROUP BY](../../../sql-reference/statements/select/group-by.md) clause and [FINAL](../../../sql-reference/statements/select/from.md#select-from-final) modifier.
+Optimization works with both `ASC` and `DESC` and does not work together with [GROUP BY](../../../sql-reference/statements/select/group-by.md) clause and [FINAL](../../../sql-reference/statements/select/from.md#select-from-final) modifier.
 
-When the `optimize_read_in_order` setting is disabled, the Clickhouse server does not use the table index while processing `SELECT` queries.
+When the `optimize_read_in_order` setting is disabled, the ClickHouse server does not use the table index while processing `SELECT` queries.
 
 Consider disabling `optimize_read_in_order` manually, when running queries that have `ORDER BY` clause, large `LIMIT` and [WHERE](../../../sql-reference/statements/select/where.md) condition that requires to read huge amount of records before queried data is found.
 
@@ -265,7 +265,7 @@ Optimization is supported in the following table engines:
 - [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)
 - [Merge](../../../engines/table-engines/special/merge.md), [Buffer](../../../engines/table-engines/special/buffer.md), and [MaterializedView](../../../engines/table-engines/special/materializedview.md) table engines over `MergeTree`-engine tables
 
-In `MaterializedView`-engine tables the optimization works with views like `SELECT ... FROM merge_tree_table ORDER BY pk`. But it is not supported in the queries like `SELECT ... FROM view ORDER BY pk` if the view query doesn't have the `ORDER BY` clause.
+In `MaterializedView`-engine tables the optimization works with views like `SELECT ... FROM merge_tree_table ORDER BY pk`. But it is not supported in the queries like `SELECT ... FROM view ORDER BY pk` if the view query does not have the `ORDER BY` clause.
 
 ## ORDER BY Expr WITH FILL Modifier {#orderby-with-fill}
 
@@ -364,7 +364,7 @@ returns
 └────────────┴────────────┴──────────┘
 ```
 
-Field `d1` doesn’t fill and use default value cause we don’t have repeated values for `d2` value, and sequence for `d1` can’t be properly calculated.
+Field `d1` does not fill and use default value cause we do not have repeated values for `d2` value, and sequence for `d1` can’t be properly calculated.
 
 The following query with a changed field in `ORDER BY`
 
@@ -400,84 +400,4 @@ returns
 └────────────┴────────────┴──────────┘
 ```
 
-## OFFSET FETCH Clause {#offset-fetch}
-
-`OFFSET` and `FETCH` allow you to retrieve data by portions. They specify a row block which you want to get by a single query.
-
-``` sql
-OFFSET offset_row_count {ROW | ROWS}] [FETCH {FIRST | NEXT} fetch_row_count {ROW | ROWS} {ONLY | WITH TIES}]
-```
-
-The `offset_row_count` or `fetch_row_count` value can be a number or a literal constant. You can omit `fetch_row_count`; by default, it equals 1.
-
-`OFFSET` specifies the number of rows to skip before starting to return rows from the query.
-
-The `FETCH` specifies the maximum number of rows that can be in the result of a query.
-
-The `ONLY` option is used to return rows that immediately follow the rows omitted by the `OFFSET`. In this case the `FETCH` is an alternative to the [LIMIT](../../../sql-reference/statements/select/limit.md) clause. For example, the following query
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a OFFSET 1 ROW FETCH FIRST 3 ROWS ONLY;
-```
-
-is identical to the query
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a LIMIT 3 OFFSET 1;
-```
-
-The `WITH TIES` option is used to return any additional rows that tie for the last place in the result set according to the `ORDER BY` clause. For example, if `fetch_row_count` is set to 5 but two additional rows match the values of the `ORDER BY` columns in the fifth row, the result set will contain seven rows.
-
-!!! note "Note"
-    According to the standard, the `OFFSET` clause must come before the `FETCH` clause if both are present.
-	
-### Examples {#examples}
-
-Input table:
-
-``` text
-┌─a─┬─b─┐
-│ 1 │ 1 │
-│ 2 │ 1 │
-│ 3 │ 4 │
-│ 1 │ 3 │
-│ 5 │ 4 │
-│ 0 │ 6 │
-│ 5 │ 7 │
-└───┴───┘
-```
-
-Usage of the `ONLY` option:
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS ONLY;
-```
-
-Result:
-
-``` text
-┌─a─┬─b─┐
-│ 2 │ 1 │
-│ 3 │ 4 │
-│ 5 │ 4 │
-└───┴───┘
-```
-
-Usage of the `WITH TIES` option:
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS WITH TIES;
-```
-
-Result:
-
-``` text
-┌─a─┬─b─┐
-│ 2 │ 1 │
-│ 3 │ 4 │
-│ 5 │ 4 │
-│ 5 │ 7 │
-└───┴───┘
-```
-
 [Original article](https://clickhouse.tech/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 fc43d1de0a1..663b84f2d48 100644
--- a/docs/en/sql-reference/statements/select/prewhere.md
+++ b/docs/en/sql-reference/statements/select/prewhere.md
@@ -16,6 +16,9 @@ A query may simultaneously specify `PREWHERE` and `WHERE`. In this case, `PREWHE
 
 If the `optimize_move_to_prewhere` setting is set to 0, heuristics to automatically move parts of expressions from `WHERE` to `PREWHERE` are disabled.
 
+!!! 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. 
+     
 ## Limitations {#limitations}
 
 `PREWHERE` is only supported by tables from the `*MergeTree` family.
diff --git a/docs/en/sql-reference/statements/select/sample.md b/docs/en/sql-reference/statements/select/sample.md
index 55c1919b81d..2ed0a804736 100644
--- a/docs/en/sql-reference/statements/select/sample.md
+++ b/docs/en/sql-reference/statements/select/sample.md
@@ -11,7 +11,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 your raw data is not accurate, so approximation doesn’t noticeably degrade the quality.
+-   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).
 
 !!! note "Note"
@@ -59,7 +59,7 @@ In this case, the query is executed on a sample of at least `n` rows (but not si
 
 Since the minimum unit for data reading is one granule (its size is set by the `index_granularity` setting), it makes sense to set a sample that is much larger than the size of the granule.
 
-When using the `SAMPLE n` clause, you don’t know which relative percent of data was processed. So you don’t know the coefficient the aggregate functions should be multiplied by. Use the `_sample_factor` virtual column to get the approximate result.
+When using the `SAMPLE n` clause, you do not know which relative percent of data was processed. So you do not know the coefficient the aggregate functions should be multiplied by. Use the `_sample_factor` virtual column to get the approximate result.
 
 The `_sample_factor` column contains relative coefficients that are calculated dynamically. This column is created automatically when you [create](../../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) a table with the specified sampling key. The usage examples of the `_sample_factor` column are shown below.
 
@@ -79,7 +79,7 @@ FROM visits
 SAMPLE 10000000
 ```
 
-The example below shows how to calculate the average session duration. Note that you don’t need to use the relative coefficient to calculate the average values.
+The example below shows how to calculate the average session duration. Note that you do not need to use the relative coefficient to calculate the average values.
 
 ``` sql
 SELECT avg(Duration)
diff --git a/docs/en/sql-reference/statements/select/union.md b/docs/en/sql-reference/statements/select/union.md
index cf18ff7a4a2..6cedfb89787 100644
--- a/docs/en/sql-reference/statements/select/union.md
+++ b/docs/en/sql-reference/statements/select/union.md
@@ -78,4 +78,10 @@ Result:
 
 Queries that are parts of `UNION/UNION ALL/UNION DISTINCT` can be run simultaneously, and their results can be mixed together.
 
+**See Also**
+
+-   [insert_null_as_default](../../../operations/settings/settings.md#insert_null_as_default) setting.
+-   [union_default_mode](../../../operations/settings/settings.md#union-default-mode) setting.
+
+
 [Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/union/) <!-- hide -->
diff --git a/docs/en/sql-reference/statements/select/with.md b/docs/en/sql-reference/statements/select/with.md
index 6a0564a8ede..0958f651847 100644
--- a/docs/en/sql-reference/statements/select/with.md
+++ b/docs/en/sql-reference/statements/select/with.md
@@ -4,7 +4,7 @@ toc_title: WITH
 
 # WITH Clause {#with-clause}
 
-Clickhouse supports Common Table Expressions ([CTE](https://en.wikipedia.org/wiki/Hierarchical_and_recursive_queries_in_SQL)), that is provides to use results of `WITH` clause in the rest of `SELECT` query. Named subqueries can be included to the current and child query context in places where table objects are allowed. Recursion is prevented by hiding the current level CTEs from the WITH expression.
+ClickHouse supports Common Table Expressions ([CTE](https://en.wikipedia.org/wiki/Hierarchical_and_recursive_queries_in_SQL)), that is provides to use results of `WITH` clause in the rest of `SELECT` query. Named subqueries can be included to the current and child query context in places where table objects are allowed. Recursion is prevented by hiding the current level CTEs from the WITH expression.
 
 ## Syntax
 
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index 7b3f709b876..a78ef38241f 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -240,7 +240,7 @@ If user is not specified, the query returns privileges for the current user.
 
 Shows parameters that were used at a [user creation](../../sql-reference/statements/create/user.md).
 
-`SHOW CREATE USER` doesn’t output user passwords.
+`SHOW CREATE USER` does not output user passwords.
 
 ### Syntax {#show-create-user-syntax}
 
diff --git a/docs/en/sql-reference/statements/system.md b/docs/en/sql-reference/statements/system.md
index 2348a2a2668..9397d7002fd 100644
--- a/docs/en/sql-reference/statements/system.md
+++ b/docs/en/sql-reference/statements/system.md
@@ -169,7 +169,7 @@ SYSTEM START MERGES [ON VOLUME <volume_name> | [db.]merge_tree_family_table_name
 ### STOP TTL MERGES {#query_language-stop-ttl-merges}
 
 Provides possibility to stop background delete old data according to [TTL expression](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists or table have not MergeTree engine. Return error when database doesn’t exists:
+Returns `Ok.` even if table does not exist or table has not MergeTree engine. Returns error when database does not exist:
 
 ``` sql
 SYSTEM STOP TTL MERGES [[db.]merge_tree_family_table_name]
@@ -178,7 +178,7 @@ SYSTEM STOP TTL MERGES [[db.]merge_tree_family_table_name]
 ### START TTL MERGES {#query_language-start-ttl-merges}
 
 Provides possibility to start background delete old data according to [TTL expression](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists. Return error when database doesn’t exists:
+Returns `Ok.` even if table does not exist. Returns error when database does not exist:
 
 ``` sql
 SYSTEM START TTL MERGES [[db.]merge_tree_family_table_name]
@@ -187,7 +187,7 @@ SYSTEM START TTL MERGES [[db.]merge_tree_family_table_name]
 ### STOP MOVES {#query_language-stop-moves}
 
 Provides possibility to stop background move data according to [TTL table expression with TO VOLUME or TO DISK clause](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-table-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists. Return error when database doesn’t exists:
+Returns `Ok.` even if table does not exist. Returns error when database does not exist:
 
 ``` sql
 SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
@@ -196,10 +196,10 @@ SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
 ### START MOVES {#query_language-start-moves}
 
 Provides possibility to start background move data according to [TTL table expression with TO VOLUME and TO DISK clause](../../engines/table-engines/mergetree-family/mergetree.md#mergetree-table-ttl) for tables in the MergeTree family:
-Return `Ok.` even table doesn’t exists. Return error when database doesn’t exists:
+Returns `Ok.` even if table does not exist. Returns error when database does not exist:
 
 ``` sql
-SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
+SYSTEM START MOVES [[db.]merge_tree_family_table_name]
 ```
 
 ## Managing ReplicatedMergeTree Tables {#query-language-system-replicated}
@@ -209,7 +209,7 @@ ClickHouse can manage background replication related processes in [ReplicatedMer
 ### STOP FETCHES {#query_language-system-stop-fetches}
 
 Provides possibility to stop background fetches for inserted parts for tables in the `ReplicatedMergeTree` family:
-Always returns `Ok.` regardless of the table engine and even table or database doesn’t exists.
+Always returns `Ok.` regardless of the table engine and even if table or database does not exist.
 
 ``` sql
 SYSTEM STOP FETCHES [[db.]replicated_merge_tree_family_table_name]
@@ -218,7 +218,7 @@ SYSTEM STOP FETCHES [[db.]replicated_merge_tree_family_table_name]
 ### START FETCHES {#query_language-system-start-fetches}
 
 Provides possibility to start background fetches for inserted parts for tables in the `ReplicatedMergeTree` family:
-Always returns `Ok.` regardless of the table engine and even table or database doesn’t exists.
+Always returns `Ok.` regardless of the table engine and even if table or database does not exist.
 
 ``` sql
 SYSTEM START FETCHES [[db.]replicated_merge_tree_family_table_name]
@@ -264,9 +264,7 @@ Wait until a `ReplicatedMergeTree` table will be synced with other replicas in a
 SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name
 ```
 
-After running this statement the `[db.]replicated_merge_tree_family_table_name` fetches commands from 
-the common replicated log into its own replication queue, and then the query waits till the replica processes all
-of the fetched commands.
+After running this statement the `[db.]replicated_merge_tree_family_table_name` fetches commands from the common replicated log into its own replication queue, and then the query waits till the replica processes all of the fetched commands.
 
 ### RESTART REPLICA {#query_language-system-restart-replica}
 
@@ -280,4 +278,3 @@ SYSTEM RESTART REPLICA [db.]replicated_merge_tree_family_table_name
 ### RESTART REPLICAS {#query_language-system-restart-replicas}
 
 Provides possibility to reinitialize Zookeeper sessions state for all `ReplicatedMergeTree` tables, will compare current state with Zookeeper as source of true and add tasks to Zookeeper queue if needed
-
diff --git a/docs/en/sql-reference/statements/truncate.md b/docs/en/sql-reference/statements/truncate.md
index a13936c88ab..f302a8605e2 100644
--- a/docs/en/sql-reference/statements/truncate.md
+++ b/docs/en/sql-reference/statements/truncate.md
@@ -11,4 +11,4 @@ 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) and [Null](../../engines/table-engines/special/null.md) table engines.
+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.
diff --git a/docs/en/sql-reference/syntax.md b/docs/en/sql-reference/syntax.md
index 5d0eee76393..573e35d2f71 100644
--- a/docs/en/sql-reference/syntax.md
+++ b/docs/en/sql-reference/syntax.md
@@ -171,7 +171,7 @@ Received exception from server (version 18.14.17):
 Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: Aggregate function sum(b) is found inside another aggregate function in query.
 ```
 
-In this example, we declared table `t` with column `b`. Then, when selecting data, we defined the `sum(b) AS b` alias. As aliases are global, ClickHouse substituted the literal `b` in the expression `argMax(a, b)` with the expression `sum(b)`. This substitution caused the exception.
+In this example, we declared table `t` with column `b`. Then, when selecting data, we defined the `sum(b) AS b` alias. As aliases are global, ClickHouse substituted the literal `b` in the expression `argMax(a, b)` with the expression `sum(b)`. This substitution caused the exception. You can change this default behavior by setting [prefer_column_name_to_alias](../operations/settings/settings.md#prefer_column_name_to_alias) to `1`.
 
 ## Asterisk {#asterisk}
 
diff --git a/docs/en/sql-reference/table-functions/cluster.md b/docs/en/sql-reference/table-functions/cluster.md
index b85542d784f..2856e66db9b 100644
--- a/docs/en/sql-reference/table-functions/cluster.md
+++ b/docs/en/sql-reference/table-functions/cluster.md
@@ -24,7 +24,7 @@ clusterAllReplicas('cluster_name', db, table[, sharding_key])
 
 `sharding_key` - When insert into cluster function with more than one shard, sharding_key need to be provided.
 
-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 don’t use the `cluster` and `clusterAllReplicas` table functions.
+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.
 
 The `cluster` and `clusterAllReplicas` table functions can be useful in the following cases:
 
diff --git a/docs/en/sql-reference/table-functions/dictionary.md b/docs/en/sql-reference/table-functions/dictionary.md
new file mode 100644
index 00000000000..675fcb5bfdd
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/dictionary.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 54
+toc_title: dictionary function
+---
+
+# dictionary {#dictionary-function}
+
+Displays the [dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) data as a ClickHouse table. Works the same way as [Dictionary](../../engines/table-engines/special/dictionary.md) engine.
+
+**Syntax**
+
+``` sql
+dictionary('dict')
+```
+
+**Arguments** 
+
+-   `dict` — A dictionary name. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+A ClickHouse table.
+
+**Example**
+
+Input table `dictionary_source_table`:
+
+``` text
+┌─id─┬─value─┐
+│  0 │     0 │
+│  1 │     1 │
+└────┴───────┘
+```
+
+Create a dictionary:
+
+``` sql
+CREATE DICTIONARY new_dictionary(id UInt64, value UInt64 DEFAULT 0) PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dictionary_source_table')) LAYOUT(DIRECT());
+```
+
+Query:
+
+``` sql
+SELECT * FROM dictionary('new_dictionary');
+```
+
+Result:
+
+``` text
+┌─id─┬─value─┐
+│  0 │     0 │
+│  1 │     1 │
+└────┴───────┘
+```
+
+**See Also**
+
+-   [Dictionary engine](../../engines/table-engines/special/dictionary.md#dictionary)
diff --git a/docs/en/sql-reference/table-functions/postgresql.md b/docs/en/sql-reference/table-functions/postgresql.md
index bfb5fdf9be6..3eab572ac12 100644
--- a/docs/en/sql-reference/table-functions/postgresql.md
+++ b/docs/en/sql-reference/table-functions/postgresql.md
@@ -65,9 +65,9 @@ postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
 INSERT 0 1
 
 postgresql> SELECT * FROM test;
- int_id | int_nullable | float | str  | float_nullable
---------+--------------+-------+------+----------------
-      1 |              |     2 | test |
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
 (1 row)
 ```
 
diff --git a/docs/en/sql-reference/table-functions/remote.md b/docs/en/sql-reference/table-functions/remote.md
index e80e58a76aa..ae399c7e612 100644
--- a/docs/en/sql-reference/table-functions/remote.md
+++ b/docs/en/sql-reference/table-functions/remote.md
@@ -42,7 +42,7 @@ The dataset from remote servers.
 
 **Usage**
 
-Using the `remote` table function is less optimal than creating a `Distributed` table because in this case the server connection is re-established for every request. Also, if hostnames are set, the names are resolved, and errors are not counted when working with various replicas. When processing a large number of queries, always create the `Distributed` table ahead of time, and don’t use the `remote` table function.
+Using the `remote` table function is less optimal than creating a `Distributed` table because in this case the server connection is re-established for every request. Also, if hostnames are set, the names are resolved, and errors are not counted when working with various replicas. When processing a large number of queries, always create the `Distributed` table ahead of time, and do not use the `remote` table function.
 
 The `remote` table function can be useful in the following cases:
 
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index 34f0607b94c..285ec862aab 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -18,7 +18,7 @@ s3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compres
 -   `path` — Bucket url with path to file. Supports following wildcards in readonly mode: `*`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings. For more information see [here](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
 -   `format` — The [format](../../interfaces/formats.md#formats) of the file.
 -   `structure` — Structure of the table. Format `'column1_name column1_type, column2_name column2_type, ...'`.
--   `compression` — Parameter is optional. Supported values: none, gzip/gz, brotli/br, xz/LZMA, zstd/zst. By default, it will autodetect compression by file extension.
+-   `compression` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression by file extension.
 
 **Returned value**
 
diff --git a/docs/en/sql-reference/table-functions/view.md b/docs/en/sql-reference/table-functions/view.md
index e49a9f5218b..18323ec4e92 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 doesn't 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.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.
 
 **Syntax**
 
diff --git a/docs/en/whats-new/changelog/2017.md b/docs/en/whats-new/changelog/2017.md
index 17d3efe7bab..9ceca2b6c4a 100644
--- a/docs/en/whats-new/changelog/2017.md
+++ b/docs/en/whats-new/changelog/2017.md
@@ -7,7 +7,7 @@ toc_title: '2017'
 
 This release contains bug fixes for the previous release 1.1.54318:
 
--   Fixed bug with possible race condition in replication that could lead to data loss. This issue affects versions 1.1.54310 and 1.1.54318. If you use one of these versions with Replicated tables, the update is strongly recommended. This issue shows in logs in Warning messages like `Part ... from own log doesn't exist.` The issue is relevant even if you don’t see these messages in logs.
+-   Fixed bug with possible race condition in replication that could lead to data loss. This issue affects versions 1.1.54310 and 1.1.54318. If you use one of these versions with Replicated tables, the update is strongly recommended. This issue shows in logs in Warning messages like `Part ... from own log does not exist.` The issue is relevant even if you do not see these messages in logs.
 
 ### ClickHouse Release 1.1.54318, 2017-11-30 {#clickhouse-release-1-1-54318-2017-11-30}
 
@@ -50,7 +50,7 @@ This release contains bug fixes for the previous release 1.1.54310:
 -   Fixed nonatomic adding and removing of parts in Replicated tables.
 -   Data inserted into a materialized view is not subjected to unnecessary deduplication.
 -   Executing a query to a Distributed table for which the local replica is lagging and remote replicas are unavailable does not result in an error anymore.
--   Users don’t need access permissions to the `default` database to create temporary tables anymore.
+-   Users do not need access permissions to the `default` database to create temporary tables anymore.
 -   Fixed crashing when specifying the Array type without arguments.
 -   Fixed hangups when the disk volume containing server logs is full.
 -   Fixed an overflow in the toRelativeWeekNum function for the first week of the Unix epoch.
@@ -138,7 +138,7 @@ This release contains bug fixes for the previous release 1.1.54310:
 
 #### Please Note When Upgrading: {#please-note-when-upgrading}
 
--   There is now a higher default value for the MergeTree setting `max_bytes_to_merge_at_max_space_in_pool` (the maximum total size of data parts to merge, in bytes): it has increased from 100 GiB to 150 GiB. This might result in large merges running after the server upgrade, which could cause an increased load on the disk subsystem. If the free space available on the server is less than twice the total amount of the merges that are running, this will cause all other merges to stop running, including merges of small data parts. As a result, INSERT queries will fail with the message “Merges are processing significantly slower than inserts.” Use the `SELECT * FROM system.merges` query to monitor the situation. You can also check the `DiskSpaceReservedForMerge` metric in the `system.metrics` table, or in Graphite. You don’t need to do anything to fix this, since the issue will resolve itself once the large merges finish. If you find this unacceptable, you can restore the previous value for the `max_bytes_to_merge_at_max_space_in_pool` setting. To do this, go to the `<merge_tree>` section in config.xml, set ``` <merge_tree>``<max_bytes_to_merge_at_max_space_in_pool>107374182400</max_bytes_to_merge_at_max_space_in_pool> ``` and restart the server.
+-   There is now a higher default value for the MergeTree setting `max_bytes_to_merge_at_max_space_in_pool` (the maximum total size of data parts to merge, in bytes): it has increased from 100 GiB to 150 GiB. This might result in large merges running after the server upgrade, which could cause an increased load on the disk subsystem. If the free space available on the server is less than twice the total amount of the merges that are running, this will cause all other merges to stop running, including merges of small data parts. As a result, INSERT queries will fail with the message “Merges are processing significantly slower than inserts.” Use the `SELECT * FROM system.merges` query to monitor the situation. You can also check the `DiskSpaceReservedForMerge` metric in the `system.metrics` table, or in Graphite. You do not need to do anything to fix this, since the issue will resolve itself once the large merges finish. If you find this unacceptable, you can restore the previous value for the `max_bytes_to_merge_at_max_space_in_pool` setting. To do this, go to the `<merge_tree>` section in config.xml, set ``` <merge_tree>``<max_bytes_to_merge_at_max_space_in_pool>107374182400</max_bytes_to_merge_at_max_space_in_pool> ``` and restart the server.
 
 ### ClickHouse Release 1.1.54284, 2017-08-29 {#clickhouse-release-1-1-54284-2017-08-29}
 
@@ -181,7 +181,7 @@ This release contains bug fixes for the previous release 1.1.54276:
 
 -   Added the `output_format_json_quote_denormals` setting, which enables outputting nan and inf values in JSON format.
 -   Optimized stream allocation when reading from a Distributed table.
--   Settings can be configured in readonly mode if the value doesn’t change.
+-   Settings can be configured in readonly mode if the value does not change.
 -   Added the ability to retrieve non-integer granules of the MergeTree engine in order to meet restrictions on the block size specified in the preferred_block_size_bytes setting. The purpose is to reduce the consumption of RAM and increase cache locality when processing queries from tables with large columns.
 -   Efficient use of indexes that contain expressions like `toStartOfHour(x)` for conditions like `toStartOfHour(x) op сonstexpr.`
 -   Added new settings for MergeTree engines (the merge_tree section in config.xml):
diff --git a/docs/en/whats-new/changelog/2018.md b/docs/en/whats-new/changelog/2018.md
index b0c4e147352..3544c9a9b49 100644
--- a/docs/en/whats-new/changelog/2018.md
+++ b/docs/en/whats-new/changelog/2018.md
@@ -32,7 +32,7 @@ toc_title: '2018'
 -   Now you can use a parameter to configure the precision of the `uniqCombined` aggregate function (select the number of HyperLogLog cells). [#3406](https://github.com/ClickHouse/ClickHouse/pull/3406)
 -   Added the `system.contributors` table that contains the names of everyone who made commits in ClickHouse. [#3452](https://github.com/ClickHouse/ClickHouse/pull/3452)
 -   Added the ability to omit the partition for the `ALTER TABLE ... FREEZE` query in order to back up all partitions at once. [#3514](https://github.com/ClickHouse/ClickHouse/pull/3514)
--   Added `dictGet` and `dictGetOrDefault` functions that don’t require specifying the type of return value. The type is determined automatically from the dictionary description. [Amos Bird](https://github.com/ClickHouse/ClickHouse/pull/3564)
+-   Added `dictGet` and `dictGetOrDefault` functions that do not require specifying the type of return value. The type is determined automatically from the dictionary description. [Amos Bird](https://github.com/ClickHouse/ClickHouse/pull/3564)
 -   Now you can specify comments for a column in the table description and change it using `ALTER`. [#3377](https://github.com/ClickHouse/ClickHouse/pull/3377)
 -   Reading is supported for `Join` type tables with simple keys. [Amos Bird](https://github.com/ClickHouse/ClickHouse/pull/3728)
 -   Now you can specify the options `join_use_nulls`, `max_rows_in_join`, `max_bytes_in_join`, and `join_overflow_mode` when creating a `Join` type table. [Amos Bird](https://github.com/ClickHouse/ClickHouse/pull/3728)
@@ -70,7 +70,7 @@ toc_title: '2018'
 
 #### Improvements: {#improvements-1}
 
--   The server does not write the processed configuration files to the `/etc/clickhouse-server/` directory. Instead, it saves them in the `preprocessed_configs` directory inside `path`. This means that the `/etc/clickhouse-server/` directory doesn’t have write access for the `clickhouse` user, which improves security. [#2443](https://github.com/ClickHouse/ClickHouse/pull/2443)
+-   The server does not write the processed configuration files to the `/etc/clickhouse-server/` directory. Instead, it saves them in the `preprocessed_configs` directory inside `path`. This means that the `/etc/clickhouse-server/` directory does not have write access for the `clickhouse` user, which improves security. [#2443](https://github.com/ClickHouse/ClickHouse/pull/2443)
 -   The `min_merge_bytes_to_use_direct_io` option is set to 10 GiB by default. A merge that forms large parts of tables from the MergeTree family will be performed in `O_DIRECT` mode, which prevents excessive page cache eviction. [#3504](https://github.com/ClickHouse/ClickHouse/pull/3504)
 -   Accelerated server start when there is a very large number of tables. [#3398](https://github.com/ClickHouse/ClickHouse/pull/3398)
 -   Added a connection pool and HTTP `Keep-Alive` for connections between replicas. [#3594](https://github.com/ClickHouse/ClickHouse/pull/3594)
@@ -291,7 +291,7 @@ toc_title: '2018'
 -   Fixed an error when using `FINAL` with `PREWHERE`. [#3298](https://github.com/ClickHouse/ClickHouse/pull/3298)
 -   Fixed an error when using `PREWHERE` over columns that were added during `ALTER`. [#3298](https://github.com/ClickHouse/ClickHouse/pull/3298)
 -   Added a check for the absence of `arrayJoin` for `DEFAULT` and `MATERIALIZED` expressions. Previously, `arrayJoin` led to an error when inserting data. [#3337](https://github.com/ClickHouse/ClickHouse/pull/3337)
--   Added a check for the absence of `arrayJoin` in a `PREWHERE` clause. Previously, this led to messages like `Size ... doesn't match` or `Unknown compression method` when executing queries. [#3357](https://github.com/ClickHouse/ClickHouse/pull/3357)
+-   Added a check for the absence of `arrayJoin` in a `PREWHERE` clause. Previously, this led to messages like `Size ... does not match` or `Unknown compression method` when executing queries. [#3357](https://github.com/ClickHouse/ClickHouse/pull/3357)
 -   Fixed segfault that could occur in rare cases after optimization that replaced AND chains from equality evaluations with the corresponding IN expression. [liuyimin-bytedance](https://github.com/ClickHouse/ClickHouse/pull/3339)
 -   Minor corrections to `clickhouse-benchmark`: previously, client information was not sent to the server; now the number of queries executed is calculated more accurately when shutting down and for limiting the number of iterations. [#3351](https://github.com/ClickHouse/ClickHouse/pull/3351) [#3352](https://github.com/ClickHouse/ClickHouse/pull/3352)
 
@@ -392,7 +392,7 @@ toc_title: '2018'
 -   The operation timeout can now be configured when working with ZooKeeper. [urykhy](https://github.com/ClickHouse/ClickHouse/pull/2971)
 -   You can specify an offset for `LIMIT n, m` as `LIMIT n OFFSET m`. [#2840](https://github.com/ClickHouse/ClickHouse/pull/2840)
 -   You can use the `SELECT TOP n` syntax as an alternative for `LIMIT`. [#2840](https://github.com/ClickHouse/ClickHouse/pull/2840)
--   Increased the size of the queue to write to system tables, so the `SystemLog parameter queue is full` error doesn’t happen as often.
+-   Increased the size of the queue to write to system tables, so the `SystemLog parameter queue is full` error does not happen as often.
 -   The `windowFunnel` aggregate function now supports events that meet multiple conditions. [Amos Bird](https://github.com/ClickHouse/ClickHouse/pull/2801)
 -   Duplicate columns can be used in a `USING` clause for `JOIN`. [#3006](https://github.com/ClickHouse/ClickHouse/pull/3006)
 -   `Pretty` formats now have a limit on column alignment by width. Use the `output_format_pretty_max_column_pad_width` setting. If a value is wider, it will still be displayed in its entirety, but the other cells in the table will not be too wide. [#3003](https://github.com/ClickHouse/ClickHouse/pull/3003)
@@ -405,7 +405,7 @@ toc_title: '2018'
 
 #### Bug Fixes: {#bug-fixes-13}
 
--   Fixed an issue with `Dictionary` tables (throws the `Size of offsets doesn't match size of column` or `Unknown compression method` exception). This bug appeared in version 18.10.3. [#2913](https://github.com/ClickHouse/ClickHouse/issues/2913)
+-   Fixed an issue with `Dictionary` tables (throws the `Size of offsets does not match size of column` or `Unknown compression method` exception). This bug appeared in version 18.10.3. [#2913](https://github.com/ClickHouse/ClickHouse/issues/2913)
 -   Fixed a bug when merging `CollapsingMergeTree` tables if one of the data parts is empty (these parts are formed during merge or `ALTER DELETE` if all data was deleted), and the `vertical` algorithm was used for the merge. [#3049](https://github.com/ClickHouse/ClickHouse/pull/3049)
 -   Fixed a race condition during `DROP` or `TRUNCATE` for `Memory` tables with a simultaneous `SELECT`, which could lead to server crashes. This bug appeared in version 1.1.54388. [#3038](https://github.com/ClickHouse/ClickHouse/pull/3038)
 -   Fixed the possibility of data loss when inserting in `Replicated` tables if the `Session is expired` error is returned (data loss can be detected by the `ReplicatedDataLoss` metric). This error occurred in version 1.1.54378. [#2939](https://github.com/ClickHouse/ClickHouse/pull/2939) [#2949](https://github.com/ClickHouse/ClickHouse/pull/2949) [#2964](https://github.com/ClickHouse/ClickHouse/pull/2964)
@@ -715,7 +715,7 @@ toc_title: '2018'
 #### Backward Incompatible Changes: {#backward-incompatible-changes-7}
 
 -   Removed escaping in `Vertical` and `Pretty*` formats and deleted the `VerticalRaw` format.
--   If servers with version 1.1.54388 (or newer) and servers with an older version are used simultaneously in a distributed query and the query has the `cast(x, 'Type')` expression without the `AS` keyword and doesn’t have the word `cast` in uppercase, an exception will be thrown with a message like `Not found column cast(0, 'UInt8') in block`. Solution: Update the server on the entire cluster.
+-   If servers with version 1.1.54388 (or newer) and servers with an older version are used simultaneously in a distributed query and the query has the `cast(x, 'Type')` expression without the `AS` keyword and does not have the word `cast` in uppercase, an exception will be thrown with a message like `Not found column cast(0, 'UInt8') in block`. Solution: Update the server on the entire cluster.
 
 ### ClickHouse Release 1.1.54385, 2018-06-01 {#clickhouse-release-1-1-54385-2018-06-01}
 
@@ -1044,7 +1044,7 @@ This release contains bug fixes for the previous release 1.1.54337:
 
 #### Backward Incompatible Changes: {#backward-incompatible-changes-11}
 
--   The format for marks in `Log` type tables that contain `Nullable` columns was changed in a backward incompatible way. If you have these tables, you should convert them to the `TinyLog` type before starting up the new server version. To do this, replace `ENGINE = Log` with `ENGINE = TinyLog` in the corresponding `.sql` file in the `metadata` directory. If your table doesn’t have `Nullable` columns or if the type of your table is not `Log`, then you don’t need to do anything.
+-   The format for marks in `Log` type tables that contain `Nullable` columns was changed in a backward incompatible way. If you have these tables, you should convert them to the `TinyLog` type before starting up the new server version. To do this, replace `ENGINE = Log` with `ENGINE = TinyLog` in the corresponding `.sql` file in the `metadata` directory. If your table does not have `Nullable` columns or if the type of your table is not `Log`, then you do not need to do anything.
 -   Removed the `experimental_allow_extended_storage_definition_syntax` setting. Now this feature is enabled by default.
 -   The `runningIncome` function was renamed to `runningDifferenceStartingWithFirstvalue` to avoid confusion.
 -   Removed the `FROM ARRAY JOIN arr` syntax when ARRAY JOIN is specified directly after FROM with no table (Amos Bird).
diff --git a/docs/en/whats-new/changelog/2019.md b/docs/en/whats-new/changelog/2019.md
index eacd522390f..bd86bf6ce8b 100644
--- a/docs/en/whats-new/changelog/2019.md
+++ b/docs/en/whats-new/changelog/2019.md
@@ -11,16 +11,16 @@ toc_title: '2019'
 
 -   Fixed potential buffer overflow in decompress. Malicious user can pass fabricated compressed data that could cause read after buffer. This issue was found by Eldar Zaitov from Yandex information security team. [#8404](https://github.com/ClickHouse/ClickHouse/pull/8404) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed possible server crash (`std::terminate`) when the server cannot send or write data in JSON or XML format with values of String data type (that require UTF-8 validation) or when compressing result data with Brotli algorithm or in some other rare cases. [#8384](https://github.com/ClickHouse/ClickHouse/pull/8384) ([alexey-milovidov](https://github.com/alexey-milovidov))
--   Fixed dictionaries with source from a clickhouse `VIEW`, now reading such dictionaries doesn’t cause the error `There is no query`. [#8351](https://github.com/ClickHouse/ClickHouse/pull/8351) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+-   Fixed dictionaries with source from a clickhouse `VIEW`, now reading such dictionaries does not cause the error `There is no query`. [#8351](https://github.com/ClickHouse/ClickHouse/pull/8351) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 -   Fixed checking if a client host is allowed by host_regexp specified in users.xml. [#8241](https://github.com/ClickHouse/ClickHouse/pull/8241), [#8342](https://github.com/ClickHouse/ClickHouse/pull/8342) ([Vitaly Baranov](https://github.com/vitlibar))
 -   `RENAME TABLE` for a distributed table now renames the folder containing inserted data before sending to shards. This fixes an issue with successive renames `tableA->tableB`, `tableC->tableA`. [#8306](https://github.com/ClickHouse/ClickHouse/pull/8306) ([tavplubix](https://github.com/tavplubix))
 -   `range_hashed` external dictionaries created by DDL queries now allow ranges of arbitrary numeric types. [#8275](https://github.com/ClickHouse/ClickHouse/pull/8275) ([alesapin](https://github.com/alesapin))
 -   Fixed `INSERT INTO table SELECT ... FROM mysql(...)` table function. [#8234](https://github.com/ClickHouse/ClickHouse/pull/8234) ([tavplubix](https://github.com/tavplubix))
--   Fixed segfault in `INSERT INTO TABLE FUNCTION file()` while inserting into a file which doesn’t exist. Now in this case file would be created and then insert would be processed. [#8177](https://github.com/ClickHouse/ClickHouse/pull/8177) ([Olga Khvostikova](https://github.com/stavrolia))
+-   Fixed segfault in `INSERT INTO TABLE FUNCTION file()` while inserting into a file which does not exist. Now in this case file would be created and then insert would be processed. [#8177](https://github.com/ClickHouse/ClickHouse/pull/8177) ([Olga Khvostikova](https://github.com/stavrolia))
 -   Fixed bitmapAnd error when intersecting an aggregated bitmap and a scalar bitmap. [#8082](https://github.com/ClickHouse/ClickHouse/pull/8082) ([Yue Huang](https://github.com/moon03432))
 -   Fixed segfault when `EXISTS` query was used without `TABLE` or `DICTIONARY` qualifier, just like `EXISTS t`. [#8213](https://github.com/ClickHouse/ClickHouse/pull/8213) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed return type for functions `rand` and `randConstant` in case of nullable argument. Now functions always return `UInt32` and never `Nullable(UInt32)`. [#8204](https://github.com/ClickHouse/ClickHouse/pull/8204) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
--   Fixed `DROP DICTIONARY IF EXISTS db.dict`, now it doesn’t throw exception if `db` doesn’t exist. [#8185](https://github.com/ClickHouse/ClickHouse/pull/8185) ([Vitaly Baranov](https://github.com/vitlibar))
+-   Fixed `DROP DICTIONARY IF EXISTS db.dict`, now it does not throw exception if `db` does not exist. [#8185](https://github.com/ClickHouse/ClickHouse/pull/8185) ([Vitaly Baranov](https://github.com/vitlibar))
 -   If a table wasn’t completely dropped because of server crash, the server will try to restore and load it [#8176](https://github.com/ClickHouse/ClickHouse/pull/8176) ([tavplubix](https://github.com/tavplubix))
 -   Fixed a trivial count query for a distributed table if there are more than two shard local table. [#8164](https://github.com/ClickHouse/ClickHouse/pull/8164) ([小路](https://github.com/nicelulu))
 -   Fixed bug that lead to a data race in DB::BlockStreamProfileInfo::calculateRowsBeforeLimit() [#8143](https://github.com/ClickHouse/ClickHouse/pull/8143) ([Alexander Kazakov](https://github.com/Akazz))
@@ -36,7 +36,7 @@ toc_title: '2019'
 -   Removed the mutation number from a part name in case there were no mutations. This removing improved the compatibility with older versions. [#8250](https://github.com/ClickHouse/ClickHouse/pull/8250) ([alesapin](https://github.com/alesapin))
 -   Fixed the bug that mutations are skipped for some attached parts due to their data_version are larger than the table mutation version. [#7812](https://github.com/ClickHouse/ClickHouse/pull/7812) ([Zhichang Yu](https://github.com/yuzhichang))
 -   Allow starting the server with redundant copies of parts after moving them to another device. [#7810](https://github.com/ClickHouse/ClickHouse/pull/7810) ([Vladimir Chebotarev](https://github.com/excitoon))
--   Fixed the error “Sizes of columns doesn’t match” that might appear when using aggregate function columns. [#7790](https://github.com/ClickHouse/ClickHouse/pull/7790) ([Boris Granveaud](https://github.com/bgranvea))
+-   Fixed the error “Sizes of columns does not match” that might appear when using aggregate function columns. [#7790](https://github.com/ClickHouse/ClickHouse/pull/7790) ([Boris Granveaud](https://github.com/bgranvea))
 -   Now an exception will be thrown in case of using WITH TIES alongside LIMIT BY. And now it’s possible to use TOP with LIMIT BY. [#7637](https://github.com/ClickHouse/ClickHouse/pull/7637) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
 -   Fix dictionary reload if it has `invalidate_query`, which stopped updates and some exception on previous update tries. [#8029](https://github.com/ClickHouse/ClickHouse/pull/8029) ([alesapin](https://github.com/alesapin))
 
@@ -52,7 +52,7 @@ toc_title: '2019'
 -   Make `bloom_filter` type of index supporting `LowCardinality` and `Nullable` [#7363](https://github.com/ClickHouse/ClickHouse/issues/7363) [#7561](https://github.com/ClickHouse/ClickHouse/pull/7561) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 -   Add function `isValidJSON` to check that passed string is a valid json. [#5910](https://github.com/ClickHouse/ClickHouse/issues/5910) [#7293](https://github.com/ClickHouse/ClickHouse/pull/7293) ([Vdimir](https://github.com/Vdimir))
 -   Implement `arrayCompact` function [#7328](https://github.com/ClickHouse/ClickHouse/pull/7328) ([Memo](https://github.com/Joeywzr))
--   Created function `hex` for Decimal numbers. It works like `hex(reinterpretAsString())`, but doesn’t delete last zero bytes. [#7355](https://github.com/ClickHouse/ClickHouse/pull/7355) ([Mikhail Korotov](https://github.com/millb))
+-   Created function `hex` for Decimal numbers. It works like `hex(reinterpretAsString())`, but does not delete last zero bytes. [#7355](https://github.com/ClickHouse/ClickHouse/pull/7355) ([Mikhail Korotov](https://github.com/millb))
 -   Add `arrayFill` and `arrayReverseFill` functions, which replace elements by other elements in front/back of them in the array. [#7380](https://github.com/ClickHouse/ClickHouse/pull/7380) ([hcz](https://github.com/hczhcz))
 -   Add `CRC32IEEE()`/`CRC64()` support [#7480](https://github.com/ClickHouse/ClickHouse/pull/7480) ([Azat Khuzhin](https://github.com/azat))
 -   Implement `char` function similar to one in [mysql](https://dev.mysql.com/doc/refman/8.0/en/string-functions.html#function_char) [#7486](https://github.com/ClickHouse/ClickHouse/pull/7486) ([sundyli](https://github.com/sundy-li))
@@ -609,12 +609,12 @@ toc_title: '2019'
 -   Fixed the possibility of hanging queries when server is overloaded and global thread pool becomes near full. This have higher chance to happen on clusters with large number of shards (hundreds), because distributed queries allocate a thread per connection to each shard. For example, this issue may reproduce if a cluster of 330 shards is processing 30 concurrent distributed queries. This issue affects all versions starting from 19.2. [#6301](https://github.com/ClickHouse/ClickHouse/pull/6301) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed logic of `arrayEnumerateUniqRanked` function. [#6423](https://github.com/ClickHouse/ClickHouse/pull/6423) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fix segfault when decoding symbol table. [#6603](https://github.com/ClickHouse/ClickHouse/pull/6603) ([Amos Bird](https://github.com/amosbird))
--   Fixed irrelevant exception in cast of `LowCardinality(Nullable)` to not-Nullable column in case if it doesn’t contain Nulls (e.g. in query like `SELECT CAST(CAST('Hello' AS LowCardinality(Nullable(String))) AS String)`. [#6094](https://github.com/ClickHouse/ClickHouse/issues/6094) [#6119](https://github.com/ClickHouse/ClickHouse/pull/6119) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+-   Fixed irrelevant exception in cast of `LowCardinality(Nullable)` to not-Nullable column in case if it does not contain Nulls (e.g. in query like `SELECT CAST(CAST('Hello' AS LowCardinality(Nullable(String))) AS String)`. [#6094](https://github.com/ClickHouse/ClickHouse/issues/6094) [#6119](https://github.com/ClickHouse/ClickHouse/pull/6119) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 -   Removed extra quoting of description in `system.settings` table. [#6696](https://github.com/ClickHouse/ClickHouse/issues/6696) [#6699](https://github.com/ClickHouse/ClickHouse/pull/6699) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Avoid possible deadlock in `TRUNCATE` of Replicated table. [#6695](https://github.com/ClickHouse/ClickHouse/pull/6695) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fix reading in order of sorting key. [#6189](https://github.com/ClickHouse/ClickHouse/pull/6189) ([Anton Popov](https://github.com/CurtizJ))
 -   Fix `ALTER TABLE ... UPDATE` query for tables with `enable_mixed_granularity_parts=1`. [#6543](https://github.com/ClickHouse/ClickHouse/pull/6543) ([alesapin](https://github.com/alesapin))
--   Fix bug opened by [#4405](https://github.com/ClickHouse/ClickHouse/pull/4405) (since 19.4.0). Reproduces in queries to Distributed tables over MergeTree tables when we doesn’t query any columns (`SELECT 1`). [#6236](https://github.com/ClickHouse/ClickHouse/pull/6236) ([alesapin](https://github.com/alesapin))
+-   Fix bug opened by [#4405](https://github.com/ClickHouse/ClickHouse/pull/4405) (since 19.4.0). Reproduces in queries to Distributed tables over MergeTree tables when we does not query any columns (`SELECT 1`). [#6236](https://github.com/ClickHouse/ClickHouse/pull/6236) ([alesapin](https://github.com/alesapin))
 -   Fixed overflow in integer division of signed type to unsigned type. The behaviour was exactly as in C or C++ language (integer promotion rules) that may be surprising. Please note that the overflow is still possible when dividing large signed number to large unsigned number or vice-versa (but that case is less usual). The issue existed in all server versions. [#6214](https://github.com/ClickHouse/ClickHouse/issues/6214) [#6233](https://github.com/ClickHouse/ClickHouse/pull/6233) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Limit maximum sleep time for throttling when `max_execution_speed` or `max_execution_speed_bytes` is set. Fixed false errors like `Estimated query execution time (inf seconds) is too long`. [#5547](https://github.com/ClickHouse/ClickHouse/issues/5547) [#6232](https://github.com/ClickHouse/ClickHouse/pull/6232) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed issues about using `MATERIALIZED` columns and aliases in `MaterializedView`. [#448](https://github.com/ClickHouse/ClickHouse/issues/448) [#3484](https://github.com/ClickHouse/ClickHouse/issues/3484) [#3450](https://github.com/ClickHouse/ClickHouse/issues/3450) [#2878](https://github.com/ClickHouse/ClickHouse/issues/2878) [#2285](https://github.com/ClickHouse/ClickHouse/issues/2285) [#3796](https://github.com/ClickHouse/ClickHouse/pull/3796) ([Amos Bird](https://github.com/amosbird)) [#6316](https://github.com/ClickHouse/ClickHouse/pull/6316) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -639,7 +639,7 @@ toc_title: '2019'
 -   Allow to `ATTACH` live views (for example, at the server startup) regardless to `allow_experimental_live_view` setting. [#6754](https://github.com/ClickHouse/ClickHouse/pull/6754) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   For stack traces gathered by query profiler, do not include stack frames generated by the query profiler itself. [#6250](https://github.com/ClickHouse/ClickHouse/pull/6250) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Now table functions `values`, `file`, `url`, `hdfs` have support for ALIAS columns. [#6255](https://github.com/ClickHouse/ClickHouse/pull/6255) ([alexey-milovidov](https://github.com/alexey-milovidov))
--   Throw an exception if `config.d` file doesn’t have the corresponding root element as the config file. [#6123](https://github.com/ClickHouse/ClickHouse/pull/6123) ([dimarub2000](https://github.com/dimarub2000))
+-   Throw an exception if `config.d` file does not have the corresponding root element as the config file. [#6123](https://github.com/ClickHouse/ClickHouse/pull/6123) ([dimarub2000](https://github.com/dimarub2000))
 -   Print extra info in exception message for `no space left on device`. [#6182](https://github.com/ClickHouse/ClickHouse/issues/6182), [#6252](https://github.com/ClickHouse/ClickHouse/issues/6252) [#6352](https://github.com/ClickHouse/ClickHouse/pull/6352) ([tavplubix](https://github.com/tavplubix))
 -   When determining shards of a `Distributed` table to be covered by a read query (for `optimize_skip_unused_shards` = 1) ClickHouse now checks conditions from both `prewhere` and `where` clauses of select statement. [#6521](https://github.com/ClickHouse/ClickHouse/pull/6521) ([Alexander Kazakov](https://github.com/Akazz))
 -   Enabled `SIMDJSON` for machines without AVX2 but with SSE 4.2 and PCLMUL instruction set. [#6285](https://github.com/ClickHouse/ClickHouse/issues/6285) [#6320](https://github.com/ClickHouse/ClickHouse/pull/6320) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -657,7 +657,7 @@ toc_title: '2019'
 -   Fixed possible deadlock of distributed queries when one of shards is localhost but the query is sent via network connection. [#6759](https://github.com/ClickHouse/ClickHouse/pull/6759) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Changed semantic of multiple tables `RENAME` to avoid possible deadlocks. [#6757](https://github.com/ClickHouse/ClickHouse/issues/6757). [#6756](https://github.com/ClickHouse/ClickHouse/pull/6756) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Rewritten MySQL compatibility server to prevent loading full packet payload in memory. Decreased memory consumption for each connection to approximately `2 * DBMS_DEFAULT_BUFFER_SIZE` (read/write buffers). [#5811](https://github.com/ClickHouse/ClickHouse/pull/5811) ([Yuriy Baranov](https://github.com/yurriy))
--   Move AST alias interpreting logic out of parser that doesn’t have to know anything about query semantics. [#6108](https://github.com/ClickHouse/ClickHouse/pull/6108) ([Artem Zuikov](https://github.com/4ertus2))
+-   Move AST alias interpreting logic out of parser that does not have to know anything about query semantics. [#6108](https://github.com/ClickHouse/ClickHouse/pull/6108) ([Artem Zuikov](https://github.com/4ertus2))
 -   Slightly more safe parsing of `NamesAndTypesList`. [#6408](https://github.com/ClickHouse/ClickHouse/issues/6408). [#6410](https://github.com/ClickHouse/ClickHouse/pull/6410) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   `clickhouse-copier`: Allow use `where_condition` from config with `partition_key` alias in query for checking partition existence (Earlier it was used only in reading data queries). [#6577](https://github.com/ClickHouse/ClickHouse/pull/6577) ([proller](https://github.com/proller))
 -   Added optional message argument in `throwIf`. ([#5772](https://github.com/ClickHouse/ClickHouse/issues/5772)) [#6329](https://github.com/ClickHouse/ClickHouse/pull/6329) ([Vdimir](https://github.com/Vdimir))
@@ -869,7 +869,7 @@ toc_title: '2019'
 
 #### Improvement {#improvement-4}
 
--   Throws an exception if `config.d` file doesn’t have the corresponding root element as the config file [#6123](https://github.com/ClickHouse/ClickHouse/pull/6123) ([dimarub2000](https://github.com/dimarub2000))
+-   Throws an exception if `config.d` file does not have the corresponding root element as the config file [#6123](https://github.com/ClickHouse/ClickHouse/pull/6123) ([dimarub2000](https://github.com/dimarub2000))
 
 #### Performance Improvement {#performance-improvement-3}
 
@@ -986,7 +986,7 @@ toc_title: '2019'
 -   Fix segfault in ExternalLoader::reloadOutdated(). [#6082](https://github.com/ClickHouse/ClickHouse/pull/6082) ([Vitaly Baranov](https://github.com/vitlibar))
 -   Fixed the case when server may close listening sockets but not shutdown and continue serving remaining queries. You may end up with two running clickhouse-server processes. Sometimes, the server may return an error `bad_function_call` for remaining queries. [#6231](https://github.com/ClickHouse/ClickHouse/pull/6231) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed useless and incorrect condition on update field for initial loading of external dictionaries via ODBC, MySQL, ClickHouse and HTTP. This fixes [#6069](https://github.com/ClickHouse/ClickHouse/issues/6069) [#6083](https://github.com/ClickHouse/ClickHouse/pull/6083) ([alexey-milovidov](https://github.com/alexey-milovidov))
--   Fixed irrelevant exception in cast of `LowCardinality(Nullable)` to not-Nullable column in case if it doesn’t contain Nulls (e.g. in query like `SELECT CAST(CAST('Hello' AS LowCardinality(Nullable(String))) AS String)`. [#6094](https://github.com/ClickHouse/ClickHouse/issues/6094) [#6119](https://github.com/ClickHouse/ClickHouse/pull/6119) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
+-   Fixed irrelevant exception in cast of `LowCardinality(Nullable)` to not-Nullable column in case if it does not contain Nulls (e.g. in query like `SELECT CAST(CAST('Hello' AS LowCardinality(Nullable(String))) AS String)`. [#6094](https://github.com/ClickHouse/ClickHouse/issues/6094) [#6119](https://github.com/ClickHouse/ClickHouse/pull/6119) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 -   Fix non-deterministic result of “uniq” aggregate function in extreme rare cases. The bug was present in all ClickHouse versions. [#6058](https://github.com/ClickHouse/ClickHouse/pull/6058) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Segfault when we set a little bit too high CIDR on the function `IPv6CIDRToRange`. [#6068](https://github.com/ClickHouse/ClickHouse/pull/6068) ([Guillaume Tassery](https://github.com/YiuRULE))
 -   Fixed small memory leak when server throw many exceptions from many different contexts. [#6144](https://github.com/ClickHouse/ClickHouse/pull/6144) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -1159,7 +1159,7 @@ toc_title: '2019'
 #### Build/Testing/Packaging Improvement {#buildtestingpackaging-improvement-8}
 
 -   Implemented `TestKeeper` as an implementation of ZooKeeper interface used for testing [#5643](https://github.com/ClickHouse/ClickHouse/pull/5643) ([alexey-milovidov](https://github.com/alexey-milovidov)) ([levushkin aleksej](https://github.com/alexey-milovidov))
--   From now on `.sql` tests can be run isolated by server, in parallel, with random database. It allows to run them faster, add new tests with custom server configurations, and be sure that different tests doesn’t affect each other. [#5554](https://github.com/ClickHouse/ClickHouse/pull/5554) ([Ivan](https://github.com/abyss7))
+-   From now on `.sql` tests can be run isolated by server, in parallel, with random database. It allows to run them faster, add new tests with custom server configurations, and be sure that different tests does not affect each other. [#5554](https://github.com/ClickHouse/ClickHouse/pull/5554) ([Ivan](https://github.com/abyss7))
 -   Remove `<name>` and `<metrics>` from performance tests [#5672](https://github.com/ClickHouse/ClickHouse/pull/5672) ([Olga Khvostikova](https://github.com/stavrolia))
 -   Fixed “select_format” performance test for `Pretty` formats [#5642](https://github.com/ClickHouse/ClickHouse/pull/5642) ([alexey-milovidov](https://github.com/alexey-milovidov))
 
@@ -1201,7 +1201,7 @@ toc_title: '2019'
 -   Fixed UInt32 overflow bug in linear models. Allow eval ML model for non-const model argument. [#5516](https://github.com/ClickHouse/ClickHouse/pull/5516) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 -   `ALTER TABLE ... DROP INDEX IF EXISTS ...` should not raise an exception if provided index does not exist [#5524](https://github.com/ClickHouse/ClickHouse/pull/5524) ([Gleb Novikov](https://github.com/NanoBjorn))
 -   Fix segfault with `bitmapHasAny` in scalar subquery [#5528](https://github.com/ClickHouse/ClickHouse/pull/5528) ([Zhichang Yu](https://github.com/yuzhichang))
--   Fixed error when replication connection pool doesn’t retry to resolve host, even when DNS cache was dropped. [#5534](https://github.com/ClickHouse/ClickHouse/pull/5534) ([alesapin](https://github.com/alesapin))
+-   Fixed error when replication connection pool does not retry to resolve host, even when DNS cache was dropped. [#5534](https://github.com/ClickHouse/ClickHouse/pull/5534) ([alesapin](https://github.com/alesapin))
 -   Fixed `ALTER ... MODIFY TTL` on ReplicatedMergeTree. [#5539](https://github.com/ClickHouse/ClickHouse/pull/5539) ([Anton Popov](https://github.com/CurtizJ))
 -   Fix INSERT into Distributed table with MATERIALIZED column [#5429](https://github.com/ClickHouse/ClickHouse/pull/5429) ([Azat Khuzhin](https://github.com/azat))
 -   Fix bad alloc when truncate Join storage [#5437](https://github.com/ClickHouse/ClickHouse/pull/5437) ([TCeason](https://github.com/TCeason))
@@ -1261,8 +1261,8 @@ toc_title: '2019'
 
 -   Added `max_parts_in_total` setting for MergeTree family of tables (default: 100 000) that prevents unsafe specification of partition key #5166. [#5171](https://github.com/ClickHouse/ClickHouse/pull/5171) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   `clickhouse-obfuscator`: derive seed for individual columns by combining initial seed with column name, not column position. This is intended to transform datasets with multiple related tables, so that tables will remain JOINable after transformation. [#5178](https://github.com/ClickHouse/ClickHouse/pull/5178) ([alexey-milovidov](https://github.com/alexey-milovidov))
--   Added functions `JSONExtractRaw`, `JSONExtractKeyAndValues`. Renamed functions `jsonExtract<type>` to `JSONExtract<type>`. When something goes wrong these functions return the correspondent values, not `NULL`. Modified function `JSONExtract`, now it gets the return type from its last parameter and doesn’t inject nullables. Implemented fallback to RapidJSON in case AVX2 instructions are not available. Simdjson library updated to a new version. [#5235](https://github.com/ClickHouse/ClickHouse/pull/5235) ([Vitaly Baranov](https://github.com/vitlibar))
--   Now `if` and `multiIf` functions don’t rely on the condition’s `Nullable`, but rely on the branches for sql compatibility. [#5238](https://github.com/ClickHouse/ClickHouse/pull/5238) ([Jian Wu](https://github.com/janplus))
+-   Added functions `JSONExtractRaw`, `JSONExtractKeyAndValues`. Renamed functions `jsonExtract<type>` to `JSONExtract<type>`. When something goes wrong these functions return the correspondent values, not `NULL`. Modified function `JSONExtract`, now it gets the return type from its last parameter and does not inject nullables. Implemented fallback to RapidJSON in case AVX2 instructions are not available. Simdjson library updated to a new version. [#5235](https://github.com/ClickHouse/ClickHouse/pull/5235) ([Vitaly Baranov](https://github.com/vitlibar))
+-   Now `if` and `multiIf` functions do not rely on the condition’s `Nullable`, but rely on the branches for sql compatibility. [#5238](https://github.com/ClickHouse/ClickHouse/pull/5238) ([Jian Wu](https://github.com/janplus))
 -   `In` predicate now generates `Null` result from `Null` input like the `Equal` function. [#5152](https://github.com/ClickHouse/ClickHouse/pull/5152) ([Jian Wu](https://github.com/janplus))
 -   Check the time limit every (flush_interval / poll_timeout) number of rows from Kafka. This allows to break the reading from Kafka consumer more frequently and to check the time limits for the top-level streams [#5249](https://github.com/ClickHouse/ClickHouse/pull/5249) ([Ivan](https://github.com/abyss7))
 -   Link rdkafka with bundled SASL. It should allow to use SASL SCRAM authentication [#5253](https://github.com/ClickHouse/ClickHouse/pull/5253) ([Ivan](https://github.com/abyss7))
@@ -1347,13 +1347,13 @@ toc_title: '2019'
 -   Fixed bitmap functions produce wrong result. [#5359](https://github.com/ClickHouse/ClickHouse/pull/5359) ([Andy Yang](https://github.com/andyyzh))
 -   Fix element_count for hashed dictionary (do not include duplicates) [#5440](https://github.com/ClickHouse/ClickHouse/pull/5440) ([Azat Khuzhin](https://github.com/azat))
 -   Use contents of environment variable TZ as the name for timezone. It helps to correctly detect default timezone in some cases.[#5443](https://github.com/ClickHouse/ClickHouse/pull/5443) ([Ivan](https://github.com/abyss7))
--   Do not try to convert integers in `dictGetT` functions, because it doesn’t work correctly. Throw an exception instead. [#5446](https://github.com/ClickHouse/ClickHouse/pull/5446) ([Artem Zuikov](https://github.com/4ertus2))
+-   Do not try to convert integers in `dictGetT` functions, because it does not work correctly. Throw an exception instead. [#5446](https://github.com/ClickHouse/ClickHouse/pull/5446) ([Artem Zuikov](https://github.com/4ertus2))
 -   Fix settings in ExternalData HTTP request. [#5455](https://github.com/ClickHouse/ClickHouse/pull/5455) ([Danila
     Kutenin](https://github.com/danlark1))
 -   Fix bug when parts were removed only from FS without dropping them from Zookeeper. [#5520](https://github.com/ClickHouse/ClickHouse/pull/5520) ([alesapin](https://github.com/alesapin))
 -   Fix segmentation fault in `bitmapHasAny` function. [#5528](https://github.com/ClickHouse/ClickHouse/pull/5528) ([Zhichang Yu](https://github.com/yuzhichang))
--   Fixed error when replication connection pool doesn’t retry to resolve host, even when DNS cache was dropped. [#5534](https://github.com/ClickHouse/ClickHouse/pull/5534) ([alesapin](https://github.com/alesapin))
--   Fixed `DROP INDEX IF EXISTS` query. Now `ALTER TABLE ... DROP INDEX IF EXISTS ...` query doesn’t raise an exception if provided index does not exist. [#5524](https://github.com/ClickHouse/ClickHouse/pull/5524) ([Gleb Novikov](https://github.com/NanoBjorn))
+-   Fixed error when replication connection pool does not retry to resolve host, even when DNS cache was dropped. [#5534](https://github.com/ClickHouse/ClickHouse/pull/5534) ([alesapin](https://github.com/alesapin))
+-   Fixed `DROP INDEX IF EXISTS` query. Now `ALTER TABLE ... DROP INDEX IF EXISTS ...` query does not raise an exception if provided index does not exist. [#5524](https://github.com/ClickHouse/ClickHouse/pull/5524) ([Gleb Novikov](https://github.com/NanoBjorn))
 -   Fix union all supertype column. There were cases with inconsistent data and column types of resulting columns. [#5503](https://github.com/ClickHouse/ClickHouse/pull/5503) ([Artem Zuikov](https://github.com/4ertus2))
 -   Skip ZNONODE during DDL query processing. Before if another node removes the znode in task queue, the one that
     did not process it, but already get list of children, will terminate the DDLWorker thread. [#5489](https://github.com/ClickHouse/ClickHouse/pull/5489) ([Azat Khuzhin](https://github.com/azat))
@@ -1712,7 +1712,7 @@ toc_title: '2019'
 -   Improved heuristics of “move to PREWHERE” optimization. [#4405](https://github.com/ClickHouse/ClickHouse/pull/4405) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Use proper lookup tables that uses HashTable’s API for 8-bit and 16-bit keys. [#4536](https://github.com/ClickHouse/ClickHouse/pull/4536) ([Amos Bird](https://github.com/amosbird))
 -   Improved performance of string comparison. [#4564](https://github.com/ClickHouse/ClickHouse/pull/4564) ([alexey-milovidov](https://github.com/alexey-milovidov))
--   Cleanup distributed DDL queue in a separate thread so that it doesn’t slow down the main loop that processes distributed DDL tasks. [#4502](https://github.com/ClickHouse/ClickHouse/pull/4502) ([Alex Zatelepin](https://github.com/ztlpn))
+-   Cleanup distributed DDL queue in a separate thread so that it does not slow down the main loop that processes distributed DDL tasks. [#4502](https://github.com/ClickHouse/ClickHouse/pull/4502) ([Alex Zatelepin](https://github.com/ztlpn))
 -   When `min_bytes_to_use_direct_io` is set to 1, not every file was opened with O_DIRECT mode because the data size to read was sometimes underestimated by the size of one compressed block. [#4526](https://github.com/ClickHouse/ClickHouse/pull/4526) ([alexey-milovidov](https://github.com/alexey-milovidov))
 
 #### Build/Testing/Packaging Improvement {#buildtestingpackaging-improvement-12}
@@ -1839,7 +1839,7 @@ toc_title: '2019'
 -   Fixed incorrect result when `Date` and `DateTime` arguments are used in branches of conditional operator (function `if`). Added generic case for function `if`. [#4243](https://github.com/ClickHouse/ClickHouse/pull/4243) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   ClickHouse dictionaries now load within `clickhouse` process. [#4166](https://github.com/ClickHouse/ClickHouse/pull/4166) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed deadlock when `SELECT` from a table with `File` engine was retried after `No such file or directory` error. [#4161](https://github.com/ClickHouse/ClickHouse/pull/4161) ([alexey-milovidov](https://github.com/alexey-milovidov))
--   Fixed race condition when selecting from `system.tables` may give `table doesn't exist` error. [#4313](https://github.com/ClickHouse/ClickHouse/pull/4313) ([alexey-milovidov](https://github.com/alexey-milovidov))
+-   Fixed race condition when selecting from `system.tables` may give `table does not exist` error. [#4313](https://github.com/ClickHouse/ClickHouse/pull/4313) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   `clickhouse-client` can segfault on exit while loading data for command line suggestions if it was run in interactive mode. [#4317](https://github.com/ClickHouse/ClickHouse/pull/4317) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed a bug when the execution of mutations containing `IN` operators was producing incorrect results. [#4099](https://github.com/ClickHouse/ClickHouse/pull/4099) ([Alex Zatelepin](https://github.com/ztlpn))
 -   Fixed error: if there is a database with `Dictionary` engine, all dictionaries forced to load at server startup, and if there is a dictionary with ClickHouse source from localhost, the dictionary cannot load. [#4255](https://github.com/ClickHouse/ClickHouse/pull/4255) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -1941,7 +1941,7 @@ This release contains exactly the same set of patches as 19.3.6.
 -   Fixed error: if there is a database with `Dictionary` engine, all dictionaries forced to load at server startup, and if there is a dictionary with ClickHouse source from localhost, the dictionary cannot load. [#4255](https://github.com/ClickHouse/ClickHouse/pull/4255) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed a bug when the execution of mutations containing `IN` operators was producing incorrect results. [#4099](https://github.com/ClickHouse/ClickHouse/pull/4099) ([Alex Zatelepin](https://github.com/ztlpn))
 -   `clickhouse-client` can segfault on exit while loading data for command line suggestions if it was run in interactive mode. [#4317](https://github.com/ClickHouse/ClickHouse/pull/4317) ([alexey-milovidov](https://github.com/alexey-milovidov))
--   Fixed race condition when selecting from `system.tables` may give `table doesn't exist` error. [#4313](https://github.com/ClickHouse/ClickHouse/pull/4313) ([alexey-milovidov](https://github.com/alexey-milovidov))
+-   Fixed race condition when selecting from `system.tables` may give `table does not exist` error. [#4313](https://github.com/ClickHouse/ClickHouse/pull/4313) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed deadlock when `SELECT` from a table with `File` engine was retried after `No such file or directory` error. [#4161](https://github.com/ClickHouse/ClickHouse/pull/4161) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed an issue: local ClickHouse dictionaries are loaded via TCP, but should load within process. [#4166](https://github.com/ClickHouse/ClickHouse/pull/4166) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed `No message received` error when interacting with PostgreSQL ODBC Driver through TLS connection. Also fixes segfault when using MySQL ODBC Driver. [#4170](https://github.com/ClickHouse/ClickHouse/pull/4170) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -2030,8 +2030,8 @@ This release contains exactly the same set of patches as 19.3.6.
 
 #### Performance Improvements {#performance-improvements-5}
 
--   Add a MergeTree setting `use_minimalistic_part_header_in_zookeeper`. If enabled, Replicated tables will store compact part metadata in a single part znode. This can dramatically reduce ZooKeeper snapshot size (especially if the tables have a lot of columns). Note that after enabling this setting you will not be able to downgrade to a version that doesn’t support it. [#3960](https://github.com/ClickHouse/ClickHouse/pull/3960) ([Alex Zatelepin](https://github.com/ztlpn))
--   Add an DFA-based implementation for functions `sequenceMatch` and `sequenceCount` in case pattern doesn’t contain time. [#4004](https://github.com/ClickHouse/ClickHouse/pull/4004) ([Léo Ercolanelli](https://github.com/ercolanelli-leo))
+-   Add a MergeTree setting `use_minimalistic_part_header_in_zookeeper`. If enabled, Replicated tables will store compact part metadata in a single part znode. This can dramatically reduce ZooKeeper snapshot size (especially if the tables have a lot of columns). Note that after enabling this setting you will not be able to downgrade to a version that does not support it. [#3960](https://github.com/ClickHouse/ClickHouse/pull/3960) ([Alex Zatelepin](https://github.com/ztlpn))
+-   Add an DFA-based implementation for functions `sequenceMatch` and `sequenceCount` in case pattern does not contain time. [#4004](https://github.com/ClickHouse/ClickHouse/pull/4004) ([Léo Ercolanelli](https://github.com/ercolanelli-leo))
 -   Performance improvement for integer numbers serialization. [#3968](https://github.com/ClickHouse/ClickHouse/pull/3968) ([Amos Bird](https://github.com/amosbird))
 -   Zero left padding PODArray so that -1 element is always valid and zeroed. It’s used for branchless calculation of offsets. [#3920](https://github.com/ClickHouse/ClickHouse/pull/3920) ([Amos Bird](https://github.com/amosbird))
 -   Reverted `jemalloc` version which lead to performance degradation. [#4018](https://github.com/ClickHouse/ClickHouse/pull/4018) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -2055,7 +2055,7 @@ This release contains exactly the same set of patches as 19.3.6.
 -   Fixed bugs found by PVS-Studio. [#4013](https://github.com/ClickHouse/ClickHouse/pull/4013) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Fixed glibc compatibility issues. [#4100](https://github.com/ClickHouse/ClickHouse/pull/4100) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Move Docker images to 18.10 and add compatibility file for glibc \>= 2.28 [#3965](https://github.com/ClickHouse/ClickHouse/pull/3965) ([alesapin](https://github.com/alesapin))
--   Add env variable if user don’t want to chown directories in server Docker image. [#3967](https://github.com/ClickHouse/ClickHouse/pull/3967) ([alesapin](https://github.com/alesapin))
+-   Add env variable if user do not want to chown directories in server Docker image. [#3967](https://github.com/ClickHouse/ClickHouse/pull/3967) ([alesapin](https://github.com/alesapin))
 -   Enabled most of the warnings from `-Weverything` in clang. Enabled `-Wpedantic`. [#3986](https://github.com/ClickHouse/ClickHouse/pull/3986) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Added a few more warnings that are available only in clang 8. [#3993](https://github.com/ClickHouse/ClickHouse/pull/3993) ([alexey-milovidov](https://github.com/alexey-milovidov))
 -   Link to `libLLVM` rather than to individual LLVM libs when using shared linking. [#3989](https://github.com/ClickHouse/ClickHouse/pull/3989) ([Orivej Desh](https://github.com/orivej))
diff --git a/docs/en/whats-new/changelog/2020.md b/docs/en/whats-new/changelog/2020.md
index bf4e4fb0fcc..7fb1f5d9377 100644
--- a/docs/en/whats-new/changelog/2020.md
+++ b/docs/en/whats-new/changelog/2020.md
@@ -14,7 +14,7 @@ toc_title: '2020'
 * Restrict merges from wide to compact parts. In case of vertical merge it led to broken result part. [#18381](https://github.com/ClickHouse/ClickHouse/pull/18381) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix filling table `system.settings_profile_elements`. This PR fixes [#18231](https://github.com/ClickHouse/ClickHouse/issues/18231). [#18379](https://github.com/ClickHouse/ClickHouse/pull/18379) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix possible crashes in aggregate functions with combinator `Distinct`, while using two-level aggregation. Fixes [#17682](https://github.com/ClickHouse/ClickHouse/issues/17682). [#18365](https://github.com/ClickHouse/ClickHouse/pull/18365) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix error when query `MODIFY COLUMN ... REMOVE TTL` doesn't actually remove column TTL. [#18130](https://github.com/ClickHouse/ClickHouse/pull/18130) ([alesapin](https://github.com/alesapin)).
+* Fix error when query `MODIFY COLUMN ... REMOVE TTL` does not actually remove column TTL. [#18130](https://github.com/ClickHouse/ClickHouse/pull/18130) ([alesapin](https://github.com/alesapin)).
 
 #### Build/Testing/Packaging Improvement
 
@@ -88,7 +88,7 @@ toc_title: '2020'
 * Fix `optimize_distributed_group_by_sharding_key` setting (that is disabled by default) for query with OFFSET only. [#16996](https://github.com/ClickHouse/ClickHouse/pull/16996) ([Azat Khuzhin](https://github.com/azat)).
 * Fix for Merge tables over Distributed tables with JOIN. [#16993](https://github.com/ClickHouse/ClickHouse/pull/16993) ([Azat Khuzhin](https://github.com/azat)).
 * Fixed wrong result in big integers (128, 256 bit) when casting from double. Big integers support is experimental. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
-* Fix possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Fix possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter does not finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
 * Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix order by optimization with monotonous functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
 * Fix optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. Fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
@@ -212,7 +212,7 @@ toc_title: '2020'
 * `SELECT count() FROM table` now can be executed if only one any column can be selected from the `table`. This PR fixes [#10639](https://github.com/ClickHouse/ClickHouse/issues/10639). [#18233](https://github.com/ClickHouse/ClickHouse/pull/18233) ([Vitaly Baranov](https://github.com/vitlibar)).
 * `SELECT JOIN` now requires the `SELECT` privilege on each of the joined tables. This PR fixes [#17654](https://github.com/ClickHouse/ClickHouse/issues/17654). [#18232](https://github.com/ClickHouse/ClickHouse/pull/18232) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix possible incomplete query result while reading from `MergeTree*` in case of read backoff (message `<Debug> MergeTreeReadPool: Will lower number of threads` in logs). Was introduced in [#16423](https://github.com/ClickHouse/ClickHouse/issues/16423). Fixes [#18137](https://github.com/ClickHouse/ClickHouse/issues/18137). [#18216](https://github.com/ClickHouse/ClickHouse/pull/18216) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix error when query `MODIFY COLUMN ... REMOVE TTL` doesn't actually remove column TTL. [#18130](https://github.com/ClickHouse/ClickHouse/pull/18130) ([alesapin](https://github.com/alesapin)).
+* Fix error when query `MODIFY COLUMN ... REMOVE TTL` does not actually remove column TTL. [#18130](https://github.com/ClickHouse/ClickHouse/pull/18130) ([alesapin](https://github.com/alesapin)).
 * Fix indeterministic functions with predicate optimizer. This fixes [#17244](https://github.com/ClickHouse/ClickHouse/issues/17244). [#17273](https://github.com/ClickHouse/ClickHouse/pull/17273) ([Winter Zhang](https://github.com/zhang2014)).
 * Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
 
@@ -253,7 +253,7 @@ toc_title: '2020'
 * Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
 * Fixed wrong result in big integers (128, 256 bit) when casting from double. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
 * Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter does not finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
 * Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed order by optimization with monotonous functions. Fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
 * Fixed optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. This fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
@@ -424,7 +424,7 @@ toc_title: '2020'
 * Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
 * Fixed wrong result in big integers (128, 256 bit) when casting from double. [#16986](https://github.com/ClickHouse/ClickHouse/pull/16986) ([Mike](https://github.com/myrrc)).
 * Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter does not finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
 * Blame info was not calculated correctly in `clickhouse-git-import`. [#16959](https://github.com/ClickHouse/ClickHouse/pull/16959) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed order by optimization with monotonous functions. This fixes [#16107](https://github.com/ClickHouse/ClickHouse/issues/16107). [#16956](https://github.com/ClickHouse/ClickHouse/pull/16956) ([Anton Popov](https://github.com/CurtizJ)).
 * Fixrf optimization of group by with enabled setting `optimize_aggregators_of_group_by_keys` and joins. This fixes [#12604](https://github.com/ClickHouse/ClickHouse/issues/12604). [#16951](https://github.com/ClickHouse/ClickHouse/pull/16951) ([Anton Popov](https://github.com/CurtizJ)).
@@ -514,7 +514,7 @@ toc_title: '2020'
 * Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
 * Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
 * `MaterializeMySQL` (experimental feature): Fix crash on create database failure. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) - Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
+* Fixed `DROP TABLE IF EXISTS` failure with `Table ... does not exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) - Fixed `DROP/DETACH DATABASE` failure with `Table ... does not exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
 * Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fixes [#12513](https://github.com/ClickHouse/ClickHouse/issues/12513): difference expressions with same alias when query is reanalyzed. [#15886](https://github.com/ClickHouse/ClickHouse/pull/15886) ([Winter Zhang](https://github.com/zhang2014)).
 * Fix possible very rare deadlocks in RBAC implementation. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
@@ -535,7 +535,7 @@ toc_title: '2020'
 * Fixed `Element ... is not a constant expression` error when using `JSON*` function result in `VALUES`, `LIMIT` or right side of `IN` operator. [#15589](https://github.com/ClickHouse/ClickHouse/pull/15589) ([tavplubix](https://github.com/tavplubix)).
 * Query will finish faster in case of exception. Cancel execution on remote replicas if exception happens. [#15578](https://github.com/ClickHouse/ClickHouse/pull/15578) ([Azat Khuzhin](https://github.com/azat)).
 * Prevent the possibility of error message `Could not calculate available disk space (statvfs), errno: 4, strerror: Interrupted system call`. This fixes [#15541](https://github.com/ClickHouse/ClickHouse/issues/15541). [#15557](https://github.com/ClickHouse/ClickHouse/pull/15557) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix `Database <db> doesn't exist.` in queries with IN and Distributed table when there's no database on initiator. [#15538](https://github.com/ClickHouse/ClickHouse/pull/15538) ([Artem Zuikov](https://github.com/4ertus2)).
+* Fix `Database <db> does not exist.` in queries with IN and Distributed table when there's no database on initiator. [#15538](https://github.com/ClickHouse/ClickHouse/pull/15538) ([Artem Zuikov](https://github.com/4ertus2)).
 * Mutation might hang waiting for some non-existent part after `MOVE` or `REPLACE PARTITION` or, in rare cases, after `DETACH` or `DROP PARTITION`. It's fixed. [#15537](https://github.com/ClickHouse/ClickHouse/pull/15537) ([tavplubix](https://github.com/tavplubix)).
 * Fix bug when `ILIKE` operator stops being case insensitive if `LIKE` with the same pattern was executed. [#15536](https://github.com/ClickHouse/ClickHouse/pull/15536) ([alesapin](https://github.com/alesapin)).
 * Fix `Missing columns` errors when selecting columns which absent in data, but depend on other columns which also absent in data. Fixes [#15530](https://github.com/ClickHouse/ClickHouse/issues/15530). [#15532](https://github.com/ClickHouse/ClickHouse/pull/15532) ([alesapin](https://github.com/alesapin)).
@@ -552,7 +552,7 @@ toc_title: '2020'
 * Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix 'Unknown identifier' in GROUP BY when query has JOIN over Merge table. [#15242](https://github.com/ClickHouse/ClickHouse/pull/15242) ([Artem Zuikov](https://github.com/4ertus2)).
 * Fix instance crash when using `joinGet` with `LowCardinality` types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
-* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
+* Fix bug in table engine `Buffer` which does not allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
 * Adjust Decimal field size in MySQL column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
 * Fixes `Data compressed with different methods` in `join_algorithm='auto'`. Keep LowCardinality as type for left table join key in `join_algorithm='partial_merge'`. [#15088](https://github.com/ClickHouse/ClickHouse/pull/15088) ([Artem Zuikov](https://github.com/4ertus2)).
 * Update `jemalloc` to fix `percpu_arena` with affinity mask. [#15035](https://github.com/ClickHouse/ClickHouse/pull/15035) ([Azat Khuzhin](https://github.com/azat)). [#14957](https://github.com/ClickHouse/ClickHouse/pull/14957) ([Azat Khuzhin](https://github.com/azat)).
@@ -711,7 +711,7 @@ toc_title: '2020'
 
 * Fix bug when `ON CLUSTER` queries may hang forever for non-leader ReplicatedMergeTreeTables. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
 * Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Fix possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Fix possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter does not finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
 * Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
 * Fix possible error `Illegal type of argument` for queries with `ORDER BY`. Fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Abort multipart upload if no data was written to WriteBufferFromS3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
@@ -751,7 +751,7 @@ toc_title: '2020'
 * Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
 * Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix a crash when database creation fails. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
+* Fixed `DROP TABLE IF EXISTS` failure with `Table ... does not exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... does not exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
 * Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix possible deadlocks in RBAC. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
@@ -789,7 +789,7 @@ toc_title: '2020'
 * Fix rare race condition on server startup when system.logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
 * Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix instance crash when using joinGet with LowCardinality types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
-* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
+* Fix bug in table engine `Buffer` which does not allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
 * Adjust decimals field size in mysql column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
 * Fixed `Cannot rename ... errno: 22, strerror: Invalid argument` error on DDL query execution in Atomic database when running clickhouse-server in docker on Mac OS. [#15024](https://github.com/ClickHouse/ClickHouse/pull/15024) ([tavplubix](https://github.com/tavplubix)).
 * Fix to make predicate push down work when subquery contains finalizeAggregation function. Fixes [#14847](https://github.com/ClickHouse/ClickHouse/issues/14847). [#14937](https://github.com/ClickHouse/ClickHouse/pull/14937) ([filimonov](https://github.com/filimonov)).
@@ -909,7 +909,7 @@ toc_title: '2020'
 * Fixed bug when `ON CLUSTER` queries may hang forever for non-leader ReplicatedMergeTreeTables. [#17089](https://github.com/ClickHouse/ClickHouse/pull/17089) ([alesapin](https://github.com/alesapin)).
 * Avoid unnecessary network errors for remote queries which may be cancelled while execution, like queries with `LIMIT`. [#17006](https://github.com/ClickHouse/ClickHouse/pull/17006) ([Azat Khuzhin](https://github.com/azat)).
 * Reresolve the IP of the `format_avro_schema_registry_url` in case of errors. [#16985](https://github.com/ClickHouse/ClickHouse/pull/16985) ([filimonov](https://github.com/filimonov)).
-* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter doesn't finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
+* Fixed possible server crash after `ALTER TABLE ... MODIFY COLUMN ... NewType` when `SELECT` have `WHERE` expression on altering column and alter does not finished yet. [#16968](https://github.com/ClickHouse/ClickHouse/pull/16968) ([Amos Bird](https://github.com/amosbird)).
 * Install script should always create subdirs in config folders. This is only relevant for Docker build with custom config. [#16936](https://github.com/ClickHouse/ClickHouse/pull/16936) ([filimonov](https://github.com/filimonov)).
 * Fixed possible error `Illegal type of argument` for queries with `ORDER BY`. Fixes [#16580](https://github.com/ClickHouse/ClickHouse/issues/16580). [#16928](https://github.com/ClickHouse/ClickHouse/pull/16928) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Abort multipart upload if no data was written to WriteBufferFromS3. [#16840](https://github.com/ClickHouse/ClickHouse/pull/16840) ([Pavel Kovalenko](https://github.com/Jokser)).
@@ -949,7 +949,7 @@ toc_title: '2020'
 * Fix rare segfaults when inserting into or selecting from MaterializedView and concurrently dropping target table (for Atomic database engine). [#15984](https://github.com/ClickHouse/ClickHouse/pull/15984) ([tavplubix](https://github.com/tavplubix)).
 * Fix ambiguity in parsing of settings profiles: `CREATE USER ... SETTINGS profile readonly` is now considered as using a profile named `readonly`, not a setting named `profile` with the readonly constraint. This fixes [#15628](https://github.com/ClickHouse/ClickHouse/issues/15628). [#15982](https://github.com/ClickHouse/ClickHouse/pull/15982) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix a crash when database creation fails. [#15954](https://github.com/ClickHouse/ClickHouse/pull/15954) ([Winter Zhang](https://github.com/zhang2014)).
-* Fixed `DROP TABLE IF EXISTS` failure with `Table ... doesn't exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... doesn't exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
+* Fixed `DROP TABLE IF EXISTS` failure with `Table ... does not exist` error when table is concurrently renamed (for Atomic database engine). Fixed rare deadlock when concurrently executing some DDL queries with multiple tables (like `DROP DATABASE` and `RENAME TABLE`) Fixed `DROP/DETACH DATABASE` failure with `Table ... does not exist` when concurrently executing `DROP/DETACH TABLE`. [#15934](https://github.com/ClickHouse/ClickHouse/pull/15934) ([tavplubix](https://github.com/tavplubix)).
 * Fix incorrect empty result for query from `Distributed` table if query has `WHERE`, `PREWHERE` and `GLOBAL IN`. Fixes [#15792](https://github.com/ClickHouse/ClickHouse/issues/15792). [#15933](https://github.com/ClickHouse/ClickHouse/pull/15933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix possible deadlocks in RBAC. [#15875](https://github.com/ClickHouse/ClickHouse/pull/15875) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix exception `Block structure mismatch` in `SELECT ... ORDER BY DESC` queries which were executed after `ALTER MODIFY COLUMN` query. Fixes [#15800](https://github.com/ClickHouse/ClickHouse/issues/15800). [#15852](https://github.com/ClickHouse/ClickHouse/pull/15852) ([alesapin](https://github.com/alesapin)).
@@ -984,7 +984,7 @@ toc_title: '2020'
 * Fix rare race condition on server startup when system.logs are enabled. [#15300](https://github.com/ClickHouse/ClickHouse/pull/15300) ([alesapin](https://github.com/alesapin)).
 * Fix MSan report in QueryLog. Uninitialized memory can be used for the field `memory_usage`. [#15258](https://github.com/ClickHouse/ClickHouse/pull/15258) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix instance crash when using joinGet with LowCardinality types. This fixes [#15214](https://github.com/ClickHouse/ClickHouse/issues/15214). [#15220](https://github.com/ClickHouse/ClickHouse/pull/15220) ([Amos Bird](https://github.com/amosbird)).
-* Fix bug in table engine `Buffer` which doesn't allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
+* Fix bug in table engine `Buffer` which does not allow to insert data of new structure into `Buffer` after `ALTER` query. Fixes [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117). [#15192](https://github.com/ClickHouse/ClickHouse/pull/15192) ([alesapin](https://github.com/alesapin)).
 * Adjust decimals field size in mysql column definition packet. [#15152](https://github.com/ClickHouse/ClickHouse/pull/15152) ([maqroll](https://github.com/maqroll)).
 * We already use padded comparison between String and FixedString (https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/FunctionsComparison.h#L333). This PR applies the same logic to field comparison which corrects the usage of FixedString as primary keys. This fixes [#14908](https://github.com/ClickHouse/ClickHouse/issues/14908). [#15033](https://github.com/ClickHouse/ClickHouse/pull/15033) ([Amos Bird](https://github.com/amosbird)).
 * If function `bar` was called with specifically crafted arguments, buffer overflow was possible. This closes [#13926](https://github.com/ClickHouse/ClickHouse/issues/13926). [#15028](https://github.com/ClickHouse/ClickHouse/pull/15028) ([alexey-milovidov](https://github.com/alexey-milovidov)).
@@ -1028,7 +1028,7 @@ toc_title: '2020'
 
 #### Backward Incompatible Change
 
-* Now `OPTIMIZE FINAL` query doesn't recalculate TTL for parts that were added before TTL was created. Use `ALTER TABLE ... MATERIALIZE TTL` once to calculate them, after that `OPTIMIZE FINAL` will evaluate TTL's properly. This behavior never worked for replicated tables. [#14220](https://github.com/ClickHouse/ClickHouse/pull/14220) ([alesapin](https://github.com/alesapin)).
+* Now `OPTIMIZE FINAL` query does not recalculate TTL for parts that were added before TTL was created. Use `ALTER TABLE ... MATERIALIZE TTL` once to calculate them, after that `OPTIMIZE FINAL` will evaluate TTL's properly. This behavior never worked for replicated tables. [#14220](https://github.com/ClickHouse/ClickHouse/pull/14220) ([alesapin](https://github.com/alesapin)).
 * Extend `parallel_distributed_insert_select` setting, adding an option to run `INSERT` into local table. The setting changes type from `Bool` to `UInt64`, so the values `false` and `true` are no longer supported. If you have these values in server configuration, the server will not start. Please replace them with `0` and `1`, respectively. [#14060](https://github.com/ClickHouse/ClickHouse/pull/14060) ([Azat Khuzhin](https://github.com/azat)).
 * Remove support for the `ODBCDriver` input/output format. This was a deprecated format once used for communication with the ClickHouse ODBC driver, now long superseded by the `ODBCDriver2` format. Resolves [#13629](https://github.com/ClickHouse/ClickHouse/issues/13629). [#13847](https://github.com/ClickHouse/ClickHouse/pull/13847) ([hexiaoting](https://github.com/hexiaoting)).
 * When upgrading from versions older than 20.5, if rolling update is performed and cluster contains both versions 20.5 or greater and less than 20.5, if ClickHouse nodes with old versions are restarted and old version has been started up in presence of newer versions, it may lead to `Part ... intersects previous part` errors. To prevent this error, first install newer clickhouse-server packages on all cluster nodes and then do restarts (so, when clickhouse-server is restarted, it will start up with the new version).
@@ -1257,7 +1257,7 @@ toc_title: '2020'
 * Fixed [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572) fix bloom filter index with const expression. [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
 * Fix SIGSEGV in StorageKafka when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
 * Add support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* CREATE USER IF NOT EXISTS now doesn't throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
+* CREATE USER IF NOT EXISTS now does not throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Exception `There is no supertype...` can be thrown during `ALTER ... UPDATE` in unexpected cases (e.g. when subtracting from UInt64 column). This fixes [#7306](https://github.com/ClickHouse/ClickHouse/issues/7306). This fixes [#4165](https://github.com/ClickHouse/ClickHouse/issues/4165). [#12633](https://github.com/ClickHouse/ClickHouse/pull/12633) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix possible `Pipeline stuck` error for queries with external sorting. Fixes [#12617](https://github.com/ClickHouse/ClickHouse/issues/12617). [#12618](https://github.com/ClickHouse/ClickHouse/pull/12618) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix error `Output of TreeExecutor is not sorted` for `OPTIMIZE DEDUPLICATE`. Fixes [#11572](https://github.com/ClickHouse/ClickHouse/issues/11572). [#12613](https://github.com/ClickHouse/ClickHouse/pull/12613) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
@@ -1398,7 +1398,7 @@ toc_title: '2020'
 * Fixed bloom filter index with const expression. This fixes [#10572](https://github.com/ClickHouse/ClickHouse/issues/10572). [#12659](https://github.com/ClickHouse/ClickHouse/pull/12659) ([Winter Zhang](https://github.com/zhang2014)).
 * Fixed `SIGSEGV` in `StorageKafka` when broker is unavailable (and not only). [#12658](https://github.com/ClickHouse/ClickHouse/pull/12658) ([Azat Khuzhin](https://github.com/azat)).
 * Added support for function `if` with `Array(UUID)` arguments. This fixes [#11066](https://github.com/ClickHouse/ClickHouse/issues/11066). [#12648](https://github.com/ClickHouse/ClickHouse/pull/12648) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* `CREATE USER IF NOT EXISTS` now doesn't throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
+* `CREATE USER IF NOT EXISTS` now does not throw exception if the user exists. This fixes [#12507](https://github.com/ClickHouse/ClickHouse/issues/12507). [#12646](https://github.com/ClickHouse/ClickHouse/pull/12646) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Better exception message in disk access storage. [#12625](https://github.com/ClickHouse/ClickHouse/pull/12625) ([alesapin](https://github.com/alesapin)).
 * The function `groupArrayMoving*` was not working for distributed queries. It's result was calculated within incorrect data type (without promotion to the largest type). The function `groupArrayMovingAvg` was returning integer number that was inconsistent with the `avg` function. This fixes [#12568](https://github.com/ClickHouse/ClickHouse/issues/12568). [#12622](https://github.com/ClickHouse/ClickHouse/pull/12622) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed lack of aliases with function `any`. [#12593](https://github.com/ClickHouse/ClickHouse/pull/12593) ([Anton Popov](https://github.com/CurtizJ)).
@@ -1436,7 +1436,7 @@ toc_title: '2020'
 * Cap max_memory_usage* limits to the process resident memory. [#12182](https://github.com/ClickHouse/ClickHouse/pull/12182) ([Azat Khuzhin](https://github.com/azat)).
 * Fix dictGet arguments check during `GROUP BY` injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
 * Fixed the behaviour when `SummingMergeTree` engine sums up columns from partition key. Added an exception in case of explicit definition of columns to sum which intersects with partition key columns. This fixes [#7867](https://github.com/ClickHouse/ClickHouse/issues/7867). [#12173](https://github.com/ClickHouse/ClickHouse/pull/12173) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Don't split the dictionary source's table name into schema and table name itself if ODBC connection doesn't support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Don't split the dictionary source's table name into schema and table name itself if ODBC connection does not support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed bad code in redundant ORDER BY optimization. The bug was introduced in [#10067](https://github.com/ClickHouse/ClickHouse/issues/10067). [#12148](https://github.com/ClickHouse/ClickHouse/pull/12148) ([alexey-milovidov](https://github.com/alexey-milovidov)).
@@ -1467,7 +1467,7 @@ toc_title: '2020'
 * Added `KILL QUERY [connection_id]` for the MySQL client/driver to cancel the long query, issue [#12038](https://github.com/ClickHouse/ClickHouse/issues/12038). [#12152](https://github.com/ClickHouse/ClickHouse/pull/12152) ([BohuTANG](https://github.com/BohuTANG)).
 * Added support for `%g` (two digit ISO year) and `%G` (four digit ISO year) substitutions in `formatDateTime` function. [#12136](https://github.com/ClickHouse/ClickHouse/pull/12136) ([vivarum](https://github.com/vivarum)).
 * Added 'type' column in system.disks. [#12115](https://github.com/ClickHouse/ClickHouse/pull/12115) ([ianton-ru](https://github.com/ianton-ru)).
-* Improved `REVOKE` command: now it requires grant/admin option for only access which will be revoked. For example, to execute `REVOKE ALL ON *.* FROM user1` now it doesn't require to have full access rights granted with grant option. Added command `REVOKE ALL FROM user1` - it revokes all granted roles from `user1`. [#12083](https://github.com/ClickHouse/ClickHouse/pull/12083) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Improved `REVOKE` command: now it requires grant/admin option for only access which will be revoked. For example, to execute `REVOKE ALL ON *.* FROM user1` now it does not require to have full access rights granted with grant option. Added command `REVOKE ALL FROM user1` - it revokes all granted roles from `user1`. [#12083](https://github.com/ClickHouse/ClickHouse/pull/12083) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Added replica priority for load_balancing (for manual prioritization of the load balancing). [#11995](https://github.com/ClickHouse/ClickHouse/pull/11995) ([Azat Khuzhin](https://github.com/azat)).
 * Switched paths in S3 metadata to relative which allows to handle S3 blobs more easily. [#11892](https://github.com/ClickHouse/ClickHouse/pull/11892) ([Vladimir Chebotarev](https://github.com/excitoon)).
 
@@ -1617,7 +1617,7 @@ toc_title: '2020'
 * Fix wrong result of comparison of FixedString with constant String. This fixes [#11393](https://github.com/ClickHouse/ClickHouse/issues/11393). This bug appeared in version 20.4. [#11828](https://github.com/ClickHouse/ClickHouse/pull/11828) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix wrong result for `if` with NULLs in condition. [#11807](https://github.com/ClickHouse/ClickHouse/pull/11807) ([Artem Zuikov](https://github.com/4ertus2)).
 * Fix using too many threads for queries. [#11788](https://github.com/ClickHouse/ClickHouse/pull/11788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed `Scalar doesn't exist` exception when using `WITH <scalar subquery> ...` in `SELECT ... FROM merge_tree_table ...` [#11621](https://github.com/ClickHouse/ClickHouse/issues/11621). [#11767](https://github.com/ClickHouse/ClickHouse/pull/11767) ([Amos Bird](https://github.com/amosbird)).
+* Fixed `Scalar does not exist` exception when using `WITH <scalar subquery> ...` in `SELECT ... FROM merge_tree_table ...` [#11621](https://github.com/ClickHouse/ClickHouse/issues/11621). [#11767](https://github.com/ClickHouse/ClickHouse/pull/11767) ([Amos Bird](https://github.com/amosbird)).
 * Fix unexpected behaviour of queries like `SELECT *, xyz.*` which were success while an error expected. [#11753](https://github.com/ClickHouse/ClickHouse/pull/11753) ([hexiaoting](https://github.com/hexiaoting)).
 * Now replicated fetches will be cancelled during metadata alter. [#11744](https://github.com/ClickHouse/ClickHouse/pull/11744) ([alesapin](https://github.com/alesapin)).
 * Parse metadata stored in zookeeper before checking for equality. [#11739](https://github.com/ClickHouse/ClickHouse/pull/11739) ([Azat Khuzhin](https://github.com/azat)).
@@ -1637,7 +1637,7 @@ toc_title: '2020'
 * Fix wrong exit code of the clickhouse-client, when `exception.code() % 256 == 0`. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
 * Fix race conditions in CREATE/DROP of different replicas of ReplicatedMergeTree. Continue to work if the table was not removed completely from ZooKeeper or not created successfully. This fixes [#11432](https://github.com/ClickHouse/ClickHouse/issues/11432). [#11592](https://github.com/ClickHouse/ClickHouse/pull/11592) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error `Size of offsets does not match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fixed rare segfault in `SHOW CREATE TABLE` Fixes [#11490](https://github.com/ClickHouse/ClickHouse/issues/11490). [#11579](https://github.com/ClickHouse/ClickHouse/pull/11579) ([tavplubix](https://github.com/tavplubix)).
 * All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
 * Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
@@ -1758,7 +1758,7 @@ toc_title: '2020'
 * Multiple names are now allowed in commands: CREATE USER, CREATE ROLE, ALTER USER, SHOW CREATE USER, SHOW GRANTS and so on. [#11670](https://github.com/ClickHouse/ClickHouse/pull/11670) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Add support for distributed DDL (`UPDATE/DELETE/DROP PARTITION`) on cross replication clusters. [#11508](https://github.com/ClickHouse/ClickHouse/pull/11508) ([frank lee](https://github.com/etah000)).
 * Clear password from command line in `clickhouse-client` and `clickhouse-benchmark` if the user has specified it with explicit value. This prevents password exposure by `ps` and similar tools. [#11665](https://github.com/ClickHouse/ClickHouse/pull/11665) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Don't use debug info from ELF file if it doesn't correspond to the running binary. It is needed to avoid printing wrong function names and source locations in stack traces. This fixes [#7514](https://github.com/ClickHouse/ClickHouse/issues/7514). [#11657](https://github.com/ClickHouse/ClickHouse/pull/11657) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Don't use debug info from ELF file if it does not correspond to the running binary. It is needed to avoid printing wrong function names and source locations in stack traces. This fixes [#7514](https://github.com/ClickHouse/ClickHouse/issues/7514). [#11657](https://github.com/ClickHouse/ClickHouse/pull/11657) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Return NULL/zero when value is not parsed completely in parseDateTimeBestEffortOrNull/Zero functions. This fixes [#7876](https://github.com/ClickHouse/ClickHouse/issues/7876). [#11653](https://github.com/ClickHouse/ClickHouse/pull/11653) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Skip empty parameters in requested URL. They may appear when you write `http://localhost:8123/?&a=b` or `http://localhost:8123/?a=b&&c=d`. This closes [#10749](https://github.com/ClickHouse/ClickHouse/issues/10749). [#11651](https://github.com/ClickHouse/ClickHouse/pull/11651) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Allow using `groupArrayArray` and `groupUniqArrayArray` as `SimpleAggregateFunction`. [#11650](https://github.com/ClickHouse/ClickHouse/pull/11650) ([Volodymyr Kuznetsov](https://github.com/ksvladimir)).
@@ -1933,7 +1933,7 @@ toc_title: '2020'
 * Fixed logical functions for UInt8 values when they are not equal to 0 or 1. [#12196](https://github.com/ClickHouse/ClickHouse/pull/12196) ([Alexander Kazakov](https://github.com/Akazz)).
 * Cap max_memory_usage* limits to the process resident memory. [#12182](https://github.com/ClickHouse/ClickHouse/pull/12182) ([Azat Khuzhin](https://github.com/azat)).
 * Fixed `dictGet` arguments check during GROUP BY injective functions elimination. [#12179](https://github.com/ClickHouse/ClickHouse/pull/12179) ([Azat Khuzhin](https://github.com/azat)).
-* Don't split the dictionary source's table name into schema and table name itself if ODBC connection doesn't support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Don't split the dictionary source's table name into schema and table name itself if ODBC connection does not support schema. [#12165](https://github.com/ClickHouse/ClickHouse/pull/12165) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fixed wrong logic in `ALTER DELETE` that leads to deleting of records when condition evaluates to NULL. This fixes [#9088](https://github.com/ClickHouse/ClickHouse/issues/9088). This closes [#12106](https://github.com/ClickHouse/ClickHouse/issues/12106). [#12153](https://github.com/ClickHouse/ClickHouse/pull/12153) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed transform of query to send to external DBMS (e.g. MySQL, ODBC) in presense of aliases. This fixes [#12032](https://github.com/ClickHouse/ClickHouse/issues/12032). [#12151](https://github.com/ClickHouse/ClickHouse/pull/12151) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Fixed potential overflow in integer division. This fixes [#12119](https://github.com/ClickHouse/ClickHouse/issues/12119). [#12140](https://github.com/ClickHouse/ClickHouse/pull/12140) ([alexey-milovidov](https://github.com/alexey-milovidov)).
@@ -1997,7 +1997,7 @@ toc_title: '2020'
 * Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
 * Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error `Size of offsets does not match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fixed rare segfault in `SHOW CREATE TABLE` Fixes [#11490](https://github.com/ClickHouse/ClickHouse/issues/11490). [#11579](https://github.com/ClickHouse/ClickHouse/pull/11579) ([tavplubix](https://github.com/tavplubix)).
 * All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
 * Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
@@ -2213,7 +2213,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix Distributed-over-Distributed with the only one shard in a nested table [#9997](https://github.com/ClickHouse/ClickHouse/pull/9997) ([Azat Khuzhin](https://github.com/azat))
 * Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). ... [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 * Fix bug in dictionary when local clickhouse server is used as source. It may caused memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin))
-* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node doesn't exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin))
+* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node does not exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin))
 * Fix error `Cannot clone block with columns because block has 0 columns ... While executing GroupingAggregatedTransform`. It happened when setting `distributed_aggregation_memory_efficient` was enabled, and distributed query read aggregating data with mixed single and two-level aggregation from different shards.  [#10063](https://github.com/ClickHouse/ClickHouse/pull/10063) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 * Fix deadlock when database with materialized view failed attach at start [#10054](https://github.com/ClickHouse/ClickHouse/pull/10054) ([Azat Khuzhin](https://github.com/azat))
 * Fix a segmentation fault that could occur in GROUP BY over string keys containing trailing zero bytes ([#8636](https://github.com/ClickHouse/ClickHouse/issues/8636), [#8925](https://github.com/ClickHouse/ClickHouse/issues/8925)). ... [#10025](https://github.com/ClickHouse/ClickHouse/pull/10025) ([Alexander Kuzmenkov](https://github.com/akuzm))
@@ -2228,7 +2228,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird))
 * Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin))
 * Fix `DISTINCT` for Distributed when `optimize_skip_unused_shards` is set. [#9808](https://github.com/ClickHouse/ClickHouse/pull/9808) ([Azat Khuzhin](https://github.com/azat))
-* Fix "scalar doesn't exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). ... [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird))
+* Fix "scalar does not exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). ... [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird))
 * Fix error with qualified names in `distributed_product_mode=\'local\'`. Fixes [#4756](https://github.com/ClickHouse/ClickHouse/issues/4756) [#9891](https://github.com/ClickHouse/ClickHouse/pull/9891) ([Artem Zuikov](https://github.com/4ertus2))
 * For INSERT queries shards now do clamp the settings from the initiator to their constraints instead of throwing an exception. This fix allows to send INSERT queries to a shard with another constraints. This change improves fix [#9447](https://github.com/ClickHouse/ClickHouse/issues/9447). [#9852](https://github.com/ClickHouse/ClickHouse/pull/9852) ([Vitaly Baranov](https://github.com/vitlibar))
 * Add some retries when commiting offsets to Kafka broker, since it can reject commit if during `offsets.commit.timeout.ms` there were no enough replicas available for the `__consumer_offsets` topic [#9884](https://github.com/ClickHouse/ClickHouse/pull/9884) ([filimonov](https://github.com/filimonov))
@@ -2248,11 +2248,11 @@ No changes compared to v20.4.3.16-stable.
 * Fix possible permanent "Cannot schedule a task" error. [#9154](https://github.com/ClickHouse/ClickHouse/pull/9154) ([Azat Khuzhin](https://github.com/azat))
 * Fix bug in backquoting in external dictionaries DDL. Fixes [#9619](https://github.com/ClickHouse/ClickHouse/issues/9619). [#9734](https://github.com/ClickHouse/ClickHouse/pull/9734) ([alesapin](https://github.com/alesapin))
 * Fixed data race in `text_log`. It does not correspond to any real bug. [#9726](https://github.com/ClickHouse/ClickHouse/pull/9726) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix bug in a replication that doesn't allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin))
+* Fix bug in a replication that does not allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin))
 * Fixed incorrect internal function names for `sumKahan` and `sumWithOverflow`. It led to exception while using this functions in remote queries. [#9636](https://github.com/ClickHouse/ClickHouse/pull/9636) ([Azat Khuzhin](https://github.com/azat))
 * Add setting `use_compact_format_in_distributed_parts_names` which allows to write files for `INSERT` queries into `Distributed` table with more compact format. This fixes [#9647](https://github.com/ClickHouse/ClickHouse/issues/9647). [#9653](https://github.com/ClickHouse/ClickHouse/pull/9653) ([alesapin](https://github.com/alesapin))
 * Fix RIGHT and FULL JOIN with LowCardinality in JOIN keys. [#9610](https://github.com/ClickHouse/ClickHouse/pull/9610) ([Artem Zuikov](https://github.com/4ertus2))
-* Fix possible exceptions `Size of filter doesn't match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
+* Fix possible exceptions `Size of filter does not match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
 * Allow `ALTER ON CLUSTER` of Distributed tables with internal replication. This fixes [#3268](https://github.com/ClickHouse/ClickHouse/issues/3268) [#9617](https://github.com/ClickHouse/ClickHouse/pull/9617) ([shinoi2](https://github.com/shinoi2))
 * Fix issue when timezone was not preserved if you write a simple arithmetic expression like `time + 1` (in contrast to an expression like `time + INTERVAL 1 SECOND`). This fixes [#5743](https://github.com/ClickHouse/ClickHouse/issues/5743) [#9323](https://github.com/ClickHouse/ClickHouse/pull/9323) ([alexey-milovidov](https://github.com/alexey-milovidov))
 
@@ -2533,7 +2533,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix error `Block structure mismatch` for queries with sampling reading from `Buffer` table. [#11602](https://github.com/ClickHouse/ClickHouse/pull/11602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix wrong exit code of the clickhouse-client, when exception.code() % 256 = 0. [#11601](https://github.com/ClickHouse/ClickHouse/pull/11601) ([filimonov](https://github.com/filimonov)).
 * Fix trivial error in log message about "Mark cache size was lowered" at server startup. This closes [#11399](https://github.com/ClickHouse/ClickHouse/issues/11399). [#11589](https://github.com/ClickHouse/ClickHouse/pull/11589) ([alexey-milovidov](https://github.com/alexey-milovidov)).
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error `Size of offsets does not match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * All queries in HTTP session have had the same query_id. It is fixed. [#11578](https://github.com/ClickHouse/ClickHouse/pull/11578) ([tavplubix](https://github.com/tavplubix)).
 * Now clickhouse-server docker container will prefer IPv6 checking server aliveness. [#11550](https://github.com/ClickHouse/ClickHouse/pull/11550) ([Ivan Starkov](https://github.com/istarkov)).
 * Fix shard_num/replica_num for `<node>` (breaks use_compact_format_in_distributed_parts_names). [#11528](https://github.com/ClickHouse/ClickHouse/pull/11528) ([Azat Khuzhin](https://github.com/azat)).
@@ -2692,7 +2692,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix incorrect `index_granularity_bytes` check while creating new replica. Fixes [#10098](https://github.com/ClickHouse/ClickHouse/issues/10098). [#10121](https://github.com/ClickHouse/ClickHouse/pull/10121) ([alesapin](https://github.com/alesapin)).
 * Fix SIGSEGV on INSERT into Distributed table when its structure differs from the underlying tables. [#10105](https://github.com/ClickHouse/ClickHouse/pull/10105) ([Azat Khuzhin](https://github.com/azat)).
 * Fix possible rows loss for queries with `JOIN` and `UNION ALL`. Fixes [#9826](https://github.com/ClickHouse/ClickHouse/issues/9826), [#10113](https://github.com/ClickHouse/ClickHouse/issues/10113). [#10099](https://github.com/ClickHouse/ClickHouse/pull/10099) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node doesn't exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin)).
+* Fixed replicated tables startup when updating from an old ClickHouse version where `/table/replicas/replica_name/metadata` node does not exist. Fixes [#10037](https://github.com/ClickHouse/ClickHouse/issues/10037). [#10095](https://github.com/ClickHouse/ClickHouse/pull/10095) ([alesapin](https://github.com/alesapin)).
 * Add some arguments check and support identifier arguments for MySQL Database Engine. [#10077](https://github.com/ClickHouse/ClickHouse/pull/10077) ([Winter Zhang](https://github.com/zhang2014)).
 * Fix bug in clickhouse dictionary source from localhost clickhouse server. The bug may lead to memory corruption if types in dictionary and source are not compatible. [#10071](https://github.com/ClickHouse/ClickHouse/pull/10071) ([alesapin](https://github.com/alesapin)).
 * Fix bug in `CHECK TABLE` query when table contain skip indices. [#10068](https://github.com/ClickHouse/ClickHouse/pull/10068) ([alesapin](https://github.com/alesapin)).
@@ -2704,7 +2704,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja)).
 * Fix parsing multiple hosts set in the CREATE USER command, e.g. `CREATE USER user6 HOST NAME REGEXP 'lo.?*host', NAME REGEXP 'lo*host'`. [#9924](https://github.com/ClickHouse/ClickHouse/pull/9924) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird)).
-* Fix "scalar doesn't exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
+* Fix "scalar does not exist" error in ALTERs ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
 * Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin)).
 * Fix error with qualified names in `distributed_product_mode='local'`. Fixes [#4756](https://github.com/ClickHouse/ClickHouse/issues/4756). [#9891](https://github.com/ClickHouse/ClickHouse/pull/9891) ([Artem Zuikov](https://github.com/4ertus2)).
 * Fix calculating grants for introspection functions from the setting 'allow_introspection_functions'. [#9840](https://github.com/ClickHouse/ClickHouse/pull/9840) ([Vitaly Baranov](https://github.com/vitlibar)).
@@ -2745,7 +2745,7 @@ No changes compared to v20.4.3.16-stable.
 
 #### Bug Fix
 * This release also contains all bug fixes from 20.1.7.38
-* Fix bug in a replication that doesn't allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin)). It makes version 20.3 backward compatible again.
+* Fix bug in a replication that does not allow replication to work if the user has executed mutations on the previous version. This fixes [#9645](https://github.com/ClickHouse/ClickHouse/issues/9645). [#9652](https://github.com/ClickHouse/ClickHouse/pull/9652) ([alesapin](https://github.com/alesapin)). It makes version 20.3 backward compatible again.
 * Add setting `use_compact_format_in_distributed_parts_names` which allows to write files for `INSERT` queries into `Distributed` table with more compact format. This fixes [#9647](https://github.com/ClickHouse/ClickHouse/issues/9647). [#9653](https://github.com/ClickHouse/ClickHouse/pull/9653) ([alesapin](https://github.com/alesapin)). It makes version 20.3 backward compatible again.
 
 ### ClickHouse release v20.3.2.1, 2020-03-12
@@ -2760,7 +2760,7 @@ No changes compared to v20.4.3.16-stable.
 * Remove `findClusterIndex`, `findClusterValue` functions. This fixes [#8641](https://github.com/ClickHouse/ClickHouse/issues/8641). If you were using these functions, send an email to `clickhouse-feedback@yandex-team.com` [#9543](https://github.com/ClickHouse/ClickHouse/pull/9543) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Now it's not allowed to create columns or add columns with `SELECT` subquery as default expression. [#9481](https://github.com/ClickHouse/ClickHouse/pull/9481) ([alesapin](https://github.com/alesapin))
 * Require aliases for subqueries in JOIN. [#9274](https://github.com/ClickHouse/ClickHouse/pull/9274) ([Artem Zuikov](https://github.com/4ertus2))
-* Improved `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression doesn't change type of column and `MODIFY` type doesn't loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669). [#9227](https://github.com/ClickHouse/ClickHouse/pull/9227) ([alesapin](https://github.com/alesapin))
+* Improved `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression does not change type of column and `MODIFY` type does not loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669). [#9227](https://github.com/ClickHouse/ClickHouse/pull/9227) ([alesapin](https://github.com/alesapin))
 * Require server to be restarted to apply the changes in logging configuration. This is a temporary workaround to avoid the bug where the server logs to a deleted log file (see [#8696](https://github.com/ClickHouse/ClickHouse/issues/8696)). [#8707](https://github.com/ClickHouse/ClickHouse/pull/8707) ([Alexander Kuzmenkov](https://github.com/akuzm))
 * The setting `experimental_use_processors` is enabled by default. This setting enables usage of the new query pipeline. This is internal refactoring and we expect no visible changes. If you will see any issues, set it to back zero. [#8768](https://github.com/ClickHouse/ClickHouse/pull/8768) ([alexey-milovidov](https://github.com/alexey-milovidov))
 
@@ -2811,7 +2811,7 @@ No changes compared to v20.4.3.16-stable.
 * Found keys were counted as missed in metrics of cache dictionaries. [#9411](https://github.com/ClickHouse/ClickHouse/pull/9411) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
 * Fix replication protocol incompatibility introduced in [#8598](https://github.com/ClickHouse/ClickHouse/issues/8598). [#9412](https://github.com/ClickHouse/ClickHouse/pull/9412) ([alesapin](https://github.com/alesapin))
 * Fixed race condition on `queue_task_handle` at the startup of `ReplicatedMergeTree` tables. [#9552](https://github.com/ClickHouse/ClickHouse/pull/9552) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* The token `NOT` didn't work in `SHOW TABLES NOT LIKE` query [#8727](https://github.com/ClickHouse/ClickHouse/issues/8727) [#8940](https://github.com/ClickHouse/ClickHouse/pull/8940) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* The token `NOT` did not work in `SHOW TABLES NOT LIKE` query [#8727](https://github.com/ClickHouse/ClickHouse/issues/8727) [#8940](https://github.com/ClickHouse/ClickHouse/pull/8940) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Added range check to function `h3EdgeLengthM`. Without this check, buffer overflow is possible. [#8945](https://github.com/ClickHouse/ClickHouse/pull/8945) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Fixed up a bug in batched calculations of ternary logical OPs on multiple arguments (more than 10). [#8718](https://github.com/ClickHouse/ClickHouse/pull/8718) ([Alexander Kazakov](https://github.com/Akazz))
 * Fix error of PREWHERE optimization, which could lead to segfaults or `Inconsistent number of columns got from MergeTreeRangeReader` exception. [#9024](https://github.com/ClickHouse/ClickHouse/pull/9024) ([Anton Popov](https://github.com/CurtizJ))
@@ -2872,7 +2872,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix bug in which a misleading error message was shown when running `SHOW CREATE TABLE a_table_that_does_not_exist`. [#8899](https://github.com/ClickHouse/ClickHouse/pull/8899) ([achulkov2](https://github.com/achulkov2))
 * Fixed `Parameters are out of bound` exception in some rare cases when we have a constant in the `SELECT` clause when we have an `ORDER BY` and a `LIMIT` clause. [#8892](https://github.com/ClickHouse/ClickHouse/pull/8892) ([Guillaume Tassery](https://github.com/YiuRULE))
 * Fix mutations finalization, when already done mutation can have status `is_done=0`. [#9217](https://github.com/ClickHouse/ClickHouse/pull/9217) ([alesapin](https://github.com/alesapin))
-* Prevent from executing `ALTER ADD INDEX` for MergeTree tables with old syntax, because it doesn't work. [#8822](https://github.com/ClickHouse/ClickHouse/pull/8822) ([Mikhail Korotov](https://github.com/millb))
+* Prevent from executing `ALTER ADD INDEX` for MergeTree tables with old syntax, because it does not work. [#8822](https://github.com/ClickHouse/ClickHouse/pull/8822) ([Mikhail Korotov](https://github.com/millb))
 * During server startup do not access table, which `LIVE VIEW` depends on, so server will be able to start. Also remove `LIVE VIEW` dependencies when detaching `LIVE VIEW`. `LIVE VIEW` is an experimental feature. [#8824](https://github.com/ClickHouse/ClickHouse/pull/8824) ([tavplubix](https://github.com/tavplubix))
 * Fix possible segfault in `MergeTreeRangeReader`, while executing `PREWHERE`. [#9106](https://github.com/ClickHouse/ClickHouse/pull/9106) ([Anton Popov](https://github.com/CurtizJ))
 * Fix possible mismatched checksums with column TTLs. [#9451](https://github.com/ClickHouse/ClickHouse/pull/9451) ([Anton Popov](https://github.com/CurtizJ))
@@ -3020,7 +3020,7 @@ No changes compared to v20.4.3.16-stable.
 
 #### Bug Fix
 
-* Fix error `Size of offsets doesn't match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix error `Size of offsets does not match size of column` for queries with `PREWHERE column in (subquery)` and `ARRAY JOIN`. [#11580](https://github.com/ClickHouse/ClickHouse/pull/11580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
 
 ### ClickHouse release v20.1.13.105-stable 2020-06-10
@@ -3116,7 +3116,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix `'Not found column in block'` error when `JOIN` appears with `TOTALS`. Fixes [#9839](https://github.com/ClickHouse/ClickHouse/issues/9839). [#9939](https://github.com/ClickHouse/ClickHouse/pull/9939) ([Artem Zuikov](https://github.com/4ertus2)).
 * Fix a bug with `ON CLUSTER` DDL queries freezing on server startup. [#9927](https://github.com/ClickHouse/ClickHouse/pull/9927) ([Gagan Arneja](https://github.com/garneja)).
 * Fix `TRUNCATE` for Join table engine ([#9917](https://github.com/ClickHouse/ClickHouse/issues/9917)). [#9920](https://github.com/ClickHouse/ClickHouse/pull/9920) ([Amos Bird](https://github.com/amosbird)).
-* Fix `'scalar doesn't exist'` error in ALTER queries ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
+* Fix `'scalar does not exist'` error in ALTER queries ([#9878](https://github.com/ClickHouse/ClickHouse/issues/9878)). [#9904](https://github.com/ClickHouse/ClickHouse/pull/9904) ([Amos Bird](https://github.com/amosbird)).
 * Fix race condition between drop and optimize in `ReplicatedMergeTree`. [#9901](https://github.com/ClickHouse/ClickHouse/pull/9901) ([alesapin](https://github.com/alesapin)).
 * Fixed `DeleteOnDestroy` logic in `ATTACH PART` which could lead to automatic removal of attached part and added few tests. [#9410](https://github.com/ClickHouse/ClickHouse/pull/9410) ([Vladimir Chebotarev](https://github.com/excitoon)).
 
@@ -3155,7 +3155,7 @@ No changes compared to v20.4.3.16-stable.
 #### Bug Fix
 * Fixed incorrect internal function names for `sumKahan` and `sumWithOverflow`. I lead to exception while using this functions in remote queries. [#9636](https://github.com/ClickHouse/ClickHouse/pull/9636) ([Azat Khuzhin](https://github.com/azat)). This issue was in all ClickHouse releases.
 * Allow `ALTER ON CLUSTER` of `Distributed` tables with internal replication. This fixes [#3268](https://github.com/ClickHouse/ClickHouse/issues/3268). [#9617](https://github.com/ClickHouse/ClickHouse/pull/9617) ([shinoi2](https://github.com/shinoi2)). This issue was in all ClickHouse releases.
-* Fix possible exceptions `Size of filter doesn't match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. Fixes [#9132](https://github.com/ClickHouse/ClickHouse/issues/9132). [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
+* Fix possible exceptions `Size of filter does not match size of column` and `Invalid number of rows in Chunk` in `MergeTreeRangeReader`. They could appear while executing `PREWHERE` in some cases. Fixes [#9132](https://github.com/ClickHouse/ClickHouse/issues/9132). [#9612](https://github.com/ClickHouse/ClickHouse/pull/9612) ([Anton Popov](https://github.com/CurtizJ))
 * Fixed the issue: timezone was not preserved if you write a simple arithmetic expression like `time + 1` (in contrast to an expression like `time + INTERVAL 1 SECOND`). This fixes [#5743](https://github.com/ClickHouse/ClickHouse/issues/5743). [#9323](https://github.com/ClickHouse/ClickHouse/pull/9323) ([alexey-milovidov](https://github.com/alexey-milovidov)). This issue was in all ClickHouse releases.
 * Now it's not possible to create or add columns with simple cyclic aliases like `a DEFAULT b, b DEFAULT a`. [#9603](https://github.com/ClickHouse/ClickHouse/pull/9603) ([alesapin](https://github.com/alesapin))
 * Fixed the issue when padding at the end of base64 encoded value can be malformed. Update base64 library. This fixes [#9491](https://github.com/ClickHouse/ClickHouse/issues/9491), closes [#9492](https://github.com/ClickHouse/ClickHouse/issues/9492) [#9500](https://github.com/ClickHouse/ClickHouse/pull/9500) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -3199,7 +3199,7 @@ No changes compared to v20.4.3.16-stable.
 [#9231](https://github.com/ClickHouse/ClickHouse/pull/9231) [(abyss7)](https://github.com/abyss7)
 * Allow comma join with `IN()` inside. Fixes [#7314](https://github.com/ClickHouse/ClickHouse/issues/7314).
 [#9251](https://github.com/ClickHouse/ClickHouse/pull/9251) [(4ertus2)](https://github.com/4ertus2)
-* Improve `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression doesn't change type of column and `MODIFY` type doesn't loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669).
+* Improve `ALTER MODIFY/ADD` queries logic. Now you cannot `ADD` column without type, `MODIFY` default expression does not change type of column and `MODIFY` type does not loose default expression value. Fixes [#8669](https://github.com/ClickHouse/ClickHouse/issues/8669).
 [#9227](https://github.com/ClickHouse/ClickHouse/pull/9227)  [(alesapin)](https://github.com/alesapin)
 * Fix mutations finalization, when already done mutation can have status is_done=0.
 [#9217](https://github.com/ClickHouse/ClickHouse/pull/9217) [(alesapin)](https://github.com/alesapin)
@@ -3283,7 +3283,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix error "Mismatch column sizes" when inserting default `Tuple` from `JSONEachRow`. This fixes [#5653](https://github.com/ClickHouse/ClickHouse/issues/5653). [#8606](https://github.com/ClickHouse/ClickHouse/pull/8606) ([tavplubix](https://github.com/tavplubix))
 * Now an exception will be thrown in case of using `WITH TIES` alongside `LIMIT BY`. Also add ability to use `TOP` with `LIMIT BY`. This fixes [#7472](https://github.com/ClickHouse/ClickHouse/issues/7472). [#7637](https://github.com/ClickHouse/ClickHouse/pull/7637) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov))
 * Fix unintendent dependency from fresh glibc version in `clickhouse-odbc-bridge` binary. [#8046](https://github.com/ClickHouse/ClickHouse/pull/8046) ([Amos Bird](https://github.com/amosbird))
-* Fix bug in check function of `*MergeTree` engines family. Now it doesn't fail in case when we have equal amount of rows in last granule and last mark (non-final). [#8047](https://github.com/ClickHouse/ClickHouse/pull/8047) ([alesapin](https://github.com/alesapin))
+* Fix bug in check function of `*MergeTree` engines family. Now it does not fail in case when we have equal amount of rows in last granule and last mark (non-final). [#8047](https://github.com/ClickHouse/ClickHouse/pull/8047) ([alesapin](https://github.com/alesapin))
 * Fix insert into `Enum*` columns after `ALTER` query, when underlying numeric type is equal to table specified type. This fixes [#7836](https://github.com/ClickHouse/ClickHouse/issues/7836). [#7908](https://github.com/ClickHouse/ClickHouse/pull/7908) ([Anton Popov](https://github.com/CurtizJ))
 * Allowed non-constant negative "size" argument for function `substring`. It was not allowed by mistake. This fixes [#4832](https://github.com/ClickHouse/ClickHouse/issues/4832). [#7703](https://github.com/ClickHouse/ClickHouse/pull/7703) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Fix parsing bug when wrong number of arguments passed to `(O|J)DBC` table engine. [#7709](https://github.com/ClickHouse/ClickHouse/pull/7709) ([alesapin](https://github.com/alesapin))
@@ -3296,7 +3296,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix function `IN` inside `WHERE` statement when row-level table filter is present. Fixes [#6687](https://github.com/ClickHouse/ClickHouse/issues/6687) [#8357](https://github.com/ClickHouse/ClickHouse/pull/8357) ([Ivan](https://github.com/abyss7))
 * Now an exception is thrown if the integral value is not parsed completely for settings values. [#7678](https://github.com/ClickHouse/ClickHouse/pull/7678) ([Mikhail Korotov](https://github.com/millb))
 * Fix exception when aggregate function is used in query to distributed table with more than two local shards. [#8164](https://github.com/ClickHouse/ClickHouse/pull/8164) ([小路](https://github.com/nicelulu))
-* Now bloom filter can handle zero length arrays and doesn't perform redundant calculations. [#8242](https://github.com/ClickHouse/ClickHouse/pull/8242) ([achimbab](https://github.com/achimbab))
+* Now bloom filter can handle zero length arrays and does not perform redundant calculations. [#8242](https://github.com/ClickHouse/ClickHouse/pull/8242) ([achimbab](https://github.com/achimbab))
 * Fixed checking if a client host is allowed by matching the client host to `host_regexp` specified in `users.xml`. [#8241](https://github.com/ClickHouse/ClickHouse/pull/8241) ([Vitaly Baranov](https://github.com/vitlibar))
 * Relax ambiguous column check that leads to false positives in multiple `JOIN ON` section. [#8385](https://github.com/ClickHouse/ClickHouse/pull/8385) ([Artem Zuikov](https://github.com/4ertus2))
 * Fixed possible server crash (`std::terminate`) when the server cannot send or write data in `JSON` or `XML` format with values of `String` data type (that require `UTF-8` validation) or when compressing result data with Brotli algorithm or in some other rare cases. This fixes [#7603](https://github.com/ClickHouse/ClickHouse/issues/7603) [#8384](https://github.com/ClickHouse/ClickHouse/pull/8384) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -3323,19 +3323,19 @@ No changes compared to v20.4.3.16-stable.
 * Fix error in background merge of columns with `SimpleAggregateFunction(LowCardinality)` type. [#8613](https://github.com/ClickHouse/ClickHouse/pull/8613) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 * Fixed type check in function `toDateTime64`. [#8375](https://github.com/ClickHouse/ClickHouse/pull/8375) ([Vasily Nemkov](https://github.com/Enmk))
 * Now server do not crash on `LEFT` or `FULL JOIN` with and Join engine and unsupported `join_use_nulls` settings. [#8479](https://github.com/ClickHouse/ClickHouse/pull/8479) ([Artem Zuikov](https://github.com/4ertus2))
-* Now `DROP DICTIONARY IF EXISTS db.dict` query doesn't throw exception if `db` doesn't exist. [#8185](https://github.com/ClickHouse/ClickHouse/pull/8185) ([Vitaly Baranov](https://github.com/vitlibar))
+* Now `DROP DICTIONARY IF EXISTS db.dict` query does not throw exception if `db` does not exist. [#8185](https://github.com/ClickHouse/ClickHouse/pull/8185) ([Vitaly Baranov](https://github.com/vitlibar))
 * Fix possible crashes in table functions (`file`, `mysql`, `remote`) caused by usage of reference to removed `IStorage` object. Fix incorrect parsing of columns specified at insertion into table function. [#7762](https://github.com/ClickHouse/ClickHouse/pull/7762) ([tavplubix](https://github.com/tavplubix))
 * Ensure network be up before starting `clickhouse-server`. This fixes [#7507](https://github.com/ClickHouse/ClickHouse/issues/7507). [#8570](https://github.com/ClickHouse/ClickHouse/pull/8570) ([Zhichang Yu](https://github.com/yuzhichang))
-* Fix timeouts handling for secure connections, so queries doesn't hang indefenitely. This fixes [#8126](https://github.com/ClickHouse/ClickHouse/issues/8126). [#8128](https://github.com/ClickHouse/ClickHouse/pull/8128) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fix timeouts handling for secure connections, so queries does not hang indefenitely. This fixes [#8126](https://github.com/ClickHouse/ClickHouse/issues/8126). [#8128](https://github.com/ClickHouse/ClickHouse/pull/8128) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Fix `clickhouse-copier`'s redundant contention between concurrent workers. [#7816](https://github.com/ClickHouse/ClickHouse/pull/7816) ([Ding Xiang Fei](https://github.com/dingxiangfei2009))
-* Now mutations doesn't skip attached parts, even if their mutation version were larger than current mutation version. [#7812](https://github.com/ClickHouse/ClickHouse/pull/7812) ([Zhichang Yu](https://github.com/yuzhichang)) [#8250](https://github.com/ClickHouse/ClickHouse/pull/8250) ([alesapin](https://github.com/alesapin))
+* Now mutations does not skip attached parts, even if their mutation version were larger than current mutation version. [#7812](https://github.com/ClickHouse/ClickHouse/pull/7812) ([Zhichang Yu](https://github.com/yuzhichang)) [#8250](https://github.com/ClickHouse/ClickHouse/pull/8250) ([alesapin](https://github.com/alesapin))
 * Ignore redundant copies of `*MergeTree` data parts after move to another disk and server restart. [#7810](https://github.com/ClickHouse/ClickHouse/pull/7810) ([Vladimir Chebotarev](https://github.com/excitoon))
 * Fix crash in `FULL JOIN` with `LowCardinality` in `JOIN` key. [#8252](https://github.com/ClickHouse/ClickHouse/pull/8252) ([Artem Zuikov](https://github.com/4ertus2))
 * Forbidden to use column name more than once in insert query like `INSERT INTO tbl (x, y, x)`. This fixes [#5465](https://github.com/ClickHouse/ClickHouse/issues/5465), [#7681](https://github.com/ClickHouse/ClickHouse/issues/7681). [#7685](https://github.com/ClickHouse/ClickHouse/pull/7685) ([alesapin](https://github.com/alesapin))
 * Added fallback for detection the number of physical CPU cores for unknown CPUs (using the number of logical CPU cores). This fixes [#5239](https://github.com/ClickHouse/ClickHouse/issues/5239). [#7726](https://github.com/ClickHouse/ClickHouse/pull/7726) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Fix `There's no column` error for materialized and alias columns. [#8210](https://github.com/ClickHouse/ClickHouse/pull/8210) ([Artem Zuikov](https://github.com/4ertus2))
 * Fixed sever crash when `EXISTS` query was used without `TABLE` or `DICTIONARY` qualifier. Just like `EXISTS t`. This fixes [#8172](https://github.com/ClickHouse/ClickHouse/issues/8172). This bug was introduced in version 19.17. [#8213](https://github.com/ClickHouse/ClickHouse/pull/8213) ([alexey-milovidov](https://github.com/alexey-milovidov))
-* Fix rare bug with error `"Sizes of columns doesn't match"` that might appear when using `SimpleAggregateFunction` column. [#7790](https://github.com/ClickHouse/ClickHouse/pull/7790) ([Boris Granveaud](https://github.com/bgranvea))
+* Fix rare bug with error `"Sizes of columns does not match"` that might appear when using `SimpleAggregateFunction` column. [#7790](https://github.com/ClickHouse/ClickHouse/pull/7790) ([Boris Granveaud](https://github.com/bgranvea))
 * Fix bug where user with empty `allow_databases` got access to all databases (and same for `allow_dictionaries`). [#7793](https://github.com/ClickHouse/ClickHouse/pull/7793) ([DeifyTheGod](https://github.com/DeifyTheGod))
 * Fix client crash when server already disconnected from client. [#8071](https://github.com/ClickHouse/ClickHouse/pull/8071) ([Azat Khuzhin](https://github.com/azat))
 * Fix `ORDER BY` behaviour in case of sorting by primary key prefix and non primary key suffix. [#7759](https://github.com/ClickHouse/ClickHouse/pull/7759) ([Anton Popov](https://github.com/CurtizJ))
@@ -3367,7 +3367,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix `CHECK TABLE` query for `*MergeTree` tables without key. Fixes [#7543](https://github.com/ClickHouse/ClickHouse/issues/7543). [#7979](https://github.com/ClickHouse/ClickHouse/pull/7979) ([alesapin](https://github.com/alesapin))
 * Fixed conversion of `Float64` to MySQL type. [#8079](https://github.com/ClickHouse/ClickHouse/pull/8079) ([Yuriy Baranov](https://github.com/yurriy))
 * Now if table was not completely dropped because of server crash, server will try to restore and load it. [#8176](https://github.com/ClickHouse/ClickHouse/pull/8176) ([tavplubix](https://github.com/tavplubix))
-* Fixed crash in table function `file` while inserting into file that doesn't exist. Now in this case file would be created and then insert would be processed. [#8177](https://github.com/ClickHouse/ClickHouse/pull/8177) ([Olga Khvostikova](https://github.com/stavrolia))
+* Fixed crash in table function `file` while inserting into file that does not exist. Now in this case file would be created and then insert would be processed. [#8177](https://github.com/ClickHouse/ClickHouse/pull/8177) ([Olga Khvostikova](https://github.com/stavrolia))
 * Fix rare deadlock which can happen when `trace_log` is in enabled. [#7838](https://github.com/ClickHouse/ClickHouse/pull/7838) ([filimonov](https://github.com/filimonov))
 * Add ability to work with different types besides `Date` in `RangeHashed` external dictionary created from DDL query. Fixes [7899](https://github.com/ClickHouse/ClickHouse/issues/7899). [#8275](https://github.com/ClickHouse/ClickHouse/pull/8275) ([alesapin](https://github.com/alesapin))
 * Fixes crash when `now64()` is called with result of another function. [#8270](https://github.com/ClickHouse/ClickHouse/pull/8270) ([Vasily Nemkov](https://github.com/Enmk))
@@ -3465,7 +3465,7 @@ No changes compared to v20.4.3.16-stable.
 * Add performance tests for short string optimized hash tables. [#7679](https://github.com/ClickHouse/ClickHouse/pull/7679) ([Amos Bird](https://github.com/amosbird))
 * Now ClickHouse will build on `AArch64` even if `MADV_FREE` is not available. This fixes [#8027](https://github.com/ClickHouse/ClickHouse/issues/8027). [#8243](https://github.com/ClickHouse/ClickHouse/pull/8243) ([Amos Bird](https://github.com/amosbird))
 * Update `zlib-ng` to fix memory sanitizer problems. [#7182](https://github.com/ClickHouse/ClickHouse/pull/7182) [#8206](https://github.com/ClickHouse/ClickHouse/pull/8206) ([Alexander Kuzmenkov](https://github.com/akuzm))
-* Enable internal MySQL library on non-Linux system, because usage of OS packages is very fragile and usually doesn't work at all. This fixes [#5765](https://github.com/ClickHouse/ClickHouse/issues/5765). [#8426](https://github.com/ClickHouse/ClickHouse/pull/8426) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Enable internal MySQL library on non-Linux system, because usage of OS packages is very fragile and usually does not work at all. This fixes [#5765](https://github.com/ClickHouse/ClickHouse/issues/5765). [#8426](https://github.com/ClickHouse/ClickHouse/pull/8426) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Fixed build on some systems after enabling `libc++`. This supersedes [#8374](https://github.com/ClickHouse/ClickHouse/issues/8374). [#8380](https://github.com/ClickHouse/ClickHouse/pull/8380) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Make `Field` methods more type-safe to find more errors. [#7386](https://github.com/ClickHouse/ClickHouse/pull/7386) [#8209](https://github.com/ClickHouse/ClickHouse/pull/8209) ([Alexander Kuzmenkov](https://github.com/akuzm))
 * Added missing files to the `libc-headers` submodule. [#8507](https://github.com/ClickHouse/ClickHouse/pull/8507) ([alexey-milovidov](https://github.com/alexey-milovidov))
@@ -3494,7 +3494,7 @@ No changes compared to v20.4.3.16-stable.
 * Fix mode of default password file for `.deb` linux distros. [#8075](https://github.com/ClickHouse/ClickHouse/pull/8075) ([proller](https://github.com/proller))
 * Improved expression for getting `clickhouse-server` PID in `clickhouse-test`. [#8063](https://github.com/ClickHouse/ClickHouse/pull/8063) ([Alexander Kazakov](https://github.com/Akazz))
 * Updated contrib/googletest to v1.10.0. [#8587](https://github.com/ClickHouse/ClickHouse/pull/8587) ([Alexander Burmak](https://github.com/Alex-Burmak))
-* Fixed ThreadSaninitizer report in `base64` library. Also updated this library to the latest version, but it doesn't matter. This fixes [#8397](https://github.com/ClickHouse/ClickHouse/issues/8397). [#8403](https://github.com/ClickHouse/ClickHouse/pull/8403) ([alexey-milovidov](https://github.com/alexey-milovidov))
+* Fixed ThreadSaninitizer report in `base64` library. Also updated this library to the latest version, but it does not matter. This fixes [#8397](https://github.com/ClickHouse/ClickHouse/issues/8397). [#8403](https://github.com/ClickHouse/ClickHouse/pull/8403) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Fix `00600_replace_running_query` for processors. [#8272](https://github.com/ClickHouse/ClickHouse/pull/8272) ([Nikolai Kochetov](https://github.com/KochetovNicolai))
 * Remove support for `tcmalloc` to make `CMakeLists.txt` simpler. [#8310](https://github.com/ClickHouse/ClickHouse/pull/8310) ([alexey-milovidov](https://github.com/alexey-milovidov))
 * Release gcc builds now use `libc++` instead of `libstdc++`. Recently `libc++` was used only with clang. This will improve consistency of build configurations and portability. [#8311](https://github.com/ClickHouse/ClickHouse/pull/8311) ([alexey-milovidov](https://github.com/alexey-milovidov))
diff --git a/docs/ja/commercial/cloud.md b/docs/ja/commercial/cloud.md
index 84f58e46cdb..62fc75ecbda 100644
--- a/docs/ja/commercial/cloud.md
+++ b/docs/ja/commercial/cloud.md
@@ -22,7 +22,7 @@ toc_title: "\u30AF\u30E9\u30A6\u30C9"
 
 ## Alibaba Cloud {#alibaba-cloud}
 
-ClickHouseのためのAlibaba Cloudの管理サービス [中国サイト](https://www.aliyun.com/product/clickhouse) (2021年5月に国際サイトで利用可能になります) 次の主な機能を提供します:
+[ClickHouseのためのAlibaba Cloudの管理サービス](https://www.alibabacloud.com/product/clickhouse) 次の主な機能を提供します:
 
 -   Alibaba Cloud Apsara分散システムをベースにした信頼性の高いクラウドディスクストレージエンジン
 -   手動でのデータ移行を必要とせずに、オン・デマンドで容量を拡張
diff --git a/docs/ja/development/build.md b/docs/ja/development/build.md
index e44ba45485e..191fa665ccd 100644
--- a/docs/ja/development/build.md
+++ b/docs/ja/development/build.md
@@ -19,28 +19,17 @@ $ sudo apt-get install git cmake python ninja-build
 
 古いシステムではcmakeの代わりにcmake3。
 
-## GCC9のインストール {#install-gcc-10}
+## Clang 11 のインストール
 
-これを行うにはいくつかの方法があります。
+On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
-### PPAパッケージからインストール {#install-from-a-ppa-package}
-
-``` bash
-$ sudo apt-get install software-properties-common
-$ sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-$ sudo apt-get update
-$ sudo apt-get install gcc-10 g++-10
+```bash
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 ```
 
-### ソースからインスト {#install-from-sources}
-
-見て [utils/ci/build-gcc-from-sources.sh](https://github.com/ClickHouse/ClickHouse/blob/master/utils/ci/build-gcc-from-sources.sh)
-
-## ビルドにGCC9を使用する {#use-gcc-10-for-builds}
-
 ``` bash
-$ export CC=gcc-10
-$ export CXX=g++-10
+$ export CC=clang
+$ export CXX=clang++
 ```
 
 ## ﾂつｨﾂ姪"ﾂ債ﾂつｹ {#checkout-clickhouse-sources}
@@ -76,7 +65,7 @@ $ cd ..
 -   Git（ソースをチェックアウトするためにのみ使用され、ビルドには必要ありません)
 -   CMake3.10以降
 -   忍者（推奨）または作る
--   C++コンパイラ:gcc9またはclang8以降
+-   C++コンパイラ:clang11以降
 -   リンカ:lldまたはgold(古典的なGNU ldは動作しません)
 -   Python(LLVMビルド内でのみ使用され、オプションです)
 
diff --git a/docs/ja/development/developer-instruction.md b/docs/ja/development/developer-instruction.md
index ccc3a177d1f..d7e5217b3b6 100644
--- a/docs/ja/development/developer-instruction.md
+++ b/docs/ja/development/developer-instruction.md
@@ -133,19 +133,19 @@ ArchまたはGentooを使用する場合は、おそらくCMakeのインスト
 
 ClickHouseはビルドに複数の外部ライブラリを使用します。 それらのすべては、サブモジュールにあるソースからClickHouseと一緒に構築されているので、別々にインストールする必要はありません。 リストは次の場所で確認できます `contrib`.
 
-# C++コンパイラ {#c-compiler}
+## C++ Compiler {#c-compiler}
 
-ClickHouseのビルドには、バージョン9以降のGCCとClangバージョン8以降のコンパイラがサポートされます。
+Compilers Clang starting from version 11 is supported for building ClickHouse.
 
-公式のYandexビルドは、わずかに優れたパフォーマンスのマシンコードを生成するため、GCCを使用しています（私たちのベンチマークに応じて最大数パーセントの そしてClangは開発のために通常より便利です。 が、当社の継続的インテグレーション（CI)プラットフォームを運チェックのための十数の組み合わせとなります。
+Clang should be used instead of gcc. Though, our continuous integration (CI) platform runs checks for about a dozen of build combinations.
 
-UBUNTUにGCCをインストールするには: `sudo apt install gcc g++`
+On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
-Gccのバージョンを確認する: `gcc --version`. の場合は下記9その指示に従う。https://clickhouse.tech/docs/ja/development/build/#install-gcc-10.
+```bash
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+```
 
-Mac OS XのビルドはClangでのみサポートされています。 ちょうど実行 `brew install llvm`
-
-Clangを使用する場合は、次のものもインストールできます `libc++` と `lld` あなたがそれが何であるか知っていれば。 を使用して `ccache` また、推奨されます。
+Mac OS X build is also supported. Just run `brew install llvm`
 
 # 建築プロセス {#the-building-process}
 
@@ -158,13 +158,6 @@ ClickHouseを構築する準備ができたので、別のディレクトリを
 
 中の間 `build` cmakeを実行してビルドを構成します。 最初の実行の前に、コンパイラ（この例ではバージョン9gccコンパイラ）を指定する環境変数を定義する必要があります。
 
-Linux:
-
-    export CC=gcc-10 CXX=g++-10
-    cmake ..
-
-Mac OS X:
-
     export CC=clang CXX=clang++
     cmake ..
 
diff --git a/docs/ja/getting-started/example-datasets/ontime.md b/docs/ja/getting-started/example-datasets/ontime.md
index bd049e8caad..d12d8a36069 100644
--- a/docs/ja/getting-started/example-datasets/ontime.md
+++ b/docs/ja/getting-started/example-datasets/ontime.md
@@ -29,126 +29,127 @@ done
 テーブルの作成:
 
 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```
 
 データのロード:
 
 ``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```
 
 ## パーティション済みデータのダウンロード {#download-of-prepared-partitions}
@@ -212,10 +213,10 @@ LIMIT 10;
 Q4. 2007年のキャリア別の遅延の数
 
 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
-GROUP BY Carrier
+GROUP BY IATA_CODE_Reporting_Airline
 ORDER BY count(*) DESC;
 ```
 
@@ -226,32 +227,32 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year=2007
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year=2007
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 同じクエリのより良いバージョン:
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
-GROUP BY Carrier
+GROUP BY IATA_CODE_Reporting_Airline
 ORDER BY c3 DESC
 ```
 
@@ -262,29 +263,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year>=2000 AND Year<=2008
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year>=2000 AND Year<=2008
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 同じクエリのより良いバージョン:
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@@ -303,7 +304,7 @@ FROM
     from ontime
     WHERE DepDelay>10
     GROUP BY Year
-)
+) q
 JOIN
 (
     select
@@ -311,7 +312,7 @@ JOIN
         count(*) as c2
     from ontime
     GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```
 
@@ -346,7 +347,7 @@ Q10.
 
 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
    sum(ArrDelayMinutes>30) AS flights_delayed,
    round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
diff --git a/docs/ja/sql-reference/aggregate-functions/reference.md b/docs/ja/sql-reference/aggregate-functions/reference.md
index 465f36179da..c66e9b54746 100644
--- a/docs/ja/sql-reference/aggregate-functions/reference.md
+++ b/docs/ja/sql-reference/aggregate-functions/reference.md
@@ -624,7 +624,7 @@ uniqHLL12(x[, ...])
 
 -   HyperLogLogアルゴリズムを使用して、異なる引数値の数を近似します。
 
-        212 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
+        2^12 5-bit cells are used. The size of the state is slightly more than 2.5 KB. The result is not very accurate (up to ~10% error) for small data sets (<10K elements). However, the result is fairly accurate for high-cardinality data sets (10K-100M), with a maximum error of ~1.6%. Starting from 100M, the estimation error increases, and the function will return very inaccurate results for data sets with extremely high cardinality (1B+ elements).
 
 -   決定的な結果を提供します(クエリ処理順序に依存しません)。
 
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 d0660444e15..f29a608b85e 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
@@ -55,7 +55,7 @@ SOURCE(SOURCE_TYPE(param1 val1 ... paramN valN)) -- Source configuration
 または
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 SETTINGS(format_csv_allow_single_quotes = 0)
 ```
 
@@ -87,7 +87,7 @@ SETTINGS(format_csv_allow_single_quotes = 0)
 または
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 ```
 
 フィールドの設定:
diff --git a/docs/ja/sql-reference/functions/bitmap-functions.md b/docs/ja/sql-reference/functions/bitmap-functions.md
index cc57e762610..de3ce938444 100644
--- a/docs/ja/sql-reference/functions/bitmap-functions.md
+++ b/docs/ja/sql-reference/functions/bitmap-functions.md
@@ -35,7 +35,7 @@ SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res)
 
 ``` text
 ┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
+│     │ AggregateFunction(groupBitmap, UInt8)        │
 └─────┴──────────────────────────────────────────────┘
 ```
 
diff --git a/docs/ja/sql-reference/functions/hash-functions.md b/docs/ja/sql-reference/functions/hash-functions.md
index d48e6846bb4..a98ae60690d 100644
--- a/docs/ja/sql-reference/functions/hash-functions.md
+++ b/docs/ja/sql-reference/functions/hash-functions.md
@@ -434,13 +434,13 @@ A [FixedString(16)](../../sql-reference/data-types/fixedstring.md) データ型
 **例**
 
 ``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type
+SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
+┌─MurmurHash3──────────────────────┬─type───┐
+│ 368A1A311CB7342253354B548E7E7E71 │ String │
+└──────────────────────────────────┴────────┘
 ```
 
 ## xxHash32,xxHash64 {#hash-functions-xxhash32}
diff --git a/docs/ja/sql-reference/statements/select/index.md b/docs/ja/sql-reference/statements/select/index.md
deleted file mode 120000
index 9c649322c82..00000000000
--- a/docs/ja/sql-reference/statements/select/index.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../../en/sql-reference/statements/select/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/select/index.md b/docs/ja/sql-reference/statements/select/index.md
new file mode 100644
index 00000000000..b1a97ba1b28
--- /dev/null
+++ b/docs/ja/sql-reference/statements/select/index.md
@@ -0,0 +1,283 @@
+---
+title: SELECT Query
+toc_folder_title: SELECT
+toc_priority: 32
+toc_title: Overview
+---
+
+# SELECT Query {#select-queries-syntax}
+
+`SELECT` queries perform data retrieval. By default, the requested data is returned to the client, while in conjunction with [INSERT INTO](../../../sql-reference/statements/insert-into.md) it can be forwarded to a different table.
+
+## Syntax {#syntax}
+
+``` sql
+[WITH expr_list|(subquery)]
+SELECT [DISTINCT] expr_list
+[FROM [db.]table | (subquery) | table_function] [FINAL]
+[SAMPLE sample_coeff]
+[ARRAY JOIN ...]
+[GLOBAL] [ANY|ALL|ASOF] [INNER|LEFT|RIGHT|FULL|CROSS] [OUTER|SEMI|ANTI] JOIN (subquery)|table (ON <expr_list>)|(USING <column_list>)
+[PREWHERE expr]
+[WHERE expr]
+[GROUP BY expr_list] [WITH ROLLUP|WITH CUBE] [WITH TOTALS]
+[HAVING expr]
+[ORDER BY expr_list] [WITH FILL] [FROM expr] [TO expr] [STEP expr]
+[LIMIT [offset_value, ]n BY columns]
+[LIMIT [n, ]m] [WITH TIES]
+[SETTINGS ...]
+[UNION  ...]
+[INTO OUTFILE filename]
+[FORMAT format]
+```
+
+All clauses are optional, except for the required list of expressions immediately after `SELECT` which is covered in more detail [below](#select-clause).
+
+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)
+-   [FROM clause](../../../sql-reference/statements/select/from.md)
+-   [SAMPLE clause](../../../sql-reference/statements/select/sample.md)
+-   [JOIN clause](../../../sql-reference/statements/select/join.md)
+-   [PREWHERE clause](../../../sql-reference/statements/select/prewhere.md)
+-   [WHERE clause](../../../sql-reference/statements/select/where.md)
+-   [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)
+-   [INTO OUTFILE clause](../../../sql-reference/statements/select/into-outfile.md)
+-   [FORMAT clause](../../../sql-reference/statements/select/format.md)
+
+## SELECT Clause {#select-clause}
+
+[Expressions](../../../sql-reference/syntax.md#syntax-expressions) specified in the `SELECT` clause are calculated after all the operations in the clauses described above are finished. These expressions work as if they apply to separate rows in the result. If expressions in the `SELECT` clause contain aggregate functions, then ClickHouse processes aggregate functions and expressions used as their arguments during the [GROUP BY](../../../sql-reference/statements/select/group-by.md) aggregation.
+
+If you want to include all columns in the result, use the asterisk (`*`) symbol. For example, `SELECT * FROM ...`.
+
+
+### COLUMNS expression {#columns-expression}
+
+To match some columns in the result with a [re2](https://en.wikipedia.org/wiki/RE2_(software)) regular expression, you can use the `COLUMNS` expression.
+
+``` sql
+COLUMNS('regexp')
+```
+
+For example, consider the table:
+
+``` sql
+CREATE TABLE default.col_names (aa Int8, ab Int8, bc Int8) ENGINE = TinyLog
+```
+
+The following query selects data from all the columns containing the `a` symbol in their name.
+
+``` sql
+SELECT COLUMNS('a') FROM col_names
+```
+
+``` text
+┌─aa─┬─ab─┐
+│  1 │  1 │
+└────┴────┘
+```
+
+The selected columns are returned not in the alphabetical order.
+
+You can use multiple `COLUMNS` expressions in a query and apply functions to them.
+
+For example:
+
+``` sql
+SELECT COLUMNS('a'), COLUMNS('c'), toTypeName(COLUMNS('c')) FROM col_names
+```
+
+``` text
+┌─aa─┬─ab─┬─bc─┬─toTypeName(bc)─┐
+│  1 │  1 │  1 │ Int8           │
+└────┴────┴────┴────────────────┘
+```
+
+Each column returned by the `COLUMNS` expression is passed to the function as a separate argument. Also you can pass other arguments to the function if it supports them. Be careful when using functions. If a function doesn’t support the number of arguments you have passed to it, ClickHouse throws an exception.
+
+For example:
+
+``` sql
+SELECT COLUMNS('a') + COLUMNS('c') FROM col_names
+```
+
+``` text
+Received exception from server (version 19.14.1):
+Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of arguments for function plus doesn't match: passed 3, should be 2.
+```
+
+In this example, `COLUMNS('a')` returns two columns: `aa` and `ab`. `COLUMNS('c')` returns the `bc` column. The `+` operator can’t apply to 3 arguments, so ClickHouse throws an exception with the relevant message.
+
+Columns that matched the `COLUMNS` expression can have different data types. If `COLUMNS` doesn’t match any columns and is the only expression in `SELECT`, ClickHouse throws an exception.
+
+### Asterisk {#asterisk}
+
+You can put an asterisk in any part of a query instead of an expression. When the query is analyzed, the asterisk is expanded to a list of all table columns (excluding the `MATERIALIZED` and `ALIAS` columns). There are only a few cases when using an asterisk is justified:
+
+-   When creating a table dump.
+-   For tables containing just a few columns, such as system tables.
+-   For getting information about what columns are in a table. In this case, set `LIMIT 1`. But it is better to use the `DESC TABLE` query.
+-   When there is strong filtration on a small number of columns using `PREWHERE`.
+-   In subqueries (since columns that aren’t needed for the external query are excluded from subqueries).
+
+In all other cases, we don’t recommend using the asterisk, since it only gives you the drawbacks of a columnar DBMS instead of the advantages. In other words using the asterisk is not recommended.
+
+### Extreme Values {#extreme-values}
+
+In addition to results, you can also get minimum and maximum values for the results columns. To do this, set the **extremes** setting to 1. Minimums and maximums are calculated for numeric types, dates, and dates with times. For other columns, the default values are output.
+
+An extra two rows are calculated – the minimums and maximums, respectively. These extra two rows are output in `JSON*`, `TabSeparated*`, and `Pretty*` [formats](../../../interfaces/formats.md), separate from the other rows. They are not output for other formats.
+
+In `JSON*` formats, the extreme values are output in a separate ‘extremes’ field. In `TabSeparated*` formats, the row comes after the main result, and after ‘totals’ if present. It is preceded by an empty row (after the other data). In `Pretty*` formats, the row is output as a separate table after the main result, and after `totals` if present.
+
+Extreme values are calculated for rows before `LIMIT`, but after `LIMIT BY`. However, when using `LIMIT offset, size`, the rows before `offset` are included in `extremes`. In stream requests, the result may also include a small number of rows that passed through `LIMIT`.
+
+### Notes {#notes}
+
+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).
+
+## Implementation Details {#implementation-details}
+
+If the query omits the `DISTINCT`, `GROUP BY` and `ORDER BY` clauses and the `IN` and `JOIN` subqueries, the query will be completely stream processed, using O(1) amount of RAM. Otherwise, the query might consume a lot of RAM if the appropriate restrictions are not specified:
+
+-   `max_memory_usage`
+-   `max_rows_to_group_by`
+-   `max_rows_to_sort`
+-   `max_rows_in_distinct`
+-   `max_bytes_in_distinct`
+-   `max_rows_in_set`
+-   `max_bytes_in_set`
+-   `max_rows_in_join`
+-   `max_bytes_in_join`
+-   `max_bytes_before_external_sort`
+-   `max_bytes_before_external_group_by`
+
+For more information, see the section “Settings”. It is possible to use external sorting (saving temporary tables to a disk) and external aggregation.
+
+## SELECT modifiers {#select-modifiers}
+
+You can use the following modifiers in `SELECT` queries.
+
+### APPLY {#apply-modifier}
+
+Allows you to invoke some function for each row returned by an outer table expression of a query. 
+
+**Syntax:**
+
+``` sql
+SELECT <expr> APPLY( <func> ) FROM [db.]table_name
+```
+
+**Example:** 
+
+``` sql
+CREATE TABLE columns_transformers (i Int64, j Int16, k Int64) ENGINE = MergeTree ORDER by (i);
+INSERT INTO columns_transformers VALUES (100, 10, 324), (120, 8, 23);
+SELECT * APPLY(sum) FROM columns_transformers;
+```
+
+```
+┌─sum(i)─┬─sum(j)─┬─sum(k)─┐
+│    220 │     18 │    347 │
+└────────┴────────┴────────┘
+```
+
+### EXCEPT {#except-modifier}
+
+Specifies the names of one or more columns to exclude from the result. All matching column names are omitted from the output.
+
+**Syntax:**
+
+``` sql
+SELECT <expr> EXCEPT ( col_name1 [, col_name2, col_name3, ...] ) FROM [db.]table_name
+```
+
+**Example:**
+
+``` sql
+SELECT * EXCEPT (i) from columns_transformers;
+```
+
+```
+┌──j─┬───k─┐
+│ 10 │ 324 │
+│  8 │  23 │
+└────┴─────┘
+```
+
+### REPLACE {#replace-modifier}
+
+Specifies one or more [expression aliases](../../../sql-reference/syntax.md#syntax-expression_aliases). Each alias must match a column name from the `SELECT *` statement. In the output column list, the column that matches the alias is replaced by the expression in that `REPLACE`.
+
+This modifier does not change the names or order of columns. However, it can change the value and the value type.
+
+**Syntax:**
+
+``` sql
+SELECT <expr> REPLACE( <expr> AS col_name) from [db.]table_name
+```
+
+**Example:**
+
+``` sql
+SELECT * REPLACE(i + 1 AS i) from columns_transformers;
+```
+
+```
+┌───i─┬──j─┬───k─┐
+│ 101 │ 10 │ 324 │
+│ 121 │  8 │  23 │
+└─────┴────┴─────┘
+```
+
+### Modifier Combinations {#modifier-combinations}
+
+You can use each modifier separately or combine them.
+
+**Examples:**
+
+Using the same modifier multiple times.
+
+``` sql
+SELECT COLUMNS('[jk]') APPLY(toString) APPLY(length) APPLY(max) from columns_transformers;
+```
+
+```
+┌─max(length(toString(j)))─┬─max(length(toString(k)))─┐
+│                        2 │                        3 │
+└──────────────────────────┴──────────────────────────┘
+```
+
+Using multiple modifiers in a single query.
+
+``` sql
+SELECT * REPLACE(i + 1 AS i) EXCEPT (j) APPLY(sum) from columns_transformers;
+```
+
+```
+┌─sum(plus(i, 1))─┬─sum(k)─┐
+│             222 │    347 │
+└─────────────────┴────────┘
+```
+
+## SETTINGS in SELECT Query {#settings-in-select}
+
+You can specify the necessary settings right in the `SELECT` query. The setting value is applied only to this query and is reset to default or previous value after the query is executed. 
+
+Other ways to make settings see [here](../../../operations/settings/index.md). 
+
+**Example**
+
+``` sql
+SELECT * FROM some_table SETTINGS optimize_read_in_order=1, cast_keep_nullable=1;
+```
diff --git a/docs/ja/sql-reference/statements/select/offset.md b/docs/ja/sql-reference/statements/select/offset.md
new file mode 100644
index 00000000000..3efd916bcb8
--- /dev/null
+++ b/docs/ja/sql-reference/statements/select/offset.md
@@ -0,0 +1,86 @@
+---
+toc_title: OFFSET
+---
+
+# OFFSET FETCH Clause {#offset-fetch}
+
+`OFFSET` and `FETCH` allow you to retrieve data by portions. They specify a row block which you want to get by a single query.
+
+``` sql
+OFFSET offset_row_count {ROW | ROWS}] [FETCH {FIRST | NEXT} fetch_row_count {ROW | ROWS} {ONLY | WITH TIES}]
+```
+
+The `offset_row_count` or `fetch_row_count` value can be a number or a literal constant. You can omit `fetch_row_count`; by default, it equals to 1.
+
+`OFFSET` specifies the number of rows to skip before starting to return rows from the query result set.
+
+The `FETCH` specifies the maximum number of rows that can be in the result of a query.
+
+The `ONLY` option is used to return rows that immediately follow the rows omitted by the `OFFSET`. In this case the `FETCH` is an alternative to the [LIMIT](../../../sql-reference/statements/select/limit.md) clause. For example, the following query
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 1 ROW FETCH FIRST 3 ROWS ONLY;
+```
+
+is identical to the query
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a LIMIT 3 OFFSET 1;
+```
+
+The `WITH TIES` option is used to return any additional rows that tie for the last place in the result set according to the `ORDER BY` clause. For example, if `fetch_row_count` is set to 5 but two additional rows match the values of the `ORDER BY` columns in the fifth row, the result set will contain seven rows.
+
+!!! note "Note"
+    According to the standard, the `OFFSET` clause must come before the `FETCH` clause if both are present.
+    
+!!! note "Note"
+    The real offset can also depend on the [offset](../../../operations/settings/settings.md#offset) setting.
+	
+## Examples {#examples}
+
+Input table:
+
+``` text
+┌─a─┬─b─┐
+│ 1 │ 1 │
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 1 │ 3 │
+│ 5 │ 4 │
+│ 0 │ 6 │
+│ 5 │ 7 │
+└───┴───┘
+```
+
+Usage of the `ONLY` option:
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS ONLY;
+```
+
+Result:
+
+``` text
+┌─a─┬─b─┐
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 5 │ 4 │
+└───┴───┘
+```
+
+Usage of the `WITH TIES` option:
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS WITH TIES;
+```
+
+Result:
+
+``` text
+┌─a─┬─b─┐
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 5 │ 4 │
+│ 5 │ 7 │
+└───┴───┘
+```
diff --git a/docs/ru/commercial/cloud.md b/docs/ru/commercial/cloud.md
index 610f0f00a99..e00fc3be673 100644
--- a/docs/ru/commercial/cloud.md
+++ b/docs/ru/commercial/cloud.md
@@ -29,3 +29,30 @@ toc_title: "Поставщики облачных услуг ClickHouse"
 -   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, данные записываются в локальные таблицы и считываются из распределенных таблиц на разных узлах. Такая архитектура повышает отказоустойчивость кластера и гарантирует высокую доступность приложений.
+
diff --git a/docs/ru/development/architecture.md b/docs/ru/development/architecture.md
index 9f43fabba4f..d2cfc44b711 100644
--- a/docs/ru/development/architecture.md
+++ b/docs/ru/development/architecture.md
@@ -27,7 +27,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 
 `IColumn` предоставляет методы для общих реляционных преобразований данных, но они не отвечают всем потребностям. Например, `ColumnUInt64` не имеет метода для вычисления суммы двух столбцов, а `ColumnString` не имеет метода для запуска поиска по подстроке. Эти бесчисленные процедуры реализованы вне `IColumn`.
 
-Различные функции на колонках могут быть реализованы обобщенным, неэффективным путем, используя `IColumn` методы для извлечения значений `Field`, или специальным путем, используя знания о внутреннем распределение данных в памяти в конкретной реализации `IColumn`. Для этого функции приводятся к конкретному типу `IColumn` и работают напрямую с его внутренним представлением. Например, в `ColumnUInt64` есть метод getData, который возвращает ссылку на внутренний массив, чтение и заполнение которого, выполняется отдельной процедурой напрямую. Фактически, мы имеем "дырявую абстракции", обеспечивающие эффективные специализации различных процедур.
+Различные функции на колонках могут быть реализованы обобщенным, неэффективным путем, используя `IColumn` методы для извлечения значений `Field`, или специальным путем, используя знания о внутреннем распределение данных в памяти в конкретной реализации `IColumn`. Для этого функции приводятся к конкретному типу `IColumn` и работают напрямую с его внутренним представлением. Например, в `ColumnUInt64` есть метод `getData`, который возвращает ссылку на внутренний массив, чтение и заполнение которого, выполняется отдельной процедурой напрямую. Фактически, мы имеем "дырявые абстракции", обеспечивающие эффективные специализации различных процедур.
 
 ## Типы данных (Data Types) {#data_types}
 
@@ -42,7 +42,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 
 ## Блоки (Block) {#block}
 
-`Block` это контейнер, который представляет фрагмент (chunk) таблицы в памяти. Это набор троек - `(IColumn, IDataType, имя колонки)`. В процессе выполнения запроса, данные обрабатываются `Block`ами. Если у нас есть `Block`, значит у нас есть данные (в объекте `IColumn`), информация о типе (в `IDataType`), которая говорит нам, как работать с колонкой, и имя колонки (оригинальное имя колонки таблицы или служебное имя, присвоенное для получения промежуточных результатов вычислений).
+`Block` это контейнер, который представляет фрагмент (chunk) таблицы в памяти. Это набор троек - `(IColumn, IDataType, имя колонки)`. В процессе выполнения запроса, данные обрабатываются `Block`-ами. Если у нас есть `Block`, значит у нас есть данные (в объекте `IColumn`), информация о типе (в `IDataType`), которая говорит нам, как работать с колонкой, и имя колонки (оригинальное имя колонки таблицы или служебное имя, присвоенное для получения промежуточных результатов вычислений).
 
 При вычислении некоторой функции на колонках в блоке мы добавляем еще одну колонку с результатами в блок, не трогая колонки аргументов функции, потому что операции иммутабельные. Позже ненужные колонки могут быть удалены из блока, но не модифицированы. Это удобно для устранения общих подвыражений.
 
@@ -58,7 +58,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 2. Реализацию форматов данных. Например, при выводе данных в терминал в формате `Pretty`, вы создаете выходной поток блоков, который форматирует поступающие в него блоки.
 3. Трансформацию данных. Допустим, у вас есть `IBlockInputStream` и вы хотите создать отфильтрованный поток. Вы создаете `FilterBlockInputStream` и инициализируете его вашим потоком. Затем вы тянете (pull) блоки из `FilterBlockInputStream`, а он тянет блоки исходного потока, фильтрует их и возвращает отфильтрованные блоки вам. Таким образом построены конвейеры выполнения запросов.
 
-Имеются и более сложные трансформации. Например, когда вы тянете блоки из `AggregatingBlockInputStream`, он считывает все данные из своего источника, агрегирует их, и возвращает поток агрегированных данных вам. Другой пример: конструктор `UnionBlockInputStream` принимает множество источников входных данных и число потоков. Такой `Stream` работает в несколько потоков и читает данные источников параллельно. 
+Имеются и более сложные трансформации. Например, когда вы тянете блоки из `AggregatingBlockInputStream`, он считывает все данные из своего источника, агрегирует их, и возвращает поток агрегированных данных вам. Другой пример: конструктор `UnionBlockInputStream` принимает множество источников входных данных и число потоков. Такой `Stream` работает в несколько потоков и читает данные источников параллельно.
 
 > Потоки блоков используют «втягивающий» (pull) подход к управлению потоком выполнения: когда вы вытягиваете блок из первого потока, он, следовательно, вытягивает необходимые блоки из вложенных потоков, так и работает весь конвейер выполнения. Ни «pull» ни «push» не имеют явного преимущества, потому что поток управления неявный, и это ограничивает в реализации различных функций, таких как одновременное выполнение нескольких запросов (слияние нескольких конвейеров вместе). Это ограничение можно преодолеть с помощью сопрограмм (coroutines) или просто запуском дополнительных потоков, которые ждут друг друга. У нас может быть больше возможностей, если мы сделаем поток управления явным: если мы локализуем логику для передачи данных из одной расчетной единицы в другую вне этих расчетных единиц. Читайте эту [статью](http://journal.stuffwithstuff.com/2013/01/13/iteration-inside-and-out/) для углубленного изучения.
 
@@ -110,9 +110,9 @@ ClickHouse - полноценная колоночная СУБД. Данные
 > Генераторы парсеров не используются по историческим причинам.
 
 ## Интерпретаторы {#interpreters}
- 
+
 Интерпретаторы отвечают за создание конвейера выполнения запроса из `AST`. Есть простые интерпретаторы, такие как `InterpreterExistsQuery` и `InterpreterDropQuery` или более сложный `InterpreterSelectQuery`. Конвейер выполнения запроса представляет собой комбинацию входных и выходных потоков блоков. Например, результатом интерпретации `SELECT` запроса является `IBlockInputStream` для чтения результирующего набора данных; результат интерпретации `INSERT` запроса - это `IBlockOutputStream`, для записи данных, предназначенных для вставки; результат интерпретации `INSERT SELECT` запроса - это `IBlockInputStream`, который возвращает пустой результирующий набор при первом чтении, но копирует данные из `SELECT` к `INSERT`.
- 
+
 `InterpreterSelectQuery` использует `ExpressionAnalyzer` и `ExpressionActions` механизмы для анализа запросов и преобразований. Именно здесь выполняется большинство оптимизаций запросов на основе правил. `ExpressionAnalyzer` написан довольно грязно и должен быть переписан: различные преобразования запросов и оптимизации должны быть извлечены в отдельные классы, чтобы позволить модульные преобразования или запросы.
 
 ## Функции {#functions}
@@ -162,9 +162,9 @@ ClickHouse имеет сильную типизацию, поэтому нет 
 
 Сервера в кластере в основном независимы. Вы можете создать `Распределенную` (`Distributed`) таблицу на одном или всех серверах в кластере. Такая таблица сама по себе не хранит данные - она только предоставляет возможность "просмотра" всех локальных таблиц на нескольких узлах кластера. При выполнении `SELECT` распределенная таблица переписывает запрос, выбирает удаленные узлы в соответствии с настройками балансировки нагрузки и отправляет им запрос. Распределенная таблица просит удаленные сервера обработать запрос до той стадии, когда промежуточные результаты с разных серверов могут быть объединены. Затем он получает промежуточные результаты и объединяет их. Распределенная таблица пытается возложить как можно больше работы на удаленные серверы и сократить объем промежуточных данных, передаваемых по сети.
 
-Ситуация усложняется, при использовании подзапросы в случае IN или JOIN, когда каждый из них использует таблицу `Distributed`. Есть разные стратегии для выполнения таких запросов.
+Ситуация усложняется, при использовании подзапросов в случае `IN` или `JOIN`, когда каждый из них использует таблицу `Distributed`. Есть разные стратегии для выполнения таких запросов.
 
-Глобального плана выполнения распределенных запросов не существует. Каждый узел имеет собственный локальный план для своей части работы. У нас есть простое однонаправленное выполнение распределенных запросов: мы отправляем запросы на удаленные узлы и затем объединяем результаты. Но это невозможно для сложных запросов GROUP BY высокой кардинальности или запросов с большим числом временных данных в JOIN: в таких случаях нам необходимо перераспределить («reshuffle») данные между серверами, что требует дополнительной координации. ClickHouse не поддерживает выполнение запросов такого рода, и нам нужно работать над этим.
+Глобального плана выполнения распределенных запросов не существует. Каждый узел имеет собственный локальный план для своей части работы. У нас есть простое однонаправленное выполнение распределенных запросов: мы отправляем запросы на удаленные узлы и затем объединяем результаты. Но это невозможно для сложных запросов `GROUP BY` высокой кардинальности или запросов с большим числом временных данных в `JOIN`: в таких случаях нам необходимо перераспределить («reshuffle») данные между серверами, что требует дополнительной координации. ClickHouse не поддерживает выполнение запросов такого рода, и нам нужно работать над этим.
 
 ## Merge Tree {#merge-tree}
 
@@ -190,7 +190,7 @@ ClickHouse имеет сильную типизацию, поэтому нет 
 
 Репликация использует асинхронную multi-master схему. Вы можете вставить данные в любую реплику, которая имеет открытую сессию в `ZooKeeper`, и данные реплицируются на все другие реплики асинхронно. Поскольку ClickHouse не поддерживает UPDATE, репликация исключает конфликты (conflict-free replication). Поскольку подтверждение вставок кворумом не реализовано, только что вставленные данные могут быть потеряны в случае сбоя одного узла.
 
-Метаданные для репликации хранятся в `ZooKeeper`. Существует журнал репликации, в котором перечислены действия, которые необходимо выполнить. Среди этих действий: получить часть (get the part); объединить части (merge parts); удалить партицию (drop a partition) и так далее. Каждая реплика копирует журнал репликации в свою очередь, а затем выполняет действия из очереди. Например, при вставке в журнале создается действие «получить часть» (get the part), и каждая реплика загружает эту часть. Слияния координируются между репликами, чтобы получить идентичные до байта результаты. Все части объединяются одинаково на всех репликах. Одна из реплик-лидеров инициирует новое слияние кусков первой и записывает действия «слияния частей» в журнал. Несколько реплик (или все) могут быть лидерами одновременно. Реплике можно запретить быть лидером с помощью `merge_tree` настройки `replicated_can_become_leader`. 
+Метаданные для репликации хранятся в `ZooKeeper`. Существует журнал репликации, в котором перечислены действия, которые необходимо выполнить. Среди этих действий: получить часть (get the part); объединить части (merge parts); удалить партицию (drop a partition) и так далее. Каждая реплика копирует журнал репликации в свою очередь, а затем выполняет действия из очереди. Например, при вставке в журнале создается действие «получить часть» (get the part), и каждая реплика загружает эту часть. Слияния координируются между репликами, чтобы получить идентичные до байта результаты. Все части объединяются одинаково на всех репликах. Одна из реплик-лидеров инициирует новое слияние кусков первой и записывает действия «слияния частей» в журнал. Несколько реплик (или все) могут быть лидерами одновременно. Реплике можно запретить быть лидером с помощью `merge_tree` настройки `replicated_can_become_leader`.
 
 Репликация является физической: между узлами передаются только сжатые части, а не запросы. Слияния обрабатываются на каждой реплике независимо, в большинстве случаев, чтобы снизить затраты на сеть, во избежание усиления роли сети. Крупные объединенные части отправляются по сети только в случае значительной задержки репликации.
 
diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index 9ddb17b7212..463d38a44fb 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -7,15 +7,15 @@ toc_title: "Инструкция для разработчиков"
 
 Сборка ClickHouse поддерживается на Linux, FreeBSD, Mac OS X.
 
-# Если вы используете Windows {#esli-vy-ispolzuete-windows}
+## Если вы используете Windows {#esli-vy-ispolzuete-windows}
 
 Если вы используете Windows, вам потребуется создать виртуальную машину с Ubuntu. Для работы с виртуальной машиной, установите VirtualBox. Скачать Ubuntu можно на сайте: https://www.ubuntu.com/#download Создайте виртуальную машину из полученного образа. Выделите для неё не менее 4 GB оперативной памяти. Для запуска терминала в Ubuntu, найдите в меню программу со словом terminal (gnome-terminal, konsole или что-то в этом роде) или нажмите Ctrl+Alt+T.
 
-# Если вы используете 32-битную систему {#esli-vy-ispolzuete-32-bitnuiu-sistemu}
+## Если вы используете 32-битную систему {#esli-vy-ispolzuete-32-bitnuiu-sistemu}
 
 ClickHouse не работает и не собирается на 32-битных системах. Получите доступ к 64-битной системе и продолжайте.
 
-# Создание репозитория на GitHub {#sozdanie-repozitoriia-na-github}
+## Создание репозитория на GitHub {#sozdanie-repozitoriia-na-github}
 
 Для работы с репозиторием ClickHouse, вам потребуется аккаунт на GitHub. Наверное, он у вас уже есть.
 
@@ -34,7 +34,7 @@ ClickHouse не работает и не собирается на 32-битны
 
 Подробное руководство по использованию Git: https://git-scm.com/book/ru/v2
 
-# Клонирование репозитория на рабочую машину {#klonirovanie-repozitoriia-na-rabochuiu-mashinu}
+## Клонирование репозитория на рабочую машину {#klonirovanie-repozitoriia-na-rabochuiu-mashinu}
 
 Затем вам потребуется загрузить исходники для работы на свой компьютер. Это называется «клонирование репозитория», потому что создаёт на вашем компьютере локальную копию репозитория, с которой вы будете работать.
 
@@ -78,7 +78,7 @@ ClickHouse не работает и не собирается на 32-битны
 
 После этого, вы сможете добавлять в свой репозиторий обновления из репозитория Яндекса с помощью команды `git pull upstream master`.
 
-## Работа с сабмодулями Git {#rabota-s-sabmoduliami-git}
+### Работа с сабмодулями Git {#rabota-s-sabmoduliami-git}
 
 Работа с сабмодулями git может быть достаточно болезненной. Следующие команды позволят содержать их в порядке:
 
@@ -110,7 +110,7 @@ The next commands would help you to reset all submodules to the initial state (!
     git submodule foreach git submodule foreach git reset --hard
     git submodule foreach git submodule foreach git clean -xfd
 
-# Система сборки {#sistema-sborki}
+## Система сборки {#sistema-sborki}
 
 ClickHouse использует систему сборки CMake и Ninja.
 
@@ -130,25 +130,25 @@ Ninja - система запуска сборочных задач.
 
 Проверьте версию CMake: `cmake --version`. Если версия меньше 3.3, то установите новую версию с сайта https://cmake.org/download/
 
-# Необязательные внешние библиотеки {#neobiazatelnye-vneshnie-biblioteki}
+## Необязательные внешние библиотеки {#neobiazatelnye-vneshnie-biblioteki}
 
 ClickHouse использует для сборки некоторое количество внешних библиотек. Но ни одну из них не требуется отдельно устанавливать, так как они собираются вместе с ClickHouse, из исходников, которые расположены в submodules. Посмотреть набор этих библиотек можно в директории contrib.
 
-# Компилятор C++ {#kompiliator-c}
+## Компилятор C++ {#kompiliator-c}
 
-В качестве компилятора C++ поддерживается GCC начиная с версии 9 или Clang начиная с версии 8.
+В качестве компилятора C++ поддерживается Clang начиная с версии 11.
 
-Официальные сборки от Яндекса, на данный момент, используют GCC, так как он генерирует слегка более производительный машинный код (разница в среднем до нескольких процентов по нашим бенчмаркам). Clang обычно более удобен для разработки. Впрочем, наша среда continuous integration проверяет около десятка вариантов сборки.
+Впрочем, наша среда continuous integration проверяет около десятка вариантов сборки, включая gcc, но сборка с помощью gcc непригодна для использования в продакшене.
 
-Для установки GCC под Ubuntu, выполните: `sudo apt install gcc g++`.
+On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
-Проверьте версию gcc: `gcc --version`. Если версия меньше 10, то следуйте инструкции: https://clickhouse.tech/docs/ru/development/build/#install-gcc-10.
+```bash
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+```
 
 Сборка под Mac OS X поддерживается только для компилятора Clang. Чтобы установить его выполните `brew install llvm`
 
-Если вы решили использовать Clang, вы также можете установить `libc++` и `lld`, если вы знаете, что это такое. При желании, установите `ccache`.
-
-# Процесс сборки {#protsess-sborki}
+## Процесс сборки {#protsess-sborki}
 
 Теперь вы готовы к сборке ClickHouse. Для размещения собранных файлов, рекомендуется создать отдельную директорию build внутри директории ClickHouse:
 
@@ -158,14 +158,7 @@ ClickHouse использует для сборки некоторое коли
 Вы можете иметь несколько разных директорий (build_release, build_debug) для разных вариантов сборки.
 
 Находясь в директории build, выполните конфигурацию сборки с помощью CMake.
-Перед первым запуском необходимо выставить переменные окружения, отвечающие за выбор компилятора (в данном примере это - gcc версии 9).
-
-Linux:
-
-    export CC=gcc-10 CXX=g++-10
-    cmake ..
-
-Mac OS X:
+Перед первым запуском необходимо выставить переменные окружения, отвечающие за выбор компилятора.
 
     export CC=clang CXX=clang++
     cmake ..
@@ -206,7 +199,7 @@ Mac OS X:
 
     ls -l programs/clickhouse
 
-# Запуск собранной версии ClickHouse {#zapusk-sobrannoi-versii-clickhouse}
+## Запуск собранной версии ClickHouse {#zapusk-sobrannoi-versii-clickhouse}
 
 Для запуска сервера из под текущего пользователя, с выводом логов в терминал и с использованием примеров конфигурационных файлов, расположенных в исходниках, перейдите в директорию `ClickHouse/programs/server/` (эта директория находится не в директории build) и выполните:
 
@@ -233,7 +226,7 @@ Mac OS X:
     sudo service clickhouse-server stop
     sudo -u clickhouse ClickHouse/build/programs/clickhouse server --config-file /etc/clickhouse-server/config.xml
 
-# Среда разработки {#sreda-razrabotki}
+## Среда разработки {#sreda-razrabotki}
 
 Если вы не знаете, какую среду разработки использовать, то рекомендуется использовать CLion. CLion является платным ПО, но его можно использовать бесплатно в течение пробного периода. Также он бесплатен для учащихся. CLion можно использовать как под Linux, так и под Mac OS X.
 
@@ -243,7 +236,7 @@ Mac OS X:
 
 На всякий случай заметим, что CLion самостоятельно создаёт свою build директорию, самостоятельно выбирает тип сборки debug по-умолчанию, для конфигурации использует встроенную в CLion версию CMake вместо установленного вами, а для запуска задач использует make вместо ninja. Это нормально, просто имейте это ввиду, чтобы не возникало путаницы.
 
-# Написание кода {#napisanie-koda}
+## Написание кода {#napisanie-koda}
 
 Описание архитектуры ClickHouse: https://clickhouse.tech/docs/ru/development/architecture/
 
@@ -253,7 +246,7 @@ Mac OS X:
 
 Список задач: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
-# Тестовые данные {#testovye-dannye}
+## Тестовые данные {#testovye-dannye}
 
 Разработка ClickHouse часто требует загрузки реалистичных наборов данных. Особенно это важно для тестирования производительности. Специально для вас мы подготовили набор данных, представляющий собой анонимизированные данные Яндекс.Метрики. Загрузка этих данных потребует ещё 3 GB места на диске. Для выполнения большинства задач разработки, загружать эти данные не обязательно.
 
@@ -274,7 +267,7 @@ Mac OS X:
     clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.hits FORMAT TSV" < hits_v1.tsv
     clickhouse-client --max_insert_block_size 100000 --query "INSERT INTO test.visits FORMAT TSV" < visits_v1.tsv
 
-# Создание Pull Request {#sozdanie-pull-request}
+## Создание Pull Request {#sozdanie-pull-request}
 
 Откройте свой форк репозитория в интерфейсе GitHub. Если вы вели разработку в бранче, выберите этот бранч. На странице будет доступна кнопка «Pull request». По сути, это означает «создать заявку на принятие моих изменений в основной репозиторий».
 
diff --git a/docs/ru/development/style.md b/docs/ru/development/style.md
index f08ecc3c4c7..de29e629ceb 100644
--- a/docs/ru/development/style.md
+++ b/docs/ru/development/style.md
@@ -747,7 +747,7 @@ The dictionary is configured incorrectly.
 Есть два основных варианта проверки на такие ошибки:
 
 * Исключение с кодом `LOGICAL_ERROR`. Его можно использовать для важных проверок, которые делаются в том числе в релизной сборке.
-* `assert`. Такие условия не проверяются в релизной сборке, можно использовать для тяжёлых и опциональных проверок.	
+* `assert`. Такие условия не проверяются в релизной сборке, можно использовать для тяжёлых и опциональных проверок.
 
 Пример сообщения, у которого должен быть код `LOGICAL_ERROR`:
 `Block header is inconsistent with Chunk in ICompicatedProcessor::munge(). It is a bug!`
@@ -780,7 +780,7 @@ The dictionary is configured incorrectly.
 
 **2.** Язык - C++20 (см. список доступных [C++20 фич](https://en.cppreference.com/w/cpp/compiler_support#C.2B.2B20_features)).
 
-**3.** Компилятор - `gcc`. На данный момент (август 2020), код собирается версией 9.3. (Также код может быть собран `clang` версий 10 и 9)
+**3.** Компилятор - `clang`. На данный момент (апрель 2021), код собирается версией 11. (Также код может быть собран `gcc` версии 10, но такая сборка не тестируется и непригодна для продакшена).
 
 Используется стандартная библиотека (реализация `libc++`).
 
diff --git a/docs/ru/engines/database-engines/atomic.md b/docs/ru/engines/database-engines/atomic.md
index a371301fd2e..8c75be3d93b 100644
--- a/docs/ru/engines/database-engines/atomic.md
+++ b/docs/ru/engines/database-engines/atomic.md
@@ -3,15 +3,52 @@ 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 t](#exchange-tables). Движок `Atomic` используется по умолчанию.
 
 ## Создание БД {#creating-a-database}
 
-```sql
-CREATE DATABASE test ENGINE = Atomic;
+``` sql
+    CREATE DATABASE test[ ENGINE = Atomic];
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/database-engines/atomic/) <!--hide-->
+## Особенности и рекомендации {#specifics-and-recommendations}
+
+### 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 в момент создания таблицы (однако это не рекомендуется). Для отображения UUID в запросе `SHOW CREATE` вы можете использовать настройку [show_table_uuid_in_table_create_query_if_not_nil](../../operations/settings/settings.md#show_table_uuid_in_table_create_query_if_not_nil). Результат выполнения в таком случае будет иметь вид:
+
+```sql
+CREATE TABLE name UUID '28f1c61c-2970-457a-bffe-454156ddcfef' (n UInt64) ENGINE = ...;
+```
+### RENAME TABLE {#rename-table}
+
+Запросы `RENAME` выполняются без изменения 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` меняет местами две таблицы атомарно. Вместо неатомарной операции:
+
+```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 и имя реплики. В этом случае будут использоваться параметры конфигурации: [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/ru/engines/table-engines/index.md b/docs/ru/engines/table-engines/index.md
index a364a3cb972..b17b2124250 100644
--- a/docs/ru/engines/table-engines/index.md
+++ b/docs/ru/engines/table-engines/index.md
@@ -48,6 +48,14 @@ toc_title: "Введение"
 
 Движки семейства:
 
+-   [Kafka](integrations/kafka.md#kafka)
+-   [MySQL](integrations/mysql.md#mysql)
+-   [ODBC](integrations/odbc.md#table-engine-odbc)
+-   [JDBC](integrations/jdbc.md#table-engine-jdbc)
+-   [S3](integrations/s3.md#table-engine-s3)
+
+### Специальные движки {#spetsialnye-dvizhki}
+
 -   [ODBC](../../engines/table-engines/integrations/odbc.md)
 -   [JDBC](../../engines/table-engines/integrations/jdbc.md)
 -   [MySQL](../../engines/table-engines/integrations/mysql.md)
@@ -84,4 +92,3 @@ toc_title: "Введение"
 Чтобы получить данные из виртуального столбца, необходимо указать его название в запросе `SELECT`. `SELECT *` не отображает данные из виртуальных столбцов.
 
 При создании таблицы со столбцом, имя которого совпадает с именем одного из виртуальных столбцов таблицы, виртуальный столбец становится недоступным. Не делайте так. Чтобы помочь избежать конфликтов, имена виртуальных столбцов обычно предваряются подчеркиванием.
-
diff --git a/docs/ru/engines/table-engines/integrations/hdfs.md b/docs/ru/engines/table-engines/integrations/hdfs.md
index b56bbfc0788..c96ac12cd2a 100644
--- a/docs/ru/engines/table-engines/integrations/hdfs.md
+++ b/docs/ru/engines/table-engines/integrations/hdfs.md
@@ -183,7 +183,7 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 #### Ограничения {#limitations}
   * hadoop\_security\_kerberos\_ticket\_cache\_path могут быть определены только на глобальном уровне
 
-## Поддержика Kerberos {#kerberos-support}
+## Поддержка Kerberos {#kerberos-support}
 
 Если hadoop\_security\_authentication параметр имеет значение 'kerberos', ClickHouse аутентифицируется с помощью Kerberos.
 [Расширенные параметры](#clickhouse-extras) и hadoop\_security\_kerberos\_ticket\_cache\_path помогают сделать это.
diff --git a/docs/ru/engines/table-engines/integrations/postgresql.md b/docs/ru/engines/table-engines/integrations/postgresql.md
index 8964b1dbf02..cb8e38ae5c9 100644
--- a/docs/ru/engines/table-engines/integrations/postgresql.md
+++ b/docs/ru/engines/table-engines/integrations/postgresql.md
@@ -22,7 +22,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Структура таблицы может отличаться от исходной структуры таблицы PostgreSQL:
 
--   Имена столбцов должны быть такими же, как в исходной таблице MySQL, но вы можете использовать только некоторые из этих столбцов и в любом порядке.
+-   Имена столбцов должны быть такими же, как в исходной таблице PostgreSQL, но вы можете использовать только некоторые из этих столбцов и в любом порядке.
 -   Типы столбцов могут отличаться от типов в исходной таблице PostgreSQL. ClickHouse пытается [приводить](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) values to the ClickHouse data types.
 -   Настройка `external_table_functions_use_nulls` определяет как обрабатывать Nullable столбцы. По умолчанию 1, если 0 - табличная функция не будет делать nullable столбцы и будет вместо null выставлять значения по умолчанию для скалярного типа. Это также применимо для null значений внутри массивов.
 
@@ -94,10 +94,10 @@ postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
 INSERT 0 1
 
 postgresql> SELECT * FROM test;
- int_id | int_nullable | float | str  | float_nullable
---------+--------------+-------+------+----------------
-      1 |              |     2 | test |
-(1 row)
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
+ (1 row)
 ```
 
 Таблица в ClickHouse, получение данных из PostgreSQL таблицы, созданной выше:
diff --git a/docs/ru/engines/table-engines/integrations/s3.md b/docs/ru/engines/table-engines/integrations/s3.md
index fa10e8ebc34..177d69dc3e0 100644
--- a/docs/ru/engines/table-engines/integrations/s3.md
+++ b/docs/ru/engines/table-engines/integrations/s3.md
@@ -11,21 +11,21 @@ toc_title: S3
 
 ``` sql
 CREATE TABLE s3_engine_table (name String, value UInt32) 
-ENGINE = S3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compression])
+ENGINE = S3(path, [aws_access_key_id, aws_secret_access_key,] format, [compression])
 ```
 
 **Параметры движка**
 
 -   `path` — URL-адрес бакета с указанием пути к файлу. Поддерживает следующие подстановочные знаки в режиме "только чтение": `*`, `?`, `{abc,def}` и `{N..M}` где `N`, `M` — числа, `'abc'`, `'def'` — строки. Подробнее смотри [ниже](#wildcards-in-path).
 -   `format` — [формат](../../../interfaces/formats.md#formats) файла.
--   `structure` — структура таблицы в формате `'column1_name column1_type, column2_name column2_type, ...'`.
--   `compression` — тип сжатия. Возможные значения: none, gzip/gz, brotli/br, xz/LZMA, zstd/zst. Необязательный параметр. Если не указано, то тип сжатия определяется автоматически по расширению файла. 
+-   `aws_access_key_id`, `aws_secret_access_key` - данные пользователя учетной записи [AWS](https://aws.amazon.com/ru/). Вы можете использовать их для аутентификации ваших запросов. Необязательный параметр. Если параметры учетной записи не указаны, то используются данные из конфигурационного файла. Смотрите подробнее [Использование сервиса S3 для хранения данных](../mergetree-family/mergetree.md#table_engine-mergetree-s3).
+-   `compression` — тип сжатия. Возможные значения: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Необязательный параметр. Если не указано, то тип сжатия определяется автоматически по расширению файла. 
 
 **Пример**
 
 ``` sql
 CREATE TABLE s3_engine_table (name String, value UInt32) 
-ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip');
+ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/test-data.csv.gz', 'CSV', 'gzip');
 INSERT INTO s3_engine_table VALUES ('one', 1), ('two', 2), ('three', 3);
 SELECT * FROM s3_engine_table LIMIT 2;
 ```
@@ -73,17 +73,19 @@ SELECT * FROM s3_engine_table LIMIT 2;
 
 Соображение безопасности: если злонамеренный пользователь попробует указать произвольные URL-адреса S3, параметр `s3_max_redirects` должен быть установлен в ноль, чтобы избежать атак [SSRF] (https://en.wikipedia.org/wiki/Server-side_request_forgery). Как альтернатива, в конфигурации сервера должен быть указан `remote_host_filter`.
 
-## Настройки конечных точек {#endpoint-settings}
+## Настройки точки приема запроса {#endpoint-settings}
 
-Для конечной точки (которая соответствует точному префиксу URL-адреса) в конфигурационном файле могут быть заданы следующие настройки:
+Для точки приема запроса (которая соответствует точному префиксу URL-адреса) в конфигурационном файле могут быть заданы следующие настройки:
 
 Обязательная настройка:
--   `endpoint` — указывает префикс конечной точки. 
+-   `endpoint` — указывает префикс точки приема запроса. 
 
 Необязательные настройки:
--   `access_key_id` и `secret_access_key` — указывают учетные данные для использования с данной конечной точкой.
--   `use_environment_credentials` — если `true`, S3-клиент будет пытаться получить учетные данные из переменных среды и метаданных Amazon EC2 для данной конечной точки. Значение по умолчанию - `false`.
--   `header` — добавляет указанный HTTP-заголовок к запросу на заданную конечную точку. Может быть определен несколько раз.
+-   `access_key_id` и `secret_access_key` — указывают учетные данные для использования с данной точкой приема запроса.
+-   `use_environment_credentials` — если `true`, S3-клиент будет пытаться получить учетные данные из переменных среды и метаданных [Amazon EC2](https://ru.wikipedia.org/wiki/Amazon_EC2) для данной точки приема запроса. Значение по умолчанию — `false`.
+-   `use_insecure_imds_request` — признак использования менее безопасного соединения при выполнении запроса к IMDS при получении учётных данных из метаданных Amazon EC2. Значение по умолчанию — `false`.
+-   `region` — название региона S3.
+-   `header` — добавляет указанный HTTP-заголовок к запросу на заданную точку приема запроса. Может быть определен несколько раз.
 -   `server_side_encryption_customer_key_base64` — устанавливает необходимые заголовки для доступа к объектам S3 с шифрованием SSE-C. 
 
 **Пример**
@@ -94,7 +96,9 @@ SELECT * FROM s3_engine_table LIMIT 2;
         <endpoint>https://storage.yandexcloud.net/my-test-bucket-768/</endpoint>
         <!-- <access_key_id>ACCESS_KEY_ID</access_key_id> -->
         <!-- <secret_access_key>SECRET_ACCESS_KEY</secret_access_key> -->
+        <!-- <region>us-west-1</region> -->
         <!-- <use_environment_credentials>false</use_environment_credentials> -->
+		<!-- <use_insecure_imds_request>false</use_insecure_imds_request> -->
         <!-- <header>Authorization: Bearer SOME-TOKEN</header> -->
         <!-- <server_side_encryption_customer_key_base64>BASE64-ENCODED-KEY</server_side_encryption_customer_key_base64> -->
     </endpoint-name>
@@ -103,7 +107,7 @@ SELECT * FROM s3_engine_table LIMIT 2;
 
 ## Примеры использования {#usage-examples}
 
-Предположим, у нас есть несколько файлов в формате TSV со следующими URL-адресами в HDFS:
+Предположим, у нас есть несколько файлов в формате TSV со следующими URL-адресами в 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'
@@ -133,8 +137,7 @@ CREATE TABLE table_with_asterisk (name String, value UInt32)
 ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/*', 'CSV');
 ```
 
-!!! warning "Warning"
-    Если список файлов содержит диапазоны чисел с ведущими нулями, используйте конструкцию с фигурными скобками для каждой цифры отдельно или используйте `?`.
+Если список файлов содержит диапазоны чисел с ведущими нулями, используйте конструкцию с фигурными скобками для каждой цифры отдельно или используйте `?`.
 
 4. Создание таблицы из файлов с именами `file-000.csv`, `file-001.csv`, … , `file-999.csv`:
 
@@ -142,9 +145,7 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_p
 CREATE TABLE big_table (name String, value UInt32) 
 ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-{000..999}.csv', 'CSV');
 ```
+
 **Смотрите также**
 
 -  [Табличная функция S3](../../../sql-reference/table-functions/s3.md)
-
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/s3/) <!--hide-->
-
diff --git a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 9a09618e508..4f0206158f1 100644
--- a/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/ru/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -34,6 +34,8 @@ ORDER BY (CounterID, StartDate, intHash32(UserID));
 
 В этом примере задано партиционирование по типам событий, произошедших в течение текущей недели.
 
+По умолчанию, ключ партиционирования с плавающей запятой не поддерживается. Чтобы использовать его, включите настройку [allow_floating_point_partition_key](../../../operations/settings/merge-tree-settings.md#allow_floating_point_partition_key).
+
 Каждая партиция состоит из отдельных фрагментов или так называемых *кусков данных*. Каждый кусок отсортирован по первичному ключу. При вставке данных в таблицу каждая отдельная запись сохраняется в виде отдельного куска. Через некоторое время после вставки (обычно до 10 минут), ClickHouse выполняет в фоновом режиме слияние данных — в результате куски для одной и той же партиции будут объединены в более крупный кусок.
 
 !!! info "Info"
diff --git a/docs/ru/engines/table-engines/mergetree-family/mergetree.md b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
index 7d7641a417d..4cff6fcfb80 100644
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@@ -727,6 +727,7 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
             <endpoint>https://storage.yandexcloud.net/my-bucket/root-path/</endpoint>
             <access_key_id>your_access_key_id</access_key_id>
             <secret_access_key>your_secret_access_key</secret_access_key>
+            <region></region>
             <proxy>
                 <uri>http://proxy1</uri>
                 <uri>http://proxy2</uri>
@@ -753,7 +754,9 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 
 Необязательные параметры:   
 
--   `use_environment_credentials` — признак, нужно ли считывать учетные данные AWS из переменных окружения `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` и `AWS_SESSION_TOKEN`, если они есть. Значение по умолчанию: `false`.
+-   `region` — название региона S3.
+-   `use_environment_credentials` — признак, нужно ли считывать учетные данные AWS из сетевого окружения, а также из переменных окружения `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` и `AWS_SESSION_TOKEN`, если они есть. Значение по умолчанию: `false`.
+-   `use_insecure_imds_request` — признак, нужно ли использовать менее безопасное соединение при выполнении запроса к IMDS при получении учётных данных из метаданных Amazon EC2. Значение по умолчанию: `false`.
 -   `proxy` — конфигурация прокси-сервера для конечной точки S3. Каждый элемент `uri` внутри блока `proxy` должен содержать URL прокси-сервера. 
 -   `connect_timeout_ms` — таймаут подключения к сокету в миллисекундах. Значение по умолчанию: 10 секунд. 
 -   `request_timeout_ms` — таймаут выполнения запроса в миллисекундах. Значение по умолчанию: 5 секунд. 
diff --git a/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
index ec0b339e8c9..ebd7875179d 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -33,11 +33,11 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 **Параметры ReplacingMergeTree**
 
--   `ver` — столбец с версией, тип `UInt*`, `Date` или `DateTime`. Необязательный параметр.
+-   `ver` — столбец с номером версии. Тип `UInt*`, `Date`, `DateTime` или `DateTime64`. Необязательный параметр.
 
     При слиянии `ReplacingMergeTree` оставляет только строку для каждого уникального ключа сортировки:
 
-    - Последнюю в выборке, если `ver` не задан. Под выборкой здесь понимается набор строк в наборе партов, участвующих в слиянии. Последний по времени создания парт (последний инсерт) будет последним в выборке. Таким образом, после дедупликации для каждого значения ключа сортировки останется самая последняя строка из самого последнего инсерта.
+    - Последнюю в выборке, если `ver` не задан. Под выборкой здесь понимается набор строк в наборе кусков данных, участвующих в слиянии. Последний по времени создания кусок (последняя вставка) будет последним в выборке. Таким образом, после дедупликации для каждого значения ключа сортировки останется самая последняя строка из самой последней вставки.
     - С максимальной версией, если `ver` задан.
 
 **Секции запроса**
@@ -62,7 +62,6 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Все параметры, кроме `ver` имеют то же значение, что в и `MergeTree`.
 
--   `ver` — столбец с версией. Необязательный параметр. Описание смотрите выше по тексту.
+-   `ver` — столбец с номером версии. Необязательный параметр. Описание смотрите выше по тексту.
 
 </details>
-
diff --git a/docs/ru/engines/table-engines/mergetree-family/replication.md b/docs/ru/engines/table-engines/mergetree-family/replication.md
index 848adbee4da..cb92084695a 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@@ -65,6 +65,8 @@ ClickHouse хранит метаинформацию о репликах в [Apa
 
 Репликация асинхронная, мульти-мастер. Запросы `INSERT` и `ALTER` можно направлять на любой доступный сервер. Данные вставятся на сервер, где выполнен запрос, а затем скопируются на остальные серверы. В связи с асинхронностью, только что вставленные данные появляются на остальных репликах с небольшой задержкой. Если часть реплик недоступна, данные на них запишутся тогда, когда они станут доступны. Если реплика доступна, то задержка составляет столько времени, сколько требуется для передачи блока сжатых данных по сети. Количество потоков для выполнения фоновых задач можно задать с помощью настройки [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size).
 
+Движок `ReplicatedMergeTree` использует отдельный пул потоков для скачивания кусков данных. Размер пула ограничен настройкой [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size), которую можно указать при перезапуске сервера. 
+
 По умолчанию, запрос INSERT ждёт подтверждения записи только от одной реплики. Если данные были успешно записаны только на одну реплику, и сервер с этой репликой перестал существовать, то записанные данные будут потеряны. Вы можете включить подтверждение записи от нескольких реплик, используя настройку `insert_quorum`.
 
 Каждый блок данных записывается атомарно. Запрос INSERT разбивается на блоки данных размером до `max_insert_block_size = 1048576` строк. То есть, если в запросе `INSERT` менее 1048576 строк, то он делается атомарно.
@@ -249,5 +251,6 @@ $ 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)
 
diff --git a/docs/ru/engines/table-engines/special/dictionary.md b/docs/ru/engines/table-engines/special/dictionary.md
index 243fd5395c0..15d32419472 100644
--- a/docs/ru/engines/table-engines/special/dictionary.md
+++ b/docs/ru/engines/table-engines/special/dictionary.md
@@ -90,3 +90,6 @@ select * from products limit 1;
 └───────────────┴─────────────────┘
 ```
 
+**Смотрите также**
+
+-   [Функция dictionary](../../../sql-reference/table-functions/dictionary.md#dictionary-function)
diff --git a/docs/ru/getting-started/example-datasets/cell-towers.md b/docs/ru/getting-started/example-datasets/cell-towers.md
new file mode 100644
index 00000000000..a5524248019
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/cell-towers.md
@@ -0,0 +1,128 @@
+---
+toc_priority: 21
+toc_title: Вышки сотовой связи
+---
+
+# Вышки сотовой связи {#cell-towers}
+
+Источник этого набора данных (dataset) - самая большая в мире открытая база данных о сотовых вышках - [OpenCellid](https://www.opencellid.org/). К 2021-му году здесь накопилось более, чем 40 миллионов записей о сотовых вышках (GSM, LTE, UMTS, и т.д.) по всему миру с их географическими координатами и метаданными (код страны, сети, и т.д.).
+
+OpenCelliD Project имеет лицензию Creative Commons Attribution-ShareAlike 4.0 International License, и мы распространяем снэпшот набора данных по условиям этой же лицензии. После авторизации можно загрузить последнюю версию набора данных.
+
+## Как получить набор данных {#get-the-dataset}
+
+1. Загрузите снэпшот набора данных за февраль 2021 [отсюда](https://datasets.clickhouse.tech/cell_towers.csv.xz) (729 MB).
+
+2. Если нужно, проверьте полноту и целостность при помощи команды:
+
+```
+md5sum cell_towers.csv.xz
+8cf986f4a0d9f12c6f384a0e9192c908  cell_towers.csv.xz
+```
+
+3. Распакуйте набор данных при помощи команды:
+
+```
+xz -d cell_towers.csv.xz
+```
+
+4. Создайте таблицу:
+
+```
+CREATE TABLE cell_towers
+(
+    radio Enum8('' = 0, 'CDMA' = 1, 'GSM' = 2, 'LTE' = 3, 'NR' = 4, 'UMTS' = 5),
+    mcc UInt16,
+    net UInt16,
+    area UInt16,
+    cell UInt64,
+    unit Int16,
+    lon Float64,
+    lat Float64,
+    range UInt32,
+    samples UInt32,
+    changeable UInt8,
+    created DateTime,
+    updated DateTime,
+    averageSignal UInt8
+)
+ENGINE = MergeTree ORDER BY (radio, mcc, net, created);
+```
+
+5. Вставьте данные:
+```
+clickhouse-client --query "INSERT INTO cell_towers FORMAT CSVWithNames" < cell_towers.csv
+```
+
+## Примеры {#examples}
+
+1. Количество вышек по типам:
+
+```
+SELECT radio, count() AS c FROM cell_towers GROUP BY radio ORDER BY c DESC
+
+┌─radio─┬────────c─┐
+│ UMTS  │ 20686487 │
+│ LTE   │ 12101148 │
+│ GSM   │  9931312 │
+│ CDMA  │   556344 │
+│ NR    │      867 │
+└───────┴──────────┘
+
+5 rows in set. Elapsed: 0.011 sec. Processed 43.28 million rows, 43.28 MB (3.83 billion rows/s., 3.83 GB/s.)
+```
+
+2. Количество вышек по [мобильному коду страны (MCC)](https://ru.wikipedia.org/wiki/Mobile_Country_Code):
+
+```
+SELECT mcc, count() FROM cell_towers GROUP BY mcc ORDER BY count() DESC LIMIT 10
+
+┌─mcc─┬─count()─┐
+│ 310 │ 5024650 │
+│ 262 │ 2622423 │
+│ 250 │ 1953176 │
+│ 208 │ 1891187 │
+│ 724 │ 1836150 │
+│ 404 │ 1729151 │
+│ 234 │ 1618924 │
+│ 510 │ 1353998 │
+│ 440 │ 1343355 │
+│ 311 │ 1332798 │
+└─────┴─────────┘
+
+10 rows in set. Elapsed: 0.019 sec. Processed 43.28 million rows, 86.55 MB (2.33 billion rows/s., 4.65 GB/s.)
+```
+
+Можно увидеть, что по количеству вышек лидируют следующие страны: США, Германия, Россия.
+
+Вы также можете создать [внешний словарь](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) в ClickHouse для того, чтобы расшифровать эти значения.
+
+## Пример использования {#use-case}
+
+Рассмотрим применение функции `pointInPolygon`.
+
+1. Создаем таблицу, в которой будем хранить многоугольники:
+
+```
+CREATE TEMPORARY TABLE moscow (polygon Array(Tuple(Float64, Float64)));
+```
+
+2. Очертания Москвы выглядят приблизительно так ("Новая Москва" в них не включена):
+
+```
+INSERT INTO moscow VALUES ([(37.84172564285271, 55.78000432402266), (37.8381207618713, 55.775874525970494), (37.83979446823122, 55.775626746008065), (37.84243326983639, 55.77446586811748), (37.84262672750849, 55.771974101091104), (37.84153238623039, 55.77114545193181), (37.841124690460184, 55.76722010265554), (37.84239076983644, 55.76654891107098), (37.842283558197025, 55.76258709833121), (37.8421759312134, 55.758073999993734), (37.84198330422974, 55.75381499999371), (37.8416827275085, 55.749277102484484), (37.84157576190186, 55.74794544108413), (37.83897929098507, 55.74525257875241), (37.83739676451868, 55.74404373042019), (37.838732481460525, 55.74298009816793), (37.841183997352545, 55.743060321833575), (37.84097476190185, 55.73938799999373), (37.84048155819702, 55.73570799999372), (37.840095812164286, 55.73228210777237), (37.83983814285274, 55.73080491981639), (37.83846476321406, 55.729799917464675), (37.83835745269769, 55.72919751082619), (37.838636380279524, 55.72859509486539), (37.8395161005249, 55.727705075632784), (37.83897964285276, 55.722727886185154), (37.83862557539366, 55.72034817326636), (37.83559735744853, 55.71944437307499), (37.835370708803126, 55.71831419154461), (37.83738169402022, 55.71765218986692), (37.83823396494291, 55.71691750159089), (37.838056931213345, 55.71547311301385), (37.836812846557606, 55.71221445615604), (37.83522525396725, 55.709331054395555), (37.83269301586908, 55.70953687463627), (37.829667367706236, 55.70903403789297), (37.83311126588435, 55.70552351822608), (37.83058993121339, 55.70041317726053), (37.82983872750851, 55.69883771404813), (37.82934501586913, 55.69718947487017), (37.828926414016685, 55.69504441658371), (37.82876530422971, 55.69287499999378), (37.82894754100031, 55.690759754047335), (37.827697554878185, 55.68951421135665), (37.82447346292115, 55.68965045405069), (37.83136543914793, 55.68322046195302), (37.833554015869154, 55.67814012759211), (37.83544184655761, 55.67295011628339), (37.837480388885474, 55.6672498719639), (37.838960677246064, 55.66316274139358), (37.83926093121332, 55.66046999999383), (37.839025050262435, 55.65869897264431), (37.83670784390257, 55.65794084879904), (37.835656529083245, 55.65694309303843), (37.83704060449217, 55.65689306460552), (37.83696819873806, 55.65550363526252), (37.83760389616388, 55.65487847246661), (37.83687972750851, 55.65356745541324), (37.83515216004943, 55.65155951234079), (37.83312418518067, 55.64979413590619), (37.82801726983639, 55.64640836412121), (37.820614174591, 55.64164525405531), (37.818908190475426, 55.6421883258084), (37.81717543386075, 55.64112490388471), (37.81690987037274, 55.63916106913107), (37.815099354492155, 55.637925371757085), (37.808769150787356, 55.633798276884455), (37.80100123544311, 55.62873670012244), (37.79598013491824, 55.62554336109055), (37.78634567724606, 55.62033499605651), (37.78334147619623, 55.618768681480326), (37.77746201055901, 55.619855533402706), (37.77527329626457, 55.61909966711279), (37.77801986242668, 55.618770300976294), (37.778212973541216, 55.617257701952106), (37.77784818518065, 55.61574504433011), (37.77016867724609, 55.61148576294007), (37.760191219573976, 55.60599579539028), (37.75338926983641, 55.60227892751446), (37.746329965606634, 55.59920577639331), (37.73939925396728, 55.59631430313617), (37.73273665739439, 55.5935318803559), (37.7299954450912, 55.59350760316188), (37.7268679946899, 55.59469840523759), (37.72626726983634, 55.59229549697373), (37.7262673598022, 55.59081598950582), (37.71897193121335, 55.5877595845419), (37.70871550793456, 55.58393177431724), (37.700497489410374, 55.580917323756644), (37.69204305026244, 55.57778089778455), (37.68544477378839, 55.57815154690915), (37.68391050793454, 55.57472945079756), (37.678803592590306, 55.57328235936491), (37.6743402539673, 55.57255251445782), (37.66813862698363, 55.57216388774464), (37.617927457672096, 55.57505691895805), (37.60443099999999, 55.5757737568051), (37.599683515869145, 55.57749105910326), (37.59754177842709, 55.57796291823627), (37.59625834786988, 55.57906686095235), (37.59501783265684, 55.57746616444403), (37.593090671936025, 55.57671634534502), (37.587018007904, 55.577944600233785), (37.578692203704804, 55.57982895000019), (37.57327546607398, 55.58116294118248), (37.57385012109279, 55.581550362779), (37.57399562266922, 55.5820107079112), (37.5735356072979, 55.58226289171689), (37.57290393054962, 55.582393529795155), (37.57037722355653, 55.581919415056234), (37.5592298306885, 55.584471614867844), (37.54189249206543, 55.58867650795186), (37.5297256269836, 55.59158133551745), (37.517837865081766, 55.59443656218868), (37.51200186508174, 55.59635625174229), (37.506808949737554, 55.59907823904434), (37.49820432275389, 55.6062944994944), (37.494406071441674, 55.60967103463367), (37.494760001358024, 55.61066689753365), (37.49397137107085, 55.61220931698269), (37.49016528606031, 55.613417718449064), (37.48773249206542, 55.61530616333343), (37.47921386508177, 55.622640129112334), (37.470652153442394, 55.62993723476164), (37.46273446298218, 55.6368075123157), (37.46350692265317, 55.64068225239439), (37.46050283203121, 55.640794546982576), (37.457627470916734, 55.64118904154646), (37.450718034393326, 55.64690488145138), (37.44239252645875, 55.65397824729769), (37.434587576721185, 55.66053543155961), (37.43582144975277, 55.661693766520735), (37.43576786245721, 55.662755031737014), (37.430982915344174, 55.664610641628116), (37.428547447097685, 55.66778515273695), (37.42945134592044, 55.668633314343566), (37.42859571562949, 55.66948145750025), (37.4262836402282, 55.670813882451405), (37.418709037048295, 55.6811141674414), (37.41922139651101, 55.68235377885389), (37.419218771842885, 55.68359335082235), (37.417196501327446, 55.684375235224735), (37.41607020370478, 55.68540557585352), (37.415640857147146, 55.68686637150793), (37.414632153442334, 55.68903015131686), (37.413344899475064, 55.690896881757396), (37.41171432275391, 55.69264232162232), (37.40948282275393, 55.69455101638112), (37.40703674603271, 55.69638690385348), (37.39607169577025, 55.70451821283731), (37.38952706878662, 55.70942491932811), (37.387778313491815, 55.71149057784176), (37.39049275399779, 55.71419814298992), (37.385557272491454, 55.7155489617061), (37.38388335714726, 55.71849856042102), (37.378368238098155, 55.7292763261685), (37.37763597123337, 55.730845879211614), (37.37890062088197, 55.73167906388319), (37.37750451918789, 55.734703664681774), (37.375610832015965, 55.734851959522246), (37.3723813571472, 55.74105626086403), (37.37014935714723, 55.746115620904355), (37.36944173016362, 55.750883999993725), (37.36975304365541, 55.76335905525834), (37.37244070571134, 55.76432079697595), (37.3724259757175, 55.76636979670426), (37.369922155757884, 55.76735417953104), (37.369892695770275, 55.76823419316575), (37.370214730163575, 55.782312184391266), (37.370493611114505, 55.78436801120489), (37.37120164550783, 55.78596427165359), (37.37284851456452, 55.7874378183096), (37.37608325135799, 55.7886695054807), (37.3764587460632, 55.78947647305964), (37.37530000265506, 55.79146512926804), (37.38235915344241, 55.79899647809345), (37.384344043655396, 55.80113596939471), (37.38594269577028, 55.80322699999366), (37.38711208598329, 55.804919036911976), (37.3880239841309, 55.806610999993666), (37.38928977249147, 55.81001864976979), (37.39038389947512, 55.81348641242801), (37.39235781481933, 55.81983538336746), (37.393709457672124, 55.82417822811877), (37.394685720901464, 55.82792275755836), (37.39557615344238, 55.830447148154136), (37.39844478226658, 55.83167107969975), (37.40019761214057, 55.83151823557964), (37.400398790382326, 55.83264967594742), (37.39659544313046, 55.83322180909622), (37.39667059524539, 55.83402792148566), (37.39682089947515, 55.83638877400216), (37.39643489154053, 55.83861656112751), (37.3955338994751, 55.84072348043264), (37.392680272491454, 55.84502158126453), (37.39241188227847, 55.84659117913199), (37.392529730163616, 55.84816071336481), (37.39486835714723, 55.85288092980303), (37.39873052645878, 55.859893456073635), (37.40272161111449, 55.86441833633205), (37.40697072750854, 55.867579567544375), (37.410007082016016, 55.868369880337), (37.4120992989502, 55.86920843741314), (37.412668021163924, 55.87055369615854), (37.41482461111453, 55.87170587948249), (37.41862266137694, 55.873183961039565), (37.42413732540892, 55.874879126654704), (37.4312182698669, 55.875614937236705), (37.43111093783558, 55.8762723478417), (37.43332105622856, 55.87706546369396), (37.43385747619623, 55.87790681284802), (37.441303050262405, 55.88027084462084), (37.44747234260555, 55.87942070143253), (37.44716141796871, 55.88072960917233), (37.44769797085568, 55.88121221323979), (37.45204320500181, 55.882080694420715), (37.45673176190186, 55.882346110794586), (37.463383999999984, 55.88252729504517), (37.46682797486874, 55.88294937719063), (37.470014457672086, 55.88361266759345), (37.47751410450743, 55.88546991372396), (37.47860317658232, 55.88534929207307), (37.48165826025772, 55.882563306475106), (37.48316434442331, 55.8815803226785), (37.483831555817645, 55.882427612793315), (37.483182967125686, 55.88372791409729), (37.483092277908824, 55.88495581062434), (37.4855716508179, 55.8875561994203), (37.486440636245746, 55.887827444039566), (37.49014203439328, 55.88897899871799), (37.493210285705544, 55.890208937135604), (37.497512451065035, 55.891342397444696), (37.49780744510645, 55.89174030252967), (37.49940333499519, 55.89239745507079), (37.50018383334346, 55.89339220941865), (37.52421672750851, 55.903869074155224), (37.52977457672118, 55.90564076517974), (37.53503220370484, 55.90661661218259), (37.54042858064267, 55.90714113744566), (37.54320461007303, 55.905645048442985), (37.545686966066306, 55.906608607018505), (37.54743976120755, 55.90788552162358), (37.55796999999999, 55.90901557907218), (37.572711542327866, 55.91059395704873), (37.57942799999998, 55.91073854155573), (37.58502865872187, 55.91009969268444), (37.58739968913264, 55.90794809960554), (37.59131567193598, 55.908713267595054), (37.612687423278814, 55.902866854295375), (37.62348079629517, 55.90041967242986), (37.635797880950896, 55.898141151686396), (37.649487626983664, 55.89639275532968), (37.65619302513125, 55.89572360207488), (37.66294133862307, 55.895295577183965), (37.66874564418033, 55.89505457604897), (37.67375601586915, 55.89254677027454), (37.67744661901856, 55.8947775867987), (37.688347, 55.89450045676125), (37.69480554232789, 55.89422926332761), (37.70107096560668, 55.89322256101114), (37.705962965606716, 55.891763491662616), (37.711885134918205, 55.889110234998974), (37.71682005026245, 55.886577568759876), (37.7199315476074, 55.88458159806678), (37.72234560316464, 55.882281005794134), (37.72364385977171, 55.8809452036196), (37.725371142837474, 55.8809722706006), (37.727870902099546, 55.88037213862385), (37.73394330422971, 55.877941504088696), (37.745339592590376, 55.87208120378722), (37.75525267724611, 55.86703807949492), (37.76919976190188, 55.859821640197474), (37.827835219574, 55.82962968399116), (37.83341438888553, 55.82575289922351), (37.83652584655761, 55.82188784027888), (37.83809213491821, 55.81612575504693), (37.83605359521481, 55.81460347077685), (37.83632178569025, 55.81276696067908), (37.838623105812026, 55.811486181656385), (37.83912198147584, 55.807329380532785), (37.839079078033414, 55.80510270463816), (37.83965844708251, 55.79940712529036), (37.840581150787344, 55.79131399999368), (37.84172564285271, 55.78000432402266)]);
+```
+
+3. Проверяем, сколько сотовых вышек находится в Москве:
+
+```
+SELECT count() FROM cell_towers WHERE pointInPolygon((lon, lat), (SELECT * FROM moscow))
+
+┌─count()─┐
+│  310463 │
+└─────────┘
+
+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=). Однако, обратите внимание, что здесь нельзя создавать временные таблицы.
diff --git a/docs/ru/getting-started/example-datasets/index.md b/docs/ru/getting-started/example-datasets/index.md
index f590300adda..756b3a75dee 100644
--- a/docs/ru/getting-started/example-datasets/index.md
+++ b/docs/ru/getting-started/example-datasets/index.md
@@ -16,4 +16,5 @@ toc_title: "Введение"
 -   [AMPLab Big Data Benchmark](amplab-benchmark.md)
 -   [Данные о такси в Нью-Йорке](nyc-taxi.md)
 -   [OnTime](ontime.md)
+-   [Вышки сотовой связи](../../getting-started/example-datasets/cell-towers.md)
 
diff --git a/docs/ru/getting-started/example-datasets/ontime.md b/docs/ru/getting-started/example-datasets/ontime.md
index be5b1cd1b70..d46b7e75e7f 100644
--- a/docs/ru/getting-started/example-datasets/ontime.md
+++ b/docs/ru/getting-started/example-datasets/ontime.md
@@ -27,126 +27,127 @@ done
 Создание таблицы:
 
 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```
 
 Загрузка данных:
 
 ``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```
 
 ## Скачивание готовых партиций {#skachivanie-gotovykh-partitsii}
@@ -211,7 +212,7 @@ LIMIT 10;
 Q4. Количество задержек по перевозчикам за 2007 год
 
 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
 GROUP BY Carrier
@@ -225,29 +226,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year=2007
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year=2007
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 Более оптимальная версия того же запроса:
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
 GROUP BY Carrier
@@ -261,29 +262,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year>=2000 AND Year<=2008
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year>=2000 AND Year<=2008
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 Более оптимальная версия того же запроса:
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@@ -302,7 +303,7 @@ FROM
     from ontime
     WHERE DepDelay>10
     GROUP BY Year
-)
+) q
 JOIN
 (
     select
@@ -310,7 +311,7 @@ JOIN
         count(*) as c2
     from ontime
     GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```
 
@@ -346,7 +347,7 @@ Q10.
 
 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
    sum(ArrDelayMinutes>30) AS flights_delayed,
    round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
diff --git a/docs/ru/getting-started/install.md b/docs/ru/getting-started/install.md
index 4ae27a910ea..d0a54d9043a 100644
--- a/docs/ru/getting-started/install.md
+++ b/docs/ru/getting-started/install.md
@@ -95,7 +95,9 @@ sudo clickhouse-client-$LATEST_VERSION/install/doinst.sh
 - [AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/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`
 
-После скачивания, можно воспользоваться `clickhouse client` для подключения к серверу, или `clickhouse local` для обработки локальных данных. Для запуска `clickhouse server` необходимо скачать конфигурационные файлы [сервера](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/config.xml) и [пользователей](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/users.xml) с GitHub.
+После скачивания можно воспользоваться `clickhouse client` для подключения к серверу или `clickhouse local` для обработки локальных данных. 
+
+Чтобы установить ClickHouse в рамках всей системы (с необходимыми конфигурационными файлами, настройками пользователей и т.д.), выполните `sudo ./clickhouse install`. Затем выполните команды `clickhouse start` (чтобы запустить сервер) и `clickhouse-client` (чтобы подключиться к нему). 
 
 Данные сборки не рекомендуются для использования в продакшене, так как они недостаточно тщательно протестированны. Также, в них присутствуют не все возможности ClickHouse.
 
@@ -172,4 +174,3 @@ SELECT 1
 **Поздравляем, система работает!**
 
 Для дальнейших экспериментов можно попробовать загрузить один из тестовых наборов данных или пройти [пошаговое руководство для начинающих](https://clickhouse.tech/tutorial.html).
-
diff --git a/docs/ru/guides/apply-catboost-model.md b/docs/ru/guides/apply-catboost-model.md
index 11964c57fc7..db2be63692f 100644
--- a/docs/ru/guides/apply-catboost-model.md
+++ b/docs/ru/guides/apply-catboost-model.md
@@ -158,7 +158,9 @@ FROM amazon_train
 <catboost_dynamic_library_path>/home/catboost/data/libcatboostmodel.so</catboost_dynamic_library_path>
 <models_config>/home/catboost/models/*_model.xml</models_config>
 ```
-
+!!! note "Примечание"
+    Вы можете позднее изменить путь к конфигурации модели CatBoost без перезагрузки сервера.
+    
 ## 4. Запустите вывод модели из SQL {#run-model-inference}
 
 Для тестирования модели запустите клиент ClickHouse `$ clickhouse client`.
diff --git a/docs/ru/interfaces/cli.md b/docs/ru/interfaces/cli.md
index 96ec36be79f..277b73a6d36 100644
--- a/docs/ru/interfaces/cli.md
+++ b/docs/ru/interfaces/cli.md
@@ -121,6 +121,7 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 -   `--user, -u` — имя пользователя, по умолчанию — ‘default’.
 -   `--password` — пароль, по умолчанию — пустая строка.
 -   `--query, -q` — запрос для выполнения, при использовании в неинтерактивном режиме.
+-   `--queries-file, -qf` - путь к файлу с запросами для выполнения. Необходимо указать только одну из опций: `query` или `queries-file`.
 -   `--database, -d` — выбрать текущую БД. Без указания значение берется из настроек сервера (по умолчанию — БД ‘default’).
 -   `--multiline, -m` — если указано — разрешить многострочные запросы, не отправлять запрос по нажатию Enter.
 -   `--multiquery, -n` — если указано — разрешить выполнять несколько запросов, разделённых точкой с запятой.
@@ -130,6 +131,7 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 -   `--stacktrace` — если указано, в случае исключения, выводить также его стек-трейс.
 -   `--config-file` — имя конфигурационного файла.
 -   `--secure` — если указано, будет использован безопасный канал.
+-   `--history_file` - путь к файлу с историей команд.
 -   `--param_<name>` — значение параметра для [запроса с параметрами](#cli-queries-with-parameters).
 
 Начиная с версии 20.5, в `clickhouse-client` есть автоматическая подсветка синтаксиса (включена всегда).
diff --git a/docs/ru/interfaces/third-party/gui.md b/docs/ru/interfaces/third-party/gui.md
index f913a0ff2cc..dc96c32e996 100644
--- a/docs/ru/interfaces/third-party/gui.md
+++ b/docs/ru/interfaces/third-party/gui.md
@@ -166,4 +166,25 @@ toc_title: "Визуальные интерфейсы от сторонних р
 
 [Как сконфигурировать ClickHouse в Looker.](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
-[Original article](https://clickhouse.tech/docs/ru/interfaces/third-party/gui/) <!--hide-->
+### SeekTable {#seektable}
+
+[SeekTable](https://www.seektable.com) — это аналитический инструмент для самостоятельного анализа и обработки данных бизнес-аналитики. Он доступен как в виде облачного сервиса, так и в виде локальной версии. Отчеты из SeekTable могут быть встроены в любое веб-приложение.
+
+Основные возможности:
+
+-   Удобный конструктор отчетов.
+-   Гибкая настройка отчетов SQL и создание запросов для специфичных отчетов.
+-   Интегрируется с ClickHouse, используя собственную точку приема запроса TCP/IP или интерфейс HTTP(S) (два разных драйвера).
+-   Поддерживает всю мощь диалекта ClickHouse SQL для построения запросов по различным измерениям и показателям.
+-   [WEB-API](https://www.seektable.com/help/web-api-integration) для автоматизированной генерации отчетов.
+-   Процесс разработки отчетов поддерживает [резервное копирование/восстановление данных](https://www.seektable.com/help/self-hosted-backup-restore); конфигурация моделей данных (кубов) / отчетов представляет собой удобочитаемый XML-файл, который может храниться в системе контроля версий.
+
+SeekTable [бесплатен](https://www.seektable.com/help/cloud-pricing) для личного/индивидуального использования.
+
+[Как сконфигурировать подключение ClickHouse в SeekTable.](https://www.seektable.com/help/clickhouse-pivot-table)
+
+### Chadmin {#chadmin}
+
+[Chadmin](https://github.com/bun4uk/chadmin) — простой графический интерфейс для визуализации запущенных запросов на вашем кластере ClickHouse. Он отображает информацию о запросах и дает возможность их завершать.
+
+[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/ru/operations/configuration-files.md b/docs/ru/operations/configuration-files.md
index 11a01d1e6d2..8b4b0da8f2b 100644
--- a/docs/ru/operations/configuration-files.md
+++ b/docs/ru/operations/configuration-files.md
@@ -6,9 +6,9 @@ toc_title: "Конфигурационные файлы"
 
 # Конфигурационные файлы {#configuration_files}
 
-Основной конфигурационный файл сервера - `config.xml`. Он расположен в директории `/etc/clickhouse-server/`.
+Основной конфигурационный файл сервера - `config.xml` или `config.yaml`. Он расположен в директории `/etc/clickhouse-server/`.
 
-Отдельные настройки могут быть переопределены в файлах `*.xml` и `*.conf` из директории `config.d` рядом с конфигом.
+Отдельные настройки могут быть переопределены в файлах `*.xml` и `*.conf`, а также `.yaml` (для файлов в формате YAML) из директории `config.d` рядом с конфигом.
 
 У элементов этих конфигурационных файлов могут быть указаны атрибуты `replace` или `remove`.
 
@@ -25,7 +25,7 @@ toc_title: "Конфигурационные файлы"
 В элементе `users_config` файла `config.xml` можно указать относительный путь к конфигурационному файлу с настройками пользователей, профилей и квот. Значение `users_config` по умолчанию — `users.xml`. Если `users_config` не указан, то настройки пользователей, профилей и квот можно задать непосредственно в `config.xml`.
 
 Настройки пользователя могут быть разделены в несколько отдельных файлов аналогичных `config.xml` и `config.d\`. Имя директории задаётся также как `users_config`.
-Имя директории задаётся так же, как имя файла в `users_config`, с подстановкой `.d` вместо `.xml`.
+Имя директории задаётся так же, как имя файла в `users_config`, с подстановкой `.d` вместо `.xml`/`.yaml`.
 Директория `users.d` используется по умолчанию, также как `users.xml` используется для `users_config`.
 Например, можно иметь по отдельному конфигурационному файлу для каждого пользователя:
 
@@ -52,3 +52,66 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 
 Сервер следит за изменениями конфигурационных файлов, а также файлов и ZooKeeper-узлов, которые были использованы при выполнении подстановок и переопределений, и перезагружает настройки пользователей и кластеров на лету. То есть, можно изменять кластера, пользователей и их настройки без перезапуска сервера.
 
+## Примеры записи конфигурации на YAML {#example}
+
+Здесь можно рассмотреть пример реальной конфигурации записанной на YAML: [config.yaml.example](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/config.yaml.example).
+
+Между стандартами XML и YAML имеются различия, поэтому в этом разделе будут перечислены некоторые подсказки для написания конфигурации на YMAL.
+
+Для записи обычной пары ключ-значение следует использовать Scalar:
+``` yaml
+key: value
+```
+
+Для создания тега, содержащего подтеги следует использовать Map:
+``` yaml
+map_key:
+  key1: val1
+  key2: val2
+  key3: val3
+```
+
+Для создания списка значений или подтегов, расположенных по определенному ключу, следует использовать Sequence:
+``` yaml
+seq_key:
+  - val1
+  - val2
+  - key1: val3
+  - map:
+      key2: val4
+      key3: val5
+```
+
+В случае, усли необходимо объявить тег, аналогичный XML-атрибуту, необходимо задать скаляр, имеющий ключ с префиксом @ и заключенный в кавычки:
+
+``` yaml
+map:
+  "@attr1": value1
+  "@attr2": value2
+  key: 123
+```
+
+Из такой Map мы получим после конвертации:
+
+``` xml
+<map attr1="value1" attr2="value2">
+    <key>123</key>
+</map>
+```
+
+Помимо Map, можно задавать атрибуты для Sequence:
+
+``` yaml
+seq:
+  - "@attr1": value1
+  - "@attr2": value2
+  - 123
+  - abc
+```
+
+Таким образом получая аналог следующей записи на XML:
+
+``` xml
+<seq attr1="value1" attr2="value2">123</seq>
+<seq attr1="value1" attr2="value2">abc</seq>
+```
diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md
index 109146d27f4..abaf2a8f2da 100644
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@@ -101,6 +101,12 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </core_dump> 
 ```
 
+## database_atomic_delay_before_drop_table_sec {#database_atomic_delay_before_drop_table_sec}
+
+Устанавливает задержку перед удалением табличных данных, в секундах. Если запрос имеет идентификатор `SYNC`, эта настройка игнорируется.
+
+Значение по умолчанию: `480` (8 минут).
+
 ## default\_database {#default-database}
 
 База данных по умолчанию.
@@ -285,7 +291,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 ## interserver_http_host {#interserver-http-host}
 
-Имя хоста, которое могут использовать другие серверы для обращения к этому.
+Имя хоста, которое могут использовать другие серверы для обращения к этому хосту.
 
 Если не указано, то определяется аналогично команде `hostname -f`.
 
@@ -297,11 +303,36 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <interserver_http_host>example.yandex.ru</interserver_http_host>
 ```
 
+## interserver_https_port {#interserver-https-port}
+
+Порт для обмена данными между репликами ClickHouse по протоколу `HTTPS`.
+
+**Пример**
+
+``` xml
+<interserver_https_port>9010</interserver_https_port>
+```
+
+## interserver_https_host {#interserver-https-host}
+
+Имя хоста, которое могут использовать другие реплики для обращения к нему по протоколу `HTTPS`.
+
+**Пример**
+
+``` xml
+<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. Сервер проверяет совпадение имени и пароля для соединяющихся с ним реплик, а также использует это же имя и пароль для соединения с другими репликами. Соответственно, эти имя и пароль должны быть прописаны одинаковыми для всех реплик кластера.
 По умолчанию аутентификация не используется.
 
+!!! note "Примечание"
+    Эти учетные данные являются общими для обмена данными по протоколам `HTTP` и `HTTPS`.
+
 Раздел содержит следующие параметры:
 
 -   `user` — имя пользователя.
@@ -384,7 +415,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
     Значения по умолчанию: при указанном `address` - `LOG_USER`, иначе - `LOG_DAEMON`
 -   format - формат сообщений. Возможные значения - `bsd` и `syslog`
 
-## send_crash_reports {#server_configuration_parameters-logger}
+## send_crash_reports {#server_configuration_parameters-send_crash_reports}
 
 Настройки для отправки сообщений о сбоях в команду разработчиков ядра ClickHouse через [Sentry](https://sentry.io).
 Включение этих настроек, особенно в pre-production среде, может дать очень ценную информацию и поможет развитию ClickHouse.
diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index bfc0b0a2644..2af99bb8026 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -55,6 +55,26 @@ Eсли число кусков в партиции превышает знач
 
 ClickHouse искусственно выполняет `INSERT` дольше (добавляет ‘sleep’), чтобы фоновый механизм слияния успевал слиять куски быстрее, чем они добавляются.
 
+## inactive_parts_to_throw_insert {#inactive-parts-to-throw-insert}
+
+Если число неактивных кусков в партиции превышает значение `inactive_parts_to_throw_insert`, `INSERT` прерывается с исключением «Too many inactive parts (N). Parts cleaning are processing significantly slower than inserts».
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 0 (не ограничено).
+
+## inactive_parts_to_delay_insert {#inactive-parts-to-delay-insert}
+
+Если число неактивных кусков в партиции больше или равно значению `inactive_parts_to_delay_insert`, `INSERT` искусственно замедляется. Это полезно, когда сервер не может быстро очистить неактивные куски.
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 0 (не ограничено).
+
 ## max_delay_to_insert {#max-delay-to-insert}
 
 Величина в секундах, которая используется для расчета задержки `INSERT`, если число кусков в партиции превышает значение [parts_to_delay_insert](#parts-to-delay-insert).
@@ -129,6 +149,39 @@ Eсли суммарное число активных кусков во все
 
 Стандартное значение Linux dirty_expire_centisecs - 30 секунд (максимальное время, которое записанные данные хранятся только в оперативной памяти), но при больших нагрузках на дисковую систему, данные могут быть записаны намного позже. Экспериментально было найдено время - 480 секунд, за которое гарантированно новый кусок будет записан на диск.
 
+## replicated_fetches_http_connection_timeout {#replicated_fetches_http_connection_timeout}
+
+Тайм-аут HTTP-соединения (в секундах) для запросов на скачивание кусков. Наследуется из профиля по умолчанию [http_connection_timeout](./settings.md#http_connection_timeout), если не задан явно.
+
+Возможные значения:
+
+-   0 - используется значение `http_connection_timeout`.
+-   Любое положительное целое число.
+
+Значение по умолчанию: `0`.
+
+## replicated_fetches_http_send_timeout {#replicated_fetches_http_send_timeout}
+
+Тайм-аут (в секундах) для отправки HTTP-запросов на скачивание кусков. Наследуется из профиля по умолчанию [http_send_timeout](./settings.md#http_send_timeout), если не задан явно.
+
+Возможные значения:
+
+-   0 - используется значение `http_send_timeout`.
+-   Любое положительное целое число.
+
+Значение по умолчанию: `0`.
+
+## replicated_fetches_http_receive_timeout {#replicated_fetches_http_receive_timeout}
+
+Тайм-аут (в секундах) для получения HTTP-запросов на скачивание кусков. Наследуется из профиля по умолчанию [http_receive_timeout](./settings.md#http_receive_timeout), если не задан явно.
+
+Возможные значения:
+
+-   0 - используется значение `http_receive_timeout`.
+-   Любое положительное целое число.
+
+Значение по умолчанию: `0`.
+
 ## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
 
 Максимальный суммарный размер кусков (в байтах) в одном слиянии, при наличии свободных ресурсов в фоновом пуле.
@@ -193,4 +246,15 @@ Eсли суммарное число активных кусков во все
 
 Значение по умолчанию: -1 (неограниченно).
 
+## allow_floating_point_partition_key {#allow_floating_point_partition_key}
+
+Позволяет использовать число с плавающей запятой в качестве ключа партиционирования.
+
+Возможные значения:
+
+-   0 — Ключ партиционирования с плавающей запятой не разрешен.
+-   1 — Ключ партиционирования с плавающей запятой разрешен.
+
+Значение по умолчанию: `0`.
+
 [Original article](https://clickhouse.tech/docs/ru/operations/settings/merge_tree_settings/) <!--hide-->
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index d10ac2ab317..ada8ee91293 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -119,6 +119,16 @@ ClickHouse применяет настройку в тех случаях, ко
 
 Значение по умолчанию: 0.
 
+## http_max_uri_size {#http-max-uri-size}
+
+Устанавливает максимальную длину URI в HTTP-запросе.
+
+Возможные значения:
+
+-   Положительное целое.
+
+Значение по умолчанию: 1048576.
+
 ## send_progress_in_http_headers {#settings-send_progress_in_http_headers}
 
 Включает или отключает HTTP-заголовки `X-ClickHouse-Progress` в ответах `clickhouse-server`.
@@ -337,7 +347,31 @@ INSERT INTO table_with_enum_column_for_tsv_insert FORMAT TSV 102	2;
 
 ## input_format_null_as_default {#settings-input-format-null-as-default}
 
-Включает или отключает использование значений по умолчанию в случаях, когда во входных данных содержится `NULL`, но тип соответствующего столбца не `Nullable(T)` (для текстовых форматов).
+Включает или отключает инициализацию [значениями по умолчанию](../../sql-reference/statements/create/table.md#create-default-values) ячеек с [NULL](../../sql-reference/syntax.md#null-literal), если тип данных столбца не позволяет [хранить NULL](../../sql-reference/data-types/nullable.md#data_type-nullable).
+Если столбец не позволяет хранить `NULL` и эта настройка отключена, то вставка `NULL` приведет к возникновению исключения. Если столбец позволяет хранить `NULL`, то значения `NULL` вставляются независимо от этой настройки. 
+
+Эта настройка используется для запросов [INSERT ... VALUES](../../sql-reference/statements/insert-into.md) для текстовых входных форматов.
+
+Возможные значения:
+
+-   0 — вставка `NULL` в столбец, не позволяющий хранить `NULL`, приведет к возникновению исключения.
+-   1 — ячейки с `NULL` инициализируются значением столбца по умолчанию.
+
+Значение по умолчанию: `1`.
+
+## insert_null_as_default {#insert_null_as_default}
+
+Включает или отключает вставку [значений по умолчанию](../../sql-reference/statements/create/table.md#create-default-values) вместо [NULL](../../sql-reference/syntax.md#null-literal) в столбцы, которые не позволяют [хранить NULL](../../sql-reference/data-types/nullable.md#data_type-nullable). 
+Если столбец не позволяет хранить `NULL` и эта настройка отключена, то вставка `NULL` приведет к возникновению исключения. Если столбец позволяет хранить `NULL`, то значения `NULL` вставляются независимо от этой настройки.
+
+Эта настройка используется для запросов [INSERT ... SELECT](../../sql-reference/statements/insert-into.md#insert_query_insert-select). При этом подзапросы `SELECT` могут объединяться с помощью `UNION ALL`.
+
+Возможные значения:
+
+-   0 — вставка `NULL` в столбец, не позволяющий хранить `NULL`, приведет к возникновению исключения.
+-   1 — вместо `NULL` вставляется значение столбца по умолчанию.
+
+Значение по умолчанию: `1`.
 
 ## input_format_skip_unknown_fields {#settings-input-format-skip-unknown-fields}
 
@@ -844,8 +878,6 @@ SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test'
 
 Значение по умолчанию: количество процессорных ядер без учёта Hyper-Threading.
 
-Если на сервере обычно исполняется менее одного запроса SELECT одновременно, то выставите этот параметр в значение чуть меньше количества реальных процессорных ядер.
-
 Для запросов, которые быстро завершаются из-за LIMIT-а, имеет смысл выставить max_threads поменьше. Например, если нужное количество записей находится в каждом блоке, то при max_threads = 8 будет считано 8 блоков, хотя достаточно было прочитать один.
 
 Чем меньше `max_threads`, тем меньше будет использоваться оперативки.
@@ -1753,7 +1785,7 @@ ClickHouse генерирует исключение
 
 ## background_pool_size {#background_pool_size}
 
-Задает количество потоков для выполнения фоновых операций в движках таблиц (например, слияния в таблицах c движком [MergeTree](../../engines/table-engines/mergetree-family/index.md)). Настройка применяется при запуске сервера ClickHouse и не может быть изменена во пользовательском сеансе. Настройка позволяет управлять загрузкой процессора и диска. Чем меньше пулл, тем ниже нагрузка на CPU и диск, при этом фоновые процессы замедляются, что может повлиять на скорость выполнения запроса.
+Задает количество потоков для выполнения фоновых операций в движках таблиц (например, слияния в таблицах c движком [MergeTree](../../engines/table-engines/mergetree-family/index.md)). Настройка применяется при запуске сервера ClickHouse и не может быть изменена во пользовательском сеансе. Настройка позволяет управлять загрузкой процессора и диска. Чем меньше пул, тем ниже нагрузка на CPU и диск, при этом фоновые процессы работают с меньшей интенсивностью, что в конечном итоге может повлиять на производительность запросов, потому что сервер будет обрабатывать больше кусков.
 
 Допустимые значения:
 
@@ -2035,6 +2067,16 @@ SELECT idx, i FROM null_in WHERE i IN (1, NULL) SETTINGS transform_null_in = 1;
 
 Значение по умолчанию: 16.
 
+## background_fetches_pool_size {#background_fetches_pool_size}
+
+Задает количество потоков для скачивания кусков данных для [реплицируемых](../../engines/table-engines/mergetree-family/replication.md) таблиц. Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе. Для использования в продакшене с частыми небольшими вставками или медленным кластером ZooKeeper рекомендуется использовать значение по умолчанию.
+
+Допустимые значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: 8.
+
 ## background_distributed_schedule_pool_size {#background_distributed_schedule_pool_size}
 
 Задает количество потоков для выполнения фоновых задач. Работает для таблиц с движком [Distributed](../../engines/table-engines/special/distributed.md). Настройка применяется при запуске сервера ClickHouse и не может быть изменена в пользовательском сеансе.
@@ -2690,6 +2732,28 @@ SELECT * FROM test2;
 
 Значение по умолчанию: `0`.
 
+## database_atomic_wait_for_drop_and_detach_synchronously {#database_atomic_wait_for_drop_and_detach_synchronously}
+
+Добавляет модификатор `SYNC` ко всем запросам `DROP` и `DETACH`. 
+
+Возможные значения:
+
+-   0 — Запросы будут выполняться с задержкой.
+-   1 — Запросы будут выполняться без задержки.
+
+Значение по умолчанию: `0`.
+
+## show_table_uuid_in_table_create_query_if_not_nil {#show_table_uuid_in_table_create_query_if_not_nil}
+
+Устанавливает отображение запроса `SHOW TABLE`.
+
+Возможные значения:
+
+-   0 — Запрос будет отображаться без UUID таблицы.
+-   1 — Запрос будет отображаться с UUID таблицы.
+
+Значение по умолчанию: `0`.
+
 ## allow_experimental_live_view {#allow-experimental-live-view}
 
 Включает экспериментальную возможность использования [LIVE-представлений](../../sql-reference/statements/create/view.md#live-view).
@@ -2724,4 +2788,172 @@ SELECT * FROM test2;
 
 Значение по умолчанию: `60`.
 
+## check_query_single_value_result {#check_query_single_value_result}
+
+Определяет уровень детализации результата для запросов [CHECK TABLE](../../sql-reference/statements/check-table.md#checking-mergetree-tables) для таблиц семейства `MergeTree`.
+
+Возможные значения:
+
+-   0 — запрос возвращает статус каждого куска данных таблицы.
+-   1 — запрос возвращает статус таблицы в целом.
+
+Значение по умолчанию: `0`.
+
+## prefer_column_name_to_alias {#prefer-column-name-to-alias}
+
+Включает или отключает замену названий столбцов на псевдонимы (alias) в выражениях и секциях запросов, см. [Примечания по использованию синонимов](../../sql-reference/syntax.md#syntax-expression_aliases). Включите эту настройку, чтобы синтаксис псевдонимов в ClickHouse был более совместим с большинством других СУБД.
+
+Возможные значения:
+
+- 0 — псевдоним подставляется вместо имени столбца.
+- 1 — псевдоним не подставляется вместо имени столбца.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Какие изменения привносит включение и выключение настройки: 
+
+Запрос:
+
+```sql
+SET prefer_column_name_to_alias = 0;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Результат:
+
+```text
+Received exception from server (version 21.5.1):
+Code: 184. DB::Exception: Received from localhost:9000. DB::Exception: Aggregate function avg(number) is found inside another aggregate function in query: While processing avg(number) AS number.
+```
+
+Запрос:
+
+```sql
+SET prefer_column_name_to_alias = 1;
+SELECT avg(number) AS number, max(number) FROM numbers(10);
+```
+
+Результат:
+
+```text
+┌─number─┬─max(number)─┐
+│    4.5 │           9 │
+└────────┴─────────────┘
+```
+
+## limit {#limit}
+
+Устанавливает максимальное количество строк, возвращаемых запросом. Ограничивает сверху значение, установленное в запросе в секции [LIMIT](../../sql-reference/statements/select/limit.md#limit-clause).
+
+Возможные значения:
+
+-   0 — число строк не ограничено.
+-   Положительное целое число.
+
+Значение по умолчанию: `0`.
+
+## offset {#offset}
+
+Устанавливает количество строк, которые необходимо пропустить перед началом возврата строк из запроса. Суммируется со значением, установленным в запросе в секции [OFFSET](../../sql-reference/statements/select/offset.md#offset-fetch).
+
+Возможные значения:
+
+-   0 — строки не пропускаются.
+-   Положительное целое число.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Исходная таблица:
+
+``` sql
+CREATE TABLE test (i UInt64) ENGINE = MergeTree() ORDER BY i;
+INSERT INTO test SELECT number FROM numbers(500);
+```
+
+Запрос:
+
+``` sql
+SET limit = 5;
+SET offset = 7;
+SELECT * FROM test LIMIT 10 OFFSET 100;
+```
+
+Результат:
+
+``` text
+┌───i─┐
+│ 107 │
+│ 108 │
+│ 109 │
+└─────┘
+```
+## http_connection_timeout {#http_connection_timeout}
+
+Тайм-аут для HTTP-соединения (в секундах).
+
+Возможные значения:
+
+-   0 - бесконечный тайм-аут.
+-   Любое положительное целое число.
+
+Значение по умолчанию: `1`.
+
+## http_send_timeout {#http_send_timeout}
+
+Тайм-аут для отправки данных через HTTP-интерфейс (в секундах).
+
+Возможные значения:
+
+-   0 - бесконечный тайм-аут.
+-   Любое положительное целое число.
+
+Значение по умолчанию: `1800`.
+
+## http_receive_timeout {#http_receive_timeout}
+
+Тайм-аут для получения данных через HTTP-интерфейс (в секундах).
+
+Возможные значения:
+
+-   0 - бесконечный тайм-аут.
+-   Любое положительное целое число.
+
+Значение по умолчанию: `1800`.
+
+## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+
+Позволяет объединить агрегатные функции с одинаковым аргументом. Запрос, содержащий по крайней мере две агрегатные функции: [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).
+
+Возможные значения:
+
+-   0 — функции с одинаковым аргументом не объединяются.
+-   1 — функции с одинаковым аргументом объединяются.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
+SET optimize_fuse_sum_count_avg = 1;
+EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
+```
+
+Результат:
+
+``` text
+SELECT
+    sum(a),
+    sumCount(b).1,
+    sumCount(b).2,
+    (sumCount(b).1) / (sumCount(b).2)
+FROM fuse_tbl
+```
+
 [Оригинальная статья](https://clickhouse.tech/docs/ru/operations/settings/settings/) <!--hide-->
diff --git a/docs/ru/operations/system-tables/clusters.md b/docs/ru/operations/system-tables/clusters.md
index ddc6849b44d..6bfeb8aa818 100644
--- a/docs/ru/operations/system-tables/clusters.md
+++ b/docs/ru/operations/system-tables/clusters.md
@@ -4,12 +4,68 @@
 
 Столбцы:
 
--   `cluster` (String) — имя кластера.
--   `shard_num` (UInt32) — номер шарда в кластере, начиная с 1.
--   `shard_weight` (UInt32) — относительный вес шарда при записи данных.
--   `replica_num` (UInt32) — номер реплики в шарде, начиная с 1.
--   `host_name` (String) — хост, указанный в конфигурации.
--   `host_address` (String) — TIP-адрес хоста, полученный из DNS.
--   `port` (UInt16) — порт, на который обращаться для соединения с сервером.
--   `user` (String) — имя пользователя, которого использовать для соединения с сервером.
+-   `cluster` ([String](../../sql-reference/data-types/string.md)) — имя кластера.
+-   `shard_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — номер шарда в кластере, начиная с 1.
+-   `shard_weight` ([UInt32](../../sql-reference/data-types/int-uint.md)) — относительный вес шарда при записи данных.
+-   `replica_num` ([UInt32](../../sql-reference/data-types/int-uint.md)) — номер реплики в шарде, начиная с 1.
+-   `host_name` ([String](../../sql-reference/data-types/string.md)) — хост, указанный в конфигурации.
+-   `host_address` ([String](../../sql-reference/data-types/string.md)) — TIP-адрес хоста, полученный из DNS.
+-   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — порт для соединения с сервером.
+-   `is_local` ([UInt8](../../sql-reference/data-types/int-uint.md)) — флаг, показывающий является ли хост локальным.
+-   `user` ([String](../../sql-reference/data-types/string.md)) — имя пользователя для соединения с сервером.
+-   `default_database` ([String](../../sql-reference/data-types/string.md)) — имя базы данных по умолчанию.
+-   `errors_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — количество неудачных попыток хоста получить доступ к реплике.
+-   `slowdowns_count` ([UInt32](../../sql-reference/data-types/int-uint.md)) — количество замен реплики из-за долгого отсутствия ответа от нее при установке соединения при хеджированных запросах.
+-   `estimated_recovery_time` ([UInt32](../../sql-reference/data-types/int-uint.md)) — количество секунд до момента, когда количество ошибок будет обнулено и реплика станет доступной.
 
+**Пример**
+
+Запрос:
+
+```sql
+SELECT * FROM system.clusters LIMIT 2 FORMAT Vertical;
+```
+
+Результат:
+
+```text
+Row 1:
+──────
+cluster:                 test_cluster_two_shards
+shard_num:               1
+shard_weight:            1
+replica_num:             1
+host_name:               127.0.0.1
+host_address:            127.0.0.1
+port:                    9000
+is_local:                1
+user:                    default
+default_database:
+errors_count:            0
+slowdowns_count:         0
+estimated_recovery_time: 0
+
+Row 2:
+──────
+cluster:                 test_cluster_two_shards
+shard_num:               2
+shard_weight:            1
+replica_num:             1
+host_name:               127.0.0.2
+host_address:            127.0.0.2
+port:                    9000
+is_local:                0
+user:                    default
+default_database:
+errors_count:            0
+slowdowns_count:         0
+estimated_recovery_time: 0
+```
+
+**Смотрите также**
+
+-   [Table engine Distributed](../../engines/table-engines/special/distributed.md)
+-   [Настройка 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-->
diff --git a/docs/ru/operations/system-tables/columns.md b/docs/ru/operations/system-tables/columns.md
index af4cff85439..b8a0aef2299 100644
--- a/docs/ru/operations/system-tables/columns.md
+++ b/docs/ru/operations/system-tables/columns.md
@@ -4,7 +4,9 @@
 
 С помощью этой таблицы можно получить информацию аналогично запросу [DESCRIBE TABLE](../../sql-reference/statements/misc.md#misc-describe-table), но для многих таблиц сразу.
 
-Таблица `system.columns` содержит столбцы (тип столбца указан в скобках):
+Колонки [временных таблиц](../../sql-reference/statements/create/table.md#temporary-tables) содержатся в `system.columns` только в тех сессиях, в которых эти таблицы были созданы. Поле `database` у таких колонок пустое. 
+
+Cтолбцы:
 
 -   `database` ([String](../../sql-reference/data-types/string.md)) — имя базы данных.
 -   `table` ([String](../../sql-reference/data-types/string.md)) — имя таблицы.
@@ -23,3 +25,46 @@
 -   `is_in_sampling_key` ([UInt8](../../sql-reference/data-types/int-uint.md)) — флаг, показывающий включение столбца в ключ выборки.
 -   `compression_codec` ([String](../../sql-reference/data-types/string.md)) — имя кодека сжатия.
 
+**Пример**
+
+```sql
+SELECT * FROM system.columns LIMIT 2 FORMAT Vertical;
+```
+
+```text
+Row 1:
+──────
+database:                system
+table:                   aggregate_function_combinators
+name:                    name
+type:                    String
+default_kind:            
+default_expression:      
+data_compressed_bytes:   0
+data_uncompressed_bytes: 0
+marks_bytes:             0
+comment:                 
+is_in_partition_key:     0
+is_in_sorting_key:       0
+is_in_primary_key:       0
+is_in_sampling_key:      0
+compression_codec:       
+
+Row 2:
+──────
+database:                system
+table:                   aggregate_function_combinators
+name:                    is_internal
+type:                    UInt8
+default_kind:            
+default_expression:      
+data_compressed_bytes:   0
+data_uncompressed_bytes: 0
+marks_bytes:             0
+comment:                 
+is_in_partition_key:     0
+is_in_sorting_key:       0
+is_in_primary_key:       0
+is_in_sampling_key:      0
+compression_codec:       
+```
diff --git a/docs/ru/operations/system-tables/dictionaries.md b/docs/ru/operations/system-tables/dictionaries.md
index 6a49904aae9..b865fea736f 100644
--- a/docs/ru/operations/system-tables/dictionaries.md
+++ b/docs/ru/operations/system-tables/dictionaries.md
@@ -21,6 +21,7 @@
 -   `bytes_allocated` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Объем оперативной памяти, используемый словарем.
 -   `query_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Количество запросов с момента загрузки словаря или с момента последней успешной перезагрузки.
 -   `hit_rate` ([Float64](../../sql-reference/data-types/float.md)) — Для cache-словарей — процент закэшированных значений.
+-   `found_rate` ([Float64](../../sql-reference/data-types/float.md)) — Процент обращений к словарю, при которых значение было найдено.
 -   `element_count` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Количество элементов, хранящихся в словаре.
 -   `load_factor` ([Float64](../../sql-reference/data-types/float.md)) — Процент заполнения словаря (для хэшированного словаря — процент заполнения хэш-таблицы).
 -   `source` ([String](../../sql-reference/data-types/string.md)) — Текст, описывающий [источник данных](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md) для словаря.
@@ -58,4 +59,3 @@ SELECT * FROM system.dictionaries
 │ dictdb   │ dict │ LOADED │ dictdb.dict │ Flat │ UInt64 │ ['value_default','value_expression'] │ ['String','String'] │           74032 │           0 │        1 │             1 │ 0.0004887585532746823 │ ClickHouse: dictdb.dicttbl │            0 │            1 │ 2020-03-04 04:17:34 │   2020-03-04 04:30:34        │                 0.002 │                │
 └──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
 ```
-
diff --git a/docs/ru/operations/system-tables/replication_queue.md b/docs/ru/operations/system-tables/replication_queue.md
index 56e8c695a21..2f9d80be16f 100644
--- a/docs/ru/operations/system-tables/replication_queue.md
+++ b/docs/ru/operations/system-tables/replication_queue.md
@@ -14,7 +14,17 @@
 
 -   `node_name` ([String](../../sql-reference/data-types/string.md)) — имя узла в ZooKeeper.
 
--   `type` ([String](../../sql-reference/data-types/string.md)) — тип задачи в очереди: `GET_PARTS`, `MERGE_PARTS`, `DETACH_PARTS`, `DROP_PARTS` или `MUTATE_PARTS`.
+-   `type` ([String](../../sql-reference/data-types/string.md)) — тип задачи в очереди:
+
+    -   `GET_PART` — скачать кусок с другой реплики.
+    -   `ATTACH_PART` — присоединить кусок. Задача может быть выполнена и с куском из нашей собственной реплики (если он находится в папке `detached`). Эта задача практически идентична задаче `GET_PART`, лишь немного оптимизирована.
+    -   `MERGE_PARTS` — выполнить слияние кусков.
+    -   `DROP_RANGE` — удалить куски в партициях из указнного диапазона.
+    -   `CLEAR_COLUMN` — удалить указанный столбец из указанной партиции. Примечание: не используется с 20.4.
+    -   `CLEAR_INDEX` — удалить указанный индекс из указанной партиции. Примечание: не используется с 20.4. 
+    -   `REPLACE_RANGE` — удалить указанный диапазон кусков и заменить их на новые.
+    -   `MUTATE_PART` — применить одну или несколько мутаций к куску.
+    -   `ALTER_METADATA` — применить изменения структуры таблицы в результате запросов с выражением `ALTER`.
 
 -   `create_time` ([Datetime](../../sql-reference/data-types/datetime.md)) — дата и время отправки задачи на выполнение.
 
@@ -77,4 +87,3 @@ last_postpone_time:     1970-01-01 03:00:00
 **Смотрите также**
 
 -   [Управление таблицами ReplicatedMergeTree](../../sql-reference/statements/system.md#query-language-system-replicated)
-
diff --git a/docs/ru/operations/system-tables/stack_trace.md b/docs/ru/operations/system-tables/stack_trace.md
index 58d0a1c4b6a..338c14534cf 100644
--- a/docs/ru/operations/system-tables/stack_trace.md
+++ b/docs/ru/operations/system-tables/stack_trace.md
@@ -6,9 +6,10 @@
 
 Столбцы:
 
--   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — Идентификатор потока.
--   `query_id` ([String](../../sql-reference/data-types/string.md)) — Идентификатор запроса. Может быть использован для получения подробной информации о выполненном запросе из системной таблицы [query_log](#system_tables-query_log).
--   `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — [Трассировка стека](https://en.wikipedia.org/wiki/Stack_trace). Представляет собой список физических адресов, по которым расположены вызываемые методы.
+-   `thread_name` ([String](../../sql-reference/data-types/string.md)) — имя потока.
+-   `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — идентификатор потока.
+-   `query_id` ([String](../../sql-reference/data-types/string.md)) — идентификатор запроса. Может быть использован для получения подробной информации о выполненном запросе из системной таблицы [query_log](#system_tables-query_log).
+-   `trace` ([Array(UInt64)](../../sql-reference/data-types/array.md)) — [трассировка стека](https://en.wikipedia.org/wiki/Stack_trace). Представляет собой список физических адресов, по которым расположены вызываемые методы.
 
 **Пример**
 
@@ -21,12 +22,14 @@ SET allow_introspection_functions = 1;
 Получение символов из объектных файлов ClickHouse:
 
 ``` sql
-WITH arrayMap(x -> demangle(addressToSymbol(x)), trace) AS all SELECT thread_id, query_id, arrayStringConcat(all, '\n') AS res FROM system.stack_trace LIMIT 1 \G
+WITH arrayMap(x -> demangle(addressToSymbol(x)), trace) AS all SELECT thread_name, thread_id, query_id, arrayStringConcat(all, '\n') AS res FROM system.stack_trace LIMIT 1 \G;
 ```
 
 ``` text
 Row 1:
 ──────
+thread_name: clickhouse-serv
+
 thread_id: 686
 query_id:  1a11f70b-626d-47c1-b948-f9c7b206395d
 res:       sigqueue
@@ -51,12 +54,14 @@ __clone
 Получение имен файлов и номеров строк в исходном коде ClickHouse:
 
 ``` sql
-WITH arrayMap(x -> addressToLine(x), trace) AS all, arrayFilter(x -> x LIKE '%/dbms/%', all) AS dbms SELECT thread_id, query_id, arrayStringConcat(notEmpty(dbms) ? dbms : all, '\n') AS res FROM system.stack_trace LIMIT 1 \G
+WITH arrayMap(x -> addressToLine(x), trace) AS all, arrayFilter(x -> x LIKE '%/dbms/%', all) AS dbms SELECT thread_name, thread_id, query_id, arrayStringConcat(notEmpty(dbms) ? dbms : all, '\n') AS res FROM system.stack_trace LIMIT 1 \G;
 ```
 
 ``` text
 Row 1:
 ──────
+thread_name: clickhouse-serv
+
 thread_id: 686
 query_id:  cad353e7-1c29-4b2e-949f-93e597ab7a54
 res:       /lib/x86_64-linux-gnu/libc-2.27.so
@@ -78,10 +83,9 @@ res:       /lib/x86_64-linux-gnu/libc-2.27.so
 /lib/x86_64-linux-gnu/libc-2.27.so
 ```
 
-**См. также**
-
--   [Функции интроспекции](../../sql-reference/functions/introspection.md) — Что такое функции интроспекции и как их использовать.
--   [system.trace_log](../../operations/system-tables/trace_log.md#system_tables-trace_log) — Содержит трассировки стека, собранные профилировщиком выборочных запросов.
--   [arrayMap](../../sql-reference/functions/array-functions.md#array-map) — Описание и пример использования функции `arrayMap`.
--   [arrayFilter](../../sql-reference/functions/array-functions.md#array-filter) — Описание и пример использования функции `arrayFilter`.
+**Смотрите также**
 
+-   [Функции интроспекции](../../sql-reference/functions/introspection.md) — описание функций интроспекции и примеры использования.
+-   [system.trace_log](../../operations/system-tables/trace_log.md#system_tables-trace_log) — системная таблица, содержащая трассировки стека, собранные профилировщиком выборочных запросов.
+-   [arrayMap](../../sql-reference/functions/array-functions.md#array-map) — описание и пример использования функции `arrayMap`.
+-   [arrayFilter](../../sql-reference/functions/array-functions.md#array-filter) — описание и пример использования функции `arrayFilter`.
diff --git a/docs/ru/operations/system-tables/tables.md b/docs/ru/operations/system-tables/tables.md
index 42e55b1f6b7..3dec1e7d940 100644
--- a/docs/ru/operations/system-tables/tables.md
+++ b/docs/ru/operations/system-tables/tables.md
@@ -1,39 +1,102 @@
 # system.tables {#system-tables}
 
-Содержит метаданные каждой таблицы, о которой знает сервер. Отсоединённые таблицы не отображаются в `system.tables`.
+Содержит метаданные каждой таблицы, о которой знает сервер. 
 
-Эта таблица содержит следующие столбцы (тип столбца показан в скобках):
+Отсоединённые таблицы ([DETACH](../../sql-reference/statements/detach.md)) не отображаются в `system.tables`.
 
--   `database String` — имя базы данных, в которой находится таблица.
--   `name` (String) — имя таблицы.
--   `engine` (String) — движок таблицы (без параметров).
--   `is_temporary` (UInt8) — флаг, указывающий на то, временная это таблица или нет.
--   `data_path` (String) — путь к данным таблицы в файловой системе.
--   `metadata_path` (String) — путь к табличным метаданным в файловой системе.
--   `metadata_modification_time` (DateTime) — время последней модификации табличных метаданных.
--   `dependencies_database` (Array(String)) — зависимости базы данных.
--   `dependencies_table` (Array(String)) — табличные зависимости (таблицы [MaterializedView](../../engines/table-engines/special/materializedview.md), созданные на базе текущей таблицы).
--   `create_table_query` (String) — запрос, которым создавалась таблица.
--   `engine_full` (String) — параметры табличного движка.
--   `partition_key` (String) — ключ партиционирования таблицы.
--   `sorting_key` (String) — ключ сортировки таблицы.
--   `primary_key` (String) - первичный ключ таблицы.
--   `sampling_key` (String) — ключ сэмплирования таблицы.
--   `storage_policy` (String) - политика хранения данных:
+Информация о [временных таблицах](../../sql-reference/statements/create/table.md#temporary-tables) содержится в `system.tables` только в тех сессиях, в которых эти таблицы были созданы. Поле `database` у таких таблиц пустое, а флаг `is_temporary` включен. 
+
+Столбцы:
+
+-   `database` ([String](../../sql-reference/data-types/string.md)) — имя базы данных, в которой находится таблица.
+-   `name` ([String](../../sql-reference/data-types/string.md)) — имя таблицы.
+-   `engine` ([String](../../sql-reference/data-types/string.md)) — движок таблицы (без параметров).
+-   `is_temporary` ([UInt8](../../sql-reference/data-types/int-uint.md)) — флаг, указывающий на то, временная это таблица или нет.
+-   `data_path` ([String](../../sql-reference/data-types/string.md)) — путь к данным таблицы в файловой системе.
+-   `metadata_path` ([String](../../sql-reference/data-types/string.md)) — путь к табличным метаданным в файловой системе.
+-   `metadata_modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — время последней модификации табличных метаданных.
+-   `dependencies_database` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — зависимости базы данных.
+-   `dependencies_table` ([Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md))) — табличные зависимости (таблицы [MaterializedView](../../engines/table-engines/special/materializedview.md), созданные на базе текущей таблицы).
+-   `create_table_query` ([String](../../sql-reference/data-types/string.md)) — запрос, при помощи которого создавалась таблица.
+-   `engine_full` ([String](../../sql-reference/data-types/string.md)) — параметры табличного движка.
+-   `partition_key` ([String](../../sql-reference/data-types/string.md)) — ключ партиционирования таблицы.
+-   `sorting_key` ([String](../../sql-reference/data-types/string.md)) — ключ сортировки таблицы.
+-   `primary_key` ([String](../../sql-reference/data-types/string.md)) - первичный ключ таблицы.
+-   `sampling_key` ([String](../../sql-reference/data-types/string.md)) — ключ сэмплирования таблицы.
+-   `storage_policy` ([String](../../sql-reference/data-types/string.md)) - политика хранения данных:
 
     -   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes)
     -   [Distributed](../../engines/table-engines/special/distributed.md#distributed)
 
--   `total_rows` (Nullable(UInt64)) - общее количество строк, если есть возможность быстро определить точное количество строк в таблице, в противном случае `Null` (включая базовую таблицу `Buffer`).
+-   `total_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество строк, если есть возможность быстро определить точное количество строк в таблице, в противном случае `NULL` (включая базовую таблицу `Buffer`).
 
--   `total_bytes` (Nullable(UInt64)) - общее количество байт, если можно быстро определить точное количество байт для таблицы на накопителе, в противном случае `Null` (**не включает** в себя никакого базового хранилища).
+-   `total_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество байт, если можно быстро определить точное количество байт для таблицы на накопителе, в противном случае `NULL` (не включает в себя никакого базового хранилища).
 
     -   Если таблица хранит данные на диске, возвращает используемое пространство на диске (т. е. сжатое).
     -   Если таблица хранит данные в памяти, возвращает приблизительное количество используемых байт в памяти.
 
--   `lifetime_rows` (Nullable(UInt64)) - общее количество строк, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
+-   `lifetime_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество строк, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
 
--   `lifetime_bytes` (Nullable(UInt64)) - общее количество байт, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
+-   `lifetime_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) - общее количество байт, добавленных оператором `INSERT` с момента запуска сервера (только для таблиц `Buffer`).
+
+-   `comment` ([String](../../sql-reference/data-types/string.md)) — комментарий к таблице.
 
 Таблица `system.tables` используется при выполнении запроса `SHOW TABLES`.
 
+**Пример**
+
+```sql
+SELECT * FROM system.tables LIMIT 2 FORMAT Vertical;
+```
+
+```text
+Row 1:
+──────
+database:                   base
+name:                       t1
+uuid:                       81b1c20a-b7c6-4116-a2ce-7583fb6b6736
+engine:                     MergeTree
+is_temporary:               0
+data_paths:                 ['/var/lib/clickhouse/store/81b/81b1c20a-b7c6-4116-a2ce-7583fb6b6736/']
+metadata_path:              /var/lib/clickhouse/store/461/461cf698-fd0b-406d-8c01-5d8fd5748a91/t1.sql
+metadata_modification_time: 2021-01-25 19:14:32
+dependencies_database:      []
+dependencies_table:         []
+create_table_query:         CREATE TABLE base.t1 (`n` UInt64) ENGINE = MergeTree ORDER BY n SETTINGS index_granularity = 8192
+engine_full:                MergeTree ORDER BY n SETTINGS index_granularity = 8192
+partition_key:
+sorting_key:                n
+primary_key:                n
+sampling_key:
+storage_policy:             default
+total_rows:                 1
+total_bytes:                99
+lifetime_rows:              ᴺᵁᴸᴸ
+lifetime_bytes:             ᴺᵁᴸᴸ
+comment:
+
+Row 2:
+──────
+database:                   default
+name:                       53r93yleapyears
+uuid:                       00000000-0000-0000-0000-000000000000
+engine:                     MergeTree
+is_temporary:               0
+data_paths:                 ['/var/lib/clickhouse/data/default/53r93yleapyears/']
+metadata_path:              /var/lib/clickhouse/metadata/default/53r93yleapyears.sql
+metadata_modification_time: 2020-09-23 09:05:36
+dependencies_database:      []
+dependencies_table:         []
+create_table_query:         CREATE TABLE default.`53r93yleapyears` (`id` Int8, `febdays` Int8) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192
+engine_full:                MergeTree ORDER BY id SETTINGS index_granularity = 8192
+partition_key:
+sorting_key:                id
+primary_key:                id
+sampling_key:
+storage_policy:             default
+total_rows:                 2
+total_bytes:                155
+lifetime_rows:              ᴺᵁᴸᴸ
+lifetime_bytes:             ᴺᵁᴸᴸ
+comment:
+```
diff --git a/docs/ru/operations/system-tables/trace_log.md b/docs/ru/operations/system-tables/trace_log.md
index 3d22e4eabfd..6d8130c1d00 100644
--- a/docs/ru/operations/system-tables/trace_log.md
+++ b/docs/ru/operations/system-tables/trace_log.md
@@ -18,10 +18,12 @@ ClickHouse создает эту таблицу когда утсановлен
 
         Во время соединения с сервером через `clickhouse-client`, вы видите строку похожую на `Connected to ClickHouse server version 19.18.1 revision 54429.`. Это поле содержит номер после `revision`, но не содержит строку после `version`.
 
--   `timer_type`([Enum8](../../sql-reference/data-types/enum.md)) — тип таймера:
+-   `trace_type`([Enum8](../../sql-reference/data-types/enum.md)) — тип трассировки:
 
-        - `Real` означает wall-clock время.
-        - `CPU` означает относительное CPU время.
+    -   `Real` — сбор трассировок стека адресов вызова по времени wall-clock.
+    -   `CPU` — сбор трассировок стека адресов вызова по времени CPU.
+    -   `Memory` — сбор выделенной памяти, когда ее размер превышает относительный инкремент.
+    -   `MemorySample` — сбор случайно выделенной памяти.
 
 -   `thread_number`([UInt32](../../sql-reference/data-types/int-uint.md)) — идентификатор треда.
 
diff --git a/docs/ru/operations/tips.md b/docs/ru/operations/tips.md
deleted file mode 100644
index 4535767e8e0..00000000000
--- a/docs/ru/operations/tips.md
+++ /dev/null
@@ -1,248 +0,0 @@
----
-toc_priority: 58
-toc_title: "Советы по эксплуатации"
----
-
-# Советы по эксплуатации {#sovety-po-ekspluatatsii}
-
-## CPU Scaling Governor {#cpu-scaling-governor}
-
-Всегда используйте `performance` scaling governor. `ondemand` scaling governor работает намного хуже при постоянно высоком спросе.
-
-``` bash
-$ echo 'performance' | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor
-```
-
-## Ограничение CPU {#ogranichenie-cpu}
-
-Процессоры могут перегреваться. С помощью `dmesg` можно увидеть, если тактовая частота процессора была ограничена из-за перегрева.
-Также ограничение может устанавливаться снаружи на уровне дата-центра. С помощью `turbostat` можно за этим наблюдать под нагрузкой.
-
-## Оперативная память {#operativnaia-pamiat}
-
-Для небольших объёмов данных (до ~200 Гб в сжатом виде) лучше всего использовать столько памяти не меньше, чем объём данных.
-Для больших объёмов данных, при выполнении интерактивных (онлайн) запросов, стоит использовать разумный объём оперативной памяти (128 Гб или более) для того, чтобы горячее подмножество данных поместилось в кеше страниц.
-Даже для объёмов данных в ~50 Тб на сервер, использование 128 Гб оперативной памяти намного лучше для производительности выполнения запросов, чем 64 Гб.
-
-Не выключайте overcommit. Значение `cat /proc/sys/vm/overcommit_memory` должно быть 0 or 1. Выполните:
-
-``` bash
-$ echo 0 | sudo tee /proc/sys/vm/overcommit_memory
-```
-
-## Huge Pages {#huge-pages}
-
-Механизм прозрачных huge pages нужно отключить. Он мешает работе аллокаторов памяти, что приводит к значительной деградации производительности.
-
-``` bash
-$ echo 'madvise' | sudo tee /sys/kernel/mm/transparent_hugepage/enabled
-```
-
-С помощью `perf top` можно наблюдать за временем, проведенном в ядре операционной системы для управления памятью.
-Постоянные huge pages так же не нужно аллоцировать.
-
-## Подсистема хранения {#podsistema-khraneniia}
-
-Если ваш бюджет позволяет использовать SSD, используйте SSD.
-В противном случае используйте HDD. SATA HDDs 7200 RPM подойдут.
-
-Предпочитайте много серверов с локальными жесткими дисками вместо меньшего числа серверов с подключенными дисковыми полками.
-Но для хранения архивов с редкими запросами полки всё же подходят.
-
-## RAID {#raid}
-
-При использовании HDD можно объединить их RAID-10, RAID-5, RAID-6 или RAID-50.
-Лучше использовать программный RAID в Linux (`mdadm`). Лучше не использовать LVM.
-При создании RAID-10, нужно выбрать `far` расположение.
-Если бюджет позволяет, лучше выбрать RAID-10.
-
-На более чем 4 дисках вместо RAID-5 нужно использовать RAID-6 (предпочтительнее) или RAID-50.
-При использовании RAID-5, RAID-6 или RAID-50, нужно всегда увеличивать stripe_cache_size, так как значение по умолчанию выбрано не самым удачным образом.
-
-``` bash
-$ echo 4096 | sudo tee /sys/block/md2/md/stripe_cache_size
-```
-
-Точное число стоит вычислять из числа устройств и размер блока по формуле: `2 * num_devices * chunk_size_in_bytes / 4096`.
-
-Размер блока в 1024 Кб подходит для всех конфигураций RAID.
-Никогда не указывайте слишком маленький или слишком большой размер блока.
-
-На SSD можно использовать RAID-0.
-Вне зависимости от использования RAID, всегда используйте репликацию для безопасности данных.
-
-Включите NCQ с длинной очередью. Для HDD стоит выбрать планировщик CFQ, а для SSD — noop. Не стоит уменьшать настройку readahead.
-На HDD стоит включать кеш записи.
-
-## Файловая система {#failovaia-sistema}
-
-Ext4 самый проверенный вариант. Укажите опции монтирования `noatime,nobarrier`.
-XFS также подходит, но не так тщательно протестирована в сочетании с ClickHouse.
-Большинство других файловых систем также должны нормально работать. Файловые системы с отложенной аллокацией работают лучше.
-
-## Ядро Linux {#iadro-linux}
-
-Не используйте слишком старое ядро Linux.
-
-## Сеть {#set}
-
-При использовании IPv6, стоит увеличить размер кеша маршрутов.
-Ядра Linux до 3.2 имели массу проблем в реализации IPv6.
-
-Предпочитайте как минимум 10 Гбит сеть. 1 Гбит также будет работать, но намного хуже для починки реплик с десятками терабайт данных или для обработки распределенных запросов с большим объёмом промежуточных данных.
-
-## ZooKeeper {#zookeeper}
-
-Вероятно вы уже используете ZooKeeper для других целей. Можно использовать ту же инсталляцию ZooKeeper, если она не сильно перегружена.
-
-Лучше использовать свежую версию ZooKeeper, как минимум 3.4.9. Версия в стабильных дистрибутивах Linux может быть устаревшей.
-
-Никогда не используете написанные вручную скрипты для переноса данных между разными ZooKeeper кластерами, потому что результат будет некорректный для sequential нод. Никогда не используйте утилиту «zkcopy», по той же причине: https://github.com/ksprojects/zkcopy/issues/15
-
-Если вы хотите разделить существующий ZooKeeper кластер на два, правильный способ - увеличить количество его реплик, а затем переконфигурировать его как два независимых кластера.
-
-Не запускайте ZooKeeper на тех же серверах, что и ClickHouse. Потому что ZooKeeper очень чувствителен к задержкам, а ClickHouse может использовать все доступные системные ресурсы.
-
-С настройками по умолчанию, ZooKeeper является бомбой замедленного действия:
-
-> Сервер ZooKeeper не будет удалять файлы со старыми снепшоты и логами при использовании конфигурации по умолчанию (см. autopurge), это является ответственностью оператора.
-
-Эту бомбу нужно обезвредить.
-
-Далее описана конфигурация ZooKeeper (3.5.1), используемая в боевом окружении Яндекс.Метрики на момент 20 мая 2017 года:
-
-zoo.cfg:
-
-``` bash
-# http://hadoop.apache.org/zookeeper/docs/current/zookeeperAdmin.html
-
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit=30000
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=10
-
-maxClientCnxns=2000
-
-maxSessionTimeout=60000000
-# the directory where the snapshot is stored.
-dataDir=/opt/zookeeper/{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }}/data
-# Place the dataLogDir to a separate physical disc for better performance
-dataLogDir=/opt/zookeeper/{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }}/logs
-
-autopurge.snapRetainCount=10
-autopurge.purgeInterval=1
-
-
-# To avoid seeks ZooKeeper allocates space in the transaction log file in
-# blocks of preAllocSize kilobytes. The default block size is 64M. One reason
-# for changing the size of the blocks is to reduce the block size if snapshots
-# are taken more often. (Also, see snapCount).
-preAllocSize=131072
-
-# Clients can submit requests faster than ZooKeeper can process them,
-# especially if there are a lot of clients. To prevent ZooKeeper from running
-# out of memory due to queued requests, ZooKeeper will throttle clients so that
-# there is no more than globalOutstandingLimit outstanding requests in the
-# system. The default limit is 1,000.ZooKeeper logs transactions to a
-# transaction log. After snapCount transactions are written to a log file a
-# snapshot is started and a new transaction log file is started. The default
-# snapCount is 10,000.
-snapCount=3000000
-
-# If this option is defined, requests will be will logged to a trace file named
-# traceFile.year.month.day.
-#traceFile=
-
-# Leader accepts client connections. Default value is "yes". The leader machine
-# coordinates updates. For higher update throughput at thes slight expense of
-# read throughput the leader can be configured to not accept clients and focus
-# on coordination.
-leaderServes=yes
-
-standaloneEnabled=false
-dynamicConfigFile=/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }}/conf/zoo.cfg.dynamic
-```
-
-Версия Java:
-
-``` text
-Java(TM) SE Runtime Environment (build 1.8.0_25-b17)
-Java HotSpot(TM) 64-Bit Server VM (build 25.25-b02, mixed mode)
-```
-
-Параметры JVM:
-
-``` bash
-NAME=zookeeper-{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }}
-ZOOCFGDIR=/etc/$NAME/conf
-
-# TODO this is really ugly
-# How to find out, which jars are needed?
-# seems, that log4j requires the log4j.properties file to be in the classpath
-CLASSPATH="$ZOOCFGDIR:/usr/build/classes:/usr/build/lib/*.jar:/usr/share/zookeeper/zookeeper-3.5.1-metrika.jar:/usr/share/zookeeper/slf4j-log4j12-1.7.5.jar:/usr/share/zookeeper/slf4j-api-1.7.5.jar:/usr/share/zookeeper/servlet-api-2.5-20081211.jar:/usr/share/zookeeper/netty-3.7.0.Final.jar:/usr/share/zookeeper/log4j-1.2.16.jar:/usr/share/zookeeper/jline-2.11.jar:/usr/share/zookeeper/jetty-util-6.1.26.jar:/usr/share/zookeeper/jetty-6.1.26.jar:/usr/share/zookeeper/javacc.jar:/usr/share/zookeeper/jackson-mapper-asl-1.9.11.jar:/usr/share/zookeeper/jackson-core-asl-1.9.11.jar:/usr/share/zookeeper/commons-cli-1.2.jar:/usr/src/java/lib/*.jar:/usr/etc/zookeeper"
-
-ZOOCFG="$ZOOCFGDIR/zoo.cfg"
-ZOO_LOG_DIR=/var/log/$NAME
-USER=zookeeper
-GROUP=zookeeper
-PIDDIR=/var/run/$NAME
-PIDFILE=$PIDDIR/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-JAVA=/usr/bin/java
-ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
-ZOO_LOG4J_PROP="INFO,ROLLINGFILE"
-JMXLOCALONLY=false
-JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '{{' }} '}}' }} \
-    -Xmx{{ '{{' }} cluster.get('xmx','1G') {{ '{{' }} '}}' }} \
-    -Xloggc:/var/log/$NAME/zookeeper-gc.log \
-    -XX:+UseGCLogFileRotation \
-    -XX:NumberOfGCLogFiles=16 \
-    -XX:GCLogFileSize=16M \
-    -verbose:gc \
-    -XX:+PrintGCTimeStamps \
-    -XX:+PrintGCDateStamps \
-    -XX:+PrintGCDetails
-    -XX:+PrintTenuringDistribution \
-    -XX:+PrintGCApplicationStoppedTime \
-    -XX:+PrintGCApplicationConcurrentTime \
-    -XX:+PrintSafepointStatistics \
-    -XX:+UseParNewGC \
-    -XX:+UseConcMarkSweepGC \
--XX:+CMSParallelRemarkEnabled"
-```
-
-Salt init:
-
-``` text
-description "zookeeper-{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }} centralized coordination service"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-respawn
-
-limit nofile 8192 8192
-
-pre-start script
-    [ -r "/etc/zookeeper-{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }}/conf/environment" ] || exit 0
-    . /etc/zookeeper-{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }}/conf/environment
-    [ -d $ZOO_LOG_DIR ] || mkdir -p $ZOO_LOG_DIR
-    chown $USER:$GROUP $ZOO_LOG_DIR
-end script
-
-script
-    . /etc/zookeeper-{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }}/conf/environment
-    [ -r /etc/default/zookeeper ] && . /etc/default/zookeeper
-    if [ -z "$JMXDISABLE" ]; then
-        JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY"
-    fi
-    exec start-stop-daemon --start -c $USER --exec $JAVA --name zookeeper-{{ '{{' }} cluster['name'] {{ '{{' }} '}}' }} \
-        -- -cp $CLASSPATH $JAVA_OPTS -Dzookeeper.log.dir=${ZOO_LOG_DIR} \
-        -Dzookeeper.root.logger=${ZOO_LOG4J_PROP} $ZOOMAIN $ZOOCFG
-end script
-```
-
diff --git a/docs/ru/operations/tips.md b/docs/ru/operations/tips.md
new file mode 120000
index 00000000000..9b3413bdbc3
--- /dev/null
+++ b/docs/ru/operations/tips.md
@@ -0,0 +1 @@
+../../en/operations/tips.md
\ No newline at end of file
diff --git a/docs/ru/operations/update.md b/docs/ru/operations/update.md
index 5c187ed1604..a3e87b52ede 100644
--- a/docs/ru/operations/update.md
+++ b/docs/ru/operations/update.md
@@ -3,7 +3,7 @@ toc_priority: 47
 toc_title: "Обновление ClickHouse"
 ---
 
-# Обновление ClickHouse {#obnovlenie-clickhouse}
+# Обновление ClickHouse {#clickhouse-upgrade}
 
 Если ClickHouse установлен с помощью deb-пакетов, выполните следующие команды на сервере:
 
@@ -15,4 +15,17 @@ $ sudo service clickhouse-server restart
 
 Если ClickHouse установлен не из рекомендуемых deb-пакетов, используйте соответствующий метод обновления.
 
-ClickHouse не поддерживает распределенное обновление. Операция должна выполняться последовательно на каждом отдельном сервере. Не обновляйте все серверы в кластере одновременно, иначе кластер становится недоступным в течение некоторого времени.
+!!! note "Примечание"
+    Вы можете обновить сразу несколько серверов, кроме случая, когда все реплики одного шарда отключены.
+
+Обновление ClickHouse до определенной версии:
+
+**Пример**
+
+`xx.yy.a.b` — это номер текущей стабильной версии. Последнюю стабильную версию можно узнать [здесь](https://github.com/ClickHouse/ClickHouse/releases)
+
+```bash
+$ sudo apt-get update
+$ sudo apt-get install clickhouse-server=xx.yy.a.b clickhouse-client=xx.yy.a.b clickhouse-common-static=xx.yy.a.b
+$ sudo service clickhouse-server restart
+```
diff --git a/docs/ru/operations/utilities/clickhouse-compressor.md b/docs/ru/operations/utilities/clickhouse-compressor.md
new file mode 100644
index 00000000000..d7f6862a62c
--- /dev/null
+++ b/docs/ru/operations/utilities/clickhouse-compressor.md
@@ -0,0 +1,27 @@
+## ClickHouse compressor
+
+Simple program for data compression and decompression in ClickHouse way.
+
+### Examples
+
+Compress data with LZ4:
+```
+$ ./clickhouse-compressor < input_file > output_file
+```
+
+Decompress data from LZ4 format:
+```
+$ ./clickhouse-compressor --decompress < input_file > output_file
+```
+
+Compress data with ZSTD at level 5:
+
+```
+$ ./clickhouse-compressor --codec 'ZSTD(5)' < input_file > output_file
+```
+
+Compress data with Delta of four bytes and ZSTD level 10.
+
+```
+$ ./clickhouse-compressor --codec 'Delta(4)' --codec 'ZSTD(10)' < input_file > output_file
+```
diff --git a/docs/ru/operations/utilities/clickhouse-format.md b/docs/ru/operations/utilities/clickhouse-format.md
new file mode 100644
index 00000000000..43043fcc1d5
--- /dev/null
+++ b/docs/ru/operations/utilities/clickhouse-format.md
@@ -0,0 +1,98 @@
+---
+toc_priority: 65
+toc_title: clickhouse-format
+---
+
+# clickhouse-format {#clickhouse-format}
+
+Позволяет форматировать входящие запросы.
+
+Ключи:
+
+- `--help` или`-h` — выводит описание ключей.
+- `--hilite` — добавляет подсветку синтаксиса с экранированием символов.
+- `--oneline` — форматирование в одну строку.
+- `--quiet` или `-q` — проверяет синтаксис без вывода результата.
+- `--multiquery` or `-n` — поддерживает несколько запросов в одной строке.
+- `--obfuscate` — обфусцирует вместо форматирования.
+- `--seed <строка>` — задает строку, которая определяет результат обфускации.
+- `--backslash` — добавляет обратный слеш в конце каждой строки отформатированного запроса. Удобно использовать если многострочный запрос скопирован из интернета или другого источника и его нужно выполнить из командной строки.
+
+## Примеры {#examples} 
+
+1. Подсветка синтаксиса и форматирование в одну строку:
+
+```bash
+$ clickhouse-format --oneline --hilite <<< "SELECT sum(number) FROM numbers(5);"
+```
+
+Результат:
+
+```sql
+SELECT sum(number) FROM numbers(5)
+```
+
+2. Несколько запросов в одной строке: 
+
+```bash
+$ clickhouse-format -n <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+    
+Результат:
+
+```text
+SELECT *
+FROM
+(
+    SELECT 1 AS x
+    UNION ALL
+    SELECT 1
+    UNION DISTINCT
+    SELECT 3
+)
+;
+```
+
+3. Обфускация:
+
+```bash
+$ clickhouse-format --seed Hello --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+
+Результат:
+
+```text
+SELECT treasury_mammoth_hazelnut BETWEEN nutmeg AND span, CASE WHEN chive >= 116 THEN switching ELSE ANYTHING END;
+```
+   
+Тот же запрос с другой инициализацией обфускатора:
+
+```bash
+$ clickhouse-format --seed World --obfuscate <<< "SELECT cost_first_screen BETWEEN a AND b, CASE WHEN x >= 123 THEN y ELSE NULL END;"
+```
+    
+Результат:
+
+```text
+SELECT horse_tape_summer BETWEEN folklore AND moccasins, CASE WHEN intestine >= 116 THEN nonconformist ELSE FORESTRY END;
+```
+
+4. Добавление обратного слеша:
+
+```bash
+$ clickhouse-format --backslash <<< "SELECT * FROM (SELECT 1 AS x UNION ALL SELECT 1 UNION DISTINCT SELECT 3);"
+```
+
+Результат:
+
+```text
+SELECT * \
+FROM  \
+( \
+    SELECT 1 AS x \
+    UNION ALL \
+    SELECT 1 \
+    UNION DISTINCT \
+    SELECT 3 \
+)
+``` 
diff --git a/docs/ru/operations/utilities/index.md b/docs/ru/operations/utilities/index.md
index fa257fb4b1a..88bd0305386 100644
--- a/docs/ru/operations/utilities/index.md
+++ b/docs/ru/operations/utilities/index.md
@@ -6,6 +6,10 @@ toc_title: "Обзор"
 
 # Утилиты ClickHouse {#utility-clickhouse}
 
--   [clickhouse-local](clickhouse-local.md)
+-   [clickhouse-local](clickhouse-local.md) - позволяет выполнять SQL-запросы над данными без остановки сервера ClickHouse, подобно утилите `awk`.
 -   [clickhouse-copier](clickhouse-copier.md) - копирует (и перешардирует) данные с одного кластера на другой.
-
+-   [clickhouse-benchmark](../../operations/utilities/clickhouse-benchmark.md) — устанавливает соединение с сервером ClickHouse и запускает циклическое выполнение указанных запросов.
+-   [clickhouse-format](../../operations/utilities/clickhouse-format.md) — позволяет форматировать входящие запросы.
+-   [ClickHouse obfuscator](../../operations/utilities/clickhouse-obfuscator.md) — обфусцирует данные.
+-   [ClickHouse compressor](../../operations/utilities/clickhouse-compressor.md) — упаковывает и распаковывает данные.
+-   [clickhouse-odbc-bridge](../../operations/utilities/odbc-bridge.md) — прокси-сервер для ODBC.
diff --git a/docs/ru/operations/utilities/odbc-bridge.md b/docs/ru/operations/utilities/odbc-bridge.md
new file mode 100644
index 00000000000..39c796c10c1
--- /dev/null
+++ b/docs/ru/operations/utilities/odbc-bridge.md
@@ -0,0 +1,38 @@
+# clickhouse-odbc-bridge
+
+Simple HTTP-server which works like a proxy for ODBC driver. The main motivation
+was possible segfaults or another faults in ODBC implementations, which can
+crash whole clickhouse-server process.
+
+This tool works via HTTP, not via pipes, shared memory, or TCP because:
+- It's simpler to implement
+- It's simpler to debug
+- jdbc-bridge can be implemented in the same way
+
+## Usage
+
+`clickhouse-server` use this tool inside odbc table function and StorageODBC.
+However it can be used as standalone tool from command line with the following
+parameters in POST-request URL:
+- `connection_string` -- ODBC connection string.
+- `columns` -- columns in ClickHouse NamesAndTypesList format, name in backticks,
+  type as string. Name and type are space separated, rows separated with
+  newline.
+- `max_block_size` -- optional parameter, sets maximum size of single block.
+Query is send in post body. Response is returned in RowBinary format.
+
+## Example:
+
+```bash
+$ clickhouse-odbc-bridge --http-port 9018 --daemon
+
+$ curl -d "query=SELECT PageID, ImpID, AdType FROM Keys ORDER BY PageID, ImpID" --data-urlencode "connection_string=DSN=ClickHouse;DATABASE=stat" --data-urlencode "columns=columns format version: 1
+3 columns:
+\`PageID\` String
+\`ImpID\` String
+\`AdType\` String
+"  "http://localhost:9018/" > result.txt
+
+$ cat result.txt # Result in RowBinary format
+12246623837185725195925621517
+```
diff --git a/docs/ru/sql-reference/aggregate-functions/combinators.md b/docs/ru/sql-reference/aggregate-functions/combinators.md
index eb52fa9bc75..74f9d1c1c05 100644
--- a/docs/ru/sql-reference/aggregate-functions/combinators.md
+++ b/docs/ru/sql-reference/aggregate-functions/combinators.md
@@ -27,6 +27,40 @@ toc_title: "Комбинаторы агрегатных функций"
 
 Комбинаторы -If и -Array можно сочетать. При этом, должен сначала идти Array, а потом If. Примеры: `uniqArrayIf(arr, cond)`, `quantilesTimingArrayIf(level1, level2)(arr, cond)`. Из-за такого порядка получается, что аргумент cond не должен быть массивом.
 
+## -SimpleState {#agg-functions-combinator-simplestate}
+
+При использовании этого комбинатора агрегатная функция возвращает то же значение, но типа [SimpleAggregateFunction(...)](../../sql-reference/data-types/simpleaggregatefunction.md). Текущее значение функции может храниться в таблице для последующей работы с таблицами семейства [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md).
+
+**Синтаксис**
+
+``` sql
+<aggFunction>SimpleState(x)
+```
+
+**Аргументы**
+
+-   `x` — параметры агрегатной функции.
+
+**Возвращаемое значение**
+
+Значение агрегатной функции типа `SimpleAggregateFunction(...)`.
+
+**Пример**
+
+Запрос:
+
+``` sql
+WITH anySimpleState(number) AS c SELECT toTypeName(c), c FROM numbers(1);
+```
+
+Результат:
+
+``` text
+┌─toTypeName(c)────────────────────────┬─c─┐
+│ SimpleAggregateFunction(any, UInt64) │ 0 │
+└──────────────────────────────────────┴───┘
+```
+
 ## -State {#state}
 
 В случае применения этого комбинатора, агрегатная функция возвращает не готовое значение (например, в случае функции [uniq](reference/uniq.md#agg_function-uniq) — количество уникальных значений), а промежуточное состояние агрегации (например, в случае функции `uniq` — хэш-таблицу для расчёта количества уникальных значений), которое имеет тип `AggregateFunction(...)` и может использоваться для дальнейшей обработки или может быть сохранено в таблицу для последующей доагрегации.
@@ -247,4 +281,3 @@ FROM people
 │ [3,2]  │ [11.5,12.949999809265137] │
 └────────┴───────────────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
index e5162b63b88..508c8de2a58 100644
--- a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
@@ -253,7 +253,7 @@ windowFunnel(window, [mode, [mode, ... ]])(timestamp, cond1, cond2, ..., condN)
 
 **Параметры**
 
--   `window` — ширина скользящего окна по времени. Единица измерения зависит от `timestamp` и может варьироваться. Должно соблюдаться условие `timestamp события cond2 <= timestamp события cond1 + window`.
+-   `window` — ширина скользящего окна по времени. Это время между первым и последним условием. Единица измерения зависит от `timestamp` и может варьироваться. Должно соблюдаться условие `timestamp события cond1 <= timestamp события cond2 <= ... <= timestamp события condN <= timestamp события cond1 + window`. 
 -   `mode` — необязательный параметр. Может быть установленно несколько значений одновременно.
     -   `'strict'` — не учитывать подряд идущие повторяющиеся события.
     -   `'strict_order'` — запрещает посторонние события в искомой последовательности. Например, при поиске цепочки `A->B->C` в `A->B->D->C` поиск будет остановлен на `D` и функция вернет 2.
@@ -311,7 +311,7 @@ FROM
     GROUP BY user_id
 )
 GROUP BY level
-ORDER BY level ASC
+ORDER BY level ASC;
 ```
 
 ## retention {#retention}
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
index b025a248f3c..6825847f256 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/deltasum.md
@@ -6,6 +6,9 @@ toc_priority: 141
 
 Суммирует арифметическую разницу между последовательными строками. Если разница отрицательна — она будет проигнорирована.
 
+!!! info "Примечание"
+    Чтобы эта функция работала должным образом, исходные данные должны быть отсортированы. В [материализованном представлении](../../../sql-reference/statements/create/view.md#materialized) вместо нее рекомендуется использовать [deltaSumTimestamp](../../../sql-reference/aggregate-functions/reference/deltasumtimestamp.md#agg_functions-deltasumtimestamp).
+
 **Синтаксис**
 
 ``` sql
@@ -18,7 +21,8 @@ deltaSum(value)
 
 **Возвращаемое значение**
 
--   накопленная арифметическая разница, типа `Integer` или `Float`.
+-   Накопленная арифметическая разница.
+Тип: `Integer` или `Float`.
 
 **Примеры**
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
new file mode 100644
index 00000000000..10294eb9e6d
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -0,0 +1,45 @@
+---
+toc_priority: 141
+---
+
+# deltaSumTimestamp {#agg_functions-deltasumtimestamp}
+
+Суммирует разницу между последовательными строками. Если разница отрицательна — она будет проигнорирована. 
+
+Эта функция предназначена в первую очередь для [материализованных представлений](../../../sql-reference/statements/create/view.md#materialized), упорядоченных по некоторому временному бакету согласно timestamp, например, по бакету `toStartOfMinute`. Поскольку строки в таком материализованном представлении будут иметь одинаковый timestamp, невозможно объединить их в "правом" порядке. Функция отслеживает `timestamp` наблюдаемых значений, поэтому возможно правильно упорядочить состояния во время слияния.
+
+Чтобы вычислить разницу между упорядоченными последовательными строками, вы можете использовать функцию [deltaSum](../../../sql-reference/aggregate-functions/reference/deltasum.md#agg_functions-deltasum) вместо функции `deltaSumTimestamp`.
+
+**Синтаксис**
+
+``` sql
+deltaSumTimestamp(value, timestamp)
+```
+
+**Аргументы**
+
+-   `value` — входные значения, должны быть типа [Integer](../../data-types/int-uint.md), или [Float](../../data-types/float.md), или [Date](../../data-types/date.md), или [DateTime](../../data-types/datetime.md).
+-   `timestamp` — параметр для упорядочивания значений, должен быть типа [Integer](../../data-types/int-uint.md), или [Float](../../data-types/float.md), или [Date](../../data-types/date.md), или [DateTime](../../data-types/datetime.md).
+
+**Возвращаемое значение**
+
+-   Накопленная разница между последовательными значениями, упорядоченными по параметру `timestamp`.
+
+Тип: [Integer](../../data-types/int-uint.md), или [Float](../../data-types/float.md), или [Date](../../data-types/date.md), или [DateTime](../../data-types/datetime.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT deltaSumTimestamp(value, timestamp) 
+FROM (SELECT number AS timestamp, [0, 4, 8, 3, 0, 0, 0, 1, 3, 5][number] AS value FROM numbers(1, 10));
+```
+
+Результат:
+
+``` text
+┌─deltaSumTimestamp(value, timestamp)─┐
+│                                  13 │
+└─────────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/max.md b/docs/ru/sql-reference/aggregate-functions/reference/max.md
deleted file mode 100644
index 4f61ecd051d..00000000000
--- a/docs/ru/sql-reference/aggregate-functions/reference/max.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-toc_priority: 3
----
-
-# max {#agg_function-max}
-
-Вычисляет максимум.
-
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/max.md b/docs/ru/sql-reference/aggregate-functions/reference/max.md
new file mode 120000
index 00000000000..ae47679c80e
--- /dev/null
+++ b/docs/ru/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/ru/sql-reference/aggregate-functions/reference/min.md b/docs/ru/sql-reference/aggregate-functions/reference/min.md
deleted file mode 100644
index 16dd577e790..00000000000
--- a/docs/ru/sql-reference/aggregate-functions/reference/min.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-toc_priority: 2
----
-
-## min {#agg_function-min}
-
-Вычисляет минимум.
-
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/min.md b/docs/ru/sql-reference/aggregate-functions/reference/min.md
new file mode 120000
index 00000000000..61417b347a8
--- /dev/null
+++ b/docs/ru/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/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md b/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
index f7239be0ba5..6dce79d8a89 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@@ -12,6 +12,9 @@ toc_priority: 208
 
 Внутренние состояния функций `quantile*` не объединяются, если они используются в одном запросе. Если вам необходимо вычислить квантили нескольких уровней, используйте функцию [quantiles](#quantiles), это повысит эффективность запроса.
 
+!!! note "Примечание"
+    Использование `quantileTDigestWeighted` [не рекомендуется для небольших наборов данных](https://github.com/tdunning/t-digest/issues/167#issuecomment-828650275) и может привести к значительной ошибке. Рассмотрите возможность использования [`quantileTDigest`](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md) в таких случаях.
+
 **Синтаксис**
 
 ``` sql
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md b/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md
index c98e7b88bcf..73d0552fc6f 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/rankCorr.md
@@ -1,4 +1,8 @@
-## rankCorr {#agg_function-rankcorr}
+---
+toc_priority: 145
+---
+
+# rankCorr {#agg_function-rankcorr}
 
 Вычисляет коэффициент ранговой корреляции.
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md b/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
new file mode 100644
index 00000000000..0606b06fba0
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
@@ -0,0 +1,46 @@
+---
+toc_priority: 144
+---
+
+# sumCount {#agg_function-sumCount}
+
+Вычисляет сумму чисел и одновременно подсчитывает количество строк.
+
+**Синтаксис**
+
+``` sql
+sumCount(x)
+```
+
+**Аргументы** 
+
+-   `x` — Входное значение типа [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), или [Decimal](../../../sql-reference/data-types/decimal.md).
+
+**Возвращаемое значение**
+
+-   Кортеж из элементов `(sum, count)`, где `sum` — это сумма чисел и `count` — количество строк со значениями, отличными от `NULL`.
+
+Тип: [Tuple](../../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE s_table (x Nullable(Int8)) Engine = Log;
+INSERT INTO s_table SELECT number FROM numbers(0, 20);
+INSERT INTO s_table VALUES (NULL);
+SELECT sumCount(x) from s_table;
+```
+
+Результат:
+
+``` text
+┌─sumCount(x)─┐
+│ (190,20)    │
+└─────────────┘
+```
+
+**Смотрите также**
+
+- Настройка [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md
index 4002cc06383..7a421d419ae 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -26,7 +26,7 @@ uniqHLL12(x[, ...])
 
 -   Использует алгоритм HyperLogLog для аппроксимации числа различных значений аргументов.
 
-        Используется 212 5-битовых ячеек. Размер состояния чуть больше 2.5 КБ. Результат не точный (ошибка до ~10%) для небольших множеств (<10K элементов). Однако для множеств большой кардинальности (10K - 100M) результат довольно точен (ошибка до ~1.6%). Начиная с 100M ошибка оценки будет только расти и для множеств огромной кардинальности (1B+ элементов) функция возвращает результат с очень большой неточностью.
+        Используется 2^12 5-битовых ячеек. Размер состояния чуть больше 2.5 КБ. Результат не точный (ошибка до ~10%) для небольших множеств (<10K элементов). Однако для множеств большой кардинальности (10K - 100M) результат довольно точен (ошибка до ~1.6%). Начиная с 100M ошибка оценки будет только расти и для множеств огромной кардинальности (1B+ элементов) функция возвращает результат с очень большой неточностью.
 
 -   Результат детерминирован (не зависит от порядка выполнения запроса).
 
diff --git a/docs/ru/sql-reference/data-types/datetime.md b/docs/ru/sql-reference/data-types/datetime.md
index ebd780d0d7d..c9804f57c33 100644
--- a/docs/ru/sql-reference/data-types/datetime.md
+++ b/docs/ru/sql-reference/data-types/datetime.md
@@ -20,8 +20,7 @@ DateTime([timezone])
 ## Использование {#ispolzovanie}
 
 Момент времени сохраняется как [Unix timestamp](https://ru.wikipedia.org/wiki/Unix-%D0%B2%D1%80%D0%B5%D0%BC%D1%8F), независимо от часового пояса и переходов на летнее/зимнее время. Дополнительно, тип `DateTime` позволяет хранить часовой пояс, единый для всей колонки, который влияет на то, как будут отображаться значения типа `DateTime` в текстовом виде и как будут парситься значения заданные в виде строк (‘2020-01-01 05:00:01’). Часовой пояс не хранится в строках таблицы (выборки), а хранится в метаданных колонки.
-Список поддерживаемых временных зон можно найти в [IANA Time Zone Database](https://www.iana.org/time-zones).
-Пакет `tzdata`, содержащий [базу данных часовых поясов IANA](https://www.iana.org/time-zones), должен быть установлен в системе. Используйте команду `timedatectl list-timezones` для получения списка часовых поясов, известных локальной системе.
+Список поддерживаемых часовых поясов можно найти в [IANA Time Zone Database](https://www.iana.org/time-zones) или получить из базы данных, выполнив запрос `SELECT * FROM system.time_zones`. Также [список](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) есть в Википедии.
 
 Часовой пояс для столбца типа `DateTime` можно в явном виде установить при создании таблицы. Если часовой пояс не установлен, то ClickHouse использует значение параметра [timezone](../../sql-reference/data-types/datetime.md#server_configuration_parameters-timezone), установленное в конфигурации сервера или в настройках операционной системы на момент запуска сервера.
 
diff --git a/docs/ru/sql-reference/data-types/datetime64.md b/docs/ru/sql-reference/data-types/datetime64.md
index 6576bf9dc0d..3a08da75bb7 100644
--- a/docs/ru/sql-reference/data-types/datetime64.md
+++ b/docs/ru/sql-reference/data-types/datetime64.md
@@ -7,9 +7,9 @@ toc_title: DateTime64
 
 Позволяет хранить момент времени, который может быть представлен как календарная дата и время, с заданной суб-секундной точностью.
 
-Размер тика/точность: 10<sup>-precision</sup> секунд, где precision - целочисленный параметр типа.
+Размер тика (точность, precision): 10<sup>-precision</sup> секунд, где precision - целочисленный параметр.
 
-Синтаксис:
+**Синтаксис:**
 
 ``` sql
 DateTime64(precision, [timezone])
@@ -17,9 +17,11 @@ DateTime64(precision, [timezone])
 
 Данные хранятся в виде количества ‘тиков’, прошедших с момента начала эпохи (1970-01-01 00:00:00 UTC), в Int64. Размер тика определяется параметром precision. Дополнительно, тип `DateTime64` позволяет хранить часовой пояс, единый для всей колонки, который влияет на то, как будут отображаться значения типа `DateTime64` в текстовом виде и как будут парситься значения заданные в виде строк (‘2020-01-01 05:00:01.000’). Часовой пояс не хранится в строках таблицы (выборки), а хранится в метаданных колонки. Подробнее см. [DateTime](datetime.md).
 
-## Пример {#primer}
+Поддерживаются значения от 1 января 1925 г. и до 31 декабря 2283 г.
 
-**1.** Создание таблицы с столбцом типа `DateTime64` и вставка данных в неё:
+## Примеры {#examples}
+
+1. Создание таблицы со столбцом типа `DateTime64` и вставка данных в неё:
 
 ``` sql
 CREATE TABLE dt
@@ -27,15 +29,15 @@ CREATE TABLE dt
     `timestamp` DateTime64(3, 'Europe/Moscow'),
     `event_id` UInt8
 )
-ENGINE = TinyLog
+ENGINE = TinyLog;
 ```
 
 ``` sql
-INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2)
+INSERT INTO dt Values (1546300800000, 1), ('2019-01-01 00:00:00', 2);
 ```
 
 ``` sql
-SELECT * FROM dt
+SELECT * FROM dt;
 ```
 
 ``` text
@@ -46,12 +48,12 @@ SELECT * FROM dt
 ```
 
 -   При вставке даты-времени как числа (аналогично ‘Unix timestamp’), время трактуется как UTC. Unix timestamp `1546300800` в часовом поясе `Europe/London (UTC+0)` представляет время `'2019-01-01 00:00:00'`. Однако, столбец `timestamp` имеет тип `DateTime('Europe/Moscow (UTC+3)')`, так что при выводе в виде строки время отобразится как `2019-01-01 03:00:00`.
--   При вставке даты-времени в виде строки, время трактуется соответственно часовому поясу установленному для колонки. `'2019-01-01 00:00:00'` трактуется как время по Москве (и в базу сохраняется `'2018-12-31 21:00:00'` в виде Unix Timestamp)
+-   При вставке даты-времени в виде строки, время трактуется соответственно часовому поясу установленному для колонки. `'2019-01-01 00:00:00'` трактуется как время по Москве (и в базу сохраняется `'2018-12-31 21:00:00'` в виде Unix Timestamp).
 
-**2.** Фильтрация по значениям даты-времени
+2. Фильтрация по значениям даты и времени
 
 ``` sql
-SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow')
+SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow');
 ```
 
 ``` text
@@ -60,12 +62,12 @@ SELECT * FROM dt WHERE timestamp = toDateTime64('2019-01-01 00:00:00', 3, 'Europ
 └─────────────────────────┴──────────┘
 ```
 
-В отличие от типа `DateTime`, `DateTime64` не конвертируется из строк автоматически
+В отличие от типа `DateTime`, `DateTime64` не конвертируется из строк автоматически.
 
-**3.** Получение часового пояса для значения типа `DateTime64`:
+3. Получение часового пояса для значения типа `DateTime64`:
 
 ``` sql
-SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x
+SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS x;
 ```
 
 ``` text
@@ -74,13 +76,13 @@ SELECT toDateTime64(now(), 3, 'Europe/Moscow') AS column, toTypeName(column) AS
 └─────────────────────────┴────────────────────────────────┘
 ```
 
-**4.** Конвертация часовых поясов
+4. Конвертация часовых поясов
 
 ``` sql
 SELECT
 toDateTime64(timestamp, 3, 'Europe/London') as lon_time,
 toDateTime64(timestamp, 3, 'Europe/Moscow') as mos_time
-FROM dt
+FROM dt;
 ```
 
 ``` text
@@ -90,7 +92,7 @@ FROM dt
 └─────────────────────────┴─────────────────────────┘
 ```
 
-## See Also {#see-also}
+**See Also**
 
 -   [Функции преобразования типов](../../sql-reference/functions/type-conversion-functions.md)
 -   [Функции для работы с датой и временем](../../sql-reference/functions/date-time-functions.md)
diff --git a/docs/ru/sql-reference/data-types/simpleaggregatefunction.md b/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
index 0948153362b..7b81c577762 100644
--- a/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
@@ -3,6 +3,8 @@
 Хранит только текущее значение агрегатной функции и не сохраняет ее полное состояние, как это делает [`AggregateFunction`](../../sql-reference/data-types/aggregatefunction.md). Такая оптимизация может быть применена к функциям, которые обладают следующим свойством: результат выполнения функции `f` к набору строк `S1 UNION ALL S2` может быть получен путем выполнения `f` к отдельным частям набора строк,
 а затем повторного выполнения `f` к результатам: `f(S1 UNION ALL S2) = f(f(S1) UNION ALL f(S2))`. Это свойство гарантирует, что результатов частичной агрегации достаточно для вычисления комбинированной, поэтому хранить и обрабатывать какие-либо дополнительные данные не требуется.
 
+Чтобы получить промежуточное значение, обычно используются агрегатные функции с суффиксом [-SimpleState](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-simplestate).
+
 Поддерживаются следующие агрегатные функции:
 
 -   [`any`](../../sql-reference/aggregate-functions/reference/any.md#agg_function-any)
@@ -15,10 +17,12 @@
 -   [`groupBitOr`](../../sql-reference/aggregate-functions/reference/groupbitor.md#groupbitor)
 -   [`groupBitXor`](../../sql-reference/aggregate-functions/reference/groupbitxor.md#groupbitxor)
 -   [`groupArrayArray`](../../sql-reference/aggregate-functions/reference/grouparray.md#agg_function-grouparray)
--   [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference/groupuniqarray.md#groupuniqarray)
+-   [`groupUniqArrayArray`](../../sql-reference/aggregate-functions/reference/groupuniqarray.md)
 -   [`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/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index 285982565c2..f1f4a8fae18 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
@@ -9,7 +9,7 @@ toc_title: "Хранение словарей в памяти"
 
 Рекомендуем [flat](#flat), [hashed](#dicts-external_dicts_dict_layout-hashed) и [complex_key_hashed](#complex-key-hashed). Скорость обработки словарей при этом максимальна.
 
-Размещение с кэшированием не рекомендуется использовать из-за потенциально низкой производительности и сложностей в подборе оптимальных параметров. Читайте об этом подробнее в разделе «[cache](#cache)».
+Размещение с кэшированием не рекомендуется использовать из-за потенциально низкой производительности и сложностей в подборе оптимальных параметров. Читайте об этом подробнее в разделе [cache](#cache).
 
 Повысить производительность словарей можно следующими способами:
 
@@ -48,7 +48,7 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 ...
 ```
 
-## Способы размещения словарей в памяти {#sposoby-razmeshcheniia-slovarei-v-pamiati}
+## Способы размещения словарей в памяти {#ways-to-store-dictionaries-in-memory}
 
 -   [flat](#flat)
 -   [hashed](#dicts-external_dicts_dict_layout-hashed)
@@ -65,11 +65,11 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 
 ### flat {#flat}
 
-Словарь полностью хранится в оперативной памяти в виде плоских массивов. Объём памяти, занимаемой словарём пропорционален размеру самого большого по размеру ключа.
+Словарь полностью хранится в оперативной памяти в виде плоских массивов. Объём памяти, занимаемой словарём, пропорционален размеру самого большого ключа (по объему).
 
-Ключ словаря имеет тип `UInt64` и его величина ограничена 500 000. Если при создании словаря обнаружен ключ больше, то ClickHouse бросает исключение и не создает словарь.
+Ключ словаря имеет тип [UInt64](../../../sql-reference/data-types/int-uint.md) и его величина ограничена параметром `max_array_size` (значение по умолчанию — 500 000). Если при создании словаря обнаружен ключ больше, то ClickHouse бросает исключение и не создает словарь. Начальный размер плоских массивов словарей контролируется параметром initial_array_size (по умолчанию - 1024).
 
-Поддерживаются все виды источников. При обновлении, данные (из файла, из таблицы) читаются целиком.
+Поддерживаются все виды источников. При обновлении данные (из файла или из таблицы) считываются целиком.
 
 Это метод обеспечивает максимальную производительность среди всех доступных способов размещения словаря.
 
@@ -77,40 +77,52 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 
 ``` xml
 <layout>
-  <flat />
+  <flat>
+    <initial_array_size>50000</initial_array_size>
+    <max_array_size>5000000</max_array_size>
+  </flat>
 </layout>
 ```
 
 или
 
 ``` sql
-LAYOUT(FLAT())
+LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
 ```
 
 ### hashed {#dicts-external_dicts_dict_layout-hashed}
 
-Словарь полностью хранится в оперативной памяти в виде хэш-таблиц. Словарь может содержать произвольное количество элементов с произвольными идентификаторами. На практике, количество ключей может достигать десятков миллионов элементов.
+Словарь полностью хранится в оперативной памяти в виде хэш-таблиц. Словарь может содержать произвольное количество элементов с произвольными идентификаторами. На практике количество ключей может достигать десятков миллионов элементов.
 
-Поддерживаются все виды источников. При обновлении, данные (из файла, из таблицы) читаются целиком.
+Если `preallocate` имеет значение `true` (по умолчанию `false`), хеш-таблица будет предварительно определена (это ускорит загрузку словаря). Используйте этот метод только в случае, если:
+
+- Источник поддерживает произвольное количество элементов (пока поддерживается только источником `ClickHouse`).
+- В данных нет дубликатов (иначе это может увеличить объем используемой памяти хеш-таблицы).
+
+Поддерживаются все виды источников. При обновлении данные (из файла, из таблицы) читаются целиком.
 
 Пример конфигурации:
 
 ``` xml
 <layout>
-  <hashed />
+   <hashed>
+    <preallocate>0</preallocate>
+  </hashed>
 </layout>
 ```
 
 или
 
 ``` sql
-LAYOUT(HASHED())
+LAYOUT(HASHED(PREALLOCATE 0))
 ```
 
 ### sparse_hashed {#dicts-external_dicts_dict_layout-sparse_hashed}
 
 Аналогичен `hashed`, но при этом занимает меньше места в памяти и генерирует более высокую загрузку CPU.
 
+Для этого типа размещения также можно задать `preallocate` в значении `true`. В данном случае это более важно, чем для типа `hashed`.
+
 Пример конфигурации:
 
 ``` xml
@@ -122,7 +134,7 @@ LAYOUT(HASHED())
 или
 
 ``` sql
-LAYOUT(SPARSE_HASHED())
+LAYOUT(SPARSE_HASHED([PREALLOCATE 0]))
 ```
 
 ### complex_key_hashed {#complex-key-hashed}
@@ -326,7 +338,7 @@ LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
 
 ``` sql
 LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
-    PATH /var/lib/clickhouse/clickhouse_dictionaries/test_dict))
+    PATH ./user_files/test_dict))
 ```
 
 ### complex_key_ssd_cache {#complex-key-ssd-cache}
@@ -440,4 +452,3 @@ dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
 Никакие другие типы не поддерживаются. Функция возвращает атрибут для префикса, соответствующего данному IP-адресу. Если есть перекрывающиеся префиксы, возвращается наиболее специфический.
 
 Данные должны полностью помещаться в оперативной памяти.
-
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index 9589353649d..1298f05eca0 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -86,3 +86,4 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
+Для словарей `Cache`, `ComplexKeyCache`, `SSDCache` и `SSDComplexKeyCache` поддерживается как синхронное, так и асинхронное обновление.
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 a7999470330..a0378251ece 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
@@ -53,7 +53,7 @@ SOURCE(SOURCE_TYPE(param1 val1 ... paramN valN)) -- Source configuration
 или
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 SETTINGS(format_csv_allow_single_quotes = 0)
 ```
 
@@ -69,7 +69,7 @@ SETTINGS(format_csv_allow_single_quotes = 0)
     -   [ClickHouse](#dicts-external_dicts_dict_sources-clickhouse)
     -   [MongoDB](#dicts-external_dicts_dict_sources-mongodb)
     -   [Redis](#dicts-external_dicts_dict_sources-redis)
-    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)      
+    -   [PostgreSQL](#dicts-external_dicts_dict_sources-postgresql)
 
 ## Локальный файл {#dicts-external_dicts_dict_sources-local_file}
 
@@ -87,7 +87,7 @@ SETTINGS(format_csv_allow_single_quotes = 0)
 или
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 ```
 
 Поля настройки:
@@ -97,6 +97,10 @@ SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
 
 Если словарь с источником `FILE` создается с помощью DDL-команды (`CREATE DICTIONARY ...`), источник словаря должен быть расположен в каталоге `user_files`. Иначе пользователи базы данных будут иметь доступ к произвольному файлу на узле ClickHouse.
 
+**Смотрите также**
+
+-   [Функция dictionary](../../../sql-reference/table-functions/dictionary.md#dictionary-function)
+
 ## Исполняемый файл {#dicts-external_dicts_dict_sources-executable}
 
 Работа с исполняемым файлом зависит от [размещения словаря в памяти](external-dicts-dict-layout.md). Если тип размещения словаря `cache` и `complex_key_cache`, то ClickHouse запрашивает необходимые ключи, отправляя запрос в `STDIN` исполняемого файла.
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index 57f53390d1c..df4742fca45 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -3,7 +3,7 @@ toc_priority: 44
 toc_title: "Ключ и поля словаря"
 ---
 
-# Ключ и поля словаря {#kliuch-i-polia-slovaria}
+# Ключ и поля словаря {#dictionary-key-and-fields}
 
 Секция `<structure>` описывает ключ словаря и поля, доступные для запросов.
 
@@ -88,7 +88,7 @@ PRIMARY KEY Id
 
 -   `PRIMARY KEY` – имя столбца с ключами.
 
-### Составной ключ {#sostavnoi-kliuch}
+### Составной ключ {#composite-key}
 
 Ключом может быть кортеж (`tuple`) из полей произвольных типов. В этом случае [layout](external-dicts-dict-layout.md) должен быть `complex_key_hashed` или `complex_key_cache`.
 
@@ -159,13 +159,12 @@ CREATE DICTIONARY somename (
 | Тег                                                  | Описание                                                                                                                                                                                                                                                                                                                                                      | Обязательный |
 |------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
 | `name`                                               | Имя столбца.                                                                                                                                                                                                                                                                                                                                                  | Да           |
-| `type`                                               | Тип данных ClickHouse.<br/>ClickHouse пытается привести значение из словаря к заданному типу данных. Например, в случае MySQL, в таблице-источнике поле может быть `TEXT`, `VARCHAR`, `BLOB`, но загружено может быть как `String`. [Nullable](../../../sql-reference/data-types/nullable.md) не поддерживается. | Да           |
-| `null_value`                                         | Значение по умолчанию для несуществующего элемента.<br/>В примере это пустая строка. Нельзя указать значение `NULL`.                                                                                                                                                                                                                                          | Да           |
+| `type`                                               | Тип данных ClickHouse.<br/>ClickHouse пытается привести значение из словаря к заданному типу данных. Например, в случае MySQL, в таблице-источнике поле может быть `TEXT`, `VARCHAR`, `BLOB`, но загружено может быть как `String`. <br/>[Nullable](../../../sql-reference/data-types/nullable.md) в настоящее время поддерживается для словарей [Flat](external-dicts-dict-layout.md#flat), [Hashed](external-dicts-dict-layout.md#dicts-external_dicts_dict_layout-hashed), [ComplexKeyHashed](external-dicts-dict-layout.md#complex-key-hashed), [Direct](external-dicts-dict-layout.md#direct), [ComplexKeyDirect](external-dicts-dict-layout.md#complex-key-direct), [RangeHashed](external-dicts-dict-layout.md#range-hashed), [Polygon](external-dicts-dict-polygon.md), [Cache](external-dicts-dict-layout.md#cache), [ComplexKeyCache](external-dicts-dict-layout.md#complex-key-cache), [SSDCache](external-dicts-dict-layout.md#ssd-cache), [SSDComplexKeyCache](external-dicts-dict-layout.md#complex-key-ssd-cache). Для словарей [IPTrie](external-dicts-dict-layout.md#ip-trie) `Nullable`-типы не поддерживаются. | Да           |
+| `null_value`                                         | Значение по умолчанию для несуществующего элемента.<br/>В примере это пустая строка. Значение [NULL](../../syntax.md#null-literal) можно указывать только для типов `Nullable` (см. предыдущую строку с описанием типов).                                                                                                                                                                                                                                          | Да           |
 | `expression`                                         | [Выражение](../../syntax.md#syntax-expressions), которое ClickHouse выполняет со значением.<br/>Выражением может быть имя столбца в удаленной SQL базе. Таким образом, вы можете использовать его для создания псевдонима удаленного столбца.<br/><br/>Значение по умолчанию: нет выражения.                                                                  | Нет          |
-| <a name="hierarchical-dict-attr"></a> `hierarchical` | Если `true`, то атрибут содержит ключ предка для текущего элемента. Смотрите [Иерархические словари](external-dicts-dict-hierarchical.md).<br/><br/>Default value: `false`.                                                                                                                                                                                   | No           |
+| <a name="hierarchical-dict-attr"></a> `hierarchical` | Если `true`, то атрибут содержит ключ предка для текущего элемента. Смотрите [Иерархические словари](external-dicts-dict-hierarchical.md).<br/><br/>Значение по умолчанию: `false`.                                                                                                                                                                                   | Нет           |
 | `is_object_id`                                       | Признак того, что запрос выполняется к документу MongoDB по `ObjectID`.<br/><br/>Значение по умолчанию: `false`.                                                                                                                                                                                                                                              | Нет          |
 
-## Смотрите также {#smotrite-takzhe}
+**Смотрите также**
 
 -   [Функции для работы с внешними словарями](../../../sql-reference/functions/ext-dict-functions.md).
-
diff --git a/docs/ru/sql-reference/dictionaries/index.md b/docs/ru/sql-reference/dictionaries/index.md
index bd432497be8..84c6f1a3c13 100644
--- a/docs/ru/sql-reference/dictionaries/index.md
+++ b/docs/ru/sql-reference/dictionaries/index.md
@@ -10,10 +10,7 @@ toc_title: "Введение"
 
 ClickHouse поддерживает специальные функции для работы со словарями, которые можно использовать в запросах. Проще и эффективнее использовать словари с помощью функций, чем `JOIN` с таблицами-справочниками.
 
-В словаре нельзя хранить значения [NULL](../../sql-reference/syntax.md#null-literal).
-
 ClickHouse поддерживает:
 
--   [Встроенные словари](internal-dicts.md#internal_dicts) со специфическим [набором функций](../../sql-reference/dictionaries/external-dictionaries/index.md).
--   [Подключаемые (внешние) словари](external-dictionaries/external-dicts.md#dicts-external-dicts) с [набором функций](../../sql-reference/dictionaries/external-dictionaries/index.md).
-
+-   [Встроенные словари](internal-dicts.md#internal_dicts) со специфическим [набором функций](../../sql-reference/functions/ext-dict-functions.md).
+-   [Подключаемые (внешние) словари](external-dictionaries/external-dicts.md#dicts-external-dicts) с [набором функций](../../sql-reference/functions/ext-dict-functions.md).
\ No newline at end of file
diff --git a/docs/ru/sql-reference/functions/array-functions.md b/docs/ru/sql-reference/functions/array-functions.md
index 560795506a0..10fc91de205 100644
--- a/docs/ru/sql-reference/functions/array-functions.md
+++ b/docs/ru/sql-reference/functions/array-functions.md
@@ -1528,3 +1528,52 @@ SELECT arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1]);
 └────────────────────────────────────────---──┘
 ```
 
+## arrayProduct {#arrayproduct}
+
+Возвращает произведение элементов [массива](../../sql-reference/data-types/array.md).
+
+**Синтаксис**
+
+``` sql
+arrayProduct(arr)
+```
+
+**Аргументы**
+
+-   `arr` — [массив](../../sql-reference/data-types/array.md) числовых значений.
+
+**Возвращаемое значение**
+
+-   Произведение элементов массива.
+
+Тип: [Float64](../../sql-reference/data-types/float.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT arrayProduct([1,2,3,4,5,6]) as res;
+```
+
+Результат:
+
+``` text
+┌─res───┐
+│ 720   │
+└───────┘
+```
+
+Запрос:
+
+``` sql
+SELECT arrayProduct([toDecimal64(1,8), toDecimal64(2,8), toDecimal64(3,8)]) as res, toTypeName(res);
+```
+
+Возвращаемое значение всегда имеет тип [Float64](../../sql-reference/data-types/float.md). Результат:
+
+``` text
+┌─res─┬─toTypeName(arrayProduct(array(toDecimal64(1, 8), toDecimal64(2, 8), toDecimal64(3, 8))))─┐
+│ 6   │ Float64                                                                                  │
+└─────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
\ No newline at end of file
diff --git a/docs/ru/sql-reference/functions/bitmap-functions.md b/docs/ru/sql-reference/functions/bitmap-functions.md
index ddae2f3eb40..3da729664d0 100644
--- a/docs/ru/sql-reference/functions/bitmap-functions.md
+++ b/docs/ru/sql-reference/functions/bitmap-functions.md
@@ -25,7 +25,7 @@ SELECT bitmapBuild([1, 2, 3, 4, 5]) AS res, toTypeName(res);
 
 ``` text
 ┌─res─┬─toTypeName(bitmapBuild([1, 2, 3, 4, 5]))─────┐
-│ 
    │ AggregateFunction(groupBitmap, UInt8)    │
+│     │ AggregateFunction(groupBitmap, UInt8)        │
 └─────┴──────────────────────────────────────────────┘
 ```
 
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index 0adccbe888b..b442a782100 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -23,13 +23,53 @@ SELECT
 └─────────────────────┴────────────┴────────────┴─────────────────────┘
 ```
 
+## timeZone {#timezone}
+
+Возвращает часовой пояс сервера.
+
+**Синтаксис** 
+
+``` sql
+timeZone()
+```
+
+Псевдоним: `timezone`. 
+
+**Возвращаемое значение**
+
+-   Часовой пояс. 
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
 ## toTimeZone {#totimezone}
 
-Переводит дату или дату-с-временем в указанный часовой пояс. Часовой пояс (таймзона) это атрибут типов Date/DateTime, внутреннее значение (количество секунд) поля таблицы или колонки результата не изменяется, изменяется тип поля и автоматически его текстовое отображение.
+Переводит дату или дату с временем в указанный часовой пояс. Часовой пояс - это атрибут типов `Date` и `DateTime`. Внутреннее значение (количество секунд) поля таблицы или результирующего столбца не изменяется, изменяется тип поля и, соответственно, его текстовое отображение. 
+
+**Синтаксис** 
+
+``` sql
+toTimezone(value, timezone)
+```
+
+Псевдоним: `toTimezone`.
+
+**Аргументы** 
+
+-   `value` — время или дата с временем. [DateTime64](../../sql-reference/data-types/datetime64.md).
+-   `timezone` — часовой пояс для возвращаемого значения. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Дата с временем. 
+
+Тип: [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Пример**
+
+Запрос:
 
 ```sql
-SELECT
-    toDateTime('2019-01-01 00:00:00', 'UTC') AS time_utc,
+SELECT toDateTime('2019-01-01 00:00:00', 'UTC') AS time_utc,
     toTypeName(time_utc) AS type_utc,
     toInt32(time_utc) AS int32utc,
     toTimeZone(time_utc, 'Asia/Yekaterinburg') AS time_yekat,
@@ -40,6 +80,7 @@ SELECT
     toInt32(time_samoa) AS int32samoa
 FORMAT Vertical;
 ```
+Результат:
 
 ```text
 Row 1:
@@ -57,6 +98,82 @@ int32samoa: 1546300800
 
 `toTimeZone(time_utc, 'Asia/Yekaterinburg')` изменяет тип `DateTime('UTC')` в `DateTime('Asia/Yekaterinburg')`. Значение (unix-время) 1546300800 остается неизменным, но текстовое отображение (результат функции toString()) меняется `time_utc:   2019-01-01 00:00:00` в `time_yekat: 2019-01-01 05:00:00`.
 
+## timeZoneOf {#timezoneof}
+
+Возвращает название часового пояса для значений типа [DateTime](../../sql-reference/data-types/datetime.md) и [DateTime64](../../sql-reference/data-types/datetime64.md).
+
+**Синтаксис** 
+
+``` sql
+timeZoneOf(value)
+```
+
+Псевдоним: `timezoneOf`. 
+
+**Аргументы**
+
+-   `value` — Дата с временем. [DateTime](../../sql-reference/data-types/datetime.md) или [DateTime64](../../sql-reference/data-types/datetime64.md). 
+
+**Возвращаемое значение**
+
+-   Название часового пояса. 
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+``` sql
+SELECT timezoneOf(now());
+```
+
+Результат:
+``` text
+┌─timezoneOf(now())─┐
+│ Etc/UTC           │
+└───────────────────┘
+```
+
+## timeZoneOffset {#timezoneoffset}
+
+Возвращает смещение часового пояса в секундах от [UTC](https://ru.wikipedia.org/wiki/Всемирное_координированное_время). Функция учитывает [летнее время](https://ru.wikipedia.org/wiki/Летнее_время) и исторические изменения часовых поясов, которые действовали на указанную дату.
+Для вычисления смещения используется информация из [базы данных IANA](https://www.iana.org/time-zones).
+
+**Синтаксис**
+
+``` sql
+timeZoneOffset(value)
+```
+
+Псевдоним: `timezoneOffset`. 
+
+**Аргументы**
+
+-   `value` — Дата с временем. [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md). 
+
+**Возвращаемое значение**
+
+-   Смещение в секундах от UTC. 
+
+Тип: [Int32](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT toDateTime('2021-04-21 10:20:30', 'Europe/Moscow') AS Time, toTypeName(Time) AS Type,
+       timeZoneOffset(Time) AS Offset_in_seconds, (Offset_in_seconds / 3600) AS Offset_in_hours;
+```
+
+Результат:
+
+``` text
+┌────────────────Time─┬─Type──────────────────────┬─Offset_in_seconds─┬─Offset_in_hours─┐
+│ 2021-04-21 10:20:30 │ DateTime('Europe/Moscow') │             10800 │               3 │
+└─────────────────────┴───────────────────────────┴───────────────────┴─────────────────┘
+```
+
 ## toYear {#toyear}
 
 Переводит дату или дату-с-временем в число типа UInt16, содержащее номер года (AD).
@@ -943,4 +1060,3 @@ SELECT FROM_UNIXTIME(1234334543, '%Y-%m-%d %R:%S') AS DateTime;
 │ 2009-02-11 14:42:23 │
 └─────────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index f4fa21ba46a..23e840a7898 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -153,8 +153,60 @@ Result:
 
 ## unhex(str) {#unhexstr}
 
-Accepts a string containing any number of hexadecimal digits, and returns a string containing the corresponding bytes. Supports both uppercase and lowercase letters A-F. The number of hexadecimal digits does not have to be even. If it is odd, the last digit is interpreted as the least significant half of the 00-0F byte. If the argument string contains anything other than hexadecimal digits, some implementation-defined result is returned (an exception isn’t thrown).
-If you want to convert the result to a number, you can use the ‘reverse’ and ‘reinterpretAsType’ functions.
+Выполняет операцию, обратную [hex](#hex). Функция интерпретирует каждую пару шестнадцатеричных цифр аргумента как число и преобразует его в символ. Возвращаемое значение представляет собой двоичную строку (BLOB).
+
+Если вы хотите преобразовать результат в число, вы можете использовать функции [reverse](../../sql-reference/functions/string-functions.md#reverse) и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions).
+
+!!! note "Примечание"
+    Если `unhex` вызывается из `clickhouse-client`, двоичные строки отображаются с использованием UTF-8.
+
+Синоним: `UNHEX`.
+
+**Синтаксис**
+
+``` sql
+unhex(arg)
+```
+
+**Аргументы**
+
+-   `arg` — Строка, содержащая любое количество шестнадцатеричных цифр. Тип: [String](../../sql-reference/data-types/string.md).
+
+Поддерживаются как прописные, так и строчные буквы `A-F`. Количество шестнадцатеричных цифр не обязательно должно быть четным. Если оно нечетное, последняя цифра интерпретируется как наименее значимая половина байта `00-0F`. Если строка аргумента содержит что-либо, кроме шестнадцатеричных цифр, возвращается некоторый результат, определенный реализацией (исключение не создается).
+
+**Возвращаемое значение**
+
+-   Бинарная строка (BLOB).
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+``` sql
+SELECT unhex('303132'), UNHEX('4D7953514C');
+```
+
+Результат:
+``` text
+┌─unhex('303132')─┬─unhex('4D7953514C')─┐
+│ 012             │ MySQL               │
+└─────────────────┴─────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT reinterpretAsUInt64(reverse(unhex('FFF'))) AS num;
+```
+
+Результат:
+
+``` text
+┌──num─┐
+│ 4095 │
+└──────┘
+```
 
 ## UUIDStringToNum(str) {#uuidstringtonumstr}
 
@@ -171,4 +223,3 @@ If you want to convert the result to a number, you can use the ‘reverse’ and
 ## bitmaskToArray(num) {#bitmasktoarraynum}
 
 Принимает целое число. Возвращает массив чисел типа UInt64, содержащий степени двойки, в сумме дающих исходное число; числа в массиве идут по возрастанию.
-
diff --git a/docs/ru/sql-reference/functions/encryption-functions.md b/docs/ru/sql-reference/functions/encryption-functions.md
index 844f9cc3197..44957fde152 100644
--- a/docs/ru/sql-reference/functions/encryption-functions.md
+++ b/docs/ru/sql-reference/functions/encryption-functions.md
@@ -5,11 +5,11 @@ toc_title: "Функции для шифрования"
 
 # Функции шифрования {#encryption-functions}
 
-Даннвые функции реализуют шифрование и расшифровку данных с помощью AES (Advanced Encryption Standard) алгоритма.
+Данные функции реализуют шифрование и расшифровку данных с помощью AES (Advanced Encryption Standard) алгоритма.
 
 Длина ключа зависит от режима шифрования. Он может быть длинной в 16, 24 и 32 байта для режимов шифрования `-128-`, `-196-` и `-256-` соответственно.
 
-Длина инициализирующего вектора всегда 16 байт (лишнии байты игнорируются). 
+Длина инициализирующего вектора всегда 16 байт (лишние байты игнорируются). 
 
 Обратите внимание, что до версии Clickhouse 21.1 эти функции работали медленно.
 
diff --git a/docs/ru/sql-reference/functions/ext-dict-functions.md b/docs/ru/sql-reference/functions/ext-dict-functions.md
index 919f8ebe276..612477dc806 100644
--- a/docs/ru/sql-reference/functions/ext-dict-functions.md
+++ b/docs/ru/sql-reference/functions/ext-dict-functions.md
@@ -3,25 +3,29 @@ toc_priority: 58
 toc_title: "Функции для работы с внешними словарями"
 ---
 
+!!! attention "Внимание"
+    Для словарей, созданных с помощью [DDL-запросов](../../sql-reference/statements/create/dictionary.md), в параметре `dict_name` указывается полное имя словаря вместе с базой данных, например: `<database>.<dict_name>`. Если база данных не указана, используется текущая.
+
 # Функции для работы с внешними словарями {#ext_dict_functions}
 
 Информацию о подключении и настройке внешних словарей смотрите в разделе [Внешние словари](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md).
 
-## dictGet {#dictget}
+## dictGet, dictGetOrDefault, dictGetOrNull {#dictget}
 
 Извлекает значение из внешнего словаря.
 
 ``` sql
-dictGet('dict_name', 'attr_name', id_expr)
-dictGetOrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
+dictGet('dict_name', attr_names, id_expr)
+dictGetOrDefault('dict_name', attr_names, id_expr, default_value_expr)
+dictGetOrNull('dict_name', attr_name, id_expr)
 ```
 
 **Аргументы**
 
 -   `dict_name` — имя словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
--   `attr_name` — имя столбца словаря. [Строковый литерал](../syntax.md#syntax-string-literal).
--   `id_expr` — значение ключа словаря. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md) или [Tuple](../../sql-reference/functions/ext-dict-functions.md) в зависимости от конфигурации словаря.
--   `default_value_expr` — значение, возвращаемое в том случае, когда словарь не содержит строки с заданным ключом `id_expr`. [Выражение](../syntax.md#syntax-expressions) возвращающее значение с типом данных, сконфигурированным для атрибута `attr_name`.
+-   `attr_names` — имя столбца словаря, [Строковый литерал](../syntax.md#syntax-string-literal), или кортеж [Tuple](../../sql-reference/data-types/tuple.md) таких имен.
+-   `id_expr` — значение ключа словаря. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md) или [Tuple](../../sql-reference/functions/ext-dict-functions.md), в зависимости от конфигурации словаря.
+-   `default_value_expr` — значение, возвращаемое в том случае, когда словарь не содержит строки с заданным ключом `id_expr`. [Выражение](../syntax.md#syntax-expressions), возвращающее значение с типом данных, сконфигурированным для атрибута `attr_names`, или кортеж [Tuple](../../sql-reference/data-types/tuple.md) таких выражений.
 
 **Возвращаемое значение**
 
@@ -31,10 +35,11 @@ dictGetOrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 
     -   `dictGet` возвращает содержимое элемента `<null_value>`, указанного для атрибута в конфигурации словаря.
     -   `dictGetOrDefault` возвращает атрибут `default_value_expr`.
+    -   `dictGetOrNull` возвращает `NULL` в случае, если ключ не найден в словаре.
 
 Если значение атрибута не удалось обработать или оно не соответствует типу данных атрибута, то ClickHouse генерирует исключение.
 
-**Пример**
+**Пример с единственным атрибутом**
 
 Создадим текстовый файл `ext-dict-text.csv` со следующим содержимым:
 
@@ -93,6 +98,130 @@ LIMIT 3
 └─────┴────────┘
 ```
 
+**Пример с несколькими атрибутами**
+
+Создадим текстовый файл `ext-dict-mult.csv` со следующим содержимым:
+
+``` text
+1,1,'1'
+2,2,'2'
+3,3,'3'
+```
+
+Первый столбец — `id`, второй столбец — `c1`, третий столбец — `c2`.
+
+Настройка внешнего словаря:
+
+``` xml
+<yandex>
+    <dictionary>
+        <name>ext-dict-mult</name>
+        <source>
+            <file>
+                <path>/path-to/ext-dict-mult.csv</path>
+                <format>CSV</format>
+            </file>
+        </source>
+        <layout>
+            <flat />
+        </layout>
+        <structure>
+            <id>
+                <name>id</name>
+            </id>
+            <attribute>
+                <name>c1</name>
+                <type>UInt32</type>
+                <null_value></null_value>
+            </attribute>
+            <attribute>
+                <name>c2</name>
+                <type>String</type>
+                <null_value></null_value>
+            </attribute>            
+        </structure>
+        <lifetime>0</lifetime>
+    </dictionary>
+</yandex>
+```
+
+Выполним запрос:
+
+``` sql
+SELECT
+    dictGet('ext-dict-mult', ('c1','c2'), number) AS val,
+    toTypeName(val) AS type
+FROM system.numbers
+LIMIT 3;
+```
+
+``` text
+┌─val─────┬─type──────────────────┐
+│ (1,'1') │ Tuple(UInt8, String)  │
+│ (2,'2') │ Tuple(UInt8, String)  │
+│ (3,'3') │ Tuple(UInt8, String)  │
+└─────────┴───────────────────────┘
+```
+
+**Пример для словаря с диапазоном ключей**
+
+Создадим таблицу:
+
+```sql
+CREATE TABLE range_key_dictionary_source_table
+(
+    key UInt64,
+    start_date Date,
+    end_date Date,
+    value String,
+    value_nullable Nullable(String)
+)
+ENGINE = TinyLog();
+
+INSERT INTO range_key_dictionary_source_table VALUES(1, toDate('2019-05-20'), toDate('2019-05-20'), 'First', 'First');
+INSERT INTO range_key_dictionary_source_table VALUES(2, toDate('2019-05-20'), toDate('2019-05-20'), 'Second', NULL);
+INSERT INTO range_key_dictionary_source_table VALUES(3, toDate('2019-05-20'), toDate('2019-05-20'), 'Third', 'Third');
+```
+
+Создадим внешний словарь:
+
+```sql
+CREATE DICTIONARY range_key_dictionary
+(
+    key UInt64,
+    start_date Date,
+    end_date Date,
+    value String,
+    value_nullable Nullable(String)
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'range_key_dictionary_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN start_date MAX end_date);
+```
+
+Выполним запрос:
+
+``` sql
+SELECT
+    (number, toDate('2019-05-20')),
+    dictHas('range_key_dictionary', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', 'value', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', 'value_nullable', number, toDate('2019-05-20')),
+    dictGetOrNull('range_key_dictionary', ('value', 'value_nullable'), number, toDate('2019-05-20'))
+FROM system.numbers LIMIT 5 FORMAT TabSeparated;
+```
+Результат:
+
+``` text
+(0,'2019-05-20')        0       \N      \N      (NULL,NULL)
+(1,'2019-05-20')        1       First   First   ('First','First')
+(2,'2019-05-20')        0       \N      \N      (NULL,NULL)
+(3,'2019-05-20')        0       \N      \N      (NULL,NULL)
+(4,'2019-05-20')        0       \N      \N      (NULL,NULL)
+```
+
 **Смотрите также**
 
 -   [Внешние словари](../../sql-reference/functions/ext-dict-functions.md)
@@ -115,7 +244,7 @@ dictHas('dict_name', id)
 -   0, если ключа нет.
 -   1, если ключ есть.
 
-Тип — `UInt8`.
+Тип: [UInt8](../../sql-reference/data-types/int-uint.md).
 
 ## dictGetHierarchy {#dictgethierarchy}
 
@@ -136,7 +265,7 @@ dictGetHierarchy('dict_name', key)
 
 -   Цепочка предков заданного ключа.
 
-Type: [Array(UInt64)](../../sql-reference/functions/ext-dict-functions.md).
+Type: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
 
 ## dictIsIn {#dictisin}
 
@@ -155,7 +284,120 @@ Type: [Array(UInt64)](../../sql-reference/functions/ext-dict-functions.md).
 -   0, если `child_id_expr` — не дочерний элемент `ancestor_id_expr`.
 -   1, если `child_id_expr` — дочерний элемент `ancestor_id_expr` или если `child_id_expr` и есть `ancestor_id_expr`.
 
-Тип — `UInt8`.
+Тип: [UInt8](../../sql-reference/data-types/int-uint.md).
+
+## dictGetChildren {#dictgetchildren}
+
+Возвращает потомков первого уровня в виде массива индексов. Это обратное преобразование для [dictGetHierarchy](#dictgethierarchy).
+
+**Синтаксис** 
+
+``` sql
+dictGetChildren(dict_name, key)
+```
+
+**Аргументы** 
+
+-   `dict_name` — имя словаря. [String literal](../../sql-reference/syntax.md#syntax-string-literal). 
+-   `key` — значение ключа. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md). 
+
+**Возвращаемые значения**
+
+-   Потомки первого уровня для ключа.
+
+Тип: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Рассмотрим иерархический словарь:
+
+``` text
+┌─id─┬─parent_id─┐
+│  1 │         0 │
+│  2 │         1 │
+│  3 │         1 │
+│  4 │         2 │
+└────┴───────────┘
+```
+
+Потомки первого уровня:
+
+``` sql
+SELECT dictGetChildren('hierarchy_flat_dictionary', number) FROM system.numbers LIMIT 4;
+```
+
+``` text
+┌─dictGetChildren('hierarchy_flat_dictionary', number)─┐
+│ [1]                                                  │
+│ [2,3]                                                │
+│ [4]                                                  │
+│ []                                                   │
+└──────────────────────────────────────────────────────┘
+```
+
+## dictGetDescendant {#dictgetdescendant}
+
+Возвращает всех потомков, как если бы функция [dictGetChildren](#dictgetchildren) была выполнена `level` раз рекурсивно.  
+
+**Синтаксис**
+
+``` sql
+dictGetDescendants(dict_name, key, level)
+```
+
+**Аргументы** 
+
+-   `dict_name` — имя словаря. [String literal](../../sql-reference/syntax.md#syntax-string-literal). 
+-   `key` — значение ключа. [Выражение](../syntax.md#syntax-expressions), возвращающее значение типа [UInt64](../../sql-reference/functions/ext-dict-functions.md).
+-   `level` — уровень иерархии. Если `level = 0`, возвращаются все потомки. [UInt8](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   Потомки для ключа.
+
+Тип: [Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Рассмотрим иерархический словарь:
+
+``` text
+┌─id─┬─parent_id─┐
+│  1 │         0 │
+│  2 │         1 │
+│  3 │         1 │
+│  4 │         2 │
+└────┴───────────┘
+```
+Все потомки:
+
+``` sql
+SELECT dictGetDescendants('hierarchy_flat_dictionary', number) FROM system.numbers LIMIT 4;
+```
+
+``` text
+┌─dictGetDescendants('hierarchy_flat_dictionary', number)─┐
+│ [1,2,3,4]                                               │
+│ [2,3,4]                                                 │
+│ [4]                                                     │
+│ []                                                      │
+└─────────────────────────────────────────────────────────┘
+```
+
+Потомки первого уровня:
+
+``` sql
+SELECT dictGetDescendants('hierarchy_flat_dictionary', number, 1) FROM system.numbers LIMIT 4;
+```
+
+``` text
+┌─dictGetDescendants('hierarchy_flat_dictionary', number, 1)─┐
+│ [1]                                                        │
+│ [2,3]                                                      │
+│ [4]                                                        │
+│ []                                                         │
+└────────────────────────────────────────────────────────────┘
+```
 
 ## Прочие функции {#ext_dict_functions-other}
 
@@ -197,4 +439,3 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
     -   `dictGet[Type]OrDefault` возвращает аргумент `default_value_expr`.
 
 Если значение атрибута не удалось обработать или оно не соответствует типу данных атрибута, то ClickHouse генерирует исключение.
-
diff --git a/docs/ru/sql-reference/functions/functions-for-nulls.md b/docs/ru/sql-reference/functions/functions-for-nulls.md
index 365dba75da7..7285f803264 100644
--- a/docs/ru/sql-reference/functions/functions-for-nulls.md
+++ b/docs/ru/sql-reference/functions/functions-for-nulls.md
@@ -224,7 +224,7 @@ assumeNotNull(x)
 **Возвращаемые значения**
 
 -   Исходное значение с не `Nullable` типом, если оно — не `NULL`.
--   Значение по умолчанию для не `Nullable` типа, если исходное значение — `NULL`.
+-   Неспецифицированный результат, зависящий от реализации, если исходное значение — `NULL`.
 
 **Пример**
 
diff --git a/docs/ru/sql-reference/functions/hash-functions.md b/docs/ru/sql-reference/functions/hash-functions.md
index 2efff9c3727..07c741e0588 100644
--- a/docs/ru/sql-reference/functions/hash-functions.md
+++ b/docs/ru/sql-reference/functions/hash-functions.md
@@ -430,7 +430,7 @@ murmurHash3_128( expr )
 
 **Аргументы**
 
--   `expr` — [выражение](../syntax.md#syntax-expressions), возвращающее значение типа[String](../../sql-reference/functions/hash-functions.md).
+-   `expr` — [выражение](../syntax.md#syntax-expressions), возвращающее значение типа [String](../../sql-reference/functions/hash-functions.md).
 
 **Возвращаемое значение**
 
@@ -439,13 +439,13 @@ murmurHash3_128( expr )
 **Пример**
 
 ``` sql
-SELECT murmurHash3_128('example_string') AS MurmurHash3, toTypeName(MurmurHash3) AS type;
+SELECT hex(murmurHash3_128('example_string')) AS MurmurHash3, toTypeName(MurmurHash3) AS type;
 ```
 
 ``` text
-┌─MurmurHash3──────┬─type────────────┐
-│ 6�1�4"S5KT�~~q │ FixedString(16) │
-└──────────────────┴─────────────────┘
+┌─MurmurHash3──────────────────────┬─type───┐
+│ 368A1A311CB7342253354B548E7E7E71 │ String │
+└──────────────────────────────────┴────────┘
 ```
 
 ## xxHash32, xxHash64 {#hash-functions-xxhash32-xxhash64}
diff --git a/docs/ru/sql-reference/functions/ip-address-functions.md b/docs/ru/sql-reference/functions/ip-address-functions.md
index d7f6d2f7618..b02d45d7667 100644
--- a/docs/ru/sql-reference/functions/ip-address-functions.md
+++ b/docs/ru/sql-reference/functions/ip-address-functions.md
@@ -397,9 +397,9 @@ SELECT addr, isIPv6String(addr) FROM ( SELECT ['::', '1111::ffff', '::ffff:127.0
 
 ## isIPAddressInRange {#isipaddressinrange}
 
-Проверяет попадает ли IP адрес в интервал, заданный в [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) нотации.
+Проверяет, попадает ли IP адрес в интервал, заданный в нотации [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing).
 
-**Syntax**
+**Синтаксис**
 
 ``` sql
 isIPAddressInRange(address, prefix)
@@ -409,7 +409,7 @@ isIPAddressInRange(address, prefix)
 **Аргументы**
 
 -   `address` — IPv4 или IPv6 адрес. [String](../../sql-reference/data-types/string.md).
--   `prefix` — IPv4 или IPv6 подсеть, заданная в CIDR нотации. [String](../../sql-reference/data-types/string.md).
+-   `prefix` — IPv4 или IPv6 подсеть, заданная в нотации CIDR. [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемое значение**
 
@@ -422,7 +422,7 @@ isIPAddressInRange(address, prefix)
 Запрос:
 
 ``` sql
-SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8')
+SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8');
 ```
 
 Результат:
@@ -436,7 +436,7 @@ SELECT isIPAddressInRange('127.0.0.1', '127.0.0.0/8')
 Запрос:
 
 ``` sql
-SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16')
+SELECT isIPAddressInRange('127.0.0.1', 'ffff::/16');
 ```
 
 Результат:
diff --git a/docs/ru/sql-reference/functions/json-functions.md b/docs/ru/sql-reference/functions/json-functions.md
index 5d419d26981..8941ccc1691 100644
--- a/docs/ru/sql-reference/functions/json-functions.md
+++ b/docs/ru/sql-reference/functions/json-functions.md
@@ -16,51 +16,65 @@ toc_title: JSON
 
 ## visitParamHas(params, name) {#visitparamhasparams-name}
 
-Проверить наличие поля с именем name.
+Проверяет наличие поля с именем `name`.
+
+Синоним: `simpleJSONHas`.
 
 ## visitParamExtractUInt(params, name) {#visitparamextractuintparams-name}
 
-Распарсить UInt64 из значения поля с именем name. Если поле строковое - попытаться распарсить число из начала строки. Если такого поля нет, или если оно есть, но содержит не число, то вернуть 0.
+Пытается выделить число типа UInt64 из значения поля с именем `name`. Если поле строковое, пытается выделить число из начала строки. Если такого поля нет, или если оно есть, но содержит не число, то возвращает 0.
+
+Синоним: `simpleJSONExtractUInt`.
 
 ## visitParamExtractInt(params, name) {#visitparamextractintparams-name}
 
 Аналогично для Int64.
 
+Синоним: `simpleJSONExtractInt`.
+
 ## visitParamExtractFloat(params, name) {#visitparamextractfloatparams-name}
 
 Аналогично для Float64.
 
+Синоним: `simpleJSONExtractFloat`.
+
 ## visitParamExtractBool(params, name) {#visitparamextractboolparams-name}
 
-Распарсить значение true/false. Результат - UInt8.
+Пытается выделить значение true/false. Результат — UInt8.
+
+Синоним: `simpleJSONExtractBool`.
 
 ## visitParamExtractRaw(params, name) {#visitparamextractrawparams-name}
 
-Вернуть значение поля, включая разделители.
+Возвращает значение поля, включая разделители.
+
+Синоним: `simpleJSONExtractRaw`.
 
 Примеры:
 
 ``` sql
-visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"'
-visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}'
+visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"';
+visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}';
 ```
 
 ## visitParamExtractString(params, name) {#visitparamextractstringparams-name}
 
-Распарсить строку в двойных кавычках. У значения убирается экранирование. Если убрать экранированные символы не удалось, то возвращается пустая строка.
+Разбирает строку в двойных кавычках. У значения убирается экранирование. Если убрать экранированные символы не удалось, то возвращается пустая строка.
+
+Синоним: `simpleJSONExtractString`.
 
 Примеры:
 
 ``` sql
-visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0'
-visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺'
-visitParamExtractString('{"abc":"\\u263"}', 'abc') = ''
-visitParamExtractString('{"abc":"hello}', 'abc') = ''
+visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0';
+visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺';
+visitParamExtractString('{"abc":"\\u263"}', 'abc') = '';
+visitParamExtractString('{"abc":"hello}', 'abc') = '';
 ```
 
-На данный момент, не поддерживаются записанные в формате `\uXXXX\uYYYY` кодовые точки не из basic multilingual plane (они переводятся не в UTF-8, а в CESU-8).
+На данный момент не поддерживаются записанные в формате `\uXXXX\uYYYY` кодовые точки не из basic multilingual plane (они переводятся не в UTF-8, а в CESU-8).
 
-Следующие функции используют [simdjson](https://github.com/lemire/simdjson) который разработан под более сложные требования для разбора JSON. Упомянутое выше предположение 2 по-прежнему применимо.
+Следующие функции используют [simdjson](https://github.com/lemire/simdjson), который разработан под более сложные требования для разбора JSON. Упомянутое выше допущение 2 по-прежнему применимо.
 
 ## isValidJSON(json) {#isvalidjsonjson}
 
@@ -292,4 +306,3 @@ SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello"
 │ [('d','"hello"'),('f','"world"')]                                                                     │
 └───────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/functions/other-functions.md b/docs/ru/sql-reference/functions/other-functions.md
index f9b3e5c3e68..84bbc6af968 100644
--- a/docs/ru/sql-reference/functions/other-functions.md
+++ b/docs/ru/sql-reference/functions/other-functions.md
@@ -1133,6 +1133,111 @@ SELECT defaultValueOfTypeName('Nullable(Int8)')
 └──────────────────────────────────────────┘
 ```
 
+## indexHint {#indexhint}
+Возвращает все данные из диапазона, в который попадают данные, соответствующие указанному выражению.
+Переданное выражение не будет вычислено. Выбор диапазона производится по индексу.
+Индекс в ClickHouse разреженный, при чтении диапазона в ответ попадают «лишние» соседние данные.
+
+**Синтаксис**
+
+```sql
+SELECT * FROM table WHERE indexHint(<expression>)
+```
+
+**Возвращаемое значение**
+
+Возвращает диапазон индекса, в котором выполняется заданное условие.
+
+Тип: [Uint8](https://clickhouse.yandex/docs/ru/data_types/int_uint/#diapazony-uint).
+
+**Пример**
+
+Рассмотрим пример с использованием тестовых данных таблицы [ontime](../../getting-started/example-datasets/ontime.md).
+
+Исходная таблица:
+
+```sql
+SELECT count() FROM ontime
+```
+
+```text
+┌─count()─┐
+│ 4276457 │
+└─────────┘
+```
+
+В таблице есть индексы по полям `(FlightDate, (Year, FlightDate))`.
+
+Выполним выборку по дате, где индекс не используется.
+
+Запрос:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime GROUP BY k ORDER BY k
+```
+
+ClickHouse обработал всю таблицу (`Processed 4.28 million rows`).
+
+Результат:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-01-01 │   13970 │
+│ 2017-01-02 │   15882 │
+........................
+│ 2017-09-28 │   16411 │
+│ 2017-09-29 │   16384 │
+│ 2017-09-30 │   12520 │
+└────────────┴─────────┘
+```
+
+Для подключения индекса выбираем конкретную дату.
+
+Запрос:
+
+```sql
+SELECT FlightDate AS k, count() FROM ontime WHERE k = '2017-09-15' GROUP BY k ORDER BY k
+```
+
+При использовании индекса ClickHouse обработал значительно меньшее количество строк (`Processed 32.74 thousand rows`).
+
+Результат:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-15 │   16428 │
+└────────────┴─────────┘
+```
+
+Передадим в функцию `indexHint` выражение `k = '2017-09-15'`.
+
+Запрос:
+
+```sql
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE indexHint(k = '2017-09-15')
+GROUP BY k
+ORDER BY k ASC
+```
+
+ClickHouse применил индекс по аналогии с примером выше (`Processed 32.74 thousand rows`).
+Выражение `k = '2017-09-15'` не используется при формировании результата.
+Функция `indexHint` позволяет увидеть соседние данные.
+
+Результат:
+
+```text
+┌──────────k─┬─count()─┐
+│ 2017-09-14 │    7071 │
+│ 2017-09-15 │   16428 │
+│ 2017-09-16 │    1077 │
+│ 2017-09-30 │    8167 │
+└────────────┴─────────┘
+```
+
 ## replicate {#other-functions-replicate}
 
 Создает массив, заполненный одним значением.
diff --git a/docs/ru/sql-reference/functions/splitting-merging-functions.md b/docs/ru/sql-reference/functions/splitting-merging-functions.md
index b8d04982b91..5a0c540cf3a 100644
--- a/docs/ru/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/ru/sql-reference/functions/splitting-merging-functions.md
@@ -14,7 +14,7 @@ separator должен быть константной строкой из ро
 **Синтаксис**
 
 ``` sql
-splitByChar(<separator>, <s>)
+splitByChar(separator, s)
 ```
 
 **Аргументы**
@@ -30,12 +30,12 @@ splitByChar(<separator>, <s>)
 -   Задано несколько последовательных разделителей;
 -   Исходная строка `s` пуста.
 
-Type: [Array](../../sql-reference/data-types/array.md) of [String](../../sql-reference/data-types/string.md).
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
 **Пример**
 
 ``` sql
-SELECT splitByChar(',', '1,2,3,abcde')
+SELECT splitByChar(',', '1,2,3,abcde');
 ```
 
 ``` text
@@ -67,12 +67,12 @@ splitByString(separator, s)
 -   Задано несколько последовательных разделителей;
 -   Исходная строка `s` пуста.
 
-Тип: [Array](../../sql-reference/data-types/array.md) of [String](../../sql-reference/data-types/string.md).
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
 
 **Примеры**
 
 ``` sql
-SELECT splitByString(', ', '1, 2 3, 4,5, abcde')
+SELECT splitByString(', ', '1, 2 3, 4,5, abcde');
 ```
 
 ``` text
@@ -82,7 +82,7 @@ SELECT splitByString(', ', '1, 2 3, 4,5, abcde')
 ```
 
 ``` sql
-SELECT splitByString('', 'abcde')
+SELECT splitByString('', 'abcde');
 ```
 
 ``` text
@@ -91,6 +91,60 @@ SELECT splitByString('', 'abcde')
 └────────────────────────────┘
 ```
 
+## splitByRegexp(regexp, s) {#splitbyregexpseparator-s}
+
+Разбивает строку на подстроки, разделенные регулярным выражением. В качестве разделителя используется строка регулярного выражения `regexp`. Если `regexp` пустая, функция разделит строку `s` на массив одиночных символов. Если для регулярного выражения совпадения не найдено, строка `s` не будет разбита.
+
+**Синтаксис**
+
+``` sql
+splitByRegexp(regexp, s)
+```
+
+**Аргументы**
+
+-   `regexp` — регулярное выражение. Константа. [String](../data-types/string.md) или [FixedString](../data-types/fixedstring.md).
+-   `s` — разбиваемая строка. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемые значения**
+
+Возвращает массив выбранных подстрок. Пустая подстрока может быть возвращена, если:
+
+-   Непустое совпадение с регулярным выражением происходит в начале или конце строки;
+-   Имеется несколько последовательных совпадений c непустым регулярным выражением;
+-   Исходная строка `s` пуста, а регулярное выражение не пустое.
+
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT splitByRegexp('\\d+', 'a12bc23de345f');
+```
+
+Результат:
+
+``` text
+┌─splitByRegexp('\\d+', 'a12bc23de345f')─┐
+│ ['a','bc','de','f']                    │
+└────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT splitByRegexp('', 'abcde');
+```
+
+Результат:
+
+``` text
+┌─splitByRegexp('', 'abcde')─┐
+│ ['a','b','c','d','e']      │
+└────────────────────────────┘
+```
 
 ## arrayStringConcat(arr\[, separator\]) {#arraystringconcatarr-separator}
 
@@ -106,7 +160,7 @@ separator - необязательный параметр, константна
 **Пример:**
 
 ``` sql
-SELECT alphaTokens('abca1abc')
+SELECT alphaTokens('abca1abc');
 ```
 
 ``` text
@@ -114,4 +168,3 @@ SELECT alphaTokens('abca1abc')
 │ ['abca','abc']          │
 └─────────────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/functions/string-functions.md b/docs/ru/sql-reference/functions/string-functions.md
index 6ef7dc01b6a..04af599c09a 100644
--- a/docs/ru/sql-reference/functions/string-functions.md
+++ b/docs/ru/sql-reference/functions/string-functions.md
@@ -645,3 +645,66 @@ SELECT decodeXMLComponent('&lt; &#x3A3; &gt;');
 
 -   [Мнемоники в HTML](https://ru.wikipedia.org/wiki/%D0%9C%D0%BD%D0%B5%D0%BC%D0%BE%D0%BD%D0%B8%D0%BA%D0%B8_%D0%B2_HTML)
 
+
+
+## extractTextFromHTML {#extracttextfromhtml}
+
+Функция для извлечения текста из HTML или XHTML.
+Она не соответствует всем HTML, XML или XHTML стандартам на 100%, но ее реализация достаточно точная и быстрая. Правила обработки следующие:
+
+1. Комментарии удаляются. Пример: `<!-- test -->`. Комментарий должен оканчиваться символами `-->`. Вложенные комментарии недопустимы.
+Примечание: конструкции наподобие `<!-->` и `<!--->` не являются допустимыми комментариями в HTML, но они будут удалены согласно другим правилам.
+2. Содержимое CDATA вставляется дословно. Примечание: формат CDATA специфичен для XML/XHTML. Но он обрабатывается всегда по принципу "наилучшего возможного результата".
+3. Элементы `script` и `style` удаляются вместе со всем содержимым. Примечание: предполагается, что закрывающий тег не может появиться внутри содержимого. Например, в JS строковый литерал должен быть экранирован как `"<\/script>"`.
+Примечание: комментарии и CDATA возможны внутри `script` или `style` - тогда закрывающие теги не ищутся внутри CDATA. Пример: `<script><![CDATA[</script>]]></script>`. Но они ищутся внутри комментариев. Иногда возникают сложные случаи: `<script>var x = "<!--"; </script> var y = "-->"; alert(x + y);</script>`
+Примечание: `script` и `style` могут быть названиями пространств имен XML - тогда они не обрабатываются как обычные элементы `script` или `style`. Пример: `<script:a>Hello</script:a>`.
+Примечание: пробелы возможны после имени закрывающего тега: `</script >`, но не перед ним: `< / script>`.
+4. Другие теги или элементы, подобные тегам, удаляются, а их внутреннее содержимое остается. Пример: `<a>.</a>`
+Примечание: ожидается, что такой HTML является недопустимым: `<a test=">"></a>`
+Примечание: функция также удаляет подобные тегам элементы: `<>`, `<!>`, и т. д.
+Примечание: если встречается тег без завершающего символа `>`, то удаляется этот тег и весь следующий за ним текст: `<hello `
+5. Мнемоники HTML и XML не декодируются. Они должны быть обработаны отдельной функцией.
+6. Пробелы в тексте удаляются и добавляются по следующим правилам:
+- Пробелы в начале и в конце извлеченного текста удаляются.
+- Несколько пробелов подряд заменяются одним пробелом.
+- Если текст разделен другими удаляемыми элементами и в этом месте нет пробела, он добавляется.
+- Это может привести к появлению неестественного написания, например: `Hello<b>world</b>`, `Hello<!-- -->world` — в HTML нет пробелов, но функция вставляет их. Также следует учитывать такие варианты написания: `Hello<p>world</p>`, `Hello<br>world`. Подобные результаты выполнения функции могут использоваться для анализа данных, например, для преобразования HTML-текста в набор используемых слов.
+7. Также обратите внимание, что правильная обработка пробелов требует поддержки `<pre></pre>` и свойств CSS `display` и `white-space`.
+
+**Синтаксис**
+
+``` sql
+extractTextFromHTML(x)
+```
+
+**Аргументы**
+
+-   `x` — текст для обработки. [String](../../sql-reference/data-types/string.md). 
+
+**Возвращаемое значение**
+
+-   Извлеченный текст.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Первый пример содержит несколько тегов и комментарий. На этом примере также видно, как обрабатываются пробелы.
+Второй пример показывает обработку `CDATA` и тега `script`.
+В третьем примере текст выделяется из полного HTML ответа, полученного с помощью функции [url](../../sql-reference/table-functions/url.md).
+
+Запрос:
+
+``` sql
+SELECT extractTextFromHTML(' <p> A text <i>with</i><b>tags</b>. <!-- comments --> </p> ');
+SELECT extractTextFromHTML('<![CDATA[The content within <b>CDATA</b>]]> <script>alert("Script");</script>');
+SELECT extractTextFromHTML(html) FROM url('http://www.donothingfor2minutes.com/', RawBLOB, 'html String');
+```
+
+Результат:
+
+``` text
+A text with tags .
+The content within <b>CDATA</b>
+Do Nothing for 2 Minutes 2:00 &nbsp;
+```
diff --git a/docs/ru/sql-reference/functions/type-conversion-functions.md b/docs/ru/sql-reference/functions/type-conversion-functions.md
index fc1dd15f8e3..8707642eb59 100644
--- a/docs/ru/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ru/sql-reference/functions/type-conversion-functions.md
@@ -3,7 +3,7 @@ toc_priority: 38
 toc_title: "Функции преобразования типов"
 ---
 
-# Функции преобразования типов {#funktsii-preobrazovaniia-tipov}
+# Функции преобразования типов {#type-conversion-functions}
 
 ## Общие проблемы преобразования чисел {#numeric-conversion-issues}
 
@@ -369,7 +369,7 @@ SELECT toFixedString('foo\0bar', 8) AS s, toStringCutToZero(s) AS s_cut;
 
 ## reinterpretAsUUID {#reinterpretasuuid}
 
-Функция принимает шестнадцатибайтную строку и интерпретирует ее байты в network order (big-endian). Если строка имеет недостаточную длину, то функция работает так, как будто строка дополнена необходимым количетсвом нулевых байт с конца. Если строка длиннее, чем шестнадцать байт, то игнорируются лишние байты с конца.
+Функция принимает строку из 16 байт и интерпретирует ее байты в порядок от старшего к младшему. Если строка имеет недостаточную длину, то функция работает так, как будто строка дополнена необходимым количеством нулевых байтов с конца. Если строка длиннее, чем 16 байтов, то лишние байты с конца игнорируются.
 
 **Синтаксис**
 
@@ -425,9 +425,27 @@ SELECT uuid = uuid2;
 
 ## reinterpret(x, T) {#type_conversion_function-reinterpret}
 
-Использует туже самую исходную последовательность байт в памяти для значения `x` и переинтерпретирует ее как конечный тип данных
+Использует ту же самую исходную последовательность байтов в памяти для значения `x` и интерпретирует ее как конечный тип данных `T`.
+
+**Синтаксис**
+
+``` sql
+reinterpret(x, type)
+```
+
+**Аргументы**
+
+-   `x` — любой тип данных. 
+-   `type` — конечный тип данных. [String](../../sql-reference/data-types/string.md). 
+
+**Возвращаемое значение**
+
+-   Значение конечного типа данных.
+
+**Примеры**
 
 Запрос:
+
 ```sql
 SELECT reinterpret(toInt8(-1), 'UInt8') as int_to_uint,
     reinterpret(toInt8(1), 'Float32') as int_to_float,
@@ -448,7 +466,23 @@ SELECT reinterpret(toInt8(-1), 'UInt8') as int_to_uint,
 
 Поддерживается также синтаксис `CAST(x AS t)`.
 
-Обратите внимание, что если значение `x` не может быть преобразовано к типу `T`, возникает переполнение. Например, `CAST(-1, 'UInt8')` возвращает 255.
+!!! warning "Предупреждение"
+   Если значение `x` не может быть преобразовано к типу `T`, возникает переполнение. Например, `CAST(-1, 'UInt8')` возвращает 255.
+
+**Синтаксис**
+
+``` sql
+CAST(x, T)
+```
+
+**Аргументы**
+
+-   `x` — любой тип данных. 
+-   `T` — конечный тип данных. [String](../../sql-reference/data-types/string.md).  
+
+**Возвращаемое значение**
+
+- Значение конечного типа данных.
 
 **Примеры**
 
@@ -456,9 +490,9 @@ SELECT reinterpret(toInt8(-1), 'UInt8') as int_to_uint,
 
 ```sql
 SELECT
-    cast(toInt8(-1), 'UInt8') AS cast_int_to_uint,
-    cast(toInt8(1), 'Float32') AS cast_int_to_float,
-    cast('1', 'UInt32') AS cast_string_to_int
+    CAST(toInt8(-1), 'UInt8') AS cast_int_to_uint,
+    CAST(toInt8(1), 'Float32') AS cast_int_to_float,
+    CAST('1', 'UInt32') AS cast_string_to_int
 ```
 
 Результат:
@@ -488,9 +522,9 @@ SELECT
 └─────────────────────┴─────────────────────┴────────────┴─────────────────────┴───────────────────────────┘
 ```
 
-Преобразование в FixedString(N) работает только для аргументов типа String или FixedString(N).
+Преобразование в FixedString(N) работает только для аргументов типа [String](../../sql-reference/data-types/string.md) или [FixedString](../../sql-reference/data-types/fixedstring.md).
 
-Поддержано преобразование к типу [Nullable](../../sql-reference/functions/type-conversion-functions.md) и обратно. 
+Поддерживается преобразование к типу [Nullable](../../sql-reference/functions/type-conversion-functions.md) и обратно. 
 
 **Примеры**
 
@@ -860,7 +894,7 @@ AS parseDateTimeBestEffortUS;
 ## parseDateTimeBestEffortOrZero {#parsedatetimebesteffortorzero}
 ## parseDateTime32BestEffortOrZero {#parsedatetime32besteffortorzero}
 
-Работает также как [parseDateTimeBestEffort](#parsedatetimebesteffort), но возвращает нулевую дату или нулевую дату и время когда получает формат даты который не может быть обработан.
+Работает аналогично функции [parseDateTimeBestEffort](#parsedatetimebesteffort), но возвращает нулевое значение, если формат даты не может быть обработан.
 
 ## parseDateTimeBestEffortUSOrNull {#parsedatetimebesteffortusornull}
 
@@ -1036,19 +1070,23 @@ SELECT parseDateTimeBestEffortUSOrZero('02.2021') AS parseDateTimeBestEffortUSOr
 
 ## parseDateTime64BestEffort {#parsedatetime64besteffort}
 
-Работает также как функция [parseDateTimeBestEffort](#parsedatetimebesteffort) но также понимамет милисекунды и микросекунды и возвращает `DateTime64(3)` или `DateTime64(6)` типы данных в зависимости от заданной точности.
+Работает аналогично функции [parseDateTimeBestEffort](#parsedatetimebesteffort), но также принимает миллисекунды и микросекунды. Возвращает тип данных [DateTime](../../sql-reference/functions/type-conversion-functions.md#data_type-datetime).
 
-**Syntax**
+**Синтаксис**
 
 ``` sql
 parseDateTime64BestEffort(time_string [, precision [, time_zone]])
 ```
 
-**Parameters**
+**Аргументы**
 
--   `time_string` — String containing a date or date with time to convert. [String](../../sql-reference/data-types/string.md).
--   `precision` — `3` for milliseconds, `6` for microseconds. Default `3`. Optional [UInt8](../../sql-reference/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).
+-   `time_string` — строка, содержащая дату или дату со временем, которые нужно преобразовать. [String](../../sql-reference/data-types/string.md).
+-   `precision` — требуемая точность: `3` — для миллисекунд, `6` — для микросекунд. По умолчанию — `3`. Необязательный. [UInt8](../../sql-reference/data-types/int-uint.md).
+-   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Разбирает значение `time_string` в зависимости от часового пояса. Необязательный. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   `time_string`, преобразованная в тип данных [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Примеры**
 
@@ -1062,7 +1100,7 @@ UNION ALL
 SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',6) AS a, toTypeName(a) AS t
 UNION ALL
 SELECT parseDateTime64BestEffort('2021-01-01 01:01:00.12346',3,'Europe/Moscow') AS a, toTypeName(a) AS t
-FORMAT PrettyCompactMonoBlcok
+FORMAT PrettyCompactMonoBlock;
 ```
 
 Результат:
@@ -1078,12 +1116,11 @@ FORMAT PrettyCompactMonoBlcok
 
 ## parseDateTime64BestEffortOrNull {#parsedatetime32besteffortornull}
 
-Работает также как функция [parseDateTime64BestEffort](#parsedatetime64besteffort) но возвращает `NULL` когда встречает формат даты который не может обработать.
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetime64besteffort), но возвращает `NULL`, если формат даты не может быть обработан.
 
 ## parseDateTime64BestEffortOrZero {#parsedatetime64besteffortorzero}
 
-Работает также как функция [parseDateTime64BestEffort](#parsedatetimebesteffort) но возвращает "нулевую" дату и время когда встречает формат даты который не может обработать.
-
+Работает аналогично функции [parseDateTime64BestEffort](#parsedatetimebesteffort), но возвращает нулевую дату и время, если формат даты не может быть обработан.
 
 ## toLowCardinality {#tolowcardinality}
 
@@ -1130,11 +1167,14 @@ SELECT toLowCardinality('1');
 ## toUnixTimestamp64Nano {#tounixtimestamp64nano}
 
 Преобразует значение `DateTime64` в значение `Int64` с фиксированной точностью менее одной секунды. 
-Входное значение округляется соответствующим образом вверх или вниз в зависимости от его точности. Обратите внимание, что возвращаемое значение - это временная метка в UTC, а не в часовом поясе `DateTime64`.
+Входное значение округляется соответствующим образом вверх или вниз в зависимости от его точности. 
+
+!!! info "Примечание"
+    Возвращаемое значение — это временная метка в UTC, а не в часовом поясе `DateTime64`.
 
 **Синтаксис**
 
-``` sql
+```sql
 toUnixTimestamp64Milli(value)
 ```
 
@@ -1150,7 +1190,7 @@ toUnixTimestamp64Milli(value)
 
 Запрос:
 
-``` sql
+```sql
 WITH toDateTime64('2019-09-16 19:20:12.345678910', 6) AS dt64
 SELECT toUnixTimestamp64Milli(dt64);
 ```
@@ -1296,4 +1336,3 @@ FROM numbers(3);
 │ 2,"good"                                  │
 └───────────────────────────────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/statements/alter/column.md b/docs/ru/sql-reference/statements/alter/column.md
index 87fc1c78cd0..158ab2e7385 100644
--- a/docs/ru/sql-reference/statements/alter/column.md
+++ b/docs/ru/sql-reference/statements/alter/column.md
@@ -63,6 +63,9 @@ DROP COLUMN [IF EXISTS] name
 
 Запрос удаляет данные из файловой системы. Так как это представляет собой удаление целых файлов, запрос выполняется почти мгновенно.
 
+!!! warning "Предупреждение"
+    Вы не можете удалить столбец, используемый в [материализованном представлениии](../../../sql-reference/statements/create/view.md#materialized). В противном случае будет ошибка.
+
 Пример:
 
 ``` sql
@@ -155,7 +158,7 @@ ALTER TABLE table_name MODIFY column_name REMOVE property;
 ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 ```
 
-## Смотрите также
+**Смотрите также**
 
 - [REMOVE TTL](ttl.md).
 
diff --git a/docs/ru/sql-reference/statements/alter/index/index.md b/docs/ru/sql-reference/statements/alter/index/index.md
index 862def5cc04..632f11ed906 100644
--- a/docs/ru/sql-reference/statements/alter/index/index.md
+++ b/docs/ru/sql-reference/statements/alter/index/index.md
@@ -9,8 +9,9 @@ toc_title: "Манипуляции с индексами"
 Добавить или удалить индекс можно с помощью операций
 
 ``` sql
-ALTER TABLE [db].name ADD INDEX name expression TYPE type GRANULARITY value [AFTER name]
-ALTER TABLE [db].name DROP INDEX name
+ALTER TABLE [db.]name ADD INDEX name expression TYPE type GRANULARITY value [AFTER name]
+ALTER TABLE [db.]name DROP INDEX name
+ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 ```
 
 Поддерживается только таблицами семейства `*MergeTree`.
@@ -18,6 +19,7 @@ ALTER TABLE [db].name DROP INDEX name
 Команда `ADD INDEX` добавляет описание индексов в метаданные, а `DROP INDEX` удаляет индекс из метаданных и стирает файлы индекса с диска, поэтому они легковесные и работают мгновенно.
 
 Если индекс появился в метаданных, то он начнет считаться в последующих слияниях и записях в таблицу, а не сразу после выполнения операции `ALTER`.
+`MATERIALIZE INDEX` - перестраивает индекс в указанной партиции. Реализовано как мутация.
 
 Запрос на изменение индексов реплицируется, сохраняя новые метаданные в ZooKeeper и применяя изменения на всех репликах.
 
diff --git a/docs/ru/sql-reference/statements/alter/partition.md b/docs/ru/sql-reference/statements/alter/partition.md
index 02bc6523100..b80cc89dbc7 100644
--- a/docs/ru/sql-reference/statements/alter/partition.md
+++ b/docs/ru/sql-reference/statements/alter/partition.md
@@ -39,7 +39,7 @@ ALTER TABLE mt DETACH PART 'all_2_2_0';
 
 После того как запрос будет выполнен, вы сможете производить любые операции с данными в директории `detached`. Например, можно удалить их из файловой системы.
 
-Запрос реплицируется — данные будут перенесены в директорию `detached` и забыты на всех репликах. Обратите внимание, запрос может быть отправлен только на реплику-лидер. Чтобы узнать, является ли реплика лидером, выполните запрос `SELECT` к системной таблице [system.replicas](../../../operations/system-tables/replicas.md#system_tables-replicas). Либо можно выполнить запрос `DETACH` на всех репликах — тогда на всех репликах, кроме реплики-лидера, запрос вернет ошибку.
+Запрос реплицируется — данные будут перенесены в директорию `detached` и забыты на всех репликах. Обратите внимание, запрос может быть отправлен только на реплику-лидер. Чтобы узнать, является ли реплика лидером, выполните запрос `SELECT` к системной таблице [system.replicas](../../../operations/system-tables/replicas.md#system_tables-replicas). Либо можно выполнить запрос `DETACH` на всех репликах — тогда на всех репликах, кроме реплик-лидеров (поскольку допускается несколько лидеров), запрос вернет ошибку.
 
 ## DROP PARTITION\|PART {#alter_drop-partition}
 
@@ -84,9 +84,13 @@ ALTER TABLE visits ATTACH PART 201901_2_2_0;
 
 Как корректно задать имя партиции или куска, см. в разделе [Как задавать имя партиции в запросах ALTER](#alter-how-to-specify-part-expr).
 
-Этот запрос реплицируется. Реплика-иницатор проверяет, есть ли данные в директории `detached`. Если данные есть, то запрос проверяет их целостность. В случае успеха данные добавляются в таблицу. Все остальные реплики загружают данные с реплики-инициатора запроса.
+Этот запрос реплицируется. Реплика-иницатор проверяет, есть ли данные в директории `detached`.
+Если данные есть, то запрос проверяет их целостность. В случае успеха данные добавляются в таблицу.
 
-Это означает, что вы можете разместить данные в директории `detached` на одной реплике и с помощью запроса `ALTER ... ATTACH` добавить их в таблицу на всех репликах.
+Если реплика, не являющаяся инициатором запроса, получив команду присоединения, находит кусок с правильными контрольными суммами в своей собственной папке `detached`, она присоединяет данные, не скачивая их с других реплик.
+Если нет куска с правильными контрольными суммами, данные загружаются из любой реплики, имеющей этот кусок.
+
+Вы можете поместить данные в директорию `detached` на одной реплике и с помощью запроса `ALTER ... ATTACH` добавить их в таблицу на всех репликах.
 
 ## ATTACH PARTITION FROM {#alter_attach-partition-from}
 
@@ -94,7 +98,8 @@ ALTER TABLE visits ATTACH PART 201901_2_2_0;
 ALTER TABLE table2 ATTACH PARTITION partition_expr FROM table1
 ```
 
-Копирует партицию из таблицы `table1` в таблицу `table2` и добавляет к существующим данным `table2`. Данные из `table1` не удаляются.
+Копирует партицию из таблицы `table1` в таблицу `table2`.
+Обратите внимание, что данные не удаляются ни из `table1`, ни из `table2`.
 
 Следует иметь в виду:
 
@@ -314,4 +319,3 @@ OPTIMIZE TABLE table_not_partitioned PARTITION tuple() FINAL;
 `IN PARTITION` указывает на партицию, для которой применяются выражения [UPDATE](../../../sql-reference/statements/alter/update.md#alter-table-update-statements) или [DELETE](../../../sql-reference/statements/alter/delete.md#alter-mutations) в результате запроса `ALTER TABLE`. Новые куски создаются только в указанной партиции. Таким образом, `IN PARTITION` помогает снизить нагрузку, когда таблица разбита на множество партиций, а вам нужно обновить данные лишь точечно.
 
 Примеры запросов `ALTER ... PARTITION` можно посмотреть в тестах: [`00502_custom_partitioning_local`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_local.sql) и [`00502_custom_partitioning_replicated_zookeeper`](https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql).
-
diff --git a/docs/ru/sql-reference/statements/alter/ttl.md b/docs/ru/sql-reference/statements/alter/ttl.md
index e949c992bbe..2a2d10b69de 100644
--- a/docs/ru/sql-reference/statements/alter/ttl.md
+++ b/docs/ru/sql-reference/statements/alter/ttl.md
@@ -82,4 +82,4 @@ SELECT * FROM table_with_ttl;
 ### Смотрите также
 
 - Подробнее о [свойстве TTL](../../../engines/table-engines/mergetree-family/mergetree.md#mergetree-column-ttl).
-
+- Изменить столбец [с TTL](../../../sql-reference/statements/alter/column.md#alter_modify-column).
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/alter/user.md b/docs/ru/sql-reference/statements/alter/user.md
index 604eff9de15..bb57c3bb328 100644
--- a/docs/ru/sql-reference/statements/alter/user.md
+++ b/docs/ru/sql-reference/statements/alter/user.md
@@ -12,20 +12,32 @@ toc_title: USER
 ``` sql
 ALTER USER [IF EXISTS] name1 [ON CLUSTER cluster_name1] [RENAME TO new_name1] 
         [, name2 [ON CLUSTER cluster_name2] [RENAME TO new_name2] ...]
-    [IDENTIFIED [WITH {PLAINTEXT_PASSWORD|SHA256_PASSWORD|DOUBLE_SHA1_PASSWORD}] BY {'password'|'hash'}]
-    [[ADD|DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
+    [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']}]
+    [[ADD | DROP] HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
     [DEFAULT ROLE role [,...] | ALL | ALL EXCEPT role [,...] ]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+    [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
+    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```  
 
 Для выполнения `ALTER USER` необходима привилегия [ALTER USER](../grant.md#grant-access-management).
 
+## Секция GRANTEES {#grantees}
+
+Определяет пользователей или роли, которым разрешено получать [привилегии](../../../sql-reference/statements/grant.md#grant-privileges) от указанного пользователя при условии, что этому пользователю также предоставлен весь необходимый доступ с использованием [GRANT OPTION](../../../sql-reference/statements/grant.md#grant-privigele-syntax). Параметры секции `GRANTEES`:
+
+-   `user` — пользователь, которому разрешено получать привилегии от указанного пользователя.
+-   `role` — роль, которой разрешено получать привилегии от указанного пользователя.
+-   `ANY` — любому пользователю или любой роли разрешено получать привилегии от указанного пользователя. Используется по умолчанию.
+-   `NONE` — никому не разрешено получать привилегии от указанного пользователя.
+
+Вы можете исключить любого пользователя или роль, используя выражение `EXCEPT`. Например, `ALTER USER user1 GRANTEES ANY EXCEPT user2`. Это означает, что если `user1` имеет привилегии, предоставленные с использованием `GRANT OPTION`, он сможет предоставить их любому, кроме `user2`.
+
 ## Примеры {#alter-user-examples}
 
 Установить ролями по умолчанию роли, назначенные пользователю:
 
 ``` sql
-ALTER USER user DEFAULT ROLE role1, role2
+ALTER USER user DEFAULT ROLE role1, role2;
 ```
 
 Если роли не были назначены пользователю, ClickHouse выбрасывает исключение.
@@ -33,7 +45,7 @@ ALTER USER user DEFAULT ROLE role1, role2
 Установить ролями по умолчанию все роли, назначенные пользователю:
 
 ``` sql
-ALTER USER user DEFAULT ROLE ALL
+ALTER USER user DEFAULT ROLE ALL;
 ```
 
 Если роль будет впоследствии назначена пользователю, она автоматически станет ролью по умолчанию.
@@ -41,6 +53,11 @@ ALTER USER user DEFAULT ROLE ALL
 Установить ролями по умолчанию все назначенные пользователю роли кроме `role1` и `role2`:
 
 ``` sql
-ALTER USER user DEFAULT ROLE ALL EXCEPT role1, role2
+ALTER USER user DEFAULT ROLE ALL EXCEPT role1, role2;
 ```
 
+Разрешить пользователю с аккаунтом `john` предоставить свои привилегии пользователю с аккаунтом `jack`:
+
+``` sql
+ALTER USER john GRANTEES jack;
+```
diff --git a/docs/ru/sql-reference/statements/attach.md b/docs/ru/sql-reference/statements/attach.md
index 18ec47d05c8..b135507b818 100644
--- a/docs/ru/sql-reference/statements/attach.md
+++ b/docs/ru/sql-reference/statements/attach.md
@@ -5,12 +5,14 @@ toc_title: ATTACH
 
 # ATTACH Statement {#attach}
 
-Запрос полностью аналогичен запросу `CREATE`, но:
+Выполняет подключение таблицы, например, при перемещении базы данных на другой сервер. 
 
--   вместо слова `CREATE` используется слово `ATTACH`;
--   запрос не создаёт данные на диске, а предполагает, что данные уже лежат в соответствующих местах, и всего лишь добавляет информацию о таблице на сервер. После выполнения запроса `ATTACH` сервер будет знать о существовании таблицы.
+Запрос не создаёт данные на диске, а предполагает, что данные уже лежат в соответствующих местах, и всего лишь добавляет информацию о таблице на сервер. После выполнения запроса `ATTACH` сервер будет знать о существовании таблицы.
 
-Если таблица перед этим была отключена ([DETACH](../../sql-reference/statements/detach.md)), т.е. её структура известна, можно использовать сокращенную форму записи без определения структуры.
+Если таблица перед этим была отключена при помощи ([DETACH](../../sql-reference/statements/detach.md)), т.е. её структура известна, можно использовать сокращенную форму записи без определения структуры.
+
+## Варианты синтаксиса {#syntax-forms}
+### Присоединение существующей таблицы {#attach-existing-table}
 
 ``` sql
 ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
@@ -20,4 +22,38 @@ ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
 
 Если таблица была отключена перманентно, она не будет подключена обратно во время старта сервера, так что нужно явно использовать запрос `ATTACH`, чтобы подключить ее.
 
+### Создание новой таблицы и присоединение данных {#create-new-table-and-attach-data}
 
+**С указанием пути к табличным данным**
+
+```sql
+ATTACH TABLE name FROM 'path/to/data/' (col1 Type1, ...)
+```
+
+Cоздает новую таблицу с указанной структурой и присоединяет табличные данные из соответствующего каталога в `user_files`.
+
+**Пример**
+
+Запрос:
+
+```sql
+DROP TABLE IF EXISTS test;
+INSERT INTO TABLE FUNCTION file('01188_attach/test/data.TSV', 'TSV', 's String, n UInt8') VALUES ('test', 42);
+ATTACH TABLE test FROM '01188_attach/test' (s String, n UInt8) ENGINE = File(TSV);
+SELECT * FROM test;
+```
+Результат:
+
+```sql
+┌─s────┬──n─┐
+│ test │ 42 │
+└──────┴────┘
+```
+
+**С указанием UUID таблицы** (Только для баз данных `Atomic`)
+
+```sql
+ATTACH TABLE name UUID '<uuid>' (col1 Type1, ...)
+```
+
+Cоздает новую таблицу с указанной структурой и присоединяет данные из таблицы с указанным UUID.
diff --git a/docs/ru/sql-reference/statements/check-table.md b/docs/ru/sql-reference/statements/check-table.md
index 10336f821d0..9592c1a5bc2 100644
--- a/docs/ru/sql-reference/statements/check-table.md
+++ b/docs/ru/sql-reference/statements/check-table.md
@@ -29,9 +29,36 @@ CHECK TABLE [db.]name
 
 В движках `*Log` не предусмотрено автоматическое восстановление данных после сбоя. Используйте запрос `CHECK TABLE`, чтобы своевременно выявлять повреждение данных.
 
-Для движков из семейства `MergeTree` запрос `CHECK TABLE` показывает статус проверки для каждого отдельного куска данных таблицы на локальном сервере.
+## Проверка таблиц семейства MergeTree {#checking-mergetree-tables}
 
-**Что делать, если данные повреждены**
+Для таблиц семейства `MergeTree` если [check_query_single_value_result](../../operations/settings/settings.md#check_query_single_value_result) = 0, запрос `CHECK TABLE` возвращает статус каждого куска данных таблицы на локальном сервере. 
+
+```sql
+SET check_query_single_value_result = 0;
+CHECK TABLE test_table;
+```
+
+```text
+┌─part_path─┬─is_passed─┬─message─┐
+│ all_1_4_1 │         1 │         │
+│ all_1_4_2 │         1 │         │
+└───────────┴───────────┴─────────┘
+```
+
+Если `check_query_single_value_result` = 0, запрос `CHECK TABLE` возвращает статус таблицы в целом.
+
+```sql
+SET check_query_single_value_result = 1;
+CHECK TABLE test_table;
+```
+
+```text
+┌─result─┐
+│      1 │
+└────────┘
+```
+
+## Что делать, если данные повреждены {#if-data-is-corrupted}
 
 В этом случае можно скопировать оставшиеся неповрежденные данные в другую таблицу. Для этого:
 
diff --git a/docs/ru/sql-reference/statements/create/row-policy.md b/docs/ru/sql-reference/statements/create/row-policy.md
index 88709598906..6fe1dc45815 100644
--- a/docs/ru/sql-reference/statements/create/row-policy.md
+++ b/docs/ru/sql-reference/statements/create/row-policy.md
@@ -5,7 +5,7 @@ toc_title: "Политика доступа"
 
 # CREATE ROW POLICY {#create-row-policy-statement}
 
-Создает [фильтры для строк](../../../operations/access-rights.md#row-policy-management), которые пользователь может прочесть из таблицы.
+Создает [политики доступа к строкам](../../../operations/access-rights.md#row-policy-management), т.е. фильтры, которые определяют, какие строки пользователь может читать из таблицы.
 
 Синтаксис:
 
@@ -13,33 +13,74 @@ toc_title: "Политика доступа"
 CREATE [ROW] POLICY [IF NOT EXISTS | OR REPLACE] policy_name1 [ON CLUSTER cluster_name1] ON [db1.]table1 
         [, policy_name2 [ON CLUSTER cluster_name2] ON [db2.]table2 ...] 
     [AS {PERMISSIVE | RESTRICTIVE}]
-    [FOR SELECT]
-    [USING condition]
+    [FOR SELECT] USING condition
     [TO {role [,...] | ALL | ALL EXCEPT role [,...]}]
 ```
 
-Секция `ON CLUSTER` позволяет создавать фильтры для строк на кластере, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
+## Секция USING {#create-row-policy-using}
 
-## Секция AS {#create-row-policy-as}
-
-С помощью данной секции можно создать политику разрешения или ограничения.
-
-Политика разрешения предоставляет доступ к строкам. Разрешительные политики, которые применяются к одной таблице, объединяются с помощью логического оператора `OR`. Политики являются разрешительными по умолчанию.
-
-Политика ограничения запрещает доступ к строкам. Ограничительные политики, которые применяются к одной таблице, объединяются логическим оператором `AND`.
-
-Ограничительные политики применяются к строкам, прошедшим фильтр разрешительной политики. Если вы не зададите разрешительные политики, пользователь не сможет обращаться ни к каким строкам из таблицы.
+Секция `USING` указывает условие для фильтрации строк. Пользователь может видеть строку, если это условие, вычисленное для строки, дает ненулевой результат.
 
 ## Секция TO {#create-row-policy-to}
 
-В секции `TO` вы можете перечислить как роли, так и пользователей. Например, `CREATE ROW POLICY ... TO accountant, john@localhost`.
+В секции `TO` перечисляются пользователи и роли, для которых должна действовать политика. Например, `CREATE ROW POLICY ... TO accountant, john@localhost`.
 
 Ключевым словом `ALL` обозначаются все пользователи, включая текущего. Ключевые слова `ALL EXCEPT` позволяют исключить пользователей из списка всех пользователей. Например, `CREATE ROW POLICY ... TO ALL EXCEPT accountant, john@localhost`
 
+!!! note "Note"
+    Если для таблицы не задано ни одной политики доступа к строкам, то любой пользователь может выполнить команду SELECT и получить все строки таблицы. Если определить хотя бы одну политику для таблицы, до доступ к строкам будет управляться этими политиками, причем для всех пользователей (даже для тех, для кого политики не определялись). Например, следующая политика
+
+    `CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter`
+
+    запретит пользователям `mira` и `peter` видеть строки с `b != 1`, и еще запретит всем остальным пользователям (например, пользователю `paul`) видеть какие-либо строки вообще из таблицы `mydb.table1`.
+    
+    Если это нежелательно, такое поведение можно исправить, определив дополнительную политику:
+
+    `CREATE ROW POLICY pol2 ON mydb.table1 USING 1 TO ALL EXCEPT mira, peter`
+
+## Секция AS {#create-row-policy-as}
+
+Может быть одновременно активно более одной политики для одной и той же таблицы и одного и того же пользователя. Поэтому нам нужен способ комбинировать политики.
+
+По умолчанию политики комбинируются с использованием логического оператора `OR`. Например, политики:
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 TO peter, antonio
+```
+
+разрешат пользователю с именем `peter` видеть строки, для которых будет верно `b=1` или `c=2`.
+
+Секция `AS` указывает, как политики должны комбинироваться с другими политиками. Политики могут быть или разрешительными (`PERMISSIVE`), или ограничительными (`RESTRICTIVE`). По умолчанию политики создаются разрешительными (`PERMISSIVE`); такие политики комбинируются с использованием логического оператора `OR`.
+
+Ограничительные (`RESTRICTIVE`) политики комбинируются с использованием логического оператора `AND`.
+
+Общая формула выглядит так:
+
+```
+строка_видима = (одна или больше permissive-политик дала ненулевой результат проверки условия) И
+                (все restrictive-политики дали ненулевой результат проверки условия)
+```
+
+Например, политики
+
+``` sql
+CREATE ROW POLICY pol1 ON mydb.table1 USING b=1 TO mira, peter
+CREATE ROW POLICY pol2 ON mydb.table1 USING c=2 AS RESTRICTIVE TO peter, antonio
+```
+
+разрешат пользователю с именем `peter` видеть только те строки, для которых будет одновременно `b=1` и `c=2`.
+
+## Секция ON CLUSTER {#create-row-policy-on-cluster}
+
+Секция `ON CLUSTER` позволяет создавать политики на кластере, см. [Распределенные DDL запросы](../../../sql-reference/distributed-ddl.md).
+
 ## Примеры
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO accountant, john@localhost`
+`CREATE ROW POLICY filter1 ON mydb.mytable USING a<1000 TO accountant, john@localhost`
 
-`CREATE ROW POLICY filter ON mydb.mytable FOR SELECT USING a<1000 TO ALL EXCEPT mira`
+`CREATE ROW POLICY filter2 ON mydb.mytable USING a<1000 AND b=5 TO ALL EXCEPT mira`
+
+`CREATE ROW POLICY filter3 ON mydb.mytable USING 1 TO admin`
 
 <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index b998435bcd8..1d65d82b24c 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -46,15 +46,32 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name AS table_function()
 ### Из запроса SELECT {#from-select-query}
 
 ``` sql
-CREATE TABLE [IF NOT EXISTS] [db.]table_name ENGINE = engine AS SELECT ...
+CREATE TABLE [IF NOT EXISTS] [db.]table_name[(name1 [type1], name2 [type2], ...)] ENGINE = engine AS SELECT ...
 ```
 
-Создаёт таблицу со структурой, как результат запроса `SELECT`, с движком engine, и заполняет её данными из SELECT-а.
+Создаёт таблицу со структурой, как результат запроса `SELECT`, с движком `engine`, и заполняет её данными из `SELECT`. Также вы можете явно задать описание столбцов.
 
-Во всех случаях, если указано `IF NOT EXISTS`, то запрос не будет возвращать ошибку, если таблица уже существует. В этом случае, запрос будет ничего не делать.
+Если таблица уже существует и указано `IF NOT EXISTS`, то запрос ничего не делает.
 
 После секции `ENGINE` в запросе могут использоваться и другие секции в зависимости от движка. Подробную документацию по созданию таблиц смотрите в описаниях [движков таблиц](../../../engines/table-engines/index.md#table_engines).
 
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE t1 (x String) ENGINE = Memory AS SELECT 1;
+SELECT x, toTypeName(x) FROM t1;
+```
+
+Результат:
+
+```text
+┌─x─┬─toTypeName(x)─┐
+│ 1 │ String        │
+└───┴───────────────┘
+```
+
 ## Модификатор NULL или NOT NULL {#null-modifiers}
 
 Модификатор `NULL` или `NOT NULL`, указанный после типа данных в определении столбца, позволяет или не позволяет типу данных быть [Nullable](../../../sql-reference/data-types/nullable.md#data_type-nullable). 
@@ -230,7 +247,7 @@ CREATE TABLE codec_example
 )
 ENGINE = MergeTree()
 ```
-## Временные таблицы {#vremennye-tablitsy}
+## Временные таблицы {#temporary-tables}
 
 ClickHouse поддерживает временные таблицы со следующими характеристиками:
 
@@ -329,4 +346,39 @@ SELECT * FROM base.t1;
 └───┘
 ```
 
+## Секция COMMENT {#comment-table}
+
+Вы можете добавить комментарий к таблице при ее создании.
+
+!!!note "Замечание"
+    Комментарий поддерживается для всех движков таблиц, кроме [Kafka](../../../engines/table-engines/integrations/kafka.md), [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md) и [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md).
+	
+**Синтаксис**
+
+``` sql
+CREATE TABLE db.table_name
+(
+    name1 type1, name2 type2, ...
+)
+ENGINE = engine
+COMMENT 'Comment'
+```
+	
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE t1 (x String) ENGINE = Memory COMMENT 'The temporary table';
+SELECT name, comment FROM system.tables WHERE name = 't1';
+```
+
+Результат:
+
+```text
+┌─name─┬─comment─────────────┐
+│ t1   │ The temporary table │
+└──────┴─────────────────────┘
+```
+
 <!--hide-->
diff --git a/docs/ru/sql-reference/statements/create/user.md b/docs/ru/sql-reference/statements/create/user.md
index 68277d67052..ea64bff061b 100644
--- a/docs/ru/sql-reference/statements/create/user.md
+++ b/docs/ru/sql-reference/statements/create/user.md
@@ -9,54 +9,68 @@ toc_title: "Пользователь"
 
 Синтаксис:
 
-```sql
+``` sql
 CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1] 
         [, name2 [ON CLUSTER cluster_name2] ...]
-    [IDENTIFIED [WITH {NO_PASSWORD|PLAINTEXT_PASSWORD|SHA256_PASSWORD|SHA256_HASH|DOUBLE_SHA1_PASSWORD|DOUBLE_SHA1_HASH}] BY {'password'|'hash'}]
+    [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 [,...]]
-    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | PROFILE 'profile_name'] [,...]
+    [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
+    [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
 
+`ON CLUSTER` позволяет создавать пользователей в кластере, см. [Распределенные DDL](../../../sql-reference/distributed-ddl.md).
+
 ## Идентификация
 
 Существует несколько способов идентификации пользователя:
 
-- `IDENTIFIED WITH no_password`
-- `IDENTIFIED WITH plaintext_password BY 'qwerty'`
-- `IDENTIFIED WITH sha256_password BY 'qwerty'` or `IDENTIFIED BY 'password'`
-- `IDENTIFIED WITH sha256_hash BY 'hash'`
-- `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
-- `IDENTIFIED WITH double_sha1_hash BY 'hash'`
+-   `IDENTIFIED WITH no_password`
+-   `IDENTIFIED WITH plaintext_password BY 'qwerty'`
+-   `IDENTIFIED WITH sha256_password BY 'qwerty'` or `IDENTIFIED BY 'password'`
+-   `IDENTIFIED WITH sha256_hash BY 'hash'`
+-   `IDENTIFIED WITH double_sha1_password BY 'qwerty'`
+-   `IDENTIFIED WITH double_sha1_hash BY 'hash'`
+-   `IDENTIFIED WITH ldap SERVER 'server_name'`
+-   `IDENTIFIED WITH kerberos` or `IDENTIFIED WITH kerberos REALM 'realm'`
 
 ## Пользовательский хост
 
 Пользовательский хост — это хост, с которого можно установить соединение с сервером ClickHouse. Хост задается в секции `HOST` следующими способами:
 
-- `HOST IP 'ip_address_or_subnetwork'` — Пользователь может подключиться к серверу ClickHouse только с указанного IP-адреса или [подсети](https://ru.wikipedia.org/wiki/Подсеть). Примеры: `HOST IP '192.168.0.0/16'`, `HOST IP '2001:DB8::/32'`. При использовании в эксплуатации указывайте только элементы `HOST IP` (IP-адреса и маски подсети), так как использование `host` и `host_regexp` может привести к дополнительной задержке.
-- `HOST ANY` — Пользователь может подключиться с любого хоста. Используется по умолчанию.
-- `HOST LOCAL` — Пользователь может подключиться только локально.
-- `HOST NAME 'fqdn'` — Хост задается через FQDN. Например, `HOST NAME 'mysite.com'`.
-- `HOST NAME REGEXP 'regexp'` — Позволяет использовать регулярные выражения [pcre](http://www.pcre.org/), чтобы задать хосты. Например, `HOST NAME REGEXP '.*\.mysite\.com'`.
-- `HOST LIKE 'template'` — Позволяет использовать оператор [LIKE](../../functions/string-search-functions.md#function-like) для фильтрации хостов. Например, `HOST LIKE '%'` эквивалентен `HOST ANY`; `HOST LIKE '%.mysite.com'` разрешает подключение со всех хостов в домене `mysite.com`.
+-   `HOST IP 'ip_address_or_subnetwork'` — Пользователь может подключиться к серверу ClickHouse только с указанного IP-адреса или [подсети](https://ru.wikipedia.org/wiki/Подсеть). Примеры: `HOST IP '192.168.0.0/16'`, `HOST IP '2001:DB8::/32'`. При использовании в эксплуатации указывайте только элементы `HOST IP` (IP-адреса и маски подсети), так как использование `host` и `host_regexp` может привести к дополнительной задержке.
+-   `HOST ANY` — Пользователь может подключиться с любого хоста. Используется по умолчанию.
+-   `HOST LOCAL` — Пользователь может подключиться только локально.
+-   `HOST NAME 'fqdn'` — Хост задается через FQDN. Например, `HOST NAME 'mysite.com'`.
+-   `HOST NAME REGEXP 'regexp'` — Позволяет использовать регулярные выражения [pcre](http://www.pcre.org/), чтобы задать хосты. Например, `HOST NAME REGEXP '.*\.mysite\.com'`.
+-   `HOST LIKE 'template'` — Позволяет использовать оператор [LIKE](../../functions/string-search-functions.md#function-like) для фильтрации хостов. Например, `HOST LIKE '%'` эквивалентен `HOST ANY`; `HOST LIKE '%.mysite.com'` разрешает подключение со всех хостов в домене `mysite.com`.
 
 Также, чтобы задать хост, вы можете использовать `@` вместе с именем пользователя. Примеры:
 
-- `CREATE USER mira@'127.0.0.1'` — Эквивалентно `HOST IP`.
-- `CREATE USER mira@'localhost'` — Эквивалентно `HOST LOCAL`.
-- `CREATE USER mira@'192.168.%.%'` — Эквивалентно `HOST LIKE`.
+-   `CREATE USER mira@'127.0.0.1'` — Эквивалентно `HOST IP`.
+-   `CREATE USER mira@'localhost'` — Эквивалентно `HOST LOCAL`.
+-   `CREATE USER mira@'192.168.%.%'` — Эквивалентно `HOST LIKE`.
 
 !!! info "Внимание"
     ClickHouse трактует конструкцию `user_name@'address'` как имя пользователя целиком. То есть технически вы можете создать несколько пользователей с одинаковыми `user_name`, но разными частями конструкции после `@`, но лучше так не делать.
+	
+## Секция GRANTEES {#grantees}
 
+Указываются пользователи или роли, которым разрешено получать [привилегии](../../../sql-reference/statements/grant.md#grant-privileges) от создаваемого пользователя при условии, что этому пользователю также предоставлен весь необходимый доступ с использованием [GRANT OPTION](../../../sql-reference/statements/grant.md#grant-privigele-syntax). Параметры секции `GRANTEES`:
+
+-   `user` — указывается пользователь, которому разрешено получать привилегии от создаваемого пользователя.
+-   `role` — указывается роль, которой разрешено получать привилегии от создаваемого пользователя.
+-   `ANY` — любому пользователю или любой роли разрешено получать привилегии от создаваемого пользователя. Используется по умолчанию.
+-   `NONE` — никому не разрешено получать привилегии от создаваемого пользователя.
+
+Вы можете исключить любого пользователя или роль, используя выражение `EXCEPT`. Например, `CREATE USER user1 GRANTEES ANY EXCEPT user2`. Это означает, что если `user1` имеет привилегии, предоставленные с использованием `GRANT OPTION`, он сможет предоставить их любому, кроме `user2`.
 
 ## Примеры {#create-user-examples}
 
-
 Создать аккаунт `mira`, защищенный паролем `qwerty`:
 
 ```sql
-CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty'
+CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty';
 ```
 
 Пользователь `mira` должен запустить клиентское приложение на хосте, где запущен ClickHouse.
@@ -64,13 +78,13 @@ CREATE USER mira HOST IP '127.0.0.1' IDENTIFIED WITH sha256_password BY 'qwerty'
 Создать аккаунт `john`, назначить на него роли, сделать данные роли ролями по умолчанию:
 
 ``` sql
-CREATE USER john DEFAULT ROLE role1, role2
+CREATE USER john DEFAULT ROLE role1, role2;
 ```
 
 Создать аккаунт `john` и установить ролями по умолчанию все его будущие роли:
 
 ``` sql
-CREATE USER user DEFAULT ROLE ALL
+CREATE USER john DEFAULT ROLE ALL;
 ```
 
 Когда роль будет назначена аккаунту `john`, она автоматически станет ролью по умолчанию.
@@ -78,7 +92,11 @@ CREATE USER user DEFAULT ROLE ALL
 Создать аккаунт `john` и установить ролями по умолчанию все его будущие роли, кроме `role1` и `role2`:
 
 ``` sql
-CREATE USER john DEFAULT ROLE ALL EXCEPT role1, role2
+CREATE USER john DEFAULT ROLE ALL EXCEPT role1, role2;
 ```
 
-<!--hide-->
\ No newline at end of file
+Создать пользователя с аккаунтом `john` и разрешить ему предоставить свои привилегии пользователю с аккаунтом `jack`:
+
+``` sql
+CREATE USER john GRANTEES jack;
+```
diff --git a/docs/ru/sql-reference/statements/detach.md b/docs/ru/sql-reference/statements/detach.md
index d707acd7ccf..af915d38772 100644
--- a/docs/ru/sql-reference/statements/detach.md
+++ b/docs/ru/sql-reference/statements/detach.md
@@ -10,7 +10,7 @@ toc_title: DETACH
 Синтаксис:
 
 ``` sql
-DETACH TABLE|VIEW [IF EXISTS] [db.]name [PERMANENTLY] [ON CLUSTER cluster]
+DETACH TABLE|VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster] [PERMANENTLY]
 ```
 
 Но ни данные, ни метаданные таблицы или материализованного представления не удаляются. При следующем запуске сервера, если не было использовано `PERMANENTLY`, сервер прочитает метаданные и снова узнает о таблице/представлении. Если таблица или представление были отключены перманентно, сервер не подключит их обратно автоматически.
diff --git a/docs/ru/sql-reference/statements/explain.md b/docs/ru/sql-reference/statements/explain.md
new file mode 100644
index 00000000000..c925e7030a7
--- /dev/null
+++ b/docs/ru/sql-reference/statements/explain.md
@@ -0,0 +1,388 @@
+---
+toc_priority: 39
+toc_title: EXPLAIN
+---
+
+# EXPLAIN {#explain}
+
+Выводит план выполнения запроса.
+
+Синтаксис:
+
+```sql
+EXPLAIN [AST | SYNTAX | PLAN | PIPELINE] [setting = value, ...] SELECT ... [FORMAT ...]
+```
+
+Пример:
+
+```sql
+EXPLAIN SELECT sum(number) FROM numbers(10) UNION ALL SELECT sum(number) FROM numbers(10) ORDER BY sum(number) ASC FORMAT TSV;
+```
+
+```sql
+Union
+  Expression (Projection)
+    Expression (Before ORDER BY and SELECT)
+      Aggregating
+        Expression (Before GROUP BY)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemNumbers)
+  Expression (Projection)
+    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 and SELECT)
+            Aggregating
+              Expression (Before GROUP BY)
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                  ReadFromStorage (SystemNumbers)
+```
+
+## Типы EXPLAIN {#explain-types}
+
+-  `AST` — абстрактное синтаксическое дерево.
+-  `SYNTAX` — текст запроса после оптимизации на уровне AST.
+-  `PLAN` — план выполнения запроса.
+-  `PIPELINE` — конвейер выполнения запроса.
+
+### EXPLAIN AST {#explain-ast}
+
+Дамп AST запроса. Поддерживает все типы запросов, не только `SELECT`.
+
+Примеры:
+
+```sql
+EXPLAIN AST SELECT 1;
+```
+
+```sql
+SelectWithUnionQuery (children 1)
+ ExpressionList (children 1)
+  SelectQuery (children 1)
+   ExpressionList (children 1)
+    Literal UInt64_1
+```
+
+```sql
+EXPLAIN AST ALTER TABLE t1 DELETE WHERE date = today();
+```
+
+```sql
+  explain
+  AlterQuery  t1 (children 1)
+   ExpressionList (children 1)
+    AlterCommand 27 (children 1)
+     Function equals (children 1)
+      ExpressionList (children 2)
+       Identifier date
+       Function today (children 1)
+        ExpressionList
+```
+
+### EXPLAIN SYNTAX {#explain-syntax}
+
+Возвращает текст запроса после применения синтаксических оптимизаций.
+
+Пример:
+
+```sql
+EXPLAIN SYNTAX SELECT * FROM system.numbers AS a, system.numbers AS b, system.numbers AS c;
+```
+
+```sql
+SELECT
+    `--a.number` AS `a.number`,
+    `--b.number` AS `b.number`,
+    number AS `c.number`
+FROM
+(
+    SELECT
+        number AS `--a.number`,
+        b.number AS `--b.number`
+    FROM system.numbers AS a
+    CROSS JOIN system.numbers AS b
+) AS `--.s`
+CROSS JOIN system.numbers AS c
+```
+
+### EXPLAIN PLAN {#explain-plan}
+
+Дамп шагов выполнения запроса.
+
+Настройки:
+
+-   `header` — выводит выходной заголовок для шага. По умолчанию: 0.
+-   `description` — выводит описание шага. По умолчанию: 1.
+-   `indexes` — показывает используемые индексы, количество отфильтрованных кусков и гранул для каждого примененного индекса. По умолчанию: 0. Поддерживается для таблиц семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md).
+-   `actions` — выводит подробную информацию о действиях, выполняемых на данном шаге. По умолчанию: 0.
+-   `json` — выводит шаги выполнения запроса в виде строки в формате [JSON](../../interfaces/formats.md#json). По умолчанию: 0. Чтобы избежать ненужного экранирования, рекомендуется использовать формат [TSVRaw](../../interfaces/formats.md#tabseparatedraw).
+
+Пример:
+
+```sql
+EXPLAIN SELECT sum(number) FROM numbers(10) GROUP BY number % 4;
+```
+
+```sql
+Union
+  Expression (Projection)
+  Expression (Before ORDER BY and SELECT)
+    Aggregating
+      Expression (Before GROUP BY)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemNumbers)
+```
+
+!!! note "Примечание"
+    Оценка стоимости выполнения шага и запроса не поддерживается.
+	
+При `json = 1` шаги выполнения запроса выводятся в формате JSON. Каждый узел — это словарь, в котором всегда есть ключи `Node Type` и `Plans`. `Node Type` — это строка с именем шага. `Plans` — это массив с описаниями дочерних шагов. Другие дополнительные ключи могут быть добавлены в зависимости от типа узла и настроек.
+
+Пример:
+
+```sql
+EXPLAIN json = 1, description = 0 SELECT 1 UNION ALL SELECT 2 FORMAT TSVRaw;
+```
+
+```json
+[
+  {
+    "Plan": {
+      "Node Type": "Union",
+      "Plans": [
+        {
+          "Node Type": "Expression",
+          "Plans": [
+            {
+              "Node Type": "SettingQuotaAndLimits",
+              "Plans": [
+                {
+                  "Node Type": "ReadFromStorage"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "Node Type": "Expression",
+          "Plans": [
+            {
+              "Node Type": "SettingQuotaAndLimits",
+              "Plans": [
+                {
+                  "Node Type": "ReadFromStorage"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+```
+
+При `description` = 1 к шагу добавляется ключ `Description`:
+
+```json
+{
+  "Node Type": "ReadFromStorage",
+  "Description": "SystemOne"
+}
+```
+
+При `header` = 1 к шагу добавляется ключ `Header` в виде массива столбцов.
+
+Пример:
+
+```sql
+EXPLAIN json = 1, description = 0, header = 1 SELECT 1, 2 + dummy;
+```
+
+```json
+[
+  {
+    "Plan": {
+      "Node Type": "Expression",
+      "Header": [
+        {
+          "Name": "1",
+          "Type": "UInt8"
+        },
+        {
+          "Name": "plus(2, dummy)",
+          "Type": "UInt16"
+        }
+      ],
+      "Plans": [
+        {
+          "Node Type": "SettingQuotaAndLimits",
+          "Header": [
+            {
+              "Name": "dummy",
+              "Type": "UInt8"
+            }
+          ],
+          "Plans": [
+            {
+              "Node Type": "ReadFromStorage",
+              "Header": [
+                {
+                  "Name": "dummy",
+                  "Type": "UInt8"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+```
+  
+При `indexes` = 1 добавляется ключ `Indexes`. Он содержит массив используемых индексов. Каждый индекс описывается как строка в формате JSON с ключом `Type` (`MinMax`, `Partition`, `PrimaryKey` или `Skip`) и дополнительные ключи:
+
+-   `Name` — имя индекса (на данный момент используется только для индекса `Skip`).
+-   `Keys` — массив столбцов, используемых индексом.
+-   `Condition` — строка с используемым условием.
+-   `Description` — индекс (на данный момент используется только для индекса `Skip`).
+-   `Initial Parts` — количество кусков до применения индекса.
+-   `Selected Parts` — количество кусков после применения индекса.
+-   `Initial Granules` — количество гранул до применения индекса.
+-   `Selected Granulesis` — количество гранул после применения индекса.
+
+Пример:
+
+```json
+"Node Type": "ReadFromMergeTree",
+"Indexes": [
+  {
+    "Type": "MinMax",
+    "Keys": ["y"],
+    "Condition": "(y in [1, +inf))",
+    "Initial Parts": 5,
+    "Selected Parts": 4,
+    "Initial Granules": 12,
+    "Selected Granules": 11
+  },
+  {
+    "Type": "Partition",
+    "Keys": ["y", "bitAnd(z, 3)"],
+    "Condition": "and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +inf)), (bitAnd(z, 3) not in [1, 1])))",
+    "Initial Parts": 4,
+    "Selected Parts": 3,
+    "Initial Granules": 11,
+    "Selected Granules": 10
+  },
+  {
+    "Type": "PrimaryKey",
+    "Keys": ["x", "y"],
+    "Condition": "and((x in [11, +inf)), (y in [1, +inf)))",
+    "Initial Parts": 3,
+    "Selected Parts": 2,
+    "Initial Granules": 10,
+    "Selected Granules": 6
+  },
+  {
+    "Type": "Skip",
+    "Name": "t_minmax",
+    "Description": "minmax GRANULARITY 2",
+    "Initial Parts": 2,
+    "Selected Parts": 1,
+    "Initial Granules": 6,
+    "Selected Granules": 2
+  },
+  {
+    "Type": "Skip",
+    "Name": "t_set",
+    "Description": "set GRANULARITY 2",
+    "Initial Parts": 1,
+    "Selected Parts": 1,
+    "Initial Granules": 2,
+    "Selected Granules": 1
+  }
+]
+```
+
+При `actions` = 1 добавляются ключи, зависящие от типа шага.
+
+Пример:
+
+```sql
+EXPLAIN json = 1, actions = 1, description = 0 SELECT 1 FORMAT TSVRaw;
+```
+
+```json
+[
+  {
+    "Plan": {
+      "Node Type": "Expression",
+      "Expression": {
+        "Inputs": [],
+        "Actions": [
+          {
+            "Node Type": "Column",
+            "Result Type": "UInt8",
+            "Result Type": "Column",
+            "Column": "Const(UInt8)",
+            "Arguments": [],
+            "Removed Arguments": [],
+            "Result": 0
+          }
+        ],
+        "Outputs": [
+          {
+            "Name": "1",
+            "Type": "UInt8"
+          }
+        ],
+        "Positions": [0],
+        "Project Input": true
+      },
+      "Plans": [
+        {
+          "Node Type": "SettingQuotaAndLimits",
+          "Plans": [
+            {
+              "Node Type": "ReadFromStorage"
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+```
+
+### EXPLAIN PIPELINE {#explain-pipeline}
+
+Настройки:
+
+-   `header` — выводит заголовок для каждого выходного порта. По умолчанию: 0.
+-   `graph` — выводит граф, описанный на языке [DOT](https://ru.wikipedia.org/wiki/DOT_(язык)). По умолчанию: 0.
+-   `compact` — выводит граф в компактном режиме, если включена настройка `graph`. По умолчанию: 1.
+
+Пример:
+
+```sql
+EXPLAIN PIPELINE SELECT sum(number) FROM numbers_mt(100000) GROUP BY number % 4;
+```
+
+```sql
+(Union)
+(Expression)
+ExpressionTransform
+  (Expression)
+  ExpressionTransform
+    (Aggregating)
+    Resize 2 → 1
+      AggregatingTransform × 2
+        (Expression)
+        ExpressionTransform × 2
+          (SettingQuotaAndLimits)
+            (ReadFromStorage)
+            NumbersMt × 2 0 → 1
+```
+
+[Оригинальная статья](https://clickhouse.tech/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 7b2d26902ef..093e6eb3b93 100644
--- a/docs/ru/sql-reference/statements/grant.md
+++ b/docs/ru/sql-reference/statements/grant.md
@@ -93,7 +93,7 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
             - `ALTER ADD CONSTRAINT`
             - `ALTER DROP CONSTRAINT`
         - `ALTER TTL`
-        - `ALTER MATERIALIZE TTL`
+            - `ALTER MATERIALIZE TTL`
         - `ALTER SETTINGS`
         - `ALTER MOVE PARTITION`
         - `ALTER FETCH PARTITION`
@@ -104,9 +104,9 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
 - [CREATE](#grant-create)
     - `CREATE DATABASE`
     - `CREATE TABLE`
+        - `CREATE TEMPORARY TABLE`
     - `CREATE VIEW`
     - `CREATE DICTIONARY`
-    - `CREATE TEMPORARY TABLE`
 - [DROP](#grant-drop)
     - `DROP DATABASE`
     - `DROP TABLE`
@@ -152,7 +152,7 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
     - `SYSTEM RELOAD`
         - `SYSTEM RELOAD CONFIG`
         - `SYSTEM RELOAD DICTIONARY`
-        - `SYSTEM RELOAD EMBEDDED DICTIONARIES`
+            - `SYSTEM RELOAD EMBEDDED DICTIONARIES`
     - `SYSTEM MERGES`
     - `SYSTEM TTL MERGES`
     - `SYSTEM FETCHES`
@@ -279,7 +279,7 @@ GRANT INSERT(x,y) ON db.table TO john
             - `ALTER ADD CONSTRAINT`. Уровень: `TABLE`. Алиасы: `ADD CONSTRAINT`
             - `ALTER DROP CONSTRAINT`. Уровень: `TABLE`. Алиасы: `DROP CONSTRAINT`
         - `ALTER TTL`. Уровень: `TABLE`. Алиасы: `ALTER MODIFY TTL`, `MODIFY TTL`
-        - `ALTER MATERIALIZE TTL`. Уровень: `TABLE`. Алиасы: `MATERIALIZE TTL`
+            - `ALTER MATERIALIZE TTL`. Уровень: `TABLE`. Алиасы: `MATERIALIZE TTL`
         - `ALTER SETTINGS`. Уровень: `TABLE`. Алиасы: `ALTER SETTING`, `ALTER MODIFY SETTING`, `MODIFY SETTING`
         - `ALTER MOVE PARTITION`. Уровень: `TABLE`. Алиасы: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
         - `ALTER FETCH PARTITION`. Уровень: `TABLE`. Алиасы: `FETCH PARTITION`
@@ -307,9 +307,9 @@ GRANT INSERT(x,y) ON db.table TO john
 - `CREATE`. Уровень: `GROUP`
     - `CREATE DATABASE`. Уровень: `DATABASE`
     - `CREATE TABLE`. Уровень: `TABLE`
+        - `CREATE TEMPORARY TABLE`. Уровень: `GLOBAL`
     - `CREATE VIEW`. Уровень: `VIEW`
     - `CREATE DICTIONARY`. Уровень: `DICTIONARY`
-    - `CREATE TEMPORARY TABLE`. Уровень: `GLOBAL`
 
 **Дополнительно**
 
@@ -407,7 +407,7 @@ GRANT INSERT(x,y) ON db.table TO john
     - `SYSTEM RELOAD`. Уровень: `GROUP`
         - `SYSTEM RELOAD CONFIG`. Уровень: `GLOBAL`. Алиасы: `RELOAD CONFIG`
         - `SYSTEM RELOAD DICTIONARY`. Уровень: `GLOBAL`. Алиасы: `SYSTEM RELOAD DICTIONARIES`, `RELOAD DICTIONARY`, `RELOAD DICTIONARIES`
-        - `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Уровень: `GLOBAL`. Алиасы: `RELOAD EMBEDDED DICTIONARIES`
+            - `SYSTEM RELOAD EMBEDDED DICTIONARIES`. Уровень: `GLOBAL`. Алиасы: `RELOAD EMBEDDED DICTIONARIES`
     - `SYSTEM MERGES`. Уровень: `TABLE`. Алиасы: `SYSTEM STOP MERGES`, `SYSTEM START MERGES`, `STOP MERGES`, `START MERGES`
     - `SYSTEM TTL MERGES`. Уровень: `TABLE`. Алиасы: `SYSTEM STOP TTL MERGES`, `SYSTEM START TTL MERGES`, `STOP TTL MERGES`, `START TTL MERGES`
     - `SYSTEM FETCHES`. Уровень: `TABLE`. Алиасы: `SYSTEM STOP FETCHES`, `SYSTEM START FETCHES`, `STOP FETCHES`, `START FETCHES`
diff --git a/docs/ru/sql-reference/statements/insert-into.md b/docs/ru/sql-reference/statements/insert-into.md
index bbd330962cf..328f1023624 100644
--- a/docs/ru/sql-reference/statements/insert-into.md
+++ b/docs/ru/sql-reference/statements/insert-into.md
@@ -107,6 +107,8 @@ INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
 Для табличной функции [input()](../table-functions/input.md) после секции `SELECT` должна следовать
 секция `FORMAT`.
 
+Чтобы вставить значение по умолчанию вместо `NULL` в столбец, который не позволяет хранить `NULL`, включите настройку [insert_null_as_default](../../operations/settings/settings.md#insert_null_as_default). 
+
 ### Замечания о производительности {#zamechaniia-o-proizvoditelnosti}
 
 `INSERT` сортирует входящие данные по первичному ключу и разбивает их на партиции по ключу партиционирования. Если вы вставляете данные в несколько партиций одновременно, то это может значительно снизить производительность запроса `INSERT`. Чтобы избежать этого:
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index 44101910a6c..70503ec4de9 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -5,19 +5,188 @@ toc_title: OPTIMIZE
 
 # OPTIMIZE {#misc_operations-optimize}
 
-``` sql
-OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE]
-```
-
-Запрос пытается запустить внеплановый мёрж кусков данных для таблиц семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md). Другие движки таблиц не поддерживаются.
-
-Если `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на мёрж и ожидает её исполнения на всех узлах (если активирована настройка `replication_alter_partitions_sync`).
-
--   Если `OPTIMIZE` не выполняет мёрж по любой причине, ClickHouse не оповещает об этом клиента. Чтобы включить оповещения, используйте настройку [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop).
--   Если указать `PARTITION`, то оптимизация выполняется только для указанной партиции. [Как задавать имя партиции в запросах](alter/index.md#alter-how-to-specify-part-expr).
--   Если указать `FINAL`, то оптимизация выполняется даже в том случае, если все данные уже лежат в одном куске. Кроме того, слияние является принудительным, даже если выполняются параллельные слияния.
--   Если указать `DEDUPLICATE`, то произойдет схлопывание полностью одинаковых строк (сравниваются значения во всех колонках), имеет смысл только для движка MergeTree.
+Запрос пытается запустить внеплановое слияние кусков данных для таблиц.
 
 !!! warning "Внимание"
-    Запрос `OPTIMIZE` не может устранить причину появления ошибки «Too many parts».
-    
+    `OPTIMIZE` не устраняет причину появления ошибки `Too many parts`.
+
+**Синтаксис**
+
+``` sql
+OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION ID 'partition_id'] [FINAL] [DEDUPLICATE [BY expression]]
+```
+
+Может применяться к таблицам семейства [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` не удалось выполнить слияние, то
+ClickHouse не оповещает клиента. Чтобы включить оповещения, используйте настройку [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop).
+-   Если указать `PARTITION`, то оптимизация выполняется только для указанной партиции. [Как задавать имя партиции в запросах](alter/index.md#alter-how-to-specify-part-expr).
+-   Если указать `FINAL`, то оптимизация выполняется даже в том случае, если все данные уже лежат в одном куске данных. Кроме того, слияние является принудительным, даже если выполняются параллельные слияния.
+-   Если указать `DEDUPLICATE`, то произойдет схлопывание полностью одинаковых строк (сравниваются значения во всех столбцах), имеет смысл только для движка MergeTree.
+
+## Выражение 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).
+
+ Список столбцов для дедупликации должен включать все столбцы, указанные в условиях сортировки (первичный ключ и ключ сортировки), а также в условиях партиционирования (ключ партиционирования).
+
+!!! note "Примечание"
+    Обратите внимание, что символ подстановки `*` обрабатывается так же, как и в запросах `SELECT`: столбцы [MATERIALIZED](../../sql-reference/statements/create/table.md#materialized) и [ALIAS](../../sql-reference/statements/create/table.md#alias) не включаются в результат.
+    Если указать пустой список или выражение, которое возвращает пустой список, то сервер вернет ошибку. Запрос вида `DEDUPLICATE BY aliased_value` также вернет ошибку.
+
+**Синтаксис**
+
+``` sql
+OPTIMIZE TABLE table DEDUPLICATE; -- по всем столбцам
+OPTIMIZE TABLE table DEDUPLICATE BY *; -- исключаются столбцы MATERIALIZED и ALIAS
+OPTIMIZE TABLE table DEDUPLICATE BY colX,colY,colZ;
+OPTIMIZE TABLE table DEDUPLICATE BY * EXCEPT colX;
+OPTIMIZE TABLE table DEDUPLICATE BY * EXCEPT (colX, colY);
+OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex');
+OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex') EXCEPT colX;
+OPTIMIZE TABLE table DEDUPLICATE BY COLUMNS('column-matched-by-regex') EXCEPT (colX, colY);
+```
+
+**Примеры**
+
+Рассмотрим таблицу:
+
+``` sql
+CREATE TABLE example (
+    primary_key Int32,
+    secondary_key Int32,
+    value UInt32,
+    partition_key UInt32,
+    materialized_value UInt32 MATERIALIZED 12345,
+    aliased_value UInt32 ALIAS 2,
+    PRIMARY KEY primary_key
+) ENGINE=MergeTree　
+PARTITION BY partition_key
+ORDER BY (primary_key, secondary_key);
+```
+``` sql
+INSERT INTO example (primary_key, secondary_key, value, partition_key) 
+VALUES (0, 0, 0, 0), (0, 0, 0, 0), (1, 1, 2, 2), (1, 1, 2, 3), (1, 1, 3, 3);
+```
+``` sql
+SELECT * FROM example;
+```
+Результат:
+```
+
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+│           1 │             1 │     3 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+Если в запросе не указаны столбцы, по которым нужно дедуплицировать, то учитываются все столбцы таблицы. Строка удаляется только в том случае, если все значения во всех столбцах равны соответствующим значениям в другой строке.
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE;
+```
+``` sql
+SELECT * FROM example;
+```
+Результат:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+│           1 │             1 │     3 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+Если столбцы в запросе указаны через `*`, то дедупликация пройдет по всем столбцам, кроме `ALIAS` и `MATERIALIZED`. Для таблицы `example` будут учтены: `primary_key`, `secondary_key`, `value` и `partition_key`.
+```sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY *;
+```
+``` sql
+SELECT * FROM example;
+```
+Результат:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+│           1 │             1 │     3 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+Дедупликация по всем столбцам, кроме `ALIAS` и `MATERIALIZED` (`BY *`), и с исключением столбца `value`: `primary_key`, `secondary_key` и `partition_key`.
+``` sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY * EXCEPT value;
+```
+``` sql
+SELECT * FROM example;
+```
+Результат:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+Дедупликация по столбцам `primary_key`, `secondary_key` и `partition_key`.
+```sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY primary_key, secondary_key, partition_key;
+```
+``` sql
+SELECT * FROM example;
+```
+Результат:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
+
+Дедупликация по любому столбцу, который соответствует регулярному выражению `.*_key`: `primary_key`, `secondary_key` и `partition_key`.
+```sql
+OPTIMIZE TABLE example FINAL DEDUPLICATE BY COLUMNS('.*_key');
+```
+``` sql
+SELECT * FROM example;
+```
+Результат:
+```
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           0 │             0 │     0 │             0 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             2 │
+└─────────────┴───────────────┴───────┴───────────────┘
+┌─primary_key─┬─secondary_key─┬─value─┬─partition_key─┐
+│           1 │             1 │     2 │             3 │
+└─────────────┴───────────────┴───────┴───────────────┘
+```
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/rename.md b/docs/ru/sql-reference/statements/rename.md
index 104918c1a73..192426dbafa 100644
--- a/docs/ru/sql-reference/statements/rename.md
+++ b/docs/ru/sql-reference/statements/rename.md
@@ -3,8 +3,16 @@ toc_priority: 48
 toc_title: RENAME
 ---
 
-# RENAME {#misc_operations-rename}
+# RENAME Statement {#misc_operations-rename}
 
+## RENAME DATABASE {#misc_operations-rename_database}
+Переименование базы данных
+
+```
+RENAME DATABASE atomic_database1 TO atomic_database2 [ON CLUSTER cluster]
+```
+
+## RENAME TABLE {#misc_operations-rename_table}
 Переименовывает одну или несколько таблиц.
 
 ``` sql
@@ -12,5 +20,3 @@ RENAME TABLE [db11.]name11 TO [db12.]name12, [db21.]name21 TO [db22.]name22, ...
 ```
 
 Переименовывание таблицы является лёгкой операцией. Если вы указали после `TO` другую базу данных, то таблица будет перенесена в эту базу данных. При этом, директории с базами данных должны быть расположены в одной файловой системе (иначе возвращается ошибка). В случае переименования нескольких таблиц в одном запросе — это неатомарная операция,  может выполнится частично, запросы в других сессиях могут получить ошибку `Table ... doesn't exist...`.
-
-
diff --git a/docs/ru/sql-reference/statements/select/index.md b/docs/ru/sql-reference/statements/select/index.md
index 886952ea5cf..a3b4e889397 100644
--- a/docs/ru/sql-reference/statements/select/index.md
+++ b/docs/ru/sql-reference/statements/select/index.md
@@ -45,6 +45,7 @@ SELECT [DISTINCT] expr_list
 -   [Секция SELECT](#select-clause)
 -   [Секция DISTINCT](distinct.md)
 -   [Секция LIMIT](limit.md)
+    [Секция OFFSET](offset.md)
 -   [Секция UNION ALL](union.md)
 -   [Секция INTO OUTFILE](into-outfile.md)
 -   [Секция FORMAT](format.md)
diff --git a/docs/ru/sql-reference/statements/select/limit.md b/docs/ru/sql-reference/statements/select/limit.md
index 03b720226f0..e4012e89556 100644
--- a/docs/ru/sql-reference/statements/select/limit.md
+++ b/docs/ru/sql-reference/statements/select/limit.md
@@ -12,13 +12,16 @@ toc_title: LIMIT
 
 При отсутствии секции [ORDER BY](order-by.md), однозначно сортирующей результат, результат может быть произвольным и может являться недетерминированным.
 
+!!! note "Примечание" 
+    Количество возвращаемых строк может зависеть также от настройки [limit](../../../operations/settings/settings.md#limit).
+
 ## Модификатор LIMIT ... WITH TIES  {#limit-with-ties}
 
 Когда вы установите модификатор WITH TIES для `LIMIT n[,m]` и указываете `ORDER BY expr_list`, вы получите первые `n` или `n,m` строк и дополнительно все строки с теми же самым значениями полей указанных в `ORDER BY` равными строке на позиции `n` для `LIMIT n` или `m` для `LIMIT n,m`.
 
 Этот модификатор также может быть скомбинирован с [ORDER BY ... WITH FILL модификатором](../../../sql-reference/statements/select/order-by.md#orderby-with-fill)
 
-Для примера следующий запрос
+Для примера следующий запрос:
 ```sql
 SELECT * FROM (
     SELECT number%50 AS n FROM numbers(100)
diff --git a/docs/ru/sql-reference/statements/select/offset.md b/docs/ru/sql-reference/statements/select/offset.md
new file mode 100644
index 00000000000..31ff1d6ea8b
--- /dev/null
+++ b/docs/ru/sql-reference/statements/select/offset.md
@@ -0,0 +1,86 @@
+---
+toc_title: OFFSET
+---
+
+# Секция OFFSET FETCH {#offset-fetch}
+
+`OFFSET` и `FETCH` позволяют извлекать данные по частям. Они указывают строки, которые вы хотите получить в результате запроса.
+
+``` sql
+OFFSET offset_row_count {ROW | ROWS}] [FETCH {FIRST | NEXT} fetch_row_count {ROW | ROWS} {ONLY | WITH TIES}]
+```
+
+`offset_row_count` или `fetch_row_count` может быть числом или литеральной константой. Если вы не задаете `fetch_row_count` явно, используется значение по умолчанию, равное 1.
+
+`OFFSET` указывает количество строк, которые необходимо пропустить перед началом возврата строк из запроса.
+
+`FETCH` указывает максимальное количество строк, которые могут быть получены в результате запроса.
+
+Опция `ONLY` используется для возврата строк, которые следуют сразу же за строками, пропущенными секцией `OFFSET`. В этом случае `FETCH` — это альтернатива [LIMIT](../../../sql-reference/statements/select/limit.md). Например, следующий запрос
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 1 ROW FETCH FIRST 3 ROWS ONLY;
+```
+
+идентичен запросу
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a LIMIT 3 OFFSET 1;
+```
+
+Опция `WITH TIES` используется для возврата дополнительных строк, которые привязываются к последней в результате запроса. Например, если `fetch_row_count` имеет значение 5 и существуют еще 2 строки с такими же значениями столбцов, указанных в `ORDER BY`, что и у пятой строки результата, то финальный набор будет содержать 7 строк.
+
+!!! note "Примечание"
+    Секция `OFFSET` должна находиться перед секцией `FETCH`, если обе присутствуют.
+
+!!! note "Примечание"
+    Общее количество пропущенных строк может зависеть также от настройки [offset](../../../operations/settings/settings.md#offset).
+	
+## Примеры {#examples}
+
+Входная таблица:
+
+``` text
+┌─a─┬─b─┐
+│ 1 │ 1 │
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 1 │ 3 │
+│ 5 │ 4 │
+│ 0 │ 6 │
+│ 5 │ 7 │
+└───┴───┘
+```
+
+Использование опции `ONLY`:
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS ONLY;
+```
+
+Результат:
+
+``` text
+┌─a─┬─b─┐
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 5 │ 4 │
+└───┴───┘
+```
+
+Использование опции `WITH TIES`:
+
+``` sql
+SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS WITH TIES;
+```
+
+Результат:
+
+``` text
+┌─a─┬─b─┐
+│ 2 │ 1 │
+│ 3 │ 4 │
+│ 5 │ 4 │
+│ 5 │ 7 │
+└───┴───┘
+```
diff --git a/docs/ru/sql-reference/statements/select/order-by.md b/docs/ru/sql-reference/statements/select/order-by.md
index 9ddec923701..cb49d167b13 100644
--- a/docs/ru/sql-reference/statements/select/order-by.md
+++ b/docs/ru/sql-reference/statements/select/order-by.md
@@ -392,84 +392,3 @@ ORDER BY
 │ 1970-03-12 │ 1970-01-08 │ original │ 
 └────────────┴────────────┴──────────┘                  
 ```
-
-## Секция OFFSET FETCH {#offset-fetch}
-
-`OFFSET` и `FETCH` позволяют извлекать данные по частям. Они указывают строки, которые вы хотите получить в результате запроса.
-
-``` sql
-OFFSET offset_row_count {ROW | ROWS}] [FETCH {FIRST | NEXT} fetch_row_count {ROW | ROWS} {ONLY | WITH TIES}]
-```
-
-`offset_row_count` или `fetch_row_count` может быть числом или литеральной константой. Если вы не используете `fetch_row_count`, то его значение равно 1.
-
-`OFFSET` указывает количество строк, которые необходимо пропустить перед началом возврата строк из запроса.
-
-`FETCH` указывает максимальное количество строк, которые могут быть получены в результате запроса.
-
-Опция `ONLY` используется для возврата строк, которые следуют сразу же за строками, пропущенными секцией `OFFSET`. В этом случае `FETCH` — это альтернатива [LIMIT](../../../sql-reference/statements/select/limit.md). Например, следующий запрос
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a OFFSET 1 ROW FETCH FIRST 3 ROWS ONLY;
-```
-
-идентичен запросу
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a LIMIT 3 OFFSET 1;
-```
-
-Опция `WITH TIES` используется для возврата дополнительных строк, которые привязываются к последней в результате запроса. Например, если `fetch_row_count` имеет значение 5 и существуют еще 2 строки с такими же значениями столбцов, указанных в `ORDER BY`, что и у пятой строки результата, то финальный набор будет содержать 7 строк.
-
-!!! note "Примечание"
-    Секция `OFFSET` должна находиться перед секцией `FETCH`, если обе присутствуют.
-	
-### Примеры {#examples}
-
-Входная таблица:
-
-``` text
-┌─a─┬─b─┐
-│ 1 │ 1 │
-│ 2 │ 1 │
-│ 3 │ 4 │
-│ 1 │ 3 │
-│ 5 │ 4 │
-│ 0 │ 6 │
-│ 5 │ 7 │
-└───┴───┘
-```
-
-Использование опции `ONLY`:
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS ONLY;
-```
-
-Результат:
-
-``` text
-┌─a─┬─b─┐
-│ 2 │ 1 │
-│ 3 │ 4 │
-│ 5 │ 4 │
-└───┴───┘
-```
-
-Использование опции `WITH TIES`:
-
-``` sql
-SELECT * FROM test_fetch ORDER BY a OFFSET 3 ROW FETCH FIRST 3 ROWS WITH TIES;
-```
-
-Результат:
-
-``` text
-┌─a─┬─b─┐
-│ 2 │ 1 │
-│ 3 │ 4 │
-│ 5 │ 4 │
-│ 5 │ 7 │
-└───┴───┘
-```
-
diff --git a/docs/ru/sql-reference/statements/select/prewhere.md b/docs/ru/sql-reference/statements/select/prewhere.md
index c2a02b1a436..5ba25e6fa6e 100644
--- a/docs/ru/sql-reference/statements/select/prewhere.md
+++ b/docs/ru/sql-reference/statements/select/prewhere.md
@@ -16,6 +16,9 @@ Prewhere — это оптимизация для более эффективн
 
 Если значение параметра `optimize_move_to_prewhere` равно 0, эвристика по автоматическому перемещнию части выражений из `WHERE` к `PREWHERE` отключается.
 
+!!! note "Внимание"
+    Секция `PREWHERE` выполняется до `FINAL`, поэтому результаты запросов `FROM FINAL` могут исказится при использовании `PREWHERE` с полями не входящями в `ORDER BY` таблицы.
+
 ## Ограничения {#limitations}
 
 `PREWHERE` поддерживается только табличными движками из семейства `*MergeTree`.
diff --git a/docs/ru/sql-reference/statements/select/union.md b/docs/ru/sql-reference/statements/select/union.md
index de8a9b0e4ea..a1e31a0be7f 100644
--- a/docs/ru/sql-reference/statements/select/union.md
+++ b/docs/ru/sql-reference/statements/select/union.md
@@ -78,3 +78,7 @@ SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 2;
 
 Запросы, которые являются частью `UNION/UNION ALL/UNION DISTINCT`, выполняются параллельно, и их результаты могут быть смешаны вместе.
 
+**Смотрите также**
+
+-   Настройка [insert_null_as_default](../../../operations/settings/settings.md#insert_null_as_default).
+-   Настройка [union_default_mode](../../../operations/settings/settings.md#union-default-mode).
diff --git a/docs/ru/sql-reference/statements/system.md b/docs/ru/sql-reference/statements/system.md
index ab68033d4f3..8c82cacdc43 100644
--- a/docs/ru/sql-reference/statements/system.md
+++ b/docs/ru/sql-reference/statements/system.md
@@ -196,7 +196,7 @@ SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
 Возвращает `Ok.` даже если указана несуществующая таблица или таблица имеет тип отличный от MergeTree. Возвращает ошибку если указана не существующая база данных:
 
 ``` sql
-SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
+SYSTEM START MOVES [[db.]merge_tree_family_table_name]
 ```
 
 ## Managing ReplicatedMergeTree Tables {#query-language-system-replicated}
@@ -204,6 +204,7 @@ SYSTEM STOP MOVES [[db.]merge_tree_family_table_name]
 ClickHouse может управлять фоновыми процессами связанными c репликацией в таблицах семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md).
 
 ### STOP FETCHES {#query_language-system-stop-fetches}
+
 Позволяет остановить фоновые процессы синхронизации новыми вставленными кусками данных с другими репликами в кластере для таблиц семейства `ReplicatedMergeTree`:
 Всегда возвращает `Ok.` вне зависимости от типа таблицы и даже если таблица или база данных не существет.
 
@@ -212,6 +213,7 @@ SYSTEM STOP FETCHES [[db.]replicated_merge_tree_family_table_name]
 ```
 
 ### START FETCHES {#query_language-system-start-fetches}
+
 Позволяет запустить фоновые процессы синхронизации новыми вставленными кусками данных с другими репликами в кластере для таблиц семейства `ReplicatedMergeTree`:
 Всегда возвращает `Ok.` вне зависимости от типа таблицы и даже если таблица или база данных не существет.
 
@@ -220,6 +222,7 @@ SYSTEM START FETCHES [[db.]replicated_merge_tree_family_table_name]
 ```
 
 ### STOP REPLICATED SENDS {#query_language-system-start-replicated-sends}
+
 Позволяет остановить фоновые процессы отсылки новых вставленных кусков данных другим репликам в кластере для таблиц семейства `ReplicatedMergeTree`:
 
 ``` sql
@@ -227,6 +230,7 @@ SYSTEM STOP REPLICATED SENDS [[db.]replicated_merge_tree_family_table_name]
 ```
 
 ### START REPLICATED SENDS {#query_language-system-start-replicated-sends}
+
 Позволяет запустить фоновые процессы отсылки новых вставленных кусков данных другим репликам в кластере для таблиц семейства `ReplicatedMergeTree`:
 
 ``` sql
@@ -234,6 +238,7 @@ SYSTEM START REPLICATED SENDS [[db.]replicated_merge_tree_family_table_name]
 ```
 
 ### STOP REPLICATION QUEUES {#query_language-system-stop-replication-queues}
+
 Останавливает фоновые процессы разбора заданий из очереди репликации которая хранится в Zookeeper для таблиц семейства `ReplicatedMergeTree`. Возможные типы заданий - merges, fetches, mutation, DDL запросы с ON CLUSTER: 
 
 ``` sql
@@ -241,6 +246,7 @@ SYSTEM STOP REPLICATION QUEUES [[db.]replicated_merge_tree_family_table_name]
 ```
 
 ### START REPLICATION QUEUES {#query_language-system-start-replication-queues}
+
 Запускает фоновые процессы разбора заданий из очереди репликации которая хранится в Zookeeper для таблиц семейства `ReplicatedMergeTree`. Возможные типы заданий - merges, fetches, mutation, DDL запросы с ON CLUSTER: 
 
 ``` sql
@@ -248,20 +254,24 @@ SYSTEM START REPLICATION QUEUES [[db.]replicated_merge_tree_family_table_name]
 ```
 
 ### SYNC REPLICA {#query_language-system-sync-replica}
+
 Ждет когда таблица семейства `ReplicatedMergeTree` будет синхронизирована с другими репликами в кластере, будет работать до достижения `receive_timeout`, если синхронизация для таблицы отключена в настоящий момент времени:  
 
 ``` sql
 SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name
 ```
 
+После выполнения этого запроса таблица `[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
 ```
 
 ### RESTART REPLICAS {#query_language-system-restart-replicas}
-Реинициализация состояния Zookeeper сессий для всех `ReplicatedMergeTree` таблиц, сравнивает текущее состояние с тем что хранится в Zookeeper как источник правды и добавляет задачи Zookeeper очередь если необходимо
 
+Реинициализация состояния ZooKeeper-сессий для всех `ReplicatedMergeTree` таблиц. Сравнивает текущее состояние реплики с тем, что хранится в ZooKeeper, как c источником правды, и добавляет задачи в очередь репликации в ZooKeeper, если необходимо.
diff --git a/docs/ru/sql-reference/statements/truncate.md b/docs/ru/sql-reference/statements/truncate.md
index b23d96d5b08..63f7fa86ea5 100644
--- a/docs/ru/sql-reference/statements/truncate.md
+++ b/docs/ru/sql-reference/statements/truncate.md
@@ -11,6 +11,6 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 
 Удаляет все данные из таблицы. Если условие `IF EXISTS` не указано, запрос вернет ошибку, если таблицы не существует.
 
-Запрос `TRUNCATE` не поддерживается для следующих движков: [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md) и [Null](../../engines/table-engines/special/null.md).
+Запрос `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).
 
 
diff --git a/docs/ru/sql-reference/syntax.md b/docs/ru/sql-reference/syntax.md
index 6a923fd6b58..dbbf5f92612 100644
--- a/docs/ru/sql-reference/syntax.md
+++ b/docs/ru/sql-reference/syntax.md
@@ -128,7 +128,7 @@ expr AS alias
 
         Например, `SELECT table_name_alias.column_name FROM table_name table_name_alias`.
 
-        В функции [CAST](sql_reference/syntax.md#type_conversion_function-cast), ключевое слово `AS` имеет другое значение. Смотрите описание функции.
+        В функции [CAST](../sql_reference/syntax.md#type_conversion_function-cast), ключевое слово `AS` имеет другое значение. Смотрите описание функции.
 
 -   `expr` — любое выражение, которое поддерживает ClickHouse.
 
@@ -138,7 +138,7 @@ expr AS alias
 
         Например, `SELECT "table t".column_name FROM table_name AS "table t"`.
 
-### Примечания по использованию {#primechaniia-po-ispolzovaniiu}
+### Примечания по использованию {#notes-on-usage}
 
 Синонимы являются глобальными для запроса или подзапроса, и вы можете определить синоним в любой части запроса для любого выражения. Например, `SELECT (1 AS n) + 2, n`.
 
@@ -169,9 +169,9 @@ Received exception from server (version 18.14.17):
 Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: Aggregate function sum(b) is found inside another aggregate function in query.
 ```
 
-В этом примере мы объявили таблицу `t` со столбцом `b`. Затем, при выборе данных, мы определили синоним `sum(b) AS b`. Поскольку синонимы глобальные, то ClickHouse заменил литерал `b` в выражении `argMax(a, b)` выражением `sum(b)`. Эта замена вызвала исключение.
+В этом примере мы объявили таблицу `t` со столбцом `b`. Затем, при выборе данных, мы определили синоним `sum(b) AS b`. Поскольку синонимы глобальные, то ClickHouse заменил литерал `b` в выражении `argMax(a, b)` выражением `sum(b)`. Эта замена вызвала исключение. Можно изменить это поведение, включив настройку [prefer_column_name_to_alias](../operations/settings/settings.md#prefer_column_name_to_alias), для этого нужно установить ее в значение `1`.
 
-## Звёздочка {#zviozdochka}
+## Звёздочка {#asterisk}
 
 В запросе `SELECT`, вместо выражения может стоять звёздочка. Подробнее смотрите раздел «SELECT».
 
@@ -180,4 +180,3 @@ Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception
 Выражение представляет собой функцию, идентификатор, литерал, применение оператора, выражение в скобках, подзапрос, звёздочку. А также может содержать синоним.
 Список выражений - одно выражение или несколько выражений через запятую.
 Функции и операторы, в свою очередь, в качестве аргументов, могут иметь произвольные выражения.
-
diff --git a/docs/ru/sql-reference/table-functions/dictionary.md b/docs/ru/sql-reference/table-functions/dictionary.md
new file mode 100644
index 00000000000..d4909bf5d9f
--- /dev/null
+++ b/docs/ru/sql-reference/table-functions/dictionary.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 54
+toc_title: dictionary
+---
+
+# dictionary {#dictionary-function}
+
+Отображает данные [словаря](../../sql-reference/dictionaries/external-dictionaries/external-dicts.md) как таблицу ClickHouse. Работает аналогично движку [Dictionary](../../engines/table-engines/special/dictionary.md).
+
+**Синтаксис**
+
+``` sql
+dictionary('dict')
+```
+
+**Аргументы** 
+
+-   `dict` — имя словаря. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+Таблица ClickHouse.
+
+**Пример**
+
+Входная таблица `dictionary_source_table`:
+
+``` text
+┌─id─┬─value─┐
+│  0 │     0 │
+│  1 │     1 │
+└────┴───────┘
+```
+
+Создаем словарь:
+
+``` sql
+CREATE DICTIONARY new_dictionary(id UInt64, value UInt64 DEFAULT 0) PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dictionary_source_table')) LAYOUT(DIRECT());
+```
+
+Запрос:
+
+``` sql
+SELECT * FROM dictionary('new_dictionary');
+```
+
+Результат:
+
+``` text
+┌─id─┬─value─┐
+│  0 │     0 │
+│  1 │     1 │
+└────┴───────┘
+```
+
+**Смотрите также**
+
+-   [Движок Dictionary](../../engines/table-engines/special/dictionary.md#dictionary)
diff --git a/docs/ru/sql-reference/table-functions/postgresql.md b/docs/ru/sql-reference/table-functions/postgresql.md
index 66637276726..2d8afe28f1e 100644
--- a/docs/ru/sql-reference/table-functions/postgresql.md
+++ b/docs/ru/sql-reference/table-functions/postgresql.md
@@ -65,10 +65,10 @@ postgres=# INSERT INTO test (int_id, str, "float") VALUES (1,'test',2);
 INSERT 0 1
 
 postgresql> SELECT * FROM test;
- int_id | int_nullable | float | str  | float_nullable
---------+--------------+-------+------+----------------
-      1 |              |     2 | test |
-(1 row)
+  int_id | int_nullable | float | str  | float_nullable
+ --------+--------------+-------+------+----------------
+       1 |              |     2 | test |
+ (1 row)
 ```
 
 Получение данных в ClickHouse:
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index 1d3fc8cfdb7..e062e59c67c 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -18,7 +18,7 @@ s3(path, [aws_access_key_id, aws_secret_access_key,] format, structure, [compres
 -   `path` — URL-адрес бакета с указанием пути к файлу. Поддерживает следующие подстановочные знаки в режиме "только чтение": `*, ?, {abc,def} и {N..M}` где `N, M` — числа, `'abc', 'def'` — строки. Подробнее смотри [здесь](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
 -   `format` — [формат](../../interfaces/formats.md#formats) файла.
 -   `structure` — cтруктура таблицы. Формат `'column1_name column1_type, column2_name column2_type, ...'`.
--   `compression` — автоматически обнаруживает сжатие по расширению файла. Возможные значения: none, gzip/gz, brotli/br, xz/LZMA, zstd/zst. Необязательный параметр. 
+-   `compression` — автоматически обнаруживает сжатие по расширению файла. Возможные значения: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. Необязательный параметр. 
 
 **Возвращаемые значения**
 
diff --git a/docs/tools/README.md b/docs/tools/README.md
index 0a6c41d8089..4340561fa57 100644
--- a/docs/tools/README.md
+++ b/docs/tools/README.md
@@ -51,5 +51,5 @@ The easiest way to see the result is to use `--livereload=8888` argument of buil
 
 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-nwwakmk4-xOJ6cdy0sJC3It8j348~IA).
+-   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.
diff --git a/docs/tools/amp.py b/docs/tools/amp.py
index b08b58d3cba..22417407946 100644
--- a/docs/tools/amp.py
+++ b/docs/tools/amp.py
@@ -62,7 +62,6 @@ def build_amp(lang, args, cfg):
         for root, _, filenames in os.walk(site_temp):
             if 'index.html' in filenames:
                 paths.append(prepare_amp_html(lang, args, root, site_temp, main_site_dir))
-        test.test_amp(paths, lang)
     logging.info(f'Finished building AMP version for {lang}')
 
 
diff --git a/docs/tools/blog.py b/docs/tools/blog.py
index c3261f61d4d..d0f2496f914 100644
--- a/docs/tools/blog.py
+++ b/docs/tools/blog.py
@@ -40,7 +40,7 @@ def build_for_lang(lang, args):
 
         site_names = {
             'en': 'ClickHouse Blog',
-            'ru': 'Блог ClickHouse '
+            'ru': 'Блог ClickHouse'
         }
 
         assert len(site_names) == len(languages)
@@ -62,7 +62,7 @@ def build_for_lang(lang, args):
             strict=True,
             theme=theme_cfg,
             nav=blog_nav,
-            copyright='©2016–2020 Yandex LLC',
+            copyright='©2016–2021 Yandex LLC',
             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 5a1f10268ab..61112d5a4f5 100755
--- a/docs/tools/build.py
+++ b/docs/tools/build.py
@@ -94,7 +94,7 @@ def build_for_lang(lang, args):
             site_dir=site_dir,
             strict=True,
             theme=theme_cfg,
-            copyright='©2016–2020 Yandex LLC',
+            copyright='©2016–2021 Yandex LLC',
             use_directory_urls=True,
             repo_name='ClickHouse/ClickHouse',
             repo_url='https://github.com/ClickHouse/ClickHouse/',
diff --git a/docs/tools/nav.py b/docs/tools/nav.py
index 291797a1633..db64d1ba404 100644
--- a/docs/tools/nav.py
+++ b/docs/tools/nav.py
@@ -31,7 +31,16 @@ def build_nav_entry(root, args):
                 result_items.append((prio, title, payload))
         elif filename.endswith('.md'):
             path = os.path.join(root, filename)
-            meta, content = util.read_md_file(path)
+
+            meta = ''
+            content = ''
+
+            try:
+                meta, content = util.read_md_file(path)
+            except:
+                print('Error in file: {}'.format(path))
+                raise
+
             path = path.split('/', 2)[-1]
             title = meta.get('toc_title', find_first_header(content))
             if title:
diff --git a/docs/tools/requirements.txt b/docs/tools/requirements.txt
index 85f9dc2a9dd..9bb4f57e9e2 100644
--- a/docs/tools/requirements.txt
+++ b/docs/tools/requirements.txt
@@ -27,12 +27,12 @@ pymdown-extensions==8.0
 python-slugify==4.0.1
 PyYAML==5.4.1
 repackage==0.7.3
-requests==2.24.0
+requests==2.25.1
 singledispatch==3.4.0.3
 six==1.15.0
 soupsieve==2.0.1
 termcolor==1.1.0
 tornado==6.1
 Unidecode==1.1.1
-urllib3==1.25.10
+urllib3>=1.26.5
 Pygments>=2.7.4
diff --git a/docs/tools/single_page.py b/docs/tools/single_page.py
index b88df5a03cb..a1e650d3ad3 100644
--- a/docs/tools/single_page.py
+++ b/docs/tools/single_page.py
@@ -109,7 +109,8 @@ def build_single_page_version(lang, args, nav, cfg):
     extra['single_page'] = True
     extra['is_amp'] = False
 
-    with open(os.path.join(args.docs_dir, lang, 'single.md'), 'w') as single_md:
+    single_md_path = os.path.join(args.docs_dir, lang, 'single.md')
+    with open(single_md_path, 'w') as single_md:
         concatenate(lang, args.docs_dir, single_md, nav)
 
         with util.temp_dir() as site_temp:
@@ -221,3 +222,7 @@ def build_single_page_version(lang, args, nav, cfg):
                         subprocess.check_call(' '.join(create_pdf_command), shell=True)
 
         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 00d1d47137f..ada4df29644 100755
--- a/docs/tools/test.py
+++ b/docs/tools/test.py
@@ -3,34 +3,9 @@
 import logging
 import os
 import sys
-
 import bs4
-
-import logging
-import os
 import subprocess
 
-import bs4
-
-
-def test_amp(paths, lang):
-    try:
-        # Get latest amp validator version
-        subprocess.check_call('amphtml-validator --help',
-                              stdout=subprocess.DEVNULL,
-                              stderr=subprocess.DEVNULL,
-                              shell=True)
-    except subprocess.CalledProcessError:
-        subprocess.check_call('npm i -g amphtml-validator', stderr=subprocess.DEVNULL, shell=True)
-
-    paths = ' '.join(paths)
-    command = f'amphtml-validator {paths}'
-    try:
-        subprocess.check_output(command, shell=True).decode('utf-8')
-    except subprocess.CalledProcessError:
-        logging.error(f'Invalid AMP for {lang}')
-        raise
-
 
 def test_template(template_path):
     if template_path.endswith('amp.html'):
diff --git a/docs/tools/website.py b/docs/tools/website.py
index 6927fbd87bb..f0346de5c94 100644
--- a/docs/tools/website.py
+++ b/docs/tools/website.py
@@ -155,10 +155,6 @@ 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'))
 
-    shutil.copy2(
-        os.path.join(args.website_dir, 'js', 'embedd.min.js'),
-        os.path.join(args.output_dir, 'js', 'embedd.min.js'))
-
     for root, _, filenames in os.walk(args.output_dir):
         for filename in filenames:
             if filename == 'main.html':
diff --git a/docs/zh/commercial/cloud.md b/docs/zh/commercial/cloud.md
index c74ffa93e9a..e0a297f51c8 100644
--- a/docs/zh/commercial/cloud.md
+++ b/docs/zh/commercial/cloud.md
@@ -31,7 +31,7 @@ toc_title: 云
 
 ## 阿里云 {#alibaba-cloud}
 
-阿里云的 ClickHouse 托管服务 [中国站](https://www.aliyun.com/product/clickhouse) (国际站于2021年5月初开放) 提供以下主要功能：
+[阿里云的 ClickHouse 托管服务](https://www.alibabacloud.com/zh/product/clickhouse) 提供以下主要功能：
 
 -   基于阿里飞天分布式系统的高可靠云盘存储引擎
 -   按需扩容，无需手动进行数据搬迁
diff --git a/docs/zh/development/build.md b/docs/zh/development/build.md
index 1aa5c1c97b7..01e0740bfa4 100644
--- a/docs/zh/development/build.md
+++ b/docs/zh/development/build.md
@@ -35,28 +35,12 @@ sudo apt-get install git cmake ninja-build
 或cmake3而不是旧系统上的cmake。
 或者在早期版本的系统中用 cmake3 替代 cmake
 
-## 安装 GCC 10 {#an-zhuang-gcc-10}
+## 安装 Clang
 
-有几种方法可以做到这一点。
+On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
-### 安装 PPA 包 {#an-zhuang-ppa-bao}
-
-``` bash
-sudo apt-get install software-properties-common
-sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-sudo apt-get update
-sudo apt-get install gcc-10 g++-10
-```
-
-### 源码安装 gcc {#yuan-ma-an-zhuang-gcc}
-
-请查看 [utils/ci/build-gcc-from-sources.sh](https://github.com/ClickHouse/ClickHouse/blob/master/utils/ci/build-gcc-from-sources.sh)
-
-## 使用 GCC 10 来编译 {#shi-yong-gcc-10-lai-bian-yi}
-
-``` bash
-export CC=gcc-10
-export CXX=g++-10
+```bash
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 ```
 
 ## 拉取 ClickHouse 源码 {#la-qu-clickhouse-yuan-ma-1}
diff --git a/docs/zh/development/developer-instruction.md b/docs/zh/development/developer-instruction.md
index 53aab5dc086..04950c11521 100644
--- a/docs/zh/development/developer-instruction.md
+++ b/docs/zh/development/developer-instruction.md
@@ -123,17 +123,13 @@ ClickHouse使用多个外部库进行构建。大多数外部库不需要单独
 
 # C++ 编译器 {#c-bian-yi-qi}
 
-GCC编译器从版本9开始，以及Clang版本\>=8都可支持构建ClickHouse。
+We support clang starting from version 11.
 
-Yandex官方当前使用GCC构建ClickHouse，因为它生成的机器代码性能较好（根据测评，最多可以相差几个百分点）。Clang通常可以更加便捷的开发。我们的持续集成（CI）平台会运行大约十二种构建组合的检查。
+On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
-在Ubuntu上安装GCC，请执行：`sudo apt install gcc g++`
-
-请使用`gcc --version`查看gcc的版本。如果gcc版本低于9，请参考此处的指示：https://clickhouse.tech/docs/zh/development/build/#an-zhuang-gcc-10 。
-
-在Mac OS X上安装GCC，请执行：`brew install gcc`
-
-如果您决定使用Clang，还可以同时安装 `libc++`以及`lld`，前提是您也熟悉它们。此外，也推荐使用`ccache`。
+```bash
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+```
 
 # 构建的过程 {#gou-jian-de-guo-cheng}
 
@@ -146,7 +142,7 @@ Yandex官方当前使用GCC构建ClickHouse，因为它生成的机器代码性
 
 在`build`目录下，通过运行CMake配置构建。 在第一次运行之前，请定义用于指定编译器的环境变量（本示例中为gcc 9 编译器）。
 
-    export CC=gcc-10 CXX=g++-10
+    export CC=clang CXX=clang++
     cmake ..
 
 `CC`变量指代C的编译器（C Compiler的缩写），而`CXX`变量指代要使用哪个C++编译器进行编译。
diff --git a/docs/zh/development/style.md b/docs/zh/development/style.md
index c8e883920dd..bb9bfde7b9b 100644
--- a/docs/zh/development/style.md
+++ b/docs/zh/development/style.md
@@ -696,7 +696,7 @@ auto s = std::string{"Hello"};
 
 **2.** 语言： C++20.
 
-**3.** 编译器： `gcc`。 此时（2020年08月），代码使用9.3版编译。（它也可以使用`clang 8` 编译）
+**3.** 编译器： `clang`。 此时（2021年03月），代码使用11版编译。（它也可以使用`gcc` 编译 but it is not suitable for production）
 
 使用标准库 (`libc++`)。
 
diff --git a/docs/zh/engines/table-engines/integrations/odbc.md b/docs/zh/engines/table-engines/integrations/odbc.md
index 1264efeaa41..767c32cc438 100644
--- a/docs/zh/engines/table-engines/integrations/odbc.md
+++ b/docs/zh/engines/table-engines/integrations/odbc.md
@@ -7,11 +7,11 @@ toc_title: ODBC
 
 # ODBC {#table-engine-odbc}
 
-允许ClickHouse通过以下方式连接到外部数据库 [ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity).
+允许ClickHouse通过[ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity)方式连接到外部数据库.
 
-为了安全地实现ODBC连接，ClickHouse使用单独的程序 `clickhouse-odbc-bridge`. 如果直接从ODBC驱动程序加载 `clickhouse-server`，驱动程序问题可能会导致ClickHouse服务器崩溃。 ClickHouse自动启动 `clickhouse-odbc-bridge` 当它是必需的。 ODBC桥程序是从相同的软件包作为安装 `clickhouse-server`.
+为了安全地实现ODBC连接，ClickHouse使用了一个独立程序 `clickhouse-odbc-bridge`. 如果ODBC驱动程序是直接从 `clickhouse-server`中加载的，那么驱动问题可能会导致ClickHouse服务崩溃。 当有需要时，ClickHouse会自动启动 `clickhouse-odbc-bridge`。 ODBC桥梁程序与`clickhouse-server`来自相同的安装包.
 
-该引擎支持 [可为空](../../../sql-reference/data-types/nullable.md) 数据类型。
+该引擎支持 [可为空](../../../sql-reference/data-types/nullable.md) 的数据类型。
 
 ## 创建表 {#creating-a-table}
 
@@ -25,14 +25,14 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 ENGINE = ODBC(connection_settings, external_database, external_table)
 ```
 
-请参阅的详细说明 [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) 查询。
+详情请见 [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) 查询。
 
 表结构可以与源表结构不同:
 
 -   列名应与源表中的列名相同，但您可以按任何顺序使用其中的一些列。
--   列类型可能与源表中的列类型不同。 ClickHouse尝试 [投](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) ClickHouse数据类型的值。
+-   列类型可能与源表中的列类型不同。 ClickHouse尝试将数值[映射](../../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) 到ClickHouse的数据类型。
 
-**发动机参数**
+**引擎参数**
 
 -   `connection_settings` — Name of the section with connection settings in the `odbc.ini` 文件
 -   `external_database` — Name of a database in an external DBMS.
@@ -40,13 +40,13 @@ ENGINE = ODBC(connection_settings, external_database, external_table)
 
 ## 用法示例 {#usage-example}
 
-**通过ODBC从本地MySQL安装中检索数据**
+**通过ODBC从本地安装的MySQL中检索数据**
 
-此示例检查Ubuntu Linux18.04和MySQL服务器5.7。
+本示例针对Ubuntu Linux18.04和MySQL服务器5.7进行检查。
 
-确保安装了unixODBC和MySQL连接器。
+请确保安装了unixODBC和MySQL连接器。
 
-默认情况下（如果从软件包安装），ClickHouse以用户身份启动 `clickhouse`. 因此，您需要在MySQL服务器中创建和配置此用户。
+默认情况下（如果从软件包安装），ClickHouse以用户`clickhouse`的身份启动 . 因此，您需要在MySQL服务器中创建和配置此用户。
 
 ``` bash
 $ sudo mysql
@@ -57,7 +57,7 @@ mysql> CREATE USER 'clickhouse'@'localhost' IDENTIFIED BY 'clickhouse';
 mysql> GRANT ALL PRIVILEGES ON *.* TO 'clickhouse'@'clickhouse' WITH GRANT OPTION;
 ```
 
-然后配置连接 `/etc/odbc.ini`.
+然后在`/etc/odbc.ini`中配置连接 .
 
 ``` bash
 $ cat /etc/odbc.ini
@@ -70,7 +70,7 @@ USERNAME = clickhouse
 PASSWORD = clickhouse
 ```
 
-您可以使用 `isql` unixodbc安装中的实用程序。
+您可以从安装的unixodbc中使用 `isql` 实用程序来检查连接情况。
 
 ``` bash
 $ isql -v mysqlconn
diff --git a/docs/zh/getting-started/example-datasets/ontime.md b/docs/zh/getting-started/example-datasets/ontime.md
index 3921f71fc7e..6d888b2196c 100644
--- a/docs/zh/getting-started/example-datasets/ontime.md
+++ b/docs/zh/getting-started/example-datasets/ontime.md
@@ -29,126 +29,127 @@ done
 创建表结构：
 
 ``` sql
-CREATE TABLE `ontime` (
-  `Year` UInt16,
-  `Quarter` UInt8,
-  `Month` UInt8,
-  `DayofMonth` UInt8,
-  `DayOfWeek` UInt8,
-  `FlightDate` Date,
-  `UniqueCarrier` FixedString(7),
-  `AirlineID` Int32,
-  `Carrier` FixedString(2),
-  `TailNum` String,
-  `FlightNum` String,
-  `OriginAirportID` Int32,
-  `OriginAirportSeqID` Int32,
-  `OriginCityMarketID` Int32,
-  `Origin` FixedString(5),
-  `OriginCityName` String,
-  `OriginState` FixedString(2),
-  `OriginStateFips` String,
-  `OriginStateName` String,
-  `OriginWac` Int32,
-  `DestAirportID` Int32,
-  `DestAirportSeqID` Int32,
-  `DestCityMarketID` Int32,
-  `Dest` FixedString(5),
-  `DestCityName` String,
-  `DestState` FixedString(2),
-  `DestStateFips` String,
-  `DestStateName` String,
-  `DestWac` Int32,
-  `CRSDepTime` Int32,
-  `DepTime` Int32,
-  `DepDelay` Int32,
-  `DepDelayMinutes` Int32,
-  `DepDel15` Int32,
-  `DepartureDelayGroups` String,
-  `DepTimeBlk` String,
-  `TaxiOut` Int32,
-  `WheelsOff` Int32,
-  `WheelsOn` Int32,
-  `TaxiIn` Int32,
-  `CRSArrTime` Int32,
-  `ArrTime` Int32,
-  `ArrDelay` Int32,
-  `ArrDelayMinutes` Int32,
-  `ArrDel15` Int32,
-  `ArrivalDelayGroups` Int32,
-  `ArrTimeBlk` String,
-  `Cancelled` UInt8,
-  `CancellationCode` FixedString(1),
-  `Diverted` UInt8,
-  `CRSElapsedTime` Int32,
-  `ActualElapsedTime` Int32,
-  `AirTime` Int32,
-  `Flights` Int32,
-  `Distance` Int32,
-  `DistanceGroup` UInt8,
-  `CarrierDelay` Int32,
-  `WeatherDelay` Int32,
-  `NASDelay` Int32,
-  `SecurityDelay` Int32,
-  `LateAircraftDelay` Int32,
-  `FirstDepTime` String,
-  `TotalAddGTime` String,
-  `LongestAddGTime` String,
-  `DivAirportLandings` String,
-  `DivReachedDest` String,
-  `DivActualElapsedTime` String,
-  `DivArrDelay` String,
-  `DivDistance` String,
-  `Div1Airport` String,
-  `Div1AirportID` Int32,
-  `Div1AirportSeqID` Int32,
-  `Div1WheelsOn` String,
-  `Div1TotalGTime` String,
-  `Div1LongestGTime` String,
-  `Div1WheelsOff` String,
-  `Div1TailNum` String,
-  `Div2Airport` String,
-  `Div2AirportID` Int32,
-  `Div2AirportSeqID` Int32,
-  `Div2WheelsOn` String,
-  `Div2TotalGTime` String,
-  `Div2LongestGTime` String,
-  `Div2WheelsOff` String,
-  `Div2TailNum` String,
-  `Div3Airport` String,
-  `Div3AirportID` Int32,
-  `Div3AirportSeqID` Int32,
-  `Div3WheelsOn` String,
-  `Div3TotalGTime` String,
-  `Div3LongestGTime` String,
-  `Div3WheelsOff` String,
-  `Div3TailNum` String,
-  `Div4Airport` String,
-  `Div4AirportID` Int32,
-  `Div4AirportSeqID` Int32,
-  `Div4WheelsOn` String,
-  `Div4TotalGTime` String,
-  `Div4LongestGTime` String,
-  `Div4WheelsOff` String,
-  `Div4TailNum` String,
-  `Div5Airport` String,
-  `Div5AirportID` Int32,
-  `Div5AirportSeqID` Int32,
-  `Div5WheelsOn` String,
-  `Div5TotalGTime` String,
-  `Div5LongestGTime` String,
-  `Div5WheelsOff` String,
-  `Div5TailNum` String
+CREATE TABLE `ontime`
+(
+    `Year`                            UInt16,
+    `Quarter`                         UInt8,
+    `Month`                           UInt8,
+    `DayofMonth`                      UInt8,
+    `DayOfWeek`                       UInt8,
+    `FlightDate`                      Date,
+    `Reporting_Airline`               String,
+    `DOT_ID_Reporting_Airline`        Int32,
+    `IATA_CODE_Reporting_Airline`     String,
+    `Tail_Number`                     Int32,
+    `Flight_Number_Reporting_Airline` String,
+    `OriginAirportID`                 Int32,
+    `OriginAirportSeqID`              Int32,
+    `OriginCityMarketID`              Int32,
+    `Origin`                          FixedString(5),
+    `OriginCityName`                  String,
+    `OriginState`                     FixedString(2),
+    `OriginStateFips`                 String,
+    `OriginStateName`                 String,
+    `OriginWac`                       Int32,
+    `DestAirportID`                   Int32,
+    `DestAirportSeqID`                Int32,
+    `DestCityMarketID`                Int32,
+    `Dest`                            FixedString(5),
+    `DestCityName`                    String,
+    `DestState`                       FixedString(2),
+    `DestStateFips`                   String,
+    `DestStateName`                   String,
+    `DestWac`                         Int32,
+    `CRSDepTime`                      Int32,
+    `DepTime`                         Int32,
+    `DepDelay`                        Int32,
+    `DepDelayMinutes`                 Int32,
+    `DepDel15`                        Int32,
+    `DepartureDelayGroups`            String,
+    `DepTimeBlk`                      String,
+    `TaxiOut`                         Int32,
+    `WheelsOff`                       Int32,
+    `WheelsOn`                        Int32,
+    `TaxiIn`                          Int32,
+    `CRSArrTime`                      Int32,
+    `ArrTime`                         Int32,
+    `ArrDelay`                        Int32,
+    `ArrDelayMinutes`                 Int32,
+    `ArrDel15`                        Int32,
+    `ArrivalDelayGroups`              Int32,
+    `ArrTimeBlk`                      String,
+    `Cancelled`                       UInt8,
+    `CancellationCode`                FixedString(1),
+    `Diverted`                        UInt8,
+    `CRSElapsedTime`                  Int32,
+    `ActualElapsedTime`               Int32,
+    `AirTime`                         Nullable(Int32),
+    `Flights`                         Int32,
+    `Distance`                        Int32,
+    `DistanceGroup`                   UInt8,
+    `CarrierDelay`                    Int32,
+    `WeatherDelay`                    Int32,
+    `NASDelay`                        Int32,
+    `SecurityDelay`                   Int32,
+    `LateAircraftDelay`               Int32,
+    `FirstDepTime`                    String,
+    `TotalAddGTime`                   String,
+    `LongestAddGTime`                 String,
+    `DivAirportLandings`              String,
+    `DivReachedDest`                  String,
+    `DivActualElapsedTime`            String,
+    `DivArrDelay`                     String,
+    `DivDistance`                     String,
+    `Div1Airport`                     String,
+    `Div1AirportID`                   Int32,
+    `Div1AirportSeqID`                Int32,
+    `Div1WheelsOn`                    String,
+    `Div1TotalGTime`                  String,
+    `Div1LongestGTime`                String,
+    `Div1WheelsOff`                   String,
+    `Div1TailNum`                     String,
+    `Div2Airport`                     String,
+    `Div2AirportID`                   Int32,
+    `Div2AirportSeqID`                Int32,
+    `Div2WheelsOn`                    String,
+    `Div2TotalGTime`                  String,
+    `Div2LongestGTime`                String,
+    `Div2WheelsOff`                   String,
+    `Div2TailNum`                     String,
+    `Div3Airport`                     String,
+    `Div3AirportID`                   Int32,
+    `Div3AirportSeqID`                Int32,
+    `Div3WheelsOn`                    String,
+    `Div3TotalGTime`                  String,
+    `Div3LongestGTime`                String,
+    `Div3WheelsOff`                   String,
+    `Div3TailNum`                     String,
+    `Div4Airport`                     String,
+    `Div4AirportID`                   Int32,
+    `Div4AirportSeqID`                Int32,
+    `Div4WheelsOn`                    String,
+    `Div4TotalGTime`                  String,
+    `Div4LongestGTime`                String,
+    `Div4WheelsOff`                   String,
+    `Div4TailNum`                     String,
+    `Div5Airport`                     String,
+    `Div5AirportID`                   Int32,
+    `Div5AirportSeqID`                Int32,
+    `Div5WheelsOn`                    String,
+    `Div5TotalGTime`                  String,
+    `Div5LongestGTime`                String,
+    `Div5WheelsOff`                   String,
+    `Div5TailNum`                     String
 ) ENGINE = MergeTree
-PARTITION BY Year
-ORDER BY (Carrier, FlightDate)
-SETTINGS index_granularity = 8192;
+      PARTITION BY Year
+      ORDER BY (IATA_CODE_Reporting_Airline, FlightDate)
+      SETTINGS index_granularity = 8192;
 ```
 
 加载数据：
 
 ``` bash
-$ for i in *.zip; do echo $i; unzip -cq $i '*.csv' | sed 's/\.00//g' | clickhouse-client --host=example-perftest01j --query="INSERT INTO ontime FORMAT CSVWithNames"; done
+ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | sed 's/\.00//g' | clickhouse-client --input_format_with_names_use_header=0 --query='INSERT INTO ontime FORMAT CSVWithNames'"
 ```
 
 ## 下载预处理好的分区数据 {#xia-zai-yu-chu-li-hao-de-fen-qu-shu-ju}
@@ -212,7 +213,7 @@ LIMIT 10;
 Q4. 查询2007年各航空公司延误超过10分钟以上的次数
 
 ``` sql
-SELECT Carrier, count(*)
+SELECT IATA_CODE_Reporting_Airline AS Carrier, count(*)
 FROM ontime
 WHERE DepDelay>10 AND Year=2007
 GROUP BY Carrier
@@ -226,29 +227,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year=2007
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year=2007
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 更好的查询版本：
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year=2007
 GROUP BY Carrier
@@ -262,29 +263,29 @@ SELECT Carrier, c, c2, c*100/c2 as c3
 FROM
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c
     FROM ontime
     WHERE DepDelay>10
         AND Year>=2000 AND Year<=2008
     GROUP BY Carrier
-)
+) q
 JOIN
 (
     SELECT
-        Carrier,
+        IATA_CODE_Reporting_Airline AS Carrier,
         count(*) AS c2
     FROM ontime
     WHERE Year>=2000 AND Year<=2008
     GROUP BY Carrier
-) USING Carrier
+) qq USING Carrier
 ORDER BY c3 DESC;
 ```
 
 更好的查询版本：
 
 ``` sql
-SELECT Carrier, avg(DepDelay>10)*100 AS c3
+SELECT IATA_CODE_Reporting_Airline AS Carrier, avg(DepDelay>10)*100 AS c3
 FROM ontime
 WHERE Year>=2000 AND Year<=2008
 GROUP BY Carrier
@@ -303,7 +304,7 @@ FROM
     from ontime
     WHERE DepDelay>10
     GROUP BY Year
-)
+) q
 JOIN
 (
     select
@@ -311,7 +312,7 @@ JOIN
         count(*) as c2
     from ontime
     GROUP BY Year
-) USING (Year)
+) qq USING (Year)
 ORDER BY Year;
 ```
 
@@ -346,7 +347,7 @@ Q10.
 
 ``` sql
 SELECT
-   min(Year), max(Year), Carrier, count(*) AS cnt,
+   min(Year), max(Year), IATA_CODE_Reporting_Airline AS Carrier, count(*) AS cnt,
    sum(ArrDelayMinutes>30) AS flights_delayed,
    round(sum(ArrDelayMinutes>30)/count(*),2) AS rate
 FROM ontime
diff --git a/docs/zh/operations/backup.md b/docs/zh/operations/backup.md
index 1b1993e3ae6..6d517e6ccb3 100644
--- a/docs/zh/operations/backup.md
+++ b/docs/zh/operations/backup.md
@@ -7,37 +7,37 @@ toc_title: "\u6570\u636E\u5907\u4EFD"
 
 # 数据备份 {#data-backup}
 
-尽管[副本](../engines/table-engines/mergetree-family/replication.md) 可以预防硬件错误带来的数据丢失, 但是它不能防止人为操作的错误: 意外删除数据, 删除错误的 table 或者删除错误 cluster 上的 table, 可以导致错误数据处理错误或者数据损坏的 bugs. 这类意外可能会影响所有的副本. 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). 但是，这些保护措施不能覆盖所有可能情况，并且这些措施可以被绕过。
 
-为了有效地减少可能的人为错误，您应该 **提前**准备备份和还原数据的策略.
+为了有效地减少可能的人为错误，您应该 **提前** 仔细的准备备份和数据还原的策略.
 
-不同公司有不同的可用资源和业务需求，因此没有适合各种情况的ClickHouse备份和恢复通用解决方案。 适用于 1GB 的数据的方案可能并不适用于几十 PB 数据的情况。 有多种可能的并有自己优缺点的方法，这将在下面讨论。 好的主意是同时结合使用多种方法而不是仅使用一种，这样可以弥补不同方法各自的缺点。
+不同公司有不同的可用资源和业务需求，因此不存在一个通用的解决方案可以应对各种情况下的ClickHouse备份和恢复。 适用于 1GB 数据的方案可能并不适用于几十 PB 数据的情况。 有多种具备各自优缺点的可能方法，将在下面对其进行讨论。最好使用几种方法而不是仅仅使用一种方法来弥补它们的各种缺点。。
 
 !!! note "注"
-    请记住，如果您备份了某些内容并且从未尝试过还原它，那么当您实际需要它时（或者至少需要比业务能够容忍的时间更长），恢复可能无法正常工作。 因此，无论您选择哪种备份方法，请确保自动还原过程，并定期在备用ClickHouse群集上练习。
+    需要注意的是，如果您备份了某些内容并且从未尝试过还原它，那么当您实际需要它时可能无法正常恢复（或者至少需要的时间比业务能够容忍的时间更长）。 因此，无论您选择哪种备份方法，请确保自动还原过程，并定期在备用ClickHouse群集上演练。
 
-## 将源数据复制到其他地方 {#duplicating-source-data-somewhere-else}
+## 将源数据复制到其它地方 {#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)），但它们可能不是提供实时查询的最佳选择。 一个可能的解决方案是使用这种文件系统创建额外的副本，并将它们从 [分布](../engines/table-engines/special/distributed.md) 用于以下目的的表 `SELECT` 查询。 任何修改数据的查询都无法访问此类副本上的快照。 作为奖励，这些副本可能具有特殊的硬件配置，每个服务器附加更多的磁盘，这将是经济高效的。
+某些本地文件系统提供快照功能（例如, [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 ...` 到远程表也可以工作。
 
-## 部件操作 {#manipulations-with-parts}
+## 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.tech/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/zh/operations/system-tables/data_type_families.md b/docs/zh/operations/system-tables/data_type_families.md
index 21eb4785e23..db08ff0371b 100644
--- a/docs/zh/operations/system-tables/data_type_families.md
+++ b/docs/zh/operations/system-tables/data_type_families.md
@@ -5,13 +5,13 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 
 # 系统。data_type_families {#system_tables-data_type_families}
 
-包含有关受支持的信息 [数据类型](../../sql-reference/data-types/).
+包含有关受支持的[数据类型](../../sql-reference/data-types/)的信息.
 
-列:
+列字段包括:
 
--   `name` ([字符串](../../sql-reference/data-types/string.md)) — Data type name.
--   `case_insensitive` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Property that shows whether you can use a data type name in a query in case insensitive manner or not. For example, `Date` 和 `date` 都是有效的。
--   `alias_to` ([字符串](../../sql-reference/data-types/string.md)) — Data type name for which `name` 是个化名
+-   `name` ([String](../../sql-reference/data-types/string.md)) — 数据类型的名称.
+-   `case_insensitive` ([UInt8](../../sql-reference/data-types/int-uint.md)) — 该属性显示是否可以在查询中以不区分大小写的方式使用数据类型名称。例如 `Date` 和 `date` 都是有效的。
+-   `alias_to` ([String](../../sql-reference/data-types/string.md)) — 名称为别名的数据类型名称。
 
 **示例**
 
@@ -36,4 +36,4 @@ SELECT * FROM system.data_type_families WHERE alias_to = 'String'
 
 **另请参阅**
 
--   [语法](../../sql-reference/syntax.md) — Information about supported syntax.
+-   [Syntax](../../sql-reference/syntax.md) — 关于所支持的语法信息.
diff --git a/docs/zh/operations/system-tables/functions.md b/docs/zh/operations/system-tables/functions.md
index ff716b0bc6c..8229a94cd5c 100644
--- a/docs/zh/operations/system-tables/functions.md
+++ b/docs/zh/operations/system-tables/functions.md
@@ -1,13 +1,30 @@
----
-machine_translated: true
-machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
----
+# system.functions {#system-functions}
 
-# 系统。功能 {#system-functions}
-
-包含有关正常函数和聚合函数的信息。
+包含有关常规函数和聚合函数的信息。
 
 列:
 
 -   `name`(`String`) – The name of the function.
 -   `is_aggregate`(`UInt8`) — Whether the function is aggregate.
+
+**举例**
+```
+ SELECT * FROM system.functions LIMIT 10;
+```
+
+```
+┌─name─────────────────────┬─is_aggregate─┬─case_insensitive─┬─alias_to─┐
+│ sumburConsistentHash     │            0 │                0 │          │
+│ yandexConsistentHash     │            0 │                0 │          │
+│ demangle                 │            0 │                0 │          │
+│ addressToLine            │            0 │                0 │          │
+│ JSONExtractRaw           │            0 │                0 │          │
+│ JSONExtractKeysAndValues │            0 │                0 │          │
+│ JSONExtract              │            0 │                0 │          │
+│ JSONExtractString        │            0 │                0 │          │
+│ JSONExtractFloat         │            0 │                0 │          │
+│ JSONExtractInt           │            0 │                0 │          │
+└──────────────────────────┴──────────────┴──────────────────┴──────────┘
+
+10 rows in set. Elapsed: 0.002 sec. 
+```
diff --git a/docs/zh/operations/system-tables/index.md b/docs/zh/operations/system-tables/index.md
index 56067bc5057..0e5778e3051 100644
--- a/docs/zh/operations/system-tables/index.md
+++ b/docs/zh/operations/system-tables/index.md
@@ -7,33 +7,33 @@ toc_title: "\u7CFB\u7EDF\u8868"
 
 # 系统表 {#system-tables}
 
-## 导言 {#system-tables-introduction}
+## 引言 {#system-tables-introduction}
 
-系统表提供以下信息:
+系统表提供的信息如下:
 
--   服务器状态、进程和环境。
+-   服务器的状态、进程以及环境。
 -   服务器的内部进程。
 
 系统表:
 
--   坐落于 `system` 数据库。
--   仅适用于读取数据。
--   不能删除或更改，但可以分离。
+-   存储于 `system` 数据库。
+-   仅提供数据读取功能。
+-   不能被删除或更改，但可以对其进行分离(detach)操作。
 
-大多数系统表将数据存储在RAM中。 ClickHouse服务器在开始时创建此类系统表。
+大多数系统表将其数据存储在RAM中。 一个ClickHouse服务在刚启动时便会创建此类系统表。
 
-与其他系统表不同，系统日志表 [metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log), [query_log](../../operations/system-tables/query_log.md#system_tables-query_log), [query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log), [trace_log](../../operations/system-tables/trace_log.md#system_tables-trace_log), [part_log](../../operations/system-tables/part_log.md#system.part_log), crash_log and text_log 默认采用[MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) 引擎并将其数据存储在存储文件系统中。 如果从文件系统中删除表，ClickHouse服务器会在下一次写入数据时再次创建空表。 如果系统表架构在新版本中发生更改，则ClickHouse会重命名当前表并创建一个新表。
+不同于其他系统表，系统日志表 [metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log), [query_log](../../operations/system-tables/query_log.md#system_tables-query_log), [query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log), [trace_log](../../operations/system-tables/trace_log.md#system_tables-trace_log), [part_log](../../operations/system-tables/part_log.md#system.part_log), crash_log and text_log 默认采用[MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) 引擎并将其数据存储在文件系统中。 如果人为的从文件系统中删除表，ClickHouse服务器会在下一次进行数据写入时再次创建空表。 如果系统表结构在新版本中发生更改，那么ClickHouse会重命名当前表并创建一个新表。
 
-用户可以通过在`/etc/clickhouse-server/config.d/`下创建与系统表同名的配置文件, 或者在`/etc/clickhouse-server/config.xml`中设置相应配置项，来自定义系统日志表的结构。可以自定义的配置项如下:
+用户可以通过在`/etc/clickhouse-server/config.d/`下创建与系统表同名的配置文件, 或者在`/etc/clickhouse-server/config.xml`中设置相应配置项，来自定义系统日志表的结构。可供自定义的配置项如下:
 
--   `database`: 系统日志表所在的数据库。这个选项目前已经废弃。所有的系统日表都位于`system`库中。
--   `table`: 系统日志表名。
+-   `database`: 系统日志表所在的数据库。这个选项目前已经不推荐使用。所有的系统日表都位于`system`库中。
+-   `table`: 接收数据写入的系统日志表。
 -   `partition_by`: 指定[PARTITION BY](../../engines/table-engines/mergetree-family/custom-partitioning-key.md)表达式。
 -   `ttl`: 指定系统日志表TTL选项。
--   `flush_interval_milliseconds`: 指定系统日志表数据落盘时间。
--   `engine`: 指定完整的表引擎定义。(以`ENGINE = `开始)。 这个选项与`partition_by`以及`ttl`冲突。如果两者一起设置，服务启动时会抛出异常并且退出。
+-   `flush_interval_milliseconds`: 指定日志表数据刷新到磁盘的时间间隔。
+-   `engine`: 指定完整的表引擎定义。(以`ENGINE = `开头)。 这个选项与`partition_by`以及`ttl`冲突。如果与两者一起设置，服务启动时会抛出异常并且退出。
 
-一个配置定义的例子如下：
+配置定义的示例如下：
 
 ```
 <yandex>
@@ -50,20 +50,20 @@ toc_title: "\u7CFB\u7EDF\u8868"
 </yandex>
 ```
 
-默认情况下，表增长是无限的。 要控制表的大小，可以使用 TTL 删除过期日志记录的设置。 你也可以使用分区功能 `MergeTree`-发动机表。
+默认情况下，表增长是无限的。可以通过TTL 删除过期日志记录的设置来控制表的大小。 你也可以使用分区功能 `MergeTree`-引擎表。
 
 ## 系统指标的来源 {#system-tables-sources-of-system-metrics}
 
 用于收集ClickHouse服务器使用的系统指标:
 
 -   `CAP_NET_ADMIN` 能力。
--   [procfs](https://en.wikipedia.org/wiki/Procfs) （仅在Linux中）。
+-   [procfs](https://en.wikipedia.org/wiki/Procfs) （仅限于Linux）。
 
 **procfs**
 
-如果ClickHouse服务器没有 `CAP_NET_ADMIN` 能力，它试图回落到 `ProcfsMetricsProvider`. `ProcfsMetricsProvider` 允许收集每个查询系统指标（用于CPU和I/O）。
+如果ClickHouse服务器没有 `CAP_NET_ADMIN` 能力，那么它将试图退回到 `ProcfsMetricsProvider`. `ProcfsMetricsProvider` 允许收集每个查询系统指标（包括CPU和I/O）。
 
-如果系统上支持并启用procfs，ClickHouse server将收集这些指标:
+如果系统上支持并启用procfs，ClickHouse server将收集如下指标:
 
 -   `OSCPUVirtualTimeMicroseconds`
 -   `OSCPUWaitMicroseconds`
diff --git a/docs/zh/sql-reference/data-types/special-data-types/interval.md b/docs/zh/sql-reference/data-types/special-data-types/interval.md
index df2ce097df0..9df25e3f555 100644
--- a/docs/zh/sql-reference/data-types/special-data-types/interval.md
+++ b/docs/zh/sql-reference/data-types/special-data-types/interval.md
@@ -5,9 +5,9 @@ toc_priority: 61
 toc_title: "\u95F4\u9694"
 ---
 
-# 间隔 {#data-type-interval}
+# Interval类型 {#data-type-interval}
 
-表示时间和日期间隔的数据类型族。 由此产生的类型 [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) 接线员
+表示时间和日期间隔的数据类型家族。  [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) 运算的结果类型。
 
 !!! warning "警告"
     `Interval` 数据类型值不能存储在表中。
@@ -15,7 +15,7 @@ toc_title: "\u95F4\u9694"
 结构:
 
 -   时间间隔作为无符号整数值。
--   间隔的类型。
+-   时间间隔的类型。
 
 支持的时间间隔类型:
 
@@ -28,7 +28,7 @@ toc_title: "\u95F4\u9694"
 -   `QUARTER`
 -   `YEAR`
 
-对于每个间隔类型，都有一个单独的数据类型。 例如， `DAY` 间隔对应于 `IntervalDay` 数据类型:
+对于每个时间间隔类型，都有一个单独的数据类型。 例如， `DAY` 间隔对应于 `IntervalDay` 数据类型:
 
 ``` sql
 SELECT toTypeName(INTERVAL 4 DAY)
@@ -42,7 +42,7 @@ SELECT toTypeName(INTERVAL 4 DAY)
 
 ## 使用说明 {#data-type-interval-usage-remarks}
 
-您可以使用 `Interval`-在算术运算类型值 [日期](../../../sql-reference/data-types/date.md) 和 [日期时间](../../../sql-reference/data-types/datetime.md)-类型值。 例如，您可以将4天添加到当前时间:
+您可以在与 [日期](../../../sql-reference/data-types/date.md) 和 [日期时间](../../../sql-reference/data-types/datetime.md) 类型值的算术运算中使用 `Interval` 类型值。 例如，您可以将4天添加到当前时间:
 
 ``` sql
 SELECT now() as current_date_time, current_date_time + INTERVAL 4 DAY
@@ -54,10 +54,10 @@ SELECT now() as current_date_time, current_date_time + INTERVAL 4 DAY
 └─────────────────────┴───────────────────────────────┘
 ```
 
-不同类型的间隔不能合并。 你不能使用间隔，如 `4 DAY 1 HOUR`. 以小于或等于间隔的最小单位的单位指定间隔，例如，间隔 `1 day and an hour` 间隔可以表示为 `25 HOUR` 或 `90000 SECOND`.
-
-你不能执行算术运算 `Interval`-类型值，但你可以添加不同类型的时间间隔，因此值 `Date` 或 `DateTime` 数据类型。 例如:
+不同类型的间隔不能合并。 你不能使用诸如 `4 DAY 1 HOUR` 的时间间隔. 以小于或等于时间间隔最小单位的单位来指定间隔，例如，时间间隔 `1 day and an hour` 可以表示为 `25 HOUR` 或 `90000 SECOND`.
 
+你不能对 `Interval` 类型的值执行算术运算，但你可以向 `Date` 或 `DateTime` 数据类型的值添加不同类型的时间间隔，例如:
+ 
 ``` sql
 SELECT now() AS current_date_time, current_date_time + INTERVAL 4 DAY + INTERVAL 3 HOUR
 ```
@@ -81,5 +81,5 @@ Code: 43. DB::Exception: Received from localhost:9000. DB::Exception: Wrong argu
 
 ## 另请参阅 {#see-also}
 
--   [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) 接线员
+-   [INTERVAL](../../../sql-reference/operators/index.md#operator-interval) 操作
 -   [toInterval](../../../sql-reference/functions/type-conversion-functions.md#function-tointerval) 类型转换函数
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 f981f442fb6..cbd88de0038 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
@@ -55,7 +55,7 @@ SOURCE(SOURCE_TYPE(param1 val1 ... paramN valN)) -- Source configuration
 或
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 SETTINGS(format_csv_allow_single_quotes = 0)
 ```
 
@@ -87,7 +87,7 @@ SETTINGS(format_csv_allow_single_quotes = 0)
 或
 
 ``` sql
-SOURCE(FILE(path '/opt/dictionaries/os.tsv' format 'TabSeparated'))
+SOURCE(FILE(path './user_files/os.tsv' format 'TabSeparated'))
 ```
 
 设置字段:
diff --git a/docs/zh/sql-reference/dictionaries/index.md b/docs/zh/sql-reference/dictionaries/index.md
index 7e8f5e83aa7..092afd5bac1 100644
--- a/docs/zh/sql-reference/dictionaries/index.md
+++ b/docs/zh/sql-reference/dictionaries/index.md
@@ -8,15 +8,15 @@ toc_title: "\u5BFC\u8A00"
 
 # 字典 {#dictionaries}
 
-字典是一个映射 (`key -> attributes`）这是方便各种类型的参考清单。
+字典是一个映射 (`键 -> 属性`）, 是方便各种类型的参考清单。
 
-ClickHouse支持使用可用于查询的字典的特殊功能。 这是更容易和更有效地使用字典与功能比 `JOIN` 与参考表。
+ClickHouse支持一些特殊函数配合字典在查询中使用。 将字典与函数结合使用比将 `JOIN` 操作与引用表结合使用更简单、更有效。
 
 [NULL](../../sql-reference/syntax.md#null-literal) 值不能存储在字典中。
 
 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).
+-   [内置字典](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-->
diff --git a/docs/zh/sql-reference/functions/array-functions.md b/docs/zh/sql-reference/functions/array-functions.md
index ac5dae3a97e..4f6dbc0d87d 100644
--- a/docs/zh/sql-reference/functions/array-functions.md
+++ b/docs/zh/sql-reference/functions/array-functions.md
@@ -606,7 +606,7 @@ SELECT arrayReverseSort((x, y) -> -y, [4, 3, 5], [1, 2, 3]) AS res;
 
 如果要获取数组中唯一项的列表，可以使用arrayReduce（‘groupUniqArray’，arr）。
 
-## arryjoin(arr) {#array-functions-join}
+## arrayJoin(arr) {#array-functions-join}
 
 一个特殊的功能。请参见[«ArrayJoin函数»](array-join.md#functions_arrayjoin)部分。
 
diff --git a/docs/zh/sql-reference/functions/other-functions.md b/docs/zh/sql-reference/functions/other-functions.md
index b17a5e89332..c58c4bd1510 100644
--- a/docs/zh/sql-reference/functions/other-functions.md
+++ b/docs/zh/sql-reference/functions/other-functions.md
@@ -477,6 +477,103 @@ FROM
 
     1 rows in set. Elapsed: 0.002 sec.
 
+
+## indexHint  {#indexhint}
+输出符合索引选择范围内的所有数据，同时不实用参数中的表达式进行过滤。
+
+传递给函数的表达式参数将不会被计算，但ClickHouse使用参数中的表达式进行索引过滤。
+
+**返回值**
+
+- 1。
+
+**示例**
+
+这是一个包含[ontime](../../getting-started/example-datasets/ontime.md)测试数据集的测试表。
+
+```
+SELECT count() FROM ontime
+
+┌─count()─┐
+│ 4276457 │
+└─────────┘
+```
+
+该表使用`(FlightDate, (Year, FlightDate))`作为索引。
+
+对该表进行如下的查询：
+
+```
+:) SELECT FlightDate AS k, count() FROM ontime GROUP BY k ORDER BY k
+
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+GROUP BY k
+ORDER BY k ASC
+
+┌──────────k─┬─count()─┐
+│ 2017-01-01 │   13970 │
+│ 2017-01-02 │   15882 │
+........................
+│ 2017-09-28 │   16411 │
+│ 2017-09-29 │   16384 │
+│ 2017-09-30 │   12520 │
+└────────────┴─────────┘
+
+273 rows in set. Elapsed: 0.072 sec. Processed 4.28 million rows, 8.55 MB (59.00 million rows/s., 118.01 MB/s.)
+```
+
+在这个查询中，由于没有使用索引，所以ClickHouse将处理整个表的所有数据(`Processed 4.28 million rows`)。使用下面的查询尝试使用索引进行查询：
+
+```
+:) SELECT FlightDate AS k, count() FROM ontime WHERE k = '2017-09-15' GROUP BY k ORDER BY k
+
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE k = '2017-09-15'
+GROUP BY k
+ORDER BY k ASC
+
+┌──────────k─┬─count()─┐
+│ 2017-09-15 │   16428 │
+└────────────┴─────────┘
+
+1 rows in set. Elapsed: 0.014 sec. Processed 32.74 thousand rows, 65.49 KB (2.31 million rows/s., 4.63 MB/s.)
+```
+
+在最后一行的显示中，通过索引ClickHouse处理的行数明显减少（`Processed 32.74 thousand rows`）。
+
+现在将表达式`k = '2017-09-15'`传递给`indexHint`函数：
+
+```
+:) SELECT FlightDate AS k, count() FROM ontime WHERE indexHint(k = '2017-09-15') GROUP BY k ORDER BY k
+
+SELECT
+    FlightDate AS k,
+    count()
+FROM ontime
+WHERE indexHint(k = '2017-09-15')
+GROUP BY k
+ORDER BY k ASC
+
+┌──────────k─┬─count()─┐
+│ 2017-09-14 │    7071 │
+│ 2017-09-15 │   16428 │
+│ 2017-09-16 │    1077 │
+│ 2017-09-30 │    8167 │
+└────────────┴─────────┘
+
+4 rows in set. Elapsed: 0.004 sec. Processed 32.74 thousand rows, 65.49 KB (8.97 million rows/s., 17.94 MB/s.)
+```
+
+对于这个请求，根据ClickHouse显示ClickHouse与上一次相同的方式应用了索引（`Processed 32.74 thousand rows`）。但是，最终返回的结果集中并没有根据`k = '2017-09-15'`表达式进行过滤结果。
+
+由于ClickHouse中使用稀疏索引，因此在读取范围时（本示例中为相邻日期），"额外"的数据将包含在索引结果中。使用`indexHint`函数可以查看到它们。
+
 ## 复制 {#replicate}
 
 使用单个值填充一个数组。
diff --git a/docs/zh/sql-reference/statements/create.md b/docs/zh/sql-reference/statements/create.md
index 639af0841dc..46e82bd1733 100644
--- a/docs/zh/sql-reference/statements/create.md
+++ b/docs/zh/sql-reference/statements/create.md
@@ -238,7 +238,7 @@ SELECT a, b, c FROM (SELECT ...)
 
 当一个`SELECT`子句包含`DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`时，请注意，这些仅会在插入数据时在每个单独的数据块上执行。例如，如果你在其中包含了`GROUP BY`，则只会在查询期间进行聚合，但聚合范围仅限于单个批的写入数据。数据不会进一步被聚合。但是当你使用一些其他数据聚合引擎时这是例外的，如：`SummingMergeTree`。
 
-目前对物化视图执行`ALTER`是不支持的，因此这可能是不方便的。如果物化视图是使用的`TO [db.]name`的方式进行构建的，你可以使用`DETACH`语句现将视图剥离，然后使用`ALTER`运行在目标表上，然后使用`ATTACH`将之前剥离的表重新加载进来。
+目前对物化视图执行`ALTER`是不支持的，因此这可能是不方便的。如果物化视图是使用的`TO [db.]name`的方式进行构建的，你可以使用`DETACH`语句先将视图剥离，然后使用`ALTER`运行在目标表上，然后使用`ATTACH`将之前剥离的表重新加载进来。
 
 视图看起来和普通的表相同。例如，你可以通过`SHOW TABLES`查看到它们。
 
diff --git a/docs/zh/sql-reference/statements/select/join.md b/docs/zh/sql-reference/statements/select/join.md
index 2976484e09a..407c8ca6101 100644
--- a/docs/zh/sql-reference/statements/select/join.md
+++ b/docs/zh/sql-reference/statements/select/join.md
@@ -43,15 +43,15 @@ ClickHouse中提供的其他联接类型:
 
     Also 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.
 
-### ASOF加入使用 {#asof-join-usage}
+### ASOF JOIN使用 {#asof-join-usage}
 
 `ASOF JOIN` 当您需要连接没有完全匹配的记录时非常有用。
 
-算法需要表中的特殊列。 本专栏:
+该算法需要表中的特殊列。 该列需要满足:
 
 -   必须包含有序序列。
--   可以是以下类型之一: [Int*，UInt*](../../../sql-reference/data-types/int-uint.md), [浮动\*](../../../sql-reference/data-types/float.md), [日期](../../../sql-reference/data-types/date.md), [日期时间](../../../sql-reference/data-types/datetime.md), [十进制\*](../../../sql-reference/data-types/decimal.md).
--   不能是唯一的列 `JOIN` 
+-   可以是以下类型之一: [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).
+-   不能是`JOIN`子句中唯一的列  
 
 语法 `ASOF JOIN ... ON`:
 
@@ -62,9 +62,9 @@ ASOF LEFT JOIN table_2
 ON equi_cond AND closest_match_cond
 ```
 
-您可以使用任意数量的相等条件和恰好一个最接近的匹配条件。 例如, `SELECT count() FROM table_1 ASOF LEFT JOIN table_2 ON table_1.a == table_2.b AND table_2.t <= table_1.t`.
+您可以使用任意数量的相等条件和一个且只有一个最接近的匹配条件。 例如, `SELECT count() FROM table_1 ASOF LEFT JOIN table_2 ON table_1.a == table_2.b AND table_2.t <= table_1.t`.
 
-支持最接近匹配的条件: `>`, `>=`, `<`, `<=`.
+支持最接近匹配的运算符: `>`, `>=`, `<`, `<=`.
 
 语法 `ASOF JOIN ... USING`:
 
@@ -75,9 +75,9 @@ ASOF JOIN table_2
 USING (equi_column1, ... equi_columnN, asof_column)
 ```
 
-`ASOF JOIN` 用途 `equi_columnX` 对于加入平等和 `asof_column` 用于加入与最接近的比赛 `table_1.asof_column >= table_2.asof_column` 条件。 该 `asof_column` 列总是在最后一个 `USING` 条款
+`table_1.asof_column >= table_2.asof_column` 中， `ASOF JOIN` 使用 `equi_columnX` 来进行条件匹配， `asof_column` 用于JOIN最接近匹配。  `asof_column` 列总是在最后一个 `USING` 条件中。
 
-例如，请考虑下表:
+例如，参考下表:
 
          table_1                           table_2
       event   | ev_time | user_id       event   | ev_time | user_id
@@ -88,10 +88,10 @@ USING (equi_column1, ... equi_columnN, asof_column)
     event_1_2 |  13:00  |  42         event_2_3 |  13:00  |   42
                   ...                               ...
 
-`ASOF JOIN` 可以从用户事件的时间戳 `table_1` 并找到一个事件 `table_2` 其中时间戳最接近事件的时间戳 `table_1` 对应于最接近的匹配条件。 如果可用，则相等的时间戳值是最接近的值。 在这里，该 `user_id` 列可用于连接相等和 `ev_time` 列可用于在最接近的匹配加入。 在我们的例子中, `event_1_1` 可以加入 `event_2_1` 和 `event_1_2` 可以加入 `event_2_3`，但是 `event_2_2` 不能加入。
+`ASOF JOIN`会从 `table_2` 中的用户事件时间戳找出和 `table_1` 中用户事件时间戳中最近的一个时间戳，来满足最接近匹配的条件。如果有得话，则相等的时间戳值是最接近的值。在此例中，`user_id` 列可用于条件匹配，`ev_time` 列可用于最接近匹配。在此例中，`event_1_1` 可以 JOIN `event_2_1`，`event_1_2` 可以JOIN `event_2_3`，但是 `event_2_2` 不能被JOIN。
 
 !!! note "注"
-    `ASOF` 加入是 **不** 支持在 [加入我们](../../../engines/table-engines/special/join.md) 表引擎。
+    `ASOF JOIN`在 [JOIN](../../../engines/table-engines/special/join.md) 表引擎中 **不受** 支持。
 
 ## 分布式联接 {#global-join}
 
diff --git a/docs/zh/sql-reference/syntax.md b/docs/zh/sql-reference/syntax.md
index 8c331db1139..c05c5a1a7bf 100644
--- a/docs/zh/sql-reference/syntax.md
+++ b/docs/zh/sql-reference/syntax.md
@@ -14,7 +14,7 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 含`INSERT INTO t VALUES` 的部分由完整SQL解析器处理，包含数据的部分 `(1, 'Hello, world'), (2, 'abc'), (3, 'def')` 交给快速流式解析器解析。通过设置参数 [input_format_values_interpret_expressions](../operations/settings/settings.md#settings-input_format_values_interpret_expressions)，你也可以对数据部分开启完整SQL解析器。当 `input_format_values_interpret_expressions = 1` 时，CH优先采用快速流式解析器来解析数据。如果失败，CH再尝试用完整SQL解析器来处理，就像处理SQL [expression](#syntax-expressions) 一样。
 
-数据可以采用任何格式。当CH接受到请求时，服务端先在内存中计算不超过 [max_query_size](../operations/settings/settings.md#settings-max_query_size) 字节的请求数据（默认1 mb），然后剩下部分交给快速流式解析器。
+数据可以采用任何格式。当CH接收到请求时，服务端先在内存中计算不超过 [max_query_size](../operations/settings/settings.md#settings-max_query_size) 字节的请求数据（默认1 mb），然后剩下部分交给快速流式解析器。
 
 这将避免在处理大型的 `INSERT`语句时出现问题。
 
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index c3600e5812a..2af0331c70b 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -33,13 +33,29 @@ option (ENABLE_CLICKHOUSE_OBFUSCATOR "Table data obfuscator (convert real data t
     ${ENABLE_CLICKHOUSE_ALL})
 
 # https://clickhouse.tech/docs/en/operations/utilities/odbc-bridge/
-option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver"
+if (ENABLE_ODBC)
+    option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver"
+        ${ENABLE_CLICKHOUSE_ALL})
+else ()
+    option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver" OFF)
+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})
 
+
+option (ENABLE_CLICKHOUSE_KEEPER "ClickHouse alternative to ZooKeeper" ${ENABLE_CLICKHOUSE_ALL})
+if (NOT USE_NURAFT)
+    # RECONFIGURE_MESSAGE_LEVEL should not be used here,
+    # since USE_NURAFT is set to OFF for FreeBSD and Darwin.
+    message (STATUS "clickhouse-keeper will not be built (lack of NuRaft)")
+    set(ENABLE_CLICKHOUSE_KEEPER OFF)
+endif()
+
 if (CLICKHOUSE_SPLIT_BINARY)
     option(ENABLE_CLICKHOUSE_INSTALL "Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only)" OFF)
 else ()
@@ -109,6 +125,12 @@ else()
     message(STATUS "ODBC bridge mode: OFF")
 endif()
 
+if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
+    message(STATUS "Library bridge mode: ON")
+else()
+    message(STATUS "Library bridge mode: OFF")
+endif()
+
 if (ENABLE_CLICKHOUSE_INSTALL)
     message(STATUS "ClickHouse install: ON")
 else()
@@ -121,6 +143,12 @@ else()
     message(STATUS "ClickHouse git-import: OFF")
 endif()
 
+if (ENABLE_CLICKHOUSE_KEEPER)
+    message(STATUS "ClickHouse keeper mode: ON")
+else()
+    message(STATUS "ClickHouse keeper mode: OFF")
+endif()
+
 if(NOT (MAKE_STATIC_LIBRARIES OR SPLIT_SHARED_LIBRARIES))
     set(CLICKHOUSE_ONE_SHARED ON)
 endif()
@@ -176,6 +204,54 @@ macro(clickhouse_program_add name)
     clickhouse_program_add_executable(${name})
 endmacro()
 
+# Embed default config files as a resource into the binary.
+# This is needed for two purposes:
+# 1. Allow to run the binary without download of any other files.
+# 2. Allow to implement "sudo clickhouse install" tool.
+#
+# Arguments: target (server, client, keeper, etc.) and list of files
+#
+# Also dependency on TARGET_FILE is required, look at examples in programs/server and programs/keeper
+macro(clickhouse_embed_binaries)
+    # TODO We actually need this on Mac, FreeBSD.
+    if (OS_LINUX)
+
+        set(arguments_list "${ARGN}")
+        list(GET arguments_list 0 target)
+
+        # for some reason cmake iterates loop including <stop>
+        math(EXPR arguments_count "${ARGC}-1")
+
+        foreach(RESOURCE_POS RANGE 1 "${arguments_count}")
+            list(GET arguments_list "${RESOURCE_POS}" RESOURCE_FILE)
+            set(RESOURCE_OBJ ${RESOURCE_FILE}.o)
+            set(RESOURCE_OBJS ${RESOURCE_OBJS} ${RESOURCE_OBJ})
+
+            # https://stackoverflow.com/questions/14776463/compile-and-add-an-object-file-from-a-binary-with-cmake
+            # PPC64LE fails to do this with objcopy, use ld or lld instead
+            if (ARCH_PPC64LE)
+                add_custom_command(OUTPUT ${RESOURCE_OBJ}
+                    COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_LINKER} -m elf64lppc -r -b binary -o "${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ}" ${RESOURCE_FILE})
+            else()
+                add_custom_command(OUTPUT ${RESOURCE_OBJ}
+                    COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS} ${RESOURCE_FILE} "${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ}"
+                    COMMAND ${OBJCOPY_PATH} --rename-section .data=.rodata,alloc,load,readonly,data,contents
+                        "${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ}" "${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ}")
+            endif()
+            set_source_files_properties(${RESOURCE_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
+        endforeach()
+
+        add_library(clickhouse_${target}_configs STATIC ${RESOURCE_OBJS})
+        set_target_properties(clickhouse_${target}_configs PROPERTIES LINKER_LANGUAGE C)
+
+        # whole-archive prevents symbols from being discarded for unknown reason
+        # CMake can shuffle each of target_link_libraries arguments with other
+        # libraries in linker command. To avoid this we hardcode whole-archive
+        # library into single string.
+        add_dependencies(clickhouse-${target}-lib clickhouse_${target}_configs)
+    endif ()
+endmacro()
+
 
 add_subdirectory (server)
 add_subdirectory (client)
@@ -190,25 +266,52 @@ add_subdirectory (install)
 add_subdirectory (git-import)
 add_subdirectory (bash-completion)
 
+if (ENABLE_CLICKHOUSE_KEEPER)
+    add_subdirectory (keeper)
+endif()
+
 if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
     add_subdirectory (odbc-bridge)
 endif ()
 
+if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
+    add_subdirectory (library-bridge)
+endif ()
+
 if (CLICKHOUSE_ONE_SHARED)
-    add_library(clickhouse-lib SHARED ${CLICKHOUSE_SERVER_SOURCES} ${CLICKHOUSE_CLIENT_SOURCES} ${CLICKHOUSE_LOCAL_SOURCES} ${CLICKHOUSE_BENCHMARK_SOURCES} ${CLICKHOUSE_COPIER_SOURCES} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_SOURCES} ${CLICKHOUSE_COMPRESSOR_SOURCES} ${CLICKHOUSE_FORMAT_SOURCES} ${CLICKHOUSE_OBFUSCATOR_SOURCES} ${CLICKHOUSE_GIT_IMPORT_SOURCES} ${CLICKHOUSE_ODBC_BRIDGE_SOURCES})
-    target_link_libraries(clickhouse-lib ${CLICKHOUSE_SERVER_LINK} ${CLICKHOUSE_CLIENT_LINK} ${CLICKHOUSE_LOCAL_LINK} ${CLICKHOUSE_BENCHMARK_LINK} ${CLICKHOUSE_COPIER_LINK} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_LINK} ${CLICKHOUSE_COMPRESSOR_LINK} ${CLICKHOUSE_FORMAT_LINK} ${CLICKHOUSE_OBFUSCATOR_LINK} ${CLICKHOUSE_GIT_IMPORT_LINK} ${CLICKHOUSE_ODBC_BRIDGE_LINK})
-    target_include_directories(clickhouse-lib ${CLICKHOUSE_SERVER_INCLUDE} ${CLICKHOUSE_CLIENT_INCLUDE} ${CLICKHOUSE_LOCAL_INCLUDE} ${CLICKHOUSE_BENCHMARK_INCLUDE} ${CLICKHOUSE_COPIER_INCLUDE} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_INCLUDE} ${CLICKHOUSE_COMPRESSOR_INCLUDE} ${CLICKHOUSE_FORMAT_INCLUDE} ${CLICKHOUSE_OBFUSCATOR_INCLUDE} ${CLICKHOUSE_GIT_IMPORT_INCLUDE} ${CLICKHOUSE_ODBC_BRIDGE_INCLUDE})
+    add_library(clickhouse-lib SHARED ${CLICKHOUSE_SERVER_SOURCES} ${CLICKHOUSE_CLIENT_SOURCES} ${CLICKHOUSE_LOCAL_SOURCES} ${CLICKHOUSE_BENCHMARK_SOURCES} ${CLICKHOUSE_COPIER_SOURCES} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_SOURCES} ${CLICKHOUSE_COMPRESSOR_SOURCES} ${CLICKHOUSE_FORMAT_SOURCES} ${CLICKHOUSE_OBFUSCATOR_SOURCES} ${CLICKHOUSE_GIT_IMPORT_SOURCES} ${CLICKHOUSE_ODBC_BRIDGE_SOURCES} ${CLICKHOUSE_KEEPER_SOURCES})
+    target_link_libraries(clickhouse-lib ${CLICKHOUSE_SERVER_LINK} ${CLICKHOUSE_CLIENT_LINK} ${CLICKHOUSE_LOCAL_LINK} ${CLICKHOUSE_BENCHMARK_LINK} ${CLICKHOUSE_COPIER_LINK} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_LINK} ${CLICKHOUSE_COMPRESSOR_LINK} ${CLICKHOUSE_FORMAT_LINK} ${CLICKHOUSE_OBFUSCATOR_LINK} ${CLICKHOUSE_GIT_IMPORT_LINK} ${CLICKHOUSE_ODBC_BRIDGE_LINK} ${CLICKHOUSE_KEEPER_LINK})
+    target_include_directories(clickhouse-lib ${CLICKHOUSE_SERVER_INCLUDE} ${CLICKHOUSE_CLIENT_INCLUDE} ${CLICKHOUSE_LOCAL_INCLUDE} ${CLICKHOUSE_BENCHMARK_INCLUDE} ${CLICKHOUSE_COPIER_INCLUDE} ${CLICKHOUSE_EXTRACT_FROM_CONFIG_INCLUDE} ${CLICKHOUSE_COMPRESSOR_INCLUDE} ${CLICKHOUSE_FORMAT_INCLUDE} ${CLICKHOUSE_OBFUSCATOR_INCLUDE} ${CLICKHOUSE_GIT_IMPORT_INCLUDE} ${CLICKHOUSE_ODBC_BRIDGE_INCLUDE} ${CLICKHOUSE_KEEPER_INCLUDE})
     set_target_properties(clickhouse-lib PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR} VERSION ${VERSION_SO} OUTPUT_NAME clickhouse DEBUG_POSTFIX "")
     install (TARGETS clickhouse-lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT clickhouse)
 endif()
 
 if (CLICKHOUSE_SPLIT_BINARY)
-    set (CLICKHOUSE_ALL_TARGETS clickhouse-server clickhouse-client clickhouse-local clickhouse-benchmark clickhouse-extract-from-config clickhouse-compressor clickhouse-format clickhouse-obfuscator clickhouse-git-import clickhouse-copier)
+    set (CLICKHOUSE_ALL_TARGETS
+        clickhouse-server
+        clickhouse-client
+        clickhouse-local
+        clickhouse-benchmark
+        clickhouse-extract-from-config
+        clickhouse-compressor
+        clickhouse-format
+        clickhouse-obfuscator
+        clickhouse-git-import
+        clickhouse-copier
+    )
 
     if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
         list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-odbc-bridge)
     endif ()
 
+    if (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE)
+        list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-library-bridge)
+    endif ()
+
+    if (ENABLE_CLICKHOUSE_KEEPER)
+        list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-keeper)
+    endif ()
+
     set_target_properties(${CLICKHOUSE_ALL_TARGETS} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
 
     add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_ALL_TARGETS})
@@ -256,6 +359,9 @@ else ()
     if (ENABLE_CLICKHOUSE_GIT_IMPORT)
         clickhouse_target_link_split_lib(clickhouse git-import)
     endif ()
+    if (ENABLE_CLICKHOUSE_KEEPER)
+        clickhouse_target_link_split_lib(clickhouse keeper)
+    endif()
     if (ENABLE_CLICKHOUSE_INSTALL)
         clickhouse_target_link_split_lib(clickhouse install)
     endif ()
@@ -263,54 +369,59 @@ else ()
     set (CLICKHOUSE_BUNDLE)
     if (ENABLE_CLICKHOUSE_SERVER)
         add_custom_target (clickhouse-server ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-server DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-server)
     endif ()
     if (ENABLE_CLICKHOUSE_CLIENT)
         add_custom_target (clickhouse-client ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-client DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-client DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-client" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-client)
     endif ()
     if (ENABLE_CLICKHOUSE_LOCAL)
         add_custom_target (clickhouse-local ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-local DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-local DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-local" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-local)
     endif ()
     if (ENABLE_CLICKHOUSE_BENCHMARK)
         add_custom_target (clickhouse-benchmark ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-benchmark DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-benchmark DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-benchmark" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-benchmark)
     endif ()
     if (ENABLE_CLICKHOUSE_COPIER)
         add_custom_target (clickhouse-copier ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-copier DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-copier DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-copier" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-copier)
     endif ()
     if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
         add_custom_target (clickhouse-extract-from-config ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-extract-from-config DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-extract-from-config DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-extract-from-config" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-extract-from-config)
     endif ()
     if (ENABLE_CLICKHOUSE_COMPRESSOR)
         add_custom_target (clickhouse-compressor ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-compressor DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-compressor DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-compressor" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-compressor)
     endif ()
     if (ENABLE_CLICKHOUSE_FORMAT)
         add_custom_target (clickhouse-format ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-format DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-format)
     endif ()
     if (ENABLE_CLICKHOUSE_OBFUSCATOR)
         add_custom_target (clickhouse-obfuscator ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-obfuscator DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-obfuscator)
     endif ()
     if (ENABLE_CLICKHOUSE_GIT_IMPORT)
         add_custom_target (clickhouse-git-import ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-git-import DEPENDS clickhouse)
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/clickhouse-git-import DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        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_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)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-keeper)
+    endif ()
 
     install (TARGETS clickhouse RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
 
diff --git a/programs/bash-completion/completions/clickhouse b/programs/bash-completion/completions/clickhouse
index c4b77cf3f7a..fc55398dcf1 100644
--- a/programs/bash-completion/completions/clickhouse
+++ b/programs/bash-completion/completions/clickhouse
@@ -23,19 +23,9 @@ function _complete_for_clickhouse_entrypoint_bin()
     fi
     util="${words[1]}"
 
-    case "$prev" in
-        -C|--config-file|--config)
-            return
-            ;;
-        # Argh...  This looks like a bash bug...
-        # Redirections are passed to the completion function
-        # although it is managed by the shell directly...
-        '<'|'>'|'>>'|[12]'>'|[12]'>>')
-            return
-            ;;
-    esac
-
-    COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd" "$util")" -- "$cur") )
+    if _complete_for_clickhouse_generic_bin_impl "$prev"; then
+        COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd" "$util")" -- "$cur") )
+    fi
 
     return 0
 }
diff --git a/programs/bash-completion/completions/clickhouse-bootstrap b/programs/bash-completion/completions/clickhouse-bootstrap
index dc8dcd5ad8d..7109148a192 100644
--- a/programs/bash-completion/completions/clickhouse-bootstrap
+++ b/programs/bash-completion/completions/clickhouse-bootstrap
@@ -15,6 +15,76 @@ shopt -s extglob
 
 export _CLICKHOUSE_COMPLETION_LOADED=1
 
+CLICKHOUSE_QueryProcessingStage=(
+    complete
+    fetch_columns
+    with_mergeable_state
+    with_mergeable_state_after_aggregation
+)
+
+CLICKHOUSE_Format=(
+    CapnProto
+    PostgreSQLWire
+    MySQLWire
+    JSONStringsEachRowWithProgress
+    JSONEachRowWithProgress
+    JSONCompact
+    JSON
+    CSV
+    Vertical
+    ODBCDriver2
+    PrettySpaceNoEscapes
+    Pretty
+    JSONCompactStrings
+    PrettyNoEscapes
+    ArrowStream
+    TabSeparatedWithNames
+    Parquet
+    Arrow
+    PrettyCompact
+    AvroConfluent
+    ORC
+    PrettyCompactNoEscapes
+    RawBLOB
+    Template
+    MsgPack
+    JSONCompactEachRow
+    CustomSeparated
+    TemplateIgnoreSpaces
+    Markdown
+    XML
+    ProtobufSingle
+    JSONCompactStringsEachRowWithNamesAndTypes
+    TSKV
+    TabSeparated
+    JSONStringEachRow
+    JSONStringsEachRow
+    TSVRaw
+    Values
+    TabSeparatedWithNamesAndTypes
+    PrettyCompactMonoBlock
+    TSVWithNamesAndTypes
+    Avro
+    RowBinaryWithNamesAndTypes
+    LineAsString
+    Native
+    JSONCompactEachRowWithNamesAndTypes
+    PrettySpace
+    Regexp
+    TSV
+    JSONEachRow
+    CustomSeparatedIgnoreSpaces
+    CSVWithNames
+    JSONStrings
+    Null
+    TabSeparatedRaw
+    TSVWithNames
+    Protobuf
+    RowBinary
+    JSONAsString
+    JSONCompactStringsEachRow
+)
+
 function _clickhouse_bin_exist()
 { [ -x "$1" ] || command -v "$1" >& /dev/null; }
 
@@ -30,6 +100,37 @@ function _clickhouse_get_options()
     "$@" --help 2>&1 | awk -F '[ ,=<>]' '{ for (i=1; i <= NF; ++i) { if (substr($i, 0, 1) == "-" && length($i) > 1) print $i; } }' | sort -u
 }
 
+function _complete_for_clickhouse_generic_bin_impl()
+{
+    local prev=$1 && shift
+
+    case "$prev" in
+        -C|--config-file|--config)
+            return 1
+            ;;
+        --stage)
+            COMPREPLY=( $(compgen -W "${CLICKHOUSE_QueryProcessingStage[*]}" -- "$cur") )
+            return 1
+            ;;
+        --format|--input-format|--output-format)
+            COMPREPLY=( $(compgen -W "${CLICKHOUSE_Format[*]}" -- "$cur") )
+            return 1
+            ;;
+        --host)
+            COMPREPLY=( $(compgen -A hostname -- "$cur") )
+            return 1
+            ;;
+        # Argh...  This looks like a bash bug...
+        # Redirections are passed to the completion function
+        # although it is managed by the shell directly...
+        '<'|'>'|'>>'|[12]'>'|[12]'>>')
+            return 1
+            ;;
+    esac
+
+    return 0
+}
+
 function _complete_for_clickhouse_generic_bin()
 {
     local cur prev
@@ -39,19 +140,9 @@ function _complete_for_clickhouse_generic_bin()
     COMPREPLY=()
     _get_comp_words_by_ref cur prev
 
-    case "$prev" in
-        -C|--config-file|--config)
-            return
-            ;;
-        # Argh...  This looks like a bash bug...
-        # Redirections are passed to the completion function
-        # although it is managed by the shell directly...
-        '<'|'>'|'>>'|[12]'>'|[12]'>>')
-            return
-            ;;
-    esac
-
-    COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd")" -- "$cur") )
+    if _complete_for_clickhouse_generic_bin_impl "$prev"; then
+        COMPREPLY=( $(compgen -W "$(_clickhouse_get_options "$cmd")" -- "$cur") )
+    fi
 
     return 0
 }
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index a0e2ea155ba..2e48c5d20c5 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -8,7 +8,6 @@
 #include <iomanip>
 #include <random>
 #include <pcg_random.hpp>
-#include <Poco/File.h>
 #include <Poco/Util/Application.h>
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
@@ -36,7 +35,9 @@
 #include <Common/Config/configReadClient.h>
 #include <Common/TerminalSize.h>
 #include <Common/StudentTTest.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 /** A tool for evaluating ClickHouse performance.
   * The tool emulates a case with fixed amount of simultaneously executing queries.
@@ -95,8 +96,8 @@ public:
             comparison_info_total.emplace_back(std::make_shared<Stats>());
         }
 
-        global_context.makeGlobalContext();
-        global_context.setSettings(settings);
+        global_context->makeGlobalContext();
+        global_context->setSettings(settings);
 
         std::cerr << std::fixed << std::setprecision(3);
 
@@ -119,8 +120,8 @@ public:
 
     int main(const std::vector<std::string> &) override
     {
-        if (!json_path.empty() && Poco::File(json_path).exists()) /// Clear file with previous results
-            Poco::File(json_path).remove();
+        if (!json_path.empty() && fs::exists(json_path)) /// Clear file with previous results
+            fs::remove(json_path);
 
         readQueries();
         runBenchmark();
@@ -159,7 +160,7 @@ private:
     bool print_stacktrace;
     const Settings & settings;
     SharedContextHolder shared_context;
-    Context global_context;
+    ContextMutablePtr global_context;
     QueryProcessingStage::Enum query_processing_stage;
 
     /// Don't execute new queries after timelimit or SIGINT or exception
diff --git a/programs/client/CMakeLists.txt b/programs/client/CMakeLists.txt
index 72b5caf9784..084e1b45911 100644
--- a/programs/client/CMakeLists.txt
+++ b/programs/client/CMakeLists.txt
@@ -21,4 +21,4 @@ list(APPEND CLICKHOUSE_CLIENT_LINK PRIVATE readpassphrase)
 
 clickhouse_program_add(client)
 
-install (FILES clickhouse-client.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-client COMPONENT clickhouse-client RENAME config.xml)
+install (FILES clickhouse-client.xml DESTINATION "${CLICKHOUSE_ETC_DIR}/clickhouse-client" COMPONENT clickhouse-client RENAME config.xml)
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index ca9976ac4a8..f268d2b5cdc 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1,7 +1,7 @@
-#include "TestHint.h"
 #include "ConnectionParameters.h"
 #include "QueryFuzzer.h"
 #include "Suggest.h"
+#include "TestHint.h"
 
 #if USE_REPLXX
 #   include <common/ReplxxLineReader.h>
@@ -21,11 +21,10 @@
 #include <unordered_set>
 #include <algorithm>
 #include <optional>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <Poco/String.h>
-#include <Poco/File.h>
 #include <Poco/Util/Application.h>
 #include <common/find_symbols.h>
 #include <common/LineReader.h>
@@ -86,6 +85,9 @@
 #include <common/argsToConfig.h>
 #include <Common/TerminalSize.h>
 #include <Common/UTF8Helpers.h>
+#include <Common/ProgressBar.h>
+#include <filesystem>
+#include <Common/filesystemHelpers.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config_version.h>
@@ -95,13 +97,10 @@
 #pragma GCC optimize("-fno-var-tracking-assignments")
 #endif
 
-/// http://en.wikipedia.org/wiki/ANSI_escape_code
-#define CLEAR_TO_END_OF_LINE "\033[K"
-
+namespace fs = std::filesystem;
 
 namespace DB
 {
-
 namespace ErrorCodes
 {
     extern const int NETWORK_ERROR;
@@ -119,8 +118,7 @@ namespace ErrorCodes
 
 static bool queryHasWithClause(const IAST * ast)
 {
-    if (const auto * select = dynamic_cast<const ASTSelectQuery *>(ast);
-        select && select->with())
+    if (const auto * select = dynamic_cast<const ASTSelectQuery *>(ast); select && select->with())
     {
         return true;
     }
@@ -152,28 +150,22 @@ public:
 
 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 need_render_progress = true;    /// Render query execution progress.
-    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.
+    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.
+    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
@@ -181,23 +173,23 @@ private:
     // 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.
+    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();
-    Context context = Context::createGlobal(shared_context.get());
+    ContextMutablePtr context = Context::createGlobal(shared_context.get());
 
     /// Buffer that reads from stdin in batch mode.
-    ReadBufferFromFileDescriptor std_in {STDIN_FILENO};
+    ReadBufferFromFileDescriptor std_in{STDIN_FILENO};
 
     /// Console output.
-    WriteBufferFromFileDescriptor std_out {STDOUT_FILENO};
+    WriteBufferFromFileDescriptor std_out{STDOUT_FILENO};
     std::unique_ptr<ShellCommand> pager_cmd;
 
     /// The user can specify to redirect query output to a file.
@@ -242,10 +234,9 @@ private:
 
     /// The server periodically sends information about how much data was read since last time.
     Progress progress;
-    bool show_progress_bar = false;
 
-    size_t written_progress_chars = 0;
-    bool written_first_block = false;
+    /// Progress bar
+    ProgressBar progress_bar;
 
     /// External tables info.
     std::list<ExternalTable> external_tables;
@@ -274,20 +265,20 @@ private:
 
         configReadClient(config(), home_path);
 
-        context.setApplicationType(Context::ApplicationType::CLIENT);
-        context.setQueryParameters(query_parameters);
+        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())
+        for (const auto & setting : context->getSettingsRef().allUnchanged())
         {
             const auto & name = setting.getName();
             if (config().has(name))
-                context.setSetting(name, config().getString(name));
+                context->setSetting(name, config().getString(name));
         }
 
         /// Set path for format schema files
         if (config().has("format_schema_path"))
-            context.setFormatSchemaPath(Poco::Path(config().getString("format_schema_path")).toString());
+            context->setFormatSchemaPath(fs::weakly_canonical(config().getString("format_schema_path")));
 
         /// Initialize query_id_formats if any
         if (config().has("query_id_formats"))
@@ -322,16 +313,13 @@ private:
             if (std::string::npos != embedded_stack_trace_pos && !print_stack_trace)
                 text.resize(embedded_stack_trace_pos);
 
-             std::cerr << "Code: " << e.code() << ". " << text << std::endl << std::endl;
+            std::cerr << "Code: " << e.code() << ". " << text << std::endl << std::endl;
 
             /// Don't print the stack trace on the client if it was logged on the server.
             /// Also don't print the stack trace in case of network errors.
-            if (print_stack_trace
-                && e.code() != ErrorCodes::NETWORK_ERROR
-                && std::string::npos == embedded_stack_trace_pos)
+            if (print_stack_trace && e.code() != ErrorCodes::NETWORK_ERROR && std::string::npos == embedded_stack_trace_pos)
             {
-                std::cerr << "Stack trace:" << std::endl
-                    << e.getStackTraceString();
+                std::cerr << "Stack trace:" << std::endl << e.getStackTraceString();
             }
 
             /// If exception code isn't zero, we should return non-zero return code anyway.
@@ -354,8 +342,7 @@ private:
             return false;
 
         LocalDate now(current_time);
-        return (now.month() == 12 && now.day() >= 20)
-            || (now.month() == 1 && now.day() <= 5);
+        return (now.month() == 12 && now.day() >= 20) || (now.month() == 1 && now.day() <= 5);
     }
 
     static bool isChineseNewYearMode(const String & local_tz)
@@ -406,9 +393,9 @@ private:
 
         if (chineseNewYearTimeZoneIndicators + M
             == std::find_if(chineseNewYearTimeZoneIndicators, chineseNewYearTimeZoneIndicators + M, [&local_tz](const char * tz)
-            {
-                return tz == local_tz;
-            }))
+                            {
+                                return tz == local_tz;
+                            }))
             return false;
 
         /// It's bad to be intrusive.
@@ -432,52 +419,51 @@ private:
     {
         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::OpeningCurlyBrace, Replxx::Color::INTENSE },
-            { TokenType::ClosingCurlyBrace, Replxx::Color::INTENSE },
+        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::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::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::Comma, Replxx::Color::INTENSE},
+               {TokenType::Semicolon, Replxx::Color::INTENSE},
+               {TokenType::Dot, Replxx::Color::INTENSE},
+               {TokenType::Asterisk, Replxx::Color::INTENSE},
+               {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::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 }
-        };
+               {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;
 
@@ -527,7 +513,10 @@ private:
         std::cerr << std::fixed << std::setprecision(3);
 
         if (is_interactive)
+        {
+            clearTerminal();
             showClientVersion();
+        }
 
         is_default_format = !config().has("vertical") && !config().has("format");
         if (config().has("vertical"))
@@ -535,24 +524,24 @@ private:
         else
             format = config().getString("format", is_interactive ? "PrettyCompact" : "TabSeparated");
 
-        format_max_block_size = config().getInt("format_max_block_size", context.getSettingsRef().max_block_size);
+        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;
+        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);
+            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);
+            progress_bar.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();
+        ClientInfo & client_info = context->getClientInfo();
         client_info.setInitialQuery();
         client_info.quota_key = config().getString("quota_key", "");
 
@@ -560,7 +549,7 @@ private:
 
         /// Initialize DateLUT here to avoid counting time spent here as query execution time.
         const auto local_tz = DateLUT::instance().getTimeZone();
-        if (!context.getSettingsRef().use_client_time_zone)
+        if (!context->getSettingsRef().use_client_time_zone)
         {
             const auto & time_zone = connection->getServerTimezone(connection_parameters.timeouts);
             if (!time_zone.empty())
@@ -572,16 +561,16 @@ private:
                 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;
+                              << ", 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;
+                          << "Proceeding with local time zone." << std::endl
+                          << std::endl;
             }
         }
 
@@ -609,8 +598,7 @@ private:
         }
 
         /// Prompt may contain the following substitutions in a form of {name}.
-        std::map<String, String> prompt_substitutions
-        {
+        std::map<String, String> prompt_substitutions{
             {"host", connection_parameters.host},
             {"port", toString(connection_parameters.port)},
             {"user", connection_parameters.user},
@@ -618,7 +606,7 @@ private:
         };
 
         /// Quite suboptimal.
-        for (const auto & [key, value]: prompt_substitutions)
+        for (const auto & [key, value] : prompt_substitutions)
             boost::replace_all(prompt_by_server_display_name, "{" + key + "}", value);
 
         if (is_interactive)
@@ -647,8 +635,8 @@ private:
                     history_file = home_path + "/.clickhouse-client-history";
             }
 
-            if (!history_file.empty() && !Poco::File(history_file).exists())
-                Poco::File(history_file).createFile();
+            if (!history_file.empty() && !fs::exists(history_file))
+                FS::createFile(history_file);
 
             LineReader::Patterns query_extenders = {"\\"};
             LineReader::Patterns query_delimiters = {";", "\\G"};
@@ -658,13 +646,7 @@ private:
             if (config().getBool("highlight"))
                 highlight_callback = highlight;
 
-            ReplxxLineReader lr(
-                *suggest,
-                history_file,
-                config().has("multiline"),
-                query_extenders,
-                query_delimiters,
-                highlight_callback);
+            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);
@@ -701,8 +683,8 @@ private:
                     // We don't need to handle the test hints in the interactive
                     // mode.
                     std::cerr << std::endl
-                        << "Exception on client:" << std::endl
-                        << "Code: " << e.code() << ". " << e.displayText() << std::endl;
+                              << "Exception on client:" << std::endl
+                              << "Code: " << e.code() << ". " << e.displayText() << std::endl;
 
                     if (config().getBool("stacktrace", false))
                         std::cerr << "Stack trace:" << std::endl << e.getStackTraceString() << std::endl;
@@ -720,8 +702,7 @@ private:
                     /// So we reconnect and allow to enter the next query.
                     connect();
                 }
-            }
-            while (true);
+            } while (true);
 
             if (isNewYearMode())
                 std::cout << "Happy new year." << std::endl;
@@ -735,14 +716,13 @@ private:
         {
             auto query_id = config().getString("query_id", "");
             if (!query_id.empty())
-                context.setCurrentQueryId(query_id);
+                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();
+            const auto * exception = server_exception ? server_exception.get() : client_exception.get();
             if (exception)
             {
                 return exception->code() != 0 ? exception->code() : -1;
@@ -765,10 +745,10 @@ private:
 
         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_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,
@@ -793,8 +773,8 @@ private:
             connection->setThrottler(throttler);
         }
 
-        connection->getServerVersion(connection_parameters.timeouts,
-                                     server_name, server_version_major, server_version_minor, server_version_patch, server_revision);
+        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);
 
@@ -805,10 +785,9 @@ private:
 
         if (is_interactive)
         {
-            std::cout << "Connected to " << server_name
-                << " server version " << server_version
-                << " revision " << server_revision
-                << "." << std::endl << std::endl;
+            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);
@@ -816,14 +795,14 @@ private:
             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;
+                          << "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;
+                          << "It may indicate that the server is out of date and can be upgraded." << std::endl
+                          << std::endl;
             }
         }
     }
@@ -880,7 +859,7 @@ private:
 
     bool processQueryText(const String & text)
     {
-        if (exit_strings.end() != exit_strings.find(trim(text, [](char c){ return isWhitespaceASCII(c) || c == ';'; })))
+        if (exit_strings.end() != exit_strings.find(trim(text, [](char c) { return isWhitespaceASCII(c) || c == ';'; })))
             return false;
 
         if (!config().has("multiquery"))
@@ -901,15 +880,13 @@ private:
 
     // 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)
+    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)
+        while (after_query_iterator.isValid() && after_query_iterator->type == TokenType::Semicolon)
         {
             this_query_end = after_query_iterator->end;
             ++after_query_iterator;
@@ -926,8 +903,7 @@ private:
         // 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 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
@@ -953,14 +929,12 @@ private:
         {
             std::string text = server_exception->displayText();
             auto embedded_stack_trace_pos = text.find("Stack trace");
-            if (std::string::npos != embedded_stack_trace_pos
-                && !config().getBool("stacktrace", false))
+            if (std::string::npos != embedded_stack_trace_pos && !config().getBool("stacktrace", false))
             {
                 text.resize(embedded_stack_trace_pos);
             }
-            std::cerr << "Received exception from server (version "
-                << server_version << "):" << std::endl << "Code: "
-                << server_exception->code() << ". " << text << std::endl;
+            std::cerr << "Received exception from server (version " << server_version << "):" << std::endl
+                      << "Code: " << server_exception->code() << ". " << text << std::endl;
             if (is_interactive)
             {
                 std::cerr << std::endl;
@@ -969,9 +943,7 @@ private:
 
         if (client_exception)
         {
-            fmt::print(stderr,
-                "Error on processing query '{}':\n{}\n",
-                full_query, client_exception->message());
+            fmt::print(stderr, "Error on processing query '{}':\n{}\n", full_query, client_exception->message());
             if (is_interactive)
             {
                 fmt::print(stderr, "\n");
@@ -1015,8 +987,7 @@ private:
             // 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))
+            while (this_query_begin < all_queries_end && isWhitespaceASCII(*this_query_begin))
             {
                 ++this_query_begin;
             }
@@ -1034,8 +1005,7 @@ private:
             // 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);
+                IParser::Pos token_iterator(tokens, context->getSettingsRef().max_parser_depth);
                 if (!token_iterator.isValid())
                 {
                     break;
@@ -1053,17 +1023,14 @@ private:
                 // 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);
+                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));
+                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());
+                    e.addMessage("\nExpected server error '{}'.", hint.serverError());
                     throw;
                 }
 
@@ -1084,7 +1051,7 @@ private:
                 if (ignore_error)
                 {
                     Tokens tokens(this_query_begin, all_queries_end);
-                    IParser::Pos token_iterator(tokens, context.getSettingsRef().max_parser_depth);
+                    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;
@@ -1109,18 +1076,13 @@ private:
             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);
+                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);
+                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);
+                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
@@ -1129,14 +1091,11 @@ private:
             // 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);
+            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);
+            full_query = all_queries_text.substr(this_query_begin - all_queries_text.data(), this_query_end - this_query_begin);
 
             if (query_fuzzer_runs)
             {
@@ -1155,8 +1114,7 @@ private:
             {
                 // 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());
+                client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
                 have_error = true;
             }
 
@@ -1169,8 +1127,7 @@ private:
             if (insert_ast && insert_ast->data)
             {
                 this_query_end = insert_ast->end;
-                adjustQueryEnd(this_query_end, all_queries_end,
-                    context.getSettingsRef().max_parser_depth);
+                adjustQueryEnd(this_query_end, all_queries_end, context->getSettingsRef().max_parser_depth);
             }
 
             // Now we know for sure where the query ends.
@@ -1178,8 +1135,7 @@ private:
             // 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));
+            TestHint test_hint(test_mode, std::string(this_query_begin, this_query_end - this_query_begin));
 
             // Check whether the error (or its absence) matches the test hints
             // (or their absence).
@@ -1191,16 +1147,13 @@ private:
                     if (!server_exception)
                     {
                         error_matches_hint = false;
-                        fmt::print(stderr,
-                            "Expected server error code '{}' but got no server error.\n",
-                            test_hint.serverError());
+                        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;
+                        std::cerr << "Expected server error code: " << test_hint.serverError() << " but got: " << server_exception->code()
+                                  << "." << std::endl;
                     }
                 }
 
@@ -1209,17 +1162,13 @@ private:
                     if (!client_exception)
                     {
                         error_matches_hint = false;
-                        fmt::print(stderr,
-                            "Expected client error code '{}' but got no client error.\n",
-                            test_hint.clientError());
+                        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());
+                        fmt::print(
+                            stderr, "Expected client error code '{}' but got '{}'.\n", test_hint.clientError(), client_exception->code());
                     }
                 }
 
@@ -1235,17 +1184,13 @@ private:
             {
                 if (test_hint.clientError())
                 {
-                    fmt::print(stderr,
-                        "The query succeeded but the client error '{}' was expected.\n",
-                        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());
+                    fmt::print(stderr, "The query succeeded but the server error '{}' was expected.\n", test_hint.serverError());
                     error_matches_hint = false;
                 }
             }
@@ -1287,7 +1232,7 @@ private:
     // Prints changed settings to stderr. Useful for debugging fuzzing failures.
     void printChangedSettings() const
     {
-        const auto & changes = context.getSettingsRef().changes();
+        const auto & changes = context->getSettingsRef().changes();
         if (!changes.empty())
         {
             fmt::print(stderr, "Changed settings: ");
@@ -1297,8 +1242,7 @@ private:
                 {
                     fmt::print(stderr, ", ");
                 }
-                fmt::print(stderr, "{} = '{}'", changes[i].name,
-                           toString(changes[i].value));
+                fmt::print(stderr, "{} = '{}'", changes[i].name, toString(changes[i].value));
             }
             fmt::print(stderr, "\n");
         }
@@ -1346,8 +1290,7 @@ private:
         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);
+            fmt::print(stderr, "Fuzzing step {} out of {}\n", fuzz_step, this_query_runs);
 
             ASTPtr ast_to_process;
             try
@@ -1377,10 +1320,12 @@ private:
                 {
                     printChangedSettings();
 
-                    fmt::print(stderr,
+                    fmt::print(
+                        stderr,
                         "Base before fuzz: {}\n"
                         "Base after fuzz: {}\n",
-                        base_before_fuzz, base_after_fuzz);
+                        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");
@@ -1389,7 +1334,9 @@ private:
                     fuzz_base->dumpTree(cerr_buf);
                     cerr_buf.next();
 
-                    fmt::print(stderr, "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.");
+                    fmt::print(
+                        stderr,
+                        "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);
                 }
@@ -1413,18 +1360,35 @@ private:
                 // 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());
+                client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
                 have_error = true;
             }
 
             if (have_error)
             {
-                const auto * exception = server_exception
-                    ? server_exception.get() : client_exception.get();
-                fmt::print(stderr, "Error on processing query '{}': {}\n",
-                    ast_to_process->formatForErrorMessage(),
-                    exception->message());
+                const auto * exception = server_exception ? server_exception.get() : client_exception.get();
+                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: Code: {}: {}\n",
+                        getCurrentExceptionCode(),
+                        getCurrentExceptionMessage(true));
+
+                    assert(!connection->isConnected());
+                }
             }
 
             if (!connection->isConnected())
@@ -1458,18 +1422,26 @@ private:
             // 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.
-            // The final caveat is that sometimes WITH queries are not executed,
+            // 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.
-            if (!have_error && queryHasWithClause(parsed_query.get()))
+            // 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 parsed_formatted_query;
+                ASTPtr ast_2;
                 try
                 {
                     const auto * tmp_pos = query_to_send.c_str();
-                    parsed_formatted_query = parseQuery(tmp_pos,
-                        tmp_pos + query_to_send.size(),
+
+                    ast_2 = parseQuery(tmp_pos, tmp_pos + query_to_send.size(),
                         false /* allow_multi_statements */);
                 }
                 catch (Exception & e)
@@ -1480,25 +1452,30 @@ private:
                     }
                 }
 
-                if (parsed_formatted_query)
+                if (ast_2)
                 {
-                    const auto formatted_twice
-                        = parsed_formatted_query->formatForErrorMessage();
-
-                    if (formatted_twice != query_to_send)
+                    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, "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",
-                            formatted_twice, query_to_send);
+                        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:\n'{}'\n", parsed_query->dumpTree());
+                        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", parsed_formatted_query->dumpTree());
-                        fmt::print(stderr, "Text-2 (AST-2 formatted):\n'{}'\n", formatted_twice);
-                        fmt::print(stderr, "Text-1 must be equal to Text-2, but it is not.\n");
+                        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);
                     }
@@ -1587,11 +1564,11 @@ private:
         if (is_interactive)
         {
             // Generate a new query_id
-            context.setCurrentQueryId("");
+            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);
+                writeString(fmt::format(query_id_format.second, fmt::arg("query_id", context->getCurrentQueryId())), std_out);
                 writeChar('\n', std_out);
                 std_out.next();
             }
@@ -1600,19 +1577,22 @@ private:
         watch.restart();
         processed_rows = 0;
         progress.reset();
-        show_progress_bar = false;
-        written_progress_chars = 0;
-        written_first_block = false;
+        progress_bar.show_progress_bar = false;
+        progress_bar.written_progress_chars = 0;
+        progress_bar.written_first_block = false;
 
         {
             /// Temporarily apply query settings to context.
             std::optional<Settings> old_settings;
-            SCOPE_EXIT({ if (old_settings) context.setSettings(*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);
+                    old_settings.emplace(context->getSettingsRef());
+                context->applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);
             };
             const auto * insert = parsed_query->as<ASTInsertQuery>();
             if (insert && insert->settings_ast)
@@ -1650,7 +1630,7 @@ private:
                     if (change.name == "profile")
                         current_profile = change.value.safeGet<String>();
                     else
-                        context.applySettingChange(change);
+                        context->applySettingChange(change);
                 }
             }
 
@@ -1666,8 +1646,7 @@ private:
 
         if (is_interactive)
         {
-            std::cout << std::endl
-                << processed_rows << " rows in set. Elapsed: " << watch.elapsedSeconds() << " sec. ";
+            std::cout << std::endl << processed_rows << " rows in set. Elapsed: " << watch.elapsedSeconds() << " sec. ";
 
             if (progress.read_rows >= 1000)
                 writeFinalProgress();
@@ -1722,10 +1701,10 @@ private:
                 connection->sendQuery(
                     connection_parameters.timeouts,
                     query_to_send,
-                    context.getCurrentQueryId(),
+                    context->getCurrentQueryId(),
                     query_processing_stage,
-                    &context.getSettingsRef(),
-                    &context.getClientInfo(),
+                    &context->getSettingsRef(),
+                    &context->getClientInfo(),
                     true);
 
                 sendExternalTables();
@@ -1737,12 +1716,10 @@ private:
             {
                 /// 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)
+                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)";
+                              << " retry (" << retries_left << " retries left)";
                 }
                 else
                 {
@@ -1763,10 +1740,10 @@ private:
         connection->sendQuery(
             connection_parameters.timeouts,
             query_to_send,
-            context.getCurrentQueryId(),
+            context->getCurrentQueryId(),
             query_processing_stage,
-            &context.getSettingsRef(),
-            &context.getClientInfo(),
+            &context->getSettingsRef(),
+            &context->getClientInfo(),
             true);
 
         sendExternalTables();
@@ -1784,12 +1761,12 @@ private:
     }
 
 
-    ASTPtr parseQuery(const char * & pos, const char * end, bool allow_multi_statements)
+    ASTPtr parseQuery(const char *& pos, const char * end, bool allow_multi_statements)
     {
         ParserQuery parser(end);
         ASTPtr res;
 
-        const auto & settings = context.getSettingsRef();
+        const auto & settings = context->getSettingsRef();
         size_t max_length = 0;
         if (!allow_multi_statements)
             max_length = settings.max_query_size;
@@ -1877,8 +1854,7 @@ private:
                 current_format = insert->format;
         }
 
-        BlockInputStreamPtr block_input = context.getInputFormat(
-            current_format, buf, sample, insert_format_max_block_size);
+        BlockInputStreamPtr block_input = context->getInputFormat(current_format, buf, sample, insert_format_max_block_size);
 
         if (columns_description.hasDefaults())
             block_input = std::make_shared<AddingDefaultsBlockInputStream>(block_input, columns_description, context);
@@ -1971,13 +1947,12 @@ private:
                 /// to avoid losing sync.
                 if (!cancelled)
                 {
-                    auto cancel_query = [&]
-                    {
+                    auto cancel_query = [&] {
                         connection->sendCancel();
                         cancelled = true;
                         if (is_interactive)
                         {
-                            clearProgress();
+                            progress_bar.clearProgress();
                             std::cout << "Cancelling query." << std::endl;
                         }
 
@@ -2066,8 +2041,8 @@ private:
                 return false;
 
             default:
-                throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from server {}",
-                    packet.type, connection->getDescription());
+                throw Exception(
+                    ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from server {}", packet.type, connection->getDescription());
         }
     }
 
@@ -2098,8 +2073,10 @@ private:
                     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);
+                    throw NetException(
+                        "Unexpected packet from server (expected Data, Exception or Log, got "
+                            + String(Protocol::Server::toString(packet.type)) + ")",
+                        ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER);
             }
         }
     }
@@ -2127,8 +2104,10 @@ private:
                     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);
+                    throw NetException(
+                        "Unexpected packet from server (expected Exception, EndOfStream or Log, got "
+                            + String(Protocol::Server::toString(packet.type)) + ")",
+                        ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER);
             }
         }
     }
@@ -2200,10 +2179,10 @@ private:
                 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_buf, block);
+            if (!progress_bar.need_render_progress)
+                block_out_stream = context->getOutputStreamParallelIfPossible(current_format, *out_buf, block);
             else
-                block_out_stream = context.getOutputStream(current_format, *out_buf, block);
+                block_out_stream = context->getOutputStream(current_format, *out_buf, block);
 
             block_out_stream->writePrefix();
         }
@@ -2231,8 +2210,8 @@ private:
                 }
                 else
                 {
-                    out_logs_buf = std::make_unique<WriteBufferFromFile>(
-                        server_logs_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_APPEND | O_CREAT);
+                    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();
                 }
             }
@@ -2249,38 +2228,35 @@ private:
             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))
-        {
-            block_out_stream->write(block);
-            written_first_block = true;
-        }
+        if (block.rows() == 0 || (query_fuzzer_runs != 0 && processed_rows >= 100))
+            return;
 
-        bool clear_progress = false;
-        if (need_render_progress)
-            clear_progress = std_out.offset() > 0;
+        if (progress_bar.need_render_progress)
+            progress_bar.clearProgress();
 
-        if (clear_progress)
-            clearProgress();
+        block_out_stream->write(block);
+        progress_bar.written_first_block = true;
 
         /// Received data block is immediately displayed to the user.
         block_out_stream->flush();
 
         /// Restore progress bar after data block.
-        if (clear_progress)
-            writeProgress();
+        if (progress_bar.need_render_progress)
+            progress_bar.writeProgress(progress, watch.elapsed());
     }
 
 
     void onLogData(Block & block)
     {
         initLogsOutputStream();
-        clearProgress();
+        progress_bar.clearProgress();
         logs_out_stream->write(block);
         logs_out_stream->flush();
     }
@@ -2301,128 +2277,26 @@ private:
 
     void onProgress(const Progress & value)
     {
-        if (!progress.incrementPiecewiseAtomically(value))
+        if (!progress_bar.updateProgress(progress, value))
         {
             // Just a keep-alive update.
             return;
         }
         if (block_out_stream)
             block_out_stream->onProgress(value);
-
-        writeProgress();
-    }
-
-
-    void clearProgress()
-    {
-        if (written_progress_chars)
-        {
-            written_progress_chars = 0;
-            std::cerr << "\r" CLEAR_TO_END_OF_LINE;
-        }
-    }
-
-
-    void writeProgress()
-    {
-        if (!need_render_progress)
-            return;
-
-        /// Output all progress bar commands to stderr at once to avoid flicker.
-        WriteBufferFromFileDescriptor message(STDERR_FILENO, 1024);
-
-        static size_t increment = 0;
-        static const char * indicators[8] =
-        {
-            "\033[1;30m→\033[0m",
-            "\033[1;31m↘\033[0m",
-            "\033[1;32m↓\033[0m",
-            "\033[1;33m↙\033[0m",
-            "\033[1;34m←\033[0m",
-            "\033[1;35m↖\033[0m",
-            "\033[1;36m↑\033[0m",
-            "\033[1m↗\033[0m",
-        };
-
-        const char * indicator = indicators[increment % 8];
-
-        size_t terminal_width = getTerminalWidth();
-
-        if (!written_progress_chars)
-        {
-            /// If the current line is not empty, the progress must be output on the next line.
-            /// The trick is found here: https://www.vidarholen.net/contents/blog/?p=878
-            message << std::string(terminal_width, ' ');
-        }
-        message << '\r';
-
-        size_t prefix_size = message.count();
-
-        message << indicator << " Progress: ";
-
-        message
-            << formatReadableQuantity(progress.read_rows) << " rows, "
-            << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
-
-        size_t elapsed_ns = watch.elapsed();
-        if (elapsed_ns)
-            message << " ("
-                << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
-                << formatReadableSizeWithDecimalSuffix(progress.read_bytes * 1000000000.0 / elapsed_ns) << "/s.) ";
-        else
-            message << ". ";
-
-        written_progress_chars = message.count() - prefix_size - (strlen(indicator) - 2); /// Don't count invisible output (escape sequences).
-
-        /// If the approximate number of rows to process is known, we can display a progress bar and percentage.
-        if (progress.total_rows_to_read > 0)
-        {
-            size_t total_rows_corrected = std::max(progress.read_rows, progress.total_rows_to_read);
-
-            /// To avoid flicker, display progress bar only if .5 seconds have passed since query execution start
-            ///  and the query is less than halfway done.
-
-            if (elapsed_ns > 500000000)
-            {
-                /// Trigger to start displaying progress bar. If query is mostly done, don't display it.
-                if (progress.read_rows * 2 < total_rows_corrected)
-                    show_progress_bar = true;
-
-                if (show_progress_bar)
-                {
-                    ssize_t width_of_progress_bar = static_cast<ssize_t>(terminal_width) - written_progress_chars - strlen(" 99%");
-                    if (width_of_progress_bar > 0)
-                    {
-                        std::string bar = UnicodeBar::render(UnicodeBar::getWidth(progress.read_rows, 0, total_rows_corrected, width_of_progress_bar));
-                        message << "\033[0;32m" << bar << "\033[0m";
-                        if (width_of_progress_bar > static_cast<ssize_t>(bar.size() / UNICODE_BAR_CHAR_SIZE))
-                            message << std::string(width_of_progress_bar - bar.size() / UNICODE_BAR_CHAR_SIZE, ' ');
-                    }
-                }
-            }
-
-            /// Underestimate percentage a bit to avoid displaying 100%.
-            message << ' ' << (99 * progress.read_rows / total_rows_corrected) << '%';
-        }
-
-        message << CLEAR_TO_END_OF_LINE;
-        ++increment;
-
-        message.next();
+        progress_bar.writeProgress(progress, watch.elapsed());
     }
 
 
     void writeFinalProgress()
     {
-        std::cout << "Processed "
-            << formatReadableQuantity(progress.read_rows) << " rows, "
-            << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
+        std::cout << "Processed " << formatReadableQuantity(progress.read_rows) << " rows, "
+                  << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
 
         size_t elapsed_ns = watch.elapsed();
         if (elapsed_ns)
-            std::cout << " ("
-                << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
-                << formatReadableSizeWithDecimalSuffix(progress.read_bytes * 1000000000.0 / elapsed_ns) << "/s.) ";
+            std::cout << " (" << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
+                      << formatReadableSizeWithDecimalSuffix(progress.read_bytes * 1000000000.0 / elapsed_ns) << "/s.)";
         else
             std::cout << ". ";
     }
@@ -2445,7 +2319,7 @@ private:
 
     void onEndOfStream()
     {
-        clearProgress();
+        progress_bar.clearProgress();
 
         if (block_out_stream)
             block_out_stream->writeSuffix();
@@ -2455,9 +2329,9 @@ private:
 
         resetOutput();
 
-        if (is_interactive && !written_first_block)
+        if (is_interactive && !progress_bar.written_first_block)
         {
-            clearProgress();
+            progress_bar.clearProgress();
             std::cout << "Ok." << std::endl;
         }
     }
@@ -2467,6 +2341,16 @@ private:
         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)
     {
@@ -2482,7 +2366,7 @@ public:
           */
         using Arguments = std::vector<std::string>;
 
-        Arguments common_arguments{""};        /// 0th argument is ignored.
+        Arguments common_arguments{""}; /// 0th argument is ignored.
         std::vector<Arguments> external_tables_arguments;
 
         bool in_external_group = false;
@@ -2496,22 +2380,19 @@ public:
                 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="))))
+            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")))
+            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)
                 {
@@ -2622,13 +2503,10 @@ public:
 
         /// 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")
-        ;
+        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();
@@ -2656,7 +2534,7 @@ public:
 
         /// Output of help message.
         if (options.count("help")
-            || (options.count("host") && options["host"].as<std::string>() == "elp"))    /// If user writes -help instead of --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";
@@ -2696,12 +2574,12 @@ public:
             }
         }
 
-        context.makeGlobalContext();
-        context.setSettings(cmd_settings);
+        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())
+        for (const auto & setting : context->getSettingsRef().all())
         {
             const auto & name = setting.getName();
             if (options.count(name))
@@ -2793,19 +2671,15 @@ public:
         {
             std::string traceparent = options["opentelemetry-traceparent"].as<std::string>();
             std::string error;
-            if (!context.getClientInfo().client_trace_context.parseTraceparentHeader(
-                traceparent, error))
+            if (!context->getClientInfo().client_trace_context.parseTraceparentHeader(traceparent, error))
             {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Cannot parse OpenTelemetry traceparent '{}': {}",
-                    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>();
+            context->getClientInfo().client_trace_context.tracestate = options["opentelemetry-tracestate"].as<std::string>();
         }
 
         argsToConfig(common_arguments, config(), 100);
@@ -2813,7 +2687,6 @@ public:
         clearPasswordFromCommandLine(argc, argv);
     }
 };
-
 }
 
 #pragma GCC diagnostic ignored "-Wunused-function"
diff --git a/programs/client/ConnectionParameters.cpp b/programs/client/ConnectionParameters.cpp
index 19734dd5ffa..6faf43759df 100644
--- a/programs/client/ConnectionParameters.cpp
+++ b/programs/client/ConnectionParameters.cpp
@@ -7,6 +7,8 @@
 #include <IO/ConnectionTimeouts.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
+#include <Common/isLocalAddress.h>
+#include <Common/DNSResolver.h>
 #include <common/setTerminalEcho.h>
 #include <ext/scope_guard.h>
 
@@ -60,7 +62,9 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
 #endif
     }
 
-    compression = config.getBool("compression", true) ? Protocol::Compression::Enable : Protocol::Compression::Disable;
+    /// By default compression is disabled if address looks like localhost.
+    compression = config.getBool("compression", !isLocalAddress(DNSResolver::instance().resolveHost(host)))
+        ? Protocol::Compression::Enable : Protocol::Compression::Disable;
 
     timeouts = ConnectionTimeouts(
         Poco::Timespan(config.getInt("connect_timeout", DBMS_DEFAULT_CONNECT_TIMEOUT_SEC), 0),
diff --git a/programs/client/QueryFuzzer.cpp b/programs/client/QueryFuzzer.cpp
index 0c8dc0731f9..721e5acb991 100644
--- a/programs/client/QueryFuzzer.cpp
+++ b/programs/client/QueryFuzzer.cpp
@@ -27,6 +27,7 @@
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 
+
 namespace DB
 {
 
@@ -37,34 +38,33 @@ namespace ErrorCodes
 
 Field QueryFuzzer::getRandomField(int type)
 {
+    static constexpr Int64 bad_int64_values[]
+        = {-2, -1, 0, 1, 2, 3, 7, 10, 100, 255, 256, 257, 1023, 1024,
+           1025, 65535, 65536, 65537, 1024 * 1024 - 1, 1024 * 1024,
+           1024 * 1024 + 1, INT_MIN - 1ll, INT_MIN, INT_MIN + 1,
+           INT_MAX - 1, INT_MAX, INT_MAX + 1ll, INT64_MIN, INT64_MIN + 1,
+           INT64_MAX - 1, INT64_MAX};
     switch (type)
     {
     case 0:
     {
-        static constexpr Int64 values[]
-                = {-2, -1, 0, 1, 2, 3, 7, 10, 100, 255, 256, 257, 1023, 1024,
-                   1025, 65535, 65536, 65537, 1024 * 1024 - 1, 1024 * 1024,
-                   1024 * 1024 + 1, INT64_MIN, INT64_MAX};
-        return values[fuzz_rand() % (sizeof(values) / sizeof(*values))];
+        return bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values)
+                / sizeof(*bad_int64_values))];
     }
     case 1:
     {
         static constexpr float values[]
-                = {NAN, INFINITY, -INFINITY, 0., 0.0001, 0.5, 0.9999,
-                   1., 1.0001, 2., 10.0001, 100.0001, 1000.0001};
-        return values[fuzz_rand() % (sizeof(values) / sizeof(*values))];
+                = {NAN, INFINITY, -INFINITY, 0., -0., 0.0001, 0.5, 0.9999,
+                   1., 1.0001, 2., 10.0001, 100.0001, 1000.0001, 1e10, 1e20,
+                  FLT_MIN, FLT_MIN + FLT_EPSILON, FLT_MAX, FLT_MAX + FLT_EPSILON}; return values[fuzz_rand() % (sizeof(values) / sizeof(*values))];
     }
     case 2:
     {
-        static constexpr Int64 values[]
-                = {-2, -1, 0, 1, 2, 3, 7, 10, 100, 255, 256, 257, 1023, 1024,
-                   1025, 65535, 65536, 65537, 1024 * 1024 - 1, 1024 * 1024,
-                   1024 * 1024 + 1, INT64_MIN, INT64_MAX};
         static constexpr UInt64 scales[] = {0, 1, 2, 10};
         return DecimalField<Decimal64>(
-                    values[fuzz_rand() % (sizeof(values) / sizeof(*values))],
-                scales[fuzz_rand() % (sizeof(scales) / sizeof(*scales))]
-                );
+            bad_int64_values[fuzz_rand() % (sizeof(bad_int64_values)
+                / sizeof(*bad_int64_values))],
+            scales[fuzz_rand() % (sizeof(scales) / sizeof(*scales))]);
     }
     default:
         assert(false);
diff --git a/programs/client/QueryFuzzer.h b/programs/client/QueryFuzzer.h
index 38714205967..7c79e683eb4 100644
--- a/programs/client/QueryFuzzer.h
+++ b/programs/client/QueryFuzzer.h
@@ -4,11 +4,14 @@
 #include <unordered_map>
 #include <vector>
 
+#include <pcg-random/pcg_random.hpp>
+
 #include <Common/randomSeed.h>
 #include <Common/Stopwatch.h>
 #include <Core/Field.h>
 #include <Parsers/IAST.h>
 
+
 namespace DB
 {
 
@@ -50,7 +53,7 @@ struct QueryFuzzer
     // Some debug fields for detecting problematic ASTs with loops.
     // These are reset for each fuzzMain call.
     std::unordered_set<const IAST *> debug_visited_nodes;
-    ASTPtr * debug_top_ast;
+    ASTPtr * debug_top_ast = nullptr;
 
 
     // This is the only function you have to call -- it will modify the passed
diff --git a/programs/client/Suggest.cpp b/programs/client/Suggest.cpp
index dfa7048349e..d4db49a1598 100644
--- a/programs/client/Suggest.cpp
+++ b/programs/client/Suggest.cpp
@@ -3,6 +3,9 @@
 #include <Core/Settings.h>
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
 
 namespace DB
 {
@@ -90,7 +93,7 @@ void Suggest::loadImpl(Connection & connection, const ConnectionTimeouts & timeo
     /// NOTE: Once you will update the completion list,
     /// do not forget to update 01676_clickhouse_client_autocomplete.sh
 
-    std::stringstream query;        // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    WriteBufferFromOwnString query;
     query << "SELECT DISTINCT arrayJoin(extractAll(name, '[\\\\w_]{2,}')) AS res FROM ("
         "SELECT name FROM system.functions"
         " UNION ALL "
@@ -108,14 +111,6 @@ void Suggest::loadImpl(Connection & connection, const ConnectionTimeouts & timeo
         " UNION ALL "
         "SELECT cluster FROM system.clusters"
         " UNION ALL "
-        "SELECT name FROM system.errors"
-        " UNION ALL "
-        "SELECT event FROM system.events"
-        " UNION ALL "
-        "SELECT metric FROM system.asynchronous_metrics"
-        " UNION ALL "
-        "SELECT metric FROM system.metrics"
-        " UNION ALL "
         "SELECT macro FROM system.macros"
         " UNION ALL "
         "SELECT policy_name FROM system.storage_policies"
@@ -139,17 +134,12 @@ void Suggest::loadImpl(Connection & connection, const ConnectionTimeouts & timeo
 
     query << ") WHERE notEmpty(res)";
 
-    Settings settings;
-    /// To show all rows from:
-    /// - system.errors
-    /// - system.events
-    settings.system_events_show_zero_values = true;
-    fetch(connection, timeouts, query.str(), settings);
+    fetch(connection, timeouts, query.str());
 }
 
-void Suggest::fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query, Settings & settings)
+void Suggest::fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query)
 {
-    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete, &settings);
+    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete);
 
     while (true)
     {
diff --git a/programs/client/Suggest.h b/programs/client/Suggest.h
index 0049bc08ebf..03332088cbe 100644
--- a/programs/client/Suggest.h
+++ b/programs/client/Suggest.h
@@ -33,7 +33,7 @@ public:
 private:
 
     void loadImpl(Connection & connection, const ConnectionTimeouts & timeouts, size_t suggestion_limit);
-    void fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query, Settings & settings);
+    void fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query);
     void fillWordsFromBlock(const Block & block);
 
     /// Words are fetched asynchronously.
diff --git a/programs/config_tools.h.in b/programs/config_tools.h.in
index 7cb5a6d883a..50ba0c16a83 100644
--- a/programs/config_tools.h.in
+++ b/programs/config_tools.h.in
@@ -15,3 +15,5 @@
 #cmakedefine01 ENABLE_CLICKHOUSE_GIT_IMPORT
 #cmakedefine01 ENABLE_CLICKHOUSE_INSTALL
 #cmakedefine01 ENABLE_CLICKHOUSE_ODBC_BRIDGE
+#cmakedefine01 ENABLE_CLICKHOUSE_LIBRARY_BRIDGE
+#cmakedefine01 ENABLE_CLICKHOUSE_KEEPER
diff --git a/programs/copier/CMakeLists.txt b/programs/copier/CMakeLists.txt
index f69b30f3f43..dfb067b00f9 100644
--- a/programs/copier/CMakeLists.txt
+++ b/programs/copier/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(CLICKHOUSE_COPIER_SOURCES
-        ${CMAKE_CURRENT_SOURCE_DIR}/ClusterCopierApp.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ClusterCopier.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Internals.cpp)
+        "${CMAKE_CURRENT_SOURCE_DIR}/ClusterCopierApp.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/ClusterCopier.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Internals.cpp")
 
 set (CLICKHOUSE_COPIER_LINK
         PRIVATE
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index bede40d65f5..a60896388a0 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -22,7 +22,7 @@ namespace ErrorCodes
 
 void ClusterCopier::init()
 {
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     task_description_watch_callback = [this] (const Coordination::WatchResponse & response)
     {
@@ -39,14 +39,14 @@ void ClusterCopier::init()
     task_cluster_initial_config = task_cluster_current_config;
 
     task_cluster->loadTasks(*task_cluster_initial_config);
-    context.setClustersConfig(task_cluster_initial_config, task_cluster->clusters_prefix);
+    getContext()->setClustersConfig(task_cluster_initial_config, task_cluster->clusters_prefix);
 
     /// Set up shards and their priority
     task_cluster->random_engine.seed(task_cluster->random_device());
     for (auto & task_table : task_cluster->table_tasks)
     {
-        task_table.cluster_pull = context.getCluster(task_table.cluster_pull_name);
-        task_table.cluster_push = context.getCluster(task_table.cluster_push_name);
+        task_table.cluster_pull = getContext()->getCluster(task_table.cluster_pull_name);
+        task_table.cluster_push = getContext()->getCluster(task_table.cluster_push_name);
         task_table.initShards(task_cluster->random_engine);
     }
 
@@ -206,7 +206,7 @@ void ClusterCopier::uploadTaskDescription(const std::string & task_path, const s
     if (task_config_str.empty())
         return;
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     zookeeper->createAncestors(local_task_description_path);
     auto code = zookeeper->tryCreate(local_task_description_path, task_config_str, zkutil::CreateMode::Persistent);
@@ -219,7 +219,7 @@ void ClusterCopier::uploadTaskDescription(const std::string & task_path, const s
 
 void ClusterCopier::reloadTaskDescription()
 {
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
     task_description_watch_zookeeper = zookeeper;
 
     String task_config_str;
@@ -235,7 +235,7 @@ void ClusterCopier::reloadTaskDescription()
 
     /// Setup settings
     task_cluster->reloadSettings(*config);
-    context.setSettings(task_cluster->settings_common);
+    getContext()->setSettings(task_cluster->settings_common);
 
     task_cluster_current_config = config;
     task_description_current_stat = stat;
@@ -440,7 +440,7 @@ bool ClusterCopier::checkPartitionPieceIsDone(const TaskTable & task_table, cons
 {
     LOG_DEBUG(log, "Check that all shards processed partition {} piece {} successfully", partition_name, piece_number);
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     /// Collect all shards that contain partition piece number piece_number.
     Strings piece_status_paths;
@@ -532,7 +532,7 @@ TaskStatus ClusterCopier::tryMoveAllPiecesToDestinationTable(const TaskTable & t
 
     LOG_DEBUG(log, "Try to move {} to destination table", partition_name);
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     const auto current_partition_attach_is_active = task_table.getPartitionAttachIsActivePath(partition_name);
     const auto current_partition_attach_is_done   = task_table.getPartitionAttachIsDonePath(partition_name);
@@ -714,6 +714,8 @@ ASTPtr ClusterCopier::removeAliasColumnsFromCreateQuery(const ASTPtr & query_ast
     new_columns_list->set(new_columns_list->columns, new_columns);
     if (const auto * indices = query_ast->as<ASTCreateQuery>()->columns_list->indices)
         new_columns_list->set(new_columns_list->indices, indices->clone());
+    if (const auto * projections = query_ast->as<ASTCreateQuery>()->columns_list->projections)
+        new_columns_list->set(new_columns_list->projections, projections->clone());
 
     new_query.replace(new_query.columns_list, new_columns_list);
 
@@ -1095,7 +1097,7 @@ TaskStatus ClusterCopier::tryCreateDestinationTable(const ConnectionTimeouts & t
             = rewriteCreateQueryStorage(task_shard->current_pull_table_create_query, task_table.table_push, task_table.engine_push_ast);
         auto & create = create_query_push_ast->as<ASTCreateQuery &>();
         create.if_not_exists = true;
-        InterpreterCreateQuery::prepareOnClusterQuery(create, context, task_table.cluster_push_name);
+        InterpreterCreateQuery::prepareOnClusterQuery(create, getContext(), task_table.cluster_push_name);
         String query = queryToString(create_query_push_ast);
 
         LOG_DEBUG(log, "Create destination tables. Query: {}", query);
@@ -1211,7 +1213,7 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
     auto split_table_for_current_piece = task_shard.list_of_split_tables_on_shard[current_piece_number];
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
 
     const String piece_is_dirty_flag_path          = partition_piece.getPartitionPieceIsDirtyPath();
     const String piece_is_dirty_cleaned_path       = partition_piece.getPartitionPieceIsCleanedPath();
@@ -1262,7 +1264,7 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
         ParserQuery p_query(query.data() + query.size());
 
-        const auto & settings = context.getSettingsRef();
+        const auto & settings = getContext()->getSettingsRef();
         return parseQuery(p_query, query, settings.max_query_size, settings.max_parser_depth);
     };
 
@@ -1366,10 +1368,10 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
         ASTPtr query_select_ast = get_select_query(split_table_for_current_piece, "count()", /*enable_splitting*/ true);
         UInt64 count;
         {
-            Context local_context = context;
+            auto local_context = Context::createCopy(context);
             // Use pull (i.e. readonly) settings, but fetch data from destination servers
-            local_context.setSettings(task_cluster->settings_pull);
-            local_context.setSetting("skip_unavailable_shards", true);
+            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());
             count = (block) ? block.safeGetByPosition(0).column->getUInt(0) : 0;
@@ -1468,7 +1470,7 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
             query += "INSERT INTO " + getQuotedTable(split_table_for_current_piece) + " VALUES ";
 
             ParserQuery p_query(query.data() + query.size());
-            const auto & settings = context.getSettingsRef();
+            const auto & settings = getContext()->getSettingsRef();
             query_insert_ast = parseQuery(p_query, query, settings.max_query_size, settings.max_parser_depth);
 
             LOG_DEBUG(log, "Executing INSERT query: {}", query);
@@ -1476,18 +1478,18 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
 
         try
         {
-            std::unique_ptr<Context> context_select = std::make_unique<Context>(context);
+            auto context_select = Context::createCopy(context);
             context_select->setSettings(task_cluster->settings_pull);
 
-            std::unique_ptr<Context> context_insert = std::make_unique<Context>(context);
+            auto context_insert = Context::createCopy(context);
             context_insert->setSettings(task_cluster->settings_push);
 
             /// Custom INSERT SELECT implementation
             BlockInputStreamPtr input;
             BlockOutputStreamPtr output;
             {
-                BlockIO io_select = InterpreterFactory::get(query_select_ast, *context_select)->execute();
-                BlockIO io_insert = InterpreterFactory::get(query_insert_ast, *context_insert)->execute();
+                BlockIO io_select = InterpreterFactory::get(query_select_ast, context_select)->execute();
+                BlockIO io_insert = InterpreterFactory::get(query_insert_ast, context_insert)->execute();
 
                 input = io_select.getInputStream();
                 output = io_insert.out;
@@ -1581,7 +1583,7 @@ void ClusterCopier::dropAndCreateLocalTable(const ASTPtr & create_ast)
     const auto & create = create_ast->as<ASTCreateQuery &>();
     dropLocalTableIfExists({create.database, create.table});
 
-    InterpreterCreateQuery interpreter(create_ast, context);
+    InterpreterCreateQuery interpreter(create_ast, getContext());
     interpreter.execute();
 }
 
@@ -1592,7 +1594,7 @@ void ClusterCopier::dropLocalTableIfExists(const DatabaseAndTableName & table_na
     drop_ast->database = table_name.first;
     drop_ast->table = table_name.second;
 
-    InterpreterDropQuery interpreter(drop_ast, context);
+    InterpreterDropQuery interpreter(drop_ast, getContext());
     interpreter.execute();
 }
 
@@ -1654,8 +1656,8 @@ void ClusterCopier::dropParticularPartitionPieceFromAllHelpingTables(const TaskT
 
 String ClusterCopier::getRemoteCreateTable(const DatabaseAndTableName & table, Connection & connection, const Settings & settings)
 {
-    Context remote_context(context);
-    remote_context.setSettings(settings);
+    auto remote_context = Context::createCopy(context);
+    remote_context->setSettings(settings);
 
     String query = "SHOW CREATE TABLE " + getQuotedTable(table);
     Block block = getBlockWithAllStreamData(std::make_shared<RemoteBlockInputStream>(
@@ -1674,7 +1676,7 @@ ASTPtr ClusterCopier::getCreateTableForPullShard(const ConnectionTimeouts & time
             task_cluster->settings_pull);
 
     ParserCreateQuery parser_create_query;
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     return parseQuery(parser_create_query, create_query_pull_str, settings.max_query_size, settings.max_parser_depth);
 }
 
@@ -1703,7 +1705,7 @@ void ClusterCopier::createShardInternalTables(const ConnectionTimeouts & timeout
     /// Create special cluster with single shard
     String shard_read_cluster_name = read_shard_prefix + task_table.cluster_pull_name;
     ClusterPtr cluster_pull_current_shard = task_table.cluster_pull->getClusterWithSingleShard(task_shard.indexInCluster());
-    context.setCluster(shard_read_cluster_name, cluster_pull_current_shard);
+    getContext()->setCluster(shard_read_cluster_name, cluster_pull_current_shard);
 
     auto storage_shard_ast = createASTStorageDistributed(shard_read_cluster_name, task_table.table_pull.first, task_table.table_pull.second);
 
@@ -1763,13 +1765,13 @@ std::set<String> ClusterCopier::getShardPartitions(const ConnectionTimeouts & ti
     }
 
     ParserQuery parser_query(query.data() + query.size());
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
 
     LOG_DEBUG(log, "Computing destination partition set, executing query: {}", query);
 
-    Context local_context = context;
-    local_context.setSettings(task_cluster->settings_pull);
+    auto local_context = Context::createCopy(context);
+    local_context->setSettings(task_cluster->settings_pull);
     Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_ast, local_context)->execute().getInputStream());
 
     if (block)
@@ -1809,11 +1811,11 @@ bool ClusterCopier::checkShardHasPartition(const ConnectionTimeouts & timeouts,
     LOG_DEBUG(log, "Checking shard {} for partition {} existence, executing query: {}", task_shard.getDescription(), partition_quoted_name, query);
 
     ParserQuery parser_query(query.data() + query.size());
-const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
 
-    Context local_context = context;
-    local_context.setSettings(task_cluster->settings_pull);
+    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;
 }
 
@@ -1848,11 +1850,11 @@ bool ClusterCopier::checkPresentPartitionPiecesOnCurrentShard(const ConnectionTi
     LOG_DEBUG(log, "Checking shard {} for partition {} piece {} existence, executing query: {}", task_shard.getDescription(), partition_quoted_name, std::to_string(current_piece_number), query);
 
     ParserQuery parser_query(query.data() + query.size());
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
     ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
 
-    Context local_context = context;
-    local_context.setSettings(task_cluster->settings_pull);
+    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)
         LOG_DEBUG(log, "Partition {} piece number {} is PRESENT on shard {}", partition_quoted_name, std::to_string(current_piece_number), task_shard.getDescription());
@@ -1908,7 +1910,7 @@ UInt64 ClusterCopier::executeQueryOnCluster(
         /// In that case we don't have local replicas, but do it just in case
         for (UInt64 i = 0; i < num_local_replicas; ++i)
         {
-            auto interpreter = InterpreterFactory::get(query_ast, context);
+            auto interpreter = InterpreterFactory::get(query_ast, getContext());
             interpreter->execute();
 
             if (increment_and_check_exit())
@@ -1923,8 +1925,8 @@ UInt64 ClusterCopier::executeQueryOnCluster(
             auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(shard_settings).getSaturated(shard_settings.max_execution_time);
             auto connections = shard.pool->getMany(timeouts, &shard_settings, pool_mode);
 
-            Context shard_context(context);
-            shard_context.setSettings(shard_settings);
+            auto shard_context = Context::createCopy(context);
+            shard_context->setSettings(shard_settings);
 
             for (auto & connection : connections)
             {
diff --git a/programs/copier/ClusterCopier.h b/programs/copier/ClusterCopier.h
index 95bb54cf4e1..085fa2ece06 100644
--- a/programs/copier/ClusterCopier.h
+++ b/programs/copier/ClusterCopier.h
@@ -12,18 +12,17 @@
 namespace DB
 {
 
-class ClusterCopier
+class ClusterCopier : WithMutableContext
 {
 public:
     ClusterCopier(const String & task_path_,
                   const String & host_id_,
                   const String & proxy_database_name_,
-                  Context & context_)
-            :
+                  ContextMutablePtr context_)
+            : WithMutableContext(context_),
             task_zookeeper_path(task_path_),
             host_id(host_id_),
             working_database_name(proxy_database_name_),
-            context(context_),
             log(&Poco::Logger::get("ClusterCopier")) {}
 
     void init();
@@ -36,7 +35,7 @@ public:
     /// Compute set of partitions, assume set of partitions aren't changed during the processing
     void discoverTablePartitions(const ConnectionTimeouts & timeouts, TaskTable & task_table, UInt64 num_threads = 0);
 
-    void uploadTaskDescription(const std::string & task_path, const std::string & task_file, const bool force);
+    void uploadTaskDescription(const std::string & task_path, const std::string & task_file, bool force);
 
     void reloadTaskDescription();
 
@@ -120,7 +119,7 @@ protected:
     /// Removes MATERIALIZED and ALIAS columns from create table query
     static ASTPtr removeAliasColumnsFromCreateQuery(const ASTPtr & query_ast);
 
-    bool tryDropPartitionPiece(ShardPartition & task_partition, const size_t current_piece_number,
+    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;
@@ -141,7 +140,7 @@ protected:
 
     TaskStatus processPartitionPieceTaskImpl(const ConnectionTimeouts & timeouts,
                                              ShardPartition & task_partition,
-                                             const size_t current_piece_number,
+                                             size_t current_piece_number,
                                              bool is_unprioritized_task);
 
     void dropAndCreateLocalTable(const ASTPtr & create_ast);
@@ -219,7 +218,6 @@ private:
 
     bool experimental_use_sample_offset{false};
 
-    Context & context;
     Poco::Logger * log;
 
     std::chrono::milliseconds default_sleep_time{1000};
diff --git a/programs/copier/ClusterCopierApp.cpp b/programs/copier/ClusterCopierApp.cpp
index e3169a49ecf..8925ab63f99 100644
--- a/programs/copier/ClusterCopierApp.cpp
+++ b/programs/copier/ClusterCopierApp.cpp
@@ -3,8 +3,11 @@
 #include <Common/TerminalSize.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Formats/registerFormats.h>
+#include <ext/scope_guard_safe.h>
 #include <unistd.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -25,7 +28,7 @@ void ClusterCopierApp::initialize(Poco::Util::Application & self)
         copy_fault_probability = std::max(std::min(config().getDouble("copy-fault-probability"), 1.0), 0.0);
     if (config().has("move-fault-probability"))
         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") : Poco::Path::current();
+    base_dir = (config().has("base-dir")) ? config().getString("base-dir") : fs::current_path().string();
 
 
     if (config().has("experimental-use-sample-offset"))
@@ -37,18 +40,18 @@ void ClusterCopierApp::initialize(Poco::Util::Application & self)
 
     process_id = std::to_string(DateLUT::instance().toNumYYYYMMDDhhmmss(timestamp)) + "_" + std::to_string(curr_pid);
     host_id = escapeForFileName(getFQDNOrHostName()) + '#' + process_id;
-    process_path = Poco::Path(base_dir + "/clickhouse-copier_" + process_id).absolute().toString();
-    Poco::File(process_path).createDirectories();
+    process_path = fs::weakly_canonical(fs::path(base_dir) / ("clickhouse-copier_" + process_id));
+    fs::create_directories(process_path);
 
     /// Override variables for BaseDaemon
     if (config().has("log-level"))
         config().setString("logger.level", config().getString("log-level"));
 
     if (config().has("base-dir") || !config().has("logger.log"))
-        config().setString("logger.log", process_path + "/log.log");
+        config().setString("logger.log", fs::path(process_path) / "log.log");
 
     if (config().has("base-dir") || !config().has("logger.errorlog"))
-        config().setString("logger.errorlog", process_path + "/log.err.log");
+        config().setString("logger.errorlog", fs::path(process_path) / "log.err.log");
 
     Base::initialize(self);
 }
@@ -110,9 +113,9 @@ void ClusterCopierApp::mainImpl()
     LOG_INFO(log, "Starting clickhouse-copier (id {}, host_id {}, path {}, revision {})", process_id, host_id, process_path, ClickHouseRevision::getVersionRevision());
 
     SharedContextHolder shared_context = Context::createShared();
-    auto context = std::make_unique<Context>(Context::createGlobal(shared_context.get()));
+    auto context = Context::createGlobal(shared_context.get());
     context->makeGlobalContext();
-    SCOPE_EXIT(context->shutdown());
+    SCOPE_EXIT_SAFE(context->shutdown());
 
     context->setConfig(loaded_config.configuration);
     context->setApplicationType(Context::ApplicationType::LOCAL);
@@ -127,13 +130,13 @@ void ClusterCopierApp::mainImpl()
     registerFormats();
 
     static const std::string default_database = "_local";
-    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, *context));
+    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, context));
     context->setCurrentDatabase(default_database);
 
     /// Initialize query scope just in case.
-    CurrentThread::QueryScope query_scope(*context);
+    CurrentThread::QueryScope query_scope(context);
 
-    auto copier = std::make_unique<ClusterCopier>(task_path, host_id, default_database, *context);
+    auto copier = std::make_unique<ClusterCopier>(task_path, host_id, default_database, context);
     copier->setSafeMode(is_safe_mode);
     copier->setCopyFaultProbability(copy_fault_probability);
     copier->setMoveFaultProbability(move_fault_probability);
diff --git a/programs/copier/Internals.cpp b/programs/copier/Internals.cpp
index ea2be469945..bec612a8226 100644
--- a/programs/copier/Internals.cpp
+++ b/programs/copier/Internals.cpp
@@ -222,8 +222,8 @@ Names extractPrimaryKeyColumnNames(const ASTPtr & storage_ast)
         {
             String pk_column = primary_key_expr_list->children[i]->getColumnName();
             if (pk_column != sorting_key_column)
-                throw Exception("Primary key must be a prefix of the sorting key, but in position "
-                                + toString(i) + " its column is " + pk_column + ", not " + sorting_key_column,
+                throw Exception("Primary key must be a prefix of the sorting key, but the column in the position "
+                                + toString(i) + " is " + sorting_key_column +", not " + pk_column,
                                 ErrorCodes::BAD_ARGUMENTS);
 
             if (!primary_key_columns_set.emplace(pk_column).second)
diff --git a/programs/copier/Internals.h b/programs/copier/Internals.h
index 7e45c0ea2ee..9e40d7ebd7b 100644
--- a/programs/copier/Internals.h
+++ b/programs/copier/Internals.h
@@ -8,7 +8,6 @@
 #include <Poco/FormattingChannel.h>
 #include <Poco/PatternFormatter.h>
 #include <Poco/UUIDGenerator.h>
-#include <Poco/File.h>
 #include <Poco/Process.h>
 #include <Poco/FileChannel.h>
 #include <Poco/SplitterChannel.h>
diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp
index ba3d6e8557b..5bf19191353 100644
--- a/programs/format/Format.cpp
+++ b/programs/format/Format.cpp
@@ -102,8 +102,8 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
             }
 
             SharedContextHolder shared_context = Context::createShared();
-            Context context = Context::createGlobal(shared_context.get());
-            context.makeGlobalContext();
+            auto context = Context::createGlobal(shared_context.get());
+            context->makeGlobalContext();
 
             registerFunctions();
             registerAggregateFunctions();
diff --git a/programs/git-import/git-import.cpp b/programs/git-import/git-import.cpp
index b07435dcf78..7977cfba79d 100644
--- a/programs/git-import/git-import.cpp
+++ b/programs/git-import/git-import.cpp
@@ -774,7 +774,7 @@ UInt128 diffHash(const CommitDiff & file_changes)
     }
 
     UInt128 hash_of_diff;
-    hasher.get128(hash_of_diff.low, hash_of_diff.high);
+    hasher.get128(hash_of_diff.items[0], hash_of_diff.items[1]);
 
     return hash_of_diff;
 }
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index ef72624e7ab..a7f566a78b8 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -71,6 +71,9 @@ namespace ErrorCodes
 
 }
 
+/// ANSI escape sequence for intense color in terminal.
+#define HILITE "\033[1m"
+#define END_HILITE "\033[0m"
 
 using namespace DB;
 namespace po = boost::program_options;
@@ -285,7 +288,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                 bool is_symlink = fs::is_symlink(symlink_path);
                 fs::path points_to;
                 if (is_symlink)
-                    points_to = fs::absolute(fs::read_symlink(symlink_path));
+                    points_to = fs::weakly_canonical(fs::read_symlink(symlink_path));
 
                 if (is_symlink && points_to == main_bin_path)
                 {
@@ -559,20 +562,32 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
         bool stdin_is_a_tty = isatty(STDIN_FILENO);
         bool stdout_is_a_tty = isatty(STDOUT_FILENO);
-        bool is_interactive = stdin_is_a_tty && stdout_is_a_tty;
+
+        /// dpkg or apt installers can ask for non-interactive work explicitly.
+
+        const char * debian_frontend_var = getenv("DEBIAN_FRONTEND");
+        bool noninteractive = debian_frontend_var && debian_frontend_var == std::string_view("noninteractive");
+
+        bool is_interactive = !noninteractive && stdin_is_a_tty && stdout_is_a_tty;
+
+        /// We can ask password even if stdin is closed/redirected but /dev/tty is available.
+        bool can_ask_password = !noninteractive && stdout_is_a_tty;
 
         if (has_password_for_default_user)
         {
-            fmt::print("Password for default user is already specified. To remind or reset, see {} and {}.\n",
+            fmt::print(HILITE "Password for default user is already specified. To remind or reset, see {} and {}." END_HILITE "\n",
                        users_config_file.string(), users_d.string());
         }
-        else if (!is_interactive)
+        else if (!can_ask_password)
         {
-            fmt::print("Password for default user is empty string. See {} and {} to change it.\n",
+            fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
                        users_config_file.string(), users_d.string());
         }
         else
         {
+            /// NOTE: When installing debian package with dpkg -i, stdin is not a terminal but we are still being able to enter password.
+            /// More sophisticated method with /dev/tty is used inside the `readpassphrase` function.
+
             char buf[1000] = {};
             std::string password;
             if (auto * result = readpassphrase("Enter password for default user: ", buf, sizeof(buf), 0))
@@ -600,7 +615,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</yandex>\n";
                 out.sync();
                 out.finalize();
-                fmt::print("Password for default user is saved in file {}.\n", password_file);
+                fmt::print(HILITE "Password for default user is saved in file {}." END_HILITE "\n", password_file);
 #else
                 out << "<yandex>\n"
                     "    <users>\n"
@@ -611,12 +626,12 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</yandex>\n";
                 out.sync();
                 out.finalize();
-                fmt::print("Password for default user is saved in plaintext in file {}.\n", password_file);
+                fmt::print(HILITE "Password for default user is saved in plaintext in file {}." END_HILITE "\n", password_file);
 #endif
                 has_password_for_default_user = true;
             }
             else
-                fmt::print("Password for default user is empty string. See {} and {} to change it.\n",
+                fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
                            users_config_file.string(), users_d.string());
         }
 
@@ -641,7 +656,6 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                 " This is optional. Taskstats accounting will be disabled."
                 " To enable taskstats accounting you may add the required capability later manually.\"",
             "/tmp/test_setcap.sh", fs::canonical(main_bin_path).string());
-        fmt::print(" {}\n", command);
         executeScript(command);
 #endif
 
@@ -830,8 +844,8 @@ namespace
                 fmt::print("The pidof command returned unusual output.\n");
             }
 
-            WriteBufferFromFileDescriptor stderr(STDERR_FILENO);
-            copyData(sh->err, stderr);
+            WriteBufferFromFileDescriptor std_err(STDERR_FILENO);
+            copyData(sh->err, std_err);
 
             sh->tryWait();
         }
@@ -842,6 +856,13 @@ namespace
             {
                 fmt::print("The process with pid = {} is running.\n", pid);
             }
+            else if (errno == ESRCH)
+            {
+                fmt::print("The process with pid = {} does not exist.\n", pid);
+                return 0;
+            }
+            else
+                throwFromErrno(fmt::format("Cannot obtain the status of pid {} with `kill`", pid), ErrorCodes::CANNOT_KILL);
         }
 
         if (!pid)
@@ -962,7 +983,7 @@ int mainEntryClickHouseStop(int argc, char ** argv)
     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::value<bool>()->default_value(false), "Stop with KILL signal instead of TERM")
+        ("force", po::bool_switch(), "Stop with KILL signal instead of TERM")
     ;
 
     po::variables_map options;
diff --git a/programs/keeper/CMakeLists.txt b/programs/keeper/CMakeLists.txt
new file mode 100644
index 00000000000..e604d0e304e
--- /dev/null
+++ b/programs/keeper/CMakeLists.txt
@@ -0,0 +1,24 @@
+set(CLICKHOUSE_KEEPER_SOURCES
+    Keeper.cpp
+)
+
+if (OS_LINUX)
+    set (LINK_RESOURCE_LIB INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:clickhouse_keeper_configs> -Wl,${NO_WHOLE_ARCHIVE}")
+endif ()
+
+set (CLICKHOUSE_KEEPER_LINK
+    PRIVATE
+        clickhouse_common_config
+        clickhouse_common_io
+        clickhouse_common_zookeeper
+        daemon
+        dbms
+
+    ${LINK_RESOURCE_LIB}
+)
+
+clickhouse_program_add(keeper)
+
+install (FILES keeper_config.xml DESTINATION "${CLICKHOUSE_ETC_DIR}/clickhouse-keeper" COMPONENT clickhouse-keeper)
+
+clickhouse_embed_binaries(keeper keeper_config.xml keeper_embedded.xml)
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
new file mode 100644
index 00000000000..8b35ec12850
--- /dev/null
+++ b/programs/keeper/Keeper.cpp
@@ -0,0 +1,468 @@
+#include "Keeper.h"
+
+#include <sys/stat.h>
+#include <pwd.h>
+#include <Common/ClickHouseRevision.h>
+#include <Server/ProtocolServerAdapter.h>
+#include <Common/DNSResolver.h>
+#include <Interpreters/DNSCacheUpdater.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 <ext/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>
+
+#if !defined(ARCADIA_BUILD)
+#   include "config_core.h"
+#   include "Common/config_version.h"
+#endif
+
+#if USE_SSL
+#    include <Poco/Net/Context.h>
+#    include <Poco/Net/SecureServerSocket.h>
+#endif
+
+#include <Server/KeeperTCPHandlerFactory.h>
+
+#if defined(OS_LINUX)
+#    include <unistd.h>
+#    include <sys/syscall.h>
+#endif
+
+
+int mainEntryClickHouseKeeper(int argc, char ** argv)
+{
+    DB::Keeper app;
+
+    try
+    {
+        return app.run(argc, argv);
+    }
+    catch (...)
+    {
+        std::cerr << DB::getCurrentExceptionMessage(true) << "\n";
+        auto code = DB::getCurrentExceptionCode();
+        return code ? code : 1;
+    }
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int SUPPORT_IS_DISABLED;
+    extern const int NETWORK_ERROR;
+    extern const int MISMATCHING_USERS_FOR_PROCESS_AND_DATA;
+    extern const int FAILED_TO_GETPWUID;
+}
+
+namespace
+{
+
+int waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t seconds_to_wait)
+{
+    const int sleep_max_ms = 1000 * seconds_to_wait;
+    const int sleep_one_ms = 100;
+    int sleep_current_ms = 0;
+    int current_connections = 0;
+    for (;;)
+    {
+        current_connections = 0;
+
+        for (auto & server : servers)
+        {
+            server.stop();
+            current_connections += server.currentConnections();
+        }
+
+        if (!current_connections)
+            break;
+
+        sleep_current_ms += sleep_one_ms;
+        if (sleep_current_ms < sleep_max_ms)
+            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
+        else
+            break;
+    }
+    return current_connections;
+}
+
+Poco::Net::SocketAddress makeSocketAddress(const std::string & host, UInt16 port, Poco::Logger * log)
+{
+    Poco::Net::SocketAddress socket_address;
+    try
+    {
+        socket_address = Poco::Net::SocketAddress(host, port);
+    }
+    catch (const Poco::Net::DNSException & e)
+    {
+        const auto code = e.code();
+        if (code == EAI_FAMILY
+#if defined(EAI_ADDRFAMILY)
+                    || code == EAI_ADDRFAMILY
+#endif
+           )
+        {
+            LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. "
+                "If it is an IPv6 address and your host has disabled IPv6, then consider to "
+                "specify IPv4 address to listen in <listen_host> element of configuration "
+                "file. Example: <listen_host>0.0.0.0</listen_host>",
+                host, e.code(), e.message());
+        }
+
+        throw;
+    }
+    return socket_address;
+}
+
+[[noreturn]] void forceShutdown()
+{
+#if defined(THREAD_SANITIZER) && defined(OS_LINUX)
+    /// Thread sanitizer tries to do something on exit that we don't need if we want to exit immediately,
+    /// while connection handling threads are still run.
+    (void)syscall(SYS_exit_group, 0);
+    __builtin_unreachable();
+#else
+    _exit(0);
+#endif
+}
+
+std::string getUserName(uid_t user_id)
+{
+    /// Try to convert user id into user name.
+    auto buffer_size = sysconf(_SC_GETPW_R_SIZE_MAX);
+    if (buffer_size <= 0)
+        buffer_size = 1024;
+    std::string buffer;
+    buffer.reserve(buffer_size);
+
+    struct passwd passwd_entry;
+    struct passwd * result = nullptr;
+    const auto error = getpwuid_r(user_id, &passwd_entry, buffer.data(), buffer_size, &result);
+
+    if (error)
+        throwFromErrno("Failed to find user name for " + toString(user_id), ErrorCodes::FAILED_TO_GETPWUID, error);
+    else if (result)
+        return result->pw_name;
+    return toString(user_id);
+}
+
+}
+
+Poco::Net::SocketAddress Keeper::socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, [[maybe_unused]] bool secure) const
+{
+    auto address = makeSocketAddress(host, port, &logger());
+#if !defined(POCO_CLICKHOUSE_PATCH) || POCO_VERSION < 0x01090100
+    if (secure)
+        /// Bug in old (<1.9.1) poco, listen() after bind() with reusePort param will fail because have no implementation in SecureServerSocketImpl
+        /// https://github.com/pocoproject/poco/pull/2257
+        socket.bind(address, /* reuseAddress = */ true);
+    else
+#endif
+#if POCO_VERSION < 0x01080000
+    socket.bind(address, /* reuseAddress = */ true);
+#else
+    socket.bind(address, /* reuseAddress = */ true, /* reusePort = */ config().getBool("listen_reuse_port", false));
+#endif
+
+    socket.listen(/* backlog = */ config().getUInt("listen_backlog", 64));
+
+    return address;
+}
+
+void Keeper::createServer(const std::string & listen_host, const char * port_name, bool listen_try, CreateServerFunc && func) const
+{
+    /// For testing purposes, user may omit tcp_port or http_port or https_port in configuration file.
+    if (!config().has(port_name))
+        return;
+
+    auto port = config().getInt(port_name);
+    try
+    {
+        func(port);
+    }
+    catch (const Poco::Exception &)
+    {
+        std::string message = "Listen [" + listen_host + "]:" + std::to_string(port) + " failed: " + getCurrentExceptionMessage(false);
+
+        if (listen_try)
+        {
+            LOG_WARNING(&logger(), "{}. If it is an IPv6 or IPv4 address and your host has disabled IPv6 or IPv4, then consider to "
+                "specify not disabled IPv4 or IPv6 address to listen in <listen_host> element of configuration "
+                "file. Example for disabled IPv6: <listen_host>0.0.0.0</listen_host> ."
+                " Example for disabled IPv4: <listen_host>::</listen_host>",
+                message);
+        }
+        else
+        {
+            throw Exception{message, ErrorCodes::NETWORK_ERROR};
+        }
+    }
+}
+
+void Keeper::uninitialize()
+{
+    logger().information("shutting down");
+    BaseDaemon::uninitialize();
+}
+
+int Keeper::run()
+{
+    if (config().hasOption("help"))
+    {
+        Poco::Util::HelpFormatter help_formatter(Keeper::options());
+        auto header_str = fmt::format("{} [OPTION] [-- [ARG]...]\n"
+                                      "positional arguments can be used to rewrite config.xml properties, for example, --http_port=8010",
+                                      commandName());
+        help_formatter.setHeader(header_str);
+        help_formatter.format(std::cout);
+        return 0;
+    }
+    if (config().hasOption("version"))
+    {
+        std::cout << DBMS_NAME << " keeper version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
+        return 0;
+    }
+
+    return Application::run(); // NOLINT
+}
+
+void Keeper::initialize(Poco::Util::Application & self)
+{
+    BaseDaemon::initialize(self);
+    logger().information("starting up");
+
+    LOG_INFO(&logger(), "OS Name = {}, OS Version = {}, OS Architecture = {}",
+        Poco::Environment::osName(),
+        Poco::Environment::osVersion(),
+        Poco::Environment::osArchitecture());
+}
+
+std::string Keeper::getDefaultConfigFileName() const
+{
+    return "keeper_config.xml";
+}
+
+void Keeper::defineOptions(Poco::Util::OptionSet & options)
+{
+    options.addOption(
+        Poco::Util::Option("help", "h", "show help and exit")
+            .required(false)
+            .repeatable(false)
+            .binding("help"));
+    options.addOption(
+        Poco::Util::Option("version", "V", "show version and exit")
+            .required(false)
+            .repeatable(false)
+            .binding("version"));
+    BaseDaemon::defineOptions(options);
+}
+
+int Keeper::main(const std::vector<std::string> & /*args*/)
+{
+    Poco::Logger * log = &logger();
+
+    UseSSL use_ssl;
+
+    MainThreadStatus::getInstance();
+
+#if !defined(NDEBUG) || !defined(__OPTIMIZE__)
+    LOG_WARNING(log, "Keeper was built in debug mode. It will work slowly.");
+#endif
+
+#if defined(SANITIZER)
+    LOG_WARNING(log, "Keeper was built with sanitizer. It will work slowly.");
+#endif
+
+    auto shared_context = Context::createShared();
+    global_context = Context::createGlobal(shared_context.get());
+
+    global_context->makeGlobalContext();
+    global_context->setApplicationType(Context::ApplicationType::KEEPER);
+
+    if (!config().has("keeper_server"))
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Keeper configuration (<keeper_server> section) not found in config");
+
+
+    std::string path;
+
+    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");
+    else if (config().has("keeper_server.snapshot_storage_path"))
+        path = config().getString("keeper_server.snapshot_storage_path");
+    else
+        path = std::filesystem::path{KEEPER_DEFAULT_PATH};
+
+
+    /// 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)
+    {
+        const auto effective_user = getUserName(effective_user_id);
+        const auto data_owner = getUserName(statbuf.st_uid);
+        std::string message = "Effective user of the process (" + effective_user +
+            ") does not match the owner of the data (" + data_owner + ").";
+        if (effective_user_id == 0)
+        {
+            message += " Run under 'sudo -u " + data_owner + "'.";
+            throw Exception(message, ErrorCodes::MISMATCHING_USERS_FOR_PROCESS_AND_DATA);
+        }
+        else
+        {
+            LOG_WARNING(log, message);
+        }
+    }
+
+    const Settings & settings = global_context->getSettingsRef();
+
+    GlobalThreadPool::initialize(config().getUInt("max_thread_pool_size", 100));
+
+    static ServerErrorHandler error_handler;
+    Poco::ErrorHandler::set(&error_handler);
+
+    /// Initialize DateLUT early, to not interfere with running time of first query.
+    LOG_DEBUG(log, "Initializing DateLUT.");
+    DateLUT::instance();
+    LOG_TRACE(log, "Initialized DateLUT with time zone '{}'.", DateLUT::instance().getTimeZone());
+
+    /// Don't want to use DNS cache
+    DNSResolver::instance().setDisableCacheFlag();
+
+    Poco::ThreadPool server_pool(3, config().getUInt("max_connections", 1024));
+
+    std::vector<std::string> listen_hosts = DB::getMultipleValuesFromConfig(config(), "", "listen_host");
+
+    bool listen_try = config().getBool("listen_try", false);
+    if (listen_hosts.empty())
+    {
+        listen_hosts.emplace_back("::1");
+        listen_hosts.emplace_back("127.0.0.1");
+        listen_try = true;
+    }
+
+    auto servers = std::make_shared<std::vector<ProtocolServerAdapter>>();
+
+    /// Initialize test keeper RAFT. Do nothing if no nu_keeper_server in config.
+    global_context->initializeKeeperStorageDispatcher();
+    for (const auto & listen_host : listen_hosts)
+    {
+        /// TCP Keeper
+        const char * port_name = "keeper_server.tcp_port";
+        createServer(listen_host, port_name, listen_try, [&](UInt16 port)
+        {
+            Poco::Net::ServerSocket socket;
+            auto address = socketBindListen(socket, listen_host, port);
+            socket.setReceiveTimeout(settings.receive_timeout);
+            socket.setSendTimeout(settings.send_timeout);
+            servers->emplace_back(
+                port_name,
+                std::make_unique<Poco::Net::TCPServer>(
+                    new KeeperTCPHandlerFactory(*this, false), server_pool, socket, new Poco::Net::TCPServerParams));
+
+            LOG_INFO(log, "Listening for connections to Keeper (tcp): {}", address.toString());
+        });
+
+        const char * secure_port_name = "keeper_server.tcp_port_secure";
+        createServer(listen_host, secure_port_name, listen_try, [&](UInt16 port)
+        {
+#if USE_SSL
+            Poco::Net::SecureServerSocket socket;
+            auto address = socketBindListen(socket, listen_host, port, /* secure = */ true);
+            socket.setReceiveTimeout(settings.receive_timeout);
+            socket.setSendTimeout(settings.send_timeout);
+            servers->emplace_back(
+                secure_port_name,
+                std::make_unique<Poco::Net::TCPServer>(
+                    new KeeperTCPHandlerFactory(*this, true), server_pool, socket, new Poco::Net::TCPServerParams));
+            LOG_INFO(log, "Listening for connections to Keeper with secure protocol (tcp_secure): {}", address.toString());
+#else
+            UNUSED(port);
+            throw Exception{"SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.",
+                ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
+        });
+    }
+
+    for (auto & server : *servers)
+        server.start();
+
+    SCOPE_EXIT({
+        LOG_INFO(log, "Shutting down.");
+
+        global_context->shutdown();
+
+        LOG_DEBUG(log, "Waiting for current connections to Keeper to finish.");
+        int current_connections = 0;
+        for (auto & server : *servers)
+        {
+            server.stop();
+            current_connections += server.currentConnections();
+        }
+
+        if (current_connections)
+            LOG_INFO(log, "Closed all listening sockets. Waiting for {} outstanding connections.", current_connections);
+        else
+            LOG_INFO(log, "Closed all listening sockets.");
+
+        if (current_connections > 0)
+            current_connections = waitServersToFinish(*servers, config().getInt("shutdown_wait_unfinished", 5));
+
+        if (current_connections)
+            LOG_INFO(log, "Closed connections to Keeper. But {} remain. Probably some users cannot finish their connections after context shutdown.", current_connections);
+        else
+            LOG_INFO(log, "Closed connections to Keeper.");
+
+        global_context->shutdownKeeperStorageDispatcher();
+
+        /// Wait server pool to avoid use-after-free of destroyed context in the handlers
+        server_pool.joinAll();
+
+        /** Explicitly destroy Context. It is more convenient than in destructor of Server, because logger is still available.
+          * At this moment, no one could own shared part of Context.
+          */
+        global_context.reset();
+        shared_context.reset();
+
+        LOG_DEBUG(log, "Destroyed global context.");
+
+        if (current_connections)
+        {
+            LOG_INFO(log, "Will shutdown forcefully.");
+            forceShutdown();
+        }
+    });
+
+
+    buildLoggers(config(), logger());
+
+    LOG_INFO(log, "Ready for connections.");
+
+    waitForTerminationRequest();
+
+    return Application::EXIT_OK;
+}
+
+
+void Keeper::logRevision() const
+{
+    Poco::Logger::root().information("Starting ClickHouse Keeper " + std::string{VERSION_STRING}
+        + " with revision " + std::to_string(ClickHouseRevision::getVersionRevision())
+        + ", " + build_id_info
+        + ", PID " + std::to_string(getpid()));
+}
+
+
+}
diff --git a/programs/keeper/Keeper.h b/programs/keeper/Keeper.h
new file mode 100644
index 00000000000..f5b97dacf7d
--- /dev/null
+++ b/programs/keeper/Keeper.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <Server/IServer.h>
+#include <daemon/BaseDaemon.h>
+
+namespace Poco
+{
+    namespace Net
+    {
+        class ServerSocket;
+    }
+}
+
+namespace DB
+{
+
+/// standalone clickhouse-keeper server (replacement for ZooKeeper). Uses the same
+/// config as clickhouse-server. Serves requests on TCP ports with or without
+/// SSL using ZooKeeper protocol.
+class Keeper : public BaseDaemon, public IServer
+{
+public:
+    using ServerApplication::run;
+
+    Poco::Util::LayeredConfiguration & config() const override
+    {
+        return BaseDaemon::config();
+    }
+
+    Poco::Logger & logger() const override
+    {
+        return BaseDaemon::logger();
+    }
+
+    ContextMutablePtr context() const override
+    {
+        return global_context;
+    }
+
+    bool isCancelled() const override
+    {
+        return BaseDaemon::isCancelled();
+    }
+
+    void defineOptions(Poco::Util::OptionSet & _options) override;
+
+protected:
+    void logRevision() const override;
+
+    int run() override;
+
+    void initialize(Application & self) override;
+
+    void uninitialize() override;
+
+    int main(const std::vector<std::string> & args) override;
+
+    std::string getDefaultConfigFileName() const override;
+
+private:
+    ContextMutablePtr global_context;
+
+    Poco::Net::SocketAddress socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, [[maybe_unused]] bool secure = false) const;
+
+    using CreateServerFunc = std::function<void(UInt16)>;
+    void createServer(const std::string & listen_host, const char * port_name, bool listen_try, CreateServerFunc && func) const;
+};
+
+}
diff --git a/programs/keeper/clickhouse-keeper.cpp b/programs/keeper/clickhouse-keeper.cpp
new file mode 100644
index 00000000000..baa673f79ee
--- /dev/null
+++ b/programs/keeper/clickhouse-keeper.cpp
@@ -0,0 +1,6 @@
+int mainEntryClickHouseKeeper(int argc, char ** argv);
+
+int main(int argc_, char ** argv_)
+{
+    return mainEntryClickHouseKeeper(argc_, argv_);
+}
diff --git a/programs/keeper/keeper_config.xml b/programs/keeper/keeper_config.xml
new file mode 100644
index 00000000000..ef218c9f2d7
--- /dev/null
+++ b/programs/keeper/keeper_config.xml
@@ -0,0 +1,81 @@
+<yandex>
+    <logger>
+        <!-- Possible levels [1]:
+
+          - none (turns off logging)
+          - fatal
+          - critical
+          - error
+          - warning
+          - notice
+          - information
+          - debug
+          - trace
+
+            [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
+        -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+        <!-- Rotation policy
+             See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
+          -->
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+
+    <max_connections>4096</max_connections>
+
+    <keeper_server>
+            <tcp_port>9181</tcp_port>
+
+            <!-- Must be unique among all keeper serves -->
+            <server_id>1</server_id>
+
+            <log_storage_path>/var/lib/clickhouse/coordination/logs</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>information</raft_logs_level>
+                <!-- All settings listed in https://github.com/ClickHouse/ClickHouse/blob/master/src/Coordination/CoordinationSettings.h -->
+            </coordination_settings>
+
+            <raft_configuration>
+                <server>
+                    <id>1</id>
+
+                    <!-- Internal port and hostname -->
+                    <hostname>localhost</hostname>
+                    <port>44444</port>
+                </server>
+
+                <!-- Add more servers here -->
+
+            </raft_configuration>
+    </keeper_server>
+
+
+    <openSSL>
+      <server>
+            <!-- Used for secure tcp port -->
+            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
+            <certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
+            <!-- dhparams are optional. You can delete the <dhParamsFile> element.
+                 To generate dhparams, use the following command:
+                  openssl dhparam -out /etc/clickhouse-keeper/dhparam.pem 4096
+                 Only file format with BEGIN DH PARAMETERS is supported.
+              -->
+            <dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+    </openSSL>
+
+</yandex>
diff --git a/programs/keeper/keeper_embedded.xml b/programs/keeper/keeper_embedded.xml
new file mode 100644
index 00000000000..37edaedba80
--- /dev/null
+++ b/programs/keeper/keeper_embedded.xml
@@ -0,0 +1,21 @@
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>./keeper_log</log_storage_path>
+        <snapshot_storage_path>./keeper_snapshot</snapshot_storage_path>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/programs/library-bridge/CMakeLists.txt b/programs/library-bridge/CMakeLists.txt
new file mode 100644
index 00000000000..0913c6e4a9a
--- /dev/null
+++ b/programs/library-bridge/CMakeLists.txt
@@ -0,0 +1,25 @@
+set (CLICKHOUSE_LIBRARY_BRIDGE_SOURCES
+    library-bridge.cpp
+    LibraryInterface.cpp
+    LibraryBridge.cpp
+    Handlers.cpp
+    HandlerFactory.cpp
+    SharedLibraryHandler.cpp
+    SharedLibraryHandlerFactory.cpp
+)
+
+if (OS_LINUX)
+    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic")
+endif ()
+
+add_executable(clickhouse-library-bridge ${CLICKHOUSE_LIBRARY_BRIDGE_SOURCES})
+
+target_link_libraries(clickhouse-library-bridge PRIVATE
+    daemon
+    dbms
+    bridge
+)
+
+set_target_properties(clickhouse-library-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+
+install(TARGETS clickhouse-library-bridge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
diff --git a/programs/library-bridge/HandlerFactory.cpp b/programs/library-bridge/HandlerFactory.cpp
new file mode 100644
index 00000000000..9f53a24156f
--- /dev/null
+++ b/programs/library-bridge/HandlerFactory.cpp
@@ -0,0 +1,23 @@
+#include "HandlerFactory.h"
+
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Server/HTTP/HTMLForm.h>
+#include "Handlers.h"
+
+
+namespace DB
+{
+    std::unique_ptr<HTTPRequestHandler> LibraryBridgeHandlerFactory::createRequestHandler(const HTTPServerRequest & request)
+    {
+        Poco::URI uri{request.getURI()};
+        LOG_DEBUG(log, "Request URI: {}", uri.toString());
+
+        if (uri == "/ping" && request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            return std::make_unique<PingHandler>(keep_alive_timeout);
+
+        if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+            return std::make_unique<LibraryRequestHandler>(keep_alive_timeout, getContext());
+
+        return nullptr;
+    }
+}
diff --git a/programs/library-bridge/HandlerFactory.h b/programs/library-bridge/HandlerFactory.h
new file mode 100644
index 00000000000..93f0721bf01
--- /dev/null
+++ b/programs/library-bridge/HandlerFactory.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandlerFactory.h>
+#include <common/logger_useful.h>
+
+
+namespace DB
+{
+
+class SharedLibraryHandler;
+using SharedLibraryHandlerPtr = std::shared_ptr<SharedLibraryHandler>;
+
+/// Factory for '/ping', '/' handlers.
+class LibraryBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
+{
+public:
+    LibraryBridgeHandlerFactory(
+            const std::string & name_,
+            size_t keep_alive_timeout_,
+            ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get(name_))
+        , name(name_)
+        , keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
+
+    std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
+
+private:
+    Poco::Logger * log;
+    std::string name;
+    size_t keep_alive_timeout;
+};
+
+}
diff --git a/programs/library-bridge/Handlers.cpp b/programs/library-bridge/Handlers.cpp
new file mode 100644
index 00000000000..6a1bfbbccb7
--- /dev/null
+++ b/programs/library-bridge/Handlers.cpp
@@ -0,0 +1,288 @@
+#include "Handlers.h"
+#include "SharedLibraryHandlerFactory.h"
+
+#include <DataStreams/copyData.h>
+#include <Formats/FormatFactory.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <Poco/Net/HTMLForm.h>
+#include <Poco/ThreadPool.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Server/HTTP/HTMLForm.h>
+#include <IO/ReadBufferFromString.h>
+
+
+namespace DB
+{
+namespace
+{
+    std::shared_ptr<Block> parseColumns(std::string && column_string)
+    {
+        auto sample_block = std::make_shared<Block>();
+        auto names_and_types = NamesAndTypesList::parse(column_string);
+
+        for (const NameAndTypePair & column_data : names_and_types)
+            sample_block->insert({column_data.type, column_data.name});
+
+        return sample_block;
+    }
+
+    std::vector<uint64_t> parseIdsFromBinary(const std::string & ids_string)
+    {
+        ReadBufferFromString buf(ids_string);
+        std::vector<uint64_t> ids;
+        readVectorBinary(ids, buf);
+        return ids;
+    }
+
+    std::vector<std::string> parseNamesFromBinary(const std::string & names_string)
+    {
+        ReadBufferFromString buf(names_string);
+        std::vector<std::string> names;
+        readVectorBinary(names, buf);
+        return names;
+    }
+}
+
+
+void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
+{
+    LOG_TRACE(log, "Request URI: {}", request.getURI());
+    HTMLForm params(request);
+
+    if (!params.has("method"))
+    {
+        processError(response, "No 'method' in request URL");
+        return;
+    }
+
+    if (!params.has("dictionary_id"))
+    {
+        processError(response, "No 'dictionary_id in request URL");
+        return;
+    }
+
+    std::string method = params.get("method");
+    std::string dictionary_id = params.get("dictionary_id");
+    LOG_TRACE(log, "Library method: '{}', dictionary id: {}", method, dictionary_id);
+
+    WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
+
+    try
+    {
+        if (method == "libNew")
+        {
+            auto & read_buf = request.getStream();
+            params.read(read_buf);
+
+            if (!params.has("library_path"))
+            {
+                processError(response, "No 'library_path' in request URL");
+                return;
+            }
+
+            if (!params.has("library_settings"))
+            {
+                processError(response, "No 'library_settings' in request URL");
+                return;
+            }
+
+            std::string library_path = params.get("library_path");
+            const auto & settings_string = params.get("library_settings");
+            std::vector<std::string> library_settings = parseNamesFromBinary(settings_string);
+
+            /// Needed for library dictionary
+            if (!params.has("attributes_names"))
+            {
+                processError(response, "No 'attributes_names' in request URL");
+                return;
+            }
+
+            const auto & attributes_string = params.get("attributes_names");
+            std::vector<std::string> attributes_names = parseNamesFromBinary(attributes_string);
+
+            /// Needed to parse block from binary string format
+            if (!params.has("sample_block"))
+            {
+                processError(response, "No 'sample_block' in request URL");
+                return;
+            }
+            std::string sample_block_string = params.get("sample_block");
+
+            std::shared_ptr<Block> sample_block;
+            try
+            {
+                sample_block = parseColumns(std::move(sample_block_string));
+            }
+            catch (const Exception & ex)
+            {
+                processError(response, "Invalid 'sample_block' parameter in request body '" + ex.message() + "'");
+                LOG_WARNING(log, ex.getStackTraceString());
+                return;
+            }
+
+            if (!params.has("null_values"))
+            {
+                processError(response, "No 'null_values' in request URL");
+                return;
+            }
+
+            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();
+
+            LOG_DEBUG(log, "Dictionary sample block with null values: {}", sample_block_with_nulls.dumpStructure());
+
+            SharedLibraryHandlerFactory::instance().create(dictionary_id, library_path, library_settings, sample_block_with_nulls, attributes_names);
+            writeStringBinary("1", out);
+        }
+        else if (method == "libClone")
+        {
+            if (!params.has("from_dictionary_id"))
+            {
+                processError(response, "No 'from_dictionary_id' in request URL");
+                return;
+            }
+
+            std::string from_dictionary_id = params.get("from_dictionary_id");
+            LOG_TRACE(log, "Calling libClone from {} to {}", from_dictionary_id, dictionary_id);
+            SharedLibraryHandlerFactory::instance().clone(from_dictionary_id, dictionary_id);
+            writeStringBinary("1", out);
+        }
+        else if (method == "libDelete")
+        {
+            SharedLibraryHandlerFactory::instance().remove(dictionary_id);
+            writeStringBinary("1", out);
+        }
+        else if (method == "isModified")
+        {
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            bool res = library_handler->isModified();
+            writeStringBinary(std::to_string(res), out);
+        }
+        else if (method == "supportsSelectiveLoad")
+        {
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            bool res = library_handler->supportsSelectiveLoad();
+            writeStringBinary(std::to_string(res), out);
+        }
+        else if (method == "loadAll")
+        {
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            const auto & sample_block = library_handler->getSampleBlock();
+            auto input = library_handler->loadAll();
+
+            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
+            copyData(*input, *output);
+        }
+        else if (method == "loadIds")
+        {
+            params.read(request.getStream());
+
+            if (!params.has("ids"))
+            {
+                processError(response, "No 'ids' in request URL");
+                return;
+            }
+
+            std::vector<uint64_t> ids = parseIdsFromBinary(params.get("ids"));
+            auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            const auto & sample_block = library_handler->getSampleBlock();
+            auto input = library_handler->loadIds(ids);
+            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
+            copyData(*input, *output);
+        }
+        else if (method == "loadKeys")
+        {
+            if (!params.has("requested_block_sample"))
+            {
+                processError(response, "No 'requested_block_sample' in request URL");
+                return;
+            }
+
+            std::string requested_block_string = params.get("requested_block_sample");
+
+            std::shared_ptr<Block> requested_sample_block;
+            try
+            {
+                requested_sample_block = parseColumns(std::move(requested_block_string));
+            }
+            catch (const Exception & ex)
+            {
+                processError(response, "Invalid 'requested_block' parameter in request body '" + ex.message() + "'");
+                LOG_WARNING(log, ex.getStackTraceString());
+                return;
+            }
+
+            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 library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
+            const auto & sample_block = library_handler->getSampleBlock();
+            auto input = library_handler->loadKeys(block.getColumns());
+            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
+            copyData(*input, *output);
+        }
+    }
+    catch (...)
+    {
+        auto message = getCurrentExceptionMessage(true);
+        response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR, message); // can't call process_error, because of too soon response sending
+
+        try
+        {
+            writeStringBinary(message, out);
+            out.finalize();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log);
+        }
+
+        tryLogCurrentException(log);
+    }
+
+    try
+    {
+        out.finalize();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+    }
+}
+
+
+void LibraryRequestHandler::processError(HTTPServerResponse & response, const std::string & message)
+{
+    response.setStatusAndReason(HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
+
+    if (!response.sent())
+        *response.send() << message << std::endl;
+
+    LOG_WARNING(log, message);
+}
+
+
+void PingHandler::handleRequest(HTTPServerRequest & /* request */, HTTPServerResponse & response)
+{
+    try
+    {
+        setResponseDefaultHeaders(response, keep_alive_timeout);
+        const char * data = "Ok.\n";
+        response.sendBuffer(data, strlen(data));
+    }
+    catch (...)
+    {
+        tryLogCurrentException("PingHandler");
+    }
+}
+
+
+}
diff --git a/programs/library-bridge/Handlers.h b/programs/library-bridge/Handlers.h
new file mode 100644
index 00000000000..dac61d3a735
--- /dev/null
+++ b/programs/library-bridge/Handlers.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandler.h>
+#include <common/logger_useful.h>
+#include "SharedLibraryHandler.h"
+
+
+namespace DB
+{
+
+
+/// Handler for requests to Library Dictionary Source, returns response in RowBinary format.
+/// When a library dictionary source is created, it sends libNew request to library bridge (which is started on first
+/// request to it, if it was not yet started). On this request a new sharedLibrayHandler is added to a
+/// sharedLibraryHandlerFactory by a dictionary uuid. With libNew request come: library_path, library_settings,
+/// names of dictionary attributes, sample block to parse block of null values, block of null values. Everything is
+/// passed in binary format and is urlencoded. When dictionary is cloned, a new handler is created.
+/// Each handler is unique to dictionary.
+class LibraryRequestHandler : public HTTPRequestHandler, WithContext
+{
+public:
+
+    LibraryRequestHandler(
+        size_t keep_alive_timeout_,
+        ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("LibraryRequestHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
+
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
+
+private:
+    static constexpr inline auto FORMAT = "RowBinary";
+
+    void processError(HTTPServerResponse & response, const std::string & message);
+
+    Poco::Logger * log;
+    size_t keep_alive_timeout;
+};
+
+
+class PingHandler : public HTTPRequestHandler
+{
+public:
+    explicit PingHandler(size_t keep_alive_timeout_)
+        : keep_alive_timeout(keep_alive_timeout_)
+    {
+    }
+
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
+
+private:
+    const size_t keep_alive_timeout;
+};
+
+}
diff --git a/programs/library-bridge/LibraryBridge.cpp b/programs/library-bridge/LibraryBridge.cpp
new file mode 100644
index 00000000000..2e5d6041151
--- /dev/null
+++ b/programs/library-bridge/LibraryBridge.cpp
@@ -0,0 +1,17 @@
+#include "LibraryBridge.h"
+
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+int mainEntryClickHouseLibraryBridge(int argc, char ** argv)
+{
+    DB::LibraryBridge app;
+    try
+    {
+        return app.run(argc, argv);
+    }
+    catch (...)
+    {
+        std::cerr << DB::getCurrentExceptionMessage(true) << "\n";
+        auto code = DB::getCurrentExceptionCode();
+        return code ? code : 1;
+    }
+}
diff --git a/programs/library-bridge/LibraryBridge.h b/programs/library-bridge/LibraryBridge.h
new file mode 100644
index 00000000000..9f2dafb89ab
--- /dev/null
+++ b/programs/library-bridge/LibraryBridge.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <bridge/IBridge.h>
+#include "HandlerFactory.h"
+
+
+namespace DB
+{
+
+class LibraryBridge : public IBridge
+{
+
+protected:
+    std::string bridgeName() const override
+    {
+        return "LibraryBridge";
+    }
+
+    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override
+    {
+        return std::make_shared<LibraryBridgeHandlerFactory>("LibraryRequestHandlerFactory-factory", keep_alive_timeout, context);
+    }
+};
+
+}
diff --git a/src/Dictionaries/LibraryDictionarySourceExternal.cpp b/programs/library-bridge/LibraryInterface.cpp
similarity index 97%
rename from src/Dictionaries/LibraryDictionarySourceExternal.cpp
rename to programs/library-bridge/LibraryInterface.cpp
index 259d0a2846a..3975368c17f 100644
--- a/src/Dictionaries/LibraryDictionarySourceExternal.cpp
+++ b/programs/library-bridge/LibraryInterface.cpp
@@ -1,4 +1,5 @@
-#include "LibraryDictionarySourceExternal.h"
+#include "LibraryInterface.h"
+
 #include <common/logger_useful.h>
 
 namespace
diff --git a/src/Dictionaries/LibraryDictionarySourceExternal.h b/programs/library-bridge/LibraryInterface.h
similarity index 97%
rename from src/Dictionaries/LibraryDictionarySourceExternal.h
rename to programs/library-bridge/LibraryInterface.h
index 3b92707d091..d23de59bbb1 100644
--- a/src/Dictionaries/LibraryDictionarySourceExternal.h
+++ b/programs/library-bridge/LibraryInterface.h
@@ -101,7 +101,7 @@ using RequestedIds = const VectorUInt64 *;
 using LibraryLoadIdsFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedColumnsNames, RequestedIds);
 
 using RequestedKeys = Table *;
-/// There is no requested columns names for load keys func
+/// There are no requested column names for load keys func
 using LibraryLoadKeysFunc = RawClickHouseLibraryTable (*)(LibraryData, LibrarySettings, RequestedKeys);
 
 using LibraryIsModifiedFunc = bool (*)(LibraryContext, LibrarySettings);
diff --git a/programs/library-bridge/LibraryUtils.h b/programs/library-bridge/LibraryUtils.h
new file mode 100644
index 00000000000..8ced8df1c48
--- /dev/null
+++ b/programs/library-bridge/LibraryUtils.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <Common/StringUtils/StringUtils.h>
+#include <Core/Block.h>
+#include <ext/bit_cast.h>
+#include <ext/range.h>
+
+#include "LibraryInterface.h"
+
+
+namespace DB
+{
+
+class CStringsHolder
+{
+
+public:
+    using Container = std::vector<std::string>;
+
+    explicit CStringsHolder(const Container & strings_pass)
+    {
+        strings_holder = strings_pass;
+        strings.size = strings_holder.size();
+
+        ptr_holder = std::make_unique<ClickHouseLibrary::CString[]>(strings.size);
+        strings.data = ptr_holder.get();
+
+        size_t i = 0;
+        for (auto & str : strings_holder)
+        {
+            strings.data[i] = str.c_str();
+            ++i;
+        }
+    }
+
+    ClickHouseLibrary::CStrings strings; // will pass pointer to lib
+
+private:
+    std::unique_ptr<ClickHouseLibrary::CString[]> ptr_holder = nullptr;
+    Container strings_holder;
+};
+
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandler.cpp b/programs/library-bridge/SharedLibraryHandler.cpp
new file mode 100644
index 00000000000..ab8cf2417c2
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandler.cpp
@@ -0,0 +1,219 @@
+#include "SharedLibraryHandler.h"
+
+#include <ext/scope_guard.h>
+#include <IO/ReadHelpers.h>
+#include <common/find_symbols.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EXTERNAL_LIBRARY_ERROR;
+    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
+
+SharedLibraryHandler::SharedLibraryHandler(
+    const std::string & library_path_,
+    const std::vector<std::string> & library_settings,
+    const Block & sample_block_,
+    const std::vector<std::string> & attributes_names_)
+    : library_path(library_path_)
+    , sample_block(sample_block_)
+    , attributes_names(attributes_names_)
+{
+    library = std::make_shared<SharedLibrary>(library_path, RTLD_LAZY);
+    settings_holder = std::make_shared<CStringsHolder>(CStringsHolder(library_settings));
+
+    auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME);
+
+    if (lib_new)
+        lib_data = lib_new(&settings_holder->strings, ClickHouseLibrary::log);
+    else
+        throw Exception("Method libNew failed", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+}
+
+
+SharedLibraryHandler::SharedLibraryHandler(const SharedLibraryHandler & other)
+    : library_path{other.library_path}
+    , sample_block{other.sample_block}
+    , attributes_names{other.attributes_names}
+    , library{other.library}
+    , settings_holder{other.settings_holder}
+{
+
+    auto lib_clone = library->tryGet<ClickHouseLibrary::LibraryCloneFunc>(ClickHouseLibrary::LIBRARY_CLONE_FUNC_NAME);
+
+    if (lib_clone)
+    {
+        lib_data = lib_clone(other.lib_data);
+    }
+    else
+    {
+        auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME);
+
+        if (lib_new)
+            lib_data = lib_new(&settings_holder->strings, ClickHouseLibrary::log);
+    }
+}
+
+
+SharedLibraryHandler::~SharedLibraryHandler()
+{
+    auto lib_delete = library->tryGet<ClickHouseLibrary::LibraryDeleteFunc>(ClickHouseLibrary::LIBRARY_DELETE_FUNC_NAME);
+
+    if (lib_delete)
+        lib_delete(lib_data);
+}
+
+
+bool SharedLibraryHandler::isModified()
+{
+    auto func_is_modified = library->tryGet<ClickHouseLibrary::LibraryIsModifiedFunc>(ClickHouseLibrary::LIBRARY_IS_MODIFIED_FUNC_NAME);
+
+    if (func_is_modified)
+        return func_is_modified(lib_data, &settings_holder->strings);
+
+    return true;
+}
+
+
+bool SharedLibraryHandler::supportsSelectiveLoad()
+{
+    auto func_supports_selective_load = library->tryGet<ClickHouseLibrary::LibrarySupportsSelectiveLoadFunc>(ClickHouseLibrary::LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME);
+
+    if (func_supports_selective_load)
+        return func_supports_selective_load(lib_data, &settings_holder->strings);
+
+    return true;
+}
+
+
+BlockInputStreamPtr 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()};
+    for (size_t i = 0; i < attributes_names.size(); ++i)
+        columns.data[i] = attributes_names[i].c_str();
+
+    auto load_all_func = library->get<ClickHouseLibrary::LibraryLoadAllFunc>(ClickHouseLibrary::LIBRARY_LOAD_ALL_FUNC_NAME);
+    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
+    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);
+}
+
+
+BlockInputStreamPtr SharedLibraryHandler::loadIds(const std::vector<uint64_t> & ids)
+{
+    const ClickHouseLibrary::VectorUInt64 ids_data{ext::bit_cast<decltype(ClickHouseLibrary::VectorUInt64::data)>(ids.data()), ids.size()};
+
+    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(attributes_names.size());
+    ClickHouseLibrary::CStrings columns_pass{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()), attributes_names.size()};
+
+    auto load_ids_func = library->get<ClickHouseLibrary::LibraryLoadIdsFunc>(ClickHouseLibrary::LIBRARY_LOAD_IDS_FUNC_NAME);
+    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
+    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);
+}
+
+
+BlockInputStreamPtr 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;
+
+    for (size_t i = 0; i < key_columns.size(); ++i)
+    {
+        auto cell_holder = std::make_unique<ClickHouseLibrary::Field[]>(key_columns[i]->size());
+
+        for (size_t j = 0; j < key_columns[i]->size(); ++j)
+        {
+            auto data_ref = key_columns[i]->getDataAt(j);
+
+            cell_holder[j] = ClickHouseLibrary::Field{
+                    .data = static_cast<const void *>(data_ref.data),
+                    .size = data_ref.size};
+        }
+
+        holder[i] = ClickHouseLibrary::Row{
+                    .data = static_cast<ClickHouseLibrary::Field *>(cell_holder.get()),
+                    .size = key_columns[i]->size()};
+
+        column_data_holders.push_back(std::move(cell_holder));
+    }
+
+    ClickHouseLibrary::Table request_cols{
+            .data = static_cast<ClickHouseLibrary::Row *>(holder.get()),
+            .size = key_columns.size()};
+
+    auto load_keys_func = library->get<ClickHouseLibrary::LibraryLoadKeysFunc>(ClickHouseLibrary::LIBRARY_LOAD_KEYS_FUNC_NAME);
+    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
+    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
+
+    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
+    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);
+}
+
+
+Block SharedLibraryHandler::dataToBlock(const ClickHouseLibrary::RawClickHouseLibraryTable data)
+{
+    if (!data)
+        throw Exception("LibraryDictionarySource: No data returned", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+
+    const auto * columns_received = static_cast<const ClickHouseLibrary::Table *>(data);
+    if (columns_received->error_code)
+        throw Exception(
+            "LibraryDictionarySource: Returned error: " + std::to_string(columns_received->error_code) + " " + (columns_received->error_string ? columns_received->error_string : ""),
+            ErrorCodes::EXTERNAL_LIBRARY_ERROR);
+
+    MutableColumns columns = sample_block.cloneEmptyColumns();
+
+    for (size_t col_n = 0; col_n < columns_received->size; ++col_n)
+    {
+        if (columns.size() != columns_received->data[col_n].size)
+            throw Exception(
+                "LibraryDictionarySource: Returned unexpected number of columns: " + std::to_string(columns_received->data[col_n].size) + ", must be " + std::to_string(columns.size()),
+                ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
+
+        for (size_t row_n = 0; row_n < columns_received->data[col_n].size; ++row_n)
+        {
+            const auto & field = columns_received->data[col_n].data[row_n];
+            if (!field.data)
+            {
+                /// sample_block contains null_value (from config) inside corresponding column
+                const auto & col = sample_block.getByPosition(row_n);
+                columns[row_n]->insertFrom(*(col.column), 0);
+            }
+            else
+            {
+                const auto & size = field.size;
+                columns[row_n]->insertData(static_cast<const char *>(field.data), size);
+            }
+        }
+    }
+
+    return sample_block.cloneWithColumns(std::move(columns));
+}
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandler.h b/programs/library-bridge/SharedLibraryHandler.h
new file mode 100644
index 00000000000..fa476995e32
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandler.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <Common/SharedLibrary.h>
+#include <common/logger_useful.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include "LibraryUtils.h"
+
+
+namespace DB
+{
+
+/// A class that manages all operations with library dictionary.
+/// Every library dictionary source has its own object of this class, accessed by UUID.
+class SharedLibraryHandler
+{
+
+public:
+    SharedLibraryHandler(
+        const std::string & library_path_,
+        const std::vector<std::string> & library_settings,
+        const Block & sample_block_,
+        const std::vector<std::string> & attributes_names_);
+
+    SharedLibraryHandler(const SharedLibraryHandler & other);
+
+    SharedLibraryHandler & operator=(const SharedLibraryHandler & other) = delete;
+
+    ~SharedLibraryHandler();
+
+    BlockInputStreamPtr loadAll();
+
+    BlockInputStreamPtr loadIds(const std::vector<uint64_t> & ids);
+
+    BlockInputStreamPtr loadKeys(const Columns & key_columns);
+
+    bool isModified();
+
+    bool supportsSelectiveLoad();
+
+    const Block & getSampleBlock() { return sample_block; }
+
+private:
+    Block dataToBlock(const ClickHouseLibrary::RawClickHouseLibraryTable data);
+
+    std::string library_path;
+    const Block sample_block;
+    std::vector<std::string> attributes_names;
+
+    SharedLibraryPtr library;
+    std::shared_ptr<CStringsHolder> settings_holder;
+    void * lib_data;
+};
+
+using SharedLibraryHandlerPtr = std::shared_ptr<SharedLibraryHandler>;
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandlerFactory.cpp b/programs/library-bridge/SharedLibraryHandlerFactory.cpp
new file mode 100644
index 00000000000..05494c313c4
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandlerFactory.cpp
@@ -0,0 +1,67 @@
+#include "SharedLibraryHandlerFactory.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+SharedLibraryHandlerPtr SharedLibraryHandlerFactory::get(const std::string & dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    auto library_handler = library_handlers.find(dictionary_id);
+
+    if (library_handler != library_handlers.end())
+        return library_handler->second;
+
+    return nullptr;
+}
+
+
+void SharedLibraryHandlerFactory::create(
+    const std::string & dictionary_id,
+    const std::string & library_path,
+    const std::vector<std::string> & library_settings,
+    const Block & sample_block,
+    const std::vector<std::string> & attributes_names)
+{
+    std::lock_guard lock(mutex);
+    library_handlers[dictionary_id] = std::make_shared<SharedLibraryHandler>(library_path, library_settings, sample_block, attributes_names);
+}
+
+
+void SharedLibraryHandlerFactory::clone(const std::string & from_dictionary_id, const std::string & to_dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    auto from_library_handler = library_handlers.find(from_dictionary_id);
+
+    /// This is not supposed to happen as libClone is called from copy constructor of LibraryDictionarySource
+    /// object, and shared library handler of from_dictionary is removed only in its destructor.
+    /// And if for from_dictionary there was no shared library handler, it would have received and exception in
+    /// its constructor, so no libClone would be made from it.
+    if (from_library_handler == library_handlers.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No shared library handler found");
+
+    /// libClone method will be called in copy constructor
+    library_handlers[to_dictionary_id] = std::make_shared<SharedLibraryHandler>(*from_library_handler->second);
+}
+
+
+void SharedLibraryHandlerFactory::remove(const std::string & dictionary_id)
+{
+    std::lock_guard lock(mutex);
+    /// libDelete is called in destructor.
+    library_handlers.erase(dictionary_id);
+}
+
+
+SharedLibraryHandlerFactory & SharedLibraryHandlerFactory::instance()
+{
+    static SharedLibraryHandlerFactory ret;
+    return ret;
+}
+
+}
diff --git a/programs/library-bridge/SharedLibraryHandlerFactory.h b/programs/library-bridge/SharedLibraryHandlerFactory.h
new file mode 100644
index 00000000000..473d90618a2
--- /dev/null
+++ b/programs/library-bridge/SharedLibraryHandlerFactory.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "SharedLibraryHandler.h"
+#include <unordered_map>
+#include <mutex>
+
+
+namespace DB
+{
+
+/// Each library dictionary source has unique UUID. When clone() method is called, a new UUID is generated.
+/// There is a unique mapping from diciotnary UUID to sharedLibraryHandler.
+class SharedLibraryHandlerFactory final : private boost::noncopyable
+{
+public:
+    static SharedLibraryHandlerFactory & instance();
+
+    SharedLibraryHandlerPtr get(const std::string & dictionary_id);
+
+    void create(
+        const std::string & dictionary_id,
+        const std::string & library_path,
+        const std::vector<std::string> & library_settings,
+        const Block & sample_block,
+        const std::vector<std::string> & attributes_names);
+
+    void clone(const std::string & from_dictionary_id, const std::string & to_dictionary_id);
+
+    void remove(const std::string & dictionary_id);
+
+private:
+    /// map: dict_id -> sharedLibraryHandler
+    std::unordered_map<std::string, SharedLibraryHandlerPtr> library_handlers;
+    std::mutex mutex;
+};
+
+}
diff --git a/programs/library-bridge/library-bridge.cpp b/programs/library-bridge/library-bridge.cpp
new file mode 100644
index 00000000000..5fff2ffe525
--- /dev/null
+++ b/programs/library-bridge/library-bridge.cpp
@@ -0,0 +1,3 @@
+int mainEntryClickHouseLibraryBridge(int argc, char ** argv);
+int main(int argc_, char ** argv_) { return mainEntryClickHouseLibraryBridge(argc_, argv_); }
+
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 2909b838c84..f48e8d4d0a0 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -18,6 +18,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/ThreadStatus.h>
+#include <Common/UnicodeBar.h>
 #include <Common/config_version.h>
 #include <Common/quoteString.h>
 #include <IO/ReadBufferFromFile.h>
@@ -41,9 +42,9 @@
 #include <common/argsToConfig.h>
 #include <Common/TerminalSize.h>
 #include <Common/randomSeed.h>
-
 #include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -71,11 +72,11 @@ void LocalServer::initialize(Poco::Util::Application & self)
     Poco::Util::Application::initialize(self);
 
     /// Load config files if exists
-    if (config().has("config-file") || Poco::File("config.xml").exists())
+    if (config().has("config-file") || fs::exists("config.xml"))
     {
         const auto config_path = config().getString("config-file", "config.xml");
         ConfigProcessor config_processor(config_path, false, true);
-        config_processor.setConfigPath(Poco::Path(config_path).makeParent().toString());
+        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);
@@ -99,9 +100,9 @@ void LocalServer::initialize(Poco::Util::Application & self)
     }
 }
 
-void LocalServer::applyCmdSettings(Context & context)
+void LocalServer::applyCmdSettings(ContextMutablePtr context)
 {
-    context.applySettingsChanges(cmd_settings.changes());
+    context->applySettingsChanges(cmd_settings.changes());
 }
 
 /// If path is specified and not empty, will try to setup server environment and load existing metadata
@@ -176,7 +177,7 @@ void LocalServer::tryInitPath()
 }
 
 
-static void attachSystemTables(const Context & context)
+static void attachSystemTables(ContextPtr context)
 {
     DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(DatabaseCatalog::SYSTEM_DATABASE);
     if (!system_database)
@@ -211,7 +212,7 @@ try
     }
 
     shared_context = Context::createShared();
-    global_context = std::make_unique<Context>(Context::createGlobal(shared_context.get()));
+    global_context = Context::createGlobal(shared_context.get());
     global_context->makeGlobalContext();
     global_context->setApplicationType(Context::ApplicationType::LOCAL);
     tryInitPath();
@@ -274,9 +275,9 @@ try
       *  if such tables will not be dropped, clickhouse-server will not be able to load them due to security reasons.
       */
     std::string default_database = config().getString("default_database", "_local");
-    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, *global_context));
+    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, global_context));
     global_context->setCurrentDatabase(default_database);
-    applyCmdOptions(*global_context);
+    applyCmdOptions(global_context);
 
     if (config().has("path"))
     {
@@ -286,17 +287,17 @@ try
         status.emplace(path + "status", StatusFile::write_full_info);
 
         LOG_DEBUG(log, "Loading metadata from {}", path);
-        Poco::File(path + "data/").createDirectories();
-        Poco::File(path + "metadata/").createDirectories();
-        loadMetadataSystem(*global_context);
-        attachSystemTables(*global_context);
-        loadMetadata(*global_context);
+        fs::create_directories(fs::path(path) / "data/");
+        fs::create_directories(fs::path(path) / "metadata/");
+        loadMetadataSystem(global_context);
+        attachSystemTables(global_context);
+        loadMetadata(global_context);
         DatabaseCatalog::instance().loadDatabases();
         LOG_DEBUG(log, "Loaded metadata.");
     }
     else if (!config().has("no-system-tables"))
     {
-        attachSystemTables(*global_context);
+        attachSystemTables(global_context);
     }
 
     processQueries();
@@ -375,23 +376,46 @@ void LocalServer::processQueries()
 
     /// 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(*global_context);
+    auto context = Context::createCopy(global_context);
 
-    context.makeSessionContext();
-    context.makeQueryContext();
+    context->makeSessionContext();
+    context->makeQueryContext();
 
-    context.setUser("default", "", Poco::Net::SocketAddress{});
-    context.setCurrentQueryId("");
+    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
+    progress_bar.need_render_progress = config().getBool("progress", false);
+
+    if (progress_bar.need_render_progress)
+    {
+        context->setProgressCallback([&](const Progress & value)
+                                     {
+                                         if (!progress_bar.updateProgress(progress, value))
+                                         {
+                                             // Just a keep-alive update.
+                                              return;
+                                         }
+                                         progress_bar.writeProgress(progress, watch.elapsed());
+                                     });
+    }
+
     bool echo_queries = config().hasOption("echo") || config().hasOption("verbose");
     std::exception_ptr exception;
 
     for (const auto & query : queries)
     {
+        watch.restart();
+        progress.reset();
+        progress_bar.show_progress_bar = false;
+        progress_bar.written_progress_chars = 0;
+        progress_bar.written_first_block = false;
+
+
         ReadBufferFromString read_buf(query);
         WriteBufferFromFileDescriptor write_buf(STDOUT_FILENO);
 
@@ -455,7 +479,7 @@ void LocalServer::setupUsers()
 {
     ConfigurationPtr users_config;
 
-    if (config().has("users_config") || config().has("config-file") || Poco::File("config.xml").exists())
+    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);
@@ -548,6 +572,7 @@ void LocalServer::init(int argc, char ** argv)
         ("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")
         ;
 
     cmd_settings.addProgramOptions(description);
@@ -597,6 +622,8 @@ void LocalServer::init(int argc, char ** argv)
 
     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"))
@@ -618,9 +645,9 @@ void LocalServer::init(int argc, char ** argv)
     argsToConfig(arguments, config(), 100);
 }
 
-void LocalServer::applyCmdOptions(Context & context)
+void LocalServer::applyCmdOptions(ContextMutablePtr context)
 {
-    context.setDefaultFormat(config().getString("output-format", config().getString("format", "TSV")));
+    context->setDefaultFormat(config().getString("output-format", config().getString("format", "TSV")));
     applyCmdSettings(context);
 }
 
diff --git a/programs/local/LocalServer.h b/programs/local/LocalServer.h
index 02778bd86cb..cf8886d9652 100644
--- a/programs/local/LocalServer.h
+++ b/programs/local/LocalServer.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <Core/Settings.h>
-#include <Poco/Util/Application.h>
 #include <filesystem>
 #include <memory>
 #include <optional>
-#include <loggers/Loggers.h>
+#include <Core/Settings.h>
 #include <Interpreters/Context.h>
-
+#include <loggers/Loggers.h>
+#include <Poco/Util/Application.h>
+#include <Common/ProgressBar.h>
 
 namespace DB
 {
@@ -36,18 +36,22 @@ private:
     std::string getInitialCreateTableQuery();
 
     void tryInitPath();
-    void applyCmdOptions(Context & context);
-    void applyCmdSettings(Context & context);
+    void applyCmdOptions(ContextMutablePtr context);
+    void applyCmdSettings(ContextMutablePtr context);
     void processQueries();
     void setupUsers();
     void cleanup();
 
+
 protected:
     SharedContextHolder shared_context;
-    std::unique_ptr<Context> global_context;
+    ContextMutablePtr global_context;
 
     /// Settings specified via command line args
     Settings cmd_settings;
+    ProgressBar progress_bar;
+    Progress progress;
+    Stopwatch watch;
 
     std::optional<std::filesystem::path> temporary_directory_to_delete;
 };
diff --git a/programs/main.cpp b/programs/main.cpp
index cbb22b7a87b..ccdf4d50fb4 100644
--- a/programs/main.cpp
+++ b/programs/main.cpp
@@ -55,6 +55,9 @@ int mainEntryClickHouseObfuscator(int argc, char ** argv);
 #if ENABLE_CLICKHOUSE_GIT_IMPORT
 int mainEntryClickHouseGitImport(int argc, char ** argv);
 #endif
+#if ENABLE_CLICKHOUSE_KEEPER
+int mainEntryClickHouseKeeper(int argc, char ** argv);
+#endif
 #if ENABLE_CLICKHOUSE_INSTALL
 int mainEntryClickHouseInstall(int argc, char ** argv);
 int mainEntryClickHouseStart(int argc, char ** argv);
@@ -112,6 +115,9 @@ std::pair<const char *, MainFunc> clickhouse_applications[] =
 #if ENABLE_CLICKHOUSE_GIT_IMPORT
     {"git-import", mainEntryClickHouseGitImport},
 #endif
+#if ENABLE_CLICKHOUSE_KEEPER
+    {"keeper", mainEntryClickHouseKeeper},
+#endif
 #if ENABLE_CLICKHOUSE_INSTALL
     {"install", mainEntryClickHouseInstall},
     {"start", mainEntryClickHouseStart},
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index aea70ba0986..f68b255158c 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -365,16 +365,20 @@ static void transformFixedString(const UInt8 * src, UInt8 * dst, size_t size, UI
     }
 }
 
-static void transformUUID(const UInt128 & src, UInt128 & dst, UInt64 seed)
+static void transformUUID(const UUID & src_uuid, UUID & dst_uuid, UInt64 seed)
 {
+    const UInt128 & src = src_uuid.toUnderType();
+    UInt128 & dst = dst_uuid.toUnderType();
+
     SipHash hash;
     hash.update(seed);
-    hash.update(reinterpret_cast<const char *>(&src), sizeof(UInt128));
+    hash.update(reinterpret_cast<const char *>(&src), sizeof(UUID));
 
     /// Saving version and variant from an old UUID
     hash.get128(reinterpret_cast<char *>(&dst));
-    dst.high = (dst.high & 0x1fffffffffffffffull) | (src.high & 0xe000000000000000ull);
-    dst.low = (dst.low & 0xffffffffffff0fffull) | (src.low & 0x000000000000f000ull);
+
+    dst.items[1] = (dst.items[1] & 0x1fffffffffffffffull) | (src.items[1] & 0xe000000000000000ull);
+    dst.items[0] = (dst.items[0] & 0xffffffffffff0fffull) | (src.items[0] & 0x000000000000f000ull);
 }
 
 class FixedStringModel : public IModel
@@ -426,10 +430,10 @@ public:
 
     ColumnPtr generate(const IColumn & column) override
     {
-        const ColumnUInt128 & src_column = assert_cast<const ColumnUInt128 &>(column);
+        const ColumnUUID & src_column = assert_cast<const ColumnUUID &>(column);
         const auto & src_data = src_column.getData();
 
-        auto res_column = ColumnUInt128::create();
+        auto res_column = ColumnUUID::create();
         auto & res_data = res_column->getData();
 
         res_data.resize(src_data.size());
@@ -1129,8 +1133,8 @@ try
     }
 
     SharedContextHolder shared_context = Context::createShared();
-    Context context = Context::createGlobal(shared_context.get());
-    context.makeGlobalContext();
+    auto context = Context::createGlobal(shared_context.get());
+    context->makeGlobalContext();
 
     ReadBufferFromFileDescriptor file_in(STDIN_FILENO);
     WriteBufferFromFileDescriptor file_out(STDOUT_FILENO);
@@ -1152,7 +1156,7 @@ try
         if (!silent)
             std::cerr << "Training models\n";
 
-        BlockInputStreamPtr input = context.getInputFormat(input_format, file_in, header, max_block_size);
+        BlockInputStreamPtr input = context->getInputFormat(input_format, file_in, header, max_block_size);
 
         input->readPrefix();
         while (Block block = input->read())
@@ -1179,8 +1183,8 @@ try
 
         file_in.seek(0, SEEK_SET);
 
-        BlockInputStreamPtr input = context.getInputFormat(input_format, file_in, header, max_block_size);
-        BlockOutputStreamPtr output = context.getOutputStreamParallelIfPossible(output_format, file_out, header);
+        BlockInputStreamPtr input = context->getInputFormat(input_format, file_in, header, max_block_size);
+        BlockOutputStreamPtr output = context->getOutputStreamParallelIfPossible(output_format, file_out, header);
 
         if (processed_rows + source_rows > limit)
             input = std::make_shared<LimitBlockInputStream>(input, limit - processed_rows, 0);
diff --git a/programs/odbc-bridge/CMakeLists.txt b/programs/odbc-bridge/CMakeLists.txt
index 11864354619..7b232f2b5dc 100644
--- a/programs/odbc-bridge/CMakeLists.txt
+++ b/programs/odbc-bridge/CMakeLists.txt
@@ -24,12 +24,14 @@ add_executable(clickhouse-odbc-bridge ${CLICKHOUSE_ODBC_BRIDGE_SOURCES})
 target_link_libraries(clickhouse-odbc-bridge PRIVATE
     daemon
     dbms
+    bridge
     clickhouse_parsers
-    Poco::Data
-    Poco::Data::ODBC
+    nanodbc
+    unixodbc
 )
 
 set_target_properties(clickhouse-odbc-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
+target_compile_options (clickhouse-odbc-bridge PRIVATE -Wno-reserved-id-macro -Wno-keyword-macro)
 
 if (USE_GDB_ADD_INDEX)
     add_custom_command(TARGET clickhouse-odbc-bridge POST_BUILD COMMAND ${GDB_ADD_INDEX_EXE} ../clickhouse-odbc-bridge COMMENT "Adding .gdb-index to clickhouse-odbc-bridge" VERBATIM)
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 14fa734f246..f4f575bb33d 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -2,29 +2,36 @@
 
 #if USE_ODBC
 
-#    include <DataTypes/DataTypeFactory.h>
-#    include <DataTypes/DataTypeNullable.h>
-#    include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#    include <IO/WriteHelpers.h>
-#    include <Parsers/ParserQueryWithOutput.h>
-#    include <Parsers/parseQuery.h>
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-#    include <Server/HTTP/HTMLForm.h>
-#    include <Poco/Net/HTTPServerRequest.h>
-#    include <Poco/Net/HTTPServerResponse.h>
-#    include <Poco/NumberParser.h>
-#    include <common/logger_useful.h>
-#    include <Common/quoteString.h>
-#    include <ext/scope_guard.h>
-#    include "getIdentifierQuote.h"
-#    include "validateODBCConnectionString.h"
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/parseQuery.h>
+#include <Server/HTTP/HTMLForm.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <Poco/NumberParser.h>
+#include <common/logger_useful.h>
+#include <Common/quoteString.h>
+#include <ext/scope_guard.h>
+#include "getIdentifierQuote.h"
+#include "validateODBCConnectionString.h"
+#include "ODBCConnectionFactory.h"
+
+#include <sql.h>
+#include <sqlext.h>
 
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+}
+
 namespace
 {
     DataTypePtr getDataType(SQLSMALLINT type)
@@ -59,6 +66,7 @@ namespace
     }
 }
 
+
 void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     HTMLForm params(request, request.getStream());
@@ -77,88 +85,79 @@ void ODBCColumnsInfoHandler::handleRequest(HTTPServerRequest & request, HTTPServ
         process_error("No 'table' param in request URL");
         return;
     }
+
     if (!params.has("connection_string"))
     {
         process_error("No 'connection_string' in request URL");
         return;
     }
+
     std::string schema_name;
     std::string table_name = params.get("table");
     std::string connection_string = params.get("connection_string");
 
     if (params.has("schema"))
-    {
         schema_name = params.get("schema");
-        LOG_TRACE(log, "Will fetch info for table '{}'", schema_name + "." + table_name);
-    }
-    else
-        LOG_TRACE(log, "Will fetch info for table '{}'", table_name);
+
     LOG_TRACE(log, "Got connection str '{}'", connection_string);
 
     try
     {
         const bool external_table_functions_use_nulls = Poco::NumberParser::parseBool(params.get("external_table_functions_use_nulls", "false"));
 
-        POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-        SQLHDBC hdbc = session.dbc().handle();
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
 
-        SQLHSTMT hstmt = nullptr;
+        nanodbc::catalog catalog(connection->get());
+        std::string catalog_name;
 
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(SQLAllocStmt(hdbc, &hstmt)))
-            throw POCO_SQL_ODBC_CLASS::ODBCException("Could not allocate connection handle.");
-
-        SCOPE_EXIT(SQLFreeStmt(hstmt, SQL_DROP));
-
-        const auto & context_settings = context.getSettingsRef();
-
-        /// TODO Why not do SQLColumns instead?
-        std::string name = schema_name.empty() ? backQuoteIfNeed(table_name) : backQuoteIfNeed(schema_name) + "." + backQuoteIfNeed(table_name);
-        WriteBufferFromOwnString buf;
-        std::string input = "SELECT * FROM " + name + " WHERE 1 = 0";
-        ParserQueryWithOutput parser(input.data() + input.size());
-        ASTPtr select = parseQuery(parser, input.data(), input.data() + input.size(), "", context_settings.max_query_size, context_settings.max_parser_depth);
-
-        IAST::FormatSettings settings(buf, true);
-        settings.always_quote_identifiers = true;
-        settings.identifier_quoting_style = getQuotingStyle(hdbc);
-        select->format(settings);
-        std::string query = buf.str();
-
-        LOG_TRACE(log, "Inferring structure with query '{}'", query);
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(POCO_SQL_ODBC_CLASS::SQLPrepare(hstmt, reinterpret_cast<SQLCHAR *>(query.data()), query.size())))
-            throw POCO_SQL_ODBC_CLASS::DescriptorException(session.dbc());
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(SQLExecute(hstmt)))
-            throw POCO_SQL_ODBC_CLASS::StatementException(hstmt);
-
-        SQLSMALLINT cols = 0;
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(SQLNumResultCols(hstmt, &cols)))
-            throw POCO_SQL_ODBC_CLASS::StatementException(hstmt);
-
-        /// TODO cols not checked
-
-        NamesAndTypesList columns;
-        for (SQLSMALLINT ncol = 1; ncol <= cols; ++ncol)
+        /// In XDBC tables it is allowed to pass either database_name or schema_name in table definion, but not both of them.
+        /// They both are passed as 'schema' parameter in request URL, so it is not clear whether it is database_name or schema_name passed.
+        /// If it is schema_name then we know that database is added in odbc.ini. But if we have database_name as 'schema',
+        /// it is not guaranteed. For nanodbc database_name must be either in odbc.ini or passed as catalog_name.
+        auto get_columns = [&]()
         {
-            SQLSMALLINT type = 0;
-            /// TODO Why 301?
-            SQLCHAR column_name[301];
-
-            SQLSMALLINT is_nullable;
-            const auto result = POCO_SQL_ODBC_CLASS::SQLDescribeCol(hstmt, ncol, column_name, sizeof(column_name), nullptr, &type, nullptr, nullptr, &is_nullable);
-            if (POCO_SQL_ODBC_CLASS::Utility::isError(result))
-                throw POCO_SQL_ODBC_CLASS::StatementException(hstmt);
-
-            auto column_type = getDataType(type);
-            if (external_table_functions_use_nulls && is_nullable == SQL_NULLABLE)
+            nanodbc::catalog::tables tables = catalog.find_tables(table_name, /* type = */ "", /* schema = */ "", /* catalog = */ schema_name);
+            if (tables.next())
             {
-                column_type = std::make_shared<DataTypeNullable>(column_type);
+                catalog_name = tables.table_catalog();
+                LOG_TRACE(log, "Will fetch info for table '{}.{}'", catalog_name, table_name);
+                return catalog.find_columns(/* column = */ "", table_name, /* schema = */ "", catalog_name);
             }
 
-            columns.emplace_back(reinterpret_cast<char *>(column_name), std::move(column_type));
+            tables = catalog.find_tables(table_name, /* type = */ "", /* schema = */ schema_name);
+            if (tables.next())
+            {
+                catalog_name = tables.table_catalog();
+                LOG_TRACE(log, "Will fetch info for table '{}.{}.{}'", catalog_name, schema_name, table_name);
+                return catalog.find_columns(/* column = */ "", table_name, schema_name, catalog_name);
+            }
+
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table {} not found", schema_name.empty() ? table_name : schema_name + '.' + table_name);
+        };
+
+        nanodbc::catalog::columns columns_definition = get_columns();
+
+        NamesAndTypesList columns;
+        while (columns_definition.next())
+        {
+            SQLSMALLINT type = columns_definition.sql_data_type();
+            std::string column_name = columns_definition.column_name();
+
+            bool is_nullable = columns_definition.nullable() == SQL_NULLABLE;
+
+            auto column_type = getDataType(type);
+
+            if (external_table_functions_use_nulls && is_nullable == SQL_NULLABLE)
+                column_type = std::make_shared<DataTypeNullable>(column_type);
+
+            columns.emplace_back(column_name, std::move(column_type));
         }
 
+        if (columns.empty())
+            throw Exception("Columns definition was not returned", ErrorCodes::LOGICAL_ERROR);
+
         WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
         {
diff --git a/programs/odbc-bridge/ColumnInfoHandler.h b/programs/odbc-bridge/ColumnInfoHandler.h
index 9b5b470b31d..bc976f54aee 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.h
+++ b/programs/odbc-bridge/ColumnInfoHandler.h
@@ -2,24 +2,23 @@
 
 #if USE_ODBC
 
-#    include <Interpreters/Context.h>
-#    include <Server/HTTP/HTTPRequestHandler.h>
-#    include <Common/config.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/Context.h>
+#include <Server/HTTP/HTTPRequestHandler.h>
+#include <Common/config.h>
+#include <Poco/Logger.h>
 
-#    include <Poco/Logger.h>
 
-/** The structure of the table is taken from the query "SELECT * FROM table WHERE 1=0".
-  * TODO: It would be much better to utilize ODBC methods dedicated for columns description.
-  * If there is no such table, an exception is thrown.
-  */
 namespace DB
 {
 
-class ODBCColumnsInfoHandler : public HTTPRequestHandler
+class ODBCColumnsInfoHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    ODBCColumnsInfoHandler(size_t keep_alive_timeout_, Context & context_)
-        : log(&Poco::Logger::get("ODBCColumnsInfoHandler")), keep_alive_timeout(keep_alive_timeout_), context(context_)
+    ODBCColumnsInfoHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("ODBCColumnsInfoHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
     {
     }
 
@@ -28,7 +27,6 @@ public:
 private:
     Poco::Logger * log;
     size_t keep_alive_timeout;
-    Context & context;
 };
 
 }
diff --git a/programs/odbc-bridge/HandlerFactory.cpp b/programs/odbc-bridge/HandlerFactory.cpp
index 9ac48af4ace..49984453d33 100644
--- a/programs/odbc-bridge/HandlerFactory.cpp
+++ b/programs/odbc-bridge/HandlerFactory.cpp
@@ -8,7 +8,7 @@
 namespace DB
 {
 
-std::unique_ptr<HTTPRequestHandler> HandlerFactory::createRequestHandler(const HTTPServerRequest & request)
+std::unique_ptr<HTTPRequestHandler> ODBCBridgeHandlerFactory::createRequestHandler(const HTTPServerRequest & request)
 {
     Poco::URI uri{request.getURI()};
     LOG_TRACE(log, "Request URI: {}", uri.toString());
@@ -21,26 +21,26 @@ std::unique_ptr<HTTPRequestHandler> HandlerFactory::createRequestHandler(const H
 
         if (uri.getPath() == "/columns_info")
 #if USE_ODBC
-            return std::make_unique<ODBCColumnsInfoHandler>(keep_alive_timeout, context);
+            return std::make_unique<ODBCColumnsInfoHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/identifier_quote")
 #if USE_ODBC
-            return std::make_unique<IdentifierQuoteHandler>(keep_alive_timeout, context);
+            return std::make_unique<IdentifierQuoteHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/schema_allowed")
 #if USE_ODBC
-            return std::make_unique<SchemaAllowedHandler>(keep_alive_timeout, context);
+            return std::make_unique<SchemaAllowedHandler>(keep_alive_timeout, getContext());
 #else
             return nullptr;
 #endif
         else if (uri.getPath() == "/write")
-            return std::make_unique<ODBCHandler>(pool_map, keep_alive_timeout, context, "write");
+            return std::make_unique<ODBCHandler>(keep_alive_timeout, getContext(), "write");
         else
-            return std::make_unique<ODBCHandler>(pool_map, keep_alive_timeout, context, "read");
+            return std::make_unique<ODBCHandler>(keep_alive_timeout, getContext(), "read");
     }
     return nullptr;
 }
diff --git a/programs/odbc-bridge/HandlerFactory.h b/programs/odbc-bridge/HandlerFactory.h
index 5dce6f02ecd..ffbbe3670af 100644
--- a/programs/odbc-bridge/HandlerFactory.h
+++ b/programs/odbc-bridge/HandlerFactory.h
@@ -1,32 +1,28 @@
 #pragma once
 
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 #include <Server/HTTP/HTTPRequestHandlerFactory.h>
 #include "ColumnInfoHandler.h"
 #include "IdentifierQuoteHandler.h"
 #include "MainHandler.h"
 #include "SchemaAllowedHandler.h"
-
 #include <Poco/Logger.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <Poco/Data/SessionPool.h>
-#pragma GCC diagnostic pop
-
 
 namespace DB
 {
 /** Factory for '/ping', '/', '/columns_info', '/identifier_quote', '/schema_allowed' handlers.
   * Also stores Session pools for ODBC connections
   */
-class HandlerFactory : public HTTPRequestHandlerFactory
+class ODBCBridgeHandlerFactory : public HTTPRequestHandlerFactory, WithContext
 {
 public:
-    HandlerFactory(const std::string & name_, size_t keep_alive_timeout_, Context & context_)
-        : log(&Poco::Logger::get(name_)), name(name_), keep_alive_timeout(keep_alive_timeout_), context(context_)
+    ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get(name_))
+        , name(name_)
+        , keep_alive_timeout(keep_alive_timeout_)
     {
-        pool_map = std::make_shared<ODBCHandler::PoolMap>();
     }
 
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
@@ -35,7 +31,6 @@ private:
     Poco::Logger * log;
     std::string name;
     size_t keep_alive_timeout;
-    Context & context;
-    std::shared_ptr<ODBCHandler::PoolMap> pool_map;
 };
+
 }
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index 5060d37c479..124a5c420f8 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -2,23 +2,20 @@
 
 #if USE_ODBC
 
-#    include <DataTypes/DataTypeFactory.h>
-#    include <Server/HTTP/HTMLForm.h>
-#    include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#    include <IO/WriteHelpers.h>
-#    include <Parsers/ParserQueryWithOutput.h>
-#    include <Parsers/parseQuery.h>
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-#    include <Poco/Net/HTTPServerRequest.h>
-#    include <Poco/Net/HTTPServerResponse.h>
-#    include <common/logger_useful.h>
-#    include <ext/scope_guard.h>
-#    include "getIdentifierQuote.h"
-#    include "validateODBCConnectionString.h"
+#include <DataTypes/DataTypeFactory.h>
+#include <Server/HTTP/HTMLForm.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/parseQuery.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <common/logger_useful.h>
+#include <ext/scope_guard.h>
+#include "getIdentifierQuote.h"
+#include "validateODBCConnectionString.h"
+#include "ODBCConnectionFactory.h"
 
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
 
 namespace DB
 {
@@ -44,10 +41,12 @@ void IdentifierQuoteHandler::handleRequest(HTTPServerRequest & request, HTTPServ
     try
     {
         std::string connection_string = params.get("connection_string");
-        POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-        SQLHDBC hdbc = session.dbc().handle();
 
-        auto identifier = getIdentifierQuote(hdbc);
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
+
+        auto identifier = getIdentifierQuote(connection->get());
 
         WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.h b/programs/odbc-bridge/IdentifierQuoteHandler.h
index dad88c72ad8..ef3806fd802 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.h
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.h
@@ -11,11 +11,13 @@
 namespace DB
 {
 
-class IdentifierQuoteHandler : public HTTPRequestHandler
+class IdentifierQuoteHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    IdentifierQuoteHandler(size_t keep_alive_timeout_, Context &)
-        : log(&Poco::Logger::get("IdentifierQuoteHandler")), keep_alive_timeout(keep_alive_timeout_)
+    IdentifierQuoteHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("IdentifierQuoteHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
     {
     }
 
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index 079fc371ab4..ffa636e8b49 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -23,13 +23,9 @@
 #include <memory>
 
 
-#if USE_ODBC
-#include <Poco/Data/ODBC/SessionImpl.h>
-#define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
-#endif
-
 namespace DB
 {
+
 namespace
 {
     std::unique_ptr<Block> parseColumns(std::string && column_string)
@@ -42,37 +38,6 @@ namespace
     }
 }
 
-using PocoSessionPoolConstructor = std::function<std::shared_ptr<Poco::Data::SessionPool>()>;
-/** Is used to adjust max size of default Poco thread pool. See issue #750
-  * Acquire the lock, resize pool and construct new Session.
-  */
-static std::shared_ptr<Poco::Data::SessionPool> createAndCheckResizePocoSessionPool(PocoSessionPoolConstructor pool_constr)
-{
-    static std::mutex mutex;
-
-    Poco::ThreadPool & pool = Poco::ThreadPool::defaultPool();
-
-    /// NOTE: The lock don't guarantee that external users of the pool don't change its capacity
-    std::unique_lock lock(mutex);
-
-    if (pool.available() == 0)
-        pool.addCapacity(2 * std::max(pool.capacity(), 1));
-
-    return pool_constr();
-}
-
-ODBCHandler::PoolPtr ODBCHandler::getPool(const std::string & connection_str)
-{
-    std::lock_guard lock(mutex);
-    if (!pool_map->count(connection_str))
-    {
-        pool_map->emplace(connection_str, createAndCheckResizePocoSessionPool([connection_str]
-        {
-            return std::make_shared<Poco::Data::SessionPool>("ODBC", validateODBCConnectionString(connection_str));
-        }));
-    }
-    return pool_map->at(connection_str);
-}
 
 void ODBCHandler::processError(HTTPServerResponse & response, const std::string & message)
 {
@@ -82,12 +47,14 @@ void ODBCHandler::processError(HTTPServerResponse & response, const std::string
     LOG_WARNING(log, message);
 }
 
+
 void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     HTMLForm params(request);
+    LOG_TRACE(log, "Request URI: {}", request.getURI());
+
     if (mode == "read")
         params.read(request.getStream());
-    LOG_TRACE(log, "Request URI: {}", request.getURI());
 
     if (mode == "read" && !params.has("query"))
     {
@@ -95,11 +62,6 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         return;
     }
 
-    if (!params.has("columns"))
-    {
-        processError(response, "No 'columns' in request URL");
-        return;
-    }
 
     if (!params.has("connection_string"))
     {
@@ -107,6 +69,16 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         return;
     }
 
+    if (!params.has("sample_block"))
+    {
+        processError(response, "No 'sample_block' in request URL");
+        return;
+    }
+
+    std::string format = params.get("format", "RowBinary");
+    std::string connection_string = params.get("connection_string");
+    LOG_TRACE(log, "Connection string: '{}'", connection_string);
+
     UInt64 max_block_size = DEFAULT_BLOCK_SIZE;
     if (params.has("max_block_size"))
     {
@@ -119,28 +91,27 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         max_block_size = parse<size_t>(max_block_size_str);
     }
 
-    std::string columns = params.get("columns");
+    std::string sample_block_string = params.get("sample_block");
     std::unique_ptr<Block> sample_block;
     try
     {
-        sample_block = parseColumns(std::move(columns));
+        sample_block = parseColumns(std::move(sample_block_string));
     }
     catch (const Exception & ex)
     {
-        processError(response, "Invalid 'columns' parameter in request body '" + ex.message() + "'");
-        LOG_WARNING(log, ex.getStackTraceString());
+        processError(response, "Invalid 'sample_block' parameter in request body '" + ex.message() + "'");
+        LOG_ERROR(log, ex.getStackTraceString());
         return;
     }
 
-    std::string format = params.get("format", "RowBinary");
-
-    std::string connection_string = params.get("connection_string");
-    LOG_TRACE(log, "Connection string: '{}'", connection_string);
-
     WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
 
     try
     {
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
+
         if (mode == "write")
         {
             if (!params.has("db_name"))
@@ -159,15 +130,12 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
 
             auto quoting_style = IdentifierQuotingStyle::None;
 #if USE_ODBC
-            POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-            quoting_style = getQuotingStyle(session.dbc().handle());
+            quoting_style = getQuotingStyle(connection->get());
 #endif
-
-            auto pool = getPool(connection_string);
             auto & read_buf = request.getStream();
-            auto input_format = FormatFactory::instance().getInput(format, read_buf, *sample_block, context, max_block_size);
+            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(pool->get(), db_name, table_name, *sample_block, quoting_style);
+            ODBCBlockOutputStream output_stream(std::move(connection), db_name, table_name, *sample_block, getContext(), quoting_style);
             copyData(*input_stream, output_stream);
             writeStringBinary("Ok.", out);
         }
@@ -176,9 +144,8 @@ 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, context);
-            auto pool = getPool(connection_string);
-            ODBCBlockInputStream inp(pool->get(), query, *sample_block, max_block_size);
+            BlockOutputStreamPtr writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, out, *sample_block, getContext());
+            ODBCBlockInputStream inp(std::move(connection), query, *sample_block, max_block_size);
             copyData(inp, *writer);
         }
     }
diff --git a/programs/odbc-bridge/MainHandler.h b/programs/odbc-bridge/MainHandler.h
index e237ede5814..bc0fca8b9a5 100644
--- a/programs/odbc-bridge/MainHandler.h
+++ b/programs/odbc-bridge/MainHandler.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
-
 #include <Poco/Logger.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <Poco/Data/SessionPool.h>
-#pragma GCC diagnostic pop
+
+#include <mutex>
+#include <unordered_map>
+
 
 namespace DB
 {
@@ -17,20 +16,16 @@ namespace DB
   * and also query in request body
   * response in RowBinary format
   */
-class ODBCHandler : public HTTPRequestHandler
+class ODBCHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    using PoolPtr = std::shared_ptr<Poco::Data::SessionPool>;
-    using PoolMap = std::unordered_map<std::string, PoolPtr>;
-
-    ODBCHandler(std::shared_ptr<PoolMap> pool_map_,
+    ODBCHandler(
         size_t keep_alive_timeout_,
-        Context & context_,
+        ContextPtr context_,
         const String & mode_)
-        : log(&Poco::Logger::get("ODBCHandler"))
-        , pool_map(pool_map_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("ODBCHandler"))
         , keep_alive_timeout(keep_alive_timeout_)
-        , context(context_)
         , mode(mode_)
     {
     }
@@ -40,14 +35,11 @@ public:
 private:
     Poco::Logger * log;
 
-    std::shared_ptr<PoolMap> pool_map;
     size_t keep_alive_timeout;
-    Context & context;
     String mode;
 
     static inline std::mutex mutex;
 
-    PoolPtr getPool(const std::string & connection_str);
     void processError(HTTPServerResponse & response, const std::string & message);
 };
 
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.cpp b/programs/odbc-bridge/ODBCBlockInputStream.cpp
index b8a4209ac94..c695c8db9cf 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockInputStream.cpp
@@ -1,5 +1,7 @@
 #include "ODBCBlockInputStream.h"
 #include <vector>
+#include <IO/ReadBufferFromString.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
@@ -14,137 +16,142 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
     extern const int UNKNOWN_TYPE;
 }
 
 
 ODBCBlockInputStream::ODBCBlockInputStream(
-    Poco::Data::Session && session_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
-    : session{session_}
-    , statement{(this->session << query_str, Poco::Data::Keywords::now)}
-    , result{statement}
-    , iterator{result.begin()}
+    nanodbc::ConnectionHolderPtr connection, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
+    : log(&Poco::Logger::get("ODBCBlockInputStream"))
     , max_block_size{max_block_size_}
-    , log(&Poco::Logger::get("ODBCBlockInputStream"))
+    , query(query_str)
 {
-    if (sample_block.columns() != result.columnCount())
-        throw Exception{"RecordSet contains " + toString(result.columnCount()) + " columns while " + toString(sample_block.columns())
-                            + " expected",
-                        ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH};
-
     description.init(sample_block);
-}
-
-
-namespace
-{
-    using ValueType = ExternalResultDescription::ValueType;
-
-    void insertValue(IColumn & column, const ValueType type, const Poco::Dynamic::Var & value)
-    {
-        switch (type)
-        {
-            case ValueType::vtUInt8:
-                assert_cast<ColumnUInt8 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtUInt16:
-                assert_cast<ColumnUInt16 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtUInt32:
-                assert_cast<ColumnUInt32 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtUInt64:
-                assert_cast<ColumnUInt64 &>(column).insertValue(value.convert<UInt64>());
-                break;
-            case ValueType::vtInt8:
-                assert_cast<ColumnInt8 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtInt16:
-                assert_cast<ColumnInt16 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtInt32:
-                assert_cast<ColumnInt32 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtInt64:
-                assert_cast<ColumnInt64 &>(column).insertValue(value.convert<Int64>());
-                break;
-            case ValueType::vtFloat32:
-                assert_cast<ColumnFloat32 &>(column).insertValue(value.convert<Float64>());
-                break;
-            case ValueType::vtFloat64:
-                assert_cast<ColumnFloat64 &>(column).insertValue(value.convert<Float64>());
-                break;
-            case ValueType::vtString:
-                assert_cast<ColumnString &>(column).insert(value.convert<String>());
-                break;
-            case ValueType::vtDate:
-            {
-                Poco::DateTime date = value.convert<Poco::DateTime>();
-                assert_cast<ColumnUInt16 &>(column).insertValue(UInt16{LocalDate(date.year(), date.month(), date.day()).getDayNum()});
-                break;
-            }
-            case ValueType::vtDateTime:
-            {
-                Poco::DateTime datetime = value.convert<Poco::DateTime>();
-                assert_cast<ColumnUInt32 &>(column).insertValue(DateLUT::instance().makeDateTime(
-                    datetime.year(), datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), datetime.second()));
-                break;
-            }
-            case ValueType::vtUUID:
-                assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.convert<std::string>()));
-                break;
-            default:
-                throw Exception("Unsupported value type", ErrorCodes::UNKNOWN_TYPE);
-        }
-    }
-
-    void insertDefaultValue(IColumn & column, const IColumn & sample_column) { column.insertFrom(sample_column, 0); }
+    result = execute(connection->get(), NANODBC_TEXT(query));
 }
 
 
 Block ODBCBlockInputStream::readImpl()
 {
-    if (iterator == result.end())
-        return {};
-
-    MutableColumns columns(description.sample_block.columns());
-    for (const auto i : ext::range(0, columns.size()))
-        columns[i] = description.sample_block.getByPosition(i).column->cloneEmpty();
+    if (finished)
+        return Block();
 
+    MutableColumns columns(description.sample_block.cloneEmptyColumns());
     size_t num_rows = 0;
-    while (iterator != result.end())
+
+    while (true)
     {
-        Poco::Data::Row & row = *iterator;
-
-        for (const auto idx : ext::range(0, row.fieldCount()))
+        if (!result.next())
         {
-            /// TODO This is extremely slow.
-            const Poco::Dynamic::Var & value = row[idx];
+            finished = true;
+            break;
+        }
 
-            if (!value.isEmpty())
+        for (int idx = 0; idx < result.columns(); ++idx)
+        {
+            const auto & sample = description.sample_block.getByPosition(idx);
+
+            if (!result.is_null(idx))
             {
-                if (description.types[idx].second)
+                bool is_nullable = description.types[idx].second;
+
+                if (is_nullable)
                 {
                     ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[idx]);
-                    insertValue(column_nullable.getNestedColumn(), description.types[idx].first, value);
+                    const auto & data_type = assert_cast<const DataTypeNullable &>(*sample.type);
+                    insertValue(column_nullable.getNestedColumn(), data_type.getNestedType(), description.types[idx].first, result, idx);
                     column_nullable.getNullMapData().emplace_back(0);
                 }
                 else
-                    insertValue(*columns[idx], description.types[idx].first, value);
+                {
+                    insertValue(*columns[idx], sample.type, description.types[idx].first, result, idx);
+                }
             }
             else
-                insertDefaultValue(*columns[idx], *description.sample_block.getByPosition(idx).column);
+                insertDefaultValue(*columns[idx], *sample.column);
         }
 
-        ++iterator;
-
-        ++num_rows;
-        if (num_rows == max_block_size)
+        if (++num_rows == max_block_size)
             break;
     }
 
     return description.sample_block.cloneWithColumns(std::move(columns));
 }
 
+
+void ODBCBlockInputStream::insertValue(
+        IColumn & column, const DataTypePtr data_type, const ValueType type, nanodbc::result & row, size_t idx)
+{
+    switch (type)
+    {
+        case ValueType::vtUInt8:
+            assert_cast<ColumnUInt8 &>(column).insertValue(row.get<uint16_t>(idx));
+            break;
+        case ValueType::vtUInt16:
+            assert_cast<ColumnUInt16 &>(column).insertValue(row.get<uint16_t>(idx));
+            break;
+        case ValueType::vtUInt32:
+            assert_cast<ColumnUInt32 &>(column).insertValue(row.get<uint32_t>(idx));
+            break;
+        case ValueType::vtUInt64:
+            assert_cast<ColumnUInt64 &>(column).insertValue(row.get<uint64_t>(idx));
+            break;
+        case ValueType::vtInt8:
+            assert_cast<ColumnInt8 &>(column).insertValue(row.get<int16_t>(idx));
+            break;
+        case ValueType::vtInt16:
+            assert_cast<ColumnInt16 &>(column).insertValue(row.get<int16_t>(idx));
+            break;
+        case ValueType::vtInt32:
+            assert_cast<ColumnInt32 &>(column).insertValue(row.get<int32_t>(idx));
+            break;
+        case ValueType::vtInt64:
+            assert_cast<ColumnInt64 &>(column).insertValue(row.get<int64_t>(idx));
+            break;
+        case ValueType::vtFloat32:
+            assert_cast<ColumnFloat32 &>(column).insertValue(row.get<float>(idx));
+            break;
+        case ValueType::vtFloat64:
+            assert_cast<ColumnFloat64 &>(column).insertValue(row.get<double>(idx));
+            break;
+        case ValueType::vtFixedString:[[fallthrough]];
+        case ValueType::vtString:
+            assert_cast<ColumnString &>(column).insert(row.get<std::string>(idx));
+            break;
+        case ValueType::vtUUID:
+        {
+            auto value = row.get<std::string>(idx);
+            assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.data(), value.size()));
+            break;
+        }
+        case ValueType::vtDate:
+            assert_cast<ColumnUInt16 &>(column).insertValue(UInt16{LocalDate{row.get<std::string>(idx)}.getDayNum()});
+            break;
+        case ValueType::vtDateTime:
+        {
+            auto value = row.get<std::string>(idx);
+            ReadBufferFromString in(value);
+            time_t time = 0;
+            readDateTimeText(time, in);
+            if (time < 0)
+                time = 0;
+            assert_cast<ColumnUInt32 &>(column).insertValue(time);
+            break;
+        }
+        case ValueType::vtDateTime64:[[fallthrough]];
+        case ValueType::vtDecimal32: [[fallthrough]];
+        case ValueType::vtDecimal64: [[fallthrough]];
+        case ValueType::vtDecimal128: [[fallthrough]];
+        case ValueType::vtDecimal256:
+        {
+            auto value = row.get<std::string>(idx);
+            ReadBufferFromString istr(value);
+            data_type->getDefaultSerialization()->deserializeWholeText(column, istr, FormatSettings{});
+            break;
+        }
+        default:
+            throw Exception("Unsupported value type", ErrorCodes::UNKNOWN_TYPE);
+    }
+}
+
 }
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.h b/programs/odbc-bridge/ODBCBlockInputStream.h
index 13491e05822..26aa766dbcc 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.h
+++ b/programs/odbc-bridge/ODBCBlockInputStream.h
@@ -3,10 +3,8 @@
 #include <string>
 #include <Core/Block.h>
 #include <DataStreams/IBlockInputStream.h>
-#include <Poco/Data/RecordSet.h>
-#include <Poco/Data/Session.h>
-#include <Poco/Data/Statement.h>
 #include <Core/ExternalResultDescription.h>
+#include "ODBCConnectionFactory.h"
 
 
 namespace DB
@@ -15,25 +13,32 @@ namespace DB
 class ODBCBlockInputStream final : public IBlockInputStream
 {
 public:
-    ODBCBlockInputStream(
-        Poco::Data::Session && session_, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_);
+    ODBCBlockInputStream(nanodbc::ConnectionHolderPtr connection, const std::string & query_str, const Block & sample_block, const 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;
 
-    Poco::Data::Session session;
-    Poco::Data::Statement statement;
-    Poco::Data::RecordSet result;
-    Poco::Data::RecordSet::Iterator iterator;
+    static void insertValue(IColumn & column, const DataTypePtr data_type, const ValueType type, nanodbc::result & row, size_t idx);
 
+    static void insertDefaultValue(IColumn & column, const IColumn & sample_column)
+    {
+        column.insertFrom(sample_column, 0);
+    }
+
+    Poco::Logger * log;
     const UInt64 max_block_size;
     ExternalResultDescription description;
 
-    Poco::Logger * log;
+    nanodbc::result result;
+    String query;
+    bool finished = false;
 };
 
 }
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.cpp b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
index db3c9441419..dc965b3b2a7 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
@@ -1,5 +1,6 @@
 #include "ODBCBlockOutputStream.h"
 
+#include <Common/hex.h>
 #include <common/logger_useful.h>
 #include <Core/Field.h>
 #include <common/LocalDate.h>
@@ -8,16 +9,14 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTIdentifier.h>
 #include "getIdentifierQuote.h"
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+#include <Formats/FormatFactory.h>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_TYPE;
-}
-
 namespace
 {
     using ValueType = ExternalResultDescription::ValueType;
@@ -39,70 +38,21 @@ namespace
         query.IAST::format(settings);
         return buf.str();
     }
-
-    std::string getQuestionMarks(size_t n)
-    {
-        std::string result = "(";
-        for (size_t i = 0; i < n; ++i)
-        {
-            if (i > 0)
-                result += ",";
-            result += "?";
-        }
-        return result + ")";
-    }
-
-    Poco::Dynamic::Var getVarFromField(const Field & field, const ValueType type)
-    {
-        switch (type)
-        {
-            case ValueType::vtUInt8:
-                return Poco::Dynamic::Var(static_cast<UInt64>(field.get<UInt64>())).convert<UInt64>();
-            case ValueType::vtUInt16:
-                return Poco::Dynamic::Var(static_cast<UInt64>(field.get<UInt64>())).convert<UInt64>();
-            case ValueType::vtUInt32:
-                return Poco::Dynamic::Var(static_cast<UInt64>(field.get<UInt64>())).convert<UInt64>();
-            case ValueType::vtUInt64:
-                return Poco::Dynamic::Var(field.get<UInt64>()).convert<UInt64>();
-            case ValueType::vtInt8:
-                return Poco::Dynamic::Var(static_cast<Int64>(field.get<Int64>())).convert<Int64>();
-            case ValueType::vtInt16:
-                return Poco::Dynamic::Var(static_cast<Int64>(field.get<Int64>())).convert<Int64>();
-            case ValueType::vtInt32:
-                return Poco::Dynamic::Var(static_cast<Int64>(field.get<Int64>())).convert<Int64>();
-            case ValueType::vtInt64:
-                return Poco::Dynamic::Var(field.get<Int64>()).convert<Int64>();
-            case ValueType::vtFloat32:
-                return Poco::Dynamic::Var(field.get<Float64>()).convert<Float64>();
-            case ValueType::vtFloat64:
-                return Poco::Dynamic::Var(field.get<Float64>()).convert<Float64>();
-            case ValueType::vtString:
-                return Poco::Dynamic::Var(field.get<String>()).convert<String>();
-            case ValueType::vtDate:
-                return Poco::Dynamic::Var(LocalDate(DayNum(field.get<UInt64>())).toString()).convert<String>();
-            case ValueType::vtDateTime:
-                return Poco::Dynamic::Var(DateLUT::instance().timeToString(time_t(field.get<UInt64>()))).convert<String>();
-            case ValueType::vtUUID:
-                return Poco::Dynamic::Var(UUID(field.get<UInt128>()).toUnderType().toHexString()).convert<std::string>();
-             default:
-                 throw Exception("Unsupported value type", ErrorCodes::UNKNOWN_TYPE);
-
-        }
-        __builtin_unreachable();
-    }
 }
 
-ODBCBlockOutputStream::ODBCBlockOutputStream(Poco::Data::Session && session_,
+ODBCBlockOutputStream::ODBCBlockOutputStream(nanodbc::ConnectionHolderPtr connection_,
                                              const std::string & remote_database_name_,
                                              const std::string & remote_table_name_,
                                              const Block & sample_block_,
+                                             ContextPtr local_context_,
                                              IdentifierQuotingStyle quoting_)
-    : session(session_)
+    : log(&Poco::Logger::get("ODBCBlockOutputStream"))
+    , connection(std::move(connection_))
     , db_name(remote_database_name_)
     , table_name(remote_table_name_)
     , sample_block(sample_block_)
+    , local_context(local_context_)
     , quoting(quoting_)
-    , log(&Poco::Logger::get("ODBCBlockOutputStream"))
 {
     description.init(sample_block);
 }
@@ -114,28 +64,12 @@ Block ODBCBlockOutputStream::getHeader() const
 
 void ODBCBlockOutputStream::write(const Block & block)
 {
-    ColumnsWithTypeAndName columns;
-    for (size_t i = 0; i < block.columns(); ++i)
-        columns.push_back({block.getColumns()[i], sample_block.getDataTypes()[i], sample_block.getNames()[i]});
+    WriteBufferFromOwnString values_buf;
+    auto writer = FormatFactory::instance().getOutputStream("Values", values_buf, sample_block, local_context);
+    writer->write(block);
 
-    std::vector<Poco::Dynamic::Var> row_to_insert(block.columns());
-    Poco::Data::Statement statement(session << getInsertQuery(db_name, table_name, columns, quoting) + getQuestionMarks(block.columns()));
-    for (size_t i = 0; i < block.columns(); ++i)
-        statement.addBind(Poco::Data::Keywords::use(row_to_insert[i]));
-
-    for (size_t i = 0; i < block.rows(); ++i)
-    {
-        for (size_t col_idx = 0; col_idx < block.columns(); ++col_idx)
-        {
-            Field val;
-            columns[col_idx].column->get(i, val);
-            if (val.isNull())
-                row_to_insert[col_idx] = Poco::Dynamic::Var();
-            else
-                row_to_insert[col_idx] = getVarFromField(val, description.types[col_idx].first);
-        }
-        statement.execute();
-    }
+    std::string query = getInsertQuery(db_name, table_name, block.getColumnsWithTypeAndName(), quoting) + values_buf.str();
+    execute(connection->get(), query);
 }
 
 }
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.h b/programs/odbc-bridge/ODBCBlockOutputStream.h
index 39e1d6f77ac..c370a0a9c7b 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.h
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.h
@@ -2,30 +2,41 @@
 
 #include <Core/Block.h>
 #include <DataStreams/IBlockOutputStream.h>
-#include <Poco/Data/Session.h>
 #include <Core/ExternalResultDescription.h>
 #include <Parsers/IdentifierQuotingStyle.h>
+#include <Interpreters/Context_fwd.h>
+#include "ODBCConnectionFactory.h"
+
 
 namespace DB
 {
+
 class ODBCBlockOutputStream : public IBlockOutputStream
 {
+
 public:
-    ODBCBlockOutputStream(Poco::Data::Session && session_, const std::string & remote_database_name_,
-                          const std::string & remote_table_name_, const Block & sample_block_, IdentifierQuotingStyle quoting);
+    ODBCBlockOutputStream(
+            nanodbc::ConnectionHolderPtr connection_,
+            const std::string & remote_database_name_,
+            const std::string & remote_table_name_,
+            const Block & sample_block_,
+            ContextPtr local_context_,
+            IdentifierQuotingStyle quoting);
 
     Block getHeader() const override;
     void write(const Block & block) override;
 
 private:
-    Poco::Data::Session session;
+    Poco::Logger * log;
+
+    nanodbc::ConnectionHolderPtr connection;
     std::string db_name;
     std::string table_name;
     Block sample_block;
+    ContextPtr local_context;
     IdentifierQuotingStyle quoting;
 
     ExternalResultDescription description;
-    Poco::Logger * log;
 };
 
 }
diff --git a/programs/odbc-bridge/ODBCBridge.cpp b/programs/odbc-bridge/ODBCBridge.cpp
index 8869a2639c1..0deefe46014 100644
--- a/programs/odbc-bridge/ODBCBridge.cpp
+++ b/programs/odbc-bridge/ODBCBridge.cpp
@@ -1,244 +1,4 @@
 #include "ODBCBridge.h"
-#include "HandlerFactory.h"
-
-#include <string>
-#include <errno.h>
-#include <IO/ReadHelpers.h>
-#include <boost/program_options.hpp>
-
-#if USE_ODBC
-// It doesn't make much sense to build this bridge without ODBC, but we still do this.
-#    include <Poco/Data/ODBC/Connector.h>
-#endif
-
-#include <Poco/Net/NetException.h>
-#include <Poco/String.h>
-#include <Poco/Util/HelpFormatter.h>
-#include <Common/Exception.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/config.h>
-#include <Formats/registerFormats.h>
-#include <common/logger_useful.h>
-#include <ext/scope_guard.h>
-#include <ext/range.h>
-#include <Common/SensitiveDataMasker.h>
-#include <Server/HTTP/HTTPServer.h>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int ARGUMENT_OUT_OF_BOUND;
-}
-
-namespace
-{
-    Poco::Net::SocketAddress makeSocketAddress(const std::string & host, UInt16 port, Poco::Logger * log)
-    {
-        Poco::Net::SocketAddress socket_address;
-        try
-        {
-            socket_address = Poco::Net::SocketAddress(host, port);
-        }
-        catch (const Poco::Net::DNSException & e)
-        {
-            const auto code = e.code();
-            if (code == EAI_FAMILY
-#if defined(EAI_ADDRFAMILY)
-                || code == EAI_ADDRFAMILY
-#endif
-            )
-            {
-                LOG_ERROR(log, "Cannot resolve listen_host ({}), error {}: {}. If it is an IPv6 address and your host has disabled IPv6, then consider to specify IPv4 address to listen in <listen_host> element of configuration file. Example: <listen_host>0.0.0.0</listen_host>", host, e.code(), e.message());
-            }
-
-            throw;
-        }
-        return socket_address;
-    }
-
-    Poco::Net::SocketAddress socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, Poco::Logger * log)
-    {
-        auto address = makeSocketAddress(host, port, log);
-#if POCO_VERSION < 0x01080000
-        socket.bind(address, /* reuseAddress = */ true);
-#else
-        socket.bind(address, /* reuseAddress = */ true, /* reusePort = */ false);
-#endif
-
-        socket.listen(/* backlog = */ 64);
-
-        return address;
-    }
-}
-
-void ODBCBridge::handleHelp(const std::string &, const std::string &)
-{
-    Poco::Util::HelpFormatter help_formatter(options());
-    help_formatter.setCommand(commandName());
-    help_formatter.setHeader("HTTP-proxy for odbc requests");
-    help_formatter.setUsage("--http-port <port>");
-    help_formatter.format(std::cerr);
-
-    stopOptionsProcessing();
-}
-
-
-void ODBCBridge::defineOptions(Poco::Util::OptionSet & options)
-{
-    options.addOption(Poco::Util::Option("http-port", "", "port to listen").argument("http-port", true).binding("http-port"));
-    options.addOption(
-        Poco::Util::Option("listen-host", "", "hostname or address to listen, default 127.0.0.1").argument("listen-host").binding("listen-host"));
-    options.addOption(
-        Poco::Util::Option("http-timeout", "", "http timeout for socket, default 1800").argument("http-timeout").binding("http-timeout"));
-
-    options.addOption(Poco::Util::Option("max-server-connections", "", "max connections to server, default 1024")
-                          .argument("max-server-connections")
-                          .binding("max-server-connections"));
-    options.addOption(Poco::Util::Option("keep-alive-timeout", "", "keepalive timeout, default 10")
-                          .argument("keep-alive-timeout")
-                          .binding("keep-alive-timeout"));
-
-    options.addOption(Poco::Util::Option("log-level", "", "sets log level, default info").argument("log-level").binding("logger.level"));
-
-    options.addOption(
-        Poco::Util::Option("log-path", "", "log path for all logs, default console").argument("log-path").binding("logger.log"));
-
-    options.addOption(Poco::Util::Option("err-log-path", "", "err log path for all logs, default no")
-                          .argument("err-log-path")
-                          .binding("logger.errorlog"));
-
-    options.addOption(Poco::Util::Option("stdout-path", "", "stdout log path, default console")
-                          .argument("stdout-path")
-                          .binding("logger.stdout"));
-
-    options.addOption(Poco::Util::Option("stderr-path", "", "stderr log path, default console")
-                          .argument("stderr-path")
-                          .binding("logger.stderr"));
-
-    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)));
-
-    ServerApplication::defineOptions(options); // NOLINT Don't need complex BaseDaemon's .xml config
-}
-
-void ODBCBridge::initialize(Application & self)
-{
-    BaseDaemon::closeFDs();
-    is_help = config().has("help");
-
-    if (is_help)
-        return;
-
-    config().setString("logger", "ODBCBridge");
-
-    /// Redirect stdout, stderr to specified files.
-    /// Some libraries and sanitizers write to stderr in case of errors.
-    const auto stdout_path = config().getString("logger.stdout", "");
-    if (!stdout_path.empty())
-    {
-        if (!freopen(stdout_path.c_str(), "a+", stdout))
-            throw Poco::OpenFileException("Cannot attach stdout to " + stdout_path);
-
-        /// Disable buffering for stdout.
-        setbuf(stdout, nullptr);
-    }
-    const auto stderr_path = config().getString("logger.stderr", "");
-    if (!stderr_path.empty())
-    {
-        if (!freopen(stderr_path.c_str(), "a+", stderr))
-            throw Poco::OpenFileException("Cannot attach stderr to " + stderr_path);
-
-        /// Disable buffering for stderr.
-        setbuf(stderr, nullptr);
-    }
-
-    buildLoggers(config(), logger(), self.commandName());
-
-    BaseDaemon::logRevision();
-
-    log = &logger();
-    hostname = config().getString("listen-host", "127.0.0.1");
-    port = config().getUInt("http-port");
-    if (port > 0xFFFF)
-        throw Exception("Out of range 'http-port': " + std::to_string(port), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
-
-    http_timeout = config().getUInt("http-timeout", DEFAULT_HTTP_READ_BUFFER_TIMEOUT);
-    max_server_connections = config().getUInt("max-server-connections", 1024);
-    keep_alive_timeout = config().getUInt("keep-alive-timeout", 10);
-
-    initializeTerminationAndSignalProcessing();
-
-#if USE_ODBC
-    // It doesn't make much sense to build this bridge without ODBC, but we
-    // still do this.
-    Poco::Data::ODBC::Connector::registerConnector();
-#endif
-
-    ServerApplication::initialize(self); // NOLINT
-}
-
-void ODBCBridge::uninitialize()
-{
-    BaseDaemon::uninitialize();
-}
-
-int ODBCBridge::main(const std::vector<std::string> & /*args*/)
-{
-    if (is_help)
-        return Application::EXIT_OK;
-
-    registerFormats();
-
-    LOG_INFO(log, "Starting up");
-    Poco::Net::ServerSocket socket;
-    auto address = socketBindListen(socket, hostname, port, log);
-    socket.setReceiveTimeout(http_timeout);
-    socket.setSendTimeout(http_timeout);
-    Poco::ThreadPool server_pool(3, max_server_connections);
-    Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams;
-    http_params->setTimeout(http_timeout);
-    http_params->setKeepAliveTimeout(keep_alive_timeout);
-
-    auto shared_context = Context::createShared();
-    Context context(Context::createGlobal(shared_context.get()));
-    context.makeGlobalContext();
-
-    if (config().has("query_masking_rules"))
-    {
-        SensitiveDataMasker::setInstance(std::make_unique<SensitiveDataMasker>(config(), "query_masking_rules"));
-    }
-
-    auto server = HTTPServer(
-        context,
-        std::make_shared<HandlerFactory>("ODBCRequestHandlerFactory-factory", keep_alive_timeout, context),
-        server_pool,
-        socket,
-        http_params);
-    server.start();
-
-    LOG_INFO(log, "Listening http://{}", address.toString());
-
-    SCOPE_EXIT({
-        LOG_DEBUG(log, "Received termination signal.");
-        LOG_DEBUG(log, "Waiting for current connections to close.");
-        server.stop();
-        for (size_t count : ext::range(1, 6))
-        {
-            if (server.currentConnections() == 0)
-                break;
-            LOG_DEBUG(log, "Waiting for {} connections, try {}", server.currentConnections(), count);
-            std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-        }
-    });
-
-    waitForTerminationRequest();
-    return Application::EXIT_OK;
-}
-}
 
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 int mainEntryClickHouseODBCBridge(int argc, char ** argv)
diff --git a/programs/odbc-bridge/ODBCBridge.h b/programs/odbc-bridge/ODBCBridge.h
index 9a0d37fa0f9..b17051dce91 100644
--- a/programs/odbc-bridge/ODBCBridge.h
+++ b/programs/odbc-bridge/ODBCBridge.h
@@ -2,38 +2,25 @@
 
 #include <Interpreters/Context.h>
 #include <Poco/Logger.h>
-#include <daemon/BaseDaemon.h>
+#include <bridge/IBridge.h>
+#include "HandlerFactory.h"
+
 
 namespace DB
 {
-/** Class represents clickhouse-odbc-bridge server, which listen
-  * incoming HTTP POST and GET requests on specified port and host.
-  * Has two handlers '/' for all incoming POST requests to ODBC driver
-  * and /ping for GET request about service status
-  */
-class ODBCBridge : public BaseDaemon
+
+class ODBCBridge : public IBridge
 {
-public:
-    void defineOptions(Poco::Util::OptionSet & options) override;
 
 protected:
-    void initialize(Application & self) override;
+    std::string bridgeName() const override
+    {
+        return "ODBCBridge";
+    }
 
-    void uninitialize() override;
-
-    int main(const std::vector<std::string> & args) override;
-
-private:
-    void handleHelp(const std::string &, const std::string &);
-
-    bool is_help;
-    std::string hostname;
-    size_t port;
-    size_t http_timeout;
-    std::string log_level;
-    size_t max_server_connections;
-    size_t keep_alive_timeout;
-
-    Poco::Logger * log;
+    HandlerFactoryPtr getHandlerFactoryPtr(ContextPtr context) const override
+    {
+        return std::make_shared<ODBCBridgeHandlerFactory>("ODBCRequestHandlerFactory-factory", keep_alive_timeout, context);
+    }
 };
 }
diff --git a/programs/odbc-bridge/ODBCConnectionFactory.h b/programs/odbc-bridge/ODBCConnectionFactory.h
new file mode 100644
index 00000000000..41ed5f1b31f
--- /dev/null
+++ b/programs/odbc-bridge/ODBCConnectionFactory.h
@@ -0,0 +1,98 @@
+#pragma once
+
+#include <common/logger_useful.h>
+#include <nanodbc/nanodbc.h>
+#include <mutex>
+#include <common/BorrowedObjectPool.h>
+#include <unordered_map>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NO_FREE_CONNECTION;
+}
+}
+
+namespace nanodbc
+{
+
+using ConnectionPtr = std::unique_ptr<nanodbc::connection>;
+using Pool = BorrowedObjectPool<ConnectionPtr>;
+using PoolPtr = std::shared_ptr<Pool>;
+
+class ConnectionHolder
+{
+public:
+    ConnectionHolder(PoolPtr pool_, ConnectionPtr connection_) : pool(pool_), connection(std::move(connection_)) {}
+
+    ConnectionHolder(const ConnectionHolder & other) = delete;
+
+    ~ConnectionHolder() { pool->returnObject(std::move(connection)); }
+
+    nanodbc::connection & get() const
+    {
+        assert(connection != nullptr);
+        return *connection;
+    }
+
+private:
+    PoolPtr pool;
+    ConnectionPtr connection;
+};
+
+using ConnectionHolderPtr = std::unique_ptr<ConnectionHolder>;
+}
+
+
+namespace DB
+{
+
+static constexpr inline auto ODBC_CONNECT_TIMEOUT = 100;
+static constexpr inline auto ODBC_POOL_WAIT_TIMEOUT = 10000;
+
+class ODBCConnectionFactory final : private boost::noncopyable
+{
+public:
+    static ODBCConnectionFactory & instance()
+    {
+        static ODBCConnectionFactory ret;
+        return ret;
+    }
+
+    nanodbc::ConnectionHolderPtr get(const std::string & connection_string, size_t pool_size)
+    {
+        std::lock_guard lock(mutex);
+
+        if (!factory.count(connection_string))
+            factory.emplace(std::make_pair(connection_string, std::make_shared<nanodbc::Pool>(pool_size)));
+
+        auto & pool = factory[connection_string];
+
+        nanodbc::ConnectionPtr connection;
+        auto connection_available = pool->tryBorrowObject(connection, []() { return nullptr; }, ODBC_POOL_WAIT_TIMEOUT);
+
+        if (!connection_available)
+            throw Exception("Unable to fetch connection within the timeout", ErrorCodes::NO_FREE_CONNECTION);
+
+        try
+        {
+            if (!connection || !connection->connected())
+                connection = std::make_unique<nanodbc::connection>(connection_string, ODBC_CONNECT_TIMEOUT);
+        }
+        catch (...)
+        {
+            pool->returnObject(std::move(connection));
+        }
+
+        return std::make_unique<nanodbc::ConnectionHolder>(factory[connection_string], std::move(connection));
+    }
+
+private:
+    /// [connection_settings_string] -> [connection_pool]
+    using PoolFactory = std::unordered_map<std::string, nanodbc::PoolPtr>;
+    PoolFactory factory;
+    std::mutex mutex;
+};
+
+}
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index d4a70db61f4..3a20148780d 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -2,33 +2,26 @@
 
 #if USE_ODBC
 
-#    include <Server/HTTP/HTMLForm.h>
-#    include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#    include <IO/WriteHelpers.h>
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-#    include <Poco/Net/HTTPServerRequest.h>
-#    include <Poco/Net/HTTPServerResponse.h>
-#    include <common/logger_useful.h>
-#    include "validateODBCConnectionString.h"
+#include <Server/HTTP/HTMLForm.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteHelpers.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <common/logger_useful.h>
+#include "validateODBCConnectionString.h"
+#include "ODBCConnectionFactory.h"
+#include <sql.h>
+#include <sqlext.h>
 
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
 
 namespace DB
 {
 namespace
 {
-    bool isSchemaAllowed(SQLHDBC hdbc)
+    bool isSchemaAllowed(nanodbc::connection & connection)
     {
-        SQLUINTEGER value;
-        SQLSMALLINT value_length = sizeof(value);
-        SQLRETURN r = POCO_SQL_ODBC_CLASS::SQLGetInfo(hdbc, SQL_SCHEMA_USAGE, &value, sizeof(value), &value_length);
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(r))
-            throw POCO_SQL_ODBC_CLASS::ConnectionException(hdbc);
-
-        return value != 0;
+        uint32_t result = connection.get_info<uint32_t>(SQL_SCHEMA_USAGE);
+        return result != 0;
     }
 }
 
@@ -55,10 +48,12 @@ void SchemaAllowedHandler::handleRequest(HTTPServerRequest & request, HTTPServer
     try
     {
         std::string connection_string = params.get("connection_string");
-        POCO_SQL_ODBC_CLASS::SessionImpl session(validateODBCConnectionString(connection_string), DBMS_DEFAULT_CONNECT_TIMEOUT_SEC);
-        SQLHDBC hdbc = session.dbc().handle();
 
-        bool result = isSchemaAllowed(hdbc);
+        auto connection = ODBCConnectionFactory::instance().get(
+                validateODBCConnectionString(connection_string),
+                getContext()->getSettingsRef().odbc_bridge_connection_pool_size);
+
+        bool result = isSchemaAllowed(connection->get());
 
         WriteBufferFromHTTPServerResponse out(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout);
         try
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.h b/programs/odbc-bridge/SchemaAllowedHandler.h
index 91eddf67803..d7b922ed05b 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.h
+++ b/programs/odbc-bridge/SchemaAllowedHandler.h
@@ -1,22 +1,25 @@
 #pragma once
 
+#include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
-
 #include <Poco/Logger.h>
 
 #if USE_ODBC
 
+
 namespace DB
 {
 
 class Context;
 
 /// This handler establishes connection to database, and retrieves whether schema is allowed.
-class SchemaAllowedHandler : public HTTPRequestHandler
+class SchemaAllowedHandler : public HTTPRequestHandler, WithContext
 {
 public:
-    SchemaAllowedHandler(size_t keep_alive_timeout_, Context &)
-        : log(&Poco::Logger::get("SchemaAllowedHandler")), keep_alive_timeout(keep_alive_timeout_)
+    SchemaAllowedHandler(size_t keep_alive_timeout_, ContextPtr context_)
+        : WithContext(context_)
+        , log(&Poco::Logger::get("SchemaAllowedHandler"))
+        , keep_alive_timeout(keep_alive_timeout_)
     {
     }
 
diff --git a/programs/odbc-bridge/getIdentifierQuote.cpp b/programs/odbc-bridge/getIdentifierQuote.cpp
index 15b3749d37d..586e3c4e5dd 100644
--- a/programs/odbc-bridge/getIdentifierQuote.cpp
+++ b/programs/odbc-bridge/getIdentifierQuote.cpp
@@ -2,11 +2,9 @@
 
 #if USE_ODBC
 
-#    include <Poco/Data/ODBC/ODBCException.h>
-#    include <Poco/Data/ODBC/SessionImpl.h>
-#    include <Poco/Data/ODBC/Utility.h>
-
-#    define POCO_SQL_ODBC_CLASS Poco::Data::ODBC
+#include <common/logger_useful.h>
+#include <sql.h>
+#include <sqlext.h>
 
 
 namespace DB
@@ -17,33 +15,27 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-std::string getIdentifierQuote(SQLHDBC hdbc)
+
+std::string getIdentifierQuote(nanodbc::connection & connection)
 {
-    std::string identifier;
-
-    SQLSMALLINT t;
-    SQLRETURN r = POCO_SQL_ODBC_CLASS::SQLGetInfo(hdbc, SQL_IDENTIFIER_QUOTE_CHAR, nullptr, 0, &t);
-
-    if (POCO_SQL_ODBC_CLASS::Utility::isError(r))
-        throw POCO_SQL_ODBC_CLASS::ConnectionException(hdbc);
-
-    if (t > 0)
+    std::string quote;
+    try
     {
-        // I have no idea, why to add '2' here, got from: contrib/poco/Data/ODBC/src/ODBCStatementImpl.cpp:60 (SQL_DRIVER_NAME)
-        identifier.resize(static_cast<std::size_t>(t) + 2);
-
-        if (POCO_SQL_ODBC_CLASS::Utility::isError(POCO_SQL_ODBC_CLASS::SQLGetInfo(
-                hdbc, SQL_IDENTIFIER_QUOTE_CHAR, &identifier[0], SQLSMALLINT((identifier.length() - 1) * sizeof(identifier[0])), &t)))
-            throw POCO_SQL_ODBC_CLASS::ConnectionException(hdbc);
-
-        identifier.resize(static_cast<std::size_t>(t));
+        quote = connection.get_info<std::string>(SQL_IDENTIFIER_QUOTE_CHAR);
     }
-    return identifier;
+    catch (...)
+    {
+        LOG_WARNING(&Poco::Logger::get("ODBCGetIdentifierQuote"), "Cannot fetch identifier quote. Default double quote is used. Reason: {}", getCurrentExceptionMessage(false));
+        return "\"";
+    }
+
+    return quote;
 }
 
-IdentifierQuotingStyle getQuotingStyle(SQLHDBC hdbc)
+
+IdentifierQuotingStyle getQuotingStyle(nanodbc::connection & connection)
 {
-    auto identifier_quote = getIdentifierQuote(hdbc);
+    auto identifier_quote = getIdentifierQuote(connection);
     if (identifier_quote.length() == 0)
         return IdentifierQuotingStyle::None;
     else if (identifier_quote[0] == '`')
diff --git a/programs/odbc-bridge/getIdentifierQuote.h b/programs/odbc-bridge/getIdentifierQuote.h
index 0fb4c3bddb1..7f7156eff82 100644
--- a/programs/odbc-bridge/getIdentifierQuote.h
+++ b/programs/odbc-bridge/getIdentifierQuote.h
@@ -2,20 +2,19 @@
 
 #if USE_ODBC
 
-#    include <Interpreters/Context.h>
-#    include <Poco/Logger.h>
-#    include <Poco/Net/HTTPRequestHandler.h>
-
-#    include <Poco/Data/ODBC/Utility.h>
-
+#include <Interpreters/Context.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/HTTPRequestHandler.h>
 #include <Parsers/IdentifierQuotingStyle.h>
+#include <nanodbc/nanodbc.h>
+
 
 namespace DB
 {
 
-std::string getIdentifierQuote(SQLHDBC hdbc);
+std::string getIdentifierQuote(nanodbc::connection & connection);
 
-IdentifierQuotingStyle getQuotingStyle(SQLHDBC hdbc);
+IdentifierQuotingStyle getQuotingStyle(nanodbc::connection & connection);
 
 }
 
diff --git a/programs/server/.gitignore b/programs/server/.gitignore
index b774776e4be..ddc480e4b29 100644
--- a/programs/server/.gitignore
+++ b/programs/server/.gitignore
@@ -1,8 +1,11 @@
-/access
-/dictionaries_lib
-/flags
-/format_schemas
+/metadata
 /metadata_dropped
+/data
+/store
+/access
+/flags
+/dictionaries_lib
+/format_schemas
 /preprocessed_configs
 /shadow
 /tmp
diff --git a/programs/server/CMakeLists.txt b/programs/server/CMakeLists.txt
index 697851b294b..f7f76fdb450 100644
--- a/programs/server/CMakeLists.txt
+++ b/programs/server/CMakeLists.txt
@@ -19,6 +19,7 @@ set (CLICKHOUSE_SERVER_LINK
         clickhouse_storages_system
         clickhouse_table_functions
         string_utils
+        jemalloc
 
     ${LINK_RESOURCE_LIB}
 
@@ -28,39 +29,6 @@ set (CLICKHOUSE_SERVER_LINK
 
 clickhouse_program_add(server)
 
-install(FILES config.xml users.xml DESTINATION ${CLICKHOUSE_ETC_DIR}/clickhouse-server COMPONENT clickhouse)
+install(FILES config.xml users.xml DESTINATION "${CLICKHOUSE_ETC_DIR}/clickhouse-server" COMPONENT clickhouse)
 
-# TODO We actually need this on Mac, FreeBSD.
-if (OS_LINUX)
-    # Embed default config files as a resource into the binary.
-    # This is needed for two purposes:
-    # 1. Allow to run the binary without download of any other files.
-    # 2. Allow to implement "sudo clickhouse install" tool.
-
-    foreach(RESOURCE_FILE config.xml users.xml embedded.xml play.html)
-        set(RESOURCE_OBJ ${RESOURCE_FILE}.o)
-        set(RESOURCE_OBJS ${RESOURCE_OBJS} ${RESOURCE_OBJ})
-
-        # https://stackoverflow.com/questions/14776463/compile-and-add-an-object-file-from-a-binary-with-cmake
-        # PPC64LE fails to do this with objcopy, use ld or lld instead
-        if (ARCH_PPC64LE)
-            add_custom_command(OUTPUT ${RESOURCE_OBJ}
-                COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${CMAKE_LINKER} -m elf64lppc -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ} ${RESOURCE_FILE})
-        else()
-            add_custom_command(OUTPUT ${RESOURCE_OBJ}
-                COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${OBJCOPY_PATH} -I binary ${OBJCOPY_ARCH_OPTIONS} ${RESOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ}
-                COMMAND ${OBJCOPY_PATH} --rename-section .data=.rodata,alloc,load,readonly,data,contents
-                    ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ} ${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_OBJ})
-        endif()
-        set_source_files_properties(${RESOURCE_OBJ} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
-    endforeach(RESOURCE_FILE)
-
-    add_library(clickhouse_server_configs STATIC ${RESOURCE_OBJS})
-    set_target_properties(clickhouse_server_configs PROPERTIES LINKER_LANGUAGE C)
-
-    # whole-archive prevents symbols from being discarded for unknown reason
-    # CMake can shuffle each of target_link_libraries arguments with other
-    # libraries in linker command. To avoid this we hardcode whole-archive
-    # library into single string.
-    add_dependencies(clickhouse-server-lib clickhouse_server_configs)
-endif ()
+clickhouse_embed_binaries(server config.xml users.xml embedded.xml play.html)
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index f2f43aabc7d..f169d793ee9 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -13,7 +13,9 @@
 #include <Poco/Net/HTTPServer.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/HelpFormatter.h>
+#include <Poco/Environment.h>
 #include <ext/scope_guard.h>
+#include <common/defines.h>
 #include <common/logger_useful.h>
 #include <common/phdr_cache.h>
 #include <common/ErrorHandlers.h>
@@ -47,6 +49,7 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/DNSCacheUpdater.h>
 #include <Interpreters/ExternalLoaderXMLConfigRepository.h>
+#include <Interpreters/InterserverCredentials.h>
 #include <Interpreters/ExpressionJIT.h>
 #include <Access/AccessControlManager.h>
 #include <Storages/StorageReplicatedMergeTree.h>
@@ -71,6 +74,7 @@
 #include <Server/PostgreSQLHandlerFactory.h>
 #include <Server/ProtocolServerAdapter.h>
 #include <Server/HTTP/HTTPServer.h>
+#include <filesystem>
 
 
 #if !defined(ARCADIA_BUILD)
@@ -85,6 +89,8 @@
 #    include <sys/mman.h>
 #    include <sys/ptrace.h>
 #    include <Common/hasLinuxCapability.h>
+#    include <unistd.h>
+#    include <sys/syscall.h>
 #endif
 
 #if USE_SSL
@@ -100,6 +106,10 @@
 #   include <Server/KeeperTCPHandlerFactory.h>
 #endif
 
+#if USE_JEMALLOC
+#    include <jemalloc/jemalloc.h>
+#endif
+
 namespace CurrentMetrics
 {
     extern const Metric Revision;
@@ -108,11 +118,37 @@ namespace CurrentMetrics
     extern const Metric MaxDDLEntryID;
 }
 
+namespace fs = std::filesystem;
+
+#if USE_JEMALLOC
+static bool jemallocOptionEnabled(const char *name)
+{
+    bool value;
+    size_t size = sizeof(value);
+
+    if (mallctl(name, reinterpret_cast<void *>(&value), &size, /* newp= */ nullptr, /* newlen= */ 0))
+        throw Poco::SystemException("mallctl() failed");
+
+    return value;
+}
+#else
+static bool jemallocOptionEnabled(const char *) { return 0; }
+#endif
+
 
 int mainEntryClickHouseServer(int argc, char ** argv)
 {
     DB::Server app;
 
+    if (jemallocOptionEnabled("opt.background_thread"))
+    {
+        LOG_ERROR(&app.logger(),
+            "jemalloc.background_thread was requested, "
+            "however ClickHouse uses percpu_arena and background_thread most likely will not give any benefits, "
+            "and also background_thread is not compatible with ClickHouse watchdog "
+            "(that can be disabled with CLICKHOUSE_WATCHDOG_ENABLE=0)");
+    }
+
     /// Do not fork separate process from watchdog if we attached to terminal.
     /// Otherwise it breaks gdb usage.
     /// Can be overridden by environment variable (cannot use server config at this moment).
@@ -150,19 +186,19 @@ void setupTmpPath(Poco::Logger * log, const std::string & path)
 {
     LOG_DEBUG(log, "Setting up {} to store temporary data in it", path);
 
-    Poco::File(path).createDirectories();
+    fs::create_directories(path);
 
     /// Clearing old temporary files.
-    Poco::DirectoryIterator dir_end;
-    for (Poco::DirectoryIterator it(path); it != dir_end; ++it)
+    fs::directory_iterator dir_end;
+    for (fs::directory_iterator it(path); it != dir_end; ++it)
     {
-        if (it->isFile() && startsWith(it.name(), "tmp"))
+        if (it->is_regular_file() && startsWith(it->path().filename(), "tmp"))
         {
-            LOG_DEBUG(log, "Removing old temporary file {}", it->path());
-            it->remove();
+            LOG_DEBUG(log, "Removing old temporary file {}", it->path().string());
+            fs::remove(it->path());
         }
         else
-            LOG_DEBUG(log, "Skipped file in temporary path {}", it->path());
+            LOG_DEBUG(log, "Skipped file in temporary path {}", it->path().string());
     }
 }
 
@@ -172,18 +208,24 @@ int waitServersToFinish(std::vector<DB::ProtocolServerAdapter> & servers, size_t
     const int sleep_one_ms = 100;
     int sleep_current_ms = 0;
     int current_connections = 0;
-    while (sleep_current_ms < sleep_max_ms)
+    for (;;)
     {
         current_connections = 0;
+
         for (auto & server : servers)
         {
             server.stop();
             current_connections += server.currentConnections();
         }
+
         if (!current_connections)
             break;
+
         sleep_current_ms += sleep_one_ms;
-        std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
+        if (sleep_current_ms < sleep_max_ms)
+            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
+        else
+            break;
     }
     return current_connections;
 }
@@ -347,6 +389,11 @@ void Server::initialize(Poco::Util::Application & self)
 {
     BaseDaemon::initialize(self);
     logger().information("starting up");
+
+    LOG_INFO(&logger(), "OS Name = {}, OS Version = {}, OS Architecture = {}",
+        Poco::Environment::osName(),
+        Poco::Environment::osVersion(),
+        Poco::Environment::osArchitecture());
 }
 
 std::string Server::getDefaultCorePath() const
@@ -391,6 +438,19 @@ void checkForUsersNotInMainConfig(
 }
 
 
+[[noreturn]] void forceShutdown()
+{
+#if defined(THREAD_SANITIZER) && defined(OS_LINUX)
+    /// Thread sanitizer tries to do something on exit that we don't need if we want to exit immediately,
+    /// while connection handling threads are still run.
+    (void)syscall(SYS_exit_group, 0);
+    __builtin_unreachable();
+#else
+    _exit(0);
+#endif
+}
+
+
 int Server::main(const std::vector<std::string> & /*args*/)
 {
     Poco::Logger * log = &logger();
@@ -425,8 +485,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
       *  settings, available functions, data types, aggregate functions, databases, ...
       */
     auto shared_context = Context::createShared();
-    auto global_context = std::make_unique<Context>(Context::createGlobal(shared_context.get()));
-    global_context_ptr = global_context.get();
+    global_context = Context::createGlobal(shared_context.get());
 
     global_context->makeGlobalContext();
     global_context->setApplicationType(Context::ApplicationType::SERVER);
@@ -622,37 +681,38 @@ int Server::main(const std::vector<std::string> & /*args*/)
       * Examples: do repair of local data; clone all replicated tables from replica.
       */
     {
-        Poco::File(path + "flags/").createDirectories();
-        global_context->setFlagsPath(path + "flags/");
+        auto flags_path = fs::path(path) / "flags/";
+        fs::create_directories(flags_path);
+        global_context->setFlagsPath(flags_path);
     }
 
     /** Directory with user provided files that are usable by 'file' table function.
       */
     {
 
-        std::string user_files_path = config().getString("user_files_path", path + "user_files/");
+        std::string user_files_path = config().getString("user_files_path", fs::path(path) / "user_files/");
         global_context->setUserFilesPath(user_files_path);
-        Poco::File(user_files_path).createDirectories();
+        fs::create_directories(user_files_path);
     }
 
     {
-        std::string dictionaries_lib_path = config().getString("dictionaries_lib_path", path + "dictionaries_lib/");
+        std::string dictionaries_lib_path = config().getString("dictionaries_lib_path", fs::path(path) / "dictionaries_lib/");
         global_context->setDictionariesLibPath(dictionaries_lib_path);
-        Poco::File(dictionaries_lib_path).createDirectories();
+        fs::create_directories(dictionaries_lib_path);
     }
 
     /// top_level_domains_lists
     {
-        const std::string & top_level_domains_path = config().getString("top_level_domains_path", path + "top_level_domains/") + "/";
-        TLDListsHolder::getInstance().parseConfig(top_level_domains_path, config());
+        const std::string & top_level_domains_path = config().getString("top_level_domains_path", fs::path(path) / "top_level_domains/");
+        TLDListsHolder::getInstance().parseConfig(fs::path(top_level_domains_path) / "", config());
     }
 
     {
-        Poco::File(path + "data/").createDirectories();
-        Poco::File(path + "metadata/").createDirectories();
+        fs::create_directories(fs::path(path) / "data/");
+        fs::create_directories(fs::path(path) / "metadata/");
 
         /// Directory with metadata of tables, which was marked as dropped by Atomic database
-        Poco::File(path + "metadata_dropped/").createDirectories();
+        fs::create_directories(fs::path(path) / "metadata_dropped/");
     }
 
     if (config().has("interserver_http_port") && config().has("interserver_https_port"))
@@ -688,16 +748,8 @@ int Server::main(const std::vector<std::string> & /*args*/)
         }
     }
 
-    if (config().has("interserver_http_credentials"))
-    {
-        String user = config().getString("interserver_http_credentials.user", "");
-        String password = config().getString("interserver_http_credentials.password", "");
-
-        if (user.empty())
-            throw Exception("Configuration parameter interserver_http_credentials user can't be empty", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
-
-        global_context->setInterserverCredentials(user, password);
-    }
+    LOG_DEBUG(log, "Initiailizing interserver credentials.");
+    global_context->updateInterserverCredentials(config());
 
     if (config().has("macros"))
         global_context->setMacros(std::make_unique<Macros>(config(), "macros", log));
@@ -758,6 +810,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
             global_context->setClustersConfig(config);
             global_context->setMacros(std::make_unique<Macros>(*config, "macros", log));
             global_context->setExternalAuthenticatorsConfig(*config);
+            global_context->setExternalModelsConfig(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"))
@@ -777,6 +830,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
             }
 
             global_context->updateStorageConfiguration(*config);
+            global_context->updateInterserverCredentials(*config);
         },
         /* already_loaded = */ false);  /// Reload it right now (initial loading)
 
@@ -835,14 +889,15 @@ int Server::main(const std::vector<std::string> & /*args*/)
         global_context->setMMappedFileCache(mmap_cache_size);
 
 #if USE_EMBEDDED_COMPILER
-    size_t compiled_expression_cache_size = config().getUInt64("compiled_expression_cache_size", 500);
+    constexpr size_t compiled_expression_cache_size_default = 1024 * 1024 * 1024;
+    size_t compiled_expression_cache_size = config().getUInt64("compiled_expression_cache_size", compiled_expression_cache_size_default);
     CompiledExpressionCacheFactory::instance().init(compiled_expression_cache_size);
 #endif
 
     /// Set path for format schema files
-    auto format_schema_path = Poco::File(config().getString("format_schema_path", path + "format_schemas/"));
-    global_context->setFormatSchemaPath(format_schema_path.path());
-    format_schema_path.createDirectories();
+    fs::path format_schema_path(config().getString("format_schema_path", fs::path(path) / "format_schemas/"));
+    global_context->setFormatSchemaPath(format_schema_path);
+    fs::create_directories(format_schema_path);
 
     /// Check sanity of MergeTreeSettings on server startup
     global_context->getMergeTreeSettings().sanityCheck(settings);
@@ -885,10 +940,30 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 servers_to_start_before_tables->emplace_back(
                     port_name,
                     std::make_unique<Poco::Net::TCPServer>(
-                        new KeeperTCPHandlerFactory(*this), server_pool, socket, new Poco::Net::TCPServerParams));
+                        new KeeperTCPHandlerFactory(*this, false), server_pool, socket, new Poco::Net::TCPServerParams));
 
                 LOG_INFO(log, "Listening for connections to Keeper (tcp): {}", address.toString());
             });
+
+            const char * secure_port_name = "keeper_server.tcp_port_secure";
+            createServer(listen_host, secure_port_name, listen_try, [&](UInt16 port)
+            {
+#if USE_SSL
+                Poco::Net::SecureServerSocket socket;
+                auto address = socketBindListen(socket, listen_host, port, /* secure = */ true);
+                socket.setReceiveTimeout(settings.receive_timeout);
+                socket.setSendTimeout(settings.send_timeout);
+                servers_to_start_before_tables->emplace_back(
+                    secure_port_name,
+                    std::make_unique<Poco::Net::TCPServer>(
+                        new KeeperTCPHandlerFactory(*this, true), server_pool, socket, new Poco::Net::TCPServerParams));
+                LOG_INFO(log, "Listening for connections to Keeper with secure protocol (tcp_secure): {}", address.toString());
+#else
+                UNUSED(port);
+                throw Exception{"SSL support for TCP protocol is disabled because Poco library was built without NetSSL support.",
+                    ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
+            });
         }
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "ClickHouse server built without NuRaft library. Cannot use internal coordination.");
@@ -937,10 +1012,12 @@ int Server::main(const std::vector<std::string> & /*args*/)
             global_context->shutdownKeeperStorageDispatcher();
         }
 
+        /// Wait server pool to avoid use-after-free of destroyed context in the handlers
+        server_pool.joinAll();
+
         /** Explicitly destroy Context. It is more convenient than in destructor of Server, because logger is still available.
           * At this moment, no one could own shared part of Context.
           */
-        global_context_ptr = nullptr;
         global_context.reset();
         shared_context.reset();
         LOG_DEBUG(log, "Destroyed global context.");
@@ -954,14 +1031,16 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
     try
     {
-        loadMetadataSystem(*global_context);
+        loadMetadataSystem(global_context);
         /// After attaching system databases we can initialize system log.
         global_context->initializeSystemLogs();
         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.loadTemporaryDatabase();
         /// Then, load remaining databases
-        loadMetadata(*global_context, default_database);
+        loadMetadata(global_context, default_database);
         database_catalog.loadDatabases();
         /// After loading validate that default database exists
         database_catalog.assertDatabaseExists(default_database);
@@ -1041,7 +1120,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
     else
     {
         /// Initialize a watcher periodically updating DNS cache
-        dns_cache_updater = std::make_unique<DNSCacheUpdater>(*global_context, config().getInt("dns_cache_update_period", 15));
+        dns_cache_updater = std::make_unique<DNSCacheUpdater>(global_context, config().getInt("dns_cache_update_period", 15));
     }
 
 #if defined(OS_LINUX)
@@ -1073,7 +1152,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
     {
         /// This object will periodically calculate some metrics.
         AsynchronousMetrics async_metrics(
-            *global_context, config().getUInt("asynchronous_metrics_update_period_s", 60), servers_to_start_before_tables, servers);
+            global_context, config().getUInt("asynchronous_metrics_update_period_s", 60), servers_to_start_before_tables, servers);
         attachSystemTablesAsync(*DatabaseCatalog::instance().getSystemDatabase(), async_metrics);
 
         for (const auto & listen_host : listen_hosts)
@@ -1310,18 +1389,9 @@ int Server::main(const std::vector<std::string> & /*args*/)
         }
 
         /// try to load dictionaries immediately, throw on error and die
-        ext::scope_guard dictionaries_xmls, models_xmls;
         try
         {
-            if (!config().getBool("dictionaries_lazy_load", true))
-            {
-                global_context->tryCreateEmbeddedDictionaries();
-                global_context->getExternalDictionariesLoader().enableAlwaysLoadEverything(true);
-            }
-            dictionaries_xmls = global_context->getExternalDictionariesLoader().addConfigRepository(
-                std::make_unique<ExternalLoaderXMLConfigRepository>(config(), "dictionaries_config"));
-            models_xmls = global_context->getExternalModelsLoader().addConfigRepository(
-                std::make_unique<ExternalLoaderXMLConfigRepository>(config(), "models_config"));
+            global_context->loadDictionaries(config());
         }
         catch (...)
         {
@@ -1336,7 +1406,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
             int pool_size = config().getInt("distributed_ddl.pool_size", 1);
             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(),
+            global_context->setDDLWorker(std::make_unique<DDLWorker>(pool_size, ddl_zookeeper_path, global_context, &config(),
                                                                      "distributed_ddl", "DDLWorker", &CurrentMetrics::MaxDDLEntryID));
         }
 
@@ -1387,7 +1457,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 /// Dump coverage here, because std::atexit callback would not be called.
                 dumpCoverageReportIfPossible();
                 LOG_INFO(log, "Will shutdown forcefully.");
-                _exit(Application::EXIT_OK);
+                forceShutdown();
             }
         });
 
diff --git a/programs/server/Server.h b/programs/server/Server.h
index fbfc26f6ee5..45e5fccd51d 100644
--- a/programs/server/Server.h
+++ b/programs/server/Server.h
@@ -40,9 +40,9 @@ public:
         return BaseDaemon::logger();
     }
 
-    Context & context() const override
+    ContextMutablePtr context() const override
     {
-        return *global_context_ptr;
+        return global_context;
     }
 
     bool isCancelled() const override
@@ -64,8 +64,7 @@ protected:
     std::string getDefaultCorePath() const override;
 
 private:
-    Context * global_context_ptr = nullptr;
-
+    ContextMutablePtr global_context;
     Poco::Net::SocketAddress socketBindListen(Poco::Net::ServerSocket & socket, const std::string & host, UInt16 port, [[maybe_unused]] bool secure = false) const;
 
     using CreateServerFunc = std::function<void(UInt16)>;
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 9c01b328290..75647b10416 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -7,7 +7,20 @@
 -->
 <yandex>
     <logger>
-        <!-- Possible levels: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105 -->
+        <!-- Possible levels [1]:
+
+          - none (turns off logging)
+          - fatal
+          - critical
+          - error
+          - warning
+          - notice
+          - information
+          - debug
+          - trace
+
+            [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
+        -->
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
         <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
@@ -76,7 +89,7 @@
     <!-- Compatibility with PostgreSQL protocol.
          ClickHouse will pretend to be PostgreSQL for applications connecting to this port.
     -->
-    <!-- <postgresql_port>9005</postgresql_port> -->
+    <postgresql_port>9005</postgresql_port>
 
     <!-- HTTP API with TLS (HTTPS).
          You have to configure certificate to enable this interface.
@@ -316,6 +329,8 @@
       -->
     <mmap_cache_size>1000</mmap_cache_size>
 
+    <!-- Cache size for compiled expressions.-->
+    <compiled_expression_cache_size>1073741824</compiled_expression_cache_size>
 
     <!-- Path to data directory, with trailing slash. -->
     <path>/var/lib/clickhouse/</path>
@@ -347,6 +362,20 @@
                 bind_dn - template used to construct the DN to bind to.
                         The resulting DN will be constructed by replacing all '{user_name}' substrings of the template with the actual
                          user name during each authentication attempt.
+                user_dn_detection - section with LDAP search parameters for detecting the actual user DN of the bound user.
+                        This is mainly used in search filters for further role mapping when the server is Active Directory. The
+                         resulting user DN will be used when replacing '{user_dn}' substrings wherever they are allowed. By default,
+                         user DN is set equal to bind DN, but once search is performed, it will be updated with to the actual detected
+                         user DN value.
+                    base_dn - template used to construct the base DN for the LDAP search.
+                            The resulting DN will be constructed by replacing all '{user_name}' and '{bind_dn}' substrings
+                             of the template with the actual user name and bind DN during the LDAP search.
+                    scope - scope of the LDAP search.
+                            Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
+                    search_filter - template used to construct the search filter for the LDAP search.
+                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', and '{base_dn}'
+                             substrings of the template with the actual user name, bind DN, and base DN during the LDAP search.
+                            Note, that the special characters must be escaped properly in XML.
                 verification_cooldown - a period of time, in seconds, after a successful bind attempt, during which a user will be assumed
                          to be successfully authenticated for all consecutive requests without contacting the LDAP server.
                         Specify 0 (the default) to disable caching and force contacting the LDAP server for each authentication request.
@@ -378,6 +407,17 @@
                     <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>
+             Example (typical Active Directory with configured user DN detection for further role mapping):
+                <my_ad_server>
+                    <host>localhost</host>
+                    <port>389</port>
+                    <bind_dn>EXAMPLE\{user_name}</bind_dn>
+                    <user_dn_detection>
+                        <base_dn>CN=Users,DC=example,DC=com</base_dn>
+                        <search_filter>(&amp;(objectClass=user)(sAMAccountName={user_name}))</search_filter>
+                    </user_dn_detection>
+                    <enable_tls>no</enable_tls>
+                </my_ad_server>
         -->
     </ldap_servers>
 
@@ -429,15 +469,16 @@
                         There can be multiple 'role_mapping' sections defined inside the same 'ldap' section. All of them will be
                          applied.
                     base_dn - template used to construct the base DN for the LDAP search.
-                            The resulting DN will be constructed by replacing all '{user_name}' and '{bind_dn}' substrings
-                             of the template with the actual user name and bind DN during each LDAP search.
+                            The resulting DN will be constructed by replacing all '{user_name}', '{bind_dn}', and '{user_dn}'
+                             substrings of the template with the actual user name, bind DN, and user DN during each LDAP search.
                     scope - scope of the LDAP search.
                             Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
                     search_filter - template used to construct the search filter for the LDAP search.
-                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', and '{base_dn}'
-                             substrings of the template with the actual user name, bind DN, and base DN during each LDAP search.
+                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', '{user_dn}', and
+                             '{base_dn}' substrings of the template with the actual user name, bind DN, user DN, and base DN during
+                             each LDAP search.
                             Note, that the special characters must be escaped properly in XML.
-                    attribute - attribute name whose values will be returned by the LDAP search.
+                    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. Prefix will be removed from the original strings and resulting strings will be treated
                              as local role names. Empty, by default.
@@ -456,6 +497,17 @@
                         <prefix>clickhouse_</prefix>
                     </role_mapping>
                 </ldap>
+             Example (typical Active Directory with role mapping that relies on the detected user DN):
+                <ldap>
+                    <server>my_ad_server</server>
+                    <role_mapping>
+                        <base_dn>CN=Users,DC=example,DC=com</base_dn>
+                        <attribute>CN</attribute>
+                        <scope>subtree</scope>
+                        <search_filter>(&amp;(objectClass=group)(member={user_dn}))</search_filter>
+                        <prefix>clickhouse_</prefix>
+                    </role_mapping>
+                </ldap>
         -->
     </user_directories>
 
@@ -505,6 +557,33 @@
     <!-- Reallocate memory for machine code ("text") using huge pages. Highly experimental. -->
     <remap_executable>false</remap_executable>
 
+    <![CDATA[
+         Uncomment below in order to use JDBC table engine and function.
+
+         To install and run JDBC bridge in background:
+         * [Debian/Ubuntu]
+           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
+           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
+           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+           apt install --no-install-recommends -f ./clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+           clickhouse-jdbc-bridge &
+
+         * [CentOS/RHEL]
+           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
+           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
+           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+           yum localinstall -y clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+           clickhouse-jdbc-bridge &
+
+         Please refer to https://github.com/ClickHouse/clickhouse-jdbc-bridge#usage for more information.
+    ]]>
+    <!--
+    <jdbc_bridge>
+        <host>127.0.0.1</host>
+        <port>9019</port>
+    </jdbc_bridge>
+    -->
+  
     <!-- Configuration of clusters that could be used in Distributed tables.
          https://clickhouse.tech/docs/en/operations/table_engines/distributed/
       -->
diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example
new file mode 100644
index 00000000000..bebfd74ff58
--- /dev/null
+++ b/programs/server/config.yaml.example
@@ -0,0 +1,950 @@
+# 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/
+
+# 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.
+# You can either move the settings to the right place inside "users.xml" file
+# or add skip_check_for_incorrect_settings: 1 here.
+logger:
+    # Possible levels [1]:
+    # - none (turns off logging)
+    # - fatal
+    # - critical
+    # - error
+    # - warning
+    # - notice
+    # - information
+    # - debug
+    # - trace
+    # [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
+    level: trace
+    log: /var/log/clickhouse-server/clickhouse-server.log
+    errorlog: /var/log/clickhouse-server/clickhouse-server.err.log
+    # Rotation policy
+    # See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
+    size: 1000M
+    count: 10
+    # console: 1
+    # Default behavior is autodetection (log to console if not daemon mode and is tty)
+
+    # Per level overrides (legacy):
+    # For example to suppress logging of the ConfigReloader you can use:
+    # NOTE: levels.logger is reserved, see below.
+    # levels:
+    #     ConfigReloader: none
+
+    # Per level overrides:
+    # For example to suppress logging of the RBAC for default user you can use:
+    # (But please note that the logger name maybe changed from version to version, even after minor upgrade)
+    # levels:
+    #     - logger:
+    #         name: 'ContextAccess (default)'
+    #         level: none
+    #     - logger:
+    #         name: 'DatabaseOrdinary (test)'
+    #         level: none
+
+# 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.
+# display_name: production
+
+# Port for HTTP API. See also 'https_port' for secure connections.
+# This interface is also used by ODBC and JDBC drivers (DataGrip, Dbeaver, ...)
+# and by most of web interfaces (embedded UI, Grafana, Redash, ...).
+http_port: 8123
+
+# Port for interaction by native protocol with:
+# - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
+# - clickhouse-server with other clickhouse-servers for distributed query processing;
+# - ClickHouse drivers and applications supporting native protocol
+# (this protocol is also informally called as "the TCP protocol");
+# See also 'tcp_port_secure' for secure connections.
+tcp_port: 9000
+
+# Compatibility with MySQL protocol.
+# ClickHouse will pretend to be MySQL for applications connecting to this port.
+mysql_port: 9004
+
+# Compatibility with PostgreSQL protocol.
+# ClickHouse will pretend to be PostgreSQL for applications connecting to this port.
+postgresql_port: 9005
+
+# HTTP API with TLS (HTTPS).
+# You have to configure certificate to enable this interface.
+# See the openSSL section below.
+# https_port: 8443
+
+# Native interface with TLS.
+# You have to configure certificate to enable this interface.
+# See the openSSL section below.
+# tcp_port_secure: 9440
+
+# Native interface wrapped with PROXYv1 protocol
+# PROXYv1 header sent for every connection.
+# ClickHouse will extract information about proxy-forwarded client address from the header.
+# tcp_with_proxy_port: 9011
+
+# Port for communication between replicas. Used for data exchange.
+# It provides low-level data access between servers.
+# This port should not be accessible from untrusted networks.
+# See also 'interserver_http_credentials'.
+# Data transferred over connections to this port should not go through untrusted networks.
+# See also 'interserver_https_port'.
+interserver_http_port: 9009
+
+# Port for communication between replicas with TLS.
+# You have to configure certificate to enable this interface.
+# See the openSSL section below.
+# See also 'interserver_http_credentials'.
+# interserver_https_port: 9010
+
+# Hostname that is used by other replicas to request this server.
+# If not specified, than it is determined analogous to 'hostname -f' command.
+# This setting could be used to switch replication to another network interface
+# (the server may be connected to multiple networks via multiple addresses)
+# interserver_http_host: example.yandex.ru
+
+# You can specify credentials for authenthication between replicas.
+# This is required when interserver_https_port is accessible from untrusted networks,
+# and also recommended to avoid SSRF attacks from possibly compromised services in your network.
+# interserver_http_credentials:
+#     user: interserver
+#     password: ''
+
+# Listen specified address.
+# Use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere.
+# Notes:
+# If you open connections from wildcard address, make sure that at least one of the following measures applied:
+# - server is protected by firewall and not accessible from untrusted networks;
+# - all users are restricted to subset of network addresses (see users.xml);
+# - all users have strong passwords, only secure (TLS) interfaces are accessible, or connections are only made via TLS interfaces.
+# - users without password have readonly access.
+# See also: https://www.shodan.io/search?query=clickhouse
+# listen_host: '::'
+
+# Same for hosts without support for IPv6:
+# listen_host: 0.0.0.0
+
+# Default values - try listen localhost on IPv4 and IPv6.
+# listen_host: '::1'
+# listen_host: 127.0.0.1
+
+# Don't exit if IPv6 or IPv4 networks are unavailable while trying to listen.
+# listen_try: 0
+
+# Allow multiple servers to listen on the same address:port. This is not recommended.
+# listen_reuse_port: 0
+
+# listen_backlog: 64
+max_connections: 4096
+
+# For 'Connection: keep-alive' in HTTP 1.1
+keep_alive_timeout: 3
+
+# gRPC protocol (see src/Server/grpc_protos/clickhouse_grpc.proto for the API)
+# grpc_port: 9100
+grpc:
+    enable_ssl: false
+
+    # The following two files are used only if enable_ssl=1
+    ssl_cert_file: /path/to/ssl_cert_file
+    ssl_key_file: /path/to/ssl_key_file
+
+    # Whether server will request client for a certificate
+    ssl_require_client_auth: false
+
+    # The following file is used only if ssl_require_client_auth=1
+    ssl_ca_cert_file: /path/to/ssl_ca_cert_file
+
+    # Default compression algorithm (applied if client doesn't specify another algorithm).
+    # Supported algorithms: none, deflate, gzip, stream_gzip
+    compression: deflate
+
+    # Default compression level (applied if client doesn't specify another level).
+    # Supported levels: none, low, medium, high
+    compression_level: medium
+
+    # Send/receive message size limits in bytes. -1 means unlimited
+    max_send_message_size: -1
+    max_receive_message_size: -1
+
+    # Enable if you want very detailed logs
+    verbose_logs: false
+
+# 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
+        # openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt
+        certificateFile: /etc/clickhouse-server/server.crt
+        privateKeyFile: /etc/clickhouse-server/server.key
+
+        # dhparams are optional. You can delete the dhParamsFile: element.
+        # To generate dhparams, use the following command:
+        # openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096
+        # Only file format with BEGIN DH PARAMETERS is supported.
+        dhParamsFile: /etc/clickhouse-server/dhparam.pem
+        verificationMode: none
+        loadDefaultCAFile: true
+        cacheSessions: true
+        disableProtocols: 'sslv2,sslv3'
+        preferServerCiphers: true
+    client:
+        # Used for connecting to https dictionary source and secured Zookeeper communication
+        loadDefaultCAFile: true
+        cacheSessions: true
+        disableProtocols: 'sslv2,sslv3'
+        preferServerCiphers: true
+
+        # Use for self-signed: verificationMode: none
+        invalidCertificateHandler:
+            # Use for self-signed: name: AcceptCertificateHandler
+            name: RejectCertificateHandler
+
+# Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123
+# http_server_default_response: |-
+#     <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>
+
+# Maximum number of concurrent queries.
+max_concurrent_queries: 100
+
+# Maximum memory usage (resident set size) for server process.
+# Zero value or unset means default. Default is "max_server_memory_usage_to_ram_ratio" of available physical RAM.
+# If the value is larger than "max_server_memory_usage_to_ram_ratio" of available physical RAM, it will be cut down.
+
+# The constraint is checked on query execution time.
+# If a query tries to allocate memory and the current memory usage plus allocation is greater
+# than specified threshold, exception will be thrown.
+
+# It is not practical to set this constraint to small values like just a few gigabytes,
+# because memory allocator will keep this amount of memory in caches and the server will deny service of queries.
+max_server_memory_usage: 0
+
+# Maximum number of threads in the Global thread pool.
+# This will default to a maximum of 10000 threads if not specified.
+# This setting will be useful in scenarios where there are a large number
+# of distributed queries that are running concurrently but are idling most
+# of the time, in which case a higher number of threads might be required.
+max_thread_pool_size: 10000
+
+# On memory constrained environments you may have to set this to value larger than 1.
+max_server_memory_usage_to_ram_ratio: 0.9
+
+# Simple server-wide memory profiler. Collect a stack trace at every peak allocation step (in bytes).
+# Data will be stored in system.trace_log table with query_id = empty string.
+# Zero means disabled.
+total_memory_profiler_step: 4194304
+
+# 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 the untracked memory limit,
+# which is 4 MiB by default but can be lowered if 'total_memory_profiler_step' is lowered.
+# You may want to set 'total_memory_profiler_step' to 1 for extra fine grained sampling.
+total_memory_tracker_sample_probability: 0
+
+# Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+# correct maximum value.
+# max_open_files: 262144
+
+# Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+# In bytes. Cache is single for server. Memory is allocated only on demand.
+# Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+# Uncompressed cache is advantageous only for very short queries and in rare cases.
+
+# Note: uncompressed cache can be pointless for lz4, because memory bandwidth
+# is slower than multi-core decompression on some server configurations.
+# Enabling it can sometimes paradoxically make queries slower.
+uncompressed_cache_size: 8589934592
+
+# Approximate size of mark cache, used in tables of MergeTree family.
+# In bytes. Cache is single for server. Memory is allocated only on demand.
+# You should not lower this value.
+mark_cache_size: 5368709120
+
+# If you enable the `min_bytes_to_use_mmap_io` setting,
+# the data in MergeTree tables can be read with mmap to avoid copying from kernel to userspace.
+# It makes sense only for large files and helps only if data reside in page cache.
+# To avoid frequent open/mmap/munmap/close calls (which are very expensive due to consequent page faults)
+# and to reuse mappings from several threads and queries,
+# the cache of mapped files is maintained. Its size is the number of mapped regions (usually equal to the number of mapped files).
+# 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
+# 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.
+# The cache is dropped (the files are closed) automatically on removal of old parts in MergeTree,
+# 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
+
+# Path to data directory, with trailing slash.
+path: /var/lib/clickhouse/
+
+# Path to temporary data for processing hard queries.
+tmp_path: /var/lib/clickhouse/tmp/
+
+# Policy from the <storage_configuration> for the temporary files.
+# If not set <tmp_path> is used, otherwise <tmp_path> is ignored.
+
+# Notes:
+# - move_factor              is ignored
+# - keep_free_space_bytes    is ignored
+# - max_data_part_size_bytes is ignored
+# - you must have exactly one volume in that policy
+# tmp_policy: tmp
+
+# Directory with user provided files that are accessible by 'file' table function.
+user_files_path: /var/lib/clickhouse/user_files/
+
+# LDAP server definitions.
+ldap_servers: ''
+
+# List LDAP servers with their connection parameters here to later 1) use them as authenticators for dedicated local users,
+# who have 'ldap' authentication mechanism specified instead of 'password', or to 2) use them as remote user directories.
+# Parameters:
+# host - LDAP server hostname or IP, this parameter is mandatory and cannot be empty.
+# port - LDAP server port, default is 636 if enable_tls is set to true, 389 otherwise.
+# bind_dn - template used to construct the DN to bind to.
+# The resulting DN will be constructed by replacing all '{user_name}' substrings of the template with the actual
+# user name during each authentication attempt.
+# user_dn_detection - section with LDAP search parameters for detecting the actual user DN of the bound user.
+# This is mainly used in search filters for further role mapping when the server is Active Directory. The
+# resulting user DN will be used when replacing '{user_dn}' substrings wherever they are allowed. By default,
+# user DN is set equal to bind DN, but once search is performed, it will be updated with to the actual detected
+# user DN value.
+# base_dn - template used to construct the base DN for the LDAP search.
+# The resulting DN will be constructed by replacing all '{user_name}' and '{bind_dn}' substrings
+# of the template with the actual user name and bind DN during the LDAP search.
+# scope - scope of the LDAP search.
+# Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
+# search_filter - template used to construct the search filter for the LDAP search.
+# The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', and '{base_dn}'
+# substrings of the template with the actual user name, bind DN, and base DN during the LDAP search.
+# Note, that the special characters must be escaped properly in XML.
+# verification_cooldown - a period of time, in seconds, after a successful bind attempt, during which a user will be assumed
+# to be successfully authenticated for all consecutive requests without contacting the LDAP server.
+# Specify 0 (the default) to disable caching and force contacting the LDAP server for each authentication request.
+# enable_tls - flag to trigger use of secure connection to the LDAP server.
+# Specify 'no' for plain text (ldap://) protocol (not recommended).
+# Specify 'yes' for LDAP over SSL/TLS (ldaps://) protocol (recommended, the default).
+# Specify 'starttls' for legacy StartTLS protocol (plain text (ldap://) protocol, upgraded to TLS).
+# tls_minimum_protocol_version - the minimum protocol version of SSL/TLS.
+# Accepted values are: 'ssl2', 'ssl3', 'tls1.0', 'tls1.1', 'tls1.2' (the default).
+# tls_require_cert - SSL/TLS peer certificate verification behavior.
+# Accepted values are: 'never', 'allow', 'try', 'demand' (the default).
+# tls_cert_file - path to certificate file.
+# tls_key_file - path to certificate key file.
+# tls_ca_cert_file - path to CA certificate file.
+# tls_ca_cert_dir - path to the directory containing CA certificates.
+# tls_cipher_suite - allowed cipher suite (in OpenSSL notation).
+# Example:
+# my_ldap_server:
+#     host: localhost
+#     port: 636
+#     bind_dn: 'uid={user_name},ou=users,dc=example,dc=com'
+#     verification_cooldown: 300
+#     enable_tls: yes
+#     tls_minimum_protocol_version: tls1.2
+#     tls_require_cert: demand
+#     tls_cert_file: /path/to/tls_cert_file
+#     tls_key_file: /path/to/tls_key_file
+#     tls_ca_cert_file: /path/to/tls_ca_cert_file
+#     tls_ca_cert_dir: /path/to/tls_ca_cert_dir
+#     tls_cipher_suite: ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384
+
+# Example (typical Active Directory with configured user DN detection for further role mapping):
+# my_ad_server:
+#     host: localhost
+#     port: 389
+#     bind_dn: 'EXAMPLE\{user_name}'
+#     user_dn_detection:
+#         base_dn: CN=Users,DC=example,DC=com
+#         search_filter: '(&amp;(objectClass=user)(sAMAccountName={user_name}))'
+#     enable_tls: no
+
+# To enable Kerberos authentication support for HTTP requests (GSS-SPNEGO), for those users who are explicitly configured
+# to authenticate via Kerberos, define a single 'kerberos' section here.
+# Parameters:
+# principal - canonical service principal name, that will be acquired and used when accepting security contexts.
+# This parameter is optional, if omitted, the default principal will be used.
+# This parameter cannot be specified together with 'realm' parameter.
+# realm - a realm, that will be used to restrict authentication to only those requests whose initiator's realm matches it.
+# This parameter is optional, if omitted, no additional filtering by realm will be applied.
+# This parameter cannot be specified together with 'principal' parameter.
+# Example:
+# kerberos: ''
+
+# Example:
+# kerberos:
+#     principal: HTTP/clickhouse.example.com@EXAMPLE.COM
+
+# Example:
+# kerberos:
+#     realm: EXAMPLE.COM
+
+# Sources to read users, roles, access rights, profiles of settings, quotas.
+user_directories:
+    users_xml:
+        # Path to configuration file with predefined users.
+        path: users.yaml
+    local_directory:
+        # Path to folder where users created by SQL commands are stored.
+        path: /var/lib/clickhouse/access/
+
+#   # To add an LDAP server as a remote user directory of users that are not defined locally, define a single 'ldap' section
+#   # with the following parameters:
+#   # server - one of LDAP server names defined in 'ldap_servers' config section above.
+#   # This parameter is mandatory and cannot be empty.
+#   # roles - section with a list of locally defined roles that will be assigned to each user retrieved from the LDAP server.
+#   # If no roles are specified here or assigned during role mapping (below), user will not be able to perform any
+#   # actions after authentication.
+#   # role_mapping - section with LDAP search parameters and mapping rules.
+#   # When a user authenticates, while still bound to LDAP, an LDAP search is performed using search_filter and the
+#   # name of the logged in user. For each entry found during that search, the value of the specified attribute is
+#   # extracted. For each attribute value that has the specified prefix, the prefix is removed, and the rest of the
+#   # value becomes the name of a local role defined in ClickHouse, which is expected to be created beforehand by
+#   # CREATE ROLE command.
+#   # There can be multiple 'role_mapping' sections defined inside the same 'ldap' section. All of them will be
+#   # applied.
+#   # base_dn - template used to construct the base DN for the LDAP search.
+#   # The resulting DN will be constructed by replacing all '{user_name}', '{bind_dn}', and '{user_dn}'
+#   # substrings of the template with the actual user name, bind DN, and user DN during each LDAP search.
+#   # scope - scope of the LDAP search.
+#   # Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
+#   # search_filter - template used to construct the search filter for the LDAP search.
+#   # The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', '{user_dn}', and
+#   # '{base_dn}' substrings of the template with the actual user name, bind DN, user DN, and base DN during
+#   # each LDAP search.
+#   # Note, that the special characters must be escaped properly in XML.
+#   # 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. Prefix will be removed from the original strings and resulting strings will be treated
+#   # as local role names. Empty, by default.
+#   # Example:
+#   # ldap:
+#   #     server: my_ldap_server
+#   #     roles:
+#   #         my_local_role1: ''
+#   #         my_local_role2: ''
+#   #     role_mapping:
+#   #         base_dn: 'ou=groups,dc=example,dc=com'
+#   #         scope: subtree
+#   #         search_filter: '(&amp;(objectClass=groupOfNames)(member={bind_dn}))'
+#   #         attribute: cn
+#   #         prefix: clickhouse_
+#   # Example (typical Active Directory with role mapping that relies on the detected user DN):
+#   # ldap:
+#   #     server: my_ad_server
+#   #     role_mapping:
+#   #         base_dn: 'CN=Users,DC=example,DC=com'
+#   #         attribute: CN
+#   #         scope: subtree
+#   #         search_filter: '(&amp;(objectClass=group)(member={user_dn}))'
+#   #         prefix: clickhouse_
+
+# Default profile of settings.
+default_profile: default
+
+# Comma-separated list of prefixes for user-defined settings.
+# custom_settings_prefixes: ''
+# System profile of settings. This settings are used by internal processes (Distributed DDL worker and so on).
+# system_profile: default
+
+# Buffer profile of settings.
+# This settings are used by Buffer storage to flush data to the underlying table.
+# Default: used from system_profile directive.
+# buffer_profile: default
+
+# Default database.
+default_database: default
+
+# Server time zone could be set here.
+
+# Time zone is used when converting between String and DateTime types,
+# when printing DateTime in text formats and parsing DateTime from text,
+# it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+# Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+# If not specified, system time zone at server startup is used.
+
+# Please note, that server could display time zone alias instead of specified name.
+# Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+# timezone: Europe/Moscow
+
+# You can specify umask here (see "man umask"). Server will apply it on startup.
+# Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+# umask: 022
+
+# Perform mlockall after startup to lower first queries latency
+# and to prevent clickhouse executable from being paged out under high IO load.
+# Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+mlock_executable: true
+
+# Reallocate memory for machine code ("text") using huge pages. Highly experimental.
+remap_executable: false
+
+# Uncomment below in order to use JDBC table engine and function.
+# To install and run JDBC bridge in background:
+# * [Debian/Ubuntu]
+# export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
+# export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
+# wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+# apt install --no-install-recommends -f ./clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+# clickhouse-jdbc-bridge &
+# * [CentOS/RHEL]
+# export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
+# export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
+# wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+# yum localinstall -y clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+# clickhouse-jdbc-bridge &
+# Please refer to https://github.com/ClickHouse/clickhouse-jdbc-bridge#usage for more information.
+
+# jdbc_bridge:
+#     host: 127.0.0.1
+#     port: 9019
+
+# Configuration of clusters that could be used in Distributed tables.
+# https://clickhouse.tech/docs/en/operations/table_engines/distributed/
+remote_servers:
+    # Test only shard config for testing distributed storage
+    test_shard_localhost:
+        # Inter-server per-cluster secret for Distributed queries
+        # default: no secret (no authentication will be performed)
+
+        # If set, then Distributed queries will be validated on shards, so at least:
+        # - such cluster should exist on the shard,
+        # - such cluster should have the same secret.
+
+        # And also (and which is more important), the initial_user will
+        # be used as current user for the query.
+
+        # Right now the protocol is pretty simple and it only takes into account:
+        # - cluster name
+        # - query
+
+        # Also it will be nice if the following will be implemented:
+        # - source hostname (see interserver_http_host), but then it will depends from DNS,
+        # it can use IP address instead, but then the you need to get correct on the initiator node.
+        # - target hostname / ip address (same notes as for source hostname)
+        # - time-based security tokens
+        # secret: ''
+        shard:
+            # Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas).
+            # internal_replication: false
+            # Optional. Shard weight when writing data. Default: 1.
+            # weight: 1
+            replica:
+                host: localhost
+                port: 9000
+                # Optional. Priority of the replica for load_balancing. Default: 1 (less value has more priority).
+                # priority: 1
+    test_cluster_two_shards_localhost:
+        shard:
+            - replica:
+                  host: localhost
+                  port: 9000
+            - replica:
+                  host: localhost
+                  port: 9000
+    test_cluster_two_shards:
+        shard:
+            - replica:
+                  host: 127.0.0.1
+                  port: 9000
+            - replica:
+                  host: 127.0.0.2
+                  port: 9000
+    test_cluster_two_shards_internal_replication:
+        shard:
+            - internal_replication: true
+              replica:
+                  host: 127.0.0.1
+                  port: 9000
+            - internal_replication: true
+              replica:
+                  host: 127.0.0.2
+                  port: 9000
+    test_shard_localhost_secure:
+        shard:
+            replica:
+                host: localhost
+                port: 9440
+                secure: 1
+    test_unavailable_shard:
+        shard:
+            - replica:
+                  host: localhost
+                  port: 9000
+            - replica:
+                  host: localhost
+                  port: 1
+
+# The list of hosts allowed to use in URL-related storage engines and table functions.
+# If this section is not present in configuration, all hosts are allowed.
+# remote_url_allow_hosts:
+
+# Host should be specified exactly as in URL. The name is checked before DNS resolution.
+# Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
+# If port is explicitly specified in URL, the host:port is checked as a whole.
+# If host specified here without port, any port with this host allowed.
+# "yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed.
+# If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
+# If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked.
+
+# Regular expression can be specified. RE2 engine is used for regexps.
+# Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
+# (forgetting to do so is a common source of error).
+
+# 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.
+
+# 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/
+
+# zookeeper:
+#     - node:
+#         host: example1
+#         port: 2181
+#     - node:
+#         host: example2
+#         port: 2181
+#     - node:
+#         host: example3
+#         port: 2181
+
+# 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
+# macros:
+#     shard: 01
+#     replica: example01-01-1
+
+# Reloading interval for embedded dictionaries, in seconds. Default: 3600.
+builtin_dictionaries_reload_interval: 3600
+
+# Maximum session timeout, in seconds. Default: 3600.
+max_session_timeout: 3600
+
+# Default session timeout, in seconds. Default: 60.
+default_session_timeout: 60
+
+# Sending data to Graphite for monitoring. Several sections can be defined.
+# interval - send every X second
+# root_path - prefix for keys
+# hostname_in_path - append hostname to root_path (default = true)
+# metrics - send data from table system.metrics
+# events - send data from table system.events
+# asynchronous_metrics - send data from table system.asynchronous_metrics
+
+# graphite:
+#     host: localhost
+#     port: 42000
+#     timeout: 0.1
+#     interval: 60
+#     root_path: one_min
+#     hostname_in_path: true
+
+#     metrics: true
+#     events: true
+#     events_cumulative: false
+#     asynchronous_metrics: true
+
+# graphite:
+#     host: localhost
+#     port: 42000
+#     timeout: 0.1
+#     interval: 1
+#     root_path: one_sec
+
+#     metrics: true
+#     events: true
+#     events_cumulative: false
+#     asynchronous_metrics: false
+
+# Serve endpoint for Prometheus monitoring.
+# endpoint - mertics path (relative to root, statring with "/")
+# port - port to setup server. If not defined or 0 than http_port used
+# metrics - send data from table system.metrics
+# events - send data from table system.events
+# asynchronous_metrics - send data from table system.asynchronous_metrics
+# status_info - send data from different component from CH, ex: Dictionaries status
+
+# prometheus:
+#     endpoint: /metrics
+#     port: 9363
+
+#     metrics: true
+#     events: true
+#     asynchronous_metrics: true
+#     status_info: true
+
+# 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.
+    # When query log structure is changed after system update,
+    # then old table will be renamed and new table will be created automatically.
+    database: system
+    table: query_log
+
+    # PARTITION BY expr: https://clickhouse.yandex/docs/en/table_engines/mergetree-family/custom_partitioning_key/
+    # Example:
+    # event_date
+    # toMonday(event_date)
+    # toYYYYMM(event_date)
+    # 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
+    # Example:
+    # event_date + INTERVAL 1 WEEK
+    # event_date + INTERVAL 7 DAY DELETE
+    # event_date + INTERVAL 2 WEEK TO DISK 'bbb'
+
+    # ttl: 'event_date + INTERVAL 30 DAY DELETE'
+
+    # Instead of partition_by, you can provide full engine expression (starting with ENGINE = ) with parameters,
+    # Example: engine: 'ENGINE = MergeTree PARTITION BY toYYYYMM(event_date) ORDER BY (event_date, event_time) SETTINGS index_granularity = 1024'
+
+    # Interval of flushing data.
+    flush_interval_milliseconds: 7500
+
+# Trace log. Stores stack traces collected by query profilers.
+# See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings.
+trace_log:
+    database: system
+    table: trace_log
+    partition_by: toYYYYMM(event_date)
+    flush_interval_milliseconds: 7500
+
+# Query thread log. Has information about all threads participated in query execution.
+# Used only for queries with setting log_query_threads = 1.
+query_thread_log:
+    database: system
+    table: query_thread_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
+
+# Uncomment to write text log into table.
+# Text log contains all information from usual server log but stores it in structured and efficient way.
+# The level of the messages that goes to the table can be limited (<level>), if not specified all messages will go to the table.
+# text_log:
+#     database: system
+#     table: text_log
+#     flush_interval_milliseconds: 7500
+#     level: ''
+
+# Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval.
+metric_log:
+    database: system
+    table: metric_log
+    flush_interval_milliseconds: 7500
+    collect_interval_milliseconds: 1000
+
+# Asynchronous metric log contains values of metrics from
+# system.asynchronous_metrics.
+asynchronous_metric_log:
+    database: system
+    table: asynchronous_metric_log
+
+    # Asynchronous metrics are updated once a minute, so there is
+    # no need to flush more often.
+    flush_interval_milliseconds: 60000
+
+# OpenTelemetry log contains OpenTelemetry trace spans.
+opentelemetry_span_log:
+
+    # The default table creation code is insufficient, this <engine> spec
+    # is a workaround. There is no 'event_time' for this log, but two times,
+    # start and finish. It is sorted by finish time, to avoid inserting
+    # data too far away in the past (probably we can sometimes insert a span
+    # that is seconds earlier than the last span in the table, due to a race
+    # between several spans inserted in parallel). This gives the spans a
+    # global order that we can use to e.g. retry insertion into some external
+    # system.
+    engine: |-
+        engine MergeTree
+             partition by toYYYYMM(finish_date)
+             order by (finish_date, finish_time_us, trace_id)
+    database: system
+    table: opentelemetry_span_log
+    flush_interval_milliseconds: 7500
+
+# Crash log. Stores stack traces for fatal errors.
+# This table is normally empty.
+crash_log:
+    database: system
+    table: crash_log
+    partition_by: ''
+    flush_interval_milliseconds: 1000
+
+# Parameters for embedded dictionaries, used in Yandex.Metrica.
+# See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+
+# Path to file with region hierarchy.
+# path_to_regions_hierarchy_file: /opt/geo/regions_hierarchy.txt
+
+# Path to directory with files containing names of regions
+# path_to_regions_names_files: /opt/geo/
+
+
+# top_level_domains_path: /var/lib/clickhouse/top_level_domains/
+# Custom TLD lists.
+# Format: name: /path/to/file
+
+# Changes will not be applied w/o server restart.
+# Path to the list is under top_level_domains_path (see above).
+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
+dictionaries_config: '*_dictionary.xml'
+
+# Uncomment if you want data to be compressed 30-100% better.
+# Don't do that if you just started using ClickHouse.
+
+# compression:
+#     # Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used.
+#     case:
+#         Conditions. All must be satisfied. Some conditions may be omitted.
+#         # min_part_size: 10000000000    # Min part size in bytes.
+#         # min_part_size_ratio: 0.01     # Min size of part relative to whole table size.
+#         # What compression method to use.
+#         method: zstd
+
+# 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.
+distributed_ddl:
+    # Path in ZooKeeper to queue with DDL queries
+    path: /clickhouse/task_queue/ddl
+
+    # Settings from this profile will be used to execute DDL queries
+    # profile: default
+
+    # Controls how much ON CLUSTER queries can be run simultaneously.
+    # pool_size: 1
+
+    # Cleanup settings (active tasks will not be removed)
+
+    # Controls task TTL (default 1 week)
+    # task_max_lifetime: 604800
+
+    # Controls how often cleanup should be performed (in seconds)
+    # cleanup_delay_period: 60
+
+    # Controls how many tasks could be in the queue
+    # max_tasks_in_queue: 1000
+
+# Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h
+# merge_tree:
+#     max_suspicious_broken_parts: 5
+
+# Protection from accidental DROP.
+# If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+# If you want do delete one table and don't want to change clickhouse-server config, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+# By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+# The same for max_partition_size_to_drop.
+# Uncomment to disable protection.
+
+# max_table_size_to_drop: 0
+# max_partition_size_to_drop: 0
+
+# Example of parameters for GraphiteMergeTree table engine
+graphite_rollup_example:
+    pattern:
+        regexp: click_cost
+        function: any
+        retention:
+            - age: 0
+              precision: 3600
+            - age: 86400
+              precision: 60
+    default:
+        function: max
+        retention:
+            - age: 0
+              precision: 60
+            - age: 3600
+              precision: 300
+            - age: 86400
+              precision: 3600
+
+# Directory in <clickhouse-path> containing schema files for various input formats.
+# The directory will be created if it doesn't exist.
+format_schema_path: /var/lib/clickhouse/format_schemas/
+
+# Default query masking rules, matching lines would be replaced with something else in the logs
+# (both text logs and system.query_log).
+# name - name for the rule (optional)
+# regexp - RE2 compatible regular expression (mandatory)
+# replace - substitution string for sensitive data (optional, by default - six asterisks)
+query_masking_rules:
+    rule:
+        name: hide encrypt/decrypt arguments
+        regexp: '((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:''(?:\\''|.)+''|.*?)\s*\)'
+        # or more secure, but also more invasive:
+        # (aes_\w+)\s*\(.*\)
+        replace: \1(???)
+
+# Uncomment to use custom http handlers.
+# rules are checked from top to bottom, first match runs the handler
+# url - to match request URL, you can use 'regex:' prefix to use regex match(optional)
+# methods - to match request method, you can use commas to separate multiple method matches(optional)
+# headers - to match request headers, match each child element(child element name is header name), you can use 'regex:' prefix to use regex match(optional)
+# handler is request handler
+# type - supported types: static, dynamic_query_handler, predefined_query_handler
+# query - use with predefined_query_handler type, executes query when the handler is called
+# query_param_name - use with dynamic_query_handler type, extracts and executes the value corresponding to the <query_param_name> value in HTTP request params
+# status - use with static type, response status code
+# content_type - use with static type, response content-type
+# response_content - use with static type, Response content sent to client, when using the prefix 'file://' or 'config://', find the content from the file or configuration send to client.
+
+# http_handlers:
+#     - rule:
+#         url: /
+#         methods: POST,GET
+#         headers:
+#           pragma: no-cache
+#         handler:
+#           type: dynamic_query_handler
+#           query_param_name: query
+#     - rule:
+#         url: /predefined_query
+#         methods: POST,GET
+#         handler:
+#           type: predefined_query_handler
+#           query: 'SELECT * FROM system.settings'
+#     - rule:
+#         handler:
+#           type: static
+#           status: 200
+#           content_type: 'text/plain; charset=UTF-8'
+#           response_content: config://http_server_default_response
+
+send_crash_reports:
+    # Changing <enabled> to true allows sending crash reports to
+    # the ClickHouse core developers team via Sentry https://sentry.io
+    # Doing so at least in pre-production environments is highly appreciated
+    enabled: false
+    # Change <anonymize> to true if you don't feel comfortable attaching the server hostname to the crash report
+    anonymize: false
+    # Default endpoint should be changed to different Sentry DSN only if you have
+    # some in-house engineers or hired consultants who're going to debug ClickHouse issues for you
+    endpoint: 'https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277'
+    # Uncomment to disable ClickHouse internal DNS caching.
+    # disable_internal_dns_cache: 1
diff --git a/programs/server/data/.gitignore b/programs/server/data/.gitignore
deleted file mode 100644
index b9719d9d1d1..00000000000
--- a/programs/server/data/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.txt
-*.dat
-*.idx
diff --git a/programs/server/metadata/.gitignore b/programs/server/metadata/.gitignore
deleted file mode 100644
index d1b811b7de5..00000000000
--- a/programs/server/metadata/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.sql
diff --git a/programs/server/users.yaml.example b/programs/server/users.yaml.example
new file mode 100644
index 00000000000..76aee04c19b
--- /dev/null
+++ b/programs/server/users.yaml.example
@@ -0,0 +1,107 @@
+# Profiles of settings.
+profiles:
+    # Default settings.
+    default:
+        # Maximum memory usage for processing single query, in bytes.
+        max_memory_usage: 10000000000
+
+        # How to choose between replicas during distributed query processing.
+        # random - choose random replica from set of replicas with minimum number of errors
+        # nearest_hostname - from set of replicas with minimum number of errors, choose replica
+        # with minimum number of different symbols between replica's hostname and local hostname (Hamming distance).
+        # in_order - first live replica is chosen in specified order.
+        # first_or_random - if first replica one has higher number of errors, pick a random one from replicas with minimum number of errors.
+        load_balancing: random
+
+        # Profile that allows only read queries.
+    readonly:
+        readonly: 1
+
+# Users and ACL.
+users:
+    # If user name was not specified, 'default' user is used.
+    default:
+        # 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 could be empty.
+        #
+        # If you want to specify SHA256, place it in 'password_sha256_hex' element.
+        # Example: password_sha256_hex: 65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5
+        # Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
+        #
+        # If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
+        # Example: password_double_sha1_hex: e395796d6546b1b65db9d665cd43f0e858dd4303
+        #
+        # If you want to specify a previously defined LDAP server (see 'ldap_servers' in the main config) for authentication,
+        # place its name in 'server' element inside 'ldap' element.
+        # Example: ldap:
+                       # server: my_ldap_server
+        #
+        # If you want to authenticate the user via Kerberos (assuming Kerberos is enabled, see 'kerberos' in the main config),
+        # 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.
+        # Example: kerberos: ''
+        # Example: kerberos:
+                       # realm: EXAMPLE.COM
+        #
+        # How to generate decent password:
+        # Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+        # In first line will be password and in second - corresponding SHA256.
+        #
+        # How to generate double SHA1:
+        # Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha1sum | tr -d '-' | xxd -r -p | sha1sum | tr -d '-'
+        # In first line will be password and in second - corresponding double SHA1.
+
+        password: ''
+
+        # List of networks with open access.
+        #
+        # To open access from everywhere, specify:
+        #    - ip: '::/0'
+        #
+        # To open access only from localhost, specify:
+        #    - ip: '::1'
+        #    - ip: 127.0.0.1
+        #
+        # Each element of list has one of the following forms:
+        # ip: IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+        # 2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+        # host: Hostname. Example: server01.yandex.ru.
+        # To check access, DNS query is performed, and all received addresses compared to peer address.
+        # host_regexp: Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+        # To check access, DNS PTR query is performed for peer address and then regexp is applied.
+        # Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+        # Strongly recommended that regexp is ends with $ and take all expression in ''
+        # All results of DNS requests are cached till server restart.
+
+        networks:
+            ip: '::/0'
+
+        # Settings profile for user.
+        profile: default
+
+        # Quota for user.
+        quota: default
+
+        # User can create other users and grant rights to them.
+        # access_management: 1
+
+# Quotas.
+quotas:
+    # Name of quota.
+    default:
+        # Limits for time interval. You could specify many intervals with different limits.
+        interval:
+            # Length of interval.
+            duration: 3600
+
+            # No limits. Just calculate resource usage for time interval.
+            queries: 0
+            errors: 0
+            result_rows: 0
+            read_rows: 0
+            execution_time: 0
diff --git a/release b/release
index f2052840cb0..9484d79630a 100755
--- a/release
+++ b/release
@@ -2,23 +2,6 @@
 
 # If you have "no space left" error, you can change the location of temporary files with BUILDPLACE environment variable.
 
-# Advanced usage:
-# Test gcc-9:
-# env DIST=disco EXTRAPACKAGES="gcc-9 g++-9" DEB_CC=gcc-9 DEB_CXX=g++-9 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Test gcc-8:
-# env DIST=bionic EXTRAPACKAGES="gcc-8 g++-8" DEB_CC=gcc-8 DEB_CXX=g++-8 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Clang6 build:
-# env DIST=bionic EXTRAPACKAGES="clang-6.0 libstdc++-8-dev lld-6.0 liblld-6.0-dev libclang-6.0-dev liblld-6.0" DEB_CC=clang-6.0 DEB_CXX=clang++-6.0 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Clang7 build:
-# env DIST=unstable EXTRAPACKAGES="clang-7 libstdc++-8-dev lld-7 liblld-7-dev libclang-7-dev liblld-7" DEB_CC=clang-7 DEB_CXX=clang++-7 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Clang6 without internal compiler (for low memory arm64):
-# env DIST=bionic DISABLE_PARALLEL=1 EXTRAPACKAGES="clang-6.0 libstdc++-8-dev" DEB_CC=clang-6.0 DEB_CXX=clang++-6.0 CMAKE_FLAGS=" -DNO_WERROR=1 " ./release
-# Do not compile internal compiler but use from system:
-# env CMAKE_FLAGS="-DUSE_INTERNAL_LLVM_LIBRARY=0 -DENABLE_EMBEDDED_COMPILER=0 -DINTERNAL_COMPILER_EXECUTABLE=clang-6.0 -DINTERNAL_LINKER_EXECUTABLE=ld.lld-6.0 -DINTERNAL_COMPILER_BIN_ROOT=/usr/bin/" EXTRAPACKAGES="clang-6.0 lld-6.0 libstdc++-8-dev" DEB_CXX=clang++-6.0 DEB_CC=clang-6.0 TEST_RUN=1 TEST_OPT="compile" ./release
-
-# Build with ASan:
-# env SANITIZER=address ./release
-
 # Version increment:
 # Default release: 18.1.2 -> 18.2.0:
 # ./release --version
@@ -31,16 +14,16 @@
 
 set -e
 
+# Avoid dependency on locale
+LC_ALL=C
+
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 cd $CUR_DIR
 
 source "./utils/release/release_lib.sh"
 
-PBUILDER_AUTOUPDATE=${PBUILDER_AUTOUPDATE=4320}
-
 DEBUILD_NOSIGN_OPTIONS="-us -uc"
 DEBUILD_NODEPS_OPTIONS="-d"
-USE_PBUILDER=${USE_PBUILDER=1}
 
 if [ -z "$VERSION_STRING" ] ; then
     get_revision_author
@@ -58,16 +41,6 @@ do
     elif [[ $1 == '--version' ]]; then
         gen_revision_author $2
         exit 0
-    elif [[ $1 == '--pbuilder' ]]; then
-        # Default
-        shift
-    elif [[ $1 == '--no-pbuilder' ]]; then
-        USE_PBUILDER=
-        shift
-    elif [[ $1 == '--fast' ]]; then
-        # Wrong but fast pbuilder mode: create base package with all depends
-        EXTRAPACKAGES="$EXTRAPACKAGES debhelper cmake ninja-build gcc-8 g++-8 libc6-dev libicu-dev libreadline-dev psmisc bash expect python3 python3-lxml python3-termcolor python3-requests curl perl sudo openssl netcat-openbsd"
-        shift
     elif [[ $1 == '--rpm' ]]; then
         MAKE_RPM=1
         shift
@@ -117,43 +90,10 @@ echo -e "\nCurrent version is $VERSION_STRING"
 
 if [ -z "$NO_BUILD" ] ; then
     gen_changelog "$VERSION_STRING" "" "$AUTHOR" ""
-    if [ -z "$USE_PBUILDER" ] ; then
-        DEB_CC=${DEB_CC:=`which gcc-10 gcc-9 gcc | head -n1`}
-        DEB_CXX=${DEB_CXX:=`which gcc-10 g++-9 g++ | head -n1`}
-        # Build (only binary packages).
-        debuild --preserve-env -e PATH \
-        -e DEB_CC=$DEB_CC -e DEB_CXX=$DEB_CXX -e CMAKE_FLAGS="$CMAKE_FLAGS" \
-        -b ${DEBUILD_NOSIGN_OPTIONS} ${DEBUILD_NODEPS_OPTIONS}
-    else
-        export DIST=${DIST:=bionic}
-        export SET_BUILDRESULT=${SET_BUILDRESULT:=$CUR_DIR/..}
-
-        if [[ -z `which pbuilder` ]] ; then
-            sudo apt install -y pbuilder devscripts ccache fakeroot debhelper debian-archive-keyring debian-keyring lsb-release
-        fi
-
-        . $CUR_DIR/debian/.pbuilderrc
-
-        if [[ ! -e "/usr/share/debootstrap/scripts/${DIST}" ]] ; then
-            sudo ln -s gutsy /usr/share/debootstrap/scripts/${DIST}
-        fi
-
-        if [[ -n "$FORCE_PBUILDER_CREATE" || ! -e "$BASETGZ" ]] ; then
-            echo Creating base system $BASETGZ
-            [ ! -e "/usr/share/debootstrap/scripts/${DIST}" ] && sudo ln -s gutsy /usr/share/debootstrap/scripts/${DIST}
-            sudo --preserve-env bash -x pbuilder create --configfile $CUR_DIR/debian/.pbuilderrc $PBUILDER_OPT
-        fi
-
-        if [ "$PBUILDER_AUTOUPDATE" -gt 0 ]; then
-            # Update every 3 days (60*24*3 minutes)
-            if [[ -n "$PBUILDER_UPDATE" ]] || test `find "$BASETGZ" -mmin +$PBUILDER_AUTOUPDATE` ; then
-                echo Updating base system $BASETGZ
-                sudo --preserve-env pbuilder update --configfile $CUR_DIR/debian/.pbuilderrc $PBUILDER_OPT
-            fi
-        fi
-
-        pdebuild --configfile $CUR_DIR/debian/.pbuilderrc -- $PBUILDER_OPT
-    fi
+    # Build (only binary packages).
+    debuild --preserve-env -e PATH \
+    -e DEB_CC=$DEB_CC -e DEB_CXX=$DEB_CXX -e CMAKE_FLAGS="$CMAKE_FLAGS" \
+    -b ${DEBUILD_NOSIGN_OPTIONS} ${DEBUILD_NODEPS_OPTIONS}
 fi
 
 if [ -n "$MAKE_RPM" ]; then
diff --git a/src/Access/AccessType.h b/src/Access/AccessType.h
index 40740b3164e..22d99112cb7 100644
--- a/src/Access/AccessType.h
+++ b/src/Access/AccessType.h
@@ -53,6 +53,12 @@ enum class AccessType
     M(ALTER_CLEAR_INDEX, "CLEAR INDEX", TABLE, ALTER_INDEX) \
     M(ALTER_INDEX, "INDEX", GROUP, ALTER_TABLE) /* allows to execute ALTER ORDER BY or ALTER {ADD|DROP...} INDEX */\
     \
+    M(ALTER_ADD_PROJECTION, "ADD PROJECTION", TABLE, ALTER_PROJECTION) \
+    M(ALTER_DROP_PROJECTION, "DROP PROJECTION", TABLE, ALTER_PROJECTION) \
+    M(ALTER_MATERIALIZE_PROJECTION, "MATERIALIZE PROJECTION", TABLE, ALTER_PROJECTION) \
+    M(ALTER_CLEAR_PROJECTION, "CLEAR PROJECTION", TABLE, ALTER_PROJECTION) \
+    M(ALTER_PROJECTION, "PROJECTION", GROUP, ALTER_TABLE) /* allows to execute ALTER ORDER BY or ALTER {ADD|DROP...} PROJECTION */\
+    \
     M(ALTER_ADD_CONSTRAINT, "ADD CONSTRAINT", TABLE, ALTER_CONSTRAINT) \
     M(ALTER_DROP_CONSTRAINT, "DROP CONSTRAINT", TABLE, ALTER_CONSTRAINT) \
     M(ALTER_CONSTRAINT, "CONSTRAINT", GROUP, ALTER_TABLE) /* allows to execute ALTER {ADD|DROP} CONSTRAINT */\
@@ -62,7 +68,7 @@ enum class AccessType
                                                                        enabled implicitly by the grant ALTER_TABLE */\
     M(ALTER_SETTINGS, "ALTER SETTING, ALTER MODIFY SETTING, MODIFY SETTING", TABLE, ALTER_TABLE) /* allows to execute ALTER MODIFY SETTING */\
     M(ALTER_MOVE_PARTITION, "ALTER MOVE PART, MOVE PARTITION, MOVE PART", TABLE, ALTER_TABLE) \
-    M(ALTER_FETCH_PARTITION, "FETCH PARTITION", TABLE, ALTER_TABLE) \
+    M(ALTER_FETCH_PARTITION, "ALTER FETCH PART, FETCH PARTITION", TABLE, ALTER_TABLE) \
     M(ALTER_FREEZE_PARTITION, "FREEZE PARTITION, UNFREEZE", TABLE, ALTER_TABLE) \
     \
     M(ALTER_TABLE, "", GROUP, ALTER) \
@@ -130,8 +136,10 @@ enum class AccessType
     M(SYSTEM_RELOAD_CONFIG, "RELOAD CONFIG", GLOBAL, SYSTEM_RELOAD) \
     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_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) \
     M(SYSTEM_MERGES, "SYSTEM STOP MERGES, SYSTEM START MERGES, STOP_MERGES, START MERGES", TABLE, SYSTEM) \
     M(SYSTEM_TTL_MERGES, "SYSTEM STOP TTL MERGES, SYSTEM START TTL MERGES, STOP TTL MERGES, START TTL MERGES", TABLE, SYSTEM) \
     M(SYSTEM_FETCHES, "SYSTEM STOP FETCHES, SYSTEM START FETCHES, STOP FETCHES, START FETCHES", TABLE, SYSTEM) \
diff --git a/src/Access/AllowedClientHosts.h b/src/Access/AllowedClientHosts.h
index a6895b120e0..7b21fd7e236 100644
--- a/src/Access/AllowedClientHosts.h
+++ b/src/Access/AllowedClientHosts.h
@@ -7,7 +7,9 @@
 #include <boost/range/algorithm/find.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -198,9 +200,9 @@ inline String AllowedClientHosts::IPSubnet::toString() const
     if (isMaskAllBitsOne())
         return prefix.toString();
     else if (IPAddress{prefix_length, mask.family()} == mask)
-        return prefix.toString() + "/" + std::to_string(prefix_length);
+        return fs::path(prefix.toString()) / std::to_string(prefix_length);
     else
-        return prefix.toString() + "/" + mask.toString();
+        return fs::path(prefix.toString()) / mask.toString();
 }
 
 inline bool AllowedClientHosts::IPSubnet::isMaskAllBitsOne() const
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index 0bcaef1e441..90495a83dfc 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -143,11 +143,13 @@ ContextAccess::ContextAccess(const AccessControlManager & manager_, const Params
     : manager(&manager_)
     , params(params_)
 {
+    std::lock_guard lock{mutex};
+
     subscription_for_user_change = manager->subscribeForChanges(
         *params.user_id, [this](const UUID &, const AccessEntityPtr & entity)
     {
         UserPtr changed_user = entity ? typeid_cast<UserPtr>(entity) : nullptr;
-        std::lock_guard lock{mutex};
+        std::lock_guard lock2{mutex};
         setUser(changed_user);
     });
 
@@ -189,7 +191,7 @@ void ContextAccess::setUser(const UserPtr & user_) const
         current_roles_with_admin_option = user->granted_roles.findGrantedWithAdminOption(params.current_roles);
     }
 
-    subscription_for_roles_changes = {};
+    subscription_for_roles_changes.reset();
     enabled_roles = manager->getEnabledRoles(current_roles, current_roles_with_admin_option);
     subscription_for_roles_changes = enabled_roles->subscribeForChanges([this](const std::shared_ptr<const EnabledRolesInfo> & roles_info_)
     {
diff --git a/src/Access/DiskAccessStorage.cpp b/src/Access/DiskAccessStorage.cpp
index 80594f66dfc..8c38cd02f9c 100644
--- a/src/Access/DiskAccessStorage.cpp
+++ b/src/Access/DiskAccessStorage.cpp
@@ -355,8 +355,9 @@ String DiskAccessStorage::getStorageParamsJSON() const
     std::lock_guard lock{mutex};
     Poco::JSON::Object json;
     json.set("path", directory_path);
-    if (readonly)
-        json.set("readonly", readonly.load());
+    bool readonly_loaded = readonly;
+    if (readonly_loaded)
+        json.set("readonly", Poco::Dynamic::Var{true});
     std::ostringstream oss;         // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     oss.exceptions(std::ios::failbit);
     Poco::JSON::Stringifier::stringify(json, oss);
diff --git a/src/Access/ExternalAuthenticators.cpp b/src/Access/ExternalAuthenticators.cpp
index 1cade973724..d4100c4e520 100644
--- a/src/Access/ExternalAuthenticators.cpp
+++ b/src/Access/ExternalAuthenticators.cpp
@@ -20,13 +20,42 @@ namespace ErrorCodes
 namespace
 {
 
-auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const String & name)
+void parseLDAPSearchParams(LDAPClient::SearchParams & params, const Poco::Util::AbstractConfiguration & config, const String & prefix)
+{
+    const bool has_base_dn = config.has(prefix + ".base_dn");
+    const bool has_search_filter = config.has(prefix + ".search_filter");
+    const bool has_attribute = config.has(prefix + ".attribute");
+    const bool has_scope = config.has(prefix + ".scope");
+
+    if (has_base_dn)
+        params.base_dn = config.getString(prefix + ".base_dn");
+
+    if (has_search_filter)
+        params.search_filter = config.getString(prefix + ".search_filter");
+
+    if (has_attribute)
+        params.attribute = config.getString(prefix + ".attribute");
+
+    if (has_scope)
+    {
+        auto scope = config.getString(prefix + ".scope");
+        boost::algorithm::to_lower(scope);
+
+        if (scope == "base")           params.scope = LDAPClient::SearchParams::Scope::BASE;
+        else if (scope == "one_level") params.scope = LDAPClient::SearchParams::Scope::ONE_LEVEL;
+        else if (scope == "subtree")   params.scope = LDAPClient::SearchParams::Scope::SUBTREE;
+        else if (scope == "children")  params.scope = LDAPClient::SearchParams::Scope::CHILDREN;
+        else
+            throw Exception("Invalid value for 'scope' field of LDAP search parameters in '" + prefix +
+                "' section, must be one of 'base', 'one_level', 'subtree', or 'children'", ErrorCodes::BAD_ARGUMENTS);
+    }
+}
+
+void parseLDAPServer(LDAPClient::Params & params, const Poco::Util::AbstractConfiguration & config, const String & name)
 {
     if (name.empty())
         throw Exception("LDAP server name cannot be empty", ErrorCodes::BAD_ARGUMENTS);
 
-    LDAPClient::Params params;
-
     const String ldap_server_config = "ldap_servers." + name;
 
     const bool has_host = config.has(ldap_server_config + ".host");
@@ -34,6 +63,7 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
     const bool has_bind_dn = config.has(ldap_server_config + ".bind_dn");
     const bool has_auth_dn_prefix = config.has(ldap_server_config + ".auth_dn_prefix");
     const bool has_auth_dn_suffix = config.has(ldap_server_config + ".auth_dn_suffix");
+    const bool has_user_dn_detection = config.has(ldap_server_config + ".user_dn_detection");
     const bool has_verification_cooldown = config.has(ldap_server_config + ".verification_cooldown");
     const bool has_enable_tls = config.has(ldap_server_config + ".enable_tls");
     const bool has_tls_minimum_protocol_version = config.has(ldap_server_config + ".tls_minimum_protocol_version");
@@ -66,6 +96,17 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         params.bind_dn = auth_dn_prefix + "{user_name}" + auth_dn_suffix;
     }
 
+    if (has_user_dn_detection)
+    {
+        if (!params.user_dn_detection)
+        {
+            params.user_dn_detection.emplace();
+            params.user_dn_detection->attribute = "dn";
+        }
+
+        parseLDAPSearchParams(*params.user_dn_detection, config, ldap_server_config + ".user_dn_detection");
+    }
+
     if (has_verification_cooldown)
         params.verification_cooldown = std::chrono::seconds{config.getUInt64(ldap_server_config + ".verification_cooldown")};
 
@@ -77,7 +118,7 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         if (enable_tls_lc_str == "starttls")
             params.enable_tls = LDAPClient::Params::TLSEnable::YES_STARTTLS;
         else if (config.getBool(ldap_server_config + ".enable_tls"))
-            params.enable_tls = LDAPClient::Params::TLSEnable::YES;
+            params.enable_tls = LDAPClient::Params::TLSEnable::YES; //-V1048
         else
             params.enable_tls = LDAPClient::Params::TLSEnable::NO;
     }
@@ -96,7 +137,7 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         else if (tls_minimum_protocol_version_lc_str == "tls1.1")
             params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::TLS1_1;
         else if (tls_minimum_protocol_version_lc_str == "tls1.2")
-            params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::TLS1_2;
+            params.tls_minimum_protocol_version = LDAPClient::Params::TLSProtocolVersion::TLS1_2; //-V1048
         else
             throw Exception("Bad value for 'tls_minimum_protocol_version' entry, allowed values are: 'ssl2', 'ssl3', 'tls1.0', 'tls1.1', 'tls1.2'", ErrorCodes::BAD_ARGUMENTS);
     }
@@ -113,7 +154,7 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
         else if (tls_require_cert_lc_str == "try")
             params.tls_require_cert = LDAPClient::Params::TLSRequireCert::TRY;
         else if (tls_require_cert_lc_str == "demand")
-            params.tls_require_cert = LDAPClient::Params::TLSRequireCert::DEMAND;
+            params.tls_require_cert = LDAPClient::Params::TLSRequireCert::DEMAND; //-V1048
         else
             throw Exception("Bad value for 'tls_require_cert' entry, allowed values are: 'never', 'allow', 'try', 'demand'", ErrorCodes::BAD_ARGUMENTS);
     }
@@ -143,14 +184,10 @@ auto parseLDAPServer(const Poco::Util::AbstractConfiguration & config, const Str
     }
     else
         params.port = (params.enable_tls == LDAPClient::Params::TLSEnable::YES ? 636 : 389);
-
-    return params;
 }
 
-auto parseKerberosParams(const Poco::Util::AbstractConfiguration & config)
+void parseKerberosParams(GSSAcceptorContext::Params & params, const Poco::Util::AbstractConfiguration & config)
 {
-    GSSAcceptorContext::Params params;
-
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys("kerberos", keys);
 
@@ -180,12 +217,20 @@ auto parseKerberosParams(const Poco::Util::AbstractConfiguration & config)
 
     params.realm = config.getString("kerberos.realm", "");
     params.principal = config.getString("kerberos.principal", "");
-
-    return params;
 }
 
 }
 
+void parseLDAPRoleSearchParams(LDAPClient::RoleSearchParams & params, const Poco::Util::AbstractConfiguration & config, const String & prefix)
+{
+    parseLDAPSearchParams(params, config, prefix);
+
+    const bool has_prefix = config.has(prefix + ".prefix");
+
+    if (has_prefix)
+        params.prefix = config.getString(prefix + ".prefix");
+}
+
 void ExternalAuthenticators::reset()
 {
     std::scoped_lock lock(mutex);
@@ -229,7 +274,8 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
     {
         try
         {
-            ldap_client_params_blueprint.insert_or_assign(ldap_server_name, parseLDAPServer(config, ldap_server_name));
+            ldap_client_params_blueprint.erase(ldap_server_name);
+            parseLDAPServer(ldap_client_params_blueprint.emplace(ldap_server_name, LDAPClient::Params{}).first->second, config, ldap_server_name);
         }
         catch (...)
         {
@@ -240,7 +286,7 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
     try
     {
         if (kerberos_keys_count > 0)
-            kerberos_params = parseKerberosParams(config);
+            parseKerberosParams(kerberos_params.emplace(), config);
     }
     catch (...)
     {
@@ -249,7 +295,7 @@ void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfigur
 }
 
 bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const BasicCredentials & credentials,
-    const LDAPClient::SearchParamsList * search_params, LDAPClient::SearchResultsList * search_results) const
+    const LDAPClient::RoleSearchParamsList * role_search_params, LDAPClient::SearchResultsList * role_search_results) const
 {
     std::optional<LDAPClient::Params> params;
     std::size_t params_hash = 0;
@@ -267,9 +313,9 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const B
         params->password = credentials.getPassword();
 
         params->combineCoreHash(params_hash);
-        if (search_params)
+        if (role_search_params)
         {
-            for (const auto & params_instance : *search_params)
+            for (const auto & params_instance : *role_search_params)
             {
                 params_instance.combineHash(params_hash);
             }
@@ -301,14 +347,14 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const B
 
                         // Ensure that search_params are compatible.
                         (
-                            search_params == nullptr ?
-                            entry.last_successful_search_results.empty() :
-                            search_params->size() == entry.last_successful_search_results.size()
+                            role_search_params == nullptr ?
+                            entry.last_successful_role_search_results.empty() :
+                            role_search_params->size() == entry.last_successful_role_search_results.size()
                         )
                     )
                     {
-                        if (search_results)
-                            *search_results = entry.last_successful_search_results;
+                        if (role_search_results)
+                            *role_search_results = entry.last_successful_role_search_results;
 
                         return true;
                     }
@@ -326,7 +372,7 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const B
     }
 
     LDAPSimpleAuthClient client(params.value());
-    const auto result = client.authenticate(search_params, search_results);
+    const auto result = client.authenticate(role_search_params, role_search_results);
     const auto current_check_timestamp = std::chrono::steady_clock::now();
 
     // Update the cache, but only if this is the latest check and the server is still configured in a compatible way.
@@ -345,9 +391,9 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const B
 
         std::size_t new_params_hash = 0;
         new_params.combineCoreHash(new_params_hash);
-        if (search_params)
+        if (role_search_params)
         {
-            for (const auto & params_instance : *search_params)
+            for (const auto & params_instance : *role_search_params)
             {
                 params_instance.combineHash(new_params_hash);
             }
@@ -363,17 +409,17 @@ bool ExternalAuthenticators::checkLDAPCredentials(const String & server, const B
             entry.last_successful_params_hash = params_hash;
             entry.last_successful_authentication_timestamp = current_check_timestamp;
 
-            if (search_results)
-                entry.last_successful_search_results = *search_results;
+            if (role_search_results)
+                entry.last_successful_role_search_results = *role_search_results;
             else
-                entry.last_successful_search_results.clear();
+                entry.last_successful_role_search_results.clear();
         }
         else if (
             entry.last_successful_params_hash != params_hash ||
             (
-                search_params == nullptr ?
-                !entry.last_successful_search_results.empty() :
-                search_params->size() != entry.last_successful_search_results.size()
+                role_search_params == nullptr ?
+                !entry.last_successful_role_search_results.empty() :
+                role_search_params->size() != entry.last_successful_role_search_results.size()
             )
         )
         {
diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h
index c8feea7eada..24f1f7b6528 100644
--- a/src/Access/ExternalAuthenticators.h
+++ b/src/Access/ExternalAuthenticators.h
@@ -34,7 +34,7 @@ public:
 
     // The name and readiness of the credentials must be verified before calling these.
     bool checkLDAPCredentials(const String & server, const BasicCredentials & credentials,
-        const LDAPClient::SearchParamsList * search_params = nullptr, LDAPClient::SearchResultsList * search_results = nullptr) const;
+        const LDAPClient::RoleSearchParamsList * role_search_params = nullptr, LDAPClient::SearchResultsList * role_search_results = nullptr) const;
     bool checkKerberosCredentials(const String & realm, const GSSAcceptorContext & credentials) const;
 
     GSSAcceptorContext::Params getKerberosParams() const;
@@ -44,7 +44,7 @@ private:
     {
         std::size_t last_successful_params_hash = 0;
         std::chrono::steady_clock::time_point last_successful_authentication_timestamp;
-        LDAPClient::SearchResultsList last_successful_search_results;
+        LDAPClient::SearchResultsList last_successful_role_search_results;
     };
 
     using LDAPCache = std::unordered_map<String, LDAPCacheEntry>; // user name   -> cache entry
@@ -58,4 +58,6 @@ private:
     std::optional<GSSAcceptorContext::Params> kerberos_params;
 };
 
+void parseLDAPRoleSearchParams(LDAPClient::RoleSearchParams & params, const Poco::Util::AbstractConfiguration & config, const String & prefix);
+
 }
diff --git a/src/Access/GrantedRoles.cpp b/src/Access/GrantedRoles.cpp
index 7930b56e44d..2659f8a3ec9 100644
--- a/src/Access/GrantedRoles.cpp
+++ b/src/Access/GrantedRoles.cpp
@@ -136,7 +136,7 @@ GrantedRoles::Elements GrantedRoles::getElements() const
     boost::range::set_difference(roles, roles_with_admin_option, std::back_inserter(element.ids));
     if (!element.empty())
     {
-        element.admin_option = false;
+        element.admin_option = false; //-V1048
         elements.emplace_back(std::move(element));
     }
 
diff --git a/src/Access/IAccessStorage.h b/src/Access/IAccessStorage.h
index 2cdd8eabf73..cc914664149 100644
--- a/src/Access/IAccessStorage.h
+++ b/src/Access/IAccessStorage.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/IAccessEntity.h>
-#include <common/types.h>
+#include <Core/Types.h>
 #include <Core/UUID.h>
 #include <ext/scope_guard.h>
 #include <functional>
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index b47a9b3e041..c1d54e8c9aa 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -68,34 +68,15 @@ void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_m
         common_roles_cfg.insert(role_names.begin(), role_names.end());
     }
 
-    LDAPClient::SearchParamsList role_search_params_cfg;
+    LDAPClient::RoleSearchParamsList role_search_params_cfg;
     if (has_role_mapping)
     {
         Poco::Util::AbstractConfiguration::Keys all_keys;
         config.keys(prefix, all_keys);
         for (const auto & key : all_keys)
         {
-            if (key != "role_mapping" && key.find("role_mapping[") != 0)
-                continue;
-
-            const String rm_prefix = prefix_str + key;
-            const String rm_prefix_str = rm_prefix + '.';
-            role_search_params_cfg.emplace_back();
-            auto & rm_params = role_search_params_cfg.back();
-
-            rm_params.base_dn = config.getString(rm_prefix_str + "base_dn", "");
-            rm_params.search_filter = config.getString(rm_prefix_str + "search_filter", "");
-            rm_params.attribute = config.getString(rm_prefix_str + "attribute", "cn");
-            rm_params.prefix = config.getString(rm_prefix_str + "prefix", "");
-
-            auto scope = config.getString(rm_prefix_str + "scope", "subtree");
-            boost::algorithm::to_lower(scope);
-            if (scope == "base")           rm_params.scope = LDAPClient::SearchParams::Scope::BASE;
-            else if (scope == "one_level") rm_params.scope = LDAPClient::SearchParams::Scope::ONE_LEVEL;
-            else if (scope == "subtree")   rm_params.scope = LDAPClient::SearchParams::Scope::SUBTREE;
-            else if (scope == "children")  rm_params.scope = LDAPClient::SearchParams::Scope::CHILDREN;
-            else
-                throw Exception("Invalid value of 'scope' field in '" + key + "' section of LDAP user directory, must be one of 'base', 'one_level', 'subtree', or 'children'", ErrorCodes::BAD_ARGUMENTS);
+            if (key == "role_mapping" || key.find("role_mapping[") == 0)
+                parseLDAPRoleSearchParams(role_search_params_cfg.emplace_back(), config, prefix_str + key);
         }
     }
 
@@ -364,7 +345,7 @@ std::set<String> LDAPAccessStorage::mapExternalRolesNoLock(const LDAPClient::Sea
 
 
 bool LDAPAccessStorage::areLDAPCredentialsValidNoLock(const User & user, const Credentials & credentials,
-    const ExternalAuthenticators & external_authenticators, LDAPClient::SearchResultsList & search_results) const
+    const ExternalAuthenticators & external_authenticators, LDAPClient::SearchResultsList & role_search_results) const
 {
     if (!credentials.isReady())
         return false;
@@ -373,7 +354,7 @@ bool LDAPAccessStorage::areLDAPCredentialsValidNoLock(const User & user, const C
         return false;
 
     if (const auto * basic_credentials = dynamic_cast<const BasicCredentials *>(&credentials))
-        return external_authenticators.checkLDAPCredentials(ldap_server_name, *basic_credentials, &role_search_params, &search_results);
+        return external_authenticators.checkLDAPCredentials(ldap_server_name, *basic_credentials, &role_search_params, &role_search_results);
 
     return false;
 }
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index ea0ab47c225..33ac9f0a914 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -68,12 +68,12 @@ private:
     void updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPClient::SearchResultsList & external_roles) const;
     std::set<String> mapExternalRolesNoLock(const LDAPClient::SearchResultsList & external_roles) const;
     bool areLDAPCredentialsValidNoLock(const User & user, const Credentials & credentials,
-        const ExternalAuthenticators & external_authenticators, LDAPClient::SearchResultsList & search_results) const;
+        const ExternalAuthenticators & external_authenticators, LDAPClient::SearchResultsList & role_search_results) const;
 
     mutable std::recursive_mutex mutex;
     AccessControlManager * access_control_manager = nullptr;
     String ldap_server_name;
-    LDAPClient::SearchParamsList role_search_params;
+    LDAPClient::RoleSearchParamsList role_search_params;
     std::set<String> common_role_names;                         // role name that should be granted to all users at all times
     mutable std::map<String, std::size_t> external_role_hashes; // user name -> LDAPClient::SearchResultsList hash (most recently retrieved and processed)
     mutable std::map<String, std::set<String>> users_per_roles; // role name -> user names (...it should be granted to; may but don't have to exist for common roles)
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index 5c4b7dd8d99..a8f9675774b 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -32,6 +32,11 @@ void LDAPClient::SearchParams::combineHash(std::size_t & seed) const
     boost::hash_combine(seed, static_cast<int>(scope));
     boost::hash_combine(seed, search_filter);
     boost::hash_combine(seed, attribute);
+}
+
+void LDAPClient::RoleSearchParams::combineHash(std::size_t & seed) const
+{
+    SearchParams::combineHash(seed);
     boost::hash_combine(seed, prefix);
 }
 
@@ -42,6 +47,9 @@ void LDAPClient::Params::combineCoreHash(std::size_t & seed) const
     boost::hash_combine(seed, bind_dn);
     boost::hash_combine(seed, user);
     boost::hash_combine(seed, password);
+
+    if (user_dn_detection)
+        user_dn_detection->combineHash(seed);
 }
 
 LDAPClient::LDAPClient(const Params & params_)
@@ -286,18 +294,33 @@ void LDAPClient::openConnection()
     if (params.enable_tls == LDAPClient::Params::TLSEnable::YES_STARTTLS)
         diag(ldap_start_tls_s(handle, nullptr, nullptr));
 
+    final_user_name = escapeForLDAP(params.user);
+    final_bind_dn = replacePlaceholders(params.bind_dn, { {"{user_name}", final_user_name} });
+    final_user_dn = final_bind_dn; // The default value... may be updated right after a successful bind.
+
     switch (params.sasl_mechanism)
     {
         case LDAPClient::Params::SASLMechanism::SIMPLE:
         {
-            const auto escaped_user_name = escapeForLDAP(params.user);
-            const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{user_name}", escaped_user_name} });
-
             ::berval cred;
             cred.bv_val = const_cast<char *>(params.password.c_str());
             cred.bv_len = params.password.size();
 
-            diag(ldap_sasl_bind_s(handle, bind_dn.c_str(), LDAP_SASL_SIMPLE, &cred, nullptr, nullptr, nullptr));
+            diag(ldap_sasl_bind_s(handle, final_bind_dn.c_str(), LDAP_SASL_SIMPLE, &cred, nullptr, nullptr, nullptr));
+
+            // Once bound, run the user DN search query and update the default value, if asked.
+            if (params.user_dn_detection)
+            {
+                const auto user_dn_search_results = search(*params.user_dn_detection);
+
+                if (user_dn_search_results.empty())
+                    throw Exception("Failed to detect user DN: empty search results", ErrorCodes::LDAP_ERROR);
+
+                if (user_dn_search_results.size() > 1)
+                    throw Exception("Failed to detect user DN: more than one entry in the search results", ErrorCodes::LDAP_ERROR);
+
+                final_user_dn = *user_dn_search_results.begin();
+            }
 
             break;
         }
@@ -316,6 +339,9 @@ void LDAPClient::closeConnection() noexcept
 
     ldap_unbind_ext_s(handle, nullptr, nullptr);
     handle = nullptr;
+    final_user_name.clear();
+    final_bind_dn.clear();
+    final_user_dn.clear();
 }
 
 LDAPClient::SearchResults LDAPClient::search(const SearchParams & search_params)
@@ -333,10 +359,19 @@ LDAPClient::SearchResults LDAPClient::search(const SearchParams & search_params)
         case SearchParams::Scope::CHILDREN:  scope = LDAP_SCOPE_CHILDREN; break;
     }
 
-    const auto escaped_user_name = escapeForLDAP(params.user);
-    const auto bind_dn = replacePlaceholders(params.bind_dn, { {"{user_name}", escaped_user_name} });
-    const auto base_dn = replacePlaceholders(search_params.base_dn, { {"{user_name}", escaped_user_name}, {"{bind_dn}", bind_dn} });
-    const auto search_filter = replacePlaceholders(search_params.search_filter, { {"{user_name}", escaped_user_name}, {"{bind_dn}", bind_dn}, {"{base_dn}", base_dn} });
+    const auto final_base_dn = replacePlaceholders(search_params.base_dn, {
+        {"{user_name}", final_user_name},
+        {"{bind_dn}", final_bind_dn},
+        {"{user_dn}", final_user_dn}
+    });
+
+    const auto final_search_filter = replacePlaceholders(search_params.search_filter, {
+        {"{user_name}", final_user_name},
+        {"{bind_dn}", final_bind_dn},
+        {"{user_dn}", final_user_dn},
+        {"{base_dn}", final_base_dn}
+    });
+
     char * attrs[] = { const_cast<char *>(search_params.attribute.c_str()), nullptr };
     ::timeval timeout = { params.search_timeout.count(), 0 };
     LDAPMessage* msgs = nullptr;
@@ -349,7 +384,7 @@ LDAPClient::SearchResults LDAPClient::search(const SearchParams & search_params)
         }
     });
 
-    diag(ldap_search_ext_s(handle, base_dn.c_str(), scope, search_filter.c_str(), attrs, 0, nullptr, nullptr, &timeout, params.search_limit, &msgs));
+    diag(ldap_search_ext_s(handle, final_base_dn.c_str(), scope, final_search_filter.c_str(), attrs, 0, nullptr, nullptr, &timeout, params.search_limit, &msgs));
 
     for (
          auto * msg = ldap_first_message(handle, msgs);
@@ -361,6 +396,27 @@ LDAPClient::SearchResults LDAPClient::search(const SearchParams & search_params)
         {
             case LDAP_RES_SEARCH_ENTRY:
             {
+                // Extract DN separately, if the requested attribute is DN.
+                if (boost::iequals("dn", search_params.attribute))
+                {
+                    BerElement * ber = nullptr;
+
+                    SCOPE_EXIT({
+                        if (ber)
+                        {
+                            ber_free(ber, 0);
+                            ber = nullptr;
+                        }
+                    });
+
+                    ::berval bv;
+
+                    diag(ldap_get_dn_ber(handle, msg, &ber, &bv));
+
+                    if (bv.bv_val && bv.bv_len > 0)
+                        result.emplace(bv.bv_val, bv.bv_len);
+                }
+
                 BerElement * ber = nullptr;
 
                 SCOPE_EXIT({
@@ -471,12 +527,12 @@ LDAPClient::SearchResults LDAPClient::search(const SearchParams & search_params)
     return result;
 }
 
-bool LDAPSimpleAuthClient::authenticate(const SearchParamsList * search_params, SearchResultsList * search_results)
+bool LDAPSimpleAuthClient::authenticate(const RoleSearchParamsList * role_search_params, SearchResultsList * role_search_results)
 {
     if (params.user.empty())
         throw Exception("LDAP authentication of a user with empty name is not allowed", ErrorCodes::BAD_ARGUMENTS);
 
-    if (!search_params != !search_results)
+    if (!role_search_params != !role_search_results)
         throw Exception("Cannot return LDAP search results", ErrorCodes::BAD_ARGUMENTS);
 
     // Silently reject authentication attempt if the password is empty as if it didn't match.
@@ -489,21 +545,21 @@ bool LDAPSimpleAuthClient::authenticate(const SearchParamsList * search_params,
     openConnection();
 
     // While connected, run search queries and save the results, if asked.
-    if (search_params)
+    if (role_search_params)
     {
-        search_results->clear();
-        search_results->reserve(search_params->size());
+        role_search_results->clear();
+        role_search_results->reserve(role_search_params->size());
 
         try
         {
-            for (const auto & single_search_params : *search_params)
+            for (const auto & params_instance : *role_search_params)
             {
-                search_results->emplace_back(search(single_search_params));
+                role_search_results->emplace_back(search(params_instance));
             }
         }
         catch (...)
         {
-            search_results->clear();
+            role_search_results->clear();
             throw;
         }
     }
@@ -532,7 +588,7 @@ LDAPClient::SearchResults LDAPClient::search(const SearchParams &)
     throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
 }
 
-bool LDAPSimpleAuthClient::authenticate(const SearchParamsList *, SearchResultsList *)
+bool LDAPSimpleAuthClient::authenticate(const RoleSearchParamsList *, SearchResultsList *)
 {
     throw Exception("ClickHouse was built without LDAP support", ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME);
 }
diff --git a/src/Access/LDAPClient.h b/src/Access/LDAPClient.h
index 4fc97bb957b..388e7ad0f0d 100644
--- a/src/Access/LDAPClient.h
+++ b/src/Access/LDAPClient.h
@@ -38,12 +38,20 @@ public:
         Scope scope = Scope::SUBTREE;
         String search_filter;
         String attribute = "cn";
+
+        void combineHash(std::size_t & seed) const;
+    };
+
+    struct RoleSearchParams
+        : public SearchParams
+    {
         String prefix;
 
         void combineHash(std::size_t & seed) const;
     };
 
-    using SearchParamsList = std::vector<SearchParams>;
+    using RoleSearchParamsList = std::vector<RoleSearchParams>;
+
     using SearchResults = std::set<String>;
     using SearchResultsList = std::vector<SearchResults>;
 
@@ -105,6 +113,8 @@ public:
         String user;
         String password;
 
+        std::optional<SearchParams> user_dn_detection;
+
         std::chrono::seconds verification_cooldown{0};
 
         std::chrono::seconds operation_timeout{40};
@@ -134,6 +144,9 @@ protected:
 #if USE_LDAP
     LDAP * handle = nullptr;
 #endif
+    String final_user_name;
+    String final_bind_dn;
+    String final_user_dn;
 };
 
 class LDAPSimpleAuthClient
@@ -141,7 +154,7 @@ class LDAPSimpleAuthClient
 {
 public:
     using LDAPClient::LDAPClient;
-    bool authenticate(const SearchParamsList * search_params, SearchResultsList * search_results);
+    bool authenticate(const RoleSearchParamsList * role_search_params, SearchResultsList * role_search_results);
 };
 
 }
diff --git a/src/Access/MemoryAccessStorage.h b/src/Access/MemoryAccessStorage.h
index 92439342168..512ccff1d1b 100644
--- a/src/Access/MemoryAccessStorage.h
+++ b/src/Access/MemoryAccessStorage.h
@@ -51,7 +51,7 @@ private:
     void setAllNoLock(const std::vector<std::pair<UUID, AccessEntityPtr>> & all_entities, Notifications & notifications);
     void prepareNotifications(const Entry & entry, bool remove, Notifications & notifications) const;
 
-    mutable std::mutex mutex;
+    mutable std::recursive_mutex mutex;
     std::unordered_map<UUID, Entry> entries_by_id; /// We want to search entries both by ID and by the pair of name and type.
     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/Quota.h b/src/Access/Quota.h
index 430bdca29b0..b7970b2583b 100644
--- a/src/Access/Quota.h
+++ b/src/Access/Quota.h
@@ -45,7 +45,7 @@ struct Quota : public IAccessEntity
 
     struct ResourceTypeInfo
     {
-        const char * const raw_name;
+        const char * const raw_name = "";
         const String name;    /// Lowercased with underscores, e.g. "result_rows".
         const String keyword; /// Uppercased with spaces, e.g. "RESULT ROWS".
         const bool output_as_float = false;
diff --git a/src/Access/RolesOrUsersSet.h b/src/Access/RolesOrUsersSet.h
index 0d8983c2ec3..871bb0c0758 100644
--- a/src/Access/RolesOrUsersSet.h
+++ b/src/Access/RolesOrUsersSet.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/UUID.h>
+#include <Core/Types.h>
 #include <boost/container/flat_set.hpp>
 #include <memory>
 #include <optional>
diff --git a/src/Access/RowPolicy.h b/src/Access/RowPolicy.h
index c9b4d69152d..723db545dbe 100644
--- a/src/Access/RowPolicy.h
+++ b/src/Access/RowPolicy.h
@@ -2,6 +2,7 @@
 
 #include <Access/IAccessEntity.h>
 #include <Access/RolesOrUsersSet.h>
+#include <Core/Types.h>
 #include <array>
 
 
diff --git a/src/Access/ya.make.in b/src/Access/ya.make.in
index 0c5692a9bfa..1f11c7d7d2a 100644
--- a/src/Access/ya.make.in
+++ b/src/Access/ya.make.in
@@ -8,7 +8,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/AggregateFunctions/AggregateFunctionAggThrow.cpp b/src/AggregateFunctions/AggregateFunctionAggThrow.cpp
index c699dd4f217..c9d292f1993 100644
--- a/src/AggregateFunctions/AggregateFunctionAggThrow.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAggThrow.cpp
@@ -11,6 +11,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -60,6 +61,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void create(AggregateDataPtr __restrict place) const override
     {
         if (std::uniform_real_distribution<>(0.0, 1.0)(thread_local_rng) <= throw_probability)
@@ -103,7 +106,7 @@ public:
 
 void registerAggregateFunctionAggThrow(AggregateFunctionFactory & factory)
 {
-    factory.registerFunction("aggThrow", [](const std::string & name, const DataTypes & argument_types, const Array & parameters)
+    factory.registerFunction("aggThrow", [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
     {
         Float64 throw_probability = 1.0;
         if (parameters.size() == 1)
diff --git a/src/AggregateFunctions/AggregateFunctionAny.cpp b/src/AggregateFunctions/AggregateFunctionAny.cpp
index 8b18abae884..9bc6e6af14f 100644
--- a/src/AggregateFunctions/AggregateFunctionAny.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAny.cpp
@@ -1,28 +1,27 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/HelpersMinMaxAny.h>
-#include <AggregateFunctions/FactoryHelpers.h>
-#include "registerAggregateFunctions.h"
 
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionAny(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionAny(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyData>(name, argument_types, parameters));
+    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyData>(name, argument_types, parameters, settings));
 }
 
-AggregateFunctionPtr createAggregateFunctionAnyLast(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionAnyLast(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyLastData>(name, argument_types, parameters));
+    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyLastData>(name, argument_types, parameters, settings));
 }
 
-AggregateFunctionPtr createAggregateFunctionAnyHeavy(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionAnyHeavy(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyHeavyData>(name, argument_types, parameters));
+    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyHeavyData>(name, argument_types, parameters, settings));
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionArgMinMax.h b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
index 9efc907aed3..335ee7c8ecb 100644
--- a/src/AggregateFunctions/AggregateFunctionArgMinMax.h
+++ b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
@@ -1,16 +1,15 @@
 #pragma once
 
-#include <AggregateFunctions/AggregateFunctionMinMaxAny.h> // SingleValueDataString used in embedded compiler
-#include <AggregateFunctions/IAggregateFunction.h>
-#include <Columns/ColumnTuple.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/IDataType.h>
 #include <common/StringRef.h>
-#include "Columns/IColumn.h"
+#include <DataTypes/IDataType.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionMinMaxAny.h> // SingleValueDataString used in embedded compiler
 
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -24,53 +23,47 @@ struct AggregateFunctionArgMinMaxData
     using ResultData_t = ResultData;
     using ValueData_t = ValueData;
 
-    ResultData result; // the argument at which the minimum/maximum value is reached.
-    ValueData value; // value for which the minimum/maximum is calculated.
+    ResultData result;  // the argument at which the minimum/maximum value is reached.
+    ValueData value;    // value for which the minimum/maximum is calculated.
 
-    static bool allocatesMemoryInArena() { return ResultData::allocatesMemoryInArena() || ValueData::allocatesMemoryInArena(); }
-
-    static String name() { return StringRef(ValueData_t::name()) == StringRef("min") ? "argMin" : "argMax"; }
+    static bool allocatesMemoryInArena()
+    {
+        return ResultData::allocatesMemoryInArena() || ValueData::allocatesMemoryInArena();
+    }
 };
 
 /// Returns the first arg value found for the minimum/maximum value. Example: argMax(arg, value).
 template <typename Data>
-class AggregateFunctionArgMinMax final : public IAggregateFunctionTupleArgHelper<Data, AggregateFunctionArgMinMax<Data>, 2>
+class AggregateFunctionArgMinMax final : public IAggregateFunctionDataHelper<Data, AggregateFunctionArgMinMax<Data>>
 {
 private:
     const DataTypePtr & type_res;
     const DataTypePtr & type_val;
     const SerializationPtr serialization_res;
     const SerializationPtr serialization_val;
-    bool tuple_argument;
 
-    using Base = IAggregateFunctionTupleArgHelper<Data, AggregateFunctionArgMinMax<Data>, 2>;
+    using Base = IAggregateFunctionDataHelper<Data, AggregateFunctionArgMinMax<Data>>;
 
 public:
-    AggregateFunctionArgMinMax(const DataTypePtr & type_res_, const DataTypePtr & type_val_, const bool tuple_argument_)
-        : Base({type_res_, type_val_}, {}, tuple_argument_)
+    AggregateFunctionArgMinMax(const DataTypePtr & type_res_, const DataTypePtr & type_val_)
+        : Base({type_res_, type_val_}, {})
         , type_res(this->argument_types[0])
         , type_val(this->argument_types[1])
         , serialization_res(type_res->getDefaultSerialization())
         , serialization_val(type_val->getDefaultSerialization())
     {
         if (!type_val->isComparable())
-            throw Exception(
-                "Illegal type " + type_val->getName() + " of second argument of aggregate function " + getName()
-                    + " because the values of that data type are not comparable",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        this->tuple_argument = tuple_argument_;
+            throw Exception("Illegal type " + type_val->getName() + " of second argument of aggregate function " + getName()
+                + " because the values of that data type are not comparable", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    String getName() const override { return Data::name(); }
+    String getName() const override
+    {
+        return StringRef(Data::ValueData_t::name()) == StringRef("min") ? "argMin" : "argMax";
+    }
 
     DataTypePtr getReturnType() const override
     {
-        if (tuple_argument)
-        {
-            return std::make_shared<DataTypeTuple>(DataTypes{this->type_res, this->type_val});
-        }
-
         return type_res;
     }
 
@@ -98,21 +91,15 @@ public:
         this->data(place).value.read(buf, *serialization_val, arena);
     }
 
-    bool allocatesMemoryInArena() const override { return Data::allocatesMemoryInArena(); }
+    bool allocatesMemoryInArena() const override
+    {
+        return Data::allocatesMemoryInArena();
+    }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        if (tuple_argument)
-        {
-            auto & tup = assert_cast<ColumnTuple &>(to);
-
-            this->data(place).result.insertResultInto(tup.getColumn(0));
-            this->data(place).value.insertResultInto(tup.getColumn(1));
-        }
-        else
-            this->data(place).result.insertResultInto(to);
+        this->data(place).result.insertResultInto(to);
     }
 };
 
-
 }
diff --git a/src/AggregateFunctions/AggregateFunctionArray.cpp b/src/AggregateFunctions/AggregateFunctionArray.cpp
index d0f17da5aa4..3eddbbb3fb2 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionArray.cpp
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionArray.h b/src/AggregateFunctions/AggregateFunctionArray.h
index ef16fcde87b..f1005e2e43a 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.h
+++ b/src/AggregateFunctions/AggregateFunctionArray.h
@@ -9,6 +9,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionAvg.cpp b/src/AggregateFunctions/AggregateFunctionAvg.cpp
index 9b1c3d6cef6..a96c8c01407 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAvg.cpp
@@ -3,10 +3,11 @@
 #include <AggregateFunctions/AggregateFunctionAvg.h>
 #include <AggregateFunctions/Helpers.h>
 #include <AggregateFunctions/FactoryHelpers.h>
-#include "registerAggregateFunctions.h"
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -20,7 +21,7 @@ bool allowType(const DataTypePtr& type) noexcept
     return t.isInt() || t.isUInt() || t.isFloat() || t.isDecimal();
 }
 
-AggregateFunctionPtr createAggregateFunctionAvg(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionAvg(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertUnary(name, argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index 7bf742294b4..7cdef3bfe69 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -7,11 +7,12 @@
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <AggregateFunctions/IAggregateFunction.h>
-#include "Core/DecimalFunctions.h"
+#include <Core/DecimalFunctions.h>
 
 
 namespace DB
 {
+struct Settings;
 template <typename T>
 using DecimalOrVectorCol = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
 
@@ -96,7 +97,9 @@ public:
         UInt32 num_scale_ = 0, UInt32 denom_scale_ = 0)
         : Base(argument_types_, {}), num_scale(num_scale_), denom_scale(denom_scale_) {}
 
-    DataTypePtr getReturnType() const final { return std::make_shared<DataTypeNumber<Float64>>(); }
+    DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<Float64>>(); }
+
+    bool allocatesMemoryInArena() const override { return false; }
 
     void NO_SANITIZE_UNDEFINED merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp b/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp
index 983b3bf3d4c..b7fdb3460e3 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.cpp
@@ -4,10 +4,11 @@
 #include <AggregateFunctions/AggregateFunctionAvgWeighted.h>
 #include <AggregateFunctions/Helpers.h>
 #include <AggregateFunctions/FactoryHelpers.h>
-#include "registerAggregateFunctions.h"
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -60,7 +61,8 @@ static IAggregateFunction * create(const IDataType & first_type, const IDataType
 #undef LINE
 }
 
-AggregateFunctionPtr createAggregateFunctionAvgWeighted(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr
+createAggregateFunctionAvgWeighted(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertBinary(name, argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
index f8b452fc444..5842e7311e9 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
@@ -5,18 +5,20 @@
 
 namespace DB
 {
-template <class T>
+struct Settings;
+
+template <typename T>
 using AvgWeightedFieldType = std::conditional_t<IsDecimalNumber<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
         NearestFieldType<T>>>;
 
-template <class T, class U>
+template <typename T, typename U>
 using MaxFieldType = std::conditional_t<(sizeof(AvgWeightedFieldType<T>) > sizeof(AvgWeightedFieldType<U>)),
     AvgWeightedFieldType<T>, AvgWeightedFieldType<U>>;
 
-template <class Value, class Weight>
+template <typename Value, typename Weight>
 class AggregateFunctionAvgWeighted final :
     public AggregateFunctionAvgBase<
         MaxFieldType<Value, Weight>, AvgWeightedFieldType<Weight>, AggregateFunctionAvgWeighted<Value, Weight>>
diff --git a/src/AggregateFunctions/AggregateFunctionBitwise.cpp b/src/AggregateFunctions/AggregateFunctionBitwise.cpp
index cfcef81243a..320231e09ab 100644
--- a/src/AggregateFunctions/AggregateFunctionBitwise.cpp
+++ b/src/AggregateFunctions/AggregateFunctionBitwise.cpp
@@ -7,6 +7,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -16,7 +18,7 @@ namespace
 {
 
 template <template <typename> class Data>
-AggregateFunctionPtr createAggregateFunctionBitwise(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionBitwise(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertUnary(name, argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionBitwise.h b/src/AggregateFunctions/AggregateFunctionBitwise.h
index 3ba8e045069..5582a200921 100644
--- a/src/AggregateFunctions/AggregateFunctionBitwise.h
+++ b/src/AggregateFunctions/AggregateFunctionBitwise.h
@@ -12,6 +12,7 @@
 
 namespace DB
 {
+struct Settings;
 
 
 template <typename T>
@@ -54,6 +55,8 @@ public:
         return std::make_shared<DataTypeNumber<T>>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).update(assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num]);
diff --git a/src/AggregateFunctions/AggregateFunctionBoundingRatio.cpp b/src/AggregateFunctions/AggregateFunctionBoundingRatio.cpp
index 6f4f254ae8f..eba642cd4e8 100644
--- a/src/AggregateFunctions/AggregateFunctionBoundingRatio.cpp
+++ b/src/AggregateFunctions/AggregateFunctionBoundingRatio.cpp
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -15,7 +16,7 @@ namespace ErrorCodes
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionRate(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionRate(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertBinary(name, argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionBoundingRatio.h b/src/AggregateFunctions/AggregateFunctionBoundingRatio.h
index 32ae22fd573..e2073c37c63 100644
--- a/src/AggregateFunctions/AggregateFunctionBoundingRatio.h
+++ b/src/AggregateFunctions/AggregateFunctionBoundingRatio.h
@@ -2,7 +2,6 @@
 
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
-#include <Common/FieldVisitors.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <AggregateFunctions/Helpers.h>
@@ -12,6 +11,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -20,7 +20,7 @@ namespace ErrorCodes
 
 /** Tracks the leftmost and rightmost (x, y) data points.
   */
-struct AggregateFunctionBoundingRatioData
+struct AggregateFunctionBoundingRatioData //-V730
 {
     struct Point
     {
@@ -127,6 +127,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, const size_t row_num, Arena *) const override
     {
         /// NOTE Slightly inefficient.
diff --git a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp
index ba0de7e1b46..bb933841ab9 100644
--- a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp
+++ b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -21,8 +22,8 @@ namespace
 AggregateFunctionPtr createAggregateFunctionCategoricalIV(
     const std::string & name,
     const DataTypes & arguments,
-    const Array & params
-)
+    const Array & params,
+    const Settings *)
 {
     assertNoParameters(name, params);
 
diff --git a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
index ba8acb208ea..a32ea97ec0b 100644
--- a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
+++ b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
@@ -13,6 +13,7 @@
 
 namespace DB
 {
+struct Settings;
 
 template <typename T = UInt64>
 class AggregateFunctionCategoricalIV final : public IAggregateFunctionHelper<AggregateFunctionCategoricalIV<T>>
@@ -33,6 +34,8 @@ public:
         return "categoricalInformationValue";
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void create(AggregateDataPtr __restrict place) const override
     {
         memset(place, 0, sizeOfData());
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
index a20d355bb2f..bc79ed097f4 100644
--- a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -13,17 +14,25 @@ namespace ErrorCodes
 
 void AggregateFunctionCombinatorFactory::registerCombinator(const AggregateFunctionCombinatorPtr & value)
 {
-    if (!dict.emplace(value->getName(), value).second)
-        throw Exception("AggregateFunctionCombinatorFactory: the name '" + value->getName() + "' is not unique",
-            ErrorCodes::LOGICAL_ERROR);
+    CombinatorPair pair{
+        .name = value->getName(),
+        .combinator_ptr = value,
+    };
+
+    /// lower_bound() cannot be used since sort order of the dict is by length of the combinator
+    /// but there are just a few combiners, so not a problem.
+    if (std::find(dict.begin(), dict.end(), pair) != dict.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionCombinatorFactory: the name '{}' is not unique",
+            value->getName());
+    dict.emplace(std::lower_bound(dict.begin(), dict.end(), pair), pair);
 }
 
 AggregateFunctionCombinatorPtr AggregateFunctionCombinatorFactory::tryFindSuffix(const std::string & name) const
 {
     /// O(N) is ok for just a few combinators.
     for (const auto & suffix_value : dict)
-        if (endsWith(name, suffix_value.first))
-            return suffix_value.second;
+        if (endsWith(name, suffix_value.name))
+            return suffix_value.combinator_ptr;
     return {};
 }
 
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
index b535475d111..cb9c84eb7b7 100644
--- a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
+++ b/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
@@ -9,13 +9,24 @@
 
 namespace DB
 {
+struct Settings;
 
 /** Create aggregate function combinator by matching suffix in aggregate function name.
   */
 class AggregateFunctionCombinatorFactory final: private boost::noncopyable
 {
 private:
-    using Dict = std::unordered_map<std::string, AggregateFunctionCombinatorPtr>;
+    struct CombinatorPair
+    {
+        std::string name;
+        AggregateFunctionCombinatorPtr combinator_ptr;
+
+        bool operator==(const CombinatorPair & rhs) const { return name == rhs.name; }
+        /// Sort by the length of the combinator name for proper tryFindSuffix()
+        /// for combiners with common prefix (i.e. "State" and "SimpleState").
+        bool operator<(const CombinatorPair & rhs) const { return name.length() > rhs.name.length(); }
+    };
+    using Dict = std::vector<CombinatorPair>;
     Dict dict;
 
 public:
diff --git a/src/AggregateFunctions/AggregateFunctionCount.cpp b/src/AggregateFunctions/AggregateFunctionCount.cpp
index 05824947b87..7c90796f65e 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.cpp
+++ b/src/AggregateFunctions/AggregateFunctionCount.cpp
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 AggregateFunctionPtr AggregateFunctionCount::getOwnNullAdapter(
     const AggregateFunctionPtr &, const DataTypes & types, const Array & params, const AggregateFunctionProperties & /*properties*/) const
@@ -16,7 +17,7 @@ AggregateFunctionPtr AggregateFunctionCount::getOwnNullAdapter(
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionCount(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionCount(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertArityAtMost<1>(name, argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
index 1b3a0acb528..8d9b0a6894e 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.h
+++ b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -13,6 +13,7 @@
 
 namespace DB
 {
+struct Settings;
 
 struct AggregateFunctionCountData
 {
@@ -38,6 +39,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn **, size_t, Arena *) const override
     {
         ++data(place).count;
@@ -126,6 +129,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         data(place).count += !assert_cast<const ColumnNullable &>(*columns[0]).isNullAt(row_num);
diff --git a/src/AggregateFunctions/AggregateFunctionDeltaSum.cpp b/src/AggregateFunctions/AggregateFunctionDeltaSum.cpp
index 231b730d1aa..f1c6e7c6112 100644
--- a/src/AggregateFunctions/AggregateFunctionDeltaSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionDeltaSum.cpp
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -20,7 +21,8 @@ namespace
 AggregateFunctionPtr createAggregateFunctionDeltaSum(
     const String & name,
     const DataTypes & arguments,
-    const Array & params)
+    const Array & params,
+    const Settings *)
 {
     assertNoParameters(name, params);
 
diff --git a/src/AggregateFunctions/AggregateFunctionDeltaSum.h b/src/AggregateFunctions/AggregateFunctionDeltaSum.h
index d5760de84ae..31d25c559dd 100644
--- a/src/AggregateFunctions/AggregateFunctionDeltaSum.h
+++ b/src/AggregateFunctions/AggregateFunctionDeltaSum.h
@@ -15,6 +15,7 @@
 
 namespace DB
 {
+struct Settings;
 
 template <typename T>
 struct AggregationFunctionDeltaSumData
@@ -22,8 +23,7 @@ struct AggregationFunctionDeltaSumData
     T sum = 0;
     T last = 0;
     T first = 0;
-    bool seen_last = false;
-    bool seen_first = false;
+    bool seen = false;
 };
 
 template <typename T>
@@ -43,22 +43,23 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<T>>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void NO_SANITIZE_UNDEFINED ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto value = assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num];
 
-        if ((this->data(place).last < value) && this->data(place).seen_last)
+        if ((this->data(place).last < value) && this->data(place).seen)
         {
             this->data(place).sum += (value - this->data(place).last);
         }
 
         this->data(place).last = value;
-        this->data(place).seen_last = true;
 
-        if (!this->data(place).seen_first)
+        if (!this->data(place).seen)
         {
             this->data(place).first = value;
-            this->data(place).seen_first = true;
+            this->data(place).seen = true;
         }
     }
 
@@ -67,7 +68,7 @@ public:
         auto place_data = &this->data(place);
         auto rhs_data = &this->data(rhs);
 
-        if ((place_data->last < rhs_data->first) && place_data->seen_last && rhs_data->seen_first)
+        if ((place_data->last < rhs_data->first) && place_data->seen && rhs_data->seen)
         {
             // If the lhs last number seen is less than the first number the rhs saw, the lhs is before
             // the rhs, for example [0, 2] [4, 7]. So we want to add the deltasums, but also add the
@@ -77,7 +78,7 @@ public:
             place_data->sum += rhs_data->sum + (rhs_data->first - place_data->last);
             place_data->last = rhs_data->last;
         }
-        else if ((rhs_data->last < place_data->first && rhs_data->seen_last && place_data->seen_first))
+        else if ((rhs_data->first < place_data->last && rhs_data->seen && place_data->seen))
         {
             // In the opposite scenario, the lhs comes after the rhs, e.g. [4, 6] [1, 2]. Since we
             // assume the input interval states are sorted by time, we assume this is a counter
@@ -85,18 +86,17 @@ public:
             // rhs last value.
 
             place_data->sum += rhs_data->sum;
-            place_data->first = rhs_data->first;
+            place_data->last = rhs_data->last;
         }
-        else if (rhs_data->seen_first)
+        else if (rhs_data->seen && !place_data->seen)
         {
             // If we're here then the lhs is an empty state and the rhs does have some state, so
             // we'll just take that state.
 
             place_data->first = rhs_data->first;
-            place_data->seen_first = rhs_data->seen_first;
             place_data->last = rhs_data->last;
-            place_data->seen_last = rhs_data->seen_last;
             place_data->sum = rhs_data->sum;
+            place_data->seen = rhs_data->seen;
         }
 
         // Otherwise lhs either has data or is uninitialized, so we don't need to modify its values.
@@ -107,8 +107,7 @@ public:
         writeIntBinary(this->data(place).sum, buf);
         writeIntBinary(this->data(place).first, buf);
         writeIntBinary(this->data(place).last, buf);
-        writePODBinary<bool>(this->data(place).seen_first, buf);
-        writePODBinary<bool>(this->data(place).seen_last, buf);
+        writePODBinary<bool>(this->data(place).seen, buf);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena *) const override
@@ -116,8 +115,7 @@ public:
         readIntBinary(this->data(place).sum, buf);
         readIntBinary(this->data(place).first, buf);
         readIntBinary(this->data(place).last, buf);
-        readPODBinary<bool>(this->data(place).seen_first, buf);
-        readPODBinary<bool>(this->data(place).seen_last, buf);
+        readPODBinary<bool>(this->data(place).seen, buf);
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
diff --git a/src/AggregateFunctions/AggregateFunctionDeltaSumTimestamp.cpp b/src/AggregateFunctions/AggregateFunctionDeltaSumTimestamp.cpp
new file mode 100644
index 00000000000..10195ae33fd
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionDeltaSumTimestamp.cpp
@@ -0,0 +1,52 @@
+#include <AggregateFunctions/AggregateFunctionDeltaSumTimestamp.h>
+
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/Helpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+AggregateFunctionPtr createAggregateFunctionDeltaSumTimestamp(
+    const String & name,
+    const DataTypes & arguments,
+    const Array & params,
+    const Settings *)
+{
+    assertNoParameters(name, params);
+
+    if (arguments.size() != 2)
+        throw Exception("Incorrect number of arguments for aggregate function " + name,
+            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (!isInteger(arguments[0]) && !isFloat(arguments[0]) && !isDateOrDateTime(arguments[0]))
+        throw Exception("Illegal type " + arguments[0]->getName() + " of argument for aggregate function " +
+            name + ", must be Int, Float, Date, DateTime", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    if (!isInteger(arguments[1]) && !isFloat(arguments[1]) && !isDateOrDateTime(arguments[1]))
+        throw Exception("Illegal type " + arguments[1]->getName() + " of argument for aggregate function " +
+            name + ", must be Int, Float, Date, DateTime", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    return AggregateFunctionPtr(createWithTwoNumericOrDateTypes<AggregationFunctionDeltaSumTimestamp>(
+        *arguments[0], *arguments[1], arguments, params));
+}
+}
+
+void registerAggregateFunctionDeltaSumTimestamp(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties properties = { .returns_default_when_only_null = true, .is_order_dependent = true };
+
+    factory.registerFunction("deltaSumTimestamp", { createAggregateFunctionDeltaSumTimestamp, properties });
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionDeltaSumTimestamp.h b/src/AggregateFunctions/AggregateFunctionDeltaSumTimestamp.h
new file mode 100644
index 00000000000..b7e91e9524a
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionDeltaSumTimestamp.h
@@ -0,0 +1,172 @@
+#pragma once
+
+#include <type_traits>
+#include <experimental/type_traits>
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+#include <Columns/ColumnVector.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypesNumber.h>
+
+#include <AggregateFunctions/IAggregateFunction.h>
+
+
+namespace DB
+{
+
+template <typename ValueType, typename TimestampType>
+struct AggregationFunctionDeltaSumTimestampData
+{
+    ValueType sum = 0;
+    ValueType first = 0;
+    ValueType last = 0;
+    TimestampType first_ts = 0;
+    TimestampType last_ts = 0;
+    bool seen = false;
+};
+
+template <typename ValueType, typename TimestampType>
+class AggregationFunctionDeltaSumTimestamp final
+    : public IAggregateFunctionDataHelper<
+        AggregationFunctionDeltaSumTimestampData<ValueType, TimestampType>,
+        AggregationFunctionDeltaSumTimestamp<ValueType, TimestampType>
+      >
+{
+public:
+    AggregationFunctionDeltaSumTimestamp(const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionDataHelper<
+            AggregationFunctionDeltaSumTimestampData<ValueType, TimestampType>,
+            AggregationFunctionDeltaSumTimestamp<ValueType, TimestampType>
+        >{arguments, params}
+    {}
+
+    AggregationFunctionDeltaSumTimestamp()
+        : IAggregateFunctionDataHelper<
+            AggregationFunctionDeltaSumTimestampData<ValueType, TimestampType>,
+            AggregationFunctionDeltaSumTimestamp<ValueType, TimestampType>
+        >{}
+    {}
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    String getName() const override { return "deltaSumTimestamp"; }
+
+    DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<ValueType>>(); }
+
+    void NO_SANITIZE_UNDEFINED ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
+    {
+        auto value = assert_cast<const ColumnVector<ValueType> &>(*columns[0]).getData()[row_num];
+        auto ts = assert_cast<const ColumnVector<TimestampType> &>(*columns[1]).getData()[row_num];
+
+        if ((this->data(place).last < value) && this->data(place).seen)
+        {
+            this->data(place).sum += (value - this->data(place).last);
+        }
+
+        this->data(place).last = value;
+        this->data(place).last_ts = ts;
+
+        if (!this->data(place).seen)
+        {
+            this->data(place).first = value;
+            this->data(place).seen = true;
+            this->data(place).first_ts = ts;
+        }
+    }
+
+    // before returns true if lhs is before rhs or false if it is not or can't be determined
+    bool ALWAYS_INLINE before (
+        const AggregationFunctionDeltaSumTimestampData<ValueType, TimestampType> * lhs,
+        const AggregationFunctionDeltaSumTimestampData<ValueType, TimestampType> * rhs
+    ) const
+    {
+        if (lhs->last_ts < rhs->first_ts)
+        {
+            return true;
+        }
+        if (lhs->last_ts == rhs->first_ts && (lhs->last_ts < rhs->last_ts || lhs->first_ts < rhs->first_ts))
+        {
+            return true;
+        }
+        return false;
+    }
+
+    void NO_SANITIZE_UNDEFINED ALWAYS_INLINE merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
+    {
+        auto place_data = &this->data(place);
+        auto rhs_data = &this->data(rhs);
+
+        if (!place_data->seen && rhs_data->seen)
+        {
+            place_data->sum = rhs_data->sum;
+            place_data->seen = true;
+            place_data->first = rhs_data->first;
+            place_data->first_ts = rhs_data->first_ts;
+            place_data->last = rhs_data->last;
+            place_data->last_ts = rhs_data->last_ts;
+        }
+        else if (place_data->seen && !rhs_data->seen)
+            return;
+        else if (before(place_data, rhs_data))
+        {
+            // This state came before the rhs state
+
+            if (rhs_data->first > place_data->last)
+                place_data->sum += (rhs_data->first - place_data->last);
+            place_data->sum += rhs_data->sum;
+            place_data->last = rhs_data->last;
+            place_data->last_ts = rhs_data->last_ts;
+        }
+        else if (before(rhs_data, place_data))
+        {
+            // This state came after the rhs state
+
+            if (place_data->first > rhs_data->last)
+                place_data->sum += (place_data->first - rhs_data->last);
+            place_data->sum += rhs_data->sum;
+            place_data->first = rhs_data->first;
+            place_data->first_ts = rhs_data->first_ts;
+        }
+        else
+        {
+            // If none of those conditions matched, it means both states we are merging have all
+            // same timestamps. We have to pick either the smaller or larger value so that the
+            // result is deterministic.
+
+            if (place_data->first < rhs_data->first)
+            {
+                place_data->first = rhs_data->first;
+                place_data->last = rhs_data->last;
+            }
+        }
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
+    {
+        writeIntBinary(this->data(place).sum, buf);
+        writeIntBinary(this->data(place).first, buf);
+        writeIntBinary(this->data(place).first_ts, buf);
+        writeIntBinary(this->data(place).last, buf);
+        writeIntBinary(this->data(place).last_ts, buf);
+        writePODBinary<bool>(this->data(place).seen, buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena *) const override
+    {
+        readIntBinary(this->data(place).sum, buf);
+        readIntBinary(this->data(place).first, buf);
+        readIntBinary(this->data(place).first_ts, buf);
+        readIntBinary(this->data(place).last, buf);
+        readIntBinary(this->data(place).last_ts, buf);
+        readPODBinary<bool>(this->data(place).seen, buf);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        assert_cast<ColumnVector<ValueType> &>(to).getData().push_back(this->data(place).sum);
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionDistinct.cpp b/src/AggregateFunctions/AggregateFunctionDistinct.cpp
index 8ad37f49797..a91148f214f 100644
--- a/src/AggregateFunctions/AggregateFunctionDistinct.cpp
+++ b/src/AggregateFunctions/AggregateFunctionDistinct.cpp
@@ -6,6 +6,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
diff --git a/src/AggregateFunctions/AggregateFunctionDistinct.h b/src/AggregateFunctions/AggregateFunctionDistinct.h
index b587bbebf6e..9b7853f8665 100644
--- a/src/AggregateFunctions/AggregateFunctionDistinct.h
+++ b/src/AggregateFunctions/AggregateFunctionDistinct.h
@@ -10,10 +10,10 @@
 #include <Common/HashTable/HashMap.h>
 #include <Common/SipHash.h>
 
-#include <Common/FieldVisitors.h>
 
 namespace DB
 {
+struct Settings;
 
 
 template <typename T>
diff --git a/src/AggregateFunctions/AggregateFunctionEntropy.cpp b/src/AggregateFunctions/AggregateFunctionEntropy.cpp
index a30b27f5311..fee4dcdcf73 100644
--- a/src/AggregateFunctions/AggregateFunctionEntropy.cpp
+++ b/src/AggregateFunctions/AggregateFunctionEntropy.cpp
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -16,7 +17,7 @@ namespace ErrorCodes
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionEntropy(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionEntropy(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     if (argument_types.empty())
diff --git a/src/AggregateFunctions/AggregateFunctionEntropy.h b/src/AggregateFunctions/AggregateFunctionEntropy.h
index 9bb1bc039c5..8e91dd87d77 100644
--- a/src/AggregateFunctions/AggregateFunctionEntropy.h
+++ b/src/AggregateFunctions/AggregateFunctionEntropy.h
@@ -14,6 +14,7 @@
 
 namespace DB
 {
+struct Settings;
 
 /** Calculates Shannon Entropy, using HashMap and computing empirical distribution function.
   * Entropy is measured in bits (base-2 logarithm is used).
@@ -103,6 +104,8 @@ public:
         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
     {
         if constexpr (!std::is_same_v<UInt128, Value>)
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index c0011b6ebec..bdc057817c9 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -23,6 +23,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -88,6 +89,17 @@ AggregateFunctionPtr AggregateFunctionFactory::get(
 
         AggregateFunctionPtr nested_function = getImpl(
             name, nested_types, nested_parameters, out_properties, has_null_arguments);
+
+        // Pure window functions are not real aggregate functions. Applying
+        // combinators doesn't make sense for them, they must handle the
+        // nullability themselves. Another special case is functions from Nothing
+        // that are rewritten to AggregateFunctionNothing, in this case
+        // nested_function is nullptr.
+        if (nested_function && nested_function->asWindowFunction())
+        {
+            return nested_function;
+        }
+
         return combinator->transformAggregateFunction(nested_function, out_properties, type_without_low_cardinality, parameters);
     }
 
@@ -121,7 +133,7 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
         is_case_insensitive = true;
     }
 
-    const Context * query_context = nullptr;
+    ContextConstPtr query_context;
     if (CurrentThread::isInitialized())
         query_context = CurrentThread::get().getQueryContext();
 
@@ -137,7 +149,8 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
         if (!out_properties.returns_default_when_only_null && has_null_arguments)
             return nullptr;
 
-        return found.creator(name, argument_types, parameters);
+        const Settings * settings = query_context ? &query_context->getSettingsRef() : nullptr;
+        return found.creator(name, argument_types, parameters, settings);
     }
 
     /// Combinators of aggregate functions.
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.h b/src/AggregateFunctions/AggregateFunctionFactory.h
index d308a5f559b..97b22d25faa 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.h
+++ b/src/AggregateFunctions/AggregateFunctionFactory.h
@@ -14,6 +14,7 @@
 
 namespace DB
 {
+struct Settings;
 
 class Context;
 class IDataType;
@@ -26,7 +27,7 @@ using DataTypes = std::vector<DataTypePtr>;
  * Parameters are for "parametric" aggregate functions.
  * For example, in quantileWeighted(0.9)(x, weight), 0.9 is "parameter" and x, weight are "arguments".
  */
-using AggregateFunctionCreator = std::function<AggregateFunctionPtr(const String &, const DataTypes &, const Array &)>;
+using AggregateFunctionCreator = std::function<AggregateFunctionPtr(const String &, const DataTypes &, const Array &, const Settings *)>;
 
 struct AggregateFunctionWithProperties
 {
diff --git a/src/AggregateFunctions/AggregateFunctionForEach.cpp b/src/AggregateFunctions/AggregateFunctionForEach.cpp
index 6e0365fc04b..0b06f0473ac 100644
--- a/src/AggregateFunctions/AggregateFunctionForEach.cpp
+++ b/src/AggregateFunctions/AggregateFunctionForEach.cpp
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionForEach.h b/src/AggregateFunctions/AggregateFunctionForEach.h
index 8d99e2e8af3..66209d8c0f5 100644
--- a/src/AggregateFunctions/AggregateFunctionForEach.h
+++ b/src/AggregateFunctions/AggregateFunctionForEach.h
@@ -13,6 +13,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
index 61dbdeef16e..c3152103f6a 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
@@ -9,6 +9,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -49,7 +50,7 @@ inline AggregateFunctionPtr createAggregateFunctionGroupArrayImpl(const DataType
 }
 
 
-AggregateFunctionPtr createAggregateFunctionGroupArray(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionGroupArray(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertUnary(name, argument_types);
 
@@ -83,7 +84,7 @@ AggregateFunctionPtr createAggregateFunctionGroupArray(const std::string & name,
         return createAggregateFunctionGroupArrayImpl<GroupArrayTrait<true, Sampler::NONE>>(argument_types[0], max_elems);
 }
 
-AggregateFunctionPtr createAggregateFunctionGroupArraySample(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionGroupArraySample(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertUnary(name, argument_types);
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArray.h b/src/AggregateFunctions/AggregateFunctionGroupArray.h
index 921274f7d59..06292992a2f 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArray.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArray.h
@@ -26,6 +26,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int TOO_LARGE_ARRAY_SIZE;
@@ -296,12 +298,7 @@ public:
         if (size)
         {
             typename ColumnVector<T>::Container & data_to = assert_cast<ColumnVector<T> &>(arr_to.getData()).getData();
-            if constexpr (is_big_int_v<T>)
-                // is data_to empty? we should probably use std::vector::insert then
-                for (auto it = this->data(place).value.begin(); it != this->data(place).value.end(); it++)
-                    data_to.push_back(*it);
-            else
-                data_to.insert(this->data(place).value.begin(), this->data(place).value.end());
+            data_to.insert(this->data(place).value.begin(), this->data(place).value.end());
         }
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.cpp
index d4e53acbbe2..7de31ae407c 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.cpp
@@ -7,6 +7,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
@@ -15,7 +17,7 @@ namespace ErrorCodes
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionGroupArrayInsertAt(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionGroupArrayInsertAt(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertBinary(name, argument_types);
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
index 35913f133b1..b804e4465ac 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h
@@ -20,6 +20,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -104,6 +105,8 @@ public:
         return std::make_shared<DataTypeArray>(type);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         /// TODO Do positions need to be 1-based for this function?
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
index e2139ba882f..cc4b2145977 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
@@ -10,6 +10,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -21,6 +22,7 @@ namespace ErrorCodes
 namespace
 {
 
+/// TODO Proper support for Decimal256.
 template <typename T, typename LimitNumberOfElements>
 struct MovingSum
 {
@@ -56,7 +58,7 @@ inline AggregateFunctionPtr createAggregateFunctionMovingImpl(const std::string
 }
 
 template <template <typename, typename> class Function>
-AggregateFunctionPtr createAggregateFunctionMoving(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionMoving(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertUnary(name, argument_types);
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
index 3bab831d316..daaa7a69baf 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
@@ -22,6 +22,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -38,7 +39,7 @@ struct MovingData
     using Array = PODArray<T, 32, Allocator>;
 
     Array value;    /// Prefix sums.
-    T sum = 0;
+    T sum{};
 
     void NO_SANITIZE_UNDEFINED add(T val, Arena * arena)
     {
@@ -69,9 +70,9 @@ struct MovingAvgData : public MovingData<T>
     T NO_SANITIZE_UNDEFINED get(size_t idx, UInt64 window_size) const
     {
         if (idx < window_size)
-            return this->value[idx] / window_size;
+            return this->value[idx] / T(window_size);
         else
-            return (this->value[idx] - this->value[idx - window_size]) / window_size;
+            return (this->value[idx] - this->value[idx - window_size]) / T(window_size);
     }
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp b/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp
index 415ba557ef5..30e0206f789 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmap.cpp
@@ -9,6 +9,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -33,7 +35,7 @@ namespace
     }
 
     template <template <typename> class Data>
-    AggregateFunctionPtr createAggregateFunctionBitmap(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+    AggregateFunctionPtr createAggregateFunctionBitmap(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
     {
         assertNoParameters(name, parameters);
         assertUnary(name, argument_types);
@@ -57,7 +59,7 @@ namespace
     // Additional aggregate functions to manipulate bitmaps.
     template <template <typename, typename> class AggregateFunctionTemplate>
     AggregateFunctionPtr
-    createAggregateFunctionBitmapL2(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+    createAggregateFunctionBitmapL2(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
     {
         assertNoParameters(name, parameters);
         assertUnary(name, argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
index 4628410286d..cbcac4f7200 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmap.h
@@ -11,6 +11,7 @@
 
 namespace DB
 {
+struct Settings;
 /// Counts bitmap operation on numbers.
 template <typename T, typename Data>
 class AggregateFunctionBitmap final : public IAggregateFunctionDataHelper<Data, AggregateFunctionBitmap<T, Data>>
@@ -22,6 +23,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<T>>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).rbs.add(assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num]);
@@ -56,6 +59,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeNumber<T>>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         Data & data_lhs = this->data(place);
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
index 40885ba74a0..64f87793d56 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
@@ -16,6 +16,7 @@
 
 namespace DB
 {
+struct Settings;
 
 enum BitmapKind
 {
diff --git a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
index dd29a64819a..0ef5358e83c 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
@@ -9,6 +9,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -72,7 +73,7 @@ inline AggregateFunctionPtr createAggregateFunctionGroupUniqArrayImpl(const std:
 
 }
 
-AggregateFunctionPtr createAggregateFunctionGroupUniqArray(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionGroupUniqArray(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertUnary(name, argument_types);
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
index 435efdd2373..ccba789483f 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
@@ -23,6 +23,7 @@
 
 namespace DB
 {
+struct Settings;
 
 
 template <typename T>
@@ -59,6 +60,8 @@ public:
         return std::make_shared<DataTypeArray>(this->argument_types[0]);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         if (limit_num_elems && this->data(place).value.size() >= max_elems)
diff --git a/src/AggregateFunctions/AggregateFunctionHistogram.cpp b/src/AggregateFunctions/AggregateFunctionHistogram.cpp
index 1b96cc43d8a..0cb4f094b9c 100644
--- a/src/AggregateFunctions/AggregateFunctionHistogram.cpp
+++ b/src/AggregateFunctions/AggregateFunctionHistogram.cpp
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -22,7 +23,7 @@ namespace ErrorCodes
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionHistogram(const std::string & name, const DataTypes & arguments, const Array & params)
+AggregateFunctionPtr createAggregateFunctionHistogram(const std::string & name, const DataTypes & arguments, const Array & params, const Settings *)
 {
     if (params.size() != 1)
         throw Exception("Function " + name + " requires single parameter: bins count", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
diff --git a/src/AggregateFunctions/AggregateFunctionHistogram.h b/src/AggregateFunctions/AggregateFunctionHistogram.h
index 76aa96ba663..5268f84e7ac 100644
--- a/src/AggregateFunctions/AggregateFunctionHistogram.h
+++ b/src/AggregateFunctions/AggregateFunctionHistogram.h
@@ -26,6 +26,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -220,7 +221,7 @@ private:
     }
 
 public:
-    AggregateFunctionHistogramData()
+    AggregateFunctionHistogramData() //-V730
         : size(0)
         , lower_bound(std::numeric_limits<Mean>::max())
         , upper_bound(std::numeric_limits<Mean>::lowest())
@@ -332,6 +333,8 @@ public:
         return std::make_shared<DataTypeArray>(tuple);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto val = assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num];
diff --git a/src/AggregateFunctions/AggregateFunctionIf.cpp b/src/AggregateFunctions/AggregateFunctionIf.cpp
index 45fead18d29..8c16d0774fa 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.cpp
+++ b/src/AggregateFunctions/AggregateFunctionIf.cpp
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionIf.h b/src/AggregateFunctions/AggregateFunctionIf.h
index 8144ae355ba..5ef8e3bc75a 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.h
+++ b/src/AggregateFunctions/AggregateFunctionIf.h
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -113,6 +114,16 @@ public:
         nested_func->merge(place, rhs, arena);
     }
 
+    void mergeBatch(
+        size_t batch_size,
+        AggregateDataPtr * places,
+        size_t place_offset,
+        const AggregateDataPtr * rhs,
+        Arena * arena) const override
+    {
+        nested_func->mergeBatch(batch_size, places, place_offset, rhs, arena);
+    }
+
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
     {
         nested_func->serialize(place, buf);
diff --git a/src/AggregateFunctions/AggregateFunctionMLMethod.cpp b/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
index 6c5c5af2f1d..e7f79c276ed 100644
--- a/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMLMethod.cpp
@@ -16,6 +16,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
@@ -29,7 +31,7 @@ namespace
     using FuncLogisticRegression = AggregateFunctionMLMethod<LinearModelData, NameLogisticRegression>;
     template <class Method>
     AggregateFunctionPtr
-    createAggregateFunctionMLMethod(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+    createAggregateFunctionMLMethod(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
     {
         if (parameters.size() > 4)
             throw Exception(
@@ -146,7 +148,7 @@ void LinearModelData::predict(
     const ColumnsWithTypeAndName & arguments,
     size_t offset,
     size_t limit,
-    const Context & context) const
+    ContextConstPtr context) const
 {
     gradient_computer->predict(container, arguments, offset, limit, weights, bias, context);
 }
@@ -453,7 +455,7 @@ void LogisticRegression::predict(
     size_t limit,
     const std::vector<Float64> & weights,
     Float64 bias,
-    const Context & /*context*/) const
+    ContextConstPtr /*context*/) const
 {
     size_t rows_num = arguments.front().column->size();
 
@@ -521,7 +523,7 @@ void LinearRegression::predict(
     size_t limit,
     const std::vector<Float64> & weights,
     Float64 bias,
-    const Context & /*context*/) const
+    ContextConstPtr /*context*/) const
 {
     if (weights.size() + 1 != arguments.size())
     {
diff --git a/src/AggregateFunctions/AggregateFunctionMLMethod.h b/src/AggregateFunctions/AggregateFunctionMLMethod.h
index 0c88f9d877d..a97b565eed3 100644
--- a/src/AggregateFunctions/AggregateFunctionMLMethod.h
+++ b/src/AggregateFunctions/AggregateFunctionMLMethod.h
@@ -3,14 +3,16 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnsNumber.h>
-#include <Common/typeid_cast.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Common/typeid_cast.h>
 #include "IAggregateFunction.h"
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
@@ -44,7 +46,7 @@ public:
         size_t limit,
         const std::vector<Float64> & weights,
         Float64 bias,
-        const Context & context) const = 0;
+        ContextConstPtr context) const = 0;
 };
 
 
@@ -69,7 +71,7 @@ public:
         size_t limit,
         const std::vector<Float64> & weights,
         Float64 bias,
-        const Context & context) const override;
+        ContextConstPtr context) const override;
 };
 
 
@@ -94,7 +96,7 @@ public:
         size_t limit,
         const std::vector<Float64> & weights,
         Float64 bias,
-        const Context & context) const override;
+        ContextConstPtr context) const override;
 };
 
 
@@ -264,7 +266,7 @@ public:
         const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
-        const Context & context) const;
+        ContextConstPtr context) const;
 
     void returnWeights(IColumn & to) const;
 private:
@@ -323,6 +325,8 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFloat64>());
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     /// This function is called from evalMLMethod function for correct predictValues call
     DataTypePtr getReturnTypeToPredict() const override
     {
@@ -363,7 +367,7 @@ public:
         const ColumnsWithTypeAndName & arguments,
         size_t offset,
         size_t limit,
-        const Context & context) const override
+        ContextConstPtr context) const override
     {
         if (arguments.size() != param_num + 1)
             throw Exception(
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp b/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
index ceb0b930f73..cad9bb1e6a5 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
@@ -12,11 +12,12 @@ extern const int NOT_IMPLEMENTED;
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionMannWhitneyUTest(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionMannWhitneyUTest(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertBinary(name, argument_types);
 
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.h b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
index 1451536d519..365bc45f7b7 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.h
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
@@ -6,7 +6,6 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
-#include <Common/FieldVisitors.h>
 #include <Common/PODArray_fwd.h>
 #include <common/types.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -21,9 +20,10 @@
 
 #include <Common/ArenaAllocator.h>
 
-#include <iostream>
+
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -174,6 +174,8 @@ public:
         return "mannWhitneyUTest";
     }
 
+    bool allocatesMemoryInArena() const override { return true; }
+
     DataTypePtr getReturnType() const override
     {
         DataTypes types
@@ -208,7 +210,7 @@ public:
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
     {
         auto & a = this->data(place);
-        auto & b = this->data(rhs);
+        const auto & b = this->data(rhs);
 
         a.merge(b, arena);
     }
diff --git a/src/AggregateFunctions/AggregateFunctionMax.cpp b/src/AggregateFunctions/AggregateFunctionMax.cpp
index 921ea4179c9..0ede138f4e6 100644
--- a/src/AggregateFunctions/AggregateFunctionMax.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMax.cpp
@@ -6,18 +6,19 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionMax(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionMax(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionMaxData>(name, argument_types, parameters));
+    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionMaxData>(name, argument_types, parameters, settings));
 }
 
-AggregateFunctionPtr createAggregateFunctionArgMax(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionArgMax(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionArgMinMax<AggregateFunctionMaxData>(name, argument_types, parameters));
+    return AggregateFunctionPtr(createAggregateFunctionArgMinMax<AggregateFunctionMaxData>(name, argument_types, parameters, settings));
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionMaxIntersections.cpp b/src/AggregateFunctions/AggregateFunctionMaxIntersections.cpp
index e262ea91d75..32c4518df2b 100644
--- a/src/AggregateFunctions/AggregateFunctionMaxIntersections.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMaxIntersections.cpp
@@ -7,6 +7,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -32,11 +34,17 @@ namespace
 
 void registerAggregateFunctionsMaxIntersections(AggregateFunctionFactory & factory)
 {
-    factory.registerFunction("maxIntersections", [](const std::string & name, const DataTypes & argument_types, const Array & parameters)
-        { return createAggregateFunctionMaxIntersections(AggregateFunctionIntersectionsKind::Count, name, argument_types, parameters); });
+    factory.registerFunction("maxIntersections",
+        [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+        {
+            return createAggregateFunctionMaxIntersections(AggregateFunctionIntersectionsKind::Count, name, argument_types, parameters);
+        });
 
-    factory.registerFunction("maxIntersectionsPosition", [](const std::string & name, const DataTypes & argument_types, const Array & parameters)
-        { return createAggregateFunctionMaxIntersections(AggregateFunctionIntersectionsKind::Position, name, argument_types, parameters); });
+    factory.registerFunction("maxIntersectionsPosition",
+        [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+        {
+            return createAggregateFunctionMaxIntersections(AggregateFunctionIntersectionsKind::Position, name, argument_types, parameters);
+        });
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
index d4946ad2c9d..2b7b28266c1 100644
--- a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
+++ b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
@@ -19,6 +19,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -87,6 +88,8 @@ public:
             return std::make_shared<DataTypeNumber<PointType>>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
     {
         PointType left = assert_cast<const ColumnVector<PointType> &>(*columns[0]).getData()[row_num];
diff --git a/src/AggregateFunctions/AggregateFunctionMerge.cpp b/src/AggregateFunctions/AggregateFunctionMerge.cpp
index 17157d21bd1..3015f23db88 100644
--- a/src/AggregateFunctions/AggregateFunctionMerge.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMerge.cpp
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionMerge.h b/src/AggregateFunctions/AggregateFunctionMerge.h
index 7f6a23f1845..d129b829f9c 100644
--- a/src/AggregateFunctions/AggregateFunctionMerge.h
+++ b/src/AggregateFunctions/AggregateFunctionMerge.h
@@ -9,6 +9,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
diff --git a/src/AggregateFunctions/AggregateFunctionMin.cpp b/src/AggregateFunctions/AggregateFunctionMin.cpp
index fec5be484e9..ee0e40ce335 100644
--- a/src/AggregateFunctions/AggregateFunctionMin.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMin.cpp
@@ -6,18 +6,19 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionMin(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionMin(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionMinData>(name, argument_types, parameters));
+    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionMinData>(name, argument_types, parameters, settings));
 }
 
-AggregateFunctionPtr createAggregateFunctionArgMin(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionArgMin(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionArgMinMax<AggregateFunctionMinData>(name, argument_types, parameters));
+    return AggregateFunctionPtr(createAggregateFunctionArgMinMax<AggregateFunctionMinData>(name, argument_types, parameters, settings));
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index 919026a78c1..de1f4fad296 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -15,6 +15,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -181,7 +183,7 @@ public:
 /** For strings. Short strings are stored in the object itself, and long strings are allocated separately.
   * NOTE It could also be suitable for arrays of numbers.
   */
-struct SingleValueDataString
+struct SingleValueDataString //-V730
 {
 private:
     using Self = SingleValueDataString;
diff --git a/src/AggregateFunctions/AggregateFunctionNothing.h b/src/AggregateFunctions/AggregateFunctionNothing.h
index f373b3b55b0..1f5b95c5cf3 100644
--- a/src/AggregateFunctions/AggregateFunctionNothing.h
+++ b/src/AggregateFunctions/AggregateFunctionNothing.h
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+struct Settings;
 
 
 /** Aggregate function that takes arbitrary number of arbitrary arguments and does nothing.
@@ -28,6 +29,8 @@ public:
         return argument_types.front();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void create(AggregateDataPtr) const override
     {
     }
diff --git a/src/AggregateFunctions/AggregateFunctionNull.cpp b/src/AggregateFunctions/AggregateFunctionNull.cpp
index f584ae1f34c..2486ae7920b 100644
--- a/src/AggregateFunctions/AggregateFunctionNull.cpp
+++ b/src/AggregateFunctions/AggregateFunctionNull.cpp
@@ -9,6 +9,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionNull.h b/src/AggregateFunctions/AggregateFunctionNull.h
index e1238182ab5..a0e36d1bc3d 100644
--- a/src/AggregateFunctions/AggregateFunctionNull.h
+++ b/src/AggregateFunctions/AggregateFunctionNull.h
@@ -12,6 +12,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.cpp b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
index ee9fce710e6..270e4f94c7a 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.cpp
+++ b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 namespace
 {
 
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.h b/src/AggregateFunctions/AggregateFunctionOrFill.h
index 4bb25e0d4de..aaafb8cc2c0 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.h
+++ b/src/AggregateFunctions/AggregateFunctionOrFill.h
@@ -11,6 +11,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -196,6 +197,18 @@ public:
         place[size_of_data] |= rhs[size_of_data];
     }
 
+    void mergeBatch(
+        size_t batch_size,
+        AggregateDataPtr * places,
+        size_t place_offset,
+        const AggregateDataPtr * rhs,
+        Arena * arena) const override
+    {
+        nested_function->mergeBatch(batch_size, places, place_offset, rhs, arena);
+        for (size_t i = 0; i < batch_size; ++i)
+            (places[i] + place_offset)[size_of_data] |= rhs[i][size_of_data];
+    }
+
     void serialize(
         ConstAggregateDataPtr place,
         WriteBuffer & buf) const override
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.cpp b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
index 1dcdb288339..26bcf5d74e4 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -52,6 +53,9 @@ template <typename Value, bool float_return> using FuncQuantilesTDigest = Aggreg
 template <typename Value, bool float_return> using FuncQuantileTDigestWeighted = AggregateFunctionQuantile<Value, QuantileTDigest<Value>, NameQuantileTDigestWeighted, true, std::conditional_t<float_return, Float32, void>, false>;
 template <typename Value, bool float_return> using FuncQuantilesTDigestWeighted = AggregateFunctionQuantile<Value, QuantileTDigest<Value>, NameQuantilesTDigestWeighted, true, std::conditional_t<float_return, Float32, void>, true>;
 
+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 <template <typename, bool> class Function>
 static constexpr bool supportDecimal()
@@ -80,7 +84,7 @@ static constexpr bool supportBigInt()
 }
 
 template <template <typename, bool> class Function>
-AggregateFunctionPtr createAggregateFunctionQuantile(const std::string & name, const DataTypes & argument_types, const Array & params)
+AggregateFunctionPtr createAggregateFunctionQuantile(const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
 {
     /// Second argument type check doesn't depend on the type of the first one.
     Function<void, true>::assertSecondArg(argument_types);
@@ -100,13 +104,14 @@ AggregateFunctionPtr createAggregateFunctionQuantile(const std::string & name, c
         if (which.idx == TypeIndex::Decimal32) return std::make_shared<Function<Decimal32, false>>(argument_types, params);
         if (which.idx == TypeIndex::Decimal64) return std::make_shared<Function<Decimal64, false>>(argument_types, params);
         if (which.idx == TypeIndex::Decimal128) return std::make_shared<Function<Decimal128, false>>(argument_types, params);
+        if (which.idx == TypeIndex::Decimal256) return std::make_shared<Function<Decimal256, false>>(argument_types, params);
         if (which.idx == TypeIndex::DateTime64) return std::make_shared<Function<DateTime64, false>>(argument_types, params);
-        //if (which.idx == TypeIndex::Decimal256) return std::make_shared<Function<Decimal256, false>>(argument_types, params);
     }
 
     if constexpr (supportBigInt<Function>())
     {
         if (which.idx == TypeIndex::Int128) return std::make_shared<Function<Int128, true>>(argument_types, params);
+        if (which.idx == TypeIndex::UInt128) return std::make_shared<Function<Int128, true>>(argument_types, params);
         if (which.idx == TypeIndex::Int256) return std::make_shared<Function<Int256, true>>(argument_types, params);
         if (which.idx == TypeIndex::UInt256) return std::make_shared<Function<UInt256, true>>(argument_types, params);
     }
@@ -155,6 +160,9 @@ void registerAggregateFunctionsQuantile(AggregateFunctionFactory & factory)
     factory.registerFunction(NameQuantileTDigestWeighted::name, createAggregateFunctionQuantile<FuncQuantileTDigestWeighted>);
     factory.registerFunction(NameQuantilesTDigestWeighted::name, createAggregateFunctionQuantile<FuncQuantilesTDigestWeighted>);
 
+    factory.registerFunction(NameQuantileBFloat16::name, createAggregateFunctionQuantile<FuncQuantileBFloat16>);
+    factory.registerFunction(NameQuantilesBFloat16::name, createAggregateFunctionQuantile<FuncQuantilesBFloat16>);
+
     /// 'median' is an alias for 'quantile'
     factory.registerAlias("median", NameQuantile::name);
     factory.registerAlias("medianDeterministic", NameQuantileDeterministic::name);
@@ -166,6 +174,7 @@ void registerAggregateFunctionsQuantile(AggregateFunctionFactory & factory)
     factory.registerAlias("medianTimingWeighted", NameQuantileTimingWeighted::name);
     factory.registerAlias("medianTDigest", NameQuantileTDigest::name);
     factory.registerAlias("medianTDigestWeighted", NameQuantileTDigestWeighted::name);
+    factory.registerAlias("medianBFloat16", NameQuantileBFloat16::name);
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index edd24add736..e7e60fe1def 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -9,6 +9,7 @@
 #include <AggregateFunctions/QuantileExactWeighted.h>
 #include <AggregateFunctions/QuantileTiming.h>
 #include <AggregateFunctions/QuantileTDigest.h>
+#include <AggregateFunctions/QuantileBFloat16Histogram.h>
 
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/QuantilesCommon.h>
@@ -28,6 +29,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -103,6 +105,8 @@ public:
             return res;
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto value = static_cast<const ColVecType &>(*columns[0]).getData()[row_num];
@@ -226,4 +230,7 @@ struct NameQuantileTDigestWeighted { static constexpr auto name = "quantileTDige
 struct NameQuantilesTDigest { static constexpr auto name = "quantilesTDigest"; };
 struct NameQuantilesTDigestWeighted { static constexpr auto name = "quantilesTDigestWeighted"; };
 
+struct NameQuantileBFloat16 { static constexpr auto name = "quantileBFloat16"; };
+struct NameQuantilesBFloat16 { static constexpr auto name = "quantilesBFloat16"; };
+
 }
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp b/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp
index 87fc24f8f98..d3f6a90e474 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp
@@ -12,11 +12,12 @@ extern const int NOT_IMPLEMENTED;
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionRankCorrelation(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionRankCorrelation(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertBinary(name, argument_types);
     assertNoParameters(name, parameters);
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
index a7e0852378c..b7da1f28fd3 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
@@ -18,6 +18,7 @@
 
 namespace DB
 {
+struct Settings;
 
 
 struct RankCorrelationData : public StatisticalSample<Float64, Float64>
@@ -58,6 +59,8 @@ public:
         return "rankCorr";
     }
 
+    bool allocatesMemoryInArena() const override { return true; }
+
     DataTypePtr getReturnType() const override
     {
         return std::make_shared<DataTypeNumber<Float64>>();
diff --git a/src/AggregateFunctions/AggregateFunctionResample.cpp b/src/AggregateFunctions/AggregateFunctionResample.cpp
index b81fb442f27..fe818acd8d7 100644
--- a/src/AggregateFunctions/AggregateFunctionResample.cpp
+++ b/src/AggregateFunctions/AggregateFunctionResample.cpp
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionResample.h b/src/AggregateFunctions/AggregateFunctionResample.h
index 4b29b921b45..45aad8c1a56 100644
--- a/src/AggregateFunctions/AggregateFunctionResample.h
+++ b/src/AggregateFunctions/AggregateFunctionResample.h
@@ -9,6 +9,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.cpp b/src/AggregateFunctions/AggregateFunctionRetention.cpp
index c9d475c78f3..7f96bc88c52 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.cpp
+++ b/src/AggregateFunctions/AggregateFunctionRetention.cpp
@@ -7,6 +7,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
@@ -15,7 +17,7 @@ namespace ErrorCodes
 namespace
 {
 
-AggregateFunctionPtr createAggregateFunctionRetention(const std::string & name, const DataTypes & arguments, const Array & params)
+AggregateFunctionPtr createAggregateFunctionRetention(const std::string & name, const DataTypes & arguments, const Array & params, const Settings *)
 {
     assertNoParameters(name, params);
 
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.h b/src/AggregateFunctions/AggregateFunctionRetention.h
index 5f0d9907280..1496c92681a 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.h
+++ b/src/AggregateFunctions/AggregateFunctionRetention.h
@@ -17,6 +17,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -94,6 +96,8 @@ public:
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt8>());
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, const size_t row_num, Arena *) const override
     {
         for (const auto i : ext::range(0, events_size))
diff --git a/src/AggregateFunctions/AggregateFunctionSegmentLengthSum.cpp b/src/AggregateFunctions/AggregateFunctionSegmentLengthSum.cpp
new file mode 100644
index 00000000000..fad60eacc04
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSegmentLengthSum.cpp
@@ -0,0 +1,66 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSegmentLengthSum.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/Helpers.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+
+#include <ext/range.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+struct Settings;
+
+namespace
+{
+    template <template <typename> class Data>
+    AggregateFunctionPtr
+    createAggregateFunctionSegmentLengthSum(const std::string & name, const DataTypes & arguments, const Array &, const Settings *)
+    {
+        if (arguments.size() != 2)
+            throw Exception(
+                "Aggregate function " + name + " requires two timestamps argument.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        auto args = {arguments[0].get(), arguments[1].get()};
+
+        if (WhichDataType{args.begin()[0]}.idx != WhichDataType{args.begin()[1]}.idx)
+            throw Exception(
+                "Illegal type " + args.begin()[0]->getName() + " and " + args.begin()[1]->getName() + " of arguments of aggregate function "
+                    + name + ", there two arguments should have same DataType",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+        for (const auto & arg : args)
+        {
+            if (!isNativeNumber(arg) && !isDateOrDateTime(arg))
+                throw Exception(
+                    "Illegal type " + arg->getName() + " of argument of aggregate function " + name
+                        + ", must be Number, Date, DateTime or DateTime64",
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+
+        AggregateFunctionPtr res(createWithBasicNumberOrDateOrDateTime<AggregateFunctionSegmentLengthSum, Data>(*arguments[0], arguments));
+
+        if (res)
+            return res;
+
+        throw Exception(
+            "Illegal type " + arguments.front().get()->getName() + " of first argument of aggregate function " + name
+                + ", must be Native Unsigned Number",
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+}
+
+}
+
+void registerAggregateFunctionSegmentLengthSum(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("segmentLengthSum", createAggregateFunctionSegmentLengthSum<AggregateFunctionSegmentLengthSumData>);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSegmentLengthSum.h b/src/AggregateFunctions/AggregateFunctionSegmentLengthSum.h
new file mode 100644
index 00000000000..0ca70cc7367
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSegmentLengthSum.h
@@ -0,0 +1,199 @@
+#pragma once
+
+#include <unordered_set>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/ArenaAllocator.h>
+#include <Common/assert_cast.h>
+
+#include <AggregateFunctions/AggregateFunctionNull.h>
+
+namespace DB
+{
+
+template <typename T>
+struct AggregateFunctionSegmentLengthSumData
+{
+    using Segment = std::pair<T, T>;
+    using Segments = PODArrayWithStackMemory<Segment, 64>;
+
+    bool sorted = false;
+
+    Segments segments;
+
+    size_t size() const { return segments.size(); }
+
+    void add(T start, T end)
+    {
+        if (sorted && segments.size() > 0)
+        {
+            sorted = segments.back().first <= start;
+        }
+        segments.emplace_back(start, end);
+    }
+
+    void merge(const AggregateFunctionSegmentLengthSumData & other)
+    {
+        if (other.segments.empty())
+            return;
+
+        const auto size = segments.size();
+
+        segments.insert(std::begin(other.segments), std::end(other.segments));
+
+        /// either sort whole container or do so partially merging ranges afterwards
+        if (!sorted && !other.sorted)
+            std::stable_sort(std::begin(segments), std::end(segments));
+        else
+        {
+            const auto begin = std::begin(segments);
+            const auto middle = std::next(begin, size);
+            const auto end = std::end(segments);
+
+            if (!sorted)
+                std::stable_sort(begin, middle);
+
+            if (!other.sorted)
+                std::stable_sort(middle, end);
+
+            std::inplace_merge(begin, middle, end);
+        }
+
+        sorted = true;
+    }
+
+    void sort()
+    {
+        if (!sorted)
+        {
+            std::stable_sort(std::begin(segments), std::end(segments));
+            sorted = true;
+        }
+    }
+
+    void serialize(WriteBuffer & buf) const
+    {
+        writeBinary(sorted, buf);
+        writeBinary(segments.size(), buf);
+
+        for (const auto & time_gap : segments)
+        {
+            writeBinary(time_gap.first, buf);
+            writeBinary(time_gap.second, buf);
+        }
+    }
+
+    void deserialize(ReadBuffer & buf)
+    {
+        readBinary(sorted, buf);
+
+        size_t size;
+        readBinary(size, buf);
+
+        segments.clear();
+        segments.reserve(size);
+
+        T start, end;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            readBinary(start, buf);
+            readBinary(end, buf);
+            segments.emplace_back(start, end);
+        }
+    }
+};
+
+template <typename T, typename Data>
+class AggregateFunctionSegmentLengthSum final : public IAggregateFunctionDataHelper<Data, AggregateFunctionSegmentLengthSum<T, Data>>
+{
+private:
+    template <typename TResult>
+    TResult getSegmentLengthSum(Data & data) const
+    {
+        if (data.size() == 0)
+            return 0;
+
+        data.sort();
+
+        TResult res = 0;
+
+        typename Data::Segment cur_segment = data.segments[0];
+
+        for (size_t i = 1; i < data.segments.size(); ++i)
+        {
+            if (cur_segment.second < data.segments[i].first)
+            {
+                res += cur_segment.second - cur_segment.first;
+                cur_segment = data.segments[i];
+            }
+            else
+                cur_segment.second = std::max(cur_segment.second, data.segments[i].second);
+        }
+
+        res += cur_segment.second - cur_segment.first;
+
+        return res;
+    }
+
+public:
+    String getName() const override { return "segmentLengthSum"; }
+
+    explicit AggregateFunctionSegmentLengthSum(const DataTypes & arguments)
+        : IAggregateFunctionDataHelper<Data, AggregateFunctionSegmentLengthSum<T, Data>>(arguments, {})
+    {
+    }
+
+    DataTypePtr getReturnType() const override
+    {
+        if constexpr (std::is_floating_point_v<T>)
+            return std::make_shared<DataTypeFloat64>();
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    AggregateFunctionPtr getOwnNullAdapter(
+        const AggregateFunctionPtr & nested_function,
+        const DataTypes & arguments,
+        const Array & params,
+        const AggregateFunctionProperties & /*properties*/) const override
+    {
+        return std::make_shared<AggregateFunctionNullVariadic<false, false, false>>(nested_function, arguments, params);
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, const size_t row_num, Arena *) const override
+    {
+        auto start = assert_cast<const ColumnVector<T> *>(columns[0])->getData()[row_num];
+        auto end = assert_cast<const ColumnVector<T> *>(columns[1])->getData()[row_num];
+        this->data(place).add(start, end);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, 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);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        if constexpr (std::is_floating_point_v<T>)
+            assert_cast<ColumnFloat64 &>(to).getData().push_back(getSegmentLengthSum<Float64>(this->data(place)));
+        else
+            assert_cast<ColumnUInt64 &>(to).getData().push_back(getSegmentLengthSum<UInt64>(this->data(place)));
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
index bbdb7622edf..c3eb0291779 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
@@ -10,6 +10,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -23,7 +24,7 @@ namespace
 {
 
 template <template <typename, typename> class AggregateFunction, template <typename> class Data>
-AggregateFunctionPtr createAggregateFunctionSequenceBase(const std::string & name, const DataTypes & argument_types, const Array & params)
+AggregateFunctionPtr createAggregateFunctionSequenceBase(const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
 {
     if (params.size() != 1)
         throw Exception{"Aggregate function " + name + " requires exactly one parameter.",
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 48015a6d282..f0fd1e33dca 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -15,6 +15,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -560,6 +561,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeUInt8>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
         this->data(place).sort();
@@ -588,6 +591,8 @@ public:
 
     DataTypePtr getReturnType() const override { return std::make_shared<DataTypeUInt64>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
         this->data(place).sort();
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
new file mode 100644
index 00000000000..0c87a32a415
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
@@ -0,0 +1,144 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSequenceNextNode.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <Core/Settings.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Interpreters/Context.h>
+#include <Common/CurrentThread.h>
+#include <ext/range.h>
+
+
+namespace DB
+{
+
+constexpr size_t max_events_size = 64;
+
+constexpr size_t min_required_args = 3;
+
+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 UNKNOWN_AGGREGATE_FUNCTION;
+}
+
+namespace
+{
+
+template <typename T>
+inline AggregateFunctionPtr createAggregateFunctionSequenceNodeImpl(
+    const DataTypePtr data_type, const DataTypes & argument_types, SequenceDirection direction, SequenceBase base)
+{
+    return std::make_shared<SequenceNextNodeImpl<T, NodeString<max_events_size>>>(
+        data_type, argument_types, base, direction, min_required_args);
+}
+
+AggregateFunctionPtr
+createAggregateFunctionSequenceNode(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    if (settings == nullptr || !settings->allow_experimental_funnel_functions)
+    {
+        throw Exception(
+            "Aggregate function " + name + " is experimental. Set `allow_experimental_funnel_functions` setting to enable it",
+            ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION);
+    }
+
+    if (parameters.size() < 2)
+        throw Exception("Aggregate function '" + name + "' requires 2 parameters (direction, head)",
+                        ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+    auto expected_param_type = Field::Types::Which::String;
+    if (parameters.at(0).getType() != expected_param_type || parameters.at(1).getType() != expected_param_type)
+        throw Exception("Aggregate function '" + name + "' requires 'String' parameters",
+                        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    String param_dir = parameters.at(0).safeGet<String>();
+    std::unordered_map<std::string, SequenceDirection> seq_dir_mapping{
+        {"forward", SequenceDirection::Forward},
+        {"backward", SequenceDirection::Backward},
+    };
+    if (!seq_dir_mapping.contains(param_dir))
+        throw Exception{"Aggregate function " + name + " doesn't support a parameter: " + param_dir, ErrorCodes::BAD_ARGUMENTS};
+    SequenceDirection direction = seq_dir_mapping[param_dir];
+
+    String param_base = parameters.at(1).safeGet<String>();
+    std::unordered_map<std::string, SequenceBase> seq_base_mapping{
+        {"head", SequenceBase::Head},
+        {"tail", SequenceBase::Tail},
+        {"first_match", SequenceBase::FirstMatch},
+        {"last_match", SequenceBase::LastMatch},
+    };
+    if (!seq_base_mapping.contains(param_base))
+        throw Exception{"Aggregate function " + name + " doesn't support a parameter: " + param_base, ErrorCodes::BAD_ARGUMENTS};
+    SequenceBase base = seq_base_mapping[param_base];
+
+    if ((base == SequenceBase::Head && direction == SequenceDirection::Backward) ||
+        (base == SequenceBase::Tail && direction == SequenceDirection::Forward))
+        throw Exception(fmt::format(
+            "Invalid argument combination of '{}' with '{}'", param_base, param_dir), ErrorCodes::BAD_ARGUMENTS);
+
+    if (argument_types.size() < min_required_args)
+        throw Exception("Aggregate function " + name + " requires at least " + toString(min_required_args) + " arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    bool is_base_match_type = base == SequenceBase::FirstMatch || base == SequenceBase::LastMatch;
+    if (is_base_match_type && argument_types.size() < min_required_args + 1)
+        throw Exception(
+            "Aggregate function " + name + " requires at least " + toString(min_required_args + 1) + " arguments when base is first_match or last_match.",
+            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (argument_types.size() > max_events_size + min_required_args)
+        throw Exception(fmt::format(
+            "Aggregate function '{}' requires at most {} (timestamp, value_column, ...{} events) arguments.",
+                name, max_events_size + min_required_args, max_events_size), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (const auto * cond_arg = argument_types[2].get(); cond_arg && !isUInt8(cond_arg))
+        throw Exception("Illegal type " + cond_arg->getName() + " of third argument of aggregate function "
+                + name + ", must be UInt8", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    for (const auto i : ext::range(min_required_args, argument_types.size()))
+    {
+        const auto * cond_arg = argument_types[i].get();
+        if (!isUInt8(cond_arg))
+            throw Exception(fmt::format(
+                "Illegal type '{}' of {} argument of aggregate function '{}', must be UInt8", cond_arg->getName(), i + 1, name),
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+    }
+
+    if (WhichDataType(argument_types[1].get()).idx != TypeIndex::String)
+        throw Exception{"Illegal type " + argument_types[1].get()->getName()
+                + " of second argument of aggregate function " + name + ", must be String",
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+    DataTypePtr data_type = makeNullable(argument_types[1]);
+
+    WhichDataType timestamp_type(argument_types[0].get());
+    if (timestamp_type.idx == TypeIndex::UInt8)
+        return createAggregateFunctionSequenceNodeImpl<UInt8>(data_type, argument_types, direction, base);
+    if (timestamp_type.idx == TypeIndex::UInt16)
+        return createAggregateFunctionSequenceNodeImpl<UInt16>(data_type, argument_types, direction, base);
+    if (timestamp_type.idx == TypeIndex::UInt32)
+        return createAggregateFunctionSequenceNodeImpl<UInt32>(data_type, argument_types, direction, base);
+    if (timestamp_type.idx == TypeIndex::UInt64)
+        return createAggregateFunctionSequenceNodeImpl<UInt64>(data_type, argument_types, direction, base);
+    if (timestamp_type.isDate())
+        return createAggregateFunctionSequenceNodeImpl<DataTypeDate::FieldType>(data_type, argument_types, direction, base);
+    if (timestamp_type.isDateTime())
+        return createAggregateFunctionSequenceNodeImpl<DataTypeDateTime::FieldType>(data_type, argument_types, direction, base);
+
+    throw Exception{"Illegal type " + argument_types.front().get()->getName()
+            + " of first argument of aggregate function " + name + ", must be Unsigned Number, Date, DateTime",
+        ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+}
+
+}
+
+void registerAggregateFunctionSequenceNextNode(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties properties = { .returns_default_when_only_null = true, .is_order_dependent = false };
+    factory.registerFunction("sequenceNextNode", { createAggregateFunctionSequenceNode, properties });
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
new file mode 100644
index 00000000000..116e53e95e8
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
@@ -0,0 +1,426 @@
+#pragma once
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnNullable.h>
+
+#include <Common/ArenaAllocator.h>
+#include <Common/assert_cast.h>
+
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionNull.h>
+
+#include <type_traits>
+#include <bitset>
+
+
+namespace DB
+{
+struct Settings;
+
+enum class SequenceDirection
+{
+    Forward,
+    Backward,
+};
+
+enum SequenceBase
+{
+    Head,
+    Tail,
+    FirstMatch,
+    LastMatch,
+};
+
+/// NodeBase used to implement a linked list for storage of SequenceNextNodeImpl
+template <typename Node, size_t MaxEventsSize>
+struct NodeBase
+{
+    UInt64 size; /// size of payload
+
+    DataTypeDateTime::FieldType event_time;
+    std::bitset<MaxEventsSize> events_bitset;
+    bool can_be_base;
+
+    char * data() { return reinterpret_cast<char *>(this) + sizeof(Node); }
+
+    const char * data() const { return reinterpret_cast<const char *>(this) + sizeof(Node); }
+
+    Node * clone(Arena * arena) const
+    {
+        return reinterpret_cast<Node *>(
+            const_cast<char *>(arena->alignedInsert(reinterpret_cast<const char *>(this), sizeof(Node) + size, alignof(Node))));
+    }
+
+    void write(WriteBuffer & buf) const
+    {
+        writeVarUInt(size, buf);
+        buf.write(data(), size);
+
+        writeBinary(event_time, buf);
+        UInt64 ulong_bitset = events_bitset.to_ulong();
+        writeBinary(ulong_bitset, buf);
+        writeBinary(can_be_base, buf);
+    }
+
+    static Node * read(ReadBuffer & buf, Arena * arena)
+    {
+        UInt64 size;
+        readVarUInt(size, buf);
+
+        Node * node = reinterpret_cast<Node *>(arena->alignedAlloc(sizeof(Node) + size, alignof(Node)));
+        node->size = size;
+        buf.read(node->data(), size);
+
+        readBinary(node->event_time, buf);
+        UInt64 ulong_bitset;
+        readBinary(ulong_bitset, buf);
+        node->events_bitset = ulong_bitset;
+        readBinary(node->can_be_base, buf);
+
+        return node;
+    }
+};
+
+/// It stores String, timestamp, bitset of matched events.
+template <size_t MaxEventsSize>
+struct NodeString : public NodeBase<NodeString<MaxEventsSize>, MaxEventsSize>
+{
+    using Node = NodeString<MaxEventsSize>;
+
+    static Node * allocate(const IColumn & column, size_t row_num, Arena * arena)
+    {
+        StringRef string = assert_cast<const ColumnString &>(column).getDataAt(row_num);
+
+        Node * node = reinterpret_cast<Node *>(arena->alignedAlloc(sizeof(Node) + string.size, alignof(Node)));
+        node->size = string.size;
+        memcpy(node->data(), string.data, string.size);
+
+        return node;
+    }
+
+    void insertInto(IColumn & column)
+    {
+        assert_cast<ColumnString &>(column).insertData(this->data(), this->size);
+    }
+
+    bool compare(const Node * rhs) const
+    {
+        auto cmp = strncmp(this->data(), rhs->data(), std::min(this->size, rhs->size));
+        return (cmp == 0) ? this->size < rhs->size : cmp < 0;
+    }
+};
+
+/// TODO : Support other types than string
+template <typename Node>
+struct SequenceNextNodeGeneralData
+{
+    using Allocator = MixedAlignedArenaAllocator<alignof(Node *), 4096>;
+    using Array = PODArray<Node *, 32, Allocator>;
+
+    Array value;
+    bool sorted = false;
+
+    struct Comparator final
+    {
+        bool operator()(const Node * lhs, const Node * rhs) const
+        {
+            return lhs->event_time == rhs->event_time ? lhs->compare(rhs) : lhs->event_time < rhs->event_time;
+        }
+    };
+
+    void sort()
+    {
+        if (!sorted)
+        {
+            std::stable_sort(std::begin(value), std::end(value), Comparator{});
+            sorted = true;
+        }
+    }
+};
+
+/// Implementation of sequenceFirstNode
+template <typename T, typename Node>
+class SequenceNextNodeImpl final
+    : public IAggregateFunctionDataHelper<SequenceNextNodeGeneralData<Node>, SequenceNextNodeImpl<T, Node>>
+{
+    using Self = SequenceNextNodeImpl<T, Node>;
+
+    using Data = SequenceNextNodeGeneralData<Node>;
+    static Data & data(AggregateDataPtr place) { return *reinterpret_cast<Data *>(place); }
+    static const Data & data(ConstAggregateDataPtr place) { return *reinterpret_cast<const Data *>(place); }
+
+    static constexpr size_t base_cond_column_idx = 2;
+    static constexpr size_t event_column_idx = 1;
+
+    SequenceBase seq_base_kind;
+    SequenceDirection seq_direction;
+    const size_t min_required_args;
+
+    DataTypePtr & data_type;
+    UInt8 events_size;
+    UInt64 max_elems;
+public:
+    SequenceNextNodeImpl(
+        const DataTypePtr & data_type_,
+        const DataTypes & arguments,
+        SequenceBase seq_base_kind_,
+        SequenceDirection seq_direction_,
+        size_t min_required_args_,
+        UInt64 max_elems_ = std::numeric_limits<UInt64>::max())
+        : IAggregateFunctionDataHelper<SequenceNextNodeGeneralData<Node>, Self>({data_type_}, {})
+        , seq_base_kind(seq_base_kind_)
+        , seq_direction(seq_direction_)
+        , min_required_args(min_required_args_)
+        , data_type(this->argument_types[0])
+        , events_size(arguments.size() - min_required_args)
+        , max_elems(max_elems_)
+    {
+    }
+
+    String getName() const override { return "sequenceNextNode"; }
+
+    DataTypePtr getReturnType() const override { return data_type; }
+
+    AggregateFunctionPtr getOwnNullAdapter(
+        const AggregateFunctionPtr & nested_function, const DataTypes & arguments, const Array & params,
+        const AggregateFunctionProperties &) const override
+    {
+        /// Even though some values are mapped to aggregating key, it could return nulls for the below case.
+        ///   aggregated events: [A -> B -> C]
+        ///   events to find: [C -> D]
+        ///   [C -> D] is not matched to 'A -> B -> C' so that it returns null.
+        return std::make_shared<AggregateFunctionNullVariadic<false, false, true>>(nested_function, arguments, params);
+    }
+
+    void insert(Data & a, const Node * v, Arena * arena) const
+    {
+        ++a.total_values;
+        a.value.push_back(v->clone(arena), arena);
+    }
+
+    void create(AggregateDataPtr place) const override
+    {
+        new (place) Data;
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        Node * node = Node::allocate(*columns[event_column_idx], row_num, arena);
+
+        const auto timestamp = assert_cast<const ColumnVector<T> *>(columns[0])->getData()[row_num];
+
+        /// The events_bitset variable stores matched events in the form of bitset.
+        /// Each Nth-bit indicates that the Nth-event are matched.
+        /// For example, event1 and event3 is matched then the values of events_bitset is 0x00000005.
+        ///   0x00000000
+        /// +          1 (bit of event1)
+        /// +          4 (bit of event3)
+        node->events_bitset.reset();
+        for (UInt8 i = 0; i < events_size; ++i)
+            if (assert_cast<const ColumnVector<UInt8> *>(columns[min_required_args + i])->getData()[row_num])
+                node->events_bitset.set(i);
+        node->event_time = timestamp;
+
+        node->can_be_base = assert_cast<const ColumnVector<UInt8> *>(columns[base_cond_column_idx])->getData()[row_num];
+
+        data(place).value.push_back(node, arena);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        if (data(rhs).value.empty())
+            return;
+
+        if (data(place).value.size() >= max_elems)
+            return;
+
+        auto & a = data(place).value;
+        auto & b = data(rhs).value;
+        const auto a_size = a.size();
+
+        const UInt64 new_elems = std::min(data(rhs).value.size(), static_cast<size_t>(max_elems) - data(place).value.size());
+        for (UInt64 i = 0; i < new_elems; ++i)
+            a.push_back(b[i]->clone(arena), arena);
+
+        /// Either sort whole container or do so partially merging ranges afterwards
+        using Comparator = typename SequenceNextNodeGeneralData<Node>::Comparator;
+
+        if (!data(place).sorted && !data(rhs).sorted)
+            std::stable_sort(std::begin(a), std::end(a), Comparator{});
+        else
+        {
+            const auto begin = std::begin(a);
+            const auto middle = std::next(begin, a_size);
+            const auto end = std::end(a);
+
+            if (!data(place).sorted)
+                std::stable_sort(begin, middle, Comparator{});
+
+            if (!data(rhs).sorted)
+                std::stable_sort(middle, end, Comparator{});
+
+            std::inplace_merge(begin, middle, end, Comparator{});
+        }
+
+        data(place).sorted = true;
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
+    {
+        /// Temporarily do a const_cast to sort the values. It helps to reduce the computational burden on the initiator node.
+        this->data(const_cast<AggregateDataPtr>(place)).sort();
+
+        writeBinary(data(place).sorted, buf);
+
+        auto & value = data(place).value;
+
+        size_t size = std::min(static_cast<size_t>(events_size + 1), value.size());
+        switch (seq_base_kind)
+        {
+            case SequenceBase::Head:
+                writeVarUInt(size, buf);
+                for (size_t i = 0; i < size; ++i)
+                    value[i]->write(buf);
+                break;
+
+            case SequenceBase::Tail:
+                writeVarUInt(size, buf);
+                for (size_t i = 0; i < size; ++i)
+                    value[value.size() - size + i]->write(buf);
+                break;
+
+            case SequenceBase::FirstMatch:
+            case SequenceBase::LastMatch:
+                writeVarUInt(value.size(), buf);
+                for (auto & node : value)
+                    node->write(buf);
+                break;
+        }
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena * arena) const override
+    {
+        readBinary(data(place).sorted, buf);
+
+        UInt64 size;
+        readVarUInt(size, buf);
+
+        if (unlikely(size == 0))
+            return;
+
+        auto & value = data(place).value;
+
+        value.resize(size, arena);
+        for (UInt64 i = 0; i < size; ++i)
+            value[i] = Node::read(buf, arena);
+    }
+
+    inline std::optional<size_t> getBaseIndex(Data & data) const
+    {
+        if (data.value.size() == 0)
+            return {};
+
+        switch (seq_base_kind)
+        {
+            case SequenceBase::Head:
+                if (data.value[0]->can_be_base)
+                    return 0;
+                break;
+
+            case SequenceBase::Tail:
+                if (data.value[data.value.size() - 1]->can_be_base)
+                    return data.value.size() - 1;
+                break;
+
+            case SequenceBase::FirstMatch:
+                for (size_t i = 0; i < data.value.size(); ++i)
+                {
+                    if (data.value[i]->events_bitset.test(0) && data.value[i]->can_be_base)
+                        return i;
+                }
+                break;
+
+            case SequenceBase::LastMatch:
+                for (size_t i = 0; i < data.value.size(); ++i)
+                {
+                    auto reversed_i = data.value.size() - i - 1;
+                    if (data.value[reversed_i]->events_bitset.test(0) && data.value[reversed_i]->can_be_base)
+                        return reversed_i;
+                }
+                break;
+        }
+
+        return {};
+    }
+
+    /// This method returns an index of next node that matched the events.
+    /// matched events in the chain of events are represented as a bitmask.
+    /// The first matched event is 0x00000001, the second one is 0x00000002, the third one is 0x00000004, and so on.
+    UInt32 getNextNodeIndex(Data & data) const
+    {
+        const UInt32 unmatched_idx = data.value.size();
+
+        if (data.value.size() <= events_size)
+            return unmatched_idx;
+
+        data.sort();
+
+        std::optional<size_t> base_opt = getBaseIndex(data);
+        if (!base_opt.has_value())
+            return unmatched_idx;
+        UInt32 base = static_cast<UInt32>(base_opt.value());
+
+        if (events_size == 0)
+            return data.value.size() > 0 ? base : unmatched_idx;
+
+        UInt32 i = 0;
+        switch (seq_direction)
+        {
+            case SequenceDirection::Forward:
+                for (i = 0; i < events_size && base + i < data.value.size(); ++i)
+                    if (!data.value[base + i]->events_bitset.test(i))
+                        break;
+                return (i == events_size) ? base + i : unmatched_idx;
+
+            case SequenceDirection::Backward:
+                for (i = 0; i < events_size && i < base; ++i)
+                    if (!data.value[base - i]->events_bitset.test(i))
+                        break;
+                return (i == events_size) ? base - i : unmatched_idx;
+        }
+        __builtin_unreachable();
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        auto & value = data(place).value;
+
+        UInt32 event_idx = getNextNodeIndex(this->data(place));
+        if (event_idx < value.size())
+        {
+            ColumnNullable & to_concrete = assert_cast<ColumnNullable &>(to);
+            value[event_idx]->insertInto(to_concrete.getNestedColumn());
+            to_concrete.getNullMapData().push_back(0);
+        }
+        else
+        {
+            to.insertDefault();
+        }
+    }
+
+    bool allocatesMemoryInArena() const override { return true; }
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
index 44631d5832a..697112dc443 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
@@ -4,10 +4,12 @@
 #include <AggregateFunctions/FactoryHelpers.h>
 
 #include <Core/TypeListNumber.h>
-#include "registerAggregateFunctions.h"
+
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -19,8 +21,8 @@ namespace
 AggregateFunctionPtr createAggregateFunctionSimpleLinearRegression(
     const String & name,
     const DataTypes & arguments,
-    const Array & params
-)
+    const Array & params,
+    const Settings *)
 {
     assertNoParameters(name, params);
     assertBinary(name, arguments);
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h
index 8c029855a26..e557ffe5d34 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h
+++ b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.h
@@ -13,6 +13,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -168,6 +169,8 @@ public:
         );
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void insertResultInto(
         AggregateDataPtr place,
         IColumn & to,
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleState.cpp b/src/AggregateFunctions/AggregateFunctionSimpleState.cpp
index 8a5a71d6806..686571f2f83 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleState.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSimpleState.cpp
@@ -3,6 +3,7 @@
 
 namespace DB
 {
+struct Settings;
 namespace
 {
     class AggregateFunctionCombinatorSimpleState final : public IAggregateFunctionCombinator
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleState.h b/src/AggregateFunctions/AggregateFunctionSimpleState.h
index 612f4ae76c1..9d34113b028 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleState.h
+++ b/src/AggregateFunctions/AggregateFunctionSimpleState.h
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 /** Not an aggregate function, but an adapter of aggregate functions.
   * Aggregate functions with the `SimpleState` suffix is almost identical to the corresponding ones,
diff --git a/src/AggregateFunctions/AggregateFunctionState.cpp b/src/AggregateFunctions/AggregateFunctionState.cpp
index 348d8ba44dd..abbe286f7ad 100644
--- a/src/AggregateFunctions/AggregateFunctionState.cpp
+++ b/src/AggregateFunctions/AggregateFunctionState.cpp
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/AggregateFunctionState.h b/src/AggregateFunctions/AggregateFunctionState.h
index e1a2c542fe8..b33bb64c6dd 100644
--- a/src/AggregateFunctions/AggregateFunctionState.h
+++ b/src/AggregateFunctions/AggregateFunctionState.h
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+struct Settings;
 
 
 /** Not an aggregate function, but an adapter of aggregate functions,
diff --git a/src/AggregateFunctions/AggregateFunctionStatistics.cpp b/src/AggregateFunctions/AggregateFunctionStatistics.cpp
index 9e3aa0962db..0b4088a281f 100644
--- a/src/AggregateFunctions/AggregateFunctionStatistics.cpp
+++ b/src/AggregateFunctions/AggregateFunctionStatistics.cpp
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -17,7 +18,7 @@ namespace
 {
 
 template <template <typename> class FunctionTemplate>
-AggregateFunctionPtr createAggregateFunctionStatisticsUnary(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionStatisticsUnary(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertUnary(name, argument_types);
@@ -31,12 +32,12 @@ AggregateFunctionPtr createAggregateFunctionStatisticsUnary(const std::string &
 }
 
 template <template <typename, typename> class FunctionTemplate>
-AggregateFunctionPtr createAggregateFunctionStatisticsBinary(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionStatisticsBinary(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertBinary(name, argument_types);
 
-    AggregateFunctionPtr res(createWithTwoNumericTypes<FunctionTemplate>(*argument_types[0], *argument_types[1], argument_types));
+    AggregateFunctionPtr res(createWithTwoBasicNumericTypes<FunctionTemplate>(*argument_types[0], *argument_types[1], argument_types));
     if (!res)
         throw Exception("Illegal types " + argument_types[0]->getName() + " and " + argument_types[1]->getName()
             + " of arguments for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
diff --git a/src/AggregateFunctions/AggregateFunctionStatistics.h b/src/AggregateFunctions/AggregateFunctionStatistics.h
index 76b6e843c15..97ea9ad8917 100644
--- a/src/AggregateFunctions/AggregateFunctionStatistics.h
+++ b/src/AggregateFunctions/AggregateFunctionStatistics.h
@@ -12,8 +12,9 @@
 
 namespace DB
 {
+struct Settings;
 
-namespace
+namespace detail
 {
 
 /// This function returns true if both values are large and comparable.
@@ -72,7 +73,7 @@ public:
         Float64 factor = static_cast<Float64>(count * source.count) / total_count;
         Float64 delta = mean - source.mean;
 
-        if (areComparable(count, source.count))
+        if (detail::areComparable(count, source.count))
             mean = (source.count * source.mean + count * mean) / total_count;
         else
             mean = source.mean + delta * (static_cast<Float64>(count) / total_count);
@@ -123,6 +124,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).update(*columns[0], row_num);
@@ -300,7 +303,7 @@ public:
         Float64 left_delta = left_mean - source.left_mean;
         Float64 right_delta = right_mean - source.right_mean;
 
-        if (areComparable(count, source.count))
+        if (detail::areComparable(count, source.count))
         {
             left_mean = (source.count * source.left_mean + count * left_mean) / total_count;
             right_mean = (source.count * source.right_mean + count * right_mean) / total_count;
@@ -375,6 +378,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).update(*columns[0], *columns[1], row_num);
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.cpp b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.cpp
index c7c2f9025ed..dc040921f53 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.cpp
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.cpp
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -17,7 +18,7 @@ namespace
 {
 
 template <template <typename> class FunctionTemplate>
-AggregateFunctionPtr createAggregateFunctionStatisticsUnary(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionStatisticsUnary(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertUnary(name, argument_types);
@@ -36,12 +37,12 @@ AggregateFunctionPtr createAggregateFunctionStatisticsUnary(const std::string &
 }
 
 template <template <typename, typename> class FunctionTemplate>
-AggregateFunctionPtr createAggregateFunctionStatisticsBinary(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionStatisticsBinary(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertBinary(name, argument_types);
 
-    AggregateFunctionPtr res(createWithTwoNumericTypes<FunctionTemplate>(*argument_types[0], *argument_types[1], argument_types));
+    AggregateFunctionPtr res(createWithTwoBasicNumericTypes<FunctionTemplate>(*argument_types[0], *argument_types[1], argument_types));
     if (!res)
         throw Exception("Illegal types " + argument_types[0]->getName() + " and " + argument_types[1]->getName()
             + " of arguments for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index 9903e2f6eaa..e57781fac33 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -30,6 +30,7 @@
 
 namespace DB
 {
+struct Settings;
 
 enum class StatisticsFunctionKind
 {
@@ -121,6 +122,8 @@ public:
         return std::make_shared<DataTypeNumber<ResultType>>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         if constexpr (StatFunc::num_args == 2)
@@ -129,11 +132,10 @@ public:
                 static_cast<ResultType>(static_cast<const ColVecT2 &>(*columns[1]).getData()[row_num]));
         else
         {
-            if constexpr (std::is_same_v<T1, Decimal256>)
+            if constexpr (IsDecimalNumber<T1>)
             {
                 this->data(place).add(static_cast<ResultType>(
-                    static_cast<const ColVecT1 &>(*columns[0]).getData()[row_num].value
-                ));
+                    static_cast<const ColVecT1 &>(*columns[0]).getData()[row_num].value));
             }
             else
                 this->data(place).add(
diff --git a/src/AggregateFunctions/AggregateFunctionStudentTTest.cpp b/src/AggregateFunctions/AggregateFunctionStudentTTest.cpp
index be08ae86095..18a5ef0c705 100644
--- a/src/AggregateFunctions/AggregateFunctionStudentTTest.cpp
+++ b/src/AggregateFunctions/AggregateFunctionStudentTTest.cpp
@@ -14,6 +14,7 @@ namespace ErrorCodes
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
@@ -56,7 +57,7 @@ struct StudentTTestData : public TTestMoments<Float64>
     }
 };
 
-AggregateFunctionPtr createAggregateFunctionStudentTTest(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionStudentTTest(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertBinary(name, argument_types);
     assertNoParameters(name, parameters);
diff --git a/src/AggregateFunctions/AggregateFunctionSum.cpp b/src/AggregateFunctions/AggregateFunctionSum.cpp
index 6afae98ef2d..c059fff516c 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSum.cpp
@@ -7,6 +7,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -50,7 +52,7 @@ template <typename T> using AggregateFunctionSumKahan =
 
 
 template <template <typename> class Function>
-AggregateFunctionPtr createAggregateFunctionSum(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionSum(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertUnary(name, argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index bd1f9fc302e..7261e56c044 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -15,6 +15,7 @@
 
 namespace DB
 {
+struct Settings;
 
 /// Uses addOverflow method (if available) to avoid UB for sumWithOverflow()
 ///
@@ -314,6 +315,8 @@ public:
             return std::make_shared<ResultDataType>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         const auto & column = assert_cast<const ColVecType &>(*columns[0]);
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.cpp b/src/AggregateFunctions/AggregateFunctionSumCount.cpp
new file mode 100644
index 00000000000..b2ad1810b75
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.cpp
@@ -0,0 +1,53 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSumCount.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include "registerAggregateFunctions.h"
+
+namespace DB
+{
+
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+bool allowType(const DataTypePtr& type) noexcept
+{
+    const WhichDataType t(type);
+    return t.isInt() || t.isUInt() || t.isFloat() || t.isDecimal();
+}
+
+AggregateFunctionPtr
+createAggregateFunctionSumCount(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    assertUnary(name, argument_types);
+
+    AggregateFunctionPtr res;
+    DataTypePtr data_type = argument_types[0];
+    if (!allowType(data_type))
+        throw Exception("Illegal type " + data_type->getName() + " of argument for aggregate function " + name,
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    if (isDecimal(data_type))
+        res.reset(createWithDecimalType<AggregateFunctionSumCount>(
+            *data_type, argument_types, getDecimalScale(*data_type)));
+    else
+        res.reset(createWithNumericType<AggregateFunctionSumCount>(*data_type, argument_types));
+
+    return res;
+}
+
+}
+
+void registerAggregateFunctionSumCount(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("sumCount", createAggregateFunctionSumCount);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.h b/src/AggregateFunctions/AggregateFunctionSumCount.h
new file mode 100644
index 00000000000..1026b6272ba
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <type_traits>
+#include <DataTypes/DataTypeTuple.h>
+#include <AggregateFunctions/AggregateFunctionAvg.h>
+
+
+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:
+    using Base = AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionSumCount<T>>;
+
+    AggregateFunctionSumCount(const DataTypes & argument_types_, UInt32 num_scale_ = 0)
+         : Base(argument_types_, num_scale_), scale(num_scale_) {}
+
+    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);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const final
+    {
+        assert_cast<DecimalOrVectorCol<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(
+            this->data(place).denominator);
+    }
+
+    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).denominator;
+    }
+
+    String getName() const final { return "sumCount"; }
+
+private:
+    UInt32 scale;
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.cpp b/src/AggregateFunctions/AggregateFunctionSumMap.cpp
index 2d4e6dfaf32..cc2f432af73 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.cpp
@@ -9,6 +9,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
@@ -75,7 +77,7 @@ auto parseArguments(const std::string & name, const DataTypes & arguments)
 // function template that allows to choose the aggregate function variant that
 // accepts either normal arguments or tuple argument.
 template<template <bool tuple_argument> typename MappedFunction>
-AggregateFunctionPtr createAggregateFunctionMap(const std::string & name, const DataTypes & arguments, const Array & params)
+AggregateFunctionPtr createAggregateFunctionMap(const std::string & name, const DataTypes & arguments, const Array & params, const Settings *)
 {
     auto [keys_type, values_types, tuple_argument] = parseArguments(name, arguments);
 
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.h b/src/AggregateFunctions/AggregateFunctionSumMap.h
index d8b19bad62f..ec2f24d12cb 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.h
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.h
@@ -21,6 +21,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -140,6 +141,8 @@ public:
         return std::make_shared<DataTypeTuple>(types);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     static const auto & getArgumentColumns(const IColumn**& columns)
     {
         if constexpr (tuple_argument)
diff --git a/src/AggregateFunctions/AggregateFunctionTTest.h b/src/AggregateFunctions/AggregateFunctionTTest.h
index 3c9873ebd1e..001de95c547 100644
--- a/src/AggregateFunctions/AggregateFunctionTTest.h
+++ b/src/AggregateFunctions/AggregateFunctionTTest.h
@@ -23,6 +23,7 @@ extern "C"
 
 namespace DB
 {
+struct Settings;
 
 class ReadBuffer;
 class WriteBuffer;
@@ -109,6 +110,8 @@ public:
         );
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         Float64 value = columns[0]->getFloat64(row_num);
diff --git a/src/AggregateFunctions/AggregateFunctionTopK.cpp b/src/AggregateFunctions/AggregateFunctionTopK.cpp
index e32da02f442..ba26247ce31 100644
--- a/src/AggregateFunctions/AggregateFunctionTopK.cpp
+++ b/src/AggregateFunctions/AggregateFunctionTopK.cpp
@@ -2,15 +2,17 @@
 #include <AggregateFunctions/AggregateFunctionTopK.h>
 #include <AggregateFunctions/Helpers.h>
 #include <AggregateFunctions/FactoryHelpers.h>
+#include <Common/FieldVisitors.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include "registerAggregateFunctions.h"
+
 
 #define TOP_K_MAX_SIZE 0xFFFFFF
 
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -57,7 +59,7 @@ static IAggregateFunction * createWithExtraTypes(const DataTypePtr & argument_ty
 
 
 template <bool is_weighted>
-AggregateFunctionPtr createAggregateFunctionTopK(const std::string & name, const DataTypes & argument_types, const Array & params)
+AggregateFunctionPtr createAggregateFunctionTopK(const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
 {
     if (!is_weighted)
     {
diff --git a/src/AggregateFunctions/AggregateFunctionTopK.h b/src/AggregateFunctions/AggregateFunctionTopK.h
index 43320a96b99..30d69b8ca7b 100644
--- a/src/AggregateFunctions/AggregateFunctionTopK.h
+++ b/src/AggregateFunctions/AggregateFunctionTopK.h
@@ -10,7 +10,6 @@
 #include <Columns/ColumnArray.h>
 
 #include <Common/SpaceSaving.h>
-#include <Common/FieldVisitors.h>
 #include <Common/assert_cast.h>
 
 #include <AggregateFunctions/IAggregateFunction.h>
@@ -18,6 +17,7 @@
 
 namespace DB
 {
+struct Settings;
 
 
 template <typename T>
@@ -50,6 +50,8 @@ public:
         return std::make_shared<DataTypeArray>(this->argument_types[0]);
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         auto & set = this->data(place).value;
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.cpp b/src/AggregateFunctions/AggregateFunctionUniq.cpp
index 32fdb188529..135b857cb5c 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.cpp
+++ b/src/AggregateFunctions/AggregateFunctionUniq.cpp
@@ -14,6 +14,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -29,7 +30,7 @@ namespace
   * It differs, for example, in that it uses a trivial hash function, since `uniq` of many arguments first hashes them out itself.
   */
 template <typename Data, typename DataForVariadic>
-AggregateFunctionPtr createAggregateFunctionUniq(const std::string & name, const DataTypes & argument_types, const Array & params)
+AggregateFunctionPtr createAggregateFunctionUniq(const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
 {
     assertNoParameters(name, params);
 
@@ -73,7 +74,7 @@ AggregateFunctionPtr createAggregateFunctionUniq(const std::string & name, const
 }
 
 template <bool is_exact, template <typename> class Data, typename DataForVariadic>
-AggregateFunctionPtr createAggregateFunctionUniq(const std::string & name, const DataTypes & argument_types, const Array & params)
+AggregateFunctionPtr createAggregateFunctionUniq(const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
 {
     assertNoParameters(name, params);
 
@@ -132,6 +133,12 @@ void registerAggregateFunctionsUniq(AggregateFunctionFactory & factory)
 
     factory.registerFunction("uniqExact",
         {createAggregateFunctionUniq<true, AggregateFunctionUniqExactData, AggregateFunctionUniqExactData<String>>, properties});
+
+#if USE_DATASKETCHES
+    factory.registerFunction("uniqTheta",
+        {createAggregateFunctionUniq<AggregateFunctionUniqThetaData, AggregateFunctionUniqThetaData>, properties});
+#endif
+
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index 4e27922ba7c..efbb9758b03 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -22,11 +22,13 @@
 
 #include <AggregateFunctions/UniquesHashSet.h>
 #include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/ThetaSketchData.h>
 #include <AggregateFunctions/UniqVariadicHash.h>
 
 
 namespace DB
 {
+struct Settings;
 
 /// uniq
 
@@ -69,7 +71,7 @@ struct AggregateFunctionUniqHLL12Data<String>
 };
 
 template <>
-struct AggregateFunctionUniqHLL12Data<UInt128>
+struct AggregateFunctionUniqHLL12Data<UUID>
 {
     using Set = HyperLogLogWithSmallSetOptimization<UInt64, 16, 12>;
     Set set;
@@ -124,6 +126,19 @@ struct AggregateFunctionUniqExactData<String>
 };
 
 
+/// uniqTheta
+#if USE_DATASKETCHES
+
+struct AggregateFunctionUniqThetaData
+{
+    using Set = ThetaSketchData<UInt64>;
+    Set set;
+
+    static String getName() { return "uniqTheta"; }
+};
+
+#endif
+
 namespace detail
 {
 
@@ -133,16 +148,14 @@ template <typename T> struct AggregateFunctionUniqTraits
 {
     static UInt64 hash(T x)
     {
-        if constexpr (std::is_same_v<T, UInt128>)
-        {
-            return sipHash64(x);
-        }
-        else if constexpr (std::is_same_v<T, Float32> || std::is_same_v<T, Float64>)
+        if constexpr (std::is_same_v<T, Float32> || std::is_same_v<T, Float64>)
         {
             return ext::bit_cast<UInt64>(x);
         }
         else if constexpr (sizeof(T) <= sizeof(UInt64))
+        {
             return x;
+        }
         else
             return DefaultHash64<T>(x);
     }
@@ -184,11 +197,17 @@ struct OneAdder
                 UInt128 key;
                 SipHash hash;
                 hash.update(value.data, value.size);
-                hash.get128(key.low, key.high);
+                hash.get128(key);
 
                 data.set.insert(key);
             }
         }
+#if USE_DATASKETCHES
+        else if constexpr (std::is_same_v<Data, AggregateFunctionUniqThetaData>)
+        {
+            data.set.insertOriginal(column.getDataAt(row_num));
+        }
+#endif
     }
 };
 
@@ -210,6 +229,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     /// ALWAYS_INLINE is required to have better code layout for uniqHLL12 function
     void ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
@@ -265,6 +286,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).set.insert(typename Data::Set::value_type(
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp b/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
index c0064044f95..205ac015a68 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
@@ -3,14 +3,18 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/Helpers.h>
 
+#include <Common/FieldVisitors.h>
+
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 
 #include <functional>
-#include "registerAggregateFunctions.h"
+
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
@@ -131,8 +135,16 @@ namespace
 void registerAggregateFunctionUniqCombined(AggregateFunctionFactory & factory)
 {
     using namespace std::placeholders;
-    factory.registerFunction("uniqCombined", std::bind(createAggregateFunctionUniqCombined, false, _1, _2, _3)); // NOLINT
-    factory.registerFunction("uniqCombined64", std::bind(createAggregateFunctionUniqCombined, true, _1, _2, _3)); // NOLINT
+    factory.registerFunction("uniqCombined",
+        [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+        {
+            return createAggregateFunctionUniqCombined(false, name, argument_types, parameters);
+        });
+    factory.registerFunction("uniqCombined64",
+        [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+        {
+            return createAggregateFunctionUniqCombined(true, name, argument_types, parameters);
+        });
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
index c9327594670..cb623bcb761 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Common/CombinedCardinalityEstimator.h>
-#include <Common/FieldVisitors.h>
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
@@ -22,6 +21,7 @@
 
 namespace DB
 {
+struct Settings;
 namespace detail
 {
     /** Hash function for uniqCombined/uniqCombined64 (based on Ret).
@@ -141,6 +141,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         if constexpr (!std::is_same_v<T, String>)
@@ -211,6 +213,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).set.insert(typename AggregateFunctionUniqCombinedData<UInt64, K, HashValueType>::Set::value_type(
diff --git a/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp b/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp
index 9befc515de6..4305139b587 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp
+++ b/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp
@@ -1,15 +1,16 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/Helpers.h>
 #include <AggregateFunctions/AggregateFunctionUniqUpTo.h>
+#include <Common/FieldVisitors.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeFixedString.h>
-#include "registerAggregateFunctions.h"
 
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -24,7 +25,7 @@ namespace
 constexpr UInt8 uniq_upto_max_threshold = 100;
 
 
-AggregateFunctionPtr createAggregateFunctionUniqUpTo(const std::string & name, const DataTypes & argument_types, const Array & params)
+AggregateFunctionPtr createAggregateFunctionUniqUpTo(const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
 {
     UInt8 threshold = 5;    /// default value
 
diff --git a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
index d2c765137bc..a1599a0935b 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <Common/FieldVisitors.h>
+#include <common/unaligned.h>
+
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 
@@ -17,13 +18,14 @@
 #include <IO/WriteHelpers.h>
 
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
 
 namespace DB
 {
+struct Settings;
 
 
 /** Counts the number of unique values up to no more than specified in the parameter.
@@ -35,7 +37,7 @@ namespace DB
   */
 
 template <typename T>
-struct __attribute__((__packed__)) AggregateFunctionUniqUpToData
+struct AggregateFunctionUniqUpToData
 {
 /** If count == threshold + 1 - this means that it is "overflowed" (values greater than threshold).
   * In this case (for example, after calling the merge function), the `data` array does not necessarily contain the initialized values
@@ -43,7 +45,17 @@ struct __attribute__((__packed__)) AggregateFunctionUniqUpToData
   *   then set count to `threshold + 1`, and values from another state are not copied.
   */
     UInt8 count = 0;
-    T data[0];
+    char data_ptr[0];
+
+    T load(size_t i) const
+    {
+        return unalignedLoad<T>(data_ptr + i * sizeof(T));
+    }
+
+    void store(size_t i, const T & x)
+    {
+        unalignedStore<T>(data_ptr + i * sizeof(T), x);
+    }
 
     size_t size() const
     {
@@ -60,12 +72,12 @@ struct __attribute__((__packed__)) AggregateFunctionUniqUpToData
 
         /// Linear search for the matching element.
         for (size_t i = 0; i < count; ++i)
-            if (data[i] == x)
+            if (load(i) == x)
                 return;
 
         /// Did not find the matching element. If there is room for one more element, insert it.
         if (count < threshold)
-            data[count] = x;
+            store(count, x);
 
         /// After increasing count, the state may be overflowed.
         ++count;
@@ -84,7 +96,7 @@ struct __attribute__((__packed__)) AggregateFunctionUniqUpToData
         }
 
         for (size_t i = 0; i < rhs.count; ++i)
-            insert(rhs.data[i], threshold);
+            insert(rhs.load(i), threshold);
     }
 
     void write(WriteBuffer & wb, UInt8 threshold) const
@@ -93,7 +105,7 @@ struct __attribute__((__packed__)) AggregateFunctionUniqUpToData
 
         /// Write values only if the state is not overflowed. Otherwise, they are not needed, and only the fact that the state is overflowed is important.
         if (count <= threshold)
-            wb.write(reinterpret_cast<const char *>(data), count * sizeof(data[0]));
+            wb.write(data_ptr, count * sizeof(T));
     }
 
     void read(ReadBuffer & rb, UInt8 threshold)
@@ -101,7 +113,7 @@ struct __attribute__((__packed__)) AggregateFunctionUniqUpToData
         readBinary(count, rb);
 
         if (count <= threshold)
-            rb.read(reinterpret_cast<char *>(data), count * sizeof(data[0]));
+            rb.read(data_ptr, count * sizeof(T));
     }
 
     /// ALWAYS_INLINE is required to have better code layout for uniqUpTo function
@@ -184,6 +196,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     /// ALWAYS_INLINE is required to have better code layout for uniqUpTo function
     void ALWAYS_INLINE add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
@@ -247,6 +261,8 @@ public:
         return std::make_shared<DataTypeUInt64>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
         this->data(place).insert(UInt64(UniqVariadicHash<is_exact, argument_is_tuple>::apply(num_args, columns, row_num)), threshold);
@@ -276,7 +292,7 @@ public:
 
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp b/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp
index bcaaf0b68fd..23605d39ab5 100644
--- a/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp
+++ b/src/AggregateFunctions/AggregateFunctionWelchTTest.cpp
@@ -14,6 +14,7 @@ namespace ErrorCodes
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
@@ -53,7 +54,7 @@ struct WelchTTestData : public TTestMoments<Float64>
     }
 };
 
-AggregateFunctionPtr createAggregateFunctionWelchTTest(const std::string & name, const DataTypes & argument_types, const Array & parameters)
+AggregateFunctionPtr createAggregateFunctionWelchTTest(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertBinary(name, argument_types);
     assertNoParameters(name, parameters);
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
index ed732a197a1..01ea2636434 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
@@ -1,7 +1,8 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/AggregateFunctionWindowFunnel.h>
-#include <AggregateFunctions/Helpers.h>
 #include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/Helpers.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 
@@ -10,6 +11,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -20,7 +23,8 @@ namespace
 {
 
 template <template <typename> class Data>
-AggregateFunctionPtr createAggregateFunctionWindowFunnel(const std::string & name, const DataTypes & arguments, const Array & params)
+AggregateFunctionPtr
+createAggregateFunctionWindowFunnel(const std::string & name, const DataTypes & arguments, const Array & params, const Settings *)
 {
     if (params.empty())
         throw Exception{"Aggregate function " + name + " requires at least one parameter: <window>, [option, [option, ...]]", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
index 9644b8d9ea4..591596461f8 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
@@ -13,6 +13,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -247,6 +248,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     AggregateFunctionPtr getOwnNullAdapter(
         const AggregateFunctionPtr & nested_function, const DataTypes & arguments, const Array & params,
         const AggregateFunctionProperties & /*properties*/) const override
diff --git a/src/AggregateFunctions/CMakeLists.txt b/src/AggregateFunctions/CMakeLists.txt
index c23831be94e..b6dbf2b4eb0 100644
--- a/src/AggregateFunctions/CMakeLists.txt
+++ b/src/AggregateFunctions/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_aggregate_functions .)
 
 list(REMOVE_ITEM clickhouse_aggregate_functions_sources
@@ -24,6 +24,6 @@ list(REMOVE_ITEM clickhouse_aggregate_functions_headers
 add_library(clickhouse_aggregate_functions ${clickhouse_aggregate_functions_sources})
 target_link_libraries(clickhouse_aggregate_functions PRIVATE dbms PUBLIC ${CITYHASH_LIBRARIES})
 
-if(ENABLE_TESTS)
-    add_subdirectory(tests)
+if(ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif()
diff --git a/src/AggregateFunctions/FactoryHelpers.h b/src/AggregateFunctions/FactoryHelpers.h
index aff7ff0ff36..ff06557f441 100644
--- a/src/AggregateFunctions/FactoryHelpers.h
+++ b/src/AggregateFunctions/FactoryHelpers.h
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/Helpers.h b/src/AggregateFunctions/Helpers.h
index 2b21b745a0e..e508bc0312d 100644
--- a/src/AggregateFunctions/Helpers.h
+++ b/src/AggregateFunctions/Helpers.h
@@ -15,12 +15,12 @@
     M(Float32) \
     M(Float64)
 
-// No UInt128 here because of the name conflict
 #define FOR_NUMERIC_TYPES(M) \
     M(UInt8) \
     M(UInt16) \
     M(UInt32) \
     M(UInt64) \
+    M(UInt128) \
     M(UInt256) \
     M(Int8) \
     M(Int16) \
@@ -31,14 +31,9 @@
     M(Float32) \
     M(Float64)
 
-#define FOR_DECIMAL_TYPES(M) \
-    M(Decimal32) \
-    M(Decimal64) \
-    M(Decimal128)
-
-
 namespace DB
 {
+struct Settings;
 
 /** Create an aggregate function with a numeric type in the template parameter, depending on the type of the argument.
   */
@@ -115,6 +110,26 @@ static IAggregateFunction * createWithUnsignedIntegerType(const IDataType & argu
     if (which.idx == TypeIndex::UInt16) return new AggregateFunctionTemplate<UInt16, Data<UInt16>>(std::forward<TArgs>(args)...);
     if (which.idx == TypeIndex::UInt32) return new AggregateFunctionTemplate<UInt32, Data<UInt32>>(std::forward<TArgs>(args)...);
     if (which.idx == TypeIndex::UInt64) return new AggregateFunctionTemplate<UInt64, Data<UInt64>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt128) return new AggregateFunctionTemplate<UInt128, Data<UInt128>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt256) return new AggregateFunctionTemplate<UInt256, Data<UInt256>>(std::forward<TArgs>(args)...);
+    return nullptr;
+}
+
+template <template <typename, typename> class AggregateFunctionTemplate, template <typename> class Data, typename... TArgs>
+static IAggregateFunction * createWithBasicNumberOrDateOrDateTime(const IDataType & argument_type, TArgs &&... args)
+{
+    WhichDataType which(argument_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) \
+        return new AggregateFunctionTemplate<TYPE, Data<TYPE>>(std::forward<TArgs>(args)...);
+    FOR_BASIC_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+    if (which.idx == TypeIndex::Date)
+        return new AggregateFunctionTemplate<UInt16, Data<UInt16>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::DateTime)
+        return new AggregateFunctionTemplate<UInt32, Data<UInt32>>(std::forward<TArgs>(args)...);
+
     return nullptr;
 }
 
@@ -125,11 +140,11 @@ static IAggregateFunction * createWithNumericBasedType(const IDataType & argumen
     if (f)
         return f;
 
-    /// expects that DataTypeDate based on UInt16, DataTypeDateTime based on UInt32 and UUID based on UInt128
+    /// expects that DataTypeDate based on UInt16, DataTypeDateTime based on UInt32
     WhichDataType which(argument_type);
     if (which.idx == TypeIndex::Date) return new AggregateFunctionTemplate<UInt16>(std::forward<TArgs>(args)...);
     if (which.idx == TypeIndex::DateTime) return new AggregateFunctionTemplate<UInt32>(std::forward<TArgs>(args)...);
-    if (which.idx == TypeIndex::UUID) return new AggregateFunctionTemplate<UInt128>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UUID) return new AggregateFunctionTemplate<UUID>(std::forward<TArgs>(args)...);
     return nullptr;
 }
 
@@ -190,6 +205,69 @@ static IAggregateFunction * createWithTwoNumericTypes(const IDataType & first_ty
     return nullptr;
 }
 
+template <typename FirstType, template <typename, typename> class AggregateFunctionTemplate, typename... TArgs>
+static IAggregateFunction * createWithTwoBasicNumericTypesSecond(const IDataType & second_type, TArgs && ... args)
+{
+    WhichDataType which(second_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) return new AggregateFunctionTemplate<FirstType, TYPE>(std::forward<TArgs>(args)...);
+    FOR_BASIC_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+    return nullptr;
+}
+
+template <template <typename, typename> class AggregateFunctionTemplate, typename... TArgs>
+static IAggregateFunction * createWithTwoBasicNumericTypes(const IDataType & first_type, const IDataType & second_type, TArgs && ... args)
+{
+    WhichDataType which(first_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) \
+        return createWithTwoBasicNumericTypesSecond<TYPE, AggregateFunctionTemplate>(second_type, std::forward<TArgs>(args)...);
+    FOR_BASIC_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+    return nullptr;
+}
+
+template <typename FirstType, template <typename, typename> class AggregateFunctionTemplate, typename... TArgs>
+static IAggregateFunction * createWithTwoNumericOrDateTypesSecond(const IDataType & second_type, TArgs && ... args)
+{
+    WhichDataType which(second_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) return new AggregateFunctionTemplate<FirstType, TYPE>(std::forward<TArgs>(args)...);
+    FOR_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+    if (which.idx == TypeIndex::Enum8) return new AggregateFunctionTemplate<FirstType, Int8>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::Enum16) return new AggregateFunctionTemplate<FirstType, Int16>(std::forward<TArgs>(args)...);
+
+    /// expects that DataTypeDate based on UInt16, DataTypeDateTime based on UInt32
+    if (which.idx == TypeIndex::Date) return new AggregateFunctionTemplate<FirstType, UInt16>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::DateTime) return new AggregateFunctionTemplate<FirstType, UInt32>(std::forward<TArgs>(args)...);
+
+    return nullptr;
+}
+
+template <template <typename, typename> class AggregateFunctionTemplate, typename... TArgs>
+static IAggregateFunction * createWithTwoNumericOrDateTypes(const IDataType & first_type, const IDataType & second_type, TArgs && ... args)
+{
+    WhichDataType which(first_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) \
+        return createWithTwoNumericOrDateTypesSecond<TYPE, AggregateFunctionTemplate>(second_type, std::forward<TArgs>(args)...);
+    FOR_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+    if (which.idx == TypeIndex::Enum8)
+        return createWithTwoNumericOrDateTypesSecond<Int8, AggregateFunctionTemplate>(second_type, std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::Enum16)
+        return createWithTwoNumericOrDateTypesSecond<Int16, AggregateFunctionTemplate>(second_type, std::forward<TArgs>(args)...);
+
+    /// expects that DataTypeDate based on UInt16, DataTypeDateTime based on UInt32
+    if (which.idx == TypeIndex::Date)
+        return createWithTwoNumericOrDateTypesSecond<UInt16, AggregateFunctionTemplate>(second_type, std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::DateTime)
+        return createWithTwoNumericOrDateTypesSecond<UInt32, AggregateFunctionTemplate>(second_type, std::forward<TArgs>(args)...);
+    return nullptr;
+}
+
 template <template <typename> class AggregateFunctionTemplate, typename... TArgs>
 static IAggregateFunction * createWithStringType(const IDataType & argument_type, TArgs && ... args)
 {
diff --git a/src/AggregateFunctions/HelpersMinMaxAny.h b/src/AggregateFunctions/HelpersMinMaxAny.h
index e995f52f498..be00ff87ae0 100644
--- a/src/AggregateFunctions/HelpersMinMaxAny.h
+++ b/src/AggregateFunctions/HelpersMinMaxAny.h
@@ -8,18 +8,15 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeTuple.h>
+
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
+struct Settings;
 
 /// min, max, any, anyLast, anyHeavy, etc...
 template <template <typename> class AggregateFunctionTemplate, template <typename> class Data>
-static IAggregateFunction * createAggregateFunctionSingleValue(const String & name, const DataTypes & argument_types, const Array & parameters)
+static IAggregateFunction * createAggregateFunctionSingleValue(const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
     assertUnary(name, argument_types);
@@ -30,7 +27,6 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) return new AggregateFunctionTemplate<Data<SingleValueDataFixed<TYPE>>>(argument_type);
     FOR_NUMERIC_TYPES(DISPATCH)
-    FOR_DECIMAL_TYPES(DISPATCH)
 #undef DISPATCH
 
     if (which.idx == TypeIndex::Date)
@@ -39,6 +35,12 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
         return new AggregateFunctionTemplate<Data<SingleValueDataFixed<DataTypeDateTime::FieldType>>>(argument_type);
     if (which.idx == TypeIndex::DateTime64)
         return new AggregateFunctionTemplate<Data<SingleValueDataFixed<DateTime64>>>(argument_type);
+    if (which.idx == TypeIndex::Decimal32)
+        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal32>>>(argument_type);
+    if (which.idx == TypeIndex::Decimal64)
+        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal64>>>(argument_type);
+    if (which.idx == TypeIndex::Decimal128)
+        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal128>>>(argument_type);
     if (which.idx == TypeIndex::String)
         return new AggregateFunctionTemplate<Data<SingleValueDataString>>(argument_type);
 
@@ -48,77 +50,66 @@ static IAggregateFunction * createAggregateFunctionSingleValue(const String & na
 
 /// argMin, argMax
 template <template <typename> class MinMaxData, typename ResData>
-static IAggregateFunction * createAggregateFunctionArgMinMaxSecond(const DataTypePtr & res_type, const DataTypePtr & val_type, bool is_tuple)
+static IAggregateFunction * createAggregateFunctionArgMinMaxSecond(const DataTypePtr & res_type, const DataTypePtr & val_type)
 {
     WhichDataType which(val_type);
 
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) \
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<TYPE>>>>(res_type, val_type, is_tuple);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<TYPE>>>>(res_type, val_type);
     FOR_NUMERIC_TYPES(DISPATCH)
-    FOR_DECIMAL_TYPES(DISPATCH)
 #undef DISPATCH
 
     if (which.idx == TypeIndex::Date)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDate::FieldType>>>>(res_type, val_type, is_tuple);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDate::FieldType>>>>(res_type, val_type);
     if (which.idx == TypeIndex::DateTime)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(res_type, val_type, is_tuple);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(res_type, val_type);
     if (which.idx == TypeIndex::DateTime64)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DateTime64>>>>(res_type, val_type, is_tuple);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DateTime64>>>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal32)
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal32>>>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal64)
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal64>>>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal128)
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal128>>>>(res_type, val_type);
     if (which.idx == TypeIndex::String)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataString>>>(res_type, val_type, is_tuple);
-
-    return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataGeneric>>>(res_type, val_type, is_tuple);
+        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataString>>>(res_type, val_type);
 
+    return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataGeneric>>>(res_type, val_type);
 }
 
 template <template <typename> class MinMaxData>
-static IAggregateFunction * createAggregateFunctionArgMinMax(const String & name, const DataTypes & argument_types, const Array & parameters)
+static IAggregateFunction * createAggregateFunctionArgMinMax(const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
+    assertBinary(name, argument_types);
 
-    DataTypePtr res_type, val_type;
-    bool is_tuple = false;
-
-    // argMin and argMax could get tuple of two as arguments
-    if (argument_types.size() == 1 && argument_types[0]->getTypeId() == TypeIndex::Tuple)
-    {
-        const auto * tuple_type = assert_cast<const DataTypeTuple *>(argument_types[0].get());
-
-        if (tuple_type->getElements().size() != 2)
-        {
-            throw Exception("Aggregate function " + name + " expects two elements in tuple argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-        }
-
-        res_type = tuple_type->getElements()[0];
-        val_type = tuple_type->getElements()[1];
-        is_tuple = true;
-     }
-     else
-     {
-        assertBinary(name, argument_types);
-        res_type = argument_types[0];
-        val_type = argument_types[1];
-     }
+    const DataTypePtr & res_type = argument_types[0];
+    const DataTypePtr & val_type = argument_types[1];
 
     WhichDataType which(res_type);
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) \
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<TYPE>>(res_type, val_type, is_tuple);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<TYPE>>(res_type, val_type);
     FOR_NUMERIC_TYPES(DISPATCH)
-    FOR_DECIMAL_TYPES(DISPATCH)
 #undef DISPATCH
 
     if (which.idx == TypeIndex::Date)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDate::FieldType>>(res_type, val_type, is_tuple);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDate::FieldType>>(res_type, val_type);
     if (which.idx == TypeIndex::DateTime)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDateTime::FieldType>>(res_type, val_type, is_tuple);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDateTime::FieldType>>(res_type, val_type);
     if (which.idx == TypeIndex::DateTime64)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DateTime64>>(res_type, val_type, is_tuple);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DateTime64>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal32)
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal32>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal64)
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal64>>(res_type, val_type);
+    if (which.idx == TypeIndex::Decimal128)
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal128>>(res_type, val_type);
     if (which.idx == TypeIndex::String)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataString>(res_type, val_type, is_tuple);
+        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataString>(res_type, val_type);
 
-    return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataGeneric>(res_type, val_type, is_tuple);
+    return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataGeneric>(res_type, val_type);
 }
 
 }
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index 168d12fb2b9..2d47a1e7fe0 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -1,21 +1,24 @@
 #pragma once
 
-#include <cstddef>
-#include <memory>
-#include <type_traits>
-#include <vector>
-
-#include <common/types.h>
-#include <Common/Exception.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
 #include <Core/Block.h>
 #include <Core/ColumnNumbers.h>
 #include <Core/Field.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnsNumber.h>
+#include <Interpreters/Context_fwd.h>
+#include <Common/Exception.h>
+#include <common/types.h>
+
+#include <cstddef>
+#include <memory>
+#include <vector>
+#include <type_traits>
 
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
@@ -50,9 +53,7 @@ class IAggregateFunction
 {
 public:
     IAggregateFunction(const DataTypes & argument_types_, const Array & parameters_)
-        : argument_types(argument_types_), parameters(parameters_)
-    {
-    }
+        : argument_types(argument_types_), parameters(parameters_) {}
 
     /// Get main function name.
     virtual String getName() const = 0;
@@ -104,7 +105,7 @@ public:
     virtual void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena * arena) const = 0;
 
     /// Returns true if a function requires Arena to handle own states (see add(), merge(), deserialize()).
-    virtual bool allocatesMemoryInArena() const { return false; }
+    virtual bool allocatesMemoryInArena() const = 0;
 
     /// Inserts results into a column. This method might modify the state (e.g.
     /// sort an array), so must be called once, from single thread. The state
@@ -122,7 +123,7 @@ public:
         const ColumnsWithTypeAndName & /*arguments*/,
         size_t /*offset*/,
         size_t /*limit*/,
-        const Context & /*context*/) const
+        ContextConstPtr /*context*/) const
     {
         throw Exception("Method predictValues is not supported for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
@@ -153,6 +154,13 @@ public:
         Arena * arena,
         ssize_t if_argument_pos = -1) const = 0;
 
+    virtual void mergeBatch(
+        size_t batch_size,
+        AggregateDataPtr * places,
+        size_t place_offset,
+        const AggregateDataPtr * rhs,
+        Arena * arena) const = 0;
+
     /** The same for single place.
       */
     virtual void addBatchSinglePlace(
@@ -178,8 +186,12 @@ public:
       *  "places" contains a large number of same values consecutively.
       */
     virtual void addBatchArray(
-        size_t batch_size, AggregateDataPtr * places, size_t place_offset, const IColumn ** columns, const UInt64 * offsets, Arena * arena)
-        const = 0;
+        size_t batch_size,
+        AggregateDataPtr * places,
+        size_t place_offset,
+        const IColumn ** columns,
+        const UInt64 * offsets,
+        Arena * arena) const = 0;
 
     /** The case when the aggregation key is UInt8
       * and pointers to aggregation states are stored in AggregateDataPtr[256] lookup table.
@@ -200,10 +212,8 @@ public:
      *  arguments and params are for nested_function.
      */
     virtual AggregateFunctionPtr getOwnNullAdapter(
-        const AggregateFunctionPtr & /*nested_function*/,
-        const DataTypes & /*arguments*/,
-        const Array & /*params*/,
-        const AggregateFunctionProperties & /*properties*/) const
+        const AggregateFunctionPtr & /*nested_function*/, const DataTypes & /*arguments*/,
+        const Array & /*params*/, const AggregateFunctionProperties & /*properties*/) const
     {
         return nullptr;
     }
@@ -248,9 +258,7 @@ private:
 
 public:
     IAggregateFunctionHelper(const DataTypes & argument_types_, const Array & parameters_)
-        : IAggregateFunction(argument_types_, parameters_)
-    {
-    }
+        : IAggregateFunction(argument_types_, parameters_) {}
 
     AddFunc getAddressOfAddFunction() const override { return &addFree; }
 
@@ -279,6 +287,18 @@ public:
         }
     }
 
+    void mergeBatch(
+        size_t batch_size,
+        AggregateDataPtr * places,
+        size_t place_offset,
+        const AggregateDataPtr * rhs,
+        Arena * arena) const override
+    {
+        for (size_t i = 0; i < batch_size; ++i)
+            if (places[i])
+                static_cast<const Derived *>(this)->merge(places[i] + place_offset, rhs[i], arena);
+    }
+
     void addBatchSinglePlace(
         size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos = -1) const override
     {
@@ -412,19 +432,32 @@ public:
     static constexpr bool DateTime64Supported = true;
 
     IAggregateFunctionDataHelper(const DataTypes & argument_types_, const Array & parameters_)
-        : IAggregateFunctionHelper<Derived>(argument_types_, parameters_)
+        : IAggregateFunctionHelper<Derived>(argument_types_, parameters_) {}
+
+    void create(AggregateDataPtr place) const override
     {
+        new (place) Data;
     }
 
-    void create(AggregateDataPtr __restrict place) const override { new (place) Data; }
+    void destroy(AggregateDataPtr __restrict place) const noexcept override
+    {
+        data(place).~Data();
+    }
 
-    void destroy(AggregateDataPtr __restrict place) const noexcept override { data(place).~Data(); }
+    bool hasTrivialDestructor() const override
+    {
+        return std::is_trivially_destructible_v<Data>;
+    }
 
-    bool hasTrivialDestructor() const override { return std::is_trivially_destructible_v<Data>; }
+    size_t sizeOfData() const override
+    {
+        return sizeof(Data);
+    }
 
-    size_t sizeOfData() const override { return sizeof(Data); }
-
-    size_t alignOfData() const override { return alignof(Data); }
+    size_t alignOfData() const override
+    {
+        return alignof(Data);
+    }
 
     void addBatchLookupTable8(
         size_t batch_size,
@@ -503,142 +536,6 @@ public:
     }
 };
 
-/// Implements tuple argument unwrapper when the tuple just masks arguments
-template <typename T, typename Derived, size_t args_count>
-class IAggregateFunctionTupleArgHelper : public IAggregateFunctionDataHelper<T, Derived>
-{
-private:
-    using Base = IAggregateFunctionDataHelper<T, Derived>;
-
-    static void addFree(const IAggregateFunction * that, AggregateDataPtr place, const IColumn ** columns_, size_t row_num, Arena * arena)
-    {
-        if (const auto * col = checkAndGetColumn<ColumnTuple>(*columns_[0]))
-        {
-            const IColumn * columns[args_count];
-            const auto & tup_columns = col->getColumns();
-
-            assert(tup_columns.size() == args_count);
-            for (size_t i = 0; i < tup_columns.size(); ++i)
-            {
-                columns[i] = tup_columns[i].get();
-            }
-
-            static_cast<const Derived &>(*that).add(place, columns, row_num, arena);
-        }
-        else
-            static_cast<const Derived &>(*that).add(place, columns_, row_num, arena);
-    }
-
-protected:
-    ssize_t extractColumns(const IColumn ** columns, const IColumn ** aggr_columns, ssize_t if_argument_pos) const
-    {
-        if (tuple_argument)
-        {
-            auto tup_columns = assert_cast<const ColumnTuple *>(aggr_columns[0])->getColumns();
-            for (size_t i = 0; i < args_count; ++i)
-                columns[i] = tup_columns[i].get();
-        }
-        else
-        {
-            for (size_t i = 0; i < args_count; ++i)
-                columns[i] = aggr_columns[i];
-        }
-        if (if_argument_pos >= 0)
-        {
-            columns[args_count] = aggr_columns[if_argument_pos];
-            return args_count;
-        }
-        else
-            return -1;
-    }
-
-    bool tuple_argument;
-
-public:
-    IAggregateFunctionTupleArgHelper(const DataTypes & argument_types_, const Array & parameters_, bool tuple_argument_)
-        : Base(argument_types_, parameters_)
-    {
-        tuple_argument = tuple_argument_;
-    }
-
-    IAggregateFunction::AddFunc getAddressOfAddFunction() const override { return &addFree; }
-
-    /*
-     * We're overriding addBatch* functions just to avoid extracting columns
-     * in 'add' functions
-     */
-    void addBatch(
-        size_t batch_size,
-        AggregateDataPtr * places,
-        size_t place_offset,
-        const IColumn ** columns,
-        Arena * arena,
-        ssize_t if_argument_pos = -1) const override
-    {
-        const IColumn * ex_columns[args_count + (if_argument_pos >= 0)];
-        if_argument_pos = extractColumns(ex_columns, columns, if_argument_pos);
-
-        Base::addBatch(batch_size, places, place_offset, ex_columns, arena, if_argument_pos);
-    }
-
-    void addBatchSinglePlace(
-        size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos = -1) const override
-    {
-        const IColumn * ex_columns[args_count + (if_argument_pos >= 0)];
-        if_argument_pos = extractColumns(ex_columns, columns, if_argument_pos);
-
-        Base::addBatchSinglePlace(batch_size, place, ex_columns, arena, if_argument_pos);
-    }
-
-    void addBatchSinglePlaceNotNull(
-        size_t batch_size,
-        AggregateDataPtr place,
-        const IColumn ** columns,
-        const UInt8 * null_map,
-        Arena * arena,
-        ssize_t if_argument_pos = -1) const override
-    {
-        const IColumn * ex_columns[args_count + (if_argument_pos >= 0)];
-        if_argument_pos = extractColumns(ex_columns, columns, if_argument_pos);
-
-        Base::addBatchSinglePlaceNotNull(batch_size, place, ex_columns, null_map, arena, if_argument_pos);
-    }
-
-    void addBatchSinglePlaceFromInterval(
-        size_t batch_begin, size_t batch_end, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos = -1)
-        const override
-    {
-        const IColumn * ex_columns[args_count + (if_argument_pos >= 0)];
-        if_argument_pos = extractColumns(ex_columns, columns, if_argument_pos);
-
-        Base::addBatchSinglePlaceFromInterval(batch_begin, batch_end, place, ex_columns, arena, if_argument_pos);
-    }
-
-    void addBatchArray(
-        size_t batch_size, AggregateDataPtr * places, size_t place_offset, const IColumn ** columns, const UInt64 * offsets, Arena * arena)
-        const override
-    {
-        const IColumn * ex_columns[args_count];
-        extractColumns(ex_columns, columns, -1);
-
-        Base::addBatchArray(batch_size, places, place_offset, ex_columns, offsets, arena);
-    }
-
-    void addBatchLookupTable8(
-        size_t batch_size,
-        AggregateDataPtr * map,
-        size_t place_offset,
-        std::function<void(AggregateDataPtr &)> init,
-        const UInt8 * key,
-        const IColumn ** columns,
-        Arena * arena) const override
-    {
-        const IColumn * ex_columns[args_count];
-        extractColumns(ex_columns, columns, -1);
-
-        Base::addBatchLookupTable8(batch_size, map, place_offset, init, key, ex_columns, arena);
-    }
-};
 
 /// Properties of aggregate function that are independent of argument types and parameters.
 struct AggregateFunctionProperties
diff --git a/src/AggregateFunctions/IAggregateFunctionCombinator.h b/src/AggregateFunctions/IAggregateFunctionCombinator.h
index c1ab621c158..f9953c83a95 100644
--- a/src/AggregateFunctions/IAggregateFunctionCombinator.h
+++ b/src/AggregateFunctions/IAggregateFunctionCombinator.h
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 /** Aggregate function combinator allows to take one aggregate function
   *  and transform it to another aggregate function.
diff --git a/src/AggregateFunctions/KeyHolderHelpers.h b/src/AggregateFunctions/KeyHolderHelpers.h
index 999e2518f89..812e681e409 100644
--- a/src/AggregateFunctions/KeyHolderHelpers.h
+++ b/src/AggregateFunctions/KeyHolderHelpers.h
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+struct Settings;
 
 template <bool is_plain_column = false>
 static auto getKeyHolder(const IColumn & column, size_t row_num, Arena & arena)
diff --git a/src/AggregateFunctions/Moments.h b/src/AggregateFunctions/Moments.h
index adf242693c1..6f51e76607f 100644
--- a/src/AggregateFunctions/Moments.h
+++ b/src/AggregateFunctions/Moments.h
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/QuantileBFloat16Histogram.h b/src/AggregateFunctions/QuantileBFloat16Histogram.h
new file mode 100644
index 00000000000..559a87a5591
--- /dev/null
+++ b/src/AggregateFunctions/QuantileBFloat16Histogram.h
@@ -0,0 +1,207 @@
+#pragma once
+
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <Common/HashTable/HashMap.h>
+#include <common/types.h>
+#include <ext/bit_cast.h>
+
+
+namespace DB
+{
+
+/** `bfloat16` is a 16-bit floating point data type that is the same as the corresponding most significant 16 bits of the `float`.
+  * https://en.wikipedia.org/wiki/Bfloat16_floating-point_format
+  *
+  * To calculate quantile, simply convert input value to 16 bit (convert to float, then take the most significant 16 bits),
+  * and calculate the histogram of these values.
+  *
+  * Hash table is the preferred way to store histogram, because the number of distinct values is small:
+  * ```
+  * SELECT uniq(bfloat)
+  * FROM
+  * (
+  *     SELECT
+  *         number,
+  *         toFloat32(number) AS f,
+  *         bitShiftRight(bitAnd(reinterpretAsUInt32(reinterpretAsFixedString(f)), 4294901760) AS cut, 16),
+  *         reinterpretAsFloat32(reinterpretAsFixedString(cut)) AS bfloat
+  *     FROM numbers(100000000)
+  * )
+  *
+  * ┌─uniq(bfloat)─┐
+  * │         2623 │
+  * └──────────────┘
+  * ```
+  * (when increasing the range of values 1000 times, the number of distinct bfloat16 values increases just by 1280).
+  *
+  * Then calculate quantile from the histogram.
+  *
+  * This sketch is very simple and rough. Its relative precision is constant 1 / 256 = 0.390625%.
+  */
+template <typename Value>
+struct QuantileBFloat16Histogram
+{
+    using BFloat16 = UInt16;
+    using Weight = UInt64;
+
+    /// Make automatic memory for 16 elements to avoid allocations for small states.
+    /// The usage of trivial hash is ok, because we effectively take logarithm of the values and pathological cases are unlikely.
+    using Data = HashMapWithStackMemory<BFloat16, Weight, TrivialHash, 4>;
+
+    Data data;
+
+    void add(const Value & x)
+    {
+        add(x, 1);
+    }
+
+    void add(const Value & x, Weight w)
+    {
+        if (!isNaN(x))
+            data[toBFloat16(x)] += w;
+    }
+
+    void merge(const QuantileBFloat16Histogram & rhs)
+    {
+        for (const auto & pair : rhs.data)
+            data[pair.getKey()] += pair.getMapped();
+    }
+
+    void serialize(WriteBuffer & buf) const
+    {
+        data.write(buf);
+    }
+
+    void deserialize(ReadBuffer & buf)
+    {
+        data.read(buf);
+    }
+
+    Value get(Float64 level) const
+    {
+        return getImpl<Value>(level);
+    }
+
+    void getMany(const Float64 * levels, const size_t * indices, size_t size, Value * result) const
+    {
+        getManyImpl(levels, indices, size, result);
+    }
+
+    Float64 getFloat(Float64 level) const
+    {
+        return getImpl<Float64>(level);
+    }
+
+    void getManyFloat(const Float64 * levels, const size_t * indices, size_t size, Float64 * result) const
+    {
+        getManyImpl(levels, indices, size, result);
+    }
+
+private:
+    /// Take the most significant 16 bits of the floating point number.
+    BFloat16 toBFloat16(const Value & x) const
+    {
+        return ext::bit_cast<UInt32>(static_cast<Float32>(x)) >> 16;
+    }
+
+    /// Put the bits into most significant 16 bits of the floating point number and fill other bits with zeros.
+    Float32 toFloat32(const BFloat16 & x) const
+    {
+        return ext::bit_cast<Float32>(x << 16);
+    }
+
+    using Pair = PairNoInit<Float32, Weight>;
+
+    template <typename T>
+    T getImpl(Float64 level) const
+    {
+        size_t size = data.size();
+
+        if (0 == size)
+            return std::numeric_limits<T>::quiet_NaN();
+
+        std::unique_ptr<Pair[]> array_holder(new Pair[size]);
+        Pair * array = array_holder.get();
+
+        Float64 sum_weight = 0;
+        Pair * arr_it = array;
+        for (const auto & pair : data)
+        {
+            sum_weight += pair.getMapped();
+            *arr_it = {toFloat32(pair.getKey()), pair.getMapped()};
+            ++arr_it;
+        }
+
+        std::sort(array, array + size, [](const Pair & a, const Pair & b) { return a.first < b.first; });
+
+        Float64 threshold = std::ceil(sum_weight * level);
+        Float64 accumulated = 0;
+
+        for (const Pair * p = array; p != (array + size); ++p)
+        {
+            accumulated += p->second;
+
+            if (accumulated >= threshold)
+                return p->first;
+        }
+
+        return array[size - 1].first;
+    }
+
+    template <typename T>
+    void getManyImpl(const Float64 * levels, const size_t * indices, size_t num_levels, T * result) const
+    {
+        size_t size = data.size();
+
+        if (0 == size)
+        {
+            for (size_t i = 0; i < num_levels; ++i)
+                result[i] = std::numeric_limits<T>::quiet_NaN();
+
+            return;
+        }
+
+        std::unique_ptr<Pair[]> array_holder(new Pair[size]);
+        Pair * array = array_holder.get();
+
+        Float64 sum_weight = 0;
+        Pair * arr_it = array;
+        for (const auto & pair : data)
+        {
+            sum_weight += pair.getMapped();
+            *arr_it = {toFloat32(pair.getKey()), pair.getMapped()};
+            ++arr_it;
+        }
+
+        std::sort(array, array + size, [](const Pair & a, const Pair & b) { return a.first < b.first; });
+
+        size_t level_index = 0;
+        Float64 accumulated = 0;
+        Float64 threshold = std::ceil(sum_weight * levels[indices[level_index]]);
+
+        for (const Pair * p = array; p != (array + size); ++p)
+        {
+            accumulated += p->second;
+
+            while (accumulated >= threshold)
+            {
+                result[indices[level_index]] = p->first;
+                ++level_index;
+
+                if (level_index == num_levels)
+                    return;
+
+                threshold = std::ceil(sum_weight * levels[indices[level_index]]);
+            }
+        }
+
+        while (level_index < num_levels)
+        {
+            result[indices[level_index]] = array[size - 1].first;
+            ++level_index;
+        }
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h
index bc85d5c1c28..1536f0fac6e 100644
--- a/src/AggregateFunctions/QuantileExact.h
+++ b/src/AggregateFunctions/QuantileExact.h
@@ -11,6 +11,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -121,7 +122,7 @@ struct QuantileExact : QuantileExactBase<Value, QuantileExact<Value>>
 
 /// QuantileExactExclusive is equivalent to Excel PERCENTILE.EXC, R-6, SAS-4, SciPy-(0,0)
 template <typename Value>
-/// There is no virtual-like functions. So we don't inherit from QuantileExactBase.
+/// There are no virtual-like functions. So we don't inherit from QuantileExactBase.
 struct QuantileExactExclusive : public QuantileExact<Value>
 {
     using QuantileExact<Value>::array;
@@ -189,7 +190,7 @@ struct QuantileExactExclusive : public QuantileExact<Value>
 
 /// QuantileExactInclusive is equivalent to Excel PERCENTILE and PERCENTILE.INC, R-7, SciPy-(1,1)
 template <typename Value>
-/// There is no virtual-like functions. So we don't inherit from QuantileExactBase.
+/// There are no virtual-like functions. So we don't inherit from QuantileExactBase.
 struct QuantileExactInclusive : public QuantileExact<Value>
 {
     using QuantileExact<Value>::array;
@@ -263,7 +264,7 @@ struct QuantileExactLow : public QuantileExactBase<Value, QuantileExactLow<Value
         {
             // sort inputs in ascending order
             std::sort(array.begin(), array.end());
-            size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+
             // if level is 0.5 then compute the "low" median of the sorted array
             // by the method of rounding.
             if (level == 0.5)
@@ -278,10 +279,14 @@ struct QuantileExactLow : public QuantileExactBase<Value, QuantileExactLow<Value
                     return array[static_cast<size_t>((floor(s / 2)) - 1)];
                 }
             }
-            // else quantile is the nth index of the sorted array obtained by multiplying
-            // level and size of array. Example if level = 0.1 and size of array is 10,
-            // then return array[1].
-            return array[n];
+            else
+            {
+                // else quantile is the nth index of the sorted array obtained by multiplying
+                // level and size of array. Example if level = 0.1 and size of array is 10,
+                // then return array[1].
+                size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+                return array[n];
+            }
         }
         return std::numeric_limits<Value>::quiet_NaN();
     }
@@ -295,7 +300,7 @@ struct QuantileExactLow : public QuantileExactBase<Value, QuantileExactLow<Value
             for (size_t i = 0; i < size; ++i)
             {
                 auto level = levels[indices[i]];
-                size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+
                 // if level is 0.5 then compute the "low" median of the sorted array
                 // by the method of rounding.
                 if (level == 0.5)
@@ -310,9 +315,13 @@ struct QuantileExactLow : public QuantileExactBase<Value, QuantileExactLow<Value
                         result[indices[i]] = array[static_cast<size_t>(floor((s / 2) - 1))];
                     }
                 }
-                // else quantile is the nth index of the sorted array obtained by multiplying
-                // level and size of array. Example if level = 0.1 and size of array is 10.
-                result[indices[i]] = array[n];
+                else
+                {
+                    // else quantile is the nth index of the sorted array obtained by multiplying
+                    // level and size of array. Example if level = 0.1 and size of array is 10.
+                    size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+                    result[indices[i]] = array[n];
+                }
             }
         }
         else
@@ -337,7 +346,7 @@ struct QuantileExactHigh : public QuantileExactBase<Value, QuantileExactHigh<Val
         {
             // sort inputs in ascending order
             std::sort(array.begin(), array.end());
-            size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+
             // if level is 0.5 then compute the "high" median of the sorted array
             // by the method of rounding.
             if (level == 0.5)
@@ -345,9 +354,13 @@ struct QuantileExactHigh : public QuantileExactBase<Value, QuantileExactHigh<Val
                 auto s = array.size();
                 return array[static_cast<size_t>(floor(s / 2))];
             }
-            // else quantile is the nth index of the sorted array obtained by multiplying
-            // level and size of array. Example if level = 0.1 and size of array is 10.
-            return array[n];
+            else
+            {
+                // else quantile is the nth index of the sorted array obtained by multiplying
+                // level and size of array. Example if level = 0.1 and size of array is 10.
+                size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+                return array[n];
+            }
         }
         return std::numeric_limits<Value>::quiet_NaN();
     }
@@ -361,7 +374,7 @@ struct QuantileExactHigh : public QuantileExactBase<Value, QuantileExactHigh<Val
             for (size_t i = 0; i < size; ++i)
             {
                 auto level = levels[indices[i]];
-                size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+
                 // if level is 0.5 then compute the "high" median of the sorted array
                 // by the method of rounding.
                 if (level == 0.5)
@@ -369,9 +382,13 @@ struct QuantileExactHigh : public QuantileExactBase<Value, QuantileExactHigh<Val
                     auto s = array.size();
                     result[indices[i]] = array[static_cast<size_t>(floor(s / 2))];
                 }
-                // else quantile is the nth index of the sorted array obtained by multiplying
-                // level and size of array. Example if level = 0.1 and size of array is 10.
-                result[indices[i]] = array[n];
+                else
+                {
+                    // else quantile is the nth index of the sorted array obtained by multiplying
+                    // level and size of array. Example if level = 0.1 and size of array is 10.
+                    size_t n = level < 1 ? level * array.size() : (array.size() - 1);
+                    result[indices[i]] = array[n];
+                }
             }
         }
         else
diff --git a/src/AggregateFunctions/QuantileExactWeighted.h b/src/AggregateFunctions/QuantileExactWeighted.h
index 86e426d9031..8170c06d0cd 100644
--- a/src/AggregateFunctions/QuantileExactWeighted.h
+++ b/src/AggregateFunctions/QuantileExactWeighted.h
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/QuantileReservoirSampler.h b/src/AggregateFunctions/QuantileReservoirSampler.h
index 6b4af04a5fb..65b1b2d0268 100644
--- a/src/AggregateFunctions/QuantileReservoirSampler.h
+++ b/src/AggregateFunctions/QuantileReservoirSampler.h
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -54,7 +55,7 @@ struct QuantileReservoirSampler
     /// Get the value of the `level` quantile. The level must be between 0 and 1.
     Value get(Float64 level)
     {
-        return data.quantileInterpolated(level);
+        return Value(data.quantileInterpolated(level));
     }
 
     /// Get the `size` values of `levels` quantiles. Write `size` results starting with `result` address.
@@ -62,7 +63,7 @@ struct QuantileReservoirSampler
     void getMany(const Float64 * levels, const size_t * indices, size_t size, Value * result)
     {
         for (size_t i = 0; i < size; ++i)
-            result[indices[i]] = data.quantileInterpolated(levels[indices[i]]);
+            result[indices[i]] = Value(data.quantileInterpolated(levels[indices[i]]));
     }
 
     /// The same, but in the case of an empty state, NaN is returned.
diff --git a/src/AggregateFunctions/QuantileReservoirSamplerDeterministic.h b/src/AggregateFunctions/QuantileReservoirSamplerDeterministic.h
index 303e6518e9c..36dce0bd601 100644
--- a/src/AggregateFunctions/QuantileReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/QuantileReservoirSamplerDeterministic.h
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/QuantileTDigest.h b/src/AggregateFunctions/QuantileTDigest.h
index 490abd5d134..b12673bc507 100644
--- a/src/AggregateFunctions/QuantileTDigest.h
+++ b/src/AggregateFunctions/QuantileTDigest.h
@@ -10,6 +10,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
@@ -132,6 +133,7 @@ class QuantileTDigest
         if (unmerged > params.max_unmerged)
             compress();
     }
+
     void compressBrute()
     {
         if (centroids.size() <= params.max_centroids)
@@ -195,14 +197,12 @@ public:
             BetterFloat l_count = l->count;
             while (r != centroids.end())
             {
-                if (l->mean == r->mean) // Perfect aggregation (fast). We compare l->mean, not l_mean, to avoid identical elements after compress
-                {
-                    l_count += r->count;
-                    l->count = l_count;
-                    ++r;
-                    continue;
-                }
-                // we use quantile which gives us the smallest error
+                /// N.B. Piece of logic which compresses the same singleton centroids into one centroid is removed
+                /// because: 1) singleton centroids are being processed in unusual way in recent version of algorithm
+                /// and such compression would break this logic;
+                /// 2) we shall not compress centroids further than `max_centroids` parameter requires because
+                /// this will lead to uneven compression.
+                /// For more information see: https://arxiv.org/abs/1902.04023
 
                 /// The ratio of the part of the histogram to l, including the half l to the entire histogram. That is, what level quantile in position l.
                 BetterFloat ql = (sum + l_count * 0.5) / count;
@@ -320,16 +320,29 @@ public:
         Float64 prev_x = 0;
         Count sum = 0;
         Value prev_mean = centroids.front().mean;
+        Count prev_count = centroids.front().count;
 
         for (const auto & c : centroids)
         {
             Float64 current_x = sum + c.count * 0.5;
 
             if (current_x >= x)
-                return interpolate(x, prev_x, prev_mean, current_x, c.mean);
+            {
+                /// Special handling of singletons.
+                Float64 left = prev_x + 0.5 * (prev_count == 1);
+                Float64 right = current_x - 0.5 * (c.count == 1);
+
+                if (x <= left)
+                    return prev_mean;
+                else if (x >= right)
+                    return c.mean;
+                else
+                    return interpolate(x, left, prev_mean, right, c.mean);
+            }
 
             sum += c.count;
             prev_mean = c.mean;
+            prev_count = c.count;
             prev_x = current_x;
         }
 
@@ -364,25 +377,40 @@ public:
         Float64 prev_x = 0;
         Count sum = 0;
         Value prev_mean = centroids.front().mean;
+        Count prev_count = centroids.front().count;
 
         size_t result_num = 0;
         for (const auto & c : centroids)
         {
             Float64 current_x = sum + c.count * 0.5;
 
-            while (current_x >= x)
+            if (current_x >= x)
             {
-                result[levels_permutation[result_num]] = interpolate(x, prev_x, prev_mean, current_x, c.mean);
+                /// Special handling of singletons.
+                Float64 left = prev_x + 0.5 * (prev_count == 1);
+                Float64 right = current_x - 0.5 * (c.count == 1);
 
-                ++result_num;
-                if (result_num >= size)
-                    return;
+                while (current_x >= x)
+                {
 
-                x = levels[levels_permutation[result_num]] * count;
+                    if (x <= left)
+                        result[levels_permutation[result_num]] = prev_mean;
+                    else if (x >= right)
+                        result[levels_permutation[result_num]] = c.mean;
+                    else
+                        result[levels_permutation[result_num]] = interpolate(x, left, prev_mean, right, c.mean);
+
+                    ++result_num;
+                    if (result_num >= size)
+                        return;
+
+                    x = levels[levels_permutation[result_num]] * count;
+                }
             }
 
             sum += c.count;
             prev_mean = c.mean;
+            prev_count = c.count;
             prev_x = current_x;
         }
 
diff --git a/src/AggregateFunctions/QuantileTiming.h b/src/AggregateFunctions/QuantileTiming.h
index dd6d923a5a0..7a88e320b89 100644
--- a/src/AggregateFunctions/QuantileTiming.h
+++ b/src/AggregateFunctions/QuantileTiming.h
@@ -11,6 +11,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/QuantilesCommon.h b/src/AggregateFunctions/QuantilesCommon.h
index fc4d5f82262..ab21a4c2efd 100644
--- a/src/AggregateFunctions/QuantilesCommon.h
+++ b/src/AggregateFunctions/QuantilesCommon.h
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/ReservoirSampler.h b/src/AggregateFunctions/ReservoirSampler.h
index a321ef08648..6c131928cb7 100644
--- a/src/AggregateFunctions/ReservoirSampler.h
+++ b/src/AggregateFunctions/ReservoirSampler.h
@@ -17,6 +17,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
@@ -131,12 +133,20 @@ public:
         size_t left_index = static_cast<size_t>(index);
         size_t right_index = left_index + 1;
         if (right_index == samples.size())
-            return static_cast<double>(samples[left_index]);
+        {
+            if constexpr (DB::IsDecimalNumber<T>)
+                return static_cast<double>(samples[left_index].value);
+            else
+                return static_cast<double>(samples[left_index]);
+        }
 
         double left_coef = right_index - index;
         double right_coef = index - left_index;
 
-        return static_cast<double>(samples[left_index]) * left_coef + static_cast<double>(samples[right_index]) * right_coef;
+        if constexpr (DB::IsDecimalNumber<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;
     }
 
     void merge(const ReservoirSampler<T, OnEmpty> & b)
diff --git a/src/AggregateFunctions/ReservoirSamplerDeterministic.h b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index 5cf97ae0f85..468a5c7c6a0 100644
--- a/src/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -16,6 +16,8 @@
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
@@ -30,6 +32,8 @@ namespace ErrorCodes
 
 namespace DB
 {
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int MEMORY_LIMIT_EXCEEDED;
@@ -163,7 +167,7 @@ public:
         sorted = false;
     }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
@@ -191,7 +195,7 @@ public:
         }
     }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/AggregateFunctions/StatCommon.h b/src/AggregateFunctions/StatCommon.h
index ba887567ad8..a8fc7c53072 100644
--- a/src/AggregateFunctions/StatCommon.h
+++ b/src/AggregateFunctions/StatCommon.h
@@ -10,6 +10,12 @@
 
 namespace DB
 {
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
 
 template <typename F>
 static Float64 integrateSimpson(Float64 a, Float64 b, F && func)
@@ -48,6 +54,11 @@ std::pair<RanksArray, Float64> computeRanksAndTieCorrection(const Values & value
             ++right;
         auto adjusted = (left + right + 1.) / 2.;
         auto count_equal = right - left;
+
+        /// Scipy implementation throws exception in this case too.
+        if (count_equal == size)
+            throw Exception("All numbers in both samples are identical", ErrorCodes::BAD_ARGUMENTS);
+
         tie_numenator += std::pow(count_equal, 3) - count_equal;
         for (size_t iter = left; iter < right; ++iter)
             out[indexes[iter]] = adjusted;
diff --git a/src/AggregateFunctions/ThetaSketchData.h b/src/AggregateFunctions/ThetaSketchData.h
new file mode 100644
index 00000000000..b2e32db6c75
--- /dev/null
+++ b/src/AggregateFunctions/ThetaSketchData.h
@@ -0,0 +1,119 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config.h>
+#endif
+
+#if USE_DATASKETCHES
+
+#include <boost/noncopyable.hpp>
+#include <memory>
+#include <theta_sketch.hpp> // Y_IGNORE
+#include <theta_union.hpp> // Y_IGNORE
+
+
+namespace DB
+{
+
+
+template <typename Key>
+class ThetaSketchData : private boost::noncopyable
+{
+private:
+    std::unique_ptr<datasketches::update_theta_sketch> sk_update;
+    std::unique_ptr<datasketches::theta_union> sk_union;
+
+    inline datasketches::update_theta_sketch * getSkUpdate()
+    {
+        if (!sk_update)
+            sk_update = std::make_unique<datasketches::update_theta_sketch>(datasketches::update_theta_sketch::builder().build());
+        return sk_update.get();
+    }
+
+    inline datasketches::theta_union * getSkUnion()
+    {
+        if (!sk_union)
+            sk_union = std::make_unique<datasketches::theta_union>(datasketches::theta_union::builder().build());
+        return sk_union.get();
+    }
+
+public:
+    using value_type = Key;
+
+    ThetaSketchData() = default;
+    ~ThetaSketchData() = default;
+
+    /// Insert original value without hash, as `datasketches::update_theta_sketch.update` will do the hash internal.
+    void insertOriginal(const StringRef & value)
+    {
+        getSkUpdate()->update(value.data, value.size);
+    }
+
+    /// Note that `datasketches::update_theta_sketch.update` will do the hash again.
+    void insert(Key value)
+    {
+        getSkUpdate()->update(value);
+    }
+
+    UInt64 size() const
+    {
+        if (sk_union)
+            return static_cast<UInt64>(sk_union->get_result().get_estimate());
+        else if (sk_update)
+            return static_cast<UInt64>(sk_update->get_estimate());
+        else
+            return 0;
+    }
+
+    void merge(const ThetaSketchData & rhs)
+    {
+        datasketches::theta_union * u = getSkUnion();
+
+        if (sk_update)
+        {
+            u->update(*sk_update);
+            sk_update.reset(nullptr);
+        }
+
+        if (rhs.sk_update)
+            u->update(*rhs.sk_update);
+        else if (rhs.sk_union)
+            u->update(rhs.sk_union->get_result());
+    }
+
+    /// You can only call for an empty object.
+    void read(DB::ReadBuffer & in)
+    {
+        datasketches::compact_theta_sketch::vector_bytes bytes;
+        readVectorBinary(bytes, in);
+        if (!bytes.empty())
+        {
+            auto sk = datasketches::compact_theta_sketch::deserialize(bytes.data(), bytes.size());
+            getSkUnion()->update(sk);
+        }
+    }
+
+    void write(DB::WriteBuffer & out) const
+    {
+        if (sk_update)
+        {
+            auto bytes = sk_update->compact().serialize();
+            writeVectorBinary(bytes, out);
+        }
+        else if (sk_union)
+        {
+            auto bytes = sk_union->get_result().serialize();
+            writeVectorBinary(bytes, out);
+        }
+        else
+        {
+            datasketches::compact_theta_sketch::vector_bytes bytes;
+            writeVectorBinary(bytes, out);
+        }
+    }
+};
+
+
+}
+
+#endif
diff --git a/src/AggregateFunctions/UniqCombinedBiasData.cpp b/src/AggregateFunctions/UniqCombinedBiasData.cpp
index a3a3176e199..3a8d93fee6b 100644
--- a/src/AggregateFunctions/UniqCombinedBiasData.cpp
+++ b/src/AggregateFunctions/UniqCombinedBiasData.cpp
@@ -2,6 +2,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace
 {
diff --git a/src/AggregateFunctions/UniqCombinedBiasData.h b/src/AggregateFunctions/UniqCombinedBiasData.h
index 2b009bfdfd8..2a4eb7ebefe 100644
--- a/src/AggregateFunctions/UniqCombinedBiasData.h
+++ b/src/AggregateFunctions/UniqCombinedBiasData.h
@@ -4,6 +4,7 @@
 
 namespace DB
 {
+struct Settings;
 
 /** Data for HyperLogLogBiasEstimator in the uniqCombined function.
   * The development plan is as follows:
diff --git a/src/AggregateFunctions/UniqVariadicHash.cpp b/src/AggregateFunctions/UniqVariadicHash.cpp
index 53ff9d59004..940f0677163 100644
--- a/src/AggregateFunctions/UniqVariadicHash.cpp
+++ b/src/AggregateFunctions/UniqVariadicHash.cpp
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+struct Settings;
 
 /// If some arguments are not contiguous, we cannot use simple hash function,
 ///  because it requires method IColumn::getDataAt to work.
diff --git a/src/AggregateFunctions/UniqVariadicHash.h b/src/AggregateFunctions/UniqVariadicHash.h
index d6e584a2e1e..b3607a63285 100644
--- a/src/AggregateFunctions/UniqVariadicHash.h
+++ b/src/AggregateFunctions/UniqVariadicHash.h
@@ -3,13 +3,13 @@
 #include <city.h>
 #include <Core/Defines.h>
 #include <Common/SipHash.h>
-#include <Common/UInt128.h>
 #include <Common/assert_cast.h>
 #include <Columns/ColumnTuple.h>
 
 
 namespace DB
 {
+struct Settings;
 
 /** Hashes a set of arguments to the aggregate function
   *  to calculate the number of unique values
@@ -107,7 +107,7 @@ struct UniqVariadicHash<true, false>
         }
 
         UInt128 key;
-        hash.get128(key.low, key.high);
+        hash.get128(key);
         return key;
     }
 };
@@ -131,7 +131,7 @@ struct UniqVariadicHash<true, true>
         }
 
         UInt128 key;
-        hash.get128(key.low, key.high);
+        hash.get128(key);
         return key;
     }
 };
diff --git a/src/AggregateFunctions/tests/CMakeLists.txt b/src/AggregateFunctions/examples/CMakeLists.txt
similarity index 100%
rename from src/AggregateFunctions/tests/CMakeLists.txt
rename to src/AggregateFunctions/examples/CMakeLists.txt
diff --git a/src/AggregateFunctions/tests/quantile-t-digest.cpp b/src/AggregateFunctions/examples/quantile-t-digest.cpp
similarity index 100%
rename from src/AggregateFunctions/tests/quantile-t-digest.cpp
rename to src/AggregateFunctions/examples/quantile-t-digest.cpp
diff --git a/src/AggregateFunctions/parseAggregateFunctionParameters.cpp b/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
index 679ed78ec8e..3826d993c4a 100644
--- a/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
+++ b/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
@@ -7,6 +7,7 @@
 
 namespace DB
 {
+struct Settings;
 
 namespace ErrorCodes
 {
diff --git a/src/AggregateFunctions/parseAggregateFunctionParameters.h b/src/AggregateFunctions/parseAggregateFunctionParameters.h
index c0815b2e941..37f1f1d5097 100644
--- a/src/AggregateFunctions/parseAggregateFunctionParameters.h
+++ b/src/AggregateFunctions/parseAggregateFunctionParameters.h
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+struct Settings;
 
 Array getAggregateFunctionParametersArray(const ASTPtr & expression_list, const std::string & error_context = "");
 
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index ae26fdc5d40..40c7d2368a0 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -6,12 +6,14 @@
 
 namespace DB
 {
+struct Settings;
 
 class AggregateFunctionFactory;
 void registerAggregateFunctionAvg(AggregateFunctionFactory &);
 void registerAggregateFunctionAvgWeighted(AggregateFunctionFactory &);
 void registerAggregateFunctionCount(AggregateFunctionFactory &);
 void registerAggregateFunctionDeltaSum(AggregateFunctionFactory &);
+void registerAggregateFunctionDeltaSumTimestamp(AggregateFunctionFactory &);
 void registerAggregateFunctionGroupArray(AggregateFunctionFactory &);
 void registerAggregateFunctionGroupUniqArray(AggregateFunctionFactory &);
 void registerAggregateFunctionGroupArrayInsertAt(AggregateFunctionFactory &);
@@ -25,6 +27,7 @@ void registerAggregateFunctionsAny(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsStable(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsSimple(AggregateFunctionFactory &);
 void registerAggregateFunctionSum(AggregateFunctionFactory &);
+void registerAggregateFunctionSumCount(AggregateFunctionFactory &);
 void registerAggregateFunctionSumMap(AggregateFunctionFactory &);
 void registerAggregateFunctionsUniq(AggregateFunctionFactory &);
 void registerAggregateFunctionUniqCombined(AggregateFunctionFactory &);
@@ -45,6 +48,7 @@ void registerAggregateFunctionRankCorrelation(AggregateFunctionFactory &);
 void registerAggregateFunctionMannWhitney(AggregateFunctionFactory &);
 void registerAggregateFunctionWelchTTest(AggregateFunctionFactory &);
 void registerAggregateFunctionStudentTTest(AggregateFunctionFactory &);
+void registerAggregateFunctionSequenceNextNode(AggregateFunctionFactory &);
 
 class AggregateFunctionCombinatorFactory;
 void registerAggregateFunctionCombinatorIf(AggregateFunctionCombinatorFactory &);
@@ -60,6 +64,7 @@ void registerAggregateFunctionCombinatorDistinct(AggregateFunctionCombinatorFact
 
 void registerWindowFunctions(AggregateFunctionFactory & factory);
 
+void registerAggregateFunctionSegmentLengthSum(AggregateFunctionFactory &);
 
 void registerAggregateFunctions()
 {
@@ -70,6 +75,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionAvgWeighted(factory);
         registerAggregateFunctionCount(factory);
         registerAggregateFunctionDeltaSum(factory);
+        registerAggregateFunctionDeltaSumTimestamp(factory);
         registerAggregateFunctionGroupArray(factory);
         registerAggregateFunctionGroupUniqArray(factory);
         registerAggregateFunctionGroupArrayInsertAt(factory);
@@ -83,6 +89,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionsStatisticsStable(factory);
         registerAggregateFunctionsStatisticsSimple(factory);
         registerAggregateFunctionSum(factory);
+        registerAggregateFunctionSumCount(factory);
         registerAggregateFunctionSumMap(factory);
         registerAggregateFunctionsUniq(factory);
         registerAggregateFunctionUniqCombined(factory);
@@ -103,10 +110,13 @@ void registerAggregateFunctions()
         registerAggregateFunctionAggThrow(factory);
         registerAggregateFunctionRankCorrelation(factory);
         registerAggregateFunctionMannWhitney(factory);
+        registerAggregateFunctionSequenceNextNode(factory);
         registerAggregateFunctionWelchTTest(factory);
         registerAggregateFunctionStudentTTest(factory);
 
         registerWindowFunctions(factory);
+
+        registerAggregateFunctionSegmentLengthSum(factory);
     }
 
     {
diff --git a/src/AggregateFunctions/registerAggregateFunctions.h b/src/AggregateFunctions/registerAggregateFunctions.h
index 2a2e0bb7d3f..2dcd4df7279 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.h
+++ b/src/AggregateFunctions/registerAggregateFunctions.h
@@ -2,6 +2,7 @@
 
 namespace DB
 {
+struct Settings;
 
 void registerAggregateFunctions();
 
diff --git a/src/AggregateFunctions/ya.make b/src/AggregateFunctions/ya.make
index 3a8f0ad9fba..aa388cf902d 100644
--- a/src/AggregateFunctions/ya.make
+++ b/src/AggregateFunctions/ya.make
@@ -20,6 +20,7 @@ SRCS(
     AggregateFunctionCombinatorFactory.cpp
     AggregateFunctionCount.cpp
     AggregateFunctionDeltaSum.cpp
+    AggregateFunctionDeltaSumTimestamp.cpp
     AggregateFunctionDistinct.cpp
     AggregateFunctionEntropy.cpp
     AggregateFunctionFactory.cpp
@@ -42,7 +43,9 @@ SRCS(
     AggregateFunctionRankCorrelation.cpp
     AggregateFunctionResample.cpp
     AggregateFunctionRetention.cpp
+    AggregateFunctionSegmentLengthSum.cpp
     AggregateFunctionSequenceMatch.cpp
+    AggregateFunctionSequenceNextNode.cpp
     AggregateFunctionSimpleLinearRegression.cpp
     AggregateFunctionSimpleState.cpp
     AggregateFunctionState.cpp
@@ -50,6 +53,7 @@ SRCS(
     AggregateFunctionStatisticsSimple.cpp
     AggregateFunctionStudentTTest.cpp
     AggregateFunctionSum.cpp
+    AggregateFunctionSumCount.cpp
     AggregateFunctionSumMap.cpp
     AggregateFunctionTopK.cpp
     AggregateFunctionUniq.cpp
diff --git a/src/AggregateFunctions/ya.make.in b/src/AggregateFunctions/ya.make.in
index 4d0c3099bbd..bc7823509af 100644
--- a/src/AggregateFunctions/ya.make.in
+++ b/src/AggregateFunctions/ya.make.in
@@ -8,7 +8,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F GroupBitmap | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F GroupBitmap | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Bridge/IBridgeHelper.cpp b/src/Bridge/IBridgeHelper.cpp
new file mode 100644
index 00000000000..b6f3446d0a6
--- /dev/null
+++ b/src/Bridge/IBridgeHelper.cpp
@@ -0,0 +1,133 @@
+#include "IBridgeHelper.h"
+
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <IO/ReadHelpers.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/URI.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int EXTERNAL_SERVER_IS_NOT_RESPONDING;
+}
+
+
+Poco::URI IBridgeHelper::getMainURI() const
+{
+    auto uri = createBaseURI();
+    uri.setPath(MAIN_HANDLER);
+    return uri;
+}
+
+
+Poco::URI IBridgeHelper::getPingURI() const
+{
+    auto uri = createBaseURI();
+    uri.setPath(PING_HANDLER);
+    return uri;
+}
+
+
+bool IBridgeHelper::checkBridgeIsRunning() const
+{
+    try
+    {
+        ReadWriteBufferFromHTTP buf(
+            getPingURI(), Poco::Net::HTTPRequest::HTTP_GET, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()));
+        return checkString(PING_OK_ANSWER, buf);
+    }
+    catch (...)
+    {
+        return false;
+    }
+}
+
+
+void IBridgeHelper::startBridgeSync() const
+{
+    if (!checkBridgeIsRunning())
+    {
+        LOG_TRACE(getLog(), "{} is not running, will try to start it", serviceAlias());
+        startBridge(startBridgeCommand());
+        bool started = false;
+
+        uint64_t milliseconds_to_wait = 10; /// Exponential backoff
+        uint64_t counter = 0;
+
+        while (milliseconds_to_wait < 10000)
+        {
+            ++counter;
+            LOG_TRACE(getLog(), "Checking {} is running, try {}", serviceAlias(), counter);
+
+            if (checkBridgeIsRunning())
+            {
+                started = true;
+                break;
+            }
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds_to_wait));
+            milliseconds_to_wait *= 2;
+        }
+
+        if (!started)
+            throw Exception("BridgeHelper: " + serviceAlias() + " is not responding",
+                ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
+    }
+}
+
+
+std::unique_ptr<ShellCommand> IBridgeHelper::startBridgeCommand() const
+{
+    if (startBridgeManually())
+        throw Exception(serviceAlias() + " is not running. Please, start it manually", ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
+
+    const auto & config = getConfig();
+    /// Path to executable folder
+    fs::path path(config.getString("application.dir", "/usr/bin"));
+
+    std::vector<std::string> cmd_args;
+    path /= serviceFileName();
+
+    cmd_args.push_back("--http-port");
+    cmd_args.push_back(std::to_string(config.getUInt(configPrefix() + ".port", getDefaultPort())));
+    cmd_args.push_back("--listen-host");
+    cmd_args.push_back(config.getString(configPrefix() + ".listen_host", DEFAULT_HOST));
+    cmd_args.push_back("--http-timeout");
+    cmd_args.push_back(std::to_string(getHTTPTimeout().totalMicroseconds()));
+    if (config.has("logger." + configPrefix() + "_log"))
+    {
+        cmd_args.push_back("--log-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_log"));
+    }
+    if (config.has("logger." + configPrefix() + "_errlog"))
+    {
+        cmd_args.push_back("--err-log-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_errlog"));
+    }
+    if (config.has("logger." + configPrefix() + "_stdout"))
+    {
+        cmd_args.push_back("--stdout-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_stdout"));
+    }
+    if (config.has("logger." + configPrefix() + "_stderr"))
+    {
+        cmd_args.push_back("--stderr-path");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_stderr"));
+    }
+    if (config.has("logger." + configPrefix() + "_level"))
+    {
+        cmd_args.push_back("--log-level");
+        cmd_args.push_back(config.getString("logger." + configPrefix() + "_level"));
+    }
+
+    LOG_TRACE(getLog(), "Starting {}", serviceAlias());
+
+    return ShellCommand::executeDirect(path.string(), cmd_args, ShellCommandDestructorStrategy(true));
+}
+
+}
diff --git a/src/Bridge/IBridgeHelper.h b/src/Bridge/IBridgeHelper.h
new file mode 100644
index 00000000000..34be69a7db7
--- /dev/null
+++ b/src/Bridge/IBridgeHelper.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <Poco/Logger.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Common/ShellCommand.h>
+#include <IO/ConnectionTimeoutsContext.h>
+#include <common/logger_useful.h>
+
+
+namespace DB
+{
+
+/// Common base class for XDBC and Library bridge helpers.
+/// Contains helper methods to check/start bridge sync.
+class IBridgeHelper: protected WithConstContext
+{
+
+public:
+    static constexpr inline auto DEFAULT_HOST = "127.0.0.1";
+    static constexpr inline auto PING_HANDLER = "/ping";
+    static constexpr inline auto MAIN_HANDLER = "/";
+    static constexpr inline auto DEFAULT_FORMAT = "RowBinary";
+    static constexpr inline auto PING_OK_ANSWER = "Ok.";
+
+    static const inline std::string PING_METHOD = Poco::Net::HTTPRequest::HTTP_GET;
+    static const inline std::string MAIN_METHOD = Poco::Net::HTTPRequest::HTTP_POST;
+
+    explicit IBridgeHelper(ContextConstPtr context_) : WithConstContext(context_) {}
+    virtual ~IBridgeHelper() = default;
+
+    void startBridgeSync() const;
+
+    Poco::URI getMainURI() const;
+
+    Poco::URI getPingURI() const;
+
+
+protected:
+    /// clickhouse-odbc-bridge, clickhouse-library-bridge
+    virtual String serviceAlias() const = 0;
+
+    virtual String serviceFileName() const = 0;
+
+    virtual size_t getDefaultPort() const = 0;
+
+    virtual bool startBridgeManually() const = 0;
+
+    virtual void startBridge(std::unique_ptr<ShellCommand> cmd) const = 0;
+
+    virtual String configPrefix() const = 0;
+
+    virtual const Poco::Util::AbstractConfiguration & getConfig() const = 0;
+
+    virtual Poco::Logger * getLog() const = 0;
+
+    virtual Poco::Timespan getHTTPTimeout() const = 0;
+
+    virtual Poco::URI createBaseURI() const = 0;
+
+
+private:
+    bool checkBridgeIsRunning() const;
+
+    std::unique_ptr<ShellCommand> startBridgeCommand() const;
+};
+
+}
diff --git a/src/Bridge/LibraryBridgeHelper.cpp b/src/Bridge/LibraryBridgeHelper.cpp
new file mode 100644
index 00000000000..8967b191b73
--- /dev/null
+++ b/src/Bridge/LibraryBridgeHelper.cpp
@@ -0,0 +1,181 @@
+#include "LibraryBridgeHelper.h"
+
+#include <IO/ReadHelpers.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/OwningBlockInputStream.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromString.h>
+#include <Formats/FormatFactory.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/ShellCommand.h>
+#include <common/logger_useful.h>
+#include <ext/range.h>
+#include <Core/Field.h>
+#include <Common/escapeForFileName.h>
+
+
+namespace DB
+{
+
+LibraryBridgeHelper::LibraryBridgeHelper(
+        ContextConstPtr context_,
+        const Block & sample_block_,
+        const Field & dictionary_id_)
+    : IBridgeHelper(context_->getGlobalContext())
+    , log(&Poco::Logger::get("LibraryBridgeHelper"))
+    , sample_block(sample_block_)
+    , config(context_->getConfigRef())
+    , http_timeout(context_->getGlobalContext()->getSettingsRef().http_receive_timeout.value)
+    , dictionary_id(dictionary_id_)
+{
+    bridge_port = config.getUInt("library_bridge.port", DEFAULT_PORT);
+    bridge_host = config.getString("library_bridge.host", DEFAULT_HOST);
+}
+
+
+Poco::URI LibraryBridgeHelper::createRequestURI(const String & method) const
+{
+    auto uri = getMainURI();
+    uri.addQueryParameter("dictionary_id", toString(dictionary_id));
+    uri.addQueryParameter("method", method);
+    return uri;
+}
+
+
+Poco::URI LibraryBridgeHelper::createBaseURI() const
+{
+    Poco::URI uri;
+    uri.setHost(bridge_host);
+    uri.setPort(bridge_port);
+    uri.setScheme("http");
+    return uri;
+}
+
+
+void LibraryBridgeHelper::startBridge(std::unique_ptr<ShellCommand> cmd) const
+{
+    getContext()->addBridgeCommand(std::move(cmd));
+}
+
+
+bool LibraryBridgeHelper::initLibrary(const std::string & library_path, const std::string library_settings, const std::string attributes_names)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LIB_NEW_METHOD);
+
+    /// 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 block_string = out.str();
+
+    auto out_stream_callback = [library_path, library_settings, attributes_names, block_string, this](std::ostream & os)
+    {
+        os << "library_path=" << escapeForFileName(library_path) << "&";
+        os << "library_settings=" << escapeForFileName(library_settings) << "&";
+        os << "attributes_names=" << escapeForFileName(attributes_names) << "&";
+        os << "sample_block=" << escapeForFileName(sample_block.getNamesAndTypesList().toString()) << "&";
+        os << "null_values=" << escapeForFileName(block_string);
+    };
+    return executeRequest(uri, out_stream_callback);
+}
+
+
+bool LibraryBridgeHelper::cloneLibrary(const Field & other_dictionary_id)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LIB_CLONE_METHOD);
+    uri.addQueryParameter("from_dictionary_id", toString(other_dictionary_id));
+    return executeRequest(uri);
+}
+
+
+bool LibraryBridgeHelper::removeLibrary()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LIB_DELETE_METHOD);
+    return executeRequest(uri);
+}
+
+
+bool LibraryBridgeHelper::isModified()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(IS_MODIFIED_METHOD);
+    return executeRequest(uri);
+}
+
+
+bool LibraryBridgeHelper::supportsSelectiveLoad()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(SUPPORTS_SELECTIVE_LOAD_METHOD);
+    return executeRequest(uri);
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadAll()
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LOAD_ALL_METHOD);
+    return loadBase(uri);
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadIds(const std::string ids_string)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LOAD_IDS_METHOD);
+    return loadBase(uri, [ids_string](std::ostream & os) { os << "ids=" << ids_string; });
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadKeys(const Block & requested_block)
+{
+    startBridgeSync();
+    auto uri = createRequestURI(LOAD_KEYS_METHOD);
+    /// Sample block to parse block from callback
+    uri.addQueryParameter("requested_block_sample", requested_block.getNamesAndTypesList().toString());
+    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);
+    };
+    return loadBase(uri, out_stream_callback);
+}
+
+
+bool LibraryBridgeHelper::executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
+{
+    ReadWriteBufferFromHTTP buf(
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        std::move(out_stream_callback),
+        ConnectionTimeouts::getHTTPTimeouts(getContext()));
+
+    bool res;
+    readBoolText(res, buf);
+    return res;
+}
+
+
+BlockInputStreamPtr LibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
+{
+    auto read_buf_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        std::move(out_stream_callback),
+        ConnectionTimeouts::getHTTPTimeouts(getContext()),
+        0,
+        Poco::Net::HTTPBasicCredentials{},
+        DBMS_DEFAULT_BUFFER_SIZE,
+        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));
+}
+
+}
diff --git a/src/Bridge/LibraryBridgeHelper.h b/src/Bridge/LibraryBridgeHelper.h
new file mode 100644
index 00000000000..c3c42e85f93
--- /dev/null
+++ b/src/Bridge/LibraryBridgeHelper.h
@@ -0,0 +1,86 @@
+#pragma once
+
+#include <Interpreters/Context.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/URI.h>
+#include <Bridge/IBridgeHelper.h>
+
+
+namespace DB
+{
+
+class LibraryBridgeHelper : public IBridgeHelper
+{
+
+public:
+    static constexpr inline size_t DEFAULT_PORT = 9012;
+
+    LibraryBridgeHelper(ContextConstPtr context_, const Block & sample_block, const Field & dictionary_id_);
+
+    bool initLibrary(const std::string & library_path, std::string library_settings, std::string attributes_names);
+
+    bool cloneLibrary(const Field & other_dictionary_id);
+
+    bool removeLibrary();
+
+    bool isModified();
+
+    bool supportsSelectiveLoad();
+
+    BlockInputStreamPtr loadAll();
+
+    BlockInputStreamPtr loadIds(std::string ids_string);
+
+    BlockInputStreamPtr loadKeys(const Block & requested_block);
+
+    BlockInputStreamPtr loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
+
+    bool executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
+
+
+protected:
+    void startBridge(std::unique_ptr<ShellCommand> cmd) const override;
+
+    String serviceAlias() const override { return "clickhouse-library-bridge"; }
+
+    String serviceFileName() const override { return serviceAlias(); }
+
+    size_t getDefaultPort() const override { return DEFAULT_PORT; }
+
+    bool startBridgeManually() const override { return false; }
+
+    String configPrefix() const override { return "library_bridge"; }
+
+    const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
+
+    Poco::Logger * getLog() const override { return log; }
+
+    Poco::Timespan getHTTPTimeout() const override { return http_timeout; }
+
+    Poco::URI createBaseURI() const override;
+
+private:
+    static constexpr inline auto LIB_NEW_METHOD = "libNew";
+    static constexpr inline auto LIB_CLONE_METHOD = "libClone";
+    static constexpr inline auto LIB_DELETE_METHOD = "libDelete";
+    static constexpr inline auto LOAD_ALL_METHOD = "loadAll";
+    static constexpr inline auto LOAD_IDS_METHOD = "loadIds";
+    static constexpr inline auto LOAD_KEYS_METHOD = "loadKeys";
+    static constexpr inline auto IS_MODIFIED_METHOD = "isModified";
+    static constexpr inline auto SUPPORTS_SELECTIVE_LOAD_METHOD = "supportsSelectiveLoad";
+
+    Poco::URI createRequestURI(const String & method) const;
+
+    Poco::Logger * log;
+    const Block sample_block;
+    const Poco::Util::AbstractConfiguration & config;
+    const Poco::Timespan http_timeout;
+
+    Field dictionary_id;
+    std::string bridge_host;
+    size_t bridge_port;
+};
+
+}
diff --git a/src/Bridge/XDBCBridgeHelper.h b/src/Bridge/XDBCBridgeHelper.h
new file mode 100644
index 00000000000..97a6251a9a0
--- /dev/null
+++ b/src/Bridge/XDBCBridgeHelper.h
@@ -0,0 +1,262 @@
+#pragma once
+
+#include <IO/ReadHelpers.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <Interpreters/Context.h>
+#include <Access/AccessType.h>
+#include <Parsers/IdentifierQuotingStyle.h>
+#include <Poco/Logger.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/URI.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/ShellCommand.h>
+#include <IO/ConnectionTimeoutsContext.h>
+#include <common/logger_useful.h>
+#include <ext/range.h>
+#include <Bridge/IBridgeHelper.h>
+
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config.h>
+#endif
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+/// Class for Helpers for XDBC-bridges, provide utility methods, not main request.
+class IXDBCBridgeHelper : public IBridgeHelper
+{
+
+public:
+    explicit IXDBCBridgeHelper(ContextPtr context_) : IBridgeHelper(context_) {}
+
+    virtual std::vector<std::pair<std::string, std::string>> getURLParams(UInt64 max_block_size) const = 0;
+
+    virtual Poco::URI getColumnsInfoURI() const = 0;
+
+    virtual IdentifierQuotingStyle getIdentifierQuotingStyle() = 0;
+
+    virtual bool isSchemaAllowed() = 0;
+
+    virtual String getName() const = 0;
+};
+
+using BridgeHelperPtr = std::shared_ptr<IXDBCBridgeHelper>;
+
+
+template <typename BridgeHelperMixin>
+class XDBCBridgeHelper : public IXDBCBridgeHelper
+{
+
+public:
+    static constexpr inline auto DEFAULT_PORT = BridgeHelperMixin::DEFAULT_PORT;
+    static constexpr inline auto COL_INFO_HANDLER = "/columns_info";
+    static constexpr inline auto IDENTIFIER_QUOTE_HANDLER = "/identifier_quote";
+    static constexpr inline auto SCHEMA_ALLOWED_HANDLER = "/schema_allowed";
+
+    XDBCBridgeHelper(
+        ContextConstPtr context_,
+        Poco::Timespan http_timeout_,
+        const std::string & connection_string_)
+    : IXDBCBridgeHelper(context_->getGlobalContext())
+    , log(&Poco::Logger::get(BridgeHelperMixin::getName() + "BridgeHelper"))
+    , connection_string(connection_string_)
+    , http_timeout(http_timeout_)
+    , config(context_->getGlobalContext()->getConfigRef())
+{
+    bridge_host = config.getString(BridgeHelperMixin::configPrefix() + ".host", DEFAULT_HOST);
+    bridge_port = config.getUInt(BridgeHelperMixin::configPrefix() + ".port", DEFAULT_PORT);
+}
+
+protected:
+    auto getConnectionString() const { return connection_string; }
+
+    String getName() const override { return BridgeHelperMixin::getName(); }
+
+    size_t getDefaultPort() const override { return DEFAULT_PORT; }
+
+    String serviceAlias() const override { return BridgeHelperMixin::serviceAlias(); }
+
+    /// Same for odbc and jdbc
+    String serviceFileName() const override { return "clickhouse-odbc-bridge"; }
+
+    String configPrefix() const override { return BridgeHelperMixin::configPrefix(); }
+
+    Poco::Timespan getHTTPTimeout() const override { return http_timeout; }
+
+    const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
+
+    Poco::Logger * getLog() const override { return log; }
+
+    bool startBridgeManually() const override { return BridgeHelperMixin::startBridgeManually(); }
+
+    Poco::URI createBaseURI() const override
+    {
+        Poco::URI uri;
+        uri.setHost(bridge_host);
+        uri.setPort(bridge_port);
+        uri.setScheme("http");
+        return uri;
+    }
+
+    void startBridge(std::unique_ptr<ShellCommand> cmd) const override
+    {
+        getContext()->addBridgeCommand(std::move(cmd));
+    }
+
+
+private:
+    using Configuration = Poco::Util::AbstractConfiguration;
+
+    Poco::Logger * log;
+    std::string connection_string;
+    Poco::Timespan http_timeout;
+    std::string bridge_host;
+    size_t bridge_port;
+
+    const Configuration & config;
+
+    std::optional<IdentifierQuotingStyle> quote_style;
+    std::optional<bool> is_schema_allowed;
+
+
+protected:
+    using URLParams = std::vector<std::pair<std::string, std::string>>;
+
+    Poco::URI getColumnsInfoURI() const override
+    {
+        auto uri = createBaseURI();
+        uri.setPath(COL_INFO_HANDLER);
+        return uri;
+    }
+
+    URLParams getURLParams(UInt64 max_block_size) const override
+    {
+        std::vector<std::pair<std::string, std::string>> result;
+
+        result.emplace_back("connection_string", connection_string); /// already validated
+        result.emplace_back("max_block_size", std::to_string(max_block_size));
+
+        return result;
+    }
+
+    bool isSchemaAllowed() override
+    {
+        if (!is_schema_allowed.has_value())
+        {
+            startBridgeSync();
+
+            auto uri = createBaseURI();
+            uri.setPath(SCHEMA_ALLOWED_HANDLER);
+            uri.addQueryParameter("connection_string", getConnectionString());
+
+            ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()));
+
+            bool res;
+            readBoolText(res, buf);
+            is_schema_allowed = res;
+        }
+
+        return *is_schema_allowed;
+    }
+
+    IdentifierQuotingStyle getIdentifierQuotingStyle() override
+    {
+        if (!quote_style.has_value())
+        {
+            startBridgeSync();
+
+            auto uri = createBaseURI();
+            uri.setPath(IDENTIFIER_QUOTE_HANDLER);
+            uri.addQueryParameter("connection_string", getConnectionString());
+
+            ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(getContext()));
+
+            std::string character;
+            readStringBinary(character, buf);
+            if (character.length() > 1)
+                throw Exception(
+                    "Failed to parse quoting style from '" + character + "' for service " + BridgeHelperMixin::serviceAlias(),
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            else if (character.length() == 0)
+                quote_style = IdentifierQuotingStyle::None;
+            else if (character[0] == '`')
+                quote_style = IdentifierQuotingStyle::Backticks;
+            else if (character[0] == '"')
+                quote_style = IdentifierQuotingStyle::DoubleQuotes;
+            else
+                throw Exception("Can not map quote identifier '" + character + "' to enum value", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+
+        return *quote_style;
+    }
+};
+
+
+struct JDBCBridgeMixin
+{
+    static constexpr inline auto DEFAULT_PORT = 9019;
+
+    static String configPrefix()
+    {
+        return "jdbc_bridge";
+    }
+
+    static String serviceAlias()
+    {
+        return "clickhouse-jdbc-bridge";
+    }
+
+    static String getName()
+    {
+        return "JDBC";
+    }
+
+    static AccessType getSourceAccessType()
+    {
+        return AccessType::JDBC;
+    }
+
+    static bool startBridgeManually()
+    {
+        return true;
+    }
+};
+
+
+struct ODBCBridgeMixin
+{
+    static constexpr inline auto DEFAULT_PORT = 9018;
+
+    static String configPrefix()
+    {
+        return "odbc_bridge";
+    }
+
+    static String serviceAlias()
+    {
+        return "clickhouse-odbc-bridge";
+    }
+
+    static String getName()
+    {
+        return "ODBC";
+    }
+
+    static AccessType getSourceAccessType()
+    {
+        return AccessType::ODBC;
+    }
+
+    static bool startBridgeManually()
+    {
+        return false;
+    }
+};
+
+}
diff --git a/src/Bridge/ya.make b/src/Bridge/ya.make
new file mode 100644
index 00000000000..e900bab036e
--- /dev/null
+++ b/src/Bridge/ya.make
@@ -0,0 +1,17 @@
+# 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
new file mode 100644
index 00000000000..5fa69cec4bb
--- /dev/null
+++ b/src/Bridge/ya.make.in
@@ -0,0 +1,14 @@
+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 fe519530123..26a68fcbd14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,17 +18,17 @@ else()
 endif()
 include(../cmake/limit_jobs.cmake)
 
-set (CONFIG_VERSION ${CMAKE_CURRENT_BINARY_DIR}/Common/config_version.h)
-set (CONFIG_COMMON ${CMAKE_CURRENT_BINARY_DIR}/Common/config.h)
+set (CONFIG_VERSION "${CMAKE_CURRENT_BINARY_DIR}/Common/config_version.h")
+set (CONFIG_COMMON "${CMAKE_CURRENT_BINARY_DIR}/Common/config.h")
 
 include (../cmake/version.cmake)
 message (STATUS "Will build ${VERSION_FULL} revision ${VERSION_REVISION} ${VERSION_OFFICIAL}")
 configure_file (Common/config.h.in ${CONFIG_COMMON})
 configure_file (Common/config_version.h.in ${CONFIG_VERSION})
-configure_file (Core/config_core.h.in ${CMAKE_CURRENT_BINARY_DIR}/Core/include/config_core.h)
+configure_file (Core/config_core.h.in "${CMAKE_CURRENT_BINARY_DIR}/Core/include/config_core.h")
 
 if (USE_DEBUG_HELPERS)
-    set (INCLUDE_DEBUG_HELPERS "-I${ClickHouse_SOURCE_DIR}/base -include ${ClickHouse_SOURCE_DIR}/src/Core/iostream_debug_helpers.h")
+    set (INCLUDE_DEBUG_HELPERS "-I\"${ClickHouse_SOURCE_DIR}/base\" -include \"${ClickHouse_SOURCE_DIR}/src/Core/iostream_debug_helpers.h\"")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
 endif ()
 
@@ -101,13 +101,14 @@ endif()
 
 if (USE_HDFS)
     add_headers_and_sources(dbms Storages/HDFS)
+    add_headers_and_sources(dbms Disks/HDFS)
 endif()
 
 list (APPEND clickhouse_common_io_sources ${CONFIG_BUILD})
 list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON})
 
 list (APPEND dbms_sources Functions/IFunction.cpp Functions/FunctionFactory.cpp Functions/FunctionHelpers.cpp Functions/extractTimeZoneFromFunctionArguments.cpp Functions/replicate.cpp Functions/FunctionsLogical.cpp)
-list (APPEND dbms_headers Functions/IFunctionImpl.h Functions/FunctionFactory.h Functions/FunctionHelpers.h Functions/extractTimeZoneFromFunctionArguments.h Functions/replicate.h Functions/FunctionsLogical.h)
+list (APPEND dbms_headers Functions/IFunction.h Functions/FunctionFactory.h Functions/FunctionHelpers.h Functions/extractTimeZoneFromFunctionArguments.h Functions/replicate.h Functions/FunctionsLogical.h)
 
 list (APPEND dbms_sources
     AggregateFunctions/AggregateFunctionFactory.cpp
@@ -184,12 +185,15 @@ add_object_library(clickhouse_disks Disks)
 add_object_library(clickhouse_interpreters Interpreters)
 add_object_library(clickhouse_interpreters_mysql Interpreters/MySQL)
 add_object_library(clickhouse_interpreters_clusterproxy Interpreters/ClusterProxy)
+add_object_library(clickhouse_interpreters_jit Interpreters/JIT)
 add_object_library(clickhouse_columns Columns)
 add_object_library(clickhouse_storages Storages)
+add_object_library(clickhouse_storages_mysql Storages/MySQL)
 add_object_library(clickhouse_storages_distributed Storages/Distributed)
 add_object_library(clickhouse_storages_mergetree Storages/MergeTree)
 add_object_library(clickhouse_storages_liveview Storages/LiveView)
 add_object_library(clickhouse_client Client)
+add_object_library(clickhouse_bridge Bridge)
 add_object_library(clickhouse_server Server)
 add_object_library(clickhouse_server_http Server/HTTP)
 add_object_library(clickhouse_formats Formats)
@@ -244,8 +248,8 @@ macro (dbms_target_link_libraries)
     endforeach ()
 endmacro ()
 
-dbms_target_include_directories (PUBLIC ${ClickHouse_SOURCE_DIR}/src ${ClickHouse_BINARY_DIR}/src)
-target_include_directories (clickhouse_common_io PUBLIC ${ClickHouse_SOURCE_DIR}/src ${ClickHouse_BINARY_DIR}/src)
+dbms_target_include_directories (PUBLIC "${ClickHouse_SOURCE_DIR}/src" "${ClickHouse_BINARY_DIR}/src")
+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})
@@ -321,10 +325,6 @@ if (USE_RDKAFKA)
     endif()
 endif()
 
-if (USE_AMQPCPP)
-    dbms_target_link_libraries(PUBLIC amqp-cpp)
-endif()
-
 if (USE_CYRUS_SASL)
     dbms_target_link_libraries(PRIVATE ${CYRUS_SASL_LIBRARY})
 endif()
@@ -360,8 +360,8 @@ dbms_target_link_libraries (
         clickhouse_common_io
 )
 
-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 PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/Core/include") # uses some includes from core
+dbms_target_include_directories(PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/Core/include")
 
 dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR})
 dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${MINISELECT_INCLUDE_DIR})
@@ -375,11 +375,9 @@ if (ZSTD_LIBRARY)
     endif ()
 endif()
 
-set (LZMA_LIBRARY liblzma)
-set (LZMA_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/xz/src/liblzma/api)
-if (LZMA_LIBRARY)
-    target_link_libraries (clickhouse_common_io PUBLIC ${LZMA_LIBRARY})
-    target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${LZMA_INCLUDE_DIR})
+if (XZ_LIBRARY)
+    target_link_libraries (clickhouse_common_io PUBLIC ${XZ_LIBRARY})
+    target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${XZ_INCLUDE_DIR})
 endif()
 
 if (USE_ICU)
@@ -442,6 +440,11 @@ if (USE_BROTLI)
     target_include_directories (clickhouse_common_io SYSTEM BEFORE PRIVATE ${BROTLI_INCLUDE_DIR})
 endif()
 
+if (USE_AMQPCPP)
+    dbms_target_link_libraries(PUBLIC ${AMQPCPP_LIBRARY})
+    dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${AMQPCPP_INCLUDE_DIR})
+endif()
+
 if (USE_CASSANDRA)
     dbms_target_link_libraries(PUBLIC ${CASSANDRA_LIBRARY})
     dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${CASS_INCLUDE_DIR})
@@ -458,7 +461,7 @@ target_include_directories (clickhouse_common_io SYSTEM BEFORE PUBLIC ${FAST_FLO
 
 if (USE_ORC)
     dbms_target_link_libraries(PUBLIC ${ORC_LIBRARIES})
-    dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${ORC_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/contrib/orc/c++/include)
+    dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${ORC_INCLUDE_DIR} "${CMAKE_BINARY_DIR}/contrib/orc/c++/include")
 endif ()
 
 if (USE_ROCKSDB)
@@ -477,7 +480,7 @@ endif ()
 
 dbms_target_link_libraries(PRIVATE _boost_context)
 
-include (${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake)
+include ("${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake")
 
 if (ENABLE_TESTS AND USE_GTEST)
     macro (grep_gtest_sources BASE_DIR DST_VAR)
@@ -486,7 +489,7 @@ if (ENABLE_TESTS AND USE_GTEST)
     endmacro()
 
     # attach all dbms gtest sources
-    grep_gtest_sources(${ClickHouse_SOURCE_DIR}/src dbms_gtest_sources)
+    grep_gtest_sources("${ClickHouse_SOURCE_DIR}/src" dbms_gtest_sources)
     add_executable(unit_tests_dbms ${dbms_gtest_sources})
 
     # gtest framework has substandard code
@@ -509,5 +512,10 @@ if (ENABLE_TESTS AND USE_GTEST)
         clickhouse_common_zookeeper
         string_utils)
 
+    # For __udivmodti4 referenced in Core/tests/gtest_DecimalFunctions.cpp
+    if (OS_DARWIN AND COMPILER_GCC)
+        target_link_libraries(unit_tests_dbms PRIVATE gcc)
+    endif ()
+
     add_check(unit_tests_dbms)
 endif ()
diff --git a/src/Client/CMakeLists.txt b/src/Client/CMakeLists.txt
index 88c05163602..119414a8a70 100644
--- a/src/Client/CMakeLists.txt
+++ b/src/Client/CMakeLists.txt
@@ -1 +1,3 @@
-add_subdirectory(tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
+endif()
\ No newline at end of file
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 939a48d949f..d26f7454bcc 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -551,6 +551,15 @@ void Connection::sendIgnoredPartUUIDs(const std::vector<UUID> & uuids)
     out->next();
 }
 
+
+void Connection::sendReadTaskResponse(const String & response)
+{
+    writeVarUInt(Protocol::Client::ReadTaskResponse, *out);
+    writeVarUInt(DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION, *out);
+    writeStringBinary(response, *out);
+    out->next();
+}
+
 void Connection::sendPreparedData(ReadBuffer & input, size_t size, const String & name)
 {
     /// NOTE 'Throttler' is not used in this method (could use, but it's not important right now).
@@ -671,8 +680,12 @@ void Connection::sendExternalTablesData(ExternalTablesData & data)
         PipelineExecutorPtr executor;
         auto on_cancel = [& executor]() { executor->cancel(); };
 
+        if (!elem->pipe)
+            elem->pipe = elem->creating_pipe_callback();
+
         QueryPipeline 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
@@ -807,6 +820,9 @@ Packet Connection::receivePacket()
                 readVectorBinary(res.part_uuids, *in);
                 return res;
 
+            case Protocol::Server::ReadTaskRequest:
+                return res;
+
             default:
                 /// In unknown state, disconnect - to not leave unsynchronised connection.
                 disconnect();
@@ -907,13 +923,13 @@ void Connection::setDescription()
 }
 
 
-std::unique_ptr<Exception> Connection::receiveException()
+std::unique_ptr<Exception> Connection::receiveException() const
 {
     return std::make_unique<Exception>(readException(*in, "Received from " + getDescription(), true /* remote */));
 }
 
 
-std::vector<String> Connection::receiveMultistringMessage(UInt64 msg_type)
+std::vector<String> Connection::receiveMultistringMessage(UInt64 msg_type) const
 {
     size_t num = Protocol::Server::stringsInMessage(msg_type);
     std::vector<String> strings(num);
@@ -923,7 +939,7 @@ std::vector<String> Connection::receiveMultistringMessage(UInt64 msg_type)
 }
 
 
-Progress Connection::receiveProgress()
+Progress Connection::receiveProgress() const
 {
     Progress progress;
     progress.read(*in, server_revision);
@@ -931,7 +947,7 @@ Progress Connection::receiveProgress()
 }
 
 
-BlockStreamProfileInfo Connection::receiveProfileInfo()
+BlockStreamProfileInfo Connection::receiveProfileInfo() const
 {
     BlockStreamProfileInfo profile_info;
     profile_info.read(*in);
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index 7e3b9b7ab61..80dbd9ed44e 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -21,6 +21,7 @@
 #include <IO/ReadBufferFromPocoSocket.h>
 
 #include <Interpreters/TablesStatus.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <Compression/ICompressionCodec.h>
 
@@ -40,6 +41,7 @@ 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;
 };
@@ -52,8 +54,6 @@ class Connection;
 using ConnectionPtr = std::shared_ptr<Connection>;
 using Connections = std::vector<ConnectionPtr>;
 
-using Scalars = std::map<String, Block>;
-
 
 /// Packet that could be received from server.
 struct Packet
@@ -111,7 +111,7 @@ public:
         setDescription();
     }
 
-    virtual ~Connection() {}
+    virtual ~Connection() = default;
 
     /// Set throttler of network traffic. One throttler could be used for multiple connections to limit total traffic.
     void setThrottler(const ThrottlerPtr & throttler_)
@@ -140,6 +140,8 @@ public:
     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,
@@ -160,6 +162,8 @@ public:
     /// Send parts' uuids to excluded them from query processing
     void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids);
 
+    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 = "");
@@ -270,7 +274,7 @@ private:
     class LoggerWrapper
     {
     public:
-        LoggerWrapper(Connection & parent_)
+        explicit LoggerWrapper(Connection & parent_)
             : log(nullptr), parent(parent_)
         {
         }
@@ -305,10 +309,10 @@ private:
     Block receiveLogData();
     Block receiveDataImpl(BlockInputStreamPtr & stream);
 
-    std::vector<String> receiveMultistringMessage(UInt64 msg_type);
-    std::unique_ptr<Exception> receiveException();
-    Progress receiveProgress();
-    BlockStreamProfileInfo receiveProfileInfo();
+    std::vector<String> receiveMultistringMessage(UInt64 msg_type) const;
+    std::unique_ptr<Exception> receiveException() const;
+    Progress receiveProgress() const;
+    BlockStreamProfileInfo receiveProfileInfo() const;
 
     void initInputBuffers();
     void initBlockInput();
diff --git a/src/Client/ConnectionEstablisher.cpp b/src/Client/ConnectionEstablisher.cpp
index 2532035fabd..4d27c9efc69 100644
--- a/src/Client/ConnectionEstablisher.cpp
+++ b/src/Client/ConnectionEstablisher.cpp
@@ -116,7 +116,7 @@ ConnectionEstablisherAsync::ConnectionEstablisherAsync(
     epoll.add(receive_timeout.getDescriptor());
 }
 
-void ConnectionEstablisherAsync::Routine::ReadCallback::operator()(int fd, const Poco::Timespan & timeout, const std::string &)
+void ConnectionEstablisherAsync::Routine::ReadCallback::operator()(int fd, Poco::Timespan timeout, const std::string &)
 {
     /// Check if it's the first time and we need to add socket fd to epoll.
     if (connection_establisher_async.socket_fd == -1)
diff --git a/src/Client/ConnectionEstablisher.h b/src/Client/ConnectionEstablisher.h
index 1096452ebce..495583ba7ec 100644
--- a/src/Client/ConnectionEstablisher.h
+++ b/src/Client/ConnectionEstablisher.h
@@ -92,7 +92,7 @@ private:
             ConnectionEstablisherAsync & connection_establisher_async;
             Fiber & fiber;
 
-            void operator()(int fd, const Poco::Timespan & timeout, const std::string &);
+            void operator()(int fd, Poco::Timespan timeout, const std::string &);
         };
 
         Fiber operator()(Fiber && sink);
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index 9e1d5f78b03..bf73e9756d2 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -26,7 +26,7 @@ public:
     using Entry = PoolBase<Connection>::Entry;
 
 public:
-    virtual ~IConnectionPool() {}
+    virtual ~IConnectionPool() = default;
 
     /// Selects the connection to work.
     /// If force_connected is false, the client must manually ensure that returned connection is good.
diff --git a/src/Client/HedgedConnections.h b/src/Client/HedgedConnections.h
index f1675108349..9f7d8837536 100644
--- a/src/Client/HedgedConnections.h
+++ b/src/Client/HedgedConnections.h
@@ -14,6 +14,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
 /** To receive data from multiple replicas (connections) from one shard asynchronously.
   * The principe of Hedged Connections is used to reduce tail latency:
   * if we don't receive data from replica and there is no progress in query execution
@@ -84,6 +90,11 @@ public:
         const ClientInfo & client_info,
         bool with_pending_data) override;
 
+    void sendReadTaskResponse(const String &) override
+    {
+        throw Exception("sendReadTaskResponse in not supported with HedgedConnections", ErrorCodes::LOGICAL_ERROR);
+    }
+
     Packet receivePacket() override;
 
     Packet receivePacketUnlocked(AsyncCallback async_callback) override;
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
index 695b2e34fd6..b0c5a3d22f5 100644
--- a/src/Client/HedgedConnectionsFactory.cpp
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -55,7 +55,7 @@ std::vector<Connection *> HedgedConnectionsFactory::getManyConnections(PoolMode
 {
     size_t min_entries = (settings && settings->skip_unavailable_shards) ? 0 : 1;
 
-    size_t max_entries;
+    size_t max_entries = 1;
     switch (pool_mode)
     {
         case PoolMode::GET_ALL:
diff --git a/src/Client/IConnections.h b/src/Client/IConnections.h
index 38730922456..d251a5fb3ab 100644
--- a/src/Client/IConnections.h
+++ b/src/Client/IConnections.h
@@ -24,6 +24,8 @@ public:
         const ClientInfo & client_info,
         bool with_pending_data) = 0;
 
+    virtual void sendReadTaskResponse(const String &) = 0;
+
     /// Get packet from any replica.
     virtual Packet receivePacket() = 0;
 
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index 8b2b7c49f26..350beffce28 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -13,6 +13,7 @@ namespace ErrorCodes
     extern const int MISMATCH_REPLICAS_DATA_SOURCES;
     extern const int NO_AVAILABLE_REPLICA;
     extern const int TIMEOUT_EXCEEDED;
+    extern const int UNKNOWN_PACKET_FROM_SERVER;
 }
 
 
@@ -155,6 +156,15 @@ void MultiplexedConnections::sendIgnoredPartUUIDs(const std::vector<UUID> & uuid
     }
 }
 
+
+void MultiplexedConnections::sendReadTaskResponse(const String & response)
+{
+    std::lock_guard lock(cancel_mutex);
+    if (cancelled)
+        return;
+    current_connection->sendReadTaskResponse(response);
+}
+
 Packet MultiplexedConnections::receivePacket()
 {
     std::lock_guard lock(cancel_mutex);
@@ -210,6 +220,7 @@ Packet MultiplexedConnections::drain()
 
         switch (packet.type)
         {
+            case Protocol::Server::ReadTaskRequest:
             case Protocol::Server::PartUUIDs:
             case Protocol::Server::Data:
             case Protocol::Server::Progress:
@@ -268,11 +279,27 @@ Packet MultiplexedConnections::receivePacketUnlocked(AsyncCallback async_callbac
     Packet packet;
     {
         AsyncCallbackSetter async_setter(current_connection, std::move(async_callback));
-        packet = current_connection->receivePacket();
+
+        try
+        {
+            packet = current_connection->receivePacket();
+        }
+        catch (Exception & e)
+        {
+            if (e.code() == ErrorCodes::UNKNOWN_PACKET_FROM_SERVER)
+            {
+                /// Exception may happen when packet is received, e.g. when got unknown packet.
+                /// In this case, invalidate replica, so that we would not read from it anymore.
+                current_connection->disconnect();
+                invalidateReplica(state);
+            }
+            throw;
+        }
     }
 
     switch (packet.type)
     {
+        case Protocol::Server::ReadTaskRequest:
         case Protocol::Server::PartUUIDs:
         case Protocol::Server::Data:
         case Protocol::Server::Progress:
diff --git a/src/Client/MultiplexedConnections.h b/src/Client/MultiplexedConnections.h
index c04b06e525e..f642db1c4cd 100644
--- a/src/Client/MultiplexedConnections.h
+++ b/src/Client/MultiplexedConnections.h
@@ -39,6 +39,8 @@ public:
         const ClientInfo & client_info,
         bool with_pending_data) override;
 
+    void sendReadTaskResponse(const String &) override;
+
     Packet receivePacket() override;
 
     void disconnect() override;
diff --git a/src/Client/PacketReceiver.h b/src/Client/PacketReceiver.h
index 2252e63a2f6..516491db994 100644
--- a/src/Client/PacketReceiver.h
+++ b/src/Client/PacketReceiver.h
@@ -98,7 +98,7 @@ private:
             PacketReceiver & receiver;
             Fiber & sink;
 
-            void operator()(int, const Poco::Timespan & timeout, const std::string &)
+            void operator()(int, Poco::Timespan timeout, const std::string &)
             {
                 receiver.receive_timeout.setRelative(timeout);
                 receiver.is_read_in_process = true;
diff --git a/src/Client/tests/CMakeLists.txt b/src/Client/examples/CMakeLists.txt
similarity index 100%
rename from src/Client/tests/CMakeLists.txt
rename to src/Client/examples/CMakeLists.txt
diff --git a/src/Client/tests/test_connect.cpp b/src/Client/examples/test_connect.cpp
similarity index 100%
rename from src/Client/tests/test_connect.cpp
rename to src/Client/examples/test_connect.cpp
diff --git a/src/Client/ya.make.in b/src/Client/ya.make.in
index 935643ecd26..0ea90f75a6c 100644
--- a/src/Client/ya.make.in
+++ b/src/Client/ya.make.in
@@ -9,7 +9,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Columns/CMakeLists.txt b/src/Columns/CMakeLists.txt
index 65172356645..f676f415eea 100644
--- a/src/Columns/CMakeLists.txt
+++ b/src/Columns/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory (examples)
 endif ()
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index df7b3cce729..a5bfcae05e4 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -162,7 +162,7 @@ MutableColumnPtr ColumnAggregateFunction::convertToValues(MutableColumnPtr colum
     return res;
 }
 
-MutableColumnPtr ColumnAggregateFunction::predictValues(const ColumnsWithTypeAndName & arguments, const Context & context) const
+MutableColumnPtr ColumnAggregateFunction::predictValues(const ColumnsWithTypeAndName & arguments, ContextConstPtr context) const
 {
     MutableColumnPtr res = func->getReturnTypeToPredict()->createColumn();
     res->reserve(data.size());
diff --git a/src/Columns/ColumnAggregateFunction.h b/src/Columns/ColumnAggregateFunction.h
index 5cb9aaa4ad5..e75af280ed5 100644
--- a/src/Columns/ColumnAggregateFunction.h
+++ b/src/Columns/ColumnAggregateFunction.h
@@ -82,7 +82,7 @@ private:
     /// Name of the type to distinguish different aggregation states.
     String type_string;
 
-    ColumnAggregateFunction() {}
+    ColumnAggregateFunction() = default;
 
     /// Create a new column that has another column as a source.
     MutablePtr createView() const;
@@ -119,7 +119,7 @@ public:
     const char * getFamilyName() const override { return "AggregateFunction"; }
     TypeIndex getDataType() const override { return TypeIndex::AggregateFunction; }
 
-    MutableColumnPtr predictValues(const ColumnsWithTypeAndName & arguments, const Context & context) const;
+    MutableColumnPtr predictValues(const ColumnsWithTypeAndName & arguments, ContextConstPtr context) const;
 
     size_t size() const override
     {
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index a4fa15c2d95..8621a793f49 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -85,8 +85,8 @@ private:
     {}
 
 public:
-    const char * getFamilyName() const override { return TypeName<T>::get(); }
-    TypeIndex getDataType() const override { return TypeId<T>::value; }
+    const char * getFamilyName() const override { return TypeName<T>; }
+    TypeIndex getDataType() const override { return TypeId<T>; }
 
     bool isNumeric() const override { return false; }
     bool canBeInsideNullable() const override { return true; }
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index 9433bf079e2..c4d7e75dd2d 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -122,7 +122,7 @@ namespace
         else if (auto * data_uint64 = getIndexesData<UInt64>(column))
             return mapUniqueIndexImpl(*data_uint64);
         else
-            throw Exception("Indexes column for getUniqueIndex must be ColumnUInt, got" + column.getName(),
+            throw Exception("Indexes column for getUniqueIndex must be ColumnUInt, got " + column.getName(),
                             ErrorCodes::LOGICAL_ERROR);
     }
 }
@@ -151,7 +151,7 @@ void ColumnLowCardinality::insertFrom(const IColumn & src, size_t n)
     const auto * low_cardinality_src = typeid_cast<const ColumnLowCardinality *>(&src);
 
     if (!low_cardinality_src)
-        throw Exception("Expected ColumnLowCardinality, got" + src.getName(), ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception("Expected ColumnLowCardinality, got " + src.getName(), ErrorCodes::ILLEGAL_COLUMN);
 
     size_t position = low_cardinality_src->getIndexes().getUInt(n);
 
diff --git a/src/Columns/ColumnLowCardinality.h b/src/Columns/ColumnLowCardinality.h
index 92bf7ff0f95..fc607021ccf 100644
--- a/src/Columns/ColumnLowCardinality.h
+++ b/src/Columns/ColumnLowCardinality.h
@@ -187,6 +187,7 @@ public:
      * So LC(Nullable(T)) would return true, LC(U) -- false.
      */
     bool nestedIsNullable() const { return isColumnNullable(*dictionary.getColumnUnique().getNestedColumn()); }
+    void nestedToNullable() { dictionary.getColumnUnique().nestedToNullable(); }
 
     const IColumnUnique & getDictionary() const { return dictionary.getColumnUnique(); }
     const ColumnPtr & getDictionaryPtr() const { return dictionary.getColumnUniquePtr(); }
diff --git a/src/Columns/ColumnNullable.cpp b/src/Columns/ColumnNullable.cpp
index 1e529751437..62524315354 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -35,7 +35,6 @@ ColumnNullable::ColumnNullable(MutableColumnPtr && nested_column_, MutableColumn
         throw Exception{"ColumnNullable cannot have constant null map", ErrorCodes::ILLEGAL_COLUMN};
 }
 
-
 void ColumnNullable::updateHashWithValue(size_t n, SipHash & hash) const
 {
     const auto & arr = getNullMapData();
diff --git a/src/Columns/ColumnString.h b/src/Columns/ColumnString.h
index 1792491c60d..0814ebaa826 100644
--- a/src/Columns/ColumnString.h
+++ b/src/Columns/ColumnString.h
@@ -111,7 +111,7 @@ public:
     }
 
 /// Suppress gcc 7.3.1 warning: '*((void*)&<anonymous> +8)' may be used uninitialized in this function
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -128,7 +128,7 @@ public:
         offsets.push_back(new_size);
     }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index 652487c2b09..51b45be53fd 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -50,6 +50,7 @@ public:
     const ColumnPtr & getNestedColumn() const override;
     const ColumnPtr & getNestedNotNullableColumn() const override { return column_holder; }
     bool nestedColumnIsNullable() const override { return is_nullable; }
+    void nestedToNullable() override;
 
     size_t uniqueInsert(const Field & x) override;
     size_t uniqueInsertFrom(const IColumn & src, size_t n) override;
@@ -263,6 +264,13 @@ void ColumnUnique<ColumnType>::updateNullMask()
     }
 }
 
+template <typename ColumnType>
+void ColumnUnique<ColumnType>::nestedToNullable()
+{
+    is_nullable = true;
+    createNullMask();
+}
+
 template <typename ColumnType>
 const ColumnPtr & ColumnUnique<ColumnType>::getNestedColumn() const
 {
@@ -657,7 +665,7 @@ UInt128 ColumnUnique<ColumnType>::IncrementalHash::getHash(const ColumnType & co
             column.updateHashWithValue(i, sip_hash);
 
         std::lock_guard lock(mutex);
-        sip_hash.get128(hash.low, hash.high);
+        sip_hash.get128(hash);
         cur_hash = hash;
         num_added_rows.store(column_size);
     }
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index a64906ba257..4e2a8c16586 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -33,6 +33,7 @@ namespace ErrorCodes
     extern const int PARAMETER_OUT_OF_BOUND;
     extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
     extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
 }
 
 template <typename T>
@@ -154,7 +155,7 @@ void ColumnVector<T>::getPermutation(bool reverse, size_t limit, int nan_directi
     else
     {
         /// A case for radix sort
-        if constexpr (is_arithmetic_v<T> && !std::is_same_v<T, UInt128>)
+        if constexpr (is_arithmetic_v<T> && !is_big_int_v<T>)
         {
             /// Thresholds on size. Lower threshold is arbitrary. Upper threshold is chosen by the type for histogram counters.
             if (s >= 256 && s <= std::numeric_limits<UInt32>::max())
@@ -292,28 +293,37 @@ MutableColumnPtr ColumnVector<T>::cloneResized(size_t size) const
         memcpy(new_col.data.data(), data.data(), count * sizeof(data[0]));
 
         if (size > count)
-            memset(static_cast<void *>(&new_col.data[count]), static_cast<int>(ValueType()), (size - count) * sizeof(ValueType));
+            memset(static_cast<void *>(&new_col.data[count]), 0, (size - count) * sizeof(ValueType));
     }
 
     return res;
 }
 
 template <typename T>
-UInt64 ColumnVector<T>::get64(size_t n) const
+UInt64 ColumnVector<T>::get64(size_t n [[maybe_unused]]) const
 {
-    return ext::bit_cast<UInt64>(data[n]);
+    if constexpr (is_arithmetic_v<T>)
+        return ext::bit_cast<UInt64>(data[n]);
+    else
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get the value of {} as UInt64", TypeName<T>);
 }
 
 template <typename T>
-inline Float64 ColumnVector<T>::getFloat64(size_t n) const
+inline Float64 ColumnVector<T>::getFloat64(size_t n [[maybe_unused]]) const
 {
-    return static_cast<Float64>(data[n]);
+    if constexpr (is_arithmetic_v<T>)
+        return static_cast<Float64>(data[n]);
+    else
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get the value of {} as Float64", TypeName<T>);
 }
 
 template <typename T>
-Float32 ColumnVector<T>::getFloat32(size_t n) const
+Float32 ColumnVector<T>::getFloat32(size_t n [[maybe_unused]]) const
 {
-    return static_cast<Float32>(data[n]);
+    if constexpr (is_arithmetic_v<T>)
+        return static_cast<Float32>(data[n]);
+    else
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get the value of {} as Float32", TypeName<T>);
 }
 
 template <typename T>
@@ -482,8 +492,6 @@ void ColumnVector<T>::gather(ColumnGathererStream & gatherer)
 template <typename T>
 void ColumnVector<T>::getExtremes(Field & min, Field & max) const
 {
-    using FastRefT = std::conditional_t<is_big_int_v<T>, const T &, const T>;
-
     size_t size = data.size();
 
     if (size == 0)
@@ -504,7 +512,7 @@ void ColumnVector<T>::getExtremes(Field & min, Field & max) const
     T cur_min = NaNOrZero<T>();
     T cur_max = NaNOrZero<T>();
 
-    for (FastRefT x : data)
+    for (const T & x : data)
     {
         if (isNaN(x))
             continue;
@@ -569,5 +577,6 @@ template class ColumnVector<Int128>;
 template class ColumnVector<Int256>;
 template class ColumnVector<Float32>;
 template class ColumnVector<Float64>;
+template class ColumnVector<UUID>;
 
 }
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index 30ab38ed1c2..e75fd11d190 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -12,6 +12,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+
 /** Stuff for comparing numbers.
   * Integer values are compared as usual.
   * Floating-point numbers are compared this way that NaNs always end up at the end
@@ -90,6 +96,7 @@ struct FloatCompareHelper
 template <class U> struct CompareHelper<Float32, U> : public FloatCompareHelper<Float32> {};
 template <class U> struct CompareHelper<Float64, U> : public FloatCompareHelper<Float64> {};
 
+
 /** A template for columns that use a simple array to store.
  */
 template <typename T>
@@ -118,7 +125,7 @@ private:
     ColumnVector(std::initializer_list<T> il) : data{il} {}
 
 public:
-    bool isNumeric() const override { return IsNumber<T>; }
+    bool isNumeric() const override { return is_arithmetic_v<T>; }
 
     size_t size() const override
     {
@@ -221,8 +228,8 @@ public:
         data.reserve(n);
     }
 
-    const char * getFamilyName() const override { return TypeName<T>::get(); }
-    TypeIndex getDataType() const override { return TypeId<T>::value; }
+    const char * getFamilyName() const override { return TypeName<T>; }
+    TypeIndex getDataType() const override { return TypeId<T>; }
 
     MutableColumnPtr cloneResized(size_t size) const override;
 
@@ -245,18 +252,27 @@ public:
     /// Out of range conversion is permitted.
     UInt64 NO_SANITIZE_UNDEFINED getUInt(size_t n) const override
     {
-        return UInt64(data[n]);
+        if constexpr (is_arithmetic_v<T>)
+            return UInt64(data[n]);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get the value of {} as UInt", TypeName<T>);
     }
 
     /// Out of range conversion is permitted.
     Int64 NO_SANITIZE_UNDEFINED getInt(size_t n) const override
     {
-        return Int64(data[n]);
+        if constexpr (is_arithmetic_v<T>)
+            return Int64(data[n]);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get the value of {} as Int", TypeName<T>);
     }
 
     bool getBool(size_t n) const override
     {
-        return bool(data[n]);
+        if constexpr (is_arithmetic_v<T>)
+            return bool(data[n]);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get the value of {} as bool", TypeName<T>);
     }
 
     void insert(const Field & x) override
@@ -370,5 +386,6 @@ extern template class ColumnVector<Int128>;
 extern template class ColumnVector<Int256>;
 extern template class ColumnVector<Float32>;
 extern template class ColumnVector<Float64>;
+extern template class ColumnVector<UUID>;
 
 }
diff --git a/src/Columns/ColumnsCommon.h b/src/Columns/ColumnsCommon.h
index 7655edffa71..71f2884bf86 100644
--- a/src/Columns/ColumnsCommon.h
+++ b/src/Columns/ColumnsCommon.h
@@ -66,7 +66,7 @@ ColumnPtr selectIndexImpl(const Column & column, const IColumn & indexes, size_t
     else if (auto * data_uint64 = detail::getIndexesData<UInt64>(indexes))
         return column.template indexImpl<UInt64>(*data_uint64, limit);
     else
-        throw Exception("Indexes column for IColumn::select must be ColumnUInt, got" + indexes.getName(),
+        throw Exception("Indexes column for IColumn::select must be ColumnUInt, got " + indexes.getName(),
                         ErrorCodes::LOGICAL_ERROR);
 }
 
diff --git a/src/Columns/ColumnsNumber.h b/src/Columns/ColumnsNumber.h
index 17a28e617c3..48721c32fa0 100644
--- a/src/Columns/ColumnsNumber.h
+++ b/src/Columns/ColumnsNumber.h
@@ -26,6 +26,6 @@ using ColumnInt256 = ColumnVector<Int256>;
 using ColumnFloat32 = ColumnVector<Float32>;
 using ColumnFloat64 = ColumnVector<Float64>;
 
-using ColumnUUID = ColumnVector<UInt128>;
+using ColumnUUID = ColumnVector<UUID>;
 
 }
diff --git a/src/Columns/IColumn.cpp b/src/Columns/IColumn.cpp
index a3ed0885651..2fe19d5d9fd 100644
--- a/src/Columns/IColumn.cpp
+++ b/src/Columns/IColumn.cpp
@@ -3,6 +3,7 @@
 #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/IColumnDummy.h b/src/Columns/IColumnDummy.h
index e844b54aaed..7e1958f077e 100644
--- a/src/Columns/IColumnDummy.h
+++ b/src/Columns/IColumnDummy.h
@@ -59,13 +59,16 @@ public:
 
     StringRef serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin) const override
     {
-        return { arena.allocContinue(0, begin), 0 };
+        /// Has to put one useless byte into Arena, because serialization into zero number of bytes is ambiguous.
+        char * res = arena.allocContinue(1, begin);
+        *res = 0;
+        return { res, 1 };
     }
 
     const char * deserializeAndInsertFromArena(const char * pos) override
     {
         ++s;
-        return pos;
+        return pos + 1;
     }
 
     const char * skipSerializedInArena(const char * pos) const override
diff --git a/src/Columns/IColumnUnique.h b/src/Columns/IColumnUnique.h
index 5558f493b92..2c1c542fce5 100644
--- a/src/Columns/IColumnUnique.h
+++ b/src/Columns/IColumnUnique.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <optional>
 #include <Columns/IColumn.h>
-#include <Common/UInt128.h>
 
 namespace DB
 {
@@ -24,6 +23,7 @@ public:
     virtual const ColumnPtr & getNestedNotNullableColumn() const = 0;
 
     virtual bool nestedColumnIsNullable() const = 0;
+    virtual void nestedToNullable() = 0;
 
     /// Returns array with StringRefHash calculated for each row of getNestedNotNullableColumn() column.
     /// Returns nullptr if nested column doesn't contain strings. Otherwise calculates hash (if it wasn't).
diff --git a/src/Columns/tests/CMakeLists.txt b/src/Columns/examples/CMakeLists.txt
similarity index 100%
rename from src/Columns/tests/CMakeLists.txt
rename to src/Columns/examples/CMakeLists.txt
diff --git a/src/Columns/tests/gtest_weak_hash_32.cpp b/src/Columns/tests/gtest_weak_hash_32.cpp
index a04bd94124c..2fa6c0ea8ac 100644
--- a/src/Columns/tests/gtest_weak_hash_32.cpp
+++ b/src/Columns/tests/gtest_weak_hash_32.cpp
@@ -14,11 +14,11 @@
 #include <DataTypes/DataTypesNumber.h>
 
 #include <Common/WeakHash.h>
+#include <Common/hex.h>
 
 #include <unordered_map>
 #include <iostream>
 #include <sstream>
-#include <Common/hex.h>
 
 
 using namespace DB;
@@ -27,20 +27,11 @@ template <typename T>
 void checkColumn(
     const WeakHash32::Container & hash,
     const PaddedPODArray<T> & eq_class,
-    const std::function<std::string(size_t)> & print_function,
     size_t allowed_collisions = 0,
     size_t max_collisions_to_print = 10)
 {
     ASSERT_EQ(hash.size(), eq_class.size());
 
-    auto print_for_row = [&](size_t row)
-    {
-        std::string res = "row: " + std::to_string(row);
-        res += " hash: " + std::to_string(hash[row]);
-        res += " value: " + print_function(row);
-        return res;
-    };
-
     /// Check equal rows has equal hash.
     {
         std::unordered_map<T, UInt32> map;
@@ -55,11 +46,7 @@ void checkColumn(
             else
             {
                 if (it->second != hash[i])
-                {
-                    std::cout << "Different hashes for the same equivalent class (" << size_t(val) << "):\n";
-                    std::cout << print_for_row(it->first) << '\n';
-                    std::cout << print_for_row(i) << std::endl;
-                }
+                    std::cout << "Different hashes for the same equivalent class (" << toString(val) << ")\n";
 
                 ASSERT_EQ(it->second, hash[i]);
             }
@@ -88,8 +75,6 @@ void checkColumn(
                 if (num_collisions <= max_collisions_to_print)
                 {
                     collisions_str << "Collision:\n";
-                    collisions_str << print_for_row(it->second) << '\n';
-                    collisions_str << print_for_row(i) << std::endl;
                 }
 
                 if (num_collisions > allowed_collisions)
@@ -118,7 +103,7 @@ TEST(WeakHash32, ColumnVectorU8)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorI8)
@@ -135,7 +120,7 @@ TEST(WeakHash32, ColumnVectorI8)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorU16)
@@ -152,7 +137,7 @@ TEST(WeakHash32, ColumnVectorU16)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorI16)
@@ -169,7 +154,7 @@ TEST(WeakHash32, ColumnVectorI16)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorU32)
@@ -186,7 +171,7 @@ TEST(WeakHash32, ColumnVectorU32)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorI32)
@@ -203,7 +188,7 @@ TEST(WeakHash32, ColumnVectorI32)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorU64)
@@ -220,7 +205,7 @@ TEST(WeakHash32, ColumnVectorU64)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorI64)
@@ -237,7 +222,7 @@ TEST(WeakHash32, ColumnVectorI64)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnVectorU128)
@@ -251,7 +236,9 @@ TEST(WeakHash32, ColumnVectorU128)
     {
         for (uint64_t i = 0; i < 65536; ++i)
         {
-            UInt128 val(i << 32u, i << 32u);
+            UInt128 val;
+            val.items[0] = i << 32u;
+            val.items[1] = i << 32u;
             data.push_back(val);
             eq_data.push_back(i);
         }
@@ -260,7 +247,7 @@ TEST(WeakHash32, ColumnVectorU128)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), eq_data, [&](size_t row) { return col->getElement(row).toHexString(); });
+    checkColumn(hash.getData(), eq_data);
 }
 
 TEST(WeakHash32, ColumnVectorI128)
@@ -277,7 +264,7 @@ TEST(WeakHash32, ColumnVectorI128)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(Int64(col->getElement(row))); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnDecimal32)
@@ -294,7 +281,7 @@ TEST(WeakHash32, ColumnDecimal32)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnDecimal64)
@@ -311,7 +298,7 @@ TEST(WeakHash32, ColumnDecimal64)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(col->getElement(row)); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnDecimal128)
@@ -328,7 +315,7 @@ TEST(WeakHash32, ColumnDecimal128)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), col->getData(), [&](size_t row) { return std::to_string(Int64(col->getElement(row))); });
+    checkColumn(hash.getData(), col->getData());
 }
 
 TEST(WeakHash32, ColumnString1)
@@ -350,7 +337,7 @@ TEST(WeakHash32, ColumnString1)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), data, [&](size_t row) { return col->getDataAt(row).toString(); });
+    checkColumn(hash.getData(), data);
 }
 
 TEST(WeakHash32, ColumnString2)
@@ -390,7 +377,7 @@ TEST(WeakHash32, ColumnString2)
     /// Now there is single collision between 'k' * 544 and 'q' * 2512 (which is calculated twice)
     size_t allowed_collisions = 4;
 
-    checkColumn(hash.getData(), data, [&](size_t row) { return col->getDataAt(row).toString(); }, allowed_collisions);
+    checkColumn(hash.getData(), data, allowed_collisions);
 }
 
 TEST(WeakHash32, ColumnString3)
@@ -428,7 +415,7 @@ TEST(WeakHash32, ColumnString3)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), data, [&](size_t row) { return col->getDataAt(row).toString(); });
+    checkColumn(hash.getData(), data);
 }
 
 TEST(WeakHash32, ColumnFixedString)
@@ -456,7 +443,7 @@ TEST(WeakHash32, ColumnFixedString)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), data, [&](size_t row) { return col->getDataAt(row).toString(); });
+    checkColumn(hash.getData(), data);
 }
 
 TEST(WeakHash32, ColumnArray)
@@ -503,15 +490,7 @@ TEST(WeakHash32, ColumnArray)
     WeakHash32 hash(col_arr->size());
     col_arr->updateWeakHash32(hash);
 
-    auto print_function = [&col_arr](size_t row)
-    {
-        auto & offsets = col_arr->getOffsets();
-        size_t s = offsets[row] - offsets[row - 1];
-        auto value = col_arr->getData().getUInt(offsets[row]);
-        return std::string("[array of size ") + std::to_string(s) + " with values " + std::to_string(value) + "]";
-    };
-
-    checkColumn(hash.getData(), eq_data, print_function);
+    checkColumn(hash.getData(), eq_data);
 }
 
 TEST(WeakHash32, ColumnArray2)
@@ -546,15 +525,7 @@ TEST(WeakHash32, ColumnArray2)
     WeakHash32 hash(col_arr->size());
     col_arr->updateWeakHash32(hash);
 
-    auto print_function = [&col_arr](size_t row)
-    {
-        auto & offsets = col_arr->getOffsets();
-        auto value1 = col_arr->getData().getUInt(offsets[row]);
-        auto value2 = col_arr->getData().getUInt(offsets[row] + 1);
-        return std::string("[") + std::to_string(value1) + ", " + std::to_string(value2) + "]";
-    };
-
-    checkColumn(hash.getData(), eq_data, print_function);
+    checkColumn(hash.getData(), eq_data);
 }
 
 TEST(WeakHash32, ColumnArrayArray)
@@ -611,20 +582,7 @@ TEST(WeakHash32, ColumnArrayArray)
     WeakHash32 hash(col_arr_arr->size());
     col_arr_arr->updateWeakHash32(hash);
 
-    auto print_function = [&col_arr_arr](size_t row2)
-    {
-        auto & offsets2 = col_arr_arr->getOffsets();
-        size_t s2 = offsets2[row2] - offsets2[row2 - 1];
-        const auto & arr2 = typeid_cast<const ColumnArray &>(col_arr_arr->getData());
-        const auto & offsets = arr2.getOffsets();
-        size_t row = offsets2[row2];
-        size_t s = offsets[row] - offsets[row - 1];
-        auto value = arr2.getData().getUInt(offsets[row]);
-        return std::string("[array of size ") + std::to_string(s2) + " with values ["
-                                "[[array of size " + std::to_string(s) + " with values " + std::to_string(value) + "]]";
-    };
-
-    checkColumn(hash.getData(), eq_data, print_function);
+    checkColumn(hash.getData(), eq_data);
 }
 
 TEST(WeakHash32, ColumnConst)
@@ -643,7 +601,7 @@ TEST(WeakHash32, ColumnConst)
     WeakHash32 hash(col_const->size());
     col_const->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), data, [&](size_t) { return std::to_string(0); });
+    checkColumn(hash.getData(), data);
 }
 
 TEST(WeakHash32, ColumnLowcardinality)
@@ -664,7 +622,7 @@ TEST(WeakHash32, ColumnLowcardinality)
     WeakHash32 hash(col->size());
     col->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), data, [&](size_t row) { return std::to_string(col->getUInt(row)); });
+    checkColumn(hash.getData(), data);
 }
 
 TEST(WeakHash32, ColumnNullable)
@@ -690,7 +648,7 @@ TEST(WeakHash32, ColumnNullable)
     WeakHash32 hash(col_null->size());
     col_null->updateWeakHash32(hash);
 
-    checkColumn(hash.getData(), eq, [&](size_t row) { return eq[row] == -1 ? "Null" : std::to_string(eq[row]); });
+    checkColumn(hash.getData(), eq);
 }
 
 TEST(WeakHash32, ColumnTupleUInt64UInt64)
@@ -721,14 +679,7 @@ TEST(WeakHash32, ColumnTupleUInt64UInt64)
     WeakHash32 hash(col_tuple->size());
     col_tuple->updateWeakHash32(hash);
 
-    auto print_func = [&](size_t row)
-    {
-        std::string l = std::to_string(col_tuple->getColumn(0).getUInt(row));
-        std::string r = std::to_string(col_tuple->getColumn(1).getUInt(row));
-        return "(" + l + ", " + r + ")";
-    };
-
-    checkColumn(hash.getData(), eq, print_func);
+    checkColumn(hash.getData(), eq);
 }
 
 TEST(WeakHash32, ColumnTupleUInt64String)
@@ -766,15 +717,8 @@ TEST(WeakHash32, ColumnTupleUInt64String)
     WeakHash32 hash(col_tuple->size());
     col_tuple->updateWeakHash32(hash);
 
-    auto print_func = [&](size_t row)
-    {
-        std::string l = std::to_string(col_tuple->getColumn(0).getUInt(row));
-        std::string r = col_tuple->getColumn(1).getDataAt(row).toString();
-        return "(" + l + ", " + r + ")";
-    };
-
     size_t allowed_collisions = 8;
-    checkColumn(hash.getData(), eq, print_func, allowed_collisions);
+    checkColumn(hash.getData(), eq, allowed_collisions);
 }
 
 TEST(WeakHash32, ColumnTupleUInt64FixedString)
@@ -812,14 +756,7 @@ TEST(WeakHash32, ColumnTupleUInt64FixedString)
     WeakHash32 hash(col_tuple->size());
     col_tuple->updateWeakHash32(hash);
 
-    auto print_func = [&](size_t row)
-    {
-        std::string l = std::to_string(col_tuple->getColumn(0).getUInt(row));
-        std::string r = col_tuple->getColumn(1).getDataAt(row).toString();
-        return "(" + l + ", " + r + ")";
-    };
-
-    checkColumn(hash.getData(), eq, print_func);
+    checkColumn(hash.getData(), eq);
 }
 
 TEST(WeakHash32, ColumnTupleUInt64Array)
@@ -866,23 +803,10 @@ TEST(WeakHash32, ColumnTupleUInt64Array)
     WeakHash32 hash(col_tuple->size());
     col_tuple->updateWeakHash32(hash);
 
-    auto print_func = [&](size_t row)
-    {
-        std::string l = std::to_string(col_tuple->getColumn(0).getUInt(row));
-
-        const auto * col_arr = typeid_cast<const ColumnArray *>(col_tuple->getColumnPtr(1).get());
-        const auto & offsets = col_arr->getOffsets();
-        size_t s = offsets[row] - offsets[row - 1];
-        auto value = col_arr->getData().getUInt(offsets[row]);
-        auto r = std::string("[array of size ") + std::to_string(s) + " with values " + std::to_string(value) + "]";
-
-        return "(" + l + ", " + r + ")";
-    };
-
     /// There are 2 collisions right now (repeated 2 times each):
     /// (0, [array of size 1212 with values 7]) vs (0, [array of size 2265 with values 17])
     /// (0, [array of size 558 with values 5]) vs (1, [array of size 879 with values 21])
 
     size_t allowed_collisions = 8;
-    checkColumn(hash.getData(), eq_data, print_func, allowed_collisions);
+    checkColumn(hash.getData(), eq_data, allowed_collisions);
 }
diff --git a/src/Columns/ya.make.in b/src/Columns/ya.make.in
index 846e2c6c3bd..3c0df961a79 100644
--- a/src/Columns/ya.make.in
+++ b/src/Columns/ya.make.in
@@ -17,7 +17,7 @@ PEERDIR(
 )
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? 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 e3c6ddf9ff4..f20f11889ce 100644
--- a/src/Common/Allocator.h
+++ b/src/Common/Allocator.h
@@ -99,9 +99,17 @@ public:
     /// Free memory range.
     void free(void * buf, size_t size)
     {
-        checkSize(size);
-        freeNoTrack(buf, size);
-        CurrentMemoryTracker::free(size);
+        try
+        {
+            checkSize(size);
+            freeNoTrack(buf, size);
+            CurrentMemoryTracker::free(size);
+        }
+        catch (...)
+        {
+            DB::tryLogCurrentException("Allocator::free");
+            throw;
+        }
     }
 
     /** Enlarge memory range.
@@ -277,7 +285,7 @@ private:
   *  GCC 4.9 mistakenly assumes that we can call `free` from a pointer to the stack.
   * In fact, the combination of conditions inside AllocatorWithStackMemory does not allow this.
   */
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wfree-nonheap-object"
 #endif
@@ -359,6 +367,6 @@ extern template class Allocator<true, false>;
 extern template class Allocator<false, true>;
 extern template class Allocator<true, true>;
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
diff --git a/src/Common/Arena.h b/src/Common/Arena.h
index 0f4f0420c38..4d14c15197d 100644
--- a/src/Common/Arena.h
+++ b/src/Common/Arena.h
@@ -128,7 +128,7 @@ private:
     template <size_t> friend class AlignedArenaAllocator;
 
 public:
-    Arena(size_t initial_size_ = 4096, size_t growth_factor_ = 2, size_t linear_growth_threshold_ = 128 * 1024 * 1024)
+    explicit Arena(size_t initial_size_ = 4096, size_t growth_factor_ = 2, size_t linear_growth_threshold_ = 128 * 1024 * 1024)
         : growth_factor(growth_factor_), linear_growth_threshold(linear_growth_threshold_),
         head(new MemoryChunk(initial_size_, nullptr)), size_in_bytes(head->size()),
         page_size(static_cast<size_t>(::getPageSize()))
@@ -160,7 +160,7 @@ public:
             void * head_pos = head->pos;
             size_t space = head->end - head->pos;
 
-            auto res = static_cast<char *>(std::align(alignment, size, head_pos, space));
+            auto * res = static_cast<char *>(std::align(alignment, size, head_pos, space));
             if (res)
             {
                 head->pos = static_cast<char *>(head_pos);
diff --git a/src/Common/AutoArray.h b/src/Common/AutoArray.h
deleted file mode 100644
index 1df8bde8c12..00000000000
--- a/src/Common/AutoArray.h
+++ /dev/null
@@ -1,309 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <cstdlib>
-
-#include <Common/Exception.h>
-#include <Common/formatReadable.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_ALLOCATE_MEMORY;
-}
-
-/** An array of (almost) unchangeable size:
-  *  the size is specified in the constructor;
-  *  `resize` method removes old data, and necessary only for
-  *  so that you can first create an empty object using the default constructor,
-  *  and then decide on the size.
-  *
-  * There is a possibility to not initialize elements by default, but create them inplace.
-  * Member destructors are called automatically.
-  *
-  * `sizeof` is equal to the size of one pointer.
-  *
-  * Not exception-safe.
-  *
-  * Copying is supported via assign() method. Moving empties the original object.
-  * That is, it is inconvenient to use this array in many cases.
-  *
-  * Designed for situations in which many arrays of the same small size are created,
-  *  but the size is not known at compile time.
-  * Also gives a significant advantage in cases where it is important that `sizeof` is minimal.
-  * For example, if arrays are put in an open-addressing hash table with inplace storage of values (like HashMap)
-  *
-  * In this case, compared to std::vector:
-  * - for arrays of 1 element size - an advantage of about 2 times;
-  * - for arrays of 5 elements - an advantage of about 1.5 times
-  *   (DB::Field, containing UInt64 and String, used as T);
-  */
-
-const size_t empty_auto_array_helper = 0;
-
-template <typename T>
-class AutoArray
-{
-public:
-    /// For deferred creation.
-    AutoArray()
-    {
-        setEmpty();
-    }
-
-    explicit AutoArray(size_t size_)
-    {
-        init(size_, false);
-    }
-
-    /** Initializes all elements with a copy constructor with the `value` parameter.
-      */
-    AutoArray(size_t size_, const T & value)
-    {
-        init(size_, true);
-
-        for (size_t i = 0; i < size_; ++i)
-        {
-            new (place(i)) T(value);
-        }
-    }
-
-    /** `resize` removes all existing items.
-      */
-    void resize(size_t size_, bool dont_init_elems = false)
-    {
-        uninit();
-        init(size_, dont_init_elems);
-    }
-
-    /** Move operations.
-      */
-    AutoArray(AutoArray && src)
-    {
-        if (this == &src)
-            return;
-        setEmpty();
-        data_ptr = src.data_ptr;
-        src.setEmpty();
-    }
-
-    AutoArray & operator= (AutoArray && src)
-    {
-        if (this == &src)
-            return *this;
-        uninit();
-        data_ptr = src.data_ptr;
-        src.setEmpty();
-
-        return *this;
-    }
-
-    ~AutoArray()
-    {
-        uninit();
-    }
-
-    size_t size() const
-    {
-        return m_size();
-    }
-
-    bool empty() const
-    {
-        return size() == 0;
-    }
-
-    void clear()
-    {
-        uninit();
-        setEmpty();
-    }
-
-    template <typename It>
-    void assign(It from_begin, It from_end)
-    {
-        uninit();
-
-        size_t size = from_end - from_begin;
-        init(size, /* dont_init_elems = */ true);
-
-        It it = from_begin;
-        for (size_t i = 0; i < size; ++i, ++it)
-            new (place(i)) T(*it);
-    }
-
-    void assign(const AutoArray & from)
-    {
-        assign(from.begin(), from.end());
-    }
-
-    /** You can read and modify elements using the [] operator
-      *  only if items were initialized
-      *  (that is, into the constructor was not passed DontInitElemsTag,
-      *   or you initialized them using `place` and `placement new`).
-      */
-    T & operator[](size_t i)
-    {
-        return elem(i);
-    }
-
-    const T & operator[](size_t i) const
-    {
-        return elem(i);
-    }
-
-    T * data()
-    {
-        return elemPtr(0);
-    }
-
-    const T * data() const
-    {
-        return elemPtr(0);
-    }
-
-    /** Get the piece of memory in which the element should be located.
-      * The function is intended to initialize an element,
-      *  which has not yet been initialized
-      * new (arr.place(i)) T(args);
-      */
-    char * place(size_t i)
-    {
-        return data_ptr + sizeof(T) * i;
-    }
-
-    using iterator = T *;
-    using const_iterator = const T *;
-
-    iterator begin() { return elemPtr(0); }
-    iterator end() { return elemPtr(size()); }
-
-    const_iterator begin() const { return elemPtr(0); }
-    const_iterator end() const { return elemPtr(size()); }
-
-    bool operator== (const AutoArray<T> & rhs) const
-    {
-        size_t s = size();
-
-        if (s != rhs.size())
-            return false;
-
-        for (size_t i = 0; i < s; ++i)
-            if (elem(i) != rhs.elem(i))
-                return false;
-
-        return true;
-    }
-
-    bool operator!= (const AutoArray<T> & rhs) const
-    {
-        return !(*this == rhs);
-    }
-
-    bool operator< (const AutoArray<T> & rhs) const
-    {
-        size_t s = size();
-        size_t rhs_s = rhs.size();
-
-        if (s < rhs_s)
-            return true;
-        if (s > rhs_s)
-            return false;
-
-        for (size_t i = 0; i < s; ++i)
-        {
-            if (elem(i) < rhs.elem(i))
-                return true;
-            if (elem(i) > rhs.elem(i))
-                return false;
-        }
-
-        return false;
-    }
-
-private:
-    static constexpr size_t alignment = alignof(T);
-    /// Bytes allocated to store size of array before data. It is padded to have minimum size as alignment.
-    /// Padding is at left and the size is stored at right (just before the first data element).
-    static constexpr size_t prefix_size = std::max(sizeof(size_t), alignment);
-
-    char * data_ptr;
-
-    size_t & m_size()
-    {
-        return reinterpret_cast<size_t *>(data_ptr)[-1];
-    }
-
-    size_t m_size() const
-    {
-        return reinterpret_cast<const size_t *>(data_ptr)[-1];
-    }
-
-    T * elemPtr(size_t i)
-    {
-        return reinterpret_cast<T *>(data_ptr) + i;
-    }
-
-    const T * elemPtr(size_t i) const
-    {
-        return reinterpret_cast<const T *>(data_ptr) + i;
-    }
-
-    T & elem(size_t i)
-    {
-        return *elemPtr(i);
-    }
-
-    const T & elem(size_t i) const
-    {
-        return *elemPtr(i);
-    }
-
-    void setEmpty()
-    {
-        data_ptr = const_cast<char *>(reinterpret_cast<const char *>(&empty_auto_array_helper)) + sizeof(size_t);
-    }
-
-    void init(size_t new_size, bool dont_init_elems)
-    {
-        if (!new_size)
-        {
-            setEmpty();
-            return;
-        }
-
-        void * new_data = nullptr;
-        int res = posix_memalign(&new_data, alignment, prefix_size + new_size * sizeof(T));
-        if (0 != res)
-            throwFromErrno(fmt::format("Cannot allocate memory (posix_memalign) {}.", ReadableSize(new_size)),
-                ErrorCodes::CANNOT_ALLOCATE_MEMORY, res);
-
-        data_ptr = static_cast<char *>(new_data);
-        data_ptr += prefix_size;
-
-        m_size() = new_size;
-
-        if (!dont_init_elems)
-            for (size_t i = 0; i < new_size; ++i)
-                new (place(i)) T();
-    }
-
-    void uninit()
-    {
-        size_t s = size();
-
-        if (s)
-        {
-            for (size_t i = 0; i < s; ++i)
-                elem(i).~T();
-
-            data_ptr -= prefix_size;
-            free(data_ptr);
-        }
-    }
-};
-
-}
diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt
index 61d9b9771a4..1935fe4fed1 100644
--- a/src/Common/CMakeLists.txt
+++ b/src/Common/CMakeLists.txt
@@ -3,6 +3,6 @@ add_subdirectory(StringUtils)
 #add_subdirectory(ZooKeeper)
 #add_subdirectory(ConfigProcessor)
 
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
-endif ()
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
+endif()
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index b7173b25ce5..3ffa9bb71de 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <Common/HashTable/HashTable.h>
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Common/ColumnsHashingImpl.h>
@@ -15,6 +14,8 @@
 
 #include <Core/Defines.h>
 #include <memory>
+#include <cassert>
+
 
 namespace DB
 {
@@ -165,8 +166,7 @@ public:
         size_t operator()(const DictionaryKey & key) const
         {
             SipHash hash;
-            hash.update(key.hash.low);
-            hash.update(key.hash.high);
+            hash.update(key.hash);
             hash.update(key.size);
             return hash.get64();
         }
@@ -594,8 +594,11 @@ struct HashMethodKeysFixed
                 return prepared_keys[row];
 
 #if defined(__SSSE3__) && !defined(MEMORY_SANITIZER)
-            if constexpr (!has_low_cardinality && !has_nullable_keys && sizeof(Key) <= 16)
+            if constexpr (sizeof(Key) <= 16)
+            {
+                assert(!has_low_cardinality && !has_nullable_keys);
                 return packFixedShuffle<Key>(columns_data.get(), keys_size, key_sizes.data(), row, masks.get());
+            }
 #endif
             return packFixed<Key>(row, keys_size, Base::getActualColumns(), key_sizes);
         }
diff --git a/src/Common/CompactArray.h b/src/Common/CompactArray.h
index 785cd04b4d0..7291fe3f18d 100644
--- a/src/Common/CompactArray.h
+++ b/src/Common/CompactArray.h
@@ -159,12 +159,12 @@ private:
     /// The number of bytes read.
     size_t read_count = 0;
     /// The content in the current position.
-    UInt8 value_l;
-    UInt8 value_r;
+    UInt8 value_l = 0;
+    UInt8 value_r = 0;
     ///
     bool is_eof = false;
     /// Does the cell fully fit into one byte?
-    bool fits_in_byte;
+    bool fits_in_byte = false;
 };
 
 /** TODO This code looks very suboptimal.
diff --git a/src/Common/ConcurrentBoundedQueue.h b/src/Common/ConcurrentBoundedQueue.h
index 7bc7f362095..cb29efc3349 100644
--- a/src/Common/ConcurrentBoundedQueue.h
+++ b/src/Common/ConcurrentBoundedQueue.h
@@ -6,7 +6,7 @@
 #include <Poco/Mutex.h>
 #include <Poco/Semaphore.h>
 
-#include <Common/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.
diff --git a/src/Common/Config/AbstractConfigurationComparison.cpp b/src/Common/Config/AbstractConfigurationComparison.cpp
index 59c0c895a89..eb677debb02 100644
--- a/src/Common/Config/AbstractConfigurationComparison.cpp
+++ b/src/Common/Config/AbstractConfigurationComparison.cpp
@@ -1,4 +1,5 @@
 #include <Common/Config/AbstractConfigurationComparison.h>
+#include <Common/getMultipleKeysFromConfig.h>
 
 #include <unordered_set>
 #include <common/StringRef.h>
@@ -31,6 +32,23 @@ bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const P
     return isSameConfiguration(left, key, right, key);
 }
 
+bool isSameConfigurationWithMultipleKeys(const Poco::Util::AbstractConfiguration & left, const Poco::Util::AbstractConfiguration & right, const String & root, const String & name)
+{
+    if (&left == &right)
+        return true;
+
+    auto left_multiple_keys = getMultipleKeysFromConfig(left, root, name);
+    auto right_multiple_keys = getMultipleKeysFromConfig(right, root, name);
+    if (left_multiple_keys.size() != right_multiple_keys.size())
+        return false;
+
+    for (auto & key : left_multiple_keys)
+        if (!isSameConfiguration(left, right, concatKeyAndSubKey(root, key)))
+            return false;
+
+    return true;
+}
+
 bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const String & left_key,
                          const Poco::Util::AbstractConfiguration & right, const String & right_key)
 {
diff --git a/src/Common/Config/AbstractConfigurationComparison.h b/src/Common/Config/AbstractConfigurationComparison.h
index 795fca2af8e..6e1d8a890bb 100644
--- a/src/Common/Config/AbstractConfigurationComparison.h
+++ b/src/Common/Config/AbstractConfigurationComparison.h
@@ -13,6 +13,17 @@ namespace DB
     bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left,
                              const Poco::Util::AbstractConfiguration & right);
 
+    /// Config may have multiple keys with one name. For example:
+    /// <root>
+    ///     <some_key>...</some_key>
+    ///     <some_key>...</some_key>
+    /// </root>
+    /// Returns true if the specified subview of the two configurations contains
+    /// the same keys and values for each key with the given name.
+    bool isSameConfigurationWithMultipleKeys(const Poco::Util::AbstractConfiguration & left,
+                                             const Poco::Util::AbstractConfiguration & right,
+                                             const String & root, const String & name);
+
     /// Returns true if the specified subview of the two configurations contains the same keys and values.
     bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left,
                              const Poco::Util::AbstractConfiguration & right,
diff --git a/src/Common/Config/CMakeLists.txt b/src/Common/Config/CMakeLists.txt
index a7914fb17ec..3da44be2af6 100644
--- a/src/Common/Config/CMakeLists.txt
+++ b/src/Common/Config/CMakeLists.txt
@@ -3,6 +3,7 @@ set (SRCS
     ConfigProcessor.cpp
     configReadClient.cpp
     ConfigReloader.cpp
+    YAMLParser.cpp
 )
 
 add_library(clickhouse_common_config ${SRCS})
@@ -15,3 +16,10 @@ target_link_libraries(clickhouse_common_config
     PRIVATE
         string_utils
 )
+
+if (USE_YAML_CPP)
+target_link_libraries(clickhouse_common_config
+    PRIVATE
+        yaml-cpp
+)
+endif()
diff --git a/src/Common/Config/ConfigProcessor.cpp b/src/Common/Config/ConfigProcessor.cpp
index 5399826fe20..7bbb4798d6f 100644
--- a/src/Common/Config/ConfigProcessor.cpp
+++ b/src/Common/Config/ConfigProcessor.cpp
@@ -1,4 +1,8 @@
+#if !defined(ARCADIA_BUILD)
+    #include <Common/config.h>
+#endif
 #include "ConfigProcessor.h"
+#include "YAMLParser.h"
 
 #include <sys/utsname.h>
 #include <cerrno>
@@ -20,10 +24,8 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
-
 #define PREPROCESSED_SUFFIX "-preprocessed"
 
-
 namespace fs = std::filesystem;
 
 using namespace Poco::XML;
@@ -60,7 +62,7 @@ static std::string numberFromHost(const std::string & s)
 
 bool ConfigProcessor::isPreprocessedFile(const std::string & path)
 {
-    return endsWith(Poco::Path(path).getBaseName(), PREPROCESSED_SUFFIX);
+    return endsWith(fs::path(path).stem(), PREPROCESSED_SUFFIX);
 }
 
 
@@ -234,7 +236,7 @@ void ConfigProcessor::merge(XMLDocumentPtr config, XMLDocumentPtr with)
 
 static std::string layerFromHost()
 {
-    utsname buf;
+    struct utsname buf;
     if (uname(&buf))
         throw Poco::Exception(std::string("uname failed: ") + errnoToString(errno));
 
@@ -414,32 +416,32 @@ ConfigProcessor::Files ConfigProcessor::getConfigMergeFiles(const std::string &
 {
     Files files;
 
-    Poco::Path merge_dir_path(config_path);
+    fs::path merge_dir_path(config_path);
     std::set<std::string> merge_dirs;
 
     /// Add path_to_config/config_name.d dir
-    merge_dir_path.setExtension("d");
-    merge_dirs.insert(merge_dir_path.toString());
+    merge_dir_path.replace_extension("d");
+    merge_dirs.insert(merge_dir_path);
     /// Add path_to_config/conf.d dir
-    merge_dir_path.setBaseName("conf");
-    merge_dirs.insert(merge_dir_path.toString());
+    merge_dir_path.replace_filename("conf.d");
+    merge_dirs.insert(merge_dir_path);
 
     for (const std::string & merge_dir_name : merge_dirs)
     {
-        Poco::File merge_dir(merge_dir_name);
-        if (!merge_dir.exists() || !merge_dir.isDirectory())
+        if (!fs::exists(merge_dir_name) || !fs::is_directory(merge_dir_name))
             continue;
 
-        for (Poco::DirectoryIterator it(merge_dir_name); it != Poco::DirectoryIterator(); ++it)
+        for (fs::directory_iterator it(merge_dir_name); it != fs::directory_iterator(); ++it)
         {
-            Poco::File & file = *it;
-            Poco::Path path(file.path());
-            std::string extension = path.getExtension();
-            std::string base_name = path.getBaseName();
+            fs::path path(it->path());
+            std::string extension = path.extension();
+            std::string base_name = path.stem();
 
             // Skip non-config and temporary files
-            if (file.isFile() && (extension == "xml" || extension == "conf") && !startsWith(base_name, "."))
-                files.push_back(file.path());
+            if (fs::is_regular_file(path)
+                    && (extension == ".xml" || extension == ".conf" || extension == ".yaml" || extension == ".yml")
+                    && !startsWith(base_name, "."))
+                files.push_back(it->path());
         }
     }
 
@@ -453,19 +455,37 @@ XMLDocumentPtr ConfigProcessor::processConfig(
     zkutil::ZooKeeperNodeCache * zk_node_cache,
     const zkutil::EventPtr & zk_changed_event)
 {
-    XMLDocumentPtr config;
     LOG_DEBUG(log, "Processing configuration file '{}'.", path);
 
+    XMLDocumentPtr config;
+
     if (fs::exists(path))
     {
-        config = dom_parser.parse(path);
+        fs::path p(path);
+        if (p.extension() == ".xml")
+        {
+            config = dom_parser.parse(path);
+        }
+        else if (p.extension() == ".yaml" || p.extension() == ".yml")
+        {
+            config = YAMLParser::parse(path);
+        }
     }
     else
     {
-        /// When we can use config embedded in binary.
+        /// These embedded files added during build with some cmake magic.
+        /// Look at the end of programs/sever/CMakeLists.txt.
+        std::string embedded_name;
         if (path == "config.xml")
+            embedded_name = "embedded.xml";
+
+        if (path == "keeper_config.xml")
+            embedded_name = "keeper_embedded.xml";
+
+        /// When we can use config embedded in binary.
+        if (!embedded_name.empty())
         {
-            auto resource = getResource("embedded.xml");
+            auto resource = getResource(embedded_name);
             if (resource.empty())
                 throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Configuration file {} doesn't exist and there is no embedded config", path);
             LOG_DEBUG(log, "There is no file '{}', will use embedded config.", path);
@@ -484,8 +504,20 @@ XMLDocumentPtr ConfigProcessor::processConfig(
         {
             LOG_DEBUG(log, "Merging configuration file '{}'.", merge_file);
 
-            XMLDocumentPtr with = dom_parser.parse(merge_file);
+            XMLDocumentPtr with;
+
+            fs::path p(merge_file);
+            if (p.extension() == ".yaml" || p.extension() == ".yml")
+            {
+                with = YAMLParser::parse(merge_file);
+            }
+            else
+            {
+                with = dom_parser.parse(merge_file);
+            }
+
             merge(config, with);
+
             contributing_files.push_back(merge_file);
         }
         catch (Exception & e)
@@ -514,7 +546,7 @@ XMLDocumentPtr ConfigProcessor::processConfig(
         else
         {
             std::string default_path = "/etc/metrika.xml";
-            if (Poco::File(default_path).exists())
+            if (fs::exists(default_path))
                 include_from_path = default_path;
         }
         if (!include_from_path.empty())
@@ -626,11 +658,11 @@ void ConfigProcessor::savePreprocessedConfig(const LoadedConfig & loaded_config,
                 if (!loaded_config.configuration->has("path"))
                 {
                     // Will use current directory
-                    auto parent_path = Poco::Path(loaded_config.config_path).makeParent();
-                    preprocessed_dir = parent_path.toString();
-                    Poco::Path poco_new_path(new_path);
-                    poco_new_path.setBaseName(poco_new_path.getBaseName() + PREPROCESSED_SUFFIX);
-                    new_path = poco_new_path.toString();
+                    fs::path parent_path = fs::path(loaded_config.config_path).parent_path();
+                    preprocessed_dir = parent_path.string();
+                    fs::path fs_new_path(new_path);
+                    fs_new_path.replace_filename(fs_new_path.stem().string() + PREPROCESSED_SUFFIX + fs_new_path.extension().string());
+                    new_path = fs_new_path.string();
                 }
                 else
                 {
@@ -645,9 +677,9 @@ void ConfigProcessor::savePreprocessedConfig(const LoadedConfig & loaded_config,
             }
 
             preprocessed_path = (fs::path(preprocessed_dir) / fs::path(new_path)).string();
-            auto preprocessed_path_parent = Poco::Path(preprocessed_path).makeParent();
-            if (!preprocessed_path_parent.toString().empty())
-                Poco::File(preprocessed_path_parent).createDirectories();
+            auto preprocessed_path_parent = fs::path(preprocessed_path).parent_path();
+            if (!preprocessed_path_parent.empty())
+                fs::create_directories(preprocessed_path_parent);
         }
         DOMWriter().writeNode(preprocessed_path, loaded_config.preprocessed_xml);
         LOG_DEBUG(log, "Saved preprocessed configuration to '{}'.", preprocessed_path);
diff --git a/src/Common/Config/ConfigProcessor.h b/src/Common/Config/ConfigProcessor.h
index 7a4102140d9..e13e66547a3 100644
--- a/src/Common/Config/ConfigProcessor.h
+++ b/src/Common/Config/ConfigProcessor.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#if !defined(ARCADIA_BUILD)
+    #include <Common/config.h>
+#endif
+
 #include <string>
 #include <unordered_set>
 #include <vector>
@@ -11,12 +15,9 @@
 #include <Poco/DOM/NodeList.h>
 #include <Poco/DOM/NamedNodeMap.h>
 #include <Poco/AutoPtr.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/Util/AbstractConfiguration.h>
-
 #include <common/logger_useful.h>
 
 
@@ -141,3 +142,4 @@ private:
 };
 
 }
+
diff --git a/src/Common/Config/ConfigReloader.cpp b/src/Common/Config/ConfigReloader.cpp
index afff08e82bb..01bb4f556d6 100644
--- a/src/Common/Config/ConfigReloader.cpp
+++ b/src/Common/Config/ConfigReloader.cpp
@@ -1,12 +1,15 @@
 #include "ConfigReloader.h"
 
 #include <Poco/Util/Application.h>
-#include <Poco/File.h>
 #include <common/logger_useful.h>
 #include <Common/setThreadName.h>
 #include "ConfigProcessor.h"
+#include <filesystem>
+#include <Common/filesystemHelpers.h>
 
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
@@ -167,8 +170,8 @@ struct ConfigReloader::FileWithTimestamp
 
 void ConfigReloader::FilesChangesTracker::addIfExists(const std::string & path_to_add)
 {
-    if (!path_to_add.empty() && Poco::File(path_to_add).exists())
-        files.emplace(path_to_add, Poco::File(path_to_add).getLastModified().epochTime());
+    if (!path_to_add.empty() && fs::exists(path_to_add))
+        files.emplace(path_to_add, FS::getModificationTime(path_to_add));
 }
 
 bool ConfigReloader::FilesChangesTracker::isDifferOrNewerThan(const FilesChangesTracker & rhs)
diff --git a/src/Common/Config/YAMLParser.cpp b/src/Common/Config/YAMLParser.cpp
new file mode 100644
index 00000000000..9eaf1cdc1ad
--- /dev/null
+++ b/src/Common/Config/YAMLParser.cpp
@@ -0,0 +1,166 @@
+#if !defined(ARCADIA_BUILD)
+    #include <Common/config.h>
+#endif
+
+#if USE_YAML_CPP
+#include "YAMLParser.h"
+
+#include <string>
+#include <cstring>
+#include <vector>
+
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/DOMParser.h>
+#include <Poco/DOM/DOMWriter.h>
+#include <Poco/DOM/NodeList.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/NamedNodeMap.h>
+#include <Poco/DOM/Text.h>
+#include <Common/Exception.h>
+
+#include <yaml-cpp/yaml.h> // Y_IGNORE
+
+#include <common/logger_useful.h>
+
+using namespace Poco::XML;
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_OPEN_FILE;
+    extern const int CANNOT_PARSE_YAML;
+}
+
+/// A prefix symbol in yaml key
+/// We add attributes to nodes by using a prefix symbol in the key part.
+/// Currently we use @ as a prefix symbol. Note, that @ is reserved
+/// by YAML standard, so we need to write a key-value pair like this: "@attribute": attr_value
+const char YAML_ATTRIBUTE_PREFIX = '@';
+
+namespace
+{
+
+Poco::AutoPtr<Poco::XML::Element> createCloneNode(Poco::XML::Element & original_node)
+{
+    Poco::AutoPtr<Poco::XML::Element> clone_node = original_node.ownerDocument()->createElement(original_node.nodeName());
+    original_node.parentNode()->appendChild(clone_node);
+    return clone_node;
+}
+
+void processNode(const YAML::Node & node, Poco::XML::Element & parent_xml_element)
+{
+    auto * xml_document = parent_xml_element.ownerDocument();
+    switch (node.Type())
+    {
+        case YAML::NodeType::Scalar:
+        {
+            auto value = node.as<std::string>();
+            Poco::AutoPtr<Poco::XML::Text> xml_value = xml_document->createTextNode(value);
+            parent_xml_element.appendChild(xml_value);
+            break;
+        }
+
+        /// We process YAML Sequences as a
+        /// list of <key>value</key> tags with same key and different values.
+        /// For example, we translate this sequence
+        /// seq:
+        ///     - val1
+        ///     - val2
+        ///
+        /// into this:
+        /// <seq>val1</seq>
+        /// <seq>val2</seq>
+        case YAML::NodeType::Sequence:
+        {
+            for (const auto & child_node : node)
+                if (parent_xml_element.hasChildNodes())
+                {
+                    /// We want to process sequences like that:
+                    /// seq:
+                    ///     - val1
+                    ///     - k2: val2
+                    ///     - val3
+                    ///     - k4: val4
+                    ///     - val5
+                    /// into xml like this:
+                    /// <seq>val1</seq>
+                    /// <seq>
+                    ///     <k2>val2</k2>
+                    /// </seq>
+                    /// <seq>val3</seq>
+                    /// <seq>
+                    ///     <k4>val4</k4>
+                    /// </seq>
+                    /// <seq>val5</seq>
+                    /// So, we create a new parent node with same tag for each child node
+                    processNode(child_node, *createCloneNode(parent_xml_element));
+                }
+                else
+                {
+                    processNode(child_node, parent_xml_element);
+                }
+            break;
+        }
+        case YAML::NodeType::Map:
+        {
+            for (const auto & key_value_pair : node)
+            {
+                const auto & key_node = key_value_pair.first;
+                const auto & value_node = key_value_pair.second;
+                auto key = key_node.as<std::string>();
+                bool is_attribute = (key.starts_with(YAML_ATTRIBUTE_PREFIX) && value_node.IsScalar());
+                if (is_attribute)
+                {
+                    /// we use substr(1) here to remove YAML_ATTRIBUTE_PREFIX from key
+                    auto attribute_name = key.substr(1);
+                    auto value = value_node.as<std::string>();
+                    parent_xml_element.setAttribute(attribute_name, value);
+                }
+                else
+                {
+                    Poco::AutoPtr<Poco::XML::Element> xml_key = xml_document->createElement(key);
+                    parent_xml_element.appendChild(xml_key);
+                    processNode(value_node, *xml_key);
+                }
+            }
+            break;
+        }
+        case YAML::NodeType::Null: break;
+        case YAML::NodeType::Undefined:
+        {
+            throw Exception(ErrorCodes::CANNOT_PARSE_YAML, "YAMLParser has encountered node with undefined type and cannot continue parsing of the file");
+        }
+    }
+}
+
+}
+
+Poco::AutoPtr<Poco::XML::Document> YAMLParser::parse(const String& path)
+{
+    YAML::Node node_yml;
+    try
+    {
+        node_yml = YAML::LoadFile(path);
+    }
+    catch (const YAML::ParserException& e)
+    {
+        /// yaml-cpp cannot parse the file because its contents are incorrect
+        throw Exception(ErrorCodes::CANNOT_PARSE_YAML, "Unable to parse YAML configuration file {}", path, e.what());
+    }
+    catch (const YAML::BadFile&)
+    {
+        /// yaml-cpp cannot open the file even though it exists
+        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");
+    xml->appendChild(root_node);
+    processNode(node_yml, *root_node);
+    return xml;
+}
+
+}
+#endif
diff --git a/src/Common/Config/YAMLParser.h b/src/Common/Config/YAMLParser.h
new file mode 100644
index 00000000000..a716f3de9b1
--- /dev/null
+++ b/src/Common/Config/YAMLParser.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+    #include <Common/config.h>
+#endif
+
+#include <string>
+
+#include <Poco/DOM/Document.h>
+#include "Poco/DOM/AutoPtr.h"
+#include <common/logger_useful.h>
+
+#if USE_YAML_CPP
+
+namespace DB
+{
+
+/// Real YAML parser: loads yaml file into a YAML::Node
+class YAMLParserImpl
+{
+public:
+    static Poco::AutoPtr<Poco::XML::Document> parse(const String& path);
+};
+
+using YAMLParser = YAMLParserImpl;
+
+}
+
+#else
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_PARSE_YAML;
+}
+
+/// Fake YAML parser: throws an exception if we try to parse YAML configs in a build without yaml-cpp
+class DummyYAMLParser
+{
+public:
+    static Poco::AutoPtr<Poco::XML::Document> parse(const String& path)
+    {
+        Poco::AutoPtr<Poco::XML::Document> xml = new Poco::XML::Document;
+        throw Exception(ErrorCodes::CANNOT_PARSE_YAML, "Unable to parse YAML configuration file {} without usage of yaml-cpp library", path);
+        return xml;
+    }
+};
+
+using YAMLParser = DummyYAMLParser;
+
+}
+
+#endif
diff --git a/src/Common/Config/configReadClient.cpp b/src/Common/Config/configReadClient.cpp
index 61d8e507c05..8ce2a8b03e9 100644
--- a/src/Common/Config/configReadClient.cpp
+++ b/src/Common/Config/configReadClient.cpp
@@ -1,8 +1,10 @@
 #include "configReadClient.h"
 
 #include <Poco/Util/LayeredConfiguration.h>
-#include <Poco/File.h>
 #include "ConfigProcessor.h"
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -11,11 +13,11 @@ bool configReadClient(Poco::Util::LayeredConfiguration & config, const std::stri
     std::string config_path;
     if (config.has("config-file"))
         config_path = config.getString("config-file");
-    else if (Poco::File("./clickhouse-client.xml").exists())
+    else if (fs::exists("./clickhouse-client.xml"))
         config_path = "./clickhouse-client.xml";
-    else if (!home_path.empty() && Poco::File(home_path + "/.clickhouse-client/config.xml").exists())
+    else if (!home_path.empty() && fs::exists(home_path + "/.clickhouse-client/config.xml"))
         config_path = home_path + "/.clickhouse-client/config.xml";
-    else if (Poco::File("/etc/clickhouse-client/config.xml").exists())
+    else if (fs::exists("/etc/clickhouse-client/config.xml"))
         config_path = "/etc/clickhouse-client/config.xml";
 
     if (!config_path.empty())
diff --git a/src/Common/CounterInFile.h b/src/Common/CounterInFile.h
index 8cd4534d413..6326261234d 100644
--- a/src/Common/CounterInFile.h
+++ b/src/Common/CounterInFile.h
@@ -7,7 +7,6 @@
 #include <iostream>
 #include <mutex>
 
-#include <Poco/File.h>
 #include <Poco/Exception.h>
 
 #include <IO/ReadBufferFromFileDescriptor.h>
@@ -59,7 +58,7 @@ public:
 
         Int64 res = -1;
 
-        bool file_doesnt_exists = !Poco::File(path).exists();
+        bool file_doesnt_exists = !fs::exists(path);
         if (file_doesnt_exists && !create_if_need)
         {
             throw Poco::Exception("File " + path + " does not exist. "
@@ -138,7 +137,7 @@ public:
     // Not thread-safe and not synchronized between processes.
     void fixIfBroken(UInt64 value)
     {
-        bool file_exists = Poco::File(path).exists();
+        bool file_exists = fs::exists(path);
 
         int fd = ::open(path.c_str(), O_RDWR | O_CREAT | O_CLOEXEC, 0666);
         if (-1 == fd)
diff --git a/src/Common/CurrentMemoryTracker.cpp b/src/Common/CurrentMemoryTracker.cpp
index 737f2566efc..d38a5a9c70c 100644
--- a/src/Common/CurrentMemoryTracker.cpp
+++ b/src/Common/CurrentMemoryTracker.cpp
@@ -27,30 +27,45 @@ namespace CurrentMemoryTracker
 
 using DB::current_thread;
 
-void alloc(Int64 size)
+namespace
 {
-    if (auto * memory_tracker = getMemoryTracker())
+    void allocImpl(Int64 size, bool throw_if_memory_exceeded)
     {
-        if (current_thread)
+        if (auto * memory_tracker = getMemoryTracker())
         {
-            current_thread->untracked_memory += size;
-            if (current_thread->untracked_memory > current_thread->untracked_memory_limit)
+            if (current_thread)
             {
-                /// Zero untracked before track. If tracker throws out-of-limit we would be able to alloc up to untracked_memory_limit bytes
-                /// more. It could be useful to enlarge Exception message in rethrow logic.
-                Int64 tmp = current_thread->untracked_memory;
-                current_thread->untracked_memory = 0;
-                memory_tracker->alloc(tmp);
+                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
+                    /// more. It could be useful to enlarge Exception message in rethrow logic.
+                    Int64 tmp = current_thread->untracked_memory;
+                    current_thread->untracked_memory = 0;
+                    memory_tracker->allocImpl(tmp, throw_if_memory_exceeded);
+                }
+            }
+            /// total_memory_tracker only, ignore untracked_memory
+            else
+            {
+                memory_tracker->allocImpl(size, throw_if_memory_exceeded);
             }
         }
-        /// total_memory_tracker only, ignore untracked_memory
-        else
-        {
-            memory_tracker->alloc(size);
-        }
     }
 }
 
+void alloc(Int64 size)
+{
+    bool throw_if_memory_exceeded = true;
+    allocImpl(size, throw_if_memory_exceeded);
+}
+
+void allocNoThrow(Int64 size)
+{
+    bool throw_if_memory_exceeded = false;
+    allocImpl(size, throw_if_memory_exceeded);
+}
+
 void realloc(Int64 old_size, Int64 new_size)
 {
     Int64 addition = new_size - old_size;
diff --git a/src/Common/CurrentMemoryTracker.h b/src/Common/CurrentMemoryTracker.h
index 3a9e8990d66..5090b7c3687 100644
--- a/src/Common/CurrentMemoryTracker.h
+++ b/src/Common/CurrentMemoryTracker.h
@@ -6,6 +6,7 @@
 namespace CurrentMemoryTracker
 {
     void alloc(Int64 size);
+    void allocNoThrow(Int64 size);
     void realloc(Int64 old_size, Int64 new_size);
     void free(Int64 size);
 }
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index abbb3c71d72..1e482361f85 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -55,6 +55,7 @@
     M(LocalThread, "Number of threads in local thread pools. The threads in local thread pools are taken from the global thread pool.") \
     M(LocalThreadActive, "Number of threads in local thread pools running a task.") \
     M(DistributedFilesToInsert, "Number of pending files to process for asynchronous insertion into Distributed tables. Number of files for every shard is summed.") \
+    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(PartsTemporary, "The part is generating now, it is not in data_parts list.") \
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index 7ab57ea7fab..c6ac7e9933a 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+#include <Common/ThreadStatus.h>
+#include <common/StringRef.h>
+
 #include <memory>
 #include <string>
 
-#include <common/StringRef.h>
-#include <Common/ThreadStatus.h>
-
 
 namespace ProfileEvents
 {
@@ -18,7 +19,6 @@ class MemoryTracker;
 namespace DB
 {
 
-class Context;
 class QueryStatus;
 struct Progress;
 class InternalTextLogsQueue;
@@ -87,7 +87,7 @@ public:
     /// Initializes query with current thread as master thread in constructor, and detaches it in destructor
     struct QueryScope
     {
-        explicit QueryScope(Context & query_context);
+        explicit QueryScope(ContextMutablePtr query_context);
         ~QueryScope();
 
         void logPeakMemoryUsage();
@@ -99,7 +99,7 @@ private:
 
     /// Sets query_context for current thread group
     /// Can by used only through QueryScope
-    static void attachQueryContext(Context & query_context);
+    static void attachQueryContext(ContextPtr query_context);
 };
 
 }
diff --git a/src/Common/DNSResolver.cpp b/src/Common/DNSResolver.cpp
index f54d3e72df5..8b006bc550d 100644
--- a/src/Common/DNSResolver.cpp
+++ b/src/Common/DNSResolver.cpp
@@ -87,9 +87,20 @@ static DNSResolver::IPAddresses resolveIPAddressImpl(const std::string & host)
 {
     Poco::Net::IPAddress ip;
 
-    /// NOTE: Poco::Net::DNS::resolveOne(host) doesn't work for IP addresses like 127.0.0.2
-    if (Poco::Net::IPAddress::tryParse(host, ip))
-        return DNSResolver::IPAddresses(1, ip);
+    /// NOTE:
+    /// - Poco::Net::DNS::resolveOne(host) doesn't work for IP addresses like 127.0.0.2
+    /// - Poco::Net::IPAddress::tryParse() expect hex string for IPv6 (w/o brackets)
+    if (host.starts_with('['))
+    {
+        assert(host.ends_with(']'));
+        if (Poco::Net::IPAddress::tryParse(host.substr(1, host.size() - 2), ip))
+            return DNSResolver::IPAddresses(1, ip);
+    }
+    else
+    {
+        if (Poco::Net::IPAddress::tryParse(host, ip))
+            return DNSResolver::IPAddresses(1, ip);
+    }
 
     /// Family: AF_UNSPEC
     /// AI_ALL is required for checking if client is allowed to connect from an address
diff --git a/src/Common/Dwarf.cpp b/src/Common/Dwarf.cpp
index d0b3244dac2..18e9315d5c3 100644
--- a/src/Common/Dwarf.cpp
+++ b/src/Common/Dwarf.cpp
@@ -804,7 +804,7 @@ bool Dwarf::findLocation(
         findSubProgramDieForAddress(cu, die, address, base_addr_cu, subprogram);
 
         // Subprogram is the DIE of caller function.
-        if (check_inline && subprogram.abbr.has_children)
+        if (/*check_inline &&*/ subprogram.abbr.has_children)
         {
             // Use an extra location and get its call file and call line, so that
             // they can be used for the second last location when we don't have
@@ -832,7 +832,7 @@ bool Dwarf::findLocation(
                 // file+line of the non-inlined outer function making the call.
                 // locationInfo.name is already set by the caller by looking up the
                 // non-inlined function @address belongs to.
-                info.has_file_and_line = true;
+                info.has_file_and_line = true; //-V1048
                 info.file = call_locations[0].file;
                 info.line = call_locations[0].line;
 
diff --git a/src/Common/Dwarf.h b/src/Common/Dwarf.h
index 9ea940c3380..4712daad28c 100644
--- a/src/Common/Dwarf.h
+++ b/src/Common/Dwarf.h
@@ -121,7 +121,7 @@ public:
     struct CallLocation
     {
         Path file = {};
-        uint64_t line;
+        uint64_t line = 0;
         std::string_view name;
     };
 
@@ -202,8 +202,8 @@ private:
     // Abbreviation for a Debugging Information Entry.
     struct DIEAbbreviation
     {
-        uint64_t code;
-        uint64_t tag;
+        uint64_t code = 0;
+        uint64_t tag = 0;
         bool has_children = false;
 
         std::string_view attributes;
diff --git a/src/Common/Elf.cpp b/src/Common/Elf.cpp
index ee78c988f69..9e312dc79f2 100644
--- a/src/Common/Elf.cpp
+++ b/src/Common/Elf.cpp
@@ -129,7 +129,12 @@ String Elf::getBuildID() const
     return {};
 }
 
-
+#if defined(OS_SUNOS)
+String Elf::getBuildID(const char * nhdr_pos, size_t size)
+{
+    return {};
+}
+#else
 String Elf::getBuildID(const char * nhdr_pos, size_t size)
 {
     const char * nhdr_end = nhdr_pos + size;
@@ -149,6 +154,7 @@ String Elf::getBuildID(const char * nhdr_pos, size_t size)
 
     return {};
 }
+#endif // OS_SUNOS
 
 
 String Elf::getBinaryHash() const
diff --git a/src/Common/Epoll.cpp b/src/Common/Epoll.cpp
index a17cce8545c..454c1a115f7 100644
--- a/src/Common/Epoll.cpp
+++ b/src/Common/Epoll.cpp
@@ -60,7 +60,7 @@ void Epoll::remove(int fd)
 size_t Epoll::getManyReady(int max_events, epoll_event * events_out, bool blocking) const
 {
     if (events_count == 0)
-        throw Exception("There is no events in epoll", ErrorCodes::LOGICAL_ERROR);
+        throw Exception("There are no events in epoll", ErrorCodes::LOGICAL_ERROR);
 
     int ready_size;
     int timeout = blocking ? -1 : 0;
diff --git a/src/Common/Epoll.h b/src/Common/Epoll.h
index 5d9aef9ef66..032f4045033 100644
--- a/src/Common/Epoll.h
+++ b/src/Common/Epoll.h
@@ -9,7 +9,7 @@
 namespace DB
 {
 
-using AsyncCallback = std::function<void(int, const Poco::Timespan &, const std::string &)>;
+using AsyncCallback = std::function<void(int, Poco::Timespan, const std::string &)>;
 
 class Epoll
 {
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index 0f85ad5c792..d840830bf28 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -548,6 +548,12 @@
     M(578, INVALID_FORMAT_INSERT_QUERY_WITH_DATA) \
     M(579, INCORRECT_PART_TYPE) \
     M(580, CANNOT_SET_ROUNDING_MODE) \
+    M(581, TOO_LARGE_DISTRIBUTED_DEPTH) \
+    M(582, NO_SUCH_PROJECTION_IN_TABLE) \
+    M(583, ILLEGAL_PROJECTION) \
+    M(584, PROJECTION_NOT_USED) \
+    M(585, CANNOT_PARSE_YAML) \
+    M(586, CANNOT_CREATE_FILE) \
     \
     M(998, POSTGRESQL_CONNECTION_FAILURE) \
     M(999, KEEPER_EXCEPTION) \
@@ -590,7 +596,7 @@ namespace ErrorCodes
 
     void increment(ErrorCode error_code, bool remote, const std::string & message, const FramePointers & trace)
     {
-        if (error_code >= end())
+        if (error_code < 0 || error_code >= end())
         {
             /// For everything outside the range, use END.
             /// (end() is the pointer pass the end, while END is the last value that has an element in values array).
diff --git a/src/Common/ErrorCodes.h b/src/Common/ErrorCodes.h
index ffd0b8b8619..cefd77df868 100644
--- a/src/Common/ErrorCodes.h
+++ b/src/Common/ErrorCodes.h
@@ -29,7 +29,7 @@ namespace ErrorCodes
     struct Error
     {
         /// Number of times Exception with this ErrorCode had been throw.
-        Value count;
+        Value count = 0;
         /// Time of the last error.
         UInt64 error_time_ms = 0;
         /// Message for the last error.
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index e8a98021588..e98cd3c3046 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -21,6 +21,8 @@
 #    include <Common/config_version.h>
 #endif
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
@@ -138,20 +140,8 @@ void throwFromErrnoWithPath(const std::string & s, const std::string & path, int
     throw ErrnoException(s + ", " + errnoToString(code, the_errno), code, the_errno, path);
 }
 
-void tryLogCurrentException(const char * log_name, const std::string & start_of_message)
+static void tryLogCurrentExceptionImpl(Poco::Logger * logger, const std::string & start_of_message)
 {
-    tryLogCurrentException(&Poco::Logger::get(log_name), start_of_message);
-}
-
-void tryLogCurrentException(Poco::Logger * logger, const std::string & start_of_message)
-{
-    /// Under high memory pressure, any new allocation will definitelly lead
-    /// to MEMORY_LIMIT_EXCEEDED exception.
-    ///
-    /// And in this case the exception will not be logged, so let's block the
-    /// MemoryTracker until the exception will be logged.
-    MemoryTracker::LockExceptionInThread lock_memory_tracker;
-
     try
     {
         if (start_of_message.empty())
@@ -164,7 +154,32 @@ void tryLogCurrentException(Poco::Logger * logger, const std::string & start_of_
     }
 }
 
-static void getNoSpaceLeftInfoMessage(std::filesystem::path path, std::string & msg)
+void tryLogCurrentException(const char * log_name, const std::string & start_of_message)
+{
+    /// Under high memory pressure, any new allocation will definitelly lead
+    /// to MEMORY_LIMIT_EXCEEDED exception.
+    ///
+    /// And in this case the exception will not be logged, so let's block the
+    /// MemoryTracker until the exception will be logged.
+    MemoryTracker::LockExceptionInThread lock_memory_tracker(VariableContext::Global);
+
+    /// Poco::Logger::get can allocate memory too
+    tryLogCurrentExceptionImpl(&Poco::Logger::get(log_name), start_of_message);
+}
+
+void tryLogCurrentException(Poco::Logger * logger, const std::string & start_of_message)
+{
+    /// Under high memory pressure, any new allocation will definitelly lead
+    /// to MEMORY_LIMIT_EXCEEDED exception.
+    ///
+    /// And in this case the exception will not be logged, so let's block the
+    /// MemoryTracker until the exception will be logged.
+    MemoryTracker::LockExceptionInThread lock_memory_tracker(VariableContext::Global);
+
+    tryLogCurrentExceptionImpl(logger, start_of_message);
+}
+
+static void getNoSpaceLeftInfoMessage(std::filesystem::path path, String & msg)
 {
     path = std::filesystem::absolute(path);
     /// It's possible to get ENOSPC for non existent file (e.g. if there are no free inodes and creat() fails)
@@ -251,22 +266,12 @@ static std::string getExtraExceptionInfo(const std::exception & e)
     String msg;
     try
     {
-        if (const auto * file_exception = dynamic_cast<const Poco::FileException *>(&e))
+        if (const auto * file_exception = dynamic_cast<const fs::filesystem_error *>(&e))
         {
-            if (file_exception->code() == ENOSPC)
-            {
-                /// See Poco::FileImpl::handleLastErrorImpl(...)
-                constexpr const char * expected_error_message = "no space left on device: ";
-                if (startsWith(file_exception->message(), expected_error_message))
-                {
-                    String path = file_exception->message().substr(strlen(expected_error_message));
-                    getNoSpaceLeftInfoMessage(path, msg);
-                }
-                else
-                {
-                    msg += "\nCannot print extra info for Poco::Exception";
-                }
-            }
+            if (file_exception->code() == std::errc::no_space_on_device)
+                getNoSpaceLeftInfoMessage(file_exception->path1(), msg);
+            else
+                msg += "\nCannot print extra info for Poco::Exception";
         }
         else if (const auto * errno_exception = dynamic_cast<const DB::ErrnoException *>(&e))
         {
diff --git a/src/Common/FieldVisitors.cpp b/src/Common/FieldVisitors.cpp
index 62f04816032..b87152da7e7 100644
--- a/src/Common/FieldVisitors.cpp
+++ b/src/Common/FieldVisitors.cpp
@@ -1,4 +1,3 @@
-#include <Core/UUID.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
@@ -27,7 +26,7 @@ template <typename T>
 static inline String formatQuotedWithPrefix(T x, const char * prefix)
 {
     WriteBufferFromOwnString wb;
-    wb.write(prefix, strlen(prefix));
+    writeCString(prefix, wb);
     writeQuoted(x, wb);
     return wb.str();
 }
@@ -48,10 +47,11 @@ String FieldVisitorDump::operator() (const DecimalField<Decimal32> & x) const {
 String FieldVisitorDump::operator() (const DecimalField<Decimal64> & x) const { return formatQuotedWithPrefix(x, "Decimal64_"); }
 String FieldVisitorDump::operator() (const DecimalField<Decimal128> & x) const { return formatQuotedWithPrefix(x, "Decimal128_"); }
 String FieldVisitorDump::operator() (const DecimalField<Decimal256> & x) const { return formatQuotedWithPrefix(x, "Decimal256_"); }
+String FieldVisitorDump::operator() (const UInt128 & x) const { return formatQuotedWithPrefix(x, "UInt128_"); }
 String FieldVisitorDump::operator() (const UInt256 & x) const { return formatQuotedWithPrefix(x, "UInt256_"); }
-String FieldVisitorDump::operator() (const Int256 & x) const { return formatQuotedWithPrefix(x, "Int256_"); }
 String FieldVisitorDump::operator() (const Int128 & x) const { return formatQuotedWithPrefix(x, "Int128_"); }
-String FieldVisitorDump::operator() (const UInt128 & x) const { return formatQuotedWithPrefix(UUID(x), "UUID_"); }
+String FieldVisitorDump::operator() (const Int256 & x) const { return formatQuotedWithPrefix(x, "Int256_"); }
+String FieldVisitorDump::operator() (const UUID & x) const { return formatQuotedWithPrefix(x, "UUID_"); }
 
 
 String FieldVisitorDump::operator() (const String & x) const
@@ -152,13 +152,11 @@ String FieldVisitorToString::operator() (const DecimalField<Decimal64> & x) cons
 String FieldVisitorToString::operator() (const DecimalField<Decimal128> & x) const { return formatQuoted(x); }
 String FieldVisitorToString::operator() (const DecimalField<Decimal256> & x) const { return formatQuoted(x); }
 String FieldVisitorToString::operator() (const Int128 & x) const { return formatQuoted(x); }
-String FieldVisitorToString::operator() (const UInt128 & x) const { return formatQuoted(UUID(x)); }
-String FieldVisitorToString::operator() (const AggregateFunctionStateData & x) const
-{
-    return formatQuoted(x.data);
-}
+String FieldVisitorToString::operator() (const UInt128 & x) const { return formatQuoted(x); }
 String FieldVisitorToString::operator() (const UInt256 & x) const { return formatQuoted(x); }
 String FieldVisitorToString::operator() (const Int256 & x) const { return formatQuoted(x); }
+String FieldVisitorToString::operator() (const UUID & x) const { return formatQuoted(x); }
+String FieldVisitorToString::operator() (const AggregateFunctionStateData & x) const { return formatQuoted(x.data); }
 
 String FieldVisitorToString::operator() (const Array & x) const
 {
@@ -228,6 +226,7 @@ void FieldVisitorWriteBinary::operator() (const UInt128 & x, WriteBuffer & buf)
 void FieldVisitorWriteBinary::operator() (const Int128 & x, WriteBuffer & buf) const { DB::writeVarInt(x, buf); }
 void FieldVisitorWriteBinary::operator() (const UInt256 & x, WriteBuffer & buf) const { DB::writeBinary(x, buf); }
 void FieldVisitorWriteBinary::operator() (const Int256 & x, WriteBuffer & buf) const { DB::writeBinary(x, buf); }
+void FieldVisitorWriteBinary::operator() (const UUID & x, WriteBuffer & buf) const { DB::writeBinary(x, buf); }
 void FieldVisitorWriteBinary::operator() (const DecimalField<Decimal32> & x, WriteBuffer & buf) const { DB::writeBinary(x.getValue(), buf); }
 void FieldVisitorWriteBinary::operator() (const DecimalField<Decimal64> & x, WriteBuffer & buf) const { DB::writeBinary(x.getValue(), buf); }
 void FieldVisitorWriteBinary::operator() (const DecimalField<Decimal128> & x, WriteBuffer & buf) const { DB::writeBinary(x.getValue(), buf); }
@@ -315,6 +314,13 @@ void FieldVisitorHash::operator() (const Int128 & x) const
     hash.update(x);
 }
 
+void FieldVisitorHash::operator() (const UUID & x) const
+{
+    UInt8 type = Field::Types::UUID;
+    hash.update(type);
+    hash.update(x);
+}
+
 void FieldVisitorHash::operator() (const Float64 & x) const
 {
     UInt8 type = Field::Types::Float64;
diff --git a/src/Common/FieldVisitors.h b/src/Common/FieldVisitors.h
index 954cd004e84..0384be39494 100644
--- a/src/Common/FieldVisitors.h
+++ b/src/Common/FieldVisitors.h
@@ -19,14 +19,6 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-// Just dont mess with it. If the redundant redeclaration is removed then ReaderHelpers.h should be included.
-// This leads to Arena.h inclusion which has a problem with ASAN stuff included properly and messing macro definition
-// which intefrers with... You dont want to know, really.
-UInt128 stringToUUID(const String & str);
-#pragma GCC diagnostic pop
-
 
 /** StaticVisitor (and its descendants) - class with overloaded operator() for all types of fields.
   * You could call visitor for field using function 'applyVisitor'.
@@ -71,8 +63,11 @@ public:
     String operator() (const Null & x) const;
     String operator() (const UInt64 & x) const;
     String operator() (const UInt128 & x) const;
+    String operator() (const UInt256 & x) const;
     String operator() (const Int64 & x) const;
     String operator() (const Int128 & x) const;
+    String operator() (const Int256 & x) const;
+    String operator() (const UUID & x) const;
     String operator() (const Float64 & x) const;
     String operator() (const String & x) const;
     String operator() (const Array & x) const;
@@ -83,9 +78,6 @@ public:
     String operator() (const DecimalField<Decimal128> & x) const;
     String operator() (const DecimalField<Decimal256> & x) const;
     String operator() (const AggregateFunctionStateData & x) const;
-
-    String operator() (const UInt256 & x) const;
-    String operator() (const Int256 & x) const;
 };
 
 
@@ -95,8 +87,11 @@ public:
     void operator() (const Null & 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;
     void operator() (const Int64 & x, WriteBuffer & buf) const;
     void operator() (const Int128 & x, WriteBuffer & buf) const;
+    void operator() (const Int256 & x, WriteBuffer & buf) const;
+    void operator() (const UUID & x, WriteBuffer & buf) const;
     void operator() (const Float64 & x, WriteBuffer & buf) const;
     void operator() (const String & x, WriteBuffer & buf) const;
     void operator() (const Array & x, WriteBuffer & buf) const;
@@ -107,9 +102,6 @@ public:
     void operator() (const DecimalField<Decimal128> & x, WriteBuffer & buf) const;
     void operator() (const DecimalField<Decimal256> & x, WriteBuffer & buf) const;
     void operator() (const AggregateFunctionStateData & x, WriteBuffer & buf) const;
-
-    void operator() (const UInt256 & x, WriteBuffer & buf) const;
-    void operator() (const Int256 & x, WriteBuffer & buf) const;
 };
 
 
@@ -120,8 +112,11 @@ public:
     String operator() (const Null & x) const;
     String operator() (const UInt64 & x) const;
     String operator() (const UInt128 & x) const;
+    String operator() (const UInt256 & x) const;
     String operator() (const Int64 & x) const;
     String operator() (const Int128 & x) const;
+    String operator() (const Int256 & x) const;
+    String operator() (const UUID & x) const;
     String operator() (const Float64 & x) const;
     String operator() (const String & x) const;
     String operator() (const Array & x) const;
@@ -132,9 +127,6 @@ public:
     String operator() (const DecimalField<Decimal128> & x) const;
     String operator() (const DecimalField<Decimal256> & x) const;
     String operator() (const AggregateFunctionStateData & x) const;
-
-    String operator() (const UInt256 & x) const;
-    String operator() (const Int256 & x) const;
 };
 
 
@@ -171,6 +163,7 @@ public:
     T operator() (const UInt64 & x) const { return T(x); }
     T operator() (const Int64 & x) const { return T(x); }
     T operator() (const Int128 & x) const { return T(x); }
+    T operator() (const UUID & x) const { return T(x.toUnderType()); }
 
     T operator() (const Float64 & x) const
     {
@@ -185,12 +178,20 @@ public:
                 /// Conversion of infinite values to integer is undefined.
                 throw Exception("Cannot convert infinite value to integer type", ErrorCodes::CANNOT_CONVERT_TYPE);
             }
+            else if (x > std::numeric_limits<T>::max() || x < std::numeric_limits<T>::lowest())
+            {
+                throw Exception("Cannot convert out of range floating point value to integer type", ErrorCodes::CANNOT_CONVERT_TYPE);
+            }
         }
 
         if constexpr (std::is_same_v<Decimal256, T>)
+        {
             return Int256(x);
+        }
         else
+        {
             return T(x);
+        }
     }
 
     T operator() (const UInt128 &) const
@@ -251,8 +252,11 @@ public:
     void operator() (const Null & x) const;
     void operator() (const UInt64 & x) const;
     void operator() (const UInt128 & x) const;
+    void operator() (const UInt256 & x) const;
     void operator() (const Int64 & x) const;
     void operator() (const Int128 & x) const;
+    void operator() (const Int256 & x) const;
+    void operator() (const UUID & x) const;
     void operator() (const Float64 & x) const;
     void operator() (const String & x) const;
     void operator() (const Array & x) const;
@@ -263,9 +267,6 @@ public:
     void operator() (const DecimalField<Decimal128> & x) const;
     void operator() (const DecimalField<Decimal256> & x) const;
     void operator() (const AggregateFunctionStateData & x) const;
-
-    void operator() (const UInt256 & x) const;
-    void operator() (const Int256 & x) const;
 };
 
 
@@ -301,7 +302,7 @@ public:
     bool operator() (Array &) const { throw Exception("Cannot sum Arrays", ErrorCodes::LOGICAL_ERROR); }
     bool operator() (Tuple &) const { throw Exception("Cannot sum Tuples", ErrorCodes::LOGICAL_ERROR); }
     bool operator() (Map &) const { throw Exception("Cannot sum Maps", ErrorCodes::LOGICAL_ERROR); }
-    bool operator() (UInt128 &) const { throw Exception("Cannot sum UUIDs", ErrorCodes::LOGICAL_ERROR); }
+    bool operator() (UUID &) const { throw Exception("Cannot sum UUIDs", ErrorCodes::LOGICAL_ERROR); }
     bool operator() (AggregateFunctionStateData &) const { throw Exception("Cannot sum AggregateFunctionStates", ErrorCodes::LOGICAL_ERROR); }
 
     bool operator() (Int128 & x) const
diff --git a/src/Common/FieldVisitorsAccurateComparison.h b/src/Common/FieldVisitorsAccurateComparison.h
index 84099eafb0f..cf3cbb208dc 100644
--- a/src/Common/FieldVisitorsAccurateComparison.h
+++ b/src/Common/FieldVisitorsAccurateComparison.h
@@ -36,41 +36,30 @@ public:
             if constexpr (std::is_arithmetic_v<T> && std::is_arithmetic_v<U>)
                 return accurate::equalsOp(l, r);
 
+            /// TODO This is wrong (does not respect scale).
             if constexpr (isDecimalField<T>() && isDecimalField<U>())
                 return l == r;
 
             if constexpr (isDecimalField<T>() && std::is_arithmetic_v<U>)
-                return l == DecimalField<Decimal128>(r, 0);
+                return l == DecimalField<Decimal256>(Decimal256(r), 0);
 
             if constexpr (std::is_arithmetic_v<T> && isDecimalField<U>())
-                return DecimalField<Decimal128>(l, 0) == r;
+                return DecimalField<Decimal256>(Decimal256(l), 0) == r;
 
-            if constexpr (std::is_same_v<T, String>)
+            if constexpr (std::is_same_v<T, String> && std::is_arithmetic_v<U>)
             {
-                if constexpr (std::is_same_v<U, UInt128>)
-                    return stringToUUID(l) == r;
-
-                if constexpr (std::is_arithmetic_v<U>)
-                {
-                    ReadBufferFromString in(l);
-                    U parsed;
-                    readText(parsed, in);
-                    return operator()(parsed, r);
-                }
+                ReadBufferFromString in(l);
+                U parsed;
+                readText(parsed, in);
+                return operator()(parsed, r);
             }
 
-            if constexpr (std::is_same_v<U, String>)
+            if constexpr (std::is_same_v<U, String> && std::is_arithmetic_v<T>)
             {
-                if constexpr (std::is_same_v<T, UInt128>)
-                    return l == stringToUUID(r);
-
-                if constexpr (std::is_arithmetic_v<T>)
-                {
-                    ReadBufferFromString in(r);
-                    T parsed;
-                    readText(parsed, in);
-                    return operator()(l, parsed);
-                }
+                ReadBufferFromString in(r);
+                T parsed;
+                readText(parsed, in);
+                return operator()(l, parsed);
             }
         }
 
@@ -96,41 +85,30 @@ public:
             if constexpr (std::is_arithmetic_v<T> && std::is_arithmetic_v<U>)
                 return accurate::lessOp(l, r);
 
+            /// TODO This is wrong (does not respect scale).
             if constexpr (isDecimalField<T>() && isDecimalField<U>())
                 return l < r;
 
             if constexpr (isDecimalField<T>() && std::is_arithmetic_v<U>)
-                return l < DecimalField<Decimal128>(r, 0);
+                return l < DecimalField<Decimal256>(Decimal256(r), 0);
 
             if constexpr (std::is_arithmetic_v<T> && isDecimalField<U>())
-                return DecimalField<Decimal128>(l, 0) < r;
+                return DecimalField<Decimal256>(Decimal256(l), 0) < r;
 
-            if constexpr (std::is_same_v<T, String>)
+            if constexpr (std::is_same_v<T, String> && std::is_arithmetic_v<U>)
             {
-                if constexpr (std::is_same_v<U, UInt128>)
-                    return stringToUUID(l) < r;
-
-                if constexpr (std::is_arithmetic_v<U>)
-                {
-                    ReadBufferFromString in(l);
-                    U parsed;
-                    readText(parsed, in);
-                    return operator()(parsed, r);
-                }
+                ReadBufferFromString in(l);
+                U parsed;
+                readText(parsed, in);
+                return operator()(parsed, r);
             }
 
-            if constexpr (std::is_same_v<U, String>)
+            if constexpr (std::is_same_v<U, String> && std::is_arithmetic_v<T>)
             {
-                if constexpr (std::is_same_v<T, UInt128>)
-                    return l < stringToUUID(r);
-
-                if constexpr (std::is_arithmetic_v<T>)
-                {
-                    ReadBufferFromString in(r);
-                    T parsed;
-                    readText(parsed, in);
-                    return operator()(l, parsed);
-                }
+                ReadBufferFromString in(r);
+                T parsed;
+                readText(parsed, in);
+                return operator()(l, parsed);
             }
         }
 
diff --git a/src/Common/FileChecker.cpp b/src/Common/FileChecker.cpp
index e7fcc8cadb7..173c4bd8a3a 100644
--- a/src/Common/FileChecker.cpp
+++ b/src/Common/FileChecker.cpp
@@ -21,7 +21,15 @@ namespace ErrorCodes
 FileChecker::FileChecker(DiskPtr disk_, const String & file_info_path_) : disk(std::move(disk_))
 {
     setPath(file_info_path_);
-    load();
+    try
+    {
+        load();
+    }
+    catch (DB::Exception & e)
+    {
+        e.addMessage("Error loading file {}", files_info_path);
+        throw;
+    }
 }
 
 void FileChecker::setPath(const String & file_info_path_)
diff --git a/src/Common/FileUpdatesTracker.h b/src/Common/FileUpdatesTracker.h
index 0914c75693c..9fe37c2a75d 100644
--- a/src/Common/FileUpdatesTracker.h
+++ b/src/Common/FileUpdatesTracker.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <Poco/File.h>
 #include <Poco/Timestamp.h>
-
 #include <string>
+#include <filesystem>
+#include <Common/filesystemHelpers.h>
 
+namespace fs = std::filesystem;
 
 class FileUpdatesTracker
 {
@@ -31,6 +32,6 @@ public:
 private:
     Poco::Timestamp getLastModificationTime() const
     {
-        return Poco::File(path).getLastModified();
+        return FS::getModificationTimestamp(path);
     }
 };
diff --git a/src/Common/HashTable/ClearableHashSet.h b/src/Common/HashTable/ClearableHashSet.h
index dc057afacd8..7da0469a99a 100644
--- a/src/Common/HashTable/ClearableHashSet.h
+++ b/src/Common/HashTable/ClearableHashSet.h
@@ -44,7 +44,7 @@ struct ClearableHashTableCell : public BaseCell
     /// Do I need to store the zero key separately (that is, can a zero key be inserted into the hash table).
     static constexpr bool need_zero_value_storage = false;
 
-    ClearableHashTableCell() {}
+    ClearableHashTableCell() {} //-V730
     ClearableHashTableCell(const Key & key_, const State & state) : BaseCell(key_, state), version(state.version) {}
 };
 
diff --git a/src/Common/HashTable/FixedClearableHashSet.h b/src/Common/HashTable/FixedClearableHashSet.h
index 19d4669831f..56c7afd250e 100644
--- a/src/Common/HashTable/FixedClearableHashSet.h
+++ b/src/Common/HashTable/FixedClearableHashSet.h
@@ -13,7 +13,7 @@ struct FixedClearableHashTableCell
     using mapped_type = VoidMapped;
     UInt32 version;
 
-    FixedClearableHashTableCell() {}
+    FixedClearableHashTableCell() {} //-V730
     FixedClearableHashTableCell(const Key &, const State & state) : version(state.version) {}
 
     const VoidKey getKey() const { return {}; }
diff --git a/src/Common/HashTable/FixedHashMap.h b/src/Common/HashTable/FixedHashMap.h
index 9fc331e09e4..37bd81c8b4f 100644
--- a/src/Common/HashTable/FixedHashMap.h
+++ b/src/Common/HashTable/FixedHashMap.h
@@ -16,7 +16,7 @@ struct FixedHashMapCell
     bool full;
     Mapped mapped;
 
-    FixedHashMapCell() {}
+    FixedHashMapCell() {} //-V730
     FixedHashMapCell(const Key &, const State &) : full(true) {}
     FixedHashMapCell(const value_type & value_, const State &) : full(true), mapped(value_.second) {}
 
@@ -31,7 +31,7 @@ struct FixedHashMapCell
     ///  Note that we have to assemble a continuous layout for the value_type on each call of getValue().
     struct CellExt
     {
-        CellExt() {}
+        CellExt() {} //-V730
         CellExt(Key && key_, const FixedHashMapCell * ptr_) : key(key_), ptr(const_cast<FixedHashMapCell *>(ptr_)) {}
         void update(Key && key_, const FixedHashMapCell * ptr_)
         {
@@ -76,7 +76,7 @@ struct FixedHashMapImplicitZeroCell
     ///  Note that we have to assemble a continuous layout for the value_type on each call of getValue().
     struct CellExt
     {
-        CellExt() {}
+        CellExt() {} //-V730
         CellExt(Key && key_, const FixedHashMapImplicitZeroCell * ptr_) : key(key_), ptr(const_cast<FixedHashMapImplicitZeroCell *>(ptr_)) {}
         void update(Key && key_, const FixedHashMapImplicitZeroCell * ptr_)
         {
diff --git a/src/Common/HashTable/FixedHashTable.h b/src/Common/HashTable/FixedHashTable.h
index e4715a6c1da..c1d2c8fe6ee 100644
--- a/src/Common/HashTable/FixedHashTable.h
+++ b/src/Common/HashTable/FixedHashTable.h
@@ -19,7 +19,7 @@ struct FixedHashTableCell
     using mapped_type = VoidMapped;
     bool full;
 
-    FixedHashTableCell() {}
+    FixedHashTableCell() {} //-V730
     FixedHashTableCell(const Key &, const State &) : full(true) {}
 
     const VoidKey getKey() const { return {}; }
@@ -267,7 +267,7 @@ public:
         DB::ReadBuffer & in;
         Cell cell;
         size_t read_count = 0;
-        size_t size;
+        size_t size = 0;
         bool is_eof = false;
         bool is_initialized = false;
     };
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 0abe96497bd..84e514c1375 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -1,9 +1,10 @@
 #pragma once
 
+#include <city.h>
+#include <Core/Types.h>
 #include <common/types.h>
 #include <common/unaligned.h>
 #include <common/StringRef.h>
-#include <Common/UInt128.h>
 
 #include <type_traits>
 
@@ -91,49 +92,38 @@ inline UInt32 updateWeakHash32(const DB::UInt8 * pos, size_t size, DB::UInt32 up
 {
     if (size < 8)
     {
-        DB::UInt64 value = 0;
-        auto * value_ptr = reinterpret_cast<unsigned char *>(&value);
+        UInt64 value = 0;
 
-        typedef __attribute__((__aligned__(1))) uint16_t uint16_unaligned_t;
-        typedef __attribute__((__aligned__(1))) uint32_t uint32_unaligned_t;
-
-        /// Adopted code from FastMemcpy.h (memcpy_tiny)
         switch (size)
         {
             case 0:
                 break;
             case 1:
-                value_ptr[0] = pos[0];
+                __builtin_memcpy(&value, pos, 1);
                 break;
             case 2:
-                *reinterpret_cast<uint16_t *>(value_ptr) = *reinterpret_cast<const uint16_unaligned_t *>(pos);
+                __builtin_memcpy(&value, pos, 2);
                 break;
             case 3:
-                *reinterpret_cast<uint16_t *>(value_ptr) = *reinterpret_cast<const uint16_unaligned_t *>(pos);
-                value_ptr[2] = pos[2];
+                __builtin_memcpy(&value, pos, 3);
                 break;
             case 4:
-                *reinterpret_cast<uint32_t *>(value_ptr) = *reinterpret_cast<const uint32_unaligned_t *>(pos);
+                __builtin_memcpy(&value, pos, 4);
                 break;
             case 5:
-                *reinterpret_cast<uint32_t *>(value_ptr) = *reinterpret_cast<const uint32_unaligned_t *>(pos);
-                value_ptr[4] = pos[4];
+                __builtin_memcpy(&value, pos, 5);
                 break;
             case 6:
-                *reinterpret_cast<uint32_t *>(value_ptr) = *reinterpret_cast<const uint32_unaligned_t *>(pos);
-                *reinterpret_cast<uint16_unaligned_t *>(value_ptr + 4) =
-                        *reinterpret_cast<const uint16_unaligned_t *>(pos + 4);
+                __builtin_memcpy(&value, pos, 6);
                 break;
             case 7:
-                *reinterpret_cast<uint32_t *>(value_ptr) = *reinterpret_cast<const uint32_unaligned_t *>(pos);
-                *reinterpret_cast<uint32_unaligned_t *>(value_ptr + 3) =
-                        *reinterpret_cast<const uint32_unaligned_t *>(pos + 3);
+                __builtin_memcpy(&value, pos, 7);
                 break;
             default:
                 __builtin_unreachable();
         }
 
-        value_ptr[7] = size;
+        reinterpret_cast<unsigned char *>(&value)[7] = size;
         return intHashCRC32(value, updated_value);
     }
 
@@ -178,35 +168,36 @@ inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) <= sizeof(UInt64)), T> k
     return intHash64(u.out);
 }
 
-template <typename T>
-static constexpr bool UseDefaultHashForBigInts =
-    std::is_same_v<T, DB::Int128>  ||
-    std::is_same_v<T, DB::UInt128> ||
-    (is_big_int_v<T> && sizeof(T) == 32);
 
 template <typename T>
-inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64) && UseDefaultHashForBigInts<T>), T> key)
+inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64)), T> key)
 {
-    if constexpr (std::is_same_v<T, DB::Int128>)
+    if constexpr (is_big_int_v<T> && sizeof(T) == 16)
     {
-        return intHash64(static_cast<UInt64>(key) ^ static_cast<UInt64>(key >> 64));
+        /// TODO This is classical antipattern.
+        return intHash64(
+            static_cast<UInt64>(key) ^
+            static_cast<UInt64>(key >> 64));
     }
-    else if constexpr (std::is_same_v<T, DB::UInt128>)
+    else if constexpr (std::is_same_v<T, DB::UUID>)
     {
-        return intHash64(key.low ^ key.high);
+        return intHash64(
+            static_cast<UInt64>(key.toUnderType()) ^
+            static_cast<UInt64>(key.toUnderType() >> 64));
     }
     else if constexpr (is_big_int_v<T> && sizeof(T) == 32)
     {
-        return intHash64(static_cast<UInt64>(key) ^
+        return intHash64(
+            static_cast<UInt64>(key) ^
             static_cast<UInt64>(key >> 64) ^
             static_cast<UInt64>(key >> 128) ^
             static_cast<UInt64>(key >> 256));
     }
-
     assert(false);
     __builtin_unreachable();
 }
 
+
 template <typename T, typename Enable = void>
 struct DefaultHash;
 
@@ -224,7 +215,7 @@ struct DefaultHash<T, std::enable_if_t<DB::IsDecimalNumber<T>>>
 {
     size_t operator() (T key) const
     {
-        return DefaultHash64<typename T::NativeType>(key);
+        return DefaultHash64<typename T::NativeType>(key.value);
     }
 };
 
@@ -272,15 +263,98 @@ DEFINE_HASH(DB::Int128)
 DEFINE_HASH(DB::Int256)
 DEFINE_HASH(DB::Float32)
 DEFINE_HASH(DB::Float64)
+DEFINE_HASH(DB::UUID)
 
 #undef DEFINE_HASH
 
 
-template <>
-struct DefaultHash<DB::UInt128> : public DB::UInt128Hash {};
+struct UInt128Hash
+{
+    size_t operator()(UInt128 x) const
+    {
+        return CityHash_v1_0_2::Hash128to64({x.items[0], x.items[1]});
+    }
+};
+
+struct UUIDHash
+{
+    size_t operator()(DB::UUID x) const
+    {
+        return UInt128Hash()(x.toUnderType());
+    }
+};
+
+#ifdef __SSE4_2__
+
+struct UInt128HashCRC32
+{
+    size_t operator()(UInt128 x) const
+    {
+        UInt64 crc = -1ULL;
+        crc = _mm_crc32_u64(crc, x.items[0]);
+        crc = _mm_crc32_u64(crc, x.items[1]);
+        return crc;
+    }
+};
+
+#else
+
+/// On other platforms we do not use CRC32. NOTE This can be confusing.
+struct UInt128HashCRC32 : public UInt128Hash {};
+
+#endif
+
+struct UInt128TrivialHash
+{
+    size_t operator()(UInt128 x) const { return x.items[0]; }
+};
+
+struct UUIDTrivialHash
+{
+    size_t operator()(DB::UUID x) const { return x.toUnderType().items[0]; }
+};
+
+struct UInt256Hash
+{
+    size_t operator()(UInt256 x) const
+    {
+        /// NOTE suboptimal
+        return CityHash_v1_0_2::Hash128to64({
+            CityHash_v1_0_2::Hash128to64({x.items[0], x.items[1]}),
+            CityHash_v1_0_2::Hash128to64({x.items[2], x.items[3]})});
+    }
+};
+
+#ifdef __SSE4_2__
+
+struct UInt256HashCRC32
+{
+    size_t operator()(UInt256 x) const
+    {
+        UInt64 crc = -1ULL;
+        crc = _mm_crc32_u64(crc, x.items[0]);
+        crc = _mm_crc32_u64(crc, x.items[1]);
+        crc = _mm_crc32_u64(crc, x.items[2]);
+        crc = _mm_crc32_u64(crc, x.items[3]);
+        return crc;
+    }
+};
+
+#else
+
+/// We do not need to use CRC32 on other platforms. NOTE This can be confusing.
+struct UInt256HashCRC32 : public UInt256Hash {};
+
+#endif
 
 template <>
-struct DefaultHash<DB::DummyUInt256> : public DB::UInt256Hash {};
+struct DefaultHash<DB::UInt128> : public UInt128Hash {};
+
+template <>
+struct DefaultHash<DB::UInt256> : public UInt256Hash {};
+
+template <>
+struct DefaultHash<DB::UUID> : public UUIDHash {};
 
 
 /// It is reasonable to use for UInt8, UInt16 with sufficient hash table size.
@@ -333,23 +407,18 @@ struct IntHash32
 {
     size_t operator() (const T & key) const
     {
-        if constexpr (std::is_same_v<T, DB::Int128>)
+        if constexpr (is_big_int_v<T> && sizeof(T) == 16)
         {
-            return intHash32<salt>(static_cast<UInt64>(key) ^ static_cast<UInt64>(key >> 64));
-        }
-        else if constexpr (std::is_same_v<T, DB::UInt128>)
-        {
-            return intHash32<salt>(key.low ^ key.high);
+            return intHash32<salt>(key.items[0] ^ key.items[1]);
         }
         else if constexpr (is_big_int_v<T> && sizeof(T) == 32)
         {
-            return intHash32<salt>(static_cast<UInt64>(key) ^
-                static_cast<UInt64>(key >> 64) ^
-                static_cast<UInt64>(key >> 128) ^
-                static_cast<UInt64>(key >> 256));
+            return intHash32<salt>(key.items[0] ^ key.items[1] ^ key.items[2] ^ key.items[3]);
         }
         else if constexpr (sizeof(T) <= sizeof(UInt64))
+        {
             return intHash32<salt>(key);
+        }
 
         assert(false);
         __builtin_unreachable();
diff --git a/src/Common/HashTable/HashMap.h b/src/Common/HashTable/HashMap.h
index c3cd09eccb2..c5675d4d7c9 100644
--- a/src/Common/HashTable/HashMap.h
+++ b/src/Common/HashTable/HashMap.h
@@ -22,19 +22,28 @@ struct PairNoInit
     First first;
     Second second;
 
-    PairNoInit() {}
+    PairNoInit() {} /// NOLINT
 
-    template <typename First_>
-    PairNoInit(First_ && first_, NoInitTag) : first(std::forward<First_>(first_))
+    template <typename FirstValue>
+    PairNoInit(FirstValue && first_, NoInitTag)
+        : first(std::forward<FirstValue>(first_))
     {
     }
 
-    template <typename First_, typename Second_>
-    PairNoInit(First_ && first_, Second_ && second_) : first(std::forward<First_>(first_)), second(std::forward<Second_>(second_))
+    template <typename FirstValue, typename SecondValue>
+    PairNoInit(FirstValue && first_, SecondValue && second_)
+        : first(std::forward<FirstValue>(first_))
+        , second(std::forward<SecondValue>(second_))
     {
     }
 };
 
+template <typename First, typename Second>
+PairNoInit<std::decay_t<First>, std::decay_t<Second>> makePairNoInit(First && first, Second && second)
+{
+    return PairNoInit<std::decay_t<First>, std::decay_t<Second>>(std::forward<First>(first), std::forward<Second>(second));
+}
+
 
 template <typename Key, typename TMapped, typename Hash, typename TState = HashTableNoState>
 struct HashMapCell
@@ -77,9 +86,6 @@ struct HashMapCell
     /// Do I need to store the zero key separately (that is, can a zero key be inserted into the hash table).
     static constexpr bool need_zero_value_storage = true;
 
-    /// Whether the cell was deleted.
-    bool isDeleted() const { return false; }
-
     void setMapped(const value_type & value_) { value.second = value_.second; }
 
     /// Serialization, in binary and text form.
diff --git a/src/Common/HashTable/HashSet.h b/src/Common/HashTable/HashSet.h
index 19dba189ddc..d06fc761362 100644
--- a/src/Common/HashTable/HashSet.h
+++ b/src/Common/HashTable/HashSet.h
@@ -73,8 +73,8 @@ struct HashSetCellWithSavedHash : public HashTableCell<Key, Hash, TState>
 
     size_t saved_hash;
 
-    HashSetCellWithSavedHash() : Base() {}
-    HashSetCellWithSavedHash(const Key & key_, const typename Base::State & state) : Base(key_, state) {}
+    HashSetCellWithSavedHash() : Base() {} //-V730
+    HashSetCellWithSavedHash(const Key & key_, const typename Base::State & state) : Base(key_, state) {} //-V730
 
     bool keyEquals(const Key & key_) const { return bitEquals(this->key, key_); }
     bool keyEquals(const Key & key_, size_t hash_) const { return saved_hash == hash_ && bitEquals(this->key, key_); }
diff --git a/src/Common/HashTable/HashTable.h b/src/Common/HashTable/HashTable.h
index 809d0691049..e25b3191652 100644
--- a/src/Common/HashTable/HashTable.h
+++ b/src/Common/HashTable/HashTable.h
@@ -12,6 +12,7 @@
 #include <Core/Defines.h>
 #include <common/types.h>
 #include <Common/Exception.h>
+#include <Common/MemorySanitizer.h>
 
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
@@ -69,10 +70,10 @@ namespace ZeroTraits
 {
 
 template <typename T>
-bool check(const T x) { return x == 0; }
+bool check(const T x) { return x == T{}; }
 
 template <typename T>
-void set(T & x) { x = 0; }
+void set(T & x) { x = {}; }
 
 }
 
@@ -304,7 +305,7 @@ template <bool need_zero_value_storage, typename Cell>
 struct ZeroValueStorage;
 
 template <typename Cell>
-struct ZeroValueStorage<true, Cell>
+struct ZeroValueStorage<true, Cell> //-V730
 {
 private:
     bool has_zero = false;
@@ -584,8 +585,19 @@ protected:
     void destroyElements()
     {
         if (!std::is_trivially_destructible_v<Cell>)
+        {
             for (iterator it = begin(), it_end = end(); it != it_end; ++it)
+            {
                 it.ptr->~Cell();
+                /// In case of poison_in_dtor=1 it will be poisoned,
+                /// but it maybe used later, during iteration.
+                ///
+                /// NOTE, that technically this is UB [1], but OK for now.
+                ///
+                ///   [1]: https://github.com/google/sanitizers/issues/854#issuecomment-329661378
+                __msan_unpoison(it.ptr, sizeof(*it.ptr));
+            }
+        }
     }
 
 
diff --git a/src/Common/HashTable/LRUHashMap.h b/src/Common/HashTable/LRUHashMap.h
index 870fb219523..bdefee351b1 100644
--- a/src/Common/HashTable/LRUHashMap.h
+++ b/src/Common/HashTable/LRUHashMap.h
@@ -220,6 +220,12 @@ public:
         return find(key) != nullptr;
     }
 
+    Value & ALWAYS_INLINE operator[](const Key & key)
+    {
+        auto [it, _] = emplace(key);
+        return it->getMapped();
+    }
+
     bool ALWAYS_INLINE erase(const Key & key)
     {
         auto key_hash = Base::hash(key);
diff --git a/src/Common/HashTable/SmallTable.h b/src/Common/HashTable/SmallTable.h
index 25f29ae869e..895d2adc83e 100644
--- a/src/Common/HashTable/SmallTable.h
+++ b/src/Common/HashTable/SmallTable.h
@@ -80,7 +80,7 @@ public:
     {
     public:
         Reader(DB::ReadBuffer & in_)
-        : in(in_)
+            : in(in_)
         {
         }
 
@@ -124,15 +124,15 @@ public:
         DB::ReadBuffer & in;
         Cell cell;
         size_t read_count = 0;
-        size_t size;
+        size_t size = 0;
         bool is_eof = false;
         bool is_initialized = false;
     };
 
     class iterator
     {
-        Self * container;
-        Cell * ptr;
+        Self * container = nullptr;
+        Cell * ptr = nullptr;
 
         friend class SmallTable;
 
@@ -158,8 +158,8 @@ public:
 
     class const_iterator
     {
-        const Self * container;
-        const Cell * ptr;
+        const Self * container = nullptr;
+        const Cell * ptr = nullptr;
 
         friend class SmallTable;
 
@@ -184,16 +184,16 @@ public:
     };
 
 
-    const_iterator begin() const     { return iteratorTo(buf); }
-    iterator begin()                 { return iteratorTo(buf); }
+    const_iterator begin() const { return iteratorTo(buf); }
+    iterator begin()             { return iteratorTo(buf); }
 
-    const_iterator end() const         { return iteratorTo(buf + m_size); }
-    iterator end()                     { return iteratorTo(buf + m_size); }
+    const_iterator end() const   { return iteratorTo(buf + m_size); }
+    iterator end()               { return iteratorTo(buf + m_size); }
 
 
 protected:
-    const_iterator iteratorTo(const Cell * ptr) const     { return const_iterator(this, ptr); }
-    iterator iteratorTo(Cell * ptr)                     { return iterator(this, ptr); }
+    const_iterator iteratorTo(const Cell * ptr) const { return const_iterator(this, ptr); }
+    iterator iteratorTo(Cell * ptr)                   { return iterator(this, ptr); }
 
 
 public:
diff --git a/src/Common/HashTable/StringHashMap.h b/src/Common/HashTable/StringHashMap.h
index fe4eab16092..298580dc837 100644
--- a/src/Common/HashTable/StringHashMap.h
+++ b/src/Common/HashTable/StringHashMap.h
@@ -28,9 +28,8 @@ struct StringHashMapCell<StringKey16, TMapped> : public HashMapCell<StringKey16,
 
     // Zero means unoccupied cells in hash table. Use key with last word = 0 as
     // zero keys, because such keys are unrepresentable (no way to encode length).
-    static bool isZero(const StringKey16 & key, const HashTableNoState &)
-    { return key.high == 0; }
-    void setZero() { this->value.first.high = 0; }
+    static bool isZero(const StringKey16 & key, const HashTableNoState &) { return key.items[1] == 0; }
+    void setZero() { this->value.first.items[1] = 0; }
 
     // external
     const StringRef getKey() const { return toStringRef(this->value.first); }
diff --git a/src/Common/HashTable/StringHashSet.h b/src/Common/HashTable/StringHashSet.h
index 8714a0e1fe4..0466dca3574 100644
--- a/src/Common/HashTable/StringHashSet.h
+++ b/src/Common/HashTable/StringHashSet.h
@@ -33,8 +33,8 @@ struct StringHashSetCell<StringKey16> : public HashTableCell<StringKey16, String
     // Zero means unoccupied cells in hash table. Use key with last word = 0 as
     // zero keys, because such keys are unrepresentable (no way to encode length).
     static bool isZero(const StringKey16 & key_, const HashTableNoState &)
-    { return key_.high == 0; }
-    void setZero() { this->key.high = 0; }
+    { return key_.items[1] == 0; }
+    void setZero() { this->key.items[1] = 0; }
 };
 
 template <>
diff --git a/src/Common/HashTable/StringHashTable.h b/src/Common/HashTable/StringHashTable.h
index 9f91de5585b..b05d119e0e9 100644
--- a/src/Common/HashTable/StringHashTable.h
+++ b/src/Common/HashTable/StringHashTable.h
@@ -25,8 +25,8 @@ inline StringRef ALWAYS_INLINE toStringRef(const StringKey8 & n)
 }
 inline StringRef ALWAYS_INLINE toStringRef(const StringKey16 & n)
 {
-    assert(n.high != 0);
-    return {reinterpret_cast<const char *>(&n), 16ul - (__builtin_clzll(n.high) >> 3)};
+    assert(n.items[1] != 0);
+    return {reinterpret_cast<const char *>(&n), 16ul - (__builtin_clzll(n.items[1]) >> 3)};
 }
 inline StringRef ALWAYS_INLINE toStringRef(const StringKey24 & n)
 {
@@ -46,8 +46,8 @@ struct StringHashTableHash
     size_t ALWAYS_INLINE operator()(StringKey16 key) const
     {
         size_t res = -1ULL;
-        res = _mm_crc32_u64(res, key.low);
-        res = _mm_crc32_u64(res, key.high);
+        res = _mm_crc32_u64(res, key.items[0]);
+        res = _mm_crc32_u64(res, key.items[1]);
         return res;
     }
     size_t ALWAYS_INLINE operator()(StringKey24 key) const
@@ -79,7 +79,7 @@ struct StringHashTableHash
 };
 
 template <typename Cell>
-struct StringHashTableEmpty
+struct StringHashTableEmpty //-V730
 {
     using Self = StringHashTableEmpty;
 
diff --git a/src/Common/HashTable/TwoLevelHashTable.h b/src/Common/HashTable/TwoLevelHashTable.h
index 7eabb5fa138..14afb91c071 100644
--- a/src/Common/HashTable/TwoLevelHashTable.h
+++ b/src/Common/HashTable/TwoLevelHashTable.h
@@ -119,9 +119,9 @@ public:
 
     class iterator
     {
-        Self * container;
-        size_t bucket;
-        typename Impl::iterator current_it;
+        Self * container{};
+        size_t bucket{};
+        typename Impl::iterator current_it{};
 
         friend class TwoLevelHashTable;
 
@@ -156,9 +156,9 @@ public:
 
     class const_iterator
     {
-        Self * container;
-        size_t bucket;
-        typename Impl::const_iterator current_it;
+        Self * container{};
+        size_t bucket{};
+        typename Impl::const_iterator current_it{};
 
         friend class TwoLevelHashTable;
 
diff --git a/src/Common/HyperLogLogCounter.h b/src/Common/HyperLogLogCounter.h
index 0acffaaaf33..1cb014a050a 100644
--- a/src/Common/HyperLogLogCounter.h
+++ b/src/Common/HyperLogLogCounter.h
@@ -80,10 +80,7 @@ template <UInt64 MaxValue> struct MinCounterType
 /// Denominator of expression for HyperLogLog algorithm.
 template <UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
     DenominatorMode denominator_mode, typename Enable = void>
-class __attribute__ ((packed)) Denominator;
-
-namespace
-{
+class Denominator;
 
 /// Returns true if rank storage is big.
 constexpr bool isBigRankStore(UInt8 precision)
@@ -91,8 +88,6 @@ constexpr bool isBigRankStore(UInt8 precision)
     return precision >= 12;
 }
 
-}
-
 /// Used to deduce denominator type depending on options provided.
 template <typename HashValueType, typename DenominatorType, DenominatorMode denominator_mode, typename Enable = void>
 struct IntermediateDenominator;
@@ -120,7 +115,7 @@ struct IntermediateDenominator<HashValueType, DenominatorType, DenominatorMode::
 /// Satisfiable when rank storage is small enough.
 template <UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
     DenominatorMode denominator_mode>
-class __attribute__ ((packed)) Denominator<precision, max_rank, HashValueType, DenominatorType,
+class __attribute__((__packed__)) Denominator<precision, max_rank, HashValueType, DenominatorType,
     denominator_mode,
     std::enable_if_t<!details::isBigRankStore(precision) || !(denominator_mode == DenominatorMode::StableIfBig)>>
 {
@@ -164,7 +159,7 @@ private:
 /// Used when rank storage is big.
 template <UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
     DenominatorMode denominator_mode>
-class __attribute__ ((packed)) Denominator<precision, max_rank, HashValueType, DenominatorType,
+class __attribute__((__packed__)) Denominator<precision, max_rank, HashValueType, DenominatorType,
     denominator_mode,
     std::enable_if_t<details::isBigRankStore(precision) && denominator_mode == DenominatorMode::StableIfBig>>
 {
@@ -252,6 +247,7 @@ struct RankWidth<UInt64>
 
 }
 
+
 /// Sets behavior of HyperLogLog class.
 enum class HyperLogLogMode
 {
diff --git a/src/Common/JSONBuilder.cpp b/src/Common/JSONBuilder.cpp
new file mode 100644
index 00000000000..30bec88003e
--- /dev/null
+++ b/src/Common/JSONBuilder.cpp
@@ -0,0 +1,99 @@
+#include <Common/JSONBuilder.h>
+#include <IO/WriteHelpers.h>
+#include <Common/typeid_cast.h>
+
+namespace DB::JSONBuilder
+{
+
+static bool isArrayOrMap(const IItem & item)
+{
+    return typeid_cast<const JSONArray *>(&item) || typeid_cast<const JSONMap *>(&item);
+}
+
+static bool isSimpleArray(const std::vector<ItemPtr> & values)
+{
+    for (const auto & value : values)
+        if (isArrayOrMap(*value))
+            return false;
+
+    return true;
+}
+
+void JSONString::format(const FormatSettings & settings, FormatContext & context)
+{
+    writeJSONString(value, context.out, settings.settings);
+}
+
+void JSONBool::format(const FormatSettings &, FormatContext & context)
+{
+    writeString(value ? "true" : "false", context.out);
+}
+
+void JSONArray::format(const FormatSettings & settings, FormatContext & context)
+{
+    writeChar('[', context.out);
+
+    context.offset += settings.indent;
+
+    bool single_row = settings.print_simple_arrays_in_single_row && isSimpleArray(values);
+    bool first = true;
+
+    for (const auto & value : values)
+    {
+        if (!first)
+            writeChar(',', context.out);
+
+        if (!single_row)
+        {
+            writeChar('\n', context.out);
+            writeChar(' ', context.offset, context.out);
+        }
+        else if (!first)
+            writeChar(' ', context.out);
+
+        first = false;
+        value->format(settings, context);
+    }
+
+    context.offset -= settings.indent;
+
+    if (!single_row)
+    {
+        writeChar('\n', context.out);
+        writeChar(' ', context.offset, context.out);
+    }
+
+    writeChar(']', context.out);
+}
+
+void JSONMap::format(const FormatSettings & settings, FormatContext & context)
+{
+    writeChar('{', context.out);
+
+    context.offset += settings.indent;
+
+    bool first = true;
+
+    for (const auto & value : values)
+    {
+        if (!first)
+            writeChar(',', context.out);
+        first = false;
+
+        writeChar('\n', context.out);
+        writeChar(' ', context.offset, context.out);
+        writeJSONString(value.key, context.out, settings.settings);
+
+        writeChar(':', context.out);
+        writeChar(' ', context.out);
+        value.value->format(settings, context);
+    }
+
+    context.offset -= settings.indent;
+
+    writeChar('\n', context.out);
+    writeChar(' ', context.offset, context.out);
+    writeChar('}', context.out);
+}
+
+}
diff --git a/src/Common/JSONBuilder.h b/src/Common/JSONBuilder.h
new file mode 100644
index 00000000000..be95323de7d
--- /dev/null
+++ b/src/Common/JSONBuilder.h
@@ -0,0 +1,111 @@
+#pragma once
+#include <type_traits>
+#include <vector>
+#include <IO/WriteBuffer.h>
+#include <Formats/FormatSettings.h>
+#include <IO/WriteHelpers.h>
+
+namespace DB::JSONBuilder
+{
+
+struct FormatSettings
+{
+    const DB::FormatSettings & settings;
+    size_t indent = 2;
+    bool print_simple_arrays_in_single_row = true;
+};
+
+struct FormatContext
+{
+    WriteBuffer & out;
+    size_t offset = 0;
+};
+
+class IItem
+{
+public:
+    virtual ~IItem() = default;
+    virtual void format(const FormatSettings & settings, FormatContext & context) = 0;
+};
+
+using ItemPtr = std::unique_ptr<IItem>;
+
+class JSONString : public IItem
+{
+public:
+    explicit JSONString(std::string value_) : value(std::move(value_)) {}
+    void format(const FormatSettings & settings, FormatContext & context) override;
+
+private:
+    std::string value;
+};
+
+template <typename T>
+class JSONNumber : public IItem
+{
+public:
+    explicit JSONNumber(T value_) : value(value_)
+    {
+        static_assert(std::is_arithmetic_v<T>, "JSONNumber support only numeric types");
+    }
+
+    void format(const FormatSettings & settings, FormatContext & context) override
+    {
+        writeJSONNumber(value, context.out, settings.settings);
+    }
+
+private:
+    T value;
+};
+
+class JSONBool : public IItem
+{
+public:
+    explicit JSONBool(bool value_) : value(std::move(value_)) {}
+    void format(const FormatSettings & settings, FormatContext & context) override;
+
+private:
+    bool value;
+};
+
+class JSONArray : public IItem
+{
+public:
+    void add(ItemPtr value) { values.push_back(std::move(value)); }
+    void add(std::string value) { add(std::make_unique<JSONString>(std::move(value))); }
+    void add(const char * value) { add(std::make_unique<JSONString>(value)); }
+    void add(bool value) { add(std::make_unique<JSONBool>(std::move(value))); }
+
+    template <typename T, std::enable_if_t<std::is_arithmetic<T>::value, bool> = true>
+    void add(T value) { add(std::make_unique<JSONNumber<T>>(value)); }
+
+    void format(const FormatSettings & settings, FormatContext & context) override;
+
+private:
+    std::vector<ItemPtr> values;
+};
+
+class JSONMap : public IItem
+{
+    struct Pair
+    {
+        std::string key;
+        ItemPtr value;
+    };
+
+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, 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, 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>
+    void add(std::string key, T value) { add(std::move(key), std::make_unique<JSONNumber<T>>(value)); }
+
+    void format(const FormatSettings & settings, FormatContext & context) override;
+
+private:
+    std::vector<Pair> values;
+};
+
+}
diff --git a/src/Common/LRUCache.h b/src/Common/LRUCache.h
index 012ab7fe6c4..10533a154d1 100644
--- a/src/Common/LRUCache.h
+++ b/src/Common/LRUCache.h
@@ -145,6 +145,11 @@ public:
         return cells.size();
     }
 
+    size_t maxSize() const
+    {
+        return max_size;
+    }
+
     void reset()
     {
         std::lock_guard lock(mutex);
diff --git a/src/Common/MemoryStatisticsOS.h b/src/Common/MemoryStatisticsOS.h
index 1661b62711f..0893e333007 100644
--- a/src/Common/MemoryStatisticsOS.h
+++ b/src/Common/MemoryStatisticsOS.h
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-/** Opens a file /proc/self/mstat. Keeps it open and reads memory statistics via 'pread'.
+/** Opens a file /proc/self/statm. Keeps it open and reads memory statistics via 'pread'.
   * This is Linux specific.
   * See: man procfs
   *
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index a584885cf0f..a05fa3b5ad5 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -6,12 +6,14 @@
 #include <Common/formatReadable.h>
 #include <common/logger_useful.h>
 #include <Common/ProfileEvents.h>
+#include <Common/thread_local_rng.h>
 
 #include <atomic>
 #include <cmath>
 #include <random>
 #include <cstdlib>
 
+
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
 thread_local bool _memory_tracker_always_throw_logical_error_on_allocation = false;
 #endif
@@ -24,8 +26,8 @@ namespace
 ///
 /// - when it is explicitly blocked with LockExceptionInThread
 ///
-/// - to avoid std::terminate(), when stack unwinding is currently in progress
-///   in this thread.
+/// - when there are uncaught exceptions objects in the current thread
+///   (to avoid std::terminate())
 ///
 ///   NOTE: that since C++11 destructor marked with noexcept by default, and
 ///   this means that any throw from destructor (that is not marked with
@@ -126,7 +128,7 @@ void MemoryTracker::logMemoryUsage(Int64 current) const
 }
 
 
-void MemoryTracker::alloc(Int64 size)
+void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
 {
     if (size < 0)
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Negative size ({}) is passed to MemoryTracker. It is a bug.", size);
@@ -135,7 +137,7 @@ void MemoryTracker::alloc(Int64 size)
     {
         /// Since the BlockerInThread should respect the level, we should go to the next parent.
         if (auto * loaded_next = parent.load(std::memory_order_relaxed))
-            loaded_next->alloc(size);
+            loaded_next->allocImpl(size, throw_if_memory_exceeded);
         return;
     }
 
@@ -179,21 +181,28 @@ void MemoryTracker::alloc(Int64 size)
 #endif
 
     std::bernoulli_distribution fault(fault_probability);
-    if (unlikely(fault_probability && fault(thread_local_rng)) && memoryTrackerCanThrow(level, true))
+    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);
 
         ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
         const auto * description = description_ptr.load(std::memory_order_relaxed);
         amount.fetch_sub(size, std::memory_order_relaxed);
-        throw DB::Exception(DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
-                            "Memory tracker{}{}: fault injected. Would use {} (attempt to allocate chunk of {} bytes), maximum: {}",
-                            description ? " " : "", description ? description : "",
-                            formatReadableSizeWithBinarySuffix(will_be),
-                            size, formatReadableSizeWithBinarySuffix(current_hard_limit));
+        throw DB::Exception(
+            DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
+            "Memory tracker{}{}: fault injected. Would use {} (attempt to allocate chunk of {} bytes), maximum: {}",
+            description ? " " : "",
+            description ? description : "",
+            formatReadableSizeWithBinarySuffix(will_be),
+            size,
+            formatReadableSizeWithBinarySuffix(current_hard_limit));
     }
 
+
     if (unlikely(current_profiler_limit && will_be > current_profiler_limit))
     {
         BlockerInThread untrack_lock(VariableContext::Global);
@@ -208,36 +217,59 @@ void MemoryTracker::alloc(Int64 size)
         DB::TraceCollector::collect(DB::TraceType::MemorySample, StackTrace(), size);
     }
 
-    if (unlikely(current_hard_limit && will_be > current_hard_limit) && memoryTrackerCanThrow(level, false))
+    if (unlikely(current_hard_limit && will_be > current_hard_limit) && memoryTrackerCanThrow(level, false) && throw_if_memory_exceeded)
     {
         /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
         BlockerInThread untrack_lock(VariableContext::Global);
-
         ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
         const auto * description = description_ptr.load(std::memory_order_relaxed);
-        amount.fetch_sub(size, std::memory_order_relaxed);
-        throw DB::Exception(DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
-                            "Memory limit{}{} exceeded: would use {} (attempt to allocate chunk of {} bytes), maximum: {}",
-                            description ? " " : "", description ? description : "",
-                            formatReadableSizeWithBinarySuffix(will_be),
-                            size, formatReadableSizeWithBinarySuffix(current_hard_limit));
+        throw DB::Exception(
+            DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED,
+            "Memory limit{}{} exceeded: would use {} (attempt to allocate chunk of {} bytes), maximum: {}",
+            description ? " " : "",
+            description ? description : "",
+            formatReadableSizeWithBinarySuffix(will_be),
+            size,
+            formatReadableSizeWithBinarySuffix(current_hard_limit));
     }
 
-    updatePeak(will_be);
+    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);
+    }
+    else
+    {
+        bool log_memory_usage = false;
+        updatePeak(will_be, log_memory_usage);
+    }
 
     if (auto * loaded_next = parent.load(std::memory_order_relaxed))
-        loaded_next->alloc(size);
+        loaded_next->allocImpl(size, throw_if_memory_exceeded);
 }
 
+void MemoryTracker::alloc(Int64 size)
+{
+    bool throw_if_memory_exceeded = true;
+    allocImpl(size, throw_if_memory_exceeded);
+}
 
-void MemoryTracker::updatePeak(Int64 will_be)
+void MemoryTracker::allocNoThrow(Int64 size)
+{
+    bool throw_if_memory_exceeded = false;
+    allocImpl(size, throw_if_memory_exceeded);
+}
+
+void 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.
     {
         peak.store(will_be, std::memory_order_relaxed);
 
-        if ((level == VariableContext::Process || level == VariableContext::Global)
+        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);
     }
@@ -315,7 +347,9 @@ void MemoryTracker::reset()
 void MemoryTracker::set(Int64 to)
 {
     amount.store(to, std::memory_order_relaxed);
-    updatePeak(to);
+
+    bool log_memory_usage = true;
+    updatePeak(to, log_memory_usage);
 }
 
 
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index 9475b555975..e57fc2e0b75 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -58,7 +58,7 @@ 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);
+    void updatePeak(Int64 will_be, bool log_memory_usage);
     void logMemoryUsage(Int64 current) const;
 
 public:
@@ -73,6 +73,10 @@ public:
       */
     void alloc(Int64 size);
 
+    void allocNoThrow(Int64 size);
+
+    void allocImpl(Int64 size, bool throw_if_memory_exceeded);
+
     void realloc(Int64 old_size, Int64 new_size)
     {
         Int64 addition = new_size - old_size;
@@ -208,7 +212,7 @@ public:
 
         static bool isBlocked(VariableContext current_level, bool fault_injection)
         {
-            return counter > 0 && current_level >= level && (!fault_injection || (fault_injection && block_fault_injections));
+            return counter > 0 && current_level >= level && (!fault_injection || block_fault_injections);
         }
     };
 };
diff --git a/src/Common/NaNUtils.h b/src/Common/NaNUtils.h
index 3b393fad41e..1c5a619e919 100644
--- a/src/Common/NaNUtils.h
+++ b/src/Common/NaNUtils.h
@@ -4,48 +4,33 @@
 #include <limits>
 #include <type_traits>
 
-#include <common/extended_types.h>
-
-
-/// To be sure, that this function is zero-cost for non-floating point types.
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, bool> isNaN(T x)
-{
-    return std::isnan(x);
-}
 
 template <typename T>
-inline std::enable_if_t<!std::is_floating_point_v<T>, bool> isNaN(T)
+inline bool isNaN(T x)
 {
-    return false;
+    /// To be sure, that this function is zero-cost for non-floating point types.
+    if constexpr (std::is_floating_point_v<T>)
+        return std::isnan(x);
+    else
+        return false;
 }
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, bool> isFinite(T x)
-{
-    return std::isfinite(x);
-}
 
 template <typename T>
-inline std::enable_if_t<!std::is_floating_point_v<T>, bool> isFinite(T)
+inline bool isFinite(T x)
 {
-    return true;
+    if constexpr (std::is_floating_point_v<T>)
+        return std::isfinite(x);
+    else
+        return true;
 }
 
-template <typename T>
-std::enable_if_t<std::is_floating_point_v<T>, T> NaNOrZero()
-{
-    return std::numeric_limits<T>::quiet_NaN();
-}
 
 template <typename T>
-std::enable_if_t<is_integer_v<T>, T> NaNOrZero()
+T NaNOrZero()
 {
-    return T{0};
-}
-
-template <typename T>
-std::enable_if_t<std::is_class_v<T> && !is_integer_v<T>, T> NaNOrZero()
-{
-    return T{};
+    if constexpr (std::is_floating_point_v<T>)
+        return std::numeric_limits<T>::quiet_NaN();
+    else
+        return {};
 }
diff --git a/src/Common/NamePrompter.h b/src/Common/NamePrompter.h
index 5f7832c4423..bb17f860f29 100644
--- a/src/Common/NamePrompter.h
+++ b/src/Common/NamePrompter.h
@@ -90,17 +90,16 @@ private:
     }
 };
 
-template <size_t MaxNumHints, class Self>
+
+template <size_t MaxNumHints, typename Self>
 class IHints
 {
 public:
-
     virtual std::vector<String> getAllRegisteredNames() const = 0;
 
     std::vector<String> getHints(const String & name) const
     {
-        static const auto registered_names = getAllRegisteredNames();
-        return prompter.getHints(name, registered_names);
+        return prompter.getHints(name, getAllRegisteredNames());
     }
 
     virtual ~IHints() = default;
diff --git a/src/Common/OpenTelemetryTraceContext.h b/src/Common/OpenTelemetryTraceContext.h
index fe88981cb1e..9f2b5af9105 100644
--- a/src/Common/OpenTelemetryTraceContext.h
+++ b/src/Common/OpenTelemetryTraceContext.h
@@ -6,12 +6,12 @@ namespace DB
 // The runtime info we need to create new OpenTelemetry spans.
 struct OpenTelemetryTraceContext
 {
-    __uint128_t trace_id = 0;
+    UUID trace_id{};
     UInt64 span_id = 0;
     // The incoming tracestate header and the trace flags, we just pass them
     // downstream. See https://www.w3.org/TR/trace-context/
     String tracestate;
-    __uint8_t trace_flags = 0;
+    UInt8 trace_flags = 0;
 
     // Parse/compose OpenTelemetry traceparent header.
     bool parseTraceparentHeader(const std::string & traceparent, std::string & error);
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index b1042332cfa..d90ac0469c5 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -260,22 +260,12 @@ public:
     template <typename ... TAllocatorParams>
     void push_back_raw(const void * ptr, TAllocatorParams &&... allocator_params)
     {
-        push_back_raw_many(1, ptr, std::forward<TAllocatorParams>(allocator_params)...);
-    }
-
-    template <typename ... TAllocatorParams>
-    void push_back_raw_many(size_t number_of_items, const void * ptr, TAllocatorParams &&... allocator_params)
-    {
-        size_t required_capacity = size() + number_of_items;
+        size_t required_capacity = size() + ELEMENT_SIZE;
         if (unlikely(required_capacity > capacity()))
             reserve(required_capacity, std::forward<TAllocatorParams>(allocator_params)...);
 
-        size_t items_byte_size = byte_size(number_of_items);
-        if (items_byte_size)
-        {
-            memcpy(c_end, ptr, items_byte_size);
-            c_end += items_byte_size;
-        }
+        memcpy(c_end, ptr, ELEMENT_SIZE);
+        c_end += ELEMENT_SIZE;
     }
 
     void protect()
@@ -523,7 +513,7 @@ public:
         insertPrepare(from_begin, from_end);
 
         if (unlikely(bytes_to_move))
-            memcpy(this->c_end + bytes_to_copy - bytes_to_move, this->c_end - bytes_to_move, bytes_to_move);
+            memmove(this->c_end + bytes_to_copy - bytes_to_move, this->c_end - bytes_to_move, bytes_to_move);
 
         memcpy(this->c_end - bytes_to_move, reinterpret_cast<const void *>(&*from_begin), bytes_to_copy);
 
diff --git a/src/Common/PoolBase.h b/src/Common/PoolBase.h
index 43f4fbff9fe..6fc5aee26dd 100644
--- a/src/Common/PoolBase.h
+++ b/src/Common/PoolBase.h
@@ -51,7 +51,7 @@ private:
       */
     struct PoolEntryHelper
     {
-        PoolEntryHelper(PooledObject & data_) : data(data_) { data.in_use = true; }
+        explicit PoolEntryHelper(PooledObject & data_) : data(data_) { data.in_use = true; }
         ~PoolEntryHelper()
         {
             std::unique_lock lock(data.pool.mutex);
@@ -69,7 +69,7 @@ public:
     public:
         friend class PoolBase<Object>;
 
-        Entry() {}    /// For deferred initialization.
+        Entry() = default;    /// For deferred initialization.
 
         /** The `Entry` object protects the resource from being used by another thread.
           * The following methods are forbidden for `rvalue`, so you can not write a similar to
@@ -99,10 +99,10 @@ public:
     private:
         std::shared_ptr<PoolEntryHelper> data;
 
-        Entry(PooledObject & object) : data(std::make_shared<PoolEntryHelper>(object)) {}
+        explicit Entry(PooledObject & object) : data(std::make_shared<PoolEntryHelper>(object)) {}
     };
 
-    virtual ~PoolBase() {}
+    virtual ~PoolBase() = default;
 
     /** Allocates the object. Wait for free object in pool for 'timeout'. With 'timeout' < 0, the timeout is infinite. */
     Entry get(Poco::Timespan::TimeDiff timeout)
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index 141ac7a7e49..78d45a93b13 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -388,7 +388,7 @@ void PoolWithFailoverBase<TNestedPool>::updateErrorCounts(PoolWithFailoverBase<T
 {
     time_t current_time = time(nullptr);
 
-    if (last_decrease_time)
+    if (last_decrease_time) //-V1051
     {
         time_t delta = current_time - last_decrease_time;
 
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 35703790d82..86f06f27455 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -135,6 +135,12 @@
     M(MergeTreeDataWriterBlocks, "Number of blocks INSERTed to MergeTree tables. Each block forms a data part of level zero.") \
     M(MergeTreeDataWriterBlocksAlreadySorted, "Number of blocks INSERTed to MergeTree tables that appeared to be already sorted.") \
     \
+    M(MergeTreeDataProjectionWriterRows, "Number of rows INSERTed to MergeTree tables projection.") \
+    M(MergeTreeDataProjectionWriterUncompressedBytes, "Uncompressed bytes (for columns as they stored in memory) INSERTed to MergeTree tables projection.") \
+    M(MergeTreeDataProjectionWriterCompressedBytes, "Bytes written to filesystem for data INSERTed to MergeTree tables projection.") \
+    M(MergeTreeDataProjectionWriterBlocks, "Number of blocks INSERTed to MergeTree tables projection. Each block forms a data part of level zero.") \
+    M(MergeTreeDataProjectionWriterBlocksAlreadySorted, "Number of blocks INSERTed to MergeTree tables projection that appeared to be already sorted.") \
+    \
     M(CannotRemoveEphemeralNode, "Number of times an error happened while trying to remove ephemeral node. This is not an issue, because our implementation of ZooKeeper library guarantee that the session will expire and the node will be removed.") \
     \
     M(RegexpCreated, "Compiled regular expressions. Identical regular expressions compiled just once and cached forever.") \
@@ -146,6 +152,11 @@
     M(StorageBufferPassedTimeMaxThreshold, "") \
     M(StorageBufferPassedRowsMaxThreshold, "") \
     M(StorageBufferPassedBytesMaxThreshold, "") \
+    M(StorageBufferPassedTimeFlushThreshold, "") \
+    M(StorageBufferPassedRowsFlushThreshold, "") \
+    M(StorageBufferPassedBytesFlushThreshold, "") \
+    M(StorageBufferLayerLockReadersWaitMilliseconds, "Time for waiting for Buffer layer during reading") \
+    M(StorageBufferLayerLockWritersWaitMilliseconds, "Time for waiting free Buffer layer to write to (can be used to tune Buffer layers)") \
     \
     M(DictCacheKeysRequested, "") \
     M(DictCacheKeysRequestedMiss, "") \
diff --git a/src/Common/ProgressBar.cpp b/src/Common/ProgressBar.cpp
new file mode 100644
index 00000000000..27e5eca1ea5
--- /dev/null
+++ b/src/Common/ProgressBar.cpp
@@ -0,0 +1,111 @@
+#include "ProgressBar.h"
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <Common/TerminalSize.h>
+#include <Common/UnicodeBar.h>
+#include <Databases/DatabaseMemory.h>
+
+namespace DB
+{
+
+bool ProgressBar::updateProgress(Progress & progress, const Progress & value)
+{
+    return progress.incrementPiecewiseAtomically(value);
+}
+
+void ProgressBar::writeProgress(const Progress & progress, const size_t elapsed_ns)
+{
+    if (!need_render_progress)
+        return;
+
+    /// Output all progress bar commands to stderr at once to avoid flicker.
+    WriteBufferFromFileDescriptor message(STDERR_FILENO, 1024);
+
+    static size_t increment = 0;
+    static const char * indicators[8] = {
+        "\033[1;30m→\033[0m",
+        "\033[1;31m↘\033[0m",
+        "\033[1;32m↓\033[0m",
+        "\033[1;33m↙\033[0m",
+        "\033[1;34m←\033[0m",
+        "\033[1;35m↖\033[0m",
+        "\033[1;36m↑\033[0m",
+        "\033[1m↗\033[0m",
+    };
+
+    const char * indicator = indicators[increment % 8];
+
+    size_t terminal_width = getTerminalWidth();
+
+    if (!written_progress_chars)
+    {
+        /// If the current line is not empty, the progress must be output on the next line.
+        /// The trick is found here: https://www.vidarholen.net/contents/blog/?p=878
+        message << std::string(terminal_width, ' ');
+    }
+    message << '\r';
+
+    size_t prefix_size = message.count();
+
+    message << indicator << " Progress: ";
+
+    message
+        << formatReadableQuantity(progress.read_rows) << " rows, "
+        << formatReadableSizeWithDecimalSuffix(progress.read_bytes);
+
+    if (elapsed_ns)
+        message << " ("
+                << formatReadableQuantity(progress.read_rows * 1000000000.0 / elapsed_ns) << " rows/s., "
+                << formatReadableSizeWithDecimalSuffix(progress.read_bytes * 1000000000.0 / elapsed_ns) << "/s.) ";
+    else
+        message << ". ";
+
+    written_progress_chars = message.count() - prefix_size - (strlen(indicator) - 2); /// Don't count invisible output (escape sequences).
+
+    /// If the approximate number of rows to process is known, we can display a progress bar and percentage.
+    if (progress.total_rows_to_read > 0)
+    {
+        size_t total_rows_corrected = std::max(progress.read_rows, progress.total_rows_to_read);
+
+        /// To avoid flicker, display progress bar only if .5 seconds have passed since query execution start
+        ///  and the query is less than halfway done.
+
+        if (elapsed_ns > 500000000)
+        {
+            /// Trigger to start displaying progress bar. If query is mostly done, don't display it.
+            if (progress.read_rows * 2 < total_rows_corrected)
+                show_progress_bar = true;
+
+            if (show_progress_bar)
+            {
+                ssize_t width_of_progress_bar = static_cast<ssize_t>(terminal_width) - written_progress_chars - strlen(" 99%");
+                if (width_of_progress_bar > 0)
+                {
+                    std::string bar
+                        = UnicodeBar::render(UnicodeBar::getWidth(progress.read_rows, 0, total_rows_corrected, width_of_progress_bar));
+                    message << "\033[0;32m" << bar << "\033[0m";
+                    if (width_of_progress_bar > static_cast<ssize_t>(bar.size() / UNICODE_BAR_CHAR_SIZE))
+                        message << std::string(width_of_progress_bar - bar.size() / UNICODE_BAR_CHAR_SIZE, ' ');
+                }
+            }
+        }
+
+        /// Underestimate percentage a bit to avoid displaying 100%.
+        message << ' ' << (99 * progress.read_rows / total_rows_corrected) << '%';
+    }
+
+    message << CLEAR_TO_END_OF_LINE;
+    ++increment;
+
+    message.next();
+}
+
+void ProgressBar::clearProgress()
+{
+    if (written_progress_chars)
+    {
+        written_progress_chars = 0;
+        std::cerr << "\r" CLEAR_TO_END_OF_LINE;
+    }
+}
+
+}
diff --git a/src/Common/ProgressBar.h b/src/Common/ProgressBar.h
new file mode 100644
index 00000000000..895cea51f6a
--- /dev/null
+++ b/src/Common/ProgressBar.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Common/Stopwatch.h>
+#include <IO/Progress.h>
+
+/// http://en.wikipedia.org/wiki/ANSI_escape_code
+#define CLEAR_TO_END_OF_LINE "\033[K"
+
+namespace DB
+{
+
+struct ProgressBar
+{
+public:
+
+    static bool updateProgress(Progress & progress, const Progress & value);
+    void writeProgress(const Progress & progress, const size_t elapsed_ns);
+    void clearProgress();
+
+    /// For interactive mode always show progress bar, for non-interactive mode it is accessed from config().
+    bool need_render_progress = true;
+
+    bool show_progress_bar = false;
+
+    size_t written_progress_chars = 0;
+
+    bool written_first_block = false;
+
+    bool clear_progress = false;
+};
+
+}
diff --git a/src/Common/SharedBlockRowRef.h b/src/Common/SharedBlockRowRef.h
index 193f7e4dd05..46c35c6ac47 100644
--- a/src/Common/SharedBlockRowRef.h
+++ b/src/Common/SharedBlockRowRef.h
@@ -44,7 +44,7 @@ using SharedBlockPtr = boost::intrusive_ptr<detail::SharedBlock>;
 struct SharedBlockRowRef
 {
     ColumnRawPtrs * columns = nullptr;
-    size_t row_num;
+    size_t row_num = 0;
     SharedBlockPtr shared_block;
 
     void swap(SharedBlockRowRef & other)
diff --git a/src/Common/SipHash.h b/src/Common/SipHash.h
index ce7e80a7204..92d635eb63c 100644
--- a/src/Common/SipHash.h
+++ b/src/Common/SipHash.h
@@ -155,7 +155,6 @@ public:
         unalignedStore<UInt64>(out + 8, v2 ^ v3);
     }
 
-    /// template for avoiding 'unsigned long long' vs 'unsigned long' problem on old poco in macos
     template <typename T>
     ALWAYS_INLINE void get128(T & lo, T & hi)
     {
@@ -165,6 +164,13 @@ public:
         hi = v2 ^ v3;
     }
 
+    template <typename T>
+    ALWAYS_INLINE void get128(T & dst)
+    {
+        static_assert(sizeof(T) == 16);
+        get128(reinterpret_cast<char *>(&dst));
+    }
+
     UInt64 get64()
     {
         finalize();
diff --git a/src/Common/SpaceSaving.h b/src/Common/SpaceSaving.h
index 185b4aa90ae..b7353d803b7 100644
--- a/src/Common/SpaceSaving.h
+++ b/src/Common/SpaceSaving.h
@@ -6,7 +6,6 @@
 #include <boost/range/adaptor/reversed.hpp>
 
 #include <Common/ArenaWithFreeLists.h>
-#include <Common/UInt128.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/HashTable/HashMap.h>
 
@@ -85,7 +84,7 @@ public:
 
     struct Counter
     {
-        Counter() {}
+        Counter() = default; //-V730
 
         Counter(const TKey & k, UInt64 c = 0, UInt64 e = 0, size_t h = 0)
           : key(k), slot(0), hash(h), count(c), error(e) {}
@@ -148,7 +147,7 @@ public:
         // Increase weight of a key that already exists
         auto hash = counter_map.hash(key);
 
-        if (auto counter = findCounter(key, hash); counter)
+        if (auto * counter = findCounter(key, hash); counter)
         {
             counter->count += increment;
             counter->error += error;
@@ -159,12 +158,12 @@ public:
         // Key doesn't exist, but can fit in the top K
         if (unlikely(size() < capacity()))
         {
-            auto c = new Counter(arena.emplace(key), increment, error, hash);
+            auto * c = new Counter(arena.emplace(key), increment, error, hash);
             push(c);
             return;
         }
 
-        auto min = counter_list.back();
+        auto * min = counter_list.back();
         // The key doesn't exist and cannot fit in the current top K, but
         // the new key has a bigger weight and is virtually more present
         // compared to the element who is less present on the set. This part
@@ -218,7 +217,7 @@ public:
          */
         if (m2 > 0)
         {
-            for (auto counter : counter_list)
+            for (auto * counter : counter_list)
             {
                 counter->count += m2;
                 counter->error += m2;
@@ -226,10 +225,10 @@ public:
         }
 
         // The list is sorted in descending order, we have to scan in reverse
-        for (auto counter : boost::adaptors::reverse(rhs.counter_list))
+        for (auto * counter : boost::adaptors::reverse(rhs.counter_list))
         {
             size_t hash = counter_map.hash(counter->key);
-            if (auto current = findCounter(counter->key, hash))
+            if (auto * current = findCounter(counter->key, hash))
             {
                 // Subtract m2 previously added, guaranteed not negative
                 current->count += (counter->count - m2);
@@ -262,7 +261,7 @@ public:
     std::vector<Counter> topK(size_t k) const
     {
         std::vector<Counter> res;
-        for (auto counter : counter_list)
+        for (auto * counter : counter_list)
         {
             res.push_back(*counter);
             if (res.size() == k)
@@ -274,7 +273,7 @@ public:
     void write(WriteBuffer & wb) const
     {
         writeVarUInt(size(), wb);
-        for (auto counter : counter_list)
+        for (auto * counter : counter_list)
             counter->write(wb);
 
         writeVarUInt(alpha_map.size(), wb);
@@ -290,7 +289,7 @@ public:
 
         for (size_t i = 0; i < count; ++i)
         {
-            auto counter = new Counter();
+            auto * counter = new Counter();
             counter->read(rb);
             counter->hash = counter_map.hash(counter->key);
             push(counter);
@@ -325,7 +324,7 @@ protected:
     {
         while (counter->slot > 0)
         {
-            auto next = counter_list[counter->slot - 1];
+            auto * next = counter_list[counter->slot - 1];
             if (*counter > *next)
             {
                 std::swap(next->slot, counter->slot);
@@ -339,7 +338,7 @@ protected:
 private:
     void destroyElements()
     {
-        for (auto counter : counter_list)
+        for (auto * counter : counter_list)
         {
             arena.free(counter->key);
             delete counter;
@@ -376,7 +375,7 @@ private:
     {
         removed_keys = 0;
         counter_map.clear();
-        for (auto counter : counter_list)
+        for (auto * counter : counter_list)
             counter_map[counter->key] = counter;
     }
 
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index 9e81cdddbda..812f888b284 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -184,6 +184,10 @@ static void * getCallerAddress(const ucontext_t & context)
 #    else
     return reinterpret_cast<void *>(context.uc_mcontext.gregs[REG_RIP]);
 #    endif
+
+#elif defined(__APPLE__) && defined(__aarch64__)
+    return reinterpret_cast<void *>(context.uc_mcontext->__ss.__pc);
+
 #elif defined(__aarch64__)
     return reinterpret_cast<void *>(context.uc_mcontext.pc);
 #elif defined(__powerpc64__)
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 35df77b6b8a..ef90a0d587d 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -11,7 +11,9 @@
 
 #ifdef __APPLE__
 // ucontext is not available without _XOPEN_SOURCE
-#   pragma clang diagnostic ignored "-Wreserved-id-macro"
+#   ifdef __clang__
+#       pragma clang diagnostic ignored "-Wreserved-id-macro"
+#   endif
 #   define _XOPEN_SOURCE 700
 #endif
 #include <ucontext.h>
diff --git a/src/Common/StatusFile.cpp b/src/Common/StatusFile.cpp
index b21454c9ed8..ceedf518608 100644
--- a/src/Common/StatusFile.cpp
+++ b/src/Common/StatusFile.cpp
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <Poco/File.h>
 #include <common/logger_useful.h>
 #include <common/errnoToString.h>
 #include <Common/ClickHouseRevision.h>
@@ -14,7 +13,9 @@
 #include <IO/LimitReadBuffer.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/Operators.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -45,7 +46,7 @@ StatusFile::StatusFile(std::string path_, FillFunction fill_)
     : path(std::move(path_)), fill(std::move(fill_))
 {
     /// If file already exists. NOTE Minor race condition.
-    if (Poco::File(path).exists())
+    if (fs::exists(path))
     {
         std::string contents;
         {
diff --git a/src/Common/StatusInfo.cpp b/src/Common/StatusInfo.cpp
index be343acfe4a..32afc833001 100644
--- a/src/Common/StatusInfo.cpp
+++ b/src/Common/StatusInfo.cpp
@@ -1,5 +1,5 @@
 #include <Common/StatusInfo.h>
-#include <Interpreters/ExternalLoader.h>
+#include <Common/ExternalLoaderStatus.h>
 
 /// Available status. Add something here as you wish.
 #define APPLY_FOR_STATUS(M) \
diff --git a/src/Common/Stopwatch.cpp b/src/Common/Stopwatch.cpp
index d792e054d24..b17e343f1af 100644
--- a/src/Common/Stopwatch.cpp
+++ b/src/Common/Stopwatch.cpp
@@ -7,8 +7,12 @@ StopwatchRUsage::Timestamp StopwatchRUsage::Timestamp::current()
 
     ::rusage rusage {};
 #if !defined(__APPLE__)
+#if defined(OS_SUNOS)
+    ::getrusage(RUSAGE_LWP, &rusage);
+#else
     ::getrusage(RUSAGE_THREAD, &rusage);
-#endif
+#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/StringUtils/CMakeLists.txt b/src/Common/StringUtils/CMakeLists.txt
index bd1282a08d5..4eedbf4842b 100644
--- a/src/Common/StringUtils/CMakeLists.txt
+++ b/src/Common/StringUtils/CMakeLists.txt
@@ -1,7 +1,7 @@
 # These files are located in separate library, because they are used by Yandex.Metrika code
 #  in places when no dependency on whole "dbms" library is possible.
 
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 
 add_headers_and_sources(clickhouse_common_stringutils .)
 
diff --git a/src/Common/StringUtils/StringUtils.h b/src/Common/StringUtils/StringUtils.h
index cb2227f01a8..20c0a5ca380 100644
--- a/src/Common/StringUtils/StringUtils.h
+++ b/src/Common/StringUtils/StringUtils.h
@@ -123,7 +123,7 @@ inline bool isWhitespaceASCII(char c)
 /// Since |isWhiteSpaceASCII()| is used inside algorithms it's easier to implement another function than add extra argument.
 inline bool isWhitespaceASCIIOneLine(char c)
 {
-    return c == ' ' || c == '\t' || c == '\r' || c == '\f' || c == '\v';
+    return c == ' ' || c == '\t' || c == '\f' || c == '\v';
 }
 
 inline bool isControlASCII(char c)
diff --git a/src/Common/TerminalSize.cpp b/src/Common/TerminalSize.cpp
index 714a19b188a..a020098aa44 100644
--- a/src/Common/TerminalSize.cpp
+++ b/src/Common/TerminalSize.cpp
@@ -1,5 +1,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
+#if defined(OS_SUNOS)
+#  include <sys/termios.h>
+#endif
 #include <Common/Exception.h>
 #include <Common/TerminalSize.h>
 #include <boost/program_options.hpp>
@@ -14,7 +17,7 @@ uint16_t getTerminalWidth()
 {
     if (isatty(STDIN_FILENO))
     {
-        winsize terminal_size {};
+        struct winsize terminal_size {};
 
         if (ioctl(STDIN_FILENO, TIOCGWINSZ, &terminal_size))
             DB::throwFromErrno("Cannot obtain terminal window size (ioctl TIOCGWINSZ)", DB::ErrorCodes::SYSTEM_ERROR);
diff --git a/src/Common/ThreadPool.cpp b/src/Common/ThreadPool.cpp
index 92d02ae0f3e..e6ccf405e9f 100644
--- a/src/Common/ThreadPool.cpp
+++ b/src/Common/ThreadPool.cpp
@@ -81,7 +81,7 @@ template <typename Thread>
 template <typename ReturnType>
 ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, int priority, std::optional<uint64_t> wait_microseconds)
 {
-    auto on_error = [&]
+    auto on_error = [&](const std::string & reason)
     {
         if constexpr (std::is_same_v<ReturnType, void>)
         {
@@ -91,7 +91,9 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, int priority, std::opti
                 std::swap(exception, first_exception);
                 std::rethrow_exception(exception);
             }
-            throw DB::Exception("Cannot schedule a task", DB::ErrorCodes::CANNOT_SCHEDULE_TASK);
+            throw DB::Exception(DB::ErrorCodes::CANNOT_SCHEDULE_TASK,
+                "Cannot schedule a task: {} (threads={}, jobs={})", reason,
+                threads.size(), scheduled_jobs);
         }
         else
             return false;
@@ -105,20 +107,30 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, int priority, std::opti
         if (wait_microseconds)  /// Check for optional. Condition is true if the optional is set and the value is zero.
         {
             if (!job_finished.wait_for(lock, std::chrono::microseconds(*wait_microseconds), pred))
-                return on_error();
+                return on_error(fmt::format("no free thread (timeout={})", *wait_microseconds));
         }
         else
             job_finished.wait(lock, pred);
 
         if (shutdown)
-            return on_error();
+            return on_error("shutdown");
 
-        jobs.emplace(std::move(job), priority);
-        ++scheduled_jobs;
+        /// We must not to allocate any memory after we emplaced a job in a queue.
+        /// Because if an exception would be thrown, we won't notify a thread about job occurrence.
 
-        if (threads.size() < std::min(max_threads, scheduled_jobs))
+        /// Check if there are enough threads to process job.
+        if (threads.size() < std::min(max_threads, scheduled_jobs + 1))
         {
-            threads.emplace_front();
+            try
+            {
+                threads.emplace_front();
+            }
+            catch (...)
+            {
+                /// Most likely this is a std::bad_alloc exception
+                return on_error("cannot allocate thread slot");
+            }
+
             try
             {
                 threads.front() = Thread([this, it = threads.begin()] { worker(it); });
@@ -126,19 +138,15 @@ ReturnType ThreadPoolImpl<Thread>::scheduleImpl(Job job, int priority, std::opti
             catch (...)
             {
                 threads.pop_front();
-
-                /// Remove the job and return error to caller.
-                /// Note that if we have allocated at least one thread, we may continue
-                /// (one thread is enough to process all jobs).
-                /// But this condition indicate an error nevertheless and better to refuse.
-
-                jobs.pop();
-                --scheduled_jobs;
-                return on_error();
+                return on_error("cannot allocate thread");
             }
         }
+
+        jobs.emplace(std::move(job), priority);
+        ++scheduled_jobs;
+        new_job_or_shutdown.notify_one();
     }
-    new_job_or_shutdown.notify_one();
+
     return ReturnType(true);
 }
 
@@ -165,6 +173,10 @@ void ThreadPoolImpl<Thread>::wait()
 {
     {
         std::unique_lock lock(mutex);
+        /// Signal here just in case.
+        /// If threads are waiting on condition variables, but there are some jobs in the queue
+        /// then it will prevent us from deadlock.
+        new_job_or_shutdown.notify_all();
         job_finished.wait(lock, [this] { return scheduled_jobs == 0; });
 
         if (first_exception)
@@ -205,6 +217,13 @@ size_t ThreadPoolImpl<Thread>::active() const
     return scheduled_jobs;
 }
 
+template <typename Thread>
+bool ThreadPoolImpl<Thread>::finished() const
+{
+    std::unique_lock lock(mutex);
+    return shutdown;
+}
+
 template <typename Thread>
 void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_it)
 {
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index f5cd887ed44..e5f3041004b 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -67,6 +67,10 @@ public:
     /// Returns number of running and scheduled jobs.
     size_t active() const;
 
+    /// Returns true if the pool already terminated
+    /// (and any further scheduling will produce CANNOT_SCHEDULE_TASK exception)
+    bool finished() const;
+
     void setMaxThreads(size_t value);
     void setMaxFreeThreads(size_t value);
     void setQueueSize(size_t value);
diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp
index 327178c92ff..7b69bf766db 100644
--- a/src/Common/ThreadProfileEvents.cpp
+++ b/src/Common/ThreadProfileEvents.cpp
@@ -125,7 +125,7 @@ void TasksStatsCounters::incrementProfileEvents(const ::taskstats & prev, const
 
 #endif
 
-#if defined(__linux__) && !defined(ARCADIA_BUILD)
+#if defined(__linux__)
 
 namespace DB
 {
@@ -568,7 +568,7 @@ void PerfDescriptorsHolder::releaseResources()
 namespace DB
 {
 
-// Not on Linux or in Arcadia: the functionality is disabled.
+// the functionality is disabled when we are not running on Linux.
 PerfEventsCounters current_thread_counters;
 
 }
diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h
index d96339add26..cf5196f3636 100644
--- a/src/Common/ThreadProfileEvents.h
+++ b/src/Common/ThreadProfileEvents.h
@@ -105,8 +105,12 @@ struct RUsageCounters
     {
         ::rusage rusage {};
 #if !defined(__APPLE__)
+#if defined(OS_SUNOS)
+        ::getrusage(RUSAGE_LWP, &rusage);
+#else
         ::getrusage(RUSAGE_THREAD, &rusage);
-#endif
+#endif // OS_SUNOS
+#endif // __APPLE
         return RUsageCounters(rusage, getClockMonotonic());
     }
 
@@ -136,9 +140,7 @@ private:
     }
 };
 
-// thread_local is disabled in Arcadia, so we have to use a dummy implementation
-// there.
-#if defined(__linux__) && !defined(ARCADIA_BUILD)
+#if defined(__linux__)
 
 struct PerfEventInfo
 {
@@ -195,7 +197,7 @@ extern thread_local PerfEventsCounters current_thread_counters;
 
 #else
 
-// Not on Linux, or in Arcadia: the functionality is disabled.
+// the functionality is disabled when we are not running on Linux.
 struct PerfEventsCounters
 {
     void initializeProfileEvents(const std::string & /* events_list */) {}
@@ -203,7 +205,6 @@ struct PerfEventsCounters
     void closeEventDescriptors() {}
 };
 
-// thread_local is disabled in Arcadia, so we are going to use a static dummy.
 extern PerfEventsCounters current_thread_counters;
 
 #endif
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 8c01ed2d46f..1493d30ea01 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -101,7 +101,8 @@ ThreadStatus::~ThreadStatus()
 
 #if !defined(ARCADIA_BUILD)
     /// It may cause segfault if query_context was destroyed, but was not detached
-    assert((!query_context && query_id.empty()) || (query_context && query_id == query_context->getCurrentQueryId()));
+    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)
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index dc5f09c5f3d..6fc43114621 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include <common/StringRef.h>
-#include <Common/ProfileEvents.h>
+#include <Core/SettingsEnums.h>
+#include <Interpreters/Context_fwd.h>
+#include <IO/Progress.h>
 #include <Common/MemoryTracker.h>
 #include <Common/OpenTelemetryTraceContext.h>
+#include <Common/ProfileEvents.h>
+#include <common/StringRef.h>
 
-#include <Core/SettingsEnums.h>
+#include <boost/noncopyable.hpp>
 
-#include <IO/Progress.h>
-
-#include <memory>
+#include <functional>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <shared_mutex>
-#include <functional>
-#include <boost/noncopyable.hpp>
 
 
 namespace Poco
@@ -26,7 +26,6 @@ namespace Poco
 namespace DB
 {
 
-class Context;
 class QueryStatus;
 class ThreadStatus;
 class QueryProfilerReal;
@@ -58,8 +57,8 @@ public:
     ProfileEvents::Counters performance_counters{VariableContext::Process};
     MemoryTracker memory_tracker{VariableContext::Process};
 
-    Context * query_context = nullptr;
-    Context * global_context = nullptr;
+    ContextWeakPtr query_context;
+    ContextWeakPtr global_context;
 
     InternalTextLogsQueueWeakPtr logs_queue_ptr;
     std::function<void()> fatal_error_callback;
@@ -72,7 +71,7 @@ public:
     LogsLevel client_logs_level = LogsLevel::none;
 
     String query;
-    UInt64 normalized_query_hash;
+    UInt64 normalized_query_hash = 0;
 };
 
 using ThreadGroupStatusPtr = std::shared_ptr<ThreadGroupStatus>;
@@ -122,9 +121,9 @@ protected:
     std::atomic<int> thread_state{ThreadState::DetachedFromQuery};
 
     /// Is set once
-    Context * global_context = nullptr;
+    ContextWeakPtr global_context;
     /// Use it only from current thread
-    Context * query_context = nullptr;
+    ContextWeakPtr query_context;
 
     String query_id;
 
@@ -178,9 +177,9 @@ public:
         return query_id;
     }
 
-    const Context * getQueryContext() const
+    auto getQueryContext() const
     {
-        return query_context;
+        return query_context.lock();
     }
 
     /// Starts new query and create new thread group for it, current thread becomes master thread of the query
@@ -203,7 +202,7 @@ public:
 
     /// Sets query context for current master thread and its thread group
     /// NOTE: query_context have to be alive until detachQuery() is called
-    void attachQueryContext(Context & query_context);
+    void attachQueryContext(ContextPtr query_context);
 
     /// Update several ProfileEvents counters
     void updatePerformanceCounters();
diff --git a/src/Common/Throttler.cpp b/src/Common/Throttler.cpp
new file mode 100644
index 00000000000..3462abfeb54
--- /dev/null
+++ b/src/Common/Throttler.cpp
@@ -0,0 +1,108 @@
+#include <Common/Throttler.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Exception.h>
+#include <Common/Stopwatch.h>
+#include <IO/WriteHelpers.h>
+#include <cmath>
+
+namespace ProfileEvents
+{
+    extern const Event ThrottlerSleepMicroseconds;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LIMIT_EXCEEDED;
+}
+
+/// Just 10^9.
+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;
+
+void Throttler::add(size_t amount)
+{
+    size_t new_count;
+    /// This outer variable is always equal to smoothed_speed.
+    /// We use to avoid race condition.
+    double current_speed = 0;
+
+    {
+        std::lock_guard lock(mutex);
+
+        auto now = clock_gettime_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)
+        {
+            /// Time spent to process the amount of bytes
+            double time_spent = now - prev_ns;
+
+            /// The speed in bytes per second is equal to amount / time_spent in seconds
+            auto new_speed = amount / (time_spent / NS);
+
+            /// We want to make old values of speed less important for our smoothed value
+            /// so we decay it's value with coef.
+            auto decay_coeff = std::pow(0.5, time_spent / window_ns);
+
+            /// Weighted average between previous and new speed
+            smoothed_speed = smoothed_speed * decay_coeff + (1 - decay_coeff) * new_speed;
+            current_speed = smoothed_speed;
+        }
+
+        count += amount;
+        new_count = count;
+        prev_ns = now;
+    }
+
+    if (limit && new_count > limit)
+        throw Exception(limit_exceeded_exception_message + std::string(" Maximum: ") + toString(limit), ErrorCodes::LIMIT_EXCEEDED);
+
+    if (max_speed && current_speed > max_speed)
+    {
+        /// If we was too fast then we have to sleep until our smoothed speed became <= max_speed
+        int64_t sleep_time = -window_ns * std::log2(max_speed / current_speed);
+
+        if (sleep_time > 0)
+        {
+            accumulated_sleep += sleep_time;
+
+            sleepForNanoseconds(sleep_time);
+
+            accumulated_sleep -= sleep_time;
+
+            ProfileEvents::increment(ProfileEvents::ThrottlerSleepMicroseconds, sleep_time / 1000UL);
+        }
+    }
+
+    if (parent)
+        parent->add(amount);
+}
+
+void Throttler::reset()
+{
+    std::lock_guard lock(mutex);
+
+    count = 0;
+    accumulated_sleep = 0;
+    smoothed_speed = 0;
+    prev_ns = 0;
+}
+
+bool Throttler::isThrottling() const
+{
+    if (accumulated_sleep != 0)
+        return true;
+
+    if (parent)
+        return parent->isThrottling();
+
+    return false;
+}
+
+}
diff --git a/src/Common/Throttler.h b/src/Common/Throttler.h
index 172cce783d8..a30df74d510 100644
--- a/src/Common/Throttler.h
+++ b/src/Common/Throttler.h
@@ -2,32 +2,16 @@
 
 #include <mutex>
 #include <memory>
-#include <Common/Stopwatch.h>
-#include <Common/Exception.h>
-#include <Common/ProfileEvents.h>
 #include <common/sleep.h>
-#include <IO/WriteHelpers.h>
-
-
-namespace ProfileEvents
-{
-    extern const Event ThrottlerSleepMicroseconds;
-}
-
+#include <atomic>
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LIMIT_EXCEEDED;
-}
-
-
 /** Allows you to limit the speed of something (in entities per second) using sleep.
   * Specifics of work:
-  * - only the average speed is considered, from the moment of the first call of `add` function;
-  *   if there were periods with low speed, then during some time after them, the speed will be higher;
+  *  Tracks exponentially (pow of 1/2) smoothed speed with hardcoded window.
+  *  See more comments in .cpp file.
   *
   * Also allows you to set a limit on the maximum number of entities. If exceeded, an exception will be thrown.
   */
@@ -41,49 +25,9 @@ public:
               const std::shared_ptr<Throttler> & parent_ = nullptr)
         : max_speed(max_speed_), limit(limit_), limit_exceeded_exception_message(limit_exceeded_exception_message_), parent(parent_) {}
 
-    void add(const size_t amount)
-    {
-        size_t new_count;
-        UInt64 elapsed_ns = 0;
-
-        {
-            std::lock_guard lock(mutex);
-
-            if (max_speed)
-            {
-                if (0 == count)
-                {
-                    watch.start();
-                    elapsed_ns = 0;
-                }
-                else
-                    elapsed_ns = watch.elapsed();
-            }
-
-            count += amount;
-            new_count = count;
-        }
-
-        if (limit && new_count > limit)
-            throw Exception(limit_exceeded_exception_message + std::string(" Maximum: ") + toString(limit), ErrorCodes::LIMIT_EXCEEDED);
-
-        if (max_speed)
-        {
-            /// How much time to wait for the average speed to become `max_speed`.
-            UInt64 desired_ns = new_count * 1000000000 / max_speed;
-
-            if (desired_ns > elapsed_ns)
-            {
-                UInt64 sleep_ns = desired_ns - elapsed_ns;
-                sleepForNanoseconds(sleep_ns);
-
-                ProfileEvents::increment(ProfileEvents::ThrottlerSleepMicroseconds, sleep_ns / 1000UL);
-            }
-        }
-
-        if (parent)
-            parent->add(amount);
-    }
+    /// Calculates the smoothed speed, sleeps if required and throws exception on
+    /// limit overflow.
+    void add(size_t amount);
 
     /// Not thread safe
     void setParent(const std::shared_ptr<Throttler> & parent_)
@@ -91,21 +35,23 @@ public:
         parent = parent_;
     }
 
-    void reset()
-    {
-        std::lock_guard lock(mutex);
+    /// Reset all throttlers internal stats
+    void reset();
 
-        count = 0;
-        watch.reset();
-    }
+    /// Is throttler already accumulated some sleep time and throttling.
+    bool isThrottling() const;
 
 private:
-    size_t count = 0;
-    const size_t max_speed = 0;
-    const UInt64 limit = 0;        /// 0 - not limited.
+    size_t count{0};
+    const size_t max_speed{0};
+    const uint64_t limit{0};        /// 0 - not limited.
     const char * limit_exceeded_exception_message = nullptr;
-    Stopwatch watch {CLOCK_MONOTONIC_COARSE};
     std::mutex mutex;
+    std::atomic<uint64_t> accumulated_sleep{0};
+    /// Smoothed value of current speed. Updated in `add` method.
+    double smoothed_speed{0};
+    /// previous `add` call time (in nanoseconds)
+    uint64_t prev_ns{0};
 
     /// Used to implement a hierarchy of throttlers
     std::shared_ptr<Throttler> parent;
diff --git a/src/Common/TimerDescriptor.cpp b/src/Common/TimerDescriptor.cpp
index 791e6380a89..793f7ed1352 100644
--- a/src/Common/TimerDescriptor.cpp
+++ b/src/Common/TimerDescriptor.cpp
@@ -74,7 +74,7 @@ void TimerDescriptor::drain() const
     }
 }
 
-void TimerDescriptor::setRelative(const Poco::Timespan & timespan) const
+void TimerDescriptor::setRelative(Poco::Timespan timespan) const
 {
     itimerspec spec;
     spec.it_interval.tv_nsec = 0;
diff --git a/src/Common/TimerDescriptor.h b/src/Common/TimerDescriptor.h
index 42f8eb386af..30a610f37f0 100644
--- a/src/Common/TimerDescriptor.h
+++ b/src/Common/TimerDescriptor.h
@@ -24,7 +24,7 @@ public:
 
     void reset() const;
     void drain() const;
-    void setRelative(const Poco::Timespan & timespan) const;
+    void setRelative(Poco::Timespan timespan) const;
 };
 
 }
diff --git a/src/Common/TraceCollector.cpp b/src/Common/TraceCollector.cpp
index ab1845ebbd2..3cb4e5615c8 100644
--- a/src/Common/TraceCollector.cpp
+++ b/src/Common/TraceCollector.cpp
@@ -24,7 +24,10 @@ namespace
     /// Thus upper bound on query_id length should be introduced to avoid buffer overflow in signal handler.
     ///
     /// And it cannot be large, since otherwise it will not fit into PIPE_BUF.
-    constexpr size_t QUERY_ID_MAX_LEN = sizeof("00000000-0000-0000-0000-000000000000") - 1; // 36
+    /// The performance test query ids can be surprisingly long like
+    /// `aggregating_merge_tree_simple_aggregate_function_string.query100.profile100`,
+    /// so make some allowance for them as well.
+    constexpr size_t QUERY_ID_MAX_LEN = 128;
 }
 
 LazyPipeFDs pipe;
diff --git a/src/Common/UInt128.h b/src/Common/UInt128.h
deleted file mode 100644
index 06fddee8dc9..00000000000
--- a/src/Common/UInt128.h
+++ /dev/null
@@ -1,292 +0,0 @@
-#pragma once
-
-#include <tuple>
-#include <iomanip>
-#include <city.h>
-
-#include <Core/Types.h>
-#include <Common/hex.h>
-
-#ifdef __SSE4_2__
-#include <nmmintrin.h>
-#endif
-
-
-namespace DB
-{
-
-/// For aggregation by SipHash, UUID type or concatenation of several fields.
-struct UInt128
-{
-/// Suppress gcc7 warnings: 'prev_key.DB::UInt128::low' may be used uninitialized in this function
-#if !__clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-
-    /// This naming assumes little endian.
-    UInt64 low;
-    UInt64 high;
-
-    /// TODO: Make this constexpr. Currently it is used in unions
-    /// and union cannot contain member with non trivial constructor
-    /// constructor must be non user provided but compiler cannot constexpr constructor
-    /// if members low and high are not initialized, if we default member initialize them
-    /// constructor becomes non trivial.
-    UInt128() = default;
-    explicit constexpr UInt128(const UInt64 low_, const UInt64 high_) : low(low_), high(high_) { }
-
-    /// We need Int128 to UInt128 conversion or AccurateComparison will call greaterOp<Int128, UInt64> instead of greaterOp<Int128, UInt128>
-    explicit constexpr UInt128(const Int128 rhs) : low(rhs), high(rhs >> 64) {}
-    explicit constexpr UInt128(const Int64 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const Int32 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const Int16 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const Int8 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const UInt8 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const UInt16 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const UInt32 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const UInt64 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const Float32 rhs) : low(rhs), high() {}
-    explicit constexpr UInt128(const Float64 rhs) : low(rhs), high() {}
-
-    constexpr auto tuple() const { return std::tie(high, low); }
-
-    String toHexString() const
-    {
-        String res(2 * sizeof(UInt128), 0);
-        writeHexUIntLowercase(*this, res.data());
-        return res;
-    }
-
-    constexpr bool operator== (const UInt128 rhs) const { return tuple() == rhs.tuple(); }
-    constexpr bool operator!= (const UInt128 rhs) const { return tuple() != rhs.tuple(); }
-    constexpr bool operator<  (const UInt128 rhs) const { return tuple() < rhs.tuple(); }
-    constexpr bool operator<= (const UInt128 rhs) const { return tuple() <= rhs.tuple(); }
-    constexpr bool operator>  (const UInt128 rhs) const { return tuple() > rhs.tuple(); }
-    constexpr bool operator>= (const UInt128 rhs) const { return tuple() >= rhs.tuple(); }
-
-    constexpr bool operator == (const Int128 rhs) const { return *this == UInt128(rhs, rhs >> 64) && rhs >= 0; }
-    constexpr bool operator != (const Int128 rhs) const { return *this != UInt128(rhs, rhs >> 64) || rhs < 0; }
-    constexpr bool operator >= (const Int128 rhs) const { return *this >= UInt128(rhs, rhs >> 64) || rhs < 0; }
-    constexpr bool operator >  (const Int128 rhs) const { return *this >  UInt128(rhs, rhs >> 64) || rhs < 0; }
-    constexpr bool operator <= (const Int128 rhs) const { return *this <= UInt128(rhs, rhs >> 64) && rhs >= 0; }
-    constexpr bool operator <  (const Int128 rhs) const { return *this <  UInt128(rhs, rhs >> 64) && rhs >= 0; }
-
-    constexpr bool operator >  (const Int256 rhs) const { return (rhs < 0) || ((Int256(high) << 64) + low) > rhs; }
-    constexpr bool operator >  (const UInt256 rhs) const { return ((UInt256(high) << 64) + low) > rhs; }
-    constexpr bool operator <  (const Int256 rhs) const { return (rhs >= 0) && ((Int256(high) << 64) + low) < rhs; }
-    constexpr bool operator <  (const UInt256 rhs) const { return ((UInt256(high) << 64) + low) < rhs; }
-
-    template <typename T> constexpr bool operator== (const T rhs) const { return *this == UInt128(rhs); }
-    template <typename T> constexpr bool operator!= (const T rhs) const { return *this != UInt128(rhs); }
-    template <typename T> constexpr bool operator>= (const T rhs) const { return *this >= UInt128(rhs); }
-    template <typename T> constexpr bool operator>  (const T rhs) const { return *this >  UInt128(rhs); }
-    template <typename T> constexpr bool operator<= (const T rhs) const { return *this <= UInt128(rhs); }
-    template <typename T> constexpr bool operator<  (const T rhs) const { return *this <  UInt128(rhs); }
-
-    template <typename T> explicit operator T() const
-    {
-        if constexpr (std::is_class_v<T>)
-            return T();
-        else
-            return static_cast<T>(low);
-    }
-
-#if !__clang__
-#pragma GCC diagnostic pop
-#endif
-
-    constexpr UInt128 & operator= (const UInt64 rhs) { low = rhs; high = 0; return *this; }
-};
-
-template <typename T> constexpr bool operator == (T a, const UInt128 b) { return b.operator==(a); }
-template <typename T> constexpr bool operator != (T a, const UInt128 b) { return b.operator!=(a); }
-template <typename T> constexpr bool operator >= (T a, const UInt128 b) { return b <= a; }
-template <typename T> constexpr bool operator >  (T a, const UInt128 b) { return b < a; }
-template <typename T> constexpr bool operator <= (T a, const UInt128 b) { return b >= a; }
-template <typename T> constexpr bool operator <  (T a, const UInt128 b) { return b > a; }
-
-template <> inline constexpr bool IsNumber<UInt128> = true;
-template <> struct TypeName<UInt128> { static constexpr const char * get() { return "UInt128"; } };
-template <> struct TypeId<UInt128> { static constexpr const TypeIndex value = TypeIndex::UInt128; };
-
-struct UInt128Hash
-{
-    size_t operator()(UInt128 x) const
-    {
-        return CityHash_v1_0_2::Hash128to64({x.low, x.high});
-    }
-};
-
-#ifdef __SSE4_2__
-
-struct UInt128HashCRC32
-{
-    size_t operator()(UInt128 x) const
-    {
-        UInt64 crc = -1ULL;
-        crc = _mm_crc32_u64(crc, x.low);
-        crc = _mm_crc32_u64(crc, x.high);
-        return crc;
-    }
-};
-
-#else
-
-/// On other platforms we do not use CRC32. NOTE This can be confusing.
-struct UInt128HashCRC32 : public UInt128Hash {};
-
-#endif
-
-struct UInt128TrivialHash
-{
-    size_t operator()(UInt128 x) const { return x.low; }
-};
-
-
-/** Used for aggregation, for putting a large number of constant-length keys in a hash table.
-  */
-struct DummyUInt256
-{
-
-/// Suppress gcc7 warnings: 'prev_key.DB::UInt256::a' may be used uninitialized in this function
-#if !__clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-
-    UInt64 a;
-    UInt64 b;
-    UInt64 c;
-    UInt64 d;
-
-    bool operator== (const DummyUInt256 rhs) const
-    {
-        return a == rhs.a && b == rhs.b && c == rhs.c && d == rhs.d;
-
-    /* So it's no better.
-        return 0xFFFF == _mm_movemask_epi8(_mm_and_si128(
-            _mm_cmpeq_epi8(
-                _mm_loadu_si128(reinterpret_cast<const __m128i *>(&a)),
-                _mm_loadu_si128(reinterpret_cast<const __m128i *>(&rhs.a))),
-            _mm_cmpeq_epi8(
-                _mm_loadu_si128(reinterpret_cast<const __m128i *>(&c)),
-                _mm_loadu_si128(reinterpret_cast<const __m128i *>(&rhs.c)))));*/
-    }
-
-    bool operator!= (const DummyUInt256 rhs) const { return !operator==(rhs); }
-
-    bool operator== (const UInt64 rhs) const { return a == rhs && b == 0 && c == 0 && d == 0; }
-    bool operator!= (const UInt64 rhs) const { return !operator==(rhs); }
-
-#if !__clang__
-#pragma GCC diagnostic pop
-#endif
-
-    DummyUInt256 & operator = (const UInt64 rhs) { a = rhs; b = 0; c = 0; d = 0; return *this; }
-};
-
-struct UInt256Hash
-{
-    size_t operator()(DummyUInt256 x) const
-    {
-        /// NOTE suboptimal
-        return CityHash_v1_0_2::Hash128to64({CityHash_v1_0_2::Hash128to64({x.a, x.b}), CityHash_v1_0_2::Hash128to64({x.c, x.d})});
-    }
-};
-
-#ifdef __SSE4_2__
-
-struct UInt256HashCRC32
-{
-    size_t operator()(DummyUInt256 x) const
-    {
-        UInt64 crc = -1ULL;
-        crc = _mm_crc32_u64(crc, x.a);
-        crc = _mm_crc32_u64(crc, x.b);
-        crc = _mm_crc32_u64(crc, x.c);
-        crc = _mm_crc32_u64(crc, x.d);
-        return crc;
-    }
-};
-
-#else
-
-/// We do not need to use CRC32 on other platforms. NOTE This can be confusing.
-struct UInt256HashCRC32 : public UInt256Hash {};
-
-#endif
-
-}
-
-template <> struct is_signed<DB::UInt128>
-{
-    static constexpr bool value = false;
-};
-
-template <> struct is_unsigned<DB::UInt128>
-{
-    static constexpr bool value = true;
-};
-
-template <> struct is_integer<DB::UInt128>
-{
-    static constexpr bool value = true;
-};
-
-// Operator +, -, /, *, % aren't implemented so it's not an arithmetic type
-template <> struct is_arithmetic<DB::UInt128>
-{
-    static constexpr bool value = false;
-};
-
-/// Overload hash for type casting
-namespace std
-{
-template <> struct hash<DB::UInt128>
-{
-    size_t operator()(const DB::UInt128 & u) const
-    {
-        return CityHash_v1_0_2::Hash128to64({u.low, u.high});
-    }
-};
-
-template<>
-class numeric_limits<DB::UInt128>
-{
-public:
-    static constexpr bool is_specialized = true;
-    static constexpr bool is_signed = ::is_signed<DB::UInt128>::value;
-    static constexpr bool is_integer = ::is_integer<DB::UInt128>::value;
-    static constexpr bool is_exact = true;
-    static constexpr bool has_infinity = false;
-    static constexpr bool has_quiet_NaN = false;
-    static constexpr bool has_signaling_NaN = false;
-    static constexpr std::float_denorm_style has_denorm = std::denorm_absent;
-    static constexpr bool has_denorm_loss = false;
-    static constexpr std::float_round_style round_style = std::round_toward_zero;
-    static constexpr bool is_iec559 = false;
-    static constexpr bool is_bounded = true;
-    static constexpr bool is_modulo = true;
-    static constexpr int digits = std::numeric_limits<UInt64>::digits * 2;
-    static constexpr int digits10 = digits * 0.30103 /*std::log10(2)*/;
-    static constexpr int max_digits10 = 0;
-    static constexpr int radix = 2;
-    static constexpr int min_exponent = 0;
-    static constexpr int min_exponent10 = 0;
-    static constexpr int max_exponent = 0;
-    static constexpr int max_exponent10 = 0;
-    static constexpr bool traps = true;
-    static constexpr bool tinyness_before = false;
-
-    static constexpr DB::UInt128 min() noexcept { return DB::UInt128(0, 0); }
-
-    static constexpr DB::UInt128 max() noexcept
-    {
-        return DB::UInt128(std::numeric_limits<UInt64>::max(), std::numeric_limits<UInt64>::max());
-    }
-
-    static constexpr DB::UInt128 lowest() noexcept { return min(); }
-};
-
-}
diff --git a/src/Common/Volnitsky.h b/src/Common/Volnitsky.h
index c674015fba9..13cef28ddcf 100644
--- a/src/Common/Volnitsky.h
+++ b/src/Common/Volnitsky.h
@@ -303,7 +303,7 @@ namespace VolnitskyTraits
                     {
                         /// ngram for Ul
                         chars.c0 = c0u;
-                        chars.c1 = c1l;
+                        chars.c1 = c1l; //-V1048
                         putNGramBase(n, offset);
                     }
 
diff --git a/src/Common/XDBCBridgeHelper.h b/src/Common/XDBCBridgeHelper.h
deleted file mode 100644
index 1e552157a56..00000000000
--- a/src/Common/XDBCBridgeHelper.h
+++ /dev/null
@@ -1,351 +0,0 @@
-#pragma once
-
-#include <IO/ReadHelpers.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
-#include <Interpreters/Context.h>
-#include <Access/AccessType.h>
-#include <Parsers/IdentifierQuotingStyle.h>
-#include <Poco/File.h>
-#include <Poco/Logger.h>
-#include <Poco/Net/HTTPRequest.h>
-#include <Poco/Path.h>
-#include <Poco/URI.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Common/ShellCommand.h>
-#include <IO/ConnectionTimeoutsContext.h>
-#include <common/logger_useful.h>
-#include <ext/range.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int EXTERNAL_SERVER_IS_NOT_RESPONDING;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-}
-
-/**
- * Class for Helpers for Xdbc-bridges, provide utility methods, not main request
- */
-class IXDBCBridgeHelper
-{
-public:
-    static constexpr inline auto DEFAULT_FORMAT = "RowBinary";
-
-    virtual std::vector<std::pair<std::string, std::string>> getURLParams(const std::string & cols, UInt64 max_block_size) const = 0;
-    virtual void startBridgeSync() const = 0;
-    virtual Poco::URI getMainURI() const = 0;
-    virtual Poco::URI getColumnsInfoURI() const = 0;
-    virtual IdentifierQuotingStyle getIdentifierQuotingStyle() = 0;
-    virtual bool isSchemaAllowed() = 0;
-    virtual String getName() const = 0;
-
-    virtual ~IXDBCBridgeHelper() = default;
-};
-
-using BridgeHelperPtr = std::shared_ptr<IXDBCBridgeHelper>;
-
-template <typename BridgeHelperMixin>
-class XDBCBridgeHelper : public IXDBCBridgeHelper
-{
-private:
-    Poco::Timespan http_timeout;
-
-    std::string connection_string;
-
-    Poco::URI ping_url;
-
-    Poco::Logger * log = &Poco::Logger::get(BridgeHelperMixin::getName() + "BridgeHelper");
-
-    std::optional<IdentifierQuotingStyle> quote_style;
-    std::optional<bool> is_schema_allowed;
-
-protected:
-    auto getConnectionString() const
-    {
-        return connection_string;
-    }
-
-public:
-    using Configuration = Poco::Util::AbstractConfiguration;
-
-    const Context & context;
-    const Configuration & config;
-
-    static constexpr inline auto DEFAULT_HOST = "127.0.0.1";
-    static constexpr inline auto DEFAULT_PORT = BridgeHelperMixin::DEFAULT_PORT;
-    static constexpr inline auto PING_HANDLER = "/ping";
-    static constexpr inline auto MAIN_HANDLER = "/";
-    static constexpr inline auto COL_INFO_HANDLER = "/columns_info";
-    static constexpr inline auto IDENTIFIER_QUOTE_HANDLER = "/identifier_quote";
-    static constexpr inline auto SCHEMA_ALLOWED_HANDLER = "/schema_allowed";
-    static constexpr inline auto PING_OK_ANSWER = "Ok.";
-
-    XDBCBridgeHelper(const Context & global_context_, const Poco::Timespan & http_timeout_, const std::string & connection_string_)
-        : http_timeout(http_timeout_), connection_string(connection_string_), context(global_context_), config(context.getConfigRef())
-    {
-        size_t bridge_port = config.getUInt(BridgeHelperMixin::configPrefix() + ".port", DEFAULT_PORT);
-        std::string bridge_host = config.getString(BridgeHelperMixin::configPrefix() + ".host", DEFAULT_HOST);
-
-        ping_url.setHost(bridge_host);
-        ping_url.setPort(bridge_port);
-        ping_url.setScheme("http");
-        ping_url.setPath(PING_HANDLER);
-    }
-
-    String getName() const override
-    {
-        return BridgeHelperMixin::getName();
-    }
-
-    IdentifierQuotingStyle getIdentifierQuotingStyle() override
-    {
-        if (!quote_style.has_value())
-        {
-            startBridgeSync();
-
-            auto uri = createBaseURI();
-            uri.setPath(IDENTIFIER_QUOTE_HANDLER);
-            uri.addQueryParameter("connection_string", getConnectionString());
-
-            ReadWriteBufferFromHTTP buf(
-                uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(context));
-            std::string character;
-            readStringBinary(character, buf);
-            if (character.length() > 1)
-                throw Exception("Failed to parse quoting style from '" + character + "' for service " + BridgeHelperMixin::serviceAlias(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-            else if (character.length() == 0)
-                quote_style = IdentifierQuotingStyle::None;
-            else if (character[0] == '`')
-                quote_style = IdentifierQuotingStyle::Backticks;
-            else if (character[0] == '"')
-                quote_style = IdentifierQuotingStyle::DoubleQuotes;
-            else
-                throw Exception("Can not map quote identifier '" + character + "' to enum value", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-        }
-
-        return *quote_style;
-    }
-
-    bool isSchemaAllowed() override
-    {
-        if (!is_schema_allowed.has_value())
-        {
-            startBridgeSync();
-
-            auto uri = createBaseURI();
-            uri.setPath(SCHEMA_ALLOWED_HANDLER);
-            uri.addQueryParameter("connection_string", getConnectionString());
-
-            ReadWriteBufferFromHTTP buf(
-                uri, Poco::Net::HTTPRequest::HTTP_POST, {}, ConnectionTimeouts::getHTTPTimeouts(context));
-
-            bool res;
-            readBoolText(res, buf);
-            is_schema_allowed = res;
-        }
-
-        return *is_schema_allowed;
-    }
-
-    /**
-     * @todo leaky abstraction - used by external API's
-     */
-    std::vector<std::pair<std::string, std::string>> getURLParams(const std::string & cols, UInt64 max_block_size) const override
-    {
-        std::vector<std::pair<std::string, std::string>> result;
-
-        result.emplace_back("connection_string", connection_string); /// already validated
-        result.emplace_back("columns", cols);
-        result.emplace_back("max_block_size", std::to_string(max_block_size));
-
-        return result;
-    }
-
-    /**
-     * Performs spawn of external daemon
-     */
-    void startBridgeSync() const override
-    {
-        if (!checkBridgeIsRunning())
-        {
-            LOG_TRACE(log, "{} is not running, will try to start it", BridgeHelperMixin::serviceAlias());
-            startBridge();
-            bool started = false;
-
-            uint64_t milliseconds_to_wait = 10; /// Exponential backoff
-            uint64_t counter = 0;
-            while (milliseconds_to_wait < 10000)
-            {
-                ++counter;
-                LOG_TRACE(log, "Checking {} is running, try {}", BridgeHelperMixin::serviceAlias(), counter);
-                if (checkBridgeIsRunning())
-                {
-                    started = true;
-                    break;
-                }
-                std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds_to_wait));
-                milliseconds_to_wait *= 2;
-            }
-
-            if (!started)
-                throw Exception(BridgeHelperMixin::getName() + "BridgeHelper: " + BridgeHelperMixin::serviceAlias() + " is not responding",
-                    ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
-        }
-    }
-
-    /**
-     * URI to fetch the data from external service
-     */
-    Poco::URI getMainURI() const override
-    {
-        auto uri = createBaseURI();
-        uri.setPath(MAIN_HANDLER);
-        return uri;
-    }
-
-    /**
-     * URI to retrieve column description from external service
-     */
-    Poco::URI getColumnsInfoURI() const override
-    {
-        auto uri = createBaseURI();
-        uri.setPath(COL_INFO_HANDLER);
-        return uri;
-    }
-
-protected:
-    Poco::URI createBaseURI() const
-    {
-        Poco::URI uri;
-        uri.setHost(ping_url.getHost());
-        uri.setPort(ping_url.getPort());
-        uri.setScheme("http");
-        return uri;
-    }
-
-private:
-    bool checkBridgeIsRunning() const
-    {
-        try
-        {
-            ReadWriteBufferFromHTTP buf(
-                ping_url, Poco::Net::HTTPRequest::HTTP_GET, {}, ConnectionTimeouts::getHTTPTimeouts(context));
-            return checkString(XDBCBridgeHelper::PING_OK_ANSWER, buf);
-        }
-        catch (...)
-        {
-            return false;
-        }
-    }
-
-    /* Contains logic for instantiation of the bridge instance */
-    void startBridge() const
-    {
-        auto cmd = BridgeHelperMixin::startBridge(config, log, http_timeout);
-        context.addXDBCBridgeCommand(std::move(cmd));
-    }
-};
-
-struct JDBCBridgeMixin
-{
-    static constexpr inline auto DEFAULT_PORT = 9019;
-    static const String configPrefix()
-    {
-        return "jdbc_bridge";
-    }
-    static const String serviceAlias()
-    {
-        return "clickhouse-jdbc-bridge";
-    }
-    static const String getName()
-    {
-        return "JDBC";
-    }
-    static AccessType getSourceAccessType()
-    {
-        return AccessType::JDBC;
-    }
-
-    static std::unique_ptr<ShellCommand> startBridge(const Poco::Util::AbstractConfiguration &, const Poco::Logger *, const Poco::Timespan &)
-    {
-        throw Exception("jdbc-bridge is not running. Please, start it manually", ErrorCodes::EXTERNAL_SERVER_IS_NOT_RESPONDING);
-    }
-};
-
-struct ODBCBridgeMixin
-{
-    static constexpr inline auto DEFAULT_PORT = 9018;
-
-    static const String configPrefix()
-    {
-        return "odbc_bridge";
-    }
-    static const String serviceAlias()
-    {
-        return "clickhouse-odbc-bridge";
-    }
-    static const String getName()
-    {
-        return "ODBC";
-    }
-    static AccessType getSourceAccessType()
-    {
-        return AccessType::ODBC;
-    }
-
-    static std::unique_ptr<ShellCommand> startBridge(
-        const Poco::Util::AbstractConfiguration & config, Poco::Logger * log, const Poco::Timespan & http_timeout)
-    {
-        /// Path to executable folder
-        Poco::Path path{config.getString("application.dir", "/usr/bin")};
-
-        std::vector<std::string> cmd_args;
-        path.setFileName("clickhouse-odbc-bridge");
-
-#if !CLICKHOUSE_SPLIT_BINARY
-        cmd_args.push_back("odbc-bridge");
-#endif
-
-        cmd_args.push_back("--http-port");
-        cmd_args.push_back(std::to_string(config.getUInt(configPrefix() + ".port", DEFAULT_PORT)));
-        cmd_args.push_back("--listen-host");
-        cmd_args.push_back(config.getString(configPrefix() + ".listen_host", XDBCBridgeHelper<ODBCBridgeMixin>::DEFAULT_HOST));
-        cmd_args.push_back("--http-timeout");
-        cmd_args.push_back(std::to_string(http_timeout.totalMicroseconds()));
-        if (config.has("logger." + configPrefix() + "_log"))
-        {
-            cmd_args.push_back("--log-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_log"));
-        }
-        if (config.has("logger." + configPrefix() + "_errlog"))
-        {
-            cmd_args.push_back("--err-log-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_errlog"));
-        }
-        if (config.has("logger." + configPrefix() + "_stdout"))
-        {
-            cmd_args.push_back("--stdout-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_stdout"));
-        }
-        if (config.has("logger." + configPrefix() + "_stderr"))
-        {
-            cmd_args.push_back("--stderr-path");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_stderr"));
-        }
-        if (config.has("logger." + configPrefix() + "_level"))
-        {
-            cmd_args.push_back("--log-level");
-            cmd_args.push_back(config.getString("logger." + configPrefix() + "_level"));
-        }
-
-        LOG_TRACE(log, "Starting {}", serviceAlias());
-
-        return ShellCommand::executeDirect(path.toString(), cmd_args, ShellCommandDestructorStrategy(true));
-    }
-};
-}
diff --git a/src/Common/ZooKeeper/CMakeLists.txt b/src/Common/ZooKeeper/CMakeLists.txt
index ef32d9266c0..d29fba53277 100644
--- a/src/Common/ZooKeeper/CMakeLists.txt
+++ b/src/Common/ZooKeeper/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 
 add_headers_and_sources(clickhouse_common_zookeeper .)
 
@@ -6,6 +6,6 @@ add_library(clickhouse_common_zookeeper ${clickhouse_common_zookeeper_headers} $
 
 target_link_libraries (clickhouse_common_zookeeper PUBLIC clickhouse_common_io common PRIVATE string_utils)
 
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
-endif ()
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
+endif()
diff --git a/src/Common/ZooKeeper/IKeeper.cpp b/src/Common/ZooKeeper/IKeeper.cpp
index 94fd291bd12..4f0c5efe680 100644
--- a/src/Common/ZooKeeper/IKeeper.cpp
+++ b/src/Common/ZooKeeper/IKeeper.cpp
@@ -142,6 +142,8 @@ void GetRequest::addRootPath(const String & root_path) { Coordination::addRootPa
 void SetRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
 void ListRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
 void CheckRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
+void SetACLRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
+void GetACLRequest::addRootPath(const String & root_path) { Coordination::addRootPath(path, root_path); }
 
 void MultiRequest::addRootPath(const String & root_path)
 {
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index 9ff37a7045d..30d816aad15 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -116,6 +116,7 @@ struct Request
     virtual ~Request() = default;
     virtual String getPath() const = 0;
     virtual void addRootPath(const String & /* root_path */) {}
+    virtual size_t bytesSize() const { return 0; }
 };
 
 struct Response;
@@ -131,6 +132,7 @@ struct Response
     Response & operator=(const Response &) = default;
     virtual ~Response() = default;
     virtual void removeRootPath(const String & /* root_path */) {}
+    virtual size_t bytesSize() const { return 0; }
 };
 
 struct WatchResponse : virtual Response
@@ -140,10 +142,46 @@ struct WatchResponse : virtual Response
     String path;
 
     void removeRootPath(const String & root_path) override;
+
+    size_t bytesSize() const override { return path.size() + sizeof(type) + sizeof(state); }
 };
 
 using WatchCallback = std::function<void(const WatchResponse &)>;
 
+struct SetACLRequest : virtual Request
+{
+    String path;
+    ACLs acls;
+    int32_t version = -1;
+
+    void addRootPath(const String & root_path) override;
+    String getPath() const override { return path; }
+    size_t bytesSize() const override { return path.size() + sizeof(version) + acls.size() * sizeof(ACL); }
+};
+
+struct SetACLResponse : virtual Response
+{
+    Stat stat;
+
+    size_t bytesSize() const override { return sizeof(Stat); }
+};
+
+struct GetACLRequest : virtual Request
+{
+    String path;
+
+    void addRootPath(const String & root_path) override;
+    String getPath() const override { return path; }
+    size_t bytesSize() const override { return path.size(); }
+};
+
+struct GetACLResponse : virtual Response
+{
+    ACLs acl;
+    Stat stat;
+    size_t bytesSize() const override { return sizeof(Stat) + acl.size() * sizeof(ACL); }
+};
+
 struct CreateRequest : virtual Request
 {
     String path;
@@ -154,6 +192,9 @@ struct CreateRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size() + data.size()
+            + sizeof(is_ephemeral) + sizeof(is_sequential) + acls.size() * sizeof(ACL); }
 };
 
 struct CreateResponse : virtual Response
@@ -161,6 +202,8 @@ struct CreateResponse : virtual Response
     String path_created;
 
     void removeRootPath(const String & root_path) override;
+
+    size_t bytesSize() const override { return path_created.size(); }
 };
 
 struct RemoveRequest : virtual Request
@@ -170,6 +213,8 @@ struct RemoveRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size() + sizeof(version); }
 };
 
 struct RemoveResponse : virtual Response
@@ -182,11 +227,15 @@ struct ExistsRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct ExistsResponse : virtual Response
 {
     Stat stat;
+
+    size_t bytesSize() const override { return sizeof(Stat); }
 };
 
 struct GetRequest : virtual Request
@@ -195,12 +244,16 @@ struct GetRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct GetResponse : virtual Response
 {
     String data;
     Stat stat;
+
+    size_t bytesSize() const override { return data.size() + sizeof(stat); }
 };
 
 struct SetRequest : virtual Request
@@ -211,11 +264,15 @@ struct SetRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return data.size() + data.size() + sizeof(version); }
 };
 
 struct SetResponse : virtual Response
 {
     Stat stat;
+
+    size_t bytesSize() const override { return sizeof(stat); }
 };
 
 struct ListRequest : virtual Request
@@ -224,12 +281,22 @@ struct ListRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct ListResponse : virtual Response
 {
     std::vector<String> names;
     Stat stat;
+
+    size_t bytesSize() const override
+    {
+        size_t size = sizeof(stat);
+        for (const auto & name : names)
+            size += name.size();
+        return size;
+    }
 };
 
 struct CheckRequest : virtual Request
@@ -239,6 +306,8 @@ struct CheckRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return path; }
+
+    size_t bytesSize() const override { return path.size() + sizeof(version); }
 };
 
 struct CheckResponse : virtual Response
@@ -251,6 +320,14 @@ struct MultiRequest : virtual Request
 
     void addRootPath(const String & root_path) override;
     String getPath() const override { return {}; }
+
+    size_t bytesSize() const override
+    {
+        size_t size = 0;
+        for (const auto & request : requests)
+            size += request->bytesSize();
+        return size;
+    }
 };
 
 struct MultiResponse : virtual Response
@@ -258,6 +335,14 @@ struct MultiResponse : virtual Response
     Responses responses;
 
     void removeRootPath(const String & root_path) override;
+
+    size_t bytesSize() const override
+    {
+        size_t size = 0;
+        for (const auto & response : responses)
+            size += response->bytesSize();
+        return size;
+    }
 };
 
 /// This response may be received only as an element of responses in MultiResponse.
@@ -326,7 +411,7 @@ public:
   * - whenever you receive exception with ZSESSIONEXPIRED code or method isExpired returns true,
   *   the ZooKeeper instance is no longer usable - you may only destroy it and probably create another.
   * - whenever session is expired or ZooKeeper instance is destroying, all callbacks are notified with special event.
-  * - data for callbacks must be alive when ZooKeeper instance is alive.
+  * - data for callbacks must be alive when ZooKeeper instance is alive, so try to avoid capturing references in callbacks, it's error-prone.
   */
 class IKeeper
 {
@@ -343,6 +428,9 @@ public:
     ///
     /// After the method is executed successfully, you must wait for callbacks
     ///  (don't destroy callback data before it will be called).
+    /// TODO: The above line is the description of an error-prone interface. It's better
+    ///  to replace callbacks with std::future results, so the caller shouldn't think about
+    ///  lifetime of the callback data.
     ///
     /// All callbacks are executed sequentially (the execution of callbacks is serialized).
     ///
diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index 5951164f58f..49eb7ad764d 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -198,7 +198,7 @@ std::pair<ResponsePtr, Undo> TestKeeperCreateRequest::process(TestKeeper::Contai
         else
         {
             TestKeeper::Node created_node;
-            created_node.seq_num = 0;
+            created_node.seq_num = 0; //-V1048
             created_node.stat.czxid = zxid;
             created_node.stat.mzxid = zxid;
             created_node.stat.ctime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
@@ -271,7 +271,7 @@ std::pair<ResponsePtr, Undo> TestKeeperRemoveRequest::process(TestKeeper::Contai
         auto & parent = container.at(parentPath(path));
         --parent.stat.numChildren;
         ++parent.stat.cversion;
-        response.error = Error::ZOK;
+        response.error = Error::ZOK; //-V1048
 
         undo = [prev_node, &container, path = path]
         {
@@ -293,7 +293,7 @@ std::pair<ResponsePtr, Undo> TestKeeperExistsRequest::process(TestKeeper::Contai
     if (it != container.end())
     {
         response.stat = it->second.stat;
-        response.error = Error::ZOK;
+        response.error = Error::ZOK; //-V1048
     }
     else
     {
@@ -316,7 +316,7 @@ std::pair<ResponsePtr, Undo> TestKeeperGetRequest::process(TestKeeper::Container
     {
         response.stat = it->second.stat;
         response.data = it->second.data;
-        response.error = Error::ZOK;
+        response.error = Error::ZOK; //-V1048
     }
 
     return { std::make_shared<GetResponse>(response), {} };
@@ -343,7 +343,7 @@ std::pair<ResponsePtr, Undo> TestKeeperSetRequest::process(TestKeeper::Container
         it->second.data = data;
         ++container.at(parentPath(path)).stat.cversion;
         response.stat = it->second.stat;
-        response.error = Error::ZOK;
+        response.error = Error::ZOK; //-V1048
 
         undo = [prev_node, &container, path = path]
         {
@@ -387,7 +387,7 @@ std::pair<ResponsePtr, Undo> TestKeeperListRequest::process(TestKeeper::Containe
         }
 
         response.stat = it->second.stat;
-        response.error = Error::ZOK;
+        response.error = Error::ZOK; //-V1048
     }
 
     return { std::make_shared<ListResponse>(response), {} };
@@ -407,7 +407,7 @@ std::pair<ResponsePtr, Undo> TestKeeperCheckRequest::process(TestKeeper::Contain
     }
     else
     {
-        response.error = Error::ZOK;
+        response.error = Error::ZOK; //-V1048
     }
 
     return { std::make_shared<CheckResponse>(response), {} };
@@ -421,26 +421,38 @@ std::pair<ResponsePtr, Undo> TestKeeperMultiRequest::process(TestKeeper::Contain
 
     try
     {
-        for (const auto & request : requests)
+        auto request_it = requests.begin();
+        response.error = Error::ZOK; //-V1048
+        while (request_it != requests.end())
         {
-            const TestKeeperRequest & concrete_request = dynamic_cast<const TestKeeperRequest &>(*request);
+            const TestKeeperRequest & concrete_request = dynamic_cast<const TestKeeperRequest &>(**request_it);
+            ++request_it;
             auto [ cur_response, undo_action ] = concrete_request.process(container, zxid);
             response.responses.emplace_back(cur_response);
             if (cur_response->error != Error::ZOK)
             {
                 response.error = cur_response->error;
-
-                for (auto it = undo_actions.rbegin(); it != undo_actions.rend(); ++it)
-                    if (*it)
-                        (*it)();
-
-                return { std::make_shared<MultiResponse>(response), {} };
+                break;
+            }
+
+            undo_actions.emplace_back(std::move(undo_action));
+        }
+
+        if (response.error != Error::ZOK)
+        {
+            for (auto it = undo_actions.rbegin(); it != undo_actions.rend(); ++it)
+                if (*it)
+                    (*it)();
+
+            while (request_it != requests.end())
+            {
+                const TestKeeperRequest & concrete_request = dynamic_cast<const TestKeeperRequest &>(**request_it);
+                ++request_it;
+                response.responses.emplace_back(concrete_request.createResponse());
+                response.responses.back()->error = Error::ZRUNTIMEINCONSISTENCY;
             }
-            else
-                undo_actions.emplace_back(std::move(undo_action));
         }
 
-        response.error = Error::ZOK;
         return { std::make_shared<MultiResponse>(response), {} };
     }
     catch (...)
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index 330985e1599..1ee70b0cc3f 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -4,6 +4,7 @@
 #include "TestKeeper.h"
 
 #include <functional>
+#include <filesystem>
 #include <pcg-random/pcg_random.hpp>
 
 #include <common/logger_useful.h>
@@ -17,6 +18,7 @@
 
 #define ZOOKEEPER_CONNECTION_TIMEOUT_MS 1000
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -238,24 +240,25 @@ Coordination::Error ZooKeeper::getChildrenImpl(const std::string & path, Strings
                                    Coordination::Stat * stat,
                                    Coordination::WatchCallback watch_callback)
 {
-    Coordination::Error code = Coordination::Error::ZOK;
-    Poco::Event event;
+    auto future_result = asyncTryGetChildrenNoThrow(path, watch_callback);
 
-    auto callback = [&](const Coordination::ListResponse & response)
+    if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        code = response.error;
+        impl->finalize();
+        return Coordination::Error::ZOPERATIONTIMEOUT;
+    }
+    else
+    {
+        auto response = future_result.get();
+        Coordination::Error code = response.error;
         if (code == Coordination::Error::ZOK)
         {
             res = response.names;
             if (stat)
                 *stat = response.stat;
         }
-        event.set();
-    };
-
-    impl->list(path, callback, watch_callback);
-    event.wait();
-    return code;
+        return code;
+    }
 }
 
 Strings ZooKeeper::getChildren(
@@ -298,20 +301,21 @@ Coordination::Error ZooKeeper::tryGetChildrenWatch(const std::string & path, Str
 
 Coordination::Error ZooKeeper::createImpl(const std::string & path, const std::string & data, int32_t mode, std::string & path_created)
 {
-    Coordination::Error code = Coordination::Error::ZOK;
-    Poco::Event event;
+    auto future_result = asyncTryCreateNoThrow(path, data, mode);
 
-    auto callback = [&](const Coordination::CreateResponse & response)
+    if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        code = response.error;
+        impl->finalize();
+        return Coordination::Error::ZOPERATIONTIMEOUT;
+    }
+    else
+    {
+        auto response = future_result.get();
+        Coordination::Error code = response.error;
         if (code == Coordination::Error::ZOK)
             path_created = response.path_created;
-        event.set();
-    };
-
-    impl->create(path, data, mode & 1, mode & 2, {}, callback);  /// TODO better mode
-    event.wait();
-    return code;
+        return code;
+    }
 }
 
 std::string ZooKeeper::create(const std::string & path, const std::string & data, int32_t mode)
@@ -366,19 +370,19 @@ void ZooKeeper::createAncestors(const std::string & path)
 
 Coordination::Error ZooKeeper::removeImpl(const std::string & path, int32_t version)
 {
-    Coordination::Error code = Coordination::Error::ZOK;
-    Poco::Event event;
+    auto future_result = asyncTryRemoveNoThrow(path, version);
 
-    auto callback = [&](const Coordination::RemoveResponse & response)
+
+    if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        if (response.error != Coordination::Error::ZOK)
-            code = response.error;
-        event.set();
-    };
-
-    impl->remove(path, version, callback);
-    event.wait();
-    return code;
+        impl->finalize();
+        return Coordination::Error::ZOPERATIONTIMEOUT;
+    }
+    else
+    {
+        auto response = future_result.get();
+        return response.error;
+    }
 }
 
 void ZooKeeper::remove(const std::string & path, int32_t version)
@@ -399,20 +403,22 @@ Coordination::Error ZooKeeper::tryRemove(const std::string & path, int32_t versi
 
 Coordination::Error ZooKeeper::existsImpl(const std::string & path, Coordination::Stat * stat, Coordination::WatchCallback watch_callback)
 {
-    Coordination::Error code = Coordination::Error::ZOK;
-    Poco::Event event;
+    auto future_result = asyncTryExistsNoThrow(path, watch_callback);
 
-    auto callback = [&](const Coordination::ExistsResponse & response)
+    if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        code = response.error;
+        impl->finalize();
+        return Coordination::Error::ZOPERATIONTIMEOUT;
+    }
+    else
+    {
+        auto response = future_result.get();
+        Coordination::Error code = response.error;
         if (code == Coordination::Error::ZOK && stat)
             *stat = response.stat;
-        event.set();
-    };
 
-    impl->exists(path, callback, watch_callback);
-    event.wait();
-    return code;
+        return code;
+    }
 }
 
 bool ZooKeeper::exists(const std::string & path, Coordination::Stat * stat, const EventPtr & watch)
@@ -431,24 +437,25 @@ bool ZooKeeper::existsWatch(const std::string & path, Coordination::Stat * stat,
 
 Coordination::Error ZooKeeper::getImpl(const std::string & path, std::string & res, Coordination::Stat * stat, Coordination::WatchCallback watch_callback)
 {
-    Coordination::Error code = Coordination::Error::ZOK;
-    Poco::Event event;
+    auto future_result = asyncTryGetNoThrow(path, watch_callback);
 
-    auto callback = [&](const Coordination::GetResponse & response)
+    if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        code = response.error;
+        impl->finalize();
+        return Coordination::Error::ZOPERATIONTIMEOUT;
+    }
+    else
+    {
+        auto response = future_result.get();
+        Coordination::Error code = response.error;
         if (code == Coordination::Error::ZOK)
         {
             res = response.data;
             if (stat)
                 *stat = response.stat;
         }
-        event.set();
-    };
-
-    impl->get(path, callback, watch_callback);
-    event.wait();
-    return code;
+        return code;
+    }
 }
 
 
@@ -503,20 +510,22 @@ bool ZooKeeper::tryGetWatch(
 Coordination::Error ZooKeeper::setImpl(const std::string & path, const std::string & data,
                            int32_t version, Coordination::Stat * stat)
 {
-    Coordination::Error code = Coordination::Error::ZOK;
-    Poco::Event event;
+    auto future_result = asyncTrySetNoThrow(path, data, version);
 
-    auto callback = [&](const Coordination::SetResponse & response)
+    if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        code = response.error;
+        impl->finalize();
+        return Coordination::Error::ZOPERATIONTIMEOUT;
+    }
+    else
+    {
+        auto response = future_result.get();
+        Coordination::Error code = response.error;
         if (code == Coordination::Error::ZOK && stat)
             *stat = response.stat;
-        event.set();
-    };
 
-    impl->set(path, data, version, callback);
-    event.wait();
-    return code;
+        return code;
+    }
 }
 
 void ZooKeeper::set(const std::string & path, const std::string & data, int32_t version, Coordination::Stat * stat)
@@ -553,19 +562,20 @@ Coordination::Error ZooKeeper::multiImpl(const Coordination::Requests & requests
     if (requests.empty())
         return Coordination::Error::ZOK;
 
-    Coordination::Error code = Coordination::Error::ZOK;
-    Poco::Event event;
+    auto future_result = asyncTryMultiNoThrow(requests);
 
-    auto callback = [&](const Coordination::MultiResponse & response)
+    if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        code = response.error;
+        impl->finalize();
+        return Coordination::Error::ZOPERATIONTIMEOUT;
+    }
+    else
+    {
+        auto response = future_result.get();
+        Coordination::Error code = response.error;
         responses = response.responses;
-        event.set();
-    };
-
-    impl->multi(requests, callback);
-    event.wait();
-    return code;
+        return code;
+    }
 }
 
 Coordination::Responses ZooKeeper::multi(const Coordination::Requests & requests)
@@ -593,7 +603,7 @@ void ZooKeeper::removeChildren(const std::string & path)
         Coordination::Requests ops;
         for (size_t i = 0; i < MULTI_BATCH_SIZE && !children.empty(); ++i)
         {
-            ops.emplace_back(makeRemoveRequest(path + "/" + children.back(), -1));
+            ops.emplace_back(makeRemoveRequest(fs::path(path) / children.back(), -1));
             children.pop_back();
         }
         multi(ops);
@@ -609,9 +619,9 @@ void ZooKeeper::removeChildrenRecursive(const std::string & path, const String &
         Coordination::Requests ops;
         for (size_t i = 0; i < MULTI_BATCH_SIZE && !children.empty(); ++i)
         {
-            removeChildrenRecursive(path + "/" + children.back());
+            removeChildrenRecursive(fs::path(path) / children.back());
             if (likely(keep_child_node.empty() || keep_child_node != children.back()))
-                ops.emplace_back(makeRemoveRequest(path + "/" + children.back(), -1));
+                ops.emplace_back(makeRemoveRequest(fs::path(path) / children.back(), -1));
             children.pop_back();
         }
         multi(ops);
@@ -629,7 +639,7 @@ void ZooKeeper::tryRemoveChildrenRecursive(const std::string & path, const Strin
         Strings batch;
         for (size_t i = 0; i < MULTI_BATCH_SIZE && !children.empty(); ++i)
         {
-            String child_path = path + "/" + children.back();
+            String child_path = fs::path(path) / children.back();
             tryRemoveChildrenRecursive(child_path);
             if (likely(keep_child_node.empty() || keep_child_node != children.back()))
             {
@@ -700,9 +710,7 @@ bool ZooKeeper::waitForDisappear(const std::string & path, const WaitCondition &
         /// Use getData insteand of exists to avoid watch leak.
         impl->get(path, callback, watch);
 
-        if (!condition)
-            state->event.wait();
-        else if (!state->event.tryWait(1000))
+        if (!state->event.tryWait(1000))
             continue;
 
         if (state->code == int32_t(Coordination::Error::ZNONODE))
@@ -752,8 +760,21 @@ std::future<Coordination::CreateResponse> ZooKeeper::asyncCreate(const std::stri
     return future;
 }
 
+std::future<Coordination::CreateResponse> ZooKeeper::asyncTryCreateNoThrow(const std::string & path, const std::string & data, int32_t mode)
+{
+    auto promise = std::make_shared<std::promise<Coordination::CreateResponse>>();
+    auto future = promise->get_future();
 
-std::future<Coordination::GetResponse> ZooKeeper::asyncGet(const std::string & path)
+    auto callback = [promise](const Coordination::CreateResponse & response) mutable
+    {
+        promise->set_value(response);
+    };
+
+    impl->create(path, data, mode & 1, mode & 2, {}, std::move(callback));
+    return future;
+}
+
+std::future<Coordination::GetResponse> ZooKeeper::asyncGet(const std::string & path, Coordination::WatchCallback watch_callback)
 {
     auto promise = std::make_shared<std::promise<Coordination::GetResponse>>();
     auto future = promise->get_future();
@@ -766,7 +787,21 @@ std::future<Coordination::GetResponse> ZooKeeper::asyncGet(const std::string & p
             promise->set_value(response);
     };
 
-    impl->get(path, std::move(callback), {});
+    impl->get(path, std::move(callback), watch_callback);
+    return future;
+}
+
+std::future<Coordination::GetResponse> ZooKeeper::asyncTryGetNoThrow(const std::string & path, Coordination::WatchCallback watch_callback)
+{
+    auto promise = std::make_shared<std::promise<Coordination::GetResponse>>();
+    auto future = promise->get_future();
+
+    auto callback = [promise](const Coordination::GetResponse & response) mutable
+    {
+        promise->set_value(response);
+    };
+
+    impl->get(path, std::move(callback), watch_callback);
     return future;
 }
 
@@ -788,7 +823,7 @@ std::future<Coordination::GetResponse> ZooKeeper::asyncTryGet(const std::string
     return future;
 }
 
-std::future<Coordination::ExistsResponse> ZooKeeper::asyncExists(const std::string & path)
+std::future<Coordination::ExistsResponse> ZooKeeper::asyncExists(const std::string & path, Coordination::WatchCallback watch_callback)
 {
     auto promise = std::make_shared<std::promise<Coordination::ExistsResponse>>();
     auto future = promise->get_future();
@@ -801,7 +836,21 @@ std::future<Coordination::ExistsResponse> ZooKeeper::asyncExists(const std::stri
             promise->set_value(response);
     };
 
-    impl->exists(path, std::move(callback), {});
+    impl->exists(path, std::move(callback), watch_callback);
+    return future;
+}
+
+std::future<Coordination::ExistsResponse> ZooKeeper::asyncTryExistsNoThrow(const std::string & path, Coordination::WatchCallback watch_callback)
+{
+    auto promise = std::make_shared<std::promise<Coordination::ExistsResponse>>();
+    auto future = promise->get_future();
+
+    auto callback = [promise](const Coordination::ExistsResponse & response) mutable
+    {
+        promise->set_value(response);
+    };
+
+    impl->exists(path, std::move(callback), watch_callback);
     return future;
 }
 
@@ -822,7 +871,22 @@ std::future<Coordination::SetResponse> ZooKeeper::asyncSet(const std::string & p
     return future;
 }
 
-std::future<Coordination::ListResponse> ZooKeeper::asyncGetChildren(const std::string & path)
+
+std::future<Coordination::SetResponse> ZooKeeper::asyncTrySetNoThrow(const std::string & path, const std::string & data, int32_t version)
+{
+    auto promise = std::make_shared<std::promise<Coordination::SetResponse>>();
+    auto future = promise->get_future();
+
+    auto callback = [promise](const Coordination::SetResponse & response) mutable
+    {
+        promise->set_value(response);
+    };
+
+    impl->set(path, data, version, std::move(callback));
+    return future;
+}
+
+std::future<Coordination::ListResponse> ZooKeeper::asyncGetChildren(const std::string & path, Coordination::WatchCallback watch_callback)
 {
     auto promise = std::make_shared<std::promise<Coordination::ListResponse>>();
     auto future = promise->get_future();
@@ -835,7 +899,21 @@ std::future<Coordination::ListResponse> ZooKeeper::asyncGetChildren(const std::s
             promise->set_value(response);
     };
 
-    impl->list(path, std::move(callback), {});
+    impl->list(path, std::move(callback), watch_callback);
+    return future;
+}
+
+std::future<Coordination::ListResponse> ZooKeeper::asyncTryGetChildrenNoThrow(const std::string & path, Coordination::WatchCallback watch_callback)
+{
+    auto promise = std::make_shared<std::promise<Coordination::ListResponse>>();
+    auto future = promise->get_future();
+
+    auto callback = [promise](const Coordination::ListResponse & response) mutable
+    {
+        promise->set_value(response);
+    };
+
+    impl->list(path, std::move(callback), watch_callback);
     return future;
 }
 
@@ -878,7 +956,21 @@ std::future<Coordination::RemoveResponse> ZooKeeper::asyncTryRemove(const std::s
     return future;
 }
 
-std::future<Coordination::MultiResponse> ZooKeeper::tryAsyncMulti(const Coordination::Requests & ops)
+std::future<Coordination::RemoveResponse> ZooKeeper::asyncTryRemoveNoThrow(const std::string & path, int32_t version)
+{
+    auto promise = std::make_shared<std::promise<Coordination::RemoveResponse>>();
+    auto future = promise->get_future();
+
+    auto callback = [promise](const Coordination::RemoveResponse & response) mutable
+    {
+        promise->set_value(response);
+    };
+
+    impl->remove(path, version, std::move(callback));
+    return future;
+}
+
+std::future<Coordination::MultiResponse> ZooKeeper::asyncTryMultiNoThrow(const Coordination::Requests & ops)
 {
     auto promise = std::make_shared<std::promise<Coordination::MultiResponse>>();
     auto future = promise->get_future();
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index 4a65ff070f7..7aafee52bf0 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -39,9 +39,6 @@ constexpr size_t MULTI_BATCH_SIZE = 100;
 /// watch notification.
 /// Callback-based watch interface is also provided.
 ///
-/// Read-only methods retry retry_num times if recoverable errors like OperationTimeout
-/// or ConnectionLoss are encountered.
-///
 /// Modifying methods do not retry, because it leads to problems of the double-delete type.
 ///
 /// Methods with names not starting at try- raise KeeperException on any error.
@@ -220,39 +217,55 @@ public:
     /// auto result1 = future1.get();
     /// auto result2 = future2.get();
     ///
-    /// Future should not be destroyed before the result is gotten.
+    /// NoThrow versions never throw any exception on future.get(), even on SessionExpired error.
 
     using FutureCreate = std::future<Coordination::CreateResponse>;
     FutureCreate asyncCreate(const std::string & path, const std::string & data, int32_t mode);
+    /// Like the previous one but don't throw any exceptions on future.get()
+    FutureCreate asyncTryCreateNoThrow(const std::string & path, const std::string & data, int32_t mode);
 
     using FutureGet = std::future<Coordination::GetResponse>;
-    FutureGet asyncGet(const std::string & path);
-
-    FutureGet asyncTryGet(const std::string & path);
+    FutureGet asyncGet(const std::string & path, Coordination::WatchCallback watch_callback = {});
+    /// Like the previous one but don't throw any exceptions on future.get()
+    FutureGet asyncTryGetNoThrow(const std::string & path, Coordination::WatchCallback watch_callback = {});
 
     using FutureExists = std::future<Coordination::ExistsResponse>;
-    FutureExists asyncExists(const std::string & path);
+    FutureExists asyncExists(const std::string & path, Coordination::WatchCallback watch_callback = {});
+    /// Like the previous one but don't throw any exceptions on future.get()
+    FutureExists asyncTryExistsNoThrow(const std::string & path, Coordination::WatchCallback watch_callback = {});
 
     using FutureGetChildren = std::future<Coordination::ListResponse>;
-    FutureGetChildren asyncGetChildren(const std::string & path);
+    FutureGetChildren asyncGetChildren(const std::string & path, Coordination::WatchCallback watch_callback = {});
+    /// Like the previous one but don't throw any exceptions on future.get()
+    FutureGetChildren asyncTryGetChildrenNoThrow(const std::string & path, Coordination::WatchCallback watch_callback = {});
 
     using FutureSet = std::future<Coordination::SetResponse>;
     FutureSet asyncSet(const std::string & path, const std::string & data, int32_t version = -1);
+    /// Like the previous one but don't throw any exceptions on future.get()
+    FutureSet asyncTrySetNoThrow(const std::string & path, const std::string & data, int32_t version = -1);
 
     using FutureRemove = std::future<Coordination::RemoveResponse>;
     FutureRemove asyncRemove(const std::string & path, int32_t version = -1);
+    /// Like the previous one but don't throw any exceptions on future.get()
+    FutureRemove asyncTryRemoveNoThrow(const std::string & path, int32_t version = -1);
 
+    using FutureMulti = std::future<Coordination::MultiResponse>;
+    FutureMulti asyncMulti(const Coordination::Requests & ops);
+    /// Like the previous one but don't throw any exceptions on future.get()
+    FutureMulti asyncTryMultiNoThrow(const Coordination::Requests & ops);
+
+    /// Very specific methods introduced without following general style. Implements
+    /// some custom throw/no throw logic on future.get().
+    ///
     /// Doesn't throw in the following cases:
     /// * The node doesn't exist
     /// * The versions do not match
     /// * The node has children
     FutureRemove asyncTryRemove(const std::string & path, int32_t version = -1);
 
-    using FutureMulti = std::future<Coordination::MultiResponse>;
-    FutureMulti asyncMulti(const Coordination::Requests & ops);
-
-    /// Like the previous one but don't throw any exceptions on future.get()
-    FutureMulti tryAsyncMulti(const Coordination::Requests & ops);
+    /// Doesn't throw in the following cases:
+    /// * The node doesn't exist
+    FutureGet asyncTryGet(const std::string & path);
 
     void finalize();
 
@@ -262,7 +275,7 @@ private:
     void init(const std::string & implementation_, const Strings & hosts_, const std::string & identity_,
               int32_t session_timeout_ms_, int32_t operation_timeout_ms_, const std::string & chroot_);
 
-    /// The following methods don't throw exceptions but return error codes.
+    /// The following methods don't any throw exceptions but return error codes.
     Coordination::Error createImpl(const std::string & path, const std::string & data, int32_t mode, std::string & path_created);
     Coordination::Error removeImpl(const std::string & path, int32_t version);
     Coordination::Error getImpl(
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index 56f9de31ec8..50bdc6c77ba 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -455,6 +455,39 @@ ZooKeeperResponsePtr ZooKeeperCheckRequest::makeResponse() const { return std::m
 ZooKeeperResponsePtr ZooKeeperMultiRequest::makeResponse() const { return std::make_shared<ZooKeeperMultiResponse>(requests); }
 ZooKeeperResponsePtr ZooKeeperCloseRequest::makeResponse() const { return std::make_shared<ZooKeeperCloseResponse>(); }
 
+void ZooKeeperSessionIDRequest::writeImpl(WriteBuffer & out) const
+{
+    Coordination::write(internal_id, out);
+    Coordination::write(session_timeout_ms, out);
+    Coordination::write(server_id, out);
+}
+
+void ZooKeeperSessionIDRequest::readImpl(ReadBuffer & in)
+{
+    Coordination::read(internal_id, in);
+    Coordination::read(session_timeout_ms, in);
+    Coordination::read(server_id, in);
+}
+
+Coordination::ZooKeeperResponsePtr ZooKeeperSessionIDRequest::makeResponse() const
+{
+    return std::make_shared<ZooKeeperSessionIDResponse>();
+}
+
+void ZooKeeperSessionIDResponse::readImpl(ReadBuffer & in)
+{
+    Coordination::read(internal_id, in);
+    Coordination::read(session_id, in);
+    Coordination::read(server_id, in);
+}
+
+void ZooKeeperSessionIDResponse::writeImpl(WriteBuffer & out) const
+{
+    Coordination::write(internal_id, out);
+    Coordination::write(session_id, out);
+    Coordination::write(server_id, out);
+}
+
 void ZooKeeperRequestFactory::registerRequest(OpNum op_num, Creator creator)
 {
     if (!op_num_to_request.try_emplace(op_num, creator).second)
@@ -511,6 +544,7 @@ ZooKeeperRequestFactory::ZooKeeperRequestFactory()
     registerZooKeeperRequest<OpNum::List, ZooKeeperListRequest>(*this);
     registerZooKeeperRequest<OpNum::Check, ZooKeeperCheckRequest>(*this);
     registerZooKeeperRequest<OpNum::Multi, ZooKeeperMultiRequest>(*this);
+    registerZooKeeperRequest<OpNum::SessionID, ZooKeeperSessionIDRequest>(*this);
 }
 
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 92b1e7c9858..ced154133b5 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -25,7 +25,7 @@ namespace Coordination
 struct ZooKeeperResponse : virtual Response
 {
     XID xid = 0;
-    int64_t zxid;
+    int64_t zxid = 0;
 
     virtual ~ZooKeeperResponse() override = default;
     virtual void readImpl(ReadBuffer &) = 0;
@@ -84,6 +84,8 @@ struct ZooKeeperSyncRequest final : ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return ZooKeeperRequest::bytesSize() + path.size(); }
 };
 
 struct ZooKeeperSyncResponse final : ZooKeeperResponse
@@ -92,6 +94,8 @@ struct ZooKeeperSyncResponse final : ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Sync; }
+
+    size_t bytesSize() const override { return path.size(); }
 };
 
 struct ZooKeeperHeartbeatResponse final : ZooKeeperResponse
@@ -128,6 +132,9 @@ struct ZooKeeperAuthRequest final : ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return ZooKeeperRequest::bytesSize() + sizeof(xid) +
+            sizeof(type) + scheme.size() + data.size(); }
 };
 
 struct ZooKeeperAuthResponse final : ZooKeeperResponse
@@ -136,6 +143,8 @@ struct ZooKeeperAuthResponse final : ZooKeeperResponse
     void writeImpl(WriteBuffer &) const override {}
 
     OpNum getOpNum() const override { return OpNum::Auth; }
+
+    size_t bytesSize() const override { return ZooKeeperResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperCloseRequest final : ZooKeeperRequest
@@ -172,6 +181,8 @@ struct ZooKeeperCreateRequest final : public CreateRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return CreateRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperCreateResponse final : CreateResponse, ZooKeeperResponse
@@ -181,6 +192,8 @@ struct ZooKeeperCreateResponse final : CreateResponse, ZooKeeperResponse
     void writeImpl(WriteBuffer & out) const override;
 
     OpNum getOpNum() const override { return OpNum::Create; }
+
+    size_t bytesSize() const override { return CreateResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperRemoveRequest final : RemoveRequest, ZooKeeperRequest
@@ -194,6 +207,8 @@ struct ZooKeeperRemoveRequest final : RemoveRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return RemoveRequest::bytesSize() + sizeof(xid); }
 };
 
 struct ZooKeeperRemoveResponse final : RemoveResponse, ZooKeeperResponse
@@ -201,6 +216,8 @@ struct ZooKeeperRemoveResponse final : RemoveResponse, ZooKeeperResponse
     void readImpl(ReadBuffer &) override {}
     void writeImpl(WriteBuffer &) const override {}
     OpNum getOpNum() const override { return OpNum::Remove; }
+
+    size_t bytesSize() const override { return RemoveResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperExistsRequest final : ExistsRequest, ZooKeeperRequest
@@ -210,7 +227,9 @@ struct ZooKeeperExistsRequest final : ExistsRequest, ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
 
     ZooKeeperResponsePtr makeResponse() const override;
-    bool isReadRequest() const override { return !has_watch; }
+    bool isReadRequest() const override { return true; }
+
+    size_t bytesSize() const override { return ExistsRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperExistsResponse final : ExistsResponse, ZooKeeperResponse
@@ -218,6 +237,8 @@ struct ZooKeeperExistsResponse final : ExistsResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Exists; }
+
+    size_t bytesSize() const override { return ExistsResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperGetRequest final : GetRequest, ZooKeeperRequest
@@ -227,7 +248,9 @@ struct ZooKeeperGetRequest final : GetRequest, ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
 
     ZooKeeperResponsePtr makeResponse() const override;
-    bool isReadRequest() const override { return !has_watch; }
+    bool isReadRequest() const override { return true; }
+
+    size_t bytesSize() const override { return GetRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperGetResponse final : GetResponse, ZooKeeperResponse
@@ -235,6 +258,8 @@ struct ZooKeeperGetResponse final : GetResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Get; }
+
+    size_t bytesSize() const override { return GetResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperSetRequest final : SetRequest, ZooKeeperRequest
@@ -247,6 +272,8 @@ struct ZooKeeperSetRequest final : SetRequest, ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override { return false; }
+
+    size_t bytesSize() const override { return SetRequest::bytesSize() + sizeof(xid); }
 };
 
 struct ZooKeeperSetResponse final : SetResponse, ZooKeeperResponse
@@ -254,6 +281,8 @@ struct ZooKeeperSetResponse final : SetResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::Set; }
+
+    size_t bytesSize() const override { return SetResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperListRequest : ListRequest, ZooKeeperRequest
@@ -262,7 +291,9 @@ struct ZooKeeperListRequest : ListRequest, ZooKeeperRequest
     void writeImpl(WriteBuffer & out) const override;
     void readImpl(ReadBuffer & in) override;
     ZooKeeperResponsePtr makeResponse() const override;
-    bool isReadRequest() const override { return !has_watch; }
+    bool isReadRequest() const override { return true; }
+
+    size_t bytesSize() const override { return ListRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperSimpleListRequest final : ZooKeeperListRequest
@@ -275,6 +306,8 @@ struct ZooKeeperListResponse : ListResponse, ZooKeeperResponse
     void readImpl(ReadBuffer & in) override;
     void writeImpl(WriteBuffer & out) const override;
     OpNum getOpNum() const override { return OpNum::List; }
+
+    size_t bytesSize() const override { return ListResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperSimpleListResponse final : ZooKeeperListResponse
@@ -292,7 +325,9 @@ struct ZooKeeperCheckRequest final : CheckRequest, ZooKeeperRequest
     void readImpl(ReadBuffer & in) override;
 
     ZooKeeperResponsePtr makeResponse() const override;
-    bool isReadRequest() const override { return !has_watch; }
+    bool isReadRequest() const override { return true; }
+
+    size_t bytesSize() const override { return CheckRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperCheckResponse final : CheckResponse, ZooKeeperResponse
@@ -300,6 +335,8 @@ struct ZooKeeperCheckResponse final : CheckResponse, ZooKeeperResponse
     void readImpl(ReadBuffer &) override {}
     void writeImpl(WriteBuffer &) const override {}
     OpNum getOpNum() const override { return OpNum::Check; }
+
+    size_t bytesSize() const override { return CheckResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 /// This response may be received only as an element of responses in MultiResponse.
@@ -309,6 +346,8 @@ struct ZooKeeperErrorResponse final : ErrorResponse, ZooKeeperResponse
     void writeImpl(WriteBuffer & out) const override;
 
     OpNum getOpNum() const override { return OpNum::Error; }
+
+    size_t bytesSize() const override { return ErrorResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
 };
 
 struct ZooKeeperMultiRequest final : MultiRequest, ZooKeeperRequest
@@ -323,6 +362,8 @@ struct ZooKeeperMultiRequest final : MultiRequest, ZooKeeperRequest
 
     ZooKeeperResponsePtr makeResponse() const override;
     bool isReadRequest() const override;
+
+    size_t bytesSize() const override { return MultiRequest::bytesSize() + sizeof(xid) + sizeof(has_watch); }
 };
 
 struct ZooKeeperMultiResponse final : MultiResponse, ZooKeeperResponse
@@ -346,6 +387,41 @@ struct ZooKeeperMultiResponse final : MultiResponse, ZooKeeperResponse
 
     void writeImpl(WriteBuffer & out) const override;
 
+    size_t bytesSize() const override { return MultiResponse::bytesSize() + sizeof(xid) + sizeof(zxid); }
+};
+
+/// Fake internal coordination (keeper) response. Never received from client
+/// and never send to client.
+struct ZooKeeperSessionIDRequest final : ZooKeeperRequest
+{
+    int64_t internal_id;
+    int64_t session_timeout_ms;
+    /// Who requested this session
+    int32_t server_id;
+
+    Coordination::OpNum getOpNum() const override { return OpNum::SessionID; }
+    String getPath() const override { return {}; }
+    void writeImpl(WriteBuffer & out) const override;
+    void readImpl(ReadBuffer & in) override;
+
+    Coordination::ZooKeeperResponsePtr makeResponse() const override;
+    bool isReadRequest() const override { return false; }
+};
+
+/// Fake internal coordination (keeper) response. Never received from client
+/// and never send to client.
+struct ZooKeeperSessionIDResponse final : ZooKeeperResponse
+{
+    int64_t internal_id;
+    int64_t session_id;
+    /// Who requested this session
+    int32_t server_id;
+
+    void readImpl(ReadBuffer & in) override;
+
+    void writeImpl(WriteBuffer & out) const override;
+
+    Coordination::OpNum getOpNum() const override { return OpNum::SessionID; }
 };
 
 class ZooKeeperRequestFactory final : private boost::noncopyable
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.cpp b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
index 295094b336b..d2dde4c4cdd 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.cpp
@@ -21,6 +21,7 @@ static const std::unordered_set<int32_t> VALID_OPERATIONS =
     static_cast<int32_t>(OpNum::Check),
     static_cast<int32_t>(OpNum::Multi),
     static_cast<int32_t>(OpNum::Auth),
+    static_cast<int32_t>(OpNum::SessionID),
 };
 
 std::string toString(OpNum op_num)
@@ -55,6 +56,8 @@ std::string toString(OpNum op_num)
             return "Heartbeat";
         case OpNum::Auth:
             return "Auth";
+        case OpNum::SessionID:
+            return "SessionID";
     }
     int32_t raw_op = static_cast<int32_t>(op_num);
     throw Exception("Operation " + std::to_string(raw_op) + " is unknown", Error::ZUNIMPLEMENTED);
diff --git a/src/Common/ZooKeeper/ZooKeeperConstants.h b/src/Common/ZooKeeper/ZooKeeperConstants.h
index 81ca6c6a460..f91204693a0 100644
--- a/src/Common/ZooKeeper/ZooKeeperConstants.h
+++ b/src/Common/ZooKeeper/ZooKeeperConstants.h
@@ -30,6 +30,7 @@ enum class OpNum : int32_t
     Check = 13,
     Multi = 14,
     Auth = 100,
+    SessionID = 997, /// Special internal request
 };
 
 std::string toString(OpNum op_num);
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index 2314139af69..a717052a1ba 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -796,8 +796,17 @@ void ZooKeeper::receiveEvent()
         /// In case we cannot read the response, we should indicate it as the error of that type
         ///  when the user cannot assume whether the request was processed or not.
         response->error = Error::ZCONNECTIONLOSS;
-        if (request_info.callback)
-            request_info.callback(*response);
+
+        try
+        {
+            if (request_info.callback)
+                request_info.callback(*response);
+        }
+        catch (...)
+        {
+            /// Throw initial exception, not exception from callback.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
 
         throw;
     }
@@ -1003,6 +1012,16 @@ void ZooKeeper::pushRequest(RequestInfo && info)
     ProfileEvents::increment(ProfileEvents::ZooKeeperTransactions);
 }
 
+void ZooKeeper::executeGenericRequest(
+    const ZooKeeperRequestPtr & request,
+    ResponseCallback callback)
+{
+    RequestInfo request_info;
+    request_info.request = request;
+    request_info.callback = callback;
+
+    pushRequest(std::move(request_info));
+}
 
 void ZooKeeper::create(
     const String & path,
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index afd2e89538f..2210fd98b18 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -121,6 +121,9 @@ public:
     /// Useful to check owner of ephemeral node.
     int64_t getSessionID() const override { return session_id; }
 
+    void executeGenericRequest(
+        const ZooKeeperRequestPtr & request,
+        ResponseCallback callback);
 
     /// See the documentation about semantics of these methods in IKeeper class.
 
diff --git a/src/Common/ZooKeeper/tests/CMakeLists.txt b/src/Common/ZooKeeper/examples/CMakeLists.txt
similarity index 100%
rename from src/Common/ZooKeeper/tests/CMakeLists.txt
rename to src/Common/ZooKeeper/examples/CMakeLists.txt
diff --git a/src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp b/src/Common/ZooKeeper/examples/zk_many_watches_reconnect.cpp
similarity index 100%
rename from src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp
rename to src/Common/ZooKeeper/examples/zk_many_watches_reconnect.cpp
diff --git a/src/Common/ZooKeeper/tests/zkutil_test_async.cpp b/src/Common/ZooKeeper/examples/zkutil_test_async.cpp
similarity index 100%
rename from src/Common/ZooKeeper/tests/zkutil_test_async.cpp
rename to src/Common/ZooKeeper/examples/zkutil_test_async.cpp
diff --git a/src/Common/ZooKeeper/tests/zkutil_test_commands.cpp b/src/Common/ZooKeeper/examples/zkutil_test_commands.cpp
similarity index 100%
rename from src/Common/ZooKeeper/tests/zkutil_test_commands.cpp
rename to src/Common/ZooKeeper/examples/zkutil_test_commands.cpp
diff --git a/src/Common/ZooKeeper/tests/zkutil_test_commands_new_lib.cpp b/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
similarity index 100%
rename from src/Common/ZooKeeper/tests/zkutil_test_commands_new_lib.cpp
rename to src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
diff --git a/src/Common/ZooKeeper/tests/zookeeper_impl.cpp b/src/Common/ZooKeeper/examples/zookeeper_impl.cpp
similarity index 100%
rename from src/Common/ZooKeeper/tests/zookeeper_impl.cpp
rename to src/Common/ZooKeeper/examples/zookeeper_impl.cpp
diff --git a/src/Common/checkStackSize.cpp b/src/Common/checkStackSize.cpp
index e94abc08c6b..54ffab7f3d0 100644
--- a/src/Common/checkStackSize.cpp
+++ b/src/Common/checkStackSize.cpp
@@ -49,7 +49,7 @@ __attribute__((__weak__)) void checkStackSize()
         stack_address = reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(pthread_get_stackaddr_np(thread)) - max_stack_size);
 #else
         pthread_attr_t attr;
-#   if defined(__FreeBSD__)
+#   if defined(__FreeBSD__) || defined(OS_SUNOS)
         pthread_attr_init(&attr);
         if (0 != pthread_attr_get_np(pthread_self(), &attr))
             throwFromErrno("Cannot pthread_attr_get_np", ErrorCodes::CANNOT_PTHREAD_ATTR);
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index ee2bfe3df53..6844f0fa9e3 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -15,3 +15,5 @@
 #cmakedefine01 USE_GRPC
 #cmakedefine01 USE_STATS
 #cmakedefine01 CLICKHOUSE_SPLIT_BINARY
+#cmakedefine01 USE_DATASKETCHES
+#cmakedefine01 USE_YAML_CPP
diff --git a/src/Common/config_version.h.in b/src/Common/config_version.h.in
index 880824f8ad0..09f1e5500ad 100644
--- a/src/Common/config_version.h.in
+++ b/src/Common/config_version.h.in
@@ -15,6 +15,7 @@
 #cmakedefine VERSION_DESCRIBE "@VERSION_DESCRIBE@"
 #cmakedefine VERSION_GITHASH "@VERSION_GITHASH@"
 #cmakedefine VERSION_INTEGER @VERSION_INTEGER@
+#cmakedefine VERSION_DATE @VERSION_DATE@
 
 #if defined(VERSION_MAJOR)
 #define DBMS_VERSION_MAJOR VERSION_MAJOR
diff --git a/src/Common/tests/CMakeLists.txt b/src/Common/examples/CMakeLists.txt
similarity index 90%
rename from src/Common/tests/CMakeLists.txt
rename to src/Common/examples/CMakeLists.txt
index 2dd56e862f0..64d28fec5c2 100644
--- a/src/Common/tests/CMakeLists.txt
+++ b/src/Common/examples/CMakeLists.txt
@@ -7,9 +7,6 @@ endif()
 add_executable (sip_hash_perf sip_hash_perf.cpp)
 target_link_libraries (sip_hash_perf PRIVATE clickhouse_common_io)
 
-add_executable (auto_array auto_array.cpp)
-target_link_libraries (auto_array PRIVATE clickhouse_common_io)
-
 add_executable (small_table small_table.cpp)
 target_link_libraries (small_table PRIVATE clickhouse_common_io)
 
@@ -35,11 +32,8 @@ target_include_directories(radix_sort SYSTEM PRIVATE ${PDQSORT_INCLUDE_DIR})
 add_executable (arena_with_free_lists arena_with_free_lists.cpp)
 target_link_libraries (arena_with_free_lists PRIVATE dbms)
 
-add_executable (pod_array pod_array.cpp)
-target_link_libraries (pod_array PRIVATE clickhouse_common_io)
-
 add_executable (lru_hash_map_perf lru_hash_map_perf.cpp)
-target_link_libraries (lru_hash_map_perf PRIVATE clickhouse_common_io)
+target_link_libraries (lru_hash_map_perf PRIVATE dbms)
 
 add_executable (thread_creation_latency thread_creation_latency.cpp)
 target_link_libraries (thread_creation_latency PRIVATE clickhouse_common_io)
@@ -52,7 +46,11 @@ target_link_libraries (space_saving PRIVATE clickhouse_common_io)
 
 add_executable (integer_hash_tables_and_hashes integer_hash_tables_and_hashes.cpp)
 target_include_directories (integer_hash_tables_and_hashes SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
-target_link_libraries (integer_hash_tables_and_hashes PRIVATE dbms)
+target_link_libraries (integer_hash_tables_and_hashes PRIVATE dbms abseil_swiss_tables)
+
+add_executable (integer_hash_tables_benchmark integer_hash_tables_benchmark.cpp)
+target_include_directories (integer_hash_tables_benchmark SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
+target_link_libraries (integer_hash_tables_benchmark PRIVATE dbms abseil_swiss_tables)
 
 add_executable (cow_columns cow_columns.cpp)
 target_link_libraries (cow_columns PRIVATE clickhouse_common_io)
diff --git a/src/Common/tests/arena_with_free_lists.cpp b/src/Common/examples/arena_with_free_lists.cpp
similarity index 84%
rename from src/Common/tests/arena_with_free_lists.cpp
rename to src/Common/examples/arena_with_free_lists.cpp
index d02fadca794..4c22cd98892 100644
--- a/src/Common/tests/arena_with_free_lists.cpp
+++ b/src/Common/examples/arena_with_free_lists.cpp
@@ -135,24 +135,24 @@ struct Dictionary
     template <typename Value> using ContainerType = Value[];
     template <typename Value> using ContainerPtrType = std::unique_ptr<ContainerType<Value>>;
 
-    enum class AttributeUnderlyingType
+    enum class AttributeUnderlyingTypeTest
     {
-        utUInt8,
-        utUInt16,
-        utUInt32,
-        utUInt64,
-        utInt8,
-        utInt16,
-        utInt32,
-        utInt64,
-        utFloat32,
-        utFloat64,
-        utString
+        UInt8,
+        UInt16,
+        UInt32,
+        UInt64,
+        Int8,
+        Int16,
+        Int32,
+        Int64,
+        Float32,
+        Float64,
+        String
     };
 
     struct Attribute final
     {
-        AttributeUnderlyingType type;
+        AttributeUnderlyingTypeTest type;
         std::variant<
             UInt8, UInt16, UInt32, UInt64,
             Int8, Int16, Int32, Int64,
@@ -172,17 +172,17 @@ struct Dictionary
     {
         switch (attribute.type)
         {
-            case AttributeUnderlyingType::utUInt8: std::get<ContainerPtrType<UInt8>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
-            case AttributeUnderlyingType::utUInt16: std::get<ContainerPtrType<UInt16>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
-            case AttributeUnderlyingType::utUInt32: std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
-            case AttributeUnderlyingType::utUInt64: std::get<ContainerPtrType<UInt64>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
-            case AttributeUnderlyingType::utInt8: std::get<ContainerPtrType<Int8>>(attribute.arrays)[idx] = value.get<Int64>(); break;
-            case AttributeUnderlyingType::utInt16: std::get<ContainerPtrType<Int16>>(attribute.arrays)[idx] = value.get<Int64>(); break;
-            case AttributeUnderlyingType::utInt32: std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = value.get<Int64>(); break;
-            case AttributeUnderlyingType::utInt64: std::get<ContainerPtrType<Int64>>(attribute.arrays)[idx] = value.get<Int64>(); break;
-            case AttributeUnderlyingType::utFloat32: std::get<ContainerPtrType<Float32>>(attribute.arrays)[idx] = value.get<Float64>(); break;
-            case AttributeUnderlyingType::utFloat64: std::get<ContainerPtrType<Float64>>(attribute.arrays)[idx] = value.get<Float64>(); break;
-            case AttributeUnderlyingType::utString:
+            case AttributeUnderlyingTypeTest::UInt8: std::get<ContainerPtrType<UInt8>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::UInt16: std::get<ContainerPtrType<UInt16>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::UInt32: std::get<ContainerPtrType<UInt32>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::UInt64: std::get<ContainerPtrType<UInt64>>(attribute.arrays)[idx] = value.get<UInt64>(); break;
+            case AttributeUnderlyingTypeTest::Int8: std::get<ContainerPtrType<Int8>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Int16: std::get<ContainerPtrType<Int16>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Int32: std::get<ContainerPtrType<Int32>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Int64: std::get<ContainerPtrType<Int64>>(attribute.arrays)[idx] = value.get<Int64>(); break;
+            case AttributeUnderlyingTypeTest::Float32: std::get<ContainerPtrType<Float32>>(attribute.arrays)[idx] = value.get<Float64>(); break;
+            case AttributeUnderlyingTypeTest::Float64: std::get<ContainerPtrType<Float64>>(attribute.arrays)[idx] = value.get<Float64>(); break;
+            case AttributeUnderlyingTypeTest::String:
             {
                 const auto & string = value.get<String>();
                 auto & string_ref = std::get<ContainerPtrType<StringRef>>(attribute.arrays)[idx];
@@ -308,7 +308,7 @@ int main(int argc, char ** argv)
     constexpr size_t cache_size = 1024;
 
     Dictionary::Attribute attr;
-    attr.type = Dictionary::AttributeUnderlyingType::utString;
+    attr.type = Dictionary::AttributeUnderlyingTypeTest::String;
     std::get<Dictionary::ContainerPtrType<StringRef>>(attr.arrays).reset(new StringRef[cache_size]{});  // NOLINT
 
     while (true)
diff --git a/src/Common/tests/array_cache.cpp b/src/Common/examples/array_cache.cpp
similarity index 100%
rename from src/Common/tests/array_cache.cpp
rename to src/Common/examples/array_cache.cpp
diff --git a/src/Common/tests/average.cpp b/src/Common/examples/average.cpp
similarity index 100%
rename from src/Common/tests/average.cpp
rename to src/Common/examples/average.cpp
diff --git a/src/Common/tests/chaos_sanitizer.cpp b/src/Common/examples/chaos_sanitizer.cpp
similarity index 100%
rename from src/Common/tests/chaos_sanitizer.cpp
rename to src/Common/examples/chaos_sanitizer.cpp
diff --git a/src/Common/tests/compact_array.cpp b/src/Common/examples/compact_array.cpp
similarity index 99%
rename from src/Common/tests/compact_array.cpp
rename to src/Common/examples/compact_array.cpp
index a63859ac712..af6257e1963 100644
--- a/src/Common/tests/compact_array.cpp
+++ b/src/Common/examples/compact_array.cpp
@@ -1,5 +1,5 @@
 /// Bug in GCC: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
@@ -263,6 +263,6 @@ int main()
     return 0;
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
diff --git a/src/Common/tests/cow_columns.cpp b/src/Common/examples/cow_columns.cpp
similarity index 100%
rename from src/Common/tests/cow_columns.cpp
rename to src/Common/examples/cow_columns.cpp
diff --git a/src/Common/tests/cow_compositions.cpp b/src/Common/examples/cow_compositions.cpp
similarity index 100%
rename from src/Common/tests/cow_compositions.cpp
rename to src/Common/examples/cow_compositions.cpp
diff --git a/src/Common/tests/hashes_test.cpp b/src/Common/examples/hashes_test.cpp
similarity index 100%
rename from src/Common/tests/hashes_test.cpp
rename to src/Common/examples/hashes_test.cpp
diff --git a/src/Common/tests/int_hashes_perf.cpp b/src/Common/examples/int_hashes_perf.cpp
similarity index 99%
rename from src/Common/tests/int_hashes_perf.cpp
rename to src/Common/examples/int_hashes_perf.cpp
index 543326a9e5c..8a32f8f536e 100644
--- a/src/Common/tests/int_hashes_perf.cpp
+++ b/src/Common/examples/int_hashes_perf.cpp
@@ -12,7 +12,7 @@
 
 static void setAffinity()
 {
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__sun)
     cpu_set_t mask;
     CPU_ZERO(&mask);
     CPU_SET(0, &mask);
diff --git a/src/Common/tests/integer_hash_tables_and_hashes.cpp b/src/Common/examples/integer_hash_tables_and_hashes.cpp
similarity index 99%
rename from src/Common/tests/integer_hash_tables_and_hashes.cpp
rename to src/Common/examples/integer_hash_tables_and_hashes.cpp
index f5d9150a6ad..12f4ed450bf 100644
--- a/src/Common/tests/integer_hash_tables_and_hashes.cpp
+++ b/src/Common/examples/integer_hash_tables_and_hashes.cpp
@@ -6,6 +6,7 @@
 
 #include <sparsehash/dense_hash_map>
 #include <sparsehash/sparse_hash_map>
+#include <absl/container/flat_hash_map.h>
 
 #include <Common/Stopwatch.h>
 
@@ -332,6 +333,7 @@ static void NO_INLINE testForEachMapAndHash(const Key * data, size_t size)
     testForEachHash<std::unordered_map>(data, size, nothing);
     testForEachHash<::google::dense_hash_map>(data, size, [](auto & map){ map.set_empty_key(-1); });
     testForEachHash<::google::sparse_hash_map>(data, size, nothing);
+    testForEachHash<::absl::flat_hash_map>(data, size, nothing);
 }
 
 
diff --git a/src/Common/examples/integer_hash_tables_benchmark.cpp b/src/Common/examples/integer_hash_tables_benchmark.cpp
new file mode 100644
index 00000000000..f81add6d6cb
--- /dev/null
+++ b/src/Common/examples/integer_hash_tables_benchmark.cpp
@@ -0,0 +1,226 @@
+#include <iostream>
+#include <iomanip>
+#include <vector>
+
+#include <unordered_map>
+
+#include <sparsehash/dense_hash_map>
+#include <sparsehash/sparse_hash_map>
+#include <absl/container/flat_hash_map.h>
+
+#include <Common/Stopwatch.h>
+
+#include <common/types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Compression/CompressedReadBuffer.h>
+#include <Common/HashTable/HashMap.h>
+
+template <typename Key, typename Map>
+void NO_INLINE test(const Key * data, size_t size, const std::string & name, std::function<void(Map &)> init = {})
+{
+    Stopwatch watch;
+
+    Map map;
+
+    if (init)
+        init(map);
+
+    for (const auto * end = data + size; data < end; ++data)
+        ++map[*data];
+
+    watch.stop();
+    std::cerr << name
+        << ":\nElapsed: " << watch.elapsedSeconds()
+        << " (" << size / watch.elapsedSeconds() << " elem/sec.)"
+        << ", map size: " << map.size() << "\n";
+}
+
+template <typename Key>
+static void NO_INLINE testForType(size_t method, size_t rows_size)
+{
+    std::cerr << std::fixed << std::setprecision(3);
+
+    std::vector<Key> data(rows_size);
+
+    {
+        DB::ReadBufferFromFileDescriptor in1(STDIN_FILENO);
+        DB::CompressedReadBuffer in2(in1);
+        in2.readStrict(reinterpret_cast<char*>(data.data()), sizeof(data[0]) * rows_size);
+    }
+
+    if (method == 0)
+    {
+        test<Key, HashMap<Key, UInt64, DefaultHash<Key>>>(data.data(), data.size(), "CH HashMap");
+    }
+    else if (method == 1)
+    {
+        test<Key, ::google::dense_hash_map<Key, UInt64, absl::Hash<Key>>>(data.data(), data.size(), "Google DenseMap", [](auto & map){ map.set_empty_key(0); });
+    }
+    else if (method == 2)
+    {
+        test<Key, ::absl::flat_hash_map<Key, UInt64>>(data.data(), data.size(), "Abseil HashMap");
+    }
+    else if (method == 3)
+    {
+        test<Key, ::absl::flat_hash_map<Key, UInt64, DefaultHash<Key>>>(data.data(), data.size(), "Abseil HashMap with CH Hash");
+    }
+    else if (method == 4)
+    {
+        test<Key, std::unordered_map<Key, UInt64>>(data.data(), data.size(), "std::unordered_map");
+    }
+    else
+    {
+        std::cerr << "Unexpected method passed " << method << std::endl;
+    }
+}
+
+/** This benchmark does not test which hash table is fastest.
+ * It tests simple aggregation scenario that is important for ClickHouse.
+ *
+ * Support bash script it is important to rerun program for each method:
+ * benchmark.sh
+ * # Usage benchmark.sh column_file_name.bin column_type
+ * echo File $1
+ * ./integer_hash_tables_benchmark 0 $2 100000000 < $1
+ * ./integer_hash_tables_benchmark 1 $2 100000000 < $1
+ * ./integer_hash_tables_benchmark 2 $2 100000000 < $1
+ * ./integer_hash_tables_benchmark 3 $2 100000000 < $1
+ * ./integer_hash_tables_benchmark 4 $2 100000000 < $1
+ *
+ * Results of this benchmark on hits_100m_obfuscated X86-64
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/WatchID.bin
+ * CH HashMap: Elapsed: 7.416 (13484217.815 elem/sec.), map size: 99997493
+ * Google DenseMap: Elapsed: 10.303 (9706022.031 elem/sec.), map size: 99997493
+ * Abseil HashMap: Elapsed: 9.106 (10982139.229 elem/sec.), map size: 99997493
+ * Abseil HashMap with CH Hash: Elapsed: 9.221 (10845360.669 elem/sec.), map size: 99997493
+ * std::unordered_map: Elapsed: 45.213 (2211758.706 elem/sec.), map size: 9999749
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/URLHash.bin
+ * CH HashMap: Elapsed: 2.620 (38168135.308 elem/sec.), map size: 20714865
+ * Google DenseMap: Elapsed: 3.426 (29189309.058 elem/sec.), map size: 20714865
+ * Abseil HashMap: Elapsed: 2.788 (35870495.097 elem/sec.), map size: 20714865
+ * Abseil HashMap with CH Hash: Elapsed: 2.991 (33428850.155 elem/sec.), map size: 20714865
+ * std::unordered_map: Elapsed: 8.503 (11760331.346 elem/sec.), map size: 20714865
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/UserID.bin
+ * CH HashMap: Elapsed: 2.157 (46352039.753 elem/sec.), map size: 17630976
+ * Google DenseMap: Elapsed: 2.725 (36694226.782 elem/sec.), map size: 17630976
+ * Abseil HashMap: Elapsed: 2.590 (38604284.187 elem/sec.), map size: 17630976
+ * Abseil HashMap with CH Hash: Elapsed: 2.785 (35904856.137 elem/sec.), map size: 17630976
+ * std::unordered_map: Elapsed: 7.268 (13759557.609 elem/sec.), map size: 17630976
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/RegionID.bin
+ * CH HashMap: Elapsed: 0.192 (521583315.810 elem/sec.), map size: 9040
+ * Google DenseMap: Elapsed: 0.297 (337081407.799 elem/sec.), map size: 9046
+ * Abseil HashMap: Elapsed: 0.295 (338805623.511 elem/sec.), map size: 9040
+ * Abseil HashMap with CH Hash: Elapsed: 0.331 (302155391.036 elem/sec.), map size: 9040
+ * std::unordered_map: Elapsed: 0.455 (219971555.390 elem/sec.), map size: 9040
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/CounterID.bin
+ * CH HashMap: Elapsed: 0.217 (460216823.609 elem/sec.), map size: 6506
+ * Google DenseMap: Elapsed: 0.373 (267838665.098 elem/sec.), map size: 6506
+ * Abseil HashMap: Elapsed: 0.325 (308124728.989 elem/sec.), map size: 6506
+ * Abseil HashMap with CH Hash: Elapsed: 0.354 (282167144.801 elem/sec.), map size: 6506
+ * std::unordered_map: Elapsed: 0.390 (256573354.171 elem/sec.), map size: 6506
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/TraficSourceID.bin
+ * CH HashMap: Elapsed: 0.246 (406714566.282 elem/sec.), map size: 10
+ * Google DenseMap: Elapsed: 0.760 (131615151.233 elem/sec.), map size: 1565609 /// Broken because there is 0 key in dataset
+ * Abseil HashMap: Elapsed: 0.309 (324068156.680 elem/sec.), map size: 10
+ * Abseil HashMap with CH Hash: Elapsed: 0.339 (295108223.814 elem/sec.), map size: 10
+ * std::unordered_map: Elapsed: 0.811 (123304031.195 elem/sec.), map size: 10
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/AdvEngineID.bin
+ * CH HashMap: Elapsed: 0.155 (643245257.748 elem/sec.), map size: 19
+ * Google DenseMap: Elapsed: 1.629 (61395025.417 elem/sec.), map size: 32260732 // Broken because there is 0 key in dataset
+ * Abseil HashMap: Elapsed: 0.292 (342765027.204 elem/sec.), map size: 19
+ * Abseil HashMap with CH Hash: Elapsed: 0.330 (302822020.210 elem/sec.), map size: 19
+ * std::unordered_map: Elapsed: 0.308 (325059333.730 elem/sec.), map size: 19
+ *
+ *
+ * Results of this benchmark on hits_100m_obfuscated AARCH64
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/WatchID.bin
+ * CH HashMap: Elapsed: 9.530 (10493528.533 elem/sec.), map size: 99997493
+ * Google DenseMap: Elapsed: 14.436 (6927091.135 elem/sec.), map size: 99997493
+ * Abseil HashMap: Elapsed: 16.671 (5998504.085 elem/sec.), map size: 99997493
+ * Abseil HashMap with CH Hash: Elapsed: 16.803 (5951365.711 elem/sec.), map size: 99997493
+ * std::unordered_map: Elapsed: 50.805 (1968305.658 elem/sec.), map size: 99997493
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/URLHash.bin
+ * CH HashMap: Elapsed: 3.693 (27076878.092 elem/sec.), map size: 20714865
+ * Google DenseMap: Elapsed: 5.051 (19796401.694 elem/sec.), map size: 20714865
+ * Abseil HashMap: Elapsed: 5.617 (17804528.625 elem/sec.), map size: 20714865
+ * Abseil HashMap with CH Hash: Elapsed: 5.702 (17537013.639 elem/sec.), map size: 20714865
+ * std::unordered_map: Elapsed: 10.757 (9296040.953 elem/sec.), map size: 2071486
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/UserID.bin
+ * CH HashMap: Elapsed: 2.982 (33535795.695 elem/sec.), map size: 17630976
+ * Google DenseMap: Elapsed: 3.940 (25381557.959 elem/sec.), map size: 17630976
+ * Abseil HashMap: Elapsed: 4.493 (22259078.458 elem/sec.), map size: 17630976
+ * Abseil HashMap with CH Hash: Elapsed: 4.596 (21759738.710 elem/sec.), map size: 17630976
+ * std::unordered_map: Elapsed: 9.035 (11067903.596 elem/sec.), map size: 17630976
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/RegionID.bin
+ * CH HashMap: Elapsed: 0.302 (331026285.361 elem/sec.), map size: 9040
+ * Google DenseMap: Elapsed: 0.623 (160419421.840 elem/sec.), map size: 9046
+ * Abseil HashMap: Elapsed: 0.981 (101971186.758 elem/sec.), map size: 9040
+ * Abseil HashMap with CH Hash: Elapsed: 0.991 (100932993.199 elem/sec.), map size: 9040
+ * std::unordered_map: Elapsed: 0.809 (123541402.715 elem/sec.), map size: 9040
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/CounterID.bin
+ * CH HashMap: Elapsed: 0.343 (291821742.078 elem/sec.), map size: 6506
+ * Google DenseMap: Elapsed: 0.718 (139191105.450 elem/sec.), map size: 6506
+ * Abseil HashMap: Elapsed: 1.019 (98148285.278 elem/sec.), map size: 6506
+ * Abseil HashMap with CH Hash: Elapsed: 1.048 (95446843.667 elem/sec.), map size: 6506
+ * std::unordered_map: Elapsed: 0.701 (142701070.085 elem/sec.), map size: 6506
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/TraficSourceID.bin
+ * CH HashMap: Elapsed: 0.376 (265905243.103 elem/sec.), map size: 10
+ * Google DenseMap: Elapsed: 1.309 (76420707.298 elem/sec.), map size: 1565609 /// Broken because there is 0 key in dataset
+ * Abseil HashMap: Elapsed: 0.955 (104668109.775 elem/sec.), map size: 10
+ * Abseil HashMap with CH Hash: Elapsed: 0.967 (103456305.391 elem/sec.), map size: 10
+ * std::unordered_map: Elapsed: 1.241 (80591305.890 elem/sec.), map size: 10
+ *
+ * File hits_100m_obfuscated/201307_1_96_4/AdvEngineID.bin
+ * CH HashMap: Elapsed: 0.213 (470208130.105 elem/sec.), map size: 19
+ * Google DenseMap: Elapsed: 2.525 (39607131.523 elem/sec.), map size: 32260732 /// Broken because there is 0 key in dataset
+ * Abseil HashMap: Elapsed: 0.950 (105233678.618 elem/sec.), map size: 19
+ * Abseil HashMap with CH Hash: Elapsed: 0.962 (104001230.717 elem/sec.), map size: 19
+ * std::unordered_map: Elapsed: 0.585 (171059989.837 elem/sec.), map size: 19
+ */
+
+int main(int argc, char ** argv)
+{
+    if (argc < 4)
+    {
+        std::cerr << "Usage: program method column_type_name rows_count < input_column.bin \n";
+        return 1;
+    }
+
+    size_t method = std::stoull(argv[1]);
+    std::string type_name = std::string(argv[2]);
+    size_t n = std::stoull(argv[3]);
+
+    if (type_name == "UInt8")
+        testForType<UInt8>(method, n);
+    else if (type_name == "UInt16")
+        testForType<UInt16>(method, n);
+    else if (type_name == "UInt32")
+        testForType<UInt32>(method, n);
+    else if (type_name == "UInt64")
+        testForType<UInt64>(method, n);
+    else if (type_name == "Int8")
+        testForType<Int8>(method, n);
+    else if (type_name == "Int16")
+        testForType<Int16>(method, n);
+    else if (type_name == "Int32")
+        testForType<Int32>(method, n);
+    else if (type_name == "Int64")
+        testForType<Int64>(method, n);
+    else
+        std::cerr << "Unexpected type passed " << type_name << std::endl;
+
+    return 0;
+}
diff --git a/src/Common/examples/lru_hash_map_perf.cpp b/src/Common/examples/lru_hash_map_perf.cpp
new file mode 100644
index 00000000000..7793f4262ff
--- /dev/null
+++ b/src/Common/examples/lru_hash_map_perf.cpp
@@ -0,0 +1,182 @@
+#include <vector>
+#include <list>
+#include <map>
+#include <random>
+#include <pcg_random.hpp>
+
+#include <Common/Stopwatch.h>
+#include <Common/HashTable/LRUHashMap.h>
+
+#include <IO/ReadBufferFromFile.h>
+#include <Compression/CompressedReadBuffer.h>
+
+template<class Key, class Value>
+class LRUHashMapBasic
+{
+public:
+    using key_type = Key;
+    using value_type = Value;
+    using list_type = std::list<std::pair<key_type, value_type>>;
+    using map_type = std::unordered_map<key_type, typename list_type::iterator>;
+
+    explicit LRUHashMapBasic(size_t max_size_, bool preallocated = false)
+        : hash_map(preallocated ? max_size_ : 32)
+        , max_size(max_size_)
+    {
+    }
+
+    template<typename ...Args>
+    std::pair<Value *, bool> emplace(const Key &key, Args &&... args)
+    {
+        auto it = hash_map.find(key);
+
+        if (it == hash_map.end())
+        {
+            if (size() >= max_size)
+            {
+                auto iterator_to_remove = list.begin();
+
+                auto & key_to_remove = iterator_to_remove->first;
+                hash_map.erase(key_to_remove);
+
+                list.erase(iterator_to_remove);
+            }
+
+
+            Value value(std::forward<Args>(args)...);
+            auto node = std::make_pair(key, std::move(value));
+
+            list.push_back(std::move(node));
+
+            auto inserted_iterator = --list.end();
+
+            hash_map[key] = inserted_iterator;
+
+            return std::make_pair(&inserted_iterator->second, true);
+        }
+        else
+        {
+            auto & iterator_in_list_to_update = it->second;
+
+            list.splice(list.end(), list, iterator_in_list_to_update);
+            iterator_in_list_to_update = --list.end();
+
+            return std::make_pair(&iterator_in_list_to_update->second, false);
+        }
+    }
+
+    value_type & operator[](const key_type & key)
+    {
+        auto [it, _] = emplace(key);
+        return *it;
+    }
+
+    size_t getMaxSize() const
+    {
+        return max_size;
+    }
+
+    size_t size() const
+    {
+        return hash_map.size();
+    }
+
+    bool empty() const
+    {
+        return hash_map.empty();
+    }
+
+    bool contains(const Key & key)
+    {
+        return hash_map.find(key) != hash_map.end();
+    }
+
+    void clear()
+    {
+        hash_map.clear();
+        list.clear();
+    }
+
+private:
+    map_type hash_map;
+    list_type list;
+    size_t max_size;
+};
+
+template <typename Key, typename Map>
+static void NO_INLINE test(const Key * data, size_t size, const std::string & name)
+{
+    size_t cache_size = size / 10;
+    Map cache(cache_size);
+    Stopwatch watch;
+
+    for (size_t i = 0; i < size; ++i)
+        ++cache[data[i]];
+
+    watch.stop();
+
+    std::cerr << name
+        << ":\nElapsed: " << watch.elapsedSeconds()
+        << " (" << size / watch.elapsedSeconds() << " elem/sec.)"
+        << ", map size: " << cache.size() << "\n";
+}
+
+template <typename Key>
+static void NO_INLINE testForType(size_t method, size_t rows_size)
+{
+    std::cerr << std::fixed << std::setprecision(3);
+
+    std::vector<Key> data(rows_size);
+
+    {
+        DB::ReadBufferFromFileDescriptor in1(STDIN_FILENO);
+        DB::CompressedReadBuffer in2(in1);
+        in2.readStrict(reinterpret_cast<char*>(data.data()), sizeof(data[0]) * rows_size);
+    }
+
+    if (method == 0)
+    {
+        test<Key, LRUHashMap<Key, UInt64>>(data.data(), data.size(), "CH HashMap");
+    }
+    else if (method == 1)
+    {
+        test<Key, LRUHashMapBasic<Key, UInt64>>(data.data(), data.size(), "BasicLRU");
+    }
+}
+
+int main(int argc, char ** argv)
+{
+    (void)(argc);
+    (void)(argv);
+
+    if (argc < 4)
+    {
+        std::cerr << "Usage: program method column_type_name rows_count < input_column.bin \n";
+        return 1;
+    }
+
+    size_t method = std::stoull(argv[1]);
+    std::string type_name = std::string(argv[2]);
+    size_t n = std::stoull(argv[3]);
+
+    if (type_name == "UInt8")
+        testForType<UInt8>(method, n);
+    else if (type_name == "UInt16")
+        testForType<UInt16>(method, n);
+    else if (type_name == "UInt32")
+        testForType<UInt32>(method, n);
+    else if (type_name == "UInt64")
+        testForType<UInt64>(method, n);
+    else if (type_name == "Int8")
+        testForType<Int8>(method, n);
+    else if (type_name == "Int16")
+        testForType<Int16>(method, n);
+    else if (type_name == "Int32")
+        testForType<Int32>(method, n);
+    else if (type_name == "Int64")
+        testForType<Int64>(method, n);
+    else
+        std::cerr << "Unexpected type passed " << type_name << std::endl;
+
+    return 0;
+}
diff --git a/src/Common/tests/memory_statistics_os_perf.cpp b/src/Common/examples/memory_statistics_os_perf.cpp
similarity index 100%
rename from src/Common/tests/memory_statistics_os_perf.cpp
rename to src/Common/examples/memory_statistics_os_perf.cpp
diff --git a/src/Common/tests/parallel_aggregation.cpp b/src/Common/examples/parallel_aggregation.cpp
similarity index 99%
rename from src/Common/tests/parallel_aggregation.cpp
rename to src/Common/examples/parallel_aggregation.cpp
index e39be163619..045a385671b 100644
--- a/src/Common/tests/parallel_aggregation.cpp
+++ b/src/Common/examples/parallel_aggregation.cpp
@@ -69,7 +69,7 @@ static void aggregate1(Map & map, Source::const_iterator begin, Source::const_it
         ++map[*it];
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -122,7 +122,7 @@ static void aggregate22(MapTwoLevel & map, Source::const_iterator begin, Source:
     }
 }
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Common/tests/parallel_aggregation2.cpp b/src/Common/examples/parallel_aggregation2.cpp
similarity index 98%
rename from src/Common/tests/parallel_aggregation2.cpp
rename to src/Common/examples/parallel_aggregation2.cpp
index 1f8e598b122..496331e203d 100644
--- a/src/Common/tests/parallel_aggregation2.cpp
+++ b/src/Common/examples/parallel_aggregation2.cpp
@@ -62,7 +62,7 @@ struct AggregateIndependent
     }
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -94,7 +94,7 @@ struct AggregateIndependentWithSequentialKeysOptimization
                     if (it != begin && *it == prev_key)
                     {
                         assert(place != nullptr);
-                        updater(place->getMapped());
+                        updater(place->getMapped()); // NOLINT
                         continue;
                     }
                     prev_key = *it;
@@ -115,7 +115,7 @@ struct AggregateIndependentWithSequentialKeysOptimization
     }
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
@@ -265,7 +265,7 @@ struct Creator
     void operator()(Value &) const {}
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -275,7 +275,7 @@ struct Updater
     void operator()(Value & x) const { ++x; }
 };
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Common/tests/procfs_metrics_provider_perf.cpp b/src/Common/examples/procfs_metrics_provider_perf.cpp
similarity index 100%
rename from src/Common/tests/procfs_metrics_provider_perf.cpp
rename to src/Common/examples/procfs_metrics_provider_perf.cpp
diff --git a/src/Common/tests/radix_sort.cpp b/src/Common/examples/radix_sort.cpp
similarity index 100%
rename from src/Common/tests/radix_sort.cpp
rename to src/Common/examples/radix_sort.cpp
diff --git a/src/Common/tests/shell_command_inout.cpp b/src/Common/examples/shell_command_inout.cpp
similarity index 100%
rename from src/Common/tests/shell_command_inout.cpp
rename to src/Common/examples/shell_command_inout.cpp
diff --git a/src/Common/tests/simple_cache.cpp b/src/Common/examples/simple_cache.cpp
similarity index 100%
rename from src/Common/tests/simple_cache.cpp
rename to src/Common/examples/simple_cache.cpp
diff --git a/src/Common/tests/sip_hash_perf.cpp b/src/Common/examples/sip_hash_perf.cpp
similarity index 100%
rename from src/Common/tests/sip_hash_perf.cpp
rename to src/Common/examples/sip_hash_perf.cpp
diff --git a/src/Common/tests/small_table.cpp b/src/Common/examples/small_table.cpp
similarity index 100%
rename from src/Common/tests/small_table.cpp
rename to src/Common/examples/small_table.cpp
diff --git a/src/Common/tests/space_saving.cpp b/src/Common/examples/space_saving.cpp
similarity index 100%
rename from src/Common/tests/space_saving.cpp
rename to src/Common/examples/space_saving.cpp
diff --git a/src/Common/tests/stopwatch.cpp b/src/Common/examples/stopwatch.cpp
similarity index 100%
rename from src/Common/tests/stopwatch.cpp
rename to src/Common/examples/stopwatch.cpp
diff --git a/src/Common/tests/symbol_index.cpp b/src/Common/examples/symbol_index.cpp
similarity index 100%
rename from src/Common/tests/symbol_index.cpp
rename to src/Common/examples/symbol_index.cpp
diff --git a/src/Common/tests/thread_creation_latency.cpp b/src/Common/examples/thread_creation_latency.cpp
similarity index 100%
rename from src/Common/tests/thread_creation_latency.cpp
rename to src/Common/examples/thread_creation_latency.cpp
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index 51a66fba3aa..4855500b776 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -6,10 +6,15 @@
 #    include <mntent.h>
 #endif
 #include <cerrno>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Poco/Version.h>
+#include <Poco/Timestamp.h>
+#include <filesystem>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <utime.h>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -20,6 +25,8 @@ namespace ErrorCodes
     extern const int SYSTEM_ERROR;
     extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_STATVFS;
+    extern const int PATH_ACCESS_DENIED;
+    extern const int CANNOT_CREATE_FILE;
 }
 
 
@@ -38,17 +45,13 @@ struct statvfs getStatVFS(const String & path)
 
 bool enoughSpaceInDirectory(const std::string & path [[maybe_unused]], size_t data_size [[maybe_unused]])
 {
-#if POCO_VERSION >= 0x01090000
-    auto free_space = Poco::File(path).freeSpace();
+    auto free_space = fs::space(path).free;
     return data_size <= free_space;
-#else
-    return true;
-#endif
 }
 
 std::unique_ptr<TemporaryFile> createTemporaryFile(const std::string & path)
 {
-    Poco::File(path).createDirectories();
+    fs::create_directories(path);
 
     /// NOTE: std::make_shared cannot use protected constructors
     return std::make_unique<TemporaryFile>(path);
@@ -79,7 +82,6 @@ std::filesystem::path getMountPoint(std::filesystem::path absolute_path)
         if (device_id != parent_device_id)
             return absolute_path;
         absolute_path = parent;
-        device_id = parent_device_id;
     }
 
     return absolute_path;
@@ -109,4 +111,93 @@ String getFilesystemName([[maybe_unused]] const String & mount_point)
 #endif
 }
 
+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);
+
+    auto [_, prefix_path_mismatch_it] = std::mismatch(absolute_path.begin(), absolute_path.end(), absolute_prefix_path.begin(), absolute_prefix_path.end());
+
+    bool path_starts_with_prefix_path = (prefix_path_mismatch_it == absolute_prefix_path.end());
+    return path_starts_with_prefix_path;
+}
+
+bool pathStartsWith(const String & path, const String & prefix_path)
+{
+    auto filesystem_path = std::filesystem::path(path);
+    auto filesystem_prefix_path = std::filesystem::path(prefix_path);
+
+    return pathStartsWith(filesystem_path, filesystem_prefix_path);
+}
+
+}
+
+
+/// Copied from Poco::File
+namespace FS
+{
+
+bool createFile(const std::string & path)
+{
+    int n = open(path.c_str(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+    if (n != -1)
+    {
+        close(n);
+        return true;
+    }
+    DB::throwFromErrnoWithPath("Cannot create file: " + path, path, DB::ErrorCodes::CANNOT_CREATE_FILE);
+}
+
+bool canRead(const std::string & path)
+{
+    struct stat st;
+    if (stat(path.c_str(), &st) == 0)
+    {
+        if (st.st_uid == geteuid())
+            return (st.st_mode & S_IRUSR) != 0;
+        else if (st.st_gid == getegid())
+            return (st.st_mode & S_IRGRP) != 0;
+        else
+            return (st.st_mode & S_IROTH) != 0 || geteuid() == 0;
+    }
+    DB::throwFromErrnoWithPath("Cannot check read access to file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+
+
+bool canWrite(const std::string & path)
+{
+    struct stat st;
+    if (stat(path.c_str(), &st) == 0)
+    {
+        if (st.st_uid == geteuid())
+            return (st.st_mode & S_IWUSR) != 0;
+        else if (st.st_gid == getegid())
+            return (st.st_mode & S_IWGRP) != 0;
+        else
+            return (st.st_mode & S_IWOTH) != 0 || geteuid() == 0;
+    }
+    DB::throwFromErrnoWithPath("Cannot check write access to file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+
+time_t getModificationTime(const std::string & path)
+{
+    struct stat st;
+    if (stat(path.c_str(), &st) == 0)
+        return st.st_mtime;
+    DB::throwFromErrnoWithPath("Cannot check modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
+
+Poco::Timestamp getModificationTimestamp(const std::string & path)
+{
+    return Poco::Timestamp::fromEpochTime(getModificationTime(path));
+}
+
+void setModificationTime(const std::string & path, time_t time)
+{
+    struct utimbuf tb;
+    tb.actime  = time;
+    tb.modtime = time;
+    if (utime(path.c_str(), &tb) != 0)
+        DB::throwFromErrnoWithPath("Cannot set modification time for file: " + path, path, DB::ErrorCodes::PATH_ACCESS_DENIED);
+}
 }
diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
index f534b61808a..b7525a64fae 100644
--- a/src/Common/filesystemHelpers.h
+++ b/src/Common/filesystemHelpers.h
@@ -29,4 +29,22 @@ String getFilesystemName([[maybe_unused]] const String & mount_point);
 
 struct statvfs getStatVFS(const String & path);
 
+/// Returns true if path starts with prefix path
+bool pathStartsWith(const std::filesystem::path & path, const std::filesystem::path & prefix_path);
+
+/// Returns true if path starts with prefix path
+bool pathStartsWith(const String & path, const String & prefix_path);
+
+}
+
+namespace FS
+{
+bool createFile(const std::string & path);
+
+bool canRead(const std::string & path);
+bool canWrite(const std::string & path);
+
+time_t getModificationTime(const std::string & path);
+Poco::Timestamp getModificationTimestamp(const std::string & path);
+void setModificationTime(const std::string & path, time_t time);
 }
diff --git a/src/Common/formatIPv6.h b/src/Common/formatIPv6.h
index 1cb9d3d1d81..c16db8490dd 100644
--- a/src/Common/formatIPv6.h
+++ b/src/Common/formatIPv6.h
@@ -85,19 +85,19 @@ inline bool parseIPv6(const char * src, unsigned char * dst)
             return clear_dst();
 
     unsigned char tmp[IPV6_BINARY_LENGTH]{};
-    auto * tp = tmp;
-    auto * endp = tp + IPV6_BINARY_LENGTH;
-    const auto * curtok = src;
-    auto saw_xdigit = false;
+    unsigned char * tp = tmp;
+    unsigned char * endp = tp + IPV6_BINARY_LENGTH;
+    const char * curtok = src;
+    bool saw_xdigit = false;
     UInt32 val{};
     unsigned char * colonp = nullptr;
 
     /// Assuming zero-terminated string.
-    while (const auto ch = *src++)
+    while (char ch = *src++)
     {
-        const auto num = unhex(ch);
+        UInt8 num = unhex(ch);
 
-        if (num != u8'\xff')
+        if (num != 0xFF)
         {
             val <<= 4;
             val |= num;
diff --git a/src/Common/formatReadable.cpp b/src/Common/formatReadable.cpp
index fc5c6c19b50..fd8ff9abd86 100644
--- a/src/Common/formatReadable.cpp
+++ b/src/Common/formatReadable.cpp
@@ -13,7 +13,10 @@ namespace DB
     }
 }
 
-static void formatReadable(double size, DB::WriteBuffer & out, int precision, const char ** units, size_t units_size, double delimiter)
+// I wanted to make this ALWAYS_INLINE to prevent flappy performance tests,
+// but GCC complains it may not be inlined.
+static void formatReadable(double size, DB::WriteBuffer & out,
+    int precision, const char ** units, size_t units_size, double delimiter)
 {
     size_t i = 0;
     for (; i + 1 < units_size && fabs(size) >= delimiter; ++i)
diff --git a/src/Common/getHashOfLoadedBinary.cpp b/src/Common/getHashOfLoadedBinary.cpp
index d401b0311be..dcf483b4fa8 100644
--- a/src/Common/getHashOfLoadedBinary.cpp
+++ b/src/Common/getHashOfLoadedBinary.cpp
@@ -38,7 +38,7 @@ std::string getHashOfLoadedBinaryHex()
 {
     SipHash hash = getHashOfLoadedBinary();
     std::array<UInt64, 2> checksum;
-    hash.get128(checksum[0], checksum[1]);
+    hash.get128(checksum);
     return getHexUIntUppercase(checksum);
 }
 
diff --git a/src/Common/intExp.h b/src/Common/intExp.h
index bc977a41d33..b2d704e58b2 100644
--- a/src/Common/intExp.h
+++ b/src/Common/intExp.h
@@ -138,9 +138,9 @@ constexpr inline Int128 exp10_i128(int x)
 }
 
 
-inline wInt256 exp10_i256(int x)
+inline Int256 exp10_i256(int x)
 {
-    using Int256 = wInt256;
+    using Int256 = Int256;
     static constexpr Int256 i10e18{1000000000000000000ll};
     static const Int256 values[] = {
         static_cast<Int256>(1ll),
diff --git a/src/Common/isLocalAddress.cpp b/src/Common/isLocalAddress.cpp
index 8da281e3051..9e22c58f94c 100644
--- a/src/Common/isLocalAddress.cpp
+++ b/src/Common/isLocalAddress.cpp
@@ -1,31 +1,121 @@
 #include <Common/isLocalAddress.h>
 
+#include <ifaddrs.h>
 #include <cstring>
+#include <optional>
 #include <common/types.h>
-#include <Poco/Util/Application.h>
-#include <Poco/Net/NetworkInterface.h>
+#include <Common/Exception.h>
+#include <Poco/Net/IPAddress.h>
 #include <Poco/Net/SocketAddress.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int SYSTEM_ERROR;
+}
+
+namespace
+{
+
+struct NetworkInterfaces
+{
+    ifaddrs * ifaddr;
+    NetworkInterfaces()
+    {
+        if (getifaddrs(&ifaddr) == -1)
+        {
+            throwFromErrno("Cannot getifaddrs", ErrorCodes::SYSTEM_ERROR);
+        }
+    }
+
+    bool hasAddress(const Poco::Net::IPAddress & address) const
+    {
+        ifaddrs * iface;
+        for (iface = ifaddr; iface != nullptr; iface = iface->ifa_next)
+        {
+            /// Point-to-point (VPN) addresses may have NULL ifa_addr
+            if (!iface->ifa_addr)
+                continue;
+
+            auto family = iface->ifa_addr->sa_family;
+            std::optional<Poco::Net::IPAddress> interface_address;
+            switch (family)
+            {
+                /// We interested only in IP-adresses
+                case AF_INET:
+                {
+                    interface_address.emplace(*(iface->ifa_addr));
+                    break;
+                }
+                case AF_INET6:
+                {
+                    interface_address.emplace(&reinterpret_cast<const struct sockaddr_in6*>(iface->ifa_addr)->sin6_addr, sizeof(struct in6_addr));
+                    break;
+                }
+                default:
+                    continue;
+            }
+
+            /** Compare the addresses without taking into account `scope`.
+              * Theoretically, this may not be correct - depends on `route` setting
+              *  - through which interface we will actually access the specified address.
+              */
+            if (interface_address->length() == address.length()
+                && 0 == memcmp(interface_address->addr(), address.addr(), address.length()))
+                return true;
+        }
+        return false;
+    }
+
+    ~NetworkInterfaces()
+    {
+        freeifaddrs(ifaddr);
+    }
+};
+
+}
+
+
 bool isLocalAddress(const Poco::Net::IPAddress & address)
 {
-    static auto interfaces = Poco::Net::NetworkInterface::list();
+    /** 127.0.0.1 is treat as local address unconditionally.
+      * ::1 is also treat as local address unconditionally.
+      *
+      * 127.0.0.{2..255} are not treat as local addresses, because they are used in tests
+      *  to emulate distributed queries across localhost.
+      *
+      * But 127.{0,1}.{0,1}.{0,1} are treat as local addresses,
+      *  because they are used in Debian for localhost.
+      */
+    if (address.isLoopback())
+    {
+        if (address.family() == Poco::Net::AddressFamily::IPv4)
+        {
+            /// The address is located in memory in big endian form (network byte order).
+            const unsigned char * digits = static_cast<const unsigned char *>(address.addr());
 
-    return interfaces.end() != std::find_if(interfaces.begin(), interfaces.end(),
-                [&] (const Poco::Net::NetworkInterface & interface)
-                {
-                    /** Compare the addresses without taking into account `scope`.
-                      * Theoretically, this may not be correct - depends on `route` setting
-                      *  - through which interface we will actually access the specified address.
-                      */
-                    return interface.address().length() == address.length()
-                        && 0 == memcmp(interface.address().addr(), address.addr(), address.length());
-                });
+            if (digits[0] == 127
+                && digits[1] <= 1
+                && digits[2] <= 1
+                && digits[3] <= 1)
+            {
+                return true;
+            }
+        }
+        else if (address.family() == Poco::Net::AddressFamily::IPv6)
+        {
+            return true;
+        }
+    }
+
+    NetworkInterfaces interfaces;
+    return interfaces.hasAddress(address);
 }
 
+
 bool isLocalAddress(const Poco::Net::SocketAddress & address, UInt16 clickhouse_port)
 {
     return clickhouse_port == address.port() && isLocalAddress(address.host());
diff --git a/src/Common/new_delete.cpp b/src/Common/new_delete.cpp
index be3724666f8..56173fb108a 100644
--- a/src/Common/new_delete.cpp
+++ b/src/Common/new_delete.cpp
@@ -41,9 +41,9 @@ struct InitializeJemallocZoneAllocatorForOSX
 namespace Memory
 {
 
-inline ALWAYS_INLINE void trackMemory(std::size_t size)
+inline ALWAYS_INLINE size_t getActualAllocationSize(size_t size)
 {
-    std::size_t actual_size = 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
@@ -52,21 +52,13 @@ inline ALWAYS_INLINE void trackMemory(std::size_t size)
         actual_size = nallocx(size, 0);
 #endif
 
-    CurrentMemoryTracker::alloc(actual_size);
+    return actual_size;
 }
 
-inline ALWAYS_INLINE bool trackMemoryNoExcept(std::size_t size) noexcept
+inline ALWAYS_INLINE void trackMemory(std::size_t size)
 {
-    try
-    {
-        trackMemory(size);
-    }
-    catch (...)
-    {
-        return false;
-    }
-
-    return true;
+    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
@@ -98,27 +90,29 @@ inline ALWAYS_INLINE void untrackMemory(void * ptr [[maybe_unused]], std::size_t
 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
 {
-    if (likely(Memory::trackMemoryNoExcept(size)))
-        return Memory::newNoExept(size);
-    return nullptr;
+    Memory::trackMemory(size);
+
+    return Memory::newNoExept(size);
 }
 
 void * operator new[](std::size_t size, const std::nothrow_t &) noexcept
 {
-    if (likely(Memory::trackMemoryNoExcept(size)))
-        return Memory::newNoExept(size);
-    return nullptr;
+    Memory::trackMemory(size);
+
+    return Memory::newNoExept(size);
 }
 
 /// delete
diff --git a/src/Common/parseAddress.cpp b/src/Common/parseAddress.cpp
index 664e0ca2f59..c99c08896ab 100644
--- a/src/Common/parseAddress.cpp
+++ b/src/Common/parseAddress.cpp
@@ -28,15 +28,27 @@ std::pair<std::string, UInt16> parseAddress(const std::string & str, UInt16 defa
             throw Exception("Illegal address passed to function parseAddress: "
                 "the address begins with opening square bracket, but no closing square bracket found", ErrorCodes::BAD_ARGUMENTS);
 
-        port = find_first_symbols<':'>(closing_square_bracket + 1, end);
+        port = closing_square_bracket + 1;
     }
     else
         port = find_first_symbols<':'>(begin, end);
 
     if (port != end)
     {
-        UInt16 port_number = parse<UInt16>(port + 1);
-        return { std::string(begin, port), port_number };
+        if (*port != ':')
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Illegal port prefix passed to function parseAddress: {}", port);
+
+        ++port;
+
+        UInt16 port_number;
+        ReadBufferFromMemory port_buf(port, end - port);
+        if (!tryReadText<UInt16>(port_number, port_buf) || !port_buf.eof())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Illegal port passed to function parseAddress: {}", port);
+        }
+        return { std::string(begin, port - 1), port_number };
     }
     else if (default_port)
     {
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index cc89af26d99..477f5e0f250 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -1,6 +1,9 @@
 #include "parseRemoteDescription.h"
 #include <Common/Exception.h>
 #include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <common/logger_useful.h>
+
 
 namespace DB
 {
@@ -167,4 +170,27 @@ std::vector<String> parseRemoteDescription(const String & description, size_t l,
     return res;
 }
 
+
+std::vector<std::pair<String, uint16_t>> parseRemoteDescriptionForExternalDatabase(const String & description, size_t max_addresses, UInt16 default_port)
+{
+    auto addresses = parseRemoteDescription(description, 0, description.size(), '|', max_addresses);
+    std::vector<std::pair<String, uint16_t>> result;
+
+    for (const auto & address : addresses)
+    {
+        size_t colon = address.find(':');
+        if (colon == String::npos)
+        {
+            LOG_WARNING(&Poco::Logger::get("ParseRemoteDescription"), "Port is not found for host: {}. Using default port {}", address, default_port);
+            result.emplace_back(std::make_pair(address, default_port));
+        }
+        else
+        {
+            result.emplace_back(std::make_pair(address.substr(0, colon), DB::parseFromString<UInt16>(address.substr(colon + 1))));
+        }
+    }
+
+    return result;
+}
+
 }
diff --git a/src/Common/parseRemoteDescription.h b/src/Common/parseRemoteDescription.h
index 6ba0bb4737f..f691a57dc73 100644
--- a/src/Common/parseRemoteDescription.h
+++ b/src/Common/parseRemoteDescription.h
@@ -17,4 +17,7 @@ namespace DB
  */
 std::vector<String> parseRemoteDescription(const String & description, size_t l, size_t r, char separator, size_t max_addresses);
 
+/// Parse remote description for external database (MySQL or PostgreSQL).
+std::vector<std::pair<String, uint16_t>> parseRemoteDescriptionForExternalDatabase(const String & description, size_t max_addresses, UInt16 default_port);
+
 }
diff --git a/src/Common/remapExecutable.cpp b/src/Common/remapExecutable.cpp
index 5418290b24f..a774b1028d5 100644
--- a/src/Common/remapExecutable.cpp
+++ b/src/Common/remapExecutable.cpp
@@ -26,6 +26,7 @@ namespace ErrorCodes
 namespace
 {
 
+/// NOLINTNEXTLINE(cert-dcl50-cpp)
 __attribute__((__noinline__)) int64_t our_syscall(...)
 {
     __asm__ __volatile__ (R"(
diff --git a/src/Common/renameat2.cpp b/src/Common/renameat2.cpp
index a735a9d72d4..26d90427889 100644
--- a/src/Common/renameat2.cpp
+++ b/src/Common/renameat2.cpp
@@ -1,6 +1,6 @@
 #include <Common/renameat2.h>
 #include <Common/Exception.h>
-#include <Poco/File.h>
+#include <filesystem>
 
 #if defined(linux) || defined(__linux) || defined(__linux__)
 #include <unistd.h>
@@ -10,6 +10,8 @@
 #include <sys/utsname.h>
 #endif
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
@@ -93,9 +95,9 @@ static bool renameat2(const std::string &, const std::string &, int)
 static void renameNoReplaceFallback(const std::string & old_path, const std::string & new_path)
 {
     /// NOTE it's unsafe
-    if (Poco::File{new_path}.exists())
+    if (fs::exists(new_path))
         throw Exception("File " + new_path + " exists", ErrorCodes::FILE_ALREADY_EXISTS);
-    Poco::File{old_path}.renameTo(new_path);
+    fs::rename(old_path, new_path);
 }
 
 /// Do not use [[noreturn]] to avoid warnings like "code will never be executed" in other places
diff --git a/src/Common/setThreadName.cpp b/src/Common/setThreadName.cpp
index 3c20711a761..9e45c62a9c9 100644
--- a/src/Common/setThreadName.cpp
+++ b/src/Common/setThreadName.cpp
@@ -1,6 +1,6 @@
 #include <pthread.h>
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(OS_SUNOS)
 #elif defined(__FreeBSD__)
     #include <pthread_np.h>
 #else
@@ -34,6 +34,8 @@ void setThreadName(const char * name)
     if ((false))
 #elif defined(OS_DARWIN)
     if (0 != pthread_setname_np(name))
+#elif defined(OS_SUNOS)
+    if (0 != pthread_setname_np(pthread_self(), name))
 #else
     if (0 != prctl(PR_SET_NAME, name, 0, 0, 0))
 #endif
@@ -44,7 +46,7 @@ std::string getThreadName()
 {
     std::string name(16, '\0');
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(OS_SUNOS)
     if (pthread_getname_np(pthread_self(), name.data(), name.size()))
         throw DB::Exception("Cannot get thread name with pthread_getname_np()", DB::ErrorCodes::PTHREAD_ERROR);
 #elif defined(__FreeBSD__)
diff --git a/src/Common/tests/auto_array.cpp b/src/Common/tests/auto_array.cpp
deleted file mode 100644
index 9e9a18ffec9..00000000000
--- a/src/Common/tests/auto_array.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <map>
-
-#include <pcg_random.hpp>
-#include <Core/Field.h>
-#include <Common/HashTable/HashMap.h>
-#include <Common/AutoArray.h>
-#include <IO/WriteHelpers.h>
-
-#include <Common/Stopwatch.h>
-
-
-int main(int argc, char ** argv)
-{
-    pcg64 rng;
-
-    {
-        size_t n = 10;
-        using T = std::string;
-        DB::AutoArray<T> arr(n);
-
-        for (size_t i = 0; i < arr.size(); ++i)
-            arr[i] = "Hello, world! " + DB::toString(i);
-
-        for (auto & elem : arr)
-            std::cerr << elem << std::endl;
-    }
-
-    std::cerr << std::endl;
-
-    {
-        size_t n = 10;
-        using T = std::string;
-        using Arr = DB::AutoArray<T>;
-        Arr arr;
-
-        arr.resize(n);
-        for (size_t i = 0; i < arr.size(); ++i)
-            arr[i] = "Hello, world! " + DB::toString(i);
-
-        for (auto & elem : arr)
-            std::cerr << elem << std::endl;
-
-        std::cerr << std::endl;
-
-        Arr arr2 = std::move(arr);
-
-        std::cerr << arr.size() << ", " << arr2.size() << std::endl;  // NOLINT
-
-        for (auto & elem : arr2)
-            std::cerr << elem << std::endl;
-    }
-
-    std::cerr << std::endl;
-
-    {
-        size_t n = 10;
-        size_t keys = 10;
-        using T = std::string;
-        using Arr = DB::AutoArray<T>;
-        using Map = std::map<Arr, T>;
-        Map map;
-
-        for (size_t i = 0; i < keys; ++i)
-        {
-            Arr key(n);
-            for (size_t j = 0; j < n; ++j)
-                key[j] = DB::toString(rng());
-
-            map[std::move(key)] = "Hello, world! " + DB::toString(i);
-        }
-
-        for (const auto & kv : map)
-        {
-            std::cerr << "[";
-            for (size_t j = 0; j < n; ++j)
-                std::cerr << (j == 0 ? "" : ", ") << kv.first[j];
-            std::cerr << "]";
-
-            std::cerr << ":\t" << kv.second << std::endl;
-        }
-
-        std::cerr << std::endl;
-
-        Map map2 = std::move(map);
-
-        for (const auto & kv : map2)
-        {
-            std::cerr << "[";
-            for (size_t j = 0; j < n; ++j)
-                std::cerr << (j == 0 ? "" : ", ") << kv.first[j];
-            std::cerr << "]";
-
-            std::cerr << ":\t" << kv.second << std::endl;
-        }
-    }
-
-    std::cerr << std::endl;
-
-    {
-        size_t n = 10;
-        size_t keys = 10;
-        using T = std::string;
-        using Arr = DB::AutoArray<T>;
-        using Vec = std::vector<Arr>;
-        Vec vec;
-
-        for (size_t i = 0; i < keys; ++i)
-        {
-            Arr key(n);
-            for (size_t j = 0; j < n; ++j)
-                key[j] = DB::toString(rng());
-
-            vec.push_back(std::move(key));
-        }
-
-        for (const auto & elem : vec)
-        {
-            std::cerr << "[";
-            for (size_t j = 0; j < n; ++j)
-                std::cerr << (j == 0 ? "" : ", ") << elem[j];
-            std::cerr << "]" << std::endl;
-        }
-
-        std::cerr << std::endl;
-
-        Vec vec2 = std::move(vec);
-
-        for (const auto & elem : vec2)
-        {
-            std::cerr << "[";
-            for (size_t j = 0; j < n; ++j)
-                std::cerr << (j == 0 ? "" : ", ") << elem[j];
-            std::cerr << "]" << std::endl;
-        }
-    }
-
-    if (argc == 2 && !strcmp(argv[1], "1"))
-    {
-        size_t n = 5;
-        size_t map_size = 1000000;
-
-        using T = DB::Field;
-        T field = std::string("Hello, world");
-
-        using Arr = std::vector<T>;
-        using Map = HashMap<UInt64, Arr>;
-
-        Stopwatch watch;
-
-        Map map;
-        for (size_t i = 0; i < map_size; ++i)
-        {
-            Map::LookupResult it;
-            bool inserted;
-
-            map.emplace(rng(), it, inserted);
-            if (inserted)
-            {
-                new (&it->getMapped()) Arr(n);
-
-                for (size_t j = 0; j < n; ++j)
-                    (it->getMapped())[j] = field;
-            }
-        }
-
-        std::cerr << std::fixed << std::setprecision(2)
-            << "Vector:    Elapsed: " << watch.elapsedSeconds()
-            << " (" << map_size / watch.elapsedSeconds() << " rows/sec., "
-            << "sizeof(Map::value_type) = " << sizeof(Map::value_type)
-            << std::endl;
-    }
-
-    {
-        size_t n = 10000;
-        using Arr = DB::AutoArray<std::string>;
-        Arr arr1(n);
-        Arr arr2(n);
-
-        for (size_t i = 0; i < n; ++i)
-        {
-            arr1[i] = "Hello, world! " + DB::toString(i);
-            arr2[i] = "Goodbye, world! " + DB::toString(i);
-        }
-
-        arr2 = std::move(arr1);
-        arr1.resize(n); // NOLINT
-
-        std::cerr
-            << "arr1.size(): " << arr1.size() << ", arr2.size(): " << arr2.size() << std::endl
-            << "arr1.data(): " << arr1.data() << ", arr2.data(): " << arr2.data() << std::endl
-            << "arr1[0]: " << arr1[0] << ", arr2[0]: " << arr2[0] << std::endl;
-    }
-
-    return 0;
-}
diff --git a/src/Common/tests/gtest_global_context.h b/src/Common/tests/gtest_global_context.h
index b6529f09b46..9bd7c2490d6 100644
--- a/src/Common/tests/gtest_global_context.h
+++ b/src/Common/tests/gtest_global_context.h
@@ -5,14 +5,14 @@
 struct ContextHolder
 {
     DB::SharedContextHolder shared_context;
-    DB::Context context;
+    DB::ContextMutablePtr context;
 
     ContextHolder()
         : shared_context(DB::Context::createShared())
         , context(DB::Context::createGlobal(shared_context.get()))
     {
-        context.makeGlobalContext();
-        context.setPath("./");
+        context->makeGlobalContext();
+        context->setPath("./");
     }
 
     ContextHolder(ContextHolder &&) = default;
diff --git a/src/Common/tests/gtest_hash_table.cpp b/src/Common/tests/gtest_hash_table.cpp
index 1c673166ca9..35fb471f07c 100644
--- a/src/Common/tests/gtest_hash_table.cpp
+++ b/src/Common/tests/gtest_hash_table.cpp
@@ -5,11 +5,17 @@
 
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashSet.h>
+#include <Common/HashTable/Hash.h>
 
 #include <IO/ReadBufferFromString.h>
+#include <IO/WriteHelpers.h>
 
 #include <gtest/gtest.h>
 
+
+using namespace DB;
+
+
 /// To test dump functionality without using other hashes that can change
 template <typename T>
 struct DummyHash
@@ -18,12 +24,12 @@ struct DummyHash
 };
 
 template<typename HashTable>
-std::set<typename HashTable::value_type> convertToSet(const HashTable& table)
+std::set<std::string> convertToSet(const HashTable & table)
 {
-    std::set<typename HashTable::value_type> result;
+    std::set<std::string> result;
 
     for (auto v: table)
-        result.emplace(v.getValue());
+        result.emplace(toString(v.getValue()));
 
     return result;
 }
@@ -91,8 +97,8 @@ TEST(HashTable, Iteration)
     cont.insert(2);
     cont.insert(3);
 
-    std::set<int> expected = {1, 2, 3};
-    std::set<int> actual = convertToSet(cont);
+    std::set<std::string> expected = {"1", "2", "3"};
+    std::set<std::string> actual = convertToSet(cont);
 
     ASSERT_EQ(actual, expected);
 }
@@ -251,14 +257,14 @@ TEST(HashTable, SerializationDeserialization)
         cont.insert(2);
         cont.insert(3);
 
-        DB::WriteBufferFromOwnString wb;
+        WriteBufferFromOwnString wb;
         cont.writeText(wb);
 
         std::string expected = "3,1,2,3";
 
         ASSERT_EQ(wb.str(), expected);
 
-        DB::ReadBufferFromString rb(expected);
+        ReadBufferFromString rb(expected);
 
         Cont deserialized;
         deserialized.readText(rb);
@@ -273,10 +279,10 @@ TEST(HashTable, SerializationDeserialization)
         cont.insert(2);
         cont.insert(3);
 
-        DB::WriteBufferFromOwnString wb;
+        WriteBufferFromOwnString wb;
         cont.write(wb);
 
-        DB::ReadBufferFromString rb(wb.str());
+        ReadBufferFromString rb(wb.str());
 
         Cont deserialized;
         deserialized.read(rb);
@@ -286,23 +292,23 @@ TEST(HashTable, SerializationDeserialization)
         using Cont = HashSet<int, DummyHash<int>, HashTableGrower<1>>;
         Cont cont;
 
-        DB::WriteBufferFromOwnString wb;
+        WriteBufferFromOwnString wb;
         cont.writeText(wb);
 
         std::string expected = "0";
         ASSERT_EQ(wb.str(), expected);
 
-        DB::ReadBufferFromString rb(expected);
+        ReadBufferFromString rb(expected);
 
         Cont deserialized;
         deserialized.readText(rb);
         ASSERT_EQ(convertToSet(cont), convertToSet(deserialized));
     }
     {
-        using Cont = HashSet<DB::UInt128, DB::UInt128TrivialHash>;
+        using Cont = HashSet<UInt128, UInt128TrivialHash>;
         Cont cont;
 
-        DB::WriteBufferFromOwnString wb;
+        WriteBufferFromOwnString wb;
         cont.write(wb);
 
         std::string expected;
@@ -310,7 +316,7 @@ TEST(HashTable, SerializationDeserialization)
 
         ASSERT_EQ(wb.str(), expected);
 
-        DB::ReadBufferFromString rb(expected);
+        ReadBufferFromString rb(expected);
 
         Cont deserialized;
         deserialized.read(rb);
@@ -359,8 +365,8 @@ TEST(HashTable, Resize)
         cont.insert(3);
         cont.insert(1);
 
-        std::set<int> expected = {1, 3};
-        std::set<int> actual = convertToSet(cont);
+        std::set<std::string> expected = {"1", "3"};
+        std::set<std::string> actual = convertToSet(cont);
 
         ASSERT_EQ(actual, expected);
     }
diff --git a/src/Common/tests/gtest_local_address.cpp b/src/Common/tests/gtest_local_address.cpp
new file mode 100644
index 00000000000..7f1d2dfc1a7
--- /dev/null
+++ b/src/Common/tests/gtest_local_address.cpp
@@ -0,0 +1,40 @@
+#include <gtest/gtest.h>
+#include <Common/isLocalAddress.h>
+#include <Common/ShellCommand.h>
+#include <Poco/Net/IPAddress.h>
+#include <IO/ReadHelpers.h>
+
+
+TEST(LocalAddress, SmokeTest)
+{
+    auto cmd = DB::ShellCommand::executeDirect("/bin/hostname", {"-i"});
+    std::string address_str;
+    DB::readString(address_str, cmd->out);
+    cmd->wait();
+    std::cerr << "Got Address: " << address_str << std::endl;
+
+    Poco::Net::IPAddress address(address_str);
+
+    EXPECT_TRUE(DB::isLocalAddress(address));
+}
+
+TEST(LocalAddress, Localhost)
+{
+    EXPECT_TRUE(DB::isLocalAddress(Poco::Net::IPAddress{"127.0.0.1"}));
+    EXPECT_TRUE(DB::isLocalAddress(Poco::Net::IPAddress{"127.0.1.1"}));
+    EXPECT_TRUE(DB::isLocalAddress(Poco::Net::IPAddress{"127.1.1.1"}));
+    EXPECT_TRUE(DB::isLocalAddress(Poco::Net::IPAddress{"127.1.0.1"}));
+    EXPECT_TRUE(DB::isLocalAddress(Poco::Net::IPAddress{"127.1.0.0"}));
+    EXPECT_TRUE(DB::isLocalAddress(Poco::Net::IPAddress{"::1"}));
+
+    /// Make sure we don't mess with the byte order.
+    EXPECT_FALSE(DB::isLocalAddress(Poco::Net::IPAddress{"1.0.0.127"}));
+    EXPECT_FALSE(DB::isLocalAddress(Poco::Net::IPAddress{"1.1.1.127"}));
+
+    EXPECT_FALSE(DB::isLocalAddress(Poco::Net::IPAddress{"0.0.0.0"}));
+    EXPECT_FALSE(DB::isLocalAddress(Poco::Net::IPAddress{"::"}));
+    EXPECT_FALSE(DB::isLocalAddress(Poco::Net::IPAddress{"::2"}));
+
+    /// See the comment in the implementation of isLocalAddress.
+    EXPECT_FALSE(DB::isLocalAddress(Poco::Net::IPAddress{"127.0.0.2"}));
+}
diff --git a/src/Common/tests/gtest_pod_array.cpp b/src/Common/tests/gtest_pod_array.cpp
index 9cc77b88195..b5ec45c3e5d 100644
--- a/src/Common/tests/gtest_pod_array.cpp
+++ b/src/Common/tests/gtest_pod_array.cpp
@@ -4,33 +4,471 @@
 
 using namespace DB;
 
+
+TEST(Common, PODArrayBasicMove)
+{
+    using namespace DB;
+
+    static constexpr size_t initial_bytes = 32;
+    using Array = PODArray<UInt64, initial_bytes,
+        AllocatorWithStackMemory<Allocator<false>, initial_bytes>>;
+
+    {
+        Array arr;
+        Array arr2;
+        arr2 = std::move(arr);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+
+        Array arr2;
+
+        arr2 = std::move(arr);
+
+        ASSERT_EQ(arr2.size(), 3);
+        ASSERT_EQ(arr2[0], 1);
+        ASSERT_EQ(arr2[1], 2);
+        ASSERT_EQ(arr2[2], 3);
+
+        arr = std::move(arr2);
+
+        ASSERT_EQ(arr.size(), 3);
+        ASSERT_EQ(arr[0], 1);
+        ASSERT_EQ(arr[1], 2);
+        ASSERT_EQ(arr[2], 3);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+        arr.push_back(4);
+        arr.push_back(5);
+
+        Array arr2;
+
+        arr2 = std::move(arr);
+
+        ASSERT_EQ(arr2.size(), 5);
+        ASSERT_EQ(arr2[0], 1);
+        ASSERT_EQ(arr2[1], 2);
+        ASSERT_EQ(arr2[2], 3);
+        ASSERT_EQ(arr2[3], 4);
+        ASSERT_EQ(arr2[4], 5);
+
+        arr = std::move(arr2);
+
+        ASSERT_EQ(arr.size(), 5);
+        ASSERT_EQ(arr[0], 1);
+        ASSERT_EQ(arr[1], 2);
+        ASSERT_EQ(arr[2], 3);
+        ASSERT_EQ(arr[3], 4);
+        ASSERT_EQ(arr[4], 5);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+
+        Array arr2;
+
+        arr2.push_back(4);
+        arr2.push_back(5);
+        arr2.push_back(6);
+        arr2.push_back(7);
+
+        arr2 = std::move(arr);
+
+        ASSERT_EQ(arr2.size(), 3);
+        ASSERT_EQ(arr2[0], 1);
+        ASSERT_EQ(arr2[1], 2);
+        ASSERT_EQ(arr2[2], 3);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+
+        Array arr2;
+
+        arr2.push_back(4);
+        arr2.push_back(5);
+        arr2.push_back(6);
+        arr2.push_back(7);
+        arr2.push_back(8);
+
+        arr = std::move(arr2);
+
+        ASSERT_EQ(arr.size(), 5);
+        ASSERT_EQ(arr[0], 4);
+        ASSERT_EQ(arr[1], 5);
+        ASSERT_EQ(arr[2], 6);
+        ASSERT_EQ(arr[3], 7);
+        ASSERT_EQ(arr[4], 8);
+    }
+}
+
+
+TEST(Common, PODArrayBasicSwap)
+{
+    using namespace DB;
+
+    static constexpr size_t initial_bytes = 32;
+    using Array = PODArray<UInt64, initial_bytes,
+        AllocatorWithStackMemory<Allocator<false>, initial_bytes>>;
+
+    {
+        Array arr;
+        Array arr2;
+        arr.swap(arr2);
+        arr2.swap(arr);
+    }
+
+    {
+        Array arr;
+
+        Array arr2;
+
+        arr2.push_back(1);
+        arr2.push_back(2);
+        arr2.push_back(3);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 3);
+        ASSERT_TRUE(arr[0] == 1);
+        ASSERT_TRUE(arr[1] == 2);
+        ASSERT_TRUE(arr[2] == 3);
+
+        ASSERT_TRUE(arr2.empty());
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.empty());
+
+        ASSERT_TRUE(arr2.size() == 3);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+        ASSERT_TRUE(arr2[2] == 3);
+    }
+
+    {
+        Array arr;
+
+        Array arr2;
+
+        arr2.push_back(1);
+        arr2.push_back(2);
+        arr2.push_back(3);
+        arr2.push_back(4);
+        arr2.push_back(5);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 5);
+        ASSERT_TRUE(arr[0] == 1);
+        ASSERT_TRUE(arr[1] == 2);
+        ASSERT_TRUE(arr[2] == 3);
+        ASSERT_TRUE(arr[3] == 4);
+        ASSERT_TRUE(arr[4] == 5);
+
+        ASSERT_TRUE(arr2.empty());
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.empty());
+
+        ASSERT_TRUE(arr2.size() == 5);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+        ASSERT_TRUE(arr2[2] == 3);
+        ASSERT_TRUE(arr2[3] == 4);
+        ASSERT_TRUE(arr2[4] == 5);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+
+        Array arr2;
+
+        arr2.push_back(4);
+        arr2.push_back(5);
+        arr2.push_back(6);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 3);
+        ASSERT_TRUE(arr[0] == 4);
+        ASSERT_TRUE(arr[1] == 5);
+        ASSERT_TRUE(arr[2] == 6);
+
+        ASSERT_TRUE(arr2.size() == 3);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+        ASSERT_TRUE(arr2[2] == 3);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 3);
+        ASSERT_TRUE(arr[0] == 1);
+        ASSERT_TRUE(arr[1] == 2);
+        ASSERT_TRUE(arr[2] == 3);
+
+        ASSERT_TRUE(arr2.size() == 3);
+        ASSERT_TRUE(arr2[0] == 4);
+        ASSERT_TRUE(arr2[1] == 5);
+        ASSERT_TRUE(arr2[2] == 6);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+
+        Array arr2;
+
+        arr2.push_back(3);
+        arr2.push_back(4);
+        arr2.push_back(5);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 3);
+        ASSERT_TRUE(arr[0] == 3);
+        ASSERT_TRUE(arr[1] == 4);
+        ASSERT_TRUE(arr[2] == 5);
+
+        ASSERT_TRUE(arr2.size() == 2);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 2);
+        ASSERT_TRUE(arr[0] == 1);
+        ASSERT_TRUE(arr[1] == 2);
+
+        ASSERT_TRUE(arr2.size() == 3);
+        ASSERT_TRUE(arr2[0] == 3);
+        ASSERT_TRUE(arr2[1] == 4);
+        ASSERT_TRUE(arr2[2] == 5);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+
+        Array arr2;
+
+        arr2.push_back(4);
+        arr2.push_back(5);
+        arr2.push_back(6);
+        arr2.push_back(7);
+        arr2.push_back(8);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 5);
+        ASSERT_TRUE(arr[0] == 4);
+        ASSERT_TRUE(arr[1] == 5);
+        ASSERT_TRUE(arr[2] == 6);
+        ASSERT_TRUE(arr[3] == 7);
+        ASSERT_TRUE(arr[4] == 8);
+
+        ASSERT_TRUE(arr2.size() == 3);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+        ASSERT_TRUE(arr2[2] == 3);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 3);
+        ASSERT_TRUE(arr[0] == 1);
+        ASSERT_TRUE(arr[1] == 2);
+        ASSERT_TRUE(arr[2] == 3);
+
+        ASSERT_TRUE(arr2.size() == 5);
+        ASSERT_TRUE(arr2[0] == 4);
+        ASSERT_TRUE(arr2[1] == 5);
+        ASSERT_TRUE(arr2[2] == 6);
+        ASSERT_TRUE(arr2[3] == 7);
+        ASSERT_TRUE(arr2[4] == 8);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+        arr.push_back(4);
+        arr.push_back(5);
+
+        Array arr2;
+
+        arr2.push_back(6);
+        arr2.push_back(7);
+        arr2.push_back(8);
+        arr2.push_back(9);
+        arr2.push_back(10);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 5);
+        ASSERT_TRUE(arr[0] == 6);
+        ASSERT_TRUE(arr[1] == 7);
+        ASSERT_TRUE(arr[2] == 8);
+        ASSERT_TRUE(arr[3] == 9);
+        ASSERT_TRUE(arr[4] == 10);
+
+        ASSERT_TRUE(arr2.size() == 5);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+        ASSERT_TRUE(arr2[2] == 3);
+        ASSERT_TRUE(arr2[3] == 4);
+        ASSERT_TRUE(arr2[4] == 5);
+
+        arr.swap(arr2);
+
+        ASSERT_TRUE(arr.size() == 5);
+        ASSERT_TRUE(arr[0] == 1);
+        ASSERT_TRUE(arr[1] == 2);
+        ASSERT_TRUE(arr[2] == 3);
+        ASSERT_TRUE(arr[3] == 4);
+        ASSERT_TRUE(arr[4] == 5);
+
+        ASSERT_TRUE(arr2.size() == 5);
+        ASSERT_TRUE(arr2[0] == 6);
+        ASSERT_TRUE(arr2[1] == 7);
+        ASSERT_TRUE(arr2[2] == 8);
+        ASSERT_TRUE(arr2[3] == 9);
+        ASSERT_TRUE(arr2[4] == 10);
+    }
+}
+
+TEST(Common, PODArrayBasicSwapMoveConstructor)
+{
+    static constexpr size_t initial_bytes = 32;
+    using Array = PODArray<UInt64, initial_bytes,
+        AllocatorWithStackMemory<Allocator<false>, initial_bytes>>;
+
+    {
+        Array arr;
+        Array arr2{std::move(arr)};
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+
+        Array arr2{std::move(arr)};
+
+        ASSERT_TRUE(arr.empty()); // NOLINT
+
+        ASSERT_TRUE(arr2.size() == 3);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+        ASSERT_TRUE(arr2[2] == 3);
+    }
+
+    {
+        Array arr;
+
+        arr.push_back(1);
+        arr.push_back(2);
+        arr.push_back(3);
+        arr.push_back(4);
+        arr.push_back(5);
+
+        Array arr2{std::move(arr)};
+
+        ASSERT_TRUE(arr.empty()); // NOLINT
+
+        ASSERT_TRUE(arr2.size() == 5);
+        ASSERT_TRUE(arr2[0] == 1);
+        ASSERT_TRUE(arr2[1] == 2);
+        ASSERT_TRUE(arr2[2] == 3);
+        ASSERT_TRUE(arr2[3] == 4);
+        ASSERT_TRUE(arr2[4] == 5);
+    }
+}
+
 TEST(Common, PODArrayInsert)
 {
-    std::string str = "test_string_abacaba";
-    PODArray<char> chars;
-    chars.insert(chars.end(), str.begin(), str.end());
-    EXPECT_EQ(str, std::string(chars.data(), chars.size()));
-
-    std::string insert_in_the_middle = "insert_in_the_middle";
-    auto pos = str.size() / 2;
-    str.insert(str.begin() + pos, insert_in_the_middle.begin(), insert_in_the_middle.end());
-    chars.insert(chars.begin() + pos, insert_in_the_middle.begin(), insert_in_the_middle.end());
-    EXPECT_EQ(str, std::string(chars.data(), chars.size()));
-
-    std::string insert_with_resize;
-    insert_with_resize.reserve(chars.capacity() * 2);
-    char cur_char = 'a';
-    while (insert_with_resize.size() < insert_with_resize.capacity())
     {
-        insert_with_resize += cur_char;
-        if (cur_char == 'z')
-            cur_char = 'a';
-        else
-            ++cur_char;
+        std::string str = "test_string_abacaba";
+        PODArray<char> chars;
+        chars.insert(chars.end(), str.begin(), str.end());
+        EXPECT_EQ(str, std::string(chars.data(), chars.size()));
+
+        std::string insert_in_the_middle = "insert_in_the_middle";
+        auto pos = str.size() / 2;
+        str.insert(str.begin() + pos, insert_in_the_middle.begin(), insert_in_the_middle.end());
+        chars.insert(chars.begin() + pos, insert_in_the_middle.begin(), insert_in_the_middle.end());
+        EXPECT_EQ(str, std::string(chars.data(), chars.size()));
+
+        std::string insert_with_resize;
+        insert_with_resize.reserve(chars.capacity() * 2);
+        char cur_char = 'a';
+        while (insert_with_resize.size() < insert_with_resize.capacity())
+        {
+            insert_with_resize += cur_char;
+            if (cur_char == 'z')
+                cur_char = 'a';
+            else
+                ++cur_char;
+        }
+        str.insert(str.begin(), insert_with_resize.begin(), insert_with_resize.end());
+        chars.insert(chars.begin(), insert_with_resize.begin(), insert_with_resize.end());
+        EXPECT_EQ(str, std::string(chars.data(), chars.size()));
+    }
+    {
+        PODArray<UInt64> values;
+        PODArray<UInt64> values_to_insert;
+
+        for (size_t i = 0; i < 120; ++i)
+            values.emplace_back(i);
+
+        values.insert(values.begin() + 1, values_to_insert.begin(), values_to_insert.end());
+        ASSERT_EQ(values.size(), 120);
+
+        values_to_insert.emplace_back(0);
+        values_to_insert.emplace_back(1);
+
+        values.insert(values.begin() + 1, values_to_insert.begin(), values_to_insert.end());
+        ASSERT_EQ(values.size(), 122);
+
+        values_to_insert.clear();
+        for (size_t i = 0; i < 240; ++i)
+            values_to_insert.emplace_back(i);
+
+        values.insert(values.begin() + 1, values_to_insert.begin(), values_to_insert.end());
+        ASSERT_EQ(values.size(), 362);
     }
-    str.insert(str.begin(), insert_with_resize.begin(), insert_with_resize.end());
-    chars.insert(chars.begin(), insert_with_resize.begin(), insert_with_resize.end());
-    EXPECT_EQ(str, std::string(chars.data(), chars.size()));
 }
 
 TEST(Common, PODArrayInsertFromItself)
@@ -46,18 +484,6 @@ TEST(Common, PODArrayInsertFromItself)
     }
 }
 
-TEST(Common, PODPushBackRawMany)
-{
-    PODArray<char> chars;
-    chars.push_back_raw_many(5, "first");
-    EXPECT_EQ(std::string("first"), std::string(chars.data(), chars.size()));
-    EXPECT_EQ(5, chars.size());
-    EXPECT_LE(chars.capacity() - chars.size(), 10);
-    chars.push_back_raw_many(10, "0123456789");
-    EXPECT_EQ(15, chars.size());
-    EXPECT_EQ(std::string("first0123456789"), std::string(chars.data(), chars.size()));
-}
-
 TEST(Common, PODNoOverallocation)
 {
     /// Check that PaddedPODArray allocates for smaller number of elements than the power of two due to padding.
diff --git a/src/Common/tests/gtest_sensitive_data_masker.cpp b/src/Common/tests/gtest_sensitive_data_masker.cpp
index b8125c77b9b..7ebf141d961 100644
--- a/src/Common/tests/gtest_sensitive_data_masker.cpp
+++ b/src/Common/tests/gtest_sensitive_data_masker.cpp
@@ -223,7 +223,7 @@ TEST(Common, SensitiveDataMasker)
     {
         EXPECT_EQ(
             std::string(e.message()),
-            "SensitiveDataMasker: cannot compile re2: ())(, error: missing ): ())(. Look at https://github.com/google/re2/wiki/Syntax for reference.: while adding query masking rule 'test'."
+            "SensitiveDataMasker: cannot compile re2: ())(, error: unexpected ): ())(. Look at https://github.com/google/re2/wiki/Syntax for reference.: while adding query masking rule 'test'."
         );
         EXPECT_EQ(e.code(), DB::ErrorCodes::CANNOT_COMPILE_REGEXP);
     }
diff --git a/src/Common/tests/gtest_thread_pool_global_full.cpp b/src/Common/tests/gtest_thread_pool_global_full.cpp
index 583d43be1bb..c6133f7ca11 100644
--- a/src/Common/tests/gtest_thread_pool_global_full.cpp
+++ b/src/Common/tests/gtest_thread_pool_global_full.cpp
@@ -25,7 +25,7 @@ TEST(ThreadPool, GlobalFull1)
     std::atomic<size_t> counter = 0;
     static constexpr size_t num_jobs = capacity + 1;
 
-    auto func = [&] { ++counter; while (counter != num_jobs) {} };
+    auto func = [&] { ++counter; while (counter != num_jobs) {} }; //-V776
 
     ThreadPool pool(num_jobs);
 
@@ -63,7 +63,7 @@ TEST(ThreadPool, GlobalFull2)
     global_pool.wait();
 
     std::atomic<size_t> counter = 0;
-    auto func = [&] { ++counter; while (counter != capacity + 1) {} };
+    auto func = [&] { ++counter; while (counter != capacity + 1) {} }; //-V776
 
     ThreadPool pool(capacity, 0, capacity);
     for (size_t i = 0; i < capacity; ++i)
diff --git a/src/Common/tests/gtest_wide_integer.cpp b/src/Common/tests/gtest_wide_integer.cpp
new file mode 100644
index 00000000000..982bbee804e
--- /dev/null
+++ b/src/Common/tests/gtest_wide_integer.cpp
@@ -0,0 +1,281 @@
+#include <gtest/gtest.h>
+
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+#include <initializer_list>
+
+#include <Core/Types.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <common/demangle.h>
+
+
+static_assert(is_signed_v<Int128>);
+static_assert(!is_unsigned_v<Int128>);
+static_assert(is_integer_v<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(sizeof(Int256) == 32);
+
+static_assert(!is_signed_v<UInt128>);
+static_assert(is_unsigned_v<UInt128>);
+static_assert(is_integer_v<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(sizeof(UInt256) == 32);
+
+
+using namespace DB;
+
+
+GTEST_TEST(WideInteger, Conversions)
+{
+    ASSERT_EQ(toString(UInt128(12345678901234567890ULL)), "12345678901234567890");
+    ASSERT_EQ(toString(UInt256(12345678901234567890ULL)), "12345678901234567890");
+
+    Int128 minus_one = -1;
+    ASSERT_EQ(minus_one.items[0], -1);
+    ASSERT_EQ(minus_one.items[1], -1);
+
+    ASSERT_EQ(0, memcmp(&minus_one, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(minus_one)));
+
+    ASSERT_EQ(minus_one, -1);
+    ASSERT_EQ(minus_one, -1LL);
+    ASSERT_EQ(minus_one, Int8(-1));
+    ASSERT_EQ(minus_one, Int16(-1));
+    ASSERT_EQ(minus_one, Int32(-1));
+    ASSERT_EQ(minus_one, Int64(-1));
+
+    ASSERT_LT(minus_one, 0);
+
+    Int128 zero = 0;
+    zero += -1;
+    ASSERT_EQ(zero, -1);
+    ASSERT_EQ(zero, minus_one);
+
+    zero += minus_one;
+    ASSERT_EQ(0, memcmp(&zero, "\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(zero)));
+
+    zero += 2;
+    ASSERT_EQ(zero, 0);
+
+    ASSERT_EQ(toString(Int128(-1)), "-1");
+    ASSERT_EQ(toString(Int256(-1)), "-1");
+
+    ASSERT_EQ(toString(Int128(-1LL)), "-1");
+    ASSERT_EQ(toString(Int256(-1LL)), "-1");
+
+    ASSERT_EQ(toString(Int128(-1234567890123456789LL)), "-1234567890123456789");
+    ASSERT_EQ(toString(Int256(-1234567890123456789LL)), "-1234567890123456789");
+
+    ASSERT_EQ(UInt64(UInt128(12345678901234567890ULL)), 12345678901234567890ULL);
+    ASSERT_EQ(UInt64(UInt256(12345678901234567890ULL)), 12345678901234567890ULL);
+
+    ASSERT_EQ(__uint128_t(UInt128(12345678901234567890ULL)), 12345678901234567890ULL);
+    ASSERT_EQ(__uint128_t(UInt256(12345678901234567890ULL)), 12345678901234567890ULL);
+
+    ASSERT_EQ(__int128_t(Int128(-1234567890123456789LL)), -1234567890123456789LL);
+    ASSERT_EQ(__int128_t(Int256(-1234567890123456789LL)), -1234567890123456789LL);
+
+    ASSERT_EQ(toString(Int128(-1)), "-1");
+    ASSERT_EQ(toString(Int256(-1)), "-1");
+
+    ASSERT_EQ(toString(UInt128(123.456)), "123");
+    ASSERT_EQ(toString(UInt256(123.456)), "123");
+    ASSERT_EQ(toString(Int128(-123.456)), "-123");
+    ASSERT_EQ(toString(Int256(-123.456)), "-123");
+
+    ASSERT_EQ(toString(UInt128(123.456f)), "123");
+    ASSERT_EQ(toString(UInt256(123.456f)), "123");
+    ASSERT_EQ(toString(Int128(-123.456f)), "-123");
+    ASSERT_EQ(toString(Int256(-123.456f)), "-123");
+
+    ASSERT_EQ(toString(UInt128(1) * 1000000000 * 1000000000 * 1000000000 * 1000000000), "1000000000000000000000000000000000000");
+    ASSERT_EQ(Float64(UInt128(1) * 1000000000 * 1000000000 * 1000000000 * 1000000000), 1e36);
+
+    ASSERT_EQ(toString(UInt256(1) * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000),
+        "1000000000000000000000000000000000000000000000000000000000000000000000000");
+    ASSERT_EQ(Float64(UInt256(1) * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000 * 1000000000), 1e72);
+
+    EXPECT_EQ(toString(parse<Int128>("148873535527910577765226390751398592640")), "148873535527910577765226390751398592640");
+    EXPECT_EQ(toString(parse<UInt128>("148873535527910577765226390751398592640")), "148873535527910577765226390751398592640");
+}
+
+
+template <typename T>
+static T divide(T & numerator, T && denominator)
+{
+    if (!denominator)
+        throwError("Division by zero");
+
+    T & n = numerator;
+    T & d = denominator;
+    T x = 1;
+    T quotient = 0;
+
+    /// Multiply d to the power of two until it will be greater than n.
+    /// The factor will be collected in x.
+    while (d <= n && ((d >> (sizeof(T) * 8 - 1)) & 1) == 0)
+    {
+        x <<= 1;
+        d <<= 1;
+    }
+
+    std::cerr << toString(x) << ", " << toString(d) << "\n";
+
+    while (x)
+    {
+        if (d <= n)
+        {
+            n -= d;
+            quotient |= x;
+        }
+
+        x >>= 1;
+        d >>= 1;
+    }
+
+    return quotient;
+}
+
+
+GTEST_TEST(WideInteger, Arithmetic)
+{
+    Int128 minus_one = -1;
+    Int128 zero = 0;
+
+    zero += -1;
+    ASSERT_EQ(zero, -1);
+    ASSERT_EQ(zero, minus_one);
+
+    zero += minus_one;
+    ASSERT_EQ(0, memcmp(&zero, "\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(zero)));
+
+    zero += 2;
+    ASSERT_EQ(zero, 0);
+
+    ASSERT_EQ(UInt256(12345678901234567890ULL) * 12345678901234567890ULL / 12345678901234567890ULL, 12345678901234567890ULL);
+    ASSERT_EQ(UInt256(12345678901234567890ULL) * UInt256(12345678901234567890ULL) / 12345678901234567890ULL, 12345678901234567890ULL);
+    ASSERT_EQ(UInt256(12345678901234567890ULL) * 12345678901234567890ULL / UInt256(12345678901234567890ULL), 12345678901234567890ULL);
+    ASSERT_EQ(UInt256(12345678901234567890ULL) * 12345678901234567890ULL / 12345678901234567890ULL, UInt256(12345678901234567890ULL));
+    ASSERT_EQ(UInt128(12345678901234567890ULL) * 12345678901234567890ULL / UInt128(12345678901234567890ULL), 12345678901234567890ULL);
+    ASSERT_EQ(UInt256(12345678901234567890ULL) * UInt128(12345678901234567890ULL) / 12345678901234567890ULL, 12345678901234567890ULL);
+
+    ASSERT_EQ(Int128(0) + Int32(-1), Int128(-1));
+
+    Int128 x(parse<Int128>("148873535527910577765226390751398592640"));
+    Int128 dividend = x / 10;
+    ASSERT_EQ(toString(dividend), "14887353552791057776522639075139859264");
+}
+
+
+GTEST_TEST(WideInteger, DecimalArithmetic)
+{
+    Decimal128 zero{};
+    Decimal32 addend = -1000;
+
+    zero += Decimal128(addend);
+    ASSERT_EQ(zero.value, -1000);
+
+    zero += addend;
+    ASSERT_EQ(zero.value, -2000);
+}
+
+
+GTEST_TEST(WideInteger, FromDouble)
+{
+    /// Check that we are being able to convert double to big integer without the help of floating point instructions.
+    /// (a prototype of a function that we may need)
+
+    double f = -123.456;
+    UInt64 u;
+    memcpy(&u, &f, sizeof(f));
+
+    bool is_negative = u >> 63;
+    uint16_t exponent = (u >> 52) & (((1ull << 12) - 1) >> 1);
+    int16_t normalized_exponent = exponent - 1023;
+    UInt64 mantissa = u & ((1ull << 52) - 1);
+
+    // std::cerr << is_negative << ", " << normalized_exponent << ", " << mantissa << "\n";
+
+    /// x = sign * (2 ^ normalized_exponent + mantissa * 2 ^ (normalized_exponent - mantissa_bits))
+
+    Int128 res = 0;
+
+    if (normalized_exponent >= 128)
+    {
+    }
+    else
+    {
+        res = mantissa;
+        if (normalized_exponent > 52)
+            res <<= (normalized_exponent - 52);
+        else
+            res >>= (52 - normalized_exponent);
+
+        if (normalized_exponent > 0)
+            res += Int128(1) << normalized_exponent;
+    }
+
+    if (is_negative)
+        res = -res;
+
+    ASSERT_EQ(toString(res), "-123");
+}
+
+
+GTEST_TEST(WideInteger, Shift)
+{
+    Int128 x = 1;
+
+    auto y = x << 64;
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00", sizeof(Int128)));
+
+    auto z = y << 11;
+    ASSERT_EQ(toString(z), "37778931862957161709568");
+
+    auto a = x << 11;
+    ASSERT_EQ(a, 2048);
+
+    z >>= 64;
+    ASSERT_EQ(z, a);
+
+    x = -1;
+    y = x << 16;
+
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
+
+    y >>= 16;
+    ASSERT_EQ(0, memcmp(&y, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
+
+    y <<= 64;
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
+
+    y >>= 32;
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", sizeof(Int128)));
+
+    y <<= 64;
+    ASSERT_EQ(0, memcmp(&y, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF", sizeof(Int128)));
+}
+
+
+GTEST_TEST(WideInteger, DecimalFormatting)
+{
+    Decimal128 x(parse<Int128>("148873535527910577765226390751398592640"));
+
+    EXPECT_EQ(toString(x.value), "148873535527910577765226390751398592640");
+    EXPECT_EQ(toString(x.value / 10), "14887353552791057776522639075139859264");
+    EXPECT_EQ(toString(x.value % 10), "0");
+
+    Int128 fractional = DecimalUtils::getFractionalPart(x, 2);
+
+    EXPECT_EQ(fractional, 40);
+    EXPECT_EQ(decimalFractional(fractional, 2), "40");
+}
diff --git a/src/Common/tests/lru_hash_map_perf.cpp b/src/Common/tests/lru_hash_map_perf.cpp
deleted file mode 100644
index 14beff3f7da..00000000000
--- a/src/Common/tests/lru_hash_map_perf.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-#include <vector>
-#include <list>
-#include <map>
-#include <random>
-#include <pcg_random.hpp>
-
-#include <Common/Stopwatch.h>
-#include <Common/HashTable/LRUHashMap.h>
-
-template<class Key, class Value>
-class LRUHashMapBasic
-{
-public:
-    using key_type = Key;
-    using value_type = Value;
-    using list_type = std::list<key_type>;
-    using node = std::pair<value_type, typename list_type::iterator>;
-    using map_type = std::unordered_map<key_type, node, DefaultHash<Key>>;
-
-    LRUHashMapBasic(size_t max_size_, bool preallocated)
-        : hash_map(preallocated ? max_size_ : 32)
-        , max_size(max_size_)
-    {
-    }
-
-    void insert(const Key &key, const Value &value)
-    {
-        auto it = hash_map.find(key);
-
-        if (it == hash_map.end())
-        {
-            if (size() >= max_size)
-            {
-                auto iterator_to_remove = list.begin();
-
-                hash_map.erase(*iterator_to_remove);
-                list.erase(iterator_to_remove);
-            }
-
-            list.push_back(key);
-            hash_map[key] = std::make_pair(value, --list.end());
-        }
-        else
-        {
-            auto & [value_to_update, iterator_in_list_to_update] = it->second;
-
-            list.splice(list.end(), list, iterator_in_list_to_update);
-
-            iterator_in_list_to_update = list.end();
-            value_to_update = value;
-        }
-    }
-
-    value_type & get(const key_type &key)
-    {
-        auto iterator_in_map = hash_map.find(key);
-        assert(iterator_in_map != hash_map.end());
-
-        auto & [value_to_return, iterator_in_list_to_update] = iterator_in_map->second;
-
-        list.splice(list.end(), list, iterator_in_list_to_update);
-        iterator_in_list_to_update = list.end();
-
-        return value_to_return;
-    }
-
-    const value_type & get(const key_type & key) const
-    {
-        return const_cast<std::decay_t<decltype(*this)> *>(this)->get(key);
-    }
-
-    size_t getMaxSize() const
-    {
-        return max_size;
-    }
-
-    size_t size() const
-    {
-        return hash_map.size();
-    }
-
-    bool empty() const
-    {
-        return hash_map.empty();
-    }
-
-    bool contains(const Key & key)
-    {
-        return hash_map.find(key) != hash_map.end();
-    }
-
-    void clear()
-    {
-        hash_map.clear();
-        list.clear();
-    }
-
-private:
-    map_type hash_map;
-    list_type list;
-    size_t max_size;
-};
-
-std::vector<UInt64> generateNumbersToInsert(size_t numbers_to_insert_size)
-{
-    std::vector<UInt64> numbers;
-    numbers.reserve(numbers_to_insert_size);
-
-    std::random_device rd;
-    pcg64 gen(rd());
-
-    UInt64 min = std::numeric_limits<UInt64>::min();
-    UInt64 max = std::numeric_limits<UInt64>::max();
-
-    auto distribution = std::uniform_int_distribution<>(min, max);
-
-    for (size_t i = 0; i < numbers_to_insert_size; ++i)
-    {
-        UInt64 number = distribution(gen);
-        numbers.emplace_back(number);
-    }
-
-    return numbers;
-}
-
-void testInsertElementsIntoHashMap(size_t map_size, const std::vector<UInt64> & numbers_to_insert, bool preallocated)
-{
-    size_t numbers_to_insert_size = numbers_to_insert.size();
-    std::cout << "TestInsertElementsIntoHashMap preallocated map size: " << map_size << " numbers to insert size: " << numbers_to_insert_size;
-    std::cout << std::endl;
-
-    HashMap<int, int> hash_map(preallocated ? map_size : 32);
-
-    Stopwatch watch;
-
-    for (size_t i = 0; i < numbers_to_insert_size; ++i)
-        hash_map.insert({ numbers_to_insert[i], numbers_to_insert[i] });
-
-    std::cout << "Inserted in " << watch.elapsedMilliseconds() << " milliseconds" << std::endl;
-
-    UInt64 summ = 0;
-
-    for (size_t i = 0; i < numbers_to_insert_size; ++i)
-    {
-        auto * it = hash_map.find(numbers_to_insert[i]);
-
-        if (it)
-            summ += it->getMapped();
-    }
-
-    std::cout << "Calculated summ: " << summ << " in " << watch.elapsedMilliseconds() << " milliseconds" << std::endl;
-}
-
-void testInsertElementsIntoStandardMap(size_t map_size, const std::vector<UInt64> & numbers_to_insert, bool preallocated)
-{
-    size_t numbers_to_insert_size = numbers_to_insert.size();
-    std::cout << "TestInsertElementsIntoStandardMap map size: " << map_size << " numbers to insert size: " << numbers_to_insert_size;
-    std::cout << std::endl;
-
-    std::unordered_map<int, int> hash_map(preallocated ? map_size : 32);
-
-    Stopwatch watch;
-
-    for (size_t i = 0; i < numbers_to_insert_size; ++i)
-        hash_map.insert({ numbers_to_insert[i], numbers_to_insert[i] });
-
-    std::cout << "Inserted in " << watch.elapsedMilliseconds() << " milliseconds" << std::endl;
-
-    UInt64 summ = 0;
-
-    for (size_t i = 0; i < numbers_to_insert_size; ++i)
-    {
-        auto it = hash_map.find(numbers_to_insert[i]);
-
-        if (it != hash_map.end())
-            summ += it->second;
-    }
-
-    std::cout << "Calculated summ: " << summ << " in " << watch.elapsedMilliseconds() << " milliseconds" << std::endl;
-}
-
-template<typename LRUCache>
-UInt64 testInsertIntoEmptyCache(size_t map_size, const std::vector<UInt64> & numbers_to_insert, bool preallocated)
-{
-    size_t numbers_to_insert_size = numbers_to_insert.size();
-    std::cout << "Test testInsertPreallocated preallocated map size: " << map_size << " numbers to insert size: " << numbers_to_insert_size;
-    std::cout << std::endl;
-
-    LRUCache cache(map_size, preallocated);
-    Stopwatch watch;
-
-    for (size_t i = 0; i < numbers_to_insert_size; ++i)
-    {
-        cache.insert(numbers_to_insert[i], numbers_to_insert[i]);
-    }
-
-    std::cout << "Inserted in " << watch.elapsedMilliseconds() << " milliseconds" << std::endl;
-
-    UInt64 summ = 0;
-
-    for (size_t i = 0; i < numbers_to_insert_size; ++i)
-        if (cache.contains(numbers_to_insert[i]))
-            summ += cache.get(numbers_to_insert[i]);
-
-    std::cout << "Calculated summ: " << summ << " in " << watch.elapsedMilliseconds() << " milliseconds" << std::endl;
-
-    return summ;
-}
-
-int main(int argc, char ** argv)
-{
-    (void)(argc);
-    (void)(argv);
-
-    size_t hash_map_size = 1200000;
-    size_t numbers_to_insert_size = 12000000;
-    std::vector<UInt64> numbers = generateNumbersToInsert(numbers_to_insert_size);
-
-    std::cout << "Test insert into HashMap preallocated=0" << std::endl;
-    testInsertElementsIntoHashMap(hash_map_size, numbers, true);
-    std::cout << std::endl;
-
-    std::cout << "Test insert into HashMap preallocated=1" << std::endl;
-    testInsertElementsIntoHashMap(hash_map_size, numbers, true);
-    std::cout << std::endl;
-
-    std::cout << "Test LRUHashMap preallocated=0" << std::endl;
-    testInsertIntoEmptyCache<LRUHashMap<UInt64, UInt64>>(hash_map_size, numbers, false);
-    std::cout << std::endl;
-
-    std::cout << "Test LRUHashMap preallocated=1" << std::endl;
-    testInsertIntoEmptyCache<LRUHashMap<UInt64, UInt64>>(hash_map_size, numbers, true);
-    std::cout << std::endl;
-
-    std::cout << "Test LRUHashMapBasic preallocated=0" << std::endl;
-    testInsertIntoEmptyCache<LRUHashMapBasic<UInt64, UInt64>>(hash_map_size, numbers, false);
-    std::cout << std::endl;
-
-    std::cout << "Test LRUHashMapBasic preallocated=1" << std::endl;
-    testInsertIntoEmptyCache<LRUHashMapBasic<UInt64, UInt64>>(hash_map_size, numbers, true);
-    std::cout << std::endl;
-
-    return 0;
-}
diff --git a/src/Common/tests/pod_array.cpp b/src/Common/tests/pod_array.cpp
deleted file mode 100644
index 7ebf2670271..00000000000
--- a/src/Common/tests/pod_array.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-#include <Common/PODArray.h>
-#include <common/types.h>
-#include <iostream>
-
-#define ASSERT_CHECK(cond, res)                        \
-do                                    \
-{                                    \
-    if (!(cond))                            \
-    {                                \
-        std::cerr << __FILE__ << ":" << __LINE__ << ":"        \
-            << "Assertion " << #cond << " failed.\n";    \
-        if ((res)) { (res) = false; }                \
-    }                                \
-} \
-while (false)
-
-static void test1()
-{
-    using namespace DB;
-
-    static constexpr size_t initial_bytes = 32;
-    using Array = PODArray<UInt64, initial_bytes,
-        AllocatorWithStackMemory<Allocator<false>, initial_bytes>>;
-
-    bool res = true;
-
-    {
-        Array arr;
-        Array arr2;
-        arr2 = std::move(arr);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-
-        Array arr2;
-
-        arr2 = std::move(arr);
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-
-        arr = std::move(arr2);
-
-        ASSERT_CHECK((arr.size() == 3), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-        ASSERT_CHECK((arr[2] == 3), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-        arr.push_back(4);
-        arr.push_back(5);
-
-        Array arr2;
-
-        arr2 = std::move(arr);
-
-        ASSERT_CHECK((arr2.size() == 5), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-        ASSERT_CHECK((arr2[3] == 4), res);
-        ASSERT_CHECK((arr2[4] == 5), res);
-
-        arr = std::move(arr2);
-
-        ASSERT_CHECK((arr.size() == 5), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-        ASSERT_CHECK((arr[2] == 3), res);
-        ASSERT_CHECK((arr[3] == 4), res);
-        ASSERT_CHECK((arr[4] == 5), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-
-        Array arr2;
-
-        arr2.push_back(4);
-        arr2.push_back(5);
-        arr2.push_back(6);
-        arr2.push_back(7);
-
-        arr2 = std::move(arr);
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-
-        Array arr2;
-
-        arr2.push_back(4);
-        arr2.push_back(5);
-        arr2.push_back(6);
-        arr2.push_back(7);
-        arr2.push_back(8);
-
-        arr = std::move(arr2);
-
-        ASSERT_CHECK((arr.size() == 5), res);
-        ASSERT_CHECK((arr[0] == 4), res);
-        ASSERT_CHECK((arr[1] == 5), res);
-        ASSERT_CHECK((arr[2] == 6), res);
-        ASSERT_CHECK((arr[3] == 7), res);
-        ASSERT_CHECK((arr[4] == 8), res);
-    }
-
-    if (!res)
-        std::cerr << "Some errors were found in test 1\n";
-}
-
-static void test2()
-{
-    using namespace DB;
-
-    static constexpr size_t initial_bytes = 32;
-    using Array = PODArray<UInt64, initial_bytes,
-        AllocatorWithStackMemory<Allocator<false>, initial_bytes>>;
-
-    bool res = true;
-
-    {
-        Array arr;
-        Array arr2;
-        arr.swap(arr2);
-        arr2.swap(arr);
-    }
-
-    {
-        Array arr;
-
-        Array arr2;
-
-        arr2.push_back(1);
-        arr2.push_back(2);
-        arr2.push_back(3);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 3), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-        ASSERT_CHECK((arr[2] == 3), res);
-
-        ASSERT_CHECK((arr2.empty()), res);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.empty()), res);
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-    }
-
-    {
-        Array arr;
-
-        Array arr2;
-
-        arr2.push_back(1);
-        arr2.push_back(2);
-        arr2.push_back(3);
-        arr2.push_back(4);
-        arr2.push_back(5);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 5), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-        ASSERT_CHECK((arr[2] == 3), res);
-        ASSERT_CHECK((arr[3] == 4), res);
-        ASSERT_CHECK((arr[4] == 5), res);
-
-        ASSERT_CHECK((arr2.empty()), res);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.empty()), res);
-
-        ASSERT_CHECK((arr2.size() == 5), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-        ASSERT_CHECK((arr2[3] == 4), res);
-        ASSERT_CHECK((arr2[4] == 5), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-
-        Array arr2;
-
-        arr2.push_back(4);
-        arr2.push_back(5);
-        arr2.push_back(6);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 3), res);
-        ASSERT_CHECK((arr[0] == 4), res);
-        ASSERT_CHECK((arr[1] == 5), res);
-        ASSERT_CHECK((arr[2] == 6), res);
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 3), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-        ASSERT_CHECK((arr[2] == 3), res);
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 4), res);
-        ASSERT_CHECK((arr2[1] == 5), res);
-        ASSERT_CHECK((arr2[2] == 6), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-
-        Array arr2;
-
-        arr2.push_back(3);
-        arr2.push_back(4);
-        arr2.push_back(5);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 3), res);
-        ASSERT_CHECK((arr[0] == 3), res);
-        ASSERT_CHECK((arr[1] == 4), res);
-        ASSERT_CHECK((arr[2] == 5), res);
-
-        ASSERT_CHECK((arr2.size() == 2), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 2), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 3), res);
-        ASSERT_CHECK((arr2[1] == 4), res);
-        ASSERT_CHECK((arr2[2] == 5), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-
-        Array arr2;
-
-        arr2.push_back(4);
-        arr2.push_back(5);
-        arr2.push_back(6);
-        arr2.push_back(7);
-        arr2.push_back(8);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 5), res);
-        ASSERT_CHECK((arr[0] == 4), res);
-        ASSERT_CHECK((arr[1] == 5), res);
-        ASSERT_CHECK((arr[2] == 6), res);
-        ASSERT_CHECK((arr[3] == 7), res);
-        ASSERT_CHECK((arr[4] == 8), res);
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 3), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-        ASSERT_CHECK((arr[2] == 3), res);
-
-        ASSERT_CHECK((arr2.size() == 5), res);
-        ASSERT_CHECK((arr2[0] == 4), res);
-        ASSERT_CHECK((arr2[1] == 5), res);
-        ASSERT_CHECK((arr2[2] == 6), res);
-        ASSERT_CHECK((arr2[3] == 7), res);
-        ASSERT_CHECK((arr2[4] == 8), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-        arr.push_back(4);
-        arr.push_back(5);
-
-        Array arr2;
-
-        arr2.push_back(6);
-        arr2.push_back(7);
-        arr2.push_back(8);
-        arr2.push_back(9);
-        arr2.push_back(10);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 5), res);
-        ASSERT_CHECK((arr[0] == 6), res);
-        ASSERT_CHECK((arr[1] == 7), res);
-        ASSERT_CHECK((arr[2] == 8), res);
-        ASSERT_CHECK((arr[3] == 9), res);
-        ASSERT_CHECK((arr[4] == 10), res);
-
-        ASSERT_CHECK((arr2.size() == 5), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-        ASSERT_CHECK((arr2[3] == 4), res);
-        ASSERT_CHECK((arr2[4] == 5), res);
-
-        arr.swap(arr2);
-
-        ASSERT_CHECK((arr.size() == 5), res);
-        ASSERT_CHECK((arr[0] == 1), res);
-        ASSERT_CHECK((arr[1] == 2), res);
-        ASSERT_CHECK((arr[2] == 3), res);
-        ASSERT_CHECK((arr[3] == 4), res);
-        ASSERT_CHECK((arr[4] == 5), res);
-
-        ASSERT_CHECK((arr2.size() == 5), res);
-        ASSERT_CHECK((arr2[0] == 6), res);
-        ASSERT_CHECK((arr2[1] == 7), res);
-        ASSERT_CHECK((arr2[2] == 8), res);
-        ASSERT_CHECK((arr2[3] == 9), res);
-        ASSERT_CHECK((arr2[4] == 10), res);
-    }
-
-    if (!res)
-        std::cerr << "Some errors were found in test 2\n";
-}
-
-static void test3()
-{
-    using namespace DB;
-
-    static constexpr size_t initial_bytes = 32;
-    using Array = PODArray<UInt64, initial_bytes,
-        AllocatorWithStackMemory<Allocator<false>, initial_bytes>>;
-
-    bool res = true;
-
-    {
-        Array arr;
-        Array arr2{std::move(arr)};
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-
-        Array arr2{std::move(arr)};
-
-        ASSERT_CHECK((arr.empty()), res); // NOLINT
-
-        ASSERT_CHECK((arr2.size() == 3), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-    }
-
-    {
-        Array arr;
-
-        arr.push_back(1);
-        arr.push_back(2);
-        arr.push_back(3);
-        arr.push_back(4);
-        arr.push_back(5);
-
-        Array arr2{std::move(arr)};
-
-        ASSERT_CHECK((arr.empty()), res); // NOLINT
-
-        ASSERT_CHECK((arr2.size() == 5), res);
-        ASSERT_CHECK((arr2[0] == 1), res);
-        ASSERT_CHECK((arr2[1] == 2), res);
-        ASSERT_CHECK((arr2[2] == 3), res);
-        ASSERT_CHECK((arr2[3] == 4), res);
-        ASSERT_CHECK((arr2[4] == 5), res);
-    }
-
-    if (!res)
-        std::cerr << "Some errors were found in test 3\n";
-}
-
-int main()
-{
-    std::cout << "test 1\n";
-    test1();
-    std::cout << "test 2\n";
-    test2();
-    std::cout << "test 3\n";
-    test3();
-
-    return 0;
-}
diff --git a/src/Common/ya.make b/src/Common/ya.make
index d1ff04f8f0a..2da45e02b41 100644
--- a/src/Common/ya.make
+++ b/src/Common/ya.make
@@ -32,6 +32,7 @@ SRCS(
     Config/AbstractConfigurationComparison.cpp
     Config/ConfigProcessor.cpp
     Config/ConfigReloader.cpp
+    Config/YAMLParser.cpp
     Config/configReadClient.cpp
     CurrentMemoryTracker.cpp
     CurrentMetrics.cpp
@@ -47,6 +48,7 @@ SRCS(
     FileChecker.cpp
     IPv6ToBinary.cpp
     IntervalKind.cpp
+    JSONBuilder.cpp
     Macros.cpp
     MemoryStatisticsOS.cpp
     MemoryTracker.cpp
@@ -56,6 +58,7 @@ SRCS(
     PipeFDs.cpp
     ProcfsMetricsProvider.cpp
     ProfileEvents.cpp
+    ProgressBar.cpp
     QueryProfiler.cpp
     RWLock.cpp
     RemoteHostFilter.cpp
@@ -77,6 +80,7 @@ SRCS(
     ThreadPool.cpp
     ThreadProfileEvents.cpp
     ThreadStatus.cpp
+    Throttler.cpp
     TimerDescriptor.cpp
     TraceCollector.cpp
     UTF8Helpers.cpp
diff --git a/src/Common/ya.make.in b/src/Common/ya.make.in
index 420384bb4a9..fd6a805891e 100644
--- a/src/Common/ya.make.in
+++ b/src/Common/ya.make.in
@@ -24,7 +24,7 @@ INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/yandex/ya.make.versions.inc)
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? 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 36cab0b3590..390835f17ae 100644
--- a/src/Compression/CMakeLists.txt
+++ b/src/Compression/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(ENABLE_TESTS)
-    add_subdirectory(tests)
+if(ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif()
diff --git a/src/Compression/CompressionCodecT64.h b/src/Compression/CompressionCodecT64.h
index 9f8ec7cc4d5..c7664679d5a 100644
--- a/src/Compression/CompressionCodecT64.h
+++ b/src/Compression/CompressionCodecT64.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-/// Get 64 integer valuses, makes 64x64 bit matrix, transpose it and crop unused bits (most significant zeroes).
+/// Get 64 integer values, makes 64x64 bit matrix, transpose it and crop unused bits (most significant zeroes).
 /// In example, if we have UInt8 with only 0 and 1 inside 64xUInt8 would be compressed into 1xUInt64.
 /// It detects unused bits by calculating min and max values of data part, saving them in header in compression phase.
 /// There's a special case with signed integers parts with crossing zero data. Here it stores one more bit to detect sign of value.
diff --git a/src/Compression/tests/CMakeLists.txt b/src/Compression/examples/CMakeLists.txt
similarity index 100%
rename from src/Compression/tests/CMakeLists.txt
rename to src/Compression/examples/CMakeLists.txt
diff --git a/src/Compression/tests/cached_compressed_read_buffer.cpp b/src/Compression/examples/cached_compressed_read_buffer.cpp
similarity index 100%
rename from src/Compression/tests/cached_compressed_read_buffer.cpp
rename to src/Compression/examples/cached_compressed_read_buffer.cpp
diff --git a/src/Compression/tests/compressed_buffer.cpp b/src/Compression/examples/compressed_buffer.cpp
similarity index 100%
rename from src/Compression/tests/compressed_buffer.cpp
rename to src/Compression/examples/compressed_buffer.cpp
diff --git a/src/Compression/tests/compressed_buffer_fuzzer.cpp b/src/Compression/examples/compressed_buffer_fuzzer.cpp
similarity index 100%
rename from src/Compression/tests/compressed_buffer_fuzzer.cpp
rename to src/Compression/examples/compressed_buffer_fuzzer.cpp
diff --git a/src/Compression/getCompressionCodecForFile.cpp b/src/Compression/getCompressionCodecForFile.cpp
index 05dd49f3939..1557985ff66 100644
--- a/src/Compression/getCompressionCodecForFile.cpp
+++ b/src/Compression/getCompressionCodecForFile.cpp
@@ -6,8 +6,6 @@
 #include <Common/PODArray.h>
 #include <common/logger_useful.h>
 
-#include <Common/UInt128.h>
-
 namespace DB
 {
 
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 0acd15e48c3..6ba2d3457ea 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -35,29 +35,6 @@
 
 using namespace DB;
 
-namespace std
-{
-template <typename T>
-std::ostream & operator<<(std::ostream & ostr, const std::optional<T> & opt)
-{
-    if (!opt)
-    {
-        return ostr << "<empty optional>";
-    }
-
-    return ostr << *opt;
-}
-
-template <typename T>
-std::vector<T> operator+(std::vector<T> && left, std::vector<T> && right)
-{
-    std::vector<T> result(std::move(left));
-    std::move(std::begin(right), std::end(right), std::back_inserter(result));
-
-    return result;
-}
-
-}
 
 namespace
 {
@@ -337,6 +314,14 @@ CodecTestSequence operator+(CodecTestSequence && left, const CodecTestSequence &
     return left.append(right);
 }
 
+std::vector<CodecTestSequence> operator+(const std::vector<CodecTestSequence> & left, const std::vector<CodecTestSequence> & right)
+{
+    std::vector<CodecTestSequence> result(std::move(left));
+    std::move(std::begin(right), std::end(right), std::back_inserter(result));
+
+    return result;
+}
+
 template <typename T>
 CodecTestSequence operator*(CodecTestSequence && left, T times)
 {
@@ -360,10 +345,12 @@ CodecTestSequence operator*(CodecTestSequence && left, T times)
 
 std::ostream & operator<<(std::ostream & ostr, const Codec & codec)
 {
-    return ostr << "Codec{"
-                << "name: " << codec.codec_statement
-                << ", expected_compression_ratio: " << codec.expected_compression_ratio
-                << "}";
+    ostr << "Codec{"
+         << "name: " << codec.codec_statement;
+    if (codec.expected_compression_ratio)
+        return ostr << ", expected_compression_ratio: " << *codec.expected_compression_ratio << "}";
+    else
+        return ostr << "}";
 }
 
 std::ostream & operator<<(std::ostream & ostr, const CodecTestSequence & seq)
@@ -775,15 +762,13 @@ auto FFand0Generator = []()
     return [step = 0](auto i) mutable
     {
         decltype(i) result;
-        if (step++ % 2 == 0)
-        {
-            memset(&result, 0, sizeof(result));
-        }
-        else
-        {
-            memset(&result, 0xFF, sizeof(result));
-        }
 
+        if (step % 2 == 0)
+            memset(&result, 0, sizeof(result));
+        else
+            memset(&result, 0xFF, sizeof(result));
+
+        ++step;
         return result;
     };
 };
@@ -1129,7 +1114,7 @@ template <typename ValueType>
 auto DDCompatibilityTestSequence()
 {
     // Generates sequences with double delta in given range.
-    auto dd_generator = [prev_delta = static_cast<Int64>(0), prev = static_cast<Int64>(0)](auto dd) mutable
+    auto dd_generator = [prev_delta = static_cast<Int64>(0), prev = static_cast<Int64>(0)](auto dd) mutable //-V788
     {
         const auto curr = dd + prev + prev_delta;
         prev = curr;
diff --git a/src/Compression/ya.make.in b/src/Compression/ya.make.in
index a981da821eb..3c1f225c3f1 100644
--- a/src/Compression/ya.make.in
+++ b/src/Compression/ya.make.in
@@ -15,7 +15,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Coordination/ACLMap.cpp b/src/Coordination/ACLMap.cpp
new file mode 100644
index 00000000000..863dfdec281
--- /dev/null
+++ b/src/Coordination/ACLMap.cpp
@@ -0,0 +1,95 @@
+#include <Coordination/ACLMap.h>
+#include <Common/SipHash.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+size_t ACLMap::ACLsHash::operator()(const Coordination::ACLs & acls) const
+{
+    SipHash hash;
+    for (const auto & acl : acls)
+    {
+        hash.update(acl.permissions);
+        hash.update(acl.scheme);
+        hash.update(acl.id);
+    }
+    return hash.get64();
+}
+
+bool ACLMap::ACLsComparator::operator()(const Coordination::ACLs & left, const Coordination::ACLs & right) const
+{
+    if (left.size() != right.size())
+        return false;
+
+    for (size_t i = 0; i < left.size(); ++i)
+    {
+        if (left[i].permissions != right[i].permissions)
+            return false;
+
+        if (left[i].scheme != right[i].scheme)
+            return false;
+
+        if (left[i].id != right[i].id)
+            return false;
+    }
+    return true;
+}
+
+uint64_t ACLMap::convertACLs(const Coordination::ACLs & acls)
+{
+    if (acl_to_num.count(acls))
+        return acl_to_num[acls];
+
+    /// Start from one
+    auto index = acl_to_num.size() + 1;
+
+    acl_to_num[acls] = index;
+    num_to_acl[index] = acls;
+
+    return index;
+}
+
+Coordination::ACLs ACLMap::convertNumber(uint64_t acls_id) const
+{
+    if (acls_id == 0)
+        return Coordination::ACLs{};
+
+    if (!num_to_acl.count(acls_id))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown ACL id {}. It's a bug", acls_id);
+
+    return num_to_acl.at(acls_id);
+}
+
+void ACLMap::addMapping(uint64_t acls_id, const Coordination::ACLs & acls)
+{
+    num_to_acl[acls_id] = acls;
+    acl_to_num[acls] = acls_id;
+}
+
+void ACLMap::addUsage(uint64_t acl_id)
+{
+    usage_counter[acl_id]++;
+}
+
+void ACLMap::removeUsage(uint64_t acl_id)
+{
+    if (usage_counter.count(acl_id) == 0)
+        return;
+
+    usage_counter[acl_id]--;
+
+    if (usage_counter[acl_id] == 0)
+    {
+        auto acls = num_to_acl[acl_id];
+        num_to_acl.erase(acl_id);
+        acl_to_num.erase(acls);
+        usage_counter.erase(acl_id);
+    }
+}
+
+}
diff --git a/src/Coordination/ACLMap.h b/src/Coordination/ACLMap.h
new file mode 100644
index 00000000000..2313b3e7cd3
--- /dev/null
+++ b/src/Coordination/ACLMap.h
@@ -0,0 +1,54 @@
+#pragma once
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Common/ZooKeeper/IKeeper.h>
+#include <unordered_map>
+
+
+namespace DB
+{
+
+/// Simple mapping of different ACLs to sequentially growing numbers
+/// Allows to store single number instead of vector of ACLs on disk and in memory.
+class ACLMap
+{
+private:
+    struct ACLsHash
+    {
+        size_t operator()(const Coordination::ACLs & acls) const;
+    };
+
+    struct ACLsComparator
+    {
+        bool operator()(const Coordination::ACLs & left, const Coordination::ACLs & right) const;
+    };
+
+    using ACLToNumMap = std::unordered_map<Coordination::ACLs, uint64_t, ACLsHash, ACLsComparator>;
+
+    using NumToACLMap = std::unordered_map<uint64_t, Coordination::ACLs>;
+
+    using UsageCounter = std::unordered_map<uint64_t, uint64_t>;
+
+    ACLToNumMap acl_to_num;
+    NumToACLMap num_to_acl;
+    UsageCounter usage_counter;
+public:
+
+    /// Convert ACL to number. If it's new ACL than adds it to map
+    /// with new id.
+    uint64_t convertACLs(const Coordination::ACLs & acls);
+
+    /// Convert number to ACL vector. If number is unknown for map
+    /// than throws LOGICAL ERROR
+    Coordination::ACLs convertNumber(uint64_t acls_id) const;
+    /// Mapping from numbers to ACLs vectors. Used during serialization.
+    const NumToACLMap & getMapping() const { return num_to_acl; }
+
+    /// Add mapping to ACLMap. Used during deserialization.
+    void addMapping(uint64_t acls_id, const Coordination::ACLs & acls);
+
+    /// Add/remove usage of some id. Used to remove unused ACLs.
+    void addUsage(uint64_t acl_id);
+    void removeUsage(uint64_t acl_id);
+};
+
+}
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
index 227192fdf8a..6ec9b17d0a7 100644
--- a/src/Coordination/Changelog.cpp
+++ b/src/Coordination/Changelog.cpp
@@ -44,8 +44,8 @@ ChangelogFileDescription getChangelogFileDescription(const std::string & path_st
 
     ChangelogFileDescription result;
     result.prefix = filename_parts[0];
-    result.from_log_index = parse<size_t>(filename_parts[1]);
-    result.to_log_index = parse<size_t>(filename_parts[2]);
+    result.from_log_index = parse<uint64_t>(filename_parts[1]);
+    result.to_log_index = parse<uint64_t>(filename_parts[2]);
     result.path = path_str;
     return result;
 }
@@ -73,14 +73,14 @@ Checksum computeRecordChecksum(const ChangelogRecord & record)
 class ChangelogWriter
 {
 public:
-    ChangelogWriter(const std::string & filepath_, WriteMode mode, size_t start_index_)
+    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))
         , start_index(start_index_)
     {}
 
 
-    off_t appendRecord(ChangelogRecord && record, bool sync)
+    off_t appendRecord(ChangelogRecord && record)
     {
         off_t result = plain_buf.count();
         writeIntBinary(computeRecordChecksum(record), plain_buf);
@@ -96,41 +96,39 @@ public:
 
         entries_written++;
 
-        if (sync)
-            plain_buf.sync();
-        else
-            plain_buf.next();
         return result;
     }
 
     void truncateToLength(off_t new_length)
     {
-        flush();
+        plain_buf.next();
         plain_buf.truncate(new_length);
         plain_buf.seek(new_length, SEEK_SET);
     }
 
-    void flush()
+    void flush(bool force_fsync)
     {
-        plain_buf.sync();
+        plain_buf.next();
+        if (force_fsync)
+            plain_buf.sync();
     }
 
-    size_t getEntriesWritten() const
+    uint64_t getEntriesWritten() const
     {
         return entries_written;
     }
 
-    void setEntriesWritten(size_t entries_written_)
+    void setEntriesWritten(uint64_t entries_written_)
     {
         entries_written = entries_written_;
     }
 
-    size_t getStartIndex() const
+    uint64_t getStartIndex() const
     {
         return start_index;
     }
 
-    void setStartIndex(size_t start_index_)
+    void setStartIndex(uint64_t start_index_)
     {
         start_index = start_index_;
     }
@@ -138,14 +136,14 @@ public:
 private:
     std::string filepath;
     WriteBufferFromFile plain_buf;
-    size_t entries_written = 0;
-    size_t start_index;
+    uint64_t entries_written = 0;
+    uint64_t start_index;
 };
 
 struct ChangelogReadResult
 {
-    size_t entries_read;
-    size_t first_read_index;
+    uint64_t entries_read;
+    uint64_t first_read_index;
     off_t last_position;
     bool error;
 };
@@ -158,9 +156,9 @@ public:
         , read_buf(filepath)
     {}
 
-    ChangelogReadResult readChangelog(IndexToLogEntry & logs, size_t start_log_index, IndexToOffset & index_to_offset, Poco::Logger * log)
+    ChangelogReadResult readChangelog(IndexToLogEntry & logs, uint64_t start_log_index, IndexToOffset & index_to_offset, Poco::Logger * log)
     {
-        size_t previous_index = 0;
+        uint64_t previous_index = 0;
         ChangelogReadResult result{};
         try
         {
@@ -247,9 +245,14 @@ private:
     ReadBufferFromFile read_buf;
 };
 
-Changelog::Changelog(const std::string & changelogs_dir_, size_t rotate_interval_, Poco::Logger * log_)
+Changelog::Changelog(
+    const std::string & changelogs_dir_,
+    uint64_t rotate_interval_,
+    bool force_sync_,
+    Poco::Logger * log_)
     : changelogs_dir(changelogs_dir_)
     , rotate_interval(rotate_interval_)
+    , force_sync(force_sync_)
     , log(log_)
 {
     namespace fs = std::filesystem;
@@ -263,15 +266,15 @@ Changelog::Changelog(const std::string & changelogs_dir_, size_t rotate_interval
     }
 }
 
-void Changelog::readChangelogAndInitWriter(size_t last_commited_log_index, size_t logs_to_keep)
+void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uint64_t logs_to_keep)
 {
-    size_t total_read = 0;
-    size_t entries_in_last = 0;
-    size_t incomplete_log_index = 0;
+    uint64_t total_read = 0;
+    uint64_t entries_in_last = 0;
+    uint64_t incomplete_log_index = 0;
     ChangelogReadResult result{};
-    size_t first_read_index = 0;
+    uint64_t first_read_index = 0;
 
-    size_t start_to_read_from = last_commited_log_index;
+    uint64_t start_to_read_from = last_commited_log_index;
     if (start_to_read_from > logs_to_keep)
         start_to_read_from -= logs_to_keep;
     else
@@ -293,7 +296,7 @@ void Changelog::readChangelogAndInitWriter(size_t last_commited_log_index, size_
                     break;
                 }
                 else if (changelog_description.from_log_index > start_to_read_from)
-                    LOG_WARNING(log, "Don't have required amount of reserved log records. Need to read from {}, smalled available log index on disk {}.", start_to_read_from, changelog_description.from_log_index);
+                    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;
@@ -355,11 +358,10 @@ void Changelog::readChangelogAndInitWriter(size_t last_commited_log_index, size_
         rotate(start_index + total_read);
 }
 
-void Changelog::rotate(size_t new_start_log_index)
+void Changelog::rotate(uint64_t new_start_log_index)
 {
-    //// doesn't exist on init
-    if (current_writer)
-        current_writer->flush();
+    /// Flush previous log
+    flush();
 
     ChangelogFileDescription new_description;
     new_description.prefix = DEFAULT_PREFIX;
@@ -373,7 +375,7 @@ void Changelog::rotate(size_t new_start_log_index)
     current_writer = std::make_unique<ChangelogWriter>(new_description.path, WriteMode::Rewrite, new_start_log_index);
 }
 
-ChangelogRecord Changelog::buildRecord(size_t index, const LogEntryPtr & log_entry)
+ChangelogRecord Changelog::buildRecord(uint64_t index, const LogEntryPtr & log_entry)
 {
     ChangelogRecord record;
     record.header.version = ChangelogVersion::V0;
@@ -391,7 +393,7 @@ ChangelogRecord Changelog::buildRecord(size_t index, const LogEntryPtr & log_ent
     return record;
 }
 
-void Changelog::appendEntry(size_t index, const LogEntryPtr & log_entry, bool force_sync)
+void Changelog::appendEntry(uint64_t index, const LogEntryPtr & log_entry)
 {
     if (!current_writer)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Changelog must be initialized before appending records");
@@ -402,14 +404,14 @@ void Changelog::appendEntry(size_t index, const LogEntryPtr & log_entry, bool fo
     if (current_writer->getEntriesWritten() == rotate_interval)
         rotate(index);
 
-    auto offset = current_writer->appendRecord(buildRecord(index, log_entry), force_sync);
+    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);
 
     logs[index] = makeClone(log_entry);
 }
 
-void Changelog::writeAt(size_t index, const LogEntryPtr & log_entry, bool force_sync)
+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);
@@ -443,7 +445,7 @@ void Changelog::writeAt(size_t index, const LogEntryPtr & log_entry, bool force_
     }
 
     /// Remove redundant logs from memory
-    for (size_t i = index; ; ++i)
+    for (uint64_t i = index; ; ++i)
     {
         auto log_itr = logs.find(i);
         if (log_itr == logs.end())
@@ -455,10 +457,10 @@ void Changelog::writeAt(size_t index, const LogEntryPtr & log_entry, bool force_
 
     current_writer->setEntriesWritten(entries_written);
 
-    appendEntry(index, log_entry, force_sync);
+    appendEntry(index, log_entry);
 }
 
-void Changelog::compact(size_t up_to_log_index)
+void Changelog::compact(uint64_t up_to_log_index)
 {
     for (auto itr = existing_changelogs.begin(); itr != existing_changelogs.end();)
     {
@@ -480,9 +482,9 @@ void Changelog::compact(size_t up_to_log_index)
 
 LogEntryPtr Changelog::getLastEntry() const
 {
-    static LogEntryPtr fake_entry = nuraft::cs_new<nuraft::log_entry>(0, nuraft::buffer::alloc(sizeof(size_t)));
+    static LogEntryPtr fake_entry = nuraft::cs_new<nuraft::log_entry>(0, nuraft::buffer::alloc(sizeof(uint64_t)));
 
-    size_t next_index = getNextEntryIndex() - 1;
+    uint64_t next_index = getNextEntryIndex() - 1;
     auto entry = logs.find(next_index);
     if (entry == logs.end())
         return fake_entry;
@@ -490,13 +492,13 @@ LogEntryPtr Changelog::getLastEntry() const
     return entry->second;
 }
 
-LogEntriesPtr Changelog::getLogEntriesBetween(size_t start, size_t end)
+LogEntriesPtr Changelog::getLogEntriesBetween(uint64_t start, uint64_t end)
 {
     LogEntriesPtr ret = nuraft::cs_new<std::vector<nuraft::ptr<nuraft::log_entry>>>();
 
     ret->resize(end - start);
-    size_t result_pos = 0;
-    for (size_t i = start; i < end; ++i)
+    uint64_t result_pos = 0;
+    for (uint64_t i = start; i < end; ++i)
     {
         (*ret)[result_pos] = entryAt(i);
         result_pos++;
@@ -504,7 +506,7 @@ LogEntriesPtr Changelog::getLogEntriesBetween(size_t start, size_t end)
     return ret;
 }
 
-LogEntryPtr Changelog::entryAt(size_t index)
+LogEntryPtr Changelog::entryAt(uint64_t index)
 {
     nuraft::ptr<nuraft::log_entry> src = nullptr;
     auto entry = logs.find(index);
@@ -515,12 +517,12 @@ LogEntryPtr Changelog::entryAt(size_t index)
     return src;
 }
 
-nuraft::ptr<nuraft::buffer> Changelog::serializeEntriesToBuffer(size_t index, int32_t count)
+nuraft::ptr<nuraft::buffer> Changelog::serializeEntriesToBuffer(uint64_t index, int32_t count)
 {
     std::vector<nuraft::ptr<nuraft::buffer>> returned_logs;
 
-    size_t size_total = 0;
-    for (size_t i = index; i < index + count; ++i)
+    uint64_t size_total = 0;
+    for (uint64_t i = index; i < index + count; ++i)
     {
         auto entry = logs.find(i);
         if (entry == logs.end())
@@ -544,14 +546,14 @@ nuraft::ptr<nuraft::buffer> Changelog::serializeEntriesToBuffer(size_t index, in
     return buf_out;
 }
 
-void Changelog::applyEntriesFromBuffer(size_t index, nuraft::buffer & buffer, bool force_sync)
+void Changelog::applyEntriesFromBuffer(uint64_t index, nuraft::buffer & buffer)
 {
     buffer.pos(0);
     int num_logs = buffer.get_int();
 
     for (int i = 0; i < num_logs; ++i)
     {
-        size_t cur_index = index + i;
+        uint64_t cur_index = index + i;
         int buf_size = buffer.get_int();
 
         nuraft::ptr<nuraft::buffer> buf_local = nuraft::buffer::alloc(buf_size);
@@ -559,23 +561,23 @@ void Changelog::applyEntriesFromBuffer(size_t index, nuraft::buffer & buffer, bo
 
         LogEntryPtr log_entry = nuraft::log_entry::deserialize(*buf_local);
         if (i == 0 && logs.count(cur_index))
-            writeAt(cur_index, log_entry, force_sync);
+            writeAt(cur_index, log_entry);
         else
-            appendEntry(cur_index, log_entry, force_sync);
+            appendEntry(cur_index, log_entry);
     }
 }
 
 void Changelog::flush()
 {
-    current_writer->flush();
+    if (current_writer)
+        current_writer->flush(force_sync);
 }
 
 Changelog::~Changelog()
 {
     try
     {
-        if (current_writer)
-            current_writer->flush();
+        flush();
     }
     catch (...)
     {
diff --git a/src/Coordination/Changelog.h b/src/Coordination/Changelog.h
index 24b98d6b892..a50b734c5b4 100644
--- a/src/Coordination/Changelog.h
+++ b/src/Coordination/Changelog.h
@@ -17,8 +17,8 @@ using LogEntries = std::vector<LogEntryPtr>;
 using LogEntriesPtr = nuraft::ptr<LogEntries>;
 using BufferPtr = nuraft::ptr<nuraft::buffer>;
 
-using IndexToOffset = std::unordered_map<size_t, off_t>;
-using IndexToLogEntry = std::unordered_map<size_t, LogEntryPtr>;
+using IndexToOffset = std::unordered_map<uint64_t, off_t>;
+using IndexToLogEntry = std::unordered_map<uint64_t, LogEntryPtr>;
 
 enum class ChangelogVersion : uint8_t
 {
@@ -30,10 +30,10 @@ static constexpr auto CURRENT_CHANGELOG_VERSION = ChangelogVersion::V0;
 struct ChangelogRecordHeader
 {
     ChangelogVersion version = CURRENT_CHANGELOG_VERSION;
-    size_t index; /// entry log number
-    size_t term;
-    nuraft::log_val_type value_type;
-    size_t blob_size;
+    uint64_t index = 0; /// entry log number
+    uint64_t term = 0;
+    nuraft::log_val_type value_type{};
+    uint64_t blob_size = 0;
 };
 
 /// Changelog record on disk
@@ -48,8 +48,8 @@ struct ChangelogRecord
 struct ChangelogFileDescription
 {
     std::string prefix;
-    size_t from_log_index;
-    size_t to_log_index;
+    uint64_t from_log_index;
+    uint64_t to_log_index;
 
     std::string path;
 };
@@ -63,27 +63,27 @@ class Changelog
 {
 
 public:
-    Changelog(const std::string & changelogs_dir_, size_t rotate_interval_, Poco::Logger * log_);
+    Changelog(const std::string & changelogs_dir_, uint64_t rotate_interval_, bool force_sync_, Poco::Logger * log_);
 
     /// Read changelog from files on changelogs_dir_ skipping all entries before from_log_index
     /// Truncate broken entries, remove files after broken entries.
-    void readChangelogAndInitWriter(size_t last_commited_log_index, size_t logs_to_keep);
+    void readChangelogAndInitWriter(uint64_t last_commited_log_index, uint64_t logs_to_keep);
 
-    /// Add entry to log with index. Call fsync if force_sync true.
-    void appendEntry(size_t index, const LogEntryPtr & log_entry, bool force_sync);
+    /// Add entry to log with index.
+    void appendEntry(uint64_t index, const LogEntryPtr & log_entry);
 
     /// Write entry at index and truncate all subsequent entries.
-    void writeAt(size_t index, const LogEntryPtr & log_entry, bool force_sync);
+    void writeAt(uint64_t index, const LogEntryPtr & log_entry);
 
     /// Remove log files with to_log_index <= up_to_log_index.
-    void compact(size_t up_to_log_index);
+    void compact(uint64_t up_to_log_index);
 
-    size_t getNextEntryIndex() const
+    uint64_t getNextEntryIndex() const
     {
         return start_index + logs.size();
     }
 
-    size_t getStartIndex() const
+    uint64_t getStartIndex() const
     {
         return start_index;
     }
@@ -92,21 +92,21 @@ public:
     LogEntryPtr getLastEntry() const;
 
     /// Return log entries between [start, end)
-    LogEntriesPtr getLogEntriesBetween(size_t start_index, size_t end_index);
+    LogEntriesPtr getLogEntriesBetween(uint64_t start_index, uint64_t end_index);
 
     /// Return entry at position index
-    LogEntryPtr entryAt(size_t index);
+    LogEntryPtr entryAt(uint64_t index);
 
     /// Serialize entries from index into buffer
-    BufferPtr serializeEntriesToBuffer(size_t index, int32_t count);
+    BufferPtr serializeEntriesToBuffer(uint64_t index, int32_t count);
 
     /// Apply entries from buffer overriding existing entries
-    void applyEntriesFromBuffer(size_t index, nuraft::buffer & buffer, bool force_sync);
+    void applyEntriesFromBuffer(uint64_t index, nuraft::buffer & buffer);
 
-    /// Fsync log to disk
+    /// Fsync latest log to disk and flush buffer
     void flush();
 
-    size_t size() const
+    uint64_t size() const
     {
         return logs.size();
     }
@@ -116,21 +116,22 @@ public:
 
 private:
     /// Pack log_entry into changelog record
-    static ChangelogRecord buildRecord(size_t index, const LogEntryPtr & log_entry);
+    static ChangelogRecord buildRecord(uint64_t index, const LogEntryPtr & log_entry);
 
     /// Starts new file [new_start_log_index, new_start_log_index + rotate_interval]
-    void rotate(size_t new_start_log_index);
+    void rotate(uint64_t new_start_log_index);
 
 private:
     const std::string changelogs_dir;
-    const size_t rotate_interval;
+    const uint64_t rotate_interval;
+    const bool force_sync;
     Poco::Logger * log;
 
-    std::map<size_t, ChangelogFileDescription> existing_changelogs;
+    std::map<uint64_t, ChangelogFileDescription> existing_changelogs;
     std::unique_ptr<ChangelogWriter> current_writer;
     IndexToOffset index_to_start_pos;
     IndexToLogEntry logs;
-    size_t start_index = 0;
+    uint64_t start_index = 0;
 };
 
 }
diff --git a/src/Coordination/CoordinationSettings.h b/src/Coordination/CoordinationSettings.h
index 45eb1348ac6..7a98e3f200d 100644
--- a/src/Coordination/CoordinationSettings.h
+++ b/src/Coordination/CoordinationSettings.h
@@ -22,18 +22,19 @@ struct Settings;
     M(Milliseconds, heart_beat_interval_ms, 500, "Heartbeat interval between quorum nodes", 0) \
     M(Milliseconds, election_timeout_lower_bound_ms, 1000, "Lower bound of election timer (avoid too often leader elections)", 0) \
     M(Milliseconds, election_timeout_upper_bound_ms, 2000, "Lower bound of election timer (avoid too often leader elections)", 0) \
-    M(UInt64, reserved_log_items, 10000, "How many log items to store (don't remove during compaction)", 0) \
-    M(UInt64, snapshot_distance, 10000, "How many log items we have to collect to write new snapshot", 0) \
+    M(UInt64, reserved_log_items, 100000, "How many log items to store (don't remove during compaction)", 0) \
+    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(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, 10000, "How many records will be stored in one log storage file", 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) \
     M(UInt64, stale_log_gap, 10000, "When node became stale and should receive snapshots from leader", 0) \
     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)
 
 DECLARE_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
 
diff --git a/src/Coordination/InMemoryLogStore.cpp b/src/Coordination/InMemoryLogStore.cpp
index 877c8a60a2a..b7bccdf588e 100644
--- a/src/Coordination/InMemoryLogStore.cpp
+++ b/src/Coordination/InMemoryLogStore.cpp
@@ -16,16 +16,16 @@ ptr<log_entry> makeClone(const ptr<log_entry> & entry)
 InMemoryLogStore::InMemoryLogStore()
     : start_idx(1)
 {
-    nuraft::ptr<nuraft::buffer> buf = nuraft::buffer::alloc(sizeof(size_t));
+    nuraft::ptr<nuraft::buffer> buf = nuraft::buffer::alloc(sizeof(uint64_t));
     logs[0] = nuraft::cs_new<nuraft::log_entry>(0, buf);
 }
 
-size_t InMemoryLogStore::start_index() const
+uint64_t InMemoryLogStore::start_index() const
 {
     return start_idx;
 }
 
-size_t InMemoryLogStore::next_slot() const
+uint64_t InMemoryLogStore::next_slot() const
 {
     std::lock_guard<std::mutex> l(logs_lock);
     // Exclude the dummy entry.
@@ -34,7 +34,7 @@ size_t InMemoryLogStore::next_slot() const
 
 nuraft::ptr<nuraft::log_entry> InMemoryLogStore::last_entry() const
 {
-    size_t next_idx = next_slot();
+    uint64_t next_idx = next_slot();
     std::lock_guard<std::mutex> lock(logs_lock);
     auto entry = logs.find(next_idx - 1);
     if (entry == logs.end())
@@ -43,17 +43,17 @@ nuraft::ptr<nuraft::log_entry> InMemoryLogStore::last_entry() const
     return makeClone(entry->second);
 }
 
-size_t InMemoryLogStore::append(nuraft::ptr<nuraft::log_entry> & entry)
+uint64_t InMemoryLogStore::append(nuraft::ptr<nuraft::log_entry> & entry)
 {
     ptr<log_entry> clone = makeClone(entry);
 
     std::lock_guard<std::mutex> l(logs_lock);
-    size_t idx = start_idx + logs.size() - 1;
+    uint64_t idx = start_idx + logs.size() - 1;
     logs[idx] = clone;
     return idx;
 }
 
-void InMemoryLogStore::write_at(size_t index, nuraft::ptr<nuraft::log_entry> & entry)
+void InMemoryLogStore::write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry)
 {
     nuraft::ptr<log_entry> clone = makeClone(entry);
 
@@ -65,14 +65,14 @@ void InMemoryLogStore::write_at(size_t index, nuraft::ptr<nuraft::log_entry> & e
     logs[index] = clone;
 }
 
-nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> InMemoryLogStore::log_entries(size_t start, size_t end)
+nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> InMemoryLogStore::log_entries(uint64_t start, uint64_t end)
 {
     nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> ret =
         nuraft::cs_new<std::vector<nuraft::ptr<nuraft::log_entry>>>();
 
     ret->resize(end - start);
-    size_t cc = 0;
-    for (size_t i = start; i < end; ++i)
+    uint64_t cc = 0;
+    for (uint64_t i = start; i < end; ++i)
     {
         nuraft::ptr<nuraft::log_entry> src = nullptr;
         {
@@ -90,7 +90,7 @@ nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> InMemoryLogStore::log_e
     return ret;
 }
 
-nuraft::ptr<nuraft::log_entry> InMemoryLogStore::entry_at(size_t index)
+nuraft::ptr<nuraft::log_entry> InMemoryLogStore::entry_at(uint64_t index)
 {
     nuraft::ptr<nuraft::log_entry> src = nullptr;
     {
@@ -103,9 +103,9 @@ nuraft::ptr<nuraft::log_entry> InMemoryLogStore::entry_at(size_t index)
     return makeClone(src);
 }
 
-size_t InMemoryLogStore::term_at(size_t index)
+uint64_t InMemoryLogStore::term_at(uint64_t index)
 {
-    size_t term = 0;
+    uint64_t term = 0;
     {
         std::lock_guard<std::mutex> l(logs_lock);
         auto entry = logs.find(index);
@@ -116,12 +116,12 @@ size_t InMemoryLogStore::term_at(size_t index)
     return term;
 }
 
-nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(size_t index, Int32 cnt)
+nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(uint64_t index, Int32 cnt)
 {
     std::vector<nuraft::ptr<nuraft::buffer>> returned_logs;
 
-    size_t size_total = 0;
-    for (size_t ii = index; ii < index + cnt; ++ii)
+    uint64_t uint64_total = 0;
+    for (uint64_t ii = index; ii < index + cnt; ++ii)
     {
         ptr<log_entry> le = nullptr;
         {
@@ -130,11 +130,11 @@ nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(size_t index, Int32 cnt)
         }
         assert(le.get());
         nuraft::ptr<nuraft::buffer> buf = le->serialize();
-        size_total += buf->size();
+        uint64_total += buf->size();
         returned_logs.push_back(buf);
     }
 
-    nuraft::ptr<buffer> buf_out = nuraft::buffer::alloc(sizeof(int32) + cnt * sizeof(int32) + size_total);
+    nuraft::ptr<buffer> buf_out = nuraft::buffer::alloc(sizeof(int32) + cnt * sizeof(int32) + uint64_total);
     buf_out->pos(0);
     buf_out->put(static_cast<Int32>(cnt));
 
@@ -147,14 +147,14 @@ nuraft::ptr<nuraft::buffer> InMemoryLogStore::pack(size_t index, Int32 cnt)
     return buf_out;
 }
 
-void InMemoryLogStore::apply_pack(size_t index, nuraft::buffer & pack)
+void InMemoryLogStore::apply_pack(uint64_t index, nuraft::buffer & pack)
 {
     pack.pos(0);
     Int32 num_logs = pack.get_int();
 
     for (Int32 i = 0; i < num_logs; ++i)
     {
-        size_t cur_idx = index + i;
+        uint64_t cur_idx = index + i;
         Int32 buf_size = pack.get_int();
 
         nuraft::ptr<nuraft::buffer> buf_local = nuraft::buffer::alloc(buf_size);
@@ -177,10 +177,10 @@ void InMemoryLogStore::apply_pack(size_t index, nuraft::buffer & pack)
     }
 }
 
-bool InMemoryLogStore::compact(size_t last_log_index)
+bool InMemoryLogStore::compact(uint64_t last_log_index)
 {
     std::lock_guard<std::mutex> l(logs_lock);
-    for (size_t ii = start_idx; ii <= last_log_index; ++ii)
+    for (uint64_t ii = start_idx; ii <= last_log_index; ++ii)
     {
         auto entry = logs.find(ii);
         if (entry != logs.end())
diff --git a/src/Coordination/InMemoryLogStore.h b/src/Coordination/InMemoryLogStore.h
index 425b056a81d..caa5e31698d 100644
--- a/src/Coordination/InMemoryLogStore.h
+++ b/src/Coordination/InMemoryLogStore.h
@@ -14,34 +14,34 @@ class InMemoryLogStore : public nuraft::log_store
 public:
     InMemoryLogStore();
 
-    size_t start_index() const override;
+    uint64_t start_index() const override;
 
-    size_t next_slot() const override;
+    uint64_t next_slot() const override;
 
     nuraft::ptr<nuraft::log_entry> last_entry() const override;
 
-    size_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
+    uint64_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
 
-    void write_at(size_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
+    void write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
 
-    nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(size_t start, size_t end) override;
+    nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(uint64_t start, uint64_t end) override;
 
-    nuraft::ptr<nuraft::log_entry> entry_at(size_t index) override;
+    nuraft::ptr<nuraft::log_entry> entry_at(uint64_t index) override;
 
-    size_t term_at(size_t index) override;
+    uint64_t term_at(uint64_t index) override;
 
-    nuraft::ptr<nuraft::buffer> pack(size_t index, Int32 cnt) override;
+    nuraft::ptr<nuraft::buffer> pack(uint64_t index, Int32 cnt) override;
 
-    void apply_pack(size_t index, nuraft::buffer & pack) override;
+    void apply_pack(uint64_t index, nuraft::buffer & pack) override;
 
-    bool compact(size_t last_log_index) override;
+    bool compact(uint64_t last_log_index) override;
 
     bool flush() override { return true; }
 
 private:
-    std::map<size_t, nuraft::ptr<nuraft::log_entry>> logs;
+    std::map<uint64_t, nuraft::ptr<nuraft::log_entry>> logs;
     mutable std::mutex logs_lock;
-    std::atomic<size_t> start_idx;
+    std::atomic<uint64_t> start_idx;
 };
 
 }
diff --git a/src/Coordination/KeeperLogStore.cpp b/src/Coordination/KeeperLogStore.cpp
index 2b1306bffb9..3896cf9b6fd 100644
--- a/src/Coordination/KeeperLogStore.cpp
+++ b/src/Coordination/KeeperLogStore.cpp
@@ -3,26 +3,29 @@
 namespace DB
 {
 
-KeeperLogStore::KeeperLogStore(const std::string & changelogs_path, size_t rotate_interval_, bool force_sync_)
+KeeperLogStore::KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_)
     : log(&Poco::Logger::get("KeeperLogStore"))
-    , changelog(changelogs_path, rotate_interval_, log)
-    , force_sync(force_sync_)
+    , changelog(changelogs_path, rotate_interval_, force_sync_, log)
 {
+    if (force_sync_)
+        LOG_INFO(log, "force_sync enabled");
+    else
+        LOG_INFO(log, "force_sync disabled");
 }
 
-size_t KeeperLogStore::start_index() const
+uint64_t KeeperLogStore::start_index() const
 {
     std::lock_guard lock(changelog_lock);
     return changelog.getStartIndex();
 }
 
-void KeeperLogStore::init(size_t last_commited_log_index, size_t logs_to_keep)
+void KeeperLogStore::init(uint64_t last_commited_log_index, uint64_t logs_to_keep)
 {
     std::lock_guard lock(changelog_lock);
     changelog.readChangelogAndInitWriter(last_commited_log_index, logs_to_keep);
 }
 
-size_t KeeperLogStore::next_slot() const
+uint64_t KeeperLogStore::next_slot() const
 {
     std::lock_guard lock(changelog_lock);
     return changelog.getNextEntryIndex();
@@ -34,34 +37,34 @@ nuraft::ptr<nuraft::log_entry> KeeperLogStore::last_entry() const
     return changelog.getLastEntry();
 }
 
-size_t KeeperLogStore::append(nuraft::ptr<nuraft::log_entry> & entry)
+uint64_t KeeperLogStore::append(nuraft::ptr<nuraft::log_entry> & entry)
 {
     std::lock_guard lock(changelog_lock);
-    size_t idx = changelog.getNextEntryIndex();
-    changelog.appendEntry(idx, entry, force_sync);
+    uint64_t idx = changelog.getNextEntryIndex();
+    changelog.appendEntry(idx, entry);
     return idx;
 }
 
 
-void KeeperLogStore::write_at(size_t index, nuraft::ptr<nuraft::log_entry> & entry)
+void KeeperLogStore::write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry)
 {
     std::lock_guard lock(changelog_lock);
-    changelog.writeAt(index, entry, force_sync);
+    changelog.writeAt(index, entry);
 }
 
-nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> KeeperLogStore::log_entries(size_t start, size_t end)
+nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> KeeperLogStore::log_entries(uint64_t start, uint64_t end)
 {
     std::lock_guard lock(changelog_lock);
     return changelog.getLogEntriesBetween(start, end);
 }
 
-nuraft::ptr<nuraft::log_entry> KeeperLogStore::entry_at(size_t index)
+nuraft::ptr<nuraft::log_entry> KeeperLogStore::entry_at(uint64_t index)
 {
     std::lock_guard lock(changelog_lock);
     return changelog.entryAt(index);
 }
 
-size_t KeeperLogStore::term_at(size_t index)
+uint64_t KeeperLogStore::term_at(uint64_t index)
 {
     std::lock_guard lock(changelog_lock);
     auto entry = changelog.entryAt(index);
@@ -70,13 +73,13 @@ size_t KeeperLogStore::term_at(size_t index)
     return 0;
 }
 
-nuraft::ptr<nuraft::buffer> KeeperLogStore::pack(size_t index, int32_t cnt)
+nuraft::ptr<nuraft::buffer> KeeperLogStore::pack(uint64_t index, int32_t cnt)
 {
     std::lock_guard lock(changelog_lock);
     return changelog.serializeEntriesToBuffer(index, cnt);
 }
 
-bool KeeperLogStore::compact(size_t last_log_index)
+bool KeeperLogStore::compact(uint64_t last_log_index)
 {
     std::lock_guard lock(changelog_lock);
     changelog.compact(last_log_index);
@@ -90,16 +93,22 @@ bool KeeperLogStore::flush()
     return true;
 }
 
-void KeeperLogStore::apply_pack(size_t index, nuraft::buffer & pack)
+void KeeperLogStore::apply_pack(uint64_t index, nuraft::buffer & pack)
 {
     std::lock_guard lock(changelog_lock);
-    changelog.applyEntriesFromBuffer(index, pack, force_sync);
+    changelog.applyEntriesFromBuffer(index, pack);
 }
 
-size_t KeeperLogStore::size() const
+uint64_t KeeperLogStore::size() const
 {
     std::lock_guard lock(changelog_lock);
     return changelog.size();
 }
 
+void KeeperLogStore::end_of_append_batch(uint64_t /*start_index*/, uint64_t /*count*/)
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.flush();
+}
+
 }
diff --git a/src/Coordination/KeeperLogStore.h b/src/Coordination/KeeperLogStore.h
index c9c20e144ba..01315e6e879 100644
--- a/src/Coordination/KeeperLogStore.h
+++ b/src/Coordination/KeeperLogStore.h
@@ -12,41 +12,42 @@ namespace DB
 class KeeperLogStore : public nuraft::log_store
 {
 public:
-    KeeperLogStore(const std::string & changelogs_path, size_t rotate_interval_, bool force_sync_);
+    KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_);
 
-    void init(size_t last_commited_log_index, size_t logs_to_keep);
+    void init(uint64_t last_commited_log_index, uint64_t logs_to_keep);
 
-    size_t start_index() const override;
+    uint64_t start_index() const override;
 
-    size_t next_slot() const override;
+    uint64_t next_slot() const override;
 
     nuraft::ptr<nuraft::log_entry> last_entry() const override;
 
-    size_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
+    uint64_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
 
-    void write_at(size_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
+    void write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
 
-    nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(size_t start, size_t end) override;
+    nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(uint64_t start, uint64_t end) override;
 
-    nuraft::ptr<nuraft::log_entry> entry_at(size_t index) override;
+    nuraft::ptr<nuraft::log_entry> entry_at(uint64_t index) override;
 
-    size_t term_at(size_t index) override;
+    uint64_t term_at(uint64_t index) override;
 
-    nuraft::ptr<nuraft::buffer> pack(size_t index, int32_t cnt) override;
+    nuraft::ptr<nuraft::buffer> pack(uint64_t index, int32_t cnt) override;
 
-    void apply_pack(size_t index, nuraft::buffer & pack) override;
+    void apply_pack(uint64_t index, nuraft::buffer & pack) override;
 
-    bool compact(size_t last_log_index) override;
+    bool compact(uint64_t last_log_index) override;
 
     bool flush() override;
 
-    size_t size() const;
+    uint64_t size() const;
+
+    void end_of_append_batch(uint64_t start_index, uint64_t count) override;
 
 private:
     mutable std::mutex changelog_lock;
     Poco::Logger * log;
     Changelog changelog;
-    bool force_sync;
 };
 
 }
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index fef373a399e..b6b0ab8cb72 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -1,4 +1,9 @@
 #include <Coordination/KeeperServer.h>
+
+#if !defined(ARCADIA_BUILD)
+#   include "config_core.h"
+#endif
+
 #include <Coordination/LoggerWrapper.h>
 #include <Coordination/KeeperStateMachine.h>
 #include <Coordination/KeeperStateManager.h>
@@ -9,6 +14,9 @@
 #include <chrono>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <string>
+#include <filesystem>
+#include <Poco/Util/Application.h>
+#include <boost/algorithm/string.hpp>
 
 namespace DB
 {
@@ -16,6 +24,73 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int RAFT_ERROR;
+    extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int SUPPORT_IS_DISABLED;
+    extern const int LOGICAL_ERROR;
+    extern const int INVALID_CONFIG_PARAMETER;
+}
+
+namespace
+{
+
+#if USE_SSL
+void setSSLParams(nuraft::asio_service::options & asio_opts)
+{
+    const Poco::Util::LayeredConfiguration & config = Poco::Util::Application::instance().config();
+    String certificate_file_property = "openSSL.server.certificateFile";
+    String private_key_file_property = "openSSL.server.privateKeyFile";
+    String root_ca_file_property = "openSSL.server.caConfig";
+
+    if (!config.has(certificate_file_property))
+        throw Exception("Server certificate file is not set.", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    if (!config.has(private_key_file_property))
+        throw Exception("Server private key file is not set.", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    asio_opts.enable_ssl_ = true;
+    asio_opts.server_cert_file_ = config.getString(certificate_file_property);
+    asio_opts.server_key_file_ = config.getString(private_key_file_property);
+
+    if (config.has(root_ca_file_property))
+        asio_opts.root_cert_file_ = config.getString(root_ca_file_property);
+
+    if (config.getBool("openSSL.server.loadDefaultCAFile", false))
+        asio_opts.load_default_ca_file_ = true;
+
+    if (config.getString("openSSL.server.verificationMode", "none") == "none")
+        asio_opts.skip_verification_ = true;
+}
+#endif
+
+std::string getSnapshotsPathFromConfig(const Poco::Util::AbstractConfiguration & config, bool standalone_keeper)
+{
+    /// the most specialized path
+    if (config.has("keeper_server.snapshot_storage_path"))
+        return config.getString("keeper_server.snapshot_storage_path");
+
+    if (config.has("keeper_server.storage_path"))
+        return std::filesystem::path{config.getString("keeper_server.storage_path")} / "snapshots";
+
+    if (standalone_keeper)
+        return std::filesystem::path{config.getString("path", KEEPER_DEFAULT_PATH)} / "snapshots";
+    else
+        return std::filesystem::path{config.getString("path", DBMS_DEFAULT_PATH)} / "coordination/snapshots";
+}
+
+std::string checkAndGetSuperdigest(const Poco::Util::AbstractConfiguration & config)
+{
+    if (!config.has("keeper_server.superdigest"))
+        return "";
+
+    auto user_and_digest = config.getString("keeper_server.superdigest");
+    std::vector<std::string> scheme_and_id;
+    boost::split(scheme_and_id, user_and_digest, [](char c) { return c == ':'; });
+    if (scheme_and_id.size() != 2 || scheme_and_id[0] != "super")
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Incorrect superdigest in keeper_server config. Must be 'super:base64string'");
+
+    return user_and_digest;
+}
+
 }
 
 KeeperServer::KeeperServer(
@@ -23,23 +98,24 @@ KeeperServer::KeeperServer(
     const CoordinationSettingsPtr & coordination_settings_,
     const Poco::Util::AbstractConfiguration & config,
     ResponsesQueue & responses_queue_,
-    SnapshotsQueue & snapshots_queue_)
+    SnapshotsQueue & snapshots_queue_,
+    bool standalone_keeper)
     : server_id(server_id_)
     , coordination_settings(coordination_settings_)
     , state_machine(nuraft::cs_new<KeeperStateMachine>(
                         responses_queue_, snapshots_queue_,
-                        config.getString("keeper_server.snapshot_storage_path", config.getString("path", DBMS_DEFAULT_PATH) + "coordination/snapshots"),
-                        coordination_settings))
-    , state_manager(nuraft::cs_new<KeeperStateManager>(server_id, "keeper_server", config, coordination_settings))
-    , responses_queue(responses_queue_)
+                        getSnapshotsPathFromConfig(config, standalone_keeper),
+                        coordination_settings,
+                        checkAndGetSuperdigest(config)))
+    , state_manager(nuraft::cs_new<KeeperStateManager>(server_id, "keeper_server", config, coordination_settings, standalone_keeper))
+    , log(&Poco::Logger::get("KeeperServer"))
 {
     if (coordination_settings->quorum_reads)
-        LOG_WARNING(&Poco::Logger::get("KeeperServer"), "Quorum reads enabled, Keeper will work slower.");
+        LOG_WARNING(log, "Quorum reads enabled, Keeper will work slower.");
 }
 
 void KeeperServer::startup()
 {
-
     state_machine->init();
 
     state_manager->loadLogStore(state_machine->last_commit_index() + 1, coordination_settings->reserved_log_items);
@@ -68,32 +144,104 @@ void KeeperServer::startup()
     params.client_req_timeout_ = coordination_settings->operation_timeout_ms.totalMilliseconds();
     params.auto_forwarding_ = coordination_settings->auto_forwarding;
     params.auto_forwarding_req_timeout_ = coordination_settings->operation_timeout_ms.totalMilliseconds() * 2;
+    params.max_append_size_ = coordination_settings->max_requests_batch_size;
 
-    params.return_method_ = nuraft::raft_params::blocking;
+    params.return_method_ = nuraft::raft_params::async_handler;
 
     nuraft::asio_service::options asio_opts{};
-    nuraft::raft_server::init_options init_options;
-    init_options.skip_initial_election_timeout_ = state_manager->shouldStartAsFollower();
-    init_options.raft_callback_ = [this] (nuraft::cb_func::Type type, nuraft::cb_func::Param * param)
+    if (state_manager->isSecure())
     {
-        return callbackFunc(type, param);
-    };
+#if USE_SSL
+        setSSLParams(asio_opts);
+#else
+        throw Exception{"SSL support for NuRaft is disabled because ClickHouse was built without SSL support.",
+                        ErrorCodes::SUPPORT_IS_DISABLED};
+#endif
+    }
 
-    raft_instance = launcher.init(
-        state_machine, state_manager, nuraft::cs_new<LoggerWrapper>("RaftInstance", coordination_settings->raft_logs_level), state_manager->getPort(),
-        asio_opts, params, init_options);
+    launchRaftServer(params, asio_opts);
 
     if (!raft_instance)
         throw Exception(ErrorCodes::RAFT_ERROR, "Cannot allocate RAFT instance");
 }
 
+void KeeperServer::launchRaftServer(
+    const nuraft::raft_params & params,
+    const nuraft::asio_service::options & asio_opts)
+{
+    nuraft::raft_server::init_options init_options;
+
+    init_options.skip_initial_election_timeout_ = state_manager->shouldStartAsFollower();
+    init_options.start_server_in_constructor_ = false;
+    init_options.raft_callback_ = [this] (nuraft::cb_func::Type type, nuraft::cb_func::Param * param)
+    {
+        return callbackFunc(type, param);
+    };
+
+    nuraft::ptr<nuraft::logger> logger = nuraft::cs_new<LoggerWrapper>("RaftInstance", coordination_settings->raft_logs_level);
+    asio_service = nuraft::cs_new<nuraft::asio_service>(asio_opts, logger);
+    asio_listener = asio_service->create_rpc_listener(state_manager->getPort(), logger);
+
+    if (!asio_listener)
+        return;
+
+    nuraft::ptr<nuraft::delayed_task_scheduler> scheduler = asio_service;
+    nuraft::ptr<nuraft::rpc_client_factory> rpc_cli_factory = asio_service;
+
+    nuraft::ptr<nuraft::state_mgr> casted_state_manager = state_manager;
+    nuraft::ptr<nuraft::state_machine> casted_state_machine = state_machine;
+
+    /// raft_server creates unique_ptr from it
+    nuraft::context * ctx = new nuraft::context(
+        casted_state_manager, casted_state_machine,
+        asio_listener, logger, rpc_cli_factory, scheduler, params);
+
+    raft_instance = nuraft::cs_new<nuraft::raft_server>(ctx, init_options);
+
+    raft_instance->start_server(init_options.skip_initial_election_timeout_);
+    asio_listener->listen(raft_instance);
+}
+
+void KeeperServer::shutdownRaftServer()
+{
+    size_t timeout = coordination_settings->shutdown_timeout.totalSeconds();
+
+    if (!raft_instance)
+    {
+        LOG_INFO(log, "RAFT doesn't start, shutdown not required");
+        return;
+    }
+
+    raft_instance->shutdown();
+    raft_instance.reset();
+
+    if (asio_listener)
+    {
+        asio_listener->stop();
+        asio_listener->shutdown();
+    }
+
+    if (asio_service)
+    {
+        asio_service->stop();
+        size_t count = 0;
+        while (asio_service->get_active_workers() != 0 && count < timeout * 100)
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+            count++;
+        }
+    }
+
+    if (asio_service->get_active_workers() != 0)
+        LOG_WARNING(log, "Failed to shutdown RAFT server in {} seconds", timeout);
+}
+
+
 void KeeperServer::shutdown()
 {
     state_machine->shutdownStorage();
     state_manager->flushLogStore();
-    auto timeout = coordination_settings->shutdown_timeout.totalSeconds();
-    if (!launcher.shutdown(timeout))
-        LOG_WARNING(&Poco::Logger::get("KeeperServer"), "Failed to shutdown RAFT server in {} seconds", timeout);
+    shutdownRaftServer();
 }
 
 namespace
@@ -109,68 +257,26 @@ nuraft::ptr<nuraft::buffer> getZooKeeperLogEntry(int64_t session_id, const Coord
 
 }
 
-void KeeperServer::putRequest(const KeeperStorage::RequestForSession & request_for_session)
+
+void KeeperServer::putLocalReadRequest(const KeeperStorage::RequestForSession & request_for_session)
 {
-    auto [session_id, request] = request_for_session;
-    if (!coordination_settings->quorum_reads && isLeaderAlive() && request->isReadRequest())
-    {
-        state_machine->processReadRequest(request_for_session);
-    }
-    else
-    {
-        std::vector<nuraft::ptr<nuraft::buffer>> entries;
-        entries.push_back(getZooKeeperLogEntry(session_id, request));
+    if (!request_for_session.request->isReadRequest())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot process non-read request locally");
 
-        std::lock_guard lock(append_entries_mutex);
-
-        auto result = raft_instance->append_entries(entries);
-        if (!result->get_accepted())
-        {
-            KeeperStorage::ResponsesForSessions responses;
-            auto response = request->makeResponse();
-            response->xid = request->xid;
-            response->zxid = 0;
-            response->error = Coordination::Error::ZOPERATIONTIMEOUT;
-            responses_queue.push(DB::KeeperStorage::ResponseForSession{session_id, response});
-        }
-
-        if (result->get_result_code() == nuraft::cmd_result_code::TIMEOUT)
-        {
-            KeeperStorage::ResponsesForSessions responses;
-            auto response = request->makeResponse();
-            response->xid = request->xid;
-            response->zxid = 0;
-            response->error = Coordination::Error::ZOPERATIONTIMEOUT;
-            responses_queue.push(DB::KeeperStorage::ResponseForSession{session_id, response});
-        }
-        else if (result->get_result_code() != nuraft::cmd_result_code::OK)
-            throw Exception(ErrorCodes::RAFT_ERROR, "Requests result failed with code {} and message: '{}'", result->get_result_code(), result->get_result_str());
-    }
+    state_machine->processReadRequest(request_for_session);
 }
 
-int64_t KeeperServer::getSessionID(int64_t session_timeout_ms)
+RaftAppendResult KeeperServer::putRequestBatch(const KeeperStorage::RequestsForSessions & requests_for_sessions)
 {
-    auto entry = nuraft::buffer::alloc(sizeof(int64_t));
-    /// Just special session request
-    nuraft::buffer_serializer bs(entry);
-    bs.put_i64(session_timeout_ms);
 
-    std::lock_guard lock(append_entries_mutex);
+    std::vector<nuraft::ptr<nuraft::buffer>> entries;
+    for (const auto & [session_id, request] : requests_for_sessions)
+        entries.push_back(getZooKeeperLogEntry(session_id, request));
 
-    auto result = raft_instance->append_entries({entry});
-
-    if (!result->get_accepted())
-        throw Exception(ErrorCodes::RAFT_ERROR, "Cannot send session_id request to RAFT");
-
-    if (result->get_result_code() != nuraft::cmd_result_code::OK)
-        throw Exception(ErrorCodes::RAFT_ERROR, "session_id request failed to RAFT");
-
-    auto resp = result->get();
-    if (resp == nullptr)
-        throw Exception(ErrorCodes::RAFT_ERROR, "Received nullptr as session_id");
-
-    nuraft::buffer_serializer bs_resp(resp);
-    return bs_resp.get_i64();
+    {
+        std::lock_guard lock(append_entries_mutex);
+        return raft_instance->append_entries(entries);
+    }
 }
 
 bool KeeperServer::isLeader() const
@@ -183,17 +289,17 @@ bool KeeperServer::isLeaderAlive() const
     return raft_instance->is_leader_alive();
 }
 
-nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type type, nuraft::cb_func::Param * /* param */)
+nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type type, nuraft::cb_func::Param * param)
 {
+    if (initialized_flag)
+        return nuraft::cb_func::ReturnCode::Ok;
+
     size_t last_commited = state_machine->last_commit_index();
     size_t next_index = state_manager->getLogStore()->next_slot();
     bool commited_store = false;
     if (next_index < last_commited || next_index - last_commited <= 1)
         commited_store = true;
 
-    if (initialized_flag)
-        return nuraft::cb_func::ReturnCode::Ok;
-
     auto set_initialized = [this] ()
     {
         std::unique_lock lock(initialized_mutex);
@@ -213,7 +319,7 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
         case nuraft::cb_func::BecomeFollower:
         case nuraft::cb_func::GotAppendEntryReqFromLeader:
         {
-            if (isLeaderAlive())
+            if (param->leaderId != -1)
             {
                 auto leader_index = raft_instance->get_leader_committed_log_idx();
                 auto our_index = raft_instance->get_committed_log_idx();
@@ -233,7 +339,7 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
         }
         case nuraft::cb_func::InitialBatchCommited:
         {
-            if (isLeader()) /// We have committed our log store and we are leader, ready to serve requests.
+            if (param->myId == param->leaderId) /// We have committed our log store and we are leader, ready to serve requests.
                 set_initialized();
             initial_batch_committed = true;
             return nuraft::cb_func::ReturnCode::Ok;
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index 091a2b0150f..282a7b48dfb 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -7,14 +7,17 @@
 #include <Coordination/KeeperStorage.h>
 #include <Coordination/CoordinationSettings.h>
 #include <unordered_map>
+#include <common/logger_useful.h>
 
 namespace DB
 {
 
+using RaftAppendResult = nuraft::ptr<nuraft::cmd_result<nuraft::ptr<nuraft::buffer>>>;
+
 class KeeperServer
 {
 private:
-    int server_id;
+    const int server_id;
 
     CoordinationSettingsPtr coordination_settings;
 
@@ -22,34 +25,43 @@ private:
 
     nuraft::ptr<KeeperStateManager> state_manager;
 
-    nuraft::raft_launcher launcher;
-
     nuraft::ptr<nuraft::raft_server> raft_instance;
+    nuraft::ptr<nuraft::asio_service> asio_service;
+    nuraft::ptr<nuraft::rpc_listener> asio_listener;
 
     std::mutex append_entries_mutex;
 
-    ResponsesQueue & responses_queue;
-
     std::mutex initialized_mutex;
     std::atomic<bool> initialized_flag = false;
     std::condition_variable initialized_cv;
     std::atomic<bool> initial_batch_committed = false;
 
+    Poco::Logger * log;
+
     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
+    /// Allows to avoid race conditions.
+    void launchRaftServer(
+        const nuraft::raft_params & params,
+        const nuraft::asio_service::options & asio_opts);
+
+    void shutdownRaftServer();
+
 public:
     KeeperServer(
         int server_id_,
         const CoordinationSettingsPtr & coordination_settings_,
         const Poco::Util::AbstractConfiguration & config,
         ResponsesQueue & responses_queue_,
-        SnapshotsQueue & snapshots_queue_);
+        SnapshotsQueue & snapshots_queue_,
+        bool standalone_keeper);
 
     void startup();
 
-    void putRequest(const KeeperStorage::RequestForSession & request);
+    void putLocalReadRequest(const KeeperStorage::RequestForSession & request);
 
-    int64_t getSessionID(int64_t session_timeout_ms);
+    RaftAppendResult putRequestBatch(const KeeperStorage::RequestsForSessions & requests);
 
     std::unordered_set<int64_t> getDeadSessions();
 
@@ -60,6 +72,8 @@ public:
     void waitInit();
 
     void shutdown();
+
+    int getServerID() const { return server_id; }
 };
 
 }
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index 70d540ca06b..7520f9b3ba2 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -23,16 +23,16 @@ namespace ErrorCodes
 
 namespace
 {
-    size_t getSnapshotPathUpToLogIdx(const String & snapshot_path)
+    uint64_t getSnapshotPathUpToLogIdx(const String & snapshot_path)
     {
         std::filesystem::path path(snapshot_path);
         std::string filename = path.stem();
         Strings name_parts;
         splitInto<'_'>(name_parts, filename);
-        return parse<size_t>(name_parts[1]);
+        return parse<uint64_t>(name_parts[1]);
     }
 
-    std::string getSnapshotFileName(size_t up_to_log_idx)
+    std::string getSnapshotFileName(uint64_t up_to_log_idx)
     {
         return std::string{"snapshot_"} + std::to_string(up_to_log_idx) + ".bin";
     }
@@ -56,14 +56,7 @@ namespace
         writeBinary(node.data, out);
 
         /// Serialize ACL
-        writeBinary(node.acls.size(), out);
-        for (const auto & acl : node.acls)
-        {
-            writeBinary(acl.permissions, out);
-            writeBinary(acl.scheme, out);
-            writeBinary(acl.id, out);
-        }
-
+        writeBinary(node.acl_id, out);
         writeBinary(node.is_sequental, out);
         /// Serialize stat
         writeBinary(node.stat.czxid, out);
@@ -81,21 +74,33 @@ namespace
         writeBinary(node.seq_num, out);
     }
 
-    void readNode(KeeperStorage::Node & node, ReadBuffer & in)
+    void readNode(KeeperStorage::Node & node, ReadBuffer & in, SnapshotVersion version, ACLMap & acl_map)
     {
         readBinary(node.data, in);
 
-        /// Deserialize ACL
-        size_t acls_size;
-        readBinary(acls_size, in);
-        for (size_t i = 0; i < acls_size; ++i)
+        if (version >= SnapshotVersion::V1)
         {
-            Coordination::ACL acl;
-            readBinary(acl.permissions, in);
-            readBinary(acl.scheme, in);
-            readBinary(acl.id, in);
-            node.acls.push_back(acl);
+            readBinary(node.acl_id, in);
         }
+        else if (version == SnapshotVersion::V0)
+        {
+            /// Deserialize ACL
+            size_t acls_size;
+            readBinary(acls_size, in);
+            Coordination::ACLs acls;
+            for (size_t i = 0; i < acls_size; ++i)
+            {
+                Coordination::ACL acl;
+                readBinary(acl.permissions, in);
+                readBinary(acl.scheme, in);
+                readBinary(acl.id, in);
+                acls.push_back(acl);
+            }
+            node.acl_id = acl_map.convertACLs(acls);
+        }
+
+        acl_map.addUsage(node.acl_id);
+
         readBinary(node.is_sequental, in);
 
         /// Deserialize stat
@@ -137,9 +142,25 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
     writeBinary(static_cast<uint8_t>(snapshot.version), out);
     serializeSnapshotMetadata(snapshot.snapshot_meta, out);
     writeBinary(snapshot.session_id, out);
+
+    /// Serialize ACLs MAP
+    writeBinary(snapshot.acl_map.size(), out);
+    for (const auto & [acl_id, acls] : snapshot.acl_map)
+    {
+        writeBinary(acl_id, out);
+        writeBinary(acls.size(), out);
+        for (const auto & acl : acls)
+        {
+            writeBinary(acl.permissions, out);
+            writeBinary(acl.scheme, out);
+            writeBinary(acl.id, out);
+        }
+    }
+
+    /// Serialize data tree
     writeBinary(snapshot.snapshot_container_size, out);
     size_t counter = 0;
-    for (auto it = snapshot.begin; counter < snapshot.snapshot_container_size; ++it, ++counter)
+    for (auto it = snapshot.begin; counter < snapshot.snapshot_container_size; ++counter)
     {
         const auto & path = it->key;
         const auto & node = it->value;
@@ -148,14 +169,33 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
 
         writeBinary(path, out);
         writeNode(node, out);
+
+        /// Last iteration: check and exit here without iterator increment. Otherwise
+        /// false positive race condition on list end is possible.
+        if (counter == snapshot.snapshot_container_size - 1)
+            break;
+
+        ++it;
     }
 
+    /// Serialize sessions
     size_t size = snapshot.session_and_timeout.size();
     writeBinary(size, out);
     for (const auto & [session_id, timeout] : snapshot.session_and_timeout)
     {
         writeBinary(session_id, out);
         writeBinary(timeout, out);
+
+        KeeperStorage::AuthIDs ids;
+        if (snapshot.session_and_auth.count(session_id))
+            ids = snapshot.session_and_auth.at(session_id);
+
+        writeBinary(ids.size(), out);
+        for (const auto & [scheme, id] : ids)
+        {
+            writeBinary(scheme, out);
+            writeBinary(id, out);
+        }
     }
 }
 
@@ -163,15 +203,42 @@ SnapshotMetadataPtr KeeperStorageSnapshot::deserialize(KeeperStorage & storage,
 {
     uint8_t version;
     readBinary(version, in);
-    if (static_cast<SnapshotVersion>(version) > SnapshotVersion::V0)
+    SnapshotVersion current_version = static_cast<SnapshotVersion>(version);
+    if (current_version > SnapshotVersion::V1)
         throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported snapshot version {}", version);
 
     SnapshotMetadataPtr result = deserializeSnapshotMetadata(in);
     int64_t session_id;
     readBinary(session_id, in);
+
     storage.zxid = result->get_last_log_idx();
     storage.session_id_counter = session_id;
 
+    if (current_version >= SnapshotVersion::V1)
+    {
+        size_t acls_map_size;
+        readBinary(acls_map_size, in);
+        size_t current_map_size = 0;
+        while (current_map_size < acls_map_size)
+        {
+            uint64_t acl_id;
+            readBinary(acl_id, in);
+            size_t acls_size;
+            readBinary(acls_size, in);
+            Coordination::ACLs acls;
+            for (size_t i = 0; i < acls_size; ++i)
+            {
+                Coordination::ACL acl;
+                readBinary(acl.permissions, in);
+                readBinary(acl.scheme, in);
+                readBinary(acl.id, in);
+                acls.push_back(acl);
+            }
+            storage.acl_map.addMapping(acl_id, acls);
+            current_map_size++;
+        }
+    }
+
     size_t snapshot_container_size;
     readBinary(snapshot_container_size, in);
 
@@ -180,8 +247,8 @@ SnapshotMetadataPtr KeeperStorageSnapshot::deserialize(KeeperStorage & storage,
     {
         std::string path;
         readBinary(path, in);
-        KeeperStorage::Node node;
-        readNode(node, in);
+        KeeperStorage::Node node{};
+        readNode(node, in, current_version, storage.acl_map);
         storage.container.insertOrReplace(path, node);
         if (node.stat.ephemeralOwner != 0)
             storage.ephemerals[node.stat.ephemeralOwner].insert(path);
@@ -208,13 +275,33 @@ SnapshotMetadataPtr KeeperStorageSnapshot::deserialize(KeeperStorage & storage,
         readBinary(active_session_id, in);
         readBinary(timeout, in);
         storage.addSessionID(active_session_id, timeout);
+
+        if (current_version >= SnapshotVersion::V1)
+        {
+            size_t session_auths_size;
+            readBinary(session_auths_size, in);
+
+            KeeperStorage::AuthIDs ids;
+            size_t session_auth_counter = 0;
+            while (session_auth_counter < session_auths_size)
+            {
+                String scheme, id;
+                readBinary(scheme, in);
+                readBinary(id, in);
+                ids.emplace_back(KeeperStorage::AuthID{scheme, id});
+
+                session_auth_counter++;
+            }
+            if (!ids.empty())
+                storage.session_and_auth[active_session_id] = ids;
+        }
         current_session_size++;
     }
 
     return result;
 }
 
-KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, size_t up_to_log_idx_)
+KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_)
     : 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)
@@ -223,6 +310,8 @@ KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, size_t up
     snapshot_container_size = storage->container.snapshotSize();
     begin = storage->getSnapshotIteratorBegin();
     session_and_timeout = storage->getActiveSessions();
+    acl_map = storage->acl_map.getMapping();
+    session_and_auth = storage->session_and_auth;
 }
 
 KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_)
@@ -234,6 +323,8 @@ KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, const Sna
     snapshot_container_size = storage->container.snapshotSize();
     begin = storage->getSnapshotIteratorBegin();
     session_and_timeout = storage->getActiveSessions();
+    acl_map = storage->acl_map.getMapping();
+    session_and_auth = storage->session_and_auth;
 }
 
 KeeperStorageSnapshot::~KeeperStorageSnapshot()
@@ -241,9 +332,10 @@ KeeperStorageSnapshot::~KeeperStorageSnapshot()
     storage->disableSnapshotMode();
 }
 
-KeeperSnapshotManager::KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, size_t storage_tick_time_)
+KeeperSnapshotManager::KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, const std::string & superdigest_, size_t storage_tick_time_)
     : snapshots_path(snapshots_path_)
     , snapshots_to_keep(snapshots_to_keep_)
+    , superdigest(superdigest_)
     , storage_tick_time(storage_tick_time_)
 {
     namespace fs = std::filesystem;
@@ -266,7 +358,7 @@ KeeperSnapshotManager::KeeperSnapshotManager(const std::string & snapshots_path_
 }
 
 
-std::string KeeperSnapshotManager::serializeSnapshotBufferToDisk(nuraft::buffer & buffer, size_t up_to_log_idx)
+std::string KeeperSnapshotManager::serializeSnapshotBufferToDisk(nuraft::buffer & buffer, uint64_t up_to_log_idx)
 {
     ReadBufferFromNuraftBuffer reader(buffer);
 
@@ -307,7 +399,7 @@ nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::deserializeLatestSnapshotBuff
     return nullptr;
 }
 
-nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::deserializeSnapshotBufferFromDisk(size_t up_to_log_idx) const
+nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::deserializeSnapshotBufferFromDisk(uint64_t up_to_log_idx) const
 {
     const std::string & snapshot_path = existing_snapshots.at(up_to_log_idx);
     WriteBufferFromNuraftBuffer writer;
@@ -330,7 +422,7 @@ SnapshotMetaAndStorage KeeperSnapshotManager::deserializeSnapshotFromBuffer(nura
 {
     ReadBufferFromNuraftBuffer reader(buffer);
     CompressedReadBuffer compressed_reader(reader);
-    auto storage = std::make_unique<KeeperStorage>(storage_tick_time);
+    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));
 }
@@ -352,7 +444,7 @@ void KeeperSnapshotManager::removeOutdatedSnapshotsIfNeeded()
         removeSnapshot(existing_snapshots.begin()->first);
 }
 
-void KeeperSnapshotManager::removeSnapshot(size_t log_idx)
+void KeeperSnapshotManager::removeSnapshot(uint64_t log_idx)
 {
     auto itr = existing_snapshots.find(log_idx);
     if (itr == existing_snapshots.end())
diff --git a/src/Coordination/KeeperSnapshotManager.h b/src/Coordination/KeeperSnapshotManager.h
index e53473d71c7..3dbd7c9328e 100644
--- a/src/Coordination/KeeperSnapshotManager.h
+++ b/src/Coordination/KeeperSnapshotManager.h
@@ -13,12 +13,13 @@ using SnapshotMetadataPtr = std::shared_ptr<SnapshotMetadata>;
 enum SnapshotVersion : uint8_t
 {
     V0 = 0,
+    V1 = 1, /// with ACL map
 };
 
 struct KeeperStorageSnapshot
 {
 public:
-    KeeperStorageSnapshot(KeeperStorage * storage_, size_t up_to_log_idx_);
+    KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_);
 
     KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_);
     ~KeeperStorageSnapshot();
@@ -29,12 +30,14 @@ public:
 
     KeeperStorage * storage;
 
-    SnapshotVersion version = SnapshotVersion::V0;
+    SnapshotVersion version = SnapshotVersion::V1;
     SnapshotMetadataPtr snapshot_meta;
     int64_t session_id;
     size_t snapshot_container_size;
     KeeperStorage::Container::const_iterator begin;
     SessionAndTimeout session_and_timeout;
+    KeeperStorage::SessionAndAuth session_and_auth;
+    std::unordered_map<uint64_t, Coordination::ACLs> acl_map;
 };
 
 using KeeperStorageSnapshotPtr = std::shared_ptr<KeeperStorageSnapshot>;
@@ -46,19 +49,19 @@ using SnapshotMetaAndStorage = std::pair<SnapshotMetadataPtr, KeeperStoragePtr>;
 class KeeperSnapshotManager
 {
 public:
-    KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, size_t storage_tick_time_ = 500);
+    KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, const std::string & superdigest_ = "", size_t storage_tick_time_ = 500);
 
     SnapshotMetaAndStorage restoreFromLatestSnapshot();
 
     static nuraft::ptr<nuraft::buffer> serializeSnapshotToBuffer(const KeeperStorageSnapshot & snapshot);
-    std::string serializeSnapshotBufferToDisk(nuraft::buffer & buffer, size_t up_to_log_idx);
+    std::string serializeSnapshotBufferToDisk(nuraft::buffer & buffer, uint64_t up_to_log_idx);
 
     SnapshotMetaAndStorage deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const;
 
-    nuraft::ptr<nuraft::buffer> deserializeSnapshotBufferFromDisk(size_t up_to_log_idx) const;
+    nuraft::ptr<nuraft::buffer> deserializeSnapshotBufferFromDisk(uint64_t up_to_log_idx) const;
     nuraft::ptr<nuraft::buffer> deserializeLatestSnapshotBufferFromDisk();
 
-    void removeSnapshot(size_t log_idx);
+    void removeSnapshot(uint64_t log_idx);
 
     size_t totalSnapshots() const
     {
@@ -76,7 +79,8 @@ private:
     void removeOutdatedSnapshotsIfNeeded();
     const std::string snapshots_path;
     const size_t snapshots_to_keep;
-    std::map<size_t, std::string> existing_snapshots;
+    std::map<uint64_t, std::string> existing_snapshots;
+    const std::string superdigest;
     size_t storage_tick_time;
 };
 
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
index 1a1957b1979..a76b86a8171 100644
--- a/src/Coordination/KeeperStateMachine.cpp
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -36,13 +36,19 @@ KeeperStorage::RequestForSession parseRequest(nuraft::buffer & data)
     return request_for_session;
 }
 
-KeeperStateMachine::KeeperStateMachine(ResponsesQueue & responses_queue_, SnapshotsQueue & snapshots_queue_, const std::string & snapshots_path_, const CoordinationSettingsPtr & coordination_settings_)
+    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, coordination_settings->dead_session_check_period_ms.totalMicroseconds())
+    , snapshot_manager(snapshots_path_, coordination_settings->snapshots_to_keep, superdigest_, coordination_settings->dead_session_check_period_ms.totalMicroseconds())
     , responses_queue(responses_queue_)
     , snapshots_queue(snapshots_queue_)
     , last_committed_idx(0)
     , log(&Poco::Logger::get("KeeperStateMachine"))
+    , superdigest(superdigest_)
 {
 }
 
@@ -54,7 +60,7 @@ void KeeperStateMachine::init()
     bool has_snapshots = snapshot_manager.totalSnapshots() != 0;
     while (snapshot_manager.totalSnapshots() != 0)
     {
-        size_t latest_log_index = snapshot_manager.getLatestSnapshotIndex();
+        uint64_t latest_log_index = snapshot_manager.getLatestSnapshotIndex();
         LOG_DEBUG(log, "Trying to load state machine from snapshot up to log index {}", latest_log_index);
 
         try
@@ -85,30 +91,34 @@ void KeeperStateMachine::init()
     }
 
     if (!storage)
-        storage = std::make_unique<KeeperStorage>(coordination_settings->dead_session_check_period_ms.totalMilliseconds());
+        storage = std::make_unique<KeeperStorage>(coordination_settings->dead_session_check_period_ms.totalMilliseconds(), superdigest);
 }
 
-nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const size_t log_idx, nuraft::buffer & data)
+nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, nuraft::buffer & data)
 {
-    if (data.size() == sizeof(int64_t))
+    auto request_for_session = parseRequest(data);
+    if (request_for_session.request->getOpNum() == Coordination::OpNum::SessionID)
     {
-        nuraft::buffer_serializer timeout_data(data);
-        int64_t session_timeout_ms = timeout_data.get_i64();
-        auto response = nuraft::buffer::alloc(sizeof(int64_t));
+        const Coordination::ZooKeeperSessionIDRequest & session_id_request = dynamic_cast<const Coordination::ZooKeeperSessionIDRequest &>(*request_for_session.request);
         int64_t session_id;
-        nuraft::buffer_serializer bs(response);
         {
             std::lock_guard lock(storage_lock);
-            session_id = storage->getSessionID(session_timeout_ms);
-            bs.put_i64(session_id);
+            session_id = storage->getSessionID(session_id_request.session_timeout_ms);
         }
-        LOG_DEBUG(log, "Session ID response {} with timeout {}", session_id, session_timeout_ms);
-        last_committed_idx = log_idx;
-        return response;
+        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);
     }
     else
     {
-        auto request_for_session = parseRequest(data);
         KeeperStorage::ResponsesForSessions responses_for_sessions;
         {
             std::lock_guard lock(storage_lock);
@@ -116,10 +126,10 @@ nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const size_t log_idx, nur
             for (auto & response_for_session : responses_for_sessions)
                 responses_queue.push(response_for_session);
         }
-
-        last_committed_idx = log_idx;
-        return nullptr;
     }
+
+    last_committed_idx = log_idx;
+    return nullptr;
 }
 
 bool KeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
@@ -169,15 +179,15 @@ void KeeperStateMachine::create_snapshot(
         bool ret = true;
         try
         {
-            auto snapshot_buf = snapshot_manager.serializeSnapshotToBuffer(*snapshot);
-            auto result_path = snapshot_manager.serializeSnapshotBufferToDisk(*snapshot_buf, snapshot->snapshot_meta->get_last_log_idx());
             {
                 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());
                 latest_snapshot_buf = snapshot_buf;
                 latest_snapshot_meta = snapshot->snapshot_meta;
-            }
 
-            LOG_DEBUG(log, "Created persistent snapshot {} with path {}", latest_snapshot_meta->get_last_log_idx(), result_path);
+                LOG_DEBUG(log, "Created persistent snapshot {} with path {}", latest_snapshot_meta->get_last_log_idx(), result_path);
+            }
 
             {
                 /// Must do it with lock (clearing elements from list)
@@ -205,7 +215,7 @@ void KeeperStateMachine::create_snapshot(
 
 void KeeperStateMachine::save_logical_snp_obj(
     nuraft::snapshot & s,
-    size_t & obj_id,
+    uint64_t & obj_id,
     nuraft::buffer & data,
     bool /*is_first_obj*/,
     bool /*is_last_obj*/)
@@ -228,43 +238,25 @@ void KeeperStateMachine::save_logical_snp_obj(
     nuraft::ptr<nuraft::buffer> snp_buf = s.serialize();
     cloned_meta = nuraft::snapshot::deserialize(*snp_buf);
 
-    /// Sometimes NuRaft can call save and create snapshots from different threads
-    /// at once. To avoid race conditions we serialize snapshots through snapshots_queue
-    /// TODO: make something better
-    CreateSnapshotTask snapshot_task;
-    std::shared_ptr<std::promise<void>> waiter = std::make_shared<std::promise<void>>();
-    auto future = waiter->get_future();
-    snapshot_task.snapshot = nullptr;
-    snapshot_task.create_snapshot = [this, waiter, cloned_buffer, log_idx = s.get_last_log_idx()] (KeeperStorageSnapshotPtr &&)
-    {
-        try
-        {
-            auto result_path = snapshot_manager.serializeSnapshotBufferToDisk(*cloned_buffer, log_idx);
-            LOG_DEBUG(log, "Saved snapshot {} to path {}", log_idx, result_path);
-        }
-        catch (...)
-        {
-            tryLogCurrentException(log);
-        }
-        waiter->set_value();
-    };
-    snapshots_queue.push(std::move(snapshot_task));
-    future.wait();
-
+    try
     {
         std::lock_guard lock(snapshots_lock);
+        auto result_path = snapshot_manager.serializeSnapshotBufferToDisk(*cloned_buffer, s.get_last_log_idx());
         latest_snapshot_buf = cloned_buffer;
         latest_snapshot_meta = cloned_meta;
+        LOG_DEBUG(log, "Saved snapshot {} to path {}", s.get_last_log_idx(), result_path);
+        obj_id++;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
     }
-
-
-    obj_id++;
 }
 
 int KeeperStateMachine::read_logical_snp_obj(
     nuraft::snapshot & s,
     void* & /*user_snp_ctx*/,
-    ulong obj_id,
+    uint64_t obj_id,
     nuraft::ptr<nuraft::buffer> & data_out,
     bool & is_last_obj)
 {
@@ -281,12 +273,15 @@ int KeeperStateMachine::read_logical_snp_obj(
     {
         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 {}",
+        {
+            LOG_WARNING(log, "Required to apply snapshot with last log index {}, but our last log index is {}. Will ignore this one and retry",
                             s.get_last_log_idx(), latest_snapshot_meta->get_last_log_idx());
+            return -1;
+        }
         data_out = nuraft::buffer::clone(*latest_snapshot_buf);
         is_last_obj = true;
     }
-    return 0;
+    return 1;
 }
 
 void KeeperStateMachine::processReadRequest(const KeeperStorage::RequestForSession & request_for_session)
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index aefdbe3f9f3..fb46f507baf 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -16,17 +16,20 @@ using SnapshotsQueue = ConcurrentBoundedQueue<CreateSnapshotTask>;
 class KeeperStateMachine : public nuraft::state_machine
 {
 public:
-    KeeperStateMachine(ResponsesQueue & responses_queue_, SnapshotsQueue & snapshots_queue_, const std::string & snapshots_path_, const CoordinationSettingsPtr & coordination_settings_);
+    KeeperStateMachine(
+        ResponsesQueue & responses_queue_, SnapshotsQueue & snapshots_queue_,
+        const std::string & snapshots_path_, const CoordinationSettingsPtr & coordination_settings_,
+        const std::string & superdigest_ = "");
 
     void init();
 
-    nuraft::ptr<nuraft::buffer> pre_commit(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
+    nuraft::ptr<nuraft::buffer> pre_commit(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
 
-    nuraft::ptr<nuraft::buffer> commit(const size_t log_idx, nuraft::buffer & data) override;
+    nuraft::ptr<nuraft::buffer> commit(const uint64_t log_idx, nuraft::buffer & data) override;
 
-    void rollback(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
+    void rollback(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
 
-    size_t last_commit_index() override { return last_committed_idx; }
+    uint64_t last_commit_index() override { return last_committed_idx; }
 
     bool apply_snapshot(nuraft::snapshot & s) override;
 
@@ -38,7 +41,7 @@ public:
 
     void save_logical_snp_obj(
         nuraft::snapshot & s,
-        size_t & obj_id,
+        uint64_t & obj_id,
         nuraft::buffer & data,
         bool is_first_obj,
         bool is_last_obj) override;
@@ -46,7 +49,7 @@ public:
     int read_logical_snp_obj(
         nuraft::snapshot & s,
         void* & user_snp_ctx,
-        ulong obj_id,
+        uint64_t obj_id,
         nuraft::ptr<nuraft::buffer> & data_out,
         bool & is_last_obj) override;
 
@@ -82,8 +85,10 @@ private:
     std::mutex storage_lock;
 
     /// Last committed Raft log number.
-    std::atomic<size_t> last_committed_idx;
+    std::atomic<uint64_t> last_committed_idx;
     Poco::Logger * log;
+
+    const std::string superdigest;
 };
 
 }
diff --git a/src/Coordination/KeeperStateManager.cpp b/src/Coordination/KeeperStateManager.cpp
index ad656cd1f95..d54752ec168 100644
--- a/src/Coordination/KeeperStateManager.cpp
+++ b/src/Coordination/KeeperStateManager.cpp
@@ -1,5 +1,6 @@
 #include <Coordination/KeeperStateManager.h>
 #include <Common/Exception.h>
+#include <filesystem>
 
 namespace DB
 {
@@ -9,9 +10,30 @@ namespace ErrorCodes
     extern const int RAFT_ERROR;
 }
 
+namespace
+{
+    std::string getLogsPathFromConfig(
+        const std::string & config_prefix, const Poco::Util::AbstractConfiguration & config, bool standalone_keeper)
+{
+    /// the most specialized path
+    if (config.has(config_prefix + ".log_storage_path"))
+        return config.getString(config_prefix + ".log_storage_path");
+
+    if (config.has(config_prefix + ".storage_path"))
+        return std::filesystem::path{config.getString(config_prefix + ".storage_path")} / "logs";
+
+    if (standalone_keeper)
+        return std::filesystem::path{config.getString("path", KEEPER_DEFAULT_PATH)} / "logs";
+    else
+        return std::filesystem::path{config.getString("path", DBMS_DEFAULT_PATH)} / "coordination/logs";
+}
+
+}
+
 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>())
 {
@@ -23,10 +45,12 @@ KeeperStateManager::KeeperStateManager(
     int my_server_id_,
     const std::string & config_prefix,
     const Poco::Util::AbstractConfiguration & config,
-    const CoordinationSettingsPtr & coordination_settings)
+    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>(
-                    config.getString(config_prefix + ".log_storage_path", config.getString("path", DBMS_DEFAULT_PATH) + "coordination/logs"),
+                    getLogsPathFromConfig(config_prefix, config, standalone_keeper),
                     coordination_settings->rotate_log_storage_interval, coordination_settings->force_sync))
     , cluster_config(nuraft::cs_new<nuraft::cluster_config>())
 {
@@ -37,6 +61,9 @@ KeeperStateManager::KeeperStateManager(
 
     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");
         std::string hostname = config.getString(full_prefix + ".hostname");
@@ -44,6 +71,7 @@ KeeperStateManager::KeeperStateManager(
         bool can_become_leader = config.getBool(full_prefix + ".can_become_leader", true);
         int32_t priority = config.getInt(full_prefix + ".priority", 1);
         bool start_as_follower = config.getBool(full_prefix + ".start_as_follower", false);
+
         if (start_as_follower)
             start_as_follower_servers.insert(server_id);
 
@@ -57,6 +85,7 @@ KeeperStateManager::KeeperStateManager(
 
         cluster_config->get_servers().push_back(peer_config);
     }
+
     if (!my_server_config)
         throw Exception(ErrorCodes::RAFT_ERROR, "Our server id {} not found in raft_configuration section", my_server_id);
 
@@ -64,7 +93,7 @@ KeeperStateManager::KeeperStateManager(
         throw Exception(ErrorCodes::RAFT_ERROR, "At least one of servers should be able to start as leader (without <start_as_follower>)");
 }
 
-void KeeperStateManager::loadLogStore(size_t last_commited_index, size_t logs_to_keep)
+void KeeperStateManager::loadLogStore(uint64_t last_commited_index, uint64_t logs_to_keep)
 {
     log_store->init(last_commited_index, logs_to_keep);
 }
diff --git a/src/Coordination/KeeperStateManager.h b/src/Coordination/KeeperStateManager.h
index f0575082b02..2a93a1dc62b 100644
--- a/src/Coordination/KeeperStateManager.h
+++ b/src/Coordination/KeeperStateManager.h
@@ -17,7 +17,8 @@ public:
         int server_id_,
         const std::string & config_prefix,
         const Poco::Util::AbstractConfiguration & config,
-        const CoordinationSettingsPtr & coordination_settings);
+        const CoordinationSettingsPtr & coordination_settings,
+        bool standalone_keeper);
 
     KeeperStateManager(
         int server_id_,
@@ -25,7 +26,7 @@ public:
         int port,
         const std::string & logs_path);
 
-    void loadLogStore(size_t last_commited_index, size_t logs_to_keep);
+    void loadLogStore(uint64_t last_commited_index, uint64_t logs_to_keep);
 
     void flushLogStore();
 
@@ -52,14 +53,20 @@ public:
         return start_as_follower_servers.count(my_server_id);
     }
 
+    bool isSecure() const
+    {
+        return secure;
+    }
+
     nuraft::ptr<KeeperLogStore> getLogStore() const { return log_store; }
 
-    size_t getTotalServers() const { return total_servers; }
+    uint64_t getTotalServers() const { return total_servers; }
 
 private:
     int my_server_id;
     int my_port;
-    size_t total_servers{0};
+    bool secure;
+    uint64_t total_servers{0};
     std::unordered_set<int> start_as_follower_servers;
     nuraft::ptr<KeeperLogStore> log_store;
     nuraft::ptr<nuraft::srv_config> my_server_config;
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 3e9b64cd0a4..3ae29edb77a 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -7,6 +7,9 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <sstream>
 #include <iomanip>
+#include <Poco/SHA1Engine.h>
+#include <Poco/Base64Encoder.h>
+#include <boost/algorithm/string.hpp>
 
 namespace DB
 {
@@ -31,6 +34,100 @@ static std::string getBaseName(const String & path)
     return std::string{&path[basename_start + 1], path.length() - basename_start - 1};
 }
 
+static String base64Encode(const String & decoded)
+{
+    std::ostringstream ostr; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    ostr.exceptions(std::ios::failbit);
+    Poco::Base64Encoder encoder(ostr);
+    encoder.rdbuf()->setLineLength(0);
+    encoder << decoded;
+    encoder.close();
+    return ostr.str();
+}
+
+static String getSHA1(const String & userdata)
+{
+    Poco::SHA1Engine engine;
+    engine.update(userdata);
+    const auto & digest_id = engine.digest();
+    return String{digest_id.begin(), digest_id.end()};
+}
+
+static String generateDigest(const String & userdata)
+{
+    std::vector<String> user_password;
+    boost::split(user_password, userdata, [](char c) { return c == ':'; });
+    return user_password[0] + ":" + base64Encode(getSHA1(user_password[1]));
+}
+
+static bool checkACL(int32_t permission, const Coordination::ACLs & node_acls, const std::vector<KeeperStorage::AuthID> & session_auths)
+{
+    if (node_acls.empty())
+        return true;
+
+    for (const auto & session_auth : session_auths)
+        if (session_auth.scheme == "super")
+            return true;
+
+    for (const auto & node_acl : node_acls)
+    {
+        if (node_acl.permissions & permission)
+        {
+            if (node_acl.scheme == "world" && node_acl.id == "anyone")
+                return true;
+
+            for (const auto & session_auth : session_auths)
+                if (node_acl.scheme == session_auth.scheme && node_acl.id == session_auth.id)
+                    return true;
+        }
+    }
+
+    return false;
+}
+
+static bool fixupACL(
+    const std::vector<Coordination::ACL> & request_acls,
+    const std::vector<KeeperStorage::AuthID> & current_ids,
+    std::vector<Coordination::ACL> & result_acls)
+{
+    if (request_acls.empty())
+        return true;
+
+    bool valid_found = false;
+    for (const auto & request_acl : request_acls)
+    {
+        if (request_acl.scheme == "auth")
+        {
+            for (const auto & current_id : current_ids)
+            {
+                valid_found = true;
+                Coordination::ACL new_acl = request_acl;
+                new_acl.scheme = current_id.scheme;
+                new_acl.id = current_id.id;
+                result_acls.push_back(new_acl);
+            }
+        }
+        else if (request_acl.scheme == "world" && request_acl.id == "anyone")
+        {
+            /// We don't need to save default ACLs
+            valid_found = true;
+        }
+        else if (request_acl.scheme == "digest")
+        {
+            Coordination::ACL new_acl = request_acl;
+
+            /// Bad auth
+            if (std::count(new_acl.id.begin(), new_acl.id.end(), ':') != 1)
+                return false;
+
+            valid_found = true;
+            new_acl.id = generateDigest(new_acl.id);
+            result_acls.push_back(new_acl);
+        }
+    }
+    return valid_found;
+}
+
 static KeeperStorage::ResponsesForSessions processWatchesImpl(const String & path, KeeperStorage::Watches & watches, KeeperStorage::Watches & list_watches, Coordination::Event event_type)
 {
     KeeperStorage::ResponsesForSessions result;
@@ -67,8 +164,9 @@ static KeeperStorage::ResponsesForSessions processWatchesImpl(const String & pat
     return result;
 }
 
-KeeperStorage::KeeperStorage(int64_t tick_time_ms)
+KeeperStorage::KeeperStorage(int64_t tick_time_ms, const String & superdigest_)
     : session_expiry_queue(tick_time_ms)
+    , superdigest(superdigest_)
 {
     container.insert("/", Node());
 }
@@ -82,8 +180,9 @@ struct KeeperStorageRequest
     explicit KeeperStorageRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
         : zk_request(zk_request_)
     {}
-    virtual std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const = 0;
+    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;
 };
@@ -91,7 +190,7 @@ struct KeeperStorageRequest
 struct KeeperStorageHeartbeatRequest final : public KeeperStorageRequest
 {
     using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & /* container */, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & /* storage */, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         return {zk_request->makeResponse(), {}};
     }
@@ -100,10 +199,11 @@ struct KeeperStorageHeartbeatRequest final : public KeeperStorageRequest
 struct KeeperStorageSyncRequest final : public KeeperStorageRequest
 {
     using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & /* container */, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & /* storage */, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         auto response = zk_request->makeResponse();
-        dynamic_cast<Coordination::ZooKeeperSyncResponse *>(response.get())->path = dynamic_cast<Coordination::ZooKeeperSyncRequest *>(zk_request.get())->path;
+        dynamic_cast<Coordination::ZooKeeperSyncResponse &>(*response).path
+            = dynamic_cast<Coordination::ZooKeeperSyncRequest &>(*zk_request).path;
         return {response, {}};
     }
 };
@@ -117,8 +217,28 @@ struct KeeperStorageCreateRequest final : public KeeperStorageRequest
         return processWatchesImpl(zk_request->getPath(), watches, list_watches, Coordination::Event::CREATED);
     }
 
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const override
+    bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
+        auto & container = storage.container;
+        auto parent_path = parentPath(zk_request->getPath());
+
+        auto it = container.find(parent_path);
+        if (it == container.end())
+            return true;
+
+        const auto & node_acls = storage.acl_map.convertNumber(it->value.acl_id);
+        if (node_acls.empty())
+            return true;
+
+        const auto & session_auths = storage.session_and_auth[session_id];
+        return checkACL(Coordination::ACL::Create, node_acls, session_auths);
+    }
+
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t zxid, int64_t session_id) const override
+    {
+        auto & container = storage.container;
+        auto & ephemerals = storage.ephemerals;
+
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Undo undo;
         Coordination::ZooKeeperCreateResponse & response = dynamic_cast<Coordination::ZooKeeperCreateResponse &>(*response_ptr);
@@ -143,7 +263,21 @@ struct KeeperStorageCreateRequest final : public KeeperStorageRequest
             }
             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))
+                {
+                    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.ctime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
@@ -153,6 +287,7 @@ struct KeeperStorageCreateRequest final : public KeeperStorageRequest
                 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)
@@ -182,13 +317,15 @@ struct KeeperStorageCreateRequest final : public KeeperStorageRequest
                 if (request.is_ephemeral)
                     ephemerals[session_id].emplace(path_created);
 
-                undo = [&container, &ephemerals, session_id, path_created, is_ephemeral = request.is_ephemeral, parent_path, child_path]
+                undo = [&storage, session_id, path_created, is_ephemeral = request.is_ephemeral, parent_path, child_path, acl_id]
                 {
-                    container.erase(path_created);
-                    if (is_ephemeral)
-                        ephemerals[session_id].erase(path_created);
+                    storage.container.erase(path_created);
+                    storage.acl_map.removeUsage(acl_id);
 
-                    container.updateValue(parent_path, [child_path] (KeeperStorage::Node & undo_parent)
+                    if (is_ephemeral)
+                        storage.ephemerals[session_id].erase(path_created);
+
+                    storage.container.updateValue(parent_path, [child_path] (KeeperStorage::Node & undo_parent)
                     {
                         --undo_parent.stat.cversion;
                         --undo_parent.stat.numChildren;
@@ -207,9 +344,26 @@ struct KeeperStorageCreateRequest final : public KeeperStorageRequest
 
 struct KeeperStorageGetRequest final : public KeeperStorageRequest
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /* zxid */, int64_t /* session_id */) const override
+
+    bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
+        auto & container = storage.container;
+        auto it = container.find(zk_request->getPath());
+        if (it == container.end())
+            return true;
+
+        const auto & node_acls = storage.acl_map.convertNumber(it->value.acl_id);
+        if (node_acls.empty())
+            return true;
+
+        const auto & session_auths = storage.session_and_auth[session_id];
+        return checkACL(Coordination::ACL::Read, node_acls, session_auths);
+    }
+
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /* zxid */, int64_t /* session_id */) const override
+    {
+        auto & container = storage.container;
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperGetResponse & response = dynamic_cast<Coordination::ZooKeeperGetResponse &>(*response_ptr);
         Coordination::ZooKeeperGetRequest & request = dynamic_cast<Coordination::ZooKeeperGetRequest &>(*zk_request);
@@ -232,9 +386,27 @@ struct KeeperStorageGetRequest final : public KeeperStorageRequest
 
 struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
+        auto & container = storage.container;
+        auto it = container.find(parentPath(zk_request->getPath()));
+        if (it == container.end())
+            return true;
+
+        const auto & node_acls = storage.acl_map.convertNumber(it->value.acl_id);
+        if (node_acls.empty())
+            return true;
+
+        const auto & session_auths = storage.session_and_auth[session_id];
+        return checkACL(Coordination::ACL::Delete, node_acls, session_auths);
+    }
+
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    {
+        auto & container = storage.container;
+        auto & ephemerals = storage.ephemerals;
+
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperRemoveResponse & response = dynamic_cast<Coordination::ZooKeeperRemoveResponse &>(*response_ptr);
         Coordination::ZooKeeperRemoveRequest & request = dynamic_cast<Coordination::ZooKeeperRemoveRequest &>(*zk_request);
@@ -264,6 +436,8 @@ struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
                     ephemerals.erase(ephemerals_it);
             }
 
+            storage.acl_map.removeUsage(prev_node.acl_id);
+
             auto child_basename = getBaseName(it->key);
             container.updateValue(parentPath(request.path), [&child_basename] (KeeperStorage::Node & parent)
             {
@@ -276,13 +450,15 @@ struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
 
             container.erase(request.path);
 
-            undo = [prev_node, &container, &ephemerals, path = request.path, child_basename]
+            undo = [prev_node, &storage, path = request.path, child_basename]
             {
                 if (prev_node.stat.ephemeralOwner != 0)
-                    ephemerals[prev_node.stat.ephemeralOwner].emplace(path);
+                    storage.ephemerals[prev_node.stat.ephemeralOwner].emplace(path);
 
-                container.insert(path, prev_node);
-                container.updateValue(parentPath(path), [&child_basename] (KeeperStorage::Node & parent)
+                storage.acl_map.addUsage(prev_node.acl_id);
+
+                storage.container.insert(path, prev_node);
+                storage.container.updateValue(parentPath(path), [&child_basename] (KeeperStorage::Node & parent)
                 {
                     ++parent.stat.numChildren;
                     --parent.stat.cversion;
@@ -303,8 +479,10 @@ struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
 struct KeeperStorageExistsRequest final : public KeeperStorageRequest
 {
     using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /* session_id */) const override
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /* session_id */) const override
     {
+        auto & container = storage.container;
+
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperExistsResponse & response = dynamic_cast<Coordination::ZooKeeperExistsResponse &>(*response_ptr);
         Coordination::ZooKeeperExistsRequest & request = dynamic_cast<Coordination::ZooKeeperExistsRequest &>(*zk_request);
@@ -326,9 +504,26 @@ struct KeeperStorageExistsRequest final : public KeeperStorageRequest
 
 struct KeeperStorageSetRequest final : public KeeperStorageRequest
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t zxid, int64_t /* session_id */) const override
+    bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
+        auto & container = storage.container;
+        auto it = container.find(zk_request->getPath());
+        if (it == container.end())
+            return true;
+
+        const auto & node_acls = storage.acl_map.convertNumber(it->value.acl_id);
+        if (node_acls.empty())
+            return true;
+
+        const auto & session_auths = storage.session_and_auth[session_id];
+        return checkACL(Coordination::ACL::Write, node_acls, session_auths);
+    }
+
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t zxid, int64_t /* session_id */) const override
+    {
+        auto & container = storage.container;
+
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperSetResponse & response = dynamic_cast<Coordination::ZooKeeperSetResponse &>(*response_ptr);
         Coordination::ZooKeeperSetRequest & request = dynamic_cast<Coordination::ZooKeeperSetRequest &>(*zk_request);
@@ -386,9 +581,25 @@ struct KeeperStorageSetRequest final : public KeeperStorageRequest
 
 struct KeeperStorageListRequest final : public KeeperStorageRequest
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
+        auto & container = storage.container;
+        auto it = container.find(zk_request->getPath());
+        if (it == container.end())
+            return true;
+
+        const auto & node_acls = storage.acl_map.convertNumber(it->value.acl_id);
+        if (node_acls.empty())
+            return true;
+
+        const auto & session_auths = storage.session_and_auth[session_id];
+        return checkACL(Coordination::ACL::Read, node_acls, session_auths);
+    }
+
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    {
+        auto & container = storage.container;
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperListResponse & response = dynamic_cast<Coordination::ZooKeeperListResponse &>(*response_ptr);
         Coordination::ZooKeeperListRequest & request = dynamic_cast<Coordination::ZooKeeperListRequest &>(*zk_request);
@@ -405,8 +616,6 @@ struct KeeperStorageListRequest final : public KeeperStorageRequest
 
             response.names.insert(response.names.end(), it->value.children.begin(), it->value.children.end());
 
-            std::sort(response.names.begin(), response.names.end());
-
             response.stat = it->value.stat;
             response.error = Coordination::Error::ZOK;
         }
@@ -417,9 +626,26 @@ struct KeeperStorageListRequest final : public KeeperStorageRequest
 
 struct KeeperStorageCheckRequest final : public KeeperStorageRequest
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & /* ephemerals */, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
+        auto & container = storage.container;
+        auto it = container.find(zk_request->getPath());
+        if (it == container.end())
+            return true;
+
+        const auto & node_acls = storage.acl_map.convertNumber(it->value.acl_id);
+        if (node_acls.empty())
+            return true;
+
+        const auto & session_auths = storage.session_and_auth[session_id];
+        return checkACL(Coordination::ACL::Read, node_acls, session_auths);
+    }
+
+    using KeeperStorageRequest::KeeperStorageRequest;
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /*session_id*/) const override
+    {
+        auto & container = storage.container;
+
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperCheckResponse & response = dynamic_cast<Coordination::ZooKeeperCheckResponse &>(*response_ptr);
         Coordination::ZooKeeperCheckRequest & request = dynamic_cast<Coordination::ZooKeeperCheckRequest &>(*zk_request);
@@ -443,6 +669,14 @@ struct KeeperStorageCheckRequest final : public KeeperStorageRequest
 
 struct KeeperStorageMultiRequest final : public KeeperStorageRequest
 {
+    bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
+    {
+        for (const auto & concrete_request : concrete_requests)
+            if (!concrete_request->checkAuth(storage, session_id))
+                return false;
+        return true;
+    }
+
     std::vector<KeeperStorageRequestPtr> concrete_requests;
     explicit KeeperStorageMultiRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
         : KeeperStorageRequest(zk_request_)
@@ -474,7 +708,7 @@ struct KeeperStorageMultiRequest final : public KeeperStorageRequest
         }
     }
 
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container & container, KeeperStorage::Ephemerals & ephemerals, int64_t zxid, int64_t session_id) const override
+    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t zxid, int64_t session_id) const override
     {
         Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
         Coordination::ZooKeeperMultiResponse & response = dynamic_cast<Coordination::ZooKeeperMultiResponse &>(*response_ptr);
@@ -485,7 +719,7 @@ struct KeeperStorageMultiRequest final : public KeeperStorageRequest
             size_t i = 0;
             for (const auto & concrete_request : concrete_requests)
             {
-                auto [ cur_response, undo_action ] = concrete_request->process(container, ephemerals, zxid, session_id);
+                auto [ cur_response, undo_action ] = concrete_request->process(storage, zxid, session_id);
 
                 response.responses[i] = cur_response;
                 if (cur_response->error != Coordination::Error::ZOK)
@@ -542,12 +776,48 @@ struct KeeperStorageMultiRequest final : public KeeperStorageRequest
 struct KeeperStorageCloseRequest final : public KeeperStorageRequest
 {
     using KeeperStorageRequest::KeeperStorageRequest;
-    std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage::Container &, KeeperStorage::Ephemerals &, int64_t, int64_t) const override
+    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
+{
+    using KeeperStorageRequest::KeeperStorageRequest;
+    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);
+        Coordination::ZooKeeperResponsePtr response_ptr = zk_request->makeResponse();
+        Coordination::ZooKeeperAuthResponse & auth_response =  dynamic_cast<Coordination::ZooKeeperAuthResponse &>(*response_ptr);
+        auto & sessions_and_auth = storage.session_and_auth;
+
+        if (auth_request.scheme != "digest" || std::count(auth_request.data.begin(), auth_request.data.end(), ':') != 1)
+        {
+            auth_response.error = Coordination::Error::ZAUTHFAILED;
+        }
+        else
+        {
+            auto digest = generateDigest(auth_request.data);
+            if (digest == storage.superdigest)
+            {
+                KeeperStorage::AuthID auth{"super", ""};
+                sessions_and_auth[session_id].emplace_back(auth);
+            }
+            else
+            {
+                KeeperStorage::AuthID auth{auth_request.scheme, digest};
+                auto & session_ids = sessions_and_auth[session_id];
+                if (std::find(session_ids.begin(), session_ids.end(), auth) == session_ids.end())
+                    sessions_and_auth[session_id].emplace_back(auth);
+            }
+
+        }
+
+        return { response_ptr, {} };
+    }
+};
+
 void KeeperStorage::finalize()
 {
     if (finalized)
@@ -612,7 +882,7 @@ KeeperWrapperFactory::KeeperWrapperFactory()
 {
     registerKeeperRequestWrapper<Coordination::OpNum::Heartbeat, KeeperStorageHeartbeatRequest>(*this);
     registerKeeperRequestWrapper<Coordination::OpNum::Sync, KeeperStorageSyncRequest>(*this);
-    //registerKeeperRequestWrapper<Coordination::OpNum::Auth, KeeperStorageAuthRequest>(*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);
@@ -658,6 +928,9 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
             ephemerals.erase(it);
         }
         clearDeadWatches(session_id);
+        auto auth_it = session_and_auth.find(session_id);
+        if (auth_it != session_and_auth.end())
+            session_and_auth.erase(auth_it);
 
         /// Finish connection
         auto response = std::make_shared<Coordination::ZooKeeperCloseResponse>();
@@ -670,7 +943,7 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
     else if (zk_request->getOpNum() == Coordination::OpNum::Heartbeat)
     {
         KeeperStorageRequestPtr storage_request = KeeperWrapperFactory::instance().get(zk_request);
-        auto [response, _] = storage_request->process(container, ephemerals, zxid, session_id);
+        auto [response, _] = storage_request->process(*this, zxid, session_id);
         response->xid = zk_request->xid;
         response->zxid = getZXID();
 
@@ -679,7 +952,18 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
     else
     {
         KeeperStorageRequestPtr storage_request = KeeperWrapperFactory::instance().get(zk_request);
-        auto [response, _] = storage_request->process(container, ephemerals, zxid, session_id);
+        Coordination::ZooKeeperResponsePtr response;
+
+        if (!storage_request->checkAuth(*this, session_id))
+        {
+            response = zk_request->makeResponse();
+            /// Original ZooKeeper always throws no auth, even when user provided some credentials
+            response->error = Coordination::Error::ZNOAUTH;
+        }
+        else
+        {
+            std::tie(response, std::ignore) = storage_request->process(*this, zxid, session_id);
+        }
 
         if (zk_request->has_watch)
         {
diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h
index 585426a7441..7c90a9bd661 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -5,6 +5,7 @@
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Coordination/SessionExpiryQueue.h>
+#include <Coordination/ACLMap.h>
 #include <Coordination/SnapshotableHashTable.h>
 #include <unordered_map>
 #include <unordered_set>
@@ -30,7 +31,7 @@ public:
     struct Node
     {
         String data;
-        Coordination::ACLs acls{};
+        uint64_t acl_id = 0; /// 0 -- no ACL by default
         bool is_sequental = false;
         Coordination::Stat stat{};
         int32_t seq_num = 0;
@@ -51,6 +52,17 @@ public:
         Coordination::ZooKeeperRequestPtr request;
     };
 
+    struct AuthID
+    {
+        std::string scheme;
+        std::string id;
+
+        bool operator==(const AuthID & other) const
+        {
+            return scheme == other.scheme && id == other.id;
+        }
+    };
+
     using RequestsForSessions = std::vector<RequestForSession>;
 
     using Container = SnapshotableHashTable<Node>;
@@ -58,6 +70,11 @@ public:
     using SessionAndWatcher = std::unordered_map<int64_t, std::unordered_set<std::string>>;
     using SessionIDs = std::vector<int64_t>;
 
+    /// Just vector of SHA1 from user:password
+    using AuthIDs = std::vector<AuthID>;
+    using SessionAndAuth = std::unordered_map<int64_t, AuthIDs>;
+    SessionAndAuth session_and_auth;
+
     using Watches = std::map<String /* path, relative of root_path */, SessionIDs>;
 
     Container container;
@@ -65,6 +82,7 @@ public:
     SessionAndWatcher sessions_and_watchers;
     SessionExpiryQueue session_expiry_queue;
     SessionAndTimeout session_and_timeout;
+    ACLMap acl_map;
 
     int64_t zxid{0};
     bool finalized{false};
@@ -79,8 +97,10 @@ public:
         return zxid;
     }
 
+    const String superdigest;
+
 public:
-    KeeperStorage(int64_t tick_time_ms);
+    KeeperStorage(int64_t tick_time_ms, const String & superdigest_);
 
     int64_t getSessionID(int64_t session_timeout_ms)
     {
diff --git a/src/Coordination/KeeperStorageDispatcher.cpp b/src/Coordination/KeeperStorageDispatcher.cpp
index 7f9f9170dc2..e95a6940baa 100644
--- a/src/Coordination/KeeperStorageDispatcher.cpp
+++ b/src/Coordination/KeeperStorageDispatcher.cpp
@@ -1,5 +1,9 @@
 #include <Coordination/KeeperStorageDispatcher.h>
 #include <Common/setThreadName.h>
+#include <Common/Stopwatch.h>
+#include <Common/ZooKeeper/KeeperException.h>
+#include <future>
+#include <chrono>
 
 namespace DB
 {
@@ -17,29 +21,116 @@ KeeperStorageDispatcher::KeeperStorageDispatcher()
 {
 }
 
+
 void KeeperStorageDispatcher::requestThread()
 {
     setThreadName("KeeperReqT");
+
+    /// Result of requests batch from previous iteration
+    RaftAppendResult prev_result = nullptr;
+    /// Requests from previous iteration. We store them to be able
+    /// to send errors to the client.
+    KeeperStorage::RequestsForSessions prev_batch;
+
     while (!shutdown_called)
     {
         KeeperStorage::RequestForSession request;
 
         UInt64 max_wait = UInt64(coordination_settings->operation_timeout_ms.totalMilliseconds());
+        uint64_t max_batch_size = coordination_settings->max_requests_batch_size;
 
-        if (requests_queue.tryPop(request, max_wait))
+        /// The code below do a very simple thing: batch all write (quorum) requests into vector until
+        /// previous write batch is not finished or max_batch size achieved. The main complexity goes from
+        /// the ability to process read requests without quorum (from local state). So when we are collecting
+        /// requests into a batch we must check that the new request is not read request. Otherwise we have to
+        /// process all already accumulated write requests, wait them synchronously and only after that process
+        /// read request. So reads are some kind of "separator" for writes.
+        try
         {
-            if (shutdown_called)
-                break;
+            if (requests_queue->tryPop(request, max_wait))
+            {
+                if (shutdown_called)
+                    break;
 
-            try
-            {
-                server->putRequest(request);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
+                KeeperStorage::RequestsForSessions current_batch;
+
+                bool has_read_request = false;
+
+                /// If new request is not read request or we must to process it through quorum.
+                /// Otherwise we will process it locally.
+                if (coordination_settings->quorum_reads || !request.request->isReadRequest())
+                {
+                    current_batch.emplace_back(request);
+
+                    /// Waiting until previous append will be successful, or batch is big enough
+                    /// has_result == false && get_result_code == OK means that our request still not processed.
+                    /// Sometimes NuRaft set errorcode without setting result, so we check both here.
+                    while (prev_result && (!prev_result->has_result() && prev_result->get_result_code() == nuraft::cmd_result_code::OK) && current_batch.size() <= max_batch_size)
+                    {
+                        /// Trying to get batch requests as fast as possible
+                        if (requests_queue->tryPop(request, 1))
+                        {
+                            /// Don't append read request into batch, we have to process them separately
+                            if (!coordination_settings->quorum_reads && request.request->isReadRequest())
+                            {
+                                has_read_request = true;
+                                break;
+                            }
+                            else
+                            {
+
+                                current_batch.emplace_back(request);
+                            }
+                        }
+
+                        if (shutdown_called)
+                            break;
+                    }
+                }
+                else
+                    has_read_request = true;
+
+                if (shutdown_called)
+                    break;
+
+                /// Forcefully process all previous pending requests
+                if (prev_result)
+                    forceWaitAndProcessResult(prev_result, prev_batch);
+
+                /// Process collected write requests batch
+                if (!current_batch.empty())
+                {
+                    auto result = server->putRequestBatch(current_batch);
+
+                    if (result)
+                    {
+                        if (has_read_request) /// If we will execute read request next, than we have to process result now
+                            forceWaitAndProcessResult(result, current_batch);
+                    }
+                    else
+                    {
+                        addErrorResponses(current_batch, Coordination::Error::ZCONNECTIONLOSS);
+                        current_batch.clear();
+                    }
+
+                    prev_batch = current_batch;
+                    prev_result = result;
+                }
+
+                /// Read request always goes after write batch (last request)
+                if (has_read_request)
+                {
+                    if (server->isLeaderAlive())
+                        server->putLocalReadRequest(request);
+                    else
+                        addErrorResponses({request}, Coordination::Error::ZCONNECTIONLOSS);
+                }
             }
         }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
     }
 }
 
@@ -94,14 +185,32 @@ void KeeperStorageDispatcher::snapshotThread()
 void KeeperStorageDispatcher::setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response)
 {
     std::lock_guard lock(session_to_response_callback_mutex);
-    auto session_writer = session_to_response_callback.find(session_id);
-    if (session_writer == session_to_response_callback.end())
-        return;
+    if (response->xid != Coordination::WATCH_XID && response->getOpNum() == Coordination::OpNum::SessionID)
+    {
+        const Coordination::ZooKeeperSessionIDResponse & session_id_resp = dynamic_cast<const Coordination::ZooKeeperSessionIDResponse &>(*response);
 
-    session_writer->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);
+        /// Nobody waits for this session id
+        if (session_id_resp.server_id != server->getServerID() || !new_session_id_response_callback.count(session_id_resp.internal_id))
+            return;
+
+        auto callback = new_session_id_response_callback[session_id_resp.internal_id];
+        callback(response);
+        new_session_id_response_callback.erase(session_id_resp.internal_id);
+    }
+    else
+    {
+        auto session_writer = session_to_response_callback.find(session_id);
+        if (session_writer == session_to_response_callback.end())
+            return;
+
+        session_writer->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);
+        }
+    }
 }
 
 bool KeeperStorageDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id)
@@ -117,26 +226,32 @@ bool KeeperStorageDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr
     request_info.session_id = session_id;
 
     std::lock_guard lock(push_request_mutex);
+
+    if (shutdown_called)
+        return false;
+
     /// Put close requests without timeouts
     if (request->getOpNum() == Coordination::OpNum::Close)
-        requests_queue.push(std::move(request_info));
-    else if (!requests_queue.tryPush(std::move(request_info), coordination_settings->operation_timeout_ms.totalMilliseconds()))
+        requests_queue->push(std::move(request_info));
+    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)
+void KeeperStorageDispatcher::initialize(const Poco::Util::AbstractConfiguration & config, bool standalone_keeper)
 {
     LOG_DEBUG(log, "Initializing storage dispatcher");
     int myid = config.getInt("keeper_server.server_id");
 
     coordination_settings->loadFromConfig("keeper_server.coordination_settings", config);
+    requests_queue = std::make_unique<RequestsQueue>(coordination_settings->max_requests_batch_size);
 
     request_thread = ThreadFromGlobalPool([this] { requestThread(); });
     responses_thread = ThreadFromGlobalPool([this] { responseThread(); });
     snapshot_thread = ThreadFromGlobalPool([this] { snapshotThread(); });
 
-    server = std::make_unique<KeeperServer>(myid, coordination_settings, config, responses_queue, snapshots_queue);
+    server = std::make_unique<KeeperServer>(
+        myid, coordination_settings, config, responses_queue, snapshots_queue, standalone_keeper);
     try
     {
         LOG_DEBUG(log, "Waiting server to initialize");
@@ -175,7 +290,7 @@ void KeeperStorageDispatcher::shutdown()
                 session_cleaner_thread.join();
 
             /// FIXME not the best way to notify
-            requests_queue.push({});
+            requests_queue->push({});
             if (request_thread.joinable())
                 request_thread.join();
 
@@ -192,7 +307,7 @@ void KeeperStorageDispatcher::shutdown()
             server->shutdown();
 
         KeeperStorage::RequestForSession request_for_session;
-        while (requests_queue.tryPop(request_for_session))
+        while (requests_queue->tryPop(request_for_session))
         {
             if (request_for_session.request)
             {
@@ -205,6 +320,8 @@ void KeeperStorageDispatcher::shutdown()
                 break;
             }
         }
+
+        std::lock_guard lock(session_to_response_callback_mutex);
         session_to_response_callback.clear();
     }
     catch (...)
@@ -249,7 +366,7 @@ void KeeperStorageDispatcher::sessionCleanerTask()
                     request_info.session_id = dead_session;
                     {
                         std::lock_guard lock(push_request_mutex);
-                        requests_queue.push(std::move(request_info));
+                        requests_queue->push(std::move(request_info));
                     }
                     finishSession(dead_session);
                     LOG_INFO(log, "Dead session close request pushed");
@@ -273,4 +390,79 @@ 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)
+{
+    for (const auto & [session_id, request] : requests_for_sessions)
+    {
+        KeeperStorage::ResponsesForSessions responses;
+        auto response = request->makeResponse();
+        response->xid = request->xid;
+        response->zxid = 0;
+        response->error = error;
+        responses_queue.push(DB::KeeperStorage::ResponseForSession{session_id, response});
+    }
+}
+
+void KeeperStorageDispatcher::forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions)
+{
+    if (!result->has_result())
+        result->get();
+
+    /// If we get some errors, than send them to clients
+    if (!result->get_accepted() || result->get_result_code() == nuraft::cmd_result_code::TIMEOUT)
+        addErrorResponses(requests_for_sessions, Coordination::Error::ZOPERATIONTIMEOUT);
+    else if (result->get_result_code() != nuraft::cmd_result_code::OK)
+        addErrorResponses(requests_for_sessions, Coordination::Error::ZCONNECTIONLOSS);
+
+    result = nullptr;
+    requests_for_sessions.clear();
+}
+
+int64_t KeeperStorageDispatcher::getSessionID(int64_t session_timeout_ms)
+{
+    KeeperStorage::RequestForSession request_info;
+    std::shared_ptr<Coordination::ZooKeeperSessionIDRequest> request = std::make_shared<Coordination::ZooKeeperSessionIDRequest>();
+    request->internal_id = internal_session_id_counter.fetch_add(1);
+    request->session_timeout_ms = session_timeout_ms;
+    request->server_id = server->getServerID();
+
+    request_info.request = request;
+    request_info.session_id = -1;
+
+    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)
+        {
+            if (response->getOpNum() != Coordination::OpNum::SessionID)
+                promise->set_exception(std::make_exception_ptr(Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Incorrect response of type {} instead of SessionID response", Coordination::toString(response->getOpNum()))));
+
+            auto session_id_response = dynamic_cast<const Coordination::ZooKeeperSessionIDResponse &>(*response);
+            if (session_id_response.internal_id != internal_id)
+            {
+                promise->set_exception(std::make_exception_ptr(Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Incorrect response with internal id {} instead of {}", session_id_response.internal_id, internal_id)));
+            }
+
+            if (response->error != Coordination::Error::ZOK)
+                promise->set_exception(std::make_exception_ptr(zkutil::KeeperException("SessionID request failed with error", response->error)));
+
+            promise->set_value(session_id_response.session_id);
+        };
+    }
+
+    {
+        std::lock_guard lock(push_request_mutex);
+        if (!requests_queue->tryPush(std::move(request_info), session_timeout_ms))
+            throw Exception("Cannot push session id request to queue within session timeout", ErrorCodes::TIMEOUT_EXCEEDED);
+    }
+
+    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);
+
+    return future.get();
+}
+
 }
diff --git a/src/Coordination/KeeperStorageDispatcher.h b/src/Coordination/KeeperStorageDispatcher.h
index 622b63be800..cc95de04ce9 100644
--- a/src/Coordination/KeeperStorageDispatcher.h
+++ b/src/Coordination/KeeperStorageDispatcher.h
@@ -32,24 +32,42 @@ private:
     using RequestsQueue = ConcurrentBoundedQueue<KeeperStorage::RequestForSession>;
     using SessionToResponseCallback = std::unordered_map<int64_t, ZooKeeperResponseCallback>;
 
-    RequestsQueue requests_queue{1};
+    /// Size depends on coordination settings
+    std::unique_ptr<RequestsQueue> requests_queue;
     ResponsesQueue responses_queue;
     SnapshotsQueue snapshots_queue{1};
 
     std::atomic<bool> shutdown_called{false};
 
     std::mutex session_to_response_callback_mutex;
+    /// These two maps looks similar, but serves different purposes.
+    /// The first map is subscription map for normal responses like
+    /// (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.
+    SessionToResponseCallback new_session_id_response_callback;
 
+    /// Reading and batching new requests from client handlers
     ThreadFromGlobalPool request_thread;
+    /// Pushing responses to clients client handlers
+    /// using session_id.
     ThreadFromGlobalPool responses_thread;
+    /// Cleaning old dead sessions
     ThreadFromGlobalPool session_cleaner_thread;
+    /// Dumping new snapshots to disk
     ThreadFromGlobalPool snapshot_thread;
 
+    /// RAFT wrapper. Most important class.
     std::unique_ptr<KeeperServer> server;
 
     Poco::Logger * log;
 
+    /// Counter for new session_id requests.
+    std::atomic<int64_t> internal_session_id_counter{0};
+
 private:
     void requestThread();
     void responseThread();
@@ -57,10 +75,18 @@ private:
     void snapshotThread();
     void setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response);
 
+    /// Add error responses for requests to responses queue.
+    /// Clears requests.
+    void addErrorResponses(const KeeperStorage::RequestsForSessions & requests_for_sessions, Coordination::Error error);
+
+    /// Forcefully wait for result and sets errors if something when wrong.
+    /// Clears both arguments
+    void forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions);
+
 public:
     KeeperStorageDispatcher();
 
-    void initialize(const Poco::Util::AbstractConfiguration & config);
+    void initialize(const Poco::Util::AbstractConfiguration & config, bool standalone_keeper);
 
     void shutdown();
 
@@ -78,10 +104,7 @@ public:
         return server->isLeaderAlive();
     }
 
-    int64_t getSessionID(long session_timeout_ms)
-    {
-        return server->getSessionID(session_timeout_ms);
-    }
+    int64_t getSessionID(int64_t session_timeout_ms);
 
     void registerSession(int64_t session_id, ZooKeeperResponseCallback callback);
     /// Call if we don't need any responses for this session no more (session was expired)
diff --git a/src/Coordination/SummingStateMachine.cpp b/src/Coordination/SummingStateMachine.cpp
index 0cb7a7da6c3..ae3d2b06d75 100644
--- a/src/Coordination/SummingStateMachine.cpp
+++ b/src/Coordination/SummingStateMachine.cpp
@@ -21,7 +21,7 @@ SummingStateMachine::SummingStateMachine()
 {
 }
 
-nuraft::ptr<nuraft::buffer> SummingStateMachine::commit(const size_t log_idx, nuraft::buffer & data)
+nuraft::ptr<nuraft::buffer> SummingStateMachine::commit(const uint64_t log_idx, nuraft::buffer & data)
 {
     int64_t value_to_add = deserializeValue(data);
 
@@ -84,7 +84,7 @@ void SummingStateMachine::createSnapshotInternal(nuraft::snapshot & s)
 
 void SummingStateMachine::save_logical_snp_obj(
     nuraft::snapshot & s,
-    size_t & obj_id,
+    uint64_t & obj_id,
     nuraft::buffer & data,
     bool /*is_first_obj*/,
     bool /*is_last_obj*/)
@@ -112,7 +112,7 @@ void SummingStateMachine::save_logical_snp_obj(
 int SummingStateMachine::read_logical_snp_obj(
     nuraft::snapshot & s,
     void* & /*user_snp_ctx*/,
-    size_t obj_id,
+    uint64_t obj_id,
     nuraft::ptr<nuraft::buffer> & data_out,
     bool & is_last_obj)
 {
@@ -142,7 +142,7 @@ int SummingStateMachine::read_logical_snp_obj(
     else
     {
         // Object ID > 0: second object, put actual value.
-        data_out = nuraft::buffer::alloc(sizeof(size_t));
+        data_out = nuraft::buffer::alloc(sizeof(uint64_t));
         nuraft::buffer_serializer bs(data_out);
         bs.put_u64(ctx->value);
         is_last_obj = true;
diff --git a/src/Coordination/SummingStateMachine.h b/src/Coordination/SummingStateMachine.h
index c8594ba7e8d..03572840739 100644
--- a/src/Coordination/SummingStateMachine.h
+++ b/src/Coordination/SummingStateMachine.h
@@ -15,13 +15,13 @@ class SummingStateMachine : public nuraft::state_machine
 public:
     SummingStateMachine();
 
-    nuraft::ptr<nuraft::buffer> pre_commit(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
+    nuraft::ptr<nuraft::buffer> pre_commit(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
 
-    nuraft::ptr<nuraft::buffer> commit(const size_t log_idx, nuraft::buffer & data) override;
+    nuraft::ptr<nuraft::buffer> commit(const uint64_t log_idx, nuraft::buffer & data) override;
 
-    void rollback(const size_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
+    void rollback(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
 
-    size_t last_commit_index() override { return last_committed_idx; }
+    uint64_t last_commit_index() override { return last_committed_idx; }
 
     bool apply_snapshot(nuraft::snapshot & s) override;
 
@@ -33,7 +33,7 @@ public:
 
     void save_logical_snp_obj(
         nuraft::snapshot & s,
-        size_t & obj_id,
+        uint64_t & obj_id,
         nuraft::buffer & data,
         bool is_first_obj,
         bool is_last_obj) override;
@@ -41,7 +41,7 @@ public:
     int read_logical_snp_obj(
         nuraft::snapshot & s,
         void* & user_snp_ctx,
-        size_t obj_id,
+        uint64_t obj_id,
         nuraft::ptr<nuraft::buffer> & data_out,
         bool & is_last_obj) override;
 
diff --git a/src/Coordination/tests/gtest_for_build.cpp b/src/Coordination/tests/gtest_for_build.cpp
index 06e60e5592f..9a744d2bbed 100644
--- a/src/Coordination/tests/gtest_for_build.cpp
+++ b/src/Coordination/tests/gtest_for_build.cpp
@@ -64,7 +64,7 @@ TEST(CoordinationTest, BufferSerde)
 {
     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Get);
     request->xid = 3;
-    dynamic_cast<Coordination::ZooKeeperGetRequest *>(request.get())->path = "/path/value";
+    dynamic_cast<Coordination::ZooKeeperGetRequest &>(*request).path = "/path/value";
 
     DB::WriteBufferFromNuraftBuffer wbuf;
     request->write(wbuf);
@@ -90,7 +90,7 @@ TEST(CoordinationTest, BufferSerde)
 
     EXPECT_EQ(request_read->getOpNum(), Coordination::OpNum::Get);
     EXPECT_EQ(request_read->xid, 3);
-    EXPECT_EQ(dynamic_cast<Coordination::ZooKeeperGetRequest *>(request_read.get())->path, "/path/value");
+    EXPECT_EQ(dynamic_cast<Coordination::ZooKeeperGetRequest &>(*request_read).path, "/path/value");
 }
 
 template <typename StateMachine>
@@ -211,6 +211,8 @@ TEST(CoordinationTest, ChangelogTestSimple)
     changelog.init(1, 0);
     auto entry = getLogEntry("hello world", 77);
     changelog.append(entry);
+    changelog.end_of_append_batch(0, 0);
+
     EXPECT_EQ(changelog.next_slot(), 2);
     EXPECT_EQ(changelog.start_index(), 1);
     EXPECT_EQ(changelog.last_entry()->get_term(), 77);
@@ -225,6 +227,7 @@ TEST(CoordinationTest, ChangelogTestFile)
     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"));
     for (const auto & p : fs::directory_iterator("./logs"))
         EXPECT_EQ(p.path(), "./logs/changelog_1_5.bin");
@@ -234,6 +237,7 @@ TEST(CoordinationTest, ChangelogTestFile)
     changelog.append(entry);
     changelog.append(entry);
     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"));
@@ -249,6 +253,8 @@ TEST(CoordinationTest, ChangelogReadWrite)
         auto entry = getLogEntry("hello world", i * 10);
         changelog.append(entry);
     }
+    changelog.end_of_append_batch(0, 0);
+
     EXPECT_EQ(changelog.size(), 10);
     DB::KeeperLogStore changelog_reader("./logs", 1000, true);
     changelog_reader.init(1, 0);
@@ -276,10 +282,14 @@ TEST(CoordinationTest, ChangelogWriteAt)
         auto entry = getLogEntry("hello world", i * 10);
         changelog.append(entry);
     }
+
+    changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 10);
 
     auto entry = getLogEntry("writer", 77);
     changelog.write_at(7, entry);
+    changelog.end_of_append_batch(0, 0);
+
     EXPECT_EQ(changelog.size(), 7);
     EXPECT_EQ(changelog.last_entry()->get_term(), 77);
     EXPECT_EQ(changelog.entry_at(7)->get_term(), 77);
@@ -305,6 +315,7 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
         auto entry = getLogEntry("hello world", i * 10);
         changelog.append(entry);
     }
+    changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 7);
     EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
@@ -319,6 +330,7 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
         auto entry = getLogEntry("hello world", i * 10);
         changelog_reader.append(entry);
     }
+    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"));
@@ -331,6 +343,7 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
 
     auto entry = getLogEntry("someentry", 77);
     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"));
@@ -354,6 +367,7 @@ TEST(CoordinationTest, ChangelogTestCompaction)
         auto entry = getLogEntry("hello world", i * 10);
         changelog.append(entry);
     }
+    changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 3);
 
@@ -373,6 +387,7 @@ TEST(CoordinationTest, ChangelogTestCompaction)
     changelog.append(e3);
     auto e4 = getLogEntry("hello world", 60);
     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"));
@@ -405,6 +420,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperations)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
         changelog.append(entry);
     }
+    changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 10);
 
@@ -420,6 +436,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperations)
     EXPECT_EQ(apply_changelog.size(), 10);
 
     apply_changelog.apply_pack(8, *entries);
+    apply_changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(apply_changelog.size(), 12);
     EXPECT_EQ(apply_changelog.start_index(), 1);
@@ -447,6 +464,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
         changelog.append(entry);
     }
+    changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 10);
 
@@ -458,6 +476,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
     EXPECT_EQ(changelog_new.size(), 0);
 
     changelog_new.apply_pack(5, *entries);
+    changelog_new.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog_new.size(), 5);
     EXPECT_EQ(changelog_new.start_index(), 5);
@@ -468,6 +487,8 @@ TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
 
     auto e = getLogEntry("hello_world", 110);
     changelog_new.append(e);
+    changelog_new.end_of_append_batch(0, 0);
+
     EXPECT_EQ(changelog_new.size(), 6);
     EXPECT_EQ(changelog_new.start_index(), 5);
     EXPECT_EQ(changelog_new.next_slot(), 11);
@@ -488,6 +509,7 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
         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"));
@@ -501,6 +523,7 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
 
     auto e1 = getLogEntry("helloworld", 5555);
     changelog.write_at(7, e1);
+    changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 7);
     EXPECT_EQ(changelog.start_index(), 1);
     EXPECT_EQ(changelog.next_slot(), 8);
@@ -534,6 +557,7 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
         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"));
@@ -547,6 +571,7 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
 
     auto e1 = getLogEntry("helloworld", 5555);
     changelog.write_at(11, e1);
+    changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 11);
     EXPECT_EQ(changelog.start_index(), 1);
     EXPECT_EQ(changelog.next_slot(), 12);
@@ -580,6 +605,7 @@ TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
         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"));
@@ -593,6 +619,7 @@ TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
 
     auto e1 = getLogEntry("helloworld", 5555);
     changelog.write_at(1, e1);
+    changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 1);
     EXPECT_EQ(changelog.start_index(), 1);
     EXPECT_EQ(changelog.next_slot(), 2);
@@ -619,6 +646,7 @@ TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
         changelog.append(entry);
     }
+    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"));
@@ -635,6 +663,7 @@ TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
 
     auto entry = getLogEntry("36_hello_world", 360);
     changelog_reader.append(entry);
+    changelog_reader.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog_reader.size(), 36);
     EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
@@ -660,6 +689,7 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", i * 10);
         changelog.append(entry);
     }
+    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"));
@@ -674,6 +704,7 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
 
     DB::KeeperLogStore changelog_reader("./logs", 5, true);
     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);
@@ -689,6 +720,7 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
 
     auto entry = getLogEntry("h", 7777);
     changelog_reader.append(entry);
+    changelog_reader.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog_reader.size(), 11);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 7777);
 
@@ -719,6 +751,7 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", (i + 44) * 10);
         changelog.append(entry);
     }
+    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"));
@@ -735,6 +768,7 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
     EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin"));
     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.last_entry()->get_term(), 7777);
 
@@ -757,6 +791,7 @@ TEST(CoordinationTest, ChangelogTestLostFiles)
         auto entry = getLogEntry(std::to_string(i) + "_hello_world", (i + 44) * 10);
         changelog.append(entry);
     }
+    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"));
@@ -876,7 +911,7 @@ TEST(CoordinationTest, TestStorageSnapshotSimple)
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
 
-    DB::KeeperStorage storage(500);
+    DB::KeeperStorage storage(500, "");
     addNode(storage, "/hello", "world", 1);
     addNode(storage, "/hello/somepath", "somedata", 3);
     storage.session_id_counter = 5;
@@ -923,7 +958,7 @@ TEST(CoordinationTest, TestStorageSnapshotMoreWrites)
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
 
-    DB::KeeperStorage storage(500);
+    DB::KeeperStorage storage(500, "");
     storage.getSessionID(130);
 
     for (size_t i = 0; i < 50; ++i)
@@ -963,7 +998,7 @@ TEST(CoordinationTest, TestStorageSnapshotManySnapshots)
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
 
-    DB::KeeperStorage storage(500);
+    DB::KeeperStorage storage(500, "");
     storage.getSessionID(130);
 
     for (size_t j = 1; j <= 5; ++j)
@@ -1000,7 +1035,7 @@ TEST(CoordinationTest, TestStorageSnapshotMode)
 {
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
-    DB::KeeperStorage storage(500);
+    DB::KeeperStorage storage(500, "");
     for (size_t i = 0; i < 50; ++i)
     {
         addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
@@ -1051,7 +1086,7 @@ TEST(CoordinationTest, TestStorageSnapshotBroken)
 {
     ChangelogDirTest test("./snapshots");
     DB::KeeperSnapshotManager manager("./snapshots", 3);
-    DB::KeeperStorage storage(500);
+    DB::KeeperStorage storage(500, "");
     for (size_t i = 0; i < 50; ++i)
     {
         addNode(storage, "/hello_" + std::to_string(i), "world_" + std::to_string(i));
@@ -1085,7 +1120,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, size_t total_logs)
+void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs)
 {
     using namespace Coordination;
     using namespace DB;
@@ -1105,6 +1140,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, size
         request->path = "/hello_" + std::to_string(i);
         auto entry = getLogEntryFromZKRequest(0, 1, request);
         changelog.append(entry);
+        changelog.end_of_append_batch(0, 0);
 
         state_machine->commit(i, changelog.entry_at(i)->get_buf());
         bool snapshot_created = false;
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index 8b2f20f0af5..29088cbf1b5 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -2,11 +2,11 @@
 
 #include <cmath>
 #include <limits>
-#include "Defines.h"
-#include "Types.h"
+#include <common/DecomposedFloat.h>
+#include <Core/Defines.h>
+#include <Core/Types.h>
 #include <common/extended_types.h>
 #include <Common/NaNUtils.h>
-#include <Common/UInt128.h>
 
 /** Preceptually-correct number comparisons.
   * Example: Int8(-1) != UInt8(255)
@@ -15,494 +15,142 @@
 namespace accurate
 {
 
-using DB::UInt64;
+using namespace DB;
 
-/** Cases:
-    1) Safe conversion (in case of default C++ operators)
-        a) int vs any int
-        b) uint vs any uint
-        c) float vs any float
-    2) int vs uint
-        a) sizeof(int) <= sizeof(uint). Accurate comparison with MAX_INT tresholds
-        b) sizeof(int)  > sizeof(uint). Casting to int
-    3) integral_type vs floating_type
-        a) sizeof(integral_type) <= 4. Comparison via casting arguments to Float64
-        b) sizeof(integral_type) == 8. Accurate comparison. Consider 3 sets of intervals:
-            1) interval between adjacent floats less or equal 1
-            2) interval between adjacent floats greater then 2
-            3) float is outside [MIN_INT64; MAX_INT64]
-*/
 
-// Case 1. Is pair of floats or pair of ints or pair of uints
 template <typename A, typename B>
-constexpr bool is_safe_conversion = (std::is_floating_point_v<A> && std::is_floating_point_v<B>)
-    || (is_integer_v<A> && is_integer_v<B> && !(is_signed_v<A> ^ is_signed_v<B>));
+bool lessOp(A a, B b)
+{
+    if constexpr (std::is_same_v<A, B>)
+        return a < b;
+
+    /// float vs float
+    if constexpr (std::is_floating_point_v<A> && std::is_floating_point_v<B>)
+        return a < b;
+
+    /// anything vs NaN
+    if (isNaN(a) || isNaN(b))
+        return false;
+
+    /// int vs int
+    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    {
+        /// same signedness
+        if constexpr (is_signed_v<A> == is_signed_v<B>)
+            return a < b;
+
+        /// different signedness
+
+        if constexpr (is_signed_v<A> && !is_signed_v<B>)
+            return a < 0 || static_cast<make_unsigned_t<A>>(a) < b;
+
+        if constexpr (!is_signed_v<A> && is_signed_v<B>)
+            return b >= 0 && a < static_cast<make_unsigned_t<B>>(b);
+    }
+
+    /// int vs float
+    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    {
+        if constexpr (sizeof(A) <= 4)
+            return static_cast<double>(a) < static_cast<double>(b);
+
+        return DecomposedFloat<B>(b).greater(a);
+    }
+
+    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    {
+        if constexpr (sizeof(B) <= 4)
+            return static_cast<double>(a) < static_cast<double>(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>);
+    __builtin_unreachable();
+}
+
 template <typename A, typename B>
-using bool_if_safe_conversion = std::enable_if_t<is_safe_conversion<A, B>, bool>;
+bool greaterOp(A a, B b)
+{
+    return lessOp(b, a);
+}
+
 template <typename A, typename B>
-using bool_if_not_safe_conversion = std::enable_if_t<!is_safe_conversion<A, B>, bool>;
-
-
-/// Case 2. Are params IntXX and UIntYY ?
-template <typename TInt, typename TUInt>
-constexpr bool is_any_int_vs_uint
-    = is_integer_v<TInt> && is_integer_v<TUInt> && is_signed_v<TInt> && is_unsigned_v<TUInt>;
-
-// Case 2a. Are params IntXX and UIntYY and sizeof(IntXX) >= sizeof(UIntYY) (in such case will use accurate compare)
-template <typename TInt, typename TUInt>
-constexpr bool is_le_int_vs_uint = is_any_int_vs_uint<TInt, TUInt> && (sizeof(TInt) <= sizeof(TUInt));
-
-static_assert(is_le_int_vs_uint<Int128, DB::UInt128>);
-static_assert(is_le_int_vs_uint<Int128, DB::UInt256>);
-
-template <typename TInt, typename TUInt>
-using bool_if_le_int_vs_uint_t = std::enable_if_t<is_le_int_vs_uint<TInt, TUInt>, bool>;
-
-template <typename TInt, typename TUInt>
-inline bool_if_le_int_vs_uint_t<TInt, TUInt> greaterOpTmpl(TInt a, TUInt b)
+bool greaterOrEqualsOp(A a, B b)
 {
-    return static_cast<TUInt>(a) > b && a >= 0 && b <= static_cast<TUInt>(std::numeric_limits<TInt>::max());
+    if (isNaN(a) || isNaN(b))
+        return false;
+
+    return !lessOp(a, b);
 }
 
-template <typename TUInt, typename TInt>
-inline bool_if_le_int_vs_uint_t<TInt, TUInt> greaterOpTmpl(TUInt a, TInt b)
+template <typename A, typename B>
+bool lessOrEqualsOp(A a, B b)
 {
-    return a > static_cast<TUInt>(b) || b < 0 || a > static_cast<TUInt>(std::numeric_limits<TInt>::max());
+    if (isNaN(a) || isNaN(b))
+        return false;
+
+    return !lessOp(b, a);
 }
 
-template <typename TInt, typename TUInt>
-inline bool_if_le_int_vs_uint_t<TInt, TUInt> equalsOpTmpl(TInt a, TUInt b)
+template <typename A, typename B>
+bool equalsOp(A a, B b)
 {
-    return static_cast<TUInt>(a) == b && a >= 0 && b <= static_cast<TUInt>(std::numeric_limits<TInt>::max());
-}
+    if constexpr (std::is_same_v<A, B>)
+        return a == b;
 
-template <typename TUInt, typename TInt>
-inline bool_if_le_int_vs_uint_t<TInt, TUInt> equalsOpTmpl(TUInt a, TInt b)
-{
-    return a == static_cast<TUInt>(b) && b >= 0 && a <= static_cast<TUInt>(std::numeric_limits<TInt>::max());
-}
+    /// float vs float
+    if constexpr (std::is_floating_point_v<A> && std::is_floating_point_v<B>)
+        return a == b;
 
+    /// anything vs NaN
+    if (isNaN(a) || isNaN(b))
+        return false;
 
-// Case 2b. Are params IntXX and UIntYY and sizeof(IntXX) > sizeof(UIntYY) (in such case will cast UIntYY to IntXX and compare)
-template <typename TInt, typename TUInt>
-constexpr bool is_gt_int_vs_uint = is_any_int_vs_uint<TInt, TUInt> && (sizeof(TInt) > sizeof(TUInt));
+    /// int vs int
+    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    {
+        /// same signedness
+        if constexpr (is_signed_v<A> == is_signed_v<B>)
+            return a == b;
 
-template <typename TInt, typename TUInt>
-using bool_if_gt_int_vs_uint = std::enable_if_t<is_gt_int_vs_uint<TInt, TUInt>, bool>;
+        /// different signedness
 
-template <typename TInt, typename TUInt>
-inline bool_if_gt_int_vs_uint<TInt, TUInt> greaterOpTmpl(TInt a, TUInt b)
-{
-    return static_cast<TInt>(a) > static_cast<TInt>(b);
-}
+        if constexpr (is_signed_v<A> && !is_signed_v<B>)
+            return a >= 0 && static_cast<make_unsigned_t<A>>(a) == b;
 
-template <typename TInt, typename TUInt>
-inline bool_if_gt_int_vs_uint<TInt, TUInt> greaterOpTmpl(TUInt a, TInt b)
-{
-    using CastA = std::conditional_t<is_big_int_v<TInt> && std::is_same_v<TUInt, DB::UInt128>, DB::UInt256, TInt>;
+        if constexpr (!is_signed_v<A> && is_signed_v<B>)
+            return b >= 0 && a == static_cast<make_unsigned_t<B>>(b);
+    }
 
-    return static_cast<CastA>(a) > b;
-}
+    /// int vs float
+    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    {
+        if constexpr (sizeof(A) <= 4)
+            return static_cast<double>(a) == static_cast<double>(b);
 
-template <typename TInt, typename TUInt>
-inline bool_if_gt_int_vs_uint<TInt, TUInt> equalsOpTmpl(TInt a, TUInt b)
-{
-    return static_cast<TInt>(a) == static_cast<TInt>(b);
-}
+        return DecomposedFloat<B>(b).equals(a);
+    }
 
-template <typename TInt, typename TUInt>
-inline bool_if_gt_int_vs_uint<TInt, TUInt> equalsOpTmpl(TUInt a, TInt b)
-{
-    return static_cast<TInt>(a) == static_cast<TInt>(b);
-}
+    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    {
+        if constexpr (sizeof(B) <= 4)
+            return static_cast<double>(a) == static_cast<double>(b);
 
+        return DecomposedFloat<A>(a).equals(b);
+    }
 
-// Case 3a. Comparison via conversion to double.
-template <typename TAInt, typename TAFloat>
-using bool_if_double_can_be_used
-    = std::enable_if_t<is_integer_v<TAInt> && (sizeof(TAInt) <= 4) && std::is_floating_point_v<TAFloat>, bool>;
-
-template <typename TAInt, typename TAFloat>
-inline bool_if_double_can_be_used<TAInt, TAFloat> greaterOpTmpl(TAInt a, TAFloat b)
-{
-    return static_cast<double>(a) > static_cast<double>(b);
-}
-
-template <typename TAInt, typename TAFloat>
-inline bool_if_double_can_be_used<TAInt, TAFloat> greaterOpTmpl(TAFloat a, TAInt b)
-{
-    return static_cast<double>(a) > static_cast<double>(b);
-}
-
-template <typename TAInt, typename TAFloat>
-inline bool_if_double_can_be_used<TAInt, TAFloat> equalsOpTmpl(TAInt a, TAFloat b)
-{
-    return static_cast<double>(a) == static_cast<double>(b);
-}
-
-template <typename TAInt, typename TAFloat>
-inline bool_if_double_can_be_used<TAInt, TAFloat> equalsOpTmpl(TAFloat a, TAInt b)
-{
-    return static_cast<double>(a) == static_cast<double>(b);
-}
-
-// Big integers vs Float (not equal in any case for now, until big floats are introduced?)
-template <typename TABigInt, typename TAFloat>
-constexpr bool if_big_int_vs_float = (is_big_int_v<TABigInt> && std::is_floating_point_v<TAFloat>);
-
-template <typename TABigInt, typename TAFloat>
-using bool_if_big_int_vs_float = std::enable_if_t<if_big_int_vs_float<TABigInt, TAFloat>, bool>;
-
-template <typename TABigInt, typename TAFloat>
-inline bool_if_big_int_vs_float<TABigInt, TAFloat> greaterOpTmpl(TAFloat, TABigInt)
-{
+    /// e.g comparing UUID with integer.
     return false;
 }
 
-template <typename TABigInt, typename TAFloat>
-inline bool_if_big_int_vs_float<TABigInt, TAFloat> greaterOpTmpl(TABigInt, TAFloat)
-{
-    return false;
-}
-
-template <typename TABigInt, typename TAFloat>
-inline bool_if_big_int_vs_float<TABigInt, TAFloat> equalsOpTmpl(TAFloat, TABigInt)
-{
-    return false;
-}
-
-template <typename TABigInt, typename TAFloat>
-inline bool_if_big_int_vs_float<TABigInt, TAFloat> equalsOpTmpl(TABigInt, TAFloat)
-{
-    return false;
-}
-
-/* Final realiztions */
-
-
 template <typename A, typename B>
-inline bool_if_not_safe_conversion<A, B> greaterOp(A a, B b)
-{
-    return greaterOpTmpl(a, b);
-}
-
-template <typename A, typename B>
-inline bool_if_safe_conversion<A, B> greaterOp(A a, B b)
-{
-    using CastA1 = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, UInt8>, uint8_t, A>;
-    using CastB1 = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, UInt8>, uint8_t, B>;
-
-    using CastA = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, DB::UInt128>, B, CastA1>;
-    using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
-
-    if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return static_cast<CastA>(a) > static_cast<CastB>(b);
-    else
-        return a > b;
-}
-
-// Case 3b. 64-bit integers vs floats comparison.
-// See hint at https://github.com/JuliaLang/julia/issues/257 (but it doesn't work properly for -2**63)
-
-constexpr DB::Int64 MAX_INT64_WITH_EXACT_FLOAT64_REPR = 9007199254740992LL; // 2^53
-
-template <>
-inline bool greaterOp<DB::Float64, DB::Int64>(DB::Float64 f, DB::Int64 i)
-{
-    if (-MAX_INT64_WITH_EXACT_FLOAT64_REPR <= i && i <= MAX_INT64_WITH_EXACT_FLOAT64_REPR)
-        return f > static_cast<DB::Float64>(i);
-
-    return (f >= static_cast<DB::Float64>(std::numeric_limits<DB::Int64>::max())) // rhs is 2**63 (not 2^63 - 1)
-            || (f > static_cast<DB::Float64>(std::numeric_limits<DB::Int64>::min()) && static_cast<DB::Int64>(f) > i);
-}
-
-template <>
-inline bool greaterOp<DB::Int64, DB::Float64>(DB::Int64 i, DB::Float64 f)
-{
-    if (-MAX_INT64_WITH_EXACT_FLOAT64_REPR <= i && i <= MAX_INT64_WITH_EXACT_FLOAT64_REPR)
-        return f < static_cast<DB::Float64>(i);
-
-    return (f < static_cast<DB::Float64>(std::numeric_limits<DB::Int64>::min()))
-            || (f < static_cast<DB::Float64>(std::numeric_limits<DB::Int64>::max()) && i > static_cast<DB::Int64>(f));
-}
-
-template <>
-inline bool greaterOp<DB::Float64, DB::UInt64>(DB::Float64 f, DB::UInt64 u)
-{
-    if (u <= static_cast<DB::UInt64>(MAX_INT64_WITH_EXACT_FLOAT64_REPR))
-        return f > static_cast<DB::Float64>(u);
-
-    return (f >= static_cast<DB::Float64>(std::numeric_limits<DB::UInt64>::max()))
-            || (f >= 0 && static_cast<DB::UInt64>(f) > u);
-}
-
-template <>
-inline bool greaterOp<DB::UInt64, DB::Float64>(DB::UInt64 u, DB::Float64 f)
-{
-    if (u <= static_cast<DB::UInt64>(MAX_INT64_WITH_EXACT_FLOAT64_REPR))
-        return static_cast<DB::Float64>(u) > f;
-
-    return (f < 0)
-            || (f < static_cast<DB::Float64>(std::numeric_limits<DB::UInt64>::max()) && u > static_cast<UInt64>(f));
-}
-
-// Case 3b for float32
-template <>
-inline bool greaterOp<DB::Float32, DB::Int64>(DB::Float32 f, DB::Int64 i)
-{
-    return greaterOp(static_cast<DB::Float64>(f), i);
-}
-
-template <>
-inline bool greaterOp<DB::Int64, DB::Float32>(DB::Int64 i, DB::Float32 f)
-{
-    return greaterOp(i, static_cast<DB::Float64>(f));
-}
-
-template <>
-inline bool greaterOp<DB::Float32, DB::UInt64>(DB::Float32 f, DB::UInt64 u)
-{
-    return greaterOp(static_cast<DB::Float64>(f), u);
-}
-
-template <>
-inline bool greaterOp<DB::UInt64, DB::Float32>(DB::UInt64 u, DB::Float32 f)
-{
-    return greaterOp(u, static_cast<DB::Float64>(f));
-}
-
-template <>
-inline bool greaterOp<DB::Float64, DB::UInt128>(DB::Float64 f, DB::UInt128 u)
-{
-    return u.low == 0 && greaterOp(f, u.high);
-}
-
-template <>
-inline bool greaterOp<DB::UInt128, DB::Float64>(DB::UInt128 u, DB::Float64 f)
-{
-    return u.low != 0 || greaterOp(u.high, f);
-}
-
-template <>
-inline bool greaterOp<DB::Float32, DB::UInt128>(DB::Float32 f, DB::UInt128 u)
-{
-    return greaterOp(static_cast<DB::Float64>(f), u);
-}
-
-template <>
-inline bool greaterOp<DB::UInt128, DB::Float32>(DB::UInt128 u, DB::Float32 f)
-{
-    return greaterOp(u, static_cast<DB::Float64>(f));
-}
-
-template <typename A, typename B>
-inline bool_if_not_safe_conversion<A, B> equalsOp(A a, B b)
-{
-    return equalsOpTmpl(a, b);
-}
-
-template <typename A, typename B>
-inline bool_if_safe_conversion<A, B> equalsOp(A a, B b)
-{
-    using LargestType = std::conditional_t<(sizeof(A) > sizeof(B)) || ((sizeof(A) == sizeof(B)) && !std::is_same_v<A, DB::UInt128>), A, B>;
-
-    return static_cast<LargestType>(a) == static_cast<LargestType>(b);
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float64, DB::UInt64>(DB::Float64 f, DB::UInt64 u)
-{
-    return static_cast<DB::UInt64>(f) == u && f == static_cast<DB::Float64>(u);
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::UInt64, DB::Float64>(DB::UInt64 u, DB::Float64 f)
-{
-    return u == static_cast<DB::UInt64>(f) && static_cast<DB::Float64>(u) == f;
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float64, DB::Int64>(DB::Float64 f, DB::Int64 u)
-{
-    return static_cast<DB::Int64>(f) == u && f == static_cast<DB::Float64>(u);
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Int64, DB::Float64>(DB::Int64 u, DB::Float64 f)
-{
-    return u == static_cast<DB::Int64>(f) && static_cast<DB::Float64>(u) == f;
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float32, DB::UInt64>(DB::Float32 f, DB::UInt64 u)
-{
-    return static_cast<DB::UInt64>(f) == u && f == static_cast<DB::Float32>(u);
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::UInt64, DB::Float32>(DB::UInt64 u, DB::Float32 f)
-{
-    return u == static_cast<DB::UInt64>(f) && static_cast<DB::Float32>(u) == f;
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Float32, DB::Int64>(DB::Float32 f, DB::Int64 u)
-{
-    return static_cast<DB::Int64>(f) == u && f == static_cast<DB::Float32>(u);
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::Int64, DB::Float32>(DB::Int64 u, DB::Float32 f)
-{
-    return u == static_cast<DB::Int64>(f) && static_cast<DB::Float32>(u) == f;
-}
-
-template <>
-inline bool NO_SANITIZE_UNDEFINED equalsOp<DB::UInt128, DB::Float64>(DB::UInt128 u, DB::Float64 f)
-{
-    return u.low == 0 && equalsOp(static_cast<UInt64>(u.high), f);
-}
-
-template <>
-inline bool equalsOp<DB::UInt128, DB::Float32>(DB::UInt128 u, DB::Float32 f)
-{
-    return equalsOp(u, static_cast<DB::Float64>(f));
-}
-
-template <>
-inline bool equalsOp<DB::Float64, DB::UInt128>(DB::Float64 f, DB::UInt128 u)
-{
-    return equalsOp(u, f);
-}
-
-template <>
-inline bool equalsOp<DB::Float32, DB::UInt128>(DB::Float32 f, DB::UInt128 u)
-{
-    return equalsOp(static_cast<DB::Float64>(f), u);
-}
-
-inline bool NO_SANITIZE_UNDEFINED greaterOp(DB::Int128 i, DB::Float64 f)
-{
-    static constexpr Int128 min_int128 = minInt128();
-    static constexpr Int128 max_int128 = maxInt128();
-
-    if (-MAX_INT64_WITH_EXACT_FLOAT64_REPR <= i && i <= MAX_INT64_WITH_EXACT_FLOAT64_REPR)
-        return static_cast<DB::Float64>(i) > f;
-
-    return (f < static_cast<DB::Float64>(min_int128))
-        || (f < static_cast<DB::Float64>(max_int128) && i > static_cast<DB::Int128>(f));
-}
-
-inline bool NO_SANITIZE_UNDEFINED greaterOp(DB::Float64 f, DB::Int128 i)
-{
-    static constexpr Int128 min_int128 = minInt128();
-    static constexpr Int128 max_int128 = maxInt128();
-
-    if (-MAX_INT64_WITH_EXACT_FLOAT64_REPR <= i && i <= MAX_INT64_WITH_EXACT_FLOAT64_REPR)
-        return f > static_cast<DB::Float64>(i);
-
-    return (f >= static_cast<DB::Float64>(max_int128))
-        || (f > static_cast<DB::Float64>(min_int128) && static_cast<DB::Int128>(f) > i);
-}
-
-inline bool greaterOp(DB::Int128 i, DB::Float32 f) { return greaterOp(i, static_cast<DB::Float64>(f)); }
-inline bool greaterOp(DB::Float32 f, DB::Int128 i) { return greaterOp(static_cast<DB::Float64>(f), i); }
-
-inline bool NO_SANITIZE_UNDEFINED equalsOp(DB::Int128 i, DB::Float64 f) { return i == static_cast<DB::Int128>(f) && static_cast<DB::Float64>(i) == f; }
-inline bool NO_SANITIZE_UNDEFINED equalsOp(DB::Int128 i, DB::Float32 f) { return i == static_cast<DB::Int128>(f) && static_cast<DB::Float32>(i) == f; }
-inline bool equalsOp(DB::Float64 f, DB::Int128 i) { return equalsOp(i, f); }
-inline bool equalsOp(DB::Float32 f, DB::Int128 i) { return equalsOp(i, f); }
-
-template <typename A, typename B>
-inline bool_if_not_safe_conversion<A, B> notEqualsOp(A a, B b)
+bool notEqualsOp(A a, B b)
 {
     return !equalsOp(a, b);
 }
 
-template <typename A, typename B>
-inline bool_if_safe_conversion<A, B> notEqualsOp(A a, B b)
-{
-    using CastA1 = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, UInt8>, uint8_t, A>;
-    using CastB1 = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, UInt8>, uint8_t, B>;
-
-    using CastA = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, DB::UInt128>, B, CastA1>;
-    using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
-
-    if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return static_cast<CastA>(a) != static_cast<CastB>(b);
-    else
-        return a != b;
-}
-
-
-template <typename A, typename B>
-inline bool_if_not_safe_conversion<A, B> lessOp(A a, B b)
-{
-    return greaterOp(b, a);
-}
-
-template <typename A, typename B>
-inline bool_if_safe_conversion<A, B> lessOp(A a, B b)
-{
-    using CastA1 = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, UInt8>, uint8_t, A>;
-    using CastB1 = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, UInt8>, uint8_t, B>;
-
-    using CastA = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, DB::UInt128>, B, CastA1>;
-    using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
-
-    if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return static_cast<CastA>(a) < static_cast<CastB>(b);
-    else
-        return a < b;
-}
-
-
-template <typename A, typename B>
-inline bool_if_not_safe_conversion<A, B> lessOrEqualsOp(A a, B b)
-{
-    if (isNaN(a) || isNaN(b))
-        return false;
-    return !greaterOp(a, b);
-}
-
-template <typename A, typename B>
-inline bool_if_safe_conversion<A, B> lessOrEqualsOp(A a, B b)
-{
-    using CastA1 = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, UInt8>, uint8_t, A>;
-    using CastB1 = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, UInt8>, uint8_t, B>;
-
-    using CastA = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, DB::UInt128>, B, CastA1>;
-    using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
-
-    if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return static_cast<CastA>(a) <= static_cast<CastB>(b);
-    else
-        return a <= b;
-}
-
-
-template <typename A, typename B>
-inline bool_if_not_safe_conversion<A, B> greaterOrEqualsOp(A a, B b)
-{
-    if (isNaN(a) || isNaN(b))
-        return false;
-    return !greaterOp(b, a);
-}
-
-template <typename A, typename B>
-inline bool_if_safe_conversion<A, B> greaterOrEqualsOp(A a, B b)
-{
-    using CastA1 = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, UInt8>, uint8_t, A>;
-    using CastB1 = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, UInt8>, uint8_t, B>;
-
-    using CastA = std::conditional_t<is_big_int_v<B> && std::is_same_v<A, DB::UInt128>, B, CastA1>;
-    using CastB = std::conditional_t<is_big_int_v<A> && std::is_same_v<B, DB::UInt128>, A, CastB1>;
-
-    if constexpr (is_big_int_v<A> || is_big_int_v<B>)
-        return static_cast<CastA>(a) >= static_cast<CastB>(b);
-    else
-        return a >= b;
-}
 
 /// Converts numeric to an equal numeric of other type.
 template <typename From, typename To>
@@ -537,8 +185,8 @@ inline bool NO_SANITIZE_UNDEFINED convertNumeric(From value, To & result)
         }
     }
 
-    if (accurate::greaterOp(value, std::numeric_limits<To>::max())
-        || accurate::greaterOp(std::numeric_limits<To>::lowest(), value))
+    if (greaterOp(value, std::numeric_limits<To>::max())
+        || lessOp(value, std::numeric_limits<To>::lowest()))
     {
         return false;
     }
diff --git a/src/Core/BaseSettings.h b/src/Core/BaseSettings.h
index b193fdd4c93..3b6cc61d1eb 100644
--- a/src/Core/BaseSettings.h
+++ b/src/Core/BaseSettings.h
@@ -2,7 +2,6 @@
 
 #include <Core/SettingsFields.h>
 #include <Common/SettingsChanges.h>
-#include <Common/FieldVisitors.h>
 #include <ext/range.h>
 #include <boost/blank.hpp>
 #include <unordered_map>
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index 0c9a470dc1d..2d57f49000d 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -369,6 +369,18 @@ void Block::setColumns(const Columns & columns)
 }
 
 
+void Block::setColumn(size_t position, ColumnWithTypeAndName && column)
+{
+    if (position >= data.size())
+        throw Exception(ErrorCodes::POSITION_OUT_OF_BOUND, "Position {} out of bound in Block::setColumn(), max position {}",
+                        position, toString(data.size()));
+
+    data[position].name = std::move(column.name);
+    data[position].type = std::move(column.type);
+    data[position].column = std::move(column.column);
+}
+
+
 Block Block::cloneWithColumns(MutableColumns && columns) const
 {
     Block res;
@@ -484,7 +496,7 @@ DataTypes Block::getDataTypes() const
 
 
 template <typename ReturnType>
-static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, const std::string & context_description)
+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]])
     {
@@ -515,7 +527,16 @@ static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, cons
         if (!actual.column || !expected.column)
             continue;
 
-        if (actual.column->getName() != expected.column->getName())
+        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);
 
@@ -537,13 +558,25 @@ static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, cons
 
 bool blocksHaveEqualStructure(const Block & lhs, const Block & rhs)
 {
-    return checkBlockStructure<bool>(lhs, rhs, {});
+    return checkBlockStructure<bool>(lhs, rhs, {}, false);
 }
 
 
 void assertBlocksHaveEqualStructure(const Block & lhs, const Block & rhs, const std::string & context_description)
 {
-    checkBlockStructure<void>(lhs, rhs, context_description);
+    checkBlockStructure<void>(lhs, rhs, context_description, false);
+}
+
+
+bool isCompatibleHeader(const Block & actual, const Block & desired)
+{
+    return checkBlockStructure<bool>(actual, desired, {}, true);
+}
+
+
+void assertCompatibleHeader(const Block & actual, const Block & desired, const std::string & context_description)
+{
+    checkBlockStructure<void>(actual, desired, context_description, true);
 }
 
 
diff --git a/src/Core/Block.h b/src/Core/Block.h
index 914d6b361b9..a21bd290571 100644
--- a/src/Core/Block.h
+++ b/src/Core/Block.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <vector>
-#include <list>
-#include <set>
-#include <map>
-#include <initializer_list>
-
 #include <Core/BlockInfo.h>
-#include <Core/NamesAndTypes.h>
 #include <Core/ColumnWithTypeAndName.h>
 #include <Core/ColumnsWithTypeAndName.h>
+#include <Core/NamesAndTypes.h>
+
+#include <initializer_list>
+#include <list>
+#include <map>
+#include <set>
+#include <vector>
 
 
 namespace DB
@@ -22,8 +22,6 @@ namespace DB
   * Allows to insert, remove columns in arbitrary position, to change order of columns.
   */
 
-class Context;
-
 class Block
 {
 private:
@@ -127,6 +125,7 @@ public:
 
     Columns getColumns() const;
     void setColumns(const Columns & columns);
+    void setColumn(size_t position, ColumnWithTypeAndName && column);
     Block cloneWithColumns(const Columns & columns) const;
     Block cloneWithoutColumns() const;
     Block cloneWithCutColumns(size_t start, size_t length) const;
@@ -186,6 +185,12 @@ bool blocksHaveEqualStructure(const Block & lhs, const Block & rhs);
 /// Throw exception when blocks are different.
 void assertBlocksHaveEqualStructure(const Block & lhs, const Block & rhs, const std::string & context_description);
 
+/// Actual header is compatible to desired if block have equal structure except constants.
+/// It is allowed when column from actual header is constant, but in desired is not.
+/// If both columns are constant, it is checked that they have the same value.
+bool isCompatibleHeader(const Block & actual, const Block & desired);
+void assertCompatibleHeader(const Block & actual, const Block & desired, const std::string & context_description);
+
 /// 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);
 
diff --git a/src/Core/BlockInfo.h b/src/Core/BlockInfo.h
index c8dd1576b22..125c90b1b23 100644
--- a/src/Core/BlockInfo.h
+++ b/src/Core/BlockInfo.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <unordered_map>
-
 #include <common/types.h>
 
+#include <unordered_map>
+#include <vector>
+
 
 namespace DB
 {
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
index 65172356645..a6176efc7f3 100644
--- a/src/Core/CMakeLists.txt
+++ b/src/Core/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif ()
diff --git a/src/Core/DecimalComparison.h b/src/Core/DecimalComparison.h
index 486c2c1f8f4..5b017cd4634 100644
--- a/src/Core/DecimalComparison.h
+++ b/src/Core/DecimalComparison.h
@@ -36,10 +36,13 @@ inline bool allowDecimalComparison(const DataTypePtr & left_type, const DataType
     return false;
 }
 
-template <size_t > struct ConstructDecInt { using Type = Int32; };
+template <size_t> struct ConstructDecInt;
+template <> struct ConstructDecInt<1> { using Type = Int32; };
+template <> struct ConstructDecInt<2> { using Type = Int32; };
+template <> struct ConstructDecInt<4> { using Type = Int32; };
 template <> struct ConstructDecInt<8> { using Type = Int64; };
 template <> struct ConstructDecInt<16> { using Type = Int128; };
-template <> struct ConstructDecInt<48> { using Type = Int256; };
+template <> struct ConstructDecInt<32> { using Type = Int256; };
 
 template <typename T, typename U>
 struct DecCompareInt
@@ -249,7 +252,7 @@ private:
                 overflow |= common::mulOverflow(y, scale, y);
 
             if (overflow)
-                throw Exception("Can't compare", ErrorCodes::DECIMAL_OVERFLOW);
+                throw Exception("Can't compare decimal number due to overflow", ErrorCodes::DECIMAL_OVERFLOW);
         }
         else
         {
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index 2cd50ab8d08..0e399210088 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -103,7 +103,10 @@ inline DecimalType decimalFromComponentsWithMultiplier(
     if (common::mulOverflow(whole, scale_multiplier, whole_scaled))
         throw Exception("Decimal math overflow", ErrorCodes::DECIMAL_OVERFLOW);
 
-    const T value = whole_scaled + fractional_sign * (fractional % scale_multiplier);
+    T value;
+    if (common::addOverflow(whole_scaled, fractional_sign * (fractional % scale_multiplier), value))
+        throw Exception("Decimal math overflow", ErrorCodes::DECIMAL_OVERFLOW);
+
     return DecimalType(value);
 }
 
@@ -273,9 +276,7 @@ template <typename To, typename DecimalType>
 To convertTo(const DecimalType & decimal, size_t scale)
 {
     To result;
-
     convertToImpl<To, DecimalType, void>(decimal, scale, result);
-
     return result;
 }
 
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index 468c1187e91..94df16758bf 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -74,6 +74,9 @@
 /// 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
 
@@ -81,8 +84,9 @@
 #define DBMS_MIN_REVISION_WITH_REFERER_IN_CLIENT_INFO 54447
 
 /// Version of ClickHouse TCP protocol. Increment it manually when you change the protocol.
-#define DBMS_TCP_PROTOCOL_VERSION 54447
+#define DBMS_TCP_PROTOCOL_VERSION 54448
 
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH 54448
 /// The boundary on which the blocks for asynchronous file operations should be aligned.
 #define DEFAULT_AIO_FILE_BLOCK_SIZE 4096
 
@@ -94,6 +98,8 @@
 
 #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.
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index afc9fe00ef5..87945dd1ce6 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -31,11 +31,11 @@ namespace ErrorCodes
 }
 
 
-ExternalTableDataPtr BaseExternalTable::getData(const Context & context)
+ExternalTableDataPtr BaseExternalTable::getData(ContextPtr context)
 {
     initReadBuffer();
     initSampleBlock();
-    auto input = context.getInputFormat(format, *read_buffer, sample_block, DEFAULT_BLOCK_SIZE);
+    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>();
@@ -127,7 +127,7 @@ ExternalTable::ExternalTable(const boost::program_options::variables_map & exter
 
 void ExternalTablesHandler::handlePart(const Poco::Net::MessageHeader & header, ReadBuffer & stream)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
 
     if (settings.http_max_multipart_form_data_size)
         read_buffer = std::make_unique<LimitReadBuffer>(
@@ -152,14 +152,14 @@ void ExternalTablesHandler::handlePart(const Poco::Net::MessageHeader & header,
     else
         throw Exception("Neither structure nor types have not been provided for external table " + name + ". Use fields " + name + "_structure or " + name + "_types to do so.", ErrorCodes::BAD_ARGUMENTS);
 
-    ExternalTableDataPtr data = getData(context);
+    ExternalTableDataPtr data = getData(getContext());
 
     /// Create table
     NamesAndTypesList columns = sample_block.getNamesAndTypesList();
-    auto temporary_table = TemporaryTableHolder(context, ColumnsDescription{columns}, {});
+    auto temporary_table = TemporaryTableHolder(getContext(), ColumnsDescription{columns}, {});
     auto storage = temporary_table.getTable();
-    context.addExternalTable(data->table_name, std::move(temporary_table));
-    BlockOutputStreamPtr output = storage->write(ASTPtr(), storage->getInMemoryMetadataPtr(), context);
+    getContext()->addExternalTable(data->table_name, std::move(temporary_table));
+    BlockOutputStreamPtr output = storage->write(ASTPtr(), storage->getInMemoryMetadataPtr(), getContext());
 
     /// Write data
     data->pipe->resize(1);
diff --git a/src/Core/ExternalTable.h b/src/Core/ExternalTable.h
index aa15846d48a..f682bf9b27f 100644
--- a/src/Core/ExternalTable.h
+++ b/src/Core/ExternalTable.h
@@ -2,6 +2,7 @@
 
 #include <Client/Connection.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <IO/ReadBuffer.h>
 #include <Server/HTTP/HTMLForm.h>
 
@@ -11,30 +12,21 @@
 #include <vector>
 
 
-namespace Poco
+namespace Poco::Net
 {
-    namespace Net
-    {
-        class NameValueCollection;
-        class MessageHeader;
-    }
+class NameValueCollection;
+class MessageHeader;
 }
 
-namespace boost
+namespace boost::program_options
 {
-    namespace program_options
-    {
-        class variables_map;
-    }
+class variables_map;
 }
 
 
 namespace DB
 {
 
-class Context;
-
-
 /// The base class containing the basic information about external table and
 /// basic functions for extracting this information from text fields.
 class BaseExternalTable
@@ -56,7 +48,7 @@ public:
     virtual void initReadBuffer() {}
 
     /// Get the table data - a pair (a stream with the contents of the table, the name of the table)
-    ExternalTableDataPtr getData(const Context & context);
+    ExternalTableDataPtr getData(ContextPtr context);
 
 protected:
     /// Clear all accumulated information
@@ -88,15 +80,14 @@ public:
 /// Parsing of external table used when sending tables via http
 /// The `handlePart` function will be called for each table passed,
 /// so it's also necessary to call `clean` at the end of the `handlePart`.
-class ExternalTablesHandler : public HTMLForm::PartHandler, BaseExternalTable
+class ExternalTablesHandler : public HTMLForm::PartHandler, BaseExternalTable, WithMutableContext
 {
 public:
-    ExternalTablesHandler(Context & context_, const Poco::Net::NameValueCollection & params_) : context(context_), params(params_) {}
+    ExternalTablesHandler(ContextMutablePtr context_, const Poco::Net::NameValueCollection & params_) : WithMutableContext(context_), params(params_) {}
 
     void handlePart(const Poco::Net::MessageHeader & header, ReadBuffer & stream) override;
 
 private:
-    Context & context;
     const Poco::Net::NameValueCollection & params;
 };
 
diff --git a/src/Core/Field.cpp b/src/Core/Field.cpp
index 8aa79b0bbe1..9dec8563d36 100644
--- a/src/Core/Field.cpp
+++ b/src/Core/Field.cpp
@@ -238,6 +238,13 @@ Field Field::restoreFromDump(const std::string_view & dump_)
         return value;
     }
 
+    prefix = std::string_view{"UInt128_"};
+    if (dump.starts_with(prefix))
+    {
+        UInt128 value = parseFromString<UInt128>(dump.substr(prefix.length()));
+        return value;
+    }
+
     prefix = std::string_view{"Int256_"};
     if (dump.starts_with(prefix))
     {
@@ -295,15 +302,6 @@ Field Field::restoreFromDump(const std::string_view & dump_)
         return decimal;
     }
 
-    prefix = std::string_view{"UUID_"};
-    if (dump.starts_with(prefix))
-    {
-        UUID uuid;
-        ReadBufferFromString buf{dump.substr(prefix.length())};
-        readQuoted(uuid, buf);
-        return uuid;
-    }
-
     if (dump.starts_with("\'"))
     {
         String str;
@@ -410,45 +408,45 @@ Field Field::restoreFromDump(const std::string_view & dump_)
 
 
 template <typename T>
-static bool decEqual(T x, T y, UInt32 x_scale, UInt32 y_scale)
+bool decimalEqual(T x, T y, UInt32 x_scale, UInt32 y_scale)
 {
     using Comparator = DecimalComparison<T, T, EqualsOp>;
     return Comparator::compare(x, y, x_scale, y_scale);
 }
 
 template <typename T>
-static bool decLess(T x, T y, UInt32 x_scale, UInt32 y_scale)
+bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale)
 {
     using Comparator = DecimalComparison<T, T, LessOp>;
     return Comparator::compare(x, y, x_scale, y_scale);
 }
 
 template <typename T>
-static bool decLessOrEqual(T x, T y, UInt32 x_scale, UInt32 y_scale)
+bool decimalLessOrEqual(T x, T y, UInt32 x_scale, UInt32 y_scale)
 {
     using Comparator = DecimalComparison<T, T, LessOrEqualsOp>;
     return Comparator::compare(x, y, x_scale, y_scale);
 }
 
-template <> bool decimalEqual(Decimal32 x, Decimal32 y, UInt32 x_scale, UInt32 y_scale) { return decEqual(x, y, x_scale, y_scale); }
-template <> bool decimalLess(Decimal32 x, Decimal32 y, UInt32 x_scale, UInt32 y_scale) { return decLess(x, y, x_scale, y_scale); }
-template <> bool decimalLessOrEqual(Decimal32 x, Decimal32 y, UInt32 x_scale, UInt32 y_scale) { return decLessOrEqual(x, y, x_scale, y_scale); }
 
-template <> bool decimalEqual(Decimal64 x, Decimal64 y, UInt32 x_scale, UInt32 y_scale) { return decEqual(x, y, x_scale, y_scale); }
-template <> bool decimalLess(Decimal64 x, Decimal64 y, UInt32 x_scale, UInt32 y_scale) { return decLess(x, y, x_scale, y_scale); }
-template <> bool decimalLessOrEqual(Decimal64 x, Decimal64 y, UInt32 x_scale, UInt32 y_scale) { return decLessOrEqual(x, y, x_scale, y_scale); }
+template bool decimalEqual<Decimal32>(Decimal32 x, Decimal32 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalEqual<Decimal64>(Decimal64 x, Decimal64 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalEqual<Decimal128>(Decimal128 x, Decimal128 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalEqual<Decimal256>(Decimal256 x, Decimal256 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalEqual<DateTime64>(DateTime64 x, DateTime64 y, UInt32 x_scale, UInt32 y_scale);
 
-template <> bool decimalEqual(Decimal128 x, Decimal128 y, UInt32 x_scale, UInt32 y_scale) { return decEqual(x, y, x_scale, y_scale); }
-template <> bool decimalLess(Decimal128 x, Decimal128 y, UInt32 x_scale, UInt32 y_scale) { return decLess(x, y, x_scale, y_scale); }
-template <> bool decimalLessOrEqual(Decimal128 x, Decimal128 y, UInt32 x_scale, UInt32 y_scale) { return decLessOrEqual(x, y, x_scale, y_scale); }
+template bool decimalLess<Decimal32>(Decimal32 x, Decimal32 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLess<Decimal64>(Decimal64 x, Decimal64 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLess<Decimal128>(Decimal128 x, Decimal128 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLess<Decimal256>(Decimal256 x, Decimal256 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLess<DateTime64>(DateTime64 x, DateTime64 y, UInt32 x_scale, UInt32 y_scale);
 
-template <> bool decimalEqual(Decimal256 x, Decimal256 y, UInt32 x_scale, UInt32 y_scale) { return decEqual(x, y, x_scale, y_scale); }
-template <> bool decimalLess(Decimal256 x, Decimal256 y, UInt32 x_scale, UInt32 y_scale) { return decLess(x, y, x_scale, y_scale); }
-template <> bool decimalLessOrEqual(Decimal256 x, Decimal256 y, UInt32 x_scale, UInt32 y_scale) { return decLessOrEqual(x, y, x_scale, y_scale); }
+template bool decimalLessOrEqual<Decimal32>(Decimal32 x, Decimal32 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLessOrEqual<Decimal64>(Decimal64 x, Decimal64 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLessOrEqual<Decimal128>(Decimal128 x, Decimal128 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLessOrEqual<Decimal256>(Decimal256 x, Decimal256 y, UInt32 x_scale, UInt32 y_scale);
+template bool decimalLessOrEqual<DateTime64>(DateTime64 x, DateTime64 y, UInt32 x_scale, UInt32 y_scale);
 
-template <> bool decimalEqual(DateTime64 x, DateTime64 y, UInt32 x_scale, UInt32 y_scale) { return decEqual(x, y, x_scale, y_scale); }
-template <> bool decimalLess(DateTime64 x, DateTime64 y, UInt32 x_scale, UInt32 y_scale) { return decLess(x, y, x_scale, y_scale); }
-template <> bool decimalLessOrEqual(DateTime64 x, DateTime64 y, UInt32 x_scale, UInt32 y_scale) { return decLessOrEqual(x, y, x_scale, y_scale); }
 
 inline void writeText(const Null &, WriteBuffer & buf)
 {
diff --git a/src/Core/Field.h b/src/Core/Field.h
index 77549854982..9c970fbbb31 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -7,7 +7,6 @@
 #include <functional>
 
 #include <Common/Exception.h>
-#include <Common/UInt128.h>
 #include <Common/AllocatorWithMemoryTracking.h>
 #include <Core/Types.h>
 #include <Core/Defines.h>
@@ -96,7 +95,7 @@ template <typename T> bool decimalEqual(T x, T y, UInt32 x_scale, UInt32 y_scale
 template <typename T> bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale);
 template <typename T> bool decimalLessOrEqual(T x, T y, UInt32 x_scale, UInt32 y_scale);
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -159,7 +158,7 @@ private:
     T dec;
     UInt32 scale;
 };
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
@@ -177,8 +176,7 @@ template <> struct NearestFieldTypeImpl<UInt16> { using Type = UInt64; };
 template <> struct NearestFieldTypeImpl<UInt32> { using Type = UInt64; };
 
 template <> struct NearestFieldTypeImpl<DayNum> { using Type = UInt64; };
-template <> struct NearestFieldTypeImpl<UInt128> { using Type = UInt128; };
-template <> struct NearestFieldTypeImpl<UUID> { using Type = UInt128; };
+template <> struct NearestFieldTypeImpl<UUID> { using Type = UUID; };
 template <> struct NearestFieldTypeImpl<Int16> { using Type = Int64; };
 template <> struct NearestFieldTypeImpl<Int32> { using Type = Int64; };
 
@@ -191,8 +189,9 @@ template <> struct NearestFieldTypeImpl<unsigned long long> { using Type = UInt6
 
 template <> struct NearestFieldTypeImpl<UInt256> { using Type = UInt256; };
 template <> struct NearestFieldTypeImpl<Int256> { using Type = Int256; };
-
+template <> struct NearestFieldTypeImpl<UInt128> { using Type = UInt128; };
 template <> struct NearestFieldTypeImpl<Int128> { using Type = Int128; };
+
 template <> struct NearestFieldTypeImpl<Decimal32> { using Type = DecimalField<Decimal32>; };
 template <> struct NearestFieldTypeImpl<Decimal64> { using Type = DecimalField<Decimal64>; };
 template <> struct NearestFieldTypeImpl<Decimal128> { using Type = DecimalField<Decimal128>; };
@@ -235,7 +234,7 @@ struct NearestFieldTypeImpl<T, std::enable_if_t<std::is_enum_v<T>>>
   *  but somewhat more efficient, and simpler.
   *
   * Used to represent a single value of one of several types in memory.
-  * Warning! Prefer to use chunks of columns instead of single values. See Column.h
+  * Warning! Prefer to use chunks of columns instead of single values. See IColumn.h
   */
 class Field
 {
@@ -252,8 +251,6 @@ public:
             UInt128 = 4,
             Int128  = 5,
 
-            /// Non-POD types.
-
             String  = 16,
             Array   = 17,
             Tuple   = 18,
@@ -265,10 +262,9 @@ public:
             UInt256 = 24,
             Int256  = 25,
             Map = 26,
+            UUID = 27,
         };
 
-        static const int MIN_NON_POD = 16;
-
         static const char * toString(Which which)
         {
             switch (which)
@@ -276,8 +272,11 @@ public:
                 case Null:    return "Null";
                 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";
@@ -288,8 +287,6 @@ public:
                 case Decimal128: return "Decimal128";
                 case Decimal256: return "Decimal256";
                 case AggregateFunctionState: return "AggregateFunctionState";
-                case UInt256: return "UInt256";
-                case Int256:  return "Int256";
             }
 
             throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
@@ -303,14 +300,19 @@ public:
 
     static bool IsDecimal(Types::Which which)
     {
-        return (which >= Types::Decimal32 && which <= Types::Decimal128) || which == Types::Decimal256;
+        return which == Types::Decimal32
+            || which == Types::Decimal64
+            || which == Types::Decimal128
+            || which == Types::Decimal256;
     }
 
     /// 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_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>;
 
-    Field()
+    Field() //-V730
         : which(Types::Null)
     {
     }
@@ -382,10 +384,10 @@ public:
     enable_if_not_field_or_stringlike_t<T, Field> &
     operator=(T && rhs);
 
-    Field & operator =(const std::string_view & str);
-    Field & operator =(const String & str) { return *this = std::string_view{str}; }
-    Field & operator =(String && str);
-    Field & operator =(const char * str) { return *this = std::string_view{str}; }
+    Field & operator= (const std::string_view & str);
+    Field & operator= (const String & str) { return *this = std::string_view{str}; }
+    Field & operator= (String && str);
+    Field & operator= (const char * str) { return *this = std::string_view{str}; }
 
     ~Field()
     {
@@ -454,8 +456,11 @@ public:
             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>();
             case Types::Int64:   return get<Int64>()   < rhs.get<Int64>();
             case Types::Int128:  return get<Int128>()  < rhs.get<Int128>();
+            case Types::Int256:  return get<Int256>()  < rhs.get<Int256>();
+            case Types::UUID:    return get<UUID>()    < rhs.get<UUID>();
             case Types::Float64: return get<Float64>() < rhs.get<Float64>();
             case Types::String:  return get<String>()  < rhs.get<String>();
             case Types::Array:   return get<Array>()   < rhs.get<Array>();
@@ -466,8 +471,6 @@ public:
             case Types::Decimal128: return get<DecimalField<Decimal128>>() < rhs.get<DecimalField<Decimal128>>();
             case Types::Decimal256: return get<DecimalField<Decimal256>>() < rhs.get<DecimalField<Decimal256>>();
             case Types::AggregateFunctionState:  return get<AggregateFunctionStateData>() < rhs.get<AggregateFunctionStateData>();
-            case Types::UInt256: return get<UInt256>() < rhs.get<UInt256>();
-            case Types::Int256: return get<Int256>() < rhs.get<Int256>();
         }
 
         throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
@@ -490,8 +493,11 @@ public:
             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>();
             case Types::Int64:   return get<Int64>()   <= rhs.get<Int64>();
             case Types::Int128:  return get<Int128>()  <= rhs.get<Int128>();
+            case Types::Int256:  return get<Int256>()  <= rhs.get<Int256>();
+            case Types::UUID:    return get<UUID>().toUnderType() <= rhs.get<UUID>().toUnderType();
             case Types::Float64: return get<Float64>() <= rhs.get<Float64>();
             case Types::String:  return get<String>()  <= rhs.get<String>();
             case Types::Array:   return get<Array>()   <= rhs.get<Array>();
@@ -502,8 +508,6 @@ public:
             case Types::Decimal128: return get<DecimalField<Decimal128>>() <= rhs.get<DecimalField<Decimal128>>();
             case Types::Decimal256: return get<DecimalField<Decimal256>>() <= rhs.get<DecimalField<Decimal256>>();
             case Types::AggregateFunctionState:  return get<AggregateFunctionStateData>() <= rhs.get<AggregateFunctionStateData>();
-            case Types::UInt256: return get<UInt256>() <= rhs.get<UInt256>();
-            case Types::Int256: return get<Int256>() <= rhs.get<Int256>();
         }
 
         throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
@@ -531,19 +535,20 @@ public:
                 // Compare as UInt64 so that NaNs compare as equal.
                 return reinterpret<UInt64>() == rhs.reinterpret<UInt64>();
             }
+            case Types::UUID:    return get<UUID>()    == rhs.get<UUID>();
             case Types::String:  return get<String>()  == rhs.get<String>();
             case Types::Array:   return get<Array>()   == rhs.get<Array>();
             case Types::Tuple:   return get<Tuple>()   == rhs.get<Tuple>();
             case Types::Map:     return get<Map>()     == rhs.get<Map>();
             case Types::UInt128: return get<UInt128>() == rhs.get<UInt128>();
+            case Types::UInt256: return get<UInt256>() == rhs.get<UInt256>();
             case Types::Int128:  return get<Int128>()  == rhs.get<Int128>();
+            case Types::Int256:  return get<Int256>()  == rhs.get<Int256>();
             case Types::Decimal32:  return get<DecimalField<Decimal32>>()  == rhs.get<DecimalField<Decimal32>>();
             case Types::Decimal64:  return get<DecimalField<Decimal64>>()  == rhs.get<DecimalField<Decimal64>>();
             case Types::Decimal128: return get<DecimalField<Decimal128>>() == rhs.get<DecimalField<Decimal128>>();
             case Types::Decimal256: return get<DecimalField<Decimal256>>() == rhs.get<DecimalField<Decimal256>>();
             case Types::AggregateFunctionState:  return get<AggregateFunctionStateData>() == rhs.get<AggregateFunctionStateData>();
-            case Types::UInt256: return get<UInt256>() == rhs.get<UInt256>();
-            case Types::Int256:  return get<Int256>()  == rhs.get<Int256>();
         }
 
         throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
@@ -563,13 +568,17 @@ public:
         {
             case Types::Null:    return f(field.template get<Null>());
 // gcc 8.2.1
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
             case Types::UInt64:  return f(field.template get<UInt64>());
             case Types::UInt128: return f(field.template get<UInt128>());
+            case Types::UInt256: return f(field.template get<UInt256>());
             case Types::Int64:   return f(field.template get<Int64>());
+            case Types::Int128:  return f(field.template get<Int128>());
+            case Types::Int256:  return f(field.template get<Int256>());
+            case Types::UUID:    return f(field.template get<UUID>());
             case Types::Float64: return f(field.template get<Float64>());
             case Types::String:  return f(field.template get<String>());
             case Types::Array:   return f(field.template get<Array>());
@@ -580,19 +589,12 @@ public:
             case Types::Decimal128: return f(field.template get<DecimalField<Decimal128>>());
             case Types::Decimal256: return f(field.template get<DecimalField<Decimal256>>());
             case Types::AggregateFunctionState: return f(field.template get<AggregateFunctionStateData>());
-            case Types::Int128: return f(field.template get<Int128>());
-            case Types::UInt256: return f(field.template get<UInt256>());
-            case Types::Int256: return f(field.template get<Int256>());
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
         }
 
-        // GCC 9 complains that control reaches the end, despite that we handle
-        // all the cases above (maybe because of throw?). Return something to
-        // silence it.
-        Null null{};
-        return f(null);
+        __builtin_unreachable();
     }
 
     String dump() const;
@@ -600,10 +602,9 @@ public:
 
 private:
     std::aligned_union_t<DBMS_MIN_FIELD_SIZE - sizeof(Types::Which),
-        Null, UInt64, UInt128, Int64, Int128, Float64, String, Array, Tuple, Map,
+        Null, UInt64, UInt128, UInt256, Int64, Int128, Int256, UUID, Float64, String, Array, Tuple, Map,
         DecimalField<Decimal32>, DecimalField<Decimal64>, DecimalField<Decimal128>, DecimalField<Decimal256>,
-        AggregateFunctionStateData,
-        UInt256, Int256
+        AggregateFunctionStateData
         > storage;
 
     Types::Which which;
@@ -685,9 +686,6 @@ private:
 
     ALWAYS_INLINE void destroy()
     {
-        if (which < Types::MIN_NON_POD)
-            return;
-
         switch (which)
         {
             case Types::String:
@@ -723,11 +721,17 @@ private:
 #undef DBMS_MIN_FIELD_SIZE
 
 
+using Row = std::vector<Field>;
+
+
 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; };
 template <> struct Field::TypeToEnum<Int64>   { static const Types::Which value = Types::Int64; };
 template <> struct Field::TypeToEnum<Int128>  { static const Types::Which value = Types::Int128; };
+template <> struct Field::TypeToEnum<Int256>  { static const Types::Which value = Types::Int256; };
+template <> struct Field::TypeToEnum<UUID>    { static const Types::Which value = Types::UUID; };
 template <> struct Field::TypeToEnum<Float64> { static const Types::Which value = Types::Float64; };
 template <> struct Field::TypeToEnum<String>  { static const Types::Which value = Types::String; };
 template <> struct Field::TypeToEnum<Array>   { static const Types::Which value = Types::Array; };
@@ -739,14 +743,15 @@ template <> struct Field::TypeToEnum<DecimalField<Decimal128>>{ static const Typ
 template <> struct Field::TypeToEnum<DecimalField<Decimal256>>{ static const Types::Which value = Types::Decimal256; };
 template <> struct Field::TypeToEnum<DecimalField<DateTime64>>{ static const Types::Which value = Types::Decimal64; };
 template <> struct Field::TypeToEnum<AggregateFunctionStateData>{ static const Types::Which value = Types::AggregateFunctionState; };
-template <> struct Field::TypeToEnum<UInt256> { static const Types::Which value = Types::UInt256; };
-template <> struct Field::TypeToEnum<Int256> { static const Types::Which value = Types::Int256; };
 
 template <> struct Field::EnumToType<Field::Types::Null>    { using Type = Null; };
 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; };
 template <> struct Field::EnumToType<Field::Types::Int64>   { using Type = Int64; };
 template <> struct Field::EnumToType<Field::Types::Int128>  { using Type = Int128; };
+template <> struct Field::EnumToType<Field::Types::Int256>  { using Type = Int256; };
+template <> struct Field::EnumToType<Field::Types::UUID>    { using Type = UUID; };
 template <> struct Field::EnumToType<Field::Types::Float64> { using Type = Float64; };
 template <> struct Field::EnumToType<Field::Types::String>  { using Type = String; };
 template <> struct Field::EnumToType<Field::Types::Array>   { using Type = Array; };
@@ -757,10 +762,8 @@ template <> struct Field::EnumToType<Field::Types::Decimal64> { using Type = Dec
 template <> struct Field::EnumToType<Field::Types::Decimal128> { using Type = DecimalField<Decimal128>; };
 template <> struct Field::EnumToType<Field::Types::Decimal256> { using Type = DecimalField<Decimal256>; };
 template <> struct Field::EnumToType<Field::Types::AggregateFunctionState> { using Type = DecimalField<AggregateFunctionStateData>; };
-template <> struct Field::EnumToType<Field::Types::UInt256> { using Type = UInt256; };
-template <> struct Field::EnumToType<Field::Types::Int256>  { using Type = Int256; };
 
-inline constexpr bool isInt64FieldType(Field::Types::Which t)
+inline constexpr bool isInt64OrUInt64FieldType(Field::Types::Which t)
 {
     return t == Field::Types::Int64
         || t == Field::Types::UInt64;
@@ -782,7 +785,7 @@ NearestFieldType<std::decay_t<T>> & Field::get()
     // Disregard signedness when converting between int64 types.
     constexpr Field::Types::Which target = TypeToEnum<StoredType>::value;
     if (target != which
-           && (!isInt64FieldType(target) || !isInt64FieldType(which)))
+           && (!isInt64OrUInt64FieldType(target) || !isInt64OrUInt64FieldType(which)))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid Field get from type {} to type {}", Types::toString(which), Types::toString(target));
 #endif
 
@@ -834,11 +837,11 @@ 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 <> struct TypeName<Array> { static std::string get() { return "Array"; } };
-template <> struct TypeName<Tuple> { static std::string get() { return "Tuple"; } };
-template <> struct TypeName<Map>   { static std::string get() { return "Map"; } };
-template <> struct TypeName<AggregateFunctionStateData> { static std::string get() { return "AggregateFunctionState"; } };
 
 template <typename T>
 decltype(auto) castToNearestFieldType(T && x)
@@ -851,7 +854,7 @@ decltype(auto) castToNearestFieldType(T && x)
 }
 
 template <typename T>
-Field::Field(T && rhs, enable_if_not_field_or_stringlike_t<T>)
+Field::Field(T && rhs, enable_if_not_field_or_stringlike_t<T>) //-V730
 {
     auto && val = castToNearestFieldType(std::forward<T>(rhs));
     createConcrete(std::forward<decltype(val)>(val));
@@ -965,7 +968,7 @@ struct fmt::formatter<DB::Field>
 
         /// Only support {}.
         if (it != end && *it != '}')
-            throw format_error("invalid format");
+            throw format_error("Invalid format");
 
         return it;
     }
diff --git a/src/Core/MySQL/Authentication.cpp b/src/Core/MySQL/Authentication.cpp
index e685ad0394d..0258f9f94af 100644
--- a/src/Core/MySQL/Authentication.cpp
+++ b/src/Core/MySQL/Authentication.cpp
@@ -73,7 +73,7 @@ Native41::Native41(const String & password, const String & auth_plugin_data)
 }
 
 void Native41::authenticate(
-    const String & user_name, std::optional<String> auth_response, Context & context,
+    const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
     std::shared_ptr<PacketEndpoint> packet_endpoint, bool, const Poco::Net::SocketAddress & address)
 {
     if (!auth_response)
@@ -86,15 +86,17 @@ void Native41::authenticate(
 
     if (auth_response->empty())
     {
-        context.setUser(user_name, "", address);
+        context->setUser(user_name, "", address);
         return;
     }
 
     if (auth_response->size() != Poco::SHA1Engine::DIGEST_SIZE)
-        throw Exception("Wrong size of auth response. Expected: " + std::to_string(Poco::SHA1Engine::DIGEST_SIZE) + " bytes, received: " + std::to_string(auth_response->size()) + " bytes.",
-                        ErrorCodes::UNKNOWN_EXCEPTION);
+        throw Exception(
+            "Wrong size of auth response. Expected: " + std::to_string(Poco::SHA1Engine::DIGEST_SIZE)
+                + " bytes, received: " + std::to_string(auth_response->size()) + " bytes.",
+            ErrorCodes::UNKNOWN_EXCEPTION);
 
-    auto user = context.getAccessControlManager().read<User>(user_name);
+    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);
@@ -109,7 +111,7 @@ void Native41::authenticate(
     {
         password_sha1[i] = digest[i] ^ static_cast<unsigned char>((*auth_response)[i]);
     }
-    context.setUser(user_name, password_sha1, address);
+    context->setUser(user_name, password_sha1, address);
 }
 
 #if USE_SSL
@@ -134,7 +136,7 @@ Sha256Password::Sha256Password(RSA & public_key_, RSA & private_key_, Poco::Logg
 }
 
 void Sha256Password::authenticate(
-    const String & user_name, std::optional<String> auth_response, Context & context,
+    const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
     std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address)
 {
     if (!auth_response)
@@ -229,7 +231,7 @@ void Sha256Password::authenticate(
         password.pop_back();
     }
 
-    context.setUser(user_name, password, address);
+    context->setUser(user_name, password, address);
 }
 
 #endif
diff --git a/src/Core/MySQL/Authentication.h b/src/Core/MySQL/Authentication.h
index e1b7c174139..acbda2bdb58 100644
--- a/src/Core/MySQL/Authentication.h
+++ b/src/Core/MySQL/Authentication.h
@@ -32,7 +32,7 @@ public:
     virtual String getAuthPluginData() = 0;
 
     virtual void authenticate(
-        const String & user_name, std::optional<String> auth_response, Context & context,
+        const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address) = 0;
 };
 
@@ -49,7 +49,7 @@ public:
     String getAuthPluginData() override { return scramble; }
 
     void authenticate(
-        const String & user_name, std::optional<String> auth_response, Context & context,
+        const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool /* is_secure_connection */, const Poco::Net::SocketAddress & address) override;
 
 private:
@@ -69,7 +69,7 @@ public:
     String getAuthPluginData() override { return scramble; }
 
     void authenticate(
-        const String & user_name, std::optional<String> auth_response, Context & context,
+        const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address) override;
 
 private:
diff --git a/src/Core/MySQL/MySQLGtid.cpp b/src/Core/MySQL/MySQLGtid.cpp
index 13dc6e0fd69..a441bccb076 100644
--- a/src/Core/MySQL/MySQLGtid.cpp
+++ b/src/Core/MySQL/MySQLGtid.cpp
@@ -1,6 +1,7 @@
 #include "MySQLGtid.h"
-
 #include <boost/algorithm/string.hpp>
+#include <IO/ReadHelpers.h>
+
 
 namespace DB
 {
@@ -38,7 +39,7 @@ void GTIDSets::parse(const String gtid_format)
         boost::split(server_ids, gset, [](char c) { return c == ':'; });
 
         GTIDSet set;
-        set.uuid = stringToUUID(server_ids[0]);
+        set.uuid = DB::parse<UUID>(server_ids[0]);
 
         for (size_t k = 1; k < server_ids.size(); k++)
         {
@@ -174,8 +175,8 @@ String GTIDSets::toPayload() const
     for (const auto & set : sets)
     {
         // MySQL UUID is big-endian.
-        writeBinaryBigEndian(set.uuid.toUnderType().low, buffer);
-        writeBinaryBigEndian(set.uuid.toUnderType().high, buffer);
+        writeBinaryBigEndian(set.uuid.toUnderType().items[0], buffer);
+        writeBinaryBigEndian(set.uuid.toUnderType().items[1], buffer);
 
         UInt64 intervals_size = set.intervals.size();
         buffer.write(reinterpret_cast<const char *>(&intervals_size), 8);
diff --git a/src/Core/MySQL/MySQLReplication.cpp b/src/Core/MySQL/MySQLReplication.cpp
index 7e3f68983be..e326d5e5b32 100644
--- a/src/Core/MySQL/MySQLReplication.cpp
+++ b/src/Core/MySQL/MySQLReplication.cpp
@@ -474,19 +474,19 @@ namespace MySQLReplication
                     }
                     case MYSQL_TYPE_NEWDECIMAL:
                     {
-                        const auto & dispatch = [](const size_t & precision, const size_t & scale, const auto & function) -> Field
+                        const auto & dispatch = [](size_t precision, size_t scale, const auto & function) -> Field
                         {
                             if (precision <= DecimalUtils::max_precision<Decimal32>)
                                 return Field(function(precision, scale, Decimal32()));
-                            else if (precision <= DecimalUtils::max_precision<Decimal64>)
+                            else if (precision <= DecimalUtils::max_precision<Decimal64>) //-V547
                                 return Field(function(precision, scale, Decimal64()));
-                            else if (precision <= DecimalUtils::max_precision<Decimal128>)
+                            else if (precision <= DecimalUtils::max_precision<Decimal128>) //-V547
                                 return Field(function(precision, scale, Decimal128()));
 
                             return Field(function(precision, scale, Decimal256()));
                         };
 
-                        const auto & read_decimal = [&](const size_t & precision, const size_t & scale, auto decimal)
+                        const auto & read_decimal = [&](size_t precision, size_t scale, auto decimal)
                         {
                             using DecimalType = decltype(decimal);
                             static constexpr size_t digits_per_integer = 9;
@@ -543,7 +543,7 @@ namespace MySQLReplication
                                     UInt32 val = 0;
                                     size_t to_read = compressed_bytes_map[compressed_decimals];
 
-                                    if (to_read)
+                                    if (to_read) //-V547
                                     {
                                         readBigEndianStrict(payload, reinterpret_cast<char *>(&val), to_read);
                                         res *= intExp10OfSize<DecimalType>(compressed_decimals);
@@ -658,12 +658,13 @@ namespace MySQLReplication
         payload.readStrict(reinterpret_cast<char *>(&commit_flag), 1);
 
         // MySQL UUID is big-endian.
-        UInt64 high = 0UL, low = 0UL;
+        UInt64 high = 0UL;
+        UInt64 low = 0UL;
         readBigEndianStrict(payload, reinterpret_cast<char *>(&low), 8);
-        gtid.uuid.toUnderType().low = low;
+        gtid.uuid.toUnderType().items[0] = low;
 
         readBigEndianStrict(payload, reinterpret_cast<char *>(&high), 8);
-        gtid.uuid.toUnderType().high = high;
+        gtid.uuid.toUnderType().items[1] = high;
 
         payload.readStrict(reinterpret_cast<char *>(&gtid.seq_no), 8);
 
diff --git a/src/Core/MySQL/MySQLReplication.h b/src/Core/MySQL/MySQLReplication.h
index d415bdda70d..cd24979caaa 100644
--- a/src/Core/MySQL/MySQLReplication.h
+++ b/src/Core/MySQL/MySQLReplication.h
@@ -452,7 +452,7 @@ namespace MySQLReplication
         UInt32 number_columns;
         String schema;
         String table;
-        std::vector<Field> rows;
+        Row rows;
 
         RowsEvent(std::shared_ptr<TableMapEvent> table_map_, EventHeader && header_, const RowsEventHeader & rows_header)
             : EventBase(std::move(header_)), number_columns(0), table_map(table_map_)
diff --git a/src/Core/PostgreSQLProtocol.h b/src/Core/PostgreSQLProtocol.h
index 471811e969b..7c5800f5a8f 100644
--- a/src/Core/PostgreSQLProtocol.h
+++ b/src/Core/PostgreSQLProtocol.h
@@ -257,6 +257,7 @@ class FirstMessage : public FrontMessage
 {
 public:
     Int32 payload_size;
+
     FirstMessage() = delete;
     FirstMessage(int payload_size_) : payload_size(payload_size_) {}
 };
@@ -264,8 +265,9 @@ public:
 class CancelRequest : public FirstMessage
 {
 public:
-    Int32 process_id;
-    Int32 secret_key;
+    Int32 process_id = 0;
+    Int32 secret_key = 0;
+
     CancelRequest(int payload_size_) : FirstMessage(payload_size_) {}
 
     void deserialize(ReadBuffer & in) override
@@ -797,15 +799,15 @@ namespace PGAuthentication
 class AuthenticationMethod
 {
 protected:
-    void setPassword(
+    static void setPassword(
         const String & user_name,
         const String & password,
-        Context & context,
+        ContextMutablePtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address)
     {
         try {
-            context.setUser(user_name, password, address);
+            context->setUser(user_name, password, address);
         }
         catch (const Exception &)
         {
@@ -819,7 +821,7 @@ protected:
 public:
     virtual void authenticate(
         const String & user_name,
-        Context & context,
+        ContextMutablePtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address) = 0;
 
@@ -832,10 +834,13 @@ class NoPasswordAuth : public AuthenticationMethod
 {
 public:
     void authenticate(
-        const String & /* user_name */,
-        Context & /* context */,
-        Messaging::MessageTransport & /* mt */,
-        const Poco::Net::SocketAddress & /* address */) override {}
+        const String & user_name,
+        ContextMutablePtr context,
+        Messaging::MessageTransport & mt,
+        const Poco::Net::SocketAddress & address) override
+    {
+        setPassword(user_name, "", context, mt, address);
+    }
 
     Authentication::Type getType() const override
     {
@@ -848,7 +853,7 @@ class CleartextPasswordAuth : public AuthenticationMethod
 public:
     void authenticate(
         const String & user_name,
-        Context & context,
+        ContextMutablePtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address) override
     {
@@ -891,11 +896,11 @@ public:
 
     void authenticate(
         const String & user_name,
-        Context & context,
+        ContextMutablePtr context,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address)
     {
-        auto user = context.getAccessControlManager().read<User>(user_name);
+        auto user = context->getAccessControlManager().read<User>(user_name);
         Authentication::Type user_auth_type = user->authentication.getType();
 
         if (type_to_method.find(user_auth_type) != type_to_method.end())
diff --git a/src/Core/Protocol.h b/src/Core/Protocol.h
index df51a0cb61a..92e780104b5 100644
--- a/src/Core/Protocol.h
+++ b/src/Core/Protocol.h
@@ -76,8 +76,10 @@ namespace Protocol
             Log = 10,                 /// System logs of the query execution
             TableColumns = 11,        /// Columns' description for default values calculation
             PartUUIDs = 12,           /// List of unique parts ids.
-
-            MAX = PartUUIDs,
+            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,
         };
 
         /// NOTE: If the type of packet argument would be Enum, the comparison packet >= 0 && packet < 10
@@ -100,6 +102,7 @@ namespace Protocol
                 "Log",
                 "TableColumns",
                 "PartUUIDs",
+                "ReadTaskRequest"
             };
             return packet <= MAX
                 ? data[packet]
@@ -135,8 +138,9 @@ namespace Protocol
             KeepAlive = 6,           /// Keep the connection alive
             Scalar = 7,              /// A block of data (compressed or not).
             IgnoredPartUUIDs = 8,    /// List of unique parts ids to exclude from query processing
+            ReadTaskResponse = 9,     /// TODO:
 
-            MAX = IgnoredPartUUIDs,
+            MAX = ReadTaskResponse,
         };
 
         inline const char * toString(UInt64 packet)
@@ -151,6 +155,7 @@ namespace Protocol
                 "KeepAlive",
                 "Scalar",
                 "IgnoredPartUUIDs",
+                "ReadTaskResponse",
             };
             return packet <= MAX
                 ? data[packet]
diff --git a/src/Core/Row.h b/src/Core/Row.h
deleted file mode 100644
index 0dc105922ff..00000000000
--- a/src/Core/Row.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include <Common/AutoArray.h>
-#include <Core/Field.h>
-
-
-namespace DB
-{
-
-/** The data type for representing one row of the table in the RAM.
-  * Warning! It is preferable to store column blocks instead of single rows. See Block.h
-  */
-
-using Row = AutoArray<Field>;
-
-}
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 045433dc895..5833e040bc6 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -57,7 +57,7 @@ class IColumn;
     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(Bool, use_hedged_requests, true, "Use hedged requests for distributed queries", 0) \
+    M(Bool, use_hedged_requests, false, "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) \
     M(Milliseconds, connection_pool_max_wait_ms, 0, "The wait time when the connection pool is full.", 0) \
@@ -70,6 +70,7 @@ class IColumn;
     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_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(Bool, extremes, false, "Calculate minimums and maximums of the result columns. They can be output in JSON-formats.", IMPORTANT) \
@@ -78,10 +79,12 @@ class IColumn;
     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_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, 3, "Number of threads performing background fetches for replicated 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_schedule_pool_size, 16, "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) \
+    M(UInt64, max_replicated_fetches_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for replicated fetches. Zero means unlimited. Only has meaning at server startup.", 0) \
+    M(UInt64, max_replicated_sends_network_bandwidth_for_server, 0, "The maximum speed of data exchange over the network in bytes per second for replicated sends. Zero means unlimited. Only has meaning at server startup.", 0) \
     \
     M(Milliseconds, distributed_directory_monitor_sleep_time_ms, 100, "Sleep time for StorageDistributed DirectoryMonitors, in case of any errors delay grows exponentially.", 0) \
     M(Milliseconds, distributed_directory_monitor_max_sleep_time_ms, 30000, "Maximum sleep time for StorageDistributed DirectoryMonitors, it limits exponential growth too.", 0) \
@@ -100,10 +103,10 @@ class IColumn;
     M(Float, totals_auto_threshold, 0.5, "The threshold for totals_mode = 'auto'.", 0) \
     \
     M(Bool, allow_suspicious_low_cardinality_types, false, "In CREATE TABLE statement allows specifying LowCardinality modifier for types of small fixed size (8 or less). Enabling this may increase merge times and memory consumption.", 0) \
-    M(Bool, compile_expressions, false, "Compile some scalar functions and operators to native code.", 0) \
+    M(Bool, compile_expressions, true, "Compile some scalar functions and operators to native code.", 0) \
     M(UInt64, min_count_to_compile_expression, 3, "The number of identical expressions before they are JIT-compiled", 0) \
     M(UInt64, group_by_two_level_threshold, 100000, "From what number of keys, a two-level aggregation starts. 0 - the threshold is not set.", 0) \
-    M(UInt64, group_by_two_level_threshold_bytes, 100000000, "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(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) \
     \
@@ -114,10 +117,11 @@ class IColumn;
     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(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 query processing - in case it is for certain that there are different keys on different shards. If 2 - same as 1 but also apply ORDER BY and LIMIT stages", 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(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, 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) \
     M(Bool, allow_nondeterministic_optimize_skip_unused_shards, false, "Allow non-deterministic functions (includes dictGet) in sharding_key for optimize_skip_unused_shards", 0) \
     M(UInt64, force_optimize_skip_unused_shards, 0, "Throw an exception if unused shards cannot be skipped (1 - throw only if the table has the sharding key, 2 - always throw.", 0) \
     M(UInt64, optimize_skip_unused_shards_nesting, 0, "Same as optimize_skip_unused_shards, but accept nesting level until which it will work.", 0) \
@@ -141,7 +145,7 @@ class IColumn;
     M(UInt64, optimize_min_equality_disjunction_chain_length, 3, "The minimum length of the expression `expr = x1 OR ... expr = xN` for optimization ", 0) \
     \
     M(UInt64, min_bytes_to_use_direct_io, 0, "The minimum number of bytes for reading the data with O_DIRECT option during SELECT queries execution. 0 - disabled.", 0) \
-    M(UInt64, min_bytes_to_use_mmap_io, (64 * 1024 * 1024), "The minimum number of bytes for reading the data with mmap option during SELECT queries execution. 0 - disabled.", 0) \
+    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) \
@@ -223,12 +227,13 @@ class IColumn;
     /** Settings for testing hedged requests */ \
     M(Milliseconds, sleep_in_send_tables_status_ms, 0, "Time to sleep in sending tables status response in TCPHandler", 0) \
     M(Milliseconds, sleep_in_send_data_ms, 0, "Time to sleep in sending data in TCPHandler", 0) \
+    M(UInt64, unknown_packet_in_send_data, 0, "Send unknown packet instead of data Nth data packet", 0) \
     \
     M(Bool, insert_allow_materialized_columns, 0, "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) \
-    M(UInt64, http_max_uri_size, 16384, "Maximum URI length of HTTP request", 0) \
+    M(UInt64, http_max_uri_size, 1048576, "Maximum URI length of HTTP request", 0) \
     M(Bool, optimize_throw_if_noop, false, "If setting is enabled and OPTIMIZE query didn't actually assign a merge then an explanatory exception is thrown", 0) \
     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) \
@@ -251,8 +256,6 @@ class IColumn;
       * Almost all limits apply to each stream individually. \
       */ \
     \
-    M(UInt64, limit, 0, "Limit on read rows from the most 'end' result for select query, default 0 means no limit length", 0) \
-    M(UInt64, offset, 0, "Offset on read rows from the most 'end' result for select query", 0) \
     M(UInt64, max_rows_to_read, 0, "Limit on read rows from the most 'deep' sources. That is, only in the deepest subquery. When reading from a remote server, it is only checked on a remote server.", 0) \
     M(UInt64, max_bytes_to_read, 0, "Limit on read bytes (after decompression) from the most 'deep' sources. That is, only in the deepest subquery. When reading from a remote server, it is only checked on a remote server.", 0) \
     M(OverflowMode, read_overflow_mode, OverflowMode::THROW, "What to do when the limit is exceeded.", 0) \
@@ -370,7 +373,9 @@ class IColumn;
     M(Bool, allow_drop_detached, false, "Allow ALTER TABLE ... DROP DETACHED PART[ITION] ... queries", 0) \
     \
     M(UInt64, postgresql_connection_pool_size, 16, "Connection pool size for PostgreSQL table engine and database engine.", 0) \
-    M(Int64, postgresql_connection_pool_wait_timeout, -1, "Connection pool push/pop timeout on empty pool for PostgreSQL table engine and database engine. By default it will block on empty pool.", 0) \
+    M(UInt64, postgresql_connection_pool_wait_timeout, 5000, "Connection pool push/pop timeout on empty pool for PostgreSQL table engine and database engine. By default it will block on empty pool.", 0) \
+    M(UInt64, glob_expansion_max_elements, 1000, "Maximum number of allowed addresses (For external storages, table functions, etc).", 0) \
+    M(UInt64, odbc_bridge_connection_pool_size, 16, "Connection pool size for each connection settings string in ODBC bridge.", 0) \
     \
     M(Seconds, distributed_replica_error_half_life, DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_DECREASE_ERROR_PERIOD, "Time period reduces replica error counter by 2 times.", 0) \
     M(UInt64, distributed_replica_error_cap, DBMS_CONNECTION_POOL_WITH_FAILOVER_MAX_ERROR_COUNT, "Max number of errors per replica, prevents piling up an incredible amount of errors if replica was offline for some time and allows it to be reconsidered in a shorter amount of time.", 0) \
@@ -412,7 +417,6 @@ class IColumn;
     M(Bool, materialize_ttl_after_modify, true, "Apply TTL for old data, after ALTER MODIFY TTL query", 0) \
     M(String, function_implementation, "", "Choose function implementation for specific target or variant (experimental). If empty enable all of them.", 0) \
     M(Bool, allow_experimental_geo_types, false, "Allow geo data types such as Point, Ring, Polygon, MultiPolygon", 0) \
-    M(Bool, allow_experimental_bigint_types, false, "Allow Int128, Int256, UInt256 and Decimal256 types", 0) \
     M(Bool, data_type_default_nullable, false, "Data types without NULL or NOT NULL will make Nullable", 0) \
     M(Bool, cast_keep_nullable, false, "CAST operator keep Nullable for result data type", 0) \
     M(Bool, alter_partition_verbose_result, false, "Output information about affected parts. Currently works only for FREEZE and ATTACH commands.", 0) \
@@ -423,6 +427,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, 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) \
@@ -430,31 +435,55 @@ class IColumn;
     M(Bool, optimize_on_insert, true, "Do the same transformation for inserted block of data as if merge was done on this block.", 0) \
     M(Bool, allow_experimental_map_type, false, "Allow data type Map", 0) \
     M(Bool, allow_experimental_window_functions, false, "Allow experimental window functions", 0) \
+    M(Bool, allow_experimental_projection_optimization, false, "Enable projection optimization when processing SELECT queries", 0) \
+    M(Bool, force_optimize_projection, false, "If projection optimization is enabled, SELECT queries need to use projection", 0) \
     M(Bool, use_antlr_parser, false, "Parse incoming queries using ANTLR-generated experimental parser", 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, 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) \
-    M(Bool, allow_experimental_query_deduplication, false, "Allow sending parts' UUIDs for a query in order to deduplicate data parts if any", 0) \
+    \
+    /** Experimental feature for moving data between shards. */ \
+    \
+    M(Bool, allow_experimental_query_deduplication, false, "Experimental data deduplication for SELECT queries based on part UUIDs", 0) \
+    M(Bool, experimental_query_deduplication_send_all_part_uuids, false, "If false only part UUIDs for currently moving parts are sent. If true all read part UUIDs are sent (useful only for testing).", 0) \
+    \
     M(Bool, engine_file_empty_if_not_exists, false, "Allows to select data from a file engine table without file", 0) \
     M(Bool, engine_file_truncate_on_insert, false, "Enables or disables truncate before insert in file engine tables", 0) \
     M(Bool, allow_experimental_database_replicated, false, "Allow to create databases with Replicated engine", 0) \
     M(UInt64, database_replicated_initial_query_timeout_sec, 300, "How long initial DDL query should wait for Replicated database to precess previous DDL queue entries", 0) \
+    M(UInt64, max_distributed_depth, 5, "Maximum distributed query depth", 0) \
     M(Bool, database_replicated_always_detach_permanently, false, "Execute DETACH TABLE as DETACH TABLE PERMANENTLY if database engine is Replicated", 0) \
     M(DistributedDDLOutputMode, distributed_ddl_output_mode, DistributedDDLOutputMode::THROW, "Format of distributed DDL query result", 0) \
     M(UInt64, distributed_ddl_entry_format_version, 1, "Version of DDL entry to write into ZooKeeper", 0) \
-    \
-    /** Obsolete settings that do nothing but left for compatibility reasons. Remove each one after half a year of obsolescence. */ \
-    \
-    M(UInt64, max_memory_usage_for_all_queries, 0, "Obsolete. Will be removed after 2020-10-20", 0) \
-    M(UInt64, multiple_joins_rewriter_version, 0, "Obsolete setting, does nothing. Will be removed after 2021-03-31", 0) \
-    M(Bool, enable_debug_queries, false, "Enabled debug queries, but now is obsolete", 0) \
-    M(Bool, allow_experimental_database_atomic, true, "Obsolete setting, does nothing. Will be removed after 2021-02-12", 0) \
+    M(UInt64, external_storage_max_read_rows, 0, "Limit maximum number of rows when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializeMySQL. If equal to 0, this setting is disabled", 0) \
+    M(UInt64, external_storage_max_read_bytes, 0, "Limit maximum number of bytes when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializeMySQL. If equal to 0, this setting is disabled", 0)  \
     M(UnionMode, union_default_mode, UnionMode::Unspecified, "Set default Union Mode in SelectWithUnion query. Possible values: empty string, 'ALL', 'DISTINCT'. If empty, query without Union Mode will throw exception.", 0) \
     M(Bool, optimize_aggregators_of_group_by_keys, true, "Eliminates min/max/any/anyLast aggregators of GROUP BY keys in SELECT section", 0) \
     M(Bool, optimize_group_by_function_keys, true, "Eliminates functions of other keys in GROUP BY section", 0) \
+    \
+    M(Bool, query_plan_enable_optimizations, true, "Apply optimizations to query plan", 0) \
     M(UInt64, query_plan_max_optimizations_to_apply, 10000, "Limit the total number of optimizations applied to query plan. If zero, ignored. If limit reached, throw exception", 0) \
-    M(Bool, database_replicated_ddl_output, true, "Obsolete setting, does nothing. Will be removed after 2021-09-08", 0) \
+    M(Bool, query_plan_filter_push_down, true, "Allow to push down filter by predicate query plan step", 0) \
+    \
+    M(UInt64, limit, 0, "Limit on read rows from the most 'end' result for select query, default 0 means no limit length", 0) \
+    M(UInt64, offset, 0, "Offset on read rows from the most 'end' result for select query", 0) \
+    \
+    /** Experimental functions */ \
+    M(Bool, allow_experimental_funnel_functions, false, "Enable experimental functions for funnel analysis.", 0) \
+    \
+    \
+    /** Obsolete settings that do nothing but left for compatibility reasons. Remove each one after half a year of obsolescence. */ \
+    M(UInt64, max_memory_usage_for_all_queries, 0, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, multiple_joins_rewriter_version, 0, "Obsolete setting, does nothing.", 0) \
+    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(HandleKafkaErrorMode, handle_kafka_error_mode, HandleKafkaErrorMode::DEFAULT, "Obsolete setting, does nothing.", 0) \
+    M(Bool, database_replicated_ddl_output, true, "Obsolete setting, does nothing.", 0) \
+    /** The section above is for obsolete settings. Do not add anything there. */
+
 
 // End of COMMON_SETTINGS
 // Please add settings related to formats into the FORMAT_FACTORY_SETTINGS below.
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index 64ba51d1c68..26c2bd9b6af 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -108,4 +108,7 @@ IMPLEMENT_SETTING_ENUM(DistributedDDLOutputMode, ErrorCodes::BAD_ARGUMENTS,
      {"null_status_on_timeout", DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT},
      {"never_throw", DistributedDDLOutputMode::NEVER_THROW}})
 
+IMPLEMENT_SETTING_ENUM(HandleKafkaErrorMode, ErrorCodes::BAD_ARGUMENTS,
+    {{"default",      HandleKafkaErrorMode::DEFAULT},
+     {"stream",       HandleKafkaErrorMode::STREAM}})
 }
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index 7615b185a61..f0dd10aacfb 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -138,7 +138,6 @@ enum class UnionMode
 
 DECLARE_SETTING_ENUM(UnionMode)
 
-
 enum class DistributedDDLOutputMode
 {
     NONE,
@@ -149,4 +148,13 @@ enum class DistributedDDLOutputMode
 
 DECLARE_SETTING_ENUM(DistributedDDLOutputMode)
 
+enum class HandleKafkaErrorMode
+{
+    DEFAULT = 0, // Ignore errors whit threshold.
+    STREAM, // Put errors to stream in the virtual column named ``_error.
+    /*FIXED_SYSTEM_TABLE, Put errors to in a fixed system table likey system.kafka_errors. This is not implemented now.  */
+    /*CUSTOM_SYSTEM_TABLE, Put errors to in a custom system table. This is not implemented now.  */
+};
+
+DECLARE_SETTING_ENUM(HandleKafkaErrorMode)
 }
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 1a5676bd8a8..3b84db04b1a 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -101,7 +101,7 @@ struct SettingFieldTimespan
     Poco::Timespan value;
     bool changed = false;
 
-    explicit SettingFieldTimespan(const Poco::Timespan & x = {}) : value(x) {}
+    explicit SettingFieldTimespan(Poco::Timespan x = {}) : value(x) {}
 
     template <class Rep, class Period = std::ratio<1>>
     explicit SettingFieldTimespan(const std::chrono::duration<Rep, Period> & x)
@@ -110,7 +110,7 @@ struct SettingFieldTimespan
     explicit SettingFieldTimespan(UInt64 x) : SettingFieldTimespan(Poco::Timespan{static_cast<Poco::Timespan::TimeDiff>(x * microseconds_per_unit)}) {}
     explicit SettingFieldTimespan(const Field & f);
 
-    SettingFieldTimespan & operator =(const Poco::Timespan & x) { value = x; changed = true; return *this; }
+    SettingFieldTimespan & operator =(Poco::Timespan x) { value = x; changed = true; return *this; }
 
     template <class Rep, class Period = std::ratio<1>>
     SettingFieldTimespan & operator =(const std::chrono::duration<Rep, Period> & x) { *this = Poco::Timespan{static_cast<Poco::Timespan::TimeDiff>(std::chrono::duration_cast<std::chrono::microseconds>(x).count())}; return *this; }
diff --git a/src/Core/SettingsQuirks.cpp b/src/Core/SettingsQuirks.cpp
index 3bf9047af3a..6d584fe8906 100644
--- a/src/Core/SettingsQuirks.cpp
+++ b/src/Core/SettingsQuirks.cpp
@@ -4,9 +4,7 @@
 
 #ifdef __linux__
 #include <linux/version.h>
-#endif
 
-#ifdef __linux__
 /// 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.
 ///
@@ -16,21 +14,15 @@
 ///   [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0c54a6a44bf3
 bool nestedEpollWorks(Poco::Logger * log)
 {
-    bool nested_epoll_works =
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 13))
         /// the check is correct since there will be no more 5.5.x releases.
-        false
-#else
-        true
-#endif
-    ;
-
-    if (!nested_epoll_works)
-    {
         if (log)
             LOG_WARNING(log, "Nested epoll_wait has some issues on kernels [5.5.0, 5.6.13). You should upgrade it to avoid possible issues.");
-    }
-    return nested_epoll_works;
+        return false;
+#else
+        (void)log;
+        return true;
+#endif
 }
 #else
 bool nestedEpollWorks(Poco::Logger *) { return true; }
diff --git a/src/Core/SortCursor.h b/src/Core/SortCursor.h
index 79730e9697e..dd804bd4675 100644
--- a/src/Core/SortCursor.h
+++ b/src/Core/SortCursor.h
@@ -126,7 +126,7 @@ struct SortCursorImpl
 
 /// Prevent using pos instead of getRow()
 private:
-    size_t pos;
+    size_t pos = 0;
 };
 
 using SortCursorImpls = std::vector<SortCursorImpl>;
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index cb7378cf096..314b6624623 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -1,6 +1,7 @@
 #include <Core/SortDescription.h>
 #include <Core/Block.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -37,6 +38,22 @@ void dumpSortDescription(const SortDescription & description, const Block & head
     }
 }
 
+void SortColumnDescription::explain(JSONBuilder::JSONMap & map, const Block & header) const
+{
+    if (!column_name.empty())
+        map.add("Column", column_name);
+    else
+    {
+        if (column_number < header.columns())
+            map.add("Column", header.getByPosition(column_number).name);
+
+        map.add("Position", column_number);
+    }
+
+    map.add("Ascending", direction > 0);
+    map.add("With Fill", with_fill);
+}
+
 std::string dumpSortDescription(const SortDescription & description)
 {
     WriteBufferFromOwnString wb;
@@ -44,5 +61,17 @@ std::string dumpSortDescription(const SortDescription & description)
     return wb.str();
 }
 
+JSONBuilder::ItemPtr explainSortDescription(const SortDescription & description, const Block & header)
+{
+    auto json_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (const auto & descr : description)
+    {
+        auto json_map = std::make_unique<JSONBuilder::JSONMap>();
+        descr.explain(*json_map, header);
+        json_array->add(std::move(json_map));
+    }
+
+    return json_array;
 }
 
+}
diff --git a/src/Core/SortDescription.h b/src/Core/SortDescription.h
index 1450393ebd8..41b4e5b6b32 100644
--- a/src/Core/SortDescription.h
+++ b/src/Core/SortDescription.h
@@ -12,6 +12,15 @@ class Collator;
 namespace DB
 {
 
+namespace JSONBuilder
+{
+    class JSONMap;
+    class IItem;
+    using ItemPtr = std::unique_ptr<IItem>;
+}
+
+class Block;
+
 struct FillColumnDescription
 {
     /// All missed values in range [FROM, TO) will be filled
@@ -62,16 +71,18 @@ struct SortColumnDescription
     {
         return fmt::format("{}:{}:dir {}nulls ", column_name, column_number, direction, nulls_direction);
     }
+
+    void explain(JSONBuilder::JSONMap & map, const Block & header) const;
 };
 
 /// Description of the sorting rule for several columns.
 using SortDescription = std::vector<SortColumnDescription>;
 
-class Block;
-
 /// Outputs user-readable description into `out`.
 void dumpSortDescription(const SortDescription & description, const Block & header, WriteBuffer & out);
 
 std::string dumpSortDescription(const SortDescription & description);
 
+JSONBuilder::ItemPtr explainSortDescription(const SortDescription & description, const Block & header);
+
 }
diff --git a/src/Core/TypeListNumber.h b/src/Core/TypeListNumber.h
index 9b7c33a6007..b65bdef4e46 100644
--- a/src/Core/TypeListNumber.h
+++ b/src/Core/TypeListNumber.h
@@ -1,20 +1,18 @@
 #pragma once
 
 #include <Core/Types.h>
-#include <Common/UInt128.h>
 #include <Common/TypeList.h>
 
 namespace DB
 {
 
 using TypeListNativeNumbers = TypeList<UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64>;
-using TypeListExtendedNumbers = TypeList<Int128, UInt256, Int256>;
+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;
 
-/// Currently separate because UInt128 cannot be used in every context where other numbers can be used.
-using TypeListNumbersAndUInt128 = typename AppendToTypeList<UInt128, TypeListNumbers>::Type;
+using TypeListNumbersAndUUID = typename TypeListConcat<TypeListNumbers, TypeList<UUID>>::Type;
 
 }
diff --git a/src/Core/Types.h b/src/Core/Types.h
index a463455cbe1..151d9bdcf5a 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <string>
 #include <vector>
+#include <common/strong_typedef.h>
 #include <common/extended_types.h>
 #include <common/defines.h>
 
@@ -15,7 +16,7 @@ namespace DB
 struct Null {};
 
 /// Ignore strange gcc warning https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55776
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
@@ -59,64 +60,56 @@ enum class TypeIndex
     LowCardinality,
     Map,
 };
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
-/// Other int defines are in common/types.h
-using UInt256 = ::wUInt256;
+
+using UInt128 = ::UInt128;
+using UInt256 = ::UInt256;
 using Int128 = ::Int128;
-using Int256 = ::wInt256;
+using Int256 = ::Int256;
 
-/** Note that for types not used in DB, IsNumber is false.
-  */
-template <typename T> constexpr bool IsNumber = false;
+STRONG_TYPEDEF(UInt128, UUID)
 
-template <> inline constexpr bool IsNumber<UInt8> = true;
-template <> inline constexpr bool IsNumber<UInt16> = true;
-template <> inline constexpr bool IsNumber<UInt32> = true;
-template <> inline constexpr bool IsNumber<UInt64> = true;
-template <> inline constexpr bool IsNumber<UInt256> = true;
-template <> inline constexpr bool IsNumber<Int8> = true;
-template <> inline constexpr bool IsNumber<Int16> = true;
-template <> inline constexpr bool IsNumber<Int32> = true;
-template <> inline constexpr bool IsNumber<Int64> = true;
-template <> inline constexpr bool IsNumber<Int128> = true;
-template <> inline constexpr bool IsNumber<Int256> = true;
-template <> inline constexpr bool IsNumber<Float32> = true;
-template <> inline constexpr bool IsNumber<Float64> = true;
 
-template <typename T> struct TypeName;
+template <typename T> constexpr const char * TypeName = "";
 
-template <> struct TypeName<UInt8>   { static constexpr const char * get() { return "UInt8";   } };
-template <> struct TypeName<UInt16>  { static constexpr const char * get() { return "UInt16";  } };
-template <> struct TypeName<UInt32>  { static constexpr const char * get() { return "UInt32";  } };
-template <> struct TypeName<UInt64>  { static constexpr const char * get() { return "UInt64";  } };
-template <> struct TypeName<UInt256> { static constexpr const char * get() { return "UInt256"; } };
-template <> struct TypeName<Int8>    { static constexpr const char * get() { return "Int8";    } };
-template <> struct TypeName<Int16>   { static constexpr const char * get() { return "Int16";   } };
-template <> struct TypeName<Int32>   { static constexpr const char * get() { return "Int32";   } };
-template <> struct TypeName<Int64>   { static constexpr const char * get() { return "Int64";   } };
-template <> struct TypeName<Int128>  { static constexpr const char * get() { return "Int128";  } };
-template <> struct TypeName<Int256> { static constexpr const char * get() { return "Int256";  } };
-template <> struct TypeName<Float32> { static constexpr const char * get() { return "Float32"; } };
-template <> struct TypeName<Float64> { static constexpr const char * get() { return "Float64"; } };
-template <> struct TypeName<String>  { static constexpr const char * get() { return "String";  } };
+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;
 
-template <typename T> struct TypeId;
-template <> struct TypeId<UInt8>    { static constexpr const TypeIndex value = TypeIndex::UInt8;  };
-template <> struct TypeId<UInt16>   { static constexpr const TypeIndex value = TypeIndex::UInt16;  };
-template <> struct TypeId<UInt32>   { static constexpr const TypeIndex value = TypeIndex::UInt32;  };
-template <> struct TypeId<UInt64>   { static constexpr const TypeIndex value = TypeIndex::UInt64;  };
-template <> struct TypeId<UInt256>  { static constexpr const TypeIndex value = TypeIndex::UInt256; };
-template <> struct TypeId<Int8>     { static constexpr const TypeIndex value = TypeIndex::Int8;  };
-template <> struct TypeId<Int16>    { static constexpr const TypeIndex value = TypeIndex::Int16; };
-template <> struct TypeId<Int32>    { static constexpr const TypeIndex value = TypeIndex::Int32; };
-template <> struct TypeId<Int64>    { static constexpr const TypeIndex value = TypeIndex::Int64; };
-template <> struct TypeId<Int128>   { static constexpr const TypeIndex value = TypeIndex::Int128; };
-template <> struct TypeId<Int256>   { static constexpr const TypeIndex value = TypeIndex::Int256; };
-template <> struct TypeId<Float32>  { static constexpr const TypeIndex value = TypeIndex::Float32;  };
-template <> struct TypeId<Float64>  { static constexpr const TypeIndex value = TypeIndex::Float64;  };
 
 /// Not a data type in database, defined just for convenience.
 using Strings = std::vector<String>;
@@ -167,6 +160,12 @@ struct Decimal
     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; }
 
@@ -175,6 +174,8 @@ struct Decimal
 
 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; }
 
@@ -202,17 +203,17 @@ public:
     {}
 };
 
-template <> struct TypeName<Decimal32>   { static constexpr const char * get() { return "Decimal32";   } };
-template <> struct TypeName<Decimal64>   { static constexpr const char * get() { return "Decimal64";   } };
-template <> struct TypeName<Decimal128>  { static constexpr const char * get() { return "Decimal128";  } };
-template <> struct TypeName<Decimal256>  { static constexpr const char * get() { return "Decimal256";  } };
-template <> struct TypeName<DateTime64>  { static constexpr const char * get() { return "DateTime64";  } };
+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 <> struct TypeId<Decimal32>    { static constexpr const TypeIndex value = TypeIndex::Decimal32; };
-template <> struct TypeId<Decimal64>    { static constexpr const TypeIndex value = TypeIndex::Decimal64; };
-template <> struct TypeId<Decimal128>   { static constexpr const TypeIndex value = TypeIndex::Decimal128; };
-template <> struct TypeId<Decimal256>   { static constexpr const TypeIndex value = TypeIndex::Decimal256; };
-template <> struct TypeId<DateTime64>   { static constexpr const TypeIndex value = TypeIndex::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;
@@ -229,8 +230,11 @@ 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)
@@ -238,31 +242,31 @@ inline constexpr const char * getTypeName(TypeIndex idx)
     switch (idx)
     {
         case TypeIndex::Nothing:    return "Nothing";
-        case TypeIndex::UInt8:      return TypeName<UInt8>::get();
-        case TypeIndex::UInt16:     return TypeName<UInt16>::get();
-        case TypeIndex::UInt32:     return TypeName<UInt32>::get();
-        case TypeIndex::UInt64:     return TypeName<UInt64>::get();
+        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 TypeName<UInt256>::get();
-        case TypeIndex::Int8:       return TypeName<Int8>::get();
-        case TypeIndex::Int16:      return TypeName<Int16>::get();
-        case TypeIndex::Int32:      return TypeName<Int32>::get();
-        case TypeIndex::Int64:      return TypeName<Int64>::get();
-        case TypeIndex::Int128:     return TypeName<Int128>::get();
-        case TypeIndex::Int256:     return TypeName<Int256>::get();
-        case TypeIndex::Float32:    return TypeName<Float32>::get();
-        case TypeIndex::Float64:    return TypeName<Float64>::get();
+        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::DateTime:   return "DateTime";
         case TypeIndex::DateTime64: return "DateTime64";
-        case TypeIndex::String:     return TypeName<String>::get();
+        case TypeIndex::String:     return "String";
         case TypeIndex::FixedString: return "FixedString";
         case TypeIndex::Enum8:      return "Enum8";
         case TypeIndex::Enum16:     return "Enum16";
-        case TypeIndex::Decimal32:  return TypeName<Decimal32>::get();
-        case TypeIndex::Decimal64:  return TypeName<Decimal64>::get();
-        case TypeIndex::Decimal128: return TypeName<Decimal128>::get();
-        case TypeIndex::Decimal256: return TypeName<Decimal256>::get();
+        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";
diff --git a/src/Core/UUID.cpp b/src/Core/UUID.cpp
new file mode 100644
index 00000000000..ef1e10f5063
--- /dev/null
+++ b/src/Core/UUID.cpp
@@ -0,0 +1,19 @@
+#include <Core/UUID.h>
+#include <Common/thread_local_rng.h>
+
+
+namespace DB
+{
+
+namespace UUIDHelpers
+{
+    UUID generateV4()
+    {
+        UInt128 res{thread_local_rng(), thread_local_rng()};
+        res.items[0] = (res.items[0] & 0xffffffffffff0fffull) | 0x0000000000004000ull;
+        res.items[1] = (res.items[1] & 0x3fffffffffffffffull) | 0x8000000000000000ull;
+        return UUID{res};
+    }
+}
+
+}
diff --git a/src/Core/UUID.h b/src/Core/UUID.h
index d5a6232a72b..a24dcebdc9e 100644
--- a/src/Core/UUID.h
+++ b/src/Core/UUID.h
@@ -1,25 +1,17 @@
 #pragma once
 
-#include <Common/UInt128.h>
-#include <common/strong_typedef.h>
-#include <Common/thread_local_rng.h>
+#include <Core/Types.h>
+
 
 namespace DB
 {
 
-STRONG_TYPEDEF(UInt128, UUID)
-
 namespace UUIDHelpers
 {
-    inline UUID generateV4()
-    {
-        UInt128 res{thread_local_rng(), thread_local_rng()};
-        res.low = (res.low & 0xffffffffffff0fffull) | 0x0000000000004000ull;
-        res.high = (res.high & 0x3fffffffffffffffull) | 0x8000000000000000ull;
-        return UUID{res};
-    }
+    /// Generate random UUID.
+    UUID generateV4();
 
-    const UUID Nil = UUID(UInt128(0, 0));
+    const UUID Nil{};
 }
 
 }
diff --git a/src/Core/callOnTypeIndex.h b/src/Core/callOnTypeIndex.h
index 2d6134ab9fc..520be263f9f 100644
--- a/src/Core/callOnTypeIndex.h
+++ b/src/Core/callOnTypeIndex.h
@@ -26,6 +26,7 @@ bool callOnBasicType(TypeIndex number, F && f)
             case TypeIndex::UInt16:       return f(TypePair<T, UInt16>());
             case TypeIndex::UInt32:       return f(TypePair<T, UInt32>());
             case TypeIndex::UInt64:       return f(TypePair<T, UInt64>());
+            case TypeIndex::UInt128:      return f(TypePair<T, UInt128>());
             case TypeIndex::UInt256:      return f(TypePair<T, UInt256>());
 
             case TypeIndex::Int8:         return f(TypePair<T, Int8>());
@@ -94,6 +95,7 @@ inline bool callOnBasicTypes(TypeIndex type_num1, TypeIndex type_num2, F && f)
             case TypeIndex::UInt16: return callOnBasicType<UInt16, _int, _float, _decimal, _datetime>(type_num2, std::forward<F>(f));
             case TypeIndex::UInt32: return callOnBasicType<UInt32, _int, _float, _decimal, _datetime>(type_num2, std::forward<F>(f));
             case TypeIndex::UInt64: return callOnBasicType<UInt64, _int, _float, _decimal, _datetime>(type_num2, std::forward<F>(f));
+            case TypeIndex::UInt128: return callOnBasicType<UInt128, _int, _float, _decimal, _datetime>(type_num2, std::forward<F>(f));
             case TypeIndex::UInt256: return callOnBasicType<UInt256, _int, _float, _decimal, _datetime>(type_num2, std::forward<F>(f));
 
             case TypeIndex::Int8: return callOnBasicType<Int8, _int, _float, _decimal, _datetime>(type_num2, std::forward<F>(f));
@@ -171,6 +173,7 @@ bool callOnIndexAndDataType(TypeIndex number, F && f, ExtraArgs && ... args)
         case TypeIndex::UInt16:         return f(TypePair<DataTypeNumber<UInt16>, T>(), std::forward<ExtraArgs>(args)...);
         case TypeIndex::UInt32:         return f(TypePair<DataTypeNumber<UInt32>, T>(), std::forward<ExtraArgs>(args)...);
         case TypeIndex::UInt64:         return f(TypePair<DataTypeNumber<UInt64>, T>(), std::forward<ExtraArgs>(args)...);
+        case TypeIndex::UInt128:        return f(TypePair<DataTypeNumber<UInt128>, T>(), std::forward<ExtraArgs>(args)...);
         case TypeIndex::UInt256:        return f(TypePair<DataTypeNumber<UInt256>, T>(), std::forward<ExtraArgs>(args)...);
 
         case TypeIndex::Int8:           return f(TypePair<DataTypeNumber<Int8>, T>(), std::forward<ExtraArgs>(args)...);
diff --git a/src/Core/tests/CMakeLists.txt b/src/Core/examples/CMakeLists.txt
similarity index 100%
rename from src/Core/tests/CMakeLists.txt
rename to src/Core/examples/CMakeLists.txt
diff --git a/src/Core/tests/field.cpp b/src/Core/examples/field.cpp
similarity index 100%
rename from src/Core/tests/field.cpp
rename to src/Core/examples/field.cpp
diff --git a/src/Core/tests/mysql_protocol.cpp b/src/Core/examples/mysql_protocol.cpp
similarity index 100%
rename from src/Core/tests/mysql_protocol.cpp
rename to src/Core/examples/mysql_protocol.cpp
diff --git a/src/Core/tests/names_and_types_fuzzer.cpp b/src/Core/examples/names_and_types_fuzzer.cpp
similarity index 100%
rename from src/Core/tests/names_and_types_fuzzer.cpp
rename to src/Core/examples/names_and_types_fuzzer.cpp
diff --git a/src/Core/tests/string_pool.cpp b/src/Core/examples/string_pool.cpp
similarity index 100%
rename from src/Core/tests/string_pool.cpp
rename to src/Core/examples/string_pool.cpp
diff --git a/src/Core/tests/string_ref_hash.cpp b/src/Core/examples/string_ref_hash.cpp
similarity index 100%
rename from src/Core/tests/string_ref_hash.cpp
rename to src/Core/examples/string_ref_hash.cpp
diff --git a/src/Core/tests/gtest_accurate_comparison.cpp b/src/Core/tests/gtest_accurate_comparison.cpp
new file mode 100644
index 00000000000..bac4ad3d72d
--- /dev/null
+++ b/src/Core/tests/gtest_accurate_comparison.cpp
@@ -0,0 +1,76 @@
+#include <gtest/gtest.h>
+#include <Core/AccurateComparison.h>
+
+using namespace DB;
+
+
+GTEST_TEST(AccurateComparison, Tests)
+{
+    /// Arbitrary assortion of cases.
+
+    ASSERT_TRUE(accurate::equalsOp(static_cast<Float32>(123), static_cast<UInt64>(123)));
+    ASSERT_TRUE(accurate::lessOp(static_cast<Float32>(123), static_cast<UInt64>(124)));
+    ASSERT_TRUE(accurate::lessOp(static_cast<Float32>(-1), static_cast<UInt64>(1)));
+    ASSERT_TRUE(accurate::lessOp(static_cast<Int64>(-1), static_cast<UInt64>(1)));
+    ASSERT_TRUE(!accurate::equalsOp(static_cast<Int64>(-1), static_cast<UInt64>(-1)));
+
+    ASSERT_TRUE(accurate::equalsOp(-0., 0));
+    ASSERT_TRUE(accurate::lessOp(-0., 1));
+    ASSERT_TRUE(accurate::lessOp(-0.5, 1));
+    ASSERT_TRUE(accurate::lessOp(0.5, 1));
+    ASSERT_TRUE(accurate::equalsOp(1.0, 1));
+    ASSERT_TRUE(accurate::greaterOp(1.1, 1));
+    ASSERT_TRUE(accurate::greaterOp(11.1, 1));
+    ASSERT_TRUE(accurate::greaterOp(11.1, 11));
+    ASSERT_TRUE(accurate::lessOp(-11.1, 11));
+    ASSERT_TRUE(accurate::lessOp(-11.1, -11));
+    ASSERT_TRUE(accurate::lessOp(-1.1, -1));
+    ASSERT_TRUE(accurate::greaterOp(-1.1, -2));
+    ASSERT_TRUE(accurate::greaterOp(1000., 100));
+    ASSERT_TRUE(accurate::greaterOp(-100., -1000));
+    ASSERT_TRUE(accurate::lessOp(100., 1000));
+    ASSERT_TRUE(accurate::lessOp(-1000., -100));
+
+    ASSERT_TRUE(accurate::lessOp(-std::numeric_limits<Float64>::infinity(), 0));
+    ASSERT_TRUE(accurate::lessOp(-std::numeric_limits<Float64>::infinity(), 1000));
+    ASSERT_TRUE(accurate::lessOp(-std::numeric_limits<Float64>::infinity(), -1000));
+    ASSERT_TRUE(accurate::greaterOp(std::numeric_limits<Float64>::infinity(), 0));
+    ASSERT_TRUE(accurate::greaterOp(std::numeric_limits<Float64>::infinity(), 1000));
+    ASSERT_TRUE(accurate::greaterOp(std::numeric_limits<Float64>::infinity(), -1000));
+
+    ASSERT_TRUE(accurate::lessOp(1, 1e100));
+    ASSERT_TRUE(accurate::lessOp(-1, 1e100));
+    ASSERT_TRUE(accurate::lessOp(-1e100, 1));
+    ASSERT_TRUE(accurate::lessOp(-1e100, -1));
+
+    /// Tricky cases with floats.
+
+    ASSERT_TRUE(accurate::equalsOp(static_cast<UInt64>(9223372036854775808ULL), static_cast<Float64>(9223372036854775808ULL)));
+    ASSERT_TRUE(accurate::equalsOp(static_cast<UInt64>(9223372036854775808ULL), static_cast<Float32>(9223372036854775808ULL)));
+
+    ASSERT_TRUE(accurate::greaterOp(static_cast<UInt64>(9223372036854776000ULL), static_cast<Float64>(9223372036854776000ULL)));
+    ASSERT_TRUE(accurate::lessOp(static_cast<UInt64>(9223372000000000000ULL), static_cast<Float32>(9223372000000000000ULL)));
+
+    ASSERT_TRUE(accurate::equalsOp(static_cast<Float32>(9223372036854775808ULL), static_cast<Float64>(9223372036854775808ULL)));
+
+    /// Integers
+
+    ASSERT_TRUE(accurate::lessOp(static_cast<UInt8>(255), 300));
+    ASSERT_TRUE(accurate::lessOp(static_cast<UInt8>(255), static_cast<Int16>(300)));
+    ASSERT_TRUE(accurate::notEqualsOp(static_cast<UInt8>(255), 44));
+    ASSERT_TRUE(accurate::notEqualsOp(static_cast<UInt8>(255), static_cast<Int16>(44)));
+
+
+/*    Float32 f = static_cast<Float32>(9223372000000000000ULL);
+    UInt64 u = static_cast<UInt64>(9223372000000000000ULL);
+    DecomposedFloat32 components(f);
+
+    std::cerr << std::fixed << std::setprecision(3) << f
+        << ", " << components.normalized_exponent()
+        << ", " << components.mantissa()
+        << ", " << (components.mantissa() << (components.normalized_exponent() - 23))
+        << ", " << (1ULL << components.normalized_exponent())
+        << ", " << (components.normalized_exponent() >= static_cast<int16_t>(8 * sizeof(UInt64) - is_signed_v<UInt64>))
+        << ": " << components.compare(u)
+        << "\n";*/
+}
diff --git a/src/Core/ya.make b/src/Core/ya.make
index 004653d060e..d1e352ee846 100644
--- a/src/Core/ya.make
+++ b/src/Core/ya.make
@@ -38,6 +38,7 @@ SRCS(
     SettingsFields.cpp
     SettingsQuirks.cpp
     SortDescription.cpp
+    UUID.cpp
     iostream_debug_helpers.cpp
 
 )
diff --git a/src/Core/ya.make.in b/src/Core/ya.make.in
index e1c679ac809..6b89dc18482 100644
--- a/src/Core/ya.make.in
+++ b/src/Core/ya.make.in
@@ -10,7 +10,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? 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
index f241d417205..6f7975d492d 100644
--- a/src/DataStreams/AddingDefaultBlockOutputStream.cpp
+++ b/src/DataStreams/AddingDefaultBlockOutputStream.cpp
@@ -10,11 +10,12 @@ AddingDefaultBlockOutputStream::AddingDefaultBlockOutputStream(
     const BlockOutputStreamPtr & output_,
     const Block & header_,
     const ColumnsDescription & columns_,
-    const Context & context_)
+    ContextPtr context_,
+    bool null_as_default_)
     : output(output_), header(header_)
 {
-    auto dag = addMissingDefaults(header_, output->getHeader().getNamesAndTypesList(), columns_, context_);
-    adding_defaults_actions = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context_));
+    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)
diff --git a/src/DataStreams/AddingDefaultBlockOutputStream.h b/src/DataStreams/AddingDefaultBlockOutputStream.h
index 5fbbe2aed60..45ff30a3daa 100644
--- a/src/DataStreams/AddingDefaultBlockOutputStream.h
+++ b/src/DataStreams/AddingDefaultBlockOutputStream.h
@@ -17,6 +17,7 @@ class Context;
   * 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
@@ -26,7 +27,8 @@ public:
         const BlockOutputStreamPtr & output_,
         const Block & header_,
         const ColumnsDescription & columns_,
-        const Context & context_);
+        ContextPtr context_,
+        bool null_as_default_ = false);
 
     Block getHeader() const override { return header; }
     void write(const Block & block) override;
diff --git a/src/DataStreams/AddingDefaultsBlockInputStream.cpp b/src/DataStreams/AddingDefaultsBlockInputStream.cpp
index 81408b0aaa6..81be24439a5 100644
--- a/src/DataStreams/AddingDefaultsBlockInputStream.cpp
+++ b/src/DataStreams/AddingDefaultsBlockInputStream.cpp
@@ -130,7 +130,7 @@ static MutableColumnPtr mixColumns(const ColumnWithTypeAndName & col_read,
 AddingDefaultsBlockInputStream::AddingDefaultsBlockInputStream(
     const BlockInputStreamPtr & input,
     const ColumnsDescription & columns_,
-    const Context & context_)
+    ContextPtr context_)
     : columns(columns_)
     , column_defaults(columns.getDefaults())
     , context(context_)
@@ -174,7 +174,7 @@ Block AddingDefaultsBlockInputStream::readImpl()
     auto dag = evaluateMissingDefaults(evaluate_block, header.getNamesAndTypesList(), columns, context, false);
     if (dag)
     {
-        auto actions = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context));
+        auto actions = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes));
         actions->execute(evaluate_block);
     }
 
diff --git a/src/DataStreams/AddingDefaultsBlockInputStream.h b/src/DataStreams/AddingDefaultsBlockInputStream.h
index b2efa5863ef..957f14caff3 100644
--- a/src/DataStreams/AddingDefaultsBlockInputStream.h
+++ b/src/DataStreams/AddingDefaultsBlockInputStream.h
@@ -7,8 +7,6 @@
 namespace DB
 {
 
-class Context;
-
 /// Adds defaults to columns using BlockDelayedDefaults bitmask attached to Block by child InputStream.
 class AddingDefaultsBlockInputStream : public IBlockInputStream
 {
@@ -16,7 +14,7 @@ public:
     AddingDefaultsBlockInputStream(
         const BlockInputStreamPtr & input,
         const ColumnsDescription & columns_,
-        const Context & context_);
+        ContextPtr context_);
 
     String getName() const override { return "AddingDefaults"; }
     Block getHeader() const override { return header; }
@@ -28,7 +26,7 @@ private:
     Block header;
     const ColumnsDescription columns;
     const ColumnDefaults column_defaults;
-    const Context & context;
+    ContextPtr context;
 };
 
 }
diff --git a/src/DataStreams/BlockIO.h b/src/DataStreams/BlockIO.h
index 91d7efac8d1..31a0e1020d2 100644
--- a/src/DataStreams/BlockIO.h
+++ b/src/DataStreams/BlockIO.h
@@ -50,7 +50,7 @@ struct BlockIO
         }
     }
 
-    void onException()
+    void onException() const
     {
         if (exception_callback)
             exception_callback();
diff --git a/src/DataStreams/CMakeLists.txt b/src/DataStreams/CMakeLists.txt
index 65172356645..a6176efc7f3 100644
--- a/src/DataStreams/CMakeLists.txt
+++ b/src/DataStreams/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif ()
diff --git a/src/DataStreams/CheckConstraintsBlockOutputStream.cpp b/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
index 3b0b4db72f9..c4556162323 100644
--- a/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
+++ b/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
@@ -27,7 +27,7 @@ CheckConstraintsBlockOutputStream::CheckConstraintsBlockOutputStream(
     const BlockOutputStreamPtr & output_,
     const Block & header_,
     const ConstraintsDescription & constraints_,
-    const Context & context_)
+    ContextPtr context_)
     : table_id(table_id_),
     output(output_),
     header(header_),
diff --git a/src/DataStreams/CheckConstraintsBlockOutputStream.h b/src/DataStreams/CheckConstraintsBlockOutputStream.h
index a1be720f21e..0f115550eb8 100644
--- a/src/DataStreams/CheckConstraintsBlockOutputStream.h
+++ b/src/DataStreams/CheckConstraintsBlockOutputStream.h
@@ -20,7 +20,7 @@ public:
             const BlockOutputStreamPtr & output_,
             const Block & header_,
             const ConstraintsDescription & constraints_,
-            const Context & context_);
+            ContextPtr context_);
 
     Block getHeader() const override { return header; }
     void write(const Block & block) override;
diff --git a/src/DataStreams/ColumnGathererStream.cpp b/src/DataStreams/ColumnGathererStream.cpp
index 2468ae872a2..683b8012efe 100644
--- a/src/DataStreams/ColumnGathererStream.cpp
+++ b/src/DataStreams/ColumnGathererStream.cpp
@@ -53,7 +53,7 @@ ColumnGathererStream::ColumnGathererStream(
 Block ColumnGathererStream::readImpl()
 {
     /// Special case: single source and there are no skipped rows
-    if (children.size() == 1 && row_sources_buf.eof())
+    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())
diff --git a/src/DataStreams/IBlockInputStream.h b/src/DataStreams/IBlockInputStream.h
index 4e314ef2980..090ea394fd6 100644
--- a/src/DataStreams/IBlockInputStream.h
+++ b/src/DataStreams/IBlockInputStream.h
@@ -2,9 +2,8 @@
 
 #include <Core/Block.h>
 #include <DataStreams/BlockStreamProfileInfo.h>
-#include <DataStreams/IBlockStream_fwd.h>
-#include <DataStreams/SizeLimits.h>
 #include <DataStreams/ExecutionSpeedLimits.h>
+#include <DataStreams/SizeLimits.h>
 #include <DataStreams/StreamLocalLimits.h>
 #include <IO/Progress.h>
 #include <Storages/TableLockHolder.h>
@@ -159,7 +158,7 @@ public:
 
     /** Set the approximate total number of rows to read.
       */
-    virtual void addTotalRowsApprox(size_t value) { total_rows_approx += value; }
+    void addTotalRowsApprox(size_t value) { total_rows_approx += value; }
 
 
     /** Ask to abort the receipt of data as soon as possible.
diff --git a/src/DataStreams/InputStreamFromASTInsertQuery.cpp b/src/DataStreams/InputStreamFromASTInsertQuery.cpp
index 70d69227ac0..0848d838276 100644
--- a/src/DataStreams/InputStreamFromASTInsertQuery.cpp
+++ b/src/DataStreams/InputStreamFromASTInsertQuery.cpp
@@ -24,7 +24,7 @@ InputStreamFromASTInsertQuery::InputStreamFromASTInsertQuery(
     const ASTPtr & ast,
     ReadBuffer * input_buffer_tail_part,
     const Block & header,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & input_function)
 {
     const auto * ast_insert_query = ast->as<ASTInsertQuery>();
@@ -58,9 +58,9 @@ InputStreamFromASTInsertQuery::InputStreamFromASTInsertQuery(
 
     input_buffer_contacenated = std::make_unique<ConcatReadBuffer>(buffers);
 
-    res_stream = context.getInputFormat(format, *input_buffer_contacenated, header, context.getSettings().max_insert_block_size);
+    res_stream = context->getInputFormat(format, *input_buffer_contacenated, header, context->getSettings().max_insert_block_size);
 
-    if (context.getSettingsRef().input_format_defaults_for_omitted_fields && ast_insert_query->table_id && !input_function)
+    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();
diff --git a/src/DataStreams/InputStreamFromASTInsertQuery.h b/src/DataStreams/InputStreamFromASTInsertQuery.h
index d4c6443c77d..15b698a2d68 100644
--- a/src/DataStreams/InputStreamFromASTInsertQuery.h
+++ b/src/DataStreams/InputStreamFromASTInsertQuery.h
@@ -25,7 +25,7 @@ public:
         const ASTPtr & ast,
         ReadBuffer * input_buffer_tail_part,
         const Block & header,
-        const Context & context,
+        ContextPtr context,
         const ASTPtr & input_function);
 
     Block readImpl() override { return res_stream->read(); }
diff --git a/src/DataStreams/InternalTextLogsRowOutputStream.h b/src/DataStreams/InternalTextLogsRowOutputStream.h
index 0f333f70d18..8ade76b34a7 100644
--- a/src/DataStreams/InternalTextLogsRowOutputStream.h
+++ b/src/DataStreams/InternalTextLogsRowOutputStream.h
@@ -8,7 +8,7 @@ namespace DB
 
 /// Prints internal server logs
 /// Input blocks have to have the same structure as SystemLogsQueue::getSampleBlock()
-/// NOTE: IRowOutputStream does not suite well for this case
+/// NOTE: IRowOutputFormat does not suite well for this case
 class InternalTextLogsRowOutputStream : public IBlockOutputStream
 {
 public:
diff --git a/src/DataStreams/MergingSortedBlockInputStream.h b/src/DataStreams/MergingSortedBlockInputStream.h
index 7f8d594416d..582b41ff3af 100644
--- a/src/DataStreams/MergingSortedBlockInputStream.h
+++ b/src/DataStreams/MergingSortedBlockInputStream.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Core/Row.h>
 #include <Core/SortDescription.h>
 #include <Core/SortCursor.h>
 
diff --git a/src/DataStreams/MongoDBBlockInputStream.cpp b/src/DataStreams/MongoDBBlockInputStream.cpp
index e4ddcd09ede..d740448e0cf 100644
--- a/src/DataStreams/MongoDBBlockInputStream.cpp
+++ b/src/DataStreams/MongoDBBlockInputStream.cpp
@@ -25,7 +25,6 @@
 // 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 <Common/FieldVisitors.h>
 #include <ext/enumerate.h>
 
 namespace DB
@@ -290,7 +289,7 @@ namespace
                 if (value.type() == Poco::MongoDB::ElementTraits<String>::TypeId)
                 {
                     String string = static_cast<const Poco::MongoDB::ConcreteElement<String> &>(value).value();
-                    assert_cast<ColumnUInt128 &>(column).getData().push_back(parse<UUID>(string));
+                    assert_cast<ColumnUUID &>(column).getData().push_back(parse<UUID>(string));
                 }
                 else
                     throw Exception{"Type mismatch, expected String (UUID), got type id = " + toString(value.type()) + " for column "
diff --git a/src/DataStreams/NativeBlockOutputStream.cpp b/src/DataStreams/NativeBlockOutputStream.cpp
index 2a016c9a0c8..a5d8c15986b 100644
--- a/src/DataStreams/NativeBlockOutputStream.cpp
+++ b/src/DataStreams/NativeBlockOutputStream.cpp
@@ -51,7 +51,7 @@ static void writeData(const IDataType & type, const ColumnPtr & column, WriteBuf
     ISerialization::SerializeBinaryBulkSettings settings;
     settings.getter = [&ostr](ISerialization::SubstreamPath) -> WriteBuffer * { return &ostr; };
     settings.position_independent_encoding = false;
-    settings.low_cardinality_max_dictionary_size = 0;
+    settings.low_cardinality_max_dictionary_size = 0; //-V1048
 
     auto serialization = type.getDefaultSerialization();
 
diff --git a/src/DataStreams/PostgreSQLBlockInputStream.cpp b/src/DataStreams/PostgreSQLBlockInputStream.cpp
index 478df9e2259..9ef0a45acc0 100644
--- a/src/DataStreams/PostgreSQLBlockInputStream.cpp
+++ b/src/DataStreams/PostgreSQLBlockInputStream.cpp
@@ -28,13 +28,13 @@ namespace ErrorCodes
 }
 
 PostgreSQLBlockInputStream::PostgreSQLBlockInputStream(
-    PostgreSQLConnectionHolderPtr connection_,
+    postgres::ConnectionHolderPtr connection_holder_,
     const std::string & query_str_,
     const Block & sample_block,
     const UInt64 max_block_size_)
     : query_str(query_str_)
     , max_block_size(max_block_size_)
-    , connection(std::move(connection_))
+    , connection_holder(std::move(connection_holder_))
 {
     description.init(sample_block);
     for (const auto idx : ext::range(0, description.sample_block.columns()))
@@ -48,7 +48,7 @@ PostgreSQLBlockInputStream::PostgreSQLBlockInputStream(
 
 void PostgreSQLBlockInputStream::readPrefix()
 {
-    tx = std::make_unique<pqxx::read_transaction>(connection->conn());
+    tx = std::make_unique<pqxx::read_transaction>(connection_holder->get());
     stream = std::make_unique<pqxx::stream_from>(*tx, pqxx::from_query, std::string_view(query_str));
 }
 
@@ -120,8 +120,15 @@ void PostgreSQLBlockInputStream::insertValue(IColumn & column, std::string_view
     switch (type)
     {
         case ValueType::vtUInt8:
-            assert_cast<ColumnUInt8 &>(column).insertValue(pqxx::from_string<uint16_t>(value));
+        {
+            if (value == "t")
+                assert_cast<ColumnUInt8 &>(column).insertValue(1);
+            else if (value == "f")
+                assert_cast<ColumnUInt8 &>(column).insertValue(0);
+            else
+                assert_cast<ColumnUInt8 &>(column).insertValue(pqxx::from_string<uint16_t>(value));
             break;
+        }
         case ValueType::vtUInt16:
             assert_cast<ColumnUInt16 &>(column).insertValue(pqxx::from_string<uint16_t>(value));
             break;
@@ -154,7 +161,7 @@ void PostgreSQLBlockInputStream::insertValue(IColumn & column, std::string_view
             assert_cast<ColumnString &>(column).insertData(value.data(), value.size());
             break;
         case ValueType::vtUUID:
-            assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.data(), value.size()));
+            assert_cast<ColumnUUID &>(column).insert(parse<UUID>(value.data(), value.size()));
             break;
         case ValueType::vtDate:
             assert_cast<ColumnUInt16 &>(column).insertValue(UInt16{LocalDate{std::string(value)}.getDayNum()});
@@ -186,7 +193,7 @@ void PostgreSQLBlockInputStream::insertValue(IColumn & column, std::string_view
 
             size_t dimension = 0, max_dimension = 0, expected_dimensions = array_info[idx].num_dimensions;
             const auto parse_value = array_info[idx].pqxx_parser;
-            std::vector<std::vector<Field>> dimensions(expected_dimensions + 1);
+            std::vector<Row> dimensions(expected_dimensions + 1);
 
             while (parsed.first != pqxx::array_parser::juncture::done)
             {
@@ -203,7 +210,8 @@ void PostgreSQLBlockInputStream::insertValue(IColumn & column, std::string_view
                 {
                     max_dimension = std::max(max_dimension, dimension);
 
-                    if (--dimension == 0)
+                    --dimension;
+                    if (dimension == 0)
                         break;
 
                     dimensions[dimension].emplace_back(Array(dimensions[dimension + 1].begin(), dimensions[dimension + 1].end()));
diff --git a/src/DataStreams/PostgreSQLBlockInputStream.h b/src/DataStreams/PostgreSQLBlockInputStream.h
index 7795cc2d36a..27aefcbc2d7 100644
--- a/src/DataStreams/PostgreSQLBlockInputStream.h
+++ b/src/DataStreams/PostgreSQLBlockInputStream.h
@@ -9,7 +9,7 @@
 #include <DataStreams/IBlockInputStream.h>
 #include <Core/ExternalResultDescription.h>
 #include <Core/Field.h>
-#include <Storages/PostgreSQL/PostgreSQLConnectionPool.h>
+#include <Storages/PostgreSQL/ConnectionHolder.h>
 
 
 namespace DB
@@ -19,7 +19,7 @@ class PostgreSQLBlockInputStream : public IBlockInputStream
 {
 public:
     PostgreSQLBlockInputStream(
-        PostgreSQLConnectionHolderPtr connection_,
+        postgres::ConnectionHolderPtr connection_holder_,
         const std::string & query_str,
         const Block & sample_block,
         const UInt64 max_block_size_);
@@ -46,7 +46,7 @@ private:
     const UInt64 max_block_size;
     ExternalResultDescription description;
 
-    PostgreSQLConnectionHolderPtr connection;
+    postgres::ConnectionHolderPtr connection_holder;
     std::unique_ptr<pqxx::read_transaction> tx;
     std::unique_ptr<pqxx::stream_from> stream;
 
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.cpp b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
index 4d1990ffe18..c09420cab6f 100644
--- a/src/DataStreams/PushingToViewsBlockOutputStream.cpp
+++ b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
@@ -26,13 +26,13 @@ namespace DB
 PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
     const StoragePtr & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const Context & context_,
+    ContextPtr context_,
     const ASTPtr & query_ptr_,
     bool no_destination)
-    : storage(storage_)
+    : WithContext(context_)
+    , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , log(&Poco::Logger::get("PushingToViewsBlockOutputStream"))
-    , context(context_)
     , query_ptr(query_ptr_)
 {
     checkStackSize();
@@ -42,12 +42,12 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
       *  but it's clear that here is not the best place for this functionality.
       */
     addTableLock(
-        storage->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout));
+        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 (!context.getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
+    if (!getContext()->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
         disable_deduplication_for_children = !no_destination && storage->supportsDeduplication();
 
     auto table_id = storage->getStorageID();
@@ -56,14 +56,14 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
     /// We need special context for materialized views insertions
     if (!dependencies.empty())
     {
-        select_context = std::make_unique<Context>(context);
-        insert_context = std::make_unique<Context>(context);
+        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", false);
+            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)
@@ -74,7 +74,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
 
     for (const auto & database_table : dependencies)
     {
-        auto dependent_table = DatabaseCatalog::instance().getTable(database_table, context);
+        auto dependent_table = DatabaseCatalog::instance().getTable(database_table, getContext());
         auto dependent_metadata_snapshot = dependent_table->getInMemoryMetadataPtr();
 
         ASTPtr query;
@@ -83,7 +83,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
         if (auto * materialized_view = dynamic_cast<StorageMaterializedView *>(dependent_table.get()))
         {
             addTableLock(
-                materialized_view->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout));
+                materialized_view->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout));
 
             StoragePtr inner_table = materialized_view->getTargetTable();
             auto inner_table_id = inner_table->getStorageID();
@@ -94,7 +94,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
             insert->table_id = inner_table_id;
 
             /// Get list of columns we get from select query.
-            auto header = InterpreterSelectQuery(query, *select_context, SelectQueryOptions().analyze())
+            auto header = InterpreterSelectQuery(query, select_context, SelectQueryOptions().analyze())
                 .getSampleBlock();
 
             /// Insert only columns returned by select.
@@ -110,16 +110,16 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
             insert->columns = std::move(list);
 
             ASTPtr insert_query_ptr(insert.release());
-            InterpreterInsertQuery interpreter(insert_query_ptr, *insert_context);
+            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);
+                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr(), true);
         else
             out = std::make_shared<PushingToViewsBlockOutputStream>(
-                dependent_table, dependent_metadata_snapshot, *insert_context, ASTPtr());
+                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr());
 
         views.emplace_back(ViewInfo{std::move(query), database_table, std::move(out), nullptr, 0 /* elapsed_ms */});
     }
@@ -127,7 +127,7 @@ PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
     /// Do not push to destination table if the flag is set
     if (!no_destination)
     {
-        output = storage->write(query_ptr, storage->getInMemoryMetadataPtr(), context);
+        output = storage->write(query_ptr, storage->getInMemoryMetadataPtr(), getContext());
         replicated_output = dynamic_cast<ReplicatedMergeTreeBlockOutputStream *>(output.get());
     }
 }
@@ -155,7 +155,7 @@ void PushingToViewsBlockOutputStream::write(const Block & block)
 
     if (auto * live_view = dynamic_cast<StorageLiveView *>(storage.get()))
     {
-        StorageLiveView::writeIntoLiveView(*live_view, block, context);
+        StorageLiveView::writeIntoLiveView(*live_view, block, getContext());
     }
     else
     {
@@ -166,11 +166,11 @@ void PushingToViewsBlockOutputStream::write(const Block & block)
     }
 
     /// Don't process materialized views if this block is duplicate
-    if (!context.getSettingsRef().deduplicate_blocks_in_dependent_materialized_views && replicated_output && replicated_output->lastBlockIsDuplicate())
+    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 = context.getSettingsRef();
+    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
@@ -228,7 +228,7 @@ void PushingToViewsBlockOutputStream::writeSuffix()
 
     std::exception_ptr first_exception;
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
     bool parallel_processing = false;
 
     /// Run writeSuffix() for views in separate thread pool.
@@ -311,7 +311,7 @@ void PushingToViewsBlockOutputStream::writeSuffix()
     UInt64 milliseconds = main_watch.elapsedMilliseconds();
     if (views.size() > 1)
     {
-        LOG_TRACE(log, "Pushing from {} to {} views took {} ms.",
+        LOG_DEBUG(log, "Pushing from {} to {} views took {} ms.",
             storage->getStorageID().getNameForLogs(), views.size(),
             milliseconds);
     }
@@ -353,10 +353,9 @@ void PushingToViewsBlockOutputStream::process(const Block & block, ViewInfo & vi
             ///  but it will contain single block (that is INSERT-ed into main table).
             /// InterpreterSelectQuery will do processing of alias columns.
 
-            Context local_context = *select_context;
-            local_context.addViewSource(
-                StorageValues::create(
-                    storage->getStorageID(), metadata_snapshot->getColumns(), block, storage->getVirtuals()));
+            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());
 
@@ -364,7 +363,7 @@ void PushingToViewsBlockOutputStream::process(const Block & block, ViewInfo & vi
             /// 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, context.getSettingsRef().min_insert_block_size_rows, context.getSettingsRef().min_insert_block_size_bytes);
+                    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
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.h b/src/DataStreams/PushingToViewsBlockOutputStream.h
index 6b32607b294..552a0a3452a 100644
--- a/src/DataStreams/PushingToViewsBlockOutputStream.h
+++ b/src/DataStreams/PushingToViewsBlockOutputStream.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <DataStreams/IBlockOutputStream.h>
-#include <Common/Stopwatch.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
+#include <Common/Stopwatch.h>
 
 namespace Poco
 {
@@ -14,18 +14,16 @@ namespace DB
 {
 
 class ReplicatedMergeTreeBlockOutputStream;
-class Context;
-
 
 /** Writes data to the specified table and to all dependent materialized views.
   */
-class PushingToViewsBlockOutputStream : public IBlockOutputStream
+class PushingToViewsBlockOutputStream : public IBlockOutputStream, WithContext
 {
 public:
     PushingToViewsBlockOutputStream(
         const StoragePtr & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const Context & context_,
+        ContextPtr context_,
         const ASTPtr & query_ptr_,
         bool no_destination = false);
 
@@ -43,7 +41,6 @@ private:
     ReplicatedMergeTreeBlockOutputStream * replicated_output = nullptr;
     Poco::Logger * log;
 
-    const Context & context;
     ASTPtr query_ptr;
     Stopwatch main_watch;
 
@@ -57,8 +54,8 @@ private:
     };
 
     std::vector<ViewInfo> views;
-    std::unique_ptr<Context> select_context;
-    std::unique_ptr<Context> insert_context;
+    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
index a62f7fca0b7..c633600d37f 100644
--- a/src/DataStreams/RemoteBlockInputStream.cpp
+++ b/src/DataStreams/RemoteBlockInputStream.cpp
@@ -6,7 +6,7 @@ namespace DB
 
 RemoteBlockInputStream::RemoteBlockInputStream(
         Connection & connection,
-        const String & query_, const Block & header_, const Context & context_,
+        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_)
 {
@@ -15,7 +15,7 @@ RemoteBlockInputStream::RemoteBlockInputStream(
 
 RemoteBlockInputStream::RemoteBlockInputStream(
         std::vector<IConnectionPool::Entry> && connections,
-        const String & query_, const Block & header_, const Context & context_,
+        const String & query_, const Block & header_, ContextPtr context_,
         const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
     : query_executor(std::move(connections), query_, header_, context_, throttler, scalars_, external_tables_, stage_)
 {
@@ -24,7 +24,7 @@ RemoteBlockInputStream::RemoteBlockInputStream(
 
 RemoteBlockInputStream::RemoteBlockInputStream(
         const ConnectionPoolWithFailoverPtr & pool,
-        const String & query_, const Block & header_, const Context & context_,
+        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_)
 {
diff --git a/src/DataStreams/RemoteBlockInputStream.h b/src/DataStreams/RemoteBlockInputStream.h
index 5ef05ee99eb..b0029da91bb 100644
--- a/src/DataStreams/RemoteBlockInputStream.h
+++ b/src/DataStreams/RemoteBlockInputStream.h
@@ -25,21 +25,21 @@ public:
     /// Takes already set connection.
     RemoteBlockInputStream(
             Connection & connection,
-            const String & query_, const Block & header_, const Context & context_,
+            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(
             std::vector<IConnectionPool::Entry> && connections,
-            const String & query_, const Block & header_, const Context & context_,
+            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_, const Context & context_,
+            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);
 
diff --git a/src/DataStreams/RemoteQueryExecutor.cpp b/src/DataStreams/RemoteQueryExecutor.cpp
index 9cac638ceb5..0c60bfdbfdb 100644
--- a/src/DataStreams/RemoteQueryExecutor.cpp
+++ b/src/DataStreams/RemoteQueryExecutor.cpp
@@ -22,47 +22,49 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int LOGICAL_ERROR;
     extern const int UNKNOWN_PACKET_FROM_SERVER;
     extern const int DUPLICATED_PART_UUIDS;
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
     Connection & connection,
-    const String & query_, const Block & header_, const Context & context_,
-    ThrottlerPtr throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
+    const String & query_, const Block & header_, ContextPtr context_,
+    ThrottlerPtr throttler, const Scalars & scalars_, const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_, std::shared_ptr<TaskIterator> task_iterator_)
     : header(header_), query(query_), context(context_)
-    , scalars(scalars_), external_tables(external_tables_), stage(stage_)
+    , scalars(scalars_), external_tables(external_tables_), stage(stage_), task_iterator(task_iterator_)
 {
     create_connections = [this, &connection, throttler]()
     {
-        return std::make_unique<MultiplexedConnections>(connection, context.getSettingsRef(), throttler);
+        return std::make_unique<MultiplexedConnections>(connection, context->getSettingsRef(), throttler);
     };
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
     std::vector<IConnectionPool::Entry> && connections_,
-    const String & query_, const Block & header_, const Context & context_,
-    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
+    const String & query_, const Block & header_, ContextPtr context_,
+    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_, std::shared_ptr<TaskIterator> task_iterator_)
     : header(header_), query(query_), context(context_)
-    , scalars(scalars_), external_tables(external_tables_), stage(stage_)
+    , scalars(scalars_), external_tables(external_tables_), stage(stage_), task_iterator(task_iterator_)
 {
-    create_connections = [this, connections_, throttler]() mutable
-    {
-        return std::make_unique<MultiplexedConnections>(
-                std::move(connections_), context.getSettingsRef(), throttler);
+    create_connections = [this, connections_, throttler]() mutable {
+        return std::make_unique<MultiplexedConnections>(std::move(connections_), context->getSettingsRef(), throttler);
     };
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
     const ConnectionPoolWithFailoverPtr & pool,
-    const String & query_, const Block & header_, const Context & context_,
-    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
+    const String & query_, const Block & header_, ContextPtr context_,
+    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_, std::shared_ptr<TaskIterator> task_iterator_)
     : header(header_), query(query_), context(context_)
-    , scalars(scalars_), external_tables(external_tables_), stage(stage_)
+    , scalars(scalars_), external_tables(external_tables_), stage(stage_), task_iterator(task_iterator_)
 {
     create_connections = [this, pool, throttler]()->std::unique_ptr<IConnections>
     {
-        const Settings & current_settings = context.getSettingsRef();
+        const Settings & current_settings = context->getSettingsRef();
         auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
 
 #if defined(OS_LINUX)
@@ -157,7 +159,7 @@ void RemoteQueryExecutor::sendQuery()
 
     connections = create_connections();
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
     if (settings.skip_unavailable_shards && 0 == connections->size())
         return;
 
@@ -176,7 +178,7 @@ void RemoteQueryExecutor::sendQuery()
     was_cancelled = false;
 
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
-    ClientInfo modified_client_info = context.getClientInfo();
+    ClientInfo modified_client_info = context->getClientInfo();
     modified_client_info.query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
     if (CurrentThread::isInitialized())
     {
@@ -205,7 +207,7 @@ Block RemoteQueryExecutor::read()
     {
         sendQuery();
 
-        if (context.getSettingsRef().skip_unavailable_shards && (0 == connections->size()))
+        if (context->getSettingsRef().skip_unavailable_shards && (0 == connections->size()))
             return {};
     }
 
@@ -231,7 +233,7 @@ std::variant<Block, int> RemoteQueryExecutor::read(std::unique_ptr<ReadContext>
     {
         sendQuery();
 
-        if (context.getSettingsRef().skip_unavailable_shards && (0 == connections->size()))
+        if (context->getSettingsRef().skip_unavailable_shards && (0 == connections->size()))
             return Block();
     }
 
@@ -297,6 +299,9 @@ std::optional<Block> RemoteQueryExecutor::processPacket(Packet packet)
 {
     switch (packet.type)
     {
+        case Protocol::Server::ReadTaskRequest:
+            processReadTaskRequest();
+            break;
         case Protocol::Server::PartUUIDs:
             if (!setPartUUIDs(packet.part_uuids))
                 got_duplicated_part_uuids = true;
@@ -363,8 +368,8 @@ std::optional<Block> RemoteQueryExecutor::processPacket(Packet packet)
 
 bool RemoteQueryExecutor::setPartUUIDs(const std::vector<UUID> & uuids)
 {
-    Context & query_context = const_cast<Context &>(context).getQueryContext();
-    auto duplicates = query_context.getPartUUIDs()->add(uuids);
+    auto query_context = context->getQueryContext();
+    auto duplicates = query_context->getPartUUIDs()->add(uuids);
 
     if (!duplicates.empty())
     {
@@ -375,6 +380,14 @@ bool RemoteQueryExecutor::setPartUUIDs(const std::vector<UUID> & uuids)
     return true;
 }
 
+void RemoteQueryExecutor::processReadTaskRequest()
+{
+    if (!task_iterator)
+        throw Exception("Distributed task iterator is not initialized", ErrorCodes::LOGICAL_ERROR);
+    auto response = (*task_iterator)();
+    connections->sendReadTaskResponse(response);
+}
+
 void RemoteQueryExecutor::finish(std::unique_ptr<ReadContext> * read_context)
 {
     /** If one of:
@@ -445,8 +458,6 @@ void RemoteQueryExecutor::sendScalars()
 
 void RemoteQueryExecutor::sendExternalTables()
 {
-    SelectQueryInfo query_info;
-
     size_t count = connections->size();
 
     {
@@ -461,24 +472,29 @@ void RemoteQueryExecutor::sendExternalTables()
             for (const auto & table : external_tables)
             {
                 StoragePtr cur = table.second;
-                auto metadata_snapshot = cur->getInMemoryMetadataPtr();
-                QueryProcessingStage::Enum read_from_table_stage = cur->getQueryProcessingStage(
-                    context, QueryProcessingStage::Complete, query_info);
-
-                Pipe pipe = cur->read(
-                    metadata_snapshot->getColumns().getNamesOfPhysical(),
-                    metadata_snapshot, query_info, context,
-                    read_from_table_stage, DEFAULT_BLOCK_SIZE, 1);
 
                 auto data = std::make_unique<ExternalTableData>();
                 data->table_name = table.first;
+                data->creating_pipe_callback = [cur, context = this->context]()
+                {
+                    SelectQueryInfo query_info;
+                    auto metadata_snapshot = cur->getInMemoryMetadataPtr();
+                    QueryProcessingStage::Enum read_from_table_stage = cur->getQueryProcessingStage(
+                        context, QueryProcessingStage::Complete, metadata_snapshot, query_info);
 
-                if (pipe.empty())
-                    data->pipe = std::make_unique<Pipe>(
+                    Pipe pipe = cur->read(
+                        metadata_snapshot->getColumns().getNamesOfPhysical(),
+                        metadata_snapshot, query_info, context,
+                        read_from_table_stage, DEFAULT_BLOCK_SIZE, 1);
+
+                    if (pipe.empty())
+                        return std::make_unique<Pipe>(
                             std::make_shared<SourceFromSingleChunk>(metadata_snapshot->getSampleBlock(), Chunk()));
-                else
-                    data->pipe = std::make_unique<Pipe>(std::move(pipe));
 
+                    return std::make_unique<Pipe>(std::move(pipe));
+                };
+
+                data->pipe = data->creating_pipe_callback();
                 res.emplace_back(std::move(data));
             }
             external_tables_data.push_back(std::move(res));
diff --git a/src/DataStreams/RemoteQueryExecutor.h b/src/DataStreams/RemoteQueryExecutor.h
index f55a023231b..a9cffd9cf97 100644
--- a/src/DataStreams/RemoteQueryExecutor.h
+++ b/src/DataStreams/RemoteQueryExecutor.h
@@ -26,6 +26,9 @@ using ProfileInfoCallback = std::function<void(const BlockStreamProfileInfo & in
 
 class RemoteQueryExecutorReadContext;
 
+/// This is the same type as StorageS3Source::IteratorWrapper
+using TaskIterator = std::function<String()>;
+
 /// This class allows one to launch queries on remote replicas of one shard and get results
 class RemoteQueryExecutor
 {
@@ -35,23 +38,23 @@ public:
     /// Takes already set connection.
     RemoteQueryExecutor(
         Connection & connection,
-        const String & query_, const Block & header_, const Context & context_,
+        const String & query_, const Block & header_, ContextPtr context_,
         ThrottlerPtr throttler_ = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::shared_ptr<TaskIterator> task_iterator_ = {});
 
     /// Accepts several connections already taken from pool.
     RemoteQueryExecutor(
         std::vector<IConnectionPool::Entry> && connections_,
-        const String & query_, const Block & header_, const Context & context_,
+        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);
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::shared_ptr<TaskIterator> task_iterator_ = {});
 
     /// Takes a pool and gets one or several connections from it.
     RemoteQueryExecutor(
         const ConnectionPoolWithFailoverPtr & pool,
-        const String & query_, const Block & header_, const Context & context_,
+        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);
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::shared_ptr<TaskIterator> task_iterator_ = {});
 
     ~RemoteQueryExecutor();
 
@@ -108,8 +111,8 @@ private:
     std::unique_ptr<IConnections> connections;
 
     const String query;
-    String query_id = "";
-    Context context;
+    String query_id;
+    ContextPtr context;
 
     ProgressCallback progress_callback;
     ProfileInfoCallback profile_info_callback;
@@ -119,6 +122,8 @@ private:
     /// Temporary tables needed to be sent to remote servers
     Tables external_tables;
     QueryProcessingStage::Enum stage;
+    /// Initiator identifier for distributed task processing
+    std::shared_ptr<TaskIterator> task_iterator;
 
     /// Streams for reading from temporary tables and following sending of data
     /// to remote servers for GLOBAL-subqueries
@@ -179,6 +184,8 @@ private:
     /// Return true if duplicates found.
     bool setPartUUIDs(const std::vector<UUID> & uuids);
 
+    void processReadTaskRequest();
+
     /// Cancell query and restart it with info about duplicated UUIDs
     /// only for `allow_experimental_query_deduplication`.
     std::variant<Block, int> restartQueryWithoutDuplicatedUUIDs(std::unique_ptr<ReadContext> * read_context = nullptr);
diff --git a/src/DataStreams/RemoteQueryExecutorReadContext.cpp b/src/DataStreams/RemoteQueryExecutorReadContext.cpp
index 46c2b6f10cb..eb89fd9398f 100644
--- a/src/DataStreams/RemoteQueryExecutorReadContext.cpp
+++ b/src/DataStreams/RemoteQueryExecutorReadContext.cpp
@@ -19,7 +19,7 @@ struct RemoteQueryExecutorRoutine
         RemoteQueryExecutorReadContext & read_context;
         Fiber & fiber;
 
-        void operator()(int fd, const Poco::Timespan & timeout = 0, const std::string fd_description = "")
+        void operator()(int fd, Poco::Timespan timeout = 0, const std::string fd_description = "")
         {
             try
             {
@@ -89,7 +89,7 @@ RemoteQueryExecutorReadContext::RemoteQueryExecutorReadContext(IConnections & co
     fiber = boost::context::fiber(std::allocator_arg_t(), stack, std::move(routine));
 }
 
-void RemoteQueryExecutorReadContext::setConnectionFD(int fd, const Poco::Timespan & timeout, const std::string & fd_description)
+void RemoteQueryExecutorReadContext::setConnectionFD(int fd, Poco::Timespan timeout, const std::string & fd_description)
 {
     if (fd == connection_fd)
         return;
diff --git a/src/DataStreams/RemoteQueryExecutorReadContext.h b/src/DataStreams/RemoteQueryExecutorReadContext.h
index 4e935bf9c43..5c56bb73dd6 100644
--- a/src/DataStreams/RemoteQueryExecutorReadContext.h
+++ b/src/DataStreams/RemoteQueryExecutorReadContext.h
@@ -58,7 +58,7 @@ public:
     bool checkTimeout(bool blocking = false);
     bool checkTimeoutImpl(bool blocking);
 
-    void setConnectionFD(int fd, const Poco::Timespan & timeout = 0, const std::string & fd_description = "");
+    void setConnectionFD(int fd, Poco::Timespan timeout = 0, const std::string & fd_description = "");
     void setTimer() const;
 
     bool resumeRoutine();
diff --git a/src/DataStreams/TTLAggregationAlgorithm.cpp b/src/DataStreams/TTLAggregationAlgorithm.cpp
index ebe08159c55..9a1cf45772f 100644
--- a/src/DataStreams/TTLAggregationAlgorithm.cpp
+++ b/src/DataStreams/TTLAggregationAlgorithm.cpp
@@ -28,12 +28,12 @@ TTLAggregationAlgorithm::TTLAggregationAlgorithm(
                 descr.arguments.push_back(header.getPositionByName(name));
 
     columns_for_aggregator.resize(description.aggregate_descriptions.size());
-    const Settings & settings = storage_.global_context.getSettingsRef();
+    const Settings & settings = storage_.getContext()->getSettingsRef();
 
     Aggregator::Params params(header, keys, aggregates,
         false, settings.max_rows_to_group_by, settings.group_by_overflow_mode, 0, 0,
         settings.max_bytes_before_external_group_by, settings.empty_result_for_aggregation_by_empty_set,
-        storage_.global_context.getTemporaryVolume(), settings.max_threads, settings.min_free_disk_space_for_temporary_data);
+        storage_.getContext()->getTemporaryVolume(), settings.max_threads, settings.min_free_disk_space_for_temporary_data);
 
     aggregator = std::make_unique<Aggregator>(params);
 }
diff --git a/src/DataStreams/TTLBlockInputStream.cpp b/src/DataStreams/TTLBlockInputStream.cpp
index 4f141a03475..8b31da6d2f1 100644
--- a/src/DataStreams/TTLBlockInputStream.cpp
+++ b/src/DataStreams/TTLBlockInputStream.cpp
@@ -68,8 +68,9 @@ TTLBlockInputStream::TTLBlockInputStream(
                 auto default_ast = it->second.expression->clone();
                 default_ast = addTypeConversionToAST(std::move(default_ast), column.type->getName());
 
-                auto syntax_result = TreeRewriter(storage_.global_context).analyze(default_ast, metadata_snapshot_->getColumns().getAllPhysical());
-                default_expression = ExpressionAnalyzer{default_ast, syntax_result, storage_.global_context}.getActions(true);
+                auto syntax_result
+                    = TreeRewriter(storage_.getContext()).analyze(default_ast, metadata_snapshot_->getColumns().getAllPhysical());
+                default_expression = ExpressionAnalyzer{default_ast, syntax_result, storage_.getContext()}.getActions(true);
                 default_column_name = default_ast->getColumnName();
             }
 
diff --git a/src/DataStreams/TemporaryFileStream.h b/src/DataStreams/TemporaryFileStream.h
index b481cef1bb2..ce9071801d0 100644
--- a/src/DataStreams/TemporaryFileStream.h
+++ b/src/DataStreams/TemporaryFileStream.h
@@ -19,7 +19,7 @@ struct TemporaryFileStream
     CompressedReadBuffer compressed_in;
     BlockInputStreamPtr block_in;
 
-    TemporaryFileStream(const std::string & path)
+    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))
@@ -39,6 +39,7 @@ struct TemporaryFileStream
         CompressedWriteBuffer compressed_buf(file_buf, CompressionCodecFactory::instance().get(codec, {}));
         NativeBlockOutputStream output(compressed_buf, 0, header);
         copyData(input, output, is_cancelled);
+        compressed_buf.finalize();
     }
 };
 
diff --git a/src/DataStreams/copyData.cpp b/src/DataStreams/copyData.cpp
index a0651999034..a26052778a8 100644
--- a/src/DataStreams/copyData.cpp
+++ b/src/DataStreams/copyData.cpp
@@ -49,6 +49,16 @@ void copyDataImpl(IBlockInputStream & from, IBlockOutputStream & to, TCancelCall
     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 &) {}
 
diff --git a/src/DataStreams/copyData.h b/src/DataStreams/copyData.h
index f2bce8f411b..3dc90aed37d 100644
--- a/src/DataStreams/copyData.h
+++ b/src/DataStreams/copyData.h
@@ -16,6 +16,9 @@ class Block;
   */
 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,
diff --git a/src/DataStreams/tests/CMakeLists.txt b/src/DataStreams/examples/CMakeLists.txt
similarity index 100%
rename from src/DataStreams/tests/CMakeLists.txt
rename to src/DataStreams/examples/CMakeLists.txt
diff --git a/src/DataStreams/ya.make.in b/src/DataStreams/ya.make.in
index eeef4b9b95d..6969f644307 100644
--- a/src/DataStreams/ya.make.in
+++ b/src/DataStreams/ya.make.in
@@ -12,7 +12,7 @@ NO_COMPILER_WARNINGS()
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/DataTypes/CMakeLists.txt b/src/DataTypes/CMakeLists.txt
index 65172356645..a6176efc7f3 100644
--- a/src/DataTypes/CMakeLists.txt
+++ b/src/DataTypes/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif ()
diff --git a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
index 3262dd1610a..6b2f94aa7b5 100644
--- a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
@@ -29,8 +29,7 @@ void DataTypeCustomSimpleAggregateFunction::checkSupportedFunctions(const Aggreg
 {
     static const std::vector<String> supported_functions{"any", "anyLast", "min",
         "max", "sum", "sumWithOverflow", "groupBitAnd", "groupBitOr", "groupBitXor",
-        "sumMap", "minMap", "maxMap", "groupArrayArray", "groupUniqArrayArray",
-        "argMin", "argMax"};
+        "sumMap", "minMap", "maxMap", "groupArrayArray", "groupUniqArrayArray"};
 
     // check function
     if (std::find(std::begin(supported_functions), std::end(supported_functions), function->getName()) == std::end(supported_functions))
diff --git a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h
index 44b007ab07f..dc054144e14 100644
--- a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h
+++ b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h
@@ -2,7 +2,6 @@
 
 #include <DataTypes/DataTypeCustom.h>
 #include <AggregateFunctions/IAggregateFunction.h>
-#include <Common/FieldVisitors.h>
 
 #include <IO/ReadHelpers.h>
 
diff --git a/src/DataTypes/DataTypeDateTime.h b/src/DataTypes/DataTypeDateTime.h
index 84df8b21813..926d529a5d8 100644
--- a/src/DataTypes/DataTypeDateTime.h
+++ b/src/DataTypes/DataTypeDateTime.h
@@ -19,9 +19,12 @@ public:
     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;
 };
diff --git a/src/DataTypes/DataTypeDateTime64.h b/src/DataTypes/DataTypeDateTime64.h
index f51e0f5d047..ac0f49613a2 100644
--- a/src/DataTypes/DataTypeDateTime64.h
+++ b/src/DataTypes/DataTypeDateTime64.h
@@ -35,6 +35,8 @@ public:
 
     bool canBePromoted() const override { return false; }
 
+    bool canBeUsedAsVersion() const override { return true; }
+
 protected:
     SerializationPtr doGetDefaultSerialization() const override;
 };
diff --git a/src/DataTypes/DataTypeDecimalBase.cpp b/src/DataTypes/DataTypeDecimalBase.cpp
index 5f64fca6704..830b22b5943 100644
--- a/src/DataTypes/DataTypeDecimalBase.cpp
+++ b/src/DataTypes/DataTypeDecimalBase.cpp
@@ -19,9 +19,14 @@ namespace ErrorCodes
 {
 }
 
-
-bool decimalCheckComparisonOverflow(const Context & context) { return context.getSettingsRef().decimal_check_overflow; }
-bool decimalCheckArithmeticOverflow(const Context & context) { return context.getSettingsRef().decimal_check_overflow; }
+bool decimalCheckComparisonOverflow(ContextConstPtr context)
+{
+    return context->getSettingsRef().decimal_check_overflow;
+}
+bool decimalCheckArithmeticOverflow(ContextConstPtr context)
+{
+    return context->getSettingsRef().decimal_check_overflow;
+}
 
 template <typename T>
 Field DataTypeDecimalBase<T>::getDefault() const
diff --git a/src/DataTypes/DataTypeDecimalBase.h b/src/DataTypes/DataTypeDecimalBase.h
index 85cb9fa8363..17b73a8e3d6 100644
--- a/src/DataTypes/DataTypeDecimalBase.h
+++ b/src/DataTypes/DataTypeDecimalBase.h
@@ -1,11 +1,12 @@
 #pragma once
-#include <cmath>
 
 #include <Columns/ColumnDecimal.h>
 #include <Core/DecimalFunctions.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context_fwd.h>
 
+#include <cmath>
 #include <type_traits>
 
 
@@ -17,9 +18,8 @@ namespace ErrorCodes
     extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
-class Context;
-bool decimalCheckComparisonOverflow(const Context & context);
-bool decimalCheckArithmeticOverflow(const Context & context);
+bool decimalCheckComparisonOverflow(ContextConstPtr context);
+bool decimalCheckArithmeticOverflow(ContextConstPtr context);
 
 inline UInt32 leastDecimalPrecisionFor(TypeIndex int_type)
 {
@@ -76,7 +76,7 @@ public:
             throw Exception("Scale " + std::to_string(scale) + " is out of bounds", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
     }
 
-    TypeIndex getTypeId() const override { return TypeId<T>::value; }
+    TypeIndex getTypeId() const override { return TypeId<T>; }
 
     Field getDefault() const override;
     MutableColumnPtr createColumn() const override;
@@ -113,15 +113,15 @@ public:
 
     T maxWholeValue() const { return getScaleMultiplier(precision - scale) - T(1); }
 
-    template<typename U>
+    template <typename U>
     bool canStoreWhole(U x) const
     {
-        static_assert(std::is_signed_v<typename T::NativeType>);
+        static_assert(is_signed_v<typename T::NativeType>);
         T max = maxWholeValue();
-        if constexpr (std::is_signed_v<U>)
-            return -max <= x && x <= max;
+        if constexpr (is_signed_v<U>)
+            return -max.value <= x && x <= max.value;
         else
-            return x <= static_cast<std::make_unsigned_t<typename T::NativeType>>(max.value);
+            return x <= static_cast<make_unsigned_t<typename T::NativeType>>(max.value);
     }
 
     /// @returns multiplier for U to become T with correct scale
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index eee3f22f9f1..c28de15565c 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -156,7 +156,7 @@ void DataTypeFactory::registerSimpleDataTypeCustom(const String &name, SimpleCre
 
 const DataTypeFactory::Value & DataTypeFactory::findCreatorByName(const String & family_name) const
 {
-    const Context * query_context = nullptr;
+    ContextPtr query_context;
     if (CurrentThread::isInitialized())
         query_context = CurrentThread::get().getQueryContext();
 
diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index 485083d67ee..95a5addf62a 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -79,6 +79,8 @@ MutableColumnUniquePtr DataTypeLowCardinality::createColumnUniqueImpl(const IDat
         return creator(static_cast<ColumnVector<UInt16> *>(nullptr));
     else if (which.isDateTime())
         return creator(static_cast<ColumnVector<UInt32> *>(nullptr));
+    else if (which.isUUID())
+        return creator(static_cast<ColumnVector<UUID> *>(nullptr));
     else if (which.isInt() || which.isUInt() || which.isFloat())
     {
         MutableColumnUniquePtr column;
diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index 1d580761362..b09a5e9e590 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -55,9 +55,12 @@ DataTypeMap::DataTypeMap(const DataTypePtr & key_type_, const DataTypePtr & valu
 
 void DataTypeMap::assertKeyType() const
 {
-    if (!key_type->isValueRepresentedByInteger() && !isStringOrFixedString(*key_type) && !WhichDataType(key_type).isNothing())
+    if (!key_type->isValueRepresentedByInteger()
+        && !isStringOrFixedString(*key_type)
+        && !WhichDataType(key_type).isNothing()
+        && !WhichDataType(key_type).isUUID())
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "Type of Map key must be a type, that can be represented by integer or string,"
+            "Type of Map key must be a type, that can be represented by integer or string or UUID,"
             " but {} given", key_type->getName());
 }
 
diff --git a/src/DataTypes/DataTypeNumberBase.cpp b/src/DataTypes/DataTypeNumberBase.cpp
index a9df7db7334..12d1989a9d6 100644
--- a/src/DataTypes/DataTypeNumberBase.cpp
+++ b/src/DataTypes/DataTypeNumberBase.cpp
@@ -43,7 +43,7 @@ template class DataTypeNumberBase<UInt8>;
 template class DataTypeNumberBase<UInt16>;
 template class DataTypeNumberBase<UInt32>;
 template class DataTypeNumberBase<UInt64>;
-template class DataTypeNumberBase<UInt128>; // base for UUID
+template class DataTypeNumberBase<UInt128>;
 template class DataTypeNumberBase<UInt256>;
 template class DataTypeNumberBase<Int8>;
 template class DataTypeNumberBase<Int16>;
diff --git a/src/DataTypes/DataTypeNumberBase.h b/src/DataTypes/DataTypeNumberBase.h
index 97c3563b032..c24778691d9 100644
--- a/src/DataTypes/DataTypeNumberBase.h
+++ b/src/DataTypes/DataTypeNumberBase.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/UInt128.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/Serializations/SerializationNumber.h>
 
@@ -16,19 +15,17 @@ class ColumnVector;
 template <typename T>
 class DataTypeNumberBase : public IDataType
 {
-    static_assert(IsNumber<T>);
+    static_assert(is_arithmetic_v<T>);
 
 public:
     static constexpr bool is_parametric = false;
+    static constexpr auto family_name = TypeName<T>;
 
     using FieldType = T;
-    static constexpr auto type_id = TypeId<T>::value;
-    static constexpr auto family_name = TypeName<T>::get();
-
     using ColumnType = ColumnVector<T>;
 
-    const char * getFamilyName() const override { return family_name; }
-    TypeIndex getTypeId() const override { return type_id; }
+    const char * getFamilyName() const override { return TypeName<T>; }
+    TypeIndex getTypeId() const override { return TypeId<T>; }
 
     Field getDefault() const override;
 
@@ -63,7 +60,7 @@ extern template class DataTypeNumberBase<UInt8>;
 extern template class DataTypeNumberBase<UInt16>;
 extern template class DataTypeNumberBase<UInt32>;
 extern template class DataTypeNumberBase<UInt64>;
-extern template class DataTypeNumberBase<UInt128>; // base for UUID
+extern template class DataTypeNumberBase<UInt128>;
 extern template class DataTypeNumberBase<UInt256>;
 extern template class DataTypeNumberBase<Int16>;
 extern template class DataTypeNumberBase<Int8>;
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index b30efb163ab..9ebc061d6f9 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -307,26 +307,30 @@ SerializationPtr DataTypeTuple::getSubcolumnSerialization(
 SerializationPtr DataTypeTuple::doGetDefaultSerialization() const
 {
     SerializationTuple::ElementSerializations serializations(elems.size());
+    bool use_explicit_names = have_explicit_names && serialize_names;
     for (size_t i = 0; i < elems.size(); ++i)
     {
+        String elem_name = use_explicit_names ? names[i] : toString(i + 1);
         auto serialization = elems[i]->getDefaultSerialization();
-        serializations[i] = std::make_shared<SerializationTupleElement>(serialization, names[i]);
+        serializations[i] = std::make_shared<SerializationTupleElement>(serialization, elem_name);
     }
 
-    return std::make_shared<SerializationTuple>(std::move(serializations), have_explicit_names);
+    return std::make_shared<SerializationTuple>(std::move(serializations), use_explicit_names);
 }
 
 SerializationPtr DataTypeTuple::getSerialization(const String & column_name, const StreamExistenceCallback & callback) const
 {
     SerializationTuple::ElementSerializations serializations(elems.size());
+    bool use_explicit_names = have_explicit_names && serialize_names;
     for (size_t i = 0; i < elems.size(); ++i)
     {
-        auto subcolumn_name = Nested::concatenateName(column_name, names[i]);
+        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, names[i]);
+        serializations[i] = std::make_shared<SerializationTupleElement>(serializaion, elem_name);
     }
 
-    return std::make_shared<SerializationTuple>(std::move(serializations), have_explicit_names);
+    return std::make_shared<SerializationTuple>(std::move(serializations), use_explicit_names);
 }
 
 static DataTypePtr create(const ASTPtr & arguments)
diff --git a/src/DataTypes/DataTypeUUID.cpp b/src/DataTypes/DataTypeUUID.cpp
index 387ccc56a71..44182a700b4 100644
--- a/src/DataTypes/DataTypeUUID.cpp
+++ b/src/DataTypes/DataTypeUUID.cpp
@@ -16,6 +16,16 @@ SerializationPtr DataTypeUUID::doGetDefaultSerialization() const
     return std::make_shared<SerializationUUID>();
 }
 
+Field DataTypeUUID::getDefault() const
+{
+    return UUID{};
+}
+
+MutableColumnPtr DataTypeUUID::createColumn() const
+{
+    return ColumnVector<UUID>::create();
+}
+
 void registerDataTypeUUID(DataTypeFactory & factory)
 {
     factory.registerSimpleDataType("UUID", [] { return DataTypePtr(std::make_shared<DataTypeUUID>()); });
diff --git a/src/DataTypes/DataTypeUUID.h b/src/DataTypes/DataTypeUUID.h
index 1546ca385a4..5ed7a912607 100644
--- a/src/DataTypes/DataTypeUUID.h
+++ b/src/DataTypes/DataTypeUUID.h
@@ -1,26 +1,45 @@
 #pragma once
 
-#include <Common/UInt128.h>
-#include <DataTypes/DataTypeNumberBase.h>
 #include <DataTypes/IDataType.h>
+#include <Columns/ColumnVector.h>
+#include <Core/UUID.h>
+
 
 namespace DB
 {
 
-class DataTypeUUID final : public DataTypeNumberBase<UInt128>
+class DataTypeUUID : public IDataType
 {
-
 public:
+    static constexpr bool is_parametric = false;
+
+    using FieldType = UUID;
+    using ColumnType = ColumnVector<UUID>;
+
     const char * getFamilyName() const override { return "UUID"; }
     TypeIndex getTypeId() const override { return TypeIndex::UUID; }
 
+    Field getDefault() const override;
+
+    MutableColumnPtr createColumn() const override;
+
+    bool isParametric() const override { return false; }
+    bool haveSubtypes() const override { return false; }
+
     bool equals(const IDataType & rhs) const override;
 
     bool canBeUsedInBitOperations() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
-    bool canBeInsideLowCardinality() const override { return false; }
-
     bool canBePromoted() const override { return false; }
+    bool shouldAlignRightInPrettyFormats() const override { return false; }
+    bool textCanContainOnlyValidUTF8() const override { return true; }
+    bool isComparable() const override { return true; }
+    bool isValueUnambiguouslyRepresentedInContiguousMemoryRegion() const override { return true; }
+    bool isValueUnambiguouslyRepresentedInFixedSizeContiguousMemoryRegion() const override { return true; }
+    bool haveMaximumSizeOfValue() const override { return true; }
+    size_t getSizeOfValueInMemory() const override { return sizeof(UUID); }
+    bool isCategorial() const override { return true; }
+    bool canBeInsideLowCardinality() const override { return true; }
 
     SerializationPtr doGetDefaultSerialization() const override;
 };
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index 5aeac78b2ef..f08bdb80d41 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <common/arithmeticOverflow.h>
+#include <common/extended_types.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypeDecimalBase.h>
@@ -38,7 +39,7 @@ public:
 
     const char * getFamilyName() const override { return family_name; }
     std::string doGetName() const override;
-    TypeIndex getTypeId() const override { return TypeId<T>::value; }
+    TypeIndex getTypeId() const override { return TypeId<T>; }
     bool canBePromoted() const override { return true; }
     DataTypePtr promoteNumericType() const override;
 
@@ -150,7 +151,7 @@ tryConvertDecimals(const typename FromDataType::FieldType & value, UInt32 scale_
 }
 
 template <typename FromDataType, typename ToDataType, typename ReturnType>
-inline std::enable_if_t<IsDataTypeDecimal<FromDataType> && IsNumber<typename ToDataType::FieldType>, ReturnType>
+inline std::enable_if_t<IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>, ReturnType>
 convertFromDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
 {
     using FromFieldType = typename FromDataType::FieldType;
@@ -160,7 +161,7 @@ convertFromDecimalImpl(const typename FromDataType::FieldType & value, UInt32 sc
 }
 
 template <typename FromDataType, typename ToDataType>
-inline std::enable_if_t<IsDataTypeDecimal<FromDataType> && IsNumber<typename ToDataType::FieldType>, typename ToDataType::FieldType>
+inline std::enable_if_t<IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>, typename ToDataType::FieldType>
 convertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale)
 {
     typename ToDataType::FieldType result;
@@ -171,14 +172,14 @@ convertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale)
 }
 
 template <typename FromDataType, typename ToDataType>
-inline std::enable_if_t<IsDataTypeDecimal<FromDataType> && IsNumber<typename ToDataType::FieldType>, bool>
+inline std::enable_if_t<IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>, bool>
 tryConvertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
 {
     return convertFromDecimalImpl<FromDataType, ToDataType, bool>(value, scale, result);
 }
 
 template <typename FromDataType, typename ToDataType, typename ReturnType>
-inline std::enable_if_t<IsNumber<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>, ReturnType>
+inline std::enable_if_t<is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>, ReturnType>
 convertToDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
 {
     using FromFieldType = typename FromDataType::FieldType;
@@ -199,35 +200,18 @@ convertToDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scal
         }
 
         auto out = value * static_cast<FromFieldType>(DecimalUtils::scaleMultiplier<ToNativeType>(scale));
-        if constexpr (std::is_same_v<ToNativeType, Int128>)
-        {
-            static constexpr Int128 min_int128 = minInt128();
-            static constexpr Int128 max_int128 = maxInt128();
 
-            if (out <= static_cast<ToNativeType>(min_int128) || out >= static_cast<ToNativeType>(max_int128))
-            {
-                if constexpr (throw_exception)
-                    throw Exception(std::string(ToDataType::family_name) + " convert overflow. Float is out of Decimal range",
-                                    ErrorCodes::DECIMAL_OVERFLOW);
-                else
-                    return ReturnType(false);
-            }
-        }
-        else
+        if (out <= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::min()) ||
+            out >= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::max()))
         {
-            if (out <= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::min()) ||
-                out >= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::max()))
-            {
-                if constexpr (throw_exception)
-                    throw Exception(std::string(ToDataType::family_name) + " convert overflow. Float is out of Decimal range",
-                                    ErrorCodes::DECIMAL_OVERFLOW);
-                else
-                    return ReturnType(false);
-            }
+            if constexpr (throw_exception)
+                throw Exception(std::string(ToDataType::family_name) + " convert overflow. Float is out of Decimal range",
+                                ErrorCodes::DECIMAL_OVERFLOW);
+            else
+                return ReturnType(false);
         }
 
         result = static_cast<ToNativeType>(out);
-
         return ReturnType(true);
     }
     else
@@ -235,25 +219,23 @@ convertToDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scal
         if constexpr (is_big_int_v<FromFieldType>)
             return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal256>, ToDataType, ReturnType>(static_cast<Int256>(value), 0, scale, result));
         else if constexpr (std::is_same_v<FromFieldType, UInt64>)
-            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal128>, ToDataType, ReturnType>(value, 0, scale, result));
+            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal128>, ToDataType, ReturnType>(static_cast<Int128>(value), 0, scale, result));
         else
-            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal64>, ToDataType, ReturnType>(value, 0, scale, result));
+            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal64>, ToDataType, ReturnType>(static_cast<Int64>(value), 0, scale, result));
     }
 }
 
 template <typename FromDataType, typename ToDataType>
-inline std::enable_if_t<IsNumber<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>, typename ToDataType::FieldType>
+inline std::enable_if_t<is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>, typename ToDataType::FieldType>
 convertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale)
 {
     typename ToDataType::FieldType result;
-
     convertToDecimalImpl<FromDataType, ToDataType, void>(value, scale, result);
-
     return result;
 }
 
 template <typename FromDataType, typename ToDataType>
-inline std::enable_if_t<IsNumber<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>, bool>
+inline std::enable_if_t<is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>, bool>
 tryConvertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
 {
     return convertToDecimalImpl<FromDataType, ToDataType, bool>(value, scale, result);
diff --git a/src/DataTypes/DataTypesNumber.cpp b/src/DataTypes/DataTypesNumber.cpp
index 5cfffa878f2..6a1aed888c9 100644
--- a/src/DataTypes/DataTypesNumber.cpp
+++ b/src/DataTypes/DataTypesNumber.cpp
@@ -21,12 +21,12 @@ static DataTypePtr createNumericDataType(const ASTPtr & arguments)
         if (std::is_integral_v<T>)
         {
             if (arguments->children.size() > 1)
-                throw Exception(String(TypeName<T>::get()) + " data type family must not have more than one argument - display width", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "{} data type family must not have more than one argument - display width", TypeName<T>);
         }
         else
         {
             if (arguments->children.size() > 2)
-                throw Exception(String(TypeName<T>::get()) + " data type family must not have more than two arguments - total number of digits and number of digits following the decimal point", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "{} data type family must not have more than two arguments - total number of digits and number of digits following the decimal point", TypeName<T>);
         }
     }
     return std::make_shared<DataTypeNumber<T>>();
@@ -44,10 +44,13 @@ void registerDataTypeNumbers(DataTypeFactory & factory)
     factory.registerDataType("Int16", createNumericDataType<Int16>);
     factory.registerDataType("Int32", createNumericDataType<Int32>);
     factory.registerDataType("Int64", createNumericDataType<Int64>);
+
     factory.registerDataType("Float32", createNumericDataType<Float32>);
     factory.registerDataType("Float64", createNumericDataType<Float64>);
 
+    factory.registerSimpleDataType("UInt128", [] { return DataTypePtr(std::make_shared<DataTypeUInt128>()); });
     factory.registerSimpleDataType("UInt256", [] { return DataTypePtr(std::make_shared<DataTypeUInt256>()); });
+
     factory.registerSimpleDataType("Int128", [] { return DataTypePtr(std::make_shared<DataTypeInt128>()); });
     factory.registerSimpleDataType("Int256", [] { return DataTypePtr(std::make_shared<DataTypeInt256>()); });
 
diff --git a/src/DataTypes/DataTypesNumber.h b/src/DataTypes/DataTypesNumber.h
index 79272756465..9f026e06127 100644
--- a/src/DataTypes/DataTypesNumber.h
+++ b/src/DataTypes/DataTypesNumber.h
@@ -44,6 +44,7 @@ using DataTypeInt64 = DataTypeNumber<Int64>;
 using DataTypeFloat32 = DataTypeNumber<Float32>;
 using DataTypeFloat64 = DataTypeNumber<Float64>;
 
+using DataTypeUInt128 = DataTypeNumber<UInt128>;
 using DataTypeInt128 = DataTypeNumber<Int128>;
 using DataTypeUInt256 = DataTypeNumber<UInt256>;
 using DataTypeInt256 = DataTypeNumber<Int256>;
diff --git a/src/DataTypes/EnumValues.cpp b/src/DataTypes/EnumValues.cpp
index d4ca7e4dfdd..6df899ba9a2 100644
--- a/src/DataTypes/EnumValues.cpp
+++ b/src/DataTypes/EnumValues.cpp
@@ -66,11 +66,22 @@ T EnumValues<T>::getValue(StringRef field_name, bool try_treat_as_id) const
             if (tmp_buf.eof() && value_to_name_map.find(x) != value_to_name_map.end())
                 return x;
         }
-        throw Exception{"Unknown element '" + field_name.toString() + "' for enum", ErrorCodes::BAD_ARGUMENTS};
+        auto hints = this->getHints(field_name.toString());
+        auto hints_string = !hints.empty() ? ", maybe you meant: " + toString(hints) : "";
+        throw Exception{"Unknown element '" + field_name.toString() + "' for enum" + hints_string, ErrorCodes::BAD_ARGUMENTS};
     }
     return it->getMapped();
 }
 
+template <typename T>
+Names EnumValues<T>::getAllRegisteredNames() const
+{
+    Names result;
+    for (const auto & value : values)
+        result.emplace_back(value.first);
+    return result;
+}
+
 template class EnumValues<Int8>;
 template class EnumValues<Int16>;
 
diff --git a/src/DataTypes/EnumValues.h b/src/DataTypes/EnumValues.h
index 45ac30f9cd7..d03a8867e42 100644
--- a/src/DataTypes/EnumValues.h
+++ b/src/DataTypes/EnumValues.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <Common/HashTable/HashMap.h>
 #include <unordered_map>
+#include <Common/HashTable/HashMap.h>
+#include <Common/NamePrompter.h>
 
 namespace DB
 {
@@ -12,7 +13,7 @@ namespace ErrorCodes
 }
 
 template <typename T>
-class EnumValues
+class EnumValues : public IHints<1, EnumValues<T>>
 {
 public:
     using Value = std::pair<std::string, T>;
@@ -65,6 +66,8 @@ public:
 
         return std::all_of(rhs_values.begin(), rhs_values.end(), check);
     }
+
+    Names getAllRegisteredNames() const override;
 };
 
 }
diff --git a/src/DataTypes/FieldToDataType.cpp b/src/DataTypes/FieldToDataType.cpp
index 95f03385121..a8d439612f5 100644
--- a/src/DataTypes/FieldToDataType.cpp
+++ b/src/DataTypes/FieldToDataType.cpp
@@ -1,4 +1,3 @@
-#include <Common/FieldVisitors.h>
 #include <DataTypes/FieldToDataType.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeMap.h>
@@ -8,6 +7,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Common/Exception.h>
@@ -20,7 +20,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int EMPTY_DATA_PASSED;
-    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -37,11 +36,6 @@ DataTypePtr FieldToDataType::operator() (const UInt64 & x) const
     return std::make_shared<DataTypeUInt64>();
 }
 
-DataTypePtr FieldToDataType::operator() (const UInt128 &) const
-{
-    throw Exception("There are no UInt128 literals in SQL", ErrorCodes::NOT_IMPLEMENTED);
-}
-
 DataTypePtr FieldToDataType::operator() (const Int64 & x) const
 {
     if (x <= std::numeric_limits<Int8>::max() && x >= std::numeric_limits<Int8>::min()) return std::make_shared<DataTypeInt8>();
@@ -50,20 +44,36 @@ DataTypePtr FieldToDataType::operator() (const Int64 & x) const
     return std::make_shared<DataTypeInt64>();
 }
 
-DataTypePtr FieldToDataType::operator() (const Int128 & x) const
-{
-    if (x <= std::numeric_limits<Int8>::max() && x >= std::numeric_limits<Int8>::min()) return std::make_shared<DataTypeInt8>();
-    if (x <= std::numeric_limits<Int16>::max() && x >= std::numeric_limits<Int16>::min()) return std::make_shared<DataTypeInt16>();
-    if (x <= std::numeric_limits<Int32>::max() && x >= std::numeric_limits<Int32>::min()) return std::make_shared<DataTypeInt32>();
-    if (x <= std::numeric_limits<Int64>::max() && x >= std::numeric_limits<Int64>::min()) return std::make_shared<DataTypeInt64>();
-    return std::make_shared<DataTypeInt128>();
-}
-
 DataTypePtr FieldToDataType::operator() (const Float64 &) const
 {
     return std::make_shared<DataTypeFloat64>();
 }
 
+DataTypePtr FieldToDataType::operator() (const UInt128 &) const
+{
+    return std::make_shared<DataTypeUInt128>();
+}
+
+DataTypePtr FieldToDataType::operator() (const Int128 &) const
+{
+    return std::make_shared<DataTypeInt128>();
+}
+
+DataTypePtr FieldToDataType::operator() (const UInt256 &) const
+{
+    return std::make_shared<DataTypeUInt256>();
+}
+
+DataTypePtr FieldToDataType::operator() (const Int256 &) const
+{
+    return std::make_shared<DataTypeInt256>();
+}
+
+DataTypePtr FieldToDataType::operator() (const UUID &) const
+{
+    return std::make_shared<DataTypeUUID>();
+}
+
 DataTypePtr FieldToDataType::operator() (const String &) const
 {
     return std::make_shared<DataTypeString>();
@@ -143,14 +153,4 @@ DataTypePtr FieldToDataType::operator() (const AggregateFunctionStateData & x) c
     return DataTypeFactory::instance().get(name);
 }
 
-DataTypePtr FieldToDataType::operator() (const UInt256 &) const
-{
-    throw Exception("There are no UInt256 literals in SQL", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-DataTypePtr FieldToDataType::operator() (const Int256 &) const
-{
-    throw Exception("There are no Int256 literals in SQL", ErrorCodes::NOT_IMPLEMENTED);
-}
-
 }
diff --git a/src/DataTypes/FieldToDataType.h b/src/DataTypes/FieldToDataType.h
index 39457564a2f..ca83ce868fc 100644
--- a/src/DataTypes/FieldToDataType.h
+++ b/src/DataTypes/FieldToDataType.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <memory>
+#include <Core/Types.h>
+#include <Core/Field.h>
 #include <Common/FieldVisitors.h>
 
 
@@ -20,8 +23,11 @@ public:
     DataTypePtr operator() (const Null & x) const;
     DataTypePtr operator() (const UInt64 & x) const;
     DataTypePtr operator() (const UInt128 & x) const;
+    DataTypePtr operator() (const UInt256 & x) const;
     DataTypePtr operator() (const Int64 & x) const;
     DataTypePtr operator() (const Int128 & x) const;
+    DataTypePtr operator() (const Int256 & x) const;
+    DataTypePtr operator() (const UUID & x) const;
     DataTypePtr operator() (const Float64 & x) const;
     DataTypePtr operator() (const String & x) const;
     DataTypePtr operator() (const Array & x) const;
@@ -32,8 +38,6 @@ public:
     DataTypePtr operator() (const DecimalField<Decimal128> & x) const;
     DataTypePtr operator() (const DecimalField<Decimal256> & x) const;
     DataTypePtr operator() (const AggregateFunctionStateData & x) const;
-    DataTypePtr operator() (const UInt256 & x) const;
-    DataTypePtr operator() (const Int256 & x) const;
 };
 
 }
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index 9b762cfa4c5..e0f5d3302df 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -177,7 +177,7 @@ public:
       */
     virtual bool canBeComparedWithCollation() const { return false; }
 
-    /** If the type is totally comparable (Ints, Date, DateTime, not nullable, not floats)
+    /** If the type is totally comparable (Ints, Date, DateTime, DateTime64, not nullable, not floats)
       *  and "simple" enough (not String, FixedString) to be used as version number
       *  (to select rows with maximum version).
       */
@@ -341,8 +341,6 @@ struct WhichDataType
     constexpr bool isNullable() const { return idx == TypeIndex::Nullable; }
     constexpr bool isFunction() const { return idx == TypeIndex::Function; }
     constexpr bool isAggregateFunction() const { return idx == TypeIndex::AggregateFunction; }
-
-    constexpr bool IsBigIntOrDeimal() const { return isInt128() || isInt256() || isUInt256() || isDecimal256(); }
 };
 
 /// IDataType helpers (alternative for IDataType virtual methods with single point of truth)
@@ -360,7 +358,8 @@ inline bool isEnum(const DataTypePtr & data_type) { return WhichDataType(data_ty
 inline bool isDecimal(const DataTypePtr & data_type) { return WhichDataType(data_type).isDecimal(); }
 inline bool isTuple(const DataTypePtr & data_type) { return WhichDataType(data_type).isTuple(); }
 inline bool isArray(const DataTypePtr & data_type) { return WhichDataType(data_type).isArray(); }
-inline bool isMap(const DataTypePtr & data_type) {return WhichDataType(data_type).isMap(); }
+inline bool isMap(const DataTypePtr & data_type) { return WhichDataType(data_type).isMap(); }
+inline bool isNothing(const DataTypePtr & data_type) { return WhichDataType(data_type).isNothing(); }
 
 template <typename T>
 inline bool isUInt8(const T & data_type)
@@ -429,7 +428,7 @@ template <typename T, typename DataType>
 inline bool isColumnedAsDecimalT(const DataType & data_type)
 {
     const WhichDataType which(data_type);
-    return (which.isDecimal() || which.isDateTime64()) && which.idx == TypeId<T>::value;
+    return (which.isDecimal() || which.isDateTime64()) && which.idx == TypeId<T>;
 }
 
 template <typename T>
@@ -468,19 +467,6 @@ inline bool isCompilableType(const DataTypePtr & data_type)
     return data_type->isValueRepresentedByNumber() && !isDecimal(data_type);
 }
 
-template <TypeIndex TYPE_IDX, typename DataType>
-inline bool isDataType(const DataType & data_type)
-{
-    WhichDataType which(data_type);
-    return which.idx == TYPE_IDX;
-}
-
-template <typename ExpectedDataType, typename DataType>
-inline bool isDataType(const DataType & data_type)
-{
-    return isDataType<ExpectedDataType::type_id>(data_type);
-}
-
 template <typename DataType> constexpr bool IsDataTypeDecimal = false;
 template <typename DataType> constexpr bool IsDataTypeNumber = false;
 template <typename DataType> constexpr bool IsDataTypeDateOrDateTime = false;
diff --git a/src/DataTypes/Native.h b/src/DataTypes/Native.h
index 754365dfc87..a1d07b54c8e 100644
--- a/src/DataTypes/Native.h
+++ b/src/DataTypes/Native.h
@@ -5,15 +5,12 @@
 #endif
 
 #if USE_EMBEDDED_COMPILER
-#    include <DataTypes/DataTypeDate.h>
-#    include <DataTypes/DataTypeDateTime.h>
-#    include <DataTypes/DataTypeFixedString.h>
-#    include <DataTypes/DataTypeInterval.h>
-#    include <DataTypes/DataTypeNullable.h>
-#    include <DataTypes/DataTypeUUID.h>
-#    include <DataTypes/DataTypesNumber.h>
-#    include <Common/typeid_cast.h>
+#    include <Common/Exception.h>
 
+#    include <DataTypes/IDataType.h>
+#    include <DataTypes/DataTypeNullable.h>
+#    include <Columns/ColumnConst.h>
+#    include <Columns/ColumnNullable.h>
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wunused-parameter"
 
@@ -29,60 +26,52 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-template <typename... Ts>
-static inline bool typeIsEither(const IDataType & type)
-{
-    return (typeid_cast<const Ts *>(&type) || ...);
-}
-
 static inline bool typeIsSigned(const IDataType & type)
 {
-    return typeIsEither<
-        DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64,
-        DataTypeFloat32, DataTypeFloat64, DataTypeInterval
-    >(type);
+    WhichDataType data_type(type);
+    return data_type.isNativeInt() || data_type.isFloat();
 }
 
 static inline llvm::Type * toNativeType(llvm::IRBuilderBase & builder, const IDataType & type)
 {
-    if (auto * nullable = typeid_cast<const DataTypeNullable *>(&type))
+    WhichDataType data_type(type);
+
+    if (data_type.isNullable())
     {
-        auto * wrapped = toNativeType(builder, *nullable->getNestedType());
-        return wrapped ? llvm::StructType::get(wrapped, /* is null = */ builder.getInt1Ty()) : nullptr;
+        const auto & data_type_nullable = static_cast<const DataTypeNullable&>(type);
+        auto * wrapped = toNativeType(builder, *data_type_nullable.getNestedType());
+        auto * is_null_type = builder.getInt1Ty();
+        return wrapped ? llvm::StructType::get(wrapped, is_null_type) : nullptr;
     }
+
     /// LLVM doesn't have unsigned types, it has unsigned instructions.
-    if (typeIsEither<DataTypeInt8, DataTypeUInt8>(type))
+    if (data_type.isInt8() || data_type.isUInt8())
         return builder.getInt8Ty();
-    if (typeIsEither<DataTypeInt16, DataTypeUInt16, DataTypeDate>(type))
+    else if (data_type.isInt16() || data_type.isUInt16() || data_type.isDate())
         return builder.getInt16Ty();
-    if (typeIsEither<DataTypeInt32, DataTypeUInt32, DataTypeDateTime>(type))
+    else if (data_type.isInt32() || data_type.isUInt32() || data_type.isDateTime())
         return builder.getInt32Ty();
-    if (typeIsEither<DataTypeInt64, DataTypeUInt64, DataTypeInterval>(type))
+    else if (data_type.isInt64() || data_type.isUInt64())
         return builder.getInt64Ty();
-    if (typeIsEither<DataTypeUUID>(type))
-        return builder.getInt128Ty();
-    if (typeIsEither<DataTypeFloat32>(type))
+    else if (data_type.isFloat32())
         return builder.getFloatTy();
-    if (typeIsEither<DataTypeFloat64>(type))
+    else if (data_type.isFloat64())
         return builder.getDoubleTy();
-    if (auto * fixed_string = typeid_cast<const DataTypeFixedString *>(&type))
-        return llvm::VectorType::get(builder.getInt8Ty(), fixed_string->getN());
+
     return nullptr;
 }
 
 static inline bool canBeNativeType(const IDataType & type)
 {
-    if (auto * nullable = typeid_cast<const DataTypeNullable *>(&type))
-        return canBeNativeType(*nullable->getNestedType());
+    WhichDataType data_type(type);
 
-    return typeIsEither<DataTypeInt8, DataTypeUInt8>(type)
-        || typeIsEither<DataTypeInt16, DataTypeUInt16, DataTypeDate>(type)
-        || typeIsEither<DataTypeInt32, DataTypeUInt32, DataTypeDateTime>(type)
-        || typeIsEither<DataTypeInt64, DataTypeUInt64, DataTypeInterval>(type)
-        || typeIsEither<DataTypeUUID>(type)
-        || typeIsEither<DataTypeFloat32>(type)
-        || typeIsEither<DataTypeFloat64>(type)
-        || typeid_cast<const DataTypeFixedString *>(&type);
+    if (data_type.isNullable())
+    {
+        const auto & data_type_nullable = static_cast<const DataTypeNullable&>(type);
+        return canBeNativeType(*data_type_nullable.getNestedType());
+    }
+
+    return data_type.isNativeInt() || data_type.isNativeUInt() || data_type.isFloat() || data_type.isDate();
 }
 
 static inline llvm::Type * toNativeType(llvm::IRBuilderBase & builder, const DataTypePtr & type)
@@ -102,45 +91,98 @@ static inline llvm::Value * nativeBoolCast(llvm::IRBuilder<> & b, const DataType
         return b.CreateICmpNE(value, zero);
     if (value->getType()->isFloatingPointTy())
         return b.CreateFCmpONE(value, zero); /// QNaN is false
-    throw Exception("Cannot cast non-number " + from->getName() + " to bool", ErrorCodes::NOT_IMPLEMENTED);
+
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot cast non-number {} to bool", from->getName());
 }
 
 static inline llvm::Value * nativeCast(llvm::IRBuilder<> & b, const DataTypePtr & from, llvm::Value * value, llvm::Type * to)
 {
     auto * n_from = value->getType();
+
     if (n_from == to)
         return value;
-    if (n_from->isIntegerTy() && to->isFloatingPointTy())
+    else if (n_from->isIntegerTy() && to->isFloatingPointTy())
         return typeIsSigned(*from) ? b.CreateSIToFP(value, to) : b.CreateUIToFP(value, to);
-    if (n_from->isFloatingPointTy() && to->isIntegerTy())
+    else if (n_from->isFloatingPointTy() && to->isIntegerTy())
         return typeIsSigned(*from) ? b.CreateFPToSI(value, to) : b.CreateFPToUI(value, to);
-    if (n_from->isIntegerTy() && to->isIntegerTy())
+    else if (n_from->isIntegerTy() && to->isIntegerTy())
         return b.CreateIntCast(value, to, typeIsSigned(*from));
-    if (n_from->isFloatingPointTy() && to->isFloatingPointTy())
+    else if (n_from->isFloatingPointTy() && to->isFloatingPointTy())
         return b.CreateFPCast(value, to);
-    throw Exception("Cannot cast " + from->getName() + " to requested type", ErrorCodes::NOT_IMPLEMENTED);
+
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot cast {} to requested type", from->getName());
 }
 
 static inline llvm::Value * nativeCast(llvm::IRBuilder<> & b, const DataTypePtr & from, llvm::Value * value, const DataTypePtr & to)
 {
     auto * n_to = toNativeType(b, to);
+
     if (value->getType() == n_to)
+    {
         return value;
-    if (from->isNullable() && to->isNullable())
+    }
+    else if (from->isNullable() && to->isNullable())
     {
         auto * inner = nativeCast(b, removeNullable(from), b.CreateExtractValue(value, {0}), to);
         return b.CreateInsertValue(inner, b.CreateExtractValue(value, {1}), {1});
     }
-    if (from->isNullable())
+    else if (from->isNullable())
+    {
         return nativeCast(b, removeNullable(from), b.CreateExtractValue(value, {0}), to);
-    if (to->isNullable())
+    }
+    else if (to->isNullable())
     {
         auto * inner = nativeCast(b, from, value, removeNullable(to));
         return b.CreateInsertValue(llvm::Constant::getNullValue(n_to), inner, {0});
     }
+
     return nativeCast(b, from, value, n_to);
 }
 
+static inline llvm::Constant * getColumnNativeValue(llvm::IRBuilderBase & builder, const DataTypePtr & column_type, const IColumn & column, size_t index)
+{
+    if (const auto * constant = typeid_cast<const ColumnConst *>(&column))
+    {
+        return getColumnNativeValue(builder, column_type, constant->getDataColumn(), 0);
+    }
+
+    WhichDataType column_data_type(column_type);
+
+    auto * type = toNativeType(builder, column_type);
+
+    if (!type || column.size() <= index)
+        return nullptr;
+
+    if (column_data_type.isNullable())
+    {
+        const auto & nullable_data_type = assert_cast<const DataTypeNullable &>(*column_type);
+        const auto & nullable_column = assert_cast<const ColumnNullable &>(column);
+
+        auto * value = getColumnNativeValue(builder, nullable_data_type.getNestedType(), nullable_column.getNestedColumn(), index);
+        auto * is_null = llvm::ConstantInt::get(type->getContainedType(1), nullable_column.isNullAt(index));
+
+        return value ? llvm::ConstantStruct::get(static_cast<llvm::StructType *>(type), value, is_null) : nullptr;
+    }
+    else if (column_data_type.isFloat32())
+    {
+        return llvm::ConstantFP::get(type, assert_cast<const ColumnVector<Float32> &>(column).getElement(index));
+    }
+    else if (column_data_type.isFloat64())
+    {
+        return llvm::ConstantFP::get(type, assert_cast<const ColumnVector<Float64> &>(column).getElement(index));
+    }
+    else if (column_data_type.isNativeUInt() || column_data_type.isDateOrDateTime())
+    {
+        return llvm::ConstantInt::get(type, column.getUInt(index));
+    }
+    else if (column_data_type.isNativeInt())
+    {
+        return llvm::ConstantInt::get(type, column.getInt(index));
+    }
+
+    return nullptr;
+}
+
 }
 
 #endif
diff --git a/src/DataTypes/NumberTraits.h b/src/DataTypes/NumberTraits.h
index c3b0d956ef5..3216149c647 100644
--- a/src/DataTypes/NumberTraits.h
+++ b/src/DataTypes/NumberTraits.h
@@ -3,7 +3,6 @@
 #include <type_traits>
 
 #include <Core/Types.h>
-#include <Common/UInt128.h>
 
 
 namespace DB
@@ -47,7 +46,7 @@ template <> struct Construct<false, false, 1> { using Type = UInt8; };
 template <> struct Construct<false, false, 2> { using Type = UInt16; };
 template <> struct Construct<false, false, 4> { using Type = UInt32; };
 template <> struct Construct<false, false, 8> { using Type = UInt64; };
-template <> struct Construct<false, false, 16> { using Type = UInt256; }; /// TODO: we cannot use our UInt128 here
+template <> struct Construct<false, false, 16> { using Type = UInt128; };
 template <> struct Construct<false, false, 32> { using Type = UInt256; };
 template <> struct Construct<false, true, 1> { using Type = Float32; };
 template <> struct Construct<false, true, 2> { using Type = Float32; };
@@ -117,6 +116,12 @@ template <typename A, typename B> struct ResultOfModulo
     using Type = std::conditional_t<std::is_floating_point_v<A> || std::is_floating_point_v<B>, Float64, Type0>;
 };
 
+template <typename A, typename B> struct ResultOfModuloLegacy
+{
+    using Type0 = typename Construct<is_signed_v<A> || is_signed_v<B>, false, sizeof(B)>::Type;
+    using Type = std::conditional_t<std::is_floating_point_v<A> || std::is_floating_point_v<B>, Float64, Type0>;
+};
+
 template <typename A> struct ResultOfNegate
 {
     using Type = typename Construct<
@@ -183,11 +188,12 @@ struct ResultOfIf
                 ? max(sizeof(A), sizeof(B)) * 2
                 : max(sizeof(A), sizeof(B))>::Type;
 
-    using ConstructedTypeWithoutUUID = std::conditional_t<std::is_same_v<A, UInt128> || std::is_same_v<B, UInt128>, Error, ConstructedType>;
-    using ConstructedWithUUID = std::conditional_t<std::is_same_v<A, UInt128> && std::is_same_v<B, UInt128>, A, ConstructedTypeWithoutUUID>;
-
-    using Type = std::conditional_t<!IsDecimalNumber<A> && !IsDecimalNumber<B>, ConstructedWithUUID,
-        std::conditional_t<IsDecimalNumber<A> && IsDecimalNumber<B>, std::conditional_t<(sizeof(A) > sizeof(B)), A, B>, Error>>;
+    using Type =
+        std::conditional_t<std::is_same_v<A, B>, A,
+        std::conditional_t<IsDecimalNumber<A> && IsDecimalNumber<B>,
+            std::conditional_t<(sizeof(A) > sizeof(B)), A, B>,
+        std::conditional_t<!IsDecimalNumber<A> && !IsDecimalNumber<B>,
+            ConstructedType, Error>>>;
 };
 
 /** Before applying operator `%` and bitwise operations, operands are casted to whole numbers. */
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.cpp b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
index 31058cb6e57..69a41d83138 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.cpp
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
@@ -160,7 +160,7 @@ struct IndexesSerializationType
             return std::make_shared<DataTypeUInt16>();
         if (type == TUInt32)
             return std::make_shared<DataTypeUInt32>();
-        if (type == TUInt64)
+        if (type == TUInt64) //-V547
             return std::make_shared<DataTypeUInt64>();
 
         throw Exception("Can't create DataType from IndexesSerializationType.", ErrorCodes::LOGICAL_ERROR);
@@ -466,7 +466,7 @@ namespace
         else if (auto * data_uint64 = getIndexesData<UInt64>(column))
             return mapIndexWithAdditionalKeys(*data_uint64, dict_size);
         else
-            throw Exception("Indexes column for mapIndexWithAdditionalKeys must be UInt, got" + column.getName(),
+            throw Exception("Indexes column for mapIndexWithAdditionalKeys must be UInt, got " + column.getName(),
                             ErrorCodes::LOGICAL_ERROR);
     }
 }
diff --git a/src/DataTypes/Serializations/SerializationNumber.cpp b/src/DataTypes/Serializations/SerializationNumber.cpp
index b0a91b11716..347db5d0aa5 100644
--- a/src/DataTypes/Serializations/SerializationNumber.cpp
+++ b/src/DataTypes/Serializations/SerializationNumber.cpp
@@ -33,55 +33,11 @@ void SerializationNumber<T>::deserializeText(IColumn & column, ReadBuffer & istr
     assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
 }
 
-template <typename T>
-static inline void writeDenormalNumber(T x, WriteBuffer & ostr)
-{
-    if constexpr (std::is_floating_point_v<T>)
-    {
-        if (std::signbit(x))
-        {
-            if (isNaN(x))
-                writeCString("-nan", ostr);
-            else
-                writeCString("-inf", ostr);
-        }
-        else
-        {
-            if (isNaN(x))
-                writeCString("nan", ostr);
-            else
-                writeCString("inf", ostr);
-        }
-    }
-    else
-    {
-        /// This function is not called for non floating point numbers.
-        (void)x;
-    }
-}
-
-
 template <typename T>
 void SerializationNumber<T>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     auto x = assert_cast<const ColumnVector<T> &>(column).getData()[row_num];
-    bool is_finite = isFinite(x);
-
-    const bool need_quote = (is_integer_v<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
-        || (settings.json.quote_denormals && !is_finite);
-
-    if (need_quote)
-        writeChar('"', ostr);
-
-    if (is_finite)
-        writeText(x, ostr);
-    else if (!settings.json.quote_denormals)
-        writeCString("null", ostr);
-    else
-        writeDenormalNumber(x, ostr);
-
-    if (need_quote)
-        writeChar('"', ostr);
+    writeJSONNumber(x, ostr, settings);
 }
 
 template <typename T>
@@ -201,7 +157,7 @@ template class SerializationNumber<UInt8>;
 template class SerializationNumber<UInt16>;
 template class SerializationNumber<UInt32>;
 template class SerializationNumber<UInt64>;
-template class SerializationNumber<UInt128>; // base for UUID
+template class SerializationNumber<UInt128>;
 template class SerializationNumber<UInt256>;
 template class SerializationNumber<Int8>;
 template class SerializationNumber<Int16>;
diff --git a/src/DataTypes/Serializations/SerializationNumber.h b/src/DataTypes/Serializations/SerializationNumber.h
index 09976a4bc4f..cb40b6c5437 100644
--- a/src/DataTypes/Serializations/SerializationNumber.h
+++ b/src/DataTypes/Serializations/SerializationNumber.h
@@ -9,7 +9,7 @@ namespace DB
 template <typename T>
 class SerializationNumber : public SimpleTextSerialization
 {
-    static_assert(IsNumber<T>);
+    static_assert(is_arithmetic_v<T>);
 
 public:
     using FieldType = T;
diff --git a/src/DataTypes/Serializations/SerializationUUID.cpp b/src/DataTypes/Serializations/SerializationUUID.cpp
index 1a0640a5e69..3c1ba869466 100644
--- a/src/DataTypes/Serializations/SerializationUUID.cpp
+++ b/src/DataTypes/Serializations/SerializationUUID.cpp
@@ -6,19 +6,20 @@
 #include <IO/ReadHelpers.h>
 #include <Common/assert_cast.h>
 
+
 namespace DB
 {
 
 void SerializationUUID::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
 {
-    writeText(UUID(assert_cast<const ColumnUInt128 &>(column).getData()[row_num]), ostr);
+    writeText(assert_cast<const ColumnUUID &>(column).getData()[row_num], ostr);
 }
 
 void SerializationUUID::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
     UUID x;
     readText(x, istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);
+    assert_cast<ColumnUUID &>(column).getData().push_back(x);
 }
 
 void SerializationUUID::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -44,7 +45,7 @@ void SerializationUUID::deserializeTextQuoted(IColumn & column, ReadBuffer & ist
     assertChar('\'', istr);
     readText(x, istr);
     assertChar('\'', istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+    assert_cast<ColumnUUID &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
 }
 
 void SerializationUUID::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -60,7 +61,7 @@ void SerializationUUID::deserializeTextJSON(IColumn & column, ReadBuffer & istr,
     assertChar('"', istr);
     readText(x, istr);
     assertChar('"', istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(x);
+    assert_cast<ColumnUUID &>(column).getData().push_back(x);
 }
 
 void SerializationUUID::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -74,7 +75,55 @@ void SerializationUUID::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
 {
     UUID value;
     readCSV(value, istr);
-    assert_cast<ColumnUInt128 &>(column).getData().push_back(value);
+    assert_cast<ColumnUUID &>(column).getData().push_back(value);
+}
+
+
+void SerializationUUID::serializeBinary(const Field & field, WriteBuffer & ostr) const
+{
+    UUID x = get<UUID>(field);
+    writeBinary(x, ostr);
+}
+
+void SerializationUUID::deserializeBinary(Field & field, ReadBuffer & istr) const
+{
+    UUID x;
+    readBinary(x, istr);
+    field = NearestFieldType<UUID>(x);
+}
+
+void SerializationUUID::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
+{
+    writeBinary(assert_cast<const ColumnVector<UUID> &>(column).getData()[row_num], ostr);
+}
+
+void SerializationUUID::deserializeBinary(IColumn & column, ReadBuffer & istr) const
+{
+    UUID x;
+    readBinary(x, istr);
+    assert_cast<ColumnVector<UUID> &>(column).getData().push_back(x);
+}
+
+void SerializationUUID::serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    const typename ColumnVector<UUID>::Container & x = typeid_cast<const ColumnVector<UUID> &>(column).getData();
+
+    size_t size = x.size();
+
+    if (limit == 0 || offset + limit > size)
+        limit = size - offset;
+
+    if (limit)
+        ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(UUID) * limit);
+}
+
+void SerializationUUID::deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const
+{
+    typename ColumnVector<UUID>::Container & x = typeid_cast<ColumnVector<UUID> &>(column).getData();
+    size_t initial_size = x.size();
+    x.resize(initial_size + limit);
+    size_t size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(UUID) * limit);
+    x.resize(initial_size + size / sizeof(UUID));
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationUUID.h b/src/DataTypes/Serializations/SerializationUUID.h
index 93bf166bbd9..3100e128848 100644
--- a/src/DataTypes/Serializations/SerializationUUID.h
+++ b/src/DataTypes/Serializations/SerializationUUID.h
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-class SerializationUUID : public SerializationNumber<UInt128>
+class SerializationUUID : public SimpleTextSerialization
 {
 public:
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
@@ -18,6 +18,13 @@ public:
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr) const override;
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr) const override;
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
 };
 
 }
diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp
index 5684503e34a..bcccb58966a 100644
--- a/src/DataTypes/convertMySQLDataType.cpp
+++ b/src/DataTypes/convertMySQLDataType.cpp
@@ -105,9 +105,9 @@ DataTypePtr convertMySQLDataType(MultiEnum<MySQLDataTypesSupport> type_support,
     {
         if (precision <= DecimalUtils::max_precision<Decimal32>)
             res = std::make_shared<DataTypeDecimal<Decimal32>>(precision, scale);
-        else if (precision <= DecimalUtils::max_precision<Decimal64>)
+        else if (precision <= DecimalUtils::max_precision<Decimal64>) //-V547
             res = std::make_shared<DataTypeDecimal<Decimal64>>(precision, scale);
-        else if (precision <= DecimalUtils::max_precision<Decimal128>)
+        else if (precision <= DecimalUtils::max_precision<Decimal128>) //-V547
             res = std::make_shared<DataTypeDecimal<Decimal128>>(precision, scale);
     }
 
diff --git a/src/DataTypes/tests/CMakeLists.txt b/src/DataTypes/examples/CMakeLists.txt
similarity index 100%
rename from src/DataTypes/tests/CMakeLists.txt
rename to src/DataTypes/examples/CMakeLists.txt
diff --git a/src/DataTypes/getLeastSupertype.cpp b/src/DataTypes/getLeastSupertype.cpp
index 6710313349b..a04d16ef7cd 100644
--- a/src/DataTypes/getLeastSupertype.cpp
+++ b/src/DataTypes/getLeastSupertype.cpp
@@ -390,6 +390,8 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
                 maximize(max_bits_of_unsigned_integer, 32);
             else if (typeid_cast<const DataTypeUInt64 *>(type.get()))
                 maximize(max_bits_of_unsigned_integer, 64);
+            else if (typeid_cast<const DataTypeUInt128 *>(type.get()))
+                maximize(max_bits_of_unsigned_integer, 128);
             else if (typeid_cast<const DataTypeUInt256 *>(type.get()))
                 maximize(max_bits_of_unsigned_integer, 256);
             else if (typeid_cast<const DataTypeInt8 *>(type.get()) || typeid_cast<const DataTypeEnum8 *>(type.get()))
@@ -423,7 +425,7 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
             size_t min_bit_width_of_integer = std::max(max_bits_of_signed_integer, max_bits_of_unsigned_integer);
 
             /// If unsigned is not covered by signed.
-            if (max_bits_of_signed_integer && max_bits_of_unsigned_integer >= max_bits_of_signed_integer)
+            if (max_bits_of_signed_integer && max_bits_of_unsigned_integer >= max_bits_of_signed_integer) //-V1051
             {
                 // Because 128 and 256 bit integers are significantly slower, we should not promote to them.
                 // But if we already have wide numbers, promotion is necessary.
@@ -482,6 +484,8 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
                     return std::make_shared<DataTypeUInt32>();
                 else if (min_bit_width_of_integer <= 64)
                     return std::make_shared<DataTypeUInt64>();
+                else if (min_bit_width_of_integer <= 128)
+                    return std::make_shared<DataTypeUInt128>();
                 else if (min_bit_width_of_integer <= 256)
                     return std::make_shared<DataTypeUInt256>();
                 else
diff --git a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
index 9d8c32c92b6..675ecfbe6e7 100644
--- a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
+++ b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
@@ -15,8 +15,6 @@
 
 #include <Core/iostream_debug_helpers.h>
 
-namespace std
-{
 
 template <typename T>
 inline std::ostream& operator<<(std::ostream & ostr, const std::vector<T> & v)
@@ -29,8 +27,6 @@ inline std::ostream& operator<<(std::ostream & ostr, const std::vector<T> & v)
     return ostr << "] (" << v.size() << ") items";
 }
 
-}
-
 using namespace DB;
 
 struct ParseDataTypeTestCase
diff --git a/src/DataTypes/tests/gtest_data_type_get_common_type.cpp b/src/DataTypes/tests/gtest_data_type_get_common_type.cpp
index 5c258f0b42e..2a77237e982 100644
--- a/src/DataTypes/tests/gtest_data_type_get_common_type.cpp
+++ b/src/DataTypes/tests/gtest_data_type_get_common_type.cpp
@@ -37,7 +37,7 @@ static auto typesFromString(const std::string & str)
 
 struct TypesTestCase
 {
-    const char * from_types;
+    const char * from_types = nullptr;
     const char * expected_type = nullptr;
 };
 
diff --git a/src/DataTypes/ya.make.in b/src/DataTypes/ya.make.in
index d93dd32bd8d..1d46c197d64 100644
--- a/src/DataTypes/ya.make.in
+++ b/src/DataTypes/ya.make.in
@@ -9,7 +9,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index b4222a7e349..6b8c470861d 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -1,7 +1,5 @@
 #include <Databases/DatabaseAtomic.h>
 #include <Databases/DatabaseOnDisk.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromFile.h>
@@ -13,6 +11,8 @@
 #include <filesystem>
 #include <Interpreters/DDLTask.h>
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 namespace ErrorCodes
@@ -35,18 +35,18 @@ public:
     UUID uuid() const override { return table()->getStorageID().uuid; }
 };
 
-DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, const Context & context_)
+DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, ContextPtr context_)
     : DatabaseOrdinary(name_, std::move(metadata_path_), "store/", logger_name, context_)
-    , path_to_table_symlinks(global_context.getPath() + "data/" + escapeForFileName(name_) + "/")
-    , path_to_metadata_symlink(global_context.getPath() + "metadata/" + escapeForFileName(name_))
+    , path_to_table_symlinks(fs::path(getContext()->getPath()) / "data" / escapeForFileName(name_) / "")
+    , path_to_metadata_symlink(fs::path(getContext()->getPath()) / "metadata" / escapeForFileName(name_))
     , db_uuid(uuid)
 {
     assert(db_uuid != UUIDHelpers::Nil);
-    Poco::File(path_to_table_symlinks).createDirectories();
+    fs::create_directories(path_to_table_symlinks);
     tryCreateMetadataSymlink();
 }
 
-DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const Context & context_)
+DatabaseAtomic::DatabaseAtomic(String name_, String metadata_path_, UUID uuid, ContextPtr context_)
     : DatabaseAtomic(name_, std::move(metadata_path_), uuid, "DatabaseAtomic (" + name_ + ")", context_)
 {
 }
@@ -68,19 +68,19 @@ String DatabaseAtomic::getTableDataPath(const ASTCreateQuery & query) const
     return tmp;
 }
 
-void DatabaseAtomic::drop(const Context &)
+void DatabaseAtomic::drop(ContextPtr)
 {
     assert(tables.empty());
     try
     {
-        Poco::File(path_to_metadata_symlink).remove();
-        Poco::File(path_to_table_symlinks).remove(true);
+        fs::remove(path_to_metadata_symlink);
+        fs::remove_all(path_to_table_symlinks);
     }
     catch (...)
     {
         LOG_WARNING(log, getCurrentExceptionMessage(true));
     }
-    Poco::File(getMetadataPath()).remove(true);
+    fs::remove_all(getMetadataPath());
 }
 
 void DatabaseAtomic::attachTable(const String & name, const StoragePtr & table, const String & relative_table_path)
@@ -91,7 +91,7 @@ void DatabaseAtomic::attachTable(const String & name, const StoragePtr & table,
     not_in_use = cleanupDetachedTables();
     auto table_id = table->getStorageID();
     assertDetachedTableNotInUse(table_id.uuid);
-    DatabaseWithDictionaries::attachTableUnlocked(name, table, lock);
+    DatabaseOrdinary::attachTableUnlocked(name, table, lock);
     table_name_to_path.emplace(std::make_pair(name, relative_table_path));
 }
 
@@ -99,20 +99,20 @@ StoragePtr DatabaseAtomic::detachTable(const String & name)
 {
     DetachedTables not_in_use;
     std::unique_lock lock(mutex);
-    auto table = DatabaseWithDictionaries::detachTableUnlocked(name, lock);
+    auto table = DatabaseOrdinary::detachTableUnlocked(name, lock);
     table_name_to_path.erase(name);
     detached_tables.emplace(table->getStorageID().uuid, table);
-    not_in_use = cleanupDetachedTables();
+    not_in_use = cleanupDetachedTables(); //-V1001
     return table;
 }
 
-void DatabaseAtomic::dropTable(const Context & context, const String & table_name, bool no_delay)
+void DatabaseAtomic::dropTable(ContextPtr local_context, const String & table_name, bool no_delay)
 {
-    if (auto * mv = dynamic_cast<StorageMaterializedView *>(tryGetTable(table_name, context).get()))
+    if (auto * mv = dynamic_cast<StorageMaterializedView *>(tryGetTable(table_name, local_context).get()))
     {
         /// Remove the inner table (if any) to avoid deadlock
         /// (due to attempt to execute DROP from the worker thread)
-        mv->dropInnerTable(no_delay, context);
+        mv->dropInnerTable(no_delay, local_context);
     }
 
     String table_metadata_path = getObjectMetadataPath(table_name);
@@ -122,8 +122,8 @@ void DatabaseAtomic::dropTable(const Context & context, const String & table_nam
         std::unique_lock lock(mutex);
         table = getTableUnlocked(table_name, lock);
         table_metadata_path_drop = DatabaseCatalog::instance().getPathForDroppedMetadata(table->getStorageID());
-        auto txn = context.getZooKeeperMetadataTransaction();
-        if (txn && !context.isInternalSubquery())
+        auto txn = local_context->getZooKeeperMetadataTransaction();
+        if (txn && !local_context->isInternalSubquery())
             txn->commit();      /// Commit point (a sort of) for Replicated database
 
         /// NOTE: replica will be lost if server crashes before the following rename
@@ -132,10 +132,11 @@ void DatabaseAtomic::dropTable(const Context & context, const String & table_nam
         /// (it's more likely to lost connection, than to fail before applying local changes).
         /// TODO better detection and recovery
 
-        Poco::File(table_metadata_path).renameTo(table_metadata_path_drop);    /// Mark table as dropped
-        DatabaseWithDictionaries::detachTableUnlocked(table_name, lock);       /// Should never throw
+        fs::rename(table_metadata_path, table_metadata_path_drop);  /// Mark table as dropped
+        DatabaseOrdinary::detachTableUnlocked(table_name, lock);  /// Should never throw
         table_name_to_path.erase(table_name);
     }
+
     if (table->storesDataOnDisk())
         tryRemoveSymlink(table_name);
 
@@ -144,7 +145,7 @@ void DatabaseAtomic::dropTable(const Context & context, const String & table_nam
     DatabaseCatalog::instance().enqueueDroppedTableCleanup(table->getStorageID(), table, table_metadata_path_drop, no_delay);
 }
 
-void DatabaseAtomic::renameTable(const Context & context, const String & table_name, IDatabase & to_database,
+void DatabaseAtomic::renameTable(ContextPtr local_context, const String & table_name, IDatabase & to_database,
                                  const String & to_table_name, bool exchange, bool dictionary)
 {
     if (typeid(*this) != typeid(to_database))
@@ -152,12 +153,10 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
         if (!typeid_cast<DatabaseOrdinary *>(&to_database))
             throw Exception("Moving tables between databases of different engines is not supported", ErrorCodes::NOT_IMPLEMENTED);
         /// Allow moving tables between Atomic and Ordinary (with table lock)
-        DatabaseOnDisk::renameTable(context, table_name, to_database, to_table_name, exchange, dictionary);
+        DatabaseOnDisk::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
         return;
     }
 
-    if (exchange && dictionary)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot exchange dictionaries");
     if (exchange && !supportsRenameat2())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "RENAME EXCHANGE is not supported");
 
@@ -174,7 +173,7 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
         /// Path can be not set for DDL dictionaries, but it does not matter for StorageDictionary.
         if (it != db.table_name_to_path.end())
             table_data_path_saved = it->second;
-        assert(!table_data_path_saved.empty() || db.dictionaries.find(table_name_) != db.dictionaries.end());
+        assert(!table_data_path_saved.empty());
         db.tables.erase(table_name_);
         db.table_name_to_path.erase(table_name_);
         if (has_symlink)
@@ -222,21 +221,21 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
         db_lock = std::unique_lock{mutex};
     }
 
-    bool is_dictionary = dictionaries.find(table_name) != dictionaries.end();
-    if (exchange && other_db.dictionaries.find(to_table_name) != other_db.dictionaries.end())
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot exchange dictionaries");
-
-    if (dictionary != is_dictionary)
-        throw Exception(ErrorCodes::INCORRECT_QUERY,
-                        "Use RENAME DICTIONARY for dictionaries and RENAME TABLE for tables.");
-
-    if (is_dictionary && !inside_database)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot move dictionary to other database");
-
     if (!exchange)
         other_db.checkMetadataFilenameAvailabilityUnlocked(to_table_name, inside_database ? db_lock : other_db_lock);
 
     StoragePtr table = getTableUnlocked(table_name, db_lock);
+
+    if (table->isDictionary() && !dictionary)
+    {
+        if (exchange)
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                "Use EXCHANGE DICTIONARIES for dictionaries and EXCHANGE TABLES for tables.");
+        else
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                "Use RENAME DICTIONARY for dictionaries and RENAME TABLE for tables.");
+    }
+
     table->checkTableCanBeRenamed();
     assert_can_move_mat_view(table);
     StoragePtr other_table;
@@ -248,8 +247,8 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
     }
 
     /// Table renaming actually begins here
-    auto txn = context.getZooKeeperMetadataTransaction();
-    if (txn && !context.isInternalSubquery())
+    auto txn = local_context->getZooKeeperMetadataTransaction();
+    if (txn && !local_context->isInternalSubquery())
         txn->commit();     /// Commit point (a sort of) for Replicated database
 
     /// NOTE: replica will be lost if server crashes before the following rename
@@ -281,17 +280,11 @@ void DatabaseAtomic::renameTable(const Context & context, const String & table_n
     attach(other_db, to_table_name, table_data_path, table);
     if (exchange)
         attach(*this, table_name, other_table_data_path, other_table);
-
-    if (is_dictionary)
-    {
-        auto new_table_id = StorageID(other_db.database_name, to_table_name, old_table_id.uuid);
-        renameDictionaryInMemoryUnlocked(old_table_id, new_table_id);
-    }
 }
 
 void DatabaseAtomic::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                                        const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                       const Context & query_context)
+                                       ContextPtr query_context)
 {
     DetachedTables not_in_use;
     auto table_data_path = getTableDataPath(query);
@@ -309,8 +302,8 @@ void DatabaseAtomic::commitCreateTable(const ASTCreateQuery & query, const Stora
         DatabaseCatalog::instance().addUUIDMapping(query.uuid);
         locked_uuid = true;
 
-        auto txn = query_context.getZooKeeperMetadataTransaction();
-        if (txn && !query_context.isInternalSubquery())
+        auto txn = query_context->getZooKeeperMetadataTransaction();
+        if (txn && !query_context->isInternalSubquery())
             txn->commit();     /// Commit point (a sort of) for Replicated database
 
         /// NOTE: replica will be lost if server crashes before the following renameNoReplace(...)
@@ -323,7 +316,7 @@ void DatabaseAtomic::commitCreateTable(const ASTCreateQuery & query, const Stora
     }
     catch (...)
     {
-        Poco::File(table_metadata_tmp_path).remove();
+        fs::remove(table_metadata_tmp_path);
         if (locked_uuid)
             DatabaseCatalog::instance().removeUUIDMappingFinally(query.uuid);
         throw;
@@ -333,7 +326,7 @@ void DatabaseAtomic::commitCreateTable(const ASTCreateQuery & query, const Stora
 }
 
 void DatabaseAtomic::commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                      const String & /*statement*/, const Context & query_context)
+                                      const String & /*statement*/, ContextPtr query_context)
 {
     bool check_file_exists = true;
     SCOPE_EXIT({ std::error_code code; if (check_file_exists) std::filesystem::remove(table_metadata_tmp_path, code); });
@@ -344,8 +337,8 @@ void DatabaseAtomic::commitAlterTable(const StorageID & table_id, const String &
     if (table_id.uuid != actual_table_id.uuid)
         throw Exception("Cannot alter table because it was renamed", ErrorCodes::CANNOT_ASSIGN_ALTER);
 
-    auto txn = query_context.getZooKeeperMetadataTransaction();
-    if (txn && !query_context.isInternalSubquery())
+    auto txn = query_context->getZooKeeperMetadataTransaction();
+    if (txn && !query_context->isInternalSubquery())
         txn->commit();      /// Commit point (a sort of) for Replicated database
 
     /// NOTE: replica will be lost if server crashes before the following rename
@@ -365,8 +358,8 @@ void DatabaseAtomic::assertDetachedTableNotInUse(const UUID & uuid)
     /// 4. INSERT INTO table ...; (both Storage instances writes data without any synchronization)
     /// To avoid it, we remember UUIDs of detached tables and does not allow ATTACH table with such UUID until detached instance still in use.
     if (detached_tables.count(uuid))
-        throw Exception("Cannot attach table with UUID " + toString(uuid) +
-              ", because it was detached but still used by some query. Retry later.", ErrorCodes::TABLE_ALREADY_EXISTS);
+        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Cannot attach table with UUID {}, "
+                        "because it was detached but still used by some query. Retry later.", toString(uuid));
 }
 
 void DatabaseAtomic::setDetachedTableNotInUseForce(const UUID & uuid)
@@ -409,26 +402,27 @@ void DatabaseAtomic::assertCanBeDetached(bool cleanup)
                         "because some tables are still in use. Retry later.", ErrorCodes::DATABASE_NOT_EMPTY);
 }
 
-DatabaseTablesIteratorPtr DatabaseAtomic::getTablesIterator(const Context & context, const IDatabase::FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr
+DatabaseAtomic::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction & filter_by_table_name)
 {
-    auto base_iter = DatabaseWithOwnTablesBase::getTablesIterator(context, filter_by_table_name);
+    auto base_iter = DatabaseWithOwnTablesBase::getTablesIterator(local_context, filter_by_table_name);
     return std::make_unique<AtomicDatabaseTablesSnapshotIterator>(std::move(typeid_cast<DatabaseTablesSnapshotIterator &>(*base_iter)));
 }
 
 UUID DatabaseAtomic::tryGetTableUUID(const String & table_name) const
 {
-    if (auto table = tryGetTable(table_name, global_context))
+    if (auto table = tryGetTable(table_name, getContext()))
         return table->getStorageID().uuid;
     return UUIDHelpers::Nil;
 }
 
-void DatabaseAtomic::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseAtomic::loadStoredObjects(ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach)
 {
     /// Recreate symlinks to table data dirs in case of force restore, because some of them may be broken
     if (has_force_restore_data_flag)
-        Poco::File(path_to_table_symlinks).remove(true);
+        fs::remove_all(path_to_table_symlinks);
 
-    DatabaseOrdinary::loadStoredObjects(context, has_force_restore_data_flag, force_attach);
+    DatabaseOrdinary::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach);
 
     if (has_force_restore_data_flag)
     {
@@ -438,7 +432,7 @@ void DatabaseAtomic::loadStoredObjects(Context & context, bool has_force_restore
             table_names = table_name_to_path;
         }
 
-        Poco::File(path_to_table_symlinks).createDirectories();
+        fs::create_directories(path_to_table_symlinks);
         for (const auto & table : table_names)
             tryCreateSymlink(table.first, table.second, true);
     }
@@ -449,9 +443,9 @@ void DatabaseAtomic::tryCreateSymlink(const String & table_name, const String &
     try
     {
         String link = path_to_table_symlinks + escapeForFileName(table_name);
-        Poco::File data = Poco::Path(global_context.getPath()).makeAbsolute().toString() + actual_data_path;
-        if (!if_data_path_exist || data.exists())
-            data.linkTo(link, Poco::File::LINK_SYMBOLIC);
+        fs::path data = fs::canonical(getContext()->getPath()) / actual_data_path;
+        if (!if_data_path_exist || fs::exists(data))
+            fs::create_directory_symlink(data, link);
     }
     catch (...)
     {
@@ -464,7 +458,7 @@ void DatabaseAtomic::tryRemoveSymlink(const String & table_name)
     try
     {
         String path = path_to_table_symlinks + escapeForFileName(table_name);
-        Poco::File{path}.remove();
+        fs::remove(path);
     }
     catch (...)
     {
@@ -477,17 +471,17 @@ void DatabaseAtomic::tryCreateMetadataSymlink()
     /// Symlinks in data/db_name/ directory and metadata/db_name/ are not used by ClickHouse,
     /// it's needed only for convenient introspection.
     assert(path_to_metadata_symlink != metadata_path);
-    Poco::File metadata_symlink(path_to_metadata_symlink);
-    if (metadata_symlink.exists())
+    fs::path metadata_symlink(path_to_metadata_symlink);
+    if (fs::exists(metadata_symlink))
     {
-        if (!metadata_symlink.isLink())
+        if (!fs::is_symlink(metadata_symlink))
             throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Directory {} exists", path_to_metadata_symlink);
     }
     else
     {
         try
         {
-            Poco::File{metadata_path}.linkTo(path_to_metadata_symlink, Poco::File::LINK_SYMBOLIC);
+            fs::create_directory_symlink(metadata_path, path_to_metadata_symlink);
         }
         catch (...)
         {
@@ -501,7 +495,7 @@ void DatabaseAtomic::renameDatabase(const String & new_name)
     /// CREATE, ATTACH, DROP, DETACH and RENAME DATABASE must hold DDLGuard
     try
     {
-        Poco::File(path_to_metadata_symlink).remove();
+        fs::remove(path_to_metadata_symlink);
     }
     catch (...)
     {
@@ -509,8 +503,8 @@ void DatabaseAtomic::renameDatabase(const String & new_name)
     }
 
     auto new_name_escaped = escapeForFileName(new_name);
-    auto old_database_metadata_path = global_context.getPath() + "metadata/" + escapeForFileName(getDatabaseName()) + ".sql";
-    auto new_database_metadata_path = global_context.getPath() + "metadata/" + new_name_escaped + ".sql";
+    auto old_database_metadata_path = getContext()->getPath() + "metadata/" + escapeForFileName(getDatabaseName()) + ".sql";
+    auto new_database_metadata_path = getContext()->getPath() + "metadata/" + new_name_escaped + ".sql";
     renameNoReplace(old_database_metadata_path, new_database_metadata_path);
 
     String old_path_to_table_symlinks;
@@ -527,57 +521,17 @@ void DatabaseAtomic::renameDatabase(const String & new_name)
             table.second->renameInMemory(table_id);
         }
 
-        for (auto & dict : dictionaries)
-        {
-            auto old_name = StorageID(dict.second.create_query);
-            auto name = old_name;
-            name.database_name = database_name;
-            renameDictionaryInMemoryUnlocked(old_name, name);
-        }
-
-        path_to_metadata_symlink = global_context.getPath() + "metadata/" + new_name_escaped;
+        path_to_metadata_symlink = getContext()->getPath() + "metadata/" + new_name_escaped;
         old_path_to_table_symlinks = path_to_table_symlinks;
-        path_to_table_symlinks = global_context.getPath() + "data/" + new_name_escaped + "/";
+        path_to_table_symlinks = getContext()->getPath() + "data/" + new_name_escaped + "/";
     }
 
-    Poco::File(old_path_to_table_symlinks).renameTo(path_to_table_symlinks);
+    fs::rename(old_path_to_table_symlinks, path_to_table_symlinks);
     tryCreateMetadataSymlink();
 }
 
-void DatabaseAtomic::renameDictionaryInMemoryUnlocked(const StorageID & old_name, const StorageID & new_name)
-{
-    auto it = dictionaries.find(old_name.table_name);
-    assert(it != dictionaries.end());
-    assert(it->second.config->getString("dictionary.uuid") == toString(old_name.uuid));
-    assert(old_name.uuid == new_name.uuid);
-    it->second.config->setString("dictionary.database", new_name.database_name);
-    it->second.config->setString("dictionary.name", new_name.table_name);
-    auto & create = it->second.create_query->as<ASTCreateQuery &>();
-    create.database = new_name.database_name;
-    create.table = new_name.table_name;
-    assert(create.uuid == new_name.uuid);
-
-    if (old_name.table_name != new_name.table_name)
-    {
-        auto attach_info = std::move(it->second);
-        dictionaries.erase(it);
-        dictionaries.emplace(new_name.table_name, std::move(attach_info));
-    }
-
-    auto result = external_loader.getLoadResult(toString(old_name.uuid));
-    if (!result.object)
-        return;
-    const auto & dict = dynamic_cast<const IDictionary &>(*result.object);
-    dict.updateDictionaryName(new_name);
-}
 void DatabaseAtomic::waitDetachedTableNotInUse(const UUID & uuid)
 {
-    {
-        std::lock_guard lock{mutex};
-        if (detached_tables.count(uuid) == 0)
-            return;
-    }
-
     /// Table is in use while its shared_ptr counter is greater than 1.
     /// We cannot trigger condvar on shared_ptr destruction, so it's busy wait.
     while (true)
@@ -593,5 +547,13 @@ void DatabaseAtomic::waitDetachedTableNotInUse(const UUID & uuid)
     }
 }
 
+void DatabaseAtomic::checkDetachedTableNotInUse(const UUID & uuid)
+{
+    DetachedTables not_in_use;
+    std::lock_guard lock{mutex};
+    not_in_use = cleanupDetachedTables();
+    assertDetachedTableNotInUse(uuid);
+}
+
 }
 
diff --git a/src/Databases/DatabaseAtomic.h b/src/Databases/DatabaseAtomic.h
index 09cdf269b35..c5dedf00d23 100644
--- a/src/Databases/DatabaseAtomic.h
+++ b/src/Databases/DatabaseAtomic.h
@@ -19,8 +19,8 @@ namespace DB
 class DatabaseAtomic : public DatabaseOrdinary
 {
 public:
-    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, const Context & context_);
-    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const Context & context_);
+    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, const String & logger_name, ContextPtr context_);
+    DatabaseAtomic(String name_, String metadata_path_, UUID uuid, ContextPtr context_);
 
     String getEngineName() const override { return "Atomic"; }
     UUID getUUID() const override { return db_uuid; }
@@ -28,14 +28,14 @@ public:
     void renameDatabase(const String & new_name) override;
 
     void renameTable(
-            const Context & context,
+            ContextPtr context,
             const String & table_name,
             IDatabase & to_database,
             const String & to_table_name,
             bool exchange,
             bool dictionary) override;
 
-    void dropTable(const Context & context, const String & table_name, bool no_delay) override;
+    void dropTable(ContextPtr context, const String & table_name, bool no_delay) override;
 
     void attachTable(const String & name, const StoragePtr & table, const String & relative_table_path) override;
     StoragePtr detachTable(const String & name) override;
@@ -43,11 +43,11 @@ public:
     String getTableDataPath(const String & table_name) const override;
     String getTableDataPath(const ASTCreateQuery & query) const override;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
-    void loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach) override;
 
     /// Atomic database cannot be detached if there is detached table which still in use
     void assertCanBeDetached(bool cleanup) override;
@@ -58,23 +58,22 @@ public:
     void tryRemoveSymlink(const String & table_name);
 
     void waitDetachedTableNotInUse(const UUID & uuid) override;
+    void checkDetachedTableNotInUse(const UUID & uuid) override;
     void setDetachedTableNotInUseForce(const UUID & uuid);
 
 protected:
-    void commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & statement, const Context & query_context) override;
+    void commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & statement, ContextPtr query_context) override;
     void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
-                           const String & table_metadata_tmp_path, const String & table_metadata_path, const Context & query_context) override;
+                           const String & table_metadata_tmp_path, const String & table_metadata_path, ContextPtr query_context) override;
 
     void assertDetachedTableNotInUse(const UUID & uuid);
-    typedef std::unordered_map<UUID, StoragePtr> DetachedTables;
+    using DetachedTables = std::unordered_map<UUID, StoragePtr>;
     [[nodiscard]] DetachedTables cleanupDetachedTables();
 
     void tryCreateMetadataSymlink();
 
-    void renameDictionaryInMemoryUnlocked(const StorageID & old_name, const StorageID & new_name);
-
     //TODO store path in DatabaseWithOwnTables::tables
-    typedef std::unordered_map<String, String> NameToPathMap;
+    using NameToPathMap = std::unordered_map<String, String>;
     NameToPathMap table_name_to_path;
 
     DetachedTables detached_tables;
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index ff5510f0bf9..40034015f27 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -21,18 +21,20 @@ namespace ErrorCodes
 
 namespace
 {
-    StoragePtr createStorageDictionary(const String & database_name, const ExternalLoader::LoadResult & load_result)
+    StoragePtr createStorageDictionary(const String & database_name, const ExternalLoader::LoadResult & load_result, ContextPtr context)
     {
         try
         {
             if (!load_result.config)
                 return nullptr;
+
             DictionaryStructure dictionary_structure = ExternalDictionariesLoader::getDictionaryStructure(*load_result.config);
             return StorageDictionary::create(
                 StorageID(database_name, load_result.name),
                 load_result.name,
                 dictionary_structure,
-                StorageDictionary::Location::DictionaryDatabase);
+                StorageDictionary::Location::DictionaryDatabase,
+                context);
         }
         catch (Exception & e)
         {
@@ -44,55 +46,54 @@ namespace
     }
 }
 
-DatabaseDictionary::DatabaseDictionary(const String & name_, const Context & context_)
-    : IDatabase(name_)
+DatabaseDictionary::DatabaseDictionary(const String & name_, ContextPtr context_)
+    : IDatabase(name_), WithContext(context_->getGlobalContext())
     , log(&Poco::Logger::get("DatabaseDictionary(" + database_name + ")"))
-    , global_context(context_.getGlobalContext())
 {
 }
 
 Tables DatabaseDictionary::listTables(const FilterByNameFunction & filter_by_name)
 {
     Tables tables;
-    auto load_results = global_context.getExternalDictionariesLoader().getLoadResults(filter_by_name);
+    auto load_results = getContext()->getExternalDictionariesLoader().getLoadResults(filter_by_name);
     String db_name = getDatabaseName();
     for (auto & load_result : load_results)
     {
-        auto storage = createStorageDictionary(db_name, load_result);
+        auto storage = createStorageDictionary(db_name, load_result, getContext());
         if (storage)
             tables.emplace(storage->getStorageID().table_name, storage);
     }
     return tables;
 }
 
-bool DatabaseDictionary::isTableExist(const String & table_name, const Context &) const
+bool DatabaseDictionary::isTableExist(const String & table_name, ContextPtr) const
 {
-    return global_context.getExternalDictionariesLoader().getCurrentStatus(table_name) != ExternalLoader::Status::NOT_EXIST;
+    return getContext()->getExternalDictionariesLoader().getCurrentStatus(table_name) != ExternalLoader::Status::NOT_EXIST;
 }
 
-StoragePtr DatabaseDictionary::tryGetTable(const String & table_name, const Context &) const
+StoragePtr DatabaseDictionary::tryGetTable(const String & table_name, ContextPtr) const
 {
-    auto load_result = global_context.getExternalDictionariesLoader().getLoadResult(table_name);
-    return createStorageDictionary(getDatabaseName(), load_result);
+    auto load_result = getContext()->getExternalDictionariesLoader().getLoadResult(table_name);
+    return createStorageDictionary(getDatabaseName(), load_result, getContext());
 }
 
-DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(const Context &, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
 {
     return std::make_unique<DatabaseTablesSnapshotIterator>(listTables(filter_by_table_name), getDatabaseName());
 }
 
 bool DatabaseDictionary::empty() const
 {
-    return !global_context.getExternalDictionariesLoader().hasObjects();
+    return !getContext()->getExternalDictionariesLoader().hasObjects();
 }
 
-ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, const Context &, bool throw_on_error) const
+ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, ContextPtr, bool throw_on_error) const
 {
     String query;
     {
         WriteBufferFromString buffer(query);
 
-        auto load_result = global_context.getExternalDictionariesLoader().getLoadResult(table_name);
+        auto load_result = getContext()->getExternalDictionariesLoader().getLoadResult(table_name);
         if (!load_result.config)
         {
             if (throw_on_error)
@@ -106,7 +107,7 @@ ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, co
         buffer << ") Engine = Dictionary(" << backQuoteIfNeed(table_name) << ")";
     }
 
-    auto settings = global_context.getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
@@ -126,7 +127,7 @@ ASTPtr DatabaseDictionary::getCreateDatabaseQuery() const
         WriteBufferFromString buffer(query);
         buffer << "CREATE DATABASE " << backQuoteIfNeed(getDatabaseName()) << " ENGINE = Dictionary";
     }
-    auto settings = global_context.getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
     return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
 }
diff --git a/src/Databases/DatabaseDictionary.h b/src/Databases/DatabaseDictionary.h
index 2cfc6ef3285..06402a96381 100644
--- a/src/Databases/DatabaseDictionary.h
+++ b/src/Databases/DatabaseDictionary.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <mutex>
-#include <unordered_set>
 #include <Databases/DatabasesCommon.h>
 #include <Databases/IDatabase.h>
 #include <Storages/IStorage_fwd.h>
 
+#include <mutex>
+#include <unordered_set>
+
 
 namespace Poco
 {
@@ -19,21 +20,21 @@ namespace DB
 /* Database to store StorageDictionary tables
  * automatically creates tables for all dictionaries
  */
-class DatabaseDictionary final : public IDatabase
+class DatabaseDictionary final : public IDatabase, WithContext
 {
 public:
-    DatabaseDictionary(const String & name_, const Context & context_);
+    DatabaseDictionary(const String & name_, ContextPtr context_);
 
     String getEngineName() const override
     {
         return "Dictionary";
     }
 
-    bool isTableExist(const String & table_name, const Context & context) const override;
+    bool isTableExist(const String & table_name, ContextPtr context) const override;
 
-    StoragePtr tryGetTable(const String & table_name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & table_name, ContextPtr context) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     bool empty() const override;
 
@@ -44,11 +45,10 @@ public:
     void shutdown() override;
 
 protected:
-    ASTPtr getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & table_name, ContextPtr context, bool throw_on_error) const override;
 
 private:
     Poco::Logger * log;
-    const Context & global_context;
 
     Tables listTables(const FilterByNameFunction & filter_by_name);
 };
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 523ce7d925e..e09860e79b6 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -11,10 +11,9 @@
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/formatAST.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Interpreters/Context.h>
 #include <Common/Macros.h>
+#include <filesystem>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
@@ -30,15 +29,18 @@
 #endif
 
 #if USE_MYSQL || USE_LIBPQXX
+#include <Common/parseRemoteDescription.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Common/parseAddress.h>
 #endif
 
 #if USE_LIBPQXX
 #include <Databases/PostgreSQL/DatabasePostgreSQL.h> // Y_IGNORE
-#include <Storages/PostgreSQL/PostgreSQLConnectionPool.h>
+#include <Storages/PostgreSQL/PoolWithFailover.h>
 #endif
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
@@ -50,34 +52,32 @@ namespace ErrorCodes
     extern const int CANNOT_CREATE_DATABASE;
 }
 
-DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & metadata_path, Context & context)
+DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context)
 {
     bool created = false;
 
     try
     {
         /// Creates store/xxx/ for Atomic
-        Poco::File(Poco::Path(metadata_path).makeParent()).createDirectories();
+        fs::create_directories(fs::path(metadata_path).parent_path());
+
         /// 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.
-        created = Poco::File(metadata_path).createDirectory();
+        created = fs::create_directory(metadata_path);
 
         DatabasePtr impl = getImpl(create, metadata_path, context);
 
-        if (impl && context.hasQueryContext() && context.getSettingsRef().log_queries)
-            context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Database, impl->getEngineName());
+        if (impl && context->hasQueryContext() && context->getSettingsRef().log_queries)
+            context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Database, impl->getEngineName());
 
         return impl;
 
     }
     catch (...)
     {
-        Poco::File metadata_dir(metadata_path);
-
-        if (created && metadata_dir.exists())
-            metadata_dir.remove(true);
-
+        if (created && fs::exists(metadata_path))
+            fs::remove_all(metadata_path);
         throw;
     }
 }
@@ -91,7 +91,7 @@ static inline ValueType safeGetLiteralValue(const ASTPtr &ast, const String &eng
     return ast->as<ASTLiteral>()->value.safeGet<ValueType>();
 }
 
-DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String & metadata_path, Context & context)
+DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context)
 {
     auto * engine_define = create.storage;
     const String & database_name = create.database;
@@ -133,19 +133,20 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         ASTs & arguments = engine->arguments->children;
         arguments[1] = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[1], context);
 
-        const auto & host_name_and_port = safeGetLiteralValue<String>(arguments[0], engine_name);
+        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);
 
         try
         {
-            const auto & [remote_host_name, remote_port] = parseAddress(host_name_and_port, 3306);
-            auto mysql_pool = mysqlxx::Pool(mysql_database_name, remote_host_name, mysql_user_name, mysql_user_password, remote_port);
-
             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);
 
                 mysql_database_settings->loadFromQueryContext(context);
                 mysql_database_settings->loadFromQuery(*engine_define); /// higher priority
@@ -154,7 +155,10 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
                     context, database_name, metadata_path, engine_define, mysql_database_name, 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);
+
 
             auto materialize_mode_settings = std::make_unique<MaterializeMySQLSettings>();
 
@@ -204,9 +208,9 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         String shard_name = safeGetLiteralValue<String>(arguments[1], "Replicated");
         String replica_name  = safeGetLiteralValue<String>(arguments[2], "Replicated");
 
-        zookeeper_path = context.getMacros()->expand(zookeeper_path);
-        shard_name = context.getMacros()->expand(shard_name);
-        replica_name = context.getMacros()->expand(replica_name);
+        zookeeper_path = context->getMacros()->expand(zookeeper_path);
+        shard_name = context->getMacros()->expand(shard_name);
+        replica_name = context->getMacros()->expand(replica_name);
 
         DatabaseReplicatedSettings database_replicated_settings{};
         if (engine_define->settings)
@@ -243,15 +247,17 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
         if (engine->arguments->children.size() == 5)
             use_table_cache = safeGetLiteralValue<UInt64>(engine_args[4], engine_name);
 
-        auto parsed_host_port = parseAddress(host_port, 5432);
+        /// Split into replicas if needed.
+        size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
 
         /// no connection is made here
-        auto connection_pool = std::make_shared<PostgreSQLConnectionPool>(
+        auto connection_pool = std::make_shared<postgres::PoolWithFailover>(
             postgres_database_name,
-            parsed_host_port.first, parsed_host_port.second,
+            addresses,
             username, password,
-            context.getSettingsRef().postgresql_connection_pool_size,
-            context.getSettingsRef().postgresql_connection_pool_wait_timeout);
+            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);
diff --git a/src/Databases/DatabaseFactory.h b/src/Databases/DatabaseFactory.h
index 88d33dc1cd5..8992ea27093 100644
--- a/src/Databases/DatabaseFactory.h
+++ b/src/Databases/DatabaseFactory.h
@@ -11,9 +11,9 @@ class ASTCreateQuery;
 class DatabaseFactory
 {
 public:
-    static DatabasePtr get(const ASTCreateQuery & create, const String & metadata_path, Context & context);
+    static DatabasePtr get(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context);
 
-    static DatabasePtr getImpl(const ASTCreateQuery & create, const String & metadata_path, Context & context);
+    static DatabasePtr getImpl(const ASTCreateQuery & create, const String & metadata_path, ContextPtr context);
 };
 
 }
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index f297bf2c82f..22afaa971a1 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -10,10 +10,11 @@
 #include <Storages/IStorage.h>
 
 #include <common/logger_useful.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <iomanip>
-#include <Poco/File.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -27,7 +28,7 @@ namespace ErrorCodes
 }
 
 
-DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, const Context & context_)
+DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, ContextPtr context_)
     : DatabaseOnDisk(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseLazy (" + name_ + ")", context_)
     , expiration_time(expiration_time_)
 {
@@ -35,16 +36,16 @@ DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_,
 
 
 void DatabaseLazy::loadStoredObjects(
-    Context & context,
+    ContextMutablePtr local_context,
     bool /* has_force_restore_data_flag */,
     bool /*force_attach*/)
 {
-    iterateMetadataFiles(context, [this](const String & file_name)
+    iterateMetadataFiles(local_context, [this](const String & file_name)
     {
         const std::string table_name = file_name.substr(0, file_name.size() - 4);
 
-        auto detached_permanently_flag = Poco::File(getMetadataPath() + "/" + file_name + detached_suffix);
-        if (detached_permanently_flag.exists())
+        fs::path detached_permanently_flag = fs::path(getMetadataPath()) / (file_name + detached_suffix);
+        if (fs::exists(detached_permanently_flag))
         {
             LOG_DEBUG(log, "Skipping permanently detached table {}.", backQuote(table_name));
             return;
@@ -56,15 +57,15 @@ void DatabaseLazy::loadStoredObjects(
 
 
 void DatabaseLazy::createTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     const StoragePtr & table,
     const ASTPtr & query)
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
     if (!endsWith(table->getName(), "Log"))
         throw Exception("Lazy engine can be used only with *Log tables.", ErrorCodes::UNSUPPORTED_METHOD);
-    DatabaseOnDisk::createTable(context, table_name, table, query);
+    DatabaseOnDisk::createTable(local_context, table_name, table, query);
 
     /// DatabaseOnDisk::createTable renames file, so we need to get new metadata_modification_time.
     std::lock_guard lock(mutex);
@@ -74,24 +75,24 @@ void DatabaseLazy::createTable(
 }
 
 void DatabaseLazy::dropTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     bool no_delay)
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
-    DatabaseOnDisk::dropTable(context, table_name, no_delay);
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
+    DatabaseOnDisk::dropTable(local_context, table_name, no_delay);
 }
 
 void DatabaseLazy::renameTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     IDatabase & to_database,
     const String & to_table_name,
     bool exchange,
     bool dictionary)
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
-    DatabaseOnDisk::renameTable(context, table_name, to_database, to_table_name, exchange, dictionary);
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
+    DatabaseOnDisk::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
 }
 
 
@@ -105,7 +106,7 @@ time_t DatabaseLazy::getObjectMetadataModificationTime(const String & table_name
 }
 
 void DatabaseLazy::alterTable(
-    const Context & /* context */,
+    ContextPtr /* context */,
     const StorageID & /*table_id*/,
     const StorageInMemoryMetadata & /* metadata */)
 {
@@ -115,14 +116,14 @@ void DatabaseLazy::alterTable(
 
 bool DatabaseLazy::isTableExist(const String & table_name) const
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
     std::lock_guard lock(mutex);
     return tables_cache.find(table_name) != tables_cache.end();
 }
 
 StoragePtr DatabaseLazy::tryGetTable(const String & table_name) const
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
     {
         std::lock_guard lock(mutex);
         auto it = tables_cache.find(table_name);
@@ -142,7 +143,7 @@ StoragePtr DatabaseLazy::tryGetTable(const String & table_name) const
     return loadTable(table_name);
 }
 
-DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(const Context &, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
 {
     std::lock_guard lock(mutex);
     Strings filtered_tables;
@@ -203,7 +204,7 @@ void DatabaseLazy::shutdown()
     for (const auto & kv : tables_snapshot)
     {
         if (kv.second.table)
-            kv.second.table->shutdown();
+            kv.second.table->flushAndShutdown();
     }
 
     std::lock_guard lock(mutex);
@@ -224,18 +225,18 @@ DatabaseLazy::~DatabaseLazy()
 
 StoragePtr DatabaseLazy::loadTable(const String & table_name) const
 {
-    SCOPE_EXIT({ clearExpiredTables(); });
+    SCOPE_EXIT_MEMORY_SAFE({ clearExpiredTables(); });
 
     LOG_DEBUG(log, "Load table {} to cache.", backQuote(table_name));
 
-    const String table_metadata_path = getMetadataPath() + "/" + escapeForFileName(table_name) + ".sql";
+    const String table_metadata_path = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + ".sql");
 
     try
     {
         StoragePtr table;
-        Context context_copy(global_context); /// some tables can change context, but not LogTables
+        auto context_copy = Context::createCopy(context); /// some tables can change context, but not LogTables
 
-        auto ast = parseQueryFromMetadata(log, global_context, table_metadata_path, /*throw_on_error*/ true, /*remove_empty*/false);
+        auto ast = parseQueryFromMetadata(log, getContext(), table_metadata_path, /*throw_on_error*/ true, /*remove_empty*/false);
         if (ast)
         {
             const auto & ast_create = ast->as<const ASTCreateQuery &>();
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index 2d091297c91..949869f4509 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -18,7 +18,7 @@ class Context;
 class DatabaseLazy final : public DatabaseOnDisk
 {
 public:
-    DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, const Context & context_);
+    DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, ContextPtr context_);
 
     String getEngineName() const override { return "Lazy"; }
 
@@ -27,22 +27,22 @@ public:
     bool canContainDistributedTables() const override { return false; }
 
     void loadStoredObjects(
-        Context & context,
+        ContextMutablePtr context,
         bool has_force_restore_data_flag, bool force_attach) override;
 
     void createTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         const StoragePtr & table,
         const ASTPtr & query) override;
 
     void dropTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         bool no_delay) override;
 
     void renameTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         IDatabase & to_database,
         const String & to_table_name,
@@ -50,21 +50,21 @@ public:
         bool dictionary) override;
 
     void alterTable(
-        const Context & context,
+        ContextPtr context,
         const StorageID & table_id,
         const StorageInMemoryMetadata & metadata) override;
 
     time_t getObjectMetadataModificationTime(const String & table_name) const override;
 
-    bool isTableExist(const String & table_name, const Context &) const override { return isTableExist(table_name); }
+    bool isTableExist(const String & table_name, ContextPtr) const override { return isTableExist(table_name); }
     bool isTableExist(const String & table_name) const;
 
-    StoragePtr tryGetTable(const String & table_name, const Context &) const override { return tryGetTable(table_name); }
+    StoragePtr tryGetTable(const String & table_name, ContextPtr) const override { return tryGetTable(table_name); }
     StoragePtr tryGetTable(const String & table_name) const;
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     void attachTable(const String & table_name, const StoragePtr & table, const String & relative_table_path) override;
 
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index 357acb32371..c0af027e027 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -4,9 +4,9 @@
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Storages/IStorage.h>
-#include <Poco/File.h>
 #include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -16,13 +16,13 @@ namespace ErrorCodes
     extern const int UNKNOWN_TABLE;
 }
 
-DatabaseMemory::DatabaseMemory(const String & name_, const Context & context)
-    : DatabaseWithOwnTablesBase(name_, "DatabaseMemory(" + name_ + ")", context)
+DatabaseMemory::DatabaseMemory(const String & name_, ContextPtr context_)
+    : DatabaseWithOwnTablesBase(name_, "DatabaseMemory(" + name_ + ")", context_)
     , data_path("data/" + escapeForFileName(database_name) + "/")
 {}
 
 void DatabaseMemory::createTable(
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     const String & table_name,
     const StoragePtr & table,
     const ASTPtr & query)
@@ -33,7 +33,7 @@ void DatabaseMemory::createTable(
 }
 
 void DatabaseMemory::dropTable(
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     const String & table_name,
     bool /*no_delay*/)
 {
@@ -42,9 +42,9 @@ void DatabaseMemory::dropTable(
     try
     {
         table->drop();
-        Poco::File table_data_dir{getTableDataPath(table_name)};
-        if (table_data_dir.exists())
-            table_data_dir.remove(true);
+        fs::path table_data_dir{getTableDataPath(table_name)};
+        if (fs::exists(table_data_dir))
+            fs::remove_all(table_data_dir);
     }
     catch (...)
     {
@@ -67,7 +67,7 @@ ASTPtr DatabaseMemory::getCreateDatabaseQuery() const
     return create_query;
 }
 
-ASTPtr DatabaseMemory::getCreateTableQueryImpl(const String & table_name, const Context &, bool throw_on_error) const
+ASTPtr DatabaseMemory::getCreateTableQueryImpl(const String & table_name, ContextPtr, bool throw_on_error) const
 {
     std::lock_guard lock{mutex};
     auto it = create_queries.find(table_name);
@@ -83,15 +83,15 @@ ASTPtr DatabaseMemory::getCreateTableQueryImpl(const String & table_name, const
 
 UUID DatabaseMemory::tryGetTableUUID(const String & table_name) const
 {
-    if (auto table = tryGetTable(table_name, global_context))
+    if (auto table = tryGetTable(table_name, getContext()))
         return table->getStorageID().uuid;
     return UUIDHelpers::Nil;
 }
 
-void DatabaseMemory::drop(const Context & context)
+void DatabaseMemory::drop(ContextPtr local_context)
 {
     /// Remove data on explicit DROP DATABASE
-    std::filesystem::remove_all(context.getPath() + data_path);
+    std::filesystem::remove_all(local_context->getPath() + data_path);
 }
 
 }
diff --git a/src/Databases/DatabaseMemory.h b/src/Databases/DatabaseMemory.h
index 40cc808e42b..8c9cf86ec19 100644
--- a/src/Databases/DatabaseMemory.h
+++ b/src/Databases/DatabaseMemory.h
@@ -19,22 +19,22 @@ namespace DB
 class DatabaseMemory final : public DatabaseWithOwnTablesBase
 {
 public:
-    DatabaseMemory(const String & name_, const Context & context);
+    DatabaseMemory(const String & name_, ContextPtr context);
 
     String getEngineName() const override { return "Memory"; }
 
     void createTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         const StoragePtr & table,
         const ASTPtr & query) override;
 
     void dropTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         bool no_delay) override;
 
-    ASTPtr getCreateTableQueryImpl(const String & name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & name, ContextPtr context, bool throw_on_error) const override;
     ASTPtr getCreateDatabaseQuery() const override;
 
     /// DatabaseMemory allows to create tables, which store data on disk.
@@ -46,7 +46,7 @@ public:
 
     UUID tryGetTableUUID(const String & table_name) const override;
 
-    void drop(const Context & context) override;
+    void drop(ContextPtr context) override;
 
 private:
     String data_path;
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 79373128713..620e560b64c 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -14,14 +14,14 @@
 #include <Storages/StorageFactory.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/escapeForFileName.h>
-
 #include <common/logger_useful.h>
-#include <Poco/DirectoryIterator.h>
-
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabaseAtomic.h>
 #include <Common/assert_cast.h>
+#include <filesystem>
+#include <Common/filesystemHelpers.h>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -37,7 +37,6 @@ namespace ErrorCodes
     extern const int INCORRECT_FILE_NAME;
     extern const int SYNTAX_ERROR;
     extern const int TABLE_ALREADY_EXISTS;
-    extern const int DICTIONARY_ALREADY_EXISTS;
     extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
 }
 
@@ -46,7 +45,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     ASTCreateQuery ast_create_query,
     const String & database_name,
     const String & table_data_path_relative,
-    Context & context,
+    ContextMutablePtr context,
     bool has_force_restore_data_flag)
 {
     ast_create_query.attach = true;
@@ -58,19 +57,26 @@ std::pair<String, StoragePtr> createTableFromAST(
         auto table_function = factory.get(ast_create_query.as_table_function, context);
         ColumnsDescription columns;
         if (ast_create_query.columns_list && ast_create_query.columns_list->columns)
-            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, false);
+            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, true);
         StoragePtr storage = table_function->execute(ast_create_query.as_table_function, context, ast_create_query.table, std::move(columns));
         storage->renameInMemory(ast_create_query);
         return {ast_create_query.table, storage};
     }
-    /// We do not directly use `InterpreterCreateQuery::execute`, because
-    /// - the database has not been loaded yet;
-    /// - the code is simpler, since the query is already brought to a suitable form.
-    if (!ast_create_query.columns_list || !ast_create_query.columns_list->columns)
-        throw Exception("Missing definition of columns.", ErrorCodes::EMPTY_LIST_OF_COLUMNS_PASSED);
 
-    ColumnsDescription columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, false);
-    ConstraintsDescription constraints = InterpreterCreateQuery::getConstraintsDescription(ast_create_query.columns_list->constraints);
+    ColumnsDescription columns;
+    ConstraintsDescription constraints;
+
+    if (!ast_create_query.is_dictionary)
+    {
+        /// We do not directly use `InterpreterCreateQuery::execute`, because
+        /// - the database has not been loaded yet;
+        /// - the code is simpler, since the query is already brought to a suitable form.
+        if (!ast_create_query.columns_list || !ast_create_query.columns_list->columns)
+            throw Exception("Missing definition of columns.", ErrorCodes::EMPTY_LIST_OF_COLUMNS_PASSED);
+
+        columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, true);
+        constraints = InterpreterCreateQuery::getConstraintsDescription(ast_create_query.columns_list->constraints);
+    }
 
     return
     {
@@ -79,7 +85,7 @@ std::pair<String, StoragePtr> createTableFromAST(
             ast_create_query,
             table_data_path_relative,
             context,
-            context.getGlobalContext(),
+            context->getGlobalContext(),
             columns,
             constraints,
             has_force_restore_data_flag)
@@ -142,10 +148,12 @@ void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemo
     ASTPtr new_columns = InterpreterCreateQuery::formatColumns(metadata.columns);
     ASTPtr new_indices = InterpreterCreateQuery::formatIndices(metadata.secondary_indices);
     ASTPtr new_constraints = InterpreterCreateQuery::formatConstraints(metadata.constraints);
+    ASTPtr new_projections = InterpreterCreateQuery::formatProjections(metadata.projections);
 
     ast_create_query.columns_list->replace(ast_create_query.columns_list->columns, new_columns);
     ast_create_query.columns_list->setOrReplace(ast_create_query.columns_list->indices, new_indices);
     ast_create_query.columns_list->setOrReplace(ast_create_query.columns_list->constraints, new_constraints);
+    ast_create_query.columns_list->setOrReplace(ast_create_query.columns_list->projections, new_projections);
 
     if (metadata.select.select_query)
     {
@@ -188,23 +196,23 @@ DatabaseOnDisk::DatabaseOnDisk(
     const String & metadata_path_,
     const String & data_path_,
     const String & logger,
-    const Context & context)
-    : DatabaseWithOwnTablesBase(name, logger, context)
+    ContextPtr local_context)
+    : DatabaseWithOwnTablesBase(name, logger, local_context)
     , metadata_path(metadata_path_)
     , data_path(data_path_)
 {
-    Poco::File(context.getPath() + data_path).createDirectories();
-    Poco::File(metadata_path).createDirectories();
+    fs::create_directories(local_context->getPath() + data_path);
+    fs::create_directories(metadata_path);
 }
 
 
 void DatabaseOnDisk::createTable(
-    const Context & context,
+    ContextPtr local_context,
     const String & table_name,
     const StoragePtr & table,
     const ASTPtr & query)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
     const auto & create = query->as<ASTCreateQuery &>();
     assert(table_name == create.table);
 
@@ -220,18 +228,16 @@ void DatabaseOnDisk::createTable(
     /// A race condition would be possible if a table with the same name is simultaneously created using CREATE and using ATTACH.
     /// But there is protection from it - see using DDLGuard in InterpreterCreateQuery.
 
-    if (isDictionaryExist(table_name))
-        throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS, "Dictionary {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
-
-    if (isTableExist(table_name, global_context))
-        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
+    if (isTableExist(table_name, getContext()))
+        throw Exception(
+            ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
 
     String table_metadata_path = getObjectMetadataPath(table_name);
 
     if (create.attach_short_syntax)
     {
         /// Metadata already exists, table was detached
-        removeDetachedPermanentlyFlag(context, table_name, table_metadata_path, true);
+        removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, true);
         attachTable(table_name, table, getTableDataPath(create));
         return;
     }
@@ -239,9 +245,9 @@ void DatabaseOnDisk::createTable(
     if (!create.attach)
         checkMetadataFilenameAvailability(table_name);
 
-    if (create.attach && Poco::File(table_metadata_path).exists())
+    if (create.attach && fs::exists(table_metadata_path))
     {
-        ASTPtr ast_detached = parseQueryFromMetadata(log, context, table_metadata_path);
+        ASTPtr ast_detached = parseQueryFromMetadata(log, local_context, table_metadata_path);
         auto & create_detached = ast_detached->as<ASTCreateQuery &>();
 
         // either both should be Nil, either values should be equal
@@ -268,21 +274,21 @@ void DatabaseOnDisk::createTable(
         out.close();
     }
 
-    commitCreateTable(create, table, table_metadata_tmp_path, table_metadata_path, context);
+    commitCreateTable(create, table, table_metadata_tmp_path, table_metadata_path, local_context);
 
-    removeDetachedPermanentlyFlag(context, table_name, table_metadata_path, false);
+    removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, false);
 }
 
 /// If the table was detached permanently we will have a flag file with
 /// .sql.detached extension, is not needed anymore since we attached the table back
-void DatabaseOnDisk::removeDetachedPermanentlyFlag(const Context &, const String & table_name, const String & table_metadata_path, bool) const
+void DatabaseOnDisk::removeDetachedPermanentlyFlag(ContextPtr, const String & table_name, const String & table_metadata_path, bool) const
 {
     try
     {
-        auto detached_permanently_flag = Poco::File(table_metadata_path + detached_suffix);
+        fs::path detached_permanently_flag(table_metadata_path + detached_suffix);
 
-        if (detached_permanently_flag.exists())
-            detached_permanently_flag.remove();
+        if (fs::exists(detached_permanently_flag))
+            fs::remove(detached_permanently_flag);
     }
     catch (Exception & e)
     {
@@ -293,7 +299,7 @@ void DatabaseOnDisk::removeDetachedPermanentlyFlag(const Context &, const String
 
 void DatabaseOnDisk::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                                        const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                       const Context & /*query_context*/)
+                                       ContextPtr /*query_context*/)
 {
     try
     {
@@ -302,23 +308,23 @@ void DatabaseOnDisk::commitCreateTable(const ASTCreateQuery & query, const Stora
 
         /// If it was ATTACH query and file with table metadata already exist
         /// (so, ATTACH is done after DETACH), then rename atomically replaces old file with new one.
-        Poco::File(table_metadata_tmp_path).renameTo(table_metadata_path);
+        fs::rename(table_metadata_tmp_path, table_metadata_path);
     }
     catch (...)
     {
-        Poco::File(table_metadata_tmp_path).remove();
+        fs::remove(table_metadata_tmp_path);
         throw;
     }
 }
 
-void DatabaseOnDisk::detachTablePermanently(const Context &, const String & table_name)
+void DatabaseOnDisk::detachTablePermanently(ContextPtr, const String & table_name)
 {
     auto table = detachTable(table_name);
 
-    Poco::File detached_permanently_flag(getObjectMetadataPath(table_name) + detached_suffix);
+    fs::path detached_permanently_flag(getObjectMetadataPath(table_name) + detached_suffix);
     try
     {
-        detached_permanently_flag.createFile();
+        FS::createFile(detached_permanently_flag);
     }
     catch (Exception & e)
     {
@@ -327,7 +333,7 @@ void DatabaseOnDisk::detachTablePermanently(const Context &, const String & tabl
     }
 }
 
-void DatabaseOnDisk::dropTable(const Context & context, const String & table_name, bool /*no_delay*/)
+void DatabaseOnDisk::dropTable(ContextPtr local_context, const String & table_name, bool /*no_delay*/)
 {
     String table_metadata_path = getObjectMetadataPath(table_name);
     String table_metadata_path_drop = table_metadata_path + drop_suffix;
@@ -344,25 +350,25 @@ void DatabaseOnDisk::dropTable(const Context & context, const String & table_nam
     bool renamed = false;
     try
     {
-        Poco::File(table_metadata_path).renameTo(table_metadata_path_drop);
+        fs::rename(table_metadata_path, table_metadata_path_drop);
         renamed = true;
         table->drop();
         table->is_dropped = true;
 
-        Poco::File table_data_dir{context.getPath() + table_data_path_relative};
-        if (table_data_dir.exists())
-            table_data_dir.remove(true);
+        fs::path table_data_dir(local_context->getPath() + table_data_path_relative);
+        if (fs::exists(table_data_dir))
+            fs::remove_all(table_data_dir);
     }
     catch (...)
     {
         LOG_WARNING(log, getCurrentExceptionMessage(__PRETTY_FUNCTION__));
         attachTable(table_name, table, table_data_path_relative);
         if (renamed)
-            Poco::File(table_metadata_path_drop).renameTo(table_metadata_path);
+            fs::rename(table_metadata_path_drop, table_metadata_path);
         throw;
     }
 
-    Poco::File(table_metadata_path_drop).remove();
+    fs::remove(table_metadata_path_drop);
 }
 
 void DatabaseOnDisk::checkMetadataFilenameAvailability(const String & to_table_name) const
@@ -375,11 +381,11 @@ void DatabaseOnDisk::checkMetadataFilenameAvailabilityUnlocked(const String & to
 {
     String table_metadata_path = getObjectMetadataPath(to_table_name);
 
-    if (Poco::File(table_metadata_path).exists())
+    if (fs::exists(table_metadata_path))
     {
-        auto detached_permanently_flag = Poco::File(table_metadata_path + detached_suffix);
+        fs::path detached_permanently_flag(table_metadata_path + detached_suffix);
 
-        if (detached_permanently_flag.exists())
+        if (fs::exists(detached_permanently_flag))
             throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists (detached permanently)", backQuote(database_name), backQuote(to_table_name));
         else
             throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists (detached)", backQuote(database_name), backQuote(to_table_name));
@@ -387,7 +393,7 @@ void DatabaseOnDisk::checkMetadataFilenameAvailabilityUnlocked(const String & to
 }
 
 void DatabaseOnDisk::renameTable(
-        const Context & context,
+        ContextPtr local_context,
         const String & table_name,
         IDatabase & to_database,
         const String & to_table_name,
@@ -418,15 +424,16 @@ void DatabaseOnDisk::renameTable(
     String table_metadata_path;
     ASTPtr attach_query;
     /// DatabaseLazy::detachTable may return nullptr even if table exists, so we need tryGetTable for this case.
-    StoragePtr table = tryGetTable(table_name, global_context);
+    StoragePtr table = tryGetTable(table_name, getContext());
     detachTable(table_name);
     UUID prev_uuid = UUIDHelpers::Nil;
     try
     {
-        table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        table_lock = table->lockExclusively(
+            local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
         table_metadata_path = getObjectMetadataPath(table_name);
-        attach_query = parseQueryFromMetadata(log, context, table_metadata_path);
+        attach_query = parseQueryFromMetadata(log, local_context, table_metadata_path);
         auto & create = attach_query->as<ASTCreateQuery &>();
         create.database = to_database.getDatabaseName();
         create.table = to_table_name;
@@ -454,9 +461,9 @@ void DatabaseOnDisk::renameTable(
     }
 
     /// Now table data are moved to new database, so we must add metadata and attach table to new database
-    to_database.createTable(context, to_table_name, table, attach_query);
+    to_database.createTable(local_context, to_table_name, table, attach_query);
 
-    Poco::File(table_metadata_path).remove();
+    fs::remove(table_metadata_path);
 
     if (from_atomic_to_ordinary)
     {
@@ -473,10 +480,10 @@ void DatabaseOnDisk::renameTable(
 
 
 /// It returns create table statement (even if table is detached)
-ASTPtr DatabaseOnDisk::getCreateTableQueryImpl(const String & table_name, const Context &, bool throw_on_error) const
+ASTPtr DatabaseOnDisk::getCreateTableQueryImpl(const String & table_name, ContextPtr, bool throw_on_error) const
 {
     ASTPtr ast;
-    bool has_table = tryGetTable(table_name, global_context) != nullptr;
+    bool has_table = tryGetTable(table_name, getContext()) != nullptr;
     auto table_metadata_path = getObjectMetadataPath(table_name);
     try
     {
@@ -497,11 +504,11 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
 {
     ASTPtr ast;
 
-    auto settings = global_context.getSettingsRef();
+    auto settings = getContext()->getSettingsRef();
     {
         std::lock_guard lock(mutex);
-        auto database_metadata_path = global_context.getPath() + "metadata/" + escapeForFileName(database_name) + ".sql";
-        ast = parseQueryFromMetadata(log, global_context, database_metadata_path, true);
+        auto database_metadata_path = getContext()->getPath() + "metadata/" + escapeForFileName(database_name) + ".sql";
+        ast = parseQueryFromMetadata(log, getContext(), database_metadata_path, true);
         auto & ast_create_query = ast->as<ASTCreateQuery &>();
         ast_create_query.attach = false;
         ast_create_query.database = database_name;
@@ -518,11 +525,11 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
     return ast;
 }
 
-void DatabaseOnDisk::drop(const Context & context)
+void DatabaseOnDisk::drop(ContextPtr local_context)
 {
     assert(tables.empty());
-    Poco::File(context.getPath() + getDataPath()).remove(false);
-    Poco::File(getMetadataPath()).remove(false);
+    fs::remove(local_context->getPath() + getDataPath());
+    fs::remove(getMetadataPath());
 }
 
 String DatabaseOnDisk::getObjectMetadataPath(const String & object_name) const
@@ -533,71 +540,71 @@ String DatabaseOnDisk::getObjectMetadataPath(const String & object_name) const
 time_t DatabaseOnDisk::getObjectMetadataModificationTime(const String & object_name) const
 {
     String table_metadata_path = getObjectMetadataPath(object_name);
-    Poco::File meta_file(table_metadata_path);
 
-    if (meta_file.exists())
-        return meta_file.getLastModified().epochTime();
+    if (fs::exists(table_metadata_path))
+        return FS::getModificationTime(table_metadata_path);
     else
         return static_cast<time_t>(0);
 }
 
-void DatabaseOnDisk::iterateMetadataFiles(const Context & context, const IteratingFunction & process_metadata_file) const
+void DatabaseOnDisk::iterateMetadataFiles(ContextPtr local_context, const IteratingFunction & process_metadata_file) const
 {
     auto process_tmp_drop_metadata_file = [&](const String & file_name)
     {
         assert(getUUID() == UUIDHelpers::Nil);
         static const char * tmp_drop_ext = ".sql.tmp_drop";
         const std::string object_name = file_name.substr(0, file_name.size() - strlen(tmp_drop_ext));
-        if (Poco::File(context.getPath() + getDataPath() + '/' + object_name).exists())
+
+        if (fs::exists(local_context->getPath() + getDataPath() + '/' + object_name))
         {
-            Poco::File(getMetadataPath() + file_name).renameTo(getMetadataPath() + object_name + ".sql");
+            fs::rename(getMetadataPath() + file_name, getMetadataPath() + object_name + ".sql");
             LOG_WARNING(log, "Object {} was not dropped previously and will be restored", backQuote(object_name));
             process_metadata_file(object_name + ".sql");
         }
         else
         {
             LOG_INFO(log, "Removing file {}", getMetadataPath() + file_name);
-            Poco::File(getMetadataPath() + file_name).remove();
+            fs::remove(getMetadataPath() + file_name);
         }
     };
 
     /// Metadata files to load: name and flag for .tmp_drop files
     std::set<std::pair<String, bool>> metadata_files;
 
-    Poco::DirectoryIterator dir_end;
-    for (Poco::DirectoryIterator dir_it(getMetadataPath()); dir_it != dir_end; ++dir_it)
+    fs::directory_iterator dir_end;
+    for (fs::directory_iterator dir_it(getMetadataPath()); dir_it != dir_end; ++dir_it)
     {
+        String file_name = dir_it->path().filename();
         /// For '.svn', '.gitignore' directory and similar.
-        if (dir_it.name().at(0) == '.')
+        if (file_name.at(0) == '.')
             continue;
 
         /// There are .sql.bak files - skip them.
-        if (endsWith(dir_it.name(), ".sql.bak"))
+        if (endsWith(file_name, ".sql.bak"))
             continue;
 
         /// Permanently detached table flag
-        if (endsWith(dir_it.name(), ".sql.detached"))
+        if (endsWith(file_name, ".sql.detached"))
             continue;
 
-        if (endsWith(dir_it.name(), ".sql.tmp_drop"))
+        if (endsWith(file_name, ".sql.tmp_drop"))
         {
             /// There are files that we tried to delete previously
-            metadata_files.emplace(dir_it.name(), false);
+            metadata_files.emplace(file_name, false);
         }
-        else if (endsWith(dir_it.name(), ".sql.tmp"))
+        else if (endsWith(file_name, ".sql.tmp"))
         {
             /// There are files .sql.tmp - delete
-            LOG_INFO(log, "Removing file {}", dir_it->path());
-            Poco::File(dir_it->path()).remove();
+            LOG_INFO(log, "Removing file {}", dir_it->path().string());
+            fs::remove(dir_it->path());
         }
-        else if (endsWith(dir_it.name(), ".sql"))
+        else if (endsWith(file_name, ".sql"))
         {
             /// The required files have names like `table_name.sql`
-            metadata_files.emplace(dir_it.name(), true);
+            metadata_files.emplace(file_name, true);
         }
         else
-            throw Exception("Incorrect file extension: " + dir_it.name() + " in metadata directory " + getMetadataPath(),
-                ErrorCodes::INCORRECT_FILE_NAME);
+            throw Exception(ErrorCodes::INCORRECT_FILE_NAME, "Incorrect file extension: {} in metadata directory {}", file_name, getMetadataPath());
     }
 
     /// Read and parse metadata in parallel
@@ -615,7 +622,12 @@ void DatabaseOnDisk::iterateMetadataFiles(const Context & context, const Iterati
     pool.wait();
 }
 
-ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Context & context, const String & metadata_file_path, bool throw_on_error /*= true*/, bool remove_empty /*= false*/)
+ASTPtr DatabaseOnDisk::parseQueryFromMetadata(
+    Poco::Logger * logger,
+    ContextPtr local_context,
+    const String & metadata_file_path,
+    bool throw_on_error /*= true*/,
+    bool remove_empty /*= false*/)
 {
     String query;
 
@@ -639,11 +651,11 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Conte
     {
         if (logger)
             LOG_ERROR(logger, "File {} is empty. Removing.", metadata_file_path);
-        Poco::File(metadata_file_path).remove();
+        fs::remove(metadata_file_path);
         return nullptr;
     }
 
-    auto settings = context.getSettingsRef();
+    auto settings = local_context->getSettingsRef();
     ParserCreateQuery parser;
     const char * pos = query.data();
     std::string error_message;
@@ -658,11 +670,15 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Conte
     auto & create = ast->as<ASTCreateQuery &>();
     if (!create.table.empty() && create.uuid != UUIDHelpers::Nil)
     {
-        String table_name = Poco::Path(metadata_file_path).makeFile().getBaseName();
-        table_name = unescapeForFileName(table_name);
+        String table_name = unescapeForFileName(fs::path(metadata_file_path).stem());
 
         if (create.table != TABLE_WITH_UUID_NAME_PLACEHOLDER && logger)
-            LOG_WARNING(logger, "File {} contains both UUID and table name. Will use name `{}` instead of `{}`", metadata_file_path, table_name, create.table);
+            LOG_WARNING(
+                logger,
+                "File {} contains both UUID and table name. Will use name `{}` instead of `{}`",
+                metadata_file_path,
+                table_name,
+                create.table);
         create.table = table_name;
     }
 
@@ -671,7 +687,7 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(Poco::Logger * logger, const Conte
 
 ASTPtr DatabaseOnDisk::getCreateQueryFromMetadata(const String & database_metadata_path, bool throw_on_error) const
 {
-    ASTPtr ast = parseQueryFromMetadata(log, global_context, database_metadata_path, throw_on_error);
+    ASTPtr ast = parseQueryFromMetadata(log, getContext(), database_metadata_path, throw_on_error);
 
     if (ast)
     {
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index b96a24f3345..73b69dd43a5 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -16,7 +16,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     ASTCreateQuery ast_create_query,
     const String & database_name,
     const String & table_data_path_relative,
-    Context & context,
+    ContextMutablePtr context,
     bool has_force_restore_data_flag);
 
 /** Get the string with the table definition based on the CREATE query.
@@ -33,23 +33,23 @@ void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemo
 class DatabaseOnDisk : public DatabaseWithOwnTablesBase
 {
 public:
-    DatabaseOnDisk(const String & name, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context);
+    DatabaseOnDisk(const String & name, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context);
 
     void createTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         const StoragePtr & table,
         const ASTPtr & query) override;
 
-    void detachTablePermanently(const Context & context, const String & table_name) override;
+    void detachTablePermanently(ContextPtr context, const String & table_name) override;
 
     void dropTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         bool no_delay) override;
 
     void renameTable(
-        const Context & context,
+        ContextPtr context,
         const String & table_name,
         IDatabase & to_database,
         const String & to_table_name,
@@ -58,7 +58,7 @@ public:
 
     ASTPtr getCreateDatabaseQuery() const override;
 
-    void drop(const Context & context) override;
+    void drop(ContextPtr context) override;
 
     String getObjectMetadataPath(const String & object_name) const override;
 
@@ -69,7 +69,7 @@ public:
     String getTableDataPath(const ASTCreateQuery & query) const override { return getTableDataPath(query.table); }
     String getMetadataPath() const override { return metadata_path; }
 
-    static ASTPtr parseQueryFromMetadata(Poco::Logger * log, const Context & context, const String & metadata_file_path, bool throw_on_error = true, bool remove_empty = false);
+    static ASTPtr parseQueryFromMetadata(Poco::Logger * log, ContextPtr context, const String & metadata_file_path, bool throw_on_error = true, bool remove_empty = false);
 
     /// will throw when the table we want to attach already exists (in active / detached / detached permanently form)
     void checkMetadataFilenameAvailability(const String & to_table_name) const;
@@ -82,19 +82,19 @@ protected:
 
     using IteratingFunction = std::function<void(const String &)>;
 
-    void iterateMetadataFiles(const Context & context, const IteratingFunction & process_metadata_file) const;
+    void iterateMetadataFiles(ContextPtr context, const IteratingFunction & process_metadata_file) const;
 
     ASTPtr getCreateTableQueryImpl(
         const String & table_name,
-        const Context & context,
+        ContextPtr context,
         bool throw_on_error) const override;
 
     ASTPtr getCreateQueryFromMetadata(const String & metadata_path, bool throw_on_error) const;
 
     virtual void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
-                                   const String & table_metadata_tmp_path, const String & table_metadata_path, const Context & query_context);
+                                   const String & table_metadata_tmp_path, const String & table_metadata_path, ContextPtr query_context);
 
-    virtual void removeDetachedPermanentlyFlag(const Context & context, const String & table_name, const String & table_metadata_path, bool attach) const;
+    virtual void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const;
 
     const String metadata_path;
     const String data_path;
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index a94668dacf7..7758841afc2 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -4,7 +4,6 @@
 #include <Databases/DatabaseOnDisk.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabasesCommon.h>
-#include <Dictionaries/getDictionaryConfigurationFromAST.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
@@ -17,7 +16,6 @@
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
-#include <Poco/DirectoryIterator.h>
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
 #include <Common/escapeForFileName.h>
@@ -36,20 +34,22 @@ static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
 namespace
 {
     void tryAttachTable(
-        Context & context,
+        ContextMutablePtr context,
         const ASTCreateQuery & query,
         DatabaseOrdinary & database,
         const String & database_name,
         const String & metadata_path,
         bool has_force_restore_data_flag)
     {
-        assert(!query.is_dictionary);
         try
         {
-            String table_name;
-            StoragePtr table;
-            std::tie(table_name, table)
-                = createTableFromAST(query, database_name, database.getTableDataPath(query), context, has_force_restore_data_flag);
+            auto [table_name, table] = createTableFromAST(
+                query,
+                database_name,
+                database.getTableDataPath(query),
+                context,
+                has_force_restore_data_flag);
+
             database.attachTable(table_name, table, database.getTableDataPath(query));
         }
         catch (Exception & e)
@@ -61,28 +61,6 @@ namespace
         }
     }
 
-
-    void tryAttachDictionary(const ASTPtr & query, DatabaseOrdinary & database, const String & metadata_path, const Context & context)
-    {
-        auto & create_query = query->as<ASTCreateQuery &>();
-        assert(create_query.is_dictionary);
-        try
-        {
-            Poco::File meta_file(metadata_path);
-            auto config = getDictionaryConfigurationFromAST(create_query, context, database.getDatabaseName());
-            time_t modification_time = meta_file.getLastModified().epochTime();
-            database.attachDictionary(create_query.table, DictionaryAttachInfo{query, config, modification_time});
-        }
-        catch (Exception & e)
-        {
-            e.addMessage(
-                "Cannot attach dictionary " + backQuote(database.getDatabaseName()) + "." + backQuote(create_query.table)
-                + " from metadata file " + metadata_path + " from query " + serializeAST(*query));
-            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))
@@ -94,18 +72,18 @@ namespace
 }
 
 
-DatabaseOrdinary::DatabaseOrdinary(const String & name_, const String & metadata_path_, const Context & context_)
+DatabaseOrdinary::DatabaseOrdinary(const String & name_, const String & metadata_path_, ContextPtr context_)
     : DatabaseOrdinary(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseOrdinary (" + name_ + ")", context_)
 {
 }
 
 DatabaseOrdinary::DatabaseOrdinary(
-    const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context_)
-    : DatabaseWithDictionaries(name_, metadata_path_, data_path_, logger, context_)
+    const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context_)
+    : DatabaseOnDisk(name_, metadata_path_, data_path_, logger, context_)
 {
 }
 
-void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool /*force_attach*/)
+void DatabaseOrdinary::loadStoredObjects(ContextMutablePtr local_context, bool has_force_restore_data_flag, bool /*force_attach*/)
 {
     /** Tables load faster if they are loaded in sorted (by name) order.
       * Otherwise (for the ext4 filesystem), `DirectoryIterator` iterates through them in some order,
@@ -117,7 +95,8 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
 
     size_t total_dictionaries = 0;
 
-    auto process_metadata = [&context, &file_names, &total_dictionaries, &file_names_mutex, this](const String & file_name)
+    auto process_metadata = [&file_names, &total_dictionaries, &file_names_mutex, this](
+                                const String & file_name)
     {
         fs::path path(getMetadataPath());
         fs::path file_path(file_name);
@@ -125,14 +104,13 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
 
         try
         {
-            auto ast = parseQueryFromMetadata(log, context, full_path.string(), /*throw_on_error*/ true, /*remove_empty*/ false);
+            auto ast = parseQueryFromMetadata(log, getContext(), full_path.string(), /*throw_on_error*/ true, /*remove_empty*/ false);
             if (ast)
             {
                 auto * create_query = ast->as<ASTCreateQuery>();
                 create_query->database = database_name;
 
-                auto detached_permanently_flag = Poco::File(full_path.string() + detached_suffix);
-                if (detached_permanently_flag.exists())
+                if (fs::exists(full_path.string() + detached_suffix))
                 {
                     /// FIXME: even if we don't load the table we can still mark the uuid of it as taken.
                     /// if (create_query->uuid != UUIDHelpers::Nil)
@@ -155,7 +133,7 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
         }
     };
 
-    iterateMetadataFiles(context, process_metadata);
+    iterateMetadataFiles(local_context, process_metadata);
 
     size_t total_tables = file_names.size() - total_dictionaries;
 
@@ -163,7 +141,6 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
 
     AtomicStopwatch watch;
     std::atomic<size_t> tables_processed{0};
-    std::atomic<size_t> dictionaries_processed{0};
 
     ThreadPool pool;
 
@@ -175,27 +152,16 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
     /// loading of its config only, it doesn't involve loading the dictionary itself.
 
     /// Attach dictionaries.
-    for (const auto & [name, query] : file_names)
-    {
-        auto create_query = query->as<const ASTCreateQuery &>();
-        if (create_query.is_dictionary)
-        {
-            tryAttachDictionary(query, *this, getMetadataPath() + name, context);
-
-            /// Messages, so that it's not boring to wait for the server to load for a long time.
-            logAboutProgress(log, ++dictionaries_processed, total_dictionaries, watch);
-        }
-    }
-
-    /// 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)
+
+        if (create_query.is_dictionary)
+        {
             pool.scheduleOrThrowOnError([&]()
             {
                 tryAttachTable(
-                    context,
+                    local_context,
                     create_query,
                     *this,
                     database_name,
@@ -205,6 +171,32 @@ void DatabaseOrdinary::loadStoredObjects(Context & context, bool has_force_resto
                 /// 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();
@@ -245,7 +237,7 @@ void DatabaseOrdinary::startupTables(ThreadPool & thread_pool)
     thread_pool.wait();
 }
 
-void DatabaseOrdinary::alterTable(const Context & context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
+void DatabaseOrdinary::alterTable(ContextPtr local_context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
 {
     String table_name = table_id.table_name;
     /// Read the definition of the table and replace the necessary parts with new ones.
@@ -265,7 +257,7 @@ void DatabaseOrdinary::alterTable(const Context & context, const StorageID & tab
         statement.data() + statement.size(),
         "in file " + table_metadata_path,
         0,
-        context.getSettingsRef().max_parser_depth);
+        local_context->getSettingsRef().max_parser_depth);
 
     applyMetadataChangesToCreateQuery(ast, metadata);
 
@@ -274,24 +266,24 @@ void DatabaseOrdinary::alterTable(const Context & context, const StorageID & tab
         WriteBufferFromFile out(table_metadata_tmp_path, statement.size(), O_WRONLY | O_CREAT | O_EXCL);
         writeString(statement, out);
         out.next();
-        if (context.getSettingsRef().fsync_metadata)
+        if (local_context->getSettingsRef().fsync_metadata)
             out.sync();
         out.close();
     }
 
-    commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, context);
+    commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, local_context);
 }
 
-void DatabaseOrdinary::commitAlterTable(const StorageID &, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & /*statement*/, const Context & /*query_context*/)
+void DatabaseOrdinary::commitAlterTable(const StorageID &, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & /*statement*/, ContextPtr /*query_context*/)
 {
     try
     {
         /// rename atomically replaces the old file with the new one.
-        Poco::File(table_metadata_tmp_path).renameTo(table_metadata_path);
+        fs::rename(table_metadata_tmp_path, table_metadata_path);
     }
     catch (...)
     {
-        Poco::File(table_metadata_tmp_path).remove();
+        fs::remove(table_metadata_tmp_path);
         throw;
     }
 }
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index c1ad32345f6..4d68890cc2b 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Databases/DatabaseWithDictionaries.h>
+#include <Databases/DatabaseOnDisk.h>
 #include <Common/ThreadPool.h>
 
 
@@ -11,26 +11,29 @@ namespace DB
   * It stores tables list in filesystem using list of .sql files,
   *  that contain declaration of table represented by SQL ATTACH TABLE query.
   */
-class DatabaseOrdinary : public DatabaseWithDictionaries
+class DatabaseOrdinary : public DatabaseOnDisk
 {
 public:
-    DatabaseOrdinary(const String & name_, const String & metadata_path_, const Context & context);
-    DatabaseOrdinary(const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context_);
+    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_);
 
     String getEngineName() const override { return "Ordinary"; }
 
-    void loadStoredObjects(
-        Context & context,
-        bool has_force_restore_data_flag,
-        bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach) override;
 
     void alterTable(
-        const Context & context,
+        ContextPtr context,
         const StorageID & table_id,
         const StorageInMemoryMetadata & metadata) override;
 
 protected:
-    virtual void commitAlterTable(const StorageID & table_id, const String & table_metadata_tmp_path, const String & table_metadata_path, const String & statement, const Context & query_context);
+    virtual void commitAlterTable(
+        const StorageID & table_id,
+        const String & table_metadata_tmp_path,
+        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 664452abe6f..b3e5fc67151 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -22,6 +22,7 @@
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/formatAST.h>
 #include <Common/Macros.h>
 
@@ -47,12 +48,12 @@ static constexpr const char * BROKEN_TABLES_SUFFIX = "_broken_tables";
 
 zkutil::ZooKeeperPtr DatabaseReplicated::getZooKeeper() const
 {
-    return global_context.getZooKeeper();
+    return getContext()->getZooKeeper();
 }
 
-static inline String getHostID(const Context & global_context, const UUID & db_uuid)
+static inline String getHostID(ContextPtr global_context, const UUID & db_uuid)
 {
-    return Cluster::Address::toString(getFQDNOrHostName(), global_context.getTCPPort()) + ':' + toString(db_uuid);
+    return Cluster::Address::toString(getFQDNOrHostName(), global_context->getTCPPort()) + ':' + toString(db_uuid);
 }
 
 
@@ -66,7 +67,7 @@ DatabaseReplicated::DatabaseReplicated(
     const String & shard_name_,
     const String & replica_name_,
     DatabaseReplicatedSettings db_settings_,
-    const Context & context_)
+    ContextPtr context_)
     : DatabaseAtomic(name_, metadata_path_, uuid, "DatabaseReplicated (" + name_ + ")", context_)
     , zookeeper_path(zookeeper_path_)
     , shard_name(shard_name_)
@@ -126,7 +127,7 @@ ClusterPtr DatabaseReplicated::getClusterImpl() const
     Strings hosts;
     Strings host_ids;
 
-    auto zookeeper = global_context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
     constexpr int max_retries = 10;
     int iteration = 0;
     bool success = false;
@@ -189,22 +190,22 @@ ClusterPtr DatabaseReplicated::getClusterImpl() const
 
     String username = db_settings.cluster_username;
     String password = db_settings.cluster_password;
-    UInt16 default_port = global_context.getTCPPort();
+    UInt16 default_port = getContext()->getTCPPort();
     bool secure = db_settings.cluster_secure_connection;
 
-    return std::make_shared<Cluster>(global_context.getSettingsRef(), shards, username, password, default_port, false, secure);
+    return std::make_shared<Cluster>(getContext()->getSettingsRef(), shards, username, password, default_port, false, secure);
 }
 
 void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
 {
     try
     {
-        if (!global_context.hasZooKeeper())
+        if (!getContext()->hasZooKeeper())
         {
             throw Exception("Can't create replicated database without ZooKeeper", ErrorCodes::NO_ZOOKEEPER);
         }
 
-        auto current_zookeeper = global_context.getZooKeeper();
+        auto current_zookeeper = getContext()->getZooKeeper();
 
         if (!current_zookeeper->exists(zookeeper_path))
         {
@@ -212,12 +213,12 @@ void DatabaseReplicated::tryConnectToZooKeeperAndInitDatabase(bool force_attach)
             createDatabaseNodesInZooKeeper(current_zookeeper);
         }
 
-        replica_path = zookeeper_path + "/replicas/" + getFullReplicaName();
+        replica_path = fs::path(zookeeper_path) / "replicas" / getFullReplicaName();
 
         String replica_host_id;
         if (current_zookeeper->tryGet(replica_path, replica_host_id))
         {
-            String host_id = getHostID(global_context, db_uuid);
+            String host_id = getHostID(getContext(), db_uuid);
             if (replica_host_id != host_id)
                 throw Exception(ErrorCodes::REPLICA_IS_ALREADY_EXIST,
                                 "Replica {} of shard {} of replicated database at {} already exists. Replica host ID: '{}', current host ID: '{}'",
@@ -273,44 +274,36 @@ bool DatabaseReplicated::createDatabaseNodesInZooKeeper(const zkutil::ZooKeeperP
     __builtin_unreachable();
 }
 
-void DatabaseReplicated::createEmptyLogEntry(Coordination::Requests & ops, const ZooKeeperPtr & current_zookeeper)
+void DatabaseReplicated::createEmptyLogEntry(const ZooKeeperPtr & current_zookeeper)
 {
     /// On replica creation add empty entry to log. Can be used to trigger some actions on other replicas (e.g. update cluster info).
     DDLLogEntry entry{};
-
-    String query_path_prefix = zookeeper_path + "/log/query-";
-    String counter_prefix = zookeeper_path + "/counter/cnt-";
-    String counter_path = current_zookeeper->create(counter_prefix, "", zkutil::CreateMode::EphemeralSequential);
-    String query_path = query_path_prefix + counter_path.substr(counter_prefix.size());
-
-    ops.emplace_back(zkutil::makeCreateRequest(query_path, entry.toString(), zkutil::CreateMode::Persistent));
-    ops.emplace_back(zkutil::makeCreateRequest(query_path + "/committed", getFullReplicaName(), zkutil::CreateMode::Persistent));
-    ops.emplace_back(zkutil::makeRemoveRequest(counter_path, -1));
+    DatabaseReplicatedDDLWorker::enqueueQueryImpl(current_zookeeper, entry, this, true);
 }
 
 void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPtr & current_zookeeper)
 {
     /// Write host name to replica_path, it will protect from multiple replicas with the same name
-    auto host_id = getHostID(global_context, db_uuid);
+    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));
-    createEmptyLogEntry(ops, current_zookeeper);
     current_zookeeper->multi(ops);
+    createEmptyLogEntry(current_zookeeper);
 }
 
-void DatabaseReplicated::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseReplicated::loadStoredObjects(ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach)
 {
     tryConnectToZooKeeperAndInitDatabase(force_attach);
 
-    DatabaseAtomic::loadStoredObjects(context, has_force_restore_data_flag, force_attach);
+    DatabaseAtomic::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach);
 
-    ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, global_context);
+    ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
     ddl_worker->startup();
 }
 
-void DatabaseReplicated::checkQueryValid(const ASTPtr & query, const Context & query_context) const
+void DatabaseReplicated::checkQueryValid(const ASTPtr & query, ContextPtr query_context) const
 {
     /// Replicas will set correct name of current database in query context (database name can be different on replicas)
     if (auto * ddl_query = dynamic_cast<ASTQueryWithTableAndOutput *>(query.get()))
@@ -325,10 +318,25 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, const Context & q
             if (!replicated_table || !create->storage->engine->arguments)
                 return;
 
-            ASTs & args = create->storage->engine->arguments->children;
+            ASTs & args_ref = create->storage->engine->arguments->children;
+            ASTs args = args_ref;
             if (args.size() < 2)
                 return;
 
+            /// It can be a constant expression. Try to evaluate it, ignore exception if we cannot.
+            bool has_expression_argument = args_ref[0]->as<ASTFunction>() || args_ref[1]->as<ASTFunction>();
+            if (has_expression_argument)
+            {
+                try
+                {
+                    args[0] = evaluateConstantExpressionAsLiteral(args_ref[0]->clone(), query_context);
+                    args[1] = evaluateConstantExpressionAsLiteral(args_ref[1]->clone(), query_context);
+                }
+                catch (...)
+                {
+                }
+            }
+
             ASTLiteral * arg1 = args[0]->as<ASTLiteral>();
             ASTLiteral * arg2 = args[1]->as<ASTLiteral>();
             if (!arg1 || !arg2 || arg1->value.getType() != Field::Types::String || arg2->value.getType() != Field::Types::String)
@@ -343,12 +351,12 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, const Context & q
 
             Macros::MacroExpansionInfo info;
             info.table_id = {getDatabaseName(), create->table, create->uuid};
-            query_context.getMacros()->expand(maybe_path, info);
+            query_context->getMacros()->expand(maybe_path, info);
             bool maybe_shard_macros = info.expanded_other;
             info.expanded_other = false;
-            query_context.getMacros()->expand(maybe_replica, info);
+            query_context->getMacros()->expand(maybe_replica, info);
             bool maybe_replica_macros = info.expanded_other;
-            bool enable_functional_tests_helper = global_context.getConfigRef().has("_functional_tests_helper_database_replicated_replace_args_macros");
+            bool enable_functional_tests_helper = getContext()->getConfigRef().has("_functional_tests_helper_database_replicated_replace_args_macros");
 
             if (!enable_functional_tests_helper)
                 LOG_WARNING(log, "It's not recommended to explicitly specify zookeeper_path and replica_name in ReplicatedMergeTree arguments");
@@ -356,12 +364,12 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, const Context & q
             if (maybe_shard_macros && maybe_replica_macros)
                 return;
 
-            if (enable_functional_tests_helper)
+            if (enable_functional_tests_helper && !has_expression_argument)
             {
                 if (maybe_path.empty() || maybe_path.back() != '/')
                     maybe_path += '/';
-                arg1->value = maybe_path + "auto_{shard}";
-                arg2->value = maybe_replica + "auto_{replica}";
+                args_ref[0]->as<ASTLiteral>()->value = maybe_path + "auto_{shard}";
+                args_ref[1]->as<ASTLiteral>()->value = maybe_replica + "auto_{replica}";
                 return;
             }
 
@@ -383,7 +391,7 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, const Context & q
 
     if (auto * query_drop = query->as<ASTDropQuery>())
     {
-        if (query_drop->kind == ASTDropQuery::Kind::Detach && query_context.getSettingsRef().database_replicated_always_detach_permanently)
+        if (query_drop->kind == ASTDropQuery::Kind::Detach && query_context->getSettingsRef().database_replicated_always_detach_permanently)
             query_drop->permanently = true;
         if (query_drop->kind == ASTDropQuery::Kind::Detach && !query_drop->permanently)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "DETACH TABLE is not allowed for Replicated databases. "
@@ -392,12 +400,12 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, const Context & q
     }
 }
 
-BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, const Context & query_context)
+BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context)
 {
     if (is_readonly)
         throw Exception(ErrorCodes::NO_ZOOKEEPER, "Database is in readonly mode, because it cannot connect to ZooKeeper");
 
-    if (query_context.getClientInfo().query_kind != ClientInfo::QueryKind::INITIAL_QUERY)
+    if (query_context->getClientInfo().query_kind != ClientInfo::QueryKind::INITIAL_QUERY)
         throw Exception(ErrorCodes::INCORRECT_QUERY, "It's not initial query. ON CLUSTER is not allowed for Replicated database.");
 
     checkQueryValid(query, query_context);
@@ -413,15 +421,15 @@ BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, const
     return getDistributedDDLStatus(node_path, entry, query_context, hosts_to_wait);
 }
 
-static UUID getTableUUIDIfReplicated(const String & metadata, const Context & context)
+static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context)
 {
     bool looks_like_replicated = metadata.find("ReplicatedMergeTree") != std::string::npos;
     if (!looks_like_replicated)
         return UUIDHelpers::Nil;
 
     ParserCreateQuery parser;
-    auto size = context.getSettingsRef().max_query_size;
-    auto depth = context.getSettingsRef().max_parser_depth;
+    auto size = context->getSettingsRef().max_query_size;
+    auto depth = context->getSettingsRef().max_parser_depth;
     ASTPtr query = parseQuery(parser, metadata, size, depth);
     const ASTCreateQuery & create = query->as<const ASTCreateQuery &>();
     if (!create.storage || !create.storage->engine)
@@ -457,7 +465,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     std::unordered_map<UUID, String> zk_replicated_id_to_name;
     for (const auto & zk_table : table_name_to_metadata)
     {
-        UUID zk_replicated_id = getTableUUIDIfReplicated(zk_table.second, global_context);
+        UUID zk_replicated_id = getTableUUIDIfReplicated(zk_table.second, getContext());
         if (zk_replicated_id != UUIDHelpers::Nil)
             zk_replicated_id_to_name.emplace(zk_replicated_id, zk_table.first);
     }
@@ -467,7 +475,8 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     std::vector<std::pair<String, String>> replicated_tables_to_rename;
     size_t total_tables = 0;
     std::vector<UUID> replicated_ids;
-    for (auto existing_tables_it = getTablesIterator(global_context, {}); existing_tables_it->isValid(); existing_tables_it->next(), ++total_tables)
+    for (auto existing_tables_it = getTablesIterator(getContext(), {}); existing_tables_it->isValid();
+         existing_tables_it->next(), ++total_tables)
     {
         String name = existing_tables_it->name();
         UUID local_replicated_id = UUIDHelpers::Nil;
@@ -506,33 +515,30 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         /// We use Ordinary engine for destination database, because it's the only way to discard table UUID
         /// and make possible creation of new table with the same UUID.
         String query = fmt::format("CREATE DATABASE IF NOT EXISTS {} ENGINE=Ordinary", backQuoteIfNeed(to_db_name));
-        Context query_context = global_context;
+        auto query_context = Context::createCopy(getContext());
         executeQuery(query, query_context, true);
     }
 
-    size_t dropped_dicts = 0;
     size_t moved_tables = 0;
     std::vector<UUID> dropped_tables;
+    size_t dropped_dictionaries = 0;
+
     for (const auto & table_name : tables_to_detach)
     {
         DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, table_name);
         if (getDatabaseName() != db_name)
             throw Exception(ErrorCodes::UNKNOWN_DATABASE, "Database was renamed, will retry");
 
-        auto table = tryGetTable(table_name, global_context);
-        if (isDictionaryExist(table_name))
-        {
-            /// We can safely drop any dictionaries because they do not store data
-            LOG_DEBUG(log, "Will DROP DICTIONARY {}", backQuoteIfNeed(table_name));
-            DatabaseAtomic::removeDictionary(global_context, table_name);
-            ++dropped_dicts;
-        }
-        else if (!table->storesDataOnDisk())
+        auto table = tryGetTable(table_name, getContext());
+
+        if (!table->storesDataOnDisk())
         {
             LOG_DEBUG(log, "Will DROP TABLE {}, because it does not store data on disk and can be safely dropped", backQuoteIfNeed(table_name));
             dropped_tables.push_back(tryGetTableUUID(table_name));
-            table->shutdown();
-            DatabaseAtomic::dropTable(global_context, table_name, true);
+            dropped_dictionaries += table->isDictionary();
+
+            table->flushAndShutdown();
+            DatabaseAtomic::dropTable(getContext(), table_name, true);
         }
         else
         {
@@ -542,14 +548,14 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
             assert(db_name < to_db_name);
             DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(to_db_name, to_name);
             auto to_db_ptr = DatabaseCatalog::instance().getDatabase(to_db_name);
-            DatabaseAtomic::renameTable(global_context, table_name, *to_db_ptr, to_name, false, false);
+            DatabaseAtomic::renameTable(getContext(), table_name, *to_db_ptr, to_name, false, false);
             ++moved_tables;
         }
     }
 
     if (!tables_to_detach.empty())
         LOG_WARNING(log, "Cleaned {} outdated objects: dropped {} dictionaries and {} tables, moved {} tables",
-                    tables_to_detach.size(), dropped_dicts, dropped_tables.size(), moved_tables);
+                    tables_to_detach.size(), dropped_dictionaries, dropped_tables.size() - dropped_dictionaries, moved_tables);
 
     /// Now database is cleared from outdated tables, let's rename ReplicatedMergeTree tables to actual names
     for (const auto & old_to_new : replicated_tables_to_rename)
@@ -561,7 +567,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         /// TODO Maybe we should do it in two steps: rename all tables to temporary names and then rename them to actual names?
         DDLGuardPtr table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::min(from, to));
         DDLGuardPtr to_table_guard = DatabaseCatalog::instance().getDDLGuard(db_name, std::max(from, to));
-        DatabaseAtomic::renameTable(global_context, from, *this, to, false, false);
+        DatabaseAtomic::renameTable(getContext(), from, *this, to, false, false);
     }
 
     for (const auto & id : dropped_tables)
@@ -569,7 +575,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
 
     for (const auto & name_and_meta : table_name_to_metadata)
     {
-        if (isTableExist(name_and_meta.first, global_context))
+        if (isTableExist(name_and_meta.first, getContext()))
         {
             assert(name_and_meta.second == readMetadataFile(name_and_meta.first));
             continue;
@@ -577,11 +583,11 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
 
         auto query_ast = parseQueryFromMetadataInZooKeeper(name_and_meta.first, name_and_meta.second);
 
-        Context query_context = global_context;
-        query_context.makeQueryContext();
-        query_context.getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
-        query_context.setCurrentDatabase(database_name);
-        query_context.setCurrentQueryId(""); // generate random query_id
+        auto query_context = Context::createCopy(getContext());
+        query_context->makeQueryContext();
+        query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+        query_context->setCurrentDatabase(database_name);
+        query_context->setCurrentQueryId(""); // generate random query_id
 
         LOG_INFO(log, "Executing {}", serializeAST(*query_ast));
         InterpreterCreateQuery(query_ast, query_context).execute();
@@ -643,7 +649,7 @@ ASTPtr DatabaseReplicated::parseQueryFromMetadataInZooKeeper(const String & node
 {
     ParserCreateQuery parser;
     String description = "in ZooKeeper " + zookeeper_path + "/metadata/" + node_name;
-    auto ast = parseQuery(parser, query, description, 0, global_context.getSettingsRef().max_parser_depth);
+    auto ast = parseQuery(parser, query, description, 0, getContext()->getSettingsRef().max_parser_depth);
 
     auto & create = ast->as<ASTCreateQuery &>();
     if (create.uuid == UUIDHelpers::Nil || create.table != TABLE_WITH_UUID_NAME_PLACEHOLDER || !create.database.empty())
@@ -658,13 +664,11 @@ ASTPtr DatabaseReplicated::parseQueryFromMetadataInZooKeeper(const String & node
     return ast;
 }
 
-void DatabaseReplicated::drop(const Context & context_)
+void DatabaseReplicated::drop(ContextPtr context_)
 {
     auto current_zookeeper = getZooKeeper();
-    Coordination::Requests ops;
-    ops.emplace_back(zkutil::makeSetRequest(replica_path, DROPPED_MARK, -1));
-    createEmptyLogEntry(ops, current_zookeeper);
-    current_zookeeper->multi(ops);
+    current_zookeeper->set(replica_path, DROPPED_MARK, -1);
+    createEmptyLogEntry(current_zookeeper);
 
     DatabaseAtomic::drop(context_);
 
@@ -691,22 +695,22 @@ void DatabaseReplicated::shutdown()
 }
 
 
-void DatabaseReplicated::dropTable(const Context & context, const String & table_name, bool no_delay)
+void DatabaseReplicated::dropTable(ContextPtr local_context, const String & table_name, bool no_delay)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn || startsWith(table_name, ".inner_id."));
     if (txn && txn->isInitialQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
-    DatabaseAtomic::dropTable(context, table_name, no_delay);
+    DatabaseAtomic::dropTable(local_context, table_name, no_delay);
 }
 
-void DatabaseReplicated::renameTable(const Context & context, const String & table_name, IDatabase & to_database,
+void DatabaseReplicated::renameTable(ContextPtr local_context, const String & table_name, IDatabase & to_database,
                                      const String & to_table_name, bool exchange, bool dictionary)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(txn);
 
     if (txn->isInitialQuery())
@@ -715,9 +719,9 @@ void DatabaseReplicated::renameTable(const Context & context, const String & tab
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Moving tables between databases is not supported for Replicated engine");
         if (table_name == to_table_name)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Cannot rename table to itself");
-        if (!isTableExist(table_name, context))
+        if (!isTableExist(table_name, local_context))
             throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", table_name);
-        if (exchange && !to_database.isTableExist(to_table_name, context))
+        if (exchange && !to_database.isTableExist(to_table_name, local_context))
             throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", to_table_name);
 
         String statement = readMetadataFile(table_name);
@@ -733,14 +737,14 @@ void DatabaseReplicated::renameTable(const Context & context, const String & tab
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path_to, statement, zkutil::CreateMode::Persistent));
     }
 
-    DatabaseAtomic::renameTable(context, table_name, to_database, to_table_name, exchange, dictionary);
+    DatabaseAtomic::renameTable(local_context, table_name, to_database, to_table_name, exchange, dictionary);
 }
 
 void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                        const String & table_metadata_tmp_path, const String & table_metadata_path,
-                       const Context & query_context)
+                       ContextPtr query_context)
 {
-    auto txn = query_context.getZooKeeperMetadataTransaction();
+    auto txn = query_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
@@ -754,9 +758,9 @@ void DatabaseReplicated::commitCreateTable(const ASTCreateQuery & query, const S
 
 void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
                                           const String & table_metadata_tmp_path, const String & table_metadata_path,
-                                          const String & statement, const Context & query_context)
+                                          const String & statement, ContextPtr query_context)
 {
-    auto txn = query_context.getZooKeeperMetadataTransaction();
+    auto txn = query_context->getZooKeeperMetadataTransaction();
     if (txn && txn->isInitialQuery())
     {
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_id.table_name);
@@ -765,36 +769,9 @@ void DatabaseReplicated::commitAlterTable(const StorageID & table_id,
     DatabaseAtomic::commitAlterTable(table_id, table_metadata_tmp_path, table_metadata_path, statement, query_context);
 }
 
-void DatabaseReplicated::createDictionary(const Context & context,
-                                          const String & dictionary_name,
-                                          const ASTPtr & query)
+void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const String & table_name)
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
-    assert(!ddl_worker->isCurrentlyActive() || txn);
-    if (txn && txn->isInitialQuery())
-    {
-        String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(dictionary_name);
-        String statement = getObjectDefinitionFromCreateQuery(query->clone());
-        txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
-    }
-    DatabaseAtomic::createDictionary(context, dictionary_name, query);
-}
-
-void DatabaseReplicated::removeDictionary(const Context & context, const String & dictionary_name)
-{
-    auto txn = context.getZooKeeperMetadataTransaction();
-    assert(!ddl_worker->isCurrentlyActive() || txn);
-    if (txn && txn->isInitialQuery())
-    {
-        String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(dictionary_name);
-        txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
-    }
-    DatabaseAtomic::removeDictionary(context, dictionary_name);
-}
-
-void DatabaseReplicated::detachTablePermanently(const Context & context, const String & table_name)
-{
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery())
     {
@@ -803,12 +780,12 @@ void DatabaseReplicated::detachTablePermanently(const Context & context, const S
         String metadata_zk_path = zookeeper_path + "/metadata/" + escapeForFileName(table_name);
         txn->addOp(zkutil::makeRemoveRequest(metadata_zk_path, -1));
     }
-    DatabaseAtomic::detachTablePermanently(context, table_name);
+    DatabaseAtomic::detachTablePermanently(local_context, table_name);
 }
 
-void DatabaseReplicated::removeDetachedPermanentlyFlag(const Context & context, const String & table_name, const String & table_metadata_path, bool attach) const
+void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context, const String & table_name, const String & table_metadata_path, bool attach) const
 {
-    auto txn = context.getZooKeeperMetadataTransaction();
+    auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
     if (txn && txn->isInitialQuery() && attach)
     {
@@ -816,7 +793,7 @@ void DatabaseReplicated::removeDetachedPermanentlyFlag(const Context & context,
         String statement = readMetadataFile(table_name);
         txn->addOp(zkutil::makeCreateRequest(metadata_zk_path, statement, zkutil::CreateMode::Persistent));
     }
-    DatabaseAtomic::removeDetachedPermanentlyFlag(context, table_name, table_metadata_path, attach);
+    DatabaseAtomic::removeDetachedPermanentlyFlag(local_context, table_name, table_metadata_path, attach);
 }
 
 
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 46bcdc71ef1..41b1bf13e5f 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -24,32 +24,28 @@ public:
     DatabaseReplicated(const String & name_, const String & metadata_path_, UUID uuid,
                        const String & zookeeper_path_, const String & shard_name_, const String & replica_name_,
                        DatabaseReplicatedSettings db_settings_,
-                       const Context & context);
+                       ContextPtr context);
 
     ~DatabaseReplicated() override;
 
     String getEngineName() const override { return "Replicated"; }
 
     /// If current query is initial, then the following methods add metadata updating ZooKeeper operations to current ZooKeeperMetadataTransaction.
-    void dropTable(const Context &, const String & table_name, bool no_delay) override;
-    void renameTable(const Context & context, const String & table_name, IDatabase & to_database,
+    void dropTable(ContextPtr, const String & table_name, bool no_delay) override;
+    void renameTable(ContextPtr context, const String & table_name, IDatabase & to_database,
                      const String & to_table_name, bool exchange, bool dictionary) override;
     void commitCreateTable(const ASTCreateQuery & query, const StoragePtr & table,
                            const String & table_metadata_tmp_path, const String & table_metadata_path,
-                           const Context & query_context) override;
+                           ContextPtr query_context) override;
     void commitAlterTable(const StorageID & table_id,
                           const String & table_metadata_tmp_path, const String & table_metadata_path,
-                          const String & statement, const Context & query_context) override;
-    void createDictionary(const Context & context,
-                          const String & dictionary_name,
-                          const ASTPtr & query) override;
-    void removeDictionary(const Context & context, const String & dictionary_name) override;
-    void detachTablePermanently(const Context & context, const String & table_name) override;
-    void removeDetachedPermanentlyFlag(const Context & context, const String & table_name, const String & table_metadata_path, bool attach) const override;
+                          const String & statement, ContextPtr query_context) override;
+    void detachTablePermanently(ContextPtr context, const String & table_name) override;
+    void removeDetachedPermanentlyFlag(ContextPtr context, const String & table_name, const String & table_metadata_path, bool attach) const override;
 
     /// Try to execute DLL query on current host as initial query. If query is succeed,
     /// then it will be executed on all replicas.
-    BlockIO tryEnqueueReplicatedDDL(const ASTPtr & query, const Context & query_context);
+    BlockIO tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context);
 
     void stopReplication();
 
@@ -59,9 +55,9 @@ public:
     /// Returns cluster consisting of database replicas
     ClusterPtr getCluster() const;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
 
-    void loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach) override;
     void shutdown() override;
 
     friend struct DatabaseReplicatedTask;
@@ -71,7 +67,7 @@ private:
     bool createDatabaseNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
     void createReplicaNodesInZooKeeper(const ZooKeeperPtr & current_zookeeper);
 
-    void checkQueryValid(const ASTPtr & query, const Context & query_context) const;
+    void checkQueryValid(const ASTPtr & query, ContextPtr query_context) const;
 
     void recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 max_log_ptr);
     std::map<String, String> tryGetConsistentMetadataSnapshot(const ZooKeeperPtr & zookeeper, UInt32 & max_log_ptr);
@@ -82,7 +78,7 @@ private:
     ClusterPtr getClusterImpl() const;
     void setCluster(ClusterPtr && new_cluster);
 
-    void createEmptyLogEntry(Coordination::Requests & ops, const ZooKeeperPtr & current_zookeeper);
+    void createEmptyLogEntry(const ZooKeeperPtr & current_zookeeper);
 
     String zookeeper_path;
     String shard_name;
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index 63f4d89b216..eb7e65e1b70 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -1,6 +1,10 @@
 #include <Databases/DatabaseReplicatedWorker.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Interpreters/DDLTask.h>
+#include <Common/ZooKeeper/KeeperException.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -13,7 +17,7 @@ namespace ErrorCodes
     extern const int UNFINISHED;
 }
 
-DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db, const Context & context_)
+DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db, ContextPtr context_)
     : DDLWorker(/* pool_size */ 1, db->zookeeper_path + "/log", context_, nullptr, {}, fmt::format("DDLWorker({})", db->getDatabaseName()))
     , database(db)
 {
@@ -69,29 +73,67 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
 String DatabaseReplicatedDDLWorker::enqueueQuery(DDLLogEntry & entry)
 {
     auto zookeeper = getAndSetZooKeeper();
-    const String query_path_prefix = queue_dir + "/query-";
+    return enqueueQueryImpl(zookeeper, entry, database);
+}
+
+String DatabaseReplicatedDDLWorker::enqueueQueryImpl(const ZooKeeperPtr & zookeeper, DDLLogEntry & entry,
+                               DatabaseReplicated * const database, bool committed)
+{
+    const String query_path_prefix = database->zookeeper_path + "/log/query-";
 
     /// We cannot create sequential node and it's ephemeral child in a single transaction, so allocate sequential number another way
     String counter_prefix = database->zookeeper_path + "/counter/cnt-";
-    String counter_path = zookeeper->create(counter_prefix, "", zkutil::CreateMode::EphemeralSequential);
+    String counter_lock_path = database->zookeeper_path + "/counter_lock";
+
+    String counter_path;
+    size_t iters = 1000;
+    while (--iters)
+    {
+        Coordination::Requests ops;
+        ops.emplace_back(zkutil::makeCreateRequest(counter_lock_path, database->getFullReplicaName(), zkutil::CreateMode::Ephemeral));
+        ops.emplace_back(zkutil::makeCreateRequest(counter_prefix, "", zkutil::CreateMode::EphemeralSequential));
+        Coordination::Responses res;
+
+        Coordination::Error code = zookeeper->tryMulti(ops, res);
+        if (code == Coordination::Error::ZOK)
+        {
+            counter_path = dynamic_cast<const Coordination::CreateResponse &>(*res.back()).path_created;
+            break;
+        }
+        else if (code != Coordination::Error::ZNODEEXISTS)
+            zkutil::KeeperMultiException::check(code, ops, res);
+    }
+
+    if (iters == 0)
+        throw Exception(ErrorCodes::UNFINISHED,
+                        "Cannot enqueue query, because some replica are trying to enqueue another query. "
+                        "It may happen on high queries rate or, in rare cases, after connection loss. Client should retry.");
+
     String node_path = query_path_prefix + counter_path.substr(counter_prefix.size());
 
+    /// Now create task in queue
     Coordination::Requests ops;
     /// Query is not committed yet, but we have to write it into log to avoid reordering
     ops.emplace_back(zkutil::makeCreateRequest(node_path, entry.toString(), zkutil::CreateMode::Persistent));
     /// '/try' will be replaced with '/committed' or will be removed due to expired session or other error
-    ops.emplace_back(zkutil::makeCreateRequest(node_path + "/try", database->getFullReplicaName(), zkutil::CreateMode::Ephemeral));
+    if (committed)
+        ops.emplace_back(zkutil::makeCreateRequest(node_path + "/committed", database->getFullReplicaName(), zkutil::CreateMode::Persistent));
+    else
+        ops.emplace_back(zkutil::makeCreateRequest(node_path + "/try", database->getFullReplicaName(), zkutil::CreateMode::Ephemeral));
     /// We don't need it anymore
     ops.emplace_back(zkutil::makeRemoveRequest(counter_path, -1));
+    /// Unlock counters
+    ops.emplace_back(zkutil::makeRemoveRequest(counter_lock_path, -1));
     /// Create status dirs
     ops.emplace_back(zkutil::makeCreateRequest(node_path + "/active", "", zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(node_path + "/finished", "", zkutil::CreateMode::Persistent));
     zookeeper->multi(ops);
 
+
     return node_path;
 }
 
-String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entry, const Context & query_context)
+String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entry, ContextPtr query_context)
 {
     /// NOTE Possibly it would be better to execute initial query on the most up-to-date node,
     /// but it requires more complex logic around /try node.
@@ -115,7 +157,7 @@ String DatabaseReplicatedDDLWorker::tryEnqueueAndExecuteEntry(DDLLogEntry & entr
     task->is_initial_query = true;
 
     LOG_DEBUG(log, "Waiting for worker thread to process all entries before {}", entry_name);
-    UInt64 timeout = query_context.getSettingsRef().database_replicated_initial_query_timeout_sec;
+    UInt64 timeout = query_context->getSettingsRef().database_replicated_initial_query_timeout_sec;
     {
         std::unique_lock lock{mutex};
         bool processed = wait_current_task_change.wait_for(lock, std::chrono::seconds(timeout), [&]()
@@ -156,7 +198,7 @@ DDLTaskPtr DatabaseReplicatedDDLWorker::initAndCheckTask(const String & entry_na
         }
     }
 
-    UInt32 our_log_ptr = parse<UInt32>(current_zookeeper->get(database->replica_path + "/log_ptr"));
+    UInt32 our_log_ptr = parse<UInt32>(current_zookeeper->get(fs::path(database->replica_path) / "log_ptr"));
     UInt32 entry_num = DatabaseReplicatedTask::getLogEntryNumber(entry_name);
 
     if (entry_num <= our_log_ptr)
@@ -165,13 +207,13 @@ DDLTaskPtr DatabaseReplicatedDDLWorker::initAndCheckTask(const String & entry_na
         return {};
     }
 
-    String entry_path = queue_dir + "/" + entry_name;
+    String entry_path = fs::path(queue_dir) / entry_name;
     auto task = std::make_unique<DatabaseReplicatedTask>(entry_name, entry_path, database);
 
     String initiator_name;
     zkutil::EventPtr wait_committed_or_failed = std::make_shared<Poco::Event>();
 
-    String try_node_path = entry_path + "/try";
+    String try_node_path = fs::path(entry_path) / "try";
     if (zookeeper->tryGet(try_node_path, initiator_name, nullptr, wait_committed_or_failed))
     {
         task->is_initial_query = initiator_name == task->host_id_str;
@@ -203,7 +245,7 @@ DDLTaskPtr DatabaseReplicatedDDLWorker::initAndCheckTask(const String & entry_na
                 if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
                     throw Coordination::Exception(code, try_node_path);
 
-                if (!zookeeper->exists(entry_path + "/committed"))
+                if (!zookeeper->exists(fs::path(entry_path) / "committed"))
                 {
                     out_reason = fmt::format("Entry {} was forcefully cancelled due to timeout", entry_name);
                     return {};
@@ -212,7 +254,7 @@ DDLTaskPtr DatabaseReplicatedDDLWorker::initAndCheckTask(const String & entry_na
         }
     }
 
-    if (!zookeeper->exists(entry_path + "/committed"))
+    if (!zookeeper->exists(fs::path(entry_path) / "committed"))
     {
         out_reason = fmt::format("Entry {} hasn't been committed", entry_name);
         return {};
@@ -220,8 +262,8 @@ DDLTaskPtr DatabaseReplicatedDDLWorker::initAndCheckTask(const String & entry_na
 
     if (task->is_initial_query)
     {
-        assert(!zookeeper->exists(entry_path + "/try"));
-        assert(zookeeper->exists(entry_path + "/committed") == (zookeeper->get(task->getFinishedNodePath()) == ExecutionStatus(0).serializeText()));
+        assert(!zookeeper->exists(fs::path(entry_path) / "try"));
+        assert(zookeeper->exists(fs::path(entry_path) / "committed") == (zookeeper->get(task->getFinishedNodePath()) == ExecutionStatus(0).serializeText()));
         out_reason = fmt::format("Entry {} has been executed as initial query", entry_name);
         return {};
     }
@@ -257,7 +299,7 @@ DDLTaskPtr DatabaseReplicatedDDLWorker::initAndCheckTask(const String & entry_na
 bool DatabaseReplicatedDDLWorker::canRemoveQueueEntry(const String & entry_name, const Coordination::Stat &)
 {
     UInt32 entry_number = DDLTaskBase::getLogEntryNumber(entry_name);
-    UInt32 max_log_ptr = parse<UInt32>(getAndSetZooKeeper()->get(database->zookeeper_path + "/max_log_ptr"));
+    UInt32 max_log_ptr = parse<UInt32>(getAndSetZooKeeper()->get(fs::path(database->zookeeper_path) / "max_log_ptr"));
     return entry_number + logs_to_keep < max_log_ptr;
 }
 
diff --git a/src/Databases/DatabaseReplicatedWorker.h b/src/Databases/DatabaseReplicatedWorker.h
index 3a45817c755..4020906f9b2 100644
--- a/src/Databases/DatabaseReplicatedWorker.h
+++ b/src/Databases/DatabaseReplicatedWorker.h
@@ -21,14 +21,17 @@ class DatabaseReplicated;
 class DatabaseReplicatedDDLWorker : public DDLWorker
 {
 public:
-    DatabaseReplicatedDDLWorker(DatabaseReplicated * db, const Context & context_);
+    DatabaseReplicatedDDLWorker(DatabaseReplicated * db, ContextPtr context_);
 
     String enqueueQuery(DDLLogEntry & entry) override;
 
-    String tryEnqueueAndExecuteEntry(DDLLogEntry & entry, const Context & query_context);
+    String tryEnqueueAndExecuteEntry(DDLLogEntry & entry, ContextPtr query_context);
 
     void shutdown() override;
 
+    static String enqueueQueryImpl(const ZooKeeperPtr & zookeeper, DDLLogEntry & entry,
+                                   DatabaseReplicated * const database, bool committed = false);
+
 private:
     bool initializeMainThread() override;
     void initializeReplication();
diff --git a/src/Databases/DatabaseWithDictionaries.cpp b/src/Databases/DatabaseWithDictionaries.cpp
deleted file mode 100644
index 55b04f27c58..00000000000
--- a/src/Databases/DatabaseWithDictionaries.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-#include <Databases/DatabaseWithDictionaries.h>
-#include <Common/StatusInfo.h>
-#include <Common/ExternalLoaderStatus.h>
-#include <Interpreters/ExternalDictionariesLoader.h>
-#include <Interpreters/ExternalLoaderTempConfigRepository.h>
-#include <Interpreters/ExternalLoaderDatabaseConfigRepository.h>
-#include <Interpreters/DDLTask.h>
-#include <Dictionaries/getDictionaryConfigurationFromAST.h>
-#include <Dictionaries/DictionaryStructure.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Interpreters/Context.h>
-#include <Storages/StorageDictionary.h>
-#include <IO/WriteBufferFromFile.h>
-#include <Poco/File.h>
-#include <boost/smart_ptr/make_shared_object.hpp>
-
-
-namespace CurrentStatusInfo
-{
-    extern const Status DictionaryStatus;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_GET_CREATE_DICTIONARY_QUERY;
-    extern const int TABLE_ALREADY_EXISTS;
-    extern const int UNKNOWN_DICTIONARY;
-    extern const int DICTIONARY_ALREADY_EXISTS;
-    extern const int FILE_DOESNT_EXIST;
-}
-
-
-void DatabaseWithDictionaries::attachDictionary(const String & dictionary_name, const DictionaryAttachInfo & attach_info)
-{
-    auto dict_id = StorageID(attach_info.create_query);
-    String internal_name = dict_id.getInternalDictionaryName();
-    assert(attach_info.create_query->as<const ASTCreateQuery &>().table == dictionary_name);
-    assert(!dict_id.database_name.empty());
-    {
-        std::unique_lock lock(mutex);
-        auto [it, inserted] = dictionaries.emplace(dictionary_name, attach_info);
-        if (!inserted)
-            throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS,
-                            "Dictionary {} already exists.", dict_id.getNameForLogs());
-
-        /// Attach the dictionary as table too.
-        try
-        {
-            /// TODO Make StorageDictionary an owner of IDictionary objects.
-            /// All DDL operations with dictionaries will work with StorageDictionary table,
-            /// and StorageDictionary will be responsible for loading of DDL dictionaries.
-            /// ExternalLoaderDatabaseConfigRepository and other hacks related to ExternalLoader
-            /// will not be longer required.
-            attachTableUnlocked(
-                dictionary_name,
-                StorageDictionary::create(
-                    dict_id,
-                    internal_name,
-                    ExternalDictionariesLoader::getDictionaryStructure(*attach_info.config),
-                    StorageDictionary::Location::SameDatabaseAndNameAsDictionary),
-                lock);
-        }
-        catch (...)
-        {
-            dictionaries.erase(it);
-            throw;
-        }
-    }
-
-    CurrentStatusInfo::set(CurrentStatusInfo::DictionaryStatus, internal_name, static_cast<Int8>(ExternalLoaderStatus::NOT_LOADED));
-
-    /// We want ExternalLoader::reloadConfig() to find out that the dictionary's config
-    /// has been added and in case `dictionaries_lazy_load == false` to load the dictionary.
-    reloadDictionaryConfig(internal_name);
-}
-
-void DatabaseWithDictionaries::detachDictionary(const String & dictionary_name)
-{
-    DictionaryAttachInfo attach_info;
-    detachDictionaryImpl(dictionary_name, attach_info);
-}
-
-void DatabaseWithDictionaries::detachDictionaryImpl(const String & dictionary_name, DictionaryAttachInfo & attach_info)
-{
-    auto dict_id = StorageID::createEmpty();
-    String internal_name;
-
-    {
-        std::unique_lock lock(mutex);
-        auto it = dictionaries.find(dictionary_name);
-        if (it == dictionaries.end())
-            throw Exception(ErrorCodes::UNKNOWN_DICTIONARY,
-                            "Dictionary {}.{} doesn't exist.", database_name, dictionary_name);
-        dict_id = StorageID(it->second.create_query);
-        internal_name = dict_id.getInternalDictionaryName();
-        assert(dict_id.table_name == dictionary_name);
-        assert(!dict_id.database_name.empty());
-
-        attach_info = std::move(it->second);
-        dictionaries.erase(it);
-
-        /// Detach the dictionary as table too.
-        try
-        {
-            if (!dict_id.hasUUID())
-                detachTableUnlocked(dictionary_name, lock);
-        }
-        catch (...)
-        {
-            dictionaries.emplace(dictionary_name, std::move(attach_info));
-            throw;
-        }
-    }
-
-    CurrentStatusInfo::unset(CurrentStatusInfo::DictionaryStatus, internal_name);
-
-    /// We want ExternalLoader::reloadConfig() to find out that the dictionary's config
-    /// has been removed and to unload the dictionary.
-    reloadDictionaryConfig(internal_name);
-
-    if (dict_id.hasUUID())
-        detachTable(dictionary_name);
-}
-
-void DatabaseWithDictionaries::createDictionary(const Context & context, const String & dictionary_name, const ASTPtr & query)
-{
-    const auto & settings = context.getSettingsRef();
-
-    /** The code is based on the assumption that all threads share the same order of operations:
-      * - create the .sql.tmp file;
-      * - add the dictionary to ExternalDictionariesLoader;
-      * - load the dictionary in case dictionaries_lazy_load == false;
-      * - attach the dictionary;
-      * - rename .sql.tmp to .sql.
-      */
-
-    auto dict_id = StorageID(query);
-    assert(query->as<const ASTCreateQuery &>().table == dictionary_name);
-    assert(!dict_id.database_name.empty());
-
-    /// A race condition would be possible if a dictionary with the same name is simultaneously created using CREATE and using ATTACH.
-    /// But there is protection from it - see using DDLGuard in InterpreterCreateQuery.
-    if (isDictionaryExist(dictionary_name))
-        throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS, "Dictionary {} already exists.", dict_id.getFullTableName());
-
-    /// A dictionary with the same full name could be defined in *.xml config files.
-    if (external_loader.getCurrentStatus(dict_id.getFullNameNotQuoted()) != ExternalLoader::Status::NOT_EXIST)
-        throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS,
-                        "Dictionary {} already exists.", dict_id.getFullNameNotQuoted());
-
-    if (isTableExist(dictionary_name, global_context))
-        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Table {} already exists.", dict_id.getFullTableName());
-
-    String dictionary_metadata_path = getObjectMetadataPath(dictionary_name);
-    String dictionary_metadata_tmp_path = dictionary_metadata_path + ".tmp";
-    String statement = getObjectDefinitionFromCreateQuery(query);
-
-    {
-        /// Exclusive flags guarantees, that table is not created right now in another thread. Otherwise, exception will be thrown.
-        WriteBufferFromFile out(dictionary_metadata_tmp_path, statement.size(), O_WRONLY | O_CREAT | O_EXCL);
-        writeString(statement, out);
-        out.next();
-        if (settings.fsync_metadata)
-            out.sync();
-        out.close();
-    }
-
-    bool succeeded = false;
-    SCOPE_EXIT({
-        if (!succeeded)
-            Poco::File(dictionary_metadata_tmp_path).remove();
-    });
-
-    /// Add a temporary repository containing the dictionary.
-    /// We need this temp repository to try loading the dictionary before actually attaching it to the database.
-    auto temp_repository = external_loader.addConfigRepository(std::make_unique<ExternalLoaderTempConfigRepository>(
-        getDatabaseName(), dictionary_metadata_tmp_path, getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), context)));
-
-    bool lazy_load = context.getConfigRef().getBool("dictionaries_lazy_load", true);
-    if (!lazy_load)
-    {
-        /// load() is called here to force loading the dictionary, wait until the loading is finished,
-        /// and throw an exception if the loading is failed.
-        external_loader.load(dict_id.getInternalDictionaryName());
-    }
-
-    auto config = getDictionaryConfigurationFromAST(query->as<const ASTCreateQuery &>(), context);
-    attachDictionary(dictionary_name, DictionaryAttachInfo{query, config, time(nullptr)});
-    SCOPE_EXIT({
-        if (!succeeded)
-            detachDictionary(dictionary_name);
-    });
-
-    auto txn = context.getZooKeeperMetadataTransaction();
-    if (txn && !context.isInternalSubquery())
-        txn->commit();      /// Commit point (a sort of) for Replicated database
-
-    /// If it was ATTACH query and file with dictionary metadata already exist
-    /// (so, ATTACH is done after DETACH), then rename atomically replaces old file with new one.
-    Poco::File(dictionary_metadata_tmp_path).renameTo(dictionary_metadata_path);
-
-    /// ExternalDictionariesLoader doesn't know we renamed the metadata path.
-    /// That's why we have to call ExternalLoader::reloadConfig() here.
-    reloadDictionaryConfig(dict_id.getInternalDictionaryName());
-
-    /// Everything's ok.
-    succeeded = true;
-}
-
-void DatabaseWithDictionaries::removeDictionary(const Context & context, const String & dictionary_name)
-{
-    DictionaryAttachInfo attach_info;
-    detachDictionaryImpl(dictionary_name, attach_info);
-
-    try
-    {
-        String dictionary_metadata_path = getObjectMetadataPath(dictionary_name);
-
-        auto txn = context.getZooKeeperMetadataTransaction();
-        if (txn && !context.isInternalSubquery())
-            txn->commit();      /// Commit point (a sort of) for Replicated database
-
-        Poco::File(dictionary_metadata_path).remove();
-        CurrentStatusInfo::unset(CurrentStatusInfo::DictionaryStatus,
-                                 StorageID(attach_info.create_query).getInternalDictionaryName());
-    }
-    catch (...)
-    {
-        /// If remove was not possible for some reason
-        attachDictionary(dictionary_name, attach_info);
-        throw;
-    }
-
-    UUID dict_uuid = attach_info.create_query->as<ASTCreateQuery>()->uuid;
-    if (dict_uuid != UUIDHelpers::Nil)
-        DatabaseCatalog::instance().removeUUIDMappingFinally(dict_uuid);
-}
-
-DatabaseDictionariesIteratorPtr DatabaseWithDictionaries::getDictionariesIterator(const FilterByNameFunction & filter_by_dictionary_name)
-{
-    std::lock_guard lock(mutex);
-    DictionariesWithID filtered_dictionaries;
-    for (const auto & dictionary : dictionaries)
-    {
-        if (filter_by_dictionary_name && !filter_by_dictionary_name(dictionary.first))
-            continue;
-        filtered_dictionaries.emplace_back();
-        filtered_dictionaries.back().first = dictionary.first;
-        filtered_dictionaries.back().second = dictionary.second.create_query->as<const ASTCreateQuery &>().uuid;
-    }
-    return std::make_unique<DatabaseDictionariesSnapshotIterator>(std::move(filtered_dictionaries), database_name);
-}
-
-bool DatabaseWithDictionaries::isDictionaryExist(const String & dictionary_name) const
-{
-    std::lock_guard lock(mutex);
-    return dictionaries.find(dictionary_name) != dictionaries.end();
-}
-
-ASTPtr DatabaseWithDictionaries::getCreateDictionaryQueryImpl(
-        const String & dictionary_name,
-        bool throw_on_error) const
-{
-    {
-        /// Try to get create query ifg for an attached dictionary.
-        std::lock_guard lock{mutex};
-        auto it = dictionaries.find(dictionary_name);
-        if (it != dictionaries.end())
-        {
-            ASTPtr ast = it->second.create_query->clone();
-            auto & create_query = ast->as<ASTCreateQuery &>();
-            create_query.attach = false;
-            create_query.database = database_name;
-            return ast;
-        }
-    }
-
-    /// Try to get create query for non-attached dictionary.
-    ASTPtr ast;
-    try
-    {
-        auto dictionary_metadata_path = getObjectMetadataPath(dictionary_name);
-        ast = getCreateQueryFromMetadata(dictionary_metadata_path, throw_on_error);
-    }
-    catch (const Exception & e)
-    {
-        if (throw_on_error && (e.code() != ErrorCodes::FILE_DOESNT_EXIST))
-            throw;
-    }
-
-    if (ast)
-    {
-        const auto * create_query = ast->as<const ASTCreateQuery>();
-        if (create_query && create_query->is_dictionary)
-            return ast;
-    }
-    if (throw_on_error)
-        throw Exception{"Dictionary " + backQuote(dictionary_name) + " doesn't exist",
-                        ErrorCodes::CANNOT_GET_CREATE_DICTIONARY_QUERY};
-    return nullptr;
-}
-
-Poco::AutoPtr<Poco::Util::AbstractConfiguration> DatabaseWithDictionaries::getDictionaryConfiguration(const String & dictionary_name) const
-{
-    std::lock_guard lock(mutex);
-    auto it = dictionaries.find(dictionary_name);
-    if (it != dictionaries.end())
-        return it->second.config;
-    throw Exception("Dictionary " + backQuote(dictionary_name) + " doesn't exist", ErrorCodes::UNKNOWN_DICTIONARY);
-}
-
-time_t DatabaseWithDictionaries::getObjectMetadataModificationTime(const String & object_name) const
-{
-    {
-        std::lock_guard lock(mutex);
-        auto it = dictionaries.find(object_name);
-        if (it != dictionaries.end())
-            return it->second.modification_time;
-    }
-    return DatabaseOnDisk::getObjectMetadataModificationTime(object_name);
-}
-
-
-bool DatabaseWithDictionaries::empty() const
-{
-    std::lock_guard lock{mutex};
-    return tables.empty() && dictionaries.empty();
-}
-
-void DatabaseWithDictionaries::reloadDictionaryConfig(const String & full_name)
-{
-    /// Ensure that this database is attached to ExternalLoader as a config repository.
-    if (!database_as_config_repo_for_external_loader.load())
-    {
-        auto repository = std::make_unique<ExternalLoaderDatabaseConfigRepository>(*this, global_context);
-        auto remove_repository_callback = external_loader.addConfigRepository(std::move(repository));
-        database_as_config_repo_for_external_loader = boost::make_shared<ext::scope_guard>(std::move(remove_repository_callback));
-    }
-
-    external_loader.reloadConfig(getDatabaseName(), full_name);
-}
-
-
-void DatabaseWithDictionaries::shutdown()
-{
-    {
-        std::lock_guard lock(mutex);
-        dictionaries.clear();
-    }
-
-    /// Invoke removing the database from ExternalLoader.
-    database_as_config_repo_for_external_loader = nullptr;
-
-    DatabaseOnDisk::shutdown();
-}
-
-
-DatabaseWithDictionaries::DatabaseWithDictionaries(
-    const String & name, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context)
-    : DatabaseOnDisk(name, metadata_path_, data_path_, logger, context)
-    , external_loader(context.getExternalDictionariesLoader())
-{
-}
-
-DatabaseWithDictionaries::~DatabaseWithDictionaries() = default;
-
-}
diff --git a/src/Databases/DatabaseWithDictionaries.h b/src/Databases/DatabaseWithDictionaries.h
deleted file mode 100644
index d69289d7456..00000000000
--- a/src/Databases/DatabaseWithDictionaries.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#pragma once
-#include <Databases/DatabaseOnDisk.h>
-#include <boost/smart_ptr/atomic_shared_ptr.hpp>
-#include <ext/scope_guard.h>
-
-namespace DB
-{
-
-class Context;
-class ExternalDictionariesLoader;
-
-
-class DatabaseWithDictionaries : public DatabaseOnDisk
-{
-public:
-    void attachDictionary(const String & dictionary_name, const DictionaryAttachInfo & attach_info) override;
-
-    void detachDictionary(const String & dictionary_name) override;
-
-    void createDictionary(const Context & context,
-                          const String & dictionary_name,
-                          const ASTPtr & query) override;
-
-    void removeDictionary(const Context & context, const String & dictionary_name) override;
-
-    bool isDictionaryExist(const String & dictionary_name) const override;
-
-    DatabaseDictionariesIteratorPtr getDictionariesIterator(const FilterByNameFunction & filter_by_dictionary_name) override;
-
-    Poco::AutoPtr<Poco::Util::AbstractConfiguration> getDictionaryConfiguration(const String & /*name*/) const override;
-
-    time_t getObjectMetadataModificationTime(const String & object_name) const override;
-
-    bool empty() const override;
-
-    void shutdown() override;
-
-    ~DatabaseWithDictionaries() override;
-
-protected:
-    DatabaseWithDictionaries(const String & name, const String & metadata_path_, const String & data_path_, const String & logger, const Context & context);
-
-    ASTPtr getCreateDictionaryQueryImpl(const String & dictionary_name, bool throw_on_error) const override;
-
-    std::unordered_map<String, DictionaryAttachInfo> dictionaries;
-    const ExternalDictionariesLoader & external_loader;
-
-private:
-    void detachDictionaryImpl(const String & dictionary_name, DictionaryAttachInfo & attach_info);
-    void reloadDictionaryConfig(const String & full_name);
-
-    boost::atomic_shared_ptr<ext::scope_guard> database_as_config_repo_for_external_loader;
-};
-
-}
diff --git a/src/Databases/DatabasesCommon.cpp b/src/Databases/DatabasesCommon.cpp
index 2d3d206162b..9d79a0dfe96 100644
--- a/src/Databases/DatabasesCommon.cpp
+++ b/src/Databases/DatabasesCommon.cpp
@@ -20,18 +20,18 @@ namespace ErrorCodes
     extern const int UNKNOWN_DATABASE;
 }
 
-DatabaseWithOwnTablesBase::DatabaseWithOwnTablesBase(const String & name_, const String & logger, const Context & context)
-        : IDatabase(name_), log(&Poco::Logger::get(logger)), global_context(context.getGlobalContext())
+DatabaseWithOwnTablesBase::DatabaseWithOwnTablesBase(const String & name_, const String & logger, ContextPtr context_)
+        : IDatabase(name_), WithContext(context_->getGlobalContext()), log(&Poco::Logger::get(logger))
 {
 }
 
-bool DatabaseWithOwnTablesBase::isTableExist(const String & table_name, const Context &) const
+bool DatabaseWithOwnTablesBase::isTableExist(const String & table_name, ContextPtr) const
 {
     std::lock_guard lock(mutex);
     return tables.find(table_name) != tables.end();
 }
 
-StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, const Context &) const
+StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, ContextPtr) const
 {
     std::lock_guard lock(mutex);
     auto it = tables.find(table_name);
@@ -40,7 +40,7 @@ StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, con
     return {};
 }
 
-DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(const Context &, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
 {
     std::lock_guard lock(mutex);
     if (!filter_by_table_name)
@@ -125,10 +125,15 @@ void DatabaseWithOwnTablesBase::shutdown()
         tables_snapshot = tables;
     }
 
+    for (const auto & kv : tables_snapshot)
+    {
+        kv.second->flush();
+    }
+
     for (const auto & kv : tables_snapshot)
     {
         auto table_id = kv.second->getStorageID();
-        kv.second->shutdown();
+        kv.second->flushAndShutdown();
         if (table_id.hasUUID())
         {
             assert(getDatabaseName() == DatabaseCatalog::TEMPORARY_DATABASE || getUUID() != UUIDHelpers::Nil);
diff --git a/src/Databases/DatabasesCommon.h b/src/Databases/DatabasesCommon.h
index 5e1e555a524..da1bd6c1852 100644
--- a/src/Databases/DatabasesCommon.h
+++ b/src/Databases/DatabasesCommon.h
@@ -16,12 +16,12 @@ namespace DB
 class Context;
 
 /// A base class for databases that manage their own list of tables.
-class DatabaseWithOwnTablesBase : public IDatabase
+class DatabaseWithOwnTablesBase : public IDatabase, protected WithContext
 {
 public:
-    bool isTableExist(const String & table_name, const Context & context) const override;
+    bool isTableExist(const String & table_name, ContextPtr context) const override;
 
-    StoragePtr tryGetTable(const String & table_name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & table_name, ContextPtr context) const override;
 
     bool empty() const override;
 
@@ -29,7 +29,7 @@ public:
 
     StoragePtr detachTable(const String & table_name) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     void shutdown() override;
 
@@ -38,9 +38,8 @@ public:
 protected:
     Tables tables;
     Poco::Logger * log;
-    const Context & global_context;
 
-    DatabaseWithOwnTablesBase(const String & name_, const String & logger, const Context & context);
+    DatabaseWithOwnTablesBase(const String & name_, const String & logger, ContextPtr context);
 
     void attachTableUnlocked(const String & table_name, const StoragePtr & table, std::unique_lock<std::mutex> & lock);
     StoragePtr detachTableUnlocked(const String & table_name, std::unique_lock<std::mutex> & lock);
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 3a196f827b7..ba5fa974d5c 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -3,25 +3,26 @@
 #include <common/types.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include <Storages/StorageInMemoryMetadata.h>
-#include <Dictionaries/IDictionary.h>
-#include <Databases/DictionaryAttachInfo.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/Exception.h>
+#include <Core/UUID.h>
 
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm/copy.hpp>
 #include <ctime>
 #include <functional>
 #include <memory>
+#include <mutex>
+#include <vector>
+#include <map>
 
 
 namespace DB
 {
 
-class Context;
 struct Settings;
 struct ConstraintsDescription;
 struct IndicesDescription;
+struct StorageInMemoryMetadata;
+struct StorageID;
 class ASTCreateQuery;
 using DictionariesWithID = std::vector<std::pair<String, UUID>>;
 
@@ -29,7 +30,6 @@ namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_GET_CREATE_TABLE_QUERY;
-    extern const int CANNOT_GET_CREATE_DICTIONARY_QUERY;
 }
 
 class IDatabaseTablesIterator
@@ -95,38 +95,7 @@ public:
     const StoragePtr & table() const override { return it->second; }
 };
 
-/// Copies list of dictionaries and iterates through such snapshot.
-class DatabaseDictionariesSnapshotIterator
-{
-private:
-    DictionariesWithID dictionaries;
-    DictionariesWithID::iterator it;
-    String database_name;
-
-public:
-    DatabaseDictionariesSnapshotIterator() = default;
-    DatabaseDictionariesSnapshotIterator(DictionariesWithID & dictionaries_, const String & database_name_)
-    : dictionaries(dictionaries_), it(dictionaries.begin()), database_name(database_name_)
-    {
-    }
-    DatabaseDictionariesSnapshotIterator(DictionariesWithID && dictionaries_, const String & database_name_)
-    : dictionaries(dictionaries_), it(dictionaries.begin()), database_name(database_name_)
-    {
-    }
-
-    void next() { ++it; }
-
-    bool isValid() const { return !dictionaries.empty() && it != dictionaries.end(); }
-
-    const String & name() const { return it->first; }
-
-    const UUID & uuid() const { return it->second; }
-
-    const String & databaseName() const { assert(!database_name.empty()); return database_name; }
-};
-
 using DatabaseTablesIteratorPtr = std::unique_ptr<IDatabaseTablesIterator>;
-using DatabaseDictionariesIteratorPtr = std::unique_ptr<DatabaseDictionariesSnapshotIterator>;
 
 
 /** Database engine.
@@ -153,19 +122,13 @@ public:
 
     /// Load a set of existing tables.
     /// You can call only once, right after the object is created.
-    virtual void loadStoredObjects(Context & /*context*/, bool /*has_force_restore_data_flag*/, bool /*force_attach*/ = false) {}
+    virtual void loadStoredObjects(ContextMutablePtr /*context*/, bool /*has_force_restore_data_flag*/, bool /*force_attach*/ = false) {}
 
     /// Check the existence of the table.
-    virtual bool isTableExist(const String & name, const Context & context) const = 0;
-
-    /// Check the existence of the dictionary
-    virtual bool isDictionaryExist(const String & /*name*/) const
-    {
-        return false;
-    }
+    virtual bool isTableExist(const String & name, ContextPtr context) const = 0;
 
     /// Get the table for work. Return nullptr if there is no table.
-    virtual StoragePtr tryGetTable(const String & name, const Context & context) const = 0;
+    virtual StoragePtr tryGetTable(const String & name, ContextPtr context) const = 0;
 
     virtual UUID tryGetTableUUID(const String & /*table_name*/) const { return UUIDHelpers::Nil; }
 
@@ -173,20 +136,14 @@ 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(const Context & context, const FilterByNameFunction & filter_by_table_name = {}) = 0;
-
-    /// Get an iterator to pass through all the dictionaries.
-    virtual DatabaseDictionariesIteratorPtr getDictionariesIterator([[maybe_unused]] const FilterByNameFunction & filter_by_dictionary_name = {})
-    {
-        return std::make_unique<DatabaseDictionariesSnapshotIterator>();
-    }
+    virtual DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}) = 0;
 
     /// Is the database empty.
     virtual bool empty() const = 0;
 
     /// Add the table to the database. Record its presence in the metadata.
     virtual void createTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*name*/,
         const StoragePtr & /*table*/,
         const ASTPtr & /*query*/)
@@ -194,32 +151,15 @@ public:
         throw Exception("There is no CREATE TABLE query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    /// Add the dictionary to the database. Record its presence in the metadata.
-    virtual void createDictionary(
-        const Context & /*context*/,
-        const String & /*dictionary_name*/,
-        const ASTPtr & /*query*/)
-    {
-        throw Exception("There is no CREATE DICTIONARY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
     /// Delete the table from the database, drop table and delete the metadata.
     virtual void dropTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*name*/,
         [[maybe_unused]] bool no_delay = false)
     {
         throw Exception("There is no DROP TABLE query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    /// Delete the dictionary from the database. Delete the metadata.
-    virtual void removeDictionary(
-        const Context & /*context*/,
-        const String & /*dictionary_name*/)
-    {
-        throw Exception("There is no DROP DICTIONARY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
     /// Add a table to the database, but do not add it to the metadata. The database may not support this method.
     ///
     /// Note: ATTACH TABLE statement actually uses createTable method.
@@ -228,35 +168,22 @@ public:
         throw Exception("There is no ATTACH TABLE query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    /// Add dictionary to the database, but do not add it to the metadata. The database may not support this method.
-    /// If dictionaries_lazy_load is false it also starts loading the dictionary asynchronously.
-    virtual void attachDictionary(const String & /* dictionary_name */, const DictionaryAttachInfo & /* attach_info */)
-    {
-        throw Exception("There is no ATTACH DICTIONARY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
     /// Forget about the table without deleting it, and return it. The database may not support this method.
     virtual StoragePtr detachTable(const String & /*name*/)
     {
         throw Exception("There is no DETACH TABLE query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    /// Forget about the dictionary without deleting it. The database may not support this method.
-    virtual void detachDictionary(const String & /*name*/)
-    {
-        throw Exception("There is no DETACH DICTIONARY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
     /// Forget about the table without deleting it's data, but rename metadata file to prevent reloading it
     /// with next restart. The database may not support this method.
-    virtual void detachTablePermanently(const Context & /*context*/, const String & /*name*/)
+    virtual void detachTablePermanently(ContextPtr /*context*/, const String & /*name*/)
     {
         throw Exception("There is no DETACH TABLE PERMANENTLY query for Database" + getEngineName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
     /// Rename the table and possibly move the table to another database.
     virtual void renameTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const String & /*name*/,
         IDatabase & /*to_database*/,
         const String & /*to_name*/,
@@ -271,7 +198,7 @@ public:
     /// Change the table structure in metadata.
     /// You must call under the alter_lock of the corresponding table . If engine_modifier is empty, then engine does not change.
     virtual void alterTable(
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         const StorageID & /*table_id*/,
         const StorageInMemoryMetadata & /*metadata*/)
     {
@@ -285,32 +212,16 @@ public:
     }
 
     /// Get the CREATE TABLE query for the table. It can also provide information for detached tables for which there is metadata.
-    ASTPtr tryGetCreateTableQuery(const String & name, const Context & context) const noexcept
+    ASTPtr tryGetCreateTableQuery(const String & name, ContextPtr context) const noexcept
     {
         return getCreateTableQueryImpl(name, context, false);
     }
 
-    ASTPtr getCreateTableQuery(const String & name, const Context & context) const
+    ASTPtr getCreateTableQuery(const String & name, ContextPtr context) const
     {
         return getCreateTableQueryImpl(name, context, true);
     }
 
-    /// Get the CREATE DICTIONARY query for the dictionary. Returns nullptr if dictionary doesn't exists.
-    ASTPtr tryGetCreateDictionaryQuery(const String & name) const noexcept
-    {
-        return getCreateDictionaryQueryImpl(name, false);
-    }
-
-    ASTPtr getCreateDictionaryQuery(const String & name) const
-    {
-        return getCreateDictionaryQueryImpl(name, true);
-    }
-
-    virtual Poco::AutoPtr<Poco::Util::AbstractConfiguration> getDictionaryConfiguration(const String & /*name*/) const
-    {
-        throw Exception(getEngineName() + ": getDictionaryConfiguration() is not supported", ErrorCodes::NOT_IMPLEMENTED);
-    }
-
     /// Get the CREATE DATABASE query for current database.
     virtual ASTPtr getCreateDatabaseQuery() const = 0;
 
@@ -345,31 +256,25 @@ public:
 
     virtual void assertCanBeDetached(bool /*cleanup*/) {}
 
-    virtual void waitDetachedTableNotInUse(const UUID & /*uuid*/) { assert(false); }
+    virtual void waitDetachedTableNotInUse(const UUID & /*uuid*/) { }
+    virtual void checkDetachedTableNotInUse(const UUID & /*uuid*/) { }
 
     /// Ask all tables to complete the background threads they are using and delete all table objects.
     virtual void shutdown() = 0;
 
     /// Delete data and metadata stored inside the database, if exists.
-    virtual void drop(const Context & /*context*/) {}
+    virtual void drop(ContextPtr /*context*/) {}
 
-    virtual ~IDatabase() {}
+    virtual ~IDatabase() = default;
 
 protected:
-    virtual ASTPtr getCreateTableQueryImpl(const String & /*name*/, const Context & /*context*/, bool throw_on_error) const
+    virtual ASTPtr getCreateTableQueryImpl(const String & /*name*/, ContextPtr /*context*/, bool throw_on_error) const
     {
         if (throw_on_error)
             throw Exception("There is no SHOW CREATE TABLE query for Database" + getEngineName(), ErrorCodes::CANNOT_GET_CREATE_TABLE_QUERY);
         return nullptr;
     }
 
-    virtual ASTPtr getCreateDictionaryQueryImpl(const String & /*name*/, bool throw_on_error) const
-    {
-        if (throw_on_error)
-            throw Exception("There is no SHOW CREATE DICTIONARY query for Database" + getEngineName(), ErrorCodes::CANNOT_GET_CREATE_DICTIONARY_QUERY);
-        return nullptr;
-    }
-
     mutable std::mutex mutex;
     String database_name;
 };
diff --git a/src/Databases/MySQL/ConnectionMySQLSettings.cpp b/src/Databases/MySQL/ConnectionMySQLSettings.cpp
index fa92e793225..1026d14018b 100644
--- a/src/Databases/MySQL/ConnectionMySQLSettings.cpp
+++ b/src/Databases/MySQL/ConnectionMySQLSettings.cpp
@@ -50,12 +50,12 @@ void ConnectionMySQLSettings::loadFromQuery(ASTStorage & storage_def)
 #undef ADD_IF_ABSENT
 }
 
-void ConnectionMySQLSettings::loadFromQueryContext(const Context & context)
+void ConnectionMySQLSettings::loadFromQueryContext(ContextPtr context)
 {
-    if (!context.hasQueryContext())
+    if (!context->hasQueryContext())
         return;
 
-    const Settings & settings = context.getQueryContext().getSettingsRef();
+    const Settings & settings = context->getQueryContext()->getSettingsRef();
 
     if (settings.mysql_datatypes_support_level.value != mysql_datatypes_support_level.value)
         set("mysql_datatypes_support_level", settings.mysql_datatypes_support_level.toString());
diff --git a/src/Databases/MySQL/ConnectionMySQLSettings.h b/src/Databases/MySQL/ConnectionMySQLSettings.h
index ce2773307c5..f05985a0cda 100644
--- a/src/Databases/MySQL/ConnectionMySQLSettings.h
+++ b/src/Databases/MySQL/ConnectionMySQLSettings.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <Core/Defines.h>
 #include <Core/BaseSettings.h>
+#include <Core/Defines.h>
 #include <Core/SettingsEnums.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
-class Context;
 class ASTStorage;
 
 #define LIST_OF_CONNECTION_MYSQL_SETTINGS(M) \
@@ -27,7 +27,7 @@ struct ConnectionMySQLSettings : public BaseSettings<ConnectionMySQLSettingsTrai
 {
     void loadFromQuery(ASTStorage & storage_def);
 
-    void loadFromQueryContext(const Context & context);
+    void loadFromQueryContext(ContextPtr context);
 };
 
 }
diff --git a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp b/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
index eeea12ae8f3..866b03e3bd6 100644
--- a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseConnectionMySQL.cpp
@@ -20,13 +20,14 @@
 #    include <Parsers/parseQuery.h>
 #    include <Parsers/queryToString.h>
 #    include <Storages/StorageMySQL.h>
+#    include <Storages/MySQL/MySQLSettings.h>
 #    include <Common/escapeForFileName.h>
 #    include <Common/parseAddress.h>
 #    include <Common/setThreadName.h>
+#    include <filesystem>
+#    include <Common/filesystemHelpers.h>
 
-#    include <Poco/DirectoryIterator.h>
-#    include <Poco/File.h>
-
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -45,10 +46,16 @@ constexpr static const auto suffix = ".remove_flag";
 static constexpr const std::chrono::seconds cleaner_sleep_time{30};
 static const std::chrono::seconds lock_acquire_timeout{10};
 
-DatabaseConnectionMySQL::DatabaseConnectionMySQL(const Context & context, const String & database_name_, const String & metadata_path_,
-    const ASTStorage * database_engine_define_, const String & database_name_in_mysql_, std::unique_ptr<ConnectionMySQLSettings> settings_, mysqlxx::Pool && pool)
+DatabaseConnectionMySQL::DatabaseConnectionMySQL(
+    ContextPtr context_,
+    const String & database_name_,
+    const String & metadata_path_,
+    const ASTStorage * database_engine_define_,
+    const String & database_name_in_mysql_,
+    std::unique_ptr<ConnectionMySQLSettings> settings_,
+    mysqlxx::PoolWithFailover && pool)
     : IDatabase(database_name_)
-    , global_context(context.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
     , metadata_path(metadata_path_)
     , database_engine_define(database_engine_define_->clone())
     , database_name_in_mysql(database_name_in_mysql_)
@@ -63,7 +70,7 @@ bool DatabaseConnectionMySQL::empty() const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(global_context);
+    fetchTablesIntoLocalCache(getContext());
 
     if (local_tables_cache.empty())
         return true;
@@ -75,12 +82,12 @@ bool DatabaseConnectionMySQL::empty() const
     return true;
 }
 
-DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name)
 {
     Tables tables;
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(context);
+    fetchTablesIntoLocalCache(local_context);
 
     for (const auto & [table_name, modify_time_and_storage] : local_tables_cache)
         if (!remove_or_detach_tables.count(table_name) && (!filter_by_table_name || filter_by_table_name(table_name)))
@@ -89,16 +96,16 @@ DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(const Conte
     return std::make_unique<DatabaseTablesSnapshotIterator>(tables, database_name);
 }
 
-bool DatabaseConnectionMySQL::isTableExist(const String & name, const Context & context) const
+bool DatabaseConnectionMySQL::isTableExist(const String & name, ContextPtr local_context) const
 {
-    return bool(tryGetTable(name, context));
+    return bool(tryGetTable(name, local_context));
 }
 
-StoragePtr DatabaseConnectionMySQL::tryGetTable(const String & mysql_table_name, const Context & context) const
+StoragePtr DatabaseConnectionMySQL::tryGetTable(const String & mysql_table_name, ContextPtr local_context) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(context);
+    fetchTablesIntoLocalCache(local_context);
 
     if (!remove_or_detach_tables.count(mysql_table_name) && local_tables_cache.find(mysql_table_name) != local_tables_cache.end())
         return local_tables_cache[mysql_table_name].second;
@@ -153,11 +160,11 @@ static ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr
     return create_table_query;
 }
 
-ASTPtr DatabaseConnectionMySQL::getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const
+ASTPtr DatabaseConnectionMySQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(context);
+    fetchTablesIntoLocalCache(local_context);
 
     if (local_tables_cache.find(table_name) == local_tables_cache.end())
     {
@@ -174,7 +181,7 @@ time_t DatabaseConnectionMySQL::getObjectMetadataModificationTime(const String &
 {
     std::lock_guard<std::mutex> lock(mutex);
 
-    fetchTablesIntoLocalCache(global_context);
+    fetchTablesIntoLocalCache(getContext());
 
     if (local_tables_cache.find(table_name) == local_tables_cache.end())
         throw Exception("MySQL table " + database_name_in_mysql + "." + table_name + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
@@ -190,12 +197,12 @@ ASTPtr DatabaseConnectionMySQL::getCreateDatabaseQuery() const
     return create_query;
 }
 
-void DatabaseConnectionMySQL::fetchTablesIntoLocalCache(const Context & context) const
+void DatabaseConnectionMySQL::fetchTablesIntoLocalCache(ContextPtr local_context) const
 {
-    const auto & tables_with_modification_time = fetchTablesWithModificationTime();
+    const auto & tables_with_modification_time = fetchTablesWithModificationTime(local_context);
 
     destroyLocalCacheExtraTables(tables_with_modification_time);
-    fetchLatestTablesStructureIntoCache(tables_with_modification_time, context);
+    fetchLatestTablesStructureIntoCache(tables_with_modification_time, local_context);
 }
 
 void DatabaseConnectionMySQL::destroyLocalCacheExtraTables(const std::map<String, UInt64> & tables_with_modification_time) const
@@ -212,7 +219,8 @@ void DatabaseConnectionMySQL::destroyLocalCacheExtraTables(const std::map<String
     }
 }
 
-void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(const std::map<String, UInt64> &tables_modification_time, const Context & context) const
+void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(
+    const std::map<String, UInt64> & tables_modification_time, ContextPtr local_context) const
 {
     std::vector<String> wait_update_tables_name;
     for (const auto & table_modification_time : tables_modification_time)
@@ -224,7 +232,7 @@ void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(const std::map
             wait_update_tables_name.emplace_back(table_modification_time.first);
     }
 
-    std::map<String, NamesAndTypesList> tables_and_columns = fetchTablesColumnsList(wait_update_tables_name, context);
+    std::map<String, NamesAndTypesList> tables_and_columns = fetchTablesColumnsList(wait_update_tables_name, local_context);
 
     for (const auto & table_and_columns : tables_and_columns)
     {
@@ -239,13 +247,24 @@ void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache(const std::map
             local_tables_cache.erase(iterator);
         }
 
-        local_tables_cache[table_name] = std::make_pair(table_modification_time, StorageMySQL::create(
-            StorageID(database_name, table_name), std::move(mysql_pool), database_name_in_mysql, table_name,
-            false, "", ColumnsDescription{columns_name_and_type}, ConstraintsDescription{}, global_context));
+        local_tables_cache[table_name] = std::make_pair(
+            table_modification_time,
+            StorageMySQL::create(
+                StorageID(database_name, table_name),
+                std::move(mysql_pool),
+                database_name_in_mysql,
+                table_name,
+                /* replace_query_ */ false,
+                /* on_duplicate_clause = */ "",
+                ColumnsDescription{columns_name_and_type},
+                ConstraintsDescription{},
+                String{},
+                getContext(),
+                MySQLSettings{}));
     }
 }
 
-std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTime() const
+std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTime(ContextPtr local_context) const
 {
     Block tables_status_sample_block
     {
@@ -261,7 +280,8 @@ std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTim
              " WHERE TABLE_SCHEMA = " << quote << database_name_in_mysql;
 
     std::map<String, UInt64> tables_with_modification_time;
-    MySQLBlockInputStream result(mysql_pool.get(), query.str(), tables_status_sample_block, DEFAULT_BLOCK_SIZE);
+    StreamSettings mysql_input_stream_settings(local_context->getSettingsRef());
+    MySQLBlockInputStream result(mysql_pool.get(), query.str(), tables_status_sample_block, mysql_input_stream_settings);
 
     while (Block block = result.read())
     {
@@ -276,15 +296,16 @@ std::map<String, UInt64> DatabaseConnectionMySQL::fetchTablesWithModificationTim
     return tables_with_modification_time;
 }
 
-std::map<String, NamesAndTypesList> DatabaseConnectionMySQL::fetchTablesColumnsList(const std::vector<String> & tables_name, const Context & context) const
+std::map<String, NamesAndTypesList>
+DatabaseConnectionMySQL::fetchTablesColumnsList(const std::vector<String> & tables_name, ContextPtr local_context) const
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
 
     return DB::fetchTablesColumnsList(
             mysql_pool,
             database_name_in_mysql,
             tables_name,
-            settings.external_table_functions_use_nulls,
+            settings,
             database_settings->mysql_datatypes_support_level);
 }
 
@@ -297,15 +318,15 @@ void DatabaseConnectionMySQL::shutdown()
     }
 
     for (const auto & [table_name, modify_time_and_storage] : tables_snapshot)
-        modify_time_and_storage.second->shutdown();
+        modify_time_and_storage.second->flushAndShutdown();
 
     std::lock_guard lock(mutex);
     local_tables_cache.clear();
 }
 
-void DatabaseConnectionMySQL::drop(const Context & /*context*/)
+void DatabaseConnectionMySQL::drop(ContextPtr /*context*/)
 {
-    Poco::File(getMetadataPath()).remove(true);
+    fs::remove_all(getMetadataPath());
 }
 
 void DatabaseConnectionMySQL::cleanOutdatedTables()
@@ -324,7 +345,7 @@ void DatabaseConnectionMySQL::cleanOutdatedTables()
             {
                 const auto table_lock = (*iterator)->lockExclusively(RWLockImpl::NO_QUERY, lock_acquire_timeout);
 
-                (*iterator)->shutdown();
+                (*iterator)->flushAndShutdown();
                 (*iterator)->is_dropped = true;
                 iterator = outdated_tables.erase(iterator);
             }
@@ -351,10 +372,10 @@ void DatabaseConnectionMySQL::attachTable(const String & table_name, const Stora
     local_tables_cache[table_name].second = storage;
 
     remove_or_detach_tables.erase(table_name);
-    Poco::File remove_flag(getMetadataPath() + '/' + escapeForFileName(table_name) + suffix);
+    fs::path remove_flag = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + suffix);
 
-    if (remove_flag.exists())
-        remove_flag.remove();
+    if (fs::exists(remove_flag))
+        fs::remove(remove_flag);
 }
 
 StoragePtr DatabaseConnectionMySQL::detachTable(const String & table_name)
@@ -378,48 +399,46 @@ String DatabaseConnectionMySQL::getMetadataPath() const
     return metadata_path;
 }
 
-void DatabaseConnectionMySQL::loadStoredObjects(Context &, bool, bool /*force_attach*/)
+void DatabaseConnectionMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /*force_attach*/)
 {
 
     std::lock_guard<std::mutex> lock{mutex};
-    Poco::DirectoryIterator iterator(getMetadataPath());
+    fs::directory_iterator iter(getMetadataPath());
 
-    for (Poco::DirectoryIterator end; iterator != end; ++iterator)
+    for (fs::directory_iterator end; iter != end; ++iter)
     {
-        if (iterator->isFile() && endsWith(iterator.name(), suffix))
+        if (fs::is_regular_file(iter->path()) && endsWith(iter->path().filename(), suffix))
         {
-            const auto & filename = iterator.name();
+            const auto & filename = iter->path().filename().string();
             const auto & table_name = unescapeForFileName(filename.substr(0, filename.size() - strlen(suffix)));
             remove_or_detach_tables.emplace(table_name);
         }
     }
 }
 
-void DatabaseConnectionMySQL::detachTablePermanently(const Context &, const String & table_name)
+void DatabaseConnectionMySQL::detachTablePermanently(ContextPtr, const String & table_name)
 {
     std::lock_guard<std::mutex> lock{mutex};
 
-    Poco::File remove_flag(getMetadataPath() + '/' + escapeForFileName(table_name) + suffix);
+    fs::path remove_flag = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + suffix);
 
     if (remove_or_detach_tables.count(table_name))
-        throw Exception("Table " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(table_name) + " is dropped",
-            ErrorCodes::TABLE_IS_DROPPED);
+        throw Exception(ErrorCodes::TABLE_IS_DROPPED, "Table {}.{} is dropped", backQuoteIfNeed(database_name), backQuoteIfNeed(table_name));
 
-    if (remove_flag.exists())
-        throw Exception("The remove flag file already exists but the " + backQuoteIfNeed(database_name) +
-            "." + backQuoteIfNeed(table_name) + " does not exists remove tables, it is bug.", ErrorCodes::LOGICAL_ERROR);
+    if (fs::exists(remove_flag))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The remove flag file already exists but the {}.{} does not exists remove tables, it is bug.",
+                        backQuoteIfNeed(database_name), backQuoteIfNeed(table_name));
 
     auto table_iter = local_tables_cache.find(table_name);
     if (table_iter == local_tables_cache.end())
-        throw Exception("Table " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(table_name) + " doesn't exist.",
-            ErrorCodes::UNKNOWN_TABLE);
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist", backQuoteIfNeed(database_name), backQuoteIfNeed(table_name));
 
     remove_or_detach_tables.emplace(table_name);
 
     try
     {
         table_iter->second.second->drop();
-        remove_flag.createFile();
+        FS::createFile(remove_flag);
     }
     catch (...)
     {
@@ -429,9 +448,9 @@ void DatabaseConnectionMySQL::detachTablePermanently(const Context &, const Stri
     table_iter->second.second->is_dropped = true;
 }
 
-void DatabaseConnectionMySQL::dropTable(const Context & context, const String & table_name, bool /*no_delay*/)
+void DatabaseConnectionMySQL::dropTable(ContextPtr local_context, const String & table_name, bool /*no_delay*/)
 {
-    detachTablePermanently(context, table_name);
+    detachTablePermanently(local_context, table_name);
 }
 
 DatabaseConnectionMySQL::~DatabaseConnectionMySQL()
@@ -456,7 +475,7 @@ DatabaseConnectionMySQL::~DatabaseConnectionMySQL()
     }
 }
 
-void DatabaseConnectionMySQL::createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
+void DatabaseConnectionMySQL::createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
 {
     const auto & create = create_query->as<ASTCreateQuery>();
 
@@ -467,7 +486,7 @@ void DatabaseConnectionMySQL::createTable(const Context &, const String & table_
     /// XXX: hack
     /// In order to prevent users from broken the table structure by executing attach table database_name.table_name (...)
     /// we should compare the old and new create_query to make them completely consistent
-    const auto & origin_create_query = getCreateTableQuery(table_name, global_context);
+    const auto & origin_create_query = getCreateTableQuery(table_name, getContext());
     origin_create_query->as<ASTCreateQuery>()->attach = true;
 
     if (queryToString(origin_create_query) != queryToString(create_query))
diff --git a/src/Databases/MySQL/DatabaseConnectionMySQL.h b/src/Databases/MySQL/DatabaseConnectionMySQL.h
index d0a5c041d7b..32741185cfa 100644
--- a/src/Databases/MySQL/DatabaseConnectionMySQL.h
+++ b/src/Databases/MySQL/DatabaseConnectionMySQL.h
@@ -6,10 +6,12 @@
 #include <mysqlxx/Pool.h>
 
 #include <Core/MultiEnum.h>
+#include <Core/NamesAndTypes.h>
 #include <Common/ThreadPool.h>
 #include <Databases/DatabasesCommon.h>
 #include <Databases/MySQL/ConnectionMySQLSettings.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <mysqlxx/PoolWithFailover.h>
 
 #include <atomic>
 #include <condition_variable>
@@ -30,15 +32,19 @@ enum class MySQLDataTypesSupport;
  *  It doesn't make any manipulations with filesystem.
  *  All tables are created by calling code after real-time pull-out structure from remote MySQL
  */
-class DatabaseConnectionMySQL final : public IDatabase
+class DatabaseConnectionMySQL final : public IDatabase, WithContext
 {
 public:
     ~DatabaseConnectionMySQL() override;
 
     DatabaseConnectionMySQL(
-        const Context & context, const String & database_name, const String & metadata_path,
-        const ASTStorage * database_engine_define, const String & database_name_in_mysql, std::unique_ptr<ConnectionMySQLSettings> settings_,
-        mysqlxx::Pool && pool);
+        ContextPtr context,
+        const String & database_name,
+        const String & metadata_path,
+        const ASTStorage * database_engine_define,
+        const String & database_name_in_mysql,
+        std::unique_ptr<ConnectionMySQLSettings> settings_,
+        mysqlxx::PoolWithFailover && pool);
 
     String getEngineName() const override { return "MySQL"; }
 
@@ -50,39 +56,38 @@ public:
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
     ASTPtr getCreateDatabaseQuery() const override;
 
-    bool isTableExist(const String & name, const Context & context) const override;
+    bool isTableExist(const String & name, ContextPtr context) const override;
 
-    StoragePtr tryGetTable(const String & name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
     time_t getObjectMetadataModificationTime(const String & name) const override;
 
     void shutdown() override;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
 
     String getMetadataPath() const override;
 
-    void createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
+    void createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
 
-    void loadStoredObjects(Context &, bool, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach) override;
 
     StoragePtr detachTable(const String & table_name) override;
 
-    void detachTablePermanently(const Context & context, const String & table_name) override;
+    void detachTablePermanently(ContextPtr context, const String & table_name) override;
 
-    void dropTable(const Context & context, const String & table_name, bool no_delay) override;
+    void dropTable(ContextPtr context, const String & table_name, bool no_delay) override;
 
     void attachTable(const String & table_name, const StoragePtr & storage, const String & relative_table_path) override;
 
 protected:
-    ASTPtr getCreateTableQueryImpl(const String & name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & name, ContextPtr context, bool throw_on_error) const override;
 
 private:
-    const Context & global_context;
     String metadata_path;
     ASTPtr database_engine_define;
     String database_name_in_mysql;
@@ -91,7 +96,7 @@ private:
     std::atomic<bool> quit{false};
     std::condition_variable cond;
 
-    using MySQLPool = mysqlxx::Pool;
+    using MySQLPool = mysqlxx::PoolWithFailover;
     using ModifyTimeAndStorage = std::pair<UInt64, StoragePtr>;
 
     mutable MySQLPool mysql_pool;
@@ -102,15 +107,15 @@ private:
 
     void cleanOutdatedTables();
 
-    void fetchTablesIntoLocalCache(const Context & context) const;
+    void fetchTablesIntoLocalCache(ContextPtr context) const;
 
-    std::map<String, UInt64> fetchTablesWithModificationTime() const;
+    std::map<String, UInt64> fetchTablesWithModificationTime(ContextPtr local_context) const;
 
-    std::map<String, NamesAndTypesList> fetchTablesColumnsList(const std::vector<String> & tables_name, const Context & context) const;
+    std::map<String, NamesAndTypesList> fetchTablesColumnsList(const std::vector<String> & tables_name, ContextPtr context) const;
 
     void destroyLocalCacheExtraTables(const std::map<String, UInt64> & tables_with_modification_time) const;
 
-    void fetchLatestTablesStructureIntoCache(const std::map<String, UInt64> & tables_modification_time, const Context & context) const;
+    void fetchLatestTablesStructureIntoCache(const std::map<String, UInt64> & tables_modification_time, ContextPtr context) const;
 
     ThreadFromGlobalPool thread;
 };
diff --git a/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp b/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp
index 8edeabee004..bf9d6cdfbfa 100644
--- a/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMaterializeMySQL.cpp
@@ -13,9 +13,11 @@
 #    include <Databases/MySQL/MaterializeMySQLSyncThread.h>
 #    include <Parsers/ASTCreateQuery.h>
 #    include <Storages/StorageMaterializeMySQL.h>
-#    include <Poco/File.h>
 #    include <Poco/Logger.h>
 #    include <Common/setThreadName.h>
+#    include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -26,27 +28,40 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-template<>
+template <>
 DatabaseMaterializeMySQL<DatabaseOrdinary>::DatabaseMaterializeMySQL(
-    const Context & context, const String & database_name_, const String & metadata_path_, UUID /*uuid*/,
-    const String & mysql_database_name_, mysqlxx::Pool && pool_, MySQLClient && client_, std::unique_ptr<MaterializeMySQLSettings> settings_)
-    : DatabaseOrdinary(database_name_
-                      , metadata_path_
-                      , "data/" + escapeForFileName(database_name_) + "/"
-                      , "DatabaseMaterializeMySQL<Ordinary> (" + database_name_ + ")", context
-                      )
+    ContextPtr context_,
+    const String & database_name_,
+    const String & metadata_path_,
+    UUID /*uuid*/,
+    const String & mysql_database_name_,
+    mysqlxx::Pool && pool_,
+    MySQLClient && client_,
+    std::unique_ptr<MaterializeMySQLSettings> settings_)
+    : DatabaseOrdinary(
+        database_name_,
+        metadata_path_,
+        "data/" + escapeForFileName(database_name_) + "/",
+        "DatabaseMaterializeMySQL<Ordinary> (" + database_name_ + ")",
+        context_)
     , settings(std::move(settings_))
-    , materialize_thread(context, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
+    , materialize_thread(context_, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
 {
 }
 
-template<>
+template <>
 DatabaseMaterializeMySQL<DatabaseAtomic>::DatabaseMaterializeMySQL(
-    const Context & context, const String & database_name_, const String & metadata_path_, UUID uuid,
-    const String & mysql_database_name_, mysqlxx::Pool && pool_, MySQLClient && client_, std::unique_ptr<MaterializeMySQLSettings> settings_)
-    : DatabaseAtomic(database_name_, metadata_path_, uuid, "DatabaseMaterializeMySQL<Atomic> (" + database_name_ + ")", context)
+    ContextPtr context_,
+    const String & database_name_,
+    const String & metadata_path_,
+    UUID uuid,
+    const String & mysql_database_name_,
+    mysqlxx::Pool && pool_,
+    MySQLClient && client_,
+    std::unique_ptr<MaterializeMySQLSettings> settings_)
+    : DatabaseAtomic(database_name_, metadata_path_, uuid, "DatabaseMaterializeMySQL<Atomic> (" + database_name_ + ")", context_)
     , settings(std::move(settings_))
-    , materialize_thread(context, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
+    , materialize_thread(context_, database_name_, mysql_database_name_, std::move(pool_), std::move(client_), settings.get())
 {
 }
 
@@ -79,9 +94,9 @@ void DatabaseMaterializeMySQL<Base>::setException(const std::exception_ptr & exc
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseMaterializeMySQL<Base>::loadStoredObjects(ContextMutablePtr context_, bool has_force_restore_data_flag, bool force_attach)
 {
-    Base::loadStoredObjects(context, has_force_restore_data_flag, force_attach);
+    Base::loadStoredObjects(context_, has_force_restore_data_flag, force_attach);
     if (!force_attach)
         materialize_thread.assertMySQLAvailable();
 
@@ -90,17 +105,17 @@ void DatabaseMaterializeMySQL<Base>::loadStoredObjects(Context & context, bool h
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::createTable(const Context & context, const String & name, const StoragePtr & table, const ASTPtr & query)
+void DatabaseMaterializeMySQL<Base>::createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query)
 {
     assertCalledFromSyncThreadOrDrop("create table");
-    Base::createTable(context, name, table, query);
+    Base::createTable(context_, name, table, query);
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::dropTable(const Context & context, const String & name, bool no_delay)
+void DatabaseMaterializeMySQL<Base>::dropTable(ContextPtr context_, const String & name, bool no_delay)
 {
     assertCalledFromSyncThreadOrDrop("drop table");
-    Base::dropTable(context, name, no_delay);
+    Base::dropTable(context_, name, no_delay);
 }
 
 template<typename Base>
@@ -118,7 +133,7 @@ StoragePtr DatabaseMaterializeMySQL<Base>::detachTable(const String & name)
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::renameTable(const Context & context, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary)
+void DatabaseMaterializeMySQL<Base>::renameTable(ContextPtr context_, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary)
 {
     assertCalledFromSyncThreadOrDrop("rename table");
 
@@ -131,34 +146,34 @@ void DatabaseMaterializeMySQL<Base>::renameTable(const Context & context, const
     if (to_database.getDatabaseName() != Base::getDatabaseName())
         throw Exception("Cannot rename with other database for MaterializeMySQL database.", ErrorCodes::NOT_IMPLEMENTED);
 
-    Base::renameTable(context, name, *this, to_name, exchange, dictionary);
+    Base::renameTable(context_, name, *this, to_name, exchange, dictionary);
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::alterTable(const Context & context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
+void DatabaseMaterializeMySQL<Base>::alterTable(ContextPtr context_, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
 {
     assertCalledFromSyncThreadOrDrop("alter table");
-    Base::alterTable(context, table_id, metadata);
+    Base::alterTable(context_, table_id, metadata);
 }
 
 template<typename Base>
-void DatabaseMaterializeMySQL<Base>::drop(const Context & context)
+void DatabaseMaterializeMySQL<Base>::drop(ContextPtr context_)
 {
     /// Remove metadata info
-    Poco::File metadata(Base::getMetadataPath() + "/.metadata");
+    fs::path metadata(Base::getMetadataPath() + "/.metadata");
 
-    if (metadata.exists())
-        metadata.remove(false);
+    if (fs::exists(metadata))
+        fs::remove(metadata);
 
-    Base::drop(context);
+    Base::drop(context_);
 }
 
 template<typename Base>
-StoragePtr DatabaseMaterializeMySQL<Base>::tryGetTable(const String & name, const Context & context) const
+StoragePtr DatabaseMaterializeMySQL<Base>::tryGetTable(const String & name, ContextPtr context_) const
 {
     if (!MaterializeMySQLSyncThread::isMySQLSyncThread())
     {
-        StoragePtr nested_storage = Base::tryGetTable(name, context);
+        StoragePtr nested_storage = Base::tryGetTable(name, context_);
 
         if (!nested_storage)
             return {};
@@ -166,19 +181,20 @@ StoragePtr DatabaseMaterializeMySQL<Base>::tryGetTable(const String & name, cons
         return std::make_shared<StorageMaterializeMySQL>(std::move(nested_storage), this);
     }
 
-    return Base::tryGetTable(name, context);
+    return Base::tryGetTable(name, context_);
 }
 
-template<typename Base>
-DatabaseTablesIteratorPtr DatabaseMaterializeMySQL<Base>::getTablesIterator(const Context & context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name)
+template <typename Base>
+DatabaseTablesIteratorPtr
+DatabaseMaterializeMySQL<Base>::getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name)
 {
     if (!MaterializeMySQLSyncThread::isMySQLSyncThread())
     {
-        DatabaseTablesIteratorPtr iterator = Base::getTablesIterator(context, filter_by_table_name);
+        DatabaseTablesIteratorPtr iterator = Base::getTablesIterator(context_, filter_by_table_name);
         return std::make_unique<DatabaseMaterializeTablesIterator>(std::move(iterator), this);
     }
 
-    return Base::getTablesIterator(context, filter_by_table_name);
+    return Base::getTablesIterator(context_, filter_by_table_name);
 }
 
 template<typename Base>
diff --git a/src/Databases/MySQL/DatabaseMaterializeMySQL.h b/src/Databases/MySQL/DatabaseMaterializeMySQL.h
index e1229269a33..74a3c06e6f0 100644
--- a/src/Databases/MySQL/DatabaseMaterializeMySQL.h
+++ b/src/Databases/MySQL/DatabaseMaterializeMySQL.h
@@ -23,7 +23,7 @@ class DatabaseMaterializeMySQL : public Base
 public:
 
     DatabaseMaterializeMySQL(
-        const Context & context, const String & database_name_, const String & metadata_path_, UUID uuid,
+        ContextPtr context, const String & database_name_, const String & metadata_path_, UUID uuid,
         const String & mysql_database_name_, mysqlxx::Pool && pool_,
         MySQLClient && client_, std::unique_ptr<MaterializeMySQLSettings> settings_);
 
@@ -43,25 +43,25 @@ protected:
 public:
     String getEngineName() const override { return "MaterializeMySQL"; }
 
-    void loadStoredObjects(Context & context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context_, bool has_force_restore_data_flag, bool force_attach) override;
 
-    void createTable(const Context & context, const String & name, const StoragePtr & table, const ASTPtr & query) override;
+    void createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query) override;
 
-    void dropTable(const Context & context, const String & name, bool no_delay) override;
+    void dropTable(ContextPtr context_, const String & name, bool no_delay) override;
 
     void attachTable(const String & name, const StoragePtr & table, const String & relative_table_path) override;
 
     StoragePtr detachTable(const String & name) override;
 
-    void renameTable(const Context & context, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary) override;
+    void renameTable(ContextPtr context_, const String & name, IDatabase & to_database, const String & to_name, bool exchange, bool dictionary) override;
 
-    void alterTable(const Context & context, const StorageID & table_id, const StorageInMemoryMetadata & metadata) override;
+    void alterTable(ContextPtr context_, const StorageID & table_id, const StorageInMemoryMetadata & metadata) override;
 
-    void drop(const Context & context) override;
+    void drop(ContextPtr context_) override;
 
-    StoragePtr tryGetTable(const String & name, const Context & context) const override;
+    StoragePtr tryGetTable(const String & name, ContextPtr context_) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) override;
 
     void assertCalledFromSyncThreadOrDrop(const char * method) const;
 
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.cpp b/src/Databases/MySQL/FetchTablesColumnsList.cpp
index 3e25c703a1d..cfd01d4ddc4 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.cpp
+++ b/src/Databases/MySQL/FetchTablesColumnsList.cpp
@@ -41,10 +41,10 @@ namespace DB
 {
 
 std::map<String, NamesAndTypesList> fetchTablesColumnsList(
-        mysqlxx::Pool & pool,
+        mysqlxx::PoolWithFailover & pool,
         const String & database_name,
         const std::vector<String> & tables_name,
-        bool external_table_functions_use_nulls,
+        const Settings & settings,
         MultiEnum<MySQLDataTypesSupport> type_support)
 {
     std::map<String, NamesAndTypesList> tables_and_columns;
@@ -72,13 +72,18 @@ std::map<String, NamesAndTypesList> fetchTablesColumnsList(
              " IS_NULLABLE = 'YES' AS is_nullable,"
              " COLUMN_TYPE LIKE '%unsigned' AS is_unsigned,"
              " CHARACTER_MAXIMUM_LENGTH AS length,"
-             " NUMERIC_PRECISION as '',"
+             " NUMERIC_PRECISION as numeric_precision,"
              " IF(ISNULL(NUMERIC_SCALE), DATETIME_PRECISION, NUMERIC_SCALE) AS scale" // we know DATETIME_PRECISION as a scale in CH
              " FROM INFORMATION_SCHEMA.COLUMNS"
-             " WHERE TABLE_SCHEMA = " << quote << database_name
-          << " AND TABLE_NAME IN " << toQueryStringWithQuote(tables_name) << " ORDER BY ORDINAL_POSITION";
+             " WHERE ";
 
-    MySQLBlockInputStream result(pool.get(), query.str(), tables_columns_sample_block, DEFAULT_BLOCK_SIZE);
+    if (!database_name.empty())
+        query << " TABLE_SCHEMA = " << quote << database_name << " AND ";
+
+    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())
     {
         const auto & table_name_col = *block.getByPosition(0).column;
@@ -99,7 +104,7 @@ std::map<String, NamesAndTypesList> fetchTablesColumnsList(
                     convertMySQLDataType(
                             type_support,
                             column_type_col[i].safeGet<String>(),
-                            external_table_functions_use_nulls && is_nullable_col[i].safeGet<UInt64>(),
+                            settings.external_table_functions_use_nulls && is_nullable_col[i].safeGet<UInt64>(),
                             is_unsigned_col[i].safeGet<UInt64>(),
                             char_max_length_col[i].safeGet<UInt64>(),
                             precision_col[i].safeGet<UInt64>(),
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.h b/src/Databases/MySQL/FetchTablesColumnsList.h
index 52191c2ecb8..55f18e0115f 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.h
+++ b/src/Databases/MySQL/FetchTablesColumnsList.h
@@ -3,7 +3,7 @@
 #include "config_core.h"
 #if USE_MYSQL
 
-#include <mysqlxx/Pool.h>
+#include <mysqlxx/PoolWithFailover.h>
 
 #include <common/types.h>
 #include <Core/MultiEnum.h>
@@ -12,15 +12,16 @@
 
 #include <map>
 #include <vector>
+#include <Core/Settings.h>
 
 namespace DB
 {
 
 std::map<String, NamesAndTypesList> fetchTablesColumnsList(
-        mysqlxx::Pool & pool,
+        mysqlxx::PoolWithFailover & pool,
         const String & database_name,
         const std::vector<String> & tables_name,
-        bool external_table_functions_use_nulls,
+        const Settings & settings,
         MultiEnum<MySQLDataTypesSupport> type_support);
 
 }
diff --git a/src/Databases/MySQL/MaterializeMetadata.cpp b/src/Databases/MySQL/MaterializeMetadata.cpp
index a54d378f813..4fd99ca3438 100644
--- a/src/Databases/MySQL/MaterializeMetadata.cpp
+++ b/src/Databases/MySQL/MaterializeMetadata.cpp
@@ -8,11 +8,13 @@
 #include <Formats/MySQLBlockInputStream.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromFile.h>
-#include <Poco/File.h>
 #include <Common/quoteString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -24,7 +26,8 @@ namespace ErrorCodes
 }
 
 static std::unordered_map<String, String> fetchTablesCreateQuery(
-    const mysqlxx::PoolWithFailover::Entry & connection, const String & database_name, const std::vector<String> & fetch_tables)
+    const mysqlxx::PoolWithFailover::Entry & connection, const String & database_name,
+    const std::vector<String> & fetch_tables, const Settings & global_settings)
 {
     std::unordered_map<String, String> tables_create_query;
     for (const auto & fetch_table_name : fetch_tables)
@@ -34,9 +37,10 @@ static std::unordered_map<String, String> fetchTablesCreateQuery(
             {std::make_shared<DataTypeString>(), "Create Table"},
         };
 
+        StreamSettings mysql_input_stream_settings(global_settings, false, true);
         MySQLBlockInputStream show_create_table(
             connection, "SHOW CREATE TABLE " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(fetch_table_name),
-            show_create_table_header, DEFAULT_BLOCK_SIZE, false, true);
+            show_create_table_header, mysql_input_stream_settings);
 
         Block create_query_block = show_create_table.read();
         if (!create_query_block || create_query_block.rows() != 1)
@@ -49,13 +53,14 @@ static std::unordered_map<String, String> fetchTablesCreateQuery(
 }
 
 
-static std::vector<String> fetchTablesInDB(const mysqlxx::PoolWithFailover::Entry & connection, const std::string & database)
+static std::vector<String> fetchTablesInDB(const mysqlxx::PoolWithFailover::Entry & connection, const std::string & database, const Settings & global_settings)
 {
     Block header{{std::make_shared<DataTypeString>(), "table_name"}};
-    String query = "SELECT TABLE_NAME AS table_name FROM INFORMATION_SCHEMA.TABLES  WHERE TABLE_SCHEMA = " + quoteString(database);
+    String query = "SELECT TABLE_NAME AS table_name FROM INFORMATION_SCHEMA.TABLES  WHERE TABLE_TYPE != 'VIEW' AND TABLE_SCHEMA = " + quoteString(database);
 
     std::vector<String> tables_in_db;
-    MySQLBlockInputStream input(connection, query, header, DEFAULT_BLOCK_SIZE);
+    StreamSettings mysql_input_stream_settings(global_settings);
+    MySQLBlockInputStream input(connection, query, header, mysql_input_stream_settings);
 
     while (Block block = input.read())
     {
@@ -77,7 +82,8 @@ void MaterializeMetadata::fetchMasterStatus(mysqlxx::PoolWithFailover::Entry & c
         {std::make_shared<DataTypeString>(), "Executed_Gtid_Set"},
     };
 
-    MySQLBlockInputStream input(connection, "SHOW MASTER STATUS;", header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream input(connection, "SHOW MASTER STATUS;", header, mysql_input_stream_settings);
     Block master_status = input.read();
 
     if (!master_status || master_status.rows() != 1)
@@ -99,7 +105,8 @@ void MaterializeMetadata::fetchMasterVariablesValue(const mysqlxx::PoolWithFailo
     };
 
     const String & fetch_query = "SHOW VARIABLES WHERE Variable_name = 'binlog_checksum'";
-    MySQLBlockInputStream variables_input(connection, fetch_query, variables_header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream variables_input(connection, fetch_query, variables_header, mysql_input_stream_settings);
 
     while (Block variables_block = variables_input.read())
     {
@@ -114,7 +121,7 @@ void MaterializeMetadata::fetchMasterVariablesValue(const mysqlxx::PoolWithFailo
     }
 }
 
-static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & connection, WriteBuffer & out)
+static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & connection, const Settings & global_settings, WriteBuffer & out)
 {
     Block sync_user_privs_header
     {
@@ -122,7 +129,8 @@ static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & conne
     };
 
     String grants_query, sub_privs;
-    MySQLBlockInputStream input(connection, "SHOW GRANTS FOR CURRENT_USER();", sync_user_privs_header, DEFAULT_BLOCK_SIZE);
+    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())
     {
         for (size_t index = 0; index < block.rows(); ++index)
@@ -146,11 +154,11 @@ static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & conne
     return false;
 }
 
-static void checkSyncUserPriv(const mysqlxx::PoolWithFailover::Entry & connection)
+static void checkSyncUserPriv(const mysqlxx::PoolWithFailover::Entry & connection, const Settings & global_settings)
 {
     WriteBufferFromOwnString out;
 
-    if (!checkSyncUserPrivImpl(connection, out))
+    if (!checkSyncUserPrivImpl(connection, global_settings, out))
         throw Exception("MySQL SYNC USER ACCESS ERR: mysql sync user needs "
                         "at least GLOBAL PRIVILEGES:'RELOAD, REPLICATION SLAVE, REPLICATION CLIENT' "
                         "and SELECT PRIVILEGE on MySQL Database."
@@ -167,7 +175,8 @@ bool MaterializeMetadata::checkBinlogFileExists(const mysqlxx::PoolWithFailover:
         {std::make_shared<DataTypeUInt64>(), "File_size"}
     };
 
-    MySQLBlockInputStream input(connection, "SHOW MASTER LOGS", logs_header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream input(connection, "SHOW MASTER LOGS", logs_header, mysql_input_stream_settings);
 
     while (Block block = input.read())
     {
@@ -186,12 +195,11 @@ void commitMetadata(const std::function<void()> & function, const String & persi
     try
     {
         function();
-
-        Poco::File(persistent_tmp_path).renameTo(persistent_path);
+        fs::rename(persistent_tmp_path, persistent_path);
     }
     catch (...)
     {
-        Poco::File(persistent_tmp_path).remove();
+        fs::remove(persistent_tmp_path);
         throw;
     }
 }
@@ -222,9 +230,9 @@ void MaterializeMetadata::transaction(const MySQLReplication::Position & positio
     commitMetadata(std::move(fun), persistent_tmp_path, persistent_path);
 }
 
-MaterializeMetadata::MaterializeMetadata(const String & path_) : persistent_path(path_)
+MaterializeMetadata::MaterializeMetadata(const String & path_, const Settings & settings_) : persistent_path(path_), settings(settings_)
 {
-    if (Poco::File(persistent_path).exists())
+    if (fs::exists(persistent_path))
     {
         ReadBufferFromFile in(persistent_path, DBMS_DEFAULT_BUFFER_SIZE);
         assertString("Version:\t" + toString(meta_version), in);
@@ -244,7 +252,7 @@ void MaterializeMetadata::startReplication(
     mysqlxx::PoolWithFailover::Entry & connection, const String & database,
     bool & opened_transaction, std::unordered_map<String, String> & need_dumping_tables)
 {
-    checkSyncUserPriv(connection);
+    checkSyncUserPriv(connection, settings);
 
     if (checkBinlogFileExists(connection))
       return;
@@ -263,7 +271,7 @@ void MaterializeMetadata::startReplication(
         connection->query("START TRANSACTION /*!40100 WITH CONSISTENT SNAPSHOT */;").execute();
 
         opened_transaction = true;
-        need_dumping_tables = fetchTablesCreateQuery(connection, database, fetchTablesInDB(connection, database));
+        need_dumping_tables = fetchTablesCreateQuery(connection, database, fetchTablesInDB(connection, database, settings), settings);
         connection->query("UNLOCK TABLES;").execute();
     }
     catch (...)
diff --git a/src/Databases/MySQL/MaterializeMetadata.h b/src/Databases/MySQL/MaterializeMetadata.h
index 3a82d1349ba..079786c261c 100644
--- a/src/Databases/MySQL/MaterializeMetadata.h
+++ b/src/Databases/MySQL/MaterializeMetadata.h
@@ -10,6 +10,7 @@
 #include <Core/MySQL/MySQLReplication.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/PoolWithFailover.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -25,6 +26,7 @@ namespace DB
 struct MaterializeMetadata
 {
     const String persistent_path;
+    const Settings settings;
 
     String binlog_file;
     UInt64 binlog_position;
@@ -50,7 +52,7 @@ struct MaterializeMetadata
         bool & opened_transaction,
         std::unordered_map<String, String> & need_dumping_tables);
 
-    MaterializeMetadata(const String & path_);
+    MaterializeMetadata(const String & path_, const Settings & settings_);
 };
 
 }
diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
index 8d1c1e109ac..e5783be4624 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.cpp
@@ -41,30 +41,30 @@ namespace ErrorCodes
 
 static constexpr auto MYSQL_BACKGROUND_THREAD_NAME = "MySQLDBSync";
 
-static Context createQueryContext(const Context & global_context)
+static ContextMutablePtr createQueryContext(ContextPtr context)
 {
-    Settings new_query_settings = global_context.getSettings();
+    Settings new_query_settings = context->getSettings();
     new_query_settings.insert_allow_materialized_columns = true;
 
     /// To avoid call AST::format
     /// TODO: We need to implement the format function for MySQLAST
     new_query_settings.enable_global_with_statement = false;
 
-    Context query_context(global_context);
-    query_context.setSettings(new_query_settings);
+    auto query_context = Context::createCopy(context);
+    query_context->setSettings(new_query_settings);
     CurrentThread::QueryScope query_scope(query_context);
 
-    query_context.getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
-    query_context.setCurrentQueryId(""); // generate random query_id
+    query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+    query_context->setCurrentQueryId(""); // generate random query_id
     return query_context;
 }
 
-static BlockIO tryToExecuteQuery(const String & query_to_execute, Context & query_context, const String & database, const String & comment)
+static BlockIO tryToExecuteQuery(const String & query_to_execute, ContextMutablePtr query_context, const String & database, const String & comment)
 {
     try
     {
         if (!database.empty())
-            query_context.setCurrentDatabase(database);
+            query_context->setCurrentDatabase(database);
 
         return executeQuery("/*" + comment + "*/ " + query_to_execute, query_context, true);
     }
@@ -90,49 +90,49 @@ MaterializeMySQLSyncThread::~MaterializeMySQLSyncThread()
     }
 }
 
-static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
+static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection, const Settings & settings)
 {
     Block variables_header{
         {std::make_shared<DataTypeString>(), "Variable_name"},
         {std::make_shared<DataTypeString>(), "Value"}
     };
 
-    const String & check_query = "SHOW VARIABLES WHERE "
-         "(Variable_name = 'log_bin' AND upper(Value) = 'ON') "
-         "OR (Variable_name = 'binlog_format' AND upper(Value) = 'ROW') "
-         "OR (Variable_name = 'binlog_row_image' AND upper(Value) = 'FULL') "
-         "OR (Variable_name = 'default_authentication_plugin' AND upper(Value) = 'MYSQL_NATIVE_PASSWORD') "
-         "OR (Variable_name = 'log_bin_use_v1_row_events' AND upper(Value) = 'OFF');";
+    const String & check_query = "SHOW VARIABLES;";
 
-    MySQLBlockInputStream variables_input(connection, check_query, variables_header, DEFAULT_BLOCK_SIZE, false, true);
+    StreamSettings mysql_input_stream_settings(settings, false, true);
+    MySQLBlockInputStream variables_input(connection, check_query, variables_header, mysql_input_stream_settings);
 
-    Block variables_block = variables_input.read();
-    if (!variables_block || variables_block.rows() != 5)
+    std::unordered_map<String, String> variables_error_message{
+        {"log_bin", "ON"},
+        {"binlog_format", "ROW"},
+        {"binlog_row_image", "FULL"},
+        {"default_authentication_plugin", "mysql_native_password"},
+        {"log_bin_use_v1_row_events", "OFF"}
+    };
+
+    while (Block variables_block = variables_input.read())
     {
-        std::unordered_map<String, String> variables_error_message{
-            {"log_bin", "log_bin = 'ON'"},
-            {"binlog_format", "binlog_format='ROW'"},
-            {"binlog_row_image", "binlog_row_image='FULL'"},
-            {"default_authentication_plugin", "default_authentication_plugin='mysql_native_password'"},
-            {"log_bin_use_v1_row_events", "log_bin_use_v1_row_events='OFF'"}
-        };
-
         ColumnPtr variable_name_column = variables_block.getByName("Variable_name").column;
+        ColumnPtr variable_value_column = variables_block.getByName("Value").column;
 
         for (size_t index = 0; index < variables_block.rows(); ++index)
         {
             const auto & error_message_it = variables_error_message.find(variable_name_column->getDataAt(index).toString());
+            const String variable_val = variable_value_column->getDataAt(index).toString();
 
-            if (error_message_it != variables_error_message.end())
+            if (error_message_it != variables_error_message.end() && variable_val == error_message_it->second)
                 variables_error_message.erase(error_message_it);
         }
+    }
 
+    if  (!variables_error_message.empty())
+    {
         bool first = true;
         WriteBufferFromOwnString error_message;
         error_message << "Illegal MySQL variables, the MaterializeMySQL engine requires ";
-        for (const auto & [variable_name, variable_error_message] : variables_error_message)
+        for (const auto & [variable_name, variable_error_val] : variables_error_message)
         {
-            error_message << (first ? "" : ", ") << variable_error_message;
+            error_message << (first ? "" : ", ") << variable_name << "='" << variable_error_val << "'";
 
             if (first)
                 first = false;
@@ -143,10 +143,19 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection)
 }
 
 MaterializeMySQLSyncThread::MaterializeMySQLSyncThread(
-    const Context & context, const String & database_name_, const String & mysql_database_name_,
-    mysqlxx::Pool && pool_, MySQLClient && client_, MaterializeMySQLSettings * settings_)
-    : log(&Poco::Logger::get("MaterializeMySQLSyncThread")), global_context(context.getGlobalContext()), database_name(database_name_)
-    , mysql_database_name(mysql_database_name_), pool(std::move(pool_)), client(std::move(client_)), settings(settings_)
+    ContextPtr context_,
+    const String & database_name_,
+    const String & mysql_database_name_,
+    mysqlxx::Pool && pool_,
+    MySQLClient && client_,
+    MaterializeMySQLSettings * settings_)
+    : WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("MaterializeMySQLSyncThread"))
+    , database_name(database_name_)
+    , mysql_database_name(mysql_database_name_)
+    , pool(std::move(pool_))
+    , client(std::move(client_))
+    , settings(settings_)
 {
     query_prefix = "EXTERNAL DDL FROM MySQL(" + backQuoteIfNeed(database_name) + ", " + backQuoteIfNeed(mysql_database_name) + ") ";
 }
@@ -158,7 +167,7 @@ void MaterializeMySQLSyncThread::synchronization()
     try
     {
         MaterializeMetadata metadata(
-            DatabaseCatalog::instance().getDatabase(database_name)->getMetadataPath() + "/.metadata");
+            DatabaseCatalog::instance().getDatabase(database_name)->getMetadataPath() + "/.metadata", getContext()->getSettingsRef());
         bool need_reconnect = true;
 
         Stopwatch watch;
@@ -231,7 +240,7 @@ void MaterializeMySQLSyncThread::assertMySQLAvailable()
 {
     try
     {
-        checkMySQLVariables(pool.get());
+        checkMySQLVariables(pool.get(), getContext()->getSettingsRef());
     }
     catch (const mysqlxx::ConnectionFailed & e)
     {
@@ -248,7 +257,7 @@ void MaterializeMySQLSyncThread::assertMySQLAvailable()
     }
 }
 
-static inline void cleanOutdatedTables(const String & database_name, const Context & context)
+static inline void cleanOutdatedTables(const String & database_name, ContextPtr context)
 {
     String cleaning_table_name;
     try
@@ -258,7 +267,7 @@ static inline void cleanOutdatedTables(const String & database_name, const Conte
 
         for (auto iterator = clean_database->getTablesIterator(context); iterator->isValid(); iterator->next())
         {
-            Context query_context = createQueryContext(context);
+            auto query_context = createQueryContext(context);
             String comment = "Materialize MySQL step 1: execute MySQL DDL for dump data";
             cleaning_table_name = backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(iterator->name());
             tryToExecuteQuery(" DROP TABLE " + cleaning_table_name, query_context, database_name, comment);
@@ -271,7 +280,8 @@ static inline void cleanOutdatedTables(const String & database_name, const Conte
     }
 }
 
-static inline BlockOutputStreamPtr getTableOutput(const String & database_name, const String & table_name, Context & query_context, bool insert_materialized = false)
+static inline BlockOutputStreamPtr
+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);
 
@@ -303,7 +313,7 @@ static inline BlockOutputStreamPtr getTableOutput(const String & database_name,
 static inline void dumpDataForTables(
     mysqlxx::Pool::Entry & connection, const std::unordered_map<String, String> & need_dumping_tables,
     const String & query_prefix, const String & database_name, const String & mysql_database_name,
-    const Context & context, const std::function<bool()> & is_cancelled)
+    ContextPtr context, const std::function<bool()> & is_cancelled)
 {
     auto iterator = need_dumping_tables.begin();
     for (; iterator != need_dumping_tables.end() && !is_cancelled(); ++iterator)
@@ -311,14 +321,15 @@ static inline void dumpDataForTables(
         try
         {
             const auto & table_name = iterator->first;
-            Context query_context = createQueryContext(context);
+            auto query_context = createQueryContext(context);
             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));
+            StreamSettings mysql_input_stream_settings(context->getSettingsRef());
             MySQLBlockInputStream input(
                 connection, "SELECT * FROM " + backQuoteIfNeed(mysql_database_name) + "." + backQuoteIfNeed(table_name),
-                out->getHeader(), DEFAULT_BLOCK_SIZE);
+                out->getHeader(), mysql_input_stream_settings);
 
             Stopwatch watch;
             copyData(input, *out, is_cancelled);
@@ -365,7 +376,7 @@ bool MaterializeMySQLSyncThread::prepareSynchronized(MaterializeMetadata & metad
 
             opened_transaction = false;
 
-            checkMySQLVariables(connection);
+            checkMySQLVariables(connection, getContext()->getSettingsRef());
             std::unordered_map<String, String> need_dumping_tables;
             metadata.startReplication(connection, mysql_database_name, opened_transaction, need_dumping_tables);
 
@@ -376,8 +387,12 @@ bool MaterializeMySQLSyncThread::prepareSynchronized(MaterializeMetadata & metad
 
                 metadata.transaction(position, [&]()
                 {
-                    cleanOutdatedTables(database_name, global_context);
-                    dumpDataForTables(connection, need_dumping_tables, query_prefix, database_name, mysql_database_name, global_context, [this] { return isCancelled(); });
+                    cleanOutdatedTables(database_name, getContext());
+                    dumpDataForTables(
+                        connection, need_dumping_tables, query_prefix, database_name, mysql_database_name, getContext(), [this]
+                        {
+                            return isCancelled();
+                        });
                 });
 
                 const auto & position_message = [&]()
@@ -431,7 +446,7 @@ void MaterializeMySQLSyncThread::flushBuffersData(Buffers & buffers, Materialize
     if (buffers.data.empty())
         return;
 
-    metadata.transaction(client.getPosition(), [&]() { buffers.commit(global_context); });
+    metadata.transaction(client.getPosition(), [&]() { buffers.commit(getContext()); });
 
     const auto & position_message = [&]()
     {
@@ -462,7 +477,7 @@ static inline void fillSignAndVersionColumnsData(Block & data, Int8 sign_value,
 
 template <bool assert_nullable = false>
 static void writeFieldsToColumn(
-    IColumn & column_to, const std::vector<Field> & rows_data, size_t column_index, const std::vector<bool> & mask, ColumnUInt8 * null_map_column = nullptr)
+    IColumn & column_to, const Row & rows_data, size_t column_index, const std::vector<bool> & mask, ColumnUInt8 * null_map_column = nullptr)
 {
     if (ColumnNullable * column_nullable = typeid_cast<ColumnNullable *>(&column_to))
         writeFieldsToColumn<true>(column_nullable->getNestedColumn(), rows_data, column_index, mask, &column_nullable->getNullMapColumn());
@@ -584,7 +599,7 @@ static void writeFieldsToColumn(
 }
 
 template <Int8 sign>
-static size_t onWriteOrDeleteData(const std::vector<Field> & rows_data, Block & buffer, size_t version)
+static size_t onWriteOrDeleteData(const Row & rows_data, Block & buffer, size_t version)
 {
     size_t prev_bytes = buffer.bytes();
     for (size_t column = 0; column < buffer.columns() - 2; ++column)
@@ -608,7 +623,7 @@ static inline bool differenceSortingKeys(const Tuple & row_old_data, const Tuple
     return false;
 }
 
-static inline size_t onUpdateData(const std::vector<Field> & rows_data, Block & buffer, size_t version, const std::vector<size_t> & sorting_columns_index)
+static inline size_t onUpdateData(const Row & rows_data, Block & buffer, size_t version, const std::vector<size_t> & sorting_columns_index)
 {
     if (rows_data.size() % 2 != 0)
         throw Exception("LOGICAL ERROR: It is a bug.", ErrorCodes::LOGICAL_ERROR);
@@ -664,21 +679,21 @@ void MaterializeMySQLSyncThread::onEvent(Buffers & buffers, const BinlogEventPtr
     if (receive_event->type() == MYSQL_WRITE_ROWS_EVENT)
     {
         WriteRowsEvent & write_rows_event = static_cast<WriteRowsEvent &>(*receive_event);
-        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(write_rows_event.table, global_context);
+        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(write_rows_event.table, getContext());
         size_t bytes = onWriteOrDeleteData<1>(write_rows_event.rows, buffer->first, ++metadata.data_version);
         buffers.add(buffer->first.rows(), buffer->first.bytes(), write_rows_event.rows.size(), bytes);
     }
     else if (receive_event->type() == MYSQL_UPDATE_ROWS_EVENT)
     {
         UpdateRowsEvent & update_rows_event = static_cast<UpdateRowsEvent &>(*receive_event);
-        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(update_rows_event.table, global_context);
+        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(update_rows_event.table, getContext());
         size_t bytes = onUpdateData(update_rows_event.rows, buffer->first, ++metadata.data_version, buffer->second);
         buffers.add(buffer->first.rows(), buffer->first.bytes(), update_rows_event.rows.size(), bytes);
     }
     else if (receive_event->type() == MYSQL_DELETE_ROWS_EVENT)
     {
         DeleteRowsEvent & delete_rows_event = static_cast<DeleteRowsEvent &>(*receive_event);
-        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(delete_rows_event.table, global_context);
+        Buffers::BufferAndSortingColumnsPtr buffer = buffers.getTableDataBuffer(delete_rows_event.table, getContext());
         size_t bytes = onWriteOrDeleteData<-1>(delete_rows_event.rows, buffer->first, ++metadata.data_version);
         buffers.add(buffer->first.rows(), buffer->first.bytes(), delete_rows_event.rows.size(), bytes);
     }
@@ -687,7 +702,7 @@ void MaterializeMySQLSyncThread::onEvent(Buffers & buffers, const BinlogEventPtr
         QueryEvent & query_event = static_cast<QueryEvent &>(*receive_event);
         Position position_before_ddl;
         position_before_ddl.update(metadata.binlog_position, metadata.binlog_file, metadata.executed_gtid_set);
-        metadata.transaction(position_before_ddl, [&]() { buffers.commit(global_context); });
+        metadata.transaction(position_before_ddl, [&]() { buffers.commit(getContext()); });
         metadata.transaction(client.getPosition(),[&](){ executeDDLAtomic(query_event); });
     }
     else
@@ -718,7 +733,7 @@ void MaterializeMySQLSyncThread::executeDDLAtomic(const QueryEvent & query_event
 {
     try
     {
-        Context query_context = createQueryContext(global_context);
+        auto query_context = createQueryContext(getContext());
         String comment = "Materialize MySQL step 2: execute MySQL DDL for sync data";
         String event_database = query_event.schema == mysql_database_name ? database_name : "";
         tryToExecuteQuery(query_prefix + query_event.query, query_context, event_database, comment);
@@ -761,13 +776,13 @@ bool MaterializeMySQLSyncThread::Buffers::checkThresholds(size_t check_block_row
         || total_blocks_bytes >= check_total_bytes;
 }
 
-void MaterializeMySQLSyncThread::Buffers::commit(const Context & context)
+void MaterializeMySQLSyncThread::Buffers::commit(ContextPtr context)
 {
     try
     {
         for (auto & table_name_and_buffer : data)
         {
-            Context query_context = createQueryContext(context);
+            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);
@@ -787,7 +802,7 @@ void MaterializeMySQLSyncThread::Buffers::commit(const Context & context)
 }
 
 MaterializeMySQLSyncThread::Buffers::BufferAndSortingColumnsPtr MaterializeMySQLSyncThread::Buffers::getTableDataBuffer(
-    const String & table_name, const Context & context)
+    const String & table_name, ContextPtr context)
 {
     const auto & iterator = data.find(table_name);
     if (iterator == data.end())
diff --git a/src/Databases/MySQL/MaterializeMySQLSyncThread.h b/src/Databases/MySQL/MaterializeMySQLSyncThread.h
index 54a6cbbdda2..03958fe10cc 100644
--- a/src/Databases/MySQL/MaterializeMySQLSyncThread.h
+++ b/src/Databases/MySQL/MaterializeMySQLSyncThread.h
@@ -36,14 +36,18 @@ namespace DB
  *  real-time pull incremental data:
  *      We will pull the binlog event of MySQL to parse and execute when the full data synchronization is completed.
  */
-class MaterializeMySQLSyncThread
+class MaterializeMySQLSyncThread : WithContext
 {
 public:
     ~MaterializeMySQLSyncThread();
 
     MaterializeMySQLSyncThread(
-        const Context & context, const String & database_name_, const String & mysql_database_name_
-        , mysqlxx::Pool && pool_, MySQLClient && client_, MaterializeMySQLSettings * settings_);
+        ContextPtr context,
+        const String & database_name_,
+        const String & mysql_database_name_,
+        mysqlxx::Pool && pool_,
+        MySQLClient && client_,
+        MaterializeMySQLSettings * settings_);
 
     void stopSynchronization();
 
@@ -55,7 +59,6 @@ public:
 
 private:
     Poco::Logger * log;
-    const Context & global_context;
 
     String database_name;
     String mysql_database_name;
@@ -90,13 +93,13 @@ private:
 
         Buffers(const String & database_) : database(database_) {}
 
-        void commit(const Context & context);
+        void commit(ContextPtr context);
 
         void add(size_t block_rows, size_t block_bytes, size_t written_rows, size_t written_bytes);
 
         bool checkThresholds(size_t check_block_rows, size_t check_block_bytes, size_t check_total_rows, size_t check_total_bytes) const;
 
-        BufferAndSortingColumnsPtr getTableDataBuffer(const String & table, const Context & context);
+        BufferAndSortingColumnsPtr getTableDataBuffer(const String & table, ContextPtr context);
     };
 
     void synchronization();
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 229c338d765..243ab9166be 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -12,12 +12,12 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
 #include <Common/escapeForFileName.h>
-#include <Poco/DirectoryIterator.h>
-#include <Poco/File.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 #include <Common/quoteString.h>
-#include <Storages/PostgreSQL/PostgreSQLConnectionPool.h>
+#include <Common/filesystemHelpers.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -35,22 +35,22 @@ static const auto suffix = ".removed";
 static const auto cleaner_reschedule_ms = 60000;
 
 DatabasePostgreSQL::DatabasePostgreSQL(
-        const Context & context,
+        ContextPtr context_,
         const String & metadata_path_,
         const ASTStorage * database_engine_define_,
         const String & dbname_,
         const String & postgres_dbname,
-        PostgreSQLConnectionPoolPtr connection_pool_,
+        postgres::PoolWithFailoverPtr connection_pool_,
         const bool cache_tables_)
     : IDatabase(dbname_)
-    , global_context(context.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
     , metadata_path(metadata_path_)
     , database_engine_define(database_engine_define_->clone())
     , dbname(postgres_dbname)
     , connection_pool(std::move(connection_pool_))
     , cache_tables(cache_tables_)
 {
-    cleaner_task = context.getSchedulePool().createTask("PostgreSQLCleanerTask", [this]{ removeOutdatedTables(); });
+    cleaner_task = getContext()->getSchedulePool().createTask("PostgreSQLCleanerTask", [this]{ removeOutdatedTables(); });
     cleaner_task->deactivate();
 }
 
@@ -69,8 +69,7 @@ bool DatabasePostgreSQL::empty() const
 }
 
 
-DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(
-        const Context & context, const FilterByNameFunction & /* filter_by_table_name */)
+DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & /* filter_by_table_name */)
 {
     std::lock_guard<std::mutex> lock(mutex);
 
@@ -79,7 +78,7 @@ DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(
 
     for (const auto & table_name : table_names)
         if (!detached_or_dropped.count(table_name))
-            tables[table_name] = fetchTable(table_name, context, true);
+            tables[table_name] = fetchTable(table_name, local_context, true);
 
     return std::make_unique<DatabaseTablesSnapshotIterator>(tables, database_name);
 }
@@ -90,8 +89,8 @@ std::unordered_set<std::string> DatabasePostgreSQL::fetchTablesList() const
     std::unordered_set<std::string> tables;
     std::string query = "SELECT tablename FROM pg_catalog.pg_tables "
         "WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'";
-    auto connection = connection_pool->get();
-    pqxx::read_transaction tx(connection->conn());
+    auto connection_holder = connection_pool->get();
+    pqxx::read_transaction tx(connection_holder->get());
 
     for (auto table_name : tx.stream<std::string>(query))
         tables.insert(std::get<0>(table_name));
@@ -109,8 +108,8 @@ bool DatabasePostgreSQL::checkPostgresTable(const String & table_name) const
             "PostgreSQL table name cannot contain single quote or backslash characters, passed {}", table_name);
     }
 
-    auto connection = connection_pool->get();
-    pqxx::nontransaction tx(connection->conn());
+    auto connection_holder = connection_pool->get();
+    pqxx::nontransaction tx(connection_holder->get());
 
     try
     {
@@ -135,7 +134,7 @@ bool DatabasePostgreSQL::checkPostgresTable(const String & table_name) const
 }
 
 
-bool DatabasePostgreSQL::isTableExist(const String & table_name, const Context & /* context */) const
+bool DatabasePostgreSQL::isTableExist(const String & table_name, ContextPtr /* context */) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
@@ -146,33 +145,38 @@ bool DatabasePostgreSQL::isTableExist(const String & table_name, const Context &
 }
 
 
-StoragePtr DatabasePostgreSQL::tryGetTable(const String & table_name, const Context & context) const
+StoragePtr DatabasePostgreSQL::tryGetTable(const String & table_name, ContextPtr local_context) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
     if (!detached_or_dropped.count(table_name))
-        return fetchTable(table_name, context, false);
+        return fetchTable(table_name, local_context, false);
 
     return StoragePtr{};
 }
 
 
-StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, const Context & context, const bool table_checked) const
+StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr local_context, const bool table_checked) const
 {
     if (!cache_tables || !cached_tables.count(table_name))
     {
         if (!table_checked && !checkPostgresTable(table_name))
             return StoragePtr{};
 
-        auto use_nulls = context.getSettingsRef().external_table_functions_use_nulls;
+        auto use_nulls = local_context->getSettingsRef().external_table_functions_use_nulls;
         auto columns = fetchPostgreSQLTableStructure(connection_pool->get(), doubleQuoteString(table_name), use_nulls);
 
         if (!columns)
             return StoragePtr{};
 
         auto storage = StoragePostgreSQL::create(
-                StorageID(database_name, table_name), table_name, std::make_shared<PostgreSQLConnectionPool>(*connection_pool),
-                ColumnsDescription{*columns}, ConstraintsDescription{}, context);
+            StorageID(database_name, table_name),
+            connection_pool,
+            table_name,
+            ColumnsDescription{*columns},
+            ConstraintsDescription{},
+            String{},
+            local_context);
 
         if (cache_tables)
             cached_tables[table_name] = storage;
@@ -206,9 +210,9 @@ void DatabasePostgreSQL::attachTable(const String & table_name, const StoragePtr
 
     detached_or_dropped.erase(table_name);
 
-    Poco::File table_marked_as_removed(getMetadataPath() + '/' + escapeForFileName(table_name) + suffix);
-    if (table_marked_as_removed.exists())
-        table_marked_as_removed.remove();
+    fs::path table_marked_as_removed = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + suffix);
+    if (fs::exists(table_marked_as_removed))
+        fs::remove(table_marked_as_removed);
 }
 
 
@@ -232,7 +236,7 @@ StoragePtr DatabasePostgreSQL::detachTable(const String & table_name)
 }
 
 
-void DatabasePostgreSQL::createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
+void DatabasePostgreSQL::createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query)
 {
     const auto & create = create_query->as<ASTCreateQuery>();
 
@@ -243,7 +247,7 @@ void DatabasePostgreSQL::createTable(const Context &, const String & table_name,
 }
 
 
-void DatabasePostgreSQL::dropTable(const Context &, const String & table_name, bool /* no_delay */)
+void DatabasePostgreSQL::dropTable(ContextPtr, const String & table_name, bool /* no_delay */)
 {
     std::lock_guard<std::mutex> lock{mutex};
 
@@ -253,16 +257,8 @@ void DatabasePostgreSQL::dropTable(const Context &, const String & table_name, b
     if (detached_or_dropped.count(table_name))
         throw Exception(fmt::format("Table {}.{} is already dropped/detached", database_name, table_name), ErrorCodes::TABLE_IS_DROPPED);
 
-    Poco::File mark_table_removed(getMetadataPath() + '/' + escapeForFileName(table_name) + suffix);
-
-    try
-    {
-        mark_table_removed.createFile();
-    }
-    catch (...)
-    {
-        throw;
-    }
+    fs::path mark_table_removed = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + suffix);
+    FS::createFile(mark_table_removed);
 
     if (cache_tables)
         cached_tables.erase(table_name);
@@ -271,24 +267,24 @@ void DatabasePostgreSQL::dropTable(const Context &, const String & table_name, b
 }
 
 
-void DatabasePostgreSQL::drop(const Context & /*context*/)
+void DatabasePostgreSQL::drop(ContextPtr /*context*/)
 {
-    Poco::File(getMetadataPath()).remove(true);
+    fs::remove_all(getMetadataPath());
 }
 
 
-void DatabasePostgreSQL::loadStoredObjects(Context & /* context */, bool, bool /*force_attach*/)
+void DatabasePostgreSQL::loadStoredObjects(ContextMutablePtr /* context */, bool, bool /*force_attach*/)
 {
     {
         std::lock_guard<std::mutex> lock{mutex};
-        Poco::DirectoryIterator iterator(getMetadataPath());
+        fs::directory_iterator iter(getMetadataPath());
 
         /// Check for previously dropped tables
-        for (Poco::DirectoryIterator end; iterator != end; ++iterator)
+        for (fs::directory_iterator end; iter != end; ++iter)
         {
-            if (iterator->isFile() && endsWith(iterator.name(), suffix))
+            if (fs::is_regular_file(iter->path()) && endsWith(iter->path().filename(), suffix))
             {
-                const auto & file_name = iterator.name();
+                const auto & file_name = iter->path().filename().string();
                 const auto & table_name = unescapeForFileName(file_name.substr(0, file_name.size() - strlen(suffix)));
                 detached_or_dropped.emplace(table_name);
             }
@@ -322,9 +318,9 @@ void DatabasePostgreSQL::removeOutdatedTables()
         {
             auto table_name = *iter;
             iter = detached_or_dropped.erase(iter);
-            Poco::File table_marked_as_removed(getMetadataPath() + '/' + escapeForFileName(table_name) + suffix);
-            if (table_marked_as_removed.exists())
-                table_marked_as_removed.remove();
+            fs::path table_marked_as_removed = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + suffix);
+            if (fs::exists(table_marked_as_removed))
+                fs::remove(table_marked_as_removed);
         }
         else
             ++iter;
@@ -349,9 +345,9 @@ ASTPtr DatabasePostgreSQL::getCreateDatabaseQuery() const
 }
 
 
-ASTPtr DatabasePostgreSQL::getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const
+ASTPtr DatabasePostgreSQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const
 {
-    auto storage = fetchTable(table_name, context, false);
+    auto storage = fetchTable(table_name, local_context, false);
     if (!storage)
     {
         if (throw_on_error)
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index 7be34df2123..3c3a67ec9d3 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -9,14 +9,13 @@
 #include <Databases/DatabasesCommon.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Storages/PostgreSQL/PoolWithFailover.h>
 
 
 namespace DB
 {
 
 class Context;
-class PostgreSQLConnectionPool;
-using PostgreSQLConnectionPoolPtr = std::shared_ptr<PostgreSQLConnectionPool>;
 
 
 /** Real-time access to table list and table structure from remote PostgreSQL.
@@ -24,18 +23,18 @@ using PostgreSQLConnectionPoolPtr = std::shared_ptr<PostgreSQLConnectionPool>;
  *  If `cache_tables` == 1 (default: 0) table structure is cached and not checked for being modififed,
  *  but it will be updated during detach->attach.
  */
-class DatabasePostgreSQL final : public IDatabase
+class DatabasePostgreSQL final : public IDatabase, WithContext
 {
 
 public:
     DatabasePostgreSQL(
-        const Context & context,
+        ContextPtr context,
         const String & metadata_path_,
         const ASTStorage * database_engine_define,
         const String & dbname_,
         const String & postgres_dbname,
-        PostgreSQLConnectionPoolPtr connection_pool_,
-        const bool cache_tables_);
+        postgres::PoolWithFailoverPtr connection_pool_,
+        bool cache_tables_);
 
     String getEngineName() const override { return "PostgreSQL"; }
     String getMetadataPath() const override { return metadata_path; }
@@ -48,31 +47,30 @@ public:
 
     bool empty() const override;
 
-    void loadStoredObjects(Context &, bool, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(const Context & context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
 
-    bool isTableExist(const String & name, const Context & context) const override;
-    StoragePtr tryGetTable(const String & name, const Context & context) const override;
+    bool isTableExist(const String & name, ContextPtr context) const override;
+    StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
-    void createTable(const Context &, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
-    void dropTable(const Context &, const String & table_name, bool no_delay) override;
+    void createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
+    void dropTable(ContextPtr, const String & table_name, bool no_delay) override;
 
     void attachTable(const String & table_name, const StoragePtr & storage, const String & relative_table_path) override;
     StoragePtr detachTable(const String & table_name) override;
 
-    void drop(const Context & /*context*/) override;
+    void drop(ContextPtr /*context*/) override;
     void shutdown() override;
 
 protected:
-    ASTPtr getCreateTableQueryImpl(const String & table_name, const Context & context, bool throw_on_error) const override;
+    ASTPtr getCreateTableQueryImpl(const String & table_name, ContextPtr context, bool throw_on_error) const override;
 
 private:
-    const Context & global_context;
     String metadata_path;
     ASTPtr database_engine_define;
     String dbname;
-    PostgreSQLConnectionPoolPtr connection_pool;
+    postgres::PoolWithFailoverPtr connection_pool;
     const bool cache_tables;
 
     mutable Tables cached_tables;
@@ -81,7 +79,7 @@ private:
 
     bool checkPostgresTable(const String & table_name) const;
     std::unordered_set<std::string> fetchTablesList() const;
-    StoragePtr fetchTable(const String & table_name, const Context & context, const bool table_checked) const;
+    StoragePtr fetchTable(const String & table_name, ContextPtr context, bool table_checked) const;
     void removeOutdatedTables();
     ASTPtr getColumnDeclaration(const DataTypePtr & data_type) const;
 };
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
index 4887b47d98a..2eb10bf273f 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
@@ -25,7 +25,7 @@ namespace ErrorCodes
 }
 
 
-static DataTypePtr convertPostgreSQLDataType(std::string & type, bool is_nullable, uint16_t dimensions)
+static DataTypePtr convertPostgreSQLDataType(String & type, bool is_nullable, uint16_t dimensions)
 {
     DataTypePtr res;
 
@@ -40,6 +40,8 @@ static DataTypePtr convertPostgreSQLDataType(std::string & type, bool is_nullabl
         res = std::make_shared<DataTypeInt32>();
     else if (type == "bigint")
         res = std::make_shared<DataTypeInt64>();
+    else if (type == "boolean")
+        res = std::make_shared<DataTypeUInt8>();
     else if (type == "real")
         res = std::make_shared<DataTypeFloat32>();
     else if (type == "double precision")
@@ -65,11 +67,11 @@ static DataTypePtr convertPostgreSQLDataType(std::string & type, bool is_nullabl
 
             if (precision <= DecimalUtils::max_precision<Decimal32>)
                 res = std::make_shared<DataTypeDecimal<Decimal32>>(precision, scale);
-            else if (precision <= DecimalUtils::max_precision<Decimal64>)
+            else if (precision <= DecimalUtils::max_precision<Decimal64>) //-V547
                 res = std::make_shared<DataTypeDecimal<Decimal64>>(precision, scale);
-            else if (precision <= DecimalUtils::max_precision<Decimal128>)
+            else if (precision <= DecimalUtils::max_precision<Decimal128>) //-V547
                 res = std::make_shared<DataTypeDecimal<Decimal128>>(precision, scale);
-            else if (precision <= DecimalUtils::max_precision<Decimal256>)
+            else if (precision <= DecimalUtils::max_precision<Decimal256>) //-V547
                 res = std::make_shared<DataTypeDecimal<Decimal256>>(precision, scale);
             else
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Precision {} and scale {} are too big and not supported", precision, scale);
@@ -94,7 +96,7 @@ static DataTypePtr convertPostgreSQLDataType(std::string & type, bool is_nullabl
 
 
 std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
-    PostgreSQLConnectionHolderPtr connection, const String & postgres_table_name, bool use_nulls)
+    postgres::ConnectionHolderPtr connection_holder, const String & postgres_table_name, bool use_nulls)
 {
     auto columns = NamesAndTypesList();
 
@@ -113,7 +115,7 @@ std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
            "AND NOT attisdropped AND attnum > 0", postgres_table_name);
     try
     {
-        pqxx::read_transaction tx(connection->conn());
+        pqxx::read_transaction tx(connection_holder->get());
         pqxx::stream_from stream(tx, pqxx::from_query, std::string_view(query));
 
         std::tuple<std::string, std::string, std::string, uint16_t> row;
@@ -133,7 +135,7 @@ std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
     {
         throw Exception(fmt::format(
                     "PostgreSQL table {}.{} does not exist",
-                    connection->conn().dbname(), postgres_table_name), ErrorCodes::UNKNOWN_TABLE);
+                    connection_holder->get().dbname(), postgres_table_name), ErrorCodes::UNKNOWN_TABLE);
     }
     catch (Exception & e)
     {
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
index 96305349062..331c1de49d2 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
@@ -5,14 +5,15 @@
 #endif
 
 #if USE_LIBPQXX
-#include <Storages/StoragePostgreSQL.h>
+#include <Storages/PostgreSQL/ConnectionHolder.h>
+#include <Core/NamesAndTypes.h>
 
 
 namespace DB
 {
 
 std::shared_ptr<NamesAndTypesList> fetchPostgreSQLTableStructure(
-    PostgreSQLConnectionHolderPtr connection, const String & postgres_table_name, bool use_nulls);
+    postgres::ConnectionHolderPtr connection_holder, const String & postgres_table_name, bool use_nulls);
 
 }
 
diff --git a/src/Databases/ya.make b/src/Databases/ya.make
index 8bd3f291a64..e1b61ee4d26 100644
--- a/src/Databases/ya.make
+++ b/src/Databases/ya.make
@@ -19,7 +19,6 @@ SRCS(
     DatabaseReplicated.cpp
     DatabaseReplicatedSettings.cpp
     DatabaseReplicatedWorker.cpp
-    DatabaseWithDictionaries.cpp
     DatabasesCommon.cpp
     MySQL/ConnectionMySQLSettings.cpp
     MySQL/DatabaseConnectionMySQL.cpp
diff --git a/src/Databases/ya.make.in b/src/Databases/ya.make.in
index b0e8faf223c..cb8b23b43af 100644
--- a/src/Databases/ya.make.in
+++ b/src/Databases/ya.make.in
@@ -8,7 +8,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F 'PostgreSQL' | sed 's/^\.\//    /' | sort ?>
+<? 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 563c0f3914b..540b9178f26 100644
--- a/src/Dictionaries/CMakeLists.txt
+++ b/src/Dictionaries/CMakeLists.txt
@@ -1,8 +1,8 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 
 add_headers_and_sources(clickhouse_dictionaries .)
 
-add_headers_and_sources(clickhouse_dictionaries ${CMAKE_CURRENT_BINARY_DIR}/generated/)
+add_headers_and_sources(clickhouse_dictionaries "${CMAKE_CURRENT_BINARY_DIR}/generated/")
 
 list(REMOVE_ITEM clickhouse_dictionaries_sources DictionaryFactory.cpp DictionarySourceFactory.cpp DictionaryStructure.cpp getDictionaryConfigurationFromAST.cpp)
 list(REMOVE_ITEM clickhouse_dictionaries_headers DictionaryFactory.h DictionarySourceFactory.h DictionaryStructure.h getDictionaryConfigurationFromAST.h)
diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 535e862af40..9bb8b34e74e 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -70,7 +70,7 @@ CacheDictionary<dictionary_key_type>::CacheDictionary(
     , rnd_engine(randomSeed())
 {
     if (!source_ptr->supportsSelectiveLoad())
-        throw Exception{full_name + ": source cannot be used with CacheDictionary", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "{}: source cannot be used with CacheDictionary", full_name);
 }
 
 template <DictionaryKeyType dictionary_key_type>
@@ -133,7 +133,7 @@ ColumnPtr CacheDictionary<dictionary_key_type>::getColumn(
 template <DictionaryKeyType dictionary_key_type>
 Columns CacheDictionary<dictionary_key_type>::getColumns(
     const Strings & attribute_names,
-    const DataTypes &,
+    const DataTypes & result_types,
     const Columns & key_columns,
     const DataTypes & key_types,
     const Columns & default_values_columns) const
@@ -159,7 +159,7 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
     DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
     auto keys = extractor.extractAllKeys();
 
-    DictionaryStorageFetchRequest request(dict_struct, attribute_names, default_values_columns);
+    DictionaryStorageFetchRequest request(dict_struct, attribute_names, result_types, default_values_columns);
 
     FetchResult result_of_fetch_from_storage;
 
@@ -176,8 +176,9 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
     ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, expired_keys_size);
     ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, not_found_keys_size);
 
-    query_count.fetch_add(keys.size());
-    hit_count.fetch_add(found_keys_size);
+    query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+    hit_count.fetch_add(found_keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(found_keys_size, std::memory_order_relaxed);
 
     MutableColumns & fetched_columns_from_storage = result_of_fetch_from_storage.fetched_columns;
     const PaddedPODArray<KeyState> & key_index_to_state_from_storage = result_of_fetch_from_storage.key_index_to_state;
@@ -277,7 +278,7 @@ ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::hasKeys(const Columns & k
     const auto keys = extractor.extractAllKeys();
 
     /// We make empty request just to fetch if keys exists
-    DictionaryStorageFetchRequest request(dict_struct, {}, {});
+    DictionaryStorageFetchRequest request(dict_struct, {}, {}, {});
 
     FetchResult result_of_fetch_from_storage;
 
@@ -296,8 +297,9 @@ ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::hasKeys(const Columns & k
     ProfileEvents::increment(ProfileEvents::DictCacheKeysExpired, expired_keys_size);
     ProfileEvents::increment(ProfileEvents::DictCacheKeysNotFound, not_found_keys_size);
 
-    query_count.fetch_add(keys.size());
-    hit_count.fetch_add(found_keys_size);
+    query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+    hit_count.fetch_add(found_keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(found_keys_size, std::memory_order_relaxed);
 
     size_t keys_to_update_size = expired_keys_size + not_found_keys_size;
     auto update_unit = std::make_shared<CacheDictionaryUpdateUnit<dictionary_key_type>>(key_columns, result_of_fetch_from_storage.key_index_to_state, request, keys_to_update_size);
@@ -365,8 +367,10 @@ ColumnPtr CacheDictionary<dictionary_key_type>::getHierarchy(
 {
     if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type);
+        size_t keys_found;
+        auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type, keys_found);
         query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
         return result;
     }
     else
@@ -381,8 +385,10 @@ ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::isInHierarchy(
 {
     if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type);
+        size_t keys_found;
+        auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type, keys_found);
         query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
         return result;
     }
     else
@@ -520,8 +526,6 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
     */
     CurrentMetrics::Increment metric_increment{CurrentMetrics::DictCacheRequests};
 
-    size_t found_keys_size = 0;
-
     Arena * complex_key_arena = update_unit_ptr->complex_keys_arena_holder.getComplexKeyArena();
     DictionaryKeysExtractor<dictionary_key_type> requested_keys_extractor(update_unit_ptr->key_columns, complex_key_arena);
     auto requested_keys = requested_keys_extractor.extractAllKeys();
@@ -610,9 +614,8 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
                     auto fetched_key_from_source = keys_extracted_from_block[i];
 
                     not_found_keys.erase(fetched_key_from_source);
-                    update_unit_ptr->requested_keys_to_fetched_columns_during_update_index[fetched_key_from_source] = found_keys_size;
+                    update_unit_ptr->requested_keys_to_fetched_columns_during_update_index[fetched_key_from_source] = found_keys_in_source.size();
                     found_keys_in_source.emplace_back(fetched_key_from_source);
-                    ++found_keys_size;
                 }
             }
 
@@ -666,9 +669,13 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
             }
         }
 
+        /// The underlying source can have duplicates, so count only unique keys this formula is used.
+        size_t found_keys_size = requested_keys_size - not_found_keys.size();
         ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedMiss, requested_keys_size - found_keys_size);
         ProfileEvents::increment(ProfileEvents::DictCacheKeysRequestedFound, found_keys_size);
         ProfileEvents::increment(ProfileEvents::DictCacheRequests);
+
+        found_count.fetch_add(found_keys_size, std::memory_order_relaxed);
     }
     else
     {
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 62cd509d006..baaf99d290b 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -75,9 +75,20 @@ public:
 
     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 static_cast<double>(hit_count.load(std::memory_order_acquire)) / query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load(std::memory_order_relaxed);
+        if (!queries)
+            return 0;
+        return static_cast<double>(hit_count.load(std::memory_order_acquire)) / queries;
     }
 
     bool supportUpdates() const override { return false; }
@@ -204,6 +215,7 @@ private:
 
     mutable std::atomic<size_t> hit_count{0};
     mutable std::atomic<size_t> query_count{0};
+    mutable std::atomic<size_t> found_count{0};
 
 };
 
diff --git a/src/Dictionaries/CacheDictionaryStorage.h b/src/Dictionaries/CacheDictionaryStorage.h
index 98031801b11..a79d83eea05 100644
--- a/src/Dictionaries/CacheDictionaryStorage.h
+++ b/src/Dictionaries/CacheDictionaryStorage.h
@@ -77,7 +77,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
         else
-            throw Exception("Method fetchColumnsForKeys is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for complex key storage");
     }
 
     void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) override
@@ -85,7 +85,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             insertColumnsForKeysImpl(keys, columns);
         else
-            throw Exception("Method insertColumnsForKeys is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
     }
 
     void insertDefaultKeys(const PaddedPODArray<UInt64> & keys) override
@@ -93,7 +93,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             insertDefaultKeysImpl(keys);
         else
-            throw Exception("Method insertDefaultKeysImpl is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for complex key storage");
     }
 
     PaddedPODArray<UInt64> getCachedSimpleKeys() const override
@@ -101,7 +101,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             return getCachedKeysImpl();
         else
-            throw Exception("Method getCachedSimpleKeys is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for complex key storage");
     }
 
     bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::complex; }
@@ -113,7 +113,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, column_fetch_requests);
         else
-            throw Exception("Method fetchColumnsForKeys is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
     }
 
     void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) override
@@ -121,7 +121,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             insertColumnsForKeysImpl(keys, columns);
         else
-            throw Exception("Method insertColumnsForKeys is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for simple key storage");
     }
 
     void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) override
@@ -129,7 +129,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             insertDefaultKeysImpl(keys);
         else
-            throw Exception("Method insertDefaultKeysImpl is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for simple key storage");
     }
 
     PaddedPODArray<StringRef> getCachedComplexKeys() const override
@@ -137,7 +137,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             return getCachedKeysImpl();
         else
-            throw Exception("Method getCachedComplexKeys is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedComplexKeys is not supported for simple key storage");
     }
 
     size_t getSize() const override { return size; }
@@ -594,15 +594,20 @@ private:
             PaddedPODArray<UInt32>,
             PaddedPODArray<UInt64>,
             PaddedPODArray<UInt128>,
+            PaddedPODArray<UInt256>,
             PaddedPODArray<Int8>,
             PaddedPODArray<Int16>,
             PaddedPODArray<Int32>,
             PaddedPODArray<Int64>,
+            PaddedPODArray<Int128>,
+            PaddedPODArray<Int256>,
             PaddedPODArray<Decimal32>,
             PaddedPODArray<Decimal64>,
             PaddedPODArray<Decimal128>,
+            PaddedPODArray<Decimal256>,
             PaddedPODArray<Float32>,
             PaddedPODArray<Float64>,
+            PaddedPODArray<UUID>,
             PaddedPODArray<StringRef>,
             std::vector<Field>> attribute_container;
     };
diff --git a/src/Dictionaries/CacheDictionaryUpdateQueue.cpp b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
index eca833f62da..310abed822f 100644
--- a/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
+++ b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
@@ -49,11 +49,10 @@ template <DictionaryKeyType dictionary_key_type>
 void CacheDictionaryUpdateQueue<dictionary_key_type>::tryPushToUpdateQueueOrThrow(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr)
 {
     if (finished)
-        throw Exception{"CacheDictionaryUpdateQueue finished", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "CacheDictionaryUpdateQueue finished");
 
     if (!update_queue.tryPush(update_unit_ptr, configuration.update_queue_push_timeout_milliseconds))
-        throw DB::Exception(
-            ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
+        throw DB::Exception(ErrorCodes::CACHE_DICTIONARY_UPDATE_FAIL,
             "Cannot push to internal update queue in dictionary {}. "
             "Timelimit of {} ms. exceeded. Current queue size is {}",
             dictionary_name_for_logs,
@@ -65,7 +64,7 @@ template <DictionaryKeyType dictionary_key_type>
 void CacheDictionaryUpdateQueue<dictionary_key_type>::waitForCurrentUpdateFinish(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr) const
 {
     if (finished)
-        throw Exception{"CacheDictionaryUpdateQueue finished", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "CacheDictionaryUpdateQueue finished");
 
     std::unique_lock<std::mutex> update_lock(update_mutex);
 
diff --git a/src/Dictionaries/CassandraBlockInputStream.cpp b/src/Dictionaries/CassandraBlockInputStream.cpp
index 721cb44a82e..9afc0069d48 100644
--- a/src/Dictionaries/CassandraBlockInputStream.cpp
+++ b/src/Dictionaries/CassandraBlockInputStream.cpp
@@ -138,11 +138,11 @@ void CassandraBlockInputStream::insertValue(IColumn & column, ValueType type, co
             cass_value_get_uuid(cass_value, &value);
             std::array<char, CASS_UUID_STRING_LENGTH> uuid_str;
             cass_uuid_string(value, uuid_str.data());
-            assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(uuid_str.data(), uuid_str.size()));
+            assert_cast<ColumnUUID &>(column).insert(parse<UUID>(uuid_str.data(), uuid_str.size()));
             break;
         }
         default:
-            throw Exception("Unknown type : " + std::to_string(static_cast<int>(type)), ErrorCodes::UNKNOWN_TYPE);
+            throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type : {}", std::to_string(static_cast<int>(type)));
     }
 }
 
@@ -256,7 +256,7 @@ void CassandraBlockInputStream::assertTypes(const CassResultPtr & result)
                 expected_text = "uuid";
                 break;
             default:
-                throw Exception("Unknown type : " + std::to_string(static_cast<int>(description.types[i].first)), ErrorCodes::UNKNOWN_TYPE);
+                throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type : {}", std::to_string(static_cast<int>(description.types[i].first)));
         }
 
         CassValueType got = cass_result_column_type(result, i);
@@ -267,8 +267,10 @@ void CassandraBlockInputStream::assertTypes(const CassResultPtr & result)
                 continue;
 
             const auto & column_name = description.sample_block.getColumnsWithTypeAndName()[i].name;
-            throw Exception("Type mismatch for column " + column_name + ": expected Cassandra type " + expected_text,
-                            ErrorCodes::TYPE_MISMATCH);
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "Type mismatch for column {} : expected Cassandra type {}",
+                column_name,
+                expected_text);
         }
     }
 
diff --git a/src/Dictionaries/CassandraDictionarySource.cpp b/src/Dictionaries/CassandraDictionarySource.cpp
index 643e9af54b8..b91ce6c82c9 100644
--- a/src/Dictionaries/CassandraDictionarySource.cpp
+++ b/src/Dictionaries/CassandraDictionarySource.cpp
@@ -17,16 +17,16 @@ void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
                                    [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
                                    [[maybe_unused]] const std::string & config_prefix,
                                    [[maybe_unused]] Block & sample_block,
-                                                    const Context & /* context */,
+                                                    ContextConstPtr /* context */,
                                                     const std::string & /* default_database */,
-                                                    bool /*check_config*/) -> DictionarySourcePtr
+                                                    bool /*created_from_ddl*/) -> DictionarySourcePtr
     {
 #if USE_CASSANDRA
     setupCassandraDriverLibraryLogging(CASS_LOG_INFO);
     return std::make_unique<CassandraDictionarySource>(dict_struct, config, config_prefix + ".cassandra", sample_block);
 #else
-    throw Exception{"Dictionary source of type `cassandra` is disabled because ClickHouse was built without cassandra support.",
-                    ErrorCodes::SUPPORT_IS_DISABLED};
+    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+        "Dictionary source of type `cassandra` is disabled because ClickHouse was built without cassandra support.");
 #endif
     };
     factory.registerSource("cassandra", create_table_source);
@@ -90,7 +90,7 @@ void CassandraSettings::setConsistency(const String & config_str)
     else if (config_str == "LocalSerial")
         consistency = CASS_CONSISTENCY_LOCAL_SERIAL;
     else    /// CASS_CONSISTENCY_ANY is only valid for writes
-        throw Exception("Unsupported consistency level: " + config_str, ErrorCodes::INVALID_CONFIG_PARAMETER);
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Unsupported consistency level: {}", config_str);
 }
 
 static const size_t max_block_size = 8192;
@@ -156,7 +156,7 @@ BlockInputStreamPtr CassandraDictionarySource::loadIds(const std::vector<UInt64>
 BlockInputStreamPtr CassandraDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     if (requested_rows.empty())
-        throw Exception("No rows requested", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No rows requested");
 
     /// TODO is there a better way to load data by complex keys?
     std::unordered_map<UInt64, std::vector<size_t>> partitions;
@@ -185,7 +185,7 @@ BlockInputStreamPtr CassandraDictionarySource::loadKeys(const Columns & key_colu
 
 BlockInputStreamPtr CassandraDictionarySource::loadUpdatedAll()
 {
-    throw Exception("Method loadUpdatedAll is unsupported for CassandraDictionarySource", ErrorCodes::NOT_IMPLEMENTED);
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for CassandraDictionarySource");
 }
 
 CassSessionShared CassandraDictionarySource::getSession()
diff --git a/src/Dictionaries/CassandraHelpers.cpp b/src/Dictionaries/CassandraHelpers.cpp
index 6de80a455c7..81f7d6d9a63 100644
--- a/src/Dictionaries/CassandraHelpers.cpp
+++ b/src/Dictionaries/CassandraHelpers.cpp
@@ -16,8 +16,10 @@ extern const int CASSANDRA_INTERNAL_ERROR;
 void cassandraCheck(CassError code)
 {
     if (code != CASS_OK)
-        throw Exception("Cassandra driver error " + std::to_string(code) + ": " + cass_error_desc(code),
-                        ErrorCodes::CASSANDRA_INTERNAL_ERROR);
+        throw Exception(ErrorCodes::CASSANDRA_INTERNAL_ERROR,
+            "Cassandra driver error {}: {}",
+            std::to_string(code),
+            cass_error_desc(code));
 }
 
 
@@ -31,8 +33,12 @@ void cassandraWaitAndCheck(CassFuturePtr & future)
     const char * message;
     size_t message_len;
     cass_future_error_message(future, &message, & message_len);
-    std::string full_message = "Cassandra driver error " + std::to_string(code) + ": " + cass_error_desc(code) + ": " + message;
-    throw Exception(full_message, ErrorCodes::CASSANDRA_INTERNAL_ERROR);
+
+    throw Exception(ErrorCodes::CASSANDRA_INTERNAL_ERROR,
+        "Cassandra driver error {}: {}: {}",
+        std::to_string(code),
+        cass_error_desc(code),
+        message);
 }
 
 static std::once_flag setup_logging_flag;
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index 5e69df2c8a0..9e44a7b442d 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -18,100 +18,75 @@
 namespace DB
 {
 
-static const size_t MAX_CONNECTIONS = 16;
-
-inline static UInt16 getPortFromContext(const Context & context, bool secure)
+namespace ErrorCodes
 {
-    return secure ? context.getTCPPortSecure().value_or(0) : context.getTCPPort();
+    extern const int BAD_ARGUMENTS;
 }
 
-static ConnectionPoolWithFailoverPtr createPool(
-    const std::string & host,
-    UInt16 port,
-    bool secure,
-    const std::string & db,
-    const std::string & user,
-    const std::string & password)
+namespace
 {
-    ConnectionPoolPtrs pools;
-    pools.emplace_back(std::make_shared<ConnectionPool>(
-        MAX_CONNECTIONS,
-        host,
-        port,
-        db,
-        user,
-        password,
-        "", /* cluster */
-        "", /* cluster_secret */
-        "ClickHouseDictionarySource",
-        Protocol::Compression::Enable,
-        secure ? Protocol::Secure::Enable : Protocol::Secure::Disable));
-    return std::make_shared<ConnectionPoolWithFailover>(pools, LoadBalancing::RANDOM);
-}
+    constexpr size_t MAX_CONNECTIONS = 16;
 
+    inline UInt16 getPortFromContext(ContextConstPtr context, bool secure)
+    {
+        return secure ? context->getTCPPortSecure().value_or(0) : context->getTCPPort();
+    }
+
+    ConnectionPoolWithFailoverPtr createPool(const ClickHouseDictionarySource::Configuration & configuration)
+    {
+        if (configuration.is_local)
+            return nullptr;
+
+        ConnectionPoolPtrs pools;
+        pools.emplace_back(std::make_shared<ConnectionPool>(
+            MAX_CONNECTIONS,
+            configuration.host,
+            configuration.port,
+            configuration.db,
+            configuration.user,
+            configuration.password,
+            "", /* cluster */
+            "", /* cluster_secret */
+            "ClickHouseDictionarySource",
+            Protocol::Compression::Enable,
+            configuration.secure ? Protocol::Secure::Enable : Protocol::Secure::Disable));
+
+        return std::make_shared<ConnectionPoolWithFailover>(pools, LoadBalancing::RANDOM);
+    }
+
+}
 
 ClickHouseDictionarySource::ClickHouseDictionarySource(
     const DictionaryStructure & dict_struct_,
-    const Poco::Util::AbstractConfiguration & config,
-    const std::string & path_to_settings,
-    const std::string & config_prefix,
+    const Configuration & configuration_,
     const Block & sample_block_,
-    const Context & context_,
-    const std::string & default_database)
+    ContextConstPtr context_)
     : update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
-    , secure(config.getBool(config_prefix + ".secure", false))
-    , host{config.getString(config_prefix + ".host", "localhost")}
-    , port(config.getInt(config_prefix + ".port", getPortFromContext(context_, secure)))
-    , user{config.getString(config_prefix + ".user", "default")}
-    , password{config.getString(config_prefix + ".password", "")}
-    , db{config.getString(config_prefix + ".db", default_database)}
-    , table{config.getString(config_prefix + ".table")}
-    , where{config.getString(config_prefix + ".where", "")}
-    , update_field{config.getString(config_prefix + ".update_field", "")}
-    , invalidate_query{config.getString(config_prefix + ".invalidate_query", "")}
-    , query_builder{dict_struct, db, "", table, where, IdentifierQuotingStyle::Backticks}
+    , configuration{configuration_}
+    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks}
     , sample_block{sample_block_}
-    , context(context_)
-    , is_local{isLocalAddress({host, port}, getPortFromContext(context_, secure))}
-    , pool{is_local ? nullptr : createPool(host, port, secure, db, user, password)}
+    , context(Context::createCopy(context_))
+    , pool{createPool(configuration)}
     , load_all_query{query_builder.composeLoadAllQuery()}
 {
-    /// We should set user info even for the case when the dictionary is loaded in-process (without TCP communication).
-    if (is_local)
-    {
-        context.setUser(user, password, Poco::Net::SocketAddress("127.0.0.1", 0));
-        context = copyContextAndApplySettings(path_to_settings, context, config);
-    }
-
     /// Query context is needed because some code in executeQuery function may assume it exists.
     /// Current example is Context::getSampleBlockCache from InterpreterSelectWithUnionQuery::getSampleBlock.
-    context.makeQueryContext();
+    context->makeQueryContext();
 }
 
-
 ClickHouseDictionarySource::ClickHouseDictionarySource(const ClickHouseDictionarySource & other)
     : update_time{other.update_time}
     , dict_struct{other.dict_struct}
-    , secure{other.secure}
-    , host{other.host}
-    , port{other.port}
-    , user{other.user}
-    , password{other.password}
-    , db{other.db}
-    , table{other.table}
-    , where{other.where}
-    , update_field{other.update_field}
-    , invalidate_query{other.invalidate_query}
+    , configuration{other.configuration}
     , invalidate_query_response{other.invalidate_query_response}
-    , query_builder{dict_struct, db, "", table, where, IdentifierQuotingStyle::Backticks}
+    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks}
     , sample_block{other.sample_block}
-    , context(other.context)
-    , is_local{other.is_local}
-    , pool{is_local ? nullptr : createPool(host, port, secure, db, user, password)}
+    , context(Context::createCopy(other.context))
+    , pool{createPool(configuration)}
     , load_all_query{other.load_all_query}
 {
-    context.makeQueryContext();
+    context->makeQueryContext();
 }
 
 std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
@@ -121,7 +96,7 @@ std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
         time_t hr_time = std::chrono::system_clock::to_time_t(update_time) - 1;
         std::string str_time = DateLUT::instance().timeToString(hr_time);
         update_time = std::chrono::system_clock::now();
-        return query_builder.composeUpdateQuery(update_field, str_time);
+        return query_builder.composeUpdateQuery(configuration.update_field, str_time);
     }
     else
     {
@@ -130,6 +105,11 @@ std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
     }
 }
 
+BlockInputStreamPtr ClickHouseDictionarySource::loadAllWithSizeHint(std::atomic<size_t> * result_size_hint)
+{
+    return createStreamForQuery(load_all_query, result_size_hint);
+}
+
 BlockInputStreamPtr ClickHouseDictionarySource::loadAll()
 {
     return createStreamForQuery(load_all_query);
@@ -155,9 +135,9 @@ BlockInputStreamPtr ClickHouseDictionarySource::loadKeys(const Columns & key_col
 
 bool ClickHouseDictionarySource::isModified() const
 {
-    if (!invalidate_query.empty())
+    if (!configuration.invalidate_query.empty())
     {
-        auto response = doInvalidateQuery(invalidate_query);
+        auto response = doInvalidateQuery(configuration.invalidate_query);
         LOG_TRACE(log, "Invalidate query has returned: {}, previous value: {}", response, invalidate_query_response);
         if (invalidate_query_response == response)
             return false;
@@ -168,36 +148,49 @@ bool ClickHouseDictionarySource::isModified() const
 
 bool ClickHouseDictionarySource::hasUpdateField() const
 {
-    return !update_field.empty();
+    return !configuration.update_field.empty();
 }
 
 std::string ClickHouseDictionarySource::toString() const
 {
-    return "ClickHouse: " + db + '.' + table + (where.empty() ? "" : ", where: " + where);
+    const std::string & where = configuration.where;
+    return "ClickHouse: " + configuration.db + '.' + configuration.table + (where.empty() ? "" : ", where: " + where);
 }
 
-
-BlockInputStreamPtr ClickHouseDictionarySource::createStreamForQuery(const String & query)
+BlockInputStreamPtr ClickHouseDictionarySource::createStreamForQuery(const String & query, std::atomic<size_t> * result_size_hint)
 {
+    BlockInputStreamPtr stream;
+
     /// Sample block should not contain first row default values
     auto empty_sample_block = sample_block.cloneEmpty();
 
-    if (is_local)
+    if (configuration.is_local)
     {
-        auto stream = executeQuery(query, context, true).getInputStream();
+        stream = executeQuery(query, context, true).getInputStream();
         stream = std::make_shared<ConvertingBlockInputStream>(stream, empty_sample_block, ConvertingBlockInputStream::MatchColumnsMode::Position);
-        return stream;
+    }
+    else
+    {
+        stream = std::make_shared<RemoteBlockInputStream>(pool, query, empty_sample_block, context);
     }
 
-    return std::make_shared<RemoteBlockInputStream>(pool, query, empty_sample_block, context);
+    if (result_size_hint)
+    {
+        stream->setProgressCallback([result_size_hint](const Progress & progress)
+        {
+            *result_size_hint += progress.total_rows_to_read;
+        });
+    }
+
+    return stream;
 }
 
 std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & request) const
 {
     LOG_TRACE(log, "Performing invalidate query");
-    if (is_local)
+    if (configuration.is_local)
     {
-        Context query_context = context;
+        auto query_context = Context::createCopy(context);
         auto input_block = executeQuery(request, query_context, true).getInputStream();
         return readInvalidateQuery(*input_block);
     }
@@ -210,20 +203,55 @@ std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & re
     }
 }
 
-
 void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
-                                 const std::string & default_database,
-                                 bool /* check_config */) -> DictionarySourcePtr
+                                 ContextConstPtr context,
+                                 const std::string & default_database [[maybe_unused]],
+                                 bool /* created_from_ddl */) -> DictionarySourcePtr
     {
-        return std::make_unique<ClickHouseDictionarySource>(
-            dict_struct, config, config_prefix, config_prefix + ".clickhouse", sample_block, context, default_database);
+        bool secure = config.getBool(config_prefix + ".secure", false);
+        auto context_copy = Context::createCopy(context);
+
+        UInt16 default_port = getPortFromContext(context_copy, secure);
+
+        std::string settings_config_prefix = config_prefix + ".clickhouse";
+        std::string host = config.getString(settings_config_prefix + ".host", "localhost");
+        UInt16 port = static_cast<UInt16>(config.getUInt(settings_config_prefix + ".port", default_port));
+
+        ClickHouseDictionarySource::Configuration configuration {
+            .secure = config.getBool(settings_config_prefix + ".secure", false),
+            .host = host,
+            .port = port,
+            .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"),
+            .where = config.getString(settings_config_prefix + ".where", ""),
+            .update_field = config.getString(settings_config_prefix + ".update_field", ""),
+            .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
+            .is_local = isLocalAddress({host, port}, default_port)
+        };
+
+        /// We should set user info even for the case when the dictionary is loaded in-process (without TCP communication).
+        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);
+        }
+
+        String dictionary_name = config.getString(".dictionary.name", "");
+        String dictionary_database = config.getString(".dictionary.database", "");
+
+        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);
     };
+
     factory.registerSource("clickhouse", create_table_source);
 }
 
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index 4f26dd16849..cf954a9620d 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -18,19 +18,33 @@ namespace DB
 class ClickHouseDictionarySource final : public IDictionarySource
 {
 public:
+    struct Configuration
+    {
+        const bool secure;
+        const std::string host;
+        const UInt16 port;
+        const std::string user;
+        const std::string password;
+        const std::string db;
+        const std::string table;
+        const std::string where;
+        const std::string update_field;
+        const std::string invalidate_query;
+        const bool is_local;
+    };
+
     ClickHouseDictionarySource(
         const DictionaryStructure & dict_struct_,
-        const Poco::Util::AbstractConfiguration & config,
-        const std::string & path_to_settings,
-        const std::string & config_prefix,
+        const Configuration & configuration_,
         const Block & sample_block_,
-        const Context & context,
-        const std::string & default_database);
+        ContextConstPtr context);
 
     /// 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;
+
     BlockInputStreamPtr loadAll() override;
 
     BlockInputStreamPtr loadUpdatedAll() override;
@@ -50,32 +64,22 @@ public:
 
     /// Used for detection whether the hashtable should be preallocated
     /// (since if there is WHERE then it can filter out too much)
-    bool hasWhere() const { return !where.empty(); }
+    bool hasWhere() const { return !configuration.where.empty(); }
 
 private:
     std::string getUpdateFieldAndDate();
 
-    BlockInputStreamPtr createStreamForQuery(const String & query);
+    BlockInputStreamPtr createStreamForQuery(const String & query, std::atomic<size_t> * result_size_hint = nullptr);
 
     std::string doInvalidateQuery(const std::string & request) const;
 
     std::chrono::time_point<std::chrono::system_clock> update_time;
     const DictionaryStructure dict_struct;
-    const bool secure;
-    const std::string host;
-    const UInt16 port;
-    const std::string user;
-    const std::string password;
-    const std::string db;
-    const std::string table;
-    const std::string where;
-    const std::string update_field;
-    std::string invalidate_query;
+    const Configuration configuration;
     mutable std::string invalidate_query_response;
     ExternalQueryBuilder query_builder;
     Block sample_block;
-    Context context;
-    const bool is_local;
+    ContextMutablePtr context;
     ConnectionPoolWithFailoverPtr pool;
     const std::string load_all_query;
     Poco::Logger * log = &Poco::Logger::get("ClickHouseDictionarySource");
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index 0ab7d199186..1f23200a745 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -17,38 +17,39 @@ namespace ErrorCodes
     extern const int UNKNOWN_ELEMENT_IN_CONFIG;
 }
 
-void DictionaryFactory::registerLayout(const std::string & layout_type, Creator create_layout, bool is_complex)
+void DictionaryFactory::registerLayout(const std::string & layout_type, LayoutCreateFunction create_layout, bool is_layout_complex)
 {
-    if (!registered_layouts.emplace(layout_type, std::move(create_layout)).second)
-        throw Exception("DictionaryFactory: the layout name '" + layout_type + "' is not unique", ErrorCodes::LOGICAL_ERROR);
-
-    layout_complexity[layout_type] = is_complex;
+    auto it = registered_layouts.find(layout_type);
+    if (it != registered_layouts.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DictionaryFactory: the layout name '{}' is not unique", layout_type);
 
+    RegisteredLayout layout { .layout_create_function = create_layout, .is_layout_complex = is_layout_complex };
+    registered_layouts.emplace(layout_type, std::move(layout));
 }
 
-
 DictionaryPtr DictionaryFactory::create(
     const std::string & name,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
-    const Context & context,
-    bool check_source_config) const
+    ContextConstPtr context,
+    bool created_from_ddl) const
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     const auto & layout_prefix = config_prefix + ".layout";
     config.keys(layout_prefix, keys);
     if (keys.size() != 1)
-        throw Exception{name + ": element dictionary.layout should have exactly one child element",
-                        ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG};
+        throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG,
+            "{}: element dictionary.layout should have exactly one child element",
+            name);
 
     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", ""), check_source_config);
+        name, config, config_prefix + ".source", dict_struct, 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);
+    if (context->hasQueryContext() && context->getSettingsRef().log_queries)
+        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Dictionary, name);
 
     const auto & layout_type = keys.front();
 
@@ -56,15 +57,18 @@ DictionaryPtr DictionaryFactory::create(
         const auto found = registered_layouts.find(layout_type);
         if (found != registered_layouts.end())
         {
-            const auto & layout_creator = found->second;
-            return layout_creator(name, dict_struct, config, config_prefix, std::move(source_ptr));
+            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);
         }
     }
 
-    throw Exception{name + ": unknown dictionary layout type: " + layout_type, ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG};
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+        "{}: unknown dictionary layout type: {}",
+        name,
+        layout_type);
 }
 
-DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreateQuery & ast, const Context & context) const
+DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreateQuery & ast, ContextConstPtr context) const
 {
     auto configuration = getDictionaryConfigurationFromAST(ast, context);
     return DictionaryFactory::create(name, *configuration, "dictionary", context, true);
@@ -72,12 +76,16 @@ DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreat
 
 bool DictionaryFactory::isComplex(const std::string & layout_type) const
 {
-    auto found = layout_complexity.find(layout_type);
+    auto it = registered_layouts.find(layout_type);
 
-    if (found != layout_complexity.end())
-        return found->second;
+    if (it == registered_layouts.end())
+    {
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+           "Unknown dictionary layout type: {}",
+           layout_type);
+    }
 
-    throw Exception{"Unknown dictionary layout type: " + layout_type, ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG};
+    return it->second.is_layout_complex;
 }
 
 
diff --git a/src/Dictionaries/DictionaryFactory.h b/src/Dictionaries/DictionaryFactory.h
index 3d3f793e2b2..a261c377cad 100644
--- a/src/Dictionaries/DictionaryFactory.h
+++ b/src/Dictionaries/DictionaryFactory.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include "IDictionary.h"
 #include "registerDictionaries.h"
 #include <Parsers/ASTCreateQuery.h>
@@ -21,8 +22,6 @@ class Logger;
 namespace DB
 {
 
-class Context;
-
 /** Create dictionary according to its layout.
   */
 class DictionaryFactory : private boost::noncopyable
@@ -37,30 +36,37 @@ public:
         const std::string & name,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
-        const Context & context,
-        bool check_source_config = false) const;
+        ContextConstPtr context,
+        bool created_from_ddl) const;
 
     /// Create dictionary from DDL-query
     DictionaryPtr create(const std::string & name,
         const ASTCreateQuery & ast,
-        const Context & context) const;
+        ContextConstPtr context) const;
 
-    using Creator = std::function<DictionaryPtr(
+    using LayoutCreateFunction = std::function<DictionaryPtr(
         const std::string & name,
         const DictionaryStructure & dict_struct,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
-        DictionarySourcePtr source_ptr)>;
+        DictionarySourcePtr source_ptr,
+        ContextConstPtr context,
+        bool created_from_ddl)>;
 
     bool isComplex(const std::string & layout_type) const;
 
-    void registerLayout(const std::string & layout_type, Creator create_layout, bool is_complex);
+    void registerLayout(const std::string & layout_type, LayoutCreateFunction create_layout, bool is_layout_complex);
 
 private:
-    using LayoutRegistry = std::unordered_map<std::string, Creator>;
+    struct RegisteredLayout
+    {
+        LayoutCreateFunction layout_create_function;
+        bool is_layout_complex;
+    };
+
+    using LayoutRegistry = std::unordered_map<std::string, RegisteredLayout>;
     LayoutRegistry registered_layouts;
-    using LayoutComplexity = std::unordered_map<std::string, bool>;
-    LayoutComplexity layout_complexity;
+
 };
 
 }
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 3e7063bb9ef..6d459bab85f 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -1,11 +1,14 @@
 #pragma once
 
 #include <Common/Arena.h>
+#include <Common/HashTable/HashMap.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
+#include <DataStreams/IBlockInputStream.h>
 #include <DataTypes/DataTypesDecimal.h>
+#include <Core/Block.h>
 #include <Dictionaries/IDictionary.h>
 #include <Dictionaries/DictionaryStructure.h>
 
@@ -60,7 +63,11 @@ private:
 class DictionaryStorageFetchRequest
 {
 public:
-    DictionaryStorageFetchRequest(const DictionaryStructure & structure, const Strings & attributes_names_to_fetch, Columns attributes_default_values_columns)
+    DictionaryStorageFetchRequest(
+        const DictionaryStructure & structure,
+        const Strings & attributes_names_to_fetch,
+        DataTypes attributes_to_fetch_result_types,
+        Columns attributes_default_values_columns)
         : attributes_to_fetch_names_set(attributes_names_to_fetch.begin(), attributes_names_to_fetch.end())
         , attributes_to_fetch_filter(structure.attributes.size(), false)
     {
@@ -73,7 +80,7 @@ public:
         dictionary_attributes_types.reserve(attributes_size);
         attributes_default_value_providers.reserve(attributes_to_fetch_names_set.size());
 
-        size_t default_values_column_index = 0;
+        size_t attributes_to_fetch_index = 0;
         for (size_t i = 0; i < attributes_size; ++i)
         {
             const auto & dictionary_attribute = structure.attributes[i];
@@ -84,8 +91,16 @@ public:
             if (attributes_to_fetch_names_set.find(name) != attributes_to_fetch_names_set.end())
             {
                 attributes_to_fetch_filter[i] = true;
-                attributes_default_value_providers.emplace_back(dictionary_attribute.null_value, attributes_default_values_columns[default_values_column_index]);
-                ++default_values_column_index;
+                auto & attribute_to_fetch_result_type = attributes_to_fetch_result_types[attributes_to_fetch_index];
+
+                if (!attribute_to_fetch_result_type->equals(*type))
+                    throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "Attribute type does not match, expected ({}), found ({})",
+                    attribute_to_fetch_result_type->getName(),
+                    type->getName());
+
+                attributes_default_value_providers.emplace_back(dictionary_attribute.null_value, attributes_default_values_columns[attributes_to_fetch_index]);
+                ++attributes_to_fetch_index;
             }
             else
                 attributes_default_value_providers.emplace_back(dictionary_attribute.null_value);
@@ -228,15 +243,21 @@ public:
         {
             return ColumnType::create();
         }
-        if constexpr (IsDecimalNumber<DictionaryAttributeType>)
+        else if constexpr (std::is_same_v<DictionaryAttributeType, UUID>)
+        {
+            return ColumnType::create(size);
+        }
+        else if constexpr (IsDecimalNumber<DictionaryAttributeType>)
         {
             auto scale = getDecimalScale(*dictionary_attribute.nested_type);
             return ColumnType::create(size, scale);
         }
-        else if constexpr (IsNumber<DictionaryAttributeType>)
+        else if constexpr (is_arithmetic_v<DictionaryAttributeType>)
+        {
             return ColumnType::create(size);
+        }
         else
-            throw Exception{"Unsupported attribute type.", ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Unsupported attribute type.");
     }
 };
 
@@ -273,7 +294,7 @@ public:
                 use_default_value_from_column = false;
             }
             else
-                throw Exception{"Type of default column is not the same as dictionary attribute type.", ErrorCodes::TYPE_MISMATCH};
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Type of default column is not the same as dictionary attribute type.");
         }
     }
 
@@ -416,6 +437,117 @@ private:
     Arena * complex_key_arena;
 };
 
+/** 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(
+    size_t key_columns_size,
+    Block & block_to_update,
+    BlockInputStreamPtr & stream)
+{
+    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");
+
+    Columns saved_block_key_columns;
+    saved_block_key_columns.reserve(key_columns_size);
+
+    /// Split into keys columns and attribute columns
+    for (size_t i = 0; i < key_columns_size; ++i)
+        saved_block_key_columns.emplace_back(block_to_update.safeGetByPosition(i).column);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> saved_keys_extractor(saved_block_key_columns, arena_holder.getComplexKeyArena());
+    auto saved_keys_extracted_from_block = saved_keys_extractor.extractAllKeys();
+
+    /**
+     * We create filter with our block to update size, because we want to filter out values that have duplicate keys
+     * if they appear in blocks that we fetch from stream.
+     * But first we try to filter out duplicate keys from existing block.
+     * For example if we have block with keys 1, 2, 2, 2, 3, 3
+     * Our filter will have [1, 0, 0, 1, 0, 1] after first stage.
+     * We also update saved_key_to_index hash map for keys to point to their latest indexes.
+     * For example if in blocks from stream we will get keys [4, 2, 3]
+     * Our filter will be [1, 0, 0, 0, 0, 0].
+     * After reading all blocks from stream we filter our duplicate keys from block_to_update and insert loaded columns.
+     */
+
+    IColumn::Filter filter(saved_keys_extracted_from_block.size(), true);
+
+    HashMap<KeyType, size_t> saved_key_to_index;
+    saved_key_to_index.reserve(saved_keys_extracted_from_block.size());
+
+    size_t indexes_to_remove_count = 0;
+
+    for (size_t i = 0; i < saved_keys_extracted_from_block.size(); ++i)
+    {
+        auto saved_key = saved_keys_extracted_from_block[i];
+        auto [it, was_inserted] = saved_key_to_index.insert(makePairNoInit(saved_key, i));
+
+        if (!was_inserted)
+        {
+            size_t index_to_remove = it->getMapped();
+            filter[index_to_remove] = false;
+            it->getMapped() = i;
+            ++indexes_to_remove_count;
+        }
+    }
+
+    auto result_fetched_columns = block_to_update.cloneEmptyColumns();
+
+    stream->readPrefix();
+
+    while (Block block = stream->read())
+    {
+        Columns block_key_columns;
+        block_key_columns.reserve(key_columns_size);
+
+        /// Split into keys columns and attribute columns
+        for (size_t i = 0; i < key_columns_size; ++i)
+            block_key_columns.emplace_back(block.safeGetByPosition(i).column);
+
+        DictionaryKeysExtractor<dictionary_key_type> update_keys_extractor(block_key_columns, arena_holder.getComplexKeyArena());
+        PaddedPODArray<KeyType> update_keys = update_keys_extractor.extractAllKeys();
+
+        for (auto update_key : update_keys)
+        {
+            const auto * it = saved_key_to_index.find(update_key);
+            if (it != nullptr)
+            {
+                size_t index_to_filter = it->getMapped();
+                filter[index_to_filter] = false;
+                ++indexes_to_remove_count;
+            }
+        }
+
+        size_t rows = block.rows();
+
+        for (size_t column_index = 0; column_index < block.columns(); ++column_index)
+        {
+            const auto update_column = block.safeGetByPosition(column_index).column;
+            MutableColumnPtr & result_fetched_column = result_fetched_columns[column_index];
+
+            result_fetched_column->insertRangeFrom(*update_column, 0, rows);
+        }
+    }
+
+    stream->readSuffix();
+
+    size_t result_fetched_rows = result_fetched_columns.front()->size();
+    size_t filter_hint = filter.size() - indexes_to_remove_count;
+
+    for (size_t column_index = 0; column_index < block_to_update.columns(); ++column_index)
+    {
+        auto & column = block_to_update.getByPosition(column_index).column;
+        column = column->filter(filter, filter_hint);
+
+        MutableColumnPtr mutable_column = column->assumeMutable();
+        const IColumn & fetched_column = *result_fetched_columns[column_index];
+        mutable_column->insertRangeFrom(fetched_column, 0, result_fetched_rows);
+    }
+}
+
 /**
  * Returns ColumnVector data as PaddedPodArray.
 
@@ -434,10 +566,10 @@ static const PaddedPODArray<T> & getColumnVectorData(
 
     if (!vector_col)
     {
-        throw Exception{ErrorCodes::TYPE_MISMATCH,
+        throw Exception(ErrorCodes::TYPE_MISMATCH,
             "{}: type mismatch: column has wrong type expected {}",
             dictionary->getDictionaryID().getNameForLogs(),
-            TypeName<T>::get()};
+            TypeName<T>);
     }
 
     if (is_const_column)
diff --git a/src/Dictionaries/DictionarySourceFactory.cpp b/src/Dictionaries/DictionarySourceFactory.cpp
index af3552364ba..507d11eba8e 100644
--- a/src/Dictionaries/DictionarySourceFactory.cpp
+++ b/src/Dictionaries/DictionarySourceFactory.cpp
@@ -71,7 +71,7 @@ DictionarySourceFactory::DictionarySourceFactory() : log(&Poco::Logger::get("Dic
 void DictionarySourceFactory::registerSource(const std::string & source_type, Creator create_source)
 {
     if (!registered_sources.emplace(source_type, std::move(create_source)).second)
-        throw Exception("DictionarySourceFactory: the source name '" + source_type + "' is not unique", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DictionarySourceFactory: the source name '{}' is not unique", source_type);
 }
 
 DictionarySourcePtr DictionarySourceFactory::create(
@@ -79,7 +79,7 @@ DictionarySourcePtr DictionarySourceFactory::create(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     const DictionaryStructure & dict_struct,
-    const Context & context,
+    ContextConstPtr context,
     const std::string & default_database,
     bool check_config) const
 {
@@ -87,8 +87,9 @@ DictionarySourcePtr DictionarySourceFactory::create(
     config.keys(config_prefix, keys);
 
     if (keys.empty() || keys.size() > 2)
-        throw Exception{name + ": element dictionary.source should have one or two child elements",
-                        ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG};
+        throw Exception(ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG,
+            "{}: element dictionary.source should have one or two child elements",
+            name);
 
     const std::string & source_type = keys.front() == "settings" ? keys.back() : keys.front();
 
@@ -100,7 +101,10 @@ DictionarySourcePtr DictionarySourceFactory::create(
         return create_source(dict_struct, config, config_prefix, sample_block, context, default_database, check_config);
     }
 
-    throw Exception{name + ": unknown dictionary source type: " + source_type, ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG};
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+        "{}: unknown dictionary source type: {}",
+        name,
+        source_type);
 }
 
 DictionarySourceFactory & DictionarySourceFactory::instance()
diff --git a/src/Dictionaries/DictionarySourceFactory.h b/src/Dictionaries/DictionarySourceFactory.h
index 1406660dfb4..9a0235a5eb0 100644
--- a/src/Dictionaries/DictionarySourceFactory.h
+++ b/src/Dictionaries/DictionarySourceFactory.h
@@ -2,6 +2,7 @@
 
 #include "IDictionarySource.h"
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <unordered_map>
 
@@ -17,7 +18,7 @@ class Logger;
 
 namespace DB
 {
-class Context;
+
 struct DictionaryStructure;
 
 /// creates IDictionarySource instance from config and DictionaryStructure
@@ -34,7 +35,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         Block & sample_block,
-        const Context & context,
+        ContextConstPtr context,
         const std::string & default_database,
         bool check_config)>;
 
@@ -47,7 +48,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         const DictionaryStructure & dict_struct,
-        const Context & context,
+        ContextConstPtr context,
         const std::string & default_database,
         bool check_config) const;
 
diff --git a/src/Dictionaries/DictionarySourceHelpers.cpp b/src/Dictionaries/DictionarySourceHelpers.cpp
index 64527a78e8e..723a0c338fd 100644
--- a/src/Dictionaries/DictionarySourceHelpers.cpp
+++ b/src/Dictionaries/DictionarySourceHelpers.cpp
@@ -67,12 +67,12 @@ Block blockForKeys(
     return block;
 }
 
-Context copyContextAndApplySettings(
+ContextMutablePtr copyContextAndApplySettings(
     const std::string & config_prefix,
-    const Context & context,
+    ContextConstPtr context,
     const Poco::Util::AbstractConfiguration & config)
 {
-    Context local_context(context);
+    auto local_context = Context::createCopy(context);
     if (config.has(config_prefix + ".settings"))
     {
         const auto prefix = config_prefix + ".settings";
@@ -88,7 +88,7 @@ Context copyContextAndApplySettings(
             changes.emplace_back(key, value);
         }
 
-        local_context.applySettingsChanges(changes);
+        local_context->applySettingsChanges(changes);
     }
     return local_context;
 }
@@ -125,9 +125,8 @@ Block BlockInputStreamWithAdditionalColumns::readImpl()
         auto cut_block = block_to_add.cloneWithCutColumns(current_range_index, block_rows);
 
         if (cut_block.rows() != block_rows)
-            throw Exception(
-                "Number of rows in block to add after cut must equal to number of rows in block from inner stream",
-                ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
+            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));
diff --git a/src/Dictionaries/DictionarySourceHelpers.h b/src/Dictionaries/DictionarySourceHelpers.h
index b429136a981..1066574f8e9 100644
--- a/src/Dictionaries/DictionarySourceHelpers.h
+++ b/src/Dictionaries/DictionarySourceHelpers.h
@@ -3,12 +3,12 @@
 #include <vector>
 
 #include <common/types.h>
-
-#include <Poco/File.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <DataStreams/IBlockInputStream.h>
 #include <Columns/IColumn.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
+
 
 namespace DB
 {
@@ -17,7 +17,6 @@ class IBlockOutputStream;
 using BlockOutputStreamPtr = std::shared_ptr<IBlockOutputStream>;
 
 struct DictionaryStructure;
-class Context;
 
 /// Write keys to block output stream.
 
@@ -37,14 +36,9 @@ Block blockForKeys(
     const std::vector<size_t> & requested_rows);
 
 /// Used for applying settings to copied context in some register[...]Source functions
-Context copyContextAndApplySettings(
+ContextMutablePtr copyContextAndApplySettings(
     const std::string & config_prefix,
-    const Context & context,
-    const Poco::Util::AbstractConfiguration & config);
-
-void applySettingsToContext(
-    const std::string & config_prefix,
-    Context & context,
+    ContextConstPtr context,
     const Poco::Util::AbstractConfiguration & config);
 
 /** A stream, adds additional columns to each block that it will read from inner stream.
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 806ee0b80e0..c0d00d3ae40 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -14,6 +14,7 @@
 #include <unordered_set>
 #include <ext/range.h>
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -33,7 +34,7 @@ namespace
         const auto expression = config.getString(config_prefix + ".expression", "");
 
         if (name.empty() && !expression.empty())
-            throw Exception{"Element " + config_prefix + ".name is empty", ErrorCodes::BAD_ARGUMENTS};
+            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)};
@@ -48,80 +49,57 @@ AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
 
     switch (type_index)
     {
-        case TypeIndex::UInt8:          return AttributeUnderlyingType::utUInt8;
-        case TypeIndex::UInt16:         return AttributeUnderlyingType::utUInt16;
-        case TypeIndex::UInt32:         return AttributeUnderlyingType::utUInt32;
-        case TypeIndex::UInt64:         return AttributeUnderlyingType::utUInt64;
-        case TypeIndex::UInt128:        return AttributeUnderlyingType::utUInt128;
+        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::utInt8;
-        case TypeIndex::Int16:          return AttributeUnderlyingType::utInt16;
-        case TypeIndex::Int32:          return AttributeUnderlyingType::utInt32;
-        case TypeIndex::Int64:          return AttributeUnderlyingType::utInt64;
+        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::utFloat32;
-        case TypeIndex::Float64:        return AttributeUnderlyingType::utFloat64;
+        case TypeIndex::Float32:        return AttributeUnderlyingType::Float32;
+        case TypeIndex::Float64:        return AttributeUnderlyingType::Float64;
 
-        case TypeIndex::Decimal32:      return AttributeUnderlyingType::utDecimal32;
-        case TypeIndex::Decimal64:      return AttributeUnderlyingType::utDecimal64;
-        case TypeIndex::Decimal128:     return AttributeUnderlyingType::utDecimal128;
+        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::utUInt16;
-        case TypeIndex::DateTime:       return AttributeUnderlyingType::utUInt32;
-        case TypeIndex::DateTime64:     return AttributeUnderlyingType::utUInt64;
+        case TypeIndex::Date:           return AttributeUnderlyingType::UInt16;
+        case TypeIndex::DateTime:       return AttributeUnderlyingType::UInt32;
+        case TypeIndex::DateTime64:     return AttributeUnderlyingType::UInt64;
 
-        case TypeIndex::UUID:           return AttributeUnderlyingType::utUInt128;
+        case TypeIndex::UUID:           return AttributeUnderlyingType::UUID;
 
-        case TypeIndex::String:         return AttributeUnderlyingType::utString;
+        case TypeIndex::String:         return AttributeUnderlyingType::String;
 
         // Temporary hack to allow arrays in keys, since they are never retrieved for polygon dictionaries.
         // TODO: This should be fixed by fully supporting arrays in dictionaries.
-        case TypeIndex::Array:          return AttributeUnderlyingType::utString;
+        case TypeIndex::Array:          return AttributeUnderlyingType::String;
 
         default: break;
     }
 
-    throw Exception{"Unknown type for dictionary" + type->getName(), ErrorCodes::UNKNOWN_TYPE};
+    throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type {} for dictionary attribute", type->getName());
 }
 
 
-std::string toString(const AttributeUnderlyingType type)
+std::string toString(AttributeUnderlyingType type)
 {
     switch (type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            return "UInt8";
-        case AttributeUnderlyingType::utUInt16:
-            return "UInt16";
-        case AttributeUnderlyingType::utUInt32:
-            return "UInt32";
-        case AttributeUnderlyingType::utUInt64:
-            return "UInt64";
-        case AttributeUnderlyingType::utUInt128:
-            return "UUID";
-        case AttributeUnderlyingType::utInt8:
-            return "Int8";
-        case AttributeUnderlyingType::utInt16:
-            return "Int16";
-        case AttributeUnderlyingType::utInt32:
-            return "Int32";
-        case AttributeUnderlyingType::utInt64:
-            return "Int64";
-        case AttributeUnderlyingType::utFloat32:
-            return "Float32";
-        case AttributeUnderlyingType::utFloat64:
-            return "Float64";
-        case AttributeUnderlyingType::utDecimal32:
-            return "Decimal32";
-        case AttributeUnderlyingType::utDecimal64:
-            return "Decimal64";
-        case AttributeUnderlyingType::utDecimal128:
-            return "Decimal128";
-        case AttributeUnderlyingType::utString:
-            return "String";
+#define M(TYPE) case AttributeUnderlyingType::TYPE: return #TYPE;
+    FOR_ATTRIBUTE_TYPES(M)
+#undef M
     }
 
-    throw Exception{"Unknown attribute_type " + toString(static_cast<int>(type)), ErrorCodes::ARGUMENT_OUT_OF_BOUND};
+    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Unknown dictionary attribute type {}", toString(static_cast<int>(type)));
 }
 
 
@@ -129,7 +107,7 @@ DictionarySpecialAttribute::DictionarySpecialAttribute(const Poco::Util::Abstrac
     : name{config.getString(config_prefix + ".name", "")}, expression{config.getString(config_prefix + ".expression", "")}
 {
     if (name.empty() && !expression.empty())
-        throw Exception{"Element " + config_prefix + ".name is empty", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty", config_prefix);
 }
 
 
@@ -141,7 +119,7 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
     const auto has_key = config.has(structure_prefix + ".key");
 
     if (has_key && has_id)
-        throw Exception{"Only one of 'id' and 'key' should be specified", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only one of 'id' and 'key' should be specified");
 
     if (has_id)
         id.emplace(config, structure_prefix + ".id");
@@ -149,15 +127,15 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
     {
         key.emplace(getAttributes(config, structure_prefix + ".key", true));
         if (key->empty())
-            throw Exception{"Empty 'key' supplied", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Empty 'key' supplied");
     }
     else
-        throw Exception{"Dictionary structure should specify either 'id' or 'key'", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary structure should specify either 'id' or 'key'");
 
     if (id)
     {
         if (id->name.empty())
-            throw Exception{"'id' cannot be empty", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "'id' cannot be empty");
 
         const char * range_default_type = "Date";
         if (config.has(structure_prefix + ".range_min"))
@@ -168,28 +146,27 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
 
         if (range_min.has_value() != range_max.has_value())
         {
-            throw Exception{"Dictionary structure should have both 'range_min' and 'range_max' either specified or not.",
-                            ErrorCodes::BAD_ARGUMENTS};
+            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{"Dictionary structure 'range_min' and 'range_max' should have same type, "
-                            "'range_min' type: "
-                                + range_min->type->getName()
-                                + ", "
-                                  "'range_max' type: "
-                                + range_max->type->getName(),
-                            ErrorCodes::BAD_ARGUMENTS};
+            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{"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(),
-                                ErrorCodes::BAD_ARGUMENTS};
+                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()))
@@ -206,10 +183,11 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
 
         if (attribute.hierarchical)
         {
-            if (id && attribute.underlying_type != AttributeUnderlyingType::utUInt64)
+            if (id && attribute.underlying_type != AttributeUnderlyingType::UInt64)
                 throw Exception(ErrorCodes::TYPE_MISMATCH,
-                    "Hierarchical attribute type for dictionary with simple key must be UInt64. Actual ({})",
+                    "Hierarchical attribute type for dictionary with simple key must be UInt64. Actual {}",
                     toString(attribute.underlying_type));
+
             else if (key)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary with complex key does not support hierarchy");
 
@@ -218,7 +196,7 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
     }
 
     if (attributes.empty())
-        throw Exception{"Dictionary has no attributes defined", ErrorCodes::BAD_ARGUMENTS};
+        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;
@@ -228,7 +206,7 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
 void DictionaryStructure::validateKeyTypes(const DataTypes & key_types) const
 {
     if (key_types.size() != key->size())
-        throw Exception{"Key structure does not match, expected " + getKeyDescription(), ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Key structure does not match, expected {}", getKeyDescription());
 
     for (const auto i : ext::range(0, key_types.size()))
     {
@@ -236,9 +214,11 @@ void DictionaryStructure::validateKeyTypes(const DataTypes & key_types) const
         const auto & actual_type = key_types[i];
 
         if (!areTypesEqual(expected_type, actual_type))
-            throw Exception{"Key type at position " + std::to_string(i) + " does not match, expected " + expected_type->getName() + ", found "
-                    + actual_type->getName(),
-                ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Key type at position {} does not match, expected {}, found {}",
+            std::to_string(i),
+            expected_type->getName(),
+            actual_type->getName());
     }
 }
 
@@ -249,13 +229,13 @@ const DictionaryAttribute & DictionaryStructure::getAttribute(const std::string
     if (it == attribute_name_to_index.end())
     {
         if (!access_to_key_from_attributes)
-            throw Exception{"No such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "No such attribute '{}'", attribute_name);
 
         for (const auto & key_attribute : *key)
             if (key_attribute.name == attribute_name)
                 return key_attribute;
 
-        throw Exception{"No such attribute '" + attribute_name + "' in keys", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No such attribute '{}' in keys", attribute_name);
     }
 
     size_t attribute_index = it->second;
@@ -267,8 +247,10 @@ const DictionaryAttribute & DictionaryStructure::getAttribute(const std::string
     const auto & attribute = getAttribute(attribute_name);
 
     if (!areTypesEqual(attribute.type, type))
-        throw Exception{"Attribute type does not match, expected " + attribute.type->getName() + ", found " + type->getName(),
-            ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Attribute type does not match, expected {}, found {}",
+            attribute.type->getName(),
+            type->getName());
 
     return attribute;
 }
@@ -313,7 +295,7 @@ bool DictionaryStructure::isKeySizeFixed() const
         return true;
 
     for (const auto & key_i : *key)
-        if (key_i.underlying_type == AttributeUnderlyingType::utString)
+        if (key_i.underlying_type == AttributeUnderlyingType::String)
             return false;
 
     return true;
@@ -343,11 +325,10 @@ static void checkAttributeKeys(const Poco::Util::AbstractConfiguration::Keys & k
     for (const auto & key : keys)
     {
         if (valid_keys.find(key) == valid_keys.end())
-            throw Exception{"Unknown key '" + key + "' inside attribute section", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown key '{}' inside attribute section", key);
     }
 }
 
-
 std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
@@ -388,8 +369,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         bool inserted = insert_result.second;
 
         if (!inserted)
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS,
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Dictionary attributes names must be unique. Attribute name ({}) is not unique",
                 name);
 
@@ -442,13 +422,13 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         const auto injective = config.getBool(prefix + "injective", false);
         const auto is_object_id = config.getBool(prefix + "is_object_id", false);
         if (name.empty())
-            throw Exception{"Properties 'name' and 'type' of an attribute cannot be empty", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Properties 'name' and 'type' of an attribute cannot be empty");
 
         if (has_hierarchy && !hierarchy_allowed)
-            throw Exception{"Hierarchy not allowed in '" + prefix, ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Hierarchy not allowed in '{}'", prefix);
 
         if (has_hierarchy && hierarchical)
-            throw Exception{"Only one hierarchical attribute supported", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Only one hierarchical attribute supported");
 
         has_hierarchy = has_hierarchy || hierarchical;
 
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 4f03b4ff09e..4815501b696 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -5,7 +5,6 @@
 #include <string>
 #include <vector>
 
-
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include <Core/Field.h>
@@ -13,32 +12,49 @@
 #include <DataTypes/IDataType.h>
 #include <Interpreters/IExternalLoadable.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) \
+
+
 namespace DB
 {
 
 enum class AttributeUnderlyingType
 {
-    utUInt8,
-    utUInt16,
-    utUInt32,
-    utUInt64,
-    utUInt128,
-    utInt8,
-    utInt16,
-    utInt32,
-    utInt64,
-    utFloat32,
-    utFloat64,
-    utDecimal32,
-    utDecimal64,
-    utDecimal128,
-    utString
+#define M(TYPE) TYPE,
+    FOR_ATTRIBUTE_TYPES(M)
+#undef M
 };
 
 
 AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type);
 
-std::string toString(const AttributeUnderlyingType type);
+std::string toString(AttributeUnderlyingType type);
 
 /// Min and max lifetimes for a dictionary or it's entry
 using DictionaryLifetime = ExternalLoadableLifetime;
@@ -80,51 +96,12 @@ void callOnDictionaryAttributeType(AttributeUnderlyingType type, F&& func)
 {
     switch (type)
     {
-        case AttributeUnderlyingType::utUInt8:
-            func(DictionaryAttributeType<UInt8>());
-            break;
-        case AttributeUnderlyingType::utUInt16:
-            func(DictionaryAttributeType<UInt16>());
-            break;
-        case AttributeUnderlyingType::utUInt32:
-            func(DictionaryAttributeType<UInt32>());
-            break;
-        case AttributeUnderlyingType::utUInt64:
-            func(DictionaryAttributeType<UInt64>());
-            break;
-        case AttributeUnderlyingType::utUInt128:
-            func(DictionaryAttributeType<UInt128>());
-            break;
-        case AttributeUnderlyingType::utInt8:
-            func(DictionaryAttributeType<Int8>());
-            break;
-        case AttributeUnderlyingType::utInt16:
-            func(DictionaryAttributeType<Int16>());
-            break;
-        case AttributeUnderlyingType::utInt32:
-            func(DictionaryAttributeType<Int32>());
-            break;
-        case AttributeUnderlyingType::utInt64:
-            func(DictionaryAttributeType<Int64>());
-            break;
-        case AttributeUnderlyingType::utFloat32:
-            func(DictionaryAttributeType<Float32>());
-            break;
-        case AttributeUnderlyingType::utFloat64:
-            func(DictionaryAttributeType<Float64>());
-            break;
-        case AttributeUnderlyingType::utString:
-            func(DictionaryAttributeType<String>());
-            break;
-        case AttributeUnderlyingType::utDecimal32:
-            func(DictionaryAttributeType<Decimal32>());
-            break;
-        case AttributeUnderlyingType::utDecimal64:
-            func(DictionaryAttributeType<Decimal64>());
-            break;
-        case AttributeUnderlyingType::utDecimal128:
-            func(DictionaryAttributeType<Decimal128>());
+#define M(TYPE) \
+        case AttributeUnderlyingType::TYPE: \
+            func(DictionaryAttributeType<TYPE>()); \
             break;
+    FOR_ATTRIBUTE_TYPES(M)
+#undef M
     }
 };
 
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 96ef259106a..2cc1d6caf5f 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -27,16 +27,16 @@ DirectDictionary<dictionary_key_type>::DirectDictionary(
     , source_ptr{std::move(source_ptr_)}
 {
     if (!source_ptr->supportsSelectiveLoad())
-        throw Exception{full_name + ": source cannot be used with DirectDictionary", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "{}: source cannot be used with DirectDictionary", full_name);
 }
 
 template <DictionaryKeyType dictionary_key_type>
-ColumnPtr DirectDictionary<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
+Columns DirectDictionary<dictionary_key_type>::getColumns(
+    const Strings & attribute_names,
+    const DataTypes & result_types,
+    const Columns & key_columns,
+    const DataTypes & key_types [[maybe_unused]],
+    const Columns & default_values_columns) const
 {
     if constexpr (dictionary_key_type == DictionaryKeyType::complex)
         dict_struct.validateKeyTypes(key_types);
@@ -45,16 +45,22 @@ ColumnPtr DirectDictionary<dictionary_key_type>::getColumn(
     DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
     const auto requested_keys = extractor.extractAllKeys();
 
-    const DictionaryAttribute & attribute = dict_struct.getAttribute(attribute_name, result_type);
-    DefaultValueProvider default_value_provider(attribute.null_value, default_values_column);
+    DictionaryStorageFetchRequest request(dict_struct, attribute_names, result_types, default_values_columns);
 
     HashMap<KeyType, size_t> key_to_fetched_index;
     key_to_fetched_index.reserve(requested_keys.size());
 
-    auto fetched_from_storage = attribute.type->createColumn();
+    auto fetched_columns_from_storage = request.makeAttributesResultColumns();
+    for (size_t attribute_index = 0; attribute_index < request.attributesSize(); ++attribute_index)
+    {
+        if (!request.shouldFillResultColumnWithIndex(attribute_index))
+            continue;
+
+        auto & fetched_column_from_storage = fetched_columns_from_storage[attribute_index];
+        fetched_column_from_storage->reserve(requested_keys.size());
+    }
 
     size_t fetched_key_index = 0;
-    size_t requested_attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
 
     Columns block_key_columns;
     size_t dictionary_keys_size = dict_struct.getKeysNames().size();
@@ -73,8 +79,14 @@ ColumnPtr DirectDictionary<dictionary_key_type>::getColumn(
         DictionaryKeysExtractor<dictionary_key_type> block_keys_extractor(block_key_columns, arena_holder.getComplexKeyArena());
         auto block_keys = block_keys_extractor.extractAllKeys();
 
-        const auto & block_column = block.safeGetByPosition(dictionary_keys_size + requested_attribute_index).column;
-        fetched_from_storage->insertRangeFrom(*block_column, 0, block_keys.size());
+        for (size_t attribute_index = 0; attribute_index < request.attributesSize(); ++attribute_index)
+        {
+            if (!request.shouldFillResultColumnWithIndex(attribute_index))
+                continue;
+
+            const auto & block_column = block.safeGetByPosition(dictionary_keys_size + attribute_index).column;
+            fetched_columns_from_storage[attribute_index]->insertRangeFrom(*block_column, 0, block_keys.size());
+        }
 
         for (size_t block_key_index = 0; block_key_index < block_keys.size(); ++block_key_index)
         {
@@ -92,29 +104,60 @@ ColumnPtr DirectDictionary<dictionary_key_type>::getColumn(
 
     size_t requested_keys_size = requested_keys.size();
 
-    auto result = fetched_from_storage->cloneEmpty();
-    result->reserve(requested_keys_size);
+    auto result_columns = request.makeAttributesResultColumns();
 
-    for (size_t requested_key_index = 0; requested_key_index < requested_keys_size; ++requested_key_index)
+    size_t keys_found = 0;
+
+    for (size_t attribute_index = 0; attribute_index < result_columns.size(); ++attribute_index)
     {
-        const auto requested_key = requested_keys[requested_key_index];
-        const auto * it = key_to_fetched_index.find(requested_key);
+        if (!request.shouldFillResultColumnWithIndex(attribute_index))
+            continue;
 
-        if (it)
-            fetched_from_storage->get(it->getMapped(), value_to_insert);
-        else
-            value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
+        auto & result_column = result_columns[attribute_index];
 
-        result->insert(value_to_insert);
+        const auto & fetched_column_from_storage = fetched_columns_from_storage[attribute_index];
+        const auto & default_value_provider = request.defaultValueProviderAtIndex(attribute_index);
+
+        result_column->reserve(requested_keys_size);
+
+        for (size_t requested_key_index = 0; requested_key_index < requested_keys_size; ++requested_key_index)
+        {
+            const auto requested_key = requested_keys[requested_key_index];
+            const auto * it = key_to_fetched_index.find(requested_key);
+
+            if (it)
+            {
+                fetched_column_from_storage->get(it->getMapped(), value_to_insert);
+                ++keys_found;
+            }
+            else
+                value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
+
+            result_column->insert(value_to_insert);
+        }
     }
 
     query_count.fetch_add(requested_keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
-    return result;
+    return request.filterRequestedColumns(result_columns);
 }
 
 template <DictionaryKeyType dictionary_key_type>
-ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(const Columns & key_columns, const DataTypes & key_types [[maybe_unused]]) const
+ColumnPtr DirectDictionary<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
+{
+    return getColumns({ attribute_name }, { result_type }, key_columns, key_types, { default_values_column }).front();
+}
+
+template <DictionaryKeyType dictionary_key_type>
+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)
         dict_struct.validateKeyTypes(key_types);
@@ -144,6 +187,8 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(const Columns &
 
     stream->readPrefix();
 
+    size_t keys_found = 0;
+
     while (const auto block = stream->read())
     {
         /// Split into keys columns and attribute columns
@@ -161,6 +206,8 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(const Columns &
             assert(it);
 
             size_t result_data_found_index = it->getMapped();
+            /// block_keys_size cannot be used, due to duplicates.
+            keys_found += !result_data[result_data_found_index];
             result_data[result_data_found_index] = true;
 
             block_keys_extractor.rollbackCurrentKey();
@@ -172,6 +219,7 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(const Columns &
     stream->readSuffix();
 
     query_count.fetch_add(requested_keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
@@ -183,8 +231,10 @@ ColumnPtr DirectDictionary<dictionary_key_type>::getHierarchy(
 {
     if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type);
+        size_t keys_found;
+        auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type, keys_found);
         query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
         return result;
     }
     else
@@ -199,8 +249,10 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::isInHierarchy(
 {
     if (dictionary_key_type == DictionaryKeyType::simple)
     {
-        auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type);
+        size_t keys_found = 0;
+        auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type, keys_found);
         query_count.fetch_add(key_column->size(), std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
         return result;
     }
     else
@@ -253,7 +305,9 @@ namespace
         const DictionaryStructure & dict_struct,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
-        DictionarySourcePtr source_ptr)
+        DictionarySourcePtr source_ptr,
+        ContextConstPtr /* context */,
+        bool /* created_from_ddl */)
     {
         const auto * layout_name = dictionary_key_type == DictionaryKeyType::simple ? "direct" : "complex_key_direct";
 
@@ -261,20 +315,20 @@ namespace
         {
             if (dict_struct.key)
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                    "'key' is not supported for dictionary of layout '({})'",
+                    "'key' is not supported for dictionary of layout '{}'",
                     layout_name);
         }
         else
         {
             if (dict_struct.id)
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                    "'id' is not supported for dictionary of layout '({})'",
+                    "'id' is not supported for dictionary of layout '{}'",
                     layout_name);
         }
 
         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 " \
+                "{}: elements .structure.range_min and .structure.range_max should be defined only "
                 "for a dictionary of layout 'range_hashed'",
                 full_name);
 
@@ -282,7 +336,7 @@ namespace
 
         if (config.has(config_prefix + ".lifetime.min") || config.has(config_prefix + ".lifetime.max"))
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "'lifetime' parameter is redundant for the dictionary' of layout '({})'",
+                "'lifetime' parameter is redundant for the dictionary' of layout '{}'",
                 layout_name);
 
         return std::make_unique<DirectDictionary<dictionary_key_type>>(dict_id, dict_struct, std::move(source_ptr));
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 6bca6ac6a18..1cc73622592 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -42,6 +42,14 @@ public:
 
     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 0; }
@@ -66,6 +74,13 @@ public:
 
     DictionaryKeyType getKeyType() const override { return dictionary_key_type; }
 
+    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;
+
     ColumnPtr getColumn(
         const std::string& attribute_name,
         const DataTypePtr & result_type,
@@ -94,6 +109,7 @@ private:
     const DictionaryLifetime dict_lifetime;
 
     mutable std::atomic<size_t> query_count{0};
+    mutable std::atomic<size_t> found_count{0};
 };
 
 extern template class DirectDictionary<DictionaryKeyType::simple>;
diff --git a/src/Dictionaries/Embedded/CMakeLists.txt b/src/Dictionaries/Embedded/CMakeLists.txt
index 9324753808f..20c7b3c832a 100644
--- a/src/Dictionaries/Embedded/CMakeLists.txt
+++ b/src/Dictionaries/Embedded/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_dictionaries_embedded .)
 add_headers_and_sources(clickhouse_dictionaries_embedded GeodataProviders)
 add_library(clickhouse_dictionaries_embedded ${clickhouse_dictionaries_embedded_sources})
diff --git a/src/Dictionaries/Embedded/GeodataProviders/HierarchiesProvider.cpp b/src/Dictionaries/Embedded/GeodataProviders/HierarchiesProvider.cpp
index 3b8848ab19b..210459da0be 100644
--- a/src/Dictionaries/Embedded/GeodataProviders/HierarchiesProvider.cpp
+++ b/src/Dictionaries/Embedded/GeodataProviders/HierarchiesProvider.cpp
@@ -5,7 +5,9 @@
 #include <Poco/Exception.h>
 #include <Poco/Util/Application.h>
 #include "HierarchyFormatReader.h"
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 bool RegionsHierarchyDataSource::isModified() const
 {
@@ -27,14 +29,13 @@ RegionsHierarchiesDataProvider::RegionsHierarchiesDataProvider(const std::string
 
 void RegionsHierarchiesDataProvider::discoverFilesWithCustomHierarchies()
 {
-    std::string basename = Poco::Path(path).getBaseName();
+    std::string basename = fs::path(path).stem();
+    fs::path dir_path = fs::canonical(path).parent_path();
 
-    Poco::Path dir_path = Poco::Path(path).absolute().parent();
-
-    Poco::DirectoryIterator dir_end;
-    for (Poco::DirectoryIterator dir_it(dir_path); dir_it != dir_end; ++dir_it)
+    fs::directory_iterator dir_end;
+    for (fs::directory_iterator dir_it(dir_path); dir_it != dir_end; ++dir_it)
     {
-        std::string candidate_basename = dir_it.path().getBaseName();
+        std::string candidate_basename = dir_it->path().stem();
 
         if (candidate_basename.starts_with(basename)
             && (candidate_basename.size() > basename.size() + 1)
diff --git a/src/Dictionaries/Embedded/GeodataProviders/NamesProvider.cpp b/src/Dictionaries/Embedded/GeodataProviders/NamesProvider.cpp
index f3e49545481..5f79fda070f 100644
--- a/src/Dictionaries/Embedded/GeodataProviders/NamesProvider.cpp
+++ b/src/Dictionaries/Embedded/GeodataProviders/NamesProvider.cpp
@@ -2,7 +2,9 @@
 
 #include <IO/ReadBufferFromFile.h>
 #include "NamesFormatReader.h"
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 bool LanguageRegionsNamesDataSource::isModified() const
 {
@@ -11,7 +13,7 @@ bool LanguageRegionsNamesDataSource::isModified() const
 
 size_t LanguageRegionsNamesDataSource::estimateTotalSize() const
 {
-    return Poco::File(path).getSize();
+    return fs::file_size(path);
 }
 
 ILanguageRegionsNamesReaderPtr LanguageRegionsNamesDataSource::createReader()
@@ -39,7 +41,7 @@ RegionsNamesDataProvider::RegionsNamesDataProvider(const std::string & directory
 ILanguageRegionsNamesDataSourcePtr RegionsNamesDataProvider::getLanguageRegionsNamesSource(const std::string & language) const
 {
     const auto data_file = getDataFilePath(language);
-    if (Poco::File(data_file).exists())
+    if (fs::exists(data_file))
         return std::make_unique<LanguageRegionsNamesDataSource>(data_file, language);
     else
         return {};
diff --git a/src/Dictionaries/Embedded/RegionsNames.h b/src/Dictionaries/Embedded/RegionsNames.h
index 7216f238156..91830490325 100644
--- a/src/Dictionaries/Embedded/RegionsNames.h
+++ b/src/Dictionaries/Embedded/RegionsNames.h
@@ -84,7 +84,7 @@ public:
     {
         size_t language_id = static_cast<size_t>(language);
 
-        if (region_id >= names_refs[language_id].size())
+        if (region_id >= names_refs[language_id].size()) //-V1051
             return StringRef("", 0);
 
         StringRef ref = names_refs[language_id][region_id];
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index 8066de41b20..2fb1bcf89ac 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -20,6 +20,7 @@
 
 namespace DB
 {
+
 static const UInt64 max_block_size = 8192;
 
 namespace ErrorCodes
@@ -62,7 +63,7 @@ ExecutableDictionarySource::ExecutableDictionarySource(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     Block & sample_block_,
-    const Context & context_)
+    ContextConstPtr context_)
     : log(&Poco::Logger::get("ExecutableDictionarySource"))
     , dict_struct{dict_struct_}
     , implicit_key{config.getBool(config_prefix + ".implicit_key", false)}
@@ -97,25 +98,25 @@ ExecutableDictionarySource::ExecutableDictionarySource(const ExecutableDictionar
     , update_field{other.update_field}
     , format{other.format}
     , sample_block{other.sample_block}
-    , context(other.context)
+    , context(Context::createCopy(other.context))
 {
 }
 
 BlockInputStreamPtr ExecutableDictionarySource::loadAll()
 {
     if (implicit_key)
-        throw Exception("ExecutableDictionarySource with implicit_key does not support loadAll method", ErrorCodes::UNSUPPORTED_METHOD);
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutableDictionarySource with implicit_key does not support loadAll method");
 
     LOG_TRACE(log, "loadAll {}", toString());
     auto process = ShellCommand::execute(command);
-    auto input_stream = context.getInputFormat(format, process->out, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, process->out, sample_block, max_block_size);
     return std::make_shared<ShellCommandOwningBlockInputStream>(log, input_stream, std::move(process));
 }
 
 BlockInputStreamPtr ExecutableDictionarySource::loadUpdatedAll()
 {
     if (implicit_key)
-        throw Exception("ExecutableDictionarySource with implicit_key does not support loadUpdatedAll method", ErrorCodes::UNSUPPORTED_METHOD);
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutableDictionarySource with implicit_key does not support loadUpdatedAll method");
 
     time_t new_update_time = time(nullptr);
     SCOPE_EXIT(update_time = new_update_time);
@@ -126,7 +127,7 @@ BlockInputStreamPtr ExecutableDictionarySource::loadUpdatedAll()
 
     LOG_TRACE(log, "loadUpdatedAll {}", command_with_update_field);
     auto process = ShellCommand::execute(command_with_update_field);
-    auto input_stream = context.getInputFormat(format, process->out, sample_block, max_block_size);
+    auto input_stream = context->getInputFormat(format, process->out, sample_block, max_block_size);
     return std::make_shared<ShellCommandOwningBlockInputStream>(log, input_stream, std::move(process));
 }
 
@@ -139,7 +140,7 @@ namespace
     {
     public:
         BlockInputStreamWithBackgroundThread(
-            const Context & context,
+            ContextConstPtr context,
             const std::string & format,
             const Block & sample_block,
             const std::string & command_str,
@@ -150,7 +151,7 @@ namespace
             send_data(std::move(send_data_)),
             thread([this] { send_data(command->in); })
         {
-            stream = context.getInputFormat(format, command->out, sample_block, max_block_size);
+            stream = context->getInputFormat(format, command->out, sample_block, max_block_size);
         }
 
         ~BlockInputStreamWithBackgroundThread() override
@@ -222,7 +223,7 @@ BlockInputStreamPtr ExecutableDictionarySource::getStreamForBlock(const Block &
         context, format, sample_block, command, log,
         [block, this](WriteBufferFromFile & out) mutable
         {
-            auto output_stream = context.getOutputStream(format, out, block.cloneEmpty());
+            auto output_stream = context->getOutputStream(format, out, block.cloneEmpty());
             formatBlock(output_stream, block);
             out.close();
         });
@@ -264,9 +265,9 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextConstPtr context,
                                  const std::string & /* default_database */,
-                                 bool check_config) -> DictionarySourcePtr
+                                 bool created_from_ddl) -> DictionarySourcePtr
     {
         if (dict_struct.has_expressions)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `executable` does not support attribute expressions");
@@ -274,10 +275,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 (check_config)
+        if (created_from_ddl)
             throw Exception(ErrorCodes::DICTIONARY_ACCESS_DENIED, "Dictionaries with executable dictionary source are not allowed to be created from DDL query");
 
-        Context context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
 
         return std::make_unique<ExecutableDictionarySource>(
             dict_struct, config, config_prefix + ".executable",
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index 9dc152bf580..4b2326b2a58 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -20,7 +20,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         Block & sample_block_,
-        const Context & context_);
+        ContextConstPtr context_);
 
     ExecutableDictionarySource(const ExecutableDictionarySource & other);
     ExecutableDictionarySource & operator=(const ExecutableDictionarySource &) = delete;
@@ -58,7 +58,7 @@ private:
     const std::string update_field;
     const std::string format;
     Block sample_block;
-    Context context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index 0c9ca4ce714..21818baa658 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -32,7 +32,7 @@ ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Configuration & configuration_,
     Block & sample_block_,
-    const Context & context_)
+    ContextConstPtr context_)
     : log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
     , dict_struct{dict_struct_}
     , configuration{configuration_}
@@ -63,19 +63,19 @@ ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(const ExecutableP
     , dict_struct{other.dict_struct}
     , configuration{other.configuration}
     , sample_block{other.sample_block}
-    , context{other.context}
+    , context{Context::createCopy(other.context)}
     , process_pool{std::make_shared<ProcessPool>(configuration.pool_size)}
 {
 }
 
 BlockInputStreamPtr ExecutablePoolDictionarySource::loadAll()
 {
-    throw Exception("ExecutablePoolDictionarySource with implicit_key does not support loadAll method", ErrorCodes::UNSUPPORTED_METHOD);
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutablePoolDictionarySource with implicit_key does not support loadAll method");
 }
 
 BlockInputStreamPtr ExecutablePoolDictionarySource::loadUpdatedAll()
 {
-    throw Exception("ExecutablePoolDictionarySource with implicit_key does not support loadAll method", ErrorCodes::UNSUPPORTED_METHOD);
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutablePoolDictionarySource with implicit_key does not support loadAll method");
 }
 
 namespace
@@ -226,13 +226,13 @@ BlockInputStreamPtr ExecutablePoolDictionarySource::getStreamForBlock(const Bloc
             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 read_stream = context->getInputFormat(configuration.format, process->out, sample_block, rows_to_read);
 
     auto stream = std::make_unique<PoolBlockInputStreamWithBackgroundThread>(
         process_pool, std::move(process), std::move(read_stream), rows_to_read, log,
         [block, this](WriteBufferFromFile & out) mutable
         {
-            auto output_stream = context.getOutputStream(configuration.format, out, block.cloneEmpty());
+            auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
             formatBlock(output_stream, block);
         });
 
@@ -273,9 +273,9 @@ void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextConstPtr context,
                                  const std::string & /* default_database */,
-                                 bool check_config) -> DictionarySourcePtr
+                                 bool created_from_ddl) -> DictionarySourcePtr
     {
         if (dict_struct.has_expressions)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `executable_pool` does not support attribute expressions");
@@ -283,23 +283,23 @@ 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 (check_config)
+        if (created_from_ddl)
             throw Exception(ErrorCodes::DICTIONARY_ACCESS_DENIED, "Dictionaries with executable pool dictionary source are not allowed to be created from DDL query");
 
-        Context context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        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();
+        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);
+        context_local_copy->setSettings(settings_no_parallel_parsing);
 
         String configuration_config_prefix = config_prefix + ".executable_pool";
 
         size_t max_command_execution_time = config.getUInt64(configuration_config_prefix + ".max_command_execution_time", 10);
 
-        size_t max_execution_time_seconds = static_cast<size_t>(context.getSettings().max_execution_time.totalSeconds());
+        size_t max_execution_time_seconds = static_cast<size_t>(context->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;
 
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
index da75881b799..9bf6e89c1f0 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.h
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -1,7 +1,8 @@
 #pragma once
 
+#include <common/BorrowedObjectPool.h>
+
 #include <Core/Block.h>
-#include <Common/BorrowedObjectPool.h>
 #include <Interpreters/Context.h>
 
 #include "IDictionarySource.h"
@@ -41,7 +42,7 @@ public:
         const DictionaryStructure & dict_struct_,
         const Configuration & configuration_,
         Block & sample_block_,
-        const Context & context_);
+        ContextConstPtr context_);
 
     ExecutablePoolDictionarySource(const ExecutablePoolDictionarySource & other);
     ExecutablePoolDictionarySource & operator=(const ExecutablePoolDictionarySource &) = delete;
@@ -77,7 +78,7 @@ private:
     const Configuration configuration;
 
     Block sample_block;
-    Context context;
+    ContextConstPtr context;
     std::shared_ptr<ProcessPool> process_pool;
 };
 
diff --git a/src/Dictionaries/ExternalQueryBuilder.cpp b/src/Dictionaries/ExternalQueryBuilder.cpp
index 454c918fd1f..8c6e9f60afb 100644
--- a/src/Dictionaries/ExternalQueryBuilder.cpp
+++ b/src/Dictionaries/ExternalQueryBuilder.cpp
@@ -173,7 +173,7 @@ std::string ExternalQueryBuilder::composeUpdateQuery(const std::string & update_
 std::string ExternalQueryBuilder::composeLoadIdsQuery(const std::vector<UInt64> & ids)
 {
     if (!dict_struct.id)
-        throw Exception{"Simple key required for method", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Simple key required for method");
 
     WriteBufferFromOwnString out;
     writeString("SELECT ", out);
@@ -244,10 +244,10 @@ std::string ExternalQueryBuilder::composeLoadKeysQuery(
     const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix)
 {
     if (!dict_struct.key)
-        throw Exception{"Composite key required for method", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
 
     if (key_columns.size() != dict_struct.key->size())
-        throw Exception{"The size of key_columns does not equal to the size of dictionary key", ErrorCodes::LOGICAL_ERROR};
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The size of key_columns does not equal to the size of dictionary key");
 
     WriteBufferFromOwnString out;
     writeString("SELECT ", out);
@@ -386,7 +386,7 @@ void ExternalQueryBuilder::composeInWithTuples(const Columns & key_columns, cons
 void ExternalQueryBuilder::composeKeyTupleDefinition(WriteBuffer & out, size_t beg, size_t end) const
 {
     if (!dict_struct.key)
-        throw Exception{"Composite key required for method", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
 
     writeChar('(', out);
 
diff --git a/src/Dictionaries/FileDictionarySource.cpp b/src/Dictionaries/FileDictionarySource.cpp
index addc2adef02..49e87e24543 100644
--- a/src/Dictionaries/FileDictionarySource.cpp
+++ b/src/Dictionaries/FileDictionarySource.cpp
@@ -1,10 +1,10 @@
 #include "FileDictionarySource.h"
+#include <common/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 <Poco/File.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <common/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
@@ -24,18 +24,14 @@ namespace ErrorCodes
 
 FileDictionarySource::FileDictionarySource(
     const std::string & filepath_, const std::string & format_,
-    Block & sample_block_, const Context & context_, bool check_config)
+    Block & sample_block_, ContextConstPtr context_, bool created_from_ddl)
     : filepath{filepath_}
     , format{format_}
     , sample_block{sample_block_}
     , context(context_)
 {
-    if (check_config)
-    {
-        const String user_files_path = context.getUserFilesPath();
-        if (!startsWith(filepath, user_files_path))
-            throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", filepath, user_files_path);
-    }
+    if (created_from_ddl && !pathStartsWith(filepath, context->getUserFilesPath()))
+        throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", filepath, context->getUserFilesPath());
 }
 
 
@@ -43,7 +39,7 @@ FileDictionarySource::FileDictionarySource(const FileDictionarySource & other)
     : filepath{other.filepath}
     , format{other.format}
     , sample_block{other.sample_block}
-    , context(other.context)
+    , context(Context::createCopy(other.context))
     , last_modification{other.last_modification}
 {
 }
@@ -53,7 +49,7 @@ BlockInputStreamPtr 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 stream = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
     last_modification = getLastModification();
 
     return std::make_shared<OwningBlockInputStream<ReadBuffer>>(stream, std::move(in_ptr));
@@ -68,28 +64,29 @@ std::string FileDictionarySource::toString() const
 
 Poco::Timestamp FileDictionarySource::getLastModification() const
 {
-    return Poco::File{filepath}.getLastModified();
+    return FS::getModificationTimestamp(filepath);
 }
 
+
 void registerDictionarySourceFile(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextConstPtr context,
                                  const std::string & /* default_database */,
-                                 bool check_config) -> DictionarySourcePtr
+                                 bool created_from_ddl) -> DictionarySourcePtr
     {
         if (dict_struct.has_expressions)
-            throw Exception{"Dictionary source of type `file` does not support attribute expressions", ErrorCodes::LOGICAL_ERROR};
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `file` does not support attribute expressions");
 
         const auto filepath = config.getString(config_prefix + ".file.path");
         const auto format = config.getString(config_prefix + ".file.format");
 
-        Context context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
 
-        return std::make_unique<FileDictionarySource>(filepath, format, sample_block, context_local_copy, check_config);
+        return std::make_unique<FileDictionarySource>(filepath, format, sample_block, context_local_copy, created_from_ddl);
     };
 
     factory.registerSource("file", create_table_source);
diff --git a/src/Dictionaries/FileDictionarySource.h b/src/Dictionaries/FileDictionarySource.h
index fa47b280911..d31a6dedb7f 100644
--- a/src/Dictionaries/FileDictionarySource.h
+++ b/src/Dictionaries/FileDictionarySource.h
@@ -17,7 +17,7 @@ class FileDictionarySource final : public IDictionarySource
 {
 public:
     FileDictionarySource(const std::string & filepath_, const std::string & format_,
-        Block & sample_block_, const Context & context_, bool check_config);
+        Block & sample_block_, ContextConstPtr context_, bool created_from_ddl);
 
     FileDictionarySource(const FileDictionarySource & other);
 
@@ -25,17 +25,17 @@ public:
 
     BlockInputStreamPtr loadUpdatedAll() override
     {
-        throw Exception{"Method loadUpdatedAll is unsupported for FileDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for FileDictionarySource");
     }
 
     BlockInputStreamPtr loadIds(const std::vector<UInt64> & /*ids*/) override
     {
-        throw Exception{"Method loadIds is unsupported for FileDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        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
     {
-        throw Exception{"Method loadKeys is unsupported for FileDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadKeys is unsupported for FileDictionarySource");
     }
 
     bool isModified() const override
@@ -61,7 +61,7 @@ private:
     const std::string filepath;
     const std::string format;
     Block sample_block;
-    const Context context;
+    ContextConstPtr context;
     Poco::Timestamp last_modification;
 };
 
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 2d8d208d76b..f58384a3b8e 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -2,6 +2,7 @@
 
 #include <Core/Defines.h>
 #include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
 
 #include <DataTypes/DataTypesDecimal.h>
 #include <IO/WriteHelpers.h>
@@ -23,23 +24,20 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
 }
 
-static const auto initial_array_size = 1024;
-static const auto max_array_size = 500000;
-
 FlatDictionary::FlatDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
     const DictionaryLifetime dict_lifetime_,
-    bool require_nonempty_,
-    BlockPtr saved_block_)
+    Configuration configuration_,
+    BlockPtr update_field_loaded_block_)
     : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
     , source_ptr{std::move(source_ptr_)}
     , dict_lifetime(dict_lifetime_)
-    , require_nonempty(require_nonempty_)
-    , loaded_ids(initial_array_size, false)
-    , saved_block{std::move(saved_block_)}
+    , configuration(configuration_)
+    , loaded_keys(configuration.initial_array_size, false)
+    , update_field_loaded_block(std::move(update_field_loaded_block_))
 {
     createAttributes();
     loadData();
@@ -126,20 +124,23 @@ ColumnPtr FlatDictionary::getColumn(
 ColumnUInt8::Ptr FlatDictionary::hasKeys(const Columns & key_columns, const DataTypes &) const
 {
     PaddedPODArray<UInt64> backup_storage;
-    const auto& ids = getColumnVectorData(this, key_columns.front(), backup_storage);
+    const auto & keys = getColumnVectorData(this, key_columns.front(), backup_storage);
+    size_t keys_size = keys.size();
 
-    auto result = ColumnUInt8::create(ext::size(ids));
-    auto& out = result->getData();
+    auto result = ColumnUInt8::create(keys_size);
+    auto & out = result->getData();
 
-    const auto ids_count = ext::size(ids);
+    size_t keys_found = 0;
 
-    for (const auto i : ext::range(0, ids_count))
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
     {
-        const auto id = ids[i];
-        out[i] = id < loaded_ids.size() && loaded_ids[id];
+        const auto key = keys[key_index];
+        out[key_index] = key < loaded_keys.size() && loaded_keys[key];
+        keys_found += out[key_index];
     }
 
-    query_count.fetch_add(ids_count, 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;
 }
@@ -153,28 +154,24 @@ ColumnPtr FlatDictionary::getHierarchy(ColumnPtr key_column, const DataTypePtr &
     const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
 
     const UInt64 null_value = std::get<UInt64>(hierarchical_attribute.null_values);
-    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.arrays);
+    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
 
-    auto is_key_valid_func = [&, this](auto & key)
-    {
-        return key < loaded_ids.size() && loaded_ids[key];
-    };
+    auto is_key_valid_func = [&, this](auto & key) { return key < loaded_keys.size() && loaded_keys[key]; };
+
+    size_t keys_found = 0;
 
     auto get_parent_key_func = [&, this](auto & hierarchy_key)
     {
-        std::optional<UInt64> result;
-
-        if (hierarchy_key >= loaded_ids.size() || !loaded_ids[hierarchy_key])
-            return result;
-
-        result = parent_keys[hierarchy_key];
-
+        bool is_key_valid = hierarchy_key < loaded_keys.size() && loaded_keys[hierarchy_key];
+        std::optional<UInt64> result = is_key_valid ? std::make_optional(parent_keys[hierarchy_key]) : std::nullopt;
+        keys_found += result.has_value();
         return result;
     };
 
     auto dictionary_hierarchy_array = getKeysHierarchyArray(keys, null_value, is_key_valid_func, get_parent_key_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;
 }
@@ -194,28 +191,24 @@ ColumnUInt8::Ptr FlatDictionary::isInHierarchy(
     const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
 
     const UInt64 null_value = std::get<UInt64>(hierarchical_attribute.null_values);
-    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.arrays);
+    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
 
-    auto is_key_valid_func = [&, this](auto & key)
-    {
-        return key < loaded_ids.size() && loaded_ids[key];
-    };
+    auto is_key_valid_func = [&, this](auto & key) { return key < loaded_keys.size() && loaded_keys[key]; };
+
+    size_t keys_found = 0;
 
     auto get_parent_key_func = [&, this](auto & hierarchy_key)
     {
-        std::optional<UInt64> result;
-
-        if (hierarchy_key >= loaded_ids.size() || !loaded_ids[hierarchy_key])
-            return result;
-
-        result = parent_keys[hierarchy_key];
-
+        bool is_key_valid = hierarchy_key < loaded_keys.size() && loaded_keys[hierarchy_key];
+        std::optional<UInt64> result = is_key_valid ? std::make_optional(parent_keys[hierarchy_key]) : std::nullopt;
+        keys_found += result.has_value();
         return result;
     };
 
     auto result = getKeysIsInHierarchyColumn(keys, keys_in, null_value, is_key_valid_func, get_parent_key_func);
 
     query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
@@ -230,7 +223,7 @@ ColumnPtr FlatDictionary::getDescendants(
 
     size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
     const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
-    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.arrays);
+    const ContainerType<UInt64> & parent_keys = std::get<ContainerType<UInt64>>(hierarchical_attribute.container);
 
     HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
 
@@ -238,13 +231,15 @@ ColumnPtr FlatDictionary::getDescendants(
     {
         auto parent_key = parent_keys[i];
 
-        if (loaded_ids[i])
+        if (loaded_keys[i])
             parent_to_child[parent_key].emplace_back(static_cast<UInt64>(i));
     }
 
-    auto result = getKeysDescendantsArray(keys, parent_to_child, level);
+    size_t keys_found;
+    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;
 }
@@ -260,22 +255,39 @@ void FlatDictionary::createAttributes()
 
 void FlatDictionary::blockToAttributes(const Block & block)
 {
-    const IColumn & id_column = *block.safeGetByPosition(0).column;
-    element_count += id_column.size();
+    const auto keys_column = block.safeGetByPosition(0).column;
 
-    for (const size_t attribute_idx : ext::range(0, attributes.size()))
+    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;
+
+    size_t key_offset = 1;
+    for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
     {
-        const IColumn & attribute_column = *block.safeGetByPosition(attribute_idx + 1).column;
-        Attribute & attribute = attributes[attribute_idx];
+        const IColumn & attribute_column = *block.safeGetByPosition(attribute_index + key_offset).column;
+        Attribute & attribute = attributes[attribute_index];
 
-        for (const auto row_idx : ext::range(0, id_column.size()))
-            setAttributeValue(attribute, id_column[row_idx].get<UInt64>(), attribute_column[row_idx]);
+        for (size_t i = 0; i < keys.size(); ++i)
+        {
+            auto key = keys[i];
+
+            if (already_processed_keys.find(key) != nullptr)
+                continue;
+            already_processed_keys.insert(key);
+
+            setAttributeValue(attribute, key, attribute_column[i]);
+            ++element_count;
+        }
+
+        already_processed_keys.clear();
     }
 }
 
 void FlatDictionary::updateData()
 {
-    if (!saved_block || saved_block->rows() == 0)
+    if (!update_field_loaded_block || update_field_loaded_block->rows() == 0)
     {
         auto stream = source_ptr->loadUpdatedAll();
         stream->readPrefix();
@@ -283,12 +295,13 @@ void FlatDictionary::updateData()
         while (const auto block = stream->read())
         {
             /// We are using this to keep saved data if input stream consists of multiple blocks
-            if (!saved_block)
-                saved_block = std::make_shared<DB::Block>(block.cloneEmpty());
-            for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
+            if (!update_field_loaded_block)
+                update_field_loaded_block = std::make_shared<DB::Block>(block.cloneEmpty());
+
+            for (size_t column_index = 0; column_index < block.columns(); ++column_index)
             {
-                const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
-                MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
+                const IColumn & update_column = *block.getByPosition(column_index).column.get();
+                MutableColumnPtr saved_column = update_field_loaded_block->getByPosition(column_index).column->assumeMutable();
                 saved_column->insertRangeFrom(update_column, 0, update_column.size());
             }
         }
@@ -297,51 +310,14 @@ void FlatDictionary::updateData()
     else
     {
         auto stream = source_ptr->loadUpdatedAll();
-        stream->readPrefix();
-
-        while (Block block = stream->read())
-        {
-            const auto & saved_id_column = *saved_block->safeGetByPosition(0).column;
-            const auto & update_id_column = *block.safeGetByPosition(0).column;
-
-            std::unordered_map<UInt64, std::vector<size_t>> update_ids;
-            for (size_t row = 0; row < update_id_column.size(); ++row)
-            {
-                const auto id = update_id_column.get64(row);
-                update_ids[id].push_back(row);
-            }
-
-            const size_t saved_rows = saved_id_column.size();
-            IColumn::Filter filter(saved_rows);
-            std::unordered_map<UInt64, std::vector<size_t>>::iterator it;
-
-            for (size_t row = 0; row < saved_id_column.size(); ++row)
-            {
-                auto id = saved_id_column.get64(row);
-                it = update_ids.find(id);
-
-                if (it != update_ids.end())
-                    filter[row] = 0;
-                else
-                    filter[row] = 1;
-            }
-
-            auto block_columns = block.mutateColumns();
-            for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
-            {
-                auto & column = saved_block->safeGetByPosition(attribute_idx).column;
-                const auto & filtered_column = column->filter(filter, -1);
-
-                block_columns[attribute_idx]->insertRangeFrom(*filtered_column.get(), 0, filtered_column->size());
-            }
-
-            saved_block->setColumns(std::move(block_columns));
-        }
-        stream->readSuffix();
+        mergeBlockWithStream<DictionaryKeyType::simple>(
+            dict_struct.getKeysSize(),
+            *update_field_loaded_block,
+            stream);
     }
 
-    if (saved_block)
-        blockToAttributes(*saved_block.get());
+    if (update_field_loaded_block)
+        blockToAttributes(*update_field_loaded_block.get());
 }
 
 void FlatDictionary::loadData()
@@ -359,26 +335,8 @@ void FlatDictionary::loadData()
     else
         updateData();
 
-    if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.", ErrorCodes::DICTIONARY_IS_EMPTY};
-}
-
-
-template <typename T>
-void FlatDictionary::addAttributeSize(const Attribute & attribute)
-{
-    const auto & array_ref = std::get<ContainerType<T>>(attribute.arrays);
-    bytes_allocated += sizeof(PaddedPODArray<T>) + array_ref.allocated_bytes();
-    bucket_count = array_ref.capacity();
-}
-
-template <>
-void FlatDictionary::addAttributeSize<String>(const Attribute & attribute)
-{
-    const auto & array_ref = std::get<ContainerType<StringRef>>(attribute.arrays);
-    bytes_allocated += sizeof(PaddedPODArray<StringRef>) + array_ref.allocated_bytes();
-    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-    bucket_count = array_ref.capacity();
+    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);
 }
 
 void FlatDictionary::calculateBytesAllocated()
@@ -391,102 +349,117 @@ void FlatDictionary::calculateBytesAllocated()
         {
             using Type = std::decay_t<decltype(dictionary_attribute_type)>;
             using AttributeType = typename Type::AttributeType;
+            using ValueType = DictionaryValueType<AttributeType>;
 
-            addAttributeSize<AttributeType>(attribute);
+            const auto & container = std::get<ContainerType<ValueType>>(attribute.container);
+            bytes_allocated += sizeof(PaddedPODArray<ValueType>) + 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 (update_field_loaded_block)
+        bytes_allocated += update_field_loaded_block->allocatedBytes();
 }
 
-
-template <typename T>
-void FlatDictionary::createAttributeImpl(Attribute & attribute, const Field & null_value)
+FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttribute & dictionary_attribute, const Field & null_value)
 {
-    attribute.null_values = T(null_value.get<T>());
-    const auto & null_value_ref = std::get<T>(attribute.null_values);
-    attribute.arrays.emplace<ContainerType<T>>(initial_array_size, null_value_ref);
-}
+    auto nullable_set = dictionary_attribute.is_nullable ? std::make_optional<NullableSet>() : std::optional<NullableSet>{};
+    Attribute attribute{dictionary_attribute.underlying_type, std::move(nullable_set), {}, {}, {}};
 
-template <>
-void FlatDictionary::createAttributeImpl<String>(Attribute & attribute, const Field & null_value)
-{
-    attribute.string_arena = std::make_unique<Arena>();
-    const String & string = null_value.get<String>();
-    const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
-    attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
-    attribute.arrays.emplace<ContainerType<StringRef>>(initial_array_size, StringRef(string_in_arena, string.size()));
-}
-
-FlatDictionary::Attribute FlatDictionary::createAttribute(const DictionaryAttribute& attribute, const Field & null_value)
-{
-    auto nullable_set = attribute.is_nullable ? std::make_optional<NullableSet>() : std::optional<NullableSet>{};
-    Attribute attr{attribute.underlying_type, std::move(nullable_set), {}, {}, {}};
-
-    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>;
 
-        createAttributeImpl<AttributeType>(attr, null_value);
+        if constexpr (std::is_same_v<ValueType, StringRef>)
+        {
+            attribute.string_arena = std::make_unique<Arena>();
+            const String & string = null_value.get<String>();
+            const char * string_in_arena = attribute.string_arena->insert(string.data(), string.size());
+            attribute.null_values.emplace<StringRef>(string_in_arena, string.size());
+        }
+        else
+            attribute.null_values = ValueType(null_value.get<NearestFieldType<ValueType>>());
+
+        const auto & null_value_ref = std::get<ValueType>(attribute.null_values);
+        attribute.container.emplace<ContainerType<ValueType>>(configuration.initial_array_size, null_value_ref);
     };
 
-    callOnDictionaryAttributeType(attribute.underlying_type, type_call);
+    callOnDictionaryAttributeType(dictionary_attribute.underlying_type, type_call);
 
-    return attr;
+    return attribute;
 }
 
-
 template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
 void FlatDictionary::getItemsImpl(
     const Attribute & attribute,
-    const PaddedPODArray<UInt64> & ids,
+    const PaddedPODArray<UInt64> & keys,
     ValueSetter && set_value,
     DefaultValueExtractor & default_value_extractor) const
 {
-    const auto & attr = std::get<ContainerType<AttributeType>>(attribute.arrays);
-    const auto rows = ext::size(ids);
+    const auto & container = std::get<ContainerType<AttributeType>>(attribute.container);
+    const auto rows = keys.size();
 
-    for (const auto row : ext::range(0, rows))
+    size_t keys_found = 0;
+
+    for (size_t row = 0; row < rows; ++row)
     {
-        const auto id = ids[row];
-        set_value(row, id < ext::size(attr) && loaded_ids[id] ? static_cast<OutputType>(attr[id]) : default_value_extractor[row]);
+        const auto key = keys[row];
+
+        if (key < loaded_keys.size() && loaded_keys[key])
+        {
+            set_value(row, static_cast<OutputType>(container[key]));
+            ++keys_found;
+        }
+        else
+            set_value(row, default_value_extractor[row]);
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
 template <typename T>
-void FlatDictionary::resize(Attribute & attribute, const UInt64 id)
+void FlatDictionary::resize(Attribute & attribute, UInt64 key)
 {
-    if (id >= max_array_size)
-        throw Exception{full_name + ": identifier should be less than " + toString(max_array_size), ErrorCodes::ARGUMENT_OUT_OF_BOUND};
+    if (key >= configuration.max_array_size)
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+            "{}: identifier should be less than {}",
+            full_name,
+            toString(configuration.max_array_size));
 
-    auto & array = std::get<ContainerType<T>>(attribute.arrays);
-    if (id >= array.size())
+    auto & container = std::get<ContainerType<T>>(attribute.container);
+
+    if (key >= container.size())
     {
-        const size_t elements_count = id + 1; //id=0 -> elements_count=1
-        loaded_ids.resize(elements_count, false);
-        array.resize_fill(elements_count, std::get<T>(attribute.null_values));
+        const size_t elements_count = key + 1; //id=0 -> elements_count=1
+        loaded_keys.resize(elements_count, false);
+        container.resize_fill(elements_count, std::get<T>(attribute.null_values));
     }
 }
 
 template <typename T>
-void FlatDictionary::setAttributeValueImpl(Attribute & attribute, const UInt64 id, const T & value)
+void FlatDictionary::setAttributeValueImpl(Attribute & attribute, UInt64 key, const T & value)
 {
-    auto & array = std::get<ContainerType<T>>(attribute.arrays);
-    array[id] = value;
-    loaded_ids[id] = true;
+    auto & array = std::get<ContainerType<T>>(attribute.container);
+    array[key] = value;
+    loaded_keys[key] = true;
 }
 
 template <>
-void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, const UInt64 id, const String & value)
+void FlatDictionary::setAttributeValueImpl<String>(Attribute & attribute, UInt64 key, const String & value)
 {
     const auto * string_in_arena = attribute.string_arena->insert(value.data(), value.size());
-    setAttributeValueImpl(attribute, id, StringRef{string_in_arena, value.size()});
+    setAttributeValueImpl(attribute, key, StringRef{string_in_arena, value.size()});
 }
 
-void FlatDictionary::setAttributeValue(Attribute & attribute, const UInt64 id, const Field & value)
+void FlatDictionary::setAttributeValue(Attribute & attribute, const UInt64 key, const Field & value)
 {
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
@@ -494,68 +467,75 @@ void FlatDictionary::setAttributeValue(Attribute & attribute, const UInt64 id, c
         using AttributeType = typename Type::AttributeType;
         using ResizeType = std::conditional_t<std::is_same_v<AttributeType, String>, StringRef, AttributeType>;
 
-        resize<ResizeType>(attribute, id);
+        resize<ResizeType>(attribute, key);
 
         if (attribute.nullable_set)
         {
             if (value.isNull())
             {
-                attribute.nullable_set->insert(id);
-                loaded_ids[id] = true;
+                attribute.nullable_set->insert(key);
+                loaded_keys[key] = true;
                 return;
             }
-            else
-            {
-                attribute.nullable_set->erase(id);
-            }
         }
 
-        setAttributeValueImpl<AttributeType>(attribute, id, value.get<AttributeType>());
+        setAttributeValueImpl<AttributeType>(attribute, key, value.get<AttributeType>());
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
-PaddedPODArray<UInt64> FlatDictionary::getIds() const
-{
-    const auto ids_count = ext::size(loaded_ids);
-
-    PaddedPODArray<UInt64> ids;
-    ids.reserve(ids_count);
-
-    for (auto idx : ext::range(0, ids_count))
-        if (loaded_ids[idx])
-            ids.push_back(idx);
-    return ids;
-}
-
 BlockInputStreamPtr FlatDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
 {
-    return std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, getIds(), column_names);
+    const auto keys_count = loaded_keys.size();
+
+    PaddedPODArray<UInt64> keys;
+    keys.reserve(keys_count);
+
+    for (size_t key_index = 0; key_index < keys_count; ++key_index)
+        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);
 }
 
 void registerDictionaryFlat(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) -> DictionaryPtr
+                            const DictionaryStructure & dict_struct,
+                            const Poco::Util::AbstractConfiguration & config,
+                            const std::string & config_prefix,
+                            DictionarySourcePtr source_ptr,
+                            ContextConstPtr /* context */,
+                            bool /* created_from_ddl */) -> DictionaryPtr
     {
         if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'flat'", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for dictionary of layout 'flat'");
 
         if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{full_name
-                                + ": elements .structure.range_min and .structure.range_max should be defined only "
-                                  "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
+            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);
+
+        static constexpr size_t default_initial_array_size = 1024;
+        static constexpr size_t default_max_array_size = 500000;
+
+        String dictionary_layout_prefix = config_prefix + ".layout" + ".flat";
+
+        FlatDictionary::Configuration configuration
+        {
+            .initial_array_size = config.getUInt64(dictionary_layout_prefix + ".initial_array_size", default_initial_array_size),
+            .max_array_size = config.getUInt64(dictionary_layout_prefix + ".max_array_size", default_max_array_size),
+            .require_nonempty = config.getBool(config_prefix + ".require_nonempty", false)
+        };
 
         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<FlatDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+
+        return std::make_unique<FlatDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, std::move(configuration));
     };
+
     factory.registerLayout("flat", create_layout, false);
 }
 
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index 09721bf1a99..211b1cdc33d 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -26,13 +26,20 @@ namespace DB
 class FlatDictionary final : public IDictionary
 {
 public:
+    struct Configuration
+    {
+        size_t initial_array_size;
+        size_t max_array_size;
+        bool require_nonempty;
+    };
+
     FlatDictionary(
         const StorageID & dict_id_,
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
         const DictionaryLifetime dict_lifetime_,
-        bool require_nonempty_,
-        BlockPtr saved_block_ = nullptr);
+        Configuration configuration_,
+        BlockPtr update_field_loaded_block_ = nullptr);
 
     std::string getTypeName() const override { return "Flat"; }
 
@@ -40,6 +47,14 @@ public:
 
     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; }
@@ -48,7 +63,7 @@ public:
 
     std::shared_ptr<const IExternalLoadable> clone() const override
     {
-        return std::make_shared<FlatDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, require_nonempty, saved_block);
+        return std::make_shared<FlatDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, configuration, update_field_loaded_block);
     }
 
     const IDictionarySource * getSource() const override { return source_ptr.get(); }
@@ -106,15 +121,20 @@ private:
             UInt32,
             UInt64,
             UInt128,
+            UInt256,
             Int8,
             Int16,
             Int32,
             Int64,
+            Int128,
+            Int256,
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
+            UUID,
             StringRef>
             null_values;
         std::variant<
@@ -123,17 +143,22 @@ private:
             ContainerType<UInt32>,
             ContainerType<UInt64>,
             ContainerType<UInt128>,
+            ContainerType<UInt256>,
             ContainerType<Int8>,
             ContainerType<Int16>,
             ContainerType<Int32>,
             ContainerType<Int64>,
+            ContainerType<Int128>,
+            ContainerType<Int256>,
             ContainerType<Decimal32>,
             ContainerType<Decimal64>,
             ContainerType<Decimal128>,
+            ContainerType<Decimal256>,
             ContainerType<Float32>,
             ContainerType<Float64>,
+            ContainerType<UUID>,
             ContainerType<StringRef>>
-            arrays;
+            container;
 
         std::unique_ptr<Arena> string_arena;
     };
@@ -143,54 +168,40 @@ private:
     void updateData();
     void loadData();
 
-    template <typename T>
-    void addAttributeSize(const Attribute & attribute);
-
     void calculateBytesAllocated();
 
-    template <typename T>
-    static void createAttributeImpl(Attribute & attribute, const Field & null_value);
-
-    static Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
+    Attribute createAttribute(const DictionaryAttribute& attribute, const Field & null_value);
 
     template <typename AttributeType, typename OutputType, typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
-        const PaddedPODArray<UInt64> & ids,
+        const PaddedPODArray<UInt64> & keys,
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
     template <typename T>
-    void resize(Attribute & attribute, const UInt64 id);
+    void resize(Attribute & attribute, UInt64 key);
 
     template <typename T>
-    void setAttributeValueImpl(Attribute & attribute, const UInt64 id, const T & value);
+    void setAttributeValueImpl(Attribute & attribute, UInt64 key, const T & value);
 
-    void setAttributeValue(Attribute & attribute, const UInt64 id, const Field & value);
-
-    const Attribute & getAttribute(const std::string & attribute_name) const;
-
-    template <typename ChildType, typename AncestorType>
-    void isInImpl(const ChildType & child_ids, const AncestorType & ancestor_ids, PaddedPODArray<UInt8> & out) const;
-
-    PaddedPODArray<UInt64> getIds() const;
+    void setAttributeValue(Attribute & attribute, UInt64 key, const Field & value);
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
     const DictionaryLifetime dict_lifetime;
-    const bool require_nonempty;
+    const Configuration configuration;
 
-    std::map<std::string, size_t> attribute_index_by_name;
     std::vector<Attribute> attributes;
-    std::vector<bool> loaded_ids;
+    std::vector<bool> loaded_keys;
 
     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};
 
-    /// TODO: Remove
-    BlockPtr saved_block;
+    BlockPtr update_field_loaded_block;
 };
 
 }
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index 62bf478afc4..b3527b06117 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -22,6 +22,7 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
 }
+
 static const UInt64 max_block_size = 8192;
 
 
@@ -30,8 +31,8 @@ HTTPDictionarySource::HTTPDictionarySource(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     Block & sample_block_,
-    const Context & context_,
-    bool check_config)
+    ContextConstPtr context_,
+    bool created_from_ddl)
     : log(&Poco::Logger::get("HTTPDictionarySource"))
     , update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
@@ -42,9 +43,8 @@ HTTPDictionarySource::HTTPDictionarySource(
     , context(context_)
     , timeouts(ConnectionTimeouts::getHTTPTimeouts(context))
 {
-
-    if (check_config)
-        context.getRemoteHostFilter().checkURL(Poco::URI(url));
+    if (created_from_ddl)
+        context->getRemoteHostFilter().checkURL(Poco::URI(url));
 
     const auto & credentials_prefix = config_prefix + ".credentials";
 
@@ -80,13 +80,23 @@ HTTPDictionarySource::HTTPDictionarySource(const HTTPDictionarySource & other)
     , update_field{other.update_field}
     , format{other.format}
     , sample_block{other.sample_block}
-    , context(other.context)
+    , context(Context::createCopy(other.context))
     , timeouts(ConnectionTimeouts::getHTTPTimeouts(context))
 {
     credentials.setUsername(other.credentials.getUsername());
     credentials.setPassword(other.credentials.getPassword());
 }
 
+BlockInputStreamPtr HTTPDictionarySource::createWrappedBuffer(std::unique_ptr<ReadWriteBufferFromHTTP> http_buffer_ptr)
+{
+    Poco::URI uri(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(format, *in_ptr_wrapped, sample_block, max_block_size);
+    return std::make_shared<OwningBlockInputStream<ReadBuffer>>(input_stream, std::move(in_ptr_wrapped));
+}
+
 void HTTPDictionarySource::getUpdateFieldAndDate(Poco::URI & uri)
 {
     if (update_time != std::chrono::system_clock::from_time_t(0))
@@ -109,10 +119,15 @@ BlockInputStreamPtr HTTPDictionarySource::loadAll()
     LOG_TRACE(log, "loadAll {}", toString());
     Poco::URI uri(url);
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri, Poco::Net::HTTPRequest::HTTP_GET, ReadWriteBufferFromHTTP::OutStreamCallback(), timeouts,
-        0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
-    return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
+        uri,
+        Poco::Net::HTTPRequest::HTTP_GET,
+        ReadWriteBufferFromHTTP::OutStreamCallback(),
+        timeouts,
+        0,
+        credentials,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        header_entries);
+    return createWrappedBuffer(std::move(in_ptr));
 }
 
 BlockInputStreamPtr HTTPDictionarySource::loadUpdatedAll()
@@ -121,10 +136,15 @@ BlockInputStreamPtr HTTPDictionarySource::loadUpdatedAll()
     getUpdateFieldAndDate(uri);
     LOG_TRACE(log, "loadUpdatedAll {}", uri.toString());
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri, Poco::Net::HTTPRequest::HTTP_GET, ReadWriteBufferFromHTTP::OutStreamCallback(), timeouts,
-        0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
-    return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
+        uri,
+        Poco::Net::HTTPRequest::HTTP_GET,
+        ReadWriteBufferFromHTTP::OutStreamCallback(),
+        timeouts,
+        0,
+        credentials,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        header_entries);
+    return createWrappedBuffer(std::move(in_ptr));
 }
 
 BlockInputStreamPtr HTTPDictionarySource::loadIds(const std::vector<UInt64> & ids)
@@ -136,16 +156,21 @@ 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(format, out_buffer, sample_block);
+        auto output_stream = context->getOutputStreamParallelIfPossible(format, out_buffer, sample_block);
         formatBlock(output_stream, block);
     };
 
     Poco::URI uri(url);
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri, Poco::Net::HTTPRequest::HTTP_POST, out_stream_callback, timeouts,
-        0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
-    return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        out_stream_callback,
+        timeouts,
+        0,
+        credentials,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        header_entries);
+    return createWrappedBuffer(std::move(in_ptr));
 }
 
 BlockInputStreamPtr HTTPDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
@@ -157,16 +182,21 @@ 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(format, out_buffer, sample_block);
+        auto output_stream = context->getOutputStreamParallelIfPossible(format, out_buffer, sample_block);
         formatBlock(output_stream, block);
     };
 
     Poco::URI uri(url);
     auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri, Poco::Net::HTTPRequest::HTTP_POST, out_stream_callback, timeouts,
-        0, credentials, DBMS_DEFAULT_BUFFER_SIZE, header_entries);
-    auto input_stream = context.getInputFormat(format, *in_ptr, sample_block, max_block_size);
-    return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(in_ptr));
+        uri,
+        Poco::Net::HTTPRequest::HTTP_POST,
+        out_stream_callback,
+        timeouts,
+        0,
+        credentials,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        header_entries);
+    return createWrappedBuffer(std::move(in_ptr));
 }
 
 bool HTTPDictionarySource::isModified() const
@@ -198,21 +228,19 @@ std::string HTTPDictionarySource::toString() const
 void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
-                                 const Poco::Util::AbstractConfiguration & config,
-                                 const std::string & config_prefix,
-                                 Block & sample_block,
-                                 const Context & context,
-                                 const std::string & /* default_database */,
-                                 bool check_config) -> DictionarySourcePtr
-    {
+                                   const Poco::Util::AbstractConfiguration & config,
+                                   const std::string & config_prefix,
+                                   Block & sample_block,
+                                   ContextConstPtr context,
+                                   const std::string & /* default_database */,
+                                   bool created_from_ddl) -> DictionarySourcePtr {
         if (dict_struct.has_expressions)
-            throw Exception{"Dictionary source of type `http` does not support attribute expressions", ErrorCodes::LOGICAL_ERROR};
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `http` does not support attribute expressions");
 
-        Context context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
 
         return std::make_unique<HTTPDictionarySource>(
-            dict_struct, config, config_prefix + ".http",
-            sample_block, context_local_copy, check_config);
+            dict_struct, config, config_prefix + ".http", sample_block, context_local_copy, created_from_ddl);
     };
     factory.registerSource("http", create_table_source);
 }
diff --git a/src/Dictionaries/HTTPDictionarySource.h b/src/Dictionaries/HTTPDictionarySource.h
index e7920132e83..9b93856a6bc 100644
--- a/src/Dictionaries/HTTPDictionarySource.h
+++ b/src/Dictionaries/HTTPDictionarySource.h
@@ -8,6 +8,7 @@
 #include "DictionaryStructure.h"
 #include "IDictionarySource.h"
 #include <Interpreters/Context.h>
+#include <IO/CompressionMethod.h>
 
 namespace Poco
 {
@@ -26,8 +27,8 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         Block & sample_block_,
-        const Context & context_,
-        bool check_config);
+        ContextConstPtr context_,
+        bool created_from_ddl);
 
     HTTPDictionarySource(const HTTPDictionarySource & other);
     HTTPDictionarySource & operator=(const HTTPDictionarySource &) = delete;
@@ -53,6 +54,9 @@ public:
 private:
     void getUpdateFieldAndDate(Poco::URI & uri);
 
+    // wrap buffer using encoding from made request
+    BlockInputStreamPtr createWrappedBuffer(std::unique_ptr<ReadWriteBufferFromHTTP> http_buffer);
+
     Poco::Logger * log;
 
     LocalDateTime getLastModification() const;
@@ -65,8 +69,9 @@ private:
     std::string update_field;
     const std::string format;
     Block sample_block;
-    Context context;
+    ContextConstPtr context;
     ConnectionTimeouts timeouts;
 };
 
 }
+
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index 3fbab4c3e39..0de28f18006 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -1,9 +1,5 @@
 #include "HashedDictionary.h"
 
-#include <ext/size.h>
-
-#include <absl/container/flat_hash_map.h>
-
 #include <Core/Defines.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <Columns/ColumnsNumber.h>
@@ -44,15 +40,13 @@ HashedDictionary<dictionary_key_type, sparse>::HashedDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
-    const DictionaryLifetime dict_lifetime_,
-    bool require_nonempty_,
-    BlockPtr saved_block_)
+    const HashedDictionaryStorageConfiguration & configuration_,
+    BlockPtr update_field_loaded_block_)
     : IDictionary(dict_id_)
     , dict_struct(dict_struct_)
     , source_ptr(std::move(source_ptr_))
-    , dict_lifetime(dict_lifetime_)
-    , require_nonempty(require_nonempty_)
-    , saved_block(std::move(saved_block_))
+    , configuration(configuration_)
+    , update_field_loaded_block(std::move(update_field_loaded_block_))
 {
     createAttributes();
     loadData();
@@ -127,7 +121,7 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getColumn(
                 [&](const size_t row, const auto value) { return out[row] = value; },
                 [&](const size_t row)
                 {
-                    out[row] = 0;
+                    out[row] = ValueType();
                     (*vec_null_map_to)[row] = true;
                 },
                 default_value_extractor);
@@ -166,6 +160,7 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::hasKeys(const Co
 
     const auto & attribute = attributes.front();
     bool is_attribute_nullable = attribute.is_nullable_set.has_value();
+    size_t keys_found = 0;
 
     getAttributeContainer(0, [&](const auto & container)
     {
@@ -175,6 +170,8 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::hasKeys(const Co
 
             out[requested_key_index] = container.find(requested_key) != container.end();
 
+            keys_found += out[requested_key_index];
+
             if (is_attribute_nullable && !out[requested_key_index])
                 out[requested_key_index] = attribute.is_nullable_set->find(requested_key) != nullptr;
 
@@ -183,6 +180,7 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::hasKeys(const Co
     });
 
     query_count.fetch_add(keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
@@ -205,6 +203,8 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getHierarchy(ColumnPtr
 
         auto is_key_valid_func = [&](auto & key) { return parent_keys_map.find(key) != parent_keys_map.end(); };
 
+        size_t keys_found = 0;
+
         auto get_parent_func = [&](auto & hierarchy_key)
         {
             std::optional<UInt64> result;
@@ -214,12 +214,15 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getHierarchy(ColumnPtr
             if (it != parent_keys_map.end())
                 result = getValueFromCell(it);
 
+            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;
     }
@@ -251,6 +254,8 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::isInHierarchy(
 
         auto is_key_valid_func = [&](auto & key) { return parent_keys_map.find(key) != parent_keys_map.end(); };
 
+        size_t keys_found = 0;
+
         auto get_parent_func = [&](auto & hierarchy_key)
         {
             std::optional<UInt64> result;
@@ -260,12 +265,15 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::isInHierarchy(
             if (it != parent_keys_map.end())
                 result = getValueFromCell(it);
 
+            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;
     }
@@ -294,9 +302,11 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getDescendants(
         for (const auto & [key, value] : parent_keys)
             parent_to_child[value].emplace_back(key);
 
-        auto result = getKeysDescendantsArray(keys, parent_to_child, level);
+        size_t keys_found;
+        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;
     }
@@ -347,7 +357,9 @@ void HashedDictionary<dictionary_key_type, sparse>::createAttributes()
 template <DictionaryKeyType dictionary_key_type, bool sparse>
 void HashedDictionary<dictionary_key_type, sparse>::updateData()
 {
-    if (!saved_block || saved_block->rows() == 0)
+    /// NOTE: updateData() does not preallocation since it may increase memory usage.
+
+    if (!update_field_loaded_block || update_field_loaded_block->rows() == 0)
     {
         auto stream = source_ptr->loadUpdatedAll();
         stream->readPrefix();
@@ -355,13 +367,13 @@ void HashedDictionary<dictionary_key_type, sparse>::updateData()
         while (const auto block = stream->read())
         {
             /// We are using this to keep saved data if input stream consists of multiple blocks
-            if (!saved_block)
-                saved_block = std::make_shared<DB::Block>(block.cloneEmpty());
+            if (!update_field_loaded_block)
+                update_field_loaded_block = std::make_shared<DB::Block>(block.cloneEmpty());
 
-            for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
+            for (size_t attribute_index = 0; attribute_index < block.columns(); ++attribute_index)
             {
-                const IColumn & update_column = *block.getByPosition(attribute_idx).column.get();
-                MutableColumnPtr saved_column = saved_block->getByPosition(attribute_idx).column->assumeMutable();
+                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());
             }
         }
@@ -369,70 +381,17 @@ void HashedDictionary<dictionary_key_type, sparse>::updateData()
     }
     else
     {
-        size_t skip_keys_size_offset = dict_struct.getKeysSize();
-
-        Columns saved_block_key_columns;
-        saved_block_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)
-            saved_block_key_columns.emplace_back(saved_block->safeGetByPosition(i).column);
-
-
-        DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
-        DictionaryKeysExtractor<dictionary_key_type> saved_keys_extractor(saved_block_key_columns, arena_holder.getComplexKeyArena());
-        auto saved_keys_extracted_from_block = saved_keys_extractor.extractAllKeys();
-
         auto stream = source_ptr->loadUpdatedAll();
-        stream->readPrefix();
-
-        while (Block block = stream->read())
-        {
-            /// TODO: Rewrite
-            Columns block_key_columns;
-            block_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)
-                block_key_columns.emplace_back(block.safeGetByPosition(i).column);
-
-            DictionaryKeysExtractor<dictionary_key_type> block_keys_extractor(saved_block_key_columns, arena_holder.getComplexKeyArena());
-            auto keys_extracted_from_block = block_keys_extractor.extractAllKeys();
-
-            absl::flat_hash_map<KeyType, std::vector<size_t>, DefaultHash<KeyType>> update_keys;
-            for (size_t row = 0; row < keys_extracted_from_block.size(); ++row)
-            {
-                auto key = keys_extracted_from_block[row];
-                update_keys[key].push_back(row);
-            }
-
-            IColumn::Filter filter(saved_keys_extracted_from_block.size());
-
-            for (size_t row = 0; row < saved_keys_extracted_from_block.size(); ++row)
-            {
-                auto key = saved_keys_extracted_from_block[row];
-                auto it = update_keys.find(key);
-                filter[row] = (it == update_keys.end());
-            }
-
-            auto block_columns = block.mutateColumns();
-            for (const auto attribute_idx : ext::range(0, attributes.size() + 1))
-            {
-                auto & column = saved_block->safeGetByPosition(attribute_idx).column;
-                const auto & filtered_column = column->filter(filter, -1);
-                block_columns[attribute_idx]->insertRangeFrom(*filtered_column.get(), 0, filtered_column->size());
-            }
-
-            saved_block->setColumns(std::move(block_columns));
-        }
-
-        stream->readSuffix();
+        mergeBlockWithStream<dictionary_key_type>(
+            dict_struct.getKeysSize(),
+            *update_field_loaded_block,
+            stream);
     }
 
-    if (saved_block)
+    if (update_field_loaded_block)
     {
-        resize(saved_block->rows());
-        blockToAttributes(*saved_block.get());
+        resize(update_field_loaded_block->rows());
+        blockToAttributes(*update_field_loaded_block.get());
     }
 }
 
@@ -550,6 +509,8 @@ void HashedDictionary<dictionary_key_type, sparse>::getItemsImpl(
 
     bool is_attribute_nullable = attribute.is_nullable_set.has_value();
 
+    size_t keys_found = 0;
+
     for (size_t key_index = 0; key_index < keys_size; ++key_index)
     {
         auto key = keys_extractor.extractCurrentKey();
@@ -557,7 +518,10 @@ void HashedDictionary<dictionary_key_type, sparse>::getItemsImpl(
         const auto it = attribute_container.find(key);
 
         if (it != attribute_container.end())
+        {
             set_value(key_index, getValueFromCell(it));
+            ++keys_found;
+        }
         else
         {
             if (is_attribute_nullable && attribute.is_nullable_set->find(key) != nullptr)
@@ -570,6 +534,7 @@ void HashedDictionary<dictionary_key_type, sparse>::getItemsImpl(
     }
 
     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, bool sparse>
@@ -587,13 +552,30 @@ void HashedDictionary<dictionary_key_type, sparse>::loadData()
 {
     if (!source_ptr->hasUpdateField())
     {
-        auto stream = source_ptr->loadAll();
+        std::atomic<size_t> new_size = 0;
+
+        BlockInputStreamPtr stream;
+        if (configuration.preallocate)
+            stream = source_ptr->loadAllWithSizeHint(&new_size);
+        else
+            stream = source_ptr->loadAll();
 
         stream->readPrefix();
 
         while (const auto block = stream->read())
         {
-            resize(block.rows());
+            if (configuration.preallocate && new_size)
+            {
+                size_t current_new_size = new_size.exchange(0);
+                if (current_new_size)
+                {
+                    LOG_TRACE(&Poco::Logger::get("HashedDictionary"), "Preallocated {} elements", current_new_size);
+                    resize(current_new_size);
+                }
+            }
+            else
+                resize(block.rows());
+
             blockToAttributes(block);
         }
 
@@ -602,9 +584,9 @@ void HashedDictionary<dictionary_key_type, sparse>::loadData()
     else
         updateData();
 
-    if (require_nonempty && 0 == element_count)
+    if (configuration.require_nonempty && 0 == element_count)
         throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY,
-            "({}): dictionary source is empty and 'require_nonempty' property is set.",
+            "{}: dictionary source is empty and 'require_nonempty' property is set.",
             full_name);
 }
 
@@ -624,7 +606,11 @@ void HashedDictionary<dictionary_key_type, sparse>::calculateBytesAllocated()
 
             if constexpr (sparse || std::is_same_v<AttributeValueType, Field>)
             {
-                bytes_allocated += container.max_size() * (sizeof(KeyType) + sizeof(AttributeValueType));
+                /// bucket_count() - Returns table size, that includes empty and deleted
+                /// size()         - Returns table size, w/o empty and deleted
+                /// and since this is sparsehash, empty cells should not be significant,
+                /// and since items cannot be removed from the dictionary, deleted is also not important.
+                bytes_allocated += container.size() * (sizeof(KeyType) + sizeof(AttributeValueType));
                 bucket_count = container.bucket_count();
             }
             else
@@ -639,6 +625,9 @@ void HashedDictionary<dictionary_key_type, sparse>::calculateBytesAllocated()
     }
 
     bytes_allocated += complex_key_arena.size();
+
+    if (update_field_loaded_block)
+        bytes_allocated += update_field_loaded_block->allocatedBytes();
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sparse>
@@ -729,41 +718,46 @@ void registerDictionaryHashed(DictionaryFactory & factory)
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is not supported for complex key hashed dictionary");
 
         if (dict_struct.range_min || dict_struct.range_max)
-            throw Exception{full_name
-                                + ": elements .structure.range_min and .structure.range_max should be defined only "
-                                  "for a dictionary of layout 'range_hashed'",
-                            ErrorCodes::BAD_ARGUMENTS};
+            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);
 
+        const std::string & layout_prefix = sparse ? ".layout.sparse_hashed" : ".layout.hashed";
+        const bool preallocate = config.getBool(config_prefix + layout_prefix + ".preallocate", false);
+
+        HashedDictionaryStorageConfiguration configuration{preallocate, require_nonempty, dict_lifetime};
+
         if (dictionary_key_type == DictionaryKeyType::simple)
         {
             if (sparse)
-                return std::make_unique<HashedDictionary<DictionaryKeyType::simple, true>>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+                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), dict_lifetime, require_nonempty);
+                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), dict_lifetime, require_nonempty);
+                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), dict_lifetime, require_nonempty);
+                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){ 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, ContextConstPtr /* 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){ 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, ContextConstPtr /* 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){ 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, ContextConstPtr /* 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){ 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, ContextConstPtr /* 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 3882b669324..324b7601a28 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -28,6 +28,13 @@
 namespace DB
 {
 
+struct HashedDictionaryStorageConfiguration
+{
+    const bool preallocate;
+    const bool require_nonempty;
+    const DictionaryLifetime lifetime;
+};
+
 template <DictionaryKeyType dictionary_key_type, bool sparse>
 class HashedDictionary final : public IDictionary
 {
@@ -39,9 +46,8 @@ public:
         const StorageID & dict_id_,
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
-        const DictionaryLifetime dict_lifetime_,
-        bool require_nonempty_,
-        BlockPtr saved_block_ = nullptr);
+        const HashedDictionaryStorageConfiguration & configuration_,
+        BlockPtr update_field_loaded_block_ = nullptr);
 
     std::string getTypeName() const override
     {
@@ -59,6 +65,14 @@ public:
 
     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; }
@@ -67,12 +81,12 @@ public:
 
     std::shared_ptr<const IExternalLoadable> clone() const override
     {
-        return std::make_shared<HashedDictionary<dictionary_key_type, sparse>>(getDictionaryID(), dict_struct, source_ptr->clone(), dict_lifetime, require_nonempty, saved_block);
+        return std::make_shared<HashedDictionary<dictionary_key_type, sparse>>(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 dict_lifetime; }
+    const DictionaryLifetime & getLifetime() const override { return configuration.lifetime; }
 
     const DictionaryStructure & getStructure() const override { return dict_struct; }
 
@@ -145,15 +159,20 @@ private:
             UInt32,
             UInt64,
             UInt128,
+            UInt256,
             Int8,
             Int16,
             Int32,
             Int64,
+            Int128,
+            Int256,
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
+            UUID,
             StringRef>
             null_values;
 
@@ -163,20 +182,24 @@ private:
             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>>
             container;
 
         std::unique_ptr<Arena> string_arena;
-
     };
 
     void createAttributes();
@@ -209,8 +232,7 @@ private:
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
-    const DictionaryLifetime dict_lifetime;
-    const bool require_nonempty;
+    const HashedDictionaryStorageConfiguration configuration;
 
     std::vector<Attribute> attributes;
 
@@ -218,9 +240,9 @@ private:
     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};
 
-    /// TODO: Remove
-    BlockPtr saved_block;
+    BlockPtr update_field_loaded_block;
     Arena complex_key_arena;
 };
 
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.cpp b/src/Dictionaries/HierarchyDictionariesUtils.cpp
index fffe0d30e0e..dd729fe636c 100644
--- a/src/Dictionaries/HierarchyDictionariesUtils.cpp
+++ b/src/Dictionaries/HierarchyDictionariesUtils.cpp
@@ -52,7 +52,7 @@ namespace
             const auto * parent_key_column_typed = checkAndGetColumn<ColumnVector<UInt64>>(*parent_key_column);
             if (!parent_key_column_typed)
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                    "Parent key column should be UInt64. Actual ({})",
+                    "Parent key column should be UInt64. Actual {}",
                     hierarchical_attribute.type->getName());
 
             const auto & parent_keys = parent_key_column_typed->getData();
@@ -84,8 +84,14 @@ namespace
     }
 }
 
-ColumnPtr getKeysHierarchyDefaultImplementation(const IDictionary * dictionary, ColumnPtr key_column, const DataTypePtr & key_type)
+ColumnPtr getKeysHierarchyDefaultImplementation(
+    const IDictionary * dictionary,
+    ColumnPtr key_column,
+    const DataTypePtr & key_type,
+    size_t & valid_keys)
 {
+    valid_keys = 0;
+
     key_column = key_column->convertToFullColumnIfConst();
     const auto * key_column_typed = checkAndGetColumn<ColumnVector<UInt64>>(*key_column);
     if (!key_column_typed)
@@ -104,6 +110,7 @@ ColumnPtr getKeysHierarchyDefaultImplementation(const IDictionary * dictionary,
     {
         auto it = key_to_parent_key.find(key);
         std::optional<UInt64> result = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+        valid_keys += result.has_value();
         return result;
     };
 
@@ -117,8 +124,11 @@ ColumnUInt8::Ptr getKeysIsInHierarchyDefaultImplementation(
     const IDictionary * dictionary,
     ColumnPtr key_column,
     ColumnPtr in_key_column,
-    const DataTypePtr & key_type)
+    const DataTypePtr & key_type,
+    size_t & valid_keys)
 {
+    valid_keys = 0;
+
     key_column = key_column->convertToFullColumnIfConst();
     in_key_column = in_key_column->convertToFullColumnIfConst();
 
@@ -143,6 +153,7 @@ ColumnUInt8::Ptr getKeysIsInHierarchyDefaultImplementation(
     {
         auto it = key_to_parent_key.find(key);
         std::optional<UInt64> result = (it != nullptr ? std::make_optional(it->getMapped()) : std::nullopt);
+        valid_keys += result.has_value();
         return result;
     };
 
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.h b/src/Dictionaries/HierarchyDictionariesUtils.h
index 8b2fe6ef08e..44382f4720f 100644
--- a/src/Dictionaries/HierarchyDictionariesUtils.h
+++ b/src/Dictionaries/HierarchyDictionariesUtils.h
@@ -196,6 +196,8 @@ namespace detail
       * Hierarchy result is ElementsAndOffsets structure, for each element there is descendants array,
       * with size offset[element_index] - (element_index > 0 ? offset[element_index - 1] : 0).
       *
+      * @param valid_keys - number of keys that are valid in parent_to_child map
+      *
       * Example:
       * id  parent_id
       * 1   0
@@ -218,11 +220,13 @@ namespace detail
     ElementsAndOffsets<KeyType> getDescendants(
         const PaddedPODArray<KeyType> & keys,
         const HashMap<KeyType, PaddedPODArray<KeyType>> & parent_to_child,
-        Strategy strategy)
+        Strategy strategy,
+        size_t & valid_keys)
     {
         /// If strategy is GetAllDescendantsStrategy we try to cache and later reuse previously calculated descendants.
         /// If strategy is GetDescendantsAtSpecificLevelStrategy we does not use cache strategy.
         size_t keys_size = keys.size();
+        valid_keys = 0;
 
         PaddedPODArray<KeyType> descendants;
         descendants.reserve(keys_size);
@@ -265,6 +269,7 @@ namespace detail
                 descendants_offsets.emplace_back(descendants.size());
                 continue;
             }
+            ++valid_keys;
 
             next_keys_to_process_stack.emplace_back(KeyAndDepth{requested_key, 0});
 
@@ -425,43 +430,52 @@ ColumnUInt8::Ptr getKeysIsInHierarchyColumn(
 }
 
 /// Returns descendants array column for keys
+///
+/// @param valid_keys - number of keys that are valid in parent_to_child map
 template <typename KeyType>
 ColumnPtr getKeysDescendantsArray(
     const PaddedPODArray<KeyType> & requested_keys,
     const HashMap<KeyType, PaddedPODArray<KeyType>> & parent_to_child,
-    size_t level)
+    size_t level,
+    size_t & valid_keys)
 {
     if (level == 0)
     {
         detail::GetAllDescendantsStrategy strategy { .level = level };
-        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy);
+        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy, valid_keys);
         return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
     }
     else
     {
         detail::GetDescendantsAtSpecificLevelStrategy strategy { .level = level };
-        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy);
+        auto elements_and_offsets = detail::getDescendants(requested_keys, parent_to_child, strategy, valid_keys);
         return detail::convertElementsAndOffsetsIntoArray(std::move(elements_and_offsets));
     }
 }
 
 /** Default getHierarchy implementation for dictionaries that does not have structure with child to parent representation.
   * Implementation will build such structure with getColumn calls, and then getHierarchy for such structure.
-  * Returns ColumnArray with hierarchy arrays for keys from key_column.
+  *
+  * @param valid_keys - number of keys (from @key_column) for which information about parent exists.
+  * @return ColumnArray with hierarchy arrays for keys from key_column.
   */
 ColumnPtr getKeysHierarchyDefaultImplementation(
     const IDictionary * dictionary,
     ColumnPtr key_column,
-    const DataTypePtr & key_type);
+    const DataTypePtr & key_type,
+    size_t & valid_keys);
 
 /** Default isInHierarchy implementation for dictionaries that does not have structure with child to parent representation.
   * Implementation will build such structure with getColumn calls, and then getHierarchy for such structure.
-  * Returns UInt8 column if key from in_key_column is in key hierarchy from key_column.
+  *
+  * @param valid_keys - number of keys (from @key_column) for which information about parent exists.
+  * @return UInt8 column if key from in_key_column is in key hierarchy from key_column.
   */
 ColumnUInt8::Ptr getKeysIsInHierarchyDefaultImplementation(
     const IDictionary * dictionary,
     ColumnPtr key_column,
     ColumnPtr in_key_column,
-    const DataTypePtr & key_type);
+    const DataTypePtr & key_type,
+    size_t & valid_keys);
 
 }
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index a7445312409..5467a673503 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -90,6 +90,8 @@ struct IDictionary : public IExternalLoadable
 
     virtual size_t getQueryCount() const = 0;
 
+    virtual double getFoundRate() const = 0;
+
     virtual double getHitRate() const = 0;
 
     virtual size_t getElementCount() const = 0;
diff --git a/src/Dictionaries/IDictionarySource.h b/src/Dictionaries/IDictionarySource.h
index 90f8b7f3a55..857d66abc48 100644
--- a/src/Dictionaries/IDictionarySource.h
+++ b/src/Dictionaries/IDictionarySource.h
@@ -4,6 +4,7 @@
 #include <DataStreams/IBlockStream_fwd.h>
 
 #include <vector>
+#include <atomic>
 
 
 namespace DB
@@ -19,6 +20,43 @@ using SharedDictionarySourcePtr = std::shared_ptr<IDictionarySource>;
 class IDictionarySource
 {
 public:
+    /**
+     * result_size_hint - approx number of rows in the stream.
+     * Returns an input stream 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
+     * in parallel, so you should use something like this:
+     *
+     *   ...
+     *   std::atomic<uint64_t> new_size = 0;
+     *
+     *   auto stream = source->loadAll(&new_size);
+     *   stream->readPrefix();
+     *
+     *   while (const auto block = stream->read())
+     *   {
+     *       if (new_size)
+     *       {
+     *           size_t current_new_size = new_size.exchange(0);
+     *           if (current_new_size)
+     *               resize(current_new_size);
+     *       }
+     *       else
+     *       {
+     *           resize(block.rows());
+     *       }
+     *   }
+     *
+     *   stream->readSuffix();
+     *   ...
+     */
+    virtual BlockInputStreamPtr loadAllWithSizeHint(std::atomic<size_t> * /* result_size_hint */)
+    {
+        return loadAll();
+    }
+
     /// Returns an input stream with all the data available from this source.
     virtual BlockInputStreamPtr loadAll() = 0;
 
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index d66c285bc42..a0630ab324c 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -124,20 +124,20 @@ static size_t formatIPWithPrefix(const unsigned char * src, UInt8 prefix_len, bo
 static void validateKeyTypes(const DataTypes & key_types)
 {
     if (key_types.empty() || key_types.size() > 2)
-        throw Exception{"Expected a single IP address or IP with mask", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a single IP address or IP with mask");
 
     const auto * key_ipv4type = typeid_cast<const DataTypeUInt32 *>(key_types[0].get());
     const auto * key_ipv6type = typeid_cast<const DataTypeFixedString *>(key_types[0].get());
 
     if (key_ipv4type == nullptr && (key_ipv6type == nullptr || key_ipv6type->getN() != 16))
-        throw Exception{"Key does not match, expected either `IPv4` (`UInt32`) or `IPv6` (`FixedString(16)`)",
-                        ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Key does not match, expected either `IPv4` (`UInt32`) or `IPv6` (`FixedString(16)`)");
 
     if (key_types.size() > 1)
     {
         const auto * mask_col_type = typeid_cast<const DataTypeUInt8 *>(key_types[1].get());
         if (mask_col_type == nullptr)
-            throw Exception{"Mask do not match, expected UInt8", ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Mask do not match, expected UInt8");
     }
 }
 
@@ -275,7 +275,9 @@ ColumnUInt8::Ptr IPAddressDictionary::hasKeys(const Columns & key_columns, const
     const auto rows = first_column->size();
 
     auto result = ColumnUInt8::create(rows);
-    auto& out = result->getData();
+    auto & out = result->getData();
+
+    size_t keys_found = 0;
 
     if (first_column->isNumeric())
     {
@@ -285,6 +287,7 @@ ColumnUInt8::Ptr IPAddressDictionary::hasKeys(const Columns & key_columns, const
             auto addrv4 = UInt32(first_column->get64(i));
             auto found = tryLookupIPv4(addrv4, addrv6_buf);
             out[i] = (found != ipNotFound());
+            keys_found += out[i];
         }
     }
     else
@@ -293,14 +296,16 @@ ColumnUInt8::Ptr IPAddressDictionary::hasKeys(const Columns & key_columns, const
         {
             auto addr = first_column->getDataAt(i);
             if (unlikely(addr.size != IPV6_BINARY_LENGTH))
-                throw Exception("Expected key to be FixedString(16)", ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected key to be FixedString(16)");
 
             auto found = tryLookupIPv6(reinterpret_cast<const uint8_t *>(addr.data));
             out[i] = (found != ipNotFound());
+            keys_found += out[i];
         }
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
@@ -316,8 +321,10 @@ void IPAddressDictionary::createAttributes()
             attributes.push_back(createAttributeWithType(attribute.underlying_type, attribute.null_value));
 
             if (attribute.hierarchical)
-                throw Exception{full_name + ": hierarchical attributes not supported for dictionary of type " + getTypeName(),
-                                ErrorCodes::TYPE_MISMATCH};
+                throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "{}: hierarchical attributes not supported for dictionary of type {}",
+                    full_name,
+                    getTypeName());
         }
     };
 
@@ -410,7 +417,7 @@ void IPAddressDictionary::loadData()
                 return cmpres;
             });
         if (deleted_count > 0)
-            LOG_WARNING(logger, "removing {} non-unique subnets from input", deleted_count);
+            LOG_TRACE(logger, "removing {} non-unique subnets from input", deleted_count);
 
         auto & ipv6_col = ip_column.emplace<IPv6Container>();
         ipv6_col.resize_fill(IPV6_BINARY_LENGTH * ip_records.size());
@@ -437,7 +444,7 @@ void IPAddressDictionary::loadData()
                 return compareTo(a, b);
             });
         if (deleted_count > 0)
-            LOG_WARNING(logger, "removing {} non-unique subnets from input", deleted_count);
+            LOG_TRACE(logger, "removing {} non-unique subnets from input", deleted_count);
 
         auto & ipv4_col = ip_column.emplace<IPv4Container>();
         ipv4_col.reserve(ip_records.size());
@@ -492,7 +499,7 @@ void IPAddressDictionary::loadData()
     LOG_TRACE(logger, "{} ip records are read", ip_records.size());
 
     if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.", ErrorCodes::DICTIONARY_IS_EMPTY};
+        throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY, "{}: dictionary source is empty and 'require_nonempty' property is set.", full_name);
 }
 
 template <typename T>
@@ -591,7 +598,7 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
     {
         const auto * key_ip_column_ptr = typeid_cast<const ColumnVector<UInt32> *>(&*key_columns.front());
         if (key_ip_column_ptr == nullptr)
-            throw Exception{"Expected a UInt32 IP column", ErrorCodes::TYPE_MISMATCH};
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a UInt32 IP column");
 
         const auto & key_mask_column = assert_cast<const ColumnVector<UInt8> &>(*key_columns.back());
 
@@ -625,7 +632,7 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
 
     const auto * key_ip_column_ptr = typeid_cast<const ColumnFixedString *>(&*key_columns.front());
     if (key_ip_column_ptr == nullptr || key_ip_column_ptr->getN() != IPV6_BINARY_LENGTH)
-        throw Exception{"Expected a FixedString(16) IP column", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a FixedString(16) IP column");
 
     const auto & key_mask_column = assert_cast<const ColumnVector<UInt8> &>(*key_columns.back());
 
@@ -678,6 +685,8 @@ void IPAddressDictionary::getItemsImpl(
 
     auto & vec = std::get<ContainerType<AttributeType>>(attribute.maps);
 
+    size_t keys_found = 0;
+
     if (first_column->isNumeric())
     {
         uint8_t addrv6_buf[IPV6_BINARY_LENGTH];
@@ -687,7 +696,10 @@ void IPAddressDictionary::getItemsImpl(
             auto addrv4 = UInt32(first_column->get64(i));
             auto found = tryLookupIPv4(addrv4, addrv6_buf);
             if (found != ipNotFound())
+            {
                 set_value(i, static_cast<OutputType>(vec[*found]));
+                ++keys_found;
+            }
             else
                 set_value(i, default_value_extractor[i]);
         }
@@ -698,17 +710,21 @@ void IPAddressDictionary::getItemsImpl(
         {
             auto addr = first_column->getDataAt(i);
             if (addr.size != IPV6_BINARY_LENGTH)
-                throw Exception("Expected key to be FixedString(16)", ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected key to be FixedString(16)");
 
             auto found = tryLookupIPv6(reinterpret_cast<const uint8_t *>(addr.data));
             if (found != ipNotFound())
+            {
                 set_value(i, static_cast<OutputType>(vec[*found]));
+                ++keys_found;
+            }
             else
                 set_value(i, default_value_extractor[i]);
         }
     }
 
     query_count.fetch_add(rows, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
 template <typename T>
@@ -744,7 +760,7 @@ const IPAddressDictionary::Attribute & IPAddressDictionary::getAttribute(const s
 {
     const auto it = attribute_index_by_name.find(attribute_name);
     if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: no such attribute '{}'", full_name, attribute_name);
 
     return attributes[it->second];
 }
@@ -918,10 +934,12 @@ void registerDictionaryTrie(DictionaryFactory & factory)
                              const DictionaryStructure & dict_struct,
                              const Poco::Util::AbstractConfiguration & config,
                              const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
+                             DictionarySourcePtr source_ptr,
+                             ContextConstPtr /* context */,
+                             bool /*created_from_ddl*/) -> DictionaryPtr
     {
         if (!dict_struct.key || dict_struct.key->size() != 1)
-            throw Exception{"Dictionary of layout 'ip_trie' has to have one 'key'", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary of layout 'ip_trie' has to have one 'key'");
 
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
         const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index cf79caa75fc..edca68aedba 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -38,6 +38,14 @@ public:
 
     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; }
@@ -94,15 +102,20 @@ private:
             UInt32,
             UInt64,
             UInt128,
+            UInt256,
             Int8,
             Int16,
             Int32,
             Int64,
+            Int128,
+            Int256,
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
+            UUID,
             String>
             null_values;
         std::variant<
@@ -111,15 +124,20 @@ private:
             ContainerType<UInt32>,
             ContainerType<UInt64>,
             ContainerType<UInt128>,
+            ContainerType<UInt256>,
             ContainerType<Int8>,
             ContainerType<Int16>,
             ContainerType<Int32>,
             ContainerType<Int64>,
+            ContainerType<Int128>,
+            ContainerType<Int256>,
             ContainerType<Decimal32>,
             ContainerType<Decimal64>,
             ContainerType<Decimal128>,
+            ContainerType<Decimal256>,
             ContainerType<Float32>,
             ContainerType<Float64>,
+            ContainerType<UUID>,
             ContainerType<StringRef>>
             maps;
         std::unique_ptr<Arena> string_arena;
@@ -200,6 +218,7 @@ private:
     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};
 
     Poco::Logger * logger;
 };
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
index 0632dd3e30f..f52d774f279 100644
--- a/src/Dictionaries/LibraryDictionarySource.cpp
+++ b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -1,312 +1,186 @@
 #include "LibraryDictionarySource.h"
+
 #include <DataStreams/OneBlockInputStream.h>
 #include <Interpreters/Context.h>
-#include <Poco/File.h>
 #include <common/logger_useful.h>
-#include <ext/bit_cast.h>
-#include <ext/range.h>
-#include <ext/scope_guard.h>
-#include <Common/StringUtils/StringUtils.h>
-#include "DictionarySourceFactory.h"
-#include "DictionaryStructure.h"
-#include "LibraryDictionarySourceExternal.h"
-#include "registerDictionaries.h"
+#include <Common/filesystemHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <filesystem>
+
+#include <Dictionaries/DictionarySourceFactory.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/registerDictionaries.h>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
-    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
     extern const int FILE_DOESNT_EXIST;
     extern const int EXTERNAL_LIBRARY_ERROR;
     extern const int PATH_ACCESS_DENIED;
 }
 
 
-class CStringsHolder
-{
-public:
-    using Container = std::vector<std::string>;
-    explicit CStringsHolder(const Container & strings_pass)
-    {
-        strings_holder = strings_pass;
-        strings.size = strings_holder.size();
-        ptr_holder = std::make_unique<ClickHouseLibrary::CString[]>(strings.size);
-        strings.data = ptr_holder.get();
-        size_t i = 0;
-        for (auto & str : strings_holder)
-        {
-            strings.data[i] = str.c_str();
-            ++i;
-        }
-    }
-
-    ClickHouseLibrary::CStrings strings; // will pass pointer to lib
-
-private:
-    std::unique_ptr<ClickHouseLibrary::CString[]> ptr_holder = nullptr;
-    Container strings_holder;
-};
-
-
-namespace
-{
-    constexpr auto lib_config_settings = ".settings";
-
-
-    CStringsHolder getLibSettings(const Poco::Util::AbstractConfiguration & config, const std::string & config_root)
-    {
-        Poco::Util::AbstractConfiguration::Keys config_keys;
-        config.keys(config_root, config_keys);
-        CStringsHolder::Container strings;
-        for (const auto & key : config_keys)
-        {
-            std::string key_name = key;
-            auto bracket_pos = key.find('[');
-            if (bracket_pos != std::string::npos && bracket_pos > 0)
-                key_name = key.substr(0, bracket_pos);
-            strings.emplace_back(key_name);
-            strings.emplace_back(config.getString(config_root + "." + key));
-        }
-        return CStringsHolder(strings);
-    }
-
-
-    Block dataToBlock(const Block & sample_block, const ClickHouseLibrary::RawClickHouseLibraryTable data)
-    {
-        if (!data)
-            throw Exception("LibraryDictionarySource: No data returned", ErrorCodes::EXTERNAL_LIBRARY_ERROR);
-
-        const auto * columns_received = static_cast<const ClickHouseLibrary::Table *>(data);
-        if (columns_received->error_code)
-            throw Exception(
-                "LibraryDictionarySource: Returned error: " + std::to_string(columns_received->error_code) + " "
-                    + (columns_received->error_string ? columns_received->error_string : ""),
-                ErrorCodes::EXTERNAL_LIBRARY_ERROR);
-
-        MutableColumns columns = sample_block.cloneEmptyColumns();
-
-        for (size_t col_n = 0; col_n < columns_received->size; ++col_n)
-        {
-            if (columns.size() != columns_received->data[col_n].size)
-                throw Exception(
-                    "LibraryDictionarySource: Returned unexpected number of columns: " + std::to_string(columns_received->data[col_n].size)
-                        + ", must be " + std::to_string(columns.size()),
-                    ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-            for (size_t row_n = 0; row_n < columns_received->data[col_n].size; ++row_n)
-            {
-                const auto & field = columns_received->data[col_n].data[row_n];
-                if (!field.data)
-                {
-                    /// sample_block contains null_value (from config) inside corresponding column
-                    const auto & col = sample_block.getByPosition(row_n);
-                    columns[row_n]->insertFrom(*(col.column), 0);
-                }
-                else
-                {
-                    const auto & size = field.size;
-                    columns[row_n]->insertData(static_cast<const char *>(field.data), size);
-                }
-            }
-        }
-
-        return sample_block.cloneWithColumns(std::move(columns));
-    }
-}
-
-
 LibraryDictionarySource::LibraryDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix_,
     Block & sample_block_,
-    const Context & context,
-    bool check_config)
+    ContextConstPtr context_,
+    bool created_from_ddl)
     : log(&Poco::Logger::get("LibraryDictionarySource"))
     , dict_struct{dict_struct_}
     , config_prefix{config_prefix_}
     , path{config.getString(config_prefix + ".path", "")}
+    , dictionary_id(getDictID())
     , sample_block{sample_block_}
+    , context(Context::createCopy(context_))
 {
+    if (created_from_ddl && !pathStartsWith(path, context->getDictionariesLibPath()))
+        throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", path, context->getDictionariesLibPath());
 
-    if (check_config)
-    {
-        const String dictionaries_lib_path = context.getDictionariesLibPath();
-        if (!startsWith(path, dictionaries_lib_path))
-            throw Exception("LibraryDictionarySource: Library path " + path + " is not inside " + dictionaries_lib_path, ErrorCodes::PATH_ACCESS_DENIED);
-    }
-
-    if (!Poco::File(path).exists())
-        throw Exception(
-            "LibraryDictionarySource: Can't load library " + Poco::File(path).path() + ": file doesn't exist",
-            ErrorCodes::FILE_DOESNT_EXIST);
+    if (!fs::exists(path))
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "LibraryDictionarySource: Can't load library {}: file doesn't exist", path);
 
     description.init(sample_block);
-    library = std::make_shared<SharedLibrary>(path, RTLD_LAZY
-#if defined(RTLD_DEEPBIND) && !defined(ADDRESS_SANITIZER) // Does not exists in FreeBSD. Cannot work with Address Sanitizer.
-        | RTLD_DEEPBIND
-#endif
-    );
-    settings = std::make_shared<CStringsHolder>(getLibSettings(config, config_prefix + lib_config_settings));
+    bridge_helper = std::make_shared<LibraryBridgeHelper>(context, description.sample_block, dictionary_id);
+    auto res = bridge_helper->initLibrary(path, getLibrarySettingsString(config, config_prefix + ".settings"), getDictAttributesString());
 
-    if (auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME))
-        lib_data = lib_new(&settings->strings, ClickHouseLibrary::log);
+    if (!res)
+        throw Exception(ErrorCodes::EXTERNAL_LIBRARY_ERROR, "Failed to create shared library from path: {}", path);
 }
 
+
+LibraryDictionarySource::~LibraryDictionarySource()
+{
+    bridge_helper->removeLibrary();
+}
+
+
 LibraryDictionarySource::LibraryDictionarySource(const LibraryDictionarySource & other)
     : log(&Poco::Logger::get("LibraryDictionarySource"))
     , dict_struct{other.dict_struct}
     , config_prefix{other.config_prefix}
     , path{other.path}
+    , dictionary_id{getDictID()}
     , sample_block{other.sample_block}
-    , library{other.library}
+    , context(other.context)
     , description{other.description}
-    , settings{other.settings}
 {
-    if (auto lib_clone = library->tryGet<ClickHouseLibrary::LibraryCloneFunc>(ClickHouseLibrary::LIBRARY_CLONE_FUNC_NAME))
-        lib_data = lib_clone(other.lib_data);
-    else if (auto lib_new = library->tryGet<ClickHouseLibrary::LibraryNewFunc>(ClickHouseLibrary::LIBRARY_CREATE_NEW_FUNC_NAME))
-        lib_data = lib_new(&settings->strings, ClickHouseLibrary::log);
+    bridge_helper = std::make_shared<LibraryBridgeHelper>(context, description.sample_block, dictionary_id);
+    bridge_helper->cloneLibrary(other.dictionary_id);
 }
 
-LibraryDictionarySource::~LibraryDictionarySource()
+
+bool LibraryDictionarySource::isModified() const
 {
-    if (auto lib_delete = library->tryGet<ClickHouseLibrary::LibraryDeleteFunc>(ClickHouseLibrary::LIBRARY_DELETE_FUNC_NAME))
-        lib_delete(lib_data);
+    return bridge_helper->isModified();
 }
 
+
+bool LibraryDictionarySource::supportsSelectiveLoad() const
+{
+    return bridge_helper->supportsSelectiveLoad();
+}
+
+
 BlockInputStreamPtr LibraryDictionarySource::loadAll()
 {
     LOG_TRACE(log, "loadAll {}", toString());
-
-    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(dict_struct.attributes.size());
-    ClickHouseLibrary::CStrings columns{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()),
-                                        dict_struct.attributes.size()};
-    size_t i = 0;
-    for (const auto & a : dict_struct.attributes)
-    {
-        columns.data[i] = a.name.c_str();
-        ++i;
-    }
-
-    auto load_all_func = library->get<ClickHouseLibrary::LibraryLoadAllFunc>(ClickHouseLibrary::LIBRARY_LOAD_ALL_FUNC_NAME);
-    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
-    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
-
-    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
-    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
-
-    ClickHouseLibrary::RawClickHouseLibraryTable data = load_all_func(data_ptr, &settings->strings, &columns);
-    auto block = dataToBlock(description.sample_block, data);
-
-    return std::make_shared<OneBlockInputStream>(block);
+    return bridge_helper->loadAll();
 }
 
+
 BlockInputStreamPtr LibraryDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
-
-    const ClickHouseLibrary::VectorUInt64 ids_data{ext::bit_cast<decltype(ClickHouseLibrary::VectorUInt64::data)>(ids.data()), ids.size()};
-    auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(dict_struct.attributes.size());
-    ClickHouseLibrary::CStrings columns_pass{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()),
-                                             dict_struct.attributes.size()};
-    size_t i = 0;
-    for (const auto & a : dict_struct.attributes)
-    {
-        columns_pass.data[i] = a.name.c_str();
-        ++i;
-    }
-
-    auto load_ids_func = library->get<ClickHouseLibrary::LibraryLoadIdsFunc>(ClickHouseLibrary::LIBRARY_LOAD_IDS_FUNC_NAME);
-    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
-    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
-
-    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
-    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
-
-    ClickHouseLibrary::RawClickHouseLibraryTable data = load_ids_func(data_ptr, &settings->strings, &columns_pass, &ids_data);
-    auto block = dataToBlock(description.sample_block, data);
-
-    return std::make_shared<OneBlockInputStream>(block);
+    return bridge_helper->loadIds(getDictIdsString(ids));
 }
 
+
 BlockInputStreamPtr LibraryDictionarySource::loadKeys(const Columns & key_columns, const std::vector<std::size_t> & requested_rows)
 {
     LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
-
-    auto holder = std::make_unique<ClickHouseLibrary::Row[]>(key_columns.size());
-    std::vector<std::unique_ptr<ClickHouseLibrary::Field[]>> column_data_holders;
-    for (size_t i = 0; i < key_columns.size(); ++i)
-    {
-        auto cell_holder = std::make_unique<ClickHouseLibrary::Field[]>(requested_rows.size());
-        for (size_t j = 0; j < requested_rows.size(); ++j)
-        {
-            auto data_ref = key_columns[i]->getDataAt(requested_rows[j]);
-            cell_holder[j] = ClickHouseLibrary::Field{.data = static_cast<const void *>(data_ref.data), .size = data_ref.size};
-        }
-        holder[i]
-            = ClickHouseLibrary::Row{.data = static_cast<ClickHouseLibrary::Field *>(cell_holder.get()), .size = requested_rows.size()};
-
-        column_data_holders.push_back(std::move(cell_holder));
-    }
-
-    ClickHouseLibrary::Table request_cols{.data = static_cast<ClickHouseLibrary::Row *>(holder.get()), .size = key_columns.size()};
-
-    auto load_keys_func = library->get<ClickHouseLibrary::LibraryLoadKeysFunc>(ClickHouseLibrary::LIBRARY_LOAD_KEYS_FUNC_NAME);
-    auto data_new_func = library->get<ClickHouseLibrary::LibraryDataNewFunc>(ClickHouseLibrary::LIBRARY_DATA_NEW_FUNC_NAME);
-    auto data_delete_func = library->get<ClickHouseLibrary::LibraryDataDeleteFunc>(ClickHouseLibrary::LIBRARY_DATA_DELETE_FUNC_NAME);
-
-    ClickHouseLibrary::LibraryData data_ptr = data_new_func(lib_data);
-    SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
-
-    ClickHouseLibrary::RawClickHouseLibraryTable data = load_keys_func(data_ptr, &settings->strings, &request_cols);
-    auto block = dataToBlock(description.sample_block, data);
-
-    return std::make_shared<OneBlockInputStream>(block);
+    auto block = blockForKeys(dict_struct, key_columns, requested_rows);
+    return bridge_helper->loadKeys(block);
 }
 
-bool LibraryDictionarySource::isModified() const
-{
-    if (auto func_is_modified = library->tryGet<ClickHouseLibrary::LibraryIsModifiedFunc>(
-        ClickHouseLibrary::LIBRARY_IS_MODIFIED_FUNC_NAME))
-        return func_is_modified(lib_data, &settings->strings);
-
-    return true;
-}
-
-bool LibraryDictionarySource::supportsSelectiveLoad() const
-{
-    if (auto func_supports_selective_load = library->tryGet<ClickHouseLibrary::LibrarySupportsSelectiveLoadFunc>(
-            ClickHouseLibrary::LIBRARY_SUPPORTS_SELECTIVE_LOAD_FUNC_NAME))
-        return func_supports_selective_load(lib_data, &settings->strings);
-
-    return true;
-}
 
 DictionarySourcePtr LibraryDictionarySource::clone() const
 {
     return std::make_unique<LibraryDictionarySource>(*this);
 }
 
+
 std::string LibraryDictionarySource::toString() const
 {
     return path;
 }
 
+
+String LibraryDictionarySource::getLibrarySettingsString(const Poco::Util::AbstractConfiguration & config, const std::string & config_root)
+{
+    Poco::Util::AbstractConfiguration::Keys config_keys;
+    config.keys(config_root, config_keys);
+    WriteBufferFromOwnString out;
+    std::vector<std::string> settings;
+
+    for (const auto & key : config_keys)
+    {
+        std::string key_name = key;
+        auto bracket_pos = key.find('[');
+
+        if (bracket_pos != std::string::npos && bracket_pos > 0)
+            key_name = key.substr(0, bracket_pos);
+
+        settings.push_back(key_name);
+        settings.push_back(config.getString(config_root + "." + key));
+    }
+
+    writeVectorBinary(settings, out);
+    return out.str();
+}
+
+
+String LibraryDictionarySource::getDictIdsString(const std::vector<UInt64> & ids)
+{
+    WriteBufferFromOwnString out;
+    writeVectorBinary(ids, out);
+    return out.str();
+}
+
+
+String LibraryDictionarySource::getDictAttributesString()
+{
+    std::vector<String> attributes_names(dict_struct.attributes.size());
+    for (size_t i = 0; i < dict_struct.attributes.size(); ++i)
+        attributes_names[i] = dict_struct.attributes[i].name;
+    WriteBufferFromOwnString out;
+    writeVectorBinary(attributes_names, out);
+    return out.str();
+}
+
+
 void registerDictionarySourceLibrary(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 const Context & context,
+                                 ContextConstPtr context,
                                  const std::string & /* default_database */,
-                                 bool check_config) -> DictionarySourcePtr
+                                 bool created_from_ddl) -> DictionarySourcePtr
     {
-        return std::make_unique<LibraryDictionarySource>(dict_struct, config, config_prefix + ".library", sample_block, context, check_config);
+        return std::make_unique<LibraryDictionarySource>(dict_struct, config, config_prefix + ".library", sample_block, context, created_from_ddl);
     };
+
     factory.registerSource("library", create_table_source);
 }
 
+
 }
diff --git a/src/Dictionaries/LibraryDictionarySource.h b/src/Dictionaries/LibraryDictionarySource.h
index 4d73b3f97d4..eb346d09fab 100644
--- a/src/Dictionaries/LibraryDictionarySource.h
+++ b/src/Dictionaries/LibraryDictionarySource.h
@@ -1,10 +1,13 @@
 #pragma once
 
 #include <Common/SharedLibrary.h>
+#include <Bridge/LibraryBridgeHelper.h>
 #include <common/LocalDateTime.h>
+#include <Core/UUID.h>
 #include "DictionaryStructure.h"
 #include <Core/ExternalResultDescription.h>
 #include "IDictionarySource.h"
+#include <Interpreters/Context_fwd.h>
 
 
 namespace Poco
@@ -17,18 +20,17 @@ namespace Util
 }
 }
 
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
 }
-class CStringsHolder;
 
-/// Allows loading dictionaries from dynamic libraries (.so)
-/// Experimental version
-/// Example: tests/external_dictionaries/dictionary_library/dictionary_library.cpp
+class CStringsHolder;
+using LibraryBridgeHelperPtr = std::shared_ptr<LibraryBridgeHelper>;
+
 class LibraryDictionarySource final : public IDictionarySource
 {
 public:
@@ -37,8 +39,8 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix_,
         Block & sample_block_,
-        const Context & context,
-        bool check_config);
+        ContextConstPtr context_,
+        bool created_from_ddl);
 
     LibraryDictionarySource(const LibraryDictionarySource & other);
     LibraryDictionarySource & operator=(const LibraryDictionarySource &) = delete;
@@ -49,7 +51,7 @@ public:
 
     BlockInputStreamPtr loadUpdatedAll() override
     {
-        throw Exception{"Method loadUpdatedAll is unsupported for LibraryDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for LibraryDictionarySource");
     }
 
     BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
@@ -68,18 +70,26 @@ public:
     std::string toString() const override;
 
 private:
-    Poco::Logger * log;
+    static String getDictIdsString(const std::vector<UInt64> & ids);
 
-    LocalDateTime getLastModification() const;
+    String getDictAttributesString();
+
+    static String getLibrarySettingsString(const Poco::Util::AbstractConfiguration & config, const std::string & config_root);
+
+    static Field getDictID() { return UUIDHelpers::generateV4(); }
+
+    Poco::Logger * log;
 
     const DictionaryStructure dict_struct;
     const std::string config_prefix;
     const std::string path;
+    const Field dictionary_id;
+
     Block sample_block;
-    SharedLibraryPtr library;
+    ContextConstPtr context;
+
+    LibraryBridgeHelperPtr bridge_helper;
     ExternalResultDescription description;
-    std::shared_ptr<CStringsHolder> settings;
-    void * lib_data = nullptr;
 };
 
 }
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index 5b5d0c4d20f..c0780616191 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -13,9 +13,9 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
         const Poco::Util::AbstractConfiguration & config,
         const std::string & root_config_prefix,
         Block & sample_block,
-        const Context &,
+        ContextConstPtr,
         const std::string & /* default_database */,
-        bool /* check_config */)
+        bool /* created_from_ddl */)
     {
         const auto config_prefix = root_config_prefix + ".mongodb";
         return std::make_unique<MongoDBDictionarySource>(dict_struct,
@@ -50,7 +50,6 @@ 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 <Common/FieldVisitors.h>
 #include <ext/enumerate.h>
 #include <DataStreams/MongoDBBlockInputStream.h>
 
@@ -59,6 +58,7 @@ namespace DB
 {
 namespace ErrorCodes
 {
+    extern const int NOT_IMPLEMENTED;
     extern const int UNSUPPORTED_METHOD;
     extern const int MONGODB_CANNOT_AUTHENTICATE;
 }
@@ -126,7 +126,7 @@ MongoDBDictionarySource::MongoDBDictionarySource(
 #if POCO_VERSION >= 0x01070800
             Poco::MongoDB::Database poco_db(db);
             if (!poco_db.authenticate(*connection, user, password, method.empty() ? Poco::MongoDB::Database::AUTH_SCRAM_SHA1 : method))
-                throw Exception("Cannot authenticate in MongoDB, incorrect user or password", ErrorCodes::MONGODB_CANNOT_AUTHENTICATE);
+                throw Exception(ErrorCodes::MONGODB_CANNOT_AUTHENTICATE, "Cannot authenticate in MongoDB, incorrect user or password");
 #else
             authenticate(*connection, db, user, password);
 #endif
@@ -151,7 +151,7 @@ BlockInputStreamPtr MongoDBDictionarySource::loadAll()
 BlockInputStreamPtr MongoDBDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     if (!dict_struct.id)
-        throw Exception{"'id' is required for selective loading", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is required for selective loading");
 
     auto cursor = createCursor(db, collection, sample_block);
 
@@ -172,7 +172,7 @@ BlockInputStreamPtr MongoDBDictionarySource::loadIds(const std::vector<UInt64> &
 BlockInputStreamPtr MongoDBDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     if (!dict_struct.key)
-        throw Exception{"'key' is required for selective loading", ErrorCodes::UNSUPPORTED_METHOD};
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is required for selective loading");
 
     auto cursor = createCursor(db, collection, sample_block);
 
@@ -186,27 +186,26 @@ BlockInputStreamPtr MongoDBDictionarySource::loadKeys(const Columns & key_column
         {
             switch (attr.second.underlying_type)
             {
-                case AttributeUnderlyingType::utUInt8:
-                case AttributeUnderlyingType::utUInt16:
-                case AttributeUnderlyingType::utUInt32:
-                case AttributeUnderlyingType::utUInt64:
-                case AttributeUnderlyingType::utUInt128:
-                case AttributeUnderlyingType::utInt8:
-                case AttributeUnderlyingType::utInt16:
-                case AttributeUnderlyingType::utInt32:
-                case AttributeUnderlyingType::utInt64:
-                case AttributeUnderlyingType::utDecimal32:
-                case AttributeUnderlyingType::utDecimal64:
-                case AttributeUnderlyingType::utDecimal128:
+                case AttributeUnderlyingType::UInt8:
+                case AttributeUnderlyingType::UInt16:
+                case AttributeUnderlyingType::UInt32:
+                case AttributeUnderlyingType::UInt64:
+                case AttributeUnderlyingType::Int8:
+                case AttributeUnderlyingType::Int16:
+                case AttributeUnderlyingType::Int32:
+                case AttributeUnderlyingType::Int64:
+                {
                     key.add(attr.second.name, Int32(key_columns[attr.first]->get64(row_idx)));
                     break;
-
-                case AttributeUnderlyingType::utFloat32:
-                case AttributeUnderlyingType::utFloat64:
+                }
+                case AttributeUnderlyingType::Float32:
+                case AttributeUnderlyingType::Float64:
+                {
                     key.add(attr.second.name, key_columns[attr.first]->getFloat64(row_idx));
                     break;
-
-                case AttributeUnderlyingType::utString:
+                }
+                case AttributeUnderlyingType::String:
+                {
                     String loaded_str(get<String>((*key_columns[attr.first])[row_idx]));
                     /// Convert string to ObjectID
                     if (attr.second.is_object_id)
@@ -219,6 +218,9 @@ BlockInputStreamPtr MongoDBDictionarySource::loadKeys(const Columns & key_column
                         key.add(attr.second.name, loaded_str);
                     }
                     break;
+                }
+                default:
+                    throw Exception("Unsupported dictionary attribute type for MongoDB dictionary source", ErrorCodes::NOT_IMPLEMENTED);
             }
         }
     }
diff --git a/src/Dictionaries/MongoDBDictionarySource.h b/src/Dictionaries/MongoDBDictionarySource.h
index ad7b66fe1a7..fef5749190f 100644
--- a/src/Dictionaries/MongoDBDictionarySource.h
+++ b/src/Dictionaries/MongoDBDictionarySource.h
@@ -50,7 +50,7 @@ public:
 
     BlockInputStreamPtr loadUpdatedAll() override
     {
-        throw Exception{"Method loadUpdatedAll is unsupported for MongoDBDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for MongoDBDictionarySource");
     }
 
     bool supportsSelectiveLoad() const override { return true; }
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index a1d0cbe7ffc..40398a7ba42 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -4,9 +4,15 @@
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
+
+[[maybe_unused]]
+static const size_t default_num_tries_on_connection_loss = 3;
+
 namespace ErrorCodes
 {
     extern const int SUPPORT_IS_DISABLED;
@@ -14,22 +20,22 @@ namespace ErrorCodes
 
 void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 {
-    auto create_table_source = [=](const DictionaryStructure & dict_struct,
-                                 const Poco::Util::AbstractConfiguration & config,
-                                 const std::string & config_prefix,
-                                 Block & sample_block,
-                                 const Context & /* context */,
+    auto create_table_source = [=]([[maybe_unused]] const DictionaryStructure & dict_struct,
+                                   [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
+                                   [[maybe_unused]] const std::string & config_prefix,
+                                   [[maybe_unused]] Block & sample_block,
+                                   [[maybe_unused]] ContextConstPtr context,
                                  const std::string & /* default_database */,
-                                 bool /* check_config */) -> DictionarySourcePtr {
+                                 bool /* created_from_ddl */) -> DictionarySourcePtr {
 #if USE_MYSQL
-        return std::make_unique<MySQLDictionarySource>(dict_struct, config, config_prefix + ".mysql", sample_block);
+        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);
+        return std::make_unique<MySQLDictionarySource>(dict_struct, config, config_prefix + ".mysql", sample_block, mysql_input_stream_settings);
 #else
-        (void)dict_struct;
-        (void)config;
-        (void)config_prefix;
-        (void)sample_block;
-        throw Exception{"Dictionary source of type `mysql` is disabled because ClickHouse was built without mysql support.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `mysql` is disabled because ClickHouse was built without mysql support.");
 #endif
     };
     factory.registerSource("mysql", create_table_source);
@@ -45,22 +51,21 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 #    include <IO/WriteHelpers.h>
 #    include <common/LocalDateTime.h>
 #    include <common/logger_useful.h>
-#    include <Formats/MySQLBlockInputStream.h>
 #    include "readInvalidateQuery.h"
 #    include <mysqlxx/Exception.h>
 #    include <mysqlxx/PoolFactory.h>
+#    include <Core/Settings.h>
 
 namespace DB
 {
-static const UInt64 max_block_size = 8192;
-static const size_t default_num_tries_on_connection_loss = 3;
 
 
 MySQLDictionarySource::MySQLDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
-    const Block & sample_block_)
+    const Block & sample_block_,
+    const StreamSettings & settings_)
     : log(&Poco::Logger::get("MySQLDictionarySource"))
     , update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
@@ -70,14 +75,11 @@ MySQLDictionarySource::MySQLDictionarySource(
     , update_field{config.getString(config_prefix + ".update_field", "")}
     , dont_check_update_time{config.getBool(config_prefix + ".dont_check_update_time", false)}
     , sample_block{sample_block_}
-    , pool{mysqlxx::PoolFactory::instance().get(config, config_prefix)}
+    , pool{std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, config_prefix))}
     , query_builder{dict_struct, db, "", table, where, IdentifierQuotingStyle::Backticks}
     , load_all_query{query_builder.composeLoadAllQuery()}
     , invalidate_query{config.getString(config_prefix + ".invalidate_query", "")}
-    , close_connection(
-            config.getBool(config_prefix + ".close_connection", false) || config.getBool(config_prefix + ".share_connection", false))
-    , max_tries_for_mysql_block_input_stream(
-            config.getBool(config_prefix + ".fail_on_connection_loss", false) ? 1 : default_num_tries_on_connection_loss)
+    , settings(settings_)
 {
 }
 
@@ -98,8 +100,7 @@ MySQLDictionarySource::MySQLDictionarySource(const MySQLDictionarySource & other
     , last_modification{other.last_modification}
     , invalidate_query{other.invalidate_query}
     , invalidate_query_response{other.invalidate_query_response}
-    , close_connection{other.close_connection}
-    , max_tries_for_mysql_block_input_stream{other.max_tries_for_mysql_block_input_stream}
+    , settings(other.settings)
 {
 }
 
@@ -119,67 +120,43 @@ std::string MySQLDictionarySource::getUpdateFieldAndDate()
     }
 }
 
-BlockInputStreamPtr MySQLDictionarySource::retriedCreateMySqlBIStream(const std::string & data_fetch_query_str, const size_t max_tries)
+BlockInputStreamPtr MySQLDictionarySource::loadFromQuery(const String & query)
 {
-    size_t count_connection_lost = 0;
-
-    while (true)
-    {
-        auto connection = pool.get();
-
-        try
-        {
-            return std::make_shared<MySQLBlockInputStream>(
-                    connection, data_fetch_query_str, sample_block, max_block_size, close_connection);
-        }
-        catch (const mysqlxx::ConnectionLost & ecl)  /// There are two retriable failures: CR_SERVER_GONE_ERROR, CR_SERVER_LOST
-        {
-            if (++count_connection_lost < max_tries)
-            {
-                LOG_WARNING(log, ecl.displayText());
-                LOG_WARNING(log, "Lost connection ({}/{}). Trying to reconnect...", count_connection_lost, max_tries);
-                continue;
-            }
-
-            LOG_ERROR(log, "Failed ({}/{}) to create BlockInputStream for MySQL dictionary source.", count_connection_lost, max_tries);
-            throw;
-        }
-    }
+    return std::make_shared<MySQLWithFailoverBlockInputStream>(
+            pool, query, sample_block, settings);
 }
 
 BlockInputStreamPtr MySQLDictionarySource::loadAll()
 {
-    auto connection = pool.get();
+    auto connection = pool->get();
     last_modification = getLastModification(connection, false);
 
     LOG_TRACE(log, load_all_query);
-    return retriedCreateMySqlBIStream(load_all_query, max_tries_for_mysql_block_input_stream);
+    return loadFromQuery(load_all_query);
 }
 
 BlockInputStreamPtr MySQLDictionarySource::loadUpdatedAll()
 {
-    auto connection = pool.get();
+    auto connection = pool->get();
     last_modification = getLastModification(connection, false);
 
     std::string load_update_query = getUpdateFieldAndDate();
     LOG_TRACE(log, load_update_query);
-    return retriedCreateMySqlBIStream(load_update_query, max_tries_for_mysql_block_input_stream);
+    return loadFromQuery(load_update_query);
 }
 
 BlockInputStreamPtr 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 retriedCreateMySqlBIStream(query, max_tries_for_mysql_block_input_stream);
+    return loadFromQuery(query);
 }
 
 BlockInputStreamPtr 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);
-    return retriedCreateMySqlBIStream(query, max_tries_for_mysql_block_input_stream);
+    return loadFromQuery(query);
 }
 
 bool MySQLDictionarySource::isModified() const
@@ -187,7 +164,7 @@ bool MySQLDictionarySource::isModified() const
     if (!invalidate_query.empty())
     {
         auto response = doInvalidateQuery(invalidate_query);
-        if (response == invalidate_query_response)
+        if (response == invalidate_query_response) //-V1051
             return false;
         invalidate_query_response = response;
         return true;
@@ -195,7 +172,7 @@ bool MySQLDictionarySource::isModified() const
 
     if (dont_check_update_time)
         return true;
-    auto connection = pool.get();
+    auto connection = pool->get();
     return getLastModification(connection, true) > last_modification;
 }
 
@@ -269,7 +246,7 @@ LocalDateTime MySQLDictionarySource::getLastModification(mysqlxx::Pool::Entry &
                 ++fetched_rows;
         }
 
-        if (close_connection && allow_connection_closure)
+        if (settings.auto_close && allow_connection_closure)
         {
             connection.disconnect();
         }
@@ -293,7 +270,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, 1, close_connection);
+    MySQLBlockInputStream block_input_stream(pool->get(), request, invalidate_sample_block, settings);
     return readInvalidateQuery(block_input_stream);
 }
 
diff --git a/src/Dictionaries/MySQLDictionarySource.h b/src/Dictionaries/MySQLDictionarySource.h
index 54bc2da6a56..ef1d81b862f 100644
--- a/src/Dictionaries/MySQLDictionarySource.h
+++ b/src/Dictionaries/MySQLDictionarySource.h
@@ -12,7 +12,7 @@
 #    include "DictionaryStructure.h"
 #    include "ExternalQueryBuilder.h"
 #    include "IDictionarySource.h"
-
+#    include <Formats/MySQLBlockInputStream.h>
 
 namespace Poco
 {
@@ -34,8 +34,9 @@ public:
     MySQLDictionarySource(
         const DictionaryStructure & dict_struct_,
         const Poco::Util::AbstractConfiguration & config,
-        const std::string & config_prefix,
-        const Block & sample_block_);
+        const String & config_prefix,
+        const Block & sample_block_,
+        const StreamSettings & settings_);
 
     /// copy-constructor is provided in order to support cloneability
     MySQLDictionarySource(const MySQLDictionarySource & other);
@@ -60,6 +61,8 @@ public:
     std::string toString() const override;
 
 private:
+    BlockInputStreamPtr loadFromQuery(const String & query);
+
     std::string getUpdateFieldAndDate();
 
     static std::string quoteForLike(const std::string s);
@@ -69,9 +72,6 @@ private:
     // execute invalidate_query. expects single cell in result
     std::string doInvalidateQuery(const std::string & request) const;
 
-    /// A helper method for recovering from "Lost connection to MySQL server during query" errors
-    BlockInputStreamPtr retriedCreateMySqlBIStream(const std::string & query_str, const size_t max_tries);
-
     Poco::Logger * log;
 
     std::chrono::time_point<std::chrono::system_clock> update_time;
@@ -82,14 +82,13 @@ private:
     const std::string update_field;
     const bool dont_check_update_time;
     Block sample_block;
-    mutable mysqlxx::PoolWithFailover pool;
+    mutable mysqlxx::PoolWithFailoverPtr pool;
     ExternalQueryBuilder query_builder;
     const std::string load_all_query;
     LocalDateTime last_modification;
     std::string invalidate_query;
     mutable std::string invalidate_query_response;
-    const bool close_connection;
-    const size_t max_tries_for_mysql_block_input_stream;
+    const StreamSettings settings;
 };
 
 }
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 7046741b3a0..084228c98ae 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -64,6 +64,8 @@ ColumnPtr IPolygonDictionary::getColumn(
     Field row_value_to_insert;
     size_t polygon_index = 0;
 
+    size_t keys_found = 0;
+
     if (unlikely(complex_attribute))
     {
         for (size_t requested_key_index = 0; requested_key_index < requested_key_points.size(); ++requested_key_index)
@@ -74,6 +76,7 @@ ColumnPtr IPolygonDictionary::getColumn(
             {
                 size_t attribute_values_index = polygon_index_to_attribute_value_index[polygon_index];
                 attribute_values_column->get(attribute_values_index, row_value_to_insert);
+                ++keys_found;
             }
             else
                 row_value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
@@ -110,6 +113,7 @@ ColumnPtr IPolygonDictionary::getColumn(
                         size_t attribute_values_index = polygon_index_to_attribute_value_index[polygon_index];
                         auto data_to_insert = attribute_values_column->getDataAt(attribute_values_index);
                         result_column_typed.insertData(data_to_insert.data, data_to_insert.size);
+                        ++keys_found;
                     }
                     else
                         result_column_typed.insert(default_value_provider.getDefaultValue(requested_key_index));
@@ -129,6 +133,7 @@ ColumnPtr IPolygonDictionary::getColumn(
                         size_t attribute_values_index = polygon_index_to_attribute_value_index[polygon_index];
                         auto & item = attribute_data[attribute_values_index];
                         result_data.emplace_back(item);
+                        ++keys_found;
                     }
                     else
                     {
@@ -143,6 +148,7 @@ ColumnPtr IPolygonDictionary::getColumn(
     }
 
     query_count.fetch_add(requested_key_points.size(), std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
@@ -151,7 +157,7 @@ BlockInputStreamPtr IPolygonDictionary::getBlockInputStream(const Names &, size_
 {
     // 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{"Reading the dictionary is not allowed", ErrorCodes::UNSUPPORTED_METHOD};
+    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Reading the dictionary is not allowed");
 }
 
 void IPolygonDictionary::setup()
@@ -164,9 +170,9 @@ void IPolygonDictionary::setup()
         attributes.emplace_back(std::move(column));
 
         if (attribute.hierarchical)
-            throw Exception{ErrorCodes::TYPE_MISMATCH,
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
                             "{}: hierarchical attributes not supported for dictionary of polygonal type",
-                            getDictionaryID().getNameForLogs()};
+                            getDictionaryID().getNameForLogs());
     }
 }
 
@@ -248,13 +254,13 @@ void IPolygonDictionary::calculateBytesAllocated()
 std::vector<IPolygonDictionary::Point> IPolygonDictionary::extractPoints(const Columns & key_columns)
 {
     if (key_columns.size() != 2)
-        throw Exception{"Expected two columns of coordinates with type Float64", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected two columns of coordinates with type Float64");
 
     const auto * column_x = typeid_cast<const ColumnVector<Float64>*>(key_columns[0].get());
     const auto * column_y = typeid_cast<const ColumnVector<Float64>*>(key_columns[1].get());
 
     if (!column_x || !column_y)
-        throw Exception{"Expected columns of Float64", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected columns of Float64");
 
     const auto rows = key_columns.front()->size();
 
@@ -285,16 +291,20 @@ ColumnUInt8::Ptr IPolygonDictionary::hasKeys(const Columns & key_columns, const
     std::vector<IPolygonDictionary::Point> points = extractPoints(key_columns);
 
     auto result = ColumnUInt8::create(points.size());
-    auto& out = result->getData();
+    auto & out = result->getData();
+
+    size_t keys_found = 0;
 
     for (size_t i = 0; i < points.size(); ++i)
     {
         size_t unused_find_result = 0;
         auto & point = points[i];
         out[i] = find(point, unused_find_result);
+        keys_found += out[i];
     }
 
     query_count.fetch_add(points.size(), std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
@@ -392,17 +402,17 @@ const IColumn * unrollMultiPolygons(const ColumnPtr & column, Offset & offset)
 {
     const auto * ptr_multi_polygons = typeid_cast<const ColumnArray*>(column.get());
     if (!ptr_multi_polygons)
-        throw Exception{"Expected a column containing arrays of polygons", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of polygons");
     offset.multi_polygon_offsets.assign(ptr_multi_polygons->getOffsets());
 
     const auto * ptr_polygons = typeid_cast<const ColumnArray*>(&ptr_multi_polygons->getData());
     if (!ptr_polygons)
-        throw Exception{"Expected a column containing arrays of rings when reading polygons", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of rings when reading polygons");
     offset.polygon_offsets.assign(ptr_polygons->getOffsets());
 
     const auto * ptr_rings = typeid_cast<const ColumnArray*>(&ptr_polygons->getData());
     if (!ptr_rings)
-        throw Exception{"Expected a column containing arrays of points when reading rings", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of points when reading rings");
     offset.ring_offsets.assign(ptr_rings->getOffsets());
 
     return ptr_rings->getDataPtr().get();
@@ -412,7 +422,7 @@ const IColumn * unrollSimplePolygons(const ColumnPtr & column, Offset & offset)
 {
     const auto * ptr_polygons = typeid_cast<const ColumnArray*>(column.get());
     if (!ptr_polygons)
-        throw Exception{"Expected a column containing arrays of points", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column containing arrays of points");
     offset.ring_offsets.assign(ptr_polygons->getOffsets());
     std::iota(offset.polygon_offsets.begin(), offset.polygon_offsets.end(), 1);
     offset.multi_polygon_offsets.assign(offset.polygon_offsets);
@@ -425,13 +435,13 @@ void handlePointsReprByArrays(const IColumn * column, Data & data, Offset & offs
     const auto * ptr_points = typeid_cast<const ColumnArray*>(column);
     const auto * ptr_coord = typeid_cast<const ColumnVector<Float64>*>(&ptr_points->getData());
     if (!ptr_coord)
-        throw Exception{"Expected coordinates to be of type Float64", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected coordinates to be of type Float64");
     const auto & offsets = ptr_points->getOffsets();
     IColumn::Offset prev_offset = 0;
     for (size_t i = 0; i < offsets.size(); ++i)
     {
         if (offsets[i] - prev_offset != 2)
-            throw Exception{"All points should be two-dimensional", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "All points should be two-dimensional");
         prev_offset = offsets[i];
         addNewPoint(ptr_coord->getElement(2 * i), ptr_coord->getElement(2 * i + 1), data, offset);
     }
@@ -441,13 +451,13 @@ void handlePointsReprByTuples(const IColumn * column, Data & data, Offset & offs
 {
     const auto * ptr_points = typeid_cast<const ColumnTuple*>(column);
     if (!ptr_points)
-        throw Exception{"Expected a column of tuples representing points", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a column of tuples representing points");
     if (ptr_points->tupleSize() != 2)
-        throw Exception{"Points should be two-dimensional", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Points should be two-dimensional");
     const auto * column_x = typeid_cast<const ColumnVector<Float64>*>(&ptr_points->getColumn(0));
     const auto * column_y = typeid_cast<const ColumnVector<Float64>*>(&ptr_points->getColumn(1));
     if (!column_x || !column_y)
-        throw Exception{"Expected coordinates to be of type Float64", ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected coordinates to be of type Float64");
     for (size_t i = 0; i < column_x->size(); ++i)
     {
         addNewPoint(column_x->getElement(i), column_y->getElement(i), data, offset);
@@ -473,8 +483,8 @@ void IPolygonDictionary::extractPolygons(const ColumnPtr & column)
     }
 
     if (!offset.allRingsHaveAPositiveArea())
-        throw Exception{"Every ring included in a polygon or excluded from it should contain at least 3 points",
-                        ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Every ring included in a polygon or excluded from it should contain at least 3 points");
 
     /** Adding the first empty polygon */
     data.addPolygon(true);
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index 5974e6461a7..f43fc0c8f57 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -63,6 +63,14 @@ public:
 
     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 attributes.empty() ? 0 : attributes.front()->size(); }
@@ -141,6 +149,7 @@ private:
 
     size_t bytes_allocated = 0;
     mutable std::atomic<size_t> query_count{0};
+    mutable std::atomic<size_t> found_count{0};
 
     /** Since the original data may have been in the form of multi-polygons, an id is stored for each single polygon
      *  corresponding to the row in which any other attributes for this entry are located.
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.cpp b/src/Dictionaries/PolygonDictionaryImplementations.cpp
index cb4bd05fd83..fd3b9efd532 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.cpp
+++ b/src/Dictionaries/PolygonDictionaryImplementations.cpp
@@ -166,16 +166,18 @@ DictionaryPtr createLayout(const std::string & ,
                            const DictionaryStructure & dict_struct,
                            const Poco::Util::AbstractConfiguration & config,
                            const std::string & config_prefix,
-                           DictionarySourcePtr source_ptr)
+                           DictionarySourcePtr source_ptr,
+                           ContextConstPtr /* context */,
+                           bool /*created_from_ddl*/)
 {
     const String database = config.getString(config_prefix + ".database", "");
     const String name = config.getString(config_prefix + ".name");
 
     if (!dict_struct.key)
-        throw Exception{"'key' is required for a polygon dictionary", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "'key' is required for a polygon dictionary");
     if (dict_struct.key->size() != 1)
-        throw Exception{"The 'key' should consist of a single attribute for a polygon dictionary",
-                        ErrorCodes::BAD_ARGUMENTS};
+        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;
@@ -206,19 +208,19 @@ DictionaryPtr createLayout(const std::string & ,
         point_type = IPolygonDictionary::PointType::Tuple;
     }
     else
-        throw Exception{"The key type " + key_type->getName() +
-                        " is not one of the following allowed types for a polygon dictionary: " +
-                        multi_polygon_array.getName() + " " +
-                        multi_polygon_tuple.getName() + " " +
-                        simple_polygon_array.getName() + " " +
-                        simple_polygon_tuple.getName() + " ",
-                        ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "The key type {} is not one of the following allowed types for a polygon dictionary: {} {} {} {} ",
+            key_type->getName(),
+            multi_polygon_array.getName(),
+            multi_polygon_tuple.getName(),
+            simple_polygon_array.getName(),
+            simple_polygon_tuple.getName());
 
     if (dict_struct.range_min || dict_struct.range_max)
-        throw Exception{name
-                        + ": elements range_min and range_max should be defined only "
-                          "for a dictionary of layout 'range_hashed'",
-                        ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "{}: elements range_min and range_max should be defined only "
+            "for a dictionary of layout 'range_hashed'",
+            name);
 
     const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
 
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index 79298fc2fb3..c563f9aab45 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -9,6 +9,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataStreams/PostgreSQLBlockInputStream.h>
 #include "readInvalidateQuery.h"
+#include <Interpreters/Context.h>
 #endif
 
 
@@ -24,19 +25,39 @@ namespace ErrorCodes
 
 static const UInt64 max_block_size = 8192;
 
+namespace
+{
+    ExternalQueryBuilder makeExternalQueryBuilder(const DictionaryStructure & dict_struct, String & schema, String & table, const String & where)
+    {
+        if (schema.empty())
+        {
+            if (auto pos = table.find('.'); pos != std::string::npos)
+            {
+                schema = table.substr(0, pos);
+                table = table.substr(pos + 1);
+            }
+        }
+        /// Do not need db because it is already in a connection string.
+        return {dict_struct, "", schema, table, where, IdentifierQuotingStyle::DoubleQuotes};
+    }
+}
+
+
 PostgreSQLDictionarySource::PostgreSQLDictionarySource(
     const DictionaryStructure & dict_struct_,
+    postgres::PoolWithFailoverPtr pool_,
     const Poco::Util::AbstractConfiguration & config_,
     const std::string & config_prefix,
     const Block & sample_block_)
     : dict_struct{dict_struct_}
     , sample_block(sample_block_)
-    , connection(std::make_shared<PostgreSQLReplicaConnection>(config_, config_prefix))
+    , pool(std::move(pool_))
     , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
     , db(config_.getString(fmt::format("{}.db", config_prefix), ""))
+    , schema(config_.getString(fmt::format("{}.schema", config_prefix), ""))
     , table(config_.getString(fmt::format("{}.table", config_prefix), ""))
     , where(config_.getString(fmt::format("{}.where", config_prefix), ""))
-    , query_builder(dict_struct, "", "", table, where, IdentifierQuotingStyle::DoubleQuotes)
+    , query_builder(makeExternalQueryBuilder(dict_struct, schema, table, where))
     , load_all_query(query_builder.composeLoadAllQuery())
     , invalidate_query(config_.getString(fmt::format("{}.invalidate_query", config_prefix), ""))
     , update_field(config_.getString(fmt::format("{}.update_field", config_prefix), ""))
@@ -48,7 +69,7 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(
 PostgreSQLDictionarySource::PostgreSQLDictionarySource(const PostgreSQLDictionarySource & other)
     : dict_struct(other.dict_struct)
     , sample_block(other.sample_block)
-    , connection(other.connection)
+    , pool(other.pool)
     , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
     , db(other.db)
     , table(other.table)
@@ -93,7 +114,7 @@ BlockInputStreamPtr PostgreSQLDictionarySource::loadKeys(const Columns & key_col
 
 BlockInputStreamPtr PostgreSQLDictionarySource::loadBase(const String & query)
 {
-    return std::make_shared<PostgreSQLBlockInputStream>(connection->get(), query, sample_block, max_block_size);
+    return std::make_shared<PostgreSQLBlockInputStream>(pool->get(), query, sample_block, max_block_size);
 }
 
 bool PostgreSQLDictionarySource::isModified() const
@@ -101,7 +122,7 @@ bool PostgreSQLDictionarySource::isModified() const
     if (!invalidate_query.empty())
     {
         auto response = doInvalidateQuery(invalidate_query);
-        if (response == invalidate_query_response)
+        if (response == invalidate_query_response) //-V1051
             return false;
         invalidate_query_response = response;
     }
@@ -114,7 +135,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(connection->get(), request, invalidate_sample_block, 1);
+    PostgreSQLBlockInputStream block_input_stream(pool->get(), request, invalidate_sample_block, 1);
     return readInvalidateQuery(block_input_stream);
 }
 
@@ -167,21 +188,26 @@ void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & root_config_prefix,
                                  Block & sample_block,
-                                 const Context & /* context */,
+                                 ContextConstPtr context,
                                  const std::string & /* default_database */,
-                                 bool /* check_config */) -> DictionarySourcePtr
+                                 bool /* created_from_ddl */) -> DictionarySourcePtr
     {
 #if USE_LIBPQXX
         const auto config_prefix = root_config_prefix + ".postgresql";
+        auto pool = std::make_shared<postgres::PoolWithFailover>(
+                    config, config_prefix,
+                    context->getSettingsRef().postgresql_connection_pool_size,
+                    context->getSettingsRef().postgresql_connection_pool_wait_timeout);
         return std::make_unique<PostgreSQLDictionarySource>(
-                dict_struct, config, config_prefix, sample_block);
+                dict_struct, pool, config, config_prefix, sample_block);
 #else
         (void)dict_struct;
         (void)config;
         (void)root_config_prefix;
         (void)sample_block;
-        throw Exception{"Dictionary source of type `postgresql` is disabled because ClickHouse was built without postgresql support.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+        (void)context;
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `postgresql` is disabled because ClickHouse was built without postgresql support.");
 #endif
     };
     factory.registerSource("postgresql", create_table_source);
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.h b/src/Dictionaries/PostgreSQLDictionarySource.h
index dd2d35db83a..780fa2b4b22 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.h
+++ b/src/Dictionaries/PostgreSQLDictionarySource.h
@@ -11,7 +11,7 @@
 #include <Core/Block.h>
 #include <common/LocalDateTime.h>
 #include <common/logger_useful.h>
-#include <Storages/PostgreSQL/PostgreSQLReplicaConnection.h>
+#include <Storages/PostgreSQL/PoolWithFailover.h>
 #include <pqxx/pqxx>
 
 
@@ -24,6 +24,7 @@ class PostgreSQLDictionarySource final : public IDictionarySource
 public:
     PostgreSQLDictionarySource(
         const DictionaryStructure & dict_struct_,
+        postgres::PoolWithFailoverPtr pool_,
         const Poco::Util::AbstractConfiguration & config_,
         const std::string & config_prefix,
         const Block & sample_block_);
@@ -45,21 +46,22 @@ public:
     std::string toString() const override;
 
 private:
-    std::string getUpdateFieldAndDate();
-    std::string doInvalidateQuery(const std::string & request) const;
+    String getUpdateFieldAndDate();
+    String doInvalidateQuery(const std::string & request) const;
     BlockInputStreamPtr loadBase(const String & query);
 
     const DictionaryStructure dict_struct;
     Block sample_block;
-    PostgreSQLReplicaConnectionPtr connection;
+    postgres::PoolWithFailoverPtr pool;
     Poco::Logger * log;
 
-    const std::string db;
-    const std::string table;
-    const std::string where;
+    const String db;
+    String schema;
+    String table;
+    const String where;
     ExternalQueryBuilder query_builder;
     const std::string load_all_query;
-    std::string invalidate_query;
+    String invalidate_query;
     std::chrono::time_point<std::chrono::system_clock> update_time;
     const std::string update_field;
     mutable std::string invalidate_query_response;
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index 30395114a8e..b771bca068f 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -195,17 +195,20 @@ ColumnUInt8::Ptr RangeHashedDictionary::hasKeys(const Columns & key_columns, con
 
     ColumnUInt8::Ptr result;
 
+    size_t keys_found = 0;
+
     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>;
-        result = hasKeysImpl<ValueType>(attribute, ids, dates);
+        result = hasKeysImpl<ValueType>(attribute, ids, dates, keys_found);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
     query_count.fetch_add(ids.size(), std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
@@ -214,13 +217,16 @@ template <typename AttributeType>
 ColumnUInt8::Ptr RangeHashedDictionary::hasKeysImpl(
     const Attribute & attribute,
     const PaddedPODArray<UInt64> & ids,
-    const PaddedPODArray<RangeStorageType> & dates) const
+    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 : ext::range(0, ids.size()))
     {
         const auto it = attr.find(ids[row]);
@@ -237,10 +243,8 @@ ColumnUInt8::Ptr RangeHashedDictionary::hasKeysImpl(
                     return v.range.contains(date);
                 });
 
-            if (val_it != std::end(ranges_and_values))
-                out[row] = true;
-            else
-                out[row] = false;
+            out[row] = val_it != std::end(ranges_and_values);
+            keys_found += out[row];
         }
         else
             out[row] = false;
@@ -260,8 +264,8 @@ void RangeHashedDictionary::createAttributes()
         attributes.push_back(createAttribute(attribute, attribute.null_value));
 
         if (attribute.hierarchical)
-            throw Exception{ErrorCodes::BAD_ARGUMENTS, "Hierarchical attributes not supported by {} dictionary.",
-                            getDictionaryID().getNameForLogs()};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Hierarchical attributes not supported by {} dictionary.",
+                            getDictionaryID().getNameForLogs());
     }
 }
 
@@ -311,8 +315,8 @@ void RangeHashedDictionary::loadData()
     stream->readSuffix();
 
     if (require_nonempty && 0 == element_count)
-        throw Exception{full_name + ": dictionary source is empty and 'require_nonempty' property is set.",
-                        ErrorCodes::DICTIONARY_IS_EMPTY};
+        throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY,
+            "{}: dictionary source is empty and 'require_nonempty' property is set.");
 }
 
 template <typename T>
@@ -396,6 +400,8 @@ void RangeHashedDictionary::getItemsImpl(
 
     const auto & attr = *std::get<Ptr<AttributeType>>(attribute.maps);
 
+    size_t keys_found = 0;
+
     for (const auto row : ext::range(0, ids.size()))
     {
         const auto it = attr.find(ids[row]);
@@ -413,7 +419,8 @@ void RangeHashedDictionary::getItemsImpl(
 
             if (val_it != std::end(ranges_and_values))
             {
-                auto& value = val_it->value;
+                ++keys_found;
+                auto & value = val_it->value;
 
                 if (value)
                     set_value(row, static_cast<OutputType>(*value), false); // NOLINT
@@ -432,6 +439,7 @@ void RangeHashedDictionary::getItemsImpl(
     }
 
     query_count.fetch_add(ids.size(), std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
 
@@ -497,7 +505,7 @@ const RangeHashedDictionary::Attribute & RangeHashedDictionary::getAttribute(con
 {
     const auto it = attribute_index_by_name.find(attribute_name);
     if (it == std::end(attribute_index_by_name))
-        throw Exception{full_name + ": no such attribute '" + attribute_name + "'", ErrorCodes::BAD_ARGUMENTS};
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: no such attribute '{}'", full_name, attribute_name);
 
     return attributes[it->second];
 }
@@ -507,8 +515,9 @@ RangeHashedDictionary::getAttributeWithType(const std::string & attribute_name,
 {
     const auto & attribute = getAttribute(attribute_name);
     if (attribute.type != type)
-        throw Exception{attribute_name + ": type mismatch: attribute " + attribute_name + " has type " + toString(attribute.type),
-                        ErrorCodes::TYPE_MISMATCH};
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "attribute {} has type {}",
+            attribute_name,
+            toString(attribute.type));
 
     return attribute;
 }
@@ -613,8 +622,9 @@ BlockInputStreamPtr RangeHashedDictionary::getBlockInputStream(const Names & col
     ListType::forEach(callable);
 
     if (!callable.stream)
-        throw Exception(
-            "Unexpected range type for RangeHashed dictionary: " + dict_struct.range_min->type->getName(), ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Unexpected range type for RangeHashed dictionary: {}",
+            dict_struct.range_min->type->getName());
 
     return callable.stream;
 }
@@ -626,14 +636,17 @@ void registerDictionaryRangeHashed(DictionaryFactory & factory)
                              const DictionaryStructure & dict_struct,
                              const Poco::Util::AbstractConfiguration & config,
                              const std::string & config_prefix,
-                             DictionarySourcePtr source_ptr) -> DictionaryPtr
+                             DictionarySourcePtr source_ptr,
+                             ContextConstPtr /* context */,
+                             bool /*created_from_ddl*/) -> DictionaryPtr
     {
         if (dict_struct.key)
-            throw Exception{"'key' is not supported for dictionary of layout 'range_hashed'", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for dictionary of layout 'range_hashed'");
 
         if (!dict_struct.range_min || !dict_struct.range_max)
-            throw Exception{full_name + ": dictionary of layout 'range_hashed' requires .structure.range_min and .structure.range_max",
-                            ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "{}: dictionary of layout '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"};
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index ca2a925df5e..edd8275acd1 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -32,6 +32,14 @@ public:
 
     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; }
@@ -105,15 +113,20 @@ private:
             UInt32,
             UInt64,
             UInt128,
+            UInt256,
             Int8,
             Int16,
             Int32,
             Int64,
+            Int128,
+            Int256,
             Decimal32,
             Decimal64,
             Decimal128,
+            Decimal256,
             Float32,
             Float64,
+            UUID,
             StringRef>
             null_values;
         std::variant<
@@ -122,15 +135,20 @@ private:
             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>>
             maps;
         std::unique_ptr<Arena> string_arena;
@@ -161,7 +179,8 @@ private:
     ColumnUInt8::Ptr hasKeysImpl(
         const Attribute & attribute,
         const PaddedPODArray<UInt64> & ids,
-        const PaddedPODArray<RangeStorageType> & dates) const;
+        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);
@@ -199,6 +218,7 @@ private:
     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};
 };
 
 }
diff --git a/src/Dictionaries/RedisBlockInputStream.cpp b/src/Dictionaries/RedisBlockInputStream.cpp
index 39cc2d610df..bb8ef92eeea 100644
--- a/src/Dictionaries/RedisBlockInputStream.cpp
+++ b/src/Dictionaries/RedisBlockInputStream.cpp
@@ -57,7 +57,7 @@ namespace DB
         void insertValue(IColumn & column, const ValueType type, const Poco::Redis::BulkString & bulk_string)
         {
             if (bulk_string.isNull())
-                throw Exception{"Type mismatch, expected not Null String", ErrorCodes::TYPE_MISMATCH};
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch, expected not Null String");
 
             const String & string_value = bulk_string.value();
             switch (type)
@@ -109,10 +109,12 @@ namespace DB
                     break;
                 }
                 case ValueType::vtUUID:
-                    assert_cast<ColumnUInt128 &>(column).insertValue(parse<UUID>(string_value));
+                    assert_cast<ColumnUUID &>(column).insertValue(parse<UUID>(string_value));
                     break;
                 default:
-                    throw Exception("Value of unsupported type:" + column.getName(), ErrorCodes::UNKNOWN_TYPE);
+                    throw Exception(ErrorCodes::UNKNOWN_TYPE,
+                        "Value of unsupported type: {}",
+                        column.getName());
             }
         }
     }
@@ -152,8 +154,9 @@ namespace DB
                 const auto & keys_array = keys.get<RedisArray>(cursor);
                 if (keys_array.size() < 2)
                 {
-                    throw Exception{"Too low keys in request to source: " + DB::toString(keys_array.size())
-                                    + ", expected 2 or more", ErrorCodes::LOGICAL_ERROR};
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Too low keys in request to source: {}, expected 2 or more",
+                        DB::toString(keys_array.size()));
                 }
 
                 if (num_rows + keys_array.size() - 1 > max_block_size)
@@ -166,8 +169,8 @@ namespace DB
                 auto values = client->execute<RedisArray>(command_for_values);
 
                 if (keys_array.size() != values.size() + 1) // 'HMGET' primary_key secondary_keys
-                    throw Exception{"Inconsistent sizes of keys and values in Redis request",
-                                    ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH};
+                    throw Exception(ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH,
+                        "Inconsistent sizes of keys and values in Redis request");
 
                 const auto & primary_key = keys_array.get<RedisBulkString>(0);
                 for (size_t i = 0; i < values.size(); ++i)
@@ -196,7 +199,8 @@ namespace DB
 
             auto values = client->execute<RedisArray>(command_for_values);
             if (values.size() != need_values)
-                throw Exception{"Inconsistent sizes of keys and values in Redis request", ErrorCodes::INTERNAL_REDIS_ERROR};
+                throw Exception(ErrorCodes::INTERNAL_REDIS_ERROR,
+                    "Inconsistent sizes of keys and values in Redis request");
 
             for (size_t i = 0; i < values.size(); ++i)
             {
diff --git a/src/Dictionaries/RedisDictionarySource.cpp b/src/Dictionaries/RedisDictionarySource.cpp
index f1d0c0c5d3c..ce979462a36 100644
--- a/src/Dictionaries/RedisDictionarySource.cpp
+++ b/src/Dictionaries/RedisDictionarySource.cpp
@@ -12,9 +12,9 @@ void registerDictionarySourceRedis(DictionarySourceFactory & factory)
                                    const Poco::Util::AbstractConfiguration & config,
                                    const String & config_prefix,
                                    Block & sample_block,
-                                   const Context & /* context */,
+                                   ContextConstPtr /* context */,
                                    const std::string & /* default_database */,
-                                   bool /* check_config */) -> DictionarySourcePtr {
+                                   bool /* created_from_ddl */) -> DictionarySourcePtr {
         return std::make_unique<RedisDictionarySource>(dict_struct, config, config_prefix + ".redis", sample_block);
     };
     factory.registerSource("redis", create_table_source);
@@ -30,7 +30,6 @@ void registerDictionarySourceRedis(DictionarySourceFactory & factory)
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include <IO/WriteHelpers.h>
-#include <Common/FieldVisitors.h>
 
 #include "RedisBlockInputStream.h"
 
@@ -66,25 +65,27 @@ namespace DB
             , client{std::make_shared<Poco::Redis::Client>(host, port)}
     {
         if (dict_struct.attributes.size() != 1)
-            throw Exception{"Invalid number of non key columns for Redis source: " +
-                            DB::toString(dict_struct.attributes.size()) + ", expected 1",
-                            ErrorCodes::INVALID_CONFIG_PARAMETER};
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                "Invalid number of non key columns for Redis source: {}, expected 1",
+                DB::toString(dict_struct.attributes.size()));
 
         if (storage_type == RedisStorageType::HASH_MAP)
         {
             if (!dict_struct.key)
-                throw Exception{"Redis source with storage type \'hash_map\' must have key",
-                                ErrorCodes::INVALID_CONFIG_PARAMETER};
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                    "Redis source with storage type \'hash_map\' must have key");
 
             if (dict_struct.key->size() != 2)
-                throw Exception{"Redis source with storage type \'hash_map\' requires 2 keys",
-                                ErrorCodes::INVALID_CONFIG_PARAMETER};
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
+                    "Redis source with storage type \'hash_map\' requires 2 keys");
             // suppose key[0] is primary key, key[1] is secondary key
 
             for (const auto & key : *dict_struct.key)
                 if (!isInteger(key.type) && !isString(key.type))
                     throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER,
-                        "Redis source supports only integer or string key, but key '{}' of type {} given", key.name, key.type->getName());
+                        "Redis source supports only integer or string key, but key '{}' of type {} given",
+                        key.name,
+                        key.type->getName());
         }
 
         if (!password.empty())
@@ -93,8 +94,9 @@ namespace DB
             command << password;
             String reply = client->execute<String>(command);
             if (reply != "OK")
-                throw Exception{"Authentication failed with reason "
-                     + reply, ErrorCodes::INTERNAL_REDIS_ERROR};
+                throw Exception(ErrorCodes::INTERNAL_REDIS_ERROR,
+                    "Authentication failed with reason {}",
+                    reply);
         }
 
         if (db_index != 0)
@@ -103,8 +105,10 @@ namespace DB
             command << std::to_string(db_index);
             String reply = client->execute<String>(command);
             if (reply != "OK")
-                throw Exception{"Selecting database with index " + DB::toString(db_index)
-                    + " failed with reason " + reply, ErrorCodes::INTERNAL_REDIS_ERROR};
+                throw Exception(ErrorCodes::INTERNAL_REDIS_ERROR,
+                    "Selecting database with index {} failed with reason {}",
+                    DB::toString(db_index),
+                    reply);
         }
     }
 
@@ -215,10 +219,10 @@ namespace DB
             client->connect(host, port);
 
         if (storage_type == RedisStorageType::HASH_MAP)
-            throw Exception{"Cannot use loadIds with 'hash_map' storage type", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Cannot use loadIds with 'hash_map' storage type");
 
         if (!dict_struct.id)
-            throw Exception{"'id' is required for selective loading", ErrorCodes::UNSUPPORTED_METHOD};
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is required for selective loading");
 
         RedisArray keys;
 
@@ -234,7 +238,7 @@ namespace DB
             client->connect(host, port);
 
         if (key_columns.size() != dict_struct.key->size())
-            throw Exception{"The size of key_columns does not equal to the size of dictionary key", ErrorCodes::LOGICAL_ERROR};
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "The size of key_columns does not equal to the size of dictionary key");
 
         RedisArray keys;
         for (auto row : requested_rows)
@@ -268,7 +272,7 @@ namespace DB
         if (storage_type_str == "hash_map")
             return RedisStorageType::HASH_MAP;
         else if (!storage_type_str.empty() && storage_type_str != "simple")
-            throw Exception("Unknown storage type " + storage_type_str + " for Redis dictionary", ErrorCodes::INVALID_CONFIG_PARAMETER);
+            throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Unknown storage type {} for Redis dictionary", storage_type_str);
 
         return RedisStorageType::SIMPLE;
     }
diff --git a/src/Dictionaries/RedisDictionarySource.h b/src/Dictionaries/RedisDictionarySource.h
index 71d2a7e724a..b2c5859decd 100644
--- a/src/Dictionaries/RedisDictionarySource.h
+++ b/src/Dictionaries/RedisDictionarySource.h
@@ -63,7 +63,7 @@ namespace ErrorCodes
 
         BlockInputStreamPtr loadUpdatedAll() override
         {
-            throw Exception{"Method loadUpdatedAll is unsupported for RedisDictionarySource", ErrorCodes::NOT_IMPLEMENTED};
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for RedisDictionarySource");
         }
 
         bool supportsSelectiveLoad() const override { return true; }
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
index 67f0465a2c7..7232d2d01b7 100644
--- a/src/Dictionaries/SSDCacheDictionaryStorage.h
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -53,7 +53,6 @@ struct SSDCacheDictionaryStorageConfiguration
 {
     const size_t strict_max_lifetime_seconds;
     const DictionaryLifetime lifetime;
-
     const std::string file_path;
     const size_t max_partitions_count;
     const size_t block_size;
@@ -465,7 +464,7 @@ public:
         /// If cache file is in directory that does not exists create it
         if (!std::filesystem::exists(parent_path_directory))
             if (!std::filesystem::create_directories(parent_path_directory))
-                throw Exception{"Failed to create directories.", ErrorCodes::CANNOT_CREATE_DIRECTORY};
+                throw Exception(ErrorCodes::CANNOT_CREATE_DIRECTORY, "Failed to create directories.");
 
         ProfileEvents::increment(ProfileEvents::FileOpen);
 
@@ -514,7 +513,7 @@ public:
         while (io_submit(aio_context.ctx, 1, &write_request_ptr) < 0)
         {
             if (errno != EINTR)
-                throw Exception("Cannot submit request for asynchronous IO on file " + file_path, ErrorCodes::CANNOT_IO_SUBMIT);
+                throw Exception(ErrorCodes::CANNOT_IO_SUBMIT, "Cannot submit request for asynchronous IO on file {}", file_path);
         }
 
         // CurrentMetrics::Increment metric_increment_write{CurrentMetrics::Write};
@@ -524,7 +523,7 @@ public:
         while (io_getevents(aio_context.ctx, 1, 1, &event, nullptr) < 0)
         {
             if (errno != EINTR)
-                throw Exception("Failed to wait for asynchronous IO completion on file " + file_path, ErrorCodes::CANNOT_IO_GETEVENTS);
+                throw Exception(ErrorCodes::CANNOT_IO_GETEVENTS, "Failed to wait for asynchronous IO completion on file {}", file_path);
         }
 
         // Unpoison the memory returned from an uninstrumented system function.
@@ -536,7 +535,10 @@ public:
         ProfileEvents::increment(ProfileEvents::WriteBufferAIOWriteBytes, bytes_written);
 
         if (bytes_written != static_cast<decltype(bytes_written)>(block_size * buffer_size_in_blocks))
-            throw Exception("Not all data was written for asynchronous IO on file " + file_path + ". returned: " + std::to_string(bytes_written), ErrorCodes::AIO_WRITE_ERROR);
+            throw Exception(ErrorCodes::AIO_WRITE_ERROR,
+                "Not all data was written for asynchronous IO on file {}. returned: {}",
+                file_path,
+                std::to_string(bytes_written));
 
         if (::fsync(file.fd) < 0)
             throwFromErrnoWithPath("Cannot fsync " + file_path, file_path, ErrorCodes::CANNOT_FSYNC);
@@ -593,7 +595,10 @@ public:
 
         if (read_bytes != static_cast<ssize_t>(buffer_size_in_bytes))
             throw Exception(ErrorCodes::AIO_READ_ERROR,
-                "GC: AIO failed to read file ({}). Expected bytes ({}). Actual bytes ({})", file_path, buffer_size_in_bytes, read_bytes);
+                "GC: AIO failed to read file {}. Expected bytes {}. Actual bytes {}",
+                file_path,
+                buffer_size_in_bytes,
+                read_bytes);
 
         SSDCacheBlock block(block_size);
 
@@ -694,7 +699,10 @@ public:
                 {
                     std::string calculated_check_sum = std::to_string(block.calculateCheckSum());
                     std::string check_sum = std::to_string(block.getCheckSum());
-                    throw Exception("Cache data corrupted. Checksum validation failed. Calculated " +  calculated_check_sum + " in block " + check_sum, ErrorCodes::CORRUPTED_DATA);
+                    throw Exception(ErrorCodes::CORRUPTED_DATA,
+                        "Cache data corrupted. Checksum validation failed. Calculated {} in block {}",
+                        calculated_check_sum,
+                        check_sum);
                 }
 
                 std::forward<FetchBlockFunc>(func)(blocks_to_fetch[block_to_fetch_index], block.getBlockData());
@@ -735,6 +743,9 @@ private:
 
         FileDescriptor & operator=(FileDescriptor && rhs)
         {
+            if (this == &rhs)
+                return *this;
+
             close(fd);
 
             fd = rhs.fd;
@@ -835,7 +846,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
         else
-            throw Exception("Method insertColumnsForKeys is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
     }
 
     void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) override
@@ -843,7 +854,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             insertColumnsForKeysImpl(keys, columns);
         else
-            throw Exception("Method insertColumnsForKeys is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
     }
 
     void insertDefaultKeys(const PaddedPODArray<UInt64> & keys) override
@@ -851,7 +862,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             insertDefaultKeysImpl(keys);
         else
-            throw Exception("Method insertDefaultKeysImpl is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for complex key storage");
     }
 
     PaddedPODArray<UInt64> getCachedSimpleKeys() const override
@@ -859,7 +870,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::simple)
             return getCachedKeysImpl();
         else
-            throw Exception("Method getCachedSimpleKeys is not supported for complex key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for complex key storage");
     }
 
     bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::complex; }
@@ -871,7 +882,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, fetch_request);
         else
-            throw Exception("Method fetchColumnsForKeys is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
     }
 
     void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) override
@@ -879,7 +890,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             insertColumnsForKeysImpl(keys, columns);
         else
-            throw Exception("Method insertColumnsForKeys is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for simple key storage");
     }
 
     void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) override
@@ -887,7 +898,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             insertDefaultKeysImpl(keys);
         else
-            throw Exception("Method insertDefaultKeysImpl is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for simple key storage");
     }
 
     PaddedPODArray<StringRef> getCachedComplexKeys() const override
@@ -895,7 +906,7 @@ public:
         if constexpr (dictionary_key_type == DictionaryKeyType::complex)
             return getCachedKeysImpl();
         else
-            throw Exception("Method getCachedSimpleKeys is not supported for simple key storage", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for simple key storage");
     }
 
     size_t getSize() const override { return index.size(); }
@@ -1108,7 +1119,7 @@ private:
             SSDCacheKeyType ssd_cache_key { key, allocated_size_for_columns, block_start };
 
             if (!SSDCacheBlock::canBeWrittenInEmptyBlock(ssd_cache_key, configuration.block_size))
-                throw Exception("Serialized columns size is greater than allowed block size and metadata", ErrorCodes::UNSUPPORTED_METHOD);
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Serialized columns size is greater than allowed block size and metadata");
 
             /// We cannot reuse place that is already allocated in file or memory cache so we erase key from index
             eraseKeyFromIndex(key);
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 37d54f3549c..fa7138348c1 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -11,18 +11,14 @@
 #include <Interpreters/Context.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/XDBCBridgeHelper.h>
 #include <common/LocalDateTime.h>
 #include <common/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "readInvalidateQuery.h"
-
 #include "registerDictionaries.h"
+#include <Common/escapeForFileName.h>
 
-#if USE_ODBC
-#    include <Poco/Data/ODBC/Connector.h> // Y_IGNORE
-#endif
 
 namespace DB
 {
@@ -41,7 +37,7 @@ namespace
             const Poco::URI & uri,
             std::function<void(std::ostream &)> callback,
             const Block & sample_block,
-            const Context & context,
+            ContextConstPtr context,
             UInt64 max_block_size,
             const ConnectionTimeouts & timeouts,
             const String name_)
@@ -89,9 +85,9 @@ namespace
         else
         {
             if (!schema.empty())
-                throw Exception{"Dictionary source of type " + bridge_.getName() + " specifies a schema but schema is not supported by "
-                                    + bridge_.getName() + "-driver",
-                                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Dictionary source of type {0} specifies a schema but schema is not supported by {0}-driver",
+                    bridge_.getName());
         }
 
         return {dict_struct_, db_, schema, table, where_, bridge_.getIdentifierQuotingStyle()};
@@ -106,9 +102,10 @@ XDBCDictionarySource::XDBCDictionarySource(
     const Poco::Util::AbstractConfiguration & config_,
     const std::string & config_prefix_,
     const Block & sample_block_,
-    const Context & context_,
+    ContextConstPtr context_,
     const BridgeHelperPtr bridge_)
-    : log(&Poco::Logger::get(bridge_->getName() + "DictionarySource"))
+    : WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get(bridge_->getName() + "DictionarySource"))
     , update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
     , db{config_.getString(config_prefix_ + ".db", "")}
@@ -122,18 +119,18 @@ XDBCDictionarySource::XDBCDictionarySource(
     , invalidate_query{config_.getString(config_prefix_ + ".invalidate_query", "")}
     , bridge_helper{bridge_}
     , timeouts{ConnectionTimeouts::getHTTPTimeouts(context_)}
-    , global_context(context_.getGlobalContext())
 {
     bridge_url = bridge_helper->getMainURI();
 
-    auto url_params = bridge_helper->getURLParams(sample_block_.getNamesAndTypesList().toString(), max_block_size);
+    auto url_params = bridge_helper->getURLParams(max_block_size);
     for (const auto & [name, value] : url_params)
         bridge_url.addQueryParameter(name, value);
 }
 
 /// copy-constructor is provided in order to support cloneability
 XDBCDictionarySource::XDBCDictionarySource(const XDBCDictionarySource & other)
-    : log(&Poco::Logger::get(other.bridge_helper->getName() + "DictionarySource"))
+    : WithContext(other.getContext())
+    , log(&Poco::Logger::get(other.bridge_helper->getName() + "DictionarySource"))
     , update_time{other.update_time}
     , dict_struct{other.dict_struct}
     , db{other.db}
@@ -148,10 +145,10 @@ XDBCDictionarySource::XDBCDictionarySource(const XDBCDictionarySource & other)
     , bridge_helper{other.bridge_helper}
     , bridge_url{other.bridge_url}
     , timeouts{other.timeouts}
-    , global_context{other.global_context}
 {
 }
 
+
 std::string XDBCDictionarySource::getUpdateFieldAndDate()
 {
     if (update_time != std::chrono::system_clock::from_time_t(0))
@@ -168,58 +165,67 @@ std::string XDBCDictionarySource::getUpdateFieldAndDate()
     }
 }
 
+
 BlockInputStreamPtr XDBCDictionarySource::loadAll()
 {
     LOG_TRACE(log, load_all_query);
-    return loadBase(load_all_query);
+    return loadFromQuery(bridge_url, sample_block, load_all_query);
 }
 
+
 BlockInputStreamPtr XDBCDictionarySource::loadUpdatedAll()
 {
     std::string load_query_update = getUpdateFieldAndDate();
 
     LOG_TRACE(log, load_query_update);
-    return loadBase(load_query_update);
+    return loadFromQuery(bridge_url, sample_block, load_query_update);
 }
 
+
 BlockInputStreamPtr XDBCDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     const auto query = query_builder.composeLoadIdsQuery(ids);
-    return loadBase(query);
+    return loadFromQuery(bridge_url, sample_block, query);
 }
 
+
 BlockInputStreamPtr 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 loadBase(query);
+    return loadFromQuery(bridge_url, sample_block, query);
 }
 
+
 bool XDBCDictionarySource::supportsSelectiveLoad() const
 {
     return true;
 }
 
+
 bool XDBCDictionarySource::hasUpdateField() const
 {
     return !update_field.empty();
 }
 
+
 DictionarySourcePtr XDBCDictionarySource::clone() const
 {
     return std::make_unique<XDBCDictionarySource>(*this);
 }
 
+
 std::string XDBCDictionarySource::toString() const
 {
     return bridge_helper->getName() + ": " + db + '.' + table + (where.empty() ? "" : ", where: " + where);
 }
 
+
 bool XDBCDictionarySource::isModified() const
 {
     if (!invalidate_query.empty())
     {
         auto response = doInvalidateQuery(invalidate_query);
-        if (invalidate_query_response == response)
+        if (invalidate_query_response == response) //-V1051
             return false;
         invalidate_query_response = response;
     }
@@ -236,51 +242,48 @@ std::string XDBCDictionarySource::doInvalidateQuery(const std::string & request)
     bridge_helper->startBridgeSync();
 
     auto invalidate_url = bridge_helper->getMainURI();
-    auto url_params = bridge_helper->getURLParams(invalidate_sample_block.getNamesAndTypesList().toString(), max_block_size);
+    auto url_params = bridge_helper->getURLParams(max_block_size);
     for (const auto & [name, value] : url_params)
         invalidate_url.addQueryParameter(name, value);
 
-    XDBCBridgeBlockInputStream stream(
-        invalidate_url,
-        [request](std::ostream & os) { os << "query=" << request; },
-        invalidate_sample_block,
-        global_context,
-        max_block_size,
-        timeouts,
-        bridge_helper->getName() + "BlockInputStream");
-
-    return readInvalidateQuery(stream);
+    return readInvalidateQuery(*loadFromQuery(invalidate_url, invalidate_sample_block, request));
 }
 
-BlockInputStreamPtr XDBCDictionarySource::loadBase(const std::string & query) const
+
+BlockInputStreamPtr XDBCDictionarySource::loadFromQuery(const Poco::URI url, const Block & required_sample_block, const std::string & query) const
 {
     bridge_helper->startBridgeSync();
+
+    auto write_body_callback = [required_sample_block, query](std::ostream & os)
+    {
+        os << "sample_block=" << escapeForFileName(required_sample_block.getNamesAndTypesList().toString());
+        os << "&";
+        os << "query=" << escapeForFileName(query);
+    };
+
     return std::make_shared<XDBCBridgeBlockInputStream>(
-        bridge_url,
-        [query](std::ostream & os) { os << "query=" << query; },
-        sample_block,
-        global_context,
+        url,
+        write_body_callback,
+        required_sample_block,
+        getContext(),
         max_block_size,
         timeouts,
         bridge_helper->getName() + "BlockInputStream");
 }
 
+
 void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
 {
-#if USE_ODBC
-    Poco::Data::ODBC::Connector::registerConnector();
-#endif
-
     auto create_table_source = [=](const DictionaryStructure & dict_struct,
                                    const Poco::Util::AbstractConfiguration & config,
                                    const std::string & config_prefix,
                                    Block & sample_block,
-                                   const Context & context,
+                                   ContextConstPtr 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"));
+            context, context->getSettings().http_receive_timeout, config.getString(config_prefix + ".odbc.connection_string"));
         return std::make_unique<XDBCDictionarySource>(dict_struct, config, config_prefix + ".odbc", sample_block, context, bridge);
 #else
         (void)dict_struct;
@@ -288,24 +291,25 @@ void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
         (void)config_prefix;
         (void)sample_block;
         (void)context;
-        throw Exception{"Dictionary source of type `odbc` is disabled because poco library was built without ODBC support.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `odbc` is disabled because poco library was built without ODBC support.");
 #endif
     };
     factory.registerSource("odbc", create_table_source);
 }
 
+
 void registerDictionarySourceJDBC(DictionarySourceFactory & factory)
 {
     auto create_table_source = [=](const DictionaryStructure & /* dict_struct */,
                                  const Poco::Util::AbstractConfiguration & /* config */,
                                  const std::string & /* config_prefix */,
                                  Block & /* sample_block */,
-                                 const Context & /* context */,
+                                 ContextConstPtr /* context */,
                                  const std::string & /* default_database */,
-                                 bool /* check_config */) -> DictionarySourcePtr {
-        throw Exception{"Dictionary source of type `jdbc` is disabled until consistent support for nullable fields.",
-                        ErrorCodes::SUPPORT_IS_DISABLED};
+                                 bool /* created_from_ddl */) -> DictionarySourcePtr {
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+            "Dictionary source of type `jdbc` is disabled until consistent support for nullable fields.");
         //        BridgeHelperPtr bridge = std::make_shared<XDBCBridgeHelper<JDBCBridgeMixin>>(config, context.getSettings().http_receive_timeout, config.getString(config_prefix + ".connection_string"));
         //        return std::make_unique<XDBCDictionarySource>(dict_struct, config, config_prefix + ".jdbc", sample_block, context, bridge);
     };
diff --git a/src/Dictionaries/XDBCDictionarySource.h b/src/Dictionaries/XDBCDictionarySource.h
index 87bc42c76ab..4a6f226102b 100644
--- a/src/Dictionaries/XDBCDictionarySource.h
+++ b/src/Dictionaries/XDBCDictionarySource.h
@@ -3,7 +3,7 @@
 #include <IO/ConnectionTimeouts.h>
 #include <Poco/Data/SessionPool.h>
 #include <Poco/URI.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 #include "DictionaryStructure.h"
 #include "ExternalQueryBuilder.h"
 #include "IDictionarySource.h"
@@ -23,7 +23,7 @@ class Logger;
 namespace DB
 {
 /// Allows loading dictionaries from a XDBC source via bridges
-class XDBCDictionarySource final : public IDictionarySource
+class XDBCDictionarySource final : public IDictionarySource, WithContext
 {
 public:
     XDBCDictionarySource(
@@ -31,7 +31,7 @@ public:
         const Poco::Util::AbstractConfiguration & config_,
         const std::string & config_prefix_,
         const Block & sample_block_,
-        const Context & context_,
+        ContextConstPtr context_,
         BridgeHelperPtr bridge);
 
     /// copy-constructor is provided in order to support cloneability
@@ -62,7 +62,7 @@ private:
     // execute invalidate_query. expects single cell in result
     std::string doInvalidateQuery(const std::string & request) const;
 
-    BlockInputStreamPtr loadBase(const std::string & query) const;
+    BlockInputStreamPtr loadFromQuery(const Poco::URI url, const Block & required_sample_block, const std::string & query) const;
 
     Poco::Logger * log;
 
@@ -82,7 +82,6 @@ private:
     BridgeHelperPtr bridge_helper;
     Poco::URI bridge_url;
     ConnectionTimeouts timeouts;
-    const Context & global_context;
 };
 
 }
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 04ba1db09fc..4816c6fd6b8 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -161,6 +161,13 @@ void buildRangeConfiguration(AutoPtr<Document> doc, AutoPtr<Element> root, const
         root->appendChild(element);
     };
 
+    if (!all_attrs.count(range->min_attr_name))
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+            "MIN ({}) attribute is not defined in the dictionary attributes", range->min_attr_name);
+    if (!all_attrs.count(range->max_attr_name))
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+            "MAX ({}) attribute is not defined in the dictionary attributes", range->max_attr_name);
+
     append_element("range_min", range->min_attr_name, all_attrs.at(range->min_attr_name));
     append_element("range_max", range->max_attr_name, all_attrs.at(range->max_attr_name));
 }
@@ -299,15 +306,30 @@ void buildPrimaryKeyConfiguration(
     if (!complex)
     {
         if (key_names.size() != 1)
-            throw Exception("Primary key for simple dictionary must contain exactly one element",
-                ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Primary key for simple dictionary must contain exactly one element");
 
         AutoPtr<Element> id_element(doc->createElement("id"));
         root->appendChild(id_element);
         AutoPtr<Element> name_element(doc->createElement("name"));
         id_element->appendChild(name_element);
 
-        const ASTDictionaryAttributeDeclaration * dict_attr = children.front()->as<const ASTDictionaryAttributeDeclaration>();
+        auto identifier_name = key_names.front();
+
+        auto it = std::find_if(children.begin(), children.end(), [&](const ASTPtr & node)
+        {
+            const ASTDictionaryAttributeDeclaration * dict_attr = node->as<const ASTDictionaryAttributeDeclaration>();
+            return dict_attr->name == identifier_name;
+        });
+
+        if (it == children.end())
+        {
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Primary key field '{}' not found among attributes",
+                identifier_name);
+        }
+
+        const ASTDictionaryAttributeDeclaration * dict_attr = (*it)->as<const ASTDictionaryAttributeDeclaration>();
 
         AutoPtr<Text> name(doc->createTextNode(dict_attr->name));
         name_element->appendChild(name);
@@ -317,8 +339,8 @@ void buildPrimaryKeyConfiguration(
     else
     {
         if (children.size() < key_names.size())
-            throw Exception(
-                "Primary key fields count is more, than dictionary attributes count.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Primary key fields count is more, than dictionary attributes count.");
 
         AutoPtr<Element> key_element(doc->createElement("key"));
         root->appendChild(key_element);
@@ -336,8 +358,9 @@ void buildPrimaryKeyConfiguration(
                 }
             }
             if (!found)
-                throw Exception(
-                    "Primary key field '" + key_name + "' not found among attributes.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+                throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                    "Primary key field '{}' not found among attributes.",
+                    key_name);
         }
     }
 }
@@ -358,7 +381,7 @@ NamesToTypeNames buildDictionaryAttributesConfiguration(
     {
         const ASTDictionaryAttributeDeclaration * dict_attr = child->as<const ASTDictionaryAttributeDeclaration>();
         if (!dict_attr->type)
-            throw Exception("Dictionary attribute must has type", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Dictionary attribute must has type");
 
         attributes_names_and_types.emplace(dict_attr->name, queryToString(dict_attr->type));
         if (std::find(key_columns.begin(), key_columns.end(), dict_attr->name) == key_columns.end())
@@ -374,7 +397,7 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
     AutoPtr<Document> doc,
     AutoPtr<Element> root,
     const ASTExpressionList * ast_expr_list,
-    const Context & context)
+    ContextConstPtr context)
 {
     const auto & children = ast_expr_list->children;
     for (size_t i = 0; i != children.size(); ++i)
@@ -416,9 +439,8 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
         }
         else
         {
-            throw Exception(
-                "Incorrect ASTPair contains wrong value, should be literal, identifier or list",
-                ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION,
+                "Incorrect ASTPair contains wrong value, should be literal, identifier or list");
         }
     }
 }
@@ -442,7 +464,7 @@ void buildSourceConfiguration(
     AutoPtr<Element> root,
     const ASTFunctionWithKeyValueArguments * source,
     const ASTDictionarySettings * settings,
-    const Context & context)
+    ContextConstPtr context)
 {
     AutoPtr<Element> outer_element(doc->createElement("source"));
     root->appendChild(outer_element);
@@ -470,24 +492,24 @@ void buildSourceConfiguration(
 void checkAST(const ASTCreateQuery & query)
 {
     if (!query.is_dictionary || query.dictionary == nullptr)
-        throw Exception("Cannot convert dictionary to configuration from non-dictionary AST.", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        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("Cannot create dictionary with empty attributes list", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty attributes list");
 
     if (query.dictionary->layout == nullptr)
-        throw Exception("Cannot create dictionary with empty layout", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty layout");
 
     const auto is_direct_layout = !strcasecmp(query.dictionary->layout->layout_type.data(), "direct") ||
                                 !strcasecmp(query.dictionary->layout->layout_type.data(), "complex_key_direct");
     if (query.dictionary->lifetime == nullptr && !is_direct_layout)
-        throw Exception("Cannot create dictionary with empty lifetime", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty lifetime");
 
     if (query.dictionary->primary_key == nullptr)
-        throw Exception("Cannot create dictionary without primary key", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary without primary key");
 
     if (query.dictionary->source == nullptr)
-        throw Exception("Cannot create dictionary with empty source", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty source");
 
     /// Range can be empty
 }
@@ -496,14 +518,14 @@ void checkPrimaryKey(const NamesToTypeNames & all_attrs, const Names & key_attrs
 {
     for (const auto & key_attr : key_attrs)
         if (all_attrs.count(key_attr) == 0)
-            throw Exception("Unknown key attribute '" + key_attr + "'", ErrorCodes::INCORRECT_DICTIONARY_DEFINITION);
+            throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Unknown key attribute '{}'", key_attr);
 }
 
 }
 
 
 DictionaryConfigurationPtr
-getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const Context & context, const std::string & database_)
+getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextConstPtr context, const std::string & database_)
 {
     checkAST(query);
 
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.h b/src/Dictionaries/getDictionaryConfigurationFromAST.h
index 5132e3c77e0..01f13ab4030 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.h
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.h
@@ -2,6 +2,7 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
@@ -11,5 +12,5 @@ using DictionaryConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfigurati
 /// This function is necessary because all loadable objects configuration are Poco::AbstractConfiguration
 /// Can throw exception if query is ill-formed
 DictionaryConfigurationPtr
-getDictionaryConfigurationFromAST(const ASTCreateQuery & query, const Context & context, const std::string & database_ = "");
+getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextConstPtr context, const std::string & database_ = "");
 }
diff --git a/src/Dictionaries/readInvalidateQuery.cpp b/src/Dictionaries/readInvalidateQuery.cpp
index 587fce6631c..4664b61bfc4 100644
--- a/src/Dictionaries/readInvalidateQuery.cpp
+++ b/src/Dictionaries/readInvalidateQuery.cpp
@@ -20,17 +20,17 @@ std::string readInvalidateQuery(IBlockInputStream & block_input_stream)
 
     Block block = block_input_stream.read();
     if (!block)
-        throw Exception("Empty response", ErrorCodes::RECEIVED_EMPTY_DATA);
+        throw Exception(ErrorCodes::RECEIVED_EMPTY_DATA, "Empty response");
 
     auto columns = block.columns();
     if (columns > 1)
-        throw Exception("Expected single column in resultset, got " + std::to_string(columns), ErrorCodes::TOO_MANY_COLUMNS);
+        throw Exception(ErrorCodes::TOO_MANY_COLUMNS, "Expected single column in resultset, got {}", std::to_string(columns));
 
     auto rows = block.rows();
     if (rows == 0)
-        throw Exception("Expected single row in resultset, got 0", ErrorCodes::RECEIVED_EMPTY_DATA);
+        throw Exception(ErrorCodes::RECEIVED_EMPTY_DATA, "Expected single row in resultset, got 0");
     if (rows > 1)
-        throw Exception("Expected single row in resultset, got at least " + std::to_string(rows), ErrorCodes::TOO_MANY_ROWS);
+        throw Exception(ErrorCodes::TOO_MANY_ROWS, "Expected single row in resultset, got at least {}", std::to_string(rows));
 
     WriteBufferFromOwnString out;
     auto & column_type = block.getByPosition(0);
@@ -38,7 +38,7 @@ std::string readInvalidateQuery(IBlockInputStream & block_input_stream)
 
     while ((block = block_input_stream.read()))
         if (block.rows() > 0)
-            throw Exception("Expected single row in resultset, got at least " + std::to_string(rows + 1), ErrorCodes::TOO_MANY_ROWS);
+            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/registerCacheDictionaries.cpp b/src/Dictionaries/registerCacheDictionaries.cpp
index b93a08acb76..0a47e13376f 100644
--- a/src/Dictionaries/registerCacheDictionaries.cpp
+++ b/src/Dictionaries/registerCacheDictionaries.cpp
@@ -1,7 +1,9 @@
 #include "CacheDictionary.h"
 #include "CacheDictionaryStorage.h"
 #include "SSDCacheDictionaryStorage.h"
+#include <Common/filesystemHelpers.h>
 #include <Dictionaries/DictionaryFactory.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -11,6 +13,7 @@ namespace ErrorCodes
     extern const int TOO_SMALL_BUFFER_SIZE;
     extern const int UNSUPPORTED_METHOD;
     extern const int BAD_ARGUMENTS;
+    extern const int PATH_ACCESS_DENIED;
 }
 
 CacheDictionaryStorageConfiguration parseCacheStorageConfiguration(
@@ -26,7 +29,7 @@ CacheDictionaryStorageConfiguration parseCacheStorageConfiguration(
     const size_t size = config.getUInt64(dictionary_configuration_prefix + "size_in_cells");
     if (size == 0)
         throw Exception(ErrorCodes::TOO_SMALL_BUFFER_SIZE,
-            "({}): cache dictionary cannot have 0 cells",
+            "{}: cache dictionary cannot have 0 cells",
             full_name);
 
     size_t dict_lifetime_seconds = static_cast<size_t>(dict_lifetime.max_sec);
@@ -68,35 +71,32 @@ SSDCacheDictionaryStorageConfiguration parseSSDCacheStorageConfiguration(
     const size_t file_size = config.getInt64(dictionary_configuration_prefix + "file_size", DEFAULT_FILE_SIZE_BYTES);
     if (file_size % block_size != 0)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): file_size must be a multiple of block_size",
+            "{}: file_size must be a multiple of block_size",
             full_name);
 
     const size_t read_buffer_size = config.getInt64(dictionary_configuration_prefix + "read_buffer_size", DEFAULT_READ_BUFFER_SIZE_BYTES);
     if (read_buffer_size % block_size != 0)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): read_buffer_size must be a multiple of block_size",
+            "{}: read_buffer_size must be a multiple of block_size",
             full_name);
 
     const size_t write_buffer_size
         = config.getInt64(dictionary_configuration_prefix + "write_buffer_size", DEFAULT_WRITE_BUFFER_SIZE_BYTES);
     if (write_buffer_size % block_size != 0)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): write_buffer_size must be a multiple of block_size",
+            "{}: write_buffer_size must be a multiple of block_size",
             full_name);
 
-    auto directory_path = config.getString(dictionary_configuration_prefix + "path");
-    if (directory_path.empty())
+    auto file_path = config.getString(dictionary_configuration_prefix + "path");
+    if (file_path.empty())
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): ssd cache dictionary cannot have empty path",
+            "{}: ssd cache dictionary cannot have empty path",
             full_name);
 
-    if (directory_path.at(0) != '/')
-        directory_path = std::filesystem::path{config.getString("path")}.concat(directory_path).string();
-
     SSDCacheDictionaryStorageConfiguration configuration{
         strict_max_lifetime_seconds,
         dict_lifetime,
-        directory_path,
+        file_path,
         max_partitions_count,
         block_size,
         file_size / block_size,
@@ -119,7 +119,7 @@ CacheDictionaryUpdateQueueConfiguration parseCacheDictionaryUpdateQueueConfigura
     const size_t max_update_queue_size = config.getUInt64(layout_prefix + ".cache.max_update_queue_size", 100000);
     if (max_update_queue_size == 0)
         throw Exception(ErrorCodes::TOO_SMALL_BUFFER_SIZE,
-            "({}): dictionary of layout '({})' cannot have empty update queue of size 0",
+            "{}: dictionary of layout '{}' cannot have empty update queue of size 0",
             full_name,
             layout_type);
 
@@ -127,7 +127,7 @@ CacheDictionaryUpdateQueueConfiguration parseCacheDictionaryUpdateQueueConfigura
         = config.getUInt64(layout_prefix + ".cache.update_queue_push_timeout_milliseconds", 10);
     if (update_queue_push_timeout_milliseconds < 10)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): dictionary of layout '({})' have too little update_queue_push_timeout",
+            "{}: dictionary of layout '{}' have too little update_queue_push_timeout",
             full_name,
             layout_type);
 
@@ -136,7 +136,7 @@ CacheDictionaryUpdateQueueConfiguration parseCacheDictionaryUpdateQueueConfigura
     const size_t max_threads_for_updates = config.getUInt64(layout_prefix + ".max_threads_for_updates", 4);
     if (max_threads_for_updates == 0)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): dictionary of layout) '({})' cannot have zero threads for updates",
+            "{}: dictionary of layout) '{}' cannot have zero threads for updates",
             full_name,
             layout_type);
 
@@ -169,14 +169,14 @@ DictionaryPtr createCacheDictionaryLayout(
 
     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'",
+            "{}: elements .structure.range_min and .structure.range_max should be defined only "
+            "for a dictionary of layout 'range_hashed'",
             full_name);
 
     const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
     if (require_nonempty)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): cache dictionary of layout cannot have 'require_nonempty' attribute set",
+            "{}: cache dictionary of layout cannot have 'require_nonempty' attribute set",
             full_name);
 
     const auto & layout_prefix = config_prefix + ".layout";
@@ -205,7 +205,9 @@ DictionaryPtr createSSDCacheDictionaryLayout(
     const DictionaryStructure & dict_struct,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
-    DictionarySourcePtr source_ptr)
+    DictionarySourcePtr source_ptr,
+    ContextConstPtr context,
+    bool created_from_ddl)
 {
     static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionary");
 
@@ -222,14 +224,14 @@ DictionaryPtr createSSDCacheDictionaryLayout(
 
     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'",
+            "{}: elements .structure.range_min and .structure.range_max should be defined only "
+            "for a dictionary of layout 'range_hashed'",
             full_name);
 
     const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
     if (require_nonempty)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
-            "({}): cache dictionary of layout cannot have 'require_nonempty' attribute set",
+            "{}: cache dictionary of layout cannot have 'require_nonempty' attribute set",
             full_name);
 
     const auto & layout_prefix = config_prefix + ".layout";
@@ -241,10 +243,14 @@ DictionaryPtr createSSDCacheDictionaryLayout(
     const bool allow_read_expired_keys = config.getBool(layout_prefix + ".cache.allow_read_expired_keys", false);
 
     auto storage_configuration = parseSSDCacheStorageConfiguration(full_name, config, layout_prefix, dict_lifetime, dictionary_key_type);
+
+    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 storage = std::make_shared<SSDCacheDictionaryStorage<dictionary_key_type>>(storage_configuration);
 
-    auto update_queue_configuration
-        = parseCacheDictionaryUpdateQueueConfiguration(full_name, config, layout_prefix, dictionary_key_type);
+    auto update_queue_configuration = parseCacheDictionaryUpdateQueueConfiguration(full_name, config, layout_prefix, dictionary_key_type);
 
     return std::make_unique<CacheDictionary<dictionary_key_type>>(
         dict_id, dict_struct, std::move(source_ptr), storage, update_queue_configuration, dict_lifetime, allow_read_expired_keys);
@@ -258,7 +264,9 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                           const DictionaryStructure & dict_struct,
                                           const Poco::Util::AbstractConfiguration & config,
                                           const std::string & config_prefix,
-                                          DictionarySourcePtr source_ptr) -> DictionaryPtr
+                                          DictionarySourcePtr source_ptr,
+                                          ContextConstPtr /* context */,
+                                          bool /* created_from_ddl */) -> DictionaryPtr
     {
         return createCacheDictionaryLayout<DictionaryKeyType::simple>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
     };
@@ -269,7 +277,9 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                                const DictionaryStructure & dict_struct,
                                                const Poco::Util::AbstractConfiguration & config,
                                                const std::string & config_prefix,
-                                               DictionarySourcePtr source_ptr) -> DictionaryPtr
+                                               DictionarySourcePtr source_ptr,
+                                               ContextConstPtr /* context */,
+                                               bool /* created_from_ddl */) -> DictionaryPtr
     {
         return createCacheDictionaryLayout<DictionaryKeyType::complex>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
     };
@@ -282,9 +292,11 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                               const DictionaryStructure & dict_struct,
                                               const Poco::Util::AbstractConfiguration & config,
                                               const std::string & config_prefix,
-                                              DictionarySourcePtr source_ptr) -> DictionaryPtr
+                                              DictionarySourcePtr source_ptr,
+                                              ContextConstPtr context,
+                                              bool created_from_ddl) -> DictionaryPtr
     {
-        return createSSDCacheDictionaryLayout<DictionaryKeyType::simple>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
+        return createSSDCacheDictionaryLayout<DictionaryKeyType::simple>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), context, created_from_ddl);
     };
 
     factory.registerLayout("ssd_cache", create_simple_ssd_cache_layout, false);
@@ -293,8 +305,10 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                                    const DictionaryStructure & dict_struct,
                                                    const Poco::Util::AbstractConfiguration & config,
                                                    const std::string & config_prefix,
-                                                   DictionarySourcePtr source_ptr) -> DictionaryPtr {
-        return createSSDCacheDictionaryLayout<DictionaryKeyType::complex>(full_name, dict_struct, config, config_prefix, std::move(source_ptr));
+                                                   DictionarySourcePtr source_ptr,
+                                                   ContextConstPtr context,
+                                                   bool created_from_ddl) -> DictionaryPtr {
+        return createSSDCacheDictionaryLayout<DictionaryKeyType::complex>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), context, created_from_ddl);
     };
 
     factory.registerLayout("complex_key_ssd_cache", create_complex_key_ssd_cache_layout, true);
diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index 389199bfe61..2b16228b59e 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -19,10 +19,10 @@ static bool registered = false;
 #pragma GCC diagnostic ignored "-Wunused-function"
 static std::string configurationToString(const DictionaryConfigurationPtr & config)
 {
-    const Poco::Util::XMLConfiguration * xml_config = dynamic_cast<const Poco::Util::XMLConfiguration *>(config.get());
+    const Poco::Util::XMLConfiguration & xml_config = dynamic_cast<const Poco::Util::XMLConfiguration &>(*config);
     std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     oss.exceptions(std::ios::failbit);
-    xml_config->save(oss);
+    xml_config.save(oss);
     return oss.str();
 }
 
diff --git a/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp b/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
index 064f57dfe11..f4854b7c77e 100644
--- a/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
+++ b/src/Dictionaries/tests/gtest_hierarchy_dictionaries_utils.cpp
@@ -154,10 +154,12 @@ TEST(HierarchyDictionariesUtils, getDescendants)
         PaddedPODArray<UInt64> keys = {0, 1, 2, 3, 4};
 
         {
+            size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
                 parent_to_child,
-                DB::detail::GetAllDescendantsStrategy());
+                DB::detail::GetAllDescendantsStrategy(),
+                keys_found);
 
             const auto & actual_elements = result.elements;
             const auto & actual_offsets = result.offsets;
@@ -167,12 +169,15 @@ TEST(HierarchyDictionariesUtils, getDescendants)
 
             ASSERT_EQ(actual_elements, expected_elements);
             ASSERT_EQ(actual_offsets, expected_offsets);
+            ASSERT_EQ(keys_found, 3);
         }
         {
+            size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
                 parent_to_child,
-                DB::detail::GetDescendantsAtSpecificLevelStrategy{1});
+                DB::detail::GetDescendantsAtSpecificLevelStrategy{1},
+                keys_found);
 
             const auto & actual_elements = result.elements;
             const auto & actual_offsets = result.offsets;
@@ -182,6 +187,7 @@ TEST(HierarchyDictionariesUtils, getDescendants)
 
             ASSERT_EQ(actual_elements, expected_elements);
             ASSERT_EQ(actual_offsets, expected_offsets);
+            ASSERT_EQ(keys_found, 3);
         }
     }
     {
@@ -192,10 +198,12 @@ TEST(HierarchyDictionariesUtils, getDescendants)
         PaddedPODArray<UInt64> keys = {1, 2, 3};
 
         {
+            size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
                 parent_to_child,
-                DB::detail::GetAllDescendantsStrategy());
+                DB::detail::GetAllDescendantsStrategy(),
+                keys_found);
 
             const auto & actual_elements = result.elements;
             const auto & actual_offsets = result.offsets;
@@ -205,12 +213,15 @@ TEST(HierarchyDictionariesUtils, getDescendants)
 
             ASSERT_EQ(actual_elements, expected_elements);
             ASSERT_EQ(actual_offsets, expected_offsets);
+            ASSERT_EQ(keys_found, 2);
         }
         {
+            size_t keys_found;
             auto result = DB::detail::getDescendants(
                 keys,
                 parent_to_child,
-                DB::detail::GetDescendantsAtSpecificLevelStrategy{1});
+                DB::detail::GetDescendantsAtSpecificLevelStrategy{1},
+                keys_found);
 
             const auto & actual_elements = result.elements;
             const auto & actual_offsets = result.offsets;
@@ -220,6 +231,7 @@ TEST(HierarchyDictionariesUtils, getDescendants)
 
             ASSERT_EQ(actual_elements, expected_elements);
             ASSERT_EQ(actual_offsets, expected_offsets);
+            ASSERT_EQ(keys_found, 2);
         }
     }
 }
diff --git a/src/Dictionaries/ya.make b/src/Dictionaries/ya.make
index dc58d3f0a14..36152fe439a 100644
--- a/src/Dictionaries/ya.make
+++ b/src/Dictionaries/ya.make
@@ -51,7 +51,6 @@ SRCS(
     HierarchyDictionariesUtils.cpp
     IPAddressDictionary.cpp
     LibraryDictionarySource.cpp
-    LibraryDictionarySourceExternal.cpp
     MongoDBDictionarySource.cpp
     MySQLDictionarySource.cpp
     PolygonDictionary.cpp
diff --git a/src/Dictionaries/ya.make.in b/src/Dictionaries/ya.make.in
index aa82fb21ba6..051696a18ed 100644
--- a/src/Dictionaries/ya.make.in
+++ b/src/Dictionaries/ya.make.in
@@ -19,7 +19,7 @@ NO_COMPILER_WARNINGS()
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Disks/CMakeLists.txt b/src/Disks/CMakeLists.txt
index 65172356645..83bbe418246 100644
--- a/src/Disks/CMakeLists.txt
+++ b/src/Disks/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
-endif ()
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
+endif()
diff --git a/src/Disks/DiskCacheWrapper.cpp b/src/Disks/DiskCacheWrapper.cpp
index f101de340f1..d5b82edb134 100644
--- a/src/Disks/DiskCacheWrapper.cpp
+++ b/src/Disks/DiskCacheWrapper.cpp
@@ -1,21 +1,22 @@
 #include "DiskCacheWrapper.h"
 #include <IO/copyData.h>
+#include <IO/ReadBufferFromFileDecorator.h>
+#include <IO/WriteBufferFromFileDecorator.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
 #include <condition_variable>
 
 namespace DB
 {
 /**
- * Write buffer with possibility to set and invoke callback when buffer is finalized.
+ * Write buffer with possibility to set and invoke callback after 'finalize' call.
  */
-class CompletionAwareWriteBuffer : public WriteBufferFromFileBase
+class CompletionAwareWriteBuffer : public WriteBufferFromFileDecorator
 {
 public:
-    CompletionAwareWriteBuffer(std::unique_ptr<WriteBufferFromFileBase> impl_, std::function<void()> completion_callback_, size_t buf_size_)
-        : WriteBufferFromFileBase(buf_size_, nullptr, 0), impl(std::move(impl_)), completion_callback(completion_callback_) { }
+    CompletionAwareWriteBuffer(std::unique_ptr<WriteBufferFromFileBase> impl_, std::function<void()> completion_callback_)
+        : WriteBufferFromFileDecorator(std::move(impl_)), completion_callback(completion_callback_) { }
 
-    ~CompletionAwareWriteBuffer() override
+    virtual ~CompletionAwareWriteBuffer() override
     {
         try
         {
@@ -32,31 +33,13 @@ public:
         if (finalized)
             return;
 
-        next();
-        impl->finalize();
-
-        finalized = true;
+        WriteBufferFromFileDecorator::finalize();
 
         completion_callback();
     }
 
-    void sync() override { impl->sync(); }
-
-    std::string getFileName() const override { return impl->getFileName(); }
-
 private:
-    void nextImpl() override
-    {
-        impl->swap(*this);
-        impl->next();
-        impl->swap(*this);
-    }
-
-    /// Actual write buffer.
-    std::unique_ptr<WriteBufferFromFileBase> impl;
-    /// Callback is invoked when finalize is completed.
     const std::function<void()> completion_callback;
-    bool finalized = false;
 };
 
 enum FileDownloadStatus
@@ -114,7 +97,7 @@ DiskCacheWrapper::readFile(
     if (!cache_file_predicate(path))
         return DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
 
-    LOG_DEBUG(&Poco::Logger::get("DiskCache"), "Read file {} from cache", backQuote(path));
+    LOG_DEBUG(log, "Read file {} from cache", backQuote(path));
 
     if (cache_disk->exists(path))
         return cache_disk->readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
@@ -128,11 +111,11 @@ DiskCacheWrapper::readFile(
         {
             /// This thread will responsible for file downloading to cache.
             metadata->status = DOWNLOADING;
-            LOG_DEBUG(&Poco::Logger::get("DiskCache"), "File {} doesn't exist in cache. Will download it", backQuote(path));
+            LOG_DEBUG(log, "File {} doesn't exist in cache. Will download it", backQuote(path));
         }
         else if (metadata->status == DOWNLOADING)
         {
-            LOG_DEBUG(&Poco::Logger::get("DiskCache"), "Waiting for file {} download to cache", backQuote(path));
+            LOG_DEBUG(log, "Waiting for file {} download to cache", backQuote(path));
             metadata->condition.wait(lock, [metadata] { return metadata->status == DOWNLOADED || metadata->status == ERROR; });
         }
     }
@@ -157,7 +140,7 @@ DiskCacheWrapper::readFile(
                 }
                 cache_disk->moveFile(tmp_path, path);
 
-                LOG_DEBUG(&Poco::Logger::get("DiskCache"), "File {} downloaded to cache", backQuote(path));
+                LOG_DEBUG(log, "File {} downloaded to cache", backQuote(path));
             }
             catch (...)
             {
@@ -186,7 +169,7 @@ DiskCacheWrapper::writeFile(const String & path, size_t buf_size, WriteMode mode
     if (!cache_file_predicate(path))
         return DiskDecorator::writeFile(path, buf_size, mode);
 
-    LOG_DEBUG(&Poco::Logger::get("DiskCache"), "Write file {} to cache", backQuote(path));
+    LOG_DEBUG(log, "Write file {} to cache", backQuote(path));
 
     auto dir_path = directoryPath(path);
     if (!cache_disk->exists(dir_path))
@@ -201,8 +184,7 @@ DiskCacheWrapper::writeFile(const String & path, size_t buf_size, WriteMode mode
             auto dst_buffer = DiskDecorator::writeFile(path, buf_size, mode);
             copyData(*src_buffer, *dst_buffer);
             dst_buffer->finalize();
-        },
-        buf_size);
+        });
 }
 
 void DiskCacheWrapper::clearDirectory(const String & path)
@@ -317,22 +299,6 @@ void DiskCacheWrapper::createDirectories(const String & path)
     DiskDecorator::createDirectories(path);
 }
 
-/// TODO: Current reservation mechanism leaks IDisk abstraction details.
-/// This hack is needed to return proper disk pointer (wrapper instead of implementation) from reservation object.
-class ReservationDelegate : public IReservation
-{
-public:
-    ReservationDelegate(ReservationPtr delegate_, DiskPtr wrapper_) : delegate(std::move(delegate_)), wrapper(wrapper_) { }
-    UInt64 getSize() const override { return delegate->getSize(); }
-    DiskPtr getDisk(size_t) const override { return wrapper; }
-    Disks getDisks() const override { return {wrapper}; }
-    void update(UInt64 new_size) override { delegate->update(new_size); }
-
-private:
-    ReservationPtr delegate;
-    DiskPtr wrapper;
-};
-
 ReservationPtr DiskCacheWrapper::reserve(UInt64 bytes)
 {
     auto ptr = DiskDecorator::reserve(bytes);
diff --git a/src/Disks/DiskCacheWrapper.h b/src/Disks/DiskCacheWrapper.h
index 7e627b0c3c3..6d58394640f 100644
--- a/src/Disks/DiskCacheWrapper.h
+++ b/src/Disks/DiskCacheWrapper.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <unordered_map>
+#include <common/logger_useful.h>
 #include "DiskDecorator.h"
 #include "DiskLocal.h"
 
@@ -63,6 +64,8 @@ private:
     mutable std::unordered_map<String, std::weak_ptr<FileDownloadMetadata>> file_downloads;
     /// Protects concurrent downloading files to cache.
     mutable std::mutex mutex;
+
+    Poco::Logger * log = &Poco::Logger::get("DiskCache");
 };
 
 }
diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index 144dc928dd3..b524cd88f10 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -196,4 +196,19 @@ void DiskDecorator::onFreeze(const String & path)
     delegate->onFreeze(path);
 }
 
+void DiskDecorator::shutdown()
+{
+    delegate->shutdown();
+}
+
+void DiskDecorator::startup()
+{
+    delegate->startup();
+}
+
+void DiskDecorator::applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextConstPtr context)
+{
+    delegate->applyNewSettings(config, context);
+}
+
 }
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index 918223b38d7..a413c1a3cfd 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -65,12 +65,33 @@ public:
     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(); }
-    Executor & getExecutor() override;
     void onFreeze(const String & path) override;
     SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
+    void shutdown() override;
+    void startup() override;
+    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextConstPtr context) override;
 
 protected:
+    Executor & getExecutor() override;
+
     DiskPtr delegate;
 };
 
+/// TODO: Current reservation mechanism leaks IDisk abstraction details.
+/// This hack is needed to return proper disk pointer (wrapper instead of implementation) from reservation object.
+class ReservationDelegate : public IReservation
+{
+public:
+    ReservationDelegate(ReservationPtr delegate_, DiskPtr wrapper_) : delegate(std::move(delegate_)), wrapper(wrapper_) { }
+    UInt64 getSize() const override { return delegate->getSize(); }
+    DiskPtr getDisk(size_t) const override { return wrapper; }
+    Disks getDisks() const override { return {wrapper}; }
+    void update(UInt64 new_size) override { delegate->update(new_size); }
+
+private:
+    ReservationPtr delegate;
+    DiskPtr wrapper;
+};
+
+
 }
diff --git a/src/Disks/DiskFactory.cpp b/src/Disks/DiskFactory.cpp
index b604269ae16..03412be9729 100644
--- a/src/Disks/DiskFactory.cpp
+++ b/src/Disks/DiskFactory.cpp
@@ -24,7 +24,7 @@ DiskPtr DiskFactory::create(
     const String & name,
     const Poco::Util::AbstractConfiguration & config,
     const String & config_prefix,
-    const Context & context) const
+    ContextConstPtr context) const
 {
     const auto disk_type = config.getString(config_prefix + ".type", "local");
 
diff --git a/src/Disks/DiskFactory.h b/src/Disks/DiskFactory.h
index d41f14bd753..ba833d9e25f 100644
--- a/src/Disks/DiskFactory.h
+++ b/src/Disks/DiskFactory.h
@@ -1,17 +1,18 @@
 #pragma once
 
-#include <common/types.h>
 #include <Disks/IDisk.h>
+#include <Interpreters/Context_fwd.h>
+#include <common/types.h>
+
+#include <boost/noncopyable.hpp>
+#include <Poco/Util/AbstractConfiguration.h>
 
 #include <functional>
 #include <unordered_map>
-#include <boost/noncopyable.hpp>
-#include <Poco/Util/AbstractConfiguration.h>
 
 
 namespace DB
 {
-class Context;
 
 /**
  * Disk factory. Responsible for creating new disk objects.
@@ -23,7 +24,7 @@ public:
         const String & name,
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
-        const Context & context)>;
+        ContextConstPtr context)>;
 
     static DiskFactory & instance();
 
@@ -33,7 +34,7 @@ public:
         const String & name,
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
-        const Context & context) const;
+        ContextConstPtr context) const;
 
 private:
     using DiskTypeRegistry = std::unordered_map<String, Creator>;
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index 42378179103..768d1c2354a 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -2,13 +2,13 @@
 #include <Common/createHardLink.h>
 #include "DiskFactory.h"
 
+#include <Disks/LocalDirectorySyncGuard.h>
 #include <Interpreters/Context.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/quoteString.h>
-#include <Disks/LocalDirectorySyncGuard.h>
-
 #include <IO/createReadBufferFromFileBase.h>
-#include <common/logger_useful.h>
+
+#include <fstream>
 #include <unistd.h>
 
 
@@ -60,27 +60,28 @@ class DiskLocalDirectoryIterator : public IDiskDirectoryIterator
 {
 public:
     explicit DiskLocalDirectoryIterator(const String & disk_path_, const String & dir_path_)
-        : dir_path(dir_path_), iter(disk_path_ + dir_path_)
+        : dir_path(dir_path_), entry(fs::path(disk_path_) / dir_path_)
     {
     }
 
-    void next() override { ++iter; }
+    void next() override { ++entry; }
 
-    bool isValid() const override { return iter != Poco::DirectoryIterator(); }
+    bool isValid() const override { return entry != fs::directory_iterator(); }
 
     String path() const override
     {
-        if (iter->isDirectory())
-            return dir_path + iter.name() + '/';
+        if (entry->is_directory())
+            return dir_path / entry->path().filename() / "";
         else
-            return dir_path + iter.name();
+            return dir_path / entry->path().filename();
     }
 
-    String name() const override { return iter.name(); }
+
+    String name() const override { return entry->path().filename(); }
 
 private:
-    String dir_path;
-    Poco::DirectoryIterator iter;
+    fs::path dir_path;
+    fs::directory_iterator entry;
 };
 
 
@@ -96,7 +97,7 @@ bool DiskLocal::tryReserve(UInt64 bytes)
     std::lock_guard lock(DiskLocal::reservation_mutex);
     if (bytes == 0)
     {
-        LOG_DEBUG(&Poco::Logger::get("DiskLocal"), "Reserving 0 bytes on disk {}", backQuote(name));
+        LOG_DEBUG(log, "Reserving 0 bytes on disk {}", backQuote(name));
         ++reservation_count;
         return true;
     }
@@ -105,7 +106,7 @@ bool DiskLocal::tryReserve(UInt64 bytes)
     UInt64 unreserved_space = available_space - std::min(available_space, reserved_bytes);
     if (unreserved_space >= bytes)
     {
-        LOG_DEBUG(&Poco::Logger::get("DiskLocal"), "Reserving {} on disk {}, having unreserved {}.",
+        LOG_DEBUG(log, "Reserving {} on disk {}, having unreserved {}.",
             ReadableSize(bytes), backQuote(name), ReadableSize(unreserved_space));
         ++reservation_count;
         reserved_bytes += bytes;
@@ -118,7 +119,7 @@ UInt64 DiskLocal::getTotalSpace() const
 {
     struct statvfs fs;
     if (name == "default") /// for default disk we get space from path/data/
-        fs = getStatVFS(disk_path + "data/");
+        fs = getStatVFS((fs::path(disk_path) / "data/").string());
     else
         fs = getStatVFS(disk_path);
     UInt64 total_size = fs.f_blocks * fs.f_bsize;
@@ -133,7 +134,7 @@ UInt64 DiskLocal::getAvailableSpace() const
     /// available for superuser only and for system purposes
     struct statvfs fs;
     if (name == "default") /// for default disk we get space from path/data/
-        fs = getStatVFS(disk_path + "data/");
+        fs = getStatVFS((fs::path(disk_path) / "data/").string());
     else
         fs = getStatVFS(disk_path);
     UInt64 total_size = fs.f_bavail * fs.f_bsize;
@@ -152,45 +153,43 @@ UInt64 DiskLocal::getUnreservedSpace() const
 
 bool DiskLocal::exists(const String & path) const
 {
-    return Poco::File(disk_path + path).exists();
+    return fs::exists(fs::path(disk_path) / path);
 }
 
 bool DiskLocal::isFile(const String & path) const
 {
-    return Poco::File(disk_path + path).isFile();
+    return fs::is_regular_file(fs::path(disk_path) / path);
 }
 
 bool DiskLocal::isDirectory(const String & path) const
 {
-    return Poco::File(disk_path + path).isDirectory();
+    return fs::is_directory(fs::path(disk_path) / path);
 }
 
 size_t DiskLocal::getFileSize(const String & path) const
 {
-    return Poco::File(disk_path + path).getSize();
+    return fs::file_size(fs::path(disk_path) / path);
 }
 
 void DiskLocal::createDirectory(const String & path)
 {
-    Poco::File(disk_path + path).createDirectory();
+    fs::create_directory(fs::path(disk_path) / path);
 }
 
 void DiskLocal::createDirectories(const String & path)
 {
-    Poco::File(disk_path + path).createDirectories();
+    fs::create_directories(fs::path(disk_path) / path);
 }
 
 void DiskLocal::clearDirectory(const String & path)
 {
-    std::vector<Poco::File> files;
-    Poco::File(disk_path + path).list(files);
-    for (auto & file : files)
-        file.remove();
+    for (const auto & entry : fs::directory_iterator(fs::path(disk_path) / path))
+        fs::remove(entry.path());
 }
 
 void DiskLocal::moveDirectory(const String & from_path, const String & to_path)
 {
-    Poco::File(disk_path + from_path).renameTo(disk_path + to_path);
+    fs::rename(fs::path(disk_path) / from_path, fs::path(disk_path) / to_path);
 }
 
 DiskDirectoryIteratorPtr DiskLocal::iterateDirectory(const String & path)
@@ -200,99 +199,95 @@ DiskDirectoryIteratorPtr DiskLocal::iterateDirectory(const String & path)
 
 void DiskLocal::moveFile(const String & from_path, const String & to_path)
 {
-    Poco::File(disk_path + from_path).renameTo(disk_path + to_path);
+    fs::rename(fs::path(disk_path) / from_path, fs::path(disk_path) / to_path);
 }
 
 void DiskLocal::replaceFile(const String & from_path, const String & to_path)
 {
-    Poco::File from_file(disk_path + from_path);
-    Poco::File to_file(disk_path + to_path);
-    if (to_file.exists())
-    {
-        Poco::File tmp_file(disk_path + to_path + ".old");
-        to_file.renameTo(tmp_file.path());
-        from_file.renameTo(disk_path + to_path);
-        tmp_file.remove();
-    }
-    else
-        from_file.renameTo(to_file.path());
+    fs::path from_file = fs::path(disk_path) / from_path;
+    fs::path to_file = fs::path(disk_path) / 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 aio_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache) const
 {
-    return createReadBufferFromFileBase(disk_path + path, estimated_size, aio_threshold, mmap_threshold, mmap_cache, buf_size);
+    return createReadBufferFromFileBase(fs::path(disk_path) / path, estimated_size, aio_threshold, mmap_threshold, mmap_cache, buf_size);
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
 DiskLocal::writeFile(const String & path, size_t buf_size, WriteMode mode)
 {
     int flags = (mode == WriteMode::Append) ? (O_APPEND | O_CREAT | O_WRONLY) : -1;
-    return std::make_unique<WriteBufferFromFile>(disk_path + path, buf_size, flags);
+    return std::make_unique<WriteBufferFromFile>(fs::path(disk_path) / path, buf_size, flags);
 }
 
 void DiskLocal::removeFile(const String & path)
 {
-    auto fs_path = disk_path + path;
+    auto fs_path = fs::path(disk_path) / path;
     if (0 != unlink(fs_path.c_str()))
-        throwFromErrnoWithPath("Cannot unlink file " + fs_path, fs_path, ErrorCodes::CANNOT_UNLINK);
+        throwFromErrnoWithPath("Cannot unlink file " + fs_path.string(), fs_path, ErrorCodes::CANNOT_UNLINK);
 }
 
 void DiskLocal::removeFileIfExists(const String & path)
 {
-    auto fs_path = disk_path + path;
+    auto fs_path = fs::path(disk_path) / path;
     if (0 != unlink(fs_path.c_str()) && errno != ENOENT)
-        throwFromErrnoWithPath("Cannot unlink file " + fs_path, fs_path, ErrorCodes::CANNOT_UNLINK);
+        throwFromErrnoWithPath("Cannot unlink file " + fs_path.string(), fs_path, ErrorCodes::CANNOT_UNLINK);
 }
 
 void DiskLocal::removeDirectory(const String & path)
 {
-    auto fs_path = disk_path + path;
+    auto fs_path = fs::path(disk_path) / path;
     if (0 != rmdir(fs_path.c_str()))
-        throwFromErrnoWithPath("Cannot rmdir " + fs_path, fs_path, ErrorCodes::CANNOT_RMDIR);
+        throwFromErrnoWithPath("Cannot rmdir " + fs_path.string(), fs_path, ErrorCodes::CANNOT_RMDIR);
 }
 
 void DiskLocal::removeRecursive(const String & path)
 {
-    Poco::File(disk_path + path).remove(true);
+    fs::remove_all(fs::path(disk_path) / path);
 }
 
 void DiskLocal::listFiles(const String & path, std::vector<String> & file_names)
 {
-    Poco::File(disk_path + path).list(file_names);
+    file_names.clear();
+    for (const auto & entry : fs::directory_iterator(fs::path(disk_path) / path))
+        file_names.emplace_back(entry.path().filename());
 }
 
 void DiskLocal::setLastModified(const String & path, const Poco::Timestamp & timestamp)
 {
-    Poco::File(disk_path + path).setLastModified(timestamp);
+    FS::setModificationTime(fs::path(disk_path) / path, timestamp.epochTime());
 }
 
 Poco::Timestamp DiskLocal::getLastModified(const String & path)
 {
-    return Poco::File(disk_path + path).getLastModified();
+    return FS::getModificationTimestamp(fs::path(disk_path) / path);
 }
 
 void DiskLocal::createHardLink(const String & src_path, const String & dst_path)
 {
-    DB::createHardLink(disk_path + src_path, disk_path + dst_path);
+    DB::createHardLink(fs::path(disk_path) / src_path, fs::path(disk_path) / dst_path);
 }
 
 void DiskLocal::truncateFile(const String & path, size_t size)
 {
-    int res = truncate((disk_path + path).c_str(), size);
+    int res = truncate((fs::path(disk_path) / path).string().data(), size);
     if (-1 == res)
         throwFromErrnoWithPath("Cannot truncate file " + path, path, ErrorCodes::CANNOT_TRUNCATE_FILE);
 }
 
 void DiskLocal::createFile(const String & path)
 {
-    Poco::File(disk_path + path).createFile();
+    FS::createFile(fs::path(disk_path) / path);
 }
 
 void DiskLocal::setReadOnly(const String & path)
 {
-    Poco::File(disk_path + path).setReadOnly(true);
+    fs::permissions(fs::path(disk_path) / path,
+                    fs::perms::owner_write | fs::perms::group_write | fs::perms::others_write,
+                    fs::perm_options::remove);
 }
 
 bool inline isSameDiskType(const IDisk & one, const IDisk & another)
@@ -303,14 +298,23 @@ bool inline isSameDiskType(const IDisk & one, const IDisk & another)
 void DiskLocal::copy(const String & from_path, const std::shared_ptr<IDisk> & to_disk, const String & to_path)
 {
     if (isSameDiskType(*this, *to_disk))
-        Poco::File(disk_path + from_path).copyTo(to_disk->getPath() + to_path); /// Use more optimal way.
+    {
+        fs::path to = fs::path(to_disk->getPath()) / to_path;
+        fs::path from = fs::path(disk_path) / from_path;
+        if (from_path.ends_with('/'))
+            from = from.parent_path();
+        if (fs::is_directory(from))
+            to /= from.filename();
+
+        fs::copy(from, to, fs::copy_options::recursive | fs::copy_options::overwrite_existing); /// Use more optimal way.
+    }
     else
         IDisk::copy(from_path, to_disk, to_path); /// Copy files through buffers.
 }
 
 SyncGuardPtr DiskLocal::getDirectorySyncGuard(const String & path) const
 {
-    return std::make_unique<LocalDirectorySyncGuard>(disk_path + path);
+    return std::make_unique<LocalDirectorySyncGuard>(fs::path(disk_path) / path);
 }
 
 DiskPtr DiskLocalReservation::getDisk(size_t i) const
@@ -339,7 +343,7 @@ DiskLocalReservation::~DiskLocalReservation()
         if (disk->reserved_bytes < size)
         {
             disk->reserved_bytes = 0;
-            LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservations size for disk '{}'.", disk->getName());
+            LOG_ERROR(disk->log, "Unbalanced reservations size for disk '{}'.", disk->getName());
         }
         else
         {
@@ -347,7 +351,7 @@ DiskLocalReservation::~DiskLocalReservation()
         }
 
         if (disk->reservation_count == 0)
-            LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservation count for disk '{}'.", disk->getName());
+            LOG_ERROR(disk->log, "Unbalanced reservation count for disk '{}'.", disk->getName());
         else
             --disk->reservation_count;
     }
@@ -363,7 +367,7 @@ void registerDiskLocal(DiskFactory & factory)
     auto creator = [](const String & name,
                       const Poco::Util::AbstractConfiguration & config,
                       const String & config_prefix,
-                      const Context & context) -> DiskPtr {
+                      ContextConstPtr context) -> DiskPtr {
         String path = config.getString(config_prefix + ".path", "");
         if (name == "default")
         {
@@ -371,7 +375,7 @@ void registerDiskLocal(DiskFactory & factory)
                 throw Exception(
                     "\"default\" disk path should be provided in <path> not it <storage_configuration>",
                     ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
-            path = context.getPath();
+            path = context->getPath();
         }
         else
         {
@@ -381,10 +385,8 @@ void registerDiskLocal(DiskFactory & factory)
                 throw Exception("Disk path must end with /. Disk " + name, ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
         }
 
-        if (Poco::File disk{path}; !disk.canRead() || !disk.canWrite())
-        {
-            throw Exception("There is no RW access to disk " + name + " (" + path + ")", ErrorCodes::PATH_ACCESS_DENIED);
-        }
+        if (!FS::canRead(path) || !FS::canWrite(path))
+            throw Exception("There is no RW access to the disk " + name + " (" + path + ")", ErrorCodes::PATH_ACCESS_DENIED);
 
         bool has_space_ratio = config.has(config_prefix + ".keep_free_space_ratio");
 
@@ -402,7 +404,7 @@ void registerDiskLocal(DiskFactory & factory)
                 throw Exception("'keep_free_space_ratio' have to be between 0 and 1", ErrorCodes::EXCESSIVE_ELEMENT_IN_CONFIG);
             String tmp_path = path;
             if (tmp_path.empty())
-                tmp_path = context.getPath();
+                tmp_path = context->getPath();
 
             // Create tmp disk for getting total disk space.
             keep_free_space_bytes = static_cast<UInt64>(DiskLocal("tmp", tmp_path, 0).getTotalSpace() * ratio);
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index d957fc6f847..47482ad8d67 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -1,12 +1,11 @@
 #pragma once
 
+#include <common/logger_useful.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <IO/WriteBufferFromFile.h>
 
-#include <Poco/DirectoryIterator.h>
-#include <Poco/File.h>
 
 namespace DB
 {
@@ -26,7 +25,7 @@ public:
         : name(name_), disk_path(path_), keep_free_space_bytes(keep_free_space_bytes_)
     {
         if (disk_path.back() != '/')
-            throw Exception("Disk path must ends with '/', but '" + disk_path + "' doesn't.", ErrorCodes::LOGICAL_ERROR);
+            throw Exception("Disk path must end with '/', but '" + disk_path + "' doesn't.", ErrorCodes::LOGICAL_ERROR);
     }
 
     const String & getName() const override { return name; }
@@ -115,6 +114,8 @@ private:
     UInt64 reservation_count = 0;
 
     static std::mutex reservation_mutex;
+
+    Poco::Logger * log = &Poco::Logger::get("DiskLocal");
 };
 
 }
diff --git a/src/Disks/DiskMemory.cpp b/src/Disks/DiskMemory.cpp
index d8b3c74d0d9..423dba6bed6 100644
--- a/src/Disks/DiskMemory.cpp
+++ b/src/Disks/DiskMemory.cpp
@@ -6,7 +6,6 @@
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/WriteBufferFromString.h>
 #include <Interpreters/Context.h>
-#include <Poco/Path.h>
 
 
 namespace DB
@@ -24,7 +23,7 @@ namespace ErrorCodes
 class DiskMemoryDirectoryIterator final : public IDiskDirectoryIterator
 {
 public:
-    explicit DiskMemoryDirectoryIterator(std::vector<Poco::Path> && dir_file_paths_)
+    explicit DiskMemoryDirectoryIterator(std::vector<fs::path> && dir_file_paths_)
         : dir_file_paths(std::move(dir_file_paths_)), iter(dir_file_paths.begin())
     {
     }
@@ -33,13 +32,13 @@ public:
 
     bool isValid() const override { return iter != dir_file_paths.end(); }
 
-    String path() const override { return (*iter).toString(); }
+    String path() const override { return iter->string(); }
 
-    String name() const override { return (*iter).getFileName(); }
+    String name() const override { return iter->filename(); }
 
 private:
-    std::vector<Poco::Path> dir_file_paths;
-    std::vector<Poco::Path>::iterator iter;
+    std::vector<fs::path> dir_file_paths;
+    std::vector<fs::path>::iterator iter;
 };
 
 
@@ -268,7 +267,7 @@ DiskDirectoryIteratorPtr DiskMemory::iterateDirectory(const String & path)
     if (!path.empty() && files.find(path) == files.end())
         throw Exception("Directory '" + path + "' does not exist", ErrorCodes::DIRECTORY_DOESNT_EXIST);
 
-    std::vector<Poco::Path> dir_file_paths;
+    std::vector<fs::path> dir_file_paths;
     for (const auto & file : files)
         if (parentPath(file.first) == path)
             dir_file_paths.emplace_back(file.first);
@@ -451,7 +450,7 @@ void registerDiskMemory(DiskFactory & factory)
     auto creator = [](const String & name,
                       const Poco::Util::AbstractConfiguration & /*config*/,
                       const String & /*config_prefix*/,
-                      const Context & /*context*/) -> DiskPtr { return std::make_shared<DiskMemory>(name); };
+                      ContextConstPtr /*context*/) -> DiskPtr { return std::make_shared<DiskMemory>(name); };
     factory.registerDiskType("memory", creator);
 }
 
diff --git a/src/Disks/DiskRestartProxy.cpp b/src/Disks/DiskRestartProxy.cpp
new file mode 100644
index 00000000000..2600dc5a1e1
--- /dev/null
+++ b/src/Disks/DiskRestartProxy.cpp
@@ -0,0 +1,311 @@
+#include "DiskRestartProxy.h"
+
+#include <IO/ReadBufferFromFileDecorator.h>
+#include <IO/WriteBufferFromFileDecorator.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int DEADLOCK_AVOIDED;
+}
+
+using Millis = std::chrono::milliseconds;
+using Seconds = std::chrono::seconds;
+
+/// Holds restart read lock till buffer destruction.
+class RestartAwareReadBuffer : public ReadBufferFromFileDecorator
+{
+public:
+    RestartAwareReadBuffer(const DiskRestartProxy & disk, std::unique_ptr<ReadBufferFromFileBase> impl_)
+        : ReadBufferFromFileDecorator(std::move(impl_)), lock(disk.mutex) { }
+
+private:
+    ReadLock lock;
+};
+
+/// Holds restart read lock till buffer finalize.
+class RestartAwareWriteBuffer : public WriteBufferFromFileDecorator
+{
+public:
+    RestartAwareWriteBuffer(const DiskRestartProxy & disk, std::unique_ptr<WriteBuffer> impl_)
+        : WriteBufferFromFileDecorator(std::move(impl_)), lock(disk.mutex) { }
+
+    virtual ~RestartAwareWriteBuffer() override
+    {
+        try
+        {
+            RestartAwareWriteBuffer::finalize();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+
+    void finalize() override
+    {
+        if (finalized)
+            return;
+
+        WriteBufferFromFileDecorator::finalize();
+
+        lock.unlock();
+    }
+
+private:
+    ReadLock lock;
+};
+
+DiskRestartProxy::DiskRestartProxy(DiskPtr & delegate_)
+    : DiskDecorator(delegate_) { }
+
+ReservationPtr DiskRestartProxy::reserve(UInt64 bytes)
+{
+    ReadLock lock (mutex);
+    auto ptr = DiskDecorator::reserve(bytes);
+    if (ptr)
+    {
+        auto disk_ptr = std::static_pointer_cast<DiskRestartProxy>(shared_from_this());
+        return std::make_unique<ReservationDelegate>(std::move(ptr), disk_ptr);
+    }
+    return ptr;
+}
+
+const String & DiskRestartProxy::getPath() const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getPath();
+}
+
+UInt64 DiskRestartProxy::getTotalSpace() const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getTotalSpace();
+}
+
+UInt64 DiskRestartProxy::getAvailableSpace() const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getAvailableSpace();
+}
+
+UInt64 DiskRestartProxy::getUnreservedSpace() const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getUnreservedSpace();
+}
+
+UInt64 DiskRestartProxy::getKeepingFreeSpace() const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getKeepingFreeSpace();
+}
+
+bool DiskRestartProxy::exists(const String & path) const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::exists(path);
+}
+
+bool DiskRestartProxy::isFile(const String & path) const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::isFile(path);
+}
+
+bool DiskRestartProxy::isDirectory(const String & path) const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::isDirectory(path);
+}
+
+size_t DiskRestartProxy::getFileSize(const String & path) const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getFileSize(path);
+}
+
+void DiskRestartProxy::createDirectory(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::createDirectory(path);
+}
+
+void DiskRestartProxy::createDirectories(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::createDirectories(path);
+}
+
+void DiskRestartProxy::clearDirectory(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::clearDirectory(path);
+}
+
+void DiskRestartProxy::moveDirectory(const String & from_path, const String & to_path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::moveDirectory(from_path, to_path);
+}
+
+DiskDirectoryIteratorPtr DiskRestartProxy::iterateDirectory(const String & path)
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::iterateDirectory(path);
+}
+
+void DiskRestartProxy::createFile(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::createFile(path);
+}
+
+void DiskRestartProxy::moveFile(const String & from_path, const String & to_path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::moveFile(from_path, to_path);
+}
+
+void DiskRestartProxy::replaceFile(const String & from_path, const String & to_path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::replaceFile(from_path, to_path);
+}
+
+void DiskRestartProxy::copy(const String & from_path, const std::shared_ptr<IDisk> & to_disk, const String & to_path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::copy(from_path, to_disk, to_path);
+}
+
+void DiskRestartProxy::listFiles(const String & path, std::vector<String> & file_names)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::listFiles(path, file_names);
+}
+
+std::unique_ptr<ReadBufferFromFileBase> DiskRestartProxy::readFile(
+    const String & path, size_t buf_size, size_t estimated_size, size_t aio_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache)
+    const
+{
+    ReadLock lock (mutex);
+    auto impl = DiskDecorator::readFile(path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
+    return std::make_unique<RestartAwareReadBuffer>(*this, std::move(impl));
+}
+
+std::unique_ptr<WriteBufferFromFileBase> DiskRestartProxy::writeFile(const String & path, size_t buf_size, WriteMode mode)
+{
+    ReadLock lock (mutex);
+    auto impl = DiskDecorator::writeFile(path, buf_size, mode);
+    return std::make_unique<RestartAwareWriteBuffer>(*this, std::move(impl));
+}
+
+void DiskRestartProxy::removeFile(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::removeFile(path);
+}
+
+void DiskRestartProxy::removeFileIfExists(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::removeFileIfExists(path);
+}
+
+void DiskRestartProxy::removeDirectory(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::removeDirectory(path);
+}
+
+void DiskRestartProxy::removeRecursive(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::removeRecursive(path);
+}
+
+void DiskRestartProxy::removeSharedFile(const String & path, bool keep_s3)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::removeSharedFile(path, keep_s3);
+}
+
+void DiskRestartProxy::removeSharedRecursive(const String & path, bool keep_s3)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::removeSharedRecursive(path, keep_s3);
+}
+
+void DiskRestartProxy::setLastModified(const String & path, const Poco::Timestamp & timestamp)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::setLastModified(path, timestamp);
+}
+
+Poco::Timestamp DiskRestartProxy::getLastModified(const String & path)
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getLastModified(path);
+}
+
+void DiskRestartProxy::setReadOnly(const String & path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::setReadOnly(path);
+}
+
+void DiskRestartProxy::createHardLink(const String & src_path, const String & dst_path)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::createHardLink(src_path, dst_path);
+}
+
+void DiskRestartProxy::truncateFile(const String & path, size_t size)
+{
+    ReadLock lock (mutex);
+    DiskDecorator::truncateFile(path, size);
+}
+
+String DiskRestartProxy::getUniqueId(const String & path) const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::getUniqueId(path);
+}
+
+bool DiskRestartProxy::checkUniqueId(const String & id) const
+{
+    ReadLock lock (mutex);
+    return DiskDecorator::checkUniqueId(id);
+}
+
+void DiskRestartProxy::restart()
+{
+    /// Speed up processing unhealthy requests.
+    DiskDecorator::shutdown();
+
+    WriteLock lock (mutex, std::defer_lock);
+
+    LOG_INFO(log, "Acquiring lock to restart disk {}", DiskDecorator::getName());
+
+    auto start_time = std::chrono::steady_clock::now();
+    auto lock_timeout = Seconds(120);
+    do
+    {
+        /// Use a small timeout to not block read operations for a long time.
+        if (lock.try_lock_for(Millis(10)))
+            break;
+    } while (std::chrono::steady_clock::now() - start_time < lock_timeout);
+
+    if (!lock.owns_lock())
+        throw Exception("Failed to acquire restart lock within timeout. Client should retry.", ErrorCodes::DEADLOCK_AVOIDED);
+
+    LOG_INFO(log, "Restart lock acquired. Restarting disk {}", DiskDecorator::getName());
+
+    DiskDecorator::startup();
+
+    LOG_INFO(log, "Disk restarted {}", DiskDecorator::getName());
+}
+
+}
diff --git a/src/Disks/DiskRestartProxy.h b/src/Disks/DiskRestartProxy.h
new file mode 100644
index 00000000000..f5502d9d68f
--- /dev/null
+++ b/src/Disks/DiskRestartProxy.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include "DiskDecorator.h"
+
+#include <common/logger_useful.h>
+#include <shared_mutex>
+
+namespace DB
+{
+using ReadLock = std::shared_lock<std::shared_timed_mutex>;
+using WriteLock = std::unique_lock<std::shared_timed_mutex>;
+
+class RestartAwareReadBuffer;
+class RestartAwareWriteBuffer;
+
+/**
+ * Gives possibility to change underlying disk settings at runtime calling 'restart' method.
+ * All disk methods are protected by read-lock. Read/Write buffers produced by disk holds read-lock till buffer is finalized/destructed.
+ * When 'restart' method is called write-lock is acquired to make sure that no operations are running on that disk.
+ */
+class DiskRestartProxy : public DiskDecorator
+{
+public:
+    explicit DiskRestartProxy(DiskPtr & delegate_);
+
+    ReservationPtr reserve(UInt64 bytes) override;
+    const String & getPath() const override;
+    UInt64 getTotalSpace() const override;
+    UInt64 getAvailableSpace() const override;
+    UInt64 getUnreservedSpace() const override;
+    UInt64 getKeepingFreeSpace() const override;
+    bool exists(const String & path) const override;
+    bool isFile(const String & path) const override;
+    bool isDirectory(const String & path) const override;
+    size_t getFileSize(const String & path) const override;
+    void createDirectory(const String & path) override;
+    void createDirectories(const String & path) override;
+    void clearDirectory(const String & path) override;
+    void moveDirectory(const String & from_path, const String & to_path) override;
+    DiskDirectoryIteratorPtr iterateDirectory(const String & path) override;
+    void createFile(const String & path) override;
+    void moveFile(const String & from_path, const String & to_path) override;
+    void replaceFile(const String & from_path, const String & to_path) override;
+    void copy(const String & from_path, const DiskPtr & to_disk, const String & to_path) override;
+    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 aio_threshold,
+        size_t mmap_threshold,
+        MMappedFileCache * mmap_cache) 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;
+    void removeDirectory(const String & path) override;
+    void removeRecursive(const String & path) override;
+    void removeSharedFile(const String & path, bool keep_s3) override;
+    void removeSharedRecursive(const String & path, bool keep_s3) override;
+    void setLastModified(const String & path, const Poco::Timestamp & timestamp) override;
+    Poco::Timestamp getLastModified(const String & path) override;
+    void setReadOnly(const String & path) override;
+    void createHardLink(const String & src_path, const String & dst_path) override;
+    void truncateFile(const String & path, size_t size) override;
+    String getUniqueId(const String & path) const override;
+    bool checkUniqueId(const String & id) const override;
+
+    void restart();
+
+private:
+    friend class RestartAwareReadBuffer;
+    friend class RestartAwareWriteBuffer;
+
+    /// Mutex to protect RW access.
+    mutable std::shared_timed_mutex mutex;
+
+    Poco::Logger * log = &Poco::Logger::get("DiskRestartProxy");
+};
+
+}
diff --git a/src/Disks/DiskSelector.cpp b/src/Disks/DiskSelector.cpp
index 0fb728a4f02..96b906f3ffc 100644
--- a/src/Disks/DiskSelector.cpp
+++ b/src/Disks/DiskSelector.cpp
@@ -18,7 +18,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_DISK;
 }
 
-DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Context & context)
+DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextConstPtr context)
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
@@ -40,12 +40,12 @@ DiskSelector::DiskSelector(const Poco::Util::AbstractConfiguration & config, con
         disks.emplace(disk_name, factory.create(disk_name, config, disk_config_prefix, context));
     }
     if (!has_default_disk)
-        disks.emplace(default_disk_name, std::make_shared<DiskLocal>(default_disk_name, context.getPath(), 0));
+        disks.emplace(default_disk_name, std::make_shared<DiskLocal>(default_disk_name, context->getPath(), 0));
 }
 
 
 DiskSelectorPtr DiskSelector::updateFromConfig(
-    const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Context & context) const
+    const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context) const
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
@@ -55,11 +55,7 @@ DiskSelectorPtr DiskSelector::updateFromConfig(
     std::shared_ptr<DiskSelector> result = std::make_shared<DiskSelector>(*this);
 
     constexpr auto default_disk_name = "default";
-    std::set<String> old_disks_minus_new_disks;
-    for (const auto & [disk_name, _] : result->getDisksMap())
-    {
-        old_disks_minus_new_disks.insert(disk_name);
-    }
+    DisksMap old_disks_minus_new_disks (result->getDisksMap());
 
     for (const auto & disk_name : keys)
     {
@@ -73,10 +69,11 @@ DiskSelectorPtr DiskSelector::updateFromConfig(
         }
         else
         {
-            old_disks_minus_new_disks.erase(disk_name);
+            auto disk = old_disks_minus_new_disks[disk_name];
 
-            /// TODO: Ideally ClickHouse shall complain if disk has changed, but
-            /// implementing that may appear as not trivial task.
+            disk->applyNewSettings(config, context);
+
+            old_disks_minus_new_disks.erase(disk_name);
         }
     }
 
@@ -91,7 +88,7 @@ DiskSelectorPtr DiskSelector::updateFromConfig(
             writeString("Disks ", warning);
 
         int index = 0;
-        for (const String & name : old_disks_minus_new_disks)
+        for (const auto & [name, _] : old_disks_minus_new_disks)
         {
             if (index++ > 0)
                 writeString(", ", warning);
diff --git a/src/Disks/DiskSelector.h b/src/Disks/DiskSelector.h
index 5d023fe1fbc..6b7e8174d3d 100644
--- a/src/Disks/DiskSelector.h
+++ b/src/Disks/DiskSelector.h
@@ -10,7 +10,6 @@
 namespace DB
 {
 
-class Context;
 class DiskSelector;
 using DiskSelectorPtr = std::shared_ptr<const DiskSelector>;
 using DisksMap = std::map<String, DiskPtr>;
@@ -20,13 +19,13 @@ using DisksMap = std::map<String, DiskPtr>;
 class DiskSelector
 {
 public:
-    DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const Context & context);
+    DiskSelector(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextConstPtr context);
     DiskSelector(const DiskSelector & from) : disks(from.disks) { }
 
     DiskSelectorPtr updateFromConfig(
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
-        const Context & context
+        ContextPtr context
     ) const;
 
     /// Get disk by name
diff --git a/src/Disks/DiskType.h b/src/Disks/DiskType.h
index 4e0ae226af4..a5c23fe2c2c 100644
--- a/src/Disks/DiskType.h
+++ b/src/Disks/DiskType.h
@@ -11,7 +11,8 @@ struct DiskType
     {
         Local,
         RAM,
-        S3
+        S3,
+        HDFS
     };
     static String toString(Type disk_type)
     {
@@ -23,10 +24,11 @@ struct DiskType
                 return "memory";
             case Type::S3:
                 return "s3";
+            case Type::HDFS:
+                return "hdfs";
         }
         __builtin_unreachable();
     }
 };
 
 }
-
diff --git a/src/Disks/HDFS/DiskHDFS.cpp b/src/Disks/HDFS/DiskHDFS.cpp
new file mode 100644
index 00000000000..da6ccb024c7
--- /dev/null
+++ b/src/Disks/HDFS/DiskHDFS.cpp
@@ -0,0 +1,194 @@
+#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>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+
+class HDFSPathKeeper : public RemoteFSPathKeeper
+{
+public:
+    using Chunk = std::vector<std::string>;
+    using Chunks = std::list<Chunk>;
+
+    explicit HDFSPathKeeper(size_t chunk_limit_) : RemoteFSPathKeeper(chunk_limit_) {}
+
+    void addPath(const String & path) override
+    {
+        if (chunks.empty() || chunks.back().size() >= chunk_limit)
+        {
+            chunks.push_back(Chunks::value_type());
+            chunks.back().reserve(chunk_limit);
+        }
+        chunks.back().push_back(path.data());
+    }
+
+    void removePaths(const std::function<void(Chunk &&)> & remove_chunk_func)
+    {
+        for (auto & chunk : chunks)
+            remove_chunk_func(std::move(chunk));
+    }
+
+private:
+    Chunks chunks;
+};
+
+
+/// 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_,
+    SettingsPtr settings_,
+    const String & metadata_path_,
+    const Poco::Util::AbstractConfiguration & config_)
+    : IDiskRemote(disk_name_, hdfs_root_path_, metadata_path_, "DiskHDFS", settings_->thread_pool_size)
+    , config(config_)
+    , hdfs_builder(createHDFSBuilder(hdfs_root_path_, config))
+    , hdfs_fs(createHDFSFS(hdfs_builder.get()))
+    , settings(std::move(settings_))
+{
+}
+
+
+std::unique_ptr<ReadBufferFromFileBase> DiskHDFS::readFile(const String & path, size_t buf_size, size_t, size_t, size_t, MMappedFileCache *) const
+{
+    auto metadata = readMeta(path);
+
+    LOG_DEBUG(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);
+}
+
+
+std::unique_ptr<WriteBufferFromFileBase> DiskHDFS::writeFile(const String & path, size_t buf_size, WriteMode mode)
+{
+    auto metadata = readOrCreateMetaForWriting(path, mode);
+
+    /// Path to store new HDFS object.
+    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",
+              backQuote(metadata_path + path), remote_fs_root_path + hdfs_path);
+
+    /// Single O_WRONLY in libhdfs adds O_TRUNC
+    auto hdfs_buffer = std::make_unique<WriteBufferFromHDFS>(hdfs_path,
+                                                             config, buf_size,
+                                                             mode == WriteMode::Rewrite ? O_WRONLY :  O_WRONLY | O_APPEND);
+
+    return std::make_unique<WriteIndirectBufferFromRemoteFS<WriteBufferFromHDFS>>(std::move(hdfs_buffer),
+                                                                                std::move(metadata),
+                                                                                file_name);
+}
+
+
+RemoteFSPathKeeperPtr DiskHDFS::createFSPathKeeper() const
+{
+    return std::make_shared<HDFSPathKeeper>(settings->objects_chunk_size_to_delete);
+}
+
+
+void DiskHDFS::removeFromRemoteFS(RemoteFSPathKeeperPtr fs_paths_keeper)
+{
+    auto * hdfs_paths_keeper = dynamic_cast<HDFSPathKeeper *>(fs_paths_keeper.get());
+    if (hdfs_paths_keeper)
+        hdfs_paths_keeper->removePaths([&](std::vector<std::string> && chunk)
+        {
+            for (const auto & hdfs_object_path : chunk)
+            {
+                const String & hdfs_path = hdfs_object_path;
+                const size_t begin_of_path = hdfs_path.find('/', hdfs_path.find("//") + 2);
+
+                /// Add path from root to file name
+                int res = hdfsDelete(hdfs_fs.get(), hdfs_path.substr(begin_of_path).c_str(), 0);
+                if (res == -1)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "HDFSDelete failed with path: " + hdfs_path);
+            }
+        });
+}
+
+
+namespace
+{
+std::unique_ptr<DiskHDFSSettings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    return std::make_unique<DiskHDFSSettings>(
+        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
+        config.getInt(config_prefix + ".thread_pool_size", 16),
+        config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000));
+}
+}
+
+void registerDiskHDFS(DiskFactory & factory)
+{
+    auto creator = [](const String & name,
+                      const Poco::Util::AbstractConfiguration & config,
+                      const String & config_prefix,
+                      ContextConstPtr context_) -> DiskPtr
+    {
+        fs::path disk = fs::path(context_->getPath()) / "disks" / name;
+        fs::create_directories(disk);
+
+        String uri{config.getString(config_prefix + ".endpoint")};
+
+        if (uri.back() != '/')
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "HDFS path must ends with '/', but '{}' doesn't.", uri);
+
+        String metadata_path = context_->getPath() + "disks/" + name + "/";
+
+        return std::make_shared<DiskHDFS>(
+            name, uri,
+            getSettings(config, config_prefix),
+            metadata_path, config);
+    };
+
+    factory.registerDiskType("hdfs", creator);
+}
+
+}
diff --git a/src/Disks/HDFS/DiskHDFS.h b/src/Disks/HDFS/DiskHDFS.h
new file mode 100644
index 00000000000..49fdf44728b
--- /dev/null
+++ b/src/Disks/HDFS/DiskHDFS.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#include <Disks/IDiskRemote.h>
+#include <Storages/HDFS/HDFSCommon.h>
+#include <Core/UUID.h>
+#include <memory>
+
+
+namespace DB
+{
+
+struct DiskHDFSSettings
+{
+    size_t min_bytes_for_seek;
+    int thread_pool_size;
+    int objects_chunk_size_to_delete;
+
+    DiskHDFSSettings(
+            int min_bytes_for_seek_,
+            int thread_pool_size_,
+            int objects_chunk_size_to_delete_)
+        : min_bytes_for_seek(min_bytes_for_seek_)
+        , thread_pool_size(thread_pool_size_)
+        , objects_chunk_size_to_delete(objects_chunk_size_to_delete_) {}
+};
+
+
+/**
+ * Storage for persisting data in HDFS and metadata on the local disk.
+ * Files are represented by file in local filesystem (clickhouse_root/disks/disk_name/path/to/file)
+ * that contains HDFS object key with actual data.
+ */
+class DiskHDFS final : public IDiskRemote
+{
+public:
+    using SettingsPtr = std::unique_ptr<DiskHDFSSettings>;
+
+    DiskHDFS(
+        const String & disk_name_,
+        const String & hdfs_root_path_,
+        SettingsPtr settings_,
+        const String & metadata_path_,
+        const Poco::Util::AbstractConfiguration & config_);
+
+    DiskType::Type getType() const override { return DiskType::Type::HDFS; }
+
+    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;
+
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & path, size_t buf_size, WriteMode mode) override;
+
+    void removeFromRemoteFS(RemoteFSPathKeeperPtr fs_paths_keeper) override;
+
+    RemoteFSPathKeeperPtr createFSPathKeeper() const override;
+
+private:
+    String getRandomName() { return toString(UUIDHelpers::generateV4()); }
+
+    const Poco::Util::AbstractConfiguration & config;
+
+    HDFSBuilderWrapper hdfs_builder;
+    HDFSFSPtr hdfs_fs;
+
+    SettingsPtr settings;
+};
+
+}
diff --git a/src/Disks/IDisk.cpp b/src/Disks/IDisk.cpp
index ee7f57af771..82705b5dcc8 100644
--- a/src/Disks/IDisk.cpp
+++ b/src/Disks/IDisk.cpp
@@ -22,7 +22,8 @@ bool IDisk::isDirectoryEmpty(const String & path)
 
 void copyFile(IDisk & from_disk, const String & from_path, IDisk & to_disk, const String & to_path)
 {
-    LOG_DEBUG(&Poco::Logger::get("IDisk"), "Copying from {} {} to {} {}.", from_disk.getName(), from_path, to_disk.getName(), to_path);
+    LOG_DEBUG(&Poco::Logger::get("IDisk"), "Copying from {} (path: {}) {} to {} (path: {}) {}.",
+              from_disk.getName(), from_disk.getPath(), from_path, to_disk.getName(), to_disk.getPath(), to_path);
 
     auto in = from_disk.readFile(from_path);
     auto out = to_disk.writeFile(to_path);
@@ -41,16 +42,15 @@ void asyncCopy(IDisk & from_disk, String from_path, IDisk & to_disk, String to_p
             [&from_disk, from_path, &to_disk, to_path]()
             {
                 setThreadName("DiskCopier");
-                DB::copyFile(from_disk, from_path, to_disk, to_path + fileName(from_path));
+                DB::copyFile(from_disk, from_path, to_disk, fs::path(to_path) / fileName(from_path));
             });
 
         results.push_back(std::move(result));
     }
     else
     {
-        Poco::Path path(from_path);
-        const String & dir_name = path.directory(path.depth() - 1);
-        const String dest = to_path + dir_name + "/";
+        fs::path dir_name = fs::path(from_path).parent_path().filename();
+        fs::path dest(fs::path(to_path) / dir_name);
         to_disk.createDirectories(dest);
 
         for (auto it = from_disk.iterateDirectory(from_path); it->isValid(); it->next())
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 726145cb5d2..cb718605dd6 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <Core/Defines.h>
 #include <common/types.h>
 #include <Common/CurrentMetrics.h>
@@ -11,9 +12,11 @@
 #include <mutex>
 #include <utility>
 #include <boost/noncopyable.hpp>
-#include <Poco/Path.h>
 #include <Poco/Timestamp.h>
+#include <filesystem>
+#include "Poco/Util/AbstractConfiguration.h"
 
+namespace fs = std::filesystem;
 
 namespace CurrentMetrics
 {
@@ -176,17 +179,17 @@ public:
     virtual void removeRecursive(const String & path) = 0;
 
     /// Remove file. Throws exception if file doesn't exists or if directory is not empty.
-    /// Differs from removeFile for S3 disks
+    /// Differs from removeFile for S3/HDFS disks
     /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
     virtual void removeSharedFile(const String & path, bool) { removeFile(path); }
 
     /// Remove file or directory with all children. Use with extra caution. Throws exception if file doesn't exists.
-    /// Differs from removeRecursive for S3 disks
+    /// Differs from removeRecursive for S3/HDFS disks
     /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
     virtual void removeSharedRecursive(const String & path, bool) { removeRecursive(path); }
 
     /// Remove file or directory if it exists.
-    /// Differs from removeFileIfExists for S3 disks
+    /// Differs from removeFileIfExists for S3/HDFS disks
     /// Second bool param is a flag to remove (true) or keep (false) shared data on S3
     virtual void removeSharedFileIfExists(const String & path, bool) { removeFileIfExists(path); }
 
@@ -209,7 +212,10 @@ public:
     virtual DiskType::Type getType() const = 0;
 
     /// Invoked when Global Context is shutdown.
-    virtual void shutdown() { }
+    virtual void shutdown() {}
+
+    /// Performs action on disk startup.
+    virtual void startup() {}
 
     /// Return some uniq string for file, overrode for S3
     /// Required for distinguish different copies of the same part on S3
@@ -217,18 +223,24 @@ public:
 
     /// Check file exists and ClickHouse has an access to it
     /// Overrode in DiskS3
-    /// Required for S3 to ensure that replica has access to data wroten by other node
+    /// Required for S3 to ensure that replica has access to data written by other node
     virtual bool checkUniqueId(const String & id) const { return exists(id); }
 
-    /// Returns executor to perform asynchronous operations.
-    virtual Executor & getExecutor() { return *executor; }
-
     /// Invoked on partitions freeze query.
     virtual void onFreeze(const String &) { }
 
     /// Returns guard, that insures synchronization of directory metadata with storage device.
     virtual SyncGuardPtr getDirectorySyncGuard(const String & path) const;
 
+    /// Applies new settings for disk in runtime.
+    virtual void applyNewSettings(const Poco::Util::AbstractConfiguration &, ContextConstPtr) {}
+
+protected:
+    friend class DiskDecorator;
+
+    /// Returns executor to perform asynchronous operations.
+    virtual Executor & getExecutor() { return *executor; }
+
 private:
     std::unique_ptr<Executor> executor;
 };
@@ -282,25 +294,27 @@ public:
 /// Return full path to a file on disk.
 inline String fullPath(const DiskPtr & disk, const String & path)
 {
-    return disk->getPath() + path;
+    return fs::path(disk->getPath()) / path;
 }
 
 /// Return parent path for the specified path.
 inline String parentPath(const String & path)
 {
-    return Poco::Path(path).parent().toString();
+    if (path.ends_with('/'))
+        return fs::path(path).parent_path().parent_path() / "";
+    return fs::path(path).parent_path() / "";
 }
 
 /// Return file name for the specified path.
 inline String fileName(const String & path)
 {
-    return Poco::Path(path).getFileName();
+    return fs::path(path).filename();
 }
 
 /// Return directory path for the specified path.
 inline String directoryPath(const String & path)
 {
-    return Poco::Path(path).setFileName("").toString();
+    return fs::path(path).parent_path() / "";
 }
 
 }
diff --git a/src/Disks/IDiskRemote.cpp b/src/Disks/IDiskRemote.cpp
new file mode 100644
index 00000000000..b30e9613ed8
--- /dev/null
+++ b/src/Disks/IDiskRemote.cpp
@@ -0,0 +1,487 @@
+#include <Disks/IDiskRemote.h>
+
+#include "Disks/DiskFactory.h"
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteBufferFromS3.h>
+#include <IO/WriteHelpers.h>
+#include <Common/createHardLink.h>
+#include <Common/quoteString.h>
+#include <common/logger_useful.h>
+#include <Common/checkStackSize.h>
+#include <boost/algorithm/string.hpp>
+#include <Common/filesystemHelpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INCORRECT_DISK_INDEX;
+    extern const int UNKNOWN_FORMAT;
+    extern const int FILE_ALREADY_EXISTS;
+    extern const int PATH_ACCESS_DENIED;;
+    extern const int CANNOT_DELETE_DIRECTORY;
+}
+
+
+/// Load metadata by path or create empty if `create` flag is set.
+IDiskRemote::Metadata::Metadata(
+        const String & remote_fs_root_path_,
+        const String & disk_path_,
+        const String & metadata_file_path_,
+        bool create)
+    : remote_fs_root_path(remote_fs_root_path_)
+    , disk_path(disk_path_)
+    , metadata_file_path(metadata_file_path_)
+    , total_size(0), remote_fs_objects(0), ref_count(0)
+{
+    if (create)
+        return;
+
+    try
+    {
+        ReadBufferFromFile buf(disk_path + metadata_file_path, 1024); /* reasonable buffer size for small file */
+
+        UInt32 version;
+        readIntText(version, buf);
+
+        if (version < VERSION_ABSOLUTE_PATHS || version > VERSION_READ_ONLY_FLAG)
+            throw Exception(
+                ErrorCodes::UNKNOWN_FORMAT,
+                "Unknown metadata file version. Path: {}. Version: {}. Maximum expected version: {}",
+                disk_path + metadata_file_path, toString(version), toString(VERSION_READ_ONLY_FLAG));
+
+        assertChar('\n', buf);
+
+        UInt32 remote_fs_objects_count;
+        readIntText(remote_fs_objects_count, buf);
+        assertChar('\t', buf);
+        readIntText(total_size, buf);
+        assertChar('\n', buf);
+        remote_fs_objects.resize(remote_fs_objects_count);
+
+        for (size_t i = 0; i < remote_fs_objects_count; ++i)
+        {
+            String remote_fs_object_path;
+            size_t remote_fs_object_size;
+            readIntText(remote_fs_object_size, buf);
+            assertChar('\t', buf);
+            readEscapedString(remote_fs_object_path, buf);
+            if (version == VERSION_ABSOLUTE_PATHS)
+            {
+                if (!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: {}",
+                        remote_fs_object_path, remote_fs_root_path, disk_path_);
+
+                remote_fs_object_path = remote_fs_object_path.substr(remote_fs_root_path.size());
+            }
+            assertChar('\n', buf);
+            remote_fs_objects[i] = {remote_fs_object_path, remote_fs_object_size};
+        }
+
+        readIntText(ref_count, buf);
+        assertChar('\n', buf);
+
+        if (version >= VERSION_READ_ONLY_FLAG)
+        {
+            readBoolText(read_only, buf);
+            assertChar('\n', buf);
+        }
+    }
+    catch (Exception & e)
+    {
+        if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
+            throw;
+
+        throw Exception("Failed to read metadata file", e, ErrorCodes::UNKNOWN_FORMAT);
+    }
+}
+
+void IDiskRemote::Metadata::addObject(const String & path, size_t size)
+{
+    total_size += size;
+    remote_fs_objects.emplace_back(path, size);
+}
+
+/// Fsync metadata file if 'sync' flag is set.
+void IDiskRemote::Metadata::save(bool sync)
+{
+    WriteBufferFromFile buf(disk_path + metadata_file_path, 1024);
+
+    writeIntText(VERSION_RELATIVE_PATHS, buf);
+    writeChar('\n', buf);
+
+    writeIntText(remote_fs_objects.size(), buf);
+    writeChar('\t', buf);
+    writeIntText(total_size, buf);
+    writeChar('\n', buf);
+
+    for (const auto & [remote_fs_object_path, remote_fs_object_size] : remote_fs_objects)
+    {
+        writeIntText(remote_fs_object_size, buf);
+        writeChar('\t', buf);
+        writeEscapedString(remote_fs_object_path, buf);
+        writeChar('\n', buf);
+    }
+
+    writeIntText(ref_count, buf);
+    writeChar('\n', buf);
+
+    writeBoolText(read_only, buf);
+    writeChar('\n', buf);
+
+    buf.finalize();
+    if (sync)
+        buf.sync();
+}
+
+IDiskRemote::Metadata IDiskRemote::readOrCreateMetaForWriting(const String & path, WriteMode mode)
+{
+    bool exist = exists(path);
+    if (exist)
+    {
+        auto metadata = readMeta(path);
+        if (metadata.read_only)
+            throw Exception("File is read-only: " + path, ErrorCodes::PATH_ACCESS_DENIED);
+
+        if (mode == WriteMode::Rewrite)
+            removeFile(path); /// Remove for re-write.
+        else
+            return metadata;
+    }
+
+    auto metadata = createMeta(path);
+    /// Save empty metadata to disk to have ability to get file size while buffer is not finalized.
+    metadata.save();
+
+    return metadata;
+}
+
+
+IDiskRemote::Metadata IDiskRemote::readMeta(const String & path) const
+{
+    return Metadata(remote_fs_root_path, metadata_path, path);
+}
+
+
+IDiskRemote::Metadata IDiskRemote::createMeta(const String & path) const
+{
+    return Metadata(remote_fs_root_path, metadata_path, path, true);
+}
+
+
+void IDiskRemote::removeMeta(const String & path, RemoteFSPathKeeperPtr fs_paths_keeper)
+{
+    LOG_DEBUG(log, "Remove file by path: {}", backQuote(metadata_path + path));
+
+    fs::path file(metadata_path + path);
+
+    if (!fs::is_regular_file(file))
+        throw Exception(ErrorCodes::CANNOT_DELETE_DIRECTORY, "Path '{}' is a directory", path);
+
+    try
+    {
+        auto metadata = readMeta(path);
+
+        /// If there is no references - delete content from remote FS.
+        if (metadata.ref_count == 0)
+        {
+            fs::remove(file);
+            for (const auto & [remote_fs_object_path, _] : metadata.remote_fs_objects)
+                fs_paths_keeper->addPath(remote_fs_root_path + remote_fs_object_path);
+        }
+        else /// In other case decrement number of references, save metadata and delete file.
+        {
+            --metadata.ref_count;
+            metadata.save();
+            fs::remove(file);
+        }
+    }
+    catch (const Exception & e)
+    {
+        /// If it's impossible to read meta - just remove it from FS.
+        if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
+        {
+            LOG_WARNING(log,
+                "Metadata file {} can't be read by reason: {}. Removing it forcibly.",
+                backQuote(path), e.nested() ? e.nested()->message() : e.message());
+            fs::remove(file);
+        }
+        else
+            throw;
+    }
+}
+
+
+void IDiskRemote::removeMetaRecursive(const String & path, RemoteFSPathKeeperPtr fs_paths_keeper)
+{
+    checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
+
+    fs::path file = fs::path(metadata_path) / path;
+    if (fs::is_regular_file(file))
+    {
+        removeMeta(path, fs_paths_keeper);
+    }
+    else
+    {
+        for (auto it{iterateDirectory(path)}; it->isValid(); it->next())
+            removeMetaRecursive(it->path(), fs_paths_keeper);
+        fs::remove(file);
+    }
+}
+
+DiskPtr DiskRemoteReservation::getDisk(size_t i) const
+{
+    if (i != 0)
+        throw Exception("Can't use i != 0 with single disk reservation", ErrorCodes::INCORRECT_DISK_INDEX);
+    return disk;
+}
+
+
+void DiskRemoteReservation::update(UInt64 new_size)
+{
+    std::lock_guard lock(disk->reservation_mutex);
+    disk->reserved_bytes -= size;
+    size = new_size;
+    disk->reserved_bytes += size;
+}
+
+
+DiskRemoteReservation::~DiskRemoteReservation()
+{
+    try
+    {
+        std::lock_guard lock(disk->reservation_mutex);
+        if (disk->reserved_bytes < size)
+        {
+            disk->reserved_bytes = 0;
+            LOG_ERROR(disk->log, "Unbalanced reservations size for disk '{}'.", disk->getName());
+        }
+        else
+        {
+            disk->reserved_bytes -= size;
+        }
+
+        if (disk->reservation_count == 0)
+            LOG_ERROR(disk->log, "Unbalanced reservation count for disk '{}'.", disk->getName());
+        else
+            --disk->reservation_count;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+
+IDiskRemote::IDiskRemote(
+    const String & name_,
+    const String & remote_fs_root_path_,
+    const String & metadata_path_,
+    const String & log_name_,
+    size_t thread_pool_size)
+    : IDisk(std::make_unique<AsyncExecutor>(log_name_, thread_pool_size))
+    , log(&Poco::Logger::get(log_name_))
+    , name(name_)
+    , remote_fs_root_path(remote_fs_root_path_)
+    , metadata_path(metadata_path_)
+{
+}
+
+
+bool IDiskRemote::exists(const String & path) const
+{
+    return fs::exists(fs::path(metadata_path) / path);
+}
+
+
+bool IDiskRemote::isFile(const String & path) const
+{
+    return fs::is_regular_file(fs::path(metadata_path) / path);
+}
+
+
+void IDiskRemote::createFile(const String & path)
+{
+    /// Create empty metadata file.
+    auto metadata = createMeta(path);
+    metadata.save();
+}
+
+
+size_t IDiskRemote::getFileSize(const String & path) const
+{
+    auto metadata = readMeta(path);
+    return metadata.total_size;
+}
+
+
+void IDiskRemote::moveFile(const String & from_path, const String & to_path)
+{
+    if (exists(to_path))
+        throw Exception("File already exists: " + to_path, ErrorCodes::FILE_ALREADY_EXISTS);
+
+    fs::rename(fs::path(metadata_path) / from_path, fs::path(metadata_path) / to_path);
+}
+
+
+void IDiskRemote::replaceFile(const String & from_path, const String & to_path)
+{
+    if (exists(to_path))
+    {
+        const String tmp_path = to_path + ".old";
+        moveFile(to_path, tmp_path);
+        moveFile(from_path, to_path);
+        removeFile(tmp_path);
+    }
+    else
+        moveFile(from_path, to_path);
+}
+
+
+void IDiskRemote::removeFileIfExists(const String & path)
+{
+    RemoteFSPathKeeperPtr fs_paths_keeper = createFSPathKeeper();
+    if (fs::exists(fs::path(metadata_path) / path))
+    {
+        removeMeta(path, fs_paths_keeper);
+        removeFromRemoteFS(fs_paths_keeper);
+    }
+}
+
+
+void IDiskRemote::removeSharedFile(const String & path, bool keep_in_remote_fs)
+{
+    RemoteFSPathKeeperPtr fs_paths_keeper = createFSPathKeeper();
+    removeMeta(path, fs_paths_keeper);
+    if (!keep_in_remote_fs)
+        removeFromRemoteFS(fs_paths_keeper);
+}
+
+
+void IDiskRemote::removeSharedRecursive(const String & path, bool keep_in_remote_fs)
+{
+    RemoteFSPathKeeperPtr fs_paths_keeper = createFSPathKeeper();
+    removeMetaRecursive(path, fs_paths_keeper);
+    if (!keep_in_remote_fs)
+        removeFromRemoteFS(fs_paths_keeper);
+}
+
+
+void IDiskRemote::setReadOnly(const String & path)
+{
+    /// We should store read only flag inside metadata file (instead of using FS flag),
+    /// because we modify metadata file when create hard-links from it.
+    auto metadata = readMeta(path);
+    metadata.read_only = true;
+    metadata.save();
+}
+
+
+bool IDiskRemote::isDirectory(const String & path) const
+{
+    return fs::is_directory(fs::path(metadata_path) / path);
+}
+
+
+void IDiskRemote::createDirectory(const String & path)
+{
+    fs::create_directory(fs::path(metadata_path) / path);
+}
+
+
+void IDiskRemote::createDirectories(const String & path)
+{
+    fs::create_directories(fs::path(metadata_path) / path);
+}
+
+
+void IDiskRemote::clearDirectory(const String & path)
+{
+    for (auto it{iterateDirectory(path)}; it->isValid(); it->next())
+        if (isFile(it->path()))
+            removeFile(it->path());
+}
+
+
+void IDiskRemote::removeDirectory(const String & path)
+{
+    fs::remove(fs::path(metadata_path) / path);
+}
+
+
+DiskDirectoryIteratorPtr IDiskRemote::iterateDirectory(const String & path)
+{
+    return std::make_unique<RemoteDiskDirectoryIterator>(metadata_path + path, path);
+}
+
+
+void IDiskRemote::listFiles(const String & path, std::vector<String> & file_names)
+{
+    for (auto it = iterateDirectory(path); it->isValid(); it->next())
+        file_names.push_back(it->name());
+}
+
+
+void IDiskRemote::setLastModified(const String & path, const Poco::Timestamp & timestamp)
+{
+    FS::setModificationTime(fs::path(metadata_path) / path, timestamp.epochTime());
+}
+
+
+Poco::Timestamp IDiskRemote::getLastModified(const String & path)
+{
+    return FS::getModificationTimestamp(fs::path(metadata_path) / path);
+}
+
+
+void IDiskRemote::createHardLink(const String & src_path, const String & dst_path)
+{
+    /// Increment number of references.
+    auto src = readMeta(src_path);
+    ++src.ref_count;
+    src.save();
+
+    /// Create FS hardlink to metadata file.
+    DB::createHardLink(metadata_path + src_path, metadata_path + dst_path);
+}
+
+
+ReservationPtr IDiskRemote::reserve(UInt64 bytes)
+{
+    if (!tryReserve(bytes))
+        return {};
+
+    return std::make_unique<DiskRemoteReservation>(std::static_pointer_cast<IDiskRemote>(shared_from_this()), bytes);
+}
+
+
+bool IDiskRemote::tryReserve(UInt64 bytes)
+{
+    std::lock_guard lock(reservation_mutex);
+    if (bytes == 0)
+    {
+        LOG_DEBUG(log, "Reserving 0 bytes on remote_fs disk {}", backQuote(name));
+        ++reservation_count;
+        return true;
+    }
+
+    auto available_space = getAvailableSpace();
+    UInt64 unreserved_space = available_space - std::min(available_space, reserved_bytes);
+    if (unreserved_space >= bytes)
+    {
+        LOG_DEBUG(log, "Reserving {} on disk {}, having unreserved {}.",
+            ReadableSize(bytes), backQuote(name), ReadableSize(unreserved_space));
+        ++reservation_count;
+        reserved_bytes += bytes;
+        return true;
+    }
+    return false;
+}
+
+}
diff --git a/src/Disks/IDiskRemote.h b/src/Disks/IDiskRemote.h
new file mode 100644
index 00000000000..a90621443e4
--- /dev/null
+++ b/src/Disks/IDiskRemote.h
@@ -0,0 +1,284 @@
+#pragma once
+#include <Common/config.h>
+
+#include <atomic>
+#include "Disks/DiskFactory.h"
+#include "Disks/Executor.h"
+#include <utility>
+#include <Common/MultiVersion.h>
+#include <Common/ThreadPool.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+/// Helper class to collect paths into chunks of maximum size.
+/// For s3 it is Aws::vector<ObjectIdentifier>, for hdfs it is std::vector<std::string>.
+class RemoteFSPathKeeper
+{
+public:
+    RemoteFSPathKeeper(size_t chunk_limit_) : chunk_limit(chunk_limit_) {}
+
+    virtual ~RemoteFSPathKeeper() = default;
+
+    virtual void addPath(const String & path) = 0;
+
+protected:
+    size_t chunk_limit;
+};
+
+using RemoteFSPathKeeperPtr = std::shared_ptr<RemoteFSPathKeeper>;
+
+
+/// Base Disk class for remote FS's, which are not posix-compatible (DiskS3 and DiskHDFS)
+class IDiskRemote : public IDisk
+{
+
+friend class DiskRemoteReservation;
+
+public:
+    IDiskRemote(
+        const String & name_,
+        const String & remote_fs_root_path_,
+        const String & metadata_path_,
+        const String & log_name_,
+        size_t thread_pool_size);
+
+    struct Metadata;
+
+    const String & getName() const final override { return name; }
+
+    const String & getPath() const final override { return metadata_path; }
+
+    Metadata readMeta(const String & path) const;
+
+    Metadata createMeta(const String & path) const;
+
+    Metadata readOrCreateMetaForWriting(const String & path, WriteMode mode);
+
+    UInt64 getTotalSpace() const override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getAvailableSpace() const override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getUnreservedSpace() const override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getKeepingFreeSpace() const override { return 0; }
+
+    bool exists(const String & path) const override;
+
+    bool isFile(const String & path) const override;
+
+    void createFile(const String & path) override;
+
+    size_t getFileSize(const String & path) const override;
+
+    void moveFile(const String & from_path, const String & to_path) override;
+
+    void replaceFile(const String & from_path, const String & to_path) override;
+
+    void removeFile(const String & path) override { removeSharedFile(path, false); }
+
+    void removeFileIfExists(const String & path) override;
+
+    void removeRecursive(const String & path) override { removeSharedRecursive(path, false); }
+
+    void removeSharedFile(const String & path, bool keep_in_remote_fs) override;
+
+    void removeSharedRecursive(const String & path, bool keep_in_remote_fs) override;
+
+    void listFiles(const String & path, std::vector<String> & file_names) override;
+
+    void setReadOnly(const String & path) override;
+
+    bool isDirectory(const String & path) const override;
+
+    void createDirectory(const String & path) override;
+
+    void createDirectories(const String & path) override;
+
+    void clearDirectory(const String & path) override;
+
+    void moveDirectory(const String & from_path, const String & to_path) override { moveFile(from_path, to_path); }
+
+    void removeDirectory(const String & path) override;
+
+    DiskDirectoryIteratorPtr iterateDirectory(const String & path) override;
+
+    void setLastModified(const String & path, const Poco::Timestamp & timestamp) override;
+
+    Poco::Timestamp getLastModified(const String & path) override;
+
+    void createHardLink(const String & src_path, const String & dst_path) override;
+
+    ReservationPtr reserve(UInt64 bytes) override;
+
+    virtual void removeFromRemoteFS(RemoteFSPathKeeperPtr fs_paths_keeper) = 0;
+
+    virtual RemoteFSPathKeeperPtr createFSPathKeeper() const = 0;
+
+protected:
+    Poco::Logger * log;
+    const String name;
+    const String remote_fs_root_path;
+
+    const String metadata_path;
+
+private:
+    void removeMeta(const String & path, RemoteFSPathKeeperPtr fs_paths_keeper);
+
+    void removeMetaRecursive(const String & path, RemoteFSPathKeeperPtr fs_paths_keeper);
+
+    bool tryReserve(UInt64 bytes);
+
+    UInt64 reserved_bytes = 0;
+    UInt64 reservation_count = 0;
+    std::mutex reservation_mutex;
+};
+
+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
+{
+    /// 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;
+
+    /// Flag indicates that file is read only.
+    bool read_only = false;
+
+    /// Load metadata by path or create empty if `create` flag is set.
+    Metadata(const String & remote_fs_root_path_,
+            const String & disk_path_,
+            const String & metadata_file_path_,
+            bool create = false);
+
+    void addObject(const String & path, size_t size);
+
+    /// Fsync metadata file if 'sync' flag is set.
+    void save(bool sync = false);
+
+};
+
+
+class RemoteDiskDirectoryIterator final : public IDiskDirectoryIterator
+{
+public:
+    RemoteDiskDirectoryIterator(const String & full_path, const String & folder_path_) : iter(full_path), folder_path(folder_path_) {}
+
+    void next() override { ++iter; }
+
+    bool isValid() const override { return iter != fs::directory_iterator(); }
+
+    String path() const override
+    {
+        if (fs::is_directory(iter->path()))
+            return folder_path / iter->path().filename().string() / "";
+        else
+            return folder_path / iter->path().filename().string();
+    }
+
+    String name() const override { return iter->path().filename(); }
+
+private:
+    fs::directory_iterator iter;
+    fs::path folder_path;
+};
+
+
+class DiskRemoteReservation final : public IReservation
+{
+public:
+    DiskRemoteReservation(const RemoteDiskPtr & disk_, UInt64 size_)
+        : disk(disk_), size(size_), metric_increment(CurrentMetrics::DiskSpaceReservedForMerge, size_)
+    {
+    }
+
+    UInt64 getSize() const override { return size; }
+
+    DiskPtr getDisk(size_t i) const override;
+
+    Disks getDisks() const override { return {disk}; }
+
+    void update(UInt64 new_size) override;
+
+    ~DiskRemoteReservation() override;
+
+private:
+    RemoteDiskPtr disk;
+    UInt64 size;
+    CurrentMetrics::Increment metric_increment;
+};
+
+
+/// Runs tasks asynchronously using thread pool.
+class AsyncExecutor : public Executor
+{
+public:
+    explicit AsyncExecutor(const String & name_, int thread_pool_size)
+        : name(name_)
+        , pool(ThreadPool(thread_pool_size)) {}
+
+    std::future<void> execute(std::function<void()> task) override
+    {
+        auto promise = std::make_shared<std::promise<void>>();
+        pool.scheduleOrThrowOnError(
+            [promise, task]()
+            {
+                try
+                {
+                    task();
+                    promise->set_value();
+                }
+                catch (...)
+                {
+                    tryLogCurrentException("Failed to run async task");
+
+                    try
+                    {
+                        promise->set_exception(std::current_exception());
+                    }
+                    catch (...) {}
+                }
+            });
+
+        return promise->get_future();
+    }
+
+    void setMaxThreads(size_t threads)
+    {
+        pool.setMaxThreads(threads);
+    }
+
+private:
+    String name;
+    ThreadPool pool;
+};
+
+}
diff --git a/src/Disks/ReadIndirectBufferFromRemoteFS.cpp b/src/Disks/ReadIndirectBufferFromRemoteFS.cpp
new file mode 100644
index 00000000000..6d4764e4392
--- /dev/null
+++ b/src/Disks/ReadIndirectBufferFromRemoteFS.cpp
@@ -0,0 +1,129 @@
+#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 && current_buf->next())
+    {
+        working_buffer = current_buf->buffer();
+        absolute_position += working_buffer.size();
+        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);
+    current_buf->next();
+
+    working_buffer = current_buf->buffer();
+    absolute_position += working_buffer.size();
+
+    return true;
+}
+
+
+#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
new file mode 100644
index 00000000000..f80406b5354
--- /dev/null
+++ b/src/Disks/ReadIndirectBufferFromRemoteFS.h
@@ -0,0 +1,46 @@
+#pragma once
+#include <Common/config.h>
+
+#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:
+    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 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 1de4ab843ac..89c2d20db9f 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -2,32 +2,29 @@
 
 #include "Disks/DiskFactory.h"
 
+#include <bitset>
 #include <random>
-#include <optional>
 #include <utility>
-#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadBufferFromString.h>
+#include <Interpreters/Context.h>
 #include <IO/ReadBufferFromS3.h>
+#include <Disks/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/WriteIndirectBufferFromRemoteFS.h>
 #include <IO/ReadHelpers.h>
 #include <IO/SeekAvoidingReadBuffer.h>
-#include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromS3.h>
 #include <IO/WriteHelpers.h>
-#include <Poco/File.h>
-#include <Common/checkStackSize.h>
 #include <Common/createHardLink.h>
 #include <Common/quoteString.h>
 #include <Common/thread_local_rng.h>
-#include <Common/ThreadPool.h>
-#include <common/logger_useful.h>
-
+#include <Common/checkStackSize.h>
+#include <boost/algorithm/string.hpp>
 #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 <boost/algorithm/string.hpp>
-
 
 namespace DB
 {
@@ -36,40 +33,56 @@ namespace ErrorCodes
 {
     extern const int S3_ERROR;
     extern const int FILE_ALREADY_EXISTS;
-    extern const int CANNOT_SEEK_THROUGH_FILE;
     extern const int UNKNOWN_FORMAT;
-    extern const int INCORRECT_DISK_INDEX;
     extern const int BAD_ARGUMENTS;
-    extern const int PATH_ACCESS_DENIED;
-    extern const int CANNOT_DELETE_DIRECTORY;
     extern const int LOGICAL_ERROR;
 }
 
-
 /// Helper class to collect keys into chunks of maximum size (to prepare batch requests to AWS API)
-class DiskS3::AwsS3KeyKeeper : public std::list<Aws::Vector<Aws::S3::Model::ObjectIdentifier>>
+/// see https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
+class S3PathKeeper : public RemoteFSPathKeeper
 {
 public:
-    void addKey(const String & key);
+    using Chunk = Aws::Vector<Aws::S3::Model::ObjectIdentifier>;
+    using Chunks = std::list<Chunk>;
 
-private:
-    /// limit for one DeleteObject request
-    /// see https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
-    const static size_t chunk_limit = 1000;
-};
+    explicit S3PathKeeper(size_t chunk_limit_) : RemoteFSPathKeeper(chunk_limit_) {}
 
-void DiskS3::AwsS3KeyKeeper::addKey(const String & key)
-{
-    if (empty() || back().size() >= chunk_limit)
-    { /// add one more chunk
-        push_back(value_type());
-        back().reserve(chunk_limit);
+    void addPath(const String & path) override
+    {
+        if (chunks.empty() || chunks.back().size() >= chunk_limit)
+        {
+            /// add one more chunk
+            chunks.push_back(Chunks::value_type());
+            chunks.back().reserve(chunk_limit);
+        }
+        Aws::S3::Model::ObjectIdentifier obj;
+        obj.SetKey(path);
+        chunks.back().push_back(obj);
     }
 
-    Aws::S3::Model::ObjectIdentifier obj;
-    obj.SetKey(key);
-    back().push_back(obj);
-}
+    void removePaths(const std::function<void(Chunk &&)> & remove_chunk_func)
+    {
+        for (auto & chunk : chunks)
+            remove_chunk_func(std::move(chunk));
+    }
+
+    static String getChunkKeys(const Chunk & chunk)
+    {
+        String res;
+        for (const auto & obj : chunk)
+        {
+            const auto & key = obj.GetKey();
+            if (!res.empty())
+                res.append(", ");
+            res.append(key.c_str(), key.size());
+        }
+        return res;
+    }
+
+private:
+    Chunks chunks;
+};
 
 String getRandomName()
 {
@@ -100,547 +113,93 @@ void throwIfError(const Aws::Utils::Outcome<Result, Error> & response)
     }
 }
 
-/**
- * S3 metadata file layout:
- * Number of S3 objects, Total size of all S3 objects.
- * Each S3 object represents path where object located in S3 and size of object.
- */
-struct DiskS3::Metadata
-{
-    /// Metadata file version.
-    static constexpr UInt32 VERSION_ABSOLUTE_PATHS = 1;
-    static constexpr UInt32 VERSION_RELATIVE_PATHS = 2;
-    static constexpr UInt32 VERSION_READ_ONLY_FLAG = 3;
-
-    using PathAndSize = std::pair<String, size_t>;
-
-    /// S3 root path.
-    const String & s3_root_path;
-
-    /// Disk path.
-    const String & disk_path;
-    /// Relative path to metadata file on local FS.
-    String metadata_file_path;
-    /// Total size of all S3 objects.
-    size_t total_size;
-    /// S3 objects paths and their sizes.
-    std::vector<PathAndSize> s3_objects;
-    /// Number of references (hardlinks) to this metadata file.
-    UInt32 ref_count;
-    /// Flag indicates that file is read only.
-    bool read_only = false;
-
-    /// Load metadata by path or create empty if `create` flag is set.
-    explicit Metadata(const String & s3_root_path_, const String & disk_path_, const String & metadata_file_path_, bool create = false)
-        : s3_root_path(s3_root_path_), disk_path(disk_path_), metadata_file_path(metadata_file_path_), total_size(0), s3_objects(0), ref_count(0)
-    {
-        if (create)
-            return;
-
-        try
-        {
-            ReadBufferFromFile buf(disk_path + metadata_file_path, 1024); /* reasonable buffer size for small file */
-
-            UInt32 version;
-            readIntText(version, buf);
-
-            if (version < VERSION_ABSOLUTE_PATHS || version > VERSION_READ_ONLY_FLAG)
-                throw Exception(
-                    "Unknown metadata file version. Path: " + disk_path + metadata_file_path
-                    + " Version: " + std::to_string(version) + ", Maximum expected version: " + std::to_string(VERSION_READ_ONLY_FLAG),
-                    ErrorCodes::UNKNOWN_FORMAT);
-
-            assertChar('\n', buf);
-
-            UInt32 s3_objects_count;
-            readIntText(s3_objects_count, buf);
-            assertChar('\t', buf);
-            readIntText(total_size, buf);
-            assertChar('\n', buf);
-            s3_objects.resize(s3_objects_count);
-            for (UInt32 i = 0; i < s3_objects_count; ++i)
-            {
-                String s3_object_path;
-                size_t s3_object_size;
-                readIntText(s3_object_size, buf);
-                assertChar('\t', buf);
-                readEscapedString(s3_object_path, buf);
-                if (version == VERSION_ABSOLUTE_PATHS)
-                {
-                    if (!boost::algorithm::starts_with(s3_object_path, s3_root_path))
-                        throw Exception(
-                            "Path in metadata does not correspond S3 root path. Path: " + s3_object_path
-                            + ", root path: " + s3_root_path + ", disk path: " + disk_path_,
-                            ErrorCodes::UNKNOWN_FORMAT);
-                    s3_object_path = s3_object_path.substr(s3_root_path.size());
-                }
-                assertChar('\n', buf);
-                s3_objects[i] = {s3_object_path, s3_object_size};
-            }
-
-            readIntText(ref_count, buf);
-            assertChar('\n', buf);
-
-            if (version >= VERSION_READ_ONLY_FLAG)
-            {
-                readBoolText(read_only, buf);
-                assertChar('\n', buf);
-            }
-        }
-        catch (Exception & e)
-        {
-            if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
-                throw;
-
-            throw Exception("Failed to read metadata file", e, ErrorCodes::UNKNOWN_FORMAT);
-        }
-    }
-
-    void addObject(const String & path, size_t size)
-    {
-        total_size += size;
-        s3_objects.emplace_back(path, size);
-    }
-
-    /// Fsync metadata file if 'sync' flag is set.
-    void save(bool sync = false)
-    {
-        WriteBufferFromFile buf(disk_path + metadata_file_path, 1024);
-
-        writeIntText(VERSION_RELATIVE_PATHS, buf);
-        writeChar('\n', buf);
-
-        writeIntText(s3_objects.size(), buf);
-        writeChar('\t', buf);
-        writeIntText(total_size, buf);
-        writeChar('\n', buf);
-        for (const auto & [s3_object_path, s3_object_size] : s3_objects)
-        {
-            writeIntText(s3_object_size, buf);
-            writeChar('\t', buf);
-            writeEscapedString(s3_object_path, buf);
-            writeChar('\n', buf);
-        }
-
-        writeIntText(ref_count, buf);
-        writeChar('\n', buf);
-
-        writeBoolText(read_only, buf);
-        writeChar('\n', buf);
-
-        buf.finalize();
-        if (sync)
-            buf.sync();
-    }
-};
-
-DiskS3::Metadata DiskS3::readMeta(const String & path) const
-{
-    return Metadata(s3_root_path, metadata_path, path);
-}
-
-DiskS3::Metadata DiskS3::createMeta(const String & path) const
-{
-    return Metadata(s3_root_path, metadata_path, path, true);
-}
-
 /// Reads data from S3 using stored paths in metadata.
-class ReadIndirectBufferFromS3 final : public ReadBufferFromFileBase
+class ReadIndirectBufferFromS3 final : public ReadIndirectBufferFromRemoteFS<ReadBufferFromS3>
 {
 public:
     ReadIndirectBufferFromS3(
-        std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, DiskS3::Metadata metadata_, size_t buf_size_)
-        : client_ptr(std::move(client_ptr_)), bucket(bucket_), metadata(std::move(metadata_)), buf_size(buf_size_)
-    {
-    }
-
-    off_t seek(off_t offset_, int whence) override
-    {
-        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;
-    }
-
-    off_t getPosition() override { return absolute_position - available(); }
-
-    std::string getFileName() const override { return metadata.metadata_file_path; }
-
-private:
-    std::unique_ptr<ReadBufferFromS3> initialize()
-    {
-        size_t offset = absolute_position;
-        for (size_t i = 0; i < metadata.s3_objects.size(); ++i)
-        {
-            current_buf_idx = i;
-            const auto & [path, size] = metadata.s3_objects[i];
-            if (size > offset)
-            {
-                auto buf = std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.s3_root_path + path, buf_size);
-                buf->seek(offset, SEEK_SET);
-                return buf;
-            }
-            offset -= size;
-        }
-        return nullptr;
-    }
-
-    bool nextImpl() override
-    {
-        /// 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 && current_buf->next())
-        {
-            working_buffer = current_buf->buffer();
-            absolute_position += working_buffer.size();
-            return true;
-        }
-
-        /// If there is no available buffers - nothing to read.
-        if (current_buf_idx + 1 >= metadata.s3_objects.size())
-            return false;
-
-        ++current_buf_idx;
-        const auto & path = metadata.s3_objects[current_buf_idx].first;
-        current_buf = std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.s3_root_path + path, buf_size);
-        current_buf->next();
-        working_buffer = current_buf->buffer();
-        absolute_position += working_buffer.size();
-
-        return true;
-    }
-
-    std::shared_ptr<Aws::S3::S3Client> client_ptr;
-    const String & bucket;
-    DiskS3::Metadata metadata;
-    size_t buf_size;
-
-    size_t absolute_position = 0;
-    size_t current_buf_idx = 0;
-    std::unique_ptr<ReadBufferFromS3> current_buf;
-};
-
-/// Stores data in S3 and adds the object key (S3 path) and object size to metadata file on local FS.
-class WriteIndirectBufferFromS3 final : public WriteBufferFromFileBase
-{
-public:
-    WriteIndirectBufferFromS3(
-        std::shared_ptr<Aws::S3::S3Client> & client_ptr_,
+        std::shared_ptr<Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         DiskS3::Metadata metadata_,
-        const String & s3_path_,
-        std::optional<DiskS3::ObjectMetadata> object_metadata_,
-        size_t min_upload_part_size,
-        size_t max_single_part_upload_size,
+        size_t s3_max_single_read_retries_,
         size_t buf_size_)
-        : WriteBufferFromFileBase(buf_size_, nullptr, 0)
-        , impl(WriteBufferFromS3(client_ptr_, bucket_, metadata_.s3_root_path + s3_path_, min_upload_part_size, max_single_part_upload_size,std::move(object_metadata_), buf_size_))
-        , metadata(std::move(metadata_))
-        , s3_path(s3_path_)
+        : ReadIndirectBufferFromRemoteFS<ReadBufferFromS3>(metadata_)
+        , client_ptr(std::move(client_ptr_))
+        , bucket(bucket_)
+        , s3_max_single_read_retries(s3_max_single_read_retries_)
+        , buf_size(buf_size_)
     {
     }
 
-    ~WriteIndirectBufferFromS3() override
+    std::unique_ptr<ReadBufferFromS3> createReadBuffer(const String & path) override
     {
-        try
-        {
-            finalize();
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-
-    void finalize() override
-    {
-        if (finalized)
-            return;
-
-        next();
-        impl.finalize();
-
-        metadata.addObject(s3_path, count());
-        metadata.save();
-
-        finalized = true;
-    }
-
-    void sync() override
-    {
-        if (finalized)
-            metadata.save(true);
-    }
-
-    std::string getFileName() const override { return metadata.metadata_file_path; }
-
-private:
-    void nextImpl() override
-    {
-        /// Transfer current working buffer to WriteBufferFromS3.
-        impl.swap(*this);
-
-        /// Write actual data to S3.
-        impl.next();
-
-        /// Return back working buffer.
-        impl.swap(*this);
-    }
-
-    WriteBufferFromS3 impl;
-    bool finalized = false;
-    DiskS3::Metadata metadata;
-    String s3_path;
-};
-
-
-class DiskS3DirectoryIterator final : public IDiskDirectoryIterator
-{
-public:
-    DiskS3DirectoryIterator(const String & full_path, const String & folder_path_) : iter(full_path), folder_path(folder_path_) {}
-
-    void next() override { ++iter; }
-
-    bool isValid() const override { return iter != Poco::DirectoryIterator(); }
-
-    String path() const override
-    {
-        if (iter->isDirectory())
-            return folder_path + iter.name() + '/';
-        else
-            return folder_path + iter.name();
-    }
-
-    String name() const override { return iter.name(); }
-
-private:
-    Poco::DirectoryIterator iter;
-    String folder_path;
-};
-
-
-using DiskS3Ptr = std::shared_ptr<DiskS3>;
-
-class DiskS3Reservation final : public IReservation
-{
-public:
-    DiskS3Reservation(const DiskS3Ptr & disk_, UInt64 size_)
-        : disk(disk_), size(size_), metric_increment(CurrentMetrics::DiskSpaceReservedForMerge, size_)
-    {
-    }
-
-    UInt64 getSize() const override { return size; }
-
-    DiskPtr getDisk(size_t i) const override
-    {
-        if (i != 0)
-        {
-            throw Exception("Can't use i != 0 with single disk reservation", ErrorCodes::INCORRECT_DISK_INDEX);
-        }
-        return disk;
-    }
-
-    Disks getDisks() const override { return {disk}; }
-
-    void update(UInt64 new_size) override
-    {
-        std::lock_guard lock(disk->reservation_mutex);
-        disk->reserved_bytes -= size;
-        size = new_size;
-        disk->reserved_bytes += size;
-    }
-
-    ~DiskS3Reservation() override
-    {
-        try
-        {
-            std::lock_guard lock(disk->reservation_mutex);
-            if (disk->reserved_bytes < size)
-            {
-                disk->reserved_bytes = 0;
-                LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservations size for disk '{}'.", disk->getName());
-            }
-            else
-            {
-                disk->reserved_bytes -= size;
-            }
-
-            if (disk->reservation_count == 0)
-                LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservation count for disk '{}'.", disk->getName());
-            else
-                --disk->reservation_count;
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
+        return std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.remote_fs_root_path + path, s3_max_single_read_retries, buf_size);
     }
 
 private:
-    DiskS3Ptr disk;
-    UInt64 size;
-    CurrentMetrics::Increment metric_increment;
+    std::shared_ptr<Aws::S3::S3Client> client_ptr;
+    const String & bucket;
+    size_t s3_max_single_read_retries;
+    size_t buf_size;
 };
 
-/// Runs tasks asynchronously using thread pool.
-class AsyncExecutor : public Executor
-{
-public:
-    explicit AsyncExecutor(int thread_pool_size) : pool(ThreadPool(thread_pool_size)) { }
-
-    std::future<void> execute(std::function<void()> task) override
-    {
-        auto promise = std::make_shared<std::promise<void>>();
-
-        pool.scheduleOrThrowOnError(
-            [promise, task]()
-            {
-                try
-                {
-                    task();
-                    promise->set_value();
-                }
-                catch (...)
-                {
-                    tryLogCurrentException(&Poco::Logger::get("DiskS3"), "Failed to run async task");
-
-                    try
-                    {
-                        promise->set_exception(std::current_exception());
-                    } catch (...) { }
-                }
-            });
-
-        return promise->get_future();
-    }
-
-private:
-    ThreadPool pool;
-};
-
-
 DiskS3::DiskS3(
     String name_,
-    std::shared_ptr<Aws::S3::S3Client> client_,
-    std::shared_ptr<S3::ProxyConfiguration> proxy_configuration_,
     String bucket_,
     String s3_root_path_,
     String metadata_path_,
-    size_t min_upload_part_size_,
-    size_t max_single_part_upload_size_,
-    size_t min_bytes_for_seek_,
-    bool send_metadata_,
-    int thread_pool_size_,
-    int list_object_keys_size_)
-    : IDisk(std::make_unique<AsyncExecutor>(thread_pool_size_))
-    , name(std::move(name_))
-    , client(std::move(client_))
-    , proxy_configuration(std::move(proxy_configuration_))
+    SettingsPtr settings_,
+    GetDiskSettings settings_getter_)
+    : IDiskRemote(name_, s3_root_path_, metadata_path_, "DiskS3", settings_->thread_pool_size)
     , bucket(std::move(bucket_))
-    , s3_root_path(std::move(s3_root_path_))
-    , metadata_path(std::move(metadata_path_))
-    , min_upload_part_size(min_upload_part_size_)
-    , max_single_part_upload_size(max_single_part_upload_size_)
-    , min_bytes_for_seek(min_bytes_for_seek_)
-    , send_metadata(send_metadata_)
-    , revision_counter(0)
-    , list_object_keys_size(list_object_keys_size_)
+    , current_settings(std::move(settings_))
+    , settings_getter(settings_getter_)
 {
 }
 
-ReservationPtr DiskS3::reserve(UInt64 bytes)
-{
-    if (!tryReserve(bytes))
-        return {};
-    return std::make_unique<DiskS3Reservation>(std::static_pointer_cast<DiskS3>(shared_from_this()), bytes);
-}
-
-bool DiskS3::exists(const String & path) const
-{
-    return Poco::File(metadata_path + path).exists();
-}
-
-bool DiskS3::isFile(const String & path) const
-{
-    return Poco::File(metadata_path + path).isFile();
-}
-
-bool DiskS3::isDirectory(const String & path) const
-{
-    return Poco::File(metadata_path + path).isDirectory();
-}
-
-size_t DiskS3::getFileSize(const String & path) const
-{
-    auto metadata = readMeta(path);
-    return metadata.total_size;
-}
-
-void DiskS3::createDirectory(const String & path)
-{
-    Poco::File(metadata_path + path).createDirectory();
-}
-
-void DiskS3::createDirectories(const String & path)
-{
-    Poco::File(metadata_path + path).createDirectories();
-}
-
 String DiskS3::getUniqueId(const String & path) const
 {
-    Metadata metadata(s3_root_path, metadata_path, path);
+    Metadata metadata(remote_fs_root_path, metadata_path, path);
     String id;
-    if (!metadata.s3_objects.empty())
-        id = metadata.s3_root_path + metadata.s3_objects[0].first;
+    if (!metadata.remote_fs_objects.empty())
+        id = metadata.remote_fs_root_path + metadata.remote_fs_objects[0].first;
     return id;
 }
 
-DiskDirectoryIteratorPtr DiskS3::iterateDirectory(const String & path)
+RemoteFSPathKeeperPtr DiskS3::createFSPathKeeper() const
 {
-    return std::make_unique<DiskS3DirectoryIterator>(metadata_path + path, path);
+    auto settings = current_settings.get();
+    return std::make_shared<S3PathKeeper>(settings->objects_chunk_size_to_delete);
 }
 
-void DiskS3::clearDirectory(const String & path)
+void DiskS3::removeFromRemoteFS(RemoteFSPathKeeperPtr fs_paths_keeper)
 {
-    for (auto it{iterateDirectory(path)}; it->isValid(); it->next())
-        if (isFile(it->path()))
-            removeFile(it->path());
+    auto settings = current_settings.get();
+    auto * s3_paths_keeper = dynamic_cast<S3PathKeeper *>(fs_paths_keeper.get());
+
+    if (s3_paths_keeper)
+        s3_paths_keeper->removePaths([&](S3PathKeeper::Chunk && chunk)
+        {
+            LOG_DEBUG(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.
+            Aws::S3::Model::DeleteObjectsRequest request;
+            request.SetBucket(bucket);
+            request.SetDelete(delkeys);
+            auto outcome = settings->client->DeleteObjects(request);
+            throwIfError(outcome);
+        });
 }
 
 void DiskS3::moveFile(const String & from_path, const String & to_path)
+{
+    auto settings = current_settings.get();
+
+    moveFile(from_path, to_path, settings->send_metadata);
+}
+
+void DiskS3::moveFile(const String & from_path, const String & to_path, bool send_metadata)
 {
     if (exists(to_path))
         throw Exception("File already exists: " + to_path, ErrorCodes::FILE_ALREADY_EXISTS);
@@ -655,44 +214,31 @@ void DiskS3::moveFile(const String & from_path, const String & to_path)
         createFileOperationObject("rename", revision, object_metadata);
     }
 
-    Poco::File(metadata_path + from_path).renameTo(metadata_path + to_path);
-}
-
-void DiskS3::replaceFile(const String & from_path, const String & to_path)
-{
-    if (exists(to_path))
-    {
-        const String tmp_path = to_path + ".old";
-        moveFile(to_path, tmp_path);
-        moveFile(from_path, to_path);
-        removeFile(tmp_path);
-    }
-    else
-        moveFile(from_path, to_path);
+    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
 {
+    auto settings = current_settings.get();
     auto metadata = readMeta(path);
 
-    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Read from file by path: {}. Existing S3 objects: {}",
-        backQuote(metadata_path + path), metadata.s3_objects.size());
+    LOG_DEBUG(log, "Read from file by path: {}. Existing S3 objects: {}",
+        backQuote(metadata_path + path), metadata.remote_fs_objects.size());
 
-    auto reader = std::make_unique<ReadIndirectBufferFromS3>(client, bucket, metadata, buf_size);
-    return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), min_bytes_for_seek);
+    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);
 }
 
 std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path, size_t buf_size, WriteMode mode)
 {
-    bool exist = exists(path);
-    if (exist && readMeta(path).read_only)
-        throw Exception("File is read-only: " + path, ErrorCodes::PATH_ACCESS_DENIED);
+    auto settings = current_settings.get();
+    auto metadata = readOrCreateMetaForWriting(path, mode);
 
     /// Path to store new S3 object.
     auto s3_path = getRandomName();
 
     std::optional<ObjectMetadata> object_metadata;
-    if (send_metadata)
+    if (settings->send_metadata)
     {
         auto revision = ++revision_counter;
         object_metadata = {
@@ -701,186 +247,28 @@ std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path,
         s3_path = "r" + revisionToString(revision) + "-file-" + s3_path;
     }
 
-    if (!exist || mode == WriteMode::Rewrite)
-    {
-        /// If metadata file exists - remove and create new.
-        if (exist)
-            removeFile(path);
+    LOG_DEBUG(log, "{} to file by path: {}. S3 path: {}",
+              mode == WriteMode::Rewrite ? "Write" : "Append", backQuote(metadata_path + path), remote_fs_root_path + s3_path);
 
-        auto metadata = createMeta(path);
-        /// Save empty metadata to disk to have ability to get file size while buffer is not finalized.
-        metadata.save();
+    auto s3_buffer = std::make_unique<WriteBufferFromS3>(
+        settings->client,
+        bucket,
+        metadata.remote_fs_root_path + s3_path,
+        settings->s3_min_upload_part_size,
+        settings->s3_max_single_part_upload_size,
+        std::move(object_metadata),
+        buf_size);
 
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Write to file by path: {}. New S3 path: {}", backQuote(metadata_path + path), s3_root_path + s3_path);
-
-        return std::make_unique<WriteIndirectBufferFromS3>(
-            client, bucket, metadata, s3_path, object_metadata, min_upload_part_size, max_single_part_upload_size, buf_size);
-    }
-    else
-    {
-        auto metadata = readMeta(path);
-
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Append to file by path: {}. New S3 path: {}. Existing S3 objects: {}.",
-            backQuote(metadata_path + path), s3_root_path + s3_path, metadata.s3_objects.size());
-
-        return std::make_unique<WriteIndirectBufferFromS3>(
-            client, bucket, metadata, s3_path, object_metadata, min_upload_part_size, max_single_part_upload_size, buf_size);
-    }
-}
-
-void DiskS3::removeMeta(const String & path, AwsS3KeyKeeper & keys)
-{
-    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Remove file by path: {}", backQuote(metadata_path + path));
-
-    Poco::File file(metadata_path + path);
-
-    if (!file.isFile())
-        throw Exception(ErrorCodes::CANNOT_DELETE_DIRECTORY, "Path '{}' is a directory", path);
-
-    try
-    {
-        auto metadata = readMeta(path);
-
-        /// If there is no references - delete content from S3.
-        if (metadata.ref_count == 0)
-        {
-            file.remove();
-
-            for (const auto & [s3_object_path, _] : metadata.s3_objects)
-                keys.addKey(s3_root_path + s3_object_path);
-        }
-        else /// In other case decrement number of references, save metadata and delete file.
-        {
-            --metadata.ref_count;
-            metadata.save();
-            file.remove();
-        }
-    }
-    catch (const Exception & e)
-    {
-        /// If it's impossible to read meta - just remove it from FS.
-        if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
-        {
-            LOG_WARNING(
-                &Poco::Logger::get("DiskS3"),
-                "Metadata file {} can't be read by reason: {}. Removing it forcibly.",
-                backQuote(path),
-                e.nested() ? e.nested()->message() : e.message());
-
-            file.remove();
-        }
-        else
-            throw;
-    }
-}
-
-void DiskS3::removeMetaRecursive(const String & path, AwsS3KeyKeeper & keys)
-{
-    checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
-
-    Poco::File file(metadata_path + path);
-    if (file.isFile())
-    {
-        removeMeta(path, keys);
-    }
-    else
-    {
-        for (auto it{iterateDirectory(path)}; it->isValid(); it->next())
-            removeMetaRecursive(it->path(), keys);
-        file.remove();
-    }
-}
-
-void DiskS3::removeAws(const AwsS3KeyKeeper & keys)
-{
-    if (!keys.empty())
-    {
-        for (const auto & chunk : keys)
-        {
-            Aws::S3::Model::Delete delkeys;
-            delkeys.SetObjects(chunk);
-
-            /// TODO: Make operation idempotent. Do not throw exception if key is already deleted.
-            Aws::S3::Model::DeleteObjectsRequest request;
-            request.SetBucket(bucket);
-            request.SetDelete(delkeys);
-            auto outcome = client->DeleteObjects(request);
-            throwIfError(outcome);
-        }
-    }
-}
-
-void DiskS3::removeFileIfExists(const String & path)
-{
-    AwsS3KeyKeeper keys;
-    if (Poco::File(metadata_path + path).exists())
-    {
-        removeMeta(path, keys);
-        removeAws(keys);
-    }
-}
-
-void DiskS3::removeDirectory(const String & path)
-{
-    Poco::File(metadata_path + path).remove();
-}
-
-void DiskS3::removeSharedFile(const String & path, bool keep_s3)
-{
-    AwsS3KeyKeeper keys;
-    removeMeta(path, keys);
-    if (!keep_s3)
-        removeAws(keys);
-}
-
-void DiskS3::removeSharedRecursive(const String & path, bool keep_s3)
-{
-    AwsS3KeyKeeper keys;
-    removeMetaRecursive(path, keys);
-    if (!keep_s3)
-        removeAws(keys);
-}
-
-bool DiskS3::tryReserve(UInt64 bytes)
-{
-    std::lock_guard lock(reservation_mutex);
-    if (bytes == 0)
-    {
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Reserving 0 bytes on s3 disk {}", backQuote(name));
-        ++reservation_count;
-        return true;
-    }
-
-    auto available_space = getAvailableSpace();
-    UInt64 unreserved_space = available_space - std::min(available_space, reserved_bytes);
-    if (unreserved_space >= bytes)
-    {
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Reserving {} on disk {}, having unreserved {}.",
-            ReadableSize(bytes), backQuote(name), ReadableSize(unreserved_space));
-        ++reservation_count;
-        reserved_bytes += bytes;
-        return true;
-    }
-    return false;
-}
-
-void DiskS3::listFiles(const String & path, std::vector<String> & file_names)
-{
-    for (auto it = iterateDirectory(path); it->isValid(); it->next())
-        file_names.push_back(it->name());
-}
-
-void DiskS3::setLastModified(const String & path, const Poco::Timestamp & timestamp)
-{
-    Poco::File(metadata_path + path).setLastModified(timestamp);
-}
-
-Poco::Timestamp DiskS3::getLastModified(const String & path)
-{
-    return Poco::File(metadata_path + path).getLastModified();
+    return std::make_unique<WriteIndirectBufferFromRemoteFS<WriteBufferFromS3>>(std::move(s3_buffer), std::move(metadata), s3_path);
 }
 
 void DiskS3::createHardLink(const String & src_path, const String & dst_path)
+{
+    auto settings = current_settings.get();
+    createHardLink(src_path, dst_path, settings->send_metadata);
+}
+
+void DiskS3::createHardLink(const String & src_path, const String & dst_path, bool send_metadata)
 {
     /// We don't need to record hardlinks created to shadow folder.
     if (send_metadata && !dst_path.starts_with("shadow/"))
@@ -902,78 +290,71 @@ void DiskS3::createHardLink(const String & src_path, const String & dst_path)
     DB::createHardLink(metadata_path + src_path, metadata_path + dst_path);
 }
 
-void DiskS3::createFile(const String & path)
-{
-    /// Create empty metadata file.
-    auto metadata = createMeta(path);
-    metadata.save();
-}
-
-void DiskS3::setReadOnly(const String & path)
-{
-    /// We should store read only flag inside metadata file (instead of using FS flag),
-    /// because we modify metadata file when create hard-links from it.
-    auto metadata = readMeta(path);
-    metadata.read_only = true;
-    metadata.save();
-}
-
 void DiskS3::shutdown()
 {
+    auto settings = current_settings.get();
     /// This call stops any next retry attempts for ongoing S3 requests.
     /// If S3 request is failed and the method below is executed S3 client immediately returns the last failed S3 request outcome.
     /// If S3 is healthy nothing wrong will be happened and S3 requests will be processed in a regular way without errors.
     /// This should significantly speed up shutdown process if S3 is unhealthy.
-    client->DisableRequestProcessing();
+    settings->client->DisableRequestProcessing();
 }
 
 void DiskS3::createFileOperationObject(const String & operation_name, UInt64 revision, const DiskS3::ObjectMetadata & metadata)
 {
+    auto settings = current_settings.get();
     const String key = "operations/r" + revisionToString(revision) + "-" + operation_name;
-    WriteBufferFromS3 buffer(client, bucket, s3_root_path + key, min_upload_part_size, max_single_part_upload_size, metadata);
+    WriteBufferFromS3 buffer(
+        settings->client,
+        bucket,
+        remote_fs_root_path + key,
+        settings->s3_min_upload_part_size,
+        settings->s3_max_single_part_upload_size,
+        metadata);
+
     buffer.write('0');
     buffer.finalize();
 }
 
 void DiskS3::startup()
 {
-    if (!send_metadata)
+    auto settings = current_settings.get();
+
+    if (!settings->send_metadata)
         return;
 
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting up disk {}", name);
+    LOG_INFO(log, "Starting up disk {}", name);
 
-    if (readSchemaVersion(bucket, s3_root_path) < RESTORABLE_SCHEMA_VERSION)
+    restore();
+
+    if (readSchemaVersion(bucket, remote_fs_root_path) < RESTORABLE_SCHEMA_VERSION)
         migrateToRestorableSchema();
 
     findLastRevision();
 
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Disk {} started up", name);
+    LOG_INFO(log, "Disk {} started up", name);
 }
 
 void DiskS3::findLastRevision()
 {
-    UInt64 l = 0, r = LATEST_REVISION;
-    while (l < r)
+    /// Construct revision number from high to low bits.
+    String revision;
+    revision.reserve(64);
+    for (int bit = 0; bit < 64; bit++)
     {
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Check revision in bounds {}-{}", l, r);
+        auto revision_prefix = revision + "1";
 
-        auto revision = l + (r - l + 1) / 2;
-        if (revision == 0)
-            break;
+        LOG_DEBUG(log, "Check object exists with revision prefix {}", revision_prefix);
 
-        auto revision_str = revisionToString(revision);
-
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Check object with revision {}", revision);
-
-        /// Check file or operation with such revision exists.
-        if (checkObjectExists(bucket, s3_root_path + "r" + revision_str)
-            || checkObjectExists(bucket, s3_root_path + "operations/r" + revision_str))
-            l = revision;
+        /// Check file or operation with such revision prefix exists.
+        if (checkObjectExists(bucket, remote_fs_root_path + "r" + revision_prefix)
+            || checkObjectExists(bucket, remote_fs_root_path + "operations/r" + revision_prefix))
+            revision += "1";
         else
-            r = revision - 1;
+            revision += "0";
     }
-    revision_counter = l;
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Found last revision number {} for disk {}", revision_counter, name);
+    revision_counter = static_cast<UInt64>(std::bitset<64>(revision).to_ullong());
+    LOG_INFO(log, "Found last revision number {} for disk {}", revision_counter, name);
 }
 
 int DiskS3::readSchemaVersion(const String & source_bucket, const String & source_path)
@@ -982,7 +363,13 @@ int DiskS3::readSchemaVersion(const String & source_bucket, const String & sourc
     if (!checkObjectExists(source_bucket, source_path + SCHEMA_VERSION_OBJECT))
         return version;
 
-    ReadBufferFromS3 buffer (client, source_bucket, source_path + SCHEMA_VERSION_OBJECT);
+    auto settings = current_settings.get();
+    ReadBufferFromS3 buffer(
+        settings->client,
+        source_bucket,
+        source_path + SCHEMA_VERSION_OBJECT,
+        settings->s3_max_single_read_retries);
+
     readIntText(version, buffer);
 
     return version;
@@ -990,13 +377,22 @@ int DiskS3::readSchemaVersion(const String & source_bucket, const String & sourc
 
 void DiskS3::saveSchemaVersion(const int & version)
 {
-    WriteBufferFromS3 buffer (client, bucket, s3_root_path + SCHEMA_VERSION_OBJECT, min_upload_part_size, max_single_part_upload_size);
+    auto settings = current_settings.get();
+
+    WriteBufferFromS3 buffer(
+        settings->client,
+        bucket,
+        remote_fs_root_path + SCHEMA_VERSION_OBJECT,
+        settings->s3_min_upload_part_size,
+        settings->s3_max_single_part_upload_size);
+
     writeIntText(version, buffer);
     buffer.finalize();
 }
 
 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);
@@ -1004,22 +400,22 @@ void DiskS3::updateObjectMetadata(const String & key, const ObjectMetadata & met
     request.SetMetadata(metadata);
     request.SetMetadataDirective(Aws::S3::Model::MetadataDirective::REPLACE);
 
-    auto outcome = client->CopyObject(request);
+    auto outcome = settings->client->CopyObject(request);
     throwIfError(outcome);
 }
 
 void DiskS3::migrateFileToRestorableSchema(const String & path)
 {
-    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Migrate file {} to restorable schema", metadata_path + path);
+    LOG_DEBUG(log, "Migrate file {} to restorable schema", metadata_path + path);
 
     auto meta = readMeta(path);
 
-    for (const auto & [key, _] : meta.s3_objects)
+    for (const auto & [key, _] : meta.remote_fs_objects)
     {
         ObjectMetadata metadata {
             {"path", path}
         };
-        updateObjectMetadata(s3_root_path + key, metadata);
+        updateObjectMetadata(remote_fs_root_path + key, metadata);
     }
 }
 
@@ -1027,7 +423,7 @@ void DiskS3::migrateToRestorableSchemaRecursive(const String & path, Futures & r
 {
     checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
 
-    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Migrate directory {} to restorable schema", metadata_path + path);
+    LOG_DEBUG(log, "Migrate directory {} to restorable schema", metadata_path + path);
 
     bool dir_contains_only_files = true;
     for (auto it = iterateDirectory(path); it->isValid(); it->next())
@@ -1070,7 +466,7 @@ void DiskS3::migrateToRestorableSchema()
 {
     try
     {
-        LOG_INFO(&Poco::Logger::get("DiskS3"), "Start migration to restorable schema for disk {}", name);
+        LOG_INFO(log, "Start migration to restorable schema for disk {}", name);
 
         Futures results;
 
@@ -1085,22 +481,23 @@ void DiskS3::migrateToRestorableSchema()
 
         saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
     }
-    catch (const Exception & e)
+    catch (const Exception &)
     {
-        LOG_ERROR(&Poco::Logger::get("DiskS3"), "Failed to migrate to restorable schema. Code: {}, e.displayText() = {}, Stack trace:\n\n{}", e.code(), e.displayText(), e.getStackTraceString());
+        tryLogCurrentException(log, fmt::format("Failed to migrate to restorable schema for disk {}", name));
 
         throw;
     }
 }
 
-bool DiskS3::checkObjectExists(const String & source_bucket, const String & prefix)
+bool DiskS3::checkObjectExists(const String & source_bucket, const String & prefix) const
 {
+    auto settings = current_settings.get();
     Aws::S3::Model::ListObjectsV2Request request;
     request.SetBucket(source_bucket);
     request.SetPrefix(prefix);
     request.SetMaxKeys(1);
 
-    auto outcome = client->ListObjectsV2(request);
+    auto outcome = settings->client->ListObjectsV2(request);
     throwIfError(outcome);
 
     return !outcome.GetResult().GetContents().empty();
@@ -1108,12 +505,13 @@ bool DiskS3::checkObjectExists(const String & source_bucket, const String & pref
 
 bool DiskS3::checkUniqueId(const String & id) const
 {
+    auto settings = current_settings.get();
     /// Check that we have right s3 and have access rights
     /// Actually interprets id as s3 object name and checks if it exists
     Aws::S3::Model::ListObjectsV2Request request;
     request.SetBucket(bucket);
     request.SetPrefix(id);
-    auto resp = client->ListObjectsV2(request);
+    auto resp = settings->client->ListObjectsV2(request);
     throwIfError(resp);
     Aws::Vector<Aws::S3::Model::Object> object_list = resp.GetResult().GetContents();
 
@@ -1123,29 +521,31 @@ bool DiskS3::checkUniqueId(const String & id) const
     return false;
 }
 
-Aws::S3::Model::HeadObjectResult DiskS3::headObject(const String & source_bucket, const String & key)
+Aws::S3::Model::HeadObjectResult DiskS3::headObject(const String & source_bucket, const String & key) const
 {
+    auto settings = current_settings.get();
     Aws::S3::Model::HeadObjectRequest request;
     request.SetBucket(source_bucket);
     request.SetKey(key);
 
-    auto outcome = client->HeadObject(request);
+    auto outcome = settings->client->HeadObject(request);
     throwIfError(outcome);
 
     return outcome.GetResultWithOwnership();
 }
 
-void DiskS3::listObjects(const String & source_bucket, const String & source_path, std::function<bool(const Aws::S3::Model::ListObjectsV2Result &)> callback)
+void DiskS3::listObjects(const String & source_bucket, const String & source_path, std::function<bool(const Aws::S3::Model::ListObjectsV2Result &)> callback) const
 {
+    auto settings = current_settings.get();
     Aws::S3::Model::ListObjectsV2Request request;
     request.SetBucket(source_bucket);
     request.SetPrefix(source_path);
-    request.SetMaxKeys(list_object_keys_size);
+    request.SetMaxKeys(settings->list_object_keys_size);
 
     Aws::S3::Model::ListObjectsV2Outcome outcome;
     do
     {
-        outcome = client->ListObjectsV2(request);
+        outcome = settings->client->ListObjectsV2(request);
         throwIfError(outcome);
 
         bool should_continue = callback(outcome.GetResult());
@@ -1157,14 +557,15 @@ 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)
+void DiskS3::copyObject(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key) 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);
 
-    auto outcome = client->CopyObject(request);
+    auto outcome = settings->client->CopyObject(request);
     throwIfError(outcome);
 }
 
@@ -1173,6 +574,7 @@ struct DiskS3::RestoreInformation
     UInt64 revision = LATEST_REVISION;
     String source_bucket;
     String source_path;
+    bool detached = false;
 };
 
 void DiskS3::readRestoreInformation(DiskS3::RestoreInformation & restore_information)
@@ -1180,33 +582,50 @@ void DiskS3::readRestoreInformation(DiskS3::RestoreInformation & restore_informa
     ReadBufferFromFile buffer(metadata_path + RESTORE_FILE_NAME, 512);
     buffer.next();
 
-    /// Empty file - just restore all metadata.
-    if (!buffer.hasPendingData())
-        return;
-
     try
     {
-        readIntText(restore_information.revision, buffer);
-        assertChar('\n', buffer);
+        std::map<String, String> properties;
 
-        if (!buffer.hasPendingData())
-            return;
+        while (buffer.hasPendingData())
+        {
+            String property;
+            readText(property, buffer);
+            assertChar('\n', buffer);
 
-        readText(restore_information.source_bucket, buffer);
-        assertChar('\n', buffer);
+            auto pos = property.find('=');
+            if (pos == String::npos || pos == 0 || pos == property.length())
+                throw Exception(fmt::format("Invalid property {} in restore file", property), ErrorCodes::UNKNOWN_FORMAT);
 
-        if (!buffer.hasPendingData())
-            return;
+            auto key = property.substr(0, pos);
+            auto value = property.substr(pos + 1);
 
-        readText(restore_information.source_path, buffer);
-        assertChar('\n', buffer);
+            auto it = properties.find(key);
+            if (it != properties.end())
+                throw Exception(fmt::format("Property key duplication {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
 
-        if (buffer.hasPendingData())
-            throw Exception("Extra information at the end of restore file", ErrorCodes::UNKNOWN_FORMAT);
+            properties[key] = value;
+        }
+
+        for (const auto & [key, value] : properties)
+        {
+            ReadBufferFromString value_buffer (value);
+
+            if (key == "revision")
+                readIntText(restore_information.revision, value_buffer);
+            else if (key == "source_bucket")
+                readText(restore_information.source_bucket, value_buffer);
+            else if (key == "source_path")
+                readText(restore_information.source_path, value_buffer);
+            else if (key == "detached")
+                readBoolTextWord(restore_information.detached, value_buffer);
+            else
+                throw Exception(fmt::format("Unknown key {} in restore file", key), ErrorCodes::UNKNOWN_FORMAT);
+        }
     }
-    catch (const Exception & e)
+    catch (const Exception &)
     {
-        throw Exception("Failed to read restore information", e, ErrorCodes::UNKNOWN_FORMAT);
+        tryLogCurrentException(log, "Failed to read restore information");
+        throw;
     }
 }
 
@@ -1219,7 +638,7 @@ void DiskS3::restore()
     {
         RestoreInformation information;
         information.source_bucket = bucket;
-        information.source_path = s3_root_path;
+        information.source_path = remote_fs_root_path;
 
         readRestoreInformation(information);
         if (information.revision == 0)
@@ -1231,51 +650,51 @@ void DiskS3::restore()
         {
             /// In this case we need to additionally cleanup S3 from objects with later revision.
             /// Will be simply just restore to different path.
-            if (information.source_path == s3_root_path && information.revision != LATEST_REVISION)
+            if (information.source_path == remote_fs_root_path && information.revision != LATEST_REVISION)
                 throw Exception("Restoring to the same bucket and path is allowed if revision is latest (0)", ErrorCodes::BAD_ARGUMENTS);
 
             /// This case complicates S3 cleanup in case of unsuccessful restore.
-            if (information.source_path != s3_root_path && s3_root_path.starts_with(information.source_path))
+            if (information.source_path != remote_fs_root_path && remote_fs_root_path.starts_with(information.source_path))
                 throw Exception("Restoring to the same bucket is allowed only if source path is not a sub-path of configured path in S3 disk", ErrorCodes::BAD_ARGUMENTS);
         }
 
+        LOG_INFO(log, "Starting to restore disk {}. Revision: {}, Source bucket: {}, Source path: {}",
+                 name, information.revision, information.source_bucket, information.source_path);
+
         if (readSchemaVersion(information.source_bucket, information.source_path) < RESTORABLE_SCHEMA_VERSION)
             throw Exception("Source bucket doesn't have restorable schema.", ErrorCodes::BAD_ARGUMENTS);
 
-        LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting to restore disk {}. Revision: {}, Source bucket: {}, Source path: {}",
-                 name, information.revision, information.source_bucket, information.source_path);
+        LOG_INFO(log, "Removing old metadata...");
 
-        LOG_INFO(&Poco::Logger::get("DiskS3"), "Removing old metadata...");
-
-        bool cleanup_s3 = information.source_bucket != bucket || information.source_path != s3_root_path;
+        bool cleanup_s3 = information.source_bucket != bucket || information.source_path != remote_fs_root_path;
         for (const auto & root : data_roots)
             if (exists(root))
                 removeSharedRecursive(root + '/', !cleanup_s3);
 
-        restoreFiles(information.source_bucket, information.source_path, information.revision);
-        restoreFileOperations(information.source_bucket, information.source_path, information.revision);
+        restoreFiles(information);
+        restoreFileOperations(information);
 
-        Poco::File restore_file(metadata_path + RESTORE_FILE_NAME);
-        restore_file.remove();
+        fs::path restore_file = fs::path(metadata_path) / RESTORE_FILE_NAME;
+        fs::remove(restore_file);
 
         saveSchemaVersion(RESTORABLE_SCHEMA_VERSION);
 
-        LOG_INFO(&Poco::Logger::get("DiskS3"), "Restore disk {} finished", name);
+        LOG_INFO(log, "Restore disk {} finished", name);
     }
-    catch (const Exception & e)
+    catch (const Exception &)
     {
-        LOG_ERROR(&Poco::Logger::get("DiskS3"), "Failed to restore disk. Code: {}, e.displayText() = {}, Stack trace:\n\n{}", e.code(), e.displayText(), e.getStackTraceString());
+        tryLogCurrentException(log, fmt::format("Failed to restore disk {}", name));
 
         throw;
     }
 }
 
-void DiskS3::restoreFiles(const String & source_bucket, const String & source_path, UInt64 target_revision)
+void DiskS3::restoreFiles(const RestoreInformation & restore_information)
 {
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting restore files for disk {}", name);
+    LOG_INFO(log, "Starting restore files for disk {}", name);
 
     std::vector<std::future<void>> results;
-    listObjects(source_bucket, source_path, [this, &source_bucket, &source_path, &target_revision, &results](auto list_result)
+    auto restore_files = [this, &restore_information, &results](auto list_result)
     {
         std::vector<String> keys;
         for (const auto & row : list_result.GetContents())
@@ -1288,7 +707,7 @@ void DiskS3::restoreFiles(const String & source_bucket, const String & source_pa
 
             const auto [revision, _] = extractRevisionAndOperationFromKey(key);
             /// Filter early if it's possible to get revision from key.
-            if (revision > target_revision)
+            if (revision > restore_information.revision)
                 continue;
 
             keys.push_back(key);
@@ -1296,23 +715,26 @@ void DiskS3::restoreFiles(const String & source_bucket, const String & source_pa
 
         if (!keys.empty())
         {
-            auto result = getExecutor().execute([this, &source_bucket, &source_path, keys]()
+            auto result = getExecutor().execute([this, &restore_information, keys]()
             {
-                processRestoreFiles(source_bucket, source_path, keys);
+                processRestoreFiles(restore_information.source_bucket, restore_information.source_path, keys);
             });
 
             results.push_back(std::move(result));
         }
 
         return true;
-    });
+    };
+
+    /// Execute.
+    listObjects(restore_information.source_bucket, restore_information.source_path, restore_files);
 
     for (auto & result : results)
         result.wait();
     for (auto & result : results)
         result.get();
 
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Files are restored for disk {}", name);
+    LOG_INFO(log, "Files are restored for disk {}", name);
 }
 
 void DiskS3::processRestoreFiles(const String & source_bucket, const String & source_path, Strings keys)
@@ -1327,7 +749,7 @@ void DiskS3::processRestoreFiles(const String & source_bucket, const String & so
         if (path_entry == object_metadata.end())
         {
             /// Such keys can remain after migration, we can skip them.
-            LOG_WARNING(&Poco::Logger::get("DiskS3"), "Skip key {} because it doesn't have 'path' in metadata", key);
+            LOG_WARNING(log, "Skip key {} because it doesn't have 'path' in metadata", key);
             continue;
         }
 
@@ -1338,24 +760,27 @@ void DiskS3::processRestoreFiles(const String & source_bucket, const String & so
         auto relative_key = shrinkKey(source_path, key);
 
         /// Copy object if we restore to different bucket / path.
-        if (bucket != source_bucket || s3_root_path != source_path)
-            copyObject(source_bucket, key, bucket, s3_root_path + relative_key);
+        if (bucket != source_bucket || remote_fs_root_path != source_path)
+            copyObject(source_bucket, key, bucket, remote_fs_root_path + relative_key);
 
         metadata.addObject(relative_key, head_result.GetContentLength());
         metadata.save();
 
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Restored file {}", path);
+        LOG_DEBUG(log, "Restored file {}", path);
     }
 }
 
-void DiskS3::restoreFileOperations(const String & source_bucket, const String & source_path, UInt64 target_revision)
+void DiskS3::restoreFileOperations(const RestoreInformation & restore_information)
 {
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "Starting restore file operations for disk {}", name);
+    auto settings = current_settings.get();
+
+    LOG_INFO(log, "Starting restore file operations for disk {}", name);
 
     /// Enable recording file operations if we restore to different bucket / path.
-    send_metadata = bucket != source_bucket || s3_root_path != source_path;
+    bool send_metadata = bucket != restore_information.source_bucket || remote_fs_root_path != restore_information.source_path;
 
-    listObjects(source_bucket, source_path + "operations/", [this, &source_bucket, &target_revision](auto list_result)
+    std::set<String> renames;
+    auto restore_file_operations = [this, &restore_information, &renames, &send_metadata](auto list_result)
     {
         const String rename = "rename";
         const String hardlink = "hardlink";
@@ -1367,28 +792,44 @@ void DiskS3::restoreFileOperations(const String & source_bucket, const String &
             const auto [revision, operation] = extractRevisionAndOperationFromKey(key);
             if (revision == UNKNOWN_REVISION)
             {
-                LOG_WARNING(&Poco::Logger::get("DiskS3"), "Skip key {} with unknown revision", key);
+                LOG_WARNING(log, "Skip key {} with unknown revision", key);
                 continue;
             }
 
             /// S3 ensures that keys will be listed in ascending UTF-8 bytes order (revision order).
             /// We can stop processing if revision of the object is already more than required.
-            if (revision > target_revision)
+            if (revision > restore_information.revision)
                 return false;
 
             /// Keep original revision if restore to different bucket / path.
             if (send_metadata)
                 revision_counter = revision - 1;
 
-            auto object_metadata = headObject(source_bucket, key).GetMetadata();
+            auto object_metadata = headObject(restore_information.source_bucket, key).GetMetadata();
             if (operation == rename)
             {
                 auto from_path = object_metadata["from_path"];
                 auto to_path = object_metadata["to_path"];
                 if (exists(from_path))
                 {
-                    moveFile(from_path, to_path);
-                    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
+                    moveFile(from_path, to_path, send_metadata);
+                    LOG_DEBUG(log, "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
+
+                    if (restore_information.detached && isDirectory(to_path))
+                    {
+                        /// Sometimes directory paths are passed without trailing '/'. We should keep them in one consistent way.
+                        if (!from_path.ends_with('/'))
+                            from_path += '/';
+                        if (!to_path.ends_with('/'))
+                            to_path += '/';
+
+                        /// Always keep latest actual directory path to avoid 'detaching' not existing paths.
+                        auto it = renames.find(from_path);
+                        if (it != renames.end())
+                            renames.erase(it);
+
+                        renames.insert(to_path);
+                    }
                 }
             }
             else if (operation == hardlink)
@@ -1398,28 +839,62 @@ void DiskS3::restoreFileOperations(const String & source_bucket, const String &
                 if (exists(src_path))
                 {
                     createDirectories(directoryPath(dst_path));
-                    createHardLink(src_path, dst_path);
-                    LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
+                    createHardLink(src_path, dst_path, send_metadata);
+                    LOG_DEBUG(log, "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
                 }
             }
         }
 
         return true;
-    });
+    };
 
-    send_metadata = true;
+    /// Execute.
+    listObjects(restore_information.source_bucket, restore_information.source_path + "operations/", restore_file_operations);
 
-    LOG_INFO(&Poco::Logger::get("DiskS3"), "File operations restored for disk {}", name);
+    if (restore_information.detached)
+    {
+        Strings not_finished_prefixes{"tmp_", "delete_tmp_", "attaching_", "deleting_"};
+
+        for (const auto & path : renames)
+        {
+            /// Skip already detached parts.
+            if (path.find("/detached/") != std::string::npos)
+                continue;
+
+            /// Skip not finished parts. They shouldn't be in 'detached' directory, because CH wouldn't be able to finish processing them.
+            fs::path directory_path(path);
+            auto directory_name = directory_path.parent_path().filename().string();
+
+            auto predicate = [&directory_name](String & prefix) { return directory_name.starts_with(prefix); };
+            if (std::any_of(not_finished_prefixes.begin(), not_finished_prefixes.end(), predicate))
+                continue;
+
+            auto detached_path = pathToDetached(path);
+
+            LOG_DEBUG(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;
+            if (path.ends_with('/'))
+                to_path /= from_path.parent_path().filename();
+            else
+                to_path /= from_path.filename();
+            fs::copy(from_path, to_path, fs::copy_options::recursive | fs::copy_options::overwrite_existing);
+            fs::remove_all(from_path);
+        }
+    }
+
+    LOG_INFO(log, "File operations restored for disk {}", name);
 }
 
 std::tuple<UInt64, String> DiskS3::extractRevisionAndOperationFromKey(const String & key)
 {
-    UInt64 revision = UNKNOWN_REVISION;
+    String revision_str;
     String operation;
 
-    re2::RE2::FullMatch(key, key_regexp, &revision, &operation);
+    re2::RE2::FullMatch(key, key_regexp, &revision_str, &operation);
 
-    return {revision, operation};
+    return {(revision_str.empty() ? UNKNOWN_REVISION : static_cast<UInt64>(std::bitset<64>(revision_str).to_ullong())), operation};
 }
 
 String DiskS3::shrinkKey(const String & path, const String & key)
@@ -1432,15 +907,14 @@ String DiskS3::shrinkKey(const String & path, const String & key)
 
 String DiskS3::revisionToString(UInt64 revision)
 {
-    static constexpr size_t max_digits = 19; /// UInt64 max digits in decimal representation.
+    return std::bitset<64>(revision).to_string();
+}
 
-    /// Align revision number with leading zeroes to have strict lexicographical order of them.
-    auto revision_str = std::to_string(revision);
-    auto digits_to_align = max_digits - revision_str.length();
-    for (size_t i = 0; i < digits_to_align; ++i)
-        revision_str = "0" + revision_str;
-
-    return revision_str;
+String DiskS3::pathToDetached(const String & source_path)
+{
+    if (source_path.ends_with('/'))
+        return fs::path(source_path).parent_path().parent_path() / "detached/";
+    return fs::path(source_path).parent_path() / "detached/";
 }
 
 void DiskS3::onFreeze(const String & path)
@@ -1451,4 +925,36 @@ void DiskS3::onFreeze(const String & path)
     revision_file_buf.finalize();
 }
 
+void DiskS3::applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextConstPtr context)
+{
+    auto new_settings = settings_getter(config, "storage_configuration.disks." + name, context);
+
+    current_settings.set(std::move(new_settings));
+
+    if (AsyncExecutor * exec = dynamic_cast<AsyncExecutor*>(&getExecutor()))
+        exec->setMaxThreads(current_settings.get()->thread_pool_size);
+}
+
+DiskS3Settings::DiskS3Settings(
+    const std::shared_ptr<Aws::S3::S3Client> & client_,
+    size_t s3_max_single_read_retries_,
+    size_t s3_min_upload_part_size_,
+    size_t s3_max_single_part_upload_size_,
+    size_t min_bytes_for_seek_,
+    bool send_metadata_,
+    int thread_pool_size_,
+    int list_object_keys_size_,
+    int objects_chunk_size_to_delete_)
+    : client(client_)
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
+    , s3_min_upload_part_size(s3_min_upload_part_size_)
+    , s3_max_single_part_upload_size(s3_max_single_part_upload_size_)
+    , min_bytes_for_seek(min_bytes_for_seek_)
+    , send_metadata(send_metadata_)
+    , thread_pool_size(thread_pool_size_)
+    , list_object_keys_size(list_object_keys_size_)
+    , objects_chunk_size_to_delete(objects_chunk_size_to_delete_)
+{
+}
+
 }
diff --git a/src/Disks/S3/DiskS3.h b/src/Disks/S3/DiskS3.h
index 87aab71fc44..8857a00d709 100644
--- a/src/Disks/S3/DiskS3.h
+++ b/src/Disks/S3/DiskS3.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <atomic>
+#include <common/logger_useful.h>
 #include "Disks/DiskFactory.h"
 #include "Disks/Executor.h"
-#include "ProxyConfiguration.h"
 
 #include <aws/s3/S3Client.h>
 #include <aws/s3/model/HeadObjectResult.h>
@@ -11,79 +11,61 @@
 
 #include <Poco/DirectoryIterator.h>
 #include <re2/re2.h>
+#include <Disks/IDiskRemote.h>
 
 
 namespace DB
 {
 
+/// Settings for DiskS3 that can be changed in runtime.
+struct DiskS3Settings
+{
+    DiskS3Settings(
+        const std::shared_ptr<Aws::S3::S3Client> & client_,
+        size_t s3_max_single_read_retries_,
+        size_t s3_min_upload_part_size_,
+        size_t s3_max_single_part_upload_size_,
+        size_t min_bytes_for_seek_,
+        bool send_metadata_,
+        int thread_pool_size_,
+        int list_object_keys_size_,
+        int objects_chunk_size_to_delete_);
+
+    std::shared_ptr<Aws::S3::S3Client> client;
+    size_t s3_max_single_read_retries;
+    size_t s3_min_upload_part_size;
+    size_t s3_max_single_part_upload_size;
+    size_t min_bytes_for_seek;
+    bool send_metadata;
+    int thread_pool_size;
+    int list_object_keys_size;
+    int objects_chunk_size_to_delete;
+};
+
+
 /**
  * Storage for persisting data in S3 and metadata on the local disk.
  * Files are represented by file in local filesystem (clickhouse_root/disks/disk_name/path/to/file)
  * that contains S3 object key with actual data.
  */
-class DiskS3 : public IDisk
+class DiskS3 final : public IDiskRemote
 {
 public:
     using ObjectMetadata = std::map<std::string, std::string>;
     using Futures = std::vector<std::future<void>>;
 
-    friend class DiskS3Reservation;
+    using SettingsPtr = std::unique_ptr<DiskS3Settings>;
+    using GetDiskSettings = std::function<SettingsPtr(const Poco::Util::AbstractConfiguration &, const String, ContextConstPtr)>;
 
-    class AwsS3KeyKeeper;
-    struct Metadata;
     struct RestoreInformation;
 
     DiskS3(
         String name_,
-        std::shared_ptr<Aws::S3::S3Client> client_,
-        std::shared_ptr<S3::ProxyConfiguration> proxy_configuration_,
         String bucket_,
         String s3_root_path_,
         String metadata_path_,
-        size_t min_upload_part_size_,
-        size_t max_single_part_upload_size_,
-        size_t min_bytes_for_seek_,
-        bool send_metadata_,
-        int thread_pool_size_,
-        int list_object_keys_size_);
-
-    const String & getName() const override { return name; }
-
-    const String & getPath() const override { return metadata_path; }
-
-    ReservationPtr reserve(UInt64 bytes) override;
-
-    UInt64 getTotalSpace() const override { return std::numeric_limits<UInt64>::max(); }
-
-    UInt64 getAvailableSpace() const override { return std::numeric_limits<UInt64>::max(); }
-
-    UInt64 getUnreservedSpace() const override { return std::numeric_limits<UInt64>::max(); }
-
-    UInt64 getKeepingFreeSpace() const override { return 0; }
-
-    bool exists(const String & path) const override;
-
-    bool isFile(const String & path) const override;
-
-    bool isDirectory(const String & path) const override;
-
-    size_t getFileSize(const String & path) const override;
-
-    void createDirectory(const String & path) override;
-
-    void createDirectories(const String & path) override;
-
-    void clearDirectory(const String & path) override;
-
-    void moveDirectory(const String & from_path, const String & to_path) override { moveFile(from_path, to_path); }
-
-    DiskDirectoryIteratorPtr iterateDirectory(const String & path) override;
-
-    void moveFile(const String & from_path, const String & to_path) override;
-
-    void replaceFile(const String & from_path, const String & to_path) override;
-
-    void listFiles(const String & path, std::vector<String> & file_names) override;
+        SettingsPtr settings_,
+        GetDiskSettings settings_getter_);
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
@@ -98,28 +80,22 @@ public:
         size_t buf_size,
         WriteMode mode) override;
 
-    void removeFile(const String & path) override { removeSharedFile(path, false); }
-    void removeFileIfExists(const String & path) override;
-    void removeDirectory(const String & path) override;
-    void removeRecursive(const String & path) override { removeSharedRecursive(path, false); }
+    void removeFromRemoteFS(RemoteFSPathKeeperPtr keeper) override;
 
-    void removeSharedFile(const String & path, bool keep_s3) override;
-    void removeSharedRecursive(const String & path, bool keep_s3) override;
+    RemoteFSPathKeeperPtr createFSPathKeeper() const override;
+
+    void moveFile(const String & from_path, const String & to_path, bool send_metadata);
+    void moveFile(const String & from_path, const String & to_path) override;
 
     void createHardLink(const String & src_path, const String & dst_path) override;
-
-    void setLastModified(const String & path, const Poco::Timestamp & timestamp) override;
-
-    Poco::Timestamp getLastModified(const String & path) override;
-
-    void createFile(const String & path) override;
-
-    void setReadOnly(const String & path) override;
+    void createHardLink(const String & src_path, const String & dst_path, bool send_metadata);
 
     DiskType::Type getType() const override { return DiskType::Type::S3; }
 
     void shutdown() override;
 
+    void startup() override;
+
     /// Return some uniq string for file
     /// Required for distinguish different copies of the same part on S3
     String getUniqueId(const String & path) const override;
@@ -128,29 +104,17 @@ public:
     /// Required for S3 to ensure that replica has access to data wroten by other node
     bool checkUniqueId(const String & id) const override;
 
-    /// Actions performed after disk creation.
-    void startup();
-
-    /// Restore S3 metadata files on file system.
-    void restore();
-
     /// Dumps current revision counter into file 'revision.txt' at given path.
     void onFreeze(const String & path) override;
 
+    void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextConstPtr context) override;
+
 private:
-    bool tryReserve(UInt64 bytes);
-
-    void removeMeta(const String & path, AwsS3KeyKeeper & keys);
-    void removeMetaRecursive(const String & path, AwsS3KeyKeeper & keys);
-    void removeAws(const AwsS3KeyKeeper & keys);
-
-    Metadata readMeta(const String & path) const;
-    Metadata createMeta(const String & path) const;
-
     void createFileOperationObject(const String & operation_name, UInt64 revision, const ObjectMetadata & metadata);
+    /// Converts revision to binary string with leading zeroes (64 bit).
     static String revisionToString(UInt64 revision);
 
-    bool checkObjectExists(const String & source_bucket, const String & prefix);
+    bool checkObjectExists(const String & source_bucket, const String & prefix) const;
     void findLastRevision();
 
     int readSchemaVersion(const String & source_bucket, const String & source_path);
@@ -160,43 +124,37 @@ private:
     void migrateToRestorableSchemaRecursive(const String & path, Futures & results);
     void migrateToRestorableSchema();
 
-    Aws::S3::Model::HeadObjectResult headObject(const String & source_bucket, const String & key);
-    void listObjects(const String & source_bucket, const String & source_path, std::function<bool(const Aws::S3::Model::ListObjectsV2Result &)> callback);
-    void copyObject(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key);
+    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;
 
+    /// Restore S3 metadata files on file system.
+    void restore();
     void readRestoreInformation(RestoreInformation & restore_information);
-    void restoreFiles(const String & source_bucket, const String & source_path, UInt64 target_revision);
+    void restoreFiles(const RestoreInformation & restore_information);
     void processRestoreFiles(const String & source_bucket, const String & source_path, std::vector<String> keys);
-    void restoreFileOperations(const String & source_bucket, const String & source_path, UInt64 target_revision);
+    void restoreFileOperations(const RestoreInformation & restore_information);
 
     /// Remove 'path' prefix from 'key' to get relative key.
     /// It's needed to store keys to metadata files in RELATIVE_PATHS version.
     static String shrinkKey(const String & path, const String & key);
     std::tuple<UInt64, String> extractRevisionAndOperationFromKey(const String & key);
 
-    const String name;
-    std::shared_ptr<Aws::S3::S3Client> client;
-    std::shared_ptr<S3::ProxyConfiguration> proxy_configuration;
+    /// Forms detached path '../../detached/part_name/' from '../../part_name/'
+    static String pathToDetached(const String & source_path);
+
     const String bucket;
-    const String s3_root_path;
-    String metadata_path;
-    size_t min_upload_part_size;
-    size_t max_single_part_upload_size;
-    size_t min_bytes_for_seek;
-    bool send_metadata;
 
-    UInt64 reserved_bytes = 0;
-    UInt64 reservation_count = 0;
-    std::mutex reservation_mutex;
+    MultiVersion<DiskS3Settings> current_settings;
+    /// Gets disk settings from context.
+    GetDiskSettings settings_getter;
 
-    std::atomic<UInt64> revision_counter;
+    std::atomic<UInt64> revision_counter = 0;
     static constexpr UInt64 LATEST_REVISION = std::numeric_limits<UInt64>::max();
     static constexpr UInt64 UNKNOWN_REVISION = 0;
 
     /// File at path {metadata_path}/restore contains metadata restore information
     inline static const String RESTORE_FILE_NAME = "restore";
-    /// The number of keys listed in one request (1000 is max value)
-    int list_object_keys_size;
 
     /// Key has format: ../../r{revision}-{operation}
     const re2::RE2 key_regexp {".*/r(\\d+)-(\\w+).*"};
diff --git a/src/Disks/S3/registerDiskS3.cpp b/src/Disks/S3/registerDiskS3.cpp
index 3ce2f909760..21eff5f3d31 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/S3/registerDiskS3.cpp
@@ -1,9 +1,17 @@
-#include <aws/core/client/DefaultRetryStrategy.h>
+#if !defined(ARCADIA_BUILD)
+    #include <Common/config.h>
+#endif
+
 #include <IO/ReadHelpers.h>
-#include <IO/S3Common.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <common/logger_useful.h>
+
+
+#if USE_AWS_S3
+
+#include <aws/core/client/DefaultRetryStrategy.h>
+#include <IO/S3Common.h>
 #include "DiskS3.h"
 #include "Disks/DiskCacheWrapper.h"
 #include "Disks/DiskFactory.h"
@@ -11,6 +19,7 @@
 #include "ProxyConfiguration.h"
 #include "ProxyListConfiguration.h"
 #include "ProxyResolverConfiguration.h"
+#include "Disks/DiskRestartProxy.h"
 
 
 namespace DB
@@ -23,84 +32,134 @@ namespace ErrorCodes
 
 namespace
 {
-    void checkWriteAccess(IDisk & disk)
-    {
-        auto file = disk.writeFile("test_acl", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
-        file->write("test", 4);
-    }
+void checkWriteAccess(IDisk & disk)
+{
+    auto file = disk.writeFile("test_acl", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
+    file->write("test", 4);
+}
 
-    void checkReadAccess(const String & disk_name, IDisk & disk)
-    {
-        auto file = disk.readFile("test_acl", DBMS_DEFAULT_BUFFER_SIZE);
-        String buf(4, '0');
-        file->readStrict(buf.data(), 4);
-        if (buf != "test")
-            throw Exception("No read access to S3 bucket in disk " + disk_name, ErrorCodes::PATH_ACCESS_DENIED);
-    }
+void checkReadAccess(const String & disk_name, IDisk & disk)
+{
+    auto file = disk.readFile("test_acl", DBMS_DEFAULT_BUFFER_SIZE);
+    String buf(4, '0');
+    file->readStrict(buf.data(), 4);
+    if (buf != "test")
+        throw Exception("No read access to S3 bucket in disk " + disk_name, ErrorCodes::PATH_ACCESS_DENIED);
+}
 
-    void checkRemoveAccess(IDisk & disk) { disk.removeFile("test_acl"); }
+void checkRemoveAccess(IDisk & disk) { disk.removeFile("test_acl"); }
 
-    std::shared_ptr<S3::ProxyResolverConfiguration> getProxyResolverConfiguration(
-        const String & prefix, const Poco::Util::AbstractConfiguration & proxy_resolver_config)
-    {
-        auto endpoint = Poco::URI(proxy_resolver_config.getString(prefix + ".endpoint"));
-        auto proxy_scheme = proxy_resolver_config.getString(prefix + ".proxy_scheme");
-        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");
+std::shared_ptr<S3::ProxyResolverConfiguration> getProxyResolverConfiguration(
+    const String & prefix, const Poco::Util::AbstractConfiguration & proxy_resolver_config)
+{
+    auto endpoint = Poco::URI(proxy_resolver_config.getString(prefix + ".endpoint"));
+    auto proxy_scheme = proxy_resolver_config.getString(prefix + ".proxy_scheme");
+    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");
 
-        LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Configured proxy resolver: {}, Scheme: {}, Port: {}",
-            endpoint.toString(), proxy_scheme, proxy_port);
+    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);
+}
 
-    std::shared_ptr<S3::ProxyListConfiguration> getProxyListConfiguration(
-        const String & prefix, const Poco::Util::AbstractConfiguration & proxy_config)
-    {
-        std::vector<String> keys;
-        proxy_config.keys(prefix, keys);
+std::shared_ptr<S3::ProxyListConfiguration> getProxyListConfiguration(
+    const String & prefix, const Poco::Util::AbstractConfiguration & proxy_config)
+{
+    std::vector<String> keys;
+    proxy_config.keys(prefix, keys);
 
-        std::vector<Poco::URI> proxies;
-        for (const auto & key : keys)
-            if (startsWith(key, "uri"))
-            {
-                Poco::URI proxy_uri(proxy_config.getString(prefix + "." + key));
-
-                if (proxy_uri.getScheme() != "http" && proxy_uri.getScheme() != "https")
-                    throw Exception("Only HTTP/HTTPS schemas allowed in proxy uri: " + proxy_uri.toString(), ErrorCodes::BAD_ARGUMENTS);
-                if (proxy_uri.getHost().empty())
-                    throw Exception("Empty host in proxy uri: " + proxy_uri.toString(), ErrorCodes::BAD_ARGUMENTS);
-
-                proxies.push_back(proxy_uri);
-
-                LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Configured proxy: {}", proxy_uri.toString());
-            }
-
-        if (!proxies.empty())
-            return std::make_shared<S3::ProxyListConfiguration>(proxies);
-
-        return nullptr;
-    }
-
-    std::shared_ptr<S3::ProxyConfiguration> getProxyConfiguration(const String & prefix, const Poco::Util::AbstractConfiguration & config)
-    {
-        if (!config.has(prefix + ".proxy"))
-            return nullptr;
-
-        std::vector<String> config_keys;
-        config.keys(prefix + ".proxy", config_keys);
-
-        if (auto resolver_configs = std::count(config_keys.begin(), config_keys.end(), "resolver"))
+    std::vector<Poco::URI> proxies;
+    for (const auto & key : keys)
+        if (startsWith(key, "uri"))
         {
-            if (resolver_configs > 1)
-                throw Exception("Multiple proxy resolver configurations aren't allowed", ErrorCodes::BAD_ARGUMENTS);
+            Poco::URI proxy_uri(proxy_config.getString(prefix + "." + key));
 
-            return getProxyResolverConfiguration(prefix + ".proxy.resolver", config);
+            if (proxy_uri.getScheme() != "http" && proxy_uri.getScheme() != "https")
+                throw Exception("Only HTTP/HTTPS schemas allowed in proxy uri: " + proxy_uri.toString(), ErrorCodes::BAD_ARGUMENTS);
+            if (proxy_uri.getHost().empty())
+                throw Exception("Empty host in proxy uri: " + proxy_uri.toString(), ErrorCodes::BAD_ARGUMENTS);
+
+            proxies.push_back(proxy_uri);
+
+            LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Configured proxy: {}", proxy_uri.toString());
         }
 
-        return getProxyListConfiguration(prefix + ".proxy", config);
+    if (!proxies.empty())
+        return std::make_shared<S3::ProxyListConfiguration>(proxies);
+
+    return nullptr;
+}
+
+std::shared_ptr<S3::ProxyConfiguration> getProxyConfiguration(const String & prefix, const Poco::Util::AbstractConfiguration & config)
+{
+    if (!config.has(prefix + ".proxy"))
+        return nullptr;
+
+    std::vector<String> config_keys;
+    config.keys(prefix + ".proxy", config_keys);
+
+    if (auto resolver_configs = std::count(config_keys.begin(), config_keys.end(), "resolver"))
+    {
+        if (resolver_configs > 1)
+            throw Exception("Multiple proxy resolver configurations aren't allowed", ErrorCodes::BAD_ARGUMENTS);
+
+        return getProxyResolverConfiguration(prefix + ".proxy.resolver", config);
     }
+
+    return getProxyListConfiguration(prefix + ".proxy", config);
+}
+
+std::shared_ptr<Aws::S3::S3Client>
+getClient(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextConstPtr context)
+{
+    S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
+        config.getString(config_prefix + ".region", ""),
+        context->getRemoteHostFilter(), context->getGlobalContext()->getSettingsRef().s3_max_redirects);
+
+    S3::URI uri(Poco::URI(config.getString(config_prefix + ".endpoint")));
+    if (uri.key.back() != '/')
+        throw Exception("S3 path must ends with '/', but '" + uri.key + "' doesn't.", ErrorCodes::BAD_ARGUMENTS);
+
+    client_configuration.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 10000);
+    client_configuration.requestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 5000);
+    client_configuration.maxConnections = config.getUInt(config_prefix + ".max_connections", 100);
+    client_configuration.endpointOverride = uri.endpoint;
+
+    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.retryStrategy
+        = std::make_shared<Aws::Client::DefaultRetryStrategy>(config.getUInt(config_prefix + ".retry_attempts", 10));
+
+    return S3::ClientFactory::instance().create(
+        client_configuration,
+        uri.is_virtual_hosted_style,
+        config.getString(config_prefix + ".access_key_id", ""),
+        config.getString(config_prefix + ".secret_access_key", ""),
+        config.getString(config_prefix + ".server_side_encryption_customer_key_base64", ""),
+        {},
+        config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", false)),
+        config.getBool(config_prefix + ".use_insecure_imds_request", config.getBool("s3.use_insecure_imds_request", false)));
+}
+
+std::unique_ptr<DiskS3Settings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextConstPtr context)
+{
+    return std::make_unique<DiskS3Settings>(
+        getClient(config, config_prefix, context),
+        config.getUInt64(config_prefix + ".s3_max_single_read_retries", context->getSettingsRef().s3_max_single_read_retries),
+        config.getUInt64(config_prefix + ".s3_min_upload_part_size", context->getSettingsRef().s3_min_upload_part_size),
+        config.getUInt64(config_prefix + ".s3_max_single_part_upload_size", context->getSettingsRef().s3_max_single_part_upload_size),
+        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
+        config.getBool(config_prefix + ".send_metadata", false),
+        config.getInt(config_prefix + ".thread_pool_size", 16),
+        config.getInt(config_prefix + ".list_object_keys_size", 1000),
+        config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000));
+}
+
 }
 
 
@@ -109,55 +168,21 @@ void registerDiskS3(DiskFactory & factory)
     auto creator = [](const String & name,
                       const Poco::Util::AbstractConfiguration & config,
                       const String & config_prefix,
-                      const Context & context) -> DiskPtr {
-        Poco::File disk{context.getPath() + "disks/" + name};
-        disk.createDirectories();
-
-        S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
-            context.getRemoteHostFilter(),
-            context.getGlobalContext().getSettingsRef().s3_max_redirects);
-
+                      ContextConstPtr context) -> DiskPtr {
         S3::URI uri(Poco::URI(config.getString(config_prefix + ".endpoint")));
         if (uri.key.back() != '/')
             throw Exception("S3 path must ends with '/', but '" + uri.key + "' doesn't.", ErrorCodes::BAD_ARGUMENTS);
 
-        client_configuration.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", 10000);
-        client_configuration.httpRequestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", 5000);
-        client_configuration.maxConnections = config.getUInt(config_prefix + ".max_connections", 100);
-        client_configuration.endpointOverride = uri.endpoint;
+        String metadata_path = config.getString(config_prefix + ".metadata_path", context->getPath() + "disks/" + name + "/");
+        fs::create_directories(metadata_path);
 
-        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.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(
-            config.getUInt(config_prefix + ".retry_attempts", 10));
-
-        auto client = S3::ClientFactory::instance().create(
-            client_configuration,
-            uri.is_virtual_hosted_style,
-            config.getString(config_prefix + ".access_key_id", ""),
-            config.getString(config_prefix + ".secret_access_key", ""),
-            config.getString(config_prefix + ".server_side_encryption_customer_key_base64", ""),
-            {},
-            config.getBool(config_prefix + ".use_environment_credentials", config.getBool("s3.use_environment_credentials", false))
-        );
-
-        String metadata_path = config.getString(config_prefix + ".metadata_path", context.getPath() + "disks/" + name + "/");
-
-        auto s3disk = std::make_shared<DiskS3>(
+        std::shared_ptr<IDisk> s3disk = std::make_shared<DiskS3>(
             name,
-            client,
-            proxy_config,
             uri.bucket,
             uri.key,
             metadata_path,
-            context.getSettingsRef().s3_min_upload_part_size,
-            context.getSettingsRef().s3_max_single_part_upload_size,
-            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-            config.getBool(config_prefix + ".send_metadata", false),
-            config.getInt(config_prefix + ".thread_pool_size", 16),
-            config.getInt(config_prefix + ".list_object_keys_size", 1000));
+            getSettings(config, config_prefix, context),
+            getSettings);
 
         /// This code is used only to check access to the corresponding disk.
         if (!config.getBool(config_prefix + ".skip_access_check", false))
@@ -167,14 +192,13 @@ void registerDiskS3(DiskFactory & factory)
             checkRemoveAccess(*s3disk);
         }
 
-        s3disk->restore();
         s3disk->startup();
 
         bool cache_enabled = config.getBool(config_prefix + ".cache_enabled", true);
 
         if (cache_enabled)
         {
-            String cache_path = config.getString(config_prefix + ".cache_path", context.getPath() + "disks/" + name + "/cache/");
+            String cache_path = config.getString(config_prefix + ".cache_path", context->getPath() + "disks/" + name + "/cache/");
 
             if (metadata_path == cache_path)
                 throw Exception("Metadata and cache path should be different: " + metadata_path, ErrorCodes::BAD_ARGUMENTS);
@@ -187,12 +211,18 @@ void registerDiskS3(DiskFactory & factory)
                        || path.ends_with("txt") || path.ends_with("dat");
             };
 
-            return std::make_shared<DiskCacheWrapper>(s3disk, cache_disk, cache_file_predicate);
+            s3disk = std::make_shared<DiskCacheWrapper>(s3disk, cache_disk, cache_file_predicate);
         }
 
-        return s3disk;
+        return std::make_shared<DiskRestartProxy>(s3disk);
     };
     factory.registerDiskType("s3", creator);
 }
 
 }
+
+#else
+
+void registerDiskS3(DiskFactory &) {}
+
+#endif
diff --git a/src/Disks/StoragePolicy.cpp b/src/Disks/StoragePolicy.cpp
index cff2685ca24..efedff9929f 100644
--- a/src/Disks/StoragePolicy.cpp
+++ b/src/Disks/StoragePolicy.cpp
@@ -8,8 +8,6 @@
 
 #include <set>
 
-#include <Poco/File.h>
-
 
 namespace
 {
diff --git a/src/Disks/WriteIndirectBufferFromRemoteFS.cpp b/src/Disks/WriteIndirectBufferFromRemoteFS.cpp
new file mode 100644
index 00000000000..6951b9fa92e
--- /dev/null
+++ b/src/Disks/WriteIndirectBufferFromRemoteFS.cpp
@@ -0,0 +1,70 @@
+#include "WriteIndirectBufferFromRemoteFS.h"
+
+#if USE_AWS_S3 || USE_HDFS
+#include <IO/WriteBufferFromS3.h>
+#include <Storages/HDFS/WriteBufferFromHDFS.h>
+
+
+namespace DB
+{
+
+template <typename T>
+WriteIndirectBufferFromRemoteFS<T>::WriteIndirectBufferFromRemoteFS(
+    std::unique_ptr<T> impl_,
+    IDiskRemote::Metadata metadata_,
+    const String & remote_fs_path_)
+    : WriteBufferFromFileDecorator(std::move(impl_))
+    , metadata(std::move(metadata_))
+    , remote_fs_path(remote_fs_path_)
+{
+}
+
+
+template <typename T>
+WriteIndirectBufferFromRemoteFS<T>::~WriteIndirectBufferFromRemoteFS()
+{
+    try
+    {
+        WriteIndirectBufferFromRemoteFS::finalize();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+
+template <typename T>
+void WriteIndirectBufferFromRemoteFS<T>::finalize()
+{
+    if (finalized)
+        return;
+
+    WriteBufferFromFileDecorator::finalize();
+
+    metadata.addObject(remote_fs_path, count());
+    metadata.save();
+}
+
+
+template <typename T>
+void WriteIndirectBufferFromRemoteFS<T>::sync()
+{
+    if (finalized)
+        metadata.save(true);
+}
+
+
+#if USE_AWS_S3
+template
+class WriteIndirectBufferFromRemoteFS<WriteBufferFromS3>;
+#endif
+
+#if USE_HDFS
+template
+class WriteIndirectBufferFromRemoteFS<WriteBufferFromHDFS>;
+#endif
+
+}
+
+#endif
diff --git a/src/Disks/WriteIndirectBufferFromRemoteFS.h b/src/Disks/WriteIndirectBufferFromRemoteFS.h
new file mode 100644
index 00000000000..ece7b9d5871
--- /dev/null
+++ b/src/Disks/WriteIndirectBufferFromRemoteFS.h
@@ -0,0 +1,39 @@
+#pragma once
+#include <Common/config.h>
+
+#if USE_AWS_S3 || USE_HDFS
+
+#include <Disks/IDiskRemote.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteBufferFromFileDecorator.h>
+
+namespace DB
+{
+
+/// Stores data in S3/HDFS and adds the object path and object size to metadata file on local FS.
+template <typename T>
+class WriteIndirectBufferFromRemoteFS final : public WriteBufferFromFileDecorator
+{
+public:
+    WriteIndirectBufferFromRemoteFS(
+        std::unique_ptr<T> impl_,
+        IDiskRemote::Metadata metadata_,
+        const String & remote_fs_path_);
+
+    virtual ~WriteIndirectBufferFromRemoteFS() override;
+
+    void finalize() override;
+
+    void sync() override;
+
+    String getFileName() const override { return metadata.metadata_file_path; }
+
+private:
+    IDiskRemote::Metadata metadata;
+
+    String remote_fs_path;
+};
+
+}
+
+#endif
diff --git a/src/Dictionaries/tests/CMakeLists.txt b/src/Disks/examples/CMakeLists.txt
similarity index 100%
rename from src/Dictionaries/tests/CMakeLists.txt
rename to src/Disks/examples/CMakeLists.txt
diff --git a/src/Disks/registerDisks.cpp b/src/Disks/registerDisks.cpp
index 2da39e62b19..8f4901e49e5 100644
--- a/src/Disks/registerDisks.cpp
+++ b/src/Disks/registerDisks.cpp
@@ -8,21 +8,33 @@
 
 namespace DB
 {
+
 void registerDiskLocal(DiskFactory & factory);
 void registerDiskMemory(DiskFactory & factory);
+
 #if USE_AWS_S3
 void registerDiskS3(DiskFactory & factory);
 #endif
 
+#if USE_HDFS
+void registerDiskHDFS(DiskFactory & factory);
+#endif
+
+
 void registerDisks()
 {
     auto & factory = DiskFactory::instance();
 
     registerDiskLocal(factory);
     registerDiskMemory(factory);
+
 #if USE_AWS_S3
     registerDiskS3(factory);
 #endif
+
+#if USE_HDFS
+    registerDiskHDFS(factory);
+#endif
 }
 
 }
diff --git a/src/Disks/tests/gtest_disk.cpp b/src/Disks/tests/gtest_disk.cpp
index 525b5e6ce38..36f91249391 100644
--- a/src/Disks/tests/gtest_disk.cpp
+++ b/src/Disks/tests/gtest_disk.cpp
@@ -1,14 +1,18 @@
 #include <gtest/gtest.h>
-
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include "gtest_disk.h"
+#include <filesystem>
 
-#if !__clang__
+namespace fs = std::filesystem;
+
+
+#if !defined(__clang__)
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
 
+
 template <typename T>
 DB::DiskPtr createDisk();
 
@@ -21,7 +25,7 @@ DB::DiskPtr createDisk<DB::DiskMemory>()
 template <>
 DB::DiskPtr createDisk<DB::DiskLocal>()
 {
-    Poco::File("tmp/").createDirectory();
+    fs::create_directory("tmp/");
     return std::make_shared<DB::DiskLocal>("local_disk", "tmp/", 0);
 }
 
@@ -42,7 +46,7 @@ template <>
 void destroyDisk<DB::DiskLocal>(DB::DiskPtr & disk)
 {
     disk.reset();
-    Poco::File("tmp/").remove(true);
+    fs::remove_all("tmp/");
 }
 
 
diff --git a/src/Disks/tests/gtest_disk.h b/src/Disks/tests/gtest_disk.h
index d7ca0beca5f..fa1028089cb 100644
--- a/src/Disks/tests/gtest_disk.h
+++ b/src/Disks/tests/gtest_disk.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Disks/DiskLocal.h>
 #include <Disks/DiskMemory.h>
 #include <Disks/IDisk.h>
diff --git a/src/Disks/tests/gtest_disk_hdfs.cpp b/src/Disks/tests/gtest_disk_hdfs.cpp
new file mode 100644
index 00000000000..d537ac967e5
--- /dev/null
+++ b/src/Disks/tests/gtest_disk_hdfs.cpp
@@ -0,0 +1,160 @@
+#include <gtest/gtest.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include "gtest_disk.h"
+
+
+#define RUN_HDFS_TEST 0
+#if RUN_HDFS_TEST
+
+#include <Disks/HDFS/DiskHDFS.h>
+#include <Poco/Util/XMLConfiguration.h>
+
+const String hdfs_uri = "hdfs://172.20.0.2:9000/disk_test/";
+const String metadata_path = "/path/to/metadata/";
+const String config_path = "/path/to/config.xml";
+const String file_name = "test.txt";
+
+
+TEST(DiskTestHDFS, RemoveFileHDFS)
+{
+    Poco::Util::AbstractConfiguration *config = new Poco::Util::XMLConfiguration(config_path);
+    auto settings = std::make_unique<DB::DiskHDFSSettings>(1024 * 1024);
+    auto disk = DB::DiskHDFS("disk_hdfs", hdfs_uri, std::move(settings), metadata_path, *config);
+
+    DB::HDFSBuilderWrapper builder = DB::createHDFSBuilder(hdfs_uri, *config);
+    DB::HDFSFSPtr fs = DB::createHDFSFS(builder.get());
+
+    disk.writeFile(file_name, 1024, DB::WriteMode::Rewrite);
+    auto metadata = disk.readMeta(file_name);
+
+    const String hdfs_file_name = metadata.remote_fs_objects[0].first;
+    const String hdfs_file_path = "/disk_test/" + hdfs_file_name;
+
+    auto ret = hdfsExists(fs.get(), hdfs_file_path.data());
+    EXPECT_EQ(0, ret);
+
+    disk.removeFile(file_name);
+    ret = hdfsExists(fs.get(), hdfs_file_path.data());
+    EXPECT_EQ(-1, ret);
+}
+
+
+TEST(DiskTestHDFS, WriteReadHDFS)
+{
+    Poco::Util::AbstractConfiguration *config = new Poco::Util::XMLConfiguration(config_path);
+    auto settings = std::make_unique<DB::DiskHDFSSettings>(1024 * 1024);
+    auto disk = DB::DiskHDFS("disk_hdfs", hdfs_uri, std::move(settings), metadata_path, *config);
+
+    {
+        auto out = disk.writeFile(file_name, 1024, DB::WriteMode::Rewrite);
+        writeString("Test write to file", *out);
+    }
+
+    {
+        DB::String result;
+        auto in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        readString(result, *in);
+        EXPECT_EQ("Test write to file", result);
+    }
+
+    disk.removeFileIfExists(file_name);
+}
+
+
+TEST(DiskTestHDFS, RewriteFileHDFS)
+{
+    Poco::Util::AbstractConfiguration *config = new Poco::Util::XMLConfiguration(config_path);
+    auto settings = std::make_unique<DB::DiskHDFSSettings>(1024 * 1024);
+    auto disk = DB::DiskHDFS("disk_hdfs", hdfs_uri, std::move(settings), metadata_path, *config);
+
+    for (size_t i = 1; i <= 10; ++i)
+    {
+        std::unique_ptr<DB::WriteBuffer> out = disk.writeFile(file_name, 1024, DB::WriteMode::Rewrite);
+        writeString("Text" + DB::toString(i), *out);
+    }
+
+    {
+        String result;
+        auto in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        readString(result, *in);
+        EXPECT_EQ("Text10", result);
+        readString(result, *in);
+        EXPECT_EQ("", result);
+    }
+
+    disk.removeFileIfExists(file_name);
+}
+
+
+TEST(DiskTestHDFS, AppendFileHDFS)
+{
+    Poco::Util::AbstractConfiguration *config = new Poco::Util::XMLConfiguration(config_path);
+    auto settings = std::make_unique<DB::DiskHDFSSettings>(1024 * 1024);
+    auto disk = DB::DiskHDFS("disk_hdfs", hdfs_uri, std::move(settings), metadata_path, *config);
+
+    {
+        std::unique_ptr<DB::WriteBuffer> out = disk.writeFile(file_name, 1024, DB::WriteMode::Append);
+        writeString("Text", *out);
+        for (size_t i = 0; i < 10; ++i)
+        {
+            writeIntText(i, *out);
+        }
+    }
+
+    {
+        String result, expected;
+        auto in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+
+        readString(result, *in);
+        EXPECT_EQ("Text0123456789", result);
+
+        readString(result, *in);
+        EXPECT_EQ("", result);
+    }
+
+    disk.removeFileIfExists(file_name);
+}
+
+
+TEST(DiskTestHDFS, SeekHDFS)
+{
+    Poco::Util::AbstractConfiguration *config = new Poco::Util::XMLConfiguration(config_path);
+    auto settings = std::make_unique<DB::DiskHDFSSettings>(1024 * 1024);
+    auto disk = DB::DiskHDFS("disk_hdfs", hdfs_uri, std::move(settings), metadata_path, *config);
+
+    {
+        std::unique_ptr<DB::WriteBuffer> out = disk.writeFile(file_name, 1024, DB::WriteMode::Rewrite);
+        writeString("test data", *out);
+    }
+
+    /// Test SEEK_SET
+    {
+        String buf(4, '0');
+        std::unique_ptr<DB::SeekableReadBuffer> in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+
+        in->seek(5, SEEK_SET);
+
+        in->readStrict(buf.data(), 4);
+        EXPECT_EQ("data", buf);
+    }
+
+    /// Test SEEK_CUR
+    {
+        std::unique_ptr<DB::SeekableReadBuffer> in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        String buf(4, '0');
+
+        in->readStrict(buf.data(), 4);
+        EXPECT_EQ("test", buf);
+
+        // Skip whitespace
+        in->seek(1, SEEK_CUR);
+
+        in->readStrict(buf.data(), 4);
+        EXPECT_EQ("data", buf);
+    }
+
+    disk.removeFileIfExists(file_name);
+}
+
+#endif
diff --git a/src/Disks/ya.make b/src/Disks/ya.make
index 53dc9fd75c4..82c87aaa488 100644
--- a/src/Disks/ya.make
+++ b/src/Disks/ya.make
@@ -14,6 +14,7 @@ SRCS(
     DiskFactory.cpp
     DiskLocal.cpp
     DiskMemory.cpp
+    DiskRestartProxy.cpp
     DiskSelector.cpp
     IDisk.cpp
     IVolume.cpp
diff --git a/src/Disks/ya.make.in b/src/Disks/ya.make.in
index ce205bd25ac..4f7ccff17ef 100644
--- a/src/Disks/ya.make.in
+++ b/src/Disks/ya.make.in
@@ -7,8 +7,7 @@ PEERDIR(
 )
 
 
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F S3 | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F 'S3|HDFS' | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Formats/CMakeLists.txt b/src/Formats/CMakeLists.txt
index 4929c141fe3..0a342917073 100644
--- a/src/Formats/CMakeLists.txt
+++ b/src/Formats/CMakeLists.txt
@@ -1,5 +1,5 @@
 configure_file(config_formats.h.in ${ConfigIncludePath}/config_formats.h)
 
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
-endif ()
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
+endif()
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index f7f32cf9b6f..02b125330c5 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -43,16 +43,15 @@ const FormatFactory::Creators & FormatFactory::getCreators(const String & name)
     throw Exception("Unknown format " + name, ErrorCodes::UNKNOWN_FORMAT);
 }
 
-FormatSettings getFormatSettings(const Context & context)
+FormatSettings getFormatSettings(ContextConstPtr context)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     return getFormatSettings(context, settings);
 }
 
 template <typename Settings>
-FormatSettings getFormatSettings(const Context & context,
-    const Settings & settings)
+FormatSettings getFormatSettings(ContextConstPtr context, const Settings & settings)
 {
     FormatSettings format_settings;
 
@@ -71,7 +70,6 @@ FormatSettings getFormatSettings(const Context & context,
     format_settings.custom.escaping_rule = settings.format_custom_escaping_rule;
     format_settings.custom.field_delimiter = settings.format_custom_field_delimiter;
     format_settings.custom.result_after_delimiter = settings.format_custom_result_after_delimiter;
-    format_settings.custom.result_after_delimiter = settings.format_custom_result_after_delimiter;
     format_settings.custom.result_before_delimiter = settings.format_custom_result_before_delimiter;
     format_settings.custom.row_after_delimiter = settings.format_custom_row_after_delimiter;
     format_settings.custom.row_before_delimiter = settings.format_custom_row_before_delimiter;
@@ -99,8 +97,8 @@ FormatSettings getFormatSettings(const Context & context,
     format_settings.regexp.regexp = settings.format_regexp;
     format_settings.regexp.skip_unmatched = settings.format_regexp_skip_unmatched;
     format_settings.schema.format_schema = settings.format_schema;
-    format_settings.schema.format_schema_path = context.getFormatSchemaPath();
-    format_settings.schema.is_server = context.hasGlobalContext() && (context.getGlobalContext().getApplicationType() == Context::ApplicationType::SERVER);
+    format_settings.schema.format_schema_path = context->getFormatSchemaPath();
+    format_settings.schema.is_server = context->hasGlobalContext() && (context->getGlobalContext()->getApplicationType() == Context::ApplicationType::SERVER);
     format_settings.skip_unknown_fields = settings.input_format_skip_unknown_fields;
     format_settings.template_settings.resultset_format = settings.format_template_resultset;
     format_settings.template_settings.row_between_delimiter = settings.format_template_rows_between_delimiter;
@@ -120,26 +118,22 @@ FormatSettings getFormatSettings(const Context & context,
     {
         const Poco::URI & avro_schema_registry_url = settings.format_avro_schema_registry_url;
         if (!avro_schema_registry_url.empty())
-            context.getRemoteHostFilter().checkURL(avro_schema_registry_url);
+            context->getRemoteHostFilter().checkURL(avro_schema_registry_url);
     }
 
     return format_settings;
 }
 
-template
-FormatSettings getFormatSettings<FormatFactorySettings>(const Context & context,
-    const FormatFactorySettings & settings);
+template FormatSettings getFormatSettings<FormatFactorySettings>(ContextConstPtr context, const FormatFactorySettings & settings);
 
-template
-FormatSettings getFormatSettings<Settings>(const Context & context,
-    const Settings & settings);
+template FormatSettings getFormatSettings<Settings>(ContextConstPtr context, const Settings & settings);
 
 
 InputFormatPtr FormatFactory::getInput(
     const String & name,
     ReadBuffer & buf,
     const Block & sample,
-    const Context & context,
+    ContextConstPtr context,
     UInt64 max_block_size,
     const std::optional<FormatSettings> & _format_settings) const
 {
@@ -154,7 +148,7 @@ InputFormatPtr FormatFactory::getInput(
         throw Exception("Format " + name + " is not suitable for input (with processors)", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT);
     }
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     const auto & file_segmentation_engine = getCreators(name).file_segmentation_engine;
 
     // Doesn't make sense to use parallel parsing with less than four threads
@@ -204,13 +198,17 @@ InputFormatPtr FormatFactory::getInput(
     return format;
 }
 
-BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(const String & name,
-    WriteBuffer & buf, const Block & sample, const Context & context,
-    WriteCallback callback, const std::optional<FormatSettings> & _format_settings) const
+BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
+    const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_processor_creator;
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     bool parallel_formatting = settings.output_format_parallel_formatting;
 
     if (output_getter && parallel_formatting && getCreators(name).supports_parallel_formatting
@@ -237,12 +235,15 @@ BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(const Stri
 }
 
 
-BlockOutputStreamPtr FormatFactory::getOutputStream(const String & name,
-    WriteBuffer & buf, const Block & sample, const Context & context,
-    WriteCallback callback, const std::optional<FormatSettings> & _format_settings) const
+BlockOutputStreamPtr FormatFactory::getOutputStream(
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
+    const std::optional<FormatSettings> & _format_settings) const
 {
-    auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
+    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
 
     if (!getCreators(name).output_processor_creator)
     {
@@ -267,7 +268,7 @@ InputFormatPtr FormatFactory::getInputFormat(
     const String & name,
     ReadBuffer & buf,
     const Block & sample,
-    const Context & context,
+    ContextConstPtr context,
     UInt64 max_block_size,
     const std::optional<FormatSettings> & _format_settings) const
 {
@@ -275,13 +276,12 @@ InputFormatPtr FormatFactory::getInputFormat(
     if (!input_getter)
         throw Exception("Format " + name + " is not suitable for input", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
-    if (context.hasQueryContext() && settings.log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
+    if (context->hasQueryContext() && settings.log_queries)
+        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
-    auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
+    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
 
     RowInputFormatParams params;
     params.max_block_size = max_block_size;
@@ -289,7 +289,6 @@ InputFormatPtr FormatFactory::getInputFormat(
     params.allow_errors_ratio = format_settings.input_allow_errors_ratio;
     params.max_execution_time = settings.max_execution_time;
     params.timeout_overflow_mode = settings.timeout_overflow_mode;
-
     auto format = input_getter(buf, sample, params, format_settings);
 
     /// It's a kludge. Because I cannot remove context from values format.
@@ -300,18 +299,20 @@ InputFormatPtr FormatFactory::getInputFormat(
 }
 
 OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
-    const String & name, WriteBuffer & buf, const Block & sample,
-    const Context & context, WriteCallback callback,
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
     const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_processor_creator;
     if (!output_getter)
         throw Exception("Format " + name + " is not suitable for output (with processors)", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT);
 
-    auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
+    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     if (settings.output_format_parallel_formatting && getCreators(name).supports_parallel_formatting
         && !settings.output_format_json_array_of_rows)
@@ -322,8 +323,8 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
 
         ParallelFormattingOutputFormat::Params builder{buf, sample, formatter_creator, settings.max_threads};
 
-        if (context.hasQueryContext() && settings.log_queries)
-            context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
+        if (context->hasQueryContext() && settings.log_queries)
+            context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
         return std::make_shared<ParallelFormattingOutputFormat>(builder);
     }
@@ -333,16 +334,19 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
 
 
 OutputFormatPtr FormatFactory::getOutputFormat(
-    const String & name, WriteBuffer & buf, const Block & sample,
-    const Context & context, WriteCallback callback,
+    const String & name,
+    WriteBuffer & buf,
+    const Block & sample,
+    ContextConstPtr context,
+    WriteCallback callback,
     const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_processor_creator;
     if (!output_getter)
         throw Exception("Format " + name + " is not suitable for output (with processors)", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT);
 
-    if (context.hasQueryContext() && context.getSettingsRef().log_queries)
-        context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
+    if (context->hasQueryContext() && context->getSettingsRef().log_queries)
+        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Format, name);
 
     RowOutputFormatParams params;
     params.callback = std::move(callback);
@@ -412,11 +416,26 @@ void FormatFactory::markOutputFormatSupportsParallelFormatting(const String & na
 {
     auto & target = dict[name].supports_parallel_formatting;
     if (target)
-        throw Exception("FormatFactory: Output format " + name + " is already marked as supporting parallel formatting.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception("FormatFactory: Output format " + name + " is already marked as supporting parallel formatting", ErrorCodes::LOGICAL_ERROR);
     target = true;
 }
 
 
+void FormatFactory::markFormatAsColumnOriented(const String & name)
+{
+    auto & target = dict[name].is_column_oriented;
+    if (target)
+        throw Exception("FormatFactory: Format " + name + " is already marked as column oriented", ErrorCodes::LOGICAL_ERROR);
+    target = true;
+}
+
+
+bool FormatFactory::checkIfFormatIsColumnOriented(const String & name)
+{
+    const auto & target = getCreators(name);
+    return target.is_column_oriented;
+}
+
 FormatFactory & FormatFactory::instance()
 {
     static FormatFactory ret;
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 4fa7e9a0c01..d5e4b1b0341 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -1,21 +1,22 @@
 #pragma once
 
-#include <common/types.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 <boost/noncopyable.hpp>
 
 #include <functional>
 #include <memory>
 #include <unordered_map>
-#include <boost/noncopyable.hpp>
 
 namespace DB
 {
 
 class Block;
-class Context;
 struct Settings;
 struct FormatFactorySettings;
 
@@ -34,11 +35,10 @@ struct RowOutputFormatParams;
 using InputFormatPtr = std::shared_ptr<IInputFormat>;
 using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
 
-FormatSettings getFormatSettings(const Context & context);
+FormatSettings getFormatSettings(ContextConstPtr context);
 
 template <typename T>
-FormatSettings getFormatSettings(const Context & context,
-    const T & settings);
+FormatSettings getFormatSettings(ContextConstPtr context, const T & settings);
 
 /** Allows to create an IBlockInputStream or IBlockOutputStream by the name of the format.
   * Note: format and compression are independent things.
@@ -101,6 +101,7 @@ private:
         OutputProcessorCreator output_processor_creator;
         FileSegmentationEngine file_segmentation_engine;
         bool supports_parallel_formatting{false};
+        bool is_column_oriented{false};
     };
 
     using FormatsDictionary = std::unordered_map<String, Creators>;
@@ -112,38 +113,52 @@ public:
         const String & name,
         ReadBuffer & buf,
         const Block & sample,
-        const Context & context,
+        ContextConstPtr context,
         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, const Context & context, WriteCallback callback = {},
+    BlockOutputStreamPtr getOutputStreamParallelIfPossible(
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr 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, const Context & context, WriteCallback callback = {},
+    BlockOutputStreamPtr getOutputStream(
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr context,
+        WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     InputFormatPtr getInputFormat(
         const String & name,
         ReadBuffer & buf,
         const Block & sample,
-        const Context & context,
+        ContextConstPtr context,
         UInt64 max_block_size,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     /// Checks all preconditions. Returns ordinary format if parallel formatting cannot be done.
     OutputFormatPtr getOutputFormatParallelIfPossible(
-        const String & name, WriteBuffer & buf, const Block & sample,
-        const Context & context, WriteCallback callback = {},
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr context,
+        WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     OutputFormatPtr getOutputFormat(
-        const String & name, WriteBuffer & buf, const Block & sample,
-        const Context & context, WriteCallback callback = {},
+        const String & name,
+        WriteBuffer & buf,
+        const Block & sample,
+        ContextConstPtr context,
+        WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     /// Register format by its name.
@@ -155,6 +170,9 @@ public:
     void registerOutputFormatProcessor(const String & name, OutputProcessorCreator output_creator);
 
     void markOutputFormatSupportsParallelFormatting(const String & name);
+    void markFormatAsColumnOriented(const String & name);
+
+    bool checkIfFormatIsColumnOriented(const String & name);
 
     const FormatsDictionary & getAllFormats() const
     {
diff --git a/src/Formats/FormatSchemaInfo.cpp b/src/Formats/FormatSchemaInfo.cpp
index 707f9babe8d..2605c0bdf04 100644
--- a/src/Formats/FormatSchemaInfo.cpp
+++ b/src/Formats/FormatSchemaInfo.cpp
@@ -1,7 +1,7 @@
 #include <Formats/FormatSchemaInfo.h>
-#include <Poco/Path.h>
 #include <Interpreters/Context.h>
 #include <Common/Exception.h>
+#include <filesystem>
 
 
 namespace DB
@@ -11,6 +11,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+namespace fs = std::filesystem;
 
 namespace
 {
@@ -34,55 +35,66 @@ FormatSchemaInfo::FormatSchemaInfo(const String & format_schema, const String &
 
     String default_file_extension = getFormatSchemaDefaultFileExtension(format);
 
-    Poco::Path path;
+    fs::path path;
     if (require_message)
     {
         size_t colon_pos = format_schema.find(':');
-        if ((colon_pos == String::npos) || (colon_pos == 0) || (colon_pos == format_schema.length() - 1)
-            || path.assign(format_schema.substr(0, colon_pos)).makeFile().getFileName().empty())
+        if ((colon_pos == String::npos) || (colon_pos == 0) || (colon_pos == format_schema.length() - 1))
         {
             throw Exception(
                     "Format schema requires the 'format_schema' setting to have the 'schema_file:message_name' format"
                     + (default_file_extension.empty() ? "" : ", e.g. 'schema." + default_file_extension + ":Message'") +
-                    ". Got '" + format_schema
-                    + "'",
-                    ErrorCodes::BAD_ARGUMENTS);
+                    ". Got '" + format_schema + "'", ErrorCodes::BAD_ARGUMENTS);
+        }
+        else
+        {
+            path = fs::path(format_schema.substr(0, colon_pos));
+            String filename = path.has_filename() ? path.filename() : path.parent_path().filename();
+            if (filename.empty())
+                throw Exception(
+                    "Format schema requires the 'format_schema' setting to have the 'schema_file:message_name' format"
+                    + (default_file_extension.empty() ? "" : ", e.g. 'schema." + default_file_extension + ":Message'") +
+                    ". Got '" + format_schema + "'", ErrorCodes::BAD_ARGUMENTS);
         }
-
         message_name = format_schema.substr(colon_pos + 1);
     }
     else
-        path.assign(format_schema).makeFile().getFileName();
+    {
+        path = fs::path(format_schema);
+        if (!path.has_filename())
+            path = path.parent_path() / "";
+    }
 
     auto default_schema_directory = [&format_schema_path]()
     {
-        static const String str = Poco::Path(format_schema_path).makeAbsolute().makeDirectory().toString();
+        static const String str = fs::canonical(format_schema_path) / "";
         return str;
     };
 
-    if (path.getExtension().empty() && !default_file_extension.empty())
-        path.setExtension(default_file_extension);
+    if (!path.has_extension() && !default_file_extension.empty())
+        path = path.parent_path() / (path.stem().string() + '.' + default_file_extension);
 
-    if (path.isAbsolute())
+    fs::path default_schema_directory_path(default_schema_directory());
+    if (path.is_absolute())
     {
         if (is_server)
-            throw Exception("Absolute path in the 'format_schema' setting is prohibited: " + path.toString(), ErrorCodes::BAD_ARGUMENTS);
-        schema_path = path.getFileName();
-        schema_directory = path.makeParent().toString();
+            throw Exception("Absolute path in the 'format_schema' setting is prohibited: " + path.string(), ErrorCodes::BAD_ARGUMENTS);
+        schema_path = path.filename();
+        schema_directory = path.parent_path() / "";
     }
-    else if (path.depth() >= 1 && path.directory(0) == "..")
+    else if (path.has_parent_path() && !fs::weakly_canonical(default_schema_directory_path / path).string().starts_with(fs::weakly_canonical(default_schema_directory_path).string()))
     {
         if (is_server)
-            throw Exception(
-                "Path in the 'format_schema' setting shouldn't go outside the 'format_schema_path' directory: " + path.toString(),
-                ErrorCodes::BAD_ARGUMENTS);
-        path = Poco::Path(default_schema_directory()).resolve(path).toString();
-        schema_path = path.getFileName();
-        schema_directory = path.makeParent().toString();
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Path in the 'format_schema' setting shouldn't go outside the 'format_schema_path' directory: {} ({} not in {})",
+                            path.string());
+        path = default_schema_directory_path / path;
+        schema_path = path.filename();
+        schema_directory = path.parent_path() / "";
     }
     else
     {
-        schema_path = path.toString();
+        schema_path = path;
         schema_directory = default_schema_directory();
     }
 }
diff --git a/src/Formats/IRowInputStream.cpp b/src/Formats/IRowInputStream.cpp
deleted file mode 100644
index f3603982de5..00000000000
--- a/src/Formats/IRowInputStream.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <Formats/IRowInputStream.h>
-#include <Common/Exception.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-void IRowInputStream::syncAfterError()
-{
-    throw Exception("Method syncAfterError is not implemented for input format", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-}
diff --git a/src/Formats/IRowInputStream.h b/src/Formats/IRowInputStream.h
deleted file mode 100644
index e0b8a574f17..00000000000
--- a/src/Formats/IRowInputStream.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <boost/noncopyable.hpp>
-#include <memory>
-#include <string>
-
-#include <Columns/IColumn.h>
-
-
-namespace DB
-{
-
-/// Contains extra information about read data.
-struct RowReadExtension
-{
-    /// IRowInputStream.read() output. It contains non zero for columns that actually read from the source and zero otherwise.
-    /// It's used to attach defaults for partially filled rows.
-    /// Can be empty, this means that all columns are read.
-    std::vector<UInt8> read_columns;
-};
-
-/** Interface of stream, that allows to read data by rows.
-  */
-class IRowInputStream : private boost::noncopyable
-{
-public:
-    /** Read next row and append it to the columns.
-      * If no more rows - return false.
-      */
-    virtual bool read(MutableColumns & columns, RowReadExtension & extra) = 0;
-
-    virtual void readPrefix() {}                /// delimiter before begin of result
-    virtual void readSuffix() {}                /// delimiter after end of result
-
-    /// Skip data until next row.
-    /// This is intended for text streams, that allow skipping of errors.
-    /// By default - throws not implemented exception.
-    virtual bool allowSyncAfterError() const { return false; }
-    virtual void syncAfterError();
-
-    /// In case of parse error, try to roll back and parse last one or two rows very carefully
-    ///  and collect as much as possible diagnostic information about error.
-    /// If not implemented, returns empty string.
-    virtual std::string getDiagnosticInfo() { return {}; }
-
-    virtual ~IRowInputStream() {}
-};
-
-using RowInputStreamPtr = std::shared_ptr<IRowInputStream>;
-
-}
diff --git a/src/Formats/IRowOutputStream.cpp b/src/Formats/IRowOutputStream.cpp
deleted file mode 100644
index f84d810b8e8..00000000000
--- a/src/Formats/IRowOutputStream.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <Common/Exception.h>
-#include <Core/Block.h>
-#include <Formats/IRowOutputStream.h>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-
-void IRowOutputStream::write(const Block & block, size_t row_num)
-{
-    size_t columns = block.columns();
-
-    writeRowStartDelimiter();
-
-    for (size_t i = 0; i < columns; ++i)
-    {
-        if (i != 0)
-            writeFieldDelimiter();
-
-        const auto & col = block.getByPosition(i);
-        writeField(*col.column, *col.type, row_num);
-    }
-
-    writeRowEndDelimiter();
-}
-
-void IRowOutputStream::writeField(const IColumn &, const IDataType &, size_t)
-{
-    throw Exception("Method writeField is not implemented for output format", ErrorCodes::NOT_IMPLEMENTED);
-}
-
-}
diff --git a/src/Formats/IRowOutputStream.h b/src/Formats/IRowOutputStream.h
deleted file mode 100644
index 7cf6251cd0d..00000000000
--- a/src/Formats/IRowOutputStream.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <cstdint>
-#include <boost/noncopyable.hpp>
-#include <common/types.h>
-
-
-namespace DB
-{
-
-class Block;
-class IColumn;
-class IDataType;
-struct Progress;
-
-
-/** Interface of stream for writing data by rows (for example: for output to terminal).
-  */
-class IRowOutputStream : private boost::noncopyable
-{
-public:
-
-    /** Write a row.
-      * Default implementation calls methods to write single values and delimiters
-      * (except delimiter between rows (writeRowBetweenDelimiter())).
-      */
-    virtual void write(const Block & block, size_t row_num);
-
-    /** Write single value. */
-    virtual void writeField(const IColumn & column, const IDataType & type, size_t row_num);
-
-    /** Write delimiter. */
-    virtual void writeFieldDelimiter() {}      /// delimiter between values
-    virtual void writeRowStartDelimiter() {}   /// delimiter before each row
-    virtual void writeRowEndDelimiter() {}     /// delimiter after each row
-    virtual void writeRowBetweenDelimiter() {} /// delimiter between rows
-    virtual void writePrefix() {}              /// delimiter before resultset
-    virtual void writeSuffix() {}              /// delimiter after resultset
-
-    /** 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 String getContentType() const { return "text/plain; charset=UTF-8"; }
-
-    virtual ~IRowOutputStream() {}
-};
-
-using RowOutputStreamPtr = std::shared_ptr<IRowOutputStream>;
-
-}
diff --git a/src/Formats/MySQLBlockInputStream.cpp b/src/Formats/MySQLBlockInputStream.cpp
index da2a175e49f..b12b4f755ed 100644
--- a/src/Formats/MySQLBlockInputStream.cpp
+++ b/src/Formats/MySQLBlockInputStream.cpp
@@ -1,32 +1,44 @@
 #if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
+#include "config_core.h"
 #endif
 
 #if USE_MYSQL
-#    include <vector>
-#    include <Columns/ColumnNullable.h>
-#    include <Columns/ColumnString.h>
-#    include <Columns/ColumnsNumber.h>
-#    include <Columns/ColumnDecimal.h>
-#    include <Columns/ColumnFixedString.h>
-#    include <DataTypes/IDataType.h>
-#    include <DataTypes/DataTypeNullable.h>
-#    include <IO/ReadBufferFromString.h>
-#    include <IO/ReadHelpers.h>
-#    include <IO/WriteHelpers.h>
-#    include <IO/Operators.h>
-#    include <Common/assert_cast.h>
-#    include <ext/range.h>
-#    include "MySQLBlockInputStream.h"
+#include <vector>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnFixedString.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+#include <Common/assert_cast.h>
+#include <ext/range.h>
+#include <common/logger_useful.h>
+#include "MySQLBlockInputStream.h"
+
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
     extern const int NOT_IMPLEMENTED;
 }
 
+StreamSettings::StreamSettings(const Settings & settings, bool auto_close_, bool fetch_by_name_, size_t max_retry_)
+    : max_read_mysql_row_nums((settings.external_storage_max_read_rows) ? settings.external_storage_max_read_rows : settings.max_block_size)
+    , max_read_mysql_bytes_size(settings.external_storage_max_read_bytes)
+    , auto_close(auto_close_)
+    , fetch_by_name(fetch_by_name_)
+    , default_num_tries_on_connection_loss(max_retry_)
+{
+}
+
 MySQLBlockInputStream::Connection::Connection(
     const mysqlxx::PoolWithFailover::Entry & entry_,
     const std::string & query_str)
@@ -36,66 +48,122 @@ MySQLBlockInputStream::Connection::Connection(
 {
 }
 
+/// Used in MaterializeMySQL and in doInvalidateQuery for dictionary source.
 MySQLBlockInputStream::MySQLBlockInputStream(
     const mysqlxx::PoolWithFailover::Entry & entry,
     const std::string & query_str,
     const Block & sample_block,
-    const UInt64 max_block_size_,
-    const bool auto_close_,
-    const bool fetch_by_name_)
-    : connection{std::make_unique<Connection>(entry, query_str)}
-    , max_block_size{max_block_size_}
-    , auto_close{auto_close_}
-    , fetch_by_name(fetch_by_name_)
+    const StreamSettings & settings_)
+    : log(&Poco::Logger::get("MySQLBlockInputStream"))
+    , connection{std::make_unique<Connection>(entry, query_str)}
+    , settings{std::make_unique<StreamSettings>(settings_)}
 {
     description.init(sample_block);
     initPositionMappingFromQueryResultStructure();
 }
 
+/// For descendant MySQLWithFailoverBlockInputStream
+    MySQLBlockInputStream::MySQLBlockInputStream(const Block &sample_block_, const StreamSettings & settings_)
+    : 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(
+    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_)
+{
+}
+
+void MySQLWithFailoverBlockInputStream::readPrefix()
+{
+    size_t count_connect_attempts = 0;
+
+    /// For recovering from "Lost connection to MySQL server during query" errors
+    while (true)
+    {
+        try
+        {
+            connection = std::make_unique<Connection>(pool->get(), query_str);
+            break;
+        }
+        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;
+        }
+    }
+
+    initPositionMappingFromQueryResultStructure();
+}
 
 namespace
 {
     using ValueType = ExternalResultDescription::ValueType;
 
-    void insertValue(const IDataType & data_type, IColumn & column, const ValueType type, const mysqlxx::Value & value)
+    void insertValue(const IDataType & data_type, IColumn & column, const ValueType type, const mysqlxx::Value & value, size_t & read_bytes_size)
     {
         switch (type)
         {
             case ValueType::vtUInt8:
                 assert_cast<ColumnUInt8 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 1;
                 break;
             case ValueType::vtUInt16:
                 assert_cast<ColumnUInt16 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 2;
                 break;
             case ValueType::vtUInt32:
                 assert_cast<ColumnUInt32 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 4;
                 break;
             case ValueType::vtUInt64:
                 assert_cast<ColumnUInt64 &>(column).insertValue(value.getUInt());
+                read_bytes_size += 8;
                 break;
             case ValueType::vtInt8:
                 assert_cast<ColumnInt8 &>(column).insertValue(value.getInt());
+                read_bytes_size += 1;
                 break;
             case ValueType::vtInt16:
                 assert_cast<ColumnInt16 &>(column).insertValue(value.getInt());
+                read_bytes_size += 2;
                 break;
             case ValueType::vtInt32:
                 assert_cast<ColumnInt32 &>(column).insertValue(value.getInt());
+                read_bytes_size += 4;
                 break;
             case ValueType::vtInt64:
                 assert_cast<ColumnInt64 &>(column).insertValue(value.getInt());
+                read_bytes_size += 8;
                 break;
             case ValueType::vtFloat32:
                 assert_cast<ColumnFloat32 &>(column).insertValue(value.getDouble());
+                read_bytes_size += 4;
                 break;
             case ValueType::vtFloat64:
                 assert_cast<ColumnFloat64 &>(column).insertValue(value.getDouble());
+                read_bytes_size += 8;
                 break;
             case ValueType::vtString:
                 assert_cast<ColumnString &>(column).insertData(value.data(), value.size());
+                read_bytes_size += assert_cast<ColumnString &>(column).byteSize();
                 break;
             case ValueType::vtDate:
                 assert_cast<ColumnUInt16 &>(column).insertValue(UInt16(value.getDate().getDayNum()));
+                read_bytes_size += 2;
                 break;
             case ValueType::vtDateTime:
             {
@@ -105,10 +173,12 @@ namespace
                 if (time < 0)
                     time = 0;
                 assert_cast<ColumnUInt32 &>(column).insertValue(time);
+                read_bytes_size += 4;
                 break;
             }
             case ValueType::vtUUID:
-                assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.data(), value.size()));
+                assert_cast<ColumnUUID &>(column).insert(parse<UUID>(value.data(), value.size()));
+                read_bytes_size += assert_cast<ColumnUUID &>(column).byteSize();
                 break;
             case ValueType::vtDateTime64:[[fallthrough]];
             case ValueType::vtDecimal32: [[fallthrough]];
@@ -118,10 +188,12 @@ namespace
             {
                 ReadBuffer buffer(const_cast<char *>(value.data()), value.size(), 0);
                 data_type.getDefaultSerialization()->deserializeWholeText(column, buffer, FormatSettings{});
+                read_bytes_size += column.sizeOfValueIfFixed();
                 break;
             }
             case ValueType::vtFixedString:
                 assert_cast<ColumnFixedString &>(column).insertData(value.data(), value.size());
+                read_bytes_size += column.sizeOfValueIfFixed();
                 break;
             default:
                 throw Exception("Unsupported value type", ErrorCodes::NOT_IMPLEMENTED);
@@ -137,8 +209,9 @@ Block MySQLBlockInputStream::readImpl()
     auto row = connection->result.fetch();
     if (!row)
     {
-        if (auto_close)
+        if (settings->auto_close)
            connection->entry.disconnect();
+
         return {};
     }
 
@@ -147,6 +220,8 @@ Block MySQLBlockInputStream::readImpl()
         columns[i] = description.sample_block.getByPosition(i).column->cloneEmpty();
 
     size_t num_rows = 0;
+    size_t read_bytes_size = 0;
+
     while (row)
     {
         for (size_t index = 0; index < position_mapping.size(); ++index)
@@ -162,12 +237,12 @@ Block MySQLBlockInputStream::readImpl()
                 {
                     ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[index]);
                     const auto & data_type = assert_cast<const DataTypeNullable &>(*sample.type);
-                    insertValue(*data_type.getNestedType(), column_nullable.getNestedColumn(), description.types[index].first, value);
+                    insertValue(*data_type.getNestedType(), column_nullable.getNestedColumn(), description.types[index].first, value, read_bytes_size);
                     column_nullable.getNullMapData().emplace_back(false);
                 }
                 else
                 {
-                    insertValue(*sample.type, *columns[index], description.types[index].first, value);
+                    insertValue(*sample.type, *columns[index], description.types[index].first, value, read_bytes_size);
                 }
             }
             else
@@ -183,7 +258,7 @@ Block MySQLBlockInputStream::readImpl()
         }
 
         ++num_rows;
-        if (num_rows == max_block_size)
+        if (num_rows == settings->max_read_mysql_row_nums || (settings->max_read_mysql_bytes_size && read_bytes_size >= settings->max_read_mysql_bytes_size))
             break;
 
         row = connection->result.fetch();
@@ -191,23 +266,11 @@ Block MySQLBlockInputStream::readImpl()
     return description.sample_block.cloneWithColumns(std::move(columns));
 }
 
-MySQLBlockInputStream::MySQLBlockInputStream(
-    const Block & sample_block_,
-    UInt64 max_block_size_,
-    bool auto_close_,
-    bool fetch_by_name_)
-    : max_block_size(max_block_size_)
-    , auto_close(auto_close_)
-    , fetch_by_name(fetch_by_name_)
-{
-    description.init(sample_block_);
-}
-
 void MySQLBlockInputStream::initPositionMappingFromQueryResultStructure()
 {
     position_mapping.resize(description.sample_block.columns());
 
-    if (!fetch_by_name)
+    if (!settings->fetch_by_name)
     {
         if (description.sample_block.columns() != connection->result.getNumFields())
             throw Exception{"mysqlxx::UseQueryResult contains " + toString(connection->result.getNumFields()) + " columns while "
@@ -250,25 +313,6 @@ void MySQLBlockInputStream::initPositionMappingFromQueryResultStructure()
     }
 }
 
-MySQLLazyBlockInputStream::MySQLLazyBlockInputStream(
-    mysqlxx::Pool & pool_,
-    const std::string & query_str_,
-    const Block & sample_block_,
-    const UInt64 max_block_size_,
-    const bool auto_close_,
-    const bool fetch_by_name_)
-    : MySQLBlockInputStream(sample_block_, max_block_size_, auto_close_, fetch_by_name_)
-    , pool(pool_)
-    , query_str(query_str_)
-{
-}
-
-void MySQLLazyBlockInputStream::readPrefix()
-{
-    connection = std::make_unique<Connection>(pool.get(), query_str);
-    initPositionMappingFromQueryResultStructure();
-}
-
 }
 
 #endif
diff --git a/src/Formats/MySQLBlockInputStream.h b/src/Formats/MySQLBlockInputStream.h
index 269b630fcc7..12deb9c3146 100644
--- a/src/Formats/MySQLBlockInputStream.h
+++ b/src/Formats/MySQLBlockInputStream.h
@@ -6,11 +6,24 @@
 #include <mysqlxx/PoolWithFailover.h>
 #include <mysqlxx/Query.h>
 #include <Core/ExternalResultDescription.h>
-
+#include <Core/Settings.h>
 
 namespace DB
 {
 
+struct StreamSettings
+{
+    /// Check if setting is enabled, otherwise use common `max_block_size` setting.
+    size_t max_read_mysql_row_nums;
+    size_t max_read_mysql_bytes_size;
+    bool auto_close;
+    bool fetch_by_name;
+    size_t default_num_tries_on_connection_loss;
+
+    StreamSettings(const Settings & settings, bool auto_close_ = false, bool fetch_by_name_ = false, size_t max_retry_ = 5);
+
+};
+
 /// Allows processing results of a MySQL query as a sequence of Blocks, simplifies chaining
 class MySQLBlockInputStream : public IBlockInputStream
 {
@@ -19,16 +32,14 @@ public:
         const mysqlxx::PoolWithFailover::Entry & entry,
         const std::string & query_str,
         const Block & sample_block,
-        const UInt64 max_block_size_,
-        const bool auto_close_ = false,
-        const bool fetch_by_name_ = false);
+        const StreamSettings & settings_);
 
     String getName() const override { return "MySQL"; }
 
     Block getHeader() const override { return description.sample_block.cloneEmpty(); }
 
 protected:
-    MySQLBlockInputStream(const Block & sample_block_, UInt64 max_block_size_, bool auto_close_, bool fetch_by_name_);
+    MySQLBlockInputStream(const Block & sample_block_, const StreamSettings & settings);
     Block readImpl() override;
     void initPositionMappingFromQueryResultStructure();
 
@@ -41,32 +52,31 @@ protected:
         mysqlxx::UseQueryResult result;
     };
 
+    Poco::Logger * log;
     std::unique_ptr<Connection> connection;
 
-    const UInt64 max_block_size;
-    const bool auto_close;
-    const bool fetch_by_name;
+    const std::unique_ptr<StreamSettings> settings;
     std::vector<size_t> position_mapping;
     ExternalResultDescription description;
 };
 
 /// Like MySQLBlockInputStream, but allocates connection only when reading is starting.
 /// It allows to create a lot of stream objects without occupation of all connection pool.
-class MySQLLazyBlockInputStream final : public MySQLBlockInputStream
+/// Also makes attempts to reconnect in case of connection failures.
+class MySQLWithFailoverBlockInputStream final : public MySQLBlockInputStream
 {
 public:
-    MySQLLazyBlockInputStream(
-        mysqlxx::Pool & pool_,
+
+    MySQLWithFailoverBlockInputStream(
+        mysqlxx::PoolWithFailoverPtr pool_,
         const std::string & query_str_,
         const Block & sample_block_,
-        const UInt64 max_block_size_,
-        const bool auto_close_ = false,
-        const bool fetch_by_name_ = false);
+        const StreamSettings & settings_);
 
 private:
     void readPrefix() override;
 
-    mysqlxx::Pool & pool;
+    mysqlxx::PoolWithFailoverPtr pool;
     std::string query_str;
 };
 
diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp
index 3539628f98e..962df507f82 100644
--- a/src/Formats/ProtobufSerializer.cpp
+++ b/src/Formats/ProtobufSerializer.cpp
@@ -237,7 +237,7 @@ namespace
             }
             catch (...)
             {
-                cannotConvertValue(str, "String", TypeName<DestType>::get());
+                cannotConvertValue(str, "String", TypeName<DestType>);
             }
         }
 
@@ -254,7 +254,7 @@ namespace
             }
             catch (boost::numeric::bad_numeric_cast &)
             {
-                cannotConvertValue(toString(value), TypeName<SrcType>::get(), TypeName<DestType>::get());
+                cannotConvertValue(toString(value), TypeName<SrcType>, TypeName<DestType>);
             }
             return result;
         }
@@ -429,7 +429,7 @@ namespace
                         else if (value == 1)
                             writeUInt(1);
                         else
-                            cannotConvertValue(toString(value), TypeName<NumberType>::get(), field_descriptor.type_name());
+                            cannotConvertValue(toString(value), TypeName<NumberType>, field_descriptor.type_name());
                     };
 
                     read_function = [this]() -> NumberType
@@ -438,7 +438,7 @@ namespace
                         if (u64 < 2)
                             return static_cast<NumberType>(u64);
                         else
-                            cannotConvertValue(toString(u64), field_descriptor.type_name(), TypeName<NumberType>::get());
+                            cannotConvertValue(toString(u64), field_descriptor.type_name(), TypeName<NumberType>);
                     };
 
                     default_function = [this]() -> NumberType { return static_cast<NumberType>(field_descriptor.default_value_bool()); };
@@ -492,7 +492,7 @@ namespace
         {
             throw Exception(
                 "The field " + quoteString(field_descriptor.full_name()) + " has an incompatible type " + field_descriptor.type_name()
-                    + " for serialization of the data type " + quoteString(TypeName<NumberType>::get()),
+                    + " for serialization of the data type " + quoteString(TypeName<NumberType>),
                 ErrorCodes::DATA_TYPE_INCOMPATIBLE_WITH_PROTOBUF_FIELD);
         }
 
@@ -507,7 +507,7 @@ namespace
         {
             const auto * enum_value_descriptor = field_descriptor.enum_type()->FindValueByNumber(value);
             if (!enum_value_descriptor)
-                cannotConvertValue(toString(value), TypeName<NumberType>::get(), field_descriptor.type_name());
+                cannotConvertValue(toString(value), TypeName<NumberType>, field_descriptor.type_name());
         }
 
     protected:
@@ -1240,7 +1240,7 @@ namespace
                             {
                                 WriteBufferFromOwnString buf;
                                 writeText(decimal, scale, buf);
-                                cannotConvertValue(buf.str(), TypeName<DecimalType>::get(), field_descriptor.type_name());
+                                cannotConvertValue(buf.str(), TypeName<DecimalType>, field_descriptor.type_name());
                             }
                         };
 
@@ -1250,7 +1250,7 @@ namespace
                             if (u64 < 2)
                                 return numberToDecimal(static_cast<UInt64>(u64 != 0));
                             else
-                                cannotConvertValue(toString(u64), field_descriptor.type_name(), TypeName<DecimalType>::get());
+                                cannotConvertValue(toString(u64), field_descriptor.type_name(), TypeName<DecimalType>);
                         };
 
                         default_function = [this]() -> DecimalType
@@ -1289,7 +1289,7 @@ namespace
         {
             throw Exception(
                 "The field " + quoteString(field_descriptor.full_name()) + " has an incompatible type " + field_descriptor.type_name()
-                    + " for serialization of the data type " + quoteString(TypeName<DecimalType>::get()),
+                    + " for serialization of the data type " + quoteString(TypeName<DecimalType>),
                 ErrorCodes::DATA_TYPE_INCOMPATIBLE_WITH_PROTOBUF_FIELD);
         }
 
@@ -1503,18 +1503,42 @@ namespace
     };
 
 
-    /// Serializes a ColumnVector<UInt128> containing UUIDs to a field of type TYPE_STRING or TYPE_BYTES.
-    class ProtobufSerializerUUID : public ProtobufSerializerNumber<UInt128>
+    /// Serializes a ColumnVector<UUID> containing UUIDs to a field of type TYPE_STRING or TYPE_BYTES.
+    class ProtobufSerializerUUID : public ProtobufSerializerSingleValue
     {
     public:
         ProtobufSerializerUUID(
             const google::protobuf::FieldDescriptor & field_descriptor_,
             const ProtobufReaderOrWriter & reader_or_writer_)
-            : ProtobufSerializerNumber<UInt128>(field_descriptor_, reader_or_writer_)
+            : ProtobufSerializerSingleValue(field_descriptor_, reader_or_writer_)
         {
             setFunctions();
         }
 
+        void writeRow(size_t row_num) override
+        {
+            const auto & column_vector = assert_cast<const ColumnVector<UUID> &>(*column);
+            write_function(column_vector.getElement(row_num));
+        }
+
+        void readRow(size_t row_num) override
+        {
+            UUID value = read_function();
+            auto & column_vector = assert_cast<ColumnVector<UUID> &>(column->assumeMutableRef());
+            if (row_num < column_vector.size())
+                column_vector.getElement(row_num) = value;
+            else
+                column_vector.insertValue(value);
+        }
+
+        void insertDefaults(size_t row_num) override
+        {
+            auto & column_vector = assert_cast<ColumnVector<UUID> &>(column->assumeMutableRef());
+            if (row_num < column_vector.size())
+                return;
+            column_vector.insertDefault();
+        }
+
     private:
         void setFunctions()
         {
@@ -1526,19 +1550,19 @@ namespace
                     ErrorCodes::DATA_TYPE_INCOMPATIBLE_WITH_PROTOBUF_FIELD);
             }
 
-            write_function = [this](UInt128 value)
+            write_function = [this](UUID value)
             {
-                uuidToString(static_cast<UUID>(value), text_buffer);
+                uuidToString(value, text_buffer);
                 writeStr(text_buffer);
             };
 
-            read_function = [this]() -> UInt128
+            read_function = [this]() -> UUID
             {
                 readStr(text_buffer);
-                return stringToUUID(text_buffer);
+                return parse<UUID>(text_buffer);
             };
 
-            default_function = [this]() -> UInt128 { return stringToUUID(field_descriptor.default_value_string()); };
+            default_function = [this]() -> UUID { return parse<UUID>(field_descriptor.default_value_string()); };
         }
 
         static void uuidToString(const UUID & uuid, String & str)
@@ -1547,13 +1571,10 @@ namespace
             writeText(uuid, buf);
         }
 
-        static UUID stringToUUID(const String & str)
-        {
-            ReadBufferFromString buf{str};
-            UUID uuid;
-            readUUIDText(uuid, buf);
-            return uuid;
-        }
+        std::function<void(UUID)> write_function;
+        std::function<UUID()> read_function;
+        std::function<UUID()> default_function;
+        String text_buffer;
     };
 
 
diff --git a/src/Formats/tests/CMakeLists.txt b/src/Formats/examples/CMakeLists.txt
similarity index 100%
rename from src/Formats/tests/CMakeLists.txt
rename to src/Formats/examples/CMakeLists.txt
diff --git a/src/Formats/tests/tab_separated_streams.cpp b/src/Formats/examples/tab_separated_streams.cpp
similarity index 100%
rename from src/Formats/tests/tab_separated_streams.cpp
rename to src/Formats/examples/tab_separated_streams.cpp
diff --git a/src/Formats/ya.make b/src/Formats/ya.make
index 8fe938be125..476e13f9a4f 100644
--- a/src/Formats/ya.make
+++ b/src/Formats/ya.make
@@ -13,8 +13,6 @@ PEERDIR(
 SRCS(
     FormatFactory.cpp
     FormatSchemaInfo.cpp
-    IRowInputStream.cpp
-    IRowOutputStream.cpp
     JSONEachRowUtils.cpp
     MySQLBlockInputStream.cpp
     NativeFormat.cpp
diff --git a/src/Formats/ya.make.in b/src/Formats/ya.make.in
index 027e04ee650..525e582755e 100644
--- a/src/Formats/ya.make.in
+++ b/src/Formats/ya.make.in
@@ -10,7 +10,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
index 1c3beb2e47d..271deb0f42c 100644
--- a/src/Functions/CMakeLists.txt
+++ b/src/Functions/CMakeLists.txt
@@ -1,10 +1,12 @@
 configure_file(config_functions.h.in ${ConfigIncludePath}/config_functions.h)
 
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+add_subdirectory(divide)
+
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions .)
 
-list(REMOVE_ITEM clickhouse_functions_sources IFunctionImpl.cpp FunctionFactory.cpp FunctionHelpers.cpp)
-list(REMOVE_ITEM clickhouse_functions_headers IFunctionImpl.h FunctionFactory.h FunctionHelpers.h)
+list(REMOVE_ITEM clickhouse_functions_sources IFunction.cpp FunctionFactory.cpp FunctionHelpers.cpp)
+list(REMOVE_ITEM clickhouse_functions_headers IFunction.h FunctionFactory.h FunctionHelpers.h)
 
 add_library(clickhouse_functions ${clickhouse_functions_sources})
 
@@ -25,7 +27,7 @@ target_link_libraries(clickhouse_functions
     PRIVATE
         ${ZLIB_LIBRARIES}
         boost::filesystem
-        libdivide
+        divide_impl
 )
 
 if (OPENSSL_CRYPTO_LIBRARY)
@@ -64,8 +66,8 @@ if (USE_FASTOPS)
     target_include_directories (clickhouse_functions SYSTEM PRIVATE ${FASTOPS_INCLUDE_DIR})
 endif ()
 
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif ()
 
 if (USE_EMBEDDED_COMPILER)
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index 28da546eb93..2b28620c84e 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -1,23 +1,24 @@
 #pragma once
-#include <regex>
+
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsNumber.h>
 #include <common/types.h>
 #include <Core/DecimalFunctions.h>
+#include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Common/Exception.h>
 #include <common/DateLUTImpl.h>
 
 /// The default mode value to use for the WEEK() function
 #define DEFAULT_WEEK_MODE 0
 
+
 namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
 }
 
@@ -25,43 +26,6 @@ namespace ErrorCodes
  * CustomWeek Transformations.
   */
 
-static inline UInt32 dateIsNotSupported(const char * name)
-{
-    throw Exception("Illegal type Date of argument for function " + std::string(name), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-}
-
-/// This factor transformation will say that the function is monotone everywhere.
-struct ZeroTransform
-{
-    static inline UInt16 execute(UInt16, UInt8, const DateLUTImpl &) { return 0; }
-    static inline UInt16 execute(UInt32, UInt8, const DateLUTImpl &) { return 0; }
-    static inline UInt16 execute(Int64, UInt8, const DateLUTImpl &) { return 0; }
-};
-
-struct ToWeekImpl
-{
-    static constexpr auto name = "toWeek";
-
-    static inline UInt8 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
-    {
-        // TODO: ditch conversion to DayNum, since it doesn't support extended range.
-        YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode);
-        return yw.second;
-    }
-    static inline UInt8 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
-    {
-        YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode);
-        return yw.second;
-    }
-    static inline UInt8 execute(UInt16 d, UInt8 week_mode, const DateLUTImpl & time_zone)
-    {
-        YearWeek yw = time_zone.toYearWeek(DayNum(d), week_mode);
-        return yw.second;
-    }
-
-    using FactorTransform = ZeroTransform;
-};
-
 struct ToYearWeekImpl
 {
     static constexpr auto name = "toYearWeek";
@@ -109,10 +73,34 @@ struct ToStartOfWeekImpl
     using FactorTransform = ZeroTransform;
 };
 
-template <typename FromType, typename ToType, typename Transform>
-struct Transformer
+struct ToWeekImpl
 {
-    explicit Transformer(Transform transform_)
+    static constexpr auto name = "toWeek";
+
+    static inline UInt8 execute(Int64 t, UInt8 week_mode, const DateLUTImpl & time_zone)
+    {
+        // TODO: ditch conversion to DayNum, since it doesn't support extended range.
+        YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode);
+        return yw.second;
+    }
+    static inline UInt8 execute(UInt32 t, UInt8 week_mode, const DateLUTImpl & time_zone)
+    {
+        YearWeek yw = time_zone.toYearWeek(time_zone.toDayNum(t), week_mode);
+        return yw.second;
+    }
+    static inline UInt8 execute(UInt16 d, UInt8 week_mode, const DateLUTImpl & time_zone)
+    {
+        YearWeek yw = time_zone.toYearWeek(DayNum(d), week_mode);
+        return yw.second;
+    }
+
+    using FactorTransform = ToStartOfYearImpl;
+};
+
+template <typename FromType, typename ToType, typename Transform>
+struct WeekTransformer
+{
+    explicit WeekTransformer(Transform transform_)
         : transform(std::move(transform_))
     {}
 
@@ -138,7 +126,7 @@ struct CustomWeekTransformImpl
     template <typename Transform>
     static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/, Transform transform = {})
     {
-        const auto op = Transformer<typename FromDataType::FieldType, typename ToDataType::FieldType, Transform>{std::move(transform)};
+        const auto op = WeekTransformer<typename FromDataType::FieldType, typename ToDataType::FieldType, Transform>{std::move(transform)};
 
         UInt8 week_mode = DEFAULT_WEEK_MODE;
         if (arguments.size() > 1)
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index c299b9c4169..03f35333150 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -1,17 +1,18 @@
 #pragma once
+
 #include <common/types.h>
 #include <Core/DecimalFunctions.h>
 #include <Common/Exception.h>
 #include <common/DateLUTImpl.h>
-//#include <common/TimeZone.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 
+
 namespace DB
 {
 
@@ -857,7 +858,8 @@ struct Transformer
 template <typename FromDataType, typename ToDataType, typename Transform>
 struct DateTimeTransformImpl
 {
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/, const Transform & transform = {})
+    static ColumnPtr execute(
+        const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/, const Transform & transform = {})
     {
         using Op = Transformer<typename FromDataType::FieldType, typename ToDataType::FieldType, Transform>;
 
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index 174ea7ee797..f10e15c1574 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -172,4 +172,10 @@ struct ModuloImpl
 #endif
 };
 
+template <typename A, typename B>
+struct ModuloLegacyImpl : ModuloImpl<A, B>
+{
+    using ResultType = typename NumberTraits::ResultOfModuloLegacy<A, B>::Type;
+};
+
 }
diff --git a/src/Functions/FunctionBase64Conversion.h b/src/Functions/FunctionBase64Conversion.h
index 4887e9fe8cc..6a8e3d2d94a 100644
--- a/src/Functions/FunctionBase64Conversion.h
+++ b/src/Functions/FunctionBase64Conversion.h
@@ -61,7 +61,7 @@ class FunctionBase64Conversion : public IFunction
 public:
     static constexpr auto name = Func::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionBase64Conversion>();
     }
@@ -146,7 +146,7 @@ public:
                     if (!outlen)
                     {
                         outlen = 0;
-                        dst_pos = savepoint;
+                        dst_pos = savepoint; //-V1048
                         // clean the symbol
                         dst_pos[0] = 0;
                     }
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index bb85ae32622..4ad876fc461 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/Arena.h>
+#include <common/wide_integer_to_string.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -23,12 +23,13 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include "Core/DecimalFunctions.h"
-#include "IFunctionImpl.h"
+#include "IFunction.h"
 #include "FunctionHelpers.h"
 #include "IsOperation.h"
 #include "DivisionUtils.h"
 #include "castTypeToEither.h"
 #include "FunctionFactory.h"
+#include <Common/Arena.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitors.h>
@@ -86,6 +87,7 @@ template <> inline constexpr bool IsIntegral<DataTypeInt32> = true;
 template <> inline constexpr bool IsIntegral<DataTypeInt64> = true;
 
 template <typename DataType> constexpr bool IsExtended = false;
+template <> inline constexpr bool IsExtended<DataTypeUInt128> = true;
 template <> inline constexpr bool IsExtended<DataTypeUInt256> = true;
 template <> inline constexpr bool IsExtended<DataTypeInt128> = true;
 template <> inline constexpr bool IsExtended<DataTypeInt256> = true;
@@ -512,7 +514,7 @@ class FunctionBinaryArithmetic : public IFunction
     static constexpr const bool is_multiply = IsOperation<Op>::multiply;
     static constexpr const bool is_division = IsOperation<Op>::division;
 
-    const Context & context;
+    ContextConstPtr context;
     bool check_decimal_overflow = true;
 
     template <typename F>
@@ -523,6 +525,7 @@ class FunctionBinaryArithmetic : public IFunction
             DataTypeUInt16,
             DataTypeUInt32,
             DataTypeUInt64,
+            DataTypeUInt128,
             DataTypeUInt256,
             DataTypeInt8,
             DataTypeInt16,
@@ -550,6 +553,7 @@ class FunctionBinaryArithmetic : public IFunction
             DataTypeUInt16,
             DataTypeUInt32,
             DataTypeUInt64,
+            DataTypeUInt128,
             DataTypeUInt256,
             DataTypeInt8,
             DataTypeInt16,
@@ -593,7 +597,7 @@ class FunctionBinaryArithmetic : public IFunction
     }
 
     static FunctionOverloadResolverPtr
-    getFunctionForIntervalArithmetic(const DataTypePtr & type0, const DataTypePtr & type1, const Context & context)
+    getFunctionForIntervalArithmetic(const DataTypePtr & type0, const DataTypePtr & type1, ContextConstPtr context)
     {
         bool first_is_date_or_datetime = isDateOrDateTime(type0);
         bool second_is_date_or_datetime = isDateOrDateTime(type1);
@@ -782,7 +786,7 @@ class FunctionBinaryArithmetic : public IFunction
         return function->execute(new_arguments, result_type, input_rows_count);
     }
 
-    template <class T, class ResultDataType, class CC, class C>
+    template <typename T, typename ResultDataType, typename CC, typename C>
     static auto helperGetOrConvert(const CC & col_const, const C & col)
     {
         using ResultType = typename ResultDataType::FieldType;
@@ -790,12 +794,14 @@ class FunctionBinaryArithmetic : public IFunction
 
         if constexpr (IsFloatingPoint<ResultDataType> && IsDecimalNumber<T>)
             return DecimalUtils::convertTo<NativeResultType>(col_const->template getValue<T>(), col.getScale());
+        else if constexpr (IsDecimalNumber<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, class OpImpl, class OpImplCheck,
-              class L, class R, class VR, class SA, class SB>
+    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
     {
         if (check_decimal_overflow)
@@ -939,9 +945,9 @@ class FunctionBinaryArithmetic : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionBinaryArithmetic>(context); }
+    static FunctionPtr create(ContextConstPtr context) { return std::make_shared<FunctionBinaryArithmetic>(context); }
 
-    explicit FunctionBinaryArithmetic(const Context & context_)
+    explicit FunctionBinaryArithmetic(ContextConstPtr context_)
     :   context(context_),
         check_decimal_overflow(decimalCheckArithmeticOverflow(context))
     {}
@@ -955,7 +961,7 @@ public:
         return getReturnTypeImplStatic(arguments, context);
     }
 
-    static DataTypePtr getReturnTypeImplStatic(const DataTypes & arguments, const Context & context)
+    static DataTypePtr getReturnTypeImplStatic(const DataTypes & arguments, ContextConstPtr context)
     {
         /// Special case when multiply aggregate function state
         if (isAggregateMultiply(arguments[0], arguments[1]))
@@ -1323,7 +1329,7 @@ public:
         });
     }
 
-    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, ValuePlaceholders values) const override
+    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, Values values) const override
     {
         assert(2 == types.size() && 2 == values.size());
 
@@ -1340,8 +1346,8 @@ public:
                 {
                     auto & b = static_cast<llvm::IRBuilder<> &>(builder);
                     auto type = std::make_shared<ResultDataType>();
-                    auto * lval = nativeCast(b, types[0], values[0](), type);
-                    auto * rval = nativeCast(b, types[1], values[1](), type);
+                    auto * lval = nativeCast(b, types[0], values[0], type);
+                    auto * rval = nativeCast(b, types[1], values[1], type);
                     result = OpSpec::compile(b, lval, rval, std::is_signed_v<typename ResultDataType::FieldType>);
                     return true;
                 }
@@ -1367,7 +1373,7 @@ public:
         const ColumnWithTypeAndName & left_,
         const ColumnWithTypeAndName & right_,
         const DataTypePtr & return_type_,
-        const Context & context)
+        ContextConstPtr context)
     {
         return std::make_shared<FunctionBinaryArithmeticWithConstants>(left_, right_, return_type_, context);
     }
@@ -1376,7 +1382,7 @@ public:
         const ColumnWithTypeAndName & left_,
         const ColumnWithTypeAndName & right_,
         const DataTypePtr & return_type_,
-        const Context & context_)
+        ContextConstPtr context_)
         : Base(context_), left(left_), right(right_), return_type(return_type_)
     {
     }
@@ -1526,42 +1532,42 @@ private:
 };
 
 template <template <typename, typename> class Op, typename Name, bool valid_on_default_arguments = true, bool valid_on_float_arguments = true>
-class BinaryArithmeticOverloadResolver : public IFunctionOverloadResolverImpl
+class BinaryArithmeticOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionOverloadResolverImplPtr create(const Context & context)
+    static FunctionOverloadResolverPtr create(ContextConstPtr context)
     {
         return std::make_unique<BinaryArithmeticOverloadResolver>(context);
     }
 
-    explicit BinaryArithmeticOverloadResolver(const Context & context_) : context(context_) {}
+    explicit BinaryArithmeticOverloadResolver(ContextConstPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
     bool isVariadic() const override { return false; }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         /// 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))))
         {
-            return std::make_unique<DefaultFunction>(
+            return std::make_unique<FunctionToFunctionBaseAdaptor>(
                 FunctionBinaryArithmeticWithConstants<Op, Name, valid_on_default_arguments, valid_on_float_arguments>::create(
                     arguments[0], arguments[1], return_type, context),
                 ext::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }),
                 return_type);
         }
 
-        return std::make_unique<DefaultFunction>(
+        return std::make_unique<FunctionToFunctionBaseAdaptor>(
             FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments>::create(context),
             ext::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }),
             return_type);
     }
 
-    DataTypePtr getReturnType(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() != 2)
             throw Exception(
@@ -1571,6 +1577,6 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 }
diff --git a/src/Functions/FunctionBitTestMany.h b/src/Functions/FunctionBitTestMany.h
index 6d527c66390..030919e8836 100644
--- a/src/Functions/FunctionBitTestMany.h
+++ b/src/Functions/FunctionBitTestMany.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnVector.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <ext/range.h>
@@ -24,7 +24,7 @@ struct FunctionBitTestMany : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitTestMany>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitTestMany>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionCustomWeekToSomething.h b/src/Functions/FunctionCustomWeekToSomething.h
index 5634ea11584..d30ce7b5c86 100644
--- a/src/Functions/FunctionCustomWeekToSomething.h
+++ b/src/Functions/FunctionCustomWeekToSomething.h
@@ -3,14 +3,14 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Functions/CustomWeekTransforms.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/TransformDateTime64.h>
-#include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <IO/WriteHelpers.h>
 
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -24,7 +24,7 @@ class FunctionCustomWeekToSomething : public IFunction
 {
 public:
     static constexpr auto name = Transform::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCustomWeekToSomething>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionCustomWeekToSomething>(); }
 
     String getName() const override { return name; }
 
@@ -144,15 +144,15 @@ public:
 
         if (checkAndGetDataType<DataTypeDate>(&type))
         {
-            return Transform::FactorTransform::execute(UInt16(left.get<UInt64>()), DEFAULT_WEEK_MODE, date_lut)
-                    == Transform::FactorTransform::execute(UInt16(right.get<UInt64>()), DEFAULT_WEEK_MODE, date_lut)
+            return Transform::FactorTransform::execute(UInt16(left.get<UInt64>()), date_lut)
+                    == Transform::FactorTransform::execute(UInt16(right.get<UInt64>()), date_lut)
                 ? is_monotonic
                 : is_not_monotonic;
         }
         else
         {
-            return Transform::FactorTransform::execute(UInt32(left.get<UInt64>()), DEFAULT_WEEK_MODE, date_lut)
-                    == Transform::FactorTransform::execute(UInt32(right.get<UInt64>()), DEFAULT_WEEK_MODE, date_lut)
+            return Transform::FactorTransform::execute(UInt32(left.get<UInt64>()), date_lut)
+                    == Transform::FactorTransform::execute(UInt32(right.get<UInt64>()), date_lut)
                 ? is_monotonic
                 : is_not_monotonic;
         }
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index 95b9e25ead1..4418f6e4b4b 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -7,7 +7,7 @@
 
 #include <Columns/ColumnsNumber.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/castTypeToEither.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
@@ -352,7 +352,7 @@ class FunctionDateOrDateTimeAddInterval : public IFunction
 {
 public:
     static constexpr auto name = Transform::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDateOrDateTimeAddInterval>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionDateOrDateTimeAddInterval>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/FunctionDateOrDateTimeToSomething.h b/src/Functions/FunctionDateOrDateTimeToSomething.h
index abe859e2f29..bdf3f425a0b 100644
--- a/src/Functions/FunctionDateOrDateTimeToSomething.h
+++ b/src/Functions/FunctionDateOrDateTimeToSomething.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Functions/DateTimeTransforms.h>
@@ -24,7 +24,7 @@ class FunctionDateOrDateTimeToSomething : public IFunction
 {
 public:
     static constexpr auto name = Transform::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDateOrDateTimeToSomething>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionDateOrDateTimeToSomething>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/FunctionFQDN.cpp b/src/Functions/FunctionFQDN.cpp
index 7b3b89eb511..36fcdfacc99 100644
--- a/src/Functions/FunctionFQDN.cpp
+++ b/src/Functions/FunctionFQDN.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <common/getFQDNOrHostName.h>
@@ -12,7 +12,7 @@ class FunctionFQDN : public IFunction
 {
 public:
     static constexpr auto name = "FQDN";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionFQDN>();
     }
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index e13f310de09..1bb78ead872 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -50,9 +50,9 @@ void FunctionFactory::registerFunction(const
 }
 
 
-FunctionOverloadResolverImplPtr FunctionFactory::getImpl(
+FunctionOverloadResolverPtr FunctionFactory::getImpl(
     const std::string & name,
-    const Context & context) const
+    ContextConstPtr context) const
 {
     auto res = tryGetImpl(name, context);
     if (!res)
@@ -82,17 +82,17 @@ std::vector<std::string> FunctionFactory::getAllNames() const
 
 FunctionOverloadResolverPtr FunctionFactory::get(
     const std::string & name,
-    const Context & context) const
+    ContextConstPtr context) const
 {
-    return std::make_shared<FunctionOverloadResolverAdaptor>(getImpl(name, context));
+    return getImpl(name, context);
 }
 
-FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
+FunctionOverloadResolverPtr FunctionFactory::tryGetImpl(
     const std::string & name_param,
-    const Context & context) const
+    ContextConstPtr context) const
 {
     String name = getAliasToOrName(name_param);
-    FunctionOverloadResolverImplPtr res;
+    FunctionOverloadResolverPtr res;
 
     auto it = functions.find(name);
     if (functions.end() != it)
@@ -110,7 +110,7 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
 
     if (CurrentThread::isInitialized())
     {
-        const auto * query_context = CurrentThread::get().getQueryContext();
+        auto query_context = CurrentThread::get().getQueryContext();
         if (query_context && query_context->getSettingsRef().log_queries)
             query_context->addQueryFactoriesInfo(Context::QueryLogFactories::Function, name);
     }
@@ -120,11 +120,10 @@ FunctionOverloadResolverImplPtr FunctionFactory::tryGetImpl(
 
 FunctionOverloadResolverPtr FunctionFactory::tryGet(
         const std::string & name,
-        const Context & context) const
+        ContextConstPtr context) const
 {
     auto impl = tryGetImpl(name, context);
-    return impl ? std::make_shared<FunctionOverloadResolverAdaptor>(std::move(impl))
-                : nullptr;
+    return impl ? std::move(impl) : nullptr;
 }
 
 FunctionFactory & FunctionFactory::instance()
diff --git a/src/Functions/FunctionFactory.h b/src/Functions/FunctionFactory.h
index 7990e78daf8..bf380d51312 100644
--- a/src/Functions/FunctionFactory.h
+++ b/src/Functions/FunctionFactory.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include <Functions/IFunctionAdaptors.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/IFactoryWithAliases.h>
+#include <Functions/IFunction.h>
+#include <Functions/IFunctionAdaptors.h>
 
 #include <functional>
 #include <memory>
@@ -12,14 +14,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Creates function by name.
   * Function could use for initialization (take ownership of shared_ptr, for example)
   *  some dictionaries from Context.
   */
-class FunctionFactory : private boost::noncopyable, public IFactoryWithAliases<std::function<FunctionOverloadResolverImplPtr(const Context &)>>
+class FunctionFactory : private boost::noncopyable,
+                        public IFactoryWithAliases<std::function<FunctionOverloadResolverPtr(ContextConstPtr)>>
 {
 public:
     static FunctionFactory & instance();
@@ -33,8 +33,9 @@ public:
     template <typename Function>
     void registerFunction(const std::string & name, CaseSensitiveness case_sensitiveness = CaseSensitive)
     {
-        if constexpr (std::is_base_of<IFunction, Function>::value)
-            registerFunction(name, &createDefaultFunction<Function>, case_sensitiveness);
+
+        if constexpr (std::is_base_of_v<IFunction, Function>)
+            registerFunction(name, &adaptFunctionToOverloadResolver<Function>, case_sensitiveness);
         else
             registerFunction(name, &Function::create, case_sensitiveness);
     }
@@ -43,14 +44,21 @@ public:
     std::vector<std::string> getAllNames() const;
 
     /// Throws an exception if not found.
-    FunctionOverloadResolverPtr get(const std::string & name, const Context & context) const;
+    FunctionOverloadResolverPtr get(const std::string & name, ContextConstPtr context) const;
 
     /// Returns nullptr if not found.
-    FunctionOverloadResolverPtr tryGet(const std::string & name, const Context & context) const;
+    FunctionOverloadResolverPtr tryGet(const std::string & name, ContextConstPtr context) const;
 
     /// The same methods to get developer interface implementation.
-    FunctionOverloadResolverImplPtr getImpl(const std::string & name, const Context & context) const;
-    FunctionOverloadResolverImplPtr tryGetImpl(const std::string & name, const Context & context) const;
+    FunctionOverloadResolverPtr getImpl(const std::string & name, ContextConstPtr context) const;
+    FunctionOverloadResolverPtr tryGetImpl(const std::string & name, ContextConstPtr context) const;
+
+    /// Register a function by its name.
+    /// No locking, you must register all functions before usage of get.
+    void registerFunction(
+        const std::string & name,
+        Value creator,
+        CaseSensitiveness case_sensitiveness = CaseSensitive);
 
 private:
     using Functions = std::unordered_map<std::string, Value>;
@@ -59,9 +67,9 @@ private:
     Functions case_insensitive_functions;
 
     template <typename Function>
-    static FunctionOverloadResolverImplPtr createDefaultFunction(const Context & context)
+    static FunctionOverloadResolverPtr adaptFunctionToOverloadResolver(ContextConstPtr context)
     {
-        return std::make_unique<DefaultOverloadResolver>(Function::create(context));
+        return std::make_unique<FunctionToOverloadResolverAdaptor>(Function::create(context));
     }
 
     const Functions & getMap() const override { return functions; }
@@ -69,13 +77,6 @@ private:
     const Functions & getCaseInsensitiveMap() const override { return case_insensitive_functions; }
 
     String getFactoryName() const override { return "FunctionFactory"; }
-
-    /// Register a function by its name.
-    /// No locking, you must register all functions before usage of get.
-    void registerFunction(
-            const std::string & name,
-            Value creator,
-            CaseSensitiveness case_sensitiveness = CaseSensitive);
 };
 
 }
diff --git a/src/Functions/FunctionFile.cpp b/src/Functions/FunctionFile.cpp
index f477f6123c3..cd81f2b4e0b 100644
--- a/src/Functions/FunctionFile.cpp
+++ b/src/Functions/FunctionFile.cpp
@@ -3,10 +3,11 @@
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <IO/ReadBufferFromFile.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Interpreters/Context.h>
 #include <unistd.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -21,12 +22,12 @@ namespace ErrorCodes
 }
 
 /// A function to read file as a string.
-class FunctionFile : public IFunction
+class FunctionFile : public IFunction, WithConstContext
 {
 public:
     static constexpr auto name = "file";
-    static FunctionPtr create(const Context &context) { return std::make_shared<FunctionFile>(context); }
-    explicit FunctionFile(const Context &context_) : context(context_) {}
+    static FunctionPtr create(ContextConstPtr context_) { return std::make_shared<FunctionFile>(context_); }
+    explicit FunctionFile(ContextConstPtr context_) : WithConstContext(context_) {}
 
     String getName() const override { return name; }
 
@@ -68,21 +69,19 @@ public:
         {
             const char * filename = reinterpret_cast<const char *>(&chars[source_offset]);
 
-            const String user_files_path = context.getUserFilesPath();
-            String user_files_absolute_path = Poco::Path(user_files_path).makeAbsolute().makeDirectory().toString();
-            Poco::Path poco_filepath = Poco::Path(filename);
-            if (poco_filepath.isRelative())
-                poco_filepath = Poco::Path(user_files_absolute_path, poco_filepath);
-            const String file_absolute_path = poco_filepath.absolute().toString();
-            checkReadIsAllowedOrThrow(user_files_absolute_path, file_absolute_path);
+            fs::path user_files_absolute_path = fs::canonical(fs::path(getContext()->getUserFilesPath()));
+            fs::path file_path(filename);
+            if (file_path.is_relative())
+                file_path = user_files_absolute_path / file_path;
+            fs::path file_absolute_path = fs::canonical(file_path);
+            checkReadIsAllowedOrThrow(user_files_absolute_path.string(), file_absolute_path);
 
-            checked_filenames[row] = file_absolute_path;
-            auto file = Poco::File(file_absolute_path);
+            checked_filenames[row] = file_absolute_path.string();
 
-            if (!file.exists())
-                throw Exception(fmt::format("File {} doesn't exist.", file_absolute_path), ErrorCodes::FILE_DOESNT_EXIST);
+            if (!fs::exists(file_absolute_path))
+                throw Exception(fmt::format("File {} doesn't exist.", file_absolute_path.string()), ErrorCodes::FILE_DOESNT_EXIST);
 
-            const auto current_file_size = Poco::File(file_absolute_path).getSize();
+            const auto current_file_size = fs::file_size(file_absolute_path);
 
             result_offset += current_file_size + 1;
             res_offsets[row] = result_offset;
@@ -113,16 +112,14 @@ private:
     void checkReadIsAllowedOrThrow(const std::string & user_files_absolute_path, const std::string & file_absolute_path) const
     {
         // If run in Local mode, no need for path checking.
-        if (context.getApplicationType() != Context::ApplicationType::LOCAL)
+        if (getContext()->getApplicationType() != Context::ApplicationType::LOCAL)
             if (file_absolute_path.find(user_files_absolute_path) != 0)
                 throw Exception("File is not inside " + user_files_absolute_path, ErrorCodes::DATABASE_ACCESS_DENIED);
 
-        Poco::File path_poco_file = Poco::File(file_absolute_path);
-        if (path_poco_file.exists() && path_poco_file.isDirectory())
+        fs::path fs_path(file_absolute_path);
+        if (fs::exists(fs_path) && fs::is_directory(fs_path))
             throw Exception("File can't be a directory", ErrorCodes::INCORRECT_FILE_NAME);
     }
-
-    const Context & context;
 };
 
 
diff --git a/src/Functions/FunctionHelpers.cpp b/src/Functions/FunctionHelpers.cpp
index 17c28ee3343..dcdd0e521eb 100644
--- a/src/Functions/FunctionHelpers.cpp
+++ b/src/Functions/FunctionHelpers.cpp
@@ -1,5 +1,5 @@
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
@@ -231,4 +231,75 @@ bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs)
     return lhs_name == rhs_name;
 }
 
+ColumnPtr wrapInNullable(const ColumnPtr & src, const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count)
+{
+    ColumnPtr result_null_map_column;
+
+    /// If result is already nullable.
+    ColumnPtr src_not_nullable = src;
+
+    if (src->onlyNull())
+        return src;
+    else if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*src))
+    {
+        src_not_nullable = nullable->getNestedColumnPtr();
+        result_null_map_column = nullable->getNullMapColumnPtr();
+    }
+
+    for (const auto & elem : args)
+    {
+        if (!elem.type->isNullable())
+            continue;
+
+        /// Const Nullable that are NULL.
+        if (elem.column->onlyNull())
+        {
+            assert(result_type->isNullable());
+            return result_type->createColumnConstWithDefaultValue(input_rows_count);
+        }
+
+        if (isColumnConst(*elem.column))
+            continue;
+
+        if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*elem.column))
+        {
+            const ColumnPtr & null_map_column = nullable->getNullMapColumnPtr();
+            if (!result_null_map_column) //-V1051
+            {
+                result_null_map_column = null_map_column;
+            }
+            else
+            {
+                MutableColumnPtr mutable_result_null_map_column = IColumn::mutate(std::move(result_null_map_column));
+
+                NullMap & result_null_map = assert_cast<ColumnUInt8 &>(*mutable_result_null_map_column).getData();
+                const NullMap & src_null_map = assert_cast<const ColumnUInt8 &>(*null_map_column).getData();
+
+                for (size_t i = 0, size = result_null_map.size(); i < size; ++i)
+                    result_null_map[i] |= src_null_map[i];
+
+                result_null_map_column = std::move(mutable_result_null_map_column);
+            }
+        }
+    }
+
+    if (!result_null_map_column)
+        return makeNullable(src);
+
+    return ColumnNullable::create(src_not_nullable->convertToFullColumnIfConst(), result_null_map_column);
+}
+
+NullPresence getNullPresense(const ColumnsWithTypeAndName & args)
+{
+    NullPresence res;
+
+    for (const auto & elem : args)
+    {
+        res.has_nullable |= elem.type->isNullable();
+        res.has_null_constant |= elem.type->onlyNull();
+    }
+
+    return res;
+}
+
 }
diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index 76e420957be..7ab008b8bea 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -156,4 +156,17 @@ checkAndGetNestedArrayOffset(const IColumn ** columns, size_t num_arguments);
 /// Check if two types are equal
 bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs);
 
+/** Return ColumnNullable of src, with null map as OR-ed null maps of args columns.
+  * Or ColumnConst(ColumnNullable) if the result is always NULL or if the result is constant and always not NULL.
+  */
+ColumnPtr wrapInNullable(const ColumnPtr & src, const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count);
+
+struct NullPresence
+{
+    bool has_nullable = false;
+    bool has_null_constant = false;
+};
+
+NullPresence getNullPresense(const ColumnsWithTypeAndName & args);
+
 }
diff --git a/src/Functions/FunctionIfBase.h b/src/Functions/FunctionIfBase.h
index bdb883ee342..17d02de2e27 100644
--- a/src/Functions/FunctionIfBase.h
+++ b/src/Functions/FunctionIfBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <DataTypes/Native.h>
 
 #if !defined(ARCADIA_BUILD)
@@ -10,7 +10,6 @@
 namespace DB
 {
 
-template <bool null_is_false>
 class FunctionIfBase : public IFunction
 {
 #if USE_EMBEDDED_COMPILER
@@ -40,46 +39,40 @@ public:
         return true;
     }
 
-    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, ValuePlaceholders values) const override
+    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, Values values) const override
     {
         auto & b = static_cast<llvm::IRBuilder<> &>(builder);
-        auto type = getReturnTypeImpl(types);
-        llvm::Value * null = nullptr;
-        if (!null_is_false && type->isNullable())
-            null = b.CreateInsertValue(llvm::Constant::getNullValue(toNativeType(b, type)), b.getTrue(), {1});
+        auto return_type = getReturnTypeImpl(types);
+
         auto * head = b.GetInsertBlock();
-        auto * join = llvm::BasicBlock::Create(head->getContext(), "", head->getParent());
+        auto * join = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
+
         std::vector<std::pair<llvm::BasicBlock *, llvm::Value *>> returns;
         for (size_t i = 0; i + 1 < types.size(); i += 2)
         {
-            auto * then = llvm::BasicBlock::Create(head->getContext(), "", head->getParent());
-            auto * next = llvm::BasicBlock::Create(head->getContext(), "", head->getParent());
-            auto * cond = values[i]();
-            if (!null_is_false && types[i]->isNullable())
-            {
-                auto * nonnull = llvm::BasicBlock::Create(head->getContext(), "", head->getParent());
-                returns.emplace_back(b.GetInsertBlock(), null);
-                b.CreateCondBr(b.CreateExtractValue(cond, {1}), join, nonnull);
-                b.SetInsertPoint(nonnull);
-                b.CreateCondBr(nativeBoolCast(b, removeNullable(types[i]), b.CreateExtractValue(cond, {0})), then, next);
-            }
-            else
-            {
-                b.CreateCondBr(nativeBoolCast(b, types[i], cond), then, next);
-            }
+            auto * then = llvm::BasicBlock::Create(head->getContext(), "then_" + std::to_string(i), head->getParent());
+            auto * next = llvm::BasicBlock::Create(head->getContext(), "next_" + std::to_string(i), head->getParent());
+            auto * cond = values[i];
+
+            b.CreateCondBr(nativeBoolCast(b, types[i], cond), then, next);
             b.SetInsertPoint(then);
-            auto * value = nativeCast(b, types[i + 1], values[i + 1](), type);
+
+            auto * value = nativeCast(b, types[i + 1], values[i + 1], return_type);
             returns.emplace_back(b.GetInsertBlock(), value);
             b.CreateBr(join);
             b.SetInsertPoint(next);
         }
-        auto * value = nativeCast(b, types.back(), values.back()(), type);
-        returns.emplace_back(b.GetInsertBlock(), value);
+
+        auto * else_value = nativeCast(b, types.back(), values.back(), return_type);
+        returns.emplace_back(b.GetInsertBlock(), else_value);
         b.CreateBr(join);
+
         b.SetInsertPoint(join);
-        auto * phi = b.CreatePHI(toNativeType(b, type), returns.size());
-        for (const auto & r : returns)
-            phi->addIncoming(r.second, r.first);
+
+        auto * phi = b.CreatePHI(toNativeType(b, return_type), returns.size());
+        for (const auto & [block, value] : returns)
+            phi->addIncoming(value, block);
+
         return phi;
     }
 #endif
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index 49f155c687b..3a17d049099 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
 }
 
 template <bool or_null>
-ColumnPtr ExecutableFunctionJoinGet<or_null>::execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const
+ColumnPtr ExecutableFunctionJoinGet<or_null>::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const
 {
     ColumnsWithTypeAndName keys;
     for (size_t i = 2; i < arguments.size(); ++i)
@@ -29,14 +29,14 @@ ColumnPtr ExecutableFunctionJoinGet<or_null>::execute(const ColumnsWithTypeAndNa
 }
 
 template <bool or_null>
-ExecutableFunctionImplPtr FunctionJoinGet<or_null>::prepare(const ColumnsWithTypeAndName &) const
+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);
 }
 
 static std::pair<std::shared_ptr<StorageJoin>, String>
-getJoin(const ColumnsWithTypeAndName & arguments, const Context & context)
+getJoin(const ColumnsWithTypeAndName & arguments, ContextConstPtr context)
 {
     String join_name;
     if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
@@ -52,7 +52,7 @@ getJoin(const ColumnsWithTypeAndName & arguments, const Context & context)
     String database_name;
     if (dot == String::npos)
     {
-        database_name = context.getCurrentDatabase();
+        database_name = context->getCurrentDatabase();
         dot = 0;
     }
     else
@@ -63,7 +63,7 @@ getJoin(const ColumnsWithTypeAndName & arguments, const Context & context)
     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}, context);
+    auto table = DatabaseCatalog::instance().getTable({database_name, table_name}, 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);
@@ -81,19 +81,19 @@ getJoin(const ColumnsWithTypeAndName & arguments, const Context & context)
 }
 
 template <bool or_null>
-FunctionBaseImplPtr JoinGetOverloadResolver<or_null>::build(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const
+FunctionBasePtr JoinGetOverloadResolver<or_null>::buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const
 {
     if (arguments.size() < 3)
         throw Exception(
             "Number of arguments for function " + getName() + " doesn't match: passed " + toString(arguments.size())
                 + ", should be greater or equal to 3",
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-    auto [storage_join, attr_name] = getJoin(arguments, context);
+    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;
     auto return_type = storage_join->joinGetCheckAndGetReturnType(data_types, attr_name, or_null);
-    auto table_lock = storage_join->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    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);
 }
 
diff --git a/src/Functions/FunctionJoinGet.h b/src/Functions/FunctionJoinGet.h
index f88b58e961a..0328d1a16e1 100644
--- a/src/Functions/FunctionJoinGet.h
+++ b/src/Functions/FunctionJoinGet.h
@@ -1,5 +1,7 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
 #include <Core/Block.h>
@@ -7,13 +9,12 @@
 namespace DB
 {
 
-class Context;
 class HashJoin;
 class StorageJoin;
 using StorageJoinPtr = std::shared_ptr<StorageJoin>;
 
 template <bool or_null>
-class ExecutableFunctionJoinGet final : public IExecutableFunctionImpl
+class ExecutableFunctionJoinGet final : public IExecutableFunction
 {
 public:
     ExecutableFunctionJoinGet(TableLockHolder table_lock_,
@@ -30,7 +31,7 @@ public:
     bool useDefaultImplementationForLowCardinalityColumns() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
 
     String getName() const override { return name; }
 
@@ -41,7 +42,7 @@ private:
 };
 
 template <bool or_null>
-class FunctionJoinGet final : public IFunctionBaseImpl
+class FunctionJoinGet final : public IFunctionBase
 {
 public:
     static constexpr auto name = or_null ? "joinGetOrNull" : "joinGet";
@@ -62,7 +63,7 @@ public:
     const DataTypes & getArgumentTypes() const override { return argument_types; }
     const DataTypePtr & getResultType() const override { return return_type; }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override;
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override;
 
 private:
     TableLockHolder table_lock;
@@ -73,18 +74,18 @@ private:
 };
 
 template <bool or_null>
-class JoinGetOverloadResolver final : public IFunctionOverloadResolverImpl
+class JoinGetOverloadResolver final : public IFunctionOverloadResolver, WithConstContext
 {
 public:
     static constexpr auto name = or_null ? "joinGetOrNull" : "joinGet";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<JoinGetOverloadResolver>(context); }
+    static FunctionOverloadResolverPtr create(ContextConstPtr context_) { return std::make_unique<JoinGetOverloadResolver>(context_); }
 
-    explicit JoinGetOverloadResolver(const Context & context_) : context(context_) {}
+    explicit JoinGetOverloadResolver(ContextConstPtr context_) : WithConstContext(context_) {}
 
     String getName() const override { return name; }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override;
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName &) const override { return {}; } // Not used
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override;
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName &) const override { return {}; } // Not used
 
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
@@ -92,9 +93,6 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 1}; }
-
-private:
-    const Context & context;
 };
 
 }
diff --git a/src/Functions/FunctionMathBinaryFloat64.h b/src/Functions/FunctionMathBinaryFloat64.h
index 0a0688dc75c..340470fa0b8 100644
--- a/src/Functions/FunctionMathBinaryFloat64.h
+++ b/src/Functions/FunctionMathBinaryFloat64.h
@@ -6,7 +6,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnConst.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 
 #if !defined(ARCADIA_BUILD)
@@ -28,7 +28,7 @@ class FunctionMathBinaryFloat64 : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMathBinaryFloat64>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMathBinaryFloat64>(); }
     static_assert(Impl::rows_per_iteration > 0, "Impl must process at least one row per iteration");
 
     bool useDefaultImplementationForConstants() const override { return true; }
@@ -76,18 +76,8 @@ private:
             if (rows_remaining != 0)
             {
                 RightType right_src_remaining[Impl::rows_per_iteration];
-                if constexpr (!is_big_int_v<RightType> && !std::is_same_v<RightType, Decimal256>)
-                {
-                    memcpy(right_src_remaining, &right_src_data[rows_size], rows_remaining * sizeof(RightType));
-                    memset(right_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(RightType));
-                }
-                else
-                {
-                    for (size_t i = 0; i < rows_remaining; i++)
-                        right_src_remaining[i] = right_src_data[rows_size + i];
-                    for (size_t i = rows_remaining; i < Impl::rows_per_iteration; i++)
-                        right_src_remaining[i] = 0;
-                }
+                memcpy(right_src_remaining, &right_src_data[rows_size], rows_remaining * sizeof(RightType));
+                memset(right_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(RightType));
                 Float64 dst_remaining[Impl::rows_per_iteration];
 
                 Impl::execute(left_src_data, right_src_remaining, dst_remaining);
@@ -123,32 +113,13 @@ private:
             if (rows_remaining != 0)
             {
                 LeftType left_src_remaining[Impl::rows_per_iteration];
-                if constexpr (!is_big_int_v<LeftType> && !std::is_same_v<LeftType, Decimal256>)
-                {
-                    memcpy(left_src_remaining, &left_src_data[rows_size], rows_remaining * sizeof(LeftType));
-                    memset(left_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(LeftType));
-                }
-                else
-                {
-                    for (size_t i = 0; i < rows_remaining; i++)
-                        left_src_remaining[i] = left_src_data[rows_size + i];
-                    for (size_t i = rows_remaining; i < Impl::rows_per_iteration; i++)
-                        left_src_remaining[i] = 0;
-                }
+                memcpy(left_src_remaining, &left_src_data[rows_size], rows_remaining * sizeof(LeftType));
+                memset(left_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(LeftType));
 
                 RightType right_src_remaining[Impl::rows_per_iteration];
-                if constexpr (!is_big_int_v<RightType> && !std::is_same_v<RightType, Decimal256>)
-                {
-                    memcpy(right_src_remaining, &right_src_data[rows_size], rows_remaining * sizeof(RightType));
-                    memset(right_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(RightType));
-                }
-                else
-                {
-                    for (size_t i = 0; i < rows_remaining; i++)
-                        right_src_remaining[i] = right_src_data[rows_size + i];
-                    for (size_t i = rows_remaining; i < Impl::rows_per_iteration; i++)
-                        right_src_remaining[i] = 0;
-                }
+                memcpy(right_src_remaining, &right_src_data[rows_size], rows_remaining * sizeof(RightType));
+                memset(right_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(RightType));
+
                 Float64 dst_remaining[Impl::rows_per_iteration];
 
                 Impl::execute(left_src_remaining, right_src_remaining, dst_remaining);
@@ -178,18 +149,8 @@ private:
             if (rows_remaining != 0)
             {
                 LeftType left_src_remaining[Impl::rows_per_iteration];
-                if constexpr (!is_big_int_v<LeftType> && !std::is_same_v<LeftType, Decimal256>)
-                {
-                    memcpy(left_src_remaining, &left_src_data[rows_size], rows_remaining * sizeof(LeftType));
-                    memset(left_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(LeftType));
-                }
-                else
-                {
-                    for (size_t i = 0; i < rows_remaining; i++)
-                        left_src_remaining[i] = left_src_data[rows_size + i];
-                    for (size_t i = rows_remaining; i < Impl::rows_per_iteration; i++)
-                        left_src_remaining[i] = 0;
-                }
+                memcpy(left_src_remaining, &left_src_data[rows_size], rows_remaining * sizeof(LeftType));
+                memset(left_src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(LeftType));
 
                 Float64 dst_remaining[Impl::rows_per_iteration];
 
diff --git a/src/Functions/FunctionMathConstFloat64.h b/src/Functions/FunctionMathConstFloat64.h
index f03f469bc35..b85b65fc43d 100644
--- a/src/Functions/FunctionMathConstFloat64.h
+++ b/src/Functions/FunctionMathConstFloat64.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
@@ -13,7 +13,7 @@ class FunctionMathConstFloat64 : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMathConstFloat64>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMathConstFloat64>(); }
 
 private:
     String getName() const override { return name; }
diff --git a/src/Functions/FunctionMathUnary.h b/src/Functions/FunctionMathUnary.h
index 49b0428811a..d7804af4f7a 100644
--- a/src/Functions/FunctionMathUnary.h
+++ b/src/Functions/FunctionMathUnary.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypesDecimal.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnDecimal.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 
 #if !defined(ARCADIA_BUILD)
@@ -35,7 +35,7 @@ class FunctionMathUnary : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMathUnary>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMathUnary>(); }
 
 private:
     String getName() const override { return name; }
@@ -87,18 +87,8 @@ private:
             if (rows_remaining != 0)
             {
                 T src_remaining[Impl::rows_per_iteration];
-                if constexpr (is_big_int_v<T> || std::is_same_v<T, Decimal256>)
-                {
-                    for (size_t i = 0; i < rows_remaining; i++)
-                        src_remaining[i] = src_data[rows_size + i];
-                    for (size_t i = rows_remaining; i < Impl::rows_per_iteration; i++)
-                        src_remaining[i] = 0;
-                }
-                else
-                {
-                    memcpy(src_remaining, &src_data[rows_size], rows_remaining * sizeof(T));
-                    memset(src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(T));
-                }
+                memcpy(src_remaining, &src_data[rows_size], rows_remaining * sizeof(T));
+                memset(src_remaining + rows_remaining, 0, (Impl::rows_per_iteration - rows_remaining) * sizeof(T));
                 ReturnType dst_remaining[Impl::rows_per_iteration];
 
                 Impl::execute(src_remaining, dst_remaining);
diff --git a/src/Functions/FunctionNumericPredicate.h b/src/Functions/FunctionNumericPredicate.h
index 72a17adac4c..006f74f531a 100644
--- a/src/Functions/FunctionNumericPredicate.h
+++ b/src/Functions/FunctionNumericPredicate.h
@@ -1,8 +1,10 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
+#include <Interpreters/Context_fwd.h>
 #include <ext/range.h>
 
 
@@ -21,7 +23,7 @@ class FunctionNumericPredicate : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionNumericPredicate>();
     }
diff --git a/src/Functions/FunctionStartsEndsWith.h b/src/Functions/FunctionStartsEndsWith.h
index 2899bc259d5..cf3a406498a 100644
--- a/src/Functions/FunctionStartsEndsWith.h
+++ b/src/Functions/FunctionStartsEndsWith.h
@@ -2,7 +2,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <Functions/GatherUtils/Sources.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/PerformanceAdaptors.h>
 #include <Functions/TargetSpecific.h>
 #include <DataTypes/DataTypeString.h>
@@ -142,7 +142,7 @@ template <typename Name>
 class FunctionStartsEndsWith : public TargetSpecific::Default::FunctionStartsEndsWith<Name>
 {
 public:
-    explicit FunctionStartsEndsWith(const Context & context) : selector(context)
+    explicit FunctionStartsEndsWith(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionStartsEndsWith<Name>>();
@@ -164,7 +164,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionStartsEndsWith<Name>>(context);
     }
diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index e00acc006cf..ceb58a5f7f6 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnString.h>
@@ -25,7 +25,7 @@ class FunctionStringOrArrayToT : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionStringOrArrayToT>();
     }
diff --git a/src/Functions/FunctionStringReplace.h b/src/Functions/FunctionStringReplace.h
index bd8edbf9202..2ff09f79f9e 100644
--- a/src/Functions/FunctionStringReplace.h
+++ b/src/Functions/FunctionStringReplace.h
@@ -23,7 +23,7 @@ class FunctionStringReplace : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionStringReplace>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionStringReplace>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionStringToString.h b/src/Functions/FunctionStringToString.h
index 4123b41c547..9b63eec4a60 100644
--- a/src/Functions/FunctionStringToString.h
+++ b/src/Functions/FunctionStringToString.h
@@ -1,9 +1,11 @@
 #pragma once
+
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -21,7 +23,7 @@ class FunctionStringToString : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionStringToString>();
     }
diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index 06469a83e3e..4b5fdf86078 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -7,7 +7,7 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnFixedString.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IsOperation.h>
 #include <Functions/castTypeToEither.h>
@@ -91,6 +91,7 @@ class FunctionUnaryArithmetic : public IFunction
             DataTypeUInt16,
             DataTypeUInt32,
             DataTypeUInt64,
+            DataTypeUInt128,
             DataTypeUInt256,
             DataTypeInt8,
             DataTypeInt16,
@@ -110,7 +111,7 @@ class FunctionUnaryArithmetic : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUnaryArithmetic>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionUnaryArithmetic>(); }
 
     String getName() const override
     {
@@ -243,7 +244,7 @@ public:
         });
     }
 
-    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, ValuePlaceholders values) const override
+    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, Values values) const override
     {
         assert(1 == types.size() && 1 == values.size());
 
@@ -260,7 +261,7 @@ public:
                 if constexpr (!std::is_same_v<T1, InvalidType> && !IsDataTypeDecimal<DataType> && Op<T0>::compilable)
                 {
                     auto & b = static_cast<llvm::IRBuilder<> &>(builder);
-                    auto * v = nativeCast(b, types[0], values[0](), std::make_shared<DataTypeNumber<T1>>());
+                    auto * v = nativeCast(b, types[0], values[0], std::make_shared<DataTypeNumber<T1>>());
                     result = Op<T0>::compile(b, v, is_signed_v<T1>);
                     return true;
                 }
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index 20e225990bd..a4357c148ac 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -1,149 +1,135 @@
 #pragma once
 
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
 
 #include <common/arithmeticOverflow.h>
 
+
 namespace DB
 {
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int DECIMAL_OVERFLOW;
 }
 
-/** Casts DateTim64 to or from Int64 representation narrowed down (or scaled up) to any scale value defined in Impl.
- */
-template <typename Impl>
-class FunctionUnixTimestamp64 : public IFunction
+/// Cast DateTime64 to Int64 representation narrowed down (or scaled up) to any scale value defined in Impl.
+class FunctionToUnixTimestamp64 : public IFunction
 {
+private:
+    size_t target_scale;
+    const char * name;
 public:
-    static constexpr auto name = Impl::name;
-    static constexpr auto target_scale = Impl::target_scale;
-
-    using SourceDataType = typename Impl::SourceDataType;
-    using ResultDataType = typename Impl::ResultDataType;
-
-    static constexpr bool is_result_datetime64 = std::is_same_v<ResultDataType, DataTypeDateTime64>;
-
-    static_assert(std::is_same_v<SourceDataType, DataTypeDateTime64> || std::is_same_v<ResultDataType, DataTypeDateTime64>);
-
-    static auto create(const Context &)
+    FunctionToUnixTimestamp64(size_t target_scale_, const char * name_)
+        : target_scale(target_scale_), name(name_)
     {
-        return std::make_shared<FunctionUnixTimestamp64<Impl>>();
     }
 
     String getName() const override { return name; }
-    size_t getNumberOfArguments() const override { return is_result_datetime64 ? 2 : 1; }
-    bool isVariadic() const override { return is_result_datetime64; }
+    size_t getNumberOfArguments() const override { return 1; }
+    bool isVariadic() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if constexpr (is_result_datetime64)
-        {
-            validateFunctionArgumentTypes(*this, arguments,
-                    FunctionArgumentDescriptors{{"value", isDataType<SourceDataType>, nullptr, std::string(SourceDataType::family_name).c_str()}},
-                    // optional
-                    FunctionArgumentDescriptors{
-    //                    {"precision", isDataType<DataTypeUInt8>, isColumnConst, ("Precision of the result, default is " + std::to_string(target_scale)).c_str()},
-                        {"timezone", isStringOrFixedString, isColumnConst, "Timezone of the result"},
-                    });
-            const auto timezone = extractTimeZoneNameFromFunctionArguments(arguments, 1, 0);
-            return std::make_shared<DataTypeDateTime64>(target_scale, timezone);
-        }
-        else
-        {
-            validateFunctionArgumentTypes(*this, arguments,
-                    FunctionArgumentDescriptors{{"value", isDataType<SourceDataType>, nullptr, std::string(SourceDataType::family_name).c_str()}});
-            return std::make_shared<DataTypeInt64>();
-        }
+        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 & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        using SourceColumnType = typename SourceDataType::ColumnType;
-        using ResultColumnType = typename ResultDataType::ColumnType;
-
         const auto & src = arguments[0];
         const auto & col = *src.column;
 
-        const SourceColumnType * source_col_typed = checkAndGetColumn<SourceColumnType>(col);
-        if (!source_col_typed && !(source_col_typed = checkAndGetColumnConstData<SourceColumnType>(&col)))
-            throw Exception("Invalid column type" + col.getName() + " expected "
-                    + std::string(SourceDataType::family_name),
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        auto res_column = ColumnInt64::create(input_rows_count);
+        auto & result_data = res_column->getData();
 
-        auto res_column = result_type->createColumn();
+        const auto & source_data = typeid_cast<const ColumnDecimal<DateTime64> &>(col).getData();
 
-        if (input_rows_count == 0)
-            return res_column;
-
-        auto & result_data = assert_cast<ResultColumnType &>(res_column->assumeMutableRef()).getData();
-        result_data.reserve(source_col_typed->size());
-        const auto & source_data = source_col_typed->getData();
-
-        const auto scale_diff = getScaleDiff(*checkAndGetDataType<SourceDataType>(src.type.get()), *checkAndGetDataType<ResultDataType>(result_type.get()));
+        Int32 scale_diff = typeid_cast<const DataTypeDateTime64 &>(*src.type).getScale() - target_scale;
         if (scale_diff == 0)
         {
-            static_assert(sizeof(typename SourceColumnType::Container::value_type) == sizeof(typename ResultColumnType::Container::value_type));
-            // no conversion necessary
-            result_data.push_back_raw_many(source_data.size(), source_data.data());
+            for (size_t i = 0; i < input_rows_count; ++i)
+                result_data[i] = source_data[i];
         }
         else if (scale_diff < 0)
         {
-            const Int64 scale_multiplier = DecimalUtils::scaleMultiplier<Int64>(std::abs(scale_diff));
-            for (const auto & v : source_data)
+            const Int64 scale_multiplier = DecimalUtils::scaleMultiplier<Int64>(-scale_diff);
+            for (size_t i = 0; i < input_rows_count; ++i)
             {
-                Int64 result_value = toDestValue(v);
+                Int64 result_value = source_data[i];
                 if (common::mulOverflow(result_value, scale_multiplier, result_value))
                     throw Exception("Decimal overflow in " + getName(), ErrorCodes::DECIMAL_OVERFLOW);
 
-                result_data.push_back(result_value);
+                result_data[i] = result_value;
             }
         }
         else
         {
             const Int64 scale_multiplier = DecimalUtils::scaleMultiplier<Int64>(scale_diff);
-            for (const auto & v : source_data)
-                result_data.push_back(static_cast<Int64>(toDestValue(v) / scale_multiplier));
+            for (size_t i = 0; i < input_rows_count; ++i)
+                result_data[i] = Int64(source_data[i]) / scale_multiplier;
         }
 
         return res_column;
     }
+};
 
+
+class FunctionFromUnixTimestamp64 : public IFunction
+{
 private:
-    static Int64 getScaleDiff(const SourceDataType & src, const ResultDataType & dst)
+    size_t target_scale;
+    const char * name;
+public:
+    FunctionFromUnixTimestamp64(size_t target_scale_, const char * name_)
+        : target_scale(target_scale_), name(name_)
     {
-        Int64 src_scale = target_scale;
-        if constexpr (std::is_same_v<SourceDataType, DataTypeDateTime64>)
-        {
-            src_scale = src.getScale();
-        }
-
-        Int64 dst_scale = target_scale;
-        if constexpr (std::is_same_v<ResultDataType, DataTypeDateTime64>)
-        {
-            dst_scale = dst.getScale();
-        }
-
-        return src_scale - dst_scale;
     }
 
-    static auto toDestValue(const DateTime64 & v)
+    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; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        return Int64{v.value};
+        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>(target_scale, timezone);
     }
 
-    template <typename T>
-    static auto toDestValue(const T & v)
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        return Int64{v};
+        const auto & src = arguments[0];
+        const auto & col = *src.column;
+
+        auto res_column = ColumnDecimal<DateTime64>::create(input_rows_count, target_scale);
+        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];
+
+        return res_column;
     }
 };
 
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index 8af4a27ecc9..4dfe5cdea91 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -141,7 +141,7 @@ class FunctionEncrypt : public IFunction
 public:
     static constexpr OpenSSLDetails::CompatibilityMode compatibility_mode = Impl::compatibility_mode;
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionEncrypt>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionEncrypt>(); }
 
 private:
     using CipherMode = OpenSSLDetails::CipherMode;
@@ -416,7 +416,7 @@ class FunctionDecrypt : public IFunction
 public:
     static constexpr OpenSSLDetails::CompatibilityMode compatibility_mode = Impl::compatibility_mode;
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDecrypt>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionDecrypt>(); }
 
 private:
     using CipherMode = OpenSSLDetails::CipherMode;
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index a79365ec16c..368e5bccbd1 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -11,7 +11,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 
@@ -93,7 +93,7 @@ class FunctionBitmapBuildImpl : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapBuildImpl>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmapBuildImpl>(); }
 
     String getName() const override { return name; }
 
@@ -221,7 +221,7 @@ class FunctionBitmapToArrayImpl : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapToArrayImpl>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmapToArrayImpl>(); }
 
     String getName() const override { return name; }
 
@@ -311,7 +311,7 @@ class FunctionBitmapSubset : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapSubset<Impl>>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmapSubset<Impl>>(); }
 
     String getName() const override { return name; }
 
@@ -469,7 +469,7 @@ class FunctionBitmapTransform : public IFunction
 public:
     static constexpr auto name = "bitmapTransform";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapTransform>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmapTransform>(); }
 
     String getName() const override { return name; }
 
@@ -635,7 +635,7 @@ class FunctionBitmapSelfCardinalityImpl : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapSelfCardinalityImpl<Impl>>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmapSelfCardinalityImpl<Impl>>(); }
 
     String getName() const override { return name; }
 
@@ -807,7 +807,7 @@ class FunctionBitmapContains : public IFunction
 public:
     static constexpr auto name = "bitmapContains";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapContains>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmapContains>(); }
 
     String getName() const override { return name; }
 
@@ -911,7 +911,7 @@ class FunctionBitmapCardinality : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmapCardinality>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmapCardinality>(); }
 
     String getName() const override { return name; }
 
@@ -1054,7 +1054,7 @@ class FunctionBitmap : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmap>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmap>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsCoding.cpp b/src/Functions/FunctionsCoding.cpp
index cf85b4512d5..c1e20a657b2 100644
--- a/src/Functions/FunctionsCoding.cpp
+++ b/src/Functions/FunctionsCoding.cpp
@@ -20,7 +20,7 @@ void registerFunctionsCoding(FunctionFactory & factory)
     factory.registerFunction<FunctionUUIDNumToString>();
     factory.registerFunction<FunctionUUIDStringToNum>();
     factory.registerFunction<FunctionHex>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionUnhex>();
+    factory.registerFunction<FunctionUnhex>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionChar>(FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionBitmaskToArray>();
     factory.registerFunction<FunctionToIPv4>();
diff --git a/src/Functions/FunctionsCoding.h b/src/Functions/FunctionsCoding.h
index ee15561f133..6c9cd6d333b 100644
--- a/src/Functions/FunctionsCoding.h
+++ b/src/Functions/FunctionsCoding.h
@@ -1,28 +1,29 @@
 #pragma once
 
-#include <Common/formatIPv6.h>
-#include <Common/hex.h>
-#include <Common/IPv6ToBinary.h>
-#include <Common/typeid_cast.h>
-#include <IO/WriteHelpers.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeFixedString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <Columns/ColumnsNumber.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnDecimal.h>
-#include <Functions/IFunctionImpl.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
+#include <IO/WriteHelpers.h>
+#include <Common/IPv6ToBinary.h>
+#include <Common/formatIPv6.h>
+#include <Common/hex.h>
+#include <Common/typeid_cast.h>
 
 #include <arpa/inet.h>
 #include <ext/range.h>
@@ -68,7 +69,7 @@ class FunctionIPv6NumToString : public IFunction
 {
 public:
     static constexpr auto name = "IPv6NumToString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv6NumToString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIPv6NumToString>(); }
 
     String getName() const override { return name; }
 
@@ -138,7 +139,7 @@ class FunctionCutIPv6 : public IFunction
 {
 public:
     static constexpr auto name = "cutIPv6";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCutIPv6>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionCutIPv6>(); }
 
     String getName() const override { return name; }
 
@@ -261,7 +262,7 @@ class FunctionIPv6StringToNum : public IFunction
 {
 public:
     static constexpr auto name = "IPv6StringToNum";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv6StringToNum>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIPv6StringToNum>(); }
 
     static inline bool tryParseIPv4(const char * pos)
     {
@@ -339,7 +340,7 @@ class FunctionIPv4NumToString : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4NumToString<mask_tail_octets, Name>>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIPv4NumToString<mask_tail_octets, Name>>(); }
 
     String getName() const override
     {
@@ -400,7 +401,7 @@ class FunctionIPv4StringToNum : public IFunction
 {
 public:
     static constexpr auto name = "IPv4StringToNum";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4StringToNum>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIPv4StringToNum>(); }
 
     String getName() const override
     {
@@ -463,7 +464,7 @@ class FunctionIPv4ToIPv6 : public IFunction
 {
 public:
      static constexpr auto name = "IPv4ToIPv6";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4ToIPv6>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIPv4ToIPv6>(); }
 
     String getName() const override { return name; }
 
@@ -518,7 +519,7 @@ class FunctionToIPv4 : public FunctionIPv4StringToNum
 {
 public:
     static constexpr auto name = "toIPv4";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToIPv4>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionToIPv4>(); }
 
     String getName() const override
     {
@@ -541,7 +542,7 @@ class FunctionToIPv6 : public FunctionIPv6StringToNum
 {
 public:
     static constexpr auto name = "toIPv6";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToIPv6>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionToIPv6>(); }
 
     String getName() const override { return name; }
 
@@ -559,7 +560,7 @@ class FunctionMACNumToString : public IFunction
 {
 public:
     static constexpr auto name = "MACNumToString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMACNumToString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMACNumToString>(); }
 
     String getName() const override
     {
@@ -689,7 +690,7 @@ class FunctionMACStringTo : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMACStringTo<Impl>>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMACStringTo<Impl>>(); }
 
     String getName() const override
     {
@@ -752,7 +753,7 @@ class FunctionUUIDNumToString : public IFunction
 
 public:
     static constexpr auto name = "UUIDNumToString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUUIDNumToString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionUUIDNumToString>(); }
 
     String getName() const override
     {
@@ -850,7 +851,7 @@ private:
 
 public:
     static constexpr auto name = "UUIDStringToNum";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUUIDStringToNum>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionUUIDStringToNum>(); }
 
     String getName() const override
     {
@@ -954,7 +955,7 @@ class FunctionHex : public IFunction
 {
 public:
     static constexpr auto name = "hex";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionHex>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionHex>(); }
 
     String getName() const override
     {
@@ -1237,7 +1238,7 @@ class FunctionUnhex : public IFunction
 {
 public:
     static constexpr auto name = "unhex";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUnhex>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionUnhex>(); }
 
     String getName() const override
     {
@@ -1326,7 +1327,7 @@ class FunctionChar : public IFunction
 {
 public:
     static constexpr auto name = "char";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionChar>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionChar>(); }
 
     String getName() const override
     {
@@ -1421,7 +1422,7 @@ class FunctionBitmaskToArray : public IFunction
 {
 public:
     static constexpr auto name = "bitmaskToArray";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmaskToArray>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmaskToArray>(); }
 
     String getName() const override
     {
@@ -1507,7 +1508,7 @@ class FunctionToStringCutToZero : public IFunction
 {
 public:
     static constexpr auto name = "toStringCutToZero";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToStringCutToZero>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionToStringCutToZero>(); }
 
     String getName() const override
     {
@@ -1672,7 +1673,7 @@ private:
 
 public:
     static constexpr auto name = "IPv6CIDRToRange";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv6CIDRToRange>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIPv6CIDRToRange>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
@@ -1786,7 +1787,7 @@ private:
 
 public:
     static constexpr auto name = "IPv4CIDRToRange";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIPv4CIDRToRange>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIPv4CIDRToRange>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
@@ -1867,7 +1868,7 @@ class FunctionIsIPv4String : public FunctionIPv4StringToNum
 public:
     static constexpr auto name = "isIPv4String";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIsIPv4String>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIsIPv4String>(); }
 
     String getName() const override { return name; }
 
@@ -1913,7 +1914,7 @@ class FunctionIsIPv6String : public FunctionIPv6StringToNum
 public:
     static constexpr auto name = "isIPv6String";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIsIPv6String>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIsIPv6String>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsComparison.h b/src/Functions/FunctionsComparison.h
index bbfa1ea20d8..0696b0fd335 100644
--- a/src/Functions/FunctionsComparison.h
+++ b/src/Functions/FunctionsComparison.h
@@ -552,22 +552,18 @@ struct NameLessOrEquals    { static constexpr auto name = "lessOrEquals"; };
 struct NameGreaterOrEquals { static constexpr auto name = "greaterOrEquals"; };
 
 
-template <
-    template <typename, typename> class Op,
-    typename Name>
+template <template <typename, typename> class Op, typename Name>
 class FunctionComparison : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionComparison>(context); }
+    static FunctionPtr create(ContextConstPtr context) { return std::make_shared<FunctionComparison>(context); }
 
-    explicit FunctionComparison(const Context & context_)
-    :   context(context_),
-        check_decimal_overflow(decimalCheckComparisonOverflow(context))
-    {}
+    explicit FunctionComparison(ContextConstPtr context_)
+        : context(context_), check_decimal_overflow(decimalCheckComparisonOverflow(context)) {}
 
 private:
-    const Context & context;
+    ContextConstPtr context;
     bool check_decimal_overflow = true;
 
     template <typename T0, typename T1>
@@ -1109,8 +1105,7 @@ public:
 
         if (left_tuple && right_tuple)
         {
-            auto adaptor = FunctionOverloadResolverAdaptor(std::make_unique<DefaultOverloadResolver>(
-                FunctionComparison<Op, Name>::create(context)));
+            auto func = FunctionToOverloadResolverAdaptor(FunctionComparison<Op, Name>::create(context));
 
             bool has_nullable = false;
             bool has_null = false;
@@ -1120,7 +1115,7 @@ public:
             {
                 ColumnsWithTypeAndName args = {{nullptr, left_tuple->getElements()[i], ""},
                                                {nullptr, right_tuple->getElements()[i], ""}};
-                auto element_type = adaptor.build(args)->getResultType();
+                auto element_type = func.build(args)->getResultType();
                 has_nullable = has_nullable || element_type->isNullable();
                 has_null = has_null || element_type->onlyNull();
             }
@@ -1152,17 +1147,24 @@ public:
         /// NOTE: We consider NaN comparison to be implementation specific (and in our implementation NaNs are sometimes equal sometimes not).
         if (left_type->equals(*right_type) && !left_type->isNullable() && !isTuple(left_type) && col_left_untyped == col_right_untyped)
         {
+            ColumnPtr result_column;
+
             /// Always true: =, <=, >=
             if constexpr (IsOperation<Op>::equals
                 || IsOperation<Op>::less_or_equals
                 || IsOperation<Op>::greater_or_equals)
             {
-                return DataTypeUInt8().createColumnConst(input_rows_count, 1u);
+                result_column = DataTypeUInt8().createColumnConst(input_rows_count, 1u);
             }
             else
             {
-                return DataTypeUInt8().createColumnConst(input_rows_count, 0u);
+                result_column = DataTypeUInt8().createColumnConst(input_rows_count, 0u);
             }
+
+            if (!isColumnConst(*col_left_untyped))
+                result_column = result_column->convertToFullColumnIfConst();
+
+            return result_column;
         }
 
         WhichDataType which_left{left_type};
@@ -1244,23 +1246,27 @@ public:
         if (2 != types.size())
             return false;
 
-        auto isBigInteger = &typeIsEither<DataTypeInt64, DataTypeUInt64, DataTypeUUID>;
-        auto isFloatingPoint = &typeIsEither<DataTypeFloat32, DataTypeFloat64>;
-        if ((isBigInteger(*types[0]) && isFloatingPoint(*types[1]))
-            || (isBigInteger(*types[1]) && isFloatingPoint(*types[0]))
-            || (WhichDataType(types[0]).isDate() && WhichDataType(types[1]).isDateTime())
-            || (WhichDataType(types[1]).isDate() && WhichDataType(types[0]).isDateTime()))
+        WhichDataType data_type_lhs(types[0]);
+        WhichDataType data_type_rhs(types[1]);
+
+        auto is_big_integer = [](WhichDataType type) { return type.isUInt64() || type.isInt64(); };
+
+        if ((is_big_integer(data_type_lhs) && data_type_rhs.isFloat())
+            || (is_big_integer(data_type_rhs) && data_type_lhs.isFloat())
+            || (data_type_lhs.isDate() && data_type_rhs.isDateTime())
+            || (data_type_rhs.isDate() && data_type_lhs.isDateTime()))
             return false; /// TODO: implement (double, int_N where N > double's mantissa width)
+
         return isCompilableType(types[0]) && isCompilableType(types[1]);
     }
 
-    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, ValuePlaceholders values) const override
+    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, Values values) const override
     {
         assert(2 == types.size() && 2 == values.size());
 
         auto & b = static_cast<llvm::IRBuilder<> &>(builder);
-        auto * x = values[0]();
-        auto * y = values[1]();
+        auto * x = values[0];
+        auto * y = values[1];
         if (!types[0]->equals(*types[1]))
         {
             llvm::Type * common;
diff --git a/src/Functions/FunctionsConsistentHashing.h b/src/Functions/FunctionsConsistentHashing.h
index faf66579fc4..69163917430 100644
--- a/src/Functions/FunctionsConsistentHashing.h
+++ b/src/Functions/FunctionsConsistentHashing.h
@@ -4,8 +4,9 @@
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -23,7 +24,7 @@ class FunctionConsistentHashImpl : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionConsistentHashImpl<Impl>>();
     }
diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index 3110a204deb..b4cf875adfb 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -13,6 +13,7 @@ void registerFunctionsConversion(FunctionFactory & factory)
     factory.registerFunction<FunctionToUInt16>();
     factory.registerFunction<FunctionToUInt32>();
     factory.registerFunction<FunctionToUInt64>();
+    factory.registerFunction<FunctionToUInt128>();
     factory.registerFunction<FunctionToUInt256>();
     factory.registerFunction<FunctionToInt8>();
     factory.registerFunction<FunctionToInt16>();
@@ -50,6 +51,7 @@ void registerFunctionsConversion(FunctionFactory & factory)
     factory.registerFunction<FunctionToUInt16OrZero>();
     factory.registerFunction<FunctionToUInt32OrZero>();
     factory.registerFunction<FunctionToUInt64OrZero>();
+    factory.registerFunction<FunctionToUInt128OrZero>();
     factory.registerFunction<FunctionToUInt256OrZero>();
     factory.registerFunction<FunctionToInt8OrZero>();
     factory.registerFunction<FunctionToInt16OrZero>();
@@ -74,6 +76,7 @@ void registerFunctionsConversion(FunctionFactory & factory)
     factory.registerFunction<FunctionToUInt16OrNull>();
     factory.registerFunction<FunctionToUInt32OrNull>();
     factory.registerFunction<FunctionToUInt64OrNull>();
+    factory.registerFunction<FunctionToUInt128OrNull>();
     factory.registerFunction<FunctionToUInt256OrNull>();
     factory.registerFunction<FunctionToInt8OrNull>();
     factory.registerFunction<FunctionToInt16OrNull>();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 10aa1987559..5af86d9ff8b 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -36,7 +36,6 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnsCommon.h>
-#include <Common/FieldVisitors.h>
 #include <Common/assert_cast.h>
 #include <Common/quoteString.h>
 #include <Core/AccurateComparison.h>
@@ -125,7 +124,7 @@ struct ConvertImpl
 
     template <typename Additions = void *>
     static ColumnPtr NO_SANITIZE_UNDEFINED execute(
-        const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type [[maybe_unused]], size_t /*input_rows_count*/,
+        const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type [[maybe_unused]], size_t input_rows_count,
         Additions additions [[maybe_unused]] = Additions())
     {
         const ColumnWithTypeAndName & named_from = arguments[0];
@@ -173,31 +172,19 @@ struct ConvertImpl
 
             const auto & vec_from = col_from->getData();
             auto & vec_to = col_to->getData();
-            size_t size = vec_from.size();
-            vec_to.resize(size);
+            vec_to.resize(input_rows_count);
 
             ColumnUInt8::MutablePtr col_null_map_to;
             ColumnUInt8::Container * vec_null_map_to [[maybe_unused]] = nullptr;
             if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
             {
-                col_null_map_to = ColumnUInt8::create(size, false);
+                col_null_map_to = ColumnUInt8::create(input_rows_count, false);
                 vec_null_map_to = &col_null_map_to->getData();
             }
 
-            for (size_t i = 0; i < size; ++i)
+            for (size_t i = 0; i < input_rows_count; ++i)
             {
-                if constexpr ((is_big_int_v<FromFieldType> || is_big_int_v<ToFieldType>) &&
-                    (std::is_same_v<FromFieldType, UInt128> || std::is_same_v<ToFieldType, UInt128>))
-                {
-                    if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
-                    {
-                        vec_to[i] = 0;
-                        (*vec_null_map_to)[i] = true;
-                    }
-                    else
-                        throw Exception("Unexpected UInt128 to big int conversion", ErrorCodes::NOT_IMPLEMENTED);
-                }
-                else if constexpr (std::is_same_v<FromDataType, DataTypeUUID> != std::is_same_v<ToDataType, DataTypeUUID>)
+                if constexpr (std::is_same_v<FromDataType, DataTypeUUID> != std::is_same_v<ToDataType, DataTypeUUID>)
                 {
                     throw Exception("Conversion between numeric types and UUID is not supported", ErrorCodes::NOT_IMPLEMENTED);
                 }
@@ -784,7 +771,7 @@ inline void parseImpl<DataTypeUUID>(DataTypeUUID::FieldType & x, ReadBuffer & rb
 {
     UUID tmp;
     readUUIDText(tmp, rb);
-    x = tmp;
+    x = tmp.toUnderType();
 }
 
 
@@ -824,7 +811,7 @@ inline bool tryParseImpl<DataTypeUUID>(DataTypeUUID::FieldType & x, ReadBuffer &
     if (!tryReadUUIDText(tmp, rb))
         return false;
 
-    x = tmp;
+    x = tmp.toUnderType();
     return true;
 }
 
@@ -1290,7 +1277,7 @@ public:
     static constexpr bool to_string_or_fixed_string = std::is_same_v<ToDataType, DataTypeFixedString> ||
                                                       std::is_same_v<ToDataType, DataTypeString>;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionConvert>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionConvert>(); }
     static FunctionPtr create() { return std::make_shared<FunctionConvert>(); }
 
     String getName() const override
@@ -1302,10 +1289,29 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return std::is_same_v<Name, NameToString>; }
 
+    using DefaultReturnTypeGetter = std::function<DataTypePtr(const ColumnsWithTypeAndName &)>;
+    static DataTypePtr getReturnTypeDefaultImplementationForNulls(const ColumnsWithTypeAndName & arguments, const DefaultReturnTypeGetter & getter)
+    {
+        NullPresence null_presence = getNullPresense(arguments);
+
+        if (null_presence.has_null_constant)
+        {
+            return makeNullable(std::make_shared<DataTypeNothing>());
+        }
+        if (null_presence.has_nullable)
+        {
+            auto nested_columns = Block(createBlockWithNestedColumns(arguments));
+            auto return_type = getter(ColumnsWithTypeAndName(nested_columns.begin(), nested_columns.end()));
+            return makeNullable(return_type);
+        }
+
+        return getter(arguments);
+    }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         auto getter = [&] (const auto & args) { return getReturnTypeImplRemovedNullable(args); };
-        auto res = FunctionOverloadResolverAdaptor::getReturnTypeDefaultImplementationForNulls(arguments, getter);
+        auto res = getReturnTypeDefaultImplementationForNulls(arguments, getter);
         to_nullable = res->isNullable();
         checked_return_type = true;
         return res;
@@ -1454,7 +1460,7 @@ private:
     ColumnPtr executeInternal(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
         if (arguments.empty())
-            throw Exception{"Function " + getName() + " expects at least 1 arguments",
+            throw Exception{"Function " + getName() + " expects at least 1 argument",
                ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION};
 
         const IDataType * from_type = arguments[0].type.get();
@@ -1471,7 +1477,7 @@ private:
             {
                 if constexpr (std::is_same_v<RightDataType, DataTypeDateTime64>)
                 {
-                    // account for optional timezone argument
+                    /// Account for optional timezone argument.
                     if (arguments.size() != 2 && arguments.size() != 3)
                         throw Exception{"Function " + getName() + " expects 2 or 3 arguments for DataTypeDateTime64.",
                             ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION};
@@ -1586,7 +1592,7 @@ public:
 
     static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionConvertFromString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionConvertFromString>(); }
     static FunctionPtr create() { return std::make_shared<FunctionConvertFromString>(); }
 
     String getName() const override
@@ -1958,6 +1964,7 @@ struct NameToUInt8 { static constexpr auto name = "toUInt8"; };
 struct NameToUInt16 { static constexpr auto name = "toUInt16"; };
 struct NameToUInt32 { static constexpr auto name = "toUInt32"; };
 struct NameToUInt64 { static constexpr auto name = "toUInt64"; };
+struct NameToUInt128 { static constexpr auto name = "toUInt128"; };
 struct NameToUInt256 { static constexpr auto name = "toUInt256"; };
 struct NameToInt8 { static constexpr auto name = "toInt8"; };
 struct NameToInt16 { static constexpr auto name = "toInt16"; };
@@ -1973,6 +1980,7 @@ using FunctionToUInt8 = FunctionConvert<DataTypeUInt8, NameToUInt8, ToNumberMono
 using FunctionToUInt16 = FunctionConvert<DataTypeUInt16, NameToUInt16, ToNumberMonotonicity<UInt16>>;
 using FunctionToUInt32 = FunctionConvert<DataTypeUInt32, NameToUInt32, ToNumberMonotonicity<UInt32>>;
 using FunctionToUInt64 = FunctionConvert<DataTypeUInt64, NameToUInt64, ToNumberMonotonicity<UInt64>>;
+using FunctionToUInt128 = FunctionConvert<DataTypeUInt128, NameToUInt128, ToNumberMonotonicity<UInt128>>;
 using FunctionToUInt256 = FunctionConvert<DataTypeUInt256, NameToUInt256, ToNumberMonotonicity<UInt256>>;
 using FunctionToInt8 = FunctionConvert<DataTypeInt8, NameToInt8, ToNumberMonotonicity<Int8>>;
 using FunctionToInt16 = FunctionConvert<DataTypeInt16, NameToInt16, ToNumberMonotonicity<Int16>>;
@@ -2001,6 +2009,7 @@ template <> struct FunctionTo<DataTypeUInt8> { using Type = FunctionToUInt8; };
 template <> struct FunctionTo<DataTypeUInt16> { using Type = FunctionToUInt16; };
 template <> struct FunctionTo<DataTypeUInt32> { using Type = FunctionToUInt32; };
 template <> struct FunctionTo<DataTypeUInt64> { using Type = FunctionToUInt64; };
+template <> struct FunctionTo<DataTypeUInt128> { using Type = FunctionToUInt128; };
 template <> struct FunctionTo<DataTypeUInt256> { using Type = FunctionToUInt256; };
 template <> struct FunctionTo<DataTypeInt8> { using Type = FunctionToInt8; };
 template <> struct FunctionTo<DataTypeInt16> { using Type = FunctionToInt16; };
@@ -2030,6 +2039,7 @@ struct NameToUInt8OrZero { static constexpr auto name = "toUInt8OrZero"; };
 struct NameToUInt16OrZero { static constexpr auto name = "toUInt16OrZero"; };
 struct NameToUInt32OrZero { static constexpr auto name = "toUInt32OrZero"; };
 struct NameToUInt64OrZero { static constexpr auto name = "toUInt64OrZero"; };
+struct NameToUInt128OrZero { static constexpr auto name = "toUInt128OrZero"; };
 struct NameToUInt256OrZero { static constexpr auto name = "toUInt256OrZero"; };
 struct NameToInt8OrZero { static constexpr auto name = "toInt8OrZero"; };
 struct NameToInt16OrZero { static constexpr auto name = "toInt16OrZero"; };
@@ -2052,6 +2062,7 @@ using FunctionToUInt8OrZero = FunctionConvertFromString<DataTypeUInt8, NameToUIn
 using FunctionToUInt16OrZero = FunctionConvertFromString<DataTypeUInt16, NameToUInt16OrZero, ConvertFromStringExceptionMode::Zero>;
 using FunctionToUInt32OrZero = FunctionConvertFromString<DataTypeUInt32, NameToUInt32OrZero, ConvertFromStringExceptionMode::Zero>;
 using FunctionToUInt64OrZero = FunctionConvertFromString<DataTypeUInt64, NameToUInt64OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToUInt128OrZero = FunctionConvertFromString<DataTypeUInt128, NameToUInt128OrZero, ConvertFromStringExceptionMode::Zero>;
 using FunctionToUInt256OrZero = FunctionConvertFromString<DataTypeUInt256, NameToUInt256OrZero, ConvertFromStringExceptionMode::Zero>;
 using FunctionToInt8OrZero = FunctionConvertFromString<DataTypeInt8, NameToInt8OrZero, ConvertFromStringExceptionMode::Zero>;
 using FunctionToInt16OrZero = FunctionConvertFromString<DataTypeInt16, NameToInt16OrZero, ConvertFromStringExceptionMode::Zero>;
@@ -2074,6 +2085,7 @@ struct NameToUInt8OrNull { static constexpr auto name = "toUInt8OrNull"; };
 struct NameToUInt16OrNull { static constexpr auto name = "toUInt16OrNull"; };
 struct NameToUInt32OrNull { static constexpr auto name = "toUInt32OrNull"; };
 struct NameToUInt64OrNull { static constexpr auto name = "toUInt64OrNull"; };
+struct NameToUInt128OrNull { static constexpr auto name = "toUInt128OrNull"; };
 struct NameToUInt256OrNull { static constexpr auto name = "toUInt256OrNull"; };
 struct NameToInt8OrNull { static constexpr auto name = "toInt8OrNull"; };
 struct NameToInt16OrNull { static constexpr auto name = "toInt16OrNull"; };
@@ -2096,6 +2108,7 @@ using FunctionToUInt8OrNull = FunctionConvertFromString<DataTypeUInt8, NameToUIn
 using FunctionToUInt16OrNull = FunctionConvertFromString<DataTypeUInt16, NameToUInt16OrNull, ConvertFromStringExceptionMode::Null>;
 using FunctionToUInt32OrNull = FunctionConvertFromString<DataTypeUInt32, NameToUInt32OrNull, ConvertFromStringExceptionMode::Null>;
 using FunctionToUInt64OrNull = FunctionConvertFromString<DataTypeUInt64, NameToUInt64OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToUInt128OrNull = FunctionConvertFromString<DataTypeUInt128, NameToUInt128OrNull, ConvertFromStringExceptionMode::Null>;
 using FunctionToUInt256OrNull = FunctionConvertFromString<DataTypeUInt256, NameToUInt256OrNull, ConvertFromStringExceptionMode::Null>;
 using FunctionToInt8OrNull = FunctionConvertFromString<DataTypeInt8, NameToInt8OrNull, ConvertFromStringExceptionMode::Null>;
 using FunctionToInt16OrNull = FunctionConvertFromString<DataTypeInt16, NameToInt16OrNull, ConvertFromStringExceptionMode::Null>;
@@ -2156,7 +2169,7 @@ using FunctionParseDateTime64BestEffortOrZero = FunctionConvertFromString<
 using FunctionParseDateTime64BestEffortOrNull = FunctionConvertFromString<
     DataTypeDateTime64, NameParseDateTime64BestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
 
-class ExecutableFunctionCast : public IExecutableFunctionImpl
+class ExecutableFunctionCast : public IExecutableFunction
 {
 public:
     using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
@@ -2174,7 +2187,7 @@ public:
     String getName() const override { return name; }
 
 protected:
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         /// drop second argument, pass others
         ColumnsWithTypeAndName new_arguments{arguments.front()};
@@ -2214,7 +2227,7 @@ enum class CastType
     accurateOrNull
 };
 
-class FunctionCast final : public IFunctionBaseImpl
+class FunctionCast final : public IFunctionBase
 {
 public:
     using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
@@ -2233,7 +2246,7 @@ public:
     const DataTypes & getArgumentTypes() const override { return argument_types; }
     const DataTypePtr & getResultType() const override { return return_type; }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName & /*sample_columns*/) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName & /*sample_columns*/) const override
     {
         try
         {
@@ -2275,10 +2288,9 @@ private:
     std::optional<Diagnostic> diagnostic;
     CastType cast_type;
 
-    WrapperType createFunctionAdaptor(FunctionPtr function, const DataTypePtr & from_type) const
+    static WrapperType createFunctionAdaptor(FunctionPtr function, const DataTypePtr & from_type)
     {
-        auto function_adaptor = FunctionOverloadResolverAdaptor(std::make_unique<DefaultOverloadResolver>(function))
-                                    .build({ColumnWithTypeAndName{nullptr, from_type, ""}});
+        auto function_adaptor = std::make_unique<FunctionToOverloadResolverAdaptor>(function)->build({ColumnWithTypeAndName{nullptr, from_type, ""}});
 
         return [function_adaptor]
             (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
@@ -2367,7 +2379,7 @@ private:
         };
     }
 
-    WrapperType createStringWrapper(const DataTypePtr & from_type) const
+    static WrapperType createStringWrapper(const DataTypePtr & from_type)
     {
         FunctionPtr function = FunctionToString::create();
         return createFunctionAdaptor(function, from_type);
@@ -2496,7 +2508,7 @@ private:
         }
     }
 
-    WrapperType createArrayWrapper(const DataTypePtr & from_type_untyped, const DataTypeArray * to_type) const
+    WrapperType createArrayWrapper(const DataTypePtr & from_type_untyped, const DataTypeArray & to_type) const
     {
         /// Conversion from String through parsing.
         if (checkAndGetDataType<DataTypeString>(from_type_untyped.get()))
@@ -2507,24 +2519,23 @@ private:
             };
         }
 
-        DataTypePtr from_nested_type;
-        DataTypePtr to_nested_type;
         const auto * from_type = checkAndGetDataType<DataTypeArray>(from_type_untyped.get());
-
-        /// get the most nested type
-        if (from_type && to_type)
+        if (!from_type)
         {
-            from_nested_type = from_type->getNestedType();
-            to_nested_type = to_type->getNestedType();
-
-            from_type = checkAndGetDataType<DataTypeArray>(from_nested_type.get());
-            to_type = checkAndGetDataType<DataTypeArray>(to_nested_type.get());
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "CAST AS Array can only be performed between same-dimensional Array or String types");
         }
 
-        /// both from_type and to_type should be nullptr now is array types had same dimensions
-        if ((from_type == nullptr) != (to_type == nullptr))
-            throw Exception{"CAST AS Array can only be performed between same-dimensional array types or from String",
-                ErrorCodes::TYPE_MISMATCH};
+        DataTypePtr from_nested_type = from_type->getNestedType();
+
+        /// In query SELECT CAST([] AS Array(Array(String))) from type is Array(Nothing)
+        bool from_empty_array = isNothing(from_nested_type);
+
+        if (from_type->getNumberOfDimensions() != to_type.getNumberOfDimensions() && !from_empty_array)
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "CAST AS Array can only be performed between same-dimensional array types");
+
+        const DataTypePtr & to_nested_type = to_type.getNestedType();
 
         /// Prepare nested type conversion
         const auto nested_function = prepareUnpackDictionaries(from_nested_type, to_nested_type);
@@ -2641,7 +2652,7 @@ private:
     WrapperType createMapToMapWrrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
     {
         return [element_wrappers = getElementWrappers(from_kv_types, to_kv_types), from_kv_types, to_kv_types]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
         {
             const auto * col = arguments.front().column.get();
             const auto & column_map = typeid_cast<const ColumnMap &>(*col);
@@ -2651,7 +2662,7 @@ private:
             for (size_t i = 0; i < 2; ++i)
             {
                 ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, input_rows_count);
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
             }
 
             return ColumnMap::create(converted_columns[0], converted_columns[1], column_map.getNestedColumn().getOffsetsPtr());
@@ -2662,7 +2673,7 @@ private:
     WrapperType createArrayToMapWrrapper(const DataTypes & from_kv_types, const DataTypes & to_kv_types) const
     {
         return [element_wrappers = getElementWrappers(from_kv_types, to_kv_types), from_kv_types, to_kv_types]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
         {
             const auto * col = arguments.front().column.get();
             const auto & column_array = typeid_cast<const ColumnArray &>(*col);
@@ -2672,7 +2683,7 @@ private:
             for (size_t i = 0; i < 2; ++i)
             {
                 ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, input_rows_count);
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
             }
 
             return ColumnMap::create(converted_columns[0], converted_columns[1], column_array.getOffsetsPtr());
@@ -3044,6 +3055,7 @@ private:
                 std::is_same_v<ToDataType, DataTypeUInt16> ||
                 std::is_same_v<ToDataType, DataTypeUInt32> ||
                 std::is_same_v<ToDataType, DataTypeUInt64> ||
+                std::is_same_v<ToDataType, DataTypeUInt128> ||
                 std::is_same_v<ToDataType, DataTypeUInt256> ||
                 std::is_same_v<ToDataType, DataTypeInt8> ||
                 std::is_same_v<ToDataType, DataTypeInt16> ||
@@ -3090,14 +3102,12 @@ private:
                 return createStringWrapper(from_type);
             case TypeIndex::FixedString:
                 return createFixedStringWrapper(from_type, checkAndGetDataType<DataTypeFixedString>(to_type.get())->getN());
-
             case TypeIndex::Array:
-                return createArrayWrapper(from_type, checkAndGetDataType<DataTypeArray>(to_type.get()));
+                return createArrayWrapper(from_type, static_cast<const DataTypeArray &>(*to_type));
             case TypeIndex::Tuple:
                 return createTupleWrapper(from_type, checkAndGetDataType<DataTypeTuple>(to_type.get()));
             case TypeIndex::Map:
                 return createMapWrapper(from_type, checkAndGetDataType<DataTypeMap>(to_type.get()));
-
             case TypeIndex::AggregateFunction:
                 return createAggregateFunctionWrapper(from_type, checkAndGetDataType<DataTypeAggregateFunction>(to_type.get()));
             default:
@@ -3125,43 +3135,45 @@ public:
 
     static MonotonicityForRange getMonotonicityInformation(const DataTypePtr & from_type, const IDataType * to_type)
     {
-        if (const auto type = checkAndGetDataType<DataTypeUInt8>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeUInt8>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt16>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeUInt16>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt32>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeUInt32>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt64>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeUInt64>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeUInt256>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeUInt128>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt8>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeUInt256>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt16>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeInt8>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt32>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeInt16>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt64>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeInt32>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt128>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeInt64>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeInt256>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeInt128>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeFloat32>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeInt256>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeFloat64>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeFloat32>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeDate>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeFloat64>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeDateTime>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeDate>(to_type))
             return monotonicityForType(type);
-        if (const auto type = checkAndGetDataType<DataTypeString>(to_type))
+        if (const auto * type = checkAndGetDataType<DataTypeDateTime>(to_type))
+            return monotonicityForType(type);
+        if (const auto * type = checkAndGetDataType<DataTypeString>(to_type))
             return monotonicityForType(type);
         if (isEnum(from_type))
         {
-            if (const auto type = checkAndGetDataType<DataTypeEnum8>(to_type))
+            if (const auto * type = checkAndGetDataType<DataTypeEnum8>(to_type))
                 return monotonicityForType(type);
-            if (const auto type = checkAndGetDataType<DataTypeEnum16>(to_type))
+            if (const auto * type = checkAndGetDataType<DataTypeEnum16>(to_type))
                 return monotonicityForType(type);
         }
         /// other types like Null, FixedString, Array and Tuple have no monotonicity defined
@@ -3170,7 +3182,7 @@ public:
 };
 
 template<CastType cast_type>
-class CastOverloadResolver : public IFunctionOverloadResolverImpl
+class CastOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     using MonotonicityForRange = FunctionCast::MonotonicityForRange;
@@ -3184,12 +3196,12 @@ public:
         ? accurate_cast_name
         : (cast_type == CastType::accurateOrNull ? accurate_cast_or_null_name : cast_name);
 
-    static FunctionOverloadResolverImplPtr create(const Context & context)
+    static FunctionOverloadResolverPtr create(ContextConstPtr context)
     {
-        return createImpl(context.getSettingsRef().cast_keep_nullable);
+        return createImpl(context->getSettingsRef().cast_keep_nullable);
     }
 
-    static FunctionOverloadResolverImplPtr createImpl(bool keep_nullable, std::optional<Diagnostic> diagnostic = {})
+    static FunctionOverloadResolverPtr createImpl(bool keep_nullable, std::optional<Diagnostic> diagnostic = {})
     {
         return std::make_unique<CastOverloadResolver>(keep_nullable, std::move(diagnostic));
     }
@@ -3207,7 +3219,7 @@ public:
 
 protected:
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         DataTypes data_types(arguments.size());
 
@@ -3218,7 +3230,7 @@ protected:
         return std::make_unique<FunctionCast>(name, std::move(monotonicity), data_types, return_type, diagnostic, cast_type);
     }
 
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         const auto & column = arguments.back().column;
         if (!column)
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.h b/src/Functions/FunctionsEmbeddedDictionaries.h
index 01456365740..a19c6226f91 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.h
+++ b/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -9,7 +9,7 @@
 #include <Columns/ColumnString.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/EmbeddedDictionaries.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Dictionaries/Embedded/RegionsHierarchy.h>
 #include <Dictionaries/Embedded/RegionsHierarchies.h>
@@ -165,14 +165,14 @@ public:
                 + toString(arguments.size()) + ", should be 1 or 2.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        if (arguments[0]->getName() != TypeName<T>::get())
+        if (arguments[0]->getName() != TypeName<T>)
             throw Exception("Illegal type " + arguments[0]->getName() + " of argument of function " + getName()
-                + " (must be " + String(TypeName<T>::get()) + ")",
+                + " (must be " + String(TypeName<T>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>::get())
+        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>)
             throw Exception("Illegal type " + arguments[1]->getName() + " of the second ('point of view') argument of function " + getName()
-                + " (must be " + String(TypeName<T>::get()) + ")",
+                + " (must be " + String(TypeName<T>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return arguments[0];
@@ -259,19 +259,19 @@ public:
                 + toString(arguments.size()) + ", should be 2 or 3.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        if (arguments[0]->getName() != TypeName<T>::get())
+        if (arguments[0]->getName() != TypeName<T>)
             throw Exception("Illegal type " + arguments[0]->getName() + " of first argument of function " + getName()
-                + " (must be " + String(TypeName<T>::get()) + ")",
+                + " (must be " + String(TypeName<T>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        if (arguments[1]->getName() != TypeName<T>::get())
+        if (arguments[1]->getName() != TypeName<T>)
             throw Exception("Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + " (must be " + String(TypeName<T>::get()) + ")",
+                + " (must be " + String(TypeName<T>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        if (arguments.size() == 3 && arguments[2]->getName() != TypeName<String>::get())
+        if (arguments.size() == 3 && arguments[2]->getName() != TypeName<String>)
             throw Exception("Illegal type " + arguments[2]->getName() + " of the third ('point of view') argument of function " + getName()
-                + " (must be " + String(TypeName<String>::get()) + ")",
+                + " (must be " + String(TypeName<String>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return std::make_shared<DataTypeUInt8>();
@@ -397,14 +397,14 @@ public:
                 + toString(arguments.size()) + ", should be 1 or 2.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        if (arguments[0]->getName() != TypeName<T>::get())
+        if (arguments[0]->getName() != TypeName<T>)
             throw Exception("Illegal type " + arguments[0]->getName() + " of argument of function " + getName()
-            + " (must be " + String(TypeName<T>::get()) + ")",
+            + " (must be " + String(TypeName<T>) + ")",
             ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>::get())
+        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>)
             throw Exception("Illegal type " + arguments[1]->getName() + " of the second ('point of view') argument of function " + getName()
-                + " (must be " + String(TypeName<String>::get()) + ")",
+                + " (must be " + String(TypeName<String>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return std::make_shared<DataTypeArray>(arguments[0]);
@@ -483,81 +483,81 @@ struct NameRegionIn                    { static constexpr auto name = "regionIn"
 struct FunctionRegionToCity :
     public FunctionTransformWithDictionary<UInt32, RegionToCityImpl,    RegionsHierarchyGetter,    NameRegionToCity>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToArea :
     public FunctionTransformWithDictionary<UInt32, RegionToAreaImpl,    RegionsHierarchyGetter,    NameRegionToArea>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToDistrict :
     public FunctionTransformWithDictionary<UInt32, RegionToDistrictImpl, RegionsHierarchyGetter, NameRegionToDistrict>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToCountry :
     public FunctionTransformWithDictionary<UInt32, RegionToCountryImpl, RegionsHierarchyGetter, NameRegionToCountry>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToContinent :
     public FunctionTransformWithDictionary<UInt32, RegionToContinentImpl, RegionsHierarchyGetter, NameRegionToContinent>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToTopContinent :
     public FunctionTransformWithDictionary<UInt32, RegionToTopContinentImpl, RegionsHierarchyGetter, NameRegionToTopContinent>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionToPopulation :
     public FunctionTransformWithDictionary<UInt32, RegionToPopulationImpl, RegionsHierarchyGetter, NameRegionToPopulation>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionIn :
     public FunctionIsInWithDictionary<UInt32, RegionInImpl, RegionsHierarchyGetter,    NameRegionIn>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
 struct FunctionRegionHierarchy :
     public FunctionHierarchyWithDictionary<UInt32, RegionHierarchyImpl, RegionsHierarchyGetter, NameRegionHierarchy>
 {
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<base_type>(context.getEmbeddedDictionaries().getRegionsHierarchies());
+        return std::make_shared<base_type>(context->getEmbeddedDictionaries().getRegionsHierarchies());
     }
 };
 
@@ -567,9 +567,9 @@ class FunctionRegionToName : public IFunction
 {
 public:
     static constexpr auto name = "regionToName";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<FunctionRegionToName>(context.getEmbeddedDictionaries().getRegionsNames());
+        return std::make_shared<FunctionRegionToName>(context->getEmbeddedDictionaries().getRegionsNames());
     }
 
 private:
@@ -602,14 +602,14 @@ public:
                 + toString(arguments.size()) + ", should be 1 or 2.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        if (arguments[0]->getName() != TypeName<UInt32>::get())
+        if (arguments[0]->getName() != TypeName<UInt32>)
             throw Exception("Illegal type " + arguments[0]->getName() + " of the first argument of function " + getName()
-                + " (must be " + String(TypeName<UInt32>::get()) + ")",
+                + " (must be " + String(TypeName<UInt32>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>::get())
+        if (arguments.size() == 2 && arguments[1]->getName() != TypeName<String>)
             throw Exception("Illegal type " + arguments[0]->getName() + " of the second argument of function " + getName()
-                + " (must be " + String(TypeName<String>::get()) + ")",
+                + " (must be " + String(TypeName<String>) + ")",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return std::make_shared<DataTypeString>();
@@ -643,9 +643,9 @@ public:
 
             const ColumnUInt32::Container & region_ids = col_from->getData();
 
-            for (size_t i = 0; i < region_ids.size(); ++i)
+            for (unsigned int region_id : region_ids)
             {
-                const StringRef & name_ref = dict.getRegionName(region_ids[i], language);
+                const StringRef & name_ref = dict.getRegionName(region_id, language);
                 col_to->insertDataWithTerminatingZero(name_ref.data, name_ref.size + 1);
             }
 
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 1f8ef60b4af..89c76f93061 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -27,7 +27,7 @@
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/castColumn.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <ext/range.h>
 
@@ -62,18 +62,18 @@ namespace ErrorCodes
   */
 
 
-class FunctionDictHelper
+class FunctionDictHelper : WithConstContext
 {
 public:
-    explicit FunctionDictHelper(const Context & context_) : context(context_) {}
+    explicit FunctionDictHelper(ContextConstPtr context_) : WithConstContext(context_) {}
 
     std::shared_ptr<const IDictionary> getDictionary(const String & dictionary_name)
     {
-        auto dict = context.getExternalDictionariesLoader().getDictionary(dictionary_name, context);
+        auto dict = getContext()->getExternalDictionariesLoader().getDictionary(dictionary_name, getContext());
 
         if (!access_checked)
         {
-            context.checkAccess(AccessType::dictGet, dict->getDatabaseOrNoDatabaseTag(), dict->getDictionaryID().getTableName());
+            getContext()->checkAccess(AccessType::dictGet, dict->getDatabaseOrNoDatabaseTag(), dict->getDictionaryID().getTableName());
             access_checked = true;
         }
 
@@ -97,26 +97,25 @@ public:
             return false;
 
         if (sample_columns.columns() < 3)
-            throw Exception{"Wrong arguments count", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Wrong arguments count");
 
         const auto * dict_name_col = checkAndGetColumnConst<ColumnString>(sample_columns.getByPosition(0).column.get());
         if (!dict_name_col)
-            throw Exception{"First argument of function dictGet... must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "First argument of function dictGet must be a constant string");
 
         const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(sample_columns.getByPosition(1).column.get());
         if (!attr_name_col)
-            throw Exception{"Second argument of function dictGet... must be a constant string", ErrorCodes::ILLEGAL_COLUMN};
+            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>());
     }
 
     DictionaryStructure getDictionaryStructure(const String & dictionary_name) const
     {
-        return context.getExternalDictionariesLoader().getDictionaryStructure(dictionary_name, context);
+        return getContext()->getExternalDictionariesLoader().getDictionaryStructure(dictionary_name, getContext());
     }
 
 private:
-    const Context & context;
     /// Access cannot be not granted, since in this case checkAccess() will throw and access_checked will not be updated.
     std::atomic<bool> access_checked = false;
 
@@ -133,12 +132,12 @@ class FunctionDictHas final : public IFunction
 public:
     static constexpr auto name = "dictHas";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictHas>(context);
     }
 
-    explicit FunctionDictHas(const Context & context_) : helper(context_) {}
+    explicit FunctionDictHas(ContextConstPtr context_) : helper(context_) {}
 
     String getName() const override { return name; }
 
@@ -154,16 +153,22 @@ public:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() < 2)
-            throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Wrong argument count for function {}",
+                getName());
 
         if (!isString(arguments[0]))
-            throw Exception{"Illegal type " + arguments[0]->getName() + " of first argument of function " + getName()
-                + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of first argument of function, expected a string",
+                arguments[0]->getName(),
+                getName());
 
         if (!WhichDataType(arguments[1]).isUInt64() &&
             !isTuple(arguments[1]))
-            throw Exception{"Illegal type " + arguments[1]->getName() + " of second argument of function " + getName()
-                + ", must be UInt64 or tuple(...).", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of second argument of function {} must be UInt64 or tuple(...)",
+                arguments[1]->getName(),
+                getName());
 
         return std::make_shared<DataTypeUInt8>();
     }
@@ -193,31 +198,39 @@ public:
         if (dictionary_key_type == DictionaryKeyType::range)
         {
             if (arguments.size() != 3)
-                throw Exception{"Wrong argument count for function " + getName()
-                    + " when dictionary has key type range", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Wrong argument count for function {} when dictionary has key type range",
+                    getName());
 
             range_col = arguments[2].column;
             range_col_type = arguments[2].type;
 
             if (!(range_col_type->isValueRepresentedByInteger() && range_col_type->getSizeOfValueInMemory() <= sizeof(Int64)))
-                throw Exception{"Illegal type " + range_col_type->getName() + " of fourth argument of function "
-                        + getName() + " must be convertible to Int64.",
-                    ErrorCodes::ILLEGAL_COLUMN};
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal type {} of fourth argument of function {} must be convertible to Int64.",
+                    range_col_type->getName(),
+                    getName());
         }
 
         if (dictionary_key_type == DictionaryKeyType::simple)
         {
             if (!key_column_type.isUInt64())
-                throw Exception{"Second argument of function " + getName() + " must be " + dictionary->getStructure().getKeyDescription(),
-                    ErrorCodes::TYPE_MISMATCH};
+                 throw Exception(
+                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                     "Second argument of function {} must be UInt64 when dictionary is simple. Actual type {}.",
+                     getName(),
+                     key_column_with_type.type->getName());
 
             return dictionary->hasKeys({key_column}, {std::make_shared<DataTypeUInt64>()});
         }
         else if (dictionary_key_type == DictionaryKeyType::complex)
         {
             if (!key_column_type.isTuple())
-                throw Exception{"Second argument of function " + getName() + " must be " + dictionary->getStructure().getKeyDescription(),
-                    ErrorCodes::TYPE_MISMATCH};
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Second argument of function {} must be tuple when dictionary is complex. Actual type {}.",
+                    getName(),
+                    key_column_with_type.type->getName());
 
             /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
             ColumnPtr key_column_full = key_column->convertToFullColumnIfConst();
@@ -228,7 +241,16 @@ public:
             return dictionary->hasKeys(key_columns, key_types);
         }
         else
+        {
+            if (!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});
+        }
     }
 
 private:
@@ -248,12 +270,12 @@ class FunctionDictGetNoType final : public IFunction
 public:
     static constexpr auto name = dictionary_get_function_type == DictionaryGetFunctionType::get ? "dictGet" : "dictGetOrDefault";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictGetNoType>(context);
     }
 
-    explicit FunctionDictGetNoType(const Context & context_) : helper(context_) {}
+    explicit FunctionDictGetNoType(ContextConstPtr context_) : helper(context_) {}
 
     String getName() const override { return name; }
 
@@ -273,14 +295,18 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() < 3)
-            throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Wrong argument count for function {}",
+                getName());
 
         String dictionary_name;
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
             dictionary_name = name_col->getValue<String>();
         else
-            throw Exception{"Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName()
-                + ", expected a const string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of first argument of function {}, expected a const string.",
+                arguments[0].type->getName(),
+                getName());
 
         Strings attribute_names = getAttributeNamesFromColumn(arguments[1].column, arguments[1].type);
 
@@ -311,17 +337,20 @@ public:
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
             dictionary_name = name_col->getValue<String>();
         else
-            throw Exception{"Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName()
-                + ", expected a const string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of first argument of function {}, expected a const string.",
+                arguments[0].type->getName(),
+                getName());
 
         Strings attribute_names = getAttributeNamesFromColumn(arguments[1].column, arguments[1].type);
 
         auto dictionary = helper.getDictionary(dictionary_name);
 
         if (!WhichDataType(arguments[2].type).isUInt64() && !isTuple(arguments[2].type))
-            throw Exception{"Illegal type " + arguments[2].type->getName() + " of third argument of function "
-                    + getName() + ", must be UInt64 or tuple(...).",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of third argument of function {}, must be UInt64 or tuple(...).",
+                arguments[2].type->getName(),
+                getName());
 
         auto dictionary_key_type = dictionary->getKeyType();
 
@@ -333,15 +362,20 @@ public:
         if (dictionary_key_type == DictionaryKeyType::range)
         {
             if (current_arguments_index >= arguments.size())
-                throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Number of arguments for function {} doesn't match: passed {} should be {}",
+                    getName(),
+                    arguments.size(),
+                    arguments.size() + 1);
 
             range_col = arguments[current_arguments_index].column;
             range_col_type = arguments[current_arguments_index].type;
 
             if (!(range_col_type->isValueRepresentedByInteger() && range_col_type->getSizeOfValueInMemory() <= sizeof(Int64)))
-                throw Exception{"Illegal type " + range_col_type->getName() + " of fourth argument of function "
-                        + getName() + " must be convertible to Int64.",
-                    ErrorCodes::ILLEGAL_COLUMN};
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                    "Illegal type {} of fourth argument of function must be convertible to Int64.",
+                    range_col_type->getName(),
+                    getName());
 
             ++current_arguments_index;
         }
@@ -351,7 +385,11 @@ public:
         if (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault)
         {
             if (current_arguments_index >= arguments.size())
-                throw Exception{"Wrong argument count for function " + getName(), ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Number of arguments for function {} doesn't match: passed {} should be {}",
+                    getName(),
+                    arguments.size(),
+                    arguments.size() + 1);
 
             const auto & column_before_cast = arguments[current_arguments_index];
 
@@ -361,10 +399,14 @@ public:
 
                 for (const auto & nested_type : nested_types)
                     if (nested_type->isNullable())
-                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Wrong argument for function ({}) default values column nullable is not supported", getName());
+                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Wrong argument for function {} default values column nullable is not supported",
+                            getName());
             }
             else if (column_before_cast.type->isNullable())
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Wrong argument for function ({}) default values column nullable is not supported", getName());
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Wrong argument for function {} default values column nullable is not supported",
+                    getName());
 
             auto result_type_no_nullable = removeNullable(result_type);
 
@@ -378,11 +420,12 @@ public:
 
                 if (!tuple_column)
                     throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "Wrong argument for function ({}) default values column must be tuple", getName());
+                        "Wrong argument for function {} default values column must be tuple",
+                        getName());
 
                 if (tuple_column->tupleSize() != attribute_names.size())
                     throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "Wrong argument for function ({}) default values tuple column must contain same column size as requested attributes",
+                        "Wrong argument for function {} default values tuple column must contain same column size as requested attributes",
                         getName());
 
                 default_cols = tuple_column->getColumnsCopy();
@@ -406,7 +449,7 @@ public:
             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 simple. Actual type ({}).",
+                     "Third argument of function {} must be UInt64 when dictionary is simple. Actual type {}.",
                      getName(),
                      key_col_with_type.type->getName());
 
@@ -436,7 +479,7 @@ public:
             if (!isTuple(key_col_with_type.type))
                  throw Exception(
                      ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                     "Third argument of function ({}) must be tuple when dictionary is complex. Actual type ({}).",
+                     "Third argument of function {} must be tuple when dictionary is complex. Actual type {}.",
                      getName(),
                      key_col_with_type.type->getName());
 
@@ -446,7 +489,7 @@ public:
             if (!isTuple(key_col_with_type.type))
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Third argument of function ({}) must be tuple when dictionary is complex. Actual type ({}).",
+                    "Third argument of function {} must be tuple when dictionary is complex. Actual type {}.",
                     getName(),
                     key_col_with_type.type->getName());
 
@@ -479,7 +522,7 @@ public:
             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 ({}).",
+                     "Third argument of function {} must be UInt64 when dictionary is range. Actual type {}.",
                      getName(),
                      key_col_with_type.type->getName());
 
@@ -505,7 +548,7 @@ public:
                     default_cols.front());
         }
         else
-            throw Exception{"Unknown dictionary identifier type", ErrorCodes::BAD_ARGUMENTS};
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown dictionary identifier type");
 
         return result;
     }
@@ -525,7 +568,7 @@ private:
 
             if (tuple_size < 1)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Tuple second argument of function ({}) must contain multiple constant string columns");
+                    "Tuple second argument of function {} must contain multiple constant string columns");
 
             for (size_t i = 0; i < tuple_col.tupleSize(); ++i)
             {
@@ -535,7 +578,7 @@ private:
 
                 if (!attribute_name_column)
                     throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "Tuple second argument of function ({}) must contain multiple constant string columns",
+                        "Tuple second argument of function {} must contain multiple constant string columns",
                         getName());
 
                 attribute_names.emplace_back(attribute_name_column->getDataAt(0));
@@ -543,7 +586,7 @@ 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.",
+                "Illegal type {} of second argument of function {}, expected a const string or const tuple of const strings.",
                 type->getName(),
                 getName());
 
@@ -561,12 +604,12 @@ class FunctionDictGetImpl final : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictGetImpl>(context);
     }
 
-    explicit FunctionDictGetImpl(const Context & context_) : impl(context_) {}
+    explicit FunctionDictGetImpl(ContextConstPtr context_) : impl(context_) {}
 
     String getName() const override { return name; }
 
@@ -700,12 +743,12 @@ class FunctionDictGetOrNull final : public IFunction
 public:
     static constexpr auto name = "dictGetOrNull";
 
-    static FunctionPtr create(const Context &context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictGetOrNull>(context);
     }
 
-    explicit FunctionDictGetOrNull(const Context & context_)
+    explicit FunctionDictGetOrNull(ContextConstPtr context_)
         : dictionary_get_func_impl(context_)
         , dictionary_has_func_impl(context_)
     {}
@@ -751,8 +794,11 @@ private:
         return result_type;
     }
 
-    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
     {
+        if (input_rows_count == 0)
+            return result_type->createColumn();
+
         /** We call dictHas function to get which map is key presented in dictionary.
             For key that presented in dictionary dict has result for that key index value will be 1. Otherwise 0.
             We invert result, and then for key that is not presented in dictionary value will be 1. Otherwise 0.
@@ -774,15 +820,15 @@ private:
         for (auto & key : is_key_in_dictionary_data)
             key = !key;
 
-        auto result_type = dictionary_get_func_impl.getReturnTypeImpl(arguments);
-        auto dictionary_get_result_column = dictionary_get_func_impl.executeImpl(arguments, result_type, input_rows_count);
+        auto dictionary_get_result_type = dictionary_get_func_impl.getReturnTypeImpl(arguments);
+        auto dictionary_get_result_column = dictionary_get_func_impl.executeImpl(arguments, dictionary_get_result_type, input_rows_count);
 
         ColumnPtr result;
 
-        WhichDataType result_data_type(result_type);
+        WhichDataType dictionary_get_result_data_type(dictionary_get_result_type);
         auto dictionary_get_result_column_mutable = dictionary_get_result_column->assumeMutable();
 
-        if (result_data_type.isTuple())
+        if (dictionary_get_result_data_type.isTuple())
         {
             ColumnTuple & column_tuple = assert_cast<ColumnTuple &>(*dictionary_get_result_column_mutable);
 
@@ -852,6 +898,7 @@ private:
     const FunctionDictGetNoType<DictionaryGetFunctionType::get> dictionary_get_func_impl;
     const FunctionDictHas dictionary_has_func_impl;
 };
+
 /// Functions to work with hierarchies.
 
 class FunctionDictGetHierarchy final : public IFunction
@@ -859,12 +906,12 @@ class FunctionDictGetHierarchy final : public IFunction
 public:
     static constexpr auto name = "dictGetHierarchy";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictGetHierarchy>(context);
     }
 
-    explicit FunctionDictGetHierarchy(const Context & context_) : helper(context_) {}
+    explicit FunctionDictGetHierarchy(ContextConstPtr context_) : helper(context_) {}
 
     String getName() const override { return name; }
 
@@ -879,13 +926,13 @@ private:
     {
         if (!isString(arguments[0]))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of first argument of function ({}). Expected String. Actual type ({})",
+                "Illegal type of first argument of function {}. Expected String. Actual type {}",
                 getName(),
                 arguments[0]->getName());
 
         if (!WhichDataType(arguments[1]).isUInt64())
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of second argument of function ({}). Expected UInt64. Actual type ({})",
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
                 getName(),
                 arguments[1]->getName());
 
@@ -903,7 +950,7 @@ private:
 
         if (!dictionary->hasHierarchy())
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                "Dictionary ({}) does not support hierarchy",
+                "Dictionary {} does not support hierarchy",
                 dictionary->getFullName());
 
         ColumnPtr result = dictionary->getHierarchy(arguments[1].column, std::make_shared<DataTypeUInt64>());
@@ -919,12 +966,12 @@ class FunctionDictIsIn final : public IFunction
 public:
     static constexpr auto name = "dictIsIn";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictIsIn>(context);
     }
 
-    explicit FunctionDictIsIn(const Context & context_)
+    explicit FunctionDictIsIn(ContextConstPtr context_)
         : helper(context_) {}
 
     String getName() const override { return name; }
@@ -939,19 +986,19 @@ private:
     {
         if (!isString(arguments[0]))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of first argument of function ({}). Expected String. Actual type ({})",
+                "Illegal type of first argument of function {}. Expected String. Actual type {}",
                 getName(),
                 arguments[0]->getName());
 
         if (!WhichDataType(arguments[1]).isUInt64())
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of second argument of function ({}). Expected UInt64. Actual type ({})",
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
                 getName(),
                 arguments[1]->getName());
 
         if (!WhichDataType(arguments[2]).isUInt64())
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of third argument of function ({}). Expected UInt64. Actual type ({})",
+                "Illegal type of third argument of function {}. Expected UInt64. Actual type {}",
                 getName(),
                 arguments[2]->getName());
 
@@ -968,7 +1015,9 @@ private:
         auto dict = helper.getDictionary(arguments[0].column);
 
         if (!dict->hasHierarchy())
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Dictionary ({}) does not support hierarchy", dict->getFullName());
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Dictionary {} does not support hierarchy",
+                dict->getFullName());
 
         ColumnPtr res = dict->isInHierarchy(arguments[1].column, arguments[2].column, std::make_shared<DataTypeUInt64>());
 
@@ -983,12 +1032,12 @@ class FunctionDictGetChildren final : public IFunction
 public:
     static constexpr auto name = "dictGetChildren";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictGetChildren>(context);
     }
 
-    explicit FunctionDictGetChildren(const Context & context_)
+    explicit FunctionDictGetChildren(ContextConstPtr context_)
         : helper(context_) {}
 
     String getName() const override { return name; }
@@ -1004,13 +1053,13 @@ private:
     {
         if (!isString(arguments[0]))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of first argument of function ({}). Expected String. Actual type ({})",
+                "Illegal type of first argument of function {}. Expected String. Actual type {}",
                 getName(),
                 arguments[0]->getName());
 
         if (!WhichDataType(arguments[1]).isUInt64())
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of second argument of function ({}). Expected UInt64. Actual type ({})",
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
                 getName(),
                 arguments[1]->getName());
 
@@ -1026,7 +1075,7 @@ private:
 
         if (!dictionary->hasHierarchy())
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                "Dictionary ({}) does not support hierarchy",
+                "Dictionary {} does not support hierarchy",
                 dictionary->getFullName());
 
         ColumnPtr result = dictionary->getDescendants(arguments[1].column, std::make_shared<DataTypeUInt64>(), 1);
@@ -1042,12 +1091,12 @@ class FunctionDictGetDescendants final : public IFunction
 public:
     static constexpr auto name = "dictGetDescendants";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionDictGetDescendants>(context);
     }
 
-    explicit FunctionDictGetDescendants(const Context & context_)
+    explicit FunctionDictGetDescendants(ContextConstPtr context_)
         : helper(context_) {}
 
     String getName() const override { return name; }
@@ -1067,27 +1116,27 @@ private:
         if (arguments_size < 2 || arguments_size > 3)
         {
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Illegal arguments size of function ({}). Expects 2 or 3 arguments size. Actual size ({})",
+                "Illegal arguments size of function {}. Expects 2 or 3 arguments size. Actual size {}",
                 getName(),
                 arguments_size);
         }
 
         if (!isString(arguments[0]))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of first argument of function ({}). Expected const String. Actual type ({})",
+                "Illegal type of first argument of function {}. Expected const String. Actual type {}",
                 getName(),
                 arguments[0]->getName());
 
         if (!WhichDataType(arguments[1]).isUInt64())
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of second argument of function ({}). Expected UInt64. Actual type ({})",
+                "Illegal type of second argument of function {}. Expected UInt64. Actual type {}",
                 getName(),
                 arguments[1]->getName());
 
         if (arguments.size() == 3 && !isUnsignedInteger(arguments[2]))
         {
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type of third argument of function ({}). Expected const unsigned integer. Actual type ({})",
+                "Illegal type of third argument of function {}. Expected const unsigned integer. Actual type {}",
                 getName(),
                 arguments[2]->getName());
         }
@@ -1108,7 +1157,7 @@ private:
         {
             if (!isColumnConst(*arguments[2].column))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Illegal type of third argument of function ({}). Expected const unsigned integer.",
+                    "Illegal type of third argument of function {}. Expected const unsigned integer.",
                     getName());
 
             level = static_cast<size_t>(arguments[2].column->get64(0));
@@ -1116,7 +1165,7 @@ private:
 
         if (!dictionary->hasHierarchy())
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                "Dictionary ({}) does not support hierarchy",
+                "Dictionary {} does not support hierarchy",
                 dictionary->getFullName());
 
         ColumnPtr res = dictionary->getDescendants(arguments[1].column, std::make_shared<DataTypeUInt64>(), level);
diff --git a/src/Functions/FunctionsExternalModels.cpp b/src/Functions/FunctionsExternalModels.cpp
index ecec9383252..6bcaf13cd69 100644
--- a/src/Functions/FunctionsExternalModels.cpp
+++ b/src/Functions/FunctionsExternalModels.cpp
@@ -18,9 +18,9 @@
 namespace DB
 {
 
-FunctionPtr FunctionModelEvaluate::create(const Context & context)
+FunctionPtr FunctionModelEvaluate::create(ContextConstPtr context)
 {
-    return std::make_shared<FunctionModelEvaluate>(context.getExternalModelsLoader());
+    return std::make_shared<FunctionModelEvaluate>(context->getExternalModelsLoader());
 }
 
 namespace ErrorCodes
diff --git a/src/Functions/FunctionsExternalModels.h b/src/Functions/FunctionsExternalModels.h
index 9bb6cc5a77c..b9d611934e6 100644
--- a/src/Functions/FunctionsExternalModels.h
+++ b/src/Functions/FunctionsExternalModels.h
@@ -1,11 +1,12 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
 class ExternalModelsLoader;
-class Context;
 
 /// Evaluate external model.
 /// First argument - model name, the others - model arguments.
@@ -16,7 +17,7 @@ class FunctionModelEvaluate final : public IFunction
 public:
     static constexpr auto name = "modelEvaluate";
 
-    static FunctionPtr create(const Context & context);
+    static FunctionPtr create(ContextConstPtr context);
 
     explicit FunctionModelEvaluate(const ExternalModelsLoader & models_loader_) : models_loader(models_loader_) {}
 
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 41152660e4f..25f57e06f2e 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -39,7 +39,7 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/TargetSpecific.h>
 #include <Functions/PerformanceAdaptors.h>
@@ -535,7 +535,7 @@ class FunctionStringHashFixedString : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionStringHashFixedString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionStringHashFixedString>(); }
 
     String getName() const override
     {
@@ -700,7 +700,7 @@ template <typename Impl, typename Name>
 class FunctionIntHash : public TargetSpecific::Default::FunctionIntHash<Impl, Name>
 {
 public:
-    explicit FunctionIntHash(const Context & context) : selector(context)
+    explicit FunctionIntHash(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionIntHash<Impl, Name>>();
@@ -718,7 +718,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionIntHash>(context);
     }
@@ -973,7 +973,7 @@ private:
         else if (which.isUInt16()) executeIntType<UInt16, first>(icolumn, vec_to);
         else if (which.isUInt32()) executeIntType<UInt32, first>(icolumn, vec_to);
         else if (which.isUInt64()) executeIntType<UInt64, first>(icolumn, vec_to);
-        else if (which.isUInt128() || which.isUUID()) executeBigIntType<UInt128, first>(icolumn, vec_to);
+        else if (which.isUInt128()) executeBigIntType<UInt128, first>(icolumn, vec_to);
         else if (which.isUInt256()) executeBigIntType<UInt256, first>(icolumn, vec_to);
         else if (which.isInt8()) executeIntType<Int8, first>(icolumn, vec_to);
         else if (which.isInt16()) executeIntType<Int16, first>(icolumn, vec_to);
@@ -981,6 +981,7 @@ private:
         else if (which.isInt64()) executeIntType<Int64, first>(icolumn, vec_to);
         else if (which.isInt128()) executeBigIntType<Int128, first>(icolumn, vec_to);
         else if (which.isInt256()) executeBigIntType<Int256, first>(icolumn, vec_to);
+        else if (which.isUUID()) executeBigIntType<UUID, first>(icolumn, vec_to);
         else if (which.isEnum8()) executeIntType<Int8, first>(icolumn, vec_to);
         else if (which.isEnum16()) executeIntType<Int16, first>(icolumn, vec_to);
         else if (which.isDate()) executeIntType<UInt16, first>(icolumn, vec_to);
@@ -1076,7 +1077,7 @@ template <typename Impl>
 class FunctionAnyHash : public TargetSpecific::Default::FunctionAnyHash<Impl>
 {
 public:
-    explicit FunctionAnyHash(const Context & context) : selector(context)
+    explicit FunctionAnyHash(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionAnyHash<Impl>>();
@@ -1094,7 +1095,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionAnyHash>(context);
     }
@@ -1181,7 +1182,7 @@ class FunctionURLHash : public IFunction
 {
 public:
     static constexpr auto name = "URLHash";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionURLHash>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionURLHash>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
index f066bb1029a..6024658dd6f 100644
--- a/src/Functions/FunctionsJSON.h
+++ b/src/Functions/FunctionsJSON.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Core/AccurateComparison.h>
 #include <Functions/DummyJSONParser.h>
 #include <Functions/SimdJSONParser.h>
@@ -270,11 +270,11 @@ private:
 
 
 template <typename Name, template<typename> typename Impl>
-class FunctionJSON : public IFunction
+class FunctionJSON : public IFunction, WithConstContext
 {
 public:
-    static FunctionPtr create(const Context & context_) { return std::make_shared<FunctionJSON>(context_); }
-    FunctionJSON(const Context & context_) : context(context_) {}
+    static FunctionPtr create(ContextConstPtr context_) { return std::make_shared<FunctionJSON>(context_); }
+    FunctionJSON(ContextConstPtr context_) : WithConstContext(context_) {}
 
     static constexpr auto name = Name::name;
     String getName() const override { return Name::name; }
@@ -291,7 +291,7 @@ public:
     {
         /// Choose JSONParser.
 #if USE_SIMDJSON
-        if (context.getSettingsRef().allow_simdjson)
+        if (getContext()->getSettingsRef().allow_simdjson)
             return FunctionJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count);
 #endif
 
@@ -301,9 +301,6 @@ public:
         return FunctionJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count);
 #endif
     }
-
-private:
-    const Context & context;
 };
 
 
@@ -613,8 +610,8 @@ struct JSONExtractTree
     class Node
     {
     public:
-        Node() {}
-        virtual ~Node() {}
+        Node() = default;
+        virtual ~Node() = default;
         virtual bool insertResultToColumn(IColumn &, const Element &) = 0;
     };
 
diff --git a/src/Functions/FunctionsLogical.cpp b/src/Functions/FunctionsLogical.cpp
index ab8e1cfc0b2..68eed88e59c 100644
--- a/src/Functions/FunctionsLogical.cpp
+++ b/src/Functions/FunctionsLogical.cpp
@@ -521,6 +521,70 @@ ColumnPtr FunctionAnyArityLogical<Impl, Name>::executeImpl(
         return basicExecuteImpl<Impl>(std::move(args_in), input_rows_count);
 }
 
+template <typename Impl, typename Name>
+ColumnPtr FunctionAnyArityLogical<Impl, Name>::getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
+{
+    /** Try to perform optimization for saturable functions (AndFunction, OrFunction) in case some arguments are
+      * constants.
+      * If function is not saturable (XorFunction) we cannot perform such optimization.
+      * If function is AndFunction and in arguments there is constant false, result is false.
+      * If function is OrFunction and in arguments there is constant true, result is true.
+      */
+    if constexpr (!Impl::isSaturable())
+        return nullptr;
+
+    bool has_true_constant = false;
+    bool has_false_constant = false;
+
+    for (const auto & argument : arguments)
+    {
+        ColumnPtr column = argument.column;
+
+        if (!column || !isColumnConst(*column))
+            continue;
+
+        DataTypePtr non_nullable_type = removeNullable(argument.type);
+        TypeIndex data_type_index = non_nullable_type->getTypeId();
+
+        if (!isNativeNumber(data_type_index))
+            continue;
+
+        const ColumnConst * const_column = static_cast<const ColumnConst *>(column.get());
+
+        Field constant_field_value = const_column->getField();
+        if (constant_field_value.isNull())
+            continue;
+
+        auto field_type = constant_field_value.getType();
+
+        bool constant_value_bool = false;
+
+        if (field_type == Field::Types::Float64)
+            constant_value_bool = static_cast<bool>(constant_field_value.get<Float64>());
+        else if (field_type == Field::Types::Int64)
+            constant_value_bool = static_cast<bool>(constant_field_value.get<Int64>());
+        else if (field_type == Field::Types::UInt64)
+            constant_value_bool = static_cast<bool>(constant_field_value.get<UInt64>());
+
+        has_true_constant = has_true_constant || constant_value_bool;
+        has_false_constant = has_false_constant || !constant_value_bool;
+    }
+
+    ColumnPtr result_column;
+
+    if constexpr (std::is_same_v<Impl, AndImpl>)
+    {
+        if (has_false_constant)
+            result_type->createColumnConst(0, static_cast<UInt8>(false));
+    }
+    else if constexpr (std::is_same_v<Impl, OrImpl>)
+    {
+        if (has_true_constant)
+            result_type->createColumnConst(0, static_cast<UInt8>(true));
+    }
+
+    return result_column;
+}
 
 template <typename A, typename Op>
 struct UnaryOperationImpl
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index a5579ebdf8a..339cc25510d 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -3,7 +3,8 @@
 #include <common/types.h>
 #include <Core/Defines.h>
 #include <DataTypes/IDataType.h>
-#include <Functions/IFunctionImpl.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <type_traits>
 
@@ -138,7 +139,7 @@ class FunctionAnyArityLogical : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionAnyArityLogical>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionAnyArityLogical>(); }
 
 public:
     String getName() const override
@@ -154,21 +155,23 @@ 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 &, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+
+    ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const override;
 
 #if USE_EMBEDDED_COMPILER
     bool isCompilableImpl(const DataTypes &) const override { return useDefaultImplementationForNulls(); }
 
-    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, ValuePlaceholders values) const override
+    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, Values values) const override
     {
         assert(!types.empty() && !values.empty());
 
         auto & b = static_cast<llvm::IRBuilder<> &>(builder);
         if constexpr (!Impl::isSaturable())
         {
-            auto * result = nativeBoolCast(b, types[0], values[0]());
+            auto * result = nativeBoolCast(b, types[0], values[0]);
             for (size_t i = 1; i < types.size(); i++)
-                result = Impl::apply(b, result, nativeBoolCast(b, types[i], values[i]()));
+                result = Impl::apply(b, result, nativeBoolCast(b, types[i], values[i]));
             return b.CreateSelect(result, b.getInt8(1), b.getInt8(0));
         }
         constexpr bool breakOnTrue = Impl::isSaturatedValue(true);
@@ -179,7 +182,7 @@ public:
         for (size_t i = 0; i < types.size(); i++)
         {
             b.SetInsertPoint(next);
-            auto * value = values[i]();
+            auto * value = values[i];
             auto * truth = nativeBoolCast(b, types[i], value);
             if (!types[i]->equals(DataTypeUInt8{}))
                 value = b.CreateSelect(truth, b.getInt8(1), b.getInt8(0));
@@ -203,7 +206,7 @@ class FunctionUnaryLogical : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionUnaryLogical>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionUnaryLogical>(); }
 
 public:
     String getName() const override
@@ -222,10 +225,10 @@ public:
 #if USE_EMBEDDED_COMPILER
     bool isCompilableImpl(const DataTypes &) const override { return true; }
 
-    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, ValuePlaceholders values) const override
+    llvm::Value * compileImpl(llvm::IRBuilderBase & builder, const DataTypes & types, Values values) const override
     {
         auto & b = static_cast<llvm::IRBuilder<> &>(builder);
-        return b.CreateSelect(Impl<UInt8>::apply(b, nativeBoolCast(b, types[0], values[0]())), b.getInt8(1), b.getInt8(0));
+        return b.CreateSelect(Impl<UInt8>::apply(b, nativeBoolCast(b, types[0], values[0])), b.getInt8(1), b.getInt8(0));
     }
 #endif
 };
diff --git a/src/Functions/FunctionsMiscellaneous.h b/src/Functions/FunctionsMiscellaneous.h
index 1828af892f4..00a67a1c172 100644
--- a/src/Functions/FunctionsMiscellaneous.h
+++ b/src/Functions/FunctionsMiscellaneous.h
@@ -17,7 +17,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-class ExecutableFunctionExpression : public IExecutableFunctionImpl
+class ExecutableFunctionExpression : public IExecutableFunction
 {
 public:
     struct Signature
@@ -35,7 +35,7 @@ public:
 
     String getName() const override { return "FunctionExpression"; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         DB::Block expr_columns;
         for (size_t i = 0; i < arguments.size(); ++i)
@@ -58,7 +58,7 @@ private:
 };
 
 /// Executes expression. Uses for lambda functions implementation. Can't be created from factory.
-class FunctionExpression : public IFunctionBaseImpl
+class FunctionExpression : public IFunctionBase
 {
 public:
     using Signature = ExecutableFunctionExpression::Signature;
@@ -81,7 +81,7 @@ public:
     const DataTypes & getArgumentTypes() const override { return argument_types; }
     const DataTypePtr & getResultType() const override { return return_type; }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionExpression>(expression_actions, signature);
     }
@@ -97,7 +97,7 @@ private:
 /// Returns ColumnFunction with captured columns.
 /// For lambda(x, x + y) x is in lambda_arguments, y is in captured arguments, expression_actions is 'x + y'.
 ///  execute(y) returns ColumnFunction(FunctionExpression(x + y), y) with type Function(x) -> function_return_type.
-class ExecutableFunctionCapture : public IExecutableFunctionImpl
+class ExecutableFunctionCapture : public IExecutableFunction
 {
 public:
     struct Capture
@@ -119,7 +119,7 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         Names names;
         DataTypes types;
@@ -138,8 +138,8 @@ public:
 
         auto function = std::make_unique<FunctionExpression>(expression_actions, types, names,
                                                              capture->return_type, capture->return_name);
-        auto function_adaptor = std::make_shared<FunctionBaseAdaptor>(std::move(function));
-        return ColumnFunction::create(input_rows_count, std::move(function_adaptor), arguments);
+
+        return ColumnFunction::create(input_rows_count, std::move(function), arguments);
     }
 
 private:
@@ -147,7 +147,7 @@ private:
     CapturePtr capture;
 };
 
-class FunctionCapture : public IFunctionBaseImpl
+class FunctionCapture : public IFunctionBase
 {
 public:
     using Capture = ExecutableFunctionCapture::Capture;
@@ -173,7 +173,7 @@ public:
     const DataTypes & getArgumentTypes() const override { return capture->captured_types; }
     const DataTypePtr & getResultType() const override { return return_type; }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionCapture>(expression_actions, capture);
     }
@@ -185,7 +185,7 @@ private:
     String name;
 };
 
-class FunctionCaptureOverloadResolver : public IFunctionOverloadResolverImpl
+class FunctionCaptureOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     using Capture = ExecutableFunctionCapture::Capture;
@@ -246,10 +246,10 @@ public:
     String getName() const override { return name; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName &) const override { return return_type; }
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName &) const override { return return_type; }
     size_t getNumberOfArguments() const override { return capture->captured_types.size(); }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr &) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName &, const DataTypePtr &) const override
     {
         return std::make_unique<FunctionCapture>(expression_actions, capture, return_type, name);
     }
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index 551c6e97495..3c6e67c1546 100644
--- a/src/Functions/FunctionsMultiStringFuzzySearch.h
+++ b/src/Functions/FunctionsMultiStringFuzzySearch.h
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <common/StringRef.h>
@@ -34,9 +34,9 @@ class FunctionsMultiStringFuzzySearch : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        if (Impl::is_using_hyperscan && !context.getSettingsRef().allow_hyperscan)
+        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);
 
diff --git a/src/Functions/FunctionsMultiStringPosition.h b/src/Functions/FunctionsMultiStringPosition.h
index 2c0f2ae8f7b..68c658c0aa7 100644
--- a/src/Functions/FunctionsMultiStringPosition.h
+++ b/src/Functions/FunctionsMultiStringPosition.h
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <common/StringRef.h>
@@ -51,7 +51,7 @@ class FunctionsMultiStringPosition : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsMultiStringPosition>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionsMultiStringPosition>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsMultiStringSearch.h b/src/Functions/FunctionsMultiStringSearch.h
index f1185c2d850..4d391124de9 100644
--- a/src/Functions/FunctionsMultiStringSearch.h
+++ b/src/Functions/FunctionsMultiStringSearch.h
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <common/StringRef.h>
@@ -47,9 +47,9 @@ class FunctionsMultiStringSearch : public IFunction
 
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        if (Impl::is_using_hyperscan && !context.getSettingsRef().allow_hyperscan)
+        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);
 
diff --git a/src/Functions/FunctionsRandom.h b/src/Functions/FunctionsRandom.h
index f7b0ac8c2e0..0eae9ef183f 100644
--- a/src/Functions/FunctionsRandom.h
+++ b/src/Functions/FunctionsRandom.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnVector.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/TargetSpecific.h>
 #include <Functions/PerformanceAdaptors.h>
 #include <IO/WriteHelpers.h>
@@ -91,7 +91,7 @@ template <typename ToType, typename Name>
 class FunctionRandom : public FunctionRandomImpl<TargetSpecific::Default::RandImpl, ToType, Name>
 {
 public:
-    explicit FunctionRandom(const Context & context) : selector(context)
+    explicit FunctionRandom(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             FunctionRandomImpl<TargetSpecific::Default::RandImpl, ToType, Name>>();
@@ -107,7 +107,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionRandom<ToType, Name>>(context);
     }
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index b190bc5bd8b..98f35e52a4c 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Columns/ColumnVector.h>
 #include <Interpreters/castColumn.h>
-#include "IFunctionImpl.h"
+#include "IFunction.h"
 #include <Common/intExp.h>
 #include <Common/assert_cast.h>
 #include <Core/Defines.h>
@@ -444,13 +444,7 @@ public:
         }
         else
         {
-            if constexpr (!is_big_int_v<NativeType>)
-                memcpy(out.data(), in.data(), in.size() * sizeof(T));
-            else
-            {
-                for (size_t i = 0; i < in.size(); i++)
-                    out[i] = in[i];
-            }
+            memcpy(out.data(), in.data(), in.size() * sizeof(T));
         }
     }
 };
@@ -511,7 +505,7 @@ class Dispatcher
 public:
     static ColumnPtr apply(const IColumn * column, Scale scale_arg)
     {
-        if constexpr (IsNumber<T>)
+        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);
@@ -526,7 +520,7 @@ class FunctionRounding : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRounding>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionRounding>(); }
 
     String getName() const override
     {
@@ -635,7 +629,7 @@ class FunctionRoundDown : public IFunction
 {
 public:
     static constexpr auto name = "roundDown";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRoundDown>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionRoundDown>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringArray.cpp b/src/Functions/FunctionsStringArray.cpp
index 247d9ffb704..14092d7dd3d 100644
--- a/src/Functions/FunctionsStringArray.cpp
+++ b/src/Functions/FunctionsStringArray.cpp
@@ -11,6 +11,7 @@ void registerFunctionsStringArray(FunctionFactory & factory)
     factory.registerFunction<FunctionAlphaTokens>();
     factory.registerFunction<FunctionSplitByChar>();
     factory.registerFunction<FunctionSplitByString>();
+    factory.registerFunction<FunctionSplitByRegexp>();
     factory.registerFunction<FunctionArrayStringConcat>();
 }
 
diff --git a/src/Functions/FunctionsStringArray.h b/src/Functions/FunctionsStringArray.h
index 6d1b8723653..2141adbc72f 100644
--- a/src/Functions/FunctionsStringArray.h
+++ b/src/Functions/FunctionsStringArray.h
@@ -9,7 +9,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/Regexps.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -263,6 +263,88 @@ public:
     }
 };
 
+class SplitByRegexpImpl
+{
+private:
+    Regexps::Pool::Pointer re;
+    OptimizedRegularExpression::MatchVec matches;
+
+    Pos pos;
+    Pos end;
+public:
+    static constexpr auto name = "splitByRegexp";
+    static String getName() { return name; }
+    static size_t getNumberOfArguments() { return 2; }
+
+    /// Check the type of function arguments.
+    static void checkArguments(const DataTypes & arguments)
+    {
+        SplitByStringImpl::checkArguments(arguments);
+    }
+
+    /// Initialize by the function arguments.
+    void init(const ColumnsWithTypeAndName & arguments)
+    {
+        const ColumnConst * col = checkAndGetColumnConstStringOrFixedString(arguments[0].column.get());
+
+        if (!col)
+            throw Exception("Illegal column " + arguments[0].column->getName()
+                            + " of first argument of function " + getName() + ". Must be constant string.",
+                            ErrorCodes::ILLEGAL_COLUMN);
+
+        if (!col->getValue<String>().empty())
+            re = Regexps::get<false, false>(col->getValue<String>());
+
+    }
+
+    /// Returns the position of the argument that is the column of strings
+    size_t getStringsArgumentPosition()
+    {
+        return 1;
+    }
+
+    /// Called for each next string.
+    void set(Pos pos_, Pos end_)
+    {
+        pos = pos_;
+        end = end_;
+    }
+
+    /// Get the next token, if any, or return false.
+    bool get(Pos & token_begin, Pos & token_end)
+    {
+        if (!re)
+        {
+            if (pos == end)
+                return false;
+
+            token_begin = pos;
+            pos += 1;
+            token_end = pos;
+        }
+        else
+        {
+            if (!pos || pos > end)
+                return false;
+
+            token_begin = pos;
+
+            if (!re->match(pos, end - pos, matches) || !matches[0].length)
+            {
+                token_end = end;
+                pos = end + 1;
+            }
+            else
+            {
+                token_end = pos + matches[0].offset;
+                pos = token_end + matches[0].length;
+            }
+        }
+
+        return true;
+    }
+};
+
 class ExtractAllImpl
 {
 private:
@@ -345,7 +427,7 @@ class FunctionTokens : public IFunction
 {
 public:
     static constexpr auto name = Generator::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionTokens>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionTokens>(); }
 
     String getName() const override
     {
@@ -508,7 +590,7 @@ private:
 
 public:
     static constexpr auto name = "arrayStringConcat";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayStringConcat>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayStringConcat>(); }
 
     String getName() const override
     {
@@ -582,6 +664,7 @@ public:
 using FunctionAlphaTokens = FunctionTokens<AlphaTokensImpl>;
 using FunctionSplitByChar = FunctionTokens<SplitByCharImpl>;
 using FunctionSplitByString = FunctionTokens<SplitByStringImpl>;
+using FunctionSplitByRegexp = FunctionTokens<SplitByRegexpImpl>;
 using FunctionExtractAll = FunctionTokens<ExtractAllImpl>;
 
 }
diff --git a/src/Functions/FunctionsStringHash.h b/src/Functions/FunctionsStringHash.h
index 72fb6e4c76d..8336a4ee85f 100644
--- a/src/Functions/FunctionsStringHash.h
+++ b/src/Functions/FunctionsStringHash.h
@@ -9,7 +9,8 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
@@ -34,7 +35,7 @@ public:
     static constexpr size_t max_shingle_size = 25;
     static constexpr size_t max_num_hashes = 25;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringHash>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionsStringHash>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index 75579b28fd3..524fe43f42f 100644
--- a/src/Functions/FunctionsStringSearch.h
+++ b/src/Functions/FunctionsStringSearch.h
@@ -8,7 +8,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
 #include <IO/WriteHelpers.h>
 
@@ -51,7 +51,7 @@ class FunctionsStringSearch : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringSearch>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionsStringSearch>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringSearchToString.h b/src/Functions/FunctionsStringSearchToString.h
index 3b910ae51af..3b3383cf162 100644
--- a/src/Functions/FunctionsStringSearchToString.h
+++ b/src/Functions/FunctionsStringSearchToString.h
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <common/StringRef.h>
@@ -36,7 +36,7 @@ class FunctionsStringSearchToString : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringSearchToString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionsStringSearchToString>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsStringSimilarity.h b/src/Functions/FunctionsStringSimilarity.h
index ba725fbd598..49fc8a21129 100644
--- a/src/Functions/FunctionsStringSimilarity.h
+++ b/src/Functions/FunctionsStringSimilarity.h
@@ -5,7 +5,8 @@
 #include <Columns/ColumnVector.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
@@ -32,7 +33,7 @@ class FunctionsStringSimilarity : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionsStringSimilarity>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionsStringSimilarity>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/FunctionsVisitParam.h b/src/Functions/FunctionsVisitParam.h
index 8ba7d423899..922ea44be9a 100644
--- a/src/Functions/FunctionsVisitParam.h
+++ b/src/Functions/FunctionsVisitParam.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeFixedString.h>
 #include <Columns/ColumnString.h>
 #include <Common/Volnitsky.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Functions/GCDLCMImpl.h b/src/Functions/GCDLCMImpl.h
index b83fe37abb6..f13a6dc3f95 100644
--- a/src/Functions/GCDLCMImpl.h
+++ b/src/Functions/GCDLCMImpl.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/NumberTraits.h>
 #include <Common/Exception.h>
-#include <numeric>
+#include <common/extended_types.h>
 #include <limits>
 #include <type_traits>
 
@@ -16,12 +16,9 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NOT_IMPLEMENTED;
     extern const int DECIMAL_OVERFLOW;
 }
 
-template <class T>
-inline constexpr bool is_gcd_lcm_implemeted = !is_big_int_v<T>;
 
 template <typename A, typename B, typename Impl, typename Name>
 struct GCDLCMImpl
@@ -30,15 +27,7 @@ struct GCDLCMImpl
     static const constexpr bool allow_fixed_string = false;
 
     template <typename Result = ResultType>
-    static inline std::enable_if_t<!is_gcd_lcm_implemeted<Result>, Result>
-    apply(A, B)
-    {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not implemented for big integers", Name::name);
-    }
-
-    template <typename Result = ResultType>
-    static inline std::enable_if_t<is_gcd_lcm_implemeted<Result>, Result>
-    apply(A a, B b)
+    static inline Result apply(A a, B b)
     {
         throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<A>::Type(a), typename NumberTraits::ToInteger<B>::Type(b));
         throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<B>::Type(b), typename NumberTraits::ToInteger<A>::Type(a));
@@ -50,7 +39,7 @@ struct GCDLCMImpl
             /// gcd() internally uses std::abs()
             Int a_s = static_cast<Int>(a);
             Int b_s = static_cast<Int>(b);
-            Int min = std::numeric_limits<Int>::min();
+            Int min = std::numeric_limits<Int>::lowest();
             Int max = std::numeric_limits<Int>::max();
             if (unlikely((a_s == min || a_s == max) || (b_s == min || b_s == max)))
                 throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Intermediate result overflow (signed a = {}, signed b = {}, min = {}, max = {})", a_s, b_s, min, max);
diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index e174261d76e..d17ab082004 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -13,7 +13,6 @@ namespace DB::ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int TOO_LARGE_ARRAY_SIZE;
-    extern const int NOT_IMPLEMENTED;
 }
 
 namespace DB::GatherUtils
@@ -45,11 +44,7 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
 
         if constexpr (OverBigInt<T> || OverBigInt<U>)
         {
-            if constexpr (std::is_same_v<U, UInt128>)
-            {
-                throw Exception("No conversion between UInt128 and " + demangle(typeid(T).name()), ErrorCodes::NOT_IMPLEMENTED);
-            }
-            else if constexpr (IsDecimalNumber<T>)
+            if constexpr (IsDecimalNumber<T>)
                 dst = static_cast<NativeU>(src.value);
             else
                 dst = static_cast<NativeU>(src);
@@ -82,7 +77,7 @@ inline ALWAYS_INLINE void writeSlice(const GenericArraySlice & slice, GenericArr
         sink.current_offset += slice.size;
     }
     else
-        throw Exception("Function writeSlice expect same column types for GenericArraySlice and GenericArraySink.",
+        throw Exception("Function writeSlice expects same column types for GenericArraySlice and GenericArraySink.",
                         ErrorCodes::LOGICAL_ERROR);
 }
 
@@ -162,7 +157,7 @@ inline ALWAYS_INLINE void writeSlice(const GenericValueSlice & slice, GenericArr
         ++sink.current_offset;
     }
     else
-        throw Exception("Function writeSlice expect same column types for GenericValueSlice and GenericArraySink.",
+        throw Exception("Function writeSlice expects same column types for GenericValueSlice and GenericArraySink.",
                         ErrorCodes::LOGICAL_ERROR);
 }
 
@@ -609,7 +604,7 @@ bool sliceHas(const GenericArraySlice & first, const GenericArraySlice & second)
 {
     /// Generic arrays should have the same type in order to use column.compareAt(...)
     if (!first.elements->structureEquals(*second.elements))
-        return false;
+        throw Exception("Function sliceHas expects same column types for slices.", ErrorCodes::LOGICAL_ERROR);
 
     auto impl = sliceHasImpl<search_type, GenericArraySlice, GenericArraySlice, sliceEqualElements, insliceEqualElements>;
     return impl(first, second, nullptr, nullptr);
@@ -670,7 +665,7 @@ void NO_INLINE arrayAllAny(FirstSource && first, SecondSource && second, ColumnU
     auto & data = result.getData();
     for (auto row : ext::range(0, size))
     {
-        data[row] = static_cast<UInt8>(sliceHas<search_type>(first.getWhole(), second.getWhole()) ? 1 : 0);
+        data[row] = static_cast<UInt8>(sliceHas<search_type>(first.getWhole(), second.getWhole()));
         first.next();
         second.next();
     }
diff --git a/src/Functions/GatherUtils/ArraySinkVisitor.h b/src/Functions/GatherUtils/ArraySinkVisitor.h
index b146780924f..7a53da25869 100644
--- a/src/Functions/GatherUtils/ArraySinkVisitor.h
+++ b/src/Functions/GatherUtils/ArraySinkVisitor.h
@@ -14,7 +14,7 @@ struct GenericArraySink;
 template <typename ArraySink>
 struct NullableArraySink;
 
-using NumericArraySinks = typename TypeListMap<NumericArraySink, TypeListNumbersAndUInt128>::Type;
+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;
diff --git a/src/Functions/GatherUtils/ArraySourceVisitor.h b/src/Functions/GatherUtils/ArraySourceVisitor.h
index 260e9a87161..1b92a9d2e81 100644
--- a/src/Functions/GatherUtils/ArraySourceVisitor.h
+++ b/src/Functions/GatherUtils/ArraySourceVisitor.h
@@ -17,7 +17,7 @@ struct NullableArraySource;
 template <typename Base>
 struct ConstSource;
 
-using NumericArraySources = typename TypeListMap<NumericArraySource, TypeListNumbersAndUInt128>::Type;
+using NumericArraySources = typename TypeListMap<NumericArraySource, TypeListNumbersAndUUID>::Type;
 using BasicArraySources = typename AppendToTypeList<GenericArraySource, NumericArraySources>::Type;
 
 class ArraySourceVisitor : public ApplyTypeListForClass<Visitor, BasicArraySources>::Type
diff --git a/src/Functions/GatherUtils/CMakeLists.txt b/src/Functions/GatherUtils/CMakeLists.txt
index 7f946931c9a..f30527c2a46 100644
--- a/src/Functions/GatherUtils/CMakeLists.txt
+++ b/src/Functions/GatherUtils/CMakeLists.txt
@@ -1,11 +1,8 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions_gatherutils .)
 add_library(clickhouse_functions_gatherutils ${clickhouse_functions_gatherutils_sources} ${clickhouse_functions_gatherutils_headers})
 target_link_libraries(clickhouse_functions_gatherutils PRIVATE dbms)
 
-check_cxx_compiler_flag("-Wsuggest-override" HAS_SUGGEST_OVERRIDE)
-check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
-
 if (HAS_SUGGEST_OVERRIDE)
     target_compile_definitions(clickhouse_functions_gatherutils PUBLIC HAS_SUGGEST_OVERRIDE)
 endif()
diff --git a/src/Functions/GatherUtils/Sources.h b/src/Functions/GatherUtils/Sources.h
index e3eb5f6df75..4dbaff9f567 100644
--- a/src/Functions/GatherUtils/Sources.h
+++ b/src/Functions/GatherUtils/Sources.h
@@ -140,7 +140,7 @@ struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
 
 
 /// The methods can be virtual or not depending on the template parameter. See IStringSource.
-#if !__clang__
+#if !defined(__clang__)
 #   pragma GCC diagnostic push
 #   pragma GCC diagnostic ignored "-Wsuggest-override"
 #elif __clang_major__ >= 11
@@ -233,7 +233,7 @@ struct ConstSource : public Base
     }
 };
 
-#if !__clang__ || __clang_major__ >= 11
+#if !defined(__clang__) || __clang_major__ >= 11
 #   pragma GCC diagnostic pop
 #endif
 
diff --git a/src/Functions/GatherUtils/ValueSourceVisitor.h b/src/Functions/GatherUtils/ValueSourceVisitor.h
index 538ee156e5d..be503cdcfcf 100644
--- a/src/Functions/GatherUtils/ValueSourceVisitor.h
+++ b/src/Functions/GatherUtils/ValueSourceVisitor.h
@@ -17,7 +17,7 @@ struct NullableValueSource;
 template <typename Base>
 struct ConstSource;
 
-using NumericValueSources = typename TypeListMap<NumericValueSource, TypeListNumbersAndUInt128>::Type;
+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;
diff --git a/src/Functions/GatherUtils/createArraySink.cpp b/src/Functions/GatherUtils/createArraySink.cpp
index 00b33cf9821..90983c9c25c 100644
--- a/src/Functions/GatherUtils/createArraySink.cpp
+++ b/src/Functions/GatherUtils/createArraySink.cpp
@@ -55,7 +55,7 @@ struct ArraySinkCreator<>
 
 std::unique_ptr<IArraySink> createArraySink(ColumnArray & col, size_t column_size)
 {
-    using Creator = ApplyTypeListForClass<ArraySinkCreator, TypeListNumbersAndUInt128>::Type;
+    using Creator = ApplyTypeListForClass<ArraySinkCreator, TypeListNumbersAndUUID>::Type;
     return Creator::create(col.getData(), col.getOffsets(), column_size);
 }
 }
diff --git a/src/Functions/GatherUtils/createArraySource.cpp b/src/Functions/GatherUtils/createArraySource.cpp
index 0744e2f2ea3..d98a72e456f 100644
--- a/src/Functions/GatherUtils/createArraySource.cpp
+++ b/src/Functions/GatherUtils/createArraySource.cpp
@@ -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, TypeListNumbersAndUInt128>::Type;
+    using Creator = typename ApplyTypeListForClass<ArraySourceCreator, TypeListNumbersAndUUID>::Type;
     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 20110066214..4f538b95369 100644
--- a/src/Functions/GatherUtils/createValueSource.cpp
+++ b/src/Functions/GatherUtils/createValueSource.cpp
@@ -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, TypeListNumbersAndUInt128>::Type;
+    using Creator = typename ApplyTypeListForClass<ValueSourceCreator, TypeListNumbersAndUUID>::Type;
     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/GregorianDate.h b/src/Functions/GregorianDate.h
index 844fb180e5e..5f179483b53 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <common/extended_types.h>
 #include <Common/Exception.h>
 #include <Core/Types.h>
 #include <IO/ReadBuffer.h>
@@ -9,6 +10,7 @@
 
 #include <cstdint>
 
+
 namespace DB
 {
     namespace ErrorCodes
@@ -27,8 +29,6 @@ namespace DB
     class GregorianDate
     {
     public:
-        GregorianDate() = delete;
-
         /** Construct from date in text form 'YYYY-MM-DD' by reading from
           * ReadBuffer.
           */
@@ -38,14 +38,14 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<wide::IntegralConcept<T>()> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
         GregorianDate(T 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<wide::IntegralConcept<T>()> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
         T toModifiedJulianDay() const;
 
         /** Write the date in text form 'YYYY-MM-DD' to a buffer.
@@ -90,14 +90,14 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<wide::IntegralConcept<T>()> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
         OrdinalDate(T 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<wide::IntegralConcept<T>()> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
         T toModifiedJulianDay() const noexcept;
 
         YearT year() const noexcept
@@ -259,7 +259,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<wide::IntegralConcept<T>()> *>
+    template <typename T, std::enable_if_t<is_integer_v<T>> *>
     GregorianDate<YearT>::GregorianDate(T mjd)
     {
         const OrdinalDate<YearT> ord(mjd);
@@ -270,7 +270,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<wide::IntegralConcept<T>()> *>
+    template <typename T, std::enable_if_t<is_integer_v<T>> *>
     T GregorianDate<YearT>::toModifiedJulianDay() const
     {
         const MonthDay md(month_, day_of_month_);
@@ -332,7 +332,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<wide::IntegralConcept<T>()> *>
+    template <typename T, std::enable_if_t<is_integer_v<T>> *>
     OrdinalDate<YearT>::OrdinalDate(T mjd)
     {
         const auto a         = mjd + 678575;
@@ -348,7 +348,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<wide::IntegralConcept<T>()> *>
+    template <typename T, std::enable_if_t<is_integer_v<T>> *>
     T OrdinalDate<YearT>::toModifiedJulianDay() const noexcept
     {
         const auto y = year_ - 1;
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index e4a1adb8525..998d48941ba 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -13,12 +13,8 @@
 #include <DataTypes/Native.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Functions/FunctionHelpers.h>
-#include <Interpreters/ExpressionActions.h>
-#include <IO/WriteHelpers.h>
-#include <ext/collection_cast.h>
 #include <cstdlib>
 #include <memory>
-#include <optional>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
@@ -31,7 +27,6 @@
 #    pragma GCC diagnostic pop
 #endif
 
-
 namespace DB
 {
 
@@ -42,152 +37,9 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
 }
 
-
-/// Cache for functions result if it was executed on low cardinality column.
-/// It's LRUCache which stores function result executed on dictionary and index mapping.
-/// It's expected that cache_size is a number of reading streams (so, will store single cached value per thread).
-class ExecutableFunctionLowCardinalityResultCache
-{
-public:
-    /// Will assume that dictionaries with same hash has the same keys.
-    /// Just in case, check that they have also the same size.
-    struct DictionaryKey
-    {
-        UInt128 hash;
-        UInt64 size;
-
-        bool operator== (const DictionaryKey & other) const { return hash == other.hash && size == other.size; }
-    };
-
-    struct DictionaryKeyHash
-    {
-        size_t operator()(const DictionaryKey & key) const
-        {
-            SipHash hash;
-            hash.update(key.hash.low);
-            hash.update(key.hash.high);
-            hash.update(key.size);
-            return hash.get64();
-        }
-    };
-
-    struct CachedValues
-    {
-        /// Store ptr to dictionary to be sure it won't be deleted.
-        ColumnPtr dictionary_holder;
-        ColumnUniquePtr function_result;
-        /// Remap positions. new_pos = index_mapping->index(old_pos);
-        ColumnPtr index_mapping;
-    };
-
-    using CachedValuesPtr = std::shared_ptr<CachedValues>;
-
-    explicit ExecutableFunctionLowCardinalityResultCache(size_t cache_size) : cache(cache_size) {}
-
-    CachedValuesPtr get(const DictionaryKey & key) { return cache.get(key); }
-    void set(const DictionaryKey & key, const CachedValuesPtr & mapped) { cache.set(key, mapped); }
-    CachedValuesPtr getOrSet(const DictionaryKey & key, const CachedValuesPtr & mapped)
-    {
-        return cache.getOrSet(key, [&]() { return mapped; }).first;
-    }
-
-private:
-    using Cache = LRUCache<DictionaryKey, CachedValues, DictionaryKeyHash>;
-    Cache cache;
-};
-
-
-void ExecutableFunctionAdaptor::createLowCardinalityResultCache(size_t cache_size)
-{
-    if (!low_cardinality_result_cache)
-        low_cardinality_result_cache = std::make_shared<ExecutableFunctionLowCardinalityResultCache>(cache_size);
-}
-
-
-ColumnPtr wrapInNullable(const ColumnPtr & src, const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count)
-{
-    ColumnPtr result_null_map_column;
-
-    /// If result is already nullable.
-    ColumnPtr src_not_nullable = src;
-
-    if (src->onlyNull())
-        return src;
-    else if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*src))
-    {
-        src_not_nullable = nullable->getNestedColumnPtr();
-        result_null_map_column = nullable->getNullMapColumnPtr();
-    }
-
-    for (const auto & elem : args)
-    {
-        if (!elem.type->isNullable())
-            continue;
-
-        /// Const Nullable that are NULL.
-        if (elem.column->onlyNull())
-        {
-            assert(result_type->isNullable());
-            return result_type->createColumnConstWithDefaultValue(input_rows_count);
-        }
-
-        if (isColumnConst(*elem.column))
-            continue;
-
-        if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*elem.column))
-        {
-            const ColumnPtr & null_map_column = nullable->getNullMapColumnPtr();
-            if (!result_null_map_column)
-            {
-                result_null_map_column = null_map_column;
-            }
-            else
-            {
-                MutableColumnPtr mutable_result_null_map_column = IColumn::mutate(std::move(result_null_map_column));
-
-                NullMap & result_null_map = assert_cast<ColumnUInt8 &>(*mutable_result_null_map_column).getData();
-                const NullMap & src_null_map = assert_cast<const ColumnUInt8 &>(*null_map_column).getData();
-
-                for (size_t i = 0, size = result_null_map.size(); i < size; ++i)
-                    if (src_null_map[i])
-                        result_null_map[i] = 1;
-
-                result_null_map_column = std::move(mutable_result_null_map_column);
-            }
-        }
-    }
-
-    if (!result_null_map_column)
-        return makeNullable(src);
-
-    return ColumnNullable::create(src_not_nullable->convertToFullColumnIfConst(), result_null_map_column);
-}
-
-
 namespace
 {
 
-struct NullPresence
-{
-    bool has_nullable = false;
-    bool has_null_constant = false;
-};
-
-NullPresence getNullPresense(const ColumnsWithTypeAndName & args)
-{
-    NullPresence res;
-
-    for (const auto & elem : args)
-    {
-        if (!res.has_nullable)
-            res.has_nullable = elem.type->isNullable();
-        if (!res.has_null_constant)
-            res.has_null_constant = elem.type->onlyNull();
-    }
-
-    return res;
-}
-
 bool allArgumentsAreConstants(const ColumnsWithTypeAndName & args)
 {
     for (const auto & arg : args)
@@ -195,128 +47,8 @@ bool allArgumentsAreConstants(const ColumnsWithTypeAndName & args)
             return false;
     return true;
 }
-}
 
-ColumnPtr ExecutableFunctionAdaptor::defaultImplementationForConstantArguments(
-    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
-{
-    ColumnNumbers arguments_to_remain_constants = impl->getArgumentsThatAreAlwaysConstant();
-
-    /// Check that these arguments are really constant.
-    for (auto arg_num : arguments_to_remain_constants)
-        if (arg_num < args.size() && !isColumnConst(*args[arg_num].column))
-            throw Exception("Argument at index " + toString(arg_num) + " for function " + getName() + " must be constant", ErrorCodes::ILLEGAL_COLUMN);
-
-    if (args.empty() || !impl->useDefaultImplementationForConstants() || !allArgumentsAreConstants(args))
-        return nullptr;
-
-    ColumnsWithTypeAndName temporary_columns;
-    bool have_converted_columns = false;
-
-    size_t arguments_size = args.size();
-    temporary_columns.reserve(arguments_size);
-    for (size_t arg_num = 0; arg_num < arguments_size; ++arg_num)
-    {
-        const ColumnWithTypeAndName & column = args[arg_num];
-
-        if (arguments_to_remain_constants.end() != std::find(arguments_to_remain_constants.begin(), arguments_to_remain_constants.end(), arg_num))
-        {
-            temporary_columns.emplace_back(ColumnWithTypeAndName{column.column->cloneResized(1), column.type, column.name});
-        }
-        else
-        {
-            have_converted_columns = true;
-            temporary_columns.emplace_back(ColumnWithTypeAndName{ assert_cast<const ColumnConst *>(column.column.get())->getDataColumnPtr(), column.type, column.name });
-        }
-    }
-
-    /** When using default implementation for constants, the function requires at least one argument
-      *  not in "arguments_to_remain_constants" set. Otherwise we get infinite recursion.
-      */
-    if (!have_converted_columns)
-        throw Exception("Number of arguments for function " + getName() + " doesn't match: the function requires more arguments",
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    ColumnPtr result_column = executeWithoutLowCardinalityColumns(temporary_columns, result_type, 1, dry_run);
-
-    /// extremely rare case, when we have function with completely const arguments
-    /// but some of them produced by non isDeterministic function
-    if (result_column->size() > 1)
-        result_column = result_column->cloneResized(1);
-
-    return ColumnConst::create(result_column, input_rows_count);
-}
-
-
-ColumnPtr ExecutableFunctionAdaptor::defaultImplementationForNulls(
-    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
-{
-    if (args.empty() || !impl->useDefaultImplementationForNulls())
-        return nullptr;
-
-    NullPresence null_presence = getNullPresense(args);
-
-    if (null_presence.has_null_constant)
-    {
-        // Default implementation for nulls returns null result for null arguments,
-        // so the result type must be nullable.
-        assert(result_type->isNullable());
-
-        return result_type->createColumnConstWithDefaultValue(input_rows_count);
-    }
-
-    if (null_presence.has_nullable)
-    {
-        ColumnsWithTypeAndName temporary_columns = createBlockWithNestedColumns(args);
-        auto temporary_result_type = removeNullable(result_type);
-
-        auto res = executeWithoutLowCardinalityColumns(temporary_columns, temporary_result_type, input_rows_count, dry_run);
-        return wrapInNullable(res, args, result_type, input_rows_count);
-    }
-
-    return nullptr;
-}
-
-ColumnPtr ExecutableFunctionAdaptor::executeWithoutLowCardinalityColumns(
-    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
-{
-    if (auto res = defaultImplementationForConstantArguments(args, result_type, input_rows_count, dry_run))
-        return res;
-
-    if (auto res = defaultImplementationForNulls(args, result_type, input_rows_count, dry_run))
-        return res;
-
-    ColumnPtr res;
-    if (dry_run)
-        res = impl->executeDryRun(args, result_type, input_rows_count);
-    else
-        res = impl->execute(args, result_type, input_rows_count);
-
-    if (!res)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty column was returned by function {}", getName());
-
-    return res;
-}
-
-static const ColumnLowCardinality * findLowCardinalityArgument(const ColumnsWithTypeAndName & arguments)
-{
-    const ColumnLowCardinality * result_column = nullptr;
-
-    for (const auto & column : arguments)
-    {
-        if (const auto * low_cardinality_column = checkAndGetColumn<ColumnLowCardinality>(column.column.get()))
-        {
-            if (result_column)
-                throw Exception("Expected single dictionary argument for function.", ErrorCodes::LOGICAL_ERROR);
-
-            result_column = low_cardinality_column;
-        }
-    }
-
-    return result_column;
-}
-
-static ColumnPtr replaceLowCardinalityColumnsByNestedAndGetDictionaryIndexes(
+ColumnPtr replaceLowCardinalityColumnsByNestedAndGetDictionaryIndexes(
     ColumnsWithTypeAndName & args, bool can_be_executed_on_default_arguments, size_t input_rows_count)
 {
     size_t num_rows = input_rows_count;
@@ -329,13 +61,14 @@ static ColumnPtr replaceLowCardinalityColumnsByNestedAndGetDictionaryIndexes(
         {
             /// Single LowCardinality column is supported now.
             if (indexes)
-                throw Exception("Expected single dictionary argument for function.", ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected single dictionary argument for function.");
 
             const auto * low_cardinality_type = checkAndGetDataType<DataTypeLowCardinality>(column.type.get());
 
             if (!low_cardinality_type)
-                throw Exception("Incompatible type for low cardinality column: " + column.type->getName(),
-                                ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Incompatible type for low cardinality column: {}",
+                    column.type->getName());
 
             if (can_be_executed_on_default_arguments)
             {
@@ -370,7 +103,7 @@ static ColumnPtr replaceLowCardinalityColumnsByNestedAndGetDictionaryIndexes(
     return indexes;
 }
 
-static void convertLowCardinalityColumnsToFull(ColumnsWithTypeAndName & args)
+void convertLowCardinalityColumnsToFull(ColumnsWithTypeAndName & args)
 {
     for (auto & column : args)
     {
@@ -379,32 +112,124 @@ static void convertLowCardinalityColumnsToFull(ColumnsWithTypeAndName & args)
     }
 }
 
-ColumnPtr ExecutableFunctionAdaptor::execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
+}
+
+ColumnPtr IExecutableFunction::defaultImplementationForConstantArguments(
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
 {
-    if (impl->useDefaultImplementationForLowCardinalityColumns())
+    ColumnNumbers arguments_to_remain_constants = getArgumentsThatAreAlwaysConstant();
+
+    /// Check that these arguments are really constant.
+    for (auto arg_num : arguments_to_remain_constants)
+        if (arg_num < args.size() && !isColumnConst(*args[arg_num].column))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "Argument at index {} for function {} must be constant",
+                toString(arg_num),
+                getName());
+
+    if (args.empty() || !useDefaultImplementationForConstants() || !allArgumentsAreConstants(args))
+        return nullptr;
+
+    ColumnsWithTypeAndName temporary_columns;
+    bool have_converted_columns = false;
+
+    size_t arguments_size = args.size();
+    temporary_columns.reserve(arguments_size);
+    for (size_t arg_num = 0; arg_num < arguments_size; ++arg_num)
+    {
+        const ColumnWithTypeAndName & column = args[arg_num];
+
+        if (arguments_to_remain_constants.end() != std::find(arguments_to_remain_constants.begin(), arguments_to_remain_constants.end(), arg_num))
+        {
+            temporary_columns.emplace_back(ColumnWithTypeAndName{column.column->cloneResized(1), column.type, column.name});
+        }
+        else
+        {
+            have_converted_columns = true;
+            temporary_columns.emplace_back(ColumnWithTypeAndName{ assert_cast<const ColumnConst *>(column.column.get())->getDataColumnPtr(), column.type, column.name });
+        }
+    }
+
+    /** When using default implementation for constants, the function requires at least one argument
+      *  not in "arguments_to_remain_constants" set. Otherwise we get infinite recursion.
+      */
+    if (!have_converted_columns)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            "Number of arguments for function {} doesn't match: the function requires more arguments",
+            getName());
+
+    ColumnPtr result_column = executeWithoutLowCardinalityColumns(temporary_columns, result_type, 1, dry_run);
+
+    /// extremely rare case, when we have function with completely const arguments
+    /// but some of them produced by non isDeterministic function
+    if (result_column->size() > 1)
+        result_column = result_column->cloneResized(1);
+
+    return ColumnConst::create(result_column, input_rows_count);
+}
+
+
+ColumnPtr IExecutableFunction::defaultImplementationForNulls(
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
+{
+    if (args.empty() || !useDefaultImplementationForNulls())
+        return nullptr;
+
+    NullPresence null_presence = getNullPresense(args);
+
+    if (null_presence.has_null_constant)
+    {
+        // Default implementation for nulls returns null result for null arguments,
+        // so the result type must be nullable.
+        assert(result_type->isNullable());
+
+        return result_type->createColumnConstWithDefaultValue(input_rows_count);
+    }
+
+    if (null_presence.has_nullable)
+    {
+        ColumnsWithTypeAndName temporary_columns = createBlockWithNestedColumns(args);
+        auto temporary_result_type = removeNullable(result_type);
+
+        auto res = executeWithoutLowCardinalityColumns(temporary_columns, temporary_result_type, input_rows_count, dry_run);
+        return wrapInNullable(res, args, result_type, input_rows_count);
+    }
+
+    return nullptr;
+}
+
+ColumnPtr IExecutableFunction::executeWithoutLowCardinalityColumns(
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
+{
+    if (auto res = defaultImplementationForConstantArguments(args, result_type, input_rows_count, dry_run))
+        return res;
+
+    if (auto res = defaultImplementationForNulls(args, result_type, input_rows_count, dry_run))
+        return res;
+
+    ColumnPtr res;
+    if (dry_run)
+        res = executeDryRunImpl(args, result_type, input_rows_count);
+    else
+        res = executeImpl(args, result_type, input_rows_count);
+
+    if (!res)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty column was returned by function {}", getName());
+
+    return res;
+}
+
+ColumnPtr IExecutableFunction::execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const
+{
+    ColumnPtr result;
+
+    if (useDefaultImplementationForLowCardinalityColumns())
     {
         ColumnsWithTypeAndName columns_without_low_cardinality = arguments;
 
         if (const auto * res_low_cardinality_type = typeid_cast<const DataTypeLowCardinality *>(result_type.get()))
         {
-            const auto * low_cardinality_column = findLowCardinalityArgument(arguments);
-            bool can_be_executed_on_default_arguments = impl->canBeExecutedOnDefaultArguments();
-            bool use_cache = low_cardinality_result_cache && can_be_executed_on_default_arguments
-                             && low_cardinality_column && low_cardinality_column->isSharedDictionary();
-            ExecutableFunctionLowCardinalityResultCache::DictionaryKey key;
-
-            if (use_cache)
-            {
-                const auto & dictionary = low_cardinality_column->getDictionary();
-                key = {dictionary.getHash(), dictionary.size()};
-
-                auto cached_values = low_cardinality_result_cache->get(key);
-                if (cached_values)
-                {
-                    auto indexes = cached_values->index_mapping->index(low_cardinality_column->getIndexes(), 0);
-                    return ColumnLowCardinality::create(cached_values->function_result, indexes, true);
-                }
-            }
+            bool can_be_executed_on_default_arguments = canBeExecutedOnDefaultArguments();
 
             const auto & dictionary_type = res_low_cardinality_type->getDictionaryType();
             ColumnPtr indexes = replaceLowCardinalityColumnsByNestedAndGetDictionaryIndexes(
@@ -422,37 +247,23 @@ ColumnPtr ExecutableFunctionAdaptor::execute(const ColumnsWithTypeAndName & argu
             ColumnUniquePtr res_dictionary = std::move(res_mut_dictionary);
 
             if (indexes)
-            {
-                if (use_cache)
-                {
-                    auto cache_values = std::make_shared<ExecutableFunctionLowCardinalityResultCache::CachedValues>();
-                    cache_values->dictionary_holder = low_cardinality_column->getDictionaryPtr();
-                    cache_values->function_result = res_dictionary;
-                    cache_values->index_mapping = res_indexes;
-
-                    cache_values = low_cardinality_result_cache->getOrSet(key, cache_values);
-                    res_dictionary = cache_values->function_result;
-                    res_indexes = cache_values->index_mapping;
-                }
-
-                return ColumnLowCardinality::create(res_dictionary, res_indexes->index(*indexes, 0), use_cache);
-            }
+                result = ColumnLowCardinality::create(res_dictionary, res_indexes->index(*indexes, 0));
             else
-            {
-                return ColumnLowCardinality::create(res_dictionary, res_indexes);
-            }
+                result = ColumnLowCardinality::create(res_dictionary, res_indexes);
         }
         else
         {
             convertLowCardinalityColumnsToFull(columns_without_low_cardinality);
-            return executeWithoutLowCardinalityColumns(columns_without_low_cardinality, result_type, input_rows_count, dry_run);
+            result = executeWithoutLowCardinalityColumns(columns_without_low_cardinality, result_type, input_rows_count, dry_run);
         }
     }
     else
-        return executeWithoutLowCardinalityColumns(arguments, result_type, input_rows_count, dry_run);
+        result = executeWithoutLowCardinalityColumns(arguments, result_type, input_rows_count, dry_run);
+
+    return result;
 }
 
-void FunctionOverloadResolverAdaptor::checkNumberOfArguments(size_t number_of_arguments) const
+void IFunctionOverloadResolver::checkNumberOfArguments(size_t number_of_arguments) const
 {
     if (isVariadic())
         return;
@@ -460,110 +271,16 @@ void FunctionOverloadResolverAdaptor::checkNumberOfArguments(size_t number_of_ar
     size_t expected_number_of_arguments = getNumberOfArguments();
 
     if (number_of_arguments != expected_number_of_arguments)
-        throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
-                        + toString(number_of_arguments) + ", should be " + toString(expected_number_of_arguments),
-                        ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            "Number of arguments for function {} doesn't match: passed {}, should be {}",
+            getName(),
+            toString(number_of_arguments),
+            toString(expected_number_of_arguments));
 }
 
-
-DataTypePtr FunctionOverloadResolverAdaptor::getReturnTypeDefaultImplementationForNulls(const ColumnsWithTypeAndName & arguments,
-                                                                                        const DefaultReturnTypeGetter & getter)
+DataTypePtr IFunctionOverloadResolver::getReturnType(const ColumnsWithTypeAndName & arguments) const
 {
-    NullPresence null_presence = getNullPresense(arguments);
-
-    if (null_presence.has_null_constant)
-    {
-        return makeNullable(std::make_shared<DataTypeNothing>());
-    }
-    if (null_presence.has_nullable)
-    {
-        Block nested_columns = createBlockWithNestedColumns(arguments);
-        auto return_type = getter(ColumnsWithTypeAndName(nested_columns.begin(), nested_columns.end()));
-        return makeNullable(return_type);
-    }
-
-    return getter(arguments);
-}
-
-DataTypePtr FunctionOverloadResolverAdaptor::getReturnTypeWithoutLowCardinality(const ColumnsWithTypeAndName & arguments) const
-{
-    checkNumberOfArguments(arguments.size());
-
-    if (!arguments.empty() && impl->useDefaultImplementationForNulls())
-        return getReturnTypeDefaultImplementationForNulls(arguments, [&](const auto & args) { return impl->getReturnType(args); });
-
-    return impl->getReturnType(arguments);
-}
-
-#if USE_EMBEDDED_COMPILER
-
-static std::optional<DataTypes> removeNullables(const DataTypes & types)
-{
-    for (const auto & type : types)
-    {
-        if (!typeid_cast<const DataTypeNullable *>(type.get()))
-            continue;
-        DataTypes filtered;
-        for (const auto & sub_type : types)
-            filtered.emplace_back(removeNullable(sub_type));
-        return filtered;
-    }
-    return {};
-}
-
-bool IFunction::isCompilable(const DataTypes & arguments) const
-{
-    if (useDefaultImplementationForNulls())
-        if (auto denulled = removeNullables(arguments))
-            return isCompilableImpl(*denulled);
-    return isCompilableImpl(arguments);
-}
-
-llvm::Value * IFunction::compile(llvm::IRBuilderBase & builder, const DataTypes & arguments, ValuePlaceholders values) const
-{
-    if (useDefaultImplementationForNulls())
-    {
-        if (auto denulled = removeNullables(arguments))
-        {
-            /// FIXME: when only one column is nullable, this can actually be slower than the non-jitted version
-            ///        because this involves copying the null map while `wrapInNullable` reuses it.
-            auto & b = static_cast<llvm::IRBuilder<> &>(builder);
-            auto * fail = llvm::BasicBlock::Create(b.GetInsertBlock()->getContext(), "", b.GetInsertBlock()->getParent());
-            auto * join = llvm::BasicBlock::Create(b.GetInsertBlock()->getContext(), "", b.GetInsertBlock()->getParent());
-            auto * zero = llvm::Constant::getNullValue(toNativeType(b, makeNullable(getReturnTypeImpl(*denulled))));
-            for (size_t i = 0; i < arguments.size(); i++)
-            {
-                if (!arguments[i]->isNullable())
-                    continue;
-                /// Would be nice to evaluate all this lazily, but that'd change semantics: if only unevaluated
-                /// arguments happen to contain NULLs, the return value would not be NULL, though it should be.
-                auto * value = values[i]();
-                auto * ok = llvm::BasicBlock::Create(b.GetInsertBlock()->getContext(), "", b.GetInsertBlock()->getParent());
-                b.CreateCondBr(b.CreateExtractValue(value, {1}), fail, ok);
-                b.SetInsertPoint(ok);
-                values[i] = [value = b.CreateExtractValue(value, {0})]() { return value; };
-            }
-            auto * result = b.CreateInsertValue(zero, compileImpl(builder, *denulled, std::move(values)), {0});
-            auto * result_columns = b.GetInsertBlock();
-            b.CreateBr(join);
-            b.SetInsertPoint(fail);
-            auto * null = b.CreateInsertValue(zero, b.getTrue(), {1});
-            b.CreateBr(join);
-            b.SetInsertPoint(join);
-            auto * phi = b.CreatePHI(result->getType(), 2);
-            phi->addIncoming(result, result_columns);
-            phi->addIncoming(null, fail);
-            return phi;
-        }
-    }
-    return compileImpl(builder, arguments, std::move(values));
-}
-
-#endif
-
-DataTypePtr FunctionOverloadResolverAdaptor::getReturnType(const ColumnsWithTypeAndName & arguments) const
-{
-    if (impl->useDefaultImplementationForLowCardinalityColumns())
+    if (useDefaultImplementationForLowCardinalityColumns())
     {
         bool has_low_cardinality = false;
         size_t num_full_low_cardinality_columns = 0;
@@ -589,15 +306,11 @@ DataTypePtr FunctionOverloadResolverAdaptor::getReturnType(const ColumnsWithType
                 ++num_full_ordinary_columns;
         }
 
-        for (auto & arg : args_without_low_cardinality)
-        {
-            arg.column = recursiveRemoveLowCardinality(arg.column);
-            arg.type = recursiveRemoveLowCardinality(arg.type);
-        }
+        convertLowCardinalityColumnsToFull(args_without_low_cardinality);
 
         auto type_without_low_cardinality = getReturnTypeWithoutLowCardinality(args_without_low_cardinality);
 
-        if (impl->canBeExecutedOnLowCardinalityDictionary() && has_low_cardinality
+        if (canBeExecutedOnLowCardinalityDictionary() && has_low_cardinality
             && num_full_low_cardinality_columns <= 1 && num_full_ordinary_columns == 0
             && type_without_low_cardinality->canBeInsideLowCardinality())
             return std::make_shared<DataTypeLowCardinality>(type_without_low_cardinality);
@@ -607,4 +320,113 @@ DataTypePtr FunctionOverloadResolverAdaptor::getReturnType(const ColumnsWithType
 
     return getReturnTypeWithoutLowCardinality(arguments);
 }
+
+FunctionBasePtr IFunctionOverloadResolver::build(const ColumnsWithTypeAndName & arguments) const
+{
+    auto return_type = getReturnType(arguments);
+    return buildImpl(arguments, return_type);
+}
+
+void IFunctionOverloadResolver::getLambdaArgumentTypes(DataTypes & arguments [[maybe_unused]]) const
+{
+    checkNumberOfArguments(arguments.size());
+    return getLambdaArgumentTypesImpl(arguments);
+}
+
+DataTypePtr IFunctionOverloadResolver::getReturnTypeWithoutLowCardinality(const ColumnsWithTypeAndName & arguments) const
+{
+    checkNumberOfArguments(arguments.size());
+
+    if (!arguments.empty() && useDefaultImplementationForNulls())
+    {
+        NullPresence null_presence = getNullPresense(arguments);
+
+        if (null_presence.has_null_constant)
+        {
+            return makeNullable(std::make_shared<DataTypeNothing>());
+        }
+        if (null_presence.has_nullable)
+        {
+            Block nested_columns = createBlockWithNestedColumns(arguments);
+            auto return_type = getReturnTypeImpl(ColumnsWithTypeAndName(nested_columns.begin(), nested_columns.end()));
+            return makeNullable(return_type);
+        }
+    }
+
+    return getReturnTypeImpl(arguments);
+}
+
+
+#if USE_EMBEDDED_COMPILER
+
+static std::optional<DataTypes> removeNullables(const DataTypes & types)
+{
+    for (const auto & type : types)
+    {
+        if (!typeid_cast<const DataTypeNullable *>(type.get()))
+            continue;
+        DataTypes filtered;
+        for (const auto & sub_type : types)
+            filtered.emplace_back(removeNullable(sub_type));
+        return filtered;
+    }
+    return {};
+}
+
+bool IFunction::isCompilable(const DataTypes & arguments) const
+{
+    if (useDefaultImplementationForNulls())
+        if (auto denulled = removeNullables(arguments))
+            return isCompilableImpl(*denulled);
+    return isCompilableImpl(arguments);
+}
+
+llvm::Value * IFunction::compile(llvm::IRBuilderBase & builder, const DataTypes & arguments, Values values) const
+{
+    auto denulled_arguments = removeNullables(arguments);
+    if (useDefaultImplementationForNulls() && denulled_arguments)
+    {
+        auto & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+        std::vector<llvm::Value*> unwrapped_values;
+        std::vector<llvm::Value*> is_null_values;
+
+        unwrapped_values.reserve(arguments.size());
+        is_null_values.reserve(arguments.size());
+
+        for (size_t i = 0; i < arguments.size(); ++i)
+        {
+            auto * value = values[i];
+
+            WhichDataType data_type(arguments[i]);
+            if (data_type.isNullable())
+            {
+                unwrapped_values.emplace_back(b.CreateExtractValue(value, {0}));
+                is_null_values.emplace_back(b.CreateExtractValue(value, {1}));
+            }
+            else
+            {
+                unwrapped_values.emplace_back(value);
+            }
+        }
+
+        auto * result = compileImpl(builder, *denulled_arguments, unwrapped_values);
+
+        auto * nullable_structure_type = toNativeType(b, makeNullable(getReturnTypeImpl(*denulled_arguments)));
+        auto * nullable_structure_value = llvm::Constant::getNullValue(nullable_structure_type);
+
+        auto * nullable_structure_with_result_value = b.CreateInsertValue(nullable_structure_value, result, {0});
+        auto * nullable_structure_result_null = b.CreateExtractValue(nullable_structure_with_result_value, {1});
+
+        for (auto * is_null_value : is_null_values)
+            nullable_structure_result_null = b.CreateOr(nullable_structure_result_null, is_null_value);
+
+        return b.CreateInsertValue(nullable_structure_with_result_value, nullable_structure_result_null, {1});
+    }
+
+    return compileImpl(builder, arguments, std::move(values));
+}
+
+#endif
+
 }
diff --git a/src/Functions/IFunction.h b/src/Functions/IFunction.h
index e94449335fb..0da55343b9d 100644
--- a/src/Functions/IFunction.h
+++ b/src/Functions/IFunction.h
@@ -1,18 +1,17 @@
 #pragma once
 
-#include <memory>
-
-#include <Core/Names.h>
-#include <Core/ColumnsWithTypeAndName.h>
 #include <Core/ColumnNumbers.h>
+#include <Core/ColumnsWithTypeAndName.h>
+#include <Core/Names.h>
 #include <DataTypes/IDataType.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
 #endif
 
+#include <memory>
+
 /// This file contains user interface for functions.
-/// For developer interface (in case you need to implement a new function) see IFunctionImpl.h
 
 namespace llvm
 {
@@ -28,6 +27,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
 class Field;
@@ -46,23 +46,78 @@ public:
     /// Get the main function name.
     virtual String getName() const = 0;
 
-    virtual ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const = 0;
+    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
+
+protected:
+
+    virtual ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const = 0;
+
+    virtual ColumnPtr executeDryRunImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    {
+        return executeImpl(arguments, result_type, input_rows_count);
+    }
+
+    /** Default implementation in presence of Nullable arguments or NULL constants as arguments is the following:
+      *  if some of arguments are NULL constants then return NULL constant,
+      *  if some of arguments are Nullable, then execute function as usual for columns,
+      *   where Nullable columns are substituted with nested columns (they have arbitrary values in rows corresponding to NULL value)
+      *   and wrap result in Nullable column where NULLs are in all rows where any of arguments are NULL.
+      */
+    virtual bool useDefaultImplementationForNulls() const { return true; }
+
+    /** If the function have non-zero number of arguments,
+      *  and if all arguments are constant, that we could automatically provide default implementation:
+      *  arguments are converted to ordinary columns with single value, then function is executed as usual,
+      *  and then the result is converted to constant column.
+      */
+    virtual bool useDefaultImplementationForConstants() const { return false; }
+
+    /** If function arguments has single low cardinality column and all other arguments are constants, call function on nested column.
+      * Otherwise, convert all low cardinality columns to ordinary columns.
+      * Returns ColumnLowCardinality if at least one argument is ColumnLowCardinality.
+      */
+    virtual bool useDefaultImplementationForLowCardinalityColumns() const { return true; }
+
+    /** Some arguments could remain constant during this implementation.
+      */
+    virtual ColumnNumbers getArgumentsThatAreAlwaysConstant() const { return {}; }
+
+    /** True if function can be called on default arguments (include Nullable's) and won't throw.
+      * Counterexample: modulo(0, 0)
+      */
+    virtual bool canBeExecutedOnDefaultArguments() const { return true; }
+
+private:
+
+    ColumnPtr defaultImplementationForConstantArguments(
+            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
+
+    ColumnPtr defaultImplementationForNulls(
+            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
+
+    ColumnPtr executeWithoutLowCardinalityColumns(
+            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
 
-    virtual void createLowCardinalityResultCache(size_t cache_size) = 0;
 };
 
 using ExecutableFunctionPtr = std::shared_ptr<IExecutableFunction>;
 
+using Values = std::vector<llvm::Value *>;
 
-using ValuePlaceholders = std::vector<std::function<llvm::Value * ()>>;
-
-/// Function with known arguments and return type (when the specific overload was chosen).
-/// It is also the point where all function-specific properties are known.
+/** Function with known arguments and return type (when the specific overload was chosen).
+  * It is also the point where all function-specific properties are known.
+  */
 class IFunctionBase
 {
 public:
+
     virtual ~IFunctionBase() = default;
 
+    virtual ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run = false) const
+    {
+        return prepare(arguments)->execute(arguments, result_type, input_rows_count, dry_run);
+    }
+
     /// Get the main function name.
     virtual String getName() const = 0;
 
@@ -73,11 +128,6 @@ public:
     /// sample_columns should contain data types of arguments and values of constants, if relevant.
     virtual ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName & arguments) const = 0;
 
-    virtual ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run = false) const
-    {
-        return prepare(arguments)->execute(arguments, result_type, input_rows_count, dry_run);
-    }
-
 #if USE_EMBEDDED_COMPILER
 
     virtual bool isCompilable() const { return false; }
@@ -90,7 +140,7 @@ public:
       *       templates with default arguments is impossible and including LLVM in such a generic header
       *       as this one is a major pain.
       */
-    virtual llvm::Value * compile(llvm::IRBuilderBase & /*builder*/, ValuePlaceholders /*values*/) const
+    virtual llvm::Value * compile(llvm::IRBuilderBase & /*builder*/, Values /*values*/) const
     {
         throw Exception(getName() + " is not JIT-compilable", ErrorCodes::NOT_IMPLEMENTED);
     }
@@ -105,12 +155,13 @@ public:
       */
     virtual bool isSuitableForConstantFolding() const { return true; }
 
-    /** Some functions like ignore(...) or toTypeName(...) always return constant result which doesn't depend on arguments.
-      * In this case we can calculate result and assume that it's constant in stream header.
-      * There is no need to implement function if it has zero arguments.
-      * Must return ColumnConst with single row or nullptr.
+    /** If function isSuitableForConstantFolding then, this method will be called during query analyzis
+      * if some arguments are constants. For example logical functions (AndFunction, OrFunction) can
+      * return they result based on some constant arguments.
+      * Arguments are passed without modifications, useDefaultImplementationForNulls, useDefaultImplementationForConstants,
+      * useDefaultImplementationForLowCardinality are not applied.
       */
-    virtual ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & /*columns*/) const { return nullptr; }
+    virtual ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & /* arguments */, const DataTypePtr & /* result_type */) const { return nullptr; }
 
     /** Function is called "injective" if it returns different result for different values of arguments.
       * Example: hex, negate, tuple...
@@ -147,9 +198,9 @@ public:
       * Example: now(). Another example: functions that work with periodically updated dictionaries.
       */
 
-    virtual bool isDeterministic() const = 0;
+    virtual bool isDeterministic() const { return true; }
 
-    virtual bool isDeterministicInScopeOfQuery() const = 0;
+    virtual bool isDeterministicInScopeOfQuery() const { return true; }
 
     /** Lets you know if the function is monotonic in a range of values.
       * This is used to work with the index in a sorted chunk of data.
@@ -176,58 +227,220 @@ public:
     {
         throw Exception("Function " + getName() + " has no information about its monotonicity.", ErrorCodes::NOT_IMPLEMENTED);
     }
+
 };
 
 using FunctionBasePtr = std::shared_ptr<IFunctionBase>;
 
 
-/// Creates IFunctionBase from argument types list (chooses one function overload).
+/** Creates IFunctionBase from argument types list (chooses one function overload).
+  */
 class IFunctionOverloadResolver
 {
 public:
     virtual ~IFunctionOverloadResolver() = default;
 
+    FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const;
+
+    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const;
+
+    void getLambdaArgumentTypes(DataTypes & arguments) const;
+
+    void checkNumberOfArguments(size_t number_of_arguments) const;
+
     /// Get the main function name.
     virtual String getName() const = 0;
 
-    /// See the comment for the same method in IFunctionBase
-    virtual bool isDeterministic() const = 0;
-    virtual bool isDeterministicInScopeOfQuery() const = 0;
-    virtual bool isInjective(const ColumnsWithTypeAndName &) const = 0;
-
-    /// Override and return true if function needs to depend on the state of the data.
-    virtual bool isStateful() const = 0;
-
-    /// Override and return true if function could take different number of arguments.
-    virtual bool isVariadic() const = 0;
-
     /// For non-variadic functions, return number of arguments; otherwise return zero (that should be ignored).
     virtual size_t getNumberOfArguments() const = 0;
 
-    /// Throw if number of arguments is incorrect.
-    virtual void checkNumberOfArguments(size_t number_of_arguments) const = 0;
+    /// TODO: This method should not be duplicated here and in IFunctionBase
+    /// See the comment for the same method in IFunctionBase
+    virtual bool isDeterministic() const { return true; }
+    virtual bool isDeterministicInScopeOfQuery() const { return true; }
+    virtual bool isInjective(const ColumnsWithTypeAndName &) const { return false; }
 
-    /// Check if arguments are correct and returns IFunctionBase.
-    virtual FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const = 0;
+    /// Override and return true if function needs to depend on the state of the data.
+    virtual bool isStateful() const { return false; }
 
+    /// Override and return true if function could take different number of arguments.
+    virtual bool isVariadic() const { return false; }
+
+    /// For non-variadic functions, return number of arguments; otherwise return zero (that should be ignored).
     /// For higher-order functions (functions, that have lambda expression as at least one argument).
     /// You pass data types with empty DataTypeFunction for lambda arguments.
     /// This function will replace it with DataTypeFunction containing actual types.
-    virtual void getLambdaArgumentTypes(DataTypes & arguments) const = 0;
+    virtual void getLambdaArgumentTypesImpl(DataTypes & arguments [[maybe_unused]]) const
+    {
+        throw Exception("Function " + getName() + " can't have lambda-expressions as arguments", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+    }
 
     /// Returns indexes of arguments, that must be ColumnConst
-    virtual ColumnNumbers getArgumentsThatAreAlwaysConstant() const = 0;
+    virtual ColumnNumbers getArgumentsThatAreAlwaysConstant() const { return {}; }
+
     /// Returns indexes if arguments, that can be Nullable without making result of function Nullable
     /// (for functions like isNull(x))
-    virtual ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t number_of_arguments) const = 0;
+    virtual ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t number_of_arguments [[maybe_unused]]) const { return {}; }
+
+protected:
+
+    virtual FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const = 0;
+
+    virtual DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const
+    {
+        throw Exception("getReturnType is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
+    /// This function will be called in default implementation. You can overload it or the previous one.
+    virtual DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const
+    {
+        DataTypes data_types(arguments.size());
+        for (size_t i = 0; i < arguments.size(); ++i)
+            data_types[i] = arguments[i].type;
+
+        return getReturnTypeImpl(data_types);
+    }
+
+    /** If useDefaultImplementationForNulls() is true, then change arguments for getReturnType() and build():
+      *  if some of arguments are Nullable(Nothing) then don't call getReturnType(), call build() with return_type = Nullable(Nothing),
+      *  if some of arguments are Nullable, then:
+      *   - Nullable types are substituted with nested types for getReturnType() function
+      *   - wrap getReturnType() result in Nullable type and pass to build
+      *
+      * Otherwise build returns build(arguments, getReturnType(arguments));
+      */
+    virtual bool useDefaultImplementationForNulls() const { return true; }
+
+    /** If useDefaultImplementationForNulls() is true, then change arguments for getReturnType() and build().
+      * If function arguments has low cardinality types, convert them to ordinary types.
+      * getReturnType returns ColumnLowCardinality if at least one argument type is ColumnLowCardinality.
+      */
+    virtual bool useDefaultImplementationForLowCardinalityColumns() const { return true; }
+
+    // /// If it isn't, will convert all ColumnLowCardinality arguments to full columns.
+    virtual bool canBeExecutedOnLowCardinalityDictionary() const { return true; }
+
+private:
+
+    DataTypePtr getReturnTypeWithoutLowCardinality(const ColumnsWithTypeAndName & arguments) const;
 };
 
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
+/// Old function interface. Check documentation in IFunction.h.
+/// If client do not need statefull properties it can implement this interface.
+class IFunction
+{
+public:
 
-/** Return ColumnNullable of src, with null map as OR-ed null maps of args columns.
-  * Or ColumnConst(ColumnNullable) if the result is always NULL or if the result is constant and always not NULL.
-  */
-ColumnPtr wrapInNullable(const ColumnPtr & src, const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count);
+    virtual ~IFunction() = default;
+
+    virtual String getName() const = 0;
+
+    virtual ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const = 0;
+    virtual ColumnPtr executeImplDryRun(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    {
+        return executeImpl(arguments, result_type, input_rows_count);
+    }
+
+    /** Default implementation in presence of Nullable arguments or NULL constants as arguments is the following:
+      *  if some of arguments are NULL constants then return NULL constant,
+      *  if some of arguments are Nullable, then execute function as usual for columns,
+      *   where Nullable columns are substituted with nested columns (they have arbitrary values in rows corresponding to NULL value)
+      *   and wrap result in Nullable column where NULLs are in all rows where any of arguments are NULL.
+      */
+    virtual bool useDefaultImplementationForNulls() const { return true; }
+
+    /** If the function have non-zero number of arguments,
+      *  and if all arguments are constant, that we could automatically provide default implementation:
+      *  arguments are converted to ordinary columns with single value, then function is executed as usual,
+      *  and then the result is converted to constant column.
+      */
+    virtual bool useDefaultImplementationForConstants() const { return false; }
+
+    /** If function arguments has single low cardinality column and all other arguments are constants, call function on nested column.
+      * Otherwise, convert all low cardinality columns to ordinary columns.
+      * Returns ColumnLowCardinality if at least one argument is ColumnLowCardinality.
+      */
+    virtual bool useDefaultImplementationForLowCardinalityColumns() const { return true; }
+
+    /// If it isn't, will convert all ColumnLowCardinality arguments to full columns.
+    virtual bool canBeExecutedOnLowCardinalityDictionary() const { return true; }
+
+    /** Some arguments could remain constant during this implementation.
+      */
+    virtual ColumnNumbers getArgumentsThatAreAlwaysConstant() const { return {}; }
+
+    /** True if function can be called on default arguments (include Nullable's) and won't throw.
+      * Counterexample: modulo(0, 0)
+      */
+    virtual bool canBeExecutedOnDefaultArguments() const { return true; }
+
+    /// Properties from IFunctionBase (see IFunction.h)
+    virtual bool isSuitableForConstantFolding() const { return true; }
+    virtual ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & /*arguments*/, const DataTypePtr & /*result_type*/) const { return nullptr; }
+    virtual bool isInjective(const ColumnsWithTypeAndName & /*sample_columns*/) const { return false; }
+    virtual bool isDeterministic() const { return true; }
+    virtual bool isDeterministicInScopeOfQuery() const { return true; }
+    virtual bool isStateful() const { return false; }
+    virtual bool hasInformationAboutMonotonicity() const { return false; }
+
+    using Monotonicity = IFunctionBase::Monotonicity;
+    virtual Monotonicity getMonotonicityForRange(const IDataType & /*type*/, const Field & /*left*/, const Field & /*right*/) const
+    {
+        throw Exception("Function " + getName() + " has no information about its monotonicity.", ErrorCodes::NOT_IMPLEMENTED);
+    }
+
+    /// For non-variadic functions, return number of arguments; otherwise return zero (that should be ignored).
+    virtual size_t getNumberOfArguments() const = 0;
+
+    virtual DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const
+    {
+        throw Exception("getReturnType is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
+    /// Get the result type by argument type. If the function does not apply to these arguments, throw an exception.
+    virtual DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const
+    {
+        DataTypes data_types(arguments.size());
+        for (size_t i = 0; i < arguments.size(); ++i)
+            data_types[i] = arguments[i].type;
+
+        return getReturnTypeImpl(data_types);
+    }
+
+    virtual bool isVariadic() const { return false; }
+
+    virtual void getLambdaArgumentTypes(DataTypes & /*arguments*/) const
+    {
+        throw Exception("Function " + getName() + " can't have lambda-expressions as arguments", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+    }
+
+    virtual ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const { return {}; }
+
+
+#if USE_EMBEDDED_COMPILER
+
+    bool isCompilable(const DataTypes & arguments) const;
+
+    llvm::Value * compile(llvm::IRBuilderBase &, const DataTypes & arguments, Values values) const;
+
+#endif
+
+protected:
+
+#if USE_EMBEDDED_COMPILER
+
+    virtual bool isCompilableImpl(const DataTypes &) const { return false; }
+
+    virtual llvm::Value * compileImpl(llvm::IRBuilderBase &, const DataTypes &, Values) const
+    {
+        throw Exception(getName() + " is not JIT-compilable", ErrorCodes::NOT_IMPLEMENTED);
+    }
+
+#endif
+};
+
+using FunctionPtr = std::shared_ptr<IFunction>;
 
 }
diff --git a/src/Functions/IFunctionAdaptors.h b/src/Functions/IFunctionAdaptors.h
index cbb71c99b1b..6a865af0dd3 100644
--- a/src/Functions/IFunctionAdaptors.h
+++ b/src/Functions/IFunctionAdaptors.h
@@ -1,162 +1,31 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+
+#include <Functions/IFunction.h>
 
 namespace DB
 {
 
-/// Adaptors are implement user interfaces from IFunction.h via developer interfaces from IFunctionImpl.h
-/// Typically, you don't need to change this classes.
+/// Following class implement IExecutableFunction via IFunction.
 
-class ExecutableFunctionAdaptor final : public IExecutableFunction
+class FunctionToExecutableFunctionAdaptor final : public IExecutableFunction
 {
 public:
-    explicit ExecutableFunctionAdaptor(ExecutableFunctionImplPtr impl_) : impl(std::move(impl_)) {}
-
-    String getName() const final { return impl->getName(); }
-
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const final;
-
-    void createLowCardinalityResultCache(size_t cache_size) override;
-
-private:
-    ExecutableFunctionImplPtr impl;
-
-    /// Cache is created by function createLowCardinalityResultCache()
-    ExecutableFunctionLowCardinalityResultCachePtr low_cardinality_result_cache;
-
-    ColumnPtr defaultImplementationForConstantArguments(
-            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
-
-    ColumnPtr defaultImplementationForNulls(
-            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
-
-    ColumnPtr executeWithoutLowCardinalityColumns(
-            const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count, bool dry_run) const;
-};
-
-class FunctionBaseAdaptor final : public IFunctionBase
-{
-public:
-    explicit FunctionBaseAdaptor(FunctionBaseImplPtr impl_) : impl(std::move(impl_)) {}
-
-    String getName() const final { return impl->getName(); }
-
-    const DataTypes & getArgumentTypes() const final { return impl->getArgumentTypes(); }
-    const DataTypePtr & getResultType() const final { return impl->getResultType(); }
-
-    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName & arguments) const final
-    {
-        return std::make_shared<ExecutableFunctionAdaptor>(impl->prepare(arguments));
-    }
-
-#if USE_EMBEDDED_COMPILER
-
-    bool isCompilable() const final { return impl->isCompilable(); }
-
-    llvm::Value * compile(llvm::IRBuilderBase & builder, ValuePlaceholders values) const override
-    {
-        return impl->compile(builder, std::move(values));
-    }
-
-#endif
-
-    bool isStateful() const final { return impl->isStateful(); }
-    bool isSuitableForConstantFolding() const final { return impl->isSuitableForConstantFolding(); }
-
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & arguments) const final
-    {
-        return impl->getResultIfAlwaysReturnsConstantAndHasArguments(arguments);
-    }
-
-    bool isInjective(const ColumnsWithTypeAndName & sample_columns) const final { return impl->isInjective(sample_columns); }
-    bool isDeterministic() const final { return impl->isDeterministic(); }
-    bool isDeterministicInScopeOfQuery() const final { return impl->isDeterministicInScopeOfQuery(); }
-    bool hasInformationAboutMonotonicity() const final { return impl->hasInformationAboutMonotonicity(); }
-
-    Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const final
-    {
-        return impl->getMonotonicityForRange(type, left, right);
-    }
-
-    const IFunctionBaseImpl * getImpl() const { return impl.get(); }
-
-private:
-    FunctionBaseImplPtr impl;
-};
-
-
-class FunctionOverloadResolverAdaptor final : public IFunctionOverloadResolver
-{
-public:
-    explicit FunctionOverloadResolverAdaptor(FunctionOverloadResolverImplPtr impl_) : impl(std::move(impl_)) {}
-
-    String getName() const final { return impl->getName(); }
-
-    bool isDeterministic() const final { return impl->isDeterministic(); }
-
-    bool isDeterministicInScopeOfQuery() const final { return impl->isDeterministicInScopeOfQuery(); }
-
-    bool isInjective(const ColumnsWithTypeAndName & columns) const final { return impl->isInjective(columns); }
-
-    bool isStateful() const final { return impl->isStateful(); }
-
-    bool isVariadic() const final { return impl->isVariadic(); }
-
-    size_t getNumberOfArguments() const final { return impl->getNumberOfArguments(); }
-
-    void checkNumberOfArguments(size_t number_of_arguments) const final;
-
-    FunctionBaseImplPtr buildImpl(const ColumnsWithTypeAndName & arguments) const
-    {
-        return impl->build(arguments, getReturnType(arguments));
-    }
-
-    FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const final
-    {
-        return std::make_shared<FunctionBaseAdaptor>(buildImpl(arguments));
-    }
-
-    void getLambdaArgumentTypes(DataTypes & arguments) const final
-    {
-        checkNumberOfArguments(arguments.size());
-        impl->getLambdaArgumentTypes(arguments);
-    }
-
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return impl->getArgumentsThatAreAlwaysConstant(); }
-
-    ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t number_of_arguments) const final
-    {
-        return impl->getArgumentsThatDontImplyNullableReturnType(number_of_arguments);
-    }
-
-    using DefaultReturnTypeGetter = std::function<DataTypePtr(const ColumnsWithTypeAndName &)>;
-    static DataTypePtr getReturnTypeDefaultImplementationForNulls(const ColumnsWithTypeAndName & arguments, const DefaultReturnTypeGetter & getter);
-private:
-    FunctionOverloadResolverImplPtr impl;
-
-    DataTypePtr getReturnTypeWithoutLowCardinality(const ColumnsWithTypeAndName & arguments) const;
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const;
-};
-
-
-/// Following classes are implement IExecutableFunctionImpl, IFunctionBaseImpl and IFunctionOverloadResolverImpl via IFunction.
-
-class DefaultExecutable final : public IExecutableFunctionImpl
-{
-public:
-    explicit DefaultExecutable(std::shared_ptr<IFunction> function_) : function(std::move(function_)) {}
+    explicit FunctionToExecutableFunctionAdaptor(std::shared_ptr<IFunction> function_) : function(std::move(function_)) {}
 
     String getName() const override { return function->getName(); }
 
 protected:
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const final
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const final
     {
         return function->executeImpl(arguments, result_type, input_rows_count);
     }
-    ColumnPtr executeDryRun(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const final
+
+    ColumnPtr executeDryRunImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const final
     {
         return function->executeImplDryRun(arguments, result_type, input_rows_count);
     }
+
     bool useDefaultImplementationForNulls() const final { return function->useDefaultImplementationForNulls(); }
     bool useDefaultImplementationForConstants() const final { return function->useDefaultImplementationForConstants(); }
     bool useDefaultImplementationForLowCardinalityColumns() const final { return function->useDefaultImplementationForLowCardinalityColumns(); }
@@ -167,10 +36,12 @@ private:
     std::shared_ptr<IFunction> function;
 };
 
-class DefaultFunction final : public IFunctionBaseImpl
+/// Following class implement IFunctionBase via IFunction.
+
+class FunctionToFunctionBaseAdaptor final : public IFunctionBase
 {
 public:
-    DefaultFunction(std::shared_ptr<IFunction> function_, DataTypes arguments_, DataTypePtr result_type_)
+    FunctionToFunctionBaseAdaptor(std::shared_ptr<IFunction> function_, DataTypes arguments_, DataTypePtr result_type_)
             : function(std::move(function_)), arguments(std::move(arguments_)), result_type(std::move(result_type_)) {}
 
     String getName() const override { return function->getName(); }
@@ -182,19 +53,23 @@ public:
 
     bool isCompilable() const override { return function->isCompilable(getArgumentTypes()); }
 
-    llvm::Value * compile(llvm::IRBuilderBase & builder, ValuePlaceholders values) const override { return function->compile(builder, getArgumentTypes(), std::move(values)); }
+    llvm::Value * compile(llvm::IRBuilderBase & builder, Values values) const override
+    {
+        return function->compile(builder, getArgumentTypes(), std::move(values));
+    }
 
 #endif
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName & /*arguments*/) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName & /*arguments*/) const override
     {
-        return std::make_unique<DefaultExecutable>(function);
+        return std::make_unique<FunctionToExecutableFunctionAdaptor>(function);
     }
 
     bool isSuitableForConstantFolding() const override { return function->isSuitableForConstantFolding(); }
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & arguments_) const override
+
+    ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments_, const DataTypePtr & result_type_) const override
     {
-        return function->getResultIfAlwaysReturnsConstantAndHasArguments(arguments_);
+        return function->getConstantResultForNonConstArguments(arguments_, result_type_);
     }
 
     bool isStateful() const override { return function->isStateful(); }
@@ -207,7 +82,6 @@ public:
 
     bool hasInformationAboutMonotonicity() const override { return function->hasInformationAboutMonotonicity(); }
 
-    using Monotonicity = IFunctionBase::Monotonicity;
     Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
     {
         return function->getMonotonicityForRange(type, left, right);
@@ -218,10 +92,13 @@ private:
     DataTypePtr result_type;
 };
 
-class DefaultOverloadResolver : public IFunctionOverloadResolverImpl
+
+/// Following class implement IFunctionOverloadResolver via IFunction.
+
+class FunctionToOverloadResolverAdaptor : public IFunctionOverloadResolver
 {
 public:
-    explicit DefaultOverloadResolver(std::shared_ptr<IFunction> function_) : function(std::move(function_)) {}
+    explicit FunctionToOverloadResolverAdaptor(std::shared_ptr<IFunction> function_) : function(std::move(function_)) {}
 
     bool isDeterministic() const override { return function->isDeterministic(); }
     bool isDeterministicInScopeOfQuery() const override { return function->isDeterministicInScopeOfQuery(); }
@@ -238,22 +115,23 @@ public:
         return function->getArgumentsThatDontImplyNullableReturnType(number_of_arguments);
     }
 
-    DataTypePtr getReturnType(const DataTypes & arguments) const override { return function->getReturnTypeImpl(arguments); }
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override { return function->getReturnTypeImpl(arguments); }
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override { return function->getReturnTypeImpl(arguments); }
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override { return function->getReturnTypeImpl(arguments); }
 
     bool useDefaultImplementationForNulls() const override { return function->useDefaultImplementationForNulls(); }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return function->useDefaultImplementationForLowCardinalityColumns(); }
     bool canBeExecutedOnLowCardinalityDictionary() const override { return function->canBeExecutedOnLowCardinalityDictionary(); }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const override
     {
         DataTypes data_types(arguments.size());
         for (size_t i = 0; i < arguments.size(); ++i)
             data_types[i] = arguments[i].type;
-        return std::make_unique<DefaultFunction>(function, data_types, result_type);
+
+        return std::make_unique<FunctionToFunctionBaseAdaptor>(function, data_types, result_type);
     }
 
-    void getLambdaArgumentTypes(DataTypes & arguments) const override { function->getLambdaArgumentTypes(arguments); }
+    void getLambdaArgumentTypesImpl(DataTypes & arguments) const override { function->getLambdaArgumentTypes(arguments); }
 
 private:
     std::shared_ptr<IFunction> function;
diff --git a/src/Functions/IFunctionImpl.h b/src/Functions/IFunctionImpl.h
deleted file mode 100644
index a9ec6926c63..00000000000
--- a/src/Functions/IFunctionImpl.h
+++ /dev/null
@@ -1,320 +0,0 @@
-#pragma once
-#include <Functions/IFunction.h>
-
-/// This file contains developer interface for functions.
-/// In order to implement a new function you can choose one of two options:
-///  * Implement interface for IFunction (old function interface, which is planned to be removed sometimes)
-///  * Implement three interfaces for IExecutableFunctionImpl, IFunctionBaseImpl and IFunctionOverloadResolverImpl
-/// Generally saying, IFunction represents a union of three new interfaces. However, it can't be used for all cases.
-/// Examples:
-///  * Function properties may depend on arguments type (e.g. toUInt32(UInt8) is globally monotonic, toUInt32(UInt64) - only on intervals)
-///  * In implementation of lambda functions DataTypeFunction needs an functional object with known arguments and return type
-///  * Function CAST prepares specific implementation based on argument types
-///
-/// Interfaces for IFunction, IExecutableFunctionImpl, IFunctionBaseImpl and IFunctionOverloadResolverImpl are pure.
-/// Default implementations are in adaptors classes (IFunctionAdaptors.h), which are implement user interfaces via developer ones.
-/// Interfaces IExecutableFunctionImpl, IFunctionBaseImpl and IFunctionOverloadResolverImpl are implemented via IFunction
-///  in DefaultExecutable, DefaultFunction and DefaultOverloadResolver classes (IFunctionAdaptors.h).
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NOT_IMPLEMENTED;
-}
-
-/// Cache for functions result if it was executed on low cardinality column.
-class ExecutableFunctionLowCardinalityResultCache;
-using ExecutableFunctionLowCardinalityResultCachePtr = std::shared_ptr<ExecutableFunctionLowCardinalityResultCache>;
-
-class IExecutableFunctionImpl
-{
-public:
-    virtual ~IExecutableFunctionImpl() = default;
-
-    virtual String getName() const = 0;
-
-    virtual ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const = 0;
-    virtual ColumnPtr executeDryRun(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
-    {
-        return execute(arguments, result_type, input_rows_count);
-    }
-
-    /** Default implementation in presence of Nullable arguments or NULL constants as arguments is the following:
-      *  if some of arguments are NULL constants then return NULL constant,
-      *  if some of arguments are Nullable, then execute function as usual for columns,
-      *   where Nullable columns are substituted with nested columns (they have arbitrary values in rows corresponding to NULL value)
-      *   and wrap result in Nullable column where NULLs are in all rows where any of arguments are NULL.
-      */
-    virtual bool useDefaultImplementationForNulls() const { return true; }
-
-    /** If the function have non-zero number of arguments,
-      *  and if all arguments are constant, that we could automatically provide default implementation:
-      *  arguments are converted to ordinary columns with single value, then function is executed as usual,
-      *  and then the result is converted to constant column.
-      */
-    virtual bool useDefaultImplementationForConstants() const { return false; }
-
-    /** If function arguments has single low cardinality column and all other arguments are constants, call function on nested column.
-      * Otherwise, convert all low cardinality columns to ordinary columns.
-      * Returns ColumnLowCardinality if at least one argument is ColumnLowCardinality.
-      */
-    virtual bool useDefaultImplementationForLowCardinalityColumns() const { return true; }
-
-    /** Some arguments could remain constant during this implementation.
-      */
-    virtual ColumnNumbers getArgumentsThatAreAlwaysConstant() const { return {}; }
-
-    /** True if function can be called on default arguments (include Nullable's) and won't throw.
-      * Counterexample: modulo(0, 0)
-      */
-    virtual bool canBeExecutedOnDefaultArguments() const { return true; }
-};
-
-using ExecutableFunctionImplPtr = std::unique_ptr<IExecutableFunctionImpl>;
-
-
-/// This class generally has the same methods as in IFunctionBase.
-/// See comments for IFunctionBase in IFunction.h
-/// The main purpose is to implement `prepare` which returns IExecutableFunctionImpl, not IExecutableFunction
-/// Inheritance is not used for better readability.
-class IFunctionBaseImpl
-{
-public:
-    virtual ~IFunctionBaseImpl() = default;
-
-    virtual String getName() const = 0;
-
-    virtual const DataTypes & getArgumentTypes() const = 0;
-    virtual const DataTypePtr & getResultType() const = 0;
-
-    virtual ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName & arguments) const = 0;
-
-#if USE_EMBEDDED_COMPILER
-
-    virtual bool isCompilable() const { return false; }
-
-    virtual llvm::Value * compile(llvm::IRBuilderBase & /*builder*/, ValuePlaceholders /*values*/) const
-    {
-        throw Exception(getName() + " is not JIT-compilable", ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-#endif
-
-    virtual bool isStateful() const { return false; }
-
-    virtual bool isSuitableForConstantFolding() const { return true; }
-    virtual ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & /*arguments*/) const { return nullptr; }
-
-    virtual bool isInjective(const ColumnsWithTypeAndName & /*sample_columns*/) const { return false; }
-    virtual bool isDeterministic() const { return true; }
-    virtual bool isDeterministicInScopeOfQuery() const { return true; }
-    virtual bool hasInformationAboutMonotonicity() const { return false; }
-
-    using Monotonicity = IFunctionBase::Monotonicity;
-    virtual Monotonicity getMonotonicityForRange(const IDataType & /*type*/, const Field & /*left*/, const Field & /*right*/) const
-    {
-        throw Exception("Function " + getName() + " has no information about its monotonicity.", ErrorCodes::NOT_IMPLEMENTED);
-    }
-};
-
-using FunctionBaseImplPtr = std::unique_ptr<IFunctionBaseImpl>;
-
-
-class IFunctionOverloadResolverImpl
-{
-public:
-
-    virtual ~IFunctionOverloadResolverImpl() = default;
-
-    virtual String getName() const = 0;
-
-    virtual FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const = 0;
-
-    virtual DataTypePtr getReturnType(const DataTypes & /*arguments*/) const
-    {
-        throw Exception("getReturnType is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-    /// This function will be called in default implementation. You can overload it or the previous one.
-    virtual DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const
-    {
-        DataTypes data_types(arguments.size());
-        for (size_t i = 0; i < arguments.size(); ++i)
-            data_types[i] = arguments[i].type;
-
-        return getReturnType(data_types);
-    }
-
-    /// For non-variadic functions, return number of arguments; otherwise return zero (that should be ignored).
-    virtual size_t getNumberOfArguments() const = 0;
-
-    /// Properties from IFunctionOverloadResolver. See comments in IFunction.h
-    virtual bool isDeterministic() const { return true; }
-    virtual bool isDeterministicInScopeOfQuery() const { return true; }
-    virtual bool isInjective(const ColumnsWithTypeAndName &) const { return false; }
-    virtual bool isStateful() const { return false; }
-    virtual bool isVariadic() const { return false; }
-
-    virtual void getLambdaArgumentTypes(DataTypes & /*arguments*/) const
-    {
-        throw Exception("Function " + getName() + " can't have lambda-expressions as arguments", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-    }
-
-    virtual ColumnNumbers getArgumentsThatAreAlwaysConstant() const { return {}; }
-    virtual ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const { return {}; }
-
-    /** If useDefaultImplementationForNulls() is true, than change arguments for getReturnType() and build():
-      *  if some of arguments are Nullable(Nothing) then don't call getReturnType(), call build() with return_type = Nullable(Nothing),
-      *  if some of arguments are Nullable, then:
-      *   - Nullable types are substituted with nested types for getReturnType() function
-      *   - wrap getReturnType() result in Nullable type and pass to build
-      *
-      * Otherwise build returns build(arguments, getReturnType(arguments));
-      */
-    virtual bool useDefaultImplementationForNulls() const { return true; }
-
-    /** If useDefaultImplementationForNulls() is true, than change arguments for getReturnType() and build().
-      * If function arguments has low cardinality types, convert them to ordinary types.
-      * getReturnType returns ColumnLowCardinality if at least one argument type is ColumnLowCardinality.
-      */
-    virtual bool useDefaultImplementationForLowCardinalityColumns() const { return true; }
-
-    /// If it isn't, will convert all ColumnLowCardinality arguments to full columns.
-    virtual bool canBeExecutedOnLowCardinalityDictionary() const { return true; }
-};
-
-using FunctionOverloadResolverImplPtr = std::unique_ptr<IFunctionOverloadResolverImpl>;
-
-
-/// Previous function interface.
-class IFunction
-{
-public:
-
-    virtual ~IFunction() = default;
-
-    virtual String getName() const = 0;
-
-    virtual ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const = 0;
-    virtual ColumnPtr executeImplDryRun(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
-    {
-        return executeImpl(arguments, result_type, input_rows_count);
-    }
-
-    /** Default implementation in presence of Nullable arguments or NULL constants as arguments is the following:
-      *  if some of arguments are NULL constants then return NULL constant,
-      *  if some of arguments are Nullable, then execute function as usual for columns,
-      *   where Nullable columns are substituted with nested columns (they have arbitrary values in rows corresponding to NULL value)
-      *   and wrap result in Nullable column where NULLs are in all rows where any of arguments are NULL.
-      */
-    virtual bool useDefaultImplementationForNulls() const { return true; }
-
-    /** If the function have non-zero number of arguments,
-      *  and if all arguments are constant, that we could automatically provide default implementation:
-      *  arguments are converted to ordinary columns with single value, then function is executed as usual,
-      *  and then the result is converted to constant column.
-      */
-    virtual bool useDefaultImplementationForConstants() const { return false; }
-
-    /** If function arguments has single low cardinality column and all other arguments are constants, call function on nested column.
-      * Otherwise, convert all low cardinality columns to ordinary columns.
-      * Returns ColumnLowCardinality if at least one argument is ColumnLowCardinality.
-      */
-    virtual bool useDefaultImplementationForLowCardinalityColumns() const { return true; }
-
-    /// If it isn't, will convert all ColumnLowCardinality arguments to full columns.
-    virtual bool canBeExecutedOnLowCardinalityDictionary() const { return true; }
-
-    /** Some arguments could remain constant during this implementation.
-      */
-    virtual ColumnNumbers getArgumentsThatAreAlwaysConstant() const { return {}; }
-
-    /** True if function can be called on default arguments (include Nullable's) and won't throw.
-      * Counterexample: modulo(0, 0)
-      */
-    virtual bool canBeExecutedOnDefaultArguments() const { return true; }
-
-#if USE_EMBEDDED_COMPILER
-
-    virtual bool isCompilable() const
-    {
-        throw Exception("isCompilable without explicit types is not implemented for IFunction", ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-    virtual llvm::Value * compile(llvm::IRBuilderBase & /*builder*/, ValuePlaceholders /*values*/) const
-    {
-        throw Exception("compile without explicit types is not implemented for IFunction", ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-#endif
-
-    /// Properties from IFunctionBase (see IFunction.h)
-    virtual bool isSuitableForConstantFolding() const { return true; }
-    virtual ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & /*arguments*/) const { return nullptr; }
-    virtual bool isInjective(const ColumnsWithTypeAndName & /*sample_columns*/) const { return false; }
-    virtual bool isDeterministic() const { return true; }
-    virtual bool isDeterministicInScopeOfQuery() const { return true; }
-    virtual bool isStateful() const { return false; }
-    virtual bool hasInformationAboutMonotonicity() const { return false; }
-
-    using Monotonicity = IFunctionBase::Monotonicity;
-    virtual Monotonicity getMonotonicityForRange(const IDataType & /*type*/, const Field & /*left*/, const Field & /*right*/) const
-    {
-        throw Exception("Function " + getName() + " has no information about its monotonicity.", ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-    /// For non-variadic functions, return number of arguments; otherwise return zero (that should be ignored).
-    virtual size_t getNumberOfArguments() const = 0;
-
-    virtual DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const
-    {
-        throw Exception("getReturnType is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-    /// Get the result type by argument type. If the function does not apply to these arguments, throw an exception.
-    virtual DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const
-    {
-        DataTypes data_types(arguments.size());
-        for (size_t i = 0; i < arguments.size(); ++i)
-            data_types[i] = arguments[i].type;
-
-        return getReturnTypeImpl(data_types);
-    }
-
-    virtual bool isVariadic() const { return false; }
-
-    virtual void getLambdaArgumentTypes(DataTypes & /*arguments*/) const
-    {
-        throw Exception("Function " + getName() + " can't have lambda-expressions as arguments", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-    }
-
-    virtual ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const { return {}; }
-
-
-#if USE_EMBEDDED_COMPILER
-
-    bool isCompilable(const DataTypes & arguments) const;
-
-    llvm::Value * compile(llvm::IRBuilderBase &, const DataTypes & arguments, ValuePlaceholders values) const;
-
-#endif
-
-protected:
-
-#if USE_EMBEDDED_COMPILER
-
-    virtual bool isCompilableImpl(const DataTypes &) const { return false; }
-
-    virtual llvm::Value * compileImpl(llvm::IRBuilderBase &, const DataTypes &, ValuePlaceholders) const
-    {
-        throw Exception(getName() + " is not JIT-compilable", ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-#endif
-};
-
-using FunctionPtr = std::shared_ptr<IFunction>;
-
-}
diff --git a/src/Functions/LeastGreatestGeneric.h b/src/Functions/LeastGreatestGeneric.h
index b13286daded..f33bda801cb 100644
--- a/src/Functions/LeastGreatestGeneric.h
+++ b/src/Functions/LeastGreatestGeneric.h
@@ -4,7 +4,7 @@
 #include <DataTypes/NumberTraits.h>
 #include <Interpreters/castColumn.h>
 #include <Columns/ColumnsNumber.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <ext/map.h>
 
@@ -30,7 +30,7 @@ class FunctionLeastGreatestGeneric : public IFunction
 {
 public:
     static constexpr auto name = kind == LeastGreatest::Least ? "least" : "greatest";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionLeastGreatestGeneric<kind>>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionLeastGreatestGeneric<kind>>(); }
 
 private:
     String getName() const override { return name; }
@@ -87,35 +87,35 @@ private:
 
 
 template <LeastGreatest kind, typename SpecializedFunction>
-class LeastGreatestOverloadResolver : public IFunctionOverloadResolverImpl
+class LeastGreatestOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = kind == LeastGreatest::Least ? "least" : "greatest";
 
-    static FunctionOverloadResolverImplPtr create(const Context & context)
+    static FunctionOverloadResolverPtr create(ContextConstPtr context)
     {
         return std::make_unique<LeastGreatestOverloadResolver<kind, SpecializedFunction>>(context);
     }
 
-    explicit LeastGreatestOverloadResolver(const Context & context_) : context(context_) {}
+    explicit LeastGreatestOverloadResolver(ContextConstPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         DataTypes argument_types;
 
         /// More efficient specialization for two numeric arguments.
         if (arguments.size() == 2 && isNumber(arguments[0].type) && isNumber(arguments[1].type))
-            return std::make_unique<DefaultFunction>(SpecializedFunction::create(context), argument_types, return_type);
+            return std::make_unique<FunctionToFunctionBaseAdaptor>(SpecializedFunction::create(context), argument_types, return_type);
 
-        return std::make_unique<DefaultFunction>(
+        return std::make_unique<FunctionToFunctionBaseAdaptor>(
             FunctionLeastGreatestGeneric<kind>::create(context), argument_types, return_type);
     }
 
-    DataTypePtr getReturnType(const DataTypes & types) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & types) const override
     {
         if (types.empty())
             throw Exception("Function " + getName() + " cannot be called without arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
@@ -127,7 +127,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/PerformanceAdaptors.h b/src/Functions/PerformanceAdaptors.h
index 5d4d013691c..04bf19bbd88 100644
--- a/src/Functions/PerformanceAdaptors.h
+++ b/src/Functions/PerformanceAdaptors.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Functions/TargetSpecific.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 
 #include <Common/Stopwatch.h>
 #include <Interpreters/Context.h>
@@ -172,7 +172,7 @@ namespace detail
  * /// default implementation.
  * class MyFunction : public MyDefaultImpl
  * {
- *     MyFunction(const Context & context) : selector(context) {
+ *     MyFunction(ContextConstPtr context) : selector(context) {
  *         /// Register all implementations in constructor.
  *         /// There could be as many implementation for every target as you want.
  *         selector.registerImplementation<TargetArch::Default, MyDefaultImpl>();
@@ -185,7 +185,7 @@ namespace detail
  *         selector.selectAndExecute(...);
  *     }
  *
- *     static FunctionPtr create(const Context & context) {
+ *     static FunctionPtr create(ContextConstPtr context) {
  *         return std::make_shared<MyFunction>(context);
  *     }
  * private:
@@ -193,12 +193,12 @@ namespace detail
  * };
  */
 template <typename FunctionInterface>
-class ImplementationSelector
+class ImplementationSelector : WithConstContext
 {
 public:
     using ImplementationPtr = std::shared_ptr<FunctionInterface>;
 
-    ImplementationSelector(const Context & context_) : context(context_) {}
+    ImplementationSelector(ContextConstPtr context_) : WithConstContext(context_) {}
 
     /* Select the best implementation based on previous runs.
      * If FunctionInterface is IFunction, then "executeImpl" method of the implementation will be called
@@ -248,7 +248,7 @@ public:
         if (isArchSupported(Arch))
         {
             // TODO(dakovalkov): make this option better.
-            const auto & choose_impl = context.getSettingsRef().function_implementation.value;
+            const auto & choose_impl = getContext()->getSettingsRef().function_implementation.value;
             if (choose_impl.empty() || choose_impl == detail::getImplementationTag<FunctionImpl>(Arch))
             {
                 implementations.emplace_back(std::make_shared<FunctionImpl>(std::forward<Args>(args)...));
@@ -258,7 +258,6 @@ public:
     }
 
 private:
-    const Context & context;
     std::vector<ImplementationPtr> implementations;
     mutable detail::PerformanceStatistics statistics; /// It is protected by internal mutex.
 };
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index c8e96f0b63a..4226e3ae0b0 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -12,7 +12,7 @@
 /// Warning in boost::geometry during template strategy substitution.
 #pragma GCC diagnostic push
 
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
@@ -285,7 +285,7 @@ void PointInPolygonWithGrid<CoordinateType>::calcGridAttributes(
     const Point & max_corner = box.max_corner();
 
 #pragma GCC diagnostic push
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
@@ -322,7 +322,7 @@ void PointInPolygonWithGrid<CoordinateType>::buildGrid()
     for (size_t row = 0; row < grid_size; ++row)
     {
 #pragma GCC diagnostic push
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
         CoordinateType y_min = min_corner.y() + row * cell_height;
@@ -646,7 +646,7 @@ UInt128 sipHash128(Polygon && polygon)
         hash_ring(inner);
 
     UInt128 res;
-    hash.get128(res.low, res.high);
+    hash.get128(res);
     return res;
 }
 
diff --git a/src/Functions/TargetSpecific.h b/src/Functions/TargetSpecific.h
index 8de6a3dbec4..e6d3fe6d665 100644
--- a/src/Functions/TargetSpecific.h
+++ b/src/Functions/TargetSpecific.h
@@ -36,15 +36,15 @@
  * int func() {
  * #if USE_MULTITARGET_CODE
  *     if (isArchSupported(TargetArch::AVX2))
- *         return TargetSpecifc::AVX2::funcImpl();
+ *         return TargetSpecific::AVX2::funcImpl();
  * #endif
- *     return TargetSpecifc::Default::funcImpl();
+ *     return TargetSpecific::Default::funcImpl();
  * }
  *
  * Sometimes code may benefit from compiling with different options.
  * For these purposes use DECLARE_MULTITARGET_CODE macros. It will create a copy
  * of the code for every supported target and compile it with different options.
- * These copies are available via TargetSpecifc namespaces described above.
+ * These copies are available via TargetSpecific namespaces described above.
  *
  * Inside every TargetSpecific namespace there is a constexpr variable BuildArch,
  * which indicates the target platform for current 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 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/CMakeLists.txt b/src/Functions/URL/CMakeLists.txt
index 0cf02fd524f..a523384f030 100644
--- a/src/Functions/URL/CMakeLists.txt
+++ b/src/Functions/URL/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions_url .)
 add_library(clickhouse_functions_url ${clickhouse_functions_url_sources} ${clickhouse_functions_url_headers})
 target_link_libraries(clickhouse_functions_url PRIVATE dbms)
@@ -15,12 +15,12 @@ if (USE_GPERF)
     add_custom_target(generate-tldlookup-gperf ./tldLookup.sh
         SOURCES tldLookup.sh
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        BYPRODUCTS ${CMAKE_CURRENT_SOURCE_DIR}/tldLookup.gperf
+        BYPRODUCTS "${CMAKE_CURRENT_SOURCE_DIR}/tldLookup.gperf"
     )
     add_custom_target(generate-tldlookup ${GPERF} tldLookup.gperf --output-file=tldLookup.generated.cpp && clang-format -i tldLookup.generated.cpp
         SOURCES tldLookup.gperf
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        # BYPRODUCTS ${CMAKE_CURRENT_SOURCE_DIR}/tldLookup.generated.cpp
+        # BYPRODUCTS "${CMAKE_CURRENT_SOURCE_DIR}/tldLookup.generated.cpp"
     )
     add_dependencies(generate-tldlookup generate-tldlookup-gperf)
     if(NOT TARGET generate-source)
diff --git a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
index d6868834f75..fa985f194f3 100644
--- a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
+++ b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
@@ -36,7 +36,7 @@ class FunctionCutToFirstSignificantSubdomainCustomImpl : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCutToFirstSignificantSubdomainCustomImpl>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionCutToFirstSignificantSubdomainCustomImpl>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index adc3ffa5001..6f277de45a5 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -1,5 +1,5 @@
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
@@ -21,7 +21,7 @@ namespace ErrorCodes
 struct FunctionPort : public IFunction
 {
     static constexpr auto name = "port";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionPort>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionPort>(); }
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
diff --git a/src/Functions/abtesting.cpp b/src/Functions/abtesting.cpp
index 7bed2f4a2b9..fa0e5e8a6bd 100644
--- a/src/Functions/abtesting.cpp
+++ b/src/Functions/abtesting.cpp
@@ -168,7 +168,7 @@ class FunctionBayesAB : public IFunction
 public:
     static constexpr auto name = "bayesAB";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionBayesAB>();
     }
diff --git a/src/Functions/addressToLine.cpp b/src/Functions/addressToLine.cpp
index a115b13e54a..1ae8d9126bb 100644
--- a/src/Functions/addressToLine.cpp
+++ b/src/Functions/addressToLine.cpp
@@ -7,7 +7,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeString.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <IO/WriteBufferFromArena.h>
 #include <IO/WriteHelpers.h>
@@ -36,9 +36,9 @@ class FunctionAddressToLine : public IFunction
 {
 public:
     static constexpr auto name = "addressToLine";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        context.checkAccess(AccessType::addressToLine);
+        context->checkAccess(AccessType::addressToLine);
         return std::make_shared<FunctionAddressToLine>();
     }
 
diff --git a/src/Functions/addressToSymbol.cpp b/src/Functions/addressToSymbol.cpp
index 5accfd1dd94..1c744a11755 100644
--- a/src/Functions/addressToSymbol.cpp
+++ b/src/Functions/addressToSymbol.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeString.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Access/AccessFlags.h>
 #include <Interpreters/Context.h>
@@ -28,9 +28,9 @@ class FunctionAddressToSymbol : public IFunction
 {
 public:
     static constexpr auto name = "addressToSymbol";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        context.checkAccess(AccessType::addressToSymbol);
+        context->checkAccess(AccessType::addressToSymbol);
         return std::make_shared<FunctionAddressToSymbol>();
     }
 
diff --git a/src/Functions/appendTrailingCharIfAbsent.cpp b/src/Functions/appendTrailingCharIfAbsent.cpp
index 7ba9a870105..89d7f12f780 100644
--- a/src/Functions/appendTrailingCharIfAbsent.cpp
+++ b/src/Functions/appendTrailingCharIfAbsent.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <ext/range.h>
 
 
@@ -24,7 +24,7 @@ class FunctionAppendTrailingCharIfAbsent : public IFunction
 {
 public:
     static constexpr auto name = "appendTrailingCharIfAbsent";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionAppendTrailingCharIfAbsent>();
     }
diff --git a/src/Functions/array/CMakeLists.txt b/src/Functions/array/CMakeLists.txt
index 1457e671261..9762674d6e9 100644
--- a/src/Functions/array/CMakeLists.txt
+++ b/src/Functions/array/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_functions_array .)
 add_library(clickhouse_functions_array ${clickhouse_functions_array_sources} ${clickhouse_functions_array_headers})
 target_link_libraries(clickhouse_functions_array PRIVATE dbms clickhouse_functions_gatherutils)
diff --git a/src/Functions/array/FunctionArrayMapped.h b/src/Functions/array/FunctionArrayMapped.h
index e336a86d994..9b51000144f 100644
--- a/src/Functions/array/FunctionArrayMapped.h
+++ b/src/Functions/array/FunctionArrayMapped.h
@@ -8,9 +8,10 @@
 #include <Columns/ColumnFunction.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -43,7 +44,7 @@ class FunctionArrayMapped : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayMapped>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayMapped>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index ef36069015c..62ae0b4f2d8 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/getLeastSupertype.h>
@@ -14,7 +14,7 @@ class FunctionArray : public IFunction
 {
 public:
     static constexpr auto name = "array";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionArray>();
     }
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index e0e246b8af4..3d40dfe83ea 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -15,6 +15,8 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
+    extern const int DECIMAL_OVERFLOW;
+    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 enum class AggregateOperation
@@ -22,7 +24,8 @@ enum class AggregateOperation
     min,
     max,
     sum,
-    average
+    average,
+    product
 };
 
 /**
@@ -54,17 +57,24 @@ struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::average>
     using Result = Float64;
 };
 
+template <typename ArrayElement>
+struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::product>
+{
+    using Result = Float64;
+};
+
 template <typename ArrayElement>
 struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::sum>
 {
     using Result =
         std::conditional_t<std::is_same_v<ArrayElement, Int128>, Int128,
-            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<std::is_floating_point_v<ArrayElement>, Float64,
-                            std::conditional_t<std::is_signed_v<ArrayElement>, Int64,
-                                UInt64>>>>>>;
+        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<std::is_floating_point_v<ArrayElement>, Float64,
+        std::conditional_t<std::is_signed_v<ArrayElement>, Int64,
+            UInt64>>>>>>>;
 };
 
 template <typename ArrayElement, AggregateOperation operation>
@@ -86,7 +96,7 @@ struct ArrayAggregateImpl
             using Types = std::decay_t<decltype(types)>;
             using DataType = typename Types::LeftType;
 
-            if constexpr (aggregate_operation == AggregateOperation::average)
+            if constexpr (aggregate_operation == AggregateOperation::average || aggregate_operation == AggregateOperation::product)
             {
                 result = std::make_shared<DataTypeFloat64>();
 
@@ -124,17 +134,17 @@ struct ArrayAggregateImpl
     template <typename Element>
     static NO_SANITIZE_UNDEFINED bool executeType(const ColumnPtr & mapped, const ColumnArray::Offsets & offsets, ColumnPtr & res_ptr)
     {
-        using Result = ArrayAggregateResult<Element, aggregate_operation>;
+        using ResultType = ArrayAggregateResult<Element, aggregate_operation>;
         using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecResultType = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
 
-        /// For average of array we return Float64 as result, but we want to keep precision
-        /// so we convert to Float64 as last step, but intermediate sum is represented as result of sum operation
-        static constexpr bool is_average_operation = aggregate_operation == AggregateOperation::average;
+        /// 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
+        static constexpr bool is_average_or_product_operation = aggregate_operation == AggregateOperation::average ||
+            aggregate_operation == AggregateOperation::product;
         using SummAggregationType = ArrayAggregateResult<Element, AggregateOperation::sum>;
 
-        using AggregationType = std::conditional_t<is_average_operation, SummAggregationType, Result>;
-
+        using AggregationType = std::conditional_t<is_average_or_product_operation, SummAggregationType, ResultType>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -147,18 +157,15 @@ struct ArrayAggregateImpl
                 return false;
 
             const AggregationType x = column_const->template getValue<Element>(); // NOLINT
-            const typename ColVecType::Container & data
-                = checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
+            const auto & data = checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
 
-            typename ColVecResult::MutablePtr res_column;
+            typename ColVecResultType::MutablePtr res_column;
             if constexpr (IsDecimalNumber<Element>)
-            {
-                res_column = ColVecResult::create(offsets.size(), data.getScale());
-            }
+                res_column = ColVecResultType::create(offsets.size(), data.getScale());
             else
-                res_column = ColVecResult::create(offsets.size());
+                res_column = ColVecResultType::create(offsets.size());
 
-            typename ColVecResult::Container & res = res_column->getData();
+            auto & res = res_column->getData();
 
             size_t pos = 0;
             for (size_t i = 0; i < offsets.size(); ++i)
@@ -167,7 +174,7 @@ struct ArrayAggregateImpl
                 {
                     size_t array_size = offsets[i] - pos;
                     /// Just multiply the value by array size.
-                    res[i] = x * array_size;
+                    res[i] = x * ResultType(array_size);
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::min ||
                                 aggregate_operation == AggregateOperation::max)
@@ -178,13 +185,45 @@ struct ArrayAggregateImpl
                 {
                     if constexpr (IsDecimalNumber<Element>)
                     {
-                        res[i] = DecimalUtils::convertTo<Result>(x, data.getScale());
+                        res[i] = DecimalUtils::convertTo<ResultType>(x, data.getScale());
                     }
                     else
                     {
                         res[i] = x;
                     }
                 }
+                else if constexpr (aggregate_operation == AggregateOperation::product)
+                {
+                    size_t array_size = offsets[i] - pos;
+                    AggregationType product = x;
+
+                    if constexpr (IsDecimalNumber<Element>)
+                    {
+                        using T = decltype(x.value);
+                        T x_val = x.value;
+
+                        for (size_t array_index = 1; array_index < array_size; ++array_index)
+                        {
+                            T product_val = product.value;
+
+                            if (common::mulOverflow(x_val, product_val, product.value))
+                                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
+                        }
+
+                        auto result_scale = data.getScale() * array_size;
+                        if (unlikely(result_scale > DecimalUtils::max_precision<AggregationType>))
+                            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds", result_scale);
+
+                        res[i] = DecimalUtils::convertTo<ResultType>(product, data.getScale() * array_size);
+                    }
+                    else
+                    {
+                        for (size_t array_index = 1; array_index < array_size; ++array_index)
+                            product = product * x;
+
+                        res[i] = product;
+                    }
+                }
 
                 pos = offsets[i];
             }
@@ -193,30 +232,33 @@ struct ArrayAggregateImpl
             return true;
         }
 
-        const typename ColVecType::Container & data = column->getData();
+        const auto & data = column->getData();
 
-        typename ColVecResult::MutablePtr res_column;
+        typename ColVecResultType::MutablePtr res_column;
         if constexpr (IsDecimalNumber<Element>)
-            res_column = ColVecResult::create(offsets.size(), data.getScale());
+            res_column = ColVecResultType::create(offsets.size(), data.getScale());
         else
-            res_column = ColVecResult::create(offsets.size());
+            res_column = ColVecResultType::create(offsets.size());
 
-        typename ColVecResult::Container & res = res_column->getData();
+        typename ColVecResultType::Container & res = res_column->getData();
 
         size_t pos = 0;
         for (size_t i = 0; i < offsets.size(); ++i)
         {
-            AggregationType s = 0;
+            AggregationType aggregate_value{};
 
             /// Array is empty
             if (offsets[i] == pos)
             {
-                res[i] = s;
+                if constexpr (IsDecimalNumber<AggregationType>)
+                    res[i] = aggregate_value.value;
+                else
+                    res[i] = aggregate_value;
                 continue;
             }
 
             size_t count = 1;
-            s = data[pos]; // NOLINT
+            aggregate_value = data[pos]; // NOLINT
             ++pos;
 
             for (; pos < offsets[i]; ++pos)
@@ -226,20 +268,36 @@ struct ArrayAggregateImpl
                 if constexpr (aggregate_operation == AggregateOperation::sum ||
                             aggregate_operation == AggregateOperation::average)
                 {
-                    s += element;
+                    aggregate_value += element;
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::min)
                 {
-                    if (element < s)
+                    if (element < aggregate_value)
                     {
-                        s = element;
+                        aggregate_value = element;
                     }
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::max)
                 {
-                    if (element > s)
+                    if (element > aggregate_value)
                     {
-                        s = element;
+                        aggregate_value = element;
+                    }
+                }
+                else if constexpr (aggregate_operation == AggregateOperation::product)
+                {
+                    if constexpr (IsDecimalNumber<Element>)
+                    {
+                        using AggregateValueDecimalUnderlyingValue = decltype(aggregate_value.value);
+                        AggregateValueDecimalUnderlyingValue current_aggregate_value = aggregate_value.value;
+                        AggregateValueDecimalUnderlyingValue element_value = static_cast<AggregateValueDecimalUnderlyingValue>(element.value);
+
+                        if (common::mulOverflow(current_aggregate_value, element_value, aggregate_value.value))
+                            throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
+                    }
+                    else
+                    {
+                        aggregate_value *= element;
                     }
                 }
 
@@ -250,17 +308,26 @@ struct ArrayAggregateImpl
             {
                 if constexpr (IsDecimalNumber<Element>)
                 {
-                    s = s / count;
-                    res[i] = DecimalUtils::convertTo<Result>(s, data.getScale());
+                    aggregate_value = aggregate_value / AggregationType(count);
+                    res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, data.getScale());
                 }
                 else
                 {
-                    res[i] = static_cast<Result>(s) / count;
+                    res[i] = static_cast<ResultType>(aggregate_value) / count;
                 }
             }
+            else if constexpr (aggregate_operation == AggregateOperation::product && IsDecimalNumber<Element>)
+            {
+                auto result_scale = data.getScale() * count;
+
+                if (unlikely(result_scale > DecimalUtils::max_precision<AggregationType>))
+                    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Scale {} is out of bounds", result_scale);
+
+                res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, result_scale);
+            }
             else
             {
-                res[i] = s;
+                res[i] = aggregate_value;
             }
         }
 
@@ -277,6 +344,7 @@ struct ArrayAggregateImpl
             executeType<UInt16>(mapped, offsets, res) ||
             executeType<UInt32>(mapped, offsets, res) ||
             executeType<UInt64>(mapped, offsets, res) ||
+            executeType<UInt128>(mapped, offsets, res) ||
             executeType<UInt256>(mapped, offsets, res) ||
             executeType<Int8>(mapped, offsets, res) ||
             executeType<Int16>(mapped, offsets, res) ||
@@ -291,7 +359,7 @@ struct ArrayAggregateImpl
             executeType<Decimal128>(mapped, offsets, res))
             return res;
         else
-            throw Exception("Unexpected column for arraySum: " + mapped->getName(), ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Unexpected column for arraySum: {}" + mapped->getName());
     }
 };
 
@@ -307,12 +375,16 @@ using FunctionArraySum = FunctionArrayMapped<ArrayAggregateImpl<AggregateOperati
 struct NameArrayAverage { static constexpr auto name = "arrayAvg"; };
 using FunctionArrayAverage = FunctionArrayMapped<ArrayAggregateImpl<AggregateOperation::average>, NameArrayAverage>;
 
+struct NameArrayProduct { static constexpr auto name = "arrayProduct"; };
+using FunctionArrayProduct = FunctionArrayMapped<ArrayAggregateImpl<AggregateOperation::product>, NameArrayProduct>;
+
 void registerFunctionArrayAggregation(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionArrayMin>();
     factory.registerFunction<FunctionArrayMax>();
     factory.registerFunction<FunctionArraySum>();
     factory.registerFunction<FunctionArrayAverage>();
+    factory.registerFunction<FunctionArrayProduct>();
 }
 
 }
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index 5ab22dede19..23193e28816 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <DataTypes/DataTypeArray.h>
@@ -26,7 +26,7 @@ class FunctionArrayConcat : public IFunction
 {
 public:
     static constexpr auto name = "arrayConcat";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayConcat>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayConcat>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayCumSumNonNegative.cpp b/src/Functions/array/arrayCumSumNonNegative.cpp
index 2c7362a1605..288422c1c9c 100644
--- a/src/Functions/array/arrayCumSumNonNegative.cpp
+++ b/src/Functions/array/arrayCumSumNonNegative.cpp
@@ -60,8 +60,8 @@ struct ArrayCumSumNonNegativeImpl
             for (; pos < offset; ++pos)
             {
                 accumulated += src_values[pos];
-                if (accumulated < 0)
-                    accumulated = 0;
+                if (accumulated < Dst{})
+                    accumulated = {};
                 res_values[pos] = accumulated;
             }
         }
diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index b4b30079a4e..7d11c6e89c8 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -13,6 +13,7 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
+    extern const int DECIMAL_OVERFLOW;
 }
 
 /** arrayDifference() - returns an array with the difference between all pairs of neighboring elements.
@@ -57,13 +58,32 @@ struct ArrayDifferenceImpl
         {
             if (pos == begin)
             {
-                dst[pos] = 0;
+                dst[pos] = {};
                 prev = src[pos];
             }
             else
             {
                 Element curr = src[pos];
-                dst[pos] = curr - prev;
+
+                if constexpr (IsDecimalNumber<Element>)
+                {
+                    using ResultNativeType = typename Result::NativeType;
+
+                    ResultNativeType result_value;
+                    bool overflow = common::subOverflow(
+                        static_cast<ResultNativeType>(curr.value),
+                        static_cast<ResultNativeType>(prev.value),
+                        result_value);
+                    if (overflow)
+                        throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "Decimal math overflow");
+
+                    dst[pos] = Result(result_value);
+                }
+                else
+                {
+                    dst[pos] = curr - prev;
+                }
+
                 prev = curr;
             }
         }
diff --git a/src/Functions/array/arrayDistinct.cpp b/src/Functions/array/arrayDistinct.cpp
index e3be840b01f..164e3b19c83 100644
--- a/src/Functions/array/arrayDistinct.cpp
+++ b/src/Functions/array/arrayDistinct.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -26,7 +26,7 @@ class FunctionArrayDistinct : public IFunction
 public:
     static constexpr auto name = "arrayDistinct";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionArrayDistinct>();
     }
@@ -270,7 +270,7 @@ void FunctionArrayDistinct::executeHashed(
             UInt128 hash;
             SipHash hash_function;
             src_data.updateHashWithValue(j, hash_function);
-            hash_function.get128(reinterpret_cast<char *>(&hash));
+            hash_function.get128(hash);
 
             if (!set.find(hash))
             {
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index 2d6a99c2258..5ec5c4d4213 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -41,7 +41,7 @@ class FunctionArrayElement : public IFunction
 {
 public:
     static constexpr auto name = "arrayElement";
-    static FunctionPtr create(const Context & context);
+    static FunctionPtr create(ContextConstPtr context);
 
     String getName() const override;
 
@@ -449,7 +449,7 @@ struct ArrayElementGenericImpl
 }
 
 
-FunctionPtr FunctionArrayElement::create(const Context &)
+FunctionPtr FunctionArrayElement::create(ContextConstPtr)
 {
     return std::make_shared<FunctionArrayElement>();
 }
@@ -876,7 +876,7 @@ bool FunctionArrayElement::matchKeyToIndexNumberConst(
     Field::dispatch([&](const auto & value)
     {
         using FieldType = std::decay_t<decltype(value)>;
-        if constexpr (is_integer_v<FieldType> && std::is_convertible_v<FieldType, DataType>)
+        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);
 
@@ -914,14 +914,15 @@ bool FunctionArrayElement::matchKeyToIndex(
         || 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<UInt128>(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);
 }
 
@@ -933,14 +934,15 @@ bool FunctionArrayElement::matchKeyToIndexConst(
         || 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<UInt128>(data, offsets, index, matched_idxs)
         || matchKeyToIndexNumberConst<Int256>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<UInt256>(data, offsets, index, matched_idxs)
+        || matchKeyToIndexNumberConst<UUID>(data, offsets, index, matched_idxs)
         || matchKeyToIndexStringConst(data, offsets, index, matched_idxs);
 }
 
diff --git a/src/Functions/array/arrayEnumerate.cpp b/src/Functions/array/arrayEnumerate.cpp
index 82bb25e2129..a80e4f9e016 100644
--- a/src/Functions/array/arrayEnumerate.cpp
+++ b/src/Functions/array/arrayEnumerate.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -22,7 +22,7 @@ class FunctionArrayEnumerate : public IFunction
 public:
     static constexpr auto name = "arrayEnumerate";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionArrayEnumerate>();
     }
diff --git a/src/Functions/array/arrayEnumerateExtended.h b/src/Functions/array/arrayEnumerateExtended.h
index 39bdd2a515e..921a0f0c75d 100644
--- a/src/Functions/array/arrayEnumerateExtended.h
+++ b/src/Functions/array/arrayEnumerateExtended.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -30,7 +30,7 @@ template <typename Derived>
 class FunctionArrayEnumerateExtended : public IFunction
 {
 public:
-    static FunctionPtr create(const Context &) { return std::make_shared<Derived>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<Derived>(); }
 
     String getName() const override { return Derived::name; }
 
diff --git a/src/Functions/array/arrayEnumerateRanked.h b/src/Functions/array/arrayEnumerateRanked.h
index ce82b8bcd86..3dbb2d2d0c9 100644
--- a/src/Functions/array/arrayEnumerateRanked.h
+++ b/src/Functions/array/arrayEnumerateRanked.h
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Interpreters/AggregationCommon.h>
 #include <Common/ColumnsHashing.h>
 #include <Common/HashTable/ClearableHashMap.h>
@@ -90,7 +90,7 @@ template <typename Derived>
 class FunctionArrayEnumerateRankedExtended : public IFunction
 {
 public:
-    static FunctionPtr create(const Context & /* context */) { return std::make_shared<Derived>(); }
+    static FunctionPtr create(ContextConstPtr /* context */) { return std::make_shared<Derived>(); }
 
     String getName() const override { return Derived::name; }
 
@@ -142,7 +142,7 @@ static inline UInt128 ALWAYS_INLINE hash128depths(const std::vector<size_t> & in
         key_columns[j]->updateHashWithValue(indices[j], hash);
     }
 
-    hash.get128(key.low, key.high);
+    hash.get128(key);
 
     return key;
 }
diff --git a/src/Functions/array/arrayFlatten.cpp b/src/Functions/array/arrayFlatten.cpp
index f9330bcd432..dfd1811d91d 100644
--- a/src/Functions/array/arrayFlatten.cpp
+++ b/src/Functions/array/arrayFlatten.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -20,7 +20,7 @@ class ArrayFlatten : public IFunction
 public:
     static constexpr auto name = "arrayFlatten";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<ArrayFlatten>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<ArrayFlatten>(); }
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
diff --git a/src/Functions/array/arrayIndex.h b/src/Functions/array/arrayIndex.h
index bc9e0b5608d..fbd3501298e 100644
--- a/src/Functions/array/arrayIndex.h
+++ b/src/Functions/array/arrayIndex.h
@@ -1,10 +1,11 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/getLeastSupertype.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
@@ -13,9 +14,9 @@
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/memcmpSmall.h>
 #include <Common/assert_cast.h>
-#include "Columns/ColumnLowCardinality.h"
-#include "DataTypes/DataTypeLowCardinality.h"
-#include "Interpreters/castColumn.h"
+#include <Columns/ColumnLowCardinality.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <Interpreters/castColumn.h>
 
 
 namespace DB
@@ -354,7 +355,7 @@ class FunctionArrayIndex : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayIndex>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayIndex>(); }
 
     /// Get function name.
     String getName() const override { return name; }
@@ -373,11 +374,10 @@ public:
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         if (!arguments[1]->onlyNull() && !allowArguments(array_type->getNestedType(), arguments[1]))
-            throw Exception("Types of array and 2nd argument of function \""
-                + getName() + "\" must be identical up to nullability, cardinality, "
-                "numeric types, or Enum and numeric type. Passed: "
-                + arguments[0]->getName() + " and " + arguments[1]->getName() + ".",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Types of array 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());
 
         return std::make_shared<DataTypeNumber<ResultType>>();
     }
@@ -494,86 +494,13 @@ private:
         inline void moveResult() { result_column = std::move(result); }
     };
 
-    static inline bool allowNested(const DataTypePtr & left, const DataTypePtr & right)
-    {
-        return ((isNativeNumber(left) || isEnum(left)) && isNativeNumber(right)) || left->equals(*right);
-    }
-
     static inline bool allowArguments(const DataTypePtr & array_inner_type, const DataTypePtr & arg)
     {
-        if (allowNested(array_inner_type, arg))
-            return true;
+        auto inner_type_decayed = removeNullable(removeLowCardinality(array_inner_type));
+        auto arg_decayed = removeNullable(removeLowCardinality(arg));
 
-        /// Nullable
-
-        const bool array_is_nullable = array_inner_type->isNullable();
-        const bool arg_is_nullable = arg->isNullable();
-
-        const DataTypePtr arg_or_arg_nullable_nested = arg_is_nullable
-            ? checkAndGetDataType<DataTypeNullable>(arg.get())->getNestedType()
-            : arg;
-
-        if (array_is_nullable) // comparing Array(Nullable(T)) elem and U
-        {
-            const DataTypePtr array_nullable_nested =
-                checkAndGetDataType<DataTypeNullable>(array_inner_type.get())->getNestedType();
-
-            // We also allow Nullable(T) and LC(U) if the Nullable(T) and U are allowed,
-            // the LC(U) will be converted to U.
-            return allowNested(
-                    array_nullable_nested,
-                    recursiveRemoveLowCardinality(arg_or_arg_nullable_nested));
-        }
-        else if (arg_is_nullable) // cannot compare Array(T) elem (namely, T) and Nullable(T)
-            return false;
-
-        /// LowCardinality
-
-        const auto * const array_lc_ptr = checkAndGetDataType<DataTypeLowCardinality>(array_inner_type.get());
-        const auto * const arg_lc_ptr = checkAndGetDataType<DataTypeLowCardinality>(arg.get());
-
-        const DataTypePtr array_lc_inner_type = recursiveRemoveLowCardinality(array_inner_type);
-        const DataTypePtr arg_lc_inner_type = recursiveRemoveLowCardinality(arg);
-
-        const bool array_is_lc = nullptr != array_lc_ptr;
-        const bool arg_is_lc = nullptr != arg_lc_ptr;
-
-        const bool array_lc_inner_type_is_nullable = array_is_lc && array_lc_inner_type->isNullable();
-        const bool arg_lc_inner_type_is_nullable = arg_is_lc && arg_lc_inner_type->isNullable();
-
-        if (array_is_lc) // comparing LC(T) and U
-        {
-            const DataTypePtr array_lc_nested_or_lc_nullable_nested = array_lc_inner_type_is_nullable
-                ? checkAndGetDataType<DataTypeNullable>(array_lc_inner_type.get())->getNestedType()
-                : array_lc_inner_type;
-
-            if (arg_is_lc) // comparing LC(T) and LC(U)
-            {
-                const DataTypePtr arg_lc_nested_or_lc_nullable_nested = arg_lc_inner_type_is_nullable
-                    ? checkAndGetDataType<DataTypeNullable>(arg_lc_inner_type.get())->getNestedType()
-                    : arg_lc_inner_type;
-
-                return allowNested(
-                        array_lc_nested_or_lc_nullable_nested,
-                        arg_lc_nested_or_lc_nullable_nested);
-            }
-            else if (arg_is_nullable) // Comparing LC(T) and Nullable(U)
-            {
-                if (!array_lc_inner_type_is_nullable)
-                    return false; // Can't compare Array(LC(U)) elem and Nullable(T);
-
-                return allowNested(
-                        array_lc_nested_or_lc_nullable_nested,
-                        arg_or_arg_nullable_nested);
-            }
-            else // Comparing LC(T) and U (U neither Nullable nor LC)
-                return allowNested(array_lc_nested_or_lc_nullable_nested, arg);
-        }
-
-        if (arg_is_lc) // Allow T and LC(U) if U and T are allowed (the low cardinality column will be converted).
-            return allowNested(array_inner_type, arg_lc_inner_type);
-
-        return false;
+        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
@@ -1044,33 +971,38 @@ private:
         if (!col)
             return nullptr;
 
-        const IColumn & col_nested = col->getData();
+        DataTypePtr array_elements_type = assert_cast<const DataTypeArray &>(*arguments[0].type).getNestedType();
+        const DataTypePtr & index_type = arguments[1].type;
+
+        DataTypePtr common_type = getLeastSupertype({array_elements_type, index_type});
+
+        ColumnPtr col_nested = castColumn({ col->getDataPtr(), array_elements_type, "" }, common_type);
 
         const ColumnPtr right_ptr = arguments[1].column->convertToFullColumnIfLowCardinality();
-        const IColumn & item_arg = *right_ptr.get();
+        ColumnPtr item_arg = castColumn({ right_ptr, removeLowCardinality(index_type), "" }, common_type);
 
         auto col_res = ResultColumnType::create();
 
         auto [null_map_data, null_map_item] = getNullMaps(arguments);
 
-        if (item_arg.onlyNull())
+        if (item_arg->onlyNull())
             Impl::Null<ConcreteAction>::process(
                 col->getOffsets(),
                 col_res->getData(),
                 null_map_data);
-        else if (isColumnConst(item_arg))
+        else if (isColumnConst(*item_arg))
             Impl::Main<ConcreteAction, true>::vector(
-                col_nested,
+                *col_nested,
                 col->getOffsets(),
-                typeid_cast<const ColumnConst &>(item_arg).getDataColumn(),
+                typeid_cast<const ColumnConst &>(*item_arg).getDataColumn(),
                 col_res->getData(), /// TODO This is wrong.
                 null_map_data,
                 nullptr);
         else
             Impl::Main<ConcreteAction>::vector(
-                col_nested,
+                *col_nested,
                 col->getOffsets(),
-                item_arg,
+                *item_arg,
                 col_res->getData(),
                 null_map_data,
                 null_map_item);
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index 736069d6060..1d3bcdd6fcc 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -38,8 +38,8 @@ class FunctionArrayIntersect : public IFunction
 {
 public:
     static constexpr auto name = "arrayIntersect";
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionArrayIntersect>(context); }
-    explicit FunctionArrayIntersect(const Context & context_) : context(context_) {}
+    static FunctionPtr create(ContextConstPtr context) { return std::make_shared<FunctionArrayIntersect>(context); }
+    explicit FunctionArrayIntersect(ContextConstPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
 
@@ -53,7 +53,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 
     /// Initially allocate a piece of memory for 64 elements. NOTE: This is just a guess.
     static constexpr size_t INITIAL_SIZE_DEGREE = 6;
@@ -281,7 +281,7 @@ FunctionArrayIntersect::CastArgumentsResult FunctionArrayIntersect::castColumns(
     return {.initial = initial_columns, .casted = casted_columns};
 }
 
-static ColumnPtr callFunctionNotEquals(ColumnWithTypeAndName first, ColumnWithTypeAndName second, const Context & context)
+static ColumnPtr callFunctionNotEquals(ColumnWithTypeAndName first, ColumnWithTypeAndName second, ContextConstPtr context)
 {
     ColumnsWithTypeAndName args{first, second};
     auto eq_func = FunctionFactory::instance().get("notEquals", context)->build(args);
@@ -518,7 +518,9 @@ ColumnPtr FunctionArrayIntersect::execute(const UnpackedArrays & arrays, Mutable
                     typename Map::mapped_type * value = nullptr;
 
                     if constexpr (is_numeric_column)
+                    {
                         value = &map[columns[arg_num]->getElement(i)];
+                    }
                     else if constexpr (std::is_same<ColumnType, ColumnString>::value || std::is_same<ColumnType, ColumnFixedString>::value)
                         value = &map[columns[arg_num]->getDataAt(i)];
                     else
diff --git a/src/Functions/array/arrayJoin.cpp b/src/Functions/array/arrayJoin.cpp
index c4991b0663e..953c29ae67d 100644
--- a/src/Functions/array/arrayJoin.cpp
+++ b/src/Functions/array/arrayJoin.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
@@ -20,7 +20,7 @@ class FunctionArrayJoin : public IFunction
 {
 public:
     static constexpr auto name = "arrayJoin";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionArrayJoin>();
     }
diff --git a/src/Functions/array/arrayPop.h b/src/Functions/array/arrayPop.h
index f33666afe35..270b5e20f85 100644
--- a/src/Functions/array/arrayPop.h
+++ b/src/Functions/array/arrayPop.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Columns/ColumnArray.h>
diff --git a/src/Functions/array/arrayPopBack.cpp b/src/Functions/array/arrayPopBack.cpp
index d69e59e7128..dea16c228fb 100644
--- a/src/Functions/array/arrayPopBack.cpp
+++ b/src/Functions/array/arrayPopBack.cpp
@@ -9,7 +9,7 @@ class FunctionArrayPopBack : public FunctionArrayPop
 {
 public:
     static constexpr auto name = "arrayPopBack";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPopBack>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayPopBack>(); }
     FunctionArrayPopBack() : FunctionArrayPop(false, name) {}
 };
 
diff --git a/src/Functions/array/arrayPopFront.cpp b/src/Functions/array/arrayPopFront.cpp
index ca9ce923aaa..14a2d5f583e 100644
--- a/src/Functions/array/arrayPopFront.cpp
+++ b/src/Functions/array/arrayPopFront.cpp
@@ -9,7 +9,7 @@ class FunctionArrayPopFront : public FunctionArrayPop
 {
 public:
     static constexpr auto name = "arrayPopFront";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPopFront>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayPopFront>(); }
     FunctionArrayPopFront() : FunctionArrayPop(true, name) {}
 };
 
diff --git a/src/Functions/array/arrayPush.h b/src/Functions/array/arrayPush.h
index 67356e85284..3a63e7b631d 100644
--- a/src/Functions/array/arrayPush.h
+++ b/src/Functions/array/arrayPush.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/getLeastSupertype.h>
diff --git a/src/Functions/array/arrayPushBack.cpp b/src/Functions/array/arrayPushBack.cpp
index 3c6d4113b88..1e12bf72d87 100644
--- a/src/Functions/array/arrayPushBack.cpp
+++ b/src/Functions/array/arrayPushBack.cpp
@@ -9,7 +9,7 @@ class FunctionArrayPushBack : public FunctionArrayPush
 {
 public:
     static constexpr auto name = "arrayPushBack";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPushBack>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayPushBack>(); }
     FunctionArrayPushBack() : FunctionArrayPush(false, name) {}
 };
 
diff --git a/src/Functions/array/arrayPushFront.cpp b/src/Functions/array/arrayPushFront.cpp
index 49f47170f3c..08b4efa207e 100644
--- a/src/Functions/array/arrayPushFront.cpp
+++ b/src/Functions/array/arrayPushFront.cpp
@@ -10,7 +10,7 @@ class FunctionArrayPushFront : public FunctionArrayPush
 {
 public:
     static constexpr auto name = "arrayPushFront";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayPushFront>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayPushFront>(); }
     FunctionArrayPushFront() : FunctionArrayPush(true, name) {}
 };
 
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index 342a4b18854..3126554c127 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -11,7 +11,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -37,7 +37,7 @@ class FunctionArrayReduce : public IFunction
 {
 public:
     static constexpr auto name = "arrayReduce";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayReduce>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayReduce>(); }
 
     String getName() const override { return name; }
 
@@ -172,7 +172,7 @@ ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & argume
         }
     }
 
-    SCOPE_EXIT({
+    SCOPE_EXIT_MEMORY_SAFE({
         for (size_t i = 0; i < input_rows_count; ++i)
             agg_func.destroy(places[i]);
     });
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index 9839d2a8fe7..dfeb79027f2 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -13,7 +13,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -40,7 +40,7 @@ class FunctionArrayReduceInRanges : public IFunction
 public:
     static const size_t minimum_step = 64;
     static constexpr auto name = "arrayReduceInRanges";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayReduceInRanges>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayReduceInRanges>(); }
 
     String getName() const override { return name; }
 
@@ -252,7 +252,7 @@ ColumnPtr FunctionArrayReduceInRanges::executeImpl(const ColumnsWithTypeAndName
             }
         }
 
-        SCOPE_EXIT({
+        SCOPE_EXIT_MEMORY_SAFE({
             for (size_t j = 0; j < place_total; ++j)
                 agg_func.destroy(places[j]);
         });
@@ -331,7 +331,7 @@ ColumnPtr FunctionArrayReduceInRanges::executeImpl(const ColumnsWithTypeAndName
             AggregateDataPtr place = arena->alignedAlloc(agg_func.sizeOfData(), agg_func.alignOfData());
             agg_func.create(place);
 
-            SCOPE_EXIT({
+            SCOPE_EXIT_MEMORY_SAFE({
                 agg_func.destroy(place);
             });
 
diff --git a/src/Functions/array/arrayResize.cpp b/src/Functions/array/arrayResize.cpp
index 0f7f20d7747..03b0430d6ec 100644
--- a/src/Functions/array/arrayResize.cpp
+++ b/src/Functions/array/arrayResize.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <DataTypes/DataTypeArray.h>
@@ -25,7 +25,7 @@ class FunctionArrayResize : public IFunction
 {
 public:
     static constexpr auto name = "arrayResize";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayResize>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayResize>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayReverse.cpp b/src/Functions/array/arrayReverse.cpp
index 1eb07c53497..2a2e24828ac 100644
--- a/src/Functions/array/arrayReverse.cpp
+++ b/src/Functions/array/arrayReverse.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -24,7 +24,7 @@ class FunctionArrayReverse : public IFunction
 {
 public:
     static constexpr auto name = "arrayReverse";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayReverse>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayReverse>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayScalarProduct.h b/src/Functions/array/arrayScalarProduct.h
index 2ff8b88b2f0..0d35157d133 100644
--- a/src/Functions/array/arrayScalarProduct.h
+++ b/src/Functions/array/arrayScalarProduct.h
@@ -25,7 +25,7 @@ class FunctionArrayScalarProduct : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayScalarProduct>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayScalarProduct>(); }
 
 private:
     using ResultColumnType = ColumnVector<typename Method::ResultType>;
diff --git a/src/Functions/array/arraySlice.cpp b/src/Functions/array/arraySlice.cpp
index 1e72e6a45cf..4fc32bfa981 100644
--- a/src/Functions/array/arraySlice.cpp
+++ b/src/Functions/array/arraySlice.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <DataTypes/DataTypeArray.h>
@@ -34,7 +34,7 @@ class FunctionArraySlice : public IFunction
 {
 public:
     static constexpr auto name = "arraySlice";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArraySlice>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArraySlice>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayUniq.cpp b/src/Functions/array/arrayUniq.cpp
index 70246872f6b..6d461206f38 100644
--- a/src/Functions/array/arrayUniq.cpp
+++ b/src/Functions/array/arrayUniq.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -31,7 +31,7 @@ class FunctionArrayUniq : public IFunction
 public:
     static constexpr auto name = "arrayUniq";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayUniq>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayUniq>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/arrayWithConstant.cpp b/src/Functions/array/arrayWithConstant.cpp
index f9fc0ac3b66..7d00c2227ee 100644
--- a/src/Functions/array/arrayWithConstant.cpp
+++ b/src/Functions/array/arrayWithConstant.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
@@ -30,7 +30,7 @@ class FunctionArrayWithConstant : public IFunction
 public:
     static constexpr auto name = "arrayWithConstant";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayWithConstant>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayWithConstant>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
diff --git a/src/Functions/array/arrayZip.cpp b/src/Functions/array/arrayZip.cpp
index 5a377355710..8e4d41ffca2 100644
--- a/src/Functions/array/arrayZip.cpp
+++ b/src/Functions/array/arrayZip.cpp
@@ -23,7 +23,7 @@ class FunctionArrayZip : public IFunction
 {
 public:
     static constexpr auto name = "arrayZip";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayZip>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayZip>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/array/emptyArray.cpp b/src/Functions/array/emptyArray.cpp
index ac227370180..38b68043628 100644
--- a/src/Functions/array/emptyArray.cpp
+++ b/src/Functions/array/emptyArray.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -14,27 +14,20 @@
 namespace DB
 {
 
-/// TODO Make it simple.
-
-template <typename Type> struct TypeToColumnType { using ColumnType = ColumnVector<Type>; };
-template <> struct TypeToColumnType<String> { using ColumnType = ColumnString; };
-
-template <typename DataType> struct DataTypeToName : TypeName<typename DataType::FieldType> { };
-template <> struct DataTypeToName<DataTypeDate> { static std::string get() { return "Date"; } };
-template <> struct DataTypeToName<DataTypeDateTime> { static std::string get() { return "DateTime"; } };
-
+namespace
+{
 
 template <typename DataType>
-struct FunctionEmptyArray : public IFunction
+class FunctionEmptyArray : public IFunction
 {
-    static constexpr auto base_name = "emptyArray";
-    static const String name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionEmptyArray>(); }
+public:
+    static String getNameImpl() { return "emptyArray" + DataType().getName(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionEmptyArray>(); }
 
 private:
     String getName() const override
     {
-        return name;
+        return getNameImpl();
     }
 
     size_t getNumberOfArguments() const override { return 0; }
@@ -46,48 +39,35 @@ private:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
-        using UnderlyingColumnType = typename TypeToColumnType<typename DataType::FieldType>::ColumnType;
-
         return ColumnArray::create(
-            UnderlyingColumnType::create(),
+            DataType().createColumn(),
             ColumnArray::ColumnOffsets::create(input_rows_count, 0));
     }
 };
 
+template <typename F>
+void registerFunction(FunctionFactory & factory)
+{
+    factory.registerFunction<F>(F::getNameImpl());
+}
 
-template <typename DataType>
-const String FunctionEmptyArray<DataType>::name = FunctionEmptyArray::base_name + String(DataTypeToName<DataType>::get());
-
-using FunctionEmptyArrayUInt8 = FunctionEmptyArray<DataTypeUInt8>;
-using FunctionEmptyArrayUInt16 = FunctionEmptyArray<DataTypeUInt16>;
-using FunctionEmptyArrayUInt32 = FunctionEmptyArray<DataTypeUInt32>;
-using FunctionEmptyArrayUInt64 = FunctionEmptyArray<DataTypeUInt64>;
-using FunctionEmptyArrayInt8 = FunctionEmptyArray<DataTypeInt8>;
-using FunctionEmptyArrayInt16 = FunctionEmptyArray<DataTypeInt16>;
-using FunctionEmptyArrayInt32 = FunctionEmptyArray<DataTypeInt32>;
-using FunctionEmptyArrayInt64 = FunctionEmptyArray<DataTypeInt64>;
-using FunctionEmptyArrayFloat32 = FunctionEmptyArray<DataTypeFloat32>;
-using FunctionEmptyArrayFloat64 = FunctionEmptyArray<DataTypeFloat64>;
-using FunctionEmptyArrayDate = FunctionEmptyArray<DataTypeDate>;
-using FunctionEmptyArrayDateTime = FunctionEmptyArray<DataTypeDateTime>;
-using FunctionEmptyArrayString = FunctionEmptyArray<DataTypeString>;
-
+}
 
 void registerFunctionsEmptyArray(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionEmptyArrayUInt8>();
-    factory.registerFunction<FunctionEmptyArrayUInt16>();
-    factory.registerFunction<FunctionEmptyArrayUInt32>();
-    factory.registerFunction<FunctionEmptyArrayUInt64>();
-    factory.registerFunction<FunctionEmptyArrayInt8>();
-    factory.registerFunction<FunctionEmptyArrayInt16>();
-    factory.registerFunction<FunctionEmptyArrayInt32>();
-    factory.registerFunction<FunctionEmptyArrayInt64>();
-    factory.registerFunction<FunctionEmptyArrayFloat32>();
-    factory.registerFunction<FunctionEmptyArrayFloat64>();
-    factory.registerFunction<FunctionEmptyArrayDate>();
-    factory.registerFunction<FunctionEmptyArrayDateTime>();
-    factory.registerFunction<FunctionEmptyArrayString>();
+    registerFunction<FunctionEmptyArray<DataTypeUInt8>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeUInt16>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeUInt32>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeUInt64>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeInt8>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeInt16>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeInt32>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeInt64>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeFloat32>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeFloat64>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeDate>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeDateTime>>(factory);
+    registerFunction<FunctionEmptyArray<DataTypeString>>(factory);
 }
 
 }
diff --git a/src/Functions/array/emptyArrayToSingle.cpp b/src/Functions/array/emptyArrayToSingle.cpp
index e3bfe62ac22..a116adca4e7 100644
--- a/src/Functions/array/emptyArrayToSingle.cpp
+++ b/src/Functions/array/emptyArrayToSingle.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
@@ -27,7 +27,7 @@ class FunctionEmptyArrayToSingle : public IFunction
 {
 public:
     static constexpr auto name = "emptyArrayToSingle";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionEmptyArrayToSingle>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionEmptyArrayToSingle>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/array/hasAll.cpp b/src/Functions/array/hasAll.cpp
index 27843b76f66..7b5b83334b9 100644
--- a/src/Functions/array/hasAll.cpp
+++ b/src/Functions/array/hasAll.cpp
@@ -10,7 +10,7 @@ class FunctionArrayHasAll : public FunctionArrayHasAllAny
 {
 public:
     static constexpr auto name = "hasAll";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayHasAll>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayHasAll>(); }
     FunctionArrayHasAll() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::All, name) {}
 };
 
diff --git a/src/Functions/array/hasAllAny.h b/src/Functions/array/hasAllAny.h
index b35c5996652..04c6558f066 100644
--- a/src/Functions/array/hasAllAny.h
+++ b/src/Functions/array/hasAllAny.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <DataTypes/DataTypeArray.h>
@@ -13,6 +13,7 @@
 #include <Interpreters/castColumn.h>
 #include <Common/typeid_cast.h>
 #include <ext/range.h>
+#include <ext/map.h>
 
 
 namespace DB
@@ -51,41 +52,13 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        size_t rows = input_rows_count;
         size_t num_args = arguments.size();
 
-        DataTypePtr common_type = nullptr;
-        auto commonType = [&common_type, &arguments]()
-        {
-            if (common_type == nullptr)
-            {
-                DataTypes data_types;
-                data_types.reserve(arguments.size());
-                for (const auto & argument : arguments)
-                    data_types.push_back(argument.type);
-
-                common_type = getLeastSupertype(data_types);
-            }
-
-            return common_type;
-        };
+        DataTypePtr common_type = getLeastSupertype(ext::map(arguments, [](auto & arg) { return arg.type; }));
 
         Columns preprocessed_columns(num_args);
-
         for (size_t i = 0; i < num_args; ++i)
-        {
-            const auto & argument = arguments[i];
-            ColumnPtr preprocessed_column = argument.column;
-
-            const auto * argument_type = typeid_cast<const DataTypeArray *>(argument.type.get());
-            const auto & nested_type = argument_type->getNestedType();
-
-            /// Converts Array(Nothing) or Array(Nullable(Nothing) to common type. Example: hasAll([Null, 1], [Null]) -> 1
-            if (typeid_cast<const DataTypeNothing *>(removeNullable(nested_type).get()))
-                preprocessed_column = castColumn(argument, commonType());
-
-            preprocessed_columns[i] = std::move(preprocessed_column);
-        }
+            preprocessed_columns[i] = castColumn(arguments[i], common_type);
 
         std::vector<std::unique_ptr<GatherUtils::IArraySource>> sources;
 
@@ -100,12 +73,12 @@ public:
             }
 
             if (const auto * argument_column_array = typeid_cast<const ColumnArray *>(argument_column.get()))
-                sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, rows));
+                sources.emplace_back(GatherUtils::createArraySource(*argument_column_array, is_const, input_rows_count));
             else
                 throw Exception{"Arguments for function " + getName() + " must be arrays.", ErrorCodes::LOGICAL_ERROR};
         }
 
-        auto result_column = ColumnUInt8::create(rows);
+        auto result_column = ColumnUInt8::create(input_rows_count);
         auto * result_column_ptr = typeid_cast<ColumnUInt8 *>(result_column.get());
         GatherUtils::sliceHas(*sources[0], *sources[1], search_type, *result_column_ptr);
 
diff --git a/src/Functions/array/hasAny.cpp b/src/Functions/array/hasAny.cpp
index 085a01c008e..94d429d6c0e 100644
--- a/src/Functions/array/hasAny.cpp
+++ b/src/Functions/array/hasAny.cpp
@@ -10,7 +10,7 @@ class FunctionArrayHasAny : public FunctionArrayHasAllAny
 {
 public:
     static constexpr auto name = "hasAny";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayHasAny>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayHasAny>(); }
     FunctionArrayHasAny() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::Any, name) {}
 };
 
diff --git a/src/Functions/array/hasSubstr.cpp b/src/Functions/array/hasSubstr.cpp
index 73430824b57..f304e8bc3ba 100644
--- a/src/Functions/array/hasSubstr.cpp
+++ b/src/Functions/array/hasSubstr.cpp
@@ -10,7 +10,7 @@ class FunctionArrayHasSubstr : public FunctionArrayHasAllAny
 {
 public:
     static constexpr auto name = "hasSubstr";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionArrayHasSubstr>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionArrayHasSubstr>(); }
     FunctionArrayHasSubstr() : FunctionArrayHasAllAny(GatherUtils::ArraySearchType::Substr, name) {}
 };
 
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index c30488cb25b..0709c1f2664 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -30,20 +30,20 @@ struct TupArg
     const IColumn::Offsets & val_offsets;
     bool is_const;
 };
-using TupleMaps = std::vector<struct TupArg>;
+using TupleMaps = std::vector<TupArg>;
 
-namespace OpTypes
+enum class OpTypes
 {
-    extern const int ADD = 0;
-    extern const int SUBTRACT = 1;
-}
+    ADD = 0,
+    SUBTRACT = 1
+};
 
-template <int op_type>
+template <OpTypes op_type>
 class FunctionMapOp : public IFunction
 {
 public:
     static constexpr auto name = (op_type == OpTypes::ADD) ? "mapAdd" : "mapSubtract";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapOp>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMapOp>(); }
 
 private:
     String getName() const override { return name; }
@@ -160,7 +160,7 @@ private:
                     KeyType key;
                     if constexpr (is_str_key)
                     {
-                        // have to use Field structs to get strings
+                        // have to use Field to get strings
                         key = arg.key_column[offset + j].get<KeyType>();
                     }
                     else
@@ -209,7 +209,8 @@ private:
     {
         const auto & promoted_type = (assert_cast<const DataTypeArray *>(res_type.getElements()[1].get()))->getNestedType();
 #define MATCH_EXECUTE(is_str) \
-        switch (promoted_type->getTypeId()) { \
+        switch (promoted_type->getTypeId()) \
+        { \
             case TypeIndex::Int64: return execute2<KeyType, is_str, Int64>(row_count, args, res_type); \
             case TypeIndex::UInt64: return execute2<KeyType, is_str, UInt64>(row_count, args, res_type); \
             case TypeIndex::Float64: return execute2<KeyType, is_str, Float64>(row_count, args, res_type); \
@@ -290,6 +291,10 @@ private:
                 return execute1<Int32, false>(row_count, res_type, args);
             case TypeIndex::Int64:
                 return execute1<Int64, false>(row_count, res_type, args);
+            case TypeIndex::Int128:
+                return execute1<Int128, false>(row_count, res_type, args);
+            case TypeIndex::Int256:
+                return execute1<Int256, false>(row_count, res_type, args);
             case TypeIndex::UInt8:
                 return execute1<UInt8, false>(row_count, res_type, args);
             case TypeIndex::Date:
@@ -300,8 +305,12 @@ private:
                 return execute1<UInt32, false>(row_count, res_type, args);
             case TypeIndex::UInt64:
                 return execute1<UInt64, false>(row_count, res_type, args);
-            case TypeIndex::UUID:
+            case TypeIndex::UInt128:
                 return execute1<UInt128, false>(row_count, res_type, args);
+            case TypeIndex::UInt256:
+                return execute1<UInt256, false>(row_count, res_type, args);
+            case TypeIndex::UUID:
+                return execute1<UUID, false>(row_count, res_type, args);
             case TypeIndex::FixedString:
             case TypeIndex::String:
                 return execute1<String, true>(row_count, res_type, args);
diff --git a/src/Functions/array/mapPopulateSeries.cpp b/src/Functions/array/mapPopulateSeries.cpp
index c025117af69..7e05eb81150 100644
--- a/src/Functions/array/mapPopulateSeries.cpp
+++ b/src/Functions/array/mapPopulateSeries.cpp
@@ -23,7 +23,7 @@ class FunctionMapPopulateSeries : public IFunction
 {
 public:
     static constexpr auto name = "mapPopulateSeries";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapPopulateSeries>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMapPopulateSeries>(); }
 
 private:
     String getName() const override { return name; }
diff --git a/src/Functions/array/range.cpp b/src/Functions/array/range.cpp
index ac968786923..9f4c9fb0676 100644
--- a/src/Functions/array/range.cpp
+++ b/src/Functions/array/range.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -32,7 +32,7 @@ class FunctionRange : public IFunction
 public:
     static constexpr auto name = "range";
     static constexpr size_t max_elements = 100'000'000;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRange>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionRange>(); }
 
 private:
     String getName() const override { return name; }
diff --git a/src/Functions/assumeNotNull.cpp b/src/Functions/assumeNotNull.cpp
index ab0d50c8c56..2b8743b1507 100644
--- a/src/Functions/assumeNotNull.cpp
+++ b/src/Functions/assumeNotNull.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Core/ColumnNumbers.h>
@@ -19,7 +19,7 @@ class FunctionAssumeNotNull : public IFunction
 public:
     static constexpr auto name = "assumeNotNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionAssumeNotNull>();
     }
diff --git a/src/Functions/bar.cpp b/src/Functions/bar.cpp
index 6f5298a8c5e..49f3be46d60 100644
--- a/src/Functions/bar.cpp
+++ b/src/Functions/bar.cpp
@@ -1,9 +1,8 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
 #include <Common/UnicodeBar.h>
-#include <Common/FieldVisitors.h>
 #include <IO/WriteHelpers.h>
 
 
@@ -29,7 +28,7 @@ class FunctionBar : public IFunction
 {
 public:
     static constexpr auto name = "bar";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionBar>();
     }
diff --git a/src/Functions/bitHammingDistance.cpp b/src/Functions/bitHammingDistance.cpp
index 9b9ff5b6c07..a89ffa16010 100644
--- a/src/Functions/bitHammingDistance.cpp
+++ b/src/Functions/bitHammingDistance.cpp
@@ -74,7 +74,7 @@ class FunctionBitHammingDistance : public IFunction
 public:
     static constexpr auto name = "bitHammingDistance";
     using ResultType = UInt8;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitHammingDistance>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitHammingDistance>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/bitmaskToList.cpp b/src/Functions/bitmaskToList.cpp
index ccd163895ff..0f3362aa031 100644
--- a/src/Functions/bitmaskToList.cpp
+++ b/src/Functions/bitmaskToList.cpp
@@ -1,5 +1,5 @@
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
 #include <DataTypes/DataTypeString.h>
@@ -30,7 +30,7 @@ class FunctionBitmaskToList : public IFunction
 {
 public:
     static constexpr auto name = "bitmaskToList";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionBitmaskToList>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionBitmaskToList>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/blockNumber.cpp b/src/Functions/blockNumber.cpp
index 512dd9bcf29..6998c02b3b6 100644
--- a/src/Functions/blockNumber.cpp
+++ b/src/Functions/blockNumber.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
@@ -18,7 +18,7 @@ private:
 
 public:
     static constexpr auto name = "blockNumber";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionBlockNumber>();
     }
diff --git a/src/Functions/blockSerializedSize.cpp b/src/Functions/blockSerializedSize.cpp
index 5a66c5d08af..bd65f6dd084 100644
--- a/src/Functions/blockSerializedSize.cpp
+++ b/src/Functions/blockSerializedSize.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <IO/NullWriteBuffer.h>
@@ -15,7 +15,7 @@ class FunctionBlockSerializedSize : public IFunction
 public:
     static constexpr auto name = "blockSerializedSize";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionBlockSerializedSize>();
     }
diff --git a/src/Functions/blockSize.cpp b/src/Functions/blockSize.cpp
index f08c0b0d963..481a89b1b82 100644
--- a/src/Functions/blockSize.cpp
+++ b/src/Functions/blockSize.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
@@ -15,7 +15,7 @@ class FunctionBlockSize : public IFunction
 {
 public:
     static constexpr auto name = "blockSize";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionBlockSize>();
     }
diff --git a/src/Functions/buildId.cpp b/src/Functions/buildId.cpp
index 7361f0e4546..4f452ac38a2 100644
--- a/src/Functions/buildId.cpp
+++ b/src/Functions/buildId.cpp
@@ -1,6 +1,6 @@
 #if defined(__ELF__) && !defined(__FreeBSD__)
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <Common/SymbolIndex.h>
@@ -18,7 +18,7 @@ class FunctionBuildId : public IFunction
 {
 public:
     static constexpr auto name = "buildId";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionBuildId>();
     }
diff --git a/src/Functions/byteSize.cpp b/src/Functions/byteSize.cpp
index ea1a9c83581..5d43ddb2929 100644
--- a/src/Functions/byteSize.cpp
+++ b/src/Functions/byteSize.cpp
@@ -2,7 +2,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
@@ -17,7 +17,7 @@ class FunctionByteSize : public IFunction
 {
 public:
     static constexpr auto name = "byteSize";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionByteSize>();
     }
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index 195eb7e72ae..95c06ee683a 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -1,6 +1,6 @@
-#include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/getLeastSupertype.h>
+#include <Functions/FunctionFactory.h>
 
 
 namespace DB
@@ -20,9 +20,9 @@ class FunctionCaseWithExpression : public IFunction
 {
 public:
     static constexpr auto name = "caseWithExpression";
-    static FunctionPtr create(const Context & context_) { return std::make_shared<FunctionCaseWithExpression>(context_); }
+    static FunctionPtr create(ContextConstPtr context_) { return std::make_shared<FunctionCaseWithExpression>(context_); }
 
-    explicit FunctionCaseWithExpression(const Context & context_) : context(context_) {}
+    explicit FunctionCaseWithExpression(ContextConstPtr context_) : context(context_) {}
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     String getName() const override { return name; }
@@ -98,7 +98,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/coalesce.cpp b/src/Functions/coalesce.cpp
index 12521185532..69b69b7d3f1 100644
--- a/src/Functions/coalesce.cpp
+++ b/src/Functions/coalesce.cpp
@@ -1,17 +1,18 @@
-#include <Functions/IFunctionImpl.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/getLeastSupertype.h>
-#include <Core/ColumnNumbers.h>
-#include <Columns/ColumnNullable.h>
 #include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnNullable.h>
+#include <Core/ColumnNumbers.h>
+#include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
 {
+
 namespace
 {
 
@@ -23,12 +24,12 @@ class FunctionCoalesce : public IFunction
 public:
     static constexpr auto name = "coalesce";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionCoalesce>(context);
     }
 
-    explicit FunctionCoalesce(const Context & context_) : context(context_) {}
+    explicit FunctionCoalesce(ContextConstPtr context_) : context(context_) {}
 
     std::string getName() const override
     {
@@ -159,7 +160,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index de4d5e9efc4..cc5636ffb5f 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -7,7 +7,7 @@
 #include <Functions/GatherUtils/Sinks.h>
 #include <Functions/GatherUtils/Slices.h>
 #include <Functions/GatherUtils/Sources.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <ext/map.h>
 #include <ext/range.h>
@@ -33,8 +33,8 @@ class ConcatImpl : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    explicit ConcatImpl(const Context & context_) : context(context_) {}
-    static FunctionPtr create(const Context & context) { return std::make_shared<ConcatImpl>(context); }
+    explicit ConcatImpl(ContextConstPtr context_) : context(context_) {}
+    static FunctionPtr create(ContextConstPtr context) { return std::make_shared<ConcatImpl>(context); }
 
     String getName() const override { return name; }
 
@@ -85,7 +85,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextWeakConstPtr context;
 
     ColumnPtr executeBinary(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
@@ -187,30 +187,30 @@ using FunctionConcatAssumeInjective = ConcatImpl<NameConcatAssumeInjective, true
 
 
 /// Also works with arrays.
-class ConcatOverloadResolver : public IFunctionOverloadResolverImpl
+class ConcatOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = "concat";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<ConcatOverloadResolver>(context); }
+    static FunctionOverloadResolverPtr create(ContextConstPtr context) { return std::make_unique<ConcatOverloadResolver>(context); }
 
-    explicit ConcatOverloadResolver(const Context & context_) : context(context_) {}
+    explicit ConcatOverloadResolver(ContextConstPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         if (isArray(arguments.at(0).type))
         {
-            return FunctionOverloadResolverAdaptor(FunctionFactory::instance().getImpl("arrayConcat", context)).buildImpl(arguments);
+            return FunctionFactory::instance().getImpl("arrayConcat", context)->build(arguments);
         }
         else
-            return std::make_unique<DefaultFunction>(
+            return std::make_unique<FunctionToFunctionBaseAdaptor>(
                 FunctionConcat::create(context), ext::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }), return_type);
     }
 
-    DataTypePtr getReturnType(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() < 2)
             throw Exception(
@@ -223,7 +223,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/connectionId.cpp b/src/Functions/connectionId.cpp
index 1eec764d923..4d22bb6ffad 100644
--- a/src/Functions/connectionId.cpp
+++ b/src/Functions/connectionId.cpp
@@ -1,6 +1,6 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
 
 
@@ -8,14 +8,14 @@ namespace DB
 {
 
 /// Get the connection Id. It's used for MySQL handler only.
-class FunctionConnectionId : public IFunction
+class FunctionConnectionId : public IFunction, WithConstContext
 {
 public:
     static constexpr auto name = "connectionId";
 
-    explicit FunctionConnectionId(const Context & context_) : context(context_) {}
+    explicit FunctionConnectionId(ContextConstPtr context_) : WithConstContext(context_) {}
 
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionConnectionId>(context); }
+    static FunctionPtr create(ContextConstPtr context_) { return std::make_shared<FunctionConnectionId>(context_); }
 
     String getName() const override { return name; }
 
@@ -25,11 +25,8 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        return result_type->createColumnConst(input_rows_count, context.getClientInfo().connection_id);
+        return result_type->createColumnConst(input_rows_count, getContext()->getClientInfo().connection_id);
     }
-
-private:
-    const Context & context;
 };
 
 void registerFunctionConnectionId(FunctionFactory & factory)
diff --git a/src/Functions/convertCharset.cpp b/src/Functions/convertCharset.cpp
index c32bbc358f5..e7a43e73a80 100644
--- a/src/Functions/convertCharset.cpp
+++ b/src/Functions/convertCharset.cpp
@@ -162,7 +162,7 @@ private:
 
 public:
     static constexpr auto name = "convertCharset";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionConvertCharset>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionConvertCharset>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 4469e11a421..76038a88d41 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -28,7 +28,7 @@ class FunctionCountDigits : public IFunction
 public:
     static constexpr auto name = "countDigits";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionCountDigits>();
     }
diff --git a/src/Functions/countMatches.h b/src/Functions/countMatches.h
index be3d06ffb84..0c6a95a94ea 100644
--- a/src/Functions/countMatches.h
+++ b/src/Functions/countMatches.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnString.h>
@@ -27,7 +27,7 @@ class FunctionCountMatches : public IFunction
 {
 public:
     static constexpr auto name = CountMatchesBase::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionCountMatches<CountMatchesBase>>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionCountMatches<CountMatchesBase>>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
diff --git a/src/Functions/currentDatabase.cpp b/src/Functions/currentDatabase.cpp
index 17dbc8d98e4..efb98260e02 100644
--- a/src/Functions/currentDatabase.cpp
+++ b/src/Functions/currentDatabase.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeString.h>
@@ -16,9 +16,9 @@ class FunctionCurrentDatabase : public IFunction
 
 public:
     static constexpr auto name = "currentDatabase";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<FunctionCurrentDatabase>(context.getCurrentDatabase());
+        return std::make_shared<FunctionCurrentDatabase>(context->getCurrentDatabase());
     }
 
     explicit FunctionCurrentDatabase(const String & db_name_) : db_name{db_name_}
diff --git a/src/Functions/currentUser.cpp b/src/Functions/currentUser.cpp
index 77eb2228d19..ea9943b3647 100644
--- a/src/Functions/currentUser.cpp
+++ b/src/Functions/currentUser.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeString.h>
@@ -16,9 +16,9 @@ class FunctionCurrentUser : public IFunction
 
 public:
     static constexpr auto name = "currentUser";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<FunctionCurrentUser>(context.getClientInfo().initial_user);
+        return std::make_shared<FunctionCurrentUser>(context->getClientInfo().initial_user);
     }
 
     explicit FunctionCurrentUser(const String & user_name_) : user_name{user_name_}
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index f660b92efc5..9d8b98aab41 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -3,12 +3,14 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnDecimal.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Functions/DateTimeTransforms.h>
+#include <Functions/TransformDateTime64.h>
 
 #include <IO/WriteHelpers.h>
 
@@ -42,9 +44,10 @@ namespace
   */
 class FunctionDateDiff : public IFunction
 {
+    using ColumnDateTime64 = ColumnDecimal<DateTime64>;
 public:
     static constexpr auto name = "dateDiff";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionDateDiff>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionDateDiff>(); }
 
     String getName() const override
     {
@@ -133,17 +136,21 @@ private:
             dispatchForSecondColumn<Transform>(*x_vec_16, y, timezone_x, timezone_y, result);
         else if (const auto * x_vec_32 = checkAndGetColumn<ColumnUInt32>(&x))
             dispatchForSecondColumn<Transform>(*x_vec_32, y, timezone_x, timezone_y, result);
+        else if (const auto * x_vec_64 = checkAndGetColumn<ColumnDateTime64>(&x))
+            dispatchForSecondColumn<Transform>(*x_vec_64, y, timezone_x, timezone_y, result);
         else if (const auto * x_const_16 = checkAndGetColumnConst<ColumnUInt16>(&x))
             dispatchConstForSecondColumn<Transform>(x_const_16->getValue<UInt16>(), y, timezone_x, timezone_y, result);
         else if (const auto * x_const_32 = checkAndGetColumnConst<ColumnUInt32>(&x))
             dispatchConstForSecondColumn<Transform>(x_const_32->getValue<UInt32>(), y, timezone_x, timezone_y, result);
+        else if (const auto * x_const_64 = checkAndGetColumnConst<ColumnDateTime64>(&x))
+            dispatchConstForSecondColumn<Transform>(x_const_64->getValue<DecimalField<DateTime64>>(), y, timezone_x, timezone_y, result);
         else
-            throw Exception("Illegal column for first argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception("Illegal column for first argument of function " + getName() + ", must be Date, DateTime or DateTime64", ErrorCodes::ILLEGAL_COLUMN);
     }
 
-    template <typename Transform, typename T1>
+    template <typename Transform, typename LeftColumnType>
     void dispatchForSecondColumn(
-        const ColumnVector<T1> & x, const IColumn & y,
+        const LeftColumnType & x, const IColumn & y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
@@ -151,10 +158,14 @@ private:
             vectorVector<Transform>(x, *y_vec_16, timezone_x, timezone_y, result);
         else if (const auto * y_vec_32 = checkAndGetColumn<ColumnUInt32>(&y))
             vectorVector<Transform>(x, *y_vec_32, timezone_x, timezone_y, result);
+        else if (const auto * y_vec_64 = checkAndGetColumn<ColumnDateTime64>(&y))
+            vectorVector<Transform>(x, *y_vec_64, timezone_x, timezone_y, result);
         else if (const auto * y_const_16 = checkAndGetColumnConst<ColumnUInt16>(&y))
             vectorConstant<Transform>(x, y_const_16->getValue<UInt16>(), timezone_x, timezone_y, result);
         else if (const auto * y_const_32 = checkAndGetColumnConst<ColumnUInt32>(&y))
             vectorConstant<Transform>(x, y_const_32->getValue<UInt32>(), timezone_x, timezone_y, result);
+        else if (const auto * y_const_64 = checkAndGetColumnConst<ColumnDateTime64>(&y))
+            vectorConstant<Transform>(x, y_const_64->getValue<DecimalField<DateTime64>>(), timezone_x, timezone_y, result);
         else
             throw Exception("Illegal column for second argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
     }
@@ -169,49 +180,81 @@ private:
             constantVector<Transform>(x, *y_vec_16, timezone_x, timezone_y, result);
         else if (const auto * y_vec_32 = checkAndGetColumn<ColumnUInt32>(&y))
             constantVector<Transform>(x, *y_vec_32, timezone_x, timezone_y, result);
+        else if (const auto * y_vec_64 = checkAndGetColumn<ColumnDateTime64>(&y))
+            constantVector<Transform>(x, *y_vec_64, timezone_x, timezone_y, result);
         else
             throw Exception("Illegal column for second argument of function " + getName() + ", must be Date or DateTime", ErrorCodes::ILLEGAL_COLUMN);
     }
 
-    template <typename Transform, typename T1, typename T2>
+    template <typename Transform, typename LeftColumnType, typename RightColumnType>
     void vectorVector(
-        const ColumnVector<T1> & x, const ColumnVector<T2> & y,
+        const LeftColumnType & x, const RightColumnType & y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
         const auto & x_data = x.getData();
         const auto & y_data = y.getData();
+
+        const auto transform_x = TransformDateTime64<Transform>(getScale(x));
+        const auto transform_y = TransformDateTime64<Transform>(getScale(y));
         for (size_t i = 0, size = x.size(); i < size; ++i)
-            result[i] = calculate<Transform>(x_data[i], y_data[i], timezone_x, timezone_y);
+                result[i] = calculate(transform_x, transform_y, x_data[i], y_data[i], timezone_x, timezone_y);
     }
 
-    template <typename Transform, typename T1, typename T2>
+    template <typename Transform, typename LeftColumnType, typename T2>
     void vectorConstant(
-        const ColumnVector<T1> & x, T2 y,
+        const LeftColumnType & x, T2 y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
         const auto & x_data = x.getData();
+        const auto transform_x = TransformDateTime64<Transform>(getScale(x));
+        const auto transform_y = TransformDateTime64<Transform>(getScale(y));
+        const auto y_value = stripDecimalFieldValue(y);
+
         for (size_t i = 0, size = x.size(); i < size; ++i)
-            result[i] = calculate<Transform>(x_data[i], y, timezone_x, timezone_y);
+            result[i] = calculate(transform_x, transform_y, x_data[i], y_value, timezone_x, timezone_y);
     }
 
-    template <typename Transform, typename T1, typename T2>
+    template <typename Transform, typename T1, typename RightColumnType>
     void constantVector(
-        T1 x, const ColumnVector<T2> & y,
+        T1 x, const RightColumnType & y,
         const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y,
         ColumnInt64::Container & result) const
     {
         const auto & y_data = y.getData();
+        const auto transform_x = TransformDateTime64<Transform>(getScale(x));
+        const auto transform_y = TransformDateTime64<Transform>(getScale(y));
+        const auto x_value = stripDecimalFieldValue(x);
+
         for (size_t i = 0, size = y.size(); i < size; ++i)
-            result[i] = calculate<Transform>(x, y_data[i], timezone_x, timezone_y);
+            result[i] = calculate(transform_x, transform_y, x_value, y_data[i], timezone_x, timezone_y);
     }
 
-    template <typename Transform, typename T1, typename T2>
-    Int64 calculate(T1 x, T2 y, const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y) const
+    template <typename TransformX, typename TransformY, typename T1, typename T2>
+    Int64 calculate(const TransformX & transform_x, const TransformY & transform_y, T1 x, T2 y, const DateLUTImpl & timezone_x, const DateLUTImpl & timezone_y) const
     {
-        return Int64(Transform::execute(y, timezone_y))
-             - Int64(Transform::execute(x, timezone_x));
+        return Int64(transform_y.execute(y, timezone_y))
+             - Int64(transform_x.execute(x, timezone_x));
+    }
+
+    template <typename T>
+    static UInt32 getScale(const T & v)
+    {
+        if constexpr (std::is_same_v<T, ColumnDateTime64>)
+            return v.getScale();
+        else if constexpr (std::is_same_v<T, DecimalField<DateTime64>>)
+            return v.getScale();
+
+        return 0;
+    }
+    template <typename T>
+    static auto stripDecimalFieldValue(T && v)
+    {
+        if constexpr (std::is_same_v<std::decay_t<T>, DecimalField<DateTime64>>)
+            return v.getValue();
+        else
+            return v;
     }
 };
 
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index f55b3b56536..d90586d6703 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -25,9 +25,9 @@ class FunctionDateTrunc : public IFunction
 public:
     static constexpr auto name = "date_trunc";
 
-    explicit FunctionDateTrunc(const Context & context_) : context(context_) {}
+    explicit FunctionDateTrunc(ContextConstPtr context_) : context(context_) {}
 
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionDateTrunc>(context); }
+    static FunctionPtr create(ContextConstPtr context) { return std::make_shared<FunctionDateTrunc>(context); }
 
     String getName() const override { return name; }
 
@@ -146,7 +146,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
     mutable IntervalKind::Kind datepart_kind = IntervalKind::Kind::Second;
 };
 
diff --git a/src/Functions/defaultValueOfArgumentType.cpp b/src/Functions/defaultValueOfArgumentType.cpp
index a46715ffaad..d7f6be1b55f 100644
--- a/src/Functions/defaultValueOfArgumentType.cpp
+++ b/src/Functions/defaultValueOfArgumentType.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Core/Field.h>
 
@@ -13,7 +13,7 @@ class FunctionDefaultValueOfArgumentType : public IFunction
 {
 public:
     static constexpr auto name = "defaultValueOfArgumentType";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionDefaultValueOfArgumentType>();
     }
@@ -42,7 +42,7 @@ public:
         return type.createColumnConst(input_rows_count, type.getDefault());
     }
 
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & arguments) const override
+    ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override
     {
         const IDataType & type = *arguments[0].type;
         return type.createColumnConst(1, type.getDefault());
diff --git a/src/Functions/defaultValueOfTypeName.cpp b/src/Functions/defaultValueOfTypeName.cpp
index 4f6d19bbc53..fec72067069 100644
--- a/src/Functions/defaultValueOfTypeName.cpp
+++ b/src/Functions/defaultValueOfTypeName.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Core/Field.h>
 #include <Columns/ColumnConst.h>
@@ -21,7 +21,7 @@ class FunctionDefaultValueOfTypeName : public IFunction
 {
 public:
     static constexpr auto name = "defaultValueOfTypeName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionDefaultValueOfTypeName>();
     }
diff --git a/src/Functions/demange.cpp b/src/Functions/demange.cpp
index d6cddc18f7a..b2df742b30a 100644
--- a/src/Functions/demange.cpp
+++ b/src/Functions/demange.cpp
@@ -25,9 +25,9 @@ class FunctionDemangle : public IFunction
 {
 public:
     static constexpr auto name = "demangle";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        context.checkAccess(AccessType::demangle);
+        context->checkAccess(AccessType::demangle);
         return std::make_shared<FunctionDemangle>();
     }
 
diff --git a/src/Functions/divide/CMakeLists.txt b/src/Functions/divide/CMakeLists.txt
new file mode 100644
index 00000000000..e5a10f0817c
--- /dev/null
+++ b/src/Functions/divide/CMakeLists.txt
@@ -0,0 +1,22 @@
+# A library for integer division by constant with CPU dispatching.
+
+if (ARCH_AMD64)
+    add_library(divide_impl_sse2 divideImpl.cpp)
+    target_compile_options(divide_impl_sse2 PRIVATE -msse2 -DNAMESPACE=SSE2)
+    target_link_libraries(divide_impl_sse2 libdivide)
+
+    add_library(divide_impl_avx2 divideImpl.cpp)
+    target_compile_options(divide_impl_avx2 PRIVATE -mavx2 -DNAMESPACE=AVX2)
+    target_link_libraries(divide_impl_avx2 libdivide)
+
+    set(IMPLEMENTATIONS divide_impl_sse2 divide_impl_avx2)
+else ()
+    add_library(divide_impl_generic divideImpl.cpp)
+    target_compile_options(divide_impl_generic PRIVATE -DNAMESPACE=Generic)
+    target_link_libraries(divide_impl_generic libdivide)
+
+    set(IMPLEMENTATIONS divide_impl_generic)
+endif ()
+
+add_library(divide_impl divide.cpp)
+target_link_libraries(divide_impl ${IMPLEMENTATIONS} clickhouse_common_io)
diff --git a/src/Functions/divide/divide.cpp b/src/Functions/divide/divide.cpp
new file mode 100644
index 00000000000..5ab11df2a65
--- /dev/null
+++ b/src/Functions/divide/divide.cpp
@@ -0,0 +1,57 @@
+#include "divide.h"
+#include <Common/CpuId.h>
+
+#if defined(__x86_64__) && !defined(ARCADIA_BUILD)
+namespace SSE2
+{
+    template <typename A, typename B, typename ResultType>
+    void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size);
+}
+
+namespace AVX2
+{
+    template <typename A, typename B, typename ResultType>
+    void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size);
+}
+#else
+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);
+}
+#endif
+
+
+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 (DB::Cpu::CpuFlagsCache::have_AVX2)
+        AVX2::divideImpl(a_pos, b, c_pos, size);
+    else if (DB::Cpu::CpuFlagsCache::have_SSE2)
+        SSE2::divideImpl(a_pos, b, c_pos, size);
+#else
+    Generic::divideImpl(a_pos, b, c_pos, size);
+#endif
+}
+
+
+template void divideImpl<uint64_t, uint64_t, uint64_t>(const uint64_t * __restrict, uint64_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint32_t, uint64_t>(const uint64_t * __restrict, uint32_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint16_t, uint64_t>(const uint64_t * __restrict, uint16_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, char8_t, uint64_t>(const uint64_t * __restrict, char8_t, uint64_t * __restrict, size_t);
+
+template void divideImpl<uint32_t, uint64_t, uint32_t>(const uint32_t * __restrict, uint64_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint32_t, uint32_t>(const uint32_t * __restrict, uint32_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint16_t, uint32_t>(const uint32_t * __restrict, uint16_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, char8_t, uint32_t>(const uint32_t * __restrict, char8_t, uint32_t * __restrict, size_t);
+
+template void divideImpl<int64_t, int64_t, int64_t>(const int64_t * __restrict, int64_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int32_t, int64_t>(const int64_t * __restrict, int32_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int16_t, int64_t>(const int64_t * __restrict, int16_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int8_t, int64_t>(const int64_t * __restrict, int8_t, int64_t * __restrict, size_t);
+
+template void divideImpl<int32_t, int64_t, int32_t>(const int32_t * __restrict, int64_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int32_t, int32_t>(const int32_t * __restrict, int32_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int16_t, int32_t>(const int32_t * __restrict, int16_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int8_t, int32_t>(const int32_t * __restrict, int8_t, int32_t * __restrict, size_t);
diff --git a/src/Functions/divide/divide.h b/src/Functions/divide/divide.h
new file mode 100644
index 00000000000..1c17a461159
--- /dev/null
+++ b/src/Functions/divide/divide.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <cstddef>
+
+template <typename A, typename B, typename ResultType>
+extern void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size);
diff --git a/src/Functions/divide/divideImpl.cpp b/src/Functions/divide/divideImpl.cpp
new file mode 100644
index 00000000000..f4c1a97d3ad
--- /dev/null
+++ b/src/Functions/divide/divideImpl.cpp
@@ -0,0 +1,79 @@
+/// 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
+#elif defined(__SSE2__)
+    #define REG_SIZE 16
+    #define LIBDIVIDE_SSE2
+#endif
+
+#include <libdivide.h>
+
+
+namespace NAMESPACE
+{
+
+template <typename A, typename B, typename ResultType>
+void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
+{
+    libdivide::divider<A> divider(b);
+    const A * a_end = a_pos + size;
+
+#if defined(__SSE2__)
+    static constexpr size_t values_per_simd_register = REG_SIZE / sizeof(A);
+    const A * a_end_simd = a_pos + size / values_per_simd_register * values_per_simd_register;
+
+    while (a_pos < a_end_simd)
+    {
+#if defined(__AVX2__)
+        _mm256_storeu_si256(reinterpret_cast<__m256i *>(c_pos),
+            _mm256_loadu_si256(reinterpret_cast<const __m256i *>(a_pos)) / divider);
+#else
+        _mm_storeu_si128(reinterpret_cast<__m128i *>(c_pos),
+            _mm_loadu_si128(reinterpret_cast<const __m128i *>(a_pos)) / divider);
+#endif
+
+        a_pos += values_per_simd_register;
+        c_pos += values_per_simd_register;
+    }
+#endif
+
+    while (a_pos < a_end)
+    {
+        *c_pos = *a_pos / divider;
+        ++a_pos;
+        ++c_pos;
+    }
+}
+
+template void divideImpl<uint64_t, uint64_t, uint64_t>(const uint64_t * __restrict, uint64_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint32_t, uint64_t>(const uint64_t * __restrict, uint32_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, uint16_t, uint64_t>(const uint64_t * __restrict, uint16_t, uint64_t * __restrict, size_t);
+template void divideImpl<uint64_t, char8_t, uint64_t>(const uint64_t * __restrict, char8_t, uint64_t * __restrict, size_t);
+
+template void divideImpl<uint32_t, uint64_t, uint32_t>(const uint32_t * __restrict, uint64_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint32_t, uint32_t>(const uint32_t * __restrict, uint32_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, uint16_t, uint32_t>(const uint32_t * __restrict, uint16_t, uint32_t * __restrict, size_t);
+template void divideImpl<uint32_t, char8_t, uint32_t>(const uint32_t * __restrict, char8_t, uint32_t * __restrict, size_t);
+
+template void divideImpl<int64_t, int64_t, int64_t>(const int64_t * __restrict, int64_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int32_t, int64_t>(const int64_t * __restrict, int32_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int16_t, int64_t>(const int64_t * __restrict, int16_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, int8_t, int64_t>(const int64_t * __restrict, int8_t, int64_t * __restrict, size_t);
+
+template void divideImpl<int32_t, int64_t, int32_t>(const int32_t * __restrict, int64_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int32_t, int32_t>(const int32_t * __restrict, int32_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int16_t, int32_t>(const int32_t * __restrict, int16_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, int8_t, int32_t>(const int32_t * __restrict, int8_t, int32_t * __restrict, size_t);
+
+}
diff --git a/src/Functions/dumpColumnStructure.cpp b/src/Functions/dumpColumnStructure.cpp
index 723b76616ed..28e1b874f3e 100644
--- a/src/Functions/dumpColumnStructure.cpp
+++ b/src/Functions/dumpColumnStructure.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <Core/Field.h>
@@ -14,7 +14,7 @@ class FunctionDumpColumnStructure : public IFunction
 {
 public:
     static constexpr auto name = "dumpColumnStructure";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionDumpColumnStructure>();
     }
diff --git a/src/Functions/errorCodeToName.cpp b/src/Functions/errorCodeToName.cpp
index 20e80e457c9..617731ba78c 100644
--- a/src/Functions/errorCodeToName.cpp
+++ b/src/Functions/errorCodeToName.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeString.h>
@@ -19,7 +19,7 @@ class FunctionErrorCodeToName : public IFunction
 {
 public:
     static constexpr auto name = "errorCodeToName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionErrorCodeToName>();
     }
diff --git a/src/Functions/evalMLMethod.cpp b/src/Functions/evalMLMethod.cpp
index 03d26db4043..1ad5d10df92 100644
--- a/src/Functions/evalMLMethod.cpp
+++ b/src/Functions/evalMLMethod.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
@@ -28,11 +28,11 @@ class FunctionEvalMLMethod : public IFunction
 {
 public:
     static constexpr auto name = "evalMLMethod";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionEvalMLMethod>(context);
     }
-    explicit FunctionEvalMLMethod(const Context & context_) : context(context_)
+    explicit FunctionEvalMLMethod(ContextConstPtr context_) : context(context_)
     {}
 
     String getName() const override
@@ -81,7 +81,7 @@ public:
         return agg_function->predictValues(arguments, context);
     }
 
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Disks/tests/CMakeLists.txt b/src/Functions/examples/CMakeLists.txt
similarity index 100%
rename from src/Disks/tests/CMakeLists.txt
rename to src/Functions/examples/CMakeLists.txt
diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index 7132c5dae82..866a900f6a7 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/Regexps.h>
 
 #include <memory>
@@ -51,7 +51,7 @@ public:
     static constexpr auto Kind = Impl::Kind;
     static constexpr auto name = Impl::Name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionExtractAllGroups>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionExtractAllGroups>(); }
 
     String getName() const override { return name; }
 
@@ -172,11 +172,12 @@ public:
                     for (size_t group = 1; group <= groups_count; ++group)
                         all_matches.push_back(matched_groups[group]);
 
-                    /// Additional limit to fail fast on supposedly incorrect usage.
-                    static constexpr size_t MAX_GROUPS_PER_ROW = 1000000;
-
-                    if (all_matches.size() > MAX_GROUPS_PER_ROW)
-                        throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size in the result of function {}", getName());
+                    /// Additional limit to fail fast on supposedly incorrect usage, arbitrary value.
+                    static constexpr size_t MAX_MATCHES_PER_ROW = 1000;
+                    if (matches_per_row > MAX_MATCHES_PER_ROW)
+                        throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE,
+                                "Too many matches per row (> {}) in the result of function {}",
+                                MAX_MATCHES_PER_ROW, getName());
 
                     pos = matched_groups[0].data() + std::max<size_t>(1, matched_groups[0].size());
 
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index 3f21be09e88..981382828bd 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -31,7 +31,7 @@ class FunctionExtractGroups : public IFunction
 {
 public:
     static constexpr auto name = "extractGroups";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionExtractGroups>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionExtractGroups>(); }
 
     String getName() const override { return name; }
 
@@ -65,12 +65,12 @@ public:
         const auto & re2 = regexp->getRE2();
 
         if (!re2)
-            throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
+            throw Exception("There are no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
 
         const size_t groups_count = re2->NumberOfCapturingGroups();
 
         if (!groups_count)
-            throw Exception("There is no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
+            throw Exception("There are no groups in regexp: " + needle, ErrorCodes::BAD_ARGUMENTS);
 
         // Including 0-group, which is the whole regexp.
         PODArrayWithStackMemory<re2_st::StringPiece, 128> matched_groups(groups_count + 1);
diff --git a/src/Functions/extractTextFromHTML.cpp b/src/Functions/extractTextFromHTML.cpp
index 528bd0c311f..aa7c208904e 100644
--- a/src/Functions/extractTextFromHTML.cpp
+++ b/src/Functions/extractTextFromHTML.cpp
@@ -1,7 +1,7 @@
 #include <Columns/ColumnString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <common/find_symbols.h>
 #include <Common/StringUtils/StringUtils.h>
 
@@ -296,7 +296,7 @@ class FunctionExtractTextFromHTML : public IFunction
 public:
     static constexpr auto name = "extractTextFromHTML";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionExtractTextFromHTML>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionExtractTextFromHTML>(); }
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.cpp b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
index 0ba08b3c612..19c02ed2390 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.cpp
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
@@ -39,14 +39,15 @@ std::string extractTimeZoneNameFromFunctionArguments(const ColumnsWithTypeAndNam
     }
     else
     {
-        if (arguments.empty())
+        if (arguments.size() <= datetime_arg_num)
             return {};
 
+        const auto & dt_arg = arguments[datetime_arg_num].type.get();
         /// If time zone is attached to an argument of type DateTime.
-        if (const auto * type = checkAndGetDataType<DataTypeDateTime>(arguments[datetime_arg_num].type.get()))
-            return type->getTimeZone().getTimeZone();
-        if (const auto * type = checkAndGetDataType<DataTypeDateTime64>(arguments[datetime_arg_num].type.get()))
-            return type->getTimeZone().getTimeZone();
+        if (const auto * type = checkAndGetDataType<DataTypeDateTime>(dt_arg))
+            return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
+        if (const auto * type = checkAndGetDataType<DataTypeDateTime64>(dt_arg))
+            return type->hasExplicitTimeZone() ? type->getTimeZone().getTimeZone() : std::string();
 
         return {};
     }
@@ -63,7 +64,7 @@ const DateLUTImpl & extractTimeZoneFromFunctionArguments(const ColumnsWithTypeAn
     }
     else
     {
-        if (arguments.empty())
+        if (arguments.size() <= datetime_arg_num)
             return DateLUT::instance();
 
         const auto & dt_arg = arguments[datetime_arg_num].type.get();
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.h b/src/Functions/extractTimeZoneFromFunctionArguments.h
index 6323b45f568..9dd3fdd4903 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.h
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.h
@@ -13,6 +13,7 @@ namespace DB
 class Block;
 
 /// 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(
     const ColumnsWithTypeAndName & arguments, size_t time_zone_arg_num, size_t datetime_arg_num);
 
diff --git a/src/Functions/filesystem.cpp b/src/Functions/filesystem.cpp
index 879c48dbe67..d60b2133813 100644
--- a/src/Functions/filesystem.cpp
+++ b/src/Functions/filesystem.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Context.h>
@@ -34,9 +34,9 @@ class FilesystemImpl : public IFunction
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<FilesystemImpl<Impl>>(std::filesystem::space(context.getConfigRef().getString("path")));
+        return std::make_shared<FilesystemImpl<Impl>>(std::filesystem::space(context->getConfigRef().getString("path")));
     }
 
     explicit FilesystemImpl(std::filesystem::space_info spaceinfo_) : spaceinfo(spaceinfo_) { }
diff --git a/src/Functions/finalizeAggregation.cpp b/src/Functions/finalizeAggregation.cpp
index 91d80e1d692..c8379e6a66f 100644
--- a/src/Functions/finalizeAggregation.cpp
+++ b/src/Functions/finalizeAggregation.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
@@ -24,7 +24,7 @@ class FunctionFinalizeAggregation : public IFunction
 {
 public:
     static constexpr auto name = "finalizeAggregation";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionFinalizeAggregation>();
     }
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 5128f077c5a..c64c182baf6 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -8,7 +8,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionsConversion.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/castTypeToEither.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 
@@ -281,7 +281,7 @@ private:
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFormatDateTimeImpl>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionFormatDateTimeImpl>(); }
 
     String getName() const override
     {
@@ -480,7 +480,7 @@ public:
                     // since right now LUT does not support Int64-values and not format instructions for subsecond parts,
                     // treat DatTime64 values just as DateTime values by ignoring fractional and casting to UInt32.
                     const auto c = DecimalUtils::split(vec[i], scale);
-                    instruction.perform(pos, static_cast<UInt32>(c.whole), time_zone);
+                    instruction.perform(pos, static_cast<Int64>(c.whole), time_zone);
                 }
             }
             else
diff --git a/src/Functions/formatReadable.h b/src/Functions/formatReadable.h
index ae70c1afa87..fc8f5afe764 100644
--- a/src/Functions/formatReadable.h
+++ b/src/Functions/formatReadable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
@@ -28,7 +28,7 @@ class FunctionFormatReadable : public IFunction
 {
 public:
     static constexpr auto name = Impl::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFormatReadable<Impl>>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionFormatReadable<Impl>>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/formatReadableTimeDelta.cpp b/src/Functions/formatReadableTimeDelta.cpp
index 9ffdb8464e0..1be6fdf36c5 100644
--- a/src/Functions/formatReadableTimeDelta.cpp
+++ b/src/Functions/formatReadableTimeDelta.cpp
@@ -1,5 +1,5 @@
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
@@ -38,7 +38,7 @@ class FunctionFormatReadableTimeDelta : public IFunction
 {
 public:
     static constexpr auto name = "formatReadableTimeDelta";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFormatReadableTimeDelta>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionFormatReadableTimeDelta>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index e8f82669aae..60ed6be1351 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -5,7 +5,7 @@
 #include <Formats/FormatFactory.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/WriteHelpers.h>
 #include <Processors/Formats/IOutputFormat.h>
@@ -35,7 +35,7 @@ class FunctionFormatRow : public IFunction
 public:
     static constexpr auto name = no_newline ? "formatRowNoNewline" : "formatRow";
 
-    FunctionFormatRow(const String & format_name_, const Context & context_) : format_name(format_name_), context(context_)
+    FunctionFormatRow(const String & format_name_, ContextConstPtr context_) : format_name(format_name_), context(context_)
     {
         if (!FormatFactory::instance().getAllFormats().count(format_name))
             throw Exception("Unknown format " + format_name, ErrorCodes::UNKNOWN_FORMAT);
@@ -76,23 +76,23 @@ public:
 
 private:
     String format_name;
-    const Context & context;
+    ContextConstPtr context;
 };
 
 template <bool no_newline>
-class FormatRowOverloadResolver : public IFunctionOverloadResolverImpl
+class FormatRowOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = no_newline ? "formatRowNoNewline" : "formatRow";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<FormatRowOverloadResolver>(context); }
-    explicit FormatRowOverloadResolver(const Context & context_) : context(context_) { }
+    static FunctionOverloadResolverPtr create(ContextConstPtr context) { return std::make_unique<FormatRowOverloadResolver>(context); }
+    explicit FormatRowOverloadResolver(ContextConstPtr context_) : context(context_) { }
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
     bool useDefaultImplementationForNulls() const override { return false; }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         if (arguments.size() < 2)
             throw Exception(
@@ -100,7 +100,7 @@ public:
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments.at(0).column.get()))
-            return std::make_unique<DefaultFunction>(
+            return std::make_unique<FunctionToFunctionBaseAdaptor>(
                 std::make_shared<FunctionFormatRow<no_newline>>(name_col->getValue<String>(), context),
                 ext::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }),
                 return_type);
@@ -108,10 +108,10 @@ public:
             throw Exception("First argument to " + getName() + " must be a format name", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    DataTypePtr getReturnType(const DataTypes &) const override { return std::make_shared<DataTypeString>(); }
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeString>(); }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/formatString.cpp b/src/Functions/formatString.cpp
index c97692bcb10..9c222d085c2 100644
--- a/src/Functions/formatString.cpp
+++ b/src/Functions/formatString.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <ext/range.h>
 
@@ -31,7 +31,7 @@ class FormatFunction : public IFunction
 public:
     static constexpr auto name = Name::name;
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FormatFunction>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FormatFunction>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/fromModifiedJulianDay.cpp b/src/Functions/fromModifiedJulianDay.cpp
index cd5699bfac5..277d876e42f 100644
--- a/src/Functions/fromModifiedJulianDay.cpp
+++ b/src/Functions/fromModifiedJulianDay.cpp
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/IDataType.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/GregorianDate.h>
 #include <IO/WriteBufferFromVector.h>
@@ -23,7 +23,7 @@ namespace DB
     }
 
     template <typename Name, typename FromDataType, bool nullOnErrors>
-    class ExecutableFunctionFromModifiedJulianDay : public IExecutableFunctionImpl
+    class ExecutableFunctionFromModifiedJulianDay : public IExecutableFunction
     {
     public:
         String getName() const override
@@ -31,7 +31,7 @@ namespace DB
             return Name::name;
         }
 
-        ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
         {
             using ColVecType = typename FromDataType::ColumnType;
             const ColVecType * col_from = checkAndGetColumn<ColVecType>(arguments[0].column.get());
@@ -95,7 +95,7 @@ namespace DB
     };
 
     template <typename Name, typename FromDataType, bool nullOnErrors>
-    class FunctionBaseFromModifiedJulianDay : public IFunctionBaseImpl
+    class FunctionBaseFromModifiedJulianDay : public IFunctionBase
     {
     public:
         explicit FunctionBaseFromModifiedJulianDay(DataTypes argument_types_, DataTypePtr return_type_)
@@ -117,7 +117,7 @@ namespace DB
             return return_type;
         }
 
-        ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+        ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
         {
             return std::make_unique<ExecutableFunctionFromModifiedJulianDay<Name, FromDataType, nullOnErrors>>();
         }
@@ -146,12 +146,12 @@ namespace DB
     };
 
     template <typename Name, bool nullOnErrors>
-    class FromModifiedJulianDayOverloadResolver : public IFunctionOverloadResolverImpl
+    class FromModifiedJulianDayOverloadResolver : public IFunctionOverloadResolver
     {
     public:
         static constexpr auto name = Name::name;
 
-        static FunctionOverloadResolverImplPtr create(const Context &)
+        static FunctionOverloadResolverPtr create(ContextConstPtr)
         {
             return std::make_unique<FromModifiedJulianDayOverloadResolver<Name, nullOnErrors>>();
         }
@@ -161,11 +161,12 @@ namespace DB
             return Name::name;
         }
 
-        FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+        FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
         {
             const DataTypePtr & from_type = removeNullable(arguments[0].type);
             DataTypes argument_types = { from_type };
-            FunctionBaseImplPtr base;
+
+            FunctionBasePtr base;
             auto call = [&](const auto & types) -> bool
             {
                 using Types = std::decay_t<decltype(types)>;
@@ -193,7 +194,7 @@ namespace DB
                     "The argument of function " + getName() + " must be integral", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
         }
 
-        DataTypePtr getReturnType(const DataTypes & arguments) const override
+        DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
         {
             if (!isInteger(arguments[0]))
             {
diff --git a/src/Functions/fromUnixTimestamp64Micro.cpp b/src/Functions/fromUnixTimestamp64Micro.cpp
index a4bac327a3a..7eb9e41474b 100644
--- a/src/Functions/fromUnixTimestamp64Micro.cpp
+++ b/src/Functions/fromUnixTimestamp64Micro.cpp
@@ -4,17 +4,11 @@
 namespace DB
 {
 
-struct TransformFromMicro
-{
-    static constexpr auto name = "fromUnixTimestamp64Micro";
-    static constexpr auto target_scale = 6;
-    using SourceDataType = DataTypeInt64;
-    using ResultDataType = DataTypeDateTime64;
-};
-
 void registerFromUnixTimestamp64Micro(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionUnixTimestamp64<TransformFromMicro>>();
+    factory.registerFunction("fromUnixTimestamp64Micro",
+        [](ContextConstPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionFromUnixTimestamp64>(6, "fromUnixTimestamp64Micro")); });
 }
 
 }
diff --git a/src/Functions/fromUnixTimestamp64Milli.cpp b/src/Functions/fromUnixTimestamp64Milli.cpp
index a4ce79ecebb..68ee1ed4078 100644
--- a/src/Functions/fromUnixTimestamp64Milli.cpp
+++ b/src/Functions/fromUnixTimestamp64Milli.cpp
@@ -4,17 +4,11 @@
 namespace DB
 {
 
-struct TransformFromMilli
-{
-    static constexpr auto name = "fromUnixTimestamp64Milli";
-    static constexpr auto target_scale = 3;
-    using SourceDataType = DataTypeInt64;
-    using ResultDataType = DataTypeDateTime64;
-};
-
 void registerFromUnixTimestamp64Milli(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionUnixTimestamp64<TransformFromMilli>>();
+    factory.registerFunction("fromUnixTimestamp64Milli",
+        [](ContextConstPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionFromUnixTimestamp64>(3, "fromUnixTimestamp64Milli")); });
 }
 
 }
diff --git a/src/Functions/fromUnixTimestamp64Nano.cpp b/src/Functions/fromUnixTimestamp64Nano.cpp
index cd69aa56a2c..19fe8524b78 100644
--- a/src/Functions/fromUnixTimestamp64Nano.cpp
+++ b/src/Functions/fromUnixTimestamp64Nano.cpp
@@ -4,17 +4,11 @@
 namespace DB
 {
 
-struct TransformFromNano
-{
-    static constexpr auto name = "fromUnixTimestamp64Nano";
-    static constexpr auto target_scale = 9;
-    using SourceDataType = DataTypeInt64;
-    using ResultDataType = DataTypeDateTime64;
-};
-
 void registerFromUnixTimestamp64Nano(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionUnixTimestamp64<TransformFromNano>>();
+    factory.registerFunction("fromUnixTimestamp64Nano",
+        [](ContextConstPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionFromUnixTimestamp64>(9, "fromUnixTimestamp64Nano")); });
 }
 
 }
diff --git a/src/Functions/fuzzBits.cpp b/src/Functions/fuzzBits.cpp
index a0631084742..b4110eae32a 100644
--- a/src/Functions/fuzzBits.cpp
+++ b/src/Functions/fuzzBits.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
 #include <common/arithmeticOverflow.h>
@@ -53,7 +53,7 @@ class FunctionFuzzBits : public IFunction
 public:
     static constexpr auto name = "fuzzBits";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionFuzzBits>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionFuzzBits>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/gcd.cpp b/src/Functions/gcd.cpp
index 52addfc66ed..f42f8f96cdb 100644
--- a/src/Functions/gcd.cpp
+++ b/src/Functions/gcd.cpp
@@ -2,6 +2,8 @@
 #include <Functions/FunctionBinaryArithmetic.h>
 #include <Functions/GCDLCMImpl.h>
 
+#include <boost/integer/common_factor.hpp>
+
 
 namespace DB
 {
@@ -19,7 +21,7 @@ struct GCDImpl : public GCDLCMImpl<A, B, GCDImpl<A, B>, NameGCD>
     static ResultType applyImpl(A a, B b)
     {
         using Int = typename NumberTraits::ToInteger<ResultType>::Type;
-        return std::gcd(Int(a), Int(b));
+        return boost::integer::gcd(Int(a), Int(b));
     }
 };
 
diff --git a/src/Functions/generateUUIDv4.cpp b/src/Functions/generateUUIDv4.cpp
index e519f5217b5..7d3f80d9096 100644
--- a/src/Functions/generateUUIDv4.cpp
+++ b/src/Functions/generateUUIDv4.cpp
@@ -32,21 +32,22 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
-        auto col_res = ColumnVector<UInt128>::create();
-        typename ColumnVector<UInt128>::Container & vec_to = col_res->getData();
+        auto col_res = ColumnVector<UUID>::create();
+        typename ColumnVector<UUID>::Container & vec_to = col_res->getData();
 
         size_t size = input_rows_count;
         vec_to.resize(size);
 
         /// RandImpl is target-dependent and is not the same in different TargetSpecific namespaces.
-        RandImpl::execute(reinterpret_cast<char *>(vec_to.data()), vec_to.size() * sizeof(UInt128));
+        RandImpl::execute(reinterpret_cast<char *>(vec_to.data()), vec_to.size() * sizeof(UUID));
 
-        for (UInt128 & uuid: vec_to)
+        for (UUID & uuid : vec_to)
         {
-            /** https://tools.ietf.org/html/rfc4122#section-4.4
-             */
-            uuid.low = (uuid.low & 0xffffffffffff0fffull) | 0x0000000000004000ull;
-            uuid.high = (uuid.high & 0x3fffffffffffffffull) | 0x8000000000000000ull;
+            /// https://tools.ietf.org/html/rfc4122#section-4.4
+
+            UInt128 & impl = uuid.toUnderType();
+            impl.items[0] = (impl.items[0] & 0xffffffffffff0fffull) | 0x0000000000004000ull;
+            impl.items[1] = (impl.items[1] & 0x3fffffffffffffffull) | 0x8000000000000000ull;
         }
 
         return col_res;
@@ -59,7 +60,7 @@ public:
 class FunctionGenerateUUIDv4 : public TargetSpecific::Default::FunctionGenerateUUIDv4
 {
 public:
-    explicit FunctionGenerateUUIDv4(const Context & context) : selector(context)
+    explicit FunctionGenerateUUIDv4(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionGenerateUUIDv4>();
@@ -75,7 +76,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionGenerateUUIDv4>(context);
     }
diff --git a/src/Functions/geoToH3.cpp b/src/Functions/geoToH3.cpp
index 6518043d15f..45e6e06d114 100644
--- a/src/Functions/geoToH3.cpp
+++ b/src/Functions/geoToH3.cpp
@@ -9,7 +9,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
 #include <ext/range.h>
 
@@ -33,7 +33,7 @@ class FunctionGeoToH3 : public IFunction
 public:
     static constexpr auto name = "geoToH3";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeoToH3>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionGeoToH3>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/geohashDecode.cpp b/src/Functions/geohashDecode.cpp
index 7e73b501bd5..89e8d40402a 100644
--- a/src/Functions/geohashDecode.cpp
+++ b/src/Functions/geohashDecode.cpp
@@ -27,7 +27,7 @@ class FunctionGeohashDecode : public IFunction
 {
 public:
     static constexpr auto name = "geohashDecode";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeohashDecode>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionGeohashDecode>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/geohashEncode.cpp b/src/Functions/geohashEncode.cpp
index 794e77b4e24..fbee2047ed2 100644
--- a/src/Functions/geohashEncode.cpp
+++ b/src/Functions/geohashEncode.cpp
@@ -28,7 +28,7 @@ class FunctionGeohashEncode : public IFunction
 {
 public:
     static constexpr auto name = "geohashEncode";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeohashEncode>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionGeohashEncode>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/geohashesInBox.cpp b/src/Functions/geohashesInBox.cpp
index 0e18916053f..fdccc97879f 100644
--- a/src/Functions/geohashesInBox.cpp
+++ b/src/Functions/geohashesInBox.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/GeoHash.h>
@@ -29,7 +29,7 @@ class FunctionGeohashesInBox : public IFunction
 {
 public:
     static constexpr auto name = "geohashesInBox";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionGeohashesInBox>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionGeohashesInBox>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/getMacro.cpp b/src/Functions/getMacro.cpp
index 949016d862d..a2fda60623f 100644
--- a/src/Functions/getMacro.cpp
+++ b/src/Functions/getMacro.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeString.h>
@@ -30,9 +30,9 @@ private:
 
 public:
     static constexpr auto name = "getMacro";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<FunctionGetMacro>(context.getMacros());
+        return std::make_shared<FunctionGetMacro>(context->getMacros());
     }
 
     explicit FunctionGetMacro(MultiVersion<Macros>::Version macros_) : macros(std::move(macros_)) {}
diff --git a/src/Functions/getScalar.cpp b/src/Functions/getScalar.cpp
index 4803c5a81d5..d74d881473f 100644
--- a/src/Functions/getScalar.cpp
+++ b/src/Functions/getScalar.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeString.h>
@@ -20,16 +20,16 @@ namespace
 
 /** Get scalar value of sub queries from query context via IAST::Hash.
   */
-class FunctionGetScalar : public IFunction
+class FunctionGetScalar : public IFunction, WithConstContext
 {
 public:
     static constexpr auto name = "__getScalar";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context_)
     {
-        return std::make_shared<FunctionGetScalar>(context);
+        return std::make_shared<FunctionGetScalar>(context_);
     }
 
-    explicit FunctionGetScalar(const Context & context_) : context(context_) {}
+    explicit FunctionGetScalar(ContextConstPtr context_) : WithConstContext(context_) {}
 
     String getName() const override
     {
@@ -46,8 +46,8 @@ public:
         if (arguments.size() != 1 || !isString(arguments[0].type) || !arguments[0].column || !isColumnConst(*arguments[0].column))
             throw Exception("Function " + getName() + " accepts one const string argument", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
         auto scalar_name = assert_cast<const ColumnConst &>(*arguments[0].column).getValue<String>();
-        const Context & query_context = context.hasQueryContext() ? context.getQueryContext() : context;
-        scalar = query_context.getScalar(scalar_name).getByPosition(0);
+        ContextConstPtr query_context = getContext()->hasQueryContext() ? getContext()->getQueryContext() : getContext();
+        scalar = query_context->getScalar(scalar_name).getByPosition(0);
         return scalar.type;
     }
 
@@ -58,7 +58,6 @@ public:
 
 private:
     mutable ColumnWithTypeAndName scalar;
-    const Context & context;
 };
 
 }
diff --git a/src/Functions/getSetting.cpp b/src/Functions/getSetting.cpp
index 5da5f902d8c..7c6592faf57 100644
--- a/src/Functions/getSetting.cpp
+++ b/src/Functions/getSetting.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/FieldToDataType.h>
@@ -19,13 +19,13 @@ namespace
 {
 
 /// Get the value of a setting.
-class FunctionGetSetting : public IFunction
+class FunctionGetSetting : public IFunction, WithConstContext
 {
 public:
     static constexpr auto name = "getSetting";
 
-    static FunctionPtr create(const Context & context_) { return std::make_shared<FunctionGetSetting>(context_); }
-    explicit FunctionGetSetting(const Context & context_) : context(context_) {}
+    static FunctionPtr create(ContextConstPtr context_) { return std::make_shared<FunctionGetSetting>(context_); }
+    explicit FunctionGetSetting(ContextConstPtr context_) : WithConstContext(context_) {}
 
     String getName() const override { return name; }
     bool isDeterministic() const override { return false; }
@@ -43,7 +43,7 @@ public:
                             ErrorCodes::ILLEGAL_COLUMN};
 
         std::string_view setting_name{column->getDataAt(0)};
-        value = context.getSettingsRef().get(setting_name);
+        value = getContext()->getSettingsRef().get(setting_name);
 
         DataTypePtr type = applyVisitor(FieldToDataType{}, value);
         value = convertFieldToType(value, *type);
@@ -57,7 +57,6 @@ public:
 
 private:
     mutable Field value;
-    const Context & context;
 };
 
 }
diff --git a/src/Functions/getSizeOfEnumType.cpp b/src/Functions/getSizeOfEnumType.cpp
index dea56bd3063..61f4d7efced 100644
--- a/src/Functions/getSizeOfEnumType.cpp
+++ b/src/Functions/getSizeOfEnumType.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeEnum.h>
@@ -20,7 +20,7 @@ class FunctionGetSizeOfEnumType : public IFunction
 {
 public:
     static constexpr auto name = "getSizeOfEnumType";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionGetSizeOfEnumType>();
     }
@@ -51,17 +51,24 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        return getResultIfAlwaysReturnsConstantAndHasArguments(arguments)->cloneResized(input_rows_count);
+        return getSizeOfEnumType(arguments[0].type, input_rows_count);
     }
 
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & arguments) const override
+    ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override
     {
-        if (const auto * type8 = checkAndGetDataType<DataTypeEnum8>(arguments[0].type.get()))
-            return DataTypeUInt8().createColumnConst(1, type8->getValues().size());
-        else if (const auto * type16 = checkAndGetDataType<DataTypeEnum16>(arguments[0].type.get()))
-            return DataTypeUInt16().createColumnConst(1, type16->getValues().size());
+        return getSizeOfEnumType(arguments[0].type, 1);
+    }
+
+private:
+
+    ColumnPtr getSizeOfEnumType(const DataTypePtr & data_type, size_t input_rows_count) const
+    {
+        if (const auto * type8 = checkAndGetDataType<DataTypeEnum8>(data_type.get()))
+            return DataTypeUInt8().createColumnConst(input_rows_count, type8->getValues().size());
+        else if (const auto * type16 = checkAndGetDataType<DataTypeEnum16>(data_type.get()))
+            return DataTypeUInt16().createColumnConst(input_rows_count, type16->getValues().size());
         else
-            throw Exception("The argument for function " + getName() + " must be Enum", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The argument for function {} must be Enum", getName());
     }
 };
 
diff --git a/src/Functions/globalVariable.cpp b/src/Functions/globalVariable.cpp
index 6482b3bb976..be2d4488daa 100644
--- a/src/Functions/globalVariable.cpp
+++ b/src/Functions/globalVariable.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -30,7 +30,7 @@ class FunctionGlobalVariable : public IFunction
 {
 public:
     static constexpr auto name = "globalVariable";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionGlobalVariable>();
     }
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index 801f8b3da7f..e160b72740e 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -3,7 +3,7 @@
 #include <Columns/ColumnConst.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/TargetSpecific.h>
@@ -187,8 +187,8 @@ float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
 
         /// This is linear interpolation between two table items at index "latitude_midpoint_index" and "latitude_midpoint_index + 1".
 
-        float k_lat;
-        float k_lon;
+        float k_lat{};
+        float k_lon{};
 
         if constexpr (method == Method::SPHERE_DEGREES)
         {
@@ -287,7 +287,7 @@ template <Method method>
 class FunctionGeoDistance : public TargetSpecific::Default::FunctionGeoDistance<method>
 {
 public:
-    explicit FunctionGeoDistance(const Context & context) : selector(context)
+    explicit FunctionGeoDistance(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             TargetSpecific::Default::FunctionGeoDistance<method>>();
@@ -307,7 +307,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionGeoDistance<method>>(context);
     }
diff --git a/src/Functions/greatest.cpp b/src/Functions/greatest.cpp
index 56b5630b6bc..9fda95db01f 100644
--- a/src/Functions/greatest.cpp
+++ b/src/Functions/greatest.cpp
@@ -26,10 +26,13 @@ struct GreatestBaseImpl
     static inline llvm::Value * compile(llvm::IRBuilder<> & b, llvm::Value * left, llvm::Value * right, bool is_signed)
     {
         if (!left->getType()->isIntegerTy())
-            /// XXX maxnum is basically fmax(), it may or may not match whatever apply() does
-            /// XXX CreateMaxNum is broken on LLVM 5.0 and 6.0 (generates minnum instead; fixed in 7)
-            return b.CreateBinaryIntrinsic(llvm::Intrinsic::maxnum, left, right);
-        return b.CreateSelect(is_signed ? b.CreateICmpSGT(left, right) : b.CreateICmpUGT(left, right), left, right);
+        {
+            /// Follows the IEEE-754 semantics for maxNum except for the handling of signaling NaNs. This matches the behavior of libc fmax.
+            return b.CreateMaxNum(left, right);
+        }
+
+        auto * compare_value = is_signed ? b.CreateICmpSGT(left, right) : b.CreateICmpUGT(left, right);
+        return b.CreateSelect(compare_value, left, right);
     }
 #endif
 };
diff --git a/src/Functions/h3EdgeAngle.cpp b/src/Functions/h3EdgeAngle.cpp
index 58ce5def111..4a0f69ab139 100644
--- a/src/Functions/h3EdgeAngle.cpp
+++ b/src/Functions/h3EdgeAngle.cpp
@@ -32,7 +32,7 @@ class FunctionH3EdgeAngle : public IFunction
 public:
     static constexpr auto name = "h3EdgeAngle";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3EdgeAngle>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3EdgeAngle>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3EdgeLengthM.cpp b/src/Functions/h3EdgeLengthM.cpp
index 8f8aebc857e..523c4bde061 100644
--- a/src/Functions/h3EdgeLengthM.cpp
+++ b/src/Functions/h3EdgeLengthM.cpp
@@ -37,7 +37,7 @@ class FunctionH3EdgeLengthM : public IFunction
 public:
     static constexpr auto name = "h3EdgeLengthM";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3EdgeLengthM>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3EdgeLengthM>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3GetBaseCell.cpp b/src/Functions/h3GetBaseCell.cpp
index 92d9ee5e3e0..83d3064a023 100644
--- a/src/Functions/h3GetBaseCell.cpp
+++ b/src/Functions/h3GetBaseCell.cpp
@@ -29,7 +29,7 @@ class FunctionH3GetBaseCell : public IFunction
 public:
     static constexpr auto name = "h3GetBaseCell";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3GetBaseCell>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3GetBaseCell>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3GetResolution.cpp b/src/Functions/h3GetResolution.cpp
index f2676ccbb82..197b0516da9 100644
--- a/src/Functions/h3GetResolution.cpp
+++ b/src/Functions/h3GetResolution.cpp
@@ -29,7 +29,7 @@ class FunctionH3GetResolution : public IFunction
 public:
     static constexpr auto name = "h3GetResolution";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3GetResolution>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3GetResolution>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3HexAreaM2.cpp b/src/Functions/h3HexAreaM2.cpp
index c7a16b57465..c7eca3396bc 100644
--- a/src/Functions/h3HexAreaM2.cpp
+++ b/src/Functions/h3HexAreaM2.cpp
@@ -32,7 +32,7 @@ class FunctionH3HexAreaM2 : public IFunction
 public:
     static constexpr auto name = "h3HexAreaM2";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3HexAreaM2>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3HexAreaM2>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3IndexesAreNeighbors.cpp b/src/Functions/h3IndexesAreNeighbors.cpp
index d43fca15012..d2873f954e8 100644
--- a/src/Functions/h3IndexesAreNeighbors.cpp
+++ b/src/Functions/h3IndexesAreNeighbors.cpp
@@ -29,7 +29,7 @@ class FunctionH3IndexesAreNeighbors : public IFunction
 public:
     static constexpr auto name = "h3IndexesAreNeighbors";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3IndexesAreNeighbors>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3IndexesAreNeighbors>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3IsValid.cpp b/src/Functions/h3IsValid.cpp
index 2918431e3b6..930b1d3c4a7 100644
--- a/src/Functions/h3IsValid.cpp
+++ b/src/Functions/h3IsValid.cpp
@@ -29,7 +29,7 @@ class FunctionH3IsValid : public IFunction
 public:
     static constexpr auto name = "h3IsValid";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3IsValid>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3IsValid>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3ToChildren.cpp b/src/Functions/h3ToChildren.cpp
index b63d4efc83e..3b09b5a1866 100644
--- a/src/Functions/h3ToChildren.cpp
+++ b/src/Functions/h3ToChildren.cpp
@@ -38,7 +38,7 @@ class FunctionH3ToChildren : public IFunction
 public:
     static constexpr auto name = "h3ToChildren";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3ToChildren>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3ToChildren>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3ToParent.cpp b/src/Functions/h3ToParent.cpp
index 73c1d002df5..b5c49d4c253 100644
--- a/src/Functions/h3ToParent.cpp
+++ b/src/Functions/h3ToParent.cpp
@@ -32,7 +32,7 @@ class FunctionH3ToParent : public IFunction
 public:
     static constexpr auto name = "h3ToParent";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3ToParent>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3ToParent>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3ToString.cpp b/src/Functions/h3ToString.cpp
index 16d7d14964a..f2a777580d0 100644
--- a/src/Functions/h3ToString.cpp
+++ b/src/Functions/h3ToString.cpp
@@ -29,7 +29,7 @@ class FunctionH3ToString : public IFunction
 public:
     static constexpr auto name = "h3ToString";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3ToString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3ToString>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/h3kRing.cpp b/src/Functions/h3kRing.cpp
index fd4a8ac57e8..e616c253c58 100644
--- a/src/Functions/h3kRing.cpp
+++ b/src/Functions/h3kRing.cpp
@@ -35,7 +35,7 @@ class FunctionH3KRing : public IFunction
 public:
     static constexpr auto name = "h3kRing";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionH3KRing>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionH3KRing>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index d5fe00e025f..941ffa48e74 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnString.h>
@@ -25,16 +25,16 @@ namespace
 /** Usage:
  *  hasColumnInTable(['hostname'[, 'username'[, 'password']],] 'database', 'table', 'column')
  */
-class FunctionHasColumnInTable : public IFunction
+class FunctionHasColumnInTable : public IFunction, WithConstContext
 {
 public:
     static constexpr auto name = "hasColumnInTable";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context_)
     {
-        return std::make_shared<FunctionHasColumnInTable>(context.getGlobalContext());
+        return std::make_shared<FunctionHasColumnInTable>(context_->getGlobalContext());
     }
 
-    explicit FunctionHasColumnInTable(const Context & global_context_) : global_context(global_context_)
+    explicit FunctionHasColumnInTable(ContextConstPtr global_context_) : WithConstContext(global_context_)
     {
     }
 
@@ -57,9 +57,6 @@ public:
     bool isDeterministic() const override { return false; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
-
-private:
-    const Context & global_context;
 };
 
 
@@ -117,7 +114,12 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
     bool has_column;
     if (host_name.empty())
     {
-        const StoragePtr & table = DatabaseCatalog::instance().getTable({database_name, table_name}, global_context);
+        // FIXME this (probably) needs a non-constant access to query context,
+        // because it might initialized a storage. Ideally, the tables required
+        // by the query should be initialized at an earlier stage.
+        const StoragePtr & table = DatabaseCatalog::instance().getTable(
+            {database_name, table_name},
+            const_pointer_cast<Context>(getContext()));
         auto table_metadata = table->getInMemoryMetadataPtr();
         has_column = table_metadata->getColumns().hasPhysical(column_name);
     }
@@ -126,18 +128,24 @@ ColumnPtr FunctionHasColumnInTable::executeImpl(const ColumnsWithTypeAndName & a
         std::vector<std::vector<String>> host_names = {{ host_name }};
 
         auto cluster = std::make_shared<Cluster>(
-            global_context.getSettings(),
+            getContext()->getSettings(),
             host_names,
             !user_name.empty() ? user_name : "default",
             password,
-            global_context.getTCPPort(),
+            getContext()->getTCPPort(),
             false);
 
-        auto remote_columns = getStructureOfRemoteTable(*cluster, {database_name, table_name}, global_context);
+        // FIXME this (probably) needs a non-constant access to query context,
+        // because it might initialized a storage. Ideally, the tables required
+        // by the query should be initialized at an earlier stage.
+        auto remote_columns = getStructureOfRemoteTable(*cluster,
+            {database_name, table_name},
+            const_pointer_cast<Context>(getContext()));
+
         has_column = remote_columns.hasPhysical(column_name);
     }
 
-    return DataTypeUInt8().createColumnConst(input_rows_count, Field(has_column));
+    return DataTypeUInt8().createColumnConst(input_rows_count, Field{UInt64(has_column)});
 }
 
 }
diff --git a/src/Functions/hasThreadFuzzer.cpp b/src/Functions/hasThreadFuzzer.cpp
index 545ac0175f2..fb7014a49b1 100644
--- a/src/Functions/hasThreadFuzzer.cpp
+++ b/src/Functions/hasThreadFuzzer.cpp
@@ -16,7 +16,7 @@ class FunctionHasThreadFuzzer : public IFunction
 {
 public:
     static constexpr auto name = "hasThreadFuzzer";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionHasThreadFuzzer>();
     }
diff --git a/src/Functions/hostName.cpp b/src/Functions/hostName.cpp
index beaaec37e70..1fdc039be96 100644
--- a/src/Functions/hostName.cpp
+++ b/src/Functions/hostName.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <Common/DNSResolver.h>
@@ -15,7 +15,7 @@ class FunctionHostName : public IFunction
 {
 public:
     static constexpr auto name = "hostName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionHostName>();
     }
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index cb8fcf28c23..7889a17f05a 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 
 
@@ -11,7 +11,7 @@ class FunctionIdentity : public IFunction
 {
 public:
     static constexpr auto name = "identity";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIdentity>();
     }
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 614bfcf700e..dbe36d4c728 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -17,7 +17,7 @@
 #include <Columns/ColumnNullable.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <Functions/GatherUtils/Algorithms.h>
@@ -169,11 +169,11 @@ public:
 };
 
 
-class FunctionIf : public FunctionIfBase</*null_is_false=*/false>
+class FunctionIf : public FunctionIfBase
 {
 public:
     static constexpr auto name = "if";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionIf>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIf>(); }
 
 private:
     template <typename T0, typename T1>
@@ -986,7 +986,7 @@ public:
             right_id = right_array->getNestedType()->getTypeId();
 
         if (!(callOnBasicTypes<true, true, true, false>(left_id, right_id, call)
-            || (res = executeTyped<UInt128, UInt128>(cond_col, arguments, result_type, input_rows_count))
+            || (res = executeTyped<UUID, UUID>(cond_col, arguments, result_type, input_rows_count))
             || (res = executeString(cond_col, arguments, result_type))
             || (res = executeGenericArray(cond_col, arguments, result_type))
             || (res = executeTuple(arguments, result_type, input_rows_count))))
diff --git a/src/Functions/ifNotFinite.cpp b/src/Functions/ifNotFinite.cpp
index 88b23da0126..be975f28ee1 100644
--- a/src/Functions/ifNotFinite.cpp
+++ b/src/Functions/ifNotFinite.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -17,9 +17,9 @@ class FunctionIfNotFinite : public IFunction
 public:
     static constexpr auto name = "ifNotFinite";
 
-    explicit FunctionIfNotFinite(const Context & context_) : context(context_) {}
+    explicit FunctionIfNotFinite(ContextConstPtr context_) : context(context_) {}
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionIfNotFinite>(context);
     }
@@ -59,7 +59,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/ifNull.cpp b/src/Functions/ifNull.cpp
index af29fa0e1f0..69c7e9346f2 100644
--- a/src/Functions/ifNull.cpp
+++ b/src/Functions/ifNull.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -21,9 +21,9 @@ class FunctionIfNull : public IFunction
 public:
     static constexpr auto name = "ifNull";
 
-    explicit FunctionIfNull(const Context & context_) : context(context_) {}
+    explicit FunctionIfNull(ContextConstPtr context_) : context(context_) {}
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionIfNull>(context);
     }
@@ -83,7 +83,7 @@ public:
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/ignore.cpp b/src/Functions/ignore.cpp
index 1348144cb05..819cd9a0b52 100644
--- a/src/Functions/ignore.cpp
+++ b/src/Functions/ignore.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 
@@ -14,7 +14,7 @@ class FunctionIgnore : public IFunction
 {
 public:
     static constexpr auto name = "ignore";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIgnore>();
     }
@@ -49,11 +49,6 @@ public:
     {
         return DataTypeUInt8().createColumnConst(input_rows_count, 0u);
     }
-
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName &) const override
-    {
-        return DataTypeUInt8().createColumnConst(1, 0u);
-    }
 };
 
 }
diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index b9a0c81b508..b1686e2a15a 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -52,7 +52,7 @@ public:
     /// It is needed to perform type analysis without creation of set.
     static constexpr auto name = FunctionInName<negative, global, null_is_skipped, ignore_set>::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIn>();
     }
diff --git a/src/Functions/indexHint.cpp b/src/Functions/indexHint.cpp
new file mode 100644
index 00000000000..6fd41a910d3
--- /dev/null
+++ b/src/Functions/indexHint.cpp
@@ -0,0 +1,66 @@
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+
+
+namespace DB
+{
+
+
+/** The `indexHint` function takes any number of any arguments and always returns one.
+  *
+  * This function has a special meaning (see ExpressionAnalyzer, KeyCondition)
+  * - the expressions inside it are not evaluated;
+  * - but when analyzing the index (selecting ranges for reading), this function is treated the same way,
+  *   as if instead of using it the expression itself would be.
+  *
+  * Example: WHERE something AND indexHint(CounterID = 34)
+  * - do not read or calculate CounterID = 34, but select ranges in which the CounterID = 34 expression can be true.
+  *
+  * The function can be used for debugging purposes, as well as for (hidden from the user) query conversions.
+  */
+class FunctionIndexHint : public IFunction
+{
+public:
+    static constexpr auto name = "indexHint";
+    static FunctionPtr create(ContextConstPtr)
+    {
+        return std::make_shared<FunctionIndexHint>();
+    }
+
+    bool isVariadic() const override
+    {
+        return true;
+    }
+    size_t getNumberOfArguments() const override
+    {
+        return 0;
+    }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    bool isSuitableForConstantFolding() const override { return false; }
+
+    String getName() const override
+    {
+        return name;
+    }
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return DataTypeUInt8().createColumnConst(input_rows_count, 1u);
+    }
+
+};
+
+
+void registerFunctionIndexHint(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionIndexHint>();
+}
+
+}
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index 4b90b7956c5..e3d79c41f5b 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnString.h>
@@ -9,7 +9,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -29,7 +29,7 @@ class FunctionInitializeAggregation : public IFunction
 {
 public:
     static constexpr auto name = "initializeAggregation";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionInitializeAggregation>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionInitializeAggregation>(); }
 
     String getName() const override { return name; }
 
@@ -132,7 +132,7 @@ ColumnPtr FunctionInitializeAggregation::executeImpl(const ColumnsWithTypeAndNam
         }
     }
 
-    SCOPE_EXIT({
+    SCOPE_EXIT_MEMORY_SAFE({
         for (size_t i = 0; i < input_rows_count; ++i)
             agg_func.destroy(places[i]);
     });
diff --git a/src/Functions/intDiv.cpp b/src/Functions/intDiv.cpp
index 804696f2776..14df8af66ca 100644
--- a/src/Functions/intDiv.cpp
+++ b/src/Functions/intDiv.cpp
@@ -1,11 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
 
-#if defined(__SSE2__)
-#    define LIBDIVIDE_SSE2 1
-#endif
-
-#include <libdivide.h>
+#include "divide/divide.h"
 
 
 namespace DB
@@ -43,7 +39,7 @@ struct DivideIntegralByConstantImpl
 
     static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
 
-    static NO_INLINE void vectorConstant(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
+    static void NO_INLINE NO_SANITIZE_UNDEFINED vectorConstant(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
     {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -70,34 +66,11 @@ struct DivideIntegralByConstantImpl
         if (unlikely(static_cast<A>(b) == 0))
             throw Exception("Division by zero", ErrorCodes::ILLEGAL_DIVISION);
 
-        libdivide::divider<A> divider(b);
-
-        const A * a_end = a_pos + size;
-
-#if defined(__SSE2__)
-        static constexpr size_t values_per_sse_register = 16 / sizeof(A);
-        const A * a_end_sse = a_pos + size / values_per_sse_register * values_per_sse_register;
-
-        while (a_pos < a_end_sse)
-        {
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(c_pos),
-                _mm_loadu_si128(reinterpret_cast<const __m128i *>(a_pos)) / divider);
-
-            a_pos += values_per_sse_register;
-            c_pos += values_per_sse_register;
-        }
-#endif
-
-        while (a_pos < a_end)
-        {
-            *c_pos = *a_pos / divider;
-            ++a_pos;
-            ++c_pos;
-        }
+        divideImpl(a_pos, b, c_pos, size);
     }
 };
 
-/** Specializations are specified for dividing numbers of the type UInt64 and UInt32 by the numbers of the same sign.
+/** Specializations are specified for dividing numbers of the type UInt64, UInt32, Int64, Int32 by the numbers of the same sign.
   * Can be expanded to all possible combinations, but more code is needed.
   */
 
diff --git a/src/Functions/isConstant.cpp b/src/Functions/isConstant.cpp
index 09e14226b70..474fb46eed3 100644
--- a/src/Functions/isConstant.cpp
+++ b/src/Functions/isConstant.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
@@ -15,7 +15,7 @@ class FunctionIsConstant : public IFunction
 {
 public:
     static constexpr auto name = "isConstant";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIsConstant>();
     }
diff --git a/src/Functions/isDecimalOverflow.cpp b/src/Functions/isDecimalOverflow.cpp
index 9104b1f1dee..c82845b7cb8 100644
--- a/src/Functions/isDecimalOverflow.cpp
+++ b/src/Functions/isDecimalOverflow.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -28,7 +28,7 @@ class FunctionIsDecimalOverflow : public IFunction
 public:
     static constexpr auto name = "isDecimalOverflow";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIsDecimalOverflow>();
     }
@@ -85,7 +85,7 @@ public:
 
         auto result_column = ColumnUInt8::create();
 
-        auto call = [&](const auto & types) -> bool
+        auto call = [&](const auto & types) -> bool //-V657
         {
             using Types = std::decay_t<decltype(types)>;
             using Type = typename Types::RightType;
diff --git a/src/Functions/isIPAddressContainedIn.cpp b/src/Functions/isIPAddressContainedIn.cpp
index d31e03cb63e..439bf0a893e 100644
--- a/src/Functions/isIPAddressContainedIn.cpp
+++ b/src/Functions/isIPAddressContainedIn.cpp
@@ -5,7 +5,7 @@
 #include <Common/formatIPv6.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <variant>
@@ -125,7 +125,7 @@ namespace DB
     public:
         static constexpr auto name = "isIPAddressInRange";
         String getName() const override { return name; }
-        static FunctionPtr create(const Context &) { return std::make_shared<FunctionIsIPAddressContainedIn>(); }
+        static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionIsIPAddressContainedIn>(); }
 
         ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /* return_type */, size_t input_rows_count) const override
         {
diff --git a/src/Functions/isNotNull.cpp b/src/Functions/isNotNull.cpp
index 104547ac485..a0119bb48c2 100644
--- a/src/Functions/isNotNull.cpp
+++ b/src/Functions/isNotNull.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -19,7 +19,7 @@ class FunctionIsNotNull : public IFunction
 public:
     static constexpr auto name = "isNotNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIsNotNull>();
     }
diff --git a/src/Functions/isNull.cpp b/src/Functions/isNull.cpp
index 35ba6b7b86d..36da85dcdd3 100644
--- a/src/Functions/isNull.cpp
+++ b/src/Functions/isNull.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -18,7 +18,7 @@ class FunctionIsNull : public IFunction
 public:
     static constexpr auto name = "isNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIsNull>();
     }
diff --git a/src/Functions/isValidUTF8.cpp b/src/Functions/isValidUTF8.cpp
index d8c5d3cc580..e3158bb709c 100644
--- a/src/Functions/isValidUTF8.cpp
+++ b/src/Functions/isValidUTF8.cpp
@@ -277,7 +277,7 @@ SOFTWARE.
             len -= 16;
         };
 
-        while (len >= 16) // NOLINT
+        while (len >= 16) // NOLINT //-V1044
             check_packed(_mm_loadu_si128(reinterpret_cast<const __m128i *>(data)));
 
         /// 0 <= len <= 15 for now. Reading data from data - 1 because of right padding of 15 and left padding
diff --git a/src/Functions/isZeroOrNull.cpp b/src/Functions/isZeroOrNull.cpp
index ceaa03dee14..4b863871629 100644
--- a/src/Functions/isZeroOrNull.cpp
+++ b/src/Functions/isZeroOrNull.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/castTypeToEither.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -26,7 +26,7 @@ class FunctionIsZeroOrNull : public IFunction
 public:
     static constexpr auto name = "isZeroOrNull";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionIsZeroOrNull>();
     }
diff --git a/src/Functions/lcm.cpp b/src/Functions/lcm.cpp
index f46e11dfa17..672d47d06b9 100644
--- a/src/Functions/lcm.cpp
+++ b/src/Functions/lcm.cpp
@@ -2,6 +2,9 @@
 #include <Functions/FunctionBinaryArithmetic.h>
 #include <Functions/GCDLCMImpl.h>
 
+#include <boost/integer/common_factor.hpp>
+
+
 namespace
 {
 
@@ -46,7 +49,7 @@ struct LCMImpl : public GCDLCMImpl<A, B, LCMImpl<A, B>, NameLCM>
           * (example: throw an exception or overflow in implementation specific way).
           */
 
-        Unsigned val1 = abs<Int>(a) / std::gcd(Int(a), Int(b));
+        Unsigned val1 = abs<Int>(a) / boost::integer::gcd(Int(a), Int(b));
         Unsigned val2 = abs<Int>(b);
 
         /// Overflow in implementation specific way.
diff --git a/src/Functions/least.cpp b/src/Functions/least.cpp
index ba87e4bd7e4..6ba7989a344 100644
--- a/src/Functions/least.cpp
+++ b/src/Functions/least.cpp
@@ -26,9 +26,13 @@ struct LeastBaseImpl
     static inline llvm::Value * compile(llvm::IRBuilder<> & b, llvm::Value * left, llvm::Value * right, bool is_signed)
     {
         if (!left->getType()->isIntegerTy())
-            /// XXX minnum is basically fmin(), it may or may not match whatever apply() does
+        {
+            /// Follows the IEEE-754 semantics for minNum, except for handling of signaling NaNs. This match’s the behavior of libc fmin.
             return b.CreateMinNum(left, right);
-        return b.CreateSelect(is_signed ? b.CreateICmpSLT(left, right) : b.CreateICmpULT(left, right), left, right);
+        }
+
+        auto * compare_value = is_signed ? b.CreateICmpSLT(left, right) : b.CreateICmpULT(left, right);
+        return b.CreateSelect(compare_value, left, right);
     }
 #endif
 };
diff --git a/src/Functions/likePatternToRegexp.h b/src/Functions/likePatternToRegexp.h
index 4301ad18ee0..0cdaba9a866 100644
--- a/src/Functions/likePatternToRegexp.h
+++ b/src/Functions/likePatternToRegexp.h
@@ -36,18 +36,21 @@ inline String likePatternToRegexp(const String & pattern)
                 res += ".";
                 break;
             case '\\':
-                ++pos;
-                if (pos == end)
+                /// Known escape sequences.
+                if (pos + 1 != end && (pos[1] == '%' || pos[1] == '_'))
+                {
+                    res += pos[1];
+                    ++pos;
+                }
+                else if (pos + 1 != end && pos[1] == '\\')
+                {
                     res += "\\\\";
+                    ++pos;
+                }
                 else
                 {
-                    if (*pos == '%' || *pos == '_')
-                        res += *pos;
-                    else
-                    {
-                        res += '\\';
-                        res += *pos;
-                    }
+                    /// Unknown escape sequence treated literally: as backslash and the following character.
+                    res += "\\\\";
                 }
                 break;
             default:
diff --git a/src/Functions/logTrace.cpp b/src/Functions/logTrace.cpp
index 6f2719588f2..a291a59504f 100644
--- a/src/Functions/logTrace.cpp
+++ b/src/Functions/logTrace.cpp
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 
 #include <common/logger_useful.h>
 
@@ -21,7 +21,7 @@ namespace
     {
     public:
         static constexpr auto name = "logTrace";
-        static FunctionPtr create(const Context &) { return std::make_shared<FunctionLogTrace>(); }
+        static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionLogTrace>(); }
 
         String getName() const override { return name; }
 
diff --git a/src/Functions/lowCardinalityIndices.cpp b/src/Functions/lowCardinalityIndices.cpp
index 67bee2f0d3f..ac7fd45e7b6 100644
--- a/src/Functions/lowCardinalityIndices.cpp
+++ b/src/Functions/lowCardinalityIndices.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeLowCardinality.h>
@@ -21,7 +21,7 @@ class FunctionLowCardinalityIndices: public IFunction
 {
 public:
     static constexpr auto name = "lowCardinalityIndices";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionLowCardinalityIndices>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionLowCardinalityIndices>(); }
 
     String getName() const override { return name; }
 
@@ -35,7 +35,7 @@ public:
     {
         const auto * type = typeid_cast<const DataTypeLowCardinality *>(arguments[0].get());
         if (!type)
-            throw Exception("First first argument of function lowCardinalityIndexes must be ColumnLowCardinality, but got"
+            throw Exception("First first argument of function lowCardinalityIndexes must be ColumnLowCardinality, but got "
                             + arguments[0]->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return std::make_shared<DataTypeUInt64>();
diff --git a/src/Functions/lowCardinalityKeys.cpp b/src/Functions/lowCardinalityKeys.cpp
index a7cb6b45550..2781248d15a 100644
--- a/src/Functions/lowCardinalityKeys.cpp
+++ b/src/Functions/lowCardinalityKeys.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Columns/ColumnLowCardinality.h>
@@ -19,7 +19,7 @@ class FunctionLowCardinalityKeys: public IFunction
 {
 public:
     static constexpr auto name = "lowCardinalityKeys";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionLowCardinalityKeys>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionLowCardinalityKeys>(); }
 
     String getName() const override { return name; }
 
@@ -33,7 +33,7 @@ public:
     {
         const auto * type = typeid_cast<const DataTypeLowCardinality *>(arguments[0].get());
         if (!type)
-            throw Exception("First first argument of function lowCardinalityKeys must be ColumnLowCardinality, but got"
+            throw Exception("First first argument of function lowCardinalityKeys must be ColumnLowCardinality, but got "
                             + arguments[0]->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         return type->getDictionaryType();
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index 7418691e61b..76b57d596cc 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeMap.h>
@@ -34,7 +34,7 @@ class FunctionMap : public IFunction
 public:
     static constexpr auto name = "map";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionMap>();
     }
@@ -146,7 +146,7 @@ class FunctionMapContains : public IFunction
 {
 public:
     static constexpr auto name = NameMapContains::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapContains>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMapContains>(); }
 
     String getName() const override
     {
@@ -209,7 +209,7 @@ class FunctionMapKeys : public IFunction
 {
 public:
     static constexpr auto name = "mapKeys";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapKeys>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMapKeys>(); }
 
     String getName() const override
     {
@@ -256,7 +256,7 @@ class FunctionMapValues : public IFunction
 {
 public:
     static constexpr auto name = "mapValues";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMapValues>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMapValues>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/materialize.h b/src/Functions/materialize.h
index 5b06ac36da7..99b556dfff5 100644
--- a/src/Functions/materialize.h
+++ b/src/Functions/materialize.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 
 namespace DB
@@ -11,7 +11,7 @@ class FunctionMaterialize : public IFunction
 {
 public:
     static constexpr auto name = "materialize";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionMaterialize>();
     }
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index fe215851bb6..115f7a23443 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -43,7 +43,7 @@ struct ModuloByConstantImpl
 
     static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
 
-    static void NO_INLINE vectorConstant(const A * __restrict src, B b, ResultType * __restrict dst, size_t size)
+    static void NO_INLINE NO_SANITIZE_UNDEFINED vectorConstant(const A * __restrict src, B b, ResultType * __restrict dst, size_t size)
     {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-compare"
@@ -78,12 +78,11 @@ struct ModuloByConstantImpl
         if (b < 0)
             b = -b;
 
-        libdivide::divider<A> divider(b);
-
         /// Here we failed to make the SSE variant from libdivide give an advantage.
 
         if (b & (b - 1))
         {
+            libdivide::divider<A> divider(b);
             for (size_t i = 0; i < size; ++i)
                 dst[i] = src[i] - (src[i] / divider) * b; /// NOTE: perhaps, the division semantics with the remainder of negative numbers is not preserved.
         }
@@ -97,6 +96,11 @@ struct ModuloByConstantImpl
     }
 };
 
+template <typename A, typename B>
+struct ModuloLegacyByConstantImpl : ModuloByConstantImpl<A, B>
+{
+    using Op = ModuloLegacyImpl<A, B>;
+};
 }
 
 /** Specializations are specified for dividing numbers of the type UInt64 and UInt32 by the numbers of the same sign.
@@ -135,4 +139,12 @@ void registerFunctionModulo(FunctionFactory & factory)
     factory.registerAlias("mod", "modulo", FunctionFactory::CaseInsensitive);
 }
 
+struct NameModuloLegacy { static constexpr auto name = "moduloLegacy"; };
+using FunctionModuloLegacy = BinaryArithmeticOverloadResolver<ModuloLegacyImpl, NameModuloLegacy, false>;
+
+void registerFunctionModuloLegacy(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionModuloLegacy>();
+}
+
 }
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index 8ca92954873..56399a7f056 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -31,11 +31,11 @@ namespace
 ///
 /// Additionally the arguments, conditions or branches, support nullable types
 /// and the NULL value, with a NULL condition treated as false.
-class FunctionMultiIf final : public FunctionIfBase</*null_is_false=*/true>
+class FunctionMultiIf final : public FunctionIfBase
 {
 public:
     static constexpr auto name = "multiIf";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionMultiIf>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionMultiIf>(); }
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 598e1225877..53c47d3972d 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/castColumn.h>
 
@@ -31,7 +31,7 @@ class FunctionNeighbor : public IFunction
 {
 public:
     static constexpr auto name = "neighbor";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionNeighbor>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionNeighbor>(); }
 
     /// Get the name of the function.
     String getName() const override { return name; }
@@ -178,7 +178,7 @@ public:
 
             for (size_t row = 0; row < input_rows_count; ++row)
             {
-                Int64 offset = offset_column->getInt(offset_is_constant ? 0 : row);
+                Int64 offset = offset_column->getInt(row);
 
                 /// Protection from possible overflow.
                 if (unlikely(offset > (1 << 30) || offset < -(1 << 30)))
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index 5704b5301ca..5cfd5ff4904 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -51,7 +51,7 @@ class FunctionNormalizedQueryHash : public IFunction
 {
 public:
     static constexpr auto name = keep_names ? "normalizedQueryHashKeepNames" : "normalizedQueryHash";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionNormalizedQueryHash>();
     }
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index 79870ace007..9d6569fd5df 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -1,6 +1,6 @@
 #include <DataTypes/DataTypeDateTime.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Core/DecimalFunctions.h>
 #include <Functions/FunctionFactory.h>
 #include <Core/Field.h>
@@ -22,14 +22,14 @@ namespace
 {
 
 /// Get the current time. (It is a constant, it is evaluated once for the entire query.)
-class ExecutableFunctionNow : public IExecutableFunctionImpl
+class ExecutableFunctionNow : public IExecutableFunction
 {
 public:
     explicit ExecutableFunctionNow(time_t time_) : time_value(time_) {}
 
     String getName() const override { return "now"; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeDateTime().createColumnConst(
                 input_rows_count,
@@ -40,7 +40,7 @@ private:
     time_t time_value;
 };
 
-class FunctionBaseNow : public IFunctionBaseImpl
+class FunctionBaseNow : public IFunctionBase
 {
 public:
     explicit FunctionBaseNow(time_t time_, DataTypePtr return_type_) : time_value(time_), return_type(return_type_) {}
@@ -58,7 +58,7 @@ public:
         return return_type;
     }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionNow>(time_value);
     }
@@ -71,7 +71,7 @@ private:
     DataTypePtr return_type;
 };
 
-class NowOverloadResolver : public IFunctionOverloadResolverImpl
+class NowOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = "now";
@@ -83,9 +83,9 @@ public:
     bool isVariadic() const override { return true; }
 
     size_t getNumberOfArguments() const override { return 0; }
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<NowOverloadResolver>(); }
+    static FunctionOverloadResolverPtr create(ContextConstPtr) { return std::make_unique<NowOverloadResolver>(); }
 
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() > 1)
         {
@@ -103,7 +103,7 @@ public:
         return std::make_shared<DataTypeDateTime>();
     }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override
     {
         if (arguments.size() > 1)
         {
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index 32c7a95de17..b31a78bf0a7 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -3,6 +3,7 @@
 #include <Core/DecimalFunctions.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <DataTypes/DataTypeNullable.h>
 
 #include <Common/assert_cast.h>
@@ -47,14 +48,14 @@ Field nowSubsecond(UInt32 scale)
 }
 
 /// Get the current time. (It is a constant, it is evaluated once for the entire query.)
-class ExecutableFunctionNow64 : public IExecutableFunctionImpl
+class ExecutableFunctionNow64 : public IExecutableFunction
 {
 public:
     explicit ExecutableFunctionNow64(Field time_) : time_value(time_) {}
 
     String getName() const override { return "now64"; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
         return result_type->createColumnConst(input_rows_count, time_value);
     }
@@ -63,7 +64,7 @@ private:
     Field time_value;
 };
 
-class FunctionBaseNow64 : public IFunctionBaseImpl
+class FunctionBaseNow64 : public IFunctionBase
 {
 public:
     explicit FunctionBaseNow64(Field time_, DataTypePtr return_type_) : time_value(time_), return_type(return_type_) {}
@@ -81,7 +82,7 @@ public:
         return return_type;
     }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionNow64>(time_value);
     }
@@ -94,7 +95,7 @@ private:
     DataTypePtr return_type;
 };
 
-class Now64OverloadResolver : public IFunctionOverloadResolverImpl
+class Now64OverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = "now64";
@@ -106,17 +107,18 @@ public:
     bool isVariadic() const override { return true; }
 
     size_t getNumberOfArguments() const override { return 0; }
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<Now64OverloadResolver>(); }
+    static FunctionOverloadResolverPtr create(ContextConstPtr) { return std::make_unique<Now64OverloadResolver>(); }
 
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         UInt32 scale = DataTypeDateTime64::default_scale;
+        String timezone_name;
 
-        if (arguments.size() > 1)
+        if (arguments.size() > 2)
         {
-            throw Exception("Arguments size of function " + getName() + " should be 0 or 1", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+            throw Exception("Arguments size of function " + getName() + " should be 0, or 1, or 2", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
         }
-        if (arguments.size() == 1)
+        if (!arguments.empty())
         {
             const auto & argument = arguments[0];
             if (!isInteger(argument.type) || !argument.column || !isColumnConst(*argument.column))
@@ -128,11 +130,15 @@ public:
 
             scale = argument.column->get64(0);
         }
+        if (arguments.size() == 2)
+        {
+            timezone_name = extractTimeZoneNameFromFunctionArguments(arguments, 1, 0);
+        }
 
-        return std::make_shared<DataTypeDateTime64>(scale);
+        return std::make_shared<DataTypeDateTime64>(scale, timezone_name);
     }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr & result_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type) const override
     {
         UInt32 scale = DataTypeDateTime64::default_scale;
         auto res_type = removeNullable(result_type);
diff --git a/src/Functions/nullIf.cpp b/src/Functions/nullIf.cpp
index 200425a7b83..8f69ef4f550 100644
--- a/src/Functions/nullIf.cpp
+++ b/src/Functions/nullIf.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -18,16 +18,16 @@ namespace
 class FunctionNullIf : public IFunction
 {
 private:
-    const Context & context;
+    ContextConstPtr context;
 public:
     static constexpr auto name = "nullIf";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionNullIf>(context);
     }
 
-    explicit FunctionNullIf(const Context & context_) : context(context_) {}
+    explicit FunctionNullIf(ContextConstPtr context_) : context(context_) {}
 
     std::string getName() const override
     {
diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
index 39d6f1aff84..f33467e6752 100644
--- a/src/Functions/partitionId.cpp
+++ b/src/Functions/partitionId.cpp
@@ -3,7 +3,7 @@
 #include <Core/Block.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Storages/MergeTree/MergeTreePartition.h>
 
 
@@ -23,7 +23,7 @@ class FunctionPartitionId : public IFunction
 public:
     static constexpr auto name = "partitionId";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionPartitionId>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionPartitionId>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index 4edd400d55d..06eae802864 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -3,7 +3,7 @@
 #include <Columns/ColumnConst.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <ext/range.h>
@@ -39,7 +39,7 @@ class FunctionPointInEllipses : public IFunction
 {
 public:
     static constexpr auto name = "pointInEllipses";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionPointInEllipses>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionPointInEllipses>(); }
 
 private:
 
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index 8e4a05bdec5..82e69c468cc 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -60,10 +60,10 @@ public:
 
     explicit FunctionPointInPolygon(bool validate_) : validate(validate_) {}
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionPointInPolygon<PointInConstPolygonImpl>>(
-            context.getSettingsRef().validate_polygons);
+            context->getSettingsRef().validate_polygons);
     }
 
     String getName() const override
diff --git a/src/Functions/polygonArea.cpp b/src/Functions/polygonArea.cpp
index 7de0869609e..07e0f922ae0 100644
--- a/src/Functions/polygonArea.cpp
+++ b/src/Functions/polygonArea.cpp
@@ -34,7 +34,7 @@ public:
 
     explicit FunctionPolygonArea() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonArea>();
     }
diff --git a/src/Functions/polygonConvexHull.cpp b/src/Functions/polygonConvexHull.cpp
index f445b4e4072..b84e327ac81 100644
--- a/src/Functions/polygonConvexHull.cpp
+++ b/src/Functions/polygonConvexHull.cpp
@@ -33,7 +33,7 @@ public:
 
     explicit FunctionPolygonConvexHull() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonConvexHull>();
     }
diff --git a/src/Functions/polygonPerimeter.cpp b/src/Functions/polygonPerimeter.cpp
index e361fa2a387..11bb5488fd9 100644
--- a/src/Functions/polygonPerimeter.cpp
+++ b/src/Functions/polygonPerimeter.cpp
@@ -33,7 +33,7 @@ public:
 
     explicit FunctionPolygonPerimeter() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonPerimeter>();
     }
diff --git a/src/Functions/polygonsDistance.cpp b/src/Functions/polygonsDistance.cpp
index 074fb5a9798..d92a1931f2b 100644
--- a/src/Functions/polygonsDistance.cpp
+++ b/src/Functions/polygonsDistance.cpp
@@ -35,7 +35,7 @@ public:
 
     explicit FunctionPolygonsDistance() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonsDistance>();
     }
diff --git a/src/Functions/polygonsEquals.cpp b/src/Functions/polygonsEquals.cpp
index 12f4cf09fa5..c14f9a18980 100644
--- a/src/Functions/polygonsEquals.cpp
+++ b/src/Functions/polygonsEquals.cpp
@@ -34,7 +34,7 @@ public:
 
     explicit FunctionPolygonsEquals() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonsEquals>();
     }
diff --git a/src/Functions/polygonsIntersection.cpp b/src/Functions/polygonsIntersection.cpp
index 8eaf6b97b2b..5676323a08a 100644
--- a/src/Functions/polygonsIntersection.cpp
+++ b/src/Functions/polygonsIntersection.cpp
@@ -34,7 +34,7 @@ public:
 
     explicit FunctionPolygonsIntersection() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonsIntersection>();
     }
diff --git a/src/Functions/polygonsSymDifference.cpp b/src/Functions/polygonsSymDifference.cpp
index a7bdf0af32f..991d66a2802 100644
--- a/src/Functions/polygonsSymDifference.cpp
+++ b/src/Functions/polygonsSymDifference.cpp
@@ -34,7 +34,7 @@ public:
 
     explicit FunctionPolygonsSymDifference() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonsSymDifference>();
     }
diff --git a/src/Functions/polygonsUnion.cpp b/src/Functions/polygonsUnion.cpp
index 834629f90ad..9a9bfc9acfe 100644
--- a/src/Functions/polygonsUnion.cpp
+++ b/src/Functions/polygonsUnion.cpp
@@ -34,7 +34,7 @@ public:
 
     explicit FunctionPolygonsUnion() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonsUnion>();
     }
diff --git a/src/Functions/polygonsWithin.cpp b/src/Functions/polygonsWithin.cpp
index 68db1494a0d..45fc06d4fbe 100644
--- a/src/Functions/polygonsWithin.cpp
+++ b/src/Functions/polygonsWithin.cpp
@@ -36,7 +36,7 @@ public:
 
     explicit FunctionPolygonsWithin() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionPolygonsWithin>();
     }
diff --git a/src/Functions/randConstant.cpp b/src/Functions/randConstant.cpp
index acc178ae974..13a07050717 100644
--- a/src/Functions/randConstant.cpp
+++ b/src/Functions/randConstant.cpp
@@ -13,7 +13,7 @@ namespace
 {
 
 template <typename ToType, typename Name>
-class ExecutableFunctionRandomConstant : public IExecutableFunctionImpl
+class ExecutableFunctionRandomConstant : public IExecutableFunction
 {
 public:
     explicit ExecutableFunctionRandomConstant(ToType value_) : value(value_) {}
@@ -22,7 +22,7 @@ public:
 
 bool useDefaultImplementationForNulls() const override { return false; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeNumber<ToType>().createColumnConst(input_rows_count, value);
     }
@@ -32,7 +32,7 @@ private:
 };
 
 template <typename ToType, typename Name>
-class FunctionBaseRandomConstant : public IFunctionBaseImpl
+class FunctionBaseRandomConstant : public IFunctionBase
 {
 public:
     explicit FunctionBaseRandomConstant(ToType value_, DataTypes argument_types_, DataTypePtr return_type_)
@@ -52,7 +52,7 @@ public:
         return return_type;
     }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionRandomConstant<ToType, Name>>(value);
     }
@@ -67,7 +67,7 @@ private:
 };
 
 template <typename ToType, typename Name>
-class RandomConstantOverloadResolver : public IFunctionOverloadResolverImpl
+class RandomConstantOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = Name::name;
@@ -79,12 +79,12 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
-    static FunctionOverloadResolverImplPtr create(const Context &)
+    static FunctionOverloadResolverPtr create(ContextConstPtr)
     {
         return std::make_unique<RandomConstantOverloadResolver<ToType, Name>>();
     }
 
-    DataTypePtr getReturnType(const DataTypes & data_types) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & data_types) const override
     {
         size_t number_of_arguments = data_types.size();
         if (number_of_arguments > 1)
@@ -94,7 +94,7 @@ public:
         return std::make_shared<DataTypeNumber<ToType>>();
     }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         DataTypes argument_types;
 
diff --git a/src/Functions/randomFixedString.cpp b/src/Functions/randomFixedString.cpp
index 2e493ddb43d..2a60f8dd88d 100644
--- a/src/Functions/randomFixedString.cpp
+++ b/src/Functions/randomFixedString.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeFixedString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/PerformanceAdaptors.h>
 #include <Functions/FunctionsRandom.h>
 #include <pcg_random.hpp>
@@ -77,7 +77,7 @@ public:
 class FunctionRandomFixedString : public FunctionRandomFixedStringImpl<TargetSpecific::Default::RandImpl>
 {
 public:
-    explicit FunctionRandomFixedString(const Context & context) : selector(context)
+    explicit FunctionRandomFixedString(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             FunctionRandomFixedStringImpl<TargetSpecific::Default::RandImpl>>();
@@ -93,7 +93,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionRandomFixedString>(context);
     }
diff --git a/src/Functions/randomPrintableASCII.cpp b/src/Functions/randomPrintableASCII.cpp
index ce7f809c151..d27772e28fb 100644
--- a/src/Functions/randomPrintableASCII.cpp
+++ b/src/Functions/randomPrintableASCII.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnString.h>
@@ -27,7 +27,7 @@ class FunctionRandomPrintableASCII : public IFunction
 {
 public:
     static constexpr auto name = "randomPrintableASCII";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRandomPrintableASCII>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionRandomPrintableASCII>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/randomString.cpp b/src/Functions/randomString.cpp
index f51a75c0422..680b01b9d08 100644
--- a/src/Functions/randomString.cpp
+++ b/src/Functions/randomString.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionsRandom.h>
 #include <Functions/PerformanceAdaptors.h>
 #include <pcg_random.hpp>
@@ -97,7 +97,7 @@ public:
 class FunctionRandomString : public FunctionRandomStringImpl<TargetSpecific::Default::RandImpl>
 {
 public:
-    explicit FunctionRandomString(const Context & context) : selector(context)
+    explicit FunctionRandomString(ContextConstPtr context) : selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
             FunctionRandomStringImpl<TargetSpecific::Default::RandImpl>>();
@@ -113,7 +113,7 @@ public:
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionRandomString>(context);
     }
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 163092226f2..48c828d2444 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <pcg_random.hpp>
 #include <Common/UTF8Helpers.h>
 #include <Common/randomSeed.h>
@@ -30,7 +30,7 @@ class FunctionRandomStringUTF8 : public IFunction
 public:
     static constexpr auto name = "randomStringUTF8";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRandomStringUTF8>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionRandomStringUTF8>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/readWkt.cpp b/src/Functions/readWkt.cpp
index 47312be2aa0..26bb13a2e93 100644
--- a/src/Functions/readWkt.cpp
+++ b/src/Functions/readWkt.cpp
@@ -68,7 +68,7 @@ public:
         return true;
     }
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionReadWkt<DataTypeName, Geometry, Serializer, NameHolder>>();
     }
diff --git a/src/Functions/regexpQuoteMeta.cpp b/src/Functions/regexpQuoteMeta.cpp
index a5ab5166fe3..cae2fdc1323 100644
--- a/src/Functions/regexpQuoteMeta.cpp
+++ b/src/Functions/regexpQuoteMeta.cpp
@@ -21,7 +21,7 @@ class FunctionRegexpQuoteMeta : public IFunction
 public:
     static constexpr auto name = "regexpQuoteMeta";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionRegexpQuoteMeta>();
     }
diff --git a/src/Functions/registerFunctions.cpp b/src/Functions/registerFunctions.cpp
index d827cc40a86..6db0f9183b2 100644
--- a/src/Functions/registerFunctions.cpp
+++ b/src/Functions/registerFunctions.cpp
@@ -45,6 +45,7 @@ void registerFunctionsUnixTimestamp64(FunctionFactory & factory);
 void registerFunctionBitHammingDistance(FunctionFactory & factory);
 void registerFunctionTupleHammingDistance(FunctionFactory & factory);
 void registerFunctionsStringHash(FunctionFactory & factory);
+void registerFunctionValidateNestedArraySizes(FunctionFactory & factory);
 #if !defined(ARCADIA_BUILD)
 void registerFunctionBayesAB(FunctionFactory &);
 #endif
@@ -103,6 +104,7 @@ void registerFunctions()
     registerFunctionBitHammingDistance(factory);
     registerFunctionTupleHammingDistance(factory);
     registerFunctionsStringHash(factory);
+    registerFunctionValidateNestedArraySizes(factory);
 
 #if !defined(ARCADIA_BUILD)
     registerFunctionBayesAB(factory);
diff --git a/src/Functions/registerFunctionsArithmetic.cpp b/src/Functions/registerFunctionsArithmetic.cpp
index 8971462593c..857f370fde3 100644
--- a/src/Functions/registerFunctionsArithmetic.cpp
+++ b/src/Functions/registerFunctionsArithmetic.cpp
@@ -11,6 +11,7 @@ void registerFunctionIntDiv(FunctionFactory & factory);
 void registerFunctionIntDivOrZero(FunctionFactory & factory);
 void registerFunctionModulo(FunctionFactory & factory);
 void registerFunctionModuloOrZero(FunctionFactory & factory);
+void registerFunctionModuloLegacy(FunctionFactory & factory);
 void registerFunctionNegate(FunctionFactory & factory);
 void registerFunctionAbs(FunctionFactory & factory);
 void registerFunctionBitAnd(FunctionFactory & factory);
@@ -51,6 +52,7 @@ void registerFunctionsArithmetic(FunctionFactory & factory)
     registerFunctionIntDivOrZero(factory);
     registerFunctionModulo(factory);
     registerFunctionModuloOrZero(factory);
+    registerFunctionModuloLegacy(factory);
     registerFunctionNegate(factory);
     registerFunctionAbs(factory);
     registerFunctionBitAnd(factory);
diff --git a/src/Functions/registerFunctionsMiscellaneous.cpp b/src/Functions/registerFunctionsMiscellaneous.cpp
index d00d4a42db0..3403390ea72 100644
--- a/src/Functions/registerFunctionsMiscellaneous.cpp
+++ b/src/Functions/registerFunctionsMiscellaneous.cpp
@@ -28,6 +28,7 @@ void registerFunctionSleep(FunctionFactory &);
 void registerFunctionSleepEachRow(FunctionFactory &);
 void registerFunctionMaterialize(FunctionFactory &);
 void registerFunctionIgnore(FunctionFactory &);
+void registerFunctionIndexHint(FunctionFactory &);
 void registerFunctionIdentity(FunctionFactory &);
 void registerFunctionArrayJoin(FunctionFactory &);
 void registerFunctionReplicate(FunctionFactory &);
@@ -101,6 +102,7 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionSleepEachRow(factory);
     registerFunctionMaterialize(factory);
     registerFunctionIgnore(factory);
+    registerFunctionIndexHint(factory);
     registerFunctionIdentity(factory);
     registerFunctionArrayJoin(factory);
     registerFunctionReplicate(factory);
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 3f4ba3d23e1..d007e479c04 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -47,7 +47,7 @@ class FunctionReinterpret : public IFunction
 public:
     static constexpr auto name = "reinterpret";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionReinterpret>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionReinterpret>(); }
 
     String getName() const override { return name; }
 
@@ -349,7 +349,7 @@ class FunctionReinterpretAs : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionReinterpretAs>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionReinterpretAs>(); }
 
     String getName() const override { return name; }
 
@@ -409,6 +409,7 @@ struct NameReinterpretAsUInt8       { static constexpr auto name = "reinterpretA
 struct NameReinterpretAsUInt16      { static constexpr auto name = "reinterpretAsUInt16"; };
 struct NameReinterpretAsUInt32      { static constexpr auto name = "reinterpretAsUInt32"; };
 struct NameReinterpretAsUInt64      { static constexpr auto name = "reinterpretAsUInt64"; };
+struct NameReinterpretAsUInt128     { static constexpr auto name = "reinterpretAsUInt128"; };
 struct NameReinterpretAsUInt256     { static constexpr auto name = "reinterpretAsUInt256"; };
 struct NameReinterpretAsInt8        { static constexpr auto name = "reinterpretAsInt8"; };
 struct NameReinterpretAsInt16       { static constexpr auto name = "reinterpretAsInt16"; };
@@ -428,6 +429,7 @@ using FunctionReinterpretAsUInt8 = FunctionReinterpretAs<DataTypeUInt8, NameRein
 using FunctionReinterpretAsUInt16 = FunctionReinterpretAs<DataTypeUInt16, NameReinterpretAsUInt16>;
 using FunctionReinterpretAsUInt32 = FunctionReinterpretAs<DataTypeUInt32, NameReinterpretAsUInt32>;
 using FunctionReinterpretAsUInt64 = FunctionReinterpretAs<DataTypeUInt64, NameReinterpretAsUInt64>;
+using FunctionReinterpretAsUInt128 = FunctionReinterpretAs<DataTypeUInt128, NameReinterpretAsUInt128>;
 using FunctionReinterpretAsUInt256 = FunctionReinterpretAs<DataTypeUInt256, NameReinterpretAsUInt256>;
 using FunctionReinterpretAsInt8 = FunctionReinterpretAs<DataTypeInt8, NameReinterpretAsInt8>;
 using FunctionReinterpretAsInt16 = FunctionReinterpretAs<DataTypeInt16, NameReinterpretAsInt16>;
@@ -453,6 +455,7 @@ void registerFunctionsReinterpretAs(FunctionFactory & factory)
     factory.registerFunction<FunctionReinterpretAsUInt16>();
     factory.registerFunction<FunctionReinterpretAsUInt32>();
     factory.registerFunction<FunctionReinterpretAsUInt64>();
+    factory.registerFunction<FunctionReinterpretAsUInt128>();
     factory.registerFunction<FunctionReinterpretAsUInt256>();
     factory.registerFunction<FunctionReinterpretAsInt8>();
     factory.registerFunction<FunctionReinterpretAsInt16>();
diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index 29347d6a275..e87a51b807d 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/castTypeToEither.h>
 
 
@@ -173,7 +173,7 @@ class FunctionRepeat : public IFunction
 
 public:
     static constexpr auto name = "repeat";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionRepeat>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionRepeat>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/replicate.cpp b/src/Functions/replicate.cpp
index ca391bec6ce..5f6f187031f 100644
--- a/src/Functions/replicate.cpp
+++ b/src/Functions/replicate.cpp
@@ -1,9 +1,10 @@
 #include <Functions/replicate.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Columns/ColumnArray.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -54,7 +55,7 @@ ColumnPtr FunctionReplicate::executeImpl(const ColumnsWithTypeAndName & argument
             offsets = array_column->getOffsetsPtr();
     }
 
-    const auto & offsets_data = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets).getData();
+    const auto & offsets_data = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets).getData(); /// NOLINT
     return ColumnArray::create(first_column->replicate(offsets_data)->convertToFullColumnIfConst(), offsets);
 }
 
diff --git a/src/Functions/replicate.h b/src/Functions/replicate.h
index 9a33951b2a3..4493d132002 100644
--- a/src/Functions/replicate.h
+++ b/src/Functions/replicate.h
@@ -1,11 +1,11 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
-class Context;
-
 /// Creates an array, multiplying the column (the first argument) by the number of elements in the array (the second argument).
 /// Function may accept more then two arguments. If so, the first array with non-empty offsets is chosen.
 class FunctionReplicate : public IFunction
@@ -13,7 +13,7 @@ class FunctionReplicate : public IFunction
 public:
     static constexpr auto name = "replicate";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionReplicate>();
     }
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index 16676eaa936..49ce3a214e3 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -57,7 +57,7 @@ class FunctionReverse : public IFunction
 {
 public:
     static constexpr auto name = "reverse";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionReverse>();
     }
@@ -113,35 +113,35 @@ public:
 
 
 /// Also works with arrays.
-class ReverseOverloadResolver : public IFunctionOverloadResolverImpl
+class ReverseOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = "reverse";
-    static FunctionOverloadResolverImplPtr create(const Context & context) { return std::make_unique<ReverseOverloadResolver>(context); }
+    static FunctionOverloadResolverPtr create(ContextConstPtr context) { return std::make_unique<ReverseOverloadResolver>(context); }
 
-    explicit ReverseOverloadResolver(const Context & context_) : context(context_) {}
+    explicit ReverseOverloadResolver(ContextConstPtr context_) : context(context_) {}
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         if (isArray(arguments.at(0).type))
-            return FunctionOverloadResolverAdaptor(FunctionFactory::instance().getImpl("arrayReverse", context)).buildImpl(arguments);
+            return FunctionFactory::instance().getImpl("arrayReverse", context)->build(arguments);
         else
-            return std::make_unique<DefaultFunction>(
+            return std::make_unique<FunctionToFunctionBaseAdaptor>(
                 FunctionReverse::create(context),
                 ext::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }),
                 return_type);
     }
 
-    DataTypePtr getReturnType(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         return arguments.at(0);
     }
 
 private:
-    const Context & context;
+    ContextConstPtr context;
 };
 
 }
diff --git a/src/Functions/roundToExp2.cpp b/src/Functions/roundToExp2.cpp
index 50a548e095e..2abe94b2b26 100644
--- a/src/Functions/roundToExp2.cpp
+++ b/src/Functions/roundToExp2.cpp
@@ -27,18 +27,6 @@ roundDownToPowerOfTwo(T x)
     return x <= 0 ? 0 : (T(1) << (63 - __builtin_clzll(x)));
 }
 
-template <typename T>
-inline std::enable_if_t<std::is_same_v<T, Int128>, T>
-roundDownToPowerOfTwo(T x)
-{
-    if (x <= 0)
-        return 0;
-
-    if (Int64 x64 = Int64(x >> 64))
-        return Int128(roundDownToPowerOfTwo(x64)) << 64;
-    return roundDownToPowerOfTwo(Int64(x));
-}
-
 template <typename T>
 inline std::enable_if_t<std::is_same_v<T, Float32>, T>
 roundDownToPowerOfTwo(T x)
diff --git a/src/Functions/rowNumberInAllBlocks.cpp b/src/Functions/rowNumberInAllBlocks.cpp
index 3aeaade7137..85211d9e740 100644
--- a/src/Functions/rowNumberInAllBlocks.cpp
+++ b/src/Functions/rowNumberInAllBlocks.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -18,7 +18,7 @@ private:
 
 public:
     static constexpr auto name = "rowNumberInAllBlocks";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionRowNumberInAllBlocks>();
     }
diff --git a/src/Functions/rowNumberInBlock.cpp b/src/Functions/rowNumberInBlock.cpp
index 0a5cf63041f..e924207a6d1 100644
--- a/src/Functions/rowNumberInBlock.cpp
+++ b/src/Functions/rowNumberInBlock.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -13,7 +13,7 @@ class FunctionRowNumberInBlock : public IFunction
 {
 public:
     static constexpr auto name = "rowNumberInBlock";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionRowNumberInBlock>();
     }
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index 1a01b88e22c..b17faf9c031 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -1,11 +1,11 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/Arena.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 
 namespace DB
@@ -33,7 +33,7 @@ class FunctionRunningAccumulate : public IFunction
 {
 public:
     static constexpr auto name = "runningAccumulate";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionRunningAccumulate>();
     }
@@ -104,7 +104,7 @@ public:
         const auto & states = column_with_states->getData();
 
         bool state_created = false;
-        SCOPE_EXIT({
+        SCOPE_EXIT_MEMORY_SAFE({
             if (state_created)
                 agg_func.destroy(place.data());
         });
@@ -120,8 +120,8 @@ public:
                     state_created = false;
                 }
 
-                agg_func.create(place.data());
-                state_created = true;
+                agg_func.create(place.data()); /// This function can throw.
+                state_created = true; //-V519
             }
 
             agg_func.merge(place.data(), state_to_add, arena.get());
diff --git a/src/Functions/runningConcurrency.cpp b/src/Functions/runningConcurrency.cpp
index e8be7b9c200..6f842bcc342 100644
--- a/src/Functions/runningConcurrency.cpp
+++ b/src/Functions/runningConcurrency.cpp
@@ -8,7 +8,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Formats/FormatSettings.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <IO/WriteBufferFromString.h>
 #include <common/defines.h>
 #include <set>
@@ -23,7 +23,7 @@ namespace DB
     }
 
     template <typename Name, typename ArgDataType, typename ConcurrencyDataType>
-    class ExecutableFunctionRunningConcurrency : public IExecutableFunctionImpl
+    class ExecutableFunctionRunningConcurrency : public IExecutableFunction
     {
     public:
         String getName() const override
@@ -31,7 +31,7 @@ namespace DB
             return Name::name;
         }
 
-        ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
         {
             using ColVecArg = typename ArgDataType::ColumnType;
             const ColVecArg * col_begin = checkAndGetColumn<ColVecArg>(arguments[0].column.get());
@@ -87,7 +87,7 @@ namespace DB
     };
 
     template <typename Name, typename ArgDataType, typename ConcurrencyDataType>
-    class FunctionBaseRunningConcurrency : public IFunctionBaseImpl
+    class FunctionBaseRunningConcurrency : public IFunctionBase
     {
     public:
         explicit FunctionBaseRunningConcurrency(DataTypes argument_types_, DataTypePtr return_type_)
@@ -109,7 +109,7 @@ namespace DB
             return return_type;
         }
 
-        ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+        ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
         {
             return std::make_unique<ExecutableFunctionRunningConcurrency<Name, ArgDataType, ConcurrencyDataType>>();
         }
@@ -125,7 +125,7 @@ namespace DB
     };
 
     template <typename Name, typename ConcurrencyDataType>
-    class RunningConcurrencyOverloadResolver : public IFunctionOverloadResolverImpl
+    class RunningConcurrencyOverloadResolver : public IFunctionOverloadResolver
     {
         template <typename T>
         struct TypeTag
@@ -154,7 +154,7 @@ namespace DB
     public:
         static constexpr auto name = Name::name;
 
-        static FunctionOverloadResolverImplPtr create(const Context &)
+        static FunctionOverloadResolverPtr create(ContextConstPtr)
         {
             return std::make_unique<RunningConcurrencyOverloadResolver<Name, ConcurrencyDataType>>();
         }
@@ -164,7 +164,7 @@ namespace DB
             return Name::name;
         }
 
-        FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+        FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
         {
             // The type of the second argument must match with that of the first one.
             if (unlikely(!arguments[1].type->equals(*(arguments[0].type))))
@@ -175,7 +175,7 @@ namespace DB
             }
 
             DataTypes argument_types = { arguments[0].type, arguments[1].type };
-            FunctionBaseImplPtr base;
+            FunctionBasePtr base;
             dispatchForSourceType(*(arguments[0].type), [&](auto arg_type_tag) // Throws when the type is inappropriate.
             {
                 using Tag = decltype(arg_type_tag);
@@ -187,7 +187,7 @@ namespace DB
             return base;
         }
 
-        DataTypePtr getReturnType(const DataTypes &) const override
+        DataTypePtr getReturnTypeImpl(const DataTypes &) const override
         {
             return std::make_shared<ConcurrencyDataType>();
         }
diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index db32b5f9a3f..41a418b9b58 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
@@ -124,7 +124,7 @@ private:
 public:
     static constexpr auto name = FunctionRunningDifferenceName<is_first_line_zero>::name;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionRunningDifferenceImpl<is_first_line_zero>>();
     }
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index 3c03f4e1f2e..8e2964c1859 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -1,7 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionUnaryArithmetic.h>
 #include <DataTypes/NumberTraits.h>
-#include <Common/FieldVisitors.h>
+
 
 namespace DB
 {
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 65566e36d1f..16b3973cdc2 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <unistd.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnConst.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -8,6 +8,7 @@
 #include <Common/assert_cast.h>
 #include <common/sleep.h>
 #include <IO/WriteHelpers.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -35,7 +36,7 @@ class FunctionSleep : public IFunction
 {
 public:
     static constexpr auto name = variant == FunctionSleepVariant::PerBlock ? "sleep" : "sleepEachRow";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionSleep<variant>>();
     }
diff --git a/src/Functions/stringToH3.cpp b/src/Functions/stringToH3.cpp
index 575382ec40f..97f9ba3f2ab 100644
--- a/src/Functions/stringToH3.cpp
+++ b/src/Functions/stringToH3.cpp
@@ -34,7 +34,7 @@ class FunctionStringToH3 : public IFunction
 public:
     static constexpr auto name = "stringToH3";
 
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionStringToH3>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionStringToH3>(); }
 
     std::string getName() const override { return name; }
 
diff --git a/src/Functions/substring.cpp b/src/Functions/substring.cpp
index 3fe82b5e0b0..13f0e296602 100644
--- a/src/Functions/substring.cpp
+++ b/src/Functions/substring.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnConst.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/GatherUtils/GatherUtils.h>
 #include <Functions/GatherUtils/Sources.h>
 #include <Functions/GatherUtils/Sinks.h>
@@ -36,7 +36,7 @@ class FunctionSubstring : public IFunction
 {
 public:
     static constexpr auto name = is_utf8 ? "substringUTF8" : "substring";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionSubstring>();
     }
diff --git a/src/Functions/subtractDays.cpp b/src/Functions/subtractDays.cpp
index 6c675dbd08f..21966a15311 100644
--- a/src/Functions/subtractDays.cpp
+++ b/src/Functions/subtractDays.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/subtractHours.cpp b/src/Functions/subtractHours.cpp
index cfaf9fa692a..e71c9d74a01 100644
--- a/src/Functions/subtractHours.cpp
+++ b/src/Functions/subtractHours.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/subtractMinutes.cpp b/src/Functions/subtractMinutes.cpp
index 3141db6b043..ba9d593a64d 100644
--- a/src/Functions/subtractMinutes.cpp
+++ b/src/Functions/subtractMinutes.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/subtractMonths.cpp b/src/Functions/subtractMonths.cpp
index 35a60874ec0..64eeba2ce86 100644
--- a/src/Functions/subtractMonths.cpp
+++ b/src/Functions/subtractMonths.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/subtractQuarters.cpp b/src/Functions/subtractQuarters.cpp
index 9d2f4a81c4e..6c066ed17a1 100644
--- a/src/Functions/subtractQuarters.cpp
+++ b/src/Functions/subtractQuarters.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/subtractSeconds.cpp b/src/Functions/subtractSeconds.cpp
index 2a13ddd2820..81a7f7e2df1 100644
--- a/src/Functions/subtractSeconds.cpp
+++ b/src/Functions/subtractSeconds.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/subtractWeeks.cpp b/src/Functions/subtractWeeks.cpp
index c4dfd9253e1..55b52043dd0 100644
--- a/src/Functions/subtractWeeks.cpp
+++ b/src/Functions/subtractWeeks.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/subtractYears.cpp b/src/Functions/subtractYears.cpp
index 3b5a57435a0..241142722d5 100644
--- a/src/Functions/subtractYears.cpp
+++ b/src/Functions/subtractYears.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionDateOrDateTimeAddInterval.h>
 
diff --git a/src/Functions/svg.cpp b/src/Functions/svg.cpp
index d8a16af1e1d..4d0edaf004b 100644
--- a/src/Functions/svg.cpp
+++ b/src/Functions/svg.cpp
@@ -24,7 +24,7 @@ public:
 
     explicit FunctionSvg() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionSvg>();
     }
diff --git a/src/Functions/tcpPort.cpp b/src/Functions/tcpPort.cpp
index 26991c900ab..baacdb0a335 100644
--- a/src/Functions/tcpPort.cpp
+++ b/src/Functions/tcpPort.cpp
@@ -14,9 +14,9 @@ class FunctionTcpPort : public IFunction
 public:
     static constexpr auto name = "tcpPort";
 
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<FunctionTcpPort>(context.getTCPPort());
+        return std::make_shared<FunctionTcpPort>(context->getTCPPort());
     }
 
     explicit FunctionTcpPort(UInt16 port_) : port(port_)
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index f74ab29186a..a3285f64c73 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Columns/ColumnString.h>
@@ -26,7 +26,7 @@ class FunctionThrowIf : public IFunction
 {
 public:
     static constexpr auto name = "throwIf";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionThrowIf>();
     }
diff --git a/src/Functions/tid.cpp b/src/Functions/tid.cpp
index 44321deb15f..6f2eb3cc595 100644
--- a/src/Functions/tid.cpp
+++ b/src/Functions/tid.cpp
@@ -1,7 +1,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 
 #include <common/getThreadId.h>
 
@@ -13,7 +13,7 @@ namespace
     {
     public:
         static constexpr auto name = "tid";
-        static FunctionPtr create(const Context &) { return std::make_shared<FunctionTid>(); }
+        static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionTid>(); }
 
         String getName() const override { return name; }
 
diff --git a/src/Functions/timeSlot.cpp b/src/Functions/timeSlot.cpp
index 894673495ee..afe99c86eb2 100644
--- a/src/Functions/timeSlot.cpp
+++ b/src/Functions/timeSlot.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionDateOrDateTimeToSomething.h>
diff --git a/src/Functions/timeSlots.cpp b/src/Functions/timeSlots.cpp
index ef5902eba11..4f8882a83ad 100644
--- a/src/Functions/timeSlots.cpp
+++ b/src/Functions/timeSlots.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnsNumber.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
@@ -109,7 +109,7 @@ class FunctionTimeSlots : public IFunction
 public:
     static constexpr auto name = "timeSlots";
     static constexpr UInt32 TIME_SLOT_SIZE = 1800;
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionTimeSlots>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionTimeSlots>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/timezone.cpp b/src/Functions/timezone.cpp
index 2cd0c28612b..c0d136ab7d4 100644
--- a/src/Functions/timezone.cpp
+++ b/src/Functions/timezone.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <common/DateLUT.h>
 #include <Core/Field.h>
@@ -16,7 +16,7 @@ class FunctionTimezone : public IFunction
 {
 public:
     static constexpr auto name = "timezone";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionTimezone>();
     }
diff --git a/src/Functions/timezoneOf.cpp b/src/Functions/timezoneOf.cpp
index 1d007a6e10e..f768722a284 100644
--- a/src/Functions/timezoneOf.cpp
+++ b/src/Functions/timezoneOf.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -23,70 +23,16 @@ namespace
 /** timezoneOf(x) - get the name of the timezone of DateTime data type.
   * Example: Europe/Moscow.
   */
-class ExecutableFunctionTimezoneOf : public IExecutableFunctionImpl
+class FunctionTimezoneOf : public IFunction
 {
 public:
     static constexpr auto name = "timezoneOf";
     String getName() const override { return name; }
-
-    bool useDefaultImplementationForNulls() const override { return false; }
-    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
-
-    /// Execute the function on the columns.
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        DataTypePtr type_no_nullable = removeNullable(arguments[0].type);
-
-        return DataTypeString().createColumnConst(input_rows_count,
-            dynamic_cast<const TimezoneMixin &>(*type_no_nullable).getTimeZone().getTimeZone());
-    }
-};
-
-
-class BaseFunctionTimezoneOf : public IFunctionBaseImpl
-{
-public:
-    BaseFunctionTimezoneOf(DataTypes argument_types_, DataTypePtr return_type_)
-        : argument_types(std::move(argument_types_)), return_type(std::move(return_type_)) {}
-
-    static constexpr auto name = "timezoneOf";
-    String getName() const override { return name; }
-
-    bool isDeterministic() const override { return true; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-
-    const DataTypes & getArgumentTypes() const override { return argument_types; }
-    const DataTypePtr & getResultType() const override { return return_type; }
-
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
-    {
-        return std::make_unique<ExecutableFunctionTimezoneOf>();
-    }
-
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & arguments) const override
-    {
-        DataTypePtr type_no_nullable = removeNullable(arguments[0].type);
-
-        return DataTypeString().createColumnConst(1,
-            dynamic_cast<const TimezoneMixin &>(*type_no_nullable).getTimeZone().getTimeZone());
-    }
-
-private:
-    DataTypes argument_types;
-    DataTypePtr return_type;
-};
-
-
-class FunctionTimezoneOfBuilder : public IFunctionOverloadResolverImpl
-{
-public:
-    static constexpr auto name = "timezoneOf";
-    String getName() const override { return name; }
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<FunctionTimezoneOfBuilder>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_unique<FunctionTimezoneOf>(); }
 
     size_t getNumberOfArguments() const override { return 1; }
 
-    DataTypePtr getReturnType(const DataTypes & types) const override
+    DataTypePtr getReturnTypeImpl(const DataTypes & types) const override
     {
         DataTypePtr type_no_nullable = removeNullable(types[0]);
 
@@ -96,21 +42,32 @@ public:
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad argument for function {}, should be DateTime or DateTime64", name);
     }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
-    {
-        return std::make_unique<BaseFunctionTimezoneOf>(DataTypes{arguments[0].type}, return_type);
-    }
-
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        DataTypePtr type_no_nullable = removeNullable(arguments[0].type);
+
+        return DataTypeString().createColumnConst(input_rows_count,
+            dynamic_cast<const TimezoneMixin &>(*type_no_nullable).getTimeZone().getTimeZone());
+    }
+
+    ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override
+    {
+        DataTypePtr type_no_nullable = removeNullable(arguments[0].type);
+
+        return DataTypeString().createColumnConst(1,
+            dynamic_cast<const TimezoneMixin &>(*type_no_nullable).getTimeZone().getTimeZone());
+    }
 };
 
 }
 
 void registerFunctionTimezoneOf(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionTimezoneOfBuilder>();
+    factory.registerFunction<FunctionTimezoneOf>();
     factory.registerAlias("timeZoneOf", "timezoneOf");
 }
 
diff --git a/src/Functions/timezoneOffset.cpp b/src/Functions/timezoneOffset.cpp
index 5acdb105b2b..296603ce0a4 100644
--- a/src/Functions/timezoneOffset.cpp
+++ b/src/Functions/timezoneOffset.cpp
@@ -12,6 +12,7 @@ using FunctiontimezoneOffset = FunctionDateOrDateTimeToSomething<DataTypeInt32,
 void registerFunctiontimezoneOffset(FunctionFactory & factory)
 {
     factory.registerFunction<FunctiontimezoneOffset>();
+    factory.registerAlias("timeZoneOffset", "timezoneOffset");
 }
 
 }
diff --git a/src/Functions/toColumnTypeName.cpp b/src/Functions/toColumnTypeName.cpp
index 2b59accba84..2d3635f4ed1 100644
--- a/src/Functions/toColumnTypeName.cpp
+++ b/src/Functions/toColumnTypeName.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <Core/Field.h>
@@ -14,7 +14,7 @@ class FunctionToColumnTypeName : public IFunction
 {
 public:
     static constexpr auto name = "toColumnTypeName";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionToColumnTypeName>();
     }
@@ -41,7 +41,7 @@ public:
         return DataTypeString().createColumnConst(input_rows_count, arguments[0].column->getName());
     }
 
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName & arguments) const override
+    ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override
     {
         return DataTypeString().createColumnConst(1, arguments[0].type->createColumn()->getName());
     }
diff --git a/src/Functions/toCustomWeek.cpp b/src/Functions/toCustomWeek.cpp
index 532a3b1e9f4..5ba0b8e8b2a 100644
--- a/src/Functions/toCustomWeek.cpp
+++ b/src/Functions/toCustomWeek.cpp
@@ -2,7 +2,7 @@
 #include <Functions/CustomWeekTransforms.h>
 #include <Functions/FunctionCustomWeekToSomething.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
diff --git a/src/Functions/toFixedString.h b/src/Functions/toFixedString.h
index 23c9e92faaf..303d51f41ad 100644
--- a/src/Functions/toFixedString.h
+++ b/src/Functions/toFixedString.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -32,7 +32,7 @@ class FunctionToFixedString : public IFunction
 {
 public:
     static constexpr auto name = "toFixedString";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToFixedString>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionToFixedString>(); }
     static FunctionPtr create() { return std::make_shared<FunctionToFixedString>(); }
 
     String getName() const override
diff --git a/src/Functions/toLowCardinality.cpp b/src/Functions/toLowCardinality.cpp
index fe06b2d6087..8f102d5db9c 100644
--- a/src/Functions/toLowCardinality.cpp
+++ b/src/Functions/toLowCardinality.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Columns/ColumnLowCardinality.h>
@@ -14,7 +14,7 @@ class FunctionToLowCardinality: public IFunction
 {
 public:
     static constexpr auto name = "toLowCardinality";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToLowCardinality>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionToLowCardinality>(); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/toModifiedJulianDay.cpp b/src/Functions/toModifiedJulianDay.cpp
index 32e9eb23987..c76b158baa8 100644
--- a/src/Functions/toModifiedJulianDay.cpp
+++ b/src/Functions/toModifiedJulianDay.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/GregorianDate.h>
 #include <IO/ReadBufferFromMemory.h>
@@ -22,7 +22,7 @@ namespace DB
     }
 
     template <typename Name, typename ToDataType, bool nullOnErrors>
-    class ExecutableFunctionToModifiedJulianDay : public IExecutableFunctionImpl
+    class ExecutableFunctionToModifiedJulianDay : public IExecutableFunction
     {
     public:
         String getName() const override
@@ -30,7 +30,7 @@ namespace DB
             return Name::name;
         }
 
-        ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+        ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
         {
             const IColumn * col_from = arguments[0].column.get();
             const ColumnString * col_from_string = checkAndGetColumn<ColumnString>(col_from);
@@ -116,7 +116,7 @@ namespace DB
     };
 
     template <typename Name, typename ToDataType, bool nullOnErrors>
-    class FunctionBaseToModifiedJulianDay : public IFunctionBaseImpl
+    class FunctionBaseToModifiedJulianDay : public IFunctionBase
     {
     public:
         explicit FunctionBaseToModifiedJulianDay(DataTypes argument_types_, DataTypePtr return_type_)
@@ -138,7 +138,7 @@ namespace DB
             return return_type;
         }
 
-        ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+        ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
         {
             return std::make_unique<ExecutableFunctionToModifiedJulianDay<Name, ToDataType, nullOnErrors>>();
         }
@@ -167,12 +167,12 @@ namespace DB
     };
 
     template <typename Name, typename ToDataType, bool nullOnErrors>
-    class ToModifiedJulianDayOverloadResolver : public IFunctionOverloadResolverImpl
+    class ToModifiedJulianDayOverloadResolver : public IFunctionOverloadResolver
     {
     public:
         static constexpr auto name = Name::name;
 
-        static FunctionOverloadResolverImplPtr create(const Context &)
+        static FunctionOverloadResolverPtr create(ContextConstPtr)
         {
             return std::make_unique<ToModifiedJulianDayOverloadResolver<Name, ToDataType, nullOnErrors>>();
         }
@@ -182,14 +182,14 @@ namespace DB
             return Name::name;
         }
 
-        FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+        FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
         {
             DataTypes argument_types = { arguments[0].type };
 
             return std::make_unique<FunctionBaseToModifiedJulianDay<Name, ToDataType, nullOnErrors>>(argument_types, return_type);
         }
 
-        DataTypePtr getReturnType(const DataTypes & arguments) const override
+        DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
         {
             if (!isStringOrFixedString(arguments[0]))
             {
diff --git a/src/Functions/toNullable.cpp b/src/Functions/toNullable.cpp
index 5758fe41adf..12d23e59f49 100644
--- a/src/Functions/toNullable.cpp
+++ b/src/Functions/toNullable.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Columns/ColumnNullable.h>
@@ -16,7 +16,7 @@ class FunctionToNullable : public IFunction
 public:
     static constexpr auto name = "toNullable";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionToNullable>();
     }
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index f194da166aa..97d2d65b67a 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeInterval.h>
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/TransformDateTime64.h>
 #include <IO/WriteHelpers.h>
 
@@ -184,7 +184,7 @@ namespace
 class FunctionToStartOfInterval : public IFunction
 {
 public:
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToStartOfInterval>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionToStartOfInterval>(); }
 
     static constexpr auto name = function_name;
     String getName() const override { return name; }
diff --git a/src/Functions/toTimezone.cpp b/src/Functions/toTimezone.cpp
index d12f926b284..ef80c2f0849 100644
--- a/src/Functions/toTimezone.cpp
+++ b/src/Functions/toTimezone.cpp
@@ -1,7 +1,7 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 
@@ -25,7 +25,7 @@ class FunctionToTimezone : public IFunction
 {
 public:
     static constexpr auto name = "toTimezone";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionToTimezone>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionToTimezone>(); }
 
     String getName() const override
     {
diff --git a/src/Functions/toTypeName.cpp b/src/Functions/toTypeName.cpp
index 5de07e1d386..f369ff1ccef 100644
--- a/src/Functions/toTypeName.cpp
+++ b/src/Functions/toTypeName.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Core/Field.h>
 #include <DataTypes/DataTypeString.h>
@@ -12,85 +12,55 @@ namespace
 /** toTypeName(x) - get the type name
   * Returns name of IDataType instance (name of data type).
   */
-class ExecutableFunctionToTypeName : public IExecutableFunctionImpl
+class FunctionToTypeName : public IFunction
 {
 public:
+
     static constexpr auto name = "toTypeName";
-    String getName() const override { return name; }
+
+    static FunctionPtr create(ContextConstPtr)
+    {
+        return std::make_shared<FunctionToTypeName>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
-    /// Execute the function on the columns.
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, arguments[0].type->getName());
     }
-};
 
-
-class BaseFunctionToTypeName : public IFunctionBaseImpl
-{
-public:
-    BaseFunctionToTypeName(DataTypes argument_types_, DataTypePtr return_type_)
-        : argument_types(std::move(argument_types_)), return_type(std::move(return_type_)) {}
-
-    static constexpr auto name = "toTypeName";
-    String getName() const override { return name; }
-
-    bool isDeterministic() const override { return true; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-
-    const DataTypes & getArgumentTypes() const override { return argument_types; }
-    const DataTypePtr & getResultType() const override { return return_type; }
-
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr &) const override
     {
-        return std::make_unique<ExecutableFunctionToTypeName>();
+        return DataTypeString().createColumnConst(1, arguments[0].type->getName());
     }
 
-    ColumnPtr getResultIfAlwaysReturnsConstantAndHasArguments(const ColumnsWithTypeAndName &) const override
-    {
-        return DataTypeString().createColumnConst(1, argument_types.at(0)->getName());
-    }
-
-private:
-    DataTypes argument_types;
-    DataTypePtr return_type;
-};
-
-
-class FunctionToTypeNameBuilder : public IFunctionOverloadResolverImpl
-{
-public:
-    static constexpr auto name = "toTypeName";
-    String getName() const override { return name; }
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<FunctionToTypeNameBuilder>(); }
-
-    size_t getNumberOfArguments() const override { return 1; }
-
-    DataTypePtr getReturnType(const DataTypes &) const override { return std::make_shared<DataTypeString>(); }
-
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
-    {
-        DataTypes types;
-        types.reserve(arguments.size());
-        for (const auto & elem : arguments)
-            types.emplace_back(elem.type);
-
-        return std::make_unique<BaseFunctionToTypeName>(types, return_type);
-    }
-
-    bool useDefaultImplementationForNulls() const override { return false; }
-    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
+
 };
 
 }
 
 void registerFunctionToTypeName(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionToTypeNameBuilder>();
+    factory.registerFunction<FunctionToTypeName>();
 }
 
 }
diff --git a/src/Functions/toUnixTimestamp64Micro.cpp b/src/Functions/toUnixTimestamp64Micro.cpp
index e1a9382e69a..bd13f753802 100644
--- a/src/Functions/toUnixTimestamp64Micro.cpp
+++ b/src/Functions/toUnixTimestamp64Micro.cpp
@@ -3,22 +3,12 @@
 
 namespace DB
 {
-namespace
-{
-
-struct TransformToMicro
-{
-    static constexpr auto name = "toUnixTimestamp64Micro";
-    static constexpr auto target_scale = 6;
-    using SourceDataType = DataTypeDateTime64;
-    using ResultDataType = DataTypeInt64;
-};
-
-}
 
 void registerToUnixTimestamp64Micro(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionUnixTimestamp64<TransformToMicro>>();
+    factory.registerFunction("toUnixTimestamp64Micro",
+        [](ContextConstPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionToUnixTimestamp64>(6, "toUnixTimestamp64Micro")); });
 }
 
 }
diff --git a/src/Functions/toUnixTimestamp64Milli.cpp b/src/Functions/toUnixTimestamp64Milli.cpp
index b49b1c9042b..088cd2011c5 100644
--- a/src/Functions/toUnixTimestamp64Milli.cpp
+++ b/src/Functions/toUnixTimestamp64Milli.cpp
@@ -3,22 +3,12 @@
 
 namespace DB
 {
-namespace
-{
-
-struct TransformToMilli
-{
-    static constexpr auto name = "toUnixTimestamp64Milli";
-    static constexpr auto target_scale = 3;
-    using SourceDataType = DataTypeDateTime64;
-    using ResultDataType = DataTypeInt64;
-};
-
-}
 
 void registerToUnixTimestamp64Milli(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionUnixTimestamp64<TransformToMilli>>();
+    factory.registerFunction("toUnixTimestamp64Milli",
+        [](ContextConstPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionToUnixTimestamp64>(3, "toUnixTimestamp64Milli")); });
 }
 
 }
diff --git a/src/Functions/toUnixTimestamp64Nano.cpp b/src/Functions/toUnixTimestamp64Nano.cpp
index 832d845434c..3961b9630ba 100644
--- a/src/Functions/toUnixTimestamp64Nano.cpp
+++ b/src/Functions/toUnixTimestamp64Nano.cpp
@@ -3,22 +3,12 @@
 
 namespace DB
 {
-namespace
-{
-
-struct TransformToNano
-{
-    static constexpr auto name = "toUnixTimestamp64Nano";
-    static constexpr auto target_scale = 9;
-    using SourceDataType = DataTypeDateTime64;
-    using ResultDataType = DataTypeInt64;
-};
-
-}
 
 void registerToUnixTimestamp64Nano(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionUnixTimestamp64<TransformToNano>>();
+    factory.registerFunction("toUnixTimestamp64Nano",
+        [](ContextConstPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionToUnixTimestamp64>(9, "toUnixTimestamp64Nano")); });
 }
 
 }
diff --git a/src/Functions/today.cpp b/src/Functions/today.cpp
index 511af881d73..9d04bd3a84d 100644
--- a/src/Functions/today.cpp
+++ b/src/Functions/today.cpp
@@ -4,7 +4,7 @@
 
 #include <DataTypes/DataTypeDate.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 
 
@@ -13,14 +13,14 @@ namespace DB
 namespace
 {
 
-class ExecutableFunctionToday : public IExecutableFunctionImpl
+class ExecutableFunctionToday : public IExecutableFunction
 {
 public:
     explicit ExecutableFunctionToday(time_t time_) : day_value(time_) {}
 
     String getName() const override { return "today"; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeDate().createColumnConst(input_rows_count, day_value);
     }
@@ -29,7 +29,7 @@ private:
     DayNum day_value;
 };
 
-class FunctionBaseToday : public IFunctionBaseImpl
+class FunctionBaseToday : public IFunctionBase
 {
 public:
     explicit FunctionBaseToday(DayNum day_value_) : day_value(day_value_), return_type(std::make_shared<DataTypeDate>()) {}
@@ -47,7 +47,7 @@ public:
         return return_type;
     }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionToday>(day_value);
     }
@@ -60,7 +60,7 @@ private:
     DataTypePtr return_type;
 };
 
-class TodayOverloadResolver : public IFunctionOverloadResolverImpl
+class TodayOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = "today";
@@ -71,11 +71,11 @@ public:
 
     size_t getNumberOfArguments() const override { return 0; }
 
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<TodayOverloadResolver>(); }
+    static FunctionOverloadResolverPtr create(ContextConstPtr) { return std::make_unique<TodayOverloadResolver>(); }
 
-    DataTypePtr getReturnType(const DataTypes &) const override { return std::make_shared<DataTypeDate>(); }
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeDate>(); }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr &) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName &, const DataTypePtr &) const override
     {
         return std::make_unique<FunctionBaseToday>(DayNum(DateLUT::instance().toDayNum(time(nullptr)).toUnderType()));
     }
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index 07fbd5a7b96..e9305304ac0 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -11,7 +11,7 @@
 #include <Common/HashTable/HashMap.h>
 #include <Common/typeid_cast.h>
 #include <common/StringRef.h>
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/getLeastSupertype.h>
@@ -58,7 +58,7 @@ class FunctionTransform : public IFunction
 {
 public:
     static constexpr auto name = "transform";
-    static FunctionPtr create(const Context &) { return std::make_shared<FunctionTransform>(); }
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionTransform>(); }
 
     String getName() const override
     {
@@ -194,8 +194,7 @@ private:
         ColumnsWithTypeAndName args = arguments;
         args[0].column = args[0].column->cloneResized(input_rows_count)->convertToFullColumnIfConst();
 
-        auto impl = FunctionOverloadResolverAdaptor(std::make_unique<DefaultOverloadResolver>(std::make_shared<FunctionTransform>()))
-                    .build(args);
+        auto impl = FunctionToOverloadResolverAdaptor(std::make_shared<FunctionTransform>()).build(args);
 
         return impl->execute(args, result_type, input_rows_count);
     }
diff --git a/src/Functions/trap.cpp b/src/Functions/trap.cpp
index 61ec52a1d07..c7f935bac3e 100644
--- a/src/Functions/trap.cpp
+++ b/src/Functions/trap.cpp
@@ -32,16 +32,16 @@ namespace ErrorCodes
 class FunctionTrap : public IFunction
 {
 private:
-    const Context & context;
+    ContextConstPtr context;
 
 public:
     static constexpr auto name = "trap";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
         return std::make_shared<FunctionTrap>(context);
     }
 
-    FunctionTrap(const Context & context_) : context(context_) {}
+    FunctionTrap(ContextConstPtr context_) : context(context_) {}
 
     String getName() const override
     {
diff --git a/src/Functions/tuple.cpp b/src/Functions/tuple.cpp
index 308090eb9bb..8c1ad90070e 100644
--- a/src/Functions/tuple.cpp
+++ b/src/Functions/tuple.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <Columns/ColumnTuple.h>
@@ -24,7 +24,7 @@ class FunctionTuple : public IFunction
 public:
     static constexpr auto name = "tuple";
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionTuple>();
     }
diff --git a/src/Functions/tupleElement.cpp b/src/Functions/tupleElement.cpp
index dbfa802a414..7f71e9d93e9 100644
--- a/src/Functions/tupleElement.cpp
+++ b/src/Functions/tupleElement.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/IDataType.h>
@@ -30,7 +30,7 @@ class FunctionTupleElement : public IFunction
 {
 public:
     static constexpr auto name = "tupleElement";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionTupleElement>();
     }
diff --git a/src/Functions/tupleHammingDistance.cpp b/src/Functions/tupleHammingDistance.cpp
index 0fd21e0ea91..a4ad7e9a5ba 100644
--- a/src/Functions/tupleHammingDistance.cpp
+++ b/src/Functions/tupleHammingDistance.cpp
@@ -19,14 +19,14 @@ namespace ErrorCodes
 class FunctionTupleHammingDistance : public IFunction
 {
 private:
-    const Context & context;
+    ContextConstPtr context;
 
 public:
     static constexpr auto name = "tupleHammingDistance";
     using ResultType = UInt8;
 
-    explicit FunctionTupleHammingDistance(const Context & context_) : context(context_) {}
-    static FunctionPtr create(const Context & context) { return std::make_shared<FunctionTupleHammingDistance>(context); }
+    explicit FunctionTupleHammingDistance(ContextConstPtr context_) : context(context_) {}
+    static FunctionPtr create(ContextConstPtr context) { return std::make_shared<FunctionTupleHammingDistance>(context); }
 
     String getName() const override { return name; }
 
diff --git a/src/Functions/uptime.cpp b/src/Functions/uptime.cpp
index b5662a87c93..7e2165318a3 100644
--- a/src/Functions/uptime.cpp
+++ b/src/Functions/uptime.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Context.h>
@@ -13,9 +13,9 @@ class FunctionUptime : public IFunction
 {
 public:
     static constexpr auto name = "uptime";
-    static FunctionPtr create(const Context & context)
+    static FunctionPtr create(ContextConstPtr context)
     {
-        return std::make_shared<FunctionUptime>(context.getUptimeSeconds());
+        return std::make_shared<FunctionUptime>(context->getUptimeSeconds());
     }
 
     explicit FunctionUptime(time_t uptime_) : uptime(uptime_)
diff --git a/src/Functions/validateNestedArraySizes.cpp b/src/Functions/validateNestedArraySizes.cpp
new file mode 100644
index 00000000000..f3327479844
--- /dev/null
+++ b/src/Functions/validateNestedArraySizes.cpp
@@ -0,0 +1,126 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Core/ColumnWithTypeAndName.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int SIZES_OF_ARRAYS_DOESNT_MATCH;
+}
+
+/** Function validateNestedArraySizes is used to check the consistency of Nested DataType subcolumns's offsets when Update
+ *  Arguments: num > 2
+ *     The first argument is the condition of WHERE in UPDATE operation, only when this is true, we need to check
+ *     The rest arguments are the subcolumns of Nested DataType.
+ */
+class FunctionValidateNestedArraySizes : public IFunction
+{
+public:
+    static constexpr auto name = "validateNestedArraySizes";
+    static FunctionPtr create(ContextConstPtr) { return std::make_shared<FunctionValidateNestedArraySizes>(); }
+
+    String getName() const override { return name; }
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
+};
+
+DataTypePtr FunctionValidateNestedArraySizes::getReturnTypeImpl(const DataTypes & arguments) const
+{
+    size_t num_args = arguments.size();
+
+    if (num_args < 3)
+        throw Exception(
+            "Function " + getName() + " needs more than two arguments; passed " + toString(arguments.size()) + ".",
+            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (!WhichDataType(arguments[0]).isUInt8())
+        throw Exception("Illegal type " + arguments[0]->getName() + " of first argument of function " + getName() + " Must be UInt.",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    for (size_t i = 1; i < num_args; ++i)
+        if (!WhichDataType(arguments[i]).isArray())
+            throw Exception(
+                "Illegal type " + arguments[i]->getName() + " of " + toString(i) + " argument of function " + getName() + " Must be Array.",
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    return std::make_shared<DataTypeUInt8>();
+}
+
+ColumnPtr FunctionValidateNestedArraySizes::executeImpl(
+    const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const
+{
+    bool is_condition_const = false;
+    bool condition = false;
+    const ColumnUInt8 * condition_column = typeid_cast<const ColumnUInt8 *>(arguments[0].column.get());
+    if (!condition_column)
+    {
+        if (checkAndGetColumnConst<ColumnUInt8>(arguments[0].column.get()))
+        {
+            is_condition_const = true;
+            condition = arguments[0].column->getBool(0);
+        }
+    }
+
+    size_t args_num = arguments.size();
+
+    for (size_t i = 0; i < input_rows_count; ++i)
+    {
+        if (is_condition_const && !condition)
+            break;
+
+        if (!is_condition_const && !condition_column->getData()[i])
+            continue;
+
+        /// The condition is true, then check the row in subcolumns in Nested Type has the same array size
+        size_t first_length = 0;
+        size_t length = 0;
+        for (size_t args_idx = 1; args_idx < args_num; ++args_idx)
+        {
+            const auto & current_arg = arguments[args_idx];
+            const ColumnArray * current_column = nullptr;
+            if (const auto * const_array = checkAndGetColumnConst<ColumnArray>(current_arg.column.get()))
+            {
+                current_column = checkAndGetColumn<ColumnArray>(&const_array->getDataColumn());
+                length = current_column->getOffsets()[0];
+            }
+            else
+            {
+                current_column = checkAndGetColumn<ColumnArray>(current_arg.column.get());
+                const auto & offsets = current_column->getOffsets();
+                length = offsets[i] - offsets[i - 1];
+            }
+
+            if (args_idx == 1)
+            {
+                first_length = length;
+            }
+            else if (first_length != length)
+            {
+                throw Exception(
+                    ErrorCodes::SIZES_OF_ARRAYS_DOESNT_MATCH,
+                    "Elements '{}' and '{}' of Nested data structure (Array columns) "
+                    "have different array sizes ({} and {} respectively) on row {}",
+                    arguments[1].name, arguments[args_idx].name, first_length, length, i);
+            }
+        }
+    }
+
+    return ColumnUInt8::create(input_rows_count, 1);
+}
+
+void registerFunctionValidateNestedArraySizes(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionValidateNestedArraySizes>();
+}
+
+}
diff --git a/src/Functions/version.cpp b/src/Functions/version.cpp
index 37f9c7b1e98..6181999e2f5 100644
--- a/src/Functions/version.cpp
+++ b/src/Functions/version.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <Core/Field.h>
@@ -16,7 +16,7 @@ class FunctionVersion : public IFunction
 {
 public:
     static constexpr auto name = "version";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionVersion>();
     }
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index ed4d2b3d501..f6a79a82df6 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -1,4 +1,4 @@
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Formats/FormatSettings.h>
@@ -19,7 +19,7 @@ class FunctionVisibleWidth : public IFunction
 {
 public:
     static constexpr auto name = "visibleWidth";
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionVisibleWidth>();
     }
diff --git a/src/Functions/wkt.cpp b/src/Functions/wkt.cpp
index 1d509a7c508..888f6a4ea5f 100644
--- a/src/Functions/wkt.cpp
+++ b/src/Functions/wkt.cpp
@@ -16,7 +16,7 @@ public:
 
     explicit FunctionWkt() = default;
 
-    static FunctionPtr create(const Context &)
+    static FunctionPtr create(ContextConstPtr)
     {
         return std::make_shared<FunctionWkt>();
     }
diff --git a/src/Functions/ya.make b/src/Functions/ya.make
index 52ed54ec64f..2a541369ff4 100644
--- a/src/Functions/ya.make
+++ b/src/Functions/ya.make
@@ -229,6 +229,8 @@ SRCS(
     defaultValueOfTypeName.cpp
     demange.cpp
     divide.cpp
+    divide/divide.cpp
+    divide/divideImpl.cpp
     dumpColumnStructure.cpp
     e.cpp
     empty.cpp
@@ -301,6 +303,7 @@ SRCS(
     ignore.cpp
     ilike.cpp
     in.cpp
+    indexHint.cpp
     initializeAggregation.cpp
     intDiv.cpp
     intDivOrZero.cpp
@@ -530,6 +533,7 @@ SRCS(
     upper.cpp
     upperUTF8.cpp
     uptime.cpp
+    validateNestedArraySizes.cpp
     version.cpp
     visibleWidth.cpp
     visitParamExtractBool.cpp
diff --git a/src/Functions/ya.make.in b/src/Functions/ya.make.in
index 5a3369c55a1..ef3e97060c7 100644
--- a/src/Functions/ya.make.in
+++ b/src/Functions/ya.make.in
@@ -35,7 +35,7 @@ PEERDIR(
 # "Arcadia" build is slightly deficient. It lacks many libraries that we need.
 
 SRCS(
-<? find . -name '*.cpp' | grep -i -v -P 'tests|Bitmap|abtesting' | sed 's/^\.\//    /' | sort ?>
+<? 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 7c0d1ebd38b..0b3ac6d2a8e 100644
--- a/src/Functions/yesterday.cpp
+++ b/src/Functions/yesterday.cpp
@@ -4,21 +4,21 @@
 
 #include <DataTypes/DataTypeDate.h>
 
-#include <Functions/IFunctionImpl.h>
+#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 
 
 namespace DB
 {
 
-class ExecutableFunctionYesterday : public IExecutableFunctionImpl
+class ExecutableFunctionYesterday : public IExecutableFunction
 {
 public:
     explicit ExecutableFunctionYesterday(time_t time_) : day_value(time_) {}
 
     String getName() const override { return "yesterday"; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeDate().createColumnConst(input_rows_count, day_value);
     }
@@ -27,7 +27,7 @@ private:
     DayNum day_value;
 };
 
-class FunctionBaseYesterday : public IFunctionBaseImpl
+class FunctionBaseYesterday : public IFunctionBase
 {
 public:
     explicit FunctionBaseYesterday(DayNum day_value_) : day_value(day_value_), return_type(std::make_shared<DataTypeDate>()) {}
@@ -45,7 +45,7 @@ public:
         return return_type;
     }
 
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionYesterday>(day_value);
     }
@@ -58,7 +58,7 @@ private:
     DataTypePtr return_type;
 };
 
-class YesterdayOverloadResolver : public IFunctionOverloadResolverImpl
+class YesterdayOverloadResolver : public IFunctionOverloadResolver
 {
 public:
     static constexpr auto name = "yesterday";
@@ -69,11 +69,11 @@ public:
 
     size_t getNumberOfArguments() const override { return 0; }
 
-    static FunctionOverloadResolverImplPtr create(const Context &) { return std::make_unique<YesterdayOverloadResolver>(); }
+    static FunctionOverloadResolverPtr create(ContextConstPtr) { return std::make_unique<YesterdayOverloadResolver>(); }
 
-    DataTypePtr getReturnType(const DataTypes &) const override { return std::make_shared<DataTypeDate>(); }
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeDate>(); }
 
-    FunctionBaseImplPtr build(const ColumnsWithTypeAndName &, const DataTypePtr &) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName &, const DataTypePtr &) const override
     {
         auto day_num = DateLUT::instance().toDayNum(time(nullptr)) - 1;
         return std::make_unique<FunctionBaseYesterday>(static_cast<DayNum>(day_num));
diff --git a/src/IO/BitHelpers.h b/src/IO/BitHelpers.h
index 0e2a08aa9a0..1cb62f5f367 100644
--- a/src/IO/BitHelpers.h
+++ b/src/IO/BitHelpers.h
@@ -9,6 +9,8 @@
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined (__ANDROID__)
 #   include <sys/endian.h>
+#elif defined(__sun)
+#   include <endian.h>
 #elif defined(__APPLE__)
 #   include <libkern/OSByteOrder.h>
 
diff --git a/src/IO/BrotliWriteBuffer.cpp b/src/IO/BrotliWriteBuffer.cpp
index 512ed5fc93f..3d0afa86360 100644
--- a/src/IO/BrotliWriteBuffer.cpp
+++ b/src/IO/BrotliWriteBuffer.cpp
@@ -50,7 +50,7 @@ BrotliWriteBuffer::BrotliWriteBuffer(std::unique_ptr<WriteBuffer> out_, int comp
 BrotliWriteBuffer::~BrotliWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finish();
 }
 
diff --git a/src/IO/CMakeLists.txt b/src/IO/CMakeLists.txt
index 65172356645..f676f415eea 100644
--- a/src/IO/CMakeLists.txt
+++ b/src/IO/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory (examples)
 endif ()
diff --git a/src/IO/CompressionMethod.cpp b/src/IO/CompressionMethod.cpp
index 6e437e34c10..c6bb5232c0c 100644
--- a/src/IO/CompressionMethod.cpp
+++ b/src/IO/CompressionMethod.cpp
@@ -46,7 +46,6 @@ std::string toContentEncodingName(CompressionMethod method)
     __builtin_unreachable();
 }
 
-
 CompressionMethod chooseCompressionMethod(const std::string & path, const std::string & hint)
 {
     std::string file_extension;
diff --git a/src/IO/ConnectionTimeouts.h b/src/IO/ConnectionTimeouts.h
index 5f12a4edc79..160566c0f8d 100644
--- a/src/IO/ConnectionTimeouts.h
+++ b/src/IO/ConnectionTimeouts.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 #include <Poco/Timespan.h>
 
 namespace DB
 {
 
-class Context;
 struct Settings;
 
 struct ConnectionTimeouts
@@ -23,9 +24,9 @@ struct ConnectionTimeouts
 
     ConnectionTimeouts() = default;
 
-    ConnectionTimeouts(const Poco::Timespan & connection_timeout_,
-                       const Poco::Timespan & send_timeout_,
-                       const Poco::Timespan & receive_timeout_)
+    ConnectionTimeouts(Poco::Timespan connection_timeout_,
+                       Poco::Timespan send_timeout_,
+                       Poco::Timespan receive_timeout_)
     : connection_timeout(connection_timeout_),
       send_timeout(send_timeout_),
       receive_timeout(receive_timeout_),
@@ -37,10 +38,10 @@ struct ConnectionTimeouts
     {
     }
 
-    ConnectionTimeouts(const Poco::Timespan & connection_timeout_,
-                       const Poco::Timespan & send_timeout_,
-                       const Poco::Timespan & receive_timeout_,
-                       const Poco::Timespan & tcp_keep_alive_timeout_)
+    ConnectionTimeouts(Poco::Timespan connection_timeout_,
+                       Poco::Timespan send_timeout_,
+                       Poco::Timespan receive_timeout_,
+                       Poco::Timespan tcp_keep_alive_timeout_)
     : connection_timeout(connection_timeout_),
       send_timeout(send_timeout_),
       receive_timeout(receive_timeout_),
@@ -51,11 +52,11 @@ struct ConnectionTimeouts
       receive_data_timeout(receive_timeout_)
     {
     }
-    ConnectionTimeouts(const Poco::Timespan & connection_timeout_,
-                       const Poco::Timespan & send_timeout_,
-                       const Poco::Timespan & receive_timeout_,
-                       const Poco::Timespan & tcp_keep_alive_timeout_,
-                       const Poco::Timespan & http_keep_alive_timeout_)
+    ConnectionTimeouts(Poco::Timespan connection_timeout_,
+                       Poco::Timespan send_timeout_,
+                       Poco::Timespan receive_timeout_,
+                       Poco::Timespan tcp_keep_alive_timeout_,
+                       Poco::Timespan http_keep_alive_timeout_)
         : connection_timeout(connection_timeout_),
           send_timeout(send_timeout_),
           receive_timeout(receive_timeout_),
@@ -67,14 +68,14 @@ struct ConnectionTimeouts
     {
     }
 
-    ConnectionTimeouts(const Poco::Timespan & connection_timeout_,
-                       const Poco::Timespan & send_timeout_,
-                       const Poco::Timespan & receive_timeout_,
-                       const Poco::Timespan & tcp_keep_alive_timeout_,
-                       const Poco::Timespan & http_keep_alive_timeout_,
-                       const Poco::Timespan & secure_connection_timeout_,
-                       const Poco::Timespan & receive_hello_timeout_,
-                       const Poco::Timespan & receive_data_timeout_)
+    ConnectionTimeouts(Poco::Timespan connection_timeout_,
+                       Poco::Timespan send_timeout_,
+                       Poco::Timespan receive_timeout_,
+                       Poco::Timespan tcp_keep_alive_timeout_,
+                       Poco::Timespan http_keep_alive_timeout_,
+                       Poco::Timespan secure_connection_timeout_,
+                       Poco::Timespan receive_hello_timeout_,
+                       Poco::Timespan receive_data_timeout_)
         : connection_timeout(connection_timeout_),
           send_timeout(send_timeout_),
           receive_timeout(receive_timeout_),
@@ -86,7 +87,7 @@ struct ConnectionTimeouts
     {
     }
 
-    static Poco::Timespan saturate(const Poco::Timespan & timespan, const Poco::Timespan & limit)
+    static Poco::Timespan saturate(Poco::Timespan timespan, Poco::Timespan limit)
     {
         if (limit.totalMicroseconds() == 0)
             return timespan;
@@ -94,7 +95,7 @@ struct ConnectionTimeouts
             return (timespan > limit) ? limit : timespan;
     }
 
-    ConnectionTimeouts getSaturated(const Poco::Timespan & limit) const
+    ConnectionTimeouts getSaturated(Poco::Timespan limit) const
     {
         return ConnectionTimeouts(saturate(connection_timeout, limit),
                                   saturate(send_timeout, limit),
@@ -110,7 +111,7 @@ struct ConnectionTimeouts
     static ConnectionTimeouts getTCPTimeoutsWithoutFailover(const Settings & settings);
     /// Timeouts for the case when we will try many addresses in a loop.
     static ConnectionTimeouts getTCPTimeoutsWithFailover(const Settings & settings);
-    static ConnectionTimeouts getHTTPTimeouts(const Context & context);
+    static ConnectionTimeouts getHTTPTimeouts(ContextConstPtr context);
 };
 
 }
diff --git a/src/IO/ConnectionTimeoutsContext.h b/src/IO/ConnectionTimeoutsContext.h
index 1e688ff3798..909ccff8ef0 100644
--- a/src/IO/ConnectionTimeoutsContext.h
+++ b/src/IO/ConnectionTimeoutsContext.h
@@ -27,10 +27,10 @@ inline ConnectionTimeouts ConnectionTimeouts::getTCPTimeoutsWithFailover(const S
         settings.receive_data_timeout_ms);
 }
 
-inline ConnectionTimeouts ConnectionTimeouts::getHTTPTimeouts(const Context & context)
+inline ConnectionTimeouts ConnectionTimeouts::getHTTPTimeouts(ContextConstPtr context)
 {
-    const auto & settings = context.getSettingsRef();
-    const auto & config = context.getConfigRef();
+    const auto & settings = context->getSettingsRef();
+    const auto & config = context->getConfigRef();
     Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 10), 0};
     return ConnectionTimeouts(settings.http_connection_timeout, settings.http_send_timeout, settings.http_receive_timeout, settings.tcp_keep_alive_timeout, http_keep_alive_timeout);
 }
diff --git a/src/IO/HashingWriteBuffer.h b/src/IO/HashingWriteBuffer.h
index 539c0390dc2..bd00a2b12da 100644
--- a/src/IO/HashingWriteBuffer.h
+++ b/src/IO/HashingWriteBuffer.h
@@ -17,7 +17,7 @@ class IHashingBuffer : public BufferWithOwnMemory<Buffer>
 public:
     using uint128 = CityHash_v1_0_2::uint128;
 
-    IHashingBuffer<Buffer>(size_t block_size_ = DBMS_DEFAULT_HASHING_BLOCK_SIZE)
+    IHashingBuffer(size_t block_size_ = DBMS_DEFAULT_HASHING_BLOCK_SIZE)
         : BufferWithOwnMemory<Buffer>(block_size_), block_pos(0), block_size(block_size_), state(0, 0)
     {
     }
diff --git a/src/IO/LZMADeflatingWriteBuffer.cpp b/src/IO/LZMADeflatingWriteBuffer.cpp
index 7ea4f7945dc..29cde872241 100644
--- a/src/IO/LZMADeflatingWriteBuffer.cpp
+++ b/src/IO/LZMADeflatingWriteBuffer.cpp
@@ -50,7 +50,7 @@ LZMADeflatingWriteBuffer::LZMADeflatingWriteBuffer(
 LZMADeflatingWriteBuffer::~LZMADeflatingWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     finish();
     lzma_end(&lstr);
diff --git a/src/IO/MMappedFileCache.h b/src/IO/MMappedFileCache.h
index cbd1977350b..adbb85a18cf 100644
--- a/src/IO/MMappedFileCache.h
+++ b/src/IO/MMappedFileCache.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Core/Types.h>
+#include <Common/HashTable/Hash.h>
 #include <Common/LRUCache.h>
 #include <Common/SipHash.h>
-#include <Common/UInt128.h>
 #include <Common/ProfileEvents.h>
 #include <IO/MMappedFile.h>
 
@@ -39,8 +40,7 @@ public:
         hash.update(offset);
         hash.update(length);
 
-        hash.get128(key.low, key.high);
-
+        hash.get128(key);
         return key;
     }
 
diff --git a/src/IO/MySQLBinlogEventReadBuffer.h b/src/IO/MySQLBinlogEventReadBuffer.h
index d31e19d82b8..7212a548844 100644
--- a/src/IO/MySQLBinlogEventReadBuffer.h
+++ b/src/IO/MySQLBinlogEventReadBuffer.h
@@ -11,11 +11,11 @@ protected:
     static const size_t MAX_CHECKSUM_SIGNATURE_LENGTH = 4;
 
     ReadBuffer & in;
-    size_t checksum_signature_length;
+    size_t checksum_signature_length = 0;
 
     size_t checksum_buff_size = 0;
     size_t checksum_buff_limit = 0;
-    char checksum_buf[MAX_CHECKSUM_SIGNATURE_LENGTH];
+    char checksum_buf[MAX_CHECKSUM_SIGNATURE_LENGTH]{};
 
     bool nextImpl() override;
 
diff --git a/src/IO/PeekableReadBuffer.cpp b/src/IO/PeekableReadBuffer.cpp
index 15fdd9448ec..c7cef777afc 100644
--- a/src/IO/PeekableReadBuffer.cpp
+++ b/src/IO/PeekableReadBuffer.cpp
@@ -175,7 +175,7 @@ bool PeekableReadBuffer::nextImpl()
 
     if (checkpoint_at_end)
     {
-        checkpoint.emplace(working_buffer.begin());
+        checkpoint.emplace(position());
         peeked_size = 0;
         checkpoint_in_own_memory = false;
     }
diff --git a/src/IO/ReadBufferAIO.cpp b/src/IO/ReadBufferAIO.cpp
index 39e3c26826a..c064e0d4ed9 100644
--- a/src/IO/ReadBufferAIO.cpp
+++ b/src/IO/ReadBufferAIO.cpp
@@ -106,7 +106,7 @@ bool ReadBufferAIO::nextImpl()
         ProfileInfo info;
         info.bytes_requested = requested_byte_count;
         info.bytes_read = bytes_read;
-        info.nanoseconds = watch->elapsed();
+        info.nanoseconds = watch->elapsed(); //-V1007
         profile_callback(info);
     }
 
diff --git a/src/IO/ReadBufferFromFileDecorator.cpp b/src/IO/ReadBufferFromFileDecorator.cpp
new file mode 100644
index 00000000000..db0c5117d63
--- /dev/null
+++ b/src/IO/ReadBufferFromFileDecorator.cpp
@@ -0,0 +1,46 @@
+#include <IO/ReadBufferFromFileDecorator.h>
+
+
+namespace DB
+{
+
+ReadBufferFromFileDecorator::ReadBufferFromFileDecorator(std::unique_ptr<ReadBufferFromFileBase> impl_)
+    : impl(std::move(impl_))
+{
+    swap(*impl);
+}
+
+
+std::string ReadBufferFromFileDecorator::getFileName() const
+{
+    return impl->getFileName();
+}
+
+
+off_t ReadBufferFromFileDecorator::getPosition()
+{
+    swap(*impl);
+    auto position = impl->getPosition();
+    swap(*impl);
+    return position;
+}
+
+
+off_t ReadBufferFromFileDecorator::seek(off_t off, int whence)
+{
+    swap(*impl);
+    auto result = impl->seek(off, whence);
+    swap(*impl);
+    return result;
+}
+
+
+bool ReadBufferFromFileDecorator::nextImpl()
+{
+    swap(*impl);
+    auto result = impl->next();
+    swap(*impl);
+    return result;
+}
+
+}
diff --git a/src/IO/ReadBufferFromFileDecorator.h b/src/IO/ReadBufferFromFileDecorator.h
new file mode 100644
index 00000000000..8b2796609b6
--- /dev/null
+++ b/src/IO/ReadBufferFromFileDecorator.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <IO/ReadBufferFromFileBase.h>
+
+
+namespace DB
+{
+
+/// Delegates all reads to underlying buffer. Doesn't have own memory.
+class ReadBufferFromFileDecorator : public ReadBufferFromFileBase
+{
+public:
+    explicit ReadBufferFromFileDecorator(std::unique_ptr<ReadBufferFromFileBase> impl_);
+
+    std::string getFileName() const override;
+
+    off_t getPosition() override;
+
+    off_t seek(off_t off, int whence) override;
+
+    bool nextImpl() override;
+
+protected:
+    std::unique_ptr<ReadBufferFromFileBase> impl;
+};
+
+}
diff --git a/src/IO/ReadBufferFromIStream.h b/src/IO/ReadBufferFromIStream.h
index 7f804783ba2..67cc60c053f 100644
--- a/src/IO/ReadBufferFromIStream.h
+++ b/src/IO/ReadBufferFromIStream.h
@@ -17,7 +17,7 @@ private:
     bool nextImpl() override;
 
 public:
-    ReadBufferFromIStream(std::istream & istr_, size_t size = DBMS_DEFAULT_BUFFER_SIZE);
+    explicit ReadBufferFromIStream(std::istream & istr_, size_t size = DBMS_DEFAULT_BUFFER_SIZE);
 };
 
 }
diff --git a/src/IO/ReadBufferFromPocoSocket.h b/src/IO/ReadBufferFromPocoSocket.h
index 032020c7330..c60aafc7e23 100644
--- a/src/IO/ReadBufferFromPocoSocket.h
+++ b/src/IO/ReadBufferFromPocoSocket.h
@@ -8,7 +8,7 @@
 namespace DB
 {
 
-using AsyncCallback = std::function<void(int, const Poco::Timespan &, const std::string &)>;
+using AsyncCallback = std::function<void(int, Poco::Timespan, const std::string &)>;
 
 /// Works with the ready Poco::Net::Socket. Blocking operations.
 class ReadBufferFromPocoSocket : public BufferWithOwnMemory<ReadBuffer>
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index fd07a7f309a..1e27b0284b7 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -12,10 +12,12 @@
 
 #    include <utility>
 
+
 namespace ProfileEvents
 {
     extern const Event S3ReadMicroseconds;
     extern const Event S3ReadBytes;
+    extern const Event S3ReadRequestsErrors;
 }
 
 namespace DB
@@ -29,26 +31,58 @@ namespace ErrorCodes
 
 
 ReadBufferFromS3::ReadBufferFromS3(
-    std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, const String & key_, size_t buffer_size_)
-    : SeekableReadBuffer(nullptr, 0), client_ptr(std::move(client_ptr_)), bucket(bucket_), key(key_), buffer_size(buffer_size_)
+    std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, const String & key_, UInt64 s3_max_single_read_retries_, size_t buffer_size_)
+    : SeekableReadBuffer(nullptr, 0)
+    , client_ptr(std::move(client_ptr_))
+    , bucket(bucket_)
+    , key(key_)
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
+    , buffer_size(buffer_size_)
 {
 }
 
-
 bool ReadBufferFromS3::nextImpl()
 {
-    if (!initialized)
-    {
+    /// Restoring valid value of `count()` during `nextImpl()`. See `ReadBuffer::next()`.
+    pos = working_buffer.begin();
+
+    if (!impl)
         impl = initialize();
-        initialized = true;
-    }
 
     Stopwatch watch;
-    auto res = impl->next();
+    bool next_result = false;
+
+    for (Int64 attempt = static_cast<Int64>(s3_max_single_read_retries); attempt >= 0; --attempt)
+    {
+        if (!impl)
+            impl = initialize();
+
+        try
+        {
+            next_result = impl->next();
+            /// FIXME. 1. Poco `istream` cannot read less than buffer_size or this state is being discarded during
+            ///           istream <-> iostream conversion. `gcount` always contains 0,
+            ///           that's why we always have error "Cannot read from istream at offset 0".
+
+            break;
+        }
+        catch (const Exception & e)
+        {
+            ProfileEvents::increment(ProfileEvents::S3ReadRequestsErrors, 1);
+
+            LOG_INFO(log, "Caught exception while reading S3 object. Bucket: {}, Key: {}, Offset: {}, Remaining attempts: {}, Message: {}",
+                    bucket, key, getPosition(), attempt, e.message());
+
+            impl.reset();
+
+            if (!attempt)
+                throw;
+        }
+    }
+
     watch.stop();
     ProfileEvents::increment(ProfileEvents::S3ReadMicroseconds, watch.elapsedMicroseconds());
-
-    if (!res)
+    if (!next_result)
         return false;
     internal_buffer = impl->buffer();
 
@@ -60,7 +94,7 @@ bool ReadBufferFromS3::nextImpl()
 
 off_t ReadBufferFromS3::seek(off_t offset_, int whence)
 {
-    if (initialized)
+    if (impl)
         throw Exception("Seek is allowed only before first read attempt from the buffer.", ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
 
     if (whence != SEEK_SET)
@@ -74,7 +108,6 @@ off_t ReadBufferFromS3::seek(off_t offset_, int whence)
     return offset;
 }
 
-
 off_t ReadBufferFromS3::getPosition()
 {
     return offset + count();
@@ -82,13 +115,13 @@ off_t ReadBufferFromS3::getPosition()
 
 std::unique_ptr<ReadBuffer> ReadBufferFromS3::initialize()
 {
-    LOG_TRACE(log, "Read S3 object. Bucket: {}, Key: {}, Offset: {}", bucket, key, std::to_string(offset));
+    LOG_TRACE(log, "Read S3 object. Bucket: {}, Key: {}, Offset: {}", bucket, key, getPosition());
 
     Aws::S3::Model::GetObjectRequest req;
     req.SetBucket(bucket);
     req.SetKey(key);
-    if (offset != 0)
-        req.SetRange("bytes=" + std::to_string(offset) + "-");
+    if (getPosition())
+        req.SetRange("bytes=" + std::to_string(getPosition()) + "-");
 
     Aws::S3::Model::GetObjectOutcome outcome = client_ptr->GetObject(req);
 
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index 829b73d0af6..1f4124d909f 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -27,8 +27,8 @@ private:
     std::shared_ptr<Aws::S3::S3Client> client_ptr;
     String bucket;
     String key;
+    UInt64 s3_max_single_read_retries;
     size_t buffer_size;
-    bool initialized = false;
     off_t offset = 0;
     Aws::S3::Model::GetObjectResult read_result;
     std::unique_ptr<ReadBuffer> impl;
@@ -40,6 +40,7 @@ public:
         std::shared_ptr<Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & key_,
+        UInt64 s3_max_single_read_retries_,
         size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE);
 
     bool nextImpl() override;
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index 72ffd74a42d..8e9a14a20fb 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -81,11 +81,6 @@ void parseUUIDWithoutSeparator(const UInt8 * src36, std::reverse_iterator<UInt8
     parseHex(&src36[16], dst16, 8);
 }
 
-UInt128 stringToUUID(const String & str)
-{
-    return parseFromString<UUID>(str);
-}
-
 void NO_INLINE throwAtAssertionFailed(const char * s, ReadBuffer & buf)
 {
     WriteBufferFromOwnString out;
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 369237f329d..a772d4ccd69 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -21,7 +21,6 @@
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Arena.h>
-#include <Common/UInt128.h>
 #include <Common/intExp.h>
 
 #include <Formats/FormatSettings.h>
@@ -51,7 +50,6 @@ namespace ErrorCodes
     extern const int CANNOT_PARSE_UUID;
     extern const int CANNOT_READ_ARRAY_FROM_TEXT;
     extern const int CANNOT_PARSE_NUMBER;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int INCORRECT_DATA;
 }
 
@@ -257,13 +255,12 @@ enum class ReadIntTextCheckOverflow
 template <typename T, typename ReturnType = void, ReadIntTextCheckOverflow check_overflow = ReadIntTextCheckOverflow::DO_NOT_CHECK_OVERFLOW>
 ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
 {
-    /// TODO: disabled for big ints cause of 127 vs 128 bit conversion
-    using UnsignedT = std::conditional_t<is_big_int_v<T>, T, make_unsigned_t<T>>;
+    using UnsignedT = make_unsigned_t<T>;
 
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
     bool negative = false;
-    UnsignedT res = 0;
+    UnsignedT res{};
     if (buf.eof())
     {
         if constexpr (throw_exception)
@@ -273,16 +270,37 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
     }
 
     const size_t initial_pos = buf.count();
+    bool has_sign = false;
+    bool has_number = false;
     while (!buf.eof())
     {
         switch (*buf.position())
         {
             case '+':
             {
+                if (has_sign || has_number)
+                {
+                    if constexpr (throw_exception)
+                        throw ParsingException(
+                            "Cannot parse number with multiple sign (+/-) characters or intermediate sign character",
+                            ErrorCodes::CANNOT_PARSE_NUMBER);
+                    else
+                        return ReturnType(false);
+                }
+                has_sign = true;
                 break;
             }
             case '-':
             {
+                if (has_sign || has_number)
+                {
+                    if constexpr (throw_exception)
+                        throw ParsingException(
+                            "Cannot parse number with multiple sign (+/-) characters or intermediate sign character",
+                            ErrorCodes::CANNOT_PARSE_NUMBER);
+                    else
+                        return ReturnType(false);
+                }
                 if constexpr (is_signed_v<T>)
                     negative = true;
                 else
@@ -292,6 +310,7 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
                     else
                         return ReturnType(false);
                 }
+                has_sign = true;
                 break;
             }
             case '0': [[fallthrough]];
@@ -305,7 +324,8 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
             case '8': [[fallthrough]];
             case '9':
             {
-                if constexpr (check_overflow == ReadIntTextCheckOverflow::CHECK_OVERFLOW)
+                has_number = true;
+                if constexpr (check_overflow == ReadIntTextCheckOverflow::CHECK_OVERFLOW && !is_big_int_v<T>)
                 {
                     /// Perform relativelly slow overflow check only when
                     /// number of decimal digits so far is close to the max for given type.
@@ -318,12 +338,8 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
                             || common::addOverflow<T>(signed_res, (*buf.position() - '0'), signed_res))
                             return ReturnType(false);
 
-                        /// Cannot assign signed to unsigned for big ints. Ignore fast path.
-                        if constexpr (!is_big_int_v<T>)
-                        {
-                            res = signed_res;
-                            break;
-                        }
+                        res = signed_res;
+                        break;
                     }
                 }
                 res *= 10;
@@ -337,6 +353,14 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
     }
 
 end:
+    if (has_sign && !has_number)
+    {
+        if constexpr (throw_exception)
+            throw ParsingException(
+                "Cannot parse number with a sign character but without any numeric character", ErrorCodes::CANNOT_PARSE_NUMBER);
+        else
+            return ReturnType(false);
+    }
     x = res;
     if constexpr (is_signed_v<T>)
     {
@@ -535,9 +559,6 @@ void parseUUIDWithoutSeparator(const UInt8 * src36, UInt8 * dst16);
 void parseUUID(const UInt8 * src36, std::reverse_iterator<UInt8 *> dst16);
 void parseUUIDWithoutSeparator(const UInt8 * src36, std::reverse_iterator<UInt8 *> dst16);
 
-template <typename IteratorSrc, typename IteratorDst>
-void formatHex(IteratorSrc src, IteratorDst dst, size_t num_bytes);
-
 
 template <typename ReturnType>
 ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf);
@@ -686,13 +707,6 @@ inline T parseFromString(const std::string_view & str)
     return parse<T>(str.data(), str.size());
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-// Just dont mess with it. If the redundant redeclaration is removed then ReaderHelpers.h should be included.
-// This leads to Arena.h inclusion which has a problem with ASAN stuff included properly and messing macro definition
-// which intefrers with... You dont want to know, really.
-UInt128 stringToUUID(const String & str);
-#pragma GCC diagnostic pop
 
 template <typename ReturnType = void>
 ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const DateLUTImpl & date_lut);
@@ -773,7 +787,8 @@ inline ReturnType readDateTimeTextImpl(DateTime64 & datetime64, UInt32 scale, Re
         while (!buf.eof() && isNumericASCII(*buf.position()))
             ++buf.position();
     }
-    else if (scale && (whole >= 1000000000LL * scale))
+    /// 9908870400 is time_t value for 2184-01-01 UTC (a bit over the last year supported by DateTime64)
+    else if (whole >= 9908870400LL)
     {
         /// Unix timestamp with subsecond precision, already scaled to integer.
         /// For disambiguation we support only time since 2001-09-09 01:46:40 UTC and less than 30 000 years in future.
@@ -838,16 +853,15 @@ readBinary(T & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 
 inline void readBinary(String & x, ReadBuffer & buf) { readStringBinary(x, buf); }
 inline void readBinary(Int128 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
+inline void readBinary(Int256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void readBinary(UInt128 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
-inline void readBinary(DummyUInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
+inline void readBinary(UInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void readBinary(Decimal32 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void readBinary(Decimal64 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void readBinary(Decimal128 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void readBinary(Decimal256 & x, ReadBuffer & buf) { readPODBinary(x.value, buf); }
 inline void readBinary(LocalDate & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 
-inline void readBinary(UInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
-inline void readBinary(Int256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 
 template <typename T>
 inline std::enable_if_t<is_arithmetic_v<T> && (sizeof(T) <= 8), void>
@@ -888,13 +902,6 @@ 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); }
 inline void readText(UUID & x, ReadBuffer & buf) { readUUIDText(x, buf); }
-[[noreturn]] inline void readText(UInt128 &, ReadBuffer &)
-{
-    /** Because UInt128 isn't a natural type, without arithmetic operator and only use as an intermediary type -for UUID-
-     *  it should never arrive here. But because we used the DataTypeNumber class we should have at least a definition of it.
-     */
-    throw Exception("UInt128 cannot be read as a text", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-}
 
 /// Generic methods to read value in text format,
 ///  possibly in single quotes (only for data types that use quotes in VALUES format of INSERT statement in SQL).
@@ -974,13 +981,8 @@ inline void readCSV(String & x, ReadBuffer & buf, const FormatSettings::CSV & se
 inline void readCSV(LocalDate & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 inline void readCSV(LocalDateTime & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 inline void readCSV(UUID & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
-[[noreturn]] inline void readCSV(UInt128 &, ReadBuffer &)
-{
-    /** Because UInt128 isn't a natural type, without arithmetic operator and only use as an intermediary type -for UUID-
-     *  it should never arrive here. But because we used the DataTypeNumber class we should have at least a definition of it.
-     */
-    throw Exception("UInt128 cannot be read as a text", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-}
+inline void readCSV(UInt128 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline void readCSV(Int128 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 inline void readCSV(UInt256 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 inline void readCSV(Int256 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
 
diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h
index 9cd37bd00f8..2f0d598cd6e 100644
--- a/src/IO/ReadWriteBufferFromHTTP.h
+++ b/src/IO/ReadWriteBufferFromHTTP.h
@@ -92,6 +92,7 @@ namespace detail
     protected:
         Poco::URI uri;
         std::string method;
+        std::string content_encoding;
 
         UpdatableSessionPtr session;
         std::istream * istr; /// owned by session
@@ -137,6 +138,7 @@ namespace detail
                 istr = receiveResponse(*sess, request, response, true);
                 response.getCookies(cookies);
 
+                content_encoding = response.get("Content-Encoding", "");
                 return istr;
 
             }
@@ -230,6 +232,11 @@ namespace detail
             /// Some data maybe already read
             next_callback(count());
         }
+
+        const std::string & getCompressionMethod() const
+        {
+            return content_encoding;
+        }
     };
 }
 
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index c31c12a1899..618d9ab7661 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -47,9 +47,11 @@ namespace DB::S3
 {
 
 PocoHTTPClientConfiguration::PocoHTTPClientConfiguration(
+        const String & force_region_,
         const RemoteHostFilter & remote_host_filter_,
         unsigned int s3_max_redirects_)
-    : remote_host_filter(remote_host_filter_)
+    : force_region(force_region_)
+    , remote_host_filter(remote_host_filter_)
     , s3_max_redirects(s3_max_redirects_)
 {
 }
@@ -63,15 +65,23 @@ void PocoHTTPClientConfiguration::updateSchemeAndRegion()
         if (uri.getScheme() == "http")
             scheme = Aws::Http::Scheme::HTTP;
 
-        String matched_region;
-        if (re2::RE2::PartialMatch(uri.getHost(), region_pattern, &matched_region))
+        if (force_region.empty())
         {
-            boost::algorithm::to_lower(matched_region);
-            region = matched_region;
+            String matched_region;
+            if (re2::RE2::PartialMatch(uri.getHost(), region_pattern, &matched_region))
+            {
+                boost::algorithm::to_lower(matched_region);
+                region = matched_region;
+            }
+            else
+            {
+                /// In global mode AWS C++ SDK send `us-east-1` but accept switching to another one if being suggested.
+                region = Aws::Region::AWS_GLOBAL;
+            }
         }
         else
         {
-            region = Aws::Region::AWS_GLOBAL;
+            region = force_region;
         }
     }
 }
@@ -81,8 +91,8 @@ PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfigu
     : per_request_configuration(clientConfiguration.perRequestConfiguration)
     , timeouts(ConnectionTimeouts(
           Poco::Timespan(clientConfiguration.connectTimeoutMs * 1000), /// connection timeout.
-          Poco::Timespan(clientConfiguration.httpRequestTimeoutMs * 1000), /// send timeout.
-          Poco::Timespan(clientConfiguration.httpRequestTimeoutMs * 1000) /// receive timeout.
+          Poco::Timespan(clientConfiguration.requestTimeoutMs * 1000), /// send timeout.
+          Poco::Timespan(clientConfiguration.requestTimeoutMs * 1000) /// receive timeout.
           ))
     , remote_host_filter(clientConfiguration.remote_host_filter)
     , s3_max_redirects(clientConfiguration.s3_max_redirects)
@@ -176,7 +186,32 @@ void PocoHTTPClient::makeRequestInternal(
 
             Poco::Net::HTTPRequest poco_request(Poco::Net::HTTPRequest::HTTP_1_1);
 
-            poco_request.setURI(target_uri.getPathAndQuery());
+            /** Aws::Http::URI will encode URL in appropriate way for AWS S3 server.
+              * Poco::URI also does that correctly but it's not compatible with AWS.
+              * For example, `+` symbol will not be converted to `%2B` by Poco and would
+              * be received as space symbol.
+              *
+              * References:
+              * https://github.com/aws/aws-sdk-java/issues/1946
+              * https://forums.aws.amazon.com/thread.jspa?threadID=55746
+              *
+              * Example:
+              * Suppose we are requesting a file: abc+def.txt
+              * To correctly do it, we need to construct an URL containing either:
+              * - abc%2Bdef.txt
+              * this is also technically correct:
+              * - abc+def.txt
+              * but AWS servers don't support it properly, interpreting plus character as whitespace
+              * although it is in path part, not in query string.
+              * e.g. this is not correct:
+              * - abc%20def.txt
+              *
+              * Poco will keep plus character as is (which is correct) while AWS servers will treat it as whitespace, which is not what is intended.
+              * To overcome this limitation, we encode URL with "Aws::Http::URI" and then pass already prepared URL to Poco.
+              */
+
+            Aws::Http::URI aws_target_uri(uri);
+            poco_request.setURI(aws_target_uri.GetPath() + aws_target_uri.GetQueryString());
 
             switch (request.GetMethod())
             {
@@ -254,25 +289,16 @@ void PocoHTTPClient::makeRequestInternal(
             }
             LOG_DEBUG(log, "Received headers: {}", headers_ss.str());
 
-            if (status_code >= 300)
-            {
-                String error_message;
-                Poco::StreamCopier::copyToString(response_body_stream, error_message);
-
-                response->SetClientErrorType(Aws::Client::CoreErrors::NETWORK_CONNECTION);
-                response->SetClientErrorMessage(error_message);
-
-                if (status_code == 429 || status_code == 503)
-                { // API throttling
-                    ProfileEvents::increment(select_metric(S3MetricType::Throttling));
-                }
-                else
-                {
-                    ProfileEvents::increment(select_metric(S3MetricType::Errors));
-                }
+            if (status_code == 429 || status_code == 503)
+            { // API throttling
+                ProfileEvents::increment(select_metric(S3MetricType::Throttling));
             }
-            else
-                response->SetResponseBody(response_body_stream, session);
+            else if (status_code >= 300)
+            {
+                ProfileEvents::increment(select_metric(S3MetricType::Errors));
+            }
+
+            response->SetResponseBody(response_body_stream, session);
 
             return;
         }
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index da6c4dd5985..a3e10494284 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -1,13 +1,17 @@
 #pragma once
 
+#include <Common/config.h>
+
+#if USE_AWS_S3
+
 #include <Common/RemoteHostFilter.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/S3/SessionAwareIOStream.h>
-#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>
+#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
 
 namespace Aws::Http::Standard
 {
@@ -25,13 +29,14 @@ class ClientFactory;
 
 struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
 {
+    String force_region;
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
 
     void updateSchemeAndRegion();
 
 private:
-    PocoHTTPClientConfiguration(const RemoteHostFilter & remote_host_filter_, unsigned int s3_max_redirects_);
+    PocoHTTPClientConfiguration(const String & force_region_, const RemoteHostFilter & remote_host_filter_, unsigned int s3_max_redirects_);
 
     /// Constructor of Aws::Client::ClientConfiguration must be called after AWS SDK initialization.
     friend ClientFactory;
@@ -94,3 +99,5 @@ private:
 };
 
 }
+
+#endif
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index f9962735ddc..ff9eafc9bc7 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -6,16 +6,20 @@
 #    include <IO/WriteBufferFromString.h>
 #    include <Storages/StorageS3Settings.h>
 
+#    include <aws/core/Version.h>
 #    include <aws/core/auth/AWSCredentialsProvider.h>
 #    include <aws/core/auth/AWSCredentialsProviderChain.h>
 #    include <aws/core/auth/STSCredentialsProvider.h>
 #    include <aws/core/client/DefaultRetryStrategy.h>
 #    include <aws/core/platform/Environment.h>
+#    include <aws/core/platform/OSVersionInfo.h>
+#    include <aws/core/utils/json/JsonSerializer.h>
 #    include <aws/core/utils/logging/LogMacros.h>
 #    include <aws/core/utils/logging/LogSystemInterface.h>
 #    include <aws/core/utils/HashingUtils.h>
-#    include <aws/s3/S3Client.h>
 #    include <aws/core/http/HttpClientFactory.h>
+#    include <aws/s3/S3Client.h>
+
 #    include <IO/S3/PocoHTTPClientFactory.h>
 #    include <IO/S3/PocoHTTPClient.h>
 #    include <Poco/URI.h>
@@ -91,28 +95,289 @@ private:
     std::unordered_map<String, Poco::Logger *> tag_loggers;
 };
 
+class AWSEC2MetadataClient : public Aws::Internal::AWSHttpResourceClient
+{
+    static constexpr char EC2_SECURITY_CREDENTIALS_RESOURCE[] = "/latest/meta-data/iam/security-credentials";
+    static constexpr char EC2_IMDS_TOKEN_RESOURCE[] = "/latest/api/token";
+    static constexpr char EC2_IMDS_TOKEN_HEADER[] = "x-aws-ec2-metadata-token";
+    static constexpr char EC2_IMDS_TOKEN_TTL_DEFAULT_VALUE[] = "21600";
+    static constexpr char EC2_IMDS_TOKEN_TTL_HEADER[] = "x-aws-ec2-metadata-token-ttl-seconds";
+
+    static constexpr char EC2_DEFAULT_METADATA_ENDPOINT[] = "http://169.254.169.254";
+
+public:
+    /// See EC2MetadataClient.
+
+    explicit AWSEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration)
+        : Aws::Internal::AWSHttpResourceClient(client_configuration)
+        , logger(&Poco::Logger::get("AWSEC2InstanceProfileConfigLoader"))
+    {
+    }
+
+    AWSEC2MetadataClient& operator =(const AWSEC2MetadataClient & rhs) = delete;
+    AWSEC2MetadataClient(const AWSEC2MetadataClient & rhs) = delete;
+    AWSEC2MetadataClient& operator =(const AWSEC2MetadataClient && rhs) = delete;
+    AWSEC2MetadataClient(const AWSEC2MetadataClient && rhs) = delete;
+
+    virtual ~AWSEC2MetadataClient() override = default;
+
+    using Aws::Internal::AWSHttpResourceClient::GetResource;
+
+    virtual Aws::String GetResource(const char * resource_path) const
+    {
+        return GetResource(endpoint.c_str(), resource_path, nullptr/*authToken*/);
+    }
+
+    virtual Aws::String getDefaultCredentials() const
+    {
+        String credentials_string;
+        {
+            std::unique_lock<std::recursive_mutex> locker(token_mutex);
+
+            LOG_TRACE(logger, "Getting default credentials for EC2 instance.");
+            auto result = GetResourceWithAWSWebServiceResult(endpoint.c_str(), EC2_SECURITY_CREDENTIALS_RESOURCE, nullptr);
+            credentials_string = result.GetPayload();
+            if (result.GetResponseCode() == Aws::Http::HttpResponseCode::UNAUTHORIZED)
+            {
+                return {};
+            }
+        }
+
+        String trimmed_credentials_string = Aws::Utils::StringUtils::Trim(credentials_string.c_str());
+        if (trimmed_credentials_string.empty())
+            return {};
+
+        std::vector<String> security_credentials = Aws::Utils::StringUtils::Split(trimmed_credentials_string, '\n');
+
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource, {} returned credential string {}.",
+                EC2_SECURITY_CREDENTIALS_RESOURCE, trimmed_credentials_string);
+
+        if (security_credentials.empty())
+        {
+            LOG_WARNING(logger, "Initial call to EC2MetadataService to get credentials failed.");
+            return {};
+        }
+
+        Aws::StringStream ss;
+        ss << EC2_SECURITY_CREDENTIALS_RESOURCE << "/" << security_credentials[0];
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource {}.", ss.str());
+        return GetResource(ss.str().c_str());
+    }
+
+    static Aws::String awsComputeUserAgentString()
+    {
+        Aws::StringStream ss;
+        ss << "aws-sdk-cpp/" << Aws::Version::GetVersionString() << " " << Aws::OSVersionInfo::ComputeOSVersionString()
+                << " " << Aws::Version::GetCompilerVersionString();
+        return ss.str();
+    }
+
+    virtual Aws::String getDefaultCredentialsSecurely() const
+    {
+        String user_agent_string = awsComputeUserAgentString();
+        String new_token;
+
+        {
+            std::unique_lock<std::recursive_mutex> locker(token_mutex);
+
+            Aws::StringStream ss;
+            ss << endpoint << EC2_IMDS_TOKEN_RESOURCE;
+            std::shared_ptr<Aws::Http::HttpRequest> token_request(Aws::Http::CreateHttpRequest(ss.str(), Aws::Http::HttpMethod::HTTP_PUT,
+                                                                        Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+            token_request->SetHeaderValue(EC2_IMDS_TOKEN_TTL_HEADER, EC2_IMDS_TOKEN_TTL_DEFAULT_VALUE);
+            token_request->SetUserAgent(user_agent_string);
+            LOG_TRACE(logger, "Calling EC2MetadataService to get token.");
+            auto result = GetResourceWithAWSWebServiceResult(token_request);
+            const String & token_string = result.GetPayload();
+            new_token = Aws::Utils::StringUtils::Trim(token_string.c_str());
+
+            if (result.GetResponseCode() == Aws::Http::HttpResponseCode::BAD_REQUEST)
+            {
+                return {};
+            }
+            else if (result.GetResponseCode() != Aws::Http::HttpResponseCode::OK || new_token.empty())
+            {
+                LOG_TRACE(logger, "Calling EC2MetadataService to get token failed, falling back to less secure way.");
+                return getDefaultCredentials();
+            }
+            token = new_token;
+        }
+
+        String url = endpoint + EC2_SECURITY_CREDENTIALS_RESOURCE;
+        std::shared_ptr<Aws::Http::HttpRequest> profile_request(Aws::Http::CreateHttpRequest(url,
+                Aws::Http::HttpMethod::HTTP_GET,
+                Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+        profile_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, new_token);
+        profile_request->SetUserAgent(user_agent_string);
+        String profile_string = GetResourceWithAWSWebServiceResult(profile_request).GetPayload();
+
+        String trimmed_profile_string = Aws::Utils::StringUtils::Trim(profile_string.c_str());
+        std::vector<String> security_credentials = Aws::Utils::StringUtils::Split(trimmed_profile_string, '\n');
+
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource, {} with token returned profile string {}.",
+                EC2_SECURITY_CREDENTIALS_RESOURCE, trimmed_profile_string);
+
+        if (security_credentials.empty())
+        {
+            LOG_WARNING(logger, "Calling EC2Metadataservice to get profiles failed.");
+            return {};
+        }
+
+        Aws::StringStream ss;
+        ss << endpoint << EC2_SECURITY_CREDENTIALS_RESOURCE << "/" << security_credentials[0];
+        std::shared_ptr<Aws::Http::HttpRequest> credentials_request(Aws::Http::CreateHttpRequest(ss.str(),
+                Aws::Http::HttpMethod::HTTP_GET,
+                Aws::Utils::Stream::DefaultResponseStreamFactoryMethod));
+        credentials_request->SetHeaderValue(EC2_IMDS_TOKEN_HEADER, new_token);
+        credentials_request->SetUserAgent(user_agent_string);
+        LOG_DEBUG(logger, "Calling EC2MetadataService resource {} with token.", ss.str());
+        return GetResourceWithAWSWebServiceResult(credentials_request).GetPayload();
+    }
+
+    virtual Aws::String getCurrentRegion() const
+    {
+        return Aws::Region::AWS_GLOBAL;
+    }
+
+private:
+    const Aws::String endpoint = EC2_DEFAULT_METADATA_ENDPOINT;
+    mutable std::recursive_mutex token_mutex;
+    mutable Aws::String token;
+    Poco::Logger * logger;
+};
+
+class AWSEC2InstanceProfileConfigLoader : public Aws::Config::AWSProfileConfigLoader
+{
+public:
+    explicit AWSEC2InstanceProfileConfigLoader(const std::shared_ptr<AWSEC2MetadataClient> & client_, bool use_secure_pull_)
+        : client(client_)
+        , use_secure_pull(use_secure_pull_)
+        , logger(&Poco::Logger::get("AWSEC2InstanceProfileConfigLoader"))
+    {
+    }
+
+    virtual ~AWSEC2InstanceProfileConfigLoader() override = default;
+
+protected:
+    virtual bool LoadInternal() override
+    {
+        auto credentials_str = use_secure_pull ? client->getDefaultCredentialsSecurely() : client->getDefaultCredentials();
+
+        /// See EC2InstanceProfileConfigLoader.
+        if (credentials_str.empty())
+            return false;
+
+        Aws::Utils::Json::JsonValue credentials_doc(credentials_str);
+        if (!credentials_doc.WasParseSuccessful())
+        {
+            LOG_ERROR(logger, "Failed to parse output from EC2MetadataService.");
+            return false;
+        }
+        String access_key, secret_key, token;
+
+        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);
+
+        secret_key = credentials_view.GetString("SecretAccessKey");
+        token = credentials_view.GetString("Token");
+
+        auto region = client->getCurrentRegion();
+
+        Aws::Config::Profile profile;
+        profile.SetCredentials(Aws::Auth::AWSCredentials(access_key, secret_key, token));
+        profile.SetRegion(region);
+        profile.SetName(Aws::Config::INSTANCE_PROFILE_KEY);
+
+        m_profiles[Aws::Config::INSTANCE_PROFILE_KEY] = profile;
+
+        return true;
+    }
+
+private:
+    std::shared_ptr<AWSEC2MetadataClient> client;
+    bool use_secure_pull;
+    Poco::Logger * logger;
+};
+
+class AWSInstanceProfileCredentialsProvider : public Aws::Auth::AWSCredentialsProvider
+{
+public:
+    /// See InstanceProfileCredentialsProvider.
+
+    explicit AWSInstanceProfileCredentialsProvider(const std::shared_ptr<AWSEC2InstanceProfileConfigLoader> & config_loader)
+        : ec2_metadata_config_loader(config_loader)
+        , load_frequency_ms(Aws::Auth::REFRESH_THRESHOLD)
+        , logger(&Poco::Logger::get("AWSInstanceProfileCredentialsProvider"))
+    {
+        LOG_INFO(logger, "Creating Instance with injected EC2MetadataClient and refresh rate {}.");
+    }
+
+    Aws::Auth::AWSCredentials GetAWSCredentials() override
+    {
+        refreshIfExpired();
+        Aws::Utils::Threading::ReaderLockGuard guard(m_reloadLock);
+        auto profile_it = ec2_metadata_config_loader->GetProfiles().find(Aws::Config::INSTANCE_PROFILE_KEY);
+
+        if (profile_it != ec2_metadata_config_loader->GetProfiles().end())
+        {
+            return profile_it->second.GetCredentials();
+        }
+
+        return Aws::Auth::AWSCredentials();
+    }
+
+protected:
+    void Reload() override
+    {
+        LOG_INFO(logger, "Credentials have expired attempting to repull from EC2 Metadata Service.");
+        ec2_metadata_config_loader->Load();
+        AWSCredentialsProvider::Reload();
+    }
+
+private:
+    void refreshIfExpired()
+    {
+        LOG_DEBUG(logger, "Checking if latest credential pull has expired.");
+        Aws::Utils::Threading::ReaderLockGuard guard(m_reloadLock);
+        if (!IsTimeToRefresh(load_frequency_ms))
+        {
+            return;
+        }
+
+        guard.UpgradeToWriterLock();
+        if (!IsTimeToRefresh(load_frequency_ms)) // double-checked lock to avoid refreshing twice
+        {
+            return;
+        }
+        Reload();
+    }
+
+    std::shared_ptr<AWSEC2InstanceProfileConfigLoader> ec2_metadata_config_loader;
+    Int64 load_frequency_ms;
+    Poco::Logger * logger;
+};
+
 class S3CredentialsProviderChain : public Aws::Auth::AWSCredentialsProviderChain
 {
 public:
-    explicit S3CredentialsProviderChain(const DB::S3::PocoHTTPClientConfiguration & configuration, const Aws::Auth::AWSCredentials & credentials, bool use_environment_credentials)
+    explicit S3CredentialsProviderChain(const DB::S3::PocoHTTPClientConfiguration & configuration, const Aws::Auth::AWSCredentials & credentials, bool use_environment_credentials, bool use_insecure_imds_request)
     {
+        auto * logger = &Poco::Logger::get("S3CredentialsProviderChain");
+
         if (use_environment_credentials)
         {
-            const DB::RemoteHostFilter & remote_host_filter = configuration.remote_host_filter;
-            const unsigned int s3_max_redirects = configuration.s3_max_redirects;
-
             static const char AWS_ECS_CONTAINER_CREDENTIALS_RELATIVE_URI[] = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI";
             static const char AWS_ECS_CONTAINER_CREDENTIALS_FULL_URI[] = "AWS_CONTAINER_CREDENTIALS_FULL_URI";
             static const char AWS_ECS_CONTAINER_AUTHORIZATION_TOKEN[] = "AWS_CONTAINER_AUTHORIZATION_TOKEN";
             static const char AWS_EC2_METADATA_DISABLED[] = "AWS_EC2_METADATA_DISABLED";
 
-            auto * logger = &Poco::Logger::get("S3CredentialsProviderChain");
-
             /// The only difference from DefaultAWSCredentialsProviderChain::DefaultAWSCredentialsProviderChain()
             /// is that this chain uses custom ClientConfiguration.
 
             AddProvider(std::make_shared<Aws::Auth::EnvironmentAWSCredentialsProvider>());
             AddProvider(std::make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>());
+            AddProvider(std::make_shared<Aws::Auth::ProcessCredentialsProvider>());
             AddProvider(std::make_shared<Aws::Auth::STSAssumeRoleWebIdentityCredentialsProvider>());
 
             /// ECS TaskRole Credentials only available when ENVIRONMENT VARIABLE is set.
@@ -145,7 +410,7 @@ public:
             }
             else if (Aws::Utils::StringUtils::ToLower(ec2_metadata_disabled.c_str()) != "true")
             {
-                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(remote_host_filter, s3_max_redirects);
+                DB::S3::PocoHTTPClientConfiguration aws_client_configuration = DB::S3::ClientFactory::instance().createClientConfiguration(configuration.region, configuration.remote_host_filter, configuration.s3_max_redirects);
 
                 /// See MakeDefaultHttpResourceClientConfiguration().
                 /// This is part of EC2 metadata client, but unfortunately it can't be accessed from outside
@@ -163,13 +428,16 @@ public:
                 /// EC2MetadataService throttles by delaying the response so the service client should set a large read timeout.
                 /// EC2MetadataService delay is in order of seconds so it only make sense to retry after a couple of seconds.
                 aws_client_configuration.connectTimeoutMs = 1000;
+
+                /// FIXME. Somehow this timeout does not work in docker without --net=host.
                 aws_client_configuration.requestTimeoutMs = 1000;
+
                 aws_client_configuration.retryStrategy = std::make_shared<Aws::Client::DefaultRetryStrategy>(1, 1000);
 
-                auto ec2_metadata_client = std::make_shared<Aws::Internal::EC2MetadataClient>(aws_client_configuration);
-                auto config_loader = std::make_shared<Aws::Config::EC2InstanceProfileConfigLoader>(ec2_metadata_client);
+                auto ec2_metadata_client = std::make_shared<AWSEC2MetadataClient>(aws_client_configuration);
+                auto config_loader = std::make_shared<AWSEC2InstanceProfileConfigLoader>(ec2_metadata_client, !use_insecure_imds_request);
 
-                AddProvider(std::make_shared<Aws::Auth::InstanceProfileCredentialsProvider>(config_loader));
+                AddProvider(std::make_shared<AWSInstanceProfileCredentialsProvider>(config_loader));
                 LOG_INFO(logger, "Added EC2 metadata service credentials provider to the provider chain.");
             }
         }
@@ -185,12 +453,14 @@ public:
         const Aws::Client::ClientConfiguration & client_configuration,
         const Aws::Auth::AWSCredentials & credentials,
         const DB::HeaderCollection & headers_,
-        bool use_environment_credentials)
+        bool use_environment_credentials,
+        bool use_insecure_imds_request)
         : Aws::Client::AWSAuthV4Signer(
             std::make_shared<S3CredentialsProviderChain>(
                 static_cast<const DB::S3::PocoHTTPClientConfiguration &>(client_configuration),
                 credentials,
-                use_environment_credentials),
+                use_environment_credentials,
+                use_insecure_imds_request),
             "s3",
             client_configuration.region,
             Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
@@ -281,7 +551,8 @@ namespace S3
         const String & secret_access_key,
         const String & server_side_encryption_customer_key_base64,
         HeaderCollection headers,
-        bool use_environment_credentials)
+        bool use_environment_credentials,
+        bool use_insecure_imds_request)
     {
         PocoHTTPClientConfiguration client_configuration = cfg_;
         client_configuration.updateSchemeAndRegion();
@@ -308,7 +579,8 @@ namespace S3
             client_configuration,
             std::move(credentials),
             std::move(headers),
-            use_environment_credentials);
+            use_environment_credentials,
+            use_insecure_imds_request);
 
         return std::make_shared<Aws::S3::S3Client>(
             std::move(auth_signer),
@@ -318,10 +590,11 @@ namespace S3
     }
 
     PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
+        const String & force_region,
         const RemoteHostFilter & remote_host_filter,
         unsigned int s3_max_redirects)
     {
-        return PocoHTTPClientConfiguration(remote_host_filter, s3_max_redirects);
+        return PocoHTTPClientConfiguration(force_region, remote_host_filter, s3_max_redirects);
     }
 
     URI::URI(const Poco::URI & uri_)
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index b071daefee1..a2f5717941d 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -5,8 +5,8 @@
 #if USE_AWS_S3
 
 #include <common/types.h>
-#include <aws/core/Aws.h>
-#include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/Aws.h>  // Y_IGNORE
+#include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
 #include <IO/S3/PocoHTTPClient.h>
 #include <Poco/URI.h>
 
@@ -38,9 +38,11 @@ public:
         const String & secret_access_key,
         const String & server_side_encryption_customer_key_base64,
         HeaderCollection headers,
-        bool use_environment_credentials);
+        bool use_environment_credentials,
+        bool use_insecure_imds_request);
 
     PocoHTTPClientConfiguration createClientConfiguration(
+        const String & force_region,
         const RemoteHostFilter & remote_host_filter,
         unsigned int s3_max_redirects);
 
diff --git a/src/IO/SeekAvoidingReadBuffer.cpp b/src/IO/SeekAvoidingReadBuffer.cpp
index b27220a88b3..2ce2db977df 100644
--- a/src/IO/SeekAvoidingReadBuffer.cpp
+++ b/src/IO/SeekAvoidingReadBuffer.cpp
@@ -4,28 +4,10 @@
 namespace DB
 {
 
-SeekAvoidingReadBuffer::SeekAvoidingReadBuffer(std::unique_ptr<ReadBufferFromFileBase> nested_, UInt64 min_bytes_for_seek_)
-    : nested(std::move(nested_))
+SeekAvoidingReadBuffer::SeekAvoidingReadBuffer(std::unique_ptr<ReadBufferFromFileBase> impl_, UInt64 min_bytes_for_seek_)
+    : ReadBufferFromFileDecorator(std::move(impl_))
     , min_bytes_for_seek(min_bytes_for_seek_)
-{
-    swap(*nested);
-}
-
-
-std::string SeekAvoidingReadBuffer::getFileName() const
-{
-    return nested->getFileName();
-}
-
-
-off_t SeekAvoidingReadBuffer::getPosition()
-{
-    swap(*nested);
-    off_t position = nested->getPosition();
-    swap(*nested);
-    return position;
-}
-
+{ }
 
 off_t SeekAvoidingReadBuffer::seek(off_t off, int whence)
 {
@@ -39,28 +21,13 @@ off_t SeekAvoidingReadBuffer::seek(off_t off, int whence)
 
     if (whence == SEEK_SET && off >= position && off < position + static_cast<off_t>(min_bytes_for_seek))
     {
-        swap(*nested);
-        nested->ignore(off - position);
-        swap(*nested);
-        position = off;
-    }
-    else
-    {
-        swap(*nested);
-        position = nested->seek(off, whence);
-        swap(*nested);
+        swap(*impl);
+        impl->ignore(off - position);
+        swap(*impl);
+        return off;
     }
 
-    return position;
-}
-
-
-bool SeekAvoidingReadBuffer::nextImpl()
-{
-    swap(*nested);
-    bool nested_result = nested->next();
-    swap(*nested);
-    return nested_result;
+    return ReadBufferFromFileDecorator::seek(off, whence);
 }
 
 }
diff --git a/src/IO/SeekAvoidingReadBuffer.h b/src/IO/SeekAvoidingReadBuffer.h
index 9ab20538f1a..5896efc4462 100644
--- a/src/IO/SeekAvoidingReadBuffer.h
+++ b/src/IO/SeekAvoidingReadBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ReadBufferFromFileBase.h>
+#include <IO/ReadBufferFromFileDecorator.h>
 
 
 namespace DB
@@ -10,22 +10,15 @@ namespace DB
 /// It is useful in network and spinning disk storage media when seek is relatively expensive
 /// operation.
 /// See also: `merge_tree_min_rows_for_seek`.
-class SeekAvoidingReadBuffer : public ReadBufferFromFileBase
+class SeekAvoidingReadBuffer : public ReadBufferFromFileDecorator
 {
-    std::unique_ptr<ReadBufferFromFileBase> nested;
-
-    UInt64 min_bytes_for_seek; /// Minimum positive seek offset which shall be executed using seek operation.
-
 public:
-    SeekAvoidingReadBuffer(std::unique_ptr<ReadBufferFromFileBase> nested_, UInt64 min_bytes_for_seek_);
-
-    std::string getFileName() const override;
-
-    off_t getPosition() override;
+    SeekAvoidingReadBuffer(std::unique_ptr<ReadBufferFromFileBase> impl_, UInt64 min_bytes_for_seek_);
 
     off_t seek(off_t off, int whence) override;
 
-    bool nextImpl() override;
+private:
+    UInt64 min_bytes_for_seek; /// Minimum positive seek offset which shall be executed using seek operation.
 };
 
 }
diff --git a/src/IO/TimeoutSetter.cpp b/src/IO/TimeoutSetter.cpp
index f06cafecff8..a82e526bf30 100644
--- a/src/IO/TimeoutSetter.cpp
+++ b/src/IO/TimeoutSetter.cpp
@@ -2,11 +2,13 @@
 
 #include <common/logger_useful.h>
 
+
 namespace DB
 {
+
 TimeoutSetter::TimeoutSetter(Poco::Net::StreamSocket & socket_,
-    const Poco::Timespan & send_timeout_,
-    const Poco::Timespan & receive_timeout_,
+    Poco::Timespan send_timeout_,
+    Poco::Timespan receive_timeout_,
     bool limit_max_timeout)
     : socket(socket_), send_timeout(send_timeout_), receive_timeout(receive_timeout_)
 {
@@ -20,7 +22,7 @@ TimeoutSetter::TimeoutSetter(Poco::Net::StreamSocket & socket_,
         socket.setReceiveTimeout(receive_timeout);
 }
 
-TimeoutSetter::TimeoutSetter(Poco::Net::StreamSocket & socket_, const Poco::Timespan & timeout_, bool limit_max_timeout)
+TimeoutSetter::TimeoutSetter(Poco::Net::StreamSocket & socket_, Poco::Timespan timeout_, bool limit_max_timeout)
     : TimeoutSetter(socket_, timeout_, timeout_, limit_max_timeout)
 {
 }
@@ -32,10 +34,12 @@ TimeoutSetter::~TimeoutSetter()
         socket.setSendTimeout(old_send_timeout);
         socket.setReceiveTimeout(old_receive_timeout);
     }
-    catch (std::exception & e)
+    catch (...)
     {
-        // Sometimes caught on macos
-        LOG_ERROR(&Poco::Logger::get("Client"), "TimeoutSetter: Can't reset timeouts: {}", e.what());
+        /// Sometimes caught on Mac OS X. This message can be safely ignored.
+        /// If you are developer using Mac, please debug this error message by yourself.
+        tryLogCurrentException("Client", "TimeoutSetter: Can't reset timeouts");
     }
 }
+
 }
diff --git a/src/IO/TimeoutSetter.h b/src/IO/TimeoutSetter.h
index ce6c8fe3ce8..31c37ea07af 100644
--- a/src/IO/TimeoutSetter.h
+++ b/src/IO/TimeoutSetter.h
@@ -11,11 +11,11 @@ namespace DB
 struct TimeoutSetter
 {
     TimeoutSetter(Poco::Net::StreamSocket & socket_,
-        const Poco::Timespan & send_timeout_,
-        const Poco::Timespan & receive_timeout_,
+        Poco::Timespan send_timeout_,
+        Poco::Timespan receive_timeout_,
         bool limit_max_timeout = false);
 
-    TimeoutSetter(Poco::Net::StreamSocket & socket_, const Poco::Timespan & timeout_, bool limit_max_timeout = false);
+    TimeoutSetter(Poco::Net::StreamSocket & socket_, Poco::Timespan timeout_, bool limit_max_timeout = false);
 
     ~TimeoutSetter();
 
diff --git a/src/IO/UncompressedCache.h b/src/IO/UncompressedCache.h
index b2f62ef2ada..5826b7f020a 100644
--- a/src/IO/UncompressedCache.h
+++ b/src/IO/UncompressedCache.h
@@ -2,8 +2,8 @@
 
 #include <Common/LRUCache.h>
 #include <Common/SipHash.h>
-#include <Common/UInt128.h>
 #include <Common/ProfileEvents.h>
+#include <Common/HashTable/Hash.h>
 #include <IO/BufferWithOwnMemory.h>
 
 
@@ -53,7 +53,7 @@ public:
         SipHash hash;
         hash.update(path_to_file.data(), path_to_file.size() + 1);
         hash.update(offset);
-        hash.get128(key.low, key.high);
+        hash.get128(key);
 
         return key;
     }
diff --git a/src/IO/WriteBufferFromFile.cpp b/src/IO/WriteBufferFromFile.cpp
index b3a63842326..67cd7ba27d6 100644
--- a/src/IO/WriteBufferFromFile.cpp
+++ b/src/IO/WriteBufferFromFile.cpp
@@ -79,7 +79,7 @@ WriteBufferFromFile::~WriteBufferFromFile()
         return;
 
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     next();
 
diff --git a/src/IO/WriteBufferFromFileDecorator.cpp b/src/IO/WriteBufferFromFileDecorator.cpp
new file mode 100644
index 00000000000..9fc7c6dd7cf
--- /dev/null
+++ b/src/IO/WriteBufferFromFileDecorator.cpp
@@ -0,0 +1,56 @@
+#include "WriteBufferFromFileDecorator.h"
+
+#include <IO/WriteBuffer.h>
+
+namespace DB
+{
+
+WriteBufferFromFileDecorator::WriteBufferFromFileDecorator(std::unique_ptr<WriteBuffer> impl_)
+    : WriteBufferFromFileBase(0, nullptr, 0), impl(std::move(impl_))
+{
+    swap(*impl);
+}
+
+void WriteBufferFromFileDecorator::finalize()
+{
+    if (finalized)
+        return;
+
+    next();
+    impl->finalize();
+
+    finalized = true;
+}
+
+WriteBufferFromFileDecorator::~WriteBufferFromFileDecorator()
+{
+    try
+    {
+        WriteBufferFromFileDecorator::finalize();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void WriteBufferFromFileDecorator::sync()
+{
+    impl->sync();
+}
+
+std::string WriteBufferFromFileDecorator::getFileName() const
+{
+    if (WriteBufferFromFileBase * buffer = dynamic_cast<WriteBufferFromFileBase*>(impl.get()))
+        return buffer->getFileName();
+    return std::string();
+}
+
+void WriteBufferFromFileDecorator::nextImpl()
+{
+    swap(*impl);
+    impl->next();
+    swap(*impl);
+}
+
+}
diff --git a/src/IO/WriteBufferFromFileDecorator.h b/src/IO/WriteBufferFromFileDecorator.h
new file mode 100644
index 00000000000..30e415c0756
--- /dev/null
+++ b/src/IO/WriteBufferFromFileDecorator.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <IO/WriteBufferFromFileBase.h>
+
+namespace DB
+{
+
+/// Delegates all writes to underlying buffer. Doesn't have own memory.
+class WriteBufferFromFileDecorator : public WriteBufferFromFileBase
+{
+public:
+    explicit WriteBufferFromFileDecorator(std::unique_ptr<WriteBuffer> impl_);
+
+    ~WriteBufferFromFileDecorator() override;
+
+    void finalize() override;
+
+    void sync() override;
+
+    std::string getFileName() const override;
+
+protected:
+    std::unique_ptr<WriteBuffer> impl;
+    bool finalized = false;
+
+private:
+    void nextImpl() override;
+};
+
+}
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index bfd874ee396..cd265653bb9 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -98,7 +98,7 @@ WriteBufferFromFileDescriptor::~WriteBufferFromFileDescriptor()
     }
 
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     next();
 }
 
diff --git a/src/IO/WriteBufferFromOStream.cpp b/src/IO/WriteBufferFromOStream.cpp
index cf731934c93..36fbf8301c1 100644
--- a/src/IO/WriteBufferFromOStream.cpp
+++ b/src/IO/WriteBufferFromOStream.cpp
@@ -43,7 +43,7 @@ WriteBufferFromOStream::WriteBufferFromOStream(
 WriteBufferFromOStream::~WriteBufferFromOStream()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     next();
 }
 
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index 45f6e96218a..78705857ec4 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -1,7 +1,6 @@
 #include <Poco/Net/NetException.h>
 
 #include <IO/WriteBufferFromPocoSocket.h>
-#include <IO/TimeoutSetter.h>
 
 #include <Common/Exception.h>
 #include <Common/NetException.h>
@@ -73,7 +72,7 @@ WriteBufferFromPocoSocket::WriteBufferFromPocoSocket(Poco::Net::Socket & socket_
 WriteBufferFromPocoSocket::~WriteBufferFromPocoSocket()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     next();
 }
 
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 93aaf9456b5..1ae1b56933d 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -87,7 +87,7 @@ void WriteBufferFromS3::allocateBuffer()
 void WriteBufferFromS3::finalize()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finalizeImpl();
 }
 
@@ -112,18 +112,6 @@ void WriteBufferFromS3::finalizeImpl()
     finalized = true;
 }
 
-WriteBufferFromS3::~WriteBufferFromS3()
-{
-    try
-    {
-        finalizeImpl();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log);
-    }
-}
-
 void WriteBufferFromS3::createMultipartUpload()
 {
     Aws::S3::Model::CreateMultipartUploadRequest req;
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 7a77949072b..2e61fef61c8 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -64,8 +64,6 @@ public:
     /// Receives response from the server after sending all data.
     void finalize() override;
 
-    ~WriteBufferFromS3() override;
-
 private:
     bool finalized = false;
 
diff --git a/src/IO/WriteBufferFromVector.h b/src/IO/WriteBufferFromVector.h
index 6341a9b698b..0e0cd3c522b 100644
--- a/src/IO/WriteBufferFromVector.h
+++ b/src/IO/WriteBufferFromVector.h
@@ -95,7 +95,7 @@ public:
     ~WriteBufferFromVector() override
     {
         /// FIXME move final flush into the caller
-        MemoryTracker::LockExceptionInThread lock;
+        MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
         finalize();
     }
 };
diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp
index 1071ac1078d..ecdf38eae34 100644
--- a/src/IO/WriteBufferValidUTF8.cpp
+++ b/src/IO/WriteBufferValidUTF8.cpp
@@ -138,7 +138,7 @@ void WriteBufferValidUTF8::finish()
 WriteBufferValidUTF8::~WriteBufferValidUTF8()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finish();
 }
 
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index b9497b6f87e..3a79951e144 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -6,12 +6,14 @@
 #include <algorithm>
 #include <iterator>
 
+#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/wide_integer_to_string.h>
+#include <common/DecomposedFloat.h>
 
 #include <Core/DecimalFunctions.h>
 #include <Core/Types.h>
@@ -19,7 +21,7 @@
 
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Common/UInt128.h>
+#include <Common/NaNUtils.h>
 
 #include <IO/CompressionMethod.h>
 #include <IO/WriteBuffer.h>
@@ -47,14 +49,8 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-template <typename T>
-inline std::string bigintToString(const T & x)
-{
-    return to_string(x);
-}
 
 /// Helper functions for formatted and binary output.
 
@@ -136,81 +132,6 @@ inline void writeBoolText(bool x, WriteBuffer & buf)
 }
 
 
-struct DecomposedFloat64
-{
-    DecomposedFloat64(double x)
-    {
-        memcpy(&x_uint, &x, sizeof(x));
-    }
-
-    uint64_t x_uint;
-
-    bool sign() const
-    {
-        return x_uint >> 63;
-    }
-
-    uint16_t exponent() const
-    {
-        return (x_uint >> 52) & 0x7FF;
-    }
-
-    int16_t normalized_exponent() const
-    {
-        return int16_t(exponent()) - 1023;
-    }
-
-    uint64_t mantissa() const
-    {
-        return x_uint & 0x5affffffffffffful;
-    }
-
-    /// NOTE Probably floating point instructions can be better.
-    bool is_inside_int64() const
-    {
-        return x_uint == 0
-            || (normalized_exponent() >= 0 && normalized_exponent() <= 52
-                && ((mantissa() & ((1ULL << (52 - normalized_exponent())) - 1)) == 0));
-    }
-};
-
-struct DecomposedFloat32
-{
-    DecomposedFloat32(float x)
-    {
-        memcpy(&x_uint, &x, sizeof(x));
-    }
-
-    uint32_t x_uint;
-
-    bool sign() const
-    {
-        return x_uint >> 31;
-    }
-
-    uint16_t exponent() const
-    {
-        return (x_uint >> 23) & 0xFF;
-    }
-
-    int16_t normalized_exponent() const
-    {
-        return int16_t(exponent()) - 127;
-    }
-
-    uint32_t mantissa() const
-    {
-        return x_uint & 0x7fffff;
-    }
-
-    bool is_inside_int32() const
-    {
-        return x_uint == 0
-            || (normalized_exponent() >= 0 && normalized_exponent() <= 23
-                && ((mantissa() & ((1ULL << (23 - normalized_exponent())) - 1)) == 0));
-    }
-};
-
 template <typename T>
 inline size_t writeFloatTextFastPath(T x, char * buffer)
 {
@@ -221,14 +142,14 @@ inline size_t writeFloatTextFastPath(T x, char * buffer)
         /// The library Ryu has low performance on integers.
         /// This workaround improves performance 6..10 times.
 
-        if (DecomposedFloat64(x).is_inside_int64())
+        if (DecomposedFloat64(x).is_integer_in_representable_range())
             result = itoa(Int64(x), buffer) - buffer;
         else
             result = jkj::dragonbox::to_chars_n(x, buffer) - buffer;
     }
     else
     {
-        if (DecomposedFloat32(x).is_inside_int32())
+        if (DecomposedFloat32(x).is_integer_in_representable_range())
             result = itoa(Int32(x), buffer) - buffer;
         else
             result = jkj::dragonbox::to_chars_n(x, buffer) - buffer;
@@ -446,6 +367,46 @@ inline void writeJSONString(const String & s, WriteBuffer & buf, const FormatSet
     writeJSONString(StringRef{s}, buf, settings);
 }
 
+template <typename T>
+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)
+        || (settings.json.quote_denormals && !is_finite);
+
+    if (need_quote)
+        writeChar('"', ostr);
+
+    if (is_finite)
+        writeText(x, ostr);
+    else if (!settings.json.quote_denormals)
+        writeCString("null", ostr);
+    else
+    {
+        if constexpr (std::is_floating_point_v<T>)
+        {
+            if (std::signbit(x))
+            {
+                if (isNaN(x))
+                    writeCString("-nan", ostr);
+                else
+                    writeCString("-inf", ostr);
+            }
+            else
+            {
+                if (isNaN(x))
+                    writeCString("nan", ostr);
+                else
+                    writeCString("inf", ostr);
+            }
+        }
+    }
+
+    if (need_quote)
+        writeChar('"', ostr);
+}
+
 
 template <char c>
 void writeAnyEscapedString(const String & s, WriteBuffer & buf)
@@ -701,13 +662,12 @@ void formatUUID(std::reverse_iterator<const UInt8 *> src16, UInt8 * dst36);
 inline void writeUUIDText(const UUID & uuid, WriteBuffer & buf)
 {
     char s[36];
-
     formatUUID(std::reverse_iterator<const UInt8 *>(reinterpret_cast<const UInt8 *>(&uuid) + 16), reinterpret_cast<UInt8 *>(s));
     buf.write(s, sizeof(s));
 }
 
-template<typename DecimalType>
-inline void writeDecimalTypeFractionalText(typename DecimalType::NativeType fractional, UInt32 scale, WriteBuffer & buf)
+template <typename DecimalType>
+inline void writeDateTime64FractionalText(typename DecimalType::NativeType fractional, UInt32 scale, WriteBuffer & buf)
 {
     static constexpr UInt32 MaxScale = DecimalUtils::max_precision<DecimalType>;
 
@@ -837,7 +797,7 @@ inline void writeDateTimeText(DateTime64 datetime64, UInt32 scale, WriteBuffer &
     if (scale > 0)
     {
         buf.write(fractional_time_delimiter);
-        writeDecimalTypeFractionalText<DateTime64>(components.fractional, scale, buf);
+        writeDateTime64FractionalText<DateTime64>(components.fractional, scale, buf);
     }
 }
 
@@ -890,7 +850,7 @@ inline void writeDateTimeUnixTimestamp(DateTime64 datetime64, UInt32 scale, Writ
     if (scale > 0) //-V547
     {
         buf.write('.');
-        writeDecimalTypeFractionalText<DateTime64>(components.fractional, scale, buf);
+        writeDateTime64FractionalText<DateTime64>(components.fractional, scale, buf);
     }
 }
 
@@ -902,23 +862,17 @@ writeBinary(const T & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const String & x, WriteBuffer & buf) { writeStringBinary(x, buf); }
 inline void writeBinary(const StringRef & x, WriteBuffer & buf) { writeStringBinary(x, buf); }
 inline void writeBinary(const std::string_view & x, WriteBuffer & buf) { writeStringBinary(x, buf); }
-inline void writeBinary(const Int128 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
-inline void writeBinary(const UInt128 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
-inline void writeBinary(const UUID & x, WriteBuffer & buf) { writePODBinary(x, buf); }
-inline void writeBinary(const DummyUInt256 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const Decimal32 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const Decimal64 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const Decimal128 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const Decimal256 & x, WriteBuffer & buf) { writePODBinary(x.value, buf); }
 inline void writeBinary(const LocalDate & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 inline void writeBinary(const LocalDateTime & x, WriteBuffer & buf) { writePODBinary(x, buf); }
-
-inline void writeBinary(const UInt256 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
-inline void writeBinary(const Int256 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
+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> && !is_big_int_v<T>, void>
+inline std::enable_if_t<is_integer_v<T>, void>
 writeText(const T & x, WriteBuffer & buf) { writeIntText(x, buf); }
 
 template <typename T>
@@ -939,23 +893,18 @@ inline void writeText(const DayNum & x, WriteBuffer & buf) { writeDateText(Local
 inline void writeText(const LocalDate & x, WriteBuffer & buf) { writeDateText(x, buf); }
 inline void writeText(const LocalDateTime & x, WriteBuffer & buf) { writeDateTimeText(x, buf); }
 inline void writeText(const UUID & x, WriteBuffer & buf) { writeUUIDText(x, buf); }
-inline void writeText(const UInt128 & x, WriteBuffer & buf) { writeText(UUID(x), buf); }
-inline void writeText(const UInt256 & x, WriteBuffer & buf) { writeText(bigintToString(x), buf); }
-inline void writeText(const Int256 & x, WriteBuffer & buf) { writeText(bigintToString(x), buf); }
 
 template <typename T>
 String decimalFractional(const T & x, UInt32 scale)
 {
     if constexpr (std::is_same_v<T, Int256>)
     {
-        static constexpr Int128 max_int128 = (Int128(0x7fffffffffffffffll) << 64) + 0xffffffffffffffffll;
-
         if (x <= std::numeric_limits<UInt32>::max())
             return decimalFractional(static_cast<UInt32>(x), scale);
         else if (x <= std::numeric_limits<UInt64>::max())
             return decimalFractional(static_cast<UInt64>(x), scale);
-        else if (x <= max_int128)
-            return decimalFractional(static_cast<Int128>(x), scale);
+        else if (x <= std::numeric_limits<UInt128>::max())
+            return decimalFractional(static_cast<UInt128>(x), scale);
     }
     else if constexpr (std::is_same_v<T, Int128>)
     {
@@ -982,10 +931,7 @@ void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr)
         writeChar('-', ostr); /// avoid crop leading minus when whole part is zero
     }
 
-    if constexpr (std::is_same_v<T, Int256>)
-        writeText(part, ostr);
-    else
-        writeIntText(part, ostr);
+    writeIntText(part, ostr);
 
     if (scale)
     {
@@ -1028,19 +974,6 @@ inline void writeQuoted(const UUID & x, WriteBuffer & buf)
     writeChar('\'', buf);
 }
 
-inline void writeQuoted(const UInt256 & x, WriteBuffer & buf)
-{
-    writeChar('\'', buf);
-    writeText(x, buf);
-    writeChar('\'', buf);
-}
-
-inline void writeQuoted(const Int256 & x, WriteBuffer & buf)
-{
-    writeChar('\'', buf);
-    writeText(x, buf);
-    writeChar('\'', buf);
-}
 
 /// String, date, datetime are in double quotes with C-style escaping. Numbers - without.
 template <typename T>
@@ -1084,13 +1017,6 @@ inline void writeCSV(const String & x, WriteBuffer & buf) { writeCSVString<>(x,
 inline void writeCSV(const LocalDate & x, WriteBuffer & buf) { writeDoubleQuoted(x, buf); }
 inline void writeCSV(const LocalDateTime & x, WriteBuffer & buf) { writeDoubleQuoted(x, buf); }
 inline void writeCSV(const UUID & x, WriteBuffer & buf) { writeDoubleQuoted(x, buf); }
-[[noreturn]] inline void writeCSV(const UInt128, WriteBuffer &)
-{
-    /** Because UInt128 isn't a natural type, without arithmetic operator and only use as an intermediary type -for UUID-
-     *  it should never arrive here. But because we used the DataTypeNumber class we should have at least a definition of it.
-     */
-    throw Exception("UInt128 cannot be write as a text", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-}
 
 template <typename T>
 void writeBinary(const std::vector<T> & x, WriteBuffer & buf)
diff --git a/src/IO/WriteIntText.h b/src/IO/WriteIntText.h
index 93444e7df73..456aed350fc 100644
--- a/src/IO/WriteIntText.h
+++ b/src/IO/WriteIntText.h
@@ -4,8 +4,24 @@
 #include <IO/WriteBuffer.h>
 #include <common/itoa.h>
 
-/// 40 digits or 39 digits and a sign
-#define WRITE_HELPERS_MAX_INT_WIDTH 40U
+
+namespace
+{
+    template <typename T> constexpr size_t max_int_width = 20;
+    template <> inline constexpr size_t max_int_width<UInt8> = 3;    /// 255
+    template <> inline constexpr size_t max_int_width<Int8> = 4;     /// -128
+    template <> inline constexpr size_t max_int_width<UInt16> = 5;   /// 65535
+    template <> inline constexpr size_t max_int_width<Int16> = 6;    /// -32768
+    template <> inline constexpr size_t max_int_width<UInt32> = 10;  /// 4294967295
+    template <> inline constexpr size_t max_int_width<Int32> = 11;   /// -2147483648
+    template <> inline constexpr size_t max_int_width<UInt64> = 20;  /// 18446744073709551615
+    template <> inline constexpr size_t max_int_width<Int64> = 20;   /// -9223372036854775808
+    template <> inline constexpr size_t max_int_width<UInt128> = 39; /// 340282366920938463463374607431768211455
+    template <> inline constexpr size_t max_int_width<Int128> = 40;  /// -170141183460469231731687303715884105728
+    template <> inline constexpr size_t max_int_width<UInt256> = 78; /// 115792089237316195423570985008687907853269984665640564039457584007913129639935
+    template <> inline constexpr size_t max_int_width<Int256> = 78;  /// -57896044618658097711785492504343953926634992332820282019728792003956564819968
+}
+
 
 namespace DB
 {
@@ -15,16 +31,16 @@ namespace detail
     template <typename T>
     void NO_INLINE writeUIntTextFallback(T x, WriteBuffer & buf)
     {
-        char tmp[WRITE_HELPERS_MAX_INT_WIDTH];
-        int len = itoa(x, tmp) - tmp;
-        buf.write(tmp, len);
+        char tmp[max_int_width<T>];
+        char * end = itoa(x, tmp);
+        buf.write(tmp, end - tmp);
     }
 }
 
 template <typename T>
 void writeIntText(T x, WriteBuffer & buf)
 {
-    if (likely(reinterpret_cast<intptr_t>(buf.position()) + WRITE_HELPERS_MAX_INT_WIDTH < reinterpret_cast<intptr_t>(buf.buffer().end())))
+    if (likely(reinterpret_cast<uintptr_t>(buf.position()) + max_int_width<T> < reinterpret_cast<uintptr_t>(buf.buffer().end())))
         buf.position() = itoa(x, buf.position());
     else
         detail::writeUIntTextFallback(x, buf);
diff --git a/src/IO/ZlibDeflatingWriteBuffer.cpp b/src/IO/ZlibDeflatingWriteBuffer.cpp
index 7e91820f298..3cf00f627b3 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.cpp
+++ b/src/IO/ZlibDeflatingWriteBuffer.cpp
@@ -49,7 +49,7 @@ ZlibDeflatingWriteBuffer::ZlibDeflatingWriteBuffer(
 ZlibDeflatingWriteBuffer::~ZlibDeflatingWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     finish();
 
diff --git a/src/IO/ZstdDeflatingWriteBuffer.cpp b/src/IO/ZstdDeflatingWriteBuffer.cpp
index 5b97588b33e..08b289a2e04 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingWriteBuffer.cpp
@@ -31,7 +31,7 @@ ZstdDeflatingWriteBuffer::ZstdDeflatingWriteBuffer(
 ZstdDeflatingWriteBuffer::~ZstdDeflatingWriteBuffer()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
 
     finish();
 
diff --git a/src/IO/copyData.cpp b/src/IO/copyData.cpp
index c653af761d4..8a044b50de9 100644
--- a/src/IO/copyData.cpp
+++ b/src/IO/copyData.cpp
@@ -1,4 +1,5 @@
 #include <Common/Exception.h>
+#include <Common/Throttler.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 #include <IO/copyData.h>
@@ -14,7 +15,7 @@ namespace ErrorCodes
 namespace
 {
 
-void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t bytes, const std::atomic<int> * is_cancelled)
+void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t bytes, const std::atomic<int> * is_cancelled, ThrottlerPtr throttler)
 {
     /// If read to the end of the buffer, eof() either fills the buffer with new data and moves the cursor to the beginning, or returns false.
     while (bytes > 0 && !from.eof())
@@ -27,13 +28,16 @@ void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t
         to.write(from.position(), count);
         from.position() += count;
         bytes -= count;
+
+        if (throttler)
+            throttler->add(count);
     }
 
     if (check_bytes && bytes > 0)
         throw Exception("Attempt to read after EOF.", ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF);
 }
 
-void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t bytes, std::function<void()> cancellation_hook)
+void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t bytes, std::function<void()> cancellation_hook, ThrottlerPtr throttler)
 {
     /// If read to the end of the buffer, eof() either fills the buffer with new data and moves the cursor to the beginning, or returns false.
     while (bytes > 0 && !from.eof())
@@ -46,6 +50,9 @@ void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t
         to.write(from.position(), count);
         from.position() += count;
         bytes -= count;
+
+        if (throttler)
+            throttler->add(count);
     }
 
     if (check_bytes && bytes > 0)
@@ -56,32 +63,42 @@ void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t
 
 void copyData(ReadBuffer & from, WriteBuffer & to)
 {
-    copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), nullptr);
+    copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), nullptr, nullptr);
 }
 
 void copyData(ReadBuffer & from, WriteBuffer & to, const std::atomic<int> & is_cancelled)
 {
-    copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), &is_cancelled);
+    copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), &is_cancelled, nullptr);
 }
 
 void copyData(ReadBuffer & from, WriteBuffer & to, std::function<void()> cancellation_hook)
 {
-    copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), cancellation_hook);
+    copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), cancellation_hook, nullptr);
 }
 
 void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes)
 {
-    copyDataImpl(from, to, true, bytes, nullptr);
+    copyDataImpl(from, to, true, bytes, nullptr, nullptr);
 }
 
 void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes, const std::atomic<int> & is_cancelled)
 {
-    copyDataImpl(from, to, true, bytes, &is_cancelled);
+    copyDataImpl(from, to, true, bytes, &is_cancelled, nullptr);
 }
 
 void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes, std::function<void()> cancellation_hook)
 {
-    copyDataImpl(from, to, true, bytes, cancellation_hook);
+    copyDataImpl(from, to, true, bytes, cancellation_hook, nullptr);
+}
+
+void copyDataWithThrottler(ReadBuffer & from, WriteBuffer & to, const std::atomic<int> & is_cancelled, ThrottlerPtr throttler)
+{
+    copyDataImpl(from, to, false, std::numeric_limits<size_t>::max(), &is_cancelled, throttler);
+}
+
+void copyDataWithThrottler(ReadBuffer & from, WriteBuffer & to, size_t bytes, const std::atomic<int> & is_cancelled, ThrottlerPtr throttler)
+{
+    copyDataImpl(from, to, true, bytes, &is_cancelled, throttler);
 }
 
 }
diff --git a/src/IO/copyData.h b/src/IO/copyData.h
index f888a039e9e..2202f36f79e 100644
--- a/src/IO/copyData.h
+++ b/src/IO/copyData.h
@@ -9,22 +9,26 @@ namespace DB
 
 class ReadBuffer;
 class WriteBuffer;
+class Throttler;
+
+using ThrottlerPtr = std::shared_ptr<Throttler>;
 
 
-/** Copies data from ReadBuffer to WriteBuffer, all that is.
-  */
+/// Copies data from ReadBuffer to WriteBuffer, all that is.
 void copyData(ReadBuffer & from, WriteBuffer & to);
 
-/** Copies `bytes` bytes from ReadBuffer to WriteBuffer. If there are no `bytes` bytes, then throws an exception.
-  */
+/// Copies `bytes` bytes from ReadBuffer to WriteBuffer. If there are no `bytes` bytes, then throws an exception.
 void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes);
 
-/** The same, with the condition to cancel.
-  */
+/// The same, with the condition to cancel.
 void copyData(ReadBuffer & from, WriteBuffer & to, const std::atomic<int> & is_cancelled);
 void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes, const std::atomic<int> & is_cancelled);
 
 void copyData(ReadBuffer & from, WriteBuffer & to, std::function<void()> cancellation_hook);
 void copyData(ReadBuffer & from, WriteBuffer & to, size_t bytes, std::function<void()> cancellation_hook);
 
+/// Same as above but also use throttler to limit maximum speed
+void copyDataWithThrottler(ReadBuffer & from, WriteBuffer & to, const std::atomic<int> & is_cancelled, ThrottlerPtr throttler);
+void copyDataWithThrottler(ReadBuffer & from, WriteBuffer & to, size_t bytes, const std::atomic<int> & is_cancelled, ThrottlerPtr throttler);
+
 }
diff --git a/src/IO/tests/CMakeLists.txt b/src/IO/examples/CMakeLists.txt
similarity index 100%
rename from src/IO/tests/CMakeLists.txt
rename to src/IO/examples/CMakeLists.txt
diff --git a/src/IO/tests/dragonbox_test.cpp b/src/IO/examples/dragonbox_test.cpp
similarity index 100%
rename from src/IO/tests/dragonbox_test.cpp
rename to src/IO/examples/dragonbox_test.cpp
diff --git a/src/IO/tests/hashing_buffer.h b/src/IO/examples/hashing_buffer.h
similarity index 100%
rename from src/IO/tests/hashing_buffer.h
rename to src/IO/examples/hashing_buffer.h
diff --git a/src/IO/tests/hashing_read_buffer.cpp b/src/IO/examples/hashing_read_buffer.cpp
similarity index 100%
rename from src/IO/tests/hashing_read_buffer.cpp
rename to src/IO/examples/hashing_read_buffer.cpp
diff --git a/src/IO/tests/hashing_write_buffer.cpp b/src/IO/examples/hashing_write_buffer.cpp
similarity index 100%
rename from src/IO/tests/hashing_write_buffer.cpp
rename to src/IO/examples/hashing_write_buffer.cpp
diff --git a/src/IO/tests/io_operators.cpp b/src/IO/examples/io_operators.cpp
similarity index 100%
rename from src/IO/tests/io_operators.cpp
rename to src/IO/examples/io_operators.cpp
diff --git a/src/IO/tests/limit_read_buffer.cpp b/src/IO/examples/limit_read_buffer.cpp
similarity index 100%
rename from src/IO/tests/limit_read_buffer.cpp
rename to src/IO/examples/limit_read_buffer.cpp
diff --git a/src/IO/tests/limit_read_buffer2.cpp b/src/IO/examples/limit_read_buffer2.cpp
similarity index 100%
rename from src/IO/tests/limit_read_buffer2.cpp
rename to src/IO/examples/limit_read_buffer2.cpp
diff --git a/src/IO/tests/lzma_buffers.cpp b/src/IO/examples/lzma_buffers.cpp
similarity index 100%
rename from src/IO/tests/lzma_buffers.cpp
rename to src/IO/examples/lzma_buffers.cpp
diff --git a/src/IO/tests/o_direct_and_dirty_pages.cpp b/src/IO/examples/o_direct_and_dirty_pages.cpp
similarity index 100%
rename from src/IO/tests/o_direct_and_dirty_pages.cpp
rename to src/IO/examples/o_direct_and_dirty_pages.cpp
diff --git a/src/IO/tests/parse_date_time_best_effort.cpp b/src/IO/examples/parse_date_time_best_effort.cpp
similarity index 100%
rename from src/IO/tests/parse_date_time_best_effort.cpp
rename to src/IO/examples/parse_date_time_best_effort.cpp
diff --git a/src/IO/tests/parse_int_perf.cpp b/src/IO/examples/parse_int_perf.cpp
similarity index 96%
rename from src/IO/tests/parse_int_perf.cpp
rename to src/IO/examples/parse_int_perf.cpp
index e35a3d8a857..5a8f8b01f50 100644
--- a/src/IO/tests/parse_int_perf.cpp
+++ b/src/IO/examples/parse_int_perf.cpp
@@ -81,8 +81,8 @@ int main(int argc, char ** argv)
                 << "Written " << n << " numbers (" << wb.count() / 1000000.0 << " MB) in " << watch.elapsedSeconds() << " sec., "
                 << n / watch.elapsedSeconds() << " num/s., "
                 << wb.count() / watch.elapsedSeconds() / 1000000 << " MB/s., "
-                << watch.elapsed() / n << " ns/num., "
-                << tsc / n << " ticks/num., "
+                << watch.elapsed() / n << " ns/num., "  // NOLINT
+                << tsc / n << " ticks/num., "  // NOLINT
                 << watch.elapsed() / wb.count() << " ns/byte., "
                 << tsc / wb.count() << " ticks/byte."
                 << std::endl;
diff --git a/src/IO/tests/parse_int_perf2.cpp b/src/IO/examples/parse_int_perf2.cpp
similarity index 100%
rename from src/IO/tests/parse_int_perf2.cpp
rename to src/IO/examples/parse_int_perf2.cpp
diff --git a/src/IO/tests/read_buffer.cpp b/src/IO/examples/read_buffer.cpp
similarity index 100%
rename from src/IO/tests/read_buffer.cpp
rename to src/IO/examples/read_buffer.cpp
diff --git a/src/IO/tests/read_buffer_aio.cpp b/src/IO/examples/read_buffer_aio.cpp
similarity index 100%
rename from src/IO/tests/read_buffer_aio.cpp
rename to src/IO/examples/read_buffer_aio.cpp
diff --git a/src/IO/tests/read_buffer_perf.cpp b/src/IO/examples/read_buffer_perf.cpp
similarity index 100%
rename from src/IO/tests/read_buffer_perf.cpp
rename to src/IO/examples/read_buffer_perf.cpp
diff --git a/src/IO/tests/read_escaped_string.cpp b/src/IO/examples/read_escaped_string.cpp
similarity index 100%
rename from src/IO/tests/read_escaped_string.cpp
rename to src/IO/examples/read_escaped_string.cpp
diff --git a/src/IO/tests/read_float_perf.cpp b/src/IO/examples/read_float_perf.cpp
similarity index 100%
rename from src/IO/tests/read_float_perf.cpp
rename to src/IO/examples/read_float_perf.cpp
diff --git a/src/IO/tests/read_write_int.cpp b/src/IO/examples/read_write_int.cpp
similarity index 100%
rename from src/IO/tests/read_write_int.cpp
rename to src/IO/examples/read_write_int.cpp
diff --git a/src/IO/tests/valid_utf8.cpp b/src/IO/examples/valid_utf8.cpp
similarity index 100%
rename from src/IO/tests/valid_utf8.cpp
rename to src/IO/examples/valid_utf8.cpp
diff --git a/src/IO/tests/valid_utf8_perf.cpp b/src/IO/examples/valid_utf8_perf.cpp
similarity index 100%
rename from src/IO/tests/valid_utf8_perf.cpp
rename to src/IO/examples/valid_utf8_perf.cpp
diff --git a/src/IO/tests/var_uint.cpp b/src/IO/examples/var_uint.cpp
similarity index 100%
rename from src/IO/tests/var_uint.cpp
rename to src/IO/examples/var_uint.cpp
diff --git a/src/IO/tests/write_buffer.cpp b/src/IO/examples/write_buffer.cpp
similarity index 100%
rename from src/IO/tests/write_buffer.cpp
rename to src/IO/examples/write_buffer.cpp
diff --git a/src/IO/tests/write_buffer_perf.cpp b/src/IO/examples/write_buffer_perf.cpp
similarity index 100%
rename from src/IO/tests/write_buffer_perf.cpp
rename to src/IO/examples/write_buffer_perf.cpp
diff --git a/src/IO/tests/write_int.cpp b/src/IO/examples/write_int.cpp
similarity index 100%
rename from src/IO/tests/write_int.cpp
rename to src/IO/examples/write_int.cpp
diff --git a/src/IO/tests/zlib_buffers.cpp b/src/IO/examples/zlib_buffers.cpp
similarity index 100%
rename from src/IO/tests/zlib_buffers.cpp
rename to src/IO/examples/zlib_buffers.cpp
diff --git a/src/IO/tests/zlib_ng_bug.cpp b/src/IO/examples/zlib_ng_bug.cpp
similarity index 100%
rename from src/IO/tests/zlib_ng_bug.cpp
rename to src/IO/examples/zlib_ng_bug.cpp
diff --git a/src/IO/tests/zstd_buffers.cpp b/src/IO/examples/zstd_buffers.cpp
similarity index 100%
rename from src/IO/tests/zstd_buffers.cpp
rename to src/IO/examples/zstd_buffers.cpp
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index 26745a8f138..a7a9eaaa4dd 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -46,7 +46,7 @@ inline size_t readAlpha(char * res, size_t max_chars, ReadBuffer & in)
 }
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #endif
@@ -634,7 +634,7 @@ ReturnType parseDateTime64BestEffortImpl(DateTime64 & res, UInt32 scale, ReadBuf
 }
 
 #if defined(__PPC__)
-#if !__clang__
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/src/IO/readDecimalText.h b/src/IO/readDecimalText.h
index 203d8e3963b..6545155aa6e 100644
--- a/src/IO/readDecimalText.h
+++ b/src/IO/readDecimalText.h
@@ -3,6 +3,7 @@
 #include <limits>
 #include <IO/ReadHelpers.h>
 #include <Common/intExp.h>
+#include <common/wide_integer_to_string.h>
 
 
 namespace DB
@@ -160,7 +161,7 @@ inline void readDecimalText(ReadBuffer & buf, T & x, uint32_t precision, uint32_
             " Expected to read decimal with scale {} and precision {}";
 
         if constexpr (is_big_int_v<typename T::NativeType>)
-            throw Exception(fmt::format(pattern, digits, bigintToString(x.value), exponent, scale, precision), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+            throw Exception(fmt::format(pattern, digits, x.value, exponent, scale, precision), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
         else
             throw Exception(fmt::format(pattern, digits, x, exponent, scale, precision), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
     }
diff --git a/src/IO/tests/gtest_DateTimeToString.cpp b/src/IO/tests/gtest_DateTimeToString.cpp
index eb609f0f97e..058e7c12fdd 100644
--- a/src/IO/tests/gtest_DateTimeToString.cpp
+++ b/src/IO/tests/gtest_DateTimeToString.cpp
@@ -161,7 +161,7 @@ INSTANTIATE_TEST_SUITE_P(DateTimeToString, DateTimeToStringParamTestDayNum,
         {
             "Negative DayNum value wraps as if it was UInt16 due to LUT limitations and to maintain compatibility with existing code.",
             DayNum(-10 * 365),
-            "2106-02-07"
+            "2139-06-10"
         },
     })
 );
diff --git a/src/IO/tests/gtest_aio_seek_back_after_eof.cpp b/src/IO/tests/gtest_aio_seek_back_after_eof.cpp
index 5f1c1c0b945..784f5479657 100644
--- a/src/IO/tests/gtest_aio_seek_back_after_eof.cpp
+++ b/src/IO/tests/gtest_aio_seek_back_after_eof.cpp
@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <IO/ReadBufferAIO.h>
 #include <Common/randomSeed.h>
+#include <filesystem>
 #include <fstream>
 #include <string>
 
@@ -14,7 +15,7 @@ namespace
 {
 std::string createTmpFileForEOFtest()
 {
-    char pattern[] = "/tmp/fileXXXXXX";
+    char pattern[] = "./EOFtestFolderXXXXXX";
     if (char * dir = ::mkdtemp(pattern); dir)
     {
         return std::string(dir) + "/foo";
@@ -78,6 +79,13 @@ TEST(ReadBufferAIOTest, TestReadAfterAIO)
     size_t read_after_eof_big = testbuf.read(repeatdata.data(), repeatdata.size());
     EXPECT_EQ(read_after_eof_big, data.length());
     EXPECT_TRUE(testbuf.eof());
+
+    if (file_path[0] != '/')
+    {
+        const size_t last_slash = file_path.rfind('/');
+        const std::string temp_dir = file_path.substr(0, last_slash);
+        std::filesystem::remove_all(temp_dir);
+    }
 }
 
 #endif
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 4936307a5e3..656e40b2ad7 100644
--- a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
+++ b/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
@@ -1,7 +1,6 @@
 #include <gtest/gtest.h>
 
 #include <stdexcept>
-#include <Poco/File.h>
 #include <IO/CascadeWriteBuffer.h>
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/WriteBufferFromTemporaryFile.h>
@@ -9,7 +8,9 @@
 #include <IO/ConcatReadBuffer.h>
 #include <IO/copyData.h>
 #include <Common/typeid_cast.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 using namespace DB;
 
 
@@ -41,10 +42,9 @@ static void testCascadeBufferRedability(
         if (!wbuf)
             continue;
 
-        auto * wbuf_readable = dynamic_cast<IReadableWriteBuffer *>(wbuf.get());
-        ASSERT_FALSE(!wbuf_readable);
+        auto & wbuf_readable = dynamic_cast<IReadableWriteBuffer &>(*wbuf);
 
-        auto rbuf = wbuf_readable->tryGetReadBuffer();
+        auto rbuf = wbuf_readable.tryGetReadBuffer();
         ASSERT_FALSE(!rbuf);
 
         read_buffers.emplace_back(rbuf);
@@ -236,7 +236,7 @@ try
 
         buf.reset();
         reread_buf.reset();
-        ASSERT_TRUE(!Poco::File(tmp_filename).exists());
+        ASSERT_TRUE(!fs::exists(tmp_filename));
     }
 }
 catch (...)
diff --git a/src/IO/tests/limit_read_buffer.reference b/src/IO/tests/limit_read_buffer.reference
deleted file mode 100644
index beeff575bf4..00000000000
--- a/src/IO/tests/limit_read_buffer.reference
+++ /dev/null
@@ -1,6 +0,0 @@
---- first ---
-Hello, wor
---- second ---
-ld! Abcdef
---- the rest ---
-ghijklmnopqrstuvwxyz.
diff --git a/src/IO/tests/limit_read_buffer.sh b/src/IO/tests/limit_read_buffer.sh
deleted file mode 100755
index ee6bc97d5fa..00000000000
--- a/src/IO/tests/limit_read_buffer.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-./limit_read_buffer 10 <<< 'Hello, world! Abcdefghijklmnopqrstuvwxyz.'
diff --git a/src/IO/ya.make b/src/IO/ya.make
index 01b3995ef7a..68e690b8611 100644
--- a/src/IO/ya.make
+++ b/src/IO/ya.make
@@ -47,6 +47,7 @@ SRCS(
     ReadBufferAIO.cpp
     ReadBufferFromFile.cpp
     ReadBufferFromFileBase.cpp
+    ReadBufferFromFileDecorator.cpp
     ReadBufferFromFileDescriptor.cpp
     ReadBufferFromIStream.cpp
     ReadBufferFromMemory.cpp
@@ -57,6 +58,7 @@ SRCS(
     UseSSL.cpp
     WriteBufferFromFile.cpp
     WriteBufferFromFileBase.cpp
+    WriteBufferFromFileDecorator.cpp
     WriteBufferFromFileDescriptor.cpp
     WriteBufferFromFileDescriptorDiscardOnFailure.cpp
     WriteBufferFromHTTP.cpp
diff --git a/src/IO/ya.make.in b/src/IO/ya.make.in
index 252e102a819..fe047aae8d1 100644
--- a/src/IO/ya.make.in
+++ b/src/IO/ya.make.in
@@ -18,7 +18,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -P 'S3|HDFS' | sed 's/^\.\//    /' | sort ?>
+<? 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.cpp b/src/Interpreters/ActionLocksManager.cpp
index 76e5228bec3..0f9b4d01bdf 100644
--- a/src/Interpreters/ActionLocksManager.cpp
+++ b/src/Interpreters/ActionLocksManager.cpp
@@ -19,29 +19,27 @@ namespace ActionLocks
 }
 
 
-ActionLocksManager::ActionLocksManager(const Context & context)
-        : global_context(context.getGlobalContext())
+ActionLocksManager::ActionLocksManager(ContextPtr context_) : WithContext(context_->getGlobalContext())
 {
 }
 
 template <typename F>
-inline void forEachTable(F && f, const Context & context)
+inline void forEachTable(F && f, ContextPtr context)
 {
     for (auto & elem : DatabaseCatalog::instance().getDatabases())
         for (auto iterator = elem.second->getTablesIterator(context); iterator->isValid(); iterator->next())
             if (auto table = iterator->table())
                 f(table);
-
 }
 
-void ActionLocksManager::add(StorageActionBlockType action_type, const Context & context)
+void ActionLocksManager::add(StorageActionBlockType action_type, ContextPtr context_)
 {
-    forEachTable([&](const StoragePtr & table) { add(table, action_type); }, context);
+    forEachTable([&](const StoragePtr & table) { add(table, action_type); }, context_);
 }
 
 void ActionLocksManager::add(const StorageID & table_id, StorageActionBlockType action_type)
 {
-    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, global_context))
+    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext()))
         add(table, action_type);
 }
 
@@ -66,7 +64,7 @@ void ActionLocksManager::remove(StorageActionBlockType action_type)
 
 void ActionLocksManager::remove(const StorageID & table_id, StorageActionBlockType action_type)
 {
-    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, global_context))
+    if (auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext()))
         remove(table, action_type);
 }
 
diff --git a/src/Interpreters/ActionLocksManager.h b/src/Interpreters/ActionLocksManager.h
index a39d8b5784f..f030afec891 100644
--- a/src/Interpreters/ActionLocksManager.h
+++ b/src/Interpreters/ActionLocksManager.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/StorageID.h>
 #include <Storages/IStorage_fwd.h>
 #include <Common/ActionLock.h>
-#include <Interpreters/StorageID.h>
+#include <common/types.h>
 
 #include <mutex>
 #include <unordered_map>
@@ -12,17 +13,15 @@
 namespace DB
 {
 
-class Context;
-
 /// Holds ActionLocks for tables
 /// Does not store pointers to tables
-class ActionLocksManager
+class ActionLocksManager : WithContext
 {
 public:
-    ActionLocksManager(const Context & context);
+    explicit ActionLocksManager(ContextPtr context);
 
     /// Adds new locks for each table
-    void add(StorageActionBlockType action_type, const Context & context);
+    void add(StorageActionBlockType action_type, ContextPtr context);
     /// Add new lock for a table if it has not been already added
     void add(const StorageID & table_id, StorageActionBlockType action_type);
     void add(const StoragePtr & table, StorageActionBlockType action_type);
@@ -43,7 +42,6 @@ private:
 
     mutable std::mutex mutex;
     StorageLocks storage_locks;
-    const Context & global_context;
 };
 
 }
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index f5bde5d23e7..35251c7b9b7 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -13,6 +13,7 @@
 #include <IO/Operators.h>
 
 #include <stack>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -25,6 +26,48 @@ namespace ErrorCodes
     extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
     extern const int THERE_IS_NO_COLUMN;
     extern const int ILLEGAL_COLUMN;
+    extern const int NOT_FOUND_COLUMN_IN_BLOCK;
+}
+
+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));
+
+    if (result_type)
+        map.add("Result Type", result_type->getName());
+
+    if (!result_name.empty())
+        map.add("Result Type", ActionsDAG::typeToString(type));
+
+    if (column)
+        map.add("Column", column->getName());
+
+    if (function_base)
+        map.add("Function", function_base->getName());
+    else if (function_builder)
+        map.add("Function", function_builder->getName());
+
+    if (type == ActionType::FUNCTION)
+        map.add("Compiled", is_function_compiled);
 }
 
 
@@ -162,34 +205,31 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
     node.function = node.function_base->prepare(arguments);
 
     /// If all arguments are constants, and function is suitable to be executed in 'prepare' stage - execute function.
-    if (all_const && node.function_base->isSuitableForConstantFolding())
+    if (node.function_base->isSuitableForConstantFolding())
     {
-        size_t num_rows = arguments.empty() ? 0 : arguments.front().column->size();
-        auto col = node.function->execute(arguments, node.result_type, num_rows, true);
+        ColumnPtr column;
+
+        if (all_const)
+        {
+            size_t num_rows = arguments.empty() ? 0 : arguments.front().column->size();
+            column = node.function->execute(arguments, node.result_type, num_rows, true);
+        }
+        else
+        {
+            column = node.function_base->getConstantResultForNonConstArguments(arguments, node.result_type);
+        }
 
         /// If the result is not a constant, just in case, we will consider the result as unknown.
-        if (isColumnConst(*col))
+        if (column && isColumnConst(*column))
         {
             /// All constant (literal) columns in block are added with size 1.
             /// But if there was no columns in block before executing a function, the result has size 0.
             /// Change the size to 1.
 
-            if (col->empty())
-                col = col->cloneResized(1);
+            if (column->empty())
+                column = column->cloneResized(1);
 
-            node.column = std::move(col);
-        }
-    }
-
-    /// Some functions like ignore() or getTypeName() always return constant result even if arguments are not constant.
-    /// We can't do constant folding, but can specify in sample block that function result is constant to avoid
-    /// unnecessary materialization.
-    if (!node.column && node.function_base->isSuitableForConstantFolding())
-    {
-        if (auto col = node.function_base->getResultIfAlwaysReturnsConstantAndHasArguments(arguments))
-        {
-            node.column = std::move(col);
-            node.allow_constant_folding = false;
+            node.column = std::move(column);
         }
     }
 
@@ -250,6 +290,17 @@ NamesAndTypesList ActionsDAG::getRequiredColumns() const
     return result;
 }
 
+Names ActionsDAG::getRequiredColumnsNames() const
+{
+    Names result;
+    result.reserve(inputs.size());
+
+    for (const auto & input : inputs)
+        result.emplace_back(input->result_name);
+
+    return result;
+}
+
 ColumnsWithTypeAndName ActionsDAG::getResultColumns() const
 {
     ColumnsWithTypeAndName result;
@@ -354,13 +405,10 @@ void ActionsDAG::removeUnusedActions(bool allow_remove_inputs)
 
     for (auto & node : nodes)
     {
-        /// We cannot remove function with side effects even if it returns constant (e.g. ignore(...)).
-        bool prevent_constant_folding = node.column && isColumnConst(*node.column) && !node.allow_constant_folding;
         /// We cannot remove arrayJoin because it changes the number of rows.
         bool is_array_join = node.type == ActionType::ARRAY_JOIN;
 
-        bool must_keep_node = is_array_join || prevent_constant_folding;
-        if (must_keep_node && visited_nodes.count(&node) == 0)
+        if (is_array_join && visited_nodes.count(&node) == 0)
         {
             visited_nodes.insert(&node);
             stack.push(&node);
@@ -375,7 +423,7 @@ void ActionsDAG::removeUnusedActions(bool allow_remove_inputs)
         auto * node = stack.top();
         stack.pop();
 
-        if (!node->children.empty() && node->column && isColumnConst(*node->column) && node->allow_constant_folding)
+        if (!node->children.empty() && node->column && isColumnConst(*node->column))
         {
             /// Constant folding.
             node->type = ActionsDAG::ActionType::COLUMN;
@@ -397,6 +445,256 @@ void ActionsDAG::removeUnusedActions(bool allow_remove_inputs)
     inputs.erase(it, inputs.end());
 }
 
+static ColumnWithTypeAndName executeActionForHeader(const ActionsDAG::Node * node, ColumnsWithTypeAndName arguments)
+{
+    ColumnWithTypeAndName res_column;
+    res_column.type = node->result_type;
+    res_column.name = node->result_name;
+
+    switch (node->type)
+    {
+        case ActionsDAG::ActionType::FUNCTION:
+        {
+            // bool all_args_are_const = true;
+
+            // for (const auto & argument : arguments)
+            //     if (typeid_cast<const ColumnConst *>(argument.column.get()) == nullptr)
+            //         all_args_are_const = false;
+
+            res_column.column = node->function->execute(arguments, res_column.type, 0, true);
+
+            // if (!all_args_are_const)
+            //     res_column.column = res_column.column->convertToFullColumnIfConst();
+
+            break;
+        }
+
+        case ActionsDAG::ActionType::ARRAY_JOIN:
+        {
+            auto key = arguments.at(0);
+            key.column = key.column->convertToFullColumnIfConst();
+
+            const ColumnArray * array = typeid_cast<const ColumnArray *>(key.column.get());
+            if (!array)
+                throw Exception(ErrorCodes::TYPE_MISMATCH,
+                                "ARRAY JOIN of not array: {}", node->result_name);
+
+            res_column.column = array->getDataPtr()->cloneEmpty();
+            break;
+        }
+
+        case ActionsDAG::ActionType::COLUMN:
+        {
+            res_column.column = node->column->cloneResized(0);
+            break;
+        }
+
+        case ActionsDAG::ActionType::ALIAS:
+        {
+            res_column.column = arguments.at(0).column;
+            break;
+        }
+
+        case ActionsDAG::ActionType::INPUT:
+        {
+            break;
+        }
+    }
+
+    return res_column;
+}
+
+Block ActionsDAG::updateHeader(Block header) const
+{
+    std::unordered_map<const Node *, ColumnWithTypeAndName> node_to_column;
+    std::set<size_t> pos_to_remove;
+
+    {
+        std::unordered_map<std::string_view, std::list<size_t>> input_positions;
+
+        for (size_t pos = 0; pos < inputs.size(); ++pos)
+            input_positions[inputs[pos]->result_name].emplace_back(pos);
+
+        for (size_t pos = 0; pos < header.columns(); ++pos)
+        {
+            const auto & col = header.getByPosition(pos);
+            auto it = input_positions.find(col.name);
+            if (it != input_positions.end() && !it->second.empty())
+            {
+                auto & list = it->second;
+                pos_to_remove.insert(pos);
+                node_to_column[inputs[list.front()]] = std::move(col);
+                list.pop_front();
+            }
+        }
+    }
+
+    ColumnsWithTypeAndName result_columns;
+    result_columns.reserve(index.size());
+
+    struct Frame
+    {
+        const Node * node = nullptr;
+        size_t next_child = 0;
+    };
+
+    {
+        for (const auto * output : index)
+        {
+            if (node_to_column.count(output) == 0)
+            {
+                std::stack<Frame> stack;
+                stack.push({.node = output});
+
+                while (!stack.empty())
+                {
+                    auto & frame = stack.top();
+                    const auto * node = frame.node;
+
+                    while (frame.next_child < node->children.size())
+                    {
+                        const auto * child = node->children[frame.next_child];
+                        if (node_to_column.count(child) == 0)
+                        {
+                            stack.push({.node = child});
+                            break;
+                        }
+
+                        ++frame.next_child;
+                    }
+
+                    if (frame.next_child < node->children.size())
+                        continue;
+
+                    stack.pop();
+
+                    ColumnsWithTypeAndName arguments(node->children.size());
+                    for (size_t i = 0; i < arguments.size(); ++i)
+                    {
+                        arguments[i] = node_to_column[node->children[i]];
+                        if (!arguments[i].column)
+                            throw Exception(ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK,
+                                            "Not found column {} in block", node->children[i]->result_name);
+                    }
+
+                    node_to_column[node] = executeActionForHeader(node, std::move(arguments));
+                }
+            }
+
+            if (node_to_column[output].column)
+                result_columns.push_back(node_to_column[output]);
+        }
+    }
+
+    if (isInputProjected())
+        header.clear();
+    else
+        header.erase(pos_to_remove);
+
+    Block res;
+
+    for (auto & col : result_columns)
+        res.insert(std::move(col));
+
+    for (const auto & item : header)
+        res.insert(std::move(item));
+
+    return res;
+}
+
+NameSet ActionsDAG::foldActionsByProjection(
+    const NameSet & required_columns, const Block & projection_block_for_keys, const String & predicate_column_name, bool add_missing_keys)
+{
+    std::unordered_set<const Node *> visited_nodes;
+    std::unordered_set<std::string_view> visited_index_names;
+    std::stack<Node *> stack;
+    std::vector<const ColumnWithTypeAndName *> missing_input_from_projection_keys;
+
+    for (const auto & node : index)
+    {
+        if (required_columns.find(node->result_name) != required_columns.end() || node->result_name == predicate_column_name)
+        {
+            visited_nodes.insert(node);
+            visited_index_names.insert(node->result_name);
+            stack.push(const_cast<Node *>(node));
+        }
+    }
+
+    if (add_missing_keys)
+    {
+        for (const auto & column : required_columns)
+        {
+            if (visited_index_names.find(column) == visited_index_names.end())
+            {
+                if (const ColumnWithTypeAndName * column_with_type_name = projection_block_for_keys.findByName(column))
+                {
+                    const auto * node = &addInput(*column_with_type_name);
+                    visited_nodes.insert(node);
+                    index.push_back(node);
+                    visited_index_names.insert(column);
+                }
+                else
+                {
+                    // Missing column
+                    return {};
+                }
+            }
+        }
+    }
+
+    while (!stack.empty())
+    {
+        auto * node = stack.top();
+        stack.pop();
+
+        if (const ColumnWithTypeAndName * column_with_type_name = projection_block_for_keys.findByName(node->result_name))
+        {
+            if (node->type != ActionsDAG::ActionType::INPUT)
+            {
+                /// Projection folding.
+                node->type = ActionsDAG::ActionType::INPUT;
+                node->result_type = std::move(column_with_type_name->type);
+                node->result_name = std::move(column_with_type_name->name);
+                node->children.clear();
+                inputs.push_back(node);
+            }
+        }
+
+        for (const auto * child : node->children)
+        {
+            if (visited_nodes.count(child) == 0)
+            {
+                stack.push(const_cast<Node *>(child));
+                visited_nodes.insert(child);
+            }
+        }
+    }
+
+    std::erase_if(inputs, [&](const Node * node) { return visited_nodes.count(node) == 0; });
+    std::erase_if(index, [&](const Node * node) { return visited_index_names.count(node->result_name) == 0; });
+    nodes.remove_if([&](const Node & node) { return visited_nodes.count(&node) == 0; });
+
+    NameSet next_required_columns;
+    for (const auto & input : inputs)
+        next_required_columns.insert(input->result_name);
+
+    return next_required_columns;
+}
+
+void ActionsDAG::reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map)
+{
+    std::sort(index.begin(), index.end(), [&key_names_pos_map](const Node * lhs, const Node * rhs)
+    {
+        return key_names_pos_map.find(lhs->result_name)->second < key_names_pos_map.find(rhs->result_name)->second;
+    });
+}
+
+void ActionsDAG::addAggregatesViaProjection(const Block & aggregates)
+{
+    for (const auto & aggregate : aggregates)
+        index.push_back(&addInput(aggregate));
+}
+
 void ActionsDAG::addAliases(const NamesWithAliases & aliases)
 {
     std::unordered_map<std::string_view, size_t> names_map;
@@ -639,9 +937,13 @@ std::string ActionsDAG::dumpDAG() const
         out << " " << (node.column ? node.column->getName() : "(no column)");
         out << " " << (node.result_type ? node.result_type->getName() : "(no type)");
         out << " " << (!node.result_name.empty() ? node.result_name : "(no name)");
+
         if (node.function_base)
             out << " [" << node.function_base->getName() << "]";
 
+        if (node.is_function_compiled)
+            out << " [compiled]";
+
         out << "\n";
     }
 
@@ -688,10 +990,8 @@ void ActionsDAG::addMaterializingOutputActions()
 
 const ActionsDAG::Node & ActionsDAG::materializeNode(const Node & node)
 {
-    FunctionOverloadResolverPtr func_builder_materialize =
-            std::make_shared<FunctionOverloadResolverAdaptor>(
-                    std::make_unique<DefaultOverloadResolver>(
-                            std::make_shared<FunctionMaterialize>()));
+    FunctionOverloadResolverPtr func_builder_materialize = std::make_unique<FunctionToOverloadResolverAdaptor>(
+                            std::make_shared<FunctionMaterialize>());
 
     const auto & name = node.result_name;
     const auto * func = &addFunction(func_builder_materialize, {&node}, {});
@@ -718,10 +1018,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     auto actions_dag = std::make_shared<ActionsDAG>(source);
     NodeRawConstPtrs projection(num_result_columns);
 
-    FunctionOverloadResolverPtr func_builder_materialize =
-            std::make_shared<FunctionOverloadResolverAdaptor>(
-                    std::make_unique<DefaultOverloadResolver>(
-                            std::make_shared<FunctionMaterialize>()));
+    FunctionOverloadResolverPtr func_builder_materialize = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMaterialize>());
 
     std::map<std::string_view, std::list<size_t>> inputs;
     if (mode == MatchColumnsMode::Name)
@@ -748,11 +1045,19 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
             {
                 auto & input = inputs[res_elem.name];
                 if (input.empty())
-                    throw Exception("Cannot find column " + backQuote(res_elem.name) + " in source stream",
-                                    ErrorCodes::THERE_IS_NO_COLUMN);
-
-                src_node = dst_node = actions_dag->inputs[input.front()];
-                input.pop_front();
+                {
+                    const auto * res_const = typeid_cast<const ColumnConst *>(res_elem.column.get());
+                    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);
+                }
+                else
+                {
+                    src_node = dst_node = actions_dag->inputs[input.front()];
+                    input.pop_front();
+                }
                 break;
             }
         }
@@ -787,9 +1092,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
             const auto * left_arg = dst_node;
 
             FunctionCast::Diagnostic diagnostic = {dst_node->result_name, res_elem.name};
-            FunctionOverloadResolverPtr func_builder_cast =
-                    std::make_shared<FunctionOverloadResolverAdaptor>(
-                            CastOverloadResolver<CastType::nonAccurate>::createImpl(false, std::move(diagnostic)));
+            FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<CastType::nonAccurate>::createImpl(false, std::move(diagnostic));
 
             NodeRawConstPtrs children = { left_arg, right_arg };
             dst_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {});
@@ -839,10 +1142,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
 ActionsDAGPtr ActionsDAG::makeAddingColumnActions(ColumnWithTypeAndName column)
 {
     auto adding_column_action = std::make_shared<ActionsDAG>();
-    FunctionOverloadResolverPtr func_builder_materialize =
-            std::make_shared<FunctionOverloadResolverAdaptor>(
-                    std::make_unique<DefaultOverloadResolver>(
-                            std::make_shared<FunctionMaterialize>()));
+    FunctionOverloadResolverPtr func_builder_materialize = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMaterialize>());
 
     auto column_name = column.name;
     const auto * column_node = &adding_column_action->addColumn(std::move(column));
@@ -965,7 +1265,7 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
 
     struct Frame
     {
-        const Node * node;
+        const Node * node = nullptr;
         size_t next_child_to_visit = 0;
     };
 
@@ -1153,10 +1453,9 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
 
 ActionsDAG::SplitResult ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const
 {
-
     struct Frame
     {
-        const Node * node;
+        const Node * node = nullptr;
         size_t next_child_to_visit = 0;
     };
 
@@ -1215,7 +1514,7 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsBeforeArrayJoin(const NameSet &
 
     auto res = split(split_nodes);
     /// Do not remove array joined columns if they are not used.
-    res.first->project_input = false;
+    /// res.first->project_input = false;
     return res;
 }
 
@@ -1228,7 +1527,9 @@ ActionsDAG::SplitResult ActionsDAG::splitActionsForFilter(const std::string & co
                         column_name, dumpDAG());
 
     std::unordered_set<const Node *> split_nodes = {node};
-    return split(split_nodes);
+    auto res = split(split_nodes);
+    res.second->project_input = project_input;
+    return res;
 }
 
 namespace
@@ -1252,7 +1553,7 @@ ConjunctionNodes getConjunctionNodes(ActionsDAG::Node * predicate, std::unordere
 
     struct Frame
     {
-        const ActionsDAG::Node * node;
+        const ActionsDAG::Node * node = nullptr;
         bool is_predicate = false;
         size_t next_child_to_visit = 0;
         size_t num_allowed_children = 0;
@@ -1349,7 +1650,7 @@ ColumnsWithTypeAndName prepareFunctionArguments(const ActionsDAG::NodeRawConstPt
 /// Create actions which calculate conjunction of selected nodes.
 /// Assume conjunction nodes are predicates (and may be used as arguments of function AND).
 ///
-/// Result actions add single column with conjunction result (it is always last in index).
+/// Result actions add single column with conjunction result (it is always first in index).
 /// No other columns are added or removed.
 ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs)
 {
@@ -1358,17 +1659,14 @@ ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunctio
 
     auto actions = std::make_shared<ActionsDAG>();
 
-    FunctionOverloadResolverPtr func_builder_and =
-            std::make_shared<FunctionOverloadResolverAdaptor>(
-                    std::make_unique<DefaultOverloadResolver>(
-                            std::make_shared<FunctionAnd>()));
+    FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
 
     std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> nodes_mapping;
     std::unordered_map<std::string, std::list<const Node *>> required_inputs;
 
     struct Frame
     {
-        const ActionsDAG::Node * node;
+        const ActionsDAG::Node * node = nullptr;
         size_t next_child_to_visit = 0;
     };
 
@@ -1414,6 +1712,20 @@ ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunctio
         }
     }
 
+    const Node * result_predicate = nodes_mapping[*conjunction.begin()];
+
+    if (conjunction.size() > 1)
+    {
+        NodeRawConstPtrs args;
+        args.reserve(conjunction.size());
+        for (const auto * predicate : conjunction)
+            args.emplace_back(nodes_mapping[predicate]);
+
+        result_predicate = &actions->addFunction(func_builder_and, std::move(args), {});
+    }
+
+    actions->index.push_back(result_predicate);
+
     for (const auto & col : all_inputs)
     {
         const Node * input;
@@ -1430,19 +1742,6 @@ ActionsDAGPtr ActionsDAG::cloneActionsForConjunction(NodeRawConstPtrs conjunctio
         actions->index.push_back(input);
     }
 
-    const Node * result_predicate = nodes_mapping[*conjunction.begin()];
-
-    if (conjunction.size() > 1)
-    {
-        NodeRawConstPtrs args;
-        args.reserve(conjunction.size());
-        for (const auto * predicate : conjunction)
-            args.emplace_back(nodes_mapping[predicate]);
-
-        result_predicate = &actions->addFunction(func_builder_and, std::move(args), {});
-    }
-
-    actions->index.push_back(result_predicate);
     return actions;
 }
 
@@ -1458,6 +1757,11 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
                             "Index for ActionsDAG does not contain filter column name {}. DAG:\n{}",
                             filter_name, dumpDAG());
 
+    /// If condition is constant let's do nothing.
+    /// It means there is nothing to push down or optimization was already applied.
+    if (predicate->type == ActionType::COLUMN)
+        return nullptr;
+
     std::unordered_set<const Node *> allowed_nodes;
 
     /// Get input nodes from available_inputs names.
@@ -1507,7 +1811,19 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
             node.result_name = std::move(predicate->result_name);
             node.result_type = std::move(predicate->result_type);
             node.column = node.result_type->createColumnConst(0, 1);
-            *predicate = std::move(node);
+
+            if (predicate->type != ActionType::INPUT)
+                *predicate = std::move(node);
+            else
+            {
+                /// Special case. We cannot replace input to constant inplace.
+                /// Because we cannot affect inputs list for actions.
+                /// So we just add a new constant and update index.
+                const auto * new_predicate = &addNode(node);
+                for (auto & index_node : index)
+                    if (index_node == predicate)
+                        index_node = new_predicate;
+            }
         }
 
         removeUnusedActions(false);
@@ -1548,9 +1864,7 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
                 predicate->children = {left_arg, right_arg};
                 auto arguments = prepareFunctionArguments(predicate->children);
 
-                FunctionOverloadResolverPtr func_builder_cast =
-                        std::make_shared<FunctionOverloadResolverAdaptor>(
-                                CastOverloadResolver<CastType::nonAccurate>::createImpl(false));
+                FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<CastType::nonAccurate>::createImpl(false);
 
                 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 88ce2818a26..9bea1d1c040 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -3,6 +3,7 @@
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/Names.h>
+#include <Interpreters/Context_fwd.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
@@ -28,6 +29,14 @@ using DataTypePtr = std::shared_ptr<const IDataType>;
 
 class CompiledExpressionCache;
 
+namespace JSONBuilder
+{
+    class JSONMap;
+
+    class IItem;
+    using ItemPtr = std::unique_ptr<IItem>;
+}
+
 /// Directed acyclic graph of expressions.
 /// This is an intermediate representation of actions which is usually built from expression list AST.
 /// Node of DAG describe calculation of a single column with known type, name, and constant value (if applicable).
@@ -54,6 +63,8 @@ public:
         FUNCTION,
     };
 
+    static const char * typeToString(ActionType type);
+
     struct Node;
     using NodeRawPtrs = std::vector<Node *>;
     using NodeRawConstPtrs = std::vector<const Node *>;
@@ -62,7 +73,7 @@ public:
     {
         NodeRawConstPtrs children;
 
-        ActionType type;
+        ActionType type{};
 
         std::string result_name;
         DataTypePtr result_type;
@@ -77,9 +88,8 @@ public:
 
         /// For COLUMN node and propagated constants.
         ColumnPtr column;
-        /// Some functions like `ignore()` always return constant but can't be replaced by constant it.
-        /// We calculate such constants in order to avoid unnecessary materialization, but prohibit it's folding.
-        bool allow_constant_folding = true;
+
+        void toTree(JSONBuilder::JSONMap & map) const;
     };
 
     /// NOTE: std::list is an implementation detail.
@@ -108,6 +118,7 @@ public:
     const NodeRawConstPtrs & getInputs() const { return inputs; }
 
     NamesAndTypesList getRequiredColumns() const;
+    Names getRequiredColumnsNames() const;
     ColumnsWithTypeAndName getResultColumns() const;
     NamesAndTypesList getNamesAndTypesList() const;
 
@@ -155,6 +166,14 @@ public:
     void removeUnusedActions(const Names & required_names);
     void removeUnusedActions(const NameSet & required_names);
 
+    NameSet foldActionsByProjection(
+        const NameSet & required_columns,
+        const Block & projection_block_for_keys,
+        const String & predicate_column_name = {},
+        bool add_missing_keys = true);
+    void reorderAggregationKeysForProjection(const std::unordered_map<std::string_view, size_t> & key_names_pos_map);
+    void addAggregatesViaProjection(const Block & aggregates);
+
     bool hasArrayJoin() const;
     bool hasStatefulFunctions() const;
     bool trivial() const; /// If actions has no functions or array join.
@@ -165,6 +184,14 @@ public:
 
     ActionsDAGPtr clone() const;
 
+    /// Execute actions for header. Input block must have empty columns.
+    /// Result should be equal to the execution of ExpressionActions build form this DAG.
+    /// Actions are not changed, no expressions are compiled.
+    ///
+    /// In addition, check that result constants are constants according to DAG.
+    /// In case if function return constant, but arguments are not constant, materialize it.
+    Block updateHeader(Block header) const;
+
     /// For apply materialize() function for every output.
     /// Also add aliases so the result names remain unchanged.
     void addMaterializingOutputActions();
@@ -220,7 +247,7 @@ public:
     /// Create actions which may calculate part of filter using only available_inputs.
     /// If nothing may be calculated, returns nullptr.
     /// Otherwise, return actions which inputs are from available_inputs.
-    /// Returned actions add single column which may be used for filter.
+    /// Returned actions add single column which may be used for filter. Added column will be the first one.
     /// Also, replace some nodes of current inputs to constant 1 in case they are filtered.
     ///
     /// @param all_inputs should contain inputs from previous step, which will be used for result actions.
@@ -231,9 +258,9 @@ public:
     /// Pushed condition: z > 0
     /// GROUP BY step will transform columns `x, y, z` -> `sum(x), y, z`
     /// If we just add filter step with actions `z -> z > 0` before GROUP BY,
-    /// columns will be transformed like `x, y, z` -> `z, z > 0, x, y` -(remove filter)-> `z, x, y`.
+    /// columns will be transformed like `x, y, z` -> `z > 0, z, x, y` -(remove filter)-> `z, x, y`.
     /// To avoid it, add inputs from `all_inputs` list,
-    /// so actions `x, y, z -> x, y, z, z > 0` -(remove filter)-> `x, y, z` will not change columns order.
+    /// so actions `x, y, z -> z > 0, x, y, z` -(remove filter)-> `x, y, z` will not change columns order.
     ActionsDAGPtr cloneActionsForFilterPushDown(
         const std::string & filter_name,
         bool can_remove_filter,
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 9045ed2c64f..066a5d20223 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -1,6 +1,5 @@
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
-#include <Core/Row.h>
 
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsMiscellaneous.h>
@@ -127,7 +126,7 @@ static Block createBlockFromCollection(const Collection & collection, const Data
     return res;
 }
 
-static Field extractValueFromNode(const ASTPtr & node, const IDataType & type, const Context & context)
+static Field extractValueFromNode(const ASTPtr & node, const IDataType & type, ContextPtr context)
 {
     if (const auto * lit = node->as<ASTLiteral>())
     {
@@ -142,7 +141,7 @@ static Field extractValueFromNode(const ASTPtr & node, const IDataType & type, c
         throw Exception("Incorrect element of set. Must be literal or constant expression.", ErrorCodes::INCORRECT_ELEMENT_OF_SET);
 }
 
-static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, const Context & context)
+static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, ContextPtr context)
 {
     /// Will form a block with values from the set.
 
@@ -156,7 +155,7 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, co
     DataTypePtr tuple_type;
     Row tuple_values;
     const auto & list = node->as<ASTExpressionList &>();
-    bool transform_null_in = context.getSettingsRef().transform_null_in;
+    bool transform_null_in = context->getSettingsRef().transform_null_in;
     for (const auto & elem : list.children)
     {
         if (num_columns == 1)
@@ -205,7 +204,9 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, co
                 tuple = &literal->value.get<Tuple>();
             }
 
-            size_t tuple_size = tuple ? tuple->size() : func->arguments->children.size();
+            assert(tuple || func);
+
+            size_t tuple_size = tuple ? tuple->size() : func->arguments->children.size(); //-V1004
             if (tuple_size != num_columns)
                 throw Exception("Incorrect size of tuple in set: " + toString(tuple_size) + " instead of " + toString(num_columns),
                     ErrorCodes::INCORRECT_ELEMENT_OF_SET);
@@ -245,7 +246,7 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const ASTPtr & right_arg,
     const DataTypes & set_element_types,
-    const Context & context)
+    ContextPtr context)
 {
     auto [right_arg_value, right_arg_type] = evaluateConstantExpression(right_arg, context);
 
@@ -259,7 +260,7 @@ Block createBlockForSet(
     };
 
     Block block;
-    bool tranform_null_in = context.getSettingsRef().transform_null_in;
+    bool tranform_null_in = context->getSettingsRef().transform_null_in;
 
     /// 1 in 1; (1, 2) in (1, 2); identity(tuple(tuple(tuple(1)))) in tuple(tuple(tuple(1))); etc.
     if (left_type_depth == right_type_depth)
@@ -288,9 +289,9 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const std::shared_ptr<ASTFunction> & right_arg,
     const DataTypes & set_element_types,
-    const Context & context)
+    ContextPtr context)
 {
-    auto get_tuple_type_from_ast = [&context](const auto & func) -> DataTypePtr
+    auto get_tuple_type_from_ast = [context](const auto & func) -> DataTypePtr
     {
         if (func && (func->name == "tuple" || func->name == "array") && !func->arguments->children.empty())
         {
@@ -337,7 +338,7 @@ Block createBlockForSet(
 
 SetPtr makeExplicitSet(
     const ASTFunction * node, const ActionsDAG & actions, bool create_ordered_set,
-    const Context & context, const SizeLimits & size_limits, PreparedSets & prepared_sets)
+    ContextPtr context, const SizeLimits & size_limits, PreparedSets & prepared_sets)
 {
     const IAST & args = *node->arguments;
 
@@ -371,7 +372,8 @@ SetPtr makeExplicitSet(
     else
         block = createBlockForSet(left_arg_type, right_arg, set_element_types, context);
 
-    SetPtr set = std::make_shared<Set>(size_limits, create_ordered_set, context.getSettingsRef().transform_null_in);
+    SetPtr set
+        = std::make_shared<Set>(size_limits, create_ordered_set, context->getSettingsRef().transform_null_in);
     set->setHeader(block.cloneEmpty());
     set->insertFromBlock(block);
     set->finishInsert();
@@ -429,11 +431,11 @@ public:
 };
 
 ActionsMatcher::Data::Data(
-    const Context & context_, SizeLimits set_size_limit_, size_t subquery_depth_,
+    ContextPtr context_, SizeLimits set_size_limit_, size_t subquery_depth_,
     const NamesAndTypesList & source_columns_, ActionsDAGPtr actions_dag,
     PreparedSets & prepared_sets_, SubqueriesForSets & subqueries_for_sets_,
     bool no_subqueries_, bool no_makeset_, bool only_consts_, bool create_source_for_in_)
-    : context(context_)
+    : WithContext(context_)
     , set_size_limit(set_size_limit_)
     , subquery_depth(subquery_depth_)
     , source_columns(source_columns_)
@@ -444,7 +446,7 @@ ActionsMatcher::Data::Data(
     , only_consts(only_consts_)
     , create_source_for_in(create_source_for_in_)
     , visit_depth(0)
-    , actions_stack(std::move(actions_dag), context)
+    , actions_stack(std::move(actions_dag), context_)
     , next_unique_suffix(actions_stack.getLastActions().getIndex().size() + 1)
 {
 }
@@ -454,8 +456,7 @@ bool ActionsMatcher::Data::hasColumn(const String & column_name) const
     return actions_stack.getLastActionsIndex().contains(column_name);
 }
 
-ScopeStack::ScopeStack(ActionsDAGPtr actions_dag, const Context & context_)
-    : context(context_)
+ScopeStack::ScopeStack(ActionsDAGPtr actions_dag, ContextPtr context_) : WithContext(context_)
 {
     auto & level = stack.emplace_back();
     level.actions_dag = std::move(actions_dag);
@@ -650,7 +651,7 @@ std::optional<NameAndTypePair> ActionsMatcher::getNameAndTypeFromAST(const ASTPt
         return NameAndTypePair(child_column_name, node->result_type);
 
     if (!data.only_consts)
-        throw Exception("Unknown identifier: " + child_column_name + " there are columns: " + data.actions_stack.dumpNames(),
+        throw Exception("Unknown identifier: " + child_column_name + "; there are columns: " + data.actions_stack.dumpNames(),
                         ErrorCodes::UNKNOWN_IDENTIFIER);
 
     return {};
@@ -698,7 +699,7 @@ ASTs ActionsMatcher::doUntuple(const ASTFunction * function, ActionsMatcher::Dat
         else
             func->setAlias(data.getUniqueName("_ut_" + name));
 
-        auto function_builder = FunctionFactory::instance().get(func->name, data.context);
+        auto function_builder = FunctionFactory::instance().get(func->name, data.getContext());
         data.addFunction(function_builder, {tuple_name_type->name, literal->getColumnName()}, func->getColumnName());
 
         columns.push_back(std::move(func));
@@ -803,7 +804,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                 auto argument_name = node.arguments->children.at(0)->getColumnName();
 
                 data.addFunction(
-                        FunctionFactory::instance().get(node.name + "IgnoreSet", data.context),
+                        FunctionFactory::instance().get(node.name + "IgnoreSet", data.getContext()),
                         { argument_name, argument_name },
                         column_name);
             }
@@ -811,6 +812,14 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         }
     }
 
+    /// A special function `indexHint`. Everything that is inside it is not calculated
+    if (node.name == "indexHint")
+    {
+        // Arguments are removed. We add function instead of constant column to avoid constant folding.
+        data.addFunction(FunctionFactory::instance().get("indexHint", data.getContext()), {}, column_name);
+        return;
+    }
+
     if (node.is_window_function)
     {
         // Also add columns from PARTITION BY and ORDER BY of window functions.
@@ -846,7 +855,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     FunctionOverloadResolverPtr function_builder;
     try
     {
-        function_builder = FunctionFactory::instance().get(node.name, data.context);
+        function_builder = FunctionFactory::instance().get(node.name, data.getContext());
     }
     catch (Exception & e)
     {
@@ -941,7 +950,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
             else if (identifier && (functionIsJoinGet(node.name) || functionIsDictGet(node.name)) && arg == 0)
             {
                 auto table_id = IdentifierSemantic::extractDatabaseAndTable(*identifier);
-                table_id = data.context.resolveStorageID(table_id, Context::ResolveOrdinary);
+                table_id = data.getContext()->resolveStorageID(table_id, Context::ResolveOrdinary);
                 auto column_string = ColumnString::create();
                 column_string->insert(table_id.getDatabaseName() + "." + table_id.getTableName());
                 ColumnWithTypeAndName column(
@@ -1005,7 +1014,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
 
                     auto lambda_actions = std::make_shared<ExpressionActions>(
                         lambda_dag,
-                        ExpressionActionsSettings::fromContext(data.context));
+                        ExpressionActionsSettings::fromContext(data.getContext(), CompileExpressions::yes));
 
                     DataTypePtr result_type = lambda_actions->getSampleBlock().getByName(result_name).type;
 
@@ -1019,10 +1028,9 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                     ///  because it does not uniquely define the expression (the types of arguments can be different).
                     String lambda_name = data.getUniqueName("__lambda");
 
-                    auto function_capture = std::make_unique<FunctionCaptureOverloadResolver>(
+                    auto function_capture = std::make_shared<FunctionCaptureOverloadResolver>(
                             lambda_actions, captured, lambda_arguments, result_type, result_name);
-                    auto function_capture_adapter = std::make_shared<FunctionOverloadResolverAdaptor>(std::move(function_capture));
-                    data.addFunction(function_capture_adapter, captured, lambda_name);
+                    data.addFunction(function_capture, captured, lambda_name);
 
                     argument_types[i] = std::make_shared<DataTypeFunction>(lambda_type->getArgumentTypes(), result_type);
                     argument_names[i] = lambda_name;
@@ -1125,8 +1133,8 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         ///  and the table has the type Set (a previously prepared set).
         if (identifier)
         {
-            auto table_id = data.context.resolveStorageID(right_in_operand);
-            StoragePtr table = DatabaseCatalog::instance().tryGetTable(table_id, data.context);
+            auto table_id = data.getContext()->resolveStorageID(right_in_operand);
+            StoragePtr table = DatabaseCatalog::instance().tryGetTable(table_id, data.getContext());
 
             if (table)
             {
@@ -1151,7 +1159,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
             return subquery_for_set.set;
         }
 
-        SetPtr set = std::make_shared<Set>(data.set_size_limit, false, data.context.getSettingsRef().transform_null_in);
+        SetPtr set = std::make_shared<Set>(data.set_size_limit, false, data.getContext()->getSettingsRef().transform_null_in);
 
         /** The following happens for GLOBAL INs or INs:
           * - in the addExternalStorage function, the IN (SELECT ...) subquery is replaced with IN _data1,
@@ -1163,7 +1171,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
           */
         if (!subquery_for_set.source && data.create_source_for_in)
         {
-            auto interpreter = interpretSubquery(right_in_operand, data.context, data.subquery_depth, {});
+            auto interpreter = interpretSubquery(right_in_operand, data.getContext(), data.subquery_depth, {});
             subquery_for_set.source = std::make_unique<QueryPlan>();
             interpreter->buildQueryPlan(*subquery_for_set.source);
         }
@@ -1178,7 +1186,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         const auto & index = data.actions_stack.getLastActionsIndex();
         if (index.contains(left_in_operand->getColumnName()))
             /// An explicit enumeration of values in parentheses.
-            return makeExplicitSet(&node, last_actions, false, data.context, data.set_size_limit, data.prepared_sets);
+            return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, data.prepared_sets);
         else
             return {};
     }
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index 42c3ea1e5bc..1d7d64f739a 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/PreparedSets.h>
 #include <Interpreters/SubqueryForSet.h>
-#include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
 {
 
-class Context;
 class ASTFunction;
 
 class ExpressionActions;
@@ -24,7 +24,7 @@ using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 /// The case of an explicit enumeration of values.
 SetPtr makeExplicitSet(
     const ASTFunction * node, const ActionsDAG & actions, bool create_ordered_set,
-    const Context & context, const SizeLimits & limits, PreparedSets & prepared_sets);
+    ContextPtr context, const SizeLimits & limits, PreparedSets & prepared_sets);
 
 /** Create a block for set from expression.
   * 'set_element_types' - types of what are on the left hand side of IN.
@@ -41,7 +41,7 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const std::shared_ptr<ASTFunction> & right_arg,
     const DataTypes & set_element_types,
-    const Context & context);
+    ContextPtr context);
 
 /** Create a block for set from literal.
   * 'set_element_types' - types of what are on the left hand side of IN.
@@ -51,7 +51,7 @@ Block createBlockForSet(
     const DataTypePtr & left_arg_type,
     const ASTPtr & right_arg,
     const DataTypes & set_element_types,
-    const Context & context);
+    ContextPtr context);
 
 /** For ActionsVisitor
   * A stack of ExpressionActions corresponding to nested lambda expressions.
@@ -60,7 +60,7 @@ Block createBlockForSet(
   *  calculation of the product must be done outside the lambda expression (it does not depend on x),
   *  and the calculation of the sum is inside (depends on x).
   */
-struct ScopeStack
+struct ScopeStack : WithContext
 {
     class Index;
     using IndexPtr = std::unique_ptr<Index>;
@@ -80,9 +80,7 @@ struct ScopeStack
 
     Levels stack;
 
-    const Context & context;
-
-    ScopeStack(ActionsDAGPtr actions_dag, const Context & context_);
+    ScopeStack(ActionsDAGPtr actions_dag, ContextPtr context_);
 
     void pushLevel(const NamesAndTypesList & input_columns);
 
@@ -113,9 +111,8 @@ class ActionsMatcher
 public:
     using Visitor = ConstInDepthNodeVisitor<ActionsMatcher, true>;
 
-    struct Data
+    struct Data : public WithContext
     {
-        const Context & context;
         SizeLimits set_size_limit;
         size_t subquery_depth;
         const NamesAndTypesList & source_columns;
@@ -135,10 +132,18 @@ public:
          */
         int next_unique_suffix;
 
-        Data(const Context & context_, SizeLimits set_size_limit_, size_t subquery_depth_,
-                const NamesAndTypesList & source_columns_, ActionsDAGPtr actions_dag,
-                PreparedSets & prepared_sets_, SubqueriesForSets & subqueries_for_sets_,
-                bool no_subqueries_, bool no_makeset_, bool only_consts_, bool create_source_for_in_);
+        Data(
+            ContextPtr context_,
+            SizeLimits set_size_limit_,
+            size_t subquery_depth_,
+            const NamesAndTypesList & source_columns_,
+            ActionsDAGPtr actions_dag,
+            PreparedSets & prepared_sets_,
+            SubqueriesForSets & subqueries_for_sets_,
+            bool no_subqueries_,
+            bool no_makeset_,
+            bool only_consts_,
+            bool create_source_for_in_);
 
         /// Does result of the calculation already exists in the block.
         bool hasColumn(const String & column_name) const;
diff --git a/src/Interpreters/AggregateDescription.cpp b/src/Interpreters/AggregateDescription.cpp
index e483eb1b7a1..ca10878a4ae 100644
--- a/src/Interpreters/AggregateDescription.cpp
+++ b/src/Interpreters/AggregateDescription.cpp
@@ -2,6 +2,8 @@
 #include <Common/FieldVisitors.h>
 #include <IO/Operators.h>
 
+#include <Common/JSONBuilder.h>
+
 namespace DB
 {
 
@@ -99,4 +101,50 @@ void AggregateDescription::explain(WriteBuffer & out, size_t indent) const
     }
 }
 
+void AggregateDescription::explain(JSONBuilder::JSONMap & map) const
+{
+    map.add("Name", column_name);
+
+    if (function)
+    {
+        auto function_map = std::make_unique<JSONBuilder::JSONMap>();
+
+        function_map->add("Name", function->getName());
+
+        const auto & params = function->getParameters();
+        if (!params.empty())
+        {
+            auto params_array = std::make_unique<JSONBuilder::JSONArray>();
+            for (const auto & param : params)
+                params_array->add(applyVisitor(FieldVisitorToString(), param));
+
+            function_map->add("Parameters", std::move(params_array));
+        }
+
+        auto args_array = std::make_unique<JSONBuilder::JSONArray>();
+        for (const auto & type : function->getArgumentTypes())
+            args_array->add(type->getName());
+
+        function_map->add("Argument Types", std::move(args_array));
+        function_map->add("Result Type", function->getReturnType()->getName());
+
+        map.add("Function", std::move(function_map));
+    }
+
+    auto args_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (const auto & name : argument_names)
+        args_array->add(name);
+
+    map.add("Arguments", std::move(args_array));
+
+    if (!arguments.empty())
+    {
+        auto args_pos_array = std::make_unique<JSONBuilder::JSONArray>();
+        for (auto pos : arguments)
+            args_pos_array->add(pos);
+
+        map.add("Argument Positions", std::move(args_pos_array));
+    }
+}
+
 }
diff --git a/src/Interpreters/AggregateDescription.h b/src/Interpreters/AggregateDescription.h
index 3af0dc38586..12c14f7a57c 100644
--- a/src/Interpreters/AggregateDescription.h
+++ b/src/Interpreters/AggregateDescription.h
@@ -5,10 +5,11 @@
 #include <Core/Names.h>
 #include <Core/Types.h>
 
-
 namespace DB
 {
 
+namespace JSONBuilder { class JSONMap; }
+
 struct AggregateDescription
 {
     AggregateFunctionPtr function;
@@ -18,6 +19,7 @@ struct AggregateDescription
     String column_name;      /// What name to use for a column with aggregate function values
 
     void explain(WriteBuffer & out, size_t indent) const; /// Get description for EXPLAIN query.
+    void explain(JSONBuilder::JSONMap & map) const;
 };
 
 using AggregateDescriptions = std::vector<AggregateDescription>;
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index 43b0671f661..dc94c2981b3 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -4,7 +4,6 @@
 
 #include <Common/SipHash.h>
 #include <Common/Arena.h>
-#include <Common/UInt128.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/memcpySmall.h>
 #include <Common/assert_cast.h>
@@ -265,7 +264,7 @@ static inline UInt128 ALWAYS_INLINE hash128(
     for (size_t j = 0; j < keys_size; ++j)
         key_columns[j]->updateHashWithValue(i, hash);
 
-    hash.get128(key.low, key.high);
+    hash.get128(key);
 
     return key;
 }
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index 6a43a40c707..64b20a54955 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -17,6 +17,7 @@
 #include <Common/CurrentThread.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
+#include <Common/JSONBuilder.h>
 #include <AggregateFunctions/AggregateFunctionArray.h>
 #include <AggregateFunctions/AggregateFunctionState.h>
 #include <IO/Operators.h>
@@ -178,9 +179,40 @@ void Aggregator::Params::explain(WriteBuffer & out, size_t indent) const
     }
 }
 
+void Aggregator::Params::explain(JSONBuilder::JSONMap & map) const
+{
+    const auto & header = src_header ? src_header
+                                     : intermediate_header;
+
+    auto keys_array = std::make_unique<JSONBuilder::JSONArray>();
+
+    for (auto key : keys)
+    {
+        if (key >= header.columns())
+            keys_array->add("");
+        else
+            keys_array->add(header.getByPosition(key).name);
+    }
+
+    map.add("Keys", std::move(keys_array));
+
+    if (!aggregates.empty())
+    {
+        auto aggregates_array = std::make_unique<JSONBuilder::JSONArray>();
+
+        for (const auto & aggregate : aggregates)
+        {
+            auto aggregate_map = std::make_unique<JSONBuilder::JSONMap>();
+            aggregate.explain(*aggregate_map);
+            aggregates_array->add(std::move(aggregate_map));
+        }
+
+        map.add("Aggregates", std::move(aggregates_array));
+    }
+}
+
 Aggregator::Aggregator(const Params & params_)
-    : params(params_),
-    isCancelled([]() { return false; })
+    : params(params_)
 {
     /// Use query-level memory tracker
     if (auto * memory_tracker_child = CurrentThread::getMemoryTracker())
@@ -293,7 +325,7 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
             /// into a fixed 16- or 32-byte blob.
             if (std::tuple_size<KeysNullMap<UInt128>>::value + keys_bytes <= 16)
                 return AggregatedDataVariants::Type::nullable_keys128;
-            if (std::tuple_size<KeysNullMap<DummyUInt256>>::value + keys_bytes <= 32)
+            if (std::tuple_size<KeysNullMap<UInt256>>::value + keys_bytes <= 32)
                 return AggregatedDataVariants::Type::nullable_keys256;
         }
 
@@ -575,11 +607,11 @@ void NO_INLINE Aggregator::executeWithoutKeyImpl(
 
 
 void NO_INLINE Aggregator::executeOnIntervalWithoutKeyImpl(
-        AggregatedDataWithoutKey & res,
-        size_t row_begin,
-        size_t row_end,
-        AggregateFunctionInstruction * aggregate_instructions,
-        Arena * arena)
+    AggregatedDataWithoutKey & res,
+    size_t row_begin,
+    size_t row_end,
+    AggregateFunctionInstruction * aggregate_instructions,
+    Arena * arena)
 {
     /// Adding values
     for (AggregateFunctionInstruction * inst = aggregate_instructions; inst->that; ++inst)
@@ -618,12 +650,12 @@ void Aggregator::prepareAggregateInstructions(Columns columns, AggregateColumns
 
         aggregate_functions_instructions[i].arguments = aggregate_columns[i].data();
         aggregate_functions_instructions[i].state_offset = offsets_of_aggregate_states[i];
+
         auto * that = aggregate_functions[i];
         /// Unnest consecutive trailing -State combinators
         while (const auto * func = typeid_cast<const AggregateFunctionState *>(that))
             that = func->getNestedFunction().get();
         aggregate_functions_instructions[i].that = that;
-        aggregate_functions_instructions[i].func = that->getAddressOfAddFunction();
 
         if (const auto * func = typeid_cast<const AggregateFunctionArray *>(that))
         {
@@ -655,9 +687,6 @@ 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)
 {
-    if (isCancelled())
-        return true;
-
     /// `result` will destroy the states of aggregate functions in the destructor
     result.aggregator = this;
 
@@ -670,9 +699,6 @@ bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedData
         LOG_TRACE(log, "Aggregation method: {}", result.getMethodName());
     }
 
-    if (isCancelled())
-        return true;
-
     /** Constant columns are not supported directly during aggregation.
       * To make them work anyway, we materialize them.
       */
@@ -698,9 +724,6 @@ bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedData
     AggregateFunctionInstructions aggregate_functions_instructions;
     prepareAggregateInstructions(columns, aggregate_columns, materialized_columns, aggregate_functions_instructions, nested_columns_holder);
 
-    if (isCancelled())
-        return true;
-
     if ((params.overflow_row || result.type == AggregatedDataVariants::Type::without_key) && !result.without_key)
     {
         AggregateDataPtr place = result.aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
@@ -814,7 +837,12 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, co
     data_variants.init(data_variants.type);
     data_variants.aggregates_pools = Arenas(1, std::make_shared<Arena>());
     data_variants.aggregates_pool = data_variants.aggregates_pools.back().get();
-    data_variants.without_key = nullptr;
+    if (params.overflow_row || data_variants.type == AggregatedDataVariants::Type::without_key)
+    {
+        AggregateDataPtr place = data_variants.aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
+        createAggregateStates(place);
+        data_variants.without_key = place;
+    }
 
     block_out.flush();
     compressed_buf.next();
@@ -834,10 +862,10 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, co
     ProfileEvents::increment(ProfileEvents::ExternalAggregationCompressedBytes, compressed_bytes);
     ProfileEvents::increment(ProfileEvents::ExternalAggregationUncompressedBytes, uncompressed_bytes);
 
-    LOG_TRACE(log,
-        "Written part in {} sec., {} rows, {} uncompressed, {} compressed,"
-        " {} uncompressed bytes per row, {} compressed bytes per row, compression rate: {}"
-        " ({} rows/sec., {}/sec. uncompressed, {}/sec. compressed)",
+    LOG_DEBUG(log,
+        "Written part in {:.3f} sec., {} rows, {} uncompressed, {} compressed,"
+        " {:.3f} uncompressed bytes per row, {:.3f} compressed bytes per row, compression rate: {:.3f}"
+        " ({:.3f} rows/sec., {}/sec. uncompressed, {}/sec. compressed)",
         elapsed_seconds,
         rows,
         ReadableSize(uncompressed_bytes),
@@ -947,7 +975,7 @@ void Aggregator::writeToTemporaryFileImpl(
     /// `data_variants` will not destroy them in the destructor, they are now owned by ColumnAggregateFunction objects.
     data_variants.aggregator = nullptr;
 
-    LOG_TRACE(log, "Max size of temporary block: {} rows, {}.", max_temporary_block_size_rows, ReadableSize(max_temporary_block_size_bytes));
+    LOG_DEBUG(log, "Max size of temporary block: {} rows, {}.", max_temporary_block_size_rows, ReadableSize(max_temporary_block_size_bytes));
 }
 
 
@@ -1220,29 +1248,35 @@ Block Aggregator::prepareBlockAndFill(
     return res;
 }
 
-void Aggregator::fillAggregateColumnsWithSingleKey(
-    AggregatedDataVariants & data_variants,
-    MutableColumns & final_aggregate_columns)
+void Aggregator::addSingleKeyToAggregateColumns(
+    const AggregatedDataVariants & data_variants,
+    MutableColumns & aggregate_columns) const
 {
-    AggregatedDataWithoutKey & data = data_variants.without_key;
-
+    const auto & data = data_variants.without_key;
     for (size_t i = 0; i < params.aggregates_size; ++i)
     {
-        ColumnAggregateFunction & column_aggregate_func = assert_cast<ColumnAggregateFunction &>(*final_aggregate_columns[i]);
-        for (auto & pool : data_variants.aggregates_pools)
-        {
-            column_aggregate_func.addArena(pool);
-        }
+        auto & column_aggregate_func = assert_cast<ColumnAggregateFunction &>(*aggregate_columns[i]);
         column_aggregate_func.getData().push_back(data + offsets_of_aggregate_states[i]);
     }
-    data = nullptr;
+}
+
+void Aggregator::addArenasToAggregateColumns(
+    const AggregatedDataVariants & data_variants,
+    MutableColumns & aggregate_columns) const
+{
+    for (size_t i = 0; i < params.aggregates_size; ++i)
+    {
+        auto & column_aggregate_func = assert_cast<ColumnAggregateFunction &>(*aggregate_columns[i]);
+        for (const auto & pool : data_variants.aggregates_pools)
+            column_aggregate_func.addArena(pool);
+    }
 }
 
 void Aggregator::createStatesAndFillKeyColumnsWithSingleKey(
     AggregatedDataVariants & data_variants,
     Columns & key_columns,
     size_t key_row,
-    MutableColumns & final_key_columns)
+    MutableColumns & final_key_columns) const
 {
     AggregateDataPtr place = data_variants.aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
     createAggregateStates(place);
@@ -1268,6 +1302,9 @@ Block Aggregator::prepareBlockAndFillWithoutKey(AggregatedDataVariants & data_va
         {
             AggregatedDataWithoutKey & data = data_variants.without_key;
 
+            if (!data)
+                throw Exception("Wrong data variant passed.", ErrorCodes::LOGICAL_ERROR);
+
             if (!final_)
             {
                 for (size_t i = 0; i < params.aggregates_size; ++i)
@@ -1419,9 +1456,6 @@ BlocksList Aggregator::prepareBlocksAndFillTwoLevelImpl(
 
 BlocksList Aggregator::convertToBlocks(AggregatedDataVariants & data_variants, bool final, size_t max_threads) const
 {
-    if (isCancelled())
-        return BlocksList();
-
     LOG_TRACE(log, "Converting aggregated data to blocks");
 
     Stopwatch watch;
@@ -1437,16 +1471,10 @@ BlocksList Aggregator::convertToBlocks(AggregatedDataVariants & data_variants, b
         && data_variants.isTwoLevel())                      /// TODO Use the shared thread pool with the `merge` function.
         thread_pool = std::make_unique<ThreadPool>(max_threads);
 
-    if (isCancelled())
-        return BlocksList();
-
     if (data_variants.without_key)
         blocks.emplace_back(prepareBlockAndFillWithoutKey(
             data_variants, final, data_variants.type != AggregatedDataVariants::Type::without_key));
 
-    if (isCancelled())
-        return BlocksList();
-
     if (data_variants.type != AggregatedDataVariants::Type::without_key)
     {
         if (!data_variants.isTwoLevel())
@@ -1462,9 +1490,6 @@ BlocksList Aggregator::convertToBlocks(AggregatedDataVariants & data_variants, b
         data_variants.aggregator = nullptr;
     }
 
-    if (isCancelled())
-        return BlocksList();
-
     size_t rows = 0;
     size_t bytes = 0;
 
@@ -1475,8 +1500,8 @@ BlocksList Aggregator::convertToBlocks(AggregatedDataVariants & data_variants, b
     }
 
     double elapsed_seconds = watch.elapsedSeconds();
-    LOG_TRACE(log,
-        "Converted aggregated data to blocks. {} rows, {} in {} sec. ({} rows/sec., {}/sec.)",
+    LOG_DEBUG(log,
+        "Converted aggregated data to blocks. {} rows, {} in {} sec. ({:.3f} rows/sec., {}/sec.)",
         rows, ReadableSize(bytes),
         elapsed_seconds, rows / elapsed_seconds,
         ReadableSize(bytes / elapsed_seconds));
@@ -1530,7 +1555,7 @@ void NO_INLINE Aggregator::mergeDataImpl(
         mergeDataNullKey<Method, Table>(table_dst, table_src, arena);
 
     table_src.mergeToViaEmplace(table_dst,
-        [&](AggregateDataPtr & dst, AggregateDataPtr & src, bool inserted)
+        [&](AggregateDataPtr & __restrict dst, AggregateDataPtr & __restrict src, bool inserted)
     {
         if (!inserted)
         {
@@ -1785,6 +1810,8 @@ void NO_INLINE Aggregator::mergeStreamsImplCase(
 
     /// For all rows.
     size_t rows = block.rows();
+    std::unique_ptr<AggregateDataPtr[]> places(new AggregateDataPtr[rows]);
+
     for (size_t i = 0; i < rows; ++i)
     {
         AggregateDataPtr aggregate_data = nullptr;
@@ -1813,18 +1840,17 @@ void NO_INLINE Aggregator::mergeStreamsImplCase(
 
         /// aggregate_date == nullptr means that the new key did not fit in the hash table because of no_more_keys.
 
-        /// If the key does not fit, and the data does not need to be aggregated into a separate row, then there's nothing to do.
-        if (!aggregate_data && !overflow_row)
-            continue;
-
         AggregateDataPtr value = aggregate_data ? aggregate_data : overflow_row;
+        places[i] = value;
+    }
 
+    for (size_t j = 0; j < params.aggregates_size; ++j)
+    {
         /// Merge state of aggregate functions.
-        for (size_t j = 0; j < params.aggregates_size; ++j)
-            aggregate_functions[j]->merge(
-                value + offsets_of_aggregate_states[j],
-                (*aggregate_columns[j])[i],
-                aggregates_pool);
+        aggregate_functions[j]->mergeBatch(
+            rows, places.get(), offsets_of_aggregate_states[j],
+            aggregate_columns[j]->data(),
+            aggregates_pool);
     }
 
     /// Early release memory.
@@ -1868,14 +1894,96 @@ void NO_INLINE Aggregator::mergeWithoutKeyStreamsImpl(
         res = place;
     }
 
-    /// Adding Values
-    for (size_t i = 0; i < params.aggregates_size; ++i)
-        aggregate_functions[i]->merge(res + offsets_of_aggregate_states[i], (*aggregate_columns[i])[0], result.aggregates_pool);
+    if (block.rows() > 0)
+    {
+        /// Adding Values
+        for (size_t i = 0; i < params.aggregates_size; ++i)
+            aggregate_functions[i]->merge(res + offsets_of_aggregate_states[i], (*aggregate_columns[i])[0], result.aggregates_pool);
+    }
 
     /// Early release memory.
     block.clear();
 }
 
+bool Aggregator::mergeBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys)
+{
+    /// `result` will destroy the states of aggregate functions in the destructor
+    result.aggregator = this;
+
+    /// How to perform the aggregation?
+    if (result.empty())
+    {
+        result.init(method_chosen);
+        result.keys_size = params.keys_size;
+        result.key_sizes = key_sizes;
+        LOG_TRACE(log, "Aggregation method: {}", result.getMethodName());
+    }
+
+    if (result.type == AggregatedDataVariants::Type::without_key || block.info.is_overflows)
+        mergeWithoutKeyStreamsImpl(block, result);
+
+#define M(NAME, IS_TWO_LEVEL) \
+    else if (result.type == AggregatedDataVariants::Type::NAME) \
+        mergeStreamsImpl(block, result.aggregates_pool, *result.NAME, result.NAME->data, result.without_key, no_more_keys);
+
+    APPLY_FOR_AGGREGATED_VARIANTS(M)
+#undef M
+    else if (result.type != AggregatedDataVariants::Type::without_key)
+        throw Exception("Unknown aggregated data variant.", ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT);
+
+    size_t result_size = result.sizeWithoutOverflowRow();
+    Int64 current_memory_usage = 0;
+    if (auto * memory_tracker_child = CurrentThread::getMemoryTracker())
+        if (auto * memory_tracker = memory_tracker_child->getParent())
+            current_memory_usage = memory_tracker->get();
+
+    /// Here all the results in the sum are taken into account, from different threads.
+    auto result_size_bytes = current_memory_usage - memory_usage_before_aggregation;
+
+    bool worth_convert_to_two_level
+        = (params.group_by_two_level_threshold && result_size >= params.group_by_two_level_threshold)
+        || (params.group_by_two_level_threshold_bytes && result_size_bytes >= static_cast<Int64>(params.group_by_two_level_threshold_bytes));
+
+    /** Converting to a two-level data structure.
+      * It allows you to make, in the subsequent, an effective merge - either economical from memory or parallel.
+      */
+    if (result.isConvertibleToTwoLevel() && worth_convert_to_two_level)
+        result.convertToTwoLevel();
+
+    /// Checking the constraints.
+    if (!checkLimits(result_size, no_more_keys))
+        return false;
+
+    /** Flush data to disk if too much RAM is consumed.
+      * Data can only be flushed to disk if a two-level aggregation structure is used.
+      */
+    if (params.max_bytes_before_external_group_by
+        && result.isTwoLevel()
+        && current_memory_usage > static_cast<Int64>(params.max_bytes_before_external_group_by)
+        && worth_convert_to_two_level)
+    {
+        size_t size = current_memory_usage + params.min_free_disk_space;
+
+        std::string tmp_path = params.tmp_volume->getDisk()->getPath();
+
+        // enoughSpaceInDirectory() is not enough to make it right, since
+        // another process (or another thread of aggregator) can consume all
+        // space.
+        //
+        // But true reservation (IVolume::reserve()) cannot be used here since
+        // current_memory_usage does not takes compression into account and
+        // will reserve way more that actually will be used.
+        //
+        // Hence let's do a simple check.
+        if (!enoughSpaceInDirectory(tmp_path, size))
+            throw Exception("Not enough space for external aggregation in " + tmp_path, ErrorCodes::NOT_ENOUGH_SPACE);
+
+        writeToTemporaryFile(result, tmp_path);
+    }
+
+    return true;
+}
+
 
 void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVariants & result, size_t max_threads)
 {
@@ -1905,9 +2013,6 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
     #undef M
     }
 
-    if (isCancelled())
-        return;
-
     /// result will destroy the states of aggregate functions in the destructor
     result.aggregator = this;
 
@@ -1934,9 +2039,6 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
 
             for (Block & block : bucket_to_blocks[bucket])
             {
-                if (isCancelled())
-                    return;
-
             #define M(NAME) \
                 else if (result.type == AggregatedDataVariants::Type::NAME) \
                     mergeStreamsImpl(block, aggregates_pool, *result.NAME, result.NAME->data.impls[bucket], nullptr, false);
@@ -1977,12 +2079,6 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
         LOG_TRACE(log, "Merged partially aggregated two-level data.");
     }
 
-    if (isCancelled())
-    {
-        result.invalidate();
-        return;
-    }
-
     if (has_blocks_with_unknown_bucket)
     {
         LOG_TRACE(log, "Merging partially aggregated single-level data.");
@@ -1992,12 +2088,6 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
         BlocksList & blocks = bucket_to_blocks[-1];
         for (Block & block : blocks)
         {
-            if (isCancelled())
-            {
-                result.invalidate();
-                return;
-            }
-
             if (!checkLimits(result.sizeWithoutOverflowRow(), no_more_keys))
                 break;
 
@@ -2065,9 +2155,6 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
 
     for (Block & block : blocks)
     {
-        if (isCancelled())
-            return {};
-
         if (bucket_num >= 0 && block.info.bucket_num != bucket_num)
             bucket_num = -1;
 
@@ -2084,9 +2171,6 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
             throw Exception("Unknown aggregated data variant.", ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT);
     }
 
-    if (isCancelled())
-        return {};
-
     Block block;
     if (result.type == AggregatedDataVariants::Type::without_key || is_overflows)
         block = prepareBlockAndFillWithoutKey(result, final, is_overflows);
@@ -2103,14 +2187,11 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
     size_t rows = block.rows();
     size_t bytes = block.bytes();
     double elapsed_seconds = watch.elapsedSeconds();
-    LOG_TRACE(log, "Merged partially aggregated blocks. {} rows, {}. in {} sec. ({} rows/sec., {}/sec.)",
+    LOG_DEBUG(log, "Merged partially aggregated blocks. {} rows, {}. in {} sec. ({:.3f} rows/sec., {}/sec.)",
         rows, ReadableSize(bytes),
         elapsed_seconds, rows / elapsed_seconds,
         ReadableSize(bytes / elapsed_seconds));
 
-    if (isCancelled())
-        return {};
-
     block.info.bucket_num = bucket_num;
     return block;
 }
@@ -2289,10 +2370,4 @@ void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result)
 }
 
 
-void Aggregator::setCancellationHook(const CancellationHook & cancellation_hook)
-{
-    isCancelled = cancellation_hook;
-}
-
-
 }
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index b7bdca399fa..da55831f952 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -15,7 +15,6 @@
 #include <Common/HashTable/TwoLevelStringHashMap.h>
 
 #include <Common/ThreadPool.h>
-#include <Common/UInt128.h>
 #include <Common/ColumnsHashing.h>
 #include <Common/assert_cast.h>
 #include <Common/filesystemHelpers.h>
@@ -78,7 +77,7 @@ using AggregatedDataWithShortStringKey = StringHashMap<AggregateDataPtr>;
 using AggregatedDataWithStringKey = HashMapWithSavedHash<StringRef, AggregateDataPtr>;
 
 using AggregatedDataWithKeys128 = HashMap<UInt128, AggregateDataPtr, UInt128HashCRC32>;
-using AggregatedDataWithKeys256 = HashMap<DummyUInt256, AggregateDataPtr, UInt256HashCRC32>;
+using AggregatedDataWithKeys256 = HashMap<UInt256, AggregateDataPtr, UInt256HashCRC32>;
 
 using AggregatedDataWithUInt32KeyTwoLevel = TwoLevelHashMap<UInt32, AggregateDataPtr, HashCRC32<UInt32>>;
 using AggregatedDataWithUInt64KeyTwoLevel = TwoLevelHashMap<UInt64, AggregateDataPtr, HashCRC32<UInt64>>;
@@ -88,7 +87,7 @@ using AggregatedDataWithShortStringKeyTwoLevel = TwoLevelStringHashMap<Aggregate
 using AggregatedDataWithStringKeyTwoLevel = TwoLevelHashMapWithSavedHash<StringRef, AggregateDataPtr>;
 
 using AggregatedDataWithKeys128TwoLevel = TwoLevelHashMap<UInt128, AggregateDataPtr, UInt128HashCRC32>;
-using AggregatedDataWithKeys256TwoLevel = TwoLevelHashMap<DummyUInt256, AggregateDataPtr, UInt256HashCRC32>;
+using AggregatedDataWithKeys256TwoLevel = TwoLevelHashMap<UInt256, AggregateDataPtr, UInt256HashCRC32>;
 
 /** Variants with better hash function, using more than 32 bits for hash.
   * Using for merging phase of external aggregation, where number of keys may be far greater than 4 billion,
@@ -100,7 +99,7 @@ using AggregatedDataWithKeys256TwoLevel = TwoLevelHashMap<DummyUInt256, Aggregat
 using AggregatedDataWithUInt64KeyHash64 = HashMap<UInt64, AggregateDataPtr, DefaultHash<UInt64>>;
 using AggregatedDataWithStringKeyHash64 = HashMapWithSavedHash<StringRef, AggregateDataPtr, StringRefHash64>;
 using AggregatedDataWithKeys128Hash64 = HashMap<UInt128, AggregateDataPtr, UInt128Hash>;
-using AggregatedDataWithKeys256Hash64 = HashMap<DummyUInt256, AggregateDataPtr, UInt256Hash>;
+using AggregatedDataWithKeys256Hash64 = HashMap<UInt256, AggregateDataPtr, UInt256Hash>;
 
 template <typename Base>
 struct AggregationDataWithNullKey : public Base
@@ -867,7 +866,7 @@ using ManyAggregatedDataVariantsPtr = std::shared_ptr<ManyAggregatedDataVariants
 
 /** Aggregates the source of the blocks.
   */
-class Aggregator
+class Aggregator final
 {
 public:
     struct Params
@@ -916,8 +915,10 @@ public:
             size_t max_bytes_before_external_group_by_,
             bool empty_result_for_aggregation_by_empty_set_,
             VolumePtr tmp_volume_, size_t max_threads_,
-            size_t min_free_disk_space_)
+            size_t min_free_disk_space_,
+            const Block & intermediate_header_ = {})
             : src_header(src_header_),
+            intermediate_header(intermediate_header_),
             keys(keys_), aggregates(aggregates_), keys_size(keys.size()), aggregates_size(aggregates.size()),
             overflow_row(overflow_row_), max_rows_to_group_by(max_rows_to_group_by_), group_by_overflow_mode(group_by_overflow_mode_),
             group_by_two_level_threshold(group_by_two_level_threshold_), group_by_two_level_threshold_bytes(group_by_two_level_threshold_bytes_),
@@ -950,9 +951,10 @@ public:
 
         /// Returns keys and aggregated for EXPLAIN query
         void explain(WriteBuffer & out, size_t indent) const;
+        void explain(JSONBuilder::JSONMap & map) const;
     };
 
-    Aggregator(const Params & params_);
+    explicit Aggregator(const Params & params_);
 
     using AggregateColumns = std::vector<ColumnRawPtrs>;
     using AggregateColumnsData = std::vector<ColumnAggregateFunction::Container *>;
@@ -983,6 +985,8 @@ 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).
@@ -994,12 +998,6 @@ public:
       */
     std::vector<Block> convertBlockToTwoLevel(const Block & block);
 
-    using CancellationHook = std::function<bool()>;
-
-    /** Set a function that checks whether the current task can be aborted.
-      */
-    void setCancellationHook(const CancellationHook & cancellation_hook);
-
     /// For external aggregation.
     void writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path);
     void writeToTemporaryFile(AggregatedDataVariants & data_variants);
@@ -1025,7 +1023,8 @@ public:
     /// Get data structure of the result.
     Block getHeader(bool final) const;
 
-protected:
+private:
+
     friend struct AggregatedDataVariants;
     friend class ConvertingAggregatedToChunksTransform;
     friend class ConvertingAggregatedToChunksSource;
@@ -1042,22 +1041,17 @@ protected:
 
     /** This array serves two purposes.
       *
-      * 1. Function arguments are collected side by side, and they do not need to be collected from different places. Also the array is made zero-terminated.
+      * Function arguments are collected side by side, and they do not need to be collected from different places. Also the array is made zero-terminated.
       * The inner loop (for the case without_key) is almost twice as compact; performance gain of about 30%.
-      *
-      * 2. Calling a function by pointer is better than a virtual call, because in the case of a virtual call,
-      *  GCC 5.1.2 generates code that, at each iteration of the loop, reloads the function address from memory into the register
-      *  (the offset value in the virtual function table).
       */
     struct AggregateFunctionInstruction
     {
-        const IAggregateFunction * that;
-        IAggregateFunction::AddFunc func;
-        size_t state_offset;
-        const IColumn ** arguments;
-        const IAggregateFunction * batch_that;
-        const IColumn ** batch_arguments;
-        const UInt64 * offsets = nullptr;
+        const IAggregateFunction * that{};
+        size_t state_offset{};
+        const IColumn ** arguments{};
+        const IAggregateFunction * batch_that{};
+        const IColumn ** batch_arguments{};
+        const UInt64 * offsets{};
     };
 
     using AggregateFunctionInstructions = std::vector<AggregateFunctionInstruction>;
@@ -1075,13 +1069,8 @@ protected:
     /// How many RAM were used to process the query before processing the first block.
     Int64 memory_usage_before_aggregation = 0;
 
-    std::mutex mutex;
-
     Poco::Logger * log = &Poco::Logger::get("Aggregator");
 
-    /// Returns true if you can abort the current task.
-    CancellationHook isCancelled;
-
     /// For external aggregation.
     TemporaryFiles temporary_files;
 
@@ -1139,7 +1128,6 @@ protected:
         Method & method,
         IBlockOutputStream & out);
 
-protected:
     /// Merge NULL key data from hash table `src` into `dst`.
     template <typename Method, typename Table>
     void mergeDataNullKey(
@@ -1295,14 +1283,18 @@ protected:
         AggregateFunctionInstructions & instructions,
         NestedColumnsHolder & nested_columns_holder);
 
-    void fillAggregateColumnsWithSingleKey(
-        AggregatedDataVariants & data_variants,
-        MutableColumns & final_aggregate_columns);
+    void addSingleKeyToAggregateColumns(
+        const AggregatedDataVariants & data_variants,
+        MutableColumns & aggregate_columns) const;
+
+    void addArenasToAggregateColumns(
+        const AggregatedDataVariants & data_variants,
+        MutableColumns & aggregate_columns) const;
 
     void createStatesAndFillKeyColumnsWithSingleKey(
         AggregatedDataVariants & data_variants,
         Columns & key_columns, size_t key_row,
-        MutableColumns & final_key_columns);
+        MutableColumns & final_key_columns) const;
 };
 
 
diff --git a/src/Interpreters/ApplyWithSubqueryVisitor.cpp b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
index f3d0c82e5f1..27e0e438a71 100644
--- a/src/Interpreters/ApplyWithSubqueryVisitor.cpp
+++ b/src/Interpreters/ApplyWithSubqueryVisitor.cpp
@@ -13,28 +13,7 @@ namespace DB
 void ApplyWithSubqueryVisitor::visit(ASTPtr & ast, const Data & data)
 {
     if (auto * node_select = ast->as<ASTSelectQuery>())
-    {
-        std::optional<Data> new_data;
-        if (auto with = node_select->with())
-        {
-            for (auto & child : with->children)
-            {
-                visit(child, new_data ? *new_data : data);
-                if (auto * ast_with_elem = child->as<ASTWithElement>())
-                {
-                    if (!new_data)
-                        new_data = data;
-                    new_data->subqueries[ast_with_elem->name] = ast_with_elem->subquery;
-                }
-            }
-        }
-
-        for (auto & child : node_select->children)
-        {
-            if (child != node_select->with())
-                visit(child, new_data ? *new_data : data);
-        }
-    }
+        visit(*node_select, data);
     else
     {
         for (auto & child : ast->children)
@@ -46,6 +25,36 @@ void ApplyWithSubqueryVisitor::visit(ASTPtr & ast, const Data & data)
     }
 }
 
+void ApplyWithSubqueryVisitor::visit(ASTSelectQuery & ast, const Data & data)
+{
+    std::optional<Data> new_data;
+    if (auto with = ast.with())
+    {
+        for (auto & child : with->children)
+        {
+            visit(child, new_data ? *new_data : data);
+            if (auto * ast_with_elem = child->as<ASTWithElement>())
+            {
+                if (!new_data)
+                    new_data = data;
+                new_data->subqueries[ast_with_elem->name] = ast_with_elem->subquery;
+            }
+        }
+    }
+
+    for (auto & child : ast.children)
+    {
+        if (child != ast.with())
+            visit(child, new_data ? *new_data : data);
+    }
+}
+
+void ApplyWithSubqueryVisitor::visit(ASTSelectWithUnionQuery & ast, const Data & data)
+{
+    for (auto & child : ast.children)
+        visit(child, data);
+}
+
 void ApplyWithSubqueryVisitor::visit(ASTTableExpression & table, const Data & data)
 {
     if (table.database_and_table_name)
diff --git a/src/Interpreters/ApplyWithSubqueryVisitor.h b/src/Interpreters/ApplyWithSubqueryVisitor.h
index ed3f9fbcd3e..3b17de1d691 100644
--- a/src/Interpreters/ApplyWithSubqueryVisitor.h
+++ b/src/Interpreters/ApplyWithSubqueryVisitor.h
@@ -7,6 +7,8 @@
 namespace DB
 {
 class ASTFunction;
+class ASTSelectQuery;
+class ASTSelectWithUnionQuery;
 struct ASTTableExpression;
 
 class ApplyWithSubqueryVisitor
@@ -18,9 +20,13 @@ public:
     };
 
     static void visit(ASTPtr & ast) { visit(ast, {}); }
+    static void visit(ASTSelectQuery & select) { visit(select, {}); }
+    static void visit(ASTSelectWithUnionQuery & select) { visit(select, {}); }
 
 private:
     static void visit(ASTPtr & ast, const Data & data);
+    static void visit(ASTSelectQuery & ast, const Data & data);
+    static void visit(ASTSelectWithUnionQuery & ast, const Data & data);
     static void visit(ASTTableExpression & table, const Data & data);
     static void visit(ASTFunction & func, const Data & data);
 };
diff --git a/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp b/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp
index 5c071ed9134..bdd9ce32707 100644
--- a/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp
+++ b/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp
@@ -64,6 +64,8 @@ Field zeroField(const Field & value)
         case Field::Types::Float64: return Float64(0);
         case Field::Types::UInt128: return UInt128(0);
         case Field::Types::Int128: return Int128(0);
+        case Field::Types::UInt256: return UInt256(0);
+        case Field::Types::Int256: return Int256(0);
         default:
             break;
     }
diff --git a/src/Interpreters/ArrayJoinAction.cpp b/src/Interpreters/ArrayJoinAction.cpp
index 77d63bd7752..3d176857601 100644
--- a/src/Interpreters/ArrayJoinAction.cpp
+++ b/src/Interpreters/ArrayJoinAction.cpp
@@ -16,10 +16,10 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
 }
 
-ArrayJoinAction::ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, const Context & context)
+ArrayJoinAction::ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, ContextPtr context)
     : columns(array_joined_columns_)
     , is_left(array_join_is_left)
-    , is_unaligned(context.getSettingsRef().enable_unaligned_array_join)
+    , is_unaligned(context->getSettingsRef().enable_unaligned_array_join)
 {
     if (columns.empty())
         throw Exception("No arrays to join", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/Interpreters/ArrayJoinAction.h b/src/Interpreters/ArrayJoinAction.h
index 81f720f00ef..975bf25a953 100644
--- a/src/Interpreters/ArrayJoinAction.h
+++ b/src/Interpreters/ArrayJoinAction.h
@@ -2,13 +2,12 @@
 
 #include <Core/Names.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
 {
 
-class Context;
-
 class IFunctionOverloadResolver;
 using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
 
@@ -27,7 +26,7 @@ public:
     /// For LEFT ARRAY JOIN.
     FunctionOverloadResolverPtr function_builder;
 
-    ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, const Context & context);
+    ArrayJoinAction(const NameSet & array_joined_columns_, bool array_join_is_left, ContextPtr context);
     void prepare(ColumnsWithTypeAndName & sample) const;
     void execute(Block & block);
 };
diff --git a/src/Interpreters/AsynchronousMetricLog.cpp b/src/Interpreters/AsynchronousMetricLog.cpp
index d2c81c9dfc5..6c20a04d291 100644
--- a/src/Interpreters/AsynchronousMetricLog.cpp
+++ b/src/Interpreters/AsynchronousMetricLog.cpp
@@ -1,9 +1,10 @@
-#include <Interpreters/AsynchronousMetricLog.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/AsynchronousMetricLog.h>
 #include <Interpreters/AsynchronousMetrics.h>
 
 
@@ -17,7 +18,7 @@ Block AsynchronousMetricLogElement::createBlock()
     columns.emplace_back(std::make_shared<DataTypeDate>(),          "event_date");
     columns.emplace_back(std::make_shared<DataTypeDateTime>(),      "event_time");
     columns.emplace_back(std::make_shared<DataTypeDateTime64>(6),   "event_time_microseconds");
-    columns.emplace_back(std::make_shared<DataTypeString>(),        "name");
+    columns.emplace_back(std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "name");
     columns.emplace_back(std::make_shared<DataTypeFloat64>(),       "value");
 
     return Block(columns);
diff --git a/src/Interpreters/AsynchronousMetrics.cpp b/src/Interpreters/AsynchronousMetrics.cpp
index 3d582293190..2216be4390c 100644
--- a/src/Interpreters/AsynchronousMetrics.cpp
+++ b/src/Interpreters/AsynchronousMetrics.cpp
@@ -172,7 +172,7 @@ void AsynchronousMetrics::update()
     AsynchronousMetricValues new_values;
 
     {
-        if (auto mark_cache = global_context.getMarkCache())
+        if (auto mark_cache = getContext()->getMarkCache())
         {
             new_values["MarkCacheBytes"] = mark_cache->weight();
             new_values["MarkCacheFiles"] = mark_cache->count();
@@ -180,7 +180,7 @@ void AsynchronousMetrics::update()
     }
 
     {
-        if (auto uncompressed_cache = global_context.getUncompressedCache())
+        if (auto uncompressed_cache = getContext()->getUncompressedCache())
         {
             new_values["UncompressedCacheBytes"] = uncompressed_cache->weight();
             new_values["UncompressedCacheCells"] = uncompressed_cache->count();
@@ -188,7 +188,7 @@ void AsynchronousMetrics::update()
     }
 
     {
-        if (auto mmap_cache = global_context.getMMappedFileCache())
+        if (auto mmap_cache = getContext()->getMMappedFileCache())
         {
             new_values["MMapCacheCells"] = mmap_cache->count();
         }
@@ -197,11 +197,14 @@ void AsynchronousMetrics::update()
 #if USE_EMBEDDED_COMPILER
     {
         if (auto * compiled_expression_cache = CompiledExpressionCacheFactory::instance().tryGetCache())
+        {
+            new_values["CompiledExpressionCacheBytes"] = compiled_expression_cache->weight();
             new_values["CompiledExpressionCacheCount"]  = compiled_expression_cache->count();
+        }
     }
 #endif
 
-    new_values["Uptime"] = global_context.getUptimeSeconds();
+    new_values["Uptime"] = getContext()->getUptimeSeconds();
 
     /// Process memory usage according to OS
 #if defined(OS_LINUX)
@@ -264,7 +267,7 @@ void AsynchronousMetrics::update()
             /// Check if database can contain MergeTree tables
             if (!db.second->canContainMergeTreeTables())
                 continue;
-            for (auto iterator = db.second->getTablesIterator(global_context); iterator->isValid(); iterator->next())
+            for (auto iterator = db.second->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             {
                 ++total_number_of_tables;
                 const auto & table = iterator->table();
@@ -307,14 +310,14 @@ void AsynchronousMetrics::update()
                 if (table_merge_tree)
                 {
                     calculateMax(max_part_count_for_partition, table_merge_tree->getMaxPartsCountForPartition());
-                    const auto & settings = global_context.getSettingsRef();
+                    const auto & settings = getContext()->getSettingsRef();
                     total_number_of_bytes += table_merge_tree->totalBytes(settings).value();
                     total_number_of_rows += table_merge_tree->totalRows(settings).value();
                     total_number_of_parts += table_merge_tree->getPartsCount();
                 }
                 if (table_replicated_merge_tree)
                 {
-                    const auto & settings = global_context.getSettingsRef();
+                    const auto & settings = getContext()->getSettingsRef();
                     total_number_of_bytes += table_replicated_merge_tree->totalBytes(settings).value();
                     total_number_of_rows += table_replicated_merge_tree->totalRows(settings).value();
                     total_number_of_parts += table_replicated_merge_tree->getPartsCount();
@@ -454,7 +457,7 @@ void AsynchronousMetrics::update()
     /// Add more metrics as you wish.
 
     // Log the new metrics.
-    if (auto log = global_context.getAsynchronousMetricLog())
+    if (auto log = getContext()->getAsynchronousMetricLog())
     {
         log->addValues(new_values);
     }
diff --git a/src/Interpreters/AsynchronousMetrics.h b/src/Interpreters/AsynchronousMetrics.h
index f727b1d6b48..38875c21edd 100644
--- a/src/Interpreters/AsynchronousMetrics.h
+++ b/src/Interpreters/AsynchronousMetrics.h
@@ -1,18 +1,19 @@
 #pragma once
 
-#include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <unordered_map>
-#include <string>
-#include <Common/ThreadPool.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/MemoryStatisticsOS.h>
+#include <Common/ThreadPool.h>
+
+#include <condition_variable>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <unordered_map>
 
 
 namespace DB
 {
 
-class Context;
 class ProtocolServerAdapter;
 
 using AsynchronousMetricValue = double;
@@ -23,16 +24,16 @@ using AsynchronousMetricValues = std::unordered_map<std::string, AsynchronousMet
   *  calculates and updates some metrics,
   *  that are not updated automatically (so, need to be asynchronously calculated).
   */
-class AsynchronousMetrics
+class AsynchronousMetrics : WithContext
 {
 public:
 #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(
-        Context & global_context_,
+        ContextPtr global_context_,
         int update_period_seconds = 60)
-        : global_context(global_context_)
+        : WithContext(global_context_)
         , update_period(update_period_seconds)
     {
     }
@@ -42,11 +43,11 @@ public:
     /// in Arcadia -- it uses its own server implementation that also uses these
     /// metrics.
     AsynchronousMetrics(
-        Context & global_context_,
+        ContextPtr global_context_,
         int update_period_seconds,
         std::shared_ptr<std::vector<ProtocolServerAdapter>> servers_to_start_before_tables_,
         std::shared_ptr<std::vector<ProtocolServerAdapter>> servers_)
-        : global_context(global_context_)
+        : WithContext(global_context_)
         , update_period(update_period_seconds)
         , servers_to_start_before_tables(servers_to_start_before_tables_)
         , servers(servers_)
@@ -68,7 +69,6 @@ public:
     AsynchronousMetricValues getValues() const;
 
 private:
-    Context & global_context;
     const std::chrono::seconds update_period;
     std::shared_ptr<std::vector<ProtocolServerAdapter>> servers_to_start_before_tables{nullptr};
     std::shared_ptr<std::vector<ProtocolServerAdapter>> servers{nullptr};
diff --git a/src/Interpreters/BloomFilterHash.h b/src/Interpreters/BloomFilterHash.h
index b64f7bae79d..b88ca36ad84 100644
--- a/src/Interpreters/BloomFilterHash.h
+++ b/src/Interpreters/BloomFilterHash.h
@@ -93,7 +93,7 @@ struct BloomFilterHash
         else if (which.isDateTime()) return build_hash_column(getNumberTypeHash<UInt64, UInt32>(field));
         else if (which.isFloat32()) return build_hash_column(getNumberTypeHash<Float64, Float64>(field));
         else if (which.isFloat64()) return build_hash_column(getNumberTypeHash<Float64, Float64>(field));
-        else if (which.isUUID()) return build_hash_column(getNumberTypeHash<UInt128, UInt128>(field));
+        else if (which.isUUID()) return build_hash_column(getNumberTypeHash<UUID, UUID>(field));
         else if (which.isString()) return build_hash_column(getStringTypeHash(field));
         else if (which.isFixedString()) return build_hash_column(getFixedStringTypeHash(field, data_type));
         else throw Exception("Unexpected type " + data_type->getName() + " of bloom filter index.", ErrorCodes::BAD_ARGUMENTS);
@@ -154,7 +154,7 @@ struct BloomFilterHash
         else if (which.isDateTime()) getNumberTypeHash<UInt32, is_first>(column, vec, pos);
         else if (which.isFloat32()) getNumberTypeHash<Float32, is_first>(column, vec, pos);
         else if (which.isFloat64()) getNumberTypeHash<Float64, is_first>(column, vec, pos);
-        else if (which.isUUID()) getNumberTypeHash<UInt128, is_first>(column, vec, pos);
+        else if (which.isUUID()) getNumberTypeHash<UUID, is_first>(column, vec, pos);
         else if (which.isString()) getStringTypeHash<is_first>(column, vec, pos);
         else if (which.isFixedString()) getStringTypeHash<is_first>(column, vec, pos);
         else throw Exception("Unexpected type " + data_type->getName() + " of bloom filter index.", ErrorCodes::BAD_ARGUMENTS);
diff --git a/src/Interpreters/CMakeLists.txt b/src/Interpreters/CMakeLists.txt
index 65172356645..1068fee4cea 100644
--- a/src/Interpreters/CMakeLists.txt
+++ b/src/Interpreters/CMakeLists.txt
@@ -1,3 +1,7 @@
 if (ENABLE_TESTS)
-    add_subdirectory (tests)
-endif ()
+    add_subdirectory(tests)
+endif()
+
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
+endif()
\ No newline at end of file
diff --git a/src/Interpreters/CatBoostModel.cpp b/src/Interpreters/CatBoostModel.cpp
index 3e4329c6080..e19258540b9 100644
--- a/src/Interpreters/CatBoostModel.cpp
+++ b/src/Interpreters/CatBoostModel.cpp
@@ -480,20 +480,15 @@ void CatBoostLibHolder::initAPI()
 
 std::shared_ptr<CatBoostLibHolder> getCatBoostWrapperHolder(const std::string & lib_path)
 {
-    static std::weak_ptr<CatBoostLibHolder> ptr;
+    static std::shared_ptr<CatBoostLibHolder> ptr;
     static std::mutex mutex;
 
     std::lock_guard lock(mutex);
-    auto result = ptr.lock();
 
-    if (!result || result->getCurrentPath() != lib_path)
-    {
-        result = std::make_shared<CatBoostLibHolder>(lib_path);
-        /// This assignment is not atomic, which prevents from creating lock only inside 'if'.
-        ptr = result;
-    }
+    if (!ptr || ptr->getCurrentPath() != lib_path)
+        ptr = std::make_shared<CatBoostLibHolder>(lib_path);
 
-    return result;
+    return ptr;
 }
 
 }
diff --git a/src/Interpreters/ClientInfo.cpp b/src/Interpreters/ClientInfo.cpp
index 5449f397f49..248c8cc6b80 100644
--- a/src/Interpreters/ClientInfo.cpp
+++ b/src/Interpreters/ClientInfo.cpp
@@ -60,6 +60,9 @@ void ClientInfo::write(WriteBuffer & out, const UInt64 server_protocol_revision)
     if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO)
         writeBinary(quota_key, out);
 
+    if (server_protocol_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH)
+        writeVarUInt(distributed_depth, out);
+
     if (interface == Interface::TCP)
     {
         if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_VERSION_PATCH)
@@ -68,7 +71,7 @@ void ClientInfo::write(WriteBuffer & out, const UInt64 server_protocol_revision)
 
     if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_OPENTELEMETRY)
     {
-        if (client_trace_context.trace_id)
+        if (client_trace_context.trace_id != UUID())
         {
             // Have OpenTelemetry header.
             writeBinary(uint8_t(1), out);
@@ -137,6 +140,9 @@ void ClientInfo::read(ReadBuffer & in, const UInt64 client_protocol_revision)
     if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO)
         readBinary(quota_key, in);
 
+    if (client_protocol_revision >= DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH)
+        readVarUInt(distributed_depth, in);
+
     if (interface == Interface::TCP)
     {
         if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_VERSION_PATCH)
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index bc471dc3aa4..b4579877ef6 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <Core/UUID.h>
 #include <Poco/Net/SocketAddress.h>
-#include <Common/UInt128.h>
 #include <common/types.h>
 #include <Common/OpenTelemetryTraceContext.h>
 
@@ -96,6 +96,8 @@ public:
     /// Common
     String quota_key;
 
+    UInt64 distributed_depth = 0;
+
     bool empty() const { return query_kind == QueryKind::NO_QUERY; }
 
     /** Serialization and deserialization.
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index 9c19094b061..2d746493988 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -103,10 +103,14 @@ Cluster::Address::Address(
     password = config.getString(config_prefix + ".password", "");
     default_database = config.getString(config_prefix + ".default_database", "");
     secure = config.getBool(config_prefix + ".secure", false) ? Protocol::Secure::Enable : Protocol::Secure::Disable;
-    compression = config.getBool(config_prefix + ".compression", true) ? Protocol::Compression::Enable : Protocol::Compression::Disable;
     priority = config.getInt(config_prefix + ".priority", 1);
     const char * port_type = secure == Protocol::Secure::Enable ? "tcp_port_secure" : "tcp_port";
     is_local = isLocal(config.getInt(port_type, 0));
+
+    /// By default compression is disabled if address looks like localhost.
+    /// NOTE: it's still enabled when interacting with servers on different port, but we don't want to complicate the logic.
+    compression = config.getBool(config_prefix + ".compression", !is_local)
+        ? Protocol::Compression::Enable : Protocol::Compression::Disable;
 }
 
 
@@ -292,7 +296,7 @@ void Clusters::updateClusters(const Poco::Util::AbstractConfiguration & new_conf
 
     std::lock_guard lock(mutex);
 
-    /// If old congig is set, remove deleted clusters from impl, otherwise just clear it.
+    /// If old config is set, remove deleted clusters from impl, otherwise just clear it.
     if (old_config)
     {
         for (const auto & key : deleted_keys)
@@ -537,7 +541,7 @@ Cluster::Cluster(const Settings & settings, const std::vector<std::vector<String
 }
 
 
-Poco::Timespan Cluster::saturate(const Poco::Timespan & v, const Poco::Timespan & limit)
+Poco::Timespan Cluster::saturate(Poco::Timespan v, Poco::Timespan limit)
 {
     if (limit.totalMicroseconds() == 0)
         return v;
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index 0fb75211bd2..4ca5cbaa9f2 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -1,10 +1,12 @@
 #pragma once
 
-#include <map>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
+
 #include <Poco/Net/SocketAddress.h>
 
+#include <map>
+
 namespace Poco
 {
     namespace Util
@@ -50,9 +52,11 @@ public:
     Cluster & operator=(const Cluster &) = delete;
 
     /// is used to set a limit on the size of the timeout
-    static Poco::Timespan saturate(const Poco::Timespan & v, const Poco::Timespan & limit);
+    static Poco::Timespan saturate(Poco::Timespan v, Poco::Timespan limit);
 
 public:
+    using SlotToShard = std::vector<UInt64>;
+
     struct Address
     {
         /** In configuration file,
@@ -230,7 +234,6 @@ public:
     bool maybeCrossReplication() const;
 
 private:
-    using SlotToShard = std::vector<UInt64>;
     SlotToShard slot_to_shard;
 
 public:
diff --git a/src/Interpreters/ClusterProxy/IStreamFactory.h b/src/Interpreters/ClusterProxy/IStreamFactory.h
index 3cf100cd85c..f66eee93e0a 100644
--- a/src/Interpreters/ClusterProxy/IStreamFactory.h
+++ b/src/Interpreters/ClusterProxy/IStreamFactory.h
@@ -8,7 +8,6 @@ namespace DB
 {
 
 struct Settings;
-class Context;
 class Cluster;
 class Throttler;
 struct SelectQueryInfo;
@@ -27,12 +26,12 @@ namespace ClusterProxy
 class IStreamFactory
 {
 public:
-    virtual ~IStreamFactory() {}
+    virtual ~IStreamFactory() = default;
 
     virtual void createForShard(
             const Cluster::ShardInfo & shard_info,
-            const String & query, const ASTPtr & query_ast,
-            const std::shared_ptr<Context> & context_ptr, const ThrottlerPtr & throttler,
+            const ASTPtr & query_ast,
+            ContextPtr context, const ThrottlerPtr & throttler,
             const SelectQueryInfo & query_info,
             std::vector<QueryPlanPtr> & res,
             Pipes & remote_pipes,
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index 0b1f964af32..0c9d42e1381 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -8,11 +8,13 @@
 #include <Common/checkStackSize.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <IO/ConnectionTimeoutsContext.h>
+#include <Interpreters/RequiredSourceColumnsVisitor.h>
 
 #include <common/logger_useful.h>
 #include <Processors/Pipe.h>
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/Sources/DelayedSource.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
@@ -73,10 +75,99 @@ SelectStreamFactory::SelectStreamFactory(
 namespace
 {
 
+/// Special support for the case when `_shard_num` column is used in GROUP BY key expression.
+/// This column is a constant for shard.
+/// Constant expression with this column may be removed from intermediate header.
+/// However, this column is not constant for initiator, and it expect intermediate header has it.
+///
+/// To fix it, the following trick is applied.
+/// We check all GROUP BY keys which depend only on `_shard_num`.
+/// Calculate such expression for current shard if it is used in header.
+/// Those columns will be added to modified header as already known constants.
+///
+/// For local shard, missed constants will be added by converting actions.
+/// For remote shard, RemoteQueryExecutor will automatically add missing constant.
+Block evaluateConstantGroupByKeysWithShardNumber(
+    const ContextPtr & context, const ASTPtr & query_ast, const Block & header, UInt32 shard_num)
+{
+    Block res;
+
+    ColumnWithTypeAndName shard_num_col;
+    shard_num_col.type = std::make_shared<DataTypeUInt32>();
+    shard_num_col.column = shard_num_col.type->createColumnConst(0, shard_num);
+    shard_num_col.name = "_shard_num";
+
+    if (auto group_by = query_ast->as<ASTSelectQuery &>().groupBy())
+    {
+        for (const auto & elem : group_by->children)
+        {
+            String key_name = elem->getColumnName();
+            if (header.has(key_name))
+            {
+                auto ast = elem->clone();
+
+                RequiredSourceColumnsVisitor::Data columns_context;
+                RequiredSourceColumnsVisitor(columns_context).visit(ast);
+
+                auto required_columns = columns_context.requiredColumns();
+                if (required_columns.size() != 1 || required_columns.count("_shard_num") == 0)
+                    continue;
+
+                Block block({shard_num_col});
+                auto syntax_result = TreeRewriter(context).analyze(ast, {NameAndTypePair{shard_num_col.name, shard_num_col.type}});
+                ExpressionAnalyzer(ast, syntax_result, context).getActions(true, false)->execute(block);
+
+                res.insert(block.getByName(key_name));
+            }
+        }
+    }
+
+    /// We always add _shard_num constant just in case.
+    /// For initial query it is considered as a column from table, and may be required by intermediate block.
+    if (!res.has(shard_num_col.name))
+        res.insert(std::move(shard_num_col));
+
+    return res;
+}
+
+ActionsDAGPtr getConvertingDAG(const Block & block, const Block & header)
+{
+    /// Convert header structure to expected.
+    /// Also we ignore constants from result and replace it with constants from header.
+    /// It is needed for functions like `now64()` or `randConstant()` because their values may be different.
+    return ActionsDAG::makeConvertingActions(
+        block.getColumnsWithTypeAndName(),
+        header.getColumnsWithTypeAndName(),
+        ActionsDAG::MatchColumnsMode::Name,
+        true);
+}
+
+void addConvertingActions(QueryPlan & plan, const Block & header)
+{
+    if (blocksHaveEqualStructure(plan.getCurrentDataStream().header, header))
+        return;
+
+    auto convert_actions_dag = getConvertingDAG(plan.getCurrentDataStream().header, header);
+    auto converting = std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), convert_actions_dag);
+    plan.addStep(std::move(converting));
+}
+
+void addConvertingActions(Pipe & pipe, const Block & header)
+{
+    if (blocksHaveEqualStructure(pipe.getHeader(), header))
+        return;
+
+    auto convert_actions = std::make_shared<ExpressionActions>(getConvertingDAG(pipe.getHeader(), header));
+    pipe.addSimpleTransform([&](const Block & cur_header, Pipe::StreamType) -> ProcessorPtr
+    {
+        return std::make_shared<ExpressionTransform>(cur_header, convert_actions);
+    });
+}
+
 std::unique_ptr<QueryPlan> createLocalPlan(
     const ASTPtr & query_ast,
     const Block & header,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage)
 {
     checkStackSize();
@@ -86,18 +177,7 @@ std::unique_ptr<QueryPlan> createLocalPlan(
     InterpreterSelectQuery interpreter(query_ast, context, SelectQueryOptions(processed_stage));
     interpreter.buildQueryPlan(*query_plan);
 
-    /// Convert header structure to expected.
-    /// Also we ignore constants from result and replace it with constants from header.
-    /// It is needed for functions like `now64()` or `randConstant()` because their values may be different.
-    auto convert_actions_dag = ActionsDAG::makeConvertingActions(
-            query_plan->getCurrentDataStream().header.getColumnsWithTypeAndName(),
-            header.getColumnsWithTypeAndName(),
-            ActionsDAG::MatchColumnsMode::Name,
-            true);
-
-    auto converting = std::make_unique<ExpressionStep>(query_plan->getCurrentDataStream(), convert_actions_dag);
-    converting->setStepDescription("Convert block structure for query from local replica");
-    query_plan->addStep(std::move(converting));
+    addConvertingActions(*query_plan, header);
 
     return query_plan;
 }
@@ -115,33 +195,44 @@ String formattedAST(const ASTPtr & ast)
 
 void SelectStreamFactory::createForShard(
     const Cluster::ShardInfo & shard_info,
-    const String &, const ASTPtr & query_ast,
-    const std::shared_ptr<Context> & context_ptr, const ThrottlerPtr & throttler,
+    const ASTPtr & query_ast,
+    ContextPtr context, const ThrottlerPtr & throttler,
     const SelectQueryInfo &,
     std::vector<QueryPlanPtr> & plans,
     Pipes & remote_pipes,
     Pipes & delayed_pipes,
     Poco::Logger * log)
 {
-    const auto & context = *context_ptr;
-
     bool add_agg_info = processed_stage == QueryProcessingStage::WithMergeableState;
     bool add_totals = false;
     bool add_extremes = false;
-    bool async_read = context_ptr->getSettingsRef().async_socket_for_remote;
+    bool async_read = context->getSettingsRef().async_socket_for_remote;
     if (processed_stage == QueryProcessingStage::Complete)
     {
         add_totals = query_ast->as<ASTSelectQuery &>().group_by_with_totals;
-        add_extremes = context.getSettingsRef().extremes;
+        add_extremes = context->getSettingsRef().extremes;
     }
 
     auto modified_query_ast = query_ast->clone();
+    auto modified_header = header;
     if (has_virtual_shard_num_column)
+    {
         VirtualColumnUtils::rewriteEntityInAst(modified_query_ast, "_shard_num", shard_info.shard_num, "toUInt32");
+        auto shard_num_constants = evaluateConstantGroupByKeysWithShardNumber(context, query_ast, modified_header, shard_info.shard_num);
+
+        for (auto & col : shard_num_constants)
+        {
+            if (modified_header.has(col.name))
+                modified_header.getByName(col.name).column = std::move(col.column);
+            else
+                modified_header.insert(std::move(col));
+        }
+    }
 
     auto emplace_local_stream = [&]()
     {
-        plans.emplace_back(createLocalPlan(modified_query_ast, header, context, processed_stage));
+        plans.emplace_back(createLocalPlan(modified_query_ast, modified_header, context, processed_stage));
+        addConvertingActions(*plans.back(), header);
     };
 
     String modified_query = formattedAST(modified_query_ast);
@@ -149,7 +240,7 @@ void SelectStreamFactory::createForShard(
     auto emplace_remote_stream = [&]()
     {
         auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-            shard_info.pool, modified_query, header, context, throttler, scalars, external_tables, processed_stage);
+            shard_info.pool, modified_query, modified_header, context, throttler, scalars, external_tables, processed_stage);
         remote_query_executor->setLogger(log);
 
         remote_query_executor->setPoolMode(PoolMode::GET_MANY);
@@ -157,10 +248,11 @@ void SelectStreamFactory::createForShard(
             remote_query_executor->setMainTable(main_table);
 
         remote_pipes.emplace_back(createRemoteSourcePipe(remote_query_executor, add_agg_info, add_totals, add_extremes, async_read));
-        remote_pipes.back().addInterpreterContext(context_ptr);
+        remote_pipes.back().addInterpreterContext(context);
+        addConvertingActions(remote_pipes.back(), header);
     };
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     if (settings.prefer_localhost_replica && shard_info.isLocal())
     {
@@ -173,7 +265,7 @@ void SelectStreamFactory::createForShard(
         }
         else
         {
-            auto resolved_id = context.resolveStorageID(main_table);
+            auto resolved_id = context->resolveStorageID(main_table);
             main_table_storage = DatabaseCatalog::instance().tryGetTable(resolved_id, context);
         }
 
@@ -249,13 +341,13 @@ void SelectStreamFactory::createForShard(
         /// Do it lazily to avoid connecting in the main thread.
 
         auto lazily_create_stream = [
-                pool = shard_info.pool, shard_num = shard_info.shard_num, modified_query, header = header, modified_query_ast,
-                &context, context_ptr, throttler,
+                pool = shard_info.pool, shard_num = shard_info.shard_num, modified_query, header = modified_header, modified_query_ast,
+                context, throttler,
                 main_table = main_table, table_func_ptr = table_func_ptr, scalars = scalars, external_tables = external_tables,
                 stage = processed_stage, local_delay, add_agg_info, add_totals, add_extremes, async_read]()
             -> Pipe
         {
-            auto current_settings = context.getSettingsRef();
+            auto current_settings = context->getSettingsRef();
             auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(
                 current_settings).getSaturated(
                     current_settings.max_execution_time);
@@ -287,8 +379,8 @@ void SelectStreamFactory::createForShard(
             {
                 auto plan = createLocalPlan(modified_query_ast, header, context, stage);
                 return QueryPipeline::getPipe(std::move(*plan->buildQueryPipeline(
-                    QueryPlanOptimizationSettings::fromContext(*context_ptr),
-                    BuildQueryPipelineSettings::fromContext(*context_ptr))));
+                    QueryPlanOptimizationSettings::fromContext(context),
+                    BuildQueryPipelineSettings::fromContext(context))));
             }
             else
             {
@@ -304,8 +396,9 @@ void SelectStreamFactory::createForShard(
             }
         };
 
-        delayed_pipes.emplace_back(createDelayedPipe(header, lazily_create_stream, add_totals, add_extremes));
-        delayed_pipes.back().addInterpreterContext(context_ptr);
+        delayed_pipes.emplace_back(createDelayedPipe(modified_header, lazily_create_stream, add_totals, add_extremes));
+        delayed_pipes.back().addInterpreterContext(context);
+        addConvertingActions(delayed_pipes.back(), header);
     }
     else
         emplace_remote_stream();
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.h b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
index 596e99b8a18..0705bcb2903 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.h
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
@@ -8,8 +8,6 @@
 namespace DB
 {
 
-using Scalars = std::map<String, Block>;
-
 namespace ClusterProxy
 {
 
@@ -36,8 +34,8 @@ public:
 
     void createForShard(
         const Cluster::ShardInfo & shard_info,
-        const String & query, const ASTPtr & query_ast,
-        const std::shared_ptr<Context> & context_ptr, const ThrottlerPtr & throttler,
+        const ASTPtr & query_ast,
+        ContextPtr context, const ThrottlerPtr & throttler,
         const SelectQueryInfo & query_info,
         std::vector<QueryPlanPtr> & plans,
         Pipes & remote_pipes,
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index 59cbae67770..2af65e0fd87 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/Cluster.h>
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/ProcessList.h>
-#include <Parsers/queryToString.h>
+#include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
 #include <Processors/Pipe.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
@@ -16,10 +16,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
+}
+
 namespace ClusterProxy
 {
 
-std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const Context & context, const Settings & settings, Poco::Logger * log)
+ContextMutablePtr updateSettingsForCluster(const Cluster & cluster, ContextPtr context, const Settings & settings, Poco::Logger * log)
 {
     Settings new_settings = settings;
     new_settings.queue_max_wait_ms = Cluster::saturate(new_settings.queue_max_wait_ms, settings.max_execution_time);
@@ -78,7 +83,7 @@ std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const
         }
     }
 
-    auto new_context = std::make_shared<Context>(context);
+    auto new_context = Context::createCopy(context);
     new_context->setSettings(new_settings);
     return new_context;
 }
@@ -86,22 +91,28 @@ std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const
 void executeQuery(
     QueryPlan & query_plan,
     IStreamFactory & stream_factory, Poco::Logger * log,
-    const ASTPtr & query_ast, const Context & context, const SelectQueryInfo & query_info)
+    const ASTPtr & query_ast, ContextPtr context, const SelectQueryInfo & query_info,
+    const ExpressionActionsPtr & sharding_key_expr,
+    const std::string & sharding_key_column_name,
+    const ClusterPtr & not_optimized_cluster)
 {
     assert(log);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
+
+    if (settings.max_distributed_depth && context->getClientInfo().distributed_depth > settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
 
     std::vector<QueryPlanPtr> plans;
     Pipes remote_pipes;
     Pipes delayed_pipes;
 
-    const std::string query = queryToString(query_ast);
+    auto new_context = updateSettingsForCluster(*query_info.getCluster(), context, settings, log);
 
-    auto new_context = updateSettingsForCluster(*query_info.cluster, context, settings, log);
+    new_context->getClientInfo().distributed_depth += 1;
 
     ThrottlerPtr user_level_throttler;
-    if (auto * process_list_element = context.getProcessListElement())
+    if (auto * process_list_element = context->getProcessListElement())
         user_level_throttler = process_list_element->getUserNetworkThrottler();
 
     /// Network bandwidth limit, if needed.
@@ -117,9 +128,28 @@ void executeQuery(
     else
         throttler = user_level_throttler;
 
-    for (const auto & shard_info : query_info.cluster->getShardsInfo())
+    size_t shards = query_info.getCluster()->getShardCount();
+    for (const auto & shard_info : query_info.getCluster()->getShardsInfo())
     {
-        stream_factory.createForShard(shard_info, query, query_ast,
+        ASTPtr query_ast_for_shard;
+        if (query_info.optimized_cluster && settings.optimize_skip_unused_shards_rewrite_in && shards > 1)
+        {
+            query_ast_for_shard = query_ast->clone();
+
+            OptimizeShardingKeyRewriteInVisitor::Data visitor_data{
+                sharding_key_expr,
+                sharding_key_column_name,
+                shard_info,
+                not_optimized_cluster->getSlotToShard(),
+            };
+            OptimizeShardingKeyRewriteInVisitor visitor(visitor_data);
+            visitor.visit(query_ast_for_shard);
+        }
+        else
+            query_ast_for_shard = query_ast;
+
+        stream_factory.createForShard(shard_info,
+            query_ast_for_shard,
             new_context, throttler, query_info, plans,
             remote_pipes, delayed_pipes, log);
     }
@@ -156,8 +186,7 @@ void executeQuery(
     for (auto & plan : plans)
         input_streams.emplace_back(plan->getCurrentDataStream());
 
-    auto header = input_streams.front().header;
-    auto union_step = std::make_unique<UnionStep>(std::move(input_streams), header);
+    auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
     query_plan.unitePlans(std::move(union_step), std::move(plans));
 }
 
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index 8840b82d5b2..c9efedfc422 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -1,18 +1,22 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST.h>
 
 namespace DB
 {
 
 struct Settings;
-class Context;
 class Cluster;
+using ClusterPtr = std::shared_ptr<Cluster>;
 struct SelectQueryInfo;
 
 class Pipe;
 class QueryPlan;
 
+class ExpressionActions;
+using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
 namespace ClusterProxy
 {
 
@@ -27,7 +31,7 @@ class IStreamFactory;
 ///   - optimize_skip_unused_shards_nesting
 ///
 /// @return new Context with adjusted settings
-std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const Context & context, const Settings & settings, Poco::Logger * log = nullptr);
+ContextMutablePtr updateSettingsForCluster(const Cluster & cluster, ContextPtr context, const Settings & settings, Poco::Logger * log = nullptr);
 
 /// Execute a distributed query, creating a vector of BlockInputStreams, from which the result can be read.
 /// `stream_factory` object encapsulates the logic of creating streams for a different type of query
@@ -35,7 +39,10 @@ std::shared_ptr<Context> updateSettingsForCluster(const Cluster & cluster, const
 void executeQuery(
     QueryPlan & query_plan,
     IStreamFactory & stream_factory, Poco::Logger * log,
-    const ASTPtr & query_ast, const Context & context, const SelectQueryInfo & query_info);
+    const ASTPtr & query_ast, ContextPtr context, const SelectQueryInfo & query_info,
+    const ExpressionActionsPtr & sharding_key_expr,
+    const std::string & sharding_key_column_name,
+    const ClusterPtr & not_optimized_cluster);
 
 }
 
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.cpp b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
index a0ea27e9905..3b3fdaa65cb 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.cpp
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.cpp
@@ -16,26 +16,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-namespace
-{
-
-void addAndTerm(ASTPtr & ast, const ASTPtr & term)
-{
-    if (!ast)
-        ast = term;
-    else
-        ast = makeASTFunction("and", ast, term);
-}
-
-/// If this is an inner join and the expression related to less than 2 tables, then move it to WHERE
-bool canMoveToWhere(std::pair<size_t, size_t> table_numbers, ASTTableJoin::Kind kind)
-{
-    return kind == ASTTableJoin::Kind::Inner &&
-        (table_numbers.first == table_numbers.second || table_numbers.first == 0 || table_numbers.second == 0);
-}
-
-}
-
 void CollectJoinOnKeysMatcher::Data::addJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast,
                                                  const std::pair<size_t, size_t> & table_no)
 {
@@ -49,8 +29,7 @@ void CollectJoinOnKeysMatcher::Data::addJoinKeys(const ASTPtr & left_ast, const
     else
         throw Exception("Cannot detect left and right JOIN keys. JOIN ON section is ambiguous.",
                         ErrorCodes::AMBIGUOUS_COLUMN_NAME);
-    if (table_no.first != table_no.second && table_no.first > 0 && table_no.second > 0)
-        has_some = true;
+    has_some = true;
 }
 
 void CollectJoinOnKeysMatcher::Data::addAsofJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast,
@@ -99,45 +78,22 @@ void CollectJoinOnKeysMatcher::visit(const ASTFunction & func, const ASTPtr & as
     {
         ASTPtr left = func.arguments->children.at(0);
         ASTPtr right = func.arguments->children.at(1);
-        auto table_numbers = getTableNumbers(left, right, data);
-
-        if (canMoveToWhere(table_numbers, data.kind))
-        {
-            addAndTerm(data.new_where_conditions, ast);
-        }
-        else
-        {
-            if (data.kind == ASTTableJoin::Kind::Inner)
-            {
-                addAndTerm(data.new_on_expression, ast);
-            }
-            data.addJoinKeys(left, right, table_numbers);
-        }
+        auto table_numbers = getTableNumbers(ast, left, right, data);
+        data.addJoinKeys(left, right, table_numbers);
     }
-    else if (inequality != ASOF::Inequality::None && !data.is_asof)
+    else if (inequality != ASOF::Inequality::None)
     {
-        ASTPtr left = func.arguments->children.at(0);
-        ASTPtr right = func.arguments->children.at(1);
-        auto table_numbers = getTableNumbers(left, right, data);
-        if (canMoveToWhere(table_numbers, data.kind))
-        {
-            addAndTerm(data.new_where_conditions, ast);
-        }
-        else
-        {
+        if (!data.is_asof)
             throw Exception("JOIN ON inequalities are not supported. Unexpected '" + queryToString(ast) + "'",
-                ErrorCodes::NOT_IMPLEMENTED);
-        }
-    }
-    else if (inequality != ASOF::Inequality::None && data.is_asof)
-    {
+                            ErrorCodes::NOT_IMPLEMENTED);
+
         if (data.asof_left_key || data.asof_right_key)
             throw Exception("ASOF JOIN expects exactly one inequality in ON section. Unexpected '" + queryToString(ast) + "'",
-                ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
+                            ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
 
         ASTPtr left = func.arguments->children.at(0);
         ASTPtr right = func.arguments->children.at(1);
-        auto table_numbers = getTableNumbers(left, right, data);
+        auto table_numbers = getTableNumbers(ast, left, right, data);
 
         data.addAsofJoinKeys(left, right, table_numbers, inequality);
     }
@@ -162,8 +118,7 @@ void CollectJoinOnKeysMatcher::getIdentifiers(const ASTPtr & ast, std::vector<co
         getIdentifiers(child, out);
 }
 
-
-std::pair<size_t, size_t> CollectJoinOnKeysMatcher::getTableNumbers(const ASTPtr & left_ast, const ASTPtr & right_ast,
+std::pair<size_t, size_t> CollectJoinOnKeysMatcher::getTableNumbers(const ASTPtr & expr, const ASTPtr & left_ast, const ASTPtr & right_ast,
                                                                     Data & data)
 {
     std::vector<const ASTIdentifier *> left_identifiers;
@@ -172,13 +127,23 @@ std::pair<size_t, size_t> CollectJoinOnKeysMatcher::getTableNumbers(const ASTPtr
     getIdentifiers(left_ast, left_identifiers);
     getIdentifiers(right_ast, right_identifiers);
 
-    size_t left_idents_table = 0;
-    size_t right_idents_table = 0;
+    if (left_identifiers.empty() || right_identifiers.empty())
+    {
+        throw Exception("Not equi-join ON expression: " + queryToString(expr) + ". No columns in one of equality side.",
+                        ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
+    }
 
-    if (!left_identifiers.empty())
-        left_idents_table = getTableForIdentifiers(left_identifiers, data);
-    if (!right_identifiers.empty())
-        right_idents_table = getTableForIdentifiers(right_identifiers, data);
+    size_t left_idents_table = getTableForIdentifiers(left_identifiers, data);
+    size_t right_idents_table = getTableForIdentifiers(right_identifiers, data);
+
+    if (left_idents_table && left_idents_table == right_idents_table)
+    {
+        auto left_name = queryToString(*left_identifiers[0]);
+        auto right_name = queryToString(*right_identifiers[0]);
+
+        throw Exception("In expression " + queryToString(expr) + " columns " + left_name + " and " + right_name
+            + " are from the same table but from different arguments of equal function", ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
+    }
 
     return std::make_pair(left_idents_table, right_idents_table);
 }
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.h b/src/Interpreters/CollectJoinOnKeysVisitor.h
index aa2fd80d07c..54e008a114e 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.h
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.h
@@ -5,7 +5,6 @@
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/Aliases.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
 
 
 namespace DB
@@ -31,11 +30,8 @@ public:
         const TableWithColumnNamesAndTypes & right_table;
         const Aliases & aliases;
         const bool is_asof{false};
-        ASTTableJoin::Kind kind;
         ASTPtr asof_left_key{};
         ASTPtr asof_right_key{};
-        ASTPtr new_on_expression{};
-        ASTPtr new_where_conditions{};
         bool has_some{false};
 
         void addJoinKeys(const ASTPtr & left_ast, const ASTPtr & right_ast, const std::pair<size_t, size_t> & table_no);
@@ -61,7 +57,7 @@ private:
     static void visit(const ASTFunction & func, const ASTPtr & ast, Data & data);
 
     static void getIdentifiers(const ASTPtr & ast, std::vector<const ASTIdentifier *> & out);
-    static std::pair<size_t, size_t> getTableNumbers(const ASTPtr & left_ast, const ASTPtr & right_ast, Data & data);
+    static std::pair<size_t, size_t> getTableNumbers(const ASTPtr & expr, const ASTPtr & left_ast, const ASTPtr & right_ast, Data & data);
     static const ASTIdentifier * unrollAliases(const ASTIdentifier * identifier, const Aliases & aliases);
     static size_t getTableForIdentifiers(std::vector<const ASTIdentifier *> & identifiers, const Data & data);
 };
diff --git a/src/Interpreters/ColumnAliasesVisitor.h b/src/Interpreters/ColumnAliasesVisitor.h
index 2cd9ad796cd..6b89c1a086f 100644
--- a/src/Interpreters/ColumnAliasesVisitor.h
+++ b/src/Interpreters/ColumnAliasesVisitor.h
@@ -56,12 +56,12 @@ public:
         /// Do not analyze joined columns.
         /// They may have aliases and come to description as is.
         const NameSet & forbidden_columns;
-        const Context & context;
+        ContextConstPtr context;
 
         /// private_aliases are from lambda, so these are local names.
         NameSet private_aliases;
 
-        Data(const ColumnsDescription & columns_, const NameSet & forbidden_columns_, const Context & context_)
+        Data(const ColumnsDescription & columns_, const NameSet & forbidden_columns_, ContextConstPtr context_)
         : columns(columns_)
         , forbidden_columns(forbidden_columns_)
         , context(context_)
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 8eec5d099e2..0c9b6ae473c 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -11,6 +11,7 @@
 #include <Common/setThreadName.h>
 #include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
+#include <Common/Throttler.h>
 #include <Common/thread_local_rng.h>
 #include <Coordination/KeeperStorageDispatcher.h>
 #include <Compression/ICompressionCodec.h>
@@ -29,6 +30,7 @@
 #include <Disks/DiskLocal.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/ActionLocksManager.h>
+#include <Interpreters/ExternalLoaderXMLConfigRepository.h>
 #include <Core/Settings.h>
 #include <Core/SettingsQuirks.h>
 #include <Access/AccessControlManager.h>
@@ -49,6 +51,7 @@
 #include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ProcessList.h>
+#include <Interpreters/InterserverCredentials.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/InterserverIOHandler.h>
 #include <Interpreters/SystemLog.h>
@@ -72,8 +75,11 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Storages/MergeTree/BackgroundJobsExecutor.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
+#include <filesystem>
 
 
+namespace fs = std::filesystem;
+
 namespace ProfileEvents
 {
     extern const Event ContextLock;
@@ -138,13 +144,13 @@ public:
     /// Find existing session or create a new.
     std::shared_ptr<NamedSession> acquireSession(
         const String & session_id,
-        Context & context,
+        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;
+        auto & user_name = context->client_info.current_user;
 
         if (user_name.empty())
             throw Exception("Empty user name.", ErrorCodes::LOGICAL_ERROR);
@@ -160,7 +166,7 @@ public:
             /// 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)
+        else if (it->second->key.first != context->client_info.current_user)
         {
             throw Exception("Session belongs to a different user", ErrorCodes::SESSION_IS_LOCKED);
         }
@@ -171,7 +177,7 @@ public:
         if (!session.unique())
             throw Exception("Session is locked by a concurrent client.", ErrorCodes::SESSION_IS_LOCKED);
 
-        session->context.client_info = context.client_info;
+        session->context->client_info = context->client_info;
 
         return session;
     }
@@ -224,7 +230,6 @@ private:
     void cleanThread()
     {
         setThreadName("SessionCleaner");
-
         std::unique_lock lock{mutex};
 
         while (true)
@@ -292,7 +297,7 @@ void NamedSession::release()
 /** Set of known objects (environment), that could be used in query.
   * Shared (global) part. Order of members (especially, order of destruction) is very important.
   */
-struct ContextShared
+struct ContextSharedPart
 {
     Poco::Logger * log = &Poco::Logger::get("Context");
 
@@ -313,8 +318,8 @@ struct ContextShared
     ConfigurationPtr zookeeper_config;                      /// Stores zookeeper configs
 
 #if USE_NURAFT
-    mutable std::mutex nu_keeper_storage_dispatcher_mutex;
-    mutable std::shared_ptr<KeeperStorageDispatcher> nu_keeper_storage_dispatcher;
+    mutable std::mutex keeper_storage_dispatcher_mutex;
+    mutable std::shared_ptr<KeeperStorageDispatcher> keeper_storage_dispatcher;
 #endif
     mutable std::mutex auxiliary_zookeepers_mutex;
     mutable std::map<String, zkutil::ZooKeeperPtr> auxiliary_zookeepers;    /// Map for auxiliary ZooKeeper clients.
@@ -322,9 +327,8 @@ struct ContextShared
 
     String interserver_io_host;                             /// The host name by which this server is available for other servers.
     UInt16 interserver_io_port = 0;                         /// and port.
-    String interserver_io_user;
-    String interserver_io_password;
     String interserver_scheme;                              /// http or https
+    MultiVersion<InterserverCredentials> interserver_io_credentials;
 
     String path;                                            /// Path to the data directory, with a slash at the end.
     String flags_path;                                      /// Path to the directory with some control flags for server maintenance.
@@ -338,6 +342,11 @@ struct ContextShared
     mutable std::optional<EmbeddedDictionaries> embedded_dictionaries;    /// Metrica's dictionaries. Have lazy initialization.
     mutable std::optional<ExternalDictionariesLoader> external_dictionaries_loader;
     mutable std::optional<ExternalModelsLoader> external_models_loader;
+    ConfigurationPtr external_models_config;
+    ext::scope_guard models_repository_guard;
+
+    ext::scope_guard dictionaries_xmls;
+
     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
@@ -355,6 +364,10 @@ struct ContextShared
     mutable std::optional<BackgroundSchedulePool> schedule_pool;    /// A thread pool that can run different jobs in background (used in replicated tables)
     mutable std::optional<BackgroundSchedulePool> distributed_schedule_pool; /// A thread pool that can run different jobs in background (used for distributed sends)
     mutable std::optional<BackgroundSchedulePool> message_broker_schedule_pool; /// A thread pool that can run different jobs in background (used for message brokers, like RabbitMQ and Kafka)
+
+    mutable ThrottlerPtr replicated_fetches_throttler; /// A server-wide throttler for replicated fetches
+    mutable ThrottlerPtr replicated_sends_throttler; /// A server-wide throttler for replicated sends
+
     MultiVersion<Macros> macros;                            /// Substitutions extracted from config.
     std::unique_ptr<DDLWorker> ddl_worker;                  /// Process ddl commands from zk.
     /// Rules for selecting the compression settings, depending on the size of the part.
@@ -370,7 +383,7 @@ struct ContextShared
     std::atomic_size_t max_partition_size_to_drop = 50000000000lu; /// Protects MergeTree partitions from accidental DROP (50GB by default)
     String format_schema_path;                              /// Path to a directory that contains schema files used by input formats.
     ActionLocksManagerPtr action_locks_manager;             /// Set of storages' action lockers
-    std::optional<SystemLogs> system_logs;                  /// Used to log queries and operations on parts
+    std::unique_ptr<SystemLogs> system_logs;                /// Used to log queries and operations on parts
     std::optional<StorageS3Settings> storage_s3_settings;   /// Settings of S3 storage
 
     RemoteHostFilter remote_host_filter; /// Allowed URL from config.xml
@@ -395,7 +408,7 @@ struct ContextShared
 
     Context::ConfigReloadCallback config_reload_callback;
 
-    ContextShared()
+    ContextSharedPart()
         : macros(std::make_unique<Macros>())
     {
         /// TODO: make it singleton (?)
@@ -409,7 +422,7 @@ struct ContextShared
     }
 
 
-    ~ContextShared()
+    ~ContextSharedPart()
     {
         try
         {
@@ -439,24 +452,43 @@ struct ContextShared
 
         DatabaseCatalog::shutdown();
 
-        /// Preemptive destruction is important, because these objects may have a refcount to ContextShared (cyclic reference).
-        /// TODO: Get rid of this.
+        std::unique_ptr<SystemLogs> delete_system_logs;
+        {
+            auto lock = std::lock_guard(mutex);
 
-        system_logs.reset();
-        embedded_dictionaries.reset();
-        external_dictionaries_loader.reset();
-        external_models_loader.reset();
-        buffer_flush_schedule_pool.reset();
-        schedule_pool.reset();
-        distributed_schedule_pool.reset();
-        message_broker_schedule_pool.reset();
-        ddl_worker.reset();
+            /// Preemptive destruction is important, because these objects may have a refcount to ContextShared (cyclic reference).
+            /// TODO: Get rid of this.
 
-        /// Stop trace collector if any
-        trace_collector.reset();
-        /// Stop zookeeper connection
-        zookeeper.reset();
+            /// Dictionaries may be required:
+            /// - for storage shutdown (during final flush of the Buffer engine)
+            /// - before storage startup (because of some streaming of, i.e. Kafka, to
+            ///   the table with materialized column that has dictGet)
+            ///
+            /// So they should be created before any storages and preserved until storages will be terminated.
+            ///
+            /// 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();
 
+            delete_system_logs = std::move(system_logs);
+            embedded_dictionaries.reset();
+            external_dictionaries_loader.reset();
+            models_repository_guard.reset();
+            external_models_loader.reset();
+            buffer_flush_schedule_pool.reset();
+            schedule_pool.reset();
+            distributed_schedule_pool.reset();
+            message_broker_schedule_pool.reset();
+            ddl_worker.reset();
+
+            /// Stop trace collector if any
+            trace_collector.reset();
+            /// Stop zookeeper connection
+            zookeeper.reset();
+        }
+
+        /// Can be removed w/o context lock
+        delete_system_logs.reset();
     }
 
     bool hasTraceCollector() const
@@ -484,27 +516,48 @@ SharedContextHolder::SharedContextHolder(SharedContextHolder &&) noexcept = defa
 SharedContextHolder & SharedContextHolder::operator=(SharedContextHolder &&) = default;
 SharedContextHolder::SharedContextHolder() = default;
 SharedContextHolder::~SharedContextHolder() = default;
-SharedContextHolder::SharedContextHolder(std::unique_ptr<ContextShared> shared_context)
+SharedContextHolder::SharedContextHolder(std::unique_ptr<ContextSharedPart> shared_context)
     : shared(std::move(shared_context)) {}
 
 void SharedContextHolder::reset() { shared.reset(); }
 
-
-Context Context::createGlobal(ContextShared * shared)
+ContextMutablePtr Context::createGlobal(ContextSharedPart * shared)
 {
-    Context res;
-    res.shared = shared;
+    auto res = std::shared_ptr<Context>(new Context);
+    res->shared = shared;
     return res;
 }
 
 void Context::initGlobal()
 {
-    DatabaseCatalog::init(*this);
+    DatabaseCatalog::init(shared_from_this());
 }
 
 SharedContextHolder Context::createShared()
 {
-    return SharedContextHolder(std::make_unique<ContextShared>());
+    return SharedContextHolder(std::make_unique<ContextSharedPart>());
+}
+
+ContextMutablePtr Context::createCopy(const ContextPtr & other)
+{
+    return std::shared_ptr<Context>(new Context(*other));
+}
+
+ContextMutablePtr Context::createCopy(const ContextWeakConstPtr & other)
+{
+    auto ptr = other.lock();
+    if (!ptr) throw Exception("Can't copy an expired context", ErrorCodes::LOGICAL_ERROR);
+    return createCopy(ptr);
+}
+
+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;
@@ -532,12 +585,13 @@ 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)
+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, *this, timeout, session_check);
+    return shared->named_sessions->acquireSession(session_id, shared_from_this(), timeout, session_check);
 }
 
 String Context::resolveDatabase(const String & database_name) const
@@ -890,21 +944,23 @@ const Block & Context::getScalar(const String & name) const
 
 Tables Context::getExternalTables() const
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     auto lock = getLock();
 
     Tables res;
     for (const auto & table : external_tables_mapping)
         res[table.first] = table.second->getTable();
 
-    if (query_context && query_context != this)
+    auto query_context_ptr = query_context.lock();
+    auto session_context_ptr = session_context.lock();
+    if (query_context_ptr && query_context_ptr.get() != this)
     {
-        Tables buf = query_context->getExternalTables();
+        Tables buf = query_context_ptr->getExternalTables();
         res.insert(buf.begin(), buf.end());
     }
-    else if (session_context && session_context != this)
+    else if (session_context_ptr && session_context_ptr.get() != this)
     {
-        Tables buf = session_context->getExternalTables();
+        Tables buf = session_context_ptr->getExternalTables();
         res.insert(buf.begin(), buf.end());
     }
     return res;
@@ -913,7 +969,7 @@ Tables Context::getExternalTables() const
 
 void Context::addExternalTable(const String & table_name, TemporaryTableHolder && temporary_table)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     auto lock = getLock();
     if (external_tables_mapping.end() != external_tables_mapping.find(table_name))
         throw Exception("Temporary table " + backQuoteIfNeed(table_name) + " already exists.", ErrorCodes::TABLE_ALREADY_EXISTS);
@@ -923,7 +979,7 @@ void Context::addExternalTable(const String & table_name, TemporaryTableHolder &
 
 std::shared_ptr<TemporaryTableHolder> Context::removeExternalTable(const String & table_name)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     std::shared_ptr<TemporaryTableHolder> holder;
     {
         auto lock = getLock();
@@ -939,32 +995,35 @@ std::shared_ptr<TemporaryTableHolder> Context::removeExternalTable(const String
 
 void Context::addScalar(const String & name, const Block & block)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     scalars[name] = block;
 }
 
 
 bool Context::hasScalar(const String & name) const
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     return scalars.count(name);
 }
 
 
-void Context::addQueryAccessInfo(const String & quoted_database_name, const String & full_quoted_table_name, const Names & column_names)
+void Context::addQueryAccessInfo(
+    const String & quoted_database_name, const String & full_quoted_table_name, const Names & column_names, const String & projection_name)
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     std::lock_guard<std::mutex> lock(query_access_info.mutex);
     query_access_info.databases.emplace(quoted_database_name);
     query_access_info.tables.emplace(full_quoted_table_name);
     for (const auto & column_name : column_names)
         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));
 }
 
 
 void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const
 {
-    assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+    assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     auto lock = getLock();
 
     switch (factory_type)
@@ -1009,10 +1068,10 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression)
 
     if (!res)
     {
-        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression, *this);
+        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression, shared_from_this());
 
         /// Run it and remember the result
-        res = table_function_ptr->execute(table_expression, *this, table_function_ptr->getName());
+        res = table_function_ptr->execute(table_expression, shared_from_this(), table_function_ptr->getName());
     }
 
     return res;
@@ -1028,7 +1087,7 @@ void Context::addViewSource(const StoragePtr & storage)
 }
 
 
-StoragePtr Context::getViewSource()
+StoragePtr Context::getViewSource() const
 {
     return view_source;
 }
@@ -1153,7 +1212,7 @@ String Context::getInitialQueryId() const
 
 void Context::setCurrentDatabaseNameInGlobalContext(const String & name)
 {
-    if (global_context != this)
+    if (!isGlobalContext())
         throw Exception("Cannot set current database for non global context, this method should be used during server initialization",
                         ErrorCodes::LOGICAL_ERROR);
     auto lock = getLock();
@@ -1187,13 +1246,13 @@ void Context::setCurrentQueryId(const String & query_id)
             UInt64 a;
             UInt64 b;
         } words;
-        __uint128_t uuid;
+        UUID uuid{};
     } random;
 
     random.words.a = thread_local_rng(); //-V656
     random.words.b = thread_local_rng(); //-V656
 
-    if (client_info.client_trace_context.trace_id != 0)
+    if (client_info.client_trace_context.trace_id != UUID())
     {
         // Use the OpenTelemetry trace context we received from the client, and
         // create a new span for the query.
@@ -1262,53 +1321,37 @@ void Context::setMacros(std::unique_ptr<Macros> && macros)
     shared->macros.set(std::move(macros));
 }
 
-const Context & Context::getQueryContext() const
+ContextMutablePtr Context::getQueryContext() const
 {
-    if (!query_context)
-        throw Exception("There is no query", ErrorCodes::THERE_IS_NO_QUERY);
-    return *query_context;
+    auto ptr = query_context.lock();
+    if (!ptr) throw Exception("There is no query or query context has expired", ErrorCodes::THERE_IS_NO_QUERY);
+    return ptr;
 }
 
-Context & Context::getQueryContext()
+bool Context::isInternalSubquery() const
 {
-    if (!query_context)
-        throw Exception("There is no query", ErrorCodes::THERE_IS_NO_QUERY);
-    return *query_context;
+    auto ptr = query_context.lock();
+    return ptr && ptr.get() != this;
 }
 
-const Context & Context::getSessionContext() const
+ContextMutablePtr Context::getSessionContext() const
 {
-    if (!session_context)
-        throw Exception("There is no session", ErrorCodes::THERE_IS_NO_SESSION);
-    return *session_context;
+    auto ptr = session_context.lock();
+    if (!ptr) throw Exception("There is no session or session context has expired", ErrorCodes::THERE_IS_NO_SESSION);
+    return ptr;
 }
 
-Context & Context::getSessionContext()
+ContextMutablePtr Context::getGlobalContext() const
 {
-    if (!session_context)
-        throw Exception("There is no session", ErrorCodes::THERE_IS_NO_SESSION);
-    return *session_context;
+    auto ptr = global_context.lock();
+    if (!ptr) throw Exception("There is no global context or global context has expired", ErrorCodes::LOGICAL_ERROR);
+    return ptr;
 }
 
-const Context & Context::getGlobalContext() const
+ContextMutablePtr Context::getBufferContext() const
 {
-    if (!global_context)
-        throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-    return *global_context;
-}
-
-Context & Context::getGlobalContext()
-{
-    if (!global_context)
-        throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-    return *global_context;
-}
-
-const Context & Context::getBufferContext() const
-{
-    if (!buffer_context)
-        throw Exception("Logical error: there is no buffer context", ErrorCodes::LOGICAL_ERROR);
-    return *buffer_context;
+    if (!buffer_context) throw Exception("There is no buffer context", ErrorCodes::LOGICAL_ERROR);
+    return buffer_context;
 }
 
 
@@ -1325,39 +1368,47 @@ EmbeddedDictionaries & Context::getEmbeddedDictionaries()
 
 const ExternalDictionariesLoader & Context::getExternalDictionariesLoader() const
 {
-    std::lock_guard lock(shared->external_dictionaries_mutex);
-    if (!shared->external_dictionaries_loader)
-    {
-        if (!this->global_context)
-            throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-
-        shared->external_dictionaries_loader.emplace(*this->global_context);
-    }
-    return *shared->external_dictionaries_loader;
+    return const_cast<Context *>(this)->getExternalDictionariesLoader();
 }
 
 ExternalDictionariesLoader & Context::getExternalDictionariesLoader()
 {
-    return const_cast<ExternalDictionariesLoader &>(const_cast<const Context *>(this)->getExternalDictionariesLoader());
+    std::lock_guard lock(shared->external_dictionaries_mutex);
+    if (!shared->external_dictionaries_loader)
+        shared->external_dictionaries_loader.emplace(getGlobalContext());
+    return *shared->external_dictionaries_loader;
 }
 
 
 const ExternalModelsLoader & Context::getExternalModelsLoader() const
 {
-    std::lock_guard lock(shared->external_models_mutex);
-    if (!shared->external_models_loader)
-    {
-        if (!this->global_context)
-            throw Exception("Logical error: there is no global context", ErrorCodes::LOGICAL_ERROR);
-
-        shared->external_models_loader.emplace(*this->global_context);
-    }
-    return *shared->external_models_loader;
+    return const_cast<Context *>(this)->getExternalModelsLoader();
 }
 
 ExternalModelsLoader & Context::getExternalModelsLoader()
 {
-    return const_cast<ExternalModelsLoader &>(const_cast<const Context *>(this)->getExternalModelsLoader());
+    std::lock_guard lock(shared->external_models_mutex);
+    return getExternalModelsLoaderUnlocked();
+}
+
+ExternalModelsLoader & Context::getExternalModelsLoaderUnlocked()
+{
+    if (!shared->external_models_loader)
+        shared->external_models_loader.emplace(getGlobalContext());
+    return *shared->external_models_loader;
+}
+
+void Context::setExternalModelsConfig(const ConfigurationPtr & config, const std::string & config_name)
+{
+    std::lock_guard lock(shared->external_models_mutex);
+
+    if (shared->external_models_config && isSameConfigurationWithMultipleKeys(*config, *shared->external_models_config, "", config_name))
+        return;
+
+    shared->external_models_config = config;
+    shared->models_repository_guard .reset();
+    shared->models_repository_guard = getExternalModelsLoaderUnlocked().addConfigRepository(
+        std::make_unique<ExternalLoaderXMLConfigRepository>(*config, config_name));
 }
 
 
@@ -1371,7 +1422,7 @@ EmbeddedDictionaries & Context::getEmbeddedDictionariesImpl(const bool throw_on_
 
         shared->embedded_dictionaries.emplace(
             std::move(geo_dictionaries_loader),
-            *this->global_context,
+            getGlobalContext(),
             throw_on_error);
     }
 
@@ -1384,6 +1435,16 @@ void Context::tryCreateEmbeddedDictionaries() const
     static_cast<void>(getEmbeddedDictionariesImpl(true));
 }
 
+void Context::loadDictionaries(const Poco::Util::AbstractConfiguration & config)
+{
+    if (!config.getBool("dictionaries_lazy_load", true))
+    {
+        tryCreateEmbeddedDictionaries();
+        getExternalDictionariesLoader().enableAlwaysLoadEverything(true);
+    }
+    shared->dictionaries_xmls = getExternalDictionariesLoader().addConfigRepository(
+        std::make_unique<ExternalLoaderXMLConfigRepository>(config, "dictionaries_config"));
+}
 
 void Context::setProgressCallback(ProgressCallback callback)
 {
@@ -1572,6 +1633,26 @@ BackgroundSchedulePool & Context::getMessageBrokerSchedulePool() const
     return *shared->message_broker_schedule_pool;
 }
 
+ThrottlerPtr Context::getReplicatedFetchesThrottler() const
+{
+    auto lock = getLock();
+    if (!shared->replicated_fetches_throttler)
+        shared->replicated_fetches_throttler = std::make_shared<Throttler>(
+            settings.max_replicated_fetches_network_bandwidth_for_server);
+
+    return shared->replicated_fetches_throttler;
+}
+
+ThrottlerPtr Context::getReplicatedSendsThrottler() const
+{
+    auto lock = getLock();
+    if (!shared->replicated_sends_throttler)
+        shared->replicated_sends_throttler = std::make_shared<Throttler>(
+            settings.max_replicated_sends_network_bandwidth_for_server);
+
+    return shared->replicated_sends_throttler;
+}
+
 bool Context::hasDistributedDDL() const
 {
     return getConfigRef().has("distributed_ddl");
@@ -1619,16 +1700,16 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
 void Context::initializeKeeperStorageDispatcher() const
 {
 #if USE_NURAFT
-    std::lock_guard lock(shared->nu_keeper_storage_dispatcher_mutex);
+    std::lock_guard lock(shared->keeper_storage_dispatcher_mutex);
 
-    if (shared->nu_keeper_storage_dispatcher)
+    if (shared->keeper_storage_dispatcher)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to initialize Keeper multiple times");
 
     const auto & config = getConfigRef();
     if (config.has("keeper_server"))
     {
-        shared->nu_keeper_storage_dispatcher = std::make_shared<KeeperStorageDispatcher>();
-        shared->nu_keeper_storage_dispatcher->initialize(config);
+        shared->keeper_storage_dispatcher = std::make_shared<KeeperStorageDispatcher>();
+        shared->keeper_storage_dispatcher->initialize(config, getApplicationType() == ApplicationType::KEEPER);
     }
 #endif
 }
@@ -1636,22 +1717,22 @@ void Context::initializeKeeperStorageDispatcher() const
 #if USE_NURAFT
 std::shared_ptr<KeeperStorageDispatcher> & Context::getKeeperStorageDispatcher() const
 {
-    std::lock_guard lock(shared->nu_keeper_storage_dispatcher_mutex);
-    if (!shared->nu_keeper_storage_dispatcher)
+    std::lock_guard lock(shared->keeper_storage_dispatcher_mutex);
+    if (!shared->keeper_storage_dispatcher)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Keeper must be initialized before requests");
 
-    return shared->nu_keeper_storage_dispatcher;
+    return shared->keeper_storage_dispatcher;
 }
 #endif
 
 void Context::shutdownKeeperStorageDispatcher() const
 {
 #if USE_NURAFT
-    std::lock_guard lock(shared->nu_keeper_storage_dispatcher_mutex);
-    if (shared->nu_keeper_storage_dispatcher)
+    std::lock_guard lock(shared->keeper_storage_dispatcher_mutex);
+    if (shared->keeper_storage_dispatcher)
     {
-        shared->nu_keeper_storage_dispatcher->shutdown();
-        shared->nu_keeper_storage_dispatcher.reset();
+        shared->keeper_storage_dispatcher->shutdown();
+        shared->keeper_storage_dispatcher.reset();
     }
 #endif
 }
@@ -1734,6 +1815,17 @@ bool Context::hasAuxiliaryZooKeeper(const String & name) const
     return getConfigRef().has("auxiliary_zookeepers." + name);
 }
 
+InterserverCredentialsPtr Context::getInterserverCredentials()
+{
+    return shared->interserver_io_credentials.get();
+}
+
+void Context::updateInterserverCredentials(const Poco::Util::AbstractConfiguration & config)
+{
+    auto credentials = InterserverCredentials::make(config, "interserver_http_credentials");
+    shared->interserver_io_credentials.set(std::move(credentials));
+}
+
 void Context::setInterserverIOAddress(const String & host, UInt16 port)
 {
     shared->interserver_io_host = host;
@@ -1749,17 +1841,6 @@ std::pair<String, UInt16> Context::getInterserverIOAddress() const
     return { shared->interserver_io_host, shared->interserver_io_port };
 }
 
-void Context::setInterserverCredentials(const String & user_, const String & password)
-{
-    shared->interserver_io_user = user_;
-    shared->interserver_io_password = password;
-}
-
-std::pair<String, String> Context::getInterserverCredentials() const
-{
-    return { shared->interserver_io_user, shared->interserver_io_password };
-}
-
 void Context::setInterserverScheme(const String & scheme)
 {
     shared->interserver_scheme = scheme;
@@ -1818,7 +1899,7 @@ std::shared_ptr<Cluster> Context::tryGetCluster(const std::string & cluster_name
 }
 
 
-void Context::reloadClusterConfig()
+void Context::reloadClusterConfig() const
 {
     while (true)
     {
@@ -1891,7 +1972,7 @@ void Context::setCluster(const String & cluster_name, const std::shared_ptr<Clus
 void Context::initializeSystemLogs()
 {
     auto lock = getLock();
-    shared->system_logs.emplace(*global_context, getConfigRef());
+    shared->system_logs = std::make_unique<SystemLogs>(getGlobalContext(), getConfigRef());
 }
 
 void Context::initializeTraceCollector()
@@ -1905,7 +1986,7 @@ bool Context::hasTraceCollector() const
 }
 
 
-std::shared_ptr<QueryLog> Context::getQueryLog()
+std::shared_ptr<QueryLog> Context::getQueryLog() const
 {
     auto lock = getLock();
 
@@ -1916,7 +1997,7 @@ std::shared_ptr<QueryLog> Context::getQueryLog()
 }
 
 
-std::shared_ptr<QueryThreadLog> Context::getQueryThreadLog()
+std::shared_ptr<QueryThreadLog> Context::getQueryThreadLog() const
 {
     auto lock = getLock();
 
@@ -1927,7 +2008,7 @@ std::shared_ptr<QueryThreadLog> Context::getQueryThreadLog()
 }
 
 
-std::shared_ptr<PartLog> Context::getPartLog(const String & part_database)
+std::shared_ptr<PartLog> Context::getPartLog(const String & part_database) const
 {
     auto lock = getLock();
 
@@ -1945,7 +2026,7 @@ std::shared_ptr<PartLog> Context::getPartLog(const String & part_database)
 }
 
 
-std::shared_ptr<TraceLog> Context::getTraceLog()
+std::shared_ptr<TraceLog> Context::getTraceLog() const
 {
     auto lock = getLock();
 
@@ -1956,7 +2037,7 @@ std::shared_ptr<TraceLog> Context::getTraceLog()
 }
 
 
-std::shared_ptr<TextLog> Context::getTextLog()
+std::shared_ptr<TextLog> Context::getTextLog() const
 {
     auto lock = getLock();
 
@@ -1967,7 +2048,7 @@ std::shared_ptr<TextLog> Context::getTextLog()
 }
 
 
-std::shared_ptr<MetricLog> Context::getMetricLog()
+std::shared_ptr<MetricLog> Context::getMetricLog() const
 {
     auto lock = getLock();
 
@@ -1978,7 +2059,7 @@ std::shared_ptr<MetricLog> Context::getMetricLog()
 }
 
 
-std::shared_ptr<AsynchronousMetricLog> Context::getAsynchronousMetricLog()
+std::shared_ptr<AsynchronousMetricLog> Context::getAsynchronousMetricLog() const
 {
     auto lock = getLock();
 
@@ -1989,7 +2070,7 @@ std::shared_ptr<AsynchronousMetricLog> Context::getAsynchronousMetricLog()
 }
 
 
-std::shared_ptr<OpenTelemetrySpanLog> Context::getOpenTelemetrySpanLog()
+std::shared_ptr<OpenTelemetrySpanLog> Context::getOpenTelemetrySpanLog() const
 {
     auto lock = getLock();
 
@@ -2057,7 +2138,7 @@ DiskSelectorPtr Context::getDiskSelector(std::lock_guard<std::mutex> & /* lock *
         constexpr auto config_name = "storage_configuration.disks";
         const auto & config = getConfigRef();
 
-        shared->merge_tree_disk_selector = std::make_shared<DiskSelector>(config, config_name, *this);
+        shared->merge_tree_disk_selector = std::make_shared<DiskSelector>(config, config_name, shared_from_this());
     }
     return shared->merge_tree_disk_selector;
 }
@@ -2080,17 +2161,20 @@ void Context::updateStorageConfiguration(const Poco::Util::AbstractConfiguration
     std::lock_guard lock(shared->storage_policies_mutex);
 
     if (shared->merge_tree_disk_selector)
-        shared->merge_tree_disk_selector = shared->merge_tree_disk_selector->updateFromConfig(config, "storage_configuration.disks", *this);
+        shared->merge_tree_disk_selector
+            = shared->merge_tree_disk_selector->updateFromConfig(config, "storage_configuration.disks", shared_from_this());
 
     if (shared->merge_tree_storage_policy_selector)
     {
         try
         {
-            shared->merge_tree_storage_policy_selector = shared->merge_tree_storage_policy_selector->updateFromConfig(config, "storage_configuration.policies", shared->merge_tree_disk_selector);
+            shared->merge_tree_storage_policy_selector = shared->merge_tree_storage_policy_selector->updateFromConfig(
+                config, "storage_configuration.policies", shared->merge_tree_disk_selector);
         }
         catch (Exception & e)
         {
-            LOG_ERROR(shared->log, "An error has occurred while reloading storage policies, storage policies were not applied: {}", e.message());
+            LOG_ERROR(
+                shared->log, "An error has occurred while reloading storage policies, storage policies were not applied: {}", e.message());
         }
     }
 
@@ -2156,14 +2240,14 @@ void Context::checkCanBeDropped(const String & database, const String & table, c
     if (!max_size_to_drop || size <= max_size_to_drop)
         return;
 
-    Poco::File force_file(getFlagsPath() + "force_drop_table");
-    bool force_file_exists = force_file.exists();
+    fs::path force_file(getFlagsPath() + "force_drop_table");
+    bool force_file_exists = fs::exists(force_file);
 
     if (force_file_exists)
     {
         try
         {
-            force_file.remove();
+            fs::remove(force_file);
             return;
         }
         catch (...)
@@ -2185,9 +2269,9 @@ void Context::checkCanBeDropped(const String & database, const String & table, c
                     "Example:\nsudo touch '{}' && sudo chmod 666 '{}'",
                     backQuoteIfNeed(database), backQuoteIfNeed(table),
                     size_str, max_size_to_drop_str,
-                    force_file.path(), force_file_exists ? "exists but not writeable (could not be removed)" : "doesn't exist",
-                    force_file.path(),
-                    force_file.path(), force_file.path());
+                    force_file.string(), force_file_exists ? "exists but not writeable (could not be removed)" : "doesn't exist",
+                    force_file.string(),
+                    force_file.string(), force_file.string());
 }
 
 
@@ -2223,27 +2307,28 @@ void Context::checkPartitionCanBeDropped(const String & database, const String &
 
 BlockInputStreamPtr Context::getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size) const
 {
-    return std::make_shared<InputStreamFromInputFormat>(FormatFactory::instance().getInput(name, buf, sample, *this, max_block_size));
+    return std::make_shared<InputStreamFromInputFormat>(
+        FormatFactory::instance().getInput(name, buf, sample, shared_from_this(), max_block_size));
 }
 
 BlockOutputStreamPtr Context::getOutputStreamParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputStreamParallelIfPossible(name, buf, sample, *this);
+    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, *this);
+    return FormatFactory::instance().getOutputStream(name, buf, sample, shared_from_this());
 }
 
 OutputFormatPtr Context::getOutputFormatParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputFormatParallelIfPossible(name, buf, sample, *this);
+    return FormatFactory::instance().getOutputFormatParallelIfPossible(name, buf, sample, shared_from_this());
 }
 
 OutputFormatPtr Context::getOutputFormat(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputFormat(name, buf, sample, *this);
+    return FormatFactory::instance().getOutputFormat(name, buf, sample, shared_from_this());
 }
 
 
@@ -2309,7 +2394,7 @@ void Context::setDefaultProfiles(const Poco::Util::AbstractConfiguration & confi
     applySettingsQuirks(settings, &Poco::Logger::get("SettingsQuirks"));
 
     shared->buffer_profile_name = config.getString("buffer_profile", shared->system_profile_name);
-    buffer_context = std::make_shared<Context>(*this);
+    buffer_context = Context::createCopy(shared_from_this());
     buffer_context->setProfile(shared->buffer_profile_name);
 }
 
@@ -2335,7 +2420,7 @@ void Context::setFormatSchemaPath(const String & path)
 
 Context::SampleBlockCache & Context::getSampleBlockCache() const
 {
-    return getQueryContext().sample_block_cache;
+    return getQueryContext()->sample_block_cache;
 }
 
 
@@ -2358,7 +2443,7 @@ void Context::setQueryParameter(const String & name, const String & value)
 }
 
 
-void Context::addXDBCBridgeCommand(std::unique_ptr<ShellCommand> cmd) const
+void Context::addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const
 {
     auto lock = getLock();
     shared->bridge_commands.emplace_back(std::move(cmd));
@@ -2382,7 +2467,7 @@ std::shared_ptr<ActionLocksManager> Context::getActionLocksManager()
     auto lock = getLock();
 
     if (!shared->action_locks_manager)
-        shared->action_locks_manager = std::make_shared<ActionLocksManager>(*this);
+        shared->action_locks_manager = std::make_shared<ActionLocksManager>(shared_from_this());
 
     return shared->action_locks_manager;
 }
@@ -2400,7 +2485,7 @@ void Context::initializeExternalTablesIfSet()
 {
     if (external_tables_initializer_callback)
     {
-        external_tables_initializer_callback(*this);
+        external_tables_initializer_callback(shared_from_this());
         /// Reset callback
         external_tables_initializer_callback = {};
     }
@@ -2421,7 +2506,7 @@ void Context::initializeInput(const StoragePtr & input_storage)
     if (!input_initializer_callback)
         throw Exception("Input initializer is not set", ErrorCodes::LOGICAL_ERROR);
 
-    input_initializer_callback(*this, input_storage);
+    input_initializer_callback(shared_from_this(), input_storage);
     /// Reset callback
     input_initializer_callback = {};
 }
@@ -2520,12 +2605,12 @@ StorageID Context::resolveStorageIDImpl(StorageID storage_id, StorageNamespace w
     if (look_for_external_table)
     {
         /// Global context should not contain temporary tables
-        assert(global_context != this || getApplicationType() == ApplicationType::LOCAL);
+        assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
 
         auto resolved_id = StorageID::createEmpty();
-        auto try_resolve = [&](const Context & context) -> bool
+        auto try_resolve = [&](ContextConstPtr context) -> bool
         {
-            const auto & tables = context.external_tables_mapping;
+            const auto & tables = context->external_tables_mapping;
             auto it = tables.find(storage_id.getTableName());
             if (it == tables.end())
                 return false;
@@ -2534,17 +2619,19 @@ StorageID Context::resolveStorageIDImpl(StorageID storage_id, StorageNamespace w
         };
 
         /// Firstly look for temporary table in current context
-        if (try_resolve(*this))
+        if (try_resolve(shared_from_this()))
             return resolved_id;
 
         /// If not found and current context was created from some query context, look for temporary table in query context
-        bool is_local_context = query_context && query_context != this;
-        if (is_local_context && try_resolve(*query_context))
+        auto query_context_ptr = query_context.lock();
+        bool is_local_context = query_context_ptr && query_context_ptr.get() != this;
+        if (is_local_context && try_resolve(query_context_ptr))
             return resolved_id;
 
         /// If not found and current context was created from some session context, look for temporary table in session context
-        bool is_local_or_query_context = session_context && session_context != this;
-        if (is_local_or_query_context && try_resolve(*session_context))
+        auto session_context_ptr = session_context.lock();
+        bool is_local_or_query_context = session_context_ptr && session_context_ptr.get() != this;
+        if (is_local_or_query_context && try_resolve(session_context_ptr))
             return resolved_id;
     }
 
@@ -2571,7 +2658,7 @@ StorageID Context::resolveStorageIDImpl(StorageID storage_id, StorageNamespace w
 void Context::initZooKeeperMetadataTransaction(ZooKeeperMetadataTransactionPtr txn, [[maybe_unused]] bool attach_existing)
 {
     assert(!metadata_transaction);
-    assert(attach_existing || query_context == this);
+    assert(attach_existing || query_context.lock().get() == this);
     metadata_transaction = std::move(txn);
 }
 
@@ -2581,20 +2668,37 @@ ZooKeeperMetadataTransactionPtr Context::getZooKeeperMetadataTransaction() const
     return metadata_transaction;
 }
 
-PartUUIDsPtr Context::getPartUUIDs()
+PartUUIDsPtr Context::getPartUUIDs() const
 {
     auto lock = getLock();
     if (!part_uuids)
-        part_uuids = std::make_shared<PartUUIDs>();
+        /// For context itself, only this initialization is not const.
+        /// We could have done in constructor.
+        /// TODO: probably, remove this from Context.
+        const_cast<PartUUIDsPtr &>(part_uuids) = std::make_shared<PartUUIDs>();
 
     return part_uuids;
 }
 
-PartUUIDsPtr Context::getIgnoredPartUUIDs()
+
+ReadTaskCallback Context::getReadTaskCallback() const
+{
+    if (!next_task_callback.has_value())
+        throw Exception(fmt::format("Next task callback is not set for query {}", getInitialQueryId()), ErrorCodes::LOGICAL_ERROR);
+    return next_task_callback.value();
+}
+
+
+void Context::setReadTaskCallback(ReadTaskCallback && callback)
+{
+    next_task_callback = callback;
+}
+
+PartUUIDsPtr Context::getIgnoredPartUUIDs() const
 {
     auto lock = getLock();
     if (!ignored_part_uuids)
-        ignored_part_uuids = std::make_shared<PartUUIDs>();
+        const_cast<PartUUIDsPtr &>(ignored_part_uuids) = std::make_shared<PartUUIDs>();
 
     return ignored_part_uuids;
 }
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 5c98a2ba64a..2be34bb3cb1 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -1,19 +1,26 @@
 #pragma once
 
+#include <Access/RowPolicy.h>
 #include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
 #include <Core/Settings.h>
-#include <common/types.h>
 #include <Core/UUID.h>
 #include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/ClientInfo.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/IAST_fwd.h>
-#include <Access/RowPolicy.h>
-#include <Common/MultiVersion.h>
-#include <Common/ThreadPool.h>
-#include <Common/OpenTelemetryTraceContext.h>
 #include <Storages/IStorage_fwd.h>
+#include <Common/MultiVersion.h>
+#include <Common/OpenTelemetryTraceContext.h>
+#include <Common/RemoteHostFilter.h>
+#include <Common/ThreadPool.h>
+#include <common/types.h>
+
+#if !defined(ARCADIA_BUILD)
+#    include "config_core.h"
+#endif
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -22,32 +29,16 @@
 #include <mutex>
 #include <optional>
 #include <thread>
-#include <Common/RemoteHostFilter.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
 
 
-namespace Poco
-{
-    namespace Net
-    {
-        class IPAddress;
-    }
-}
-
-namespace zkutil
-{
-    class ZooKeeper;
-}
+namespace Poco::Net { class IPAddress; }
+namespace zkutil { class ZooKeeper; }
 
 
 namespace DB
 {
 
-struct ContextShared;
-class Context;
+struct ContextSharedPart;
 class ContextAccess;
 struct User;
 using UserPtr = std::shared_ptr<const User>;
@@ -61,6 +52,8 @@ class AccessRightsElements;
 class EmbeddedDictionaries;
 class ExternalDictionariesLoader;
 class ExternalModelsLoader;
+class InterserverCredentials;
+using InterserverCredentialsPtr = std::shared_ptr<const InterserverCredentials>;
 class InterserverIOHandler;
 class BackgroundSchedulePool;
 class MergeList;
@@ -120,23 +113,22 @@ using VolumePtr = std::shared_ptr<IVolume>;
 struct NamedSession;
 struct BackgroundTaskSchedulingSettings;
 
+class Throttler;
+using ThrottlerPtr = std::shared_ptr<Throttler>;
+
 class ZooKeeperMetadataTransaction;
 using ZooKeeperMetadataTransactionPtr = std::shared_ptr<ZooKeeperMetadataTransaction>;
 
-#if USE_EMBEDDED_COMPILER
-class CompiledExpressionCache;
-#endif
-
 /// Callback for external tables initializer
-using ExternalTablesInitializer = std::function<void(Context &)>;
+using ExternalTablesInitializer = std::function<void(ContextPtr)>;
 
 /// Callback for initialize input()
-using InputInitializer = std::function<void(Context &, const StoragePtr &)>;
+using InputInitializer = std::function<void(ContextPtr, const StoragePtr &)>;
 /// Callback for reading blocks of data from client for function input()
-using InputBlocksReader = std::function<Block(Context &)>;
+using InputBlocksReader = std::function<Block(ContextPtr)>;
 
-/// Scalar results of sub queries
-using Scalars = std::map<String, Block>;
+/// Used in distributed task processing
+using ReadTaskCallback = std::function<String()>;
 
 /// An empty interface for an arbitrary object that may be attached by a shared pointer
 /// to query context, when using ClickHouse as a library.
@@ -153,15 +145,16 @@ struct SharedContextHolder
 {
     ~SharedContextHolder();
     SharedContextHolder();
-    SharedContextHolder(std::unique_ptr<ContextShared> shared_context);
+    explicit SharedContextHolder(std::unique_ptr<ContextSharedPart> shared_context);
     SharedContextHolder(SharedContextHolder &&) noexcept;
 
     SharedContextHolder & operator=(SharedContextHolder &&);
 
-    ContextShared * get() const { return shared.get(); }
+    ContextSharedPart * get() const { return shared.get(); }
     void reset();
+
 private:
-    std::unique_ptr<ContextShared> shared;
+    std::unique_ptr<ContextSharedPart> shared;
 };
 
 /** A set of known objects that can be used in the query.
@@ -170,10 +163,10 @@ private:
   *
   * Everything is encapsulated for all sorts of checks and locks.
   */
-class Context
+class Context: public std::enable_shared_from_this<Context>
 {
 private:
-    ContextShared * shared;
+    ContextSharedPart * shared;
 
     ClientInfo client_info;
     ExternalTablesInitializer external_tables_initializer_callback;
@@ -198,6 +191,9 @@ private:
     TemporaryTablesMapping external_tables_mapping;
     Scalars scalars;
 
+    /// Fields for distributed s3 function
+    std::optional<ReadTaskCallback> next_task_callback;
+
     /// Record entities accessed by current query, and store this information in system.query_log.
     struct QueryAccessInfo
     {
@@ -209,6 +205,7 @@ private:
             databases = rhs.databases;
             tables = rhs.tables;
             columns = rhs.columns;
+            projections = rhs.projections;
         }
 
         QueryAccessInfo(QueryAccessInfo && rhs) = delete;
@@ -224,6 +221,7 @@ private:
             std::swap(databases, rhs.databases);
             std::swap(tables, rhs.tables);
             std::swap(columns, rhs.columns);
+            std::swap(projections, rhs.projections);
         }
 
         /// To prevent a race between copy-constructor and other uses of this structure.
@@ -231,6 +229,7 @@ private:
         std::set<std::string> databases{};
         std::set<std::string> tables{};
         std::set<std::string> columns{};
+        std::set<std::string> projections;
     };
 
     QueryAccessInfo query_access_info;
@@ -252,18 +251,19 @@ private:
     /// Needs to be chandged while having const context in factories methods
     mutable QueryFactoriesInfo query_factories_info;
 
-    //TODO maybe replace with temporary tables?
+    /// TODO: maybe replace with temporary tables?
     StoragePtr view_source;                 /// Temporary StorageValues used to generate alias columns for materialized views
     Tables table_function_results;          /// Temporary tables obtained by execution of table functions. Keyed by AST tree id.
 
-    Context * query_context = nullptr;
-    Context * session_context = nullptr;    /// Session context or nullptr. Could be equal to this.
-    Context * global_context = nullptr;     /// Global context. Could be equal to this.
-    std::shared_ptr<Context> buffer_context;/// Buffer context. Could be equal to this.
+    ContextWeakMutablePtr query_context;
+    ContextWeakMutablePtr session_context;  /// Session context or nullptr. Could be equal to this.
+    ContextWeakMutablePtr global_context;   /// Global context. Could be equal to this.
+
+    /// XXX: move this stuff to shared part instead.
+    ContextMutablePtr buffer_context;  /// Buffer context. Could be equal to this.
 
 public:
-    // Top-level OpenTelemetry trace context for the query. Makes sense only for
-    // a query context.
+    // Top-level OpenTelemetry trace context for the query. Makes sense only for a query context.
     OpenTelemetryTraceContext query_trace_context;
 
 private:
@@ -281,7 +281,7 @@ private:
     IHostContextPtr host_context;  /// Arbitrary object that may used to attach some host specific information to query context,
                                    /// when using ClickHouse as a library in some project. For example, it may contain host
                                    /// logger, some query identification information, profiling guards, etc. This field is
-                                   /// to be customized in HTTP and TCP servers by overloading the customizeContext(DB::Context&)
+                                   /// to be customized in HTTP and TCP servers by overloading the customizeContext(DB::ContextPtr)
                                    /// methods.
 
     ZooKeeperMetadataTransactionPtr metadata_transaction;    /// Distributed DDL context. I'm not sure if it's a suitable place for this,
@@ -290,16 +290,20 @@ private:
                                                     /// thousands of signatures.
                                                     /// And I hope it will be replaced with more common Transaction sometime.
 
-    /// Use copy constructor or createGlobal() instead
     Context();
+    Context(const Context &);
+    Context & operator=(const Context &);
 
 public:
     /// Create initial Context with ContextShared and etc.
-    static Context createGlobal(ContextShared * shared);
+    static ContextMutablePtr createGlobal(ContextSharedPart * shared);
+    static ContextMutablePtr createCopy(const ContextWeakConstPtr & other);
+    static ContextMutablePtr createCopy(const ContextMutablePtr & other);
+    static ContextMutablePtr createCopy(const ContextPtr & other);
     static SharedContextHolder createShared();
 
-    Context(const Context &);
-    Context & operator=(const Context &);
+    void copyFrom(const ContextPtr & other);
+
     ~Context();
 
     String getPath() const;
@@ -432,7 +436,11 @@ public:
     bool hasScalar(const String & name) const;
 
     const QueryAccessInfo & getQueryAccessInfo() const { return query_access_info; }
-    void addQueryAccessInfo(const String & quoted_database_name, const String & full_quoted_table_name, const Names & column_names);
+    void addQueryAccessInfo(
+        const String & quoted_database_name,
+        const String & full_quoted_table_name,
+        const Names & column_names,
+        const String & projection_name = {});
 
     /// Supported factories for records in query_log
     enum class QueryLogFactories
@@ -454,7 +462,7 @@ public:
     StoragePtr executeTableFunction(const ASTPtr & table_expression);
 
     void addViewSource(const StoragePtr & storage);
-    StoragePtr getViewSource();
+    StoragePtr getViewSource() const;
 
     String getCurrentDatabase() const;
     String getCurrentQueryId() const { return client_info.current_query_id; }
@@ -503,7 +511,11 @@ public:
     EmbeddedDictionaries & getEmbeddedDictionaries();
     ExternalDictionariesLoader & getExternalDictionariesLoader();
     ExternalModelsLoader & getExternalModelsLoader();
+    ExternalModelsLoader & getExternalModelsLoaderUnlocked();
     void tryCreateEmbeddedDictionaries() const;
+    void loadDictionaries(const Poco::Util::AbstractConfiguration & config);
+
+    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;
@@ -522,8 +534,8 @@ public:
     std::pair<String, UInt16> getInterserverIOAddress() const;
 
     /// Credentials which server will use to communicate with others
-    void setInterserverCredentials(const String & user, const String & password);
-    std::pair<String, String> getInterserverCredentials() const;
+    void updateInterserverCredentials(const Poco::Util::AbstractConfiguration & config);
+    InterserverCredentialsPtr getInterserverCredentials();
 
     /// Interserver requests scheme (http or https)
     void setInterserverScheme(const String & scheme);
@@ -546,27 +558,29 @@ public:
 
     /// For methods below you may need to acquire the context lock by yourself.
 
-    const Context & getQueryContext() const;
-    Context & getQueryContext();
-    bool hasQueryContext() const { return query_context != nullptr; }
-    bool isInternalSubquery() const { return hasQueryContext() && query_context != this; }
+    ContextMutablePtr getQueryContext() const;
+    bool hasQueryContext() const { return !query_context.expired(); }
+    bool isInternalSubquery() const;
 
-    const Context & getSessionContext() const;
-    Context & getSessionContext();
-    bool hasSessionContext() const { return session_context != nullptr; }
+    ContextMutablePtr getSessionContext() const;
+    bool hasSessionContext() const { return !session_context.expired(); }
 
-    const Context & getGlobalContext() const;
-    Context & getGlobalContext();
-    bool hasGlobalContext() const { return global_context != nullptr; }
+    ContextMutablePtr getGlobalContext() const;
+    bool hasGlobalContext() const { return !global_context.expired(); }
+    bool isGlobalContext() const
+    {
+        auto ptr = global_context.lock();
+        return ptr && ptr.get() == this;
+    }
 
-    const Context & getBufferContext() const;
+    ContextMutablePtr getBufferContext() const;
 
-    void setQueryContext(Context & context_) { query_context = &context_; }
-    void setSessionContext(Context & context_) { session_context = &context_; }
+    void setQueryContext(ContextMutablePtr context_) { query_context = context_; }
+    void setSessionContext(ContextMutablePtr context_) { session_context = context_; }
 
-    void makeQueryContext() { query_context = this; }
-    void makeSessionContext() { session_context = this; }
-    void makeGlobalContext() { initGlobal(); global_context = this; }
+    void makeQueryContext() { query_context = shared_from_this(); }
+    void makeSessionContext() { session_context = shared_from_this(); }
+    void makeGlobalContext() { initGlobal(); global_context = shared_from_this(); }
 
     const Settings & getSettingsRef() const { return settings; }
 
@@ -646,6 +660,9 @@ public:
     BackgroundSchedulePool & getMessageBrokerSchedulePool() const;
     BackgroundSchedulePool & getDistributedSchedulePool() const;
 
+    ThrottlerPtr getReplicatedFetchesThrottler() const;
+    ThrottlerPtr getReplicatedSendsThrottler() const;
+
     /// Has distributed_ddl configuration or not.
     bool hasDistributedDDL() const;
     void setDDLWorker(std::unique_ptr<DDLWorker> ddl_worker);
@@ -657,7 +674,7 @@ public:
     void setClustersConfig(const ConfigurationPtr & config, const String & config_name = "remote_servers");
     /// Sets custom cluster, but doesn't update configuration
     void setCluster(const String & cluster_name, const std::shared_ptr<Cluster> & cluster);
-    void reloadClusterConfig();
+    void reloadClusterConfig() const;
 
     Compiler & getCompiler();
 
@@ -670,17 +687,17 @@ public:
     bool hasTraceCollector() const;
 
     /// Nullptr if the query log is not ready for this moment.
-    std::shared_ptr<QueryLog> getQueryLog();
-    std::shared_ptr<QueryThreadLog> getQueryThreadLog();
-    std::shared_ptr<TraceLog> getTraceLog();
-    std::shared_ptr<TextLog> getTextLog();
-    std::shared_ptr<MetricLog> getMetricLog();
-    std::shared_ptr<AsynchronousMetricLog> getAsynchronousMetricLog();
-    std::shared_ptr<OpenTelemetrySpanLog> getOpenTelemetrySpanLog();
+    std::shared_ptr<QueryLog> getQueryLog() const;
+    std::shared_ptr<QueryThreadLog> getQueryThreadLog() 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;
 
     /// Returns an object used to log operations with parts if it possible.
     /// Provide table name to make required checks.
-    std::shared_ptr<PartLog> getPartLog(const String & part_database);
+    std::shared_ptr<PartLog> getPartLog(const String & part_database) const;
 
     const MergeTreeSettings & getMergeTreeSettings() const;
     const MergeTreeSettings & getReplicatedMergeTreeSettings() const;
@@ -723,7 +740,8 @@ public:
     {
         SERVER,         /// The program is run as clickhouse-server daemon (default behavior)
         CLIENT,         /// clickhouse-client
-        LOCAL           /// clickhouse-local
+        LOCAL,          /// clickhouse-local
+        KEEPER,         /// clickhouse-keeper (also daemon)
     };
 
     ApplicationType getApplicationType() const;
@@ -747,7 +765,7 @@ public:
     void setQueryParameters(const NameToNameMap & parameters) { query_parameters = parameters; }
 
     /// Add started bridge command. It will be killed after context destruction
-    void addXDBCBridgeCommand(std::unique_ptr<ShellCommand> cmd) const;
+    void addBridgeCommand(std::unique_ptr<ShellCommand> cmd) const;
 
     IHostContextPtr & getHostContext();
     const IHostContextPtr & getHostContext() const;
@@ -766,8 +784,12 @@ public:
 
     MySQLWireContext mysql;
 
-    PartUUIDsPtr getPartUUIDs();
-    PartUUIDsPtr getIgnoredPartUUIDs();
+    PartUUIDsPtr getPartUUIDs() const;
+    PartUUIDsPtr getIgnoredPartUUIDs() const;
+
+    ReadTaskCallback getReadTaskCallback() const;
+    void setReadTaskCallback(ReadTaskCallback && callback);
+
 private:
     std::unique_lock<std::recursive_mutex> getLock() const;
 
@@ -788,6 +810,9 @@ 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);
 };
 
 
@@ -801,12 +826,12 @@ struct NamedSession
 {
     NamedSessionKey key;
     UInt64 close_cycle = 0;
-    Context context;
+    ContextMutablePtr context;
     std::chrono::steady_clock::duration timeout;
     NamedSessions & parent;
 
-    NamedSession(NamedSessionKey key_, Context & context_, std::chrono::steady_clock::duration timeout_, NamedSessions & parent_)
-        : key(key_), context(context_), timeout(timeout_), parent(parent_)
+    NamedSession(NamedSessionKey key_, ContextPtr context_, std::chrono::steady_clock::duration timeout_, NamedSessions & parent_)
+        : key(key_), context(Context::createCopy(context_)), timeout(timeout_), parent(parent_)
     {
     }
 
diff --git a/src/Interpreters/Context_fwd.h b/src/Interpreters/Context_fwd.h
new file mode 100644
index 00000000000..af18e5a7fdd
--- /dev/null
+++ b/src/Interpreters/Context_fwd.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <Common/Exception.h>
+
+#include <map>
+#include <memory>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+class Block;
+
+/// Scalar results of subqueries
+using Scalars = std::map<String, Block>;
+
+class Context;
+
+/// Most used types have shorter names
+/// TODO: in the first part of refactoring all the context pointers are non-const.
+using ContextPtr = std::shared_ptr<const Context>;
+using ContextConstPtr = std::shared_ptr<const Context>;
+using ContextMutablePtr = std::shared_ptr<Context>;
+using ContextWeakPtr = std::weak_ptr<const Context>;
+using ContextWeakConstPtr = std::weak_ptr<const Context>;
+using ContextWeakMutablePtr = std::weak_ptr<Context>;
+
+template <class Shared = ContextPtr>
+struct WithContextImpl
+{
+    using Weak = typename Shared::weak_type;
+    using ConstShared = std::shared_ptr<const typename Shared::element_type>;
+    using ConstWeak = typename ConstShared::weak_type;
+
+    WithContextImpl() = default;
+    explicit WithContextImpl(Weak context_) : context(context_) {}
+
+    inline Shared getContext() const
+    {
+        auto ptr = context.lock();
+        if (!ptr) throw Exception("Context has expired", ErrorCodes::LOGICAL_ERROR);
+        return ptr;
+    }
+
+protected:
+    Weak context;
+};
+
+using WithContext = WithContextImpl<>;
+using WithConstContext = WithContextImpl<ContextConstPtr>;
+using WithMutableContext = WithContextImpl<ContextMutablePtr>;
+
+}
diff --git a/src/Interpreters/ConvertStringsToEnumVisitor.cpp b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
new file mode 100644
index 00000000000..fa2e0b6613a
--- /dev/null
+++ b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
@@ -0,0 +1,186 @@
+#include <Interpreters/ConvertStringsToEnumVisitor.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/IAST.h>
+#include <Common/typeid_cast.h>
+
+
+namespace DB
+{
+
+namespace
+{
+
+/// @note We place strings in ascending order here under the assumption it colud speed up String to Enum conversion.
+String makeStringsEnum(const std::set<String> & values)
+{
+    String enum_string = "Enum8(";
+    if (values.size() >= 255)
+        enum_string = "Enum16(";
+
+    size_t number = 1;
+    for (const auto & item : values)
+    {
+        enum_string += "\'" + item + "\' = " + std::to_string(number++);
+
+        if (number <= values.size())
+            enum_string += ", ";
+    }
+
+    enum_string += ")";
+    return enum_string;
+}
+
+void changeIfArguments(ASTPtr & first, ASTPtr & second)
+{
+    String first_value = first->as<ASTLiteral>()->value.get<String>();
+    String second_value = second->as<ASTLiteral>()->value.get<String>();
+
+    std::set<String> values;
+    values.insert(first_value);
+    values.insert(second_value);
+
+    String enum_string = makeStringsEnum(values);
+    auto enum_literal = std::make_shared<ASTLiteral>(enum_string);
+
+    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");
+    second_cast->arguments->children.push_back(second);
+    second_cast->arguments->children.push_back(enum_literal);
+
+    first = first_cast;
+    second = second_cast;
+}
+
+void changeTransformArguments(ASTPtr & array_to, ASTPtr & other)
+{
+    std::set<String> values;
+
+    for (const auto & item : array_to->as<ASTLiteral>()->value.get<Array>())
+        values.insert(item.get<String>());
+    values.insert(other->as<ASTLiteral>()->value.get<String>());
+
+    String enum_string = makeStringsEnum(values);
+
+    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");
+    other_cast->arguments->children.push_back(other);
+    other_cast->arguments->children.push_back(std::make_shared<ASTLiteral>(enum_string));
+    other = other_cast;
+}
+
+bool checkSameType(const Array & array, const String & type)
+{
+    for (const auto & item : array)
+        if (item.getTypeName() != type)
+            return false;
+    return true;
+}
+
+}
+
+
+bool FindUsedFunctionsMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &)
+{
+    return !(node->as<ASTFunction>());
+}
+
+void FindUsedFunctionsMatcher::visit(const ASTPtr & ast, Data & data)
+{
+    if (auto * func = ast->as<ASTFunction>())
+        visit(*func, data);
+}
+
+void FindUsedFunctionsMatcher::visit(const ASTFunction & func, Data & data)
+{
+    if (data.names.count(func.name) && !data.call_stack.empty())
+    {
+        String alias = func.tryGetAlias();
+        if (!alias.empty())
+        {
+            data.used_functions.insert(alias);
+        }
+    }
+
+    data.call_stack.push_back(func.name);
+
+    /// Visit children with known call stack
+    Visitor(data).visit(func.arguments);
+
+    data.call_stack.pop_back();
+}
+
+
+bool ConvertStringsToEnumMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &)
+{
+    return !(node->as<ASTFunction>());
+}
+
+void ConvertStringsToEnumMatcher::visit(ASTPtr & ast, Data & data)
+{
+    if (auto * func = ast->as<ASTFunction>())
+        visit(*func, data);
+}
+
+void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data)
+{
+    if (!function_node.arguments)
+        return;
+
+    /// We are not sure we could change the type of function result
+    /// cause it is present in other function as argument
+    if (data.used_functions.count(function_node.tryGetAlias()))
+        return;
+
+    if (function_node.name == "if")
+    {
+        if (function_node.arguments->children.size() != 2)
+            return;
+
+        const ASTLiteral * literal1 = function_node.arguments->children[1]->as<ASTLiteral>();
+        const ASTLiteral * literal2 = function_node.arguments->children[2]->as<ASTLiteral>();
+        if (!literal1 || !literal2)
+            return;
+
+        if (literal1->value.getTypeName() != std::string_view{"String"}
+            || literal2->value.getTypeName() != std::string_view{"String"})
+            return;
+
+        changeIfArguments(function_node.arguments->children[1],
+                            function_node.arguments->children[2]);
+    }
+    else if (function_node.name == "transform")
+    {
+        if (function_node.arguments->children.size() != 4)
+            return;
+
+        const ASTLiteral * literal_to = function_node.arguments->children[2]->as<ASTLiteral>();
+        const ASTLiteral * literal_other = function_node.arguments->children[3]->as<ASTLiteral>();
+        if (!literal_to || !literal_other)
+            return;
+
+        if (literal_to->value.getTypeName() != std::string_view{"Array"}
+            || literal_other->value.getTypeName() != std::string_view{"String"})
+            return;
+
+        Array array_to = literal_to->value.get<Array>();
+        if (array_to.empty())
+            return;
+
+        bool to_strings = checkSameType(array_to, "String");
+        if (!to_strings)
+            return;
+
+        changeTransformArguments(function_node.arguments->children[2], function_node.arguments->children[3]);
+    }
+}
+
+}
+
diff --git a/src/Interpreters/ConvertStringsToEnumVisitor.h b/src/Interpreters/ConvertStringsToEnumVisitor.h
index adf408f87bd..b1389f40654 100644
--- a/src/Interpreters/ConvertStringsToEnumVisitor.h
+++ b/src/Interpreters/ConvertStringsToEnumVisitor.h
@@ -1,98 +1,17 @@
 #pragma once
 
-#include <Functions/FunctionFactory.h>
-#include <IO/WriteHelpers.h>
+#include <vector>
+#include <unordered_map>
+#include <unordered_set>
+
 #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/ASTWithAlias.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/IAST.h>
-#include <Common/typeid_cast.h>
+#include <Parsers/IAST_fwd.h>
+
 
 namespace DB
 {
 
-namespace
-{
-
-/// @note We place strings in ascending order here under the assumption it colud speed up String to Enum conversion.
-String makeStringsEnum(const std::set<String> & values)
-{
-    String enum_string = "Enum8(";
-    if (values.size() >= 255)
-        enum_string = "Enum16(";
-
-    size_t number = 1;
-    for (const auto & item : values)
-    {
-        enum_string += "\'" + item + "\' = " + std::to_string(number++);
-
-        if (number <= values.size())
-            enum_string += ", ";
-    }
-
-    enum_string += ")";
-    return enum_string;
-}
-
-void changeIfArguments(ASTPtr & first, ASTPtr & second)
-{
-    String first_value = first->as<ASTLiteral>()->value.get<String>();
-    String second_value = second->as<ASTLiteral>()->value.get<String>();
-
-    std::set<String> values;
-    values.insert(first_value);
-    values.insert(second_value);
-
-    String enum_string = makeStringsEnum(values);
-    auto enum_literal = std::make_shared<ASTLiteral>(enum_string);
-
-    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");
-    second_cast->arguments->children.push_back(second);
-    second_cast->arguments->children.push_back(enum_literal);
-
-    first = first_cast;
-    second = second_cast;
-}
-
-void changeTransformArguments(ASTPtr & array_to, ASTPtr & other)
-{
-    std::set<String> values;
-
-    for (const auto & item : array_to->as<ASTLiteral>()->value.get<Array>())
-        values.insert(item.get<String>());
-    values.insert(other->as<ASTLiteral>()->value.get<String>());
-
-    String enum_string = makeStringsEnum(values);
-
-    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");
-    other_cast->arguments->children.push_back(other);
-    other_cast->arguments->children.push_back(std::make_shared<ASTLiteral>(enum_string));
-    other = other_cast;
-}
-
-bool checkSameType(const Array & array, const String & type)
-{
-    for (const auto & item : array)
-        if (item.getTypeName() != type)
-            return false;
-    return true;
-}
-
-}
+class ASTFunction;
 
 struct FindUsedFunctionsMatcher
 {
@@ -105,35 +24,9 @@ struct FindUsedFunctionsMatcher
         std::vector<String> call_stack = {};
     };
 
-    static bool needChildVisit(const ASTPtr & node, const ASTPtr &)
-    {
-        return !(node->as<ASTFunction>());
-    }
-
-    static void visit(const ASTPtr & ast, Data & data)
-    {
-        if (auto * func = ast->as<ASTFunction>())
-            visit(*func, data);
-    }
-
-    static void visit(const ASTFunction & func, Data & data)
-    {
-        if (data.names.count(func.name) && !data.call_stack.empty())
-        {
-            String alias = func.tryGetAlias();
-            if (!alias.empty())
-            {
-                data.used_functions.insert(alias);
-            }
-        }
-
-        data.call_stack.push_back(func.name);
-
-        /// Visit children with known call stack
-        Visitor(data).visit(func.arguments);
-
-        data.call_stack.pop_back();
-    }
+    static bool needChildVisit(const ASTPtr & node, const ASTPtr &);
+    static void visit(const ASTPtr & ast, Data & data);
+    static void visit(const ASTFunction & func, Data & data);
 };
 
 using FindUsedFunctionsVisitor = FindUsedFunctionsMatcher::Visitor;
@@ -145,70 +38,9 @@ struct ConvertStringsToEnumMatcher
         std::unordered_set<String> & used_functions;
     };
 
-    static bool needChildVisit(const ASTPtr & node, const ASTPtr &)
-    {
-        return !(node->as<ASTFunction>());
-    }
-
-    static void visit(ASTPtr & ast, Data & data)
-    {
-        if (auto * func = ast->as<ASTFunction>())
-            visit(*func, data);
-    }
-
-    static void visit(ASTFunction & function_node, Data & data)
-    {
-        if (!function_node.arguments)
-            return;
-
-        /// We are not sure we could change the type of function result
-        /// cause it is present in other function as argument
-        if (data.used_functions.count(function_node.tryGetAlias()))
-            return;
-
-        if (function_node.name == "if")
-        {
-            if (function_node.arguments->children.size() != 2)
-                return;
-
-            auto literal1 = function_node.arguments->children[1]->as<ASTLiteral>();
-            auto literal2 = function_node.arguments->children[2]->as<ASTLiteral>();
-            if (!literal1 || !literal2)
-                return;
-
-            if (String(literal1->value.getTypeName()) != "String" ||
-                String(literal2->value.getTypeName()) != "String")
-                return;
-
-            changeIfArguments(function_node.arguments->children[1],
-                              function_node.arguments->children[2]);
-        }
-        else if (function_node.name == "transform")
-        {
-            if (function_node.arguments->children.size() != 4)
-                return;
-
-            auto literal_to = function_node.arguments->children[2]->as<ASTLiteral>();
-            auto literal_other = function_node.arguments->children[3]->as<ASTLiteral>();
-            if (!literal_to || !literal_other)
-                return;
-
-            if (String(literal_to->value.getTypeName()) != "Array" ||
-                String(literal_other->value.getTypeName()) != "String")
-                return;
-
-            Array array_to = literal_to->value.get<Array>();
-            if (array_to.size() == 0)
-                return;
-
-            bool to_strings = checkSameType(array_to, "String");
-            if (!to_strings)
-                return;
-
-            changeTransformArguments(function_node.arguments->children[2],
-                                     function_node.arguments->children[3]);
-        }
-    }
+    static bool needChildVisit(const ASTPtr & node, const ASTPtr &);
+    static void visit(ASTPtr & ast, Data & data);
+    static void visit(ASTFunction & function_node, Data & data);
 };
 
 using ConvertStringsToEnumVisitor = InDepthNodeVisitor<ConvertStringsToEnumMatcher, true>;
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.cpp b/src/Interpreters/CrossToInnerJoinVisitor.cpp
index 2fcd75b1f23..b6f977cd9b5 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.cpp
+++ b/src/Interpreters/CrossToInnerJoinVisitor.cpp
@@ -81,86 +81,6 @@ private:
     ASTTableJoin * join = nullptr;
 };
 
-/// Collect all identifiers from ast
-class IdentifiersCollector
-{
-public:
-    using ASTIdentPtr = const ASTIdentifier *;
-    using ASTIdentifiers = std::vector<ASTIdentPtr>;
-    struct Data
-    {
-        ASTIdentifiers idents;
-    };
-
-    static void visit(const ASTPtr & node, Data & data)
-    {
-        if (const auto * ident = node->as<ASTIdentifier>())
-            data.idents.push_back(ident);
-    }
-
-    static bool needChildVisit(const ASTPtr &, const ASTPtr &)
-    {
-        return true;
-    }
-
-    static ASTIdentifiers collect(const ASTPtr & node)
-    {
-        IdentifiersCollector::Data ident_data;
-        ConstInDepthNodeVisitor<IdentifiersCollector, true> ident_visitor(ident_data);
-        ident_visitor.visit(node);
-        return ident_data.idents;
-    }
-};
-
-/// Split expression `expr_1 AND expr_2 AND ... AND expr_n` into vector `[expr_1, expr_2, ..., expr_n]`
-void collectConjunctions(const ASTPtr & node, std::vector<ASTPtr> & members)
-{
-    if (const auto * func = node->as<ASTFunction>(); func && func->name == NameAnd::name)
-    {
-        for (const auto & child : func->arguments->children)
-            collectConjunctions(child, members);
-        return;
-    }
-    members.push_back(node);
-}
-
-std::vector<ASTPtr> collectConjunctions(const ASTPtr & node)
-{
-    std::vector<ASTPtr> members;
-    collectConjunctions(node, members);
-    return members;
-}
-
-std::optional<size_t> getIdentMembership(const ASTIdentifier & ident, const std::vector<TableWithColumnNamesAndTypes> & tables)
-{
-    std::optional<size_t> table_pos = IdentifierSemantic::getMembership(ident);
-    if (table_pos)
-        return table_pos;
-    return IdentifierSemantic::chooseTableColumnMatch(ident, tables, true);
-}
-
-std::optional<size_t> getIdentsMembership(const ASTPtr ast,
-                                          const std::vector<TableWithColumnNamesAndTypes> & tables,
-                                          const Aliases & aliases)
-{
-    auto idents = IdentifiersCollector::collect(ast);
-
-    std::optional<size_t> result;
-    for (const auto * ident : idents)
-    {
-        /// Moving expressions that use column aliases is not supported.
-        if (ident->isShort() && aliases.count(ident->shortName()))
-            return {};
-        const auto pos = getIdentMembership(*ident, tables);
-        if (!pos)
-            return {};
-        if (result && *pos != *result)
-            return {};
-        result = pos;
-    }
-    return result;
-}
-
 bool isAllowedToRewriteCrossJoin(const ASTPtr & node, const Aliases & aliases)
 {
     if (node->as<ASTFunction>())
@@ -193,8 +113,8 @@ std::map<size_t, std::vector<ASTPtr>> moveExpressionToJoinOn(
 
             /// Check if the identifiers are from different joined tables.
             /// If it's a self joint, tables should have aliases.
-            auto left_table_pos = getIdentsMembership(func->arguments->children[0], tables, aliases);
-            auto right_table_pos = getIdentsMembership(func->arguments->children[1], tables, aliases);
+            auto left_table_pos = IdentifierSemantic::getIdentsMembership(func->arguments->children[0], tables, aliases);
+            auto right_table_pos = IdentifierSemantic::getIdentsMembership(func->arguments->children[1], tables, aliases);
 
             /// Identifiers from different table move to JOIN ON
             if (left_table_pos && right_table_pos && *left_table_pos != *right_table_pos)
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index d446422124a..4fb44738d8d 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -52,11 +52,11 @@ void DDLLogEntry::assertVersion() const
                                                             "Maximum supported version is {}", version, max_version);
 }
 
-void DDLLogEntry::setSettingsIfRequired(const Context & context)
+void DDLLogEntry::setSettingsIfRequired(ContextPtr context)
 {
-    version = context.getSettingsRef().distributed_ddl_entry_format_version;
+    version = context->getSettingsRef().distributed_ddl_entry_format_version;
     if (version == 2)
-        settings.emplace(context.getSettingsRef().changes());
+        settings.emplace(context->getSettingsRef().changes());
 }
 
 String DDLLogEntry::toString() const
@@ -135,19 +135,19 @@ void DDLLogEntry::parse(const String & data)
 }
 
 
-void DDLTaskBase::parseQueryFromEntry(const Context & context)
+void DDLTaskBase::parseQueryFromEntry(ContextPtr context)
 {
     const char * begin = entry.query.data();
     const char * end = begin + entry.query.size();
 
     ParserQuery parser_query(end);
     String description;
-    query = parseQuery(parser_query, begin, end, description, 0, context.getSettingsRef().max_parser_depth);
+    query = parseQuery(parser_query, begin, end, description, 0, context->getSettingsRef().max_parser_depth);
 }
 
-std::unique_ptr<Context> DDLTaskBase::makeQueryContext(Context & from_context, const ZooKeeperPtr & /*zookeeper*/)
+ContextMutablePtr DDLTaskBase::makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & /*zookeeper*/)
 {
-    auto query_context = std::make_unique<Context>(from_context);
+    auto query_context = Context::createCopy(from_context);
     query_context->makeQueryContext();
     query_context->setCurrentQueryId(""); // generate random query_id
     query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
@@ -157,17 +157,17 @@ std::unique_ptr<Context> DDLTaskBase::makeQueryContext(Context & from_context, c
 }
 
 
-bool DDLTask::findCurrentHostID(const Context & global_context, Poco::Logger * log)
+bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log)
 {
     bool host_in_hostlist = false;
 
     for (const HostID & host : entry.hosts)
     {
-        auto maybe_secure_port = global_context.getTCPPortSecure();
+        auto maybe_secure_port = global_context->getTCPPortSecure();
 
         /// The port is considered local if it matches TCP or TCP secure port that the server is listening.
         bool is_local_port = (maybe_secure_port && host.isLocalAddress(*maybe_secure_port))
-                             || host.isLocalAddress(global_context.getTCPPort());
+                             || host.isLocalAddress(global_context->getTCPPort());
 
         if (!is_local_port)
             continue;
@@ -189,14 +189,14 @@ bool DDLTask::findCurrentHostID(const Context & global_context, Poco::Logger * l
     return host_in_hostlist;
 }
 
-void DDLTask::setClusterInfo(const Context & context, Poco::Logger * log)
+void DDLTask::setClusterInfo(ContextPtr context, Poco::Logger * log)
 {
     auto * query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query.get());
     if (!query_on_cluster)
         throw Exception("Received unknown DDL query", ErrorCodes::UNKNOWN_TYPE_OF_QUERY);
 
     cluster_name = query_on_cluster->cluster;
-    cluster = context.tryGetCluster(cluster_name);
+    cluster = context->tryGetCluster(cluster_name);
 
     if (!cluster)
         throw Exception(ErrorCodes::INCONSISTENT_CLUSTER_DEFINITION,
@@ -277,7 +277,7 @@ bool DDLTask::tryFindHostInCluster()
     return found_exact_match;
 }
 
-bool DDLTask::tryFindHostInClusterViaResolving(const Context & context)
+bool DDLTask::tryFindHostInClusterViaResolving(ContextPtr context)
 {
     const auto & shards = cluster->getShardsAddresses();
     bool found_via_resolving = false;
@@ -288,9 +288,9 @@ bool DDLTask::tryFindHostInClusterViaResolving(const Context & context)
         {
             const Cluster::Address & address = shards[shard_num][replica_num];
 
-            if (auto resolved = address.getResolvedAddress();
-                resolved && (isLocalAddress(*resolved, context.getTCPPort())
-                             || (context.getTCPPortSecure() && isLocalAddress(*resolved, *context.getTCPPortSecure()))))
+            if (auto resolved = address.getResolvedAddress(); resolved
+                && (isLocalAddress(*resolved, context->getTCPPort())
+                    || (context->getTCPPortSecure() && isLocalAddress(*resolved, *context->getTCPPortSecure()))))
             {
                 if (found_via_resolving)
                 {
@@ -344,7 +344,7 @@ String DatabaseReplicatedTask::getShardID() const
     return database->shard_name;
 }
 
-void DatabaseReplicatedTask::parseQueryFromEntry(const Context & context)
+void DatabaseReplicatedTask::parseQueryFromEntry(ContextPtr context)
 {
     DDLTaskBase::parseQueryFromEntry(context);
     if (auto * ddl_query = dynamic_cast<ASTQueryWithTableAndOutput *>(query.get()))
@@ -355,7 +355,7 @@ void DatabaseReplicatedTask::parseQueryFromEntry(const Context & context)
     }
 }
 
-std::unique_ptr<Context> DatabaseReplicatedTask::makeQueryContext(Context & from_context, const ZooKeeperPtr & zookeeper)
+ContextMutablePtr DatabaseReplicatedTask::makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper)
 {
     auto query_context = DDLTaskBase::makeQueryContext(from_context, zookeeper);
     query_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index a333bb1af45..703d691a358 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -1,7 +1,9 @@
 #pragma once
+
 #include <Core/Types.h>
 #include <Interpreters/Cluster.h>
 #include <Common/ZooKeeper/Types.h>
+#include <filesystem>
 
 namespace Poco
 {
@@ -13,6 +15,8 @@ namespace zkutil
 class ZooKeeper;
 }
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
@@ -63,7 +67,7 @@ struct DDLLogEntry
     String initiator; // optional
     std::optional<SettingsChanges> settings;
 
-    void setSettingsIfRequired(const Context & context);
+    void setSettingsIfRequired(ContextPtr context);
     String toString() const;
     void parse(const String & data);
     void assertVersion() const;
@@ -93,15 +97,15 @@ struct DDLTaskBase
     DDLTaskBase(const DDLTaskBase &) = delete;
     virtual ~DDLTaskBase() = default;
 
-    virtual void parseQueryFromEntry(const Context & context);
+    virtual void parseQueryFromEntry(ContextPtr context);
 
     virtual String getShardID() const = 0;
 
-    virtual std::unique_ptr<Context> makeQueryContext(Context & from_context, const ZooKeeperPtr & zookeeper);
+    virtual ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper);
 
-    inline String getActiveNodePath() const { return entry_path + "/active/" + host_id_str; }
-    inline String getFinishedNodePath() const { return entry_path + "/finished/" + host_id_str; }
-    inline String getShardNodePath() const { return entry_path + "/shards/" + getShardID(); }
+    inline String getActiveNodePath() const { return fs::path(entry_path) / "active" / host_id_str; }
+    inline String getFinishedNodePath() const { return fs::path(entry_path) / "finished" / host_id_str; }
+    inline String getShardNodePath() const { return fs::path(entry_path) / "shards" / getShardID(); }
 
     static String getLogEntryName(UInt32 log_entry_number);
     static UInt32 getLogEntryNumber(const String & log_entry_name);
@@ -111,22 +115,22 @@ struct DDLTask : public DDLTaskBase
 {
     DDLTask(const String & name, const String & path) : DDLTaskBase(name, path) {}
 
-    bool findCurrentHostID(const Context & global_context, Poco::Logger * log);
+    bool findCurrentHostID(ContextPtr global_context, Poco::Logger * log);
 
-    void setClusterInfo(const Context & context, Poco::Logger * log);
+    void setClusterInfo(ContextPtr context, Poco::Logger * log);
 
     String getShardID() const override;
 
 private:
     bool tryFindHostInCluster();
-    bool tryFindHostInClusterViaResolving(const Context & context);
+    bool tryFindHostInClusterViaResolving(ContextPtr context);
 
     HostID host_id;
     String cluster_name;
     ClusterPtr cluster;
     Cluster::Address address_in_cluster;
-    size_t host_shard_num;
-    size_t host_replica_num;
+    size_t host_shard_num = 0;
+    size_t host_replica_num = 0;
 };
 
 struct DatabaseReplicatedTask : public DDLTaskBase
@@ -134,8 +138,8 @@ struct DatabaseReplicatedTask : public DDLTaskBase
     DatabaseReplicatedTask(const String & name, const String & path, DatabaseReplicated * database_);
 
     String getShardID() const override;
-    void parseQueryFromEntry(const Context & context) override;
-    std::unique_ptr<Context> makeQueryContext(Context & from_context, const ZooKeeperPtr & zookeeper) override;
+    void parseQueryFromEntry(ContextPtr context) override;
+    ContextMutablePtr makeQueryContext(ContextPtr from_context, const ZooKeeperPtr & zookeeper) override;
 
     DatabaseReplicated * database;
 };
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index eceb48ae773..1c023f757f8 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -29,6 +29,7 @@
 #include <common/logger_useful.h>
 #include <random>
 #include <pcg_random.hpp>
+#include <ext/scope_guard_safe.h>
 
 namespace fs = std::filesystem;
 
@@ -148,9 +149,15 @@ std::unique_ptr<ZooKeeperLock> createSimpleZooKeeperLock(
 }
 
 
-DDLWorker::DDLWorker(int pool_size_, const std::string & zk_root_dir, const Context & context_, const Poco::Util::AbstractConfiguration * config, const String & prefix,
-                     const String & logger_name, const CurrentMetrics::Metric * max_entry_metric_)
-    : context(context_)
+DDLWorker::DDLWorker(
+    int pool_size_,
+    const std::string & zk_root_dir,
+    ContextPtr context_,
+    const Poco::Util::AbstractConfiguration * config,
+    const String & prefix,
+    const String & logger_name,
+    const CurrentMetrics::Metric * max_entry_metric_)
+    : context(Context::createCopy(context_))
     , log(&Poco::Logger::get(logger_name))
     , pool_size(pool_size_)
     , max_entry_metric(max_entry_metric_)
@@ -176,16 +183,16 @@ DDLWorker::DDLWorker(int pool_size_, const std::string & zk_root_dir, const Cont
         max_tasks_in_queue = std::max<UInt64>(1, config->getUInt64(prefix + ".max_tasks_in_queue", max_tasks_in_queue));
 
         if (config->has(prefix + ".profile"))
-            context.setSetting("profile", config->getString(prefix + ".profile"));
+            context->setSetting("profile", config->getString(prefix + ".profile"));
     }
 
-    if (context.getSettingsRef().readonly)
+    if (context->getSettingsRef().readonly)
     {
         LOG_WARNING(log, "Distributed DDL worker is run with readonly settings, it will not be able to execute DDL queries Set appropriate system_profile or distributed_ddl.profile to fix this.");
     }
 
     host_fqdn = getFQDNOrHostName();
-    host_fqdn_id = Cluster::Address::toString(host_fqdn, context.getTCPPort());
+    host_fqdn_id = Cluster::Address::toString(host_fqdn, context->getTCPPort());
 }
 
 void DDLWorker::startup()
@@ -224,7 +231,7 @@ ZooKeeperPtr DDLWorker::getAndSetZooKeeper()
     std::lock_guard lock(zookeeper_mutex);
 
     if (!current_zookeeper || current_zookeeper->expired())
-        current_zookeeper = context.getZooKeeper();
+        current_zookeeper = context->getZooKeeper();
 
     return current_zookeeper;
 }
@@ -365,7 +372,20 @@ void DDLWorker::scheduleTasks(bool reinitialized)
     }
 
     Strings queue_nodes = zookeeper->getChildren(queue_dir, nullptr, queue_updated_event);
+    size_t size_before_filtering = queue_nodes.size();
     filterAndSortQueueNodes(queue_nodes);
+    /// The following message is too verbose, but it can be useful too debug mysterious test failures in CI
+    LOG_TRACE(log, "scheduleTasks: initialized={}, size_before_filtering={}, queue_size={}, "
+                   "entries={}..{}, "
+                   "first_failed_task_name={}, current_tasks_size={},"
+                   "last_current_task={},"
+                   "last_skipped_entry_name={}",
+                   initialized, size_before_filtering, queue_nodes.size(),
+                   queue_nodes.empty() ? "none" : queue_nodes.front(), queue_nodes.empty() ? "none" : queue_nodes.back(),
+                   first_failed_task_name ? *first_failed_task_name : "none", current_tasks.size(),
+                   current_tasks.empty() ? "none" : current_tasks.back()->entry_name,
+                   last_skipped_entry_name ? *last_skipped_entry_name : "none");
+
     if (max_tasks_in_queue < queue_nodes.size())
         cleanup_event->set();
 
@@ -491,8 +511,8 @@ bool DDLWorker::tryExecuteQuery(const String & query, DDLTaskBase & task, const
     {
         auto query_context = task.makeQueryContext(context, zookeeper);
         if (!task.is_initial_query)
-            query_scope.emplace(*query_context);
-        executeQuery(istr, ostr, !task.is_initial_query, *query_context, {});
+            query_scope.emplace(query_context);
+        executeQuery(istr, ostr, !task.is_initial_query, query_context, {});
 
         if (auto txn = query_context->getZooKeeperMetadataTransaction())
         {
@@ -638,7 +658,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
                 if (!query_with_table->table.empty())
                 {
                     /// It's not CREATE DATABASE
-                    auto table_id = context.tryResolveStorageID(*query_with_table, Context::ResolveOrdinary);
+                    auto table_id = context->tryResolveStorageID(*query_with_table, Context::ResolveOrdinary);
                     storage = DatabaseCatalog::instance().tryGetTable(table_id, context);
                 }
 
@@ -820,7 +840,7 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
             zookeeper->set(tries_to_execute_path, toString(counter + 1));
 
             task.ops.push_back(create_shard_flag);
-            SCOPE_EXIT({ if (!executed_by_us && !task.ops.empty()) task.ops.pop_back(); });
+            SCOPE_EXIT_MEMORY({ if (!executed_by_us && !task.ops.empty()) task.ops.pop_back(); });
 
             /// If the leader will unexpectedly changed this method will return false
             /// and on the next iteration new leader will take lock
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index 4814f232ce2..45218226fee 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -42,7 +42,7 @@ class AccessRightsElements;
 class DDLWorker
 {
 public:
-    DDLWorker(int pool_size_, const std::string & zk_root_dir, const Context & context_, const Poco::Util::AbstractConfiguration * config, const String & prefix,
+    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);
     virtual ~DDLWorker();
 
@@ -110,8 +110,7 @@ protected:
     void runMainThread();
     void runCleanupThread();
 
-protected:
-    Context context;
+    ContextMutablePtr context;
     Poco::Logger * log;
 
     std::string host_fqdn;      /// current host domain name
diff --git a/src/Interpreters/DNSCacheUpdater.cpp b/src/Interpreters/DNSCacheUpdater.cpp
index 723945165e3..27d0c3abd92 100644
--- a/src/Interpreters/DNSCacheUpdater.cpp
+++ b/src/Interpreters/DNSCacheUpdater.cpp
@@ -1,15 +1,16 @@
 #include "DNSCacheUpdater.h"
-#include <Common/DNSResolver.h>
+
 #include <Interpreters/Context.h>
+#include <Common/DNSResolver.h>
 
 
 namespace DB
 {
 
-DNSCacheUpdater::DNSCacheUpdater(Context & context_, Int32 update_period_seconds_)
-    : context(context_),
-    update_period_seconds(update_period_seconds_),
-    pool(context_.getSchedulePool())
+DNSCacheUpdater::DNSCacheUpdater(ContextPtr context_, Int32 update_period_seconds_)
+    : WithContext(context_)
+    , update_period_seconds(update_period_seconds_)
+    , pool(getContext()->getSchedulePool())
 {
     task_handle = pool.createTask("DNSCacheUpdater", [this]{ run(); });
 }
@@ -24,7 +25,7 @@ void DNSCacheUpdater::run()
         LOG_INFO(&Poco::Logger::get("DNSCacheUpdater"), "IPs of some hosts have been changed. Will reload cluster config.");
         try
         {
-            context.reloadClusterConfig();
+            getContext()->reloadClusterConfig();
         }
         catch (...)
         {
diff --git a/src/Interpreters/DNSCacheUpdater.h b/src/Interpreters/DNSCacheUpdater.h
index 2cc0f9f0f21..bbbc2ab3d21 100644
--- a/src/Interpreters/DNSCacheUpdater.h
+++ b/src/Interpreters/DNSCacheUpdater.h
@@ -1,26 +1,24 @@
 #pragma once
 
 #include <Core/BackgroundSchedulePool.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/Stopwatch.h>
 
 
 namespace DB
 {
 
-class Context;
-
 /// Add a task to BackgroundProcessingPool that resolves all hosts and updates cache with constant period.
-class DNSCacheUpdater
+class DNSCacheUpdater : WithContext
 {
 public:
-    explicit DNSCacheUpdater(Context & context, Int32 update_period_seconds_);
+    DNSCacheUpdater(ContextPtr context, Int32 update_period_seconds_);
     ~DNSCacheUpdater();
     void start();
 
 private:
     void run();
 
-    Context & context;
     Int32 update_period_seconds;
 
     BackgroundSchedulePool & pool;
diff --git a/src/Interpreters/DatabaseAndTableWithAlias.h b/src/Interpreters/DatabaseAndTableWithAlias.h
index b889509c264..a4773ec435b 100644
--- a/src/Interpreters/DatabaseAndTableWithAlias.h
+++ b/src/Interpreters/DatabaseAndTableWithAlias.h
@@ -16,8 +16,6 @@ namespace DB
 class ASTSelectQuery;
 class ASTIdentifier;
 struct ASTTableExpression;
-class Context;
-
 
 /// Extracts database name (and/or alias) from table expression or identifier
 struct DatabaseAndTableWithAlias
@@ -28,9 +26,9 @@ struct DatabaseAndTableWithAlias
     UUID uuid = UUIDHelpers::Nil;
 
     DatabaseAndTableWithAlias() = default;
-    DatabaseAndTableWithAlias(const ASTPtr & identifier_node, const String & current_database = "");
-    DatabaseAndTableWithAlias(const ASTIdentifier & identifier, const String & current_database = "");
-    DatabaseAndTableWithAlias(const ASTTableExpression & table_expression, const String & current_database = "");
+    explicit DatabaseAndTableWithAlias(const ASTPtr & identifier_node, const String & current_database = "");
+    explicit DatabaseAndTableWithAlias(const ASTIdentifier & identifier, const String & current_database = "");
+    explicit DatabaseAndTableWithAlias(const ASTTableExpression & table_expression, const String & current_database = "");
 
     /// "alias." or "table." if alias is empty
     String getQualifiedNamePrefix(bool with_dot = true) const;
@@ -75,14 +73,14 @@ struct TableWithColumnNamesAndTypes
 
     void addMaterializedColumns(const NamesAndTypesList & addition)
     {
-        addAdditionalColumns(alias_columns, addition);
+        addAdditionalColumns(materialized_columns, addition);
     }
 
 private:
     void addAdditionalColumns(NamesAndTypesList & target, const NamesAndTypesList & addition)
     {
         target.insert(target.end(), addition.begin(), addition.end());
-        for (auto & col : addition)
+        for (const auto & col : addition)
             names.insert(col.name);
     }
 
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index f398074da09..a70cdb2e054 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -5,7 +5,6 @@
 #include <Databases/IDatabase.h>
 #include <Databases/DatabaseMemory.h>
 #include <Databases/DatabaseOnDisk.h>
-#include <Poco/File.h>
 #include <Common/quoteString.h>
 #include <Storages/StorageMemory.h>
 #include <Storages/LiveView/TemporaryLiveViewCleaner.h>
@@ -16,6 +15,9 @@
 #include <Common/renameat2.h>
 #include <Common/CurrentMetrics.h>
 #include <common/logger_useful.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <filesystem>
+#include <Common/filesystemHelpers.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
@@ -26,8 +28,7 @@
 #    include <Storages/StorageMaterializeMySQL.h>
 #endif
 
-#include <filesystem>
-
+namespace fs = std::filesystem;
 
 namespace CurrentMetrics
 {
@@ -48,15 +49,14 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-TemporaryTableHolder::TemporaryTableHolder(const Context & context_,
-                                           const TemporaryTableHolder::Creator & creator, const ASTPtr & query)
-    : global_context(context_.getGlobalContext())
+TemporaryTableHolder::TemporaryTableHolder(ContextPtr context_, const TemporaryTableHolder::Creator & creator, const ASTPtr & query)
+    : WithContext(context_->getGlobalContext())
     , temporary_tables(DatabaseCatalog::instance().getDatabaseForTemporaryTables().get())
 {
     ASTPtr original_create;
     ASTCreateQuery * create = dynamic_cast<ASTCreateQuery *>(query.get());
     String global_name;
-    if (query)
+    if (create)
     {
         original_create = create->clone();
         if (create->uuid == UUIDHelpers::Nil)
@@ -73,37 +73,34 @@ TemporaryTableHolder::TemporaryTableHolder(const Context & context_,
     }
     auto table_id = StorageID(DatabaseCatalog::TEMPORARY_DATABASE, global_name, id);
     auto table = creator(table_id);
-    temporary_tables->createTable(global_context, global_name, table, original_create);
+    temporary_tables->createTable(getContext(), global_name, table, original_create);
     table->startup();
 }
 
 
 TemporaryTableHolder::TemporaryTableHolder(
-    const Context & context_,
+    ContextPtr context_,
     const ColumnsDescription & columns,
     const ConstraintsDescription & constraints,
     const ASTPtr & query,
     bool create_for_global_subquery)
-    : TemporaryTableHolder
-      (
-          context_,
-          [&](const StorageID & table_id)
-          {
-              auto storage = StorageMemory::create(
-                      table_id, ColumnsDescription{columns}, ConstraintsDescription{constraints});
+    : TemporaryTableHolder(
+        context_,
+        [&](const StorageID & table_id)
+        {
+            auto storage = StorageMemory::create(table_id, ColumnsDescription{columns}, ConstraintsDescription{constraints}, String{});
 
-              if (create_for_global_subquery)
-                  storage->delayReadForGlobalSubqueries();
+            if (create_for_global_subquery)
+                storage->delayReadForGlobalSubqueries();
 
-              return storage;
-          },
-          query
-      )
+            return storage;
+        },
+        query)
 {
 }
 
 TemporaryTableHolder::TemporaryTableHolder(TemporaryTableHolder && rhs)
-        : global_context(rhs.global_context), temporary_tables(rhs.temporary_tables), id(rhs.id)
+        : WithContext(rhs.context), temporary_tables(rhs.temporary_tables), id(rhs.id)
 {
     rhs.id = UUIDHelpers::Nil;
 }
@@ -118,7 +115,7 @@ TemporaryTableHolder & TemporaryTableHolder::operator = (TemporaryTableHolder &&
 TemporaryTableHolder::~TemporaryTableHolder()
 {
     if (id != UUIDHelpers::Nil)
-        temporary_tables->dropTable(global_context, "_tmp_" + toString(id));
+        temporary_tables->dropTable(getContext(), "_tmp_" + toString(id));
 }
 
 StorageID TemporaryTableHolder::getGlobalTableID() const
@@ -128,22 +125,25 @@ StorageID TemporaryTableHolder::getGlobalTableID() const
 
 StoragePtr TemporaryTableHolder::getTable() const
 {
-    auto table = temporary_tables->tryGetTable("_tmp_" + toString(id), global_context);
+    auto table = temporary_tables->tryGetTable("_tmp_" + toString(id), getContext());
     if (!table)
         throw Exception("Temporary table " + getGlobalTableID().getNameForLogs() + " not found", ErrorCodes::LOGICAL_ERROR);
     return table;
 }
 
 
+void DatabaseCatalog::loadTemporaryDatabase()
+{
+    drop_delay_sec = getContext()->getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
+
+    auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, getContext());
+    attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
+}
+
 void DatabaseCatalog::loadDatabases()
 {
-    drop_delay_sec = global_context.getConfigRef().getInt("database_atomic_delay_before_drop_table_sec", default_drop_delay_sec);
-
-    auto db_for_temporary_and_external_tables = std::make_shared<DatabaseMemory>(TEMPORARY_DATABASE, global_context);
-    attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
-
     loadMarkedAsDroppedTables();
-    auto task_holder = global_context.getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
+    auto task_holder = getContext()->getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
     drop_task = std::make_unique<BackgroundSchedulePoolTaskHolder>(std::move(task_holder));
     (*drop_task)->activate();
     std::lock_guard lock{tables_marked_dropped_mutex};
@@ -152,7 +152,7 @@ void DatabaseCatalog::loadDatabases()
 
     /// Another background thread which drops temporary LiveViews.
     /// We should start it after loadMarkedAsDroppedTables() to avoid race condition.
-    TemporaryLiveViewCleaner::instance().startupIfNecessary();
+    TemporaryLiveViewCleaner::instance().startup();
 }
 
 void DatabaseCatalog::shutdownImpl()
@@ -212,7 +212,7 @@ DatabaseAndTable DatabaseCatalog::tryGetByUUID(const UUID & uuid) const
 
 DatabaseAndTable DatabaseCatalog::getTableImpl(
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context_,
     std::optional<Exception> * exception) const
 {
     if (!table_id)
@@ -268,7 +268,7 @@ DatabaseAndTable DatabaseCatalog::getTableImpl(
         database = it->second;
     }
 
-    auto table = database->tryGetTable(table_id.table_name, context);
+    auto table = database->tryGetTable(table_id.table_name, context_);
     if (!table && exception)
             exception->emplace(ErrorCodes::UNKNOWN_TABLE, "Table {} doesn't exist", table_id.getNameForLogs());
     if (!table)
@@ -351,13 +351,12 @@ DatabasePtr DatabaseCatalog::detachDatabase(const String & database_name, bool d
     if (drop)
     {
         /// Delete the database.
-        db->drop(global_context);
+        db->drop(getContext());
 
         /// Old ClickHouse versions did not store database.sql files
-        Poco::File database_metadata_file(
-                global_context.getPath() + "metadata/" + escapeForFileName(database_name) + ".sql");
-        if (database_metadata_file.exists())
-            database_metadata_file.remove(false);
+        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);
     }
 
     return db;
@@ -423,7 +422,7 @@ Databases DatabaseCatalog::getDatabases() const
     return databases;
 }
 
-bool DatabaseCatalog::isTableExist(const DB::StorageID & table_id, const Context & context) const
+bool DatabaseCatalog::isTableExist(const DB::StorageID & table_id, ContextPtr context_) const
 {
     if (table_id.hasUUID())
         return tryGetByUUID(table_id.uuid).second != nullptr;
@@ -435,12 +434,12 @@ bool DatabaseCatalog::isTableExist(const DB::StorageID & table_id, const Context
         if (iter != databases.end())
             db = iter->second;
     }
-    return db && db->isTableExist(table_id.table_name, context);
+    return db && db->isTableExist(table_id.table_name, context_);
 }
 
-void DatabaseCatalog::assertTableDoesntExist(const StorageID & table_id, const Context & context) const
+void DatabaseCatalog::assertTableDoesntExist(const StorageID & table_id, ContextPtr context_) const
 {
-    if (isTableExist(table_id, context))
+    if (isTableExist(table_id, context_))
         throw Exception("Table " + table_id.getNameForLogs() + " already exists.", ErrorCodes::TABLE_ALREADY_EXISTS);
 }
 
@@ -528,13 +527,13 @@ void DatabaseCatalog::updateUUIDMapping(const UUID & uuid, DatabasePtr database,
 
 std::unique_ptr<DatabaseCatalog> DatabaseCatalog::database_catalog;
 
-DatabaseCatalog::DatabaseCatalog(Context & global_context_)
-    : global_context(global_context_), log(&Poco::Logger::get("DatabaseCatalog"))
+DatabaseCatalog::DatabaseCatalog(ContextMutablePtr global_context_)
+    : WithMutableContext(global_context_), log(&Poco::Logger::get("DatabaseCatalog"))
 {
-    TemporaryLiveViewCleaner::init(global_context);
+    TemporaryLiveViewCleaner::init(global_context_);
 }
 
-DatabaseCatalog & DatabaseCatalog::init(Context & global_context_)
+DatabaseCatalog & DatabaseCatalog::init(ContextMutablePtr global_context_)
 {
     if (database_catalog)
     {
@@ -568,9 +567,9 @@ void DatabaseCatalog::shutdown()
     }
 }
 
-DatabasePtr DatabaseCatalog::getDatabase(const String & database_name, const Context & local_context) const
+DatabasePtr DatabaseCatalog::getDatabase(const String & database_name, ContextPtr local_context) const
 {
-    String resolved_database = local_context.resolveDatabase(database_name);
+    String resolved_database = local_context->resolveDatabase(database_name);
     return getDatabase(resolved_database);
 }
 
@@ -631,36 +630,38 @@ std::unique_lock<std::shared_mutex> DatabaseCatalog::getExclusiveDDLGuardForData
 
 bool DatabaseCatalog::isDictionaryExist(const StorageID & table_id) const
 {
-    auto db = tryGetDatabase(table_id.getDatabaseName());
-    return db && db->isDictionaryExist(table_id.getTableName());
+    auto storage = tryGetTable(table_id, getContext());
+    bool storage_is_dictionary = storage && storage->isDictionary();
+
+    return storage_is_dictionary;
 }
 
-StoragePtr DatabaseCatalog::getTable(const StorageID & table_id, const Context & context) const
+StoragePtr DatabaseCatalog::getTable(const StorageID & table_id, ContextPtr local_context) const
 {
     std::optional<Exception> exc;
-    auto res = getTableImpl(table_id, context, &exc);
+    auto res = getTableImpl(table_id, local_context, &exc);
     if (!res.second)
         throw Exception(*exc);
     return res.second;
 }
 
-StoragePtr DatabaseCatalog::tryGetTable(const StorageID & table_id, const Context & context) const
+StoragePtr DatabaseCatalog::tryGetTable(const StorageID & table_id, ContextPtr local_context) const
 {
-    return getTableImpl(table_id, context, nullptr).second;
+    return getTableImpl(table_id, local_context, nullptr).second;
 }
 
-DatabaseAndTable DatabaseCatalog::getDatabaseAndTable(const StorageID & table_id, const Context & context) const
+DatabaseAndTable DatabaseCatalog::getDatabaseAndTable(const StorageID & table_id, ContextPtr local_context) const
 {
     std::optional<Exception> exc;
-    auto res = getTableImpl(table_id, context, &exc);
+    auto res = getTableImpl(table_id, local_context, &exc);
     if (!res.second)
         throw Exception(*exc);
     return res;
 }
 
-DatabaseAndTable DatabaseCatalog::tryGetDatabaseAndTable(const StorageID & table_id, const Context & context) const
+DatabaseAndTable DatabaseCatalog::tryGetDatabaseAndTable(const StorageID & table_id, ContextPtr local_context) const
 {
-    return getTableImpl(table_id, context, nullptr);
+    return getTableImpl(table_id, local_context, nullptr);
 }
 
 void DatabaseCatalog::loadMarkedAsDroppedTables()
@@ -673,7 +674,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
     /// we should load them and enqueue cleanup to remove data from store/ and metadata from ZooKeeper
 
     std::map<String, StorageID> dropped_metadata;
-    String path = global_context.getPath() + "metadata_dropped/";
+    String path = getContext()->getPath() + "metadata_dropped/";
 
     if (!std::filesystem::exists(path))
     {
@@ -728,7 +729,7 @@ void DatabaseCatalog::loadMarkedAsDroppedTables()
 
 String DatabaseCatalog::getPathForDroppedMetadata(const StorageID & table_id) const
 {
-    return global_context.getPath() + "metadata_dropped/" +
+    return getContext()->getPath() + "metadata_dropped/" +
            escapeForFileName(table_id.getDatabaseName()) + "." +
            escapeForFileName(table_id.getTableName()) + "." +
            toString(table_id.uuid) + ".sql";
@@ -751,7 +752,8 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
     {
         /// Try load table from metadata to drop it correctly (e.g. remove metadata from zk or remove data from all volumes)
         LOG_INFO(log, "Trying load partially dropped table {} from {}", table_id.getNameForLogs(), dropped_metadata_path);
-        ASTPtr ast = DatabaseOnDisk::parseQueryFromMetadata(log, global_context, dropped_metadata_path, /*throw_on_error*/ false, /*remove_empty*/false);
+        ASTPtr ast = DatabaseOnDisk::parseQueryFromMetadata(
+            log, getContext(), dropped_metadata_path, /*throw_on_error*/ false, /*remove_empty*/ false);
         auto * create = typeid_cast<ASTCreateQuery *>(ast.get());
         assert(!create || create->uuid == table_id.uuid);
 
@@ -762,7 +764,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
             create->table = table_id.table_name;
             try
             {
-                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, global_context, false).second;
+                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, getContext(), false).second;
                 table->is_dropped = true;
             }
             catch (...)
@@ -780,7 +782,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
         }
 
         addUUIDMapping(table_id.uuid);
-        drop_time = Poco::File(dropped_metadata_path).getLastModified().epochTime();
+        drop_time = FS::getModificationTime(dropped_metadata_path);
     }
 
     std::lock_guard lock(tables_marked_dropped_mutex);
@@ -889,16 +891,15 @@ void DatabaseCatalog::dropTableFinally(const TableMarkedAsDropped & table)
 
     /// Even if table is not loaded, try remove its data from disk.
     /// TODO remove data from all volumes
-    String data_path = global_context.getPath() + "store/" + getPathForUUID(table.table_id.uuid);
-    Poco::File table_data_dir{data_path};
-    if (table_data_dir.exists())
+    fs::path data_path = fs::path(getContext()->getPath()) / "store" / getPathForUUID(table.table_id.uuid);
+    if (fs::exists(data_path))
     {
-        LOG_INFO(log, "Removing data directory {} of dropped table {}", data_path, table.table_id.getNameForLogs());
-        table_data_dir.remove(true);
+        LOG_INFO(log, "Removing data directory {} of dropped table {}", data_path.string(), table.table_id.getNameForLogs());
+        fs::remove_all(data_path);
     }
 
     LOG_INFO(log, "Removing metadata {} of dropped table {}", table.metadata_path, table.table_id.getNameForLogs());
-    Poco::File(table.metadata_path).remove();
+    fs::remove(fs::path(table.metadata_path));
 
     removeUUIDMappingFinally(table.table_id.uuid);
     CurrentMetrics::sub(CurrentMetrics::TablesToDropQueueSize, 1);
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index dad9846da0b..e20259fb973 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -1,25 +1,28 @@
 #pragma once
-#include <Storages/IStorage_fwd.h>
+
+#include <Core/UUID.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
 #include <Parsers/IAST_fwd.h>
-#include <Core/UUID.h>
-#include <Poco/Logger.h>
+#include <Storages/IStorage_fwd.h>
+
 #include <boost/noncopyable.hpp>
-#include <memory>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <mutex>
-#include <shared_mutex>
+#include <Poco/Logger.h>
+
 #include <array>
 #include <list>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <shared_mutex>
+#include <unordered_map>
+#include <unordered_set>
 
 
 namespace DB
 {
 
-class Context;
 class IDatabase;
 class Exception;
 class ColumnsDescription;
@@ -51,7 +54,12 @@ public:
     /// NOTE: using std::map here (and not std::unordered_map) to avoid iterator invalidation on insertion.
     using Map = std::map<String, Entry>;
 
-    DDLGuard(Map & map_, std::shared_mutex & db_mutex_, std::unique_lock<std::mutex> guards_lock_, const String & elem, const String & database_name);
+    DDLGuard(
+        Map & map_,
+        std::shared_mutex & db_mutex_,
+        std::unique_lock<std::mutex> guards_lock_,
+        const String & elem,
+        const String & database_name);
     ~DDLGuard();
 
     /// Unlocks table name, keeps holding read lock for database name
@@ -74,15 +82,15 @@ using DDLGuardPtr = std::unique_ptr<DDLGuard>;
 /// Such table can be accessed from everywhere by its ID.
 /// Removes the table from database on destruction.
 /// TemporaryTableHolder object can be attached to a query or session Context, so table will be accessible through the context.
-struct TemporaryTableHolder : boost::noncopyable
+struct TemporaryTableHolder : boost::noncopyable, WithContext
 {
-    typedef std::function<StoragePtr(const StorageID &)> Creator;
+    using Creator = std::function<StoragePtr (const StorageID &)>;
 
-    TemporaryTableHolder(const Context & context, const Creator & creator, const ASTPtr & query = {});
+    TemporaryTableHolder(ContextPtr context, const Creator & creator, const ASTPtr & query = {});
 
     /// Creates temporary table with Engine=Memory
     TemporaryTableHolder(
-        const Context & context,
+        ContextPtr context,
         const ColumnsDescription & columns,
         const ConstraintsDescription & constraints,
         const ASTPtr & query = {},
@@ -99,7 +107,6 @@ struct TemporaryTableHolder : boost::noncopyable
 
     operator bool () const { return id != UUIDHelpers::Nil; }
 
-    const Context & global_context;
     IDatabase * temporary_tables = nullptr;
     UUID id = UUIDHelpers::Nil;
 };
@@ -109,16 +116,18 @@ using TemporaryTablesMapping = std::map<String, std::shared_ptr<TemporaryTableHo
 
 class BackgroundSchedulePoolTaskHolder;
 
-class DatabaseCatalog : boost::noncopyable
+/// For some reason Context is required to get Storage from Database object
+class DatabaseCatalog : boost::noncopyable, WithMutableContext
 {
 public:
     static constexpr const char * TEMPORARY_DATABASE = "_temporary_and_external_tables";
     static constexpr const char * SYSTEM_DATABASE = "system";
 
-    static DatabaseCatalog & init(Context & global_context_);
+    static DatabaseCatalog & init(ContextMutablePtr global_context_);
     static DatabaseCatalog & instance();
     static void shutdown();
 
+    void loadTemporaryDatabase();
     void loadDatabases();
 
     /// Get an object that protects the table from concurrently executing multiple DDL operations.
@@ -146,19 +155,19 @@ public:
     Databases getDatabases() const;
 
     /// Same as getDatabase(const String & database_name), but if database_name is empty, current database of local_context is used
-    DatabasePtr getDatabase(const String & database_name, const Context & local_context) const;
+    DatabasePtr getDatabase(const String & database_name, ContextPtr local_context) const;
 
     /// For all of the following methods database_name in table_id must be not empty (even for temporary tables).
-    void assertTableDoesntExist(const StorageID & table_id, const Context & context) const;
-    bool isTableExist(const StorageID & table_id, const Context & context) const;
+    void assertTableDoesntExist(const StorageID & table_id, ContextPtr context) const;
+    bool isTableExist(const StorageID & table_id, ContextPtr context) const;
     bool isDictionaryExist(const StorageID & table_id) const;
 
-    StoragePtr getTable(const StorageID & table_id, const Context & context) const;
-    StoragePtr tryGetTable(const StorageID & table_id, const Context & context) const;
-    DatabaseAndTable getDatabaseAndTable(const StorageID & table_id, const Context & context) const;
-    DatabaseAndTable tryGetDatabaseAndTable(const StorageID & table_id, const Context & context) const;
+    StoragePtr getTable(const StorageID & table_id, ContextPtr context) const;
+    StoragePtr tryGetTable(const StorageID & table_id, ContextPtr context) const;
+    DatabaseAndTable getDatabaseAndTable(const StorageID & table_id, ContextPtr context) const;
+    DatabaseAndTable tryGetDatabaseAndTable(const StorageID & table_id, ContextPtr context) const;
     DatabaseAndTable getTableImpl(const StorageID & table_id,
-                                  const Context & context,
+                                  ContextPtr context,
                                   std::optional<Exception> * exception = nullptr) const;
 
     void addDependency(const StorageID & from, const StorageID & where);
@@ -200,7 +209,7 @@ private:
     // make emplace(global_context_) compile with private constructor ¯\_(ツ)_/¯.
     static std::unique_ptr<DatabaseCatalog> database_catalog;
 
-    DatabaseCatalog(Context & global_context_);
+    explicit DatabaseCatalog(ContextMutablePtr global_context_);
     void assertDatabaseExistsUnlocked(const String & database_name) const;
     void assertDatabaseDoesntExistUnlocked(const String & database_name) const;
 
@@ -216,9 +225,9 @@ private:
     static constexpr UInt64 bits_for_first_level = 4;
     using UUIDToStorageMap = std::array<UUIDToStorageMapPart, 1ull << bits_for_first_level>;
 
-    inline size_t getFirstLevelIdx(const UUID & uuid) const
+    static inline size_t getFirstLevelIdx(const UUID & uuid)
     {
-        return uuid.toUnderType().low >> (64 - bits_for_first_level);
+        return uuid.toUnderType().items[0] >> (64 - bits_for_first_level);
     }
 
     struct TableMarkedAsDropped
@@ -226,7 +235,7 @@ private:
         StorageID table_id = StorageID::createEmpty();
         StoragePtr table;
         String metadata_path;
-        time_t drop_time;
+        time_t drop_time{};
     };
     using TablesMarkedAsDropped = std::list<TableMarkedAsDropped>;
 
@@ -237,11 +246,8 @@ private:
     static constexpr size_t reschedule_time_ms = 100;
     static constexpr time_t drop_error_cooldown_sec = 5;
 
-private:
     using UUIDToDatabaseMap = std::unordered_map<UUID, DatabasePtr>;
 
-    /// For some reason Context is required to get Storage from Database object
-    Context & global_context;
     mutable std::mutex databases_mutex;
 
     ViewDependencies view_dependencies;
diff --git a/src/Interpreters/DictionaryReader.cpp b/src/Interpreters/DictionaryReader.cpp
index 1b503bd8313..fc795b9cdfb 100644
--- a/src/Interpreters/DictionaryReader.cpp
+++ b/src/Interpreters/DictionaryReader.cpp
@@ -44,7 +44,7 @@ DictionaryReader::FunctionWrapper::FunctionWrapper(FunctionOverloadResolverPtr r
 static constexpr const size_t key_size = 1;
 
 DictionaryReader::DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                                   const Context & context)
+                                   ContextPtr context)
     : result_header(makeResultBlock(result_columns))
     , key_position(key_size + result_header.columns())
 {
diff --git a/src/Interpreters/DictionaryReader.h b/src/Interpreters/DictionaryReader.h
index b49a15debb3..bfb21e2f050 100644
--- a/src/Interpreters/DictionaryReader.h
+++ b/src/Interpreters/DictionaryReader.h
@@ -3,12 +3,11 @@
 #include <Core/Block.h>
 #include <Columns/ColumnVector.h>
 #include <Functions/IFunctionAdaptors.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
-class Context;
-
 /// Read block of required columns from Dictionary by UInt64 key column. Rename columns if needed.
 /// Current implementation uses dictHas() + N * dictGet() functions.
 class DictionaryReader
@@ -35,7 +34,7 @@ public:
     };
 
     DictionaryReader(const String & dictionary_name, const Names & src_column_names, const NamesAndTypesList & result_columns,
-                     const Context & context);
+                     ContextPtr context);
     void readKeys(const IColumn & keys, Block & out_block, ColumnVector<UInt8>::Container & found, std::vector<size_t> & positions) const;
 
 private:
diff --git a/src/Interpreters/DuplicateOrderByVisitor.h b/src/Interpreters/DuplicateOrderByVisitor.h
index f5e5763c719..bd8652ff298 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.h
+++ b/src/Interpreters/DuplicateOrderByVisitor.h
@@ -21,7 +21,7 @@ class ASTFunctionStatefulData
 public:
     using TypeToVisit = ASTFunction;
 
-    const Context & context;
+    ContextConstPtr context;
     bool & is_stateful;
     void visit(ASTFunction & ast_function, ASTPtr &)
     {
@@ -80,7 +80,7 @@ class DuplicateOrderByData
 public:
     using TypeToVisit = ASTSelectQuery;
 
-    const Context & context;
+    ContextConstPtr context;
 
     void visit(ASTSelectQuery & select_query, ASTPtr &)
     {
@@ -93,7 +93,7 @@ public:
                     bool is_stateful = false;
                     ASTFunctionStatefulVisitor::Data data{context, is_stateful};
                     ASTFunctionStatefulVisitor(data).visit(elem);
-                    if (is_stateful)
+                    if (is_stateful) //-V547
                         return;
                 }
             }
diff --git a/src/Interpreters/EmbeddedDictionaries.cpp b/src/Interpreters/EmbeddedDictionaries.cpp
index 58b21fdda52..947768ad3d7 100644
--- a/src/Interpreters/EmbeddedDictionaries.cpp
+++ b/src/Interpreters/EmbeddedDictionaries.cpp
@@ -35,7 +35,7 @@ bool EmbeddedDictionaries::reloadDictionary(
     const bool throw_on_error,
     const bool force_reload)
 {
-    const auto & config = context.getConfigRef();
+    const auto & config = getContext()->getConfigRef();
 
     bool not_initialized = dictionary.get() == nullptr;
 
@@ -122,12 +122,12 @@ void EmbeddedDictionaries::reloadPeriodically()
 
 EmbeddedDictionaries::EmbeddedDictionaries(
     std::unique_ptr<GeoDictionariesLoader> geo_dictionaries_loader_,
-    Context & context_,
+    ContextPtr context_,
     const bool throw_on_error)
-    : log(&Poco::Logger::get("EmbeddedDictionaries"))
-    , context(context_)
+    : WithContext(context_)
+    , log(&Poco::Logger::get("EmbeddedDictionaries"))
     , geo_dictionaries_loader(std::move(geo_dictionaries_loader_))
-    , reload_period(context_.getConfigRef().getInt("builtin_dictionaries_reload_interval", 3600))
+    , reload_period(getContext()->getConfigRef().getInt("builtin_dictionaries_reload_interval", 3600))
 {
     reloadImpl(throw_on_error);
     reloading_thread = ThreadFromGlobalPool([this] { reloadPeriodically(); });
diff --git a/src/Interpreters/EmbeddedDictionaries.h b/src/Interpreters/EmbeddedDictionaries.h
index 69b21d4b39a..674b3a7f01e 100644
--- a/src/Interpreters/EmbeddedDictionaries.h
+++ b/src/Interpreters/EmbeddedDictionaries.h
@@ -1,10 +1,13 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+#include <Common/MultiVersion.h>
+#include <Common/ThreadPool.h>
+
+#include <Poco/Event.h>
+
 #include <thread>
 #include <functional>
-#include <Common/MultiVersion.h>
-#include <Common/ThreadPool.h>
-#include <Poco/Event.h>
 
 
 namespace Poco { class Logger; namespace Util { class AbstractConfiguration; } }
@@ -17,16 +20,12 @@ class GeoDictionariesLoader;
 namespace DB
 {
 
-class Context;
-
-
 /// Metrica's Dictionaries which can be used in functions.
 
-class EmbeddedDictionaries
+class EmbeddedDictionaries : WithContext
 {
 private:
     Poco::Logger * log;
-    Context & context;
 
     MultiVersion<RegionsHierarchies> regions_hierarchies;
     MultiVersion<RegionsNames> regions_names;
@@ -44,7 +43,7 @@ private:
     Poco::Event destroy;
 
 
-    void handleException(const bool throw_on_error) const;
+    void handleException(bool throw_on_error) const;
 
     /** Updates directories (dictionaries) every reload_period seconds.
      * If all dictionaries are not loaded at least once, try reload them with exponential delay (1, 2, ... reload_period).
@@ -53,7 +52,7 @@ private:
     void reloadPeriodically();
 
     /// Updates dictionaries.
-    bool reloadImpl(const bool throw_on_error, const bool force_reload = false);
+    bool reloadImpl(bool throw_on_error, bool force_reload = false);
 
     template <typename Dictionary>
     using DictionaryReloader = std::function<std::unique_ptr<Dictionary>(const Poco::Util::AbstractConfiguration & config)>;
@@ -62,15 +61,15 @@ private:
     bool reloadDictionary(
         MultiVersion<Dictionary> & dictionary,
         DictionaryReloader<Dictionary> reload_dictionary,
-        const bool throw_on_error,
-        const bool force_reload);
+        bool throw_on_error,
+        bool force_reload);
 
 public:
     /// Every reload_period seconds directories are updated inside a separate thread.
     EmbeddedDictionaries(
         std::unique_ptr<GeoDictionariesLoader> geo_dictionaries_loader,
-        Context & context,
-        const bool throw_on_error);
+        ContextPtr context,
+        bool throw_on_error);
 
     /// Forcibly reloads all dictionaries.
     void reload();
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index 94b3a5218b4..1c947e62e69 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -1,26 +1,22 @@
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTWithElement.h>
-
-#include <Interpreters/Context.h>
-#include <Interpreters/misc.h>
-#include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/ExecuteScalarSubqueriesVisitor.h>
-#include <Interpreters/addTypeConversionToAST.h>
 
+#include <Columns/ColumnTuple.h>
 #include <DataStreams/IBlockInputStream.h>
 #include <DataStreams/materializeBlock.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeTuple.h>
-
-#include <Columns/ColumnTuple.h>
-
 #include <IO/WriteHelpers.h>
-
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/addTypeConversionToAST.h>
+#include <Interpreters/misc.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTWithElement.h>
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 
 namespace DB
@@ -29,7 +25,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int INCORRECT_RESULT_OF_SCALAR_SUBQUERY;
-    extern const int TOO_MANY_ROWS;
 }
 
 
@@ -82,17 +77,17 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
     auto scalar_query_hash_str = toString(hash.first) + "_" + toString(hash.second);
 
     Block scalar;
-    if (data.context.hasQueryContext() && data.context.getQueryContext().hasScalar(scalar_query_hash_str))
-        scalar = data.context.getQueryContext().getScalar(scalar_query_hash_str);
+    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
     {
-        Context subquery_context = data.context;
-        Settings subquery_settings = data.context.getSettings();
+        auto subquery_context = Context::createCopy(data.getContext());
+        Settings subquery_settings = data.getContext()->getSettings();
         subquery_settings.max_result_rows = 1;
         subquery_settings.extremes = false;
-        subquery_context.setSettings(subquery_settings);
+        subquery_context->setSettings(subquery_settings);
 
         ASTPtr subquery_select = subquery.children.at(0);
 
@@ -120,36 +115,26 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
         {
             auto io = interpreter.execute();
 
-            try
+            PullingAsyncPipelineExecutor executor(io.pipeline);
+            while (block.rows() == 0 && executor.pull(block));
+
+            if (block.rows() == 0)
             {
-                PullingAsyncPipelineExecutor executor(io.pipeline);
-                while (block.rows() == 0 && executor.pull(block));
-
-                if (block.rows() == 0)
-                {
-                    /// Interpret subquery with empty result as Null literal
-                    auto ast_new = std::make_unique<ASTLiteral>(Null());
-                    ast_new->setAlias(ast->tryGetAlias());
-                    ast = std::move(ast_new);
-                    return;
-                }
-
-                if (block.rows() != 1)
-                    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));
-
-                if (tmp_block.rows() != 0)
-                    throw Exception("Scalar subquery returned more than one row", ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY);
-            }
-            catch (const Exception & e)
-            {
-                if (e.code() == ErrorCodes::TOO_MANY_ROWS)
-                    throw Exception("Scalar subquery returned more than one row", ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY);
-                else
-                    throw;
+                /// Interpret subquery with empty result as Null literal
+                auto ast_new = std::make_unique<ASTLiteral>(Null());
+                ast_new->setAlias(ast->tryGetAlias());
+                ast = std::move(ast_new);
+                return;
             }
+
+            if (block.rows() != 1)
+                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));
+
+            if (tmp_block.rows() != 0)
+                throw Exception("Scalar subquery returned more than one row", ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY);
         }
 
         block = materializeBlock(block);
@@ -167,10 +152,11 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
         }
     }
 
-    const Settings & settings = data.context.getSettingsRef();
+    const Settings & settings = data.getContext()->getSettingsRef();
 
     // Always convert to literals when there is no query context.
-    if (data.only_analyze || !settings.enable_scalar_subquery_optimization || worthConvertingToLiteral(scalar) || !data.context.hasQueryContext())
+    if (data.only_analyze || !settings.enable_scalar_subquery_optimization || worthConvertingToLiteral(scalar)
+        || !data.getContext()->hasQueryContext())
     {
         auto lit = std::make_unique<ASTLiteral>((*scalar.safeGetByPosition(0).column)[0]);
         lit->alias = subquery.alias;
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.h b/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
index 02949ad6d59..aa404f2c622 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <Common/typeid_cast.h>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
 
-class Context;
 class ASTSubquery;
 class ASTFunction;
 struct ASTTableExpression;
@@ -33,9 +33,8 @@ class ExecuteScalarSubqueriesMatcher
 public:
     using Visitor = InDepthNodeVisitor<ExecuteScalarSubqueriesMatcher, true>;
 
-    struct Data
+    struct Data : public WithConstContext
     {
-        const Context & context;
         size_t subquery_depth;
         Scalars & scalars;
         bool only_analyze;
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index aa250e800cb..bd06c753319 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -15,6 +15,7 @@
 #include <Columns/ColumnSet.h>
 #include <queue>
 #include <stack>
+#include <Common/JSONBuilder.h>
 
 #if defined(MEMORY_SANITIZER)
     #include <sanitizer/msan_interface.h>
@@ -50,7 +51,7 @@ ExpressionActions::ExpressionActions(ActionsDAGPtr actions_dag_, const Expressio
     actions_dag = actions_dag_->clone();
 
 #if USE_EMBEDDED_COMPILER
-    if (settings.compile_expressions)
+    if (settings.can_compile_expressions && settings.compile_expressions == CompileExpressions::yes)
         actions_dag->compileExpressions(settings.min_count_to_compile_expression);
 #endif
 
@@ -258,6 +259,29 @@ std::string ExpressionActions::Action::toString() const
     return out.str();
 }
 
+JSONBuilder::ItemPtr ExpressionActions::Action::toTree() const
+{
+    auto map = std::make_unique<JSONBuilder::JSONMap>();
+
+    if (node)
+        node->toTree(*map);
+
+    auto args = std::make_unique<JSONBuilder::JSONArray>();
+    auto dropped_args = std::make_unique<JSONBuilder::JSONArray>();
+    for (auto arg : arguments)
+    {
+        args->add(arg.pos);
+        if (!arg.needed_later)
+            dropped_args->add(arg.pos);
+    }
+
+    map->add("Arguments", std::move(args));
+    map->add("Removed Arguments", std::move(dropped_args));
+    map->add("Result", result_position);
+
+    return map;
+}
+
 void ExpressionActions::checkLimits(const ColumnsWithTypeAndName & columns) const
 {
     if (settings.max_temporary_non_const_columns)
@@ -297,7 +321,7 @@ namespace
         ColumnsWithTypeAndName & inputs;
         ColumnsWithTypeAndName columns = {};
         std::vector<ssize_t> inputs_pos = {};
-        size_t num_rows;
+        size_t num_rows = 0;
     };
 }
 
@@ -522,6 +546,10 @@ std::string ExpressionActions::getSmallestColumn(const NamesAndTypesList & colum
 
     for (const auto & column : columns)
     {
+        /// Skip .sizeX and similar meta information
+        if (!column.getSubcolumnName().empty())
+            continue;
+
         /// @todo resolve evil constant
         size_t size = column.type->haveMaximumSizeOfValue() ? column.type->getMaximumSizeOfValueInMemory() : 100;
 
@@ -563,6 +591,50 @@ std::string ExpressionActions::dumpActions() const
     return ss.str();
 }
 
+JSONBuilder::ItemPtr ExpressionActions::toTree() const
+{
+    auto inputs_array = std::make_unique<JSONBuilder::JSONArray>();
+
+    for (const auto & input_column : required_columns)
+    {
+        auto map = std::make_unique<JSONBuilder::JSONMap>();
+        map->add("Name", input_column.name);
+        if (input_column.type)
+            map->add("Type", input_column.type->getName());
+
+        inputs_array->add(std::move(map));
+    }
+
+    auto outputs_array = std::make_unique<JSONBuilder::JSONArray>();
+
+    for (const auto & output_column : sample_block)
+    {
+        auto map = std::make_unique<JSONBuilder::JSONMap>();
+        map->add("Name", output_column.name);
+        if (output_column.type)
+            map->add("Type", output_column.type->getName());
+
+        outputs_array->add(std::move(map));
+    }
+
+    auto actions_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (const auto & action : actions)
+        actions_array->add(action.toTree());
+
+    auto positions_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (auto pos : result_positions)
+        positions_array->add(pos);
+
+    auto map = std::make_unique<JSONBuilder::JSONMap>();
+    map->add("Inputs", std::move(inputs_array));
+    map->add("Actions", std::move(actions_array));
+    map->add("Outputs", std::move(outputs_array));
+    map->add("Positions", std::move(positions_array));
+    map->add("Project Input", actions_dag->isInputProjected());
+
+    return map;
+}
+
 bool ExpressionActions::checkColumnIsAlwaysFalse(const String & column_name) const
 {
     /// Check has column in (empty set).
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index 5d48ed84b7c..c446b339072 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -30,7 +30,6 @@ using ArrayJoinActionPtr = std::shared_ptr<ArrayJoinAction>;
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
-
 /// Sequence of actions on the block.
 /// Is used to calculate expressions.
 ///
@@ -58,6 +57,7 @@ public:
         size_t result_position;
 
         std::string toString() const;
+        JSONBuilder::ItemPtr toTree() const;
     };
 
     using Actions = std::vector<Action>;
@@ -108,6 +108,7 @@ public:
     const Block & getSampleBlock() const { return sample_block; }
 
     std::string dumpActions() const;
+    JSONBuilder::ItemPtr toTree() const;
 
     static std::string getSmallestColumn(const NamesAndTypesList & columns);
 
@@ -133,9 +134,9 @@ private:
   *     2) calculate the expression in the SELECT section,
   * and between the two steps do the filtering by value in the WHERE clause.
   */
-struct ExpressionActionsChain
+struct ExpressionActionsChain : WithContext
 {
-    explicit ExpressionActionsChain(const Context & context_) : context(context_) {}
+    explicit ExpressionActionsChain(ContextPtr context_) : WithContext(context_) {}
 
 
     struct Step
@@ -241,7 +242,6 @@ struct ExpressionActionsChain
     using StepPtr = std::unique_ptr<Step>;
     using Steps = std::vector<StepPtr>;
 
-    const Context & context;
     Steps steps;
 
     void addStep(NameSet non_constant_inputs = {});
diff --git a/src/Interpreters/ExpressionActionsSettings.cpp b/src/Interpreters/ExpressionActionsSettings.cpp
index e23a2a14cc7..550aa4d339c 100644
--- a/src/Interpreters/ExpressionActionsSettings.cpp
+++ b/src/Interpreters/ExpressionActionsSettings.cpp
@@ -1,24 +1,26 @@
 #include <Interpreters/ExpressionActionsSettings.h>
+
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
 
 namespace DB
 {
 
-ExpressionActionsSettings ExpressionActionsSettings::fromSettings(const Settings & from)
+ExpressionActionsSettings ExpressionActionsSettings::fromSettings(const Settings & from, CompileExpressions compile_expressions)
 {
     ExpressionActionsSettings settings;
-    settings.compile_expressions = from.compile_expressions;
+    settings.can_compile_expressions = from.compile_expressions;
     settings.min_count_to_compile_expression = from.min_count_to_compile_expression;
     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;
 
     return settings;
 }
 
-ExpressionActionsSettings ExpressionActionsSettings::fromContext(const Context & from)
+ExpressionActionsSettings ExpressionActionsSettings::fromContext(ContextPtr from, CompileExpressions compile_expressions)
 {
-    return fromSettings(from.getSettingsRef());
+    return fromSettings(from->getSettingsRef(), compile_expressions);
 }
 
 }
diff --git a/src/Interpreters/ExpressionActionsSettings.h b/src/Interpreters/ExpressionActionsSettings.h
index f424445e7a4..26532128805 100644
--- a/src/Interpreters/ExpressionActionsSettings.h
+++ b/src/Interpreters/ExpressionActionsSettings.h
@@ -1,23 +1,32 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 #include <cstddef>
 
 namespace DB
 {
 
 struct Settings;
-class Context;
+
+enum class CompileExpressions: uint8_t
+{
+    no = 0,
+    yes = 1,
+};
 
 struct ExpressionActionsSettings
 {
-    bool compile_expressions = false;
+    bool can_compile_expressions = false;
     size_t min_count_to_compile_expression = 0;
 
     size_t max_temporary_columns = 0;
     size_t max_temporary_non_const_columns = 0;
 
-    static ExpressionActionsSettings fromSettings(const Settings & from);
-    static ExpressionActionsSettings fromContext(const Context & from);
+    CompileExpressions compile_expressions = CompileExpressions::no;
+
+    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 4d2cebc9900..f7fdc87f0e9 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -26,6 +26,8 @@
 #include <Interpreters/DictionaryReader.h>
 #include <Interpreters/Context.h>
 
+#include <Processors/QueryPlan/ExpressionStep.h>
+
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 
@@ -119,20 +121,24 @@ bool sanitizeBlock(Block & block, bool throw_if_cannot_create_column)
     return true;
 }
 
+ExpressionAnalyzerData::~ExpressionAnalyzerData() = default;
+
 ExpressionAnalyzer::ExtractedSettings::ExtractedSettings(const Settings & settings_)
     : use_index_for_in_with_subqueries(settings_.use_index_for_in_with_subqueries)
     , size_limits_for_set(settings_.max_rows_in_set, settings_.max_bytes_in_set, settings_.set_overflow_mode)
 {}
 
+ExpressionAnalyzer::~ExpressionAnalyzer() = default;
 
 ExpressionAnalyzer::ExpressionAnalyzer(
     const ASTPtr & query_,
     const TreeRewriterResultPtr & syntax_analyzer_result_,
-    const Context & context_,
+    ContextPtr context_,
     size_t subquery_depth_,
     bool do_global,
     SubqueriesForSets subqueries_for_sets_)
-    : query(query_), context(context_), settings(context.getSettings())
+    : WithContext(context_)
+    , query(query_), settings(getContext()->getSettings())
     , subquery_depth(subquery_depth_)
     , syntax(syntax_analyzer_result_)
 {
@@ -292,7 +298,7 @@ void ExpressionAnalyzer::initGlobalSubqueriesAndExternalTables(bool do_global)
 {
     if (do_global)
     {
-        GlobalSubqueriesVisitor::Data subqueries_data(context, subquery_depth, isRemoteStorage(),
+        GlobalSubqueriesVisitor::Data subqueries_data(getContext(), subquery_depth, isRemoteStorage(),
                                                    external_tables, subqueries_for_sets, has_global_subqueries);
         GlobalSubqueriesVisitor(subqueries_data).visit(query);
     }
@@ -312,11 +318,11 @@ void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_
         return;
     }
 
-    auto interpreter_subquery = interpretSubquery(subquery_or_table_name, context, {}, query_options);
+    auto interpreter_subquery = interpretSubquery(subquery_or_table_name, getContext(), {}, query_options);
     auto io = interpreter_subquery->execute();
     PullingAsyncPipelineExecutor executor(io.pipeline);
 
-    SetPtr set = std::make_shared<Set>(settings.size_limits_for_set, true, context.getSettingsRef().transform_null_in);
+    SetPtr set = std::make_shared<Set>(settings.size_limits_for_set, true, getContext()->getSettingsRef().transform_null_in);
     set->setHeader(executor.getHeader());
 
     Block block;
@@ -340,8 +346,8 @@ SetPtr ExpressionAnalyzer::isPlainStorageSetInSubquery(const ASTPtr & subquery_o
     const auto * table = subquery_or_table_name->as<ASTIdentifier>();
     if (!table)
         return nullptr;
-    auto table_id = context.resolveStorageID(subquery_or_table_name);
-    const auto storage = DatabaseCatalog::instance().getTable(table_id, context);
+    auto table_id = getContext()->resolveStorageID(subquery_or_table_name);
+    const auto storage = DatabaseCatalog::instance().getTable(table_id, getContext());
     if (storage->getName() != "Set")
         return nullptr;
     const auto storage_set = std::dynamic_pointer_cast<StorageSet>(storage);
@@ -375,7 +381,7 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
         const IAST & args = *func->arguments;
         const ASTPtr & left_in_operand = args.children.at(0);
 
-        if (storage()->mayBenefitFromIndexForIn(left_in_operand, context, metadata_snapshot))
+        if (storage()->mayBenefitFromIndexForIn(left_in_operand, getContext(), metadata_snapshot))
         {
             const ASTPtr & arg = args.children.at(1);
             if (arg->as<ASTSubquery>() || arg->as<ASTIdentifier>())
@@ -389,7 +395,7 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
                 getRootActions(left_in_operand, true, temp_actions);
 
                 if (temp_actions->tryFindInIndex(left_in_operand->getColumnName()))
-                    makeExplicitSet(func, *temp_actions, true, context,
+                    makeExplicitSet(func, *temp_actions, true, getContext(),
                         settings.size_limits_for_set, prepared_sets);
             }
         }
@@ -400,7 +406,7 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
 void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_subqueries, ActionsDAGPtr & actions, bool only_consts)
 {
     LogAST log;
-    ActionsVisitor::Data visitor_data(context, settings.size_limits_for_set, subquery_depth,
+    ActionsVisitor::Data visitor_data(getContext(), settings.size_limits_for_set, subquery_depth,
                                    sourceColumns(), std::move(actions), prepared_sets, subqueries_for_sets,
                                    no_subqueries, false, only_consts, !isRemoteStorage());
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
@@ -411,7 +417,7 @@ void ExpressionAnalyzer::getRootActions(const ASTPtr & ast, bool no_subqueries,
 void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, bool no_subqueries, ActionsDAGPtr & actions, bool only_consts)
 {
     LogAST log;
-    ActionsVisitor::Data visitor_data(context, settings.size_limits_for_set, subquery_depth,
+    ActionsVisitor::Data visitor_data(getContext(), settings.size_limits_for_set, subquery_depth,
                                    sourceColumns(), std::move(actions), prepared_sets, subqueries_for_sets,
                                    no_subqueries, true, only_consts, !isRemoteStorage());
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
@@ -421,7 +427,7 @@ void ExpressionAnalyzer::getRootActionsNoMakeSet(const ASTPtr & ast, bool no_sub
 void ExpressionAnalyzer::getRootActionsForHaving(const ASTPtr & ast, bool no_subqueries, ActionsDAGPtr & actions, bool only_consts)
 {
     LogAST log;
-    ActionsVisitor::Data visitor_data(context, settings.size_limits_for_set, subquery_depth,
+    ActionsVisitor::Data visitor_data(getContext(), settings.size_limits_for_set, subquery_depth,
                                    sourceColumns(), std::move(actions), prepared_sets, subqueries_for_sets,
                                    no_subqueries, false, only_consts, true);
     ActionsVisitor(visitor_data, log.stream()).visit(ast);
@@ -468,10 +474,58 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
     return !aggregates().empty();
 }
 
-void makeWindowDescriptionFromAST(WindowDescription & desc, const IAST * ast)
+void makeWindowDescriptionFromAST(const WindowDescriptions & existing_descriptions,
+    WindowDescription & desc, const IAST * ast)
 {
     const auto & definition = ast->as<const ASTWindowDefinition &>();
 
+    if (!definition.parent_window_name.empty())
+    {
+        auto it = existing_descriptions.find(definition.parent_window_name);
+        if (it == existing_descriptions.end())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Window definition '{}' references an unknown window '{}'",
+                definition.formatForErrorMessage(),
+                definition.parent_window_name);
+        }
+
+        const auto & parent = it->second;
+        desc.partition_by = parent.partition_by;
+        desc.order_by = parent.order_by;
+        desc.frame = parent.frame;
+
+        // If an existing_window_name is specified it must refer to an earlier
+        // entry in the WINDOW list; the new window copies its partitioning clause
+        // from that entry, as well as its ordering clause if any. In this case
+        // the new window cannot specify its own PARTITION BY clause, and it can
+        // specify ORDER BY only if the copied window does not have one. The new
+        // window always uses its own frame clause; the copied window must not
+        // specify a frame clause.
+        // -- https://www.postgresql.org/docs/current/sql-select.html
+        if (definition.partition_by)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Derived window definition '{}' is not allowed to override PARTITION BY",
+                definition.formatForErrorMessage());
+        }
+
+        if (definition.order_by && !parent.order_by.empty())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Derived window definition '{}' is not allowed to override a non-empty ORDER BY",
+                definition.formatForErrorMessage());
+        }
+
+        if (!parent.frame.is_default)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Parent window '{}' is not allowed to define a frame: while processing derived window definition '{}'",
+                definition.parent_window_name,
+                definition.formatForErrorMessage());
+        }
+    }
+
     if (definition.partition_by)
     {
         for (const auto & column_ast : definition.partition_by->children)
@@ -532,7 +586,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
 {
     // Convenient to check here because at least we have the Context.
     if (!syntax->window_function_asts.empty() &&
-        !context.getSettingsRef().allow_experimental_window_functions)
+        !getContext()->getSettingsRef().allow_experimental_window_functions)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
             "The support for window functions is experimental and will change"
@@ -551,7 +605,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
             const auto & elem = ptr->as<const ASTWindowListElement &>();
             WindowDescription desc;
             desc.window_name = elem.name;
-            makeWindowDescriptionFromAST(desc, elem.definition.get());
+            makeWindowDescriptionFromAST(window_descriptions, desc, elem.definition.get());
 
             auto [it, inserted] = window_descriptions.insert(
                 {desc.window_name, desc});
@@ -636,7 +690,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
                 const ASTWindowDefinition &>();
             WindowDescription desc;
             desc.window_name = definition.getDefaultWindowName();
-            makeWindowDescriptionFromAST(desc, &definition);
+            makeWindowDescriptionFromAST(window_descriptions, desc, &definition);
 
             auto [it, inserted] = window_descriptions.insert(
                 {desc.window_name, desc});
@@ -685,7 +739,7 @@ ArrayJoinActionPtr ExpressionAnalyzer::addMultipleArrayJoinAction(ActionsDAGPtr
         result_columns.insert(result_source.first);
     }
 
-    return std::make_shared<ArrayJoinAction>(result_columns, array_join_is_left, context);
+    return std::make_shared<ArrayJoinAction>(result_columns, array_join_is_left, getContext());
 }
 
 ArrayJoinActionPtr SelectQueryExpressionAnalyzer::appendArrayJoin(ExpressionActionsChain & chain, ActionsDAGPtr & before_array_join, bool only_types)
@@ -745,21 +799,21 @@ static JoinPtr tryGetStorageJoin(std::shared_ptr<TableJoin> analyzed_join)
     return {};
 }
 
-static ExpressionActionsPtr createJoinedBlockActions(const Context & context, const TableJoin & analyzed_join)
+static ActionsDAGPtr createJoinedBlockActions(ContextPtr context, const TableJoin & analyzed_join)
 {
     ASTPtr expression_list = analyzed_join.rightKeysList();
     auto syntax_result = TreeRewriter(context).analyze(expression_list, analyzed_join.columnsFromJoinedTable());
-    return ExpressionAnalyzer(expression_list, syntax_result, context).getActions(true, false);
+    return ExpressionAnalyzer(expression_list, syntax_result, context).getActionsDAG(true, false);
 }
 
-static bool allowDictJoin(StoragePtr joined_storage, const Context & context, String & dict_name, String & key_name)
+static bool allowDictJoin(StoragePtr joined_storage, ContextPtr context, String & dict_name, String & key_name)
 {
-    const auto * dict = dynamic_cast<const StorageDictionary *>(joined_storage.get());
-    if (!dict)
+    if (!joined_storage->isDictionary())
         return false;
 
-    dict_name = dict->dictionaryName();
-    auto dictionary = context.getExternalDictionariesLoader().getDictionary(dict_name, context);
+    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;
 
@@ -772,7 +826,7 @@ static bool allowDictJoin(StoragePtr joined_storage, const Context & context, St
     return false;
 }
 
-static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join, const Block & sample_block, const Context & context)
+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();
 
@@ -801,67 +855,77 @@ JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(
     const ASTTablesInSelectQueryElement & join_element, const ColumnsWithTypeAndName & left_sample_columns)
 {
     /// Two JOINs are not supported with the same subquery, but different USINGs.
-    auto join_hash = join_element.getTreeHash();
-    String join_subquery_id = toString(join_hash.first) + "_" + toString(join_hash.second);
 
-    SubqueryForSet & subquery_for_join = subqueries_for_sets[join_subquery_id];
+    if (joined_plan)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table join was already created for query");
 
     /// Use StorageJoin if any.
-    if (!subquery_for_join.join)
-        subquery_for_join.join = tryGetStorageJoin(syntax->analyzed_join);
+    JoinPtr join = tryGetStorageJoin(syntax->analyzed_join);
 
-    if (!subquery_for_join.join)
+    if (!join)
     {
         /// Actions which need to be calculated on joined block.
-        ExpressionActionsPtr joined_block_actions = createJoinedBlockActions(context, analyzedJoin());
+        auto joined_block_actions = createJoinedBlockActions(getContext(), analyzedJoin());
 
         Names original_right_columns;
-        if (!subquery_for_join.source)
+
+        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);
+
         {
-            NamesWithAliases required_columns_with_aliases = analyzedJoin().getRequiredColumns(
-                joined_block_actions->getSampleBlock(), joined_block_actions->getRequiredColumns());
-            for (auto & pr : required_columns_with_aliases)
-                original_right_columns.push_back(pr.first);
+            joined_plan = std::make_unique<QueryPlan>();
+            interpreter->buildQueryPlan(*joined_plan);
 
-            /** 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, context, original_right_columns, query_options);
+            auto sample_block = interpreter->getSampleBlock();
 
-            subquery_for_join.makeSource(interpreter, std::move(required_columns_with_aliases));
+            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));
         }
 
-        /// TODO You do not need to set this up when JOIN is only needed on remote servers.
-        subquery_for_join.addJoinActions(joined_block_actions); /// changes subquery_for_join.sample_block inside
+        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 = subquery_for_join.sample_block.getColumnsWithTypeAndName();
+        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)
-            subquery_for_join.addJoinActions(std::make_shared<ExpressionActions>(
-                syntax->analyzed_join->rightConvertingActions(),
-                ExpressionActionsSettings::fromContext(context)));
+        {
+            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));
+        }
 
-        subquery_for_join.join = makeJoin(syntax->analyzed_join, subquery_for_join.sample_block, context);
+        join = makeJoin(syntax->analyzed_join, joined_plan->getCurrentDataStream().header, getContext());
 
         /// Do not make subquery for join over dictionary.
         if (syntax->analyzed_join->dictionary_reader)
-        {
-            JoinPtr join = subquery_for_join.join;
-            subqueries_for_sets.erase(join_subquery_id);
-            return join;
-        }
+            joined_plan.reset();
     }
     else
-    {
-        const ColumnsWithTypeAndName & right_sample_columns = subquery_for_join.sample_block.getColumnsWithTypeAndName();
-        bool need_convert = syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, right_sample_columns);
-        if (need_convert)
-            subquery_for_join.addJoinActions(std::make_shared<ExpressionActions>(syntax->analyzed_join->rightConvertingActions()));
-    }
+        syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, {});
 
-    return subquery_for_join.join;
+    return join;
 }
 
 ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
@@ -893,8 +957,8 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
         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});
-        auto tmp_actions = std::make_shared<ExpressionActions>(tmp_actions_dag, ExpressionActionsSettings::fromContext(context));
-        auto required_columns = tmp_actions->getRequiredColumns();
+
+        auto required_columns = tmp_actions_dag->getRequiredColumnsNames();
         NameSet required_source_columns(required_columns.begin(), required_columns.end());
         required_source_columns.insert(first_action_names.begin(), first_action_names.end());
 
@@ -1011,7 +1075,8 @@ bool SelectQueryExpressionAnalyzer::appendGroupBy(ExpressionActionsChain & chain
         {
             auto actions_dag = std::make_shared<ActionsDAG>(columns_after_join);
             getRootActions(child, only_types, actions_dag);
-            group_by_elements_actions.emplace_back(std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(context)));
+            group_by_elements_actions.emplace_back(
+                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes)));
         }
     }
 
@@ -1170,7 +1235,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChai
             auto actions_dag = std::make_shared<ActionsDAG>(columns_after_join);
             getRootActions(child, only_types, actions_dag);
             order_by_elements_actions.emplace_back(
-                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(context)));
+                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes)));
         }
     }
 
@@ -1328,23 +1393,28 @@ ActionsDAGPtr ExpressionAnalyzer::getActionsDAG(bool add_aliases, bool project_r
     return actions_dag;
 }
 
-ExpressionActionsPtr ExpressionAnalyzer::getActions(bool add_aliases, bool project_result)
+ExpressionActionsPtr ExpressionAnalyzer::getActions(bool add_aliases, bool project_result, CompileExpressions compile_expressions)
 {
-    return std::make_shared<ExpressionActions>(getActionsDAG(add_aliases, project_result), ExpressionActionsSettings::fromContext(context));
+    return std::make_shared<ExpressionActions>(
+        getActionsDAG(add_aliases, project_result), ExpressionActionsSettings::fromContext(getContext(), compile_expressions));
 }
 
-
 ExpressionActionsPtr ExpressionAnalyzer::getConstActions(const ColumnsWithTypeAndName & constant_inputs)
 {
     auto actions = std::make_shared<ActionsDAG>(constant_inputs);
 
     getRootActions(query, true, actions, true);
-    return std::make_shared<ExpressionActions>(actions, ExpressionActionsSettings::fromContext(context));
+    return std::make_shared<ExpressionActions>(actions, ExpressionActionsSettings::fromContext(getContext()));
+}
+
+std::unique_ptr<QueryPlan> SelectQueryExpressionAnalyzer::getJoinedPlan()
+{
+    return std::move(joined_plan);
 }
 
 ActionsDAGPtr SelectQueryExpressionAnalyzer::simpleSelectActions()
 {
-    ExpressionActionsChain new_chain(context);
+    ExpressionActionsChain new_chain(getContext());
     appendSelect(new_chain, false);
     return new_chain.getLastActions();
 }
@@ -1371,8 +1441,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         */
 
     const ASTSelectQuery & query = *query_analyzer.getSelectQuery();
-    const Context & context = query_analyzer.context;
-    const Settings & settings = context.getSettingsRef();
+    auto context = query_analyzer.getContext();
+    const Settings & settings = context->getSettingsRef();
     const ConstStoragePtr & storage = query_analyzer.storage();
 
     bool finalized = false;
@@ -1432,7 +1502,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                 {
                     ExpressionActions(
                         prewhere_info->prewhere_actions,
-                        ExpressionActionsSettings::fromSettings(context.getSettingsRef())).execute(before_prewhere_sample);
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_prewhere_sample);
                     auto & column_elem = before_prewhere_sample.getByName(query.prewhere()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
@@ -1467,7 +1537,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                 {
                     ExpressionActions(
                         before_where,
-                        ExpressionActionsSettings::fromSettings(context.getSettingsRef())).execute(before_where_sample);
+                        ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_where_sample);
                     auto & column_elem = before_where_sample.getByName(query.where()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
@@ -1481,7 +1551,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         {
             /// TODO correct conditions
             optimize_aggregation_in_order =
-                    context.getSettingsRef().optimize_aggregation_in_order
+                    context->getSettingsRef().optimize_aggregation_in_order
                     && storage && query.groupBy();
 
             query_analyzer.appendGroupBy(chain, only_types || !first_stage, optimize_aggregation_in_order, group_by_elements_actions);
@@ -1507,7 +1577,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
         optimize_read_in_order =
             settings.optimize_read_in_order
-            && storage && query.orderBy()
+            && storage
+            && query.orderBy()
             && !query_analyzer.hasAggregation()
             && !query_analyzer.hasWindow()
             && !query.final()
@@ -1614,7 +1685,7 @@ void ExpressionAnalysisResult::finalize(const ExpressionActionsChain & chain, si
 
     if (hasWhere())
     {
-        auto where_column_name = query.where()->getColumnName();
+        where_column_name = query.where()->getColumnName();
         remove_where_filter = chain.steps.at(where_step_num)->required_output.find(where_column_name)->second;
     }
 }
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index 58893091882..e9abf2db033 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -16,7 +16,6 @@ namespace DB
 {
 
 class Block;
-class Context;
 struct Settings;
 
 struct ExpressionActionsChain;
@@ -48,9 +47,13 @@ bool sanitizeBlock(Block & block, bool throw_if_cannot_create_column = false);
 /// ExpressionAnalyzer sources, intermediates and results. It splits data and logic, allows to test them separately.
 struct ExpressionAnalyzerData
 {
+    ~ExpressionAnalyzerData();
+
     SubqueriesForSets subqueries_for_sets;
     PreparedSets prepared_sets;
 
+    std::unique_ptr<QueryPlan> joined_plan;
+
     /// Columns after ARRAY JOIN. If there is no ARRAY JOIN, it's source_columns.
     NamesAndTypesList columns_after_array_join;
     /// Columns after Columns after ARRAY JOIN and JOIN. If there is no JOIN, it's columns_after_array_join.
@@ -78,7 +81,7 @@ struct ExpressionAnalyzerData
   *
   * NOTE: if `ast` is a SELECT query from a table, the structure of this table should not change during the lifetime of ExpressionAnalyzer.
   */
-class ExpressionAnalyzer : protected ExpressionAnalyzerData, private boost::noncopyable
+class ExpressionAnalyzer : protected ExpressionAnalyzerData, private boost::noncopyable, protected WithContext
 {
 private:
     /// Extracts settings to enlight which are used (and avoid copy of others).
@@ -96,10 +99,12 @@ public:
     ExpressionAnalyzer(
         const ASTPtr & query_,
         const TreeRewriterResultPtr & syntax_analyzer_result_,
-        const Context & context_)
+        ContextPtr context_)
     :   ExpressionAnalyzer(query_, syntax_analyzer_result_, context_, 0, false, {})
     {}
 
+    ~ExpressionAnalyzer();
+
     void appendExpression(ExpressionActionsChain & chain, const ASTPtr & expr, bool only_types);
 
     /// If `ast` is not a SELECT query, just gets all the actions to evaluate the expression.
@@ -107,7 +112,7 @@ public:
     ///     If also project_result, than only aliases remain in the output block.
     /// Otherwise, only temporary columns will be deleted from the block.
     ActionsDAGPtr getActionsDAG(bool add_aliases, bool project_result = true);
-    ExpressionActionsPtr getActions(bool add_aliases, bool project_result = true);
+    ExpressionActionsPtr getActions(bool add_aliases, bool project_result = true, CompileExpressions compile_expressions = CompileExpressions::no);
 
     /// Actions that can be performed on an empty block: adding constants and applying functions that depend only on constants.
     /// Does not execute subqueries.
@@ -145,13 +150,12 @@ protected:
     ExpressionAnalyzer(
         const ASTPtr & query_,
         const TreeRewriterResultPtr & syntax_analyzer_result_,
-        const Context & context_,
+        ContextPtr context_,
         size_t subquery_depth_,
         bool do_global_,
         SubqueriesForSets subqueries_for_sets_);
 
     ASTPtr query;
-    const Context & context;
     const ExtractedSettings settings;
     size_t subquery_depth;
 
@@ -205,6 +209,7 @@ struct ExpressionAnalysisResult
     bool has_order_by   = false;
     bool has_window = false;
 
+    String where_column_name;
     bool remove_where_filter = false;
     bool optimize_read_in_order = false;
     bool optimize_aggregation_in_order = false;
@@ -227,6 +232,9 @@ struct ExpressionAnalysisResult
     /// perform SELECT DISTINCT.
     Names selected_columns;
 
+    /// Columns to read from storage if any.
+    Names required_columns;
+
     /// Columns will be removed after prewhere actions execution.
     NameSet columns_to_remove_after_prewhere;
 
@@ -272,7 +280,7 @@ public:
     SelectQueryExpressionAnalyzer(
         const ASTPtr & query_,
         const TreeRewriterResultPtr & syntax_analyzer_result_,
-        const Context & context_,
+        ContextPtr context_,
         const StorageMetadataPtr & metadata_snapshot_,
         const NameSet & required_result_columns_ = {},
         bool do_global_ = false,
@@ -295,6 +303,7 @@ public:
     const AggregateDescriptions & aggregates() const { return aggregate_descriptions; }
 
     const PreparedSets & getPreparedSets() const { return prepared_sets; }
+    std::unique_ptr<QueryPlan> getJoinedPlan();
 
     /// Tables that will need to be sent to remote servers for distributed query processing.
     const TemporaryTablesMapping & getExternalTables() const { return external_tables; }
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 522141d243f..b9fb1ae89d8 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -3,63 +3,24 @@
 #if USE_EMBEDDED_COMPILER
 
 #include <optional>
+#include <stack>
 
+#include <common/logger_useful.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnVector.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <Common/ProfileEvents.h>
-#include <Common/Stopwatch.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionsComparison.h>
 #include <DataTypes/Native.h>
 #include <Functions/IFunctionAdaptors.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-
-#include <llvm/Analysis/TargetTransformInfo.h>
-#include <llvm/IR/BasicBlock.h>
-#include <llvm/IR/DataLayout.h>
-#include <llvm/IR/DerivedTypes.h>
-#include <llvm/IR/Function.h>
-#include <llvm/IR/IRBuilder.h>
-#include <llvm/IR/LLVMContext.h>
-#include <llvm/IR/Mangler.h>
-#include <llvm/IR/Module.h>
-#include <llvm/IR/Type.h>
-#include <llvm/IR/LegacyPassManager.h>
-#include <llvm/ExecutionEngine/ExecutionEngine.h>
-#include <llvm/ExecutionEngine/JITSymbol.h>
-#include <llvm/ExecutionEngine/SectionMemoryManager.h>
-#include <llvm/ExecutionEngine/Orc/CompileUtils.h>
-#include <llvm/ExecutionEngine/Orc/IRCompileLayer.h>
-#include <llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h>
-#include <llvm/Target/TargetMachine.h>
-#include <llvm/MC/SubtargetFeature.h>
-#include <llvm/Support/DynamicLibrary.h>
-#include <llvm/Support/Host.h>
-#include <llvm/Support/TargetRegistry.h>
-#include <llvm/Support/TargetSelect.h>
-#include <llvm/Transforms/IPO/PassManagerBuilder.h>
-
-#pragma GCC diagnostic pop
-
-/// 'LegacyRTDyldObjectLinkingLayer' is deprecated: ORCv1 layers (layers with the 'Legacy' prefix) are deprecated. Please use ORCv2
-/// 'LegacyIRCompileLayer' is deprecated: ORCv1 layers (layers with the 'Legacy' prefix) are deprecated. Please use the ORCv2 IRCompileLayer instead
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-
-namespace ProfileEvents
-{
-    extern const Event CompileFunction;
-    extern const Event CompileExpressionsMicroseconds;
-    extern const Event CompileExpressionsBytes;
-}
+#include <Interpreters/JIT/CHJIT.h>
+#include <Interpreters/JIT/CompileDAG.h>
+#include <Interpreters/JIT/compileFunction.h>
+#include <Interpreters/ActionsDAG.h>
 
 namespace DB
 {
@@ -67,207 +28,51 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int CANNOT_COMPILE_CODE;
 }
 
-namespace
+static CHJIT & getJITInstance()
 {
-    struct ColumnData
-    {
-        const char * data = nullptr;
-        const char * null = nullptr;
-        size_t stride = 0;
-    };
-
-    struct ColumnDataPlaceholder
-    {
-        llvm::Value * data_init; /// first row
-        llvm::Value * null_init;
-        llvm::Value * stride;
-        llvm::PHINode * data; /// current row
-        llvm::PHINode * null;
-    };
+    static CHJIT jit;
+    return jit;
 }
 
-static ColumnData getColumnData(const IColumn * column)
+static Poco::Logger * getLogger()
 {
-    ColumnData result;
-    const bool is_const = isColumnConst(*column);
-    if (is_const)
-        column = &reinterpret_cast<const ColumnConst *>(column)->getDataColumn();
-    if (const auto * nullable = typeid_cast<const ColumnNullable *>(column))
-    {
-        result.null = nullable->getNullMapColumn().getRawData().data;
-        column = &nullable->getNestedColumn();
-    }
-    result.data = column->getRawData().data;
-    result.stride = is_const ? 0 : column->sizeOfValueIfFixed();
-    return result;
+    static Poco::Logger & logger = Poco::Logger::get("ExpressionJIT");
+    return &logger;
 }
 
-static void applyFunction(IFunctionBase & function, Field & value)
+class CompiledFunction
 {
-    const auto & type = function.getArgumentTypes().at(0);
-    ColumnsWithTypeAndName args{{type->createColumnConst(1, value), type, "x" }};
-    auto col = function.execute(args, function.getResultType(), 1);
-    col->get(0, value);
-}
-
-static llvm::TargetMachine * getNativeMachine()
-{
-    std::string error;
-    auto cpu = llvm::sys::getHostCPUName();
-    auto triple = llvm::sys::getProcessTriple();
-    const auto * target = llvm::TargetRegistry::lookupTarget(triple, error);
-    if (!target)
-        throw Exception("Could not initialize native target: " + error, ErrorCodes::CANNOT_COMPILE_CODE);
-    llvm::SubtargetFeatures features;
-    llvm::StringMap<bool> feature_map;
-    if (llvm::sys::getHostCPUFeatures(feature_map))
-        for (auto & f : feature_map)
-            features.AddFeature(f.first(), f.second);
-    llvm::TargetOptions options;
-    return target->createTargetMachine(
-        triple, cpu, features.getString(), options, llvm::None,
-        llvm::None, llvm::CodeGenOpt::Default, /*jit=*/true
-    );
-}
-
-
-struct SymbolResolver : public llvm::orc::SymbolResolver
-{
-    llvm::LegacyJITSymbolResolver & impl;
-
-    explicit SymbolResolver(llvm::LegacyJITSymbolResolver & impl_) : impl(impl_) {}
-
-    llvm::orc::SymbolNameSet getResponsibilitySet(const llvm::orc::SymbolNameSet & symbols) final
-    {
-        return symbols;
-    }
-
-    llvm::orc::SymbolNameSet lookup(std::shared_ptr<llvm::orc::AsynchronousSymbolQuery> query, llvm::orc::SymbolNameSet symbols) final
-    {
-        llvm::orc::SymbolNameSet missing;
-        for (const auto & symbol : symbols)
-        {
-            bool has_resolved = false;
-            impl.lookup({*symbol}, [&](llvm::Expected<llvm::JITSymbolResolver::LookupResult> resolved)
-            {
-                if (resolved && !resolved->empty())
-                {
-                    query->notifySymbolMetRequiredState(symbol, resolved->begin()->second);
-                    has_resolved = true;
-                }
-            });
-
-            if (!has_resolved)
-                missing.insert(symbol);
-        }
-        return missing;
-    }
-};
-
-
-struct LLVMContext
-{
-    std::shared_ptr<llvm::LLVMContext> context {std::make_shared<llvm::LLVMContext>()};
-    std::unique_ptr<llvm::Module> module {std::make_unique<llvm::Module>("jit", *context)};
-    std::unique_ptr<llvm::TargetMachine> machine {getNativeMachine()};
-    llvm::DataLayout layout {machine->createDataLayout()};
-    llvm::IRBuilder<> builder {*context};
-
-    llvm::orc::ExecutionSession execution_session;
-
-    std::shared_ptr<llvm::SectionMemoryManager> memory_manager;
-    llvm::orc::LegacyRTDyldObjectLinkingLayer object_layer;
-    llvm::orc::LegacyIRCompileLayer<decltype(object_layer), llvm::orc::SimpleCompiler> compile_layer;
-
-    std::unordered_map<std::string, void *> symbols;
-
-    LLVMContext()
-        : memory_manager(std::make_shared<llvm::SectionMemoryManager>())
-        , object_layer(execution_session, [this](llvm::orc::VModuleKey)
-        {
-            return llvm::orc::LegacyRTDyldObjectLinkingLayer::Resources{memory_manager, std::make_shared<SymbolResolver>(*memory_manager)};
-        })
-        , compile_layer(object_layer, llvm::orc::SimpleCompiler(*machine))
-    {
-        module->setDataLayout(layout);
-        module->setTargetTriple(machine->getTargetTriple().getTriple());
-    }
-
-    /// returns used memory
-    void compileAllFunctionsToNativeCode()
-    {
-        if (module->empty())
-            return;
-        llvm::PassManagerBuilder pass_manager_builder;
-        llvm::legacy::PassManager mpm;
-        llvm::legacy::FunctionPassManager fpm(module.get());
-        pass_manager_builder.OptLevel = 3;
-        pass_manager_builder.SLPVectorize = true;
-        pass_manager_builder.LoopVectorize = true;
-        pass_manager_builder.RerollLoops = true;
-        pass_manager_builder.VerifyInput = true;
-        pass_manager_builder.VerifyOutput = true;
-        machine->adjustPassManager(pass_manager_builder);
-        fpm.add(llvm::createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis()));
-        mpm.add(llvm::createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis()));
-        pass_manager_builder.populateFunctionPassManager(fpm);
-        pass_manager_builder.populateModulePassManager(mpm);
-        fpm.doInitialization();
-        for (auto & function : *module)
-            fpm.run(function);
-        fpm.doFinalization();
-        mpm.run(*module);
-
-        std::vector<std::string> functions;
-        functions.reserve(module->size());
-        for (const auto & function : *module)
-            functions.emplace_back(function.getName());
-
-        llvm::orc::VModuleKey module_key = execution_session.allocateVModule();
-        if (compile_layer.addModule(module_key, std::move(module)))
-            throw Exception("Cannot add module to compile layer", ErrorCodes::CANNOT_COMPILE_CODE);
-
-        for (const auto & name : functions)
-        {
-            std::string mangled_name;
-            llvm::raw_string_ostream mangled_name_stream(mangled_name);
-            llvm::Mangler::getNameWithPrefix(mangled_name_stream, name, layout);
-            mangled_name_stream.flush();
-            auto symbol = compile_layer.findSymbol(mangled_name, false);
-            if (!symbol)
-                continue; /// external function (e.g. an intrinsic that calls into libc)
-            auto address = symbol.getAddress();
-            if (!address)
-                throw Exception("Function " + name + " failed to link", ErrorCodes::CANNOT_COMPILE_CODE);
-            symbols[name] = reinterpret_cast<void *>(*address);
-        }
-    }
-};
-
-
-template <typename... Ts>
-static bool castToEitherWithNullable(IColumn * column)
-{
-    return ((typeid_cast<Ts *>(column)
-            || (typeid_cast<ColumnNullable *>(column) && typeid_cast<Ts *>(&(typeid_cast<ColumnNullable *>(column)->getNestedColumn())))) || ...);
-}
-
-class LLVMExecutableFunction : public IExecutableFunctionImpl
-{
-    std::string name;
-    void * function;
-
 public:
-    LLVMExecutableFunction(const std::string & name_, const std::unordered_map<std::string, void *> & symbols)
-        : name(name_)
+
+    CompiledFunction(void * compiled_function_, CHJIT::CompiledModuleInfo module_info_)
+        : compiled_function(compiled_function_)
+        , module_info(std::move(module_info_))
+    {}
+
+    void * getCompiledFunction() const { return compiled_function; }
+
+    ~CompiledFunction()
+    {
+        getJITInstance().deleteCompiledModule(module_info);
+    }
+
+private:
+
+    void * compiled_function;
+
+    CHJIT::CompiledModuleInfo module_info;
+};
+
+class LLVMExecutableFunction : public IExecutableFunction
+{
+public:
+
+    explicit LLVMExecutableFunction(const std::string & name_, std::shared_ptr<CompiledFunction> compiled_function_)
+        : name(name_)
+        , compiled_function(compiled_function_)
     {
-        auto it = symbols.find(name);
-        if (symbols.end() == it)
-            throw Exception("Cannot find symbol " + name + " in LLVMContext", ErrorCodes::LOGICAL_ERROR);
-        function = it->second;
     }
 
     String getName() const override { return name; }
@@ -276,490 +81,204 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t block_size) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        auto col_res = result_type->createColumn();
+        if (!canBeNativeType(*result_type))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "LLVMExecutableFunction unexpected result type in: {}", result_type->getName());
 
-        if (block_size)
+        auto result_column = result_type->createColumn();
+
+        if (input_rows_count)
         {
-            if (!castToEitherWithNullable<
-                ColumnUInt8, ColumnUInt16, ColumnUInt32, ColumnUInt64,
-                ColumnInt8, ColumnInt16, ColumnInt32, ColumnInt64,
-                ColumnFloat32, ColumnFloat64>(col_res.get()))
-                throw Exception("Unexpected column in LLVMExecutableFunction: " + col_res->getName(), ErrorCodes::LOGICAL_ERROR);
-            col_res = col_res->cloneResized(block_size);
+            result_column = result_column->cloneResized(input_rows_count);
+
             std::vector<ColumnData> columns(arguments.size() + 1);
+            std::vector<ColumnPtr> columns_backup;
+
             for (size_t i = 0; i < arguments.size(); ++i)
             {
-                const auto * column = arguments[i].column.get();
-                if (!column)
-                    throw Exception("Column " + arguments[i].name + " is missing", ErrorCodes::LOGICAL_ERROR);
-                columns[i] = getColumnData(column);
+                auto column = arguments[i].column->convertToFullColumnIfConst();
+                columns_backup.emplace_back(column);
+                columns[i] = getColumnData(column.get());
             }
-            columns[arguments.size()] = getColumnData(col_res.get());
-            reinterpret_cast<void (*) (size_t, ColumnData *)>(function)(block_size, columns.data());
-        }
 
-        return col_res;
-    }
-};
+            columns[arguments.size()] = getColumnData(result_column.get());
 
-static void compileFunctionToLLVMByteCode(LLVMContext & context, const IFunctionBaseImpl & f)
-{
-    ProfileEvents::increment(ProfileEvents::CompileFunction);
+            JITCompiledFunction jit_compiled_function_typed = reinterpret_cast<JITCompiledFunction>(compiled_function->getCompiledFunction());
+            jit_compiled_function_typed(input_rows_count, columns.data());
 
-    const auto & arg_types = f.getArgumentTypes();
-    auto & b = context.builder;
-    auto * size_type = b.getIntNTy(sizeof(size_t) * 8);
-    auto * data_type = llvm::StructType::get(b.getInt8PtrTy(), b.getInt8PtrTy(), size_type);
-    auto * func_type = llvm::FunctionType::get(b.getVoidTy(), { size_type, data_type->getPointerTo() }, /*isVarArg=*/false);
-    auto * func = llvm::Function::Create(func_type, llvm::Function::ExternalLinkage, f.getName(), context.module.get());
-    auto * args = func->args().begin();
-    llvm::Value * counter_arg = &*args++;
-    llvm::Value * columns_arg = &*args++;
+            #if defined(MEMORY_SANITIZER)
+            /// Memory sanitizer don't know about stores from JIT-ed code.
+            /// But maybe we can generate this code with MSan instrumentation?
 
-    auto * entry = llvm::BasicBlock::Create(b.getContext(), "entry", func);
-    b.SetInsertPoint(entry);
-    std::vector<ColumnDataPlaceholder> columns(arg_types.size() + 1);
-    for (size_t i = 0; i <= arg_types.size(); ++i)
-    {
-        const auto & type = i == arg_types.size() ? f.getResultType() : arg_types[i];
-        auto * data = b.CreateLoad(b.CreateConstInBoundsGEP1_32(data_type, columns_arg, i));
-        columns[i].data_init = b.CreatePointerCast(b.CreateExtractValue(data, {0}), toNativeType(b, removeNullable(type))->getPointerTo());
-        columns[i].null_init = type->isNullable() ? b.CreateExtractValue(data, {1}) : nullptr;
-        columns[i].stride = b.CreateExtractValue(data, {2});
-    }
-
-    /// assume nonzero initial value in `counter_arg`
-    auto * loop = llvm::BasicBlock::Create(b.getContext(), "loop", func);
-    b.CreateBr(loop);
-    b.SetInsertPoint(loop);
-    auto * counter_phi = b.CreatePHI(counter_arg->getType(), 2);
-    counter_phi->addIncoming(counter_arg, 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);
-        }
-    }
-    ValuePlaceholders arguments(arg_types.size());
-    for (size_t i = 0; i < arguments.size(); ++i) // NOLINT
-    {
-        arguments[i] = [&b, &col = columns[i], &type = arg_types[i]]() -> llvm::Value *
-        {
-            auto * value = b.CreateLoad(col.data);
-            if (!col.null)
-                return value;
-            auto * is_null = b.CreateICmpNE(b.CreateLoad(col.null), b.getInt8(0));
-            auto * nullable = llvm::Constant::getNullValue(toNativeType(b, type));
-            return b.CreateInsertValue(b.CreateInsertValue(nullable, value, {0}), is_null, {1});
-        };
-    }
-    auto * result = f.compile(b, std::move(arguments));
-    if (columns.back().null)
-    {
-        b.CreateStore(b.CreateExtractValue(result, {0}), columns.back().data);
-        b.CreateStore(b.CreateSelect(b.CreateExtractValue(result, {1}), b.getInt8(1), b.getInt8(0)), columns.back().null);
-    }
-    else
-    {
-        b.CreateStore(result, columns.back().data);
-    }
-    auto * cur_block = b.GetInsertBlock();
-    for (auto & col : columns)
-    {
-        /// stride is either 0 or size of native type; output column is never constant; neither is at least one input
-        auto * is_const = &col == &columns.back() || columns.size() <= 2 ? b.getFalse() : b.CreateICmpEQ(col.stride, llvm::ConstantInt::get(size_type, 0));
-        col.data->addIncoming(b.CreateSelect(is_const, col.data, b.CreateConstInBoundsGEP1_32(nullptr, col.data, 1)), cur_block);
-        if (col.null)
-            col.null->addIncoming(b.CreateSelect(is_const, col.null, b.CreateConstInBoundsGEP1_32(nullptr, col.null, 1)), cur_block);
-    }
-    counter_phi->addIncoming(b.CreateSub(counter_phi, llvm::ConstantInt::get(size_type, 1)), cur_block);
-
-    auto * end = llvm::BasicBlock::Create(b.getContext(), "end", func);
-    b.CreateCondBr(b.CreateICmpNE(counter_phi, llvm::ConstantInt::get(size_type, 1)), loop, end);
-    b.SetInsertPoint(end);
-    b.CreateRetVoid();
-}
-
-static llvm::Constant * getNativeValue(llvm::Type * type, const IColumn & column, size_t i)
-{
-    if (!type || column.size() <= i)
-        return nullptr;
-    if (const auto * constant = typeid_cast<const ColumnConst *>(&column))
-        return getNativeValue(type, constant->getDataColumn(), 0);
-    if (const auto * nullable = typeid_cast<const ColumnNullable *>(&column))
-    {
-        auto * value = getNativeValue(type->getContainedType(0), nullable->getNestedColumn(), i);
-        auto * is_null = llvm::ConstantInt::get(type->getContainedType(1), nullable->isNullAt(i));
-        return value ? llvm::ConstantStruct::get(static_cast<llvm::StructType *>(type), value, is_null) : nullptr;
-    }
-    if (type->isFloatTy())
-        return llvm::ConstantFP::get(type, assert_cast<const ColumnVector<Float32> &>(column).getElement(i));
-    if (type->isDoubleTy())
-        return llvm::ConstantFP::get(type, assert_cast<const ColumnVector<Float64> &>(column).getElement(i));
-    if (type->isIntegerTy())
-        return llvm::ConstantInt::get(type, column.getUInt(i));
-    /// TODO: if (type->isVectorTy())
-    return nullptr;
-}
-
-/// Same as IFunctionBase::compile, but also for constants and input columns.
-using CompilableExpression = std::function<llvm::Value * (llvm::IRBuilderBase &, const ValuePlaceholders &)>;
-
-static CompilableExpression subexpression(ColumnPtr c, DataTypePtr type)
-{
-    return [=](llvm::IRBuilderBase & b, const ValuePlaceholders &) { return getNativeValue(toNativeType(b, type), *c, 0); };
-}
-
-static CompilableExpression subexpression(size_t i)
-{
-    return [=](llvm::IRBuilderBase &, const ValuePlaceholders & inputs) { return inputs[i](); };
-}
-
-static CompilableExpression subexpression(const IFunctionBase & f, std::vector<CompilableExpression> args)
-{
-    return [&, args = std::move(args)](llvm::IRBuilderBase & builder, const ValuePlaceholders & inputs)
-    {
-        ValuePlaceholders input;
-        for (const auto & arg : args)
-            input.push_back([&]() { return arg(builder, inputs); });
-        auto * result = f.compile(builder, input);
-        if (result->getType() != toNativeType(builder, f.getResultType()))
-            throw Exception("Function " + f.getName() + " generated an llvm::Value of invalid type", ErrorCodes::LOGICAL_ERROR);
-        return result;
-    };
-}
-
-struct LLVMModuleState
-{
-    std::unordered_map<std::string, void *> symbols;
-    std::shared_ptr<llvm::LLVMContext> major_context;
-    std::shared_ptr<llvm::SectionMemoryManager> memory_manager;
-};
-
-LLVMFunction::LLVMFunction(const CompileDAG & dag)
-    : name(dag.dump())
-    , module_state(std::make_unique<LLVMModuleState>())
-{
-    LLVMContext context;
-    std::vector<CompilableExpression> expressions;
-    expressions.reserve(dag.size());
-
-    for (const auto & node : dag)
-    {
-        switch (node.type)
-        {
-            case CompileNode::NodeType::CONSTANT:
+            if (const auto * nullable_column = typeid_cast<const ColumnNullable *>(result_column.get()))
             {
-                const auto * col = typeid_cast<const ColumnConst *>(node.column.get());
+                const auto & nested_column = nullable_column->getNestedColumn();
+                const auto & null_map_column = nullable_column->getNullMapColumn();
 
-                /// TODO: implement `getNativeValue` for all types & replace the check with `c.column && toNativeType(...)`
-                if (!getNativeValue(toNativeType(context.builder, node.result_type), col->getDataColumn(), 0))
-                    throw Exception(ErrorCodes::LOGICAL_ERROR,
-                                    "Cannot compile constant of type {} = {}",
-                                    node.result_type->getName(),
-                                    applyVisitor(FieldVisitorToString(), col->getDataColumn()[0]));
+                auto nested_column_raw_data = nested_column.getRawData();
+                __msan_unpoison(nested_column_raw_data.data, nested_column_raw_data.size);
 
-                expressions.emplace_back(subexpression(col->getDataColumnPtr(), node.result_type));
-                break;
+                auto null_map_column_raw_data = null_map_column.getRawData();
+                __msan_unpoison(null_map_column_raw_data.data, null_map_column_raw_data.size);
             }
-            case CompileNode::NodeType::FUNCTION:
-            {
-                std::vector<CompilableExpression> args;
-                args.reserve(node.arguments.size());
-
-                for (auto arg : node.arguments)
-                    args.emplace_back(expressions[arg]);
-
-                originals.push_back(node.function);
-                expressions.emplace_back(subexpression(*node.function, std::move(args)));
-                break;
-            }
-            case CompileNode::NodeType::INPUT:
-            {
-                expressions.emplace_back(subexpression(arg_types.size()));
-                arg_types.push_back(node.result_type);
-                break;
-            }
-        }
-    }
-
-    expression = std::move(expressions.back());
-
-    compileFunctionToLLVMByteCode(context, *this);
-    context.compileAllFunctionsToNativeCode();
-
-    module_state->symbols = context.symbols;
-    module_state->major_context = context.context;
-    module_state->memory_manager = context.memory_manager;
-}
-
-llvm::Value * LLVMFunction::compile(llvm::IRBuilderBase & builder, ValuePlaceholders values) const
-{
-    return expression(builder, values);
-}
-
-ExecutableFunctionImplPtr LLVMFunction::prepare(const ColumnsWithTypeAndName &) const { return std::make_unique<LLVMExecutableFunction>(name, module_state->symbols); }
-
-bool LLVMFunction::isDeterministic() const
-{
-    for (const auto & f : originals)
-        if (!f->isDeterministic())
-            return false;
-    return true;
-}
-
-bool LLVMFunction::isDeterministicInScopeOfQuery() const
-{
-    for (const auto & f : originals)
-        if (!f->isDeterministicInScopeOfQuery())
-            return false;
-    return true;
-}
-
-bool LLVMFunction::isSuitableForConstantFolding() const
-{
-    for (const auto & f : originals)
-        if (!f->isSuitableForConstantFolding())
-            return false;
-    return true;
-}
-
-bool LLVMFunction::isInjective(const ColumnsWithTypeAndName & sample_block) const
-{
-    for (const auto & f : originals)
-        if (!f->isInjective(sample_block))
-            return false;
-    return true;
-}
-
-bool LLVMFunction::hasInformationAboutMonotonicity() const
-{
-    for (const auto & f : originals)
-        if (!f->hasInformationAboutMonotonicity())
-            return false;
-    return true;
-}
-
-LLVMFunction::Monotonicity LLVMFunction::getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const
-{
-    const IDataType * type_ptr = &type;
-    Field left_mut = left;
-    Field right_mut = right;
-    Monotonicity result(true, true, true);
-    /// monotonicity is only defined for unary functions, so the chain must describe a sequence of nested calls
-    for (size_t i = 0; i < originals.size(); ++i)
-    {
-        Monotonicity m = originals[i]->getMonotonicityForRange(*type_ptr, left_mut, right_mut);
-        if (!m.is_monotonic)
-            return m;
-        result.is_positive ^= !m.is_positive;
-        result.is_always_monotonic &= m.is_always_monotonic;
-        if (i + 1 < originals.size())
-        {
-            if (left_mut != Field())
-                applyFunction(*originals[i], left_mut);
-            if (right_mut != Field())
-                applyFunction(*originals[i], right_mut);
-            if (!m.is_positive)
-                std::swap(left_mut, right_mut);
-            type_ptr = originals[i]->getResultType().get();
-        }
-    }
-    return result;
-}
-
-
-static bool isCompilable(const IFunctionBase & function)
-{
-    if (!canBeNativeType(*function.getResultType()))
-        return false;
-    for (const auto & type : function.getArgumentTypes())
-        if (!canBeNativeType(*type))
-            return false;
-    return function.isCompilable();
-}
-
-static bool isCompilableConstant(const ActionsDAG::Node & node)
-{
-    return node.column && isColumnConst(*node.column) && canBeNativeType(*node.result_type) && node.allow_constant_folding;
-}
-
-static bool isCompilableFunction(const ActionsDAG::Node & node)
-{
-    return node.type == ActionsDAG::ActionType::FUNCTION && isCompilable(*node.function_base);
-}
-
-static LLVMFunction::CompileDAG getCompilableDAG(
-    const ActionsDAG::Node * root,
-    ActionsDAG::NodeRawConstPtrs & children,
-    const std::unordered_set<const ActionsDAG::Node *> & used_in_result)
-{
-    LLVMFunction::CompileDAG dag;
-
-    std::unordered_map<const ActionsDAG::Node *, size_t> positions;
-    struct Frame
-    {
-        const ActionsDAG::Node * node;
-        size_t next_child_to_visit = 0;
-    };
-
-    std::stack<Frame> stack;
-    stack.push(Frame{.node = root});
-
-    while (!stack.empty())
-    {
-        auto & frame = stack.top();
-        bool is_const = isCompilableConstant(*frame.node);
-        bool can_inline = stack.size() == 1 || !used_in_result.count(frame.node);
-        bool is_compilable_function = !is_const && can_inline && isCompilableFunction(*frame.node);
-
-        while (is_compilable_function && frame.next_child_to_visit < frame.node->children.size())
-        {
-            const auto * child = frame.node->children[frame.next_child_to_visit];
-
-            if (positions.count(child))
-                ++frame.next_child_to_visit;
             else
             {
-                stack.emplace(Frame{.node = child});
-                break;
+                __msan_unpoison(result_column->getRawData().data, result_column->getRawData().size);
             }
+
+            #endif
         }
 
-        if (!is_compilable_function || frame.next_child_to_visit == frame.node->children.size())
-        {
-            LLVMFunction::CompileNode node;
-            node.function = frame.node->function_base;
-            node.result_type = frame.node->result_type;
-            node.type = is_const ? LLVMFunction::CompileNode::NodeType::CONSTANT
-                                 : (is_compilable_function ? LLVMFunction::CompileNode::NodeType::FUNCTION
-                                                           : LLVMFunction::CompileNode::NodeType::INPUT);
-
-            if (node.type == LLVMFunction::CompileNode::NodeType::FUNCTION)
-                for (const auto * child : frame.node->children)
-                    node.arguments.push_back(positions[child]);
-
-            if (node.type == LLVMFunction::CompileNode::NodeType::CONSTANT)
-                node.column = frame.node->column;
-
-            if (node.type == LLVMFunction::CompileNode::NodeType::INPUT)
-                children.emplace_back(frame.node);
-
-            positions[frame.node] = dag.size();
-            dag.push_back(std::move(node));
-            stack.pop();
-        }
+        return result_column;
     }
 
-    return dag;
-}
+private:
+    std::string name;
+    std::shared_ptr<CompiledFunction> compiled_function;
+};
 
-std::string LLVMFunction::CompileDAG::dump() const
+class LLVMFunction : public IFunctionBase
 {
-    WriteBufferFromOwnString out;
-    bool first = true;
-    for (const auto & node : *this)
+public:
+
+    explicit LLVMFunction(const CompileDAG & dag_)
+        : name(dag_.dump())
+        , dag(dag_)
     {
-        if (!first)
-            out << " ; ";
-        first = false;
-
-        switch (node.type)
+        for (size_t i = 0; i < dag.getNodesCount(); ++i)
         {
-            case CompileNode::NodeType::CONSTANT:
-            {
-                const auto * column = typeid_cast<const ColumnConst *>(node.column.get());
-                const auto & data = column->getDataColumn();
-                out << node.result_type->getName() << " = " << applyVisitor(FieldVisitorToString(), data[0]);
-                break;
-            }
-            case CompileNode::NodeType::FUNCTION:
-            {
-                out << node.result_type->getName() << " = ";
-                out << node.function->getName() << "(";
+            const auto & node = dag[i];
 
-                for (size_t i = 0; i < node.arguments.size(); ++i)
-                {
-                    if (i)
-                        out << ", ";
-
-                    out << node.arguments[i];
-                }
-
-                out << ")";
-                break;
-            }
-            case CompileNode::NodeType::INPUT:
-            {
-                out << node.result_type->getName();
-                break;
-            }
+            if (node.type == CompileDAG::CompileType::FUNCTION)
+                nested_functions.emplace_back(node.function);
+            else if (node.type == CompileDAG::CompileType::INPUT)
+                argument_types.emplace_back(node.result_type);
         }
     }
 
-    return out.str();
-}
-
-UInt128 LLVMFunction::CompileDAG::hash() const
-{
-    SipHash hash;
-    for (const auto & node : *this)
+    void setCompiledFunction(std::shared_ptr<CompiledFunction> compiled_function_)
     {
-        hash.update(node.type);
-        hash.update(node.result_type->getName());
-
-        switch (node.type)
-        {
-            case CompileNode::NodeType::CONSTANT:
-            {
-                typeid_cast<const ColumnConst *>(node.column.get())->getDataColumn().updateHashWithValue(0, hash);
-                break;
-            }
-            case CompileNode::NodeType::FUNCTION:
-            {
-                hash.update(node.function->getName());
-                for (size_t arg : node.arguments)
-                    hash.update(arg);
-
-                break;
-            }
-            case CompileNode::NodeType::INPUT:
-            {
-                break;
-            }
-        }
+        compiled_function = compiled_function_;
     }
 
-    UInt128 result;
-    hash.get128(result.low, result.high);
-    return result;
-}
+    bool isCompilable() const override { return true; }
+
+    llvm::Value * compile(llvm::IRBuilderBase & builder, Values values) const override
+    {
+        return dag.compile(builder, values);
+    }
+
+    String getName() const override { return name; }
+
+    const DataTypes & getArgumentTypes() const override { return argument_types; }
+
+    const DataTypePtr & getResultType() const override { return dag.back().result_type; }
+
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
+    {
+        if (!compiled_function)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Compiled function was not initialized {}", name);
+
+        return std::make_unique<LLVMExecutableFunction>(name, compiled_function);
+    }
+
+    bool isDeterministic() const override
+    {
+        for (const auto & f : nested_functions)
+            if (!f->isDeterministic())
+                return false;
+
+        return true;
+    }
+
+    bool isDeterministicInScopeOfQuery() const override
+    {
+        for (const auto & f : nested_functions)
+            if (!f->isDeterministicInScopeOfQuery())
+                return false;
+
+        return true;
+    }
+
+    bool isSuitableForConstantFolding() const override
+    {
+        for (const auto & f : nested_functions)
+            if (!f->isSuitableForConstantFolding())
+                return false;
+
+        return true;
+    }
+
+    bool isInjective(const ColumnsWithTypeAndName & sample_block) const override
+    {
+        for (const auto & f : nested_functions)
+            if (!f->isInjective(sample_block))
+                return false;
+
+        return true;
+    }
+
+    bool hasInformationAboutMonotonicity() const override
+    {
+        for (const auto & f : nested_functions)
+            if (!f->hasInformationAboutMonotonicity())
+                return false;
+
+        return true;
+    }
+
+    Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
+    {
+        const IDataType * type_ptr = &type;
+        Field left_mut = left;
+        Field right_mut = right;
+        Monotonicity result(true, true, 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)
+        {
+            Monotonicity m = nested_functions[i]->getMonotonicityForRange(*type_ptr, left_mut, right_mut);
+            if (!m.is_monotonic)
+                return m;
+            result.is_positive ^= !m.is_positive;
+            result.is_always_monotonic &= m.is_always_monotonic;
+            if (i + 1 < nested_functions.size())
+            {
+                if (left_mut != Field())
+                    applyFunction(*nested_functions[i], left_mut);
+                if (right_mut != Field())
+                    applyFunction(*nested_functions[i], right_mut);
+                if (!m.is_positive)
+                    std::swap(left_mut, right_mut);
+                type_ptr = nested_functions[i]->getResultType().get();
+            }
+        }
+        return result;
+    }
+
+    static void applyFunction(IFunctionBase & function, Field & value)
+    {
+        const auto & type = function.getArgumentTypes().at(0);
+        ColumnsWithTypeAndName args{{type->createColumnConst(1, value), type, "x" }};
+        auto col = function.execute(args, function.getResultType(), 1);
+        col->get(0, value);
+    }
+
+private:
+    std::string name;
+    CompileDAG dag;
+    DataTypes argument_types;
+    std::vector<FunctionBasePtr> nested_functions;
+    std::shared_ptr<CompiledFunction> compiled_function;
+};
 
 static FunctionBasePtr compile(
-    const LLVMFunction::CompileDAG & dag,
+    const CompileDAG & dag,
     size_t min_count_to_compile_expression)
 {
-    static std::unordered_map<UInt128, UInt32, UInt128Hash> counter;
+    static std::unordered_map<UInt128, UInt64, UInt128Hash> counter;
     static std::mutex mutex;
 
-    struct LLVMTargetInitializer
-    {
-        LLVMTargetInitializer()
-        {
-            llvm::InitializeNativeTarget();
-            llvm::InitializeNativeTargetAsmPrinter();
-            llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr);
-        }
-    };
-
-    static LLVMTargetInitializer initializer;
-
     auto hash_key = dag.hash();
     {
         std::lock_guard lock(mutex);
@@ -767,50 +286,165 @@ static FunctionBasePtr compile(
             return nullptr;
     }
 
-    FunctionBasePtr fn;
+    auto llvm_function = std::make_shared<LLVMFunction>(dag);
+
     if (auto * compilation_cache = CompiledExpressionCacheFactory::instance().tryGetCache())
     {
-        std::tie(fn, std::ignore) = compilation_cache->getOrSet(hash_key, [&dag] ()
+        auto [compiled_function_cache_entry, _] = compilation_cache->getOrSet(hash_key, [&] ()
         {
-            Stopwatch watch;
-            FunctionBasePtr result_fn;
-            result_fn = std::make_shared<FunctionBaseAdaptor>(std::make_unique<LLVMFunction>(dag));
-            ProfileEvents::increment(ProfileEvents::CompileExpressionsMicroseconds, watch.elapsedMicroseconds());
-            return result_fn;
+            LOG_TRACE(getLogger(), "Compile expression {}", llvm_function->getName());
+            CHJIT::CompiledModuleInfo compiled_module_info = compileFunction(getJITInstance(), *llvm_function);
+            auto * compiled_jit_function = getJITInstance().findCompiledFunction(compiled_module_info, llvm_function->getName());
+            auto compiled_function = std::make_shared<CompiledFunction>(compiled_jit_function, compiled_module_info);
+
+            return std::make_shared<CompiledFunctionCacheEntry>(std::move(compiled_function), compiled_module_info.size);
         });
+
+        llvm_function->setCompiledFunction(compiled_function_cache_entry->getCompiledFunction());
     }
     else
     {
-        Stopwatch watch;
-        fn = std::make_shared<FunctionBaseAdaptor>(std::make_unique<LLVMFunction>(dag));
-        ProfileEvents::increment(ProfileEvents::CompileExpressionsMicroseconds, watch.elapsedMicroseconds());
+        LOG_TRACE(getLogger(), "Compile expression {}", llvm_function->getName());
+        CHJIT::CompiledModuleInfo compiled_module_info = compileFunction(getJITInstance(), *llvm_function);
+        auto * compiled_jit_function = getJITInstance().findCompiledFunction(compiled_module_info, llvm_function->getName());
+        auto compiled_function = std::make_shared<CompiledFunction>(compiled_jit_function, compiled_module_info);
+        llvm_function->setCompiledFunction(compiled_function);
     }
 
-    return fn;
+    return llvm_function;
+}
+
+static bool isCompilableConstant(const ActionsDAG::Node & node)
+{
+    return node.column && isColumnConst(*node.column) && canBeNativeType(*node.result_type);
+}
+
+static bool isCompilableFunction(const ActionsDAG::Node & node)
+{
+    if (node.type != ActionsDAG::ActionType::FUNCTION)
+        return false;
+
+    auto & function = *node.function_base;
+
+    if (!canBeNativeType(*function.getResultType()))
+        return false;
+
+    for (const auto & type : function.getArgumentTypes())
+    {
+        if (!canBeNativeType(*type))
+            return false;
+    }
+
+    return function.isCompilable();
+}
+
+static CompileDAG getCompilableDAG(
+    const ActionsDAG::Node * root,
+    ActionsDAG::NodeRawConstPtrs & children)
+{
+    /// Extract CompileDAG from root actions dag node.
+
+    CompileDAG dag;
+
+    std::unordered_map<const ActionsDAG::Node *, size_t> visited_node_to_compile_dag_position;
+
+    struct Frame
+    {
+        const ActionsDAG::Node * node;
+        size_t next_child_to_visit = 0;
+    };
+
+    std::stack<Frame> stack;
+    stack.emplace(Frame{.node = root});
+
+    while (!stack.empty())
+    {
+        auto & frame = stack.top();
+        const auto * node = frame.node;
+
+        bool is_compilable_constant = isCompilableConstant(*node);
+        bool is_compilable_function = isCompilableFunction(*node);
+
+        if (!is_compilable_function || is_compilable_constant)
+        {
+           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
+           {
+                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;
+        }
+
+        while (frame.next_child_to_visit < node->children.size())
+        {
+            const auto & child = node->children[frame.next_child_to_visit];
+
+            if (visited_node_to_compile_dag_position.contains(child))
+            {
+                ++frame.next_child_to_visit;
+                continue;
+            }
+
+            stack.emplace(Frame{.node = child});
+            break;
+        }
+
+        bool all_children_visited = frame.next_child_to_visit == node->children.size();
+
+        if (!all_children_visited)
+            continue;
+
+        /// Here we process only functions that are not compiled constants
+
+        CompileDAG::Node compile_node;
+        compile_node.function = node->function_base;
+        compile_node.result_type = node->result_type;
+        compile_node.type = CompileDAG::CompileType::FUNCTION;
+
+        for (const auto * child : node->children)
+            compile_node.arguments.push_back(visited_node_to_compile_dag_position[child]);
+
+        visited_node_to_compile_dag_position[node] = dag.getNodesCount();
+
+        dag.addNode(std::move(compile_node));
+        stack.pop();
+    }
+
+    return dag;
 }
 
 void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression)
 {
     struct Data
     {
-        bool is_compilable = false;
+        bool is_compilable_in_isolation = false;
         bool all_parents_compilable = true;
-        size_t num_inlineable_nodes = 0;
+        size_t compilable_children_size = 0;
+        size_t children_size = 0;
     };
 
-    std::unordered_map<const Node *, Data> data;
-    std::unordered_set<const Node *> used_in_result;
+    std::unordered_map<const Node *, Data> node_to_data;
+
+    /// Check which nodes can be compiled in isolation
 
     for (const auto & node : nodes)
-        data[&node].is_compilable = isCompilableConstant(node) || isCompilableFunction(node);
-
-    for (const auto & node : nodes)
-        if (!data[&node].is_compilable)
-            for (const auto * child : node.children)
-                data[child].all_parents_compilable = false;
-
-    for (const auto * node : index)
-        used_in_result.insert(node);
+    {
+        bool node_is_compilable_in_isolation = isCompilableFunction(node) && !isCompilableConstant(node);
+        node_to_data[&node].is_compilable_in_isolation = node_is_compilable_in_isolation;
+    }
 
     struct Frame
     {
@@ -819,83 +453,126 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression)
     };
 
     std::stack<Frame> stack;
-    std::unordered_set<const Node *> visited;
+    std::unordered_set<const Node *> visited_nodes;
+
+    /** Algorithm is to iterate over each node in ActionsDAG, and update node compilable_children_size.
+      * After this procedure data for each node is initialized.
+      */
 
     for (auto & node : nodes)
     {
-        if (visited.count(&node))
+        if (visited_nodes.contains(&node))
             continue;
 
         stack.emplace(Frame{.node = &node});
+
         while (!stack.empty())
         {
-            auto & frame = stack.top();
+            auto & current_frame = stack.top();
+            auto & current_node = current_frame.node;
 
-            while (frame.next_child_to_visit < frame.node->children.size())
+            while (current_frame.next_child_to_visit < current_node->children.size())
             {
-                const auto * child = frame.node->children[frame.next_child_to_visit];
+                const auto & child = node.children[current_frame.next_child_to_visit];
 
-                if (visited.count(child))
-                    ++frame.next_child_to_visit;
-                else
+                if (visited_nodes.contains(child))
                 {
-                    stack.emplace(Frame{.node = child});
-                    break;
+                    ++current_frame.next_child_to_visit;
+                    continue;
                 }
+
+                stack.emplace(Frame{.node=child});
+                break;
             }
 
-            if (frame.next_child_to_visit == frame.node->children.size())
+            bool all_children_visited = current_frame.next_child_to_visit == current_node->children.size();
+
+            if (!all_children_visited)
+                continue;
+
+            auto & current_node_data = node_to_data[current_node];
+
+            if (current_node_data.is_compilable_in_isolation)
             {
-                auto & cur = data[frame.node];
-                if (cur.is_compilable)
+                for (const auto * child : current_node->children)
                 {
-                    cur.num_inlineable_nodes = 1;
+                    auto & child_data = node_to_data[child];
 
-                    if (!isCompilableConstant(*frame.node))
-                        for (const auto * child : frame.node->children)
-                            if (!used_in_result.count(child))
-                                cur.num_inlineable_nodes += data[child].num_inlineable_nodes;
-
-                    /// Check if we should inline current node.
-                    bool should_compile = true;
-
-                    /// Inline parents instead of node is possible.
-                    if (!used_in_result.count(frame.node) && cur.all_parents_compilable)
-                        should_compile = false;
-
-                    /// There is not reason to inline single node.
-                    /// The result of compiling function in isolation is pretty much the same as its `execute` method.
-                    if (cur.num_inlineable_nodes <= 1)
-                        should_compile = false;
-
-                    if (should_compile)
+                    if (child_data.is_compilable_in_isolation)
                     {
-                        NodeRawConstPtrs new_children;
-                        auto dag = getCompilableDAG(frame.node, new_children, used_in_result);
-
-                        if (auto fn = compile(dag, min_count_to_compile_expression))
-                        {
-                            /// Replace current node to compilable function.
-
-                            ColumnsWithTypeAndName arguments;
-                            arguments.reserve(new_children.size());
-                            for (const auto * child : new_children)
-                                arguments.emplace_back(child->column, child->result_type, child->result_name);
-
-                            auto * frame_node = const_cast<Node *>(frame.node);
-                            frame_node->type = ActionsDAG::ActionType::FUNCTION;
-                            frame_node->function_base = fn;
-                            frame_node->function = fn->prepare(arguments);
-                            frame_node->children.swap(new_children);
-                            frame_node->is_function_compiled = true;
-                            frame_node->column = nullptr; /// Just in case.
-                        }
+                        current_node_data.compilable_children_size += child_data.compilable_children_size;
+                        current_node_data.compilable_children_size += 1;
                     }
+
+                    current_node_data.children_size += node_to_data[child].children_size;
                 }
 
-                visited.insert(frame.node);
-                stack.pop();
+                current_node_data.children_size += current_node->children.size();
             }
+
+            visited_nodes.insert(current_node);
+            stack.pop();
+        }
+    }
+
+    for (const auto & node : nodes)
+    {
+        auto & node_data = node_to_data[&node];
+        bool node_is_valid_for_compilation = node_data.is_compilable_in_isolation && node_data.compilable_children_size > 0;
+
+        for (const auto & child : node.children)
+            node_to_data[child].all_parents_compilable &= node_is_valid_for_compilation;
+    }
+
+    for (const auto & node : index)
+    {
+        /// Force result nodes to compile
+        node_to_data[node].all_parents_compilable = false;
+    }
+
+    std::vector<Node *> nodes_to_compile;
+
+    for (auto & node : nodes)
+    {
+        auto & node_data = node_to_data[&node];
+
+        bool node_is_valid_for_compilation = node_data.is_compilable_in_isolation && node_data.compilable_children_size > 0;
+
+        /// If all parents are compilable then this node should not be standalone compiled
+        bool should_compile = node_is_valid_for_compilation && !node_data.all_parents_compilable;
+
+        if (!should_compile)
+            continue;
+
+        nodes_to_compile.emplace_back(&node);
+    }
+
+    /** Sort nodes before compilation using their children size to avoid compiling subexpression before compile parent expression.
+      * This is needed to avoid compiling expression more than once with different names because of compilation order.
+      */
+    std::sort(nodes_to_compile.begin(), nodes_to_compile.end(), [&](const Node * lhs, const Node * rhs) { return node_to_data[lhs].children_size > node_to_data[rhs].children_size; });
+
+    for (auto & node : nodes_to_compile)
+    {
+        NodeRawConstPtrs new_children;
+        auto dag = getCompilableDAG(node, new_children);
+
+        if (dag.getInputNodesCount() == 0)
+            continue;
+
+        if (auto fn = compile(dag, min_count_to_compile_expression))
+        {
+            ColumnsWithTypeAndName arguments;
+            arguments.reserve(new_children.size());
+            for (const auto * child : new_children)
+                arguments.emplace_back(child->column, child->result_type, child->result_name);
+
+            node->type = ActionsDAG::ActionType::FUNCTION;
+            node->function_base = fn;
+            node->function = fn->prepare(arguments);
+            node->children.swap(new_children);
+            node->is_function_compiled = true;
+            node->column = nullptr;
         }
     }
 }
diff --git a/src/Interpreters/ExpressionJIT.h b/src/Interpreters/ExpressionJIT.h
index 793c19b4fe7..6b39acae799 100644
--- a/src/Interpreters/ExpressionJIT.h
+++ b/src/Interpreters/ExpressionJIT.h
@@ -5,98 +5,47 @@
 #endif
 
 #if USE_EMBEDDED_COMPILER
-#    include <set>
-#    include <Functions/IFunctionImpl.h>
-#    include <Interpreters/Context.h>
-#    include <Interpreters/ExpressionActions.h>
 #    include <Common/LRUCache.h>
-
+#    include <Common/HashTable/Hash.h>
 
 namespace DB
 {
 
-using CompilableExpression = std::function<llvm::Value * (llvm::IRBuilderBase &, const ValuePlaceholders &)>;
+class CompiledFunction;
 
-struct LLVMModuleState;
-
-class LLVMFunction : public IFunctionBaseImpl
+class CompiledFunctionCacheEntry
 {
-    std::string name;
-    DataTypes arg_types;
-
-    std::vector<FunctionBasePtr> originals;
-    CompilableExpression expression;
-
-    std::unique_ptr<LLVMModuleState> module_state;
-
 public:
+    CompiledFunctionCacheEntry(std::shared_ptr<CompiledFunction> compiled_function_, size_t compiled_function_size_)
+        : compiled_function(std::move(compiled_function_))
+        , compiled_function_size(compiled_function_size_)
+    {}
 
-    /// LLVMFunction is a compiled part of ActionsDAG.
-    /// We store this part as independent DAG with minial required information to compile it.
-    struct CompileNode
+    std::shared_ptr<CompiledFunction> getCompiledFunction() const { return compiled_function; }
+
+    size_t getCompiledFunctionSize() const { return compiled_function_size; }
+
+private:
+    std::shared_ptr<CompiledFunction> compiled_function;
+
+    size_t compiled_function_size;
+};
+
+struct CompiledFunctionWeightFunction
+{
+    size_t operator()(const CompiledFunctionCacheEntry & compiled_function) const
     {
-        enum class NodeType
-        {
-            INPUT = 0,
-            CONSTANT = 1,
-            FUNCTION = 2,
-        };
-
-        NodeType type;
-        DataTypePtr result_type;
-
-        /// For CONSTANT
-        ColumnPtr column;
-
-        /// For FUNCTION
-        FunctionBasePtr function;
-        std::vector<size_t> arguments;
-    };
-
-    /// DAG is represented as list of nodes stored in in-order traverse order.
-    /// Expression (a + 1) + (b + 1) will be represented like chain: a, 1, a + 1, b, b + 1, (a + 1) + (b + 1).
-    struct CompileDAG : public std::vector<CompileNode>
-    {
-        std::string dump() const;
-        UInt128 hash() const;
-    };
-
-    explicit LLVMFunction(const CompileDAG & dag);
-
-    bool isCompilable() const override { return true; }
-
-    llvm::Value * compile(llvm::IRBuilderBase & builder, ValuePlaceholders values) const override;
-
-    String getName() const override { return name; }
-
-    const DataTypes & getArgumentTypes() const override { return arg_types; }
-
-    const DataTypePtr & getResultType() const override { return originals.back()->getResultType(); }
-
-    ExecutableFunctionImplPtr prepare(const ColumnsWithTypeAndName &) const override;
-
-    bool isDeterministic() const override;
-
-    bool isDeterministicInScopeOfQuery() const override;
-
-    bool isSuitableForConstantFolding() const override;
-
-    bool isInjective(const ColumnsWithTypeAndName & sample_block) const override;
-
-    bool hasInformationAboutMonotonicity() const override;
-
-    Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override;
-
-    const LLVMModuleState * getLLVMModuleState() const { return module_state.get(); }
+        return compiled_function.getCompiledFunctionSize();
+    }
 };
 
 /** This child of LRUCache breaks one of it's invariants: total weight may be changed after insertion.
  * We have to do so, because we don't known real memory consumption of generated LLVM code for every function.
  */
-class CompiledExpressionCache : public LRUCache<UInt128, IFunctionBase, UInt128Hash>
+class CompiledExpressionCache : public LRUCache<UInt128, CompiledFunctionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>
 {
 public:
-    using Base = LRUCache<UInt128, IFunctionBase, UInt128Hash>;
+    using Base = LRUCache<UInt128, CompiledFunctionCacheEntry, UInt128Hash, CompiledFunctionWeightFunction>;
     using Base::Base;
 };
 
diff --git a/src/Interpreters/ExternalDictionariesLoader.cpp b/src/Interpreters/ExternalDictionariesLoader.cpp
index 8df29459b72..e6414474817 100644
--- a/src/Interpreters/ExternalDictionariesLoader.cpp
+++ b/src/Interpreters/ExternalDictionariesLoader.cpp
@@ -23,48 +23,47 @@ namespace ErrorCodes
 }
 
 /// Must not acquire Context lock in constructor to avoid possibility of deadlocks.
-ExternalDictionariesLoader::ExternalDictionariesLoader(Context & global_context_)
+ExternalDictionariesLoader::ExternalDictionariesLoader(ContextConstPtr global_context_)
     : ExternalLoader("external dictionary", &Poco::Logger::get("ExternalDictionariesLoader"))
-    , global_context(global_context_)
+    , WithConstContext(global_context_)
 {
     setConfigSettings({"dictionary", "name", "database", "uuid"});
     enableAsyncLoading(true);
     enablePeriodicUpdates(true);
 }
 
-
 ExternalLoader::LoadablePtr ExternalDictionariesLoader::create(
         const std::string & name, const Poco::Util::AbstractConfiguration & config,
         const std::string & key_in_config, const std::string & repository_name) const
 {
     /// For dictionaries from databases (created with DDL queries) we have to perform
     /// additional checks, so we identify them here.
-    bool dictionary_from_database = !repository_name.empty();
-    return DictionaryFactory::instance().create(name, config, key_in_config, global_context, dictionary_from_database);
+    bool created_from_ddl = !repository_name.empty();
+    return DictionaryFactory::instance().create(name, config, key_in_config, getContext(), created_from_ddl);
 }
 
-ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::getDictionary(const std::string & dictionary_name, const Context & context) const
+ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::getDictionary(const std::string & dictionary_name, ContextConstPtr local_context) const
 {
-    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, context.getCurrentDatabase());
+    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
     return std::static_pointer_cast<const IDictionary>(load(resolved_dictionary_name));
 }
 
-ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::tryGetDictionary(const std::string & dictionary_name, const Context & context) const
+ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::tryGetDictionary(const std::string & dictionary_name, ContextConstPtr local_context) const
 {
-    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, context.getCurrentDatabase());
+    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
     return std::static_pointer_cast<const IDictionary>(tryLoad(resolved_dictionary_name));
 }
 
 
-void ExternalDictionariesLoader::reloadDictionary(const std::string & dictionary_name, const Context & context) const
+void ExternalDictionariesLoader::reloadDictionary(const std::string & dictionary_name, ContextConstPtr local_context) const
 {
-    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, context.getCurrentDatabase());
+    std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
     loadOrReload(resolved_dictionary_name);
 }
 
-DictionaryStructure ExternalDictionariesLoader::getDictionaryStructure(const std::string & dictionary_name, const Context & query_context) const
+DictionaryStructure ExternalDictionariesLoader::getDictionaryStructure(const std::string & dictionary_name, ContextConstPtr query_context) const
 {
-    std::string resolved_name = resolveDictionaryName(dictionary_name, query_context.getCurrentDatabase());
+    std::string resolved_name = resolveDictionaryName(dictionary_name, query_context->getCurrentDatabase());
 
     auto load_result = getLoadResult(resolved_name);
     if (!load_result.config)
@@ -110,7 +109,10 @@ std::string ExternalDictionariesLoader::resolveDictionaryNameFromDatabaseCatalog
     std::string maybe_database_name = name.substr(0, pos);
     std::string maybe_table_name = name.substr(pos + 1);
 
-    auto [db, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable({maybe_database_name, maybe_table_name}, global_context);
+    auto [db, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable(
+        {maybe_database_name, maybe_table_name},
+        const_pointer_cast<Context>(getContext()));
+
     if (!db)
         return name;
     assert(table);
diff --git a/src/Interpreters/ExternalDictionariesLoader.h b/src/Interpreters/ExternalDictionariesLoader.h
index ce5b2512741..1182e96573c 100644
--- a/src/Interpreters/ExternalDictionariesLoader.h
+++ b/src/Interpreters/ExternalDictionariesLoader.h
@@ -1,32 +1,33 @@
 #pragma once
 
+#include <Dictionaries/IDictionary.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/ExternalLoader.h>
+#include <Common/quoteString.h>
+
 #include <memory>
 
-#include <Common/quoteString.h>
-#include <Interpreters/ExternalLoader.h>
-#include <Dictionaries/IDictionary.h>
-
 namespace DB
 {
-class Context;
+
 class IExternalLoaderConfigRepository;
 
 /// Manages user-defined dictionaries.
-class ExternalDictionariesLoader : public ExternalLoader
+class ExternalDictionariesLoader : public ExternalLoader, WithConstContext
 {
 public:
     using DictPtr = std::shared_ptr<const IDictionary>;
 
     /// Dictionaries will be loaded immediately and then will be updated in separate thread, each 'reload_period' seconds.
-    explicit ExternalDictionariesLoader(Context & global_context_);
+    explicit ExternalDictionariesLoader(ContextConstPtr global_context_);
 
-    DictPtr getDictionary(const std::string & dictionary_name, const Context & context) const;
+    DictPtr getDictionary(const std::string & dictionary_name, ContextConstPtr context) const;
 
-    DictPtr tryGetDictionary(const std::string & dictionary_name, const Context & context) const;
+    DictPtr tryGetDictionary(const std::string & dictionary_name, ContextConstPtr context) const;
 
-    void reloadDictionary(const std::string & dictionary_name, const Context & context) const;
+    void reloadDictionary(const std::string & dictionary_name, ContextConstPtr context) const;
 
-    DictionaryStructure getDictionaryStructure(const std::string & dictionary_name, const Context & context) const;
+    DictionaryStructure getDictionaryStructure(const std::string & dictionary_name, ContextConstPtr context) const;
 
     static DictionaryStructure getDictionaryStructure(const Poco::Util::AbstractConfiguration & config, const std::string & key_in_config = "dictionary");
 
@@ -45,9 +46,6 @@ protected:
 
     friend class StorageSystemDictionaries;
     friend class DatabaseDictionary;
-
-private:
-    Context & global_context;
 };
 
 }
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 853fe296d1c..70d6e9a277d 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -10,7 +10,7 @@
 #include <Common/setThreadName.h>
 #include <Common/StatusInfo.h>
 #include <ext/chrono_io.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <unordered_set>
@@ -910,7 +910,7 @@ private:
         if (enable_async_loading)
         {
             /// Put a job to the thread pool for the loading.
-            auto thread = ThreadFromGlobalPool{&LoadingDispatcher::doLoading, this, info.name, loading_id, forced_to_reload, min_id_to_finish_loading_dependencies_, true};
+            auto thread = ThreadFromGlobalPool{&LoadingDispatcher::doLoading, this, info.name, loading_id, forced_to_reload, min_id_to_finish_loading_dependencies_, true, CurrentThread::getGroup()};
             loading_threads.try_emplace(loading_id, std::move(thread));
         }
         else
@@ -947,8 +947,16 @@ private:
     }
 
     /// Does the loading, possibly in the separate thread.
-    void doLoading(const String & name, size_t loading_id, bool forced_to_reload, size_t min_id_to_finish_loading_dependencies_, bool async)
+    void doLoading(const String & name, size_t loading_id, bool forced_to_reload, size_t min_id_to_finish_loading_dependencies_, bool async, ThreadGroupStatusPtr thread_group = {})
     {
+        if (thread_group)
+            CurrentThread::attachTo(thread_group);
+
+        SCOPE_EXIT_SAFE(
+            if (thread_group)
+                CurrentThread::detachQueryIfNotDetached();
+        );
+
         LOG_TRACE(log, "Start loading object '{}'", name);
         try
         {
diff --git a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
deleted file mode 100644
index 41269b91b5f..00000000000
--- a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include <Interpreters/ExternalLoaderDatabaseConfigRepository.h>
-#include <Interpreters/Context.h>
-#include <Storages/IStorage.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_DICTIONARY;
-}
-
-
-namespace
-{
-    String trimDatabaseName(const std::string & loadable_definition_name, const String & database_name,
-                            const IDatabase & database, const Context & global_context)
-    {
-        bool is_atomic_database = database.getUUID() != UUIDHelpers::Nil;
-        if (is_atomic_database)
-        {
-            /// We do not know actual database and dictionary names here
-            auto dict_id = StorageID::createEmpty();
-            dict_id.uuid = parseFromString<UUID>(loadable_definition_name);
-            assert(dict_id.uuid != UUIDHelpers::Nil);
-            /// Get associated StorageDictionary by UUID
-            auto table = DatabaseCatalog::instance().getTable(dict_id, global_context);
-            auto dict_id_with_names = table->getStorageID();
-            return dict_id_with_names.table_name;
-        }
-
-        if (!startsWith(loadable_definition_name, database_name))
-            throw Exception(ErrorCodes::UNKNOWN_DICTIONARY,
-                            "Loadable '{}' is not from database '{}'", loadable_definition_name, database_name);
-        ///    dbname.loadable_name
-        ///--> remove <---
-        return loadable_definition_name.substr(database_name.length() + 1);
-    }
-}
-
-
-ExternalLoaderDatabaseConfigRepository::ExternalLoaderDatabaseConfigRepository(IDatabase & database_, const Context & context_)
-    : global_context(context_.getGlobalContext())
-    , database_name(database_.getDatabaseName())
-    , database(database_)
-{
-}
-
-LoadablesConfigurationPtr ExternalLoaderDatabaseConfigRepository::load(const std::string & loadable_definition_name)
-{
-    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, global_context);
-    return database.getDictionaryConfiguration(dict_name);
-}
-
-bool ExternalLoaderDatabaseConfigRepository::exists(const std::string & loadable_definition_name)
-{
-    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, global_context);
-    return database.isDictionaryExist(dict_name);
-}
-
-Poco::Timestamp ExternalLoaderDatabaseConfigRepository::getUpdateTime(const std::string & loadable_definition_name)
-{
-    auto dict_name = trimDatabaseName(loadable_definition_name, database_name, database, global_context);
-    return database.getObjectMetadataModificationTime(dict_name);
-}
-
-std::set<std::string> ExternalLoaderDatabaseConfigRepository::getAllLoadablesDefinitionNames()
-{
-    std::set<std::string> result;
-    auto itr = database.getDictionariesIterator();
-    bool is_atomic_database = database.getUUID() != UUIDHelpers::Nil;
-    while (itr && itr->isValid())
-    {
-        if (is_atomic_database)
-        {
-            assert(itr->uuid() != UUIDHelpers::Nil);
-            result.insert(toString(itr->uuid()));
-        }
-        else
-            result.insert(database_name + "." + itr->name());
-        itr->next();
-    }
-    return result;
-}
-
-}
diff --git a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h
index 59dad1274e0..b8dd6e278ad 100644
--- a/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderDatabaseConfigRepository.h
@@ -9,12 +9,12 @@ namespace DB
 
 /// Repository from database, which stores dictionary definitions on disk.
 /// Tracks update time and existence of .sql files through IDatabase.
-class ExternalLoaderDatabaseConfigRepository : public IExternalLoaderConfigRepository
+class ExternalLoaderDatabaseConfigRepository : public IExternalLoaderConfigRepository, WithContext
 {
 public:
-    ExternalLoaderDatabaseConfigRepository(IDatabase & database_, const Context & global_context_);
+    ExternalLoaderDatabaseConfigRepository(IDatabase & database_, ContextPtr global_context_);
 
-    const std::string & getName() const override { return database_name; }
+    std::string getName() const override { return database_name; }
 
     std::set<std::string> getAllLoadablesDefinitionNames() override;
 
@@ -25,7 +25,6 @@ public:
     LoadablesConfigurationPtr load(const std::string & loadable_definition_name) override;
 
 private:
-    const Context & global_context;
     const String database_name;
     IDatabase & database;
 };
diff --git a/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.cpp b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.cpp
new file mode 100644
index 00000000000..86f5a9ded0a
--- /dev/null
+++ b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.cpp
@@ -0,0 +1,39 @@
+#include "ExternalLoaderDictionaryStorageConfigRepository.h"
+
+#include <Interpreters/Context.h>
+#include <Storages/StorageDictionary.h>
+
+namespace DB
+{
+
+ExternalLoaderDictionaryStorageConfigRepository::ExternalLoaderDictionaryStorageConfigRepository(const StorageDictionary & dictionary_storage_)
+    : dictionary_storage(dictionary_storage_)
+{
+}
+
+std::string ExternalLoaderDictionaryStorageConfigRepository::getName() const
+{
+    return dictionary_storage.getStorageID().getInternalDictionaryName();
+}
+
+std::set<std::string> ExternalLoaderDictionaryStorageConfigRepository::getAllLoadablesDefinitionNames()
+{
+    return { getName() };
+}
+
+bool ExternalLoaderDictionaryStorageConfigRepository::exists(const std::string & loadable_definition_name)
+{
+    return getName() == loadable_definition_name;
+}
+
+Poco::Timestamp ExternalLoaderDictionaryStorageConfigRepository::getUpdateTime(const std::string &)
+{
+    return dictionary_storage.getUpdateTime();
+}
+
+LoadablesConfigurationPtr ExternalLoaderDictionaryStorageConfigRepository::load(const std::string &)
+{
+    return dictionary_storage.getConfiguration();
+}
+
+}
diff --git a/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h
new file mode 100644
index 00000000000..06d2b0faf75
--- /dev/null
+++ b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <Interpreters/IExternalLoaderConfigRepository.h>
+#include <Databases/IDatabase.h>
+
+namespace DB
+{
+
+class StorageDictionary;
+
+class ExternalLoaderDictionaryStorageConfigRepository : public IExternalLoaderConfigRepository
+{
+public:
+    explicit ExternalLoaderDictionaryStorageConfigRepository(const StorageDictionary & dictionary_storage_);
+
+    std::string getName() const override;
+
+    std::set<std::string> getAllLoadablesDefinitionNames() override;
+
+    bool exists(const std::string & loadable_definition_name) override;
+
+    Poco::Timestamp getUpdateTime(const std::string & loadable_definition_name) override;
+
+    LoadablesConfigurationPtr load(const std::string & loadable_definition_name) override;
+
+private:
+    const StorageDictionary & dictionary_storage;
+};
+
+}
diff --git a/src/Interpreters/ExternalLoaderTempConfigRepository.h b/src/Interpreters/ExternalLoaderTempConfigRepository.h
index 46e2eb846e9..d042f310ed1 100644
--- a/src/Interpreters/ExternalLoaderTempConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderTempConfigRepository.h
@@ -13,7 +13,7 @@ class ExternalLoaderTempConfigRepository : public IExternalLoaderConfigRepositor
 public:
     ExternalLoaderTempConfigRepository(const String & repository_name_, const String & path_, const LoadablesConfigurationPtr & config_);
 
-    const String & getName() const override { return name; }
+    String getName() const override { return name; }
     bool isTemporary() const override { return true; }
 
     std::set<String> getAllLoadablesDefinitionNames() override;
diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp b/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
index 63755ee1839..00c31110ea4 100644
--- a/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
+++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
@@ -3,12 +3,13 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/getMultipleKeysFromConfig.h>
-
 #include <Poco/Glob.h>
-#include <Poco/File.h>
-#include <Poco/Path.h>
+#include <Common/filesystemHelpers.h>
+#include <filesystem>
 
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 ExternalLoaderXMLConfigRepository::ExternalLoaderXMLConfigRepository(
@@ -19,7 +20,7 @@ ExternalLoaderXMLConfigRepository::ExternalLoaderXMLConfigRepository(
 
 Poco::Timestamp ExternalLoaderXMLConfigRepository::getUpdateTime(const std::string & definition_entity_name)
 {
-    return Poco::File(definition_entity_name).getLastModified();
+    return FS::getModificationTimestamp(definition_entity_name);
 }
 
 std::set<std::string> ExternalLoaderXMLConfigRepository::getAllLoadablesDefinitionNames()
@@ -36,8 +37,8 @@ std::set<std::string> ExternalLoaderXMLConfigRepository::getAllLoadablesDefiniti
         if (pattern[0] != '/')
         {
             const auto app_config_path = main_config.getString("config-file", "config.xml");
-            const auto config_dir = Poco::Path{app_config_path}.parent().toString();
-            const auto absolute_path = config_dir + pattern;
+            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;
@@ -59,7 +60,7 @@ std::set<std::string> ExternalLoaderXMLConfigRepository::getAllLoadablesDefiniti
 
 bool ExternalLoaderXMLConfigRepository::exists(const std::string & definition_entity_name)
 {
-    return Poco::File(definition_entity_name).exists();
+    return fs::exists(fs::path(definition_entity_name));
 }
 
 Poco::AutoPtr<Poco::Util::AbstractConfiguration> ExternalLoaderXMLConfigRepository::load(
diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.h b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
index dd689856300..76f51f04397 100644
--- a/src/Interpreters/ExternalLoaderXMLConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
@@ -15,7 +15,7 @@ class ExternalLoaderXMLConfigRepository : public IExternalLoaderConfigRepository
 public:
     ExternalLoaderXMLConfigRepository(const Poco::Util::AbstractConfiguration & main_config_, const std::string & config_key_);
 
-    const String & getName() const override { return name; }
+    std::string getName() const override { return name; }
 
     /// Return set of .xml files from path in main_config (config_key)
     std::set<std::string> getAllLoadablesDefinitionNames() override;
diff --git a/src/Interpreters/ExternalModelsLoader.cpp b/src/Interpreters/ExternalModelsLoader.cpp
index 4e9ddb78241..317cf0bf1c9 100644
--- a/src/Interpreters/ExternalModelsLoader.cpp
+++ b/src/Interpreters/ExternalModelsLoader.cpp
@@ -10,9 +10,8 @@ namespace ErrorCodes
 }
 
 
-ExternalModelsLoader::ExternalModelsLoader(Context & context_)
-    : ExternalLoader("external model", &Poco::Logger::get("ExternalModelsLoader"))
-    , context(context_)
+ExternalModelsLoader::ExternalModelsLoader(ContextPtr context_)
+    : ExternalLoader("external model", &Poco::Logger::get("ExternalModelsLoader")), WithContext(context_)
 {
     setConfigSettings({"model", "name", {}, {}});
     enablePeriodicUpdates(true);
@@ -30,7 +29,7 @@ std::shared_ptr<const IExternalLoadable> ExternalModelsLoader::create(
     {
         return std::make_unique<CatBoostModel>(
                 name, config.getString(config_prefix + ".path"),
-                context.getConfigRef().getString("catboost_dynamic_library_path"),
+                getContext()->getConfigRef().getString("catboost_dynamic_library_path"),
                 lifetime
         );
     }
diff --git a/src/Interpreters/ExternalModelsLoader.h b/src/Interpreters/ExternalModelsLoader.h
index 3f09512338d..f0a7592f4d3 100644
--- a/src/Interpreters/ExternalModelsLoader.h
+++ b/src/Interpreters/ExternalModelsLoader.h
@@ -1,28 +1,33 @@
 #pragma once
 
 #include <Interpreters/CatBoostModel.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/ExternalLoader.h>
 #include <common/logger_useful.h>
+
 #include <memory>
 
 
 namespace DB
 {
 
-class Context;
-
 /// Manages user-defined models.
-class ExternalModelsLoader : public ExternalLoader
+class ExternalModelsLoader : public ExternalLoader, WithContext
 {
 public:
     using ModelPtr = std::shared_ptr<const IModel>;
 
     /// Models will be loaded immediately and then will be updated in separate thread, each 'reload_period' seconds.
-    ExternalModelsLoader(Context & context_);
+    explicit ExternalModelsLoader(ContextPtr context_);
 
-    ModelPtr getModel(const std::string & name) const
+    ModelPtr getModel(const std::string & model_name) const
     {
-        return std::static_pointer_cast<const IModel>(load(name));
+        return std::static_pointer_cast<const IModel>(load(model_name));
+    }
+
+    void reloadModel(const std::string & model_name) const
+    {
+        loadOrReload(model_name);
     }
 
 protected:
@@ -30,9 +35,6 @@ protected:
             const std::string & config_prefix, const std::string & repository_name) const override;
 
     friend class StorageSystemModels;
-private:
-
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/ExtractExpressionInfoVisitor.cpp b/src/Interpreters/ExtractExpressionInfoVisitor.cpp
index 64c23cd4fd1..34632a96bda 100644
--- a/src/Interpreters/ExtractExpressionInfoVisitor.cpp
+++ b/src/Interpreters/ExtractExpressionInfoVisitor.cpp
@@ -40,7 +40,7 @@ void ExpressionInfoMatcher::visit(const ASTFunction & ast_function, const ASTPtr
     }
     else
     {
-        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, data.context);
+        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, data.getContext());
 
         /// Skip lambda, tuple and other special functions
         if (function)
@@ -82,11 +82,12 @@ bool ExpressionInfoMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &)
     return !node->as<ASTSubquery>();
 }
 
-bool hasNonRewritableFunction(const ASTPtr & node, const Context & context)
+bool hasNonRewritableFunction(const ASTPtr & node, ContextConstPtr context)
 {
     for (const auto & select_expression : node->children)
     {
-        ExpressionInfoVisitor::Data expression_info{.context = context, .tables = {}};
+        TablesWithColumns tables;
+        ExpressionInfoVisitor::Data expression_info{WithConstContext{context}, tables};
         ExpressionInfoVisitor(expression_info).visit(select_expression);
 
         if (expression_info.is_stateful_function
diff --git a/src/Interpreters/ExtractExpressionInfoVisitor.h b/src/Interpreters/ExtractExpressionInfoVisitor.h
index d05415490e6..bfb414e8601 100644
--- a/src/Interpreters/ExtractExpressionInfoVisitor.h
+++ b/src/Interpreters/ExtractExpressionInfoVisitor.h
@@ -1,21 +1,20 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
-class Context;
 
 struct ExpressionInfoMatcher
 {
-    struct Data
+    struct Data : public WithConstContext
     {
-        const Context & context;
         const TablesWithColumns & tables;
 
         bool is_array_join = false;
@@ -37,6 +36,6 @@ struct ExpressionInfoMatcher
 
 using ExpressionInfoVisitor = ConstInDepthNodeVisitor<ExpressionInfoMatcher, true>;
 
-bool hasNonRewritableFunction(const ASTPtr & node, const Context & context);
+bool hasNonRewritableFunction(const ASTPtr & node, ContextConstPtr context);
 
 }
diff --git a/src/Interpreters/FillingRow.h b/src/Interpreters/FillingRow.h
index 0e1d60d0d7a..434a9270718 100644
--- a/src/Interpreters/FillingRow.h
+++ b/src/Interpreters/FillingRow.h
@@ -34,7 +34,7 @@ public:
     FillColumnDescription & getFillDescription(size_t ind) { return description[ind].fill_description; }
 
 private:
-    std::vector<Field> row;
+    Row row;
     SortDescription description;
 };
 
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 80d133ebea6..1aac27396ed 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -1,37 +1,36 @@
 #pragma once
 
-#include <Parsers/IAST.h>
-#include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Interpreters/interpretSubquery.h>
-#include <Common/typeid_cast.h>
 #include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
 #include <Databases/IDatabase.h>
 #include <IO/WriteHelpers.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-#include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/interpretSubquery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/IAST.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int WRONG_GLOBAL_SUBQUERY;
 }
 
-
 class GlobalSubqueriesMatcher
 {
 public:
-    struct Data
+    struct Data : WithContext
     {
-        const Context & context;
         size_t subquery_depth;
         bool is_remote;
         size_t external_table_id;
@@ -39,16 +38,22 @@ public:
         SubqueriesForSets & subqueries_for_sets;
         bool & has_global_subqueries;
 
-        Data(const Context & context_, size_t subquery_depth_, bool is_remote_,
-             TemporaryTablesMapping & tables, SubqueriesForSets & subqueries_for_sets_, bool & has_global_subqueries_)
-        :   context(context_),
-            subquery_depth(subquery_depth_),
-            is_remote(is_remote_),
-            external_table_id(1),
-            external_tables(tables),
-            subqueries_for_sets(subqueries_for_sets_),
-            has_global_subqueries(has_global_subqueries_)
-        {}
+        Data(
+            ContextPtr context_,
+            size_t subquery_depth_,
+            bool is_remote_,
+            TemporaryTablesMapping & tables,
+            SubqueriesForSets & subqueries_for_sets_,
+            bool & has_global_subqueries_)
+            : WithContext(context_)
+            , subquery_depth(subquery_depth_)
+            , is_remote(is_remote_)
+            , external_table_id(1)
+            , external_tables(tables)
+            , subqueries_for_sets(subqueries_for_sets_)
+            , has_global_subqueries(has_global_subqueries_)
+        {
+        }
 
         void addExternalStorage(ASTPtr & ast, bool set_alias = false)
         {
@@ -80,7 +85,7 @@ public:
                 /// If this is already an external table, you do not need to add anything. Just remember its presence.
                 auto temporary_table_name = getIdentifierName(subquery_or_table_name);
                 bool exists_in_local_map = external_tables.end() != external_tables.find(temporary_table_name);
-                bool exists_in_context = context.tryResolveStorageID(StorageID("", temporary_table_name), Context::ResolveExternal);
+                bool exists_in_context = getContext()->tryResolveStorageID(StorageID("", temporary_table_name), Context::ResolveExternal);
                 if (exists_in_local_map || exists_in_context)
                     return;
             }
@@ -97,14 +102,17 @@ public:
                 }
             }
 
-            auto interpreter = interpretSubquery(subquery_or_table_name, context, subquery_depth, {});
+            auto interpreter = interpretSubquery(subquery_or_table_name, getContext(), subquery_depth, {});
 
             Block sample = interpreter->getSampleBlock();
             NamesAndTypesList columns = sample.getNamesAndTypesList();
 
             auto external_storage_holder = std::make_shared<TemporaryTableHolder>(
-                    context, ColumnsDescription{columns}, ConstraintsDescription{}, nullptr,
-                    /*create_for_global_subquery*/ true);
+                getContext(),
+                ColumnsDescription{columns},
+                ConstraintsDescription{},
+                nullptr,
+                /*create_for_global_subquery*/ true);
             StoragePtr external_storage = external_storage_holder->getTable();
 
             /** We replace the subquery with the name of the temporary table.
@@ -136,10 +144,10 @@ public:
 
             external_tables[external_table_name] = external_storage_holder;
 
-            if (context.getSettingsRef().use_index_for_in_with_subqueries)
+            if (getContext()->getSettingsRef().use_index_for_in_with_subqueries)
             {
                 auto external_table = external_storage_holder->getTable();
-                auto table_out = external_table->write({}, external_table->getInMemoryMetadataPtr(), context);
+                auto table_out = external_table->write({}, external_table->getInMemoryMetadataPtr(), getContext());
                 auto io = interpreter->execute();
                 PullingPipelineExecutor executor(io.pipeline);
 
@@ -176,9 +184,7 @@ public:
     static bool needChildVisit(ASTPtr &, const ASTPtr & child)
     {
         /// We do not go into subqueries.
-        if (child->as<ASTSelectQuery>())
-            return false;
-        return true;
+        return !child->as<ASTSelectQuery>();
     }
 
 private:
diff --git a/src/Interpreters/GroupByFunctionKeysVisitor.h b/src/Interpreters/GroupByFunctionKeysVisitor.h
index 0c745be33ed..855723307d6 100644
--- a/src/Interpreters/GroupByFunctionKeysVisitor.h
+++ b/src/Interpreters/GroupByFunctionKeysVisitor.h
@@ -97,7 +97,7 @@ public:
         KeepFunctionVisitor::Data keep_data{data.key_names_to_keep, keep_key};
         KeepFunctionVisitor(keep_data).visit(function_node->arguments);
 
-        if (!keep_key)
+        if (!keep_key) //-V547
             (data.key_names_to_keep).erase(function_node->getColumnName());
     }
 
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index fcd89aed84d..09c4c538347 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -384,7 +384,7 @@ template <typename Value, typename Mapped> struct KeyGetterForTypeImpl<HashJoin:
 };
 template <typename Value, typename Mapped> struct KeyGetterForTypeImpl<HashJoin::Type::keys256, Value, Mapped>
 {
-    using Type = ColumnsHashing::HashMethodKeysFixed<Value, DummyUInt256, Mapped, false, false, false, use_offset>;
+    using Type = ColumnsHashing::HashMethodKeysFixed<Value, UInt256, Mapped, false, false, false, use_offset>;
 };
 template <typename Value, typename Mapped> struct KeyGetterForTypeImpl<HashJoin::Type::hashed, Value, Mapped>
 {
@@ -680,7 +680,19 @@ namespace
 class AddedColumns
 {
 public:
-    using TypeAndNames = std::vector<std::pair<decltype(ColumnWithTypeAndName::type), decltype(ColumnWithTypeAndName::name)>>;
+
+    struct TypeAndName
+    {
+        DataTypePtr type;
+        String name;
+        String qualified_name;
+
+        TypeAndName(DataTypePtr type_, const String & name_, const String & qualified_name_)
+            : type(type_)
+            , name(name_)
+            , qualified_name(qualified_name_)
+        {}
+    };
 
     AddedColumns(const Block & block_with_columns_to_add,
                  const Block & block,
@@ -705,27 +717,30 @@ public:
 
         for (const auto & src_column : block_with_columns_to_add)
         {
+            /// Column names `src_column.name` and `qualified_name` can differ for StorageJoin,
+            /// because it uses not qualified right block column names
+            auto qualified_name = join.getTableJoin().renamedRightColumnName(src_column.name);
             /// Don't insert column if it's in left block
-            if (!block.has(src_column.name))
-                addColumn(src_column);
+            if (!block.has(qualified_name))
+                addColumn(src_column, qualified_name);
         }
 
         if (is_asof_join)
         {
             const ColumnWithTypeAndName & right_asof_column = join.rightAsofKeyColumn();
-            addColumn(right_asof_column);
+            addColumn(right_asof_column, right_asof_column.name);
             left_asof_key = key_columns.back();
         }
 
         for (auto & tn : type_name)
-            right_indexes.push_back(saved_block_sample.getPositionByName(tn.second));
+            right_indexes.push_back(saved_block_sample.getPositionByName(tn.name));
     }
 
     size_t size() const { return columns.size(); }
 
     ColumnWithTypeAndName moveColumn(size_t i)
     {
-        return ColumnWithTypeAndName(std::move(columns[i]), type_name[i].first, type_name[i].second);
+        return ColumnWithTypeAndName(std::move(columns[i]), type_name[i].type, type_name[i].qualified_name);
     }
 
     template <bool has_defaults>
@@ -748,7 +763,7 @@ public:
         if (lazy_defaults_count)
         {
             for (size_t j = 0, size = right_indexes.size(); j < size; ++j)
-                JoinCommon::addDefaultValues(*columns[j], type_name[j].first, lazy_defaults_count);
+                JoinCommon::addDefaultValues(*columns[j], type_name[j].type, lazy_defaults_count);
             lazy_defaults_count = 0;
         }
     }
@@ -764,7 +779,7 @@ public:
     bool need_filter = false;
 
 private:
-    TypeAndNames type_name;
+    std::vector<TypeAndName> type_name;
     MutableColumns columns;
     std::vector<size_t> right_indexes;
     size_t lazy_defaults_count = 0;
@@ -773,11 +788,11 @@ private:
     ASOF::Inequality asof_inequality;
     const IColumn * left_asof_key = nullptr;
 
-    void addColumn(const ColumnWithTypeAndName & src_column)
+    void addColumn(const ColumnWithTypeAndName & src_column, const std::string & qualified_name)
     {
         columns.push_back(src_column.column->cloneEmpty());
         columns.back()->reserve(src_column.column->size());
-        type_name.emplace_back(src_column.type, src_column.name);
+        type_name.emplace_back(src_column.type, src_column.name, qualified_name);
     }
 };
 
@@ -1081,7 +1096,8 @@ void HashJoin::joinBlockImpl(
 
             const auto & col = block.getByName(left_name);
             bool is_nullable = nullable_right_side || right_key.type->isNullable();
-            block.insert(correctNullability({col.column, col.type, right_key.name}, is_nullable));
+            auto right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
+            block.insert(correctNullability({col.column, col.type, right_col_name}, is_nullable));
         }
     }
     else if (has_required_right_keys)
@@ -1106,7 +1122,8 @@ void HashJoin::joinBlockImpl(
             bool is_nullable = nullable_right_side || right_key.type->isNullable();
 
             ColumnPtr thin_column = filterWithBlanks(col.column, filter);
-            block.insert(correctNullability({thin_column, col.type, right_key.name}, is_nullable, null_map_filter));
+            auto right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
+            block.insert(correctNullability({thin_column, col.type, right_col_name}, is_nullable, null_map_filter));
 
             if constexpr (need_replication)
                 right_keys_to_replicate.push_back(block.getPositionByName(right_key.name));
@@ -1311,7 +1328,12 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
 
 void HashJoin::joinTotals(Block & block) const
 {
-    JoinCommon::joinTotals(totals, sample_block_with_columns_to_add, *table_join, block);
+    Block sample_right_block = sample_block_with_columns_to_add.cloneEmpty();
+    /// For StorageJoin column names isn't qualified in sample_block_with_columns_to_add
+    for (auto & col : sample_right_block)
+        col.name = getTableJoin().renamedRightColumnName(col.name);
+
+    JoinCommon::joinTotals(totals, sample_right_block, *table_join, block);
 }
 
 
@@ -1504,6 +1526,7 @@ BlockInputStreamPtr HashJoin::createStreamWithNonJoinedRows(const Block & result
 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)
     {
         used_flags.reinit<kind_, strictness_>(map.getBufferSizeInCells(data->type) + 1);
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index b726de44f3a..5ec8ed92f10 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -134,6 +134,8 @@ class HashJoin : public IJoin
 public:
     HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block, bool any_take_last_row_ = false);
 
+    const TableJoin & getTableJoin() const override { return *table_join; }
+
     /** Add block of data from right hand of JOIN to the map.
       * Returns false, if some limit was exceeded and you should not insert more data.
       */
@@ -157,6 +159,8 @@ public:
 
     void joinTotals(Block & block) const override;
 
+    bool isFilled() const override { return from_storage_join || data->type == Type::DICT; }
+
     /** For RIGHT and FULL JOINs.
       * A stream that will contain default values from left table, joined with rows from right table, that was not joined before.
       * Use only after all calls to joinBlock was done.
@@ -220,15 +224,15 @@ public:
     template <typename Mapped>
     struct MapsTemplate
     {
-        std::unique_ptr<FixedHashMap<UInt8, Mapped>>   key8;
-        std::unique_ptr<FixedHashMap<UInt16, Mapped>> key16;
-        std::unique_ptr<HashMap<UInt32, Mapped, HashCRC32<UInt32>>>                     key32;
-        std::unique_ptr<HashMap<UInt64, Mapped, HashCRC32<UInt64>>>                     key64;
-        std::unique_ptr<HashMapWithSavedHash<StringRef, Mapped>>                        key_string;
-        std::unique_ptr<HashMapWithSavedHash<StringRef, Mapped>>                        key_fixed_string;
-        std::unique_ptr<HashMap<UInt128, Mapped, UInt128HashCRC32>>                     keys128;
-        std::unique_ptr<HashMap<DummyUInt256, Mapped, UInt256HashCRC32>>                keys256;
-        std::unique_ptr<HashMap<UInt128, Mapped, UInt128TrivialHash>>                   hashed;
+        std::unique_ptr<FixedHashMap<UInt8, Mapped>>                  key8;
+        std::unique_ptr<FixedHashMap<UInt16, Mapped>>                 key16;
+        std::unique_ptr<HashMap<UInt32, Mapped, HashCRC32<UInt32>>>   key32;
+        std::unique_ptr<HashMap<UInt64, Mapped, HashCRC32<UInt64>>>   key64;
+        std::unique_ptr<HashMapWithSavedHash<StringRef, Mapped>>      key_string;
+        std::unique_ptr<HashMapWithSavedHash<StringRef, Mapped>>      key_fixed_string;
+        std::unique_ptr<HashMap<UInt128, Mapped, UInt128HashCRC32>>   keys128;
+        std::unique_ptr<HashMap<UInt256, Mapped, UInt256HashCRC32>>   keys256;
+        std::unique_ptr<HashMap<UInt128, Mapped, UInt128TrivialHash>> hashed;
 
         void create(Type which)
         {
@@ -342,6 +346,9 @@ private:
     ASTTableJoin::Kind kind;
     ASTTableJoin::Strictness strictness;
 
+    /// 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;
 
diff --git a/src/Interpreters/IExternalLoaderConfigRepository.h b/src/Interpreters/IExternalLoaderConfigRepository.h
index 866aa0b877f..0d0c8acc01a 100644
--- a/src/Interpreters/IExternalLoaderConfigRepository.h
+++ b/src/Interpreters/IExternalLoaderConfigRepository.h
@@ -23,7 +23,7 @@ class IExternalLoaderConfigRepository
 {
 public:
     /// Returns the name of the repository.
-    virtual const std::string & getName() const = 0;
+    virtual std::string getName() const = 0;
 
     /// Whether this repository is temporary:
     /// it's created and destroyed while executing the same query.
@@ -42,7 +42,7 @@ public:
     /// Load configuration from some concrete source to AbstractConfiguration
     virtual LoadablesConfigurationPtr load(const std::string & path) = 0;
 
-    virtual ~IExternalLoaderConfigRepository() {}
+    virtual ~IExternalLoaderConfigRepository() = default;
 };
 
 }
diff --git a/src/Interpreters/IInterpreter.cpp b/src/Interpreters/IInterpreter.cpp
index b219a9cd923..1b0e9738429 100644
--- a/src/Interpreters/IInterpreter.cpp
+++ b/src/Interpreters/IInterpreter.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 void IInterpreter::extendQueryLogElem(
-    QueryLogElement & elem, const ASTPtr & ast, const Context & context, const String & query_database, const String & query_table) const
+    QueryLogElement & elem, const ASTPtr & ast, ContextPtr context, const String & query_database, const String & query_table) const
 {
     if (!query_database.empty() && query_table.empty())
     {
@@ -12,7 +12,8 @@ void IInterpreter::extendQueryLogElem(
     }
     else if (!query_table.empty())
     {
-        auto quoted_database = query_database.empty() ? backQuoteIfNeed(context.getCurrentDatabase()) : backQuoteIfNeed(query_database);
+        auto quoted_database = query_database.empty() ? backQuoteIfNeed(context->getCurrentDatabase())
+                                                      : backQuoteIfNeed(query_database);
         elem.query_databases.insert(quoted_database);
         elem.query_tables.insert(quoted_database + "." + backQuoteIfNeed(query_table));
     }
diff --git a/src/Interpreters/IInterpreter.h b/src/Interpreters/IInterpreter.h
index aaecf735e60..1b4eada3c9f 100644
--- a/src/Interpreters/IInterpreter.h
+++ b/src/Interpreters/IInterpreter.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <DataStreams/BlockIO.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
 struct QueryLogElement;
-class Context;
 
 /** Interpreters interface for different queries.
   */
@@ -27,11 +27,11 @@ public:
     void extendQueryLogElem(
         QueryLogElement & elem,
         const ASTPtr & ast,
-        const Context & context,
+        ContextPtr context,
         const String & query_database,
         const String & query_table) const;
 
-    virtual void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, const Context &) const {}
+    virtual void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, ContextPtr) const {}
 
     virtual ~IInterpreter() = default;
 };
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index 833625a6f3e..7233ab332dd 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-void IInterpreterUnionOrSelectQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const
+void IInterpreterUnionOrSelectQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const
 {
     elem.query_kind = "Select";
 }
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.h b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
index 128072fb103..0b07f27e14a 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.h
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
@@ -10,9 +10,9 @@ namespace DB
 class IInterpreterUnionOrSelectQuery : public IInterpreter
 {
 public:
-    IInterpreterUnionOrSelectQuery(const ASTPtr & query_ptr_, const Context & context_, const SelectQueryOptions & options_)
+    IInterpreterUnionOrSelectQuery(const ASTPtr & query_ptr_, ContextPtr context_, const SelectQueryOptions & options_)
         : query_ptr(query_ptr_)
-        , context(std::make_shared<Context>(context_))
+        , context(Context::createCopy(context_))
         , options(options_)
         , max_streams(context->getSettingsRef().max_threads)
     {
@@ -28,11 +28,11 @@ public:
 
     size_t getMaxStreams() const { return max_streams; }
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const override;
 
 protected:
     ASTPtr query_ptr;
-    std::shared_ptr<Context> context;
+    ContextMutablePtr context;
     Block result_header;
     SelectQueryOptions options;
     size_t max_streams = 1;
diff --git a/src/Interpreters/IJoin.h b/src/Interpreters/IJoin.h
index ade6eaa0cc9..0f486fbe523 100644
--- a/src/Interpreters/IJoin.h
+++ b/src/Interpreters/IJoin.h
@@ -14,11 +14,15 @@ class Block;
 struct ExtraBlock;
 using ExtraBlockPtr = std::shared_ptr<ExtraBlock>;
 
+class TableJoin;
+
 class IJoin
 {
 public:
     virtual ~IJoin() = default;
 
+    virtual const TableJoin & getTableJoin() const = 0;
+
     /// Add block of data from right hand of JOIN.
     /// @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;
@@ -37,6 +41,10 @@ public:
     virtual size_t getTotalByteCount() const = 0;
     virtual bool alwaysReturnsEmptySet() const { return false; }
 
+    /// StorageJoin/Dictionary is already filled. No need to call addJoinedBlock.
+    /// Different query plan is used for such joins.
+    virtual bool isFilled() const { return false; }
+
     virtual BlockInputStreamPtr createStreamWithNonJoinedRows(const Block &, UInt64) const { return {}; }
 };
 
diff --git a/src/Interpreters/IdentifierSemantic.cpp b/src/Interpreters/IdentifierSemantic.cpp
index 81bd499ea2e..8b8eab219ba 100644
--- a/src/Interpreters/IdentifierSemantic.cpp
+++ b/src/Interpreters/IdentifierSemantic.cpp
@@ -3,6 +3,8 @@
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/StorageID.h>
 
+#include <Parsers/ASTFunction.h>
+
 namespace DB
 {
 
@@ -249,4 +251,86 @@ void IdentifierSemantic::setColumnLongName(ASTIdentifier & identifier, const Dat
     }
 }
 
+std::optional<size_t> IdentifierSemantic::getIdentMembership(const ASTIdentifier & ident, const std::vector<TableWithColumnNamesAndTypes> & tables)
+{
+    std::optional<size_t> table_pos = IdentifierSemantic::getMembership(ident);
+    if (table_pos)
+        return table_pos;
+    return IdentifierSemantic::chooseTableColumnMatch(ident, tables, true);
+}
+
+std::optional<size_t>
+IdentifierSemantic::getIdentsMembership(ASTPtr ast, const std::vector<TableWithColumnNamesAndTypes> & tables, const Aliases & aliases)
+{
+    auto idents = IdentifiersCollector::collect(ast);
+
+    std::optional<size_t> result;
+    for (const auto * ident : idents)
+    {
+        /// short name clashes with alias, ambiguous
+        if (ident->isShort() && aliases.count(ident->shortName()))
+            return {};
+        const auto pos = getIdentMembership(*ident, tables);
+        if (!pos)
+            return {};
+        /// identifiers from different tables
+        if (result && *pos != *result)
+            return {};
+        result = pos;
+    }
+    return result;
+}
+
+IdentifiersCollector::ASTIdentifiers IdentifiersCollector::collect(const ASTPtr & node)
+{
+    IdentifiersCollector::Data ident_data;
+    ConstInDepthNodeVisitor<IdentifiersCollector, true> ident_visitor(ident_data);
+    ident_visitor.visit(node);
+    return ident_data.idents;
+}
+
+bool IdentifiersCollector::needChildVisit(const ASTPtr &, const ASTPtr &)
+{
+    return true;
+}
+
+void IdentifiersCollector::visit(const ASTPtr & node, IdentifiersCollector::Data & data)
+{
+    if (const auto * ident = node->as<ASTIdentifier>())
+        data.idents.push_back(ident);
+}
+
+
+IdentifierMembershipCollector::IdentifierMembershipCollector(const ASTSelectQuery & select, ContextPtr context)
+{
+    if (ASTPtr with = select.with())
+        QueryAliasesNoSubqueriesVisitor(aliases).visit(with);
+    QueryAliasesNoSubqueriesVisitor(aliases).visit(select.select());
+
+    tables = getDatabaseAndTablesWithColumns(getTableExpressions(select), context);
+}
+
+std::optional<size_t> IdentifierMembershipCollector::getIdentsMembership(ASTPtr ast) const
+{
+    return IdentifierSemantic::getIdentsMembership(ast, tables, aliases);
+}
+
+static void collectConjunctions(const ASTPtr & node, std::vector<ASTPtr> & members)
+{
+    if (const auto * func = node->as<ASTFunction>(); func && func->name == "and")
+    {
+        for (const auto & child : func->arguments->children)
+            collectConjunctions(child, members);
+        return;
+    }
+    members.push_back(node);
+}
+
+std::vector<ASTPtr> collectConjunctions(const ASTPtr & node)
+{
+    std::vector<ASTPtr> members;
+    collectConjunctions(node, members);
+    return members;
+}
+
 }
diff --git a/src/Interpreters/IdentifierSemantic.h b/src/Interpreters/IdentifierSemantic.h
index 80b55ba0537..20ef3248f7c 100644
--- a/src/Interpreters/IdentifierSemantic.h
+++ b/src/Interpreters/IdentifierSemantic.h
@@ -2,8 +2,15 @@
 
 #include <optional>
 
-#include <Parsers/ASTIdentifier.h>
+#include <Interpreters/Aliases.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/QueryAliasesVisitor.h>
+#include <Interpreters/getHeaderForProcessingStage.h>
+#include <Interpreters/getTableExpressions.h>
+
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
@@ -59,9 +66,48 @@ struct IdentifierSemantic
     static std::optional<size_t> chooseTableColumnMatch(const ASTIdentifier &, const TablesWithColumns & tables,
                             bool allow_ambiguous = false);
 
+    static std::optional<size_t> getIdentMembership(const ASTIdentifier & ident, const std::vector<TableWithColumnNamesAndTypes> & tables);
+
+    /// Collect common table membership for identifiers in expression
+    /// If membership cannot be established or there are several identifies from different tables, return empty optional
+    static std::optional<size_t>
+    getIdentsMembership(ASTPtr ast, const std::vector<TableWithColumnNamesAndTypes> & tables, const Aliases & aliases);
+
 private:
     static bool doesIdentifierBelongTo(const ASTIdentifier & identifier, const String & database, const String & table);
     static bool doesIdentifierBelongTo(const ASTIdentifier & identifier, const String & table);
 };
 
+
+/// Collect all identifies from AST recursively
+class IdentifiersCollector
+{
+public:
+    using ASTIdentPtr = const ASTIdentifier *;
+    using ASTIdentifiers = std::vector<ASTIdentPtr>;
+    struct Data
+    {
+        ASTIdentifiers idents;
+    };
+
+    static void visit(const ASTPtr & node, Data & data);
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &);
+    static ASTIdentifiers collect(const ASTPtr & node);
+};
+
+/// Collect identifier table membership considering aliases
+class IdentifierMembershipCollector
+{
+public:
+    IdentifierMembershipCollector(const ASTSelectQuery & select, ContextPtr context);
+    std::optional<size_t> getIdentsMembership(ASTPtr ast) const;
+
+private:
+    std::vector<TableWithColumnNamesAndTypes> tables;
+    Aliases aliases;
+};
+
+/// Split expression `expr_1 AND expr_2 AND ... AND expr_n` into vector `[expr_1, expr_2, ..., expr_n]`
+std::vector<ASTPtr> collectConjunctions(const ASTPtr & node);
+
 }
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
index 2e922393131..e173f1554f4 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
@@ -25,9 +25,9 @@ namespace ErrorCodes
 namespace
 {
 
-StoragePtr tryGetTable(const ASTPtr & database_and_table, const Context & context)
+StoragePtr tryGetTable(const ASTPtr & database_and_table, ContextPtr context)
 {
-    auto table_id = context.tryResolveStorageID(database_and_table);
+    auto table_id = context->tryResolveStorageID(database_and_table);
     if (!table_id)
         return {};
     return DatabaseCatalog::instance().tryGetTable(table_id, context);
@@ -35,12 +35,21 @@ StoragePtr tryGetTable(const ASTPtr & database_and_table, const Context & contex
 
 using CheckShardsAndTables = InJoinSubqueriesPreprocessor::CheckShardsAndTables;
 
-struct NonGlobalTableData
+struct NonGlobalTableData : public WithContext
 {
     using TypeToVisit = ASTTableExpression;
 
+    NonGlobalTableData(
+        ContextPtr context_,
+        const CheckShardsAndTables & checker_,
+        std::vector<ASTPtr> & renamed_tables_,
+        ASTFunction * function_,
+        ASTTableJoin * table_join_)
+        : WithContext(context_), checker(checker_), renamed_tables(renamed_tables_), function(function_), table_join(table_join_)
+    {
+    }
+
     const CheckShardsAndTables & checker;
-    const Context & context;
     std::vector<ASTPtr> & renamed_tables;
     ASTFunction * function = nullptr;
     ASTTableJoin * table_join = nullptr;
@@ -55,9 +64,9 @@ struct NonGlobalTableData
 private:
     void renameIfNeeded(ASTPtr & database_and_table)
     {
-        const DistributedProductMode distributed_product_mode = context.getSettingsRef().distributed_product_mode;
+        const DistributedProductMode distributed_product_mode = getContext()->getSettingsRef().distributed_product_mode;
 
-        StoragePtr storage = tryGetTable(database_and_table, context);
+        StoragePtr storage = tryGetTable(database_and_table, getContext());
         if (!storage || !checker.hasAtLeastTwoShards(*storage))
             return;
 
@@ -119,11 +128,17 @@ using NonGlobalTableVisitor = InDepthNodeVisitor<NonGlobalTableMatcher, true>;
 class NonGlobalSubqueryMatcher
 {
 public:
-    struct Data
+    struct Data : public WithContext
     {
+        using RenamedTables = std::vector<std::pair<ASTPtr, std::vector<ASTPtr>>>;
+
+        Data(ContextPtr context_, const CheckShardsAndTables & checker_, RenamedTables & renamed_tables_)
+        : WithContext(context_), checker(checker_), renamed_tables(renamed_tables_)
+        {
+        }
+
         const CheckShardsAndTables & checker;
-        const Context & context;
-        std::vector<std::pair<ASTPtr, std::vector<ASTPtr>>> & renamed_tables;
+        RenamedTables & renamed_tables;
     };
 
     static void visit(ASTPtr & node, Data & data)
@@ -161,9 +176,9 @@ private:
             }
             auto & subquery = node.arguments->children.at(1);
             std::vector<ASTPtr> renamed;
-            NonGlobalTableVisitor::Data table_data{data.checker, data.context, renamed, &node, nullptr};
+            NonGlobalTableVisitor::Data table_data(data.getContext(), data.checker, renamed, &node, nullptr);
             NonGlobalTableVisitor(table_data).visit(subquery);
-            if (!renamed.empty())
+            if (!renamed.empty()) //-V547
                 data.renamed_tables.emplace_back(subquery, std::move(renamed));
         }
     }
@@ -179,9 +194,9 @@ private:
             if (auto & subquery = node.table_expression->as<ASTTableExpression>()->subquery)
             {
                 std::vector<ASTPtr> renamed;
-                NonGlobalTableVisitor::Data table_data{data.checker, data.context, renamed, nullptr, table_join};
+                NonGlobalTableVisitor::Data table_data(data.getContext(), data.checker, renamed, nullptr, table_join);
                 NonGlobalTableVisitor(table_data).visit(subquery);
-                if (!renamed.empty())
+                if (!renamed.empty()) //-V547
                     data.renamed_tables.emplace_back(subquery, std::move(renamed));
             }
         }
@@ -202,7 +217,7 @@ void InJoinSubqueriesPreprocessor::visit(ASTPtr & ast) const
     if (!query || !query->tables())
         return;
 
-    if (context.getSettingsRef().distributed_product_mode == DistributedProductMode::ALLOW)
+    if (getContext()->getSettingsRef().distributed_product_mode == DistributedProductMode::ALLOW)
         return;
 
     const auto & tables_in_select_query = query->tables()->as<ASTTablesInSelectQuery &>();
@@ -221,12 +236,12 @@ void InJoinSubqueriesPreprocessor::visit(ASTPtr & ast) const
 
     /// If not really distributed table, skip it.
     {
-        StoragePtr storage = tryGetTable(table_expression->database_and_table_name, context);
+        StoragePtr storage = tryGetTable(table_expression->database_and_table_name, getContext());
         if (!storage || !checker->hasAtLeastTwoShards(*storage))
             return;
     }
 
-    NonGlobalSubqueryVisitor::Data visitor_data{*checker, context, renamed_tables};
+    NonGlobalSubqueryVisitor::Data visitor_data{getContext(), *checker, renamed_tables};
     NonGlobalSubqueryVisitor(visitor_data).visit(ast);
 }
 
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.h b/src/Interpreters/InJoinSubqueriesPreprocessor.h
index 4d46fabfd99..92a408e7ae3 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.h
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.h
@@ -1,19 +1,18 @@
 #pragma once
 
-#include <common/types.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
+#include <common/types.h>
 
-#include <string>
 #include <memory>
+#include <string>
 
 
 namespace DB
 {
 
 class ASTSelectQuery;
-class Context;
-
 
 /** Scheme of operation:
   *
@@ -32,7 +31,7 @@ class Context;
   * Do not recursively preprocess subqueries, as it will be done by calling code.
   */
 
-class InJoinSubqueriesPreprocessor
+class InJoinSubqueriesPreprocessor : WithContext
 {
 public:
     using SubqueryTables = std::vector<std::pair<ASTPtr, std::vector<ASTPtr>>>;  /// {subquery, renamed_tables}
@@ -47,17 +46,17 @@ public:
         virtual ~CheckShardsAndTables() {}
     };
 
-    InJoinSubqueriesPreprocessor(const Context & context_, SubqueryTables & renamed_tables_,
-                                 CheckShardsAndTables::Ptr _checker = std::make_unique<CheckShardsAndTables>())
-        : context(context_)
-        , renamed_tables(renamed_tables_)
-        , checker(std::move(_checker))
-    {}
+    InJoinSubqueriesPreprocessor(
+        ContextPtr context_,
+        SubqueryTables & renamed_tables_,
+        CheckShardsAndTables::Ptr _checker = std::make_unique<CheckShardsAndTables>())
+        : WithContext(context_), renamed_tables(renamed_tables_), checker(std::move(_checker))
+    {
+    }
 
     void visit(ASTPtr & ast) const;
 
 private:
-    const Context & context;
     SubqueryTables & renamed_tables;
     CheckShardsAndTables::Ptr checker;
 };
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 4a8aef414e4..25cb679094b 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -1,24 +1,27 @@
 #include <Interpreters/InterpreterAlterQuery.h>
-#include <Interpreters/executeDDLQueryOnCluster.h>
-#include <Interpreters/MutationsInterpreter.h>
+
+#include <Access/AccessRightsElement.h>
+#include <Databases/DatabaseFactory.h>
+#include <Databases/DatabaseReplicated.h>
+#include <Databases/IDatabase.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/QueryLog.h>
+#include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTAssignment.h>
-#include <Storages/IStorage.h>
 #include <Storages/AlterCommands.h>
-#include <Storages/MutationCommands.h>
-#include <Storages/PartitionCommands.h>
+#include <Storages/IStorage.h>
 #include <Storages/LiveView/LiveViewCommands.h>
 #include <Storages/LiveView/StorageLiveView.h>
-#include <Access/AccessRightsElement.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/PartitionCommands.h>
 #include <Common/typeid_cast.h>
+
 #include <boost/range/algorithm_ext/push_back.hpp>
+
 #include <algorithm>
-#include <Databases/IDatabase.h>
-#include <Databases/DatabaseReplicated.h>
-#include <Databases/DatabaseFactory.h>
 
 
 namespace DB
@@ -32,8 +35,7 @@ namespace ErrorCodes
 }
 
 
-InterpreterAlterQuery::InterpreterAlterQuery(const ASTPtr & query_ptr_, const Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterAlterQuery::InterpreterAlterQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -44,22 +46,23 @@ BlockIO InterpreterAlterQuery::execute()
 
 
     if (!alter.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
-    context.checkAccess(getRequiredAccess());
-    auto table_id = context.resolveStorageID(alter, Context::ResolveOrdinary);
+    getContext()->checkAccess(getRequiredAccess());
+    auto table_id = getContext()->resolveStorageID(alter, Context::ResolveOrdinary);
     query_ptr->as<ASTAlterQuery &>().database = table_id.database_name;
 
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
-    if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+    if (typeid_cast<DatabaseReplicated *>(database.get())
+        && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
     {
         auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
         guard->releaseTableLock();
-        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
     }
 
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
-    auto alter_lock = table->lockForAlter(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
+    auto alter_lock = table->lockForAlter(getContext()->getCurrentQueryId(), 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,
@@ -105,15 +108,15 @@ BlockIO InterpreterAlterQuery::execute()
 
     if (!mutation_commands.empty())
     {
-        table->checkMutationIsPossible(mutation_commands, context.getSettingsRef());
-        MutationsInterpreter(table, metadata_snapshot, mutation_commands, context, false).validate();
-        table->mutate(mutation_commands, context);
+        table->checkMutationIsPossible(mutation_commands, getContext()->getSettingsRef());
+        MutationsInterpreter(table, metadata_snapshot, mutation_commands, getContext(), false).validate();
+        table->mutate(mutation_commands, getContext());
     }
 
     if (!partition_commands.empty())
     {
-        table->checkAlterPartitionIsPossible(partition_commands, metadata_snapshot, context.getSettingsRef());
-        auto partition_commands_pipe = table->alterPartition(metadata_snapshot, partition_commands, context);
+        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));
     }
@@ -136,10 +139,10 @@ BlockIO InterpreterAlterQuery::execute()
     if (!alter_commands.empty())
     {
         StorageInMemoryMetadata metadata = table->getInMemoryMetadata();
-        alter_commands.validate(metadata, context);
+        alter_commands.validate(metadata, getContext());
         alter_commands.prepare(metadata);
-        table->checkAlterIsPossible(alter_commands, context);
-        table->alter(alter_commands, context, alter_lock);
+        table->checkAlterIsPossible(alter_commands, getContext());
+        table->alter(alter_commands, getContext(), alter_lock);
     }
 
     return res;
@@ -177,11 +180,6 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_UPDATE, database, table, column_names_from_update_assignments());
             break;
         }
-        case ASTAlterCommand::DELETE:
-        {
-            required_access.emplace_back(AccessType::ALTER_DELETE, database, table);
-            break;
-        }
         case ASTAlterCommand::ADD_COLUMN:
         {
             required_access.emplace_back(AccessType::ALTER_ADD_COLUMN, database, table, column_name_from_col_decl());
@@ -243,11 +241,25 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_DROP_CONSTRAINT, database, table);
             break;
         }
-        case ASTAlterCommand::MODIFY_TTL:
+        case ASTAlterCommand::ADD_PROJECTION:
         {
-            required_access.emplace_back(AccessType::ALTER_TTL, database, table);
+            required_access.emplace_back(AccessType::ALTER_ADD_PROJECTION, database, table);
             break;
         }
+        case ASTAlterCommand::DROP_PROJECTION:
+        {
+            if (command.clear_projection)
+                required_access.emplace_back(AccessType::ALTER_CLEAR_PROJECTION, database, table);
+            else
+                required_access.emplace_back(AccessType::ALTER_DROP_PROJECTION, database, table);
+            break;
+        }
+        case ASTAlterCommand::MATERIALIZE_PROJECTION:
+        {
+            required_access.emplace_back(AccessType::ALTER_MATERIALIZE_PROJECTION, database, table);
+            break;
+        }
+        case ASTAlterCommand::MODIFY_TTL:
         case ASTAlterCommand::REMOVE_TTL:
         {
             required_access.emplace_back(AccessType::ALTER_TTL, database, table);
@@ -268,7 +280,8 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::INSERT, database, table);
             break;
         }
-        case ASTAlterCommand::DROP_PARTITION: [[fallthrough]];
+        case ASTAlterCommand::DELETE:
+        case ASTAlterCommand::DROP_PARTITION:
         case ASTAlterCommand::DROP_DETACHED_PARTITION:
         {
             required_access.emplace_back(AccessType::ALTER_DELETE, database, table);
@@ -328,7 +341,7 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
     return required_access;
 }
 
-void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const
+void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const
 {
     const auto & alter = ast->as<const ASTAlterQuery &>();
 
@@ -358,14 +371,14 @@ void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const
 
             if (!command->from_table.empty())
             {
-                String database = command->from_database.empty() ? context.getCurrentDatabase() : command->from_database;
+                String database = command->from_database.empty() ? getContext()->getCurrentDatabase() : command->from_database;
                 elem.query_databases.insert(database);
                 elem.query_tables.insert(database + "." + command->from_table);
             }
 
             if (!command->to_table.empty())
             {
-                String database = command->to_database.empty() ? context.getCurrentDatabase() : command->to_database;
+                String database = command->to_database.empty() ? getContext()->getCurrentDatabase() : command->to_database;
                 elem.query_databases.insert(database);
                 elem.query_tables.insert(database + "." + command->to_table);
             }
diff --git a/src/Interpreters/InterpreterAlterQuery.h b/src/Interpreters/InterpreterAlterQuery.h
index 37084844f6c..ae9750b0b62 100644
--- a/src/Interpreters/InterpreterAlterQuery.h
+++ b/src/Interpreters/InterpreterAlterQuery.h
@@ -6,7 +6,7 @@
 
 namespace DB
 {
-class Context;
+
 class AccessRightsElements;
 class ASTAlterCommand;
 
@@ -14,23 +14,21 @@ class ASTAlterCommand;
 /** Allows you add or remove a column in the table.
   * It also allows you to manipulate the partitions of the MergeTree family tables.
   */
-class InterpreterAlterQuery : public IInterpreter
+class InterpreterAlterQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterAlterQuery(const ASTPtr & query_ptr_, const Context & context_);
+    InterpreterAlterQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
     static AccessRightsElements getRequiredAccessForCommand(const ASTAlterCommand & command, const String & database, const String & table);
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context & context) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr context) const override;
 
 private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-
-    const Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterCheckQuery.cpp b/src/Interpreters/InterpreterCheckQuery.cpp
index b3cd807abe5..e8a4f884dd0 100644
--- a/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/src/Interpreters/InterpreterCheckQuery.cpp
@@ -29,8 +29,7 @@ NamesAndTypes getBlockStructure()
 }
 
 
-InterpreterCheckQuery::InterpreterCheckQuery(const ASTPtr & query_ptr_, const Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterCheckQuery::InterpreterCheckQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -38,14 +37,14 @@ InterpreterCheckQuery::InterpreterCheckQuery(const ASTPtr & query_ptr_, const Co
 BlockIO InterpreterCheckQuery::execute()
 {
     const auto & check = query_ptr->as<ASTCheckQuery &>();
-    auto table_id = context.resolveStorageID(check, Context::ResolveOrdinary);
+    auto table_id = getContext()->resolveStorageID(check, Context::ResolveOrdinary);
 
-    context.checkAccess(AccessType::SHOW_TABLES, table_id);
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
-    auto check_results = table->checkData(query_ptr, context);
+    getContext()->checkAccess(AccessType::SHOW_TABLES, table_id);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
+    auto check_results = table->checkData(query_ptr, getContext());
 
     Block block;
-    if (context.getSettingsRef().check_query_single_value_result)
+    if (getContext()->getSettingsRef().check_query_single_value_result)
     {
         bool result = std::all_of(check_results.begin(), check_results.end(), [] (const CheckResult & res) { return res.success; });
         auto column = ColumnUInt8::create();
diff --git a/src/Interpreters/InterpreterCheckQuery.h b/src/Interpreters/InterpreterCheckQuery.h
index c667ca74c22..557faddfe9c 100644
--- a/src/Interpreters/InterpreterCheckQuery.h
+++ b/src/Interpreters/InterpreterCheckQuery.h
@@ -7,20 +7,17 @@
 namespace DB
 {
 
-class Context;
 class Cluster;
 
-class InterpreterCheckQuery : public IInterpreter
+class InterpreterCheckQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterCheckQuery(const ASTPtr & query_ptr_, const Context & context_);
+    InterpreterCheckQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-
-    const Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 8cd93546ad0..dc3fc0458b9 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -51,14 +51,13 @@
 #include <Databases/IDatabase.h>
 #include <Databases/DatabaseOnDisk.h>
 
-#include <Dictionaries/getDictionaryConfigurationFromAST.h>
-
 #include <Compression/CompressionFactory.h>
 
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/addTypeConversionToAST.h>
 #include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/ApplyWithSubqueryVisitor.h>
 
 #include <TableFunctions/TableFunctionFactory.h>
 #include <common/logger_useful.h>
@@ -70,6 +69,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int TABLE_ALREADY_EXISTS;
+    extern const int DICTIONARY_ALREADY_EXISTS;
     extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
     extern const int INCORRECT_QUERY;
     extern const int UNKNOWN_DATABASE_ENGINE;
@@ -78,7 +78,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int BAD_DATABASE_FOR_TEMPORARY_TABLE;
     extern const int SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY;
-    extern const int DICTIONARY_ALREADY_EXISTS;
     extern const int ILLEGAL_SYNTAX_FOR_DATA_TYPE;
     extern const int ILLEGAL_COLUMN;
     extern const int LOGICAL_ERROR;
@@ -90,8 +89,8 @@ namespace ErrorCodes
 
 namespace fs = std::filesystem;
 
-InterpreterCreateQuery::InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterCreateQuery::InterpreterCreateQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+    : WithMutableContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -113,7 +112,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
     /// Will write file with database metadata, if needed.
     String database_name_escaped = escapeForFileName(database_name);
-    fs::path metadata_path = fs::canonical(context.getPath());
+    fs::path metadata_path = fs::canonical(getContext()->getPath());
     fs::path metadata_file_tmp_path = metadata_path / "metadata" / (database_name_escaped + ".sql.tmp");
     fs::path metadata_file_path = metadata_path / "metadata" / (database_name_escaped + ".sql");
 
@@ -122,7 +121,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         if (!fs::exists(metadata_file_path))
             throw Exception("Database engine must be specified for ATTACH DATABASE query", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
         /// Short syntax: try read database definition from file
-        auto ast = DatabaseOnDisk::parseQueryFromMetadata(nullptr, context, metadata_file_path);
+        auto ast = DatabaseOnDisk::parseQueryFromMetadata(nullptr, getContext(), metadata_file_path);
         create = ast->as<ASTCreateQuery &>();
         if (!create.table.empty() || !create.storage)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Metadata file {} contains incorrect CREATE DATABASE query", metadata_file_path.string());
@@ -136,7 +135,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         /// When attaching old-style database during server startup, we must always use Ordinary engine
         if (create.attach)
             throw Exception("Database engine must be specified for ATTACH DATABASE query", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
-        bool old_style_database = context.getSettingsRef().default_database_engine.value == DefaultDatabaseEngine::Ordinary;
+        bool old_style_database = getContext()->getSettingsRef().default_database_engine.value == DefaultDatabaseEngine::Ordinary;
         auto engine = std::make_shared<ASTFunction>();
         auto storage = std::make_shared<ASTStorage>();
         engine->name = old_style_database ? "Ordinary" : "Atomic";
@@ -144,7 +143,9 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         storage->set(storage->engine, engine);
         create.set(create.storage, storage);
     }
-    else if ((create.columns_list && create.columns_list->indices && !create.columns_list->indices->children.empty()))
+    else if ((create.columns_list
+              && ((create.columns_list->indices && !create.columns_list->indices->children.empty())
+                  || (create.columns_list->projections && !create.columns_list->projections->children.empty()))))
     {
         /// Currently, there are no database engines, that support any arguments.
         throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE, "Unknown database engine: {}", serializeAST(*create.storage));
@@ -174,7 +175,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
         if (create_from_user)
         {
-            const auto & default_engine = context.getSettingsRef().default_database_engine.value;
+            const auto & default_engine = getContext()->getSettingsRef().default_database_engine.value;
             if (create.uuid == UUIDHelpers::Nil && default_engine == DefaultDatabaseEngine::Atomic)
                 create.uuid = UUIDHelpers::generateV4();    /// Will enable Atomic engine for nested database
         }
@@ -194,7 +195,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
     }
     else
     {
-        bool is_on_cluster = context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
+        bool is_on_cluster = getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
         if (create.uuid != UUIDHelpers::Nil && !is_on_cluster)
             throw Exception("Ordinary database engine does not support UUID", ErrorCodes::INCORRECT_QUERY);
 
@@ -203,19 +204,20 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         metadata_path = metadata_path / "metadata" / database_name_escaped;
     }
 
-    if (create.storage->engine->name == "MaterializeMySQL" && !context.getSettingsRef().allow_experimental_database_materialize_mysql && !internal)
+    if (create.storage->engine->name == "MaterializeMySQL" && !getContext()->getSettingsRef().allow_experimental_database_materialize_mysql
+        && !internal)
     {
         throw Exception("MaterializeMySQL is an experimental database engine. "
                         "Enable allow_experimental_database_materialize_mysql to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
-    if (create.storage->engine->name == "Replicated" && !context.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);
     }
 
-    DatabasePtr database = DatabaseFactory::get(create, metadata_path / "", context);
+    DatabasePtr database = DatabaseFactory::get(create, metadata_path / "", getContext());
 
     if (create.uuid != UUIDHelpers::Nil)
         create.database = TABLE_WITH_UUID_NAME_PLACEHOLDER;
@@ -237,7 +239,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         writeString(statement, out);
 
         out.next();
-        if (context.getSettingsRef().fsync_metadata)
+        if (getContext()->getSettingsRef().fsync_metadata)
             out.sync();
         out.close();
     }
@@ -261,7 +263,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         }
 
         /// We use global context here, because storages lifetime is bigger than query context lifetime
-        database->loadStoredObjects(context.getGlobalContext(), has_force_restore_data_flag, create.attach && force_attach);
+        database->loadStoredObjects(getContext()->getGlobalContext(), has_force_restore_data_flag, create.attach && force_attach); //-V560
     }
     catch (...)
     {
@@ -360,8 +362,18 @@ ASTPtr InterpreterCreateQuery::formatConstraints(const ConstraintsDescription &
     return res;
 }
 
+ASTPtr InterpreterCreateQuery::formatProjections(const ProjectionsDescription & projections)
+{
+    auto res = std::make_shared<ASTExpressionList>();
+
+    for (const auto & projection : projections)
+        res->children.push_back(projection.definition_ast->clone());
+
+    return res;
+}
+
 ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
-    const ASTExpressionList & columns_ast, const Context & context, bool sanity_check_compression_codecs)
+    const ASTExpressionList & columns_ast, ContextPtr context_, bool attach)
 {
     /// First, deduce implicit types.
 
@@ -370,6 +382,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
 
     ASTPtr default_expr_list = std::make_shared<ASTExpressionList>();
     NamesAndTypesList column_names_and_types;
+    bool make_columns_nullable = !attach && context_->getSettingsRef().data_type_default_nullable;
 
     for (const auto & ast : columns_ast.children)
     {
@@ -388,7 +401,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
                 if (*col_decl.null_modifier)
                     column_type = makeNullable(column_type);
             }
-            else if (context.getSettingsRef().data_type_default_nullable)
+            else if (make_columns_nullable)
             {
                 column_type = makeNullable(column_type);
             }
@@ -431,8 +444,9 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
     Block defaults_sample_block;
     /// set missing types and wrap default_expression's in a conversion-function if necessary
     if (!default_expr_list->children.empty())
-        defaults_sample_block = validateColumnsDefaultsAndGetSampleBlock(default_expr_list, column_names_and_types, context);
+        defaults_sample_block = validateColumnsDefaultsAndGetSampleBlock(default_expr_list, column_names_and_types, context_);
 
+    bool sanity_check_compression_codecs = !attach && !context_->getSettingsRef().allow_suspicious_codecs;
     ColumnsDescription res;
     auto name_type_it = column_names_and_types.begin();
     for (auto ast_it = columns_ast.children.begin(); ast_it != columns_ast.children.end(); ++ast_it, ++name_type_it)
@@ -476,7 +490,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
         res.add(std::move(column));
     }
 
-    if (context.getSettingsRef().flatten_nested)
+    if (context_->getSettingsRef().flatten_nested)
         res.flattenNested();
 
     if (res.getAllPhysical().empty())
@@ -508,24 +522,30 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
 
         if (create.columns_list->columns)
         {
-            bool sanity_check_compression_codecs = !create.attach && !context.getSettingsRef().allow_suspicious_codecs;
-            properties.columns = getColumnsDescription(*create.columns_list->columns, context, sanity_check_compression_codecs);
+            properties.columns = getColumnsDescription(*create.columns_list->columns, getContext(), create.attach);
         }
 
         if (create.columns_list->indices)
             for (const auto & index : create.columns_list->indices->children)
                 properties.indices.push_back(
-                    IndexDescription::getIndexFromAST(index->clone(), properties.columns, context));
+                    IndexDescription::getIndexFromAST(index->clone(), properties.columns, getContext()));
+
+        if (create.columns_list->projections)
+            for (const auto & projection_ast : create.columns_list->projections->children)
+            {
+                auto projection = ProjectionDescription::getProjectionFromAST(projection_ast, properties.columns, getContext());
+                properties.projections.add(std::move(projection));
+            }
 
         properties.constraints = getConstraintsDescription(create.columns_list->constraints);
     }
     else if (!create.as_table.empty())
     {
-        String as_database_name = context.resolveDatabase(create.as_database);
-        StoragePtr as_storage = DatabaseCatalog::instance().getTable({as_database_name, create.as_table}, context);
+        String as_database_name = getContext()->resolveDatabase(create.as_database);
+        StoragePtr as_storage = DatabaseCatalog::instance().getTable({as_database_name, create.as_table}, getContext());
 
         /// as_storage->getColumns() and setEngine(...) must be called under structure lock of other_table for CREATE ... AS other_table.
-        as_storage_lock = as_storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        as_storage_lock = as_storage->lockForShare(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
         auto as_storage_metadata = as_storage->getInMemoryMetadataPtr();
         properties.columns = as_storage_metadata->getColumns();
 
@@ -538,16 +558,20 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
     }
     else if (create.select)
     {
-        Block as_select_sample = InterpreterSelectWithUnionQuery::getSampleBlock(create.select->clone(), context);
+        Block as_select_sample = InterpreterSelectWithUnionQuery::getSampleBlock(create.select->clone(), getContext());
         properties.columns = ColumnsDescription(as_select_sample.getNamesAndTypesList());
     }
     else if (create.as_table_function)
     {
         /// Table function without columns list.
-        auto table_function = TableFunctionFactory::instance().get(create.as_table_function, context);
-        properties.columns = table_function->getActualTableStructure(context);
+        auto table_function = TableFunctionFactory::instance().get(create.as_table_function, getContext());
+        properties.columns = table_function->getActualTableStructure(getContext());
         assert(!properties.columns.empty());
     }
+    else if (create.is_dictionary)
+    {
+        return {};
+    }
     else
         throw Exception("Incorrect CREATE query: required list of column descriptions or AS section or SELECT.", ErrorCodes::INCORRECT_QUERY);
 
@@ -559,10 +583,12 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
     ASTPtr new_columns = formatColumns(properties.columns);
     ASTPtr new_indices = formatIndices(properties.indices);
     ASTPtr new_constraints = formatConstraints(properties.constraints);
+    ASTPtr new_projections = formatProjections(properties.projections);
 
     create.columns_list->setOrReplace(create.columns_list->columns, new_columns);
     create.columns_list->setOrReplace(create.columns_list->indices, new_indices);
     create.columns_list->setOrReplace(create.columns_list->constraints, new_constraints);
+    create.columns_list->setOrReplace(create.columns_list->projections, new_projections);
 
     validateTableStructure(create, properties);
     /// Set the table engine if it was not specified explicitly.
@@ -586,7 +612,7 @@ void InterpreterCreateQuery::validateTableStructure(const ASTCreateQuery & creat
             throw Exception("Column " + backQuoteIfNeed(column.name) + " already exists", ErrorCodes::DUPLICATE_COLUMN);
     }
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
 
     /// Check low cardinality types in creating table if it was not allowed in setting
     if (!create.attach && !settings.allow_suspicious_low_cardinality_types && !create.is_materialized_view)
@@ -619,22 +645,6 @@ void InterpreterCreateQuery::validateTableStructure(const ASTCreateQuery & creat
         }
     }
 
-    if (!create.attach && !settings.allow_experimental_bigint_types)
-    {
-        for (const auto & name_and_type_pair : properties.columns.getAllPhysical())
-        {
-            WhichDataType which(*name_and_type_pair.type);
-            if (which.IsBigIntOrDeimal())
-            {
-                const auto & type_name = name_and_type_pair.type->getName();
-                String message = "Cannot create table with column '" + name_and_type_pair.name + "' which type is '"
-                                 + type_name + "' because experimental bigint types are not allowed. "
-                                 + "Set 'allow_experimental_bigint_types' setting to enable.";
-                throw Exception(message, ErrorCodes::ILLEGAL_COLUMN);
-            }
-        }
-    }
-
     if (!create.attach && !settings.allow_experimental_map_type)
     {
         for (const auto & name_and_type_pair : properties.columns.getAllPhysical())
@@ -681,10 +691,10 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
     {
         /// NOTE Getting the structure from the table specified in the AS is done not atomically with the creation of the table.
 
-        String as_database_name = context.resolveDatabase(create.as_database);
+        String as_database_name = getContext()->resolveDatabase(create.as_database);
         String as_table_name = create.as_table;
 
-        ASTPtr as_create_ptr = DatabaseCatalog::instance().getDatabase(as_database_name)->getCreateTableQuery(as_table_name, context);
+        ASTPtr as_create_ptr = DatabaseCatalog::instance().getDatabase(as_database_name)->getCreateTableQuery(as_table_name, getContext());
         const auto & as_create = as_create_ptr->as<ASTCreateQuery &>();
 
         const String qualified_name = backQuoteIfNeed(as_database_name) + "." + backQuoteIfNeed(as_table_name);
@@ -721,7 +731,7 @@ static void generateUUIDForTable(ASTCreateQuery & create)
     /// If destination table (to_table_id) is not specified for materialized view,
     /// then MV will create inner table. We should generate UUID of inner table here,
     /// so it will be the same on all hosts if query in ON CLUSTER or database engine is Replicated.
-    bool need_uuid_for_inner_table = create.is_materialized_view && !create.to_table_id;
+    bool need_uuid_for_inner_table = !create.attach && create.is_materialized_view && !create.to_table_id;
     if (need_uuid_for_inner_table && create.to_inner_uuid == UUIDHelpers::Nil)
         create.to_inner_uuid = UUIDHelpers::generateV4();
 }
@@ -731,7 +741,8 @@ 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" && context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY && !internal)
+    if (database->getEngineName() == "Replicated" && getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY
+        && !internal)
     {
         if (create.uuid == UUIDHelpers::Nil)
             throw Exception("Table UUID is not specified in DDL log", ErrorCodes::LOGICAL_ERROR);
@@ -761,7 +772,7 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
     }
     else
     {
-        bool is_on_cluster = context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
+        bool is_on_cluster = getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
         bool has_uuid = create.uuid != UUIDHelpers::Nil || create.to_inner_uuid != UUIDHelpers::Nil;
         if (has_uuid && !is_on_cluster)
             throw Exception(ErrorCodes::INCORRECT_QUERY,
@@ -782,19 +793,19 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
         UUID uuid_of_table_to_replace;
         if (create.create_or_replace)
         {
-            uuid_of_table_to_replace = context.tryResolveStorageID(StorageID(create.database, create.table)).uuid;
+            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, context));
+                assert(!database->isTableExist(create.table, getContext()));
             }
             else
                 create.table = "_tmp_replace_" + toString(uuid_of_table_to_replace);
         }
         else
         {
-            uuid_of_table_to_replace = context.resolveStorageID(StorageID(create.database, create.table)).uuid;
+            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));
@@ -811,7 +822,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         throw Exception("Temporary tables cannot be inside a database. You should not specify a database for a temporary table.",
             ErrorCodes::BAD_DATABASE_FOR_TEMPORARY_TABLE);
 
-    String current_database = context.getCurrentDatabase();
+    String current_database = getContext()->getCurrentDatabase();
     auto database_name = create.database.empty() ? current_database : create.database;
 
     // If this is a stub ATTACH query, read the query definition from the database
@@ -821,23 +832,32 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         if (database->getEngineName() == "Replicated")
         {
             auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.table);
-            if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+            if (typeid_cast<DatabaseReplicated *>(database.get()) && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
             {
                 create.database = database_name;
                 guard->releaseTableLock();
-                return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+                return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
             }
         }
 
         bool if_not_exists = create.if_not_exists;
 
         // Table SQL definition is available even if the table is detached (even permanently)
-        auto query = database->getCreateTableQuery(create.table, context);
-        create = query->as<ASTCreateQuery &>(); // Copy the saved create query, but use ATTACH instead of CREATE
-        if (create.is_dictionary)
+        auto query = database->getCreateTableQuery(create.table, getContext());
+        auto create_query = query->as<ASTCreateQuery &>();
+
+        if (!create.is_dictionary && create_query.is_dictionary)
             throw Exception(ErrorCodes::INCORRECT_QUERY,
-                            "Cannot ATTACH TABLE {}.{}, it is a Dictionary",
-                            backQuoteIfNeed(database_name), backQuoteIfNeed(create.table));
+                "Cannot ATTACH TABLE {}.{}, it is a Dictionary",
+                backQuoteIfNeed(database_name), backQuoteIfNeed(create.table));
+
+        if (create.is_dictionary && !create_query.is_dictionary)
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                "Cannot ATTACH DICTIONARY {}.{}, it is a Table",
+                backQuoteIfNeed(database_name), backQuoteIfNeed(create.table));
+
+        create = create_query; // Copy the saved create query, but use ATTACH instead of CREATE
+
         create.attach = true;
         create.attach_short_syntax = true;
         create.if_not_exists = if_not_exists;
@@ -847,10 +867,10 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
     if (create.attach_from_path)
     {
-        fs::path user_files = fs::path(context.getUserFilesPath()).lexically_normal();
-        fs::path root_path = fs::path(context.getPath()).lexically_normal();
+        fs::path user_files = fs::path(getContext()->getUserFilesPath()).lexically_normal();
+        fs::path root_path = fs::path(getContext()->getPath()).lexically_normal();
 
-        if (context.getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        if (getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
         {
             fs::path data_path = fs::path(*create.attach_from_path).lexically_normal();
             if (data_path.is_relative())
@@ -870,7 +890,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
                                 "Data directory {} must be inside {} to attach it", String(data_path), String(user_files));
         }
     }
-    else if (create.attach && !create.attach_short_syntax && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+    else if (create.attach && !create.attach_short_syntax && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
     {
         auto * log = &Poco::Logger::get("InterpreterCreateQuery");
         LOG_WARNING(log, "ATTACH TABLE query with full table definition is not recommended: "
@@ -887,6 +907,8 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
     if (create.select && create.isView())
     {
+        // Expand CTE before filling default database
+        ApplyWithSubqueryVisitor().visit(*create.select);
         AddDefaultDatabaseVisitor visitor(current_database);
         visitor.visit(*create.select);
     }
@@ -902,11 +924,11 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     if (need_add_to_database && database->getEngineName() == "Replicated")
     {
         auto guard = DatabaseCatalog::instance().getDDLGuard(create.database, create.table);
-        if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+        if (typeid_cast<DatabaseReplicated *>(database.get()) && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
         {
             assertOrSetUUID(create, database);
             guard->releaseTableLock();
-            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
         }
     }
 
@@ -941,8 +963,11 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
         database = DatabaseCatalog::instance().getDatabase(create.database);
         assertOrSetUUID(create, database);
 
+        String storage_name = create.is_dictionary ? "Dictionary" : "Table";
+        auto storage_already_exists_error_code = create.is_dictionary ? ErrorCodes::DICTIONARY_ALREADY_EXISTS : ErrorCodes::TABLE_ALREADY_EXISTS;
+
         /// Table can be created before or it can be created concurrently in another thread, while we were waiting in DDLGuard.
-        if (database->isTableExist(create.table, context))
+        if (database->isTableExist(create.table, getContext()))
         {
             /// TODO Check structure of table
             if (create.if_not_exists)
@@ -955,26 +980,27 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
                 drop_ast->table = create.table;
                 drop_ast->no_ddl_lock = true;
 
-                Context drop_context = context;
+                auto drop_context = Context::createCopy(context);
                 InterpreterDropQuery interpreter(drop_ast, drop_context);
                 interpreter.execute();
             }
             else
-                throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists.", backQuoteIfNeed(create.database), backQuoteIfNeed(create.table));
+                throw Exception(storage_already_exists_error_code,
+                    "{} {}.{} already exists.", storage_name, backQuoteIfNeed(create.database), backQuoteIfNeed(create.table));
         }
 
         data_path = database->getTableDataPath(create);
-        if (!create.attach && !data_path.empty() && fs::exists(fs::path{context.getPath()} / data_path))
-            throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Directory for table data {} already exists", String(data_path));
+        if (!create.attach && !data_path.empty() && fs::exists(fs::path{getContext()->getPath()} / data_path))
+            throw Exception(storage_already_exists_error_code, "Directory for {} data {} already exists", Poco::toLower(storage_name), String(data_path));
     }
     else
     {
-        if (create.if_not_exists && context.tryResolveStorageID({"", create.table}, Context::ResolveExternal))
+        if (create.if_not_exists && getContext()->tryResolveStorageID({"", create.table}, Context::ResolveExternal))
             return false;
 
         String temporary_table_name = create.table;
-        auto temporary_table = TemporaryTableHolder(context, properties.columns, properties.constraints, query_ptr);
-        context.getSessionContext().addExternalTable(temporary_table_name, std::move(temporary_table));
+        auto temporary_table = TemporaryTableHolder(getContext(), properties.columns, properties.constraints, query_ptr);
+        getContext()->getSessionContext()->addExternalTable(temporary_table_name, std::move(temporary_table));
         return true;
     }
 
@@ -990,21 +1016,34 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
         create.attach_from_path = std::nullopt;
     }
 
+    if (create.attach)
+    {
+        /// If table was detached it's not possible to attach it back while some threads are using
+        /// old instance of the storage. For example, AsynchronousMetrics may cause ATTACH to fail,
+        /// so we allow waiting here. If database_atomic_wait_for_drop_and_detach_synchronously is disabled
+        /// and old storage instance still exists it will throw exception.
+        bool throw_if_table_in_use = getContext()->getSettingsRef().database_atomic_wait_for_drop_and_detach_synchronously;
+        if (throw_if_table_in_use)
+            database->checkDetachedTableNotInUse(create.uuid);
+        else
+            database->waitDetachedTableNotInUse(create.uuid);
+    }
+
     StoragePtr res;
     /// NOTE: CREATE query may be rewritten by Storage creator or table function
     if (create.as_table_function)
     {
         const auto & factory = TableFunctionFactory::instance();
-        auto table_func = factory.get(create.as_table_function, context);
-        res = table_func->execute(create.as_table_function, context, create.table, properties.columns);
+        auto table_func = factory.get(create.as_table_function, getContext());
+        res = table_func->execute(create.as_table_function, getContext(), create.table, properties.columns);
         res->renameInMemory({create.database, create.table, create.uuid});
     }
     else
     {
         res = StorageFactory::instance().get(create,
             data_path,
-            context,
-            context.getGlobalContext(),
+            getContext(),
+            getContext()->getGlobalContext(),
             properties.columns,
             properties.constraints,
             false);
@@ -1015,7 +1054,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
                         "ATTACH ... FROM ... query is not supported for {} table engine, "
                         "because such tables do not store any data on disk. Use CREATE instead.", res->getName());
 
-    database->createTable(context, create.table, res, query_ptr);
+    database->createTable(getContext(), create.table, res, query_ptr);
 
     /// Move table data to the proper place. Wo do not move data earlier to avoid situations
     /// when data directory moved, but table has not been created due to some error.
@@ -1067,10 +1106,10 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         };
         ast_rename->elements.push_back(std::move(elem));
         ast_rename->exchange = true;
-        InterpreterRenameQuery(ast_rename, context).execute();
+        InterpreterRenameQuery(ast_rename, getContext()).execute();
         replaced = true;
 
-        InterpreterDropQuery(ast_drop, context).execute();
+        InterpreterDropQuery(ast_drop, getContext()).execute();
 
         create.table = table_to_replace_name;
         return fillTableIfNeeded(create);
@@ -1078,7 +1117,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
     catch (...)
     {
         if (created && create.replace_table && !replaced)
-            InterpreterDropQuery(ast_drop, context).execute();
+            InterpreterDropQuery(ast_drop, getContext()).execute();
         throw;
     }
 }
@@ -1093,67 +1132,18 @@ BlockIO InterpreterCreateQuery::fillTableIfNeeded(const ASTCreateQuery & create)
         insert->table_id = {create.database, create.table, create.uuid};
         insert->select = create.select->clone();
 
-        if (create.temporary && !context.getSessionContext().hasQueryContext())
-            context.getSessionContext().makeQueryContext();
+        if (create.temporary && !getContext()->getSessionContext()->hasQueryContext())
+            getContext()->getSessionContext()->makeQueryContext();
 
         return InterpreterInsertQuery(insert,
-            create.temporary ? context.getSessionContext() : context,
-            context.getSettingsRef().insert_allow_materialized_columns).execute();
+            create.temporary ? getContext()->getSessionContext() : getContext(),
+            getContext()->getSettingsRef().insert_allow_materialized_columns).execute();
     }
 
     return {};
 }
 
-BlockIO InterpreterCreateQuery::createDictionary(ASTCreateQuery & create)
-{
-    String dictionary_name = create.table;
-
-    create.database = context.resolveDatabase(create.database);
-    const String & database_name = create.database;
-
-    auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, dictionary_name);
-    DatabasePtr database = DatabaseCatalog::instance().getDatabase(database_name);
-
-    if (typeid_cast<DatabaseReplicated *>(database.get()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
-    {
-        if (!create.attach)
-            assertOrSetUUID(create, database);
-        guard->releaseTableLock();
-        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
-    }
-
-    if (database->isDictionaryExist(dictionary_name))
-    {
-        /// TODO Check structure of dictionary
-        if (create.if_not_exists)
-            return {};
-        else
-            throw Exception(
-                "Dictionary " + database_name + "." + dictionary_name + " already exists.", ErrorCodes::DICTIONARY_ALREADY_EXISTS);
-    }
-
-    if (create.attach)
-    {
-        auto query = DatabaseCatalog::instance().getDatabase(database_name)->getCreateDictionaryQuery(dictionary_name);
-        create = query->as<ASTCreateQuery &>();
-        create.attach = true;
-    }
-
-    assertOrSetUUID(create, database);
-
-    if (create.attach)
-    {
-        auto config = getDictionaryConfigurationFromAST(create, context);
-        auto modification_time = database->getObjectMetadataModificationTime(dictionary_name);
-        database->attachDictionary(dictionary_name, DictionaryAttachInfo{query_ptr, config, modification_time});
-    }
-    else
-        database->createDictionary(context, dictionary_name, query_ptr);
-
-    return {};
-}
-
-void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, const Context & context, const String & cluster_name)
+void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, ContextPtr local_context, const String & cluster_name)
 {
     if (create.attach)
         return;
@@ -1163,8 +1153,8 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, cons
     generateUUIDForTable(create);
 
     /// For cross-replication cluster we cannot use UUID in replica path.
-    String cluster_name_expanded = context.getMacros()->expand(cluster_name);
-    ClusterPtr cluster = context.getCluster(cluster_name_expanded);
+    String cluster_name_expanded = local_context->getMacros()->expand(cluster_name);
+    ClusterPtr cluster = local_context->getCluster(cluster_name_expanded);
 
     if (cluster->maybeCrossReplication())
     {
@@ -1188,7 +1178,7 @@ void InterpreterCreateQuery::prepareOnClusterQuery(ASTCreateQuery & create, cons
             Macros::MacroExpansionInfo info;
             info.table_id.uuid = create.uuid;
             info.ignore_unknown = true;
-            context.getMacros()->expand(zk_path, info);
+            local_context->getMacros()->expand(zk_path, info);
             if (!info.expanded_uuid)
                 return;
         }
@@ -1206,21 +1196,19 @@ BlockIO InterpreterCreateQuery::execute()
     auto & create = query_ptr->as<ASTCreateQuery &>();
     if (!create.cluster.empty())
     {
-        prepareOnClusterQuery(create, context, create.cluster);
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        prepareOnClusterQuery(create, getContext(), create.cluster);
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
     }
 
-    context.checkAccess(getRequiredAccess());
+    getContext()->checkAccess(getRequiredAccess());
 
     ASTQueryWithOutput::resetOutputASTIfExist(create);
 
     /// CREATE|ATTACH DATABASE
     if (!create.database.empty() && create.table.empty())
         return createDatabase(create);
-    else if (!create.is_dictionary)
-        return createTable(create);
     else
-        return createDictionary(create);
+        return createTable(create);
 }
 
 
@@ -1274,12 +1262,12 @@ AccessRightsElements InterpreterCreateQuery::getRequiredAccess() const
     return required_access;
 }
 
-void InterpreterCreateQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const
+void InterpreterCreateQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const
 {
     elem.query_kind = "Create";
     if (!as_table_saved.empty())
     {
-        String database = backQuoteIfNeed(as_database_saved.empty() ? context.getCurrentDatabase() : as_database_saved);
+        String database = backQuoteIfNeed(as_database_saved.empty() ? getContext()->getCurrentDatabase() : as_database_saved);
         elem.query_databases.insert(database);
         elem.query_tables.insert(database + "." + backQuoteIfNeed(as_table_saved));
     }
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index d88357fe412..45f0bbd7cf8 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -1,18 +1,17 @@
 #pragma once
 
+#include <Access/AccessRightsElement.h>
 #include <Interpreters/IInterpreter.h>
 #include <Storages/ColumnsDescription.h>
+#include <Storages/ConstraintsDescription.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/StorageInMemoryMetadata.h>
-#include <Storages/ConstraintsDescription.h>
 #include <Common/ThreadPool.h>
-#include <Access/AccessRightsElement.h>
 
 
 namespace DB
 {
 
-class Context;
 class ASTCreateQuery;
 class ASTExpressionList;
 class ASTConstraintDeclaration;
@@ -23,10 +22,10 @@ using DatabasePtr = std::shared_ptr<IDatabase>;
 /** Allows to create new table or database,
   *  or create an object for existing table or database.
   */
-class InterpreterCreateQuery : public IInterpreter
+class InterpreterCreateQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterCreateQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
 
     BlockIO execute() override;
 
@@ -36,6 +35,7 @@ public:
 
     static ASTPtr formatIndices(const IndicesDescription & indices);
     static ASTPtr formatConstraints(const ConstraintsDescription & constraints);
+    static ASTPtr formatProjections(const ProjectionsDescription & projections);
 
     void setForceRestoreData(bool has_force_restore_data_flag_)
     {
@@ -54,12 +54,12 @@ public:
 
     /// 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, const Context & context, bool sanity_check_compression_codecs);
+    static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, ContextPtr context, bool attach);
     static ConstraintsDescription getConstraintsDescription(const ASTExpressionList * constraints);
 
-    static void prepareOnClusterQuery(ASTCreateQuery & create, const Context & context, const String & cluster_name);
+    static void prepareOnClusterQuery(ASTCreateQuery & create, ContextPtr context, const String & cluster_name);
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const override;
 
 private:
     struct TableProperties
@@ -67,11 +67,11 @@ private:
         ColumnsDescription columns;
         IndicesDescription indices;
         ConstraintsDescription constraints;
+        ProjectionsDescription projections;
     };
 
     BlockIO createDatabase(ASTCreateQuery & create);
     BlockIO createTable(ASTCreateQuery & create);
-    BlockIO createDictionary(ASTCreateQuery & create);
 
     /// Calculate list of columns, constraints, indices, etc... of table. Rewrite query in canonical way.
     TableProperties setProperties(ASTCreateQuery & create) const;
@@ -88,7 +88,6 @@ private:
     void assertOrSetUUID(ASTCreateQuery & create, const DatabasePtr & database) const;
 
     ASTPtr query_ptr;
-    Context & context;
 
     /// Skip safety threshold when loading tables.
     bool has_force_restore_data_flag = false;
diff --git a/src/Interpreters/InterpreterCreateQuotaQuery.cpp b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
index 4c35aaf573b..223215624b3 100644
--- a/src/Interpreters/InterpreterCreateQuotaQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
@@ -73,18 +73,18 @@ namespace
 BlockIO InterpreterCreateQuotaQuery::execute()
 {
     auto & query = query_ptr->as<ASTCreateQuotaQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    context.checkAccess(query.alter ? AccessType::ALTER_QUOTA : AccessType::CREATE_QUOTA);
+    auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(query.alter ? AccessType::ALTER_QUOTA : AccessType::CREATE_QUOTA);
 
     if (!query.cluster.empty())
     {
-        query.replaceCurrentUserTag(context.getUserName());
-        return executeDDLQueryOnCluster(query_ptr, context);
+        query.replaceCurrentUserTag(getContext()->getUserName());
+        return executeDDLQueryOnCluster(query_ptr, getContext());
     }
 
     std::optional<RolesOrUsersSet> roles_from_query;
     if (query.roles)
-        roles_from_query = RolesOrUsersSet{*query.roles, access_control, context.getUserID()};
+        roles_from_query = RolesOrUsersSet{*query.roles, access_control, getContext()->getUserID()};
 
     if (query.alter)
     {
diff --git a/src/Interpreters/InterpreterCreateQuotaQuery.h b/src/Interpreters/InterpreterCreateQuotaQuery.h
index ca0e7b44713..7fb60cde1f6 100644
--- a/src/Interpreters/InterpreterCreateQuotaQuery.h
+++ b/src/Interpreters/InterpreterCreateQuotaQuery.h
@@ -2,19 +2,18 @@
 
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <optional>
 
 
 namespace DB
 {
+
 class ASTCreateQuotaQuery;
 struct Quota;
 
-
-class InterpreterCreateQuotaQuery : public IInterpreter
+class InterpreterCreateQuotaQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterCreateQuotaQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateQuotaQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -25,6 +24,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateRoleQuery.cpp b/src/Interpreters/InterpreterCreateRoleQuery.cpp
index 72ad3234b95..b9debc259be 100644
--- a/src/Interpreters/InterpreterCreateRoleQuery.cpp
+++ b/src/Interpreters/InterpreterCreateRoleQuery.cpp
@@ -34,14 +34,14 @@ namespace
 BlockIO InterpreterCreateRoleQuery::execute()
 {
     const auto & query = query_ptr->as<const ASTCreateRoleQuery &>();
-    auto & access_control = context.getAccessControlManager();
+    auto & access_control = getContext()->getAccessControlManager();
     if (query.alter)
-        context.checkAccess(AccessType::ALTER_ROLE);
+        getContext()->checkAccess(AccessType::ALTER_ROLE);
     else
-        context.checkAccess(AccessType::CREATE_ROLE);
+        getContext()->checkAccess(AccessType::CREATE_ROLE);
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context);
+        return executeDDLQueryOnCluster(query_ptr, getContext());
 
     std::optional<SettingsProfileElements> settings_from_query;
     if (query.settings)
diff --git a/src/Interpreters/InterpreterCreateRoleQuery.h b/src/Interpreters/InterpreterCreateRoleQuery.h
index 768fd6d1d6b..ee8ff8ff7fb 100644
--- a/src/Interpreters/InterpreterCreateRoleQuery.h
+++ b/src/Interpreters/InterpreterCreateRoleQuery.h
@@ -6,14 +6,14 @@
 
 namespace DB
 {
+
 class ASTCreateRoleQuery;
 struct Role;
 
-
-class InterpreterCreateRoleQuery : public IInterpreter
+class InterpreterCreateRoleQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterCreateRoleQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateRoleQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -21,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp b/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp
index 0932f74cdc5..5e4b9b30e66 100644
--- a/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp
+++ b/src/Interpreters/InterpreterCreateRowPolicyQuery.cpp
@@ -44,21 +44,21 @@ namespace
 BlockIO InterpreterCreateRowPolicyQuery::execute()
 {
     auto & query = query_ptr->as<ASTCreateRowPolicyQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    context.checkAccess(query.alter ? AccessType::ALTER_ROW_POLICY : AccessType::CREATE_ROW_POLICY);
+    auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(query.alter ? AccessType::ALTER_ROW_POLICY : AccessType::CREATE_ROW_POLICY);
 
     if (!query.cluster.empty())
     {
-        query.replaceCurrentUserTag(context.getUserName());
-        return executeDDLQueryOnCluster(query_ptr, context);
+        query.replaceCurrentUserTag(getContext()->getUserName());
+        return executeDDLQueryOnCluster(query_ptr, getContext());
     }
 
     assert(query.names->cluster.empty());
     std::optional<RolesOrUsersSet> roles_from_query;
     if (query.roles)
-        roles_from_query = RolesOrUsersSet{*query.roles, access_control, context.getUserID()};
+        roles_from_query = RolesOrUsersSet{*query.roles, access_control, getContext()->getUserID()};
 
-    query.replaceEmptyDatabase(context.getCurrentDatabase());
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
 
     if (query.alter)
     {
diff --git a/src/Interpreters/InterpreterCreateRowPolicyQuery.h b/src/Interpreters/InterpreterCreateRowPolicyQuery.h
index feb583310c0..8adfe6b0855 100644
--- a/src/Interpreters/InterpreterCreateRowPolicyQuery.h
+++ b/src/Interpreters/InterpreterCreateRowPolicyQuery.h
@@ -2,19 +2,18 @@
 
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <optional>
 
 
 namespace DB
 {
+
 class ASTCreateRowPolicyQuery;
 struct RowPolicy;
 
-
-class InterpreterCreateRowPolicyQuery : public IInterpreter
+class InterpreterCreateRowPolicyQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterCreateRowPolicyQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateRowPolicyQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -22,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp b/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp
index 0931b48e723..fb5fb258b10 100644
--- a/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp
+++ b/src/Interpreters/InterpreterCreateSettingsProfileQuery.cpp
@@ -42,16 +42,16 @@ namespace
 BlockIO InterpreterCreateSettingsProfileQuery::execute()
 {
     auto & query = query_ptr->as<ASTCreateSettingsProfileQuery &>();
-    auto & access_control = context.getAccessControlManager();
+    auto & access_control = getContext()->getAccessControlManager();
     if (query.alter)
-        context.checkAccess(AccessType::ALTER_SETTINGS_PROFILE);
+        getContext()->checkAccess(AccessType::ALTER_SETTINGS_PROFILE);
     else
-        context.checkAccess(AccessType::CREATE_SETTINGS_PROFILE);
+        getContext()->checkAccess(AccessType::CREATE_SETTINGS_PROFILE);
 
     if (!query.cluster.empty())
     {
-        query.replaceCurrentUserTag(context.getUserName());
-        return executeDDLQueryOnCluster(query_ptr, context);
+        query.replaceCurrentUserTag(getContext()->getUserName());
+        return executeDDLQueryOnCluster(query_ptr, getContext());
     }
 
     std::optional<SettingsProfileElements> settings_from_query;
@@ -60,7 +60,7 @@ BlockIO InterpreterCreateSettingsProfileQuery::execute()
 
     std::optional<RolesOrUsersSet> roles_from_query;
     if (query.to_roles)
-        roles_from_query = RolesOrUsersSet{*query.to_roles, access_control, context.getUserID()};
+        roles_from_query = RolesOrUsersSet{*query.to_roles, access_control, getContext()->getUserID()};
 
     if (query.alter)
     {
diff --git a/src/Interpreters/InterpreterCreateSettingsProfileQuery.h b/src/Interpreters/InterpreterCreateSettingsProfileQuery.h
index fd420779cf4..aa9264fbf22 100644
--- a/src/Interpreters/InterpreterCreateSettingsProfileQuery.h
+++ b/src/Interpreters/InterpreterCreateSettingsProfileQuery.h
@@ -6,14 +6,14 @@
 
 namespace DB
 {
+
 class ASTCreateSettingsProfileQuery;
 struct SettingsProfile;
 
-
-class InterpreterCreateSettingsProfileQuery : public IInterpreter
+class InterpreterCreateSettingsProfileQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterCreateSettingsProfileQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateSettingsProfileQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -21,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterCreateUserQuery.cpp b/src/Interpreters/InterpreterCreateUserQuery.cpp
index 777cf7de297..7f4969ff9ef 100644
--- a/src/Interpreters/InterpreterCreateUserQuery.cpp
+++ b/src/Interpreters/InterpreterCreateUserQuery.cpp
@@ -75,8 +75,8 @@ namespace
 BlockIO InterpreterCreateUserQuery::execute()
 {
     const auto & query = query_ptr->as<const ASTCreateUserQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    auto access = context.getAccess();
+    auto & access_control = getContext()->getAccessControlManager();
+    auto access = getContext()->getAccess();
     access->checkAccess(query.alter ? AccessType::ALTER_USER : AccessType::CREATE_USER);
 
     std::optional<RolesOrUsersSet> default_roles_from_query;
@@ -91,7 +91,7 @@ BlockIO InterpreterCreateUserQuery::execute()
     }
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context);
+        return executeDDLQueryOnCluster(query_ptr, getContext());
 
     std::optional<SettingsProfileElements> settings_from_query;
     if (query.settings)
diff --git a/src/Interpreters/InterpreterCreateUserQuery.h b/src/Interpreters/InterpreterCreateUserQuery.h
index e5b614b5cbb..7d357924d35 100644
--- a/src/Interpreters/InterpreterCreateUserQuery.h
+++ b/src/Interpreters/InterpreterCreateUserQuery.h
@@ -6,14 +6,14 @@
 
 namespace DB
 {
+
 class ASTCreateUserQuery;
 struct User;
 
-
-class InterpreterCreateUserQuery : public IInterpreter
+class InterpreterCreateUserQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterCreateUserQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterCreateUserQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -21,6 +21,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterDescribeQuery.cpp b/src/Interpreters/InterpreterDescribeQuery.cpp
index 27d8ac48bc8..705e52da72c 100644
--- a/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -69,20 +69,20 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
     if (table_expression.subquery)
     {
         auto names_and_types = InterpreterSelectWithUnionQuery::getSampleBlock(
-            table_expression.subquery->children.at(0), context).getNamesAndTypesList();
+            table_expression.subquery->children.at(0), getContext()).getNamesAndTypesList();
         columns = ColumnsDescription(std::move(names_and_types));
     }
     else if (table_expression.table_function)
     {
-        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression.table_function, context);
-        columns = table_function_ptr->getActualTableStructure(context);
+        TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression.table_function, getContext());
+        columns = table_function_ptr->getActualTableStructure(getContext());
     }
     else
     {
-        auto table_id = context.resolveStorageID(table_expression.database_and_table_name);
-        context.checkAccess(AccessType::SHOW_COLUMNS, table_id);
-        auto table = DatabaseCatalog::instance().getTable(table_id, context);
-        auto table_lock = table->lockForShare(context.getInitialQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        auto table_id = getContext()->resolveStorageID(table_expression.database_and_table_name);
+        getContext()->checkAccess(AccessType::SHOW_COLUMNS, table_id);
+        auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
+        auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
         auto metadata_snapshot = table->getInMemoryMetadataPtr();
         columns = metadata_snapshot->getColumns();
     }
diff --git a/src/Interpreters/InterpreterDescribeQuery.h b/src/Interpreters/InterpreterDescribeQuery.h
index 4fafe61f229..627d1ca0353 100644
--- a/src/Interpreters/InterpreterDescribeQuery.h
+++ b/src/Interpreters/InterpreterDescribeQuery.h
@@ -7,16 +7,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Return names, types and other information about columns in specified table.
   */
-class InterpreterDescribeQuery : public IInterpreter
+class InterpreterDescribeQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterDescribeQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterDescribeQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -24,7 +20,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterDropAccessEntityQuery.cpp b/src/Interpreters/InterpreterDropAccessEntityQuery.cpp
index e02c047e75d..a9b8db6d74e 100644
--- a/src/Interpreters/InterpreterDropAccessEntityQuery.cpp
+++ b/src/Interpreters/InterpreterDropAccessEntityQuery.cpp
@@ -25,13 +25,13 @@ using EntityType = IAccessEntity::Type;
 BlockIO InterpreterDropAccessEntityQuery::execute()
 {
     auto & query = query_ptr->as<ASTDropAccessEntityQuery &>();
-    auto & access_control = context.getAccessControlManager();
-    context.checkAccess(getRequiredAccess());
+    auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(getRequiredAccess());
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context);
+        return executeDDLQueryOnCluster(query_ptr, getContext());
 
-    query.replaceEmptyDatabase(context.getCurrentDatabase());
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
 
     auto do_drop = [&](const Strings & names)
     {
diff --git a/src/Interpreters/InterpreterDropAccessEntityQuery.h b/src/Interpreters/InterpreterDropAccessEntityQuery.h
index 0db68a0ad78..0ee478e904e 100644
--- a/src/Interpreters/InterpreterDropAccessEntityQuery.h
+++ b/src/Interpreters/InterpreterDropAccessEntityQuery.h
@@ -6,12 +6,13 @@
 
 namespace DB
 {
+
 class AccessRightsElements;
 
-class InterpreterDropAccessEntityQuery : public IInterpreter
+class InterpreterDropAccessEntityQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterDropAccessEntityQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterDropAccessEntityQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -19,6 +20,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index 276f61d244a..3c515d58e0c 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -1,5 +1,3 @@
-#include <Poco/File.h>
-
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
@@ -31,7 +29,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int SYNTAX_ERROR;
     extern const int UNKNOWN_TABLE;
-    extern const int UNKNOWN_DICTIONARY;
     extern const int NOT_IMPLEMENTED;
     extern const int INCORRECT_QUERY;
 }
@@ -43,27 +40,22 @@ static DatabasePtr tryGetDatabase(const String & database_name, bool if_exists)
 }
 
 
-InterpreterDropQuery::InterpreterDropQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+InterpreterDropQuery::InterpreterDropQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_)
+{
+}
 
 
 BlockIO InterpreterDropQuery::execute()
 {
     auto & drop = query_ptr->as<ASTDropQuery &>();
     if (!drop.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccessForDDLOnCluster());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccessForDDLOnCluster());
 
-    if (context.getSettingsRef().database_atomic_wait_for_drop_and_detach_synchronously)
+    if (getContext()->getSettingsRef().database_atomic_wait_for_drop_and_detach_synchronously)
         drop.no_delay = true;
 
     if (!drop.table.empty())
-    {
-        if (!drop.is_dictionary)
-            return executeToTable(drop);
-        else if (drop.permanently && drop.kind == ASTDropQuery::Kind::Detach)
-            throw Exception("DETACH PERMANENTLY is not implemented for dictionaries", ErrorCodes::NOT_IMPLEMENTED);
-        else
-            return executeToDictionary(drop.database, drop.table, drop.kind, drop.if_exists, drop.temporary, drop.no_ddl_lock);
-    }
+        return executeToTable(drop);
     else if (!drop.database.empty())
         return executeToDatabase(drop);
     else
@@ -98,10 +90,10 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
     auto table_id = StorageID(query);
     if (query.temporary || table_id.database_name.empty())
     {
-        if (context.tryResolveStorageID(table_id, Context::ResolveExternal))
+        if (getContext()->tryResolveStorageID(table_id, Context::ResolveExternal))
             return executeToTemporaryTable(table_id.getTableName(), query.kind);
         else
-            query.database = table_id.database_name = context.getCurrentDatabase();
+            query.database = table_id.database_name = getContext()->getCurrentDatabase();
     }
 
     if (query.temporary)
@@ -115,13 +107,22 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
     auto ddl_guard = (!query.no_ddl_lock ? DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name) : nullptr);
 
     /// If table was already dropped by anyone, an exception will be thrown
-    auto [database, table] = query.if_exists ? DatabaseCatalog::instance().tryGetDatabaseAndTable(table_id, context)
-                                             : DatabaseCatalog::instance().getDatabaseAndTable(table_id, context);
+    auto [database, table] = query.if_exists ? DatabaseCatalog::instance().tryGetDatabaseAndTable(table_id, getContext())
+                                             : DatabaseCatalog::instance().getDatabaseAndTable(table_id, getContext());
 
     if (database && table)
     {
-        if (query.as<ASTDropQuery &>().is_view && !table->isView())
-            throw Exception("Table " + table_id.getNameForLogs() + " is not a View", ErrorCodes::LOGICAL_ERROR);
+        auto & ast_drop_query = query.as<ASTDropQuery &>();
+
+        if (ast_drop_query.is_view && !table->isView())
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                "Table {} is not a View",
+                table_id.getNameForLogs());
+
+        if (ast_drop_query.is_dictionary && !table->isDictionary())
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                "Table {} is not a Dictionary",
+                table_id.getNameForLogs());
 
         /// Now get UUID, so we can wait for table data to be finally dropped
         table_id.uuid = database->tryGetTableUUID(table_id.table_name);
@@ -129,36 +130,55 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
         /// Prevents recursive drop from drop database query. The original query must specify a table.
         bool is_drop_or_detach_database = query_ptr->as<ASTDropQuery>()->table.empty();
         bool is_replicated_ddl_query = typeid_cast<DatabaseReplicated *>(database.get()) &&
-                                       context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY &&
+                                       getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY &&
                                        !is_drop_or_detach_database;
+
+        AccessFlags drop_storage;
+
+        if (table->isView())
+            drop_storage = AccessType::DROP_VIEW;
+        else if (table->isDictionary())
+            drop_storage = AccessType::DROP_DICTIONARY;
+        else
+            drop_storage = AccessType::DROP_TABLE;
+
         if (is_replicated_ddl_query)
         {
             if (query.kind == ASTDropQuery::Kind::Detach)
-                context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
+                getContext()->checkAccess(drop_storage, table_id);
             else if (query.kind == ASTDropQuery::Kind::Truncate)
-                context.checkAccess(AccessType::TRUNCATE, table_id);
+                getContext()->checkAccess(AccessType::TRUNCATE, table_id);
             else if (query.kind == ASTDropQuery::Kind::Drop)
-                context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
+                getContext()->checkAccess(drop_storage, table_id);
 
             ddl_guard->releaseTableLock();
             table.reset();
-            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query.clone(), context);
+            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query.clone(), getContext());
         }
 
         if (query.kind == ASTDropQuery::Kind::Detach)
         {
-            context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
-            table->checkTableCanBeDetached();
-            table->shutdown();
+            getContext()->checkAccess(drop_storage, table_id);
+
+            if (table->isDictionary())
+            {
+                /// If DROP DICTIONARY query is not used, check if Dictionary can be dropped with DROP TABLE query
+                if (!query.is_dictionary)
+                    table->checkTableCanBeDetached();
+            }
+            else
+                table->checkTableCanBeDetached();
+
+            table->flushAndShutdown();
             TableExclusiveLockHolder table_lock;
 
             if (database->getUUID() == UUIDHelpers::Nil)
-                table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
 
             if (query.permanently)
             {
                 /// Drop table from memory, don't touch data, metadata file renamed and will be skipped during server restart
-                database->detachTablePermanently(context, table_id.table_name);
+                database->detachTablePermanently(getContext(), table_id.table_name);
             }
             else
             {
@@ -168,26 +188,38 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
         }
         else if (query.kind == ASTDropQuery::Kind::Truncate)
         {
-            context.checkAccess(AccessType::TRUNCATE, table_id);
+            if (table->isDictionary())
+                throw Exception("Cannot TRUNCATE dictionary", ErrorCodes::SYNTAX_ERROR);
+
+            getContext()->checkAccess(AccessType::TRUNCATE, table_id);
+
             table->checkTableCanBeDropped();
 
-            auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+            auto table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
             auto metadata_snapshot = table->getInMemoryMetadataPtr();
             /// Drop table data, don't touch metadata
-            table->truncate(query_ptr, metadata_snapshot, context, table_lock);
+            table->truncate(query_ptr, metadata_snapshot, getContext(), table_lock);
         }
         else if (query.kind == ASTDropQuery::Kind::Drop)
         {
-            context.checkAccess(table->isView() ? AccessType::DROP_VIEW : AccessType::DROP_TABLE, table_id);
-            table->checkTableCanBeDropped();
+            getContext()->checkAccess(drop_storage, table_id);
 
-            table->shutdown();
+            if (table->isDictionary())
+            {
+                /// If DROP DICTIONARY query is not used, check if Dictionary can be dropped with DROP TABLE query
+                if (!query.is_dictionary)
+                    table->checkTableCanBeDropped();
+            }
+            else
+                table->checkTableCanBeDropped();
+
+            table->flushAndShutdown();
 
             TableExclusiveLockHolder table_lock;
             if (database->getUUID() == UUIDHelpers::Nil)
-                table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
 
-            database->dropTable(context, table_id.table_name, query.no_delay);
+            database->dropTable(getContext(), table_id.table_name, query.no_delay);
         }
 
         db = database;
@@ -197,90 +229,30 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
     return {};
 }
 
-
-BlockIO InterpreterDropQuery::executeToDictionary(
-    const String & database_name_,
-    const String & dictionary_name,
-    ASTDropQuery::Kind kind,
-    bool if_exists,
-    bool is_temporary,
-    bool no_ddl_lock)
-{
-    if (is_temporary)
-        throw Exception("Temporary dictionaries are not possible.", ErrorCodes::SYNTAX_ERROR);
-
-    String database_name = context.resolveDatabase(database_name_);
-
-    auto ddl_guard = (!no_ddl_lock ? DatabaseCatalog::instance().getDDLGuard(database_name, dictionary_name) : nullptr);
-    query_ptr->as<ASTDropQuery>()->database = database_name;
-    DatabasePtr database = tryGetDatabase(database_name, if_exists);
-
-    bool is_drop_or_detach_database = query_ptr->as<ASTDropQuery>()->table.empty();
-    bool is_replicated_ddl_query = typeid_cast<DatabaseReplicated *>(database.get()) &&
-                                   context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY &&
-                                   !is_drop_or_detach_database;
-    if (is_replicated_ddl_query)
-    {
-        if (kind == ASTDropQuery::Kind::Detach)
-            throw Exception(ErrorCodes::INCORRECT_QUERY, "DETACH DICTIONARY is not allowed for Replicated databases.");
-
-        context.checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
-
-        ddl_guard->releaseTableLock();
-        return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
-    }
-
-    if (!database || !database->isDictionaryExist(dictionary_name))
-    {
-        if (!if_exists)
-            throw Exception(
-                "Dictionary " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(dictionary_name) + " doesn't exist.",
-                ErrorCodes::UNKNOWN_DICTIONARY);
-        else
-            return {};
-    }
-
-    if (kind == ASTDropQuery::Kind::Detach)
-    {
-        /// Drop dictionary from memory, don't touch data and metadata
-        context.checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
-        database->detachDictionary(dictionary_name);
-    }
-    else if (kind == ASTDropQuery::Kind::Truncate)
-    {
-        throw Exception("Cannot TRUNCATE dictionary", ErrorCodes::SYNTAX_ERROR);
-    }
-    else if (kind == ASTDropQuery::Kind::Drop)
-    {
-        context.checkAccess(AccessType::DROP_DICTIONARY, database_name, dictionary_name);
-        database->removeDictionary(context, dictionary_name);
-    }
-    return {};
-}
-
 BlockIO InterpreterDropQuery::executeToTemporaryTable(const String & table_name, ASTDropQuery::Kind kind)
 {
     if (kind == ASTDropQuery::Kind::Detach)
         throw Exception("Unable to detach temporary table.", ErrorCodes::SYNTAX_ERROR);
     else
     {
-        auto & context_handle = context.hasSessionContext() ? context.getSessionContext() : context;
-        auto resolved_id = context_handle.tryResolveStorageID(StorageID("", table_name), Context::ResolveExternal);
+        auto context_handle = getContext()->hasSessionContext() ? getContext()->getSessionContext() : getContext();
+        auto resolved_id = context_handle->tryResolveStorageID(StorageID("", table_name), Context::ResolveExternal);
         if (resolved_id)
         {
-            StoragePtr table = DatabaseCatalog::instance().getTable(resolved_id, context);
+            StoragePtr table = DatabaseCatalog::instance().getTable(resolved_id, getContext());
             if (kind == ASTDropQuery::Kind::Truncate)
             {
-                auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                auto table_lock
+                    = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
                 /// Drop table data, don't touch metadata
                 auto metadata_snapshot = table->getInMemoryMetadataPtr();
-                table->truncate(query_ptr, metadata_snapshot, context, table_lock);
+                table->truncate(query_ptr, metadata_snapshot, getContext(), table_lock);
             }
             else if (kind == ASTDropQuery::Kind::Drop)
             {
-                context_handle.removeExternalTable(table_name);
-                table->shutdown();
-                auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                context_handle->removeExternalTable(table_name);
+                table->flushAndShutdown();
+                auto table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
                 /// Delete table data
                 table->drop();
                 table->is_dropped = true;
@@ -334,7 +306,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
         else if (query.kind == ASTDropQuery::Kind::Detach || query.kind == ASTDropQuery::Kind::Drop)
         {
             bool drop = query.kind == ASTDropQuery::Kind::Drop;
-            context.checkAccess(AccessType::DROP_DATABASE, database_name);
+            getContext()->checkAccess(AccessType::DROP_DATABASE, database_name);
 
             if (query.kind == ASTDropQuery::Kind::Detach && query.permanently)
                 throw Exception("DETACH PERMANENTLY is not implemented for databases", ErrorCodes::NOT_IMPLEMENTED);
@@ -348,26 +320,26 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
 
             if (database->shouldBeEmptyOnDetach())
             {
-                /// DETACH or DROP all tables and dictionaries inside database.
-                /// First we should DETACH or DROP dictionaries because StorageDictionary
-                /// must be detached only by detaching corresponding dictionary.
-                for (auto iterator = database->getDictionariesIterator(); iterator->isValid(); iterator->next())
-                {
-                    String current_dictionary = iterator->name();
-                    executeToDictionary(database_name, current_dictionary, query.kind, false, false, false);
-                }
-
                 ASTDropQuery query_for_table;
                 query_for_table.kind = query.kind;
                 query_for_table.if_exists = true;
                 query_for_table.database = database_name;
                 query_for_table.no_delay = query.no_delay;
 
-                for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+                /// Flush should not be done if shouldBeEmptyOnDetach() == false,
+                /// since in this case getTablesIterator() may do some additional work,
+                /// see DatabaseMaterializeMySQL<>::getTablesIterator()
+                for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
+                {
+                    iterator->table()->flush();
+                }
+
+                for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
                 {
                     DatabasePtr db;
                     UUID table_to_wait = UUIDHelpers::Nil;
                     query_for_table.table = iterator->name();
+                    query_for_table.is_dictionary = iterator->table()->isDictionary();
                     executeToTableImpl(query_for_table, db, table_to_wait);
                     uuids_to_wait.push_back(table_to_wait);
                 }
@@ -421,7 +393,7 @@ AccessRightsElements InterpreterDropQuery::getRequiredAccessForDDLOnCluster() co
     return required_access;
 }
 
-void InterpreterDropQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const
+void InterpreterDropQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const
 {
     elem.query_kind = "Drop";
 }
diff --git a/src/Interpreters/InterpreterDropQuery.h b/src/Interpreters/InterpreterDropQuery.h
index 4a67857767f..16a08e95a3b 100644
--- a/src/Interpreters/InterpreterDropQuery.h
+++ b/src/Interpreters/InterpreterDropQuery.h
@@ -16,20 +16,19 @@ class AccessRightsElements;
   * or remove information about table (just forget) from server (DETACH),
   * or just clear all data in table (TRUNCATE).
   */
-class InterpreterDropQuery : public IInterpreter
+class InterpreterDropQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterDropQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterDropQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
 
     /// Drop table or database.
     BlockIO execute() override;
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr) const override;
 
 private:
     AccessRightsElements getRequiredAccessForDDLOnCluster() const;
     ASTPtr query_ptr;
-    Context & context;
 
     BlockIO executeToDatabase(const ASTDropQuery & query);
     BlockIO executeToDatabaseImpl(const ASTDropQuery & query, DatabasePtr & database, std::vector<UUID> & uuids_to_wait);
diff --git a/src/Interpreters/InterpreterExistsQuery.cpp b/src/Interpreters/InterpreterExistsQuery.cpp
index 335ee452e39..cbdb8561920 100644
--- a/src/Interpreters/InterpreterExistsQuery.cpp
+++ b/src/Interpreters/InterpreterExistsQuery.cpp
@@ -44,34 +44,34 @@ BlockInputStreamPtr InterpreterExistsQuery::executeImpl()
     {
         if (exists_query->temporary)
         {
-            result = context.tryResolveStorageID({"", exists_query->table}, Context::ResolveExternal);
+            result = getContext()->tryResolveStorageID({"", exists_query->table}, Context::ResolveExternal);
         }
         else
         {
-            String database = context.resolveDatabase(exists_query->database);
-            context.checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
-            result = DatabaseCatalog::instance().isTableExist({database, exists_query->table}, context);
+            String database = getContext()->resolveDatabase(exists_query->database);
+            getContext()->checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
+            result = DatabaseCatalog::instance().isTableExist({database, exists_query->table}, getContext());
         }
     }
     else if ((exists_query = query_ptr->as<ASTExistsViewQuery>()))
     {
-        String database = context.resolveDatabase(exists_query->database);
-        context.checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
-        auto table = DatabaseCatalog::instance().tryGetTable({database, exists_query->table}, context);
+        String database = getContext()->resolveDatabase(exists_query->database);
+        getContext()->checkAccess(AccessType::SHOW_TABLES, database, exists_query->table);
+        auto table = DatabaseCatalog::instance().tryGetTable({database, exists_query->table}, getContext());
         result = table && table->isView();
     }
     else if ((exists_query = query_ptr->as<ASTExistsDatabaseQuery>()))
     {
-        String database = context.resolveDatabase(exists_query->database);
-        context.checkAccess(AccessType::SHOW_DATABASES, database);
+        String database = getContext()->resolveDatabase(exists_query->database);
+        getContext()->checkAccess(AccessType::SHOW_DATABASES, database);
         result = DatabaseCatalog::instance().isDatabaseExist(database);
     }
     else if ((exists_query = query_ptr->as<ASTExistsDictionaryQuery>()))
     {
         if (exists_query->temporary)
             throw Exception("Temporary dictionaries are not possible.", ErrorCodes::SYNTAX_ERROR);
-        String database = context.resolveDatabase(exists_query->database);
-        context.checkAccess(AccessType::SHOW_DICTIONARIES, database, exists_query->table);
+        String database = getContext()->resolveDatabase(exists_query->database);
+        getContext()->checkAccess(AccessType::SHOW_DICTIONARIES, database, exists_query->table);
         result = DatabaseCatalog::instance().isDictionaryExist({database, exists_query->table});
     }
 
diff --git a/src/Interpreters/InterpreterExistsQuery.h b/src/Interpreters/InterpreterExistsQuery.h
index 1860e1d0aa9..efc664f07c3 100644
--- a/src/Interpreters/InterpreterExistsQuery.h
+++ b/src/Interpreters/InterpreterExistsQuery.h
@@ -7,16 +7,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Check that table exists. Return single row with single column "result" of type UInt8 and value 0 or 1.
   */
-class InterpreterExistsQuery : public IInterpreter
+class InterpreterExistsQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterExistsQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterExistsQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) { }
 
     BlockIO execute() override;
 
@@ -24,7 +20,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 4eff8b8456d..b4a91170bc4 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -7,6 +7,7 @@
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/Context.h>
+#include <Formats/FormatFactory.h>
 #include <Parsers/DumpASTNode.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTExplainQuery.h>
@@ -18,6 +19,8 @@
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/printPipeline.h>
 
+#include <Common/JSONBuilder.h>
+
 namespace DB
 {
 
@@ -33,9 +36,9 @@ namespace
 {
     struct ExplainAnalyzedSyntaxMatcher
     {
-        struct Data
+        struct Data : public WithContext
         {
-            const Context & context;
+            explicit Data(ContextPtr context_) : WithContext(context_) {}
         };
 
         static bool needChildVisit(ASTPtr & node, ASTPtr &)
@@ -52,7 +55,7 @@ namespace
         static void visit(ASTSelectQuery & select, ASTPtr & node, Data & data)
         {
             InterpreterSelectQuery interpreter(
-                node, data.context, SelectQueryOptions(QueryProcessingStage::FetchColumns).analyze().modify());
+                node, data.getContext(), SelectQueryOptions(QueryProcessingStage::FetchColumns).analyze().modify());
 
             const SelectQueryInfo & query_info = interpreter.getQueryInfo();
             if (query_info.view_query)
@@ -121,6 +124,7 @@ struct QueryPlanSettings
 
     /// Apply query plan optimizations.
     bool optimize = true;
+    bool json = false;
 
     constexpr static char name[] = "PLAN";
 
@@ -129,7 +133,9 @@ struct QueryPlanSettings
             {"header", query_plan_options.header},
             {"description", query_plan_options.description},
             {"actions", query_plan_options.actions},
+            {"indexes", query_plan_options.indexes},
             {"optimize", optimize},
+            {"json", json}
     };
 };
 
@@ -223,6 +229,7 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
     MutableColumns res_columns = sample_block.cloneEmptyColumns();
 
     WriteBufferFromOwnString buf;
+    bool single_line = false;
 
     if (ast.getKind() == ASTExplainQuery::ParsedAST)
     {
@@ -236,7 +243,7 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
         if (ast.getSettings())
             throw Exception("Settings are not supported for EXPLAIN SYNTAX query.", ErrorCodes::UNKNOWN_SETTING);
 
-        ExplainAnalyzedSyntaxVisitor::Data data{.context = context};
+        ExplainAnalyzedSyntaxVisitor::Data data(getContext());
         ExplainAnalyzedSyntaxVisitor(data).visit(query);
 
         ast.getExplainedQuery()->format(IAST::FormatSettings(buf, false));
@@ -249,13 +256,32 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
         auto settings = checkAndGetSettings<QueryPlanSettings>(ast.getSettings());
         QueryPlan plan;
 
-        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), context, SelectQueryOptions());
+        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), getContext(), SelectQueryOptions());
         interpreter.buildQueryPlan(plan);
 
         if (settings.optimize)
-            plan.optimize(QueryPlanOptimizationSettings::fromContext(context));
+            plan.optimize(QueryPlanOptimizationSettings::fromContext(getContext()));
 
-        plan.explainPlan(buf, settings.query_plan_options);
+        if (settings.json)
+        {
+            /// Add extra layers to make plan look more like from postgres.
+            auto plan_map = std::make_unique<JSONBuilder::JSONMap>();
+            plan_map->add("Plan", plan.explainPlan(settings.query_plan_options));
+            auto plan_array = std::make_unique<JSONBuilder::JSONArray>();
+            plan_array->add(std::move(plan_map));
+
+            auto format_settings = getFormatSettings(getContext());
+            format_settings.json.quote_64bit_integers = false;
+
+            JSONBuilder::FormatSettings json_format_settings{.settings = format_settings};
+            JSONBuilder::FormatContext format_context{.out = buf};
+
+            plan_array->format(json_format_settings, format_context);
+
+            single_line = true;
+        }
+        else
+            plan.explainPlan(buf, settings.query_plan_options);
     }
     else if (ast.getKind() == ASTExplainQuery::QueryPipeline)
     {
@@ -265,11 +291,11 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
         auto settings = checkAndGetSettings<QueryPipelineSettings>(ast.getSettings());
         QueryPlan plan;
 
-        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), context, SelectQueryOptions());
+        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), getContext(), SelectQueryOptions());
         interpreter.buildQueryPlan(plan);
         auto pipeline = plan.buildQueryPipeline(
-            QueryPlanOptimizationSettings::fromContext(context),
-            BuildQueryPipelineSettings::fromContext(context));
+            QueryPlanOptimizationSettings::fromContext(getContext()),
+            BuildQueryPipelineSettings::fromContext(getContext()));
 
         if (settings.graph)
         {
@@ -288,7 +314,10 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
         }
     }
 
-    fillColumn(*res_columns[0], buf.str());
+    if (single_line)
+        res_columns[0]->insertData(buf.str().data(), buf.str().size());
+    else
+        fillColumn(*res_columns[0], buf.str());
 
     return std::make_shared<OneBlockInputStream>(sample_block.cloneWithColumns(std::move(res_columns)));
 }
diff --git a/src/Interpreters/InterpreterExplainQuery.h b/src/Interpreters/InterpreterExplainQuery.h
index fbc8a998f2c..f16b1a8f69d 100644
--- a/src/Interpreters/InterpreterExplainQuery.h
+++ b/src/Interpreters/InterpreterExplainQuery.h
@@ -7,15 +7,11 @@
 namespace DB
 {
 
-class Context;
-
 /// Returns single row with explain results
-class InterpreterExplainQuery : public IInterpreter
+class InterpreterExplainQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterExplainQuery(const ASTPtr & query_, const Context & context_)
-        : query(query_), context(context_)
-    {}
+    InterpreterExplainQuery(const ASTPtr & query_, ContextPtr context_) : WithContext(context_), query(query_) { }
 
     BlockIO execute() override;
 
@@ -23,7 +19,6 @@ public:
 
 private:
     ASTPtr query;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterExternalDDLQuery.cpp b/src/Interpreters/InterpreterExternalDDLQuery.cpp
index 4a93c0fa753..e91b95a988d 100644
--- a/src/Interpreters/InterpreterExternalDDLQuery.cpp
+++ b/src/Interpreters/InterpreterExternalDDLQuery.cpp
@@ -26,8 +26,8 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-InterpreterExternalDDLQuery::InterpreterExternalDDLQuery(const ASTPtr & query_, Context & context_)
-    : query(query_), context(context_)
+InterpreterExternalDDLQuery::InterpreterExternalDDLQuery(const ASTPtr & query_, ContextMutablePtr context_)
+    : WithMutableContext(context_), query(query_)
 {
 }
 
@@ -35,7 +35,7 @@ BlockIO InterpreterExternalDDLQuery::execute()
 {
     const ASTExternalDDLQuery & external_ddl_query = query->as<ASTExternalDDLQuery &>();
 
-    if (context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+    if (getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
         throw Exception("Cannot parse and execute EXTERNAL DDL FROM.", ErrorCodes::SYNTAX_ERROR);
 
     if (external_ddl_query.from->name == "MySQL")
@@ -48,19 +48,19 @@ BlockIO InterpreterExternalDDLQuery::execute()
 
         if (external_ddl_query.external_ddl->as<ASTDropQuery>())
             return MySQLInterpreter::InterpreterMySQLDropQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
         else if (external_ddl_query.external_ddl->as<ASTRenameQuery>())
             return MySQLInterpreter::InterpreterMySQLRenameQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
         else if (external_ddl_query.external_ddl->as<MySQLParser::ASTAlterQuery>())
             return MySQLInterpreter::InterpreterMySQLAlterQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
         else if (external_ddl_query.external_ddl->as<MySQLParser::ASTCreateQuery>())
             return MySQLInterpreter::InterpreterMySQLCreateQuery(
-                external_ddl_query.external_ddl, context, getIdentifierName(arguments[0]),
+                external_ddl_query.external_ddl, getContext(), getIdentifierName(arguments[0]),
                 getIdentifierName(arguments[1])).execute();
 #endif
     }
diff --git a/src/Interpreters/InterpreterExternalDDLQuery.h b/src/Interpreters/InterpreterExternalDDLQuery.h
index f6b29c20c70..d084e68d7c8 100644
--- a/src/Interpreters/InterpreterExternalDDLQuery.h
+++ b/src/Interpreters/InterpreterExternalDDLQuery.h
@@ -6,15 +6,15 @@
 namespace DB
 {
 
-class InterpreterExternalDDLQuery : public IInterpreter
+class InterpreterExternalDDLQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterExternalDDLQuery(const ASTPtr & query_, Context & context_);
+    InterpreterExternalDDLQuery(const ASTPtr & query_, ContextMutablePtr context_);
 
     BlockIO execute() override;
+
 private:
     const ASTPtr query;
-    Context & context;
 
 };
 
diff --git a/src/Interpreters/InterpreterFactory.cpp b/src/Interpreters/InterpreterFactory.cpp
index 15e4c52f040..79cda364c42 100644
--- a/src/Interpreters/InterpreterFactory.cpp
+++ b/src/Interpreters/InterpreterFactory.cpp
@@ -92,7 +92,7 @@ namespace ErrorCodes
 }
 
 
-std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, Context & context, const SelectQueryOptions & options)
+std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, ContextMutablePtr context, const SelectQueryOptions & options)
 {
     OpenTelemetrySpanHolder span("InterpreterFactory::get()");
 
@@ -112,7 +112,7 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, Context &
     else if (query->as<ASTInsertQuery>())
     {
         ProfileEvents::increment(ProfileEvents::InsertQuery);
-        bool allow_materialized = static_cast<bool>(context.getSettingsRef().insert_allow_materialized_columns);
+        bool allow_materialized = static_cast<bool>(context->getSettingsRef().insert_allow_materialized_columns);
         return std::make_unique<InterpreterInsertQuery>(query, context, allow_materialized);
     }
     else if (query->as<ASTCreateQuery>())
diff --git a/src/Interpreters/InterpreterFactory.h b/src/Interpreters/InterpreterFactory.h
index 22a6ab7e8f3..774cbd1cb0f 100644
--- a/src/Interpreters/InterpreterFactory.h
+++ b/src/Interpreters/InterpreterFactory.h
@@ -16,7 +16,7 @@ class InterpreterFactory
 public:
     static std::unique_ptr<IInterpreter> get(
         ASTPtr & query,
-        Context & context,
+        ContextMutablePtr context,
         const SelectQueryOptions & options = {});
 };
 
diff --git a/src/Interpreters/InterpreterGrantQuery.cpp b/src/Interpreters/InterpreterGrantQuery.cpp
index b518178f6d0..7487ca79bde 100644
--- a/src/Interpreters/InterpreterGrantQuery.cpp
+++ b/src/Interpreters/InterpreterGrantQuery.cpp
@@ -225,7 +225,7 @@ BlockIO InterpreterGrantQuery::execute()
 {
     auto & query = query_ptr->as<ASTGrantQuery &>();
 
-    query.replaceCurrentUserTag(context.getUserName());
+    query.replaceCurrentUserTag(getContext()->getUserName());
     query.access_rights_elements.eraseNonGrantable();
 
     if (!query.access_rights_elements.sameOptions())
@@ -233,32 +233,32 @@ BlockIO InterpreterGrantQuery::execute()
     if (!query.access_rights_elements.empty() && query.access_rights_elements[0].is_partial_revoke && !query.is_revoke)
         throw Exception("A partial revoke should be revoked, not granted", ErrorCodes::LOGICAL_ERROR);
 
-    auto & access_control = context.getAccessControlManager();
+    auto & access_control = getContext()->getAccessControlManager();
     std::optional<RolesOrUsersSet> roles_set;
     if (query.roles)
         roles_set = RolesOrUsersSet{*query.roles, access_control};
 
-    std::vector<UUID> grantees = RolesOrUsersSet{*query.grantees, access_control, context.getUserID()}.getMatchingIDs(access_control);
+    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 = getRoleIDsAndCheckAdminOption(access_control, *context.getAccess(), query, *roles_set, grantees);
+        roles = getRoleIDsAndCheckAdminOption(access_control, *getContext()->getAccess(), query, *roles_set, grantees);
 
     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, *context.getAccess(), grantees);
-        return executeDDLQueryOnCluster(query_ptr, context, std::move(required_access));
+        checkGranteesAreAllowed(access_control, *getContext()->getAccess(), grantees);
+        return executeDDLQueryOnCluster(query_ptr, getContext(), std::move(required_access));
     }
 
-    query.replaceEmptyDatabase(context.getCurrentDatabase());
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
 
     /// Check if the current user has corresponding access rights with grant option.
     if (!query.access_rights_elements.empty())
-        checkGrantOption(access_control, *context.getAccess(), query, grantees);
+        checkGrantOption(access_control, *getContext()->getAccess(), query, grantees);
 
     /// Update roles and users listed in `grantees`.
     auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
@@ -291,7 +291,7 @@ void InterpreterGrantQuery::updateRoleFromQuery(Role & role, const ASTGrantQuery
     updateFromQueryImpl(role, query, roles_to_grant_or_revoke);
 }
 
-void InterpreterGrantQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & /*ast*/, const Context &) const
+void InterpreterGrantQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & /*ast*/, ContextPtr) const
 {
     auto & query = query_ptr->as<ASTGrantQuery &>();
     if (query.is_revoke)
diff --git a/src/Interpreters/InterpreterGrantQuery.h b/src/Interpreters/InterpreterGrantQuery.h
index 645b33346c3..abaddcc599b 100644
--- a/src/Interpreters/InterpreterGrantQuery.h
+++ b/src/Interpreters/InterpreterGrantQuery.h
@@ -1,30 +1,30 @@
 #pragma once
 
+#include <Core/UUID.h>
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <Core/UUID.h>
 
 
 namespace DB
 {
+
 class ASTGrantQuery;
 struct User;
 struct Role;
 
-
-class InterpreterGrantQuery : public IInterpreter
+class InterpreterGrantQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterGrantQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterGrantQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
     static void updateUserFromQuery(User & user, const ASTGrantQuery & query);
     static void updateRoleFromQuery(Role & role, const ASTGrantQuery & query);
-    void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, ContextPtr) const override;
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index b4ed7a2fd6e..225bf9ec651 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -2,28 +2,21 @@
 
 #include <Access/AccessFlags.h>
 #include <DataStreams/AddingDefaultBlockOutputStream.h>
-#include <DataStreams/AddingDefaultsBlockInputStream.h>
 #include <DataStreams/CheckConstraintsBlockOutputStream.h>
 #include <DataStreams/CountingBlockOutputStream.h>
 #include <DataStreams/InputStreamFromASTInsertQuery.h>
 #include <DataStreams/NullAndDoCopyBlockInputStream.h>
-#include <DataStreams/NullBlockOutputStream.h>
 #include <DataStreams/PushingToViewsBlockOutputStream.h>
-#include <DataStreams/RemoteBlockInputStream.h>
 #include <DataStreams/SquashingBlockOutputStream.h>
 #include <DataStreams/copyData.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
-#include <Interpreters/JoinedTables.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/queryToString.h>
-#include <Processors/NullSink.h>
 #include <Processors/Sources/SinkToOutputStream.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -35,11 +28,8 @@
 #include <Interpreters/TranslateQualifiedNamesVisitor.h>
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/processColumnTransformers.h>
-
-namespace
-{
-const UInt64 PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL = 2;
-}
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnNullable.h>
 
 
 namespace DB
@@ -50,13 +40,12 @@ namespace ErrorCodes
     extern const int NO_SUCH_COLUMN_IN_TABLE;
     extern const int ILLEGAL_COLUMN;
     extern const int DUPLICATE_COLUMN;
-    extern const int LOGICAL_ERROR;
 }
 
 InterpreterInsertQuery::InterpreterInsertQuery(
-    const ASTPtr & query_ptr_, const Context & context_, bool allow_materialized_, bool no_squash_, bool no_destination_)
-    : query_ptr(query_ptr_)
-    , context(context_)
+    const ASTPtr & query_ptr_, ContextPtr context_, bool allow_materialized_, bool no_squash_, bool no_destination_)
+    : WithContext(context_)
+    , query_ptr(query_ptr_)
     , allow_materialized(allow_materialized_)
     , no_squash(no_squash_)
     , no_destination(no_destination_)
@@ -70,12 +59,12 @@ StoragePtr InterpreterInsertQuery::getTable(ASTInsertQuery & query)
     if (query.table_function)
     {
         const auto & factory = TableFunctionFactory::instance();
-        TableFunctionPtr table_function_ptr = factory.get(query.table_function, context);
-        return table_function_ptr->execute(query.table_function, context, table_function_ptr->getName());
+        TableFunctionPtr table_function_ptr = factory.get(query.table_function, getContext());
+        return table_function_ptr->execute(query.table_function, getContext(), table_function_ptr->getName());
     }
 
-    query.table_id = context.resolveStorageID(query.table_id);
-    return DatabaseCatalog::instance().getTable(query.table_id, context);
+    query.table_id = getContext()->resolveStorageID(query.table_id);
+    return DatabaseCatalog::instance().getTable(query.table_id, getContext());
 }
 
 Block InterpreterInsertQuery::getSampleBlock(
@@ -95,7 +84,7 @@ Block InterpreterInsertQuery::getSampleBlock(
 
     Block table_sample = metadata_snapshot->getSampleBlock();
 
-    const auto columns_ast = processColumnTransformers(context.getCurrentDatabase(), table, metadata_snapshot, query.columns);
+    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;
@@ -160,97 +149,28 @@ static bool isTrivialSelect(const ASTPtr & select)
 
 BlockIO InterpreterInsertQuery::execute()
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
     auto & query = query_ptr->as<ASTInsertQuery &>();
 
     BlockIO res;
 
     StoragePtr table = getTable(query);
-    auto table_lock = table->lockForShare(context.getInitialQueryId(), settings.lock_acquire_timeout);
+    auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), settings.lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
     auto query_sample_block = getSampleBlock(query, table, metadata_snapshot);
     if (!query.table_function)
-        context.checkAccess(AccessType::INSERT, query.table_id, query_sample_block.getNames());
+        getContext()->checkAccess(AccessType::INSERT, query.table_id, query_sample_block.getNames());
 
     bool is_distributed_insert_select = false;
 
     if (query.select && table->isRemote() && settings.parallel_distributed_insert_select)
     {
         // Distributed INSERT SELECT
-        std::shared_ptr<StorageDistributed> storage_src;
-        auto & select = query.select->as<ASTSelectWithUnionQuery &>();
-        auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
-        if (select.list_of_selects->children.size() == 1)
-        {
-            if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
-            {
-                JoinedTables joined_tables(Context(context), *select_query);
-
-                if (joined_tables.tablesCount() == 1)
-                {
-                    storage_src = std::dynamic_pointer_cast<StorageDistributed>(joined_tables.getLeftTableStorage());
-                    if (storage_src)
-                    {
-                        const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
-                        select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
-
-                        auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select_query->clone());
-                        select_with_union_query->list_of_selects->children.push_back(new_select_query);
-
-                        new_select_query->replaceDatabaseAndTable(storage_src->getRemoteDatabaseName(), storage_src->getRemoteTableName());
-
-                        new_query->select = select_with_union_query;
-                    }
-                }
-            }
-        }
-
-        auto storage_dst = std::dynamic_pointer_cast<StorageDistributed>(table);
-
-        if (storage_src && storage_dst && storage_src->getClusterName() == storage_dst->getClusterName())
+        if (auto maybe_pipeline = table->distributedWrite(query, getContext()))
         {
+            res.pipeline = std::move(*maybe_pipeline);
             is_distributed_insert_select = true;
-
-            if (settings.parallel_distributed_insert_select == PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL)
-            {
-                new_query->table_id = StorageID(storage_dst->getRemoteDatabaseName(), storage_dst->getRemoteTableName());
-            }
-
-            const auto & cluster = storage_src->getCluster();
-            const auto & shards_info = cluster->getShardsInfo();
-
-            std::vector<std::unique_ptr<QueryPipeline>> pipelines;
-
-            String new_query_str = queryToString(new_query);
-            for (size_t shard_index : ext::range(0, shards_info.size()))
-            {
-                const auto & shard_info = shards_info[shard_index];
-                if (shard_info.isLocal())
-                {
-                    InterpreterInsertQuery interpreter(new_query, context);
-                    pipelines.emplace_back(std::make_unique<QueryPipeline>(interpreter.execute().pipeline));
-                }
-                else
-                {
-                    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
-                    auto connections = shard_info.pool->getMany(timeouts, &settings, PoolMode::GET_ONE);
-                    if (connections.empty() || connections.front().isNull())
-                        throw Exception(
-                            "Expected exactly one connection for shard " + toString(shard_info.shard_num), ErrorCodes::LOGICAL_ERROR);
-
-                    ///  INSERT SELECT query returns empty block
-                    auto in_stream = std::make_shared<RemoteBlockInputStream>(std::move(connections), new_query_str, Block{}, context);
-                    pipelines.emplace_back(std::make_unique<QueryPipeline>());
-                    pipelines.back()->init(Pipe(std::make_shared<SourceFromInputStream>(std::move(in_stream))));
-                    pipelines.back()->setSinks([](const Block & header, QueryPipeline::StreamType) -> ProcessorPtr
-                    {
-                        return std::make_shared<EmptySink>(header);
-                    });
-                }
-            }
-
-            res.pipeline = QueryPipeline::unitePipelines(std::move(pipelines), {}, ExpressionActionsSettings::fromContext(context));
         }
     }
 
@@ -285,15 +205,20 @@ BlockIO InterpreterInsertQuery::execute()
                   * to avoid unnecessary squashing.
                   */
 
-                Settings new_settings = context.getSettings();
+                Settings new_settings = getContext()->getSettings();
 
                 new_settings.max_threads = std::max<UInt64>(1, settings.max_insert_threads);
 
-                if (settings.min_insert_block_size_rows && table->prefersLargeBlocks())
-                    new_settings.max_block_size = settings.min_insert_block_size_rows;
+                if (table->prefersLargeBlocks())
+                {
+                    if (settings.min_insert_block_size_rows)
+                        new_settings.max_block_size = settings.min_insert_block_size_rows;
+                    if (settings.min_insert_block_size_bytes)
+                        new_settings.preferred_block_size_bytes = settings.min_insert_block_size_bytes;
+                }
 
-                Context new_context = context;
-                new_context.setSettings(new_settings);
+                auto new_context = Context::createCopy(context);
+                new_context->setSettings(new_settings);
 
                 InterpreterSelectWithUnionQuery interpreter_select{
                     query.select, new_context, SelectQueryOptions(QueryProcessingStage::Complete, 1)};
@@ -303,18 +228,39 @@ BlockIO InterpreterInsertQuery::execute()
             {
                 /// Passing 1 as subquery_depth will disable limiting size of intermediate result.
                 InterpreterSelectWithUnionQuery interpreter_select{
-                    query.select, context, SelectQueryOptions(QueryProcessingStage::Complete, 1)};
+                    query.select, getContext(), SelectQueryOptions(QueryProcessingStage::Complete, 1)};
                 res = interpreter_select.execute();
             }
 
+            res.pipeline.dropTotalsAndExtremes();
+
             if (table->supportsParallelInsert() && settings.max_insert_threads > 1)
                 out_streams_size = std::min(size_t(settings.max_insert_threads), res.pipeline.getNumStreams());
 
             res.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 & query_columns = query_sample_block.getColumnsWithTypeAndName();
+                const auto & output_columns = metadata_snapshot->getColumns();
+
+                if (input_columns.size() == query_columns.size())
+                {
+                    for (size_t col_idx = 0; col_idx < query_columns.size(); ++col_idx)
+                    {
+                        /// Change query sample block columns to Nullable to allow inserting nullable columns, where NULL values will be substituted with
+                        /// default column values (in AddingDefaultBlockOutputStream), so all values will be cast correctly.
+                        if (input_columns[col_idx].type->isNullable() && !query_columns[col_idx].type->isNullable() && output_columns.hasDefault(query_columns[col_idx].name))
+                            query_sample_block.setColumn(col_idx, ColumnWithTypeAndName(makeNullable(query_columns[col_idx].column), makeNullable(query_columns[col_idx].type), query_columns[col_idx].name));
+                    }
+                }
+            }
         }
         else if (query.watch)
         {
-            InterpreterWatchQuery interpreter_watch{ query.watch, context };
+            InterpreterWatchQuery interpreter_watch{ query.watch, getContext() };
             res = interpreter_watch.execute();
             res.pipeline.init(Pipe(std::make_shared<SourceFromInputStream>(std::move(res.in))));
         }
@@ -327,21 +273,23 @@ BlockIO InterpreterInsertQuery::execute()
             /// 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 = table->write(query_ptr, metadata_snapshot, context);
+                out = table->write(query_ptr, metadata_snapshot, getContext());
             else
-                out = std::make_shared<PushingToViewsBlockOutputStream>(table, metadata_snapshot, context, query_ptr, no_destination);
+                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(), context);
+                    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(), context);
+                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.
@@ -360,9 +308,8 @@ BlockIO InterpreterInsertQuery::execute()
             }
 
             auto out_wrapper = std::make_shared<CountingBlockOutputStream>(out);
-            out_wrapper->setProcessListElement(context.getProcessListElement());
-            out = std::move(out_wrapper);
-            out_streams.emplace_back(std::move(out));
+            out_wrapper->setProcessListElement(getContext()->getProcessListElement());
+            out_streams.emplace_back(std::move(out_wrapper));
         }
     }
 
@@ -378,7 +325,7 @@ BlockIO InterpreterInsertQuery::execute()
                 res.pipeline.getHeader().getColumnsWithTypeAndName(),
                 header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Position);
-        auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(context));
+        auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes));
 
         res.pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
         {
@@ -406,7 +353,7 @@ BlockIO InterpreterInsertQuery::execute()
     else if (query.data && !query.has_tail) /// can execute without additional data
     {
         // res.out = std::move(out_streams.at(0));
-        res.in = std::make_shared<InputStreamFromASTInsertQuery>(query_ptr, nullptr, query_sample_block, context, nullptr);
+        res.in = std::make_shared<InputStreamFromASTInsertQuery>(query_ptr, nullptr, query_sample_block, getContext(), nullptr);
         res.in = std::make_shared<NullAndDoCopyBlockInputStream>(res.in, out_streams.at(0));
     }
     else
@@ -429,10 +376,10 @@ StorageID InterpreterInsertQuery::getDatabaseTable() const
 }
 
 
-void InterpreterInsertQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, const Context & context_) const
+void InterpreterInsertQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr &, ContextPtr context_) const
 {
     elem.query_kind = "Insert";
-    const auto & insert_table = context_.getInsertionTable();
+    const auto & insert_table = context_->getInsertionTable();
     if (!insert_table.empty())
     {
         elem.query_databases.insert(insert_table.getDatabaseName());
diff --git a/src/Interpreters/InterpreterInsertQuery.h b/src/Interpreters/InterpreterInsertQuery.h
index 85178bc73ad..71b8c827702 100644
--- a/src/Interpreters/InterpreterInsertQuery.h
+++ b/src/Interpreters/InterpreterInsertQuery.h
@@ -9,17 +9,14 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Interprets the INSERT query.
   */
-class InterpreterInsertQuery : public IInterpreter
+class InterpreterInsertQuery : public IInterpreter, WithContext
 {
 public:
     InterpreterInsertQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         bool allow_materialized_ = false,
         bool no_squash_ = false,
         bool no_destination_ = false);
@@ -33,14 +30,13 @@ public:
 
     StorageID getDatabaseTable() const;
 
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context & context_) const override;
+    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;
 
     ASTPtr query_ptr;
-    const Context & context;
     const bool allow_materialized;
     const bool no_squash;
     const bool no_destination;
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index c50659c6c45..7e58cccf13a 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -74,7 +74,7 @@ static void insertResultRow(size_t n, CancellationCode code, const Block & sourc
         columns[col_num]->insertFrom(*source.getByName(header.getByPosition(col_num).name).column, n);
 }
 
-static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & processes_block, Context & context)
+static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & processes_block, ContextPtr context)
 {
     QueryDescriptors res;
     size_t num_processes = processes_block.rows();
@@ -82,7 +82,7 @@ static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & proce
 
     const ColumnString & query_id_col = typeid_cast<const ColumnString &>(*processes_block.getByName("query_id").column);
     const ColumnString & user_col = typeid_cast<const ColumnString &>(*processes_block.getByName("user").column);
-    const ClientInfo & my_client = context.getProcessListElement()->getClientInfo();
+    const ClientInfo & my_client = context->getProcessListElement()->getClientInfo();
 
     bool access_denied = false;
     std::optional<bool> is_kill_query_granted_value;
@@ -90,7 +90,7 @@ static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & proce
     {
         if (!is_kill_query_granted_value)
         {
-            is_kill_query_granted_value = context.getAccess()->isGranted(AccessType::KILL_QUERY);
+            is_kill_query_granted_value = context->getAccess()->isGranted(AccessType::KILL_QUERY);
             if (!*is_kill_query_granted_value)
                 access_denied = true;
         }
@@ -195,7 +195,7 @@ BlockIO InterpreterKillQueryQuery::execute()
     const auto & query = query_ptr->as<ASTKillQueryQuery &>();
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccessForDDLOnCluster());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccessForDDLOnCluster());
 
     BlockIO res_io;
     switch (query.type)
@@ -206,8 +206,8 @@ BlockIO InterpreterKillQueryQuery::execute()
         if (!processes_block)
             return res_io;
 
-        ProcessList & process_list = context.getProcessList();
-        QueryDescriptors queries_to_stop = extractQueriesExceptMeAndCheckAccess(processes_block, context);
+        ProcessList & process_list = getContext()->getProcessList();
+        QueryDescriptors queries_to_stop = extractQueriesExceptMeAndCheckAccess(processes_block, getContext());
 
         auto header = processes_block.cloneEmpty();
         header.insert(0, {ColumnString::create(), std::make_shared<DataTypeString>(), "kill_status"});
@@ -248,7 +248,7 @@ BlockIO InterpreterKillQueryQuery::execute()
         MutableColumns res_columns = header.cloneEmptyColumns();
         auto table_id = StorageID::createEmpty();
         AccessRightsElements required_access_rights;
-        auto access = context.getAccess();
+        auto access = getContext()->getAccess();
         bool access_denied = false;
 
         for (size_t i = 0; i < mutations_block.rows(); ++i)
@@ -259,14 +259,16 @@ BlockIO InterpreterKillQueryQuery::execute()
             CancellationCode code = CancellationCode::Unknown;
             if (!query.test)
             {
-                auto storage = DatabaseCatalog::instance().tryGetTable(table_id, context);
+                auto storage = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
                 if (!storage)
                     code = CancellationCode::NotFound;
                 else
                 {
                     ParserAlterCommand parser;
-                    auto command_ast = parseQuery(parser, command_col.getDataAt(i).toString(), 0, context.getSettingsRef().max_parser_depth);
-                    required_access_rights = InterpreterAlterQuery::getRequiredAccessForCommand(command_ast->as<const ASTAlterCommand &>(), table_id.database_name, table_id.table_name);
+                    auto command_ast
+                        = parseQuery(parser, command_col.getDataAt(i).toString(), 0, getContext()->getSettingsRef().max_parser_depth);
+                    required_access_rights = InterpreterAlterQuery::getRequiredAccessForCommand(
+                        command_ast->as<const ASTAlterCommand &>(), table_id.database_name, table_id.table_name);
                     if (!access->isGranted(required_access_rights))
                     {
                         access_denied = true;
@@ -300,7 +302,7 @@ Block InterpreterKillQueryQuery::getSelectResult(const String & columns, const S
     if (where_expression)
         select_query += " WHERE " + queryToString(where_expression);
 
-    auto stream = executeQuery(select_query, context.getGlobalContext(), true).getInputStream();
+    auto stream = executeQuery(select_query, getContext(), true).getInputStream();
     Block res = stream->read();
 
     if (res && stream->read())
diff --git a/src/Interpreters/InterpreterKillQueryQuery.h b/src/Interpreters/InterpreterKillQueryQuery.h
index 788703f8e6d..9284d777ca7 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.h
+++ b/src/Interpreters/InterpreterKillQueryQuery.h
@@ -8,15 +8,12 @@
 namespace DB
 {
 
-class Context;
 class AccessRightsElements;
 
-
-class InterpreterKillQueryQuery final : public IInterpreter
+class InterpreterKillQueryQuery final : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterKillQueryQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterKillQueryQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) { }
 
     BlockIO execute() override;
 
@@ -25,8 +22,6 @@ private:
     Block getSelectResult(const String & columns, const String & table);
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterOptimizeQuery.cpp b/src/Interpreters/InterpreterOptimizeQuery.cpp
index d8e9013e397..64de5ee0479 100644
--- a/src/Interpreters/InterpreterOptimizeQuery.cpp
+++ b/src/Interpreters/InterpreterOptimizeQuery.cpp
@@ -25,12 +25,12 @@ BlockIO InterpreterOptimizeQuery::execute()
     const auto & ast = query_ptr->as<ASTOptimizeQuery &>();
 
     if (!ast.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
-    context.checkAccess(getRequiredAccess());
+    getContext()->checkAccess(getRequiredAccess());
 
-    auto table_id = context.resolveStorageID(ast, Context::ResolveOrdinary);
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
+    auto table_id = getContext()->resolveStorageID(ast, Context::ResolveOrdinary);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
     // Empty list of names means we deduplicate by all columns, but user can explicitly state which columns to use.
@@ -40,7 +40,8 @@ BlockIO InterpreterOptimizeQuery::execute()
         // User requested custom set of columns for deduplication, possibly with Column Transformer expression.
         {
             // Expand asterisk, column transformers, etc into list of column names.
-            const auto cols = processColumnTransformers(context.getCurrentDatabase(), table, metadata_snapshot, ast.deduplicate_by_columns);
+            const auto cols
+                = processColumnTransformers(getContext()->getCurrentDatabase(), table, metadata_snapshot, ast.deduplicate_by_columns);
             for (const auto & col : cols->children)
                 column_names.emplace_back(col->getColumnName());
         }
@@ -68,7 +69,7 @@ BlockIO InterpreterOptimizeQuery::execute()
         }
     }
 
-    table->optimize(query_ptr, metadata_snapshot, ast.partition, ast.final, ast.deduplicate, column_names, context);
+    table->optimize(query_ptr, metadata_snapshot, ast.partition, ast.final, ast.deduplicate, column_names, getContext());
 
     return {};
 }
diff --git a/src/Interpreters/InterpreterOptimizeQuery.h b/src/Interpreters/InterpreterOptimizeQuery.h
index faf336a0e98..8491fe8df49 100644
--- a/src/Interpreters/InterpreterOptimizeQuery.h
+++ b/src/Interpreters/InterpreterOptimizeQuery.h
@@ -6,19 +6,15 @@
 
 namespace DB
 {
-class Context;
-class AccessRightsElements;
 
+class AccessRightsElements;
 
 /** Just call method "optimize" for table.
   */
-class InterpreterOptimizeQuery : public IInterpreter
+class InterpreterOptimizeQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterOptimizeQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_)
-    {
-    }
+    InterpreterOptimizeQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -26,7 +22,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterRenameQuery.cpp b/src/Interpreters/InterpreterRenameQuery.cpp
index 923a342d9ea..515559ad903 100644
--- a/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/src/Interpreters/InterpreterRenameQuery.cpp
@@ -18,8 +18,8 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-InterpreterRenameQuery::InterpreterRenameQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterRenameQuery::InterpreterRenameQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+    : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -29,12 +29,12 @@ BlockIO InterpreterRenameQuery::execute()
     const auto & rename = query_ptr->as<const ASTRenameQuery &>();
 
     if (!rename.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccess());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
-    context.checkAccess(getRequiredAccess());
+    getContext()->checkAccess(getRequiredAccess());
 
-    String path = context.getPath();
-    String current_database = context.getCurrentDatabase();
+    String path = getContext()->getPath();
+    String current_database = getContext()->getCurrentDatabase();
 
     /** In case of error while renaming, it is possible that only part of tables was renamed
       *  or we will be in inconsistent state. (It is worth to be fixed.)
@@ -77,10 +77,11 @@ BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, c
     for (const auto & elem : descriptions)
     {
         if (!rename.exchange)
-            database_catalog.assertTableDoesntExist(StorageID(elem.to_database_name, elem.to_table_name), context);
+            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()) && context.getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
+        if (typeid_cast<DatabaseReplicated *>(database.get())
+            && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
         {
             if (1 < descriptions.size())
                 throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Database {} is Replicated, "
@@ -90,12 +91,12 @@ BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, c
             UniqueTableName to(elem.to_database_name, elem.to_table_name);
             ddl_guards[from]->releaseTableLock();
             ddl_guards[to]->releaseTableLock();
-            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, context);
+            return typeid_cast<DatabaseReplicated *>(database.get())->tryEnqueueReplicatedDDL(query_ptr, getContext());
         }
         else
         {
             database->renameTable(
-                context,
+                getContext(),
                 elem.from_table_name,
                 *database_catalog.getDatabase(elem.to_database_name),
                 elem.to_table_name,
@@ -140,19 +141,19 @@ AccessRightsElements InterpreterRenameQuery::getRequiredAccess() const
     return required_access;
 }
 
-void InterpreterRenameQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const
+void InterpreterRenameQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const
 {
     elem.query_kind = "Rename";
     const auto & rename = ast->as<const ASTRenameQuery &>();
     for (const auto & element : rename.elements)
     {
         {
-            String database = backQuoteIfNeed(element.from.database.empty() ? context.getCurrentDatabase() : element.from.database);
+            String database = backQuoteIfNeed(element.from.database.empty() ? getContext()->getCurrentDatabase() : element.from.database);
             elem.query_databases.insert(database);
             elem.query_tables.insert(database + "." + backQuoteIfNeed(element.from.table));
         }
         {
-            String database = backQuoteIfNeed(element.to.database.empty() ? context.getCurrentDatabase() : element.to.database);
+            String database = backQuoteIfNeed(element.to.database.empty() ? getContext()->getCurrentDatabase() : element.to.database);
             elem.query_databases.insert(database);
             elem.query_tables.insert(database + "." + backQuoteIfNeed(element.to.table));
         }
diff --git a/src/Interpreters/InterpreterRenameQuery.h b/src/Interpreters/InterpreterRenameQuery.h
index 0da25f63e8d..49fdd50f52d 100644
--- a/src/Interpreters/InterpreterRenameQuery.h
+++ b/src/Interpreters/InterpreterRenameQuery.h
@@ -7,7 +7,6 @@
 namespace DB
 {
 
-class Context;
 class AccessRightsElements;
 class DDLGuard;
 
@@ -49,12 +48,12 @@ using TableGuards = std::map<UniqueTableName, std::unique_ptr<DDLGuard>>;
 /** Rename one table
   *  or rename many tables at once.
   */
-class InterpreterRenameQuery : public IInterpreter
+class InterpreterRenameQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterRenameQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterRenameQuery(const ASTPtr & query_ptr_, ContextPtr context_);
     BlockIO execute() override;
-    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const override;
 
 private:
     BlockIO executeToTables(const ASTRenameQuery & rename, const RenameDescriptions & descriptions, TableGuards & ddl_guards);
@@ -63,7 +62,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 1f6b0c37437..7407088ba60 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -37,7 +37,6 @@
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 
 #include <Processors/Pipe.h>
-#include <Processors/QueryPlan/AddingDelayedSourceStep.h>
 #include <Processors/QueryPlan/AggregatingStep.h>
 #include <Processors/QueryPlan/ArrayJoinStep.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
@@ -48,6 +47,7 @@
 #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>
@@ -82,7 +82,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <ext/map.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <memory>
 
 
@@ -138,8 +138,8 @@ String InterpreterSelectQuery::generateFilterActions(ActionsDAGPtr & actions, co
     table_expr->children.push_back(table_expr->database_and_table_name);
 
     /// Using separate expression analyzer to prevent any possible alias injection
-    auto syntax_result = TreeRewriter(*context).analyzeSelect(query_ast, TreeRewriterResult({}, storage, metadata_snapshot));
-    SelectQueryExpressionAnalyzer analyzer(query_ast, syntax_result, *context, metadata_snapshot);
+    auto syntax_result = TreeRewriter(context).analyzeSelect(query_ast, TreeRewriterResult({}, storage, metadata_snapshot));
+    SelectQueryExpressionAnalyzer analyzer(query_ast, syntax_result, context, metadata_snapshot);
     actions = analyzer.simpleSelectActions();
 
     auto column_name = expr_list->children.at(0)->getColumnName();
@@ -154,7 +154,7 @@ String InterpreterSelectQuery::generateFilterActions(ActionsDAGPtr & actions, co
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const SelectQueryOptions & options_,
     const Names & required_result_column_names_)
     : InterpreterSelectQuery(query_ptr_, context_, nullptr, std::nullopt, nullptr, options_, required_result_column_names_)
@@ -163,7 +163,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const BlockInputStreamPtr & input_,
     const SelectQueryOptions & options_)
     : InterpreterSelectQuery(query_ptr_, context_, input_, std::nullopt, nullptr, options_.copy().noSubquery())
@@ -171,7 +171,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
 InterpreterSelectQuery::InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         Pipe input_pipe_,
         const SelectQueryOptions & options_)
         : InterpreterSelectQuery(query_ptr_, context_, nullptr, std::move(input_pipe_), nullptr, options_.copy().noSubquery())
@@ -179,7 +179,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const StoragePtr & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const SelectQueryOptions & options_)
@@ -192,15 +192,15 @@ InterpreterSelectQuery::~InterpreterSelectQuery() = default;
 /** There are no limits on the maximum size of the result for the subquery.
   *  Since the result of the query is not the result of the entire query.
   */
-static Context getSubqueryContext(const Context & context)
+static ContextPtr getSubqueryContext(ContextPtr context)
 {
-    Context subquery_context = context;
-    Settings subquery_settings = context.getSettings();
+    auto subquery_context = Context::createCopy(context);
+    Settings subquery_settings = context->getSettings();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of extremes does not make sense and is not necessary (if you do it, then the extremes of the subquery can be taken for whole query).
     subquery_settings.extremes = false;
-    subquery_context.setSettings(subquery_settings);
+    subquery_context->setSettings(subquery_settings);
     return subquery_context;
 }
 
@@ -223,7 +223,7 @@ static void rewriteMultipleJoins(ASTPtr & query, const TablesWithColumns & table
 
 /// Checks that the current user has the SELECT privilege.
 static void checkAccessRightsForSelect(
-    const Context & context,
+    ContextPtr context,
     const StorageID & table_id,
     const StorageMetadataPtr & table_metadata,
     const Strings & required_columns,
@@ -236,19 +236,19 @@ static void checkAccessRightsForSelect(
         /// In this case just checking access for `required_columns` doesn't work correctly
         /// because `required_columns` will contain the name of a column of minimum size (see TreeRewriterResult::collectUsedColumns())
         /// which is probably not the same column as the column the current user has access to.
-        auto access = context.getAccess();
+        auto access = context->getAccess();
         for (const auto & column : table_metadata->getColumns())
         {
             if (access->isGranted(AccessType::SELECT, table_id.database_name, table_id.table_name, column.name))
                 return;
         }
-        throw Exception(context.getUserName() + ": Not enough privileges. "
+        throw Exception(context->getUserName() + ": Not enough privileges. "
                         "To execute this query it's necessary to have grant SELECT for at least one column on " + table_id.getFullTableName(),
                         ErrorCodes::ACCESS_DENIED);
     }
 
     /// General check.
-    context.checkAccess(AccessType::SELECT, table_id, required_columns);
+    context->checkAccess(AccessType::SELECT, table_id, required_columns);
 }
 
 /// Returns true if we should ignore quotas and limits for a specified table in the system database.
@@ -265,7 +265,7 @@ static bool shouldIgnoreQuotaAndLimits(const StorageID & table_id)
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
-    const Context & context_,
+    ContextPtr context_,
     const BlockInputStreamPtr & input_,
     std::optional<Pipe> input_pipe_,
     const StoragePtr & storage_,
@@ -282,6 +282,8 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 {
     checkStackSize();
 
+    query_info.ignore_projections = options.ignore_projections;
+
     initSettings();
     const Settings & settings = context->getSettingsRef();
 
@@ -309,7 +311,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         ApplyWithSubqueryVisitor().visit(query_ptr);
     }
 
-    JoinedTables joined_tables(getSubqueryContext(*context), getSelectQuery());
+    JoinedTables joined_tables(getSubqueryContext(context), getSelectQuery());
 
     bool got_storage_from_query = false;
     if (!has_input && !storage)
@@ -376,15 +378,17 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         if (view)
             view->replaceWithSubquery(getSelectQuery(), view_table, metadata_snapshot);
 
-        syntax_analyzer_result = TreeRewriter(*context).analyzeSelect(
+        syntax_analyzer_result = TreeRewriter(context).analyzeSelect(
             query_ptr,
             TreeRewriterResult(source_header.getNamesAndTypesList(), storage, metadata_snapshot),
             options, joined_tables.tablesWithColumns(), required_result_column_names, table_join);
 
+        query_info.syntax_analyzer_result = syntax_analyzer_result;
+
         /// Save scalar sub queries's results in the query context
         if (!options.only_analyze && context->hasQueryContext())
             for (const auto & it : syntax_analyzer_result->getScalars())
-                context->getQueryContext().addScalar(it.first, it.second);
+                context->getQueryContext()->addScalar(it.first, it.second);
 
         if (view)
         {
@@ -407,12 +411,25 @@ InterpreterSelectQuery::InterpreterSelectQuery(
                 current_info.query = query_ptr;
                 current_info.syntax_analyzer_result = syntax_analyzer_result;
 
-                MergeTreeWhereOptimizer{current_info, *context, std::move(column_compressed_sizes), metadata_snapshot, syntax_analyzer_result->requiredSourceColumns(), log};
+                MergeTreeWhereOptimizer{
+                    current_info,
+                    context,
+                    std::move(column_compressed_sizes),
+                    metadata_snapshot,
+                    syntax_analyzer_result->requiredSourceColumns(),
+                    log};
             }
         }
 
+        if (query.prewhere() && query.where())
+        {
+            /// Filter block in WHERE instead to get better performance
+            query.setExpression(
+                ASTSelectQuery::Expression::WHERE, makeASTFunction("and", query.prewhere()->clone(), query.where()->clone()));
+        }
+
         query_analyzer = std::make_unique<SelectQueryExpressionAnalyzer>(
-                query_ptr, syntax_analyzer_result, *context, metadata_snapshot,
+                query_ptr, syntax_analyzer_result, context, metadata_snapshot,
                 NameSet(required_result_column_names.begin(), required_result_column_names.end()),
                 !options.only_analyze, options, std::move(subquery_for_sets));
 
@@ -494,12 +511,6 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             query.setExpression(ASTSelectQuery::Expression::WHERE, std::make_shared<ASTLiteral>(0u));
         need_analyze_again = true;
     }
-    if (query.prewhere() && query.where())
-    {
-        /// Filter block in WHERE instead to get better performance
-        query.setExpression(ASTSelectQuery::Expression::WHERE, makeASTFunction("and", query.prewhere()->clone(), query.where()->clone()));
-        need_analyze_again = true;
-    }
 
     if (need_analyze_again)
     {
@@ -520,7 +531,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     {
         /// The current user should have the SELECT privilege.
         /// If this table_id is for a table function we don't check access rights here because in this case they have been already checked in ITableFunction::execute().
-        checkAccessRightsForSelect(*context, table_id, metadata_snapshot, required_columns, *syntax_analyzer_result);
+        checkAccessRightsForSelect(context, table_id, metadata_snapshot, required_columns, *syntax_analyzer_result);
 
         /// Remove limits for some tables in the `system` database.
         if (shouldIgnoreQuotaAndLimits(table_id) && (joined_tables.tablesCount() <= 1))
@@ -530,6 +541,13 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         }
     }
 
+    /// Add prewhere actions with alias columns and record needed columns from storage.
+    if (storage)
+    {
+        addPrewhereAliasActions();
+        analysis_result.required_columns = required_columns;
+    }
+
     /// Blocks used in expression analysis contains size 1 const columns for constant folding and
     ///  null non-const columns to avoid useless memory allocations. However, a valid block sample
     ///  requires all columns to be of size 0, thus we need to sanitize the block here.
@@ -541,7 +559,10 @@ void InterpreterSelectQuery::buildQueryPlan(QueryPlan & query_plan)
     executeImpl(query_plan, input, std::move(input_pipe));
 
     /// We must guarantee that result structure is the same as in getSampleBlock()
-    if (!blocksHaveEqualStructure(query_plan.getCurrentDataStream().header, result_header))
+    ///
+    /// But if we ignore aggregation, plan header does not match result_header.
+    /// TODO: add special stage for InterpreterSelectQuery?
+    if (!options.ignore_aggregation && !blocksHaveEqualStructure(query_plan.getCurrentDataStream().header, result_header))
     {
         auto convert_actions_dag = ActionsDAG::makeConvertingActions(
                 query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
@@ -562,8 +583,8 @@ BlockIO InterpreterSelectQuery::execute()
     buildQueryPlan(query_plan);
 
     res.pipeline = std::move(*query_plan.buildQueryPipeline(
-        QueryPlanOptimizationSettings::fromContext(*context),
-        BuildQueryPipelineSettings::fromContext(*context)));
+        QueryPlanOptimizationSettings::fromContext(context),
+        BuildQueryPipelineSettings::fromContext(context)));
     return res;
 }
 
@@ -572,9 +593,17 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
     OpenTelemetrySpanHolder span(__PRETTY_FUNCTION__);
 
     query_info.query = query_ptr;
+    query_info.has_window = query_analyzer->hasWindow();
 
     if (storage && !options.only_analyze)
-        from_stage = storage->getQueryProcessingStage(*context, options.to_stage, query_info);
+    {
+        from_stage = storage->getQueryProcessingStage(context, options.to_stage, metadata_snapshot, query_info);
+
+        /// TODO how can we make IN index work if we cache parts before selecting a projection?
+        /// XXX Used for IN set index analysis. Is this a proper way?
+        if (query_info.projection)
+            metadata_snapshot->selected_projection = query_info.projection->desc;
+    }
 
     /// Do I need to perform the first part of the pipeline?
     /// Running on remote servers during distributed processing or if query is not distributed.
@@ -608,9 +637,7 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
 
         if (analysis_result.prewhere_info)
         {
-            ExpressionActions(
-                analysis_result.prewhere_info->prewhere_actions,
-                ExpressionActionsSettings::fromContext(*context)).execute(header);
+            header = analysis_result.prewhere_info->prewhere_actions->updateHeader(header);
             if (analysis_result.prewhere_info->remove_prewhere_column)
                 header.erase(analysis_result.prewhere_info->prewhere_column_name);
         }
@@ -622,6 +649,28 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
         if (!analysis_result.need_aggregate)
         {
             // What's the difference with selected_columns?
+            // Here we calculate the header we want from remote server after it
+            // executes query up to WithMergeableState. When there is an ORDER BY,
+            // it is executed on remote server firstly, then we execute merge
+            // sort on initiator. To execute ORDER BY, we need to calculate the
+            // ORDER BY keys. These keys might be not present among the final
+            // SELECT columns given by the `selected_column`. This is why we have
+            // to use proper keys given by the result columns of the
+            // `before_order_by` expression actions.
+            // Another complication is window functions -- if we have them, they
+            // are calculated on initiator, before ORDER BY columns. In this case,
+            // the shard has to return columns required for window function
+            // calculation and further steps, given by the `before_window`
+            // expression actions.
+            // As of 21.6 this is broken: the actions in `before_window` might
+            // not contain everything required for the ORDER BY step, but this
+            // is a responsibility of ExpressionAnalyzer and is not a problem
+            // with this code. See
+            // https://github.com/ClickHouse/ClickHouse/issues/19857 for details.
+            if (analysis_result.before_window)
+            {
+                return analysis_result.before_window->getResultColumns();
+            }
             return analysis_result.before_order_by->getResultColumns();
         }
 
@@ -649,14 +698,20 @@ Block InterpreterSelectQuery::getSampleBlockImpl()
 
     if (options.to_stage == QueryProcessingStage::Enum::WithMergeableStateAfterAggregation)
     {
-        // What's the difference with selected_columns?
+        // It's different from selected_columns, see the comment above for
+        // WithMergeableState stage.
+        if (analysis_result.before_window)
+        {
+            return analysis_result.before_window->getResultColumns();
+        }
+
         return analysis_result.before_order_by->getResultColumns();
     }
 
     return analysis_result.final_projection->getResultColumns();
 }
 
-static Field getWithFillFieldValue(const ASTPtr & node, const Context & context)
+static Field getWithFillFieldValue(const ASTPtr & node, ContextPtr context)
 {
     const auto & [field, type] = evaluateConstantExpression(node, context);
 
@@ -666,7 +721,7 @@ static Field getWithFillFieldValue(const ASTPtr & node, const Context & context)
     return field;
 }
 
-static FillColumnDescription getWithFillDescription(const ASTOrderByElement & order_by_elem, const Context & context)
+static FillColumnDescription getWithFillDescription(const ASTOrderByElement & order_by_elem, ContextPtr context)
 {
     FillColumnDescription descr;
     if (order_by_elem.fill_from)
@@ -711,7 +766,7 @@ static FillColumnDescription getWithFillDescription(const ASTOrderByElement & or
     return descr;
 }
 
-static SortDescription getSortDescription(const ASTSelectQuery & query, const Context & context)
+static SortDescription getSortDescription(const ASTSelectQuery & query, ContextPtr context)
 {
     SortDescription order_descr;
     order_descr.reserve(query.orderBy()->children.size());
@@ -751,7 +806,7 @@ static SortDescription getSortDescriptionFromGroupBy(const ASTSelectQuery & quer
     return order_descr;
 }
 
-static UInt64 getLimitUIntValue(const ASTPtr & node, const Context & context, const std::string & expr)
+static UInt64 getLimitUIntValue(const ASTPtr & node, ContextPtr context, const std::string & expr)
 {
     const auto & [field, type] = evaluateConstantExpression(node, context);
 
@@ -766,7 +821,7 @@ static UInt64 getLimitUIntValue(const ASTPtr & node, const Context & context, co
 }
 
 
-static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery & query, const Context & context)
+static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery & query, ContextPtr context)
 {
     UInt64 length = 0;
     UInt64 offset = 0;
@@ -783,7 +838,7 @@ static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery &
 }
 
 
-static UInt64 getLimitForSorting(const ASTSelectQuery & query, const Context & context)
+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())
@@ -855,31 +910,24 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
     bool to_aggregation_stage = false;
     bool from_aggregation_stage = false;
 
-    if (expressions.filter_info)
+    /// Do I need to aggregate in a separate row rows that have not passed max_rows_to_group_by.
+    bool aggregate_overflow_row =
+        expressions.need_aggregate &&
+        query.group_by_with_totals &&
+        settings.max_rows_to_group_by &&
+        settings.group_by_overflow_mode == OverflowMode::ANY &&
+        settings.totals_mode != TotalsMode::AFTER_HAVING_EXCLUSIVE;
+
+    /// Do I need to immediately finalize the aggregate functions after the aggregation?
+    bool aggregate_final =
+        expressions.need_aggregate &&
+        options.to_stage > QueryProcessingStage::WithMergeableState &&
+        !query.group_by_with_totals && !query.group_by_with_rollup && !query.group_by_with_cube;
+
+    if (query_info.projection && query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
     {
-        if (!expressions.prewhere_info)
-        {
-            const bool does_storage_support_prewhere = !input && !input_pipe && storage && storage->supportsPrewhere();
-            if (does_storage_support_prewhere && settings.optimize_move_to_prewhere)
-            {
-                /// Execute row level filter in prewhere as a part of "move to prewhere" optimization.
-                expressions.prewhere_info = std::make_shared<PrewhereDAGInfo>(
-                    std::move(expressions.filter_info->actions),
-                    std::move(expressions.filter_info->column_name));
-                expressions.prewhere_info->prewhere_actions->projectInput(false);
-                expressions.prewhere_info->remove_prewhere_column = expressions.filter_info->do_remove_column;
-                expressions.prewhere_info->need_filter = true;
-                expressions.filter_info = nullptr;
-            }
-        }
-        else
-        {
-            /// Add row level security actions to prewhere.
-            expressions.prewhere_info->row_level_filter_actions = std::move(expressions.filter_info->actions);
-            expressions.prewhere_info->row_level_column_name = std::move(expressions.filter_info->column_name);
-            expressions.prewhere_info->row_level_filter_actions->projectInput(false);
-            expressions.filter_info = nullptr;
-        }
+        query_info.projection->aggregate_overflow_row = aggregate_overflow_row;
+        query_info.projection->aggregate_final = aggregate_final;
     }
 
     if (options.only_analyze)
@@ -924,6 +972,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
 
             // To remove additional columns in dry run
             // For example, sample column which can be removed in this stage
+            // TODO There seems to be no place initializing remove_columns_actions
             if (expressions.prewhere_info->remove_columns_actions)
             {
                 auto remove_columns = std::make_unique<ExpressionStep>(
@@ -969,20 +1018,6 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
 
     if (options.to_stage > QueryProcessingStage::FetchColumns)
     {
-        /// Do I need to aggregate in a separate row rows that have not passed max_rows_to_group_by.
-        bool aggregate_overflow_row =
-            expressions.need_aggregate &&
-            query.group_by_with_totals &&
-            settings.max_rows_to_group_by &&
-            settings.group_by_overflow_mode == OverflowMode::ANY &&
-            settings.totals_mode != TotalsMode::AFTER_HAVING_EXCLUSIVE;
-
-        /// Do I need to immediately finalize the aggregate functions after the aggregation?
-        bool aggregate_final =
-            expressions.need_aggregate &&
-            options.to_stage > QueryProcessingStage::WithMergeableState &&
-            !query.group_by_with_totals && !query.group_by_with_rollup && !query.group_by_with_cube;
-
         auto preliminary_sort = [&]()
         {
             /** For distributed query processing,
@@ -990,10 +1025,16 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
               *  but there is an ORDER or LIMIT,
               *  then we will perform the preliminary sorting and LIMIT on the remote server.
               */
-            if (!expressions.second_stage && !expressions.need_aggregate && !expressions.hasHaving())
+            if (!expressions.second_stage
+                && !expressions.need_aggregate
+                && !expressions.hasHaving()
+                && !expressions.has_window)
             {
                 if (expressions.has_order_by)
-                    executeOrder(query_plan, query_info.input_order_info);
+                    executeOrder(
+                        query_plan,
+                        query_info.input_order_info ? query_info.input_order_info
+                                                    : (query_info.projection ? query_info.projection->input_order_info : nullptr));
 
                 if (expressions.has_order_by && query.limitLength())
                     executeDistinct(query_plan, false, expressions.selected_columns, true);
@@ -1027,7 +1068,9 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
 
         if (expressions.first_stage)
         {
-            if (expressions.filter_info)
+            // If there is a storage that supports prewhere, this will always be nullptr
+            // Thus, we don't actually need to check if projection is active.
+            if (!query_info.projection && expressions.filter_info)
             {
                 auto row_level_security_step = std::make_unique<FilterStep>(
                         query_plan.getCurrentDataStream(),
@@ -1081,43 +1124,84 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
 
             if (expressions.hasJoin())
             {
-                JoinPtr join = expressions.join;
-
-                QueryPlanStepPtr join_step = std::make_unique<JoinStep>(
-                    query_plan.getCurrentDataStream(),
-                    expressions.join);
-
-                join_step->setStepDescription("JOIN");
-                query_plan.addStep(std::move(join_step));
-
-                if (expressions.join_has_delayed_stream)
+                if (expressions.join->isFilled())
                 {
-                    const Block & join_result_sample = query_plan.getCurrentDataStream().header;
-                    auto stream = std::make_shared<LazyNonJoinedBlockInputStream>(*join, join_result_sample, settings.max_block_size);
-                    auto source = std::make_shared<SourceFromInputStream>(std::move(stream));
-                    auto add_non_joined_rows_step = std::make_unique<AddingDelayedSourceStep>(
-                            query_plan.getCurrentDataStream(), std::move(source));
+                    QueryPlanStepPtr filled_join_step = std::make_unique<FilledJoinStep>(
+                        query_plan.getCurrentDataStream(),
+                        expressions.join,
+                        settings.max_block_size);
 
-                    add_non_joined_rows_step->setStepDescription("Add non-joined rows after JOIN");
-                    query_plan.addStep(std::move(add_non_joined_rows_step));
+                    filled_join_step->setStepDescription("JOIN");
+                    query_plan.addStep(std::move(filled_join_step));
+                }
+                else
+                {
+                    auto joined_plan = query_analyzer->getJoinedPlan();
+
+                    if (!joined_plan)
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is no joined plan for query");
+
+                    QueryPlanStepPtr join_step = std::make_unique<JoinStep>(
+                        query_plan.getCurrentDataStream(),
+                        joined_plan->getCurrentDataStream(),
+                        expressions.join,
+                        settings.max_block_size);
+
+                    join_step->setStepDescription("JOIN");
+                    std::vector<QueryPlanPtr> plans;
+                    plans.emplace_back(std::make_unique<QueryPlan>(std::move(query_plan)));
+                    plans.emplace_back(std::move(joined_plan));
+
+                    query_plan = QueryPlan();
+                    query_plan.unitePlans(std::move(join_step), {std::move(plans)});
                 }
             }
 
-            if (expressions.hasWhere())
+            if (!query_info.projection && expressions.hasWhere())
                 executeWhere(query_plan, expressions.before_where, expressions.remove_where_filter);
 
             if (expressions.need_aggregate)
             {
-                executeAggregation(query_plan, expressions.before_aggregation, aggregate_overflow_row, aggregate_final, query_info.input_order_info);
+                executeAggregation(
+                    query_plan, expressions.before_aggregation, aggregate_overflow_row, aggregate_final, query_info.input_order_info);
                 /// We need to reset input order info, so that executeOrder can't use  it
                 query_info.input_order_info.reset();
             }
+
+            // Now we must execute:
+            // 1) expressions before window functions,
+            // 2) window functions,
+            // 3) expressions after window functions,
+            // 4) preliminary distinct.
+            // This code decides which part we execute on shard (first_stage)
+            // and which part on initiator (second_stage). See also the counterpart
+            // code for "second_stage" that has to execute the rest.
+            if (expressions.need_aggregate)
+            {
+                // We have aggregation, so we can't execute any later-stage
+                // expressions on shards, neither "before window functions" nor
+                // "before ORDER BY".
+            }
             else
             {
-                executeExpression(query_plan, expressions.before_window, "Before window functions");
-                executeWindow(query_plan);
-                executeExpression(query_plan, expressions.before_order_by, "Before ORDER BY");
-                executeDistinct(query_plan, true, expressions.selected_columns, true);
+                // We don't have aggregation.
+                // Window functions must be executed on initiator (second_stage).
+                // ORDER BY and DISTINCT might depend on them, so if we have
+                // window functions, we can't execute ORDER BY and DISTINCT
+                // now, on shard (first_stage).
+                if (query_analyzer->hasWindow())
+                {
+                    executeExpression(query_plan, expressions.before_window, "Before window functions");
+                }
+                else
+                {
+                    // We don't have window functions, so we can execute the
+                    // expressions before ORDER BY and the preliminary DISTINCT
+                    // now, on shards (first_stage).
+                    assert(!expressions.before_window);
+                    executeExpression(query_plan, expressions.before_order_by, "Before ORDER BY");
+                    executeDistinct(query_plan, true, expressions.selected_columns, true);
+                }
             }
 
             preliminary_sort();
@@ -1161,16 +1245,44 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
                 }
                 else if (expressions.hasHaving())
                     executeHaving(query_plan, expressions.before_having);
+            }
+            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);
 
+            // Now we must execute:
+            // 1) expressions before window functions,
+            // 2) window functions,
+            // 3) expressions after window functions,
+            // 4) preliminary distinct.
+            // Some of these were already executed at the shards (first_stage),
+            // see the counterpart code and comments there.
+            if (from_aggregation_stage)
+            {
+                if (query_analyzer->hasWindow())
+                    throw Exception("Window functions does not support processing from WithMergeableStateAfterAggregation", ErrorCodes::NOT_IMPLEMENTED);
+            }
+            else if (expressions.need_aggregate)
+            {
                 executeExpression(query_plan, expressions.before_window,
                     "Before window functions");
                 executeWindow(query_plan);
                 executeExpression(query_plan, expressions.before_order_by, "Before ORDER BY");
                 executeDistinct(query_plan, true, expressions.selected_columns, true);
-
             }
-            else if (query.group_by_with_totals || query.group_by_with_rollup || query.group_by_with_cube)
-                throw Exception("WITH TOTALS, ROLLUP or CUBE are not supported without aggregation", ErrorCodes::NOT_IMPLEMENTED);
+            else
+            {
+                if (query_analyzer->hasWindow())
+                {
+                    executeWindow(query_plan);
+                    executeExpression(query_plan, expressions.before_order_by, "Before ORDER BY");
+                    executeDistinct(query_plan, true, expressions.selected_columns, true);
+                }
+                else
+                {
+                    // Neither aggregation nor windows, all expressions before
+                    // ORDER BY executed on shards.
+                }
+            }
 
             if (expressions.has_order_by)
             {
@@ -1184,11 +1296,17 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
                   */
 
                 if (from_aggregation_stage)
-                    executeMergeSorted(query_plan, "for ORDER BY");
-                else if (!expressions.first_stage && !expressions.need_aggregate && !(query.group_by_with_totals && !aggregate_final))
-                    executeMergeSorted(query_plan, "for ORDER BY");
+                    executeMergeSorted(query_plan, "after aggregation stage for ORDER BY");
+                else if (!expressions.first_stage
+                    && !expressions.need_aggregate
+                    && !expressions.has_window
+                    && !(query.group_by_with_totals && !aggregate_final))
+                    executeMergeSorted(query_plan, "for ORDER BY, without aggregation");
                 else    /// Otherwise, just sort.
-                    executeOrder(query_plan, query_info.input_order_info);
+                    executeOrder(
+                        query_plan,
+                        query_info.input_order_info ? query_info.input_order_info
+                                                    : (query_info.projection ? query_info.projection->input_order_info : nullptr));
             }
 
             /** Optimization - if there are several sources and there is LIMIT, then first apply the preliminary LIMIT,
@@ -1197,7 +1315,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             bool has_withfill = false;
             if (query.orderBy())
             {
-                SortDescription order_descr = getSortDescription(query, *context);
+                SortDescription order_descr = getSortDescription(query, context);
                 for (auto & desc : order_descr)
                     if (desc.with_fill)
                     {
@@ -1293,13 +1411,59 @@ static StreamLocalLimits getLimitsForStorage(const Settings & settings, const Se
     return limits;
 }
 
-void InterpreterSelectQuery::addEmptySourceToQueryPlan(QueryPlan & query_plan, const Block & source_header, const SelectQueryInfo & query_info)
+static void executeMergeAggregatedImpl(
+    QueryPlan & query_plan,
+    bool overflow_row,
+    bool final,
+    bool is_remote_storage,
+    const Settings & settings,
+    const NamesAndTypesList & aggregation_keys,
+    const AggregateDescriptions & aggregates)
+{
+    const auto & header_before_merge = query_plan.getCurrentDataStream().header;
+
+    ColumnNumbers keys;
+    for (const auto & key : aggregation_keys)
+        keys.push_back(header_before_merge.getPositionByName(key.name));
+
+    /** There are two modes of distributed aggregation.
+      *
+      * 1. In different threads read from the remote servers blocks.
+      * Save all the blocks in the RAM. Merge blocks.
+      * If the aggregation is two-level - parallelize to the number of buckets.
+      *
+      * 2. In one thread, read blocks from different servers in order.
+      * RAM stores only one block from each server.
+      * If the aggregation is a two-level aggregation, we consistently merge the blocks of each next level.
+      *
+      * The second option consumes less memory (up to 256 times less)
+      *  in the case of two-level aggregation, which is used for large results after GROUP BY,
+      *  but it can work more slowly.
+      */
+
+    Aggregator::Params params(header_before_merge, keys, aggregates, overflow_row, settings.max_threads);
+
+    auto transform_params = std::make_shared<AggregatingTransformParams>(params, final);
+
+    auto merging_aggregated = std::make_unique<MergingAggregatedStep>(
+            query_plan.getCurrentDataStream(),
+            std::move(transform_params),
+            settings.distributed_aggregation_memory_efficient && is_remote_storage,
+            settings.max_threads,
+            settings.aggregation_memory_efficient_merge_threads);
+
+    query_plan.addStep(std::move(merging_aggregated));
+}
+
+void InterpreterSelectQuery::addEmptySourceToQueryPlan(
+    QueryPlan & query_plan, const Block & source_header, const SelectQueryInfo & query_info, ContextPtr context_)
 {
     Pipe pipe(std::make_shared<NullSource>(source_header));
 
-    if (query_info.prewhere_info)
+    PrewhereInfoPtr prewhere_info_ptr = query_info.projection ? query_info.projection->prewhere_info : query_info.prewhere_info;
+    if (prewhere_info_ptr)
     {
-        auto & prewhere_info = *query_info.prewhere_info;
+        auto & prewhere_info = *prewhere_info_ptr;
 
         if (prewhere_info.alias_actions)
         {
@@ -1350,15 +1514,234 @@ void InterpreterSelectQuery::addEmptySourceToQueryPlan(QueryPlan & query_plan, c
     auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
     read_from_pipe->setStepDescription("Read from NullSource");
     query_plan.addStep(std::move(read_from_pipe));
+
+    if (query_info.projection)
+    {
+        if (query_info.projection->before_where)
+        {
+            auto where_step = std::make_unique<FilterStep>(
+                query_plan.getCurrentDataStream(),
+                query_info.projection->before_where,
+                query_info.projection->where_column_name,
+                query_info.projection->remove_where_filter);
+
+            where_step->setStepDescription("WHERE");
+            query_plan.addStep(std::move(where_step));
+        }
+
+        if (query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
+        {
+            if (query_info.projection->before_aggregation)
+            {
+                auto expression_before_aggregation
+                    = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), query_info.projection->before_aggregation);
+                expression_before_aggregation->setStepDescription("Before GROUP BY");
+                query_plan.addStep(std::move(expression_before_aggregation));
+            }
+
+            executeMergeAggregatedImpl(
+                query_plan,
+                query_info.projection->aggregate_overflow_row,
+                query_info.projection->aggregate_final,
+                false,
+                context_->getSettingsRef(),
+                query_info.projection->aggregation_keys,
+                query_info.projection->aggregate_descriptions);
+        }
+    }
+}
+
+void InterpreterSelectQuery::addPrewhereAliasActions()
+{
+    const Settings & settings = context->getSettingsRef();
+    auto & expressions = analysis_result;
+    if (expressions.filter_info)
+    {
+        if (!expressions.prewhere_info)
+        {
+            const bool does_storage_support_prewhere = !input && !input_pipe && storage && storage->supportsPrewhere();
+            if (does_storage_support_prewhere && settings.optimize_move_to_prewhere)
+            {
+                /// Execute row level filter in prewhere as a part of "move to prewhere" optimization.
+                expressions.prewhere_info = std::make_shared<PrewhereDAGInfo>(
+                    std::move(expressions.filter_info->actions),
+                    std::move(expressions.filter_info->column_name));
+                expressions.prewhere_info->prewhere_actions->projectInput(false);
+                expressions.prewhere_info->remove_prewhere_column = expressions.filter_info->do_remove_column;
+                expressions.prewhere_info->need_filter = true;
+                expressions.filter_info = nullptr;
+            }
+        }
+        else
+        {
+            /// Add row level security actions to prewhere.
+            expressions.prewhere_info->row_level_filter_actions = std::move(expressions.filter_info->actions);
+            expressions.prewhere_info->row_level_column_name = std::move(expressions.filter_info->column_name);
+            expressions.prewhere_info->row_level_filter_actions->projectInput(false);
+            expressions.filter_info = nullptr;
+        }
+    }
+
+    auto & prewhere_info = analysis_result.prewhere_info;
+    auto & columns_to_remove_after_prewhere = analysis_result.columns_to_remove_after_prewhere;
+
+    /// Detect, if ALIAS columns are required for query execution
+    auto alias_columns_required = false;
+    const ColumnsDescription & storage_columns = metadata_snapshot->getColumns();
+    for (const auto & column_name : required_columns)
+    {
+        auto column_default = storage_columns.getDefault(column_name);
+        if (column_default && column_default->kind == ColumnDefaultKind::Alias)
+        {
+            alias_columns_required = true;
+            break;
+        }
+    }
+
+    /// There are multiple sources of required columns:
+    ///  - raw required columns,
+    ///  - columns deduced from ALIAS columns,
+    ///  - raw required columns from PREWHERE,
+    ///  - columns deduced from ALIAS columns from PREWHERE.
+    /// PREWHERE is a special case, since we need to resolve it and pass directly to `IStorage::read()`
+    /// before any other executions.
+    if (alias_columns_required)
+    {
+        NameSet required_columns_from_prewhere; /// Set of all (including ALIAS) required columns for PREWHERE
+        NameSet required_aliases_from_prewhere; /// Set of ALIAS required columns for PREWHERE
+
+        if (prewhere_info)
+        {
+            /// Get some columns directly from PREWHERE expression actions
+            auto prewhere_required_columns = prewhere_info->prewhere_actions->getRequiredColumns().getNames();
+            required_columns_from_prewhere.insert(prewhere_required_columns.begin(), prewhere_required_columns.end());
+
+            if (prewhere_info->row_level_filter_actions)
+            {
+                auto row_level_required_columns = prewhere_info->row_level_filter_actions->getRequiredColumns().getNames();
+                required_columns_from_prewhere.insert(row_level_required_columns.begin(), row_level_required_columns.end());
+            }
+        }
+
+        /// Expression, that contains all raw required columns
+        ASTPtr required_columns_all_expr = std::make_shared<ASTExpressionList>();
+
+        /// Expression, that contains raw required columns for PREWHERE
+        ASTPtr required_columns_from_prewhere_expr = std::make_shared<ASTExpressionList>();
+
+        /// Sort out already known required columns between expressions,
+        /// also populate `required_aliases_from_prewhere`.
+        for (const auto & column : required_columns)
+        {
+            ASTPtr column_expr;
+            const auto column_default = storage_columns.getDefault(column);
+            bool is_alias = column_default && column_default->kind == ColumnDefaultKind::Alias;
+            if (is_alias)
+            {
+                auto column_decl = storage_columns.get(column);
+                column_expr = column_default->expression->clone();
+                // recursive visit for alias to alias
+                replaceAliasColumnsInQuery(
+                    column_expr, metadata_snapshot->getColumns(), syntax_analyzer_result->getArrayJoinSourceNameSet(), context);
+
+                column_expr = addTypeConversionToAST(
+                    std::move(column_expr), column_decl.type->getName(), metadata_snapshot->getColumns().getAll(), context);
+                column_expr = setAlias(column_expr, column);
+            }
+            else
+                column_expr = std::make_shared<ASTIdentifier>(column);
+
+            if (required_columns_from_prewhere.count(column))
+            {
+                required_columns_from_prewhere_expr->children.emplace_back(std::move(column_expr));
+
+                if (is_alias)
+                    required_aliases_from_prewhere.insert(column);
+            }
+            else
+                required_columns_all_expr->children.emplace_back(std::move(column_expr));
+        }
+
+        /// Columns, which we will get after prewhere and filter executions.
+        NamesAndTypesList required_columns_after_prewhere;
+        NameSet required_columns_after_prewhere_set;
+
+        /// Collect required columns from prewhere expression actions.
+        if (prewhere_info)
+        {
+            NameSet columns_to_remove(columns_to_remove_after_prewhere.begin(), columns_to_remove_after_prewhere.end());
+            Block prewhere_actions_result = prewhere_info->prewhere_actions->getResultColumns();
+
+            /// Populate required columns with the columns, added by PREWHERE actions and not removed afterwards.
+            /// XXX: looks hacky that we already know which columns after PREWHERE we won't need for sure.
+            for (const auto & column : prewhere_actions_result)
+            {
+                if (prewhere_info->remove_prewhere_column && column.name == prewhere_info->prewhere_column_name)
+                    continue;
+
+                if (columns_to_remove.count(column.name))
+                    continue;
+
+                required_columns_all_expr->children.emplace_back(std::make_shared<ASTIdentifier>(column.name));
+                required_columns_after_prewhere.emplace_back(column.name, column.type);
+            }
+
+            required_columns_after_prewhere_set
+                = ext::map<NameSet>(required_columns_after_prewhere, [](const auto & it) { return it.name; });
+        }
+
+        auto syntax_result
+            = TreeRewriter(context).analyze(required_columns_all_expr, required_columns_after_prewhere, storage, metadata_snapshot);
+        alias_actions = ExpressionAnalyzer(required_columns_all_expr, syntax_result, context).getActionsDAG(true);
+
+        /// The set of required columns could be added as a result of adding an action to calculate ALIAS.
+        required_columns = alias_actions->getRequiredColumns().getNames();
+
+        /// Do not remove prewhere filter if it is a column which is used as alias.
+        if (prewhere_info && prewhere_info->remove_prewhere_column)
+            if (required_columns.end() != std::find(required_columns.begin(), required_columns.end(), prewhere_info->prewhere_column_name))
+                prewhere_info->remove_prewhere_column = false;
+
+        /// Remove columns which will be added by prewhere.
+        required_columns.erase(
+            std::remove_if(
+                required_columns.begin(),
+                required_columns.end(),
+                [&](const String & name) { return required_columns_after_prewhere_set.count(name) != 0; }),
+            required_columns.end());
+
+        if (prewhere_info)
+        {
+            /// Don't remove columns which are needed to be aliased.
+            for (const auto & name : required_columns)
+                prewhere_info->prewhere_actions->tryRestoreColumn(name);
+
+            auto analyzed_result
+                = TreeRewriter(context).analyze(required_columns_from_prewhere_expr, metadata_snapshot->getColumns().getAllPhysical());
+            prewhere_info->alias_actions
+                = ExpressionAnalyzer(required_columns_from_prewhere_expr, analyzed_result, context).getActionsDAG(true, false);
+
+            /// Add (physical?) columns required by alias actions.
+            auto required_columns_from_alias = prewhere_info->alias_actions->getRequiredColumns();
+            Block prewhere_actions_result = prewhere_info->prewhere_actions->getResultColumns();
+            for (auto & column : required_columns_from_alias)
+                if (!prewhere_actions_result.has(column.name))
+                    if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column.name))
+                        required_columns.push_back(column.name);
+
+            /// Add physical columns required by prewhere actions.
+            for (const auto & column : required_columns_from_prewhere)
+                if (required_aliases_from_prewhere.count(column) == 0)
+                    if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column))
+                        required_columns.push_back(column);
+        }
+    }
 }
 
 void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum processing_stage, QueryPlan & query_plan)
 {
     auto & query = getSelectQuery();
     const Settings & settings = context->getSettingsRef();
-    auto & expressions = analysis_result;
-    auto & prewhere_info = expressions.prewhere_info;
-    auto & columns_to_remove_after_prewhere = expressions.columns_to_remove_after_prewhere;
 
     /// Optimization for trivial query like SELECT count() FROM table.
     bool optimize_trivial_count =
@@ -1389,7 +1772,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
             temp_query_info.syntax_analyzer_result = syntax_analyzer_result;
             temp_query_info.sets = query_analyzer->getPreparedSets();
 
-            num_rows = storage->totalRowsByPartitionPredicate(temp_query_info, *context);
+            num_rows = storage->totalRowsByPartitionPredicate(temp_query_info, context);
         }
 
         if (num_rows)
@@ -1401,7 +1784,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
             AggregateDataPtr place = state.data();
 
             agg_count.create(place);
-            SCOPE_EXIT(agg_count.destroy(place));
+            SCOPE_EXIT_MEMORY_SAFE(agg_count.destroy(place));
 
             agg_count.set(place, *num_rows);
 
@@ -1427,160 +1810,6 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         }
     }
 
-    /// Actions to calculate ALIAS if required.
-    ActionsDAGPtr alias_actions;
-
-    if (storage)
-    {
-        /// Detect, if ALIAS columns are required for query execution
-        auto alias_columns_required = false;
-        const ColumnsDescription & storage_columns = metadata_snapshot->getColumns();
-        for (const auto & column_name : required_columns)
-        {
-            auto column_default = storage_columns.getDefault(column_name);
-            if (column_default && column_default->kind == ColumnDefaultKind::Alias)
-            {
-                alias_columns_required = true;
-                break;
-            }
-        }
-
-        /// There are multiple sources of required columns:
-        ///  - raw required columns,
-        ///  - columns deduced from ALIAS columns,
-        ///  - raw required columns from PREWHERE,
-        ///  - columns deduced from ALIAS columns from PREWHERE.
-        /// PREWHERE is a special case, since we need to resolve it and pass directly to `IStorage::read()`
-        /// before any other executions.
-        if (alias_columns_required)
-        {
-            NameSet required_columns_from_prewhere; /// Set of all (including ALIAS) required columns for PREWHERE
-            NameSet required_aliases_from_prewhere; /// Set of ALIAS required columns for PREWHERE
-
-            if (prewhere_info)
-            {
-                /// Get some columns directly from PREWHERE expression actions
-                auto prewhere_required_columns = prewhere_info->prewhere_actions->getRequiredColumns().getNames();
-                required_columns_from_prewhere.insert(prewhere_required_columns.begin(), prewhere_required_columns.end());
-
-                if (prewhere_info->row_level_filter_actions)
-                {
-                    auto row_level_required_columns = prewhere_info->row_level_filter_actions->getRequiredColumns().getNames();
-                    required_columns_from_prewhere.insert(row_level_required_columns.begin(), row_level_required_columns.end());
-                }
-            }
-
-            /// Expression, that contains all raw required columns
-            ASTPtr required_columns_all_expr = std::make_shared<ASTExpressionList>();
-
-            /// Expression, that contains raw required columns for PREWHERE
-            ASTPtr required_columns_from_prewhere_expr = std::make_shared<ASTExpressionList>();
-
-            /// Sort out already known required columns between expressions,
-            /// also populate `required_aliases_from_prewhere`.
-            for (const auto & column : required_columns)
-            {
-                ASTPtr column_expr;
-                const auto column_default = storage_columns.getDefault(column);
-                bool is_alias = column_default && column_default->kind == ColumnDefaultKind::Alias;
-                if (is_alias)
-                {
-                    auto column_decl = storage_columns.get(column);
-                    column_expr = column_default->expression->clone();
-                    // recursive visit for alias to alias
-                    replaceAliasColumnsInQuery(column_expr, metadata_snapshot->getColumns(), syntax_analyzer_result->getArrayJoinSourceNameSet(), *context);
-
-                    column_expr = addTypeConversionToAST(std::move(column_expr), column_decl.type->getName(), metadata_snapshot->getColumns().getAll(), *context);
-                    column_expr = setAlias(column_expr, column);
-                }
-                else
-                    column_expr = std::make_shared<ASTIdentifier>(column);
-
-                if (required_columns_from_prewhere.count(column))
-                {
-                    required_columns_from_prewhere_expr->children.emplace_back(std::move(column_expr));
-
-                    if (is_alias)
-                        required_aliases_from_prewhere.insert(column);
-                }
-                else
-                    required_columns_all_expr->children.emplace_back(std::move(column_expr));
-            }
-
-            /// Columns, which we will get after prewhere and filter executions.
-            NamesAndTypesList required_columns_after_prewhere;
-            NameSet required_columns_after_prewhere_set;
-
-            /// Collect required columns from prewhere expression actions.
-            if (prewhere_info)
-            {
-                NameSet columns_to_remove(columns_to_remove_after_prewhere.begin(), columns_to_remove_after_prewhere.end());
-                Block prewhere_actions_result = prewhere_info->prewhere_actions->getResultColumns();
-
-                /// Populate required columns with the columns, added by PREWHERE actions and not removed afterwards.
-                /// XXX: looks hacky that we already know which columns after PREWHERE we won't need for sure.
-                for (const auto & column : prewhere_actions_result)
-                {
-                    if (prewhere_info->remove_prewhere_column && column.name == prewhere_info->prewhere_column_name)
-                        continue;
-
-                    if (columns_to_remove.count(column.name))
-                        continue;
-
-                    required_columns_all_expr->children.emplace_back(std::make_shared<ASTIdentifier>(column.name));
-                    required_columns_after_prewhere.emplace_back(column.name, column.type);
-                }
-
-                required_columns_after_prewhere_set
-                    = ext::map<NameSet>(required_columns_after_prewhere, [](const auto & it) { return it.name; });
-            }
-
-            auto syntax_result = TreeRewriter(*context).analyze(required_columns_all_expr, required_columns_after_prewhere, storage, metadata_snapshot);
-            alias_actions = ExpressionAnalyzer(required_columns_all_expr, syntax_result, *context).getActionsDAG(true);
-
-            /// The set of required columns could be added as a result of adding an action to calculate ALIAS.
-            required_columns = alias_actions->getRequiredColumns().getNames();
-
-            /// Do not remove prewhere filter if it is a column which is used as alias.
-            if (prewhere_info && prewhere_info->remove_prewhere_column)
-                if (required_columns.end()
-                    != std::find(required_columns.begin(), required_columns.end(), prewhere_info->prewhere_column_name))
-                    prewhere_info->remove_prewhere_column = false;
-
-            /// Remove columns which will be added by prewhere.
-            required_columns.erase(std::remove_if(required_columns.begin(), required_columns.end(), [&](const String & name)
-            {
-                return required_columns_after_prewhere_set.count(name) != 0;
-            }), required_columns.end());
-
-            if (prewhere_info)
-            {
-                /// Don't remove columns which are needed to be aliased.
-                for (const auto & name : required_columns)
-                    prewhere_info->prewhere_actions->tryRestoreColumn(name);
-
-                auto analyzed_result
-                    = TreeRewriter(*context).analyze(required_columns_from_prewhere_expr, metadata_snapshot->getColumns().getAllPhysical());
-                prewhere_info->alias_actions
-                    = ExpressionAnalyzer(required_columns_from_prewhere_expr, analyzed_result, *context).getActionsDAG(true, false);
-
-                /// Add (physical?) columns required by alias actions.
-                auto required_columns_from_alias = prewhere_info->alias_actions->getRequiredColumns();
-                Block prewhere_actions_result = prewhere_info->prewhere_actions->getResultColumns();
-                for (auto & column : required_columns_from_alias)
-                    if (!prewhere_actions_result.has(column.name))
-                        if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column.name))
-                            required_columns.push_back(column.name);
-
-                /// Add physical columns required by prewhere actions.
-                for (const auto & column : required_columns_from_prewhere)
-                    if (required_aliases_from_prewhere.count(column) == 0)
-                        if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column))
-                            required_columns.push_back(column);
-            }
-        }
-    }
-
     /// Limitation on the number of columns to read.
     /// It's not applied in 'only_analyze' mode, because the query could be analyzed without removal of unnecessary columns.
     if (!options.only_analyze && settings.max_columns_to_read && required_columns.size() > settings.max_columns_to_read)
@@ -1608,7 +1837,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
 
     UInt64 max_block_size = settings.max_block_size;
 
-    auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, *context);
+    auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
 
     /** Optimization - if not specified DISTINCT, WHERE, GROUP, HAVING, ORDER, LIMIT BY, WITH TIES but LIMIT is specified, and limit + offset < max_block_size,
      *  then as the block size we will use limit + offset (not to read more from the table than requested),
@@ -1624,6 +1853,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         && !query.limitBy()
         && query.limitLength()
         && !query_analyzer->hasAggregation()
+        && !query_analyzer->hasWindow()
         && limit_length <= std::numeric_limits<UInt64>::max() - limit_offset
         && limit_length + limit_offset < max_block_size)
     {
@@ -1650,7 +1880,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
                 throw Exception("Subquery expected", ErrorCodes::LOGICAL_ERROR);
 
             interpreter_subquery = std::make_unique<InterpreterSelectWithUnionQuery>(
-                subquery, getSubqueryContext(*context),
+                subquery, getSubqueryContext(context),
                 options.copy().subquery().noModify(), required_columns);
 
             if (query_analyzer->hasAggregation())
@@ -1664,18 +1894,20 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
     {
         /// Table.
         if (max_streams == 0)
-            throw Exception("Logical error: zero number of streams requested", ErrorCodes::LOGICAL_ERROR);
+            max_streams = 1;
 
         /// If necessary, we request more sources than the number of threads - to distribute the work evenly over the threads.
         if (max_streams > 1 && !is_remote)
             max_streams *= settings.max_streams_to_max_threads_ratio;
 
-        query_info.syntax_analyzer_result = syntax_analyzer_result;
+        // TODO figure out how to make set for projections
         query_info.sets = query_analyzer->getPreparedSets();
-        auto actions_settings = ExpressionActionsSettings::fromContext(*context);
+        auto & prewhere_info = analysis_result.prewhere_info;
 
         if (prewhere_info)
         {
+            auto actions_settings = ExpressionActionsSettings::fromContext(context, CompileExpressions::yes);
+
             query_info.prewhere_info = std::make_shared<PrewhereInfo>();
             query_info.prewhere_info->prewhere_actions = std::make_shared<ExpressionActions>(prewhere_info->prewhere_actions, actions_settings);
 
@@ -1694,27 +1926,52 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
 
         /// Create optimizer with prepared actions.
         /// Maybe we will need to calc input_order_info later, e.g. while reading from StorageMerge.
-        if (analysis_result.optimize_read_in_order || analysis_result.optimize_aggregation_in_order)
+        if ((analysis_result.optimize_read_in_order || analysis_result.optimize_aggregation_in_order)
+            && (!query_info.projection || query_info.projection->complete))
         {
             if (analysis_result.optimize_read_in_order)
-                query_info.order_optimizer = std::make_shared<ReadInOrderOptimizer>(
-                    analysis_result.order_by_elements_actions,
-                    getSortDescription(query, *context),
-                    query_info.syntax_analyzer_result);
+            {
+                if (query_info.projection)
+                {
+                    query_info.projection->order_optimizer = std::make_shared<ReadInOrderOptimizer>(
+                        // TODO Do we need a projection variant for this field?
+                        analysis_result.order_by_elements_actions,
+                        getSortDescription(query, context),
+                        query_info.syntax_analyzer_result);
+                }
+                else
+                {
+                    query_info.order_optimizer = std::make_shared<ReadInOrderOptimizer>(
+                        analysis_result.order_by_elements_actions, getSortDescription(query, context), query_info.syntax_analyzer_result);
+                }
+            }
             else
-                query_info.order_optimizer = std::make_shared<ReadInOrderOptimizer>(
-                    analysis_result.group_by_elements_actions,
-                    getSortDescriptionFromGroupBy(query),
-                    query_info.syntax_analyzer_result);
+            {
+                if (query_info.projection)
+                {
+                    query_info.projection->order_optimizer = std::make_shared<ReadInOrderOptimizer>(
+                        query_info.projection->group_by_elements_actions,
+                        getSortDescriptionFromGroupBy(query),
+                        query_info.syntax_analyzer_result);
+                }
+                else
+                {
+                    query_info.order_optimizer = std::make_shared<ReadInOrderOptimizer>(
+                        analysis_result.group_by_elements_actions, getSortDescriptionFromGroupBy(query), query_info.syntax_analyzer_result);
+                }
+            }
 
-            query_info.input_order_info = query_info.order_optimizer->getInputOrder(metadata_snapshot, *context);
+            if (query_info.projection)
+                query_info.projection->input_order_info
+                    = query_info.projection->order_optimizer->getInputOrder(query_info.projection->desc->metadata, context);
+            else
+                query_info.input_order_info = query_info.order_optimizer->getInputOrder(metadata_snapshot, context);
         }
 
         StreamLocalLimits limits;
         SizeLimits leaf_limits;
         std::shared_ptr<const EnabledQuota> quota;
 
-
         /// Set the limits and quota for reading data, the speed and time of the query.
         if (!options.ignore_limits)
         {
@@ -1727,21 +1984,27 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
             quota = context->getQuota();
 
         storage->read(query_plan, required_columns, metadata_snapshot,
-                      query_info, *context, processing_stage, max_block_size, max_streams);
+                      query_info, context, processing_stage, max_block_size, max_streams);
 
         if (context->hasQueryContext() && !options.is_internal)
         {
             auto local_storage_id = storage->getStorageID();
-            context->getQueryContext().addQueryAccessInfo(
-                backQuoteIfNeed(local_storage_id.getDatabaseName()), local_storage_id.getFullTableName(), required_columns);
+            context->getQueryContext()->addQueryAccessInfo(
+                backQuoteIfNeed(local_storage_id.getDatabaseName()),
+                local_storage_id.getFullTableName(),
+                required_columns,
+                query_info.projection ? query_info.projection->desc->name : "");
         }
 
         /// Create step which reads from empty source if storage has no data.
         if (!query_plan.isInitialized())
         {
-            auto header = metadata_snapshot->getSampleBlockForColumns(
-                    required_columns, storage->getVirtuals(), storage->getStorageID());
-            addEmptySourceToQueryPlan(query_plan, header, query_info);
+            auto header = query_info.projection
+                ? query_info.projection->desc->metadata->getSampleBlockForColumns(
+                    query_info.projection->required_columns, storage->getVirtuals(), storage->getStorageID())
+                : metadata_snapshot->getSampleBlockForColumns(required_columns, storage->getVirtuals(), storage->getStorageID());
+
+            addEmptySourceToQueryPlan(query_plan, header, query_info, context);
         }
 
         /// Extend lifetime of context, table lock, storage. Set limits and quota.
@@ -1797,6 +2060,9 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
     expression_before_aggregation->setStepDescription("Before GROUP BY");
     query_plan.addStep(std::move(expression_before_aggregation));
 
+    if (options.ignore_aggregation)
+        return;
+
     const auto & header_before_aggregation = query_plan.getCurrentDataStream().header;
     ColumnNumbers keys;
     for (const auto & key : query_analyzer->aggregationKeys())
@@ -1847,44 +2113,23 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
     query_plan.addStep(std::move(aggregating_step));
 }
 
-
 void InterpreterSelectQuery::executeMergeAggregated(QueryPlan & query_plan, bool overflow_row, bool final)
 {
-    const auto & header_before_merge = query_plan.getCurrentDataStream().header;
+    /// If aggregate projection was chosen for table, avoid adding MergeAggregated.
+    /// It is already added by storage (because of performance issues).
+    /// TODO: We should probably add another one processing stage for storage?
+    ///       WithMergeableStateAfterAggregation is not ok because, e.g., it skips sorting after aggregation.
+    if (query_info.projection && query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
+        return;
 
-    ColumnNumbers keys;
-    for (const auto & key : query_analyzer->aggregationKeys())
-        keys.push_back(header_before_merge.getPositionByName(key.name));
-
-    /** There are two modes of distributed aggregation.
-      *
-      * 1. In different threads read from the remote servers blocks.
-      * Save all the blocks in the RAM. Merge blocks.
-      * If the aggregation is two-level - parallelize to the number of buckets.
-      *
-      * 2. In one thread, read blocks from different servers in order.
-      * RAM stores only one block from each server.
-      * If the aggregation is a two-level aggregation, we consistently merge the blocks of each next level.
-      *
-      * The second option consumes less memory (up to 256 times less)
-      *  in the case of two-level aggregation, which is used for large results after GROUP BY,
-      *  but it can work more slowly.
-      */
-
-    const Settings & settings = context->getSettingsRef();
-
-    Aggregator::Params params(header_before_merge, keys, query_analyzer->aggregates(), overflow_row, settings.max_threads);
-
-    auto transform_params = std::make_shared<AggregatingTransformParams>(params, final);
-
-    auto merging_aggregated = std::make_unique<MergingAggregatedStep>(
-            query_plan.getCurrentDataStream(),
-            std::move(transform_params),
-            settings.distributed_aggregation_memory_efficient && storage && storage->isRemote(),
-            settings.max_threads,
-            settings.aggregation_memory_efficient_merge_threads);
-
-    query_plan.addStep(std::move(merging_aggregated));
+    executeMergeAggregatedImpl(
+        query_plan,
+        overflow_row,
+        final,
+        storage && storage->isRemote(),
+        context->getSettingsRef(),
+        query_analyzer->aggregationKeys(),
+        query_analyzer->aggregates());
 }
 
 
@@ -2114,8 +2359,8 @@ void InterpreterSelectQuery::executeOrderOptimized(QueryPlan & query_plan, Input
 void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfoPtr input_sorting_info)
 {
     auto & query = getSelectQuery();
-    SortDescription output_order_descr = getSortDescription(query, *context);
-    UInt64 limit = getLimitForSorting(query, *context);
+    SortDescription output_order_descr = getSortDescription(query, context);
+    UInt64 limit = getLimitForSorting(query, context);
 
     if (input_sorting_info)
     {
@@ -2163,8 +2408,8 @@ void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfo
 void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const std::string & description)
 {
     auto & query = getSelectQuery();
-    SortDescription order_descr = getSortDescription(query, *context);
-    UInt64 limit = getLimitForSorting(query, *context);
+    SortDescription order_descr = getSortDescription(query, context);
+    UInt64 limit = getLimitForSorting(query, context);
 
     executeMergeSorted(query_plan, order_descr, limit, description);
 }
@@ -2198,7 +2443,7 @@ void InterpreterSelectQuery::executeDistinct(QueryPlan & query_plan, bool before
     {
         const Settings & settings = context->getSettingsRef();
 
-        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, *context);
+        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
         UInt64 limit_for_distinct = 0;
 
         /// If after this stage of DISTINCT ORDER BY is not executed,
@@ -2227,7 +2472,7 @@ void InterpreterSelectQuery::executePreLimit(QueryPlan & query_plan, bool do_not
     /// If there is LIMIT
     if (query.limitLength())
     {
-        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, *context);
+        auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
 
         if (do_not_skip_offset)
         {
@@ -2255,8 +2500,8 @@ void InterpreterSelectQuery::executeLimitBy(QueryPlan & query_plan)
     for (const auto & elem : query.limitBy()->children)
         columns.emplace_back(elem->getColumnName());
 
-    UInt64 length = getLimitUIntValue(query.limitByLength(), *context, "LIMIT");
-    UInt64 offset = (query.limitByOffset() ? getLimitUIntValue(query.limitByOffset(), *context, "OFFSET") : 0);
+    UInt64 length = getLimitUIntValue(query.limitByLength(), context, "LIMIT");
+    UInt64 offset = (query.limitByOffset() ? getLimitUIntValue(query.limitByOffset(), context, "OFFSET") : 0);
 
     auto limit_by = std::make_unique<LimitByStep>(query_plan.getCurrentDataStream(), length, offset, columns);
     query_plan.addStep(std::move(limit_by));
@@ -2267,7 +2512,7 @@ void InterpreterSelectQuery::executeWithFill(QueryPlan & query_plan)
     auto & query = getSelectQuery();
     if (query.orderBy())
     {
-        SortDescription order_descr = getSortDescription(query, *context);
+        SortDescription order_descr = getSortDescription(query, context);
         SortDescription fill_descr;
         for (auto & desc : order_descr)
         {
@@ -2309,14 +2554,14 @@ void InterpreterSelectQuery::executeLimit(QueryPlan & query_plan)
 
         UInt64 limit_length;
         UInt64 limit_offset;
-        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, *context);
+        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, context);
 
         SortDescription order_descr;
         if (query.limit_with_ties)
         {
             if (!query.orderBy())
                 throw Exception("LIMIT WITH TIES without ORDER BY", ErrorCodes::LOGICAL_ERROR);
-            order_descr = getSortDescription(query, *context);
+            order_descr = getSortDescription(query, context);
         }
 
         auto limit = std::make_unique<LimitStep>(
@@ -2339,7 +2584,7 @@ void InterpreterSelectQuery::executeOffset(QueryPlan & query_plan)
     {
         UInt64 limit_length;
         UInt64 limit_offset;
-        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, *context);
+        std::tie(limit_length, limit_offset) = getLimitLengthAndOffset(query, context);
 
         auto offsets_step = std::make_unique<OffsetStep>(query_plan.getCurrentDataStream(), limit_offset);
         query_plan.addStep(std::move(offsets_step));
@@ -2357,13 +2602,16 @@ void InterpreterSelectQuery::executeExtremes(QueryPlan & query_plan)
 
 void InterpreterSelectQuery::executeSubqueriesInSetsAndJoins(QueryPlan & query_plan, SubqueriesForSets & subqueries_for_sets)
 {
-    if (query_info.input_order_info)
-        executeMergeSorted(query_plan, query_info.input_order_info->order_key_prefix_descr, 0, "before creating sets for subqueries and joins");
+    const auto & input_order_info = query_info.input_order_info
+        ? query_info.input_order_info
+        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
+    if (input_order_info)
+        executeMergeSorted(query_plan, input_order_info->order_key_prefix_descr, 0, "before creating sets for subqueries and joins");
 
     const Settings & settings = context->getSettingsRef();
 
     SizeLimits limits(settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
-    addCreatingSetsStep(query_plan, std::move(subqueries_for_sets), limits, *context);
+    addCreatingSetsStep(query_plan, std::move(subqueries_for_sets), limits, context);
 }
 
 
@@ -2377,7 +2625,7 @@ void InterpreterSelectQuery::initSettings()
 {
     auto & query = getSelectQuery();
     if (query.settings())
-        InterpreterSetQuery(query.settings(), *context).executeForCurrentContext();
+        InterpreterSetQuery(query.settings(), context).executeForCurrentContext();
 }
 
 }
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index 13f4755d431..2733ce418cd 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -15,11 +15,13 @@
 
 #include <Columns/FilterDescription.h>
 
-namespace Poco { class Logger; }
+namespace Poco
+{
+class Logger;
+}
 
 namespace DB
 {
-
 struct SubqueryForSet;
 class InterpreterSelectWithUnionQuery;
 class Context;
@@ -46,28 +48,28 @@ public:
 
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         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_,
-        const Context & context_,
+        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_,
-            const Context & context_,
+            ContextPtr context_,
             Pipe input_pipe_,
             const SelectQueryOptions & = {});
 
     /// Read data not from the table specified in the query, but from the specified `storage_`.
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const StoragePtr & storage_,
         const StorageMetadataPtr & metadata_snapshot_ = nullptr,
         const SelectQueryOptions & = {});
@@ -85,25 +87,38 @@ public:
 
     virtual void ignoreWithTotals() override;
 
+    ASTPtr getQuery() const { return query_ptr; }
+
     const SelectQueryInfo & getQueryInfo() const { return query_info; }
 
-    static void addEmptySourceToQueryPlan(QueryPlan & query_plan, const Block & source_header, const SelectQueryInfo & query_info);
+    const SelectQueryExpressionAnalyzer * getQueryAnalyzer() const { return query_analyzer.get(); }
+
+    const ExpressionAnalysisResult & getAnalysisResult() const { return analysis_result; }
+
+    const Names & getRequiredColumns() const { return required_columns; }
+
+    bool hasAggregation() const { return query_analyzer->hasAggregation(); }
+
+    static void addEmptySourceToQueryPlan(
+        QueryPlan & query_plan, const Block & source_header, const SelectQueryInfo & query_info, ContextPtr context_);
 
     Names getRequiredColumns() { return required_columns; }
 
 private:
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const BlockInputStreamPtr & input_,
         std::optional<Pipe> input_pipe,
         const StoragePtr & storage_,
         const SelectQueryOptions &,
         const Names & required_result_column_names = {},
-        const StorageMetadataPtr & metadata_snapshot_= nullptr);
+        const StorageMetadataPtr & metadata_snapshot_ = nullptr);
 
     ASTSelectQuery & getSelectQuery() { return query_ptr->as<ASTSelectQuery &>(); }
 
+    void addPrewhereAliasActions();
+
     Block getSampleBlockImpl();
 
     void executeImpl(QueryPlan & query_plan, const BlockInputStreamPtr & prepared_input, std::optional<Pipe> prepared_pipe);
@@ -112,7 +127,8 @@ private:
 
     void executeFetchColumns(QueryProcessingStage::Enum processing_stage, QueryPlan & query_plan);
     void executeWhere(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter);
-    void executeAggregation(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool overflow_row, bool final, InputOrderInfoPtr group_by_info);
+    void 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);
@@ -131,7 +147,8 @@ private:
     void executeDistinct(QueryPlan & query_plan, bool before_order, Names columns, bool pre_distinct);
     void executeExtremes(QueryPlan & query_plan);
     void executeSubqueriesInSetsAndJoins(QueryPlan & query_plan, std::unordered_map<String, SubqueryForSet> & subqueries_for_sets);
-    void executeMergeSorted(QueryPlan & query_plan, const SortDescription & sort_description, UInt64 limit, const std::string & description);
+    void
+    executeMergeSorted(QueryPlan & query_plan, const SortDescription & sort_description, UInt64 limit, const std::string & description);
 
     String generateFilterActions(ActionsDAGPtr & actions, const Names & prerequisite_columns = {}) const;
 
@@ -168,12 +185,15 @@ private:
     /// Structure of query source (table, subquery, etc).
     Block source_header;
 
+    /// Actions to calculate ALIAS if required.
+    ActionsDAGPtr alias_actions;
+
     /// The subquery interpreter, if the subquery
     std::unique_ptr<InterpreterSelectWithUnionQuery> interpreter_subquery;
 
     /// Table from where to read data, if not subquery.
     StoragePtr storage;
-    StorageID table_id = StorageID::createEmpty();  /// Will be initialized if storage is not nullptr
+    StorageID table_id = StorageID::createEmpty(); /// Will be initialized if storage is not nullptr
     TableLockHolder table_lock;
 
     /// Used when we read from prepared input, not table or subquery.
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index 21737bbb57e..3cf4a905d38 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -6,6 +6,7 @@
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/queryToString.h>
 #include <Processors/QueryPlan/DistinctStep.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/IQueryPlanStep.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/UnionStep.h>
@@ -28,7 +29,7 @@ namespace ErrorCodes
 }
 
 InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
-    const ASTPtr & query_ptr_, const Context & 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>();
@@ -196,26 +197,26 @@ Block InterpreterSelectWithUnionQuery::getCommonHeaderForUnion(const Blocks & he
 Block InterpreterSelectWithUnionQuery::getCurrentChildResultHeader(const ASTPtr & ast_ptr_, const Names & required_result_column_names)
 {
     if (ast_ptr_->as<ASTSelectWithUnionQuery>())
-        return InterpreterSelectWithUnionQuery(ast_ptr_, *context, options.copy().analyze().noModify(), required_result_column_names)
+        return InterpreterSelectWithUnionQuery(ast_ptr_, context, options.copy().analyze().noModify(), required_result_column_names)
             .getSampleBlock();
     else
-        return InterpreterSelectQuery(ast_ptr_, *context, options.copy().analyze().noModify()).getSampleBlock();
+        return InterpreterSelectQuery(ast_ptr_, context, options.copy().analyze().noModify()).getSampleBlock();
 }
 
 std::unique_ptr<IInterpreterUnionOrSelectQuery>
 InterpreterSelectWithUnionQuery::buildCurrentChildInterpreter(const ASTPtr & ast_ptr_, const Names & current_required_result_column_names)
 {
     if (ast_ptr_->as<ASTSelectWithUnionQuery>())
-        return std::make_unique<InterpreterSelectWithUnionQuery>(ast_ptr_, *context, options, current_required_result_column_names);
+        return std::make_unique<InterpreterSelectWithUnionQuery>(ast_ptr_, context, options, current_required_result_column_names);
     else
-        return std::make_unique<InterpreterSelectQuery>(ast_ptr_, *context, options, current_required_result_column_names);
+        return std::make_unique<InterpreterSelectQuery>(ast_ptr_, context, options, current_required_result_column_names);
 }
 
 InterpreterSelectWithUnionQuery::~InterpreterSelectWithUnionQuery() = default;
 
-Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_, const Context & context_, bool is_subquery)
+Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_, ContextPtr context_, bool is_subquery)
 {
-    auto & cache = context_.getSampleBlockCache();
+    auto & cache = context_->getSampleBlockCache();
     /// Using query string because query_ptr changes for every internal SELECT
     auto key = queryToString(query_ptr_);
     if (cache.find(key) != cache.end())
@@ -251,11 +252,23 @@ void InterpreterSelectWithUnionQuery::buildQueryPlan(QueryPlan & query_plan)
         {
             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 union_step = std::make_unique<UnionStep>(std::move(data_streams), result_header, max_threads);
+        auto union_step = std::make_unique<UnionStep>(std::move(data_streams), max_threads);
 
         query_plan.unitePlans(std::move(union_step), std::move(plans));
 
@@ -298,8 +311,8 @@ BlockIO InterpreterSelectWithUnionQuery::execute()
     buildQueryPlan(query_plan);
 
     auto pipeline = query_plan.buildQueryPipeline(
-        QueryPlanOptimizationSettings::fromContext(*context),
-        BuildQueryPipelineSettings::fromContext(*context));
+        QueryPlanOptimizationSettings::fromContext(context),
+        BuildQueryPipelineSettings::fromContext(context));
 
     res.pipeline = std::move(*pipeline);
     res.pipeline.addInterpreterContext(context);
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.h b/src/Interpreters/InterpreterSelectWithUnionQuery.h
index f4062b2005e..bd18b8e7907 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.h
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.h
@@ -6,7 +6,6 @@
 namespace DB
 {
 
-class Context;
 class InterpreterSelectQuery;
 class QueryPlan;
 
@@ -19,7 +18,7 @@ public:
 
     InterpreterSelectWithUnionQuery(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         const SelectQueryOptions &,
         const Names & required_result_column_names = {});
 
@@ -35,7 +34,7 @@ public:
 
     static Block getSampleBlock(
         const ASTPtr & query_ptr_,
-        const Context & context_,
+        ContextPtr context_,
         bool is_subquery = false);
 
     virtual void ignoreWithTotals() override;
diff --git a/src/Interpreters/InterpreterSetQuery.cpp b/src/Interpreters/InterpreterSetQuery.cpp
index f92e9638822..1c6a4236bf6 100644
--- a/src/Interpreters/InterpreterSetQuery.cpp
+++ b/src/Interpreters/InterpreterSetQuery.cpp
@@ -9,8 +9,8 @@ namespace DB
 BlockIO InterpreterSetQuery::execute()
 {
     const auto & ast = query_ptr->as<ASTSetQuery &>();
-    context.checkSettingsConstraints(ast.changes);
-    context.getSessionContext().applySettingsChanges(ast.changes);
+    getContext()->checkSettingsConstraints(ast.changes);
+    getContext()->getSessionContext()->applySettingsChanges(ast.changes);
     return {};
 }
 
@@ -18,8 +18,8 @@ BlockIO InterpreterSetQuery::execute()
 void InterpreterSetQuery::executeForCurrentContext()
 {
     const auto & ast = query_ptr->as<ASTSetQuery &>();
-    context.checkSettingsConstraints(ast.changes);
-    context.applySettingsChanges(ast.changes);
+    getContext()->checkSettingsConstraints(ast.changes);
+    getContext()->applySettingsChanges(ast.changes);
 }
 
 }
diff --git a/src/Interpreters/InterpreterSetQuery.h b/src/Interpreters/InterpreterSetQuery.h
index 6e8e8b8b733..9bd49708421 100644
--- a/src/Interpreters/InterpreterSetQuery.h
+++ b/src/Interpreters/InterpreterSetQuery.h
@@ -7,17 +7,14 @@
 namespace DB
 {
 
-class Context;
 class ASTSetQuery;
 
-
 /** Change one or several settings for the session or just for the current context.
   */
-class InterpreterSetQuery : public IInterpreter
+class InterpreterSetQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterSetQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterSetQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     /** Usual SET query. Set setting for the session.
       */
@@ -30,8 +27,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterSetRoleQuery.cpp b/src/Interpreters/InterpreterSetRoleQuery.cpp
index 8d314606329..057ccd447ef 100644
--- a/src/Interpreters/InterpreterSetRoleQuery.cpp
+++ b/src/Interpreters/InterpreterSetRoleQuery.cpp
@@ -28,13 +28,13 @@ BlockIO InterpreterSetRoleQuery::execute()
 
 void InterpreterSetRoleQuery::setRole(const ASTSetRoleQuery & query)
 {
-    auto & access_control = context.getAccessControlManager();
-    auto & session_context = context.getSessionContext();
-    auto user = session_context.getUser();
+    auto & access_control = getContext()->getAccessControlManager();
+    auto session_context = getContext()->getSessionContext();
+    auto user = session_context->getUser();
 
     if (query.kind == ASTSetRoleQuery::Kind::SET_ROLE_DEFAULT)
     {
-        session_context.setCurrentRolesDefault();
+        session_context->setCurrentRolesDefault();
     }
     else
     {
@@ -53,17 +53,17 @@ void InterpreterSetRoleQuery::setRole(const ASTSetRoleQuery & query)
                 new_current_roles.emplace_back(id);
             }
         }
-        session_context.setCurrentRoles(new_current_roles);
+        session_context->setCurrentRoles(new_current_roles);
     }
 }
 
 
 void InterpreterSetRoleQuery::setDefaultRole(const ASTSetRoleQuery & query)
 {
-    context.checkAccess(AccessType::ALTER_USER);
+    getContext()->checkAccess(AccessType::ALTER_USER);
 
-    auto & access_control = context.getAccessControlManager();
-    std::vector<UUID> to_users = RolesOrUsersSet{*query.to_users, access_control, context.getUserID()}.getMatchingIDs(access_control);
+    auto & access_control = getContext()->getAccessControlManager();
+    std::vector<UUID> to_users = RolesOrUsersSet{*query.to_users, access_control, getContext()->getUserID()}.getMatchingIDs(access_control);
     RolesOrUsersSet roles_from_query{*query.roles, access_control};
 
     auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
diff --git a/src/Interpreters/InterpreterSetRoleQuery.h b/src/Interpreters/InterpreterSetRoleQuery.h
index 0919b0f23f9..0a489f45fcd 100644
--- a/src/Interpreters/InterpreterSetRoleQuery.h
+++ b/src/Interpreters/InterpreterSetRoleQuery.h
@@ -7,16 +7,14 @@
 namespace DB
 {
 
-class Context;
 class ASTSetRoleQuery;
 struct RolesOrUsersSet;
 struct User;
 
-
-class InterpreterSetRoleQuery : public IInterpreter
+class InterpreterSetRoleQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterSetRoleQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterSetRoleQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -27,6 +25,6 @@ private:
     void setDefaultRole(const ASTSetRoleQuery & query);
 
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp b/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp
index 31c1ef874df..41b986e43a2 100644
--- a/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp
+++ b/src/Interpreters/InterpreterShowAccessEntitiesQuery.cpp
@@ -17,25 +17,27 @@ namespace ErrorCodes
 using EntityType = IAccessEntity::Type;
 
 
-InterpreterShowAccessEntitiesQuery::InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterShowAccessEntitiesQuery::InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+    : WithMutableContext(context_), query_ptr(query_ptr_)
 {
 }
 
 
 BlockIO InterpreterShowAccessEntitiesQuery::execute()
 {
-    return executeQuery(getRewrittenQuery(), context, true);
+    return executeQuery(getRewrittenQuery(), getContext(), true);
 }
 
 
 String InterpreterShowAccessEntitiesQuery::getRewrittenQuery() const
 {
     auto & query = query_ptr->as<ASTShowAccessEntitiesQuery &>();
-    query.replaceEmptyDatabase(context.getCurrentDatabase());
+    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
+
     String origin;
     String expr = "*";
-    String filter, order;
+    String filter;
+    String order;
 
     switch (query.type)
     {
@@ -43,8 +45,10 @@ String InterpreterShowAccessEntitiesQuery::getRewrittenQuery() const
         {
             origin = "row_policies";
             expr = "name";
+
             if (!query.short_name.empty())
-                filter += String{filter.empty() ? "" : " AND "} + "short_name = " + quoteString(query.short_name);
+                filter = "short_name = " + quoteString(query.short_name);
+
             if (query.database_and_table_name)
             {
                 const String & database = query.database_and_table_name->first;
diff --git a/src/Interpreters/InterpreterShowAccessEntitiesQuery.h b/src/Interpreters/InterpreterShowAccessEntitiesQuery.h
index 8fcd70919ba..35511a38d8f 100644
--- a/src/Interpreters/InterpreterShowAccessEntitiesQuery.h
+++ b/src/Interpreters/InterpreterShowAccessEntitiesQuery.h
@@ -6,12 +6,11 @@
 
 namespace DB
 {
-class Context;
 
-class InterpreterShowAccessEntitiesQuery : public IInterpreter
+class InterpreterShowAccessEntitiesQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterShowAccessEntitiesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
 
     BlockIO execute() override;
 
@@ -22,7 +21,6 @@ private:
     String getRewrittenQuery() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterShowAccessQuery.cpp b/src/Interpreters/InterpreterShowAccessQuery.cpp
index a1f8b5ed656..d2e21b71ae5 100644
--- a/src/Interpreters/InterpreterShowAccessQuery.cpp
+++ b/src/Interpreters/InterpreterShowAccessQuery.cpp
@@ -49,8 +49,8 @@ BlockInputStreamPtr InterpreterShowAccessQuery::executeImpl() const
 
 std::vector<AccessEntityPtr> InterpreterShowAccessQuery::getEntities() const
 {
-    const auto & access_control = context.getAccessControlManager();
-    context.checkAccess(AccessType::SHOW_ACCESS);
+    const auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(AccessType::SHOW_ACCESS);
 
     std::vector<AccessEntityPtr> entities;
     for (auto type : ext::range(EntityType::MAX))
@@ -71,7 +71,7 @@ std::vector<AccessEntityPtr> InterpreterShowAccessQuery::getEntities() const
 ASTs InterpreterShowAccessQuery::getCreateAndGrantQueries() const
 {
     auto entities = getEntities();
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = getContext()->getAccessControlManager();
 
     ASTs create_queries, grant_queries;
     for (const auto & entity : entities)
diff --git a/src/Interpreters/InterpreterShowAccessQuery.h b/src/Interpreters/InterpreterShowAccessQuery.h
index eb548c56241..d08d8962abc 100644
--- a/src/Interpreters/InterpreterShowAccessQuery.h
+++ b/src/Interpreters/InterpreterShowAccessQuery.h
@@ -6,17 +6,16 @@
 
 namespace DB
 {
-class Context;
+
 struct IAccessEntity;
 using AccessEntityPtr = std::shared_ptr<const IAccessEntity>;
 
 /** Return all queries for creating access entities and grants.
   */
-class InterpreterShowAccessQuery : public IInterpreter
+class InterpreterShowAccessQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowAccessQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowAccessQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -29,8 +28,6 @@ private:
     std::vector<AccessEntityPtr> getEntities() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
index c39fed8fb62..33e29d2b7bd 100644
--- a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
@@ -225,8 +225,8 @@ namespace
 }
 
 
-InterpreterShowCreateAccessEntityQuery::InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, const Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterShowCreateAccessEntityQuery::InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, ContextPtr context_)
+    : WithContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -270,9 +270,9 @@ BlockInputStreamPtr InterpreterShowCreateAccessEntityQuery::executeImpl()
 std::vector<AccessEntityPtr> InterpreterShowCreateAccessEntityQuery::getEntities() const
 {
     auto & show_query = query_ptr->as<ASTShowCreateAccessEntityQuery &>();
-    const auto & access_control = context.getAccessControlManager();
-    context.checkAccess(getRequiredAccess());
-    show_query.replaceEmptyDatabase(context.getCurrentDatabase());
+    const auto & access_control = getContext()->getAccessControlManager();
+    getContext()->checkAccess(getRequiredAccess());
+    show_query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
     std::vector<AccessEntityPtr> entities;
 
     if (show_query.all)
@@ -286,12 +286,12 @@ std::vector<AccessEntityPtr> InterpreterShowCreateAccessEntityQuery::getEntities
     }
     else if (show_query.current_user)
     {
-        if (auto user = context.getUser())
+        if (auto user = getContext()->getUser())
             entities.push_back(user);
     }
     else if (show_query.current_quota)
     {
-        auto usage = context.getQuotaUsage();
+        auto usage = getContext()->getQuotaUsage();
         if (usage)
             entities.push_back(access_control.read<Quota>(usage->quota_id));
     }
@@ -341,7 +341,7 @@ ASTs InterpreterShowCreateAccessEntityQuery::getCreateQueries() const
     auto entities = getEntities();
 
     ASTs list;
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = getContext()->getAccessControlManager();
     for (const auto & entity : entities)
         list.push_back(getCreateQuery(*entity, access_control));
 
diff --git a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
index 5bacbd42988..6d026d2b81b 100644
--- a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
+++ b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
@@ -16,10 +16,10 @@ using AccessEntityPtr = std::shared_ptr<const IAccessEntity>;
 
 /** Returns a single item containing a statement which could be used to create a specified role.
   */
-class InterpreterShowCreateAccessEntityQuery : public IInterpreter
+class InterpreterShowCreateAccessEntityQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, const Context & context_);
+    InterpreterShowCreateAccessEntityQuery(const ASTPtr & query_ptr_, ContextPtr context_);
 
     BlockIO execute() override;
 
@@ -36,7 +36,6 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
-    const Context & context;
 };
 
 
diff --git a/src/Interpreters/InterpreterShowCreateQuery.cpp b/src/Interpreters/InterpreterShowCreateQuery.cpp
index a853c4b9a9b..967d3e7f570 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateQuery.cpp
@@ -45,40 +45,48 @@ BlockInputStreamPtr InterpreterShowCreateQuery::executeImpl()
     ASTPtr create_query;
     ASTQueryWithTableAndOutput * show_query;
     if ((show_query = query_ptr->as<ASTShowCreateTableQuery>()) ||
-        (show_query = query_ptr->as<ASTShowCreateViewQuery>()))
+        (show_query = query_ptr->as<ASTShowCreateViewQuery>()) ||
+        (show_query = query_ptr->as<ASTShowCreateDictionaryQuery>()))
     {
         auto resolve_table_type = show_query->temporary ? Context::ResolveExternal : Context::ResolveOrdinary;
-        auto table_id = context.resolveStorageID(*show_query, resolve_table_type);
-        context.checkAccess(AccessType::SHOW_COLUMNS, table_id);
-        create_query = DatabaseCatalog::instance().getDatabase(table_id.database_name)->getCreateTableQuery(table_id.table_name, context);
+        auto table_id = getContext()->resolveStorageID(*show_query, resolve_table_type);
+
+        bool is_dictionary = static_cast<bool>(query_ptr->as<ASTShowCreateDictionaryQuery>());
+
+        if (is_dictionary)
+            getContext()->checkAccess(AccessType::SHOW_DICTIONARIES, table_id);
+        else
+            getContext()->checkAccess(AccessType::SHOW_COLUMNS, table_id);
+
+        create_query = DatabaseCatalog::instance().getDatabase(table_id.database_name)->getCreateTableQuery(table_id.table_name, getContext());
+
+        auto & ast_create_query = create_query->as<ASTCreateQuery &>();
         if (query_ptr->as<ASTShowCreateViewQuery>())
         {
-            auto & ast_create_query = create_query->as<ASTCreateQuery &>();
             if (!ast_create_query.isView())
-                throw Exception(backQuote(ast_create_query.database) + "." + backQuote(ast_create_query.table) + " is not a VIEW", ErrorCodes::BAD_ARGUMENTS);
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}.{} is not a VIEW",
+                    backQuote(ast_create_query.database), backQuote(ast_create_query.table));
+        }
+        else if (is_dictionary)
+        {
+            if (!ast_create_query.is_dictionary)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}.{} is not a DICTIONARY",
+                    backQuote(ast_create_query.database), backQuote(ast_create_query.table));
         }
     }
     else if ((show_query = query_ptr->as<ASTShowCreateDatabaseQuery>()))
     {
         if (show_query->temporary)
             throw Exception("Temporary databases are not possible.", ErrorCodes::SYNTAX_ERROR);
-        show_query->database = context.resolveDatabase(show_query->database);
-        context.checkAccess(AccessType::SHOW_DATABASES, show_query->database);
+        show_query->database = getContext()->resolveDatabase(show_query->database);
+        getContext()->checkAccess(AccessType::SHOW_DATABASES, show_query->database);
         create_query = DatabaseCatalog::instance().getDatabase(show_query->database)->getCreateDatabaseQuery();
     }
-    else if ((show_query = query_ptr->as<ASTShowCreateDictionaryQuery>()))
-    {
-        if (show_query->temporary)
-            throw Exception("Temporary dictionaries are not possible.", ErrorCodes::SYNTAX_ERROR);
-        show_query->database = context.resolveDatabase(show_query->database);
-        context.checkAccess(AccessType::SHOW_DICTIONARIES, show_query->database, show_query->table);
-        create_query = DatabaseCatalog::instance().getDatabase(show_query->database)->getCreateDictionaryQuery(show_query->table);
-    }
 
     if (!create_query)
         throw Exception("Unable to show the create query of " + show_query->table + ". Maybe it was created by the system.", ErrorCodes::THERE_IS_NO_QUERY);
 
-    if (!context.getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
+    if (!getContext()->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
     {
         auto & create = create_query->as<ASTCreateQuery &>();
         create.uuid = UUIDHelpers::Nil;
diff --git a/src/Interpreters/InterpreterShowCreateQuery.h b/src/Interpreters/InterpreterShowCreateQuery.h
index 5ac98509b23..53f587d3e7d 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.h
+++ b/src/Interpreters/InterpreterShowCreateQuery.h
@@ -7,16 +7,12 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Return single row with single column "statement" of type String with text of query to CREATE specified table.
   */
-class InterpreterShowCreateQuery : public IInterpreter
+class InterpreterShowCreateQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowCreateQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowCreateQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -24,7 +20,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     BlockInputStreamPtr executeImpl();
 };
diff --git a/src/Interpreters/InterpreterShowGrantsQuery.cpp b/src/Interpreters/InterpreterShowGrantsQuery.cpp
index bda5ef0f8b1..f3e554122e1 100644
--- a/src/Interpreters/InterpreterShowGrantsQuery.cpp
+++ b/src/Interpreters/InterpreterShowGrantsQuery.cpp
@@ -136,8 +136,8 @@ BlockInputStreamPtr InterpreterShowGrantsQuery::executeImpl()
 std::vector<AccessEntityPtr> InterpreterShowGrantsQuery::getEntities() const
 {
     const auto & show_query = query_ptr->as<ASTShowGrantsQuery &>();
-    const auto & access_control = context.getAccessControlManager();
-    auto ids = RolesOrUsersSet{*show_query.for_roles, access_control, context.getUserID()}.getMatchingIDs(access_control);
+    const auto & access_control = getContext()->getAccessControlManager();
+    auto ids = RolesOrUsersSet{*show_query.for_roles, access_control, getContext()->getUserID()}.getMatchingIDs(access_control);
 
     std::vector<AccessEntityPtr> entities;
     for (const auto & id : ids)
@@ -155,7 +155,7 @@ std::vector<AccessEntityPtr> InterpreterShowGrantsQuery::getEntities() const
 ASTs InterpreterShowGrantsQuery::getGrantQueries() const
 {
     auto entities = getEntities();
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = getContext()->getAccessControlManager();
 
     ASTs grant_queries;
     for (const auto & entity : entities)
diff --git a/src/Interpreters/InterpreterShowGrantsQuery.h b/src/Interpreters/InterpreterShowGrantsQuery.h
index f5dbd110fd0..c23aa1e3b94 100644
--- a/src/Interpreters/InterpreterShowGrantsQuery.h
+++ b/src/Interpreters/InterpreterShowGrantsQuery.h
@@ -1,22 +1,22 @@
 #pragma once
 
+#include <Core/UUID.h>
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
-#include <Core/UUID.h>
 
 
 namespace DB
 {
+
 class AccessControlManager;
 class ASTShowGrantsQuery;
 struct IAccessEntity;
 using AccessEntityPtr = std::shared_ptr<const IAccessEntity>;
 
-
-class InterpreterShowGrantsQuery : public IInterpreter
+class InterpreterShowGrantsQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterShowGrantsQuery(const ASTPtr & query_ptr_, Context & context_) : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowGrantsQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -32,6 +32,6 @@ private:
     std::vector<AccessEntityPtr> getEntities() const;
 
     ASTPtr query_ptr;
-    Context & context;
 };
+
 }
diff --git a/src/Interpreters/InterpreterShowPrivilegesQuery.cpp b/src/Interpreters/InterpreterShowPrivilegesQuery.cpp
index e88b97d8671..201c1cfece8 100644
--- a/src/Interpreters/InterpreterShowPrivilegesQuery.cpp
+++ b/src/Interpreters/InterpreterShowPrivilegesQuery.cpp
@@ -4,7 +4,7 @@
 
 namespace DB
 {
-InterpreterShowPrivilegesQuery::InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, Context & context_)
+InterpreterShowPrivilegesQuery::InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
     : query_ptr(query_ptr_), context(context_)
 {
 }
diff --git a/src/Interpreters/InterpreterShowPrivilegesQuery.h b/src/Interpreters/InterpreterShowPrivilegesQuery.h
index 0c1a30107c0..852d5173eb1 100644
--- a/src/Interpreters/InterpreterShowPrivilegesQuery.h
+++ b/src/Interpreters/InterpreterShowPrivilegesQuery.h
@@ -11,7 +11,7 @@ class Context;
 class InterpreterShowPrivilegesQuery : public IInterpreter
 {
 public:
-    InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterShowPrivilegesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
 
     BlockIO execute() override;
 
@@ -20,7 +20,7 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
+    ContextMutablePtr context;
 };
 
 }
diff --git a/src/Interpreters/InterpreterShowProcesslistQuery.cpp b/src/Interpreters/InterpreterShowProcesslistQuery.cpp
index 697b286fe75..780ba688a89 100644
--- a/src/Interpreters/InterpreterShowProcesslistQuery.cpp
+++ b/src/Interpreters/InterpreterShowProcesslistQuery.cpp
@@ -12,7 +12,7 @@ namespace DB
 
 BlockIO InterpreterShowProcesslistQuery::execute()
 {
-    return executeQuery("SELECT * FROM system.processes", context, true);
+    return executeQuery("SELECT * FROM system.processes", getContext(), true);
 }
 
 }
diff --git a/src/Interpreters/InterpreterShowProcesslistQuery.h b/src/Interpreters/InterpreterShowProcesslistQuery.h
index fa0bbf075bd..31454882a89 100644
--- a/src/Interpreters/InterpreterShowProcesslistQuery.h
+++ b/src/Interpreters/InterpreterShowProcesslistQuery.h
@@ -7,16 +7,13 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Return list of currently executing queries.
   */
-class InterpreterShowProcesslistQuery : public IInterpreter
+class InterpreterShowProcesslistQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterShowProcesslistQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterShowProcesslistQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+        : WithMutableContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
@@ -27,8 +24,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterShowTablesQuery.cpp b/src/Interpreters/InterpreterShowTablesQuery.cpp
index 49c55fa3a93..609df1404ca 100644
--- a/src/Interpreters/InterpreterShowTablesQuery.cpp
+++ b/src/Interpreters/InterpreterShowTablesQuery.cpp
@@ -18,8 +18,8 @@ namespace ErrorCodes
 }
 
 
-InterpreterShowTablesQuery::InterpreterShowTablesQuery(const ASTPtr & query_ptr_, Context & context_)
-    : query_ptr(query_ptr_), context(context_)
+InterpreterShowTablesQuery::InterpreterShowTablesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+    : WithMutableContext(context_), query_ptr(query_ptr_)
 {
 }
 
@@ -102,7 +102,7 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
     if (query.temporary && !query.from.empty())
         throw Exception("The `FROM` and `TEMPORARY` cannot be used together in `SHOW TABLES`", ErrorCodes::SYNTAX_ERROR);
 
-    String database = context.resolveDatabase(query.from);
+    String database = getContext()->resolveDatabase(query.from);
     DatabaseCatalog::instance().assertDatabaseExists(database);
 
     WriteBufferFromOwnString rewritten_query;
@@ -142,7 +142,7 @@ String InterpreterShowTablesQuery::getRewrittenQuery()
 
 BlockIO InterpreterShowTablesQuery::execute()
 {
-    return executeQuery(getRewrittenQuery(), context, true);
+    return executeQuery(getRewrittenQuery(), getContext(), true);
 }
 
 
diff --git a/src/Interpreters/InterpreterShowTablesQuery.h b/src/Interpreters/InterpreterShowTablesQuery.h
index 4f720e68622..16fc9ef2cf4 100644
--- a/src/Interpreters/InterpreterShowTablesQuery.h
+++ b/src/Interpreters/InterpreterShowTablesQuery.h
@@ -13,10 +13,10 @@ class Context;
 /** Return a list of tables or databases meets specified conditions.
   * Interprets a query through replacing it to SELECT query from system.tables or system.databases.
   */
-class InterpreterShowTablesQuery : public IInterpreter
+class InterpreterShowTablesQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterShowTablesQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterShowTablesQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
 
     BlockIO execute() override;
 
@@ -27,7 +27,6 @@ public:
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 
     String getRewrittenQuery();
 };
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 67576836d52..f97001883bd 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -10,6 +10,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Interpreters/ActionLocksManager.h>
 #include <Interpreters/InterpreterDropQuery.h>
@@ -28,6 +29,7 @@
 #include <Access/ContextAccess.h>
 #include <Access/AllowedClientHosts.h>
 #include <Databases/IDatabase.h>
+#include <Disks/DiskRestartProxy.h>
 #include <Storages/StorageDistributed.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/StorageFactory.h>
@@ -134,7 +136,7 @@ AccessType getRequiredAccessType(StorageActionBlockType action_type)
 /// Implements SYSTEM [START|STOP] <something action from ActionLocks>
 void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type, bool start)
 {
-    auto manager = context.getActionLocksManager();
+    auto manager = getContext()->getActionLocksManager();
     manager->cleanExpired();
 
     if (volume_ptr && action_type == ActionLocks::PartsMerge)
@@ -143,7 +145,7 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
     }
     else if (table_id)
     {
-        auto table = DatabaseCatalog::instance().tryGetTable(table_id, context);
+        auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
         if (table)
         {
             if (start)
@@ -157,10 +159,10 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
     }
     else
     {
-        auto access = context.getAccess();
+        auto access = getContext()->getAccess();
         for (auto & elem : DatabaseCatalog::instance().getDatabases())
         {
-            for (auto iterator = elem.second->getTablesIterator(context); iterator->isValid(); iterator->next())
+            for (auto iterator = elem.second->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             {
                 StoragePtr table = iterator->table();
                 if (!table)
@@ -190,8 +192,8 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
 }
 
 
-InterpreterSystemQuery::InterpreterSystemQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_->clone()), context(context_), log(&Poco::Logger::get("InterpreterSystemQuery"))
+InterpreterSystemQuery::InterpreterSystemQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+        : WithMutableContext(context_), query_ptr(query_ptr_->clone()), log(&Poco::Logger::get("InterpreterSystemQuery"))
 {
 }
 
@@ -201,37 +203,37 @@ BlockIO InterpreterSystemQuery::execute()
     auto & query = query_ptr->as<ASTSystemQuery &>();
 
     if (!query.cluster.empty())
-        return executeDDLQueryOnCluster(query_ptr, context, getRequiredAccessForDDLOnCluster());
+        return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccessForDDLOnCluster());
 
     using Type = ASTSystemQuery::Type;
 
     /// Use global context with fresh system profile settings
-    Context system_context = context.getGlobalContext();
-    system_context.setSetting("profile", context.getSystemProfileName());
+    auto system_context = Context::createCopy(getContext()->getGlobalContext());
+    system_context->setSetting("profile", getContext()->getSystemProfileName());
 
     /// Make canonical query for simpler processing
     if (!query.table.empty())
-        table_id = context.resolveStorageID(StorageID(query.database, query.table), Context::ResolveOrdinary);
+        table_id = getContext()->resolveStorageID(StorageID(query.database, query.table), Context::ResolveOrdinary);
 
     if (!query.target_dictionary.empty() && !query.database.empty())
         query.target_dictionary = query.database + "." + query.target_dictionary;
 
     volume_ptr = {};
     if (!query.storage_policy.empty() && !query.volume.empty())
-        volume_ptr = context.getStoragePolicy(query.storage_policy)->getVolumeByName(query.volume);
+        volume_ptr = getContext()->getStoragePolicy(query.storage_policy)->getVolumeByName(query.volume);
 
     switch (query.type)
     {
         case Type::SHUTDOWN:
         {
-            context.checkAccess(AccessType::SYSTEM_SHUTDOWN);
+            getContext()->checkAccess(AccessType::SYSTEM_SHUTDOWN);
             if (kill(0, SIGTERM))
                 throwFromErrno("System call kill(0, SIGTERM) failed", ErrorCodes::CANNOT_KILL);
             break;
         }
         case Type::KILL:
         {
-            context.checkAccess(AccessType::SYSTEM_SHUTDOWN);
+            getContext()->checkAccess(AccessType::SYSTEM_SHUTDOWN);
             /// Exit with the same code as it is usually set by shell when process is terminated by SIGKILL.
             /// It's better than doing 'raise' or 'kill', because they have no effect for 'init' process (with pid = 0, usually in Docker).
             LOG_INFO(log, "Exit immediately as the SYSTEM KILL command has been issued.");
@@ -254,63 +256,80 @@ BlockIO InterpreterSystemQuery::execute()
         }
         case Type::DROP_DNS_CACHE:
         {
-            context.checkAccess(AccessType::SYSTEM_DROP_DNS_CACHE);
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_DNS_CACHE);
             DNSResolver::instance().dropCache();
             /// Reinitialize clusters to update their resolved_addresses
-            system_context.reloadClusterConfig();
+            system_context->reloadClusterConfig();
             break;
         }
         case Type::DROP_MARK_CACHE:
-            context.checkAccess(AccessType::SYSTEM_DROP_MARK_CACHE);
-            system_context.dropMarkCache();
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_MARK_CACHE);
+            system_context->dropMarkCache();
             break;
         case Type::DROP_UNCOMPRESSED_CACHE:
-            context.checkAccess(AccessType::SYSTEM_DROP_UNCOMPRESSED_CACHE);
-            system_context.dropUncompressedCache();
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_UNCOMPRESSED_CACHE);
+            system_context->dropUncompressedCache();
             break;
         case Type::DROP_MMAP_CACHE:
-            context.checkAccess(AccessType::SYSTEM_DROP_MMAP_CACHE);
-            system_context.dropMMappedFileCache();
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_MMAP_CACHE);
+            system_context->dropMMappedFileCache();
             break;
 #if USE_EMBEDDED_COMPILER
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
-            context.checkAccess(AccessType::SYSTEM_DROP_COMPILED_EXPRESSION_CACHE);
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_COMPILED_EXPRESSION_CACHE);
             if (auto * cache = CompiledExpressionCacheFactory::instance().tryGetCache())
                 cache->reset();
             break;
 #endif
         case Type::RELOAD_DICTIONARY:
         {
-            context.checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
+
+            auto & external_dictionaries_loader = system_context->getExternalDictionariesLoader();
+            external_dictionaries_loader.reloadDictionary(query.target_dictionary, getContext());
 
-            auto & external_dictionaries_loader = system_context.getExternalDictionariesLoader();
-            external_dictionaries_loader.reloadDictionary(query.target_dictionary, context);
 
             ExternalDictionariesLoader::resetAll();
             break;
         }
         case Type::RELOAD_DICTIONARIES:
         {
-            context.checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_DICTIONARY);
             executeCommandsAndThrowIfError(
-                    [&] () { system_context.getExternalDictionariesLoader().reloadAllTriedToLoad(); },
-                    [&] () { system_context.getEmbeddedDictionaries().reload(); }
+                    [&] () { system_context->getExternalDictionariesLoader().reloadAllTriedToLoad(); },
+                    [&] () { system_context->getEmbeddedDictionaries().reload(); }
             );
             ExternalDictionariesLoader::resetAll();
             break;
         }
+        case Type::RELOAD_MODEL:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_MODEL);
+
+            auto & external_models_loader = system_context->getExternalModelsLoader();
+            external_models_loader.reloadModel(query.target_model);
+            break;
+        }
+        case Type::RELOAD_MODELS:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_MODEL);
+
+            auto & external_models_loader = system_context->getExternalModelsLoader();
+            external_models_loader.reloadAllTriedToLoad();
+            break;
+        }
         case Type::RELOAD_EMBEDDED_DICTIONARIES:
-            context.checkAccess(AccessType::SYSTEM_RELOAD_EMBEDDED_DICTIONARIES);
-            system_context.getEmbeddedDictionaries().reload();
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_EMBEDDED_DICTIONARIES);
+            system_context->getEmbeddedDictionaries().reload();
             break;
         case Type::RELOAD_CONFIG:
-            context.checkAccess(AccessType::SYSTEM_RELOAD_CONFIG);
-            system_context.reloadConfig();
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_CONFIG);
+            system_context->reloadConfig();
             break;
         case Type::RELOAD_SYMBOLS:
         {
 #if defined(__ELF__) && !defined(__FreeBSD__)
-            context.checkAccess(AccessType::SYSTEM_RELOAD_SYMBOLS);
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_SYMBOLS);
             (void)SymbolIndex::instance(true);
             break;
 #else
@@ -376,18 +395,21 @@ BlockIO InterpreterSystemQuery::execute()
                 throw Exception("There is no " + query.database + "." + query.table + " replicated table",
                                 ErrorCodes::BAD_ARGUMENTS);
             break;
+        case Type::RESTART_DISK:
+            restartDisk(query.disk);
+            break;
         case Type::FLUSH_LOGS:
         {
-            context.checkAccess(AccessType::SYSTEM_FLUSH_LOGS);
+            getContext()->checkAccess(AccessType::SYSTEM_FLUSH_LOGS);
             executeCommandsAndThrowIfError(
-                    [&] () { if (auto query_log = context.getQueryLog()) query_log->flush(true); },
-                    [&] () { if (auto part_log = context.getPartLog("")) part_log->flush(true); },
-                    [&] () { if (auto query_thread_log = context.getQueryThreadLog()) query_thread_log->flush(true); },
-                    [&] () { if (auto trace_log = context.getTraceLog()) trace_log->flush(true); },
-                    [&] () { if (auto text_log = context.getTextLog()) text_log->flush(true); },
-                    [&] () { if (auto metric_log = context.getMetricLog()) metric_log->flush(true); },
-                    [&] () { if (auto asynchronous_metric_log = context.getAsynchronousMetricLog()) asynchronous_metric_log->flush(true); },
-                    [&] () { if (auto opentelemetry_span_log = context.getOpenTelemetrySpanLog()) opentelemetry_span_log->flush(true); }
+                    [&] () { if (auto query_log = getContext()->getQueryLog()) query_log->flush(true); },
+                    [&] () { if (auto part_log = getContext()->getPartLog("")) part_log->flush(true); },
+                    [&] () { if (auto query_thread_log = getContext()->getQueryThreadLog()) query_thread_log->flush(true); },
+                    [&] () { if (auto trace_log = getContext()->getTraceLog()) trace_log->flush(true); },
+                    [&] () { if (auto text_log = getContext()->getTextLog()) text_log->flush(true); },
+                    [&] () { 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); }
             );
             break;
         }
@@ -402,23 +424,23 @@ BlockIO InterpreterSystemQuery::execute()
 }
 
 
-StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica, Context & system_context, bool need_ddl_guard)
+StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica, ContextMutablePtr system_context, bool need_ddl_guard)
 {
-    context.checkAccess(AccessType::SYSTEM_RESTART_REPLICA, replica);
+    getContext()->checkAccess(AccessType::SYSTEM_RESTART_REPLICA, replica);
 
     auto table_ddl_guard = need_ddl_guard ? DatabaseCatalog::instance().getDDLGuard(replica.getDatabaseName(), replica.getTableName()) : nullptr;
-    auto [database, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable(replica, context);
+    auto [database, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable(replica, getContext());
     ASTPtr create_ast;
 
     /// Detach actions
     if (!table || !dynamic_cast<const StorageReplicatedMergeTree *>(table.get()))
         return nullptr;
 
-    table->shutdown();
+    table->flushAndShutdown();
     {
         /// If table was already dropped by anyone, an exception will be thrown
-        auto table_lock = table->lockExclusively(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-        create_ast = database->getCreateTableQuery(replica.table_name, context);
+        auto table_lock = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
+        create_ast = database->getCreateTableQuery(replica.table_name, getContext());
 
         database->detachTable(replica.table_name);
     }
@@ -429,14 +451,14 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
     auto & create = create_ast->as<ASTCreateQuery &>();
     create.attach = true;
 
-    auto columns = InterpreterCreateQuery::getColumnsDescription(*create.columns_list->columns, system_context, false);
+    auto columns = InterpreterCreateQuery::getColumnsDescription(*create.columns_list->columns, system_context, true);
     auto constraints = InterpreterCreateQuery::getConstraintsDescription(create.columns_list->constraints);
     auto data_path = database->getTableDataPath(create);
 
     table = StorageFactory::instance().get(create,
         data_path,
         system_context,
-        system_context.getGlobalContext(),
+        system_context->getGlobalContext(),
         columns,
         constraints,
         false);
@@ -447,7 +469,7 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
     return table;
 }
 
-void InterpreterSystemQuery::restartReplicas(Context & system_context)
+void InterpreterSystemQuery::restartReplicas(ContextMutablePtr system_context)
 {
     std::vector<StorageID> replica_names;
     auto & catalog = DatabaseCatalog::instance();
@@ -455,7 +477,7 @@ void InterpreterSystemQuery::restartReplicas(Context & system_context)
     for (auto & elem : catalog.getDatabases())
     {
         DatabasePtr & database = elem.second;
-        for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+        for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
         {
             if (auto table = iterator->table())
             {
@@ -490,43 +512,43 @@ void InterpreterSystemQuery::dropReplica(ASTSystemQuery & query)
 
     if (!table_id.empty())
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA, table_id);
-        StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA, table_id);
+        StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
 
         if (!dropReplicaImpl(query, table))
             throw Exception("Table " + table_id.getNameForLogs() + " is not replicated", ErrorCodes::BAD_ARGUMENTS);
     }
     else if (!query.database.empty())
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA, query.database);
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA, query.database);
         DatabasePtr database = DatabaseCatalog::instance().getDatabase(query.database);
-        for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+        for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             dropReplicaImpl(query, iterator->table());
         LOG_TRACE(log, "Dropped replica {} from database {}", query.replica, backQuoteIfNeed(database->getDatabaseName()));
     }
     else if (query.is_drop_whole_replica)
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA);
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA);
         auto databases = DatabaseCatalog::instance().getDatabases();
 
         for (auto & elem : databases)
         {
             DatabasePtr & database = elem.second;
-            for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+            for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
                 dropReplicaImpl(query, iterator->table());
             LOG_TRACE(log, "Dropped replica {} from database {}", query.replica, backQuoteIfNeed(database->getDatabaseName()));
         }
     }
     else if (!query.replica_zk_path.empty())
     {
-        context.checkAccess(AccessType::SYSTEM_DROP_REPLICA);
-        auto remote_replica_path = query.replica_zk_path  + "/replicas/" + query.replica;
+        getContext()->checkAccess(AccessType::SYSTEM_DROP_REPLICA);
+        String remote_replica_path = fs::path(query.replica_zk_path)  / "replicas" / query.replica;
 
         /// This check is actually redundant, but it may prevent from some user mistakes
         for (auto & elem : DatabaseCatalog::instance().getDatabases())
         {
             DatabasePtr & database = elem.second;
-            for (auto iterator = database->getTablesIterator(context); iterator->isValid(); iterator->next())
+            for (auto iterator = database->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
             {
                 if (auto * storage_replicated = dynamic_cast<StorageReplicatedMergeTree *>(iterator->table().get()))
                 {
@@ -541,7 +563,7 @@ void InterpreterSystemQuery::dropReplica(ASTSystemQuery & query)
             }
         }
 
-        auto zookeeper = context.getZooKeeper();
+        auto zookeeper = getContext()->getZooKeeper();
 
         bool looks_like_table_path = zookeeper->exists(query.replica_zk_path + "/replicas") ||
                                      zookeeper->exists(query.replica_zk_path + "/dropped");
@@ -567,7 +589,7 @@ bool InterpreterSystemQuery::dropReplicaImpl(ASTSystemQuery & query, const Stora
         return false;
 
     StorageReplicatedMergeTree::Status status;
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = getContext()->getZooKeeper();
     storage_replicated->getStatus(status);
 
     /// Do not allow to drop local replicas and active remote replicas
@@ -590,13 +612,13 @@ bool InterpreterSystemQuery::dropReplicaImpl(ASTSystemQuery & query, const Stora
 
 void InterpreterSystemQuery::syncReplica(ASTSystemQuery &)
 {
-    context.checkAccess(AccessType::SYSTEM_SYNC_REPLICA, table_id);
-    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, context);
+    getContext()->checkAccess(AccessType::SYSTEM_SYNC_REPLICA, table_id);
+    StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
 
     if (auto * storage_replicated = dynamic_cast<StorageReplicatedMergeTree *>(table.get()))
     {
         LOG_TRACE(log, "Synchronizing entries in replica's queue with table's log and waiting for it to become empty");
-        if (!storage_replicated->waitForShrinkingQueueSize(0, context.getSettingsRef().receive_timeout.totalMilliseconds()))
+        if (!storage_replicated->waitForShrinkingQueueSize(0, getContext()->getSettingsRef().receive_timeout.totalMilliseconds()))
         {
             LOG_ERROR(log, "SYNC REPLICA {}: Timed out!", table_id.getNameForLogs());
             throw Exception(
@@ -611,14 +633,26 @@ void InterpreterSystemQuery::syncReplica(ASTSystemQuery &)
 
 void InterpreterSystemQuery::flushDistributed(ASTSystemQuery &)
 {
-    context.checkAccess(AccessType::SYSTEM_FLUSH_DISTRIBUTED, table_id);
+    getContext()->checkAccess(AccessType::SYSTEM_FLUSH_DISTRIBUTED, table_id);
 
-    if (auto * storage_distributed = dynamic_cast<StorageDistributed *>(DatabaseCatalog::instance().getTable(table_id, context).get()))
-        storage_distributed->flushClusterNodesAllData(context);
+    if (auto * storage_distributed = dynamic_cast<StorageDistributed *>(DatabaseCatalog::instance().getTable(table_id, getContext()).get()))
+        storage_distributed->flushClusterNodesAllData(getContext());
     else
         throw Exception("Table " + table_id.getNameForLogs() + " is not distributed", ErrorCodes::BAD_ARGUMENTS);
 }
 
+void InterpreterSystemQuery::restartDisk(String & name)
+{
+    getContext()->checkAccess(AccessType::SYSTEM_RESTART_DISK);
+
+    auto disk = getContext()->getDisk(name);
+
+    if (DiskRestartProxy * restart_proxy = dynamic_cast<DiskRestartProxy*>(disk.get()))
+        restart_proxy->restart();
+    else
+        throw Exception("Disk " + name + " doesn't have possibility to restart", ErrorCodes::BAD_ARGUMENTS);
+}
+
 
 AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster() const
 {
@@ -652,6 +686,12 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_DICTIONARY);
             break;
         }
+        case Type::RELOAD_MODEL: [[fallthrough]];
+        case Type::RELOAD_MODELS:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_RELOAD_MODEL);
+            break;
+        }
         case Type::RELOAD_CONFIG:
         {
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_CONFIG);
@@ -755,6 +795,11 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_FLUSH_LOGS);
             break;
         }
+        case Type::RESTART_DISK:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_RESTART_DISK);
+            break;
+        }
         case Type::STOP_LISTEN_QUERIES: break;
         case Type::START_LISTEN_QUERIES: break;
         case Type::UNKNOWN: break;
@@ -763,7 +808,7 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
     return required_access;
 }
 
-void InterpreterSystemQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & /*ast*/, const Context &) const
+void InterpreterSystemQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & /*ast*/, ContextPtr) const
 {
     elem.query_kind = "System";
 }
diff --git a/src/Interpreters/InterpreterSystemQuery.h b/src/Interpreters/InterpreterSystemQuery.h
index 39f8bf69a6e..297f7225a92 100644
--- a/src/Interpreters/InterpreterSystemQuery.h
+++ b/src/Interpreters/InterpreterSystemQuery.h
@@ -30,34 +30,34 @@ class ASTSystemQuery;
   * - start/stop actions for all existing tables.
   * Note that the actions for tables that will be created after this query will not be affected.
   */
-class InterpreterSystemQuery : public IInterpreter
+class InterpreterSystemQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterSystemQuery(const ASTPtr & query_ptr_, Context & context_);
+    InterpreterSystemQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_);
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-    Context & context;
     Poco::Logger * log = nullptr;
     StorageID table_id = StorageID::createEmpty();      /// Will be set up if query contains table name
     VolumePtr volume_ptr;
 
     /// Tries to get a replicated table and restart it
     /// Returns pointer to a newly created table if the restart was successful
-    StoragePtr tryRestartReplica(const StorageID & replica, Context & context, bool need_ddl_guard = true);
+    StoragePtr tryRestartReplica(const StorageID & replica, ContextMutablePtr context, bool need_ddl_guard = true);
 
-    void restartReplicas(Context & system_context);
+    void restartReplicas(ContextMutablePtr system_context);
     void syncReplica(ASTSystemQuery & query);
     void dropReplica(ASTSystemQuery & query);
     bool dropReplicaImpl(ASTSystemQuery & query, const StoragePtr & table);
     void flushDistributed(ASTSystemQuery & query);
+    void restartDisk(String & name);
 
     AccessRightsElements getRequiredAccessForDDLOnCluster() const;
     void startStopAction(StorageActionBlockType action_type, bool start);
 
-    void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, const Context &) const override;
+    void extendQueryLogElemImpl(QueryLogElement &, const ASTPtr &, ContextPtr) const override;
 };
 
 
diff --git a/src/Interpreters/InterpreterUseQuery.cpp b/src/Interpreters/InterpreterUseQuery.cpp
index 58f5b6c9a32..626d2f499c7 100644
--- a/src/Interpreters/InterpreterUseQuery.cpp
+++ b/src/Interpreters/InterpreterUseQuery.cpp
@@ -11,8 +11,8 @@ namespace DB
 BlockIO InterpreterUseQuery::execute()
 {
     const String & new_database = query_ptr->as<ASTUseQuery &>().database;
-    context.checkAccess(AccessType::SHOW_DATABASES, new_database);
-    context.getSessionContext().setCurrentDatabase(new_database);
+    getContext()->checkAccess(AccessType::SHOW_DATABASES, new_database);
+    getContext()->getSessionContext()->setCurrentDatabase(new_database);
     return {};
 }
 
diff --git a/src/Interpreters/InterpreterUseQuery.h b/src/Interpreters/InterpreterUseQuery.h
index ae409117afd..d1ce57dc64a 100644
--- a/src/Interpreters/InterpreterUseQuery.h
+++ b/src/Interpreters/InterpreterUseQuery.h
@@ -7,23 +7,17 @@
 namespace DB
 {
 
-class Context;
-
-
 /** Change default database for session.
   */
-class InterpreterUseQuery : public IInterpreter
+class InterpreterUseQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterUseQuery(const ASTPtr & query_ptr_, Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterUseQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-    Context & context;
 };
 
-
 }
diff --git a/src/Interpreters/InterpreterWatchQuery.cpp b/src/Interpreters/InterpreterWatchQuery.cpp
index 757a2d1738b..edf0f37c00e 100644
--- a/src/Interpreters/InterpreterWatchQuery.cpp
+++ b/src/Interpreters/InterpreterWatchQuery.cpp
@@ -32,15 +32,15 @@ namespace ErrorCodes
 
 BlockIO InterpreterWatchQuery::execute()
 {
-    if (!context.getSettingsRef().allow_experimental_live_view)
+    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 = context.resolveStorageID(query, Context::ResolveOrdinary);
+    auto table_id = getContext()->resolveStorageID(query, Context::ResolveOrdinary);
 
     /// Get storage
-    storage = DatabaseCatalog::instance().tryGetTable(table_id, context);
+    storage = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
 
     if (!storage)
         throw Exception("Table " + table_id.getNameForLogs() + " doesn't exist.",
@@ -48,10 +48,10 @@ BlockIO InterpreterWatchQuery::execute()
 
     /// List of columns to read to execute the query.
     Names required_columns = storage->getInMemoryMetadataPtr()->getColumns().getNamesOfPhysical();
-    context.checkAccess(AccessType::SELECT, table_id, required_columns);
+    getContext()->checkAccess(AccessType::SELECT, table_id, required_columns);
 
     /// Get context settings for this query
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
 
     /// Limitation on the number of columns to read.
     if (settings.max_columns_to_read && required_columns.size() > settings.max_columns_to_read)
@@ -71,19 +71,19 @@ BlockIO InterpreterWatchQuery::execute()
     QueryProcessingStage::Enum from_stage = QueryProcessingStage::FetchColumns;
 
     /// Watch storage
-    streams = storage->watch(required_columns, query_info, context, from_stage, max_block_size, max_streams);
+    streams = 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;
+        limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
         limits.size_limits.max_rows = settings.max_result_rows;
         limits.size_limits.max_bytes = settings.max_result_bytes;
         limits.size_limits.overflow_mode = settings.result_overflow_mode;
 
         stream->setLimits(limits);
-        stream->setQuota(context.getQuota());
+        stream->setQuota(getContext()->getQuota());
     }
 
     res.in = streams[0];
diff --git a/src/Interpreters/InterpreterWatchQuery.h b/src/Interpreters/InterpreterWatchQuery.h
index c4aa5b9ca99..45b61a18b66 100644
--- a/src/Interpreters/InterpreterWatchQuery.h
+++ b/src/Interpreters/InterpreterWatchQuery.h
@@ -14,30 +14,27 @@ limitations under the License. */
 #include <Core/QueryProcessingStage.h>
 #include <DataStreams/BlockIO.h>
 #include <DataStreams/IBlockInputStream.h>
-#include <Parsers/IAST_fwd.h>
 #include <Interpreters/IInterpreter.h>
-#include <Storages/SelectQueryInfo.h>
+#include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
+#include <Storages/SelectQueryInfo.h>
 
 namespace DB
 {
 
-class Context;
 class IAST;
 using ASTPtr = std::shared_ptr<IAST>;
 using StoragePtr = std::shared_ptr<IStorage>;
 
-class InterpreterWatchQuery : public IInterpreter
+class InterpreterWatchQuery : public IInterpreter, WithContext
 {
 public:
-    InterpreterWatchQuery(const ASTPtr & query_ptr_, const Context & context_)
-        : query_ptr(query_ptr_), context(context_) {}
+    InterpreterWatchQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
 
 private:
     ASTPtr query_ptr;
-    const Context & context;
 
     /// Table from where to read data, if not subquery.
     StoragePtr storage;
@@ -45,5 +42,4 @@ private:
     BlockInputStreams streams;
 };
 
-
 }
diff --git a/src/Interpreters/InterserverCredentials.cpp b/src/Interpreters/InterserverCredentials.cpp
new file mode 100644
index 00000000000..e60d397eb02
--- /dev/null
+++ b/src/Interpreters/InterserverCredentials.cpp
@@ -0,0 +1,87 @@
+#include <Interpreters/InterserverCredentials.h>
+#include <common/logger_useful.h>
+#include <Common/StringUtils/StringUtils.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NO_ELEMENTS_IN_CONFIG;
+}
+
+std::unique_ptr<InterserverCredentials>
+InterserverCredentials::make(const Poco::Util::AbstractConfiguration & config, const std::string & root_tag)
+{
+    if (config.has("user") && !config.has("password"))
+        throw Exception("Configuration parameter interserver_http_credentials.password can't be empty", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    if (!config.has("user") && config.has("password"))
+        throw Exception("Configuration parameter interserver_http_credentials.user can't be empty if user specified", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+
+    /// They both can be empty
+    auto user = config.getString(root_tag + ".user", "");
+    auto password = config.getString(root_tag + ".password", "");
+
+    auto store = parseCredentialsFromConfig(user, password, config, root_tag);
+
+    return std::make_unique<InterserverCredentials>(user, password, store);
+}
+
+InterserverCredentials::CurrentCredentials InterserverCredentials::parseCredentialsFromConfig(
+    const std::string & current_user_,
+    const std::string & current_password_,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & root_tag)
+{
+    auto * log = &Poco::Logger::get("InterserverCredentials");
+    CurrentCredentials store;
+    store.emplace_back(current_user_, current_password_);
+    if (config.getBool(root_tag + ".allow_empty", false))
+    {
+        LOG_DEBUG(log, "Allowing empty credentials");
+        /// Allow empty credential to support migrating from no auth
+        store.emplace_back("", "");
+    }
+
+    Poco::Util::AbstractConfiguration::Keys old_users;
+    config.keys(root_tag, old_users);
+
+    for (const auto & user_key : old_users)
+    {
+        if (startsWith(user_key, "old"))
+        {
+            std::string full_prefix = root_tag + "." + user_key;
+            std::string old_user_name = config.getString(full_prefix + ".user");
+            LOG_DEBUG(log, "Adding credentials for old user {}", old_user_name);
+
+            std::string old_user_password =  config.getString(full_prefix + ".password");
+
+            store.emplace_back(old_user_name, old_user_password);
+        }
+    }
+
+    return store;
+}
+
+InterserverCredentials::CheckResult InterserverCredentials::isValidUser(const UserWithPassword & credentials) const
+{
+    auto itr = std::find(all_users_store.begin(), all_users_store.end(), credentials);
+
+    if (itr == all_users_store.end())
+    {
+        if (credentials.first.empty())
+            return {"Server requires HTTP Basic authentication, but client doesn't provide it", false};
+
+        return {"Incorrect user or password in HTTP basic authentication: " + credentials.first, false};
+    }
+
+    return {"", true};
+}
+
+InterserverCredentials::CheckResult InterserverCredentials::isValidUser(const std::string & user, const std::string & password) const
+{
+    return isValidUser(std::make_pair(user, password));
+}
+
+}
diff --git a/src/Interpreters/InterserverCredentials.h b/src/Interpreters/InterserverCredentials.h
new file mode 100644
index 00000000000..ffe568868dd
--- /dev/null
+++ b/src/Interpreters/InterserverCredentials.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/Exception.h>
+#include <common/logger_useful.h>
+#include <unordered_set>
+
+namespace DB
+{
+
+/// InterserverCredentials implements authentication using a CurrentCredentials, which
+/// is configured, e.g.
+///    <interserver_http_credentials>
+///        <user>admin</user>
+///        <password>222</password>
+///        <!-- To support mix of un/authenticated clients -->
+///        <!-- <allow_empty>true</allow_empty> -->
+///        <old>
+///            <!-- Allow authentication using previous passwords during rotation -->
+///            <user>admin</user>
+///            <password>qqq</password>
+///        </old>
+///        <old>
+///            <!-- Allow authentication using previous users during rotation -->
+///            <user>johny</user>
+///            <password>333</password>
+///        </old>
+///    </interserver_http_credentials>
+class InterserverCredentials
+{
+public:
+    using UserWithPassword = std::pair<std::string, std::string>;
+    using CheckResult = std::pair<std::string, bool>;
+    using CurrentCredentials = std::vector<UserWithPassword>;
+
+    InterserverCredentials(const InterserverCredentials &) = delete;
+
+    static std::unique_ptr<InterserverCredentials> make(const Poco::Util::AbstractConfiguration & config, const std::string & root_tag);
+
+    InterserverCredentials(const std::string & current_user_, const std::string & current_password_, const CurrentCredentials & all_users_store_)
+        : current_user(current_user_)
+        , current_password(current_password_)
+        , all_users_store(all_users_store_)
+    {}
+
+    CheckResult isValidUser(const UserWithPassword & credentials) const;
+    CheckResult isValidUser(const std::string & user, const std::string & password) const;
+
+    std::string getUser() const { return current_user; }
+
+    std::string getPassword() const { return current_password; }
+
+
+private:
+    std::string current_user;
+    std::string current_password;
+
+    /// In common situation this store contains one record
+    CurrentCredentials all_users_store;
+
+    static CurrentCredentials parseCredentialsFromConfig(
+        const std::string & current_user_,
+        const std::string & current_password_,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & root_tag);
+};
+
+using InterserverCredentialsPtr = std::shared_ptr<const InterserverCredentials>;
+
+}
diff --git a/src/Interpreters/JIT/CHJIT.cpp b/src/Interpreters/JIT/CHJIT.cpp
new file mode 100644
index 00000000000..72a2ede5853
--- /dev/null
+++ b/src/Interpreters/JIT/CHJIT.cpp
@@ -0,0 +1,382 @@
+#include "CHJIT.h"
+
+#if USE_EMBEDDED_COMPILER
+
+#include <llvm/Analysis/TargetTransformInfo.h>
+#include <llvm/IR/BasicBlock.h>
+#include <llvm/IR/DataLayout.h>
+#include <llvm/IR/DerivedTypes.h>
+#include <llvm/IR/Function.h>
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/Mangler.h>
+#include <llvm/IR/Type.h>
+#include <llvm/IR/LegacyPassManager.h>
+#include <llvm/ExecutionEngine/JITSymbol.h>
+#include <llvm/ExecutionEngine/SectionMemoryManager.h>
+#include <llvm/ExecutionEngine/JITEventListener.h>
+#include <llvm/MC/SubtargetFeature.h>
+#include <llvm/Support/DynamicLibrary.h>
+#include <llvm/Support/Host.h>
+#include <llvm/Support/TargetRegistry.h>
+#include <llvm/Support/TargetSelect.h>
+#include <llvm/Transforms/IPO/PassManagerBuilder.h>
+#include <llvm/Support/SmallVectorMemoryBuffer.h>
+
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_COMPILE_CODE;
+    extern const int LOGICAL_ERROR;
+}
+
+/** Simple module to object file compiler.
+  * Result object cannot be used as machine code directly, it should be passed to linker.
+  */
+class JITCompiler
+{
+public:
+
+    explicit JITCompiler(llvm::TargetMachine &target_machine_)
+    : target_machine(target_machine_)
+    {
+    }
+
+    std::unique_ptr<llvm::MemoryBuffer> compile(llvm::Module & module)
+    {
+        auto materialize_error = module.materializeAll();
+        if (materialize_error)
+        {
+            std::string error_message;
+            handleAllErrors(std::move(materialize_error),
+                [&](const llvm::ErrorInfoBase & error_info) { error_message = error_info.message(); });
+
+            throw Exception(ErrorCodes::CANNOT_COMPILE_CODE, "Cannot materialize module: {}", error_message);
+        }
+
+        llvm::SmallVector<char, 4096> object_buffer;
+
+        llvm::raw_svector_ostream object_stream(object_buffer);
+        llvm::legacy::PassManager pass_manager;
+        llvm::MCContext * machine_code_context = nullptr;
+
+        if (target_machine.addPassesToEmitMC(pass_manager, machine_code_context, object_stream))
+            throw Exception(ErrorCodes::CANNOT_COMPILE_CODE, "MachineCode is not supported for the platform");
+
+        pass_manager.run(module);
+
+        std::unique_ptr<llvm::MemoryBuffer> compiled_object_buffer = std::make_unique<llvm::SmallVectorMemoryBuffer>(
+            std::move(object_buffer), "<in memory object compiled from " + module.getModuleIdentifier() + ">");
+
+        return compiled_object_buffer;
+    }
+
+    ~JITCompiler() = default;
+
+private:
+    llvm::TargetMachine & target_machine;
+};
+
+/** 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 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; }
+
+    inline llvm::SectionMemoryManager & getManager() { return manager; }
+
+private:
+    DefaultMMapper mmaper;
+    llvm::SectionMemoryManager manager;
+};
+
+class JITSymbolResolver : public llvm::LegacyJITSymbolResolver
+{
+public:
+    llvm::JITSymbol findSymbolInLogicalDylib(const std::string &) override { return nullptr; }
+
+    llvm::JITSymbol findSymbol(const std::string & Name) override
+    {
+        auto address_it = symbol_name_to_symbol_address.find(Name);
+        if (address_it == symbol_name_to_symbol_address.end())
+            throw Exception(ErrorCodes::CANNOT_COMPILE_CODE, "Could not find symbol {}", Name);
+
+        uint64_t symbol_address = reinterpret_cast<uint64_t>(address_it->second);
+        auto jit_symbol = llvm::JITSymbol(symbol_address, llvm::JITSymbolFlags::None);
+
+        return jit_symbol;
+    }
+
+    void registerSymbol(const std::string & symbol_name, void * symbol) { symbol_name_to_symbol_address[symbol_name] = symbol; }
+
+    ~JITSymbolResolver() override = default;
+
+private:
+    std::unordered_map<std::string, void *> symbol_name_to_symbol_address;
+};
+
+/// GDB JITEventListener. Can be used if result machine code need to be debugged.
+// class JITEventListener
+// {
+// public:
+//     JITEventListener()
+//         : gdb_listener(llvm::JITEventListener::createGDBRegistrationListener())
+//     {}
+
+//     void notifyObjectLoaded(
+//         llvm::JITEventListener::ObjectKey object_key,
+//         const llvm::object::ObjectFile & object_file,
+//         const llvm::RuntimeDyld::LoadedObjectInfo & loaded_object_Info)
+//     {
+//         gdb_listener->notifyObjectLoaded(object_key, object_file, loaded_object_Info);
+//     }
+
+//     void notifyFreeingObject(llvm::JITEventListener::ObjectKey object_key)
+//     {
+//         gdb_listener->notifyFreeingObject(object_key);
+//     }
+
+// private:
+//     llvm::JITEventListener * gdb_listener = nullptr;
+// };
+
+CHJIT::CHJIT()
+    : machine(getTargetMachine())
+    , layout(machine->createDataLayout())
+    , compiler(std::make_unique<JITCompiler>(*machine))
+    , symbol_resolver(std::make_unique<JITSymbolResolver>())
+{
+    /// Define common symbols that can be generated during compilation
+    /// Necessary for valid linker symbol resolution
+    symbol_resolver->registerSymbol("memset", reinterpret_cast<void *>(&memset));
+    symbol_resolver->registerSymbol("memcpy", reinterpret_cast<void *>(&memcpy));
+    symbol_resolver->registerSymbol("memcmp", reinterpret_cast<void *>(&memcmp));
+}
+
+CHJIT::~CHJIT() = default;
+
+CHJIT::CompiledModuleInfo CHJIT::compileModule(std::function<void (llvm::Module &)> compile_function)
+{
+    std::lock_guard<std::mutex> lock(jit_lock);
+
+    auto module = createModuleForCompilation();
+    compile_function(*module);
+    auto module_info = compileModule(std::move(module));
+
+    ++current_module_key;
+    return module_info;
+}
+
+std::unique_ptr<llvm::Module> CHJIT::createModuleForCompilation()
+{
+    std::unique_ptr<llvm::Module> module = std::make_unique<llvm::Module>("jit" + std::to_string(current_module_key), context);
+    module->setDataLayout(layout);
+    module->setTargetTriple(machine->getTargetTriple().getTriple());
+
+    return module;
+}
+
+CHJIT::CompiledModuleInfo CHJIT::compileModule(std::unique_ptr<llvm::Module> module)
+{
+    runOptimizationPassesOnModule(*module);
+
+    auto buffer = compiler->compile(*module);
+
+    llvm::Expected<std::unique_ptr<llvm::object::ObjectFile>> object = llvm::object::ObjectFile::createObjectFile(*buffer);
+
+    if (!object)
+    {
+        std::string error_message;
+        handleAllErrors(object.takeError(), [&](const llvm::ErrorInfoBase & error_info) { error_message = error_info.message(); });
+
+        throw Exception(ErrorCodes::CANNOT_COMPILE_CODE, "Cannot create object file from compiled buffer: {}", error_message);
+    }
+
+    std::unique_ptr<JITModuleMemoryManager> module_memory_manager = std::make_unique<JITModuleMemoryManager>();
+    llvm::RuntimeDyld dynamic_linker = {module_memory_manager->getManager(), *symbol_resolver};
+
+    std::unique_ptr<llvm::RuntimeDyld::LoadedObjectInfo> linked_object = dynamic_linker.loadObject(*object.get());
+
+    dynamic_linker.resolveRelocations();
+    module_memory_manager->getManager().finalizeMemory();
+
+    CompiledModuleInfo module_info;
+
+    for (const auto & function : *module)
+    {
+        if (function.isDeclaration())
+            continue;
+
+        auto function_name = std::string(function.getName());
+
+        auto mangled_name = getMangledName(function_name);
+        auto jit_symbol = dynamic_linker.getSymbol(mangled_name);
+
+        if (!jit_symbol)
+            throw Exception(ErrorCodes::CANNOT_COMPILE_CODE, "DynamicLinker could not found symbol {} after compilation", function_name);
+
+        auto * jit_symbol_address = reinterpret_cast<void *>(jit_symbol.getAddress());
+
+        std::string symbol_name = std::to_string(current_module_key) + '_' + function_name;
+        name_to_symbol[symbol_name] = jit_symbol_address;
+        module_info.compiled_functions.emplace_back(std::move(function_name));
+    }
+
+    module_info.size = module_memory_manager->getAllocatedSize();
+    module_info.identifier = current_module_key;
+
+    module_identifier_to_memory_manager[current_module_key] = std::move(module_memory_manager);
+
+    compiled_code_size.fetch_add(module_info.size, std::memory_order_relaxed);
+
+    return module_info;
+}
+
+void CHJIT::deleteCompiledModule(const CHJIT::CompiledModuleInfo & module_info)
+{
+    std::lock_guard<std::mutex> lock(jit_lock);
+
+    auto module_it = module_identifier_to_memory_manager.find(module_info.identifier);
+    if (module_it == module_identifier_to_memory_manager.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is no compiled module with identifier {}", module_info.identifier);
+
+    for (const auto & function : module_info.compiled_functions)
+        name_to_symbol.erase(function);
+
+    module_identifier_to_memory_manager.erase(module_it);
+    compiled_code_size.fetch_sub(module_info.size, std::memory_order_relaxed);
+}
+
+void * CHJIT::findCompiledFunction(const CompiledModuleInfo & module_info, const std::string & function_name) const
+{
+    std::lock_guard<std::mutex> lock(jit_lock);
+
+    std::string symbol_name = std::to_string(module_info.identifier) + '_' + function_name;
+    auto it = name_to_symbol.find(symbol_name);
+    if (it != name_to_symbol.end())
+        return it->second;
+
+    return nullptr;
+}
+
+void CHJIT::registerExternalSymbol(const std::string & symbol_name, void * address)
+{
+    std::lock_guard<std::mutex> lock(jit_lock);
+    symbol_resolver->registerSymbol(symbol_name, address);
+}
+
+std::string CHJIT::getMangledName(const std::string & name_to_mangle) const
+{
+    std::string mangled_name;
+    llvm::raw_string_ostream mangled_name_stream(mangled_name);
+    llvm::Mangler::getNameWithPrefix(mangled_name_stream, name_to_mangle, layout);
+    mangled_name_stream.flush();
+
+    return mangled_name;
+}
+
+void CHJIT::runOptimizationPassesOnModule(llvm::Module & module) const
+{
+    llvm::PassManagerBuilder pass_manager_builder;
+    llvm::legacy::PassManager mpm;
+    llvm::legacy::FunctionPassManager fpm(&module);
+    pass_manager_builder.OptLevel = 3;
+    pass_manager_builder.SLPVectorize = true;
+    pass_manager_builder.LoopVectorize = true;
+    pass_manager_builder.RerollLoops = true;
+    pass_manager_builder.VerifyInput = true;
+    pass_manager_builder.VerifyOutput = true;
+    machine->adjustPassManager(pass_manager_builder);
+
+    fpm.add(llvm::createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis()));
+    mpm.add(llvm::createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis()));
+
+    pass_manager_builder.populateFunctionPassManager(fpm);
+    pass_manager_builder.populateModulePassManager(mpm);
+
+    fpm.doInitialization();
+    for (auto & function : module)
+        fpm.run(function);
+    fpm.doFinalization();
+
+    mpm.run(module);
+}
+
+std::unique_ptr<llvm::TargetMachine> CHJIT::getTargetMachine()
+{
+    static std::once_flag llvm_target_initialized;
+    std::call_once(llvm_target_initialized, []()
+    {
+        llvm::InitializeNativeTarget();
+        llvm::InitializeNativeTargetAsmPrinter();
+        llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr);
+    });
+
+    std::string error;
+    auto cpu = llvm::sys::getHostCPUName();
+    auto triple = llvm::sys::getProcessTriple();
+    const auto * target = llvm::TargetRegistry::lookupTarget(triple, error);
+    if (!target)
+        throw Exception(ErrorCodes::CANNOT_COMPILE_CODE, "Cannot find target triple {} error: {}", triple, error);
+
+    llvm::SubtargetFeatures features;
+    llvm::StringMap<bool> feature_map;
+    if (llvm::sys::getHostCPUFeatures(feature_map))
+        for (auto & f : feature_map)
+            features.AddFeature(f.first(), f.second);
+
+    llvm::TargetOptions options;
+
+    bool jit = true;
+    auto * target_machine = target->createTargetMachine(triple,
+        cpu,
+        features.getString(),
+        options,
+        llvm::None,
+        llvm::None,
+        llvm::CodeGenOpt::Aggressive,
+        jit);
+
+    if (!target_machine)
+        throw Exception(ErrorCodes::CANNOT_COMPILE_CODE, "Cannot create target machine");
+
+    return std::unique_ptr<llvm::TargetMachine>(target_machine);
+}
+
+}
+
+#endif
diff --git a/src/Interpreters/JIT/CHJIT.h b/src/Interpreters/JIT/CHJIT.h
new file mode 100644
index 00000000000..45a8aef50af
--- /dev/null
+++ b/src/Interpreters/JIT/CHJIT.h
@@ -0,0 +1,120 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#    include "config_core.h"
+#endif
+
+#if USE_EMBEDDED_COMPILER
+
+#include <unordered_map>
+#include <atomic>
+
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Module.h>
+#include <llvm/Target/TargetMachine.h>
+
+namespace DB
+{
+
+class JITModuleMemoryManager;
+class JITSymbolResolver;
+class JITCompiler;
+
+/** Custom jit implementation
+  * Main use cases:
+  * 1. Compiled functions in module.
+  * 2. Release memory for compiled functions.
+  *
+  * In LLVM library there are 2 main JIT stacks MCJIT and ORCv2.
+  *
+  * Main reasons for custom implementation vs MCJIT
+  * MCJIT keeps llvm::Module and compiled object code before linking process after module was compiled.
+  * llvm::Module can be removed, but compiled object code cannot be removed. Memory for compiled code
+  * will be release only during MCJIT instance destruction. It is too expensive to create MCJIT
+  * instance for each compiled module.
+  * Also important reason is that if some error occurred during compilation steps, MCJIT can just terminate
+  * our program.
+  *
+  * Main reasons for custom implementation vs ORCv2.
+  * ORC is on request compiler, we do not need support for asynchronous compilation.
+  * It was possible to remove compiled code with ORCv1 but it was deprecated.
+  * In ORCv2 this probably can be done only with custom layer and materialization unit.
+  * But it is inconvenient, discard is only called for materialization units by JITDylib that are not yet materialized.
+  *
+  * CHJIT interface is thread safe, that means all functions can be called from multiple threads and state of CHJIT instance
+  * will not be broken.
+  * It is client responsibility to be sure and do not use compiled code after it was released.
+  */
+class CHJIT
+{
+public:
+    CHJIT();
+
+    ~CHJIT();
+
+    struct CompiledModuleInfo
+    {
+        /// Size of compiled module code in bytes
+        size_t size;
+        /// Module identifier. Should not be changed by client
+        uint64_t identifier;
+        /// Vector of compiled function nameds. Should not be changed by client
+        std::vector<std::string> compiled_functions;
+    };
+
+    /** Compile module. In compile function client responsibility is to fill module with necessary
+      * IR code, then it will be compiled by CHJIT instance.
+      * Return compiled module info.
+      */
+    CompiledModuleInfo compileModule(std::function<void (llvm::Module &)> compile_function);
+
+    /** Delete compiled module. Pointers to functions from module become invalid after this call.
+      * It is client responsibility to be sure that there are no pointers to compiled module code.
+      */
+    void deleteCompiledModule(const CompiledModuleInfo & module_info);
+
+    /** Find compiled function using module_info, and function_name.
+      * It is client responsibility to case result function to right signature.
+      * After call to deleteCompiledModule compiled functions from module become invalid.
+      */
+    void * findCompiledFunction(const CompiledModuleInfo & module_info, const std::string & function_name) const;
+
+    /** Register external symbol for CHJIT instance to use, during linking.
+      * It can be function, or global constant.
+      * It is client responsibility to be sure that address of symbol is valid during CHJIT instance lifetime.
+      */
+    void registerExternalSymbol(const std::string & symbol_name, void * address);
+
+    /** Total compiled code size for module that are currently valid.
+      */
+    inline size_t getCompiledCodeSize() const { return compiled_code_size.load(std::memory_order_relaxed); }
+
+private:
+
+    std::unique_ptr<llvm::Module> createModuleForCompilation();
+
+    CompiledModuleInfo compileModule(std::unique_ptr<llvm::Module> module);
+
+    std::string getMangledName(const std::string & name_to_mangle) const;
+
+    void runOptimizationPassesOnModule(llvm::Module & module) const;
+
+    static std::unique_ptr<llvm::TargetMachine> getTargetMachine();
+
+    llvm::LLVMContext context;
+    std::unique_ptr<llvm::TargetMachine> machine;
+    llvm::DataLayout layout;
+    std::unique_ptr<JITCompiler> compiler;
+    std::unique_ptr<JITSymbolResolver> symbol_resolver;
+
+    std::unordered_map<std::string, void *> name_to_symbol;
+    std::unordered_map<uint64_t, std::unique_ptr<JITModuleMemoryManager>> module_identifier_to_memory_manager;
+    uint64_t current_module_key = 0;
+    std::atomic<size_t> compiled_code_size = 0;
+    mutable std::mutex jit_lock;
+
+};
+
+}
+
+#endif
diff --git a/src/Interpreters/JIT/CompileDAG.cpp b/src/Interpreters/JIT/CompileDAG.cpp
new file mode 100644
index 00000000000..5fc88e7884c
--- /dev/null
+++ b/src/Interpreters/JIT/CompileDAG.cpp
@@ -0,0 +1,180 @@
+#include "CompileDAG.h"
+
+#if USE_EMBEDDED_COMPILER
+
+#include <llvm/IR/BasicBlock.h>
+#include <llvm/IR/Function.h>
+#include <llvm/IR/IRBuilder.h>
+
+#include <Common/SipHash.h>
+#include <Common/FieldVisitors.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/Native.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+llvm::Value * CompileDAG::compile(llvm::IRBuilderBase & builder, Values input_nodes_values) const
+{
+    assert(input_nodes_values.size() == getInputNodesCount());
+
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    PaddedPODArray<llvm::Value *> compiled_values;
+    compiled_values.resize_fill(nodes.size());
+
+    size_t input_nodes_values_index = 0;
+    size_t compiled_values_index = 0;
+
+    size_t dag_size = nodes.size();
+
+    for (size_t i = 0; i < dag_size; ++i)
+    {
+        const auto & node = nodes[i];
+
+        switch (node.type)
+        {
+            case CompileType::CONSTANT:
+            {
+                auto * native_value = getColumnNativeValue(b, node.result_type, *node.column, 0);
+                if (!native_value)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Cannot find native value for constant column with type {}",
+                    node.result_type->getName());
+
+                compiled_values[compiled_values_index] = native_value;
+                break;
+            }
+            case CompileType::FUNCTION:
+            {
+                Values temporary_values;
+                temporary_values.reserve(node.arguments.size());
+
+                for (auto argument_index : node.arguments)
+                {
+                    assert(compiled_values[argument_index] != nullptr);
+                    temporary_values.emplace_back(compiled_values[argument_index]);
+                }
+
+                compiled_values[compiled_values_index] = node.function->compile(builder, temporary_values);
+                break;
+            }
+            case CompileType::INPUT:
+            {
+                compiled_values[compiled_values_index] = input_nodes_values[input_nodes_values_index];
+                ++input_nodes_values_index;
+                break;
+            }
+        }
+
+        ++compiled_values_index;
+    }
+
+    return compiled_values.back();
+}
+
+std::string CompileDAG::dump() const
+{
+    std::vector<std::string> dumped_values;
+    dumped_values.resize(nodes.size());
+
+    size_t dag_size = nodes.size();
+    for (size_t i = 0; i < dag_size; ++i)
+    {
+        const auto & node = nodes[i];
+
+        switch (node.type)
+        {
+            case CompileType::CONSTANT:
+            {
+                const auto * column = typeid_cast<const ColumnConst *>(node.column.get());
+                const auto & data = column->getDataColumn();
+
+                dumped_values[i] = applyVisitor(FieldVisitorToString(), data[0]) + " : " + node.result_type->getName();
+                break;
+            }
+            case CompileType::FUNCTION:
+            {
+                std::string function_dump = node.function->getName();
+                function_dump += '(';
+
+                for (auto argument_index : node.arguments)
+                {
+                    function_dump += dumped_values[argument_index];
+                    function_dump += ", ";
+                }
+
+                if (!node.arguments.empty())
+                {
+                    function_dump.pop_back();
+                    function_dump.pop_back();
+                }
+
+                function_dump += ')';
+
+                dumped_values[i] = std::move(function_dump);
+                break;
+            }
+            case CompileType::INPUT:
+            {
+                dumped_values[i] = node.result_type->getName();
+                break;
+            }
+        }
+    }
+
+    return dumped_values.back();
+}
+
+UInt128 CompileDAG::hash() const
+{
+    SipHash hash;
+    for (const auto & node : nodes)
+    {
+        hash.update(node.type);
+
+        const auto & result_type_name = node.result_type->getName();
+        hash.update(result_type_name.size());
+        hash.update(result_type_name);
+
+        switch (node.type)
+        {
+            case CompileType::CONSTANT:
+            {
+                assert_cast<const ColumnConst *>(node.column.get())->getDataColumn().updateHashWithValue(0, hash);
+                break;
+            }
+            case CompileType::FUNCTION:
+            {
+                const auto & function_name = node.function->getName();
+
+                hash.update(function_name.size());
+                hash.update(function_name);
+
+                for (size_t arg : node.arguments)
+                    hash.update(arg);
+
+                break;
+            }
+            case CompileType::INPUT:
+            {
+                break;
+            }
+        }
+    }
+
+    UInt128 result;
+    hash.get128(result);
+    return result;
+}
+
+}
+
+#endif
diff --git a/src/Interpreters/JIT/CompileDAG.h b/src/Interpreters/JIT/CompileDAG.h
new file mode 100644
index 00000000000..ee9cc5cc83a
--- /dev/null
+++ b/src/Interpreters/JIT/CompileDAG.h
@@ -0,0 +1,89 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#    include "config_core.h"
+#endif
+
+#if USE_EMBEDDED_COMPILER
+
+#include <vector>
+
+#include <Core/Types.h>
+
+#include <Columns/IColumn.h>
+#include <DataTypes/IDataType.h>
+#include <Functions/IFunction.h>
+
+namespace llvm
+{
+    class Value;
+    class IRBuilderBase;
+}
+
+namespace DB
+{
+
+/** This class is needed to compile part of ActionsDAG.
+  * For example we have expression (a + 1) + (b + 1) in actions dag.
+  * It must be added into CompileDAG in order of compile evaluation.
+  * Node a, Constant 1, Function add(a + 1), Input b, Constant 1, Function add(b, 1), Function add(add(a + 1), add(a + 1)).
+  *
+  * Compile function must be called with input_nodes_values equal to input nodes count.
+  * When compile method is called added nodes are compiled in order.
+  */
+class CompileDAG
+{
+public:
+
+    enum class CompileType
+    {
+        INPUT = 0,
+        CONSTANT = 1,
+        FUNCTION = 2,
+    };
+
+    struct Node
+    {
+        CompileType type;
+        DataTypePtr result_type;
+
+        /// For CONSTANT
+        ColumnPtr column;
+
+        /// For FUNCTION
+        FunctionBasePtr function;
+        std::vector<size_t> arguments;
+    };
+
+    llvm::Value * compile(llvm::IRBuilderBase & builder, Values input_nodes_values) const;
+
+    std::string dump() const;
+
+    UInt128 hash() const;
+
+    void addNode(Node node)
+    {
+        input_nodes_count += (node.type == CompileType::INPUT);
+        nodes.emplace_back(std::move(node));
+    }
+
+    inline size_t getNodesCount() const { return nodes.size(); }
+    inline size_t getInputNodesCount() const { return input_nodes_count; }
+
+    inline Node & operator[](size_t index) { return nodes[index]; }
+    inline const Node & operator[](size_t index) const { return nodes[index]; }
+
+    inline Node & front() { return nodes.front(); }
+    inline const Node & front() const { return nodes.front(); }
+
+    inline Node & back() { return nodes.back(); }
+    inline const Node & back() const { return nodes.back(); }
+
+private:
+    std::vector<Node> nodes;
+    size_t input_nodes_count = 0;
+};
+
+}
+
+#endif
diff --git a/src/Interpreters/JIT/compileFunction.cpp b/src/Interpreters/JIT/compileFunction.cpp
new file mode 100644
index 00000000000..43f914c715a
--- /dev/null
+++ b/src/Interpreters/JIT/compileFunction.cpp
@@ -0,0 +1,187 @@
+#include "compileFunction.h"
+
+#if USE_EMBEDDED_COMPILER
+
+#include <llvm/IR/BasicBlock.h>
+#include <llvm/IR/Function.h>
+#include <llvm/IR/IRBuilder.h>
+
+#include <Common/Stopwatch.h>
+#include <Common/ProfileEvents.h>
+#include <DataTypes/Native.h>
+#include <Interpreters/JIT/CHJIT.h>
+
+namespace
+{
+    struct ColumnDataPlaceholder
+    {
+        llvm::Value * data_init = nullptr; /// first row
+        llvm::Value * null_init = nullptr;
+        llvm::PHINode * data = nullptr; /// current row
+        llvm::PHINode * null = nullptr;
+    };
+}
+
+namespace ProfileEvents
+{
+    extern const Event CompileFunction;
+    extern const Event CompileExpressionsMicroseconds;
+    extern const Event CompileExpressionsBytes;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+ColumnData getColumnData(const IColumn * column)
+{
+    ColumnData result;
+    const bool is_const = isColumnConst(*column);
+
+    if (is_const)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Input columns should not be constant");
+
+    if (const auto * nullable = typeid_cast<const ColumnNullable *>(column))
+    {
+        result.null_data = nullable->getNullMapColumn().getRawData().data;
+        column = & nullable->getNestedColumn();
+    }
+
+    result.data = column->getRawData().data;
+
+    return result;
+}
+
+static void compileFunction(llvm::Module & module, const IFunctionBase & function)
+{
+    /** Algorithm is to create a loop that iterate over ColumnDataRowsSize size_t argument and
+     * over ColumnData data and null_data. On each step compiled expression from function
+     * will be executed over column data and null_data row.
+     */
+    ProfileEvents::increment(ProfileEvents::CompileFunction);
+
+    const auto & arg_types = function.getArgumentTypes();
+
+    llvm::IRBuilder<> b(module.getContext());
+    auto * size_type = b.getIntNTy(sizeof(size_t) * 8);
+    auto * data_type = llvm::StructType::get(b.getInt8PtrTy(), b.getInt8PtrTy());
+    auto * func_type = llvm::FunctionType::get(b.getVoidTy(), { size_type, data_type->getPointerTo() }, /*isVarArg=*/false);
+
+    /// Create function in module
+
+    auto * func = llvm::Function::Create(func_type, llvm::Function::ExternalLinkage, function.getName(), module);
+    auto * args = func->args().begin();
+    llvm::Value * counter_arg = &*args++;
+    llvm::Value * columns_arg = &*args++;
+
+    /// Initialize ColumnDataPlaceholder llvm representation of ColumnData
+
+    auto * entry = llvm::BasicBlock::Create(b.getContext(), "entry", func);
+    b.SetInsertPoint(entry);
+
+    std::vector<ColumnDataPlaceholder> columns(arg_types.size() + 1);
+    for (size_t i = 0; i <= arg_types.size(); ++i)
+    {
+        const auto & type = i == arg_types.size() ? function.getResultType() : arg_types[i];
+        auto * data = b.CreateLoad(data_type, b.CreateConstInBoundsGEP1_32(data_type, columns_arg, i));
+        columns[i].data_init = b.CreatePointerCast(b.CreateExtractValue(data, {0}), toNativeType(b, removeNullable(type))->getPointerTo());
+        columns[i].null_init = type->isNullable() ? b.CreateExtractValue(data, {1}) : nullptr;
+    }
+
+    /// Initialize loop
+
+    auto * loop = llvm::BasicBlock::Create(b.getContext(), "loop", func);
+    b.CreateBr(loop);
+    b.SetInsertPoint(loop);
+
+    auto * counter_phi = b.CreatePHI(counter_arg->getType(), 2);
+    counter_phi->addIncoming(counter_arg, 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);
+        }
+    }
+
+    /// Initialize column row values
+
+    Values arguments;
+    arguments.reserve(arg_types.size());
+
+    for (size_t i = 0; i < arg_types.size(); ++i)
+    {
+        auto & column = columns[i];
+        auto type = arg_types[i];
+
+        auto * value = b.CreateLoad(toNativeType(b, removeNullable(type)), column.data);
+        if (!type->isNullable())
+        {
+            arguments.emplace_back(value);
+            continue;
+        }
+
+        auto * is_null = b.CreateICmpNE(b.CreateLoad(b.getInt8Ty(), column.null), b.getInt8(0));
+        auto * nullable_unitilized = llvm::Constant::getNullValue(toNativeType(b, type));
+        auto * nullable_value = b.CreateInsertValue(b.CreateInsertValue(nullable_unitilized, value, {0}), is_null, {1});
+        arguments.emplace_back(nullable_value);
+    }
+
+    /// Compile values for column rows and store compiled value in result column
+
+    auto * result = function.compile(b, std::move(arguments));
+    if (columns.back().null)
+    {
+        b.CreateStore(b.CreateExtractValue(result, {0}), columns.back().data);
+        b.CreateStore(b.CreateSelect(b.CreateExtractValue(result, {1}), b.getInt8(1), b.getInt8(0)), columns.back().null);
+    }
+    else
+    {
+        b.CreateStore(result, columns.back().data);
+    }
+
+    /// End of loop
+
+    auto * cur_block = b.GetInsertBlock();
+    for (auto & col : columns)
+    {
+        col.data->addIncoming(b.CreateConstInBoundsGEP1_32(nullptr, col.data, 1), cur_block);
+        if (col.null)
+            col.null->addIncoming(b.CreateConstInBoundsGEP1_32(nullptr, col.null, 1), cur_block);
+    }
+
+    counter_phi->addIncoming(b.CreateSub(counter_phi, llvm::ConstantInt::get(size_type, 1)), cur_block);
+
+    auto * end = llvm::BasicBlock::Create(b.getContext(), "end", func);
+    b.CreateCondBr(b.CreateICmpNE(counter_phi, llvm::ConstantInt::get(size_type, 1)), loop, end);
+    b.SetInsertPoint(end);
+    b.CreateRetVoid();
+}
+
+CHJIT::CompiledModuleInfo compileFunction(CHJIT & jit, const IFunctionBase & function)
+{
+    Stopwatch watch;
+
+    auto compiled_module_info = jit.compileModule([&](llvm::Module & module)
+    {
+        compileFunction(module, function);
+    });
+
+    ProfileEvents::increment(ProfileEvents::CompileExpressionsMicroseconds, watch.elapsedMicroseconds());
+    ProfileEvents::increment(ProfileEvents::CompileExpressionsBytes, compiled_module_info.size);
+    ProfileEvents::increment(ProfileEvents::CompileFunction);
+
+    return compiled_module_info;
+}
+
+}
+
+#endif
diff --git a/src/Interpreters/JIT/compileFunction.h b/src/Interpreters/JIT/compileFunction.h
new file mode 100644
index 00000000000..e74d35e7aa8
--- /dev/null
+++ b/src/Interpreters/JIT/compileFunction.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#    include "config_core.h"
+#endif
+
+#if USE_EMBEDDED_COMPILER
+
+#include <Functions/IFunction.h>
+#include <Interpreters/JIT/CHJIT.h>
+
+namespace DB
+{
+
+/** ColumnData structure to pass into compiled function.
+  * data is raw column data.
+  * null_data is null map column raw data.
+  */
+struct ColumnData
+{
+    const char * data = nullptr;
+    const char * null_data = nullptr;
+};
+
+/** Returns ColumnData for column.
+  * If constant column is passed, LOGICAL_ERROR will be thrown.
+  */
+ColumnData getColumnData(const IColumn * column);
+
+using ColumnDataRowsSize = size_t;
+using JITCompiledFunction = void (*)(ColumnDataRowsSize, ColumnData *);
+
+/** Compile function to native jit code using CHJIT instance.
+  * Function is compiled as single module.
+  * After this function execution, code for function will be compiled and can be queried using
+  * findCompiledFunction with function name.
+  * Compiled function can be safely casted to JITCompiledFunction type and must be called with
+  * valid ColumnData and ColumnDataRowsSize.
+  * It is important that ColumnData parameter of JITCompiledFunction is result column,
+  * and will be filled by compiled function.
+  */
+CHJIT::CompiledModuleInfo compileFunction(CHJIT & jit, const IFunctionBase & function);
+
+}
+
+#endif
diff --git a/src/Interpreters/JoinSwitcher.h b/src/Interpreters/JoinSwitcher.h
index 1fd719cd5dc..75ff7bb9b2c 100644
--- a/src/Interpreters/JoinSwitcher.h
+++ b/src/Interpreters/JoinSwitcher.h
@@ -19,6 +19,8 @@ class JoinSwitcher : public IJoin
 public:
     JoinSwitcher(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block_);
 
+    const TableJoin & getTableJoin() const override { return *table_join; }
+
     /// Add block of data from right hand of JOIN into current join object.
     /// If join-in-memory memory limit exceeded switches to join-on-disk and continue with it.
     /// @returns false, if join-on-disk disk limit exceeded
diff --git a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
index 772077ba92a..3cb8004a29f 100644
--- a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
+++ b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
@@ -11,6 +11,7 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTColumnsMatcher.h>
 #include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
 #include <Parsers/ExpressionListParsers.h>
@@ -73,16 +74,29 @@ public:
             }
         }
 
-        void addTableColumns(const String & table_name)
+        using ShouldAddColumnPredicate = std::function<bool (const String&)>;
+
+        /// Add columns from table with table_name into select expression list
+        /// Use should_add_column_predicate for check if column name should be added
+        /// By default should_add_column_predicate returns true for any column name
+        void addTableColumns(
+            const String & table_name,
+            ShouldAddColumnPredicate should_add_column_predicate = [](const String &) { return true; })
         {
             auto it = table_columns.find(table_name);
             if (it == table_columns.end())
                 throw Exception("Unknown qualified identifier: " + table_name, ErrorCodes::UNKNOWN_IDENTIFIER);
 
             for (const auto & column : it->second)
-                new_select_expression_list->children.push_back(
-                    std::make_shared<ASTIdentifier>(std::vector<String>{it->first, column.name}));
+            {
+                if (should_add_column_predicate(column.name))
+                {
+                    auto identifier = std::make_shared<ASTIdentifier>(std::vector<String>{it->first, column.name});
+                    new_select_expression_list->children.emplace_back(std::move(identifier));
+                }
+            }
         }
+
     };
 
     static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return false; }
@@ -119,6 +133,13 @@ private:
 
                 data.addTableColumns(identifier.name());
             }
+            else if (auto * columns_matcher = child->as<ASTColumnsMatcher>())
+            {
+                has_asterisks = true;
+
+                for (auto & table_name : data.tables_order)
+                    data.addTableColumns(table_name, [&](const String & column_name) { return columns_matcher->isColumnMatching(column_name); });
+            }
             else
                 data.new_select_expression_list->children.push_back(child);
         }
@@ -225,7 +246,7 @@ struct CollectColumnIdentifiersMatcher
             : identifiers(identifiers_)
         {}
 
-        void addIdentirier(const ASTIdentifier & ident)
+        void addIdentifier(const ASTIdentifier & ident)
         {
             for (const auto & aliases : ignored)
                 if (aliases.count(ident.name()))
@@ -267,7 +288,7 @@ struct CollectColumnIdentifiersMatcher
 
     static void visit(const ASTIdentifier & ident, const ASTPtr &, Data & data)
     {
-        data.addIdentirier(ident);
+        data.addIdentifier(ident);
     }
 
     static void visit(const ASTFunction & func, const ASTPtr &, Data & data)
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 17d7949e478..d947a3e2a48 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -1,25 +1,24 @@
 #include <Interpreters/JoinedTables.h>
-#include <Interpreters/TableJoin.h>
-#include <Interpreters/getTableExpressions.h>
-#include <Interpreters/InJoinSubqueriesPreprocessor.h>
+
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/InDepthNodeVisitor.h>
-
-#include <Storages/IStorage.h>
-#include <Storages/ColumnsDescription.h>
-#include <Storages/StorageValues.h>
-#include <Storages/StorageJoin.h>
-#include <Storages/StorageDictionary.h>
-
+#include <Interpreters/InJoinSubqueriesPreprocessor.h>
+#include <Interpreters/TableJoin.h>
+#include <Interpreters/getTableExpressions.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
 #include <Parsers/parseQuery.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/IStorage.h>
+#include <Storages/StorageDictionary.h>
+#include <Storages/StorageJoin.h>
+#include <Storages/StorageValues.h>
 
 namespace DB
 {
@@ -129,7 +128,7 @@ using RenameQualifiedIdentifiersVisitor = InDepthNodeVisitor<RenameQualifiedIden
 
 }
 
-JoinedTables::JoinedTables(Context && context_, const ASTSelectQuery & select_query)
+JoinedTables::JoinedTables(ContextPtr context_, const ASTSelectQuery & select_query)
     : context(context_)
     , table_expressions(getTableExpressions(select_query))
     , left_table_expression(extractTableExpression(select_query, 0))
@@ -159,26 +158,26 @@ StoragePtr JoinedTables::getLeftTableStorage()
         return {};
 
     if (isLeftTableFunction())
-        return context.getQueryContext().executeTableFunction(left_table_expression);
+        return context->getQueryContext()->executeTableFunction(left_table_expression);
 
     StorageID table_id = StorageID::createEmpty();
     if (left_db_and_table)
     {
-        table_id = context.resolveStorageID(StorageID(left_db_and_table->database, left_db_and_table->table, left_db_and_table->uuid));
+        table_id = context->resolveStorageID(StorageID(left_db_and_table->database, left_db_and_table->table, left_db_and_table->uuid));
     }
     else /// If the table is not specified - use the table `system.one`.
     {
         table_id = StorageID("system", "one");
     }
 
-    if (auto view_source = context.getViewSource())
+    if (auto view_source = context->getViewSource())
     {
         const auto & storage_values = static_cast<const StorageValues &>(*view_source);
         auto tmp_table_id = storage_values.getStorageID();
         if (tmp_table_id.database_name == table_id.database_name && tmp_table_id.table_name == table_id.table_name)
         {
             /// Read from view source.
-            return context.getViewSource();
+            return context->getViewSource();
         }
     }
 
@@ -192,7 +191,7 @@ bool JoinedTables::resolveTables()
     if (tables_with_columns.size() != table_expressions.size())
         throw Exception("Unexpected tables count", ErrorCodes::LOGICAL_ERROR);
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
     if (settings.joined_subquery_requires_alias && tables_with_columns.size() > 1)
     {
         for (size_t i = 0; i < tables_with_columns.size(); ++i)
@@ -234,7 +233,7 @@ void JoinedTables::rewriteDistributedInAndJoins(ASTPtr & query)
 
     String database;
     if (!renamed_tables.empty())
-        database = context.getCurrentDatabase();
+        database = context->getCurrentDatabase();
 
     for (auto & [subquery, ast_tables] : renamed_tables)
     {
@@ -254,8 +253,8 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     if (tables_with_columns.size() < 2)
         return {};
 
-    auto settings = context.getSettingsRef();
-    auto table_join = std::make_shared<TableJoin>(settings, context.getTemporaryVolume());
+    auto settings = context->getSettingsRef();
+    auto table_join = std::make_shared<TableJoin>(settings, context->getTemporaryVolume());
 
     const ASTTablesInSelectQueryElement * ast_join = select_query.join();
     const auto & table_to_join = ast_join->table_expression->as<ASTTableExpression &>();
@@ -263,7 +262,7 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     /// TODO This syntax does not support specifying a database name.
     if (table_to_join.database_and_table_name)
     {
-        auto joined_table_id = context.resolveStorageID(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)
         {
diff --git a/src/Interpreters/JoinedTables.h b/src/Interpreters/JoinedTables.h
index 812808fed61..52eb71e419d 100644
--- a/src/Interpreters/JoinedTables.h
+++ b/src/Interpreters/JoinedTables.h
@@ -22,11 +22,11 @@ using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 class JoinedTables
 {
 public:
-    JoinedTables(Context && context, const ASTSelectQuery & select_query);
+    JoinedTables(ContextPtr context, const ASTSelectQuery & select_query);
 
     void reset(const ASTSelectQuery & select_query)
     {
-        *this = JoinedTables(std::move(context), select_query);
+        *this = JoinedTables(Context::createCopy(context), select_query);
     }
 
     StoragePtr getLeftTableStorage();
@@ -48,7 +48,7 @@ public:
     std::unique_ptr<InterpreterSelectWithUnionQuery> makeLeftTableSubquery(const SelectQueryOptions & select_options);
 
 private:
-    Context context;
+    ContextPtr context;
     std::vector<const ASTTableExpression *> table_expressions;
     TablesWithColumns tables_with_columns;
 
diff --git a/src/Interpreters/MergeJoin.h b/src/Interpreters/MergeJoin.h
index d145a69ce9d..f286e74b385 100644
--- a/src/Interpreters/MergeJoin.h
+++ b/src/Interpreters/MergeJoin.h
@@ -23,6 +23,7 @@ class MergeJoin : public IJoin
 public:
     MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block);
 
+    const TableJoin & getTableJoin() const override { return *table_join; }
     bool addJoinedBlock(const Block & block, bool check_limits) override;
     void joinBlock(Block &, ExtraBlockPtr & not_processed) override;
     void joinTotals(Block &) const override;
diff --git a/src/Interpreters/MonotonicityCheckVisitor.h b/src/Interpreters/MonotonicityCheckVisitor.h
index 87571a44eb0..f0698b27426 100644
--- a/src/Interpreters/MonotonicityCheckVisitor.h
+++ b/src/Interpreters/MonotonicityCheckVisitor.h
@@ -26,7 +26,7 @@ public:
     struct Data
     {
         const TablesWithColumns & tables;
-        const Context & context;
+        ContextConstPtr context;
         const std::unordered_set<String> & group_by_function_hashes;
         Monotonicity monotonicity{true, true, true};
         ASTIdentifier * identifier = nullptr;
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index 3573d48b837..ca0b8257f6e 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -26,6 +26,7 @@
 #include <Parsers/formatAST.h>
 #include <IO/WriteHelpers.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
+#include <DataTypes/NestedUtils.h>
 
 
 namespace DB
@@ -50,7 +51,7 @@ class FirstNonDeterministicFunctionMatcher
 public:
     struct Data
     {
-        const Context & context;
+        ContextPtr context;
         std::optional<String> nondeterministic_function_name;
     };
 
@@ -80,7 +81,7 @@ public:
 
 using FirstNonDeterministicFunctionFinder = InDepthNodeVisitor<FirstNonDeterministicFunctionMatcher, true>;
 
-std::optional<String> findFirstNonDeterministicFunctionName(const MutationCommand & command, const Context & context)
+std::optional<String> findFirstNonDeterministicFunctionName(const MutationCommand & command, ContextPtr context)
 {
     FirstNonDeterministicFunctionMatcher::Data finder_data{context, std::nullopt};
 
@@ -113,7 +114,7 @@ std::optional<String> findFirstNonDeterministicFunctionName(const MutationComman
     return {};
 }
 
-ASTPtr prepareQueryAffectedAST(const std::vector<MutationCommand> & commands, const StoragePtr & storage, const Context & context)
+ASTPtr prepareQueryAffectedAST(const std::vector<MutationCommand> & commands, const StoragePtr & storage, ContextPtr context)
 {
     /// Execute `SELECT count() FROM storage WHERE predicate1 OR predicate2 OR ...` query.
     /// The result can differ from the number of affected rows (e.g. if there is an UPDATE command that
@@ -178,7 +179,7 @@ bool isStorageTouchedByMutations(
     const StoragePtr & storage,
     const StorageMetadataPtr & metadata_snapshot,
     const std::vector<MutationCommand> & commands,
-    Context context_copy)
+    ContextMutablePtr context_copy)
 {
     if (commands.empty())
         return false;
@@ -206,8 +207,8 @@ bool isStorageTouchedByMutations(
     if (all_commands_can_be_skipped)
         return false;
 
-    context_copy.setSetting("max_streams_to_max_threads_ratio", 1);
-    context_copy.setSetting("max_threads", 1);
+    context_copy->setSetting("max_streams_to_max_threads_ratio", 1);
+    context_copy->setSetting("max_threads", 1);
 
     ASTPtr select_query = prepareQueryAffectedAST(commands, storage, context_copy);
 
@@ -232,7 +233,7 @@ bool isStorageTouchedByMutations(
 ASTPtr getPartitionAndPredicateExpressionForMutationCommand(
     const MutationCommand & command,
     const StoragePtr & storage,
-    const Context & context
+    ContextPtr context
 )
 {
     ASTPtr partition_predicate_as_ast_func;
@@ -266,7 +267,7 @@ MutationsInterpreter::MutationsInterpreter(
     StoragePtr storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     MutationCommands commands_,
-    const Context & context_,
+    ContextPtr context_,
     bool can_execute_)
     : storage(std::move(storage_))
     , metadata_snapshot(metadata_snapshot_)
@@ -349,6 +350,35 @@ static void validateUpdateColumns(
     }
 }
 
+/// Returns ASTs of updated nested subcolumns, if all of subcolumns were updated.
+/// They are used to validate sizes of nested arrays.
+/// If some of subcolumns were updated and some weren't,
+/// it makes sense to validate only updated columns with their old versions,
+/// because their sizes couldn't change, since sizes of all nested subcolumns must be consistent.
+static std::optional<std::vector<ASTPtr>> getExpressionsOfUpdatedNestedSubcolumns(
+    const String & column_name,
+    const NamesAndTypesList & all_columns,
+    const std::unordered_map<String, ASTPtr> & column_to_update_expression)
+{
+    std::vector<ASTPtr> res;
+    auto source_name = Nested::splitName(column_name).first;
+
+    /// Check this nested subcolumn
+    for (const auto & column : all_columns)
+    {
+        auto split = Nested::splitName(column.name);
+        if (isArray(column.type) && split.first == source_name && !split.second.empty())
+        {
+            auto it = column_to_update_expression.find(column.name);
+            if (it == column_to_update_expression.end())
+                return {};
+
+            res.push_back(it->second);
+        }
+    }
+
+    return res;
+}
 
 ASTPtr MutationsInterpreter::prepare(bool dry_run)
 {
@@ -361,6 +391,7 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
 
     const ColumnsDescription & columns_desc = metadata_snapshot->getColumns();
     const IndicesDescription & indices_desc = metadata_snapshot->getSecondaryIndices();
+    const ProjectionsDescription & projections_desc = metadata_snapshot->getProjections();
     NamesAndTypesList all_columns = columns_desc.getAllPhysical();
 
     NameSet updated_columns;
@@ -372,8 +403,8 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
         }
     }
 
-    /// We need to know which columns affect which MATERIALIZED columns and data skipping indices
-    /// to recalculate them if dependencies are updated.
+    /// We need to know which columns affect which MATERIALIZED columns, data skipping indices
+    /// and projections to recalculate them if dependencies are updated.
     std::unordered_map<String, Names> column_to_affected_materialized;
     if (!updated_columns.empty())
     {
@@ -394,14 +425,15 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
         validateUpdateColumns(storage, metadata_snapshot, updated_columns, column_to_affected_materialized);
     }
 
-    /// Columns, that we need to read for calculation of skip indices or TTL expressions.
+    /// Columns, that we need to read for calculation of skip indices, projections or TTL expressions.
     auto dependencies = getAllColumnDependencies(metadata_snapshot, updated_columns);
 
     /// First, break a sequence of commands into stages.
-    for (const auto & command : commands)
+    for (auto & command : commands)
     {
         if (command.type == MutationCommand::DELETE)
         {
+            mutation_kind.set(MutationKind::MUTATE_OTHER);
             if (stages.empty() || !stages.back().column_to_updated.empty())
                 stages.emplace_back(context);
 
@@ -410,6 +442,7 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
         }
         else if (command.type == MutationCommand::UPDATE)
         {
+            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.
@@ -438,12 +471,43 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
                 ///
                 /// Outer CAST is added just in case if we don't trust the returning type of 'if'.
 
-                auto type_literal = std::make_shared<ASTLiteral>(columns_desc.getPhysical(column).type->getName());
+                const auto & type = columns_desc.getPhysical(column).type;
+                auto type_literal = std::make_shared<ASTLiteral>(type->getName());
 
                 const auto & update_expr = kv.second;
+
+                ASTPtr condition = getPartitionAndPredicateExpressionForMutationCommand(command);
+
+                /// And new check validateNestedArraySizes for Nested subcolumns
+                if (isArray(type) && !Nested::splitName(column).second.empty())
+                {
+                    std::shared_ptr<ASTFunction> function = nullptr;
+
+                    auto nested_update_exprs = getExpressionsOfUpdatedNestedSubcolumns(column, all_columns, command.column_to_update_expression);
+                    if (!nested_update_exprs)
+                    {
+                        function = makeASTFunction("validateNestedArraySizes",
+                            condition,
+                            update_expr->clone(),
+                            std::make_shared<ASTIdentifier>(column));
+                        condition = makeASTFunction("and", condition, function);
+                    }
+                    else if (nested_update_exprs->size() > 1)
+                    {
+                        function = std::make_shared<ASTFunction>();
+                        function->name = "validateNestedArraySizes";
+                        function->arguments = std::make_shared<ASTExpressionList>();
+                        function->children.push_back(function->arguments);
+                        function->arguments->children.push_back(condition);
+                        for (const auto & it : *nested_update_exprs)
+                            function->arguments->children.push_back(it->clone());
+                        condition = makeASTFunction("and", condition, function);
+                    }
+                }
+
                 auto updated_column = makeASTFunction("CAST",
                     makeASTFunction("if",
-                        getPartitionAndPredicateExpressionForMutationCommand(command),
+                        condition,
                         makeASTFunction("CAST",
                             update_expr->clone(),
                             type_literal),
@@ -469,6 +533,7 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
         }
         else if (command.type == MutationCommand::MATERIALIZE_INDEX)
         {
+            mutation_kind.set(MutationKind::MUTATE_INDEX_PROJECTION);
             auto it = std::find_if(
                     std::cbegin(indices_desc), std::end(indices_desc),
                     [&](const IndexDescription & index)
@@ -483,9 +548,29 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
             const auto required_columns = syntax_result->requiredSourceColumns();
             for (const auto & column : required_columns)
                 dependencies.emplace(column, ColumnDependency::SKIP_INDEX);
+            materialized_indices.emplace(command.index_name);
+        }
+        else if (command.type == MutationCommand::MATERIALIZE_PROJECTION)
+        {
+            mutation_kind.set(MutationKind::MUTATE_INDEX_PROJECTION);
+            const auto & projection = projections_desc.get(command.projection_name);
+            for (const auto & column : projection.required_columns)
+                dependencies.emplace(column, ColumnDependency::PROJECTION);
+            materialized_projections.emplace(command.projection_name);
+        }
+        else if (command.type == MutationCommand::DROP_INDEX)
+        {
+            mutation_kind.set(MutationKind::MUTATE_INDEX_PROJECTION);
+            materialized_indices.erase(command.index_name);
+        }
+        else if (command.type == MutationCommand::DROP_PROJECTION)
+        {
+            mutation_kind.set(MutationKind::MUTATE_INDEX_PROJECTION);
+            materialized_projections.erase(command.projection_name);
         }
         else if (command.type == MutationCommand::MATERIALIZE_TTL)
         {
+            mutation_kind.set(MutationKind::MUTATE_OTHER);
             if (metadata_snapshot->hasRowsTTL())
             {
                 for (const auto & column : all_columns)
@@ -510,11 +595,11 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
                         dependencies.insert(dependency);
                 }
 
-                /// Recalc only skip indices of columns, that could be updated by TTL.
+                /// Recalc only skip indices and projections of columns which could be updated by TTL.
                 auto new_dependencies = metadata_snapshot->getColumnDependencies(new_updated_columns);
                 for (const auto & dependency : new_dependencies)
                 {
-                    if (dependency.kind == ColumnDependency::SKIP_INDEX)
+                    if (dependency.kind == ColumnDependency::SKIP_INDEX || dependency.kind == ColumnDependency::PROJECTION)
                         dependencies.insert(dependency);
                 }
 
@@ -528,6 +613,7 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
         }
         else if (command.type == MutationCommand::READ_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.
@@ -539,7 +625,7 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
             throw Exception("Unknown mutation command type: " + DB::toString<int>(command.type), ErrorCodes::UNKNOWN_MUTATION_COMMAND);
     }
 
-    /// We care about affected indices because we also need to rewrite them
+    /// We care about affected indices and projections because we also need to rewrite them
     /// when one of index columns updated or filtered with delete.
     /// The same about columns, that are needed for calculation of TTL expressions.
     if (!dependencies.empty())
@@ -593,7 +679,7 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
                 updated_header = std::make_unique<Block>(pipeline->getHeader());
             }
 
-            /// Special step to recalculate affected indices and TTL expressions.
+            /// Special step to recalculate affected indices, projections and TTL expressions.
             stages.emplace_back(context);
             for (const auto & column : unchanged_columns)
                 stages.back().column_to_updated.emplace(
@@ -649,9 +735,9 @@ ASTPtr MutationsInterpreter::prepareInterpreterSelectQuery(std::vector<Stage> &
             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())
+        if (context->hasQueryContext())
             for (const auto & it : syntax_result->getScalars())
-                context.getQueryContext().addScalar(it.first, it.second);
+                context->getQueryContext()->addScalar(it.first, it.second);
 
         stage.analyzer = std::make_unique<ExpressionAnalyzer>(all_asts, syntax_result, context);
 
@@ -756,7 +842,7 @@ QueryPipelinePtr MutationsInterpreter::addStreamsForLaterStages(const std::vecto
         SubqueriesForSets & subqueries_for_sets = stage.analyzer->getSubqueriesForSets();
         if (!subqueries_for_sets.empty())
         {
-            const Settings & settings = context.getSettingsRef();
+            const Settings & settings = context->getSettingsRef();
             SizeLimits network_transfer_limits(
                     settings.max_rows_to_transfer, settings.max_bytes_to_transfer, settings.transfer_overflow_mode);
             addCreatingSetsStep(plan, std::move(subqueries_for_sets), network_transfer_limits, context);
@@ -780,7 +866,7 @@ void MutationsInterpreter::validate()
     if (!select_interpreter)
         select_interpreter = std::make_unique<InterpreterSelectQuery>(mutation_ast, context, storage, metadata_snapshot, select_limits);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     /// For Replicated* storages mutations cannot employ non-deterministic functions
     /// because that produces inconsistencies between replicas
@@ -884,4 +970,10 @@ bool MutationsInterpreter::isAffectingAllColumns() const
     return stages.back().isAffectingAllColumns(storage_columns);
 }
 
+void MutationsInterpreter::MutationKind::set(const MutationKindEnum & kind)
+{
+    if (mutation_kind < kind)
+        mutation_kind = kind;
+}
+
 }
diff --git a/src/Interpreters/MutationsInterpreter.h b/src/Interpreters/MutationsInterpreter.h
index dcebba5743e..0d91da5613c 100644
--- a/src/Interpreters/MutationsInterpreter.h
+++ b/src/Interpreters/MutationsInterpreter.h
@@ -23,13 +23,13 @@ bool isStorageTouchedByMutations(
     const StoragePtr & storage,
     const StorageMetadataPtr & metadata_snapshot,
     const std::vector<MutationCommand> & commands,
-    Context context_copy
+    ContextMutablePtr context_copy
 );
 
 ASTPtr getPartitionAndPredicateExpressionForMutationCommand(
     const MutationCommand & command,
     const StoragePtr & storage,
-    const Context & context
+    ContextPtr context
 );
 
 /// Create an input stream that will read data from storage and apply mutation commands (UPDATEs, DELETEs, MATERIALIZEs)
@@ -43,7 +43,7 @@ public:
         StoragePtr storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         MutationCommands commands_,
-        const Context & context_,
+        ContextPtr context_,
         bool can_execute_);
 
     void validate();
@@ -59,6 +59,24 @@ public:
     /// Latest mutation stage affects all columns in storage
     bool isAffectingAllColumns() const;
 
+    NameSet grabMaterializedIndices() { return std::move(materialized_indices); }
+
+    NameSet grabMaterializedProjections() { return std::move(materialized_projections); }
+
+    struct MutationKind
+    {
+        enum MutationKindEnum
+        {
+            MUTATE_UNKNOWN,
+            MUTATE_INDEX_PROJECTION,
+            MUTATE_OTHER,
+        } mutation_kind = MUTATE_UNKNOWN;
+
+        void set(const MutationKindEnum & kind);
+    };
+
+    MutationKind::MutationKindEnum getMutationKind() const { return mutation_kind.mutation_kind; }
+
 private:
     ASTPtr prepare(bool dry_run);
 
@@ -74,7 +92,7 @@ private:
     StoragePtr storage;
     StorageMetadataPtr metadata_snapshot;
     MutationCommands commands;
-    Context context;
+    ContextPtr context;
     bool can_execute;
     SelectQueryOptions select_limits;
 
@@ -101,7 +119,7 @@ private:
 
     struct Stage
     {
-        Stage(const Context & context_) : expressions_chain(context_) {}
+        explicit Stage(ContextPtr context_) : expressions_chain(context_) {}
 
         ASTs filters;
         std::unordered_map<String, ASTPtr> column_to_updated;
@@ -125,6 +143,11 @@ private:
     std::unique_ptr<Block> updated_header;
     std::vector<Stage> stages;
     bool is_prepared = false; /// Has the sequence of stages been prepared.
+
+    NameSet materialized_indices;
+    NameSet materialized_projections;
+
+    MutationKind mutation_kind; /// Do we meet any index or projection mutation.
 };
 
 }
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
index dfc126a6c24..d50aa323ba3 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
@@ -41,7 +41,7 @@ namespace MySQLInterpreter
 {
 
 static inline String resolveDatabase(
-    const String & database_in_query, const String & replica_mysql_database, const String & replica_clickhouse_database, const Context & context)
+    const String & database_in_query, const String & replica_mysql_database, const String & replica_clickhouse_database, ContextPtr context)
 {
     if (!database_in_query.empty())
     {
@@ -63,7 +63,7 @@ static inline String resolveDatabase(
     /// context.getCurrentDatabase() is always return `default database`
     /// When USE replica_mysql_database; CREATE TABLE table_name;
     /// context.getCurrentDatabase() is always return replica_clickhouse_database
-    const String & current_database = context.getCurrentDatabase();
+    const String & current_database = context->getCurrentDatabase();
     return current_database != replica_clickhouse_database ? "" : replica_clickhouse_database;
 }
 
@@ -117,15 +117,15 @@ static inline NamesAndTypesList getColumnsList(ASTExpressionList * columns_defin
     return columns_name_and_type;
 }
 
-static NamesAndTypesList getNames(const ASTFunction & expr, const Context & context, const NamesAndTypesList & columns)
+static NamesAndTypesList getNames(const ASTFunction & expr, ContextPtr context, const NamesAndTypesList & columns)
 {
     if (expr.arguments->children.empty())
         return NamesAndTypesList{};
 
     ASTPtr temp_ast = expr.clone();
     auto syntax = TreeRewriter(context).analyze(temp_ast, columns);
-    auto expression = ExpressionAnalyzer(temp_ast, syntax, context).getActions(false);
-    return expression->getRequiredColumnsWithTypes();
+    auto required_columns = ExpressionAnalyzer(temp_ast, syntax, context).getActionsDAG(false)->getRequiredColumns();
+    return required_columns;
 }
 
 static NamesAndTypesList modifyPrimaryKeysToNonNullable(const NamesAndTypesList & primary_keys, NamesAndTypesList & columns)
@@ -158,7 +158,7 @@ static NamesAndTypesList modifyPrimaryKeysToNonNullable(const NamesAndTypesList
 }
 
 static inline std::tuple<NamesAndTypesList, NamesAndTypesList, NamesAndTypesList, NameSet> getKeys(
-    ASTExpressionList * columns_define, ASTExpressionList * indices_define, const Context & context, NamesAndTypesList & columns)
+    ASTExpressionList * columns_define, ASTExpressionList * indices_define, ContextPtr context, NamesAndTypesList & columns)
 {
     NameSet increment_columns;
     auto keys = makeASTFunction("tuple");
@@ -185,7 +185,7 @@ static inline std::tuple<NamesAndTypesList, NamesAndTypesList, NamesAndTypesList
                     {
                         const auto & prefix_limit = function->arguments->children[0]->as<ASTLiteral>();
 
-                        if (prefix_limit && isInt64FieldType(prefix_limit->value.getType()))
+                        if (prefix_limit && isInt64OrUInt64FieldType(prefix_limit->value.getType()))
                             res->children.back() = std::make_shared<ASTIdentifier>(function->name);
                     }
                 }
@@ -370,7 +370,7 @@ static ASTPtr getOrderByPolicy(
     return order_by_expression;
 }
 
-void InterpreterCreateImpl::validate(const InterpreterCreateImpl::TQuery & create_query, const Context &)
+void InterpreterCreateImpl::validate(const InterpreterCreateImpl::TQuery & create_query, ContextPtr)
 {
     /// This is dangerous, because the like table may not exists in ClickHouse
     if (create_query.like_table)
@@ -383,7 +383,7 @@ void InterpreterCreateImpl::validate(const InterpreterCreateImpl::TQuery & creat
 }
 
 ASTs InterpreterCreateImpl::getRewrittenQueries(
-    const TQuery & create_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const TQuery & create_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     auto rewritten_query = std::make_shared<ASTCreateQuery>();
     if (resolveDatabase(create_query.database, mysql_database, mapped_to_database, context) != mapped_to_database)
@@ -453,12 +453,12 @@ ASTs InterpreterCreateImpl::getRewrittenQueries(
     return ASTs{rewritten_query};
 }
 
-void InterpreterDropImpl::validate(const InterpreterDropImpl::TQuery & /*query*/, const Context & /*context*/)
+void InterpreterDropImpl::validate(const InterpreterDropImpl::TQuery & /*query*/, ContextPtr /*context*/)
 {
 }
 
 ASTs InterpreterDropImpl::getRewrittenQueries(
-    const InterpreterDropImpl::TQuery & drop_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const InterpreterDropImpl::TQuery & drop_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     const auto & database_name = resolveDatabase(drop_query.database, mysql_database, mapped_to_database, context);
 
@@ -471,14 +471,14 @@ ASTs InterpreterDropImpl::getRewrittenQueries(
     return ASTs{rewritten_query};
 }
 
-void InterpreterRenameImpl::validate(const InterpreterRenameImpl::TQuery & rename_query, const Context & /*context*/)
+void InterpreterRenameImpl::validate(const InterpreterRenameImpl::TQuery & rename_query, ContextPtr /*context*/)
 {
     if (rename_query.exchange)
         throw Exception("Cannot execute exchange for external ddl query.", ErrorCodes::NOT_IMPLEMENTED);
 }
 
 ASTs InterpreterRenameImpl::getRewrittenQueries(
-    const InterpreterRenameImpl::TQuery & rename_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const InterpreterRenameImpl::TQuery & rename_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     ASTRenameQuery::Elements elements;
     for (const auto & rename_element : rename_query.elements)
@@ -507,12 +507,12 @@ ASTs InterpreterRenameImpl::getRewrittenQueries(
     return ASTs{rewritten_query};
 }
 
-void InterpreterAlterImpl::validate(const InterpreterAlterImpl::TQuery & /*query*/, const Context & /*context*/)
+void InterpreterAlterImpl::validate(const InterpreterAlterImpl::TQuery & /*query*/, ContextPtr /*context*/)
 {
 }
 
 ASTs InterpreterAlterImpl::getRewrittenQueries(
-    const InterpreterAlterImpl::TQuery & alter_query, const Context & context, const String & mapped_to_database, const String & mysql_database)
+    const InterpreterAlterImpl::TQuery & alter_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     if (resolveDatabase(alter_query.database, mysql_database, mapped_to_database, context) != mapped_to_database)
         return {};
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
index 497a661cc7f..1efbe8ee744 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h
@@ -1,62 +1,66 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
-#include <Parsers/queryToString.h>
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/executeQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTRenameQuery.h>
+#include <Parsers/IAST_fwd.h>
 #include <Parsers/MySQL/ASTAlterQuery.h>
 #include <Parsers/MySQL/ASTCreateQuery.h>
+#include <Parsers/queryToString.h>
 
 namespace DB
 {
 
 namespace MySQLInterpreter
 {
+    struct InterpreterDropImpl
+    {
+        using TQuery = ASTDropQuery;
 
-struct InterpreterDropImpl
-{
-    using TQuery = ASTDropQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
+        static ASTs getRewrittenQueries(
+            const TQuery & drop_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
-    static ASTs getRewrittenQueries(const TQuery & drop_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+    struct InterpreterAlterImpl
+    {
+        using TQuery = MySQLParser::ASTAlterQuery;
 
-struct InterpreterAlterImpl
-{
-    using TQuery = MySQLParser::ASTAlterQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
+        static ASTs getRewrittenQueries(
+            const TQuery & alter_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
-    static ASTs getRewrittenQueries(const TQuery & alter_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+    struct InterpreterRenameImpl
+    {
+        using TQuery = ASTRenameQuery;
 
-struct InterpreterRenameImpl
-{
-    using TQuery = ASTRenameQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
+        static ASTs getRewrittenQueries(
+            const TQuery & rename_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
-    static ASTs getRewrittenQueries(const TQuery & rename_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+    struct InterpreterCreateImpl
+    {
+        using TQuery = MySQLParser::ASTCreateQuery;
 
-struct InterpreterCreateImpl
-{
-    using TQuery = MySQLParser::ASTCreateQuery;
+        static void validate(const TQuery & query, ContextPtr context);
 
-    static void validate(const TQuery & query, const Context & context);
-
-    static ASTs getRewrittenQueries(const TQuery & create_query, const Context & context, const String & mapped_to_database, const String & mysql_database);
-};
+        static ASTs getRewrittenQueries(
+            const TQuery & create_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database);
+    };
 
 template <typename InterpreterImpl>
-class InterpreterMySQLDDLQuery : public IInterpreter
+class InterpreterMySQLDDLQuery : public IInterpreter, WithMutableContext
 {
 public:
-    InterpreterMySQLDDLQuery(const ASTPtr & query_ptr_, Context & context_, const String & mapped_to_database_, const String & mysql_database_)
-        : query_ptr(query_ptr_), context(context_), mapped_to_database(mapped_to_database_), mysql_database(mysql_database_)
+    InterpreterMySQLDDLQuery(
+        const ASTPtr & query_ptr_, ContextMutablePtr context_, const String & mapped_to_database_, const String & mysql_database_)
+        : WithMutableContext(context_), query_ptr(query_ptr_), mapped_to_database(mapped_to_database_), mysql_database(mysql_database_)
     {
     }
 
@@ -64,18 +68,17 @@ public:
     {
         const typename InterpreterImpl::TQuery & query = query_ptr->as<typename InterpreterImpl::TQuery &>();
 
-        InterpreterImpl::validate(query, context);
-        ASTs rewritten_queries = InterpreterImpl::getRewrittenQueries(query, context, mapped_to_database, mysql_database);
+        InterpreterImpl::validate(query, getContext());
+        ASTs rewritten_queries = InterpreterImpl::getRewrittenQueries(query, getContext(), mapped_to_database, mysql_database);
 
         for (const auto & rewritten_query : rewritten_queries)
-            executeQuery("/* Rewritten MySQL DDL Query */ " + queryToString(rewritten_query), context, true);
+            executeQuery("/* Rewritten MySQL DDL Query */ " + queryToString(rewritten_query), getContext(), true);
 
         return BlockIO{};
     }
 
 private:
     ASTPtr query_ptr;
-    Context & context;
     const String mapped_to_database;
     const String mysql_database;
 };
diff --git a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
index 5a82a570db0..77a14e780c5 100644
--- a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
+++ b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
@@ -18,7 +18,7 @@
 
 using namespace DB;
 
-static inline ASTPtr tryRewrittenCreateQuery(const String & query, const Context & context)
+static inline ASTPtr tryRewrittenCreateQuery(const String & query, ContextPtr context)
 {
     ParserExternalDDLQuery external_ddl_parser;
     ASTPtr ast = parseQuery(external_ddl_parser, "EXTERNAL DDL FROM MySQL(test_database, test_database) " + query, 0, 0);
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
index d65755f98ba..798c2f2e376 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
@@ -18,9 +18,9 @@ void NormalizeSelectWithUnionQueryMatcher::getSelectsFromUnionListNode(ASTPtr &
             getSelectsFromUnionListNode(child, selects);
 
         return;
-        }
+    }
 
-        selects.push_back(ast_select);
+    selects.push_back(ast_select);
 }
 
 void NormalizeSelectWithUnionQueryMatcher::visit(ASTPtr & ast, Data & data)
diff --git a/src/Interpreters/OpenTelemetrySpanLog.cpp b/src/Interpreters/OpenTelemetrySpanLog.cpp
index f9ae6518af0..727a60f2260 100644
--- a/src/Interpreters/OpenTelemetrySpanLog.cpp
+++ b/src/Interpreters/OpenTelemetrySpanLog.cpp
@@ -8,6 +8,9 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeUUID.h>
 
+#include <Common/hex.h>
+
+
 namespace DB
 {
 
@@ -43,7 +46,7 @@ void OpenTelemetrySpanLogElement::appendToBlock(MutableColumns & columns) const
 {
     size_t i = 0;
 
-    columns[i++]->insert(UInt128(Int128(trace_id)));
+    columns[i++]->insert(trace_id);
     columns[i++]->insert(span_id);
     columns[i++]->insert(parent_span_id);
     columns[i++]->insert(operation_name);
@@ -79,10 +82,8 @@ OpenTelemetrySpanHolder::OpenTelemetrySpanHolder(const std::string & _operation_
     auto & thread = CurrentThread::get();
 
     trace_id = thread.thread_trace_context.trace_id;
-    if (!trace_id)
-    {
+    if (trace_id == UUID())
         return;
-    }
 
     parent_span_id = thread.thread_trace_context.span_id;
     span_id = thread_local_rng();
@@ -98,10 +99,8 @@ OpenTelemetrySpanHolder::~OpenTelemetrySpanHolder()
 {
     try
     {
-        if (!trace_id)
-        {
+        if (trace_id == UUID())
             return;
-        }
 
         // First of all, return old value of current span.
         auto & thread = CurrentThread::get();
@@ -116,7 +115,7 @@ OpenTelemetrySpanHolder::~OpenTelemetrySpanHolder()
             return;
         }
 
-        auto * context = thread_group->query_context;
+        auto context = thread_group->query_context.lock();
         if (!context)
         {
             // Both global and query contexts can be null when executing a
@@ -145,18 +144,31 @@ OpenTelemetrySpanHolder::~OpenTelemetrySpanHolder()
 }
 
 
+template <typename T>
+static T readHex(const char * data)
+{
+    T x{};
+
+    const char * end = data + sizeof(T) * 2;
+    while (data < end)
+    {
+        x *= 16;
+        x += unhex(*data);
+        ++data;
+    }
+
+    return x;
+}
+
+
 bool OpenTelemetryTraceContext::parseTraceparentHeader(const std::string & traceparent,
     std::string & error)
 {
     trace_id = 0;
 
-    uint8_t version = -1;
-    uint64_t trace_id_high = 0;
-    uint64_t trace_id_low = 0;
-
     // Version 00, which is the only one we can parse, is fixed width. Use this
     // fact for an additional sanity check.
-    const int expected_length = 2 + 1 + 32 + 1 + 16 + 1 + 2;
+    const int expected_length = strlen("xx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxx-xx");
     if (traceparent.length() != expected_length)
     {
         error = fmt::format("unexpected length {}, expected {}",
@@ -164,30 +176,10 @@ bool OpenTelemetryTraceContext::parseTraceparentHeader(const std::string & trace
         return false;
     }
 
-    // clang-tidy doesn't like sscanf:
-    //   error: 'sscanf' used to convert a string to an unsigned integer value,
-    //   but function will not report conversion errors; consider using 'strtoul'
-    //   instead [cert-err34-c,-warnings-as-errors]
-    // There is no other ready solution, and hand-rolling a more complicated
-    // parser for an HTTP header in C++ sounds like RCE.
-    // NOLINTNEXTLINE(cert-err34-c)
-    int result = sscanf(&traceparent[0],
-        "%2" SCNx8 "-%16" SCNx64 "%16" SCNx64 "-%16" SCNx64 "-%2" SCNx8,
-        &version, &trace_id_high, &trace_id_low, &span_id, &trace_flags);
+    const char * data = traceparent.data();
 
-    if (result == EOF)
-    {
-        error = "EOF";
-        return false;
-    }
-
-    // We read uint128 as two uint64, so 5 parts and not 4.
-    if (result != 5)
-    {
-        error = fmt::format("could only read {} parts instead of the expected 5",
-            result);
-        return false;
-    }
+    uint8_t version = readHex<uint8_t>(data);
+    data += 2;
 
     if (version != 0)
     {
@@ -195,8 +187,35 @@ bool OpenTelemetryTraceContext::parseTraceparentHeader(const std::string & trace
         return false;
     }
 
-    trace_id = static_cast<__uint128_t>(trace_id_high) << 64
-        | trace_id_low;
+    if (*data != '-')
+    {
+        error = fmt::format("Malformed traceparant header: {}", traceparent);
+        return false;
+    }
+
+    ++data;
+    UInt128 trace_id_128 = readHex<UInt128>(data);
+    trace_id = trace_id_128;
+    data += 32;
+
+    if (*data != '-')
+    {
+        error = fmt::format("Malformed traceparant header: {}", traceparent);
+        return false;
+    }
+
+    ++data;
+    span_id = readHex<UInt64>(data);
+    data += 16;
+
+    if (*data != '-')
+    {
+        error = fmt::format("Malformed traceparant header: {}", traceparent);
+        return false;
+    }
+
+    ++data;
+    trace_flags = readHex<UInt8>(data);
     return true;
 }
 
@@ -205,7 +224,7 @@ std::string OpenTelemetryTraceContext::composeTraceparentHeader() const
 {
     // This span is a parent for its children, so we specify this span_id as a
     // parent id.
-    return fmt::format("00-{:032x}-{:016x}-{:02x}", trace_id,
+    return fmt::format("00-{:032x}-{:016x}-{:02x}", __uint128_t(trace_id.toUnderType()),
         span_id,
         // This cast is needed because fmt is being weird and complaining that
         // "mixing character types is not allowed".
diff --git a/src/Interpreters/OpenTelemetrySpanLog.h b/src/Interpreters/OpenTelemetrySpanLog.h
index f74e1f0c9fd..861293b4f98 100644
--- a/src/Interpreters/OpenTelemetrySpanLog.h
+++ b/src/Interpreters/OpenTelemetrySpanLog.h
@@ -7,7 +7,7 @@ namespace DB
 
 struct OpenTelemetrySpan
 {
-    __uint128_t trace_id;
+    UUID trace_id;
     UInt64 span_id;
     UInt64 parent_span_id;
     std::string operation_name;
diff --git a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
new file mode 100644
index 00000000000..399def00006
--- /dev/null
+++ b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
@@ -0,0 +1,124 @@
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <DataTypes/FieldToDataType.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
+
+namespace
+{
+
+using namespace DB;
+
+Field executeFunctionOnField(
+    const Field & field, const std::string & name,
+    const ExpressionActionsPtr & sharding_expr,
+    const std::string & sharding_key_column_name)
+{
+    DataTypePtr type = applyVisitor(FieldToDataType{}, field);
+
+    ColumnWithTypeAndName column;
+    column.column = type->createColumnConst(1, field);
+    column.name = name;
+    column.type = type;
+
+    Block block{column};
+    size_t num_rows = 1;
+    sharding_expr->execute(block, num_rows);
+
+    ColumnWithTypeAndName & ret = block.getByName(sharding_key_column_name);
+    return (*ret.column)[0];
+}
+
+/// @param sharding_column_value - one of values from IN
+/// @param sharding_column_name - name of that column
+/// @param sharding_expr - expression of sharding_key for the Distributed() table
+/// @param sharding_key_column_name - name of the column for sharding_expr
+/// @param shard_info - info for the current shard (to compare shard_num with calculated)
+/// @param slots - weight -> shard mapping
+/// @return true if shard may contain such value (or it is unknown), otherwise false.
+bool shardContains(
+    const Field & sharding_column_value,
+    const std::string & sharding_column_name,
+    const ExpressionActionsPtr & sharding_expr,
+    const std::string & sharding_key_column_name,
+    const Cluster::ShardInfo & shard_info,
+    const Cluster::SlotToShard & slots)
+{
+    /// NULL is not allowed in sharding key,
+    /// so it should be safe to assume that shard cannot contain it.
+    if (sharding_column_value.isNull())
+        return false;
+
+    Field sharding_value = executeFunctionOnField(sharding_column_value, sharding_column_name, sharding_expr, sharding_key_column_name);
+    /// The value from IN can be non-numeric,
+    /// but in this case it should be convertible to numeric type, let's try.
+    sharding_value = convertFieldToType(sharding_value, DataTypeUInt64());
+    /// In case of conversion is not possible (NULL), shard cannot contain the value anyway.
+    if (sharding_value.isNull())
+        return false;
+
+    UInt64 value = sharding_value.get<UInt64>();
+    const auto shard_num = slots[value % slots.size()] + 1;
+    return shard_info.shard_num == shard_num;
+}
+
+}
+
+namespace DB
+{
+
+bool OptimizeShardingKeyRewriteInMatcher::needChildVisit(ASTPtr & /*node*/, const ASTPtr & /*child*/)
+{
+    return true;
+}
+
+void OptimizeShardingKeyRewriteInMatcher::visit(ASTPtr & node, Data & data)
+{
+    if (auto * function = node->as<ASTFunction>())
+        visit(*function, data);
+}
+
+void OptimizeShardingKeyRewriteInMatcher::visit(ASTFunction & function, Data & data)
+{
+    if (function.name != "in")
+        return;
+
+    auto * left = function.arguments->children.front().get();
+    auto * right = function.arguments->children.back().get();
+    auto * identifier = left->as<ASTIdentifier>();
+    if (!identifier)
+        return;
+
+    const auto & sharding_expr = data.sharding_key_expr;
+    const auto & sharding_key_column_name = data.sharding_key_column_name;
+
+    if (!sharding_expr->getRequiredColumnsWithTypes().contains(identifier->name()))
+        return;
+
+    /// NOTE: that we should not take care about empty tuple,
+    /// since after optimize_skip_unused_shards,
+    /// at least one element should match each shard.
+    if (auto * tuple_func = right->as<ASTFunction>(); tuple_func && tuple_func->name == "tuple")
+    {
+        auto * tuple_elements = tuple_func->children.front()->as<ASTExpressionList>();
+        std::erase_if(tuple_elements->children, [&](auto & child)
+        {
+            auto * literal = child->template as<ASTLiteral>();
+            return literal && !shardContains(literal->value, identifier->name(), sharding_expr, sharding_key_column_name, data.shard_info, data.slots);
+        });
+    }
+    else if (auto * tuple_literal = right->as<ASTLiteral>();
+        tuple_literal && tuple_literal->value.getType() == Field::Types::Tuple)
+    {
+        auto & tuple = tuple_literal->value.get<Tuple &>();
+        std::erase_if(tuple, [&](auto & child)
+        {
+            return !shardContains(child, identifier->name(), sharding_expr, sharding_key_column_name, data.shard_info, data.slots);
+        });
+    }
+}
+
+}
diff --git a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h
new file mode 100644
index 00000000000..3087fb844ed
--- /dev/null
+++ b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/Cluster.h>
+
+namespace DB
+{
+
+class ExpressionActions;
+using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
+class ASTFunction;
+
+/// Rewrite `sharding_key IN (...)` for specific shard,
+/// so that it will contain only values that belong to this specific shard.
+///
+/// See also:
+/// - evaluateExpressionOverConstantCondition()
+/// - StorageDistributed::createSelector()
+/// - createBlockSelector()
+struct OptimizeShardingKeyRewriteInMatcher
+{
+    /// Cluster::SlotToShard
+    using SlotToShard = std::vector<UInt64>;
+
+    struct Data
+    {
+        const ExpressionActionsPtr & sharding_key_expr;
+        const std::string & sharding_key_column_name;
+        const Cluster::ShardInfo & shard_info;
+        const Cluster::SlotToShard & slots;
+    };
+
+    static bool needChildVisit(ASTPtr & /*node*/, const ASTPtr & /*child*/);
+    static void visit(ASTPtr & node, Data & data);
+    static void visit(ASTFunction & function, Data & data);
+};
+
+using OptimizeShardingKeyRewriteInVisitor = InDepthNodeVisitor<OptimizeShardingKeyRewriteInMatcher, true>;
+
+}
diff --git a/src/Interpreters/PartLog.cpp b/src/Interpreters/PartLog.cpp
index c180a4dd254..ad4fb60f00c 100644
--- a/src/Interpreters/PartLog.cpp
+++ b/src/Interpreters/PartLog.cpp
@@ -103,7 +103,7 @@ void PartLogElement::appendToBlock(MutableColumns & columns) const
 
 
 bool PartLog::addNewPart(
-    Context & current_context, const MutableDataPartPtr & part, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
+    ContextPtr current_context, const MutableDataPartPtr & part, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
 {
     return addNewParts(current_context, {part}, elapsed_ns, execution_status);
 }
@@ -120,7 +120,7 @@ inline UInt64 time_in_seconds(std::chrono::time_point<std::chrono::system_clock>
 }
 
 bool PartLog::addNewParts(
-    Context & current_context, const PartLog::MutableDataPartsVector & parts, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
+    ContextPtr current_context, const PartLog::MutableDataPartsVector & parts, UInt64 elapsed_ns, const ExecutionStatus & execution_status)
 {
     if (parts.empty())
         return true;
@@ -130,7 +130,7 @@ bool PartLog::addNewParts(
     try
     {
         auto table_id = parts.front()->storage.getStorageID();
-        part_log = current_context.getPartLog(table_id.database_name); // assume parts belong to the same table
+        part_log = current_context->getPartLog(table_id.database_name); // assume parts belong to the same table
         if (!part_log)
             return false;
 
@@ -143,7 +143,7 @@ bool PartLog::addNewParts(
             if (query_id.data && query_id.size)
                 elem.query_id.insert(0, query_id.data, query_id.size);
 
-            elem.event_type = PartLogElement::NEW_PART;
+            elem.event_type = PartLogElement::NEW_PART; //-V1048
 
             // construct event_time and event_time_microseconds using the same time point
             // so that the two times will always be equal up to a precision of a second.
diff --git a/src/Interpreters/PartLog.h b/src/Interpreters/PartLog.h
index c946d6ce85f..edb6ab4a45f 100644
--- a/src/Interpreters/PartLog.h
+++ b/src/Interpreters/PartLog.h
@@ -69,9 +69,9 @@ class PartLog : public SystemLog<PartLogElement>
 
 public:
     /// Add a record about creation of new part.
-    static bool addNewPart(Context & context, const MutableDataPartPtr & part, UInt64 elapsed_ns,
+    static bool addNewPart(ContextPtr context, const MutableDataPartPtr & part, UInt64 elapsed_ns,
                            const ExecutionStatus & execution_status = {});
-    static bool addNewParts(Context & context, const MutableDataPartsVector & parts, UInt64 elapsed_ns,
+    static bool addNewParts(ContextPtr context, const MutableDataPartsVector & parts, UInt64 elapsed_ns,
                             const ExecutionStatus & execution_status = {});
 };
 
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.cpp b/src/Interpreters/PredicateExpressionsOptimizer.cpp
index 476bdaaceea..b3ef2e42e4a 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.cpp
+++ b/src/Interpreters/PredicateExpressionsOptimizer.cpp
@@ -19,11 +19,11 @@ namespace ErrorCodes
 }
 
 PredicateExpressionsOptimizer::PredicateExpressionsOptimizer(
-    const Context & context_, const TablesWithColumns & tables_with_columns_, const Settings & settings)
-    : enable_optimize_predicate_expression(settings.enable_optimize_predicate_expression)
+    ContextConstPtr context_, const TablesWithColumns & tables_with_columns_, const Settings & settings)
+    : WithConstContext(context_)
+    , enable_optimize_predicate_expression(settings.enable_optimize_predicate_expression)
     , enable_optimize_predicate_expression_to_final_subquery(settings.enable_optimize_predicate_expression_to_final_subquery)
     , allow_push_predicate_when_subquery_contains_with(settings.allow_push_predicate_when_subquery_contains_with)
-    , context(context_)
     , tables_with_columns(tables_with_columns_)
 {
 }
@@ -87,7 +87,7 @@ std::vector<ASTs> PredicateExpressionsOptimizer::extractTablesPredicates(const A
 
     for (const auto & predicate_expression : splitConjunctionPredicate({where, prewhere}))
     {
-        ExpressionInfoVisitor::Data expression_info{.context = context, .tables = tables_with_columns};
+        ExpressionInfoVisitor::Data expression_info{WithConstContext{getContext()}, tables_with_columns};
         ExpressionInfoVisitor(expression_info).visit(predicate_expression);
 
         if (expression_info.is_stateful_function
@@ -162,7 +162,7 @@ bool PredicateExpressionsOptimizer::tryRewritePredicatesToTable(ASTPtr & table_e
     {
         auto optimize_final = enable_optimize_predicate_expression_to_final_subquery;
         auto optimize_with = allow_push_predicate_when_subquery_contains_with;
-        PredicateRewriteVisitor::Data data(context, table_predicates, table_columns, optimize_final, optimize_with);
+        PredicateRewriteVisitor::Data data(getContext(), table_predicates, table_columns, optimize_final, optimize_with);
 
         PredicateRewriteVisitor(data).visit(table_element);
         return data.is_rewrite;
@@ -187,7 +187,8 @@ bool PredicateExpressionsOptimizer::tryMovePredicatesFromHavingToWhere(ASTSelect
 
     for (const auto & moving_predicate: splitConjunctionPredicate({select_query.having()}))
     {
-        ExpressionInfoVisitor::Data expression_info{.context = context, .tables = {}};
+        TablesWithColumns tables;
+        ExpressionInfoVisitor::Data expression_info{WithConstContext{getContext()}, tables};
         ExpressionInfoVisitor(expression_info).visit(moving_predicate);
 
         /// TODO: If there is no group by, where, and prewhere expression, we can push down the stateful function
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.h b/src/Interpreters/PredicateExpressionsOptimizer.h
index 223ac1e8998..db580032f73 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.h
+++ b/src/Interpreters/PredicateExpressionsOptimizer.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <Parsers/ASTSelectQuery.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Parsers/ASTSelectQuery.h>
 
 namespace DB
 {
 
-class Context;
 struct Settings;
 
 /** Predicate optimization based on rewriting ast rules
@@ -15,10 +15,10 @@ struct Settings;
  *      - Move predicates from having to where
  *      - Push the predicate down from the current query to the having of the subquery
  */
-class PredicateExpressionsOptimizer
+class PredicateExpressionsOptimizer : WithConstContext
 {
 public:
-    PredicateExpressionsOptimizer(const Context & context_, const TablesWithColumns & tables_with_columns_, const Settings & settings_);
+    PredicateExpressionsOptimizer(ContextConstPtr context_, const TablesWithColumns & tables_with_columns_, const Settings & settings_);
 
     bool optimize(ASTSelectQuery & select_query);
 
@@ -26,7 +26,6 @@ private:
     const bool enable_optimize_predicate_expression;
     const bool enable_optimize_predicate_expression_to_final_subquery;
     const bool allow_push_predicate_when_subquery_contains_with;
-    const Context & context;
     const TablesWithColumns & tables_with_columns;
 
     std::vector<ASTs> extractTablesPredicates(const ASTPtr & where, const ASTPtr & prewhere);
diff --git a/src/Interpreters/PredicateRewriteVisitor.cpp b/src/Interpreters/PredicateRewriteVisitor.cpp
index 6f28b9050df..3dda066c4ac 100644
--- a/src/Interpreters/PredicateRewriteVisitor.cpp
+++ b/src/Interpreters/PredicateRewriteVisitor.cpp
@@ -17,8 +17,16 @@ namespace DB
 {
 
 PredicateRewriteVisitorData::PredicateRewriteVisitorData(
-    const Context & context_, const ASTs & predicates_, const TableWithColumnNamesAndTypes & table_columns_, bool optimize_final_, bool optimize_with_)
-    : context(context_), predicates(predicates_), table_columns(table_columns_), optimize_final(optimize_final_), optimize_with(optimize_with_)
+    ContextConstPtr context_,
+    const ASTs & predicates_,
+    const TableWithColumnNamesAndTypes & table_columns_,
+    bool optimize_final_,
+    bool optimize_with_)
+    : WithConstContext(context_)
+    , predicates(predicates_)
+    , table_columns(table_columns_)
+    , optimize_final(optimize_final_)
+    , optimize_with(optimize_with_)
 {
 }
 
@@ -64,7 +72,9 @@ void PredicateRewriteVisitorData::visitOtherInternalSelect(ASTSelectQuery & sele
     }
 
     const Names & internal_columns = InterpreterSelectQuery(
-        temp_internal_select, context, SelectQueryOptions().analyze()).getSampleBlock().getNames();
+        temp_internal_select,
+        const_pointer_cast<Context>(getContext()),
+        SelectQueryOptions().analyze()).getSampleBlock().getNames();
 
     if (rewriteSubquery(*temp_select_query, internal_columns))
     {
@@ -96,7 +106,7 @@ bool PredicateRewriteVisitorData::rewriteSubquery(ASTSelectQuery & subquery, con
         || (!optimize_with && subquery.with())
         || subquery.withFill()
         || subquery.limitBy() || subquery.limitLength()
-        || hasNonRewritableFunction(subquery.select(), context))
+        || hasNonRewritableFunction(subquery.select(), getContext()))
         return false;
 
     Names outer_columns = table_columns.columns.getNames();
diff --git a/src/Interpreters/PredicateRewriteVisitor.h b/src/Interpreters/PredicateRewriteVisitor.h
index 1132d93a5ec..b4ff063c954 100644
--- a/src/Interpreters/PredicateRewriteVisitor.h
+++ b/src/Interpreters/PredicateRewriteVisitor.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
 
-class PredicateRewriteVisitorData
+class PredicateRewriteVisitorData : WithConstContext
 {
 public:
     bool is_rewrite = false;
@@ -19,17 +20,17 @@ public:
 
     static bool needChild(const ASTPtr & node, const ASTPtr &)
     {
-        if (node && node->as<TypeToVisit>())
-            return false;
-
-        return true;
+        return !(node && node->as<TypeToVisit>());
     }
 
-    PredicateRewriteVisitorData(const Context & context_, const ASTs & predicates_,
-                                const TableWithColumnNamesAndTypes & table_columns_, bool optimize_final_, bool optimize_with_);
+    PredicateRewriteVisitorData(
+        ContextConstPtr context_,
+        const ASTs & predicates_,
+        const TableWithColumnNamesAndTypes & table_columns_,
+        bool optimize_final_,
+        bool optimize_with_);
 
 private:
-    const Context & context;
     const ASTs & predicates;
     const TableWithColumnNamesAndTypes & table_columns;
     bool optimize_final;
@@ -44,4 +45,5 @@ private:
 
 using PredicateRewriteMatcher = OneTypeMatcher<PredicateRewriteVisitorData, PredicateRewriteVisitorData::needChild>;
 using PredicateRewriteVisitor = InDepthNodeVisitor<PredicateRewriteMatcher, true>;
+
 }
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 15bda5d213d..951ff6420c4 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -60,12 +60,12 @@ static bool isUnlimitedQuery(const IAST * ast)
 }
 
 
-ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * ast, Context & query_context)
+ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * ast, ContextPtr query_context)
 {
     EntryPtr res;
 
-    const ClientInfo & client_info = query_context.getClientInfo();
-    const Settings & settings = query_context.getSettingsRef();
+    const ClientInfo & client_info = query_context->getClientInfo();
+    const Settings & settings = query_context->getSettingsRef();
 
     if (client_info.current_query_id.empty())
         throw Exception("Query id cannot be empty", ErrorCodes::LOGICAL_ERROR);
@@ -174,12 +174,10 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
         }
 
         auto process_it = processes.emplace(processes.end(),
-            query_, client_info, priorities.insert(settings.priority));
+            query_context, query_, client_info, priorities.insert(settings.priority));
 
         res = std::make_shared<Entry>(*this, process_it);
 
-        process_it->query_context = &query_context;
-
         ProcessListForUser & user_process_list = user_to_queries[client_info.current_user];
         user_process_list.queries.emplace(client_info.current_query_id, &res->get());
 
@@ -201,7 +199,7 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
             /// Set query-level memory trackers
             thread_group->memory_tracker.setOrRaiseHardLimit(settings.max_memory_usage);
 
-            if (query_context.hasTraceCollector())
+            if (query_context->hasTraceCollector())
             {
                 /// Set up memory profiling
                 thread_group->memory_tracker.setOrRaiseProfilerLimit(settings.memory_profiler_step);
@@ -290,14 +288,12 @@ ProcessListEntry::~ProcessListEntry()
 
 
 QueryStatus::QueryStatus(
-    const String & query_,
-    const ClientInfo & client_info_,
-    QueryPriorities::Handle && priority_handle_)
-    :
-    query(query_),
-    client_info(client_info_),
-    priority_handle(std::move(priority_handle_)),
-    num_queries_increment{CurrentMetrics::Query}
+    ContextPtr context_, const String & query_, const ClientInfo & client_info_, QueryPriorities::Handle && priority_handle_)
+    : WithContext(context_)
+    , query(query_)
+    , client_info(client_info_)
+    , priority_handle(std::move(priority_handle_))
+    , num_queries_increment{CurrentMetrics::Query}
 {
 }
 
@@ -454,10 +450,10 @@ QueryStatusInfo QueryStatus::getInfo(bool get_thread_list, bool get_profile_even
             res.profile_counters = std::make_shared<ProfileEvents::Counters>(thread_group->performance_counters.getPartiallyAtomicSnapshot());
     }
 
-    if (get_settings && query_context)
+    if (get_settings && getContext())
     {
-        res.query_settings = std::make_shared<Settings>(query_context->getSettings());
-        res.current_database = query_context->getCurrentDatabase();
+        res.query_settings = std::make_shared<Settings>(getContext()->getSettings());
+        res.current_database = getContext()->getCurrentDatabase();
     }
 
     return res;
diff --git a/src/Interpreters/ProcessList.h b/src/Interpreters/ProcessList.h
index bc93ce7e191..fca28b031db 100644
--- a/src/Interpreters/ProcessList.h
+++ b/src/Interpreters/ProcessList.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <Core/Defines.h>
 #include <DataStreams/BlockIO.h>
 #include <IO/Progress.h>
@@ -33,7 +32,6 @@ namespace CurrentMetrics
 namespace DB
 {
 
-class Context;
 struct Settings;
 class IAST;
 
@@ -72,7 +70,7 @@ struct QueryStatusInfo
 };
 
 /// Query and information about its execution.
-class QueryStatus
+class QueryStatus : public WithContext
 {
 protected:
     friend class ProcessList;
@@ -83,9 +81,6 @@ protected:
     String query;
     ClientInfo client_info;
 
-    /// Is set once when init
-    Context * query_context = nullptr;
-
     /// Info about all threads involved in query execution
     ThreadGroupStatusPtr thread_group;
 
@@ -128,6 +123,7 @@ protected:
 public:
 
     QueryStatus(
+        ContextPtr context_,
         const String & query_,
         const ClientInfo & client_info_,
         QueryPriorities::Handle && priority_handle_);
@@ -172,9 +168,6 @@ public:
 
     QueryStatusInfo getInfo(bool get_thread_list = false, bool get_profile_events = false, bool get_settings = false) const;
 
-    Context * tryGetQueryContext() { return query_context; }
-    const Context * tryGetQueryContext() const { return query_context; }
-
     /// Copies pointers to in/out streams
     void setQueryStreams(const BlockIO & io);
 
@@ -283,7 +276,7 @@ protected:
 
     /// List of queries
     Container processes;
-    size_t max_size;        /// 0 means no limit. Otherwise, when limit exceeded, an exception is thrown.
+    size_t max_size = 0;        /// 0 means no limit. Otherwise, when limit exceeded, an exception is thrown.
 
     /// Stores per-user info: queries, statistics and limits
     UserToQueries user_to_queries;
@@ -305,7 +298,7 @@ public:
       * If timeout is passed - throw an exception.
       * Don't count KILL QUERY queries.
       */
-    EntryPtr insert(const String & query_, const IAST * ast, Context & query_context);
+    EntryPtr insert(const String & query_, const IAST * ast, ContextPtr query_context);
 
     /// Number of currently executing queries.
     size_t size() const { return processes.size(); }
diff --git a/src/Interpreters/QueryAliasesVisitor.cpp b/src/Interpreters/QueryAliasesVisitor.cpp
index d395bfc20e9..bd0b2e88d2f 100644
--- a/src/Interpreters/QueryAliasesVisitor.cpp
+++ b/src/Interpreters/QueryAliasesVisitor.cpp
@@ -15,15 +15,22 @@ namespace ErrorCodes
     extern const int MULTIPLE_EXPRESSIONS_FOR_ALIAS;
 }
 
-static String wrongAliasMessage(const ASTPtr & ast, const ASTPtr & prev_ast, const String & alias)
+namespace
 {
-    WriteBufferFromOwnString message;
-    message << "Different expressions with the same alias " << backQuoteIfNeed(alias) << ":\n";
-    formatAST(*ast, message, false, true);
-    message << "\nand\n";
-    formatAST(*prev_ast, message, false, true);
-    message << '\n';
-    return message.str();
+
+    constexpr auto dummy_subquery_name_prefix = "_subquery";
+
+    String wrongAliasMessage(const ASTPtr & ast, const ASTPtr & prev_ast, const String & alias)
+    {
+        WriteBufferFromOwnString message;
+        message << "Different expressions with the same alias " << backQuoteIfNeed(alias) << ":\n";
+        formatAST(*ast, message, false, true);
+        message << "\nand\n";
+        formatAST(*prev_ast, message, false, true);
+        message << '\n';
+        return message.str();
+    }
+
 }
 
 
@@ -99,7 +106,7 @@ void QueryAliasesMatcher<T>::visit(const ASTSubquery & const_subquery, const AST
         String alias;
         do
         {
-            alias = "_subquery" + std::to_string(++subquery_index);
+            alias = dummy_subquery_name_prefix + std::to_string(++subquery_index);
         }
         while (aliases.count(alias));
 
@@ -124,6 +131,30 @@ void QueryAliasesMatcher<T>::visitOther(const ASTPtr & ast, Data & data)
 
         aliases[alias] = ast;
     }
+
+    /** QueryAliasesVisitor is executed before ExecuteScalarSubqueriesVisitor.
+        For example we have subquery in our query (SELECT sum(number) FROM numbers(10)).
+
+        After running QueryAliasesVisitor it will be (SELECT sum(number) FROM numbers(10)) as _subquery_1
+        and prefer_alias_to_column_name for this subquery will be true.
+
+        After running ExecuteScalarSubqueriesVisitor it will be converted to (45 as _subquery_1)
+        and prefer_alias_to_column_name for ast literal will be true.
+
+        But if we send such query on remote host with Distributed engine for example we cannot send prefer_alias_to_column_name
+        information for our ast node with query string. And this alias will be dropped because prefer_alias_to_column_name for ASTWIthAlias
+        by default is false.
+
+        It is imporant that subquery can be converted to literal during ExecuteScalarSubqueriesVisitor.
+        And code below check if we previously set for subquery alias as _subquery, and if it is true
+        then set prefer_alias_to_column_name = true for node that was optimized during ExecuteScalarSubqueriesVisitor.
+     */
+
+    if (auto * ast_with_alias = dynamic_cast<ASTWithAlias *>(ast.get()))
+    {
+        if (startsWith(alias, dummy_subquery_name_prefix))
+            ast_with_alias->prefer_alias_to_column_name = true;
+    }
 }
 
 /// Explicit template instantiations
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index b6902468242..1242af48676 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -63,6 +63,8 @@ Block QueryLogElement::createBlock()
             std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())), "tables"},
         {std::make_shared<DataTypeArray>(
             std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())), "columns"},
+        {std::make_shared<DataTypeArray>(
+            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())), "projections"},
         {std::make_shared<DataTypeInt32>(),                                   "exception_code"},
         {std::make_shared<DataTypeString>(),                                  "exception"},
         {std::make_shared<DataTypeString>(),                                  "stack_trace"},
@@ -144,6 +146,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         auto & column_databases = typeid_cast<ColumnArray &>(*columns[i++]);
         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 fill_column = [](const std::set<String> & data, ColumnArray & column)
         {
@@ -160,6 +163,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         fill_column(query_databases, column_databases);
         fill_column(query_tables, column_tables);
         fill_column(query_columns, column_columns);
+        fill_column(query_projections, column_projections);
     }
 
     columns[i++]->insert(exception_code);
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index 8617a8d1cbc..684a635a920 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -57,6 +57,7 @@ struct QueryLogElement
     std::set<String> query_databases;
     std::set<String> query_tables;
     std::set<String> query_columns;
+    std::set<String> query_projections;
 
     std::unordered_set<String> used_aggregate_functions;
     std::unordered_set<String> used_aggregate_function_combinators;
diff --git a/src/Interpreters/QueryNormalizer.cpp b/src/Interpreters/QueryNormalizer.cpp
index 0a2e6505558..7fef203aea6 100644
--- a/src/Interpreters/QueryNormalizer.cpp
+++ b/src/Interpreters/QueryNormalizer.cpp
@@ -138,18 +138,8 @@ void QueryNormalizer::visit(ASTSelectQuery & select, const ASTPtr &, Data & data
 {
     for (auto & child : select.children)
     {
-        if (child == select.groupBy() || child == select.orderBy() || child == select.having())
-        {
-            bool old_setting = data.settings.prefer_column_name_to_alias;
-            data.settings.prefer_column_name_to_alias = false;
+        if (needVisitChild(child))
             visit(child, data);
-            data.settings.prefer_column_name_to_alias = old_setting;
-        }
-        else
-        {
-            if (needVisitChild(child))
-                visit(child, data);
-        }
     }
 
     /// If the WHERE clause or HAVING consists of a single alias, the reference must be replaced not only in children,
@@ -248,6 +238,8 @@ void QueryNormalizer::visit(ASTPtr & ast, Data & data)
 
     current_asts.erase(initial_ast.get());
     current_asts.erase(ast.get());
+    if (data.ignore_alias && !ast->tryGetAlias().empty())
+        ast->setAlias("");
     finished_asts[initial_ast] = ast;
 
     /// @note can not place it in CheckASTDepth dtor cause of exception.
diff --git a/src/Interpreters/QueryNormalizer.h b/src/Interpreters/QueryNormalizer.h
index 3dcccea1cfb..5cb12c255c2 100644
--- a/src/Interpreters/QueryNormalizer.h
+++ b/src/Interpreters/QueryNormalizer.h
@@ -48,12 +48,14 @@ public:
         MapOfASTs finished_asts;    /// already processed vertices (and by what they replaced)
         SetOfASTs current_asts;     /// vertices in the current call stack of this method
         std::string current_alias;  /// the alias referencing to the ancestor of ast (the deepest ancestor with aliases)
+        bool ignore_alias; /// normalize query without any aliases
 
-        Data(const Aliases & aliases_, const NameSet & source_columns_set_, ExtractedSettings && settings_)
+        Data(const Aliases & aliases_, const NameSet & source_columns_set_, bool ignore_alias_, ExtractedSettings && settings_)
             : aliases(aliases_)
             , source_columns_set(source_columns_set_)
             , settings(settings_)
             , level(0)
+            , ignore_alias(ignore_alias_)
         {}
     };
 
diff --git a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
index d737e877f01..04ac1607b60 100644
--- a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
+++ b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
@@ -16,7 +16,7 @@ public:
     struct Data
     {
         std::unordered_set<String> & keys;
-        const Context & context;
+        ContextConstPtr context;
         bool redundant = true;
         bool done = false;
 
diff --git a/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp b/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
index ae575b8aae7..e242eab919a 100644
--- a/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
+++ b/src/Interpreters/RemoveInjectiveFunctionsVisitor.cpp
@@ -12,11 +12,12 @@ namespace DB
 static bool isUniq(const ASTFunction & func)
 {
     return func.name == "uniq" || func.name == "uniqExact" || func.name == "uniqHLL12"
-        || func.name == "uniqCombined" || func.name == "uniqCombined64";
+        || func.name == "uniqCombined" || func.name == "uniqCombined64"
+        || func.name == "uniqTheta";
 }
 
 /// Remove injective functions of one argument: replace with a child
-static bool removeInjectiveFunction(ASTPtr & ast, const Context & context, const FunctionFactory & function_factory)
+static bool removeInjectiveFunction(ASTPtr & ast, ContextConstPtr context, const FunctionFactory & function_factory)
 {
     const ASTFunction * func = ast->as<ASTFunction>();
     if (!func)
@@ -46,7 +47,7 @@ void RemoveInjectiveFunctionsMatcher::visit(ASTFunction & func, ASTPtr &, const
 
         for (auto & arg : func.arguments->children)
         {
-            while (removeInjectiveFunction(arg, data.context, function_factory))
+            while (removeInjectiveFunction(arg, data.getContext(), function_factory))
                 ;
         }
     }
diff --git a/src/Interpreters/RemoveInjectiveFunctionsVisitor.h b/src/Interpreters/RemoveInjectiveFunctionsVisitor.h
index 1adde0d35b0..29fd9bb0af5 100644
--- a/src/Interpreters/RemoveInjectiveFunctionsVisitor.h
+++ b/src/Interpreters/RemoveInjectiveFunctionsVisitor.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
@@ -12,9 +13,9 @@ class ASTFunction;
 class RemoveInjectiveFunctionsMatcher
 {
 public:
-    struct Data
+    struct Data : public WithConstContext
     {
-        const Context & context;
+        explicit Data(ContextConstPtr context_) : WithConstContext(context_) {}
     };
 
     static void visit(ASTPtr & ast, const Data & data);
diff --git a/src/Interpreters/RequiredSourceColumnsVisitor.cpp b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
index 54883043d30..2f2a68656bc 100644
--- a/src/Interpreters/RequiredSourceColumnsVisitor.cpp
+++ b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
@@ -51,8 +51,10 @@ bool RequiredSourceColumnsMatcher::needChildVisit(const ASTPtr & node, const AST
 
     if (const auto * f = node->as<ASTFunction>())
     {
+        /// "indexHint" is a special function for index analysis.
+        /// Everything that is inside it is not calculated. See KeyCondition
         /// "lambda" visit children itself.
-        if (f->name == "lambda")
+        if (f->name == "indexHint" || f->name == "lambda")
             return false;
     }
 
diff --git a/src/Interpreters/RewriteSumIfFunctionVisitor.cpp b/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
index 2593c220c63..7b322ca1585 100644
--- a/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
+++ b/src/Interpreters/RewriteSumIfFunctionVisitor.cpp
@@ -29,7 +29,7 @@ void RewriteSumIfFunctionMatcher::visit(const ASTFunction & func, ASTPtr & ast,
     {
         /// sumIf(1, cond) -> countIf(cond)
         const auto * literal = func_arguments[0]->as<ASTLiteral>();
-        if (!literal || !DB::isInt64FieldType(literal->value.getType()))
+        if (!literal || !DB::isInt64OrUInt64FieldType(literal->value.getType()))
             return;
 
         if (func_arguments.size() == 2 && literal->value.get<UInt64>() == 1)
@@ -54,7 +54,7 @@ void RewriteSumIfFunctionMatcher::visit(const ASTFunction & func, ASTPtr & ast,
 
         if (first_literal && second_literal)
         {
-            if (!DB::isInt64FieldType(first_literal->value.getType()) || !DB::isInt64FieldType(second_literal->value.getType()))
+            if (!DB::isInt64OrUInt64FieldType(first_literal->value.getType()) || !DB::isInt64OrUInt64FieldType(second_literal->value.getType()))
                 return;
 
             auto first_value = first_literal->value.get<UInt64>();
diff --git a/src/Interpreters/SelectQueryOptions.h b/src/Interpreters/SelectQueryOptions.h
index b21d27ef5c8..d723dbf4ff6 100644
--- a/src/Interpreters/SelectQueryOptions.h
+++ b/src/Interpreters/SelectQueryOptions.h
@@ -32,6 +32,14 @@ struct SelectQueryOptions
     bool remove_duplicates = false;
     bool ignore_quota = false;
     bool ignore_limits = false;
+    /// This is a temporary flag to avoid adding aggregating step. Used for projections.
+    /// TODO: we need more stages for InterpreterSelectQuery
+    bool ignore_aggregation = false;
+    /// This flag is needed to analyze query ignoring table projections.
+    /// It is needed because we build another one InterpreterSelectQuery while analyzing projections.
+    /// It helps to avoid infinite recursion.
+    bool ignore_projections = false;
+    bool ignore_alias = false;
     bool is_internal = false;
     bool is_subquery = false; // non-subquery can also have subquery_depth > 0, e.g. insert select
 
@@ -83,6 +91,24 @@ struct SelectQueryOptions
         return *this;
     }
 
+    SelectQueryOptions & ignoreProjections(bool value = true)
+    {
+        ignore_projections = value;
+        return *this;
+    }
+
+    SelectQueryOptions & ignoreAggregation(bool value = true)
+    {
+        ignore_aggregation = value;
+        return *this;
+    }
+
+    SelectQueryOptions & ignoreAlias(bool value = true)
+    {
+        ignore_alias = value;
+        return *this;
+    }
+
     SelectQueryOptions & setInternal(bool value = false)
     {
         is_internal = value;
diff --git a/src/Interpreters/Set.cpp b/src/Interpreters/Set.cpp
index b150eabda65..65896edfa69 100644
--- a/src/Interpreters/Set.cpp
+++ b/src/Interpreters/Set.cpp
@@ -1,8 +1,6 @@
 #include <optional>
 
 #include <Core/Field.h>
-#include <Common/FieldVisitors.h>
-#include <Core/Row.h>
 
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Interpreters/SetVariants.cpp b/src/Interpreters/SetVariants.cpp
index eb21333e3ec..1cc0f767ecc 100644
--- a/src/Interpreters/SetVariants.cpp
+++ b/src/Interpreters/SetVariants.cpp
@@ -122,7 +122,7 @@ typename SetVariantsTemplate<Variant>::Type SetVariantsTemplate<Variant>::choose
                 throw Exception{"Aggregator: keys sizes overflow", ErrorCodes::LOGICAL_ERROR};
             if ((std::tuple_size<KeysNullMap<UInt128>>::value + keys_bytes) <= 16)
                 return Type::nullable_keys128;
-            if ((std::tuple_size<KeysNullMap<DummyUInt256>>::value + keys_bytes) <= 32)
+            if ((std::tuple_size<KeysNullMap<UInt256>>::value + keys_bytes) <= 32)
                 return Type::nullable_keys256;
         }
 
diff --git a/src/Interpreters/SetVariants.h b/src/Interpreters/SetVariants.h
index bcd833e42a8..d6be996effb 100644
--- a/src/Interpreters/SetVariants.h
+++ b/src/Interpreters/SetVariants.h
@@ -8,7 +8,6 @@
 #include <Common/HashTable/ClearableHashSet.h>
 #include <Common/HashTable/FixedClearableHashSet.h>
 #include <Common/HashTable/FixedHashSet.h>
-#include <Common/UInt128.h>
 
 
 namespace DB
@@ -202,12 +201,12 @@ struct NonClearableSet
     std::unique_ptr<SetMethodString<HashSetWithSavedHash<StringRef>>>                        key_string;
     std::unique_ptr<SetMethodFixedString<HashSetWithSavedHash<StringRef>>>                   key_fixed_string;
     std::unique_ptr<SetMethodKeysFixed<HashSet<UInt128, UInt128HashCRC32>>>                  keys128;
-    std::unique_ptr<SetMethodKeysFixed<HashSet<DummyUInt256, UInt256HashCRC32>>>             keys256;
+    std::unique_ptr<SetMethodKeysFixed<HashSet<UInt256, UInt256HashCRC32>>>                  keys256;
     std::unique_ptr<SetMethodHashed<HashSet<UInt128, UInt128TrivialHash>>>                   hashed;
 
     /// Support for nullable keys (for DISTINCT implementation).
     std::unique_ptr<SetMethodKeysFixed<HashSet<UInt128, UInt128HashCRC32>, true>>            nullable_keys128;
-    std::unique_ptr<SetMethodKeysFixed<HashSet<DummyUInt256, UInt256HashCRC32>, true>>       nullable_keys256;
+    std::unique_ptr<SetMethodKeysFixed<HashSet<UInt256, UInt256HashCRC32>, true>>            nullable_keys256;
     /** Unlike Aggregator, `concat` method is not used here.
       * This is done because `hashed` method, although slower, but in this case, uses less RAM.
       *  since when you use it, the key values themselves are not stored.
@@ -224,12 +223,12 @@ struct ClearableSet
     std::unique_ptr<SetMethodString<ClearableHashSetWithSavedHash<StringRef>>>                       key_string;
     std::unique_ptr<SetMethodFixedString<ClearableHashSetWithSavedHash<StringRef>>>                  key_fixed_string;
     std::unique_ptr<SetMethodKeysFixed<ClearableHashSet<UInt128, UInt128HashCRC32>>>                 keys128;
-    std::unique_ptr<SetMethodKeysFixed<ClearableHashSet<DummyUInt256, UInt256HashCRC32>>>            keys256;
+    std::unique_ptr<SetMethodKeysFixed<ClearableHashSet<UInt256, UInt256HashCRC32>>>                 keys256;
     std::unique_ptr<SetMethodHashed<ClearableHashSet<UInt128, UInt128TrivialHash>>>                  hashed;
 
     /// Support for nullable keys (for DISTINCT implementation).
     std::unique_ptr<SetMethodKeysFixed<ClearableHashSet<UInt128, UInt128HashCRC32>, true>>           nullable_keys128;
-    std::unique_ptr<SetMethodKeysFixed<ClearableHashSet<DummyUInt256, UInt256HashCRC32>, true>>      nullable_keys256;
+    std::unique_ptr<SetMethodKeysFixed<ClearableHashSet<UInt256, UInt256HashCRC32>, true>>           nullable_keys256;
     /** Unlike Aggregator, `concat` method is not used here.
       * This is done because `hashed` method, although slower, but in this case, uses less RAM.
       *  since when you use it, the key values themselves are not stored.
diff --git a/src/Interpreters/SubqueryForSet.cpp b/src/Interpreters/SubqueryForSet.cpp
index a3a51210bf1..08fc07c71e1 100644
--- a/src/Interpreters/SubqueryForSet.cpp
+++ b/src/Interpreters/SubqueryForSet.cpp
@@ -1,9 +1,6 @@
 #include <Interpreters/SubqueryForSet.h>
-#include <Interpreters/InterpreterSelectWithUnionQuery.h>
-#include <Interpreters/IJoin.h>
-#include <Interpreters/MergeJoin.h>
-#include <Interpreters/ExpressionActions.h>
-
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Interpreters/PreparedSets.h>
 
 namespace DB
 {
@@ -13,65 +10,4 @@ SubqueryForSet::~SubqueryForSet() = default;
 SubqueryForSet::SubqueryForSet(SubqueryForSet &&) = default;
 SubqueryForSet & SubqueryForSet::operator= (SubqueryForSet &&) = default;
 
-void SubqueryForSet::makeSource(std::shared_ptr<InterpreterSelectWithUnionQuery> & interpreter,
-                                NamesWithAliases && joined_block_aliases_)
-{
-    joined_block_aliases = std::move(joined_block_aliases_);
-    source = std::make_unique<QueryPlan>();
-    interpreter->buildQueryPlan(*source);
-
-    sample_block = interpreter->getSampleBlock();
-    renameColumns(sample_block);
-}
-
-void SubqueryForSet::renameColumns(Block & block)
-{
-    for (const auto & name_with_alias : joined_block_aliases)
-    {
-        if (block.has(name_with_alias.first))
-        {
-            auto pos = block.getPositionByName(name_with_alias.first);
-            auto column = block.getByPosition(pos);
-            block.erase(pos);
-            column.name = name_with_alias.second;
-            block.insert(std::move(column));
-        }
-    }
-}
-
-void SubqueryForSet::addJoinActions(ExpressionActionsPtr actions)
-{
-    actions->execute(sample_block);
-    if (joined_block_actions == nullptr)
-    {
-        joined_block_actions = actions;
-    }
-    else
-    {
-        auto new_dag = ActionsDAG::merge(
-            std::move(*joined_block_actions->getActionsDAG().clone()),
-            std::move(*actions->getActionsDAG().clone()));
-        joined_block_actions = std::make_shared<ExpressionActions>(new_dag, actions->getSettings());
-    }
-}
-
-bool SubqueryForSet::insertJoinedBlock(Block & block)
-{
-    renameColumns(block);
-
-    if (joined_block_actions)
-        joined_block_actions->execute(block);
-
-    return join->addJoinedBlock(block);
-}
-
-void SubqueryForSet::setTotals(Block totals)
-{
-    if (join)
-    {
-        renameColumns(totals);
-        join->setTotals(totals);
-    }
-}
-
 }
diff --git a/src/Interpreters/SubqueryForSet.h b/src/Interpreters/SubqueryForSet.h
index a42bf296d6c..974f5bd3e58 100644
--- a/src/Interpreters/SubqueryForSet.h
+++ b/src/Interpreters/SubqueryForSet.h
@@ -2,19 +2,16 @@
 
 #include <Core/Block.h>
 #include <Storages/IStorage_fwd.h>
-#include <Parsers/IAST.h>
-#include <Interpreters/IJoin.h>
-#include <Interpreters/PreparedSets.h>
 
 
 namespace DB
 {
 
-class InterpreterSelectWithUnionQuery;
-class ExpressionActions;
-using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 class QueryPlan;
 
+class Set;
+using SetPtr = std::shared_ptr<Set>;
+
 /// Information on what to do when executing a subquery in the [GLOBAL] IN/JOIN section.
 struct SubqueryForSet
 {
@@ -28,28 +25,10 @@ struct SubqueryForSet
 
     /// If set, build it from result.
     SetPtr set;
-    JoinPtr join;
-    /// Apply this actions to joined block.
-    ExpressionActionsPtr joined_block_actions;
-    Block sample_block; /// source->getHeader() + column renames
 
     /// If set, put the result into the table.
     /// This is a temporary table for transferring to remote servers for distributed query processing.
     StoragePtr table;
-
-    void makeSource(std::shared_ptr<InterpreterSelectWithUnionQuery> & interpreter,
-                    NamesWithAliases && joined_block_aliases_);
-
-    void addJoinActions(ExpressionActionsPtr actions);
-
-    bool insertJoinedBlock(Block & block);
-    void setTotals(Block totals);
-
-private:
-    NamesWithAliases joined_block_aliases; /// Rename column from joined block from this list.
-
-    /// Rename source right table column names into qualified column names if they conflicts with left table ones.
-    void renameColumns(Block & block);
 };
 
 /// ID of subquery -> what to do with it.
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index 1667d845d77..31ceca8ec05 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -30,7 +30,7 @@ constexpr size_t DEFAULT_METRIC_LOG_COLLECT_INTERVAL_MILLISECONDS = 1000;
 /// Creates a system log with MergeTree engine using parameters from config
 template <typename TSystemLog>
 std::shared_ptr<TSystemLog> createSystemLog(
-    Context & context,
+    ContextPtr context,
     const String & default_database_name,
     const String & default_table_name,
     const Poco::Util::AbstractConfiguration & config,
@@ -88,7 +88,7 @@ std::shared_ptr<TSystemLog> createSystemLog(
 }
 
 
-SystemLogs::SystemLogs(Context & global_context, const Poco::Util::AbstractConfiguration & config)
+SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConfiguration & config)
 {
     query_log = createSystemLog<QueryLog>(global_context, "system", "query_log", config, "query_log");
     query_thread_log = createSystemLog<QueryThreadLog>(global_context, "system", "query_thread_log", config, "query_thread_log");
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index aa3dc113e44..074586efe3d 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -93,7 +93,7 @@ public:
 ///  because SystemLog destruction makes insert query while flushing data into underlying tables
 struct SystemLogs
 {
-    SystemLogs(Context & global_context, const Poco::Util::AbstractConfiguration & config);
+    SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConfiguration & config);
     ~SystemLogs();
 
     void shutdown();
@@ -115,7 +115,7 @@ struct SystemLogs
 
 
 template <typename LogElement>
-class SystemLog : public ISystemLog, private boost::noncopyable
+class SystemLog : public ISystemLog, private boost::noncopyable, WithContext
 {
 public:
     using Self = SystemLog;
@@ -129,7 +129,7 @@ public:
       *   and new table get created - as if previous table was not exist.
       */
     SystemLog(
-        Context & context_,
+        ContextPtr context_,
         const String & database_name_,
         const String & table_name_,
         const String & storage_def_,
@@ -152,6 +152,8 @@ public:
     void shutdown() override
     {
         stopFlushThread();
+        if (table)
+            table->flushAndShutdown();
     }
 
     String getName() override
@@ -166,7 +168,6 @@ protected:
 
 private:
     /* Saving thread data */
-    Context & context;
     const StorageID table_id;
     const String storage_def;
     StoragePtr table;
@@ -184,12 +185,13 @@ private:
     // synchronous log flushing for SYSTEM FLUSH LOGS.
     uint64_t queue_front_index = 0;
     bool is_shutdown = false;
+    // A flag that says we must create the tables even if the queue is empty.
     bool is_force_prepare_tables = false;
     std::condition_variable flush_event;
     // Requested to flush logs up to this index, exclusive
-    uint64_t requested_flush_before = 0;
+    uint64_t requested_flush_up_to = 0;
     // Flushed log up to this index, exclusive
-    uint64_t flushed_before = 0;
+    uint64_t flushed_up_to = 0;
     // Logged overflow message at this queue front index
     uint64_t logged_queue_full_at_index = -1;
 
@@ -207,12 +209,13 @@ private:
 
 
 template <typename LogElement>
-SystemLog<LogElement>::SystemLog(Context & context_,
+SystemLog<LogElement>::SystemLog(
+    ContextPtr context_,
     const String & database_name_,
     const String & table_name_,
     const String & storage_def_,
     size_t flush_interval_milliseconds_)
-    : context(context_)
+    : WithContext(context_)
     , table_id(database_name_, table_name_)
     , storage_def(storage_def_)
     , flush_interval_milliseconds(flush_interval_milliseconds_)
@@ -267,8 +270,8 @@ void SystemLog<LogElement>::add(const LogElement & element)
             // It is enough to only wake the flushing thread once, after the message
             // count increases past half available size.
             const uint64_t queue_end = queue_front_index + queue.size();
-            if (requested_flush_before < queue_end)
-                requested_flush_before = queue_end;
+            if (requested_flush_up_to < queue_end)
+                requested_flush_up_to = queue_end;
 
             flush_event.notify_all();
         }
@@ -304,24 +307,36 @@ void SystemLog<LogElement>::add(const LogElement & element)
 template <typename LogElement>
 void SystemLog<LogElement>::flush(bool force)
 {
-    std::unique_lock lock(mutex);
+    uint64_t this_thread_requested_offset;
 
-    if (is_shutdown)
-        return;
-
-    const uint64_t queue_end = queue_front_index + queue.size();
-
-    is_force_prepare_tables = force;
-    if (requested_flush_before < queue_end || force)
     {
-        requested_flush_before = queue_end;
+        std::unique_lock lock(mutex);
+
+        if (is_shutdown)
+            return;
+
+        this_thread_requested_offset = queue_front_index + queue.size();
+
+        // Publish our flush request, taking care not to overwrite the requests
+        // made by other threads.
+        is_force_prepare_tables |= force;
+        requested_flush_up_to = std::max(requested_flush_up_to,
+            this_thread_requested_offset);
+
         flush_event.notify_all();
     }
 
-    // Use an arbitrary timeout to avoid endless waiting.
-    const int timeout_seconds = 60;
+    LOG_DEBUG(log, "Requested flush up to offset {}",
+        this_thread_requested_offset);
+
+    // Use an arbitrary timeout to avoid endless waiting. 60s proved to be
+    // too fast for our parallel functional tests, probably because they
+    // heavily load the disk.
+    const int timeout_seconds = 180;
+    std::unique_lock lock(mutex);
     bool result = flush_event.wait_for(lock, std::chrono::seconds(timeout_seconds),
-        [&] { return flushed_before >= queue_end && !is_force_prepare_tables; });
+        [&] { return flushed_up_to >= this_thread_requested_offset
+                && !is_force_prepare_tables; });
 
     if (!result)
     {
@@ -371,6 +386,8 @@ void SystemLog<LogElement>::savingThreadFunction()
             // The end index (exclusive, like std end()) of the messages we are
             // going to flush.
             uint64_t to_flush_end = 0;
+            // Should we prepare table even if there are no new messages.
+            bool should_prepare_tables_anyway = false;
 
             {
                 std::unique_lock lock(mutex);
@@ -378,7 +395,7 @@ void SystemLog<LogElement>::savingThreadFunction()
                     std::chrono::milliseconds(flush_interval_milliseconds),
                     [&] ()
                     {
-                        return requested_flush_before > flushed_before || is_shutdown || is_force_prepare_tables;
+                        return requested_flush_up_to > flushed_up_to || is_shutdown || is_force_prepare_tables;
                     }
                 );
 
@@ -389,18 +406,14 @@ void SystemLog<LogElement>::savingThreadFunction()
                 to_flush.resize(0);
                 queue.swap(to_flush);
 
+                should_prepare_tables_anyway = is_force_prepare_tables;
+
                 exit_this_thread = is_shutdown;
             }
 
             if (to_flush.empty())
             {
-                bool force;
-                {
-                    std::lock_guard lock(mutex);
-                    force = is_force_prepare_tables;
-                }
-
-                if (force)
+                if (should_prepare_tables_anyway)
                 {
                     prepareTable();
                     LOG_TRACE(log, "Table created (force)");
@@ -429,7 +442,8 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
 {
     try
     {
-        LOG_TRACE(log, "Flushing system log, {} entries to flush", to_flush.size());
+        LOG_TRACE(log, "Flushing system log, {} entries to flush up to offset {}",
+            to_flush.size(), to_flush_end);
 
         /// We check for existence of the table and create it as needed at every
         /// flush. This is done to allow user to drop the table at any moment
@@ -451,8 +465,8 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
         ASTPtr query_ptr(insert.release());
 
         // we need query context to do inserts to target table with MV containing subqueries or joins
-        Context insert_context(context);
-        insert_context.makeQueryContext();
+        auto insert_context = Context::createCopy(context);
+        insert_context->makeQueryContext();
 
         InterpreterInsertQuery interpreter(query_ptr, insert_context);
         BlockIO io = interpreter.execute();
@@ -468,12 +482,12 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
 
     {
         std::lock_guard lock(mutex);
-        flushed_before = to_flush_end;
+        flushed_up_to = to_flush_end;
         is_force_prepare_tables = false;
         flush_event.notify_all();
     }
 
-    LOG_TRACE(log, "Flushed system log");
+    LOG_TRACE(log, "Flushed system log up to offset {}", to_flush_end);
 }
 
 
@@ -482,7 +496,7 @@ void SystemLog<LogElement>::prepareTable()
 {
     String description = table_id.getNameForLogs();
 
-    table = DatabaseCatalog::instance().tryGetTable(table_id, context);
+    table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
 
     if (table)
     {
@@ -494,7 +508,8 @@ void SystemLog<LogElement>::prepareTable()
         {
             /// Rename the existing table.
             int suffix = 0;
-            while (DatabaseCatalog::instance().isTableExist({table_id.database_name, table_id.table_name + "_" + toString(suffix)}, context))
+            while (DatabaseCatalog::instance().isTableExist(
+                {table_id.database_name, table_id.table_name + "_" + toString(suffix)}, getContext()))
                 ++suffix;
 
             auto rename = std::make_shared<ASTRenameQuery>();
@@ -513,10 +528,14 @@ void SystemLog<LogElement>::prepareTable()
 
             rename->elements.emplace_back(elem);
 
-            LOG_DEBUG(log, "Existing table {} for system log has obsolete or different structure. Renaming it to {}", description, backQuoteIfNeed(to.table));
+            LOG_DEBUG(
+                log,
+                "Existing table {} for system log has obsolete or different structure. Renaming it to {}",
+                description,
+                backQuoteIfNeed(to.table));
 
-            Context query_context = context;
-            query_context.makeQueryContext();
+            auto query_context = Context::createCopy(context);
+            query_context->makeQueryContext();
             InterpreterRenameQuery(rename, query_context).execute();
 
             /// The required table will be created.
@@ -534,13 +553,14 @@ void SystemLog<LogElement>::prepareTable()
         auto create = getCreateTableQuery();
 
 
-        Context query_context = context;
-        query_context.makeQueryContext();
+        auto query_context = Context::createCopy(context);
+        query_context->makeQueryContext();
+
         InterpreterCreateQuery interpreter(create, query_context);
         interpreter.setInternal(true);
         interpreter.execute();
 
-        table = DatabaseCatalog::instance().getTable(table_id, context);
+        table = DatabaseCatalog::instance().getTable(table_id, getContext());
     }
 
     is_prepared = true;
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index c50c61c418c..122e2cd6479 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -156,9 +156,12 @@ NameSet TableJoin::requiredRightKeys() const
 {
     NameSet required;
     for (const auto & name : key_names_right)
+    {
+        auto rename = renamedRightColumnName(name);
         for (const auto & column : columns_added_by_join)
-            if (name == column.name)
+            if (rename == column.name)
                 required.insert(name);
+    }
     return required;
 }
 
@@ -214,12 +217,12 @@ Block TableJoin::getRequiredRightKeys(const Block & right_table_keys, std::vecto
 
 bool TableJoin::leftBecomeNullable(const DataTypePtr & column_type) const
 {
-    return forceNullableLeft() && column_type->canBeInsideNullable();
+    return forceNullableLeft() && JoinCommon::canBecomeNullable(column_type);
 }
 
 bool TableJoin::rightBecomeNullable(const DataTypePtr & column_type) const
 {
-    return forceNullableRight() && column_type->canBeInsideNullable();
+    return forceNullableRight() && JoinCommon::canBecomeNullable(column_type);
 }
 
 void TableJoin::addJoinedColumn(const NameAndTypePair & joined_column)
@@ -233,7 +236,7 @@ void TableJoin::addJoinedColumn(const NameAndTypePair & joined_column)
     }
 
     if (rightBecomeNullable(type))
-        type = makeNullable(type);
+        type = JoinCommon::convertTypeToNullable(type);
 
     columns_added_by_join.emplace_back(joined_column.name, type);
 }
@@ -265,7 +268,7 @@ void TableJoin::addJoinedColumnsAndCorrectTypes(ColumnsWithTypeAndName & columns
             /// No need to nullify constants
             bool is_column_const = col.column && isColumnConst(*col.column);
             if (!is_column_const)
-                col.type = makeNullable(col.type);
+                col.type = JoinCommon::convertTypeToNullable(col.type);
         }
     }
 
@@ -464,4 +467,11 @@ ActionsDAGPtr TableJoin::applyKeyConvertToTable(
     return dag;
 }
 
+String TableJoin::renamedRightColumnName(const String & name) const
+{
+    if (const auto it = renames.find(name); it != renames.end())
+        return it->second;
+    return name;
+}
+
 }
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 71a27849297..dc8ebeb7413 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -128,7 +128,11 @@ public:
     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 { return join_algorithm == JoinAlgorithm::HASH; }
+    bool forceHashJoin() const
+    {
+        /// HashJoin always used for DictJoin
+        return dictionary_reader || join_algorithm == JoinAlgorithm::HASH;
+    }
 
     bool forceNullableRight() const { return join_use_nulls && isLeftOrFull(table_join.kind); }
     bool forceNullableLeft() const { return join_use_nulls && isRightOrFull(table_join.kind); }
@@ -199,6 +203,8 @@ public:
     /// Split key and other columns by keys name list
     void splitAdditionalColumns(const Block & sample_block, Block & block_keys, Block & block_others) const;
     Block getRequiredRightKeys(const Block & right_table_keys, std::vector<String> & keys_sources) const;
+
+    String renamedRightColumnName(const String & name) const;
 };
 
 }
diff --git a/src/Interpreters/TextLog.cpp b/src/Interpreters/TextLog.cpp
index 489bb302ad0..f5a0ce51d49 100644
--- a/src/Interpreters/TextLog.cpp
+++ b/src/Interpreters/TextLog.cpp
@@ -74,7 +74,7 @@ void TextLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(source_line);
 }
 
-TextLog::TextLog(Context & context_, const String & database_name_,
+TextLog::TextLog(ContextPtr context_, const String & database_name_,
         const String & table_name_, const String & storage_def_,
         size_t flush_interval_milliseconds_)
   : SystemLog<TextLogElement>(context_, database_name_, table_name_,
diff --git a/src/Interpreters/TextLog.h b/src/Interpreters/TextLog.h
index da678868be3..0133d5e4eb6 100644
--- a/src/Interpreters/TextLog.h
+++ b/src/Interpreters/TextLog.h
@@ -10,10 +10,10 @@ struct TextLogElement
 {
     time_t event_time{};
     Decimal64 event_time_microseconds{};
-    UInt32 microseconds;
+    UInt32 microseconds{};
 
     String thread_name;
-    UInt64 thread_id;
+    UInt64 thread_id{};
 
     Message::Priority level = Message::PRIO_TRACE;
 
@@ -22,7 +22,7 @@ struct TextLogElement
     String message;
 
     String source_file;
-    UInt64 source_line;
+    UInt64 source_line{};
 
     static std::string name() { return "TextLog"; }
     static Block createBlock();
@@ -33,7 +33,7 @@ class TextLog : public SystemLog<TextLogElement>
 {
 public:
     TextLog(
-        Context & context_,
+        ContextPtr context_,
         const String & database_name_,
         const String & table_name_,
         const String & storage_def_,
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index 8a979721290..8590b3c94f3 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -33,9 +33,11 @@ namespace ErrorCodes
 
 void ThreadStatus::applyQuerySettings()
 {
-    const Settings & settings = query_context->getSettingsRef();
+    auto query_context_ptr = query_context.lock();
+    assert(query_context_ptr);
+    const Settings & settings = query_context_ptr->getSettingsRef();
 
-    query_id = query_context->getCurrentQueryId();
+    query_id = query_context_ptr->getCurrentQueryId();
     initQueryProfiler();
 
     untracked_memory_limit = settings.max_untracked_memory;
@@ -58,27 +60,27 @@ void ThreadStatus::applyQuerySettings()
 }
 
 
-void ThreadStatus::attachQueryContext(Context & query_context_)
+void ThreadStatus::attachQueryContext(ContextPtr query_context_)
 {
-    query_context = &query_context_;
+    query_context = query_context_;
 
-    if (!global_context)
-        global_context = &query_context->getGlobalContext();
+    if (global_context.expired())
+        global_context = query_context_->getGlobalContext();
 
     if (thread_group)
     {
         std::lock_guard lock(thread_group->mutex);
 
         thread_group->query_context = query_context;
-        if (!thread_group->global_context)
+        if (thread_group->global_context.expired())
             thread_group->global_context = global_context;
     }
 
     // Generate new span for thread manually here, because we can't depend
     // on OpenTelemetrySpanHolder due to link order issues.
     // FIXME why and how is this different from setupState()?
-    thread_trace_context = query_context->query_trace_context;
-    if (thread_trace_context.trace_id)
+    thread_trace_context = query_context_->query_trace_context;
+    if (thread_trace_context.trace_id != UUID())
     {
         thread_trace_context.span_id = thread_local_rng();
     }
@@ -113,18 +115,18 @@ void ThreadStatus::setupState(const ThreadGroupStatusPtr & thread_group_)
         fatal_error_callback = thread_group->fatal_error_callback;
         query_context = thread_group->query_context;
 
-        if (!global_context)
+        if (global_context.expired())
             global_context = thread_group->global_context;
     }
 
-    if (query_context)
+    if (auto query_context_ptr = query_context.lock())
     {
         applyQuerySettings();
 
         // Generate new span for thread manually here, because we can't depend
         // on OpenTelemetrySpanHolder due to link order issues.
-        thread_trace_context = query_context->query_trace_context;
-        if (thread_trace_context.trace_id)
+        thread_trace_context = query_context_ptr->query_trace_context;
+        if (thread_trace_context.trace_id != UUID())
         {
             thread_trace_context.span_id = thread_local_rng();
         }
@@ -201,9 +203,9 @@ void ThreadStatus::initPerformanceCounters()
     // query_start_time_nanoseconds cannot be used here since RUsageCounters expect CLOCK_MONOTONIC
     *last_rusage = RUsageCounters::current();
 
-    if (query_context)
+    if (auto query_context_ptr = query_context.lock())
     {
-        const Settings & settings = query_context->getSettingsRef();
+        const Settings & settings = query_context_ptr->getSettingsRef();
         if (settings.metrics_perf_events_enabled)
         {
             try
@@ -246,8 +248,8 @@ void ThreadStatus::finalizePerformanceCounters()
     // 'select 1 settings metrics_perf_events_enabled = 1', I still get
     // query_context->getSettingsRef().metrics_perf_events_enabled == 0 *shrug*.
     bool close_perf_descriptors = true;
-    if (query_context)
-        close_perf_descriptors = !query_context->getSettingsRef().metrics_perf_events_enabled;
+    if (auto query_context_ptr = query_context.lock())
+        close_perf_descriptors = !query_context_ptr->getSettingsRef().metrics_perf_events_enabled;
 
     try
     {
@@ -262,17 +264,19 @@ void ThreadStatus::finalizePerformanceCounters()
 
     try
     {
-        if (global_context && query_context)
+        auto global_context_ptr = global_context.lock();
+        auto query_context_ptr = query_context.lock();
+        if (global_context_ptr && query_context_ptr)
         {
-            const auto & settings = query_context->getSettingsRef();
+            const auto & settings = query_context_ptr->getSettingsRef();
             if (settings.log_queries && settings.log_query_threads)
             {
                 const auto now = std::chrono::system_clock::now();
                 Int64 query_duration_ms = (time_in_microseconds(now) - query_start_time_microseconds) / 1000;
                 if (query_duration_ms >= settings.log_queries_min_query_duration_ms.totalMilliseconds())
                 {
-                    if (auto thread_log = global_context->getQueryThreadLog())
-                        logToQueryThreadLog(*thread_log, query_context->getCurrentDatabase(), now);
+                    if (auto thread_log = global_context_ptr->getQueryThreadLog())
+                        logToQueryThreadLog(*thread_log, query_context_ptr->getCurrentDatabase(), now);
                 }
             }
         }
@@ -286,10 +290,13 @@ void ThreadStatus::finalizePerformanceCounters()
 void ThreadStatus::initQueryProfiler()
 {
     /// query profilers are useless without trace collector
-    if (!global_context || !global_context->hasTraceCollector())
+    auto global_context_ptr = global_context.lock();
+    if (!global_context_ptr || !global_context_ptr->hasTraceCollector())
         return;
 
-    const auto & settings = query_context->getSettingsRef();
+    auto query_context_ptr = query_context.lock();
+    assert(query_context_ptr);
+    const auto & settings = query_context_ptr->getSettingsRef();
 
     try
     {
@@ -316,6 +323,8 @@ void ThreadStatus::finalizeQueryProfiler()
 
 void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
 {
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
+
     if (exit_if_already_detached && thread_state == ThreadState::DetachedFromQuery)
     {
         thread_state = thread_exits ? ThreadState::Died : ThreadState::DetachedFromQuery;
@@ -325,9 +334,10 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
     assertState({ThreadState::AttachedToQuery}, __PRETTY_FUNCTION__);
 
     std::shared_ptr<OpenTelemetrySpanLog> opentelemetry_span_log;
-    if (thread_trace_context.trace_id && query_context)
+    auto query_context_ptr = query_context.lock();
+    if (thread_trace_context.trace_id != UUID() && query_context_ptr)
     {
-        opentelemetry_span_log = query_context->getOpenTelemetrySpanLog();
+        opentelemetry_span_log = query_context_ptr->getOpenTelemetrySpanLog();
     }
 
     if (opentelemetry_span_log)
@@ -347,7 +357,8 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
         // is going to fail, because we're going to reset it to zero later in
         // this function.
         span.span_id = thread_trace_context.span_id;
-        span.parent_span_id = query_context->query_trace_context.span_id;
+        assert(query_context_ptr);
+        span.parent_span_id = query_context_ptr->query_trace_context.span_id;
         span.operation_name = getThreadName();
         span.start_time_us = query_start_time_microseconds;
         span.finish_time_us =
@@ -370,7 +381,7 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
     memory_tracker.setParent(thread_group->memory_tracker.getParent());
 
     query_id.clear();
-    query_context = nullptr;
+    query_context.reset();
     thread_trace_context.trace_id = 0;
     thread_trace_context.span_id = 0;
     thread_group.reset();
@@ -429,11 +440,12 @@ void ThreadStatus::logToQueryThreadLog(QueryThreadLog & thread_log, const String
         }
     }
 
-    if (query_context)
+    auto query_context_ptr = query_context.lock();
+    if (query_context_ptr)
     {
-        elem.client_info = query_context->getClientInfo();
+        elem.client_info = query_context_ptr->getClientInfo();
 
-        if (query_context->getSettingsRef().log_profile_events != 0)
+        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());
@@ -467,7 +479,7 @@ void CurrentThread::attachToIfDetached(const ThreadGroupStatusPtr & thread_group
     current_thread->deleter = CurrentThread::defaultThreadDeleter;
 }
 
-void CurrentThread::attachQueryContext(Context & query_context)
+void CurrentThread::attachQueryContext(ContextPtr query_context)
 {
     if (unlikely(!current_thread))
         return;
@@ -496,12 +508,12 @@ void CurrentThread::detachQueryIfNotDetached()
 }
 
 
-CurrentThread::QueryScope::QueryScope(Context & query_context)
+CurrentThread::QueryScope::QueryScope(ContextMutablePtr query_context)
 {
     CurrentThread::initializeQuery();
     CurrentThread::attachQueryContext(query_context);
-    if (!query_context.hasQueryContext())
-        query_context.makeQueryContext();
+    if (!query_context->hasQueryContext())
+        query_context->makeQueryContext();
 }
 
 void CurrentThread::QueryScope::logPeakMemoryUsage()
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index 3f4c2e74e23..a2725f2506e 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -81,7 +81,7 @@ void appendUnusedGroupByColumn(ASTSelectQuery * select_query, const NameSet & so
 }
 
 /// Eliminates injective function calls and constant expressions from group by statement.
-void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_columns, const Context & context)
+void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_columns, ContextConstPtr context)
 {
     const FunctionFactory & function_factory = FunctionFactory::instance();
 
@@ -135,7 +135,7 @@ void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_colum
                 const auto & dict_name = dict_name_ast->value.safeGet<String>();
                 const auto & attr_name = attr_name_ast->value.safeGet<String>();
 
-                const auto & dict_ptr = context.getExternalDictionariesLoader().getDictionary(dict_name, context);
+                const auto & dict_ptr = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
                 if (!dict_ptr->isInjective(attr_name))
                 {
                     ++i;
@@ -270,7 +270,7 @@ void optimizeDuplicatesInOrderBy(const ASTSelectQuery * select_query)
 }
 
 /// Optimize duplicate ORDER BY
-void optimizeDuplicateOrderBy(ASTPtr & query, const Context & context)
+void optimizeDuplicateOrderBy(ASTPtr & query, ContextConstPtr context)
 {
     DuplicateOrderByVisitor::Data order_by_data{context};
     DuplicateOrderByVisitor(order_by_data).visit(query);
@@ -396,7 +396,7 @@ void optimizeDuplicateDistinct(ASTSelectQuery & select)
 
 /// Replace monotonous functions in ORDER BY if they don't participate in GROUP BY expression,
 /// has a single argument and not an aggregate functions.
-void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, const Context & context,
+void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, ContextConstPtr context,
                                           const TablesWithColumns & tables_with_columns,
                                           const Names & sorting_key_columns)
 {
@@ -448,7 +448,7 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, const C
 /// Optimize ORDER BY x, y, f(x), g(x, y), f(h(x)), t(f(x), g(x)) into ORDER BY x, y
 /// in case if f(), g(), h(), t() are deterministic (in scope of query).
 /// Don't optimize ORDER BY f(x), g(x), x even if f(x) is bijection for x or g(x).
-void optimizeRedundantFunctionsInOrderBy(const ASTSelectQuery * select_query, const Context & context)
+void optimizeRedundantFunctionsInOrderBy(const ASTSelectQuery * select_query, ContextConstPtr context)
 {
     const auto & order_by = select_query->orderBy();
     if (!order_by)
@@ -561,9 +561,9 @@ void optimizeCountConstantAndSumOne(ASTPtr & query)
 }
 
 
-void optimizeInjectiveFunctionsInsideUniq(ASTPtr & query, const Context & context)
+void optimizeInjectiveFunctionsInsideUniq(ASTPtr & query, ContextConstPtr context)
 {
-    RemoveInjectiveFunctionsVisitor::Data data = {context};
+    RemoveInjectiveFunctionsVisitor::Data data(context);
     RemoveInjectiveFunctionsVisitor(data).visit(query);
 }
 
@@ -592,10 +592,10 @@ void TreeOptimizer::optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_
 
 void TreeOptimizer::apply(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set,
                           const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
-                          const Context & context, const StorageMetadataPtr & metadata_snapshot,
+                          ContextConstPtr context, const StorageMetadataPtr & metadata_snapshot,
                           bool & rewrite_subqueries)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     auto * select_query = query->as<ASTSelectQuery>();
     if (!select_query)
diff --git a/src/Interpreters/TreeOptimizer.h b/src/Interpreters/TreeOptimizer.h
index a10dfc57451..706f030e620 100644
--- a/src/Interpreters/TreeOptimizer.h
+++ b/src/Interpreters/TreeOptimizer.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <Parsers/IAST_fwd.h>
 #include <Interpreters/Aliases.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
 
-class Context;
 struct StorageInMemoryMetadata;
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 
@@ -16,10 +16,14 @@ using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 class TreeOptimizer
 {
 public:
-    static void apply(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set,
-                      const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
-                      const Context & context, const StorageMetadataPtr & metadata_snapshot,
-                      bool & rewrite_subqueries);
+    static void apply(
+        ASTPtr & query,
+        Aliases & aliases,
+        const NameSet & source_columns_set,
+        const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns,
+        ContextConstPtr context,
+        const StorageMetadataPtr & metadata_snapshot,
+        bool & rewrite_subqueries);
 
     static void optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif);
 };
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index f88fd16045a..5b4a869d44b 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -26,6 +26,7 @@
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/queryToString.h>
+#include <Parsers/ASTLiteral.h>
 
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -181,8 +182,72 @@ struct CustomizeAggregateFunctionsMoveSuffixData
     }
 };
 
+struct FuseSumCountAggregates
+{
+    std::vector<ASTFunction *> sums {};
+    std::vector<ASTFunction *> counts {};
+    std::vector<ASTFunction *> avgs {};
+
+    void addFuncNode(ASTFunction * func)
+    {
+        if (func->name == "sum")
+            sums.push_back(func);
+        else if (func->name == "count")
+            counts.push_back(func);
+        else
+        {
+            assert(func->name == "avg");
+            avgs.push_back(func);
+        }
+    }
+
+    bool canBeFused() const
+    {
+        // Need at least two different kinds of functions to fuse.
+        if (sums.empty() && counts.empty())
+            return false;
+        if (sums.empty() && avgs.empty())
+            return false;
+        if (counts.empty() && avgs.empty())
+            return false;
+        return true;
+    }
+};
+
+struct FuseSumCountAggregatesVisitorData
+{
+    using TypeToVisit = ASTFunction;
+
+    std::unordered_map<String, FuseSumCountAggregates> fuse_map;
+
+    void visit(ASTFunction & func, ASTPtr &)
+    {
+        if (func.name == "sum" || func.name == "avg" || func.name == "count")
+        {
+            if (func.arguments->children.empty())
+                return;
+
+            // Probably we can extend it to match count() for non-nullable argument
+            // to sum/avg with any other argument. Now we require strict match.
+            const auto argument = func.arguments->children.at(0)->getColumnName();
+            auto it = fuse_map.find(argument);
+            if (it != fuse_map.end())
+            {
+                it->second.addFuncNode(&func);
+            }
+            else
+            {
+                FuseSumCountAggregates funcs{};
+                funcs.addFuncNode(&func);
+                fuse_map[argument] = funcs;
+            }
+        }
+    }
+};
+
 using CustomizeAggregateFunctionsOrNullVisitor = InDepthNodeVisitor<OneTypeMatcher<CustomizeAggregateFunctionsSuffixData>, true>;
 using CustomizeAggregateFunctionsMoveOrNullVisitor = InDepthNodeVisitor<OneTypeMatcher<CustomizeAggregateFunctionsMoveSuffixData>, true>;
+using FuseSumCountAggregatesVisitor = InDepthNodeVisitor<OneTypeMatcher<FuseSumCountAggregatesVisitorData>, true>;
 
 /// 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.
@@ -200,6 +265,49 @@ void translateQualifiedNames(ASTPtr & query, const ASTSelectQuery & select_query
         throw Exception("Empty list of columns in SELECT query", ErrorCodes::EMPTY_LIST_OF_COLUMNS_QUERIED);
 }
 
+// Replaces one avg/sum/count function with an appropriate expression with
+// sumCount().
+void replaceWithSumCount(String column_name, ASTFunction & func)
+{
+    auto func_base = makeASTFunction("sumCount", std::make_shared<ASTIdentifier>(column_name));
+    auto exp_list = std::make_shared<ASTExpressionList>();
+    if (func.name == "sum" || func.name == "count")
+    {
+        /// Rewrite "sum" to sumCount().1, rewrite "count" to sumCount().2
+        UInt8 idx = (func.name == "sum" ? 1 : 2);
+        func.name = "tupleElement";
+        exp_list->children.push_back(func_base);
+        exp_list->children.push_back(std::make_shared<ASTLiteral>(idx));
+    }
+    else
+    {
+        /// Rewrite "avg" to sumCount().1 / sumCount().2
+        auto new_arg1 = makeASTFunction("tupleElement", func_base, std::make_shared<ASTLiteral>(UInt8(1)));
+        auto new_arg2 = makeASTFunction("tupleElement", func_base, std::make_shared<ASTLiteral>(UInt8(2)));
+        func.name = "divide";
+        exp_list->children.push_back(new_arg1);
+        exp_list->children.push_back(new_arg2);
+    }
+    func.arguments = exp_list;
+    func.children.push_back(func.arguments);
+}
+
+void fuseSumCountAggregates(std::unordered_map<String, FuseSumCountAggregates> & fuse_map)
+{
+    for (auto & it : fuse_map)
+    {
+        if (it.second.canBeFused())
+        {
+            for (auto & func: it.second.sums)
+                replaceWithSumCount(it.first, *func);
+            for (auto & func: it.second.avgs)
+                replaceWithSumCount(it.first, *func);
+            for (auto & func: it.second.counts)
+                replaceWithSumCount(it.first, *func);
+        }
+    }
+}
+
 bool hasArrayJoin(const ASTPtr & ast)
 {
     if (const ASTFunction * function = ast->as<ASTFunction>())
@@ -293,13 +401,11 @@ void removeUnneededColumnsFromSelectClause(const ASTSelectQuery * select_query,
         else
         {
             ASTFunction * func = elem->as<ASTFunction>();
+
+            /// Never remove untuple. It's result column may be in required columns.
+            /// It is not easy to analyze untuple here, because types were not calculated yes.
             if (func && func->name == "untuple")
-                for (const auto & col : required_result_columns)
-                    if (col.rfind("_ut_", 0) == 0)
-                    {
-                        new_elements.push_back(elem);
-                        break;
-                    }
+                new_elements.push_back(elem);
         }
     }
 
@@ -307,10 +413,10 @@ void removeUnneededColumnsFromSelectClause(const ASTSelectQuery * select_query,
 }
 
 /// Replacing scalar subqueries with constant values.
-void executeScalarSubqueries(ASTPtr & query, const Context & context, size_t subquery_depth, Scalars & scalars, bool only_analyze)
+void executeScalarSubqueries(ASTPtr & query, ContextConstPtr context, size_t subquery_depth, Scalars & scalars, bool only_analyze)
 {
     LogAST log;
-    ExecuteScalarSubqueriesVisitor::Data visitor_data{context, subquery_depth, scalars, only_analyze};
+    ExecuteScalarSubqueriesVisitor::Data visitor_data{WithConstContext{context}, subquery_depth, scalars, only_analyze};
     ExecuteScalarSubqueriesVisitor(visitor_data, log.stream()).visit(query);
 }
 
@@ -405,13 +511,13 @@ void setJoinStrictness(ASTSelectQuery & select_query, JoinStrictness join_defaul
 
 /// Find the columns that are obtained by JOIN.
 void collectJoinedColumns(TableJoin & analyzed_join, const ASTSelectQuery & select_query,
-                          const TablesWithColumns & tables, const Aliases & aliases, ASTPtr & new_where_conditions)
+                          const TablesWithColumns & tables, const Aliases & aliases)
 {
     const ASTTablesInSelectQueryElement * node = select_query.join();
-    if (!node)
+    if (!node || tables.size() < 2)
         return;
 
-    auto & table_join = node->table_join->as<ASTTableJoin &>();
+    const auto & table_join = node->table_join->as<ASTTableJoin &>();
 
     if (table_join.using_expression_list)
     {
@@ -430,33 +536,16 @@ void collectJoinedColumns(TableJoin & analyzed_join, const ASTSelectQuery & sele
     {
         bool is_asof = (table_join.strictness == ASTTableJoin::Strictness::Asof);
 
-        CollectJoinOnKeysVisitor::Data data{analyzed_join, tables[0], tables[1], aliases, is_asof, table_join.kind};
+        CollectJoinOnKeysVisitor::Data data{analyzed_join, tables[0], tables[1], aliases, is_asof};
         CollectJoinOnKeysVisitor(data).visit(table_join.on_expression);
         if (!data.has_some)
             throw Exception("Cannot get JOIN keys from JOIN ON section: " + queryToString(table_join.on_expression),
                             ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
         if (is_asof)
-        {
             data.asofToJoinKeys();
-        }
-        else if (data.new_on_expression)
-        {
-            table_join.on_expression = data.new_on_expression;
-            new_where_conditions = data.new_where_conditions;
-        }
     }
 }
 
-/// Move joined key related to only one table to WHERE clause
-void moveJoinedKeyToWhere(ASTSelectQuery * select_query, ASTPtr & new_where_conditions)
-{
-    if (select_query->where())
-        select_query->setExpression(ASTSelectQuery::Expression::WHERE,
-            makeASTFunction("and", new_where_conditions, select_query->where()));
-    else
-        select_query->setExpression(ASTSelectQuery::Expression::WHERE, new_where_conditions->clone());
-}
-
 
 std::vector<const ASTFunction *> getAggregates(ASTPtr & query, const ASTSelectQuery & select_query)
 {
@@ -666,6 +755,7 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
             partition_source_columns.push_back("_part");
             partition_source_columns.push_back("_partition_id");
             partition_source_columns.push_back("_part_uuid");
+            partition_source_columns.push_back("_partition_value");
             optimize_trivial_count = true;
             for (const auto & required_column : required)
             {
@@ -789,7 +879,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     size_t subquery_depth = select_options.subquery_depth;
     bool remove_duplicates = select_options.remove_duplicates;
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
 
     const NameSet & source_columns_set = result.source_columns_set;
 
@@ -823,7 +913,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
             all_source_columns_set.insert(name);
     }
 
-    normalize(query, result.aliases, all_source_columns_set, settings);
+    normalize(query, result.aliases, all_source_columns_set, select_options.ignore_alias, settings);
 
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
@@ -832,25 +922,22 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     removeUnneededColumnsFromSelectClause(select_query, required_result_columns, remove_duplicates);
 
     /// Executing scalar subqueries - replacing them with constant values.
-    executeScalarSubqueries(query, context, subquery_depth, result.scalars, select_options.only_analyze);
+    executeScalarSubqueries(query, getContext(), subquery_depth, result.scalars, select_options.only_analyze);
 
-    TreeOptimizer::apply(query, result.aliases, source_columns_set, tables_with_columns, context, result.metadata_snapshot, result.rewrite_subqueries);
+    TreeOptimizer::apply(
+        query, result.aliases, source_columns_set, tables_with_columns, getContext(), result.metadata_snapshot, result.rewrite_subqueries);
 
     /// array_join_alias_to_name, array_join_result_to_source.
     getArrayJoinedColumns(query, result, select_query, result.source_columns, source_columns_set);
 
     setJoinStrictness(*select_query, settings.join_default_strictness, settings.any_join_distinct_right_table_keys,
                         result.analyzed_join->table_join);
-
-    ASTPtr new_where_condition = nullptr;
-    collectJoinedColumns(*result.analyzed_join, *select_query, tables_with_columns, result.aliases, new_where_condition);
-    if (new_where_condition)
-        moveJoinedKeyToWhere(select_query, new_where_condition);
+    collectJoinedColumns(*result.analyzed_join, *select_query, tables_with_columns, result.aliases);
 
     /// rewrite filters for select query, must go after getArrayJoinedColumns
     if (settings.optimize_respect_aliases && result.metadata_snapshot)
     {
-        replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.getArrayJoinSourceNameSet(), context);
+        replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.getArrayJoinSourceNameSet(), getContext());
     }
 
     result.aggregates = getAggregates(query, *select_query);
@@ -877,14 +964,14 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     if (query->as<ASTSelectQuery>())
         throw Exception("Not select analyze for select asts.", ErrorCodes::LOGICAL_ERROR);
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = getContext()->getSettingsRef();
 
     TreeRewriterResult result(source_columns, storage, metadata_snapshot, false);
 
-    normalize(query, result.aliases, result.source_columns_set, settings);
+    normalize(query, result.aliases, result.source_columns_set, false, settings);
 
     /// Executing scalar subqueries. Column defaults could be a scalar subquery.
-    executeScalarSubqueries(query, context, 0, result.scalars, false);
+    executeScalarSubqueries(query, getContext(), 0, result.scalars, false);
 
     TreeOptimizer::optimizeIf(query, result.aliases, settings.optimize_if_chain_to_multiif);
 
@@ -906,7 +993,8 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     return std::make_shared<const TreeRewriterResult>(result);
 }
 
-void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, const Settings & settings)
+void TreeRewriter::normalize(
+    ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, bool ignore_alias, const Settings & settings)
 {
     CustomizeCountDistinctVisitor::Data data_count_distinct{settings.count_distinct_implementation};
     CustomizeCountDistinctVisitor(data_count_distinct).visit(query);
@@ -932,7 +1020,18 @@ void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const NameSet &
         CustomizeGlobalNotInVisitor(data_global_not_null_in).visit(query);
     }
 
-    // Rewrite all aggregate functions to add -OrNull suffix to them
+    // Try to fuse sum/avg/count with identical arguments to one sumCount call,
+    // 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)
+    {
+        FuseSumCountAggregatesVisitor::Data data;
+        FuseSumCountAggregatesVisitor(data).visit(query);
+        fuseSumCountAggregates(data.fuse_map);
+    }
+
+    /// Rewrite all aggregate functions to add -OrNull suffix to them
     if (settings.aggregate_functions_null_for_empty)
     {
         CustomizeAggregateFunctionsOrNullVisitor::Data data_or_null{"OrNull"};
@@ -955,7 +1054,7 @@ void TreeRewriter::normalize(ASTPtr & query, Aliases & aliases, const NameSet &
         FunctionNameNormalizer().visit(query.get());
 
     /// Common subexpression elimination. Rewrite rules.
-    QueryNormalizer::Data normalizer_data(aliases, source_columns_set, settings);
+    QueryNormalizer::Data normalizer_data(aliases, source_columns_set, ignore_alias, settings);
     QueryNormalizer(normalizer_data).visit(query);
 }
 
diff --git a/src/Interpreters/TreeRewriter.h b/src/Interpreters/TreeRewriter.h
index 4e3fe21bde9..1f535325666 100644
--- a/src/Interpreters/TreeRewriter.h
+++ b/src/Interpreters/TreeRewriter.h
@@ -3,8 +3,9 @@
 #include <Core/Block.h>
 #include <Core/NamesAndTypes.h>
 #include <Interpreters/Aliases.h>
-#include <Interpreters/SelectQueryOptions.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/SelectQueryOptions.h>
 #include <Storages/IStorage_fwd.h>
 
 namespace DB
@@ -13,7 +14,6 @@ namespace DB
 class ASTFunction;
 struct ASTTablesInSelectQueryElement;
 class TableJoin;
-class Context;
 struct Settings;
 struct SelectQueryOptions;
 using Scalars = std::map<String, Block>;
@@ -92,12 +92,10 @@ using TreeRewriterResultPtr = std::shared_ptr<const TreeRewriterResult>;
 ///  * scalar subqueries are executed replaced with constants
 ///  * unneeded columns are removed from SELECT clause
 ///  * duplicated columns are removed from ORDER BY, LIMIT BY, USING(...).
-class TreeRewriter
+class TreeRewriter : WithConstContext
 {
 public:
-    TreeRewriter(const Context & context_)
-        : context(context_)
-    {}
+    explicit TreeRewriter(ContextConstPtr context_) : WithConstContext(context_) {}
 
     /// Analyze and rewrite not select query
     TreeRewriterResultPtr analyze(
@@ -117,9 +115,7 @@ public:
         std::shared_ptr<TableJoin> table_join = {}) const;
 
 private:
-    const Context & context;
-
-    static void normalize(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, const Settings & settings);
+    static void normalize(ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, bool ignore_alias, const Settings & settings);
 };
 
 }
diff --git a/src/Interpreters/WindowDescription.cpp b/src/Interpreters/WindowDescription.cpp
index a97ef41204a..b9f8597706e 100644
--- a/src/Interpreters/WindowDescription.cpp
+++ b/src/Interpreters/WindowDescription.cpp
@@ -1,9 +1,11 @@
 #include <Interpreters/WindowDescription.h>
 
 #include <Core/Field.h>
+#include <Common/FieldVisitors.h>
 #include <IO/Operators.h>
 #include <Parsers/ASTFunction.h>
 
+
 namespace DB
 {
 
@@ -86,6 +88,38 @@ void WindowFrame::toString(WriteBuffer & buf) const
 
 void WindowFrame::checkValid() const
 {
+    // Check the validity of offsets.
+    if (type == WindowFrame::FrameType::Rows
+        || type == WindowFrame::FrameType::Groups)
+    {
+        if (begin_type == BoundaryType::Offset
+            && !((begin_offset.getType() == Field::Types::UInt64
+                    || begin_offset.getType() == Field::Types::Int64)
+                && begin_offset.get<Int64>() >= 0
+                && begin_offset.get<Int64>() < INT_MAX))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Frame start offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given.",
+                toString(type),
+                applyVisitor(FieldVisitorToString(), begin_offset),
+                Field::Types::toString(begin_offset.getType()));
+        }
+
+        if (end_type == BoundaryType::Offset
+            && !((end_offset.getType() == Field::Types::UInt64
+                    || end_offset.getType() == Field::Types::Int64)
+                && end_offset.get<Int64>() >= 0
+                && end_offset.get<Int64>() < INT_MAX))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Frame end offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given.",
+                toString(type),
+                applyVisitor(FieldVisitorToString(), end_offset),
+                Field::Types::toString(end_offset.getType()));
+        }
+    }
+
+    // Check relative positioning of offsets.
     // UNBOUNDED PRECEDING end and UNBOUNDED FOLLOWING start should have been
     // forbidden at the parsing level.
     assert(!(begin_type == BoundaryType::Unbounded && !begin_preceding));
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index 70a4e0e44e0..4cb478bae85 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Common/FieldVisitors.h>
 #include <Core/Field.h>
 #include <Parsers/IAST_fwd.h>
 #include <AggregateFunctions/IAggregateFunction.h>
diff --git a/src/Interpreters/addMissingDefaults.cpp b/src/Interpreters/addMissingDefaults.cpp
index bb444103d8e..ffabb43ed42 100644
--- a/src/Interpreters/addMissingDefaults.cpp
+++ b/src/Interpreters/addMissingDefaults.cpp
@@ -19,7 +19,8 @@ ActionsDAGPtr addMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context,
+    bool null_as_default)
 {
     auto actions = std::make_shared<ActionsDAG>(header.getColumnsWithTypeAndName());
     auto & index = actions->getIndex();
@@ -80,7 +81,7 @@ ActionsDAGPtr addMissingDefaults(
     }
 
     /// Computes explicitly specified values by default and materialized columns.
-    if (auto dag = evaluateMissingDefaults(actions->getResultColumns(), required_columns, columns, context))
+    if (auto dag = evaluateMissingDefaults(actions->getResultColumns(), required_columns, columns, context, true, null_as_default))
         actions = ActionsDAG::merge(std::move(*actions), std::move(*dag));
     else
         /// Removes unused columns and reorders result.
diff --git a/src/Interpreters/addMissingDefaults.h b/src/Interpreters/addMissingDefaults.h
index e746c7cc9e6..0a3d4de478c 100644
--- a/src/Interpreters/addMissingDefaults.h
+++ b/src/Interpreters/addMissingDefaults.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <unordered_map>
-#include <string>
+#include <Interpreters/Context_fwd.h>
+
 #include <memory>
+#include <string>
+#include <unordered_map>
 
 
 namespace DB
 {
 
 class Block;
-class Context;
 class NamesAndTypesList;
 class ColumnsDescription;
 
@@ -20,12 +21,10 @@ using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
   * 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 can substitute NULL with 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).
   */
 ActionsDAGPtr addMissingDefaults(
-    const Block & header,
-    const NamesAndTypesList & required_columns,
-    const ColumnsDescription & columns,
-    const Context & context);
-
+    const Block & header, const NamesAndTypesList & required_columns,
+    const ColumnsDescription & columns, ContextPtr context, bool null_as_default = false);
 }
diff --git a/src/Interpreters/addTypeConversionToAST.cpp b/src/Interpreters/addTypeConversionToAST.cpp
index 18591fd732c..86fd7926e78 100644
--- a/src/Interpreters/addTypeConversionToAST.cpp
+++ b/src/Interpreters/addTypeConversionToAST.cpp
@@ -32,10 +32,12 @@ ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name)
     return func;
 }
 
-ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, const Context & context)
+ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, ContextConstPtr context)
 {
     auto syntax_analyzer_result = TreeRewriter(context).analyze(ast, all_columns);
-    const auto actions = ExpressionAnalyzer(ast, syntax_analyzer_result, context).getActions(true);
+    const auto actions = ExpressionAnalyzer(ast,
+        syntax_analyzer_result,
+        const_pointer_cast<Context>(context)).getActions(true);
 
     for (const auto & action : actions->getActions())
         if (action.node->type == ActionsDAG::ActionType::ARRAY_JOIN)
diff --git a/src/Interpreters/addTypeConversionToAST.h b/src/Interpreters/addTypeConversionToAST.h
index 16fa98f6e0c..7a4d879dc61 100644
--- a/src/Interpreters/addTypeConversionToAST.h
+++ b/src/Interpreters/addTypeConversionToAST.h
@@ -1,17 +1,19 @@
 #pragma once
 
-#include <common/types.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
+#include <common/types.h>
 
 
 namespace DB
 {
-class Context;
+
 class NamesAndTypesList;
+
 /// It will produce an expression with CAST to get an AST with the required type.
 ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name);
 
 // If same type, then ignore the wrapper of CAST function
-ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, const Context & context);
+ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name, const NamesAndTypesList & all_columns, ContextConstPtr context);
 
 }
diff --git a/src/Interpreters/castColumn.cpp b/src/Interpreters/castColumn.cpp
index e8f8bd3bed1..181cca1e017 100644
--- a/src/Interpreters/castColumn.cpp
+++ b/src/Interpreters/castColumn.cpp
@@ -21,8 +21,7 @@ static ColumnPtr castColumn(const ColumnWithTypeAndName & arg, const DataTypePtr
         }
     };
 
-    FunctionOverloadResolverPtr func_builder_cast =
-        std::make_shared<FunctionOverloadResolverAdaptor>(CastOverloadResolver<cast_type>::createImpl(false));
+    FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<cast_type>::createImpl(false);
 
     auto func_cast = func_builder_cast->build(arguments);
 
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index ed920539bea..0b124634fec 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -14,14 +14,13 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 
 #include <Core/AccurateComparison.h>
-#include <Common/FieldVisitors.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
-#include <DataTypes/DataTypeUUID.h>
-#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <common/DateLUT.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
@@ -67,6 +66,14 @@ static Field convertNumericType(const Field & from, const IDataType & type)
         return convertNumericTypeImpl<Int64, To>(from);
     if (from.getType() == Field::Types::Float64)
         return convertNumericTypeImpl<Float64, To>(from);
+    if (from.getType() == Field::Types::UInt128)
+        return convertNumericTypeImpl<UInt128, To>(from);
+    if (from.getType() == Field::Types::Int128)
+        return convertNumericTypeImpl<Int128, To>(from);
+    if (from.getType() == Field::Types::UInt256)
+        return convertNumericTypeImpl<UInt256, To>(from);
+    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);
@@ -78,9 +85,9 @@ static Field convertIntToDecimalType(const Field & from, const DataTypeDecimal<T
 {
     From value = from.get<From>();
     if (!type.canStoreWhole(value))
-        throw Exception("Number is too much to place in " + type.getName(), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+        throw Exception("Number is too big to place in " + type.getName(), ErrorCodes::ARGUMENT_OUT_OF_BOUND);
 
-    T scaled_value = type.getScaleMultiplier() * value;
+    T scaled_value = type.getScaleMultiplier() * static_cast<T>(value);
     return DecimalField<T>(scaled_value, type.getScale());
 }
 
@@ -108,6 +115,15 @@ static Field convertDecimalType(const Field & from, const To & type)
         return convertIntToDecimalType<UInt64>(from, type);
     if (from.getType() == Field::Types::Int64)
         return convertIntToDecimalType<Int64>(from, type);
+    if (from.getType() == Field::Types::UInt128)
+        return convertIntToDecimalType<UInt128>(from, type);
+    if (from.getType() == Field::Types::Int128)
+        return convertIntToDecimalType<Int128>(from, type);
+    if (from.getType() == Field::Types::UInt256)
+        return convertIntToDecimalType<UInt256>(from, type);
+    if (from.getType() == Field::Types::Int256)
+        return convertIntToDecimalType<Int256>(from, type);
+
     if (from.getType() == Field::Types::String)
         return convertStringToDecimalType(from, type);
 
@@ -125,17 +141,17 @@ static Field convertDecimalType(const Field & from, const To & type)
 
 Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const IDataType * from_type_hint)
 {
+    if (from_type_hint && from_type_hint->equals(type))
+    {
+        return src;
+    }
+
     WhichDataType which_type(type);
     WhichDataType which_from_type;
+
     if (from_type_hint)
     {
         which_from_type = WhichDataType(*from_type_hint);
-
-        // This was added to mitigate converting DateTime64-Field (a typedef to a Decimal64) to DataTypeDate64-compatible type.
-        if (from_type_hint && from_type_hint->equals(type))
-        {
-            return src;
-        }
     }
 
     /// Conversion between Date and DateTime and vice versa.
@@ -179,19 +195,24 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             return src;
         }
 
-        if (which_type.isUUID() && src.getType() == Field::Types::UInt128)
-        {
-            /// Already in needed type.
-            return src;
-        }
-
         if (which_type.isDateTime64() && src.getType() == Field::Types::Decimal64)
         {
             /// Already in needed type.
             return src;
         }
 
-        /// TODO Conversion from integers to DateTime64
+        if (which_type.isDateTime64()
+            && (which_from_type.isNativeInt() || which_from_type.isNativeUInt() || which_from_type.isDateOrDateTime()))
+        {
+            const auto scale = static_cast<const DataTypeDateTime64 &>(type).getScale();
+            const auto decimal_value = DecimalUtils::decimalFromComponents<DateTime64>(src.reinterpret<Int64>(), 0, scale);
+            return Field(DecimalField<DateTime64>(decimal_value, scale));
+        }
+    }
+    else if (which_type.isUUID() && src.getType() == Field::Types::UUID)
+    {
+        /// Already in needed type.
+        return src;
     }
     else if (which_type.isStringOrFixedString())
     {
@@ -364,6 +385,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
 
 }
 
+
 Field convertFieldToType(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint)
 {
     if (from_value.isNull())
@@ -390,18 +412,22 @@ Field convertFieldToType(const Field & from_value, const IDataType & to_type, co
         return convertFieldToTypeImpl(from_value, to_type, from_type_hint);
 }
 
+
 Field convertFieldToTypeOrThrow(const Field & from_value, const IDataType & to_type, const IDataType * from_type_hint)
 {
     bool is_null = from_value.isNull();
     if (is_null && !to_type.isNullable())
         throw Exception(ErrorCodes::TYPE_MISMATCH, "Cannot convert NULL to {}", to_type.getName());
+
     Field converted = convertFieldToType(from_value, to_type, from_type_hint);
+
     if (!is_null && converted.isNull())
         throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
             "Cannot convert value '{}'{}: it cannot be represented as {}",
             toString(from_value),
             from_type_hint ? " from " + from_type_hint->getName() : "",
             to_type.getName());
+
     return converted;
 }
 
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index a3301bcf55b..e6b5893edd7 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -19,7 +19,6 @@
 #include <Interpreters/ReplaceQueryParameterVisitor.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
-
 namespace DB
 {
 
@@ -30,14 +29,14 @@ namespace ErrorCodes
 }
 
 
-std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, const Context & context)
+std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, ContextPtr context)
 {
     NamesAndTypesList source_columns = {{ "_dummy", std::make_shared<DataTypeUInt8>() }};
     auto ast = node->clone();
-    ReplaceQueryParameterVisitor param_visitor(context.getQueryParameters());
+    ReplaceQueryParameterVisitor param_visitor(context->getQueryParameters());
     param_visitor.visit(ast);
 
-    if (context.getSettingsRef().normalize_function_names)
+    if (context->getSettingsRef().normalize_function_names)
         FunctionNameNormalizer().visit(ast.get());
 
     String name = ast->getColumnName();
@@ -66,7 +65,7 @@ std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(co
 }
 
 
-ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, const Context & context)
+ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, ContextPtr context)
 {
     /// If it's already a literal.
     if (node->as<ASTLiteral>())
@@ -74,7 +73,7 @@ ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, const Context &
     return std::make_shared<ASTLiteral>(evaluateConstantExpression(node, context).first);
 }
 
-ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, const Context & context)
+ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, ContextPtr context)
 {
     if (const auto * id = node->as<ASTIdentifier>())
         return std::make_shared<ASTLiteral>(id->name());
@@ -82,18 +81,18 @@ ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, cons
     return evaluateConstantExpressionAsLiteral(node, context);
 }
 
-ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, const Context & context)
+ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, ContextPtr context)
 {
     ASTPtr res = evaluateConstantExpressionOrIdentifierAsLiteral(node, context);
     auto & literal = res->as<ASTLiteral &>();
     if (literal.value.safeGet<String>().empty())
     {
-        String current_database = context.getCurrentDatabase();
+        String current_database = context->getCurrentDatabase();
         if (current_database.empty())
         {
             /// Table was created on older version of ClickHouse and CREATE contains not folded expression.
             /// Current database is not set yet during server startup, so we cannot evaluate it correctly.
-            literal.value = context.getConfigRef().getString("default_database", "default");
+            literal.value = context->getConfigRef().getString("default_database", "default");
         }
         else
             literal.value = current_database;
diff --git a/src/Interpreters/evaluateConstantExpression.h b/src/Interpreters/evaluateConstantExpression.h
index c797b8461de..b95982f5b99 100644
--- a/src/Interpreters/evaluateConstantExpression.h
+++ b/src/Interpreters/evaluateConstantExpression.h
@@ -2,6 +2,7 @@
 
 #include <Core/Block.h>
 #include <Core/Field.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST.h>
 #include <Parsers/IParser.h>
 
@@ -12,7 +13,6 @@
 namespace DB
 {
 
-class Context;
 class ExpressionActions;
 class IDataType;
 
@@ -23,25 +23,25 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
   * Throws exception if it's not a constant expression.
   * Quite suboptimal.
   */
-std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, const Context & context);
+std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(const ASTPtr & node, ContextPtr context);
 
 
 /** Evaluate constant expression and returns ASTLiteral with its value.
   */
-ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, const Context & context);
+ASTPtr evaluateConstantExpressionAsLiteral(const ASTPtr & node, ContextPtr context);
 
 
 /** Evaluate constant expression and returns ASTLiteral with its value.
   * Also, if AST is identifier, then return string literal with its name.
   * Useful in places where some name may be specified as identifier, or as result of a constant expression.
   */
-ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, const Context & context);
+ASTPtr evaluateConstantExpressionOrIdentifierAsLiteral(const ASTPtr & node, ContextPtr context);
 
 /** The same as evaluateConstantExpressionOrIdentifierAsLiteral(...),
  *  but if result is an empty string, replace it with current database name
  *  or default database name.
  */
-ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, const Context & context);
+ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, ContextPtr context);
 
 /** Try to fold condition to countable set of constant values.
   * @param node a condition that we try to fold.
diff --git a/src/Interpreters/examples/CMakeLists.txt b/src/Interpreters/examples/CMakeLists.txt
new file mode 100644
index 00000000000..85daffc4064
--- /dev/null
+++ b/src/Interpreters/examples/CMakeLists.txt
@@ -0,0 +1,40 @@
+add_executable (hash_map hash_map.cpp)
+target_include_directories (hash_map SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
+target_link_libraries (hash_map PRIVATE dbms)
+
+add_executable (hash_map_lookup hash_map_lookup.cpp)
+target_include_directories (hash_map_lookup SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
+target_link_libraries (hash_map_lookup PRIVATE dbms)
+
+add_executable (hash_map3 hash_map3.cpp)
+target_link_libraries (hash_map3 PRIVATE dbms ${FARMHASH_LIBRARIES} metrohash)
+
+add_executable (hash_map_string hash_map_string.cpp)
+target_include_directories (hash_map_string SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
+target_link_libraries (hash_map_string PRIVATE dbms)
+
+add_executable (hash_map_string_2 hash_map_string_2.cpp)
+target_link_libraries (hash_map_string_2 PRIVATE dbms)
+
+add_executable (hash_map_string_3 hash_map_string_3.cpp)
+target_link_libraries (hash_map_string_3 PRIVATE dbms ${FARMHASH_LIBRARIES} metrohash)
+
+add_executable (hash_map_string_small hash_map_string_small.cpp)
+target_include_directories (hash_map_string_small SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
+target_link_libraries (hash_map_string_small PRIVATE dbms)
+
+add_executable (string_hash_map string_hash_map.cpp)
+target_link_libraries (string_hash_map PRIVATE dbms)
+
+add_executable (string_hash_map_aggregation string_hash_map.cpp)
+target_link_libraries (string_hash_map_aggregation PRIVATE dbms)
+
+add_executable (string_hash_set string_hash_set.cpp)
+target_link_libraries (string_hash_set PRIVATE dbms)
+
+add_executable (two_level_hash_map two_level_hash_map.cpp)
+target_include_directories (two_level_hash_map SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
+target_link_libraries (two_level_hash_map PRIVATE dbms)
+
+add_executable (jit_example jit_example.cpp)
+target_link_libraries (jit_example PRIVATE dbms)
diff --git a/src/Interpreters/tests/hash_map.cpp b/src/Interpreters/examples/hash_map.cpp
similarity index 89%
rename from src/Interpreters/tests/hash_map.cpp
rename to src/Interpreters/examples/hash_map.cpp
index 620f2515825..66704ab432a 100644
--- a/src/Interpreters/tests/hash_map.cpp
+++ b/src/Interpreters/examples/hash_map.cpp
@@ -12,7 +12,6 @@
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 */
 #include <common/types.h>
-#include <Core/Row.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
@@ -27,19 +26,6 @@
   * This is important, because if you run all the tests one by one, the results will be incorrect.
   * (Due to the peculiarities of the work of the allocator, the first test takes advantage.)
   *
-  * Depending on USE_AUTO_ARRAY, one of the structures is selected as the value.
-  * USE_AUTO_ARRAY = 0 - uses std::vector (hard-copy structure, sizeof = 24 bytes).
-  * USE_AUTO_ARRAY = 1 - uses AutoArray (a structure specially designed for such cases, sizeof = 8 bytes).
-  *
-  * That is, the test also allows you to compare AutoArray and std::vector.
-  *
-  * If USE_AUTO_ARRAY = 0, then HashMap confidently overtakes all.
-  * If USE_AUTO_ARRAY = 1, then HashMap is slightly less serious (20%) ahead of google::dense_hash_map.
-  *
-  * When using HashMap, AutoArray has a rather serious (40%) advantage over std::vector.
-  * And when using other hash tables, AutoArray even more seriously overtakes std::vector
-  *  (up to three and a half times in the case of std::unordered_map and google::sparse_hash_map).
-  *
   * HashMap, unlike google::dense_hash_map, much more depends on the quality of the hash function.
   *
   * PS. Measure everything yourself, otherwise I'm almost confused.
@@ -49,9 +35,6 @@
   * But in this test, there was something similar to the old scenario of using hash tables in the aggregation.
   */
 
-#define USE_AUTO_ARRAY    0
-
-
 struct AlternativeHash
 {
     size_t operator() (UInt64 x) const
@@ -85,12 +68,7 @@ int main(int argc, char ** argv)
     using namespace DB;
 
     using Key = UInt64;
-
-#if USE_AUTO_ARRAY
-    using Value = AutoArray<IAggregateFunction*>;
-#else
     using Value = std::vector<IAggregateFunction*>;
-#endif
 
     size_t n = argc < 2 ? 10000000 : std::stol(argv[1]);
     //size_t m = std::stol(argv[2]);
@@ -119,13 +97,8 @@ int main(int argc, char ** argv)
 
     INIT
 
-#ifndef USE_AUTO_ARRAY
     #undef INIT
     #define INIT
-#endif
-
-    Row row(1);
-    row[0] = UInt64(0);
 
     std::cerr << "sizeof(Key) = " << sizeof(Key) << ", sizeof(Value) = " << sizeof(Value) << std::endl;
 
diff --git a/src/Interpreters/tests/hash_map3.cpp b/src/Interpreters/examples/hash_map3.cpp
similarity index 100%
rename from src/Interpreters/tests/hash_map3.cpp
rename to src/Interpreters/examples/hash_map3.cpp
diff --git a/src/Interpreters/tests/hash_map_lookup.cpp b/src/Interpreters/examples/hash_map_lookup.cpp
similarity index 100%
rename from src/Interpreters/tests/hash_map_lookup.cpp
rename to src/Interpreters/examples/hash_map_lookup.cpp
diff --git a/src/Interpreters/tests/hash_map_string.cpp b/src/Interpreters/examples/hash_map_string.cpp
similarity index 100%
rename from src/Interpreters/tests/hash_map_string.cpp
rename to src/Interpreters/examples/hash_map_string.cpp
diff --git a/src/Interpreters/tests/hash_map_string_2.cpp b/src/Interpreters/examples/hash_map_string_2.cpp
similarity index 100%
rename from src/Interpreters/tests/hash_map_string_2.cpp
rename to src/Interpreters/examples/hash_map_string_2.cpp
diff --git a/src/Interpreters/tests/hash_map_string_3.cpp b/src/Interpreters/examples/hash_map_string_3.cpp
similarity index 100%
rename from src/Interpreters/tests/hash_map_string_3.cpp
rename to src/Interpreters/examples/hash_map_string_3.cpp
diff --git a/src/Interpreters/tests/hash_map_string_small.cpp b/src/Interpreters/examples/hash_map_string_small.cpp
similarity index 100%
rename from src/Interpreters/tests/hash_map_string_small.cpp
rename to src/Interpreters/examples/hash_map_string_small.cpp
diff --git a/src/Interpreters/examples/jit_example.cpp b/src/Interpreters/examples/jit_example.cpp
new file mode 100644
index 00000000000..9694314b820
--- /dev/null
+++ b/src/Interpreters/examples/jit_example.cpp
@@ -0,0 +1,57 @@
+#include <iostream>
+
+#include <llvm/IR/IRBuilder.h>
+
+#include <Interpreters/JIT/CHJIT.h>
+
+void test_function()
+{
+    std::cerr << "Test function" << std::endl;
+}
+
+int main(int argc, char **argv)
+{
+    (void)(argc);
+    (void)(argv);
+
+    auto jit = DB::CHJIT();
+
+    jit.registerExternalSymbol("test_function", reinterpret_cast<void *>(&test_function));
+
+    auto compiled_module_info = jit.compileModule([](llvm::Module & module)
+    {
+        auto & context = module.getContext();
+        llvm::IRBuilder<> b (context);
+
+        auto * func_declaration_type = llvm::FunctionType::get(b.getVoidTy(), { }, /*isVarArg=*/false);
+        auto * func_declaration = llvm::Function::Create(func_declaration_type, llvm::Function::ExternalLinkage, "test_function", module);
+
+        auto * value_type = b.getInt64Ty();
+        auto * pointer_type = value_type->getPointerTo();
+
+        auto * func_type = llvm::FunctionType::get(b.getVoidTy(), { pointer_type }, /*isVarArg=*/false);
+        auto * function = llvm::Function::Create(func_type, llvm::Function::ExternalLinkage, "test_name", module);
+        auto * entry = llvm::BasicBlock::Create(context, "entry", function);
+
+        auto * argument = function->args().begin();
+        b.SetInsertPoint(entry);
+
+        b.CreateCall(func_declaration);
+
+        auto * load_argument = b.CreateLoad(value_type, argument);
+        auto * value = b.CreateAdd(load_argument, load_argument);
+        b.CreateRet(value);
+    });
+
+    for (const auto & compiled_function_name : compiled_module_info.compiled_functions)
+    {
+        std::cerr << compiled_function_name << std::endl;
+    }
+
+    int64_t value = 5;
+    auto * test_name_function = reinterpret_cast<int64_t (*)(int64_t *)>(jit.findCompiledFunction(compiled_module_info, "test_name"));
+    auto result = test_name_function(&value);
+    std::cerr << "Result " << result << std::endl;
+
+    return 0;
+}
diff --git a/src/Interpreters/tests/string_hash_map.cpp b/src/Interpreters/examples/string_hash_map.cpp
similarity index 100%
rename from src/Interpreters/tests/string_hash_map.cpp
rename to src/Interpreters/examples/string_hash_map.cpp
diff --git a/src/Interpreters/tests/string_hash_set.cpp b/src/Interpreters/examples/string_hash_set.cpp
similarity index 100%
rename from src/Interpreters/tests/string_hash_set.cpp
rename to src/Interpreters/examples/string_hash_set.cpp
diff --git a/src/Interpreters/tests/two_level_hash_map.cpp b/src/Interpreters/examples/two_level_hash_map.cpp
similarity index 100%
rename from src/Interpreters/tests/two_level_hash_map.cpp
rename to src/Interpreters/examples/two_level_hash_map.cpp
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index d4e8d06e613..99ece6bb14c 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -48,17 +48,17 @@ bool isSupportedAlterType(int type)
 }
 
 
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & context)
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context)
 {
     return executeDDLQueryOnCluster(query_ptr_, context, {});
 }
 
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context, const AccessRightsElements & query_requires_access)
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, const AccessRightsElements & query_requires_access)
 {
     return executeDDLQueryOnCluster(query_ptr, context, AccessRightsElements{query_requires_access});
 }
 
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & context, AccessRightsElements && query_requires_access)
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context, AccessRightsElements && query_requires_access)
 {
     /// Remove FORMAT <fmt> and INTO OUTFILE <file> if exists
     ASTPtr query_ptr = query_ptr_->clone();
@@ -71,7 +71,7 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
         throw Exception("Distributed execution is not supported for such DDL queries", ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    if (!context.getSettingsRef().allow_distributed_ddl)
+    if (!context->getSettingsRef().allow_distributed_ddl)
         throw Exception("Distributed DDL queries are prohibited for the user", ErrorCodes::QUERY_IS_PROHIBITED);
 
     if (const auto * query_alter = query_ptr->as<ASTAlterQuery>())
@@ -83,9 +83,9 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
         }
     }
 
-    query->cluster = context.getMacros()->expand(query->cluster);
-    ClusterPtr cluster = context.getCluster(query->cluster);
-    DDLWorker & ddl_worker = context.getDDLWorker();
+    query->cluster = context->getMacros()->expand(query->cluster);
+    ClusterPtr cluster = context->getCluster(query->cluster);
+    DDLWorker & ddl_worker = context->getDDLWorker();
 
     /// Enumerate hosts which will be used to send query.
     Cluster::AddressesWithFailover shards = cluster->getShardsAddresses();
@@ -109,7 +109,7 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
            != query_requires_access.end());
 
     bool use_local_default_database = false;
-    const String & current_database = context.getCurrentDatabase();
+    const String & current_database = context->getCurrentDatabase();
 
     if (need_replace_current_database)
     {
@@ -157,7 +157,7 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
     visitor.visitDDL(query_ptr);
 
     /// Check access rights, assume that all servers have the same users config
-    context.checkAccess(query_requires_access);
+    context->checkAccess(query_requires_access);
 
     DDLLogEntry entry;
     entry.hosts = std::move(hosts);
@@ -169,14 +169,14 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, const Context & cont
     return getDistributedDDLStatus(node_path, entry, context);
 }
 
-BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, const Context & context, const std::optional<Strings> & hosts_to_wait)
+BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait)
 {
     BlockIO io;
-    if (context.getSettingsRef().distributed_ddl_task_timeout == 0)
+    if (context->getSettingsRef().distributed_ddl_task_timeout == 0)
         return io;
 
     auto stream = std::make_shared<DDLQueryStatusInputStream>(node_path, entry, context, hosts_to_wait);
-    if (context.getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
+    if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
     {
         /// Wait for query to finish, but ignore output
         NullBlockOutputStream output{Block{}};
@@ -189,18 +189,18 @@ BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & en
     return io;
 }
 
-DDLQueryStatusInputStream::DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, const Context & context_,
+DDLQueryStatusInputStream::DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_,
                                                      const std::optional<Strings> & hosts_to_wait)
     : node_path(zk_node_path)
     , context(context_)
     , watch(CLOCK_MONOTONIC_COARSE)
     , log(&Poco::Logger::get("DDLQueryStatusInputStream"))
 {
-    if (context.getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::THROW ||
-        context.getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
+    if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::THROW ||
+        context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
         throw_on_timeout = true;
-    else if (context.getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT ||
-             context.getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NEVER_THROW)
+    else if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT ||
+             context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NEVER_THROW)
         throw_on_timeout = false;
     else
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown output mode");
@@ -235,7 +235,7 @@ DDLQueryStatusInputStream::DDLQueryStatusInputStream(const String & zk_node_path
 
     addTotalRowsApprox(waiting_hosts.size());
 
-    timeout_seconds = context.getSettingsRef().distributed_ddl_task_timeout;
+    timeout_seconds = context->getSettingsRef().distributed_ddl_task_timeout;
 }
 
 std::pair<String, UInt16> DDLQueryStatusInputStream::parseHostAndPort(const String & host_id) const
@@ -259,21 +259,21 @@ Block DDLQueryStatusInputStream::readImpl()
     assert(num_hosts_finished <= waiting_hosts.size());
     if (all_hosts_finished || timeout_exceeded)
     {
-        bool throw_if_error_on_host = context.getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW;
+        bool throw_if_error_on_host = context->getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW;
         if (first_exception && throw_if_error_on_host)
             throw Exception(*first_exception);
 
         return res;
     }
 
-    auto zookeeper = context.getZooKeeper();
+    auto zookeeper = context->getZooKeeper();
     size_t try_number = 0;
 
     while (res.rows() == 0)
     {
         if (isCancelled())
         {
-            bool throw_if_error_on_host = context.getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW;
+            bool throw_if_error_on_host = context->getSettingsRef().distributed_ddl_output_mode != DistributedDDLOutputMode::NEVER_THROW;
             if (first_exception && throw_if_error_on_host)
                 throw Exception(*first_exception);
 
diff --git a/src/Interpreters/executeDDLQueryOnCluster.h b/src/Interpreters/executeDDLQueryOnCluster.h
index a33b89d0cb3..bbd39a6e8ec 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.h
+++ b/src/Interpreters/executeDDLQueryOnCluster.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include <DataStreams/BlockIO.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 
 namespace zkutil
@@ -10,7 +12,6 @@ namespace zkutil
 namespace DB
 {
 
-class Context;
 class AccessRightsElements;
 struct DDLLogEntry;
 
@@ -20,16 +21,16 @@ bool isSupportedAlterType(int type);
 
 /// Pushes distributed DDL query to the queue.
 /// Returns DDLQueryStatusInputStream, which reads results of query execution on each host in the cluster.
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context);
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context, const AccessRightsElements & query_requires_access);
-BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, const Context & context, AccessRightsElements && query_requires_access);
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context);
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, const AccessRightsElements & query_requires_access);
+BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr, ContextPtr context, AccessRightsElements && query_requires_access);
 
-BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, const Context & context, const std::optional<Strings> & hosts_to_wait = {});
+BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & entry, ContextPtr context, const std::optional<Strings> & hosts_to_wait = {});
 
 class DDLQueryStatusInputStream final : public IBlockInputStream
 {
 public:
-    DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, const Context & context_, const std::optional<Strings> & hosts_to_wait = {});
+    DDLQueryStatusInputStream(const String & zk_node_path, const DDLLogEntry & entry, ContextPtr context_, const std::optional<Strings> & hosts_to_wait = {});
 
     String getName() const override { return "DDLQueryStatusInputStream"; }
 
@@ -48,7 +49,7 @@ private:
     std::pair<String, UInt16> parseHostAndPort(const String & host_id) const;
 
     String node_path;
-    const Context & context;
+    ContextPtr context;
     Stopwatch watch;
     Poco::Logger * log;
 
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index a5c21405ff1..a78c810d5d4 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -121,7 +121,7 @@ static String joinLines(const String & query)
 }
 
 
-static String prepareQueryForLogging(const String & query, Context & context)
+static String prepareQueryForLogging(const String & query, ContextPtr context)
 {
     String res = query;
 
@@ -136,14 +136,14 @@ static String prepareQueryForLogging(const String & query, Context & context)
         }
     }
 
-    res = res.substr(0, context.getSettingsRef().log_queries_cut_to_length);
+    res = res.substr(0, context->getSettingsRef().log_queries_cut_to_length);
 
     return res;
 }
 
 
 /// Log query into text log (not into system table).
-static void logQuery(const String & query, const Context & context, bool internal)
+static void logQuery(const String & query, ContextPtr context, bool internal)
 {
     if (internal)
     {
@@ -151,14 +151,14 @@ static void logQuery(const String & query, const Context & context, bool interna
     }
     else
     {
-        const auto & client_info = context.getClientInfo();
+        const auto & client_info = context->getClientInfo();
 
         const auto & current_query_id = client_info.current_query_id;
         const auto & initial_query_id = client_info.initial_query_id;
         const auto & current_user = client_info.current_user;
 
-        String comment = context.getSettingsRef().log_comment;
-        size_t max_query_size = context.getSettingsRef().max_query_size;
+        String comment = context->getSettingsRef().log_comment;
+        size_t max_query_size = context->getSettingsRef().max_query_size;
 
         if (comment.size() > max_query_size)
             comment.resize(max_query_size);
@@ -170,11 +170,11 @@ static void logQuery(const String & query, const Context & context, bool interna
             client_info.current_address.toString(),
             (current_user != "default" ? ", user: " + current_user : ""),
             (!initial_query_id.empty() && current_query_id != initial_query_id ? ", initial_query_id: " + initial_query_id : std::string()),
-            (context.getSettingsRef().use_antlr_parser ? "experimental" : "production"),
+            (context->getSettingsRef().use_antlr_parser ? "experimental" : "production"),
             comment,
             joinLines(query));
 
-        if (client_info.client_trace_context.trace_id)
+        if (client_info.client_trace_context.trace_id != UUID())
         {
             LOG_TRACE(&Poco::Logger::get("executeQuery"),
                 "OpenTelemetry traceparent '{}'",
@@ -204,19 +204,30 @@ static void setExceptionStackTrace(QueryLogElement & elem)
 
 
 /// Log exception (with query info) into text log (not into system table).
-static void logException(Context & context, QueryLogElement & elem)
+static void logException(ContextPtr context, QueryLogElement & elem)
 {
     String comment;
     if (!elem.log_comment.empty())
         comment = fmt::format(" (comment: {})", elem.log_comment);
 
     if (elem.stack_trace.empty())
-        LOG_ERROR(&Poco::Logger::get("executeQuery"), "{} (from {}){} (in query: {})",
-            elem.exception, context.getClientInfo().current_address.toString(), comment, joinLines(elem.query));
+        LOG_ERROR(
+            &Poco::Logger::get("executeQuery"),
+            "{} (from {}){} (in query: {})",
+            elem.exception,
+            context->getClientInfo().current_address.toString(),
+            comment,
+            joinLines(elem.query));
     else
-        LOG_ERROR(&Poco::Logger::get("executeQuery"), "{} (from {}){} (in query: {})"
+        LOG_ERROR(
+            &Poco::Logger::get("executeQuery"),
+            "{} (from {}){} (in query: {})"
             ", Stack trace (when copying this message, always include the lines below):\n\n{}",
-            elem.exception, context.getClientInfo().current_address.toString(), comment, joinLines(elem.query), elem.stack_trace);
+            elem.exception,
+            context->getClientInfo().current_address.toString(),
+            comment,
+            joinLines(elem.query),
+            elem.stack_trace);
 }
 
 inline UInt64 time_in_microseconds(std::chrono::time_point<std::chrono::system_clock> timepoint)
@@ -230,13 +241,13 @@ inline UInt64 time_in_seconds(std::chrono::time_point<std::chrono::system_clock>
     return std::chrono::duration_cast<std::chrono::seconds>(timepoint.time_since_epoch()).count();
 }
 
-static void onExceptionBeforeStart(const String & query_for_logging, Context & context, UInt64 current_time_us, ASTPtr ast)
+static void onExceptionBeforeStart(const String & query_for_logging, ContextPtr context, UInt64 current_time_us, ASTPtr ast)
 {
     /// Exception before the query execution.
-    if (auto quota = context.getQuota())
+    if (auto quota = context->getQuota())
         quota->used(Quota::ERRORS, 1, /* check_exceeded = */ false);
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     /// Log the start of query execution into the table if necessary.
     QueryLogElement elem;
@@ -251,7 +262,7 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     elem.query_start_time = current_time_us / 1000000;
     elem.query_start_time_microseconds = current_time_us;
 
-    elem.current_database = context.getCurrentDatabase();
+    elem.current_database = context->getCurrentDatabase();
     elem.query = query_for_logging;
     elem.normalized_query_hash = normalizedQueryHash<false>(query_for_logging);
 
@@ -260,7 +271,7 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     elem.exception_code = getCurrentExceptionCode();
     elem.exception = getCurrentExceptionMessage(false);
 
-    elem.client_info = context.getClientInfo();
+    elem.client_info = context->getClientInfo();
 
     elem.log_comment = settings.log_comment;
     if (elem.log_comment.size() > settings.max_query_size)
@@ -274,17 +285,17 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     CurrentThread::finalizePerformanceCounters();
 
     if (settings.log_queries && elem.type >= settings.log_queries_min_type && !settings.log_queries_min_query_duration_ms.totalMilliseconds())
-        if (auto query_log = context.getQueryLog())
+        if (auto query_log = context->getQueryLog())
             query_log->add(elem);
 
-    if (auto opentelemetry_span_log = context.getOpenTelemetrySpanLog();
-        context.query_trace_context.trace_id
+    if (auto opentelemetry_span_log = context->getOpenTelemetrySpanLog();
+        context->query_trace_context.trace_id != UUID()
             && opentelemetry_span_log)
     {
         OpenTelemetrySpanLogElement span;
-        span.trace_id = context.query_trace_context.trace_id;
-        span.span_id = context.query_trace_context.span_id;
-        span.parent_span_id = context.getClientInfo().client_trace_context.span_id;
+        span.trace_id = context->query_trace_context.trace_id;
+        span.span_id = context->query_trace_context.span_id;
+        span.parent_span_id = context->getClientInfo().client_trace_context.span_id;
         span.operation_name = "query";
         span.start_time_us = current_time_us;
         span.finish_time_us = current_time_us;
@@ -299,11 +310,11 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
         span.attribute_names.push_back("clickhouse.query_id");
         span.attribute_values.push_back(elem.client_info.current_query_id);
 
-        if (!context.query_trace_context.tracestate.empty())
+        if (!context->query_trace_context.tracestate.empty())
         {
             span.attribute_names.push_back("clickhouse.tracestate");
             span.attribute_values.push_back(
-                context.query_trace_context.tracestate);
+                context->query_trace_context.tracestate);
         }
 
         opentelemetry_span_log->add(span);
@@ -324,19 +335,19 @@ static void onExceptionBeforeStart(const String & query_for_logging, Context & c
     }
 }
 
-static void setQuerySpecificSettings(ASTPtr & ast, Context & context)
+static void setQuerySpecificSettings(ASTPtr & ast, ContextMutablePtr context)
 {
     if (auto * ast_insert_into = dynamic_cast<ASTInsertQuery *>(ast.get()))
     {
         if (ast_insert_into->watch)
-            context.setSetting("output_format_enable_streaming", 1);
+            context->setSetting("output_format_enable_streaming", 1);
     }
 }
 
 static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     const char * begin,
     const char * end,
-    Context & context,
+    ContextMutablePtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool has_query_tail,
@@ -349,7 +360,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     assert(internal || CurrentThread::get().getQueryContext()->getCurrentQueryId() == CurrentThread::getQueryId());
 #endif
 
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     ASTPtr ast;
     const char * query_end;
@@ -365,7 +376,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 #if !defined(ARCADIA_BUILD)
         if (settings.use_antlr_parser)
         {
-            ast = parseQuery(begin, end, max_query_size, settings.max_parser_depth, context.getCurrentDatabase());
+            ast = parseQuery(begin, end, max_query_size, settings.max_parser_depth, context->getCurrentDatabase());
         }
         else
         {
@@ -456,9 +467,9 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     try
     {
         /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
-        if (context.hasQueryParameters())
+        if (context->hasQueryParameters())
         {
-            ReplaceQueryParameterVisitor visitor(context.getQueryParameters());
+            ReplaceQueryParameterVisitor visitor(context->getQueryParameters());
             visitor.visit(ast);
             query = serializeAST(*ast);
         }
@@ -476,7 +487,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         }
 
         /// Normalize SelectWithUnionQuery
-        NormalizeSelectWithUnionQueryVisitor::Data data{context.getSettingsRef().union_default_mode};
+        NormalizeSelectWithUnionQueryVisitor::Data data{context->getSettingsRef().union_default_mode};
         NormalizeSelectWithUnionQueryVisitor{data}.visit(ast);
 
         /// Check the limits.
@@ -487,12 +498,12 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         if (!internal && !ast->as<ASTShowProcesslistQuery>())
         {
             /// processlist also has query masked now, to avoid secrets leaks though SHOW PROCESSLIST by other users.
-            process_list_entry = context.getProcessList().insert(query_for_logging, ast.get(), context);
-            context.setProcessListElement(&process_list_entry->get());
+            process_list_entry = context->getProcessList().insert(query_for_logging, ast.get(), context);
+            context->setProcessListElement(&process_list_entry->get());
         }
 
         /// Load external tables if they were provided
-        context.initializeExternalTablesIfSet();
+        context->initializeExternalTablesIfSet();
 
         auto * insert_query = ast->as<ASTInsertQuery>();
         if (insert_query && insert_query->select)
@@ -504,7 +515,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 insert_query->tryFindInputFunction(input_function);
                 if (input_function)
                 {
-                    StoragePtr storage = context.executeTableFunction(input_function);
+                    StoragePtr storage = context->executeTableFunction(input_function);
                     auto & input_storage = dynamic_cast<StorageInput &>(*storage);
                     auto input_metadata_snapshot = input_storage.getInMemoryMetadataPtr();
                     BlockInputStreamPtr input_stream = std::make_shared<InputStreamFromASTInsertQuery>(
@@ -515,14 +526,14 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         }
         else
             /// reset Input callbacks if query is not INSERT SELECT
-            context.resetInputCallbacks();
+            context->resetInputCallbacks();
 
         auto interpreter = InterpreterFactory::get(ast, context, SelectQueryOptions(stage).setInternal(internal));
 
         std::shared_ptr<const EnabledQuota> quota;
         if (!interpreter->ignoreQuota())
         {
-            quota = context.getQuota();
+            quota = context->getQuota();
             if (quota)
             {
                 if (ast->as<ASTSelectQuery>() || ast->as<ASTSelectWithUnionQuery>())
@@ -541,7 +552,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         StreamLocalLimits limits;
         if (!interpreter->ignoreLimits())
         {
-            limits.mode = LimitsMode::LIMITS_CURRENT;
+            limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
             limits.size_limits = SizeLimits(settings.max_result_rows, settings.max_result_bytes, settings.result_overflow_mode);
         }
 
@@ -558,7 +569,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// Save insertion table (not table function). TODO: support remote() table function.
             auto table_id = insert_interpreter->getDatabaseTable();
             if (!table_id.empty())
-                context.setInsertionTable(std::move(table_id));
+                context->setInsertionTable(std::move(table_id));
         }
 
         if (process_list_entry)
@@ -578,8 +589,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         {
             /// 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());
+            pipeline.setProgressCallback(context->getProgressCallback());
+            pipeline.setProcessListElement(context->getProcessListElement());
             if (stage == QueryProcessingStage::Complete && !pipeline.isCompleted())
             {
                 pipeline.resize(1);
@@ -597,8 +608,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// Limits apply only to the final result.
             if (res.in)
             {
-                res.in->setProgressCallback(context.getProgressCallback());
-                res.in->setProcessListElement(context.getProcessListElement());
+                res.in->setProgressCallback(context->getProgressCallback());
+                res.in->setProcessListElement(context->getProcessListElement());
                 if (stage == QueryProcessingStage::Complete)
                 {
                     if (!interpreter->ignoreQuota())
@@ -612,7 +623,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             {
                 if (auto * stream = dynamic_cast<CountingBlockOutputStream *>(res.out.get()))
                 {
-                    stream->setProcessListElement(context.getProcessListElement());
+                    stream->setProcessListElement(context->getProcessListElement());
                 }
             }
         }
@@ -621,18 +632,18 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         {
             QueryLogElement elem;
 
-            elem.type = QueryLogElementType::QUERY_START;
+            elem.type = QueryLogElementType::QUERY_START; //-V1048
 
             elem.event_time = time_in_seconds(current_time);
             elem.event_time_microseconds = time_in_microseconds(current_time);
             elem.query_start_time = time_in_seconds(current_time);
             elem.query_start_time_microseconds = time_in_microseconds(current_time);
 
-            elem.current_database = context.getCurrentDatabase();
+            elem.current_database = context->getCurrentDatabase();
             elem.query = query_for_logging;
             elem.normalized_query_hash = normalizedQueryHash<false>(query_for_logging);
 
-            elem.client_info = context.getClientInfo();
+            elem.client_info = context->getClientInfo();
 
             bool log_queries = settings.log_queries && !internal;
 
@@ -641,16 +652,17 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             {
                 if (use_processors)
                 {
-                    const auto & info = context.getQueryAccessInfo();
+                    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;
                 }
 
                 interpreter->extendQueryLogElem(elem, ast, context, query_database, query_table);
 
                 if (settings.log_query_settings)
-                    elem.query_settings = std::make_shared<Settings>(context.getSettingsRef());
+                    elem.query_settings = std::make_shared<Settings>(context->getSettingsRef());
 
                 elem.log_comment = settings.log_comment;
                 if (elem.log_comment.size() > settings.max_query_size)
@@ -658,7 +670,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                 if (elem.type >= settings.log_queries_min_type && !settings.log_queries_min_query_duration_ms.totalMilliseconds())
                 {
-                    if (auto query_log = context.getQueryLog())
+                    if (auto query_log = context->getQueryLog())
                         query_log->add(elem);
                 }
             }
@@ -692,7 +704,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             };
 
             /// Also make possible for caller to log successful query finish and exception during execution.
-            auto finish_callback = [elem, &context, ast,
+            auto finish_callback = [elem, context, ast,
                  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(),
@@ -700,7 +712,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             ]
                 (IBlockInputStream * stream_in, IBlockOutputStream * stream_out, QueryPipeline * query_pipeline) mutable
             {
-                QueryStatus * process_list_elem = context.getProcessListElement();
+                QueryStatus * process_list_elem = context->getProcessListElement();
 
                 if (!process_list_elem)
                     return;
@@ -708,7 +720,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 /// Update performance counters before logging to query_log
                 CurrentThread::finalizePerformanceCounters();
 
-                QueryStatusInfo info = process_list_elem->getInfo(true, context.getSettingsRef().log_profile_events);
+                QueryStatusInfo info = process_list_elem->getInfo(true, context->getSettingsRef().log_profile_events);
 
                 double elapsed_seconds = info.elapsed_seconds;
 
@@ -721,7 +733,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.event_time_microseconds = time_in_microseconds(finish_time);
                 status_info_to_query_log(elem, info, ast);
 
-                auto progress_callback = context.getProgressCallback();
+                auto progress_callback = context->getProgressCallback();
 
                 if (progress_callback)
                     progress_callback(Progress(WriteProgress(info.written_rows, info.written_bytes)));
@@ -763,7 +775,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.thread_ids = std::move(info.thread_ids);
                 elem.profile_counters = std::move(info.profile_counters);
 
-                const auto & factories_info = context.getQueryFactoriesInfo();
+                const auto & factories_info = context->getQueryFactoriesInfo();
                 elem.used_aggregate_functions = factories_info.aggregate_functions;
                 elem.used_aggregate_function_combinators = factories_info.aggregate_function_combinators;
                 elem.used_database_engines = factories_info.database_engines;
@@ -776,18 +788,18 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                 if (log_queries && elem.type >= log_queries_min_type && Int64(elem.query_duration_ms) >= log_queries_min_query_duration_ms)
                 {
-                    if (auto query_log = context.getQueryLog())
+                    if (auto query_log = context->getQueryLog())
                         query_log->add(elem);
                 }
 
-                if (auto opentelemetry_span_log = context.getOpenTelemetrySpanLog();
-                    context.query_trace_context.trace_id
+                if (auto opentelemetry_span_log = context->getOpenTelemetrySpanLog();
+                    context->query_trace_context.trace_id != UUID()
                         && opentelemetry_span_log)
                 {
                     OpenTelemetrySpanLogElement span;
-                    span.trace_id = context.query_trace_context.trace_id;
-                    span.span_id = context.query_trace_context.span_id;
-                    span.parent_span_id = context.getClientInfo().client_trace_context.span_id;
+                    span.trace_id = context->query_trace_context.trace_id;
+                    span.span_id = context->query_trace_context.span_id;
+                    span.parent_span_id = context->getClientInfo().client_trace_context.span_id;
                     span.operation_name = "query";
                     span.start_time_us = elem.query_start_time_microseconds;
                     span.finish_time_us = time_in_microseconds(finish_time);
@@ -801,18 +813,18 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
                     span.attribute_names.push_back("clickhouse.query_id");
                     span.attribute_values.push_back(elem.client_info.current_query_id);
-                    if (!context.query_trace_context.tracestate.empty())
+                    if (!context->query_trace_context.tracestate.empty())
                     {
                         span.attribute_names.push_back("clickhouse.tracestate");
                         span.attribute_values.push_back(
-                            context.query_trace_context.tracestate);
+                            context->query_trace_context.tracestate);
                     }
 
                     opentelemetry_span_log->add(span);
                 }
             };
 
-            auto exception_callback = [elem, &context, ast,
+            auto exception_callback = [elem, context, ast,
                  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(),
@@ -833,8 +845,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 elem.exception_code = getCurrentExceptionCode();
                 elem.exception = getCurrentExceptionMessage(false);
 
-                QueryStatus * process_list_elem = context.getProcessListElement();
-                const Settings & current_settings = context.getSettingsRef();
+                QueryStatus * process_list_elem = context->getProcessListElement();
+                const Settings & current_settings = context->getSettingsRef();
 
                 /// Update performance counters before logging to query_log
                 CurrentThread::finalizePerformanceCounters();
@@ -852,7 +864,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 /// In case of exception we log internal queries also
                 if (log_queries && elem.type >= log_queries_min_type && Int64(elem.query_duration_ms) >= log_queries_min_query_duration_ms)
                 {
-                    if (auto query_log = context.getQueryLog())
+                    if (auto query_log = context->getQueryLog())
                         query_log->add(elem);
                 }
 
@@ -898,7 +910,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
 BlockIO executeQuery(
     const String & query,
-    Context & context,
+    ContextMutablePtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool may_have_embedded_data)
@@ -912,7 +924,7 @@ BlockIO executeQuery(
     {
         String format_name = ast_query_with_output->format
                 ? getIdentifierName(ast_query_with_output->format)
-                : context.getDefaultFormat();
+                : context->getDefaultFormat();
 
         if (format_name == "Null")
             streams.null_format = true;
@@ -923,7 +935,7 @@ BlockIO executeQuery(
 
 BlockIO executeQuery(
     const String & query,
-    Context & context,
+    ContextMutablePtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool may_have_embedded_data,
@@ -942,7 +954,7 @@ void executeQuery(
     ReadBuffer & istr,
     WriteBuffer & ostr,
     bool allow_into_outfile,
-    Context & context,
+    ContextMutablePtr context,
     std::function<void(const String &, const String &, const String &, const String &)> set_result_details)
 {
     PODArray<char> parse_buf;
@@ -953,7 +965,7 @@ void executeQuery(
     if (!istr.hasPendingData())
         istr.next();
 
-    size_t max_query_size = context.getSettingsRef().max_query_size;
+    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))
@@ -1012,12 +1024,12 @@ void executeQuery(
 
             String format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
                 ? getIdentifierName(ast_query_with_output->format)
-                : context.getDefaultFormat();
+                : context->getDefaultFormat();
 
-            auto out = context.getOutputStreamParallelIfPossible(format_name, *out_buf, streams.in->getHeader());
+            auto out = context->getOutputStreamParallelIfPossible(format_name, *out_buf, streams.in->getHeader());
 
             /// Save previous progress callback if any. TODO Do it more conveniently.
-            auto previous_progress_callback = context.getProgressCallback();
+            auto previous_progress_callback = context->getProgressCallback();
 
             /// NOTE Progress callback takes shared ownership of 'out'.
             streams.in->setProgressCallback([out, previous_progress_callback] (const Progress & progress)
@@ -1028,7 +1040,8 @@ void executeQuery(
             });
 
             if (set_result_details)
-                set_result_details(context.getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
+                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(); });
         }
@@ -1050,7 +1063,7 @@ void executeQuery(
 
             String format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
                                  ? getIdentifierName(ast_query_with_output->format)
-                                 : context.getDefaultFormat();
+                                 : context->getDefaultFormat();
 
             if (!pipeline.isCompleted())
             {
@@ -1059,11 +1072,11 @@ void executeQuery(
                     return std::make_shared<MaterializingTransform>(header);
                 });
 
-                auto out = context.getOutputFormatParallelIfPossible(format_name, *out_buf, pipeline.getHeader());
+                auto out = context->getOutputFormatParallelIfPossible(format_name, *out_buf, pipeline.getHeader());
                 out->setAutoFlush();
 
                 /// Save previous progress callback if any. TODO Do it more conveniently.
-                auto previous_progress_callback = context.getProgressCallback();
+                auto previous_progress_callback = context->getProgressCallback();
 
                 /// NOTE Progress callback takes shared ownership of 'out'.
                 pipeline.setProgressCallback([out, previous_progress_callback] (const Progress & progress)
@@ -1074,13 +1087,14 @@ void executeQuery(
                 });
 
                 if (set_result_details)
-                    set_result_details(context.getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
+                    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());
+                pipeline.setProgressCallback(context->getProgressCallback());
             }
 
             {
diff --git a/src/Interpreters/executeQuery.h b/src/Interpreters/executeQuery.h
index 2850bb3baf4..6448b26a652 100644
--- a/src/Interpreters/executeQuery.h
+++ b/src/Interpreters/executeQuery.h
@@ -2,7 +2,6 @@
 
 #include <Core/QueryProcessingStage.h>
 #include <DataStreams/BlockIO.h>
-
 #include <Processors/QueryPipeline.h>
 
 namespace DB
@@ -10,7 +9,6 @@ namespace DB
 
 class ReadBuffer;
 class WriteBuffer;
-class Context;
 
 
 /// Parse and execute a query.
@@ -18,7 +16,7 @@ void executeQuery(
     ReadBuffer & istr,                  /// Where to read query from (and data for INSERT, if present).
     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.
-    Context & context,                  /// DB, tables, data types, storage engines, functions, aggregate functions...
+    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.
 );
 
@@ -39,7 +37,7 @@ void executeQuery(
 /// must be done separately.
 BlockIO executeQuery(
     const String & query,     /// Query text without INSERT data. The latter must be written to BlockIO::out.
-    Context & context,        /// DB, tables, data types, storage engines, functions, aggregate functions...
+    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
@@ -48,7 +46,7 @@ BlockIO executeQuery(
 /// Old interface with allow_processors flag. For compatibility.
 BlockIO executeQuery(
     const String & query,
-    Context & context,
+    ContextMutablePtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
     bool may_have_embedded_data,
diff --git a/src/Interpreters/getHeaderForProcessingStage.cpp b/src/Interpreters/getHeaderForProcessingStage.cpp
index b56b90cdf3f..9c7c86a0b88 100644
--- a/src/Interpreters/getHeaderForProcessingStage.cpp
+++ b/src/Interpreters/getHeaderForProcessingStage.cpp
@@ -12,21 +12,27 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-/// Rewrite original query removing joined tables from it
-bool removeJoin(ASTSelectQuery & select)
+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 &>();
-    if (!joined_table.table_join)
-        return false;
+    return joined_table.table_join != nullptr;
+}
 
-    /// The most simple temporary solution: leave only the first table in query.
-    /// TODO: we also need to remove joined columns and related functions (taking in account aliases if any).
-    tables->children.resize(1);
-    return true;
+/// Rewrite original query removing joined tables from it
+bool removeJoin(ASTSelectQuery & select)
+{
+    if (hasJoin(select))
+    {
+        /// The most simple temporary solution: leave only the first table in query.
+        /// TODO: we also need to remove joined columns and related functions (taking in account aliases if any).
+        select.tables()->children.resize(1);
+        return true;
+    }
+    return false;
 }
 
 Block getHeaderForProcessingStage(
@@ -34,7 +40,7 @@ Block getHeaderForProcessingStage(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage)
 {
     switch (processed_stage)
diff --git a/src/Interpreters/getHeaderForProcessingStage.h b/src/Interpreters/getHeaderForProcessingStage.h
index ec238edf774..75a89bc5d39 100644
--- a/src/Interpreters/getHeaderForProcessingStage.h
+++ b/src/Interpreters/getHeaderForProcessingStage.h
@@ -1,7 +1,9 @@
 #pragma once
+
 #include <Core/Block.h>
 #include <Core/Names.h>
 #include <Core/QueryProcessingStage.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
@@ -11,9 +13,9 @@ class IStorage;
 struct StorageInMemoryMetadata;
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 struct SelectQueryInfo;
-class Context;
 class ASTSelectQuery;
 
+bool hasJoin(const ASTSelectQuery & select);
 bool removeJoin(ASTSelectQuery & select);
 
 Block getHeaderForProcessingStage(
@@ -21,7 +23,7 @@ Block getHeaderForProcessingStage(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage);
 
 }
diff --git a/src/Interpreters/getTableExpressions.cpp b/src/Interpreters/getTableExpressions.cpp
index a4e971c302c..22eb307071c 100644
--- a/src/Interpreters/getTableExpressions.cpp
+++ b/src/Interpreters/getTableExpressions.cpp
@@ -75,7 +75,7 @@ ASTPtr extractTableExpression(const ASTSelectQuery & select, size_t table_number
 
 static NamesAndTypesList getColumnsFromTableExpression(
     const ASTTableExpression & table_expression,
-    const Context & context,
+    ContextPtr context,
     NamesAndTypesList & materialized,
     NamesAndTypesList & aliases,
     NamesAndTypesList & virtuals)
@@ -89,7 +89,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
     else if (table_expression.table_function)
     {
         const auto table_function = table_expression.table_function;
-        auto * query_context = const_cast<Context *>(&context.getQueryContext());
+        auto query_context = context->getQueryContext();
         const auto & function_storage = query_context->executeTableFunction(table_function);
         auto function_metadata_snapshot = function_storage->getInMemoryMetadataPtr();
         const auto & columns = function_metadata_snapshot->getColumns();
@@ -100,7 +100,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
     }
     else if (table_expression.database_and_table_name)
     {
-        auto table_id = context.resolveStorageID(table_expression.database_and_table_name);
+        auto table_id = context->resolveStorageID(table_expression.database_and_table_name);
         const auto & table = DatabaseCatalog::instance().getTable(table_id, context);
         auto table_metadata_snapshot = table->getInMemoryMetadataPtr();
         const auto & columns = table_metadata_snapshot->getColumns();
@@ -113,7 +113,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
     return names_and_type_list;
 }
 
-NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, const Context & context)
+NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, ContextPtr context)
 {
     NamesAndTypesList materialized;
     NamesAndTypesList aliases;
@@ -121,15 +121,15 @@ NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table
     return getColumnsFromTableExpression(table_expression, context, materialized, aliases, virtuals);
 }
 
-TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, const Context & context)
+TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, ContextPtr context)
 {
     TablesWithColumns tables_with_columns;
 
     if (!table_expressions.empty())
     {
-        String current_database = context.getCurrentDatabase();
-        bool include_alias_cols = context.getSettingsRef().asterisk_include_alias_columns;
-        bool include_materialized_cols = context.getSettingsRef().asterisk_include_materialized_columns;
+        String current_database = context->getCurrentDatabase();
+        bool include_alias_cols = context->getSettingsRef().asterisk_include_alias_columns;
+        bool include_materialized_cols = context->getSettingsRef().asterisk_include_materialized_columns;
 
         for (const ASTTableExpression * table_expression : table_expressions)
         {
diff --git a/src/Interpreters/getTableExpressions.h b/src/Interpreters/getTableExpressions.h
index 9254fb9d6a0..961176437b5 100644
--- a/src/Interpreters/getTableExpressions.h
+++ b/src/Interpreters/getTableExpressions.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/NamesAndTypes.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 
 namespace DB
@@ -8,7 +9,6 @@ namespace DB
 
 struct ASTTableExpression;
 class ASTSelectQuery;
-class Context;
 
 NameSet removeDuplicateColumns(NamesAndTypesList & columns);
 
@@ -16,7 +16,7 @@ std::vector<const ASTTableExpression *> getTableExpressions(const ASTSelectQuery
 const ASTTableExpression * getTableExpression(const ASTSelectQuery & select, size_t table_number);
 ASTPtr extractTableExpression(const ASTSelectQuery & select, size_t table_number);
 
-NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, const Context & context);
-TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, const Context & context);
+NamesAndTypesList getColumnsFromTableExpression(const ASTTableExpression & table_expression, ContextPtr context);
+TablesWithColumns getDatabaseAndTablesWithColumns(const std::vector<const ASTTableExpression *> & table_expressions, ContextPtr context);
 
 }
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index 47cd6cc20f6..ff16c7b3ff6 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -24,13 +24,22 @@ namespace
 {
 
 /// Add all required expressions for missing columns calculation
-void addDefaultRequiredExpressionsRecursively(const Block & block, const String & required_column, const ColumnsDescription & columns, ASTPtr default_expr_list_accum, NameSet & added_columns)
+void addDefaultRequiredExpressionsRecursively(
+    const Block & block, const String & required_column_name, DataTypePtr required_column_type,
+    const ColumnsDescription & columns, ASTPtr default_expr_list_accum, NameSet & added_columns, bool null_as_default)
 {
     checkStackSize();
-    if (block.has(required_column) || added_columns.count(required_column))
+
+    bool is_column_in_query = block.has(required_column_name);
+    bool convert_null_to_default = false;
+
+    if (is_column_in_query)
+        convert_null_to_default = null_as_default && block.findByName(required_column_name)->type->isNullable() && !required_column_type->isNullable();
+
+    if ((is_column_in_query && !convert_null_to_default) || added_columns.count(required_column_name))
         return;
 
-    auto column_default = columns.getDefault(required_column);
+    auto column_default = columns.getDefault(required_column_name);
 
     if (column_default)
     {
@@ -43,22 +52,25 @@ void addDefaultRequiredExpressionsRecursively(const Block & block, const String
         RequiredSourceColumnsVisitor(columns_context).visit(column_default_expr);
         NameSet required_columns_names = columns_context.requiredColumns();
 
-        auto cast_func = makeASTFunction("CAST", column_default_expr, std::make_shared<ASTLiteral>(columns.get(required_column).type->getName()));
-        default_expr_list_accum->children.emplace_back(setAlias(cast_func, required_column));
-        added_columns.emplace(required_column);
+        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));
+        default_expr_list_accum->children.emplace_back(setAlias(expr, required_column_name));
 
-        for (const auto & required_column_name : required_columns_names)
-            addDefaultRequiredExpressionsRecursively(block, required_column_name, columns, default_expr_list_accum, added_columns);
+        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);
     }
 }
 
-ASTPtr defaultRequiredExpressions(const Block & block, const NamesAndTypesList & required_columns, const ColumnsDescription & columns)
+ASTPtr defaultRequiredExpressions(const Block & block, const NamesAndTypesList & required_columns, const ColumnsDescription & columns, bool null_as_default)
 {
     ASTPtr default_expr_list = std::make_shared<ASTExpressionList>();
 
     NameSet added_columns;
     for (const auto & column : required_columns)
-        addDefaultRequiredExpressionsRecursively(block, column.name, columns, default_expr_list, added_columns);
+        addDefaultRequiredExpressionsRecursively(block, column.name, column.type, columns, default_expr_list, added_columns, null_as_default);
 
     if (default_expr_list->children.empty())
         return nullptr;
@@ -92,7 +104,7 @@ ActionsDAGPtr createExpressions(
     ASTPtr expr_list,
     bool save_unneeded_columns,
     const NamesAndTypesList & required_columns,
-    const Context & context)
+    ContextPtr context)
 {
     if (!expr_list)
         return nullptr;
@@ -114,7 +126,7 @@ ActionsDAGPtr createExpressions(
 
 }
 
-void performRequiredConversions(Block & block, const NamesAndTypesList & required_columns, const Context & context)
+void performRequiredConversions(Block & block, const NamesAndTypesList & required_columns, ContextPtr context)
 {
     ASTPtr conversion_expr_list = convertRequiredExpressions(block, required_columns);
     if (conversion_expr_list->children.empty())
@@ -131,12 +143,14 @@ ActionsDAGPtr evaluateMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
-    const Context & context, bool save_unneeded_columns)
+    ContextPtr context,
+    bool save_unneeded_columns,
+    bool null_as_default)
 {
     if (!columns.hasDefaults())
         return nullptr;
 
-    ASTPtr expr_list = defaultRequiredExpressions(header, required_columns, columns);
+    ASTPtr expr_list = defaultRequiredExpressions(header, required_columns, columns, null_as_default);
     return createExpressions(header, expr_list, save_unneeded_columns, required_columns, context);
 }
 
diff --git a/src/Interpreters/inplaceBlockConversions.h b/src/Interpreters/inplaceBlockConversions.h
index 63540e2994d..cc8261693f9 100644
--- a/src/Interpreters/inplaceBlockConversions.h
+++ b/src/Interpreters/inplaceBlockConversions.h
@@ -1,31 +1,34 @@
 #pragma once
 
-#include <unordered_map>
-#include <string>
+#include <Interpreters/Context_fwd.h>
+
 #include <memory>
+#include <string>
+#include <unordered_map>
 
 
 namespace DB
 {
 
 class Block;
-class Context;
 class NamesAndTypesList;
 class ColumnsDescription;
 
 class ActionsDAG;
 using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
 
-/// Create actions which adds missing defaults to block according to required_columns using columns description.
+/// Create actions which adds missing defaults to block according to required_columns using columns description
+/// or substitute NULL into DEFAULT value in case of INSERT SELECT query (null_as_default) if according setting is 1.
 /// Return nullptr if no actions required.
 ActionsDAGPtr evaluateMissingDefaults(
     const Block & header,
     const NamesAndTypesList & required_columns,
     const ColumnsDescription & columns,
-    const Context & context, bool save_unneeded_columns = true);
+    ContextPtr context,
+    bool save_unneeded_columns = true,
+    bool null_as_default = false);
 
 /// Tries to convert columns in block to required_columns
-void performRequiredConversions(Block & block,
-    const NamesAndTypesList & required_columns,
-    const Context & context);
+void performRequiredConversions(Block & block, const NamesAndTypesList & required_columns, ContextPtr context);
+
 }
diff --git a/src/Interpreters/interpretSubquery.cpp b/src/Interpreters/interpretSubquery.cpp
index cf343a4fda2..2fb2f390b67 100644
--- a/src/Interpreters/interpretSubquery.cpp
+++ b/src/Interpreters/interpretSubquery.cpp
@@ -22,14 +22,14 @@ namespace ErrorCodes
 }
 
 std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, size_t subquery_depth, const Names & required_source_columns)
+    const ASTPtr & table_expression, ContextPtr context, size_t subquery_depth, const Names & required_source_columns)
 {
     auto subquery_options = SelectQueryOptions(QueryProcessingStage::Complete, subquery_depth);
     return interpretSubquery(table_expression, context, required_source_columns, subquery_options);
 }
 
 std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, const Names & required_source_columns, const SelectQueryOptions & options)
+    const ASTPtr & table_expression, ContextPtr context, const Names & required_source_columns, const SelectQueryOptions & options)
 {
     if (auto * expr = table_expression->as<ASTTableExpression>())
     {
@@ -59,13 +59,13 @@ std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
       *  max_rows_in_join, max_bytes_in_join, join_overflow_mode,
       *  which are checked separately (in the Set, Join objects).
       */
-    Context subquery_context = context;
-    Settings subquery_settings = context.getSettings();
+    auto subquery_context = Context::createCopy(context);
+    Settings subquery_settings = context->getSettings();
     subquery_settings.max_result_rows = 0;
     subquery_settings.max_result_bytes = 0;
     /// The calculation of `extremes` does not make sense and is not necessary (if you do it, then the `extremes` of the subquery can be taken instead of the whole query).
     subquery_settings.extremes = false;
-    subquery_context.setSettings(subquery_settings);
+    subquery_context->setSettings(subquery_settings);
 
     auto subquery_options = options.subquery();
 
@@ -88,14 +88,14 @@ std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
         /// get columns list for target table
         if (function)
         {
-            auto * query_context = const_cast<Context *>(&context.getQueryContext());
+            auto query_context = context->getQueryContext();
             const auto & storage = query_context->executeTableFunction(table_expression);
             columns = storage->getInMemoryMetadataPtr()->getColumns().getOrdinary();
             select_query->addTableFunction(*const_cast<ASTPtr *>(&table_expression)); // XXX: const_cast should be avoided!
         }
         else
         {
-            auto table_id = context.resolveStorageID(table_expression);
+            auto table_id = context->resolveStorageID(table_expression);
             const auto & storage = DatabaseCatalog::instance().getTable(table_id, context);
             columns = storage->getInMemoryMetadataPtr()->getColumns().getOrdinary();
             select_query->replaceDatabaseAndTable(table_id);
diff --git a/src/Interpreters/interpretSubquery.h b/src/Interpreters/interpretSubquery.h
index 2aee6ffd81a..3836d1f7664 100644
--- a/src/Interpreters/interpretSubquery.h
+++ b/src/Interpreters/interpretSubquery.h
@@ -6,12 +6,10 @@
 namespace DB
 {
 
-class Context;
+std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
+    const ASTPtr & table_expression, ContextPtr context, size_t subquery_depth, const Names & required_source_columns);
 
 std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, size_t subquery_depth, const Names & required_source_columns);
-
-std::shared_ptr<InterpreterSelectWithUnionQuery> interpretSubquery(
-    const ASTPtr & table_expression, const Context & context, const Names & required_source_columns, const SelectQueryOptions & options);
+    const ASTPtr & table_expression, ContextPtr context, const Names & required_source_columns, const SelectQueryOptions & options);
 
 }
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/join_common.cpp
index 9a9253cee75..80299610a44 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/join_common.cpp
@@ -49,20 +49,53 @@ ColumnPtr changeLowCardinality(const ColumnPtr & column, const ColumnPtr & dst_s
 namespace JoinCommon
 {
 
-void convertColumnToNullable(ColumnWithTypeAndName & column, bool low_card_nullability)
+
+bool canBecomeNullable(const DataTypePtr & type)
 {
-    if (low_card_nullability && column.type->lowCardinality())
+    bool can_be_inside = type->canBeInsideNullable();
+    if (const auto * low_cardinality_type = typeid_cast<const DataTypeLowCardinality *>(type.get()))
+        can_be_inside |= low_cardinality_type->getDictionaryType()->canBeInsideNullable();
+    return can_be_inside;
+}
+
+/// Add nullability to type.
+/// Note: LowCardinality(T) transformed to LowCardinality(Nullable(T))
+DataTypePtr convertTypeToNullable(const DataTypePtr & type)
+{
+    if (const auto * low_cardinality_type = typeid_cast<const DataTypeLowCardinality *>(type.get()))
+    {
+        const auto & dict_type = low_cardinality_type->getDictionaryType();
+        if (dict_type->canBeInsideNullable())
+            return std::make_shared<DataTypeLowCardinality>(makeNullable(dict_type));
+    }
+    return makeNullable(type);
+}
+
+void convertColumnToNullable(ColumnWithTypeAndName & column, bool remove_low_card)
+{
+    if (remove_low_card && column.type->lowCardinality())
     {
         column.column = recursiveRemoveLowCardinality(column.column);
         column.type = recursiveRemoveLowCardinality(column.type);
     }
 
-    if (column.type->isNullable() || !column.type->canBeInsideNullable())
+    if (column.type->isNullable() || !canBecomeNullable(column.type))
         return;
 
-    column.type = makeNullable(column.type);
+    column.type = convertTypeToNullable(column.type);
+
     if (column.column)
-        column.column = makeNullable(column.column);
+    {
+        if (column.column->lowCardinality())
+        {
+            /// Convert nested to nullable, not LowCardinality itself
+            ColumnLowCardinality * col_as_lc = assert_cast<ColumnLowCardinality *>(column.column->assumeMutable().get());
+            if (!col_as_lc->nestedIsNullable())
+                col_as_lc->nestedToNullable();
+        }
+        else
+            column.column = makeNullable(column.column);
+    }
 }
 
 void convertColumnsToNullable(Block & block, size_t starting_pos)
@@ -96,7 +129,7 @@ void changeColumnRepresentation(const ColumnPtr & src_column, ColumnPtr & dst_co
     ColumnPtr dst_not_null = JoinCommon::emptyNotNullableClone(dst_column);
     bool lowcard_src = JoinCommon::emptyNotNullableClone(src_column)->lowCardinality();
     bool lowcard_dst = dst_not_null->lowCardinality();
-    bool change_lowcard = (!lowcard_src && lowcard_dst) || (lowcard_src && !lowcard_dst);
+    bool change_lowcard = lowcard_src != lowcard_dst;
 
     if (nullable_src && !nullable_dst)
     {
@@ -248,7 +281,7 @@ void createMissedColumns(Block & block)
     for (size_t i = 0; i < block.columns(); ++i)
     {
         auto & column = block.getByPosition(i);
-        if (!column.column)
+        if (!column.column) //-V1051
             column.column = column.type->createColumn();
     }
 }
@@ -284,6 +317,11 @@ void joinTotals(const Block & totals, const Block & columns_to_add, const TableJ
         for (size_t i = 0; i < columns_to_add.columns(); ++i)
         {
             const auto & col = columns_to_add.getByPosition(i);
+            if (block.has(col.name))
+            {
+                /// For StorageJoin we discarded table qualifiers, so some names may clash
+                continue;
+            }
             block.insert({
                 col.type->createColumnConstWithDefaultValue(1)->convertToFullColumnIfConst(),
                 col.type,
diff --git a/src/Interpreters/join_common.h b/src/Interpreters/join_common.h
index cec41438448..9a000aa107a 100644
--- a/src/Interpreters/join_common.h
+++ b/src/Interpreters/join_common.h
@@ -15,8 +15,9 @@ using ColumnRawPtrs = std::vector<const IColumn *>;
 
 namespace JoinCommon
 {
-
-void convertColumnToNullable(ColumnWithTypeAndName & column, bool low_card_nullability = false);
+bool canBecomeNullable(const DataTypePtr & type);
+DataTypePtr convertTypeToNullable(const DataTypePtr & type);
+void convertColumnToNullable(ColumnWithTypeAndName & column, bool remove_low_card = false);
 void convertColumnsToNullable(Block & block, size_t starting_pos = 0);
 void removeColumnNullability(ColumnWithTypeAndName & column);
 void changeColumnRepresentation(const ColumnPtr & src_column, ColumnPtr & dst_column);
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 71d3c7e6e5b..43f9727c355 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -18,20 +18,23 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
 
 static void executeCreateQuery(
     const String & query,
-    Context & context,
+    ContextMutablePtr context,
     const String & database,
     const String & file_name,
     bool has_force_restore_data_flag)
 {
     ParserCreateQuery parser;
-    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "in file " + file_name, 0, context.getSettingsRef().max_parser_depth);
+    ASTPtr ast = parseQuery(
+        parser, query.data(), query.data() + query.size(), "in file " + file_name, 0, context->getSettingsRef().max_parser_depth);
 
     auto & ast_create_query = ast->as<ASTCreateQuery &>();
     ast_create_query.database = database;
@@ -45,7 +48,7 @@ static void executeCreateQuery(
 
 
 static void loadDatabase(
-    Context & context,
+    ContextMutablePtr context,
     const String & database,
     const String & database_path,
     bool force_restore_data)
@@ -53,13 +56,13 @@ static void loadDatabase(
     String database_attach_query;
     String database_metadata_file = database_path + ".sql";
 
-    if (Poco::File(database_metadata_file).exists())
+    if (fs::exists(fs::path(database_metadata_file)))
     {
         /// There is .sql file with database creation statement.
         ReadBufferFromFile in(database_metadata_file, 1024);
         readStringUntilEOF(database_attach_query, in);
     }
-    else if (Poco::File(database_path).exists())
+    else if (fs::exists(fs::path(database_path)))
     {
         /// 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";
@@ -73,8 +76,7 @@ static void loadDatabase(
 
     try
     {
-        executeCreateQuery(database_attach_query, context, database,
-            database_metadata_file, force_restore_data);
+        executeCreateQuery(database_attach_query, context, database, database_metadata_file, force_restore_data);
     }
     catch (Exception & e)
     {
@@ -84,45 +86,46 @@ static void loadDatabase(
 }
 
 
-void loadMetadata(Context & context, const String & default_database_name)
+void loadMetadata(ContextMutablePtr context, const String & default_database_name)
 {
     Poco::Logger * log = &Poco::Logger::get("loadMetadata");
 
-    String path = context.getPath() + "metadata";
+    String path = context->getPath() + "metadata";
 
     /** There may exist 'force_restore_data' file, that means,
       *  skip safety threshold on difference of data parts while initializing tables.
       * This file is deleted after successful loading of tables.
       * (flag is "one-shot")
       */
-    Poco::File force_restore_data_flag_file(context.getFlagsPath() + "force_restore_data");
-    bool has_force_restore_data_flag = force_restore_data_flag_file.exists();
+    auto force_restore_data_flag_file = fs::path(context->getFlagsPath()) / "force_restore_data";
+    bool has_force_restore_data_flag = fs::exists(force_restore_data_flag_file);
 
     /// Loop over databases.
     std::map<String, String> databases;
-    Poco::DirectoryIterator dir_end;
-    for (Poco::DirectoryIterator it(path); it != dir_end; ++it)
+    fs::directory_iterator dir_end;
+    for (fs::directory_iterator it(path); it != dir_end; ++it)
     {
-        if (it->isLink())
+        if (it->is_symlink())
             continue;
 
-        if (!it->isDirectory())
+        const auto current_file = it->path().filename().string();
+        if (!it->is_directory())
         {
             /// TODO: DETACH DATABASE PERMANENTLY ?
-            if (endsWith(it.name(), ".sql"))
+            if (fs::path(current_file).extension() == ".sql")
             {
-                String db_name = it.name().substr(0, it.name().size() - 4);
+                String db_name = fs::path(current_file).stem();
                 if (db_name != DatabaseCatalog::SYSTEM_DATABASE)
-                    databases.emplace(unescapeForFileName(db_name), path + "/" + db_name);
+                    databases.emplace(unescapeForFileName(db_name), fs::path(path) / db_name);
             }
 
             /// Temporary fails may be left from previous server runs.
-            if (endsWith(it.name(), ".tmp"))
+            if (fs::path(current_file).extension() == ".tmp")
             {
-                LOG_WARNING(log, "Removing temporary file {}", it->path());
+                LOG_WARNING(log, "Removing temporary file {}", it->path().string());
                 try
                 {
-                    it->remove();
+                    fs::remove(it->path());
                 }
                 catch (...)
                 {
@@ -135,13 +138,13 @@ void loadMetadata(Context & context, const String & default_database_name)
         }
 
         /// For '.svn', '.gitignore' directory and similar.
-        if (it.name().at(0) == '.')
+        if (current_file.at(0) == '.')
             continue;
 
-        if (it.name() == DatabaseCatalog::SYSTEM_DATABASE)
+        if (current_file == DatabaseCatalog::SYSTEM_DATABASE)
             continue;
 
-        databases.emplace(unescapeForFileName(it.name()), it.path().toString());
+        databases.emplace(unescapeForFileName(current_file), it->path().string());
     }
 
     /// clickhouse-local creates DatabaseMemory as default database by itself
@@ -158,7 +161,7 @@ void loadMetadata(Context & context, const String & default_database_name)
     {
         try
         {
-            force_restore_data_flag_file.remove();
+            fs::remove(force_restore_data_flag_file);
         }
         catch (...)
         {
@@ -168,11 +171,11 @@ void loadMetadata(Context & context, const String & default_database_name)
 }
 
 
-void loadMetadataSystem(Context & context)
+void loadMetadataSystem(ContextMutablePtr context)
 {
-    String path = context.getPath() + "metadata/" + DatabaseCatalog::SYSTEM_DATABASE;
+    String path = context->getPath() + "metadata/" + DatabaseCatalog::SYSTEM_DATABASE;
     String metadata_file = path + ".sql";
-    if (Poco::File(path).exists() || Poco::File(metadata_file).exists())
+    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);
diff --git a/src/Interpreters/loadMetadata.h b/src/Interpreters/loadMetadata.h
index b23887d5282..cf038a42855 100644
--- a/src/Interpreters/loadMetadata.h
+++ b/src/Interpreters/loadMetadata.h
@@ -1,16 +1,16 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 
 namespace DB
 {
 
-class Context;
-
 /// Load tables from system database. Only real tables like query_log, part_log.
 /// You should first load system database, then attach system tables that you need into it, then load other databases.
-void loadMetadataSystem(Context & context);
+void loadMetadataSystem(ContextMutablePtr context);
 
 /// Load tables from databases and add them to context. Database 'system' is ignored. Use separate function to load system tables.
-void loadMetadata(Context & context, const String & default_database_name = {});
+void loadMetadata(ContextMutablePtr context, const String & default_database_name = {});
 
 }
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.cpp b/src/Interpreters/replaceAliasColumnsInQuery.cpp
index 4daa787c397..d85c1b23c2f 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.cpp
+++ b/src/Interpreters/replaceAliasColumnsInQuery.cpp
@@ -6,11 +6,11 @@
 namespace DB
 {
 
-void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, const Context & context)
+void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, ContextConstPtr context)
 {
-    ColumnAliasesVisitor::Data aliase_column_data(columns, forbidden_columns, context);
-    ColumnAliasesVisitor aliase_column_visitor(aliase_column_data);
-    aliase_column_visitor.visit(ast);
+    ColumnAliasesVisitor::Data aliases_column_data(columns, forbidden_columns, context);
+    ColumnAliasesVisitor aliases_column_visitor(aliases_column_data);
+    aliases_column_visitor.visit(ast);
 }
 
 }
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.h b/src/Interpreters/replaceAliasColumnsInQuery.h
index bf7143ba099..90963ea167b 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.h
+++ b/src/Interpreters/replaceAliasColumnsInQuery.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <common/types.h>
 #include <Core/Names.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
+#include <common/types.h>
 
 namespace DB
 {
 
 class ColumnsDescription;
-class Context;
-void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, const Context & context);
+
+void replaceAliasColumnsInQuery(ASTPtr & ast, const ColumnsDescription & columns, const NameSet & forbidden_columns, ContextConstPtr context);
 
 }
diff --git a/src/Interpreters/sortBlock.h b/src/Interpreters/sortBlock.h
index a3b0a10b8f9..faf9384901b 100644
--- a/src/Interpreters/sortBlock.h
+++ b/src/Interpreters/sortBlock.h
@@ -32,7 +32,7 @@ bool isAlreadySorted(const Block & block, const SortDescription & description);
 /// Column with description for sort
 struct ColumnWithSortDescription
 {
-    const IColumn * column;
+    const IColumn * column = nullptr;
     SortColumnDescription description;
 
     /// It means, that this column is ColumnConst
diff --git a/src/Interpreters/tests/CMakeLists.txt b/src/Interpreters/tests/CMakeLists.txt
index 8905d2fe6e6..e69de29bb2d 100644
--- a/src/Interpreters/tests/CMakeLists.txt
+++ b/src/Interpreters/tests/CMakeLists.txt
@@ -1,45 +0,0 @@
-add_executable (hash_map hash_map.cpp)
-target_include_directories (hash_map SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
-target_link_libraries (hash_map PRIVATE dbms)
-
-add_executable (hash_map_lookup hash_map_lookup.cpp)
-target_include_directories (hash_map_lookup SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
-target_link_libraries (hash_map_lookup PRIVATE dbms)
-
-add_executable (hash_map3 hash_map3.cpp)
-target_link_libraries (hash_map3 PRIVATE dbms ${FARMHASH_LIBRARIES} metrohash)
-
-add_executable (hash_map_string hash_map_string.cpp)
-target_include_directories (hash_map_string SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
-target_link_libraries (hash_map_string PRIVATE dbms)
-
-add_executable (hash_map_string_2 hash_map_string_2.cpp)
-target_link_libraries (hash_map_string_2 PRIVATE dbms)
-
-add_executable (hash_map_string_3 hash_map_string_3.cpp)
-target_link_libraries (hash_map_string_3 PRIVATE dbms ${FARMHASH_LIBRARIES} metrohash)
-
-add_executable (hash_map_string_small hash_map_string_small.cpp)
-target_include_directories (hash_map_string_small SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
-target_link_libraries (hash_map_string_small PRIVATE dbms)
-
-add_executable (string_hash_map string_hash_map.cpp)
-target_link_libraries (string_hash_map PRIVATE dbms)
-
-add_executable (string_hash_map_aggregation string_hash_map.cpp)
-target_link_libraries (string_hash_map_aggregation PRIVATE dbms)
-
-add_executable (string_hash_set string_hash_set.cpp)
-target_link_libraries (string_hash_set PRIVATE dbms)
-
-add_executable (two_level_hash_map two_level_hash_map.cpp)
-target_include_directories (two_level_hash_map SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})
-target_link_libraries (two_level_hash_map PRIVATE dbms)
-
-add_executable (in_join_subqueries_preprocessor in_join_subqueries_preprocessor.cpp)
-target_link_libraries (in_join_subqueries_preprocessor PRIVATE clickhouse_aggregate_functions dbms clickhouse_parsers)
-
-if (OS_LINUX)
-    add_executable (internal_iotop internal_iotop.cpp)
-    target_link_libraries (internal_iotop PRIVATE dbms)
-endif ()
diff --git a/src/Interpreters/tests/gtest_cycle_aliases.cpp b/src/Interpreters/tests/gtest_cycle_aliases.cpp
index c13e98cd69f..df40d96a66e 100644
--- a/src/Interpreters/tests/gtest_cycle_aliases.cpp
+++ b/src/Interpreters/tests/gtest_cycle_aliases.cpp
@@ -20,6 +20,6 @@ TEST(QueryNormalizer, SimpleCycleAlias)
     aliases["b"] = parseQuery(parser, "a as b", 0, 0)->children[0];
 
     Settings settings;
-    QueryNormalizer::Data normalizer_data(aliases, {}, settings);
+    QueryNormalizer::Data normalizer_data(aliases, {}, false, settings);
     EXPECT_THROW(QueryNormalizer(normalizer_data).visit(ast), Exception);
 }
diff --git a/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp b/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
deleted file mode 100644
index 2b53277d02f..00000000000
--- a/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
+++ /dev/null
@@ -1,1264 +0,0 @@
-#include <ext/shared_ptr_helper.h>
-
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ParserSelectQuery.h>
-#include <Parsers/parseQuery.h>
-#include <Parsers/queryToString.h>
-#include <Interpreters/InJoinSubqueriesPreprocessor.h>
-#include <Interpreters/Context.h>
-#include <Core/Settings.h>
-#include <Storages/IStorage.h>
-#include <Databases/IDatabase.h>
-#include <Databases/DatabaseOrdinary.h>
-#include <Common/typeid_cast.h>
-
-#include <iostream>
-#include <vector>
-#include <utility>
-#include <string>
-
-
-namespace DB
-{
-    namespace ErrorCodes
-    {
-        extern const int DISTRIBUTED_IN_JOIN_SUBQUERY_DENIED;
-    }
-}
-
-
-/// Simplified version of the StorageDistributed class.
-class StorageDistributedFake final : public ext::shared_ptr_helper<StorageDistributedFake>, public DB::IStorage
-{
-    friend struct ext::shared_ptr_helper<StorageDistributedFake>;
-public:
-    std::string getName() const override { return "DistributedFake"; }
-    bool isRemote() const override { return true; }
-    size_t getShardCount() const { return shard_count; }
-    std::string getRemoteDatabaseName() const { return remote_database; }
-    std::string getRemoteTableName() const { return remote_table; }
-
-protected:
-    StorageDistributedFake(const std::string & remote_database_, const std::string & remote_table_, size_t shard_count_)
-        : IStorage({"", ""}), remote_database(remote_database_), remote_table(remote_table_), shard_count(shard_count_)
-    {
-    }
-
-private:
-    const std::string remote_database;
-    const std::string remote_table;
-    size_t shard_count;
-};
-
-
-class CheckShardsAndTablesMock : public DB::InJoinSubqueriesPreprocessor::CheckShardsAndTables
-{
-public:
-    bool hasAtLeastTwoShards(const DB::IStorage & table) const override
-    {
-        if (!table.isRemote())
-            return false;
-
-        const StorageDistributedFake * distributed = dynamic_cast<const StorageDistributedFake *>(&table);
-        if (!distributed)
-            return false;
-
-        return distributed->getShardCount() >= 2;
-    }
-
-    std::pair<std::string, std::string>
-    getRemoteDatabaseAndTableName(const DB::IStorage & table) const override
-    {
-        const StorageDistributedFake & distributed = dynamic_cast<const StorageDistributedFake &>(table);
-        return { distributed.getRemoteDatabaseName(), distributed.getRemoteTableName() };
-    }
-};
-
-
-struct TestEntry
-{
-    unsigned int line_num;
-    std::string input;
-    std::string expected_output;
-    size_t shard_count;
-    DB::DistributedProductMode mode;
-    bool expected_success;
-};
-
-using TestEntries = std::vector<TestEntry>;
-using TestResult = std::pair<bool, std::string>;
-
-TestResult check(const TestEntry & entry);
-bool parse(DB::ASTPtr & ast, const std::string & query);
-bool equals(const DB::ASTPtr & lhs, const DB::ASTPtr & rhs);
-void reorder(DB::IAST * ast);
-
-
-TestEntries entries =
-{
-    /// Trivial query.
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        0,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        1,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        0,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        1,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        0,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        1,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        0,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        1,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT 1",
-        "SELECT 1",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    /// Section IN / depth 1
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        1,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        1,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits)",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits)",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section NOT IN / depth 1
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM remote_db.remote_visits)",
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM remote_db.remote_visits)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM remote_db.remote_visits)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM remote_db.remote_visits)",
-        "SELECT count() FROM test.visits_all WHERE UserID NOT IN (SELECT UserID FROM remote_db.remote_visits)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section GLOBAL IN / depth 1
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section GLOBAL NOT IN / depth 1
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL NOT IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section JOIN / depth 1
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits) USING UserID",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits) USING UserID",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits) USING UserID",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section GLOBAL JOIN / depth 1
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all) USING UserID",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section JOIN / depth 1 / 2 of the subquery.
-
-    {
-        __LINE__,
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits WHERE RegionID = 2) USING UserID",
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits WHERE RegionID = 2) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE RegionID = 2) USING UserID",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section IN / depth 1 / table at level 2
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT count() FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits))",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section GLOBAL IN / depth 1 / table at level 2
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        "SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section IN at level 1, GLOBAL IN section at level 2.
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)))",
-        "SELECT UserID FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)))",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)))",
-        "SELECT UserID FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)))",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)))",
-        "SELECT UserID FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote_db.remote_visits WHERE UserID GLOBAL IN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits)))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section JOIN / depth 1 / table at level 2
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)) USING UserID",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)) USING UserID",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits)) USING UserID",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM test.visits_all)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits)) USING UserID",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM (SELECT UserID FROM remote_db.remote_visits)) USING UserID",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section IN / depth 2
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM remote_db.remote_visits WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM remote_db.remote_visits WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section JOIN / depth 2
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM test.visits_all)) USING CounterID)",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM test.visits_all)) USING CounterID)",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM remote_db.remote_visits)) USING CounterID)",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM remote_db.remote_visits)) USING CounterID)",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM test.visits_all)) USING CounterID)",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM test.visits_all)) USING CounterID)",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM test.visits_all)) USING CounterID)",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID GLOBAL IN (SELECT CounterID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM test.visits_all)) USING CounterID)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.visits_all ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM test.visits_all)) USING CounterID)",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM remote_db.remote_visits ALL INNER JOIN (SELECT CounterID FROM (SELECT CounterID FROM remote_db.remote_visits)) USING CounterID)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section JOIN / depth 2
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        "SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE OtherID GLOBAL IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM remote_db.remote_visits WHERE RegionID = 2) USING OtherID)",
-        "SELECT UserID FROM test.visits_all WHERE OtherID GLOBAL IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM remote_db.remote_visits WHERE RegionID = 2) USING OtherID)",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE OtherID GLOBAL IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        "SELECT UserID FROM test.visits_all WHERE OtherID GLOBAL IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        "SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        "SELECT UserID FROM test.visits_all WHERE OtherID GLOBAL IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) GLOBAL ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM (SELECT OtherID FROM test.visits_all WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2) USING OtherID)",
-        "SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM (SELECT OtherID FROM remote_db.remote_visits WHERE RegionID = 1) ALL INNER JOIN (SELECT OtherID FROM remote_db.remote_visits WHERE RegionID = 2) USING OtherID)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section JOIN / section IN
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2)) USING UserID",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2)) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2)) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2)) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM remote_db.remote_visits WHERE RegionID = 2)) USING UserID",
-        "SELECT UserID FROM test.visits_all GLOBAL ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM remote_db.remote_visits WHERE RegionID = 2)) USING UserID",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM test.visits_all WHERE OtherID IN (SELECT OtherID FROM test.visits_all WHERE RegionID = 2)) USING UserID",
-        "SELECT UserID FROM test.visits_all ALL INNER JOIN (SELECT UserID FROM remote_db.remote_visits WHERE OtherID IN (SELECT OtherID FROM remote_db.remote_visits WHERE RegionID = 2)) USING UserID",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Table function.
-
-    {
-        __LINE__,
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote('127.0.0.{1,2}', test, visits_all))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote('127.0.0.{1,2}', test, visits_all))",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote('127.0.0.{1,2}', test, visits_all))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote('127.0.0.{1,2}', test, visits_all))",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        "SELECT count() FROM remote('127.0.0.{1,2}', test, visits_all) WHERE UserID IN (SELECT UserID FROM test.visits_all)",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote('127.0.0.{1,2}', test, visits_all))",
-        "SELECT count() FROM test.visits_all WHERE UserID IN (SELECT UserID FROM remote('127.0.0.{1,2}', test, visits_all))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Section IN / depth 2 / two distributed tables
-
-    {
-        __LINE__,
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM test.hits_all WHERE BrowserID IN (SELECT BrowserID FROM test.visits_all WHERE OtherID = 1))",
-        "SELECT UserID, RegionID FROM test.visits_all WHERE CounterID IN (SELECT CounterID FROM distant_db.distant_hits WHERE BrowserID IN (SELECT BrowserID FROM remote_db.remote_visits WHERE OtherID = 1))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Aggregate function.
-
-    {
-        __LINE__,
-        "SELECT sum(RegionID IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        "SELECT sum(RegionID IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        2,
-        DB::DistributedProductMode::ALLOW,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT sum(RegionID IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        "SELECT sum(RegionID IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        2,
-        DB::DistributedProductMode::DENY,
-        false
-    },
-
-    {
-        __LINE__,
-        "SELECT sum(RegionID GLOBAL IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        "SELECT sum(RegionID GLOBAL IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT sum(RegionID IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        "SELECT sum(RegionID GLOBAL IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT sum(RegionID GLOBAL IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        "SELECT sum(RegionID GLOBAL IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT sum(RegionID IN (SELECT RegionID from test.hits_all)) FROM test.visits_all",
-        "SELECT sum(RegionID IN (SELECT RegionID from distant_db.distant_hits)) FROM test.visits_all",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    /// Miscellaneous.
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all))",
-        "SELECT count() FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all))",
-        "SELECT count() FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::LOCAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT count() FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all))",
-        "SELECT count() FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all WHERE x GLOBAL IN (SELECT x FROM test.visits_all))",
-        2,
-        DB::DistributedProductMode::GLOBAL,
-        true
-    },
-
-    {
-        __LINE__,
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.hits_all))",
-        "SELECT UserID FROM (SELECT UserID FROM test.visits_all WHERE UserID GLOBAL IN (SELECT UserID FROM test.hits_all))",
-        2,
-        DB::DistributedProductMode::DENY,
-        true
-    }
-};
-
-
-static bool run()
-{
-    unsigned int count = 0;
-    unsigned int i = 1;
-
-    for (const auto & entry : entries)
-    {
-        auto res = check(entry);
-        if (res.first)
-        {
-            ++count;
-        }
-        else
-            std::cout << "Test " << i << " at line " << entry.line_num << " failed.\n"
-                "Expected: " << entry.expected_output << ".\n"
-                "Received: " << res.second << "\n";
-
-        ++i;
-    }
-
-    std::cout << count << " out of " << entries.size() << " test(s) passed.\n";
-
-    return count == entries.size();
-}
-
-
-TestResult check(const TestEntry & entry)
-{
-    static DB::SharedContextHolder shared_context = DB::Context::createShared();
-    static DB::Context context = DB::Context::createGlobal(shared_context.get());
-    context.makeGlobalContext();
-
-    try
-    {
-
-        auto storage_distributed_visits = StorageDistributedFake::create("remote_db", "remote_visits", entry.shard_count);
-        auto storage_distributed_hits = StorageDistributedFake::create("distant_db", "distant_hits", entry.shard_count);
-
-        DB::DatabasePtr database = std::make_shared<DB::DatabaseOrdinary>("test", "./metadata/test/", context);
-        DB::DatabaseCatalog::instance().attachDatabase("test", database);
-        database->attachTable("visits_all", storage_distributed_visits);
-        database->attachTable("hits_all", storage_distributed_hits);
-        context.setCurrentDatabase("test");
-        context.setSetting("distributed_product_mode", entry.mode);
-
-        /// Parse and process the incoming query.
-        DB::ASTPtr ast_input;
-        if (!parse(ast_input, entry.input))
-            return TestResult(false, "parse error");
-
-        bool success = true;
-
-        try
-        {
-            DB::InJoinSubqueriesPreprocessor::SubqueryTables renamed;
-            DB::InJoinSubqueriesPreprocessor(context, renamed, std::make_unique<CheckShardsAndTablesMock>()).visit(ast_input);
-        }
-        catch (const DB::Exception & ex)
-        {
-            if (ex.code() == DB::ErrorCodes::DISTRIBUTED_IN_JOIN_SUBQUERY_DENIED)
-                success = false;
-            else
-                throw;
-        }
-        catch (...)
-        {
-            throw;
-        }
-
-        if (success != entry.expected_success)
-            return TestResult(false, "unexpected result");
-
-        /// Parse the expected result.
-        DB::ASTPtr ast_expected;
-        if (!parse(ast_expected, entry.expected_output))
-            return TestResult(false, "parse error");
-
-        /// Compare the processed query and the expected result.
-        bool res = equals(ast_input, ast_expected);
-        std::string output = DB::queryToString(ast_input);
-
-        DB::DatabaseCatalog::instance().detachDatabase("test");
-        return TestResult(res, output);
-    }
-    catch (DB::Exception & e)
-    {
-        DB::DatabaseCatalog::instance().detachDatabase("test");
-        return TestResult(false, e.displayText());
-    }
-}
-
-bool parse(DB::ASTPtr & ast, const std::string & query)
-{
-    DB::ParserSelectQuery parser;
-    std::string message;
-    const auto * begin = query.data();
-    const auto * end = begin + query.size();
-    ast = DB::tryParseQuery(parser, begin, end, message, false, "", false, 0, 0);
-    return ast != nullptr;
-}
-
-bool equals(const DB::ASTPtr & lhs, const DB::ASTPtr & rhs)
-{
-    DB::ASTPtr lhs_reordered = lhs->clone();
-    reorder(&*lhs_reordered);
-
-    DB::ASTPtr rhs_reordered = rhs->clone();
-    reorder(&*rhs_reordered);
-
-    return lhs_reordered->getTreeHash() == rhs_reordered->getTreeHash();
-}
-
-void reorder(DB::IAST * ast)
-{
-    if (ast == nullptr)
-        return;
-
-    auto & children = ast->children;
-    if (children.empty())
-        return;
-
-    for (auto & child : children)
-        reorder(&*child);
-
-    std::sort(children.begin(), children.end(), [](const DB::ASTPtr & lhs, const DB::ASTPtr & rhs)
-    {
-        return lhs->getTreeHash() < rhs->getTreeHash();
-    });
-}
-
-int main()
-{
-    return run() ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/src/Interpreters/tests/internal_iotop.cpp b/src/Interpreters/tests/internal_iotop.cpp
deleted file mode 100644
index 6025a46e9b7..00000000000
--- a/src/Interpreters/tests/internal_iotop.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <Common/ThreadPool.h>
-#include <IO/ReadBufferFromFile.h>
-#include <IO/WriteBufferFromFile.h>
-#include <IO/copyData.h>
-#include <Common/TaskStatsInfoGetter.h>
-#include <Poco/File.h>
-#include <Common/Stopwatch.h>
-#include <common/getPageSize.h>
-#include <common/getThreadId.h>
-#include <IO/WriteBufferFromString.h>
-#include <linux/taskstats.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <pthread.h>
-
-
-std::mutex mutex;
-
-
-static std::ostream & operator << (std::ostream & stream, const ::taskstats & stat)
-{
-#define PRINT(field) (stream << #field << " " << stat.field)
-
-    PRINT(ac_pid) << ", ";
-
-    PRINT(read_bytes) << ", ";
-    PRINT(write_bytes) << ", ";
-
-    PRINT(read_char) << ", ";
-    PRINT(write_char) << ", ";
-
-    PRINT(swapin_delay_total) << ", ";
-    PRINT(blkio_delay_total) << ", ";
-    PRINT(cpu_delay_total) << ", ";
-
-    PRINT(ac_pid) << ", ";
-
-    PRINT(ac_utime) << ", ";
-    PRINT(ac_stime) << ", ";
-
-#undef PRINT
-
-    return stream;
-}
-
-using namespace DB;
-
-
-static void do_io(size_t id)
-{
-    ::taskstats stat;
-    int tid = getThreadId();
-    TaskStatsInfoGetter get_info;
-
-    get_info.getStat(stat, tid);
-    {
-        std::lock_guard lock(mutex);
-        std::cerr << "#" << id << ", tid " << tid << ", initial\n" << stat << "\n";
-    }
-
-    size_t copy_size = 1048576 * (1 + id);
-    std::string path_dst = "test_out_" + std::to_string(id);
-
-    {
-        size_t page_size = static_cast<size_t>(::getPageSize());
-        ReadBufferFromFile rb("/dev/urandom");
-        WriteBufferFromFile wb(path_dst, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_CREAT | O_TRUNC | O_DIRECT, 0666, nullptr, page_size);
-        copyData(rb, wb, copy_size);
-        wb.close();
-    }
-
-    get_info.getStat(stat, tid);
-    {
-        std::lock_guard lock(mutex);
-        std::cerr << "#" << id << ", tid " << tid << ", step1\n" << stat << "\n";
-    }
-
-    {
-        ReadBufferFromFile rb(path_dst);
-        WriteBufferFromOwnString wb;
-        copyData(rb, wb, copy_size);
-    }
-
-    get_info.getStat(stat, tid);
-    {
-        std::lock_guard lock(mutex);
-        std::cerr << "#" << id << ", tid " << tid << ", step2\n" << stat << "\n";
-    }
-
-    {
-        ReadBufferFromFile rb(path_dst);
-        WriteBufferFromOwnString wb;
-        copyData(rb, wb, copy_size);
-    }
-
-    get_info.getStat(stat, tid);
-    {
-        std::lock_guard lock(mutex);
-        std::cerr << "#" << id << ", tid " << tid << ", step3\n" << stat << "\n";
-    }
-
-    Poco::File(path_dst).remove(false);
-}
-
-static void test_perf()
-{
-
-    ::taskstats stat;
-    int tid = getThreadId();
-    TaskStatsInfoGetter get_info;
-
-    rusage rusage;
-
-    constexpr size_t num_samples = 1000000;
-    {
-        Stopwatch watch;
-        for (size_t i = 0; i < num_samples; ++i)
-            getrusage(RUSAGE_THREAD, &rusage);
-
-        auto ms = watch.elapsedMilliseconds();
-        if (ms > 0)
-            std::cerr << "RUsage: " << double(ms) / num_samples << " ms per call, " << 1000 * num_samples / ms << " calls per second\n";
-    }
-
-    {
-        Stopwatch watch;
-        for (size_t i = 0; i < num_samples; ++i)
-            get_info.getStat(stat, tid);
-
-        auto ms = watch.elapsedMilliseconds();
-        if (ms > 0)
-            std::cerr << "Netlink: " << double(ms) / num_samples << " ms per call, " << 1000 * num_samples / ms << " calls per second\n";
-    }
-
-    std::cerr << stat << "\n";
-}
-
-int main()
-try
-{
-    std::cerr << "pid " << getpid() << "\n";
-
-    size_t num_threads = 2;
-    ThreadPool pool(num_threads);
-    for (size_t i = 0; i < num_threads; ++i)
-        pool.scheduleOrThrowOnError([i]() { do_io(i); });
-    pool.wait();
-
-    test_perf();
-    return 0;
-}
-catch (...)
-{
-    std::cerr << getCurrentExceptionMessage(true);
-    return -1;
-}
-
diff --git a/src/Interpreters/ya.make b/src/Interpreters/ya.make
index 64f931a3eaf..480c368c640 100644
--- a/src/Interpreters/ya.make
+++ b/src/Interpreters/ya.make
@@ -39,6 +39,7 @@ SRCS(
     CollectJoinOnKeysVisitor.cpp
     ColumnAliasesVisitor.cpp
     Context.cpp
+    ConvertStringsToEnumVisitor.cpp
     CrashLog.cpp
     CrossToInnerJoinVisitor.cpp
     DDLTask.cpp
@@ -54,7 +55,7 @@ SRCS(
     ExpressionAnalyzer.cpp
     ExternalDictionariesLoader.cpp
     ExternalLoader.cpp
-    ExternalLoaderDatabaseConfigRepository.cpp
+    ExternalLoaderDictionaryStorageConfigRepository.cpp
     ExternalLoaderTempConfigRepository.cpp
     ExternalLoaderXMLConfigRepository.cpp
     ExternalModelsLoader.cpp
@@ -103,6 +104,7 @@ SRCS(
     InterpreterSystemQuery.cpp
     InterpreterUseQuery.cpp
     InterpreterWatchQuery.cpp
+    InterserverCredentials.cpp
     JoinSwitcher.cpp
     JoinToSubqueryTransformVisitor.cpp
     JoinedTables.cpp
@@ -117,6 +119,7 @@ SRCS(
     OpenTelemetrySpanLog.cpp
     OptimizeIfChains.cpp
     OptimizeIfWithConstantConditionVisitor.cpp
+    OptimizeShardingKeyRewriteInVisitor.cpp
     PartLog.cpp
     PredicateExpressionsOptimizer.cpp
     PredicateRewriteVisitor.cpp
diff --git a/src/Interpreters/ya.make.in b/src/Interpreters/ya.make.in
index 6be5a5f2db7..4481f8c6136 100644
--- a/src/Interpreters/ya.make.in
+++ b/src/Interpreters/ya.make.in
@@ -17,7 +17,7 @@ NO_COMPILER_WARNINGS()
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F JIT | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F JIT | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index df4a9a5f99a..918abc39037 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -177,6 +177,41 @@ void ASTAlterCommand::formatImpl(
                       << "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 : "");
+        projection_decl->formatImpl(settings, state, frame);
+
+        if (first)
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " FIRST " << (settings.hilite ? hilite_none : "");
+        else if (projection)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " 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 : "");
+        projection->formatImpl(settings, state, frame);
+        if (partition)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str<< " 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 : "");
+        projection->formatImpl(settings, state, frame);
+        if (partition)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str<< " 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
@@ -245,7 +280,7 @@ void ASTAlterCommand::formatImpl(
     else if (type == ASTAlterCommand::FETCH_PARTITION)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "FETCH "
-                      << "PARTITION " << (settings.hilite ? hilite_none : "");
+                      << (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;
diff --git a/src/Parsers/ASTAlterQuery.h b/src/Parsers/ASTAlterQuery.h
index 8a2bfdb1960..f8677c10a7b 100644
--- a/src/Parsers/ASTAlterQuery.h
+++ b/src/Parsers/ASTAlterQuery.h
@@ -46,6 +46,10 @@ public:
         ADD_CONSTRAINT,
         DROP_CONSTRAINT,
 
+        ADD_PROJECTION,
+        DROP_PROJECTION,
+        MATERIALIZE_PROJECTION,
+
         DROP_PARTITION,
         DROP_DETACHED_PARTITION,
         ATTACH_PARTITION,
@@ -106,6 +110,17 @@ public:
     */
     ASTPtr constraint;
 
+    /** The ADD PROJECTION query stores the ProjectionDeclaration there.
+     */
+    ASTPtr projection_decl;
+
+    /** The ADD PROJECTION query stores the name of the projection following AFTER.
+     *  The DROP PROJECTION query stores the name for deletion.
+     *  The MATERIALIZE PROJECTION query stores the name of the projection to materialize.
+     *  The CLEAR PROJECTION query stores the name of the projection to clear.
+     */
+    ASTPtr projection;
+
     /** Used in DROP PARTITION, ATTACH PARTITION FROM, UPDATE, DELETE queries.
      *  The value or ID of the partition is stored here.
      */
@@ -141,6 +156,8 @@ public:
 
     bool clear_index = false;   /// for CLEAR INDEX (do not drop index from metadata)
 
+    bool clear_projection = false;   /// for CLEAR PROJECTION (do not drop projection from metadata)
+
     bool if_not_exists = false; /// option for ADD_COLUMN
 
     bool if_exists = false;     /// option for DROP_COLUMN, MODIFY_COLUMN, COMMENT_COLUMN
diff --git a/src/Parsers/ASTCreateQuery.cpp b/src/Parsers/ASTCreateQuery.cpp
index 1192fcc6ebd..d6d424beb3a 100644
--- a/src/Parsers/ASTCreateQuery.cpp
+++ b/src/Parsers/ASTCreateQuery.cpp
@@ -32,6 +32,9 @@ ASTPtr ASTStorage::clone() const
     if (settings)
         res->set(res->settings, settings->clone());
 
+    if (comment)
+        res->set(res->comment, comment->clone());
+
     return res;
 }
 
@@ -72,6 +75,11 @@ 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);
+    }
 
 }
 
@@ -125,6 +133,8 @@ ASTPtr ASTColumns::clone() const
         res->set(res->indices, indices->clone());
     if (constraints)
         res->set(res->constraints, constraints->clone());
+    if (projections)
+        res->set(res->projections, projections->clone());
     if (primary_key)
         res->set(res->primary_key, primary_key->clone());
 
@@ -165,6 +175,16 @@ void ASTColumns::formatImpl(const FormatSettings & s, FormatState & state, Forma
             list.children.push_back(elem);
         }
     }
+    if (projections)
+    {
+        for (const auto & projection : projections->children)
+        {
+            auto elem = std::make_shared<ASTColumnsElement>();
+            elem->prefix = "PROJECTION";
+            elem->set(elem->elem, projection->clone());
+            list.children.push_back(elem);
+        }
+    }
 
     if (!list.children.empty())
     {
@@ -327,7 +347,7 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
             FormatStateStacked frame_nested = frame;
             columns_list->formatImpl(settings, state, frame_nested);
             settings.ostr << (settings.one_line ? ")" : "\n)");
-            frame.expression_list_always_start_on_new_line = false;
+            frame.expression_list_always_start_on_new_line = false; //-V519
         }
 
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS " << (settings.hilite ? hilite_none : "");
@@ -355,7 +375,7 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
         settings.ostr << (settings.one_line ? ")" : "\n)");
     }
 
-    frame.expression_list_always_start_on_new_line = false;
+    frame.expression_list_always_start_on_new_line = false; //-V519
 
     if (storage)
         storage->formatImpl(settings, state, frame);
diff --git a/src/Parsers/ASTCreateQuery.h b/src/Parsers/ASTCreateQuery.h
index d6d5c22240c..c7be67d9b78 100644
--- a/src/Parsers/ASTCreateQuery.h
+++ b/src/Parsers/ASTCreateQuery.h
@@ -23,8 +23,10 @@ public:
     IAST * order_by = nullptr;
     IAST * sample_by = nullptr;
     IAST * ttl_table = nullptr;
+    IAST * comment = nullptr;
     ASTSetQuery * settings = nullptr;
 
+
     String getID(char) const override { return "Storage definition"; }
 
     ASTPtr clone() const override;
@@ -41,6 +43,7 @@ public:
     ASTExpressionList * columns = nullptr;
     ASTExpressionList * indices = nullptr;
     ASTExpressionList * constraints = nullptr;
+    ASTExpressionList * projections = nullptr;
     IAST              * primary_key = nullptr;
 
     String getID(char) const override { return "Columns definition"; }
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index 3cb2e8bfa37..cc460f600dd 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -3,6 +3,7 @@
 #include <Common/quoteString.h>
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
+#include <DataTypes/NumberTraits.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
@@ -15,8 +16,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int UNEXPECTED_EXPRESSION;
+}
+
 void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr) const
 {
+    if (name == "view")
+        throw Exception("Table function view cannot be used as an expression", ErrorCodes::UNEXPECTED_EXPRESSION);
+
     writeString(name, ostr);
 
     if (parameters)
@@ -214,7 +223,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
             for (const char ** func = operators; *func; func += 2)
             {
-                if (strcmp(name.c_str(), func[0]) != 0)
+                if (strcasecmp(name.c_str(), func[0]) != 0)
                 {
                     continue;
                 }
@@ -226,7 +235,11 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                  * interpreted as a comment. Instead, negate the literal
                  * in place. Another possible solution is to use parentheses,
                  * but the old comment said it is impossible, without mentioning
-                 * the reason.
+                 * the reason. We should also negate the nonnegative literals,
+                 * for symmetry. We print the negated value without parentheses,
+                 * because they are not needed around a single literal. Also we
+                 * use formatting from FieldVisitorToString, so that the type is
+                 * preserved (e.g. -0. is printed with trailing period).
                  */
                 if (literal && name == "negate")
                 {
@@ -243,26 +256,18 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                             {
                                 // The parser doesn't create decimal literals, but
                                 // they can be produced by constant folding or the
-                                // fuzzer.
+                                // fuzzer. Decimals are always signed, so no need
+                                // to deduce the result type like we do for ints.
                                 const auto int_value = value.getValue().value;
-                                // We compare to zero so we don't care about scale.
-                                if (int_value >= 0)
-                                {
-                                    return false;
-                                }
-
-                                settings.ostr << ValueType{-int_value,
-                                    value.getScale()};
+                                settings.ostr << FieldVisitorToString{}(ValueType{
+                                    -int_value,
+                                    value.getScale()});
                             }
                             else if constexpr (std::is_arithmetic_v<ValueType>)
                             {
-                                if (value >= 0)
-                                {
-                                    return false;
-                                }
-                                // We don't need parentheses around a single
-                                // literal.
-                                settings.ostr << -value;
+                                using ResultType = typename NumberTraits::ResultOfNegate<ValueType>::Type;
+                                settings.ostr << FieldVisitorToString{}(
+                                    -static_cast<ResultType>(value));
                                 return true;
                             }
 
@@ -378,14 +383,40 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
             if (!written && 0 == strcmp(name.c_str(), "tupleElement"))
             {
+                // fuzzer sometimes may inserts tupleElement() created from ASTLiteral:
+                //
+                //     Function_tupleElement, 0xx
+                //     -ExpressionList_, 0xx
+                //     --Literal_Int64_255, 0xx
+                //     --Literal_Int64_100, 0xx
+                //
+                // And in this case it will be printed as "255.100", which
+                // later will be parsed as float, and formatting will be
+                // inconsistent.
+                //
+                // So instead of printing it as regular tuple,
+                // let's print it as ExpressionList instead (i.e. with ", " delimiter).
+                bool tuple_arguments_valid = true;
+                const auto * lit_left = arguments->children[0]->as<ASTLiteral>();
+                const auto * lit_right = arguments->children[1]->as<ASTLiteral>();
+
+                if (lit_left)
+                {
+                    Field::Types::Which type = lit_left->value.getType();
+                    if (type != Field::Types::Tuple && type != Field::Types::Array)
+                    {
+                        tuple_arguments_valid = false;
+                    }
+                }
+
                 // It can be printed in a form of 'x.1' only if right hand side
                 // is an unsigned integer lineral. We also allow nonnegative
                 // signed integer literals, because the fuzzer sometimes inserts
                 // them, and we want to have consistent formatting.
-                if (const auto * lit = arguments->children[1]->as<ASTLiteral>())
+                if (tuple_arguments_valid && lit_right)
                 {
-                    if (isInt64FieldType(lit->value.getType())
-                        && lit->value.get<Int64>() >= 0)
+                    if (isInt64OrUInt64FieldType(lit_right->value.getType())
+                        && lit_right->value.get<Int64>() >= 0)
                     {
                         if (frame.need_parens)
                             settings.ostr << '(';
@@ -483,14 +514,14 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
         if (!written && 0 == strcmp(name.c_str(), "map"))
         {
-            settings.ostr << (settings.hilite ? hilite_operator : "") << '{' << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_operator : "") << "map(" << (settings.hilite ? hilite_none : "");
             for (size_t i = 0; i < arguments->children.size(); ++i)
             {
                 if (i != 0)
                     settings.ostr << ", ";
                 arguments->children[i]->formatImpl(settings, state, nested_dont_need_parens);
             }
-            settings.ostr << (settings.hilite ? hilite_operator : "") << '}' << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_operator : "") << ')' << (settings.hilite ? hilite_none : "");
             written = true;
         }
     }
diff --git a/src/Parsers/ASTFunctionWithKeyValueArguments.h b/src/Parsers/ASTFunctionWithKeyValueArguments.h
index 88ab712cc04..f5eaa33bfc7 100644
--- a/src/Parsers/ASTFunctionWithKeyValueArguments.h
+++ b/src/Parsers/ASTFunctionWithKeyValueArguments.h
@@ -20,7 +20,7 @@ public:
     bool second_with_brackets;
 
 public:
-    ASTPair(bool second_with_brackets_)
+    explicit ASTPair(bool second_with_brackets_)
         : second_with_brackets(second_with_brackets_)
     {
     }
@@ -49,7 +49,7 @@ public:
     /// Has brackets around arguments
     bool has_brackets;
 
-    ASTFunctionWithKeyValueArguments(bool has_brackets_ = true)
+    explicit ASTFunctionWithKeyValueArguments(bool has_brackets_ = true)
         : has_brackets(has_brackets_)
     {
     }
diff --git a/src/Parsers/ASTProjectionDeclaration.cpp b/src/Parsers/ASTProjectionDeclaration.cpp
new file mode 100644
index 00000000000..3692b1a2013
--- /dev/null
+++ b/src/Parsers/ASTProjectionDeclaration.cpp
@@ -0,0 +1,31 @@
+#include <Parsers/ASTProjectionDeclaration.h>
+#include <Common/quoteString.h>
+
+
+namespace DB
+{
+
+ASTPtr ASTProjectionDeclaration::clone() const
+{
+    auto res = std::make_shared<ASTProjectionDeclaration>();
+    res->name = name;
+    if (query)
+        res->set(res->query, query->clone());
+    return res;
+}
+
+
+void ASTProjectionDeclaration::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    settings.ostr << backQuoteIfNeed(name);
+    std::string indent_str = settings.one_line ? "" : std::string(4u * frame.indent, ' ');
+    std::string nl_or_nothing = settings.one_line ? "" : "\n";
+    settings.ostr << nl_or_nothing << indent_str << "(" << nl_or_nothing;
+    FormatStateStacked frame_nested = frame;
+    frame_nested.need_parens = false;
+    ++frame_nested.indent;
+    query->formatImpl(settings, state, frame_nested);
+    settings.ostr << nl_or_nothing << indent_str << ")";
+}
+
+}
diff --git a/src/Parsers/ASTProjectionDeclaration.h b/src/Parsers/ASTProjectionDeclaration.h
new file mode 100644
index 00000000000..9d6c953a52b
--- /dev/null
+++ b/src/Parsers/ASTProjectionDeclaration.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/IAST.h>
+
+
+namespace DB
+{
+/** name (subquery)
+  */
+class ASTProjectionDeclaration : public IAST
+{
+public:
+    String name;
+    IAST * query;
+
+    /** Get the text that identifies this element. */
+    String getID(char) const override { return "Projection"; }
+
+    ASTPtr clone() const override;
+    void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+};
+
+}
diff --git a/src/Parsers/ASTProjectionSelectQuery.cpp b/src/Parsers/ASTProjectionSelectQuery.cpp
new file mode 100644
index 00000000000..31a306bc011
--- /dev/null
+++ b/src/Parsers/ASTProjectionSelectQuery.cpp
@@ -0,0 +1,124 @@
+#include <Interpreters/StorageID.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTProjectionSelectQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Common/typeid_cast.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+ASTPtr ASTProjectionSelectQuery::clone() const
+{
+    auto res = std::make_shared<ASTProjectionSelectQuery>(*this);
+    res->children.clear();
+    res->positions.clear();
+
+#define CLONE(expr) res->setExpression(expr, getExpression(expr, true))
+
+    /** NOTE Members must clone exactly in the same order,
+        *  in which they were inserted into `children` in ParserSelectQuery.
+        * This is important because of the children's names the identifier (getTreeHash) is compiled,
+        *  which can be used for column identifiers in the case of subqueries in the IN statement.
+        * For distributed query processing, in case one of the servers is localhost and the other one is not,
+        *  localhost query is executed within the process and is cloned,
+        *  and the request is sent to the remote server in text form via TCP.
+        * And if the cloning order does not match the parsing order,
+        *  then different servers will get different identifiers.
+        */
+    CLONE(Expression::WITH);
+    CLONE(Expression::SELECT);
+    CLONE(Expression::GROUP_BY);
+    CLONE(Expression::ORDER_BY);
+
+#undef CLONE
+
+    return res;
+}
+
+
+void ASTProjectionSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const
+{
+    frame.current_select = this;
+    frame.need_parens = false;
+    std::string indent_str = s.one_line ? "" : std::string(4 * frame.indent, ' ');
+
+    if (with())
+    {
+        s.ostr << (s.hilite ? hilite_keyword : "") << indent_str << "WITH " << (s.hilite ? hilite_none : "");
+        s.one_line ? with()->formatImpl(s, state, frame) : with()->as<ASTExpressionList &>().formatImplMultiline(s, state, frame);
+        s.ostr << s.nl_or_ws;
+    }
+
+    s.ostr << (s.hilite ? hilite_keyword : "") << indent_str << "SELECT " << (s.hilite ? hilite_none : "");
+
+    s.one_line ? select()->formatImpl(s, state, frame) : select()->as<ASTExpressionList &>().formatImplMultiline(s, state, frame);
+
+    if (groupBy())
+    {
+        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "GROUP BY " << (s.hilite ? hilite_none : "");
+        s.one_line ? groupBy()->formatImpl(s, state, frame) : groupBy()->as<ASTExpressionList &>().formatImplMultiline(s, state, frame);
+    }
+
+    if (orderBy())
+    {
+        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "ORDER BY " << (s.hilite ? hilite_none : "");
+        orderBy()->formatImpl(s, state, frame);
+    }
+}
+
+void ASTProjectionSelectQuery::setExpression(Expression expr, ASTPtr && ast)
+{
+    if (ast)
+    {
+        auto it = positions.find(expr);
+        if (it == positions.end())
+        {
+            positions[expr] = children.size();
+            children.emplace_back(ast);
+        }
+        else
+            children[it->second] = ast;
+    }
+    else if (positions.count(expr))
+    {
+        size_t pos = positions[expr];
+        children.erase(children.begin() + pos);
+        positions.erase(expr);
+        for (auto & pr : positions)
+            if (pr.second > pos)
+                --pr.second;
+    }
+}
+
+ASTPtr & ASTProjectionSelectQuery::getExpression(Expression expr)
+{
+    if (!positions.count(expr))
+        throw Exception("Get expression before set", ErrorCodes::LOGICAL_ERROR);
+    return children[positions[expr]];
+}
+
+ASTPtr ASTProjectionSelectQuery::cloneToASTSelect() const
+{
+    auto select_query = std::make_shared<ASTSelectQuery>();
+    ASTPtr node = select_query;
+    if (with())
+        select_query->setExpression(ASTSelectQuery::Expression::WITH, with()->clone());
+    if (select())
+        select_query->setExpression(ASTSelectQuery::Expression::SELECT, select()->clone());
+    if (groupBy())
+        select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, groupBy()->clone());
+    // Get rid of orderBy. It's used for projection definition only
+    return node;
+}
+
+}
diff --git a/src/Parsers/ASTProjectionSelectQuery.h b/src/Parsers/ASTProjectionSelectQuery.h
new file mode 100644
index 00000000000..71334c50868
--- /dev/null
+++ b/src/Parsers/ASTProjectionSelectQuery.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <Core/Names.h>
+#include <Parsers/IAST.h>
+
+
+namespace DB
+{
+/** PROJECTION SELECT query
+  */
+class ASTProjectionSelectQuery : public IAST
+{
+public:
+    enum class Expression : uint8_t
+    {
+        WITH,
+        SELECT,
+        GROUP_BY,
+        ORDER_BY,
+    };
+
+    /** Get the text that identifies this element. */
+    String getID(char) const override { return "ProjectionSelectQuery"; }
+
+    ASTPtr clone() const override;
+
+    ASTPtr & refSelect() { return getExpression(Expression::SELECT); }
+
+    const ASTPtr with() const { return getExpression(Expression::WITH); }
+    const ASTPtr select() const { return getExpression(Expression::SELECT); }
+    const ASTPtr groupBy() const { return getExpression(Expression::GROUP_BY); }
+    const ASTPtr orderBy() const { return getExpression(Expression::ORDER_BY); }
+
+    /// Set/Reset/Remove expression.
+    void setExpression(Expression expr, ASTPtr && ast);
+
+    ASTPtr getExpression(Expression expr, bool clone = false) const
+    {
+        auto it = positions.find(expr);
+        if (it != positions.end())
+            return clone ? children[it->second]->clone() : children[it->second];
+        return {};
+    }
+
+    ASTPtr cloneToASTSelect() const;
+
+protected:
+    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+
+private:
+    std::unordered_map<Expression, size_t> positions;
+
+    ASTPtr & getExpression(Expression expr);
+};
+
+}
diff --git a/src/Parsers/ASTSampleRatio.h b/src/Parsers/ASTSampleRatio.h
index 09dec6aac99..a3e70b7dab7 100644
--- a/src/Parsers/ASTSampleRatio.h
+++ b/src/Parsers/ASTSampleRatio.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/IAST.h>
 
+
 namespace DB
 {
 
@@ -11,12 +12,7 @@ namespace DB
 class ASTSampleRatio : public IAST
 {
 public:
-#ifdef __SIZEOF_INT128__
     using BigNum = __uint128_t;    /// Must contain the result of multiplying two UInt64.
-#else
-    #warning "No uint128_t type. Sampling ratios cannot work correctly."
-    using BigNum = uint64_t;
-#endif
 
     struct Rational
     {
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 4715c7f201b..b5cfa17f035 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -95,7 +95,7 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
 
     if (tables())
     {
-        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "FROM " << (s.hilite ? hilite_none : "");
+        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "FROM" << (s.hilite ? hilite_none : "");
         tables()->formatImpl(s, state, frame);
     }
 
diff --git a/src/Parsers/ASTSelectWithUnionQuery.cpp b/src/Parsers/ASTSelectWithUnionQuery.cpp
index 6a990a3d154..fa7359574f8 100644
--- a/src/Parsers/ASTSelectWithUnionQuery.cpp
+++ b/src/Parsers/ASTSelectWithUnionQuery.cpp
@@ -35,24 +35,24 @@ void ASTSelectWithUnionQuery::formatQueryImpl(const FormatSettings & settings, F
         if (mode == Mode::Unspecified)
             return "";
         else if (mode == Mode::ALL)
-            return "ALL";
+            return " ALL";
         else
-            return "DISTINCT";
+            return " DISTINCT";
     };
 
     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 : "") << "UNION"
                           << mode_to_str((is_normalized) ? union_mode : list_of_modes[it - list_of_selects->children.begin() - 1])
                           << (settings.hilite ? hilite_none : "");
 
         if (auto * node = (*it)->as<ASTSelectWithUnionQuery>())
         {
+            settings.ostr << settings.nl_or_ws << indent_str;
+
             if (node->list_of_selects->children.size() == 1)
             {
-                if (it != list_of_selects->children.begin())
-                    settings.ostr << settings.nl_or_ws;
                 (node->list_of_selects->children.at(0))->formatImpl(settings, state, frame);
             }
             else
diff --git a/src/Parsers/ASTSubquery.cpp b/src/Parsers/ASTSubquery.cpp
index 142072050a6..58f334376e6 100644
--- a/src/Parsers/ASTSubquery.cpp
+++ b/src/Parsers/ASTSubquery.cpp
@@ -29,6 +29,11 @@ void ASTSubquery::appendColumnNameImpl(WriteBuffer & ostr) const
 
 void ASTSubquery::formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
+    /// NOTE: due to trickery of filling cte_name (in interpreters) it is hard
+    /// to print it w/o newline (for !oneline case), since if nl_or_ws
+    /// prepended here, then formatting will be incorrect with alias:
+    ///
+    ///   (select 1 in ((select 1) as sub))
     if (!cte_name.empty())
     {
         settings.ostr << (settings.hilite ? hilite_identifier : "");
@@ -40,7 +45,7 @@ void ASTSubquery::formatImplWithoutAlias(const FormatSettings & settings, Format
     std::string indent_str = settings.one_line ? "" : std::string(4u * frame.indent, ' ');
     std::string nl_or_nothing = settings.one_line ? "" : "\n";
 
-    settings.ostr << nl_or_nothing << indent_str << "(" << nl_or_nothing;
+    settings.ostr << "(" << nl_or_nothing;
     FormatStateStacked frame_nested = frame;
     frame_nested.need_parens = false;
     ++frame_nested.indent;
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index 71bda0c7709..bf94df0bf50 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -54,6 +54,10 @@ const char * ASTSystemQuery::typeToString(Type type)
             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:
@@ -90,6 +94,8 @@ const char * ASTSystemQuery::typeToString(Type type)
             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);
     }
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index 5bcdcc7875d..6cd1443155f 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -36,9 +36,12 @@ public:
         SYNC_REPLICA,
         RELOAD_DICTIONARY,
         RELOAD_DICTIONARIES,
+        RELOAD_MODEL,
+        RELOAD_MODELS,
         RELOAD_EMBEDDED_DICTIONARIES,
         RELOAD_CONFIG,
         RELOAD_SYMBOLS,
+        RESTART_DISK,
         STOP_MERGES,
         START_MERGES,
         STOP_TTL_MERGES,
@@ -63,6 +66,7 @@ public:
     Type type = Type::UNKNOWN;
 
     String target_dictionary;
+    String target_model;
     String database;
     String table;
     String replica;
@@ -70,6 +74,7 @@ public:
     bool is_drop_whole_replica{};
     String storage_policy;
     String volume;
+    String disk;
     UInt64 seconds{};
 
     String getID(char) const override { return "SYSTEM query"; }
diff --git a/src/Parsers/ASTTablesInSelectQuery.cpp b/src/Parsers/ASTTablesInSelectQuery.cpp
index 8d131a848f7..e063b9f7125 100644
--- a/src/Parsers/ASTTablesInSelectQuery.cpp
+++ b/src/Parsers/ASTTablesInSelectQuery.cpp
@@ -109,14 +109,17 @@ void ASTTableExpression::formatImpl(const FormatSettings & settings, FormatState
 
     if (database_and_table_name)
     {
+        settings.ostr << " ";
         database_and_table_name->formatImpl(settings, state, frame);
     }
     else if (table_function)
     {
+        settings.ostr << " ";
         table_function->formatImpl(settings, state, frame);
     }
     else if (subquery)
     {
+        settings.ostr << settings.nl_or_ws << indent_str;
         subquery->formatImpl(settings, state, frame);
     }
 
@@ -142,9 +145,15 @@ void ASTTableExpression::formatImpl(const FormatSettings & settings, FormatState
 }
 
 
-void ASTTableJoin::formatImplBeforeTable(const FormatSettings & settings, FormatState &, FormatStateStacked) const
+void ASTTableJoin::formatImplBeforeTable(const FormatSettings & settings, FormatState &, FormatStateStacked frame) const
 {
     settings.ostr << (settings.hilite ? hilite_keyword : "");
+    std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
+
+    if (kind != Kind::Comma)
+    {
+        settings.ostr << settings.nl_or_ws << indent_str;
+    }
 
     switch (locality)
     {
@@ -241,6 +250,7 @@ void ASTArrayJoin::formatImpl(const FormatSettings & settings, FormatState & sta
     frame.expression_list_prepend_whitespace = true;
 
     settings.ostr << (settings.hilite ? hilite_keyword : "")
+        << settings.nl_or_ws
         << (kind == Kind::Left ? "LEFT " : "") << "ARRAY JOIN" << (settings.hilite ? hilite_none : "");
 
     settings.one_line
@@ -254,10 +264,7 @@ void ASTTablesInSelectQueryElement::formatImpl(const FormatSettings & settings,
     if (table_expression)
     {
         if (table_join)
-        {
             table_join->as<ASTTableJoin &>().formatImplBeforeTable(settings, state, frame);
-            settings.ostr << " ";
-        }
 
         table_expression->formatImpl(settings, state, frame);
 
@@ -275,13 +282,8 @@ void ASTTablesInSelectQuery::formatImpl(const FormatSettings & settings, FormatS
 {
     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;
-
-        (*it)->formatImpl(settings, state, frame);
-    }
+    for (const auto & child : children)
+        child->formatImpl(settings, state, frame);
 }
 
 }
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
index 35374df6177..376df5bc80c 100644
--- a/src/Parsers/ASTWindowDefinition.cpp
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -1,8 +1,10 @@
 #include <Parsers/ASTWindowDefinition.h>
 
 #include <Common/quoteString.h>
+#include <Common/FieldVisitors.h>
 #include <IO/Operators.h>
 
+
 namespace DB
 {
 
@@ -10,6 +12,8 @@ ASTPtr ASTWindowDefinition::clone() const
 {
     auto result = std::make_shared<ASTWindowDefinition>();
 
+    result->parent_window_name = parent_window_name;
+
     if (partition_by)
     {
         result->partition_by = partition_by->clone();
@@ -36,31 +40,48 @@ void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
     FormatState & state, FormatStateStacked format_frame) const
 {
     format_frame.expression_list_prepend_whitespace = false;
+    bool need_space = false;
+
+    if (!parent_window_name.empty())
+    {
+        settings.ostr << backQuoteIfNeed(parent_window_name);
+
+        need_space = true;
+    }
 
     if (partition_by)
     {
+        if (need_space)
+        {
+            settings.ostr << " ";
+        }
+
         settings.ostr << "PARTITION BY ";
         partition_by->formatImpl(settings, state, format_frame);
-    }
 
-    if (partition_by && order_by)
-    {
-        settings.ostr << " ";
+        need_space = true;
     }
 
     if (order_by)
     {
+        if (need_space)
+        {
+            settings.ostr << " ";
+        }
+
         settings.ostr << "ORDER BY ";
         order_by->formatImpl(settings, state, format_frame);
-    }
 
-    if ((partition_by || order_by) && !frame.is_default)
-    {
-        settings.ostr << " ";
+        need_space = true;
     }
 
     if (!frame.is_default)
     {
+        if (need_space)
+        {
+            settings.ostr << " ";
+        }
+
         settings.ostr << WindowFrame::toString(frame.type) << " BETWEEN ";
         if (frame.begin_type == WindowFrame::BoundaryType::Current)
         {
diff --git a/src/Parsers/ASTWindowDefinition.h b/src/Parsers/ASTWindowDefinition.h
index b57c1094e42..7547f1527f2 100644
--- a/src/Parsers/ASTWindowDefinition.h
+++ b/src/Parsers/ASTWindowDefinition.h
@@ -10,6 +10,8 @@ namespace DB
 
 struct ASTWindowDefinition : public IAST
 {
+    std::string parent_window_name;
+
     ASTPtr partition_by;
 
     ASTPtr order_by;
diff --git a/src/Parsers/ASTWithElement.cpp b/src/Parsers/ASTWithElement.cpp
index ce39086eb4a..b517509c4bc 100644
--- a/src/Parsers/ASTWithElement.cpp
+++ b/src/Parsers/ASTWithElement.cpp
@@ -16,8 +16,11 @@ ASTPtr ASTWithElement::clone() const
 
 void ASTWithElement::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
+    std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
+
     settings.writeIdentifier(name);
-    settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS " << (settings.hilite ? hilite_none : "");
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS" << (settings.hilite ? hilite_none : "");
+    settings.ostr << settings.nl_or_ws << indent_str;
     dynamic_cast<const ASTWithAlias &>(*subquery).formatImplWithoutAlias(settings, state, frame);
 }
 
diff --git a/src/Parsers/CMakeLists.txt b/src/Parsers/CMakeLists.txt
index 13e460da4e4..5aaa5c32f92 100644
--- a/src/Parsers/CMakeLists.txt
+++ b/src/Parsers/CMakeLists.txt
@@ -1,14 +1,14 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_parsers .)
 add_headers_and_sources(clickhouse_parsers ./MySQL)
 add_library(clickhouse_parsers ${clickhouse_parsers_headers} ${clickhouse_parsers_sources})
 target_link_libraries(clickhouse_parsers PUBLIC clickhouse_common_io)
 
 if (USE_DEBUG_HELPERS)
-    set (INCLUDE_DEBUG_HELPERS "-I${ClickHouse_SOURCE_DIR}/base -include ${ClickHouse_SOURCE_DIR}/src/Parsers/iostream_debug_helpers.h")
+    set (INCLUDE_DEBUG_HELPERS "-I\"${ClickHouse_SOURCE_DIR}/base\" -include \"${ClickHouse_SOURCE_DIR}/src/Parsers/iostream_debug_helpers.h\"")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
 endif ()
 
-if(ENABLE_TESTS)
-    add_subdirectory(tests)
+if(ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif()
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 84c178790b2..75a341a543d 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -497,20 +497,18 @@ bool ParserTableFunctionView::parseImpl(Pos & pos, ASTPtr & node, Expected & exp
 
 bool ParserWindowReference::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ASTFunction * function = dynamic_cast<ASTFunction *>(node.get());
+    assert(node);
+    ASTFunction & function = dynamic_cast<ASTFunction &>(*node);
 
     // Variant 1:
     // function_name ( * ) OVER window_name
-    // FIXME doesn't work anyway for now -- never used anywhere, window names
-    // can't be defined, and TreeRewriter thinks the window name is a column so
-    // the query fails.
     if (pos->type != TokenType::OpeningRoundBracket)
     {
         ASTPtr window_name_ast;
         ParserIdentifier window_name_parser;
         if (window_name_parser.parse(pos, window_name_ast, expected))
         {
-            function->window_name = getIdentifierName(window_name_ast);
+            function.window_name = getIdentifierName(window_name_ast);
             return true;
         }
         else
@@ -522,7 +520,7 @@ bool ParserWindowReference::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     // Variant 2:
     // function_name ( * ) OVER ( window_definition )
     ParserWindowDefinition parser_definition;
-    return parser_definition.parse(pos, function->window_definition, expected);
+    return parser_definition.parse(pos, function.window_definition, expected);
 }
 
 static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & pos,
@@ -580,18 +578,6 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
         else if (parser_literal.parse(pos, ast_literal, expected))
         {
             const Field & value = ast_literal->as<ASTLiteral &>().value;
-            if ((node->frame.type == WindowFrame::FrameType::Rows
-                    || node->frame.type == WindowFrame::FrameType::Groups)
-                && !(value.getType() == Field::Types::UInt64
-                     || (value.getType() == Field::Types::Int64
-                            && value.get<Int64>() >= 0)))
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Frame offset for '{}' frame must be a nonnegative integer, '{}' of type '{}' given.",
-                    WindowFrame::toString(node->frame.type),
-                    applyVisitor(FieldVisitorToString(), value),
-                    Field::Types::toString(value.getType()));
-            }
             node->frame.begin_offset = value;
             node->frame.begin_type = WindowFrame::BoundaryType::Offset;
         }
@@ -641,18 +627,6 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
             else if (parser_literal.parse(pos, ast_literal, expected))
             {
                 const Field & value = ast_literal->as<ASTLiteral &>().value;
-                if ((node->frame.type == WindowFrame::FrameType::Rows
-                        || node->frame.type == WindowFrame::FrameType::Groups)
-                    && !(value.getType() == Field::Types::UInt64
-                         || (value.getType() == Field::Types::Int64
-                                && value.get<Int64>() >= 0)))
-                {
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Frame offset for '{}' frame must be a nonnegative integer, '{}' of type '{}' given.",
-                        WindowFrame::toString(node->frame.type),
-                        applyVisitor(FieldVisitorToString(), value),
-                        Field::Types::toString(value.getType()));
-                }
                 node->frame.end_offset = value;
                 node->frame.end_type = WindowFrame::BoundaryType::Offset;
             }
@@ -685,16 +659,10 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
     return true;
 }
 
-bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+// All except parent window name.
+static bool parseWindowDefinitionParts(IParser::Pos & pos,
+    ASTWindowDefinition & node, Expected & expected)
 {
-    auto result = std::make_shared<ASTWindowDefinition>();
-
-    ParserToken parser_openging_bracket(TokenType::OpeningRoundBracket);
-    if (!parser_openging_bracket.ignore(pos, expected))
-    {
-        return false;
-    }
-
     ParserKeyword keyword_partition_by("PARTITION BY");
     ParserNotEmptyExpressionList columns_partition_by(
         false /* we don't allow declaring aliases here*/);
@@ -706,8 +674,8 @@ bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         ASTPtr partition_by_ast;
         if (columns_partition_by.parse(pos, partition_by_ast, expected))
         {
-            result->children.push_back(partition_by_ast);
-            result->partition_by = partition_by_ast;
+            node.children.push_back(partition_by_ast);
+            node.partition_by = partition_by_ast;
         }
         else
         {
@@ -720,8 +688,8 @@ bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         ASTPtr order_by_ast;
         if (columns_order_by.parse(pos, order_by_ast, expected))
         {
-            result->children.push_back(order_by_ast);
-            result->order_by = order_by_ast;
+            node.children.push_back(order_by_ast);
+            node.order_by = order_by_ast;
         }
         else
         {
@@ -729,9 +697,45 @@ bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         }
     }
 
-    if (!tryParseFrameDefinition(result.get(), pos, expected))
+    return tryParseFrameDefinition(&node, pos, expected);
+}
+
+bool ParserWindowDefinition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    auto result = std::make_shared<ASTWindowDefinition>();
+
+    ParserToken parser_openging_bracket(TokenType::OpeningRoundBracket);
+    if (!parser_openging_bracket.ignore(pos, expected))
+    {
+        return false;
+    }
+
+    // We can have a parent window name specified before all other things. No
+    // easy way to distinguish identifier from keywords, so just try to parse it
+    // both ways.
+    if (parseWindowDefinitionParts(pos, *result, expected))
+    {
+        // Successfully parsed without parent window specifier. It can be empty,
+        // so check that it is followed by the closing bracket.
+        ParserToken parser_closing_bracket(TokenType::ClosingRoundBracket);
+        if (parser_closing_bracket.ignore(pos, expected))
+        {
+            node = result;
+            return true;
+        }
+    }
+
+    // Try to parse with parent window specifier.
+    ParserIdentifier parser_parent_window;
+    ASTPtr window_name_identifier;
+    if (!parser_parent_window.parse(pos, window_name_identifier, expected))
+    {
+        return false;
+    }
+    result->parent_window_name = window_name_identifier->as<const ASTIdentifier &>().name();
+
+    if (!parseWindowDefinitionParts(pos, *result, expected))
     {
-        /* Broken frame definition. */
         return false;
     }
 
@@ -818,7 +822,119 @@ bool ParserCodec::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     return true;
 }
 
-bool ParserCastExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+ASTPtr createFunctionCast(const ASTPtr & expr_ast, const ASTPtr & type_ast)
+{
+    /// Convert to canonical representation in functional form: CAST(expr, 'type')
+    auto type_literal = std::make_shared<ASTLiteral>(queryToString(type_ast));
+
+    auto expr_list_args = std::make_shared<ASTExpressionList>();
+    expr_list_args->children.push_back(expr_ast);
+    expr_list_args->children.push_back(std::move(type_literal));
+
+    auto func_node = std::make_shared<ASTFunction>();
+    func_node->name = "CAST";
+    func_node->arguments = std::move(expr_list_args);
+    func_node->children.push_back(func_node->arguments);
+
+    return func_node;
+}
+
+template <TokenType ...tokens>
+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.
+
+    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)
+    {
+        ++pos;
+    }
+    else if (isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket>(pos->type))
+    {
+        TokenType last_token = TokenType::OpeningSquareBracket;
+        std::vector<TokenType> stack;
+        while (pos.isValid())
+        {
+            if (isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket>(pos->type))
+            {
+                stack.push_back(pos->type);
+                if (!isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket, TokenType::Comma>(last_token))
+                    return false;
+            }
+            else if (pos->type == TokenType::ClosingSquareBracket)
+            {
+                if (isOneOf<TokenType::Comma, TokenType::OpeningRoundBracket>(last_token))
+                    return false;
+                if (stack.empty() || stack.back() != TokenType::OpeningSquareBracket)
+                    return false;
+                stack.pop_back();
+            }
+            else if (pos->type == TokenType::ClosingRoundBracket)
+            {
+                if (isOneOf<TokenType::Comma, TokenType::OpeningSquareBracket>(last_token))
+                    return false;
+                if (stack.empty() || stack.back() != TokenType::OpeningRoundBracket)
+                    return false;
+                stack.pop_back();
+            }
+            else if (pos->type == TokenType::Comma)
+            {
+                if (isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket, TokenType::Comma>(last_token))
+                    return false;
+            }
+            else if (isOneOf<TokenType::Number, TokenType::StringLiteral>(pos->type))
+            {
+                if (!isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket, TokenType::Comma>(last_token))
+                    return false;
+            }
+            else
+            {
+                break;
+            }
+
+            /// Update data_end on every iteration to avoid appearances of extra trailing
+            /// whitespaces into data. Whitespaces are skipped at operator '++' of Pos.
+            data_end = pos->end;
+            last_token = pos->type;
+            ++pos;
+        }
+
+        if (!stack.empty())
+            return false;
+    }
+
+    ASTPtr type_ast;
+    if (ParserToken(TokenType::DoubleColon).ignore(pos, expected)
+        && ParserDataType().parse(pos, type_ast, expected))
+    {
+        String s;
+        size_t data_size = data_end - data_begin;
+        if (is_string_literal)
+        {
+            ReadBufferFromMemory buf(data_begin, data_size);
+            readQuotedStringWithSQLStyle(s, buf);
+            assert(buf.count() == data_size);
+        }
+        else
+            s = String(data_begin, data_size);
+
+        auto literal = std::make_shared<ASTLiteral>(std::move(s));
+        node = createFunctionCast(literal, type_ast);
+        return true;
+    }
+
+    return false;
+}
+
+bool ParserCastAsExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     /// Either CAST(expr AS type) or CAST(expr, 'type')
     /// The latter will be parsed normally as a function later.
@@ -833,20 +949,7 @@ bool ParserCastExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
         && ParserDataType().parse(pos, type_node, expected)
         && ParserToken(TokenType::ClosingRoundBracket).ignore(pos, expected))
     {
-        /// Convert to canonical representation in functional form: CAST(expr, 'type')
-
-        auto type_literal = std::make_shared<ASTLiteral>(queryToString(type_node));
-
-        auto expr_list_args = std::make_shared<ASTExpressionList>();
-        expr_list_args->children.push_back(expr_node);
-        expr_list_args->children.push_back(std::move(type_literal));
-
-        auto func_node = std::make_shared<ASTFunction>();
-        func_node->name = "CAST";
-        func_node->arguments = std::move(expr_list_args);
-        func_node->children.push_back(func_node->arguments);
-
-        node = std::move(func_node);
+        node = createFunctionCast(expr_node, type_node);
         return true;
     }
 
@@ -1975,12 +2078,13 @@ bool ParserMySQLGlobalVariable::parseImpl(Pos & pos, ASTPtr & node, Expected & e
 bool ParserExpressionElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     return ParserSubquery().parse(pos, node, expected)
+        || ParserCastOperator().parse(pos, node, expected)
         || ParserTupleOfLiterals().parse(pos, node, expected)
         || ParserParenthesisExpression().parse(pos, node, expected)
         || ParserArrayOfLiterals().parse(pos, node, expected)
         || ParserArray().parse(pos, node, expected)
         || ParserLiteral().parse(pos, node, expected)
-        || ParserCastExpression().parse(pos, node, expected)
+        || ParserCastAsExpression().parse(pos, node, expected)
         || ParserExtractExpression().parse(pos, node, expected)
         || ParserDateAddExpression().parse(pos, node, expected)
         || ParserDateDiffExpression().parse(pos, node, expected)
diff --git a/src/Parsers/ExpressionElementParsers.h b/src/Parsers/ExpressionElementParsers.h
index cbbbd3f6d3b..9ba92ad6f66 100644
--- a/src/Parsers/ExpressionElementParsers.h
+++ b/src/Parsers/ExpressionElementParsers.h
@@ -45,7 +45,7 @@ protected:
 class ParserIdentifier : public IParserBase
 {
 public:
-    ParserIdentifier(bool allow_query_parameter_ = false) : allow_query_parameter(allow_query_parameter_) {}
+    explicit ParserIdentifier(bool allow_query_parameter_ = false) : allow_query_parameter(allow_query_parameter_) {}
 protected:
     const char * getName() const override { return "identifier"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
@@ -59,7 +59,7 @@ protected:
 class ParserCompoundIdentifier : public IParserBase
 {
 public:
-    ParserCompoundIdentifier(bool table_name_with_optional_uuid_ = false, bool allow_query_parameter_ = false)
+    explicit ParserCompoundIdentifier(bool table_name_with_optional_uuid_ = false, bool allow_query_parameter_ = false)
         : table_name_with_optional_uuid(table_name_with_optional_uuid_), allow_query_parameter(allow_query_parameter_)
     {
     }
@@ -85,7 +85,7 @@ public:
     using ColumnTransformers = MultiEnum<ColumnTransformer, UInt8>;
     static constexpr auto AllTransformers = ColumnTransformers{ColumnTransformer::APPLY, ColumnTransformer::EXCEPT, ColumnTransformer::REPLACE};
 
-    ParserColumnsTransformers(ColumnTransformers allowed_transformers_ = AllTransformers, bool is_strict_ = false)
+    explicit ParserColumnsTransformers(ColumnTransformers allowed_transformers_ = AllTransformers, bool is_strict_ = false)
         : allowed_transformers(allowed_transformers_)
         , is_strict(is_strict_)
     {}
@@ -103,7 +103,7 @@ class ParserAsterisk : public IParserBase
 {
 public:
     using ColumnTransformers = ParserColumnsTransformers::ColumnTransformers;
-    ParserAsterisk(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
+    explicit ParserAsterisk(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
         : allowed_transformers(allowed_transformers_)
     {}
 
@@ -129,7 +129,7 @@ class ParserColumnsMatcher : public IParserBase
 {
 public:
     using ColumnTransformers = ParserColumnsTransformers::ColumnTransformers;
-    ParserColumnsMatcher(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
+    explicit ParserColumnsMatcher(ColumnTransformers allowed_transformers_ = ParserColumnsTransformers::AllTransformers)
         : allowed_transformers(allowed_transformers_)
     {}
 
@@ -149,7 +149,7 @@ protected:
 class ParserFunction : public IParserBase
 {
 public:
-    ParserFunction(bool allow_function_parameters_ = true, bool is_table_function_ = false)
+    explicit ParserFunction(bool allow_function_parameters_ = true, bool is_table_function_ = false)
         : allow_function_parameters(allow_function_parameters_), is_table_function(is_table_function_)
     {
     }
@@ -209,10 +209,22 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
-class ParserCastExpression : public IParserBase
+/// Fast path of cast operator "::".
+/// It tries to read literal as text.
+/// If it fails, later operator will be transformed to function CAST.
+/// Examples: "0.1::Decimal(38, 38)", "[1, 2]::Array(UInt8)"
+class ParserCastOperator : public IParserBase
 {
 protected:
-    const char * getName() const override { return "CAST expression"; }
+    const char * getName() const override { return "CAST operator"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+ASTPtr createFunctionCast(const ASTPtr & expr_ast, const ASTPtr & type_ast);
+class ParserCastAsExpression : public IParserBase
+{
+protected:
+    const char * getName() const override { return "CAST AS expression"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index e9ad65af471..eec79edc05e 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -3,7 +3,6 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTFunctionWithKeyValueArguments.h>
-#include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseIntervalKind.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -558,11 +557,32 @@ bool ParserUnaryMinusExpression::parseImpl(Pos & pos, ASTPtr & node, Expected &
 }
 
 
+bool ParserCastExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ASTPtr expr_ast;
+    if (!elem_parser.parse(pos, expr_ast, expected))
+        return false;
+
+    ASTPtr type_ast;
+    if (ParserToken(TokenType::DoubleColon).ignore(pos, expected)
+        && ParserDataType().parse(pos, type_ast, expected))
+    {
+        node = createFunctionCast(expr_ast, type_ast);
+    }
+    else
+    {
+        node = expr_ast;
+    }
+
+    return true;
+}
+
+
 bool ParserArrayElementExpression::parseImpl(Pos & pos, ASTPtr & node, Expected &expected)
 {
     return ParserLeftAssociativeBinaryOperatorList{
         operators,
-        std::make_unique<ParserExpressionElement>(),
+        std::make_unique<ParserCastExpression>(),
         std::make_unique<ParserExpressionWithOptionalAlias>(false)
     }.parse(pos, node, expected);
 }
diff --git a/src/Parsers/ExpressionListParsers.h b/src/Parsers/ExpressionListParsers.h
index 2371e006c09..3a65141d751 100644
--- a/src/Parsers/ExpressionListParsers.h
+++ b/src/Parsers/ExpressionListParsers.h
@@ -6,6 +6,7 @@
 #include <Parsers/CommonParsers.h>
 
 #include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ExpressionElementParsers.h>
 #include <Common/IntervalKind.h>
 
 namespace DB
@@ -205,6 +206,20 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
+/// CAST operator "::". This parser is used if left argument
+/// of operator cannot be read as simple literal from text of query.
+/// Example: "[1, 1 + 1, 1 + 2]::Array(UInt8)"
+class ParserCastExpression : public IParserBase
+{
+private:
+    ParserExpressionElement elem_parser;
+
+protected:
+    const char * getName() const override { return "CAST expression"; }
+
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 
 class ParserArrayElementExpression : public IParserBase
 {
diff --git a/src/Parsers/IAST.cpp b/src/Parsers/IAST.cpp
index 6451a9d0c0d..3a21d704eb9 100644
--- a/src/Parsers/IAST.cpp
+++ b/src/Parsers/IAST.cpp
@@ -53,7 +53,7 @@ IAST::Hash IAST::getTreeHash() const
     SipHash hash_state;
     updateTreeHash(hash_state);
     IAST::Hash res;
-    hash_state.get128(res.first, res.second);
+    hash_state.get128(res);
     return res;
 }
 
diff --git a/src/Parsers/Lexer.cpp b/src/Parsers/Lexer.cpp
index 1fa4d396113..241abbd98de 100644
--- a/src/Parsers/Lexer.cpp
+++ b/src/Parsers/Lexer.cpp
@@ -316,7 +316,12 @@ Token Lexer::nextTokenImpl()
         case '?':
             return Token(TokenType::QuestionMark, token_begin, ++pos);
         case ':':
-            return Token(TokenType::Colon, token_begin, ++pos);
+        {
+            ++pos;
+            if (pos < end && *pos == ':')
+                return Token(TokenType::DoubleColon, token_begin, ++pos);
+            return Token(TokenType::Colon, token_begin, pos);
+        }
         case '|':
         {
             ++pos;
diff --git a/src/Parsers/Lexer.h b/src/Parsers/Lexer.h
index dc1c9824b6b..447964355c8 100644
--- a/src/Parsers/Lexer.h
+++ b/src/Parsers/Lexer.h
@@ -40,6 +40,7 @@ namespace DB
     M(Arrow)                  /** ->. Should be distinguished from minus operator. */ \
     M(QuestionMark) \
     M(Colon) \
+    M(DoubleColon) \
     M(Equals) \
     M(NotEquals) \
     M(Less) \
diff --git a/src/Parsers/New/AST/AlterTableQuery.cpp b/src/Parsers/New/AST/AlterTableQuery.cpp
index 4b75e8fe1b6..3f901f95639 100644
--- a/src/Parsers/New/AST/AlterTableQuery.cpp
+++ b/src/Parsers/New/AST/AlterTableQuery.cpp
@@ -91,6 +91,15 @@ PtrTo<AlterTableClause> AlterTableClause::createAddIndex(bool if_not_exists, Ptr
     return query;
 }
 
+// static
+PtrTo<AlterTableClause> AlterTableClause::createAddProjection(bool if_not_exists, PtrTo<TableElementExpr> element, PtrTo<Identifier> after)
+{
+    assert(element->getType() == TableElementExpr::ExprType::PROJECTION);
+    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::ADD_PROJECTION, {element, after}));
+    query->if_not_exists = if_not_exists;
+    return query;
+}
+
 // static
 PtrTo<AlterTableClause> AlterTableClause::createAttach(PtrTo<PartitionClause> clause, PtrTo<TableIdentifier> from)
 {
@@ -98,9 +107,23 @@ PtrTo<AlterTableClause> AlterTableClause::createAttach(PtrTo<PartitionClause> cl
 }
 
 // static
-PtrTo<AlterTableClause> AlterTableClause::createClear(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in)
+PtrTo<AlterTableClause> AlterTableClause::createClearColumn(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in)
 {
-    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::CLEAR, {identifier, in}));
+    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::CLEAR_COLUMN, {identifier, in}));
+    query->if_exists = if_exists;
+    return query;
+}
+
+PtrTo<AlterTableClause> AlterTableClause::createClearIndex(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in)
+{
+    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::CLEAR_INDEX, {identifier, in}));
+    query->if_exists = if_exists;
+    return query;
+}
+
+PtrTo<AlterTableClause> AlterTableClause::createClearProjection(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in)
+{
+    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::CLEAR_PROJECTION, {identifier, in}));
     query->if_exists = if_exists;
     return query;
 }
@@ -149,6 +172,14 @@ PtrTo<AlterTableClause> AlterTableClause::createDropIndex(bool if_exists, PtrTo<
     return query;
 }
 
+// static
+PtrTo<AlterTableClause> AlterTableClause::createDropProjection(bool if_exists, PtrTo<Identifier> identifier)
+{
+    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::DROP_PROJECTION, {identifier}));
+    query->if_exists = if_exists;
+    return query;
+}
+
 // static
 PtrTo<AlterTableClause> AlterTableClause::createDropPartition(PtrTo<PartitionClause> clause)
 {
@@ -161,6 +192,22 @@ PtrTo<AlterTableClause> AlterTableClause::createFreezePartition(PtrTo<PartitionC
     return PtrTo<AlterTableClause>(new AlterTableClause(ClauseType::FREEZE_PARTITION, {clause}));
 }
 
+// static
+PtrTo<AlterTableClause> AlterTableClause::createMaterializeIndex(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in)
+{
+    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::MATERIALIZE_INDEX, {identifier, in}));
+    query->if_exists = if_exists;
+    return query;
+}
+
+// static
+PtrTo<AlterTableClause> AlterTableClause::createMaterializeProjection(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in)
+{
+    PtrTo<AlterTableClause> query(new AlterTableClause(ClauseType::MATERIALIZE_PROJECTION, {identifier, in}));
+    query->if_exists = if_exists;
+    return query;
+}
+
 // static
 PtrTo<AlterTableClause> AlterTableClause::createModify(bool if_exists, PtrTo<TableElementExpr> element)
 {
@@ -256,6 +303,13 @@ ASTPtr AlterTableClause::convertToOld() const
             if (has(AFTER)) command->index = get(AFTER)->convertToOld();
             break;
 
+        case ClauseType::ADD_PROJECTION:
+            command->type = ASTAlterCommand::ADD_PROJECTION;
+            command->if_not_exists = if_not_exists;
+            command->projection_decl = get(ELEMENT)->convertToOld();
+            if (has(AFTER)) command->projection = get(AFTER)->convertToOld();
+            break;
+
         case ClauseType::ATTACH:
             command->type = ASTAlterCommand::ATTACH_PARTITION;
             command->partition = get(PARTITION)->convertToOld();
@@ -271,12 +325,30 @@ ASTPtr AlterTableClause::convertToOld() const
             }
             break;
 
-        case ClauseType::CLEAR:
+        case ClauseType::CLEAR_COLUMN:
             command->type = ASTAlterCommand::DROP_COLUMN;
             command->if_exists = if_exists;
             command->clear_column = true;
             command->detach = false;
-            command->column = get(COLUMN)->convertToOld();
+            command->column = get(ELEMENT)->convertToOld();
+            if (has(IN)) command->partition = get(IN)->convertToOld();
+            break;
+
+        case ClauseType::CLEAR_INDEX:
+            command->type = ASTAlterCommand::DROP_INDEX;
+            command->if_exists = if_exists;
+            command->clear_index = true;
+            command->detach = false;
+            command->index = get(ELEMENT)->convertToOld();
+            if (has(IN)) command->partition = get(IN)->convertToOld();
+            break;
+
+        case ClauseType::CLEAR_PROJECTION:
+            command->type = ASTAlterCommand::DROP_PROJECTION;
+            command->if_exists = if_exists;
+            command->clear_projection = true;
+            command->detach = false;
+            command->projection = get(ELEMENT)->convertToOld();
             if (has(IN)) command->partition = get(IN)->convertToOld();
             break;
 
@@ -315,14 +387,21 @@ ASTPtr AlterTableClause::convertToOld() const
             command->type = ASTAlterCommand::DROP_COLUMN;
             command->if_exists = if_exists;
             command->detach = false;
-            command->column = get(COLUMN)->convertToOld();
+            command->column = get(ELEMENT)->convertToOld();
             break;
 
         case ClauseType::DROP_INDEX:
             command->type = ASTAlterCommand::DROP_INDEX;
             command->if_exists = if_exists;
             command->detach = false;
-            command->index = get(COLUMN)->convertToOld();
+            command->index = get(ELEMENT)->convertToOld();
+            break;
+
+        case ClauseType::DROP_PROJECTION:
+            command->type = ASTAlterCommand::DROP_PROJECTION;
+            command->if_exists = if_exists;
+            command->detach = false;
+            command->projection = get(ELEMENT)->convertToOld();
             break;
 
         case ClauseType::DROP_PARTITION:
@@ -340,6 +419,20 @@ ASTPtr AlterTableClause::convertToOld() const
                 command->type = ASTAlterCommand::FREEZE_ALL;
             break;
 
+        case ClauseType::MATERIALIZE_INDEX:
+            command->type = ASTAlterCommand::MATERIALIZE_INDEX;
+            command->if_exists = if_exists;
+            command->index = get(ELEMENT)->convertToOld();
+            if (has(IN)) command->partition = get(IN)->convertToOld();
+            break;
+
+        case ClauseType::MATERIALIZE_PROJECTION:
+            command->type = ASTAlterCommand::MATERIALIZE_PROJECTION;
+            command->if_exists = if_exists;
+            command->projection = get(ELEMENT)->convertToOld();
+            if (has(IN)) command->partition = get(IN)->convertToOld();
+            break;
+
         case ClauseType::MODIFY:
             command->type = ASTAlterCommand::MODIFY_COLUMN;
             command->if_exists = if_exists;
@@ -511,16 +604,34 @@ antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseAddIndex(ClickHouseParser::
     return AlterTableClause::createAddIndex(!!ctx->IF(), visit(ctx->tableIndexDfnt()), after);
 }
 
+antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseAddProjection(ClickHouseParser::AlterTableClauseAddProjectionContext * ctx)
+{
+    auto after = ctx->AFTER() ? visit(ctx->nestedIdentifier()).as<PtrTo<Identifier>>() : nullptr;
+    return AlterTableClause::createAddProjection(!!ctx->IF(), visit(ctx->tableProjectionDfnt()), after);
+}
+
 antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseAttach(ClickHouseParser::AlterTableClauseAttachContext *ctx)
 {
     auto from = ctx->tableIdentifier() ? visit(ctx->tableIdentifier()).as<PtrTo<TableIdentifier>>() : nullptr;
     return AlterTableClause::createAttach(visit(ctx->partitionClause()), from);
 }
 
-antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseClear(ClickHouseParser::AlterTableClauseClearContext * ctx)
+antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseClearColumn(ClickHouseParser::AlterTableClauseClearColumnContext * ctx)
 {
     auto partition = ctx->partitionClause() ? visit(ctx->partitionClause()).as<PtrTo<PartitionClause>>() : nullptr;
-    return AlterTableClause::createClear(!!ctx->IF(), visit(ctx->nestedIdentifier()), partition);
+    return AlterTableClause::createClearColumn(!!ctx->IF(), visit(ctx->nestedIdentifier()), partition);
+}
+
+antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseClearIndex(ClickHouseParser::AlterTableClauseClearIndexContext * ctx)
+{
+    auto partition = ctx->partitionClause() ? visit(ctx->partitionClause()).as<PtrTo<PartitionClause>>() : nullptr;
+    return AlterTableClause::createClearIndex(!!ctx->IF(), visit(ctx->nestedIdentifier()), partition);
+}
+
+antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseClearProjection(ClickHouseParser::AlterTableClauseClearProjectionContext * ctx)
+{
+    auto partition = ctx->partitionClause() ? visit(ctx->partitionClause()).as<PtrTo<PartitionClause>>() : nullptr;
+    return AlterTableClause::createClearProjection(!!ctx->IF(), visit(ctx->nestedIdentifier()), partition);
 }
 
 antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseComment(ClickHouseParser::AlterTableClauseCommentContext * ctx)
@@ -548,6 +659,11 @@ antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseDropIndex(ClickHouseParser:
     return AlterTableClause::createDropIndex(!!ctx->IF(), visit(ctx->nestedIdentifier()));
 }
 
+antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseDropProjection(ClickHouseParser::AlterTableClauseDropProjectionContext * ctx)
+{
+    return AlterTableClause::createDropProjection(!!ctx->IF(), visit(ctx->nestedIdentifier()));
+}
+
 antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseDropPartition(ClickHouseParser::AlterTableClauseDropPartitionContext *ctx)
 {
     return AlterTableClause::createDropPartition(visit(ctx->partitionClause()));
@@ -559,6 +675,18 @@ antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseFreezePartition(ClickHouseP
     return AlterTableClause::createFreezePartition(clause);
 }
 
+antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseMaterializeIndex(ClickHouseParser::AlterTableClauseMaterializeIndexContext * ctx)
+{
+    auto partition = ctx->partitionClause() ? visit(ctx->partitionClause()).as<PtrTo<PartitionClause>>() : nullptr;
+    return AlterTableClause::createMaterializeIndex(!!ctx->IF(), visit(ctx->nestedIdentifier()), partition);
+}
+
+antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseMaterializeProjection(ClickHouseParser::AlterTableClauseMaterializeProjectionContext * ctx)
+{
+    auto partition = ctx->partitionClause() ? visit(ctx->partitionClause()).as<PtrTo<PartitionClause>>() : nullptr;
+    return AlterTableClause::createMaterializeProjection(!!ctx->IF(), visit(ctx->nestedIdentifier()), partition);
+}
+
 antlrcpp::Any ParseTreeVisitor::visitAlterTableClauseModify(ClickHouseParser::AlterTableClauseModifyContext * ctx)
 {
     return AlterTableClause::createModify(!!ctx->IF(), visit(ctx->tableColumnDfnt()));
diff --git a/src/Parsers/New/AST/AlterTableQuery.h b/src/Parsers/New/AST/AlterTableQuery.h
index a1e5becedaf..7e7783c49ad 100644
--- a/src/Parsers/New/AST/AlterTableQuery.h
+++ b/src/Parsers/New/AST/AlterTableQuery.h
@@ -61,16 +61,22 @@ class AlterTableClause : public INode
     public:
         static PtrTo<AlterTableClause> createAddColumn(bool if_not_exists, PtrTo<TableElementExpr> element, PtrTo<Identifier> after);
         static PtrTo<AlterTableClause> createAddIndex(bool if_not_exists, PtrTo<TableElementExpr> element, PtrTo<Identifier> after);
+        static PtrTo<AlterTableClause> createAddProjection(bool if_not_exists, PtrTo<TableElementExpr> element, PtrTo<Identifier> after);
         static PtrTo<AlterTableClause> createAttach(PtrTo<PartitionClause> clause, PtrTo<TableIdentifier> from);
-        static PtrTo<AlterTableClause> createClear(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in);
+        static PtrTo<AlterTableClause> createClearColumn(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in);
+        static PtrTo<AlterTableClause> createClearIndex(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in);
+        static PtrTo<AlterTableClause> createClearProjection(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in);
         static PtrTo<AlterTableClause> createCodec(bool if_exists, PtrTo<Identifier> identifier, PtrTo<CodecExpr> codec);
         static PtrTo<AlterTableClause> createComment(bool if_exists, PtrTo<Identifier> identifier, PtrTo<StringLiteral> comment);
         static PtrTo<AlterTableClause> createDelete(PtrTo<ColumnExpr> expr);
         static PtrTo<AlterTableClause> createDetach(PtrTo<PartitionClause> clause);
         static PtrTo<AlterTableClause> createDropColumn(bool if_exists, PtrTo<Identifier> identifier);
         static PtrTo<AlterTableClause> createDropIndex(bool if_exists, PtrTo<Identifier> identifier);
+        static PtrTo<AlterTableClause> createDropProjection(bool if_exists, PtrTo<Identifier> identifier);
         static PtrTo<AlterTableClause> createDropPartition(PtrTo<PartitionClause> clause);
         static PtrTo<AlterTableClause> createFreezePartition(PtrTo<PartitionClause> clause);
+        static PtrTo<AlterTableClause> createMaterializeIndex(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in);
+        static PtrTo<AlterTableClause> createMaterializeProjection(bool if_exists, PtrTo<Identifier> identifier, PtrTo<PartitionClause> in);
         static PtrTo<AlterTableClause> createModify(bool if_exists, PtrTo<TableElementExpr> element);
         static PtrTo<AlterTableClause> createMovePartitionToDisk(PtrTo<PartitionClause> clause, PtrTo<StringLiteral> literal);
         static PtrTo<AlterTableClause> createMovePartitionToTable(PtrTo<PartitionClause> clause, PtrTo<TableIdentifier> identifier);
@@ -88,19 +94,19 @@ class AlterTableClause : public INode
     private:
         enum ChildIndex : UInt8
         {
-            // ADD COLUMN or INDEX
-            ELEMENT = 0,  // TableElementExpr
+            // ADD COLUMN, INDEX or PROJECTION
+            ELEMENT = 0,  // TableElementExpr (COLUMN, CONSTRAINT, INDEX, PROJECTION)
             AFTER = 1,    // Identifier (optional)
 
             // ATTACH/REPLACE
             PARTITION = 0,  // PartitionClause
             FROM = 1,       // TableIdentifier (optional)
 
-            // CLEAR
-            COLUMN = 0,  // Identifier
+            // CLEAR COLUMN, INDEX or PROJECTION
             IN = 1,      // PartitionClause
 
-            // CODEC
+            // CODEC, COMMENT and RENAME
+            COLUMN = 0, // Identifier
             CODEC = 1,  // CodecExpr
 
             // COMMENT
@@ -127,16 +133,22 @@ class AlterTableClause : public INode
         {
             ADD_COLUMN,
             ADD_INDEX,
+            ADD_PROJECTION,
             ATTACH,
-            CLEAR,
+            CLEAR_COLUMN,
+            CLEAR_INDEX,
+            CLEAR_PROJECTION,
             CODEC,
             COMMENT,
             DELETE,
             DETACH,
             DROP_COLUMN,
             DROP_INDEX,
+            DROP_PROJECTION,
             DROP_PARTITION,
             FREEZE_PARTITION,
+            MATERIALIZE_INDEX,
+            MATERIALIZE_PROJECTION,
             MODIFY,
             MOVE_PARTITION_TO_DISK,
             MOVE_PARTITION_TO_TABLE,
diff --git a/src/Parsers/New/AST/CreateTableQuery.cpp b/src/Parsers/New/AST/CreateTableQuery.cpp
index 77b43f525ec..bb2ec505138 100644
--- a/src/Parsers/New/AST/CreateTableQuery.cpp
+++ b/src/Parsers/New/AST/CreateTableQuery.cpp
@@ -48,6 +48,7 @@ ASTPtr TableSchemaClause::convertToOld() const
             auto column_list = std::make_shared<ASTExpressionList>();
             auto constraint_list = std::make_shared<ASTExpressionList>();
             auto index_list = std::make_shared<ASTExpressionList>();
+            auto projection_list = std::make_shared<ASTExpressionList>();
 
             for (const auto & element : get(ELEMENTS)->as<TableElementList &>())
             {
@@ -62,12 +63,16 @@ ASTPtr TableSchemaClause::convertToOld() const
                     case TableElementExpr::ExprType::INDEX:
                         index_list->children.push_back(element->convertToOld());
                         break;
+                    case TableElementExpr::ExprType::PROJECTION:
+                        projection_list->children.push_back(element->convertToOld());
+                        break;
                 }
             }
 
             if (!column_list->children.empty()) columns->set(columns->columns, column_list);
             if (!constraint_list->children.empty()) columns->set(columns->constraints, constraint_list);
             if (!index_list->children.empty()) columns->set(columns->indices, index_list);
+            if (!projection_list->children.empty()) columns->set(columns->projections, projection_list);
 
             return columns;
         }
diff --git a/src/Parsers/New/AST/Identifier.cpp b/src/Parsers/New/AST/Identifier.cpp
index a5c41bf9876..3b931d19720 100644
--- a/src/Parsers/New/AST/Identifier.cpp
+++ b/src/Parsers/New/AST/Identifier.cpp
@@ -142,16 +142,19 @@ antlrcpp::Any ParseTreeVisitor::visitIdentifierOrNull(ClickHouseParser::Identifi
 
 antlrcpp::Any ParseTreeVisitor::visitInterval(ClickHouseParser::IntervalContext *)
 {
+    asm (""); // prevent symbol removal
     __builtin_unreachable();
 }
 
 antlrcpp::Any ParseTreeVisitor::visitKeyword(ClickHouseParser::KeywordContext *)
 {
+    asm (""); // prevent symbol removal
     __builtin_unreachable();
 }
 
 antlrcpp::Any ParseTreeVisitor::visitKeywordForAlias(ClickHouseParser::KeywordForAliasContext *)
 {
+    asm (""); // prevent symbol removal
     __builtin_unreachable();
 }
 
diff --git a/src/Parsers/New/AST/SelectUnionQuery.cpp b/src/Parsers/New/AST/SelectUnionQuery.cpp
index b3c6e2a923b..35eda09b473 100644
--- a/src/Parsers/New/AST/SelectUnionQuery.cpp
+++ b/src/Parsers/New/AST/SelectUnionQuery.cpp
@@ -1,7 +1,9 @@
 #include <Parsers/New/AST/SelectUnionQuery.h>
 
 #include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTProjectionSelectQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSetQuery.h>
@@ -102,6 +104,59 @@ ASTPtr SettingsClause::convertToOld() const
     return expr;
 }
 
+// PROJECTION SELECT Caluse
+
+ProjectionSelectStmt::ProjectionSelectStmt(PtrTo<ColumnExprList> expr_list)
+    : INode(MAX_INDEX)
+{
+    set(COLUMNS, expr_list);
+}
+
+void ProjectionSelectStmt::setWithClause(PtrTo<WithClause> clause)
+{
+    set(WITH, clause);
+}
+
+void ProjectionSelectStmt::setGroupByClause(PtrTo<GroupByClause> clause)
+{
+    set(GROUP_BY, clause);
+}
+
+void ProjectionSelectStmt::setOrderByClause(PtrTo<ProjectionOrderByClause> clause)
+{
+    set(ORDER_BY, clause);
+}
+
+ASTPtr ProjectionSelectStmt::convertToOld() const
+{
+    auto old_select = std::make_shared<ASTProjectionSelectQuery>();
+
+    old_select->setExpression(ASTProjectionSelectQuery::Expression::SELECT, get(COLUMNS)->convertToOld());
+
+    if (has(WITH)) old_select->setExpression(ASTProjectionSelectQuery::Expression::WITH, get(WITH)->convertToOld());
+    if (has(GROUP_BY)) old_select->setExpression(ASTProjectionSelectQuery::Expression::GROUP_BY, get(GROUP_BY)->convertToOld());
+    if (has(ORDER_BY))
+    {
+        ASTPtr order_expression;
+        auto expr_list = get(ORDER_BY)->convertToOld();
+        if (expr_list->children.size() == 1)
+        {
+            order_expression = expr_list->children.front();
+        }
+        else
+        {
+            auto function_node = std::make_shared<ASTFunction>();
+            function_node->name = "tuple";
+            function_node->arguments = expr_list;
+            function_node->children.push_back(expr_list);
+            order_expression = function_node;
+        }
+        old_select->setExpression(ASTProjectionSelectQuery::Expression::ORDER_BY, std::move(order_expression));
+    }
+
+    return old_select;
+}
+
 // SELECT Statement
 
 SelectStmt::SelectStmt(bool distinct_, ModifierType type, bool totals, PtrTo<ColumnExprList> expr_list)
@@ -302,6 +357,11 @@ antlrcpp::Any ParseTreeVisitor::visitOrderByClause(ClickHouseParser::OrderByClau
     return std::make_shared<OrderByClause>(visit(ctx->orderExprList()).as<PtrTo<OrderExprList>>());
 }
 
+antlrcpp::Any ParseTreeVisitor::visitProjectionOrderByClause(ClickHouseParser::ProjectionOrderByClauseContext *ctx)
+{
+    return std::make_shared<ProjectionOrderByClause>(visit(ctx->columnExprList()).as<PtrTo<ColumnExprList>>());
+}
+
 antlrcpp::Any ParseTreeVisitor::visitLimitByClause(ClickHouseParser::LimitByClauseContext *ctx)
 {
     return std::make_shared<LimitByClause>(visit(ctx->limitExpr()), visit(ctx->columnExprList()));
@@ -317,6 +377,18 @@ antlrcpp::Any ParseTreeVisitor::visitSettingsClause(ClickHouseParser::SettingsCl
     return std::make_shared<SettingsClause>(visit(ctx->settingExprList()).as<PtrTo<SettingExprList>>());
 }
 
+antlrcpp::Any ParseTreeVisitor::visitProjectionSelectStmt(ClickHouseParser::ProjectionSelectStmtContext *ctx)
+{
+    PtrTo<ColumnExprList> column_list = visit(ctx->columnExprList());
+    auto select_stmt = std::make_shared<ProjectionSelectStmt>(column_list);
+
+    if (ctx->withClause()) select_stmt->setWithClause(visit(ctx->withClause()));
+    if (ctx->groupByClause()) select_stmt->setGroupByClause(visit(ctx->groupByClause()));
+    if (ctx->projectionOrderByClause()) select_stmt->setOrderByClause(visit(ctx->projectionOrderByClause()));
+
+    return select_stmt;
+}
+
 antlrcpp::Any ParseTreeVisitor::visitSelectStmt(ClickHouseParser::SelectStmtContext *ctx)
 {
     SelectStmt::ModifierType type = SelectStmt::ModifierType::NONE;
diff --git a/src/Parsers/New/AST/SelectUnionQuery.h b/src/Parsers/New/AST/SelectUnionQuery.h
index 0d9b74dd192..587da271a78 100644
--- a/src/Parsers/New/AST/SelectUnionQuery.h
+++ b/src/Parsers/New/AST/SelectUnionQuery.h
@@ -97,6 +97,29 @@ class SettingsClause : public INode
 
 // Statement
 
+class ProjectionSelectStmt : public INode
+{
+    public:
+        ProjectionSelectStmt(PtrTo<ColumnExprList> expr_list);
+
+        void setWithClause(PtrTo<WithClause> clause);
+        void setGroupByClause(PtrTo<GroupByClause> clause);
+        void setOrderByClause(PtrTo<ProjectionOrderByClause> clause);
+
+        ASTPtr convertToOld() const override;
+
+    private:
+        enum ChildIndex : UInt8
+        {
+            COLUMNS = 0,  // ColumnExprList
+            WITH,         // WithClause (optional)
+            GROUP_BY,     // GroupByClause (optional)
+            ORDER_BY,     // OrderByClause (optional)
+
+            MAX_INDEX,
+        };
+};
+
 class SelectStmt : public INode
 {
     public:
diff --git a/src/Parsers/New/AST/TableElementExpr.cpp b/src/Parsers/New/AST/TableElementExpr.cpp
index d994ea7eef6..70855fee697 100644
--- a/src/Parsers/New/AST/TableElementExpr.cpp
+++ b/src/Parsers/New/AST/TableElementExpr.cpp
@@ -4,10 +4,12 @@
 #include <Parsers/ASTConstraintDeclaration.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIndexDeclaration.h>
+#include <Parsers/ASTProjectionDeclaration.h>
 #include <Parsers/New/AST/ColumnExpr.h>
 #include <Parsers/New/AST/ColumnTypeExpr.h>
 #include <Parsers/New/AST/Identifier.h>
 #include <Parsers/New/AST/Literal.h>
+#include <Parsers/New/AST/SelectUnionQuery.h>
 #include <Parsers/New/ParseTreeVisitor.h>
 
 
@@ -81,6 +83,13 @@ TableElementExpr::createIndex(PtrTo<Identifier> name, PtrTo<ColumnExpr> expr, Pt
     return PtrTo<TableElementExpr>(new TableElementExpr(ExprType::INDEX, {name, expr, type, granularity}));
 }
 
+// static
+PtrTo<TableElementExpr>
+TableElementExpr::createProjection(PtrTo<Identifier> name, PtrTo<ProjectionSelectStmt> query)
+{
+    return PtrTo<TableElementExpr>(new TableElementExpr(ExprType::PROJECTION, {name, query}));
+}
+
 TableElementExpr::TableElementExpr(ExprType type, PtrList exprs) : INode(exprs), expr_type(type)
 {
 }
@@ -152,6 +161,15 @@ ASTPtr TableElementExpr::convertToOld() const
             expr->set(expr->type, get(INDEX_TYPE)->convertToOld());
             expr->granularity = get<NumberLiteral>(GRANULARITY)->as<UInt64>().value_or(0); // FIXME: throw exception instead of default.
 
+            return expr;
+        }
+        case ExprType::PROJECTION:
+        {
+            auto expr = std::make_shared<ASTProjectionDeclaration>();
+
+            expr->name = get<Identifier>(NAME)->getName();
+            expr->set(expr->query, get(QUERY)->convertToOld());
+
             return expr;
         }
     }
@@ -222,6 +240,11 @@ antlrcpp::Any ParseTreeVisitor::visitTableElementExprIndex(ClickHouseParser::Tab
     return visit(ctx->tableIndexDfnt());
 }
 
+antlrcpp::Any ParseTreeVisitor::visitTableElementExprProjection(ClickHouseParser::TableElementExprProjectionContext *ctx)
+{
+    return visit(ctx->tableProjectionDfnt());
+}
+
 antlrcpp::Any ParseTreeVisitor::visitTableIndexDfnt(ClickHouseParser::TableIndexDfntContext *ctx)
 {
     return TableElementExpr::createIndex(
@@ -231,4 +254,11 @@ antlrcpp::Any ParseTreeVisitor::visitTableIndexDfnt(ClickHouseParser::TableIndex
         Literal::createNumber(ctx->DECIMAL_LITERAL()));
 }
 
+antlrcpp::Any ParseTreeVisitor::visitTableProjectionDfnt(ClickHouseParser::TableProjectionDfntContext *ctx)
+{
+    return TableElementExpr::createProjection(
+        visit(ctx->nestedIdentifier()),
+        visit(ctx->projectionSelectStmt()));
+}
+
 }
diff --git a/src/Parsers/New/AST/TableElementExpr.h b/src/Parsers/New/AST/TableElementExpr.h
index ca0a4f23bdd..18d1aa9c456 100644
--- a/src/Parsers/New/AST/TableElementExpr.h
+++ b/src/Parsers/New/AST/TableElementExpr.h
@@ -68,6 +68,7 @@ class TableElementExpr : public INode
             COLUMN,
             CONSTRAINT,
             INDEX,
+            PROJECTION,
         };
 
         static PtrTo<TableElementExpr> createColumn(
@@ -83,6 +84,9 @@ class TableElementExpr : public INode
         static PtrTo<TableElementExpr>
         createIndex(PtrTo<Identifier> name, PtrTo<ColumnExpr> expr, PtrTo<ColumnTypeExpr> type, PtrTo<NumberLiteral> granularity);
 
+        static PtrTo<TableElementExpr>
+        createProjection(PtrTo<Identifier> name, PtrTo<ProjectionSelectStmt> query);
+
         auto getType() const { return expr_type; }
 
         ASTPtr convertToOld() const override;
@@ -106,6 +110,9 @@ class TableElementExpr : public INode
             EXPR = 1,         // ColumnExpr
             INDEX_TYPE = 2,   // ColumnTypeExpr
             GRANULARITY = 3,  // NumberLiteral
+
+            // PROJECTION
+            QUERY = 1,         // ColumnExpr
         };
 
         const ExprType expr_type;
diff --git a/src/Parsers/New/AST/fwd_decl.h b/src/Parsers/New/AST/fwd_decl.h
index 555e9cb5727..4f9bde4bbbb 100644
--- a/src/Parsers/New/AST/fwd_decl.h
+++ b/src/Parsers/New/AST/fwd_decl.h
@@ -47,6 +47,7 @@ class PartitionClause;
 class Query;
 class RatioExpr;
 class TableSchemaClause;
+class ProjectionSelectStmt;
 class SelectStmt;
 class SelectUnionQuery;
 class SettingExpr;
@@ -81,6 +82,7 @@ using TTLExprList = List<TTLExpr>;
 using ClusterClause = SimpleClause<StringLiteral>;
 using DestinationClause = SimpleClause<TableIdentifier>;
 using OrderByClause = SimpleClause<OrderExprList>;
+using ProjectionOrderByClause = SimpleClause<ColumnExprList>;
 using PrimaryKeyClause = SimpleClause<ColumnExpr>;
 using TTLClause = SimpleClause<TTLExprList>;
 using UUIDClause = SimpleClause<StringLiteral>;
diff --git a/src/Parsers/New/CMakeLists.txt b/src/Parsers/New/CMakeLists.txt
index 468394b7bd8..b045b0cc123 100644
--- a/src/Parsers/New/CMakeLists.txt
+++ b/src/Parsers/New/CMakeLists.txt
@@ -50,12 +50,6 @@ set (SRCS
 
 add_library (clickhouse_parsers_new ${SRCS})
 
-# XXX: hack for old clang-10!
-check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
-
-# XXX: hack for old gcc-10!
-check_cxx_compiler_flag("-Wshadow" HAS_SHADOW)
-
 target_compile_options (clickhouse_parsers_new
     PRIVATE
         -Wno-c++2a-compat
@@ -68,12 +62,16 @@ target_compile_options (clickhouse_parsers_new
         -Wno-extra-semi
         -Wno-inconsistent-missing-destructor-override
 )
+
+# XXX: hack for old clang-10!
 if (HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
     target_compile_options (clickhouse_parsers_new
         PRIVATE
             -Wno-suggest-destructor-override
     )
 endif ()
+
+# XXX: hack for old gcc-10!
 if (HAS_SHADOW)
     target_compile_options (clickhouse_parsers_new
         PRIVATE
diff --git a/src/Parsers/New/CharInputStream.cpp b/src/Parsers/New/CharInputStream.cpp
index 820666ff801..71cccafae50 100644
--- a/src/Parsers/New/CharInputStream.cpp
+++ b/src/Parsers/New/CharInputStream.cpp
@@ -40,7 +40,7 @@ void CharInputStream::consume()
         throw IllegalStateException("cannot consume EOF");
     }
 
-    if (p < s) ++p;
+    ++p;
 }
 
 void CharInputStream::seek(size_t i)
diff --git a/src/Parsers/New/ClickHouseLexer.cpp b/src/Parsers/New/ClickHouseLexer.cpp
index 832e5969426..f5db3a71dee 100644
--- a/src/Parsers/New/ClickHouseLexer.cpp
+++ b/src/Parsers/New/ClickHouseLexer.cpp
@@ -76,30 +76,30 @@ std::vector<std::string> ClickHouseLexer::_ruleNames = {
   u8"INDEX", u8"INF", u8"INJECTIVE", u8"INNER", u8"INSERT", u8"INTERVAL", 
   u8"INTO", u8"IS", u8"IS_OBJECT_ID", u8"JOIN", u8"KEY", u8"KILL", u8"LAST", 
   u8"LAYOUT", u8"LEADING", u8"LEFT", u8"LIFETIME", u8"LIKE", u8"LIMIT", 
-  u8"LIVE", u8"LOCAL", u8"LOGS", u8"MATERIALIZED", u8"MAX", u8"MERGES", 
-  u8"MIN", u8"MINUTE", u8"MODIFY", u8"MONTH", u8"MOVE", u8"MUTATION", u8"NAN_SQL", 
-  u8"NO", u8"NOT", u8"NULL_SQL", u8"NULLS", u8"OFFSET", u8"ON", u8"OPTIMIZE", 
-  u8"OR", u8"ORDER", u8"OUTER", u8"OUTFILE", u8"PARTITION", u8"POPULATE", 
-  u8"PREWHERE", u8"PRIMARY", u8"QUARTER", u8"RANGE", u8"RELOAD", u8"REMOVE", 
-  u8"RENAME", u8"REPLACE", u8"REPLICA", u8"REPLICATED", u8"RIGHT", u8"ROLLUP", 
-  u8"SAMPLE", u8"SECOND", u8"SELECT", u8"SEMI", u8"SENDS", u8"SET", u8"SETTINGS", 
-  u8"SHOW", u8"SOURCE", u8"START", u8"STOP", u8"SUBSTRING", u8"SYNC", u8"SYNTAX", 
-  u8"SYSTEM", u8"TABLE", u8"TABLES", u8"TEMPORARY", u8"TEST", u8"THEN", 
-  u8"TIES", u8"TIMEOUT", u8"TIMESTAMP", u8"TO", u8"TOP", u8"TOTALS", u8"TRAILING", 
-  u8"TRIM", u8"TRUNCATE", u8"TTL", u8"TYPE", u8"UNION", u8"UPDATE", u8"USE", 
-  u8"USING", u8"UUID", u8"VALUES", u8"VIEW", u8"VOLUME", u8"WATCH", u8"WEEK", 
-  u8"WHEN", u8"WHERE", u8"WITH", u8"YEAR", u8"JSON_FALSE", u8"JSON_TRUE", 
-  u8"IDENTIFIER", u8"FLOATING_LITERAL", u8"OCTAL_LITERAL", u8"DECIMAL_LITERAL", 
-  u8"HEXADECIMAL_LITERAL", u8"STRING_LITERAL", u8"A", u8"B", u8"C", u8"D", 
-  u8"E", u8"F", u8"G", u8"H", u8"I", u8"J", u8"K", u8"L", u8"M", u8"N", 
-  u8"O", u8"P", u8"Q", u8"R", u8"S", u8"T", u8"U", u8"V", u8"W", u8"X", 
-  u8"Y", u8"Z", u8"LETTER", u8"OCT_DIGIT", u8"DEC_DIGIT", u8"HEX_DIGIT", 
-  u8"ARROW", u8"ASTERISK", u8"BACKQUOTE", u8"BACKSLASH", u8"COLON", u8"COMMA", 
-  u8"CONCAT", u8"DASH", u8"DOT", u8"EQ_DOUBLE", u8"EQ_SINGLE", u8"GE", u8"GT", 
-  u8"LBRACE", u8"LBRACKET", u8"LE", u8"LPAREN", u8"LT", u8"NOT_EQ", u8"PERCENT", 
-  u8"PLUS", u8"QUERY", u8"QUOTE_DOUBLE", u8"QUOTE_SINGLE", u8"RBRACE", u8"RBRACKET", 
-  u8"RPAREN", u8"SEMICOLON", u8"SLASH", u8"UNDERSCORE", u8"MULTI_LINE_COMMENT", 
-  u8"SINGLE_LINE_COMMENT", u8"WHITESPACE"
+  u8"LIVE", u8"LOCAL", u8"LOGS", u8"MATERIALIZED", u8"MATERIALIZE", u8"MAX", 
+  u8"MERGES", u8"MIN", u8"MINUTE", u8"MODIFY", u8"MONTH", u8"MOVE", u8"MUTATION", 
+  u8"NAN_SQL", u8"NO", u8"NOT", u8"NULL_SQL", u8"NULLS", u8"OFFSET", u8"ON", 
+  u8"OPTIMIZE", u8"OR", u8"ORDER", u8"OUTER", u8"OUTFILE", u8"PARTITION", 
+  u8"POPULATE", u8"PREWHERE", u8"PRIMARY", u8"PROJECTION", u8"QUARTER", 
+  u8"RANGE", u8"RELOAD", u8"REMOVE", u8"RENAME", u8"REPLACE", u8"REPLICA", 
+  u8"REPLICATED", u8"RIGHT", u8"ROLLUP", u8"SAMPLE", u8"SECOND", u8"SELECT", 
+  u8"SEMI", u8"SENDS", u8"SET", u8"SETTINGS", u8"SHOW", u8"SOURCE", u8"START", 
+  u8"STOP", u8"SUBSTRING", u8"SYNC", u8"SYNTAX", u8"SYSTEM", u8"TABLE", 
+  u8"TABLES", u8"TEMPORARY", u8"TEST", u8"THEN", u8"TIES", u8"TIMEOUT", 
+  u8"TIMESTAMP", u8"TO", u8"TOP", u8"TOTALS", u8"TRAILING", u8"TRIM", u8"TRUNCATE", 
+  u8"TTL", u8"TYPE", u8"UNION", u8"UPDATE", u8"USE", u8"USING", u8"UUID", 
+  u8"VALUES", u8"VIEW", u8"VOLUME", u8"WATCH", u8"WEEK", u8"WHEN", u8"WHERE", 
+  u8"WITH", u8"YEAR", u8"JSON_FALSE", u8"JSON_TRUE", u8"IDENTIFIER", u8"FLOATING_LITERAL", 
+  u8"OCTAL_LITERAL", u8"DECIMAL_LITERAL", u8"HEXADECIMAL_LITERAL", u8"STRING_LITERAL", 
+  u8"A", u8"B", u8"C", u8"D", u8"E", u8"F", u8"G", u8"H", u8"I", u8"J", 
+  u8"K", u8"L", u8"M", u8"N", u8"O", u8"P", u8"Q", u8"R", u8"S", u8"T", 
+  u8"U", u8"V", u8"W", u8"X", u8"Y", u8"Z", u8"LETTER", u8"OCT_DIGIT", u8"DEC_DIGIT", 
+  u8"HEX_DIGIT", u8"ARROW", u8"ASTERISK", u8"BACKQUOTE", u8"BACKSLASH", 
+  u8"COLON", u8"COMMA", u8"CONCAT", u8"DASH", u8"DOT", u8"EQ_DOUBLE", u8"EQ_SINGLE", 
+  u8"GE", u8"GT", u8"LBRACE", u8"LBRACKET", u8"LE", u8"LPAREN", u8"LT", 
+  u8"NOT_EQ", u8"PERCENT", u8"PLUS", u8"QUERY", u8"QUOTE_DOUBLE", u8"QUOTE_SINGLE", 
+  u8"RBRACE", u8"RBRACKET", u8"RPAREN", u8"SEMICOLON", u8"SLASH", u8"UNDERSCORE", 
+  u8"MULTI_LINE_COMMENT", u8"SINGLE_LINE_COMMENT", u8"WHITESPACE"
 };
 
 std::vector<std::string> ClickHouseLexer::_channelNames = {
@@ -120,12 +120,12 @@ std::vector<std::string> ClickHouseLexer::_literalNames = {
   "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
   "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
   "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-  "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", u8"'false'", 
-  u8"'true'", "", "", "", "", "", "", u8"'->'", u8"'*'", u8"'`'", u8"'\\'", 
-  u8"':'", u8"','", u8"'||'", u8"'-'", u8"'.'", u8"'=='", u8"'='", u8"'>='", 
-  u8"'>'", u8"'{'", u8"'['", u8"'<='", u8"'('", u8"'<'", "", u8"'%'", u8"'+'", 
-  u8"'?'", u8"'\"'", u8"'''", u8"'}'", u8"']'", u8"')'", u8"';'", u8"'/'", 
-  u8"'_'"
+  "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
+  "", u8"'false'", u8"'true'", "", "", "", "", "", "", u8"'->'", u8"'*'", 
+  u8"'`'", u8"'\\'", u8"':'", u8"','", u8"'||'", u8"'-'", u8"'.'", u8"'=='", 
+  u8"'='", u8"'>='", u8"'>'", u8"'{'", u8"'['", u8"'<='", u8"'('", u8"'<'", 
+  "", u8"'%'", u8"'+'", u8"'?'", u8"'\"'", u8"'''", u8"'}'", u8"']'", u8"')'", 
+  u8"';'", u8"'/'", u8"'_'"
 };
 
 std::vector<std::string> ClickHouseLexer::_symbolicNames = {
@@ -144,27 +144,27 @@ std::vector<std::string> ClickHouseLexer::_symbolicNames = {
   u8"INDEX", u8"INF", u8"INJECTIVE", u8"INNER", u8"INSERT", u8"INTERVAL", 
   u8"INTO", u8"IS", u8"IS_OBJECT_ID", u8"JOIN", u8"KEY", u8"KILL", u8"LAST", 
   u8"LAYOUT", u8"LEADING", u8"LEFT", u8"LIFETIME", u8"LIKE", u8"LIMIT", 
-  u8"LIVE", u8"LOCAL", u8"LOGS", u8"MATERIALIZED", u8"MAX", u8"MERGES", 
-  u8"MIN", u8"MINUTE", u8"MODIFY", u8"MONTH", u8"MOVE", u8"MUTATION", u8"NAN_SQL", 
-  u8"NO", u8"NOT", u8"NULL_SQL", u8"NULLS", u8"OFFSET", u8"ON", u8"OPTIMIZE", 
-  u8"OR", u8"ORDER", u8"OUTER", u8"OUTFILE", u8"PARTITION", u8"POPULATE", 
-  u8"PREWHERE", u8"PRIMARY", u8"QUARTER", u8"RANGE", u8"RELOAD", u8"REMOVE", 
-  u8"RENAME", u8"REPLACE", u8"REPLICA", u8"REPLICATED", u8"RIGHT", u8"ROLLUP", 
-  u8"SAMPLE", u8"SECOND", u8"SELECT", u8"SEMI", u8"SENDS", u8"SET", u8"SETTINGS", 
-  u8"SHOW", u8"SOURCE", u8"START", u8"STOP", u8"SUBSTRING", u8"SYNC", u8"SYNTAX", 
-  u8"SYSTEM", u8"TABLE", u8"TABLES", u8"TEMPORARY", u8"TEST", u8"THEN", 
-  u8"TIES", u8"TIMEOUT", u8"TIMESTAMP", u8"TO", u8"TOP", u8"TOTALS", u8"TRAILING", 
-  u8"TRIM", u8"TRUNCATE", u8"TTL", u8"TYPE", u8"UNION", u8"UPDATE", u8"USE", 
-  u8"USING", u8"UUID", u8"VALUES", u8"VIEW", u8"VOLUME", u8"WATCH", u8"WEEK", 
-  u8"WHEN", u8"WHERE", u8"WITH", u8"YEAR", u8"JSON_FALSE", u8"JSON_TRUE", 
-  u8"IDENTIFIER", u8"FLOATING_LITERAL", u8"OCTAL_LITERAL", u8"DECIMAL_LITERAL", 
-  u8"HEXADECIMAL_LITERAL", u8"STRING_LITERAL", u8"ARROW", u8"ASTERISK", 
-  u8"BACKQUOTE", u8"BACKSLASH", u8"COLON", u8"COMMA", u8"CONCAT", u8"DASH", 
-  u8"DOT", u8"EQ_DOUBLE", u8"EQ_SINGLE", u8"GE", u8"GT", u8"LBRACE", u8"LBRACKET", 
-  u8"LE", u8"LPAREN", u8"LT", u8"NOT_EQ", u8"PERCENT", u8"PLUS", u8"QUERY", 
-  u8"QUOTE_DOUBLE", u8"QUOTE_SINGLE", u8"RBRACE", u8"RBRACKET", u8"RPAREN", 
-  u8"SEMICOLON", u8"SLASH", u8"UNDERSCORE", u8"MULTI_LINE_COMMENT", u8"SINGLE_LINE_COMMENT", 
-  u8"WHITESPACE"
+  u8"LIVE", u8"LOCAL", u8"LOGS", u8"MATERIALIZED", u8"MATERIALIZE", u8"MAX", 
+  u8"MERGES", u8"MIN", u8"MINUTE", u8"MODIFY", u8"MONTH", u8"MOVE", u8"MUTATION", 
+  u8"NAN_SQL", u8"NO", u8"NOT", u8"NULL_SQL", u8"NULLS", u8"OFFSET", u8"ON", 
+  u8"OPTIMIZE", u8"OR", u8"ORDER", u8"OUTER", u8"OUTFILE", u8"PARTITION", 
+  u8"POPULATE", u8"PREWHERE", u8"PRIMARY", u8"PROJECTION", u8"QUARTER", 
+  u8"RANGE", u8"RELOAD", u8"REMOVE", u8"RENAME", u8"REPLACE", u8"REPLICA", 
+  u8"REPLICATED", u8"RIGHT", u8"ROLLUP", u8"SAMPLE", u8"SECOND", u8"SELECT", 
+  u8"SEMI", u8"SENDS", u8"SET", u8"SETTINGS", u8"SHOW", u8"SOURCE", u8"START", 
+  u8"STOP", u8"SUBSTRING", u8"SYNC", u8"SYNTAX", u8"SYSTEM", u8"TABLE", 
+  u8"TABLES", u8"TEMPORARY", u8"TEST", u8"THEN", u8"TIES", u8"TIMEOUT", 
+  u8"TIMESTAMP", u8"TO", u8"TOP", u8"TOTALS", u8"TRAILING", u8"TRIM", u8"TRUNCATE", 
+  u8"TTL", u8"TYPE", u8"UNION", u8"UPDATE", u8"USE", u8"USING", u8"UUID", 
+  u8"VALUES", u8"VIEW", u8"VOLUME", u8"WATCH", u8"WEEK", u8"WHEN", u8"WHERE", 
+  u8"WITH", u8"YEAR", u8"JSON_FALSE", u8"JSON_TRUE", u8"IDENTIFIER", u8"FLOATING_LITERAL", 
+  u8"OCTAL_LITERAL", u8"DECIMAL_LITERAL", u8"HEXADECIMAL_LITERAL", u8"STRING_LITERAL", 
+  u8"ARROW", u8"ASTERISK", u8"BACKQUOTE", u8"BACKSLASH", u8"COLON", u8"COMMA", 
+  u8"CONCAT", u8"DASH", u8"DOT", u8"EQ_DOUBLE", u8"EQ_SINGLE", u8"GE", u8"GT", 
+  u8"LBRACE", u8"LBRACKET", u8"LE", u8"LPAREN", u8"LT", u8"NOT_EQ", u8"PERCENT", 
+  u8"PLUS", u8"QUERY", u8"QUOTE_DOUBLE", u8"QUOTE_SINGLE", u8"RBRACE", u8"RBRACKET", 
+  u8"RPAREN", u8"SEMICOLON", u8"SLASH", u8"UNDERSCORE", u8"MULTI_LINE_COMMENT", 
+  u8"SINGLE_LINE_COMMENT", u8"WHITESPACE"
 };
 
 dfa::Vocabulary ClickHouseLexer::_vocabulary(_literalNames, _symbolicNames);
@@ -188,7 +188,7 @@ ClickHouseLexer::Initializer::Initializer() {
 
   _serializedATN = {
     0x3, 0x608b, 0xa72a, 0x8133, 0xb9ed, 0x417c, 0x3be7, 0x7786, 0x5964, 
-    0x2, 0xdd, 0x7e2, 0x8, 0x1, 0x4, 0x2, 0x9, 0x2, 0x4, 0x3, 0x9, 0x3, 
+    0x2, 0xdf, 0x7fd, 0x8, 0x1, 0x4, 0x2, 0x9, 0x2, 0x4, 0x3, 0x9, 0x3, 
     0x4, 0x4, 0x9, 0x4, 0x4, 0x5, 0x9, 0x5, 0x4, 0x6, 0x9, 0x6, 0x4, 0x7, 
     0x9, 0x7, 0x4, 0x8, 0x9, 0x8, 0x4, 0x9, 0x9, 0x9, 0x4, 0xa, 0x9, 0xa, 
     0x4, 0xb, 0x9, 0xb, 0x4, 0xc, 0x9, 0xc, 0x4, 0xd, 0x9, 0xd, 0x4, 0xe, 
@@ -264,1308 +264,1326 @@ ClickHouseLexer::Initializer::Initializer() {
     0xee, 0x4, 0xef, 0x9, 0xef, 0x4, 0xf0, 0x9, 0xf0, 0x4, 0xf1, 0x9, 0xf1, 
     0x4, 0xf2, 0x9, 0xf2, 0x4, 0xf3, 0x9, 0xf3, 0x4, 0xf4, 0x9, 0xf4, 0x4, 
     0xf5, 0x9, 0xf5, 0x4, 0xf6, 0x9, 0xf6, 0x4, 0xf7, 0x9, 0xf7, 0x4, 0xf8, 
-    0x9, 0xf8, 0x4, 0xf9, 0x9, 0xf9, 0x4, 0xfa, 0x9, 0xfa, 0x3, 0x2, 0x3, 
-    0x2, 0x3, 0x2, 0x3, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 
-    0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 
-    0x4, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x6, 0x3, 0x6, 0x3, 
-    0x6, 0x3, 0x6, 0x3, 0x6, 0x3, 0x6, 0x3, 0x7, 0x3, 0x7, 0x3, 0x7, 0x3, 
-    0x7, 0x3, 0x8, 0x3, 0x8, 0x3, 0x8, 0x3, 0x8, 0x3, 0x8, 0x3, 0x9, 0x3, 
-    0x9, 0x3, 0x9, 0x3, 0x9, 0x3, 0xa, 0x3, 0xa, 0x3, 0xa, 0x3, 0xa, 0x3, 
-    0xa, 0x3, 0xa, 0x3, 0xb, 0x3, 0xb, 0x3, 0xb, 0x3, 0xc, 0x3, 0xc, 0x3, 
-    0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 
-    0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x234, 0xa, 0xc, 
-    0x3, 0xd, 0x3, 0xd, 0x3, 0xd, 0x3, 0xd, 0x3, 0xd, 0x3, 0xe, 0x3, 0xe, 
-    0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 
-    0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 
-    0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x11, 0x3, 
-    0x11, 0x3, 0x11, 0x3, 0x11, 0x3, 0x11, 0x3, 0x12, 0x3, 0x12, 0x3, 0x12, 
-    0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x14, 0x3, 
-    0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 
-    0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 
-    0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 
-    0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 0x3, 0x18, 0x3, 0x18, 0x3, 
-    0x18, 0x3, 0x18, 0x3, 0x18, 0x3, 0x18, 0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 
-    0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x1a, 0x3, 
-    0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1b, 
-    0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 
-    0x1b, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 
-    0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1d, 0x3, 
-    0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1e, 
-    0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1f, 0x3, 
-    0x1f, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 
-    0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 
+    0x9, 0xf8, 0x4, 0xf9, 0x9, 0xf9, 0x4, 0xfa, 0x9, 0xfa, 0x4, 0xfb, 0x9, 
+    0xfb, 0x4, 0xfc, 0x9, 0xfc, 0x3, 0x2, 0x3, 0x2, 0x3, 0x2, 0x3, 0x2, 
+    0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 
+    0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x5, 0x3, 0x5, 
+    0x3, 0x5, 0x3, 0x5, 0x3, 0x6, 0x3, 0x6, 0x3, 0x6, 0x3, 0x6, 0x3, 0x6, 
+    0x3, 0x6, 0x3, 0x7, 0x3, 0x7, 0x3, 0x7, 0x3, 0x7, 0x3, 0x8, 0x3, 0x8, 
+    0x3, 0x8, 0x3, 0x8, 0x3, 0x8, 0x3, 0x9, 0x3, 0x9, 0x3, 0x9, 0x3, 0x9, 
+    0x3, 0xa, 0x3, 0xa, 0x3, 0xa, 0x3, 0xa, 0x3, 0xa, 0x3, 0xa, 0x3, 0xb, 
+    0x3, 0xb, 0x3, 0xb, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 
+    0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 
+    0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x238, 0xa, 0xc, 0x3, 0xd, 0x3, 0xd, 0x3, 
+    0xd, 0x3, 0xd, 0x3, 0xd, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 
+    0xe, 0x3, 0xe, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 
+    0xf, 0x3, 0xf, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 
+    0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x11, 0x3, 0x11, 0x3, 0x11, 0x3, 
+    0x11, 0x3, 0x11, 0x3, 0x12, 0x3, 0x12, 0x3, 0x12, 0x3, 0x13, 0x3, 0x13, 
+    0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 
+    0x14, 0x3, 0x14, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 
+    0x3, 0x15, 0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 
+    0x16, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 
+    0x3, 0x17, 0x3, 0x17, 0x3, 0x18, 0x3, 0x18, 0x3, 0x18, 0x3, 0x18, 0x3, 
+    0x18, 0x3, 0x18, 0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 
+    0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 
+    0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 
+    0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1c, 0x3, 
+    0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 
+    0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 
+    0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1e, 
+    0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x1f, 0x3, 
+    0x1f, 0x3, 0x1f, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 
+    0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x3, 0x21, 0x3, 0x21, 0x3, 
     0x21, 0x3, 0x21, 0x3, 0x21, 0x3, 0x21, 0x3, 0x21, 0x3, 0x21, 0x3, 0x21, 
-    0x3, 0x21, 0x3, 0x21, 0x3, 0x21, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 
-    0x22, 0x3, 0x22, 0x3, 0x23, 0x3, 0x23, 0x3, 0x23, 0x3, 0x23, 0x3, 0x24, 
+    0x3, 0x21, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 
+    0x23, 0x3, 0x23, 0x3, 0x23, 0x3, 0x23, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 
     0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 
-    0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x25, 0x3, 0x25, 
-    0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 
-    0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x27, 
-    0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 
-    0x28, 0x3, 0x28, 0x3, 0x28, 0x3, 0x28, 0x3, 0x28, 0x3, 0x29, 0x3, 0x29, 
+    0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 
+    0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x26, 0x3, 0x26, 0x3, 
+    0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 
+    0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 0x28, 0x3, 0x28, 0x3, 
+    0x28, 0x3, 0x28, 0x3, 0x28, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 
     0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 
-    0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 
-    0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2b, 0x3, 
-    0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2c, 
+    0x29, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 
+    0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 
+    0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 
     0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 
-    0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2d, 
+    0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 
     0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 
-    0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 
-    0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 
-    0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x30, 0x3, 0x30, 
+    0x2d, 0x3, 0x2d, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 
+    0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 
+    0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 
     0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 
-    0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 
-    0x3, 0x31, 0x3, 0x31, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 
-    0x32, 0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 0x34, 0x3, 0x34, 
-    0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x35, 0x3, 
-    0x35, 0x3, 0x35, 0x3, 0x35, 0x3, 0x35, 0x3, 0x35, 0x3, 0x35, 0x3, 0x36, 
-    0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 
-    0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 
-    0x3, 0x37, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 
-    0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x39, 
-    0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 
-    0x39, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 
-    0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 
-    0x3b, 0x3, 0x3b, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 
-    0x3, 0x3c, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 
-    0x3d, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3f, 0x3, 0x3f, 
-    0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x40, 0x3, 
-    0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x41, 
-    0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 0x3, 0x42, 0x3, 0x42, 0x3, 
-    0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 
-    0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x44, 0x3, 
-    0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x45, 
+    0x30, 0x3, 0x30, 0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 
+    0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x33, 0x3, 
+    0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 
+    0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x35, 0x3, 0x35, 0x3, 0x35, 0x3, 
+    0x35, 0x3, 0x35, 0x3, 0x35, 0x3, 0x35, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 
+    0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 0x37, 0x3, 0x37, 0x3, 
+    0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x38, 
+    0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 
+    0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 
+    0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x3a, 0x3, 
+    0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 
+    0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 
+    0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3d, 
+    0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3e, 0x3, 
+    0x3e, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 
+    0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 
+    0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 
+    0x3, 0x41, 0x3, 0x41, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 
+    0x42, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 
+    0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 
+    0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 
     0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 
-    0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x46, 0x3, 0x46, 
-    0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x3, 0x47, 0x3, 0x47, 0x3, 
-    0x47, 0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x3, 0x48, 0x3, 0x48, 
+    0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 
+    0x3, 0x46, 0x3, 0x46, 0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x3, 
+    0x47, 0x3, 0x47, 0x3, 0x47, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 
     0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 
-    0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x49, 0x3, 0x49, 
-    0x3, 0x49, 0x3, 0x49, 0x3, 0x49, 0x3, 0x4a, 0x3, 0x4a, 0x3, 0x4a, 0x3, 
-    0x4b, 0x3, 0x4b, 0x3, 0x4b, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 
-    0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4d, 0x3, 0x4d, 0x3, 0x4d, 0x3, 0x4e, 0x3, 
-    0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4f, 0x3, 0x4f, 
+    0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x49, 0x3, 0x49, 0x3, 0x49, 0x3, 0x49, 
+    0x3, 0x49, 0x3, 0x4a, 0x3, 0x4a, 0x3, 0x4a, 0x3, 0x4b, 0x3, 0x4b, 0x3, 
+    0x4b, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 
+    0x3, 0x4d, 0x3, 0x4d, 0x3, 0x4d, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 
+    0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
     0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 
-    0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x410, 
-    0xa, 0x4f, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 
-    0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x51, 0x3, 0x51, 
-    0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x52, 0x3, 0x52, 0x3, 
-    0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 
-    0x53, 0x3, 0x54, 0x3, 0x54, 0x3, 0x54, 0x3, 0x54, 0x3, 0x54, 0x3, 0x55, 
-    0x3, 0x55, 0x3, 0x55, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
+    0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x414, 0xa, 0x4f, 0x3, 0x50, 
+    0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 
+    0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 
+    0x3, 0x51, 0x3, 0x51, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 
+    0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
+    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x54, 0x3, 
+    0x54, 0x3, 0x54, 0x3, 0x54, 0x3, 0x54, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 
+    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
     0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x3, 
-    0x57, 0x3, 0x58, 0x3, 0x58, 0x3, 0x58, 0x3, 0x58, 0x3, 0x59, 0x3, 0x59, 
-    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x3, 
-    0x5a, 0x3, 0x5a, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 
-    0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 
-    0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 
-    0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 
-    0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5f, 0x3, 0x5f, 
-    0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 0x3, 0x60, 0x3, 0x60, 0x3, 0x60, 0x3, 
-    0x60, 0x3, 0x60, 0x3, 0x60, 0x3, 0x61, 0x3, 0x61, 0x3, 0x61, 0x3, 0x61, 
-    0x3, 0x61, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 
-    0x62, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x64, 
+    0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x3, 0x58, 0x3, 
+    0x58, 0x3, 0x58, 0x3, 0x58, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x3, 
+    0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 
+    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 
+    0x5c, 0x3, 0x5c, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 
+    0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 
+    0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 
+    0x3, 0x5f, 0x3, 0x60, 0x3, 0x60, 0x3, 0x60, 0x3, 0x60, 0x3, 0x60, 0x3, 
+    0x60, 0x3, 0x61, 0x3, 0x61, 0x3, 0x61, 0x3, 0x61, 0x3, 0x61, 0x3, 0x62, 
+    0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x63, 0x3, 
+    0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 
     0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 
-    0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x65, 
-    0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 0x3, 
-    0x66, 0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 0x3, 0x67, 0x3, 0x67, 0x3, 0x67, 
-    0x3, 0x67, 0x3, 0x68, 0x3, 0x68, 0x3, 0x68, 0x3, 0x68, 0x3, 0x68, 0x3, 
-    0x68, 0x3, 0x68, 0x3, 0x69, 0x3, 0x69, 0x3, 0x69, 0x3, 0x69, 0x3, 0x69, 
-    0x3, 0x69, 0x3, 0x69, 0x3, 0x6a, 0x3, 0x6a, 0x3, 0x6a, 0x3, 0x6a, 0x3, 
-    0x6a, 0x3, 0x6a, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 
-    0x3, 0x6c, 0x3, 0x6c, 0x3, 0x6c, 0x3, 0x6c, 0x3, 0x6c, 0x3, 0x6c, 0x3, 
-    0x6c, 0x3, 0x6c, 0x3, 0x6c, 0x3, 0x6d, 0x3, 0x6d, 0x3, 0x6d, 0x3, 0x6d, 
-    0x3, 0x6e, 0x3, 0x6e, 0x3, 0x6e, 0x3, 0x6f, 0x3, 0x6f, 0x3, 0x6f, 0x3, 
-    0x6f, 0x3, 0x70, 0x3, 0x70, 0x3, 0x70, 0x3, 0x70, 0x3, 0x70, 0x3, 0x71, 
-    0x3, 0x71, 0x3, 0x71, 0x3, 0x71, 0x3, 0x71, 0x3, 0x71, 0x3, 0x72, 0x3, 
-    0x72, 0x3, 0x72, 0x3, 0x72, 0x3, 0x72, 0x3, 0x72, 0x3, 0x72, 0x3, 0x73, 
-    0x3, 0x73, 0x3, 0x73, 0x3, 0x74, 0x3, 0x74, 0x3, 0x74, 0x3, 0x74, 0x3, 
-    0x74, 0x3, 0x74, 0x3, 0x74, 0x3, 0x74, 0x3, 0x74, 0x3, 0x75, 0x3, 0x75, 
-    0x3, 0x75, 0x3, 0x76, 0x3, 0x76, 0x3, 0x76, 0x3, 0x76, 0x3, 0x76, 0x3, 
-    0x76, 0x3, 0x77, 0x3, 0x77, 0x3, 0x77, 0x3, 0x77, 0x3, 0x77, 0x3, 0x77, 
-    0x3, 0x78, 0x3, 0x78, 0x3, 0x78, 0x3, 0x78, 0x3, 0x78, 0x3, 0x78, 0x3, 
-    0x78, 0x3, 0x78, 0x3, 0x79, 0x3, 0x79, 0x3, 0x79, 0x3, 0x79, 0x3, 0x79, 
+    0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 
+    0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 0x3, 
+    0x65, 0x3, 0x65, 0x3, 0x65, 0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 
+    0x3, 0x67, 0x3, 0x67, 0x3, 0x67, 0x3, 0x67, 0x3, 0x67, 0x3, 0x67, 0x3, 
+    0x67, 0x3, 0x68, 0x3, 0x68, 0x3, 0x68, 0x3, 0x68, 0x3, 0x69, 0x3, 0x69, 
+    0x3, 0x69, 0x3, 0x69, 0x3, 0x69, 0x3, 0x69, 0x3, 0x69, 0x3, 0x6a, 0x3, 
+    0x6a, 0x3, 0x6a, 0x3, 0x6a, 0x3, 0x6a, 0x3, 0x6a, 0x3, 0x6a, 0x3, 0x6b, 
+    0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6c, 0x3, 
+    0x6c, 0x3, 0x6c, 0x3, 0x6c, 0x3, 0x6c, 0x3, 0x6d, 0x3, 0x6d, 0x3, 0x6d, 
+    0x3, 0x6d, 0x3, 0x6d, 0x3, 0x6d, 0x3, 0x6d, 0x3, 0x6d, 0x3, 0x6d, 0x3, 
+    0x6e, 0x3, 0x6e, 0x3, 0x6e, 0x3, 0x6e, 0x3, 0x6f, 0x3, 0x6f, 0x3, 0x6f, 
+    0x3, 0x70, 0x3, 0x70, 0x3, 0x70, 0x3, 0x70, 0x3, 0x71, 0x3, 0x71, 0x3, 
+    0x71, 0x3, 0x71, 0x3, 0x71, 0x3, 0x72, 0x3, 0x72, 0x3, 0x72, 0x3, 0x72, 
+    0x3, 0x72, 0x3, 0x72, 0x3, 0x73, 0x3, 0x73, 0x3, 0x73, 0x3, 0x73, 0x3, 
+    0x73, 0x3, 0x73, 0x3, 0x73, 0x3, 0x74, 0x3, 0x74, 0x3, 0x74, 0x3, 0x75, 
+    0x3, 0x75, 0x3, 0x75, 0x3, 0x75, 0x3, 0x75, 0x3, 0x75, 0x3, 0x75, 0x3, 
+    0x75, 0x3, 0x75, 0x3, 0x76, 0x3, 0x76, 0x3, 0x76, 0x3, 0x77, 0x3, 0x77, 
+    0x3, 0x77, 0x3, 0x77, 0x3, 0x77, 0x3, 0x77, 0x3, 0x78, 0x3, 0x78, 0x3, 
+    0x78, 0x3, 0x78, 0x3, 0x78, 0x3, 0x78, 0x3, 0x79, 0x3, 0x79, 0x3, 0x79, 
     0x3, 0x79, 0x3, 0x79, 0x3, 0x79, 0x3, 0x79, 0x3, 0x79, 0x3, 0x7a, 0x3, 
     0x7a, 0x3, 0x7a, 0x3, 0x7a, 0x3, 0x7a, 0x3, 0x7a, 0x3, 0x7a, 0x3, 0x7a, 
-    0x3, 0x7a, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 
-    0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 
-    0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7d, 0x3, 
-    0x7d, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 
-    0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 
-    0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 
-    0x3, 0x80, 0x3, 0x80, 0x3, 0x80, 0x3, 0x80, 0x3, 0x80, 0x3, 0x80, 0x3, 
-    0x80, 0x3, 0x81, 0x3, 0x81, 0x3, 0x81, 0x3, 0x81, 0x3, 0x81, 0x3, 0x81, 
-    0x3, 0x81, 0x3, 0x82, 0x3, 0x82, 0x3, 0x82, 0x3, 0x82, 0x3, 0x82, 0x3, 
-    0x82, 0x3, 0x82, 0x3, 0x82, 0x3, 0x83, 0x3, 0x83, 0x3, 0x83, 0x3, 0x83, 
-    0x3, 0x83, 0x3, 0x83, 0x3, 0x83, 0x3, 0x83, 0x3, 0x84, 0x3, 0x84, 0x3, 
-    0x84, 0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 
-    0x3, 0x84, 0x3, 0x84, 0x3, 0x85, 0x3, 0x85, 0x3, 0x85, 0x3, 0x85, 0x3, 
-    0x85, 0x3, 0x85, 0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 
-    0x3, 0x86, 0x3, 0x86, 0x3, 0x87, 0x3, 0x87, 0x3, 0x87, 0x3, 0x87, 0x3, 
-    0x87, 0x3, 0x87, 0x3, 0x87, 0x3, 0x88, 0x3, 0x88, 0x3, 0x88, 0x3, 0x88, 
-    0x3, 0x88, 0x3, 0x88, 0x3, 0x88, 0x3, 0x89, 0x3, 0x89, 0x3, 0x89, 0x3, 
-    0x89, 0x3, 0x89, 0x3, 0x89, 0x3, 0x89, 0x3, 0x8a, 0x3, 0x8a, 0x3, 0x8a, 
-    0x3, 0x8a, 0x3, 0x8a, 0x3, 0x8b, 0x3, 0x8b, 0x3, 0x8b, 0x3, 0x8b, 0x3, 
-    0x8b, 0x3, 0x8b, 0x3, 0x8c, 0x3, 0x8c, 0x3, 0x8c, 0x3, 0x8c, 0x3, 0x8d, 
-    0x3, 0x8d, 0x3, 0x8d, 0x3, 0x8d, 0x3, 0x8d, 0x3, 0x8d, 0x3, 0x8d, 0x3, 
-    0x8d, 0x3, 0x8d, 0x3, 0x8e, 0x3, 0x8e, 0x3, 0x8e, 0x3, 0x8e, 0x3, 0x8e, 
-    0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 
-    0x8f, 0x3, 0x90, 0x3, 0x90, 0x3, 0x90, 0x3, 0x90, 0x3, 0x90, 0x3, 0x90, 
-    0x3, 0x91, 0x3, 0x91, 0x3, 0x91, 0x3, 0x91, 0x3, 0x91, 0x3, 0x92, 0x3, 
-    0x92, 0x3, 0x92, 0x3, 0x92, 0x3, 0x92, 0x3, 0x92, 0x3, 0x92, 0x3, 0x92, 
-    0x3, 0x92, 0x3, 0x92, 0x3, 0x93, 0x3, 0x93, 0x3, 0x93, 0x3, 0x93, 0x3, 
-    0x93, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 
-    0x3, 0x94, 0x3, 0x95, 0x3, 0x95, 0x3, 0x95, 0x3, 0x95, 0x3, 0x95, 0x3, 
-    0x95, 0x3, 0x95, 0x3, 0x96, 0x3, 0x96, 0x3, 0x96, 0x3, 0x96, 0x3, 0x96, 
-    0x3, 0x96, 0x3, 0x97, 0x3, 0x97, 0x3, 0x97, 0x3, 0x97, 0x3, 0x97, 0x3, 
-    0x97, 0x3, 0x97, 0x3, 0x98, 0x3, 0x98, 0x3, 0x98, 0x3, 0x98, 0x3, 0x98, 
-    0x3, 0x98, 0x3, 0x98, 0x3, 0x98, 0x3, 0x98, 0x3, 0x98, 0x3, 0x99, 0x3, 
-    0x99, 0x3, 0x99, 0x3, 0x99, 0x3, 0x99, 0x3, 0x9a, 0x3, 0x9a, 0x3, 0x9a, 
-    0x3, 0x9a, 0x3, 0x9a, 0x3, 0x9b, 0x3, 0x9b, 0x3, 0x9b, 0x3, 0x9b, 0x3, 
-    0x9b, 0x3, 0x9c, 0x3, 0x9c, 0x3, 0x9c, 0x3, 0x9c, 0x3, 0x9c, 0x3, 0x9c, 
-    0x3, 0x9c, 0x3, 0x9c, 0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9d, 0x3, 
-    0x9d, 0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9e, 
-    0x3, 0x9e, 0x3, 0x9e, 0x3, 0x9f, 0x3, 0x9f, 0x3, 0x9f, 0x3, 0x9f, 0x3, 
-    0xa0, 0x3, 0xa0, 0x3, 0xa0, 0x3, 0xa0, 0x3, 0xa0, 0x3, 0xa0, 0x3, 0xa0, 
-    0x3, 0xa1, 0x3, 0xa1, 0x3, 0xa1, 0x3, 0xa1, 0x3, 0xa1, 0x3, 0xa1, 0x3, 
-    0xa1, 0x3, 0xa1, 0x3, 0xa1, 0x3, 0xa2, 0x3, 0xa2, 0x3, 0xa2, 0x3, 0xa2, 
-    0x3, 0xa2, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 
-    0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa4, 0x3, 0xa4, 0x3, 0xa4, 
-    0x3, 0xa4, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 0x3, 
-    0xa6, 0x3, 0xa6, 0x3, 0xa6, 0x3, 0xa6, 0x3, 0xa6, 0x3, 0xa6, 0x3, 0xa7, 
-    0x3, 0xa7, 0x3, 0xa7, 0x3, 0xa7, 0x3, 0xa7, 0x3, 0xa7, 0x3, 0xa7, 0x3, 
-    0xa8, 0x3, 0xa8, 0x3, 0xa8, 0x3, 0xa8, 0x3, 0xa9, 0x3, 0xa9, 0x3, 0xa9, 
-    0x3, 0xa9, 0x3, 0xa9, 0x3, 0xa9, 0x3, 0xaa, 0x3, 0xaa, 0x3, 0xaa, 0x3, 
-    0xaa, 0x3, 0xaa, 0x3, 0xab, 0x3, 0xab, 0x3, 0xab, 0x3, 0xab, 0x3, 0xab, 
-    0x3, 0xab, 0x3, 0xab, 0x3, 0xac, 0x3, 0xac, 0x3, 0xac, 0x3, 0xac, 0x3, 
-    0xac, 0x3, 0xad, 0x3, 0xad, 0x3, 0xad, 0x3, 0xad, 0x3, 0xad, 0x3, 0xad, 
-    0x3, 0xad, 0x3, 0xae, 0x3, 0xae, 0x3, 0xae, 0x3, 0xae, 0x3, 0xae, 0x3, 
-    0xae, 0x3, 0xaf, 0x3, 0xaf, 0x3, 0xaf, 0x3, 0xaf, 0x3, 0xaf, 0x3, 0xb0, 
-    0x3, 0xb0, 0x3, 0xb0, 0x3, 0xb0, 0x3, 0xb0, 0x3, 0xb1, 0x3, 0xb1, 0x3, 
-    0xb1, 0x3, 0xb1, 0x3, 0xb1, 0x3, 0xb1, 0x3, 0xb2, 0x3, 0xb2, 0x3, 0xb2, 
-    0x3, 0xb2, 0x3, 0xb2, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 
-    0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x5, 0xb3, 
-    0x69a, 0xa, 0xb3, 0x3, 0xb4, 0x3, 0xb4, 0x3, 0xb4, 0x3, 0xb4, 0x3, 0xb4, 
-    0x3, 0xb4, 0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 0x3, 
-    0xb6, 0x3, 0xb6, 0x5, 0xb6, 0x6a9, 0xa, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 
-    0x3, 0xb6, 0x7, 0xb6, 0x6ae, 0xa, 0xb6, 0xc, 0xb6, 0xe, 0xb6, 0x6b1, 
-    0xb, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 
-    0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x7, 0xb6, 0x6bb, 0xa, 0xb6, 0xc, 0xb6, 
-    0xe, 0xb6, 0x6be, 0xb, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 
-    0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x7, 
-    0xb6, 0x6ca, 0xa, 0xb6, 0xc, 0xb6, 0xe, 0xb6, 0x6cd, 0xb, 0xb6, 0x3, 
-    0xb6, 0x3, 0xb6, 0x5, 0xb6, 0x6d1, 0xa, 0xb6, 0x3, 0xb7, 0x3, 0xb7, 
-    0x3, 0xb7, 0x7, 0xb7, 0x6d6, 0xa, 0xb7, 0xc, 0xb7, 0xe, 0xb7, 0x6d9, 
-    0xb, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 0x5, 0xb7, 0x6dd, 0xa, 0xb7, 0x3, 0xb7, 
-    0x3, 0xb7, 0x5, 0xb7, 0x6e1, 0xa, 0xb7, 0x3, 0xb7, 0x6, 0xb7, 0x6e4, 
-    0xa, 0xb7, 0xd, 0xb7, 0xe, 0xb7, 0x6e5, 0x3, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 
-    0x5, 0xb7, 0x6eb, 0xa, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 0x5, 0xb7, 0x6ef, 
-    0xa, 0xb7, 0x3, 0xb7, 0x6, 0xb7, 0x6f2, 0xa, 0xb7, 0xd, 0xb7, 0xe, 0xb7, 
-    0x6f3, 0x3, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 0x7, 0xb7, 0x6f9, 0xa, 0xb7, 
-    0xc, 0xb7, 0xe, 0xb7, 0x6fc, 0xb, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 
-    0x5, 0xb7, 0x701, 0xa, 0xb7, 0x3, 0xb7, 0x6, 0xb7, 0x704, 0xa, 0xb7, 
-    0xd, 0xb7, 0xe, 0xb7, 0x705, 0x3, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 
-    0x3, 0xb7, 0x5, 0xb7, 0x70d, 0xa, 0xb7, 0x3, 0xb7, 0x6, 0xb7, 0x710, 
-    0xa, 0xb7, 0xd, 0xb7, 0xe, 0xb7, 0x711, 0x3, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 
-    0x3, 0xb7, 0x5, 0xb7, 0x718, 0xa, 0xb7, 0x3, 0xb7, 0x6, 0xb7, 0x71b, 
-    0xa, 0xb7, 0xd, 0xb7, 0xe, 0xb7, 0x71c, 0x5, 0xb7, 0x71f, 0xa, 0xb7, 
-    0x3, 0xb8, 0x3, 0xb8, 0x6, 0xb8, 0x723, 0xa, 0xb8, 0xd, 0xb8, 0xe, 0xb8, 
-    0x724, 0x3, 0xb9, 0x6, 0xb9, 0x728, 0xa, 0xb9, 0xd, 0xb9, 0xe, 0xb9, 
-    0x729, 0x3, 0xba, 0x3, 0xba, 0x3, 0xba, 0x6, 0xba, 0x72f, 0xa, 0xba, 
-    0xd, 0xba, 0xe, 0xba, 0x730, 0x3, 0xbb, 0x3, 0xbb, 0x3, 0xbb, 0x3, 0xbb, 
-    0x3, 0xbb, 0x3, 0xbb, 0x3, 0xbb, 0x3, 0xbb, 0x7, 0xbb, 0x73b, 0xa, 0xbb, 
-    0xc, 0xbb, 0xe, 0xbb, 0x73e, 0xb, 0xbb, 0x3, 0xbb, 0x3, 0xbb, 0x3, 0xbc, 
-    0x3, 0xbc, 0x3, 0xbd, 0x3, 0xbd, 0x3, 0xbe, 0x3, 0xbe, 0x3, 0xbf, 0x3, 
-    0xbf, 0x3, 0xc0, 0x3, 0xc0, 0x3, 0xc1, 0x3, 0xc1, 0x3, 0xc2, 0x3, 0xc2, 
-    0x3, 0xc3, 0x3, 0xc3, 0x3, 0xc4, 0x3, 0xc4, 0x3, 0xc5, 0x3, 0xc5, 0x3, 
-    0xc6, 0x3, 0xc6, 0x3, 0xc7, 0x3, 0xc7, 0x3, 0xc8, 0x3, 0xc8, 0x3, 0xc9, 
-    0x3, 0xc9, 0x3, 0xca, 0x3, 0xca, 0x3, 0xcb, 0x3, 0xcb, 0x3, 0xcc, 0x3, 
-    0xcc, 0x3, 0xcd, 0x3, 0xcd, 0x3, 0xce, 0x3, 0xce, 0x3, 0xcf, 0x3, 0xcf, 
-    0x3, 0xd0, 0x3, 0xd0, 0x3, 0xd1, 0x3, 0xd1, 0x3, 0xd2, 0x3, 0xd2, 0x3, 
-    0xd3, 0x3, 0xd3, 0x3, 0xd4, 0x3, 0xd4, 0x3, 0xd5, 0x3, 0xd5, 0x3, 0xd6, 
-    0x3, 0xd6, 0x3, 0xd7, 0x3, 0xd7, 0x3, 0xd8, 0x3, 0xd8, 0x3, 0xd9, 0x3, 
-    0xd9, 0x3, 0xda, 0x3, 0xda, 0x3, 0xda, 0x3, 0xdb, 0x3, 0xdb, 0x3, 0xdc, 
-    0x3, 0xdc, 0x3, 0xdd, 0x3, 0xdd, 0x3, 0xde, 0x3, 0xde, 0x3, 0xdf, 0x3, 
-    0xdf, 0x3, 0xe0, 0x3, 0xe0, 0x3, 0xe0, 0x3, 0xe1, 0x3, 0xe1, 0x3, 0xe2, 
-    0x3, 0xe2, 0x3, 0xe3, 0x3, 0xe3, 0x3, 0xe3, 0x3, 0xe4, 0x3, 0xe4, 0x3, 
-    0xe5, 0x3, 0xe5, 0x3, 0xe5, 0x3, 0xe6, 0x3, 0xe6, 0x3, 0xe7, 0x3, 0xe7, 
-    0x3, 0xe8, 0x3, 0xe8, 0x3, 0xe9, 0x3, 0xe9, 0x3, 0xe9, 0x3, 0xea, 0x3, 
-    0xea, 0x3, 0xeb, 0x3, 0xeb, 0x3, 0xec, 0x3, 0xec, 0x3, 0xec, 0x3, 0xec, 
-    0x5, 0xec, 0x7ab, 0xa, 0xec, 0x3, 0xed, 0x3, 0xed, 0x3, 0xee, 0x3, 0xee, 
-    0x3, 0xef, 0x3, 0xef, 0x3, 0xf0, 0x3, 0xf0, 0x3, 0xf1, 0x3, 0xf1, 0x3, 
-    0xf2, 0x3, 0xf2, 0x3, 0xf3, 0x3, 0xf3, 0x3, 0xf4, 0x3, 0xf4, 0x3, 0xf5, 
-    0x3, 0xf5, 0x3, 0xf6, 0x3, 0xf6, 0x3, 0xf7, 0x3, 0xf7, 0x3, 0xf8, 0x3, 
-    0xf8, 0x3, 0xf8, 0x3, 0xf8, 0x7, 0xf8, 0x7c7, 0xa, 0xf8, 0xc, 0xf8, 
-    0xe, 0xf8, 0x7ca, 0xb, 0xf8, 0x3, 0xf8, 0x3, 0xf8, 0x3, 0xf8, 0x3, 0xf8, 
-    0x3, 0xf8, 0x3, 0xf9, 0x3, 0xf9, 0x3, 0xf9, 0x3, 0xf9, 0x7, 0xf9, 0x7d5, 
-    0xa, 0xf9, 0xc, 0xf9, 0xe, 0xf9, 0x7d8, 0xb, 0xf9, 0x3, 0xf9, 0x5, 0xf9, 
-    0x7db, 0xa, 0xf9, 0x3, 0xf9, 0x3, 0xf9, 0x3, 0xfa, 0x3, 0xfa, 0x3, 0xfa, 
-    0x3, 0xfa, 0x3, 0x7c8, 0x2, 0xfb, 0x3, 0x3, 0x5, 0x4, 0x7, 0x5, 0x9, 
-    0x6, 0xb, 0x7, 0xd, 0x8, 0xf, 0x9, 0x11, 0xa, 0x13, 0xb, 0x15, 0xc, 
-    0x17, 0xd, 0x19, 0xe, 0x1b, 0xf, 0x1d, 0x10, 0x1f, 0x11, 0x21, 0x12, 
-    0x23, 0x13, 0x25, 0x14, 0x27, 0x15, 0x29, 0x16, 0x2b, 0x17, 0x2d, 0x18, 
-    0x2f, 0x19, 0x31, 0x1a, 0x33, 0x1b, 0x35, 0x1c, 0x37, 0x1d, 0x39, 0x1e, 
-    0x3b, 0x1f, 0x3d, 0x20, 0x3f, 0x21, 0x41, 0x22, 0x43, 0x23, 0x45, 0x24, 
-    0x47, 0x25, 0x49, 0x26, 0x4b, 0x27, 0x4d, 0x28, 0x4f, 0x29, 0x51, 0x2a, 
-    0x53, 0x2b, 0x55, 0x2c, 0x57, 0x2d, 0x59, 0x2e, 0x5b, 0x2f, 0x5d, 0x30, 
-    0x5f, 0x31, 0x61, 0x32, 0x63, 0x33, 0x65, 0x34, 0x67, 0x35, 0x69, 0x36, 
-    0x6b, 0x37, 0x6d, 0x38, 0x6f, 0x39, 0x71, 0x3a, 0x73, 0x3b, 0x75, 0x3c, 
-    0x77, 0x3d, 0x79, 0x3e, 0x7b, 0x3f, 0x7d, 0x40, 0x7f, 0x41, 0x81, 0x42, 
-    0x83, 0x43, 0x85, 0x44, 0x87, 0x45, 0x89, 0x46, 0x8b, 0x47, 0x8d, 0x48, 
-    0x8f, 0x49, 0x91, 0x4a, 0x93, 0x4b, 0x95, 0x4c, 0x97, 0x4d, 0x99, 0x4e, 
-    0x9b, 0x4f, 0x9d, 0x50, 0x9f, 0x51, 0xa1, 0x52, 0xa3, 0x53, 0xa5, 0x54, 
-    0xa7, 0x55, 0xa9, 0x56, 0xab, 0x57, 0xad, 0x58, 0xaf, 0x59, 0xb1, 0x5a, 
-    0xb3, 0x5b, 0xb5, 0x5c, 0xb7, 0x5d, 0xb9, 0x5e, 0xbb, 0x5f, 0xbd, 0x60, 
-    0xbf, 0x61, 0xc1, 0x62, 0xc3, 0x63, 0xc5, 0x64, 0xc7, 0x65, 0xc9, 0x66, 
-    0xcb, 0x67, 0xcd, 0x68, 0xcf, 0x69, 0xd1, 0x6a, 0xd3, 0x6b, 0xd5, 0x6c, 
-    0xd7, 0x6d, 0xd9, 0x6e, 0xdb, 0x6f, 0xdd, 0x70, 0xdf, 0x71, 0xe1, 0x72, 
-    0xe3, 0x73, 0xe5, 0x74, 0xe7, 0x75, 0xe9, 0x76, 0xeb, 0x77, 0xed, 0x78, 
-    0xef, 0x79, 0xf1, 0x7a, 0xf3, 0x7b, 0xf5, 0x7c, 0xf7, 0x7d, 0xf9, 0x7e, 
-    0xfb, 0x7f, 0xfd, 0x80, 0xff, 0x81, 0x101, 0x82, 0x103, 0x83, 0x105, 
-    0x84, 0x107, 0x85, 0x109, 0x86, 0x10b, 0x87, 0x10d, 0x88, 0x10f, 0x89, 
-    0x111, 0x8a, 0x113, 0x8b, 0x115, 0x8c, 0x117, 0x8d, 0x119, 0x8e, 0x11b, 
-    0x8f, 0x11d, 0x90, 0x11f, 0x91, 0x121, 0x92, 0x123, 0x93, 0x125, 0x94, 
-    0x127, 0x95, 0x129, 0x96, 0x12b, 0x97, 0x12d, 0x98, 0x12f, 0x99, 0x131, 
-    0x9a, 0x133, 0x9b, 0x135, 0x9c, 0x137, 0x9d, 0x139, 0x9e, 0x13b, 0x9f, 
-    0x13d, 0xa0, 0x13f, 0xa1, 0x141, 0xa2, 0x143, 0xa3, 0x145, 0xa4, 0x147, 
-    0xa5, 0x149, 0xa6, 0x14b, 0xa7, 0x14d, 0xa8, 0x14f, 0xa9, 0x151, 0xaa, 
-    0x153, 0xab, 0x155, 0xac, 0x157, 0xad, 0x159, 0xae, 0x15b, 0xaf, 0x15d, 
-    0xb0, 0x15f, 0xb1, 0x161, 0xb2, 0x163, 0xb3, 0x165, 0xb4, 0x167, 0xb5, 
-    0x169, 0xb6, 0x16b, 0xb7, 0x16d, 0xb8, 0x16f, 0xb9, 0x171, 0xba, 0x173, 
-    0xbb, 0x175, 0xbc, 0x177, 0x2, 0x179, 0x2, 0x17b, 0x2, 0x17d, 0x2, 0x17f, 
-    0x2, 0x181, 0x2, 0x183, 0x2, 0x185, 0x2, 0x187, 0x2, 0x189, 0x2, 0x18b, 
-    0x2, 0x18d, 0x2, 0x18f, 0x2, 0x191, 0x2, 0x193, 0x2, 0x195, 0x2, 0x197, 
-    0x2, 0x199, 0x2, 0x19b, 0x2, 0x19d, 0x2, 0x19f, 0x2, 0x1a1, 0x2, 0x1a3, 
-    0x2, 0x1a5, 0x2, 0x1a7, 0x2, 0x1a9, 0x2, 0x1ab, 0x2, 0x1ad, 0x2, 0x1af, 
-    0x2, 0x1b1, 0x2, 0x1b3, 0xbd, 0x1b5, 0xbe, 0x1b7, 0xbf, 0x1b9, 0xc0, 
-    0x1bb, 0xc1, 0x1bd, 0xc2, 0x1bf, 0xc3, 0x1c1, 0xc4, 0x1c3, 0xc5, 0x1c5, 
-    0xc6, 0x1c7, 0xc7, 0x1c9, 0xc8, 0x1cb, 0xc9, 0x1cd, 0xca, 0x1cf, 0xcb, 
-    0x1d1, 0xcc, 0x1d3, 0xcd, 0x1d5, 0xce, 0x1d7, 0xcf, 0x1d9, 0xd0, 0x1db, 
-    0xd1, 0x1dd, 0xd2, 0x1df, 0xd3, 0x1e1, 0xd4, 0x1e3, 0xd5, 0x1e5, 0xd6, 
-    0x1e7, 0xd7, 0x1e9, 0xd8, 0x1eb, 0xd9, 0x1ed, 0xda, 0x1ef, 0xdb, 0x1f1, 
-    0xdc, 0x1f3, 0xdd, 0x3, 0x2, 0x26, 0x4, 0x2, 0x5e, 0x5e, 0x62, 0x62, 
-    0x4, 0x2, 0x24, 0x24, 0x5e, 0x5e, 0x4, 0x2, 0x29, 0x29, 0x5e, 0x5e, 
-    0x4, 0x2, 0x43, 0x43, 0x63, 0x63, 0x4, 0x2, 0x44, 0x44, 0x64, 0x64, 
-    0x4, 0x2, 0x45, 0x45, 0x65, 0x65, 0x4, 0x2, 0x46, 0x46, 0x66, 0x66, 
-    0x4, 0x2, 0x47, 0x47, 0x67, 0x67, 0x4, 0x2, 0x48, 0x48, 0x68, 0x68, 
-    0x4, 0x2, 0x49, 0x49, 0x69, 0x69, 0x4, 0x2, 0x4a, 0x4a, 0x6a, 0x6a, 
-    0x4, 0x2, 0x4b, 0x4b, 0x6b, 0x6b, 0x4, 0x2, 0x4c, 0x4c, 0x6c, 0x6c, 
-    0x4, 0x2, 0x4d, 0x4d, 0x6d, 0x6d, 0x4, 0x2, 0x4e, 0x4e, 0x6e, 0x6e, 
-    0x4, 0x2, 0x4f, 0x4f, 0x6f, 0x6f, 0x4, 0x2, 0x50, 0x50, 0x70, 0x70, 
-    0x4, 0x2, 0x51, 0x51, 0x71, 0x71, 0x4, 0x2, 0x52, 0x52, 0x72, 0x72, 
-    0x4, 0x2, 0x53, 0x53, 0x73, 0x73, 0x4, 0x2, 0x54, 0x54, 0x74, 0x74, 
-    0x4, 0x2, 0x55, 0x55, 0x75, 0x75, 0x4, 0x2, 0x56, 0x56, 0x76, 0x76, 
-    0x4, 0x2, 0x57, 0x57, 0x77, 0x77, 0x4, 0x2, 0x58, 0x58, 0x78, 0x78, 
-    0x4, 0x2, 0x59, 0x59, 0x79, 0x79, 0x4, 0x2, 0x5a, 0x5a, 0x7a, 0x7a, 
-    0x4, 0x2, 0x5b, 0x5b, 0x7b, 0x7b, 0x4, 0x2, 0x5c, 0x5c, 0x7c, 0x7c, 
-    0x4, 0x2, 0x43, 0x5c, 0x63, 0x7c, 0x3, 0x2, 0x32, 0x39, 0x3, 0x2, 0x32, 
-    0x3b, 0x5, 0x2, 0x32, 0x3b, 0x43, 0x48, 0x63, 0x68, 0x4, 0x2, 0xc, 0xc, 
-    0xf, 0xf, 0x4, 0x3, 0xc, 0xc, 0xf, 0xf, 0x4, 0x2, 0xb, 0xf, 0x22, 0x22, 
-    0x2, 0x7f2, 0x2, 0x3, 0x3, 0x2, 0x2, 0x2, 0x2, 0x5, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x7, 0x3, 0x2, 0x2, 0x2, 0x2, 0x9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xd, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x11, 0x3, 0x2, 0x2, 0x2, 0x2, 0x13, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x15, 0x3, 0x2, 0x2, 0x2, 0x2, 0x17, 0x3, 0x2, 0x2, 0x2, 0x2, 0x19, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x1b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x1f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x21, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x23, 0x3, 0x2, 0x2, 0x2, 0x2, 0x25, 0x3, 0x2, 0x2, 0x2, 0x2, 0x27, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x29, 0x3, 0x2, 0x2, 0x2, 0x2, 0x2b, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x2d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x2f, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x31, 0x3, 0x2, 0x2, 0x2, 0x2, 0x33, 0x3, 0x2, 0x2, 0x2, 0x2, 0x35, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x37, 0x3, 0x2, 0x2, 0x2, 0x2, 0x39, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x3b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x3d, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x3f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x41, 0x3, 0x2, 0x2, 0x2, 0x2, 0x43, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x45, 0x3, 0x2, 0x2, 0x2, 0x2, 0x47, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x49, 0x3, 0x2, 0x2, 0x2, 0x2, 0x4b, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x4d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x4f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x51, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x53, 0x3, 0x2, 0x2, 0x2, 0x2, 0x55, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x57, 0x3, 0x2, 0x2, 0x2, 0x2, 0x59, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x5b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x5d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x5f, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x61, 0x3, 0x2, 0x2, 0x2, 0x2, 0x63, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x65, 0x3, 0x2, 0x2, 0x2, 0x2, 0x67, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x69, 0x3, 0x2, 0x2, 0x2, 0x2, 0x6b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x6d, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x6f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x71, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x73, 0x3, 0x2, 0x2, 0x2, 0x2, 0x75, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x77, 0x3, 0x2, 0x2, 0x2, 0x2, 0x79, 0x3, 0x2, 0x2, 0x2, 0x2, 0x7b, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x7d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x7f, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x81, 0x3, 0x2, 0x2, 0x2, 0x2, 0x83, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x85, 0x3, 0x2, 0x2, 0x2, 0x2, 0x87, 0x3, 0x2, 0x2, 0x2, 0x2, 0x89, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x8b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x8d, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x8f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x91, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x93, 0x3, 0x2, 0x2, 0x2, 0x2, 0x95, 0x3, 0x2, 0x2, 0x2, 0x2, 0x97, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x99, 0x3, 0x2, 0x2, 0x2, 0x2, 0x9b, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x9d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x9f, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0xa1, 0x3, 0x2, 0x2, 0x2, 0x2, 0xa3, 0x3, 0x2, 0x2, 0x2, 0x2, 0xa5, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xa7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xa9, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0xab, 0x3, 0x2, 0x2, 0x2, 0x2, 0xad, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0xaf, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb1, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb3, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xb5, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb7, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0xb9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xbb, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0xbd, 0x3, 0x2, 0x2, 0x2, 0x2, 0xbf, 0x3, 0x2, 0x2, 0x2, 0x2, 0xc1, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xc3, 0x3, 0x2, 0x2, 0x2, 0x2, 0xc5, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0xc7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xc9, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0xcb, 0x3, 0x2, 0x2, 0x2, 0x2, 0xcd, 0x3, 0x2, 0x2, 0x2, 0x2, 0xcf, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xd1, 0x3, 0x2, 0x2, 0x2, 0x2, 0xd3, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0xd5, 0x3, 0x2, 0x2, 0x2, 0x2, 0xd7, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0xd9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xdb, 0x3, 0x2, 0x2, 0x2, 0x2, 0xdd, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xdf, 0x3, 0x2, 0x2, 0x2, 0x2, 0xe1, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0xe3, 0x3, 0x2, 0x2, 0x2, 0x2, 0xe5, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0xe7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xe9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xeb, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xed, 0x3, 0x2, 0x2, 0x2, 0x2, 0xef, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0xf1, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf3, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0xf5, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf9, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0xfb, 0x3, 0x2, 0x2, 0x2, 0x2, 0xfd, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0xff, 0x3, 0x2, 0x2, 0x2, 0x2, 0x101, 0x3, 0x2, 0x2, 
-    0x2, 0x2, 0x103, 0x3, 0x2, 0x2, 0x2, 0x2, 0x105, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x107, 0x3, 0x2, 0x2, 0x2, 0x2, 0x109, 0x3, 0x2, 0x2, 0x2, 0x2, 
-    0x10b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x10d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x10f, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x111, 0x3, 0x2, 0x2, 0x2, 0x2, 0x113, 0x3, 
-    0x2, 0x2, 0x2, 0x2, 0x115, 0x3, 0x2, 0x2, 0x2, 0x2, 0x117, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x119, 0x3, 0x2, 0x2, 0x2, 0x2, 0x11b, 0x3, 0x2, 0x2, 
-    0x2, 0x2, 0x11d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x11f, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x121, 0x3, 0x2, 0x2, 0x2, 0x2, 0x123, 0x3, 0x2, 0x2, 0x2, 0x2, 
-    0x125, 0x3, 0x2, 0x2, 0x2, 0x2, 0x127, 0x3, 0x2, 0x2, 0x2, 0x2, 0x129, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x12b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x12d, 0x3, 
-    0x2, 0x2, 0x2, 0x2, 0x12f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x131, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x133, 0x3, 0x2, 0x2, 0x2, 0x2, 0x135, 0x3, 0x2, 0x2, 
-    0x2, 0x2, 0x137, 0x3, 0x2, 0x2, 0x2, 0x2, 0x139, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x13b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x13d, 0x3, 0x2, 0x2, 0x2, 0x2, 
-    0x13f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x141, 0x3, 0x2, 0x2, 0x2, 0x2, 0x143, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x145, 0x3, 0x2, 0x2, 0x2, 0x2, 0x147, 0x3, 
-    0x2, 0x2, 0x2, 0x2, 0x149, 0x3, 0x2, 0x2, 0x2, 0x2, 0x14b, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x14d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x14f, 0x3, 0x2, 0x2, 
-    0x2, 0x2, 0x151, 0x3, 0x2, 0x2, 0x2, 0x2, 0x153, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x155, 0x3, 0x2, 0x2, 0x2, 0x2, 0x157, 0x3, 0x2, 0x2, 0x2, 0x2, 
-    0x159, 0x3, 0x2, 0x2, 0x2, 0x2, 0x15b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x15d, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x15f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x161, 0x3, 
-    0x2, 0x2, 0x2, 0x2, 0x163, 0x3, 0x2, 0x2, 0x2, 0x2, 0x165, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x167, 0x3, 0x2, 0x2, 0x2, 0x2, 0x169, 0x3, 0x2, 0x2, 
-    0x2, 0x2, 0x16b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x16d, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x16f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x171, 0x3, 0x2, 0x2, 0x2, 0x2, 
-    0x173, 0x3, 0x2, 0x2, 0x2, 0x2, 0x175, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1b3, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x1b5, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1b7, 0x3, 
-    0x2, 0x2, 0x2, 0x2, 0x1b9, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1bb, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x1bd, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1bf, 0x3, 0x2, 0x2, 
-    0x2, 0x2, 0x1c1, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1c3, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x1c5, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1c7, 0x3, 0x2, 0x2, 0x2, 0x2, 
-    0x1c9, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1cb, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1cd, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x1cf, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d1, 0x3, 
-    0x2, 0x2, 0x2, 0x2, 0x1d3, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d5, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x1d7, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d9, 0x3, 0x2, 0x2, 
-    0x2, 0x2, 0x1db, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1dd, 0x3, 0x2, 0x2, 0x2, 
-    0x2, 0x1df, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1e1, 0x3, 0x2, 0x2, 0x2, 0x2, 
-    0x1e3, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1e7, 
-    0x3, 0x2, 0x2, 0x2, 0x2, 0x1e9, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1eb, 0x3, 
-    0x2, 0x2, 0x2, 0x2, 0x1ed, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1ef, 0x3, 0x2, 
-    0x2, 0x2, 0x2, 0x1f1, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1f3, 0x3, 0x2, 0x2, 
-    0x2, 0x3, 0x1f5, 0x3, 0x2, 0x2, 0x2, 0x5, 0x1f9, 0x3, 0x2, 0x2, 0x2, 
-    0x7, 0x1ff, 0x3, 0x2, 0x2, 0x2, 0x9, 0x205, 0x3, 0x2, 0x2, 0x2, 0xb, 
-    0x209, 0x3, 0x2, 0x2, 0x2, 0xd, 0x20f, 0x3, 0x2, 0x2, 0x2, 0xf, 0x213, 
-    0x3, 0x2, 0x2, 0x2, 0x11, 0x218, 0x3, 0x2, 0x2, 0x2, 0x13, 0x21c, 0x3, 
-    0x2, 0x2, 0x2, 0x15, 0x222, 0x3, 0x2, 0x2, 0x2, 0x17, 0x233, 0x3, 0x2, 
-    0x2, 0x2, 0x19, 0x235, 0x3, 0x2, 0x2, 0x2, 0x1b, 0x23a, 0x3, 0x2, 0x2, 
-    0x2, 0x1d, 0x240, 0x3, 0x2, 0x2, 0x2, 0x1f, 0x247, 0x3, 0x2, 0x2, 0x2, 
-    0x21, 0x24f, 0x3, 0x2, 0x2, 0x2, 0x23, 0x254, 0x3, 0x2, 0x2, 0x2, 0x25, 
-    0x257, 0x3, 0x2, 0x2, 0x2, 0x27, 0x25c, 0x3, 0x2, 0x2, 0x2, 0x29, 0x261, 
-    0x3, 0x2, 0x2, 0x2, 0x2b, 0x267, 0x3, 0x2, 0x2, 0x2, 0x2d, 0x26d, 0x3, 
-    0x2, 0x2, 0x2, 0x2f, 0x275, 0x3, 0x2, 0x2, 0x2, 0x31, 0x27b, 0x3, 0x2, 
-    0x2, 0x2, 0x33, 0x283, 0x3, 0x2, 0x2, 0x2, 0x35, 0x28a, 0x3, 0x2, 0x2, 
-    0x2, 0x37, 0x292, 0x3, 0x2, 0x2, 0x2, 0x39, 0x29d, 0x3, 0x2, 0x2, 0x2, 
-    0x3b, 0x2a4, 0x3, 0x2, 0x2, 0x2, 0x3d, 0x2aa, 0x3, 0x2, 0x2, 0x2, 0x3f, 
-    0x2af, 0x3, 0x2, 0x2, 0x2, 0x41, 0x2b8, 0x3, 0x2, 0x2, 0x2, 0x43, 0x2c2, 
-    0x3, 0x2, 0x2, 0x2, 0x45, 0x2c7, 0x3, 0x2, 0x2, 0x2, 0x47, 0x2cb, 0x3, 
-    0x2, 0x2, 0x2, 0x49, 0x2d7, 0x3, 0x2, 0x2, 0x2, 0x4b, 0x2df, 0x3, 0x2, 
-    0x2, 0x2, 0x4d, 0x2e5, 0x3, 0x2, 0x2, 0x2, 0x4f, 0x2ec, 0x3, 0x2, 0x2, 
-    0x2, 0x51, 0x2f1, 0x3, 0x2, 0x2, 0x2, 0x53, 0x2fc, 0x3, 0x2, 0x2, 0x2, 
-    0x55, 0x305, 0x3, 0x2, 0x2, 0x2, 0x57, 0x30c, 0x3, 0x2, 0x2, 0x2, 0x59, 
-    0x319, 0x3, 0x2, 0x2, 0x2, 0x5b, 0x324, 0x3, 0x2, 0x2, 0x2, 0x5d, 0x329, 
-    0x3, 0x2, 0x2, 0x2, 0x5f, 0x332, 0x3, 0x2, 0x2, 0x2, 0x61, 0x33e, 0x3, 
-    0x2, 0x2, 0x2, 0x63, 0x343, 0x3, 0x2, 0x2, 0x2, 0x65, 0x348, 0x3, 0x2, 
-    0x2, 0x2, 0x67, 0x34c, 0x3, 0x2, 0x2, 0x2, 0x69, 0x353, 0x3, 0x2, 0x2, 
-    0x2, 0x6b, 0x35a, 0x3, 0x2, 0x2, 0x2, 0x6d, 0x361, 0x3, 0x2, 0x2, 0x2, 
-    0x6f, 0x369, 0x3, 0x2, 0x2, 0x2, 0x71, 0x374, 0x3, 0x2, 0x2, 0x2, 0x73, 
-    0x37c, 0x3, 0x2, 0x2, 0x2, 0x75, 0x384, 0x3, 0x2, 0x2, 0x2, 0x77, 0x38a, 
-    0x3, 0x2, 0x2, 0x2, 0x79, 0x390, 0x3, 0x2, 0x2, 0x2, 0x7b, 0x396, 0x3, 
-    0x2, 0x2, 0x2, 0x7d, 0x39a, 0x3, 0x2, 0x2, 0x2, 0x7f, 0x3a1, 0x3, 0x2, 
-    0x2, 0x2, 0x81, 0x3a8, 0x3, 0x2, 0x2, 0x2, 0x83, 0x3ad, 0x3, 0x2, 0x2, 
-    0x2, 0x85, 0x3b2, 0x3, 0x2, 0x2, 0x2, 0x87, 0x3bb, 0x3, 0x2, 0x2, 0x2, 
-    0x89, 0x3c2, 0x3, 0x2, 0x2, 0x2, 0x8b, 0x3ce, 0x3, 0x2, 0x2, 0x2, 0x8d, 
-    0x3d4, 0x3, 0x2, 0x2, 0x2, 0x8f, 0x3db, 0x3, 0x2, 0x2, 0x2, 0x91, 0x3e8, 
-    0x3, 0x2, 0x2, 0x2, 0x93, 0x3ed, 0x3, 0x2, 0x2, 0x2, 0x95, 0x3f0, 0x3, 
-    0x2, 0x2, 0x2, 0x97, 0x3f3, 0x3, 0x2, 0x2, 0x2, 0x99, 0x3f9, 0x3, 0x2, 
-    0x2, 0x2, 0x9b, 0x3fc, 0x3, 0x2, 0x2, 0x2, 0x9d, 0x40f, 0x3, 0x2, 0x2, 
-    0x2, 0x9f, 0x411, 0x3, 0x2, 0x2, 0x2, 0xa1, 0x41b, 0x3, 0x2, 0x2, 0x2, 
-    0xa3, 0x421, 0x3, 0x2, 0x2, 0x2, 0xa5, 0x428, 0x3, 0x2, 0x2, 0x2, 0xa7, 
-    0x431, 0x3, 0x2, 0x2, 0x2, 0xa9, 0x436, 0x3, 0x2, 0x2, 0x2, 0xab, 0x439, 
-    0x3, 0x2, 0x2, 0x2, 0xad, 0x446, 0x3, 0x2, 0x2, 0x2, 0xaf, 0x44b, 0x3, 
-    0x2, 0x2, 0x2, 0xb1, 0x44f, 0x3, 0x2, 0x2, 0x2, 0xb3, 0x454, 0x3, 0x2, 
-    0x2, 0x2, 0xb5, 0x459, 0x3, 0x2, 0x2, 0x2, 0xb7, 0x460, 0x3, 0x2, 0x2, 
-    0x2, 0xb9, 0x468, 0x3, 0x2, 0x2, 0x2, 0xbb, 0x46d, 0x3, 0x2, 0x2, 0x2, 
-    0xbd, 0x476, 0x3, 0x2, 0x2, 0x2, 0xbf, 0x47b, 0x3, 0x2, 0x2, 0x2, 0xc1, 
-    0x481, 0x3, 0x2, 0x2, 0x2, 0xc3, 0x486, 0x3, 0x2, 0x2, 0x2, 0xc5, 0x48c, 
-    0x3, 0x2, 0x2, 0x2, 0xc7, 0x491, 0x3, 0x2, 0x2, 0x2, 0xc9, 0x49e, 0x3, 
-    0x2, 0x2, 0x2, 0xcb, 0x4a2, 0x3, 0x2, 0x2, 0x2, 0xcd, 0x4a9, 0x3, 0x2, 
-    0x2, 0x2, 0xcf, 0x4ad, 0x3, 0x2, 0x2, 0x2, 0xd1, 0x4b4, 0x3, 0x2, 0x2, 
-    0x2, 0xd3, 0x4bb, 0x3, 0x2, 0x2, 0x2, 0xd5, 0x4c1, 0x3, 0x2, 0x2, 0x2, 
-    0xd7, 0x4c6, 0x3, 0x2, 0x2, 0x2, 0xd9, 0x4cf, 0x3, 0x2, 0x2, 0x2, 0xdb, 
-    0x4d3, 0x3, 0x2, 0x2, 0x2, 0xdd, 0x4d6, 0x3, 0x2, 0x2, 0x2, 0xdf, 0x4da, 
-    0x3, 0x2, 0x2, 0x2, 0xe1, 0x4df, 0x3, 0x2, 0x2, 0x2, 0xe3, 0x4e5, 0x3, 
-    0x2, 0x2, 0x2, 0xe5, 0x4ec, 0x3, 0x2, 0x2, 0x2, 0xe7, 0x4ef, 0x3, 0x2, 
-    0x2, 0x2, 0xe9, 0x4f8, 0x3, 0x2, 0x2, 0x2, 0xeb, 0x4fb, 0x3, 0x2, 0x2, 
-    0x2, 0xed, 0x501, 0x3, 0x2, 0x2, 0x2, 0xef, 0x507, 0x3, 0x2, 0x2, 0x2, 
-    0xf1, 0x50f, 0x3, 0x2, 0x2, 0x2, 0xf3, 0x519, 0x3, 0x2, 0x2, 0x2, 0xf5, 
-    0x522, 0x3, 0x2, 0x2, 0x2, 0xf7, 0x52b, 0x3, 0x2, 0x2, 0x2, 0xf9, 0x533, 
-    0x3, 0x2, 0x2, 0x2, 0xfb, 0x53b, 0x3, 0x2, 0x2, 0x2, 0xfd, 0x541, 0x3, 
-    0x2, 0x2, 0x2, 0xff, 0x548, 0x3, 0x2, 0x2, 0x2, 0x101, 0x54f, 0x3, 0x2, 
-    0x2, 0x2, 0x103, 0x556, 0x3, 0x2, 0x2, 0x2, 0x105, 0x55e, 0x3, 0x2, 
-    0x2, 0x2, 0x107, 0x566, 0x3, 0x2, 0x2, 0x2, 0x109, 0x571, 0x3, 0x2, 
-    0x2, 0x2, 0x10b, 0x577, 0x3, 0x2, 0x2, 0x2, 0x10d, 0x57e, 0x3, 0x2, 
-    0x2, 0x2, 0x10f, 0x585, 0x3, 0x2, 0x2, 0x2, 0x111, 0x58c, 0x3, 0x2, 
-    0x2, 0x2, 0x113, 0x593, 0x3, 0x2, 0x2, 0x2, 0x115, 0x598, 0x3, 0x2, 
-    0x2, 0x2, 0x117, 0x59e, 0x3, 0x2, 0x2, 0x2, 0x119, 0x5a2, 0x3, 0x2, 
-    0x2, 0x2, 0x11b, 0x5ab, 0x3, 0x2, 0x2, 0x2, 0x11d, 0x5b0, 0x3, 0x2, 
-    0x2, 0x2, 0x11f, 0x5b7, 0x3, 0x2, 0x2, 0x2, 0x121, 0x5bd, 0x3, 0x2, 
-    0x2, 0x2, 0x123, 0x5c2, 0x3, 0x2, 0x2, 0x2, 0x125, 0x5cc, 0x3, 0x2, 
-    0x2, 0x2, 0x127, 0x5d1, 0x3, 0x2, 0x2, 0x2, 0x129, 0x5d8, 0x3, 0x2, 
-    0x2, 0x2, 0x12b, 0x5df, 0x3, 0x2, 0x2, 0x2, 0x12d, 0x5e5, 0x3, 0x2, 
-    0x2, 0x2, 0x12f, 0x5ec, 0x3, 0x2, 0x2, 0x2, 0x131, 0x5f6, 0x3, 0x2, 
-    0x2, 0x2, 0x133, 0x5fb, 0x3, 0x2, 0x2, 0x2, 0x135, 0x600, 0x3, 0x2, 
-    0x2, 0x2, 0x137, 0x605, 0x3, 0x2, 0x2, 0x2, 0x139, 0x60d, 0x3, 0x2, 
-    0x2, 0x2, 0x13b, 0x617, 0x3, 0x2, 0x2, 0x2, 0x13d, 0x61a, 0x3, 0x2, 
-    0x2, 0x2, 0x13f, 0x61e, 0x3, 0x2, 0x2, 0x2, 0x141, 0x625, 0x3, 0x2, 
-    0x2, 0x2, 0x143, 0x62e, 0x3, 0x2, 0x2, 0x2, 0x145, 0x633, 0x3, 0x2, 
-    0x2, 0x2, 0x147, 0x63c, 0x3, 0x2, 0x2, 0x2, 0x149, 0x640, 0x3, 0x2, 
-    0x2, 0x2, 0x14b, 0x645, 0x3, 0x2, 0x2, 0x2, 0x14d, 0x64b, 0x3, 0x2, 
-    0x2, 0x2, 0x14f, 0x652, 0x3, 0x2, 0x2, 0x2, 0x151, 0x656, 0x3, 0x2, 
-    0x2, 0x2, 0x153, 0x65c, 0x3, 0x2, 0x2, 0x2, 0x155, 0x661, 0x3, 0x2, 
-    0x2, 0x2, 0x157, 0x668, 0x3, 0x2, 0x2, 0x2, 0x159, 0x66d, 0x3, 0x2, 
-    0x2, 0x2, 0x15b, 0x674, 0x3, 0x2, 0x2, 0x2, 0x15d, 0x67a, 0x3, 0x2, 
-    0x2, 0x2, 0x15f, 0x67f, 0x3, 0x2, 0x2, 0x2, 0x161, 0x684, 0x3, 0x2, 
-    0x2, 0x2, 0x163, 0x68a, 0x3, 0x2, 0x2, 0x2, 0x165, 0x699, 0x3, 0x2, 
-    0x2, 0x2, 0x167, 0x69b, 0x3, 0x2, 0x2, 0x2, 0x169, 0x6a1, 0x3, 0x2, 
-    0x2, 0x2, 0x16b, 0x6d0, 0x3, 0x2, 0x2, 0x2, 0x16d, 0x71e, 0x3, 0x2, 
-    0x2, 0x2, 0x16f, 0x720, 0x3, 0x2, 0x2, 0x2, 0x171, 0x727, 0x3, 0x2, 
-    0x2, 0x2, 0x173, 0x72b, 0x3, 0x2, 0x2, 0x2, 0x175, 0x732, 0x3, 0x2, 
-    0x2, 0x2, 0x177, 0x741, 0x3, 0x2, 0x2, 0x2, 0x179, 0x743, 0x3, 0x2, 
-    0x2, 0x2, 0x17b, 0x745, 0x3, 0x2, 0x2, 0x2, 0x17d, 0x747, 0x3, 0x2, 
-    0x2, 0x2, 0x17f, 0x749, 0x3, 0x2, 0x2, 0x2, 0x181, 0x74b, 0x3, 0x2, 
-    0x2, 0x2, 0x183, 0x74d, 0x3, 0x2, 0x2, 0x2, 0x185, 0x74f, 0x3, 0x2, 
-    0x2, 0x2, 0x187, 0x751, 0x3, 0x2, 0x2, 0x2, 0x189, 0x753, 0x3, 0x2, 
-    0x2, 0x2, 0x18b, 0x755, 0x3, 0x2, 0x2, 0x2, 0x18d, 0x757, 0x3, 0x2, 
-    0x2, 0x2, 0x18f, 0x759, 0x3, 0x2, 0x2, 0x2, 0x191, 0x75b, 0x3, 0x2, 
-    0x2, 0x2, 0x193, 0x75d, 0x3, 0x2, 0x2, 0x2, 0x195, 0x75f, 0x3, 0x2, 
-    0x2, 0x2, 0x197, 0x761, 0x3, 0x2, 0x2, 0x2, 0x199, 0x763, 0x3, 0x2, 
-    0x2, 0x2, 0x19b, 0x765, 0x3, 0x2, 0x2, 0x2, 0x19d, 0x767, 0x3, 0x2, 
-    0x2, 0x2, 0x19f, 0x769, 0x3, 0x2, 0x2, 0x2, 0x1a1, 0x76b, 0x3, 0x2, 
-    0x2, 0x2, 0x1a3, 0x76d, 0x3, 0x2, 0x2, 0x2, 0x1a5, 0x76f, 0x3, 0x2, 
-    0x2, 0x2, 0x1a7, 0x771, 0x3, 0x2, 0x2, 0x2, 0x1a9, 0x773, 0x3, 0x2, 
-    0x2, 0x2, 0x1ab, 0x775, 0x3, 0x2, 0x2, 0x2, 0x1ad, 0x777, 0x3, 0x2, 
-    0x2, 0x2, 0x1af, 0x779, 0x3, 0x2, 0x2, 0x2, 0x1b1, 0x77b, 0x3, 0x2, 
-    0x2, 0x2, 0x1b3, 0x77d, 0x3, 0x2, 0x2, 0x2, 0x1b5, 0x780, 0x3, 0x2, 
-    0x2, 0x2, 0x1b7, 0x782, 0x3, 0x2, 0x2, 0x2, 0x1b9, 0x784, 0x3, 0x2, 
-    0x2, 0x2, 0x1bb, 0x786, 0x3, 0x2, 0x2, 0x2, 0x1bd, 0x788, 0x3, 0x2, 
-    0x2, 0x2, 0x1bf, 0x78a, 0x3, 0x2, 0x2, 0x2, 0x1c1, 0x78d, 0x3, 0x2, 
-    0x2, 0x2, 0x1c3, 0x78f, 0x3, 0x2, 0x2, 0x2, 0x1c5, 0x791, 0x3, 0x2, 
-    0x2, 0x2, 0x1c7, 0x794, 0x3, 0x2, 0x2, 0x2, 0x1c9, 0x796, 0x3, 0x2, 
-    0x2, 0x2, 0x1cb, 0x799, 0x3, 0x2, 0x2, 0x2, 0x1cd, 0x79b, 0x3, 0x2, 
-    0x2, 0x2, 0x1cf, 0x79d, 0x3, 0x2, 0x2, 0x2, 0x1d1, 0x79f, 0x3, 0x2, 
-    0x2, 0x2, 0x1d3, 0x7a2, 0x3, 0x2, 0x2, 0x2, 0x1d5, 0x7a4, 0x3, 0x2, 
-    0x2, 0x2, 0x1d7, 0x7aa, 0x3, 0x2, 0x2, 0x2, 0x1d9, 0x7ac, 0x3, 0x2, 
-    0x2, 0x2, 0x1db, 0x7ae, 0x3, 0x2, 0x2, 0x2, 0x1dd, 0x7b0, 0x3, 0x2, 
-    0x2, 0x2, 0x1df, 0x7b2, 0x3, 0x2, 0x2, 0x2, 0x1e1, 0x7b4, 0x3, 0x2, 
-    0x2, 0x2, 0x1e3, 0x7b6, 0x3, 0x2, 0x2, 0x2, 0x1e5, 0x7b8, 0x3, 0x2, 
-    0x2, 0x2, 0x1e7, 0x7ba, 0x3, 0x2, 0x2, 0x2, 0x1e9, 0x7bc, 0x3, 0x2, 
-    0x2, 0x2, 0x1eb, 0x7be, 0x3, 0x2, 0x2, 0x2, 0x1ed, 0x7c0, 0x3, 0x2, 
-    0x2, 0x2, 0x1ef, 0x7c2, 0x3, 0x2, 0x2, 0x2, 0x1f1, 0x7d0, 0x3, 0x2, 
-    0x2, 0x2, 0x1f3, 0x7de, 0x3, 0x2, 0x2, 0x2, 0x1f5, 0x1f6, 0x5, 0x177, 
-    0xbc, 0x2, 0x1f6, 0x1f7, 0x5, 0x17d, 0xbf, 0x2, 0x1f7, 0x1f8, 0x5, 0x17d, 
-    0xbf, 0x2, 0x1f8, 0x4, 0x3, 0x2, 0x2, 0x2, 0x1f9, 0x1fa, 0x5, 0x177, 
-    0xbc, 0x2, 0x1fa, 0x1fb, 0x5, 0x181, 0xc1, 0x2, 0x1fb, 0x1fc, 0x5, 0x19d, 
-    0xcf, 0x2, 0x1fc, 0x1fd, 0x5, 0x17f, 0xc0, 0x2, 0x1fd, 0x1fe, 0x5, 0x199, 
-    0xcd, 0x2, 0x1fe, 0x6, 0x3, 0x2, 0x2, 0x2, 0x1ff, 0x200, 0x5, 0x177, 
-    0xbc, 0x2, 0x200, 0x201, 0x5, 0x18d, 0xc7, 0x2, 0x201, 0x202, 0x5, 0x187, 
-    0xc4, 0x2, 0x202, 0x203, 0x5, 0x177, 0xbc, 0x2, 0x203, 0x204, 0x5, 0x19b, 
-    0xce, 0x2, 0x204, 0x8, 0x3, 0x2, 0x2, 0x2, 0x205, 0x206, 0x5, 0x177, 
-    0xbc, 0x2, 0x206, 0x207, 0x5, 0x18d, 0xc7, 0x2, 0x207, 0x208, 0x5, 0x18d, 
-    0xc7, 0x2, 0x208, 0xa, 0x3, 0x2, 0x2, 0x2, 0x209, 0x20a, 0x5, 0x177, 
-    0xbc, 0x2, 0x20a, 0x20b, 0x5, 0x18d, 0xc7, 0x2, 0x20b, 0x20c, 0x5, 0x19d, 
-    0xcf, 0x2, 0x20c, 0x20d, 0x5, 0x17f, 0xc0, 0x2, 0x20d, 0x20e, 0x5, 0x199, 
-    0xcd, 0x2, 0x20e, 0xc, 0x3, 0x2, 0x2, 0x2, 0x20f, 0x210, 0x5, 0x177, 
-    0xbc, 0x2, 0x210, 0x211, 0x5, 0x191, 0xc9, 0x2, 0x211, 0x212, 0x5, 0x17d, 
-    0xbf, 0x2, 0x212, 0xe, 0x3, 0x2, 0x2, 0x2, 0x213, 0x214, 0x5, 0x177, 
-    0xbc, 0x2, 0x214, 0x215, 0x5, 0x191, 0xc9, 0x2, 0x215, 0x216, 0x5, 0x19d, 
-    0xcf, 0x2, 0x216, 0x217, 0x5, 0x187, 0xc4, 0x2, 0x217, 0x10, 0x3, 0x2, 
-    0x2, 0x2, 0x218, 0x219, 0x5, 0x177, 0xbc, 0x2, 0x219, 0x21a, 0x5, 0x191, 
-    0xc9, 0x2, 0x21a, 0x21b, 0x5, 0x1a7, 0xd4, 0x2, 0x21b, 0x12, 0x3, 0x2, 
-    0x2, 0x2, 0x21c, 0x21d, 0x5, 0x177, 0xbc, 0x2, 0x21d, 0x21e, 0x5, 0x199, 
-    0xcd, 0x2, 0x21e, 0x21f, 0x5, 0x199, 0xcd, 0x2, 0x21f, 0x220, 0x5, 0x177, 
-    0xbc, 0x2, 0x220, 0x221, 0x5, 0x1a7, 0xd4, 0x2, 0x221, 0x14, 0x3, 0x2, 
-    0x2, 0x2, 0x222, 0x223, 0x5, 0x177, 0xbc, 0x2, 0x223, 0x224, 0x5, 0x19b, 
-    0xce, 0x2, 0x224, 0x16, 0x3, 0x2, 0x2, 0x2, 0x225, 0x226, 0x5, 0x177, 
-    0xbc, 0x2, 0x226, 0x227, 0x5, 0x19b, 0xce, 0x2, 0x227, 0x228, 0x5, 0x17b, 
-    0xbe, 0x2, 0x228, 0x234, 0x3, 0x2, 0x2, 0x2, 0x229, 0x22a, 0x5, 0x177, 
-    0xbc, 0x2, 0x22a, 0x22b, 0x5, 0x19b, 0xce, 0x2, 0x22b, 0x22c, 0x5, 0x17b, 
-    0xbe, 0x2, 0x22c, 0x22d, 0x5, 0x17f, 0xc0, 0x2, 0x22d, 0x22e, 0x5, 0x191, 
-    0xc9, 0x2, 0x22e, 0x22f, 0x5, 0x17d, 0xbf, 0x2, 0x22f, 0x230, 0x5, 0x187, 
-    0xc4, 0x2, 0x230, 0x231, 0x5, 0x191, 0xc9, 0x2, 0x231, 0x232, 0x5, 0x183, 
-    0xc2, 0x2, 0x232, 0x234, 0x3, 0x2, 0x2, 0x2, 0x233, 0x225, 0x3, 0x2, 
-    0x2, 0x2, 0x233, 0x229, 0x3, 0x2, 0x2, 0x2, 0x234, 0x18, 0x3, 0x2, 0x2, 
-    0x2, 0x235, 0x236, 0x5, 0x177, 0xbc, 0x2, 0x236, 0x237, 0x5, 0x19b, 
-    0xce, 0x2, 0x237, 0x238, 0x5, 0x193, 0xca, 0x2, 0x238, 0x239, 0x5, 0x181, 
-    0xc1, 0x2, 0x239, 0x1a, 0x3, 0x2, 0x2, 0x2, 0x23a, 0x23b, 0x5, 0x177, 
-    0xbc, 0x2, 0x23b, 0x23c, 0x5, 0x19b, 0xce, 0x2, 0x23c, 0x23d, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x23d, 0x23e, 0x5, 0x191, 0xc9, 0x2, 0x23e, 0x23f, 0x5, 0x17b, 
-    0xbe, 0x2, 0x23f, 0x1c, 0x3, 0x2, 0x2, 0x2, 0x240, 0x241, 0x5, 0x177, 
-    0xbc, 0x2, 0x241, 0x242, 0x5, 0x19d, 0xcf, 0x2, 0x242, 0x243, 0x5, 0x19d, 
-    0xcf, 0x2, 0x243, 0x244, 0x5, 0x177, 0xbc, 0x2, 0x244, 0x245, 0x5, 0x17b, 
-    0xbe, 0x2, 0x245, 0x246, 0x5, 0x185, 0xc3, 0x2, 0x246, 0x1e, 0x3, 0x2, 
-    0x2, 0x2, 0x247, 0x248, 0x5, 0x179, 0xbd, 0x2, 0x248, 0x249, 0x5, 0x17f, 
-    0xc0, 0x2, 0x249, 0x24a, 0x5, 0x19d, 0xcf, 0x2, 0x24a, 0x24b, 0x5, 0x1a3, 
-    0xd2, 0x2, 0x24b, 0x24c, 0x5, 0x17f, 0xc0, 0x2, 0x24c, 0x24d, 0x5, 0x17f, 
-    0xc0, 0x2, 0x24d, 0x24e, 0x5, 0x191, 0xc9, 0x2, 0x24e, 0x20, 0x3, 0x2, 
-    0x2, 0x2, 0x24f, 0x250, 0x5, 0x179, 0xbd, 0x2, 0x250, 0x251, 0x5, 0x193, 
-    0xca, 0x2, 0x251, 0x252, 0x5, 0x19d, 0xcf, 0x2, 0x252, 0x253, 0x5, 0x185, 
-    0xc3, 0x2, 0x253, 0x22, 0x3, 0x2, 0x2, 0x2, 0x254, 0x255, 0x5, 0x179, 
-    0xbd, 0x2, 0x255, 0x256, 0x5, 0x1a7, 0xd4, 0x2, 0x256, 0x24, 0x3, 0x2, 
-    0x2, 0x2, 0x257, 0x258, 0x5, 0x17b, 0xbe, 0x2, 0x258, 0x259, 0x5, 0x177, 
-    0xbc, 0x2, 0x259, 0x25a, 0x5, 0x19b, 0xce, 0x2, 0x25a, 0x25b, 0x5, 0x17f, 
-    0xc0, 0x2, 0x25b, 0x26, 0x3, 0x2, 0x2, 0x2, 0x25c, 0x25d, 0x5, 0x17b, 
-    0xbe, 0x2, 0x25d, 0x25e, 0x5, 0x177, 0xbc, 0x2, 0x25e, 0x25f, 0x5, 0x19b, 
-    0xce, 0x2, 0x25f, 0x260, 0x5, 0x19d, 0xcf, 0x2, 0x260, 0x28, 0x3, 0x2, 
-    0x2, 0x2, 0x261, 0x262, 0x5, 0x17b, 0xbe, 0x2, 0x262, 0x263, 0x5, 0x185, 
-    0xc3, 0x2, 0x263, 0x264, 0x5, 0x17f, 0xc0, 0x2, 0x264, 0x265, 0x5, 0x17b, 
-    0xbe, 0x2, 0x265, 0x266, 0x5, 0x18b, 0xc6, 0x2, 0x266, 0x2a, 0x3, 0x2, 
-    0x2, 0x2, 0x267, 0x268, 0x5, 0x17b, 0xbe, 0x2, 0x268, 0x269, 0x5, 0x18d, 
-    0xc7, 0x2, 0x269, 0x26a, 0x5, 0x17f, 0xc0, 0x2, 0x26a, 0x26b, 0x5, 0x177, 
-    0xbc, 0x2, 0x26b, 0x26c, 0x5, 0x199, 0xcd, 0x2, 0x26c, 0x2c, 0x3, 0x2, 
-    0x2, 0x2, 0x26d, 0x26e, 0x5, 0x17b, 0xbe, 0x2, 0x26e, 0x26f, 0x5, 0x18d, 
-    0xc7, 0x2, 0x26f, 0x270, 0x5, 0x19f, 0xd0, 0x2, 0x270, 0x271, 0x5, 0x19b, 
-    0xce, 0x2, 0x271, 0x272, 0x5, 0x19d, 0xcf, 0x2, 0x272, 0x273, 0x5, 0x17f, 
-    0xc0, 0x2, 0x273, 0x274, 0x5, 0x199, 0xcd, 0x2, 0x274, 0x2e, 0x3, 0x2, 
-    0x2, 0x2, 0x275, 0x276, 0x5, 0x17b, 0xbe, 0x2, 0x276, 0x277, 0x5, 0x193, 
-    0xca, 0x2, 0x277, 0x278, 0x5, 0x17d, 0xbf, 0x2, 0x278, 0x279, 0x5, 0x17f, 
-    0xc0, 0x2, 0x279, 0x27a, 0x5, 0x17b, 0xbe, 0x2, 0x27a, 0x30, 0x3, 0x2, 
-    0x2, 0x2, 0x27b, 0x27c, 0x5, 0x17b, 0xbe, 0x2, 0x27c, 0x27d, 0x5, 0x193, 
-    0xca, 0x2, 0x27d, 0x27e, 0x5, 0x18d, 0xc7, 0x2, 0x27e, 0x27f, 0x5, 0x18d, 
-    0xc7, 0x2, 0x27f, 0x280, 0x5, 0x177, 0xbc, 0x2, 0x280, 0x281, 0x5, 0x19d, 
-    0xcf, 0x2, 0x281, 0x282, 0x5, 0x17f, 0xc0, 0x2, 0x282, 0x32, 0x3, 0x2, 
-    0x2, 0x2, 0x283, 0x284, 0x5, 0x17b, 0xbe, 0x2, 0x284, 0x285, 0x5, 0x193, 
-    0xca, 0x2, 0x285, 0x286, 0x5, 0x18d, 0xc7, 0x2, 0x286, 0x287, 0x5, 0x19f, 
-    0xd0, 0x2, 0x287, 0x288, 0x5, 0x18f, 0xc8, 0x2, 0x288, 0x289, 0x5, 0x191, 
-    0xc9, 0x2, 0x289, 0x34, 0x3, 0x2, 0x2, 0x2, 0x28a, 0x28b, 0x5, 0x17b, 
-    0xbe, 0x2, 0x28b, 0x28c, 0x5, 0x193, 0xca, 0x2, 0x28c, 0x28d, 0x5, 0x18f, 
-    0xc8, 0x2, 0x28d, 0x28e, 0x5, 0x18f, 0xc8, 0x2, 0x28e, 0x28f, 0x5, 0x17f, 
-    0xc0, 0x2, 0x28f, 0x290, 0x5, 0x191, 0xc9, 0x2, 0x290, 0x291, 0x5, 0x19d, 
-    0xcf, 0x2, 0x291, 0x36, 0x3, 0x2, 0x2, 0x2, 0x292, 0x293, 0x5, 0x17b, 
-    0xbe, 0x2, 0x293, 0x294, 0x5, 0x193, 0xca, 0x2, 0x294, 0x295, 0x5, 0x191, 
-    0xc9, 0x2, 0x295, 0x296, 0x5, 0x19b, 0xce, 0x2, 0x296, 0x297, 0x5, 0x19d, 
-    0xcf, 0x2, 0x297, 0x298, 0x5, 0x199, 0xcd, 0x2, 0x298, 0x299, 0x5, 0x177, 
-    0xbc, 0x2, 0x299, 0x29a, 0x5, 0x187, 0xc4, 0x2, 0x29a, 0x29b, 0x5, 0x191, 
-    0xc9, 0x2, 0x29b, 0x29c, 0x5, 0x19d, 0xcf, 0x2, 0x29c, 0x38, 0x3, 0x2, 
-    0x2, 0x2, 0x29d, 0x29e, 0x5, 0x17b, 0xbe, 0x2, 0x29e, 0x29f, 0x5, 0x199, 
-    0xcd, 0x2, 0x29f, 0x2a0, 0x5, 0x17f, 0xc0, 0x2, 0x2a0, 0x2a1, 0x5, 0x177, 
-    0xbc, 0x2, 0x2a1, 0x2a2, 0x5, 0x19d, 0xcf, 0x2, 0x2a2, 0x2a3, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2a3, 0x3a, 0x3, 0x2, 0x2, 0x2, 0x2a4, 0x2a5, 0x5, 0x17b, 
-    0xbe, 0x2, 0x2a5, 0x2a6, 0x5, 0x199, 0xcd, 0x2, 0x2a6, 0x2a7, 0x5, 0x193, 
-    0xca, 0x2, 0x2a7, 0x2a8, 0x5, 0x19b, 0xce, 0x2, 0x2a8, 0x2a9, 0x5, 0x19b, 
-    0xce, 0x2, 0x2a9, 0x3c, 0x3, 0x2, 0x2, 0x2, 0x2aa, 0x2ab, 0x5, 0x17b, 
-    0xbe, 0x2, 0x2ab, 0x2ac, 0x5, 0x19f, 0xd0, 0x2, 0x2ac, 0x2ad, 0x5, 0x179, 
-    0xbd, 0x2, 0x2ad, 0x2ae, 0x5, 0x17f, 0xc0, 0x2, 0x2ae, 0x3e, 0x3, 0x2, 
-    0x2, 0x2, 0x2af, 0x2b0, 0x5, 0x17d, 0xbf, 0x2, 0x2b0, 0x2b1, 0x5, 0x177, 
-    0xbc, 0x2, 0x2b1, 0x2b2, 0x5, 0x19d, 0xcf, 0x2, 0x2b2, 0x2b3, 0x5, 0x177, 
-    0xbc, 0x2, 0x2b3, 0x2b4, 0x5, 0x179, 0xbd, 0x2, 0x2b4, 0x2b5, 0x5, 0x177, 
-    0xbc, 0x2, 0x2b5, 0x2b6, 0x5, 0x19b, 0xce, 0x2, 0x2b6, 0x2b7, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2b7, 0x40, 0x3, 0x2, 0x2, 0x2, 0x2b8, 0x2b9, 0x5, 0x17d, 
-    0xbf, 0x2, 0x2b9, 0x2ba, 0x5, 0x177, 0xbc, 0x2, 0x2ba, 0x2bb, 0x5, 0x19d, 
-    0xcf, 0x2, 0x2bb, 0x2bc, 0x5, 0x177, 0xbc, 0x2, 0x2bc, 0x2bd, 0x5, 0x179, 
-    0xbd, 0x2, 0x2bd, 0x2be, 0x5, 0x177, 0xbc, 0x2, 0x2be, 0x2bf, 0x5, 0x19b, 
-    0xce, 0x2, 0x2bf, 0x2c0, 0x5, 0x17f, 0xc0, 0x2, 0x2c0, 0x2c1, 0x5, 0x19b, 
-    0xce, 0x2, 0x2c1, 0x42, 0x3, 0x2, 0x2, 0x2, 0x2c2, 0x2c3, 0x5, 0x17d, 
-    0xbf, 0x2, 0x2c3, 0x2c4, 0x5, 0x177, 0xbc, 0x2, 0x2c4, 0x2c5, 0x5, 0x19d, 
-    0xcf, 0x2, 0x2c5, 0x2c6, 0x5, 0x17f, 0xc0, 0x2, 0x2c6, 0x44, 0x3, 0x2, 
-    0x2, 0x2, 0x2c7, 0x2c8, 0x5, 0x17d, 0xbf, 0x2, 0x2c8, 0x2c9, 0x5, 0x177, 
-    0xbc, 0x2, 0x2c9, 0x2ca, 0x5, 0x1a7, 0xd4, 0x2, 0x2ca, 0x46, 0x3, 0x2, 
-    0x2, 0x2, 0x2cb, 0x2cc, 0x5, 0x17d, 0xbf, 0x2, 0x2cc, 0x2cd, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2cd, 0x2ce, 0x5, 0x17d, 0xbf, 0x2, 0x2ce, 0x2cf, 0x5, 0x19f, 
-    0xd0, 0x2, 0x2cf, 0x2d0, 0x5, 0x195, 0xcb, 0x2, 0x2d0, 0x2d1, 0x5, 0x18d, 
-    0xc7, 0x2, 0x2d1, 0x2d2, 0x5, 0x187, 0xc4, 0x2, 0x2d2, 0x2d3, 0x5, 0x17b, 
-    0xbe, 0x2, 0x2d3, 0x2d4, 0x5, 0x177, 0xbc, 0x2, 0x2d4, 0x2d5, 0x5, 0x19d, 
-    0xcf, 0x2, 0x2d5, 0x2d6, 0x5, 0x17f, 0xc0, 0x2, 0x2d6, 0x48, 0x3, 0x2, 
-    0x2, 0x2, 0x2d7, 0x2d8, 0x5, 0x17d, 0xbf, 0x2, 0x2d8, 0x2d9, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2d9, 0x2da, 0x5, 0x181, 0xc1, 0x2, 0x2da, 0x2db, 0x5, 0x177, 
-    0xbc, 0x2, 0x2db, 0x2dc, 0x5, 0x19f, 0xd0, 0x2, 0x2dc, 0x2dd, 0x5, 0x18d, 
-    0xc7, 0x2, 0x2dd, 0x2de, 0x5, 0x19d, 0xcf, 0x2, 0x2de, 0x4a, 0x3, 0x2, 
-    0x2, 0x2, 0x2df, 0x2e0, 0x5, 0x17d, 0xbf, 0x2, 0x2e0, 0x2e1, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2e1, 0x2e2, 0x5, 0x18d, 0xc7, 0x2, 0x2e2, 0x2e3, 0x5, 0x177, 
-    0xbc, 0x2, 0x2e3, 0x2e4, 0x5, 0x1a7, 0xd4, 0x2, 0x2e4, 0x4c, 0x3, 0x2, 
-    0x2, 0x2, 0x2e5, 0x2e6, 0x5, 0x17d, 0xbf, 0x2, 0x2e6, 0x2e7, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2e7, 0x2e8, 0x5, 0x18d, 0xc7, 0x2, 0x2e8, 0x2e9, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2e9, 0x2ea, 0x5, 0x19d, 0xcf, 0x2, 0x2ea, 0x2eb, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2eb, 0x4e, 0x3, 0x2, 0x2, 0x2, 0x2ec, 0x2ed, 0x5, 0x17d, 
-    0xbf, 0x2, 0x2ed, 0x2ee, 0x5, 0x17f, 0xc0, 0x2, 0x2ee, 0x2ef, 0x5, 0x19b, 
-    0xce, 0x2, 0x2ef, 0x2f0, 0x5, 0x17b, 0xbe, 0x2, 0x2f0, 0x50, 0x3, 0x2, 
-    0x2, 0x2, 0x2f1, 0x2f2, 0x5, 0x17d, 0xbf, 0x2, 0x2f2, 0x2f3, 0x5, 0x17f, 
-    0xc0, 0x2, 0x2f3, 0x2f4, 0x5, 0x19b, 0xce, 0x2, 0x2f4, 0x2f5, 0x5, 0x17b, 
-    0xbe, 0x2, 0x2f5, 0x2f6, 0x5, 0x17f, 0xc0, 0x2, 0x2f6, 0x2f7, 0x5, 0x191, 
-    0xc9, 0x2, 0x2f7, 0x2f8, 0x5, 0x17d, 0xbf, 0x2, 0x2f8, 0x2f9, 0x5, 0x187, 
-    0xc4, 0x2, 0x2f9, 0x2fa, 0x5, 0x191, 0xc9, 0x2, 0x2fa, 0x2fb, 0x5, 0x183, 
-    0xc2, 0x2, 0x2fb, 0x52, 0x3, 0x2, 0x2, 0x2, 0x2fc, 0x2fd, 0x5, 0x17d, 
-    0xbf, 0x2, 0x2fd, 0x2fe, 0x5, 0x17f, 0xc0, 0x2, 0x2fe, 0x2ff, 0x5, 0x19b, 
-    0xce, 0x2, 0x2ff, 0x300, 0x5, 0x17b, 0xbe, 0x2, 0x300, 0x301, 0x5, 0x199, 
-    0xcd, 0x2, 0x301, 0x302, 0x5, 0x187, 0xc4, 0x2, 0x302, 0x303, 0x5, 0x179, 
-    0xbd, 0x2, 0x303, 0x304, 0x5, 0x17f, 0xc0, 0x2, 0x304, 0x54, 0x3, 0x2, 
-    0x2, 0x2, 0x305, 0x306, 0x5, 0x17d, 0xbf, 0x2, 0x306, 0x307, 0x5, 0x17f, 
-    0xc0, 0x2, 0x307, 0x308, 0x5, 0x19d, 0xcf, 0x2, 0x308, 0x309, 0x5, 0x177, 
-    0xbc, 0x2, 0x309, 0x30a, 0x5, 0x17b, 0xbe, 0x2, 0x30a, 0x30b, 0x5, 0x185, 
-    0xc3, 0x2, 0x30b, 0x56, 0x3, 0x2, 0x2, 0x2, 0x30c, 0x30d, 0x5, 0x17d, 
-    0xbf, 0x2, 0x30d, 0x30e, 0x5, 0x187, 0xc4, 0x2, 0x30e, 0x30f, 0x5, 0x17b, 
-    0xbe, 0x2, 0x30f, 0x310, 0x5, 0x19d, 0xcf, 0x2, 0x310, 0x311, 0x5, 0x187, 
-    0xc4, 0x2, 0x311, 0x312, 0x5, 0x193, 0xca, 0x2, 0x312, 0x313, 0x5, 0x191, 
-    0xc9, 0x2, 0x313, 0x314, 0x5, 0x177, 0xbc, 0x2, 0x314, 0x315, 0x5, 0x199, 
-    0xcd, 0x2, 0x315, 0x316, 0x5, 0x187, 0xc4, 0x2, 0x316, 0x317, 0x5, 0x17f, 
-    0xc0, 0x2, 0x317, 0x318, 0x5, 0x19b, 0xce, 0x2, 0x318, 0x58, 0x3, 0x2, 
-    0x2, 0x2, 0x319, 0x31a, 0x5, 0x17d, 0xbf, 0x2, 0x31a, 0x31b, 0x5, 0x187, 
-    0xc4, 0x2, 0x31b, 0x31c, 0x5, 0x17b, 0xbe, 0x2, 0x31c, 0x31d, 0x5, 0x19d, 
-    0xcf, 0x2, 0x31d, 0x31e, 0x5, 0x187, 0xc4, 0x2, 0x31e, 0x31f, 0x5, 0x193, 
-    0xca, 0x2, 0x31f, 0x320, 0x5, 0x191, 0xc9, 0x2, 0x320, 0x321, 0x5, 0x177, 
-    0xbc, 0x2, 0x321, 0x322, 0x5, 0x199, 0xcd, 0x2, 0x322, 0x323, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x323, 0x5a, 0x3, 0x2, 0x2, 0x2, 0x324, 0x325, 0x5, 0x17d, 
-    0xbf, 0x2, 0x325, 0x326, 0x5, 0x187, 0xc4, 0x2, 0x326, 0x327, 0x5, 0x19b, 
-    0xce, 0x2, 0x327, 0x328, 0x5, 0x18b, 0xc6, 0x2, 0x328, 0x5c, 0x3, 0x2, 
-    0x2, 0x2, 0x329, 0x32a, 0x5, 0x17d, 0xbf, 0x2, 0x32a, 0x32b, 0x5, 0x187, 
-    0xc4, 0x2, 0x32b, 0x32c, 0x5, 0x19b, 0xce, 0x2, 0x32c, 0x32d, 0x5, 0x19d, 
-    0xcf, 0x2, 0x32d, 0x32e, 0x5, 0x187, 0xc4, 0x2, 0x32e, 0x32f, 0x5, 0x191, 
-    0xc9, 0x2, 0x32f, 0x330, 0x5, 0x17b, 0xbe, 0x2, 0x330, 0x331, 0x5, 0x19d, 
-    0xcf, 0x2, 0x331, 0x5e, 0x3, 0x2, 0x2, 0x2, 0x332, 0x333, 0x5, 0x17d, 
-    0xbf, 0x2, 0x333, 0x334, 0x5, 0x187, 0xc4, 0x2, 0x334, 0x335, 0x5, 0x19b, 
-    0xce, 0x2, 0x335, 0x336, 0x5, 0x19d, 0xcf, 0x2, 0x336, 0x337, 0x5, 0x199, 
-    0xcd, 0x2, 0x337, 0x338, 0x5, 0x187, 0xc4, 0x2, 0x338, 0x339, 0x5, 0x179, 
-    0xbd, 0x2, 0x339, 0x33a, 0x5, 0x19f, 0xd0, 0x2, 0x33a, 0x33b, 0x5, 0x19d, 
-    0xcf, 0x2, 0x33b, 0x33c, 0x5, 0x17f, 0xc0, 0x2, 0x33c, 0x33d, 0x5, 0x17d, 
-    0xbf, 0x2, 0x33d, 0x60, 0x3, 0x2, 0x2, 0x2, 0x33e, 0x33f, 0x5, 0x17d, 
-    0xbf, 0x2, 0x33f, 0x340, 0x5, 0x199, 0xcd, 0x2, 0x340, 0x341, 0x5, 0x193, 
-    0xca, 0x2, 0x341, 0x342, 0x5, 0x195, 0xcb, 0x2, 0x342, 0x62, 0x3, 0x2, 
-    0x2, 0x2, 0x343, 0x344, 0x5, 0x17f, 0xc0, 0x2, 0x344, 0x345, 0x5, 0x18d, 
-    0xc7, 0x2, 0x345, 0x346, 0x5, 0x19b, 0xce, 0x2, 0x346, 0x347, 0x5, 0x17f, 
-    0xc0, 0x2, 0x347, 0x64, 0x3, 0x2, 0x2, 0x2, 0x348, 0x349, 0x5, 0x17f, 
-    0xc0, 0x2, 0x349, 0x34a, 0x5, 0x191, 0xc9, 0x2, 0x34a, 0x34b, 0x5, 0x17d, 
-    0xbf, 0x2, 0x34b, 0x66, 0x3, 0x2, 0x2, 0x2, 0x34c, 0x34d, 0x5, 0x17f, 
-    0xc0, 0x2, 0x34d, 0x34e, 0x5, 0x191, 0xc9, 0x2, 0x34e, 0x34f, 0x5, 0x183, 
-    0xc2, 0x2, 0x34f, 0x350, 0x5, 0x187, 0xc4, 0x2, 0x350, 0x351, 0x5, 0x191, 
-    0xc9, 0x2, 0x351, 0x352, 0x5, 0x17f, 0xc0, 0x2, 0x352, 0x68, 0x3, 0x2, 
-    0x2, 0x2, 0x353, 0x354, 0x5, 0x17f, 0xc0, 0x2, 0x354, 0x355, 0x5, 0x1a1, 
-    0xd1, 0x2, 0x355, 0x356, 0x5, 0x17f, 0xc0, 0x2, 0x356, 0x357, 0x5, 0x191, 
-    0xc9, 0x2, 0x357, 0x358, 0x5, 0x19d, 0xcf, 0x2, 0x358, 0x359, 0x5, 0x19b, 
-    0xce, 0x2, 0x359, 0x6a, 0x3, 0x2, 0x2, 0x2, 0x35a, 0x35b, 0x5, 0x17f, 
-    0xc0, 0x2, 0x35b, 0x35c, 0x5, 0x1a5, 0xd3, 0x2, 0x35c, 0x35d, 0x5, 0x187, 
-    0xc4, 0x2, 0x35d, 0x35e, 0x5, 0x19b, 0xce, 0x2, 0x35e, 0x35f, 0x5, 0x19d, 
-    0xcf, 0x2, 0x35f, 0x360, 0x5, 0x19b, 0xce, 0x2, 0x360, 0x6c, 0x3, 0x2, 
-    0x2, 0x2, 0x361, 0x362, 0x5, 0x17f, 0xc0, 0x2, 0x362, 0x363, 0x5, 0x1a5, 
-    0xd3, 0x2, 0x363, 0x364, 0x5, 0x195, 0xcb, 0x2, 0x364, 0x365, 0x5, 0x18d, 
-    0xc7, 0x2, 0x365, 0x366, 0x5, 0x177, 0xbc, 0x2, 0x366, 0x367, 0x5, 0x187, 
-    0xc4, 0x2, 0x367, 0x368, 0x5, 0x191, 0xc9, 0x2, 0x368, 0x6e, 0x3, 0x2, 
-    0x2, 0x2, 0x369, 0x36a, 0x5, 0x17f, 0xc0, 0x2, 0x36a, 0x36b, 0x5, 0x1a5, 
-    0xd3, 0x2, 0x36b, 0x36c, 0x5, 0x195, 0xcb, 0x2, 0x36c, 0x36d, 0x5, 0x199, 
-    0xcd, 0x2, 0x36d, 0x36e, 0x5, 0x17f, 0xc0, 0x2, 0x36e, 0x36f, 0x5, 0x19b, 
-    0xce, 0x2, 0x36f, 0x370, 0x5, 0x19b, 0xce, 0x2, 0x370, 0x371, 0x5, 0x187, 
-    0xc4, 0x2, 0x371, 0x372, 0x5, 0x193, 0xca, 0x2, 0x372, 0x373, 0x5, 0x191, 
-    0xc9, 0x2, 0x373, 0x70, 0x3, 0x2, 0x2, 0x2, 0x374, 0x375, 0x5, 0x17f, 
-    0xc0, 0x2, 0x375, 0x376, 0x5, 0x1a5, 0xd3, 0x2, 0x376, 0x377, 0x5, 0x19d, 
-    0xcf, 0x2, 0x377, 0x378, 0x5, 0x199, 0xcd, 0x2, 0x378, 0x379, 0x5, 0x177, 
-    0xbc, 0x2, 0x379, 0x37a, 0x5, 0x17b, 0xbe, 0x2, 0x37a, 0x37b, 0x5, 0x19d, 
-    0xcf, 0x2, 0x37b, 0x72, 0x3, 0x2, 0x2, 0x2, 0x37c, 0x37d, 0x5, 0x181, 
-    0xc1, 0x2, 0x37d, 0x37e, 0x5, 0x17f, 0xc0, 0x2, 0x37e, 0x37f, 0x5, 0x19d, 
-    0xcf, 0x2, 0x37f, 0x380, 0x5, 0x17b, 0xbe, 0x2, 0x380, 0x381, 0x5, 0x185, 
-    0xc3, 0x2, 0x381, 0x382, 0x5, 0x17f, 0xc0, 0x2, 0x382, 0x383, 0x5, 0x19b, 
-    0xce, 0x2, 0x383, 0x74, 0x3, 0x2, 0x2, 0x2, 0x384, 0x385, 0x5, 0x181, 
-    0xc1, 0x2, 0x385, 0x386, 0x5, 0x187, 0xc4, 0x2, 0x386, 0x387, 0x5, 0x191, 
-    0xc9, 0x2, 0x387, 0x388, 0x5, 0x177, 0xbc, 0x2, 0x388, 0x389, 0x5, 0x18d, 
-    0xc7, 0x2, 0x389, 0x76, 0x3, 0x2, 0x2, 0x2, 0x38a, 0x38b, 0x5, 0x181, 
-    0xc1, 0x2, 0x38b, 0x38c, 0x5, 0x187, 0xc4, 0x2, 0x38c, 0x38d, 0x5, 0x199, 
-    0xcd, 0x2, 0x38d, 0x38e, 0x5, 0x19b, 0xce, 0x2, 0x38e, 0x38f, 0x5, 0x19d, 
-    0xcf, 0x2, 0x38f, 0x78, 0x3, 0x2, 0x2, 0x2, 0x390, 0x391, 0x5, 0x181, 
-    0xc1, 0x2, 0x391, 0x392, 0x5, 0x18d, 0xc7, 0x2, 0x392, 0x393, 0x5, 0x19f, 
-    0xd0, 0x2, 0x393, 0x394, 0x5, 0x19b, 0xce, 0x2, 0x394, 0x395, 0x5, 0x185, 
-    0xc3, 0x2, 0x395, 0x7a, 0x3, 0x2, 0x2, 0x2, 0x396, 0x397, 0x5, 0x181, 
-    0xc1, 0x2, 0x397, 0x398, 0x5, 0x193, 0xca, 0x2, 0x398, 0x399, 0x5, 0x199, 
-    0xcd, 0x2, 0x399, 0x7c, 0x3, 0x2, 0x2, 0x2, 0x39a, 0x39b, 0x5, 0x181, 
-    0xc1, 0x2, 0x39b, 0x39c, 0x5, 0x193, 0xca, 0x2, 0x39c, 0x39d, 0x5, 0x199, 
-    0xcd, 0x2, 0x39d, 0x39e, 0x5, 0x18f, 0xc8, 0x2, 0x39e, 0x39f, 0x5, 0x177, 
-    0xbc, 0x2, 0x39f, 0x3a0, 0x5, 0x19d, 0xcf, 0x2, 0x3a0, 0x7e, 0x3, 0x2, 
-    0x2, 0x2, 0x3a1, 0x3a2, 0x5, 0x181, 0xc1, 0x2, 0x3a2, 0x3a3, 0x5, 0x199, 
-    0xcd, 0x2, 0x3a3, 0x3a4, 0x5, 0x17f, 0xc0, 0x2, 0x3a4, 0x3a5, 0x5, 0x17f, 
-    0xc0, 0x2, 0x3a5, 0x3a6, 0x5, 0x1a9, 0xd5, 0x2, 0x3a6, 0x3a7, 0x5, 0x17f, 
-    0xc0, 0x2, 0x3a7, 0x80, 0x3, 0x2, 0x2, 0x2, 0x3a8, 0x3a9, 0x5, 0x181, 
-    0xc1, 0x2, 0x3a9, 0x3aa, 0x5, 0x199, 0xcd, 0x2, 0x3aa, 0x3ab, 0x5, 0x193, 
-    0xca, 0x2, 0x3ab, 0x3ac, 0x5, 0x18f, 0xc8, 0x2, 0x3ac, 0x82, 0x3, 0x2, 
-    0x2, 0x2, 0x3ad, 0x3ae, 0x5, 0x181, 0xc1, 0x2, 0x3ae, 0x3af, 0x5, 0x19f, 
-    0xd0, 0x2, 0x3af, 0x3b0, 0x5, 0x18d, 0xc7, 0x2, 0x3b0, 0x3b1, 0x5, 0x18d, 
-    0xc7, 0x2, 0x3b1, 0x84, 0x3, 0x2, 0x2, 0x2, 0x3b2, 0x3b3, 0x5, 0x181, 
-    0xc1, 0x2, 0x3b3, 0x3b4, 0x5, 0x19f, 0xd0, 0x2, 0x3b4, 0x3b5, 0x5, 0x191, 
-    0xc9, 0x2, 0x3b5, 0x3b6, 0x5, 0x17b, 0xbe, 0x2, 0x3b6, 0x3b7, 0x5, 0x19d, 
-    0xcf, 0x2, 0x3b7, 0x3b8, 0x5, 0x187, 0xc4, 0x2, 0x3b8, 0x3b9, 0x5, 0x193, 
-    0xca, 0x2, 0x3b9, 0x3ba, 0x5, 0x191, 0xc9, 0x2, 0x3ba, 0x86, 0x3, 0x2, 
-    0x2, 0x2, 0x3bb, 0x3bc, 0x5, 0x183, 0xc2, 0x2, 0x3bc, 0x3bd, 0x5, 0x18d, 
-    0xc7, 0x2, 0x3bd, 0x3be, 0x5, 0x193, 0xca, 0x2, 0x3be, 0x3bf, 0x5, 0x179, 
-    0xbd, 0x2, 0x3bf, 0x3c0, 0x5, 0x177, 0xbc, 0x2, 0x3c0, 0x3c1, 0x5, 0x18d, 
-    0xc7, 0x2, 0x3c1, 0x88, 0x3, 0x2, 0x2, 0x2, 0x3c2, 0x3c3, 0x5, 0x183, 
-    0xc2, 0x2, 0x3c3, 0x3c4, 0x5, 0x199, 0xcd, 0x2, 0x3c4, 0x3c5, 0x5, 0x177, 
-    0xbc, 0x2, 0x3c5, 0x3c6, 0x5, 0x191, 0xc9, 0x2, 0x3c6, 0x3c7, 0x5, 0x19f, 
-    0xd0, 0x2, 0x3c7, 0x3c8, 0x5, 0x18d, 0xc7, 0x2, 0x3c8, 0x3c9, 0x5, 0x177, 
-    0xbc, 0x2, 0x3c9, 0x3ca, 0x5, 0x199, 0xcd, 0x2, 0x3ca, 0x3cb, 0x5, 0x187, 
-    0xc4, 0x2, 0x3cb, 0x3cc, 0x5, 0x19d, 0xcf, 0x2, 0x3cc, 0x3cd, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x3cd, 0x8a, 0x3, 0x2, 0x2, 0x2, 0x3ce, 0x3cf, 0x5, 0x183, 
-    0xc2, 0x2, 0x3cf, 0x3d0, 0x5, 0x199, 0xcd, 0x2, 0x3d0, 0x3d1, 0x5, 0x193, 
-    0xca, 0x2, 0x3d1, 0x3d2, 0x5, 0x19f, 0xd0, 0x2, 0x3d2, 0x3d3, 0x5, 0x195, 
-    0xcb, 0x2, 0x3d3, 0x8c, 0x3, 0x2, 0x2, 0x2, 0x3d4, 0x3d5, 0x5, 0x185, 
-    0xc3, 0x2, 0x3d5, 0x3d6, 0x5, 0x177, 0xbc, 0x2, 0x3d6, 0x3d7, 0x5, 0x1a1, 
-    0xd1, 0x2, 0x3d7, 0x3d8, 0x5, 0x187, 0xc4, 0x2, 0x3d8, 0x3d9, 0x5, 0x191, 
-    0xc9, 0x2, 0x3d9, 0x3da, 0x5, 0x183, 0xc2, 0x2, 0x3da, 0x8e, 0x3, 0x2, 
-    0x2, 0x2, 0x3db, 0x3dc, 0x5, 0x185, 0xc3, 0x2, 0x3dc, 0x3dd, 0x5, 0x187, 
-    0xc4, 0x2, 0x3dd, 0x3de, 0x5, 0x17f, 0xc0, 0x2, 0x3de, 0x3df, 0x5, 0x199, 
-    0xcd, 0x2, 0x3df, 0x3e0, 0x5, 0x177, 0xbc, 0x2, 0x3e0, 0x3e1, 0x5, 0x199, 
-    0xcd, 0x2, 0x3e1, 0x3e2, 0x5, 0x17b, 0xbe, 0x2, 0x3e2, 0x3e3, 0x5, 0x185, 
-    0xc3, 0x2, 0x3e3, 0x3e4, 0x5, 0x187, 0xc4, 0x2, 0x3e4, 0x3e5, 0x5, 0x17b, 
-    0xbe, 0x2, 0x3e5, 0x3e6, 0x5, 0x177, 0xbc, 0x2, 0x3e6, 0x3e7, 0x5, 0x18d, 
-    0xc7, 0x2, 0x3e7, 0x90, 0x3, 0x2, 0x2, 0x2, 0x3e8, 0x3e9, 0x5, 0x185, 
-    0xc3, 0x2, 0x3e9, 0x3ea, 0x5, 0x193, 0xca, 0x2, 0x3ea, 0x3eb, 0x5, 0x19f, 
-    0xd0, 0x2, 0x3eb, 0x3ec, 0x5, 0x199, 0xcd, 0x2, 0x3ec, 0x92, 0x3, 0x2, 
-    0x2, 0x2, 0x3ed, 0x3ee, 0x5, 0x187, 0xc4, 0x2, 0x3ee, 0x3ef, 0x5, 0x17d, 
-    0xbf, 0x2, 0x3ef, 0x94, 0x3, 0x2, 0x2, 0x2, 0x3f0, 0x3f1, 0x5, 0x187, 
-    0xc4, 0x2, 0x3f1, 0x3f2, 0x5, 0x181, 0xc1, 0x2, 0x3f2, 0x96, 0x3, 0x2, 
-    0x2, 0x2, 0x3f3, 0x3f4, 0x5, 0x187, 0xc4, 0x2, 0x3f4, 0x3f5, 0x5, 0x18d, 
-    0xc7, 0x2, 0x3f5, 0x3f6, 0x5, 0x187, 0xc4, 0x2, 0x3f6, 0x3f7, 0x5, 0x18b, 
-    0xc6, 0x2, 0x3f7, 0x3f8, 0x5, 0x17f, 0xc0, 0x2, 0x3f8, 0x98, 0x3, 0x2, 
-    0x2, 0x2, 0x3f9, 0x3fa, 0x5, 0x187, 0xc4, 0x2, 0x3fa, 0x3fb, 0x5, 0x191, 
-    0xc9, 0x2, 0x3fb, 0x9a, 0x3, 0x2, 0x2, 0x2, 0x3fc, 0x3fd, 0x5, 0x187, 
-    0xc4, 0x2, 0x3fd, 0x3fe, 0x5, 0x191, 0xc9, 0x2, 0x3fe, 0x3ff, 0x5, 0x17d, 
-    0xbf, 0x2, 0x3ff, 0x400, 0x5, 0x17f, 0xc0, 0x2, 0x400, 0x401, 0x5, 0x1a5, 
-    0xd3, 0x2, 0x401, 0x9c, 0x3, 0x2, 0x2, 0x2, 0x402, 0x403, 0x5, 0x187, 
-    0xc4, 0x2, 0x403, 0x404, 0x5, 0x191, 0xc9, 0x2, 0x404, 0x405, 0x5, 0x181, 
-    0xc1, 0x2, 0x405, 0x410, 0x3, 0x2, 0x2, 0x2, 0x406, 0x407, 0x5, 0x187, 
-    0xc4, 0x2, 0x407, 0x408, 0x5, 0x191, 0xc9, 0x2, 0x408, 0x409, 0x5, 0x181, 
-    0xc1, 0x2, 0x409, 0x40a, 0x5, 0x187, 0xc4, 0x2, 0x40a, 0x40b, 0x5, 0x191, 
-    0xc9, 0x2, 0x40b, 0x40c, 0x5, 0x187, 0xc4, 0x2, 0x40c, 0x40d, 0x5, 0x19d, 
-    0xcf, 0x2, 0x40d, 0x40e, 0x5, 0x1a7, 0xd4, 0x2, 0x40e, 0x410, 0x3, 0x2, 
-    0x2, 0x2, 0x40f, 0x402, 0x3, 0x2, 0x2, 0x2, 0x40f, 0x406, 0x3, 0x2, 
-    0x2, 0x2, 0x410, 0x9e, 0x3, 0x2, 0x2, 0x2, 0x411, 0x412, 0x5, 0x187, 
-    0xc4, 0x2, 0x412, 0x413, 0x5, 0x191, 0xc9, 0x2, 0x413, 0x414, 0x5, 0x189, 
-    0xc5, 0x2, 0x414, 0x415, 0x5, 0x17f, 0xc0, 0x2, 0x415, 0x416, 0x5, 0x17b, 
-    0xbe, 0x2, 0x416, 0x417, 0x5, 0x19d, 0xcf, 0x2, 0x417, 0x418, 0x5, 0x187, 
-    0xc4, 0x2, 0x418, 0x419, 0x5, 0x1a1, 0xd1, 0x2, 0x419, 0x41a, 0x5, 0x17f, 
-    0xc0, 0x2, 0x41a, 0xa0, 0x3, 0x2, 0x2, 0x2, 0x41b, 0x41c, 0x5, 0x187, 
-    0xc4, 0x2, 0x41c, 0x41d, 0x5, 0x191, 0xc9, 0x2, 0x41d, 0x41e, 0x5, 0x191, 
-    0xc9, 0x2, 0x41e, 0x41f, 0x5, 0x17f, 0xc0, 0x2, 0x41f, 0x420, 0x5, 0x199, 
-    0xcd, 0x2, 0x420, 0xa2, 0x3, 0x2, 0x2, 0x2, 0x421, 0x422, 0x5, 0x187, 
-    0xc4, 0x2, 0x422, 0x423, 0x5, 0x191, 0xc9, 0x2, 0x423, 0x424, 0x5, 0x19b, 
-    0xce, 0x2, 0x424, 0x425, 0x5, 0x17f, 0xc0, 0x2, 0x425, 0x426, 0x5, 0x199, 
-    0xcd, 0x2, 0x426, 0x427, 0x5, 0x19d, 0xcf, 0x2, 0x427, 0xa4, 0x3, 0x2, 
-    0x2, 0x2, 0x428, 0x429, 0x5, 0x187, 0xc4, 0x2, 0x429, 0x42a, 0x5, 0x191, 
-    0xc9, 0x2, 0x42a, 0x42b, 0x5, 0x19d, 0xcf, 0x2, 0x42b, 0x42c, 0x5, 0x17f, 
-    0xc0, 0x2, 0x42c, 0x42d, 0x5, 0x199, 0xcd, 0x2, 0x42d, 0x42e, 0x5, 0x1a1, 
-    0xd1, 0x2, 0x42e, 0x42f, 0x5, 0x177, 0xbc, 0x2, 0x42f, 0x430, 0x5, 0x18d, 
-    0xc7, 0x2, 0x430, 0xa6, 0x3, 0x2, 0x2, 0x2, 0x431, 0x432, 0x5, 0x187, 
-    0xc4, 0x2, 0x432, 0x433, 0x5, 0x191, 0xc9, 0x2, 0x433, 0x434, 0x5, 0x19d, 
-    0xcf, 0x2, 0x434, 0x435, 0x5, 0x193, 0xca, 0x2, 0x435, 0xa8, 0x3, 0x2, 
-    0x2, 0x2, 0x436, 0x437, 0x5, 0x187, 0xc4, 0x2, 0x437, 0x438, 0x5, 0x19b, 
-    0xce, 0x2, 0x438, 0xaa, 0x3, 0x2, 0x2, 0x2, 0x439, 0x43a, 0x5, 0x187, 
-    0xc4, 0x2, 0x43a, 0x43b, 0x5, 0x19b, 0xce, 0x2, 0x43b, 0x43c, 0x5, 0x1ed, 
-    0xf7, 0x2, 0x43c, 0x43d, 0x5, 0x193, 0xca, 0x2, 0x43d, 0x43e, 0x5, 0x179, 
-    0xbd, 0x2, 0x43e, 0x43f, 0x5, 0x189, 0xc5, 0x2, 0x43f, 0x440, 0x5, 0x17f, 
-    0xc0, 0x2, 0x440, 0x441, 0x5, 0x17b, 0xbe, 0x2, 0x441, 0x442, 0x5, 0x19d, 
-    0xcf, 0x2, 0x442, 0x443, 0x5, 0x1ed, 0xf7, 0x2, 0x443, 0x444, 0x5, 0x187, 
-    0xc4, 0x2, 0x444, 0x445, 0x5, 0x17d, 0xbf, 0x2, 0x445, 0xac, 0x3, 0x2, 
-    0x2, 0x2, 0x446, 0x447, 0x5, 0x189, 0xc5, 0x2, 0x447, 0x448, 0x5, 0x193, 
-    0xca, 0x2, 0x448, 0x449, 0x5, 0x187, 0xc4, 0x2, 0x449, 0x44a, 0x5, 0x191, 
-    0xc9, 0x2, 0x44a, 0xae, 0x3, 0x2, 0x2, 0x2, 0x44b, 0x44c, 0x5, 0x18b, 
-    0xc6, 0x2, 0x44c, 0x44d, 0x5, 0x17f, 0xc0, 0x2, 0x44d, 0x44e, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x44e, 0xb0, 0x3, 0x2, 0x2, 0x2, 0x44f, 0x450, 0x5, 0x18b, 
-    0xc6, 0x2, 0x450, 0x451, 0x5, 0x187, 0xc4, 0x2, 0x451, 0x452, 0x5, 0x18d, 
-    0xc7, 0x2, 0x452, 0x453, 0x5, 0x18d, 0xc7, 0x2, 0x453, 0xb2, 0x3, 0x2, 
-    0x2, 0x2, 0x454, 0x455, 0x5, 0x18d, 0xc7, 0x2, 0x455, 0x456, 0x5, 0x177, 
-    0xbc, 0x2, 0x456, 0x457, 0x5, 0x19b, 0xce, 0x2, 0x457, 0x458, 0x5, 0x19d, 
-    0xcf, 0x2, 0x458, 0xb4, 0x3, 0x2, 0x2, 0x2, 0x459, 0x45a, 0x5, 0x18d, 
-    0xc7, 0x2, 0x45a, 0x45b, 0x5, 0x177, 0xbc, 0x2, 0x45b, 0x45c, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x45c, 0x45d, 0x5, 0x193, 0xca, 0x2, 0x45d, 0x45e, 0x5, 0x19f, 
-    0xd0, 0x2, 0x45e, 0x45f, 0x5, 0x19d, 0xcf, 0x2, 0x45f, 0xb6, 0x3, 0x2, 
-    0x2, 0x2, 0x460, 0x461, 0x5, 0x18d, 0xc7, 0x2, 0x461, 0x462, 0x5, 0x17f, 
-    0xc0, 0x2, 0x462, 0x463, 0x5, 0x177, 0xbc, 0x2, 0x463, 0x464, 0x5, 0x17d, 
-    0xbf, 0x2, 0x464, 0x465, 0x5, 0x187, 0xc4, 0x2, 0x465, 0x466, 0x5, 0x191, 
-    0xc9, 0x2, 0x466, 0x467, 0x5, 0x183, 0xc2, 0x2, 0x467, 0xb8, 0x3, 0x2, 
-    0x2, 0x2, 0x468, 0x469, 0x5, 0x18d, 0xc7, 0x2, 0x469, 0x46a, 0x5, 0x17f, 
-    0xc0, 0x2, 0x46a, 0x46b, 0x5, 0x181, 0xc1, 0x2, 0x46b, 0x46c, 0x5, 0x19d, 
-    0xcf, 0x2, 0x46c, 0xba, 0x3, 0x2, 0x2, 0x2, 0x46d, 0x46e, 0x5, 0x18d, 
-    0xc7, 0x2, 0x46e, 0x46f, 0x5, 0x187, 0xc4, 0x2, 0x46f, 0x470, 0x5, 0x181, 
-    0xc1, 0x2, 0x470, 0x471, 0x5, 0x17f, 0xc0, 0x2, 0x471, 0x472, 0x5, 0x19d, 
-    0xcf, 0x2, 0x472, 0x473, 0x5, 0x187, 0xc4, 0x2, 0x473, 0x474, 0x5, 0x18f, 
-    0xc8, 0x2, 0x474, 0x475, 0x5, 0x17f, 0xc0, 0x2, 0x475, 0xbc, 0x3, 0x2, 
-    0x2, 0x2, 0x476, 0x477, 0x5, 0x18d, 0xc7, 0x2, 0x477, 0x478, 0x5, 0x187, 
-    0xc4, 0x2, 0x478, 0x479, 0x5, 0x18b, 0xc6, 0x2, 0x479, 0x47a, 0x5, 0x17f, 
-    0xc0, 0x2, 0x47a, 0xbe, 0x3, 0x2, 0x2, 0x2, 0x47b, 0x47c, 0x5, 0x18d, 
-    0xc7, 0x2, 0x47c, 0x47d, 0x5, 0x187, 0xc4, 0x2, 0x47d, 0x47e, 0x5, 0x18f, 
-    0xc8, 0x2, 0x47e, 0x47f, 0x5, 0x187, 0xc4, 0x2, 0x47f, 0x480, 0x5, 0x19d, 
-    0xcf, 0x2, 0x480, 0xc0, 0x3, 0x2, 0x2, 0x2, 0x481, 0x482, 0x5, 0x18d, 
-    0xc7, 0x2, 0x482, 0x483, 0x5, 0x187, 0xc4, 0x2, 0x483, 0x484, 0x5, 0x1a1, 
-    0xd1, 0x2, 0x484, 0x485, 0x5, 0x17f, 0xc0, 0x2, 0x485, 0xc2, 0x3, 0x2, 
-    0x2, 0x2, 0x486, 0x487, 0x5, 0x18d, 0xc7, 0x2, 0x487, 0x488, 0x5, 0x193, 
-    0xca, 0x2, 0x488, 0x489, 0x5, 0x17b, 0xbe, 0x2, 0x489, 0x48a, 0x5, 0x177, 
-    0xbc, 0x2, 0x48a, 0x48b, 0x5, 0x18d, 0xc7, 0x2, 0x48b, 0xc4, 0x3, 0x2, 
-    0x2, 0x2, 0x48c, 0x48d, 0x5, 0x18d, 0xc7, 0x2, 0x48d, 0x48e, 0x5, 0x193, 
-    0xca, 0x2, 0x48e, 0x48f, 0x5, 0x183, 0xc2, 0x2, 0x48f, 0x490, 0x5, 0x19b, 
-    0xce, 0x2, 0x490, 0xc6, 0x3, 0x2, 0x2, 0x2, 0x491, 0x492, 0x5, 0x18f, 
-    0xc8, 0x2, 0x492, 0x493, 0x5, 0x177, 0xbc, 0x2, 0x493, 0x494, 0x5, 0x19d, 
-    0xcf, 0x2, 0x494, 0x495, 0x5, 0x17f, 0xc0, 0x2, 0x495, 0x496, 0x5, 0x199, 
-    0xcd, 0x2, 0x496, 0x497, 0x5, 0x187, 0xc4, 0x2, 0x497, 0x498, 0x5, 0x177, 
-    0xbc, 0x2, 0x498, 0x499, 0x5, 0x18d, 0xc7, 0x2, 0x499, 0x49a, 0x5, 0x187, 
-    0xc4, 0x2, 0x49a, 0x49b, 0x5, 0x1a9, 0xd5, 0x2, 0x49b, 0x49c, 0x5, 0x17f, 
-    0xc0, 0x2, 0x49c, 0x49d, 0x5, 0x17d, 0xbf, 0x2, 0x49d, 0xc8, 0x3, 0x2, 
-    0x2, 0x2, 0x49e, 0x49f, 0x5, 0x18f, 0xc8, 0x2, 0x49f, 0x4a0, 0x5, 0x177, 
-    0xbc, 0x2, 0x4a0, 0x4a1, 0x5, 0x1a5, 0xd3, 0x2, 0x4a1, 0xca, 0x3, 0x2, 
-    0x2, 0x2, 0x4a2, 0x4a3, 0x5, 0x18f, 0xc8, 0x2, 0x4a3, 0x4a4, 0x5, 0x17f, 
-    0xc0, 0x2, 0x4a4, 0x4a5, 0x5, 0x199, 0xcd, 0x2, 0x4a5, 0x4a6, 0x5, 0x183, 
-    0xc2, 0x2, 0x4a6, 0x4a7, 0x5, 0x17f, 0xc0, 0x2, 0x4a7, 0x4a8, 0x5, 0x19b, 
-    0xce, 0x2, 0x4a8, 0xcc, 0x3, 0x2, 0x2, 0x2, 0x4a9, 0x4aa, 0x5, 0x18f, 
-    0xc8, 0x2, 0x4aa, 0x4ab, 0x5, 0x187, 0xc4, 0x2, 0x4ab, 0x4ac, 0x5, 0x191, 
-    0xc9, 0x2, 0x4ac, 0xce, 0x3, 0x2, 0x2, 0x2, 0x4ad, 0x4ae, 0x5, 0x18f, 
-    0xc8, 0x2, 0x4ae, 0x4af, 0x5, 0x187, 0xc4, 0x2, 0x4af, 0x4b0, 0x5, 0x191, 
-    0xc9, 0x2, 0x4b0, 0x4b1, 0x5, 0x19f, 0xd0, 0x2, 0x4b1, 0x4b2, 0x5, 0x19d, 
-    0xcf, 0x2, 0x4b2, 0x4b3, 0x5, 0x17f, 0xc0, 0x2, 0x4b3, 0xd0, 0x3, 0x2, 
-    0x2, 0x2, 0x4b4, 0x4b5, 0x5, 0x18f, 0xc8, 0x2, 0x4b5, 0x4b6, 0x5, 0x193, 
-    0xca, 0x2, 0x4b6, 0x4b7, 0x5, 0x17d, 0xbf, 0x2, 0x4b7, 0x4b8, 0x5, 0x187, 
-    0xc4, 0x2, 0x4b8, 0x4b9, 0x5, 0x181, 0xc1, 0x2, 0x4b9, 0x4ba, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x4ba, 0xd2, 0x3, 0x2, 0x2, 0x2, 0x4bb, 0x4bc, 0x5, 0x18f, 
-    0xc8, 0x2, 0x4bc, 0x4bd, 0x5, 0x193, 0xca, 0x2, 0x4bd, 0x4be, 0x5, 0x191, 
-    0xc9, 0x2, 0x4be, 0x4bf, 0x5, 0x19d, 0xcf, 0x2, 0x4bf, 0x4c0, 0x5, 0x185, 
-    0xc3, 0x2, 0x4c0, 0xd4, 0x3, 0x2, 0x2, 0x2, 0x4c1, 0x4c2, 0x5, 0x18f, 
-    0xc8, 0x2, 0x4c2, 0x4c3, 0x5, 0x193, 0xca, 0x2, 0x4c3, 0x4c4, 0x5, 0x1a1, 
-    0xd1, 0x2, 0x4c4, 0x4c5, 0x5, 0x17f, 0xc0, 0x2, 0x4c5, 0xd6, 0x3, 0x2, 
-    0x2, 0x2, 0x4c6, 0x4c7, 0x5, 0x18f, 0xc8, 0x2, 0x4c7, 0x4c8, 0x5, 0x19f, 
-    0xd0, 0x2, 0x4c8, 0x4c9, 0x5, 0x19d, 0xcf, 0x2, 0x4c9, 0x4ca, 0x5, 0x177, 
-    0xbc, 0x2, 0x4ca, 0x4cb, 0x5, 0x19d, 0xcf, 0x2, 0x4cb, 0x4cc, 0x5, 0x187, 
-    0xc4, 0x2, 0x4cc, 0x4cd, 0x5, 0x193, 0xca, 0x2, 0x4cd, 0x4ce, 0x5, 0x191, 
-    0xc9, 0x2, 0x4ce, 0xd8, 0x3, 0x2, 0x2, 0x2, 0x4cf, 0x4d0, 0x5, 0x191, 
-    0xc9, 0x2, 0x4d0, 0x4d1, 0x5, 0x177, 0xbc, 0x2, 0x4d1, 0x4d2, 0x5, 0x191, 
-    0xc9, 0x2, 0x4d2, 0xda, 0x3, 0x2, 0x2, 0x2, 0x4d3, 0x4d4, 0x5, 0x191, 
-    0xc9, 0x2, 0x4d4, 0x4d5, 0x5, 0x193, 0xca, 0x2, 0x4d5, 0xdc, 0x3, 0x2, 
-    0x2, 0x2, 0x4d6, 0x4d7, 0x5, 0x191, 0xc9, 0x2, 0x4d7, 0x4d8, 0x5, 0x193, 
-    0xca, 0x2, 0x4d8, 0x4d9, 0x5, 0x19d, 0xcf, 0x2, 0x4d9, 0xde, 0x3, 0x2, 
-    0x2, 0x2, 0x4da, 0x4db, 0x5, 0x191, 0xc9, 0x2, 0x4db, 0x4dc, 0x5, 0x19f, 
-    0xd0, 0x2, 0x4dc, 0x4dd, 0x5, 0x18d, 0xc7, 0x2, 0x4dd, 0x4de, 0x5, 0x18d, 
-    0xc7, 0x2, 0x4de, 0xe0, 0x3, 0x2, 0x2, 0x2, 0x4df, 0x4e0, 0x5, 0x191, 
-    0xc9, 0x2, 0x4e0, 0x4e1, 0x5, 0x19f, 0xd0, 0x2, 0x4e1, 0x4e2, 0x5, 0x18d, 
-    0xc7, 0x2, 0x4e2, 0x4e3, 0x5, 0x18d, 0xc7, 0x2, 0x4e3, 0x4e4, 0x5, 0x19b, 
-    0xce, 0x2, 0x4e4, 0xe2, 0x3, 0x2, 0x2, 0x2, 0x4e5, 0x4e6, 0x5, 0x193, 
-    0xca, 0x2, 0x4e6, 0x4e7, 0x5, 0x181, 0xc1, 0x2, 0x4e7, 0x4e8, 0x5, 0x181, 
-    0xc1, 0x2, 0x4e8, 0x4e9, 0x5, 0x19b, 0xce, 0x2, 0x4e9, 0x4ea, 0x5, 0x17f, 
-    0xc0, 0x2, 0x4ea, 0x4eb, 0x5, 0x19d, 0xcf, 0x2, 0x4eb, 0xe4, 0x3, 0x2, 
-    0x2, 0x2, 0x4ec, 0x4ed, 0x5, 0x193, 0xca, 0x2, 0x4ed, 0x4ee, 0x5, 0x191, 
-    0xc9, 0x2, 0x4ee, 0xe6, 0x3, 0x2, 0x2, 0x2, 0x4ef, 0x4f0, 0x5, 0x193, 
-    0xca, 0x2, 0x4f0, 0x4f1, 0x5, 0x195, 0xcb, 0x2, 0x4f1, 0x4f2, 0x5, 0x19d, 
-    0xcf, 0x2, 0x4f2, 0x4f3, 0x5, 0x187, 0xc4, 0x2, 0x4f3, 0x4f4, 0x5, 0x18f, 
-    0xc8, 0x2, 0x4f4, 0x4f5, 0x5, 0x187, 0xc4, 0x2, 0x4f5, 0x4f6, 0x5, 0x1a9, 
-    0xd5, 0x2, 0x4f6, 0x4f7, 0x5, 0x17f, 0xc0, 0x2, 0x4f7, 0xe8, 0x3, 0x2, 
-    0x2, 0x2, 0x4f8, 0x4f9, 0x5, 0x193, 0xca, 0x2, 0x4f9, 0x4fa, 0x5, 0x199, 
-    0xcd, 0x2, 0x4fa, 0xea, 0x3, 0x2, 0x2, 0x2, 0x4fb, 0x4fc, 0x5, 0x193, 
-    0xca, 0x2, 0x4fc, 0x4fd, 0x5, 0x199, 0xcd, 0x2, 0x4fd, 0x4fe, 0x5, 0x17d, 
-    0xbf, 0x2, 0x4fe, 0x4ff, 0x5, 0x17f, 0xc0, 0x2, 0x4ff, 0x500, 0x5, 0x199, 
-    0xcd, 0x2, 0x500, 0xec, 0x3, 0x2, 0x2, 0x2, 0x501, 0x502, 0x5, 0x193, 
-    0xca, 0x2, 0x502, 0x503, 0x5, 0x19f, 0xd0, 0x2, 0x503, 0x504, 0x5, 0x19d, 
-    0xcf, 0x2, 0x504, 0x505, 0x5, 0x17f, 0xc0, 0x2, 0x505, 0x506, 0x5, 0x199, 
-    0xcd, 0x2, 0x506, 0xee, 0x3, 0x2, 0x2, 0x2, 0x507, 0x508, 0x5, 0x193, 
-    0xca, 0x2, 0x508, 0x509, 0x5, 0x19f, 0xd0, 0x2, 0x509, 0x50a, 0x5, 0x19d, 
-    0xcf, 0x2, 0x50a, 0x50b, 0x5, 0x181, 0xc1, 0x2, 0x50b, 0x50c, 0x5, 0x187, 
-    0xc4, 0x2, 0x50c, 0x50d, 0x5, 0x18d, 0xc7, 0x2, 0x50d, 0x50e, 0x5, 0x17f, 
-    0xc0, 0x2, 0x50e, 0xf0, 0x3, 0x2, 0x2, 0x2, 0x50f, 0x510, 0x5, 0x195, 
-    0xcb, 0x2, 0x510, 0x511, 0x5, 0x177, 0xbc, 0x2, 0x511, 0x512, 0x5, 0x199, 
-    0xcd, 0x2, 0x512, 0x513, 0x5, 0x19d, 0xcf, 0x2, 0x513, 0x514, 0x5, 0x187, 
-    0xc4, 0x2, 0x514, 0x515, 0x5, 0x19d, 0xcf, 0x2, 0x515, 0x516, 0x5, 0x187, 
-    0xc4, 0x2, 0x516, 0x517, 0x5, 0x193, 0xca, 0x2, 0x517, 0x518, 0x5, 0x191, 
-    0xc9, 0x2, 0x518, 0xf2, 0x3, 0x2, 0x2, 0x2, 0x519, 0x51a, 0x5, 0x195, 
-    0xcb, 0x2, 0x51a, 0x51b, 0x5, 0x193, 0xca, 0x2, 0x51b, 0x51c, 0x5, 0x195, 
-    0xcb, 0x2, 0x51c, 0x51d, 0x5, 0x19f, 0xd0, 0x2, 0x51d, 0x51e, 0x5, 0x18d, 
-    0xc7, 0x2, 0x51e, 0x51f, 0x5, 0x177, 0xbc, 0x2, 0x51f, 0x520, 0x5, 0x19d, 
-    0xcf, 0x2, 0x520, 0x521, 0x5, 0x17f, 0xc0, 0x2, 0x521, 0xf4, 0x3, 0x2, 
-    0x2, 0x2, 0x522, 0x523, 0x5, 0x195, 0xcb, 0x2, 0x523, 0x524, 0x5, 0x199, 
-    0xcd, 0x2, 0x524, 0x525, 0x5, 0x17f, 0xc0, 0x2, 0x525, 0x526, 0x5, 0x1a3, 
-    0xd2, 0x2, 0x526, 0x527, 0x5, 0x185, 0xc3, 0x2, 0x527, 0x528, 0x5, 0x17f, 
-    0xc0, 0x2, 0x528, 0x529, 0x5, 0x199, 0xcd, 0x2, 0x529, 0x52a, 0x5, 0x17f, 
-    0xc0, 0x2, 0x52a, 0xf6, 0x3, 0x2, 0x2, 0x2, 0x52b, 0x52c, 0x5, 0x195, 
-    0xcb, 0x2, 0x52c, 0x52d, 0x5, 0x199, 0xcd, 0x2, 0x52d, 0x52e, 0x5, 0x187, 
-    0xc4, 0x2, 0x52e, 0x52f, 0x5, 0x18f, 0xc8, 0x2, 0x52f, 0x530, 0x5, 0x177, 
-    0xbc, 0x2, 0x530, 0x531, 0x5, 0x199, 0xcd, 0x2, 0x531, 0x532, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x532, 0xf8, 0x3, 0x2, 0x2, 0x2, 0x533, 0x534, 0x5, 0x197, 
-    0xcc, 0x2, 0x534, 0x535, 0x5, 0x19f, 0xd0, 0x2, 0x535, 0x536, 0x5, 0x177, 
-    0xbc, 0x2, 0x536, 0x537, 0x5, 0x199, 0xcd, 0x2, 0x537, 0x538, 0x5, 0x19d, 
-    0xcf, 0x2, 0x538, 0x539, 0x5, 0x17f, 0xc0, 0x2, 0x539, 0x53a, 0x5, 0x199, 
-    0xcd, 0x2, 0x53a, 0xfa, 0x3, 0x2, 0x2, 0x2, 0x53b, 0x53c, 0x5, 0x199, 
-    0xcd, 0x2, 0x53c, 0x53d, 0x5, 0x177, 0xbc, 0x2, 0x53d, 0x53e, 0x5, 0x191, 
-    0xc9, 0x2, 0x53e, 0x53f, 0x5, 0x183, 0xc2, 0x2, 0x53f, 0x540, 0x5, 0x17f, 
-    0xc0, 0x2, 0x540, 0xfc, 0x3, 0x2, 0x2, 0x2, 0x541, 0x542, 0x5, 0x199, 
-    0xcd, 0x2, 0x542, 0x543, 0x5, 0x17f, 0xc0, 0x2, 0x543, 0x544, 0x5, 0x18d, 
-    0xc7, 0x2, 0x544, 0x545, 0x5, 0x193, 0xca, 0x2, 0x545, 0x546, 0x5, 0x177, 
-    0xbc, 0x2, 0x546, 0x547, 0x5, 0x17d, 0xbf, 0x2, 0x547, 0xfe, 0x3, 0x2, 
-    0x2, 0x2, 0x548, 0x549, 0x5, 0x199, 0xcd, 0x2, 0x549, 0x54a, 0x5, 0x17f, 
-    0xc0, 0x2, 0x54a, 0x54b, 0x5, 0x18f, 0xc8, 0x2, 0x54b, 0x54c, 0x5, 0x193, 
-    0xca, 0x2, 0x54c, 0x54d, 0x5, 0x1a1, 0xd1, 0x2, 0x54d, 0x54e, 0x5, 0x17f, 
-    0xc0, 0x2, 0x54e, 0x100, 0x3, 0x2, 0x2, 0x2, 0x54f, 0x550, 0x5, 0x199, 
-    0xcd, 0x2, 0x550, 0x551, 0x5, 0x17f, 0xc0, 0x2, 0x551, 0x552, 0x5, 0x191, 
-    0xc9, 0x2, 0x552, 0x553, 0x5, 0x177, 0xbc, 0x2, 0x553, 0x554, 0x5, 0x18f, 
-    0xc8, 0x2, 0x554, 0x555, 0x5, 0x17f, 0xc0, 0x2, 0x555, 0x102, 0x3, 0x2, 
-    0x2, 0x2, 0x556, 0x557, 0x5, 0x199, 0xcd, 0x2, 0x557, 0x558, 0x5, 0x17f, 
-    0xc0, 0x2, 0x558, 0x559, 0x5, 0x195, 0xcb, 0x2, 0x559, 0x55a, 0x5, 0x18d, 
-    0xc7, 0x2, 0x55a, 0x55b, 0x5, 0x177, 0xbc, 0x2, 0x55b, 0x55c, 0x5, 0x17b, 
-    0xbe, 0x2, 0x55c, 0x55d, 0x5, 0x17f, 0xc0, 0x2, 0x55d, 0x104, 0x3, 0x2, 
-    0x2, 0x2, 0x55e, 0x55f, 0x5, 0x199, 0xcd, 0x2, 0x55f, 0x560, 0x5, 0x17f, 
-    0xc0, 0x2, 0x560, 0x561, 0x5, 0x195, 0xcb, 0x2, 0x561, 0x562, 0x5, 0x18d, 
-    0xc7, 0x2, 0x562, 0x563, 0x5, 0x187, 0xc4, 0x2, 0x563, 0x564, 0x5, 0x17b, 
-    0xbe, 0x2, 0x564, 0x565, 0x5, 0x177, 0xbc, 0x2, 0x565, 0x106, 0x3, 0x2, 
-    0x2, 0x2, 0x566, 0x567, 0x5, 0x199, 0xcd, 0x2, 0x567, 0x568, 0x5, 0x17f, 
-    0xc0, 0x2, 0x568, 0x569, 0x5, 0x195, 0xcb, 0x2, 0x569, 0x56a, 0x5, 0x18d, 
-    0xc7, 0x2, 0x56a, 0x56b, 0x5, 0x187, 0xc4, 0x2, 0x56b, 0x56c, 0x5, 0x17b, 
-    0xbe, 0x2, 0x56c, 0x56d, 0x5, 0x177, 0xbc, 0x2, 0x56d, 0x56e, 0x5, 0x19d, 
-    0xcf, 0x2, 0x56e, 0x56f, 0x5, 0x17f, 0xc0, 0x2, 0x56f, 0x570, 0x5, 0x17d, 
-    0xbf, 0x2, 0x570, 0x108, 0x3, 0x2, 0x2, 0x2, 0x571, 0x572, 0x5, 0x199, 
-    0xcd, 0x2, 0x572, 0x573, 0x5, 0x187, 0xc4, 0x2, 0x573, 0x574, 0x5, 0x183, 
-    0xc2, 0x2, 0x574, 0x575, 0x5, 0x185, 0xc3, 0x2, 0x575, 0x576, 0x5, 0x19d, 
-    0xcf, 0x2, 0x576, 0x10a, 0x3, 0x2, 0x2, 0x2, 0x577, 0x578, 0x5, 0x199, 
-    0xcd, 0x2, 0x578, 0x579, 0x5, 0x193, 0xca, 0x2, 0x579, 0x57a, 0x5, 0x18d, 
-    0xc7, 0x2, 0x57a, 0x57b, 0x5, 0x18d, 0xc7, 0x2, 0x57b, 0x57c, 0x5, 0x19f, 
-    0xd0, 0x2, 0x57c, 0x57d, 0x5, 0x195, 0xcb, 0x2, 0x57d, 0x10c, 0x3, 0x2, 
-    0x2, 0x2, 0x57e, 0x57f, 0x5, 0x19b, 0xce, 0x2, 0x57f, 0x580, 0x5, 0x177, 
-    0xbc, 0x2, 0x580, 0x581, 0x5, 0x18f, 0xc8, 0x2, 0x581, 0x582, 0x5, 0x195, 
-    0xcb, 0x2, 0x582, 0x583, 0x5, 0x18d, 0xc7, 0x2, 0x583, 0x584, 0x5, 0x17f, 
-    0xc0, 0x2, 0x584, 0x10e, 0x3, 0x2, 0x2, 0x2, 0x585, 0x586, 0x5, 0x19b, 
-    0xce, 0x2, 0x586, 0x587, 0x5, 0x17f, 0xc0, 0x2, 0x587, 0x588, 0x5, 0x17b, 
-    0xbe, 0x2, 0x588, 0x589, 0x5, 0x193, 0xca, 0x2, 0x589, 0x58a, 0x5, 0x191, 
-    0xc9, 0x2, 0x58a, 0x58b, 0x5, 0x17d, 0xbf, 0x2, 0x58b, 0x110, 0x3, 0x2, 
-    0x2, 0x2, 0x58c, 0x58d, 0x5, 0x19b, 0xce, 0x2, 0x58d, 0x58e, 0x5, 0x17f, 
-    0xc0, 0x2, 0x58e, 0x58f, 0x5, 0x18d, 0xc7, 0x2, 0x58f, 0x590, 0x5, 0x17f, 
-    0xc0, 0x2, 0x590, 0x591, 0x5, 0x17b, 0xbe, 0x2, 0x591, 0x592, 0x5, 0x19d, 
-    0xcf, 0x2, 0x592, 0x112, 0x3, 0x2, 0x2, 0x2, 0x593, 0x594, 0x5, 0x19b, 
-    0xce, 0x2, 0x594, 0x595, 0x5, 0x17f, 0xc0, 0x2, 0x595, 0x596, 0x5, 0x18f, 
-    0xc8, 0x2, 0x596, 0x597, 0x5, 0x187, 0xc4, 0x2, 0x597, 0x114, 0x3, 0x2, 
-    0x2, 0x2, 0x598, 0x599, 0x5, 0x19b, 0xce, 0x2, 0x599, 0x59a, 0x5, 0x17f, 
-    0xc0, 0x2, 0x59a, 0x59b, 0x5, 0x191, 0xc9, 0x2, 0x59b, 0x59c, 0x5, 0x17d, 
-    0xbf, 0x2, 0x59c, 0x59d, 0x5, 0x19b, 0xce, 0x2, 0x59d, 0x116, 0x3, 0x2, 
-    0x2, 0x2, 0x59e, 0x59f, 0x5, 0x19b, 0xce, 0x2, 0x59f, 0x5a0, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5a0, 0x5a1, 0x5, 0x19d, 0xcf, 0x2, 0x5a1, 0x118, 0x3, 0x2, 
-    0x2, 0x2, 0x5a2, 0x5a3, 0x5, 0x19b, 0xce, 0x2, 0x5a3, 0x5a4, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5a4, 0x5a5, 0x5, 0x19d, 0xcf, 0x2, 0x5a5, 0x5a6, 0x5, 0x19d, 
-    0xcf, 0x2, 0x5a6, 0x5a7, 0x5, 0x187, 0xc4, 0x2, 0x5a7, 0x5a8, 0x5, 0x191, 
-    0xc9, 0x2, 0x5a8, 0x5a9, 0x5, 0x183, 0xc2, 0x2, 0x5a9, 0x5aa, 0x5, 0x19b, 
-    0xce, 0x2, 0x5aa, 0x11a, 0x3, 0x2, 0x2, 0x2, 0x5ab, 0x5ac, 0x5, 0x19b, 
-    0xce, 0x2, 0x5ac, 0x5ad, 0x5, 0x185, 0xc3, 0x2, 0x5ad, 0x5ae, 0x5, 0x193, 
-    0xca, 0x2, 0x5ae, 0x5af, 0x5, 0x1a3, 0xd2, 0x2, 0x5af, 0x11c, 0x3, 0x2, 
-    0x2, 0x2, 0x5b0, 0x5b1, 0x5, 0x19b, 0xce, 0x2, 0x5b1, 0x5b2, 0x5, 0x193, 
-    0xca, 0x2, 0x5b2, 0x5b3, 0x5, 0x19f, 0xd0, 0x2, 0x5b3, 0x5b4, 0x5, 0x199, 
-    0xcd, 0x2, 0x5b4, 0x5b5, 0x5, 0x17b, 0xbe, 0x2, 0x5b5, 0x5b6, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5b6, 0x11e, 0x3, 0x2, 0x2, 0x2, 0x5b7, 0x5b8, 0x5, 0x19b, 
-    0xce, 0x2, 0x5b8, 0x5b9, 0x5, 0x19d, 0xcf, 0x2, 0x5b9, 0x5ba, 0x5, 0x177, 
-    0xbc, 0x2, 0x5ba, 0x5bb, 0x5, 0x199, 0xcd, 0x2, 0x5bb, 0x5bc, 0x5, 0x19d, 
-    0xcf, 0x2, 0x5bc, 0x120, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x5be, 0x5, 0x19b, 
-    0xce, 0x2, 0x5be, 0x5bf, 0x5, 0x19d, 0xcf, 0x2, 0x5bf, 0x5c0, 0x5, 0x193, 
-    0xca, 0x2, 0x5c0, 0x5c1, 0x5, 0x195, 0xcb, 0x2, 0x5c1, 0x122, 0x3, 0x2, 
-    0x2, 0x2, 0x5c2, 0x5c3, 0x5, 0x19b, 0xce, 0x2, 0x5c3, 0x5c4, 0x5, 0x19f, 
-    0xd0, 0x2, 0x5c4, 0x5c5, 0x5, 0x179, 0xbd, 0x2, 0x5c5, 0x5c6, 0x5, 0x19b, 
-    0xce, 0x2, 0x5c6, 0x5c7, 0x5, 0x19d, 0xcf, 0x2, 0x5c7, 0x5c8, 0x5, 0x199, 
-    0xcd, 0x2, 0x5c8, 0x5c9, 0x5, 0x187, 0xc4, 0x2, 0x5c9, 0x5ca, 0x5, 0x191, 
-    0xc9, 0x2, 0x5ca, 0x5cb, 0x5, 0x183, 0xc2, 0x2, 0x5cb, 0x124, 0x3, 0x2, 
-    0x2, 0x2, 0x5cc, 0x5cd, 0x5, 0x19b, 0xce, 0x2, 0x5cd, 0x5ce, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x5ce, 0x5cf, 0x5, 0x191, 0xc9, 0x2, 0x5cf, 0x5d0, 0x5, 0x17b, 
-    0xbe, 0x2, 0x5d0, 0x126, 0x3, 0x2, 0x2, 0x2, 0x5d1, 0x5d2, 0x5, 0x19b, 
-    0xce, 0x2, 0x5d2, 0x5d3, 0x5, 0x1a7, 0xd4, 0x2, 0x5d3, 0x5d4, 0x5, 0x191, 
-    0xc9, 0x2, 0x5d4, 0x5d5, 0x5, 0x19d, 0xcf, 0x2, 0x5d5, 0x5d6, 0x5, 0x177, 
-    0xbc, 0x2, 0x5d6, 0x5d7, 0x5, 0x1a5, 0xd3, 0x2, 0x5d7, 0x128, 0x3, 0x2, 
-    0x2, 0x2, 0x5d8, 0x5d9, 0x5, 0x19b, 0xce, 0x2, 0x5d9, 0x5da, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x5da, 0x5db, 0x5, 0x19b, 0xce, 0x2, 0x5db, 0x5dc, 0x5, 0x19d, 
-    0xcf, 0x2, 0x5dc, 0x5dd, 0x5, 0x17f, 0xc0, 0x2, 0x5dd, 0x5de, 0x5, 0x18f, 
-    0xc8, 0x2, 0x5de, 0x12a, 0x3, 0x2, 0x2, 0x2, 0x5df, 0x5e0, 0x5, 0x19d, 
-    0xcf, 0x2, 0x5e0, 0x5e1, 0x5, 0x177, 0xbc, 0x2, 0x5e1, 0x5e2, 0x5, 0x179, 
-    0xbd, 0x2, 0x5e2, 0x5e3, 0x5, 0x18d, 0xc7, 0x2, 0x5e3, 0x5e4, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5e4, 0x12c, 0x3, 0x2, 0x2, 0x2, 0x5e5, 0x5e6, 0x5, 0x19d, 
-    0xcf, 0x2, 0x5e6, 0x5e7, 0x5, 0x177, 0xbc, 0x2, 0x5e7, 0x5e8, 0x5, 0x179, 
-    0xbd, 0x2, 0x5e8, 0x5e9, 0x5, 0x18d, 0xc7, 0x2, 0x5e9, 0x5ea, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5ea, 0x5eb, 0x5, 0x19b, 0xce, 0x2, 0x5eb, 0x12e, 0x3, 0x2, 
-    0x2, 0x2, 0x5ec, 0x5ed, 0x5, 0x19d, 0xcf, 0x2, 0x5ed, 0x5ee, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5ee, 0x5ef, 0x5, 0x18f, 0xc8, 0x2, 0x5ef, 0x5f0, 0x5, 0x195, 
-    0xcb, 0x2, 0x5f0, 0x5f1, 0x5, 0x193, 0xca, 0x2, 0x5f1, 0x5f2, 0x5, 0x199, 
-    0xcd, 0x2, 0x5f2, 0x5f3, 0x5, 0x177, 0xbc, 0x2, 0x5f3, 0x5f4, 0x5, 0x199, 
-    0xcd, 0x2, 0x5f4, 0x5f5, 0x5, 0x1a7, 0xd4, 0x2, 0x5f5, 0x130, 0x3, 0x2, 
-    0x2, 0x2, 0x5f6, 0x5f7, 0x5, 0x19d, 0xcf, 0x2, 0x5f7, 0x5f8, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5f8, 0x5f9, 0x5, 0x19b, 0xce, 0x2, 0x5f9, 0x5fa, 0x5, 0x19d, 
-    0xcf, 0x2, 0x5fa, 0x132, 0x3, 0x2, 0x2, 0x2, 0x5fb, 0x5fc, 0x5, 0x19d, 
-    0xcf, 0x2, 0x5fc, 0x5fd, 0x5, 0x185, 0xc3, 0x2, 0x5fd, 0x5fe, 0x5, 0x17f, 
-    0xc0, 0x2, 0x5fe, 0x5ff, 0x5, 0x191, 0xc9, 0x2, 0x5ff, 0x134, 0x3, 0x2, 
-    0x2, 0x2, 0x600, 0x601, 0x5, 0x19d, 0xcf, 0x2, 0x601, 0x602, 0x5, 0x187, 
-    0xc4, 0x2, 0x602, 0x603, 0x5, 0x17f, 0xc0, 0x2, 0x603, 0x604, 0x5, 0x19b, 
-    0xce, 0x2, 0x604, 0x136, 0x3, 0x2, 0x2, 0x2, 0x605, 0x606, 0x5, 0x19d, 
-    0xcf, 0x2, 0x606, 0x607, 0x5, 0x187, 0xc4, 0x2, 0x607, 0x608, 0x5, 0x18f, 
-    0xc8, 0x2, 0x608, 0x609, 0x5, 0x17f, 0xc0, 0x2, 0x609, 0x60a, 0x5, 0x193, 
-    0xca, 0x2, 0x60a, 0x60b, 0x5, 0x19f, 0xd0, 0x2, 0x60b, 0x60c, 0x5, 0x19d, 
-    0xcf, 0x2, 0x60c, 0x138, 0x3, 0x2, 0x2, 0x2, 0x60d, 0x60e, 0x5, 0x19d, 
-    0xcf, 0x2, 0x60e, 0x60f, 0x5, 0x187, 0xc4, 0x2, 0x60f, 0x610, 0x5, 0x18f, 
-    0xc8, 0x2, 0x610, 0x611, 0x5, 0x17f, 0xc0, 0x2, 0x611, 0x612, 0x5, 0x19b, 
-    0xce, 0x2, 0x612, 0x613, 0x5, 0x19d, 0xcf, 0x2, 0x613, 0x614, 0x5, 0x177, 
-    0xbc, 0x2, 0x614, 0x615, 0x5, 0x18f, 0xc8, 0x2, 0x615, 0x616, 0x5, 0x195, 
-    0xcb, 0x2, 0x616, 0x13a, 0x3, 0x2, 0x2, 0x2, 0x617, 0x618, 0x5, 0x19d, 
-    0xcf, 0x2, 0x618, 0x619, 0x5, 0x193, 0xca, 0x2, 0x619, 0x13c, 0x3, 0x2, 
-    0x2, 0x2, 0x61a, 0x61b, 0x5, 0x19d, 0xcf, 0x2, 0x61b, 0x61c, 0x5, 0x193, 
-    0xca, 0x2, 0x61c, 0x61d, 0x5, 0x195, 0xcb, 0x2, 0x61d, 0x13e, 0x3, 0x2, 
-    0x2, 0x2, 0x61e, 0x61f, 0x5, 0x19d, 0xcf, 0x2, 0x61f, 0x620, 0x5, 0x193, 
-    0xca, 0x2, 0x620, 0x621, 0x5, 0x19d, 0xcf, 0x2, 0x621, 0x622, 0x5, 0x177, 
-    0xbc, 0x2, 0x622, 0x623, 0x5, 0x18d, 0xc7, 0x2, 0x623, 0x624, 0x5, 0x19b, 
-    0xce, 0x2, 0x624, 0x140, 0x3, 0x2, 0x2, 0x2, 0x625, 0x626, 0x5, 0x19d, 
-    0xcf, 0x2, 0x626, 0x627, 0x5, 0x199, 0xcd, 0x2, 0x627, 0x628, 0x5, 0x177, 
-    0xbc, 0x2, 0x628, 0x629, 0x5, 0x187, 0xc4, 0x2, 0x629, 0x62a, 0x5, 0x18d, 
-    0xc7, 0x2, 0x62a, 0x62b, 0x5, 0x187, 0xc4, 0x2, 0x62b, 0x62c, 0x5, 0x191, 
-    0xc9, 0x2, 0x62c, 0x62d, 0x5, 0x183, 0xc2, 0x2, 0x62d, 0x142, 0x3, 0x2, 
-    0x2, 0x2, 0x62e, 0x62f, 0x5, 0x19d, 0xcf, 0x2, 0x62f, 0x630, 0x5, 0x199, 
-    0xcd, 0x2, 0x630, 0x631, 0x5, 0x187, 0xc4, 0x2, 0x631, 0x632, 0x5, 0x18f, 
-    0xc8, 0x2, 0x632, 0x144, 0x3, 0x2, 0x2, 0x2, 0x633, 0x634, 0x5, 0x19d, 
-    0xcf, 0x2, 0x634, 0x635, 0x5, 0x199, 0xcd, 0x2, 0x635, 0x636, 0x5, 0x19f, 
-    0xd0, 0x2, 0x636, 0x637, 0x5, 0x191, 0xc9, 0x2, 0x637, 0x638, 0x5, 0x17b, 
-    0xbe, 0x2, 0x638, 0x639, 0x5, 0x177, 0xbc, 0x2, 0x639, 0x63a, 0x5, 0x19d, 
-    0xcf, 0x2, 0x63a, 0x63b, 0x5, 0x17f, 0xc0, 0x2, 0x63b, 0x146, 0x3, 0x2, 
-    0x2, 0x2, 0x63c, 0x63d, 0x5, 0x19d, 0xcf, 0x2, 0x63d, 0x63e, 0x5, 0x19d, 
-    0xcf, 0x2, 0x63e, 0x63f, 0x5, 0x18d, 0xc7, 0x2, 0x63f, 0x148, 0x3, 0x2, 
-    0x2, 0x2, 0x640, 0x641, 0x5, 0x19d, 0xcf, 0x2, 0x641, 0x642, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x642, 0x643, 0x5, 0x195, 0xcb, 0x2, 0x643, 0x644, 0x5, 0x17f, 
-    0xc0, 0x2, 0x644, 0x14a, 0x3, 0x2, 0x2, 0x2, 0x645, 0x646, 0x5, 0x19f, 
-    0xd0, 0x2, 0x646, 0x647, 0x5, 0x191, 0xc9, 0x2, 0x647, 0x648, 0x5, 0x187, 
-    0xc4, 0x2, 0x648, 0x649, 0x5, 0x193, 0xca, 0x2, 0x649, 0x64a, 0x5, 0x191, 
-    0xc9, 0x2, 0x64a, 0x14c, 0x3, 0x2, 0x2, 0x2, 0x64b, 0x64c, 0x5, 0x19f, 
-    0xd0, 0x2, 0x64c, 0x64d, 0x5, 0x195, 0xcb, 0x2, 0x64d, 0x64e, 0x5, 0x17d, 
-    0xbf, 0x2, 0x64e, 0x64f, 0x5, 0x177, 0xbc, 0x2, 0x64f, 0x650, 0x5, 0x19d, 
-    0xcf, 0x2, 0x650, 0x651, 0x5, 0x17f, 0xc0, 0x2, 0x651, 0x14e, 0x3, 0x2, 
-    0x2, 0x2, 0x652, 0x653, 0x5, 0x19f, 0xd0, 0x2, 0x653, 0x654, 0x5, 0x19b, 
-    0xce, 0x2, 0x654, 0x655, 0x5, 0x17f, 0xc0, 0x2, 0x655, 0x150, 0x3, 0x2, 
-    0x2, 0x2, 0x656, 0x657, 0x5, 0x19f, 0xd0, 0x2, 0x657, 0x658, 0x5, 0x19b, 
-    0xce, 0x2, 0x658, 0x659, 0x5, 0x187, 0xc4, 0x2, 0x659, 0x65a, 0x5, 0x191, 
-    0xc9, 0x2, 0x65a, 0x65b, 0x5, 0x183, 0xc2, 0x2, 0x65b, 0x152, 0x3, 0x2, 
-    0x2, 0x2, 0x65c, 0x65d, 0x5, 0x19f, 0xd0, 0x2, 0x65d, 0x65e, 0x5, 0x19f, 
-    0xd0, 0x2, 0x65e, 0x65f, 0x5, 0x187, 0xc4, 0x2, 0x65f, 0x660, 0x5, 0x17d, 
-    0xbf, 0x2, 0x660, 0x154, 0x3, 0x2, 0x2, 0x2, 0x661, 0x662, 0x5, 0x1a1, 
-    0xd1, 0x2, 0x662, 0x663, 0x5, 0x177, 0xbc, 0x2, 0x663, 0x664, 0x5, 0x18d, 
-    0xc7, 0x2, 0x664, 0x665, 0x5, 0x19f, 0xd0, 0x2, 0x665, 0x666, 0x5, 0x17f, 
-    0xc0, 0x2, 0x666, 0x667, 0x5, 0x19b, 0xce, 0x2, 0x667, 0x156, 0x3, 0x2, 
-    0x2, 0x2, 0x668, 0x669, 0x5, 0x1a1, 0xd1, 0x2, 0x669, 0x66a, 0x5, 0x187, 
-    0xc4, 0x2, 0x66a, 0x66b, 0x5, 0x17f, 0xc0, 0x2, 0x66b, 0x66c, 0x5, 0x1a3, 
-    0xd2, 0x2, 0x66c, 0x158, 0x3, 0x2, 0x2, 0x2, 0x66d, 0x66e, 0x5, 0x1a1, 
-    0xd1, 0x2, 0x66e, 0x66f, 0x5, 0x193, 0xca, 0x2, 0x66f, 0x670, 0x5, 0x18d, 
-    0xc7, 0x2, 0x670, 0x671, 0x5, 0x19f, 0xd0, 0x2, 0x671, 0x672, 0x5, 0x18f, 
-    0xc8, 0x2, 0x672, 0x673, 0x5, 0x17f, 0xc0, 0x2, 0x673, 0x15a, 0x3, 0x2, 
-    0x2, 0x2, 0x674, 0x675, 0x5, 0x1a3, 0xd2, 0x2, 0x675, 0x676, 0x5, 0x177, 
-    0xbc, 0x2, 0x676, 0x677, 0x5, 0x19d, 0xcf, 0x2, 0x677, 0x678, 0x5, 0x17b, 
-    0xbe, 0x2, 0x678, 0x679, 0x5, 0x185, 0xc3, 0x2, 0x679, 0x15c, 0x3, 0x2, 
-    0x2, 0x2, 0x67a, 0x67b, 0x5, 0x1a3, 0xd2, 0x2, 0x67b, 0x67c, 0x5, 0x17f, 
-    0xc0, 0x2, 0x67c, 0x67d, 0x5, 0x17f, 0xc0, 0x2, 0x67d, 0x67e, 0x5, 0x18b, 
-    0xc6, 0x2, 0x67e, 0x15e, 0x3, 0x2, 0x2, 0x2, 0x67f, 0x680, 0x5, 0x1a3, 
-    0xd2, 0x2, 0x680, 0x681, 0x5, 0x185, 0xc3, 0x2, 0x681, 0x682, 0x5, 0x17f, 
-    0xc0, 0x2, 0x682, 0x683, 0x5, 0x191, 0xc9, 0x2, 0x683, 0x160, 0x3, 0x2, 
-    0x2, 0x2, 0x684, 0x685, 0x5, 0x1a3, 0xd2, 0x2, 0x685, 0x686, 0x5, 0x185, 
-    0xc3, 0x2, 0x686, 0x687, 0x5, 0x17f, 0xc0, 0x2, 0x687, 0x688, 0x5, 0x199, 
-    0xcd, 0x2, 0x688, 0x689, 0x5, 0x17f, 0xc0, 0x2, 0x689, 0x162, 0x3, 0x2, 
-    0x2, 0x2, 0x68a, 0x68b, 0x5, 0x1a3, 0xd2, 0x2, 0x68b, 0x68c, 0x5, 0x187, 
-    0xc4, 0x2, 0x68c, 0x68d, 0x5, 0x19d, 0xcf, 0x2, 0x68d, 0x68e, 0x5, 0x185, 
-    0xc3, 0x2, 0x68e, 0x164, 0x3, 0x2, 0x2, 0x2, 0x68f, 0x690, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x690, 0x691, 0x5, 0x17f, 0xc0, 0x2, 0x691, 0x692, 0x5, 0x177, 
-    0xbc, 0x2, 0x692, 0x693, 0x5, 0x199, 0xcd, 0x2, 0x693, 0x69a, 0x3, 0x2, 
-    0x2, 0x2, 0x694, 0x695, 0x5, 0x1a7, 0xd4, 0x2, 0x695, 0x696, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x696, 0x697, 0x5, 0x1a7, 0xd4, 0x2, 0x697, 0x698, 0x5, 0x1a7, 
-    0xd4, 0x2, 0x698, 0x69a, 0x3, 0x2, 0x2, 0x2, 0x699, 0x68f, 0x3, 0x2, 
-    0x2, 0x2, 0x699, 0x694, 0x3, 0x2, 0x2, 0x2, 0x69a, 0x166, 0x3, 0x2, 
-    0x2, 0x2, 0x69b, 0x69c, 0x7, 0x68, 0x2, 0x2, 0x69c, 0x69d, 0x7, 0x63, 
-    0x2, 0x2, 0x69d, 0x69e, 0x7, 0x6e, 0x2, 0x2, 0x69e, 0x69f, 0x7, 0x75, 
-    0x2, 0x2, 0x69f, 0x6a0, 0x7, 0x67, 0x2, 0x2, 0x6a0, 0x168, 0x3, 0x2, 
-    0x2, 0x2, 0x6a1, 0x6a2, 0x7, 0x76, 0x2, 0x2, 0x6a2, 0x6a3, 0x7, 0x74, 
-    0x2, 0x2, 0x6a3, 0x6a4, 0x7, 0x77, 0x2, 0x2, 0x6a4, 0x6a5, 0x7, 0x67, 
-    0x2, 0x2, 0x6a5, 0x16a, 0x3, 0x2, 0x2, 0x2, 0x6a6, 0x6a9, 0x5, 0x1ab, 
-    0xd6, 0x2, 0x6a7, 0x6a9, 0x5, 0x1ed, 0xf7, 0x2, 0x6a8, 0x6a6, 0x3, 0x2, 
-    0x2, 0x2, 0x6a8, 0x6a7, 0x3, 0x2, 0x2, 0x2, 0x6a9, 0x6af, 0x3, 0x2, 
-    0x2, 0x2, 0x6aa, 0x6ae, 0x5, 0x1ab, 0xd6, 0x2, 0x6ab, 0x6ae, 0x5, 0x1ed, 
-    0xf7, 0x2, 0x6ac, 0x6ae, 0x5, 0x1af, 0xd8, 0x2, 0x6ad, 0x6aa, 0x3, 0x2, 
-    0x2, 0x2, 0x6ad, 0x6ab, 0x3, 0x2, 0x2, 0x2, 0x6ad, 0x6ac, 0x3, 0x2, 
-    0x2, 0x2, 0x6ae, 0x6b1, 0x3, 0x2, 0x2, 0x2, 0x6af, 0x6ad, 0x3, 0x2, 
-    0x2, 0x2, 0x6af, 0x6b0, 0x3, 0x2, 0x2, 0x2, 0x6b0, 0x6d1, 0x3, 0x2, 
-    0x2, 0x2, 0x6b1, 0x6af, 0x3, 0x2, 0x2, 0x2, 0x6b2, 0x6bc, 0x5, 0x1b7, 
-    0xdc, 0x2, 0x6b3, 0x6bb, 0xa, 0x2, 0x2, 0x2, 0x6b4, 0x6b5, 0x5, 0x1b9, 
-    0xdd, 0x2, 0x6b5, 0x6b6, 0xb, 0x2, 0x2, 0x2, 0x6b6, 0x6bb, 0x3, 0x2, 
-    0x2, 0x2, 0x6b7, 0x6b8, 0x5, 0x1b7, 0xdc, 0x2, 0x6b8, 0x6b9, 0x5, 0x1b7, 
-    0xdc, 0x2, 0x6b9, 0x6bb, 0x3, 0x2, 0x2, 0x2, 0x6ba, 0x6b3, 0x3, 0x2, 
-    0x2, 0x2, 0x6ba, 0x6b4, 0x3, 0x2, 0x2, 0x2, 0x6ba, 0x6b7, 0x3, 0x2, 
-    0x2, 0x2, 0x6bb, 0x6be, 0x3, 0x2, 0x2, 0x2, 0x6bc, 0x6ba, 0x3, 0x2, 
-    0x2, 0x2, 0x6bc, 0x6bd, 0x3, 0x2, 0x2, 0x2, 0x6bd, 0x6bf, 0x3, 0x2, 
-    0x2, 0x2, 0x6be, 0x6bc, 0x3, 0x2, 0x2, 0x2, 0x6bf, 0x6c0, 0x5, 0x1b7, 
-    0xdc, 0x2, 0x6c0, 0x6d1, 0x3, 0x2, 0x2, 0x2, 0x6c1, 0x6cb, 0x5, 0x1df, 
-    0xf0, 0x2, 0x6c2, 0x6ca, 0xa, 0x3, 0x2, 0x2, 0x6c3, 0x6c4, 0x5, 0x1b9, 
-    0xdd, 0x2, 0x6c4, 0x6c5, 0xb, 0x2, 0x2, 0x2, 0x6c5, 0x6ca, 0x3, 0x2, 
-    0x2, 0x2, 0x6c6, 0x6c7, 0x5, 0x1df, 0xf0, 0x2, 0x6c7, 0x6c8, 0x5, 0x1df, 
-    0xf0, 0x2, 0x6c8, 0x6ca, 0x3, 0x2, 0x2, 0x2, 0x6c9, 0x6c2, 0x3, 0x2, 
-    0x2, 0x2, 0x6c9, 0x6c3, 0x3, 0x2, 0x2, 0x2, 0x6c9, 0x6c6, 0x3, 0x2, 
-    0x2, 0x2, 0x6ca, 0x6cd, 0x3, 0x2, 0x2, 0x2, 0x6cb, 0x6c9, 0x3, 0x2, 
-    0x2, 0x2, 0x6cb, 0x6cc, 0x3, 0x2, 0x2, 0x2, 0x6cc, 0x6ce, 0x3, 0x2, 
-    0x2, 0x2, 0x6cd, 0x6cb, 0x3, 0x2, 0x2, 0x2, 0x6ce, 0x6cf, 0x5, 0x1df, 
-    0xf0, 0x2, 0x6cf, 0x6d1, 0x3, 0x2, 0x2, 0x2, 0x6d0, 0x6a8, 0x3, 0x2, 
-    0x2, 0x2, 0x6d0, 0x6b2, 0x3, 0x2, 0x2, 0x2, 0x6d0, 0x6c1, 0x3, 0x2, 
-    0x2, 0x2, 0x6d1, 0x16c, 0x3, 0x2, 0x2, 0x2, 0x6d2, 0x6d3, 0x5, 0x173, 
-    0xba, 0x2, 0x6d3, 0x6d7, 0x5, 0x1c3, 0xe2, 0x2, 0x6d4, 0x6d6, 0x5, 0x1b1, 
-    0xd9, 0x2, 0x6d5, 0x6d4, 0x3, 0x2, 0x2, 0x2, 0x6d6, 0x6d9, 0x3, 0x2, 
-    0x2, 0x2, 0x6d7, 0x6d5, 0x3, 0x2, 0x2, 0x2, 0x6d7, 0x6d8, 0x3, 0x2, 
-    0x2, 0x2, 0x6d8, 0x6dc, 0x3, 0x2, 0x2, 0x2, 0x6d9, 0x6d7, 0x3, 0x2, 
-    0x2, 0x2, 0x6da, 0x6dd, 0x5, 0x195, 0xcb, 0x2, 0x6db, 0x6dd, 0x5, 0x17f, 
-    0xc0, 0x2, 0x6dc, 0x6da, 0x3, 0x2, 0x2, 0x2, 0x6dc, 0x6db, 0x3, 0x2, 
-    0x2, 0x2, 0x6dd, 0x6e0, 0x3, 0x2, 0x2, 0x2, 0x6de, 0x6e1, 0x5, 0x1db, 
-    0xee, 0x2, 0x6df, 0x6e1, 0x5, 0x1c1, 0xe1, 0x2, 0x6e0, 0x6de, 0x3, 0x2, 
-    0x2, 0x2, 0x6e0, 0x6df, 0x3, 0x2, 0x2, 0x2, 0x6e0, 0x6e1, 0x3, 0x2, 
-    0x2, 0x2, 0x6e1, 0x6e3, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6e4, 0x5, 0x1af, 
-    0xd8, 0x2, 0x6e3, 0x6e2, 0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6e5, 0x3, 0x2, 
-    0x2, 0x2, 0x6e5, 0x6e3, 0x3, 0x2, 0x2, 0x2, 0x6e5, 0x6e6, 0x3, 0x2, 
-    0x2, 0x2, 0x6e6, 0x71f, 0x3, 0x2, 0x2, 0x2, 0x6e7, 0x6ea, 0x5, 0x173, 
-    0xba, 0x2, 0x6e8, 0x6eb, 0x5, 0x195, 0xcb, 0x2, 0x6e9, 0x6eb, 0x5, 0x17f, 
-    0xc0, 0x2, 0x6ea, 0x6e8, 0x3, 0x2, 0x2, 0x2, 0x6ea, 0x6e9, 0x3, 0x2, 
-    0x2, 0x2, 0x6eb, 0x6ee, 0x3, 0x2, 0x2, 0x2, 0x6ec, 0x6ef, 0x5, 0x1db, 
-    0xee, 0x2, 0x6ed, 0x6ef, 0x5, 0x1c1, 0xe1, 0x2, 0x6ee, 0x6ec, 0x3, 0x2, 
-    0x2, 0x2, 0x6ee, 0x6ed, 0x3, 0x2, 0x2, 0x2, 0x6ee, 0x6ef, 0x3, 0x2, 
-    0x2, 0x2, 0x6ef, 0x6f1, 0x3, 0x2, 0x2, 0x2, 0x6f0, 0x6f2, 0x5, 0x1af, 
-    0xd8, 0x2, 0x6f1, 0x6f0, 0x3, 0x2, 0x2, 0x2, 0x6f2, 0x6f3, 0x3, 0x2, 
-    0x2, 0x2, 0x6f3, 0x6f1, 0x3, 0x2, 0x2, 0x2, 0x6f3, 0x6f4, 0x3, 0x2, 
-    0x2, 0x2, 0x6f4, 0x71f, 0x3, 0x2, 0x2, 0x2, 0x6f5, 0x6f6, 0x5, 0x171, 
-    0xb9, 0x2, 0x6f6, 0x6fa, 0x5, 0x1c3, 0xe2, 0x2, 0x6f7, 0x6f9, 0x5, 0x1af, 
-    0xd8, 0x2, 0x6f8, 0x6f7, 0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6fc, 0x3, 0x2, 
-    0x2, 0x2, 0x6fa, 0x6f8, 0x3, 0x2, 0x2, 0x2, 0x6fa, 0x6fb, 0x3, 0x2, 
-    0x2, 0x2, 0x6fb, 0x6fd, 0x3, 0x2, 0x2, 0x2, 0x6fc, 0x6fa, 0x3, 0x2, 
-    0x2, 0x2, 0x6fd, 0x700, 0x5, 0x17f, 0xc0, 0x2, 0x6fe, 0x701, 0x5, 0x1db, 
-    0xee, 0x2, 0x6ff, 0x701, 0x5, 0x1c1, 0xe1, 0x2, 0x700, 0x6fe, 0x3, 0x2, 
-    0x2, 0x2, 0x700, 0x6ff, 0x3, 0x2, 0x2, 0x2, 0x700, 0x701, 0x3, 0x2, 
-    0x2, 0x2, 0x701, 0x703, 0x3, 0x2, 0x2, 0x2, 0x702, 0x704, 0x5, 0x1af, 
-    0xd8, 0x2, 0x703, 0x702, 0x3, 0x2, 0x2, 0x2, 0x704, 0x705, 0x3, 0x2, 
-    0x2, 0x2, 0x705, 0x703, 0x3, 0x2, 0x2, 0x2, 0x705, 0x706, 0x3, 0x2, 
-    0x2, 0x2, 0x706, 0x71f, 0x3, 0x2, 0x2, 0x2, 0x707, 0x708, 0x5, 0x1c3, 
-    0xe2, 0x2, 0x708, 0x709, 0x5, 0x171, 0xb9, 0x2, 0x709, 0x70c, 0x5, 0x17f, 
-    0xc0, 0x2, 0x70a, 0x70d, 0x5, 0x1db, 0xee, 0x2, 0x70b, 0x70d, 0x5, 0x1c1, 
-    0xe1, 0x2, 0x70c, 0x70a, 0x3, 0x2, 0x2, 0x2, 0x70c, 0x70b, 0x3, 0x2, 
-    0x2, 0x2, 0x70c, 0x70d, 0x3, 0x2, 0x2, 0x2, 0x70d, 0x70f, 0x3, 0x2, 
-    0x2, 0x2, 0x70e, 0x710, 0x5, 0x1af, 0xd8, 0x2, 0x70f, 0x70e, 0x3, 0x2, 
-    0x2, 0x2, 0x710, 0x711, 0x3, 0x2, 0x2, 0x2, 0x711, 0x70f, 0x3, 0x2, 
-    0x2, 0x2, 0x711, 0x712, 0x3, 0x2, 0x2, 0x2, 0x712, 0x71f, 0x3, 0x2, 
-    0x2, 0x2, 0x713, 0x714, 0x5, 0x171, 0xb9, 0x2, 0x714, 0x717, 0x5, 0x17f, 
-    0xc0, 0x2, 0x715, 0x718, 0x5, 0x1db, 0xee, 0x2, 0x716, 0x718, 0x5, 0x1c1, 
-    0xe1, 0x2, 0x717, 0x715, 0x3, 0x2, 0x2, 0x2, 0x717, 0x716, 0x3, 0x2, 
-    0x2, 0x2, 0x717, 0x718, 0x3, 0x2, 0x2, 0x2, 0x718, 0x71a, 0x3, 0x2, 
-    0x2, 0x2, 0x719, 0x71b, 0x5, 0x1af, 0xd8, 0x2, 0x71a, 0x719, 0x3, 0x2, 
-    0x2, 0x2, 0x71b, 0x71c, 0x3, 0x2, 0x2, 0x2, 0x71c, 0x71a, 0x3, 0x2, 
-    0x2, 0x2, 0x71c, 0x71d, 0x3, 0x2, 0x2, 0x2, 0x71d, 0x71f, 0x3, 0x2, 
-    0x2, 0x2, 0x71e, 0x6d2, 0x3, 0x2, 0x2, 0x2, 0x71e, 0x6e7, 0x3, 0x2, 
-    0x2, 0x2, 0x71e, 0x6f5, 0x3, 0x2, 0x2, 0x2, 0x71e, 0x707, 0x3, 0x2, 
-    0x2, 0x2, 0x71e, 0x713, 0x3, 0x2, 0x2, 0x2, 0x71f, 0x16e, 0x3, 0x2, 
-    0x2, 0x2, 0x720, 0x722, 0x7, 0x32, 0x2, 0x2, 0x721, 0x723, 0x5, 0x1ad, 
-    0xd7, 0x2, 0x722, 0x721, 0x3, 0x2, 0x2, 0x2, 0x723, 0x724, 0x3, 0x2, 
-    0x2, 0x2, 0x724, 0x722, 0x3, 0x2, 0x2, 0x2, 0x724, 0x725, 0x3, 0x2, 
-    0x2, 0x2, 0x725, 0x170, 0x3, 0x2, 0x2, 0x2, 0x726, 0x728, 0x5, 0x1af, 
-    0xd8, 0x2, 0x727, 0x726, 0x3, 0x2, 0x2, 0x2, 0x728, 0x729, 0x3, 0x2, 
-    0x2, 0x2, 0x729, 0x727, 0x3, 0x2, 0x2, 0x2, 0x729, 0x72a, 0x3, 0x2, 
-    0x2, 0x2, 0x72a, 0x172, 0x3, 0x2, 0x2, 0x2, 0x72b, 0x72c, 0x7, 0x32, 
-    0x2, 0x2, 0x72c, 0x72e, 0x5, 0x1a5, 0xd3, 0x2, 0x72d, 0x72f, 0x5, 0x1b1, 
-    0xd9, 0x2, 0x72e, 0x72d, 0x3, 0x2, 0x2, 0x2, 0x72f, 0x730, 0x3, 0x2, 
-    0x2, 0x2, 0x730, 0x72e, 0x3, 0x2, 0x2, 0x2, 0x730, 0x731, 0x3, 0x2, 
-    0x2, 0x2, 0x731, 0x174, 0x3, 0x2, 0x2, 0x2, 0x732, 0x73c, 0x5, 0x1e1, 
-    0xf1, 0x2, 0x733, 0x73b, 0xa, 0x4, 0x2, 0x2, 0x734, 0x735, 0x5, 0x1b9, 
-    0xdd, 0x2, 0x735, 0x736, 0xb, 0x2, 0x2, 0x2, 0x736, 0x73b, 0x3, 0x2, 
-    0x2, 0x2, 0x737, 0x738, 0x5, 0x1e1, 0xf1, 0x2, 0x738, 0x739, 0x5, 0x1e1, 
-    0xf1, 0x2, 0x739, 0x73b, 0x3, 0x2, 0x2, 0x2, 0x73a, 0x733, 0x3, 0x2, 
-    0x2, 0x2, 0x73a, 0x734, 0x3, 0x2, 0x2, 0x2, 0x73a, 0x737, 0x3, 0x2, 
-    0x2, 0x2, 0x73b, 0x73e, 0x3, 0x2, 0x2, 0x2, 0x73c, 0x73a, 0x3, 0x2, 
-    0x2, 0x2, 0x73c, 0x73d, 0x3, 0x2, 0x2, 0x2, 0x73d, 0x73f, 0x3, 0x2, 
-    0x2, 0x2, 0x73e, 0x73c, 0x3, 0x2, 0x2, 0x2, 0x73f, 0x740, 0x5, 0x1e1, 
-    0xf1, 0x2, 0x740, 0x176, 0x3, 0x2, 0x2, 0x2, 0x741, 0x742, 0x9, 0x5, 
-    0x2, 0x2, 0x742, 0x178, 0x3, 0x2, 0x2, 0x2, 0x743, 0x744, 0x9, 0x6, 
-    0x2, 0x2, 0x744, 0x17a, 0x3, 0x2, 0x2, 0x2, 0x745, 0x746, 0x9, 0x7, 
-    0x2, 0x2, 0x746, 0x17c, 0x3, 0x2, 0x2, 0x2, 0x747, 0x748, 0x9, 0x8, 
-    0x2, 0x2, 0x748, 0x17e, 0x3, 0x2, 0x2, 0x2, 0x749, 0x74a, 0x9, 0x9, 
-    0x2, 0x2, 0x74a, 0x180, 0x3, 0x2, 0x2, 0x2, 0x74b, 0x74c, 0x9, 0xa, 
-    0x2, 0x2, 0x74c, 0x182, 0x3, 0x2, 0x2, 0x2, 0x74d, 0x74e, 0x9, 0xb, 
-    0x2, 0x2, 0x74e, 0x184, 0x3, 0x2, 0x2, 0x2, 0x74f, 0x750, 0x9, 0xc, 
-    0x2, 0x2, 0x750, 0x186, 0x3, 0x2, 0x2, 0x2, 0x751, 0x752, 0x9, 0xd, 
-    0x2, 0x2, 0x752, 0x188, 0x3, 0x2, 0x2, 0x2, 0x753, 0x754, 0x9, 0xe, 
-    0x2, 0x2, 0x754, 0x18a, 0x3, 0x2, 0x2, 0x2, 0x755, 0x756, 0x9, 0xf, 
-    0x2, 0x2, 0x756, 0x18c, 0x3, 0x2, 0x2, 0x2, 0x757, 0x758, 0x9, 0x10, 
-    0x2, 0x2, 0x758, 0x18e, 0x3, 0x2, 0x2, 0x2, 0x759, 0x75a, 0x9, 0x11, 
-    0x2, 0x2, 0x75a, 0x190, 0x3, 0x2, 0x2, 0x2, 0x75b, 0x75c, 0x9, 0x12, 
-    0x2, 0x2, 0x75c, 0x192, 0x3, 0x2, 0x2, 0x2, 0x75d, 0x75e, 0x9, 0x13, 
-    0x2, 0x2, 0x75e, 0x194, 0x3, 0x2, 0x2, 0x2, 0x75f, 0x760, 0x9, 0x14, 
-    0x2, 0x2, 0x760, 0x196, 0x3, 0x2, 0x2, 0x2, 0x761, 0x762, 0x9, 0x15, 
-    0x2, 0x2, 0x762, 0x198, 0x3, 0x2, 0x2, 0x2, 0x763, 0x764, 0x9, 0x16, 
-    0x2, 0x2, 0x764, 0x19a, 0x3, 0x2, 0x2, 0x2, 0x765, 0x766, 0x9, 0x17, 
-    0x2, 0x2, 0x766, 0x19c, 0x3, 0x2, 0x2, 0x2, 0x767, 0x768, 0x9, 0x18, 
-    0x2, 0x2, 0x768, 0x19e, 0x3, 0x2, 0x2, 0x2, 0x769, 0x76a, 0x9, 0x19, 
-    0x2, 0x2, 0x76a, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x76b, 0x76c, 0x9, 0x1a, 
-    0x2, 0x2, 0x76c, 0x1a2, 0x3, 0x2, 0x2, 0x2, 0x76d, 0x76e, 0x9, 0x1b, 
-    0x2, 0x2, 0x76e, 0x1a4, 0x3, 0x2, 0x2, 0x2, 0x76f, 0x770, 0x9, 0x1c, 
-    0x2, 0x2, 0x770, 0x1a6, 0x3, 0x2, 0x2, 0x2, 0x771, 0x772, 0x9, 0x1d, 
-    0x2, 0x2, 0x772, 0x1a8, 0x3, 0x2, 0x2, 0x2, 0x773, 0x774, 0x9, 0x1e, 
-    0x2, 0x2, 0x774, 0x1aa, 0x3, 0x2, 0x2, 0x2, 0x775, 0x776, 0x9, 0x1f, 
-    0x2, 0x2, 0x776, 0x1ac, 0x3, 0x2, 0x2, 0x2, 0x777, 0x778, 0x9, 0x20, 
-    0x2, 0x2, 0x778, 0x1ae, 0x3, 0x2, 0x2, 0x2, 0x779, 0x77a, 0x9, 0x21, 
-    0x2, 0x2, 0x77a, 0x1b0, 0x3, 0x2, 0x2, 0x2, 0x77b, 0x77c, 0x9, 0x22, 
-    0x2, 0x2, 0x77c, 0x1b2, 0x3, 0x2, 0x2, 0x2, 0x77d, 0x77e, 0x7, 0x2f, 
-    0x2, 0x2, 0x77e, 0x77f, 0x7, 0x40, 0x2, 0x2, 0x77f, 0x1b4, 0x3, 0x2, 
-    0x2, 0x2, 0x780, 0x781, 0x7, 0x2c, 0x2, 0x2, 0x781, 0x1b6, 0x3, 0x2, 
-    0x2, 0x2, 0x782, 0x783, 0x7, 0x62, 0x2, 0x2, 0x783, 0x1b8, 0x3, 0x2, 
-    0x2, 0x2, 0x784, 0x785, 0x7, 0x5e, 0x2, 0x2, 0x785, 0x1ba, 0x3, 0x2, 
-    0x2, 0x2, 0x786, 0x787, 0x7, 0x3c, 0x2, 0x2, 0x787, 0x1bc, 0x3, 0x2, 
-    0x2, 0x2, 0x788, 0x789, 0x7, 0x2e, 0x2, 0x2, 0x789, 0x1be, 0x3, 0x2, 
-    0x2, 0x2, 0x78a, 0x78b, 0x7, 0x7e, 0x2, 0x2, 0x78b, 0x78c, 0x7, 0x7e, 
-    0x2, 0x2, 0x78c, 0x1c0, 0x3, 0x2, 0x2, 0x2, 0x78d, 0x78e, 0x7, 0x2f, 
-    0x2, 0x2, 0x78e, 0x1c2, 0x3, 0x2, 0x2, 0x2, 0x78f, 0x790, 0x7, 0x30, 
-    0x2, 0x2, 0x790, 0x1c4, 0x3, 0x2, 0x2, 0x2, 0x791, 0x792, 0x7, 0x3f, 
-    0x2, 0x2, 0x792, 0x793, 0x7, 0x3f, 0x2, 0x2, 0x793, 0x1c6, 0x3, 0x2, 
-    0x2, 0x2, 0x794, 0x795, 0x7, 0x3f, 0x2, 0x2, 0x795, 0x1c8, 0x3, 0x2, 
-    0x2, 0x2, 0x796, 0x797, 0x7, 0x40, 0x2, 0x2, 0x797, 0x798, 0x7, 0x3f, 
-    0x2, 0x2, 0x798, 0x1ca, 0x3, 0x2, 0x2, 0x2, 0x799, 0x79a, 0x7, 0x40, 
-    0x2, 0x2, 0x79a, 0x1cc, 0x3, 0x2, 0x2, 0x2, 0x79b, 0x79c, 0x7, 0x7d, 
-    0x2, 0x2, 0x79c, 0x1ce, 0x3, 0x2, 0x2, 0x2, 0x79d, 0x79e, 0x7, 0x5d, 
-    0x2, 0x2, 0x79e, 0x1d0, 0x3, 0x2, 0x2, 0x2, 0x79f, 0x7a0, 0x7, 0x3e, 
-    0x2, 0x2, 0x7a0, 0x7a1, 0x7, 0x3f, 0x2, 0x2, 0x7a1, 0x1d2, 0x3, 0x2, 
-    0x2, 0x2, 0x7a2, 0x7a3, 0x7, 0x2a, 0x2, 0x2, 0x7a3, 0x1d4, 0x3, 0x2, 
-    0x2, 0x2, 0x7a4, 0x7a5, 0x7, 0x3e, 0x2, 0x2, 0x7a5, 0x1d6, 0x3, 0x2, 
-    0x2, 0x2, 0x7a6, 0x7a7, 0x7, 0x23, 0x2, 0x2, 0x7a7, 0x7ab, 0x7, 0x3f, 
-    0x2, 0x2, 0x7a8, 0x7a9, 0x7, 0x3e, 0x2, 0x2, 0x7a9, 0x7ab, 0x7, 0x40, 
-    0x2, 0x2, 0x7aa, 0x7a6, 0x3, 0x2, 0x2, 0x2, 0x7aa, 0x7a8, 0x3, 0x2, 
-    0x2, 0x2, 0x7ab, 0x1d8, 0x3, 0x2, 0x2, 0x2, 0x7ac, 0x7ad, 0x7, 0x27, 
-    0x2, 0x2, 0x7ad, 0x1da, 0x3, 0x2, 0x2, 0x2, 0x7ae, 0x7af, 0x7, 0x2d, 
-    0x2, 0x2, 0x7af, 0x1dc, 0x3, 0x2, 0x2, 0x2, 0x7b0, 0x7b1, 0x7, 0x41, 
-    0x2, 0x2, 0x7b1, 0x1de, 0x3, 0x2, 0x2, 0x2, 0x7b2, 0x7b3, 0x7, 0x24, 
-    0x2, 0x2, 0x7b3, 0x1e0, 0x3, 0x2, 0x2, 0x2, 0x7b4, 0x7b5, 0x7, 0x29, 
-    0x2, 0x2, 0x7b5, 0x1e2, 0x3, 0x2, 0x2, 0x2, 0x7b6, 0x7b7, 0x7, 0x7f, 
-    0x2, 0x2, 0x7b7, 0x1e4, 0x3, 0x2, 0x2, 0x2, 0x7b8, 0x7b9, 0x7, 0x5f, 
-    0x2, 0x2, 0x7b9, 0x1e6, 0x3, 0x2, 0x2, 0x2, 0x7ba, 0x7bb, 0x7, 0x2b, 
-    0x2, 0x2, 0x7bb, 0x1e8, 0x3, 0x2, 0x2, 0x2, 0x7bc, 0x7bd, 0x7, 0x3d, 
-    0x2, 0x2, 0x7bd, 0x1ea, 0x3, 0x2, 0x2, 0x2, 0x7be, 0x7bf, 0x7, 0x31, 
-    0x2, 0x2, 0x7bf, 0x1ec, 0x3, 0x2, 0x2, 0x2, 0x7c0, 0x7c1, 0x7, 0x61, 
-    0x2, 0x2, 0x7c1, 0x1ee, 0x3, 0x2, 0x2, 0x2, 0x7c2, 0x7c3, 0x7, 0x31, 
-    0x2, 0x2, 0x7c3, 0x7c4, 0x7, 0x2c, 0x2, 0x2, 0x7c4, 0x7c8, 0x3, 0x2, 
-    0x2, 0x2, 0x7c5, 0x7c7, 0xb, 0x2, 0x2, 0x2, 0x7c6, 0x7c5, 0x3, 0x2, 
-    0x2, 0x2, 0x7c7, 0x7ca, 0x3, 0x2, 0x2, 0x2, 0x7c8, 0x7c9, 0x3, 0x2, 
-    0x2, 0x2, 0x7c8, 0x7c6, 0x3, 0x2, 0x2, 0x2, 0x7c9, 0x7cb, 0x3, 0x2, 
-    0x2, 0x2, 0x7ca, 0x7c8, 0x3, 0x2, 0x2, 0x2, 0x7cb, 0x7cc, 0x7, 0x2c, 
-    0x2, 0x2, 0x7cc, 0x7cd, 0x7, 0x31, 0x2, 0x2, 0x7cd, 0x7ce, 0x3, 0x2, 
-    0x2, 0x2, 0x7ce, 0x7cf, 0x8, 0xf8, 0x2, 0x2, 0x7cf, 0x1f0, 0x3, 0x2, 
-    0x2, 0x2, 0x7d0, 0x7d1, 0x7, 0x2f, 0x2, 0x2, 0x7d1, 0x7d2, 0x7, 0x2f, 
-    0x2, 0x2, 0x7d2, 0x7d6, 0x3, 0x2, 0x2, 0x2, 0x7d3, 0x7d5, 0xa, 0x23, 
-    0x2, 0x2, 0x7d4, 0x7d3, 0x3, 0x2, 0x2, 0x2, 0x7d5, 0x7d8, 0x3, 0x2, 
-    0x2, 0x2, 0x7d6, 0x7d4, 0x3, 0x2, 0x2, 0x2, 0x7d6, 0x7d7, 0x3, 0x2, 
-    0x2, 0x2, 0x7d7, 0x7da, 0x3, 0x2, 0x2, 0x2, 0x7d8, 0x7d6, 0x3, 0x2, 
-    0x2, 0x2, 0x7d9, 0x7db, 0x9, 0x24, 0x2, 0x2, 0x7da, 0x7d9, 0x3, 0x2, 
-    0x2, 0x2, 0x7db, 0x7dc, 0x3, 0x2, 0x2, 0x2, 0x7dc, 0x7dd, 0x8, 0xf9, 
-    0x2, 0x2, 0x7dd, 0x1f2, 0x3, 0x2, 0x2, 0x2, 0x7de, 0x7df, 0x9, 0x25, 
-    0x2, 0x2, 0x7df, 0x7e0, 0x3, 0x2, 0x2, 0x2, 0x7e0, 0x7e1, 0x8, 0xfa, 
-    0x2, 0x2, 0x7e1, 0x1f4, 0x3, 0x2, 0x2, 0x2, 0x26, 0x2, 0x233, 0x40f, 
-    0x699, 0x6a8, 0x6ad, 0x6af, 0x6ba, 0x6bc, 0x6c9, 0x6cb, 0x6d0, 0x6d7, 
-    0x6dc, 0x6e0, 0x6e5, 0x6ea, 0x6ee, 0x6f3, 0x6fa, 0x700, 0x705, 0x70c, 
-    0x711, 0x717, 0x71c, 0x71e, 0x724, 0x729, 0x730, 0x73a, 0x73c, 0x7aa, 
-    0x7c8, 0x7d6, 0x7da, 0x3, 0x8, 0x2, 0x2, 
+    0x3, 0x7a, 0x3, 0x7a, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 
+    0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7b, 0x3, 0x7c, 0x3, 0x7c, 
+    0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 0x3, 0x7c, 0x3, 
+    0x7c, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7d, 
+    0x3, 0x7d, 0x3, 0x7d, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 
+    0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 0x3, 0x7e, 
+    0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 0x7f, 0x3, 
+    0x7f, 0x3, 0x7f, 0x3, 0x80, 0x3, 0x80, 0x3, 0x80, 0x3, 0x80, 0x3, 0x80, 
+    0x3, 0x80, 0x3, 0x81, 0x3, 0x81, 0x3, 0x81, 0x3, 0x81, 0x3, 0x81, 0x3, 
+    0x81, 0x3, 0x81, 0x3, 0x82, 0x3, 0x82, 0x3, 0x82, 0x3, 0x82, 0x3, 0x82, 
+    0x3, 0x82, 0x3, 0x82, 0x3, 0x83, 0x3, 0x83, 0x3, 0x83, 0x3, 0x83, 0x3, 
+    0x83, 0x3, 0x83, 0x3, 0x83, 0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 
+    0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 0x3, 0x84, 0x3, 0x85, 0x3, 0x85, 0x3, 
+    0x85, 0x3, 0x85, 0x3, 0x85, 0x3, 0x85, 0x3, 0x85, 0x3, 0x85, 0x3, 0x86, 
+    0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 
+    0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 0x86, 0x3, 0x87, 0x3, 0x87, 0x3, 0x87, 
+    0x3, 0x87, 0x3, 0x87, 0x3, 0x87, 0x3, 0x88, 0x3, 0x88, 0x3, 0x88, 0x3, 
+    0x88, 0x3, 0x88, 0x3, 0x88, 0x3, 0x88, 0x3, 0x89, 0x3, 0x89, 0x3, 0x89, 
+    0x3, 0x89, 0x3, 0x89, 0x3, 0x89, 0x3, 0x89, 0x3, 0x8a, 0x3, 0x8a, 0x3, 
+    0x8a, 0x3, 0x8a, 0x3, 0x8a, 0x3, 0x8a, 0x3, 0x8a, 0x3, 0x8b, 0x3, 0x8b, 
+    0x3, 0x8b, 0x3, 0x8b, 0x3, 0x8b, 0x3, 0x8b, 0x3, 0x8b, 0x3, 0x8c, 0x3, 
+    0x8c, 0x3, 0x8c, 0x3, 0x8c, 0x3, 0x8c, 0x3, 0x8d, 0x3, 0x8d, 0x3, 0x8d, 
+    0x3, 0x8d, 0x3, 0x8d, 0x3, 0x8d, 0x3, 0x8e, 0x3, 0x8e, 0x3, 0x8e, 0x3, 
+    0x8e, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 
+    0x3, 0x8f, 0x3, 0x8f, 0x3, 0x8f, 0x3, 0x90, 0x3, 0x90, 0x3, 0x90, 0x3, 
+    0x90, 0x3, 0x90, 0x3, 0x91, 0x3, 0x91, 0x3, 0x91, 0x3, 0x91, 0x3, 0x91, 
+    0x3, 0x91, 0x3, 0x91, 0x3, 0x92, 0x3, 0x92, 0x3, 0x92, 0x3, 0x92, 0x3, 
+    0x92, 0x3, 0x92, 0x3, 0x93, 0x3, 0x93, 0x3, 0x93, 0x3, 0x93, 0x3, 0x93, 
+    0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 
+    0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x94, 0x3, 0x95, 0x3, 0x95, 0x3, 0x95, 
+    0x3, 0x95, 0x3, 0x95, 0x3, 0x96, 0x3, 0x96, 0x3, 0x96, 0x3, 0x96, 0x3, 
+    0x96, 0x3, 0x96, 0x3, 0x96, 0x3, 0x97, 0x3, 0x97, 0x3, 0x97, 0x3, 0x97, 
+    0x3, 0x97, 0x3, 0x97, 0x3, 0x97, 0x3, 0x98, 0x3, 0x98, 0x3, 0x98, 0x3, 
+    0x98, 0x3, 0x98, 0x3, 0x98, 0x3, 0x99, 0x3, 0x99, 0x3, 0x99, 0x3, 0x99, 
+    0x3, 0x99, 0x3, 0x99, 0x3, 0x99, 0x3, 0x9a, 0x3, 0x9a, 0x3, 0x9a, 0x3, 
+    0x9a, 0x3, 0x9a, 0x3, 0x9a, 0x3, 0x9a, 0x3, 0x9a, 0x3, 0x9a, 0x3, 0x9a, 
+    0x3, 0x9b, 0x3, 0x9b, 0x3, 0x9b, 0x3, 0x9b, 0x3, 0x9b, 0x3, 0x9c, 0x3, 
+    0x9c, 0x3, 0x9c, 0x3, 0x9c, 0x3, 0x9c, 0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9d, 
+    0x3, 0x9d, 0x3, 0x9d, 0x3, 0x9e, 0x3, 0x9e, 0x3, 0x9e, 0x3, 0x9e, 0x3, 
+    0x9e, 0x3, 0x9e, 0x3, 0x9e, 0x3, 0x9e, 0x3, 0x9f, 0x3, 0x9f, 0x3, 0x9f, 
+    0x3, 0x9f, 0x3, 0x9f, 0x3, 0x9f, 0x3, 0x9f, 0x3, 0x9f, 0x3, 0x9f, 0x3, 
+    0x9f, 0x3, 0xa0, 0x3, 0xa0, 0x3, 0xa0, 0x3, 0xa1, 0x3, 0xa1, 0x3, 0xa1, 
+    0x3, 0xa1, 0x3, 0xa2, 0x3, 0xa2, 0x3, 0xa2, 0x3, 0xa2, 0x3, 0xa2, 0x3, 
+    0xa2, 0x3, 0xa2, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 
+    0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa3, 0x3, 0xa4, 0x3, 0xa4, 0x3, 
+    0xa4, 0x3, 0xa4, 0x3, 0xa4, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 
+    0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa5, 0x3, 0xa6, 0x3, 
+    0xa6, 0x3, 0xa6, 0x3, 0xa6, 0x3, 0xa7, 0x3, 0xa7, 0x3, 0xa7, 0x3, 0xa7, 
+    0x3, 0xa7, 0x3, 0xa8, 0x3, 0xa8, 0x3, 0xa8, 0x3, 0xa8, 0x3, 0xa8, 0x3, 
+    0xa8, 0x3, 0xa9, 0x3, 0xa9, 0x3, 0xa9, 0x3, 0xa9, 0x3, 0xa9, 0x3, 0xa9, 
+    0x3, 0xa9, 0x3, 0xaa, 0x3, 0xaa, 0x3, 0xaa, 0x3, 0xaa, 0x3, 0xab, 0x3, 
+    0xab, 0x3, 0xab, 0x3, 0xab, 0x3, 0xab, 0x3, 0xab, 0x3, 0xac, 0x3, 0xac, 
+    0x3, 0xac, 0x3, 0xac, 0x3, 0xac, 0x3, 0xad, 0x3, 0xad, 0x3, 0xad, 0x3, 
+    0xad, 0x3, 0xad, 0x3, 0xad, 0x3, 0xad, 0x3, 0xae, 0x3, 0xae, 0x3, 0xae, 
+    0x3, 0xae, 0x3, 0xae, 0x3, 0xaf, 0x3, 0xaf, 0x3, 0xaf, 0x3, 0xaf, 0x3, 
+    0xaf, 0x3, 0xaf, 0x3, 0xaf, 0x3, 0xb0, 0x3, 0xb0, 0x3, 0xb0, 0x3, 0xb0, 
+    0x3, 0xb0, 0x3, 0xb0, 0x3, 0xb1, 0x3, 0xb1, 0x3, 0xb1, 0x3, 0xb1, 0x3, 
+    0xb1, 0x3, 0xb2, 0x3, 0xb2, 0x3, 0xb2, 0x3, 0xb2, 0x3, 0xb2, 0x3, 0xb3, 
+    0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb3, 0x3, 0xb4, 0x3, 
+    0xb4, 0x3, 0xb4, 0x3, 0xb4, 0x3, 0xb4, 0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 
+    0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 0x3, 0xb5, 0x3, 
+    0xb5, 0x5, 0xb5, 0x6b5, 0xa, 0xb5, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 
+    0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb6, 0x3, 0xb7, 0x3, 0xb7, 0x3, 0xb7, 0x3, 
+    0xb7, 0x3, 0xb7, 0x3, 0xb8, 0x3, 0xb8, 0x5, 0xb8, 0x6c4, 0xa, 0xb8, 
+    0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x7, 0xb8, 0x6c9, 0xa, 0xb8, 0xc, 0xb8, 
+    0xe, 0xb8, 0x6cc, 0xb, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 
+    0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x7, 0xb8, 0x6d6, 0xa, 0xb8, 
+    0xc, 0xb8, 0xe, 0xb8, 0x6d9, 0xb, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 
+    0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x3, 
+    0xb8, 0x7, 0xb8, 0x6e5, 0xa, 0xb8, 0xc, 0xb8, 0xe, 0xb8, 0x6e8, 0xb, 
+    0xb8, 0x3, 0xb8, 0x3, 0xb8, 0x5, 0xb8, 0x6ec, 0xa, 0xb8, 0x3, 0xb9, 
+    0x3, 0xb9, 0x3, 0xb9, 0x7, 0xb9, 0x6f1, 0xa, 0xb9, 0xc, 0xb9, 0xe, 0xb9, 
+    0x6f4, 0xb, 0xb9, 0x3, 0xb9, 0x3, 0xb9, 0x5, 0xb9, 0x6f8, 0xa, 0xb9, 
+    0x3, 0xb9, 0x3, 0xb9, 0x5, 0xb9, 0x6fc, 0xa, 0xb9, 0x3, 0xb9, 0x6, 0xb9, 
+    0x6ff, 0xa, 0xb9, 0xd, 0xb9, 0xe, 0xb9, 0x700, 0x3, 0xb9, 0x3, 0xb9, 
+    0x3, 0xb9, 0x5, 0xb9, 0x706, 0xa, 0xb9, 0x3, 0xb9, 0x3, 0xb9, 0x5, 0xb9, 
+    0x70a, 0xa, 0xb9, 0x3, 0xb9, 0x6, 0xb9, 0x70d, 0xa, 0xb9, 0xd, 0xb9, 
+    0xe, 0xb9, 0x70e, 0x3, 0xb9, 0x3, 0xb9, 0x3, 0xb9, 0x7, 0xb9, 0x714, 
+    0xa, 0xb9, 0xc, 0xb9, 0xe, 0xb9, 0x717, 0xb, 0xb9, 0x3, 0xb9, 0x3, 0xb9, 
+    0x3, 0xb9, 0x5, 0xb9, 0x71c, 0xa, 0xb9, 0x3, 0xb9, 0x6, 0xb9, 0x71f, 
+    0xa, 0xb9, 0xd, 0xb9, 0xe, 0xb9, 0x720, 0x3, 0xb9, 0x3, 0xb9, 0x3, 0xb9, 
+    0x3, 0xb9, 0x3, 0xb9, 0x5, 0xb9, 0x728, 0xa, 0xb9, 0x3, 0xb9, 0x6, 0xb9, 
+    0x72b, 0xa, 0xb9, 0xd, 0xb9, 0xe, 0xb9, 0x72c, 0x3, 0xb9, 0x3, 0xb9, 
+    0x3, 0xb9, 0x3, 0xb9, 0x5, 0xb9, 0x733, 0xa, 0xb9, 0x3, 0xb9, 0x6, 0xb9, 
+    0x736, 0xa, 0xb9, 0xd, 0xb9, 0xe, 0xb9, 0x737, 0x5, 0xb9, 0x73a, 0xa, 
+    0xb9, 0x3, 0xba, 0x3, 0xba, 0x6, 0xba, 0x73e, 0xa, 0xba, 0xd, 0xba, 
+    0xe, 0xba, 0x73f, 0x3, 0xbb, 0x6, 0xbb, 0x743, 0xa, 0xbb, 0xd, 0xbb, 
+    0xe, 0xbb, 0x744, 0x3, 0xbc, 0x3, 0xbc, 0x3, 0xbc, 0x6, 0xbc, 0x74a, 
+    0xa, 0xbc, 0xd, 0xbc, 0xe, 0xbc, 0x74b, 0x3, 0xbd, 0x3, 0xbd, 0x3, 0xbd, 
+    0x3, 0xbd, 0x3, 0xbd, 0x3, 0xbd, 0x3, 0xbd, 0x3, 0xbd, 0x7, 0xbd, 0x756, 
+    0xa, 0xbd, 0xc, 0xbd, 0xe, 0xbd, 0x759, 0xb, 0xbd, 0x3, 0xbd, 0x3, 0xbd, 
+    0x3, 0xbe, 0x3, 0xbe, 0x3, 0xbf, 0x3, 0xbf, 0x3, 0xc0, 0x3, 0xc0, 0x3, 
+    0xc1, 0x3, 0xc1, 0x3, 0xc2, 0x3, 0xc2, 0x3, 0xc3, 0x3, 0xc3, 0x3, 0xc4, 
+    0x3, 0xc4, 0x3, 0xc5, 0x3, 0xc5, 0x3, 0xc6, 0x3, 0xc6, 0x3, 0xc7, 0x3, 
+    0xc7, 0x3, 0xc8, 0x3, 0xc8, 0x3, 0xc9, 0x3, 0xc9, 0x3, 0xca, 0x3, 0xca, 
+    0x3, 0xcb, 0x3, 0xcb, 0x3, 0xcc, 0x3, 0xcc, 0x3, 0xcd, 0x3, 0xcd, 0x3, 
+    0xce, 0x3, 0xce, 0x3, 0xcf, 0x3, 0xcf, 0x3, 0xd0, 0x3, 0xd0, 0x3, 0xd1, 
+    0x3, 0xd1, 0x3, 0xd2, 0x3, 0xd2, 0x3, 0xd3, 0x3, 0xd3, 0x3, 0xd4, 0x3, 
+    0xd4, 0x3, 0xd5, 0x3, 0xd5, 0x3, 0xd6, 0x3, 0xd6, 0x3, 0xd7, 0x3, 0xd7, 
+    0x3, 0xd8, 0x3, 0xd8, 0x3, 0xd9, 0x3, 0xd9, 0x3, 0xda, 0x3, 0xda, 0x3, 
+    0xdb, 0x3, 0xdb, 0x3, 0xdc, 0x3, 0xdc, 0x3, 0xdc, 0x3, 0xdd, 0x3, 0xdd, 
+    0x3, 0xde, 0x3, 0xde, 0x3, 0xdf, 0x3, 0xdf, 0x3, 0xe0, 0x3, 0xe0, 0x3, 
+    0xe1, 0x3, 0xe1, 0x3, 0xe2, 0x3, 0xe2, 0x3, 0xe2, 0x3, 0xe3, 0x3, 0xe3, 
+    0x3, 0xe4, 0x3, 0xe4, 0x3, 0xe5, 0x3, 0xe5, 0x3, 0xe5, 0x3, 0xe6, 0x3, 
+    0xe6, 0x3, 0xe7, 0x3, 0xe7, 0x3, 0xe7, 0x3, 0xe8, 0x3, 0xe8, 0x3, 0xe9, 
+    0x3, 0xe9, 0x3, 0xea, 0x3, 0xea, 0x3, 0xeb, 0x3, 0xeb, 0x3, 0xeb, 0x3, 
+    0xec, 0x3, 0xec, 0x3, 0xed, 0x3, 0xed, 0x3, 0xee, 0x3, 0xee, 0x3, 0xee, 
+    0x3, 0xee, 0x5, 0xee, 0x7c6, 0xa, 0xee, 0x3, 0xef, 0x3, 0xef, 0x3, 0xf0, 
+    0x3, 0xf0, 0x3, 0xf1, 0x3, 0xf1, 0x3, 0xf2, 0x3, 0xf2, 0x3, 0xf3, 0x3, 
+    0xf3, 0x3, 0xf4, 0x3, 0xf4, 0x3, 0xf5, 0x3, 0xf5, 0x3, 0xf6, 0x3, 0xf6, 
+    0x3, 0xf7, 0x3, 0xf7, 0x3, 0xf8, 0x3, 0xf8, 0x3, 0xf9, 0x3, 0xf9, 0x3, 
+    0xfa, 0x3, 0xfa, 0x3, 0xfa, 0x3, 0xfa, 0x7, 0xfa, 0x7e2, 0xa, 0xfa, 
+    0xc, 0xfa, 0xe, 0xfa, 0x7e5, 0xb, 0xfa, 0x3, 0xfa, 0x3, 0xfa, 0x3, 0xfa, 
+    0x3, 0xfa, 0x3, 0xfa, 0x3, 0xfb, 0x3, 0xfb, 0x3, 0xfb, 0x3, 0xfb, 0x7, 
+    0xfb, 0x7f0, 0xa, 0xfb, 0xc, 0xfb, 0xe, 0xfb, 0x7f3, 0xb, 0xfb, 0x3, 
+    0xfb, 0x5, 0xfb, 0x7f6, 0xa, 0xfb, 0x3, 0xfb, 0x3, 0xfb, 0x3, 0xfc, 
+    0x3, 0xfc, 0x3, 0xfc, 0x3, 0xfc, 0x3, 0x7e3, 0x2, 0xfd, 0x3, 0x3, 0x5, 
+    0x4, 0x7, 0x5, 0x9, 0x6, 0xb, 0x7, 0xd, 0x8, 0xf, 0x9, 0x11, 0xa, 0x13, 
+    0xb, 0x15, 0xc, 0x17, 0xd, 0x19, 0xe, 0x1b, 0xf, 0x1d, 0x10, 0x1f, 0x11, 
+    0x21, 0x12, 0x23, 0x13, 0x25, 0x14, 0x27, 0x15, 0x29, 0x16, 0x2b, 0x17, 
+    0x2d, 0x18, 0x2f, 0x19, 0x31, 0x1a, 0x33, 0x1b, 0x35, 0x1c, 0x37, 0x1d, 
+    0x39, 0x1e, 0x3b, 0x1f, 0x3d, 0x20, 0x3f, 0x21, 0x41, 0x22, 0x43, 0x23, 
+    0x45, 0x24, 0x47, 0x25, 0x49, 0x26, 0x4b, 0x27, 0x4d, 0x28, 0x4f, 0x29, 
+    0x51, 0x2a, 0x53, 0x2b, 0x55, 0x2c, 0x57, 0x2d, 0x59, 0x2e, 0x5b, 0x2f, 
+    0x5d, 0x30, 0x5f, 0x31, 0x61, 0x32, 0x63, 0x33, 0x65, 0x34, 0x67, 0x35, 
+    0x69, 0x36, 0x6b, 0x37, 0x6d, 0x38, 0x6f, 0x39, 0x71, 0x3a, 0x73, 0x3b, 
+    0x75, 0x3c, 0x77, 0x3d, 0x79, 0x3e, 0x7b, 0x3f, 0x7d, 0x40, 0x7f, 0x41, 
+    0x81, 0x42, 0x83, 0x43, 0x85, 0x44, 0x87, 0x45, 0x89, 0x46, 0x8b, 0x47, 
+    0x8d, 0x48, 0x8f, 0x49, 0x91, 0x4a, 0x93, 0x4b, 0x95, 0x4c, 0x97, 0x4d, 
+    0x99, 0x4e, 0x9b, 0x4f, 0x9d, 0x50, 0x9f, 0x51, 0xa1, 0x52, 0xa3, 0x53, 
+    0xa5, 0x54, 0xa7, 0x55, 0xa9, 0x56, 0xab, 0x57, 0xad, 0x58, 0xaf, 0x59, 
+    0xb1, 0x5a, 0xb3, 0x5b, 0xb5, 0x5c, 0xb7, 0x5d, 0xb9, 0x5e, 0xbb, 0x5f, 
+    0xbd, 0x60, 0xbf, 0x61, 0xc1, 0x62, 0xc3, 0x63, 0xc5, 0x64, 0xc7, 0x65, 
+    0xc9, 0x66, 0xcb, 0x67, 0xcd, 0x68, 0xcf, 0x69, 0xd1, 0x6a, 0xd3, 0x6b, 
+    0xd5, 0x6c, 0xd7, 0x6d, 0xd9, 0x6e, 0xdb, 0x6f, 0xdd, 0x70, 0xdf, 0x71, 
+    0xe1, 0x72, 0xe3, 0x73, 0xe5, 0x74, 0xe7, 0x75, 0xe9, 0x76, 0xeb, 0x77, 
+    0xed, 0x78, 0xef, 0x79, 0xf1, 0x7a, 0xf3, 0x7b, 0xf5, 0x7c, 0xf7, 0x7d, 
+    0xf9, 0x7e, 0xfb, 0x7f, 0xfd, 0x80, 0xff, 0x81, 0x101, 0x82, 0x103, 
+    0x83, 0x105, 0x84, 0x107, 0x85, 0x109, 0x86, 0x10b, 0x87, 0x10d, 0x88, 
+    0x10f, 0x89, 0x111, 0x8a, 0x113, 0x8b, 0x115, 0x8c, 0x117, 0x8d, 0x119, 
+    0x8e, 0x11b, 0x8f, 0x11d, 0x90, 0x11f, 0x91, 0x121, 0x92, 0x123, 0x93, 
+    0x125, 0x94, 0x127, 0x95, 0x129, 0x96, 0x12b, 0x97, 0x12d, 0x98, 0x12f, 
+    0x99, 0x131, 0x9a, 0x133, 0x9b, 0x135, 0x9c, 0x137, 0x9d, 0x139, 0x9e, 
+    0x13b, 0x9f, 0x13d, 0xa0, 0x13f, 0xa1, 0x141, 0xa2, 0x143, 0xa3, 0x145, 
+    0xa4, 0x147, 0xa5, 0x149, 0xa6, 0x14b, 0xa7, 0x14d, 0xa8, 0x14f, 0xa9, 
+    0x151, 0xaa, 0x153, 0xab, 0x155, 0xac, 0x157, 0xad, 0x159, 0xae, 0x15b, 
+    0xaf, 0x15d, 0xb0, 0x15f, 0xb1, 0x161, 0xb2, 0x163, 0xb3, 0x165, 0xb4, 
+    0x167, 0xb5, 0x169, 0xb6, 0x16b, 0xb7, 0x16d, 0xb8, 0x16f, 0xb9, 0x171, 
+    0xba, 0x173, 0xbb, 0x175, 0xbc, 0x177, 0xbd, 0x179, 0xbe, 0x17b, 0x2, 
+    0x17d, 0x2, 0x17f, 0x2, 0x181, 0x2, 0x183, 0x2, 0x185, 0x2, 0x187, 0x2, 
+    0x189, 0x2, 0x18b, 0x2, 0x18d, 0x2, 0x18f, 0x2, 0x191, 0x2, 0x193, 0x2, 
+    0x195, 0x2, 0x197, 0x2, 0x199, 0x2, 0x19b, 0x2, 0x19d, 0x2, 0x19f, 0x2, 
+    0x1a1, 0x2, 0x1a3, 0x2, 0x1a5, 0x2, 0x1a7, 0x2, 0x1a9, 0x2, 0x1ab, 0x2, 
+    0x1ad, 0x2, 0x1af, 0x2, 0x1b1, 0x2, 0x1b3, 0x2, 0x1b5, 0x2, 0x1b7, 0xbf, 
+    0x1b9, 0xc0, 0x1bb, 0xc1, 0x1bd, 0xc2, 0x1bf, 0xc3, 0x1c1, 0xc4, 0x1c3, 
+    0xc5, 0x1c5, 0xc6, 0x1c7, 0xc7, 0x1c9, 0xc8, 0x1cb, 0xc9, 0x1cd, 0xca, 
+    0x1cf, 0xcb, 0x1d1, 0xcc, 0x1d3, 0xcd, 0x1d5, 0xce, 0x1d7, 0xcf, 0x1d9, 
+    0xd0, 0x1db, 0xd1, 0x1dd, 0xd2, 0x1df, 0xd3, 0x1e1, 0xd4, 0x1e3, 0xd5, 
+    0x1e5, 0xd6, 0x1e7, 0xd7, 0x1e9, 0xd8, 0x1eb, 0xd9, 0x1ed, 0xda, 0x1ef, 
+    0xdb, 0x1f1, 0xdc, 0x1f3, 0xdd, 0x1f5, 0xde, 0x1f7, 0xdf, 0x3, 0x2, 
+    0x26, 0x4, 0x2, 0x5e, 0x5e, 0x62, 0x62, 0x4, 0x2, 0x24, 0x24, 0x5e, 
+    0x5e, 0x4, 0x2, 0x29, 0x29, 0x5e, 0x5e, 0x4, 0x2, 0x43, 0x43, 0x63, 
+    0x63, 0x4, 0x2, 0x44, 0x44, 0x64, 0x64, 0x4, 0x2, 0x45, 0x45, 0x65, 
+    0x65, 0x4, 0x2, 0x46, 0x46, 0x66, 0x66, 0x4, 0x2, 0x47, 0x47, 0x67, 
+    0x67, 0x4, 0x2, 0x48, 0x48, 0x68, 0x68, 0x4, 0x2, 0x49, 0x49, 0x69, 
+    0x69, 0x4, 0x2, 0x4a, 0x4a, 0x6a, 0x6a, 0x4, 0x2, 0x4b, 0x4b, 0x6b, 
+    0x6b, 0x4, 0x2, 0x4c, 0x4c, 0x6c, 0x6c, 0x4, 0x2, 0x4d, 0x4d, 0x6d, 
+    0x6d, 0x4, 0x2, 0x4e, 0x4e, 0x6e, 0x6e, 0x4, 0x2, 0x4f, 0x4f, 0x6f, 
+    0x6f, 0x4, 0x2, 0x50, 0x50, 0x70, 0x70, 0x4, 0x2, 0x51, 0x51, 0x71, 
+    0x71, 0x4, 0x2, 0x52, 0x52, 0x72, 0x72, 0x4, 0x2, 0x53, 0x53, 0x73, 
+    0x73, 0x4, 0x2, 0x54, 0x54, 0x74, 0x74, 0x4, 0x2, 0x55, 0x55, 0x75, 
+    0x75, 0x4, 0x2, 0x56, 0x56, 0x76, 0x76, 0x4, 0x2, 0x57, 0x57, 0x77, 
+    0x77, 0x4, 0x2, 0x58, 0x58, 0x78, 0x78, 0x4, 0x2, 0x59, 0x59, 0x79, 
+    0x79, 0x4, 0x2, 0x5a, 0x5a, 0x7a, 0x7a, 0x4, 0x2, 0x5b, 0x5b, 0x7b, 
+    0x7b, 0x4, 0x2, 0x5c, 0x5c, 0x7c, 0x7c, 0x4, 0x2, 0x43, 0x5c, 0x63, 
+    0x7c, 0x3, 0x2, 0x32, 0x39, 0x3, 0x2, 0x32, 0x3b, 0x5, 0x2, 0x32, 0x3b, 
+    0x43, 0x48, 0x63, 0x68, 0x4, 0x2, 0xc, 0xc, 0xf, 0xf, 0x4, 0x3, 0xc, 
+    0xc, 0xf, 0xf, 0x4, 0x2, 0xb, 0xf, 0x22, 0x22, 0x2, 0x80d, 0x2, 0x3, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x5, 0x3, 0x2, 0x2, 0x2, 0x2, 0x7, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xd, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf, 0x3, 0x2, 0x2, 0x2, 0x2, 0x11, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x13, 0x3, 0x2, 0x2, 0x2, 0x2, 0x15, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x17, 0x3, 0x2, 0x2, 0x2, 0x2, 0x19, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x1b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1f, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x21, 0x3, 0x2, 0x2, 0x2, 0x2, 0x23, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x25, 0x3, 0x2, 0x2, 0x2, 0x2, 0x27, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x29, 0x3, 0x2, 0x2, 0x2, 0x2, 0x2b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x2d, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x2f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x31, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x33, 0x3, 0x2, 0x2, 0x2, 0x2, 0x35, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x37, 0x3, 0x2, 0x2, 0x2, 0x2, 0x39, 0x3, 0x2, 0x2, 0x2, 0x2, 0x3b, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x3d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x3f, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x41, 0x3, 0x2, 0x2, 0x2, 0x2, 0x43, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x45, 0x3, 0x2, 0x2, 0x2, 0x2, 0x47, 0x3, 0x2, 0x2, 0x2, 0x2, 0x49, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x4b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x4d, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x4f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x51, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x53, 0x3, 0x2, 0x2, 0x2, 0x2, 0x55, 0x3, 0x2, 0x2, 0x2, 0x2, 0x57, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x59, 0x3, 0x2, 0x2, 0x2, 0x2, 0x5b, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x5d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x5f, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x61, 0x3, 0x2, 0x2, 0x2, 0x2, 0x63, 0x3, 0x2, 0x2, 0x2, 0x2, 0x65, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x67, 0x3, 0x2, 0x2, 0x2, 0x2, 0x69, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x6b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x6d, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x6f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x71, 0x3, 0x2, 0x2, 0x2, 0x2, 0x73, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x75, 0x3, 0x2, 0x2, 0x2, 0x2, 0x77, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x79, 0x3, 0x2, 0x2, 0x2, 0x2, 0x7b, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x7d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x7f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x81, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x83, 0x3, 0x2, 0x2, 0x2, 0x2, 0x85, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x87, 0x3, 0x2, 0x2, 0x2, 0x2, 0x89, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x8b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x8d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x8f, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x91, 0x3, 0x2, 0x2, 0x2, 0x2, 0x93, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x95, 0x3, 0x2, 0x2, 0x2, 0x2, 0x97, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x99, 0x3, 0x2, 0x2, 0x2, 0x2, 0x9b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x9d, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x9f, 0x3, 0x2, 0x2, 0x2, 0x2, 0xa1, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0xa3, 0x3, 0x2, 0x2, 0x2, 0x2, 0xa5, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xa7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xa9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xab, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0xad, 0x3, 0x2, 0x2, 0x2, 0x2, 0xaf, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0xb1, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb3, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xb5, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xb9, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0xbb, 0x3, 0x2, 0x2, 0x2, 0x2, 0xbd, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0xbf, 0x3, 0x2, 0x2, 0x2, 0x2, 0xc1, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xc3, 0x3, 0x2, 0x2, 0x2, 0x2, 0xc5, 0x3, 0x2, 0x2, 0x2, 0x2, 0xc7, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0xc9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xcb, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0xcd, 0x3, 0x2, 0x2, 0x2, 0x2, 0xcf, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xd1, 0x3, 0x2, 0x2, 0x2, 0x2, 0xd3, 0x3, 0x2, 0x2, 0x2, 0x2, 0xd5, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0xd7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xd9, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0xdb, 0x3, 0x2, 0x2, 0x2, 0x2, 0xdd, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xdf, 0x3, 0x2, 0x2, 0x2, 0x2, 0xe1, 0x3, 0x2, 0x2, 0x2, 0x2, 0xe3, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0xe5, 0x3, 0x2, 0x2, 0x2, 0x2, 0xe7, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0xe9, 0x3, 0x2, 0x2, 0x2, 0x2, 0xeb, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xed, 0x3, 0x2, 0x2, 0x2, 0x2, 0xef, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf1, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0xf3, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf5, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0xf7, 0x3, 0x2, 0x2, 0x2, 0x2, 0xf9, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0xfb, 0x3, 0x2, 0x2, 0x2, 0x2, 0xfd, 0x3, 0x2, 0x2, 0x2, 0x2, 0xff, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x101, 0x3, 0x2, 0x2, 0x2, 0x2, 0x103, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x105, 0x3, 0x2, 0x2, 0x2, 0x2, 0x107, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x109, 0x3, 0x2, 0x2, 0x2, 0x2, 0x10b, 0x3, 0x2, 0x2, 
+    0x2, 0x2, 0x10d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x10f, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x111, 0x3, 0x2, 0x2, 0x2, 0x2, 0x113, 0x3, 0x2, 0x2, 0x2, 0x2, 
+    0x115, 0x3, 0x2, 0x2, 0x2, 0x2, 0x117, 0x3, 0x2, 0x2, 0x2, 0x2, 0x119, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x11b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x11d, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x11f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x121, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x123, 0x3, 0x2, 0x2, 0x2, 0x2, 0x125, 0x3, 0x2, 0x2, 
+    0x2, 0x2, 0x127, 0x3, 0x2, 0x2, 0x2, 0x2, 0x129, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x12b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x12d, 0x3, 0x2, 0x2, 0x2, 0x2, 
+    0x12f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x131, 0x3, 0x2, 0x2, 0x2, 0x2, 0x133, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x135, 0x3, 0x2, 0x2, 0x2, 0x2, 0x137, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x139, 0x3, 0x2, 0x2, 0x2, 0x2, 0x13b, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x13d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x13f, 0x3, 0x2, 0x2, 
+    0x2, 0x2, 0x141, 0x3, 0x2, 0x2, 0x2, 0x2, 0x143, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x145, 0x3, 0x2, 0x2, 0x2, 0x2, 0x147, 0x3, 0x2, 0x2, 0x2, 0x2, 
+    0x149, 0x3, 0x2, 0x2, 0x2, 0x2, 0x14b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x14d, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x14f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x151, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x153, 0x3, 0x2, 0x2, 0x2, 0x2, 0x155, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x157, 0x3, 0x2, 0x2, 0x2, 0x2, 0x159, 0x3, 0x2, 0x2, 
+    0x2, 0x2, 0x15b, 0x3, 0x2, 0x2, 0x2, 0x2, 0x15d, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x15f, 0x3, 0x2, 0x2, 0x2, 0x2, 0x161, 0x3, 0x2, 0x2, 0x2, 0x2, 
+    0x163, 0x3, 0x2, 0x2, 0x2, 0x2, 0x165, 0x3, 0x2, 0x2, 0x2, 0x2, 0x167, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x169, 0x3, 0x2, 0x2, 0x2, 0x2, 0x16b, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x16d, 0x3, 0x2, 0x2, 0x2, 0x2, 0x16f, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x171, 0x3, 0x2, 0x2, 0x2, 0x2, 0x173, 0x3, 0x2, 0x2, 
+    0x2, 0x2, 0x175, 0x3, 0x2, 0x2, 0x2, 0x2, 0x177, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x179, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1b7, 0x3, 0x2, 0x2, 0x2, 0x2, 
+    0x1b9, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1bb, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1bd, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x1bf, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1c1, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x1c3, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1c5, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x1c7, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1c9, 0x3, 0x2, 0x2, 
+    0x2, 0x2, 0x1cb, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1cd, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x1cf, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d1, 0x3, 0x2, 0x2, 0x2, 0x2, 
+    0x1d3, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d5, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1d7, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x1d9, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1db, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x1dd, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1df, 0x3, 0x2, 
+    0x2, 0x2, 0x2, 0x1e1, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1e3, 0x3, 0x2, 0x2, 
+    0x2, 0x2, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1e7, 0x3, 0x2, 0x2, 0x2, 
+    0x2, 0x1e9, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1eb, 0x3, 0x2, 0x2, 0x2, 0x2, 
+    0x1ed, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1ef, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1f1, 
+    0x3, 0x2, 0x2, 0x2, 0x2, 0x1f3, 0x3, 0x2, 0x2, 0x2, 0x2, 0x1f5, 0x3, 
+    0x2, 0x2, 0x2, 0x2, 0x1f7, 0x3, 0x2, 0x2, 0x2, 0x3, 0x1f9, 0x3, 0x2, 
+    0x2, 0x2, 0x5, 0x1fd, 0x3, 0x2, 0x2, 0x2, 0x7, 0x203, 0x3, 0x2, 0x2, 
+    0x2, 0x9, 0x209, 0x3, 0x2, 0x2, 0x2, 0xb, 0x20d, 0x3, 0x2, 0x2, 0x2, 
+    0xd, 0x213, 0x3, 0x2, 0x2, 0x2, 0xf, 0x217, 0x3, 0x2, 0x2, 0x2, 0x11, 
+    0x21c, 0x3, 0x2, 0x2, 0x2, 0x13, 0x220, 0x3, 0x2, 0x2, 0x2, 0x15, 0x226, 
+    0x3, 0x2, 0x2, 0x2, 0x17, 0x237, 0x3, 0x2, 0x2, 0x2, 0x19, 0x239, 0x3, 
+    0x2, 0x2, 0x2, 0x1b, 0x23e, 0x3, 0x2, 0x2, 0x2, 0x1d, 0x244, 0x3, 0x2, 
+    0x2, 0x2, 0x1f, 0x24b, 0x3, 0x2, 0x2, 0x2, 0x21, 0x253, 0x3, 0x2, 0x2, 
+    0x2, 0x23, 0x258, 0x3, 0x2, 0x2, 0x2, 0x25, 0x25b, 0x3, 0x2, 0x2, 0x2, 
+    0x27, 0x260, 0x3, 0x2, 0x2, 0x2, 0x29, 0x265, 0x3, 0x2, 0x2, 0x2, 0x2b, 
+    0x26b, 0x3, 0x2, 0x2, 0x2, 0x2d, 0x271, 0x3, 0x2, 0x2, 0x2, 0x2f, 0x279, 
+    0x3, 0x2, 0x2, 0x2, 0x31, 0x27f, 0x3, 0x2, 0x2, 0x2, 0x33, 0x287, 0x3, 
+    0x2, 0x2, 0x2, 0x35, 0x28e, 0x3, 0x2, 0x2, 0x2, 0x37, 0x296, 0x3, 0x2, 
+    0x2, 0x2, 0x39, 0x2a1, 0x3, 0x2, 0x2, 0x2, 0x3b, 0x2a8, 0x3, 0x2, 0x2, 
+    0x2, 0x3d, 0x2ae, 0x3, 0x2, 0x2, 0x2, 0x3f, 0x2b3, 0x3, 0x2, 0x2, 0x2, 
+    0x41, 0x2bc, 0x3, 0x2, 0x2, 0x2, 0x43, 0x2c6, 0x3, 0x2, 0x2, 0x2, 0x45, 
+    0x2cb, 0x3, 0x2, 0x2, 0x2, 0x47, 0x2cf, 0x3, 0x2, 0x2, 0x2, 0x49, 0x2db, 
+    0x3, 0x2, 0x2, 0x2, 0x4b, 0x2e3, 0x3, 0x2, 0x2, 0x2, 0x4d, 0x2e9, 0x3, 
+    0x2, 0x2, 0x2, 0x4f, 0x2f0, 0x3, 0x2, 0x2, 0x2, 0x51, 0x2f5, 0x3, 0x2, 
+    0x2, 0x2, 0x53, 0x300, 0x3, 0x2, 0x2, 0x2, 0x55, 0x309, 0x3, 0x2, 0x2, 
+    0x2, 0x57, 0x310, 0x3, 0x2, 0x2, 0x2, 0x59, 0x31d, 0x3, 0x2, 0x2, 0x2, 
+    0x5b, 0x328, 0x3, 0x2, 0x2, 0x2, 0x5d, 0x32d, 0x3, 0x2, 0x2, 0x2, 0x5f, 
+    0x336, 0x3, 0x2, 0x2, 0x2, 0x61, 0x342, 0x3, 0x2, 0x2, 0x2, 0x63, 0x347, 
+    0x3, 0x2, 0x2, 0x2, 0x65, 0x34c, 0x3, 0x2, 0x2, 0x2, 0x67, 0x350, 0x3, 
+    0x2, 0x2, 0x2, 0x69, 0x357, 0x3, 0x2, 0x2, 0x2, 0x6b, 0x35e, 0x3, 0x2, 
+    0x2, 0x2, 0x6d, 0x365, 0x3, 0x2, 0x2, 0x2, 0x6f, 0x36d, 0x3, 0x2, 0x2, 
+    0x2, 0x71, 0x378, 0x3, 0x2, 0x2, 0x2, 0x73, 0x380, 0x3, 0x2, 0x2, 0x2, 
+    0x75, 0x388, 0x3, 0x2, 0x2, 0x2, 0x77, 0x38e, 0x3, 0x2, 0x2, 0x2, 0x79, 
+    0x394, 0x3, 0x2, 0x2, 0x2, 0x7b, 0x39a, 0x3, 0x2, 0x2, 0x2, 0x7d, 0x39e, 
+    0x3, 0x2, 0x2, 0x2, 0x7f, 0x3a5, 0x3, 0x2, 0x2, 0x2, 0x81, 0x3ac, 0x3, 
+    0x2, 0x2, 0x2, 0x83, 0x3b1, 0x3, 0x2, 0x2, 0x2, 0x85, 0x3b6, 0x3, 0x2, 
+    0x2, 0x2, 0x87, 0x3bf, 0x3, 0x2, 0x2, 0x2, 0x89, 0x3c6, 0x3, 0x2, 0x2, 
+    0x2, 0x8b, 0x3d2, 0x3, 0x2, 0x2, 0x2, 0x8d, 0x3d8, 0x3, 0x2, 0x2, 0x2, 
+    0x8f, 0x3df, 0x3, 0x2, 0x2, 0x2, 0x91, 0x3ec, 0x3, 0x2, 0x2, 0x2, 0x93, 
+    0x3f1, 0x3, 0x2, 0x2, 0x2, 0x95, 0x3f4, 0x3, 0x2, 0x2, 0x2, 0x97, 0x3f7, 
+    0x3, 0x2, 0x2, 0x2, 0x99, 0x3fd, 0x3, 0x2, 0x2, 0x2, 0x9b, 0x400, 0x3, 
+    0x2, 0x2, 0x2, 0x9d, 0x413, 0x3, 0x2, 0x2, 0x2, 0x9f, 0x415, 0x3, 0x2, 
+    0x2, 0x2, 0xa1, 0x41f, 0x3, 0x2, 0x2, 0x2, 0xa3, 0x425, 0x3, 0x2, 0x2, 
+    0x2, 0xa5, 0x42c, 0x3, 0x2, 0x2, 0x2, 0xa7, 0x435, 0x3, 0x2, 0x2, 0x2, 
+    0xa9, 0x43a, 0x3, 0x2, 0x2, 0x2, 0xab, 0x43d, 0x3, 0x2, 0x2, 0x2, 0xad, 
+    0x44a, 0x3, 0x2, 0x2, 0x2, 0xaf, 0x44f, 0x3, 0x2, 0x2, 0x2, 0xb1, 0x453, 
+    0x3, 0x2, 0x2, 0x2, 0xb3, 0x458, 0x3, 0x2, 0x2, 0x2, 0xb5, 0x45d, 0x3, 
+    0x2, 0x2, 0x2, 0xb7, 0x464, 0x3, 0x2, 0x2, 0x2, 0xb9, 0x46c, 0x3, 0x2, 
+    0x2, 0x2, 0xbb, 0x471, 0x3, 0x2, 0x2, 0x2, 0xbd, 0x47a, 0x3, 0x2, 0x2, 
+    0x2, 0xbf, 0x47f, 0x3, 0x2, 0x2, 0x2, 0xc1, 0x485, 0x3, 0x2, 0x2, 0x2, 
+    0xc3, 0x48a, 0x3, 0x2, 0x2, 0x2, 0xc5, 0x490, 0x3, 0x2, 0x2, 0x2, 0xc7, 
+    0x495, 0x3, 0x2, 0x2, 0x2, 0xc9, 0x4a2, 0x3, 0x2, 0x2, 0x2, 0xcb, 0x4ae, 
+    0x3, 0x2, 0x2, 0x2, 0xcd, 0x4b2, 0x3, 0x2, 0x2, 0x2, 0xcf, 0x4b9, 0x3, 
+    0x2, 0x2, 0x2, 0xd1, 0x4bd, 0x3, 0x2, 0x2, 0x2, 0xd3, 0x4c4, 0x3, 0x2, 
+    0x2, 0x2, 0xd5, 0x4cb, 0x3, 0x2, 0x2, 0x2, 0xd7, 0x4d1, 0x3, 0x2, 0x2, 
+    0x2, 0xd9, 0x4d6, 0x3, 0x2, 0x2, 0x2, 0xdb, 0x4df, 0x3, 0x2, 0x2, 0x2, 
+    0xdd, 0x4e3, 0x3, 0x2, 0x2, 0x2, 0xdf, 0x4e6, 0x3, 0x2, 0x2, 0x2, 0xe1, 
+    0x4ea, 0x3, 0x2, 0x2, 0x2, 0xe3, 0x4ef, 0x3, 0x2, 0x2, 0x2, 0xe5, 0x4f5, 
+    0x3, 0x2, 0x2, 0x2, 0xe7, 0x4fc, 0x3, 0x2, 0x2, 0x2, 0xe9, 0x4ff, 0x3, 
+    0x2, 0x2, 0x2, 0xeb, 0x508, 0x3, 0x2, 0x2, 0x2, 0xed, 0x50b, 0x3, 0x2, 
+    0x2, 0x2, 0xef, 0x511, 0x3, 0x2, 0x2, 0x2, 0xf1, 0x517, 0x3, 0x2, 0x2, 
+    0x2, 0xf3, 0x51f, 0x3, 0x2, 0x2, 0x2, 0xf5, 0x529, 0x3, 0x2, 0x2, 0x2, 
+    0xf7, 0x532, 0x3, 0x2, 0x2, 0x2, 0xf9, 0x53b, 0x3, 0x2, 0x2, 0x2, 0xfb, 
+    0x543, 0x3, 0x2, 0x2, 0x2, 0xfd, 0x54e, 0x3, 0x2, 0x2, 0x2, 0xff, 0x556, 
+    0x3, 0x2, 0x2, 0x2, 0x101, 0x55c, 0x3, 0x2, 0x2, 0x2, 0x103, 0x563, 
+    0x3, 0x2, 0x2, 0x2, 0x105, 0x56a, 0x3, 0x2, 0x2, 0x2, 0x107, 0x571, 
+    0x3, 0x2, 0x2, 0x2, 0x109, 0x579, 0x3, 0x2, 0x2, 0x2, 0x10b, 0x581, 
+    0x3, 0x2, 0x2, 0x2, 0x10d, 0x58c, 0x3, 0x2, 0x2, 0x2, 0x10f, 0x592, 
+    0x3, 0x2, 0x2, 0x2, 0x111, 0x599, 0x3, 0x2, 0x2, 0x2, 0x113, 0x5a0, 
+    0x3, 0x2, 0x2, 0x2, 0x115, 0x5a7, 0x3, 0x2, 0x2, 0x2, 0x117, 0x5ae, 
+    0x3, 0x2, 0x2, 0x2, 0x119, 0x5b3, 0x3, 0x2, 0x2, 0x2, 0x11b, 0x5b9, 
+    0x3, 0x2, 0x2, 0x2, 0x11d, 0x5bd, 0x3, 0x2, 0x2, 0x2, 0x11f, 0x5c6, 
+    0x3, 0x2, 0x2, 0x2, 0x121, 0x5cb, 0x3, 0x2, 0x2, 0x2, 0x123, 0x5d2, 
+    0x3, 0x2, 0x2, 0x2, 0x125, 0x5d8, 0x3, 0x2, 0x2, 0x2, 0x127, 0x5dd, 
+    0x3, 0x2, 0x2, 0x2, 0x129, 0x5e7, 0x3, 0x2, 0x2, 0x2, 0x12b, 0x5ec, 
+    0x3, 0x2, 0x2, 0x2, 0x12d, 0x5f3, 0x3, 0x2, 0x2, 0x2, 0x12f, 0x5fa, 
+    0x3, 0x2, 0x2, 0x2, 0x131, 0x600, 0x3, 0x2, 0x2, 0x2, 0x133, 0x607, 
+    0x3, 0x2, 0x2, 0x2, 0x135, 0x611, 0x3, 0x2, 0x2, 0x2, 0x137, 0x616, 
+    0x3, 0x2, 0x2, 0x2, 0x139, 0x61b, 0x3, 0x2, 0x2, 0x2, 0x13b, 0x620, 
+    0x3, 0x2, 0x2, 0x2, 0x13d, 0x628, 0x3, 0x2, 0x2, 0x2, 0x13f, 0x632, 
+    0x3, 0x2, 0x2, 0x2, 0x141, 0x635, 0x3, 0x2, 0x2, 0x2, 0x143, 0x639, 
+    0x3, 0x2, 0x2, 0x2, 0x145, 0x640, 0x3, 0x2, 0x2, 0x2, 0x147, 0x649, 
+    0x3, 0x2, 0x2, 0x2, 0x149, 0x64e, 0x3, 0x2, 0x2, 0x2, 0x14b, 0x657, 
+    0x3, 0x2, 0x2, 0x2, 0x14d, 0x65b, 0x3, 0x2, 0x2, 0x2, 0x14f, 0x660, 
+    0x3, 0x2, 0x2, 0x2, 0x151, 0x666, 0x3, 0x2, 0x2, 0x2, 0x153, 0x66d, 
+    0x3, 0x2, 0x2, 0x2, 0x155, 0x671, 0x3, 0x2, 0x2, 0x2, 0x157, 0x677, 
+    0x3, 0x2, 0x2, 0x2, 0x159, 0x67c, 0x3, 0x2, 0x2, 0x2, 0x15b, 0x683, 
+    0x3, 0x2, 0x2, 0x2, 0x15d, 0x688, 0x3, 0x2, 0x2, 0x2, 0x15f, 0x68f, 
+    0x3, 0x2, 0x2, 0x2, 0x161, 0x695, 0x3, 0x2, 0x2, 0x2, 0x163, 0x69a, 
+    0x3, 0x2, 0x2, 0x2, 0x165, 0x69f, 0x3, 0x2, 0x2, 0x2, 0x167, 0x6a5, 
+    0x3, 0x2, 0x2, 0x2, 0x169, 0x6b4, 0x3, 0x2, 0x2, 0x2, 0x16b, 0x6b6, 
+    0x3, 0x2, 0x2, 0x2, 0x16d, 0x6bc, 0x3, 0x2, 0x2, 0x2, 0x16f, 0x6eb, 
+    0x3, 0x2, 0x2, 0x2, 0x171, 0x739, 0x3, 0x2, 0x2, 0x2, 0x173, 0x73b, 
+    0x3, 0x2, 0x2, 0x2, 0x175, 0x742, 0x3, 0x2, 0x2, 0x2, 0x177, 0x746, 
+    0x3, 0x2, 0x2, 0x2, 0x179, 0x74d, 0x3, 0x2, 0x2, 0x2, 0x17b, 0x75c, 
+    0x3, 0x2, 0x2, 0x2, 0x17d, 0x75e, 0x3, 0x2, 0x2, 0x2, 0x17f, 0x760, 
+    0x3, 0x2, 0x2, 0x2, 0x181, 0x762, 0x3, 0x2, 0x2, 0x2, 0x183, 0x764, 
+    0x3, 0x2, 0x2, 0x2, 0x185, 0x766, 0x3, 0x2, 0x2, 0x2, 0x187, 0x768, 
+    0x3, 0x2, 0x2, 0x2, 0x189, 0x76a, 0x3, 0x2, 0x2, 0x2, 0x18b, 0x76c, 
+    0x3, 0x2, 0x2, 0x2, 0x18d, 0x76e, 0x3, 0x2, 0x2, 0x2, 0x18f, 0x770, 
+    0x3, 0x2, 0x2, 0x2, 0x191, 0x772, 0x3, 0x2, 0x2, 0x2, 0x193, 0x774, 
+    0x3, 0x2, 0x2, 0x2, 0x195, 0x776, 0x3, 0x2, 0x2, 0x2, 0x197, 0x778, 
+    0x3, 0x2, 0x2, 0x2, 0x199, 0x77a, 0x3, 0x2, 0x2, 0x2, 0x19b, 0x77c, 
+    0x3, 0x2, 0x2, 0x2, 0x19d, 0x77e, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x780, 
+    0x3, 0x2, 0x2, 0x2, 0x1a1, 0x782, 0x3, 0x2, 0x2, 0x2, 0x1a3, 0x784, 
+    0x3, 0x2, 0x2, 0x2, 0x1a5, 0x786, 0x3, 0x2, 0x2, 0x2, 0x1a7, 0x788, 
+    0x3, 0x2, 0x2, 0x2, 0x1a9, 0x78a, 0x3, 0x2, 0x2, 0x2, 0x1ab, 0x78c, 
+    0x3, 0x2, 0x2, 0x2, 0x1ad, 0x78e, 0x3, 0x2, 0x2, 0x2, 0x1af, 0x790, 
+    0x3, 0x2, 0x2, 0x2, 0x1b1, 0x792, 0x3, 0x2, 0x2, 0x2, 0x1b3, 0x794, 
+    0x3, 0x2, 0x2, 0x2, 0x1b5, 0x796, 0x3, 0x2, 0x2, 0x2, 0x1b7, 0x798, 
+    0x3, 0x2, 0x2, 0x2, 0x1b9, 0x79b, 0x3, 0x2, 0x2, 0x2, 0x1bb, 0x79d, 
+    0x3, 0x2, 0x2, 0x2, 0x1bd, 0x79f, 0x3, 0x2, 0x2, 0x2, 0x1bf, 0x7a1, 
+    0x3, 0x2, 0x2, 0x2, 0x1c1, 0x7a3, 0x3, 0x2, 0x2, 0x2, 0x1c3, 0x7a5, 
+    0x3, 0x2, 0x2, 0x2, 0x1c5, 0x7a8, 0x3, 0x2, 0x2, 0x2, 0x1c7, 0x7aa, 
+    0x3, 0x2, 0x2, 0x2, 0x1c9, 0x7ac, 0x3, 0x2, 0x2, 0x2, 0x1cb, 0x7af, 
+    0x3, 0x2, 0x2, 0x2, 0x1cd, 0x7b1, 0x3, 0x2, 0x2, 0x2, 0x1cf, 0x7b4, 
+    0x3, 0x2, 0x2, 0x2, 0x1d1, 0x7b6, 0x3, 0x2, 0x2, 0x2, 0x1d3, 0x7b8, 
+    0x3, 0x2, 0x2, 0x2, 0x1d5, 0x7ba, 0x3, 0x2, 0x2, 0x2, 0x1d7, 0x7bd, 
+    0x3, 0x2, 0x2, 0x2, 0x1d9, 0x7bf, 0x3, 0x2, 0x2, 0x2, 0x1db, 0x7c5, 
+    0x3, 0x2, 0x2, 0x2, 0x1dd, 0x7c7, 0x3, 0x2, 0x2, 0x2, 0x1df, 0x7c9, 
+    0x3, 0x2, 0x2, 0x2, 0x1e1, 0x7cb, 0x3, 0x2, 0x2, 0x2, 0x1e3, 0x7cd, 
+    0x3, 0x2, 0x2, 0x2, 0x1e5, 0x7cf, 0x3, 0x2, 0x2, 0x2, 0x1e7, 0x7d1, 
+    0x3, 0x2, 0x2, 0x2, 0x1e9, 0x7d3, 0x3, 0x2, 0x2, 0x2, 0x1eb, 0x7d5, 
+    0x3, 0x2, 0x2, 0x2, 0x1ed, 0x7d7, 0x3, 0x2, 0x2, 0x2, 0x1ef, 0x7d9, 
+    0x3, 0x2, 0x2, 0x2, 0x1f1, 0x7db, 0x3, 0x2, 0x2, 0x2, 0x1f3, 0x7dd, 
+    0x3, 0x2, 0x2, 0x2, 0x1f5, 0x7eb, 0x3, 0x2, 0x2, 0x2, 0x1f7, 0x7f9, 
+    0x3, 0x2, 0x2, 0x2, 0x1f9, 0x1fa, 0x5, 0x17b, 0xbe, 0x2, 0x1fa, 0x1fb, 
+    0x5, 0x181, 0xc1, 0x2, 0x1fb, 0x1fc, 0x5, 0x181, 0xc1, 0x2, 0x1fc, 0x4, 
+    0x3, 0x2, 0x2, 0x2, 0x1fd, 0x1fe, 0x5, 0x17b, 0xbe, 0x2, 0x1fe, 0x1ff, 
+    0x5, 0x185, 0xc3, 0x2, 0x1ff, 0x200, 0x5, 0x1a1, 0xd1, 0x2, 0x200, 0x201, 
+    0x5, 0x183, 0xc2, 0x2, 0x201, 0x202, 0x5, 0x19d, 0xcf, 0x2, 0x202, 0x6, 
+    0x3, 0x2, 0x2, 0x2, 0x203, 0x204, 0x5, 0x17b, 0xbe, 0x2, 0x204, 0x205, 
+    0x5, 0x191, 0xc9, 0x2, 0x205, 0x206, 0x5, 0x18b, 0xc6, 0x2, 0x206, 0x207, 
+    0x5, 0x17b, 0xbe, 0x2, 0x207, 0x208, 0x5, 0x19f, 0xd0, 0x2, 0x208, 0x8, 
+    0x3, 0x2, 0x2, 0x2, 0x209, 0x20a, 0x5, 0x17b, 0xbe, 0x2, 0x20a, 0x20b, 
+    0x5, 0x191, 0xc9, 0x2, 0x20b, 0x20c, 0x5, 0x191, 0xc9, 0x2, 0x20c, 0xa, 
+    0x3, 0x2, 0x2, 0x2, 0x20d, 0x20e, 0x5, 0x17b, 0xbe, 0x2, 0x20e, 0x20f, 
+    0x5, 0x191, 0xc9, 0x2, 0x20f, 0x210, 0x5, 0x1a1, 0xd1, 0x2, 0x210, 0x211, 
+    0x5, 0x183, 0xc2, 0x2, 0x211, 0x212, 0x5, 0x19d, 0xcf, 0x2, 0x212, 0xc, 
+    0x3, 0x2, 0x2, 0x2, 0x213, 0x214, 0x5, 0x17b, 0xbe, 0x2, 0x214, 0x215, 
+    0x5, 0x195, 0xcb, 0x2, 0x215, 0x216, 0x5, 0x181, 0xc1, 0x2, 0x216, 0xe, 
+    0x3, 0x2, 0x2, 0x2, 0x217, 0x218, 0x5, 0x17b, 0xbe, 0x2, 0x218, 0x219, 
+    0x5, 0x195, 0xcb, 0x2, 0x219, 0x21a, 0x5, 0x1a1, 0xd1, 0x2, 0x21a, 0x21b, 
+    0x5, 0x18b, 0xc6, 0x2, 0x21b, 0x10, 0x3, 0x2, 0x2, 0x2, 0x21c, 0x21d, 
+    0x5, 0x17b, 0xbe, 0x2, 0x21d, 0x21e, 0x5, 0x195, 0xcb, 0x2, 0x21e, 0x21f, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x21f, 0x12, 0x3, 0x2, 0x2, 0x2, 0x220, 0x221, 
+    0x5, 0x17b, 0xbe, 0x2, 0x221, 0x222, 0x5, 0x19d, 0xcf, 0x2, 0x222, 0x223, 
+    0x5, 0x19d, 0xcf, 0x2, 0x223, 0x224, 0x5, 0x17b, 0xbe, 0x2, 0x224, 0x225, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x225, 0x14, 0x3, 0x2, 0x2, 0x2, 0x226, 0x227, 
+    0x5, 0x17b, 0xbe, 0x2, 0x227, 0x228, 0x5, 0x19f, 0xd0, 0x2, 0x228, 0x16, 
+    0x3, 0x2, 0x2, 0x2, 0x229, 0x22a, 0x5, 0x17b, 0xbe, 0x2, 0x22a, 0x22b, 
+    0x5, 0x19f, 0xd0, 0x2, 0x22b, 0x22c, 0x5, 0x17f, 0xc0, 0x2, 0x22c, 0x238, 
+    0x3, 0x2, 0x2, 0x2, 0x22d, 0x22e, 0x5, 0x17b, 0xbe, 0x2, 0x22e, 0x22f, 
+    0x5, 0x19f, 0xd0, 0x2, 0x22f, 0x230, 0x5, 0x17f, 0xc0, 0x2, 0x230, 0x231, 
+    0x5, 0x183, 0xc2, 0x2, 0x231, 0x232, 0x5, 0x195, 0xcb, 0x2, 0x232, 0x233, 
+    0x5, 0x181, 0xc1, 0x2, 0x233, 0x234, 0x5, 0x18b, 0xc6, 0x2, 0x234, 0x235, 
+    0x5, 0x195, 0xcb, 0x2, 0x235, 0x236, 0x5, 0x187, 0xc4, 0x2, 0x236, 0x238, 
+    0x3, 0x2, 0x2, 0x2, 0x237, 0x229, 0x3, 0x2, 0x2, 0x2, 0x237, 0x22d, 
+    0x3, 0x2, 0x2, 0x2, 0x238, 0x18, 0x3, 0x2, 0x2, 0x2, 0x239, 0x23a, 0x5, 
+    0x17b, 0xbe, 0x2, 0x23a, 0x23b, 0x5, 0x19f, 0xd0, 0x2, 0x23b, 0x23c, 
+    0x5, 0x197, 0xcc, 0x2, 0x23c, 0x23d, 0x5, 0x185, 0xc3, 0x2, 0x23d, 0x1a, 
+    0x3, 0x2, 0x2, 0x2, 0x23e, 0x23f, 0x5, 0x17b, 0xbe, 0x2, 0x23f, 0x240, 
+    0x5, 0x19f, 0xd0, 0x2, 0x240, 0x241, 0x5, 0x1ab, 0xd6, 0x2, 0x241, 0x242, 
+    0x5, 0x195, 0xcb, 0x2, 0x242, 0x243, 0x5, 0x17f, 0xc0, 0x2, 0x243, 0x1c, 
+    0x3, 0x2, 0x2, 0x2, 0x244, 0x245, 0x5, 0x17b, 0xbe, 0x2, 0x245, 0x246, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x246, 0x247, 0x5, 0x1a1, 0xd1, 0x2, 0x247, 0x248, 
+    0x5, 0x17b, 0xbe, 0x2, 0x248, 0x249, 0x5, 0x17f, 0xc0, 0x2, 0x249, 0x24a, 
+    0x5, 0x189, 0xc5, 0x2, 0x24a, 0x1e, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x24c, 
+    0x5, 0x17d, 0xbf, 0x2, 0x24c, 0x24d, 0x5, 0x183, 0xc2, 0x2, 0x24d, 0x24e, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x24e, 0x24f, 0x5, 0x1a7, 0xd4, 0x2, 0x24f, 0x250, 
+    0x5, 0x183, 0xc2, 0x2, 0x250, 0x251, 0x5, 0x183, 0xc2, 0x2, 0x251, 0x252, 
+    0x5, 0x195, 0xcb, 0x2, 0x252, 0x20, 0x3, 0x2, 0x2, 0x2, 0x253, 0x254, 
+    0x5, 0x17d, 0xbf, 0x2, 0x254, 0x255, 0x5, 0x197, 0xcc, 0x2, 0x255, 0x256, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x256, 0x257, 0x5, 0x189, 0xc5, 0x2, 0x257, 0x22, 
+    0x3, 0x2, 0x2, 0x2, 0x258, 0x259, 0x5, 0x17d, 0xbf, 0x2, 0x259, 0x25a, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x25a, 0x24, 0x3, 0x2, 0x2, 0x2, 0x25b, 0x25c, 
+    0x5, 0x17f, 0xc0, 0x2, 0x25c, 0x25d, 0x5, 0x17b, 0xbe, 0x2, 0x25d, 0x25e, 
+    0x5, 0x19f, 0xd0, 0x2, 0x25e, 0x25f, 0x5, 0x183, 0xc2, 0x2, 0x25f, 0x26, 
+    0x3, 0x2, 0x2, 0x2, 0x260, 0x261, 0x5, 0x17f, 0xc0, 0x2, 0x261, 0x262, 
+    0x5, 0x17b, 0xbe, 0x2, 0x262, 0x263, 0x5, 0x19f, 0xd0, 0x2, 0x263, 0x264, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x264, 0x28, 0x3, 0x2, 0x2, 0x2, 0x265, 0x266, 
+    0x5, 0x17f, 0xc0, 0x2, 0x266, 0x267, 0x5, 0x189, 0xc5, 0x2, 0x267, 0x268, 
+    0x5, 0x183, 0xc2, 0x2, 0x268, 0x269, 0x5, 0x17f, 0xc0, 0x2, 0x269, 0x26a, 
+    0x5, 0x18f, 0xc8, 0x2, 0x26a, 0x2a, 0x3, 0x2, 0x2, 0x2, 0x26b, 0x26c, 
+    0x5, 0x17f, 0xc0, 0x2, 0x26c, 0x26d, 0x5, 0x191, 0xc9, 0x2, 0x26d, 0x26e, 
+    0x5, 0x183, 0xc2, 0x2, 0x26e, 0x26f, 0x5, 0x17b, 0xbe, 0x2, 0x26f, 0x270, 
+    0x5, 0x19d, 0xcf, 0x2, 0x270, 0x2c, 0x3, 0x2, 0x2, 0x2, 0x271, 0x272, 
+    0x5, 0x17f, 0xc0, 0x2, 0x272, 0x273, 0x5, 0x191, 0xc9, 0x2, 0x273, 0x274, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x274, 0x275, 0x5, 0x19f, 0xd0, 0x2, 0x275, 0x276, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x276, 0x277, 0x5, 0x183, 0xc2, 0x2, 0x277, 0x278, 
+    0x5, 0x19d, 0xcf, 0x2, 0x278, 0x2e, 0x3, 0x2, 0x2, 0x2, 0x279, 0x27a, 
+    0x5, 0x17f, 0xc0, 0x2, 0x27a, 0x27b, 0x5, 0x197, 0xcc, 0x2, 0x27b, 0x27c, 
+    0x5, 0x181, 0xc1, 0x2, 0x27c, 0x27d, 0x5, 0x183, 0xc2, 0x2, 0x27d, 0x27e, 
+    0x5, 0x17f, 0xc0, 0x2, 0x27e, 0x30, 0x3, 0x2, 0x2, 0x2, 0x27f, 0x280, 
+    0x5, 0x17f, 0xc0, 0x2, 0x280, 0x281, 0x5, 0x197, 0xcc, 0x2, 0x281, 0x282, 
+    0x5, 0x191, 0xc9, 0x2, 0x282, 0x283, 0x5, 0x191, 0xc9, 0x2, 0x283, 0x284, 
+    0x5, 0x17b, 0xbe, 0x2, 0x284, 0x285, 0x5, 0x1a1, 0xd1, 0x2, 0x285, 0x286, 
+    0x5, 0x183, 0xc2, 0x2, 0x286, 0x32, 0x3, 0x2, 0x2, 0x2, 0x287, 0x288, 
+    0x5, 0x17f, 0xc0, 0x2, 0x288, 0x289, 0x5, 0x197, 0xcc, 0x2, 0x289, 0x28a, 
+    0x5, 0x191, 0xc9, 0x2, 0x28a, 0x28b, 0x5, 0x1a3, 0xd2, 0x2, 0x28b, 0x28c, 
+    0x5, 0x193, 0xca, 0x2, 0x28c, 0x28d, 0x5, 0x195, 0xcb, 0x2, 0x28d, 0x34, 
+    0x3, 0x2, 0x2, 0x2, 0x28e, 0x28f, 0x5, 0x17f, 0xc0, 0x2, 0x28f, 0x290, 
+    0x5, 0x197, 0xcc, 0x2, 0x290, 0x291, 0x5, 0x193, 0xca, 0x2, 0x291, 0x292, 
+    0x5, 0x193, 0xca, 0x2, 0x292, 0x293, 0x5, 0x183, 0xc2, 0x2, 0x293, 0x294, 
+    0x5, 0x195, 0xcb, 0x2, 0x294, 0x295, 0x5, 0x1a1, 0xd1, 0x2, 0x295, 0x36, 
+    0x3, 0x2, 0x2, 0x2, 0x296, 0x297, 0x5, 0x17f, 0xc0, 0x2, 0x297, 0x298, 
+    0x5, 0x197, 0xcc, 0x2, 0x298, 0x299, 0x5, 0x195, 0xcb, 0x2, 0x299, 0x29a, 
+    0x5, 0x19f, 0xd0, 0x2, 0x29a, 0x29b, 0x5, 0x1a1, 0xd1, 0x2, 0x29b, 0x29c, 
+    0x5, 0x19d, 0xcf, 0x2, 0x29c, 0x29d, 0x5, 0x17b, 0xbe, 0x2, 0x29d, 0x29e, 
+    0x5, 0x18b, 0xc6, 0x2, 0x29e, 0x29f, 0x5, 0x195, 0xcb, 0x2, 0x29f, 0x2a0, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x2a0, 0x38, 0x3, 0x2, 0x2, 0x2, 0x2a1, 0x2a2, 
+    0x5, 0x17f, 0xc0, 0x2, 0x2a2, 0x2a3, 0x5, 0x19d, 0xcf, 0x2, 0x2a3, 0x2a4, 
+    0x5, 0x183, 0xc2, 0x2, 0x2a4, 0x2a5, 0x5, 0x17b, 0xbe, 0x2, 0x2a5, 0x2a6, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x2a6, 0x2a7, 0x5, 0x183, 0xc2, 0x2, 0x2a7, 0x3a, 
+    0x3, 0x2, 0x2, 0x2, 0x2a8, 0x2a9, 0x5, 0x17f, 0xc0, 0x2, 0x2a9, 0x2aa, 
+    0x5, 0x19d, 0xcf, 0x2, 0x2aa, 0x2ab, 0x5, 0x197, 0xcc, 0x2, 0x2ab, 0x2ac, 
+    0x5, 0x19f, 0xd0, 0x2, 0x2ac, 0x2ad, 0x5, 0x19f, 0xd0, 0x2, 0x2ad, 0x3c, 
+    0x3, 0x2, 0x2, 0x2, 0x2ae, 0x2af, 0x5, 0x17f, 0xc0, 0x2, 0x2af, 0x2b0, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x2b0, 0x2b1, 0x5, 0x17d, 0xbf, 0x2, 0x2b1, 0x2b2, 
+    0x5, 0x183, 0xc2, 0x2, 0x2b2, 0x3e, 0x3, 0x2, 0x2, 0x2, 0x2b3, 0x2b4, 
+    0x5, 0x181, 0xc1, 0x2, 0x2b4, 0x2b5, 0x5, 0x17b, 0xbe, 0x2, 0x2b5, 0x2b6, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x2b6, 0x2b7, 0x5, 0x17b, 0xbe, 0x2, 0x2b7, 0x2b8, 
+    0x5, 0x17d, 0xbf, 0x2, 0x2b8, 0x2b9, 0x5, 0x17b, 0xbe, 0x2, 0x2b9, 0x2ba, 
+    0x5, 0x19f, 0xd0, 0x2, 0x2ba, 0x2bb, 0x5, 0x183, 0xc2, 0x2, 0x2bb, 0x40, 
+    0x3, 0x2, 0x2, 0x2, 0x2bc, 0x2bd, 0x5, 0x181, 0xc1, 0x2, 0x2bd, 0x2be, 
+    0x5, 0x17b, 0xbe, 0x2, 0x2be, 0x2bf, 0x5, 0x1a1, 0xd1, 0x2, 0x2bf, 0x2c0, 
+    0x5, 0x17b, 0xbe, 0x2, 0x2c0, 0x2c1, 0x5, 0x17d, 0xbf, 0x2, 0x2c1, 0x2c2, 
+    0x5, 0x17b, 0xbe, 0x2, 0x2c2, 0x2c3, 0x5, 0x19f, 0xd0, 0x2, 0x2c3, 0x2c4, 
+    0x5, 0x183, 0xc2, 0x2, 0x2c4, 0x2c5, 0x5, 0x19f, 0xd0, 0x2, 0x2c5, 0x42, 
+    0x3, 0x2, 0x2, 0x2, 0x2c6, 0x2c7, 0x5, 0x181, 0xc1, 0x2, 0x2c7, 0x2c8, 
+    0x5, 0x17b, 0xbe, 0x2, 0x2c8, 0x2c9, 0x5, 0x1a1, 0xd1, 0x2, 0x2c9, 0x2ca, 
+    0x5, 0x183, 0xc2, 0x2, 0x2ca, 0x44, 0x3, 0x2, 0x2, 0x2, 0x2cb, 0x2cc, 
+    0x5, 0x181, 0xc1, 0x2, 0x2cc, 0x2cd, 0x5, 0x17b, 0xbe, 0x2, 0x2cd, 0x2ce, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x2ce, 0x46, 0x3, 0x2, 0x2, 0x2, 0x2cf, 0x2d0, 
+    0x5, 0x181, 0xc1, 0x2, 0x2d0, 0x2d1, 0x5, 0x183, 0xc2, 0x2, 0x2d1, 0x2d2, 
+    0x5, 0x181, 0xc1, 0x2, 0x2d2, 0x2d3, 0x5, 0x1a3, 0xd2, 0x2, 0x2d3, 0x2d4, 
+    0x5, 0x199, 0xcd, 0x2, 0x2d4, 0x2d5, 0x5, 0x191, 0xc9, 0x2, 0x2d5, 0x2d6, 
+    0x5, 0x18b, 0xc6, 0x2, 0x2d6, 0x2d7, 0x5, 0x17f, 0xc0, 0x2, 0x2d7, 0x2d8, 
+    0x5, 0x17b, 0xbe, 0x2, 0x2d8, 0x2d9, 0x5, 0x1a1, 0xd1, 0x2, 0x2d9, 0x2da, 
+    0x5, 0x183, 0xc2, 0x2, 0x2da, 0x48, 0x3, 0x2, 0x2, 0x2, 0x2db, 0x2dc, 
+    0x5, 0x181, 0xc1, 0x2, 0x2dc, 0x2dd, 0x5, 0x183, 0xc2, 0x2, 0x2dd, 0x2de, 
+    0x5, 0x185, 0xc3, 0x2, 0x2de, 0x2df, 0x5, 0x17b, 0xbe, 0x2, 0x2df, 0x2e0, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x2e0, 0x2e1, 0x5, 0x191, 0xc9, 0x2, 0x2e1, 0x2e2, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x2e2, 0x4a, 0x3, 0x2, 0x2, 0x2, 0x2e3, 0x2e4, 
+    0x5, 0x181, 0xc1, 0x2, 0x2e4, 0x2e5, 0x5, 0x183, 0xc2, 0x2, 0x2e5, 0x2e6, 
+    0x5, 0x191, 0xc9, 0x2, 0x2e6, 0x2e7, 0x5, 0x17b, 0xbe, 0x2, 0x2e7, 0x2e8, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x2e8, 0x4c, 0x3, 0x2, 0x2, 0x2, 0x2e9, 0x2ea, 
+    0x5, 0x181, 0xc1, 0x2, 0x2ea, 0x2eb, 0x5, 0x183, 0xc2, 0x2, 0x2eb, 0x2ec, 
+    0x5, 0x191, 0xc9, 0x2, 0x2ec, 0x2ed, 0x5, 0x183, 0xc2, 0x2, 0x2ed, 0x2ee, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x2ee, 0x2ef, 0x5, 0x183, 0xc2, 0x2, 0x2ef, 0x4e, 
+    0x3, 0x2, 0x2, 0x2, 0x2f0, 0x2f1, 0x5, 0x181, 0xc1, 0x2, 0x2f1, 0x2f2, 
+    0x5, 0x183, 0xc2, 0x2, 0x2f2, 0x2f3, 0x5, 0x19f, 0xd0, 0x2, 0x2f3, 0x2f4, 
+    0x5, 0x17f, 0xc0, 0x2, 0x2f4, 0x50, 0x3, 0x2, 0x2, 0x2, 0x2f5, 0x2f6, 
+    0x5, 0x181, 0xc1, 0x2, 0x2f6, 0x2f7, 0x5, 0x183, 0xc2, 0x2, 0x2f7, 0x2f8, 
+    0x5, 0x19f, 0xd0, 0x2, 0x2f8, 0x2f9, 0x5, 0x17f, 0xc0, 0x2, 0x2f9, 0x2fa, 
+    0x5, 0x183, 0xc2, 0x2, 0x2fa, 0x2fb, 0x5, 0x195, 0xcb, 0x2, 0x2fb, 0x2fc, 
+    0x5, 0x181, 0xc1, 0x2, 0x2fc, 0x2fd, 0x5, 0x18b, 0xc6, 0x2, 0x2fd, 0x2fe, 
+    0x5, 0x195, 0xcb, 0x2, 0x2fe, 0x2ff, 0x5, 0x187, 0xc4, 0x2, 0x2ff, 0x52, 
+    0x3, 0x2, 0x2, 0x2, 0x300, 0x301, 0x5, 0x181, 0xc1, 0x2, 0x301, 0x302, 
+    0x5, 0x183, 0xc2, 0x2, 0x302, 0x303, 0x5, 0x19f, 0xd0, 0x2, 0x303, 0x304, 
+    0x5, 0x17f, 0xc0, 0x2, 0x304, 0x305, 0x5, 0x19d, 0xcf, 0x2, 0x305, 0x306, 
+    0x5, 0x18b, 0xc6, 0x2, 0x306, 0x307, 0x5, 0x17d, 0xbf, 0x2, 0x307, 0x308, 
+    0x5, 0x183, 0xc2, 0x2, 0x308, 0x54, 0x3, 0x2, 0x2, 0x2, 0x309, 0x30a, 
+    0x5, 0x181, 0xc1, 0x2, 0x30a, 0x30b, 0x5, 0x183, 0xc2, 0x2, 0x30b, 0x30c, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x30c, 0x30d, 0x5, 0x17b, 0xbe, 0x2, 0x30d, 0x30e, 
+    0x5, 0x17f, 0xc0, 0x2, 0x30e, 0x30f, 0x5, 0x189, 0xc5, 0x2, 0x30f, 0x56, 
+    0x3, 0x2, 0x2, 0x2, 0x310, 0x311, 0x5, 0x181, 0xc1, 0x2, 0x311, 0x312, 
+    0x5, 0x18b, 0xc6, 0x2, 0x312, 0x313, 0x5, 0x17f, 0xc0, 0x2, 0x313, 0x314, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x314, 0x315, 0x5, 0x18b, 0xc6, 0x2, 0x315, 0x316, 
+    0x5, 0x197, 0xcc, 0x2, 0x316, 0x317, 0x5, 0x195, 0xcb, 0x2, 0x317, 0x318, 
+    0x5, 0x17b, 0xbe, 0x2, 0x318, 0x319, 0x5, 0x19d, 0xcf, 0x2, 0x319, 0x31a, 
+    0x5, 0x18b, 0xc6, 0x2, 0x31a, 0x31b, 0x5, 0x183, 0xc2, 0x2, 0x31b, 0x31c, 
+    0x5, 0x19f, 0xd0, 0x2, 0x31c, 0x58, 0x3, 0x2, 0x2, 0x2, 0x31d, 0x31e, 
+    0x5, 0x181, 0xc1, 0x2, 0x31e, 0x31f, 0x5, 0x18b, 0xc6, 0x2, 0x31f, 0x320, 
+    0x5, 0x17f, 0xc0, 0x2, 0x320, 0x321, 0x5, 0x1a1, 0xd1, 0x2, 0x321, 0x322, 
+    0x5, 0x18b, 0xc6, 0x2, 0x322, 0x323, 0x5, 0x197, 0xcc, 0x2, 0x323, 0x324, 
+    0x5, 0x195, 0xcb, 0x2, 0x324, 0x325, 0x5, 0x17b, 0xbe, 0x2, 0x325, 0x326, 
+    0x5, 0x19d, 0xcf, 0x2, 0x326, 0x327, 0x5, 0x1ab, 0xd6, 0x2, 0x327, 0x5a, 
+    0x3, 0x2, 0x2, 0x2, 0x328, 0x329, 0x5, 0x181, 0xc1, 0x2, 0x329, 0x32a, 
+    0x5, 0x18b, 0xc6, 0x2, 0x32a, 0x32b, 0x5, 0x19f, 0xd0, 0x2, 0x32b, 0x32c, 
+    0x5, 0x18f, 0xc8, 0x2, 0x32c, 0x5c, 0x3, 0x2, 0x2, 0x2, 0x32d, 0x32e, 
+    0x5, 0x181, 0xc1, 0x2, 0x32e, 0x32f, 0x5, 0x18b, 0xc6, 0x2, 0x32f, 0x330, 
+    0x5, 0x19f, 0xd0, 0x2, 0x330, 0x331, 0x5, 0x1a1, 0xd1, 0x2, 0x331, 0x332, 
+    0x5, 0x18b, 0xc6, 0x2, 0x332, 0x333, 0x5, 0x195, 0xcb, 0x2, 0x333, 0x334, 
+    0x5, 0x17f, 0xc0, 0x2, 0x334, 0x335, 0x5, 0x1a1, 0xd1, 0x2, 0x335, 0x5e, 
+    0x3, 0x2, 0x2, 0x2, 0x336, 0x337, 0x5, 0x181, 0xc1, 0x2, 0x337, 0x338, 
+    0x5, 0x18b, 0xc6, 0x2, 0x338, 0x339, 0x5, 0x19f, 0xd0, 0x2, 0x339, 0x33a, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x33a, 0x33b, 0x5, 0x19d, 0xcf, 0x2, 0x33b, 0x33c, 
+    0x5, 0x18b, 0xc6, 0x2, 0x33c, 0x33d, 0x5, 0x17d, 0xbf, 0x2, 0x33d, 0x33e, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x33e, 0x33f, 0x5, 0x1a1, 0xd1, 0x2, 0x33f, 0x340, 
+    0x5, 0x183, 0xc2, 0x2, 0x340, 0x341, 0x5, 0x181, 0xc1, 0x2, 0x341, 0x60, 
+    0x3, 0x2, 0x2, 0x2, 0x342, 0x343, 0x5, 0x181, 0xc1, 0x2, 0x343, 0x344, 
+    0x5, 0x19d, 0xcf, 0x2, 0x344, 0x345, 0x5, 0x197, 0xcc, 0x2, 0x345, 0x346, 
+    0x5, 0x199, 0xcd, 0x2, 0x346, 0x62, 0x3, 0x2, 0x2, 0x2, 0x347, 0x348, 
+    0x5, 0x183, 0xc2, 0x2, 0x348, 0x349, 0x5, 0x191, 0xc9, 0x2, 0x349, 0x34a, 
+    0x5, 0x19f, 0xd0, 0x2, 0x34a, 0x34b, 0x5, 0x183, 0xc2, 0x2, 0x34b, 0x64, 
+    0x3, 0x2, 0x2, 0x2, 0x34c, 0x34d, 0x5, 0x183, 0xc2, 0x2, 0x34d, 0x34e, 
+    0x5, 0x195, 0xcb, 0x2, 0x34e, 0x34f, 0x5, 0x181, 0xc1, 0x2, 0x34f, 0x66, 
+    0x3, 0x2, 0x2, 0x2, 0x350, 0x351, 0x5, 0x183, 0xc2, 0x2, 0x351, 0x352, 
+    0x5, 0x195, 0xcb, 0x2, 0x352, 0x353, 0x5, 0x187, 0xc4, 0x2, 0x353, 0x354, 
+    0x5, 0x18b, 0xc6, 0x2, 0x354, 0x355, 0x5, 0x195, 0xcb, 0x2, 0x355, 0x356, 
+    0x5, 0x183, 0xc2, 0x2, 0x356, 0x68, 0x3, 0x2, 0x2, 0x2, 0x357, 0x358, 
+    0x5, 0x183, 0xc2, 0x2, 0x358, 0x359, 0x5, 0x1a5, 0xd3, 0x2, 0x359, 0x35a, 
+    0x5, 0x183, 0xc2, 0x2, 0x35a, 0x35b, 0x5, 0x195, 0xcb, 0x2, 0x35b, 0x35c, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x35c, 0x35d, 0x5, 0x19f, 0xd0, 0x2, 0x35d, 0x6a, 
+    0x3, 0x2, 0x2, 0x2, 0x35e, 0x35f, 0x5, 0x183, 0xc2, 0x2, 0x35f, 0x360, 
+    0x5, 0x1a9, 0xd5, 0x2, 0x360, 0x361, 0x5, 0x18b, 0xc6, 0x2, 0x361, 0x362, 
+    0x5, 0x19f, 0xd0, 0x2, 0x362, 0x363, 0x5, 0x1a1, 0xd1, 0x2, 0x363, 0x364, 
+    0x5, 0x19f, 0xd0, 0x2, 0x364, 0x6c, 0x3, 0x2, 0x2, 0x2, 0x365, 0x366, 
+    0x5, 0x183, 0xc2, 0x2, 0x366, 0x367, 0x5, 0x1a9, 0xd5, 0x2, 0x367, 0x368, 
+    0x5, 0x199, 0xcd, 0x2, 0x368, 0x369, 0x5, 0x191, 0xc9, 0x2, 0x369, 0x36a, 
+    0x5, 0x17b, 0xbe, 0x2, 0x36a, 0x36b, 0x5, 0x18b, 0xc6, 0x2, 0x36b, 0x36c, 
+    0x5, 0x195, 0xcb, 0x2, 0x36c, 0x6e, 0x3, 0x2, 0x2, 0x2, 0x36d, 0x36e, 
+    0x5, 0x183, 0xc2, 0x2, 0x36e, 0x36f, 0x5, 0x1a9, 0xd5, 0x2, 0x36f, 0x370, 
+    0x5, 0x199, 0xcd, 0x2, 0x370, 0x371, 0x5, 0x19d, 0xcf, 0x2, 0x371, 0x372, 
+    0x5, 0x183, 0xc2, 0x2, 0x372, 0x373, 0x5, 0x19f, 0xd0, 0x2, 0x373, 0x374, 
+    0x5, 0x19f, 0xd0, 0x2, 0x374, 0x375, 0x5, 0x18b, 0xc6, 0x2, 0x375, 0x376, 
+    0x5, 0x197, 0xcc, 0x2, 0x376, 0x377, 0x5, 0x195, 0xcb, 0x2, 0x377, 0x70, 
+    0x3, 0x2, 0x2, 0x2, 0x378, 0x379, 0x5, 0x183, 0xc2, 0x2, 0x379, 0x37a, 
+    0x5, 0x1a9, 0xd5, 0x2, 0x37a, 0x37b, 0x5, 0x1a1, 0xd1, 0x2, 0x37b, 0x37c, 
+    0x5, 0x19d, 0xcf, 0x2, 0x37c, 0x37d, 0x5, 0x17b, 0xbe, 0x2, 0x37d, 0x37e, 
+    0x5, 0x17f, 0xc0, 0x2, 0x37e, 0x37f, 0x5, 0x1a1, 0xd1, 0x2, 0x37f, 0x72, 
+    0x3, 0x2, 0x2, 0x2, 0x380, 0x381, 0x5, 0x185, 0xc3, 0x2, 0x381, 0x382, 
+    0x5, 0x183, 0xc2, 0x2, 0x382, 0x383, 0x5, 0x1a1, 0xd1, 0x2, 0x383, 0x384, 
+    0x5, 0x17f, 0xc0, 0x2, 0x384, 0x385, 0x5, 0x189, 0xc5, 0x2, 0x385, 0x386, 
+    0x5, 0x183, 0xc2, 0x2, 0x386, 0x387, 0x5, 0x19f, 0xd0, 0x2, 0x387, 0x74, 
+    0x3, 0x2, 0x2, 0x2, 0x388, 0x389, 0x5, 0x185, 0xc3, 0x2, 0x389, 0x38a, 
+    0x5, 0x18b, 0xc6, 0x2, 0x38a, 0x38b, 0x5, 0x195, 0xcb, 0x2, 0x38b, 0x38c, 
+    0x5, 0x17b, 0xbe, 0x2, 0x38c, 0x38d, 0x5, 0x191, 0xc9, 0x2, 0x38d, 0x76, 
+    0x3, 0x2, 0x2, 0x2, 0x38e, 0x38f, 0x5, 0x185, 0xc3, 0x2, 0x38f, 0x390, 
+    0x5, 0x18b, 0xc6, 0x2, 0x390, 0x391, 0x5, 0x19d, 0xcf, 0x2, 0x391, 0x392, 
+    0x5, 0x19f, 0xd0, 0x2, 0x392, 0x393, 0x5, 0x1a1, 0xd1, 0x2, 0x393, 0x78, 
+    0x3, 0x2, 0x2, 0x2, 0x394, 0x395, 0x5, 0x185, 0xc3, 0x2, 0x395, 0x396, 
+    0x5, 0x191, 0xc9, 0x2, 0x396, 0x397, 0x5, 0x1a3, 0xd2, 0x2, 0x397, 0x398, 
+    0x5, 0x19f, 0xd0, 0x2, 0x398, 0x399, 0x5, 0x189, 0xc5, 0x2, 0x399, 0x7a, 
+    0x3, 0x2, 0x2, 0x2, 0x39a, 0x39b, 0x5, 0x185, 0xc3, 0x2, 0x39b, 0x39c, 
+    0x5, 0x197, 0xcc, 0x2, 0x39c, 0x39d, 0x5, 0x19d, 0xcf, 0x2, 0x39d, 0x7c, 
+    0x3, 0x2, 0x2, 0x2, 0x39e, 0x39f, 0x5, 0x185, 0xc3, 0x2, 0x39f, 0x3a0, 
+    0x5, 0x197, 0xcc, 0x2, 0x3a0, 0x3a1, 0x5, 0x19d, 0xcf, 0x2, 0x3a1, 0x3a2, 
+    0x5, 0x193, 0xca, 0x2, 0x3a2, 0x3a3, 0x5, 0x17b, 0xbe, 0x2, 0x3a3, 0x3a4, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x3a4, 0x7e, 0x3, 0x2, 0x2, 0x2, 0x3a5, 0x3a6, 
+    0x5, 0x185, 0xc3, 0x2, 0x3a6, 0x3a7, 0x5, 0x19d, 0xcf, 0x2, 0x3a7, 0x3a8, 
+    0x5, 0x183, 0xc2, 0x2, 0x3a8, 0x3a9, 0x5, 0x183, 0xc2, 0x2, 0x3a9, 0x3aa, 
+    0x5, 0x1ad, 0xd7, 0x2, 0x3aa, 0x3ab, 0x5, 0x183, 0xc2, 0x2, 0x3ab, 0x80, 
+    0x3, 0x2, 0x2, 0x2, 0x3ac, 0x3ad, 0x5, 0x185, 0xc3, 0x2, 0x3ad, 0x3ae, 
+    0x5, 0x19d, 0xcf, 0x2, 0x3ae, 0x3af, 0x5, 0x197, 0xcc, 0x2, 0x3af, 0x3b0, 
+    0x5, 0x193, 0xca, 0x2, 0x3b0, 0x82, 0x3, 0x2, 0x2, 0x2, 0x3b1, 0x3b2, 
+    0x5, 0x185, 0xc3, 0x2, 0x3b2, 0x3b3, 0x5, 0x1a3, 0xd2, 0x2, 0x3b3, 0x3b4, 
+    0x5, 0x191, 0xc9, 0x2, 0x3b4, 0x3b5, 0x5, 0x191, 0xc9, 0x2, 0x3b5, 0x84, 
+    0x3, 0x2, 0x2, 0x2, 0x3b6, 0x3b7, 0x5, 0x185, 0xc3, 0x2, 0x3b7, 0x3b8, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x3b8, 0x3b9, 0x5, 0x195, 0xcb, 0x2, 0x3b9, 0x3ba, 
+    0x5, 0x17f, 0xc0, 0x2, 0x3ba, 0x3bb, 0x5, 0x1a1, 0xd1, 0x2, 0x3bb, 0x3bc, 
+    0x5, 0x18b, 0xc6, 0x2, 0x3bc, 0x3bd, 0x5, 0x197, 0xcc, 0x2, 0x3bd, 0x3be, 
+    0x5, 0x195, 0xcb, 0x2, 0x3be, 0x86, 0x3, 0x2, 0x2, 0x2, 0x3bf, 0x3c0, 
+    0x5, 0x187, 0xc4, 0x2, 0x3c0, 0x3c1, 0x5, 0x191, 0xc9, 0x2, 0x3c1, 0x3c2, 
+    0x5, 0x197, 0xcc, 0x2, 0x3c2, 0x3c3, 0x5, 0x17d, 0xbf, 0x2, 0x3c3, 0x3c4, 
+    0x5, 0x17b, 0xbe, 0x2, 0x3c4, 0x3c5, 0x5, 0x191, 0xc9, 0x2, 0x3c5, 0x88, 
+    0x3, 0x2, 0x2, 0x2, 0x3c6, 0x3c7, 0x5, 0x187, 0xc4, 0x2, 0x3c7, 0x3c8, 
+    0x5, 0x19d, 0xcf, 0x2, 0x3c8, 0x3c9, 0x5, 0x17b, 0xbe, 0x2, 0x3c9, 0x3ca, 
+    0x5, 0x195, 0xcb, 0x2, 0x3ca, 0x3cb, 0x5, 0x1a3, 0xd2, 0x2, 0x3cb, 0x3cc, 
+    0x5, 0x191, 0xc9, 0x2, 0x3cc, 0x3cd, 0x5, 0x17b, 0xbe, 0x2, 0x3cd, 0x3ce, 
+    0x5, 0x19d, 0xcf, 0x2, 0x3ce, 0x3cf, 0x5, 0x18b, 0xc6, 0x2, 0x3cf, 0x3d0, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x3d0, 0x3d1, 0x5, 0x1ab, 0xd6, 0x2, 0x3d1, 0x8a, 
+    0x3, 0x2, 0x2, 0x2, 0x3d2, 0x3d3, 0x5, 0x187, 0xc4, 0x2, 0x3d3, 0x3d4, 
+    0x5, 0x19d, 0xcf, 0x2, 0x3d4, 0x3d5, 0x5, 0x197, 0xcc, 0x2, 0x3d5, 0x3d6, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x3d6, 0x3d7, 0x5, 0x199, 0xcd, 0x2, 0x3d7, 0x8c, 
+    0x3, 0x2, 0x2, 0x2, 0x3d8, 0x3d9, 0x5, 0x189, 0xc5, 0x2, 0x3d9, 0x3da, 
+    0x5, 0x17b, 0xbe, 0x2, 0x3da, 0x3db, 0x5, 0x1a5, 0xd3, 0x2, 0x3db, 0x3dc, 
+    0x5, 0x18b, 0xc6, 0x2, 0x3dc, 0x3dd, 0x5, 0x195, 0xcb, 0x2, 0x3dd, 0x3de, 
+    0x5, 0x187, 0xc4, 0x2, 0x3de, 0x8e, 0x3, 0x2, 0x2, 0x2, 0x3df, 0x3e0, 
+    0x5, 0x189, 0xc5, 0x2, 0x3e0, 0x3e1, 0x5, 0x18b, 0xc6, 0x2, 0x3e1, 0x3e2, 
+    0x5, 0x183, 0xc2, 0x2, 0x3e2, 0x3e3, 0x5, 0x19d, 0xcf, 0x2, 0x3e3, 0x3e4, 
+    0x5, 0x17b, 0xbe, 0x2, 0x3e4, 0x3e5, 0x5, 0x19d, 0xcf, 0x2, 0x3e5, 0x3e6, 
+    0x5, 0x17f, 0xc0, 0x2, 0x3e6, 0x3e7, 0x5, 0x189, 0xc5, 0x2, 0x3e7, 0x3e8, 
+    0x5, 0x18b, 0xc6, 0x2, 0x3e8, 0x3e9, 0x5, 0x17f, 0xc0, 0x2, 0x3e9, 0x3ea, 
+    0x5, 0x17b, 0xbe, 0x2, 0x3ea, 0x3eb, 0x5, 0x191, 0xc9, 0x2, 0x3eb, 0x90, 
+    0x3, 0x2, 0x2, 0x2, 0x3ec, 0x3ed, 0x5, 0x189, 0xc5, 0x2, 0x3ed, 0x3ee, 
+    0x5, 0x197, 0xcc, 0x2, 0x3ee, 0x3ef, 0x5, 0x1a3, 0xd2, 0x2, 0x3ef, 0x3f0, 
+    0x5, 0x19d, 0xcf, 0x2, 0x3f0, 0x92, 0x3, 0x2, 0x2, 0x2, 0x3f1, 0x3f2, 
+    0x5, 0x18b, 0xc6, 0x2, 0x3f2, 0x3f3, 0x5, 0x181, 0xc1, 0x2, 0x3f3, 0x94, 
+    0x3, 0x2, 0x2, 0x2, 0x3f4, 0x3f5, 0x5, 0x18b, 0xc6, 0x2, 0x3f5, 0x3f6, 
+    0x5, 0x185, 0xc3, 0x2, 0x3f6, 0x96, 0x3, 0x2, 0x2, 0x2, 0x3f7, 0x3f8, 
+    0x5, 0x18b, 0xc6, 0x2, 0x3f8, 0x3f9, 0x5, 0x191, 0xc9, 0x2, 0x3f9, 0x3fa, 
+    0x5, 0x18b, 0xc6, 0x2, 0x3fa, 0x3fb, 0x5, 0x18f, 0xc8, 0x2, 0x3fb, 0x3fc, 
+    0x5, 0x183, 0xc2, 0x2, 0x3fc, 0x98, 0x3, 0x2, 0x2, 0x2, 0x3fd, 0x3fe, 
+    0x5, 0x18b, 0xc6, 0x2, 0x3fe, 0x3ff, 0x5, 0x195, 0xcb, 0x2, 0x3ff, 0x9a, 
+    0x3, 0x2, 0x2, 0x2, 0x400, 0x401, 0x5, 0x18b, 0xc6, 0x2, 0x401, 0x402, 
+    0x5, 0x195, 0xcb, 0x2, 0x402, 0x403, 0x5, 0x181, 0xc1, 0x2, 0x403, 0x404, 
+    0x5, 0x183, 0xc2, 0x2, 0x404, 0x405, 0x5, 0x1a9, 0xd5, 0x2, 0x405, 0x9c, 
+    0x3, 0x2, 0x2, 0x2, 0x406, 0x407, 0x5, 0x18b, 0xc6, 0x2, 0x407, 0x408, 
+    0x5, 0x195, 0xcb, 0x2, 0x408, 0x409, 0x5, 0x185, 0xc3, 0x2, 0x409, 0x414, 
+    0x3, 0x2, 0x2, 0x2, 0x40a, 0x40b, 0x5, 0x18b, 0xc6, 0x2, 0x40b, 0x40c, 
+    0x5, 0x195, 0xcb, 0x2, 0x40c, 0x40d, 0x5, 0x185, 0xc3, 0x2, 0x40d, 0x40e, 
+    0x5, 0x18b, 0xc6, 0x2, 0x40e, 0x40f, 0x5, 0x195, 0xcb, 0x2, 0x40f, 0x410, 
+    0x5, 0x18b, 0xc6, 0x2, 0x410, 0x411, 0x5, 0x1a1, 0xd1, 0x2, 0x411, 0x412, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x412, 0x414, 0x3, 0x2, 0x2, 0x2, 0x413, 0x406, 
+    0x3, 0x2, 0x2, 0x2, 0x413, 0x40a, 0x3, 0x2, 0x2, 0x2, 0x414, 0x9e, 0x3, 
+    0x2, 0x2, 0x2, 0x415, 0x416, 0x5, 0x18b, 0xc6, 0x2, 0x416, 0x417, 0x5, 
+    0x195, 0xcb, 0x2, 0x417, 0x418, 0x5, 0x18d, 0xc7, 0x2, 0x418, 0x419, 
+    0x5, 0x183, 0xc2, 0x2, 0x419, 0x41a, 0x5, 0x17f, 0xc0, 0x2, 0x41a, 0x41b, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x41b, 0x41c, 0x5, 0x18b, 0xc6, 0x2, 0x41c, 0x41d, 
+    0x5, 0x1a5, 0xd3, 0x2, 0x41d, 0x41e, 0x5, 0x183, 0xc2, 0x2, 0x41e, 0xa0, 
+    0x3, 0x2, 0x2, 0x2, 0x41f, 0x420, 0x5, 0x18b, 0xc6, 0x2, 0x420, 0x421, 
+    0x5, 0x195, 0xcb, 0x2, 0x421, 0x422, 0x5, 0x195, 0xcb, 0x2, 0x422, 0x423, 
+    0x5, 0x183, 0xc2, 0x2, 0x423, 0x424, 0x5, 0x19d, 0xcf, 0x2, 0x424, 0xa2, 
+    0x3, 0x2, 0x2, 0x2, 0x425, 0x426, 0x5, 0x18b, 0xc6, 0x2, 0x426, 0x427, 
+    0x5, 0x195, 0xcb, 0x2, 0x427, 0x428, 0x5, 0x19f, 0xd0, 0x2, 0x428, 0x429, 
+    0x5, 0x183, 0xc2, 0x2, 0x429, 0x42a, 0x5, 0x19d, 0xcf, 0x2, 0x42a, 0x42b, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x42b, 0xa4, 0x3, 0x2, 0x2, 0x2, 0x42c, 0x42d, 
+    0x5, 0x18b, 0xc6, 0x2, 0x42d, 0x42e, 0x5, 0x195, 0xcb, 0x2, 0x42e, 0x42f, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x42f, 0x430, 0x5, 0x183, 0xc2, 0x2, 0x430, 0x431, 
+    0x5, 0x19d, 0xcf, 0x2, 0x431, 0x432, 0x5, 0x1a5, 0xd3, 0x2, 0x432, 0x433, 
+    0x5, 0x17b, 0xbe, 0x2, 0x433, 0x434, 0x5, 0x191, 0xc9, 0x2, 0x434, 0xa6, 
+    0x3, 0x2, 0x2, 0x2, 0x435, 0x436, 0x5, 0x18b, 0xc6, 0x2, 0x436, 0x437, 
+    0x5, 0x195, 0xcb, 0x2, 0x437, 0x438, 0x5, 0x1a1, 0xd1, 0x2, 0x438, 0x439, 
+    0x5, 0x197, 0xcc, 0x2, 0x439, 0xa8, 0x3, 0x2, 0x2, 0x2, 0x43a, 0x43b, 
+    0x5, 0x18b, 0xc6, 0x2, 0x43b, 0x43c, 0x5, 0x19f, 0xd0, 0x2, 0x43c, 0xaa, 
+    0x3, 0x2, 0x2, 0x2, 0x43d, 0x43e, 0x5, 0x18b, 0xc6, 0x2, 0x43e, 0x43f, 
+    0x5, 0x19f, 0xd0, 0x2, 0x43f, 0x440, 0x5, 0x1f1, 0xf9, 0x2, 0x440, 0x441, 
+    0x5, 0x197, 0xcc, 0x2, 0x441, 0x442, 0x5, 0x17d, 0xbf, 0x2, 0x442, 0x443, 
+    0x5, 0x18d, 0xc7, 0x2, 0x443, 0x444, 0x5, 0x183, 0xc2, 0x2, 0x444, 0x445, 
+    0x5, 0x17f, 0xc0, 0x2, 0x445, 0x446, 0x5, 0x1a1, 0xd1, 0x2, 0x446, 0x447, 
+    0x5, 0x1f1, 0xf9, 0x2, 0x447, 0x448, 0x5, 0x18b, 0xc6, 0x2, 0x448, 0x449, 
+    0x5, 0x181, 0xc1, 0x2, 0x449, 0xac, 0x3, 0x2, 0x2, 0x2, 0x44a, 0x44b, 
+    0x5, 0x18d, 0xc7, 0x2, 0x44b, 0x44c, 0x5, 0x197, 0xcc, 0x2, 0x44c, 0x44d, 
+    0x5, 0x18b, 0xc6, 0x2, 0x44d, 0x44e, 0x5, 0x195, 0xcb, 0x2, 0x44e, 0xae, 
+    0x3, 0x2, 0x2, 0x2, 0x44f, 0x450, 0x5, 0x18f, 0xc8, 0x2, 0x450, 0x451, 
+    0x5, 0x183, 0xc2, 0x2, 0x451, 0x452, 0x5, 0x1ab, 0xd6, 0x2, 0x452, 0xb0, 
+    0x3, 0x2, 0x2, 0x2, 0x453, 0x454, 0x5, 0x18f, 0xc8, 0x2, 0x454, 0x455, 
+    0x5, 0x18b, 0xc6, 0x2, 0x455, 0x456, 0x5, 0x191, 0xc9, 0x2, 0x456, 0x457, 
+    0x5, 0x191, 0xc9, 0x2, 0x457, 0xb2, 0x3, 0x2, 0x2, 0x2, 0x458, 0x459, 
+    0x5, 0x191, 0xc9, 0x2, 0x459, 0x45a, 0x5, 0x17b, 0xbe, 0x2, 0x45a, 0x45b, 
+    0x5, 0x19f, 0xd0, 0x2, 0x45b, 0x45c, 0x5, 0x1a1, 0xd1, 0x2, 0x45c, 0xb4, 
+    0x3, 0x2, 0x2, 0x2, 0x45d, 0x45e, 0x5, 0x191, 0xc9, 0x2, 0x45e, 0x45f, 
+    0x5, 0x17b, 0xbe, 0x2, 0x45f, 0x460, 0x5, 0x1ab, 0xd6, 0x2, 0x460, 0x461, 
+    0x5, 0x197, 0xcc, 0x2, 0x461, 0x462, 0x5, 0x1a3, 0xd2, 0x2, 0x462, 0x463, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x463, 0xb6, 0x3, 0x2, 0x2, 0x2, 0x464, 0x465, 
+    0x5, 0x191, 0xc9, 0x2, 0x465, 0x466, 0x5, 0x183, 0xc2, 0x2, 0x466, 0x467, 
+    0x5, 0x17b, 0xbe, 0x2, 0x467, 0x468, 0x5, 0x181, 0xc1, 0x2, 0x468, 0x469, 
+    0x5, 0x18b, 0xc6, 0x2, 0x469, 0x46a, 0x5, 0x195, 0xcb, 0x2, 0x46a, 0x46b, 
+    0x5, 0x187, 0xc4, 0x2, 0x46b, 0xb8, 0x3, 0x2, 0x2, 0x2, 0x46c, 0x46d, 
+    0x5, 0x191, 0xc9, 0x2, 0x46d, 0x46e, 0x5, 0x183, 0xc2, 0x2, 0x46e, 0x46f, 
+    0x5, 0x185, 0xc3, 0x2, 0x46f, 0x470, 0x5, 0x1a1, 0xd1, 0x2, 0x470, 0xba, 
+    0x3, 0x2, 0x2, 0x2, 0x471, 0x472, 0x5, 0x191, 0xc9, 0x2, 0x472, 0x473, 
+    0x5, 0x18b, 0xc6, 0x2, 0x473, 0x474, 0x5, 0x185, 0xc3, 0x2, 0x474, 0x475, 
+    0x5, 0x183, 0xc2, 0x2, 0x475, 0x476, 0x5, 0x1a1, 0xd1, 0x2, 0x476, 0x477, 
+    0x5, 0x18b, 0xc6, 0x2, 0x477, 0x478, 0x5, 0x193, 0xca, 0x2, 0x478, 0x479, 
+    0x5, 0x183, 0xc2, 0x2, 0x479, 0xbc, 0x3, 0x2, 0x2, 0x2, 0x47a, 0x47b, 
+    0x5, 0x191, 0xc9, 0x2, 0x47b, 0x47c, 0x5, 0x18b, 0xc6, 0x2, 0x47c, 0x47d, 
+    0x5, 0x18f, 0xc8, 0x2, 0x47d, 0x47e, 0x5, 0x183, 0xc2, 0x2, 0x47e, 0xbe, 
+    0x3, 0x2, 0x2, 0x2, 0x47f, 0x480, 0x5, 0x191, 0xc9, 0x2, 0x480, 0x481, 
+    0x5, 0x18b, 0xc6, 0x2, 0x481, 0x482, 0x5, 0x193, 0xca, 0x2, 0x482, 0x483, 
+    0x5, 0x18b, 0xc6, 0x2, 0x483, 0x484, 0x5, 0x1a1, 0xd1, 0x2, 0x484, 0xc0, 
+    0x3, 0x2, 0x2, 0x2, 0x485, 0x486, 0x5, 0x191, 0xc9, 0x2, 0x486, 0x487, 
+    0x5, 0x18b, 0xc6, 0x2, 0x487, 0x488, 0x5, 0x1a5, 0xd3, 0x2, 0x488, 0x489, 
+    0x5, 0x183, 0xc2, 0x2, 0x489, 0xc2, 0x3, 0x2, 0x2, 0x2, 0x48a, 0x48b, 
+    0x5, 0x191, 0xc9, 0x2, 0x48b, 0x48c, 0x5, 0x197, 0xcc, 0x2, 0x48c, 0x48d, 
+    0x5, 0x17f, 0xc0, 0x2, 0x48d, 0x48e, 0x5, 0x17b, 0xbe, 0x2, 0x48e, 0x48f, 
+    0x5, 0x191, 0xc9, 0x2, 0x48f, 0xc4, 0x3, 0x2, 0x2, 0x2, 0x490, 0x491, 
+    0x5, 0x191, 0xc9, 0x2, 0x491, 0x492, 0x5, 0x197, 0xcc, 0x2, 0x492, 0x493, 
+    0x5, 0x187, 0xc4, 0x2, 0x493, 0x494, 0x5, 0x19f, 0xd0, 0x2, 0x494, 0xc6, 
+    0x3, 0x2, 0x2, 0x2, 0x495, 0x496, 0x5, 0x193, 0xca, 0x2, 0x496, 0x497, 
+    0x5, 0x17b, 0xbe, 0x2, 0x497, 0x498, 0x5, 0x1a1, 0xd1, 0x2, 0x498, 0x499, 
+    0x5, 0x183, 0xc2, 0x2, 0x499, 0x49a, 0x5, 0x19d, 0xcf, 0x2, 0x49a, 0x49b, 
+    0x5, 0x18b, 0xc6, 0x2, 0x49b, 0x49c, 0x5, 0x17b, 0xbe, 0x2, 0x49c, 0x49d, 
+    0x5, 0x191, 0xc9, 0x2, 0x49d, 0x49e, 0x5, 0x18b, 0xc6, 0x2, 0x49e, 0x49f, 
+    0x5, 0x1ad, 0xd7, 0x2, 0x49f, 0x4a0, 0x5, 0x183, 0xc2, 0x2, 0x4a0, 0x4a1, 
+    0x5, 0x181, 0xc1, 0x2, 0x4a1, 0xc8, 0x3, 0x2, 0x2, 0x2, 0x4a2, 0x4a3, 
+    0x5, 0x193, 0xca, 0x2, 0x4a3, 0x4a4, 0x5, 0x17b, 0xbe, 0x2, 0x4a4, 0x4a5, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x4a5, 0x4a6, 0x5, 0x183, 0xc2, 0x2, 0x4a6, 0x4a7, 
+    0x5, 0x19d, 0xcf, 0x2, 0x4a7, 0x4a8, 0x5, 0x18b, 0xc6, 0x2, 0x4a8, 0x4a9, 
+    0x5, 0x17b, 0xbe, 0x2, 0x4a9, 0x4aa, 0x5, 0x191, 0xc9, 0x2, 0x4aa, 0x4ab, 
+    0x5, 0x18b, 0xc6, 0x2, 0x4ab, 0x4ac, 0x5, 0x1ad, 0xd7, 0x2, 0x4ac, 0x4ad, 
+    0x5, 0x183, 0xc2, 0x2, 0x4ad, 0xca, 0x3, 0x2, 0x2, 0x2, 0x4ae, 0x4af, 
+    0x5, 0x193, 0xca, 0x2, 0x4af, 0x4b0, 0x5, 0x17b, 0xbe, 0x2, 0x4b0, 0x4b1, 
+    0x5, 0x1a9, 0xd5, 0x2, 0x4b1, 0xcc, 0x3, 0x2, 0x2, 0x2, 0x4b2, 0x4b3, 
+    0x5, 0x193, 0xca, 0x2, 0x4b3, 0x4b4, 0x5, 0x183, 0xc2, 0x2, 0x4b4, 0x4b5, 
+    0x5, 0x19d, 0xcf, 0x2, 0x4b5, 0x4b6, 0x5, 0x187, 0xc4, 0x2, 0x4b6, 0x4b7, 
+    0x5, 0x183, 0xc2, 0x2, 0x4b7, 0x4b8, 0x5, 0x19f, 0xd0, 0x2, 0x4b8, 0xce, 
+    0x3, 0x2, 0x2, 0x2, 0x4b9, 0x4ba, 0x5, 0x193, 0xca, 0x2, 0x4ba, 0x4bb, 
+    0x5, 0x18b, 0xc6, 0x2, 0x4bb, 0x4bc, 0x5, 0x195, 0xcb, 0x2, 0x4bc, 0xd0, 
+    0x3, 0x2, 0x2, 0x2, 0x4bd, 0x4be, 0x5, 0x193, 0xca, 0x2, 0x4be, 0x4bf, 
+    0x5, 0x18b, 0xc6, 0x2, 0x4bf, 0x4c0, 0x5, 0x195, 0xcb, 0x2, 0x4c0, 0x4c1, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x4c1, 0x4c2, 0x5, 0x1a1, 0xd1, 0x2, 0x4c2, 0x4c3, 
+    0x5, 0x183, 0xc2, 0x2, 0x4c3, 0xd2, 0x3, 0x2, 0x2, 0x2, 0x4c4, 0x4c5, 
+    0x5, 0x193, 0xca, 0x2, 0x4c5, 0x4c6, 0x5, 0x197, 0xcc, 0x2, 0x4c6, 0x4c7, 
+    0x5, 0x181, 0xc1, 0x2, 0x4c7, 0x4c8, 0x5, 0x18b, 0xc6, 0x2, 0x4c8, 0x4c9, 
+    0x5, 0x185, 0xc3, 0x2, 0x4c9, 0x4ca, 0x5, 0x1ab, 0xd6, 0x2, 0x4ca, 0xd4, 
+    0x3, 0x2, 0x2, 0x2, 0x4cb, 0x4cc, 0x5, 0x193, 0xca, 0x2, 0x4cc, 0x4cd, 
+    0x5, 0x197, 0xcc, 0x2, 0x4cd, 0x4ce, 0x5, 0x195, 0xcb, 0x2, 0x4ce, 0x4cf, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x4cf, 0x4d0, 0x5, 0x189, 0xc5, 0x2, 0x4d0, 0xd6, 
+    0x3, 0x2, 0x2, 0x2, 0x4d1, 0x4d2, 0x5, 0x193, 0xca, 0x2, 0x4d2, 0x4d3, 
+    0x5, 0x197, 0xcc, 0x2, 0x4d3, 0x4d4, 0x5, 0x1a5, 0xd3, 0x2, 0x4d4, 0x4d5, 
+    0x5, 0x183, 0xc2, 0x2, 0x4d5, 0xd8, 0x3, 0x2, 0x2, 0x2, 0x4d6, 0x4d7, 
+    0x5, 0x193, 0xca, 0x2, 0x4d7, 0x4d8, 0x5, 0x1a3, 0xd2, 0x2, 0x4d8, 0x4d9, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x4d9, 0x4da, 0x5, 0x17b, 0xbe, 0x2, 0x4da, 0x4db, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x4db, 0x4dc, 0x5, 0x18b, 0xc6, 0x2, 0x4dc, 0x4dd, 
+    0x5, 0x197, 0xcc, 0x2, 0x4dd, 0x4de, 0x5, 0x195, 0xcb, 0x2, 0x4de, 0xda, 
+    0x3, 0x2, 0x2, 0x2, 0x4df, 0x4e0, 0x5, 0x195, 0xcb, 0x2, 0x4e0, 0x4e1, 
+    0x5, 0x17b, 0xbe, 0x2, 0x4e1, 0x4e2, 0x5, 0x195, 0xcb, 0x2, 0x4e2, 0xdc, 
+    0x3, 0x2, 0x2, 0x2, 0x4e3, 0x4e4, 0x5, 0x195, 0xcb, 0x2, 0x4e4, 0x4e5, 
+    0x5, 0x197, 0xcc, 0x2, 0x4e5, 0xde, 0x3, 0x2, 0x2, 0x2, 0x4e6, 0x4e7, 
+    0x5, 0x195, 0xcb, 0x2, 0x4e7, 0x4e8, 0x5, 0x197, 0xcc, 0x2, 0x4e8, 0x4e9, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x4e9, 0xe0, 0x3, 0x2, 0x2, 0x2, 0x4ea, 0x4eb, 
+    0x5, 0x195, 0xcb, 0x2, 0x4eb, 0x4ec, 0x5, 0x1a3, 0xd2, 0x2, 0x4ec, 0x4ed, 
+    0x5, 0x191, 0xc9, 0x2, 0x4ed, 0x4ee, 0x5, 0x191, 0xc9, 0x2, 0x4ee, 0xe2, 
+    0x3, 0x2, 0x2, 0x2, 0x4ef, 0x4f0, 0x5, 0x195, 0xcb, 0x2, 0x4f0, 0x4f1, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x4f1, 0x4f2, 0x5, 0x191, 0xc9, 0x2, 0x4f2, 0x4f3, 
+    0x5, 0x191, 0xc9, 0x2, 0x4f3, 0x4f4, 0x5, 0x19f, 0xd0, 0x2, 0x4f4, 0xe4, 
+    0x3, 0x2, 0x2, 0x2, 0x4f5, 0x4f6, 0x5, 0x197, 0xcc, 0x2, 0x4f6, 0x4f7, 
+    0x5, 0x185, 0xc3, 0x2, 0x4f7, 0x4f8, 0x5, 0x185, 0xc3, 0x2, 0x4f8, 0x4f9, 
+    0x5, 0x19f, 0xd0, 0x2, 0x4f9, 0x4fa, 0x5, 0x183, 0xc2, 0x2, 0x4fa, 0x4fb, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x4fb, 0xe6, 0x3, 0x2, 0x2, 0x2, 0x4fc, 0x4fd, 
+    0x5, 0x197, 0xcc, 0x2, 0x4fd, 0x4fe, 0x5, 0x195, 0xcb, 0x2, 0x4fe, 0xe8, 
+    0x3, 0x2, 0x2, 0x2, 0x4ff, 0x500, 0x5, 0x197, 0xcc, 0x2, 0x500, 0x501, 
+    0x5, 0x199, 0xcd, 0x2, 0x501, 0x502, 0x5, 0x1a1, 0xd1, 0x2, 0x502, 0x503, 
+    0x5, 0x18b, 0xc6, 0x2, 0x503, 0x504, 0x5, 0x193, 0xca, 0x2, 0x504, 0x505, 
+    0x5, 0x18b, 0xc6, 0x2, 0x505, 0x506, 0x5, 0x1ad, 0xd7, 0x2, 0x506, 0x507, 
+    0x5, 0x183, 0xc2, 0x2, 0x507, 0xea, 0x3, 0x2, 0x2, 0x2, 0x508, 0x509, 
+    0x5, 0x197, 0xcc, 0x2, 0x509, 0x50a, 0x5, 0x19d, 0xcf, 0x2, 0x50a, 0xec, 
+    0x3, 0x2, 0x2, 0x2, 0x50b, 0x50c, 0x5, 0x197, 0xcc, 0x2, 0x50c, 0x50d, 
+    0x5, 0x19d, 0xcf, 0x2, 0x50d, 0x50e, 0x5, 0x181, 0xc1, 0x2, 0x50e, 0x50f, 
+    0x5, 0x183, 0xc2, 0x2, 0x50f, 0x510, 0x5, 0x19d, 0xcf, 0x2, 0x510, 0xee, 
+    0x3, 0x2, 0x2, 0x2, 0x511, 0x512, 0x5, 0x197, 0xcc, 0x2, 0x512, 0x513, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x513, 0x514, 0x5, 0x1a1, 0xd1, 0x2, 0x514, 0x515, 
+    0x5, 0x183, 0xc2, 0x2, 0x515, 0x516, 0x5, 0x19d, 0xcf, 0x2, 0x516, 0xf0, 
+    0x3, 0x2, 0x2, 0x2, 0x517, 0x518, 0x5, 0x197, 0xcc, 0x2, 0x518, 0x519, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x519, 0x51a, 0x5, 0x1a1, 0xd1, 0x2, 0x51a, 0x51b, 
+    0x5, 0x185, 0xc3, 0x2, 0x51b, 0x51c, 0x5, 0x18b, 0xc6, 0x2, 0x51c, 0x51d, 
+    0x5, 0x191, 0xc9, 0x2, 0x51d, 0x51e, 0x5, 0x183, 0xc2, 0x2, 0x51e, 0xf2, 
+    0x3, 0x2, 0x2, 0x2, 0x51f, 0x520, 0x5, 0x199, 0xcd, 0x2, 0x520, 0x521, 
+    0x5, 0x17b, 0xbe, 0x2, 0x521, 0x522, 0x5, 0x19d, 0xcf, 0x2, 0x522, 0x523, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x523, 0x524, 0x5, 0x18b, 0xc6, 0x2, 0x524, 0x525, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x525, 0x526, 0x5, 0x18b, 0xc6, 0x2, 0x526, 0x527, 
+    0x5, 0x197, 0xcc, 0x2, 0x527, 0x528, 0x5, 0x195, 0xcb, 0x2, 0x528, 0xf4, 
+    0x3, 0x2, 0x2, 0x2, 0x529, 0x52a, 0x5, 0x199, 0xcd, 0x2, 0x52a, 0x52b, 
+    0x5, 0x197, 0xcc, 0x2, 0x52b, 0x52c, 0x5, 0x199, 0xcd, 0x2, 0x52c, 0x52d, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x52d, 0x52e, 0x5, 0x191, 0xc9, 0x2, 0x52e, 0x52f, 
+    0x5, 0x17b, 0xbe, 0x2, 0x52f, 0x530, 0x5, 0x1a1, 0xd1, 0x2, 0x530, 0x531, 
+    0x5, 0x183, 0xc2, 0x2, 0x531, 0xf6, 0x3, 0x2, 0x2, 0x2, 0x532, 0x533, 
+    0x5, 0x199, 0xcd, 0x2, 0x533, 0x534, 0x5, 0x19d, 0xcf, 0x2, 0x534, 0x535, 
+    0x5, 0x183, 0xc2, 0x2, 0x535, 0x536, 0x5, 0x1a7, 0xd4, 0x2, 0x536, 0x537, 
+    0x5, 0x189, 0xc5, 0x2, 0x537, 0x538, 0x5, 0x183, 0xc2, 0x2, 0x538, 0x539, 
+    0x5, 0x19d, 0xcf, 0x2, 0x539, 0x53a, 0x5, 0x183, 0xc2, 0x2, 0x53a, 0xf8, 
+    0x3, 0x2, 0x2, 0x2, 0x53b, 0x53c, 0x5, 0x199, 0xcd, 0x2, 0x53c, 0x53d, 
+    0x5, 0x19d, 0xcf, 0x2, 0x53d, 0x53e, 0x5, 0x18b, 0xc6, 0x2, 0x53e, 0x53f, 
+    0x5, 0x193, 0xca, 0x2, 0x53f, 0x540, 0x5, 0x17b, 0xbe, 0x2, 0x540, 0x541, 
+    0x5, 0x19d, 0xcf, 0x2, 0x541, 0x542, 0x5, 0x1ab, 0xd6, 0x2, 0x542, 0xfa, 
+    0x3, 0x2, 0x2, 0x2, 0x543, 0x544, 0x5, 0x199, 0xcd, 0x2, 0x544, 0x545, 
+    0x5, 0x19d, 0xcf, 0x2, 0x545, 0x546, 0x5, 0x197, 0xcc, 0x2, 0x546, 0x547, 
+    0x5, 0x18d, 0xc7, 0x2, 0x547, 0x548, 0x5, 0x183, 0xc2, 0x2, 0x548, 0x549, 
+    0x5, 0x17f, 0xc0, 0x2, 0x549, 0x54a, 0x5, 0x1a1, 0xd1, 0x2, 0x54a, 0x54b, 
+    0x5, 0x18b, 0xc6, 0x2, 0x54b, 0x54c, 0x5, 0x197, 0xcc, 0x2, 0x54c, 0x54d, 
+    0x5, 0x195, 0xcb, 0x2, 0x54d, 0xfc, 0x3, 0x2, 0x2, 0x2, 0x54e, 0x54f, 
+    0x5, 0x19b, 0xce, 0x2, 0x54f, 0x550, 0x5, 0x1a3, 0xd2, 0x2, 0x550, 0x551, 
+    0x5, 0x17b, 0xbe, 0x2, 0x551, 0x552, 0x5, 0x19d, 0xcf, 0x2, 0x552, 0x553, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x553, 0x554, 0x5, 0x183, 0xc2, 0x2, 0x554, 0x555, 
+    0x5, 0x19d, 0xcf, 0x2, 0x555, 0xfe, 0x3, 0x2, 0x2, 0x2, 0x556, 0x557, 
+    0x5, 0x19d, 0xcf, 0x2, 0x557, 0x558, 0x5, 0x17b, 0xbe, 0x2, 0x558, 0x559, 
+    0x5, 0x195, 0xcb, 0x2, 0x559, 0x55a, 0x5, 0x187, 0xc4, 0x2, 0x55a, 0x55b, 
+    0x5, 0x183, 0xc2, 0x2, 0x55b, 0x100, 0x3, 0x2, 0x2, 0x2, 0x55c, 0x55d, 
+    0x5, 0x19d, 0xcf, 0x2, 0x55d, 0x55e, 0x5, 0x183, 0xc2, 0x2, 0x55e, 0x55f, 
+    0x5, 0x191, 0xc9, 0x2, 0x55f, 0x560, 0x5, 0x197, 0xcc, 0x2, 0x560, 0x561, 
+    0x5, 0x17b, 0xbe, 0x2, 0x561, 0x562, 0x5, 0x181, 0xc1, 0x2, 0x562, 0x102, 
+    0x3, 0x2, 0x2, 0x2, 0x563, 0x564, 0x5, 0x19d, 0xcf, 0x2, 0x564, 0x565, 
+    0x5, 0x183, 0xc2, 0x2, 0x565, 0x566, 0x5, 0x193, 0xca, 0x2, 0x566, 0x567, 
+    0x5, 0x197, 0xcc, 0x2, 0x567, 0x568, 0x5, 0x1a5, 0xd3, 0x2, 0x568, 0x569, 
+    0x5, 0x183, 0xc2, 0x2, 0x569, 0x104, 0x3, 0x2, 0x2, 0x2, 0x56a, 0x56b, 
+    0x5, 0x19d, 0xcf, 0x2, 0x56b, 0x56c, 0x5, 0x183, 0xc2, 0x2, 0x56c, 0x56d, 
+    0x5, 0x195, 0xcb, 0x2, 0x56d, 0x56e, 0x5, 0x17b, 0xbe, 0x2, 0x56e, 0x56f, 
+    0x5, 0x193, 0xca, 0x2, 0x56f, 0x570, 0x5, 0x183, 0xc2, 0x2, 0x570, 0x106, 
+    0x3, 0x2, 0x2, 0x2, 0x571, 0x572, 0x5, 0x19d, 0xcf, 0x2, 0x572, 0x573, 
+    0x5, 0x183, 0xc2, 0x2, 0x573, 0x574, 0x5, 0x199, 0xcd, 0x2, 0x574, 0x575, 
+    0x5, 0x191, 0xc9, 0x2, 0x575, 0x576, 0x5, 0x17b, 0xbe, 0x2, 0x576, 0x577, 
+    0x5, 0x17f, 0xc0, 0x2, 0x577, 0x578, 0x5, 0x183, 0xc2, 0x2, 0x578, 0x108, 
+    0x3, 0x2, 0x2, 0x2, 0x579, 0x57a, 0x5, 0x19d, 0xcf, 0x2, 0x57a, 0x57b, 
+    0x5, 0x183, 0xc2, 0x2, 0x57b, 0x57c, 0x5, 0x199, 0xcd, 0x2, 0x57c, 0x57d, 
+    0x5, 0x191, 0xc9, 0x2, 0x57d, 0x57e, 0x5, 0x18b, 0xc6, 0x2, 0x57e, 0x57f, 
+    0x5, 0x17f, 0xc0, 0x2, 0x57f, 0x580, 0x5, 0x17b, 0xbe, 0x2, 0x580, 0x10a, 
+    0x3, 0x2, 0x2, 0x2, 0x581, 0x582, 0x5, 0x19d, 0xcf, 0x2, 0x582, 0x583, 
+    0x5, 0x183, 0xc2, 0x2, 0x583, 0x584, 0x5, 0x199, 0xcd, 0x2, 0x584, 0x585, 
+    0x5, 0x191, 0xc9, 0x2, 0x585, 0x586, 0x5, 0x18b, 0xc6, 0x2, 0x586, 0x587, 
+    0x5, 0x17f, 0xc0, 0x2, 0x587, 0x588, 0x5, 0x17b, 0xbe, 0x2, 0x588, 0x589, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x589, 0x58a, 0x5, 0x183, 0xc2, 0x2, 0x58a, 0x58b, 
+    0x5, 0x181, 0xc1, 0x2, 0x58b, 0x10c, 0x3, 0x2, 0x2, 0x2, 0x58c, 0x58d, 
+    0x5, 0x19d, 0xcf, 0x2, 0x58d, 0x58e, 0x5, 0x18b, 0xc6, 0x2, 0x58e, 0x58f, 
+    0x5, 0x187, 0xc4, 0x2, 0x58f, 0x590, 0x5, 0x189, 0xc5, 0x2, 0x590, 0x591, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x591, 0x10e, 0x3, 0x2, 0x2, 0x2, 0x592, 0x593, 
+    0x5, 0x19d, 0xcf, 0x2, 0x593, 0x594, 0x5, 0x197, 0xcc, 0x2, 0x594, 0x595, 
+    0x5, 0x191, 0xc9, 0x2, 0x595, 0x596, 0x5, 0x191, 0xc9, 0x2, 0x596, 0x597, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x597, 0x598, 0x5, 0x199, 0xcd, 0x2, 0x598, 0x110, 
+    0x3, 0x2, 0x2, 0x2, 0x599, 0x59a, 0x5, 0x19f, 0xd0, 0x2, 0x59a, 0x59b, 
+    0x5, 0x17b, 0xbe, 0x2, 0x59b, 0x59c, 0x5, 0x193, 0xca, 0x2, 0x59c, 0x59d, 
+    0x5, 0x199, 0xcd, 0x2, 0x59d, 0x59e, 0x5, 0x191, 0xc9, 0x2, 0x59e, 0x59f, 
+    0x5, 0x183, 0xc2, 0x2, 0x59f, 0x112, 0x3, 0x2, 0x2, 0x2, 0x5a0, 0x5a1, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5a1, 0x5a2, 0x5, 0x183, 0xc2, 0x2, 0x5a2, 0x5a3, 
+    0x5, 0x17f, 0xc0, 0x2, 0x5a3, 0x5a4, 0x5, 0x197, 0xcc, 0x2, 0x5a4, 0x5a5, 
+    0x5, 0x195, 0xcb, 0x2, 0x5a5, 0x5a6, 0x5, 0x181, 0xc1, 0x2, 0x5a6, 0x114, 
+    0x3, 0x2, 0x2, 0x2, 0x5a7, 0x5a8, 0x5, 0x19f, 0xd0, 0x2, 0x5a8, 0x5a9, 
+    0x5, 0x183, 0xc2, 0x2, 0x5a9, 0x5aa, 0x5, 0x191, 0xc9, 0x2, 0x5aa, 0x5ab, 
+    0x5, 0x183, 0xc2, 0x2, 0x5ab, 0x5ac, 0x5, 0x17f, 0xc0, 0x2, 0x5ac, 0x5ad, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x5ad, 0x116, 0x3, 0x2, 0x2, 0x2, 0x5ae, 0x5af, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5af, 0x5b0, 0x5, 0x183, 0xc2, 0x2, 0x5b0, 0x5b1, 
+    0x5, 0x193, 0xca, 0x2, 0x5b1, 0x5b2, 0x5, 0x18b, 0xc6, 0x2, 0x5b2, 0x118, 
+    0x3, 0x2, 0x2, 0x2, 0x5b3, 0x5b4, 0x5, 0x19f, 0xd0, 0x2, 0x5b4, 0x5b5, 
+    0x5, 0x183, 0xc2, 0x2, 0x5b5, 0x5b6, 0x5, 0x195, 0xcb, 0x2, 0x5b6, 0x5b7, 
+    0x5, 0x181, 0xc1, 0x2, 0x5b7, 0x5b8, 0x5, 0x19f, 0xd0, 0x2, 0x5b8, 0x11a, 
+    0x3, 0x2, 0x2, 0x2, 0x5b9, 0x5ba, 0x5, 0x19f, 0xd0, 0x2, 0x5ba, 0x5bb, 
+    0x5, 0x183, 0xc2, 0x2, 0x5bb, 0x5bc, 0x5, 0x1a1, 0xd1, 0x2, 0x5bc, 0x11c, 
+    0x3, 0x2, 0x2, 0x2, 0x5bd, 0x5be, 0x5, 0x19f, 0xd0, 0x2, 0x5be, 0x5bf, 
+    0x5, 0x183, 0xc2, 0x2, 0x5bf, 0x5c0, 0x5, 0x1a1, 0xd1, 0x2, 0x5c0, 0x5c1, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x5c1, 0x5c2, 0x5, 0x18b, 0xc6, 0x2, 0x5c2, 0x5c3, 
+    0x5, 0x195, 0xcb, 0x2, 0x5c3, 0x5c4, 0x5, 0x187, 0xc4, 0x2, 0x5c4, 0x5c5, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5c5, 0x11e, 0x3, 0x2, 0x2, 0x2, 0x5c6, 0x5c7, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5c7, 0x5c8, 0x5, 0x189, 0xc5, 0x2, 0x5c8, 0x5c9, 
+    0x5, 0x197, 0xcc, 0x2, 0x5c9, 0x5ca, 0x5, 0x1a7, 0xd4, 0x2, 0x5ca, 0x120, 
+    0x3, 0x2, 0x2, 0x2, 0x5cb, 0x5cc, 0x5, 0x19f, 0xd0, 0x2, 0x5cc, 0x5cd, 
+    0x5, 0x197, 0xcc, 0x2, 0x5cd, 0x5ce, 0x5, 0x1a3, 0xd2, 0x2, 0x5ce, 0x5cf, 
+    0x5, 0x19d, 0xcf, 0x2, 0x5cf, 0x5d0, 0x5, 0x17f, 0xc0, 0x2, 0x5d0, 0x5d1, 
+    0x5, 0x183, 0xc2, 0x2, 0x5d1, 0x122, 0x3, 0x2, 0x2, 0x2, 0x5d2, 0x5d3, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5d3, 0x5d4, 0x5, 0x1a1, 0xd1, 0x2, 0x5d4, 0x5d5, 
+    0x5, 0x17b, 0xbe, 0x2, 0x5d5, 0x5d6, 0x5, 0x19d, 0xcf, 0x2, 0x5d6, 0x5d7, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x5d7, 0x124, 0x3, 0x2, 0x2, 0x2, 0x5d8, 0x5d9, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5d9, 0x5da, 0x5, 0x1a1, 0xd1, 0x2, 0x5da, 0x5db, 
+    0x5, 0x197, 0xcc, 0x2, 0x5db, 0x5dc, 0x5, 0x199, 0xcd, 0x2, 0x5dc, 0x126, 
+    0x3, 0x2, 0x2, 0x2, 0x5dd, 0x5de, 0x5, 0x19f, 0xd0, 0x2, 0x5de, 0x5df, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x5df, 0x5e0, 0x5, 0x17d, 0xbf, 0x2, 0x5e0, 0x5e1, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5e1, 0x5e2, 0x5, 0x1a1, 0xd1, 0x2, 0x5e2, 0x5e3, 
+    0x5, 0x19d, 0xcf, 0x2, 0x5e3, 0x5e4, 0x5, 0x18b, 0xc6, 0x2, 0x5e4, 0x5e5, 
+    0x5, 0x195, 0xcb, 0x2, 0x5e5, 0x5e6, 0x5, 0x187, 0xc4, 0x2, 0x5e6, 0x128, 
+    0x3, 0x2, 0x2, 0x2, 0x5e7, 0x5e8, 0x5, 0x19f, 0xd0, 0x2, 0x5e8, 0x5e9, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x5e9, 0x5ea, 0x5, 0x195, 0xcb, 0x2, 0x5ea, 0x5eb, 
+    0x5, 0x17f, 0xc0, 0x2, 0x5eb, 0x12a, 0x3, 0x2, 0x2, 0x2, 0x5ec, 0x5ed, 
+    0x5, 0x19f, 0xd0, 0x2, 0x5ed, 0x5ee, 0x5, 0x1ab, 0xd6, 0x2, 0x5ee, 0x5ef, 
+    0x5, 0x195, 0xcb, 0x2, 0x5ef, 0x5f0, 0x5, 0x1a1, 0xd1, 0x2, 0x5f0, 0x5f1, 
+    0x5, 0x17b, 0xbe, 0x2, 0x5f1, 0x5f2, 0x5, 0x1a9, 0xd5, 0x2, 0x5f2, 0x12c, 
+    0x3, 0x2, 0x2, 0x2, 0x5f3, 0x5f4, 0x5, 0x19f, 0xd0, 0x2, 0x5f4, 0x5f5, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x5f5, 0x5f6, 0x5, 0x19f, 0xd0, 0x2, 0x5f6, 0x5f7, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x5f7, 0x5f8, 0x5, 0x183, 0xc2, 0x2, 0x5f8, 0x5f9, 
+    0x5, 0x193, 0xca, 0x2, 0x5f9, 0x12e, 0x3, 0x2, 0x2, 0x2, 0x5fa, 0x5fb, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x5fb, 0x5fc, 0x5, 0x17b, 0xbe, 0x2, 0x5fc, 0x5fd, 
+    0x5, 0x17d, 0xbf, 0x2, 0x5fd, 0x5fe, 0x5, 0x191, 0xc9, 0x2, 0x5fe, 0x5ff, 
+    0x5, 0x183, 0xc2, 0x2, 0x5ff, 0x130, 0x3, 0x2, 0x2, 0x2, 0x600, 0x601, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x601, 0x602, 0x5, 0x17b, 0xbe, 0x2, 0x602, 0x603, 
+    0x5, 0x17d, 0xbf, 0x2, 0x603, 0x604, 0x5, 0x191, 0xc9, 0x2, 0x604, 0x605, 
+    0x5, 0x183, 0xc2, 0x2, 0x605, 0x606, 0x5, 0x19f, 0xd0, 0x2, 0x606, 0x132, 
+    0x3, 0x2, 0x2, 0x2, 0x607, 0x608, 0x5, 0x1a1, 0xd1, 0x2, 0x608, 0x609, 
+    0x5, 0x183, 0xc2, 0x2, 0x609, 0x60a, 0x5, 0x193, 0xca, 0x2, 0x60a, 0x60b, 
+    0x5, 0x199, 0xcd, 0x2, 0x60b, 0x60c, 0x5, 0x197, 0xcc, 0x2, 0x60c, 0x60d, 
+    0x5, 0x19d, 0xcf, 0x2, 0x60d, 0x60e, 0x5, 0x17b, 0xbe, 0x2, 0x60e, 0x60f, 
+    0x5, 0x19d, 0xcf, 0x2, 0x60f, 0x610, 0x5, 0x1ab, 0xd6, 0x2, 0x610, 0x134, 
+    0x3, 0x2, 0x2, 0x2, 0x611, 0x612, 0x5, 0x1a1, 0xd1, 0x2, 0x612, 0x613, 
+    0x5, 0x183, 0xc2, 0x2, 0x613, 0x614, 0x5, 0x19f, 0xd0, 0x2, 0x614, 0x615, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x615, 0x136, 0x3, 0x2, 0x2, 0x2, 0x616, 0x617, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x617, 0x618, 0x5, 0x189, 0xc5, 0x2, 0x618, 0x619, 
+    0x5, 0x183, 0xc2, 0x2, 0x619, 0x61a, 0x5, 0x195, 0xcb, 0x2, 0x61a, 0x138, 
+    0x3, 0x2, 0x2, 0x2, 0x61b, 0x61c, 0x5, 0x1a1, 0xd1, 0x2, 0x61c, 0x61d, 
+    0x5, 0x18b, 0xc6, 0x2, 0x61d, 0x61e, 0x5, 0x183, 0xc2, 0x2, 0x61e, 0x61f, 
+    0x5, 0x19f, 0xd0, 0x2, 0x61f, 0x13a, 0x3, 0x2, 0x2, 0x2, 0x620, 0x621, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x621, 0x622, 0x5, 0x18b, 0xc6, 0x2, 0x622, 0x623, 
+    0x5, 0x193, 0xca, 0x2, 0x623, 0x624, 0x5, 0x183, 0xc2, 0x2, 0x624, 0x625, 
+    0x5, 0x197, 0xcc, 0x2, 0x625, 0x626, 0x5, 0x1a3, 0xd2, 0x2, 0x626, 0x627, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x627, 0x13c, 0x3, 0x2, 0x2, 0x2, 0x628, 0x629, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x629, 0x62a, 0x5, 0x18b, 0xc6, 0x2, 0x62a, 0x62b, 
+    0x5, 0x193, 0xca, 0x2, 0x62b, 0x62c, 0x5, 0x183, 0xc2, 0x2, 0x62c, 0x62d, 
+    0x5, 0x19f, 0xd0, 0x2, 0x62d, 0x62e, 0x5, 0x1a1, 0xd1, 0x2, 0x62e, 0x62f, 
+    0x5, 0x17b, 0xbe, 0x2, 0x62f, 0x630, 0x5, 0x193, 0xca, 0x2, 0x630, 0x631, 
+    0x5, 0x199, 0xcd, 0x2, 0x631, 0x13e, 0x3, 0x2, 0x2, 0x2, 0x632, 0x633, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x633, 0x634, 0x5, 0x197, 0xcc, 0x2, 0x634, 0x140, 
+    0x3, 0x2, 0x2, 0x2, 0x635, 0x636, 0x5, 0x1a1, 0xd1, 0x2, 0x636, 0x637, 
+    0x5, 0x197, 0xcc, 0x2, 0x637, 0x638, 0x5, 0x199, 0xcd, 0x2, 0x638, 0x142, 
+    0x3, 0x2, 0x2, 0x2, 0x639, 0x63a, 0x5, 0x1a1, 0xd1, 0x2, 0x63a, 0x63b, 
+    0x5, 0x197, 0xcc, 0x2, 0x63b, 0x63c, 0x5, 0x1a1, 0xd1, 0x2, 0x63c, 0x63d, 
+    0x5, 0x17b, 0xbe, 0x2, 0x63d, 0x63e, 0x5, 0x191, 0xc9, 0x2, 0x63e, 0x63f, 
+    0x5, 0x19f, 0xd0, 0x2, 0x63f, 0x144, 0x3, 0x2, 0x2, 0x2, 0x640, 0x641, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x641, 0x642, 0x5, 0x19d, 0xcf, 0x2, 0x642, 0x643, 
+    0x5, 0x17b, 0xbe, 0x2, 0x643, 0x644, 0x5, 0x18b, 0xc6, 0x2, 0x644, 0x645, 
+    0x5, 0x191, 0xc9, 0x2, 0x645, 0x646, 0x5, 0x18b, 0xc6, 0x2, 0x646, 0x647, 
+    0x5, 0x195, 0xcb, 0x2, 0x647, 0x648, 0x5, 0x187, 0xc4, 0x2, 0x648, 0x146, 
+    0x3, 0x2, 0x2, 0x2, 0x649, 0x64a, 0x5, 0x1a1, 0xd1, 0x2, 0x64a, 0x64b, 
+    0x5, 0x19d, 0xcf, 0x2, 0x64b, 0x64c, 0x5, 0x18b, 0xc6, 0x2, 0x64c, 0x64d, 
+    0x5, 0x193, 0xca, 0x2, 0x64d, 0x148, 0x3, 0x2, 0x2, 0x2, 0x64e, 0x64f, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x64f, 0x650, 0x5, 0x19d, 0xcf, 0x2, 0x650, 0x651, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x651, 0x652, 0x5, 0x195, 0xcb, 0x2, 0x652, 0x653, 
+    0x5, 0x17f, 0xc0, 0x2, 0x653, 0x654, 0x5, 0x17b, 0xbe, 0x2, 0x654, 0x655, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x655, 0x656, 0x5, 0x183, 0xc2, 0x2, 0x656, 0x14a, 
+    0x3, 0x2, 0x2, 0x2, 0x657, 0x658, 0x5, 0x1a1, 0xd1, 0x2, 0x658, 0x659, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x659, 0x65a, 0x5, 0x191, 0xc9, 0x2, 0x65a, 0x14c, 
+    0x3, 0x2, 0x2, 0x2, 0x65b, 0x65c, 0x5, 0x1a1, 0xd1, 0x2, 0x65c, 0x65d, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x65d, 0x65e, 0x5, 0x199, 0xcd, 0x2, 0x65e, 0x65f, 
+    0x5, 0x183, 0xc2, 0x2, 0x65f, 0x14e, 0x3, 0x2, 0x2, 0x2, 0x660, 0x661, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x661, 0x662, 0x5, 0x195, 0xcb, 0x2, 0x662, 0x663, 
+    0x5, 0x18b, 0xc6, 0x2, 0x663, 0x664, 0x5, 0x197, 0xcc, 0x2, 0x664, 0x665, 
+    0x5, 0x195, 0xcb, 0x2, 0x665, 0x150, 0x3, 0x2, 0x2, 0x2, 0x666, 0x667, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x667, 0x668, 0x5, 0x199, 0xcd, 0x2, 0x668, 0x669, 
+    0x5, 0x181, 0xc1, 0x2, 0x669, 0x66a, 0x5, 0x17b, 0xbe, 0x2, 0x66a, 0x66b, 
+    0x5, 0x1a1, 0xd1, 0x2, 0x66b, 0x66c, 0x5, 0x183, 0xc2, 0x2, 0x66c, 0x152, 
+    0x3, 0x2, 0x2, 0x2, 0x66d, 0x66e, 0x5, 0x1a3, 0xd2, 0x2, 0x66e, 0x66f, 
+    0x5, 0x19f, 0xd0, 0x2, 0x66f, 0x670, 0x5, 0x183, 0xc2, 0x2, 0x670, 0x154, 
+    0x3, 0x2, 0x2, 0x2, 0x671, 0x672, 0x5, 0x1a3, 0xd2, 0x2, 0x672, 0x673, 
+    0x5, 0x19f, 0xd0, 0x2, 0x673, 0x674, 0x5, 0x18b, 0xc6, 0x2, 0x674, 0x675, 
+    0x5, 0x195, 0xcb, 0x2, 0x675, 0x676, 0x5, 0x187, 0xc4, 0x2, 0x676, 0x156, 
+    0x3, 0x2, 0x2, 0x2, 0x677, 0x678, 0x5, 0x1a3, 0xd2, 0x2, 0x678, 0x679, 
+    0x5, 0x1a3, 0xd2, 0x2, 0x679, 0x67a, 0x5, 0x18b, 0xc6, 0x2, 0x67a, 0x67b, 
+    0x5, 0x181, 0xc1, 0x2, 0x67b, 0x158, 0x3, 0x2, 0x2, 0x2, 0x67c, 0x67d, 
+    0x5, 0x1a5, 0xd3, 0x2, 0x67d, 0x67e, 0x5, 0x17b, 0xbe, 0x2, 0x67e, 0x67f, 
+    0x5, 0x191, 0xc9, 0x2, 0x67f, 0x680, 0x5, 0x1a3, 0xd2, 0x2, 0x680, 0x681, 
+    0x5, 0x183, 0xc2, 0x2, 0x681, 0x682, 0x5, 0x19f, 0xd0, 0x2, 0x682, 0x15a, 
+    0x3, 0x2, 0x2, 0x2, 0x683, 0x684, 0x5, 0x1a5, 0xd3, 0x2, 0x684, 0x685, 
+    0x5, 0x18b, 0xc6, 0x2, 0x685, 0x686, 0x5, 0x183, 0xc2, 0x2, 0x686, 0x687, 
+    0x5, 0x1a7, 0xd4, 0x2, 0x687, 0x15c, 0x3, 0x2, 0x2, 0x2, 0x688, 0x689, 
+    0x5, 0x1a5, 0xd3, 0x2, 0x689, 0x68a, 0x5, 0x197, 0xcc, 0x2, 0x68a, 0x68b, 
+    0x5, 0x191, 0xc9, 0x2, 0x68b, 0x68c, 0x5, 0x1a3, 0xd2, 0x2, 0x68c, 0x68d, 
+    0x5, 0x193, 0xca, 0x2, 0x68d, 0x68e, 0x5, 0x183, 0xc2, 0x2, 0x68e, 0x15e, 
+    0x3, 0x2, 0x2, 0x2, 0x68f, 0x690, 0x5, 0x1a7, 0xd4, 0x2, 0x690, 0x691, 
+    0x5, 0x17b, 0xbe, 0x2, 0x691, 0x692, 0x5, 0x1a1, 0xd1, 0x2, 0x692, 0x693, 
+    0x5, 0x17f, 0xc0, 0x2, 0x693, 0x694, 0x5, 0x189, 0xc5, 0x2, 0x694, 0x160, 
+    0x3, 0x2, 0x2, 0x2, 0x695, 0x696, 0x5, 0x1a7, 0xd4, 0x2, 0x696, 0x697, 
+    0x5, 0x183, 0xc2, 0x2, 0x697, 0x698, 0x5, 0x183, 0xc2, 0x2, 0x698, 0x699, 
+    0x5, 0x18f, 0xc8, 0x2, 0x699, 0x162, 0x3, 0x2, 0x2, 0x2, 0x69a, 0x69b, 
+    0x5, 0x1a7, 0xd4, 0x2, 0x69b, 0x69c, 0x5, 0x189, 0xc5, 0x2, 0x69c, 0x69d, 
+    0x5, 0x183, 0xc2, 0x2, 0x69d, 0x69e, 0x5, 0x195, 0xcb, 0x2, 0x69e, 0x164, 
+    0x3, 0x2, 0x2, 0x2, 0x69f, 0x6a0, 0x5, 0x1a7, 0xd4, 0x2, 0x6a0, 0x6a1, 
+    0x5, 0x189, 0xc5, 0x2, 0x6a1, 0x6a2, 0x5, 0x183, 0xc2, 0x2, 0x6a2, 0x6a3, 
+    0x5, 0x19d, 0xcf, 0x2, 0x6a3, 0x6a4, 0x5, 0x183, 0xc2, 0x2, 0x6a4, 0x166, 
+    0x3, 0x2, 0x2, 0x2, 0x6a5, 0x6a6, 0x5, 0x1a7, 0xd4, 0x2, 0x6a6, 0x6a7, 
+    0x5, 0x18b, 0xc6, 0x2, 0x6a7, 0x6a8, 0x5, 0x1a1, 0xd1, 0x2, 0x6a8, 0x6a9, 
+    0x5, 0x189, 0xc5, 0x2, 0x6a9, 0x168, 0x3, 0x2, 0x2, 0x2, 0x6aa, 0x6ab, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x6ab, 0x6ac, 0x5, 0x183, 0xc2, 0x2, 0x6ac, 0x6ad, 
+    0x5, 0x17b, 0xbe, 0x2, 0x6ad, 0x6ae, 0x5, 0x19d, 0xcf, 0x2, 0x6ae, 0x6b5, 
+    0x3, 0x2, 0x2, 0x2, 0x6af, 0x6b0, 0x5, 0x1ab, 0xd6, 0x2, 0x6b0, 0x6b1, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x6b1, 0x6b2, 0x5, 0x1ab, 0xd6, 0x2, 0x6b2, 0x6b3, 
+    0x5, 0x1ab, 0xd6, 0x2, 0x6b3, 0x6b5, 0x3, 0x2, 0x2, 0x2, 0x6b4, 0x6aa, 
+    0x3, 0x2, 0x2, 0x2, 0x6b4, 0x6af, 0x3, 0x2, 0x2, 0x2, 0x6b5, 0x16a, 
+    0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6b7, 0x7, 0x68, 0x2, 0x2, 0x6b7, 0x6b8, 
+    0x7, 0x63, 0x2, 0x2, 0x6b8, 0x6b9, 0x7, 0x6e, 0x2, 0x2, 0x6b9, 0x6ba, 
+    0x7, 0x75, 0x2, 0x2, 0x6ba, 0x6bb, 0x7, 0x67, 0x2, 0x2, 0x6bb, 0x16c, 
+    0x3, 0x2, 0x2, 0x2, 0x6bc, 0x6bd, 0x7, 0x76, 0x2, 0x2, 0x6bd, 0x6be, 
+    0x7, 0x74, 0x2, 0x2, 0x6be, 0x6bf, 0x7, 0x77, 0x2, 0x2, 0x6bf, 0x6c0, 
+    0x7, 0x67, 0x2, 0x2, 0x6c0, 0x16e, 0x3, 0x2, 0x2, 0x2, 0x6c1, 0x6c4, 
+    0x5, 0x1af, 0xd8, 0x2, 0x6c2, 0x6c4, 0x5, 0x1f1, 0xf9, 0x2, 0x6c3, 0x6c1, 
+    0x3, 0x2, 0x2, 0x2, 0x6c3, 0x6c2, 0x3, 0x2, 0x2, 0x2, 0x6c4, 0x6ca, 
+    0x3, 0x2, 0x2, 0x2, 0x6c5, 0x6c9, 0x5, 0x1af, 0xd8, 0x2, 0x6c6, 0x6c9, 
+    0x5, 0x1f1, 0xf9, 0x2, 0x6c7, 0x6c9, 0x5, 0x1b3, 0xda, 0x2, 0x6c8, 0x6c5, 
+    0x3, 0x2, 0x2, 0x2, 0x6c8, 0x6c6, 0x3, 0x2, 0x2, 0x2, 0x6c8, 0x6c7, 
+    0x3, 0x2, 0x2, 0x2, 0x6c9, 0x6cc, 0x3, 0x2, 0x2, 0x2, 0x6ca, 0x6c8, 
+    0x3, 0x2, 0x2, 0x2, 0x6ca, 0x6cb, 0x3, 0x2, 0x2, 0x2, 0x6cb, 0x6ec, 
+    0x3, 0x2, 0x2, 0x2, 0x6cc, 0x6ca, 0x3, 0x2, 0x2, 0x2, 0x6cd, 0x6d7, 
+    0x5, 0x1bb, 0xde, 0x2, 0x6ce, 0x6d6, 0xa, 0x2, 0x2, 0x2, 0x6cf, 0x6d0, 
+    0x5, 0x1bd, 0xdf, 0x2, 0x6d0, 0x6d1, 0xb, 0x2, 0x2, 0x2, 0x6d1, 0x6d6, 
+    0x3, 0x2, 0x2, 0x2, 0x6d2, 0x6d3, 0x5, 0x1bb, 0xde, 0x2, 0x6d3, 0x6d4, 
+    0x5, 0x1bb, 0xde, 0x2, 0x6d4, 0x6d6, 0x3, 0x2, 0x2, 0x2, 0x6d5, 0x6ce, 
+    0x3, 0x2, 0x2, 0x2, 0x6d5, 0x6cf, 0x3, 0x2, 0x2, 0x2, 0x6d5, 0x6d2, 
+    0x3, 0x2, 0x2, 0x2, 0x6d6, 0x6d9, 0x3, 0x2, 0x2, 0x2, 0x6d7, 0x6d5, 
+    0x3, 0x2, 0x2, 0x2, 0x6d7, 0x6d8, 0x3, 0x2, 0x2, 0x2, 0x6d8, 0x6da, 
+    0x3, 0x2, 0x2, 0x2, 0x6d9, 0x6d7, 0x3, 0x2, 0x2, 0x2, 0x6da, 0x6db, 
+    0x5, 0x1bb, 0xde, 0x2, 0x6db, 0x6ec, 0x3, 0x2, 0x2, 0x2, 0x6dc, 0x6e6, 
+    0x5, 0x1e3, 0xf2, 0x2, 0x6dd, 0x6e5, 0xa, 0x3, 0x2, 0x2, 0x6de, 0x6df, 
+    0x5, 0x1bd, 0xdf, 0x2, 0x6df, 0x6e0, 0xb, 0x2, 0x2, 0x2, 0x6e0, 0x6e5, 
+    0x3, 0x2, 0x2, 0x2, 0x6e1, 0x6e2, 0x5, 0x1e3, 0xf2, 0x2, 0x6e2, 0x6e3, 
+    0x5, 0x1e3, 0xf2, 0x2, 0x6e3, 0x6e5, 0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6dd, 
+    0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6de, 0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6e1, 
+    0x3, 0x2, 0x2, 0x2, 0x6e5, 0x6e8, 0x3, 0x2, 0x2, 0x2, 0x6e6, 0x6e4, 
+    0x3, 0x2, 0x2, 0x2, 0x6e6, 0x6e7, 0x3, 0x2, 0x2, 0x2, 0x6e7, 0x6e9, 
+    0x3, 0x2, 0x2, 0x2, 0x6e8, 0x6e6, 0x3, 0x2, 0x2, 0x2, 0x6e9, 0x6ea, 
+    0x5, 0x1e3, 0xf2, 0x2, 0x6ea, 0x6ec, 0x3, 0x2, 0x2, 0x2, 0x6eb, 0x6c3, 
+    0x3, 0x2, 0x2, 0x2, 0x6eb, 0x6cd, 0x3, 0x2, 0x2, 0x2, 0x6eb, 0x6dc, 
+    0x3, 0x2, 0x2, 0x2, 0x6ec, 0x170, 0x3, 0x2, 0x2, 0x2, 0x6ed, 0x6ee, 
+    0x5, 0x177, 0xbc, 0x2, 0x6ee, 0x6f2, 0x5, 0x1c7, 0xe4, 0x2, 0x6ef, 0x6f1, 
+    0x5, 0x1b5, 0xdb, 0x2, 0x6f0, 0x6ef, 0x3, 0x2, 0x2, 0x2, 0x6f1, 0x6f4, 
+    0x3, 0x2, 0x2, 0x2, 0x6f2, 0x6f0, 0x3, 0x2, 0x2, 0x2, 0x6f2, 0x6f3, 
+    0x3, 0x2, 0x2, 0x2, 0x6f3, 0x6f7, 0x3, 0x2, 0x2, 0x2, 0x6f4, 0x6f2, 
+    0x3, 0x2, 0x2, 0x2, 0x6f5, 0x6f8, 0x5, 0x199, 0xcd, 0x2, 0x6f6, 0x6f8, 
+    0x5, 0x183, 0xc2, 0x2, 0x6f7, 0x6f5, 0x3, 0x2, 0x2, 0x2, 0x6f7, 0x6f6, 
+    0x3, 0x2, 0x2, 0x2, 0x6f8, 0x6fb, 0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6fc, 
+    0x5, 0x1df, 0xf0, 0x2, 0x6fa, 0x6fc, 0x5, 0x1c5, 0xe3, 0x2, 0x6fb, 0x6f9, 
+    0x3, 0x2, 0x2, 0x2, 0x6fb, 0x6fa, 0x3, 0x2, 0x2, 0x2, 0x6fb, 0x6fc, 
+    0x3, 0x2, 0x2, 0x2, 0x6fc, 0x6fe, 0x3, 0x2, 0x2, 0x2, 0x6fd, 0x6ff, 
+    0x5, 0x1b3, 0xda, 0x2, 0x6fe, 0x6fd, 0x3, 0x2, 0x2, 0x2, 0x6ff, 0x700, 
+    0x3, 0x2, 0x2, 0x2, 0x700, 0x6fe, 0x3, 0x2, 0x2, 0x2, 0x700, 0x701, 
+    0x3, 0x2, 0x2, 0x2, 0x701, 0x73a, 0x3, 0x2, 0x2, 0x2, 0x702, 0x705, 
+    0x5, 0x177, 0xbc, 0x2, 0x703, 0x706, 0x5, 0x199, 0xcd, 0x2, 0x704, 0x706, 
+    0x5, 0x183, 0xc2, 0x2, 0x705, 0x703, 0x3, 0x2, 0x2, 0x2, 0x705, 0x704, 
+    0x3, 0x2, 0x2, 0x2, 0x706, 0x709, 0x3, 0x2, 0x2, 0x2, 0x707, 0x70a, 
+    0x5, 0x1df, 0xf0, 0x2, 0x708, 0x70a, 0x5, 0x1c5, 0xe3, 0x2, 0x709, 0x707, 
+    0x3, 0x2, 0x2, 0x2, 0x709, 0x708, 0x3, 0x2, 0x2, 0x2, 0x709, 0x70a, 
+    0x3, 0x2, 0x2, 0x2, 0x70a, 0x70c, 0x3, 0x2, 0x2, 0x2, 0x70b, 0x70d, 
+    0x5, 0x1b3, 0xda, 0x2, 0x70c, 0x70b, 0x3, 0x2, 0x2, 0x2, 0x70d, 0x70e, 
+    0x3, 0x2, 0x2, 0x2, 0x70e, 0x70c, 0x3, 0x2, 0x2, 0x2, 0x70e, 0x70f, 
+    0x3, 0x2, 0x2, 0x2, 0x70f, 0x73a, 0x3, 0x2, 0x2, 0x2, 0x710, 0x711, 
+    0x5, 0x175, 0xbb, 0x2, 0x711, 0x715, 0x5, 0x1c7, 0xe4, 0x2, 0x712, 0x714, 
+    0x5, 0x1b3, 0xda, 0x2, 0x713, 0x712, 0x3, 0x2, 0x2, 0x2, 0x714, 0x717, 
+    0x3, 0x2, 0x2, 0x2, 0x715, 0x713, 0x3, 0x2, 0x2, 0x2, 0x715, 0x716, 
+    0x3, 0x2, 0x2, 0x2, 0x716, 0x718, 0x3, 0x2, 0x2, 0x2, 0x717, 0x715, 
+    0x3, 0x2, 0x2, 0x2, 0x718, 0x71b, 0x5, 0x183, 0xc2, 0x2, 0x719, 0x71c, 
+    0x5, 0x1df, 0xf0, 0x2, 0x71a, 0x71c, 0x5, 0x1c5, 0xe3, 0x2, 0x71b, 0x719, 
+    0x3, 0x2, 0x2, 0x2, 0x71b, 0x71a, 0x3, 0x2, 0x2, 0x2, 0x71b, 0x71c, 
+    0x3, 0x2, 0x2, 0x2, 0x71c, 0x71e, 0x3, 0x2, 0x2, 0x2, 0x71d, 0x71f, 
+    0x5, 0x1b3, 0xda, 0x2, 0x71e, 0x71d, 0x3, 0x2, 0x2, 0x2, 0x71f, 0x720, 
+    0x3, 0x2, 0x2, 0x2, 0x720, 0x71e, 0x3, 0x2, 0x2, 0x2, 0x720, 0x721, 
+    0x3, 0x2, 0x2, 0x2, 0x721, 0x73a, 0x3, 0x2, 0x2, 0x2, 0x722, 0x723, 
+    0x5, 0x1c7, 0xe4, 0x2, 0x723, 0x724, 0x5, 0x175, 0xbb, 0x2, 0x724, 0x727, 
+    0x5, 0x183, 0xc2, 0x2, 0x725, 0x728, 0x5, 0x1df, 0xf0, 0x2, 0x726, 0x728, 
+    0x5, 0x1c5, 0xe3, 0x2, 0x727, 0x725, 0x3, 0x2, 0x2, 0x2, 0x727, 0x726, 
+    0x3, 0x2, 0x2, 0x2, 0x727, 0x728, 0x3, 0x2, 0x2, 0x2, 0x728, 0x72a, 
+    0x3, 0x2, 0x2, 0x2, 0x729, 0x72b, 0x5, 0x1b3, 0xda, 0x2, 0x72a, 0x729, 
+    0x3, 0x2, 0x2, 0x2, 0x72b, 0x72c, 0x3, 0x2, 0x2, 0x2, 0x72c, 0x72a, 
+    0x3, 0x2, 0x2, 0x2, 0x72c, 0x72d, 0x3, 0x2, 0x2, 0x2, 0x72d, 0x73a, 
+    0x3, 0x2, 0x2, 0x2, 0x72e, 0x72f, 0x5, 0x175, 0xbb, 0x2, 0x72f, 0x732, 
+    0x5, 0x183, 0xc2, 0x2, 0x730, 0x733, 0x5, 0x1df, 0xf0, 0x2, 0x731, 0x733, 
+    0x5, 0x1c5, 0xe3, 0x2, 0x732, 0x730, 0x3, 0x2, 0x2, 0x2, 0x732, 0x731, 
+    0x3, 0x2, 0x2, 0x2, 0x732, 0x733, 0x3, 0x2, 0x2, 0x2, 0x733, 0x735, 
+    0x3, 0x2, 0x2, 0x2, 0x734, 0x736, 0x5, 0x1b3, 0xda, 0x2, 0x735, 0x734, 
+    0x3, 0x2, 0x2, 0x2, 0x736, 0x737, 0x3, 0x2, 0x2, 0x2, 0x737, 0x735, 
+    0x3, 0x2, 0x2, 0x2, 0x737, 0x738, 0x3, 0x2, 0x2, 0x2, 0x738, 0x73a, 
+    0x3, 0x2, 0x2, 0x2, 0x739, 0x6ed, 0x3, 0x2, 0x2, 0x2, 0x739, 0x702, 
+    0x3, 0x2, 0x2, 0x2, 0x739, 0x710, 0x3, 0x2, 0x2, 0x2, 0x739, 0x722, 
+    0x3, 0x2, 0x2, 0x2, 0x739, 0x72e, 0x3, 0x2, 0x2, 0x2, 0x73a, 0x172, 
+    0x3, 0x2, 0x2, 0x2, 0x73b, 0x73d, 0x7, 0x32, 0x2, 0x2, 0x73c, 0x73e, 
+    0x5, 0x1b1, 0xd9, 0x2, 0x73d, 0x73c, 0x3, 0x2, 0x2, 0x2, 0x73e, 0x73f, 
+    0x3, 0x2, 0x2, 0x2, 0x73f, 0x73d, 0x3, 0x2, 0x2, 0x2, 0x73f, 0x740, 
+    0x3, 0x2, 0x2, 0x2, 0x740, 0x174, 0x3, 0x2, 0x2, 0x2, 0x741, 0x743, 
+    0x5, 0x1b3, 0xda, 0x2, 0x742, 0x741, 0x3, 0x2, 0x2, 0x2, 0x743, 0x744, 
+    0x3, 0x2, 0x2, 0x2, 0x744, 0x742, 0x3, 0x2, 0x2, 0x2, 0x744, 0x745, 
+    0x3, 0x2, 0x2, 0x2, 0x745, 0x176, 0x3, 0x2, 0x2, 0x2, 0x746, 0x747, 
+    0x7, 0x32, 0x2, 0x2, 0x747, 0x749, 0x5, 0x1a9, 0xd5, 0x2, 0x748, 0x74a, 
+    0x5, 0x1b5, 0xdb, 0x2, 0x749, 0x748, 0x3, 0x2, 0x2, 0x2, 0x74a, 0x74b, 
+    0x3, 0x2, 0x2, 0x2, 0x74b, 0x749, 0x3, 0x2, 0x2, 0x2, 0x74b, 0x74c, 
+    0x3, 0x2, 0x2, 0x2, 0x74c, 0x178, 0x3, 0x2, 0x2, 0x2, 0x74d, 0x757, 
+    0x5, 0x1e5, 0xf3, 0x2, 0x74e, 0x756, 0xa, 0x4, 0x2, 0x2, 0x74f, 0x750, 
+    0x5, 0x1bd, 0xdf, 0x2, 0x750, 0x751, 0xb, 0x2, 0x2, 0x2, 0x751, 0x756, 
+    0x3, 0x2, 0x2, 0x2, 0x752, 0x753, 0x5, 0x1e5, 0xf3, 0x2, 0x753, 0x754, 
+    0x5, 0x1e5, 0xf3, 0x2, 0x754, 0x756, 0x3, 0x2, 0x2, 0x2, 0x755, 0x74e, 
+    0x3, 0x2, 0x2, 0x2, 0x755, 0x74f, 0x3, 0x2, 0x2, 0x2, 0x755, 0x752, 
+    0x3, 0x2, 0x2, 0x2, 0x756, 0x759, 0x3, 0x2, 0x2, 0x2, 0x757, 0x755, 
+    0x3, 0x2, 0x2, 0x2, 0x757, 0x758, 0x3, 0x2, 0x2, 0x2, 0x758, 0x75a, 
+    0x3, 0x2, 0x2, 0x2, 0x759, 0x757, 0x3, 0x2, 0x2, 0x2, 0x75a, 0x75b, 
+    0x5, 0x1e5, 0xf3, 0x2, 0x75b, 0x17a, 0x3, 0x2, 0x2, 0x2, 0x75c, 0x75d, 
+    0x9, 0x5, 0x2, 0x2, 0x75d, 0x17c, 0x3, 0x2, 0x2, 0x2, 0x75e, 0x75f, 
+    0x9, 0x6, 0x2, 0x2, 0x75f, 0x17e, 0x3, 0x2, 0x2, 0x2, 0x760, 0x761, 
+    0x9, 0x7, 0x2, 0x2, 0x761, 0x180, 0x3, 0x2, 0x2, 0x2, 0x762, 0x763, 
+    0x9, 0x8, 0x2, 0x2, 0x763, 0x182, 0x3, 0x2, 0x2, 0x2, 0x764, 0x765, 
+    0x9, 0x9, 0x2, 0x2, 0x765, 0x184, 0x3, 0x2, 0x2, 0x2, 0x766, 0x767, 
+    0x9, 0xa, 0x2, 0x2, 0x767, 0x186, 0x3, 0x2, 0x2, 0x2, 0x768, 0x769, 
+    0x9, 0xb, 0x2, 0x2, 0x769, 0x188, 0x3, 0x2, 0x2, 0x2, 0x76a, 0x76b, 
+    0x9, 0xc, 0x2, 0x2, 0x76b, 0x18a, 0x3, 0x2, 0x2, 0x2, 0x76c, 0x76d, 
+    0x9, 0xd, 0x2, 0x2, 0x76d, 0x18c, 0x3, 0x2, 0x2, 0x2, 0x76e, 0x76f, 
+    0x9, 0xe, 0x2, 0x2, 0x76f, 0x18e, 0x3, 0x2, 0x2, 0x2, 0x770, 0x771, 
+    0x9, 0xf, 0x2, 0x2, 0x771, 0x190, 0x3, 0x2, 0x2, 0x2, 0x772, 0x773, 
+    0x9, 0x10, 0x2, 0x2, 0x773, 0x192, 0x3, 0x2, 0x2, 0x2, 0x774, 0x775, 
+    0x9, 0x11, 0x2, 0x2, 0x775, 0x194, 0x3, 0x2, 0x2, 0x2, 0x776, 0x777, 
+    0x9, 0x12, 0x2, 0x2, 0x777, 0x196, 0x3, 0x2, 0x2, 0x2, 0x778, 0x779, 
+    0x9, 0x13, 0x2, 0x2, 0x779, 0x198, 0x3, 0x2, 0x2, 0x2, 0x77a, 0x77b, 
+    0x9, 0x14, 0x2, 0x2, 0x77b, 0x19a, 0x3, 0x2, 0x2, 0x2, 0x77c, 0x77d, 
+    0x9, 0x15, 0x2, 0x2, 0x77d, 0x19c, 0x3, 0x2, 0x2, 0x2, 0x77e, 0x77f, 
+    0x9, 0x16, 0x2, 0x2, 0x77f, 0x19e, 0x3, 0x2, 0x2, 0x2, 0x780, 0x781, 
+    0x9, 0x17, 0x2, 0x2, 0x781, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x782, 0x783, 
+    0x9, 0x18, 0x2, 0x2, 0x783, 0x1a2, 0x3, 0x2, 0x2, 0x2, 0x784, 0x785, 
+    0x9, 0x19, 0x2, 0x2, 0x785, 0x1a4, 0x3, 0x2, 0x2, 0x2, 0x786, 0x787, 
+    0x9, 0x1a, 0x2, 0x2, 0x787, 0x1a6, 0x3, 0x2, 0x2, 0x2, 0x788, 0x789, 
+    0x9, 0x1b, 0x2, 0x2, 0x789, 0x1a8, 0x3, 0x2, 0x2, 0x2, 0x78a, 0x78b, 
+    0x9, 0x1c, 0x2, 0x2, 0x78b, 0x1aa, 0x3, 0x2, 0x2, 0x2, 0x78c, 0x78d, 
+    0x9, 0x1d, 0x2, 0x2, 0x78d, 0x1ac, 0x3, 0x2, 0x2, 0x2, 0x78e, 0x78f, 
+    0x9, 0x1e, 0x2, 0x2, 0x78f, 0x1ae, 0x3, 0x2, 0x2, 0x2, 0x790, 0x791, 
+    0x9, 0x1f, 0x2, 0x2, 0x791, 0x1b0, 0x3, 0x2, 0x2, 0x2, 0x792, 0x793, 
+    0x9, 0x20, 0x2, 0x2, 0x793, 0x1b2, 0x3, 0x2, 0x2, 0x2, 0x794, 0x795, 
+    0x9, 0x21, 0x2, 0x2, 0x795, 0x1b4, 0x3, 0x2, 0x2, 0x2, 0x796, 0x797, 
+    0x9, 0x22, 0x2, 0x2, 0x797, 0x1b6, 0x3, 0x2, 0x2, 0x2, 0x798, 0x799, 
+    0x7, 0x2f, 0x2, 0x2, 0x799, 0x79a, 0x7, 0x40, 0x2, 0x2, 0x79a, 0x1b8, 
+    0x3, 0x2, 0x2, 0x2, 0x79b, 0x79c, 0x7, 0x2c, 0x2, 0x2, 0x79c, 0x1ba, 
+    0x3, 0x2, 0x2, 0x2, 0x79d, 0x79e, 0x7, 0x62, 0x2, 0x2, 0x79e, 0x1bc, 
+    0x3, 0x2, 0x2, 0x2, 0x79f, 0x7a0, 0x7, 0x5e, 0x2, 0x2, 0x7a0, 0x1be, 
+    0x3, 0x2, 0x2, 0x2, 0x7a1, 0x7a2, 0x7, 0x3c, 0x2, 0x2, 0x7a2, 0x1c0, 
+    0x3, 0x2, 0x2, 0x2, 0x7a3, 0x7a4, 0x7, 0x2e, 0x2, 0x2, 0x7a4, 0x1c2, 
+    0x3, 0x2, 0x2, 0x2, 0x7a5, 0x7a6, 0x7, 0x7e, 0x2, 0x2, 0x7a6, 0x7a7, 
+    0x7, 0x7e, 0x2, 0x2, 0x7a7, 0x1c4, 0x3, 0x2, 0x2, 0x2, 0x7a8, 0x7a9, 
+    0x7, 0x2f, 0x2, 0x2, 0x7a9, 0x1c6, 0x3, 0x2, 0x2, 0x2, 0x7aa, 0x7ab, 
+    0x7, 0x30, 0x2, 0x2, 0x7ab, 0x1c8, 0x3, 0x2, 0x2, 0x2, 0x7ac, 0x7ad, 
+    0x7, 0x3f, 0x2, 0x2, 0x7ad, 0x7ae, 0x7, 0x3f, 0x2, 0x2, 0x7ae, 0x1ca, 
+    0x3, 0x2, 0x2, 0x2, 0x7af, 0x7b0, 0x7, 0x3f, 0x2, 0x2, 0x7b0, 0x1cc, 
+    0x3, 0x2, 0x2, 0x2, 0x7b1, 0x7b2, 0x7, 0x40, 0x2, 0x2, 0x7b2, 0x7b3, 
+    0x7, 0x3f, 0x2, 0x2, 0x7b3, 0x1ce, 0x3, 0x2, 0x2, 0x2, 0x7b4, 0x7b5, 
+    0x7, 0x40, 0x2, 0x2, 0x7b5, 0x1d0, 0x3, 0x2, 0x2, 0x2, 0x7b6, 0x7b7, 
+    0x7, 0x7d, 0x2, 0x2, 0x7b7, 0x1d2, 0x3, 0x2, 0x2, 0x2, 0x7b8, 0x7b9, 
+    0x7, 0x5d, 0x2, 0x2, 0x7b9, 0x1d4, 0x3, 0x2, 0x2, 0x2, 0x7ba, 0x7bb, 
+    0x7, 0x3e, 0x2, 0x2, 0x7bb, 0x7bc, 0x7, 0x3f, 0x2, 0x2, 0x7bc, 0x1d6, 
+    0x3, 0x2, 0x2, 0x2, 0x7bd, 0x7be, 0x7, 0x2a, 0x2, 0x2, 0x7be, 0x1d8, 
+    0x3, 0x2, 0x2, 0x2, 0x7bf, 0x7c0, 0x7, 0x3e, 0x2, 0x2, 0x7c0, 0x1da, 
+    0x3, 0x2, 0x2, 0x2, 0x7c1, 0x7c2, 0x7, 0x23, 0x2, 0x2, 0x7c2, 0x7c6, 
+    0x7, 0x3f, 0x2, 0x2, 0x7c3, 0x7c4, 0x7, 0x3e, 0x2, 0x2, 0x7c4, 0x7c6, 
+    0x7, 0x40, 0x2, 0x2, 0x7c5, 0x7c1, 0x3, 0x2, 0x2, 0x2, 0x7c5, 0x7c3, 
+    0x3, 0x2, 0x2, 0x2, 0x7c6, 0x1dc, 0x3, 0x2, 0x2, 0x2, 0x7c7, 0x7c8, 
+    0x7, 0x27, 0x2, 0x2, 0x7c8, 0x1de, 0x3, 0x2, 0x2, 0x2, 0x7c9, 0x7ca, 
+    0x7, 0x2d, 0x2, 0x2, 0x7ca, 0x1e0, 0x3, 0x2, 0x2, 0x2, 0x7cb, 0x7cc, 
+    0x7, 0x41, 0x2, 0x2, 0x7cc, 0x1e2, 0x3, 0x2, 0x2, 0x2, 0x7cd, 0x7ce, 
+    0x7, 0x24, 0x2, 0x2, 0x7ce, 0x1e4, 0x3, 0x2, 0x2, 0x2, 0x7cf, 0x7d0, 
+    0x7, 0x29, 0x2, 0x2, 0x7d0, 0x1e6, 0x3, 0x2, 0x2, 0x2, 0x7d1, 0x7d2, 
+    0x7, 0x7f, 0x2, 0x2, 0x7d2, 0x1e8, 0x3, 0x2, 0x2, 0x2, 0x7d3, 0x7d4, 
+    0x7, 0x5f, 0x2, 0x2, 0x7d4, 0x1ea, 0x3, 0x2, 0x2, 0x2, 0x7d5, 0x7d6, 
+    0x7, 0x2b, 0x2, 0x2, 0x7d6, 0x1ec, 0x3, 0x2, 0x2, 0x2, 0x7d7, 0x7d8, 
+    0x7, 0x3d, 0x2, 0x2, 0x7d8, 0x1ee, 0x3, 0x2, 0x2, 0x2, 0x7d9, 0x7da, 
+    0x7, 0x31, 0x2, 0x2, 0x7da, 0x1f0, 0x3, 0x2, 0x2, 0x2, 0x7db, 0x7dc, 
+    0x7, 0x61, 0x2, 0x2, 0x7dc, 0x1f2, 0x3, 0x2, 0x2, 0x2, 0x7dd, 0x7de, 
+    0x7, 0x31, 0x2, 0x2, 0x7de, 0x7df, 0x7, 0x2c, 0x2, 0x2, 0x7df, 0x7e3, 
+    0x3, 0x2, 0x2, 0x2, 0x7e0, 0x7e2, 0xb, 0x2, 0x2, 0x2, 0x7e1, 0x7e0, 
+    0x3, 0x2, 0x2, 0x2, 0x7e2, 0x7e5, 0x3, 0x2, 0x2, 0x2, 0x7e3, 0x7e4, 
+    0x3, 0x2, 0x2, 0x2, 0x7e3, 0x7e1, 0x3, 0x2, 0x2, 0x2, 0x7e4, 0x7e6, 
+    0x3, 0x2, 0x2, 0x2, 0x7e5, 0x7e3, 0x3, 0x2, 0x2, 0x2, 0x7e6, 0x7e7, 
+    0x7, 0x2c, 0x2, 0x2, 0x7e7, 0x7e8, 0x7, 0x31, 0x2, 0x2, 0x7e8, 0x7e9, 
+    0x3, 0x2, 0x2, 0x2, 0x7e9, 0x7ea, 0x8, 0xfa, 0x2, 0x2, 0x7ea, 0x1f4, 
+    0x3, 0x2, 0x2, 0x2, 0x7eb, 0x7ec, 0x7, 0x2f, 0x2, 0x2, 0x7ec, 0x7ed, 
+    0x7, 0x2f, 0x2, 0x2, 0x7ed, 0x7f1, 0x3, 0x2, 0x2, 0x2, 0x7ee, 0x7f0, 
+    0xa, 0x23, 0x2, 0x2, 0x7ef, 0x7ee, 0x3, 0x2, 0x2, 0x2, 0x7f0, 0x7f3, 
+    0x3, 0x2, 0x2, 0x2, 0x7f1, 0x7ef, 0x3, 0x2, 0x2, 0x2, 0x7f1, 0x7f2, 
+    0x3, 0x2, 0x2, 0x2, 0x7f2, 0x7f5, 0x3, 0x2, 0x2, 0x2, 0x7f3, 0x7f1, 
+    0x3, 0x2, 0x2, 0x2, 0x7f4, 0x7f6, 0x9, 0x24, 0x2, 0x2, 0x7f5, 0x7f4, 
+    0x3, 0x2, 0x2, 0x2, 0x7f6, 0x7f7, 0x3, 0x2, 0x2, 0x2, 0x7f7, 0x7f8, 
+    0x8, 0xfb, 0x2, 0x2, 0x7f8, 0x1f6, 0x3, 0x2, 0x2, 0x2, 0x7f9, 0x7fa, 
+    0x9, 0x25, 0x2, 0x2, 0x7fa, 0x7fb, 0x3, 0x2, 0x2, 0x2, 0x7fb, 0x7fc, 
+    0x8, 0xfc, 0x2, 0x2, 0x7fc, 0x1f8, 0x3, 0x2, 0x2, 0x2, 0x26, 0x2, 0x237, 
+    0x413, 0x6b4, 0x6c3, 0x6c8, 0x6ca, 0x6d5, 0x6d7, 0x6e4, 0x6e6, 0x6eb, 
+    0x6f2, 0x6f7, 0x6fb, 0x700, 0x705, 0x709, 0x70e, 0x715, 0x71b, 0x720, 
+    0x727, 0x72c, 0x732, 0x737, 0x739, 0x73f, 0x744, 0x74b, 0x755, 0x757, 
+    0x7c5, 0x7e3, 0x7f1, 0x7f5, 0x3, 0x8, 0x2, 0x2, 
   };
 
   atn::ATNDeserializer deserializer;
diff --git a/src/Parsers/New/ClickHouseLexer.g4 b/src/Parsers/New/ClickHouseLexer.g4
index 508bc1d33ff..343b73ff86b 100644
--- a/src/Parsers/New/ClickHouseLexer.g4
+++ b/src/Parsers/New/ClickHouseLexer.g4
@@ -102,6 +102,7 @@ LIMIT: L I M I T;
 LIVE: L I V E;
 LOCAL: L O C A L;
 LOGS: L O G S;
+MATERIALIZE: M A T E R I A L I Z E;
 MATERIALIZED: M A T E R I A L I Z E D;
 MAX: M A X;
 MERGES: M E R G E S;
@@ -127,6 +128,7 @@ PARTITION: P A R T I T I O N;
 POPULATE: P O P U L A T E;
 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;
 QUARTER: Q U A R T E R;
 RANGE: R A N G E;
 RELOAD: R E L O A D;
diff --git a/src/Parsers/New/ClickHouseLexer.h b/src/Parsers/New/ClickHouseLexer.h
index 62de0792f3c..4de0a30ba2c 100644
--- a/src/Parsers/New/ClickHouseLexer.h
+++ b/src/Parsers/New/ClickHouseLexer.h
@@ -13,51 +13,51 @@ namespace DB {
 class  ClickHouseLexer : public antlr4::Lexer {
 public:
   enum {
-    ADD = 1, AFTER = 2, ALIAS = 3, ALL = 4, ALTER = 5, AND = 6, ANTI = 7,
-    ANY = 8, ARRAY = 9, AS = 10, ASCENDING = 11, ASOF = 12, ASYNC = 13,
-    ATTACH = 14, BETWEEN = 15, BOTH = 16, BY = 17, CASE = 18, CAST = 19,
-    CHECK = 20, CLEAR = 21, CLUSTER = 22, CODEC = 23, COLLATE = 24, COLUMN = 25,
-    COMMENT = 26, CONSTRAINT = 27, CREATE = 28, CROSS = 29, CUBE = 30, DATABASE = 31,
-    DATABASES = 32, DATE = 33, DAY = 34, DEDUPLICATE = 35, DEFAULT = 36,
-    DELAY = 37, DELETE = 38, DESC = 39, DESCENDING = 40, DESCRIBE = 41,
-    DETACH = 42, DICTIONARIES = 43, DICTIONARY = 44, DISK = 45, DISTINCT = 46,
-    DISTRIBUTED = 47, DROP = 48, ELSE = 49, END = 50, ENGINE = 51, EVENTS = 52,
-    EXISTS = 53, EXPLAIN = 54, EXPRESSION = 55, EXTRACT = 56, FETCHES = 57,
-    FINAL = 58, FIRST = 59, FLUSH = 60, FOR = 61, FORMAT = 62, FREEZE = 63,
-    FROM = 64, FULL = 65, FUNCTION = 66, GLOBAL = 67, GRANULARITY = 68,
-    GROUP = 69, HAVING = 70, HIERARCHICAL = 71, HOUR = 72, ID = 73, IF = 74,
-    ILIKE = 75, IN = 76, INDEX = 77, INF = 78, INJECTIVE = 79, INNER = 80,
-    INSERT = 81, INTERVAL = 82, INTO = 83, IS = 84, IS_OBJECT_ID = 85, JOIN = 86,
-    KEY = 87, KILL = 88, LAST = 89, LAYOUT = 90, LEADING = 91, LEFT = 92,
-    LIFETIME = 93, LIKE = 94, LIMIT = 95, LIVE = 96, LOCAL = 97, LOGS = 98,
-    MATERIALIZED = 99, MAX = 100, MERGES = 101, MIN = 102, MINUTE = 103,
-    MODIFY = 104, MONTH = 105, MOVE = 106, MUTATION = 107, NAN_SQL = 108,
-    NO = 109, NOT = 110, NULL_SQL = 111, NULLS = 112, OFFSET = 113, ON = 114,
-    OPTIMIZE = 115, OR = 116, ORDER = 117, OUTER = 118, OUTFILE = 119, PARTITION = 120,
-    POPULATE = 121, PREWHERE = 122, PRIMARY = 123, QUARTER = 124, RANGE = 125,
-    RELOAD = 126, REMOVE = 127, RENAME = 128, REPLACE = 129, REPLICA = 130,
-    REPLICATED = 131, RIGHT = 132, ROLLUP = 133, SAMPLE = 134, SECOND = 135,
-    SELECT = 136, SEMI = 137, SENDS = 138, SET = 139, SETTINGS = 140, SHOW = 141,
-    SOURCE = 142, START = 143, STOP = 144, SUBSTRING = 145, SYNC = 146,
-    SYNTAX = 147, SYSTEM = 148, TABLE = 149, TABLES = 150, TEMPORARY = 151,
-    TEST = 152, THEN = 153, TIES = 154, TIMEOUT = 155, TIMESTAMP = 156,
-    TO = 157, TOP = 158, TOTALS = 159, TRAILING = 160, TRIM = 161, TRUNCATE = 162,
-    TTL = 163, TYPE = 164, UNION = 165, UPDATE = 166, USE = 167, USING = 168,
-    UUID = 169, VALUES = 170, VIEW = 171, VOLUME = 172, WATCH = 173, WEEK = 174,
-    WHEN = 175, WHERE = 176, WITH = 177, YEAR = 178, JSON_FALSE = 179, JSON_TRUE = 180,
-    IDENTIFIER = 181, FLOATING_LITERAL = 182, OCTAL_LITERAL = 183, DECIMAL_LITERAL = 184,
-    HEXADECIMAL_LITERAL = 185, STRING_LITERAL = 186, ARROW = 187, ASTERISK = 188,
-    BACKQUOTE = 189, BACKSLASH = 190, COLON = 191, COMMA = 192, CONCAT = 193,
-    DASH = 194, DOT = 195, EQ_DOUBLE = 196, EQ_SINGLE = 197, GE = 198, GT = 199,
-    LBRACE = 200, LBRACKET = 201, LE = 202, LPAREN = 203, LT = 204, NOT_EQ = 205,
-    PERCENT = 206, PLUS = 207, QUERY = 208, QUOTE_DOUBLE = 209, QUOTE_SINGLE = 210,
-    RBRACE = 211, RBRACKET = 212, RPAREN = 213, SEMICOLON = 214, SLASH = 215,
-    UNDERSCORE = 216, MULTI_LINE_COMMENT = 217, SINGLE_LINE_COMMENT = 218,
-    WHITESPACE = 219
+    ADD = 1, AFTER = 2, ALIAS = 3, ALL = 4, ALTER = 5, AND = 6, ANTI = 7, 
+    ANY = 8, ARRAY = 9, AS = 10, ASCENDING = 11, ASOF = 12, ASYNC = 13, 
+    ATTACH = 14, BETWEEN = 15, BOTH = 16, BY = 17, CASE = 18, CAST = 19, 
+    CHECK = 20, CLEAR = 21, CLUSTER = 22, CODEC = 23, COLLATE = 24, COLUMN = 25, 
+    COMMENT = 26, CONSTRAINT = 27, CREATE = 28, CROSS = 29, CUBE = 30, DATABASE = 31, 
+    DATABASES = 32, DATE = 33, DAY = 34, DEDUPLICATE = 35, DEFAULT = 36, 
+    DELAY = 37, DELETE = 38, DESC = 39, DESCENDING = 40, DESCRIBE = 41, 
+    DETACH = 42, DICTIONARIES = 43, DICTIONARY = 44, DISK = 45, DISTINCT = 46, 
+    DISTRIBUTED = 47, DROP = 48, ELSE = 49, END = 50, ENGINE = 51, EVENTS = 52, 
+    EXISTS = 53, EXPLAIN = 54, EXPRESSION = 55, EXTRACT = 56, FETCHES = 57, 
+    FINAL = 58, FIRST = 59, FLUSH = 60, FOR = 61, FORMAT = 62, FREEZE = 63, 
+    FROM = 64, FULL = 65, FUNCTION = 66, GLOBAL = 67, GRANULARITY = 68, 
+    GROUP = 69, HAVING = 70, HIERARCHICAL = 71, HOUR = 72, ID = 73, IF = 74, 
+    ILIKE = 75, IN = 76, INDEX = 77, INF = 78, INJECTIVE = 79, INNER = 80, 
+    INSERT = 81, INTERVAL = 82, INTO = 83, IS = 84, IS_OBJECT_ID = 85, JOIN = 86, 
+    KEY = 87, KILL = 88, LAST = 89, LAYOUT = 90, LEADING = 91, LEFT = 92, 
+    LIFETIME = 93, LIKE = 94, LIMIT = 95, LIVE = 96, LOCAL = 97, LOGS = 98, 
+    MATERIALIZED = 99, MATERIALIZE = 100, MAX = 101, MERGES = 102, MIN = 103, 
+    MINUTE = 104, MODIFY = 105, MONTH = 106, MOVE = 107, MUTATION = 108, 
+    NAN_SQL = 109, NO = 110, NOT = 111, NULL_SQL = 112, NULLS = 113, OFFSET = 114, 
+    ON = 115, OPTIMIZE = 116, OR = 117, ORDER = 118, OUTER = 119, OUTFILE = 120, 
+    PARTITION = 121, POPULATE = 122, PREWHERE = 123, PRIMARY = 124, PROJECTION = 125, 
+    QUARTER = 126, RANGE = 127, RELOAD = 128, REMOVE = 129, RENAME = 130, 
+    REPLACE = 131, REPLICA = 132, REPLICATED = 133, RIGHT = 134, ROLLUP = 135, 
+    SAMPLE = 136, SECOND = 137, SELECT = 138, SEMI = 139, SENDS = 140, SET = 141, 
+    SETTINGS = 142, SHOW = 143, SOURCE = 144, START = 145, STOP = 146, SUBSTRING = 147, 
+    SYNC = 148, SYNTAX = 149, SYSTEM = 150, TABLE = 151, TABLES = 152, TEMPORARY = 153, 
+    TEST = 154, THEN = 155, TIES = 156, TIMEOUT = 157, TIMESTAMP = 158, 
+    TO = 159, TOP = 160, TOTALS = 161, TRAILING = 162, TRIM = 163, TRUNCATE = 164, 
+    TTL = 165, TYPE = 166, UNION = 167, UPDATE = 168, USE = 169, USING = 170, 
+    UUID = 171, VALUES = 172, VIEW = 173, VOLUME = 174, WATCH = 175, WEEK = 176, 
+    WHEN = 177, WHERE = 178, WITH = 179, YEAR = 180, JSON_FALSE = 181, JSON_TRUE = 182, 
+    IDENTIFIER = 183, FLOATING_LITERAL = 184, OCTAL_LITERAL = 185, DECIMAL_LITERAL = 186, 
+    HEXADECIMAL_LITERAL = 187, STRING_LITERAL = 188, ARROW = 189, ASTERISK = 190, 
+    BACKQUOTE = 191, BACKSLASH = 192, COLON = 193, COMMA = 194, CONCAT = 195, 
+    DASH = 196, DOT = 197, EQ_DOUBLE = 198, EQ_SINGLE = 199, GE = 200, GT = 201, 
+    LBRACE = 202, LBRACKET = 203, LE = 204, LPAREN = 205, LT = 206, NOT_EQ = 207, 
+    PERCENT = 208, PLUS = 209, QUERY = 210, QUOTE_DOUBLE = 211, QUOTE_SINGLE = 212, 
+    RBRACE = 213, RBRACKET = 214, RPAREN = 215, SEMICOLON = 216, SLASH = 217, 
+    UNDERSCORE = 218, MULTI_LINE_COMMENT = 219, SINGLE_LINE_COMMENT = 220, 
+    WHITESPACE = 221
   };
 
   ClickHouseLexer(antlr4::CharStream *input);
-  ~ClickHouseLexer() override;
+  ~ClickHouseLexer();
 
   virtual std::string getGrammarFileName() const override;
   virtual const std::vector<std::string>& getRuleNames() const override;
diff --git a/src/Parsers/New/ClickHouseParser.cpp b/src/Parsers/New/ClickHouseParser.cpp
index 91cf1e47f96..d3ba8563a6f 100644
--- a/src/Parsers/New/ClickHouseParser.cpp
+++ b/src/Parsers/New/ClickHouseParser.cpp
@@ -92,7 +92,7 @@ ClickHouseParser::QueryStmtContext* ClickHouseParser::queryStmt() {
     exitRule();
   });
   try {
-    setState(226);
+    setState(232);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::ALTER:
@@ -118,36 +118,36 @@ ClickHouseParser::QueryStmtContext* ClickHouseParser::queryStmt() {
       case ClickHouseParser::WITH:
       case ClickHouseParser::LPAREN: {
         enterOuterAlt(_localctx, 1);
-        setState(212);
+        setState(218);
         query();
-        setState(216);
+        setState(222);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::INTO) {
-          setState(213);
+          setState(219);
           match(ClickHouseParser::INTO);
-          setState(214);
+          setState(220);
           match(ClickHouseParser::OUTFILE);
-          setState(215);
+          setState(221);
           match(ClickHouseParser::STRING_LITERAL);
         }
-        setState(220);
+        setState(226);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::FORMAT) {
-          setState(218);
+          setState(224);
           match(ClickHouseParser::FORMAT);
-          setState(219);
+          setState(225);
           identifierOrNull();
         }
-        setState(223);
+        setState(229);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::SEMICOLON) {
-          setState(222);
+          setState(228);
           match(ClickHouseParser::SEMICOLON);
         }
         break;
@@ -155,7 +155,7 @@ ClickHouseParser::QueryStmtContext* ClickHouseParser::queryStmt() {
 
       case ClickHouseParser::INSERT: {
         enterOuterAlt(_localctx, 2);
-        setState(225);
+        setState(231);
         insertStmt();
         break;
       }
@@ -273,131 +273,131 @@ ClickHouseParser::QueryContext* ClickHouseParser::query() {
     exitRule();
   });
   try {
-    setState(246);
+    setState(252);
     _errHandler->sync(this);
     switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 4, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(228);
+      setState(234);
       alterStmt();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(229);
+      setState(235);
       attachStmt();
       break;
     }
 
     case 3: {
       enterOuterAlt(_localctx, 3);
-      setState(230);
+      setState(236);
       checkStmt();
       break;
     }
 
     case 4: {
       enterOuterAlt(_localctx, 4);
-      setState(231);
+      setState(237);
       createStmt();
       break;
     }
 
     case 5: {
       enterOuterAlt(_localctx, 5);
-      setState(232);
+      setState(238);
       describeStmt();
       break;
     }
 
     case 6: {
       enterOuterAlt(_localctx, 6);
-      setState(233);
+      setState(239);
       dropStmt();
       break;
     }
 
     case 7: {
       enterOuterAlt(_localctx, 7);
-      setState(234);
+      setState(240);
       existsStmt();
       break;
     }
 
     case 8: {
       enterOuterAlt(_localctx, 8);
-      setState(235);
+      setState(241);
       explainStmt();
       break;
     }
 
     case 9: {
       enterOuterAlt(_localctx, 9);
-      setState(236);
+      setState(242);
       killStmt();
       break;
     }
 
     case 10: {
       enterOuterAlt(_localctx, 10);
-      setState(237);
+      setState(243);
       optimizeStmt();
       break;
     }
 
     case 11: {
       enterOuterAlt(_localctx, 11);
-      setState(238);
+      setState(244);
       renameStmt();
       break;
     }
 
     case 12: {
       enterOuterAlt(_localctx, 12);
-      setState(239);
+      setState(245);
       selectUnionStmt();
       break;
     }
 
     case 13: {
       enterOuterAlt(_localctx, 13);
-      setState(240);
+      setState(246);
       setStmt();
       break;
     }
 
     case 14: {
       enterOuterAlt(_localctx, 14);
-      setState(241);
+      setState(247);
       showStmt();
       break;
     }
 
     case 15: {
       enterOuterAlt(_localctx, 15);
-      setState(242);
+      setState(248);
       systemStmt();
       break;
     }
 
     case 16: {
       enterOuterAlt(_localctx, 16);
-      setState(243);
+      setState(249);
       truncateStmt();
       break;
     }
 
     case 17: {
       enterOuterAlt(_localctx, 17);
-      setState(244);
+      setState(250);
       useStmt();
       break;
     }
 
     case 18: {
       enterOuterAlt(_localctx, 18);
-      setState(245);
+      setState(251);
       watchStmt();
       break;
     }
@@ -483,31 +483,31 @@ ClickHouseParser::AlterStmtContext* ClickHouseParser::alterStmt() {
   try {
     _localctx = dynamic_cast<AlterStmtContext *>(_tracker.createInstance<ClickHouseParser::AlterTableStmtContext>(_localctx));
     enterOuterAlt(_localctx, 1);
-    setState(248);
+    setState(254);
     match(ClickHouseParser::ALTER);
-    setState(249);
+    setState(255);
     match(ClickHouseParser::TABLE);
-    setState(250);
+    setState(256);
     tableIdentifier();
-    setState(252);
+    setState(258);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(251);
+      setState(257);
       clusterClause();
     }
-    setState(254);
+    setState(260);
     alterTableClause();
-    setState(259);
+    setState(265);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(255);
-      match(ClickHouseParser::COMMA);
-      setState(256);
-      alterTableClause();
       setState(261);
+      match(ClickHouseParser::COMMA);
+      setState(262);
+      alterTableClause();
+      setState(267);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -564,95 +564,6 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseReplaceContext::accept(tree::Par
   else
     return visitor->visitChildren(this);
 }
-//----------------- AlterTableClauseRenameContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::RENAME() {
-  return getToken(ClickHouseParser::RENAME, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::COLUMN() {
-  return getToken(ClickHouseParser::COLUMN, 0);
-}
-
-std::vector<ClickHouseParser::NestedIdentifierContext *> ClickHouseParser::AlterTableClauseRenameContext::nestedIdentifier() {
-  return getRuleContexts<ClickHouseParser::NestedIdentifierContext>();
-}
-
-ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseRenameContext::nestedIdentifier(size_t i) {
-  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(i);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::TO() {
-  return getToken(ClickHouseParser::TO, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::IF() {
-  return getToken(ClickHouseParser::IF, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::EXISTS() {
-  return getToken(ClickHouseParser::EXISTS, 0);
-}
-
-ClickHouseParser::AlterTableClauseRenameContext::AlterTableClauseRenameContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseRenameContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseRename(this);
-  else
-    return visitor->visitChildren(this);
-}
-//----------------- AlterTableClauseFreezePartitionContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseFreezePartitionContext::FREEZE() {
-  return getToken(ClickHouseParser::FREEZE, 0);
-}
-
-ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseFreezePartitionContext::partitionClause() {
-  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
-}
-
-ClickHouseParser::AlterTableClauseFreezePartitionContext::AlterTableClauseFreezePartitionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseFreezePartitionContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseFreezePartition(this);
-  else
-    return visitor->visitChildren(this);
-}
-//----------------- AlterTableClauseModifyContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::MODIFY() {
-  return getToken(ClickHouseParser::MODIFY, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::COLUMN() {
-  return getToken(ClickHouseParser::COLUMN, 0);
-}
-
-ClickHouseParser::TableColumnDfntContext* ClickHouseParser::AlterTableClauseModifyContext::tableColumnDfnt() {
-  return getRuleContext<ClickHouseParser::TableColumnDfntContext>(0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::IF() {
-  return getToken(ClickHouseParser::IF, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::EXISTS() {
-  return getToken(ClickHouseParser::EXISTS, 0);
-}
-
-ClickHouseParser::AlterTableClauseModifyContext::AlterTableClauseModifyContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseModifyContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseModify(this);
-  else
-    return visitor->visitChildren(this);
-}
 //----------------- AlterTableClauseModifyOrderByContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyOrderByContext::MODIFY() {
@@ -680,25 +591,6 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseModifyOrderByContext::accept(tre
   else
     return visitor->visitChildren(this);
 }
-//----------------- AlterTableClauseRemoveTTLContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseRemoveTTLContext::REMOVE() {
-  return getToken(ClickHouseParser::REMOVE, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseRemoveTTLContext::TTL() {
-  return getToken(ClickHouseParser::TTL, 0);
-}
-
-ClickHouseParser::AlterTableClauseRemoveTTLContext::AlterTableClauseRemoveTTLContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseRemoveTTLContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseRemoveTTL(this);
-  else
-    return visitor->visitChildren(this);
-}
 //----------------- AlterTableClauseUpdateContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseUpdateContext::UPDATE() {
@@ -722,6 +614,45 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseUpdateContext::accept(tree::Pars
   else
     return visitor->visitChildren(this);
 }
+//----------------- AlterTableClauseClearProjectionContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearProjectionContext::CLEAR() {
+  return getToken(ClickHouseParser::CLEAR, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearProjectionContext::PROJECTION() {
+  return getToken(ClickHouseParser::PROJECTION, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseClearProjectionContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearProjectionContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearProjectionContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearProjectionContext::IN() {
+  return getToken(ClickHouseParser::IN, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseClearProjectionContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseClearProjectionContext::AlterTableClauseClearProjectionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseClearProjectionContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseClearProjection(this);
+  else
+    return visitor->visitChildren(this);
+}
 //----------------- AlterTableClauseModifyRemoveContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyRemoveContext::MODIFY() {
@@ -784,41 +715,6 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseDeleteContext::accept(tree::Pars
   else
     return visitor->visitChildren(this);
 }
-//----------------- AlterTableClauseModifyCodecContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::MODIFY() {
-  return getToken(ClickHouseParser::MODIFY, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::COLUMN() {
-  return getToken(ClickHouseParser::COLUMN, 0);
-}
-
-ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseModifyCodecContext::nestedIdentifier() {
-  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
-}
-
-ClickHouseParser::CodecExprContext* ClickHouseParser::AlterTableClauseModifyCodecContext::codecExpr() {
-  return getRuleContext<ClickHouseParser::CodecExprContext>(0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::IF() {
-  return getToken(ClickHouseParser::IF, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::EXISTS() {
-  return getToken(ClickHouseParser::EXISTS, 0);
-}
-
-ClickHouseParser::AlterTableClauseModifyCodecContext::AlterTableClauseModifyCodecContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseModifyCodecContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseModifyCodec(this);
-  else
-    return visitor->visitChildren(this);
-}
 //----------------- AlterTableClauseCommentContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseCommentContext::COMMENT() {
@@ -854,33 +750,6 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseCommentContext::accept(tree::Par
   else
     return visitor->visitChildren(this);
 }
-//----------------- AlterTableClauseAttachContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseAttachContext::ATTACH() {
-  return getToken(ClickHouseParser::ATTACH, 0);
-}
-
-ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseAttachContext::partitionClause() {
-  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseAttachContext::FROM() {
-  return getToken(ClickHouseParser::FROM, 0);
-}
-
-ClickHouseParser::TableIdentifierContext* ClickHouseParser::AlterTableClauseAttachContext::tableIdentifier() {
-  return getRuleContext<ClickHouseParser::TableIdentifierContext>(0);
-}
-
-ClickHouseParser::AlterTableClauseAttachContext::AlterTableClauseAttachContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseAttachContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseAttach(this);
-  else
-    return visitor->visitChildren(this);
-}
 //----------------- AlterTableClauseDropColumnContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseDropColumnContext::DROP() {
@@ -912,45 +781,6 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseDropColumnContext::accept(tree::
   else
     return visitor->visitChildren(this);
 }
-//----------------- AlterTableClauseClearContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseClearContext::CLEAR() {
-  return getToken(ClickHouseParser::CLEAR, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseClearContext::COLUMN() {
-  return getToken(ClickHouseParser::COLUMN, 0);
-}
-
-ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseClearContext::nestedIdentifier() {
-  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseClearContext::IF() {
-  return getToken(ClickHouseParser::IF, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseClearContext::EXISTS() {
-  return getToken(ClickHouseParser::EXISTS, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseClearContext::IN() {
-  return getToken(ClickHouseParser::IN, 0);
-}
-
-ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseClearContext::partitionClause() {
-  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
-}
-
-ClickHouseParser::AlterTableClauseClearContext::AlterTableClauseClearContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseClearContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseClear(this);
-  else
-    return visitor->visitChildren(this);
-}
 //----------------- AlterTableClauseDetachContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseDetachContext::DETACH() {
@@ -970,37 +800,6 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseDetachContext::accept(tree::Pars
   else
     return visitor->visitChildren(this);
 }
-//----------------- AlterTableClauseDropIndexContext ------------------------------------------------------------------
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::DROP() {
-  return getToken(ClickHouseParser::DROP, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::INDEX() {
-  return getToken(ClickHouseParser::INDEX, 0);
-}
-
-ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseDropIndexContext::nestedIdentifier() {
-  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::IF() {
-  return getToken(ClickHouseParser::IF, 0);
-}
-
-tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::EXISTS() {
-  return getToken(ClickHouseParser::EXISTS, 0);
-}
-
-ClickHouseParser::AlterTableClauseDropIndexContext::AlterTableClauseDropIndexContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
-
-
-antlrcpp::Any ClickHouseParser::AlterTableClauseDropIndexContext::accept(tree::ParseTreeVisitor *visitor) {
-  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseDropIndex(this);
-  else
-    return visitor->visitChildren(this);
-}
 //----------------- AlterTableClauseAddIndexContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseAddIndexContext::ADD() {
@@ -1063,6 +862,437 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseDropPartitionContext::accept(tre
   else
     return visitor->visitChildren(this);
 }
+//----------------- AlterTableClauseMaterializeIndexContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeIndexContext::MATERIALIZE() {
+  return getToken(ClickHouseParser::MATERIALIZE, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeIndexContext::INDEX() {
+  return getToken(ClickHouseParser::INDEX, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseMaterializeIndexContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeIndexContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeIndexContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeIndexContext::IN() {
+  return getToken(ClickHouseParser::IN, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseMaterializeIndexContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseMaterializeIndexContext::AlterTableClauseMaterializeIndexContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseMaterializeIndexContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseMaterializeIndex(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseMaterializeProjectionContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeProjectionContext::MATERIALIZE() {
+  return getToken(ClickHouseParser::MATERIALIZE, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeProjectionContext::PROJECTION() {
+  return getToken(ClickHouseParser::PROJECTION, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseMaterializeProjectionContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeProjectionContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeProjectionContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMaterializeProjectionContext::IN() {
+  return getToken(ClickHouseParser::IN, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseMaterializeProjectionContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseMaterializeProjectionContext::AlterTableClauseMaterializeProjectionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseMaterializeProjectionContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseMaterializeProjection(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseMovePartitionContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::MOVE() {
+  return getToken(ClickHouseParser::MOVE, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseMovePartitionContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::TO() {
+  return getToken(ClickHouseParser::TO, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::DISK() {
+  return getToken(ClickHouseParser::DISK, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::STRING_LITERAL() {
+  return getToken(ClickHouseParser::STRING_LITERAL, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::VOLUME() {
+  return getToken(ClickHouseParser::VOLUME, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::TABLE() {
+  return getToken(ClickHouseParser::TABLE, 0);
+}
+
+ClickHouseParser::TableIdentifierContext* ClickHouseParser::AlterTableClauseMovePartitionContext::tableIdentifier() {
+  return getRuleContext<ClickHouseParser::TableIdentifierContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseMovePartitionContext::AlterTableClauseMovePartitionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseMovePartitionContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseMovePartition(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseRenameContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::RENAME() {
+  return getToken(ClickHouseParser::RENAME, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::COLUMN() {
+  return getToken(ClickHouseParser::COLUMN, 0);
+}
+
+std::vector<ClickHouseParser::NestedIdentifierContext *> ClickHouseParser::AlterTableClauseRenameContext::nestedIdentifier() {
+  return getRuleContexts<ClickHouseParser::NestedIdentifierContext>();
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseRenameContext::nestedIdentifier(size_t i) {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(i);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::TO() {
+  return getToken(ClickHouseParser::TO, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseRenameContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+ClickHouseParser::AlterTableClauseRenameContext::AlterTableClauseRenameContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseRenameContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseRename(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseFreezePartitionContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseFreezePartitionContext::FREEZE() {
+  return getToken(ClickHouseParser::FREEZE, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseFreezePartitionContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseFreezePartitionContext::AlterTableClauseFreezePartitionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseFreezePartitionContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseFreezePartition(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseClearColumnContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearColumnContext::CLEAR() {
+  return getToken(ClickHouseParser::CLEAR, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearColumnContext::COLUMN() {
+  return getToken(ClickHouseParser::COLUMN, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseClearColumnContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearColumnContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearColumnContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearColumnContext::IN() {
+  return getToken(ClickHouseParser::IN, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseClearColumnContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseClearColumnContext::AlterTableClauseClearColumnContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseClearColumnContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseClearColumn(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseModifyContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::MODIFY() {
+  return getToken(ClickHouseParser::MODIFY, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::COLUMN() {
+  return getToken(ClickHouseParser::COLUMN, 0);
+}
+
+ClickHouseParser::TableColumnDfntContext* ClickHouseParser::AlterTableClauseModifyContext::tableColumnDfnt() {
+  return getRuleContext<ClickHouseParser::TableColumnDfntContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+ClickHouseParser::AlterTableClauseModifyContext::AlterTableClauseModifyContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseModifyContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseModify(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseClearIndexContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearIndexContext::CLEAR() {
+  return getToken(ClickHouseParser::CLEAR, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearIndexContext::INDEX() {
+  return getToken(ClickHouseParser::INDEX, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseClearIndexContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearIndexContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearIndexContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseClearIndexContext::IN() {
+  return getToken(ClickHouseParser::IN, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseClearIndexContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseClearIndexContext::AlterTableClauseClearIndexContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseClearIndexContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseClearIndex(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseRemoveTTLContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseRemoveTTLContext::REMOVE() {
+  return getToken(ClickHouseParser::REMOVE, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseRemoveTTLContext::TTL() {
+  return getToken(ClickHouseParser::TTL, 0);
+}
+
+ClickHouseParser::AlterTableClauseRemoveTTLContext::AlterTableClauseRemoveTTLContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseRemoveTTLContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseRemoveTTL(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseModifyCodecContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::MODIFY() {
+  return getToken(ClickHouseParser::MODIFY, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::COLUMN() {
+  return getToken(ClickHouseParser::COLUMN, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseModifyCodecContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+ClickHouseParser::CodecExprContext* ClickHouseParser::AlterTableClauseModifyCodecContext::codecExpr() {
+  return getRuleContext<ClickHouseParser::CodecExprContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCodecContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+ClickHouseParser::AlterTableClauseModifyCodecContext::AlterTableClauseModifyCodecContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseModifyCodecContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseModifyCodec(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseAttachContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAttachContext::ATTACH() {
+  return getToken(ClickHouseParser::ATTACH, 0);
+}
+
+ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseAttachContext::partitionClause() {
+  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAttachContext::FROM() {
+  return getToken(ClickHouseParser::FROM, 0);
+}
+
+ClickHouseParser::TableIdentifierContext* ClickHouseParser::AlterTableClauseAttachContext::tableIdentifier() {
+  return getRuleContext<ClickHouseParser::TableIdentifierContext>(0);
+}
+
+ClickHouseParser::AlterTableClauseAttachContext::AlterTableClauseAttachContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseAttachContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseAttach(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseDropProjectionContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropProjectionContext::DROP() {
+  return getToken(ClickHouseParser::DROP, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropProjectionContext::PROJECTION() {
+  return getToken(ClickHouseParser::PROJECTION, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseDropProjectionContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropProjectionContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropProjectionContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+ClickHouseParser::AlterTableClauseDropProjectionContext::AlterTableClauseDropProjectionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseDropProjectionContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseDropProjection(this);
+  else
+    return visitor->visitChildren(this);
+}
+//----------------- AlterTableClauseDropIndexContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::DROP() {
+  return getToken(ClickHouseParser::DROP, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::INDEX() {
+  return getToken(ClickHouseParser::INDEX, 0);
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseDropIndexContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::AlterTableClauseDropIndexContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
+}
+
+ClickHouseParser::AlterTableClauseDropIndexContext::AlterTableClauseDropIndexContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::AlterTableClauseDropIndexContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitAlterTableClauseDropIndex(this);
+  else
+    return visitor->visitChildren(this);
+}
 //----------------- AlterTableClauseModifyCommentContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::AlterTableClauseModifyCommentContext::MODIFY() {
@@ -1121,46 +1351,46 @@ antlrcpp::Any ClickHouseParser::AlterTableClauseModifyTTLContext::accept(tree::P
   else
     return visitor->visitChildren(this);
 }
-//----------------- AlterTableClauseMovePartitionContext ------------------------------------------------------------------
+//----------------- AlterTableClauseAddProjectionContext ------------------------------------------------------------------
 
-tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::MOVE() {
-  return getToken(ClickHouseParser::MOVE, 0);
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAddProjectionContext::ADD() {
+  return getToken(ClickHouseParser::ADD, 0);
 }
 
-ClickHouseParser::PartitionClauseContext* ClickHouseParser::AlterTableClauseMovePartitionContext::partitionClause() {
-  return getRuleContext<ClickHouseParser::PartitionClauseContext>(0);
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAddProjectionContext::PROJECTION() {
+  return getToken(ClickHouseParser::PROJECTION, 0);
 }
 
-tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::TO() {
-  return getToken(ClickHouseParser::TO, 0);
+ClickHouseParser::TableProjectionDfntContext* ClickHouseParser::AlterTableClauseAddProjectionContext::tableProjectionDfnt() {
+  return getRuleContext<ClickHouseParser::TableProjectionDfntContext>(0);
 }
 
-tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::DISK() {
-  return getToken(ClickHouseParser::DISK, 0);
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAddProjectionContext::IF() {
+  return getToken(ClickHouseParser::IF, 0);
 }
 
-tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::STRING_LITERAL() {
-  return getToken(ClickHouseParser::STRING_LITERAL, 0);
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAddProjectionContext::NOT() {
+  return getToken(ClickHouseParser::NOT, 0);
 }
 
-tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::VOLUME() {
-  return getToken(ClickHouseParser::VOLUME, 0);
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAddProjectionContext::EXISTS() {
+  return getToken(ClickHouseParser::EXISTS, 0);
 }
 
-tree::TerminalNode* ClickHouseParser::AlterTableClauseMovePartitionContext::TABLE() {
-  return getToken(ClickHouseParser::TABLE, 0);
+tree::TerminalNode* ClickHouseParser::AlterTableClauseAddProjectionContext::AFTER() {
+  return getToken(ClickHouseParser::AFTER, 0);
 }
 
-ClickHouseParser::TableIdentifierContext* ClickHouseParser::AlterTableClauseMovePartitionContext::tableIdentifier() {
-  return getRuleContext<ClickHouseParser::TableIdentifierContext>(0);
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::AlterTableClauseAddProjectionContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
 }
 
-ClickHouseParser::AlterTableClauseMovePartitionContext::AlterTableClauseMovePartitionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
+ClickHouseParser::AlterTableClauseAddProjectionContext::AlterTableClauseAddProjectionContext(AlterTableClauseContext *ctx) { copyFrom(ctx); }
 
 
-antlrcpp::Any ClickHouseParser::AlterTableClauseMovePartitionContext::accept(tree::ParseTreeVisitor *visitor) {
+antlrcpp::Any ClickHouseParser::AlterTableClauseAddProjectionContext::accept(tree::ParseTreeVisitor *visitor) {
   if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
-    return parserVisitor->visitAlterTableClauseMovePartition(this);
+    return parserVisitor->visitAlterTableClauseAddProjection(this);
   else
     return visitor->visitChildren(this);
 }
@@ -1216,41 +1446,41 @@ ClickHouseParser::AlterTableClauseContext* ClickHouseParser::alterTableClause()
     exitRule();
   });
   try {
-    setState(413);
+    setState(482);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 24, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 35, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseAddColumnContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(262);
+      setState(268);
       match(ClickHouseParser::ADD);
-      setState(263);
+      setState(269);
       match(ClickHouseParser::COLUMN);
-      setState(267);
+      setState(273);
       _errHandler->sync(this);
 
       switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 7, _ctx)) {
       case 1: {
-        setState(264);
+        setState(270);
         match(ClickHouseParser::IF);
-        setState(265);
+        setState(271);
         match(ClickHouseParser::NOT);
-        setState(266);
+        setState(272);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(269);
+      setState(275);
       tableColumnDfnt();
-      setState(272);
+      setState(278);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::AFTER) {
-        setState(270);
+        setState(276);
         match(ClickHouseParser::AFTER);
-        setState(271);
+        setState(277);
         nestedIdentifier();
       }
       break;
@@ -1259,390 +1489,592 @@ ClickHouseParser::AlterTableClauseContext* ClickHouseParser::alterTableClause()
     case 2: {
       _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseAddIndexContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(274);
+      setState(280);
       match(ClickHouseParser::ADD);
-      setState(275);
+      setState(281);
       match(ClickHouseParser::INDEX);
-      setState(279);
+      setState(285);
       _errHandler->sync(this);
 
       switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 9, _ctx)) {
       case 1: {
-        setState(276);
+        setState(282);
         match(ClickHouseParser::IF);
-        setState(277);
+        setState(283);
         match(ClickHouseParser::NOT);
-        setState(278);
+        setState(284);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(281);
+      setState(287);
       tableIndexDfnt();
-      setState(284);
+      setState(290);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::AFTER) {
-        setState(282);
+        setState(288);
         match(ClickHouseParser::AFTER);
-        setState(283);
+        setState(289);
         nestedIdentifier();
       }
       break;
     }
 
     case 3: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseAttachContext>(_localctx));
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseAddProjectionContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(286);
-      match(ClickHouseParser::ATTACH);
-      setState(287);
-      partitionClause();
-      setState(290);
+      setState(292);
+      match(ClickHouseParser::ADD);
+      setState(293);
+      match(ClickHouseParser::PROJECTION);
+      setState(297);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 11, _ctx)) {
+      case 1: {
+        setState(294);
+        match(ClickHouseParser::IF);
+        setState(295);
+        match(ClickHouseParser::NOT);
+        setState(296);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(299);
+      tableProjectionDfnt();
+      setState(302);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
-      if (_la == ClickHouseParser::FROM) {
-        setState(288);
-        match(ClickHouseParser::FROM);
-        setState(289);
-        tableIdentifier();
+      if (_la == ClickHouseParser::AFTER) {
+        setState(300);
+        match(ClickHouseParser::AFTER);
+        setState(301);
+        nestedIdentifier();
       }
       break;
     }
 
     case 4: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseClearContext>(_localctx));
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseAttachContext>(_localctx));
       enterOuterAlt(_localctx, 4);
-      setState(292);
-      match(ClickHouseParser::CLEAR);
-      setState(293);
-      match(ClickHouseParser::COLUMN);
-      setState(296);
-      _errHandler->sync(this);
-
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 12, _ctx)) {
-      case 1: {
-        setState(294);
-        match(ClickHouseParser::IF);
-        setState(295);
-        match(ClickHouseParser::EXISTS);
-        break;
-      }
-
-      }
-      setState(298);
-      nestedIdentifier();
-      setState(301);
+      setState(304);
+      match(ClickHouseParser::ATTACH);
+      setState(305);
+      partitionClause();
+      setState(308);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
-      if (_la == ClickHouseParser::IN) {
-        setState(299);
-        match(ClickHouseParser::IN);
-        setState(300);
-        partitionClause();
+      if (_la == ClickHouseParser::FROM) {
+        setState(306);
+        match(ClickHouseParser::FROM);
+        setState(307);
+        tableIdentifier();
       }
       break;
     }
 
     case 5: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseCommentContext>(_localctx));
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseClearColumnContext>(_localctx));
       enterOuterAlt(_localctx, 5);
-      setState(303);
-      match(ClickHouseParser::COMMENT);
-      setState(304);
+      setState(310);
+      match(ClickHouseParser::CLEAR);
+      setState(311);
       match(ClickHouseParser::COLUMN);
-      setState(307);
+      setState(314);
       _errHandler->sync(this);
 
       switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 14, _ctx)) {
       case 1: {
-        setState(305);
+        setState(312);
         match(ClickHouseParser::IF);
-        setState(306);
+        setState(313);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(309);
-      nestedIdentifier();
-      setState(310);
-      match(ClickHouseParser::STRING_LITERAL);
-      break;
-    }
-
-    case 6: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDeleteContext>(_localctx));
-      enterOuterAlt(_localctx, 6);
-      setState(312);
-      match(ClickHouseParser::DELETE);
-      setState(313);
-      match(ClickHouseParser::WHERE);
-      setState(314);
-      columnExpr(0);
-      break;
-    }
-
-    case 7: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDetachContext>(_localctx));
-      enterOuterAlt(_localctx, 7);
-      setState(315);
-      match(ClickHouseParser::DETACH);
       setState(316);
-      partitionClause();
-      break;
-    }
-
-    case 8: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDropColumnContext>(_localctx));
-      enterOuterAlt(_localctx, 8);
-      setState(317);
-      match(ClickHouseParser::DROP);
-      setState(318);
-      match(ClickHouseParser::COLUMN);
-      setState(321);
-      _errHandler->sync(this);
-
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 15, _ctx)) {
-      case 1: {
-        setState(319);
-        match(ClickHouseParser::IF);
-        setState(320);
-        match(ClickHouseParser::EXISTS);
-        break;
-      }
-
-      }
-      setState(323);
       nestedIdentifier();
-      break;
-    }
-
-    case 9: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDropIndexContext>(_localctx));
-      enterOuterAlt(_localctx, 9);
-      setState(324);
-      match(ClickHouseParser::DROP);
-      setState(325);
-      match(ClickHouseParser::INDEX);
-      setState(328);
-      _errHandler->sync(this);
-
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 16, _ctx)) {
-      case 1: {
-        setState(326);
-        match(ClickHouseParser::IF);
-        setState(327);
-        match(ClickHouseParser::EXISTS);
-        break;
-      }
-
-      }
-      setState(330);
-      nestedIdentifier();
-      break;
-    }
-
-    case 10: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDropPartitionContext>(_localctx));
-      enterOuterAlt(_localctx, 10);
-      setState(331);
-      match(ClickHouseParser::DROP);
-      setState(332);
-      partitionClause();
-      break;
-    }
-
-    case 11: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseFreezePartitionContext>(_localctx));
-      enterOuterAlt(_localctx, 11);
-      setState(333);
-      match(ClickHouseParser::FREEZE);
-      setState(335);
+      setState(319);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
-      if (_la == ClickHouseParser::PARTITION) {
-        setState(334);
+      if (_la == ClickHouseParser::IN) {
+        setState(317);
+        match(ClickHouseParser::IN);
+        setState(318);
         partitionClause();
       }
       break;
     }
 
-    case 12: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyCodecContext>(_localctx));
-      enterOuterAlt(_localctx, 12);
-      setState(337);
-      match(ClickHouseParser::MODIFY);
-      setState(338);
-      match(ClickHouseParser::COLUMN);
-      setState(341);
+    case 6: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseClearIndexContext>(_localctx));
+      enterOuterAlt(_localctx, 6);
+      setState(321);
+      match(ClickHouseParser::CLEAR);
+      setState(322);
+      match(ClickHouseParser::INDEX);
+      setState(325);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 16, _ctx)) {
+      case 1: {
+        setState(323);
+        match(ClickHouseParser::IF);
+        setState(324);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(327);
+      nestedIdentifier();
+      setState(330);
+      _errHandler->sync(this);
+
+      _la = _input->LA(1);
+      if (_la == ClickHouseParser::IN) {
+        setState(328);
+        match(ClickHouseParser::IN);
+        setState(329);
+        partitionClause();
+      }
+      break;
+    }
+
+    case 7: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseClearProjectionContext>(_localctx));
+      enterOuterAlt(_localctx, 7);
+      setState(332);
+      match(ClickHouseParser::CLEAR);
+      setState(333);
+      match(ClickHouseParser::PROJECTION);
+      setState(336);
       _errHandler->sync(this);
 
       switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 18, _ctx)) {
       case 1: {
-        setState(339);
+        setState(334);
         match(ClickHouseParser::IF);
-        setState(340);
+        setState(335);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(343);
+      setState(338);
       nestedIdentifier();
-      setState(344);
-      codecExpr();
-      break;
-    }
-
-    case 13: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyCommentContext>(_localctx));
-      enterOuterAlt(_localctx, 13);
-      setState(346);
-      match(ClickHouseParser::MODIFY);
-      setState(347);
-      match(ClickHouseParser::COLUMN);
-      setState(350);
+      setState(341);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 19, _ctx)) {
-      case 1: {
-        setState(348);
-        match(ClickHouseParser::IF);
-        setState(349);
-        match(ClickHouseParser::EXISTS);
-        break;
+      _la = _input->LA(1);
+      if (_la == ClickHouseParser::IN) {
+        setState(339);
+        match(ClickHouseParser::IN);
+        setState(340);
+        partitionClause();
       }
-
-      }
-      setState(352);
-      nestedIdentifier();
-      setState(353);
-      match(ClickHouseParser::COMMENT);
-      setState(354);
-      match(ClickHouseParser::STRING_LITERAL);
       break;
     }
 
-    case 14: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyRemoveContext>(_localctx));
-      enterOuterAlt(_localctx, 14);
-      setState(356);
-      match(ClickHouseParser::MODIFY);
-      setState(357);
+    case 8: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseCommentContext>(_localctx));
+      enterOuterAlt(_localctx, 8);
+      setState(343);
+      match(ClickHouseParser::COMMENT);
+      setState(344);
       match(ClickHouseParser::COLUMN);
-      setState(360);
+      setState(347);
       _errHandler->sync(this);
 
       switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 20, _ctx)) {
       case 1: {
-        setState(358);
+        setState(345);
         match(ClickHouseParser::IF);
-        setState(359);
+        setState(346);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(362);
+      setState(349);
       nestedIdentifier();
-      setState(363);
-      match(ClickHouseParser::REMOVE);
-      setState(364);
-      tableColumnPropertyType();
+      setState(350);
+      match(ClickHouseParser::STRING_LITERAL);
       break;
     }
 
-    case 15: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyContext>(_localctx));
-      enterOuterAlt(_localctx, 15);
-      setState(366);
-      match(ClickHouseParser::MODIFY);
-      setState(367);
-      match(ClickHouseParser::COLUMN);
-      setState(370);
-      _errHandler->sync(this);
-
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 21, _ctx)) {
-      case 1: {
-        setState(368);
-        match(ClickHouseParser::IF);
-        setState(369);
-        match(ClickHouseParser::EXISTS);
-        break;
-      }
-
-      }
-      setState(372);
-      tableColumnDfnt();
-      break;
-    }
-
-    case 16: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyOrderByContext>(_localctx));
-      enterOuterAlt(_localctx, 16);
-      setState(373);
-      match(ClickHouseParser::MODIFY);
-      setState(374);
-      match(ClickHouseParser::ORDER);
-      setState(375);
-      match(ClickHouseParser::BY);
-      setState(376);
+    case 9: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDeleteContext>(_localctx));
+      enterOuterAlt(_localctx, 9);
+      setState(352);
+      match(ClickHouseParser::DELETE);
+      setState(353);
+      match(ClickHouseParser::WHERE);
+      setState(354);
       columnExpr(0);
       break;
     }
 
-    case 17: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyTTLContext>(_localctx));
-      enterOuterAlt(_localctx, 17);
+    case 10: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDetachContext>(_localctx));
+      enterOuterAlt(_localctx, 10);
+      setState(355);
+      match(ClickHouseParser::DETACH);
+      setState(356);
+      partitionClause();
+      break;
+    }
+
+    case 11: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDropColumnContext>(_localctx));
+      enterOuterAlt(_localctx, 11);
+      setState(357);
+      match(ClickHouseParser::DROP);
+      setState(358);
+      match(ClickHouseParser::COLUMN);
+      setState(361);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 21, _ctx)) {
+      case 1: {
+        setState(359);
+        match(ClickHouseParser::IF);
+        setState(360);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(363);
+      nestedIdentifier();
+      break;
+    }
+
+    case 12: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDropIndexContext>(_localctx));
+      enterOuterAlt(_localctx, 12);
+      setState(364);
+      match(ClickHouseParser::DROP);
+      setState(365);
+      match(ClickHouseParser::INDEX);
+      setState(368);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 22, _ctx)) {
+      case 1: {
+        setState(366);
+        match(ClickHouseParser::IF);
+        setState(367);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(370);
+      nestedIdentifier();
+      break;
+    }
+
+    case 13: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDropProjectionContext>(_localctx));
+      enterOuterAlt(_localctx, 13);
+      setState(371);
+      match(ClickHouseParser::DROP);
+      setState(372);
+      match(ClickHouseParser::PROJECTION);
+      setState(375);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 23, _ctx)) {
+      case 1: {
+        setState(373);
+        match(ClickHouseParser::IF);
+        setState(374);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
       setState(377);
-      match(ClickHouseParser::MODIFY);
+      nestedIdentifier();
+      break;
+    }
+
+    case 14: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseDropPartitionContext>(_localctx));
+      enterOuterAlt(_localctx, 14);
       setState(378);
-      ttlClause();
+      match(ClickHouseParser::DROP);
+      setState(379);
+      partitionClause();
+      break;
+    }
+
+    case 15: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseFreezePartitionContext>(_localctx));
+      enterOuterAlt(_localctx, 15);
+      setState(380);
+      match(ClickHouseParser::FREEZE);
+      setState(382);
+      _errHandler->sync(this);
+
+      _la = _input->LA(1);
+      if (_la == ClickHouseParser::PARTITION) {
+        setState(381);
+        partitionClause();
+      }
+      break;
+    }
+
+    case 16: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseMaterializeIndexContext>(_localctx));
+      enterOuterAlt(_localctx, 16);
+      setState(384);
+      match(ClickHouseParser::MATERIALIZE);
+      setState(385);
+      match(ClickHouseParser::INDEX);
+      setState(388);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 25, _ctx)) {
+      case 1: {
+        setState(386);
+        match(ClickHouseParser::IF);
+        setState(387);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(390);
+      nestedIdentifier();
+      setState(393);
+      _errHandler->sync(this);
+
+      _la = _input->LA(1);
+      if (_la == ClickHouseParser::IN) {
+        setState(391);
+        match(ClickHouseParser::IN);
+        setState(392);
+        partitionClause();
+      }
+      break;
+    }
+
+    case 17: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseMaterializeProjectionContext>(_localctx));
+      enterOuterAlt(_localctx, 17);
+      setState(395);
+      match(ClickHouseParser::MATERIALIZE);
+      setState(396);
+      match(ClickHouseParser::PROJECTION);
+      setState(399);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 27, _ctx)) {
+      case 1: {
+        setState(397);
+        match(ClickHouseParser::IF);
+        setState(398);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(401);
+      nestedIdentifier();
+      setState(404);
+      _errHandler->sync(this);
+
+      _la = _input->LA(1);
+      if (_la == ClickHouseParser::IN) {
+        setState(402);
+        match(ClickHouseParser::IN);
+        setState(403);
+        partitionClause();
+      }
       break;
     }
 
     case 18: {
-      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseMovePartitionContext>(_localctx));
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyCodecContext>(_localctx));
       enterOuterAlt(_localctx, 18);
-      setState(379);
-      match(ClickHouseParser::MOVE);
-      setState(380);
-      partitionClause();
-      setState(390);
+      setState(406);
+      match(ClickHouseParser::MODIFY);
+      setState(407);
+      match(ClickHouseParser::COLUMN);
+      setState(410);
       _errHandler->sync(this);
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 22, _ctx)) {
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 29, _ctx)) {
       case 1: {
-        setState(381);
+        setState(408);
+        match(ClickHouseParser::IF);
+        setState(409);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(412);
+      nestedIdentifier();
+      setState(413);
+      codecExpr();
+      break;
+    }
+
+    case 19: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyCommentContext>(_localctx));
+      enterOuterAlt(_localctx, 19);
+      setState(415);
+      match(ClickHouseParser::MODIFY);
+      setState(416);
+      match(ClickHouseParser::COLUMN);
+      setState(419);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 30, _ctx)) {
+      case 1: {
+        setState(417);
+        match(ClickHouseParser::IF);
+        setState(418);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(421);
+      nestedIdentifier();
+      setState(422);
+      match(ClickHouseParser::COMMENT);
+      setState(423);
+      match(ClickHouseParser::STRING_LITERAL);
+      break;
+    }
+
+    case 20: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyRemoveContext>(_localctx));
+      enterOuterAlt(_localctx, 20);
+      setState(425);
+      match(ClickHouseParser::MODIFY);
+      setState(426);
+      match(ClickHouseParser::COLUMN);
+      setState(429);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 31, _ctx)) {
+      case 1: {
+        setState(427);
+        match(ClickHouseParser::IF);
+        setState(428);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(431);
+      nestedIdentifier();
+      setState(432);
+      match(ClickHouseParser::REMOVE);
+      setState(433);
+      tableColumnPropertyType();
+      break;
+    }
+
+    case 21: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyContext>(_localctx));
+      enterOuterAlt(_localctx, 21);
+      setState(435);
+      match(ClickHouseParser::MODIFY);
+      setState(436);
+      match(ClickHouseParser::COLUMN);
+      setState(439);
+      _errHandler->sync(this);
+
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 32, _ctx)) {
+      case 1: {
+        setState(437);
+        match(ClickHouseParser::IF);
+        setState(438);
+        match(ClickHouseParser::EXISTS);
+        break;
+      }
+
+      }
+      setState(441);
+      tableColumnDfnt();
+      break;
+    }
+
+    case 22: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyOrderByContext>(_localctx));
+      enterOuterAlt(_localctx, 22);
+      setState(442);
+      match(ClickHouseParser::MODIFY);
+      setState(443);
+      match(ClickHouseParser::ORDER);
+      setState(444);
+      match(ClickHouseParser::BY);
+      setState(445);
+      columnExpr(0);
+      break;
+    }
+
+    case 23: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseModifyTTLContext>(_localctx));
+      enterOuterAlt(_localctx, 23);
+      setState(446);
+      match(ClickHouseParser::MODIFY);
+      setState(447);
+      ttlClause();
+      break;
+    }
+
+    case 24: {
+      _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseMovePartitionContext>(_localctx));
+      enterOuterAlt(_localctx, 24);
+      setState(448);
+      match(ClickHouseParser::MOVE);
+      setState(449);
+      partitionClause();
+      setState(459);
+      _errHandler->sync(this);
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 33, _ctx)) {
+      case 1: {
+        setState(450);
         match(ClickHouseParser::TO);
-        setState(382);
+        setState(451);
         match(ClickHouseParser::DISK);
-        setState(383);
+        setState(452);
         match(ClickHouseParser::STRING_LITERAL);
         break;
       }
 
       case 2: {
-        setState(384);
+        setState(453);
         match(ClickHouseParser::TO);
-        setState(385);
+        setState(454);
         match(ClickHouseParser::VOLUME);
-        setState(386);
+        setState(455);
         match(ClickHouseParser::STRING_LITERAL);
         break;
       }
 
       case 3: {
-        setState(387);
+        setState(456);
         match(ClickHouseParser::TO);
-        setState(388);
+        setState(457);
         match(ClickHouseParser::TABLE);
-        setState(389);
+        setState(458);
         tableIdentifier();
         break;
       }
@@ -1651,67 +2083,67 @@ ClickHouseParser::AlterTableClauseContext* ClickHouseParser::alterTableClause()
       break;
     }
 
-    case 19: {
+    case 25: {
       _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseRemoveTTLContext>(_localctx));
-      enterOuterAlt(_localctx, 19);
-      setState(392);
+      enterOuterAlt(_localctx, 25);
+      setState(461);
       match(ClickHouseParser::REMOVE);
-      setState(393);
+      setState(462);
       match(ClickHouseParser::TTL);
       break;
     }
 
-    case 20: {
+    case 26: {
       _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseRenameContext>(_localctx));
-      enterOuterAlt(_localctx, 20);
-      setState(394);
+      enterOuterAlt(_localctx, 26);
+      setState(463);
       match(ClickHouseParser::RENAME);
-      setState(395);
+      setState(464);
       match(ClickHouseParser::COLUMN);
-      setState(398);
+      setState(467);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 23, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 34, _ctx)) {
       case 1: {
-        setState(396);
+        setState(465);
         match(ClickHouseParser::IF);
-        setState(397);
+        setState(466);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(400);
+      setState(469);
       nestedIdentifier();
-      setState(401);
+      setState(470);
       match(ClickHouseParser::TO);
-      setState(402);
+      setState(471);
       nestedIdentifier();
       break;
     }
 
-    case 21: {
+    case 27: {
       _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseReplaceContext>(_localctx));
-      enterOuterAlt(_localctx, 21);
-      setState(404);
+      enterOuterAlt(_localctx, 27);
+      setState(473);
       match(ClickHouseParser::REPLACE);
-      setState(405);
+      setState(474);
       partitionClause();
-      setState(406);
+      setState(475);
       match(ClickHouseParser::FROM);
-      setState(407);
+      setState(476);
       tableIdentifier();
       break;
     }
 
-    case 22: {
+    case 28: {
       _localctx = dynamic_cast<AlterTableClauseContext *>(_tracker.createInstance<ClickHouseParser::AlterTableClauseUpdateContext>(_localctx));
-      enterOuterAlt(_localctx, 22);
-      setState(409);
+      enterOuterAlt(_localctx, 28);
+      setState(478);
       match(ClickHouseParser::UPDATE);
-      setState(410);
+      setState(479);
       assignmentExprList();
-      setState(411);
+      setState(480);
       whereClause();
       break;
     }
@@ -1773,17 +2205,17 @@ ClickHouseParser::AssignmentExprListContext* ClickHouseParser::assignmentExprLis
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(415);
+    setState(484);
     assignmentExpr();
-    setState(420);
+    setState(489);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(416);
+      setState(485);
       match(ClickHouseParser::COMMA);
-      setState(417);
+      setState(486);
       assignmentExpr();
-      setState(422);
+      setState(491);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -1838,11 +2270,11 @@ ClickHouseParser::AssignmentExprContext* ClickHouseParser::assignmentExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(423);
+    setState(492);
     nestedIdentifier();
-    setState(424);
+    setState(493);
     match(ClickHouseParser::EQ_SINGLE);
-    setState(425);
+    setState(494);
     columnExpr(0);
    
   }
@@ -1908,7 +2340,7 @@ ClickHouseParser::TableColumnPropertyTypeContext* ClickHouseParser::tableColumnP
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(427);
+    setState(496);
     _la = _input->LA(1);
     if (!((((_la & ~ 0x3fULL) == 0) &&
       ((1ULL << _la) & ((1ULL << ClickHouseParser::ALIAS)
@@ -1975,25 +2407,25 @@ ClickHouseParser::PartitionClauseContext* ClickHouseParser::partitionClause() {
     exitRule();
   });
   try {
-    setState(434);
+    setState(503);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 26, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 37, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(429);
+      setState(498);
       match(ClickHouseParser::PARTITION);
-      setState(430);
+      setState(499);
       columnExpr(0);
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(431);
+      setState(500);
       match(ClickHouseParser::PARTITION);
-      setState(432);
+      setState(501);
       match(ClickHouseParser::ID);
-      setState(433);
+      setState(502);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -2063,18 +2495,18 @@ ClickHouseParser::AttachStmtContext* ClickHouseParser::attachStmt() {
   try {
     _localctx = dynamic_cast<AttachStmtContext *>(_tracker.createInstance<ClickHouseParser::AttachDictionaryStmtContext>(_localctx));
     enterOuterAlt(_localctx, 1);
-    setState(436);
+    setState(505);
     match(ClickHouseParser::ATTACH);
-    setState(437);
+    setState(506);
     match(ClickHouseParser::DICTIONARY);
-    setState(438);
+    setState(507);
     tableIdentifier();
-    setState(440);
+    setState(509);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(439);
+      setState(508);
       clusterClause();
     }
    
@@ -2133,18 +2565,18 @@ ClickHouseParser::CheckStmtContext* ClickHouseParser::checkStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(442);
+    setState(511);
     match(ClickHouseParser::CHECK);
-    setState(443);
+    setState(512);
     match(ClickHouseParser::TABLE);
-    setState(444);
+    setState(513);
     tableIdentifier();
-    setState(446);
+    setState(515);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::PARTITION) {
-      setState(445);
+      setState(514);
       partitionClause();
     }
    
@@ -2556,13 +2988,13 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
     exitRule();
   });
   try {
-    setState(585);
+    setState(654);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 60, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 71, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<CreateStmtContext *>(_tracker.createInstance<ClickHouseParser::CreateDatabaseStmtContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(448);
+      setState(517);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ATTACH
 
@@ -2573,39 +3005,39 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(449);
+      setState(518);
       match(ClickHouseParser::DATABASE);
-      setState(453);
+      setState(522);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 29, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 40, _ctx)) {
       case 1: {
-        setState(450);
+        setState(519);
         match(ClickHouseParser::IF);
-        setState(451);
+        setState(520);
         match(ClickHouseParser::NOT);
-        setState(452);
+        setState(521);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(455);
+      setState(524);
       databaseIdentifier();
-      setState(457);
+      setState(526);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(456);
+        setState(525);
         clusterClause();
       }
-      setState(460);
+      setState(529);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ENGINE) {
-        setState(459);
+        setState(528);
         engineExpr();
       }
       break;
@@ -2614,7 +3046,7 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
     case 2: {
       _localctx = dynamic_cast<CreateStmtContext *>(_tracker.createInstance<ClickHouseParser::CreateDictionaryStmtContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(462);
+      setState(531);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ATTACH
 
@@ -2625,44 +3057,44 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(463);
+      setState(532);
       match(ClickHouseParser::DICTIONARY);
-      setState(467);
+      setState(536);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 32, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 43, _ctx)) {
       case 1: {
-        setState(464);
+        setState(533);
         match(ClickHouseParser::IF);
-        setState(465);
+        setState(534);
         match(ClickHouseParser::NOT);
-        setState(466);
+        setState(535);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(469);
+      setState(538);
       tableIdentifier();
-      setState(471);
+      setState(540);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::UUID) {
-        setState(470);
+        setState(539);
         uuidClause();
       }
-      setState(474);
+      setState(543);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(473);
+        setState(542);
         clusterClause();
       }
-      setState(476);
+      setState(545);
       dictionarySchemaClause();
-      setState(477);
+      setState(546);
       dictionaryEngineClause();
       break;
     }
@@ -2670,7 +3102,7 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
     case 3: {
       _localctx = dynamic_cast<CreateStmtContext *>(_tracker.createInstance<ClickHouseParser::CreateLiveViewStmtContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(479);
+      setState(548);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ATTACH
 
@@ -2681,81 +3113,81 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(480);
+      setState(549);
       match(ClickHouseParser::LIVE);
-      setState(481);
+      setState(550);
       match(ClickHouseParser::VIEW);
-      setState(485);
+      setState(554);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 35, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 46, _ctx)) {
       case 1: {
-        setState(482);
+        setState(551);
         match(ClickHouseParser::IF);
-        setState(483);
+        setState(552);
         match(ClickHouseParser::NOT);
-        setState(484);
+        setState(553);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(487);
+      setState(556);
       tableIdentifier();
-      setState(489);
+      setState(558);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::UUID) {
-        setState(488);
+        setState(557);
         uuidClause();
       }
-      setState(492);
+      setState(561);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(491);
+        setState(560);
         clusterClause();
       }
-      setState(499);
+      setState(568);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::WITH) {
-        setState(494);
+        setState(563);
         match(ClickHouseParser::WITH);
-        setState(495);
+        setState(564);
         match(ClickHouseParser::TIMEOUT);
-        setState(497);
+        setState(566);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::DECIMAL_LITERAL) {
-          setState(496);
+          setState(565);
           match(ClickHouseParser::DECIMAL_LITERAL);
         }
       }
-      setState(502);
+      setState(571);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::TO) {
-        setState(501);
+        setState(570);
         destinationClause();
       }
-      setState(505);
+      setState(574);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 41, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 52, _ctx)) {
       case 1: {
-        setState(504);
+        setState(573);
         tableSchemaClause();
         break;
       }
 
       }
-      setState(507);
+      setState(576);
       subqueryClause();
       break;
     }
@@ -2763,7 +3195,7 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
     case 4: {
       _localctx = dynamic_cast<CreateStmtContext *>(_tracker.createInstance<ClickHouseParser::CreateMaterializedViewStmtContext>(_localctx));
       enterOuterAlt(_localctx, 4);
-      setState(509);
+      setState(578);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ATTACH
 
@@ -2774,69 +3206,69 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(510);
+      setState(579);
       match(ClickHouseParser::MATERIALIZED);
-      setState(511);
+      setState(580);
       match(ClickHouseParser::VIEW);
-      setState(515);
+      setState(584);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 42, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 53, _ctx)) {
       case 1: {
-        setState(512);
+        setState(581);
         match(ClickHouseParser::IF);
-        setState(513);
+        setState(582);
         match(ClickHouseParser::NOT);
-        setState(514);
+        setState(583);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(517);
+      setState(586);
       tableIdentifier();
-      setState(519);
+      setState(588);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::UUID) {
-        setState(518);
+        setState(587);
         uuidClause();
       }
-      setState(522);
+      setState(591);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(521);
+        setState(590);
         clusterClause();
       }
-      setState(525);
+      setState(594);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::AS || _la == ClickHouseParser::LPAREN) {
-        setState(524);
+        setState(593);
         tableSchemaClause();
       }
-      setState(532);
+      setState(601);
       _errHandler->sync(this);
       switch (_input->LA(1)) {
         case ClickHouseParser::TO: {
-          setState(527);
+          setState(596);
           destinationClause();
           break;
         }
 
         case ClickHouseParser::ENGINE: {
-          setState(528);
+          setState(597);
           engineClause();
-          setState(530);
+          setState(599);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::POPULATE) {
-            setState(529);
+            setState(598);
             match(ClickHouseParser::POPULATE);
           }
           break;
@@ -2845,7 +3277,7 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
       default:
         throw NoViableAltException(this);
       }
-      setState(534);
+      setState(603);
       subqueryClause();
       break;
     }
@@ -2853,7 +3285,7 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
     case 5: {
       _localctx = dynamic_cast<CreateStmtContext *>(_tracker.createInstance<ClickHouseParser::CreateTableStmtContext>(_localctx));
       enterOuterAlt(_localctx, 5);
-      setState(536);
+      setState(605);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ATTACH
 
@@ -2864,74 +3296,74 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(538);
+      setState(607);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::TEMPORARY) {
-        setState(537);
+        setState(606);
         match(ClickHouseParser::TEMPORARY);
       }
-      setState(540);
+      setState(609);
       match(ClickHouseParser::TABLE);
-      setState(544);
+      setState(613);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 49, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 60, _ctx)) {
       case 1: {
-        setState(541);
+        setState(610);
         match(ClickHouseParser::IF);
-        setState(542);
+        setState(611);
         match(ClickHouseParser::NOT);
-        setState(543);
+        setState(612);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(546);
+      setState(615);
       tableIdentifier();
-      setState(548);
+      setState(617);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::UUID) {
-        setState(547);
+        setState(616);
         uuidClause();
       }
-      setState(551);
+      setState(620);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(550);
+        setState(619);
         clusterClause();
       }
-      setState(554);
+      setState(623);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 52, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 63, _ctx)) {
       case 1: {
-        setState(553);
+        setState(622);
         tableSchemaClause();
         break;
       }
 
       }
-      setState(557);
+      setState(626);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ENGINE) {
-        setState(556);
+        setState(625);
         engineClause();
       }
-      setState(560);
+      setState(629);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::AS) {
-        setState(559);
+        setState(628);
         subqueryClause();
       }
       break;
@@ -2940,7 +3372,7 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
     case 6: {
       _localctx = dynamic_cast<CreateStmtContext *>(_tracker.createInstance<ClickHouseParser::CreateViewStmtContext>(_localctx));
       enterOuterAlt(_localctx, 6);
-      setState(562);
+      setState(631);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ATTACH
 
@@ -2951,63 +3383,63 @@ ClickHouseParser::CreateStmtContext* ClickHouseParser::createStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(565);
+      setState(634);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::OR) {
-        setState(563);
+        setState(632);
         match(ClickHouseParser::OR);
-        setState(564);
+        setState(633);
         match(ClickHouseParser::REPLACE);
       }
-      setState(567);
+      setState(636);
       match(ClickHouseParser::VIEW);
-      setState(571);
+      setState(640);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 56, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 67, _ctx)) {
       case 1: {
-        setState(568);
+        setState(637);
         match(ClickHouseParser::IF);
-        setState(569);
+        setState(638);
         match(ClickHouseParser::NOT);
-        setState(570);
+        setState(639);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(573);
+      setState(642);
       tableIdentifier();
-      setState(575);
+      setState(644);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::UUID) {
-        setState(574);
+        setState(643);
         uuidClause();
       }
-      setState(578);
+      setState(647);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(577);
+        setState(646);
         clusterClause();
       }
-      setState(581);
+      setState(650);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 59, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 70, _ctx)) {
       case 1: {
-        setState(580);
+        setState(649);
         tableSchemaClause();
         break;
       }
 
       }
-      setState(583);
+      setState(652);
       subqueryClause();
       break;
     }
@@ -3077,23 +3509,23 @@ ClickHouseParser::DictionarySchemaClauseContext* ClickHouseParser::dictionarySch
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(587);
+    setState(656);
     match(ClickHouseParser::LPAREN);
-    setState(588);
+    setState(657);
     dictionaryAttrDfnt();
-    setState(593);
+    setState(662);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(589);
+      setState(658);
       match(ClickHouseParser::COMMA);
-      setState(590);
+      setState(659);
       dictionaryAttrDfnt();
-      setState(595);
+      setState(664);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(596);
+    setState(665);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -3199,67 +3631,67 @@ ClickHouseParser::DictionaryAttrDfntContext* ClickHouseParser::dictionaryAttrDfn
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(598);
+    setState(667);
     identifier();
-    setState(599);
+    setState(668);
     columnTypeExpr();
-    setState(621);
+    setState(690);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 63, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 74, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(619);
+        setState(688);
         _errHandler->sync(this);
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 62, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 73, _ctx)) {
         case 1: {
-          setState(600);
+          setState(669);
 
           if (!(!_localctx->attrs.count("default"))) throw FailedPredicateException(this, "!$attrs.count(\"default\")");
-          setState(601);
+          setState(670);
           match(ClickHouseParser::DEFAULT);
-          setState(602);
+          setState(671);
           literal();
           _localctx->attrs.insert("default");
           break;
         }
 
         case 2: {
-          setState(605);
+          setState(674);
 
           if (!(!_localctx->attrs.count("expression"))) throw FailedPredicateException(this, "!$attrs.count(\"expression\")");
-          setState(606);
+          setState(675);
           match(ClickHouseParser::EXPRESSION);
-          setState(607);
+          setState(676);
           columnExpr(0);
           _localctx->attrs.insert("expression");
           break;
         }
 
         case 3: {
-          setState(610);
+          setState(679);
 
           if (!(!_localctx->attrs.count("hierarchical"))) throw FailedPredicateException(this, "!$attrs.count(\"hierarchical\")");
-          setState(611);
+          setState(680);
           match(ClickHouseParser::HIERARCHICAL);
           _localctx->attrs.insert("hierarchical");
           break;
         }
 
         case 4: {
-          setState(613);
+          setState(682);
 
           if (!(!_localctx->attrs.count("injective"))) throw FailedPredicateException(this, "!$attrs.count(\"injective\")");
-          setState(614);
+          setState(683);
           match(ClickHouseParser::INJECTIVE);
           _localctx->attrs.insert("injective");
           break;
         }
 
         case 5: {
-          setState(616);
+          setState(685);
 
           if (!(!_localctx->attrs.count("is_object_id"))) throw FailedPredicateException(this, "!$attrs.count(\"is_object_id\")");
-          setState(617);
+          setState(686);
           match(ClickHouseParser::IS_OBJECT_ID);
           _localctx->attrs.insert("is_object_id");
           break;
@@ -3267,9 +3699,9 @@ ClickHouseParser::DictionaryAttrDfntContext* ClickHouseParser::dictionaryAttrDfn
 
         } 
       }
-      setState(623);
+      setState(692);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 63, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 74, _ctx);
     }
    
   }
@@ -3355,70 +3787,70 @@ ClickHouseParser::DictionaryEngineClauseContext* ClickHouseParser::dictionaryEng
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(625);
+    setState(694);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 64, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 75, _ctx)) {
     case 1: {
-      setState(624);
+      setState(693);
       dictionaryPrimaryKeyClause();
       break;
     }
 
     }
-    setState(649);
+    setState(718);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 66, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 77, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(647);
+        setState(716);
         _errHandler->sync(this);
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 65, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 76, _ctx)) {
         case 1: {
-          setState(627);
+          setState(696);
 
           if (!(!_localctx->clauses.count("source"))) throw FailedPredicateException(this, "!$clauses.count(\"source\")");
-          setState(628);
+          setState(697);
           sourceClause();
           _localctx->clauses.insert("source");
           break;
         }
 
         case 2: {
-          setState(631);
+          setState(700);
 
           if (!(!_localctx->clauses.count("lifetime"))) throw FailedPredicateException(this, "!$clauses.count(\"lifetime\")");
-          setState(632);
+          setState(701);
           lifetimeClause();
           _localctx->clauses.insert("lifetime");
           break;
         }
 
         case 3: {
-          setState(635);
+          setState(704);
 
           if (!(!_localctx->clauses.count("layout"))) throw FailedPredicateException(this, "!$clauses.count(\"layout\")");
-          setState(636);
+          setState(705);
           layoutClause();
           _localctx->clauses.insert("layout");
           break;
         }
 
         case 4: {
-          setState(639);
+          setState(708);
 
           if (!(!_localctx->clauses.count("range"))) throw FailedPredicateException(this, "!$clauses.count(\"range\")");
-          setState(640);
+          setState(709);
           rangeClause();
           _localctx->clauses.insert("range");
           break;
         }
 
         case 5: {
-          setState(643);
+          setState(712);
 
           if (!(!_localctx->clauses.count("settings"))) throw FailedPredicateException(this, "!$clauses.count(\"settings\")");
-          setState(644);
+          setState(713);
           dictionarySettingsClause();
           _localctx->clauses.insert("settings");
           break;
@@ -3426,9 +3858,9 @@ ClickHouseParser::DictionaryEngineClauseContext* ClickHouseParser::dictionaryEng
 
         } 
       }
-      setState(651);
+      setState(720);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 66, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 77, _ctx);
     }
    
   }
@@ -3481,11 +3913,11 @@ ClickHouseParser::DictionaryPrimaryKeyClauseContext* ClickHouseParser::dictionar
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(652);
+    setState(721);
     match(ClickHouseParser::PRIMARY);
-    setState(653);
+    setState(722);
     match(ClickHouseParser::KEY);
-    setState(654);
+    setState(723);
     columnExprList();
    
   }
@@ -3547,9 +3979,9 @@ ClickHouseParser::DictionaryArgExprContext* ClickHouseParser::dictionaryArgExpr(
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(656);
+    setState(725);
     identifier();
-    setState(663);
+    setState(732);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::AFTER:
@@ -3649,6 +4081,7 @@ ClickHouseParser::DictionaryArgExprContext* ClickHouseParser::dictionaryArgExpr(
       case ClickHouseParser::LOCAL:
       case ClickHouseParser::LOGS:
       case ClickHouseParser::MATERIALIZED:
+      case ClickHouseParser::MATERIALIZE:
       case ClickHouseParser::MAX:
       case ClickHouseParser::MERGES:
       case ClickHouseParser::MIN:
@@ -3729,16 +4162,16 @@ ClickHouseParser::DictionaryArgExprContext* ClickHouseParser::dictionaryArgExpr(
       case ClickHouseParser::JSON_FALSE:
       case ClickHouseParser::JSON_TRUE:
       case ClickHouseParser::IDENTIFIER: {
-        setState(657);
+        setState(726);
         identifier();
-        setState(660);
+        setState(729);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::LPAREN) {
-          setState(658);
+          setState(727);
           match(ClickHouseParser::LPAREN);
-          setState(659);
+          setState(728);
           match(ClickHouseParser::RPAREN);
         }
         break;
@@ -3755,7 +4188,7 @@ ClickHouseParser::DictionaryArgExprContext* ClickHouseParser::dictionaryArgExpr(
       case ClickHouseParser::DASH:
       case ClickHouseParser::DOT:
       case ClickHouseParser::PLUS: {
-        setState(662);
+        setState(731);
         literal();
         break;
       }
@@ -3835,15 +4268,15 @@ ClickHouseParser::SourceClauseContext* ClickHouseParser::sourceClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(665);
+    setState(734);
     match(ClickHouseParser::SOURCE);
-    setState(666);
+    setState(735);
     match(ClickHouseParser::LPAREN);
-    setState(667);
+    setState(736);
     identifier();
-    setState(668);
+    setState(737);
     match(ClickHouseParser::LPAREN);
-    setState(672);
+    setState(741);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while ((((_la & ~ 0x3fULL) == 0) &&
@@ -3944,6 +4377,7 @@ ClickHouseParser::SourceClauseContext* ClickHouseParser::sourceClause() {
       | (1ULL << (ClickHouseParser::LOCAL - 64))
       | (1ULL << (ClickHouseParser::LOGS - 64))
       | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+      | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
       | (1ULL << (ClickHouseParser::MAX - 64))
       | (1ULL << (ClickHouseParser::MERGES - 64))
       | (1ULL << (ClickHouseParser::MIN - 64))
@@ -3967,10 +4401,10 @@ ClickHouseParser::SourceClauseContext* ClickHouseParser::sourceClause() {
       | (1ULL << (ClickHouseParser::PREWHERE - 64))
       | (1ULL << (ClickHouseParser::PRIMARY - 64))
       | (1ULL << (ClickHouseParser::QUARTER - 64))
-      | (1ULL << (ClickHouseParser::RANGE - 64))
-      | (1ULL << (ClickHouseParser::RELOAD - 64))
-      | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+      | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+      | (1ULL << (ClickHouseParser::REMOVE - 128))
+      | (1ULL << (ClickHouseParser::RENAME - 128))
       | (1ULL << (ClickHouseParser::REPLACE - 128))
       | (1ULL << (ClickHouseParser::REPLICA - 128))
       | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -4024,15 +4458,15 @@ ClickHouseParser::SourceClauseContext* ClickHouseParser::sourceClause() {
       | (1ULL << (ClickHouseParser::JSON_FALSE - 128))
       | (1ULL << (ClickHouseParser::JSON_TRUE - 128))
       | (1ULL << (ClickHouseParser::IDENTIFIER - 128)))) != 0)) {
-      setState(669);
+      setState(738);
       dictionaryArgExpr();
-      setState(674);
+      setState(743);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(675);
+    setState(744);
     match(ClickHouseParser::RPAREN);
-    setState(676);
+    setState(745);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -4101,39 +4535,39 @@ ClickHouseParser::LifetimeClauseContext* ClickHouseParser::lifetimeClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(678);
+    setState(747);
     match(ClickHouseParser::LIFETIME);
-    setState(679);
+    setState(748);
     match(ClickHouseParser::LPAREN);
-    setState(689);
+    setState(758);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::DECIMAL_LITERAL: {
-        setState(680);
+        setState(749);
         match(ClickHouseParser::DECIMAL_LITERAL);
         break;
       }
 
       case ClickHouseParser::MIN: {
-        setState(681);
+        setState(750);
         match(ClickHouseParser::MIN);
-        setState(682);
+        setState(751);
         match(ClickHouseParser::DECIMAL_LITERAL);
-        setState(683);
+        setState(752);
         match(ClickHouseParser::MAX);
-        setState(684);
+        setState(753);
         match(ClickHouseParser::DECIMAL_LITERAL);
         break;
       }
 
       case ClickHouseParser::MAX: {
-        setState(685);
+        setState(754);
         match(ClickHouseParser::MAX);
-        setState(686);
+        setState(755);
         match(ClickHouseParser::DECIMAL_LITERAL);
-        setState(687);
+        setState(756);
         match(ClickHouseParser::MIN);
-        setState(688);
+        setState(757);
         match(ClickHouseParser::DECIMAL_LITERAL);
         break;
       }
@@ -4141,7 +4575,7 @@ ClickHouseParser::LifetimeClauseContext* ClickHouseParser::lifetimeClause() {
     default:
       throw NoViableAltException(this);
     }
-    setState(691);
+    setState(760);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -4215,15 +4649,15 @@ ClickHouseParser::LayoutClauseContext* ClickHouseParser::layoutClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(693);
+    setState(762);
     match(ClickHouseParser::LAYOUT);
-    setState(694);
+    setState(763);
     match(ClickHouseParser::LPAREN);
-    setState(695);
+    setState(764);
     identifier();
-    setState(696);
+    setState(765);
     match(ClickHouseParser::LPAREN);
-    setState(700);
+    setState(769);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while ((((_la & ~ 0x3fULL) == 0) &&
@@ -4324,6 +4758,7 @@ ClickHouseParser::LayoutClauseContext* ClickHouseParser::layoutClause() {
       | (1ULL << (ClickHouseParser::LOCAL - 64))
       | (1ULL << (ClickHouseParser::LOGS - 64))
       | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+      | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
       | (1ULL << (ClickHouseParser::MAX - 64))
       | (1ULL << (ClickHouseParser::MERGES - 64))
       | (1ULL << (ClickHouseParser::MIN - 64))
@@ -4347,10 +4782,10 @@ ClickHouseParser::LayoutClauseContext* ClickHouseParser::layoutClause() {
       | (1ULL << (ClickHouseParser::PREWHERE - 64))
       | (1ULL << (ClickHouseParser::PRIMARY - 64))
       | (1ULL << (ClickHouseParser::QUARTER - 64))
-      | (1ULL << (ClickHouseParser::RANGE - 64))
-      | (1ULL << (ClickHouseParser::RELOAD - 64))
-      | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+      | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+      | (1ULL << (ClickHouseParser::REMOVE - 128))
+      | (1ULL << (ClickHouseParser::RENAME - 128))
       | (1ULL << (ClickHouseParser::REPLACE - 128))
       | (1ULL << (ClickHouseParser::REPLICA - 128))
       | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -4404,15 +4839,15 @@ ClickHouseParser::LayoutClauseContext* ClickHouseParser::layoutClause() {
       | (1ULL << (ClickHouseParser::JSON_FALSE - 128))
       | (1ULL << (ClickHouseParser::JSON_TRUE - 128))
       | (1ULL << (ClickHouseParser::IDENTIFIER - 128)))) != 0)) {
-      setState(697);
+      setState(766);
       dictionaryArgExpr();
-      setState(702);
+      setState(771);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(703);
+    setState(772);
     match(ClickHouseParser::RPAREN);
-    setState(704);
+    setState(773);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -4481,33 +4916,33 @@ ClickHouseParser::RangeClauseContext* ClickHouseParser::rangeClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(706);
+    setState(775);
     match(ClickHouseParser::RANGE);
-    setState(707);
+    setState(776);
     match(ClickHouseParser::LPAREN);
-    setState(718);
+    setState(787);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::MIN: {
-        setState(708);
+        setState(777);
         match(ClickHouseParser::MIN);
-        setState(709);
+        setState(778);
         identifier();
-        setState(710);
+        setState(779);
         match(ClickHouseParser::MAX);
-        setState(711);
+        setState(780);
         identifier();
         break;
       }
 
       case ClickHouseParser::MAX: {
-        setState(713);
+        setState(782);
         match(ClickHouseParser::MAX);
-        setState(714);
+        setState(783);
         identifier();
-        setState(715);
+        setState(784);
         match(ClickHouseParser::MIN);
-        setState(716);
+        setState(785);
         identifier();
         break;
       }
@@ -4515,7 +4950,7 @@ ClickHouseParser::RangeClauseContext* ClickHouseParser::rangeClause() {
     default:
       throw NoViableAltException(this);
     }
-    setState(720);
+    setState(789);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -4572,13 +5007,13 @@ ClickHouseParser::DictionarySettingsClauseContext* ClickHouseParser::dictionaryS
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(722);
+    setState(791);
     match(ClickHouseParser::SETTINGS);
-    setState(723);
+    setState(792);
     match(ClickHouseParser::LPAREN);
-    setState(724);
+    setState(793);
     settingExprList();
-    setState(725);
+    setState(794);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -4635,11 +5070,11 @@ ClickHouseParser::ClusterClauseContext* ClickHouseParser::clusterClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(727);
+    setState(796);
     match(ClickHouseParser::ON);
-    setState(728);
+    setState(797);
     match(ClickHouseParser::CLUSTER);
-    setState(731);
+    setState(800);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::AFTER:
@@ -4739,6 +5174,7 @@ ClickHouseParser::ClusterClauseContext* ClickHouseParser::clusterClause() {
       case ClickHouseParser::LOCAL:
       case ClickHouseParser::LOGS:
       case ClickHouseParser::MATERIALIZED:
+      case ClickHouseParser::MATERIALIZE:
       case ClickHouseParser::MAX:
       case ClickHouseParser::MERGES:
       case ClickHouseParser::MIN:
@@ -4819,13 +5255,13 @@ ClickHouseParser::ClusterClauseContext* ClickHouseParser::clusterClause() {
       case ClickHouseParser::JSON_FALSE:
       case ClickHouseParser::JSON_TRUE:
       case ClickHouseParser::IDENTIFIER: {
-        setState(729);
+        setState(798);
         identifier();
         break;
       }
 
       case ClickHouseParser::STRING_LITERAL: {
-        setState(730);
+        setState(799);
         match(ClickHouseParser::STRING_LITERAL);
         break;
       }
@@ -4880,9 +5316,9 @@ ClickHouseParser::UuidClauseContext* ClickHouseParser::uuidClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(733);
+    setState(802);
     match(ClickHouseParser::UUID);
-    setState(734);
+    setState(803);
     match(ClickHouseParser::STRING_LITERAL);
    
   }
@@ -4931,9 +5367,9 @@ ClickHouseParser::DestinationClauseContext* ClickHouseParser::destinationClause(
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(736);
+    setState(805);
     match(ClickHouseParser::TO);
-    setState(737);
+    setState(806);
     tableIdentifier();
    
   }
@@ -4982,9 +5418,9 @@ ClickHouseParser::SubqueryClauseContext* ClickHouseParser::subqueryClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(739);
+    setState(808);
     match(ClickHouseParser::AS);
-    setState(740);
+    setState(809);
     selectUnionStmt();
    
   }
@@ -5094,29 +5530,29 @@ ClickHouseParser::TableSchemaClauseContext* ClickHouseParser::tableSchemaClause(
     exitRule();
   });
   try {
-    setState(757);
+    setState(826);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 75, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 86, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<TableSchemaClauseContext *>(_tracker.createInstance<ClickHouseParser::SchemaDescriptionClauseContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(742);
+      setState(811);
       match(ClickHouseParser::LPAREN);
-      setState(743);
+      setState(812);
       tableElementExpr();
-      setState(748);
+      setState(817);
       _errHandler->sync(this);
       _la = _input->LA(1);
       while (_la == ClickHouseParser::COMMA) {
-        setState(744);
+        setState(813);
         match(ClickHouseParser::COMMA);
-        setState(745);
+        setState(814);
         tableElementExpr();
-        setState(750);
+        setState(819);
         _errHandler->sync(this);
         _la = _input->LA(1);
       }
-      setState(751);
+      setState(820);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -5124,9 +5560,9 @@ ClickHouseParser::TableSchemaClauseContext* ClickHouseParser::tableSchemaClause(
     case 2: {
       _localctx = dynamic_cast<TableSchemaClauseContext *>(_tracker.createInstance<ClickHouseParser::SchemaAsTableClauseContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(753);
+      setState(822);
       match(ClickHouseParser::AS);
-      setState(754);
+      setState(823);
       tableIdentifier();
       break;
     }
@@ -5134,9 +5570,9 @@ ClickHouseParser::TableSchemaClauseContext* ClickHouseParser::tableSchemaClause(
     case 3: {
       _localctx = dynamic_cast<TableSchemaClauseContext *>(_tracker.createInstance<ClickHouseParser::SchemaAsFunctionClauseContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(755);
+      setState(824);
       match(ClickHouseParser::AS);
-      setState(756);
+      setState(825);
       tableFunctionExpr();
       break;
     }
@@ -5234,71 +5670,71 @@ ClickHouseParser::EngineClauseContext* ClickHouseParser::engineClause() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(759);
+    setState(828);
     engineExpr();
-    setState(786);
+    setState(855);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 77, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 88, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(784);
+        setState(853);
         _errHandler->sync(this);
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 76, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 87, _ctx)) {
         case 1: {
-          setState(760);
+          setState(829);
 
           if (!(!_localctx->clauses.count("orderByClause"))) throw FailedPredicateException(this, "!$clauses.count(\"orderByClause\")");
-          setState(761);
+          setState(830);
           orderByClause();
           _localctx->clauses.insert("orderByClause");
           break;
         }
 
         case 2: {
-          setState(764);
+          setState(833);
 
           if (!(!_localctx->clauses.count("partitionByClause"))) throw FailedPredicateException(this, "!$clauses.count(\"partitionByClause\")");
-          setState(765);
+          setState(834);
           partitionByClause();
           _localctx->clauses.insert("partitionByClause");
           break;
         }
 
         case 3: {
-          setState(768);
+          setState(837);
 
           if (!(!_localctx->clauses.count("primaryKeyClause"))) throw FailedPredicateException(this, "!$clauses.count(\"primaryKeyClause\")");
-          setState(769);
+          setState(838);
           primaryKeyClause();
           _localctx->clauses.insert("primaryKeyClause");
           break;
         }
 
         case 4: {
-          setState(772);
+          setState(841);
 
           if (!(!_localctx->clauses.count("sampleByClause"))) throw FailedPredicateException(this, "!$clauses.count(\"sampleByClause\")");
-          setState(773);
+          setState(842);
           sampleByClause();
           _localctx->clauses.insert("sampleByClause");
           break;
         }
 
         case 5: {
-          setState(776);
+          setState(845);
 
           if (!(!_localctx->clauses.count("ttlClause"))) throw FailedPredicateException(this, "!$clauses.count(\"ttlClause\")");
-          setState(777);
+          setState(846);
           ttlClause();
           _localctx->clauses.insert("ttlClause");
           break;
         }
 
         case 6: {
-          setState(780);
+          setState(849);
 
           if (!(!_localctx->clauses.count("settingsClause"))) throw FailedPredicateException(this, "!$clauses.count(\"settingsClause\")");
-          setState(781);
+          setState(850);
           settingsClause();
           _localctx->clauses.insert("settingsClause");
           break;
@@ -5306,9 +5742,9 @@ ClickHouseParser::EngineClauseContext* ClickHouseParser::engineClause() {
 
         } 
       }
-      setState(788);
+      setState(857);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 77, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 88, _ctx);
     }
    
   }
@@ -5361,11 +5797,11 @@ ClickHouseParser::PartitionByClauseContext* ClickHouseParser::partitionByClause(
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(789);
+    setState(858);
     match(ClickHouseParser::PARTITION);
-    setState(790);
+    setState(859);
     match(ClickHouseParser::BY);
-    setState(791);
+    setState(860);
     columnExpr(0);
    
   }
@@ -5418,11 +5854,11 @@ ClickHouseParser::PrimaryKeyClauseContext* ClickHouseParser::primaryKeyClause()
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(793);
+    setState(862);
     match(ClickHouseParser::PRIMARY);
-    setState(794);
+    setState(863);
     match(ClickHouseParser::KEY);
-    setState(795);
+    setState(864);
     columnExpr(0);
    
   }
@@ -5475,11 +5911,11 @@ ClickHouseParser::SampleByClauseContext* ClickHouseParser::sampleByClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(797);
+    setState(866);
     match(ClickHouseParser::SAMPLE);
-    setState(798);
+    setState(867);
     match(ClickHouseParser::BY);
-    setState(799);
+    setState(868);
     columnExpr(0);
    
   }
@@ -5541,23 +5977,23 @@ ClickHouseParser::TtlClauseContext* ClickHouseParser::ttlClause() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(801);
+    setState(870);
     match(ClickHouseParser::TTL);
-    setState(802);
+    setState(871);
     ttlExpr();
-    setState(807);
+    setState(876);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 78, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 89, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(803);
+        setState(872);
         match(ClickHouseParser::COMMA);
-        setState(804);
+        setState(873);
         ttlExpr(); 
       }
-      setState(809);
+      setState(878);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 78, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 89, _ctx);
     }
    
   }
@@ -5623,26 +6059,26 @@ ClickHouseParser::EngineExprContext* ClickHouseParser::engineExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(810);
+    setState(879);
     match(ClickHouseParser::ENGINE);
-    setState(812);
+    setState(881);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::EQ_SINGLE) {
-      setState(811);
+      setState(880);
       match(ClickHouseParser::EQ_SINGLE);
     }
-    setState(814);
+    setState(883);
     identifierOrNull();
-    setState(820);
+    setState(889);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 81, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 92, _ctx)) {
     case 1: {
-      setState(815);
+      setState(884);
       match(ClickHouseParser::LPAREN);
-      setState(817);
+      setState(886);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -5745,6 +6181,7 @@ ClickHouseParser::EngineExprContext* ClickHouseParser::engineExpr() {
         | (1ULL << (ClickHouseParser::LOCAL - 64))
         | (1ULL << (ClickHouseParser::LOGS - 64))
         | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+        | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
         | (1ULL << (ClickHouseParser::MAX - 64))
         | (1ULL << (ClickHouseParser::MERGES - 64))
         | (1ULL << (ClickHouseParser::MIN - 64))
@@ -5770,10 +6207,10 @@ ClickHouseParser::EngineExprContext* ClickHouseParser::engineExpr() {
         | (1ULL << (ClickHouseParser::PREWHERE - 64))
         | (1ULL << (ClickHouseParser::PRIMARY - 64))
         | (1ULL << (ClickHouseParser::QUARTER - 64))
-        | (1ULL << (ClickHouseParser::RANGE - 64))
-        | (1ULL << (ClickHouseParser::RELOAD - 64))
-        | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+        | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+        | (1ULL << (ClickHouseParser::REMOVE - 128))
+        | (1ULL << (ClickHouseParser::RENAME - 128))
         | (1ULL << (ClickHouseParser::REPLACE - 128))
         | (1ULL << (ClickHouseParser::REPLICA - 128))
         | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -5832,16 +6269,16 @@ ClickHouseParser::EngineExprContext* ClickHouseParser::engineExpr() {
         | (1ULL << (ClickHouseParser::DECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::HEXADECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::STRING_LITERAL - 128))
-        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 194) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
-        | (1ULL << (ClickHouseParser::DOT - 194))
-        | (1ULL << (ClickHouseParser::LBRACKET - 194))
-        | (1ULL << (ClickHouseParser::LPAREN - 194))
-        | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(816);
+        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 196) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 196)) & ((1ULL << (ClickHouseParser::DASH - 196))
+        | (1ULL << (ClickHouseParser::DOT - 196))
+        | (1ULL << (ClickHouseParser::LBRACKET - 196))
+        | (1ULL << (ClickHouseParser::LPAREN - 196))
+        | (1ULL << (ClickHouseParser::PLUS - 196)))) != 0)) {
+        setState(885);
         columnExprList();
       }
-      setState(819);
+      setState(888);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -5873,6 +6310,25 @@ void ClickHouseParser::TableElementExprContext::copyFrom(TableElementExprContext
   ParserRuleContext::copyFrom(ctx);
 }
 
+//----------------- TableElementExprProjectionContext ------------------------------------------------------------------
+
+tree::TerminalNode* ClickHouseParser::TableElementExprProjectionContext::PROJECTION() {
+  return getToken(ClickHouseParser::PROJECTION, 0);
+}
+
+ClickHouseParser::TableProjectionDfntContext* ClickHouseParser::TableElementExprProjectionContext::tableProjectionDfnt() {
+  return getRuleContext<ClickHouseParser::TableProjectionDfntContext>(0);
+}
+
+ClickHouseParser::TableElementExprProjectionContext::TableElementExprProjectionContext(TableElementExprContext *ctx) { copyFrom(ctx); }
+
+
+antlrcpp::Any ClickHouseParser::TableElementExprProjectionContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitTableElementExprProjection(this);
+  else
+    return visitor->visitChildren(this);
+}
 //----------------- TableElementExprConstraintContext ------------------------------------------------------------------
 
 tree::TerminalNode* ClickHouseParser::TableElementExprConstraintContext::CONSTRAINT() {
@@ -5942,13 +6398,13 @@ ClickHouseParser::TableElementExprContext* ClickHouseParser::tableElementExpr()
     exitRule();
   });
   try {
-    setState(830);
+    setState(901);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 82, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 93, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<TableElementExprContext *>(_tracker.createInstance<ClickHouseParser::TableElementExprColumnContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(822);
+      setState(891);
       tableColumnDfnt();
       break;
     }
@@ -5956,13 +6412,13 @@ ClickHouseParser::TableElementExprContext* ClickHouseParser::tableElementExpr()
     case 2: {
       _localctx = dynamic_cast<TableElementExprContext *>(_tracker.createInstance<ClickHouseParser::TableElementExprConstraintContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(823);
+      setState(892);
       match(ClickHouseParser::CONSTRAINT);
-      setState(824);
+      setState(893);
       identifier();
-      setState(825);
+      setState(894);
       match(ClickHouseParser::CHECK);
-      setState(826);
+      setState(895);
       columnExpr(0);
       break;
     }
@@ -5970,13 +6426,23 @@ ClickHouseParser::TableElementExprContext* ClickHouseParser::tableElementExpr()
     case 3: {
       _localctx = dynamic_cast<TableElementExprContext *>(_tracker.createInstance<ClickHouseParser::TableElementExprIndexContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(828);
+      setState(897);
       match(ClickHouseParser::INDEX);
-      setState(829);
+      setState(898);
       tableIndexDfnt();
       break;
     }
 
+    case 4: {
+      _localctx = dynamic_cast<TableElementExprContext *>(_tracker.createInstance<ClickHouseParser::TableElementExprProjectionContext>(_localctx));
+      enterOuterAlt(_localctx, 4);
+      setState(899);
+      match(ClickHouseParser::PROJECTION);
+      setState(900);
+      tableProjectionDfnt();
+      break;
+    }
+
     }
    
   }
@@ -6049,51 +6515,51 @@ ClickHouseParser::TableColumnDfntContext* ClickHouseParser::tableColumnDfnt() {
     exitRule();
   });
   try {
-    setState(864);
+    setState(935);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 91, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 102, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(832);
+      setState(903);
       nestedIdentifier();
-      setState(833);
+      setState(904);
       columnTypeExpr();
-      setState(835);
+      setState(906);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ALIAS
 
       || _la == ClickHouseParser::DEFAULT || _la == ClickHouseParser::MATERIALIZED) {
-        setState(834);
+        setState(905);
         tableColumnPropertyExpr();
       }
-      setState(839);
+      setState(910);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::COMMENT) {
-        setState(837);
+        setState(908);
         match(ClickHouseParser::COMMENT);
-        setState(838);
+        setState(909);
         match(ClickHouseParser::STRING_LITERAL);
       }
-      setState(842);
+      setState(913);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::CODEC) {
-        setState(841);
+        setState(912);
         codecExpr();
       }
-      setState(846);
+      setState(917);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::TTL) {
-        setState(844);
+        setState(915);
         match(ClickHouseParser::TTL);
-        setState(845);
+        setState(916);
         columnExpr(0);
       }
       break;
@@ -6101,47 +6567,47 @@ ClickHouseParser::TableColumnDfntContext* ClickHouseParser::tableColumnDfnt() {
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(848);
+      setState(919);
       nestedIdentifier();
-      setState(850);
+      setState(921);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 87, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 98, _ctx)) {
       case 1: {
-        setState(849);
+        setState(920);
         columnTypeExpr();
         break;
       }
 
       }
-      setState(852);
+      setState(923);
       tableColumnPropertyExpr();
-      setState(855);
+      setState(926);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::COMMENT) {
-        setState(853);
+        setState(924);
         match(ClickHouseParser::COMMENT);
-        setState(854);
+        setState(925);
         match(ClickHouseParser::STRING_LITERAL);
       }
-      setState(858);
+      setState(929);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::CODEC) {
-        setState(857);
+        setState(928);
         codecExpr();
       }
-      setState(862);
+      setState(933);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::TTL) {
-        setState(860);
+        setState(931);
         match(ClickHouseParser::TTL);
-        setState(861);
+        setState(932);
         columnExpr(0);
       }
       break;
@@ -6204,7 +6670,7 @@ ClickHouseParser::TableColumnPropertyExprContext* ClickHouseParser::tableColumnP
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(866);
+    setState(937);
     _la = _input->LA(1);
     if (!(_la == ClickHouseParser::ALIAS
 
@@ -6215,7 +6681,7 @@ ClickHouseParser::TableColumnPropertyExprContext* ClickHouseParser::tableColumnP
       _errHandler->reportMatch(this);
       consume();
     }
-    setState(867);
+    setState(938);
     columnExpr(0);
    
   }
@@ -6280,17 +6746,17 @@ ClickHouseParser::TableIndexDfntContext* ClickHouseParser::tableIndexDfnt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(869);
+    setState(940);
     nestedIdentifier();
-    setState(870);
+    setState(941);
     columnExpr(0);
-    setState(871);
+    setState(942);
     match(ClickHouseParser::TYPE);
-    setState(872);
+    setState(943);
     columnTypeExpr();
-    setState(873);
+    setState(944);
     match(ClickHouseParser::GRANULARITY);
-    setState(874);
+    setState(945);
     match(ClickHouseParser::DECIMAL_LITERAL);
    
   }
@@ -6303,6 +6769,57 @@ ClickHouseParser::TableIndexDfntContext* ClickHouseParser::tableIndexDfnt() {
   return _localctx;
 }
 
+//----------------- TableProjectionDfntContext ------------------------------------------------------------------
+
+ClickHouseParser::TableProjectionDfntContext::TableProjectionDfntContext(ParserRuleContext *parent, size_t invokingState)
+  : ParserRuleContext(parent, invokingState) {
+}
+
+ClickHouseParser::NestedIdentifierContext* ClickHouseParser::TableProjectionDfntContext::nestedIdentifier() {
+  return getRuleContext<ClickHouseParser::NestedIdentifierContext>(0);
+}
+
+ClickHouseParser::ProjectionSelectStmtContext* ClickHouseParser::TableProjectionDfntContext::projectionSelectStmt() {
+  return getRuleContext<ClickHouseParser::ProjectionSelectStmtContext>(0);
+}
+
+
+size_t ClickHouseParser::TableProjectionDfntContext::getRuleIndex() const {
+  return ClickHouseParser::RuleTableProjectionDfnt;
+}
+
+
+antlrcpp::Any ClickHouseParser::TableProjectionDfntContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitTableProjectionDfnt(this);
+  else
+    return visitor->visitChildren(this);
+}
+
+ClickHouseParser::TableProjectionDfntContext* ClickHouseParser::tableProjectionDfnt() {
+  TableProjectionDfntContext *_localctx = _tracker.createInstance<TableProjectionDfntContext>(_ctx, getState());
+  enterRule(_localctx, 72, ClickHouseParser::RuleTableProjectionDfnt);
+
+  auto onExit = finally([=] {
+    exitRule();
+  });
+  try {
+    enterOuterAlt(_localctx, 1);
+    setState(947);
+    nestedIdentifier();
+    setState(948);
+    projectionSelectStmt();
+   
+  }
+  catch (RecognitionException &e) {
+    _errHandler->reportError(this, e);
+    _localctx->exception = std::current_exception();
+    _errHandler->recover(this, _localctx->exception);
+  }
+
+  return _localctx;
+}
+
 //----------------- CodecExprContext ------------------------------------------------------------------
 
 ClickHouseParser::CodecExprContext::CodecExprContext(ParserRuleContext *parent, size_t invokingState)
@@ -6352,7 +6869,7 @@ antlrcpp::Any ClickHouseParser::CodecExprContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::CodecExprContext* ClickHouseParser::codecExpr() {
   CodecExprContext *_localctx = _tracker.createInstance<CodecExprContext>(_ctx, getState());
-  enterRule(_localctx, 72, ClickHouseParser::RuleCodecExpr);
+  enterRule(_localctx, 74, ClickHouseParser::RuleCodecExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -6360,25 +6877,25 @@ ClickHouseParser::CodecExprContext* ClickHouseParser::codecExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(876);
+    setState(950);
     match(ClickHouseParser::CODEC);
-    setState(877);
+    setState(951);
     match(ClickHouseParser::LPAREN);
-    setState(878);
+    setState(952);
     codecArgExpr();
-    setState(883);
+    setState(957);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(879);
+      setState(953);
       match(ClickHouseParser::COMMA);
-      setState(880);
+      setState(954);
       codecArgExpr();
-      setState(885);
+      setState(959);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(886);
+    setState(960);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -6428,7 +6945,7 @@ antlrcpp::Any ClickHouseParser::CodecArgExprContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::CodecArgExprContext* ClickHouseParser::codecArgExpr() {
   CodecArgExprContext *_localctx = _tracker.createInstance<CodecArgExprContext>(_ctx, getState());
-  enterRule(_localctx, 74, ClickHouseParser::RuleCodecArgExpr);
+  enterRule(_localctx, 76, ClickHouseParser::RuleCodecArgExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -6436,16 +6953,16 @@ ClickHouseParser::CodecArgExprContext* ClickHouseParser::codecArgExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(888);
+    setState(962);
     identifier();
-    setState(894);
+    setState(968);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::LPAREN) {
-      setState(889);
+      setState(963);
       match(ClickHouseParser::LPAREN);
-      setState(891);
+      setState(965);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -6548,6 +7065,7 @@ ClickHouseParser::CodecArgExprContext* ClickHouseParser::codecArgExpr() {
         | (1ULL << (ClickHouseParser::LOCAL - 64))
         | (1ULL << (ClickHouseParser::LOGS - 64))
         | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+        | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
         | (1ULL << (ClickHouseParser::MAX - 64))
         | (1ULL << (ClickHouseParser::MERGES - 64))
         | (1ULL << (ClickHouseParser::MIN - 64))
@@ -6573,10 +7091,10 @@ ClickHouseParser::CodecArgExprContext* ClickHouseParser::codecArgExpr() {
         | (1ULL << (ClickHouseParser::PREWHERE - 64))
         | (1ULL << (ClickHouseParser::PRIMARY - 64))
         | (1ULL << (ClickHouseParser::QUARTER - 64))
-        | (1ULL << (ClickHouseParser::RANGE - 64))
-        | (1ULL << (ClickHouseParser::RELOAD - 64))
-        | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+        | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+        | (1ULL << (ClickHouseParser::REMOVE - 128))
+        | (1ULL << (ClickHouseParser::RENAME - 128))
         | (1ULL << (ClickHouseParser::REPLACE - 128))
         | (1ULL << (ClickHouseParser::REPLICA - 128))
         | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -6635,16 +7153,16 @@ ClickHouseParser::CodecArgExprContext* ClickHouseParser::codecArgExpr() {
         | (1ULL << (ClickHouseParser::DECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::HEXADECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::STRING_LITERAL - 128))
-        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 194) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
-        | (1ULL << (ClickHouseParser::DOT - 194))
-        | (1ULL << (ClickHouseParser::LBRACKET - 194))
-        | (1ULL << (ClickHouseParser::LPAREN - 194))
-        | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(890);
+        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 196) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 196)) & ((1ULL << (ClickHouseParser::DASH - 196))
+        | (1ULL << (ClickHouseParser::DOT - 196))
+        | (1ULL << (ClickHouseParser::LBRACKET - 196))
+        | (1ULL << (ClickHouseParser::LPAREN - 196))
+        | (1ULL << (ClickHouseParser::PLUS - 196)))) != 0)) {
+        setState(964);
         columnExprList();
       }
-      setState(893);
+      setState(967);
       match(ClickHouseParser::RPAREN);
     }
    
@@ -6703,41 +7221,41 @@ antlrcpp::Any ClickHouseParser::TtlExprContext::accept(tree::ParseTreeVisitor *v
 
 ClickHouseParser::TtlExprContext* ClickHouseParser::ttlExpr() {
   TtlExprContext *_localctx = _tracker.createInstance<TtlExprContext>(_ctx, getState());
-  enterRule(_localctx, 76, ClickHouseParser::RuleTtlExpr);
+  enterRule(_localctx, 78, ClickHouseParser::RuleTtlExpr);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(896);
+    setState(970);
     columnExpr(0);
-    setState(904);
+    setState(978);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 95, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 106, _ctx)) {
     case 1: {
-      setState(897);
+      setState(971);
       match(ClickHouseParser::DELETE);
       break;
     }
 
     case 2: {
-      setState(898);
+      setState(972);
       match(ClickHouseParser::TO);
-      setState(899);
+      setState(973);
       match(ClickHouseParser::DISK);
-      setState(900);
+      setState(974);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
 
     case 3: {
-      setState(901);
+      setState(975);
       match(ClickHouseParser::TO);
-      setState(902);
+      setState(976);
       match(ClickHouseParser::VOLUME);
-      setState(903);
+      setState(977);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -6791,7 +7309,7 @@ antlrcpp::Any ClickHouseParser::DescribeStmtContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::DescribeStmtContext* ClickHouseParser::describeStmt() {
   DescribeStmtContext *_localctx = _tracker.createInstance<DescribeStmtContext>(_ctx, getState());
-  enterRule(_localctx, 78, ClickHouseParser::RuleDescribeStmt);
+  enterRule(_localctx, 80, ClickHouseParser::RuleDescribeStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -6799,7 +7317,7 @@ ClickHouseParser::DescribeStmtContext* ClickHouseParser::describeStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(906);
+    setState(980);
     _la = _input->LA(1);
     if (!(_la == ClickHouseParser::DESC
 
@@ -6810,18 +7328,18 @@ ClickHouseParser::DescribeStmtContext* ClickHouseParser::describeStmt() {
       _errHandler->reportMatch(this);
       consume();
     }
-    setState(908);
+    setState(982);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 96, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 107, _ctx)) {
     case 1: {
-      setState(907);
+      setState(981);
       match(ClickHouseParser::TABLE);
       break;
     }
 
     }
-    setState(910);
+    setState(984);
     tableExpr(0);
    
   }
@@ -6949,20 +7467,20 @@ antlrcpp::Any ClickHouseParser::DropTableStmtContext::accept(tree::ParseTreeVisi
 }
 ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
   DropStmtContext *_localctx = _tracker.createInstance<DropStmtContext>(_ctx, getState());
-  enterRule(_localctx, 80, ClickHouseParser::RuleDropStmt);
+  enterRule(_localctx, 82, ClickHouseParser::RuleDropStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(943);
+    setState(1017);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 104, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 115, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<DropStmtContext *>(_tracker.createInstance<ClickHouseParser::DropDatabaseStmtContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(912);
+      setState(986);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::DETACH
 
@@ -6973,29 +7491,29 @@ ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(913);
+      setState(987);
       match(ClickHouseParser::DATABASE);
-      setState(916);
+      setState(990);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 97, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 108, _ctx)) {
       case 1: {
-        setState(914);
+        setState(988);
         match(ClickHouseParser::IF);
-        setState(915);
+        setState(989);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(918);
+      setState(992);
       databaseIdentifier();
-      setState(920);
+      setState(994);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(919);
+        setState(993);
         clusterClause();
       }
       break;
@@ -7004,7 +7522,7 @@ ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
     case 2: {
       _localctx = dynamic_cast<DropStmtContext *>(_tracker.createInstance<ClickHouseParser::DropTableStmtContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(922);
+      setState(996);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::DETACH
 
@@ -7015,32 +7533,32 @@ ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(929);
+      setState(1003);
       _errHandler->sync(this);
       switch (_input->LA(1)) {
         case ClickHouseParser::DICTIONARY: {
-          setState(923);
+          setState(997);
           match(ClickHouseParser::DICTIONARY);
           break;
         }
 
         case ClickHouseParser::TABLE:
         case ClickHouseParser::TEMPORARY: {
-          setState(925);
+          setState(999);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::TEMPORARY) {
-            setState(924);
+            setState(998);
             match(ClickHouseParser::TEMPORARY);
           }
-          setState(927);
+          setState(1001);
           match(ClickHouseParser::TABLE);
           break;
         }
 
         case ClickHouseParser::VIEW: {
-          setState(928);
+          setState(1002);
           match(ClickHouseParser::VIEW);
           break;
         }
@@ -7048,37 +7566,37 @@ ClickHouseParser::DropStmtContext* ClickHouseParser::dropStmt() {
       default:
         throw NoViableAltException(this);
       }
-      setState(933);
+      setState(1007);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 101, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 112, _ctx)) {
       case 1: {
-        setState(931);
+        setState(1005);
         match(ClickHouseParser::IF);
-        setState(932);
+        setState(1006);
         match(ClickHouseParser::EXISTS);
         break;
       }
 
       }
-      setState(935);
+      setState(1009);
       tableIdentifier();
-      setState(937);
+      setState(1011);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ON) {
-        setState(936);
+        setState(1010);
         clusterClause();
       }
-      setState(941);
+      setState(1015);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::NO) {
-        setState(939);
+        setState(1013);
         match(ClickHouseParser::NO);
-        setState(940);
+        setState(1014);
         match(ClickHouseParser::DELAY);
       }
       break;
@@ -7171,24 +7689,24 @@ antlrcpp::Any ClickHouseParser::ExistsDatabaseStmtContext::accept(tree::ParseTre
 }
 ClickHouseParser::ExistsStmtContext* ClickHouseParser::existsStmt() {
   ExistsStmtContext *_localctx = _tracker.createInstance<ExistsStmtContext>(_ctx, getState());
-  enterRule(_localctx, 82, ClickHouseParser::RuleExistsStmt);
+  enterRule(_localctx, 84, ClickHouseParser::RuleExistsStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(958);
+    setState(1032);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 107, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 118, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<ExistsStmtContext *>(_tracker.createInstance<ClickHouseParser::ExistsDatabaseStmtContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(945);
+      setState(1019);
       match(ClickHouseParser::EXISTS);
-      setState(946);
+      setState(1020);
       match(ClickHouseParser::DATABASE);
-      setState(947);
+      setState(1021);
       databaseIdentifier();
       break;
     }
@@ -7196,40 +7714,40 @@ ClickHouseParser::ExistsStmtContext* ClickHouseParser::existsStmt() {
     case 2: {
       _localctx = dynamic_cast<ExistsStmtContext *>(_tracker.createInstance<ClickHouseParser::ExistsTableStmtContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(948);
+      setState(1022);
       match(ClickHouseParser::EXISTS);
-      setState(955);
+      setState(1029);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 106, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 117, _ctx)) {
       case 1: {
-        setState(949);
+        setState(1023);
         match(ClickHouseParser::DICTIONARY);
         break;
       }
 
       case 2: {
-        setState(951);
+        setState(1025);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::TEMPORARY) {
-          setState(950);
+          setState(1024);
           match(ClickHouseParser::TEMPORARY);
         }
-        setState(953);
+        setState(1027);
         match(ClickHouseParser::TABLE);
         break;
       }
 
       case 3: {
-        setState(954);
+        setState(1028);
         match(ClickHouseParser::VIEW);
         break;
       }
 
       }
-      setState(957);
+      setState(1031);
       tableIdentifier();
       break;
     }
@@ -7279,18 +7797,18 @@ antlrcpp::Any ClickHouseParser::ExplainStmtContext::accept(tree::ParseTreeVisito
 
 ClickHouseParser::ExplainStmtContext* ClickHouseParser::explainStmt() {
   ExplainStmtContext *_localctx = _tracker.createInstance<ExplainStmtContext>(_ctx, getState());
-  enterRule(_localctx, 84, ClickHouseParser::RuleExplainStmt);
+  enterRule(_localctx, 86, ClickHouseParser::RuleExplainStmt);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(960);
+    setState(1034);
     match(ClickHouseParser::EXPLAIN);
-    setState(961);
+    setState(1035);
     match(ClickHouseParser::SYNTAX);
-    setState(962);
+    setState(1036);
     query();
    
   }
@@ -7356,58 +7874,58 @@ antlrcpp::Any ClickHouseParser::InsertStmtContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::InsertStmtContext* ClickHouseParser::insertStmt() {
   InsertStmtContext *_localctx = _tracker.createInstance<InsertStmtContext>(_ctx, getState());
-  enterRule(_localctx, 86, ClickHouseParser::RuleInsertStmt);
+  enterRule(_localctx, 88, ClickHouseParser::RuleInsertStmt);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(964);
+    setState(1038);
     match(ClickHouseParser::INSERT);
-    setState(965);
+    setState(1039);
     match(ClickHouseParser::INTO);
-    setState(967);
+    setState(1041);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 108, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 119, _ctx)) {
     case 1: {
-      setState(966);
+      setState(1040);
       match(ClickHouseParser::TABLE);
       break;
     }
 
     }
-    setState(972);
+    setState(1046);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 109, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 120, _ctx)) {
     case 1: {
-      setState(969);
+      setState(1043);
       tableIdentifier();
       break;
     }
 
     case 2: {
-      setState(970);
+      setState(1044);
       match(ClickHouseParser::FUNCTION);
-      setState(971);
+      setState(1045);
       tableFunctionExpr();
       break;
     }
 
     }
-    setState(975);
+    setState(1049);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 110, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 121, _ctx)) {
     case 1: {
-      setState(974);
+      setState(1048);
       columnsClause();
       break;
     }
 
     }
-    setState(977);
+    setState(1051);
     dataClause();
    
   }
@@ -7465,7 +7983,7 @@ antlrcpp::Any ClickHouseParser::ColumnsClauseContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::ColumnsClauseContext* ClickHouseParser::columnsClause() {
   ColumnsClauseContext *_localctx = _tracker.createInstance<ColumnsClauseContext>(_ctx, getState());
-  enterRule(_localctx, 88, ClickHouseParser::RuleColumnsClause);
+  enterRule(_localctx, 90, ClickHouseParser::RuleColumnsClause);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -7473,23 +7991,23 @@ ClickHouseParser::ColumnsClauseContext* ClickHouseParser::columnsClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(979);
+    setState(1053);
     match(ClickHouseParser::LPAREN);
-    setState(980);
+    setState(1054);
     nestedIdentifier();
-    setState(985);
+    setState(1059);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(981);
+      setState(1055);
       match(ClickHouseParser::COMMA);
-      setState(982);
+      setState(1056);
       nestedIdentifier();
-      setState(987);
+      setState(1061);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(988);
+    setState(1062);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -7576,22 +8094,22 @@ antlrcpp::Any ClickHouseParser::DataClauseSelectContext::accept(tree::ParseTreeV
 }
 ClickHouseParser::DataClauseContext* ClickHouseParser::dataClause() {
   DataClauseContext *_localctx = _tracker.createInstance<DataClauseContext>(_ctx, getState());
-  enterRule(_localctx, 90, ClickHouseParser::RuleDataClause);
+  enterRule(_localctx, 92, ClickHouseParser::RuleDataClause);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(999);
+    setState(1073);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::FORMAT: {
         _localctx = dynamic_cast<DataClauseContext *>(_tracker.createInstance<ClickHouseParser::DataClauseFormatContext>(_localctx));
         enterOuterAlt(_localctx, 1);
-        setState(990);
+        setState(1064);
         match(ClickHouseParser::FORMAT);
-        setState(991);
+        setState(1065);
         identifier();
         break;
       }
@@ -7599,7 +8117,7 @@ ClickHouseParser::DataClauseContext* ClickHouseParser::dataClause() {
       case ClickHouseParser::VALUES: {
         _localctx = dynamic_cast<DataClauseContext *>(_tracker.createInstance<ClickHouseParser::DataClauseValuesContext>(_localctx));
         enterOuterAlt(_localctx, 2);
-        setState(992);
+        setState(1066);
         match(ClickHouseParser::VALUES);
         break;
       }
@@ -7609,17 +8127,17 @@ ClickHouseParser::DataClauseContext* ClickHouseParser::dataClause() {
       case ClickHouseParser::LPAREN: {
         _localctx = dynamic_cast<DataClauseContext *>(_tracker.createInstance<ClickHouseParser::DataClauseSelectContext>(_localctx));
         enterOuterAlt(_localctx, 3);
-        setState(993);
+        setState(1067);
         selectUnionStmt();
-        setState(995);
+        setState(1069);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::SEMICOLON) {
-          setState(994);
+          setState(1068);
           match(ClickHouseParser::SEMICOLON);
         }
-        setState(997);
+        setState(1071);
         match(ClickHouseParser::EOF);
         break;
       }
@@ -7694,7 +8212,7 @@ antlrcpp::Any ClickHouseParser::KillMutationStmtContext::accept(tree::ParseTreeV
 }
 ClickHouseParser::KillStmtContext* ClickHouseParser::killStmt() {
   KillStmtContext *_localctx = _tracker.createInstance<KillStmtContext>(_ctx, getState());
-  enterRule(_localctx, 92, ClickHouseParser::RuleKillStmt);
+  enterRule(_localctx, 94, ClickHouseParser::RuleKillStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -7703,28 +8221,28 @@ ClickHouseParser::KillStmtContext* ClickHouseParser::killStmt() {
   try {
     _localctx = dynamic_cast<KillStmtContext *>(_tracker.createInstance<ClickHouseParser::KillMutationStmtContext>(_localctx));
     enterOuterAlt(_localctx, 1);
-    setState(1001);
+    setState(1075);
     match(ClickHouseParser::KILL);
-    setState(1002);
+    setState(1076);
     match(ClickHouseParser::MUTATION);
-    setState(1004);
+    setState(1078);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(1003);
+      setState(1077);
       clusterClause();
     }
-    setState(1006);
+    setState(1080);
     whereClause();
-    setState(1008);
+    setState(1082);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ASYNC || _la == ClickHouseParser::SYNC
 
     || _la == ClickHouseParser::TEST) {
-      setState(1007);
+      setState(1081);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::ASYNC || _la == ClickHouseParser::SYNC
 
@@ -7796,7 +8314,7 @@ antlrcpp::Any ClickHouseParser::OptimizeStmtContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::OptimizeStmtContext* ClickHouseParser::optimizeStmt() {
   OptimizeStmtContext *_localctx = _tracker.createInstance<OptimizeStmtContext>(_ctx, getState());
-  enterRule(_localctx, 94, ClickHouseParser::RuleOptimizeStmt);
+  enterRule(_localctx, 96, ClickHouseParser::RuleOptimizeStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -7804,42 +8322,42 @@ ClickHouseParser::OptimizeStmtContext* ClickHouseParser::optimizeStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1010);
+    setState(1084);
     match(ClickHouseParser::OPTIMIZE);
-    setState(1011);
+    setState(1085);
     match(ClickHouseParser::TABLE);
-    setState(1012);
+    setState(1086);
     tableIdentifier();
-    setState(1014);
+    setState(1088);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(1013);
+      setState(1087);
       clusterClause();
     }
-    setState(1017);
+    setState(1091);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::PARTITION) {
-      setState(1016);
+      setState(1090);
       partitionClause();
     }
-    setState(1020);
+    setState(1094);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::FINAL) {
-      setState(1019);
+      setState(1093);
       match(ClickHouseParser::FINAL);
     }
-    setState(1023);
+    setState(1097);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::DEDUPLICATE) {
-      setState(1022);
+      setState(1096);
       match(ClickHouseParser::DEDUPLICATE);
     }
    
@@ -7910,7 +8428,7 @@ antlrcpp::Any ClickHouseParser::RenameStmtContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::RenameStmtContext* ClickHouseParser::renameStmt() {
   RenameStmtContext *_localctx = _tracker.createInstance<RenameStmtContext>(_ctx, getState());
-  enterRule(_localctx, 96, ClickHouseParser::RuleRenameStmt);
+  enterRule(_localctx, 98, ClickHouseParser::RuleRenameStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -7918,38 +8436,38 @@ ClickHouseParser::RenameStmtContext* ClickHouseParser::renameStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1025);
+    setState(1099);
     match(ClickHouseParser::RENAME);
-    setState(1026);
+    setState(1100);
     match(ClickHouseParser::TABLE);
-    setState(1027);
+    setState(1101);
     tableIdentifier();
-    setState(1028);
+    setState(1102);
     match(ClickHouseParser::TO);
-    setState(1029);
+    setState(1103);
     tableIdentifier();
-    setState(1037);
+    setState(1111);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(1030);
+      setState(1104);
       match(ClickHouseParser::COMMA);
-      setState(1031);
+      setState(1105);
       tableIdentifier();
-      setState(1032);
+      setState(1106);
       match(ClickHouseParser::TO);
-      setState(1033);
+      setState(1107);
       tableIdentifier();
-      setState(1039);
+      setState(1113);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
-    setState(1041);
+    setState(1115);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(1040);
+      setState(1114);
       clusterClause();
     }
    
@@ -7963,6 +8481,106 @@ ClickHouseParser::RenameStmtContext* ClickHouseParser::renameStmt() {
   return _localctx;
 }
 
+//----------------- ProjectionSelectStmtContext ------------------------------------------------------------------
+
+ClickHouseParser::ProjectionSelectStmtContext::ProjectionSelectStmtContext(ParserRuleContext *parent, size_t invokingState)
+  : ParserRuleContext(parent, invokingState) {
+}
+
+tree::TerminalNode* ClickHouseParser::ProjectionSelectStmtContext::LPAREN() {
+  return getToken(ClickHouseParser::LPAREN, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::ProjectionSelectStmtContext::SELECT() {
+  return getToken(ClickHouseParser::SELECT, 0);
+}
+
+ClickHouseParser::ColumnExprListContext* ClickHouseParser::ProjectionSelectStmtContext::columnExprList() {
+  return getRuleContext<ClickHouseParser::ColumnExprListContext>(0);
+}
+
+tree::TerminalNode* ClickHouseParser::ProjectionSelectStmtContext::RPAREN() {
+  return getToken(ClickHouseParser::RPAREN, 0);
+}
+
+ClickHouseParser::WithClauseContext* ClickHouseParser::ProjectionSelectStmtContext::withClause() {
+  return getRuleContext<ClickHouseParser::WithClauseContext>(0);
+}
+
+ClickHouseParser::GroupByClauseContext* ClickHouseParser::ProjectionSelectStmtContext::groupByClause() {
+  return getRuleContext<ClickHouseParser::GroupByClauseContext>(0);
+}
+
+ClickHouseParser::ProjectionOrderByClauseContext* ClickHouseParser::ProjectionSelectStmtContext::projectionOrderByClause() {
+  return getRuleContext<ClickHouseParser::ProjectionOrderByClauseContext>(0);
+}
+
+
+size_t ClickHouseParser::ProjectionSelectStmtContext::getRuleIndex() const {
+  return ClickHouseParser::RuleProjectionSelectStmt;
+}
+
+
+antlrcpp::Any ClickHouseParser::ProjectionSelectStmtContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitProjectionSelectStmt(this);
+  else
+    return visitor->visitChildren(this);
+}
+
+ClickHouseParser::ProjectionSelectStmtContext* ClickHouseParser::projectionSelectStmt() {
+  ProjectionSelectStmtContext *_localctx = _tracker.createInstance<ProjectionSelectStmtContext>(_ctx, getState());
+  enterRule(_localctx, 100, ClickHouseParser::RuleProjectionSelectStmt);
+  size_t _la = 0;
+
+  auto onExit = finally([=] {
+    exitRule();
+  });
+  try {
+    enterOuterAlt(_localctx, 1);
+    setState(1117);
+    match(ClickHouseParser::LPAREN);
+    setState(1119);
+    _errHandler->sync(this);
+
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::WITH) {
+      setState(1118);
+      withClause();
+    }
+    setState(1121);
+    match(ClickHouseParser::SELECT);
+    setState(1122);
+    columnExprList();
+    setState(1124);
+    _errHandler->sync(this);
+
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::GROUP) {
+      setState(1123);
+      groupByClause();
+    }
+    setState(1127);
+    _errHandler->sync(this);
+
+    _la = _input->LA(1);
+    if (_la == ClickHouseParser::ORDER) {
+      setState(1126);
+      projectionOrderByClause();
+    }
+    setState(1129);
+    match(ClickHouseParser::RPAREN);
+   
+  }
+  catch (RecognitionException &e) {
+    _errHandler->reportError(this, e);
+    _localctx->exception = std::current_exception();
+    _errHandler->recover(this, _localctx->exception);
+  }
+
+  return _localctx;
+}
+
 //----------------- SelectUnionStmtContext ------------------------------------------------------------------
 
 ClickHouseParser::SelectUnionStmtContext::SelectUnionStmtContext(ParserRuleContext *parent, size_t invokingState)
@@ -8008,7 +8626,7 @@ antlrcpp::Any ClickHouseParser::SelectUnionStmtContext::accept(tree::ParseTreeVi
 
 ClickHouseParser::SelectUnionStmtContext* ClickHouseParser::selectUnionStmt() {
   SelectUnionStmtContext *_localctx = _tracker.createInstance<SelectUnionStmtContext>(_ctx, getState());
-  enterRule(_localctx, 98, ClickHouseParser::RuleSelectUnionStmt);
+  enterRule(_localctx, 102, ClickHouseParser::RuleSelectUnionStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -8016,19 +8634,19 @@ ClickHouseParser::SelectUnionStmtContext* ClickHouseParser::selectUnionStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1043);
+    setState(1131);
     selectStmtWithParens();
-    setState(1049);
+    setState(1137);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::UNION) {
-      setState(1044);
+      setState(1132);
       match(ClickHouseParser::UNION);
-      setState(1045);
+      setState(1133);
       match(ClickHouseParser::ALL);
-      setState(1046);
+      setState(1134);
       selectStmtWithParens();
-      setState(1051);
+      setState(1139);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -8080,30 +8698,30 @@ antlrcpp::Any ClickHouseParser::SelectStmtWithParensContext::accept(tree::ParseT
 
 ClickHouseParser::SelectStmtWithParensContext* ClickHouseParser::selectStmtWithParens() {
   SelectStmtWithParensContext *_localctx = _tracker.createInstance<SelectStmtWithParensContext>(_ctx, getState());
-  enterRule(_localctx, 100, ClickHouseParser::RuleSelectStmtWithParens);
+  enterRule(_localctx, 104, ClickHouseParser::RuleSelectStmtWithParens);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1057);
+    setState(1145);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::SELECT:
       case ClickHouseParser::WITH: {
         enterOuterAlt(_localctx, 1);
-        setState(1052);
+        setState(1140);
         selectStmt();
         break;
       }
 
       case ClickHouseParser::LPAREN: {
         enterOuterAlt(_localctx, 2);
-        setState(1053);
+        setState(1141);
         match(ClickHouseParser::LPAREN);
-        setState(1054);
+        setState(1142);
         selectUnionStmt();
-        setState(1055);
+        setState(1143);
         match(ClickHouseParser::RPAREN);
         break;
       }
@@ -8223,7 +8841,7 @@ antlrcpp::Any ClickHouseParser::SelectStmtContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::SelectStmtContext* ClickHouseParser::selectStmt() {
   SelectStmtContext *_localctx = _tracker.createInstance<SelectStmtContext>(_ctx, getState());
-  enterRule(_localctx, 102, ClickHouseParser::RuleSelectStmt);
+  enterRule(_localctx, 106, ClickHouseParser::RuleSelectStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -8231,90 +8849,90 @@ ClickHouseParser::SelectStmtContext* ClickHouseParser::selectStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1060);
+    setState(1148);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::WITH) {
-      setState(1059);
+      setState(1147);
       withClause();
     }
-    setState(1062);
+    setState(1150);
     match(ClickHouseParser::SELECT);
-    setState(1064);
+    setState(1152);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 125, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 139, _ctx)) {
     case 1: {
-      setState(1063);
+      setState(1151);
       match(ClickHouseParser::DISTINCT);
       break;
     }
 
     }
-    setState(1067);
+    setState(1155);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 126, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 140, _ctx)) {
     case 1: {
-      setState(1066);
+      setState(1154);
       topClause();
       break;
     }
 
     }
-    setState(1069);
+    setState(1157);
     columnExprList();
-    setState(1071);
+    setState(1159);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::FROM) {
-      setState(1070);
+      setState(1158);
       fromClause();
     }
-    setState(1074);
+    setState(1162);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ARRAY || _la == ClickHouseParser::INNER
 
     || _la == ClickHouseParser::LEFT) {
-      setState(1073);
+      setState(1161);
       arrayJoinClause();
     }
-    setState(1077);
+    setState(1165);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::PREWHERE) {
-      setState(1076);
+      setState(1164);
       prewhereClause();
     }
-    setState(1080);
+    setState(1168);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::WHERE) {
-      setState(1079);
+      setState(1167);
       whereClause();
     }
-    setState(1083);
+    setState(1171);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::GROUP) {
-      setState(1082);
+      setState(1170);
       groupByClause();
     }
-    setState(1087);
+    setState(1175);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 132, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 146, _ctx)) {
     case 1: {
-      setState(1085);
+      setState(1173);
       match(ClickHouseParser::WITH);
-      setState(1086);
+      setState(1174);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::CUBE || _la == ClickHouseParser::ROLLUP)) {
       _errHandler->recoverInline(this);
@@ -8327,57 +8945,57 @@ ClickHouseParser::SelectStmtContext* ClickHouseParser::selectStmt() {
     }
 
     }
-    setState(1091);
+    setState(1179);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::WITH) {
-      setState(1089);
+      setState(1177);
       match(ClickHouseParser::WITH);
-      setState(1090);
+      setState(1178);
       match(ClickHouseParser::TOTALS);
     }
-    setState(1094);
+    setState(1182);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::HAVING) {
-      setState(1093);
+      setState(1181);
       havingClause();
     }
-    setState(1097);
+    setState(1185);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ORDER) {
-      setState(1096);
+      setState(1184);
       orderByClause();
     }
-    setState(1100);
+    setState(1188);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 136, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 150, _ctx)) {
     case 1: {
-      setState(1099);
+      setState(1187);
       limitByClause();
       break;
     }
 
     }
-    setState(1103);
+    setState(1191);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::LIMIT) {
-      setState(1102);
+      setState(1190);
       limitClause();
     }
-    setState(1106);
+    setState(1194);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::SETTINGS) {
-      setState(1105);
+      setState(1193);
       settingsClause();
     }
    
@@ -8420,16 +9038,16 @@ antlrcpp::Any ClickHouseParser::WithClauseContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::WithClauseContext* ClickHouseParser::withClause() {
   WithClauseContext *_localctx = _tracker.createInstance<WithClauseContext>(_ctx, getState());
-  enterRule(_localctx, 104, ClickHouseParser::RuleWithClause);
+  enterRule(_localctx, 108, ClickHouseParser::RuleWithClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1108);
+    setState(1196);
     match(ClickHouseParser::WITH);
-    setState(1109);
+    setState(1197);
     columnExprList();
    
   }
@@ -8479,25 +9097,25 @@ antlrcpp::Any ClickHouseParser::TopClauseContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::TopClauseContext* ClickHouseParser::topClause() {
   TopClauseContext *_localctx = _tracker.createInstance<TopClauseContext>(_ctx, getState());
-  enterRule(_localctx, 106, ClickHouseParser::RuleTopClause);
+  enterRule(_localctx, 110, ClickHouseParser::RuleTopClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1111);
+    setState(1199);
     match(ClickHouseParser::TOP);
-    setState(1112);
+    setState(1200);
     match(ClickHouseParser::DECIMAL_LITERAL);
-    setState(1115);
+    setState(1203);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 139, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 153, _ctx)) {
     case 1: {
-      setState(1113);
+      setState(1201);
       match(ClickHouseParser::WITH);
-      setState(1114);
+      setState(1202);
       match(ClickHouseParser::TIES);
       break;
     }
@@ -8543,16 +9161,16 @@ antlrcpp::Any ClickHouseParser::FromClauseContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::FromClauseContext* ClickHouseParser::fromClause() {
   FromClauseContext *_localctx = _tracker.createInstance<FromClauseContext>(_ctx, getState());
-  enterRule(_localctx, 108, ClickHouseParser::RuleFromClause);
+  enterRule(_localctx, 112, ClickHouseParser::RuleFromClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1117);
+    setState(1205);
     match(ClickHouseParser::FROM);
-    setState(1118);
+    setState(1206);
     joinExpr(0);
    
   }
@@ -8606,7 +9224,7 @@ antlrcpp::Any ClickHouseParser::ArrayJoinClauseContext::accept(tree::ParseTreeVi
 
 ClickHouseParser::ArrayJoinClauseContext* ClickHouseParser::arrayJoinClause() {
   ArrayJoinClauseContext *_localctx = _tracker.createInstance<ArrayJoinClauseContext>(_ctx, getState());
-  enterRule(_localctx, 110, ClickHouseParser::RuleArrayJoinClause);
+  enterRule(_localctx, 114, ClickHouseParser::RuleArrayJoinClause);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -8614,14 +9232,14 @@ ClickHouseParser::ArrayJoinClauseContext* ClickHouseParser::arrayJoinClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1121);
+    setState(1209);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::INNER
 
     || _la == ClickHouseParser::LEFT) {
-      setState(1120);
+      setState(1208);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::INNER
 
@@ -8633,11 +9251,11 @@ ClickHouseParser::ArrayJoinClauseContext* ClickHouseParser::arrayJoinClause() {
         consume();
       }
     }
-    setState(1123);
+    setState(1211);
     match(ClickHouseParser::ARRAY);
-    setState(1124);
+    setState(1212);
     match(ClickHouseParser::JOIN);
-    setState(1125);
+    setState(1213);
     columnExprList();
    
   }
@@ -8679,16 +9297,16 @@ antlrcpp::Any ClickHouseParser::PrewhereClauseContext::accept(tree::ParseTreeVis
 
 ClickHouseParser::PrewhereClauseContext* ClickHouseParser::prewhereClause() {
   PrewhereClauseContext *_localctx = _tracker.createInstance<PrewhereClauseContext>(_ctx, getState());
-  enterRule(_localctx, 112, ClickHouseParser::RulePrewhereClause);
+  enterRule(_localctx, 116, ClickHouseParser::RulePrewhereClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1127);
+    setState(1215);
     match(ClickHouseParser::PREWHERE);
-    setState(1128);
+    setState(1216);
     columnExpr(0);
    
   }
@@ -8730,16 +9348,16 @@ antlrcpp::Any ClickHouseParser::WhereClauseContext::accept(tree::ParseTreeVisito
 
 ClickHouseParser::WhereClauseContext* ClickHouseParser::whereClause() {
   WhereClauseContext *_localctx = _tracker.createInstance<WhereClauseContext>(_ctx, getState());
-  enterRule(_localctx, 114, ClickHouseParser::RuleWhereClause);
+  enterRule(_localctx, 118, ClickHouseParser::RuleWhereClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1130);
+    setState(1218);
     match(ClickHouseParser::WHERE);
-    setState(1131);
+    setState(1219);
     columnExpr(0);
    
   }
@@ -8801,7 +9419,7 @@ antlrcpp::Any ClickHouseParser::GroupByClauseContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::GroupByClauseContext* ClickHouseParser::groupByClause() {
   GroupByClauseContext *_localctx = _tracker.createInstance<GroupByClauseContext>(_ctx, getState());
-  enterRule(_localctx, 116, ClickHouseParser::RuleGroupByClause);
+  enterRule(_localctx, 120, ClickHouseParser::RuleGroupByClause);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -8809,15 +9427,15 @@ ClickHouseParser::GroupByClauseContext* ClickHouseParser::groupByClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1133);
+    setState(1221);
     match(ClickHouseParser::GROUP);
-    setState(1134);
+    setState(1222);
     match(ClickHouseParser::BY);
-    setState(1141);
+    setState(1229);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 141, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 155, _ctx)) {
     case 1: {
-      setState(1135);
+      setState(1223);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::CUBE || _la == ClickHouseParser::ROLLUP)) {
       _errHandler->recoverInline(this);
@@ -8826,17 +9444,17 @@ ClickHouseParser::GroupByClauseContext* ClickHouseParser::groupByClause() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1136);
+      setState(1224);
       match(ClickHouseParser::LPAREN);
-      setState(1137);
+      setState(1225);
       columnExprList();
-      setState(1138);
+      setState(1226);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     case 2: {
-      setState(1140);
+      setState(1228);
       columnExprList();
       break;
     }
@@ -8882,16 +9500,16 @@ antlrcpp::Any ClickHouseParser::HavingClauseContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::HavingClauseContext* ClickHouseParser::havingClause() {
   HavingClauseContext *_localctx = _tracker.createInstance<HavingClauseContext>(_ctx, getState());
-  enterRule(_localctx, 118, ClickHouseParser::RuleHavingClause);
+  enterRule(_localctx, 122, ClickHouseParser::RuleHavingClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1143);
+    setState(1231);
     match(ClickHouseParser::HAVING);
-    setState(1144);
+    setState(1232);
     columnExpr(0);
    
   }
@@ -8937,18 +9555,18 @@ antlrcpp::Any ClickHouseParser::OrderByClauseContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::OrderByClauseContext* ClickHouseParser::orderByClause() {
   OrderByClauseContext *_localctx = _tracker.createInstance<OrderByClauseContext>(_ctx, getState());
-  enterRule(_localctx, 120, ClickHouseParser::RuleOrderByClause);
+  enterRule(_localctx, 124, ClickHouseParser::RuleOrderByClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1146);
+    setState(1234);
     match(ClickHouseParser::ORDER);
-    setState(1147);
+    setState(1235);
     match(ClickHouseParser::BY);
-    setState(1148);
+    setState(1236);
     orderExprList();
    
   }
@@ -8961,6 +9579,63 @@ ClickHouseParser::OrderByClauseContext* ClickHouseParser::orderByClause() {
   return _localctx;
 }
 
+//----------------- ProjectionOrderByClauseContext ------------------------------------------------------------------
+
+ClickHouseParser::ProjectionOrderByClauseContext::ProjectionOrderByClauseContext(ParserRuleContext *parent, size_t invokingState)
+  : ParserRuleContext(parent, invokingState) {
+}
+
+tree::TerminalNode* ClickHouseParser::ProjectionOrderByClauseContext::ORDER() {
+  return getToken(ClickHouseParser::ORDER, 0);
+}
+
+tree::TerminalNode* ClickHouseParser::ProjectionOrderByClauseContext::BY() {
+  return getToken(ClickHouseParser::BY, 0);
+}
+
+ClickHouseParser::ColumnExprListContext* ClickHouseParser::ProjectionOrderByClauseContext::columnExprList() {
+  return getRuleContext<ClickHouseParser::ColumnExprListContext>(0);
+}
+
+
+size_t ClickHouseParser::ProjectionOrderByClauseContext::getRuleIndex() const {
+  return ClickHouseParser::RuleProjectionOrderByClause;
+}
+
+
+antlrcpp::Any ClickHouseParser::ProjectionOrderByClauseContext::accept(tree::ParseTreeVisitor *visitor) {
+  if (auto parserVisitor = dynamic_cast<ClickHouseParserVisitor*>(visitor))
+    return parserVisitor->visitProjectionOrderByClause(this);
+  else
+    return visitor->visitChildren(this);
+}
+
+ClickHouseParser::ProjectionOrderByClauseContext* ClickHouseParser::projectionOrderByClause() {
+  ProjectionOrderByClauseContext *_localctx = _tracker.createInstance<ProjectionOrderByClauseContext>(_ctx, getState());
+  enterRule(_localctx, 126, ClickHouseParser::RuleProjectionOrderByClause);
+
+  auto onExit = finally([=] {
+    exitRule();
+  });
+  try {
+    enterOuterAlt(_localctx, 1);
+    setState(1238);
+    match(ClickHouseParser::ORDER);
+    setState(1239);
+    match(ClickHouseParser::BY);
+    setState(1240);
+    columnExprList();
+   
+  }
+  catch (RecognitionException &e) {
+    _errHandler->reportError(this, e);
+    _localctx->exception = std::current_exception();
+    _errHandler->recover(this, _localctx->exception);
+  }
+
+  return _localctx;
+}
+
 //----------------- LimitByClauseContext ------------------------------------------------------------------
 
 ClickHouseParser::LimitByClauseContext::LimitByClauseContext(ParserRuleContext *parent, size_t invokingState)
@@ -8998,20 +9673,20 @@ antlrcpp::Any ClickHouseParser::LimitByClauseContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::LimitByClauseContext* ClickHouseParser::limitByClause() {
   LimitByClauseContext *_localctx = _tracker.createInstance<LimitByClauseContext>(_ctx, getState());
-  enterRule(_localctx, 122, ClickHouseParser::RuleLimitByClause);
+  enterRule(_localctx, 128, ClickHouseParser::RuleLimitByClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1150);
+    setState(1242);
     match(ClickHouseParser::LIMIT);
-    setState(1151);
+    setState(1243);
     limitExpr();
-    setState(1152);
+    setState(1244);
     match(ClickHouseParser::BY);
-    setState(1153);
+    setState(1245);
     columnExprList();
    
   }
@@ -9061,7 +9736,7 @@ antlrcpp::Any ClickHouseParser::LimitClauseContext::accept(tree::ParseTreeVisito
 
 ClickHouseParser::LimitClauseContext* ClickHouseParser::limitClause() {
   LimitClauseContext *_localctx = _tracker.createInstance<LimitClauseContext>(_ctx, getState());
-  enterRule(_localctx, 124, ClickHouseParser::RuleLimitClause);
+  enterRule(_localctx, 130, ClickHouseParser::RuleLimitClause);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -9069,18 +9744,18 @@ ClickHouseParser::LimitClauseContext* ClickHouseParser::limitClause() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1155);
+    setState(1247);
     match(ClickHouseParser::LIMIT);
-    setState(1156);
+    setState(1248);
     limitExpr();
-    setState(1159);
+    setState(1251);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::WITH) {
-      setState(1157);
+      setState(1249);
       match(ClickHouseParser::WITH);
-      setState(1158);
+      setState(1250);
       match(ClickHouseParser::TIES);
     }
    
@@ -9123,16 +9798,16 @@ antlrcpp::Any ClickHouseParser::SettingsClauseContext::accept(tree::ParseTreeVis
 
 ClickHouseParser::SettingsClauseContext* ClickHouseParser::settingsClause() {
   SettingsClauseContext *_localctx = _tracker.createInstance<SettingsClauseContext>(_ctx, getState());
-  enterRule(_localctx, 126, ClickHouseParser::RuleSettingsClause);
+  enterRule(_localctx, 132, ClickHouseParser::RuleSettingsClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1161);
+    setState(1253);
     match(ClickHouseParser::SETTINGS);
-    setState(1162);
+    setState(1254);
     settingExprList();
    
   }
@@ -9279,8 +9954,8 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
   ClickHouseParser::JoinExprContext *_localctx = _tracker.createInstance<JoinExprContext>(_ctx, parentState);
   ClickHouseParser::JoinExprContext *previousContext = _localctx;
   (void)previousContext; // Silence compiler, in case the context is not used by generated code.
-  size_t startState = 128;
-  enterRecursionRule(_localctx, 128, ClickHouseParser::RuleJoinExpr, precedence);
+  size_t startState = 134;
+  enterRecursionRule(_localctx, 134, ClickHouseParser::RuleJoinExpr, precedence);
 
     size_t _la = 0;
 
@@ -9290,33 +9965,33 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1176);
+    setState(1268);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 145, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 159, _ctx)) {
     case 1: {
       _localctx = _tracker.createInstance<JoinExprTableContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
 
-      setState(1165);
+      setState(1257);
       tableExpr(0);
-      setState(1167);
+      setState(1259);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 143, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 157, _ctx)) {
       case 1: {
-        setState(1166);
+        setState(1258);
         match(ClickHouseParser::FINAL);
         break;
       }
 
       }
-      setState(1170);
+      setState(1262);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 144, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 158, _ctx)) {
       case 1: {
-        setState(1169);
+        setState(1261);
         sampleClause();
         break;
       }
@@ -9329,38 +10004,38 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
       _localctx = _tracker.createInstance<JoinExprParensContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1172);
+      setState(1264);
       match(ClickHouseParser::LPAREN);
-      setState(1173);
+      setState(1265);
       joinExpr(0);
-      setState(1174);
+      setState(1266);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     }
     _ctx->stop = _input->LT(-1);
-    setState(1195);
+    setState(1287);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 149, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 163, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
         if (!_parseListeners.empty())
           triggerExitRuleEvent();
         previousContext = _localctx;
-        setState(1193);
+        setState(1285);
         _errHandler->sync(this);
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 148, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 162, _ctx)) {
         case 1: {
           auto newContext = _tracker.createInstance<JoinExprCrossOpContext>(_tracker.createInstance<JoinExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleJoinExpr);
-          setState(1178);
+          setState(1270);
 
           if (!(precpred(_ctx, 3))) throw FailedPredicateException(this, "precpred(_ctx, 3)");
-          setState(1179);
+          setState(1271);
           joinOpCross();
-          setState(1180);
+          setState(1272);
           joinExpr(4);
           break;
         }
@@ -9369,17 +10044,17 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
           auto newContext = _tracker.createInstance<JoinExprOpContext>(_tracker.createInstance<JoinExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleJoinExpr);
-          setState(1182);
+          setState(1274);
 
           if (!(precpred(_ctx, 4))) throw FailedPredicateException(this, "precpred(_ctx, 4)");
-          setState(1184);
+          setState(1276);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::GLOBAL
 
           || _la == ClickHouseParser::LOCAL) {
-            setState(1183);
+            setState(1275);
             _la = _input->LA(1);
             if (!(_la == ClickHouseParser::GLOBAL
 
@@ -9391,7 +10066,7 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
               consume();
             }
           }
-          setState(1187);
+          setState(1279);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
@@ -9405,23 +10080,23 @@ ClickHouseParser::JoinExprContext* ClickHouseParser::joinExpr(int precedence) {
             | (1ULL << (ClickHouseParser::LEFT - 80))
             | (1ULL << (ClickHouseParser::RIGHT - 80))
             | (1ULL << (ClickHouseParser::SEMI - 80)))) != 0)) {
-            setState(1186);
+            setState(1278);
             joinOp();
           }
-          setState(1189);
+          setState(1281);
           match(ClickHouseParser::JOIN);
-          setState(1190);
+          setState(1282);
           joinExpr(0);
-          setState(1191);
+          setState(1283);
           joinConstraintClause();
           break;
         }
 
         } 
       }
-      setState(1197);
+      setState(1289);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 149, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 163, _ctx);
     }
   }
   catch (RecognitionException &e) {
@@ -9546,24 +10221,24 @@ antlrcpp::Any ClickHouseParser::JoinOpLeftRightContext::accept(tree::ParseTreeVi
 }
 ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
   JoinOpContext *_localctx = _tracker.createInstance<JoinOpContext>(_ctx, getState());
-  enterRule(_localctx, 130, ClickHouseParser::RuleJoinOp);
+  enterRule(_localctx, 136, ClickHouseParser::RuleJoinOp);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1241);
+    setState(1333);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 163, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 177, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<JoinOpContext *>(_tracker.createInstance<ClickHouseParser::JoinOpInnerContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1207);
+      setState(1299);
       _errHandler->sync(this);
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 152, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 166, _ctx)) {
       case 1: {
-        setState(1199);
+        setState(1291);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9571,7 +10246,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0)) {
-          setState(1198);
+          setState(1290);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9584,15 +10259,15 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
             consume();
           }
         }
-        setState(1201);
+        setState(1293);
         match(ClickHouseParser::INNER);
         break;
       }
 
       case 2: {
-        setState(1202);
+        setState(1294);
         match(ClickHouseParser::INNER);
-        setState(1204);
+        setState(1296);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9600,7 +10275,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0)) {
-          setState(1203);
+          setState(1295);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9617,7 +10292,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
       }
 
       case 3: {
-        setState(1206);
+        setState(1298);
         _la = _input->LA(1);
         if (!((((_la & ~ 0x3fULL) == 0) &&
           ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9639,11 +10314,11 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
     case 2: {
       _localctx = dynamic_cast<JoinOpContext *>(_tracker.createInstance<ClickHouseParser::JoinOpLeftRightContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1223);
+      setState(1315);
       _errHandler->sync(this);
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 157, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 171, _ctx)) {
       case 1: {
-        setState(1210);
+        setState(1302);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9652,7 +10327,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           | (1ULL << ClickHouseParser::ANTI)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0) || _la == ClickHouseParser::SEMI) {
-          setState(1209);
+          setState(1301);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9666,7 +10341,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
             consume();
           }
         }
-        setState(1212);
+        setState(1304);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::LEFT
 
@@ -9677,19 +10352,19 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           _errHandler->reportMatch(this);
           consume();
         }
-        setState(1214);
+        setState(1306);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1213);
+          setState(1305);
           match(ClickHouseParser::OUTER);
         }
         break;
       }
 
       case 2: {
-        setState(1216);
+        setState(1308);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::LEFT
 
@@ -9700,15 +10375,15 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           _errHandler->reportMatch(this);
           consume();
         }
-        setState(1218);
+        setState(1310);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1217);
+          setState(1309);
           match(ClickHouseParser::OUTER);
         }
-        setState(1221);
+        setState(1313);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -9717,7 +10392,7 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
           | (1ULL << ClickHouseParser::ANTI)
           | (1ULL << ClickHouseParser::ANY)
           | (1ULL << ClickHouseParser::ASOF))) != 0) || _la == ClickHouseParser::SEMI) {
-          setState(1220);
+          setState(1312);
           _la = _input->LA(1);
           if (!((((_la & ~ 0x3fULL) == 0) &&
             ((1ULL << _la) & ((1ULL << ClickHouseParser::ALL)
@@ -9741,18 +10416,18 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
     case 3: {
       _localctx = dynamic_cast<JoinOpContext *>(_tracker.createInstance<ClickHouseParser::JoinOpFullContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1239);
+      setState(1331);
       _errHandler->sync(this);
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 162, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 176, _ctx)) {
       case 1: {
-        setState(1226);
+        setState(1318);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::ALL
 
         || _la == ClickHouseParser::ANY) {
-          setState(1225);
+          setState(1317);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::ALL
 
@@ -9764,38 +10439,38 @@ ClickHouseParser::JoinOpContext* ClickHouseParser::joinOp() {
             consume();
           }
         }
-        setState(1228);
+        setState(1320);
         match(ClickHouseParser::FULL);
-        setState(1230);
+        setState(1322);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1229);
+          setState(1321);
           match(ClickHouseParser::OUTER);
         }
         break;
       }
 
       case 2: {
-        setState(1232);
+        setState(1324);
         match(ClickHouseParser::FULL);
-        setState(1234);
+        setState(1326);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::OUTER) {
-          setState(1233);
+          setState(1325);
           match(ClickHouseParser::OUTER);
         }
-        setState(1237);
+        setState(1329);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::ALL
 
         || _la == ClickHouseParser::ANY) {
-          setState(1236);
+          setState(1328);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::ALL
 
@@ -9867,28 +10542,28 @@ antlrcpp::Any ClickHouseParser::JoinOpCrossContext::accept(tree::ParseTreeVisito
 
 ClickHouseParser::JoinOpCrossContext* ClickHouseParser::joinOpCross() {
   JoinOpCrossContext *_localctx = _tracker.createInstance<JoinOpCrossContext>(_ctx, getState());
-  enterRule(_localctx, 132, ClickHouseParser::RuleJoinOpCross);
+  enterRule(_localctx, 138, ClickHouseParser::RuleJoinOpCross);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1249);
+    setState(1341);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::CROSS:
       case ClickHouseParser::GLOBAL:
       case ClickHouseParser::LOCAL: {
         enterOuterAlt(_localctx, 1);
-        setState(1244);
+        setState(1336);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
         if (_la == ClickHouseParser::GLOBAL
 
         || _la == ClickHouseParser::LOCAL) {
-          setState(1243);
+          setState(1335);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::GLOBAL
 
@@ -9900,16 +10575,16 @@ ClickHouseParser::JoinOpCrossContext* ClickHouseParser::joinOpCross() {
             consume();
           }
         }
-        setState(1246);
+        setState(1338);
         match(ClickHouseParser::CROSS);
-        setState(1247);
+        setState(1339);
         match(ClickHouseParser::JOIN);
         break;
       }
 
       case ClickHouseParser::COMMA: {
         enterOuterAlt(_localctx, 2);
-        setState(1248);
+        setState(1340);
         match(ClickHouseParser::COMMA);
         break;
       }
@@ -9969,42 +10644,42 @@ antlrcpp::Any ClickHouseParser::JoinConstraintClauseContext::accept(tree::ParseT
 
 ClickHouseParser::JoinConstraintClauseContext* ClickHouseParser::joinConstraintClause() {
   JoinConstraintClauseContext *_localctx = _tracker.createInstance<JoinConstraintClauseContext>(_ctx, getState());
-  enterRule(_localctx, 134, ClickHouseParser::RuleJoinConstraintClause);
+  enterRule(_localctx, 140, ClickHouseParser::RuleJoinConstraintClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1260);
+    setState(1352);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 166, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 180, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1251);
+      setState(1343);
       match(ClickHouseParser::ON);
-      setState(1252);
+      setState(1344);
       columnExprList();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1253);
+      setState(1345);
       match(ClickHouseParser::USING);
-      setState(1254);
+      setState(1346);
       match(ClickHouseParser::LPAREN);
-      setState(1255);
+      setState(1347);
       columnExprList();
-      setState(1256);
+      setState(1348);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     case 3: {
       enterOuterAlt(_localctx, 3);
-      setState(1258);
+      setState(1350);
       match(ClickHouseParser::USING);
-      setState(1259);
+      setState(1351);
       columnExprList();
       break;
     }
@@ -10058,25 +10733,25 @@ antlrcpp::Any ClickHouseParser::SampleClauseContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::SampleClauseContext* ClickHouseParser::sampleClause() {
   SampleClauseContext *_localctx = _tracker.createInstance<SampleClauseContext>(_ctx, getState());
-  enterRule(_localctx, 136, ClickHouseParser::RuleSampleClause);
+  enterRule(_localctx, 142, ClickHouseParser::RuleSampleClause);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1262);
+    setState(1354);
     match(ClickHouseParser::SAMPLE);
-    setState(1263);
+    setState(1355);
     ratioExpr();
-    setState(1266);
+    setState(1358);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 167, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 181, _ctx)) {
     case 1: {
-      setState(1264);
+      setState(1356);
       match(ClickHouseParser::OFFSET);
-      setState(1265);
+      setState(1357);
       ratioExpr();
       break;
     }
@@ -10130,7 +10805,7 @@ antlrcpp::Any ClickHouseParser::LimitExprContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::LimitExprContext* ClickHouseParser::limitExpr() {
   LimitExprContext *_localctx = _tracker.createInstance<LimitExprContext>(_ctx, getState());
-  enterRule(_localctx, 138, ClickHouseParser::RuleLimitExpr);
+  enterRule(_localctx, 144, ClickHouseParser::RuleLimitExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -10138,14 +10813,14 @@ ClickHouseParser::LimitExprContext* ClickHouseParser::limitExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1268);
+    setState(1360);
     columnExpr(0);
-    setState(1271);
+    setState(1363);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::OFFSET || _la == ClickHouseParser::COMMA) {
-      setState(1269);
+      setState(1361);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::OFFSET || _la == ClickHouseParser::COMMA)) {
       _errHandler->recoverInline(this);
@@ -10154,7 +10829,7 @@ ClickHouseParser::LimitExprContext* ClickHouseParser::limitExpr() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1270);
+      setState(1362);
       columnExpr(0);
     }
    
@@ -10205,7 +10880,7 @@ antlrcpp::Any ClickHouseParser::OrderExprListContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::OrderExprListContext* ClickHouseParser::orderExprList() {
   OrderExprListContext *_localctx = _tracker.createInstance<OrderExprListContext>(_ctx, getState());
-  enterRule(_localctx, 140, ClickHouseParser::RuleOrderExprList);
+  enterRule(_localctx, 146, ClickHouseParser::RuleOrderExprList);
 
   auto onExit = finally([=] {
     exitRule();
@@ -10213,21 +10888,21 @@ ClickHouseParser::OrderExprListContext* ClickHouseParser::orderExprList() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1273);
+    setState(1365);
     orderExpr();
-    setState(1278);
+    setState(1370);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 169, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 183, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(1274);
+        setState(1366);
         match(ClickHouseParser::COMMA);
-        setState(1275);
+        setState(1367);
         orderExpr(); 
       }
-      setState(1280);
+      setState(1372);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 169, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 183, _ctx);
     }
    
   }
@@ -10297,7 +10972,7 @@ antlrcpp::Any ClickHouseParser::OrderExprContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::OrderExprContext* ClickHouseParser::orderExpr() {
   OrderExprContext *_localctx = _tracker.createInstance<OrderExprContext>(_ctx, getState());
-  enterRule(_localctx, 142, ClickHouseParser::RuleOrderExpr);
+  enterRule(_localctx, 148, ClickHouseParser::RuleOrderExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -10305,14 +10980,14 @@ ClickHouseParser::OrderExprContext* ClickHouseParser::orderExpr() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1281);
+    setState(1373);
     columnExpr(0);
-    setState(1283);
+    setState(1375);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 170, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 184, _ctx)) {
     case 1: {
-      setState(1282);
+      setState(1374);
       _la = _input->LA(1);
       if (!((((_la & ~ 0x3fULL) == 0) &&
         ((1ULL << _la) & ((1ULL << ClickHouseParser::ASCENDING)
@@ -10328,14 +11003,14 @@ ClickHouseParser::OrderExprContext* ClickHouseParser::orderExpr() {
     }
 
     }
-    setState(1287);
+    setState(1379);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 171, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 185, _ctx)) {
     case 1: {
-      setState(1285);
+      setState(1377);
       match(ClickHouseParser::NULLS);
-      setState(1286);
+      setState(1378);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::FIRST
 
@@ -10350,14 +11025,14 @@ ClickHouseParser::OrderExprContext* ClickHouseParser::orderExpr() {
     }
 
     }
-    setState(1291);
+    setState(1383);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 172, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 186, _ctx)) {
     case 1: {
-      setState(1289);
+      setState(1381);
       match(ClickHouseParser::COLLATE);
-      setState(1290);
+      setState(1382);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -10407,23 +11082,23 @@ antlrcpp::Any ClickHouseParser::RatioExprContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::RatioExprContext* ClickHouseParser::ratioExpr() {
   RatioExprContext *_localctx = _tracker.createInstance<RatioExprContext>(_ctx, getState());
-  enterRule(_localctx, 144, ClickHouseParser::RuleRatioExpr);
+  enterRule(_localctx, 150, ClickHouseParser::RuleRatioExpr);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1293);
+    setState(1385);
     numberLiteral();
-    setState(1296);
+    setState(1388);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 173, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 187, _ctx)) {
     case 1: {
-      setState(1294);
+      setState(1386);
       match(ClickHouseParser::SLASH);
-      setState(1295);
+      setState(1387);
       numberLiteral();
       break;
     }
@@ -10477,7 +11152,7 @@ antlrcpp::Any ClickHouseParser::SettingExprListContext::accept(tree::ParseTreeVi
 
 ClickHouseParser::SettingExprListContext* ClickHouseParser::settingExprList() {
   SettingExprListContext *_localctx = _tracker.createInstance<SettingExprListContext>(_ctx, getState());
-  enterRule(_localctx, 146, ClickHouseParser::RuleSettingExprList);
+  enterRule(_localctx, 152, ClickHouseParser::RuleSettingExprList);
 
   auto onExit = finally([=] {
     exitRule();
@@ -10485,21 +11160,21 @@ ClickHouseParser::SettingExprListContext* ClickHouseParser::settingExprList() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1298);
+    setState(1390);
     settingExpr();
-    setState(1303);
+    setState(1395);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 174, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 188, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(1299);
+        setState(1391);
         match(ClickHouseParser::COMMA);
-        setState(1300);
+        setState(1392);
         settingExpr(); 
       }
-      setState(1305);
+      setState(1397);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 174, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 188, _ctx);
     }
    
   }
@@ -10545,18 +11220,18 @@ antlrcpp::Any ClickHouseParser::SettingExprContext::accept(tree::ParseTreeVisito
 
 ClickHouseParser::SettingExprContext* ClickHouseParser::settingExpr() {
   SettingExprContext *_localctx = _tracker.createInstance<SettingExprContext>(_ctx, getState());
-  enterRule(_localctx, 148, ClickHouseParser::RuleSettingExpr);
+  enterRule(_localctx, 154, ClickHouseParser::RuleSettingExpr);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1306);
+    setState(1398);
     identifier();
-    setState(1307);
+    setState(1399);
     match(ClickHouseParser::EQ_SINGLE);
-    setState(1308);
+    setState(1400);
     literal();
    
   }
@@ -10598,16 +11273,16 @@ antlrcpp::Any ClickHouseParser::SetStmtContext::accept(tree::ParseTreeVisitor *v
 
 ClickHouseParser::SetStmtContext* ClickHouseParser::setStmt() {
   SetStmtContext *_localctx = _tracker.createInstance<SetStmtContext>(_ctx, getState());
-  enterRule(_localctx, 150, ClickHouseParser::RuleSetStmt);
+  enterRule(_localctx, 156, ClickHouseParser::RuleSetStmt);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1310);
+    setState(1402);
     match(ClickHouseParser::SET);
-    setState(1311);
+    setState(1403);
     settingExprList();
    
   }
@@ -10819,26 +11494,26 @@ antlrcpp::Any ClickHouseParser::ShowCreateDictionaryStmtContext::accept(tree::Pa
 }
 ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
   ShowStmtContext *_localctx = _tracker.createInstance<ShowStmtContext>(_ctx, getState());
-  enterRule(_localctx, 152, ClickHouseParser::RuleShowStmt);
+  enterRule(_localctx, 158, ClickHouseParser::RuleShowStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1355);
+    setState(1447);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 182, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 196, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowCreateDatabaseStmtContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1313);
+      setState(1405);
       match(ClickHouseParser::SHOW);
-      setState(1314);
+      setState(1406);
       match(ClickHouseParser::CREATE);
-      setState(1315);
+      setState(1407);
       match(ClickHouseParser::DATABASE);
-      setState(1316);
+      setState(1408);
       databaseIdentifier();
       break;
     }
@@ -10846,13 +11521,13 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 2: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowCreateDictionaryStmtContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1317);
+      setState(1409);
       match(ClickHouseParser::SHOW);
-      setState(1318);
+      setState(1410);
       match(ClickHouseParser::CREATE);
-      setState(1319);
+      setState(1411);
       match(ClickHouseParser::DICTIONARY);
-      setState(1320);
+      setState(1412);
       tableIdentifier();
       break;
     }
@@ -10860,33 +11535,33 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 3: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowCreateTableStmtContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1321);
+      setState(1413);
       match(ClickHouseParser::SHOW);
-      setState(1322);
+      setState(1414);
       match(ClickHouseParser::CREATE);
-      setState(1324);
+      setState(1416);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 175, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 189, _ctx)) {
       case 1: {
-        setState(1323);
+        setState(1415);
         match(ClickHouseParser::TEMPORARY);
         break;
       }
 
       }
-      setState(1327);
+      setState(1419);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 176, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 190, _ctx)) {
       case 1: {
-        setState(1326);
+        setState(1418);
         match(ClickHouseParser::TABLE);
         break;
       }
 
       }
-      setState(1329);
+      setState(1421);
       tableIdentifier();
       break;
     }
@@ -10894,9 +11569,9 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 4: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowDatabasesStmtContext>(_localctx));
       enterOuterAlt(_localctx, 4);
-      setState(1330);
+      setState(1422);
       match(ClickHouseParser::SHOW);
-      setState(1331);
+      setState(1423);
       match(ClickHouseParser::DATABASES);
       break;
     }
@@ -10904,18 +11579,18 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 5: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowDictionariesStmtContext>(_localctx));
       enterOuterAlt(_localctx, 5);
-      setState(1332);
+      setState(1424);
       match(ClickHouseParser::SHOW);
-      setState(1333);
+      setState(1425);
       match(ClickHouseParser::DICTIONARIES);
-      setState(1336);
+      setState(1428);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::FROM) {
-        setState(1334);
+        setState(1426);
         match(ClickHouseParser::FROM);
-        setState(1335);
+        setState(1427);
         databaseIdentifier();
       }
       break;
@@ -10924,26 +11599,26 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
     case 6: {
       _localctx = dynamic_cast<ShowStmtContext *>(_tracker.createInstance<ClickHouseParser::ShowTablesStmtContext>(_localctx));
       enterOuterAlt(_localctx, 6);
-      setState(1338);
+      setState(1430);
       match(ClickHouseParser::SHOW);
-      setState(1340);
+      setState(1432);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::TEMPORARY) {
-        setState(1339);
+        setState(1431);
         match(ClickHouseParser::TEMPORARY);
       }
-      setState(1342);
+      setState(1434);
       match(ClickHouseParser::TABLES);
-      setState(1345);
+      setState(1437);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::FROM
 
       || _la == ClickHouseParser::IN) {
-        setState(1343);
+        setState(1435);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::FROM
 
@@ -10954,22 +11629,22 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
           _errHandler->reportMatch(this);
           consume();
         }
-        setState(1344);
+        setState(1436);
         databaseIdentifier();
       }
-      setState(1350);
+      setState(1442);
       _errHandler->sync(this);
       switch (_input->LA(1)) {
         case ClickHouseParser::LIKE: {
-          setState(1347);
+          setState(1439);
           match(ClickHouseParser::LIKE);
-          setState(1348);
+          setState(1440);
           match(ClickHouseParser::STRING_LITERAL);
           break;
         }
 
         case ClickHouseParser::WHERE: {
-          setState(1349);
+          setState(1441);
           whereClause();
           break;
         }
@@ -10985,12 +11660,12 @@ ClickHouseParser::ShowStmtContext* ClickHouseParser::showStmt() {
       default:
         break;
       }
-      setState(1353);
+      setState(1445);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::LIMIT) {
-        setState(1352);
+        setState(1444);
         limitClause();
       }
       break;
@@ -11097,69 +11772,69 @@ antlrcpp::Any ClickHouseParser::SystemStmtContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
   SystemStmtContext *_localctx = _tracker.createInstance<SystemStmtContext>(_ctx, getState());
-  enterRule(_localctx, 154, ClickHouseParser::RuleSystemStmt);
+  enterRule(_localctx, 160, ClickHouseParser::RuleSystemStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1391);
+    setState(1483);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 185, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 199, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1357);
+      setState(1449);
       match(ClickHouseParser::SYSTEM);
-      setState(1358);
+      setState(1450);
       match(ClickHouseParser::FLUSH);
-      setState(1359);
+      setState(1451);
       match(ClickHouseParser::DISTRIBUTED);
-      setState(1360);
+      setState(1452);
       tableIdentifier();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1361);
+      setState(1453);
       match(ClickHouseParser::SYSTEM);
-      setState(1362);
+      setState(1454);
       match(ClickHouseParser::FLUSH);
-      setState(1363);
+      setState(1455);
       match(ClickHouseParser::LOGS);
       break;
     }
 
     case 3: {
       enterOuterAlt(_localctx, 3);
-      setState(1364);
+      setState(1456);
       match(ClickHouseParser::SYSTEM);
-      setState(1365);
+      setState(1457);
       match(ClickHouseParser::RELOAD);
-      setState(1366);
+      setState(1458);
       match(ClickHouseParser::DICTIONARIES);
       break;
     }
 
     case 4: {
       enterOuterAlt(_localctx, 4);
-      setState(1367);
+      setState(1459);
       match(ClickHouseParser::SYSTEM);
-      setState(1368);
+      setState(1460);
       match(ClickHouseParser::RELOAD);
-      setState(1369);
+      setState(1461);
       match(ClickHouseParser::DICTIONARY);
-      setState(1370);
+      setState(1462);
       tableIdentifier();
       break;
     }
 
     case 5: {
       enterOuterAlt(_localctx, 5);
-      setState(1371);
+      setState(1463);
       match(ClickHouseParser::SYSTEM);
-      setState(1372);
+      setState(1464);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::START
 
@@ -11170,34 +11845,34 @@ ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1380);
+      setState(1472);
       _errHandler->sync(this);
       switch (_input->LA(1)) {
         case ClickHouseParser::DISTRIBUTED: {
-          setState(1373);
+          setState(1465);
           match(ClickHouseParser::DISTRIBUTED);
-          setState(1374);
+          setState(1466);
           match(ClickHouseParser::SENDS);
           break;
         }
 
         case ClickHouseParser::FETCHES: {
-          setState(1375);
+          setState(1467);
           match(ClickHouseParser::FETCHES);
           break;
         }
 
         case ClickHouseParser::MERGES:
         case ClickHouseParser::TTL: {
-          setState(1377);
+          setState(1469);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::TTL) {
-            setState(1376);
+            setState(1468);
             match(ClickHouseParser::TTL);
           }
-          setState(1379);
+          setState(1471);
           match(ClickHouseParser::MERGES);
           break;
         }
@@ -11205,16 +11880,16 @@ ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
       default:
         throw NoViableAltException(this);
       }
-      setState(1382);
+      setState(1474);
       tableIdentifier();
       break;
     }
 
     case 6: {
       enterOuterAlt(_localctx, 6);
-      setState(1383);
+      setState(1475);
       match(ClickHouseParser::SYSTEM);
-      setState(1384);
+      setState(1476);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::START
 
@@ -11225,22 +11900,22 @@ ClickHouseParser::SystemStmtContext* ClickHouseParser::systemStmt() {
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1385);
+      setState(1477);
       match(ClickHouseParser::REPLICATED);
-      setState(1386);
+      setState(1478);
       match(ClickHouseParser::SENDS);
       break;
     }
 
     case 7: {
       enterOuterAlt(_localctx, 7);
-      setState(1387);
+      setState(1479);
       match(ClickHouseParser::SYSTEM);
-      setState(1388);
+      setState(1480);
       match(ClickHouseParser::SYNC);
-      setState(1389);
+      setState(1481);
       match(ClickHouseParser::REPLICA);
-      setState(1390);
+      setState(1482);
       tableIdentifier();
       break;
     }
@@ -11306,7 +11981,7 @@ antlrcpp::Any ClickHouseParser::TruncateStmtContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::TruncateStmtContext* ClickHouseParser::truncateStmt() {
   TruncateStmtContext *_localctx = _tracker.createInstance<TruncateStmtContext>(_ctx, getState());
-  enterRule(_localctx, 156, ClickHouseParser::RuleTruncateStmt);
+  enterRule(_localctx, 162, ClickHouseParser::RuleTruncateStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -11314,51 +11989,51 @@ ClickHouseParser::TruncateStmtContext* ClickHouseParser::truncateStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1393);
+    setState(1485);
     match(ClickHouseParser::TRUNCATE);
-    setState(1395);
+    setState(1487);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 186, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 200, _ctx)) {
     case 1: {
-      setState(1394);
+      setState(1486);
       match(ClickHouseParser::TEMPORARY);
       break;
     }
 
     }
-    setState(1398);
+    setState(1490);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 187, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 201, _ctx)) {
     case 1: {
-      setState(1397);
+      setState(1489);
       match(ClickHouseParser::TABLE);
       break;
     }
 
     }
-    setState(1402);
+    setState(1494);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 188, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 202, _ctx)) {
     case 1: {
-      setState(1400);
+      setState(1492);
       match(ClickHouseParser::IF);
-      setState(1401);
+      setState(1493);
       match(ClickHouseParser::EXISTS);
       break;
     }
 
     }
-    setState(1404);
+    setState(1496);
     tableIdentifier();
-    setState(1406);
+    setState(1498);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::ON) {
-      setState(1405);
+      setState(1497);
       clusterClause();
     }
    
@@ -11401,16 +12076,16 @@ antlrcpp::Any ClickHouseParser::UseStmtContext::accept(tree::ParseTreeVisitor *v
 
 ClickHouseParser::UseStmtContext* ClickHouseParser::useStmt() {
   UseStmtContext *_localctx = _tracker.createInstance<UseStmtContext>(_ctx, getState());
-  enterRule(_localctx, 158, ClickHouseParser::RuleUseStmt);
+  enterRule(_localctx, 164, ClickHouseParser::RuleUseStmt);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1408);
+    setState(1500);
     match(ClickHouseParser::USE);
-    setState(1409);
+    setState(1501);
     databaseIdentifier();
    
   }
@@ -11464,7 +12139,7 @@ antlrcpp::Any ClickHouseParser::WatchStmtContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::WatchStmtContext* ClickHouseParser::watchStmt() {
   WatchStmtContext *_localctx = _tracker.createInstance<WatchStmtContext>(_ctx, getState());
-  enterRule(_localctx, 160, ClickHouseParser::RuleWatchStmt);
+  enterRule(_localctx, 166, ClickHouseParser::RuleWatchStmt);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -11472,26 +12147,26 @@ ClickHouseParser::WatchStmtContext* ClickHouseParser::watchStmt() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1411);
+    setState(1503);
     match(ClickHouseParser::WATCH);
-    setState(1412);
+    setState(1504);
     tableIdentifier();
-    setState(1414);
+    setState(1506);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::EVENTS) {
-      setState(1413);
+      setState(1505);
       match(ClickHouseParser::EVENTS);
     }
-    setState(1418);
+    setState(1510);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::LIMIT) {
-      setState(1416);
+      setState(1508);
       match(ClickHouseParser::LIMIT);
-      setState(1417);
+      setState(1509);
       match(ClickHouseParser::DECIMAL_LITERAL);
     }
    
@@ -11685,20 +12360,20 @@ antlrcpp::Any ClickHouseParser::ColumnTypeExprEnumContext::accept(tree::ParseTre
 }
 ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
   ColumnTypeExprContext *_localctx = _tracker.createInstance<ColumnTypeExprContext>(_ctx, getState());
-  enterRule(_localctx, 162, ClickHouseParser::RuleColumnTypeExpr);
+  enterRule(_localctx, 168, ClickHouseParser::RuleColumnTypeExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1467);
+    setState(1559);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 196, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 210, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprSimpleContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1420);
+      setState(1512);
       identifier();
       break;
     }
@@ -11706,29 +12381,29 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 2: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprNestedContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1421);
+      setState(1513);
       identifier();
-      setState(1422);
+      setState(1514);
       match(ClickHouseParser::LPAREN);
-      setState(1423);
+      setState(1515);
       identifier();
-      setState(1424);
+      setState(1516);
       columnTypeExpr();
-      setState(1431);
+      setState(1523);
       _errHandler->sync(this);
       _la = _input->LA(1);
       while (_la == ClickHouseParser::COMMA) {
-        setState(1425);
+        setState(1517);
         match(ClickHouseParser::COMMA);
-        setState(1426);
+        setState(1518);
         identifier();
-        setState(1427);
+        setState(1519);
         columnTypeExpr();
-        setState(1433);
+        setState(1525);
         _errHandler->sync(this);
         _la = _input->LA(1);
       }
-      setState(1434);
+      setState(1526);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -11736,25 +12411,25 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 3: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprEnumContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1436);
+      setState(1528);
       identifier();
-      setState(1437);
+      setState(1529);
       match(ClickHouseParser::LPAREN);
-      setState(1438);
+      setState(1530);
       enumValue();
-      setState(1443);
+      setState(1535);
       _errHandler->sync(this);
       _la = _input->LA(1);
       while (_la == ClickHouseParser::COMMA) {
-        setState(1439);
+        setState(1531);
         match(ClickHouseParser::COMMA);
-        setState(1440);
+        setState(1532);
         enumValue();
-        setState(1445);
+        setState(1537);
         _errHandler->sync(this);
         _la = _input->LA(1);
       }
-      setState(1446);
+      setState(1538);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -11762,25 +12437,25 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 4: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprComplexContext>(_localctx));
       enterOuterAlt(_localctx, 4);
-      setState(1448);
+      setState(1540);
       identifier();
-      setState(1449);
+      setState(1541);
       match(ClickHouseParser::LPAREN);
-      setState(1450);
+      setState(1542);
       columnTypeExpr();
-      setState(1455);
+      setState(1547);
       _errHandler->sync(this);
       _la = _input->LA(1);
       while (_la == ClickHouseParser::COMMA) {
-        setState(1451);
+        setState(1543);
         match(ClickHouseParser::COMMA);
-        setState(1452);
+        setState(1544);
         columnTypeExpr();
-        setState(1457);
+        setState(1549);
         _errHandler->sync(this);
         _la = _input->LA(1);
       }
-      setState(1458);
+      setState(1550);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -11788,11 +12463,11 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
     case 5: {
       _localctx = dynamic_cast<ColumnTypeExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnTypeExprParamContext>(_localctx));
       enterOuterAlt(_localctx, 5);
-      setState(1460);
+      setState(1552);
       identifier();
-      setState(1461);
+      setState(1553);
       match(ClickHouseParser::LPAREN);
-      setState(1463);
+      setState(1555);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -11895,6 +12570,7 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
         | (1ULL << (ClickHouseParser::LOCAL - 64))
         | (1ULL << (ClickHouseParser::LOGS - 64))
         | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+        | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
         | (1ULL << (ClickHouseParser::MAX - 64))
         | (1ULL << (ClickHouseParser::MERGES - 64))
         | (1ULL << (ClickHouseParser::MIN - 64))
@@ -11920,10 +12596,10 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
         | (1ULL << (ClickHouseParser::PREWHERE - 64))
         | (1ULL << (ClickHouseParser::PRIMARY - 64))
         | (1ULL << (ClickHouseParser::QUARTER - 64))
-        | (1ULL << (ClickHouseParser::RANGE - 64))
-        | (1ULL << (ClickHouseParser::RELOAD - 64))
-        | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+        | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+        | (1ULL << (ClickHouseParser::REMOVE - 128))
+        | (1ULL << (ClickHouseParser::RENAME - 128))
         | (1ULL << (ClickHouseParser::REPLACE - 128))
         | (1ULL << (ClickHouseParser::REPLICA - 128))
         | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -11982,16 +12658,16 @@ ClickHouseParser::ColumnTypeExprContext* ClickHouseParser::columnTypeExpr() {
         | (1ULL << (ClickHouseParser::DECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::HEXADECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::STRING_LITERAL - 128))
-        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 194) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
-        | (1ULL << (ClickHouseParser::DOT - 194))
-        | (1ULL << (ClickHouseParser::LBRACKET - 194))
-        | (1ULL << (ClickHouseParser::LPAREN - 194))
-        | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(1462);
+        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 196) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 196)) & ((1ULL << (ClickHouseParser::DASH - 196))
+        | (1ULL << (ClickHouseParser::DOT - 196))
+        | (1ULL << (ClickHouseParser::LBRACKET - 196))
+        | (1ULL << (ClickHouseParser::LPAREN - 196))
+        | (1ULL << (ClickHouseParser::PLUS - 196)))) != 0)) {
+        setState(1554);
         columnExprList();
       }
-      setState(1465);
+      setState(1557);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -12045,7 +12721,7 @@ antlrcpp::Any ClickHouseParser::ColumnExprListContext::accept(tree::ParseTreeVis
 
 ClickHouseParser::ColumnExprListContext* ClickHouseParser::columnExprList() {
   ColumnExprListContext *_localctx = _tracker.createInstance<ColumnExprListContext>(_ctx, getState());
-  enterRule(_localctx, 164, ClickHouseParser::RuleColumnExprList);
+  enterRule(_localctx, 170, ClickHouseParser::RuleColumnExprList);
 
   auto onExit = finally([=] {
     exitRule();
@@ -12053,21 +12729,21 @@ ClickHouseParser::ColumnExprListContext* ClickHouseParser::columnExprList() {
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1469);
+    setState(1561);
     columnsExpr();
-    setState(1474);
+    setState(1566);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 197, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 211, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
-        setState(1470);
+        setState(1562);
         match(ClickHouseParser::COMMA);
-        setState(1471);
+        setState(1563);
         columnsExpr(); 
       }
-      setState(1476);
+      setState(1568);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 197, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 211, _ctx);
     }
    
   }
@@ -12158,20 +12834,20 @@ antlrcpp::Any ClickHouseParser::ColumnsExprSubqueryContext::accept(tree::ParseTr
 }
 ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
   ColumnsExprContext *_localctx = _tracker.createInstance<ColumnsExprContext>(_ctx, getState());
-  enterRule(_localctx, 166, ClickHouseParser::RuleColumnsExpr);
+  enterRule(_localctx, 172, ClickHouseParser::RuleColumnsExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1488);
+    setState(1580);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 199, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 213, _ctx)) {
     case 1: {
       _localctx = dynamic_cast<ColumnsExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnsExprAsteriskContext>(_localctx));
       enterOuterAlt(_localctx, 1);
-      setState(1480);
+      setState(1572);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -12273,6 +12949,7 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
         | (1ULL << (ClickHouseParser::LOCAL - 64))
         | (1ULL << (ClickHouseParser::LOGS - 64))
         | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+        | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
         | (1ULL << (ClickHouseParser::MAX - 64))
         | (1ULL << (ClickHouseParser::MERGES - 64))
         | (1ULL << (ClickHouseParser::MIN - 64))
@@ -12296,10 +12973,10 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
         | (1ULL << (ClickHouseParser::PREWHERE - 64))
         | (1ULL << (ClickHouseParser::PRIMARY - 64))
         | (1ULL << (ClickHouseParser::QUARTER - 64))
-        | (1ULL << (ClickHouseParser::RANGE - 64))
-        | (1ULL << (ClickHouseParser::RELOAD - 64))
-        | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+        | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+        | (1ULL << (ClickHouseParser::REMOVE - 128))
+        | (1ULL << (ClickHouseParser::RENAME - 128))
         | (1ULL << (ClickHouseParser::REPLACE - 128))
         | (1ULL << (ClickHouseParser::REPLICA - 128))
         | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -12353,12 +13030,12 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
         | (1ULL << (ClickHouseParser::JSON_FALSE - 128))
         | (1ULL << (ClickHouseParser::JSON_TRUE - 128))
         | (1ULL << (ClickHouseParser::IDENTIFIER - 128)))) != 0)) {
-        setState(1477);
+        setState(1569);
         tableIdentifier();
-        setState(1478);
+        setState(1570);
         match(ClickHouseParser::DOT);
       }
-      setState(1482);
+      setState(1574);
       match(ClickHouseParser::ASTERISK);
       break;
     }
@@ -12366,11 +13043,11 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
     case 2: {
       _localctx = dynamic_cast<ColumnsExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnsExprSubqueryContext>(_localctx));
       enterOuterAlt(_localctx, 2);
-      setState(1483);
+      setState(1575);
       match(ClickHouseParser::LPAREN);
-      setState(1484);
+      setState(1576);
       selectUnionStmt();
-      setState(1485);
+      setState(1577);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -12378,7 +13055,7 @@ ClickHouseParser::ColumnsExprContext* ClickHouseParser::columnsExpr() {
     case 3: {
       _localctx = dynamic_cast<ColumnsExprContext *>(_tracker.createInstance<ClickHouseParser::ColumnsExprColumnContext>(_localctx));
       enterOuterAlt(_localctx, 3);
-      setState(1487);
+      setState(1579);
       columnExpr(0);
       break;
     }
@@ -13248,8 +13925,8 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
   ClickHouseParser::ColumnExprContext *_localctx = _tracker.createInstance<ColumnExprContext>(_ctx, parentState);
   ClickHouseParser::ColumnExprContext *previousContext = _localctx;
   (void)previousContext; // Silence compiler, in case the context is not used by generated code.
-  size_t startState = 168;
-  enterRecursionRule(_localctx, 168, ClickHouseParser::RuleColumnExpr, precedence);
+  size_t startState = 174;
+  enterRecursionRule(_localctx, 174, ClickHouseParser::RuleColumnExpr, precedence);
 
     size_t _la = 0;
 
@@ -13259,54 +13936,54 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1597);
+    setState(1689);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 210, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 224, _ctx)) {
     case 1: {
       _localctx = _tracker.createInstance<ColumnExprCaseContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
 
-      setState(1491);
+      setState(1583);
       match(ClickHouseParser::CASE);
-      setState(1493);
+      setState(1585);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 200, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 214, _ctx)) {
       case 1: {
-        setState(1492);
+        setState(1584);
         columnExpr(0);
         break;
       }
 
       }
-      setState(1500); 
+      setState(1592); 
       _errHandler->sync(this);
       _la = _input->LA(1);
       do {
-        setState(1495);
+        setState(1587);
         match(ClickHouseParser::WHEN);
-        setState(1496);
+        setState(1588);
         columnExpr(0);
-        setState(1497);
+        setState(1589);
         match(ClickHouseParser::THEN);
-        setState(1498);
+        setState(1590);
         columnExpr(0);
-        setState(1502); 
+        setState(1594); 
         _errHandler->sync(this);
         _la = _input->LA(1);
       } while (_la == ClickHouseParser::WHEN);
-      setState(1506);
+      setState(1598);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::ELSE) {
-        setState(1504);
+        setState(1596);
         match(ClickHouseParser::ELSE);
-        setState(1505);
+        setState(1597);
         columnExpr(0);
       }
-      setState(1508);
+      setState(1600);
       match(ClickHouseParser::END);
       break;
     }
@@ -13315,17 +13992,17 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprCastContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1510);
+      setState(1602);
       match(ClickHouseParser::CAST);
-      setState(1511);
+      setState(1603);
       match(ClickHouseParser::LPAREN);
-      setState(1512);
+      setState(1604);
       columnExpr(0);
-      setState(1513);
+      setState(1605);
       match(ClickHouseParser::AS);
-      setState(1514);
+      setState(1606);
       columnTypeExpr();
-      setState(1515);
+      setState(1607);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13334,9 +14011,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprDateContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1517);
+      setState(1609);
       match(ClickHouseParser::DATE);
-      setState(1518);
+      setState(1610);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -13345,17 +14022,17 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprExtractContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1519);
+      setState(1611);
       match(ClickHouseParser::EXTRACT);
-      setState(1520);
+      setState(1612);
       match(ClickHouseParser::LPAREN);
-      setState(1521);
+      setState(1613);
       interval();
-      setState(1522);
+      setState(1614);
       match(ClickHouseParser::FROM);
-      setState(1523);
+      setState(1615);
       columnExpr(0);
-      setState(1524);
+      setState(1616);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13364,11 +14041,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprIntervalContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1526);
+      setState(1618);
       match(ClickHouseParser::INTERVAL);
-      setState(1527);
+      setState(1619);
       columnExpr(0);
-      setState(1528);
+      setState(1620);
       interval();
       break;
     }
@@ -13377,27 +14054,27 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprSubstringContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1530);
+      setState(1622);
       match(ClickHouseParser::SUBSTRING);
-      setState(1531);
+      setState(1623);
       match(ClickHouseParser::LPAREN);
-      setState(1532);
+      setState(1624);
       columnExpr(0);
-      setState(1533);
+      setState(1625);
       match(ClickHouseParser::FROM);
-      setState(1534);
+      setState(1626);
       columnExpr(0);
-      setState(1537);
+      setState(1629);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
       if (_la == ClickHouseParser::FOR) {
-        setState(1535);
+        setState(1627);
         match(ClickHouseParser::FOR);
-        setState(1536);
+        setState(1628);
         columnExpr(0);
       }
-      setState(1539);
+      setState(1631);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13406,9 +14083,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprTimestampContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1541);
+      setState(1633);
       match(ClickHouseParser::TIMESTAMP);
-      setState(1542);
+      setState(1634);
       match(ClickHouseParser::STRING_LITERAL);
       break;
     }
@@ -13417,11 +14094,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprTrimContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1543);
+      setState(1635);
       match(ClickHouseParser::TRIM);
-      setState(1544);
+      setState(1636);
       match(ClickHouseParser::LPAREN);
-      setState(1545);
+      setState(1637);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::BOTH || _la == ClickHouseParser::LEADING || _la == ClickHouseParser::TRAILING)) {
       _errHandler->recoverInline(this);
@@ -13430,13 +14107,13 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         _errHandler->reportMatch(this);
         consume();
       }
-      setState(1546);
+      setState(1638);
       match(ClickHouseParser::STRING_LITERAL);
-      setState(1547);
+      setState(1639);
       match(ClickHouseParser::FROM);
-      setState(1548);
+      setState(1640);
       columnExpr(0);
-      setState(1549);
+      setState(1641);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13445,16 +14122,16 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprFunctionContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1551);
+      setState(1643);
       identifier();
-      setState(1557);
+      setState(1649);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 205, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 219, _ctx)) {
       case 1: {
-        setState(1552);
+        setState(1644);
         match(ClickHouseParser::LPAREN);
-        setState(1554);
+        setState(1646);
         _errHandler->sync(this);
 
         _la = _input->LA(1);
@@ -13557,6 +14234,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           | (1ULL << (ClickHouseParser::LOCAL - 64))
           | (1ULL << (ClickHouseParser::LOGS - 64))
           | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+          | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
           | (1ULL << (ClickHouseParser::MAX - 64))
           | (1ULL << (ClickHouseParser::MERGES - 64))
           | (1ULL << (ClickHouseParser::MIN - 64))
@@ -13582,10 +14260,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           | (1ULL << (ClickHouseParser::PREWHERE - 64))
           | (1ULL << (ClickHouseParser::PRIMARY - 64))
           | (1ULL << (ClickHouseParser::QUARTER - 64))
-          | (1ULL << (ClickHouseParser::RANGE - 64))
-          | (1ULL << (ClickHouseParser::RELOAD - 64))
-          | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-          ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+          | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+          ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+          | (1ULL << (ClickHouseParser::REMOVE - 128))
+          | (1ULL << (ClickHouseParser::RENAME - 128))
           | (1ULL << (ClickHouseParser::REPLACE - 128))
           | (1ULL << (ClickHouseParser::REPLICA - 128))
           | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -13644,35 +14322,35 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           | (1ULL << (ClickHouseParser::DECIMAL_LITERAL - 128))
           | (1ULL << (ClickHouseParser::HEXADECIMAL_LITERAL - 128))
           | (1ULL << (ClickHouseParser::STRING_LITERAL - 128))
-          | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 194) & ~ 0x3fULL) == 0) &&
-          ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
-          | (1ULL << (ClickHouseParser::DOT - 194))
-          | (1ULL << (ClickHouseParser::LBRACKET - 194))
-          | (1ULL << (ClickHouseParser::LPAREN - 194))
-          | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-          setState(1553);
+          | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 196) & ~ 0x3fULL) == 0) &&
+          ((1ULL << (_la - 196)) & ((1ULL << (ClickHouseParser::DASH - 196))
+          | (1ULL << (ClickHouseParser::DOT - 196))
+          | (1ULL << (ClickHouseParser::LBRACKET - 196))
+          | (1ULL << (ClickHouseParser::LPAREN - 196))
+          | (1ULL << (ClickHouseParser::PLUS - 196)))) != 0)) {
+          setState(1645);
           columnExprList();
         }
-        setState(1556);
+        setState(1648);
         match(ClickHouseParser::RPAREN);
         break;
       }
 
       }
-      setState(1559);
+      setState(1651);
       match(ClickHouseParser::LPAREN);
-      setState(1561);
+      setState(1653);
       _errHandler->sync(this);
 
-      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 206, _ctx)) {
+      switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 220, _ctx)) {
       case 1: {
-        setState(1560);
+        setState(1652);
         match(ClickHouseParser::DISTINCT);
         break;
       }
 
       }
-      setState(1564);
+      setState(1656);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -13775,6 +14453,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::LOCAL - 64))
         | (1ULL << (ClickHouseParser::LOGS - 64))
         | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+        | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
         | (1ULL << (ClickHouseParser::MAX - 64))
         | (1ULL << (ClickHouseParser::MERGES - 64))
         | (1ULL << (ClickHouseParser::MIN - 64))
@@ -13800,10 +14479,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::PREWHERE - 64))
         | (1ULL << (ClickHouseParser::PRIMARY - 64))
         | (1ULL << (ClickHouseParser::QUARTER - 64))
-        | (1ULL << (ClickHouseParser::RANGE - 64))
-        | (1ULL << (ClickHouseParser::RELOAD - 64))
-        | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+        | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+        | (1ULL << (ClickHouseParser::REMOVE - 128))
+        | (1ULL << (ClickHouseParser::RENAME - 128))
         | (1ULL << (ClickHouseParser::REPLACE - 128))
         | (1ULL << (ClickHouseParser::REPLICA - 128))
         | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -13862,16 +14541,16 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::DECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::HEXADECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::STRING_LITERAL - 128))
-        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 194) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
-        | (1ULL << (ClickHouseParser::DOT - 194))
-        | (1ULL << (ClickHouseParser::LBRACKET - 194))
-        | (1ULL << (ClickHouseParser::LPAREN - 194))
-        | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(1563);
+        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 196) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 196)) & ((1ULL << (ClickHouseParser::DASH - 196))
+        | (1ULL << (ClickHouseParser::DOT - 196))
+        | (1ULL << (ClickHouseParser::LBRACKET - 196))
+        | (1ULL << (ClickHouseParser::LPAREN - 196))
+        | (1ULL << (ClickHouseParser::PLUS - 196)))) != 0)) {
+        setState(1655);
         columnArgList();
       }
-      setState(1566);
+      setState(1658);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -13880,7 +14559,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprLiteralContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1568);
+      setState(1660);
       literal();
       break;
     }
@@ -13889,9 +14568,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprNegateContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1569);
+      setState(1661);
       match(ClickHouseParser::DASH);
-      setState(1570);
+      setState(1662);
       columnExpr(17);
       break;
     }
@@ -13900,9 +14579,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprNotContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1571);
+      setState(1663);
       match(ClickHouseParser::NOT);
-      setState(1572);
+      setState(1664);
       columnExpr(12);
       break;
     }
@@ -13911,7 +14590,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprAsteriskContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1576);
+      setState(1668);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -14013,6 +14692,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::LOCAL - 64))
         | (1ULL << (ClickHouseParser::LOGS - 64))
         | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+        | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
         | (1ULL << (ClickHouseParser::MAX - 64))
         | (1ULL << (ClickHouseParser::MERGES - 64))
         | (1ULL << (ClickHouseParser::MIN - 64))
@@ -14036,10 +14716,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::PREWHERE - 64))
         | (1ULL << (ClickHouseParser::PRIMARY - 64))
         | (1ULL << (ClickHouseParser::QUARTER - 64))
-        | (1ULL << (ClickHouseParser::RANGE - 64))
-        | (1ULL << (ClickHouseParser::RELOAD - 64))
-        | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+        | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+        | (1ULL << (ClickHouseParser::REMOVE - 128))
+        | (1ULL << (ClickHouseParser::RENAME - 128))
         | (1ULL << (ClickHouseParser::REPLACE - 128))
         | (1ULL << (ClickHouseParser::REPLICA - 128))
         | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -14093,12 +14773,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::JSON_FALSE - 128))
         | (1ULL << (ClickHouseParser::JSON_TRUE - 128))
         | (1ULL << (ClickHouseParser::IDENTIFIER - 128)))) != 0)) {
-        setState(1573);
+        setState(1665);
         tableIdentifier();
-        setState(1574);
+        setState(1666);
         match(ClickHouseParser::DOT);
       }
-      setState(1578);
+      setState(1670);
       match(ClickHouseParser::ASTERISK);
       break;
     }
@@ -14107,11 +14787,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprSubqueryContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1579);
+      setState(1671);
       match(ClickHouseParser::LPAREN);
-      setState(1580);
+      setState(1672);
       selectUnionStmt();
-      setState(1581);
+      setState(1673);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -14120,11 +14800,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprParensContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1583);
+      setState(1675);
       match(ClickHouseParser::LPAREN);
-      setState(1584);
+      setState(1676);
       columnExpr(0);
-      setState(1585);
+      setState(1677);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -14133,11 +14813,11 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprTupleContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1587);
+      setState(1679);
       match(ClickHouseParser::LPAREN);
-      setState(1588);
+      setState(1680);
       columnExprList();
-      setState(1589);
+      setState(1681);
       match(ClickHouseParser::RPAREN);
       break;
     }
@@ -14146,9 +14826,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprArrayContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1591);
+      setState(1683);
       match(ClickHouseParser::LBRACKET);
-      setState(1593);
+      setState(1685);
       _errHandler->sync(this);
 
       _la = _input->LA(1);
@@ -14251,6 +14931,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::LOCAL - 64))
         | (1ULL << (ClickHouseParser::LOGS - 64))
         | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+        | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
         | (1ULL << (ClickHouseParser::MAX - 64))
         | (1ULL << (ClickHouseParser::MERGES - 64))
         | (1ULL << (ClickHouseParser::MIN - 64))
@@ -14276,10 +14957,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::PREWHERE - 64))
         | (1ULL << (ClickHouseParser::PRIMARY - 64))
         | (1ULL << (ClickHouseParser::QUARTER - 64))
-        | (1ULL << (ClickHouseParser::RANGE - 64))
-        | (1ULL << (ClickHouseParser::RELOAD - 64))
-        | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+        | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+        | (1ULL << (ClickHouseParser::REMOVE - 128))
+        | (1ULL << (ClickHouseParser::RENAME - 128))
         | (1ULL << (ClickHouseParser::REPLACE - 128))
         | (1ULL << (ClickHouseParser::REPLICA - 128))
         | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -14338,16 +15019,16 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
         | (1ULL << (ClickHouseParser::DECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::HEXADECIMAL_LITERAL - 128))
         | (1ULL << (ClickHouseParser::STRING_LITERAL - 128))
-        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 194) & ~ 0x3fULL) == 0) &&
-        ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
-        | (1ULL << (ClickHouseParser::DOT - 194))
-        | (1ULL << (ClickHouseParser::LBRACKET - 194))
-        | (1ULL << (ClickHouseParser::LPAREN - 194))
-        | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-        setState(1592);
+        | (1ULL << (ClickHouseParser::ASTERISK - 128)))) != 0) || ((((_la - 196) & ~ 0x3fULL) == 0) &&
+        ((1ULL << (_la - 196)) & ((1ULL << (ClickHouseParser::DASH - 196))
+        | (1ULL << (ClickHouseParser::DOT - 196))
+        | (1ULL << (ClickHouseParser::LBRACKET - 196))
+        | (1ULL << (ClickHouseParser::LPAREN - 196))
+        | (1ULL << (ClickHouseParser::PLUS - 196)))) != 0)) {
+        setState(1684);
         columnExprList();
       }
-      setState(1595);
+      setState(1687);
       match(ClickHouseParser::RBRACKET);
       break;
     }
@@ -14356,44 +15037,44 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
       _localctx = _tracker.createInstance<ColumnExprIdentifierContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1596);
+      setState(1688);
       columnIdentifier();
       break;
     }
 
     }
     _ctx->stop = _input->LT(-1);
-    setState(1670);
+    setState(1762);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 219, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 233, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
         if (!_parseListeners.empty())
           triggerExitRuleEvent();
         previousContext = _localctx;
-        setState(1668);
+        setState(1760);
         _errHandler->sync(this);
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 218, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 232, _ctx)) {
         case 1: {
           auto newContext = _tracker.createInstance<ColumnExprPrecedence1Context>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1599);
+          setState(1691);
 
           if (!(precpred(_ctx, 16))) throw FailedPredicateException(this, "precpred(_ctx, 16)");
-          setState(1600);
+          setState(1692);
           _la = _input->LA(1);
-          if (!(((((_la - 188) & ~ 0x3fULL) == 0) &&
-            ((1ULL << (_la - 188)) & ((1ULL << (ClickHouseParser::ASTERISK - 188))
-            | (1ULL << (ClickHouseParser::PERCENT - 188))
-            | (1ULL << (ClickHouseParser::SLASH - 188)))) != 0))) {
+          if (!(((((_la - 190) & ~ 0x3fULL) == 0) &&
+            ((1ULL << (_la - 190)) & ((1ULL << (ClickHouseParser::ASTERISK - 190))
+            | (1ULL << (ClickHouseParser::PERCENT - 190))
+            | (1ULL << (ClickHouseParser::SLASH - 190)))) != 0))) {
           _errHandler->recoverInline(this);
           }
           else {
             _errHandler->reportMatch(this);
             consume();
           }
-          setState(1601);
+          setState(1693);
           columnExpr(17);
           break;
         }
@@ -14402,22 +15083,22 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprPrecedence2Context>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1602);
+          setState(1694);
 
           if (!(precpred(_ctx, 15))) throw FailedPredicateException(this, "precpred(_ctx, 15)");
-          setState(1603);
+          setState(1695);
           _la = _input->LA(1);
-          if (!(((((_la - 193) & ~ 0x3fULL) == 0) &&
-            ((1ULL << (_la - 193)) & ((1ULL << (ClickHouseParser::CONCAT - 193))
-            | (1ULL << (ClickHouseParser::DASH - 193))
-            | (1ULL << (ClickHouseParser::PLUS - 193)))) != 0))) {
+          if (!(((((_la - 195) & ~ 0x3fULL) == 0) &&
+            ((1ULL << (_la - 195)) & ((1ULL << (ClickHouseParser::CONCAT - 195))
+            | (1ULL << (ClickHouseParser::DASH - 195))
+            | (1ULL << (ClickHouseParser::PLUS - 195)))) != 0))) {
           _errHandler->recoverInline(this);
           }
           else {
             _errHandler->reportMatch(this);
             consume();
           }
-          setState(1604);
+          setState(1696);
           columnExpr(16);
           break;
         }
@@ -14426,86 +15107,86 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprPrecedence3Context>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1605);
+          setState(1697);
 
           if (!(precpred(_ctx, 14))) throw FailedPredicateException(this, "precpred(_ctx, 14)");
-          setState(1624);
+          setState(1716);
           _errHandler->sync(this);
-          switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 214, _ctx)) {
+          switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 228, _ctx)) {
           case 1: {
-            setState(1606);
+            setState(1698);
             match(ClickHouseParser::EQ_DOUBLE);
             break;
           }
 
           case 2: {
-            setState(1607);
+            setState(1699);
             match(ClickHouseParser::EQ_SINGLE);
             break;
           }
 
           case 3: {
-            setState(1608);
+            setState(1700);
             match(ClickHouseParser::NOT_EQ);
             break;
           }
 
           case 4: {
-            setState(1609);
+            setState(1701);
             match(ClickHouseParser::LE);
             break;
           }
 
           case 5: {
-            setState(1610);
+            setState(1702);
             match(ClickHouseParser::GE);
             break;
           }
 
           case 6: {
-            setState(1611);
+            setState(1703);
             match(ClickHouseParser::LT);
             break;
           }
 
           case 7: {
-            setState(1612);
+            setState(1704);
             match(ClickHouseParser::GT);
             break;
           }
 
           case 8: {
-            setState(1614);
+            setState(1706);
             _errHandler->sync(this);
 
             _la = _input->LA(1);
             if (_la == ClickHouseParser::GLOBAL) {
-              setState(1613);
+              setState(1705);
               match(ClickHouseParser::GLOBAL);
             }
-            setState(1617);
+            setState(1709);
             _errHandler->sync(this);
 
             _la = _input->LA(1);
             if (_la == ClickHouseParser::NOT) {
-              setState(1616);
+              setState(1708);
               match(ClickHouseParser::NOT);
             }
-            setState(1619);
+            setState(1711);
             match(ClickHouseParser::IN);
             break;
           }
 
           case 9: {
-            setState(1621);
+            setState(1713);
             _errHandler->sync(this);
 
             _la = _input->LA(1);
             if (_la == ClickHouseParser::NOT) {
-              setState(1620);
+              setState(1712);
               match(ClickHouseParser::NOT);
             }
-            setState(1623);
+            setState(1715);
             _la = _input->LA(1);
             if (!(_la == ClickHouseParser::ILIKE
 
@@ -14520,7 +15201,7 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           }
 
           }
-          setState(1626);
+          setState(1718);
           columnExpr(15);
           break;
         }
@@ -14529,12 +15210,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprAndContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1627);
+          setState(1719);
 
           if (!(precpred(_ctx, 11))) throw FailedPredicateException(this, "precpred(_ctx, 11)");
-          setState(1628);
+          setState(1720);
           match(ClickHouseParser::AND);
-          setState(1629);
+          setState(1721);
           columnExpr(12);
           break;
         }
@@ -14543,12 +15224,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprOrContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1630);
+          setState(1722);
 
           if (!(precpred(_ctx, 10))) throw FailedPredicateException(this, "precpred(_ctx, 10)");
-          setState(1631);
+          setState(1723);
           match(ClickHouseParser::OR);
-          setState(1632);
+          setState(1724);
           columnExpr(11);
           break;
         }
@@ -14557,24 +15238,24 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprBetweenContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1633);
+          setState(1725);
 
           if (!(precpred(_ctx, 9))) throw FailedPredicateException(this, "precpred(_ctx, 9)");
-          setState(1635);
+          setState(1727);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::NOT) {
-            setState(1634);
+            setState(1726);
             match(ClickHouseParser::NOT);
           }
-          setState(1637);
+          setState(1729);
           match(ClickHouseParser::BETWEEN);
-          setState(1638);
+          setState(1730);
           columnExpr(0);
-          setState(1639);
+          setState(1731);
           match(ClickHouseParser::AND);
-          setState(1640);
+          setState(1732);
           columnExpr(10);
           break;
         }
@@ -14583,16 +15264,16 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprTernaryOpContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1642);
+          setState(1734);
 
           if (!(precpred(_ctx, 8))) throw FailedPredicateException(this, "precpred(_ctx, 8)");
-          setState(1643);
+          setState(1735);
           match(ClickHouseParser::QUERY);
-          setState(1644);
+          setState(1736);
           columnExpr(0);
-          setState(1645);
+          setState(1737);
           match(ClickHouseParser::COLON);
-          setState(1646);
+          setState(1738);
           columnExpr(8);
           break;
         }
@@ -14601,14 +15282,14 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprArrayAccessContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1648);
+          setState(1740);
 
           if (!(precpred(_ctx, 19))) throw FailedPredicateException(this, "precpred(_ctx, 19)");
-          setState(1649);
+          setState(1741);
           match(ClickHouseParser::LBRACKET);
-          setState(1650);
+          setState(1742);
           columnExpr(0);
-          setState(1651);
+          setState(1743);
           match(ClickHouseParser::RBRACKET);
           break;
         }
@@ -14617,12 +15298,12 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprTupleAccessContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1653);
+          setState(1745);
 
           if (!(precpred(_ctx, 18))) throw FailedPredicateException(this, "precpred(_ctx, 18)");
-          setState(1654);
+          setState(1746);
           match(ClickHouseParser::DOT);
-          setState(1655);
+          setState(1747);
           match(ClickHouseParser::DECIMAL_LITERAL);
           break;
         }
@@ -14631,20 +15312,20 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprIsNullContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1656);
+          setState(1748);
 
           if (!(precpred(_ctx, 13))) throw FailedPredicateException(this, "precpred(_ctx, 13)");
-          setState(1657);
+          setState(1749);
           match(ClickHouseParser::IS);
-          setState(1659);
+          setState(1751);
           _errHandler->sync(this);
 
           _la = _input->LA(1);
           if (_la == ClickHouseParser::NOT) {
-            setState(1658);
+            setState(1750);
             match(ClickHouseParser::NOT);
           }
-          setState(1661);
+          setState(1753);
           match(ClickHouseParser::NULL_SQL);
           break;
         }
@@ -14653,10 +15334,10 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
           auto newContext = _tracker.createInstance<ColumnExprAliasContext>(_tracker.createInstance<ColumnExprContext>(parentContext, parentState));
           _localctx = newContext;
           pushNewRecursionContext(newContext, startState, RuleColumnExpr);
-          setState(1662);
+          setState(1754);
 
           if (!(precpred(_ctx, 7))) throw FailedPredicateException(this, "precpred(_ctx, 7)");
-          setState(1666);
+          setState(1758);
           _errHandler->sync(this);
           switch (_input->LA(1)) {
             case ClickHouseParser::DATE:
@@ -14664,15 +15345,15 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
             case ClickHouseParser::ID:
             case ClickHouseParser::KEY:
             case ClickHouseParser::IDENTIFIER: {
-              setState(1663);
+              setState(1755);
               alias();
               break;
             }
 
             case ClickHouseParser::AS: {
-              setState(1664);
+              setState(1756);
               match(ClickHouseParser::AS);
-              setState(1665);
+              setState(1757);
               identifier();
               break;
             }
@@ -14685,9 +15366,9 @@ ClickHouseParser::ColumnExprContext* ClickHouseParser::columnExpr(int precedence
 
         } 
       }
-      setState(1672);
+      setState(1764);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 219, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 233, _ctx);
     }
   }
   catch (RecognitionException &e) {
@@ -14735,7 +15416,7 @@ antlrcpp::Any ClickHouseParser::ColumnArgListContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::ColumnArgListContext* ClickHouseParser::columnArgList() {
   ColumnArgListContext *_localctx = _tracker.createInstance<ColumnArgListContext>(_ctx, getState());
-  enterRule(_localctx, 170, ClickHouseParser::RuleColumnArgList);
+  enterRule(_localctx, 176, ClickHouseParser::RuleColumnArgList);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -14743,17 +15424,17 @@ ClickHouseParser::ColumnArgListContext* ClickHouseParser::columnArgList() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1673);
+    setState(1765);
     columnArgExpr();
-    setState(1678);
+    setState(1770);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(1674);
+      setState(1766);
       match(ClickHouseParser::COMMA);
-      setState(1675);
+      setState(1767);
       columnArgExpr();
-      setState(1680);
+      setState(1772);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -14797,25 +15478,25 @@ antlrcpp::Any ClickHouseParser::ColumnArgExprContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::ColumnArgExprContext* ClickHouseParser::columnArgExpr() {
   ColumnArgExprContext *_localctx = _tracker.createInstance<ColumnArgExprContext>(_ctx, getState());
-  enterRule(_localctx, 172, ClickHouseParser::RuleColumnArgExpr);
+  enterRule(_localctx, 178, ClickHouseParser::RuleColumnArgExpr);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1683);
+    setState(1775);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 221, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 235, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1681);
+      setState(1773);
       columnLambdaExpr();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1682);
+      setState(1774);
       columnExpr(0);
       break;
     }
@@ -14885,7 +15566,7 @@ antlrcpp::Any ClickHouseParser::ColumnLambdaExprContext::accept(tree::ParseTreeV
 
 ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr() {
   ColumnLambdaExprContext *_localctx = _tracker.createInstance<ColumnLambdaExprContext>(_ctx, getState());
-  enterRule(_localctx, 174, ClickHouseParser::RuleColumnLambdaExpr);
+  enterRule(_localctx, 180, ClickHouseParser::RuleColumnLambdaExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -14893,27 +15574,27 @@ ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr()
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1704);
+    setState(1796);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::LPAREN: {
-        setState(1685);
+        setState(1777);
         match(ClickHouseParser::LPAREN);
-        setState(1686);
+        setState(1778);
         identifier();
-        setState(1691);
+        setState(1783);
         _errHandler->sync(this);
         _la = _input->LA(1);
         while (_la == ClickHouseParser::COMMA) {
-          setState(1687);
+          setState(1779);
           match(ClickHouseParser::COMMA);
-          setState(1688);
+          setState(1780);
           identifier();
-          setState(1693);
+          setState(1785);
           _errHandler->sync(this);
           _la = _input->LA(1);
         }
-        setState(1694);
+        setState(1786);
         match(ClickHouseParser::RPAREN);
         break;
       }
@@ -15015,6 +15696,7 @@ ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr()
       case ClickHouseParser::LOCAL:
       case ClickHouseParser::LOGS:
       case ClickHouseParser::MATERIALIZED:
+      case ClickHouseParser::MATERIALIZE:
       case ClickHouseParser::MAX:
       case ClickHouseParser::MERGES:
       case ClickHouseParser::MIN:
@@ -15095,17 +15777,17 @@ ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr()
       case ClickHouseParser::JSON_FALSE:
       case ClickHouseParser::JSON_TRUE:
       case ClickHouseParser::IDENTIFIER: {
-        setState(1696);
+        setState(1788);
         identifier();
-        setState(1701);
+        setState(1793);
         _errHandler->sync(this);
         _la = _input->LA(1);
         while (_la == ClickHouseParser::COMMA) {
-          setState(1697);
+          setState(1789);
           match(ClickHouseParser::COMMA);
-          setState(1698);
+          setState(1790);
           identifier();
-          setState(1703);
+          setState(1795);
           _errHandler->sync(this);
           _la = _input->LA(1);
         }
@@ -15115,9 +15797,9 @@ ClickHouseParser::ColumnLambdaExprContext* ClickHouseParser::columnLambdaExpr()
     default:
       throw NoViableAltException(this);
     }
-    setState(1706);
+    setState(1798);
     match(ClickHouseParser::ARROW);
-    setState(1707);
+    setState(1799);
     columnExpr(0);
    
   }
@@ -15163,27 +15845,27 @@ antlrcpp::Any ClickHouseParser::ColumnIdentifierContext::accept(tree::ParseTreeV
 
 ClickHouseParser::ColumnIdentifierContext* ClickHouseParser::columnIdentifier() {
   ColumnIdentifierContext *_localctx = _tracker.createInstance<ColumnIdentifierContext>(_ctx, getState());
-  enterRule(_localctx, 176, ClickHouseParser::RuleColumnIdentifier);
+  enterRule(_localctx, 182, ClickHouseParser::RuleColumnIdentifier);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1712);
+    setState(1804);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 225, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 239, _ctx)) {
     case 1: {
-      setState(1709);
+      setState(1801);
       tableIdentifier();
-      setState(1710);
+      setState(1802);
       match(ClickHouseParser::DOT);
       break;
     }
 
     }
-    setState(1714);
+    setState(1806);
     nestedIdentifier();
    
   }
@@ -15229,23 +15911,23 @@ antlrcpp::Any ClickHouseParser::NestedIdentifierContext::accept(tree::ParseTreeV
 
 ClickHouseParser::NestedIdentifierContext* ClickHouseParser::nestedIdentifier() {
   NestedIdentifierContext *_localctx = _tracker.createInstance<NestedIdentifierContext>(_ctx, getState());
-  enterRule(_localctx, 178, ClickHouseParser::RuleNestedIdentifier);
+  enterRule(_localctx, 184, ClickHouseParser::RuleNestedIdentifier);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1716);
+    setState(1808);
     identifier();
-    setState(1719);
+    setState(1811);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 226, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 240, _ctx)) {
     case 1: {
-      setState(1717);
+      setState(1809);
       match(ClickHouseParser::DOT);
-      setState(1718);
+      setState(1810);
       identifier();
       break;
     }
@@ -15368,8 +16050,8 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
   ClickHouseParser::TableExprContext *_localctx = _tracker.createInstance<TableExprContext>(_ctx, parentState);
   ClickHouseParser::TableExprContext *previousContext = _localctx;
   (void)previousContext; // Silence compiler, in case the context is not used by generated code.
-  size_t startState = 180;
-  enterRecursionRule(_localctx, 180, ClickHouseParser::RuleTableExpr, precedence);
+  size_t startState = 186;
+  enterRecursionRule(_localctx, 186, ClickHouseParser::RuleTableExpr, precedence);
 
     
 
@@ -15379,15 +16061,15 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
   try {
     size_t alt;
     enterOuterAlt(_localctx, 1);
-    setState(1728);
+    setState(1820);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 227, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 241, _ctx)) {
     case 1: {
       _localctx = _tracker.createInstance<TableExprIdentifierContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
 
-      setState(1722);
+      setState(1814);
       tableIdentifier();
       break;
     }
@@ -15396,7 +16078,7 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
       _localctx = _tracker.createInstance<TableExprFunctionContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1723);
+      setState(1815);
       tableFunctionExpr();
       break;
     }
@@ -15405,20 +16087,20 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
       _localctx = _tracker.createInstance<TableExprSubqueryContext>(_localctx);
       _ctx = _localctx;
       previousContext = _localctx;
-      setState(1724);
+      setState(1816);
       match(ClickHouseParser::LPAREN);
-      setState(1725);
+      setState(1817);
       selectUnionStmt();
-      setState(1726);
+      setState(1818);
       match(ClickHouseParser::RPAREN);
       break;
     }
 
     }
     _ctx->stop = _input->LT(-1);
-    setState(1738);
+    setState(1830);
     _errHandler->sync(this);
-    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 229, _ctx);
+    alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 243, _ctx);
     while (alt != 2 && alt != atn::ATN::INVALID_ALT_NUMBER) {
       if (alt == 1) {
         if (!_parseListeners.empty())
@@ -15427,10 +16109,10 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
         auto newContext = _tracker.createInstance<TableExprAliasContext>(_tracker.createInstance<TableExprContext>(parentContext, parentState));
         _localctx = newContext;
         pushNewRecursionContext(newContext, startState, RuleTableExpr);
-        setState(1730);
+        setState(1822);
 
         if (!(precpred(_ctx, 1))) throw FailedPredicateException(this, "precpred(_ctx, 1)");
-        setState(1734);
+        setState(1826);
         _errHandler->sync(this);
         switch (_input->LA(1)) {
           case ClickHouseParser::DATE:
@@ -15438,15 +16120,15 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
           case ClickHouseParser::ID:
           case ClickHouseParser::KEY:
           case ClickHouseParser::IDENTIFIER: {
-            setState(1731);
+            setState(1823);
             alias();
             break;
           }
 
           case ClickHouseParser::AS: {
-            setState(1732);
+            setState(1824);
             match(ClickHouseParser::AS);
-            setState(1733);
+            setState(1825);
             identifier();
             break;
           }
@@ -15455,9 +16137,9 @@ ClickHouseParser::TableExprContext* ClickHouseParser::tableExpr(int precedence)
           throw NoViableAltException(this);
         } 
       }
-      setState(1740);
+      setState(1832);
       _errHandler->sync(this);
-      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 229, _ctx);
+      alt = getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 243, _ctx);
     }
   }
   catch (RecognitionException &e) {
@@ -15505,7 +16187,7 @@ antlrcpp::Any ClickHouseParser::TableFunctionExprContext::accept(tree::ParseTree
 
 ClickHouseParser::TableFunctionExprContext* ClickHouseParser::tableFunctionExpr() {
   TableFunctionExprContext *_localctx = _tracker.createInstance<TableFunctionExprContext>(_ctx, getState());
-  enterRule(_localctx, 182, ClickHouseParser::RuleTableFunctionExpr);
+  enterRule(_localctx, 188, ClickHouseParser::RuleTableFunctionExpr);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -15513,11 +16195,11 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::tableFunctionExpr(
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1741);
+    setState(1833);
     identifier();
-    setState(1742);
+    setState(1834);
     match(ClickHouseParser::LPAREN);
-    setState(1744);
+    setState(1836);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
@@ -15620,6 +16302,7 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::tableFunctionExpr(
       | (1ULL << (ClickHouseParser::LOCAL - 64))
       | (1ULL << (ClickHouseParser::LOGS - 64))
       | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+      | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
       | (1ULL << (ClickHouseParser::MAX - 64))
       | (1ULL << (ClickHouseParser::MERGES - 64))
       | (1ULL << (ClickHouseParser::MIN - 64))
@@ -15645,10 +16328,10 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::tableFunctionExpr(
       | (1ULL << (ClickHouseParser::PREWHERE - 64))
       | (1ULL << (ClickHouseParser::PRIMARY - 64))
       | (1ULL << (ClickHouseParser::QUARTER - 64))
-      | (1ULL << (ClickHouseParser::RANGE - 64))
-      | (1ULL << (ClickHouseParser::RELOAD - 64))
-      | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+      | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+      | (1ULL << (ClickHouseParser::REMOVE - 128))
+      | (1ULL << (ClickHouseParser::RENAME - 128))
       | (1ULL << (ClickHouseParser::REPLACE - 128))
       | (1ULL << (ClickHouseParser::REPLICA - 128))
       | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -15706,14 +16389,14 @@ ClickHouseParser::TableFunctionExprContext* ClickHouseParser::tableFunctionExpr(
       | (1ULL << (ClickHouseParser::OCTAL_LITERAL - 128))
       | (1ULL << (ClickHouseParser::DECIMAL_LITERAL - 128))
       | (1ULL << (ClickHouseParser::HEXADECIMAL_LITERAL - 128))
-      | (1ULL << (ClickHouseParser::STRING_LITERAL - 128)))) != 0) || ((((_la - 194) & ~ 0x3fULL) == 0) &&
-      ((1ULL << (_la - 194)) & ((1ULL << (ClickHouseParser::DASH - 194))
-      | (1ULL << (ClickHouseParser::DOT - 194))
-      | (1ULL << (ClickHouseParser::PLUS - 194)))) != 0)) {
-      setState(1743);
+      | (1ULL << (ClickHouseParser::STRING_LITERAL - 128)))) != 0) || ((((_la - 196) & ~ 0x3fULL) == 0) &&
+      ((1ULL << (_la - 196)) & ((1ULL << (ClickHouseParser::DASH - 196))
+      | (1ULL << (ClickHouseParser::DOT - 196))
+      | (1ULL << (ClickHouseParser::PLUS - 196)))) != 0)) {
+      setState(1835);
       tableArgList();
     }
-    setState(1746);
+    setState(1838);
     match(ClickHouseParser::RPAREN);
    
   }
@@ -15759,27 +16442,27 @@ antlrcpp::Any ClickHouseParser::TableIdentifierContext::accept(tree::ParseTreeVi
 
 ClickHouseParser::TableIdentifierContext* ClickHouseParser::tableIdentifier() {
   TableIdentifierContext *_localctx = _tracker.createInstance<TableIdentifierContext>(_ctx, getState());
-  enterRule(_localctx, 184, ClickHouseParser::RuleTableIdentifier);
+  enterRule(_localctx, 190, ClickHouseParser::RuleTableIdentifier);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1751);
+    setState(1843);
     _errHandler->sync(this);
 
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 231, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 245, _ctx)) {
     case 1: {
-      setState(1748);
+      setState(1840);
       databaseIdentifier();
-      setState(1749);
+      setState(1841);
       match(ClickHouseParser::DOT);
       break;
     }
 
     }
-    setState(1753);
+    setState(1845);
     identifier();
    
   }
@@ -15829,7 +16512,7 @@ antlrcpp::Any ClickHouseParser::TableArgListContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::TableArgListContext* ClickHouseParser::tableArgList() {
   TableArgListContext *_localctx = _tracker.createInstance<TableArgListContext>(_ctx, getState());
-  enterRule(_localctx, 186, ClickHouseParser::RuleTableArgList);
+  enterRule(_localctx, 192, ClickHouseParser::RuleTableArgList);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -15837,17 +16520,17 @@ ClickHouseParser::TableArgListContext* ClickHouseParser::tableArgList() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1755);
+    setState(1847);
     tableArgExpr();
-    setState(1760);
+    setState(1852);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == ClickHouseParser::COMMA) {
-      setState(1756);
+      setState(1848);
       match(ClickHouseParser::COMMA);
-      setState(1757);
+      setState(1849);
       tableArgExpr();
-      setState(1762);
+      setState(1854);
       _errHandler->sync(this);
       _la = _input->LA(1);
     }
@@ -15895,32 +16578,32 @@ antlrcpp::Any ClickHouseParser::TableArgExprContext::accept(tree::ParseTreeVisit
 
 ClickHouseParser::TableArgExprContext* ClickHouseParser::tableArgExpr() {
   TableArgExprContext *_localctx = _tracker.createInstance<TableArgExprContext>(_ctx, getState());
-  enterRule(_localctx, 188, ClickHouseParser::RuleTableArgExpr);
+  enterRule(_localctx, 194, ClickHouseParser::RuleTableArgExpr);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1766);
+    setState(1858);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 233, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 247, _ctx)) {
     case 1: {
       enterOuterAlt(_localctx, 1);
-      setState(1763);
+      setState(1855);
       tableIdentifier();
       break;
     }
 
     case 2: {
       enterOuterAlt(_localctx, 2);
-      setState(1764);
+      setState(1856);
       tableFunctionExpr();
       break;
     }
 
     case 3: {
       enterOuterAlt(_localctx, 3);
-      setState(1765);
+      setState(1857);
       literal();
       break;
     }
@@ -15962,14 +16645,14 @@ antlrcpp::Any ClickHouseParser::DatabaseIdentifierContext::accept(tree::ParseTre
 
 ClickHouseParser::DatabaseIdentifierContext* ClickHouseParser::databaseIdentifier() {
   DatabaseIdentifierContext *_localctx = _tracker.createInstance<DatabaseIdentifierContext>(_ctx, getState());
-  enterRule(_localctx, 190, ClickHouseParser::RuleDatabaseIdentifier);
+  enterRule(_localctx, 196, ClickHouseParser::RuleDatabaseIdentifier);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1768);
+    setState(1860);
     identifier();
    
   }
@@ -16023,28 +16706,28 @@ antlrcpp::Any ClickHouseParser::FloatingLiteralContext::accept(tree::ParseTreeVi
 
 ClickHouseParser::FloatingLiteralContext* ClickHouseParser::floatingLiteral() {
   FloatingLiteralContext *_localctx = _tracker.createInstance<FloatingLiteralContext>(_ctx, getState());
-  enterRule(_localctx, 192, ClickHouseParser::RuleFloatingLiteral);
+  enterRule(_localctx, 198, ClickHouseParser::RuleFloatingLiteral);
   size_t _la = 0;
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1778);
+    setState(1870);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::FLOATING_LITERAL: {
         enterOuterAlt(_localctx, 1);
-        setState(1770);
+        setState(1862);
         match(ClickHouseParser::FLOATING_LITERAL);
         break;
       }
 
       case ClickHouseParser::DOT: {
         enterOuterAlt(_localctx, 2);
-        setState(1771);
+        setState(1863);
         match(ClickHouseParser::DOT);
-        setState(1772);
+        setState(1864);
         _la = _input->LA(1);
         if (!(_la == ClickHouseParser::OCTAL_LITERAL
 
@@ -16060,16 +16743,16 @@ ClickHouseParser::FloatingLiteralContext* ClickHouseParser::floatingLiteral() {
 
       case ClickHouseParser::DECIMAL_LITERAL: {
         enterOuterAlt(_localctx, 3);
-        setState(1773);
+        setState(1865);
         match(ClickHouseParser::DECIMAL_LITERAL);
-        setState(1774);
+        setState(1866);
         match(ClickHouseParser::DOT);
-        setState(1776);
+        setState(1868);
         _errHandler->sync(this);
 
-        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 234, _ctx)) {
+        switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 248, _ctx)) {
         case 1: {
-          setState(1775);
+          setState(1867);
           _la = _input->LA(1);
           if (!(_la == ClickHouseParser::OCTAL_LITERAL
 
@@ -16154,7 +16837,7 @@ antlrcpp::Any ClickHouseParser::NumberLiteralContext::accept(tree::ParseTreeVisi
 
 ClickHouseParser::NumberLiteralContext* ClickHouseParser::numberLiteral() {
   NumberLiteralContext *_localctx = _tracker.createInstance<NumberLiteralContext>(_ctx, getState());
-  enterRule(_localctx, 194, ClickHouseParser::RuleNumberLiteral);
+  enterRule(_localctx, 200, ClickHouseParser::RuleNumberLiteral);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -16162,14 +16845,14 @@ ClickHouseParser::NumberLiteralContext* ClickHouseParser::numberLiteral() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1781);
+    setState(1873);
     _errHandler->sync(this);
 
     _la = _input->LA(1);
     if (_la == ClickHouseParser::DASH
 
     || _la == ClickHouseParser::PLUS) {
-      setState(1780);
+      setState(1872);
       _la = _input->LA(1);
       if (!(_la == ClickHouseParser::DASH
 
@@ -16181,41 +16864,41 @@ ClickHouseParser::NumberLiteralContext* ClickHouseParser::numberLiteral() {
         consume();
       }
     }
-    setState(1789);
+    setState(1881);
     _errHandler->sync(this);
-    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 237, _ctx)) {
+    switch (getInterpreter<atn::ParserATNSimulator>()->adaptivePredict(_input, 251, _ctx)) {
     case 1: {
-      setState(1783);
+      setState(1875);
       floatingLiteral();
       break;
     }
 
     case 2: {
-      setState(1784);
+      setState(1876);
       match(ClickHouseParser::OCTAL_LITERAL);
       break;
     }
 
     case 3: {
-      setState(1785);
+      setState(1877);
       match(ClickHouseParser::DECIMAL_LITERAL);
       break;
     }
 
     case 4: {
-      setState(1786);
+      setState(1878);
       match(ClickHouseParser::HEXADECIMAL_LITERAL);
       break;
     }
 
     case 5: {
-      setState(1787);
+      setState(1879);
       match(ClickHouseParser::INF);
       break;
     }
 
     case 6: {
-      setState(1788);
+      setState(1880);
       match(ClickHouseParser::NAN_SQL);
       break;
     }
@@ -16265,13 +16948,13 @@ antlrcpp::Any ClickHouseParser::LiteralContext::accept(tree::ParseTreeVisitor *v
 
 ClickHouseParser::LiteralContext* ClickHouseParser::literal() {
   LiteralContext *_localctx = _tracker.createInstance<LiteralContext>(_ctx, getState());
-  enterRule(_localctx, 196, ClickHouseParser::RuleLiteral);
+  enterRule(_localctx, 202, ClickHouseParser::RuleLiteral);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1794);
+    setState(1886);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::INF:
@@ -16284,21 +16967,21 @@ ClickHouseParser::LiteralContext* ClickHouseParser::literal() {
       case ClickHouseParser::DOT:
       case ClickHouseParser::PLUS: {
         enterOuterAlt(_localctx, 1);
-        setState(1791);
+        setState(1883);
         numberLiteral();
         break;
       }
 
       case ClickHouseParser::STRING_LITERAL: {
         enterOuterAlt(_localctx, 2);
-        setState(1792);
+        setState(1884);
         match(ClickHouseParser::STRING_LITERAL);
         break;
       }
 
       case ClickHouseParser::NULL_SQL: {
         enterOuterAlt(_localctx, 3);
-        setState(1793);
+        setState(1885);
         match(ClickHouseParser::NULL_SQL);
         break;
       }
@@ -16370,7 +17053,7 @@ antlrcpp::Any ClickHouseParser::IntervalContext::accept(tree::ParseTreeVisitor *
 
 ClickHouseParser::IntervalContext* ClickHouseParser::interval() {
   IntervalContext *_localctx = _tracker.createInstance<IntervalContext>(_ctx, getState());
-  enterRule(_localctx, 198, ClickHouseParser::RuleInterval);
+  enterRule(_localctx, 204, ClickHouseParser::RuleInterval);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -16378,16 +17061,16 @@ ClickHouseParser::IntervalContext* ClickHouseParser::interval() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1796);
+    setState(1888);
     _la = _input->LA(1);
     if (!(_la == ClickHouseParser::DAY || ((((_la - 72) & ~ 0x3fULL) == 0) &&
       ((1ULL << (_la - 72)) & ((1ULL << (ClickHouseParser::HOUR - 72))
       | (1ULL << (ClickHouseParser::MINUTE - 72))
       | (1ULL << (ClickHouseParser::MONTH - 72))
-      | (1ULL << (ClickHouseParser::QUARTER - 72))
-      | (1ULL << (ClickHouseParser::SECOND - 72)))) != 0) || _la == ClickHouseParser::WEEK
-
-    || _la == ClickHouseParser::YEAR)) {
+      | (1ULL << (ClickHouseParser::QUARTER - 72)))) != 0) || ((((_la - 137) & ~ 0x3fULL) == 0) &&
+      ((1ULL << (_la - 137)) & ((1ULL << (ClickHouseParser::SECOND - 137))
+      | (1ULL << (ClickHouseParser::WEEK - 137))
+      | (1ULL << (ClickHouseParser::YEAR - 137)))) != 0))) {
     _errHandler->recoverInline(this);
     }
     else {
@@ -16795,6 +17478,10 @@ tree::TerminalNode* ClickHouseParser::KeywordContext::LOGS() {
   return getToken(ClickHouseParser::LOGS, 0);
 }
 
+tree::TerminalNode* ClickHouseParser::KeywordContext::MATERIALIZE() {
+  return getToken(ClickHouseParser::MATERIALIZE, 0);
+}
+
 tree::TerminalNode* ClickHouseParser::KeywordContext::MATERIALIZED() {
   return getToken(ClickHouseParser::MATERIALIZED, 0);
 }
@@ -17098,7 +17785,7 @@ antlrcpp::Any ClickHouseParser::KeywordContext::accept(tree::ParseTreeVisitor *v
 
 ClickHouseParser::KeywordContext* ClickHouseParser::keyword() {
   KeywordContext *_localctx = _tracker.createInstance<KeywordContext>(_ctx, getState());
-  enterRule(_localctx, 200, ClickHouseParser::RuleKeyword);
+  enterRule(_localctx, 206, ClickHouseParser::RuleKeyword);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -17106,7 +17793,7 @@ ClickHouseParser::KeywordContext* ClickHouseParser::keyword() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1798);
+    setState(1890);
     _la = _input->LA(1);
     if (!((((_la & ~ 0x3fULL) == 0) &&
       ((1ULL << _la) & ((1ULL << ClickHouseParser::AFTER)
@@ -17204,6 +17891,7 @@ ClickHouseParser::KeywordContext* ClickHouseParser::keyword() {
       | (1ULL << (ClickHouseParser::LOCAL - 64))
       | (1ULL << (ClickHouseParser::LOGS - 64))
       | (1ULL << (ClickHouseParser::MATERIALIZED - 64))
+      | (1ULL << (ClickHouseParser::MATERIALIZE - 64))
       | (1ULL << (ClickHouseParser::MAX - 64))
       | (1ULL << (ClickHouseParser::MERGES - 64))
       | (1ULL << (ClickHouseParser::MIN - 64))
@@ -17224,10 +17912,10 @@ ClickHouseParser::KeywordContext* ClickHouseParser::keyword() {
       | (1ULL << (ClickHouseParser::POPULATE - 64))
       | (1ULL << (ClickHouseParser::PREWHERE - 64))
       | (1ULL << (ClickHouseParser::PRIMARY - 64))
-      | (1ULL << (ClickHouseParser::RANGE - 64))
-      | (1ULL << (ClickHouseParser::RELOAD - 64))
-      | (1ULL << (ClickHouseParser::REMOVE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
-      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RENAME - 128))
+      | (1ULL << (ClickHouseParser::RANGE - 64)))) != 0) || ((((_la - 128) & ~ 0x3fULL) == 0) &&
+      ((1ULL << (_la - 128)) & ((1ULL << (ClickHouseParser::RELOAD - 128))
+      | (1ULL << (ClickHouseParser::REMOVE - 128))
+      | (1ULL << (ClickHouseParser::RENAME - 128))
       | (1ULL << (ClickHouseParser::REPLACE - 128))
       | (1ULL << (ClickHouseParser::REPLICA - 128))
       | (1ULL << (ClickHouseParser::REPLICATED - 128))
@@ -17331,7 +18019,7 @@ antlrcpp::Any ClickHouseParser::KeywordForAliasContext::accept(tree::ParseTreeVi
 
 ClickHouseParser::KeywordForAliasContext* ClickHouseParser::keywordForAlias() {
   KeywordForAliasContext *_localctx = _tracker.createInstance<KeywordForAliasContext>(_ctx, getState());
-  enterRule(_localctx, 202, ClickHouseParser::RuleKeywordForAlias);
+  enterRule(_localctx, 208, ClickHouseParser::RuleKeywordForAlias);
   size_t _la = 0;
 
   auto onExit = finally([=] {
@@ -17339,7 +18027,7 @@ ClickHouseParser::KeywordForAliasContext* ClickHouseParser::keywordForAlias() {
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1800);
+    setState(1892);
     _la = _input->LA(1);
     if (!(((((_la - 33) & ~ 0x3fULL) == 0) &&
       ((1ULL << (_la - 33)) & ((1ULL << (ClickHouseParser::DATE - 33))
@@ -17392,18 +18080,18 @@ antlrcpp::Any ClickHouseParser::AliasContext::accept(tree::ParseTreeVisitor *vis
 
 ClickHouseParser::AliasContext* ClickHouseParser::alias() {
   AliasContext *_localctx = _tracker.createInstance<AliasContext>(_ctx, getState());
-  enterRule(_localctx, 204, ClickHouseParser::RuleAlias);
+  enterRule(_localctx, 210, ClickHouseParser::RuleAlias);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1804);
+    setState(1896);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::IDENTIFIER: {
         enterOuterAlt(_localctx, 1);
-        setState(1802);
+        setState(1894);
         match(ClickHouseParser::IDENTIFIER);
         break;
       }
@@ -17413,7 +18101,7 @@ ClickHouseParser::AliasContext* ClickHouseParser::alias() {
       case ClickHouseParser::ID:
       case ClickHouseParser::KEY: {
         enterOuterAlt(_localctx, 2);
-        setState(1803);
+        setState(1895);
         keywordForAlias();
         break;
       }
@@ -17465,18 +18153,18 @@ antlrcpp::Any ClickHouseParser::IdentifierContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::IdentifierContext* ClickHouseParser::identifier() {
   IdentifierContext *_localctx = _tracker.createInstance<IdentifierContext>(_ctx, getState());
-  enterRule(_localctx, 206, ClickHouseParser::RuleIdentifier);
+  enterRule(_localctx, 212, ClickHouseParser::RuleIdentifier);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1809);
+    setState(1901);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::IDENTIFIER: {
         enterOuterAlt(_localctx, 1);
-        setState(1806);
+        setState(1898);
         match(ClickHouseParser::IDENTIFIER);
         break;
       }
@@ -17490,7 +18178,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::identifier() {
       case ClickHouseParser::WEEK:
       case ClickHouseParser::YEAR: {
         enterOuterAlt(_localctx, 2);
-        setState(1807);
+        setState(1899);
         interval();
         break;
       }
@@ -17590,6 +18278,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::identifier() {
       case ClickHouseParser::LOCAL:
       case ClickHouseParser::LOGS:
       case ClickHouseParser::MATERIALIZED:
+      case ClickHouseParser::MATERIALIZE:
       case ClickHouseParser::MAX:
       case ClickHouseParser::MERGES:
       case ClickHouseParser::MIN:
@@ -17664,7 +18353,7 @@ ClickHouseParser::IdentifierContext* ClickHouseParser::identifier() {
       case ClickHouseParser::JSON_FALSE:
       case ClickHouseParser::JSON_TRUE: {
         enterOuterAlt(_localctx, 3);
-        setState(1808);
+        setState(1900);
         keyword();
         break;
       }
@@ -17712,13 +18401,13 @@ antlrcpp::Any ClickHouseParser::IdentifierOrNullContext::accept(tree::ParseTreeV
 
 ClickHouseParser::IdentifierOrNullContext* ClickHouseParser::identifierOrNull() {
   IdentifierOrNullContext *_localctx = _tracker.createInstance<IdentifierOrNullContext>(_ctx, getState());
-  enterRule(_localctx, 208, ClickHouseParser::RuleIdentifierOrNull);
+  enterRule(_localctx, 214, ClickHouseParser::RuleIdentifierOrNull);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
-    setState(1813);
+    setState(1905);
     _errHandler->sync(this);
     switch (_input->LA(1)) {
       case ClickHouseParser::AFTER:
@@ -17818,6 +18507,7 @@ ClickHouseParser::IdentifierOrNullContext* ClickHouseParser::identifierOrNull()
       case ClickHouseParser::LOCAL:
       case ClickHouseParser::LOGS:
       case ClickHouseParser::MATERIALIZED:
+      case ClickHouseParser::MATERIALIZE:
       case ClickHouseParser::MAX:
       case ClickHouseParser::MERGES:
       case ClickHouseParser::MIN:
@@ -17899,14 +18589,14 @@ ClickHouseParser::IdentifierOrNullContext* ClickHouseParser::identifierOrNull()
       case ClickHouseParser::JSON_TRUE:
       case ClickHouseParser::IDENTIFIER: {
         enterOuterAlt(_localctx, 1);
-        setState(1811);
+        setState(1903);
         identifier();
         break;
       }
 
       case ClickHouseParser::NULL_SQL: {
         enterOuterAlt(_localctx, 2);
-        setState(1812);
+        setState(1904);
         match(ClickHouseParser::NULL_SQL);
         break;
       }
@@ -17958,18 +18648,18 @@ antlrcpp::Any ClickHouseParser::EnumValueContext::accept(tree::ParseTreeVisitor
 
 ClickHouseParser::EnumValueContext* ClickHouseParser::enumValue() {
   EnumValueContext *_localctx = _tracker.createInstance<EnumValueContext>(_ctx, getState());
-  enterRule(_localctx, 210, ClickHouseParser::RuleEnumValue);
+  enterRule(_localctx, 216, ClickHouseParser::RuleEnumValue);
 
   auto onExit = finally([=] {
     exitRule();
   });
   try {
     enterOuterAlt(_localctx, 1);
-    setState(1815);
+    setState(1907);
     match(ClickHouseParser::STRING_LITERAL);
-    setState(1816);
+    setState(1908);
     match(ClickHouseParser::EQ_SINGLE);
-    setState(1817);
+    setState(1909);
     numberLiteral();
    
   }
@@ -17987,9 +18677,9 @@ bool ClickHouseParser::sempred(RuleContext *context, size_t ruleIndex, size_t pr
     case 12: return dictionaryAttrDfntSempred(dynamic_cast<DictionaryAttrDfntContext *>(context), predicateIndex);
     case 13: return dictionaryEngineClauseSempred(dynamic_cast<DictionaryEngineClauseContext *>(context), predicateIndex);
     case 26: return engineClauseSempred(dynamic_cast<EngineClauseContext *>(context), predicateIndex);
-    case 64: return joinExprSempred(dynamic_cast<JoinExprContext *>(context), predicateIndex);
-    case 84: return columnExprSempred(dynamic_cast<ColumnExprContext *>(context), predicateIndex);
-    case 90: return tableExprSempred(dynamic_cast<TableExprContext *>(context), predicateIndex);
+    case 67: return joinExprSempred(dynamic_cast<JoinExprContext *>(context), predicateIndex);
+    case 87: return columnExprSempred(dynamic_cast<ColumnExprContext *>(context), predicateIndex);
+    case 93: return tableExprSempred(dynamic_cast<TableExprContext *>(context), predicateIndex);
 
   default:
     break;
@@ -18098,21 +18788,22 @@ std::vector<std::string> ClickHouseParser::_ruleNames = {
   "clusterClause", "uuidClause", "destinationClause", "subqueryClause", 
   "tableSchemaClause", "engineClause", "partitionByClause", "primaryKeyClause", 
   "sampleByClause", "ttlClause", "engineExpr", "tableElementExpr", "tableColumnDfnt", 
-  "tableColumnPropertyExpr", "tableIndexDfnt", "codecExpr", "codecArgExpr", 
-  "ttlExpr", "describeStmt", "dropStmt", "existsStmt", "explainStmt", "insertStmt", 
-  "columnsClause", "dataClause", "killStmt", "optimizeStmt", "renameStmt", 
-  "selectUnionStmt", "selectStmtWithParens", "selectStmt", "withClause", 
-  "topClause", "fromClause", "arrayJoinClause", "prewhereClause", "whereClause", 
-  "groupByClause", "havingClause", "orderByClause", "limitByClause", "limitClause", 
-  "settingsClause", "joinExpr", "joinOp", "joinOpCross", "joinConstraintClause", 
-  "sampleClause", "limitExpr", "orderExprList", "orderExpr", "ratioExpr", 
-  "settingExprList", "settingExpr", "setStmt", "showStmt", "systemStmt", 
-  "truncateStmt", "useStmt", "watchStmt", "columnTypeExpr", "columnExprList", 
-  "columnsExpr", "columnExpr", "columnArgList", "columnArgExpr", "columnLambdaExpr", 
-  "columnIdentifier", "nestedIdentifier", "tableExpr", "tableFunctionExpr", 
-  "tableIdentifier", "tableArgList", "tableArgExpr", "databaseIdentifier", 
-  "floatingLiteral", "numberLiteral", "literal", "interval", "keyword", 
-  "keywordForAlias", "alias", "identifier", "identifierOrNull", "enumValue"
+  "tableColumnPropertyExpr", "tableIndexDfnt", "tableProjectionDfnt", "codecExpr", 
+  "codecArgExpr", "ttlExpr", "describeStmt", "dropStmt", "existsStmt", "explainStmt", 
+  "insertStmt", "columnsClause", "dataClause", "killStmt", "optimizeStmt", 
+  "renameStmt", "projectionSelectStmt", "selectUnionStmt", "selectStmtWithParens", 
+  "selectStmt", "withClause", "topClause", "fromClause", "arrayJoinClause", 
+  "prewhereClause", "whereClause", "groupByClause", "havingClause", "orderByClause", 
+  "projectionOrderByClause", "limitByClause", "limitClause", "settingsClause", 
+  "joinExpr", "joinOp", "joinOpCross", "joinConstraintClause", "sampleClause", 
+  "limitExpr", "orderExprList", "orderExpr", "ratioExpr", "settingExprList", 
+  "settingExpr", "setStmt", "showStmt", "systemStmt", "truncateStmt", "useStmt", 
+  "watchStmt", "columnTypeExpr", "columnExprList", "columnsExpr", "columnExpr", 
+  "columnArgList", "columnArgExpr", "columnLambdaExpr", "columnIdentifier", 
+  "nestedIdentifier", "tableExpr", "tableFunctionExpr", "tableIdentifier", 
+  "tableArgList", "tableArgExpr", "databaseIdentifier", "floatingLiteral", 
+  "numberLiteral", "literal", "interval", "keyword", "keywordForAlias", 
+  "alias", "identifier", "identifierOrNull", "enumValue"
 };
 
 std::vector<std::string> ClickHouseParser::_literalNames = {
@@ -18125,11 +18816,11 @@ std::vector<std::string> ClickHouseParser::_literalNames = {
   "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
   "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
   "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
-  "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "'false'", 
-  "'true'", "", "", "", "", "", "", "'->'", "'*'", "'`'", "'\\'", "':'", 
-  "','", "'||'", "'-'", "'.'", "'=='", "'='", "'>='", "'>'", "'{'", "'['", 
-  "'<='", "'('", "'<'", "", "'%'", "'+'", "'?'", "'\"'", "'''", "'}'", "']'", 
-  "')'", "';'", "'/'", "'_'"
+  "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", 
+  "", "'false'", "'true'", "", "", "", "", "", "", "'->'", "'*'", "'`'", 
+  "'\\'", "':'", "','", "'||'", "'-'", "'.'", "'=='", "'='", "'>='", "'>'", 
+  "'{'", "'['", "'<='", "'('", "'<'", "", "'%'", "'+'", "'?'", "'\"'", "'''", 
+  "'}'", "']'", "')'", "';'", "'/'", "'_'"
 };
 
 std::vector<std::string> ClickHouseParser::_symbolicNames = {
@@ -18146,16 +18837,16 @@ std::vector<std::string> ClickHouseParser::_symbolicNames = {
   "INDEX", "INF", "INJECTIVE", "INNER", "INSERT", "INTERVAL", "INTO", "IS", 
   "IS_OBJECT_ID", "JOIN", "KEY", "KILL", "LAST", "LAYOUT", "LEADING", "LEFT", 
   "LIFETIME", "LIKE", "LIMIT", "LIVE", "LOCAL", "LOGS", "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", "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", 
+  "MATERIALIZE", "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", "JSON_FALSE", "JSON_TRUE", "IDENTIFIER", "FLOATING_LITERAL", 
   "OCTAL_LITERAL", "DECIMAL_LITERAL", "HEXADECIMAL_LITERAL", "STRING_LITERAL", 
   "ARROW", "ASTERISK", "BACKQUOTE", "BACKSLASH", "COLON", "COMMA", "CONCAT", 
@@ -18185,7 +18876,7 @@ ClickHouseParser::Initializer::Initializer() {
 
   _serializedATN = {
     0x3, 0x608b, 0xa72a, 0x8133, 0xb9ed, 0x417c, 0x3be7, 0x7786, 0x5964, 
-    0x3, 0xdd, 0x71e, 0x4, 0x2, 0x9, 0x2, 0x4, 0x3, 0x9, 0x3, 0x4, 0x4, 
+    0x3, 0xdf, 0x77a, 0x4, 0x2, 0x9, 0x2, 0x4, 0x3, 0x9, 0x3, 0x4, 0x4, 
     0x9, 0x4, 0x4, 0x5, 0x9, 0x5, 0x4, 0x6, 0x9, 0x6, 0x4, 0x7, 0x9, 0x7, 
     0x4, 0x8, 0x9, 0x8, 0x4, 0x9, 0x9, 0x9, 0x4, 0xa, 0x9, 0xa, 0x4, 0xb, 
     0x9, 0xb, 0x4, 0xc, 0x9, 0xc, 0x4, 0xd, 0x9, 0xd, 0x4, 0xe, 0x9, 0xe, 
@@ -18217,275 +18908,290 @@ ClickHouseParser::Initializer::Initializer() {
     0x60, 0x9, 0x60, 0x4, 0x61, 0x9, 0x61, 0x4, 0x62, 0x9, 0x62, 0x4, 0x63, 
     0x9, 0x63, 0x4, 0x64, 0x9, 0x64, 0x4, 0x65, 0x9, 0x65, 0x4, 0x66, 0x9, 
     0x66, 0x4, 0x67, 0x9, 0x67, 0x4, 0x68, 0x9, 0x68, 0x4, 0x69, 0x9, 0x69, 
-    0x4, 0x6a, 0x9, 0x6a, 0x4, 0x6b, 0x9, 0x6b, 0x3, 0x2, 0x3, 0x2, 0x3, 
-    0x2, 0x3, 0x2, 0x5, 0x2, 0xdb, 0xa, 0x2, 0x3, 0x2, 0x3, 0x2, 0x5, 0x2, 
-    0xdf, 0xa, 0x2, 0x3, 0x2, 0x5, 0x2, 0xe2, 0xa, 0x2, 0x3, 0x2, 0x5, 0x2, 
-    0xe5, 0xa, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 
+    0x4, 0x6a, 0x9, 0x6a, 0x4, 0x6b, 0x9, 0x6b, 0x4, 0x6c, 0x9, 0x6c, 0x4, 
+    0x6d, 0x9, 0x6d, 0x4, 0x6e, 0x9, 0x6e, 0x3, 0x2, 0x3, 0x2, 0x3, 0x2, 
+    0x3, 0x2, 0x5, 0x2, 0xe1, 0xa, 0x2, 0x3, 0x2, 0x3, 0x2, 0x5, 0x2, 0xe5, 
+    0xa, 0x2, 0x3, 0x2, 0x5, 0x2, 0xe8, 0xa, 0x2, 0x3, 0x2, 0x5, 0x2, 0xeb, 
+    0xa, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 
     0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 
-    0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x5, 0x3, 0xf9, 
-    0xa, 0x3, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x5, 0x4, 0xff, 0xa, 
-    0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x7, 0x4, 0x104, 0xa, 0x4, 0xc, 0x4, 
-    0xe, 0x4, 0x107, 0xb, 0x4, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
-    0x5, 0x5, 0x5, 0x10e, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
-    0x113, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 
-    0x5, 0x11a, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x11f, 
-    0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x125, 0xa, 
-    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x12b, 0xa, 0x5, 
-    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x130, 0xa, 0x5, 0x3, 0x5, 0x3, 
-    0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x136, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 
+    0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x5, 0x3, 0xff, 0xa, 
+    0x3, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x5, 0x4, 0x105, 0xa, 0x4, 
+    0x3, 0x4, 0x3, 0x4, 0x3, 0x4, 0x7, 0x4, 0x10a, 0xa, 0x4, 0xc, 0x4, 0xe, 
+    0x4, 0x10d, 0xb, 0x4, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 
+    0x5, 0x5, 0x114, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x119, 
+    0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
+    0x120, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x125, 0xa, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x12c, 
+    0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x131, 0xa, 0x5, 0x3, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x137, 0xa, 0x5, 0x3, 0x5, 
+    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x13d, 0xa, 0x5, 0x3, 0x5, 0x3, 
+    0x5, 0x3, 0x5, 0x5, 0x5, 0x142, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 
+    0x3, 0x5, 0x5, 0x5, 0x148, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 
+    0x5, 0x14d, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
+    0x153, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x158, 0xa, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x15e, 0xa, 0x5, 
     0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 
-    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x144, 0xa, 0x5, 0x3, 0x5, 0x3, 
-    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x14b, 0xa, 0x5, 0x3, 0x5, 
-    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x152, 0xa, 0x5, 0x3, 
-    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x158, 0xa, 0x5, 0x3, 0x5, 
-    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
-    0x161, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
-    0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x16b, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 
-    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
-    0x175, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
+    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x16c, 0xa, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x173, 
+    0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
+    0x17a, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 
+    0x5, 0x181, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
+    0x187, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x18c, 0xa, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x192, 0xa, 0x5, 
+    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x197, 0xa, 0x5, 0x3, 0x5, 0x3, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x19d, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 
+    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x1a6, 0xa, 
     0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
-    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x189, 
-    0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 
-    0x5, 0x5, 0x191, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
+    0x5, 0x3, 0x5, 0x5, 0x5, 0x1b0, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 
+    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x1ba, 0xa, 
     0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
-    0x5, 0x3, 0x5, 0x5, 0x5, 0x1a0, 0xa, 0x5, 0x3, 0x6, 0x3, 0x6, 0x3, 0x6, 
-    0x7, 0x6, 0x1a5, 0xa, 0x6, 0xc, 0x6, 0xe, 0x6, 0x1a8, 0xb, 0x6, 0x3, 
-    0x7, 0x3, 0x7, 0x3, 0x7, 0x3, 0x7, 0x3, 0x8, 0x3, 0x8, 0x3, 0x9, 0x3, 
-    0x9, 0x3, 0x9, 0x3, 0x9, 0x3, 0x9, 0x5, 0x9, 0x1b5, 0xa, 0x9, 0x3, 0xa, 
-    0x3, 0xa, 0x3, 0xa, 0x3, 0xa, 0x5, 0xa, 0x1bb, 0xa, 0xa, 0x3, 0xb, 0x3, 
-    0xb, 0x3, 0xb, 0x3, 0xb, 0x5, 0xb, 0x1c1, 0xa, 0xb, 0x3, 0xc, 0x3, 0xc, 
-    0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1c8, 0xa, 0xc, 0x3, 0xc, 0x3, 
-    0xc, 0x5, 0xc, 0x1cc, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1cf, 0xa, 0xc, 
-    0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1d6, 0xa, 
-    0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1da, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 
-    0x1dd, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 
-    0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1e8, 0xa, 0xc, 0x3, 0xc, 
-    0x3, 0xc, 0x5, 0xc, 0x1ec, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1ef, 0xa, 
-    0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1f4, 0xa, 0xc, 0x5, 0xc, 
-    0x1f6, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x1f9, 0xa, 0xc, 0x3, 0xc, 0x5, 
-    0xc, 0x1fc, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 
-    0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x206, 0xa, 0xc, 0x3, 0xc, 0x3, 
-    0xc, 0x5, 0xc, 0x20a, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x20d, 0xa, 0xc, 
-    0x3, 0xc, 0x5, 0xc, 0x210, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 
-    0xc, 0x215, 0xa, 0xc, 0x5, 0xc, 0x217, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 
-    0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x21d, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 
-    0xc, 0x3, 0xc, 0x5, 0xc, 0x223, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 
-    0x227, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x22a, 0xa, 0xc, 0x3, 0xc, 0x5, 
-    0xc, 0x22d, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x230, 0xa, 0xc, 0x3, 0xc, 
-    0x5, 0xc, 0x233, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x238, 
-    0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x23e, 0xa, 
-    0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x242, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 
-    0x245, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x248, 0xa, 0xc, 0x3, 0xc, 0x3, 
-    0xc, 0x5, 0xc, 0x24c, 0xa, 0xc, 0x3, 0xd, 0x3, 0xd, 0x3, 0xd, 0x3, 0xd, 
-    0x7, 0xd, 0x252, 0xa, 0xd, 0xc, 0xd, 0xe, 0xd, 0x255, 0xb, 0xd, 0x3, 
-    0xd, 0x3, 0xd, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 0x1ce, 0xa, 0x5, 
+    0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x5, 0x5, 
+    0x1d6, 0xa, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
+    0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 0x5, 0x3, 
+    0x5, 0x5, 0x5, 0x1e5, 0xa, 0x5, 0x3, 0x6, 0x3, 0x6, 0x3, 0x6, 0x7, 0x6, 
+    0x1ea, 0xa, 0x6, 0xc, 0x6, 0xe, 0x6, 0x1ed, 0xb, 0x6, 0x3, 0x7, 0x3, 
+    0x7, 0x3, 0x7, 0x3, 0x7, 0x3, 0x8, 0x3, 0x8, 0x3, 0x9, 0x3, 0x9, 0x3, 
+    0x9, 0x3, 0x9, 0x3, 0x9, 0x5, 0x9, 0x1fa, 0xa, 0x9, 0x3, 0xa, 0x3, 0xa, 
+    0x3, 0xa, 0x3, 0xa, 0x5, 0xa, 0x200, 0xa, 0xa, 0x3, 0xb, 0x3, 0xb, 0x3, 
+    0xb, 0x3, 0xb, 0x5, 0xb, 0x206, 0xa, 0xb, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 
+    0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x20d, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 
+    0xc, 0x211, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x214, 0xa, 0xc, 0x3, 0xc, 
+    0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x21b, 0xa, 0xc, 0x3, 
+    0xc, 0x3, 0xc, 0x5, 0xc, 0x21f, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x222, 
+    0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 
+    0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x22d, 0xa, 0xc, 0x3, 0xc, 0x3, 
+    0xc, 0x5, 0xc, 0x231, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x234, 0xa, 0xc, 
+    0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x239, 0xa, 0xc, 0x5, 0xc, 0x23b, 
+    0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x23e, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x241, 
+    0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 
+    0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x24b, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 
+    0xc, 0x24f, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x252, 0xa, 0xc, 0x3, 0xc, 
+    0x5, 0xc, 0x255, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x25a, 
+    0xa, 0xc, 0x5, 0xc, 0x25c, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 
+    0xc, 0x5, 0xc, 0x262, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 
+    0x5, 0xc, 0x268, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x26c, 0xa, 
+    0xc, 0x3, 0xc, 0x5, 0xc, 0x26f, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x272, 
+    0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x275, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x278, 
+    0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x27d, 0xa, 0xc, 0x3, 
+    0xc, 0x3, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 0x283, 0xa, 0xc, 0x3, 0xc, 
+    0x3, 0xc, 0x5, 0xc, 0x287, 0xa, 0xc, 0x3, 0xc, 0x5, 0xc, 0x28a, 0xa, 
+    0xc, 0x3, 0xc, 0x5, 0xc, 0x28d, 0xa, 0xc, 0x3, 0xc, 0x3, 0xc, 0x5, 0xc, 
+    0x291, 0xa, 0xc, 0x3, 0xd, 0x3, 0xd, 0x3, 0xd, 0x3, 0xd, 0x7, 0xd, 0x297, 
+    0xa, 0xd, 0xc, 0xd, 0xe, 0xd, 0x29a, 0xb, 0xd, 0x3, 0xd, 0x3, 0xd, 0x3, 
     0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 
     0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 
-    0xe, 0x3, 0xe, 0x7, 0xe, 0x26e, 0xa, 0xe, 0xc, 0xe, 0xe, 0xe, 0x271, 
-    0xb, 0xe, 0x3, 0xf, 0x5, 0xf, 0x274, 0xa, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 
+    0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x3, 0xe, 0x7, 
+    0xe, 0x2b3, 0xa, 0xe, 0xc, 0xe, 0xe, 0xe, 0x2b6, 0xb, 0xe, 0x3, 0xf, 
+    0x5, 0xf, 0x2b9, 0xa, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 
     0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 
     0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 
-    0xf, 0x3, 0xf, 0x3, 0xf, 0x3, 0xf, 0x7, 0xf, 0x28a, 0xa, 0xf, 0xc, 0xf, 
-    0xe, 0xf, 0x28d, 0xb, 0xf, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 
-    0x3, 0x11, 0x3, 0x11, 0x3, 0x11, 0x3, 0x11, 0x5, 0x11, 0x297, 0xa, 0x11, 
-    0x3, 0x11, 0x5, 0x11, 0x29a, 0xa, 0x11, 0x3, 0x12, 0x3, 0x12, 0x3, 0x12, 
-    0x3, 0x12, 0x3, 0x12, 0x7, 0x12, 0x2a1, 0xa, 0x12, 0xc, 0x12, 0xe, 0x12, 
-    0x2a4, 0xb, 0x12, 0x3, 0x12, 0x3, 0x12, 0x3, 0x12, 0x3, 0x13, 0x3, 0x13, 
-    0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 
-    0x13, 0x3, 0x13, 0x3, 0x13, 0x5, 0x13, 0x2b4, 0xa, 0x13, 0x3, 0x13, 
-    0x3, 0x13, 0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x7, 
-    0x14, 0x2bd, 0xa, 0x14, 0xc, 0x14, 0xe, 0x14, 0x2c0, 0xb, 0x14, 0x3, 
-    0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 
-    0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 
-    0x15, 0x3, 0x15, 0x5, 0x15, 0x2d1, 0xa, 0x15, 0x3, 0x15, 0x3, 0x15, 
-    0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 0x17, 0x3, 
-    0x17, 0x3, 0x17, 0x3, 0x17, 0x5, 0x17, 0x2de, 0xa, 0x17, 0x3, 0x18, 
-    0x3, 0x18, 0x3, 0x18, 0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x1a, 0x3, 
-    0x1a, 0x3, 0x1a, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x7, 0x1b, 
-    0x2ed, 0xa, 0x1b, 0xc, 0x1b, 0xe, 0x1b, 0x2f0, 0xb, 0x1b, 0x3, 0x1b, 
-    0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x5, 0x1b, 0x2f8, 
-    0xa, 0x1b, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 
-    0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 
+    0xf, 0x3, 0xf, 0x7, 0xf, 0x2cf, 0xa, 0xf, 0xc, 0xf, 0xe, 0xf, 0x2d2, 
+    0xb, 0xf, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x10, 0x3, 0x11, 0x3, 
+    0x11, 0x3, 0x11, 0x3, 0x11, 0x5, 0x11, 0x2dc, 0xa, 0x11, 0x3, 0x11, 
+    0x5, 0x11, 0x2df, 0xa, 0x11, 0x3, 0x12, 0x3, 0x12, 0x3, 0x12, 0x3, 0x12, 
+    0x3, 0x12, 0x7, 0x12, 0x2e6, 0xa, 0x12, 0xc, 0x12, 0xe, 0x12, 0x2e9, 
+    0xb, 0x12, 0x3, 0x12, 0x3, 0x12, 0x3, 0x12, 0x3, 0x13, 0x3, 0x13, 0x3, 
+    0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 0x3, 0x13, 
+    0x3, 0x13, 0x3, 0x13, 0x5, 0x13, 0x2f9, 0xa, 0x13, 0x3, 0x13, 0x3, 0x13, 
+    0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x3, 0x14, 0x7, 0x14, 0x302, 
+    0xa, 0x14, 0xc, 0x14, 0xe, 0x14, 0x305, 0xb, 0x14, 0x3, 0x14, 0x3, 0x14, 
+    0x3, 0x14, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 
+    0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x15, 
+    0x5, 0x15, 0x316, 0xa, 0x15, 0x3, 0x15, 0x3, 0x15, 0x3, 0x16, 0x3, 0x16, 
+    0x3, 0x16, 0x3, 0x16, 0x3, 0x16, 0x3, 0x17, 0x3, 0x17, 0x3, 0x17, 0x3, 
+    0x17, 0x5, 0x17, 0x323, 0xa, 0x17, 0x3, 0x18, 0x3, 0x18, 0x3, 0x18, 
+    0x3, 0x19, 0x3, 0x19, 0x3, 0x19, 0x3, 0x1a, 0x3, 0x1a, 0x3, 0x1a, 0x3, 
+    0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x7, 0x1b, 0x332, 0xa, 0x1b, 
+    0xc, 0x1b, 0xe, 0x1b, 0x335, 0xb, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 
+    0x3, 0x1b, 0x3, 0x1b, 0x3, 0x1b, 0x5, 0x1b, 0x33d, 0xa, 0x1b, 0x3, 0x1c, 
     0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 
     0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 
-    0x7, 0x1c, 0x313, 0xa, 0x1c, 0xc, 0x1c, 0xe, 0x1c, 0x316, 0xb, 0x1c, 
-    0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1e, 0x3, 0x1e, 0x3, 
-    0x1e, 0x3, 0x1e, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x20, 
-    0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 0x7, 0x20, 0x328, 0xa, 0x20, 0xc, 0x20, 
-    0xe, 0x20, 0x32b, 0xb, 0x20, 0x3, 0x21, 0x3, 0x21, 0x5, 0x21, 0x32f, 
-    0xa, 0x21, 0x3, 0x21, 0x3, 0x21, 0x3, 0x21, 0x5, 0x21, 0x334, 0xa, 0x21, 
-    0x3, 0x21, 0x5, 0x21, 0x337, 0xa, 0x21, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 
-    0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x5, 0x22, 0x341, 
-    0xa, 0x22, 0x3, 0x23, 0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x346, 0xa, 0x23, 
-    0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x34a, 0xa, 0x23, 0x3, 0x23, 0x5, 0x23, 
-    0x34d, 0xa, 0x23, 0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x351, 0xa, 0x23, 
-    0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x355, 0xa, 0x23, 0x3, 0x23, 0x3, 0x23, 
-    0x3, 0x23, 0x5, 0x23, 0x35a, 0xa, 0x23, 0x3, 0x23, 0x5, 0x23, 0x35d, 
-    0xa, 0x23, 0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x361, 0xa, 0x23, 0x5, 0x23, 
-    0x363, 0xa, 0x23, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x25, 0x3, 0x25, 
+    0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 
+    0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x3, 0x1c, 0x7, 0x1c, 0x358, 
+    0xa, 0x1c, 0xc, 0x1c, 0xe, 0x1c, 0x35b, 0xb, 0x1c, 0x3, 0x1d, 0x3, 0x1d, 
+    0x3, 0x1d, 0x3, 0x1d, 0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1e, 0x3, 0x1e, 0x3, 
+    0x1f, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x1f, 0x3, 0x20, 0x3, 0x20, 0x3, 0x20, 
+    0x3, 0x20, 0x7, 0x20, 0x36d, 0xa, 0x20, 0xc, 0x20, 0xe, 0x20, 0x370, 
+    0xb, 0x20, 0x3, 0x21, 0x3, 0x21, 0x5, 0x21, 0x374, 0xa, 0x21, 0x3, 0x21, 
+    0x3, 0x21, 0x3, 0x21, 0x5, 0x21, 0x379, 0xa, 0x21, 0x3, 0x21, 0x5, 0x21, 
+    0x37c, 0xa, 0x21, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 
+    0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x3, 0x22, 0x5, 0x22, 0x388, 
+    0xa, 0x22, 0x3, 0x23, 0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x38d, 0xa, 0x23, 
+    0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x391, 0xa, 0x23, 0x3, 0x23, 0x5, 0x23, 
+    0x394, 0xa, 0x23, 0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x398, 0xa, 0x23, 
+    0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x39c, 0xa, 0x23, 0x3, 0x23, 0x3, 0x23, 
+    0x3, 0x23, 0x5, 0x23, 0x3a1, 0xa, 0x23, 0x3, 0x23, 0x5, 0x23, 0x3a4, 
+    0xa, 0x23, 0x3, 0x23, 0x3, 0x23, 0x5, 0x23, 0x3a8, 0xa, 0x23, 0x5, 0x23, 
+    0x3aa, 0xa, 0x23, 0x3, 0x24, 0x3, 0x24, 0x3, 0x24, 0x3, 0x25, 0x3, 0x25, 
     0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x25, 0x3, 0x26, 0x3, 
-    0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x26, 0x7, 0x26, 0x374, 0xa, 0x26, 
-    0xc, 0x26, 0xe, 0x26, 0x377, 0xb, 0x26, 0x3, 0x26, 0x3, 0x26, 0x3, 0x27, 
-    0x3, 0x27, 0x3, 0x27, 0x5, 0x27, 0x37e, 0xa, 0x27, 0x3, 0x27, 0x5, 0x27, 
-    0x381, 0xa, 0x27, 0x3, 0x28, 0x3, 0x28, 0x3, 0x28, 0x3, 0x28, 0x3, 0x28, 
-    0x3, 0x28, 0x3, 0x28, 0x3, 0x28, 0x5, 0x28, 0x38b, 0xa, 0x28, 0x3, 0x29, 
-    0x3, 0x29, 0x5, 0x29, 0x38f, 0xa, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x2a, 
-    0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x397, 0xa, 0x2a, 0x3, 0x2a, 
-    0x3, 0x2a, 0x5, 0x2a, 0x39b, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 
-    0x5, 0x2a, 0x3a0, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3a4, 
-    0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3a8, 0xa, 0x2a, 0x3, 0x2a, 
-    0x3, 0x2a, 0x5, 0x2a, 0x3ac, 0xa, 0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 
-    0x3b0, 0xa, 0x2a, 0x5, 0x2a, 0x3b2, 0xa, 0x2a, 0x3, 0x2b, 0x3, 0x2b, 
-    0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3ba, 0xa, 0x2b, 
-    0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3be, 0xa, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 
-    0x3c1, 0xa, 0x2b, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2d, 
-    0x3, 0x2d, 0x3, 0x2d, 0x5, 0x2d, 0x3ca, 0xa, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 
-    0x3, 0x2d, 0x5, 0x2d, 0x3cf, 0xa, 0x2d, 0x3, 0x2d, 0x5, 0x2d, 0x3d2, 
-    0xa, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 
-    0x2e, 0x7, 0x2e, 0x3da, 0xa, 0x2e, 0xc, 0x2e, 0xe, 0x2e, 0x3dd, 0xb, 
-    0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 
-    0x3, 0x2f, 0x5, 0x2f, 0x3e6, 0xa, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x5, 0x2f, 
-    0x3ea, 0xa, 0x2f, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 0x3ef, 
-    0xa, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 0x3f3, 0xa, 0x30, 0x3, 0x31, 
-    0x3, 0x31, 0x3, 0x31, 0x3, 0x31, 0x5, 0x31, 0x3f9, 0xa, 0x31, 0x3, 0x31, 
-    0x5, 0x31, 0x3fc, 0xa, 0x31, 0x3, 0x31, 0x5, 0x31, 0x3ff, 0xa, 0x31, 
-    0x3, 0x31, 0x5, 0x31, 0x402, 0xa, 0x31, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 
-    0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 
-    0x32, 0x7, 0x32, 0x40e, 0xa, 0x32, 0xc, 0x32, 0xe, 0x32, 0x411, 0xb, 
-    0x32, 0x3, 0x32, 0x5, 0x32, 0x414, 0xa, 0x32, 0x3, 0x33, 0x3, 0x33, 
-    0x3, 0x33, 0x3, 0x33, 0x7, 0x33, 0x41a, 0xa, 0x33, 0xc, 0x33, 0xe, 0x33, 
-    0x41d, 0xb, 0x33, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 
-    0x5, 0x34, 0x424, 0xa, 0x34, 0x3, 0x35, 0x5, 0x35, 0x427, 0xa, 0x35, 
-    0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x42b, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 
-    0x42e, 0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x432, 0xa, 0x35, 
-    0x3, 0x35, 0x5, 0x35, 0x435, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x438, 
-    0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x43b, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 
-    0x43e, 0xa, 0x35, 0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x442, 0xa, 0x35, 
-    0x3, 0x35, 0x3, 0x35, 0x5, 0x35, 0x446, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 
-    0x449, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x44c, 0xa, 0x35, 0x3, 0x35, 
-    0x5, 0x35, 0x44f, 0xa, 0x35, 0x3, 0x35, 0x5, 0x35, 0x452, 0xa, 0x35, 
-    0x3, 0x35, 0x5, 0x35, 0x455, 0xa, 0x35, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 
-    0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x3, 0x37, 0x5, 0x37, 0x45e, 0xa, 0x37, 
-    0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 0x3, 0x39, 0x5, 0x39, 0x464, 0xa, 0x39, 
-    0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x3a, 0x3, 0x3a, 0x3, 
-    0x3a, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 
-    0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x3, 0x3c, 0x5, 0x3c, 0x478, 
-    0xa, 0x3c, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3e, 0x3, 0x3e, 0x3, 
-    0x3e, 0x3, 0x3e, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 
-    0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x3, 0x40, 0x5, 0x40, 0x48a, 0xa, 0x40, 
-    0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x5, 
-    0x42, 0x492, 0xa, 0x42, 0x3, 0x42, 0x5, 0x42, 0x495, 0xa, 0x42, 0x3, 
-    0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x5, 0x42, 0x49b, 0xa, 0x42, 
-    0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x5, 
-    0x42, 0x4a3, 0xa, 0x42, 0x3, 0x42, 0x5, 0x42, 0x4a6, 0xa, 0x42, 0x3, 
-    0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x7, 0x42, 0x4ac, 0xa, 0x42, 
-    0xc, 0x42, 0xe, 0x42, 0x4af, 0xb, 0x42, 0x3, 0x43, 0x5, 0x43, 0x4b2, 
-    0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4b7, 0xa, 0x43, 
-    0x3, 0x43, 0x5, 0x43, 0x4ba, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4bd, 
-    0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4c1, 0xa, 0x43, 0x3, 0x43, 
-    0x3, 0x43, 0x5, 0x43, 0x4c5, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4c8, 
-    0xa, 0x43, 0x5, 0x43, 0x4ca, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4cd, 
-    0xa, 0x43, 0x3, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4d1, 0xa, 0x43, 0x3, 0x43, 
-    0x3, 0x43, 0x5, 0x43, 0x4d5, 0xa, 0x43, 0x3, 0x43, 0x5, 0x43, 0x4d8, 
-    0xa, 0x43, 0x5, 0x43, 0x4da, 0xa, 0x43, 0x5, 0x43, 0x4dc, 0xa, 0x43, 
-    0x3, 0x44, 0x5, 0x44, 0x4df, 0xa, 0x44, 0x3, 0x44, 0x3, 0x44, 0x3, 0x44, 
-    0x5, 0x44, 0x4e4, 0xa, 0x44, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 
-    0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x5, 0x45, 0x4ef, 
-    0xa, 0x45, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 0x5, 0x46, 0x4f5, 
-    0xa, 0x46, 0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x5, 0x47, 0x4fa, 0xa, 0x47, 
-    0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x7, 0x48, 0x4ff, 0xa, 0x48, 0xc, 0x48, 
-    0xe, 0x48, 0x502, 0xb, 0x48, 0x3, 0x49, 0x3, 0x49, 0x5, 0x49, 0x506, 
-    0xa, 0x49, 0x3, 0x49, 0x3, 0x49, 0x5, 0x49, 0x50a, 0xa, 0x49, 0x3, 0x49, 
-    0x3, 0x49, 0x5, 0x49, 0x50e, 0xa, 0x49, 0x3, 0x4a, 0x3, 0x4a, 0x3, 0x4a, 
-    0x5, 0x4a, 0x513, 0xa, 0x4a, 0x3, 0x4b, 0x3, 0x4b, 0x3, 0x4b, 0x7, 0x4b, 
-    0x518, 0xa, 0x4b, 0xc, 0x4b, 0xe, 0x4b, 0x51b, 0xb, 0x4b, 0x3, 0x4c, 
-    0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x3, 0x4d, 0x3, 0x4d, 0x3, 0x4d, 0x3, 
-    0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
-    0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x52f, 0xa, 0x4e, 
-    0x3, 0x4e, 0x5, 0x4e, 0x532, 0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
-    0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x53b, 0xa, 0x4e, 
-    0x3, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x53f, 0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
-    0x3, 0x4e, 0x5, 0x4e, 0x544, 0xa, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 
-    0x5, 0x4e, 0x549, 0xa, 0x4e, 0x3, 0x4e, 0x5, 0x4e, 0x54c, 0xa, 0x4e, 
-    0x5, 0x4e, 0x54e, 0xa, 0x4e, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
-    0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 
-    0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
-    0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x564, 0xa, 0x4f, 0x3, 0x4f, 
-    0x5, 0x4f, 0x567, 0xa, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
-    0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x5, 0x4f, 0x572, 
-    0xa, 0x4f, 0x3, 0x50, 0x3, 0x50, 0x5, 0x50, 0x576, 0xa, 0x50, 0x3, 0x50, 
-    0x5, 0x50, 0x579, 0xa, 0x50, 0x3, 0x50, 0x3, 0x50, 0x5, 0x50, 0x57d, 
-    0xa, 0x50, 0x3, 0x50, 0x3, 0x50, 0x5, 0x50, 0x581, 0xa, 0x50, 0x3, 0x51, 
-    0x3, 0x51, 0x3, 0x51, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x5, 0x52, 0x589, 
-    0xa, 0x52, 0x3, 0x52, 0x3, 0x52, 0x5, 0x52, 0x58d, 0xa, 0x52, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 
-    0x53, 0x3, 0x53, 0x7, 0x53, 0x598, 0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 
-    0x59b, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x7, 0x53, 0x5a4, 0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 
-    0x5a7, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
-    0x3, 0x53, 0x3, 0x53, 0x7, 0x53, 0x5b0, 0xa, 0x53, 0xc, 0x53, 0xe, 0x53, 
-    0x5b3, 0xb, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 0x3, 0x53, 
-    0x5, 0x53, 0x5ba, 0xa, 0x53, 0x3, 0x53, 0x3, 0x53, 0x5, 0x53, 0x5be, 
-    0xa, 0x53, 0x3, 0x54, 0x3, 0x54, 0x3, 0x54, 0x7, 0x54, 0x5c3, 0xa, 0x54, 
-    0xc, 0x54, 0xe, 0x54, 0x5c6, 0xb, 0x54, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 
-    0x5, 0x55, 0x5cb, 0xa, 0x55, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 
-    0x3, 0x55, 0x3, 0x55, 0x5, 0x55, 0x5d3, 0xa, 0x55, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x5, 0x56, 0x5d8, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x6, 0x56, 0x5df, 0xa, 0x56, 0xd, 0x56, 0xe, 0x56, 
-    0x5e0, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x5e5, 0xa, 0x56, 0x3, 0x56, 
+    0x26, 0x3, 0x26, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 0x3, 0x27, 
+    0x7, 0x27, 0x3be, 0xa, 0x27, 0xc, 0x27, 0xe, 0x27, 0x3c1, 0xb, 0x27, 
+    0x3, 0x27, 0x3, 0x27, 0x3, 0x28, 0x3, 0x28, 0x3, 0x28, 0x5, 0x28, 0x3c8, 
+    0xa, 0x28, 0x3, 0x28, 0x5, 0x28, 0x3cb, 0xa, 0x28, 0x3, 0x29, 0x3, 0x29, 
+    0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x3, 0x29, 0x5, 
+    0x29, 0x3d5, 0xa, 0x29, 0x3, 0x2a, 0x3, 0x2a, 0x5, 0x2a, 0x3d9, 0xa, 
+    0x2a, 0x3, 0x2a, 0x3, 0x2a, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 
+    0x5, 0x2b, 0x3e1, 0xa, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3e5, 
+    0xa, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3ea, 0xa, 0x2b, 
+    0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3ee, 0xa, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 
+    0x5, 0x2b, 0x3f2, 0xa, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3f6, 
+    0xa, 0x2b, 0x3, 0x2b, 0x3, 0x2b, 0x5, 0x2b, 0x3fa, 0xa, 0x2b, 0x5, 0x2b, 
+    0x3fc, 0xa, 0x2b, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 
+    0x3, 0x2c, 0x5, 0x2c, 0x404, 0xa, 0x2c, 0x3, 0x2c, 0x3, 0x2c, 0x5, 0x2c, 
+    0x408, 0xa, 0x2c, 0x3, 0x2c, 0x5, 0x2c, 0x40b, 0xa, 0x2c, 0x3, 0x2d, 
+    0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2d, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x5, 
+    0x2e, 0x414, 0xa, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x3, 0x2e, 0x5, 0x2e, 
+    0x419, 0xa, 0x2e, 0x3, 0x2e, 0x5, 0x2e, 0x41c, 0xa, 0x2e, 0x3, 0x2e, 
+    0x3, 0x2e, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 0x7, 0x2f, 0x424, 
+    0xa, 0x2f, 0xc, 0x2f, 0xe, 0x2f, 0x427, 0xb, 0x2f, 0x3, 0x2f, 0x3, 0x2f, 
+    0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 0x430, 
+    0xa, 0x30, 0x3, 0x30, 0x3, 0x30, 0x5, 0x30, 0x434, 0xa, 0x30, 0x3, 0x31, 
+    0x3, 0x31, 0x3, 0x31, 0x5, 0x31, 0x439, 0xa, 0x31, 0x3, 0x31, 0x3, 0x31, 
+    0x5, 0x31, 0x43d, 0xa, 0x31, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 0x3, 0x32, 
+    0x5, 0x32, 0x443, 0xa, 0x32, 0x3, 0x32, 0x5, 0x32, 0x446, 0xa, 0x32, 
+    0x3, 0x32, 0x5, 0x32, 0x449, 0xa, 0x32, 0x3, 0x32, 0x5, 0x32, 0x44c, 
+    0xa, 0x32, 0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 
+    0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x3, 0x33, 0x7, 0x33, 0x458, 
+    0xa, 0x33, 0xc, 0x33, 0xe, 0x33, 0x45b, 0xb, 0x33, 0x3, 0x33, 0x5, 0x33, 
+    0x45e, 0xa, 0x33, 0x3, 0x34, 0x3, 0x34, 0x5, 0x34, 0x462, 0xa, 0x34, 
+    0x3, 0x34, 0x3, 0x34, 0x3, 0x34, 0x5, 0x34, 0x467, 0xa, 0x34, 0x3, 0x34, 
+    0x5, 0x34, 0x46a, 0xa, 0x34, 0x3, 0x34, 0x3, 0x34, 0x3, 0x35, 0x3, 0x35, 
+    0x3, 0x35, 0x3, 0x35, 0x7, 0x35, 0x472, 0xa, 0x35, 0xc, 0x35, 0xe, 0x35, 
+    0x475, 0xb, 0x35, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 0x3, 0x36, 
+    0x5, 0x36, 0x47c, 0xa, 0x36, 0x3, 0x37, 0x5, 0x37, 0x47f, 0xa, 0x37, 
+    0x3, 0x37, 0x3, 0x37, 0x5, 0x37, 0x483, 0xa, 0x37, 0x3, 0x37, 0x5, 0x37, 
+    0x486, 0xa, 0x37, 0x3, 0x37, 0x3, 0x37, 0x5, 0x37, 0x48a, 0xa, 0x37, 
+    0x3, 0x37, 0x5, 0x37, 0x48d, 0xa, 0x37, 0x3, 0x37, 0x5, 0x37, 0x490, 
+    0xa, 0x37, 0x3, 0x37, 0x5, 0x37, 0x493, 0xa, 0x37, 0x3, 0x37, 0x5, 0x37, 
+    0x496, 0xa, 0x37, 0x3, 0x37, 0x3, 0x37, 0x5, 0x37, 0x49a, 0xa, 0x37, 
+    0x3, 0x37, 0x3, 0x37, 0x5, 0x37, 0x49e, 0xa, 0x37, 0x3, 0x37, 0x5, 0x37, 
+    0x4a1, 0xa, 0x37, 0x3, 0x37, 0x5, 0x37, 0x4a4, 0xa, 0x37, 0x3, 0x37, 
+    0x5, 0x37, 0x4a7, 0xa, 0x37, 0x3, 0x37, 0x5, 0x37, 0x4aa, 0xa, 0x37, 
+    0x3, 0x37, 0x5, 0x37, 0x4ad, 0xa, 0x37, 0x3, 0x38, 0x3, 0x38, 0x3, 0x38, 
+    0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x3, 0x39, 0x5, 0x39, 0x4b6, 0xa, 0x39, 
+    0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3a, 0x3, 0x3b, 0x5, 0x3b, 0x4bc, 0xa, 0x3b, 
+    0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3b, 0x3, 0x3c, 0x3, 0x3c, 0x3, 
+    0x3c, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3d, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3e, 
+    0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3e, 0x3, 0x3e, 0x5, 0x3e, 0x4d0, 
+    0xa, 0x3e, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x3f, 0x3, 0x40, 0x3, 0x40, 0x3, 
+    0x40, 0x3, 0x40, 0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 0x3, 0x41, 0x3, 0x42, 
+    0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x42, 0x3, 0x43, 0x3, 0x43, 0x3, 
+    0x43, 0x3, 0x43, 0x5, 0x43, 0x4e6, 0xa, 0x43, 0x3, 0x44, 0x3, 0x44, 
+    0x3, 0x44, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x5, 0x45, 0x4ee, 0xa, 0x45, 
+    0x3, 0x45, 0x5, 0x45, 0x4f1, 0xa, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 
+    0x3, 0x45, 0x5, 0x45, 0x4f7, 0xa, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 
+    0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x5, 0x45, 0x4ff, 0xa, 0x45, 0x3, 0x45, 
+    0x5, 0x45, 0x502, 0xa, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 0x3, 0x45, 
+    0x7, 0x45, 0x508, 0xa, 0x45, 0xc, 0x45, 0xe, 0x45, 0x50b, 0xb, 0x45, 
+    0x3, 0x46, 0x5, 0x46, 0x50e, 0xa, 0x46, 0x3, 0x46, 0x3, 0x46, 0x3, 0x46, 
+    0x5, 0x46, 0x513, 0xa, 0x46, 0x3, 0x46, 0x5, 0x46, 0x516, 0xa, 0x46, 
+    0x3, 0x46, 0x5, 0x46, 0x519, 0xa, 0x46, 0x3, 0x46, 0x3, 0x46, 0x5, 0x46, 
+    0x51d, 0xa, 0x46, 0x3, 0x46, 0x3, 0x46, 0x5, 0x46, 0x521, 0xa, 0x46, 
+    0x3, 0x46, 0x5, 0x46, 0x524, 0xa, 0x46, 0x5, 0x46, 0x526, 0xa, 0x46, 
+    0x3, 0x46, 0x5, 0x46, 0x529, 0xa, 0x46, 0x3, 0x46, 0x3, 0x46, 0x5, 0x46, 
+    0x52d, 0xa, 0x46, 0x3, 0x46, 0x3, 0x46, 0x5, 0x46, 0x531, 0xa, 0x46, 
+    0x3, 0x46, 0x5, 0x46, 0x534, 0xa, 0x46, 0x5, 0x46, 0x536, 0xa, 0x46, 
+    0x5, 0x46, 0x538, 0xa, 0x46, 0x3, 0x47, 0x5, 0x47, 0x53b, 0xa, 0x47, 
+    0x3, 0x47, 0x3, 0x47, 0x3, 0x47, 0x5, 0x47, 0x540, 0xa, 0x47, 0x3, 0x48, 
+    0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 0x48, 0x3, 
+    0x48, 0x3, 0x48, 0x5, 0x48, 0x54b, 0xa, 0x48, 0x3, 0x49, 0x3, 0x49, 
+    0x3, 0x49, 0x3, 0x49, 0x5, 0x49, 0x551, 0xa, 0x49, 0x3, 0x4a, 0x3, 0x4a, 
+    0x3, 0x4a, 0x5, 0x4a, 0x556, 0xa, 0x4a, 0x3, 0x4b, 0x3, 0x4b, 0x3, 0x4b, 
+    0x7, 0x4b, 0x55b, 0xa, 0x4b, 0xc, 0x4b, 0xe, 0x4b, 0x55e, 0xb, 0x4b, 
+    0x3, 0x4c, 0x3, 0x4c, 0x5, 0x4c, 0x562, 0xa, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 
+    0x5, 0x4c, 0x566, 0xa, 0x4c, 0x3, 0x4c, 0x3, 0x4c, 0x5, 0x4c, 0x56a, 
+    0xa, 0x4c, 0x3, 0x4d, 0x3, 0x4d, 0x3, 0x4d, 0x5, 0x4d, 0x56f, 0xa, 0x4d, 
+    0x3, 0x4e, 0x3, 0x4e, 0x3, 0x4e, 0x7, 0x4e, 0x574, 0xa, 0x4e, 0xc, 0x4e, 
+    0xe, 0x4e, 0x577, 0xb, 0x4e, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 0x3, 0x4f, 
+    0x3, 0x50, 0x3, 0x50, 0x3, 0x50, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 
+    0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 
+    0x3, 0x51, 0x5, 0x51, 0x58b, 0xa, 0x51, 0x3, 0x51, 0x5, 0x51, 0x58e, 
+    0xa, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 
+    0x51, 0x3, 0x51, 0x5, 0x51, 0x597, 0xa, 0x51, 0x3, 0x51, 0x3, 0x51, 
+    0x5, 0x51, 0x59b, 0xa, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x5, 0x51, 
+    0x5a0, 0xa, 0x51, 0x3, 0x51, 0x3, 0x51, 0x3, 0x51, 0x5, 0x51, 0x5a5, 
+    0xa, 0x51, 0x3, 0x51, 0x5, 0x51, 0x5a8, 0xa, 0x51, 0x5, 0x51, 0x5aa, 
+    0xa, 0x51, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 
+    0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 
+    0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 
+    0x52, 0x3, 0x52, 0x5, 0x52, 0x5c0, 0xa, 0x52, 0x3, 0x52, 0x5, 0x52, 
+    0x5c3, 0xa, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 
+    0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x3, 0x52, 0x5, 0x52, 0x5ce, 0xa, 0x52, 
+    0x3, 0x53, 0x3, 0x53, 0x5, 0x53, 0x5d2, 0xa, 0x53, 0x3, 0x53, 0x5, 0x53, 
+    0x5d5, 0xa, 0x53, 0x3, 0x53, 0x3, 0x53, 0x5, 0x53, 0x5d9, 0xa, 0x53, 
+    0x3, 0x53, 0x3, 0x53, 0x5, 0x53, 0x5dd, 0xa, 0x53, 0x3, 0x54, 0x3, 0x54, 
+    0x3, 0x54, 0x3, 0x55, 0x3, 0x55, 0x3, 0x55, 0x5, 0x55, 0x5e5, 0xa, 0x55, 
+    0x3, 0x55, 0x3, 0x55, 0x5, 0x55, 0x5e9, 0xa, 0x55, 0x3, 0x56, 0x3, 0x56, 
     0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
+    0x56, 0x7, 0x56, 0x5f4, 0xa, 0x56, 0xc, 0x56, 0xe, 0x56, 0x5f7, 0xb, 
     0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x604, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x5, 0x56, 0x615, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x618, 0xa, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x61c, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 
-    0x61f, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x62b, 
-    0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x63c, 0xa, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x5, 0x56, 0x640, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 
-    0x651, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x654, 0xa, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x5, 0x56, 0x658, 0xa, 0x56, 0x3, 0x56, 0x5, 0x56, 0x65b, 
-    0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x666, 0xa, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
-    0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x67e, 0xa, 0x56, 0x3, 0x56, 
-    0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x685, 0xa, 0x56, 
-    0x7, 0x56, 0x687, 0xa, 0x56, 0xc, 0x56, 0xe, 0x56, 0x68a, 0xb, 0x56, 
-    0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x7, 0x57, 0x68f, 0xa, 0x57, 0xc, 0x57, 
-    0xe, 0x57, 0x692, 0xb, 0x57, 0x3, 0x58, 0x3, 0x58, 0x5, 0x58, 0x696, 
-    0xa, 0x58, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x7, 0x59, 0x69c, 
-    0xa, 0x59, 0xc, 0x59, 0xe, 0x59, 0x69f, 0xb, 0x59, 0x3, 0x59, 0x3, 0x59, 
-    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x7, 0x59, 0x6a6, 0xa, 0x59, 0xc, 0x59, 
-    0xe, 0x59, 0x6a9, 0xb, 0x59, 0x5, 0x59, 0x6ab, 0xa, 0x59, 0x3, 0x59, 
-    0x3, 0x59, 0x3, 0x59, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x5, 0x5a, 0x6b3, 
-    0xa, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5b, 0x3, 0x5b, 0x3, 0x5b, 0x5, 
-    0x5b, 0x6ba, 0xa, 0x5b, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 
-    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x5, 0x5c, 0x6c3, 0xa, 0x5c, 0x3, 0x5c, 
-    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x5, 0x5c, 0x6c9, 0xa, 0x5c, 0x7, 0x5c, 
-    0x6cb, 0xa, 0x5c, 0xc, 0x5c, 0xe, 0x5c, 0x6ce, 0xb, 0x5c, 0x3, 0x5d, 
-    0x3, 0x5d, 0x3, 0x5d, 0x5, 0x5d, 0x6d3, 0xa, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 
-    0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x5, 0x5e, 0x6da, 0xa, 0x5e, 0x3, 0x5e, 
-    0x3, 0x5e, 0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 0x7, 0x5f, 0x6e1, 0xa, 0x5f, 
-    0xc, 0x5f, 0xe, 0x5f, 0x6e4, 0xb, 0x5f, 0x3, 0x60, 0x3, 0x60, 0x3, 0x60, 
-    0x5, 0x60, 0x6e9, 0xa, 0x60, 0x3, 0x61, 0x3, 0x61, 0x3, 0x62, 0x3, 0x62, 
-    0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x5, 0x62, 0x6f3, 0xa, 0x62, 
-    0x5, 0x62, 0x6f5, 0xa, 0x62, 0x3, 0x63, 0x5, 0x63, 0x6f8, 0xa, 0x63, 
-    0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 0x5, 
-    0x63, 0x700, 0xa, 0x63, 0x3, 0x64, 0x3, 0x64, 0x3, 0x64, 0x5, 0x64, 
-    0x705, 0xa, 0x64, 0x3, 0x65, 0x3, 0x65, 0x3, 0x66, 0x3, 0x66, 0x3, 0x67, 
-    0x3, 0x67, 0x3, 0x68, 0x3, 0x68, 0x5, 0x68, 0x70f, 0xa, 0x68, 0x3, 0x69, 
-    0x3, 0x69, 0x3, 0x69, 0x5, 0x69, 0x714, 0xa, 0x69, 0x3, 0x6a, 0x3, 0x6a, 
-    0x5, 0x6a, 0x718, 0xa, 0x6a, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 0x3, 0x6b, 
-    0x3, 0x6b, 0x2, 0x5, 0x82, 0xaa, 0xb6, 0x6c, 0x2, 0x4, 0x6, 0x8, 0xa, 
+    0x3, 0x56, 0x7, 0x56, 0x600, 0xa, 0x56, 0xc, 0x56, 0xe, 0x56, 0x603, 
+    0xb, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 
+    0x56, 0x3, 0x56, 0x7, 0x56, 0x60c, 0xa, 0x56, 0xc, 0x56, 0xe, 0x56, 
+    0x60f, 0xb, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 0x3, 0x56, 
+    0x5, 0x56, 0x616, 0xa, 0x56, 0x3, 0x56, 0x3, 0x56, 0x5, 0x56, 0x61a, 
+    0xa, 0x56, 0x3, 0x57, 0x3, 0x57, 0x3, 0x57, 0x7, 0x57, 0x61f, 0xa, 0x57, 
+    0xc, 0x57, 0xe, 0x57, 0x622, 0xb, 0x57, 0x3, 0x58, 0x3, 0x58, 0x3, 0x58, 
+    0x5, 0x58, 0x627, 0xa, 0x58, 0x3, 0x58, 0x3, 0x58, 0x3, 0x58, 0x3, 0x58, 
+    0x3, 0x58, 0x3, 0x58, 0x5, 0x58, 0x62f, 0xa, 0x58, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x5, 0x59, 0x634, 0xa, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x6, 0x59, 0x63b, 0xa, 0x59, 0xd, 0x59, 0xe, 0x59, 
+    0x63c, 0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x641, 0xa, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x660, 0xa, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x5, 0x59, 0x671, 0xa, 0x59, 0x3, 0x59, 0x5, 0x59, 0x674, 0xa, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x678, 0xa, 0x59, 0x3, 0x59, 0x5, 0x59, 
+    0x67b, 0xa, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x687, 
+    0xa, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x698, 0xa, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x5, 0x59, 0x69c, 0xa, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 
+    0x6ad, 0xa, 0x59, 0x3, 0x59, 0x5, 0x59, 0x6b0, 0xa, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x5, 0x59, 0x6b4, 0xa, 0x59, 0x3, 0x59, 0x5, 0x59, 0x6b7, 
+    0xa, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x6c2, 0xa, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 
+    0x59, 0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x6da, 0xa, 0x59, 0x3, 0x59, 
+    0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x3, 0x59, 0x5, 0x59, 0x6e1, 0xa, 0x59, 
+    0x7, 0x59, 0x6e3, 0xa, 0x59, 0xc, 0x59, 0xe, 0x59, 0x6e6, 0xb, 0x59, 
+    0x3, 0x5a, 0x3, 0x5a, 0x3, 0x5a, 0x7, 0x5a, 0x6eb, 0xa, 0x5a, 0xc, 0x5a, 
+    0xe, 0x5a, 0x6ee, 0xb, 0x5a, 0x3, 0x5b, 0x3, 0x5b, 0x5, 0x5b, 0x6f2, 
+    0xa, 0x5b, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x7, 0x5c, 0x6f8, 
+    0xa, 0x5c, 0xc, 0x5c, 0xe, 0x5c, 0x6fb, 0xb, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 
+    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5c, 0x7, 0x5c, 0x702, 0xa, 0x5c, 0xc, 0x5c, 
+    0xe, 0x5c, 0x705, 0xb, 0x5c, 0x5, 0x5c, 0x707, 0xa, 0x5c, 0x3, 0x5c, 
+    0x3, 0x5c, 0x3, 0x5c, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 0x5, 0x5d, 0x70f, 
+    0xa, 0x5d, 0x3, 0x5d, 0x3, 0x5d, 0x3, 0x5e, 0x3, 0x5e, 0x3, 0x5e, 0x5, 
+    0x5e, 0x716, 0xa, 0x5e, 0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 
+    0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 0x5, 0x5f, 0x71f, 0xa, 0x5f, 0x3, 0x5f, 
+    0x3, 0x5f, 0x3, 0x5f, 0x3, 0x5f, 0x5, 0x5f, 0x725, 0xa, 0x5f, 0x7, 0x5f, 
+    0x727, 0xa, 0x5f, 0xc, 0x5f, 0xe, 0x5f, 0x72a, 0xb, 0x5f, 0x3, 0x60, 
+    0x3, 0x60, 0x3, 0x60, 0x5, 0x60, 0x72f, 0xa, 0x60, 0x3, 0x60, 0x3, 0x60, 
+    0x3, 0x61, 0x3, 0x61, 0x3, 0x61, 0x5, 0x61, 0x736, 0xa, 0x61, 0x3, 0x61, 
+    0x3, 0x61, 0x3, 0x62, 0x3, 0x62, 0x3, 0x62, 0x7, 0x62, 0x73d, 0xa, 0x62, 
+    0xc, 0x62, 0xe, 0x62, 0x740, 0xb, 0x62, 0x3, 0x63, 0x3, 0x63, 0x3, 0x63, 
+    0x5, 0x63, 0x745, 0xa, 0x63, 0x3, 0x64, 0x3, 0x64, 0x3, 0x65, 0x3, 0x65, 
+    0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 0x3, 0x65, 0x5, 0x65, 0x74f, 0xa, 0x65, 
+    0x5, 0x65, 0x751, 0xa, 0x65, 0x3, 0x66, 0x5, 0x66, 0x754, 0xa, 0x66, 
+    0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 0x3, 0x66, 0x5, 
+    0x66, 0x75c, 0xa, 0x66, 0x3, 0x67, 0x3, 0x67, 0x3, 0x67, 0x5, 0x67, 
+    0x761, 0xa, 0x67, 0x3, 0x68, 0x3, 0x68, 0x3, 0x69, 0x3, 0x69, 0x3, 0x6a, 
+    0x3, 0x6a, 0x3, 0x6b, 0x3, 0x6b, 0x5, 0x6b, 0x76b, 0xa, 0x6b, 0x3, 0x6c, 
+    0x3, 0x6c, 0x3, 0x6c, 0x5, 0x6c, 0x770, 0xa, 0x6c, 0x3, 0x6d, 0x3, 0x6d, 
+    0x5, 0x6d, 0x774, 0xa, 0x6d, 0x3, 0x6e, 0x3, 0x6e, 0x3, 0x6e, 0x3, 0x6e, 
+    0x3, 0x6e, 0x2, 0x5, 0x88, 0xb0, 0xbc, 0x6f, 0x2, 0x4, 0x6, 0x8, 0xa, 
     0xc, 0xe, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, 0x20, 0x22, 
     0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 
     0x3c, 0x3e, 0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 
@@ -18494,1076 +19200,1132 @@ ClickHouseParser::Initializer::Initializer() {
     0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 
     0x9c, 0x9e, 0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae, 0xb0, 0xb2, 
     0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe, 0xc0, 0xc2, 0xc4, 0xc6, 0xc8, 0xca, 
-    0xcc, 0xce, 0xd0, 0xd2, 0xd4, 0x2, 0x1d, 0x8, 0x2, 0x5, 0x5, 0x19, 0x19, 
-    0x1c, 0x1c, 0x26, 0x26, 0x65, 0x65, 0xa5, 0xa5, 0x4, 0x2, 0x10, 0x10, 
-    0x1e, 0x1e, 0x5, 0x2, 0x5, 0x5, 0x26, 0x26, 0x65, 0x65, 0x4, 0x2, 0x29, 
-    0x29, 0x2b, 0x2b, 0x4, 0x2, 0x2c, 0x2c, 0x32, 0x32, 0x5, 0x2, 0xf, 0xf, 
-    0x94, 0x94, 0x9a, 0x9a, 0x4, 0x2, 0x20, 0x20, 0x87, 0x87, 0x4, 0x2, 
-    0x52, 0x52, 0x5e, 0x5e, 0x4, 0x2, 0x45, 0x45, 0x63, 0x63, 0x5, 0x2, 
-    0x6, 0x6, 0xa, 0xa, 0xe, 0xe, 0x6, 0x2, 0x6, 0x6, 0x9, 0xa, 0xe, 0xe, 
-    0x8b, 0x8b, 0x4, 0x2, 0x5e, 0x5e, 0x86, 0x86, 0x4, 0x2, 0x6, 0x6, 0xa, 
-    0xa, 0x4, 0x2, 0x73, 0x73, 0xc2, 0xc2, 0x4, 0x2, 0xd, 0xd, 0x29, 0x2a, 
-    0x4, 0x2, 0x3d, 0x3d, 0x5b, 0x5b, 0x4, 0x2, 0x42, 0x42, 0x4e, 0x4e, 
-    0x3, 0x2, 0x91, 0x92, 0x5, 0x2, 0x12, 0x12, 0x5d, 0x5d, 0xa2, 0xa2, 
-    0x5, 0x2, 0xbe, 0xbe, 0xd0, 0xd0, 0xd9, 0xd9, 0x4, 0x2, 0xc3, 0xc4, 
-    0xd1, 0xd1, 0x4, 0x2, 0x4d, 0x4d, 0x60, 0x60, 0x3, 0x2, 0xb9, 0xba, 
-    0x4, 0x2, 0xc4, 0xc4, 0xd1, 0xd1, 0xa, 0x2, 0x24, 0x24, 0x4a, 0x4a, 
-    0x69, 0x69, 0x6b, 0x6b, 0x7e, 0x7e, 0x89, 0x89, 0xb0, 0xb0, 0xb4, 0xb4, 
-    0xe, 0x2, 0x4, 0x23, 0x25, 0x49, 0x4b, 0x4f, 0x51, 0x68, 0x6a, 0x6a, 
-    0x6c, 0x6d, 0x6f, 0x70, 0x72, 0x7d, 0x7f, 0x88, 0x8a, 0xaf, 0xb1, 0xb3, 
-    0xb5, 0xb6, 0x6, 0x2, 0x23, 0x23, 0x3d, 0x3d, 0x4b, 0x4b, 0x59, 0x59, 
-    0x2, 0x81c, 0x2, 0xe4, 0x3, 0x2, 0x2, 0x2, 0x4, 0xf8, 0x3, 0x2, 0x2, 
-    0x2, 0x6, 0xfa, 0x3, 0x2, 0x2, 0x2, 0x8, 0x19f, 0x3, 0x2, 0x2, 0x2, 
-    0xa, 0x1a1, 0x3, 0x2, 0x2, 0x2, 0xc, 0x1a9, 0x3, 0x2, 0x2, 0x2, 0xe, 
-    0x1ad, 0x3, 0x2, 0x2, 0x2, 0x10, 0x1b4, 0x3, 0x2, 0x2, 0x2, 0x12, 0x1b6, 
-    0x3, 0x2, 0x2, 0x2, 0x14, 0x1bc, 0x3, 0x2, 0x2, 0x2, 0x16, 0x24b, 0x3, 
-    0x2, 0x2, 0x2, 0x18, 0x24d, 0x3, 0x2, 0x2, 0x2, 0x1a, 0x258, 0x3, 0x2, 
-    0x2, 0x2, 0x1c, 0x273, 0x3, 0x2, 0x2, 0x2, 0x1e, 0x28e, 0x3, 0x2, 0x2, 
-    0x2, 0x20, 0x292, 0x3, 0x2, 0x2, 0x2, 0x22, 0x29b, 0x3, 0x2, 0x2, 0x2, 
-    0x24, 0x2a8, 0x3, 0x2, 0x2, 0x2, 0x26, 0x2b7, 0x3, 0x2, 0x2, 0x2, 0x28, 
-    0x2c4, 0x3, 0x2, 0x2, 0x2, 0x2a, 0x2d4, 0x3, 0x2, 0x2, 0x2, 0x2c, 0x2d9, 
-    0x3, 0x2, 0x2, 0x2, 0x2e, 0x2df, 0x3, 0x2, 0x2, 0x2, 0x30, 0x2e2, 0x3, 
-    0x2, 0x2, 0x2, 0x32, 0x2e5, 0x3, 0x2, 0x2, 0x2, 0x34, 0x2f7, 0x3, 0x2, 
-    0x2, 0x2, 0x36, 0x2f9, 0x3, 0x2, 0x2, 0x2, 0x38, 0x317, 0x3, 0x2, 0x2, 
-    0x2, 0x3a, 0x31b, 0x3, 0x2, 0x2, 0x2, 0x3c, 0x31f, 0x3, 0x2, 0x2, 0x2, 
-    0x3e, 0x323, 0x3, 0x2, 0x2, 0x2, 0x40, 0x32c, 0x3, 0x2, 0x2, 0x2, 0x42, 
-    0x340, 0x3, 0x2, 0x2, 0x2, 0x44, 0x362, 0x3, 0x2, 0x2, 0x2, 0x46, 0x364, 
-    0x3, 0x2, 0x2, 0x2, 0x48, 0x367, 0x3, 0x2, 0x2, 0x2, 0x4a, 0x36e, 0x3, 
-    0x2, 0x2, 0x2, 0x4c, 0x37a, 0x3, 0x2, 0x2, 0x2, 0x4e, 0x382, 0x3, 0x2, 
-    0x2, 0x2, 0x50, 0x38c, 0x3, 0x2, 0x2, 0x2, 0x52, 0x3b1, 0x3, 0x2, 0x2, 
-    0x2, 0x54, 0x3c0, 0x3, 0x2, 0x2, 0x2, 0x56, 0x3c2, 0x3, 0x2, 0x2, 0x2, 
-    0x58, 0x3c6, 0x3, 0x2, 0x2, 0x2, 0x5a, 0x3d5, 0x3, 0x2, 0x2, 0x2, 0x5c, 
-    0x3e9, 0x3, 0x2, 0x2, 0x2, 0x5e, 0x3eb, 0x3, 0x2, 0x2, 0x2, 0x60, 0x3f4, 
-    0x3, 0x2, 0x2, 0x2, 0x62, 0x403, 0x3, 0x2, 0x2, 0x2, 0x64, 0x415, 0x3, 
-    0x2, 0x2, 0x2, 0x66, 0x423, 0x3, 0x2, 0x2, 0x2, 0x68, 0x426, 0x3, 0x2, 
-    0x2, 0x2, 0x6a, 0x456, 0x3, 0x2, 0x2, 0x2, 0x6c, 0x459, 0x3, 0x2, 0x2, 
-    0x2, 0x6e, 0x45f, 0x3, 0x2, 0x2, 0x2, 0x70, 0x463, 0x3, 0x2, 0x2, 0x2, 
-    0x72, 0x469, 0x3, 0x2, 0x2, 0x2, 0x74, 0x46c, 0x3, 0x2, 0x2, 0x2, 0x76, 
-    0x46f, 0x3, 0x2, 0x2, 0x2, 0x78, 0x479, 0x3, 0x2, 0x2, 0x2, 0x7a, 0x47c, 
-    0x3, 0x2, 0x2, 0x2, 0x7c, 0x480, 0x3, 0x2, 0x2, 0x2, 0x7e, 0x485, 0x3, 
-    0x2, 0x2, 0x2, 0x80, 0x48b, 0x3, 0x2, 0x2, 0x2, 0x82, 0x49a, 0x3, 0x2, 
-    0x2, 0x2, 0x84, 0x4db, 0x3, 0x2, 0x2, 0x2, 0x86, 0x4e3, 0x3, 0x2, 0x2, 
-    0x2, 0x88, 0x4ee, 0x3, 0x2, 0x2, 0x2, 0x8a, 0x4f0, 0x3, 0x2, 0x2, 0x2, 
-    0x8c, 0x4f6, 0x3, 0x2, 0x2, 0x2, 0x8e, 0x4fb, 0x3, 0x2, 0x2, 0x2, 0x90, 
-    0x503, 0x3, 0x2, 0x2, 0x2, 0x92, 0x50f, 0x3, 0x2, 0x2, 0x2, 0x94, 0x514, 
-    0x3, 0x2, 0x2, 0x2, 0x96, 0x51c, 0x3, 0x2, 0x2, 0x2, 0x98, 0x520, 0x3, 
-    0x2, 0x2, 0x2, 0x9a, 0x54d, 0x3, 0x2, 0x2, 0x2, 0x9c, 0x571, 0x3, 0x2, 
-    0x2, 0x2, 0x9e, 0x573, 0x3, 0x2, 0x2, 0x2, 0xa0, 0x582, 0x3, 0x2, 0x2, 
-    0x2, 0xa2, 0x585, 0x3, 0x2, 0x2, 0x2, 0xa4, 0x5bd, 0x3, 0x2, 0x2, 0x2, 
-    0xa6, 0x5bf, 0x3, 0x2, 0x2, 0x2, 0xa8, 0x5d2, 0x3, 0x2, 0x2, 0x2, 0xaa, 
-    0x63f, 0x3, 0x2, 0x2, 0x2, 0xac, 0x68b, 0x3, 0x2, 0x2, 0x2, 0xae, 0x695, 
-    0x3, 0x2, 0x2, 0x2, 0xb0, 0x6aa, 0x3, 0x2, 0x2, 0x2, 0xb2, 0x6b2, 0x3, 
-    0x2, 0x2, 0x2, 0xb4, 0x6b6, 0x3, 0x2, 0x2, 0x2, 0xb6, 0x6c2, 0x3, 0x2, 
-    0x2, 0x2, 0xb8, 0x6cf, 0x3, 0x2, 0x2, 0x2, 0xba, 0x6d9, 0x3, 0x2, 0x2, 
-    0x2, 0xbc, 0x6dd, 0x3, 0x2, 0x2, 0x2, 0xbe, 0x6e8, 0x3, 0x2, 0x2, 0x2, 
-    0xc0, 0x6ea, 0x3, 0x2, 0x2, 0x2, 0xc2, 0x6f4, 0x3, 0x2, 0x2, 0x2, 0xc4, 
-    0x6f7, 0x3, 0x2, 0x2, 0x2, 0xc6, 0x704, 0x3, 0x2, 0x2, 0x2, 0xc8, 0x706, 
-    0x3, 0x2, 0x2, 0x2, 0xca, 0x708, 0x3, 0x2, 0x2, 0x2, 0xcc, 0x70a, 0x3, 
-    0x2, 0x2, 0x2, 0xce, 0x70e, 0x3, 0x2, 0x2, 0x2, 0xd0, 0x713, 0x3, 0x2, 
-    0x2, 0x2, 0xd2, 0x717, 0x3, 0x2, 0x2, 0x2, 0xd4, 0x719, 0x3, 0x2, 0x2, 
-    0x2, 0xd6, 0xda, 0x5, 0x4, 0x3, 0x2, 0xd7, 0xd8, 0x7, 0x55, 0x2, 0x2, 
-    0xd8, 0xd9, 0x7, 0x79, 0x2, 0x2, 0xd9, 0xdb, 0x7, 0xbc, 0x2, 0x2, 0xda, 
-    0xd7, 0x3, 0x2, 0x2, 0x2, 0xda, 0xdb, 0x3, 0x2, 0x2, 0x2, 0xdb, 0xde, 
-    0x3, 0x2, 0x2, 0x2, 0xdc, 0xdd, 0x7, 0x40, 0x2, 0x2, 0xdd, 0xdf, 0x5, 
-    0xd2, 0x6a, 0x2, 0xde, 0xdc, 0x3, 0x2, 0x2, 0x2, 0xde, 0xdf, 0x3, 0x2, 
-    0x2, 0x2, 0xdf, 0xe1, 0x3, 0x2, 0x2, 0x2, 0xe0, 0xe2, 0x7, 0xd8, 0x2, 
-    0x2, 0xe1, 0xe0, 0x3, 0x2, 0x2, 0x2, 0xe1, 0xe2, 0x3, 0x2, 0x2, 0x2, 
-    0xe2, 0xe5, 0x3, 0x2, 0x2, 0x2, 0xe3, 0xe5, 0x5, 0x58, 0x2d, 0x2, 0xe4, 
-    0xd6, 0x3, 0x2, 0x2, 0x2, 0xe4, 0xe3, 0x3, 0x2, 0x2, 0x2, 0xe5, 0x3, 
-    0x3, 0x2, 0x2, 0x2, 0xe6, 0xf9, 0x5, 0x6, 0x4, 0x2, 0xe7, 0xf9, 0x5, 
-    0x12, 0xa, 0x2, 0xe8, 0xf9, 0x5, 0x14, 0xb, 0x2, 0xe9, 0xf9, 0x5, 0x16, 
-    0xc, 0x2, 0xea, 0xf9, 0x5, 0x50, 0x29, 0x2, 0xeb, 0xf9, 0x5, 0x52, 0x2a, 
-    0x2, 0xec, 0xf9, 0x5, 0x54, 0x2b, 0x2, 0xed, 0xf9, 0x5, 0x56, 0x2c, 
-    0x2, 0xee, 0xf9, 0x5, 0x5e, 0x30, 0x2, 0xef, 0xf9, 0x5, 0x60, 0x31, 
-    0x2, 0xf0, 0xf9, 0x5, 0x62, 0x32, 0x2, 0xf1, 0xf9, 0x5, 0x64, 0x33, 
-    0x2, 0xf2, 0xf9, 0x5, 0x98, 0x4d, 0x2, 0xf3, 0xf9, 0x5, 0x9a, 0x4e, 
-    0x2, 0xf4, 0xf9, 0x5, 0x9c, 0x4f, 0x2, 0xf5, 0xf9, 0x5, 0x9e, 0x50, 
-    0x2, 0xf6, 0xf9, 0x5, 0xa0, 0x51, 0x2, 0xf7, 0xf9, 0x5, 0xa2, 0x52, 
-    0x2, 0xf8, 0xe6, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xe7, 0x3, 0x2, 0x2, 0x2, 
-    0xf8, 0xe8, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xe9, 0x3, 0x2, 0x2, 0x2, 0xf8, 
-    0xea, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xeb, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xec, 
-    0x3, 0x2, 0x2, 0x2, 0xf8, 0xed, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xee, 0x3, 
-    0x2, 0x2, 0x2, 0xf8, 0xef, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf0, 0x3, 0x2, 
-    0x2, 0x2, 0xf8, 0xf1, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf2, 0x3, 0x2, 0x2, 
-    0x2, 0xf8, 0xf3, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf4, 0x3, 0x2, 0x2, 0x2, 
-    0xf8, 0xf5, 0x3, 0x2, 0x2, 0x2, 0xf8, 0xf6, 0x3, 0x2, 0x2, 0x2, 0xf8, 
-    0xf7, 0x3, 0x2, 0x2, 0x2, 0xf9, 0x5, 0x3, 0x2, 0x2, 0x2, 0xfa, 0xfb, 
-    0x7, 0x7, 0x2, 0x2, 0xfb, 0xfc, 0x7, 0x97, 0x2, 0x2, 0xfc, 0xfe, 0x5, 
-    0xba, 0x5e, 0x2, 0xfd, 0xff, 0x5, 0x2c, 0x17, 0x2, 0xfe, 0xfd, 0x3, 
-    0x2, 0x2, 0x2, 0xfe, 0xff, 0x3, 0x2, 0x2, 0x2, 0xff, 0x100, 0x3, 0x2, 
-    0x2, 0x2, 0x100, 0x105, 0x5, 0x8, 0x5, 0x2, 0x101, 0x102, 0x7, 0xc2, 
-    0x2, 0x2, 0x102, 0x104, 0x5, 0x8, 0x5, 0x2, 0x103, 0x101, 0x3, 0x2, 
-    0x2, 0x2, 0x104, 0x107, 0x3, 0x2, 0x2, 0x2, 0x105, 0x103, 0x3, 0x2, 
-    0x2, 0x2, 0x105, 0x106, 0x3, 0x2, 0x2, 0x2, 0x106, 0x7, 0x3, 0x2, 0x2, 
-    0x2, 0x107, 0x105, 0x3, 0x2, 0x2, 0x2, 0x108, 0x109, 0x7, 0x3, 0x2, 
-    0x2, 0x109, 0x10d, 0x7, 0x1b, 0x2, 0x2, 0x10a, 0x10b, 0x7, 0x4c, 0x2, 
-    0x2, 0x10b, 0x10c, 0x7, 0x70, 0x2, 0x2, 0x10c, 0x10e, 0x7, 0x37, 0x2, 
-    0x2, 0x10d, 0x10a, 0x3, 0x2, 0x2, 0x2, 0x10d, 0x10e, 0x3, 0x2, 0x2, 
-    0x2, 0x10e, 0x10f, 0x3, 0x2, 0x2, 0x2, 0x10f, 0x112, 0x5, 0x44, 0x23, 
-    0x2, 0x110, 0x111, 0x7, 0x4, 0x2, 0x2, 0x111, 0x113, 0x5, 0xb4, 0x5b, 
-    0x2, 0x112, 0x110, 0x3, 0x2, 0x2, 0x2, 0x112, 0x113, 0x3, 0x2, 0x2, 
-    0x2, 0x113, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x114, 0x115, 0x7, 0x3, 0x2, 
-    0x2, 0x115, 0x119, 0x7, 0x4f, 0x2, 0x2, 0x116, 0x117, 0x7, 0x4c, 0x2, 
-    0x2, 0x117, 0x118, 0x7, 0x70, 0x2, 0x2, 0x118, 0x11a, 0x7, 0x37, 0x2, 
-    0x2, 0x119, 0x116, 0x3, 0x2, 0x2, 0x2, 0x119, 0x11a, 0x3, 0x2, 0x2, 
-    0x2, 0x11a, 0x11b, 0x3, 0x2, 0x2, 0x2, 0x11b, 0x11e, 0x5, 0x48, 0x25, 
-    0x2, 0x11c, 0x11d, 0x7, 0x4, 0x2, 0x2, 0x11d, 0x11f, 0x5, 0xb4, 0x5b, 
-    0x2, 0x11e, 0x11c, 0x3, 0x2, 0x2, 0x2, 0x11e, 0x11f, 0x3, 0x2, 0x2, 
-    0x2, 0x11f, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x120, 0x121, 0x7, 0x10, 0x2, 
-    0x2, 0x121, 0x124, 0x5, 0x10, 0x9, 0x2, 0x122, 0x123, 0x7, 0x42, 0x2, 
-    0x2, 0x123, 0x125, 0x5, 0xba, 0x5e, 0x2, 0x124, 0x122, 0x3, 0x2, 0x2, 
-    0x2, 0x124, 0x125, 0x3, 0x2, 0x2, 0x2, 0x125, 0x1a0, 0x3, 0x2, 0x2, 
-    0x2, 0x126, 0x127, 0x7, 0x17, 0x2, 0x2, 0x127, 0x12a, 0x7, 0x1b, 0x2, 
-    0x2, 0x128, 0x129, 0x7, 0x4c, 0x2, 0x2, 0x129, 0x12b, 0x7, 0x37, 0x2, 
-    0x2, 0x12a, 0x128, 0x3, 0x2, 0x2, 0x2, 0x12a, 0x12b, 0x3, 0x2, 0x2, 
-    0x2, 0x12b, 0x12c, 0x3, 0x2, 0x2, 0x2, 0x12c, 0x12f, 0x5, 0xb4, 0x5b, 
-    0x2, 0x12d, 0x12e, 0x7, 0x4e, 0x2, 0x2, 0x12e, 0x130, 0x5, 0x10, 0x9, 
-    0x2, 0x12f, 0x12d, 0x3, 0x2, 0x2, 0x2, 0x12f, 0x130, 0x3, 0x2, 0x2, 
-    0x2, 0x130, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x131, 0x132, 0x7, 0x1c, 0x2, 
-    0x2, 0x132, 0x135, 0x7, 0x1b, 0x2, 0x2, 0x133, 0x134, 0x7, 0x4c, 0x2, 
-    0x2, 0x134, 0x136, 0x7, 0x37, 0x2, 0x2, 0x135, 0x133, 0x3, 0x2, 0x2, 
-    0x2, 0x135, 0x136, 0x3, 0x2, 0x2, 0x2, 0x136, 0x137, 0x3, 0x2, 0x2, 
-    0x2, 0x137, 0x138, 0x5, 0xb4, 0x5b, 0x2, 0x138, 0x139, 0x7, 0xbc, 0x2, 
-    0x2, 0x139, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x13a, 0x13b, 0x7, 0x28, 0x2, 
-    0x2, 0x13b, 0x13c, 0x7, 0xb2, 0x2, 0x2, 0x13c, 0x1a0, 0x5, 0xaa, 0x56, 
-    0x2, 0x13d, 0x13e, 0x7, 0x2c, 0x2, 0x2, 0x13e, 0x1a0, 0x5, 0x10, 0x9, 
-    0x2, 0x13f, 0x140, 0x7, 0x32, 0x2, 0x2, 0x140, 0x143, 0x7, 0x1b, 0x2, 
-    0x2, 0x141, 0x142, 0x7, 0x4c, 0x2, 0x2, 0x142, 0x144, 0x7, 0x37, 0x2, 
-    0x2, 0x143, 0x141, 0x3, 0x2, 0x2, 0x2, 0x143, 0x144, 0x3, 0x2, 0x2, 
-    0x2, 0x144, 0x145, 0x3, 0x2, 0x2, 0x2, 0x145, 0x1a0, 0x5, 0xb4, 0x5b, 
-    0x2, 0x146, 0x147, 0x7, 0x32, 0x2, 0x2, 0x147, 0x14a, 0x7, 0x4f, 0x2, 
-    0x2, 0x148, 0x149, 0x7, 0x4c, 0x2, 0x2, 0x149, 0x14b, 0x7, 0x37, 0x2, 
-    0x2, 0x14a, 0x148, 0x3, 0x2, 0x2, 0x2, 0x14a, 0x14b, 0x3, 0x2, 0x2, 
-    0x2, 0x14b, 0x14c, 0x3, 0x2, 0x2, 0x2, 0x14c, 0x1a0, 0x5, 0xb4, 0x5b, 
-    0x2, 0x14d, 0x14e, 0x7, 0x32, 0x2, 0x2, 0x14e, 0x1a0, 0x5, 0x10, 0x9, 
-    0x2, 0x14f, 0x151, 0x7, 0x41, 0x2, 0x2, 0x150, 0x152, 0x5, 0x10, 0x9, 
-    0x2, 0x151, 0x150, 0x3, 0x2, 0x2, 0x2, 0x151, 0x152, 0x3, 0x2, 0x2, 
-    0x2, 0x152, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x153, 0x154, 0x7, 0x6a, 0x2, 
-    0x2, 0x154, 0x157, 0x7, 0x1b, 0x2, 0x2, 0x155, 0x156, 0x7, 0x4c, 0x2, 
-    0x2, 0x156, 0x158, 0x7, 0x37, 0x2, 0x2, 0x157, 0x155, 0x3, 0x2, 0x2, 
-    0x2, 0x157, 0x158, 0x3, 0x2, 0x2, 0x2, 0x158, 0x159, 0x3, 0x2, 0x2, 
-    0x2, 0x159, 0x15a, 0x5, 0xb4, 0x5b, 0x2, 0x15a, 0x15b, 0x5, 0x4a, 0x26, 
-    0x2, 0x15b, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x15c, 0x15d, 0x7, 0x6a, 0x2, 
-    0x2, 0x15d, 0x160, 0x7, 0x1b, 0x2, 0x2, 0x15e, 0x15f, 0x7, 0x4c, 0x2, 
-    0x2, 0x15f, 0x161, 0x7, 0x37, 0x2, 0x2, 0x160, 0x15e, 0x3, 0x2, 0x2, 
-    0x2, 0x160, 0x161, 0x3, 0x2, 0x2, 0x2, 0x161, 0x162, 0x3, 0x2, 0x2, 
-    0x2, 0x162, 0x163, 0x5, 0xb4, 0x5b, 0x2, 0x163, 0x164, 0x7, 0x1c, 0x2, 
-    0x2, 0x164, 0x165, 0x7, 0xbc, 0x2, 0x2, 0x165, 0x1a0, 0x3, 0x2, 0x2, 
-    0x2, 0x166, 0x167, 0x7, 0x6a, 0x2, 0x2, 0x167, 0x16a, 0x7, 0x1b, 0x2, 
-    0x2, 0x168, 0x169, 0x7, 0x4c, 0x2, 0x2, 0x169, 0x16b, 0x7, 0x37, 0x2, 
-    0x2, 0x16a, 0x168, 0x3, 0x2, 0x2, 0x2, 0x16a, 0x16b, 0x3, 0x2, 0x2, 
-    0x2, 0x16b, 0x16c, 0x3, 0x2, 0x2, 0x2, 0x16c, 0x16d, 0x5, 0xb4, 0x5b, 
-    0x2, 0x16d, 0x16e, 0x7, 0x81, 0x2, 0x2, 0x16e, 0x16f, 0x5, 0xe, 0x8, 
-    0x2, 0x16f, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x170, 0x171, 0x7, 0x6a, 0x2, 
-    0x2, 0x171, 0x174, 0x7, 0x1b, 0x2, 0x2, 0x172, 0x173, 0x7, 0x4c, 0x2, 
-    0x2, 0x173, 0x175, 0x7, 0x37, 0x2, 0x2, 0x174, 0x172, 0x3, 0x2, 0x2, 
-    0x2, 0x174, 0x175, 0x3, 0x2, 0x2, 0x2, 0x175, 0x176, 0x3, 0x2, 0x2, 
-    0x2, 0x176, 0x1a0, 0x5, 0x44, 0x23, 0x2, 0x177, 0x178, 0x7, 0x6a, 0x2, 
-    0x2, 0x178, 0x179, 0x7, 0x77, 0x2, 0x2, 0x179, 0x17a, 0x7, 0x13, 0x2, 
-    0x2, 0x17a, 0x1a0, 0x5, 0xaa, 0x56, 0x2, 0x17b, 0x17c, 0x7, 0x6a, 0x2, 
-    0x2, 0x17c, 0x1a0, 0x5, 0x3e, 0x20, 0x2, 0x17d, 0x17e, 0x7, 0x6c, 0x2, 
-    0x2, 0x17e, 0x188, 0x5, 0x10, 0x9, 0x2, 0x17f, 0x180, 0x7, 0x9f, 0x2, 
-    0x2, 0x180, 0x181, 0x7, 0x2f, 0x2, 0x2, 0x181, 0x189, 0x7, 0xbc, 0x2, 
-    0x2, 0x182, 0x183, 0x7, 0x9f, 0x2, 0x2, 0x183, 0x184, 0x7, 0xae, 0x2, 
-    0x2, 0x184, 0x189, 0x7, 0xbc, 0x2, 0x2, 0x185, 0x186, 0x7, 0x9f, 0x2, 
-    0x2, 0x186, 0x187, 0x7, 0x97, 0x2, 0x2, 0x187, 0x189, 0x5, 0xba, 0x5e, 
-    0x2, 0x188, 0x17f, 0x3, 0x2, 0x2, 0x2, 0x188, 0x182, 0x3, 0x2, 0x2, 
-    0x2, 0x188, 0x185, 0x3, 0x2, 0x2, 0x2, 0x189, 0x1a0, 0x3, 0x2, 0x2, 
-    0x2, 0x18a, 0x18b, 0x7, 0x81, 0x2, 0x2, 0x18b, 0x1a0, 0x7, 0xa5, 0x2, 
-    0x2, 0x18c, 0x18d, 0x7, 0x82, 0x2, 0x2, 0x18d, 0x190, 0x7, 0x1b, 0x2, 
-    0x2, 0x18e, 0x18f, 0x7, 0x4c, 0x2, 0x2, 0x18f, 0x191, 0x7, 0x37, 0x2, 
-    0x2, 0x190, 0x18e, 0x3, 0x2, 0x2, 0x2, 0x190, 0x191, 0x3, 0x2, 0x2, 
-    0x2, 0x191, 0x192, 0x3, 0x2, 0x2, 0x2, 0x192, 0x193, 0x5, 0xb4, 0x5b, 
-    0x2, 0x193, 0x194, 0x7, 0x9f, 0x2, 0x2, 0x194, 0x195, 0x5, 0xb4, 0x5b, 
-    0x2, 0x195, 0x1a0, 0x3, 0x2, 0x2, 0x2, 0x196, 0x197, 0x7, 0x83, 0x2, 
-    0x2, 0x197, 0x198, 0x5, 0x10, 0x9, 0x2, 0x198, 0x199, 0x7, 0x42, 0x2, 
-    0x2, 0x199, 0x19a, 0x5, 0xba, 0x5e, 0x2, 0x19a, 0x1a0, 0x3, 0x2, 0x2, 
-    0x2, 0x19b, 0x19c, 0x7, 0xa8, 0x2, 0x2, 0x19c, 0x19d, 0x5, 0xa, 0x6, 
-    0x2, 0x19d, 0x19e, 0x5, 0x74, 0x3b, 0x2, 0x19e, 0x1a0, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x108, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x114, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x120, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x126, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x131, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x13a, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x13d, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x13f, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x146, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x14d, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x14f, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x153, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x15c, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x166, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x170, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x177, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x17b, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x17d, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x18a, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x18c, 0x3, 0x2, 0x2, 
-    0x2, 0x19f, 0x196, 0x3, 0x2, 0x2, 0x2, 0x19f, 0x19b, 0x3, 0x2, 0x2, 
-    0x2, 0x1a0, 0x9, 0x3, 0x2, 0x2, 0x2, 0x1a1, 0x1a6, 0x5, 0xc, 0x7, 0x2, 
-    0x1a2, 0x1a3, 0x7, 0xc2, 0x2, 0x2, 0x1a3, 0x1a5, 0x5, 0xc, 0x7, 0x2, 
-    0x1a4, 0x1a2, 0x3, 0x2, 0x2, 0x2, 0x1a5, 0x1a8, 0x3, 0x2, 0x2, 0x2, 
-    0x1a6, 0x1a4, 0x3, 0x2, 0x2, 0x2, 0x1a6, 0x1a7, 0x3, 0x2, 0x2, 0x2, 
-    0x1a7, 0xb, 0x3, 0x2, 0x2, 0x2, 0x1a8, 0x1a6, 0x3, 0x2, 0x2, 0x2, 0x1a9, 
-    0x1aa, 0x5, 0xb4, 0x5b, 0x2, 0x1aa, 0x1ab, 0x7, 0xc7, 0x2, 0x2, 0x1ab, 
-    0x1ac, 0x5, 0xaa, 0x56, 0x2, 0x1ac, 0xd, 0x3, 0x2, 0x2, 0x2, 0x1ad, 
-    0x1ae, 0x9, 0x2, 0x2, 0x2, 0x1ae, 0xf, 0x3, 0x2, 0x2, 0x2, 0x1af, 0x1b0, 
-    0x7, 0x7a, 0x2, 0x2, 0x1b0, 0x1b5, 0x5, 0xaa, 0x56, 0x2, 0x1b1, 0x1b2, 
-    0x7, 0x7a, 0x2, 0x2, 0x1b2, 0x1b3, 0x7, 0x4b, 0x2, 0x2, 0x1b3, 0x1b5, 
-    0x7, 0xbc, 0x2, 0x2, 0x1b4, 0x1af, 0x3, 0x2, 0x2, 0x2, 0x1b4, 0x1b1, 
-    0x3, 0x2, 0x2, 0x2, 0x1b5, 0x11, 0x3, 0x2, 0x2, 0x2, 0x1b6, 0x1b7, 0x7, 
-    0x10, 0x2, 0x2, 0x1b7, 0x1b8, 0x7, 0x2e, 0x2, 0x2, 0x1b8, 0x1ba, 0x5, 
-    0xba, 0x5e, 0x2, 0x1b9, 0x1bb, 0x5, 0x2c, 0x17, 0x2, 0x1ba, 0x1b9, 0x3, 
-    0x2, 0x2, 0x2, 0x1ba, 0x1bb, 0x3, 0x2, 0x2, 0x2, 0x1bb, 0x13, 0x3, 0x2, 
-    0x2, 0x2, 0x1bc, 0x1bd, 0x7, 0x16, 0x2, 0x2, 0x1bd, 0x1be, 0x7, 0x97, 
-    0x2, 0x2, 0x1be, 0x1c0, 0x5, 0xba, 0x5e, 0x2, 0x1bf, 0x1c1, 0x5, 0x10, 
-    0x9, 0x2, 0x1c0, 0x1bf, 0x3, 0x2, 0x2, 0x2, 0x1c0, 0x1c1, 0x3, 0x2, 
-    0x2, 0x2, 0x1c1, 0x15, 0x3, 0x2, 0x2, 0x2, 0x1c2, 0x1c3, 0x9, 0x3, 0x2, 
-    0x2, 0x1c3, 0x1c7, 0x7, 0x21, 0x2, 0x2, 0x1c4, 0x1c5, 0x7, 0x4c, 0x2, 
-    0x2, 0x1c5, 0x1c6, 0x7, 0x70, 0x2, 0x2, 0x1c6, 0x1c8, 0x7, 0x37, 0x2, 
-    0x2, 0x1c7, 0x1c4, 0x3, 0x2, 0x2, 0x2, 0x1c7, 0x1c8, 0x3, 0x2, 0x2, 
-    0x2, 0x1c8, 0x1c9, 0x3, 0x2, 0x2, 0x2, 0x1c9, 0x1cb, 0x5, 0xc0, 0x61, 
-    0x2, 0x1ca, 0x1cc, 0x5, 0x2c, 0x17, 0x2, 0x1cb, 0x1ca, 0x3, 0x2, 0x2, 
-    0x2, 0x1cb, 0x1cc, 0x3, 0x2, 0x2, 0x2, 0x1cc, 0x1ce, 0x3, 0x2, 0x2, 
-    0x2, 0x1cd, 0x1cf, 0x5, 0x40, 0x21, 0x2, 0x1ce, 0x1cd, 0x3, 0x2, 0x2, 
-    0x2, 0x1ce, 0x1cf, 0x3, 0x2, 0x2, 0x2, 0x1cf, 0x24c, 0x3, 0x2, 0x2, 
-    0x2, 0x1d0, 0x1d1, 0x9, 0x3, 0x2, 0x2, 0x1d1, 0x1d5, 0x7, 0x2e, 0x2, 
-    0x2, 0x1d2, 0x1d3, 0x7, 0x4c, 0x2, 0x2, 0x1d3, 0x1d4, 0x7, 0x70, 0x2, 
-    0x2, 0x1d4, 0x1d6, 0x7, 0x37, 0x2, 0x2, 0x1d5, 0x1d2, 0x3, 0x2, 0x2, 
-    0x2, 0x1d5, 0x1d6, 0x3, 0x2, 0x2, 0x2, 0x1d6, 0x1d7, 0x3, 0x2, 0x2, 
-    0x2, 0x1d7, 0x1d9, 0x5, 0xba, 0x5e, 0x2, 0x1d8, 0x1da, 0x5, 0x2e, 0x18, 
-    0x2, 0x1d9, 0x1d8, 0x3, 0x2, 0x2, 0x2, 0x1d9, 0x1da, 0x3, 0x2, 0x2, 
-    0x2, 0x1da, 0x1dc, 0x3, 0x2, 0x2, 0x2, 0x1db, 0x1dd, 0x5, 0x2c, 0x17, 
-    0x2, 0x1dc, 0x1db, 0x3, 0x2, 0x2, 0x2, 0x1dc, 0x1dd, 0x3, 0x2, 0x2, 
-    0x2, 0x1dd, 0x1de, 0x3, 0x2, 0x2, 0x2, 0x1de, 0x1df, 0x5, 0x18, 0xd, 
-    0x2, 0x1df, 0x1e0, 0x5, 0x1c, 0xf, 0x2, 0x1e0, 0x24c, 0x3, 0x2, 0x2, 
-    0x2, 0x1e1, 0x1e2, 0x9, 0x3, 0x2, 0x2, 0x1e2, 0x1e3, 0x7, 0x62, 0x2, 
-    0x2, 0x1e3, 0x1e7, 0x7, 0xad, 0x2, 0x2, 0x1e4, 0x1e5, 0x7, 0x4c, 0x2, 
-    0x2, 0x1e5, 0x1e6, 0x7, 0x70, 0x2, 0x2, 0x1e6, 0x1e8, 0x7, 0x37, 0x2, 
-    0x2, 0x1e7, 0x1e4, 0x3, 0x2, 0x2, 0x2, 0x1e7, 0x1e8, 0x3, 0x2, 0x2, 
-    0x2, 0x1e8, 0x1e9, 0x3, 0x2, 0x2, 0x2, 0x1e9, 0x1eb, 0x5, 0xba, 0x5e, 
-    0x2, 0x1ea, 0x1ec, 0x5, 0x2e, 0x18, 0x2, 0x1eb, 0x1ea, 0x3, 0x2, 0x2, 
-    0x2, 0x1eb, 0x1ec, 0x3, 0x2, 0x2, 0x2, 0x1ec, 0x1ee, 0x3, 0x2, 0x2, 
-    0x2, 0x1ed, 0x1ef, 0x5, 0x2c, 0x17, 0x2, 0x1ee, 0x1ed, 0x3, 0x2, 0x2, 
-    0x2, 0x1ee, 0x1ef, 0x3, 0x2, 0x2, 0x2, 0x1ef, 0x1f5, 0x3, 0x2, 0x2, 
-    0x2, 0x1f0, 0x1f1, 0x7, 0xb3, 0x2, 0x2, 0x1f1, 0x1f3, 0x7, 0x9d, 0x2, 
-    0x2, 0x1f2, 0x1f4, 0x7, 0xba, 0x2, 0x2, 0x1f3, 0x1f2, 0x3, 0x2, 0x2, 
-    0x2, 0x1f3, 0x1f4, 0x3, 0x2, 0x2, 0x2, 0x1f4, 0x1f6, 0x3, 0x2, 0x2, 
-    0x2, 0x1f5, 0x1f0, 0x3, 0x2, 0x2, 0x2, 0x1f5, 0x1f6, 0x3, 0x2, 0x2, 
-    0x2, 0x1f6, 0x1f8, 0x3, 0x2, 0x2, 0x2, 0x1f7, 0x1f9, 0x5, 0x30, 0x19, 
-    0x2, 0x1f8, 0x1f7, 0x3, 0x2, 0x2, 0x2, 0x1f8, 0x1f9, 0x3, 0x2, 0x2, 
-    0x2, 0x1f9, 0x1fb, 0x3, 0x2, 0x2, 0x2, 0x1fa, 0x1fc, 0x5, 0x34, 0x1b, 
-    0x2, 0x1fb, 0x1fa, 0x3, 0x2, 0x2, 0x2, 0x1fb, 0x1fc, 0x3, 0x2, 0x2, 
-    0x2, 0x1fc, 0x1fd, 0x3, 0x2, 0x2, 0x2, 0x1fd, 0x1fe, 0x5, 0x32, 0x1a, 
-    0x2, 0x1fe, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x1ff, 0x200, 0x9, 0x3, 0x2, 
-    0x2, 0x200, 0x201, 0x7, 0x65, 0x2, 0x2, 0x201, 0x205, 0x7, 0xad, 0x2, 
-    0x2, 0x202, 0x203, 0x7, 0x4c, 0x2, 0x2, 0x203, 0x204, 0x7, 0x70, 0x2, 
-    0x2, 0x204, 0x206, 0x7, 0x37, 0x2, 0x2, 0x205, 0x202, 0x3, 0x2, 0x2, 
-    0x2, 0x205, 0x206, 0x3, 0x2, 0x2, 0x2, 0x206, 0x207, 0x3, 0x2, 0x2, 
-    0x2, 0x207, 0x209, 0x5, 0xba, 0x5e, 0x2, 0x208, 0x20a, 0x5, 0x2e, 0x18, 
-    0x2, 0x209, 0x208, 0x3, 0x2, 0x2, 0x2, 0x209, 0x20a, 0x3, 0x2, 0x2, 
-    0x2, 0x20a, 0x20c, 0x3, 0x2, 0x2, 0x2, 0x20b, 0x20d, 0x5, 0x2c, 0x17, 
-    0x2, 0x20c, 0x20b, 0x3, 0x2, 0x2, 0x2, 0x20c, 0x20d, 0x3, 0x2, 0x2, 
-    0x2, 0x20d, 0x20f, 0x3, 0x2, 0x2, 0x2, 0x20e, 0x210, 0x5, 0x34, 0x1b, 
-    0x2, 0x20f, 0x20e, 0x3, 0x2, 0x2, 0x2, 0x20f, 0x210, 0x3, 0x2, 0x2, 
-    0x2, 0x210, 0x216, 0x3, 0x2, 0x2, 0x2, 0x211, 0x217, 0x5, 0x30, 0x19, 
-    0x2, 0x212, 0x214, 0x5, 0x36, 0x1c, 0x2, 0x213, 0x215, 0x7, 0x7b, 0x2, 
-    0x2, 0x214, 0x213, 0x3, 0x2, 0x2, 0x2, 0x214, 0x215, 0x3, 0x2, 0x2, 
-    0x2, 0x215, 0x217, 0x3, 0x2, 0x2, 0x2, 0x216, 0x211, 0x3, 0x2, 0x2, 
-    0x2, 0x216, 0x212, 0x3, 0x2, 0x2, 0x2, 0x217, 0x218, 0x3, 0x2, 0x2, 
-    0x2, 0x218, 0x219, 0x5, 0x32, 0x1a, 0x2, 0x219, 0x24c, 0x3, 0x2, 0x2, 
-    0x2, 0x21a, 0x21c, 0x9, 0x3, 0x2, 0x2, 0x21b, 0x21d, 0x7, 0x99, 0x2, 
-    0x2, 0x21c, 0x21b, 0x3, 0x2, 0x2, 0x2, 0x21c, 0x21d, 0x3, 0x2, 0x2, 
-    0x2, 0x21d, 0x21e, 0x3, 0x2, 0x2, 0x2, 0x21e, 0x222, 0x7, 0x97, 0x2, 
-    0x2, 0x21f, 0x220, 0x7, 0x4c, 0x2, 0x2, 0x220, 0x221, 0x7, 0x70, 0x2, 
-    0x2, 0x221, 0x223, 0x7, 0x37, 0x2, 0x2, 0x222, 0x21f, 0x3, 0x2, 0x2, 
-    0x2, 0x222, 0x223, 0x3, 0x2, 0x2, 0x2, 0x223, 0x224, 0x3, 0x2, 0x2, 
-    0x2, 0x224, 0x226, 0x5, 0xba, 0x5e, 0x2, 0x225, 0x227, 0x5, 0x2e, 0x18, 
-    0x2, 0x226, 0x225, 0x3, 0x2, 0x2, 0x2, 0x226, 0x227, 0x3, 0x2, 0x2, 
-    0x2, 0x227, 0x229, 0x3, 0x2, 0x2, 0x2, 0x228, 0x22a, 0x5, 0x2c, 0x17, 
-    0x2, 0x229, 0x228, 0x3, 0x2, 0x2, 0x2, 0x229, 0x22a, 0x3, 0x2, 0x2, 
-    0x2, 0x22a, 0x22c, 0x3, 0x2, 0x2, 0x2, 0x22b, 0x22d, 0x5, 0x34, 0x1b, 
-    0x2, 0x22c, 0x22b, 0x3, 0x2, 0x2, 0x2, 0x22c, 0x22d, 0x3, 0x2, 0x2, 
-    0x2, 0x22d, 0x22f, 0x3, 0x2, 0x2, 0x2, 0x22e, 0x230, 0x5, 0x36, 0x1c, 
-    0x2, 0x22f, 0x22e, 0x3, 0x2, 0x2, 0x2, 0x22f, 0x230, 0x3, 0x2, 0x2, 
-    0x2, 0x230, 0x232, 0x3, 0x2, 0x2, 0x2, 0x231, 0x233, 0x5, 0x32, 0x1a, 
-    0x2, 0x232, 0x231, 0x3, 0x2, 0x2, 0x2, 0x232, 0x233, 0x3, 0x2, 0x2, 
-    0x2, 0x233, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x234, 0x237, 0x9, 0x3, 0x2, 
-    0x2, 0x235, 0x236, 0x7, 0x76, 0x2, 0x2, 0x236, 0x238, 0x7, 0x83, 0x2, 
-    0x2, 0x237, 0x235, 0x3, 0x2, 0x2, 0x2, 0x237, 0x238, 0x3, 0x2, 0x2, 
-    0x2, 0x238, 0x239, 0x3, 0x2, 0x2, 0x2, 0x239, 0x23d, 0x7, 0xad, 0x2, 
-    0x2, 0x23a, 0x23b, 0x7, 0x4c, 0x2, 0x2, 0x23b, 0x23c, 0x7, 0x70, 0x2, 
-    0x2, 0x23c, 0x23e, 0x7, 0x37, 0x2, 0x2, 0x23d, 0x23a, 0x3, 0x2, 0x2, 
-    0x2, 0x23d, 0x23e, 0x3, 0x2, 0x2, 0x2, 0x23e, 0x23f, 0x3, 0x2, 0x2, 
-    0x2, 0x23f, 0x241, 0x5, 0xba, 0x5e, 0x2, 0x240, 0x242, 0x5, 0x2e, 0x18, 
-    0x2, 0x241, 0x240, 0x3, 0x2, 0x2, 0x2, 0x241, 0x242, 0x3, 0x2, 0x2, 
-    0x2, 0x242, 0x244, 0x3, 0x2, 0x2, 0x2, 0x243, 0x245, 0x5, 0x2c, 0x17, 
-    0x2, 0x244, 0x243, 0x3, 0x2, 0x2, 0x2, 0x244, 0x245, 0x3, 0x2, 0x2, 
-    0x2, 0x245, 0x247, 0x3, 0x2, 0x2, 0x2, 0x246, 0x248, 0x5, 0x34, 0x1b, 
-    0x2, 0x247, 0x246, 0x3, 0x2, 0x2, 0x2, 0x247, 0x248, 0x3, 0x2, 0x2, 
-    0x2, 0x248, 0x249, 0x3, 0x2, 0x2, 0x2, 0x249, 0x24a, 0x5, 0x32, 0x1a, 
-    0x2, 0x24a, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x1c2, 0x3, 0x2, 0x2, 
-    0x2, 0x24b, 0x1d0, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x1e1, 0x3, 0x2, 0x2, 
-    0x2, 0x24b, 0x1ff, 0x3, 0x2, 0x2, 0x2, 0x24b, 0x21a, 0x3, 0x2, 0x2, 
-    0x2, 0x24b, 0x234, 0x3, 0x2, 0x2, 0x2, 0x24c, 0x17, 0x3, 0x2, 0x2, 0x2, 
-    0x24d, 0x24e, 0x7, 0xcd, 0x2, 0x2, 0x24e, 0x253, 0x5, 0x1a, 0xe, 0x2, 
-    0x24f, 0x250, 0x7, 0xc2, 0x2, 0x2, 0x250, 0x252, 0x5, 0x1a, 0xe, 0x2, 
-    0x251, 0x24f, 0x3, 0x2, 0x2, 0x2, 0x252, 0x255, 0x3, 0x2, 0x2, 0x2, 
-    0x253, 0x251, 0x3, 0x2, 0x2, 0x2, 0x253, 0x254, 0x3, 0x2, 0x2, 0x2, 
-    0x254, 0x256, 0x3, 0x2, 0x2, 0x2, 0x255, 0x253, 0x3, 0x2, 0x2, 0x2, 
-    0x256, 0x257, 0x7, 0xd7, 0x2, 0x2, 0x257, 0x19, 0x3, 0x2, 0x2, 0x2, 
-    0x258, 0x259, 0x5, 0xd0, 0x69, 0x2, 0x259, 0x26f, 0x5, 0xa4, 0x53, 0x2, 
-    0x25a, 0x25b, 0x6, 0xe, 0x2, 0x3, 0x25b, 0x25c, 0x7, 0x26, 0x2, 0x2, 
-    0x25c, 0x25d, 0x5, 0xc6, 0x64, 0x2, 0x25d, 0x25e, 0x8, 0xe, 0x1, 0x2, 
-    0x25e, 0x26e, 0x3, 0x2, 0x2, 0x2, 0x25f, 0x260, 0x6, 0xe, 0x3, 0x3, 
-    0x260, 0x261, 0x7, 0x39, 0x2, 0x2, 0x261, 0x262, 0x5, 0xaa, 0x56, 0x2, 
-    0x262, 0x263, 0x8, 0xe, 0x1, 0x2, 0x263, 0x26e, 0x3, 0x2, 0x2, 0x2, 
-    0x264, 0x265, 0x6, 0xe, 0x4, 0x3, 0x265, 0x266, 0x7, 0x49, 0x2, 0x2, 
-    0x266, 0x26e, 0x8, 0xe, 0x1, 0x2, 0x267, 0x268, 0x6, 0xe, 0x5, 0x3, 
-    0x268, 0x269, 0x7, 0x51, 0x2, 0x2, 0x269, 0x26e, 0x8, 0xe, 0x1, 0x2, 
-    0x26a, 0x26b, 0x6, 0xe, 0x6, 0x3, 0x26b, 0x26c, 0x7, 0x57, 0x2, 0x2, 
-    0x26c, 0x26e, 0x8, 0xe, 0x1, 0x2, 0x26d, 0x25a, 0x3, 0x2, 0x2, 0x2, 
-    0x26d, 0x25f, 0x3, 0x2, 0x2, 0x2, 0x26d, 0x264, 0x3, 0x2, 0x2, 0x2, 
-    0x26d, 0x267, 0x3, 0x2, 0x2, 0x2, 0x26d, 0x26a, 0x3, 0x2, 0x2, 0x2, 
-    0x26e, 0x271, 0x3, 0x2, 0x2, 0x2, 0x26f, 0x26d, 0x3, 0x2, 0x2, 0x2, 
-    0x26f, 0x270, 0x3, 0x2, 0x2, 0x2, 0x270, 0x1b, 0x3, 0x2, 0x2, 0x2, 0x271, 
-    0x26f, 0x3, 0x2, 0x2, 0x2, 0x272, 0x274, 0x5, 0x1e, 0x10, 0x2, 0x273, 
-    0x272, 0x3, 0x2, 0x2, 0x2, 0x273, 0x274, 0x3, 0x2, 0x2, 0x2, 0x274, 
-    0x28b, 0x3, 0x2, 0x2, 0x2, 0x275, 0x276, 0x6, 0xf, 0x7, 0x3, 0x276, 
-    0x277, 0x5, 0x22, 0x12, 0x2, 0x277, 0x278, 0x8, 0xf, 0x1, 0x2, 0x278, 
-    0x28a, 0x3, 0x2, 0x2, 0x2, 0x279, 0x27a, 0x6, 0xf, 0x8, 0x3, 0x27a, 
-    0x27b, 0x5, 0x24, 0x13, 0x2, 0x27b, 0x27c, 0x8, 0xf, 0x1, 0x2, 0x27c, 
-    0x28a, 0x3, 0x2, 0x2, 0x2, 0x27d, 0x27e, 0x6, 0xf, 0x9, 0x3, 0x27e, 
-    0x27f, 0x5, 0x26, 0x14, 0x2, 0x27f, 0x280, 0x8, 0xf, 0x1, 0x2, 0x280, 
-    0x28a, 0x3, 0x2, 0x2, 0x2, 0x281, 0x282, 0x6, 0xf, 0xa, 0x3, 0x282, 
-    0x283, 0x5, 0x28, 0x15, 0x2, 0x283, 0x284, 0x8, 0xf, 0x1, 0x2, 0x284, 
-    0x28a, 0x3, 0x2, 0x2, 0x2, 0x285, 0x286, 0x6, 0xf, 0xb, 0x3, 0x286, 
-    0x287, 0x5, 0x2a, 0x16, 0x2, 0x287, 0x288, 0x8, 0xf, 0x1, 0x2, 0x288, 
-    0x28a, 0x3, 0x2, 0x2, 0x2, 0x289, 0x275, 0x3, 0x2, 0x2, 0x2, 0x289, 
-    0x279, 0x3, 0x2, 0x2, 0x2, 0x289, 0x27d, 0x3, 0x2, 0x2, 0x2, 0x289, 
-    0x281, 0x3, 0x2, 0x2, 0x2, 0x289, 0x285, 0x3, 0x2, 0x2, 0x2, 0x28a, 
-    0x28d, 0x3, 0x2, 0x2, 0x2, 0x28b, 0x289, 0x3, 0x2, 0x2, 0x2, 0x28b, 
-    0x28c, 0x3, 0x2, 0x2, 0x2, 0x28c, 0x1d, 0x3, 0x2, 0x2, 0x2, 0x28d, 0x28b, 
-    0x3, 0x2, 0x2, 0x2, 0x28e, 0x28f, 0x7, 0x7d, 0x2, 0x2, 0x28f, 0x290, 
-    0x7, 0x59, 0x2, 0x2, 0x290, 0x291, 0x5, 0xa6, 0x54, 0x2, 0x291, 0x1f, 
-    0x3, 0x2, 0x2, 0x2, 0x292, 0x299, 0x5, 0xd0, 0x69, 0x2, 0x293, 0x296, 
-    0x5, 0xd0, 0x69, 0x2, 0x294, 0x295, 0x7, 0xcd, 0x2, 0x2, 0x295, 0x297, 
-    0x7, 0xd7, 0x2, 0x2, 0x296, 0x294, 0x3, 0x2, 0x2, 0x2, 0x296, 0x297, 
-    0x3, 0x2, 0x2, 0x2, 0x297, 0x29a, 0x3, 0x2, 0x2, 0x2, 0x298, 0x29a, 
-    0x5, 0xc6, 0x64, 0x2, 0x299, 0x293, 0x3, 0x2, 0x2, 0x2, 0x299, 0x298, 
-    0x3, 0x2, 0x2, 0x2, 0x29a, 0x21, 0x3, 0x2, 0x2, 0x2, 0x29b, 0x29c, 0x7, 
-    0x90, 0x2, 0x2, 0x29c, 0x29d, 0x7, 0xcd, 0x2, 0x2, 0x29d, 0x29e, 0x5, 
-    0xd0, 0x69, 0x2, 0x29e, 0x2a2, 0x7, 0xcd, 0x2, 0x2, 0x29f, 0x2a1, 0x5, 
-    0x20, 0x11, 0x2, 0x2a0, 0x29f, 0x3, 0x2, 0x2, 0x2, 0x2a1, 0x2a4, 0x3, 
-    0x2, 0x2, 0x2, 0x2a2, 0x2a0, 0x3, 0x2, 0x2, 0x2, 0x2a2, 0x2a3, 0x3, 
-    0x2, 0x2, 0x2, 0x2a3, 0x2a5, 0x3, 0x2, 0x2, 0x2, 0x2a4, 0x2a2, 0x3, 
-    0x2, 0x2, 0x2, 0x2a5, 0x2a6, 0x7, 0xd7, 0x2, 0x2, 0x2a6, 0x2a7, 0x7, 
-    0xd7, 0x2, 0x2, 0x2a7, 0x23, 0x3, 0x2, 0x2, 0x2, 0x2a8, 0x2a9, 0x7, 
-    0x5f, 0x2, 0x2, 0x2a9, 0x2b3, 0x7, 0xcd, 0x2, 0x2, 0x2aa, 0x2b4, 0x7, 
-    0xba, 0x2, 0x2, 0x2ab, 0x2ac, 0x7, 0x68, 0x2, 0x2, 0x2ac, 0x2ad, 0x7, 
-    0xba, 0x2, 0x2, 0x2ad, 0x2ae, 0x7, 0x66, 0x2, 0x2, 0x2ae, 0x2b4, 0x7, 
-    0xba, 0x2, 0x2, 0x2af, 0x2b0, 0x7, 0x66, 0x2, 0x2, 0x2b0, 0x2b1, 0x7, 
-    0xba, 0x2, 0x2, 0x2b1, 0x2b2, 0x7, 0x68, 0x2, 0x2, 0x2b2, 0x2b4, 0x7, 
-    0xba, 0x2, 0x2, 0x2b3, 0x2aa, 0x3, 0x2, 0x2, 0x2, 0x2b3, 0x2ab, 0x3, 
-    0x2, 0x2, 0x2, 0x2b3, 0x2af, 0x3, 0x2, 0x2, 0x2, 0x2b4, 0x2b5, 0x3, 
-    0x2, 0x2, 0x2, 0x2b5, 0x2b6, 0x7, 0xd7, 0x2, 0x2, 0x2b6, 0x25, 0x3, 
-    0x2, 0x2, 0x2, 0x2b7, 0x2b8, 0x7, 0x5c, 0x2, 0x2, 0x2b8, 0x2b9, 0x7, 
-    0xcd, 0x2, 0x2, 0x2b9, 0x2ba, 0x5, 0xd0, 0x69, 0x2, 0x2ba, 0x2be, 0x7, 
-    0xcd, 0x2, 0x2, 0x2bb, 0x2bd, 0x5, 0x20, 0x11, 0x2, 0x2bc, 0x2bb, 0x3, 
-    0x2, 0x2, 0x2, 0x2bd, 0x2c0, 0x3, 0x2, 0x2, 0x2, 0x2be, 0x2bc, 0x3, 
-    0x2, 0x2, 0x2, 0x2be, 0x2bf, 0x3, 0x2, 0x2, 0x2, 0x2bf, 0x2c1, 0x3, 
-    0x2, 0x2, 0x2, 0x2c0, 0x2be, 0x3, 0x2, 0x2, 0x2, 0x2c1, 0x2c2, 0x7, 
-    0xd7, 0x2, 0x2, 0x2c2, 0x2c3, 0x7, 0xd7, 0x2, 0x2, 0x2c3, 0x27, 0x3, 
-    0x2, 0x2, 0x2, 0x2c4, 0x2c5, 0x7, 0x7f, 0x2, 0x2, 0x2c5, 0x2d0, 0x7, 
-    0xcd, 0x2, 0x2, 0x2c6, 0x2c7, 0x7, 0x68, 0x2, 0x2, 0x2c7, 0x2c8, 0x5, 
-    0xd0, 0x69, 0x2, 0x2c8, 0x2c9, 0x7, 0x66, 0x2, 0x2, 0x2c9, 0x2ca, 0x5, 
-    0xd0, 0x69, 0x2, 0x2ca, 0x2d1, 0x3, 0x2, 0x2, 0x2, 0x2cb, 0x2cc, 0x7, 
-    0x66, 0x2, 0x2, 0x2cc, 0x2cd, 0x5, 0xd0, 0x69, 0x2, 0x2cd, 0x2ce, 0x7, 
-    0x68, 0x2, 0x2, 0x2ce, 0x2cf, 0x5, 0xd0, 0x69, 0x2, 0x2cf, 0x2d1, 0x3, 
-    0x2, 0x2, 0x2, 0x2d0, 0x2c6, 0x3, 0x2, 0x2, 0x2, 0x2d0, 0x2cb, 0x3, 
-    0x2, 0x2, 0x2, 0x2d1, 0x2d2, 0x3, 0x2, 0x2, 0x2, 0x2d2, 0x2d3, 0x7, 
-    0xd7, 0x2, 0x2, 0x2d3, 0x29, 0x3, 0x2, 0x2, 0x2, 0x2d4, 0x2d5, 0x7, 
-    0x8e, 0x2, 0x2, 0x2d5, 0x2d6, 0x7, 0xcd, 0x2, 0x2, 0x2d6, 0x2d7, 0x5, 
-    0x94, 0x4b, 0x2, 0x2d7, 0x2d8, 0x7, 0xd7, 0x2, 0x2, 0x2d8, 0x2b, 0x3, 
-    0x2, 0x2, 0x2, 0x2d9, 0x2da, 0x7, 0x74, 0x2, 0x2, 0x2da, 0x2dd, 0x7, 
-    0x18, 0x2, 0x2, 0x2db, 0x2de, 0x5, 0xd0, 0x69, 0x2, 0x2dc, 0x2de, 0x7, 
-    0xbc, 0x2, 0x2, 0x2dd, 0x2db, 0x3, 0x2, 0x2, 0x2, 0x2dd, 0x2dc, 0x3, 
-    0x2, 0x2, 0x2, 0x2de, 0x2d, 0x3, 0x2, 0x2, 0x2, 0x2df, 0x2e0, 0x7, 0xab, 
-    0x2, 0x2, 0x2e0, 0x2e1, 0x7, 0xbc, 0x2, 0x2, 0x2e1, 0x2f, 0x3, 0x2, 
-    0x2, 0x2, 0x2e2, 0x2e3, 0x7, 0x9f, 0x2, 0x2, 0x2e3, 0x2e4, 0x5, 0xba, 
-    0x5e, 0x2, 0x2e4, 0x31, 0x3, 0x2, 0x2, 0x2, 0x2e5, 0x2e6, 0x7, 0xc, 
-    0x2, 0x2, 0x2e6, 0x2e7, 0x5, 0x64, 0x33, 0x2, 0x2e7, 0x33, 0x3, 0x2, 
-    0x2, 0x2, 0x2e8, 0x2e9, 0x7, 0xcd, 0x2, 0x2, 0x2e9, 0x2ee, 0x5, 0x42, 
-    0x22, 0x2, 0x2ea, 0x2eb, 0x7, 0xc2, 0x2, 0x2, 0x2eb, 0x2ed, 0x5, 0x42, 
-    0x22, 0x2, 0x2ec, 0x2ea, 0x3, 0x2, 0x2, 0x2, 0x2ed, 0x2f0, 0x3, 0x2, 
-    0x2, 0x2, 0x2ee, 0x2ec, 0x3, 0x2, 0x2, 0x2, 0x2ee, 0x2ef, 0x3, 0x2, 
-    0x2, 0x2, 0x2ef, 0x2f1, 0x3, 0x2, 0x2, 0x2, 0x2f0, 0x2ee, 0x3, 0x2, 
-    0x2, 0x2, 0x2f1, 0x2f2, 0x7, 0xd7, 0x2, 0x2, 0x2f2, 0x2f8, 0x3, 0x2, 
-    0x2, 0x2, 0x2f3, 0x2f4, 0x7, 0xc, 0x2, 0x2, 0x2f4, 0x2f8, 0x5, 0xba, 
-    0x5e, 0x2, 0x2f5, 0x2f6, 0x7, 0xc, 0x2, 0x2, 0x2f6, 0x2f8, 0x5, 0xb8, 
-    0x5d, 0x2, 0x2f7, 0x2e8, 0x3, 0x2, 0x2, 0x2, 0x2f7, 0x2f3, 0x3, 0x2, 
-    0x2, 0x2, 0x2f7, 0x2f5, 0x3, 0x2, 0x2, 0x2, 0x2f8, 0x35, 0x3, 0x2, 0x2, 
-    0x2, 0x2f9, 0x314, 0x5, 0x40, 0x21, 0x2, 0x2fa, 0x2fb, 0x6, 0x1c, 0xc, 
-    0x3, 0x2fb, 0x2fc, 0x5, 0x7a, 0x3e, 0x2, 0x2fc, 0x2fd, 0x8, 0x1c, 0x1, 
-    0x2, 0x2fd, 0x313, 0x3, 0x2, 0x2, 0x2, 0x2fe, 0x2ff, 0x6, 0x1c, 0xd, 
-    0x3, 0x2ff, 0x300, 0x5, 0x38, 0x1d, 0x2, 0x300, 0x301, 0x8, 0x1c, 0x1, 
-    0x2, 0x301, 0x313, 0x3, 0x2, 0x2, 0x2, 0x302, 0x303, 0x6, 0x1c, 0xe, 
-    0x3, 0x303, 0x304, 0x5, 0x3a, 0x1e, 0x2, 0x304, 0x305, 0x8, 0x1c, 0x1, 
-    0x2, 0x305, 0x313, 0x3, 0x2, 0x2, 0x2, 0x306, 0x307, 0x6, 0x1c, 0xf, 
-    0x3, 0x307, 0x308, 0x5, 0x3c, 0x1f, 0x2, 0x308, 0x309, 0x8, 0x1c, 0x1, 
-    0x2, 0x309, 0x313, 0x3, 0x2, 0x2, 0x2, 0x30a, 0x30b, 0x6, 0x1c, 0x10, 
-    0x3, 0x30b, 0x30c, 0x5, 0x3e, 0x20, 0x2, 0x30c, 0x30d, 0x8, 0x1c, 0x1, 
-    0x2, 0x30d, 0x313, 0x3, 0x2, 0x2, 0x2, 0x30e, 0x30f, 0x6, 0x1c, 0x11, 
-    0x3, 0x30f, 0x310, 0x5, 0x80, 0x41, 0x2, 0x310, 0x311, 0x8, 0x1c, 0x1, 
-    0x2, 0x311, 0x313, 0x3, 0x2, 0x2, 0x2, 0x312, 0x2fa, 0x3, 0x2, 0x2, 
-    0x2, 0x312, 0x2fe, 0x3, 0x2, 0x2, 0x2, 0x312, 0x302, 0x3, 0x2, 0x2, 
-    0x2, 0x312, 0x306, 0x3, 0x2, 0x2, 0x2, 0x312, 0x30a, 0x3, 0x2, 0x2, 
-    0x2, 0x312, 0x30e, 0x3, 0x2, 0x2, 0x2, 0x313, 0x316, 0x3, 0x2, 0x2, 
-    0x2, 0x314, 0x312, 0x3, 0x2, 0x2, 0x2, 0x314, 0x315, 0x3, 0x2, 0x2, 
-    0x2, 0x315, 0x37, 0x3, 0x2, 0x2, 0x2, 0x316, 0x314, 0x3, 0x2, 0x2, 0x2, 
-    0x317, 0x318, 0x7, 0x7a, 0x2, 0x2, 0x318, 0x319, 0x7, 0x13, 0x2, 0x2, 
-    0x319, 0x31a, 0x5, 0xaa, 0x56, 0x2, 0x31a, 0x39, 0x3, 0x2, 0x2, 0x2, 
-    0x31b, 0x31c, 0x7, 0x7d, 0x2, 0x2, 0x31c, 0x31d, 0x7, 0x59, 0x2, 0x2, 
-    0x31d, 0x31e, 0x5, 0xaa, 0x56, 0x2, 0x31e, 0x3b, 0x3, 0x2, 0x2, 0x2, 
-    0x31f, 0x320, 0x7, 0x88, 0x2, 0x2, 0x320, 0x321, 0x7, 0x13, 0x2, 0x2, 
-    0x321, 0x322, 0x5, 0xaa, 0x56, 0x2, 0x322, 0x3d, 0x3, 0x2, 0x2, 0x2, 
-    0x323, 0x324, 0x7, 0xa5, 0x2, 0x2, 0x324, 0x329, 0x5, 0x4e, 0x28, 0x2, 
-    0x325, 0x326, 0x7, 0xc2, 0x2, 0x2, 0x326, 0x328, 0x5, 0x4e, 0x28, 0x2, 
-    0x327, 0x325, 0x3, 0x2, 0x2, 0x2, 0x328, 0x32b, 0x3, 0x2, 0x2, 0x2, 
-    0x329, 0x327, 0x3, 0x2, 0x2, 0x2, 0x329, 0x32a, 0x3, 0x2, 0x2, 0x2, 
-    0x32a, 0x3f, 0x3, 0x2, 0x2, 0x2, 0x32b, 0x329, 0x3, 0x2, 0x2, 0x2, 0x32c, 
-    0x32e, 0x7, 0x35, 0x2, 0x2, 0x32d, 0x32f, 0x7, 0xc7, 0x2, 0x2, 0x32e, 
-    0x32d, 0x3, 0x2, 0x2, 0x2, 0x32e, 0x32f, 0x3, 0x2, 0x2, 0x2, 0x32f, 
-    0x330, 0x3, 0x2, 0x2, 0x2, 0x330, 0x336, 0x5, 0xd2, 0x6a, 0x2, 0x331, 
-    0x333, 0x7, 0xcd, 0x2, 0x2, 0x332, 0x334, 0x5, 0xa6, 0x54, 0x2, 0x333, 
-    0x332, 0x3, 0x2, 0x2, 0x2, 0x333, 0x334, 0x3, 0x2, 0x2, 0x2, 0x334, 
-    0x335, 0x3, 0x2, 0x2, 0x2, 0x335, 0x337, 0x7, 0xd7, 0x2, 0x2, 0x336, 
-    0x331, 0x3, 0x2, 0x2, 0x2, 0x336, 0x337, 0x3, 0x2, 0x2, 0x2, 0x337, 
-    0x41, 0x3, 0x2, 0x2, 0x2, 0x338, 0x341, 0x5, 0x44, 0x23, 0x2, 0x339, 
-    0x33a, 0x7, 0x1d, 0x2, 0x2, 0x33a, 0x33b, 0x5, 0xd0, 0x69, 0x2, 0x33b, 
-    0x33c, 0x7, 0x16, 0x2, 0x2, 0x33c, 0x33d, 0x5, 0xaa, 0x56, 0x2, 0x33d, 
-    0x341, 0x3, 0x2, 0x2, 0x2, 0x33e, 0x33f, 0x7, 0x4f, 0x2, 0x2, 0x33f, 
-    0x341, 0x5, 0x48, 0x25, 0x2, 0x340, 0x338, 0x3, 0x2, 0x2, 0x2, 0x340, 
-    0x339, 0x3, 0x2, 0x2, 0x2, 0x340, 0x33e, 0x3, 0x2, 0x2, 0x2, 0x341, 
-    0x43, 0x3, 0x2, 0x2, 0x2, 0x342, 0x343, 0x5, 0xb4, 0x5b, 0x2, 0x343, 
-    0x345, 0x5, 0xa4, 0x53, 0x2, 0x344, 0x346, 0x5, 0x46, 0x24, 0x2, 0x345, 
-    0x344, 0x3, 0x2, 0x2, 0x2, 0x345, 0x346, 0x3, 0x2, 0x2, 0x2, 0x346, 
-    0x349, 0x3, 0x2, 0x2, 0x2, 0x347, 0x348, 0x7, 0x1c, 0x2, 0x2, 0x348, 
-    0x34a, 0x7, 0xbc, 0x2, 0x2, 0x349, 0x347, 0x3, 0x2, 0x2, 0x2, 0x349, 
-    0x34a, 0x3, 0x2, 0x2, 0x2, 0x34a, 0x34c, 0x3, 0x2, 0x2, 0x2, 0x34b, 
-    0x34d, 0x5, 0x4a, 0x26, 0x2, 0x34c, 0x34b, 0x3, 0x2, 0x2, 0x2, 0x34c, 
-    0x34d, 0x3, 0x2, 0x2, 0x2, 0x34d, 0x350, 0x3, 0x2, 0x2, 0x2, 0x34e, 
-    0x34f, 0x7, 0xa5, 0x2, 0x2, 0x34f, 0x351, 0x5, 0xaa, 0x56, 0x2, 0x350, 
-    0x34e, 0x3, 0x2, 0x2, 0x2, 0x350, 0x351, 0x3, 0x2, 0x2, 0x2, 0x351, 
-    0x363, 0x3, 0x2, 0x2, 0x2, 0x352, 0x354, 0x5, 0xb4, 0x5b, 0x2, 0x353, 
-    0x355, 0x5, 0xa4, 0x53, 0x2, 0x354, 0x353, 0x3, 0x2, 0x2, 0x2, 0x354, 
-    0x355, 0x3, 0x2, 0x2, 0x2, 0x355, 0x356, 0x3, 0x2, 0x2, 0x2, 0x356, 
-    0x359, 0x5, 0x46, 0x24, 0x2, 0x357, 0x358, 0x7, 0x1c, 0x2, 0x2, 0x358, 
-    0x35a, 0x7, 0xbc, 0x2, 0x2, 0x359, 0x357, 0x3, 0x2, 0x2, 0x2, 0x359, 
-    0x35a, 0x3, 0x2, 0x2, 0x2, 0x35a, 0x35c, 0x3, 0x2, 0x2, 0x2, 0x35b, 
-    0x35d, 0x5, 0x4a, 0x26, 0x2, 0x35c, 0x35b, 0x3, 0x2, 0x2, 0x2, 0x35c, 
-    0x35d, 0x3, 0x2, 0x2, 0x2, 0x35d, 0x360, 0x3, 0x2, 0x2, 0x2, 0x35e, 
-    0x35f, 0x7, 0xa5, 0x2, 0x2, 0x35f, 0x361, 0x5, 0xaa, 0x56, 0x2, 0x360, 
-    0x35e, 0x3, 0x2, 0x2, 0x2, 0x360, 0x361, 0x3, 0x2, 0x2, 0x2, 0x361, 
-    0x363, 0x3, 0x2, 0x2, 0x2, 0x362, 0x342, 0x3, 0x2, 0x2, 0x2, 0x362, 
-    0x352, 0x3, 0x2, 0x2, 0x2, 0x363, 0x45, 0x3, 0x2, 0x2, 0x2, 0x364, 0x365, 
-    0x9, 0x4, 0x2, 0x2, 0x365, 0x366, 0x5, 0xaa, 0x56, 0x2, 0x366, 0x47, 
-    0x3, 0x2, 0x2, 0x2, 0x367, 0x368, 0x5, 0xb4, 0x5b, 0x2, 0x368, 0x369, 
-    0x5, 0xaa, 0x56, 0x2, 0x369, 0x36a, 0x7, 0xa6, 0x2, 0x2, 0x36a, 0x36b, 
-    0x5, 0xa4, 0x53, 0x2, 0x36b, 0x36c, 0x7, 0x46, 0x2, 0x2, 0x36c, 0x36d, 
-    0x7, 0xba, 0x2, 0x2, 0x36d, 0x49, 0x3, 0x2, 0x2, 0x2, 0x36e, 0x36f, 
-    0x7, 0x19, 0x2, 0x2, 0x36f, 0x370, 0x7, 0xcd, 0x2, 0x2, 0x370, 0x375, 
-    0x5, 0x4c, 0x27, 0x2, 0x371, 0x372, 0x7, 0xc2, 0x2, 0x2, 0x372, 0x374, 
-    0x5, 0x4c, 0x27, 0x2, 0x373, 0x371, 0x3, 0x2, 0x2, 0x2, 0x374, 0x377, 
-    0x3, 0x2, 0x2, 0x2, 0x375, 0x373, 0x3, 0x2, 0x2, 0x2, 0x375, 0x376, 
-    0x3, 0x2, 0x2, 0x2, 0x376, 0x378, 0x3, 0x2, 0x2, 0x2, 0x377, 0x375, 
-    0x3, 0x2, 0x2, 0x2, 0x378, 0x379, 0x7, 0xd7, 0x2, 0x2, 0x379, 0x4b, 
-    0x3, 0x2, 0x2, 0x2, 0x37a, 0x380, 0x5, 0xd0, 0x69, 0x2, 0x37b, 0x37d, 
-    0x7, 0xcd, 0x2, 0x2, 0x37c, 0x37e, 0x5, 0xa6, 0x54, 0x2, 0x37d, 0x37c, 
-    0x3, 0x2, 0x2, 0x2, 0x37d, 0x37e, 0x3, 0x2, 0x2, 0x2, 0x37e, 0x37f, 
-    0x3, 0x2, 0x2, 0x2, 0x37f, 0x381, 0x7, 0xd7, 0x2, 0x2, 0x380, 0x37b, 
-    0x3, 0x2, 0x2, 0x2, 0x380, 0x381, 0x3, 0x2, 0x2, 0x2, 0x381, 0x4d, 0x3, 
-    0x2, 0x2, 0x2, 0x382, 0x38a, 0x5, 0xaa, 0x56, 0x2, 0x383, 0x38b, 0x7, 
-    0x28, 0x2, 0x2, 0x384, 0x385, 0x7, 0x9f, 0x2, 0x2, 0x385, 0x386, 0x7, 
-    0x2f, 0x2, 0x2, 0x386, 0x38b, 0x7, 0xbc, 0x2, 0x2, 0x387, 0x388, 0x7, 
-    0x9f, 0x2, 0x2, 0x388, 0x389, 0x7, 0xae, 0x2, 0x2, 0x389, 0x38b, 0x7, 
-    0xbc, 0x2, 0x2, 0x38a, 0x383, 0x3, 0x2, 0x2, 0x2, 0x38a, 0x384, 0x3, 
-    0x2, 0x2, 0x2, 0x38a, 0x387, 0x3, 0x2, 0x2, 0x2, 0x38a, 0x38b, 0x3, 
-    0x2, 0x2, 0x2, 0x38b, 0x4f, 0x3, 0x2, 0x2, 0x2, 0x38c, 0x38e, 0x9, 0x5, 
-    0x2, 0x2, 0x38d, 0x38f, 0x7, 0x97, 0x2, 0x2, 0x38e, 0x38d, 0x3, 0x2, 
-    0x2, 0x2, 0x38e, 0x38f, 0x3, 0x2, 0x2, 0x2, 0x38f, 0x390, 0x3, 0x2, 
-    0x2, 0x2, 0x390, 0x391, 0x5, 0xb6, 0x5c, 0x2, 0x391, 0x51, 0x3, 0x2, 
-    0x2, 0x2, 0x392, 0x393, 0x9, 0x6, 0x2, 0x2, 0x393, 0x396, 0x7, 0x21, 
-    0x2, 0x2, 0x394, 0x395, 0x7, 0x4c, 0x2, 0x2, 0x395, 0x397, 0x7, 0x37, 
-    0x2, 0x2, 0x396, 0x394, 0x3, 0x2, 0x2, 0x2, 0x396, 0x397, 0x3, 0x2, 
-    0x2, 0x2, 0x397, 0x398, 0x3, 0x2, 0x2, 0x2, 0x398, 0x39a, 0x5, 0xc0, 
-    0x61, 0x2, 0x399, 0x39b, 0x5, 0x2c, 0x17, 0x2, 0x39a, 0x399, 0x3, 0x2, 
-    0x2, 0x2, 0x39a, 0x39b, 0x3, 0x2, 0x2, 0x2, 0x39b, 0x3b2, 0x3, 0x2, 
-    0x2, 0x2, 0x39c, 0x3a3, 0x9, 0x6, 0x2, 0x2, 0x39d, 0x3a4, 0x7, 0x2e, 
-    0x2, 0x2, 0x39e, 0x3a0, 0x7, 0x99, 0x2, 0x2, 0x39f, 0x39e, 0x3, 0x2, 
-    0x2, 0x2, 0x39f, 0x3a0, 0x3, 0x2, 0x2, 0x2, 0x3a0, 0x3a1, 0x3, 0x2, 
-    0x2, 0x2, 0x3a1, 0x3a4, 0x7, 0x97, 0x2, 0x2, 0x3a2, 0x3a4, 0x7, 0xad, 
-    0x2, 0x2, 0x3a3, 0x39d, 0x3, 0x2, 0x2, 0x2, 0x3a3, 0x39f, 0x3, 0x2, 
-    0x2, 0x2, 0x3a3, 0x3a2, 0x3, 0x2, 0x2, 0x2, 0x3a4, 0x3a7, 0x3, 0x2, 
-    0x2, 0x2, 0x3a5, 0x3a6, 0x7, 0x4c, 0x2, 0x2, 0x3a6, 0x3a8, 0x7, 0x37, 
-    0x2, 0x2, 0x3a7, 0x3a5, 0x3, 0x2, 0x2, 0x2, 0x3a7, 0x3a8, 0x3, 0x2, 
-    0x2, 0x2, 0x3a8, 0x3a9, 0x3, 0x2, 0x2, 0x2, 0x3a9, 0x3ab, 0x5, 0xba, 
-    0x5e, 0x2, 0x3aa, 0x3ac, 0x5, 0x2c, 0x17, 0x2, 0x3ab, 0x3aa, 0x3, 0x2, 
-    0x2, 0x2, 0x3ab, 0x3ac, 0x3, 0x2, 0x2, 0x2, 0x3ac, 0x3af, 0x3, 0x2, 
-    0x2, 0x2, 0x3ad, 0x3ae, 0x7, 0x6f, 0x2, 0x2, 0x3ae, 0x3b0, 0x7, 0x27, 
-    0x2, 0x2, 0x3af, 0x3ad, 0x3, 0x2, 0x2, 0x2, 0x3af, 0x3b0, 0x3, 0x2, 
-    0x2, 0x2, 0x3b0, 0x3b2, 0x3, 0x2, 0x2, 0x2, 0x3b1, 0x392, 0x3, 0x2, 
-    0x2, 0x2, 0x3b1, 0x39c, 0x3, 0x2, 0x2, 0x2, 0x3b2, 0x53, 0x3, 0x2, 0x2, 
-    0x2, 0x3b3, 0x3b4, 0x7, 0x37, 0x2, 0x2, 0x3b4, 0x3b5, 0x7, 0x21, 0x2, 
-    0x2, 0x3b5, 0x3c1, 0x5, 0xc0, 0x61, 0x2, 0x3b6, 0x3bd, 0x7, 0x37, 0x2, 
-    0x2, 0x3b7, 0x3be, 0x7, 0x2e, 0x2, 0x2, 0x3b8, 0x3ba, 0x7, 0x99, 0x2, 
-    0x2, 0x3b9, 0x3b8, 0x3, 0x2, 0x2, 0x2, 0x3b9, 0x3ba, 0x3, 0x2, 0x2, 
-    0x2, 0x3ba, 0x3bb, 0x3, 0x2, 0x2, 0x2, 0x3bb, 0x3be, 0x7, 0x97, 0x2, 
-    0x2, 0x3bc, 0x3be, 0x7, 0xad, 0x2, 0x2, 0x3bd, 0x3b7, 0x3, 0x2, 0x2, 
-    0x2, 0x3bd, 0x3b9, 0x3, 0x2, 0x2, 0x2, 0x3bd, 0x3bc, 0x3, 0x2, 0x2, 
-    0x2, 0x3bd, 0x3be, 0x3, 0x2, 0x2, 0x2, 0x3be, 0x3bf, 0x3, 0x2, 0x2, 
-    0x2, 0x3bf, 0x3c1, 0x5, 0xba, 0x5e, 0x2, 0x3c0, 0x3b3, 0x3, 0x2, 0x2, 
-    0x2, 0x3c0, 0x3b6, 0x3, 0x2, 0x2, 0x2, 0x3c1, 0x55, 0x3, 0x2, 0x2, 0x2, 
-    0x3c2, 0x3c3, 0x7, 0x38, 0x2, 0x2, 0x3c3, 0x3c4, 0x7, 0x95, 0x2, 0x2, 
-    0x3c4, 0x3c5, 0x5, 0x4, 0x3, 0x2, 0x3c5, 0x57, 0x3, 0x2, 0x2, 0x2, 0x3c6, 
-    0x3c7, 0x7, 0x53, 0x2, 0x2, 0x3c7, 0x3c9, 0x7, 0x55, 0x2, 0x2, 0x3c8, 
-    0x3ca, 0x7, 0x97, 0x2, 0x2, 0x3c9, 0x3c8, 0x3, 0x2, 0x2, 0x2, 0x3c9, 
-    0x3ca, 0x3, 0x2, 0x2, 0x2, 0x3ca, 0x3ce, 0x3, 0x2, 0x2, 0x2, 0x3cb, 
-    0x3cf, 0x5, 0xba, 0x5e, 0x2, 0x3cc, 0x3cd, 0x7, 0x44, 0x2, 0x2, 0x3cd, 
-    0x3cf, 0x5, 0xb8, 0x5d, 0x2, 0x3ce, 0x3cb, 0x3, 0x2, 0x2, 0x2, 0x3ce, 
-    0x3cc, 0x3, 0x2, 0x2, 0x2, 0x3cf, 0x3d1, 0x3, 0x2, 0x2, 0x2, 0x3d0, 
-    0x3d2, 0x5, 0x5a, 0x2e, 0x2, 0x3d1, 0x3d0, 0x3, 0x2, 0x2, 0x2, 0x3d1, 
-    0x3d2, 0x3, 0x2, 0x2, 0x2, 0x3d2, 0x3d3, 0x3, 0x2, 0x2, 0x2, 0x3d3, 
-    0x3d4, 0x5, 0x5c, 0x2f, 0x2, 0x3d4, 0x59, 0x3, 0x2, 0x2, 0x2, 0x3d5, 
-    0x3d6, 0x7, 0xcd, 0x2, 0x2, 0x3d6, 0x3db, 0x5, 0xb4, 0x5b, 0x2, 0x3d7, 
-    0x3d8, 0x7, 0xc2, 0x2, 0x2, 0x3d8, 0x3da, 0x5, 0xb4, 0x5b, 0x2, 0x3d9, 
-    0x3d7, 0x3, 0x2, 0x2, 0x2, 0x3da, 0x3dd, 0x3, 0x2, 0x2, 0x2, 0x3db, 
-    0x3d9, 0x3, 0x2, 0x2, 0x2, 0x3db, 0x3dc, 0x3, 0x2, 0x2, 0x2, 0x3dc, 
-    0x3de, 0x3, 0x2, 0x2, 0x2, 0x3dd, 0x3db, 0x3, 0x2, 0x2, 0x2, 0x3de, 
-    0x3df, 0x7, 0xd7, 0x2, 0x2, 0x3df, 0x5b, 0x3, 0x2, 0x2, 0x2, 0x3e0, 
-    0x3e1, 0x7, 0x40, 0x2, 0x2, 0x3e1, 0x3ea, 0x5, 0xd0, 0x69, 0x2, 0x3e2, 
-    0x3ea, 0x7, 0xac, 0x2, 0x2, 0x3e3, 0x3e5, 0x5, 0x64, 0x33, 0x2, 0x3e4, 
-    0x3e6, 0x7, 0xd8, 0x2, 0x2, 0x3e5, 0x3e4, 0x3, 0x2, 0x2, 0x2, 0x3e5, 
-    0x3e6, 0x3, 0x2, 0x2, 0x2, 0x3e6, 0x3e7, 0x3, 0x2, 0x2, 0x2, 0x3e7, 
-    0x3e8, 0x7, 0x2, 0x2, 0x3, 0x3e8, 0x3ea, 0x3, 0x2, 0x2, 0x2, 0x3e9, 
-    0x3e0, 0x3, 0x2, 0x2, 0x2, 0x3e9, 0x3e2, 0x3, 0x2, 0x2, 0x2, 0x3e9, 
-    0x3e3, 0x3, 0x2, 0x2, 0x2, 0x3ea, 0x5d, 0x3, 0x2, 0x2, 0x2, 0x3eb, 0x3ec, 
-    0x7, 0x5a, 0x2, 0x2, 0x3ec, 0x3ee, 0x7, 0x6d, 0x2, 0x2, 0x3ed, 0x3ef, 
-    0x5, 0x2c, 0x17, 0x2, 0x3ee, 0x3ed, 0x3, 0x2, 0x2, 0x2, 0x3ee, 0x3ef, 
-    0x3, 0x2, 0x2, 0x2, 0x3ef, 0x3f0, 0x3, 0x2, 0x2, 0x2, 0x3f0, 0x3f2, 
-    0x5, 0x74, 0x3b, 0x2, 0x3f1, 0x3f3, 0x9, 0x7, 0x2, 0x2, 0x3f2, 0x3f1, 
-    0x3, 0x2, 0x2, 0x2, 0x3f2, 0x3f3, 0x3, 0x2, 0x2, 0x2, 0x3f3, 0x5f, 0x3, 
-    0x2, 0x2, 0x2, 0x3f4, 0x3f5, 0x7, 0x75, 0x2, 0x2, 0x3f5, 0x3f6, 0x7, 
-    0x97, 0x2, 0x2, 0x3f6, 0x3f8, 0x5, 0xba, 0x5e, 0x2, 0x3f7, 0x3f9, 0x5, 
-    0x2c, 0x17, 0x2, 0x3f8, 0x3f7, 0x3, 0x2, 0x2, 0x2, 0x3f8, 0x3f9, 0x3, 
-    0x2, 0x2, 0x2, 0x3f9, 0x3fb, 0x3, 0x2, 0x2, 0x2, 0x3fa, 0x3fc, 0x5, 
-    0x10, 0x9, 0x2, 0x3fb, 0x3fa, 0x3, 0x2, 0x2, 0x2, 0x3fb, 0x3fc, 0x3, 
-    0x2, 0x2, 0x2, 0x3fc, 0x3fe, 0x3, 0x2, 0x2, 0x2, 0x3fd, 0x3ff, 0x7, 
-    0x3c, 0x2, 0x2, 0x3fe, 0x3fd, 0x3, 0x2, 0x2, 0x2, 0x3fe, 0x3ff, 0x3, 
-    0x2, 0x2, 0x2, 0x3ff, 0x401, 0x3, 0x2, 0x2, 0x2, 0x400, 0x402, 0x7, 
-    0x25, 0x2, 0x2, 0x401, 0x400, 0x3, 0x2, 0x2, 0x2, 0x401, 0x402, 0x3, 
-    0x2, 0x2, 0x2, 0x402, 0x61, 0x3, 0x2, 0x2, 0x2, 0x403, 0x404, 0x7, 0x82, 
-    0x2, 0x2, 0x404, 0x405, 0x7, 0x97, 0x2, 0x2, 0x405, 0x406, 0x5, 0xba, 
-    0x5e, 0x2, 0x406, 0x407, 0x7, 0x9f, 0x2, 0x2, 0x407, 0x40f, 0x5, 0xba, 
-    0x5e, 0x2, 0x408, 0x409, 0x7, 0xc2, 0x2, 0x2, 0x409, 0x40a, 0x5, 0xba, 
-    0x5e, 0x2, 0x40a, 0x40b, 0x7, 0x9f, 0x2, 0x2, 0x40b, 0x40c, 0x5, 0xba, 
-    0x5e, 0x2, 0x40c, 0x40e, 0x3, 0x2, 0x2, 0x2, 0x40d, 0x408, 0x3, 0x2, 
-    0x2, 0x2, 0x40e, 0x411, 0x3, 0x2, 0x2, 0x2, 0x40f, 0x40d, 0x3, 0x2, 
-    0x2, 0x2, 0x40f, 0x410, 0x3, 0x2, 0x2, 0x2, 0x410, 0x413, 0x3, 0x2, 
-    0x2, 0x2, 0x411, 0x40f, 0x3, 0x2, 0x2, 0x2, 0x412, 0x414, 0x5, 0x2c, 
-    0x17, 0x2, 0x413, 0x412, 0x3, 0x2, 0x2, 0x2, 0x413, 0x414, 0x3, 0x2, 
-    0x2, 0x2, 0x414, 0x63, 0x3, 0x2, 0x2, 0x2, 0x415, 0x41b, 0x5, 0x66, 
-    0x34, 0x2, 0x416, 0x417, 0x7, 0xa7, 0x2, 0x2, 0x417, 0x418, 0x7, 0x6, 
-    0x2, 0x2, 0x418, 0x41a, 0x5, 0x66, 0x34, 0x2, 0x419, 0x416, 0x3, 0x2, 
-    0x2, 0x2, 0x41a, 0x41d, 0x3, 0x2, 0x2, 0x2, 0x41b, 0x419, 0x3, 0x2, 
-    0x2, 0x2, 0x41b, 0x41c, 0x3, 0x2, 0x2, 0x2, 0x41c, 0x65, 0x3, 0x2, 0x2, 
-    0x2, 0x41d, 0x41b, 0x3, 0x2, 0x2, 0x2, 0x41e, 0x424, 0x5, 0x68, 0x35, 
-    0x2, 0x41f, 0x420, 0x7, 0xcd, 0x2, 0x2, 0x420, 0x421, 0x5, 0x64, 0x33, 
-    0x2, 0x421, 0x422, 0x7, 0xd7, 0x2, 0x2, 0x422, 0x424, 0x3, 0x2, 0x2, 
-    0x2, 0x423, 0x41e, 0x3, 0x2, 0x2, 0x2, 0x423, 0x41f, 0x3, 0x2, 0x2, 
-    0x2, 0x424, 0x67, 0x3, 0x2, 0x2, 0x2, 0x425, 0x427, 0x5, 0x6a, 0x36, 
-    0x2, 0x426, 0x425, 0x3, 0x2, 0x2, 0x2, 0x426, 0x427, 0x3, 0x2, 0x2, 
-    0x2, 0x427, 0x428, 0x3, 0x2, 0x2, 0x2, 0x428, 0x42a, 0x7, 0x8a, 0x2, 
-    0x2, 0x429, 0x42b, 0x7, 0x30, 0x2, 0x2, 0x42a, 0x429, 0x3, 0x2, 0x2, 
-    0x2, 0x42a, 0x42b, 0x3, 0x2, 0x2, 0x2, 0x42b, 0x42d, 0x3, 0x2, 0x2, 
-    0x2, 0x42c, 0x42e, 0x5, 0x6c, 0x37, 0x2, 0x42d, 0x42c, 0x3, 0x2, 0x2, 
-    0x2, 0x42d, 0x42e, 0x3, 0x2, 0x2, 0x2, 0x42e, 0x42f, 0x3, 0x2, 0x2, 
-    0x2, 0x42f, 0x431, 0x5, 0xa6, 0x54, 0x2, 0x430, 0x432, 0x5, 0x6e, 0x38, 
-    0x2, 0x431, 0x430, 0x3, 0x2, 0x2, 0x2, 0x431, 0x432, 0x3, 0x2, 0x2, 
-    0x2, 0x432, 0x434, 0x3, 0x2, 0x2, 0x2, 0x433, 0x435, 0x5, 0x70, 0x39, 
-    0x2, 0x434, 0x433, 0x3, 0x2, 0x2, 0x2, 0x434, 0x435, 0x3, 0x2, 0x2, 
-    0x2, 0x435, 0x437, 0x3, 0x2, 0x2, 0x2, 0x436, 0x438, 0x5, 0x72, 0x3a, 
-    0x2, 0x437, 0x436, 0x3, 0x2, 0x2, 0x2, 0x437, 0x438, 0x3, 0x2, 0x2, 
-    0x2, 0x438, 0x43a, 0x3, 0x2, 0x2, 0x2, 0x439, 0x43b, 0x5, 0x74, 0x3b, 
-    0x2, 0x43a, 0x439, 0x3, 0x2, 0x2, 0x2, 0x43a, 0x43b, 0x3, 0x2, 0x2, 
-    0x2, 0x43b, 0x43d, 0x3, 0x2, 0x2, 0x2, 0x43c, 0x43e, 0x5, 0x76, 0x3c, 
-    0x2, 0x43d, 0x43c, 0x3, 0x2, 0x2, 0x2, 0x43d, 0x43e, 0x3, 0x2, 0x2, 
-    0x2, 0x43e, 0x441, 0x3, 0x2, 0x2, 0x2, 0x43f, 0x440, 0x7, 0xb3, 0x2, 
-    0x2, 0x440, 0x442, 0x9, 0x8, 0x2, 0x2, 0x441, 0x43f, 0x3, 0x2, 0x2, 
-    0x2, 0x441, 0x442, 0x3, 0x2, 0x2, 0x2, 0x442, 0x445, 0x3, 0x2, 0x2, 
-    0x2, 0x443, 0x444, 0x7, 0xb3, 0x2, 0x2, 0x444, 0x446, 0x7, 0xa1, 0x2, 
-    0x2, 0x445, 0x443, 0x3, 0x2, 0x2, 0x2, 0x445, 0x446, 0x3, 0x2, 0x2, 
-    0x2, 0x446, 0x448, 0x3, 0x2, 0x2, 0x2, 0x447, 0x449, 0x5, 0x78, 0x3d, 
+    0xcc, 0xce, 0xd0, 0xd2, 0xd4, 0xd6, 0xd8, 0xda, 0x2, 0x1d, 0x8, 0x2, 
+    0x5, 0x5, 0x19, 0x19, 0x1c, 0x1c, 0x26, 0x26, 0x65, 0x65, 0xa7, 0xa7, 
+    0x4, 0x2, 0x10, 0x10, 0x1e, 0x1e, 0x5, 0x2, 0x5, 0x5, 0x26, 0x26, 0x65, 
+    0x65, 0x4, 0x2, 0x29, 0x29, 0x2b, 0x2b, 0x4, 0x2, 0x2c, 0x2c, 0x32, 
+    0x32, 0x5, 0x2, 0xf, 0xf, 0x96, 0x96, 0x9c, 0x9c, 0x4, 0x2, 0x20, 0x20, 
+    0x89, 0x89, 0x4, 0x2, 0x52, 0x52, 0x5e, 0x5e, 0x4, 0x2, 0x45, 0x45, 
+    0x63, 0x63, 0x5, 0x2, 0x6, 0x6, 0xa, 0xa, 0xe, 0xe, 0x6, 0x2, 0x6, 0x6, 
+    0x9, 0xa, 0xe, 0xe, 0x8d, 0x8d, 0x4, 0x2, 0x5e, 0x5e, 0x88, 0x88, 0x4, 
+    0x2, 0x6, 0x6, 0xa, 0xa, 0x4, 0x2, 0x74, 0x74, 0xc4, 0xc4, 0x4, 0x2, 
+    0xd, 0xd, 0x29, 0x2a, 0x4, 0x2, 0x3d, 0x3d, 0x5b, 0x5b, 0x4, 0x2, 0x42, 
+    0x42, 0x4e, 0x4e, 0x3, 0x2, 0x93, 0x94, 0x5, 0x2, 0x12, 0x12, 0x5d, 
+    0x5d, 0xa4, 0xa4, 0x5, 0x2, 0xc0, 0xc0, 0xd2, 0xd2, 0xdb, 0xdb, 0x4, 
+    0x2, 0xc5, 0xc6, 0xd3, 0xd3, 0x4, 0x2, 0x4d, 0x4d, 0x60, 0x60, 0x3, 
+    0x2, 0xbb, 0xbc, 0x4, 0x2, 0xc6, 0xc6, 0xd3, 0xd3, 0xa, 0x2, 0x24, 0x24, 
+    0x4a, 0x4a, 0x6a, 0x6a, 0x6c, 0x6c, 0x80, 0x80, 0x8b, 0x8b, 0xb2, 0xb2, 
+    0xb6, 0xb6, 0xe, 0x2, 0x4, 0x23, 0x25, 0x49, 0x4b, 0x4f, 0x51, 0x69, 
+    0x6b, 0x6b, 0x6d, 0x6e, 0x70, 0x71, 0x73, 0x7e, 0x81, 0x8a, 0x8c, 0xb1, 
+    0xb3, 0xb5, 0xb7, 0xb8, 0x6, 0x2, 0x23, 0x23, 0x3d, 0x3d, 0x4b, 0x4b, 
+    0x59, 0x59, 0x2, 0x88a, 0x2, 0xea, 0x3, 0x2, 0x2, 0x2, 0x4, 0xfe, 0x3, 
+    0x2, 0x2, 0x2, 0x6, 0x100, 0x3, 0x2, 0x2, 0x2, 0x8, 0x1e4, 0x3, 0x2, 
+    0x2, 0x2, 0xa, 0x1e6, 0x3, 0x2, 0x2, 0x2, 0xc, 0x1ee, 0x3, 0x2, 0x2, 
+    0x2, 0xe, 0x1f2, 0x3, 0x2, 0x2, 0x2, 0x10, 0x1f9, 0x3, 0x2, 0x2, 0x2, 
+    0x12, 0x1fb, 0x3, 0x2, 0x2, 0x2, 0x14, 0x201, 0x3, 0x2, 0x2, 0x2, 0x16, 
+    0x290, 0x3, 0x2, 0x2, 0x2, 0x18, 0x292, 0x3, 0x2, 0x2, 0x2, 0x1a, 0x29d, 
+    0x3, 0x2, 0x2, 0x2, 0x1c, 0x2b8, 0x3, 0x2, 0x2, 0x2, 0x1e, 0x2d3, 0x3, 
+    0x2, 0x2, 0x2, 0x20, 0x2d7, 0x3, 0x2, 0x2, 0x2, 0x22, 0x2e0, 0x3, 0x2, 
+    0x2, 0x2, 0x24, 0x2ed, 0x3, 0x2, 0x2, 0x2, 0x26, 0x2fc, 0x3, 0x2, 0x2, 
+    0x2, 0x28, 0x309, 0x3, 0x2, 0x2, 0x2, 0x2a, 0x319, 0x3, 0x2, 0x2, 0x2, 
+    0x2c, 0x31e, 0x3, 0x2, 0x2, 0x2, 0x2e, 0x324, 0x3, 0x2, 0x2, 0x2, 0x30, 
+    0x327, 0x3, 0x2, 0x2, 0x2, 0x32, 0x32a, 0x3, 0x2, 0x2, 0x2, 0x34, 0x33c, 
+    0x3, 0x2, 0x2, 0x2, 0x36, 0x33e, 0x3, 0x2, 0x2, 0x2, 0x38, 0x35c, 0x3, 
+    0x2, 0x2, 0x2, 0x3a, 0x360, 0x3, 0x2, 0x2, 0x2, 0x3c, 0x364, 0x3, 0x2, 
+    0x2, 0x2, 0x3e, 0x368, 0x3, 0x2, 0x2, 0x2, 0x40, 0x371, 0x3, 0x2, 0x2, 
+    0x2, 0x42, 0x387, 0x3, 0x2, 0x2, 0x2, 0x44, 0x3a9, 0x3, 0x2, 0x2, 0x2, 
+    0x46, 0x3ab, 0x3, 0x2, 0x2, 0x2, 0x48, 0x3ae, 0x3, 0x2, 0x2, 0x2, 0x4a, 
+    0x3b5, 0x3, 0x2, 0x2, 0x2, 0x4c, 0x3b8, 0x3, 0x2, 0x2, 0x2, 0x4e, 0x3c4, 
+    0x3, 0x2, 0x2, 0x2, 0x50, 0x3cc, 0x3, 0x2, 0x2, 0x2, 0x52, 0x3d6, 0x3, 
+    0x2, 0x2, 0x2, 0x54, 0x3fb, 0x3, 0x2, 0x2, 0x2, 0x56, 0x40a, 0x3, 0x2, 
+    0x2, 0x2, 0x58, 0x40c, 0x3, 0x2, 0x2, 0x2, 0x5a, 0x410, 0x3, 0x2, 0x2, 
+    0x2, 0x5c, 0x41f, 0x3, 0x2, 0x2, 0x2, 0x5e, 0x433, 0x3, 0x2, 0x2, 0x2, 
+    0x60, 0x435, 0x3, 0x2, 0x2, 0x2, 0x62, 0x43e, 0x3, 0x2, 0x2, 0x2, 0x64, 
+    0x44d, 0x3, 0x2, 0x2, 0x2, 0x66, 0x45f, 0x3, 0x2, 0x2, 0x2, 0x68, 0x46d, 
+    0x3, 0x2, 0x2, 0x2, 0x6a, 0x47b, 0x3, 0x2, 0x2, 0x2, 0x6c, 0x47e, 0x3, 
+    0x2, 0x2, 0x2, 0x6e, 0x4ae, 0x3, 0x2, 0x2, 0x2, 0x70, 0x4b1, 0x3, 0x2, 
+    0x2, 0x2, 0x72, 0x4b7, 0x3, 0x2, 0x2, 0x2, 0x74, 0x4bb, 0x3, 0x2, 0x2, 
+    0x2, 0x76, 0x4c1, 0x3, 0x2, 0x2, 0x2, 0x78, 0x4c4, 0x3, 0x2, 0x2, 0x2, 
+    0x7a, 0x4c7, 0x3, 0x2, 0x2, 0x2, 0x7c, 0x4d1, 0x3, 0x2, 0x2, 0x2, 0x7e, 
+    0x4d4, 0x3, 0x2, 0x2, 0x2, 0x80, 0x4d8, 0x3, 0x2, 0x2, 0x2, 0x82, 0x4dc, 
+    0x3, 0x2, 0x2, 0x2, 0x84, 0x4e1, 0x3, 0x2, 0x2, 0x2, 0x86, 0x4e7, 0x3, 
+    0x2, 0x2, 0x2, 0x88, 0x4f6, 0x3, 0x2, 0x2, 0x2, 0x8a, 0x537, 0x3, 0x2, 
+    0x2, 0x2, 0x8c, 0x53f, 0x3, 0x2, 0x2, 0x2, 0x8e, 0x54a, 0x3, 0x2, 0x2, 
+    0x2, 0x90, 0x54c, 0x3, 0x2, 0x2, 0x2, 0x92, 0x552, 0x3, 0x2, 0x2, 0x2, 
+    0x94, 0x557, 0x3, 0x2, 0x2, 0x2, 0x96, 0x55f, 0x3, 0x2, 0x2, 0x2, 0x98, 
+    0x56b, 0x3, 0x2, 0x2, 0x2, 0x9a, 0x570, 0x3, 0x2, 0x2, 0x2, 0x9c, 0x578, 
+    0x3, 0x2, 0x2, 0x2, 0x9e, 0x57c, 0x3, 0x2, 0x2, 0x2, 0xa0, 0x5a9, 0x3, 
+    0x2, 0x2, 0x2, 0xa2, 0x5cd, 0x3, 0x2, 0x2, 0x2, 0xa4, 0x5cf, 0x3, 0x2, 
+    0x2, 0x2, 0xa6, 0x5de, 0x3, 0x2, 0x2, 0x2, 0xa8, 0x5e1, 0x3, 0x2, 0x2, 
+    0x2, 0xaa, 0x619, 0x3, 0x2, 0x2, 0x2, 0xac, 0x61b, 0x3, 0x2, 0x2, 0x2, 
+    0xae, 0x62e, 0x3, 0x2, 0x2, 0x2, 0xb0, 0x69b, 0x3, 0x2, 0x2, 0x2, 0xb2, 
+    0x6e7, 0x3, 0x2, 0x2, 0x2, 0xb4, 0x6f1, 0x3, 0x2, 0x2, 0x2, 0xb6, 0x706, 
+    0x3, 0x2, 0x2, 0x2, 0xb8, 0x70e, 0x3, 0x2, 0x2, 0x2, 0xba, 0x712, 0x3, 
+    0x2, 0x2, 0x2, 0xbc, 0x71e, 0x3, 0x2, 0x2, 0x2, 0xbe, 0x72b, 0x3, 0x2, 
+    0x2, 0x2, 0xc0, 0x735, 0x3, 0x2, 0x2, 0x2, 0xc2, 0x739, 0x3, 0x2, 0x2, 
+    0x2, 0xc4, 0x744, 0x3, 0x2, 0x2, 0x2, 0xc6, 0x746, 0x3, 0x2, 0x2, 0x2, 
+    0xc8, 0x750, 0x3, 0x2, 0x2, 0x2, 0xca, 0x753, 0x3, 0x2, 0x2, 0x2, 0xcc, 
+    0x760, 0x3, 0x2, 0x2, 0x2, 0xce, 0x762, 0x3, 0x2, 0x2, 0x2, 0xd0, 0x764, 
+    0x3, 0x2, 0x2, 0x2, 0xd2, 0x766, 0x3, 0x2, 0x2, 0x2, 0xd4, 0x76a, 0x3, 
+    0x2, 0x2, 0x2, 0xd6, 0x76f, 0x3, 0x2, 0x2, 0x2, 0xd8, 0x773, 0x3, 0x2, 
+    0x2, 0x2, 0xda, 0x775, 0x3, 0x2, 0x2, 0x2, 0xdc, 0xe0, 0x5, 0x4, 0x3, 
+    0x2, 0xdd, 0xde, 0x7, 0x55, 0x2, 0x2, 0xde, 0xdf, 0x7, 0x7a, 0x2, 0x2, 
+    0xdf, 0xe1, 0x7, 0xbe, 0x2, 0x2, 0xe0, 0xdd, 0x3, 0x2, 0x2, 0x2, 0xe0, 
+    0xe1, 0x3, 0x2, 0x2, 0x2, 0xe1, 0xe4, 0x3, 0x2, 0x2, 0x2, 0xe2, 0xe3, 
+    0x7, 0x40, 0x2, 0x2, 0xe3, 0xe5, 0x5, 0xd8, 0x6d, 0x2, 0xe4, 0xe2, 0x3, 
+    0x2, 0x2, 0x2, 0xe4, 0xe5, 0x3, 0x2, 0x2, 0x2, 0xe5, 0xe7, 0x3, 0x2, 
+    0x2, 0x2, 0xe6, 0xe8, 0x7, 0xda, 0x2, 0x2, 0xe7, 0xe6, 0x3, 0x2, 0x2, 
+    0x2, 0xe7, 0xe8, 0x3, 0x2, 0x2, 0x2, 0xe8, 0xeb, 0x3, 0x2, 0x2, 0x2, 
+    0xe9, 0xeb, 0x5, 0x5a, 0x2e, 0x2, 0xea, 0xdc, 0x3, 0x2, 0x2, 0x2, 0xea, 
+    0xe9, 0x3, 0x2, 0x2, 0x2, 0xeb, 0x3, 0x3, 0x2, 0x2, 0x2, 0xec, 0xff, 
+    0x5, 0x6, 0x4, 0x2, 0xed, 0xff, 0x5, 0x12, 0xa, 0x2, 0xee, 0xff, 0x5, 
+    0x14, 0xb, 0x2, 0xef, 0xff, 0x5, 0x16, 0xc, 0x2, 0xf0, 0xff, 0x5, 0x52, 
+    0x2a, 0x2, 0xf1, 0xff, 0x5, 0x54, 0x2b, 0x2, 0xf2, 0xff, 0x5, 0x56, 
+    0x2c, 0x2, 0xf3, 0xff, 0x5, 0x58, 0x2d, 0x2, 0xf4, 0xff, 0x5, 0x60, 
+    0x31, 0x2, 0xf5, 0xff, 0x5, 0x62, 0x32, 0x2, 0xf6, 0xff, 0x5, 0x64, 
+    0x33, 0x2, 0xf7, 0xff, 0x5, 0x68, 0x35, 0x2, 0xf8, 0xff, 0x5, 0x9e, 
+    0x50, 0x2, 0xf9, 0xff, 0x5, 0xa0, 0x51, 0x2, 0xfa, 0xff, 0x5, 0xa2, 
+    0x52, 0x2, 0xfb, 0xff, 0x5, 0xa4, 0x53, 0x2, 0xfc, 0xff, 0x5, 0xa6, 
+    0x54, 0x2, 0xfd, 0xff, 0x5, 0xa8, 0x55, 0x2, 0xfe, 0xec, 0x3, 0x2, 0x2, 
+    0x2, 0xfe, 0xed, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xee, 0x3, 0x2, 0x2, 0x2, 
+    0xfe, 0xef, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xf0, 0x3, 0x2, 0x2, 0x2, 0xfe, 
+    0xf1, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xf2, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xf3, 
+    0x3, 0x2, 0x2, 0x2, 0xfe, 0xf4, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xf5, 0x3, 
+    0x2, 0x2, 0x2, 0xfe, 0xf6, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xf7, 0x3, 0x2, 
+    0x2, 0x2, 0xfe, 0xf8, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xf9, 0x3, 0x2, 0x2, 
+    0x2, 0xfe, 0xfa, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xfb, 0x3, 0x2, 0x2, 0x2, 
+    0xfe, 0xfc, 0x3, 0x2, 0x2, 0x2, 0xfe, 0xfd, 0x3, 0x2, 0x2, 0x2, 0xff, 
+    0x5, 0x3, 0x2, 0x2, 0x2, 0x100, 0x101, 0x7, 0x7, 0x2, 0x2, 0x101, 0x102, 
+    0x7, 0x99, 0x2, 0x2, 0x102, 0x104, 0x5, 0xc0, 0x61, 0x2, 0x103, 0x105, 
+    0x5, 0x2c, 0x17, 0x2, 0x104, 0x103, 0x3, 0x2, 0x2, 0x2, 0x104, 0x105, 
+    0x3, 0x2, 0x2, 0x2, 0x105, 0x106, 0x3, 0x2, 0x2, 0x2, 0x106, 0x10b, 
+    0x5, 0x8, 0x5, 0x2, 0x107, 0x108, 0x7, 0xc4, 0x2, 0x2, 0x108, 0x10a, 
+    0x5, 0x8, 0x5, 0x2, 0x109, 0x107, 0x3, 0x2, 0x2, 0x2, 0x10a, 0x10d, 
+    0x3, 0x2, 0x2, 0x2, 0x10b, 0x109, 0x3, 0x2, 0x2, 0x2, 0x10b, 0x10c, 
+    0x3, 0x2, 0x2, 0x2, 0x10c, 0x7, 0x3, 0x2, 0x2, 0x2, 0x10d, 0x10b, 0x3, 
+    0x2, 0x2, 0x2, 0x10e, 0x10f, 0x7, 0x3, 0x2, 0x2, 0x10f, 0x113, 0x7, 
+    0x1b, 0x2, 0x2, 0x110, 0x111, 0x7, 0x4c, 0x2, 0x2, 0x111, 0x112, 0x7, 
+    0x71, 0x2, 0x2, 0x112, 0x114, 0x7, 0x37, 0x2, 0x2, 0x113, 0x110, 0x3, 
+    0x2, 0x2, 0x2, 0x113, 0x114, 0x3, 0x2, 0x2, 0x2, 0x114, 0x115, 0x3, 
+    0x2, 0x2, 0x2, 0x115, 0x118, 0x5, 0x44, 0x23, 0x2, 0x116, 0x117, 0x7, 
+    0x4, 0x2, 0x2, 0x117, 0x119, 0x5, 0xba, 0x5e, 0x2, 0x118, 0x116, 0x3, 
+    0x2, 0x2, 0x2, 0x118, 0x119, 0x3, 0x2, 0x2, 0x2, 0x119, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x11a, 0x11b, 0x7, 0x3, 0x2, 0x2, 0x11b, 0x11f, 0x7, 
+    0x4f, 0x2, 0x2, 0x11c, 0x11d, 0x7, 0x4c, 0x2, 0x2, 0x11d, 0x11e, 0x7, 
+    0x71, 0x2, 0x2, 0x11e, 0x120, 0x7, 0x37, 0x2, 0x2, 0x11f, 0x11c, 0x3, 
+    0x2, 0x2, 0x2, 0x11f, 0x120, 0x3, 0x2, 0x2, 0x2, 0x120, 0x121, 0x3, 
+    0x2, 0x2, 0x2, 0x121, 0x124, 0x5, 0x48, 0x25, 0x2, 0x122, 0x123, 0x7, 
+    0x4, 0x2, 0x2, 0x123, 0x125, 0x5, 0xba, 0x5e, 0x2, 0x124, 0x122, 0x3, 
+    0x2, 0x2, 0x2, 0x124, 0x125, 0x3, 0x2, 0x2, 0x2, 0x125, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x126, 0x127, 0x7, 0x3, 0x2, 0x2, 0x127, 0x12b, 0x7, 
+    0x7f, 0x2, 0x2, 0x128, 0x129, 0x7, 0x4c, 0x2, 0x2, 0x129, 0x12a, 0x7, 
+    0x71, 0x2, 0x2, 0x12a, 0x12c, 0x7, 0x37, 0x2, 0x2, 0x12b, 0x128, 0x3, 
+    0x2, 0x2, 0x2, 0x12b, 0x12c, 0x3, 0x2, 0x2, 0x2, 0x12c, 0x12d, 0x3, 
+    0x2, 0x2, 0x2, 0x12d, 0x130, 0x5, 0x4a, 0x26, 0x2, 0x12e, 0x12f, 0x7, 
+    0x4, 0x2, 0x2, 0x12f, 0x131, 0x5, 0xba, 0x5e, 0x2, 0x130, 0x12e, 0x3, 
+    0x2, 0x2, 0x2, 0x130, 0x131, 0x3, 0x2, 0x2, 0x2, 0x131, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x132, 0x133, 0x7, 0x10, 0x2, 0x2, 0x133, 0x136, 0x5, 
+    0x10, 0x9, 0x2, 0x134, 0x135, 0x7, 0x42, 0x2, 0x2, 0x135, 0x137, 0x5, 
+    0xc0, 0x61, 0x2, 0x136, 0x134, 0x3, 0x2, 0x2, 0x2, 0x136, 0x137, 0x3, 
+    0x2, 0x2, 0x2, 0x137, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x138, 0x139, 0x7, 
+    0x17, 0x2, 0x2, 0x139, 0x13c, 0x7, 0x1b, 0x2, 0x2, 0x13a, 0x13b, 0x7, 
+    0x4c, 0x2, 0x2, 0x13b, 0x13d, 0x7, 0x37, 0x2, 0x2, 0x13c, 0x13a, 0x3, 
+    0x2, 0x2, 0x2, 0x13c, 0x13d, 0x3, 0x2, 0x2, 0x2, 0x13d, 0x13e, 0x3, 
+    0x2, 0x2, 0x2, 0x13e, 0x141, 0x5, 0xba, 0x5e, 0x2, 0x13f, 0x140, 0x7, 
+    0x4e, 0x2, 0x2, 0x140, 0x142, 0x5, 0x10, 0x9, 0x2, 0x141, 0x13f, 0x3, 
+    0x2, 0x2, 0x2, 0x141, 0x142, 0x3, 0x2, 0x2, 0x2, 0x142, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x143, 0x144, 0x7, 0x17, 0x2, 0x2, 0x144, 0x147, 0x7, 
+    0x4f, 0x2, 0x2, 0x145, 0x146, 0x7, 0x4c, 0x2, 0x2, 0x146, 0x148, 0x7, 
+    0x37, 0x2, 0x2, 0x147, 0x145, 0x3, 0x2, 0x2, 0x2, 0x147, 0x148, 0x3, 
+    0x2, 0x2, 0x2, 0x148, 0x149, 0x3, 0x2, 0x2, 0x2, 0x149, 0x14c, 0x5, 
+    0xba, 0x5e, 0x2, 0x14a, 0x14b, 0x7, 0x4e, 0x2, 0x2, 0x14b, 0x14d, 0x5, 
+    0x10, 0x9, 0x2, 0x14c, 0x14a, 0x3, 0x2, 0x2, 0x2, 0x14c, 0x14d, 0x3, 
+    0x2, 0x2, 0x2, 0x14d, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x14e, 0x14f, 0x7, 
+    0x17, 0x2, 0x2, 0x14f, 0x152, 0x7, 0x7f, 0x2, 0x2, 0x150, 0x151, 0x7, 
+    0x4c, 0x2, 0x2, 0x151, 0x153, 0x7, 0x37, 0x2, 0x2, 0x152, 0x150, 0x3, 
+    0x2, 0x2, 0x2, 0x152, 0x153, 0x3, 0x2, 0x2, 0x2, 0x153, 0x154, 0x3, 
+    0x2, 0x2, 0x2, 0x154, 0x157, 0x5, 0xba, 0x5e, 0x2, 0x155, 0x156, 0x7, 
+    0x4e, 0x2, 0x2, 0x156, 0x158, 0x5, 0x10, 0x9, 0x2, 0x157, 0x155, 0x3, 
+    0x2, 0x2, 0x2, 0x157, 0x158, 0x3, 0x2, 0x2, 0x2, 0x158, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x159, 0x15a, 0x7, 0x1c, 0x2, 0x2, 0x15a, 0x15d, 0x7, 
+    0x1b, 0x2, 0x2, 0x15b, 0x15c, 0x7, 0x4c, 0x2, 0x2, 0x15c, 0x15e, 0x7, 
+    0x37, 0x2, 0x2, 0x15d, 0x15b, 0x3, 0x2, 0x2, 0x2, 0x15d, 0x15e, 0x3, 
+    0x2, 0x2, 0x2, 0x15e, 0x15f, 0x3, 0x2, 0x2, 0x2, 0x15f, 0x160, 0x5, 
+    0xba, 0x5e, 0x2, 0x160, 0x161, 0x7, 0xbe, 0x2, 0x2, 0x161, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x162, 0x163, 0x7, 0x28, 0x2, 0x2, 0x163, 0x164, 0x7, 
+    0xb4, 0x2, 0x2, 0x164, 0x1e5, 0x5, 0xb0, 0x59, 0x2, 0x165, 0x166, 0x7, 
+    0x2c, 0x2, 0x2, 0x166, 0x1e5, 0x5, 0x10, 0x9, 0x2, 0x167, 0x168, 0x7, 
+    0x32, 0x2, 0x2, 0x168, 0x16b, 0x7, 0x1b, 0x2, 0x2, 0x169, 0x16a, 0x7, 
+    0x4c, 0x2, 0x2, 0x16a, 0x16c, 0x7, 0x37, 0x2, 0x2, 0x16b, 0x169, 0x3, 
+    0x2, 0x2, 0x2, 0x16b, 0x16c, 0x3, 0x2, 0x2, 0x2, 0x16c, 0x16d, 0x3, 
+    0x2, 0x2, 0x2, 0x16d, 0x1e5, 0x5, 0xba, 0x5e, 0x2, 0x16e, 0x16f, 0x7, 
+    0x32, 0x2, 0x2, 0x16f, 0x172, 0x7, 0x4f, 0x2, 0x2, 0x170, 0x171, 0x7, 
+    0x4c, 0x2, 0x2, 0x171, 0x173, 0x7, 0x37, 0x2, 0x2, 0x172, 0x170, 0x3, 
+    0x2, 0x2, 0x2, 0x172, 0x173, 0x3, 0x2, 0x2, 0x2, 0x173, 0x174, 0x3, 
+    0x2, 0x2, 0x2, 0x174, 0x1e5, 0x5, 0xba, 0x5e, 0x2, 0x175, 0x176, 0x7, 
+    0x32, 0x2, 0x2, 0x176, 0x179, 0x7, 0x7f, 0x2, 0x2, 0x177, 0x178, 0x7, 
+    0x4c, 0x2, 0x2, 0x178, 0x17a, 0x7, 0x37, 0x2, 0x2, 0x179, 0x177, 0x3, 
+    0x2, 0x2, 0x2, 0x179, 0x17a, 0x3, 0x2, 0x2, 0x2, 0x17a, 0x17b, 0x3, 
+    0x2, 0x2, 0x2, 0x17b, 0x1e5, 0x5, 0xba, 0x5e, 0x2, 0x17c, 0x17d, 0x7, 
+    0x32, 0x2, 0x2, 0x17d, 0x1e5, 0x5, 0x10, 0x9, 0x2, 0x17e, 0x180, 0x7, 
+    0x41, 0x2, 0x2, 0x17f, 0x181, 0x5, 0x10, 0x9, 0x2, 0x180, 0x17f, 0x3, 
+    0x2, 0x2, 0x2, 0x180, 0x181, 0x3, 0x2, 0x2, 0x2, 0x181, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x182, 0x183, 0x7, 0x66, 0x2, 0x2, 0x183, 0x186, 0x7, 
+    0x4f, 0x2, 0x2, 0x184, 0x185, 0x7, 0x4c, 0x2, 0x2, 0x185, 0x187, 0x7, 
+    0x37, 0x2, 0x2, 0x186, 0x184, 0x3, 0x2, 0x2, 0x2, 0x186, 0x187, 0x3, 
+    0x2, 0x2, 0x2, 0x187, 0x188, 0x3, 0x2, 0x2, 0x2, 0x188, 0x18b, 0x5, 
+    0xba, 0x5e, 0x2, 0x189, 0x18a, 0x7, 0x4e, 0x2, 0x2, 0x18a, 0x18c, 0x5, 
+    0x10, 0x9, 0x2, 0x18b, 0x189, 0x3, 0x2, 0x2, 0x2, 0x18b, 0x18c, 0x3, 
+    0x2, 0x2, 0x2, 0x18c, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x18d, 0x18e, 0x7, 
+    0x66, 0x2, 0x2, 0x18e, 0x191, 0x7, 0x7f, 0x2, 0x2, 0x18f, 0x190, 0x7, 
+    0x4c, 0x2, 0x2, 0x190, 0x192, 0x7, 0x37, 0x2, 0x2, 0x191, 0x18f, 0x3, 
+    0x2, 0x2, 0x2, 0x191, 0x192, 0x3, 0x2, 0x2, 0x2, 0x192, 0x193, 0x3, 
+    0x2, 0x2, 0x2, 0x193, 0x196, 0x5, 0xba, 0x5e, 0x2, 0x194, 0x195, 0x7, 
+    0x4e, 0x2, 0x2, 0x195, 0x197, 0x5, 0x10, 0x9, 0x2, 0x196, 0x194, 0x3, 
+    0x2, 0x2, 0x2, 0x196, 0x197, 0x3, 0x2, 0x2, 0x2, 0x197, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x198, 0x199, 0x7, 0x6b, 0x2, 0x2, 0x199, 0x19c, 0x7, 
+    0x1b, 0x2, 0x2, 0x19a, 0x19b, 0x7, 0x4c, 0x2, 0x2, 0x19b, 0x19d, 0x7, 
+    0x37, 0x2, 0x2, 0x19c, 0x19a, 0x3, 0x2, 0x2, 0x2, 0x19c, 0x19d, 0x3, 
+    0x2, 0x2, 0x2, 0x19d, 0x19e, 0x3, 0x2, 0x2, 0x2, 0x19e, 0x19f, 0x5, 
+    0xba, 0x5e, 0x2, 0x19f, 0x1a0, 0x5, 0x4c, 0x27, 0x2, 0x1a0, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x1a1, 0x1a2, 0x7, 0x6b, 0x2, 0x2, 0x1a2, 0x1a5, 0x7, 
+    0x1b, 0x2, 0x2, 0x1a3, 0x1a4, 0x7, 0x4c, 0x2, 0x2, 0x1a4, 0x1a6, 0x7, 
+    0x37, 0x2, 0x2, 0x1a5, 0x1a3, 0x3, 0x2, 0x2, 0x2, 0x1a5, 0x1a6, 0x3, 
+    0x2, 0x2, 0x2, 0x1a6, 0x1a7, 0x3, 0x2, 0x2, 0x2, 0x1a7, 0x1a8, 0x5, 
+    0xba, 0x5e, 0x2, 0x1a8, 0x1a9, 0x7, 0x1c, 0x2, 0x2, 0x1a9, 0x1aa, 0x7, 
+    0xbe, 0x2, 0x2, 0x1aa, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x1ab, 0x1ac, 0x7, 
+    0x6b, 0x2, 0x2, 0x1ac, 0x1af, 0x7, 0x1b, 0x2, 0x2, 0x1ad, 0x1ae, 0x7, 
+    0x4c, 0x2, 0x2, 0x1ae, 0x1b0, 0x7, 0x37, 0x2, 0x2, 0x1af, 0x1ad, 0x3, 
+    0x2, 0x2, 0x2, 0x1af, 0x1b0, 0x3, 0x2, 0x2, 0x2, 0x1b0, 0x1b1, 0x3, 
+    0x2, 0x2, 0x2, 0x1b1, 0x1b2, 0x5, 0xba, 0x5e, 0x2, 0x1b2, 0x1b3, 0x7, 
+    0x83, 0x2, 0x2, 0x1b3, 0x1b4, 0x5, 0xe, 0x8, 0x2, 0x1b4, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x1b5, 0x1b6, 0x7, 0x6b, 0x2, 0x2, 0x1b6, 0x1b9, 0x7, 
+    0x1b, 0x2, 0x2, 0x1b7, 0x1b8, 0x7, 0x4c, 0x2, 0x2, 0x1b8, 0x1ba, 0x7, 
+    0x37, 0x2, 0x2, 0x1b9, 0x1b7, 0x3, 0x2, 0x2, 0x2, 0x1b9, 0x1ba, 0x3, 
+    0x2, 0x2, 0x2, 0x1ba, 0x1bb, 0x3, 0x2, 0x2, 0x2, 0x1bb, 0x1e5, 0x5, 
+    0x44, 0x23, 0x2, 0x1bc, 0x1bd, 0x7, 0x6b, 0x2, 0x2, 0x1bd, 0x1be, 0x7, 
+    0x78, 0x2, 0x2, 0x1be, 0x1bf, 0x7, 0x13, 0x2, 0x2, 0x1bf, 0x1e5, 0x5, 
+    0xb0, 0x59, 0x2, 0x1c0, 0x1c1, 0x7, 0x6b, 0x2, 0x2, 0x1c1, 0x1e5, 0x5, 
+    0x3e, 0x20, 0x2, 0x1c2, 0x1c3, 0x7, 0x6d, 0x2, 0x2, 0x1c3, 0x1cd, 0x5, 
+    0x10, 0x9, 0x2, 0x1c4, 0x1c5, 0x7, 0xa1, 0x2, 0x2, 0x1c5, 0x1c6, 0x7, 
+    0x2f, 0x2, 0x2, 0x1c6, 0x1ce, 0x7, 0xbe, 0x2, 0x2, 0x1c7, 0x1c8, 0x7, 
+    0xa1, 0x2, 0x2, 0x1c8, 0x1c9, 0x7, 0xb0, 0x2, 0x2, 0x1c9, 0x1ce, 0x7, 
+    0xbe, 0x2, 0x2, 0x1ca, 0x1cb, 0x7, 0xa1, 0x2, 0x2, 0x1cb, 0x1cc, 0x7, 
+    0x99, 0x2, 0x2, 0x1cc, 0x1ce, 0x5, 0xc0, 0x61, 0x2, 0x1cd, 0x1c4, 0x3, 
+    0x2, 0x2, 0x2, 0x1cd, 0x1c7, 0x3, 0x2, 0x2, 0x2, 0x1cd, 0x1ca, 0x3, 
+    0x2, 0x2, 0x2, 0x1ce, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x1cf, 0x1d0, 0x7, 
+    0x83, 0x2, 0x2, 0x1d0, 0x1e5, 0x7, 0xa7, 0x2, 0x2, 0x1d1, 0x1d2, 0x7, 
+    0x84, 0x2, 0x2, 0x1d2, 0x1d5, 0x7, 0x1b, 0x2, 0x2, 0x1d3, 0x1d4, 0x7, 
+    0x4c, 0x2, 0x2, 0x1d4, 0x1d6, 0x7, 0x37, 0x2, 0x2, 0x1d5, 0x1d3, 0x3, 
+    0x2, 0x2, 0x2, 0x1d5, 0x1d6, 0x3, 0x2, 0x2, 0x2, 0x1d6, 0x1d7, 0x3, 
+    0x2, 0x2, 0x2, 0x1d7, 0x1d8, 0x5, 0xba, 0x5e, 0x2, 0x1d8, 0x1d9, 0x7, 
+    0xa1, 0x2, 0x2, 0x1d9, 0x1da, 0x5, 0xba, 0x5e, 0x2, 0x1da, 0x1e5, 0x3, 
+    0x2, 0x2, 0x2, 0x1db, 0x1dc, 0x7, 0x85, 0x2, 0x2, 0x1dc, 0x1dd, 0x5, 
+    0x10, 0x9, 0x2, 0x1dd, 0x1de, 0x7, 0x42, 0x2, 0x2, 0x1de, 0x1df, 0x5, 
+    0xc0, 0x61, 0x2, 0x1df, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x1e0, 0x1e1, 0x7, 
+    0xaa, 0x2, 0x2, 0x1e1, 0x1e2, 0x5, 0xa, 0x6, 0x2, 0x1e2, 0x1e3, 0x5, 
+    0x78, 0x3d, 0x2, 0x1e3, 0x1e5, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x10e, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x11a, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x126, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x132, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x138, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x143, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x14e, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x159, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x162, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x165, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x167, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x16e, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x175, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x17c, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x17e, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x182, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x18d, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x198, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x1a1, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x1ab, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x1b5, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x1bc, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x1c0, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x1c2, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x1cf, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x1d1, 0x3, 0x2, 0x2, 0x2, 0x1e4, 0x1db, 0x3, 
+    0x2, 0x2, 0x2, 0x1e4, 0x1e0, 0x3, 0x2, 0x2, 0x2, 0x1e5, 0x9, 0x3, 0x2, 
+    0x2, 0x2, 0x1e6, 0x1eb, 0x5, 0xc, 0x7, 0x2, 0x1e7, 0x1e8, 0x7, 0xc4, 
+    0x2, 0x2, 0x1e8, 0x1ea, 0x5, 0xc, 0x7, 0x2, 0x1e9, 0x1e7, 0x3, 0x2, 
+    0x2, 0x2, 0x1ea, 0x1ed, 0x3, 0x2, 0x2, 0x2, 0x1eb, 0x1e9, 0x3, 0x2, 
+    0x2, 0x2, 0x1eb, 0x1ec, 0x3, 0x2, 0x2, 0x2, 0x1ec, 0xb, 0x3, 0x2, 0x2, 
+    0x2, 0x1ed, 0x1eb, 0x3, 0x2, 0x2, 0x2, 0x1ee, 0x1ef, 0x5, 0xba, 0x5e, 
+    0x2, 0x1ef, 0x1f0, 0x7, 0xc9, 0x2, 0x2, 0x1f0, 0x1f1, 0x5, 0xb0, 0x59, 
+    0x2, 0x1f1, 0xd, 0x3, 0x2, 0x2, 0x2, 0x1f2, 0x1f3, 0x9, 0x2, 0x2, 0x2, 
+    0x1f3, 0xf, 0x3, 0x2, 0x2, 0x2, 0x1f4, 0x1f5, 0x7, 0x7b, 0x2, 0x2, 0x1f5, 
+    0x1fa, 0x5, 0xb0, 0x59, 0x2, 0x1f6, 0x1f7, 0x7, 0x7b, 0x2, 0x2, 0x1f7, 
+    0x1f8, 0x7, 0x4b, 0x2, 0x2, 0x1f8, 0x1fa, 0x7, 0xbe, 0x2, 0x2, 0x1f9, 
+    0x1f4, 0x3, 0x2, 0x2, 0x2, 0x1f9, 0x1f6, 0x3, 0x2, 0x2, 0x2, 0x1fa, 
+    0x11, 0x3, 0x2, 0x2, 0x2, 0x1fb, 0x1fc, 0x7, 0x10, 0x2, 0x2, 0x1fc, 
+    0x1fd, 0x7, 0x2e, 0x2, 0x2, 0x1fd, 0x1ff, 0x5, 0xc0, 0x61, 0x2, 0x1fe, 
+    0x200, 0x5, 0x2c, 0x17, 0x2, 0x1ff, 0x1fe, 0x3, 0x2, 0x2, 0x2, 0x1ff, 
+    0x200, 0x3, 0x2, 0x2, 0x2, 0x200, 0x13, 0x3, 0x2, 0x2, 0x2, 0x201, 0x202, 
+    0x7, 0x16, 0x2, 0x2, 0x202, 0x203, 0x7, 0x99, 0x2, 0x2, 0x203, 0x205, 
+    0x5, 0xc0, 0x61, 0x2, 0x204, 0x206, 0x5, 0x10, 0x9, 0x2, 0x205, 0x204, 
+    0x3, 0x2, 0x2, 0x2, 0x205, 0x206, 0x3, 0x2, 0x2, 0x2, 0x206, 0x15, 0x3, 
+    0x2, 0x2, 0x2, 0x207, 0x208, 0x9, 0x3, 0x2, 0x2, 0x208, 0x20c, 0x7, 
+    0x21, 0x2, 0x2, 0x209, 0x20a, 0x7, 0x4c, 0x2, 0x2, 0x20a, 0x20b, 0x7, 
+    0x71, 0x2, 0x2, 0x20b, 0x20d, 0x7, 0x37, 0x2, 0x2, 0x20c, 0x209, 0x3, 
+    0x2, 0x2, 0x2, 0x20c, 0x20d, 0x3, 0x2, 0x2, 0x2, 0x20d, 0x20e, 0x3, 
+    0x2, 0x2, 0x2, 0x20e, 0x210, 0x5, 0xc6, 0x64, 0x2, 0x20f, 0x211, 0x5, 
+    0x2c, 0x17, 0x2, 0x210, 0x20f, 0x3, 0x2, 0x2, 0x2, 0x210, 0x211, 0x3, 
+    0x2, 0x2, 0x2, 0x211, 0x213, 0x3, 0x2, 0x2, 0x2, 0x212, 0x214, 0x5, 
+    0x40, 0x21, 0x2, 0x213, 0x212, 0x3, 0x2, 0x2, 0x2, 0x213, 0x214, 0x3, 
+    0x2, 0x2, 0x2, 0x214, 0x291, 0x3, 0x2, 0x2, 0x2, 0x215, 0x216, 0x9, 
+    0x3, 0x2, 0x2, 0x216, 0x21a, 0x7, 0x2e, 0x2, 0x2, 0x217, 0x218, 0x7, 
+    0x4c, 0x2, 0x2, 0x218, 0x219, 0x7, 0x71, 0x2, 0x2, 0x219, 0x21b, 0x7, 
+    0x37, 0x2, 0x2, 0x21a, 0x217, 0x3, 0x2, 0x2, 0x2, 0x21a, 0x21b, 0x3, 
+    0x2, 0x2, 0x2, 0x21b, 0x21c, 0x3, 0x2, 0x2, 0x2, 0x21c, 0x21e, 0x5, 
+    0xc0, 0x61, 0x2, 0x21d, 0x21f, 0x5, 0x2e, 0x18, 0x2, 0x21e, 0x21d, 0x3, 
+    0x2, 0x2, 0x2, 0x21e, 0x21f, 0x3, 0x2, 0x2, 0x2, 0x21f, 0x221, 0x3, 
+    0x2, 0x2, 0x2, 0x220, 0x222, 0x5, 0x2c, 0x17, 0x2, 0x221, 0x220, 0x3, 
+    0x2, 0x2, 0x2, 0x221, 0x222, 0x3, 0x2, 0x2, 0x2, 0x222, 0x223, 0x3, 
+    0x2, 0x2, 0x2, 0x223, 0x224, 0x5, 0x18, 0xd, 0x2, 0x224, 0x225, 0x5, 
+    0x1c, 0xf, 0x2, 0x225, 0x291, 0x3, 0x2, 0x2, 0x2, 0x226, 0x227, 0x9, 
+    0x3, 0x2, 0x2, 0x227, 0x228, 0x7, 0x62, 0x2, 0x2, 0x228, 0x22c, 0x7, 
+    0xaf, 0x2, 0x2, 0x229, 0x22a, 0x7, 0x4c, 0x2, 0x2, 0x22a, 0x22b, 0x7, 
+    0x71, 0x2, 0x2, 0x22b, 0x22d, 0x7, 0x37, 0x2, 0x2, 0x22c, 0x229, 0x3, 
+    0x2, 0x2, 0x2, 0x22c, 0x22d, 0x3, 0x2, 0x2, 0x2, 0x22d, 0x22e, 0x3, 
+    0x2, 0x2, 0x2, 0x22e, 0x230, 0x5, 0xc0, 0x61, 0x2, 0x22f, 0x231, 0x5, 
+    0x2e, 0x18, 0x2, 0x230, 0x22f, 0x3, 0x2, 0x2, 0x2, 0x230, 0x231, 0x3, 
+    0x2, 0x2, 0x2, 0x231, 0x233, 0x3, 0x2, 0x2, 0x2, 0x232, 0x234, 0x5, 
+    0x2c, 0x17, 0x2, 0x233, 0x232, 0x3, 0x2, 0x2, 0x2, 0x233, 0x234, 0x3, 
+    0x2, 0x2, 0x2, 0x234, 0x23a, 0x3, 0x2, 0x2, 0x2, 0x235, 0x236, 0x7, 
+    0xb5, 0x2, 0x2, 0x236, 0x238, 0x7, 0x9f, 0x2, 0x2, 0x237, 0x239, 0x7, 
+    0xbc, 0x2, 0x2, 0x238, 0x237, 0x3, 0x2, 0x2, 0x2, 0x238, 0x239, 0x3, 
+    0x2, 0x2, 0x2, 0x239, 0x23b, 0x3, 0x2, 0x2, 0x2, 0x23a, 0x235, 0x3, 
+    0x2, 0x2, 0x2, 0x23a, 0x23b, 0x3, 0x2, 0x2, 0x2, 0x23b, 0x23d, 0x3, 
+    0x2, 0x2, 0x2, 0x23c, 0x23e, 0x5, 0x30, 0x19, 0x2, 0x23d, 0x23c, 0x3, 
+    0x2, 0x2, 0x2, 0x23d, 0x23e, 0x3, 0x2, 0x2, 0x2, 0x23e, 0x240, 0x3, 
+    0x2, 0x2, 0x2, 0x23f, 0x241, 0x5, 0x34, 0x1b, 0x2, 0x240, 0x23f, 0x3, 
+    0x2, 0x2, 0x2, 0x240, 0x241, 0x3, 0x2, 0x2, 0x2, 0x241, 0x242, 0x3, 
+    0x2, 0x2, 0x2, 0x242, 0x243, 0x5, 0x32, 0x1a, 0x2, 0x243, 0x291, 0x3, 
+    0x2, 0x2, 0x2, 0x244, 0x245, 0x9, 0x3, 0x2, 0x2, 0x245, 0x246, 0x7, 
+    0x65, 0x2, 0x2, 0x246, 0x24a, 0x7, 0xaf, 0x2, 0x2, 0x247, 0x248, 0x7, 
+    0x4c, 0x2, 0x2, 0x248, 0x249, 0x7, 0x71, 0x2, 0x2, 0x249, 0x24b, 0x7, 
+    0x37, 0x2, 0x2, 0x24a, 0x247, 0x3, 0x2, 0x2, 0x2, 0x24a, 0x24b, 0x3, 
+    0x2, 0x2, 0x2, 0x24b, 0x24c, 0x3, 0x2, 0x2, 0x2, 0x24c, 0x24e, 0x5, 
+    0xc0, 0x61, 0x2, 0x24d, 0x24f, 0x5, 0x2e, 0x18, 0x2, 0x24e, 0x24d, 0x3, 
+    0x2, 0x2, 0x2, 0x24e, 0x24f, 0x3, 0x2, 0x2, 0x2, 0x24f, 0x251, 0x3, 
+    0x2, 0x2, 0x2, 0x250, 0x252, 0x5, 0x2c, 0x17, 0x2, 0x251, 0x250, 0x3, 
+    0x2, 0x2, 0x2, 0x251, 0x252, 0x3, 0x2, 0x2, 0x2, 0x252, 0x254, 0x3, 
+    0x2, 0x2, 0x2, 0x253, 0x255, 0x5, 0x34, 0x1b, 0x2, 0x254, 0x253, 0x3, 
+    0x2, 0x2, 0x2, 0x254, 0x255, 0x3, 0x2, 0x2, 0x2, 0x255, 0x25b, 0x3, 
+    0x2, 0x2, 0x2, 0x256, 0x25c, 0x5, 0x30, 0x19, 0x2, 0x257, 0x259, 0x5, 
+    0x36, 0x1c, 0x2, 0x258, 0x25a, 0x7, 0x7c, 0x2, 0x2, 0x259, 0x258, 0x3, 
+    0x2, 0x2, 0x2, 0x259, 0x25a, 0x3, 0x2, 0x2, 0x2, 0x25a, 0x25c, 0x3, 
+    0x2, 0x2, 0x2, 0x25b, 0x256, 0x3, 0x2, 0x2, 0x2, 0x25b, 0x257, 0x3, 
+    0x2, 0x2, 0x2, 0x25c, 0x25d, 0x3, 0x2, 0x2, 0x2, 0x25d, 0x25e, 0x5, 
+    0x32, 0x1a, 0x2, 0x25e, 0x291, 0x3, 0x2, 0x2, 0x2, 0x25f, 0x261, 0x9, 
+    0x3, 0x2, 0x2, 0x260, 0x262, 0x7, 0x9b, 0x2, 0x2, 0x261, 0x260, 0x3, 
+    0x2, 0x2, 0x2, 0x261, 0x262, 0x3, 0x2, 0x2, 0x2, 0x262, 0x263, 0x3, 
+    0x2, 0x2, 0x2, 0x263, 0x267, 0x7, 0x99, 0x2, 0x2, 0x264, 0x265, 0x7, 
+    0x4c, 0x2, 0x2, 0x265, 0x266, 0x7, 0x71, 0x2, 0x2, 0x266, 0x268, 0x7, 
+    0x37, 0x2, 0x2, 0x267, 0x264, 0x3, 0x2, 0x2, 0x2, 0x267, 0x268, 0x3, 
+    0x2, 0x2, 0x2, 0x268, 0x269, 0x3, 0x2, 0x2, 0x2, 0x269, 0x26b, 0x5, 
+    0xc0, 0x61, 0x2, 0x26a, 0x26c, 0x5, 0x2e, 0x18, 0x2, 0x26b, 0x26a, 0x3, 
+    0x2, 0x2, 0x2, 0x26b, 0x26c, 0x3, 0x2, 0x2, 0x2, 0x26c, 0x26e, 0x3, 
+    0x2, 0x2, 0x2, 0x26d, 0x26f, 0x5, 0x2c, 0x17, 0x2, 0x26e, 0x26d, 0x3, 
+    0x2, 0x2, 0x2, 0x26e, 0x26f, 0x3, 0x2, 0x2, 0x2, 0x26f, 0x271, 0x3, 
+    0x2, 0x2, 0x2, 0x270, 0x272, 0x5, 0x34, 0x1b, 0x2, 0x271, 0x270, 0x3, 
+    0x2, 0x2, 0x2, 0x271, 0x272, 0x3, 0x2, 0x2, 0x2, 0x272, 0x274, 0x3, 
+    0x2, 0x2, 0x2, 0x273, 0x275, 0x5, 0x36, 0x1c, 0x2, 0x274, 0x273, 0x3, 
+    0x2, 0x2, 0x2, 0x274, 0x275, 0x3, 0x2, 0x2, 0x2, 0x275, 0x277, 0x3, 
+    0x2, 0x2, 0x2, 0x276, 0x278, 0x5, 0x32, 0x1a, 0x2, 0x277, 0x276, 0x3, 
+    0x2, 0x2, 0x2, 0x277, 0x278, 0x3, 0x2, 0x2, 0x2, 0x278, 0x291, 0x3, 
+    0x2, 0x2, 0x2, 0x279, 0x27c, 0x9, 0x3, 0x2, 0x2, 0x27a, 0x27b, 0x7, 
+    0x77, 0x2, 0x2, 0x27b, 0x27d, 0x7, 0x85, 0x2, 0x2, 0x27c, 0x27a, 0x3, 
+    0x2, 0x2, 0x2, 0x27c, 0x27d, 0x3, 0x2, 0x2, 0x2, 0x27d, 0x27e, 0x3, 
+    0x2, 0x2, 0x2, 0x27e, 0x282, 0x7, 0xaf, 0x2, 0x2, 0x27f, 0x280, 0x7, 
+    0x4c, 0x2, 0x2, 0x280, 0x281, 0x7, 0x71, 0x2, 0x2, 0x281, 0x283, 0x7, 
+    0x37, 0x2, 0x2, 0x282, 0x27f, 0x3, 0x2, 0x2, 0x2, 0x282, 0x283, 0x3, 
+    0x2, 0x2, 0x2, 0x283, 0x284, 0x3, 0x2, 0x2, 0x2, 0x284, 0x286, 0x5, 
+    0xc0, 0x61, 0x2, 0x285, 0x287, 0x5, 0x2e, 0x18, 0x2, 0x286, 0x285, 0x3, 
+    0x2, 0x2, 0x2, 0x286, 0x287, 0x3, 0x2, 0x2, 0x2, 0x287, 0x289, 0x3, 
+    0x2, 0x2, 0x2, 0x288, 0x28a, 0x5, 0x2c, 0x17, 0x2, 0x289, 0x288, 0x3, 
+    0x2, 0x2, 0x2, 0x289, 0x28a, 0x3, 0x2, 0x2, 0x2, 0x28a, 0x28c, 0x3, 
+    0x2, 0x2, 0x2, 0x28b, 0x28d, 0x5, 0x34, 0x1b, 0x2, 0x28c, 0x28b, 0x3, 
+    0x2, 0x2, 0x2, 0x28c, 0x28d, 0x3, 0x2, 0x2, 0x2, 0x28d, 0x28e, 0x3, 
+    0x2, 0x2, 0x2, 0x28e, 0x28f, 0x5, 0x32, 0x1a, 0x2, 0x28f, 0x291, 0x3, 
+    0x2, 0x2, 0x2, 0x290, 0x207, 0x3, 0x2, 0x2, 0x2, 0x290, 0x215, 0x3, 
+    0x2, 0x2, 0x2, 0x290, 0x226, 0x3, 0x2, 0x2, 0x2, 0x290, 0x244, 0x3, 
+    0x2, 0x2, 0x2, 0x290, 0x25f, 0x3, 0x2, 0x2, 0x2, 0x290, 0x279, 0x3, 
+    0x2, 0x2, 0x2, 0x291, 0x17, 0x3, 0x2, 0x2, 0x2, 0x292, 0x293, 0x7, 0xcf, 
+    0x2, 0x2, 0x293, 0x298, 0x5, 0x1a, 0xe, 0x2, 0x294, 0x295, 0x7, 0xc4, 
+    0x2, 0x2, 0x295, 0x297, 0x5, 0x1a, 0xe, 0x2, 0x296, 0x294, 0x3, 0x2, 
+    0x2, 0x2, 0x297, 0x29a, 0x3, 0x2, 0x2, 0x2, 0x298, 0x296, 0x3, 0x2, 
+    0x2, 0x2, 0x298, 0x299, 0x3, 0x2, 0x2, 0x2, 0x299, 0x29b, 0x3, 0x2, 
+    0x2, 0x2, 0x29a, 0x298, 0x3, 0x2, 0x2, 0x2, 0x29b, 0x29c, 0x7, 0xd9, 
+    0x2, 0x2, 0x29c, 0x19, 0x3, 0x2, 0x2, 0x2, 0x29d, 0x29e, 0x5, 0xd6, 
+    0x6c, 0x2, 0x29e, 0x2b4, 0x5, 0xaa, 0x56, 0x2, 0x29f, 0x2a0, 0x6, 0xe, 
+    0x2, 0x3, 0x2a0, 0x2a1, 0x7, 0x26, 0x2, 0x2, 0x2a1, 0x2a2, 0x5, 0xcc, 
+    0x67, 0x2, 0x2a2, 0x2a3, 0x8, 0xe, 0x1, 0x2, 0x2a3, 0x2b3, 0x3, 0x2, 
+    0x2, 0x2, 0x2a4, 0x2a5, 0x6, 0xe, 0x3, 0x3, 0x2a5, 0x2a6, 0x7, 0x39, 
+    0x2, 0x2, 0x2a6, 0x2a7, 0x5, 0xb0, 0x59, 0x2, 0x2a7, 0x2a8, 0x8, 0xe, 
+    0x1, 0x2, 0x2a8, 0x2b3, 0x3, 0x2, 0x2, 0x2, 0x2a9, 0x2aa, 0x6, 0xe, 
+    0x4, 0x3, 0x2aa, 0x2ab, 0x7, 0x49, 0x2, 0x2, 0x2ab, 0x2b3, 0x8, 0xe, 
+    0x1, 0x2, 0x2ac, 0x2ad, 0x6, 0xe, 0x5, 0x3, 0x2ad, 0x2ae, 0x7, 0x51, 
+    0x2, 0x2, 0x2ae, 0x2b3, 0x8, 0xe, 0x1, 0x2, 0x2af, 0x2b0, 0x6, 0xe, 
+    0x6, 0x3, 0x2b0, 0x2b1, 0x7, 0x57, 0x2, 0x2, 0x2b1, 0x2b3, 0x8, 0xe, 
+    0x1, 0x2, 0x2b2, 0x29f, 0x3, 0x2, 0x2, 0x2, 0x2b2, 0x2a4, 0x3, 0x2, 
+    0x2, 0x2, 0x2b2, 0x2a9, 0x3, 0x2, 0x2, 0x2, 0x2b2, 0x2ac, 0x3, 0x2, 
+    0x2, 0x2, 0x2b2, 0x2af, 0x3, 0x2, 0x2, 0x2, 0x2b3, 0x2b6, 0x3, 0x2, 
+    0x2, 0x2, 0x2b4, 0x2b2, 0x3, 0x2, 0x2, 0x2, 0x2b4, 0x2b5, 0x3, 0x2, 
+    0x2, 0x2, 0x2b5, 0x1b, 0x3, 0x2, 0x2, 0x2, 0x2b6, 0x2b4, 0x3, 0x2, 0x2, 
+    0x2, 0x2b7, 0x2b9, 0x5, 0x1e, 0x10, 0x2, 0x2b8, 0x2b7, 0x3, 0x2, 0x2, 
+    0x2, 0x2b8, 0x2b9, 0x3, 0x2, 0x2, 0x2, 0x2b9, 0x2d0, 0x3, 0x2, 0x2, 
+    0x2, 0x2ba, 0x2bb, 0x6, 0xf, 0x7, 0x3, 0x2bb, 0x2bc, 0x5, 0x22, 0x12, 
+    0x2, 0x2bc, 0x2bd, 0x8, 0xf, 0x1, 0x2, 0x2bd, 0x2cf, 0x3, 0x2, 0x2, 
+    0x2, 0x2be, 0x2bf, 0x6, 0xf, 0x8, 0x3, 0x2bf, 0x2c0, 0x5, 0x24, 0x13, 
+    0x2, 0x2c0, 0x2c1, 0x8, 0xf, 0x1, 0x2, 0x2c1, 0x2cf, 0x3, 0x2, 0x2, 
+    0x2, 0x2c2, 0x2c3, 0x6, 0xf, 0x9, 0x3, 0x2c3, 0x2c4, 0x5, 0x26, 0x14, 
+    0x2, 0x2c4, 0x2c5, 0x8, 0xf, 0x1, 0x2, 0x2c5, 0x2cf, 0x3, 0x2, 0x2, 
+    0x2, 0x2c6, 0x2c7, 0x6, 0xf, 0xa, 0x3, 0x2c7, 0x2c8, 0x5, 0x28, 0x15, 
+    0x2, 0x2c8, 0x2c9, 0x8, 0xf, 0x1, 0x2, 0x2c9, 0x2cf, 0x3, 0x2, 0x2, 
+    0x2, 0x2ca, 0x2cb, 0x6, 0xf, 0xb, 0x3, 0x2cb, 0x2cc, 0x5, 0x2a, 0x16, 
+    0x2, 0x2cc, 0x2cd, 0x8, 0xf, 0x1, 0x2, 0x2cd, 0x2cf, 0x3, 0x2, 0x2, 
+    0x2, 0x2ce, 0x2ba, 0x3, 0x2, 0x2, 0x2, 0x2ce, 0x2be, 0x3, 0x2, 0x2, 
+    0x2, 0x2ce, 0x2c2, 0x3, 0x2, 0x2, 0x2, 0x2ce, 0x2c6, 0x3, 0x2, 0x2, 
+    0x2, 0x2ce, 0x2ca, 0x3, 0x2, 0x2, 0x2, 0x2cf, 0x2d2, 0x3, 0x2, 0x2, 
+    0x2, 0x2d0, 0x2ce, 0x3, 0x2, 0x2, 0x2, 0x2d0, 0x2d1, 0x3, 0x2, 0x2, 
+    0x2, 0x2d1, 0x1d, 0x3, 0x2, 0x2, 0x2, 0x2d2, 0x2d0, 0x3, 0x2, 0x2, 0x2, 
+    0x2d3, 0x2d4, 0x7, 0x7e, 0x2, 0x2, 0x2d4, 0x2d5, 0x7, 0x59, 0x2, 0x2, 
+    0x2d5, 0x2d6, 0x5, 0xac, 0x57, 0x2, 0x2d6, 0x1f, 0x3, 0x2, 0x2, 0x2, 
+    0x2d7, 0x2de, 0x5, 0xd6, 0x6c, 0x2, 0x2d8, 0x2db, 0x5, 0xd6, 0x6c, 0x2, 
+    0x2d9, 0x2da, 0x7, 0xcf, 0x2, 0x2, 0x2da, 0x2dc, 0x7, 0xd9, 0x2, 0x2, 
+    0x2db, 0x2d9, 0x3, 0x2, 0x2, 0x2, 0x2db, 0x2dc, 0x3, 0x2, 0x2, 0x2, 
+    0x2dc, 0x2df, 0x3, 0x2, 0x2, 0x2, 0x2dd, 0x2df, 0x5, 0xcc, 0x67, 0x2, 
+    0x2de, 0x2d8, 0x3, 0x2, 0x2, 0x2, 0x2de, 0x2dd, 0x3, 0x2, 0x2, 0x2, 
+    0x2df, 0x21, 0x3, 0x2, 0x2, 0x2, 0x2e0, 0x2e1, 0x7, 0x92, 0x2, 0x2, 
+    0x2e1, 0x2e2, 0x7, 0xcf, 0x2, 0x2, 0x2e2, 0x2e3, 0x5, 0xd6, 0x6c, 0x2, 
+    0x2e3, 0x2e7, 0x7, 0xcf, 0x2, 0x2, 0x2e4, 0x2e6, 0x5, 0x20, 0x11, 0x2, 
+    0x2e5, 0x2e4, 0x3, 0x2, 0x2, 0x2, 0x2e6, 0x2e9, 0x3, 0x2, 0x2, 0x2, 
+    0x2e7, 0x2e5, 0x3, 0x2, 0x2, 0x2, 0x2e7, 0x2e8, 0x3, 0x2, 0x2, 0x2, 
+    0x2e8, 0x2ea, 0x3, 0x2, 0x2, 0x2, 0x2e9, 0x2e7, 0x3, 0x2, 0x2, 0x2, 
+    0x2ea, 0x2eb, 0x7, 0xd9, 0x2, 0x2, 0x2eb, 0x2ec, 0x7, 0xd9, 0x2, 0x2, 
+    0x2ec, 0x23, 0x3, 0x2, 0x2, 0x2, 0x2ed, 0x2ee, 0x7, 0x5f, 0x2, 0x2, 
+    0x2ee, 0x2f8, 0x7, 0xcf, 0x2, 0x2, 0x2ef, 0x2f9, 0x7, 0xbc, 0x2, 0x2, 
+    0x2f0, 0x2f1, 0x7, 0x69, 0x2, 0x2, 0x2f1, 0x2f2, 0x7, 0xbc, 0x2, 0x2, 
+    0x2f2, 0x2f3, 0x7, 0x67, 0x2, 0x2, 0x2f3, 0x2f9, 0x7, 0xbc, 0x2, 0x2, 
+    0x2f4, 0x2f5, 0x7, 0x67, 0x2, 0x2, 0x2f5, 0x2f6, 0x7, 0xbc, 0x2, 0x2, 
+    0x2f6, 0x2f7, 0x7, 0x69, 0x2, 0x2, 0x2f7, 0x2f9, 0x7, 0xbc, 0x2, 0x2, 
+    0x2f8, 0x2ef, 0x3, 0x2, 0x2, 0x2, 0x2f8, 0x2f0, 0x3, 0x2, 0x2, 0x2, 
+    0x2f8, 0x2f4, 0x3, 0x2, 0x2, 0x2, 0x2f9, 0x2fa, 0x3, 0x2, 0x2, 0x2, 
+    0x2fa, 0x2fb, 0x7, 0xd9, 0x2, 0x2, 0x2fb, 0x25, 0x3, 0x2, 0x2, 0x2, 
+    0x2fc, 0x2fd, 0x7, 0x5c, 0x2, 0x2, 0x2fd, 0x2fe, 0x7, 0xcf, 0x2, 0x2, 
+    0x2fe, 0x2ff, 0x5, 0xd6, 0x6c, 0x2, 0x2ff, 0x303, 0x7, 0xcf, 0x2, 0x2, 
+    0x300, 0x302, 0x5, 0x20, 0x11, 0x2, 0x301, 0x300, 0x3, 0x2, 0x2, 0x2, 
+    0x302, 0x305, 0x3, 0x2, 0x2, 0x2, 0x303, 0x301, 0x3, 0x2, 0x2, 0x2, 
+    0x303, 0x304, 0x3, 0x2, 0x2, 0x2, 0x304, 0x306, 0x3, 0x2, 0x2, 0x2, 
+    0x305, 0x303, 0x3, 0x2, 0x2, 0x2, 0x306, 0x307, 0x7, 0xd9, 0x2, 0x2, 
+    0x307, 0x308, 0x7, 0xd9, 0x2, 0x2, 0x308, 0x27, 0x3, 0x2, 0x2, 0x2, 
+    0x309, 0x30a, 0x7, 0x81, 0x2, 0x2, 0x30a, 0x315, 0x7, 0xcf, 0x2, 0x2, 
+    0x30b, 0x30c, 0x7, 0x69, 0x2, 0x2, 0x30c, 0x30d, 0x5, 0xd6, 0x6c, 0x2, 
+    0x30d, 0x30e, 0x7, 0x67, 0x2, 0x2, 0x30e, 0x30f, 0x5, 0xd6, 0x6c, 0x2, 
+    0x30f, 0x316, 0x3, 0x2, 0x2, 0x2, 0x310, 0x311, 0x7, 0x67, 0x2, 0x2, 
+    0x311, 0x312, 0x5, 0xd6, 0x6c, 0x2, 0x312, 0x313, 0x7, 0x69, 0x2, 0x2, 
+    0x313, 0x314, 0x5, 0xd6, 0x6c, 0x2, 0x314, 0x316, 0x3, 0x2, 0x2, 0x2, 
+    0x315, 0x30b, 0x3, 0x2, 0x2, 0x2, 0x315, 0x310, 0x3, 0x2, 0x2, 0x2, 
+    0x316, 0x317, 0x3, 0x2, 0x2, 0x2, 0x317, 0x318, 0x7, 0xd9, 0x2, 0x2, 
+    0x318, 0x29, 0x3, 0x2, 0x2, 0x2, 0x319, 0x31a, 0x7, 0x90, 0x2, 0x2, 
+    0x31a, 0x31b, 0x7, 0xcf, 0x2, 0x2, 0x31b, 0x31c, 0x5, 0x9a, 0x4e, 0x2, 
+    0x31c, 0x31d, 0x7, 0xd9, 0x2, 0x2, 0x31d, 0x2b, 0x3, 0x2, 0x2, 0x2, 
+    0x31e, 0x31f, 0x7, 0x75, 0x2, 0x2, 0x31f, 0x322, 0x7, 0x18, 0x2, 0x2, 
+    0x320, 0x323, 0x5, 0xd6, 0x6c, 0x2, 0x321, 0x323, 0x7, 0xbe, 0x2, 0x2, 
+    0x322, 0x320, 0x3, 0x2, 0x2, 0x2, 0x322, 0x321, 0x3, 0x2, 0x2, 0x2, 
+    0x323, 0x2d, 0x3, 0x2, 0x2, 0x2, 0x324, 0x325, 0x7, 0xad, 0x2, 0x2, 
+    0x325, 0x326, 0x7, 0xbe, 0x2, 0x2, 0x326, 0x2f, 0x3, 0x2, 0x2, 0x2, 
+    0x327, 0x328, 0x7, 0xa1, 0x2, 0x2, 0x328, 0x329, 0x5, 0xc0, 0x61, 0x2, 
+    0x329, 0x31, 0x3, 0x2, 0x2, 0x2, 0x32a, 0x32b, 0x7, 0xc, 0x2, 0x2, 0x32b, 
+    0x32c, 0x5, 0x68, 0x35, 0x2, 0x32c, 0x33, 0x3, 0x2, 0x2, 0x2, 0x32d, 
+    0x32e, 0x7, 0xcf, 0x2, 0x2, 0x32e, 0x333, 0x5, 0x42, 0x22, 0x2, 0x32f, 
+    0x330, 0x7, 0xc4, 0x2, 0x2, 0x330, 0x332, 0x5, 0x42, 0x22, 0x2, 0x331, 
+    0x32f, 0x3, 0x2, 0x2, 0x2, 0x332, 0x335, 0x3, 0x2, 0x2, 0x2, 0x333, 
+    0x331, 0x3, 0x2, 0x2, 0x2, 0x333, 0x334, 0x3, 0x2, 0x2, 0x2, 0x334, 
+    0x336, 0x3, 0x2, 0x2, 0x2, 0x335, 0x333, 0x3, 0x2, 0x2, 0x2, 0x336, 
+    0x337, 0x7, 0xd9, 0x2, 0x2, 0x337, 0x33d, 0x3, 0x2, 0x2, 0x2, 0x338, 
+    0x339, 0x7, 0xc, 0x2, 0x2, 0x339, 0x33d, 0x5, 0xc0, 0x61, 0x2, 0x33a, 
+    0x33b, 0x7, 0xc, 0x2, 0x2, 0x33b, 0x33d, 0x5, 0xbe, 0x60, 0x2, 0x33c, 
+    0x32d, 0x3, 0x2, 0x2, 0x2, 0x33c, 0x338, 0x3, 0x2, 0x2, 0x2, 0x33c, 
+    0x33a, 0x3, 0x2, 0x2, 0x2, 0x33d, 0x35, 0x3, 0x2, 0x2, 0x2, 0x33e, 0x359, 
+    0x5, 0x40, 0x21, 0x2, 0x33f, 0x340, 0x6, 0x1c, 0xc, 0x3, 0x340, 0x341, 
+    0x5, 0x7e, 0x40, 0x2, 0x341, 0x342, 0x8, 0x1c, 0x1, 0x2, 0x342, 0x358, 
+    0x3, 0x2, 0x2, 0x2, 0x343, 0x344, 0x6, 0x1c, 0xd, 0x3, 0x344, 0x345, 
+    0x5, 0x38, 0x1d, 0x2, 0x345, 0x346, 0x8, 0x1c, 0x1, 0x2, 0x346, 0x358, 
+    0x3, 0x2, 0x2, 0x2, 0x347, 0x348, 0x6, 0x1c, 0xe, 0x3, 0x348, 0x349, 
+    0x5, 0x3a, 0x1e, 0x2, 0x349, 0x34a, 0x8, 0x1c, 0x1, 0x2, 0x34a, 0x358, 
+    0x3, 0x2, 0x2, 0x2, 0x34b, 0x34c, 0x6, 0x1c, 0xf, 0x3, 0x34c, 0x34d, 
+    0x5, 0x3c, 0x1f, 0x2, 0x34d, 0x34e, 0x8, 0x1c, 0x1, 0x2, 0x34e, 0x358, 
+    0x3, 0x2, 0x2, 0x2, 0x34f, 0x350, 0x6, 0x1c, 0x10, 0x3, 0x350, 0x351, 
+    0x5, 0x3e, 0x20, 0x2, 0x351, 0x352, 0x8, 0x1c, 0x1, 0x2, 0x352, 0x358, 
+    0x3, 0x2, 0x2, 0x2, 0x353, 0x354, 0x6, 0x1c, 0x11, 0x3, 0x354, 0x355, 
+    0x5, 0x86, 0x44, 0x2, 0x355, 0x356, 0x8, 0x1c, 0x1, 0x2, 0x356, 0x358, 
+    0x3, 0x2, 0x2, 0x2, 0x357, 0x33f, 0x3, 0x2, 0x2, 0x2, 0x357, 0x343, 
+    0x3, 0x2, 0x2, 0x2, 0x357, 0x347, 0x3, 0x2, 0x2, 0x2, 0x357, 0x34b, 
+    0x3, 0x2, 0x2, 0x2, 0x357, 0x34f, 0x3, 0x2, 0x2, 0x2, 0x357, 0x353, 
+    0x3, 0x2, 0x2, 0x2, 0x358, 0x35b, 0x3, 0x2, 0x2, 0x2, 0x359, 0x357, 
+    0x3, 0x2, 0x2, 0x2, 0x359, 0x35a, 0x3, 0x2, 0x2, 0x2, 0x35a, 0x37, 0x3, 
+    0x2, 0x2, 0x2, 0x35b, 0x359, 0x3, 0x2, 0x2, 0x2, 0x35c, 0x35d, 0x7, 
+    0x7b, 0x2, 0x2, 0x35d, 0x35e, 0x7, 0x13, 0x2, 0x2, 0x35e, 0x35f, 0x5, 
+    0xb0, 0x59, 0x2, 0x35f, 0x39, 0x3, 0x2, 0x2, 0x2, 0x360, 0x361, 0x7, 
+    0x7e, 0x2, 0x2, 0x361, 0x362, 0x7, 0x59, 0x2, 0x2, 0x362, 0x363, 0x5, 
+    0xb0, 0x59, 0x2, 0x363, 0x3b, 0x3, 0x2, 0x2, 0x2, 0x364, 0x365, 0x7, 
+    0x8a, 0x2, 0x2, 0x365, 0x366, 0x7, 0x13, 0x2, 0x2, 0x366, 0x367, 0x5, 
+    0xb0, 0x59, 0x2, 0x367, 0x3d, 0x3, 0x2, 0x2, 0x2, 0x368, 0x369, 0x7, 
+    0xa7, 0x2, 0x2, 0x369, 0x36e, 0x5, 0x50, 0x29, 0x2, 0x36a, 0x36b, 0x7, 
+    0xc4, 0x2, 0x2, 0x36b, 0x36d, 0x5, 0x50, 0x29, 0x2, 0x36c, 0x36a, 0x3, 
+    0x2, 0x2, 0x2, 0x36d, 0x370, 0x3, 0x2, 0x2, 0x2, 0x36e, 0x36c, 0x3, 
+    0x2, 0x2, 0x2, 0x36e, 0x36f, 0x3, 0x2, 0x2, 0x2, 0x36f, 0x3f, 0x3, 0x2, 
+    0x2, 0x2, 0x370, 0x36e, 0x3, 0x2, 0x2, 0x2, 0x371, 0x373, 0x7, 0x35, 
+    0x2, 0x2, 0x372, 0x374, 0x7, 0xc9, 0x2, 0x2, 0x373, 0x372, 0x3, 0x2, 
+    0x2, 0x2, 0x373, 0x374, 0x3, 0x2, 0x2, 0x2, 0x374, 0x375, 0x3, 0x2, 
+    0x2, 0x2, 0x375, 0x37b, 0x5, 0xd8, 0x6d, 0x2, 0x376, 0x378, 0x7, 0xcf, 
+    0x2, 0x2, 0x377, 0x379, 0x5, 0xac, 0x57, 0x2, 0x378, 0x377, 0x3, 0x2, 
+    0x2, 0x2, 0x378, 0x379, 0x3, 0x2, 0x2, 0x2, 0x379, 0x37a, 0x3, 0x2, 
+    0x2, 0x2, 0x37a, 0x37c, 0x7, 0xd9, 0x2, 0x2, 0x37b, 0x376, 0x3, 0x2, 
+    0x2, 0x2, 0x37b, 0x37c, 0x3, 0x2, 0x2, 0x2, 0x37c, 0x41, 0x3, 0x2, 0x2, 
+    0x2, 0x37d, 0x388, 0x5, 0x44, 0x23, 0x2, 0x37e, 0x37f, 0x7, 0x1d, 0x2, 
+    0x2, 0x37f, 0x380, 0x5, 0xd6, 0x6c, 0x2, 0x380, 0x381, 0x7, 0x16, 0x2, 
+    0x2, 0x381, 0x382, 0x5, 0xb0, 0x59, 0x2, 0x382, 0x388, 0x3, 0x2, 0x2, 
+    0x2, 0x383, 0x384, 0x7, 0x4f, 0x2, 0x2, 0x384, 0x388, 0x5, 0x48, 0x25, 
+    0x2, 0x385, 0x386, 0x7, 0x7f, 0x2, 0x2, 0x386, 0x388, 0x5, 0x4a, 0x26, 
+    0x2, 0x387, 0x37d, 0x3, 0x2, 0x2, 0x2, 0x387, 0x37e, 0x3, 0x2, 0x2, 
+    0x2, 0x387, 0x383, 0x3, 0x2, 0x2, 0x2, 0x387, 0x385, 0x3, 0x2, 0x2, 
+    0x2, 0x388, 0x43, 0x3, 0x2, 0x2, 0x2, 0x389, 0x38a, 0x5, 0xba, 0x5e, 
+    0x2, 0x38a, 0x38c, 0x5, 0xaa, 0x56, 0x2, 0x38b, 0x38d, 0x5, 0x46, 0x24, 
+    0x2, 0x38c, 0x38b, 0x3, 0x2, 0x2, 0x2, 0x38c, 0x38d, 0x3, 0x2, 0x2, 
+    0x2, 0x38d, 0x390, 0x3, 0x2, 0x2, 0x2, 0x38e, 0x38f, 0x7, 0x1c, 0x2, 
+    0x2, 0x38f, 0x391, 0x7, 0xbe, 0x2, 0x2, 0x390, 0x38e, 0x3, 0x2, 0x2, 
+    0x2, 0x390, 0x391, 0x3, 0x2, 0x2, 0x2, 0x391, 0x393, 0x3, 0x2, 0x2, 
+    0x2, 0x392, 0x394, 0x5, 0x4c, 0x27, 0x2, 0x393, 0x392, 0x3, 0x2, 0x2, 
+    0x2, 0x393, 0x394, 0x3, 0x2, 0x2, 0x2, 0x394, 0x397, 0x3, 0x2, 0x2, 
+    0x2, 0x395, 0x396, 0x7, 0xa7, 0x2, 0x2, 0x396, 0x398, 0x5, 0xb0, 0x59, 
+    0x2, 0x397, 0x395, 0x3, 0x2, 0x2, 0x2, 0x397, 0x398, 0x3, 0x2, 0x2, 
+    0x2, 0x398, 0x3aa, 0x3, 0x2, 0x2, 0x2, 0x399, 0x39b, 0x5, 0xba, 0x5e, 
+    0x2, 0x39a, 0x39c, 0x5, 0xaa, 0x56, 0x2, 0x39b, 0x39a, 0x3, 0x2, 0x2, 
+    0x2, 0x39b, 0x39c, 0x3, 0x2, 0x2, 0x2, 0x39c, 0x39d, 0x3, 0x2, 0x2, 
+    0x2, 0x39d, 0x3a0, 0x5, 0x46, 0x24, 0x2, 0x39e, 0x39f, 0x7, 0x1c, 0x2, 
+    0x2, 0x39f, 0x3a1, 0x7, 0xbe, 0x2, 0x2, 0x3a0, 0x39e, 0x3, 0x2, 0x2, 
+    0x2, 0x3a0, 0x3a1, 0x3, 0x2, 0x2, 0x2, 0x3a1, 0x3a3, 0x3, 0x2, 0x2, 
+    0x2, 0x3a2, 0x3a4, 0x5, 0x4c, 0x27, 0x2, 0x3a3, 0x3a2, 0x3, 0x2, 0x2, 
+    0x2, 0x3a3, 0x3a4, 0x3, 0x2, 0x2, 0x2, 0x3a4, 0x3a7, 0x3, 0x2, 0x2, 
+    0x2, 0x3a5, 0x3a6, 0x7, 0xa7, 0x2, 0x2, 0x3a6, 0x3a8, 0x5, 0xb0, 0x59, 
+    0x2, 0x3a7, 0x3a5, 0x3, 0x2, 0x2, 0x2, 0x3a7, 0x3a8, 0x3, 0x2, 0x2, 
+    0x2, 0x3a8, 0x3aa, 0x3, 0x2, 0x2, 0x2, 0x3a9, 0x389, 0x3, 0x2, 0x2, 
+    0x2, 0x3a9, 0x399, 0x3, 0x2, 0x2, 0x2, 0x3aa, 0x45, 0x3, 0x2, 0x2, 0x2, 
+    0x3ab, 0x3ac, 0x9, 0x4, 0x2, 0x2, 0x3ac, 0x3ad, 0x5, 0xb0, 0x59, 0x2, 
+    0x3ad, 0x47, 0x3, 0x2, 0x2, 0x2, 0x3ae, 0x3af, 0x5, 0xba, 0x5e, 0x2, 
+    0x3af, 0x3b0, 0x5, 0xb0, 0x59, 0x2, 0x3b0, 0x3b1, 0x7, 0xa8, 0x2, 0x2, 
+    0x3b1, 0x3b2, 0x5, 0xaa, 0x56, 0x2, 0x3b2, 0x3b3, 0x7, 0x46, 0x2, 0x2, 
+    0x3b3, 0x3b4, 0x7, 0xbc, 0x2, 0x2, 0x3b4, 0x49, 0x3, 0x2, 0x2, 0x2, 
+    0x3b5, 0x3b6, 0x5, 0xba, 0x5e, 0x2, 0x3b6, 0x3b7, 0x5, 0x66, 0x34, 0x2, 
+    0x3b7, 0x4b, 0x3, 0x2, 0x2, 0x2, 0x3b8, 0x3b9, 0x7, 0x19, 0x2, 0x2, 
+    0x3b9, 0x3ba, 0x7, 0xcf, 0x2, 0x2, 0x3ba, 0x3bf, 0x5, 0x4e, 0x28, 0x2, 
+    0x3bb, 0x3bc, 0x7, 0xc4, 0x2, 0x2, 0x3bc, 0x3be, 0x5, 0x4e, 0x28, 0x2, 
+    0x3bd, 0x3bb, 0x3, 0x2, 0x2, 0x2, 0x3be, 0x3c1, 0x3, 0x2, 0x2, 0x2, 
+    0x3bf, 0x3bd, 0x3, 0x2, 0x2, 0x2, 0x3bf, 0x3c0, 0x3, 0x2, 0x2, 0x2, 
+    0x3c0, 0x3c2, 0x3, 0x2, 0x2, 0x2, 0x3c1, 0x3bf, 0x3, 0x2, 0x2, 0x2, 
+    0x3c2, 0x3c3, 0x7, 0xd9, 0x2, 0x2, 0x3c3, 0x4d, 0x3, 0x2, 0x2, 0x2, 
+    0x3c4, 0x3ca, 0x5, 0xd6, 0x6c, 0x2, 0x3c5, 0x3c7, 0x7, 0xcf, 0x2, 0x2, 
+    0x3c6, 0x3c8, 0x5, 0xac, 0x57, 0x2, 0x3c7, 0x3c6, 0x3, 0x2, 0x2, 0x2, 
+    0x3c7, 0x3c8, 0x3, 0x2, 0x2, 0x2, 0x3c8, 0x3c9, 0x3, 0x2, 0x2, 0x2, 
+    0x3c9, 0x3cb, 0x7, 0xd9, 0x2, 0x2, 0x3ca, 0x3c5, 0x3, 0x2, 0x2, 0x2, 
+    0x3ca, 0x3cb, 0x3, 0x2, 0x2, 0x2, 0x3cb, 0x4f, 0x3, 0x2, 0x2, 0x2, 0x3cc, 
+    0x3d4, 0x5, 0xb0, 0x59, 0x2, 0x3cd, 0x3d5, 0x7, 0x28, 0x2, 0x2, 0x3ce, 
+    0x3cf, 0x7, 0xa1, 0x2, 0x2, 0x3cf, 0x3d0, 0x7, 0x2f, 0x2, 0x2, 0x3d0, 
+    0x3d5, 0x7, 0xbe, 0x2, 0x2, 0x3d1, 0x3d2, 0x7, 0xa1, 0x2, 0x2, 0x3d2, 
+    0x3d3, 0x7, 0xb0, 0x2, 0x2, 0x3d3, 0x3d5, 0x7, 0xbe, 0x2, 0x2, 0x3d4, 
+    0x3cd, 0x3, 0x2, 0x2, 0x2, 0x3d4, 0x3ce, 0x3, 0x2, 0x2, 0x2, 0x3d4, 
+    0x3d1, 0x3, 0x2, 0x2, 0x2, 0x3d4, 0x3d5, 0x3, 0x2, 0x2, 0x2, 0x3d5, 
+    0x51, 0x3, 0x2, 0x2, 0x2, 0x3d6, 0x3d8, 0x9, 0x5, 0x2, 0x2, 0x3d7, 0x3d9, 
+    0x7, 0x99, 0x2, 0x2, 0x3d8, 0x3d7, 0x3, 0x2, 0x2, 0x2, 0x3d8, 0x3d9, 
+    0x3, 0x2, 0x2, 0x2, 0x3d9, 0x3da, 0x3, 0x2, 0x2, 0x2, 0x3da, 0x3db, 
+    0x5, 0xbc, 0x5f, 0x2, 0x3db, 0x53, 0x3, 0x2, 0x2, 0x2, 0x3dc, 0x3dd, 
+    0x9, 0x6, 0x2, 0x2, 0x3dd, 0x3e0, 0x7, 0x21, 0x2, 0x2, 0x3de, 0x3df, 
+    0x7, 0x4c, 0x2, 0x2, 0x3df, 0x3e1, 0x7, 0x37, 0x2, 0x2, 0x3e0, 0x3de, 
+    0x3, 0x2, 0x2, 0x2, 0x3e0, 0x3e1, 0x3, 0x2, 0x2, 0x2, 0x3e1, 0x3e2, 
+    0x3, 0x2, 0x2, 0x2, 0x3e2, 0x3e4, 0x5, 0xc6, 0x64, 0x2, 0x3e3, 0x3e5, 
+    0x5, 0x2c, 0x17, 0x2, 0x3e4, 0x3e3, 0x3, 0x2, 0x2, 0x2, 0x3e4, 0x3e5, 
+    0x3, 0x2, 0x2, 0x2, 0x3e5, 0x3fc, 0x3, 0x2, 0x2, 0x2, 0x3e6, 0x3ed, 
+    0x9, 0x6, 0x2, 0x2, 0x3e7, 0x3ee, 0x7, 0x2e, 0x2, 0x2, 0x3e8, 0x3ea, 
+    0x7, 0x9b, 0x2, 0x2, 0x3e9, 0x3e8, 0x3, 0x2, 0x2, 0x2, 0x3e9, 0x3ea, 
+    0x3, 0x2, 0x2, 0x2, 0x3ea, 0x3eb, 0x3, 0x2, 0x2, 0x2, 0x3eb, 0x3ee, 
+    0x7, 0x99, 0x2, 0x2, 0x3ec, 0x3ee, 0x7, 0xaf, 0x2, 0x2, 0x3ed, 0x3e7, 
+    0x3, 0x2, 0x2, 0x2, 0x3ed, 0x3e9, 0x3, 0x2, 0x2, 0x2, 0x3ed, 0x3ec, 
+    0x3, 0x2, 0x2, 0x2, 0x3ee, 0x3f1, 0x3, 0x2, 0x2, 0x2, 0x3ef, 0x3f0, 
+    0x7, 0x4c, 0x2, 0x2, 0x3f0, 0x3f2, 0x7, 0x37, 0x2, 0x2, 0x3f1, 0x3ef, 
+    0x3, 0x2, 0x2, 0x2, 0x3f1, 0x3f2, 0x3, 0x2, 0x2, 0x2, 0x3f2, 0x3f3, 
+    0x3, 0x2, 0x2, 0x2, 0x3f3, 0x3f5, 0x5, 0xc0, 0x61, 0x2, 0x3f4, 0x3f6, 
+    0x5, 0x2c, 0x17, 0x2, 0x3f5, 0x3f4, 0x3, 0x2, 0x2, 0x2, 0x3f5, 0x3f6, 
+    0x3, 0x2, 0x2, 0x2, 0x3f6, 0x3f9, 0x3, 0x2, 0x2, 0x2, 0x3f7, 0x3f8, 
+    0x7, 0x70, 0x2, 0x2, 0x3f8, 0x3fa, 0x7, 0x27, 0x2, 0x2, 0x3f9, 0x3f7, 
+    0x3, 0x2, 0x2, 0x2, 0x3f9, 0x3fa, 0x3, 0x2, 0x2, 0x2, 0x3fa, 0x3fc, 
+    0x3, 0x2, 0x2, 0x2, 0x3fb, 0x3dc, 0x3, 0x2, 0x2, 0x2, 0x3fb, 0x3e6, 
+    0x3, 0x2, 0x2, 0x2, 0x3fc, 0x55, 0x3, 0x2, 0x2, 0x2, 0x3fd, 0x3fe, 0x7, 
+    0x37, 0x2, 0x2, 0x3fe, 0x3ff, 0x7, 0x21, 0x2, 0x2, 0x3ff, 0x40b, 0x5, 
+    0xc6, 0x64, 0x2, 0x400, 0x407, 0x7, 0x37, 0x2, 0x2, 0x401, 0x408, 0x7, 
+    0x2e, 0x2, 0x2, 0x402, 0x404, 0x7, 0x9b, 0x2, 0x2, 0x403, 0x402, 0x3, 
+    0x2, 0x2, 0x2, 0x403, 0x404, 0x3, 0x2, 0x2, 0x2, 0x404, 0x405, 0x3, 
+    0x2, 0x2, 0x2, 0x405, 0x408, 0x7, 0x99, 0x2, 0x2, 0x406, 0x408, 0x7, 
+    0xaf, 0x2, 0x2, 0x407, 0x401, 0x3, 0x2, 0x2, 0x2, 0x407, 0x403, 0x3, 
+    0x2, 0x2, 0x2, 0x407, 0x406, 0x3, 0x2, 0x2, 0x2, 0x407, 0x408, 0x3, 
+    0x2, 0x2, 0x2, 0x408, 0x409, 0x3, 0x2, 0x2, 0x2, 0x409, 0x40b, 0x5, 
+    0xc0, 0x61, 0x2, 0x40a, 0x3fd, 0x3, 0x2, 0x2, 0x2, 0x40a, 0x400, 0x3, 
+    0x2, 0x2, 0x2, 0x40b, 0x57, 0x3, 0x2, 0x2, 0x2, 0x40c, 0x40d, 0x7, 0x38, 
+    0x2, 0x2, 0x40d, 0x40e, 0x7, 0x97, 0x2, 0x2, 0x40e, 0x40f, 0x5, 0x4, 
+    0x3, 0x2, 0x40f, 0x59, 0x3, 0x2, 0x2, 0x2, 0x410, 0x411, 0x7, 0x53, 
+    0x2, 0x2, 0x411, 0x413, 0x7, 0x55, 0x2, 0x2, 0x412, 0x414, 0x7, 0x99, 
+    0x2, 0x2, 0x413, 0x412, 0x3, 0x2, 0x2, 0x2, 0x413, 0x414, 0x3, 0x2, 
+    0x2, 0x2, 0x414, 0x418, 0x3, 0x2, 0x2, 0x2, 0x415, 0x419, 0x5, 0xc0, 
+    0x61, 0x2, 0x416, 0x417, 0x7, 0x44, 0x2, 0x2, 0x417, 0x419, 0x5, 0xbe, 
+    0x60, 0x2, 0x418, 0x415, 0x3, 0x2, 0x2, 0x2, 0x418, 0x416, 0x3, 0x2, 
+    0x2, 0x2, 0x419, 0x41b, 0x3, 0x2, 0x2, 0x2, 0x41a, 0x41c, 0x5, 0x5c, 
+    0x2f, 0x2, 0x41b, 0x41a, 0x3, 0x2, 0x2, 0x2, 0x41b, 0x41c, 0x3, 0x2, 
+    0x2, 0x2, 0x41c, 0x41d, 0x3, 0x2, 0x2, 0x2, 0x41d, 0x41e, 0x5, 0x5e, 
+    0x30, 0x2, 0x41e, 0x5b, 0x3, 0x2, 0x2, 0x2, 0x41f, 0x420, 0x7, 0xcf, 
+    0x2, 0x2, 0x420, 0x425, 0x5, 0xba, 0x5e, 0x2, 0x421, 0x422, 0x7, 0xc4, 
+    0x2, 0x2, 0x422, 0x424, 0x5, 0xba, 0x5e, 0x2, 0x423, 0x421, 0x3, 0x2, 
+    0x2, 0x2, 0x424, 0x427, 0x3, 0x2, 0x2, 0x2, 0x425, 0x423, 0x3, 0x2, 
+    0x2, 0x2, 0x425, 0x426, 0x3, 0x2, 0x2, 0x2, 0x426, 0x428, 0x3, 0x2, 
+    0x2, 0x2, 0x427, 0x425, 0x3, 0x2, 0x2, 0x2, 0x428, 0x429, 0x7, 0xd9, 
+    0x2, 0x2, 0x429, 0x5d, 0x3, 0x2, 0x2, 0x2, 0x42a, 0x42b, 0x7, 0x40, 
+    0x2, 0x2, 0x42b, 0x434, 0x5, 0xd6, 0x6c, 0x2, 0x42c, 0x434, 0x7, 0xae, 
+    0x2, 0x2, 0x42d, 0x42f, 0x5, 0x68, 0x35, 0x2, 0x42e, 0x430, 0x7, 0xda, 
+    0x2, 0x2, 0x42f, 0x42e, 0x3, 0x2, 0x2, 0x2, 0x42f, 0x430, 0x3, 0x2, 
+    0x2, 0x2, 0x430, 0x431, 0x3, 0x2, 0x2, 0x2, 0x431, 0x432, 0x7, 0x2, 
+    0x2, 0x3, 0x432, 0x434, 0x3, 0x2, 0x2, 0x2, 0x433, 0x42a, 0x3, 0x2, 
+    0x2, 0x2, 0x433, 0x42c, 0x3, 0x2, 0x2, 0x2, 0x433, 0x42d, 0x3, 0x2, 
+    0x2, 0x2, 0x434, 0x5f, 0x3, 0x2, 0x2, 0x2, 0x435, 0x436, 0x7, 0x5a, 
+    0x2, 0x2, 0x436, 0x438, 0x7, 0x6e, 0x2, 0x2, 0x437, 0x439, 0x5, 0x2c, 
+    0x17, 0x2, 0x438, 0x437, 0x3, 0x2, 0x2, 0x2, 0x438, 0x439, 0x3, 0x2, 
+    0x2, 0x2, 0x439, 0x43a, 0x3, 0x2, 0x2, 0x2, 0x43a, 0x43c, 0x5, 0x78, 
+    0x3d, 0x2, 0x43b, 0x43d, 0x9, 0x7, 0x2, 0x2, 0x43c, 0x43b, 0x3, 0x2, 
+    0x2, 0x2, 0x43c, 0x43d, 0x3, 0x2, 0x2, 0x2, 0x43d, 0x61, 0x3, 0x2, 0x2, 
+    0x2, 0x43e, 0x43f, 0x7, 0x76, 0x2, 0x2, 0x43f, 0x440, 0x7, 0x99, 0x2, 
+    0x2, 0x440, 0x442, 0x5, 0xc0, 0x61, 0x2, 0x441, 0x443, 0x5, 0x2c, 0x17, 
+    0x2, 0x442, 0x441, 0x3, 0x2, 0x2, 0x2, 0x442, 0x443, 0x3, 0x2, 0x2, 
+    0x2, 0x443, 0x445, 0x3, 0x2, 0x2, 0x2, 0x444, 0x446, 0x5, 0x10, 0x9, 
+    0x2, 0x445, 0x444, 0x3, 0x2, 0x2, 0x2, 0x445, 0x446, 0x3, 0x2, 0x2, 
+    0x2, 0x446, 0x448, 0x3, 0x2, 0x2, 0x2, 0x447, 0x449, 0x7, 0x3c, 0x2, 
     0x2, 0x448, 0x447, 0x3, 0x2, 0x2, 0x2, 0x448, 0x449, 0x3, 0x2, 0x2, 
-    0x2, 0x449, 0x44b, 0x3, 0x2, 0x2, 0x2, 0x44a, 0x44c, 0x5, 0x7a, 0x3e, 
+    0x2, 0x449, 0x44b, 0x3, 0x2, 0x2, 0x2, 0x44a, 0x44c, 0x7, 0x25, 0x2, 
     0x2, 0x44b, 0x44a, 0x3, 0x2, 0x2, 0x2, 0x44b, 0x44c, 0x3, 0x2, 0x2, 
-    0x2, 0x44c, 0x44e, 0x3, 0x2, 0x2, 0x2, 0x44d, 0x44f, 0x5, 0x7c, 0x3f, 
-    0x2, 0x44e, 0x44d, 0x3, 0x2, 0x2, 0x2, 0x44e, 0x44f, 0x3, 0x2, 0x2, 
-    0x2, 0x44f, 0x451, 0x3, 0x2, 0x2, 0x2, 0x450, 0x452, 0x5, 0x7e, 0x40, 
-    0x2, 0x451, 0x450, 0x3, 0x2, 0x2, 0x2, 0x451, 0x452, 0x3, 0x2, 0x2, 
-    0x2, 0x452, 0x454, 0x3, 0x2, 0x2, 0x2, 0x453, 0x455, 0x5, 0x80, 0x41, 
-    0x2, 0x454, 0x453, 0x3, 0x2, 0x2, 0x2, 0x454, 0x455, 0x3, 0x2, 0x2, 
-    0x2, 0x455, 0x69, 0x3, 0x2, 0x2, 0x2, 0x456, 0x457, 0x7, 0xb3, 0x2, 
-    0x2, 0x457, 0x458, 0x5, 0xa6, 0x54, 0x2, 0x458, 0x6b, 0x3, 0x2, 0x2, 
-    0x2, 0x459, 0x45a, 0x7, 0xa0, 0x2, 0x2, 0x45a, 0x45d, 0x7, 0xba, 0x2, 
-    0x2, 0x45b, 0x45c, 0x7, 0xb3, 0x2, 0x2, 0x45c, 0x45e, 0x7, 0x9c, 0x2, 
-    0x2, 0x45d, 0x45b, 0x3, 0x2, 0x2, 0x2, 0x45d, 0x45e, 0x3, 0x2, 0x2, 
-    0x2, 0x45e, 0x6d, 0x3, 0x2, 0x2, 0x2, 0x45f, 0x460, 0x7, 0x42, 0x2, 
-    0x2, 0x460, 0x461, 0x5, 0x82, 0x42, 0x2, 0x461, 0x6f, 0x3, 0x2, 0x2, 
-    0x2, 0x462, 0x464, 0x9, 0x9, 0x2, 0x2, 0x463, 0x462, 0x3, 0x2, 0x2, 
-    0x2, 0x463, 0x464, 0x3, 0x2, 0x2, 0x2, 0x464, 0x465, 0x3, 0x2, 0x2, 
-    0x2, 0x465, 0x466, 0x7, 0xb, 0x2, 0x2, 0x466, 0x467, 0x7, 0x58, 0x2, 
-    0x2, 0x467, 0x468, 0x5, 0xa6, 0x54, 0x2, 0x468, 0x71, 0x3, 0x2, 0x2, 
-    0x2, 0x469, 0x46a, 0x7, 0x7c, 0x2, 0x2, 0x46a, 0x46b, 0x5, 0xaa, 0x56, 
-    0x2, 0x46b, 0x73, 0x3, 0x2, 0x2, 0x2, 0x46c, 0x46d, 0x7, 0xb2, 0x2, 
-    0x2, 0x46d, 0x46e, 0x5, 0xaa, 0x56, 0x2, 0x46e, 0x75, 0x3, 0x2, 0x2, 
-    0x2, 0x46f, 0x470, 0x7, 0x47, 0x2, 0x2, 0x470, 0x477, 0x7, 0x13, 0x2, 
-    0x2, 0x471, 0x472, 0x9, 0x8, 0x2, 0x2, 0x472, 0x473, 0x7, 0xcd, 0x2, 
-    0x2, 0x473, 0x474, 0x5, 0xa6, 0x54, 0x2, 0x474, 0x475, 0x7, 0xd7, 0x2, 
-    0x2, 0x475, 0x478, 0x3, 0x2, 0x2, 0x2, 0x476, 0x478, 0x5, 0xa6, 0x54, 
-    0x2, 0x477, 0x471, 0x3, 0x2, 0x2, 0x2, 0x477, 0x476, 0x3, 0x2, 0x2, 
-    0x2, 0x478, 0x77, 0x3, 0x2, 0x2, 0x2, 0x479, 0x47a, 0x7, 0x48, 0x2, 
-    0x2, 0x47a, 0x47b, 0x5, 0xaa, 0x56, 0x2, 0x47b, 0x79, 0x3, 0x2, 0x2, 
-    0x2, 0x47c, 0x47d, 0x7, 0x77, 0x2, 0x2, 0x47d, 0x47e, 0x7, 0x13, 0x2, 
-    0x2, 0x47e, 0x47f, 0x5, 0x8e, 0x48, 0x2, 0x47f, 0x7b, 0x3, 0x2, 0x2, 
-    0x2, 0x480, 0x481, 0x7, 0x61, 0x2, 0x2, 0x481, 0x482, 0x5, 0x8c, 0x47, 
-    0x2, 0x482, 0x483, 0x7, 0x13, 0x2, 0x2, 0x483, 0x484, 0x5, 0xa6, 0x54, 
-    0x2, 0x484, 0x7d, 0x3, 0x2, 0x2, 0x2, 0x485, 0x486, 0x7, 0x61, 0x2, 
-    0x2, 0x486, 0x489, 0x5, 0x8c, 0x47, 0x2, 0x487, 0x488, 0x7, 0xb3, 0x2, 
-    0x2, 0x488, 0x48a, 0x7, 0x9c, 0x2, 0x2, 0x489, 0x487, 0x3, 0x2, 0x2, 
-    0x2, 0x489, 0x48a, 0x3, 0x2, 0x2, 0x2, 0x48a, 0x7f, 0x3, 0x2, 0x2, 0x2, 
-    0x48b, 0x48c, 0x7, 0x8e, 0x2, 0x2, 0x48c, 0x48d, 0x5, 0x94, 0x4b, 0x2, 
-    0x48d, 0x81, 0x3, 0x2, 0x2, 0x2, 0x48e, 0x48f, 0x8, 0x42, 0x1, 0x2, 
-    0x48f, 0x491, 0x5, 0xb6, 0x5c, 0x2, 0x490, 0x492, 0x7, 0x3c, 0x2, 0x2, 
-    0x491, 0x490, 0x3, 0x2, 0x2, 0x2, 0x491, 0x492, 0x3, 0x2, 0x2, 0x2, 
-    0x492, 0x494, 0x3, 0x2, 0x2, 0x2, 0x493, 0x495, 0x5, 0x8a, 0x46, 0x2, 
-    0x494, 0x493, 0x3, 0x2, 0x2, 0x2, 0x494, 0x495, 0x3, 0x2, 0x2, 0x2, 
-    0x495, 0x49b, 0x3, 0x2, 0x2, 0x2, 0x496, 0x497, 0x7, 0xcd, 0x2, 0x2, 
-    0x497, 0x498, 0x5, 0x82, 0x42, 0x2, 0x498, 0x499, 0x7, 0xd7, 0x2, 0x2, 
-    0x499, 0x49b, 0x3, 0x2, 0x2, 0x2, 0x49a, 0x48e, 0x3, 0x2, 0x2, 0x2, 
-    0x49a, 0x496, 0x3, 0x2, 0x2, 0x2, 0x49b, 0x4ad, 0x3, 0x2, 0x2, 0x2, 
-    0x49c, 0x49d, 0xc, 0x5, 0x2, 0x2, 0x49d, 0x49e, 0x5, 0x86, 0x44, 0x2, 
-    0x49e, 0x49f, 0x5, 0x82, 0x42, 0x6, 0x49f, 0x4ac, 0x3, 0x2, 0x2, 0x2, 
-    0x4a0, 0x4a2, 0xc, 0x6, 0x2, 0x2, 0x4a1, 0x4a3, 0x9, 0xa, 0x2, 0x2, 
-    0x4a2, 0x4a1, 0x3, 0x2, 0x2, 0x2, 0x4a2, 0x4a3, 0x3, 0x2, 0x2, 0x2, 
-    0x4a3, 0x4a5, 0x3, 0x2, 0x2, 0x2, 0x4a4, 0x4a6, 0x5, 0x84, 0x43, 0x2, 
-    0x4a5, 0x4a4, 0x3, 0x2, 0x2, 0x2, 0x4a5, 0x4a6, 0x3, 0x2, 0x2, 0x2, 
-    0x4a6, 0x4a7, 0x3, 0x2, 0x2, 0x2, 0x4a7, 0x4a8, 0x7, 0x58, 0x2, 0x2, 
-    0x4a8, 0x4a9, 0x5, 0x82, 0x42, 0x2, 0x4a9, 0x4aa, 0x5, 0x88, 0x45, 0x2, 
-    0x4aa, 0x4ac, 0x3, 0x2, 0x2, 0x2, 0x4ab, 0x49c, 0x3, 0x2, 0x2, 0x2, 
-    0x4ab, 0x4a0, 0x3, 0x2, 0x2, 0x2, 0x4ac, 0x4af, 0x3, 0x2, 0x2, 0x2, 
-    0x4ad, 0x4ab, 0x3, 0x2, 0x2, 0x2, 0x4ad, 0x4ae, 0x3, 0x2, 0x2, 0x2, 
-    0x4ae, 0x83, 0x3, 0x2, 0x2, 0x2, 0x4af, 0x4ad, 0x3, 0x2, 0x2, 0x2, 0x4b0, 
-    0x4b2, 0x9, 0xb, 0x2, 0x2, 0x4b1, 0x4b0, 0x3, 0x2, 0x2, 0x2, 0x4b1, 
-    0x4b2, 0x3, 0x2, 0x2, 0x2, 0x4b2, 0x4b3, 0x3, 0x2, 0x2, 0x2, 0x4b3, 
-    0x4ba, 0x7, 0x52, 0x2, 0x2, 0x4b4, 0x4b6, 0x7, 0x52, 0x2, 0x2, 0x4b5, 
-    0x4b7, 0x9, 0xb, 0x2, 0x2, 0x4b6, 0x4b5, 0x3, 0x2, 0x2, 0x2, 0x4b6, 
-    0x4b7, 0x3, 0x2, 0x2, 0x2, 0x4b7, 0x4ba, 0x3, 0x2, 0x2, 0x2, 0x4b8, 
-    0x4ba, 0x9, 0xb, 0x2, 0x2, 0x4b9, 0x4b1, 0x3, 0x2, 0x2, 0x2, 0x4b9, 
-    0x4b4, 0x3, 0x2, 0x2, 0x2, 0x4b9, 0x4b8, 0x3, 0x2, 0x2, 0x2, 0x4ba, 
-    0x4dc, 0x3, 0x2, 0x2, 0x2, 0x4bb, 0x4bd, 0x9, 0xc, 0x2, 0x2, 0x4bc, 
-    0x4bb, 0x3, 0x2, 0x2, 0x2, 0x4bc, 0x4bd, 0x3, 0x2, 0x2, 0x2, 0x4bd, 
-    0x4be, 0x3, 0x2, 0x2, 0x2, 0x4be, 0x4c0, 0x9, 0xd, 0x2, 0x2, 0x4bf, 
-    0x4c1, 0x7, 0x78, 0x2, 0x2, 0x4c0, 0x4bf, 0x3, 0x2, 0x2, 0x2, 0x4c0, 
-    0x4c1, 0x3, 0x2, 0x2, 0x2, 0x4c1, 0x4ca, 0x3, 0x2, 0x2, 0x2, 0x4c2, 
-    0x4c4, 0x9, 0xd, 0x2, 0x2, 0x4c3, 0x4c5, 0x7, 0x78, 0x2, 0x2, 0x4c4, 
-    0x4c3, 0x3, 0x2, 0x2, 0x2, 0x4c4, 0x4c5, 0x3, 0x2, 0x2, 0x2, 0x4c5, 
-    0x4c7, 0x3, 0x2, 0x2, 0x2, 0x4c6, 0x4c8, 0x9, 0xc, 0x2, 0x2, 0x4c7, 
-    0x4c6, 0x3, 0x2, 0x2, 0x2, 0x4c7, 0x4c8, 0x3, 0x2, 0x2, 0x2, 0x4c8, 
-    0x4ca, 0x3, 0x2, 0x2, 0x2, 0x4c9, 0x4bc, 0x3, 0x2, 0x2, 0x2, 0x4c9, 
-    0x4c2, 0x3, 0x2, 0x2, 0x2, 0x4ca, 0x4dc, 0x3, 0x2, 0x2, 0x2, 0x4cb, 
-    0x4cd, 0x9, 0xe, 0x2, 0x2, 0x4cc, 0x4cb, 0x3, 0x2, 0x2, 0x2, 0x4cc, 
-    0x4cd, 0x3, 0x2, 0x2, 0x2, 0x4cd, 0x4ce, 0x3, 0x2, 0x2, 0x2, 0x4ce, 
-    0x4d0, 0x7, 0x43, 0x2, 0x2, 0x4cf, 0x4d1, 0x7, 0x78, 0x2, 0x2, 0x4d0, 
-    0x4cf, 0x3, 0x2, 0x2, 0x2, 0x4d0, 0x4d1, 0x3, 0x2, 0x2, 0x2, 0x4d1, 
-    0x4da, 0x3, 0x2, 0x2, 0x2, 0x4d2, 0x4d4, 0x7, 0x43, 0x2, 0x2, 0x4d3, 
-    0x4d5, 0x7, 0x78, 0x2, 0x2, 0x4d4, 0x4d3, 0x3, 0x2, 0x2, 0x2, 0x4d4, 
-    0x4d5, 0x3, 0x2, 0x2, 0x2, 0x4d5, 0x4d7, 0x3, 0x2, 0x2, 0x2, 0x4d6, 
-    0x4d8, 0x9, 0xe, 0x2, 0x2, 0x4d7, 0x4d6, 0x3, 0x2, 0x2, 0x2, 0x4d7, 
-    0x4d8, 0x3, 0x2, 0x2, 0x2, 0x4d8, 0x4da, 0x3, 0x2, 0x2, 0x2, 0x4d9, 
-    0x4cc, 0x3, 0x2, 0x2, 0x2, 0x4d9, 0x4d2, 0x3, 0x2, 0x2, 0x2, 0x4da, 
-    0x4dc, 0x3, 0x2, 0x2, 0x2, 0x4db, 0x4b9, 0x3, 0x2, 0x2, 0x2, 0x4db, 
-    0x4c9, 0x3, 0x2, 0x2, 0x2, 0x4db, 0x4d9, 0x3, 0x2, 0x2, 0x2, 0x4dc, 
-    0x85, 0x3, 0x2, 0x2, 0x2, 0x4dd, 0x4df, 0x9, 0xa, 0x2, 0x2, 0x4de, 0x4dd, 
-    0x3, 0x2, 0x2, 0x2, 0x4de, 0x4df, 0x3, 0x2, 0x2, 0x2, 0x4df, 0x4e0, 
-    0x3, 0x2, 0x2, 0x2, 0x4e0, 0x4e1, 0x7, 0x1f, 0x2, 0x2, 0x4e1, 0x4e4, 
-    0x7, 0x58, 0x2, 0x2, 0x4e2, 0x4e4, 0x7, 0xc2, 0x2, 0x2, 0x4e3, 0x4de, 
-    0x3, 0x2, 0x2, 0x2, 0x4e3, 0x4e2, 0x3, 0x2, 0x2, 0x2, 0x4e4, 0x87, 0x3, 
-    0x2, 0x2, 0x2, 0x4e5, 0x4e6, 0x7, 0x74, 0x2, 0x2, 0x4e6, 0x4ef, 0x5, 
-    0xa6, 0x54, 0x2, 0x4e7, 0x4e8, 0x7, 0xaa, 0x2, 0x2, 0x4e8, 0x4e9, 0x7, 
-    0xcd, 0x2, 0x2, 0x4e9, 0x4ea, 0x5, 0xa6, 0x54, 0x2, 0x4ea, 0x4eb, 0x7, 
-    0xd7, 0x2, 0x2, 0x4eb, 0x4ef, 0x3, 0x2, 0x2, 0x2, 0x4ec, 0x4ed, 0x7, 
-    0xaa, 0x2, 0x2, 0x4ed, 0x4ef, 0x5, 0xa6, 0x54, 0x2, 0x4ee, 0x4e5, 0x3, 
-    0x2, 0x2, 0x2, 0x4ee, 0x4e7, 0x3, 0x2, 0x2, 0x2, 0x4ee, 0x4ec, 0x3, 
-    0x2, 0x2, 0x2, 0x4ef, 0x89, 0x3, 0x2, 0x2, 0x2, 0x4f0, 0x4f1, 0x7, 0x88, 
-    0x2, 0x2, 0x4f1, 0x4f4, 0x5, 0x92, 0x4a, 0x2, 0x4f2, 0x4f3, 0x7, 0x73, 
-    0x2, 0x2, 0x4f3, 0x4f5, 0x5, 0x92, 0x4a, 0x2, 0x4f4, 0x4f2, 0x3, 0x2, 
-    0x2, 0x2, 0x4f4, 0x4f5, 0x3, 0x2, 0x2, 0x2, 0x4f5, 0x8b, 0x3, 0x2, 0x2, 
-    0x2, 0x4f6, 0x4f9, 0x5, 0xaa, 0x56, 0x2, 0x4f7, 0x4f8, 0x9, 0xf, 0x2, 
-    0x2, 0x4f8, 0x4fa, 0x5, 0xaa, 0x56, 0x2, 0x4f9, 0x4f7, 0x3, 0x2, 0x2, 
-    0x2, 0x4f9, 0x4fa, 0x3, 0x2, 0x2, 0x2, 0x4fa, 0x8d, 0x3, 0x2, 0x2, 0x2, 
-    0x4fb, 0x500, 0x5, 0x90, 0x49, 0x2, 0x4fc, 0x4fd, 0x7, 0xc2, 0x2, 0x2, 
-    0x4fd, 0x4ff, 0x5, 0x90, 0x49, 0x2, 0x4fe, 0x4fc, 0x3, 0x2, 0x2, 0x2, 
-    0x4ff, 0x502, 0x3, 0x2, 0x2, 0x2, 0x500, 0x4fe, 0x3, 0x2, 0x2, 0x2, 
-    0x500, 0x501, 0x3, 0x2, 0x2, 0x2, 0x501, 0x8f, 0x3, 0x2, 0x2, 0x2, 0x502, 
-    0x500, 0x3, 0x2, 0x2, 0x2, 0x503, 0x505, 0x5, 0xaa, 0x56, 0x2, 0x504, 
-    0x506, 0x9, 0x10, 0x2, 0x2, 0x505, 0x504, 0x3, 0x2, 0x2, 0x2, 0x505, 
-    0x506, 0x3, 0x2, 0x2, 0x2, 0x506, 0x509, 0x3, 0x2, 0x2, 0x2, 0x507, 
-    0x508, 0x7, 0x72, 0x2, 0x2, 0x508, 0x50a, 0x9, 0x11, 0x2, 0x2, 0x509, 
-    0x507, 0x3, 0x2, 0x2, 0x2, 0x509, 0x50a, 0x3, 0x2, 0x2, 0x2, 0x50a, 
-    0x50d, 0x3, 0x2, 0x2, 0x2, 0x50b, 0x50c, 0x7, 0x1a, 0x2, 0x2, 0x50c, 
-    0x50e, 0x7, 0xbc, 0x2, 0x2, 0x50d, 0x50b, 0x3, 0x2, 0x2, 0x2, 0x50d, 
-    0x50e, 0x3, 0x2, 0x2, 0x2, 0x50e, 0x91, 0x3, 0x2, 0x2, 0x2, 0x50f, 0x512, 
-    0x5, 0xc4, 0x63, 0x2, 0x510, 0x511, 0x7, 0xd9, 0x2, 0x2, 0x511, 0x513, 
-    0x5, 0xc4, 0x63, 0x2, 0x512, 0x510, 0x3, 0x2, 0x2, 0x2, 0x512, 0x513, 
-    0x3, 0x2, 0x2, 0x2, 0x513, 0x93, 0x3, 0x2, 0x2, 0x2, 0x514, 0x519, 0x5, 
-    0x96, 0x4c, 0x2, 0x515, 0x516, 0x7, 0xc2, 0x2, 0x2, 0x516, 0x518, 0x5, 
-    0x96, 0x4c, 0x2, 0x517, 0x515, 0x3, 0x2, 0x2, 0x2, 0x518, 0x51b, 0x3, 
-    0x2, 0x2, 0x2, 0x519, 0x517, 0x3, 0x2, 0x2, 0x2, 0x519, 0x51a, 0x3, 
-    0x2, 0x2, 0x2, 0x51a, 0x95, 0x3, 0x2, 0x2, 0x2, 0x51b, 0x519, 0x3, 0x2, 
-    0x2, 0x2, 0x51c, 0x51d, 0x5, 0xd0, 0x69, 0x2, 0x51d, 0x51e, 0x7, 0xc7, 
-    0x2, 0x2, 0x51e, 0x51f, 0x5, 0xc6, 0x64, 0x2, 0x51f, 0x97, 0x3, 0x2, 
-    0x2, 0x2, 0x520, 0x521, 0x7, 0x8d, 0x2, 0x2, 0x521, 0x522, 0x5, 0x94, 
-    0x4b, 0x2, 0x522, 0x99, 0x3, 0x2, 0x2, 0x2, 0x523, 0x524, 0x7, 0x8f, 
-    0x2, 0x2, 0x524, 0x525, 0x7, 0x1e, 0x2, 0x2, 0x525, 0x526, 0x7, 0x21, 
-    0x2, 0x2, 0x526, 0x54e, 0x5, 0xc0, 0x61, 0x2, 0x527, 0x528, 0x7, 0x8f, 
-    0x2, 0x2, 0x528, 0x529, 0x7, 0x1e, 0x2, 0x2, 0x529, 0x52a, 0x7, 0x2e, 
-    0x2, 0x2, 0x52a, 0x54e, 0x5, 0xba, 0x5e, 0x2, 0x52b, 0x52c, 0x7, 0x8f, 
-    0x2, 0x2, 0x52c, 0x52e, 0x7, 0x1e, 0x2, 0x2, 0x52d, 0x52f, 0x7, 0x99, 
-    0x2, 0x2, 0x52e, 0x52d, 0x3, 0x2, 0x2, 0x2, 0x52e, 0x52f, 0x3, 0x2, 
-    0x2, 0x2, 0x52f, 0x531, 0x3, 0x2, 0x2, 0x2, 0x530, 0x532, 0x7, 0x97, 
-    0x2, 0x2, 0x531, 0x530, 0x3, 0x2, 0x2, 0x2, 0x531, 0x532, 0x3, 0x2, 
-    0x2, 0x2, 0x532, 0x533, 0x3, 0x2, 0x2, 0x2, 0x533, 0x54e, 0x5, 0xba, 
-    0x5e, 0x2, 0x534, 0x535, 0x7, 0x8f, 0x2, 0x2, 0x535, 0x54e, 0x7, 0x22, 
-    0x2, 0x2, 0x536, 0x537, 0x7, 0x8f, 0x2, 0x2, 0x537, 0x53a, 0x7, 0x2d, 
-    0x2, 0x2, 0x538, 0x539, 0x7, 0x42, 0x2, 0x2, 0x539, 0x53b, 0x5, 0xc0, 
-    0x61, 0x2, 0x53a, 0x538, 0x3, 0x2, 0x2, 0x2, 0x53a, 0x53b, 0x3, 0x2, 
-    0x2, 0x2, 0x53b, 0x54e, 0x3, 0x2, 0x2, 0x2, 0x53c, 0x53e, 0x7, 0x8f, 
-    0x2, 0x2, 0x53d, 0x53f, 0x7, 0x99, 0x2, 0x2, 0x53e, 0x53d, 0x3, 0x2, 
-    0x2, 0x2, 0x53e, 0x53f, 0x3, 0x2, 0x2, 0x2, 0x53f, 0x540, 0x3, 0x2, 
-    0x2, 0x2, 0x540, 0x543, 0x7, 0x98, 0x2, 0x2, 0x541, 0x542, 0x9, 0x12, 
-    0x2, 0x2, 0x542, 0x544, 0x5, 0xc0, 0x61, 0x2, 0x543, 0x541, 0x3, 0x2, 
-    0x2, 0x2, 0x543, 0x544, 0x3, 0x2, 0x2, 0x2, 0x544, 0x548, 0x3, 0x2, 
-    0x2, 0x2, 0x545, 0x546, 0x7, 0x60, 0x2, 0x2, 0x546, 0x549, 0x7, 0xbc, 
-    0x2, 0x2, 0x547, 0x549, 0x5, 0x74, 0x3b, 0x2, 0x548, 0x545, 0x3, 0x2, 
-    0x2, 0x2, 0x548, 0x547, 0x3, 0x2, 0x2, 0x2, 0x548, 0x549, 0x3, 0x2, 
-    0x2, 0x2, 0x549, 0x54b, 0x3, 0x2, 0x2, 0x2, 0x54a, 0x54c, 0x5, 0x7e, 
-    0x40, 0x2, 0x54b, 0x54a, 0x3, 0x2, 0x2, 0x2, 0x54b, 0x54c, 0x3, 0x2, 
-    0x2, 0x2, 0x54c, 0x54e, 0x3, 0x2, 0x2, 0x2, 0x54d, 0x523, 0x3, 0x2, 
-    0x2, 0x2, 0x54d, 0x527, 0x3, 0x2, 0x2, 0x2, 0x54d, 0x52b, 0x3, 0x2, 
-    0x2, 0x2, 0x54d, 0x534, 0x3, 0x2, 0x2, 0x2, 0x54d, 0x536, 0x3, 0x2, 
-    0x2, 0x2, 0x54d, 0x53c, 0x3, 0x2, 0x2, 0x2, 0x54e, 0x9b, 0x3, 0x2, 0x2, 
-    0x2, 0x54f, 0x550, 0x7, 0x96, 0x2, 0x2, 0x550, 0x551, 0x7, 0x3e, 0x2, 
-    0x2, 0x551, 0x552, 0x7, 0x31, 0x2, 0x2, 0x552, 0x572, 0x5, 0xba, 0x5e, 
-    0x2, 0x553, 0x554, 0x7, 0x96, 0x2, 0x2, 0x554, 0x555, 0x7, 0x3e, 0x2, 
-    0x2, 0x555, 0x572, 0x7, 0x64, 0x2, 0x2, 0x556, 0x557, 0x7, 0x96, 0x2, 
-    0x2, 0x557, 0x558, 0x7, 0x80, 0x2, 0x2, 0x558, 0x572, 0x7, 0x2d, 0x2, 
-    0x2, 0x559, 0x55a, 0x7, 0x96, 0x2, 0x2, 0x55a, 0x55b, 0x7, 0x80, 0x2, 
-    0x2, 0x55b, 0x55c, 0x7, 0x2e, 0x2, 0x2, 0x55c, 0x572, 0x5, 0xba, 0x5e, 
-    0x2, 0x55d, 0x55e, 0x7, 0x96, 0x2, 0x2, 0x55e, 0x566, 0x9, 0x13, 0x2, 
-    0x2, 0x55f, 0x560, 0x7, 0x31, 0x2, 0x2, 0x560, 0x567, 0x7, 0x8c, 0x2, 
-    0x2, 0x561, 0x567, 0x7, 0x3b, 0x2, 0x2, 0x562, 0x564, 0x7, 0xa5, 0x2, 
-    0x2, 0x563, 0x562, 0x3, 0x2, 0x2, 0x2, 0x563, 0x564, 0x3, 0x2, 0x2, 
-    0x2, 0x564, 0x565, 0x3, 0x2, 0x2, 0x2, 0x565, 0x567, 0x7, 0x67, 0x2, 
-    0x2, 0x566, 0x55f, 0x3, 0x2, 0x2, 0x2, 0x566, 0x561, 0x3, 0x2, 0x2, 
-    0x2, 0x566, 0x563, 0x3, 0x2, 0x2, 0x2, 0x567, 0x568, 0x3, 0x2, 0x2, 
-    0x2, 0x568, 0x572, 0x5, 0xba, 0x5e, 0x2, 0x569, 0x56a, 0x7, 0x96, 0x2, 
-    0x2, 0x56a, 0x56b, 0x9, 0x13, 0x2, 0x2, 0x56b, 0x56c, 0x7, 0x85, 0x2, 
-    0x2, 0x56c, 0x572, 0x7, 0x8c, 0x2, 0x2, 0x56d, 0x56e, 0x7, 0x96, 0x2, 
-    0x2, 0x56e, 0x56f, 0x7, 0x94, 0x2, 0x2, 0x56f, 0x570, 0x7, 0x84, 0x2, 
-    0x2, 0x570, 0x572, 0x5, 0xba, 0x5e, 0x2, 0x571, 0x54f, 0x3, 0x2, 0x2, 
-    0x2, 0x571, 0x553, 0x3, 0x2, 0x2, 0x2, 0x571, 0x556, 0x3, 0x2, 0x2, 
-    0x2, 0x571, 0x559, 0x3, 0x2, 0x2, 0x2, 0x571, 0x55d, 0x3, 0x2, 0x2, 
-    0x2, 0x571, 0x569, 0x3, 0x2, 0x2, 0x2, 0x571, 0x56d, 0x3, 0x2, 0x2, 
-    0x2, 0x572, 0x9d, 0x3, 0x2, 0x2, 0x2, 0x573, 0x575, 0x7, 0xa4, 0x2, 
-    0x2, 0x574, 0x576, 0x7, 0x99, 0x2, 0x2, 0x575, 0x574, 0x3, 0x2, 0x2, 
-    0x2, 0x575, 0x576, 0x3, 0x2, 0x2, 0x2, 0x576, 0x578, 0x3, 0x2, 0x2, 
-    0x2, 0x577, 0x579, 0x7, 0x97, 0x2, 0x2, 0x578, 0x577, 0x3, 0x2, 0x2, 
-    0x2, 0x578, 0x579, 0x3, 0x2, 0x2, 0x2, 0x579, 0x57c, 0x3, 0x2, 0x2, 
-    0x2, 0x57a, 0x57b, 0x7, 0x4c, 0x2, 0x2, 0x57b, 0x57d, 0x7, 0x37, 0x2, 
-    0x2, 0x57c, 0x57a, 0x3, 0x2, 0x2, 0x2, 0x57c, 0x57d, 0x3, 0x2, 0x2, 
-    0x2, 0x57d, 0x57e, 0x3, 0x2, 0x2, 0x2, 0x57e, 0x580, 0x5, 0xba, 0x5e, 
-    0x2, 0x57f, 0x581, 0x5, 0x2c, 0x17, 0x2, 0x580, 0x57f, 0x3, 0x2, 0x2, 
-    0x2, 0x580, 0x581, 0x3, 0x2, 0x2, 0x2, 0x581, 0x9f, 0x3, 0x2, 0x2, 0x2, 
-    0x582, 0x583, 0x7, 0xa9, 0x2, 0x2, 0x583, 0x584, 0x5, 0xc0, 0x61, 0x2, 
-    0x584, 0xa1, 0x3, 0x2, 0x2, 0x2, 0x585, 0x586, 0x7, 0xaf, 0x2, 0x2, 
-    0x586, 0x588, 0x5, 0xba, 0x5e, 0x2, 0x587, 0x589, 0x7, 0x36, 0x2, 0x2, 
-    0x588, 0x587, 0x3, 0x2, 0x2, 0x2, 0x588, 0x589, 0x3, 0x2, 0x2, 0x2, 
-    0x589, 0x58c, 0x3, 0x2, 0x2, 0x2, 0x58a, 0x58b, 0x7, 0x61, 0x2, 0x2, 
-    0x58b, 0x58d, 0x7, 0xba, 0x2, 0x2, 0x58c, 0x58a, 0x3, 0x2, 0x2, 0x2, 
-    0x58c, 0x58d, 0x3, 0x2, 0x2, 0x2, 0x58d, 0xa3, 0x3, 0x2, 0x2, 0x2, 0x58e, 
-    0x5be, 0x5, 0xd0, 0x69, 0x2, 0x58f, 0x590, 0x5, 0xd0, 0x69, 0x2, 0x590, 
-    0x591, 0x7, 0xcd, 0x2, 0x2, 0x591, 0x592, 0x5, 0xd0, 0x69, 0x2, 0x592, 
-    0x599, 0x5, 0xa4, 0x53, 0x2, 0x593, 0x594, 0x7, 0xc2, 0x2, 0x2, 0x594, 
-    0x595, 0x5, 0xd0, 0x69, 0x2, 0x595, 0x596, 0x5, 0xa4, 0x53, 0x2, 0x596, 
-    0x598, 0x3, 0x2, 0x2, 0x2, 0x597, 0x593, 0x3, 0x2, 0x2, 0x2, 0x598, 
-    0x59b, 0x3, 0x2, 0x2, 0x2, 0x599, 0x597, 0x3, 0x2, 0x2, 0x2, 0x599, 
-    0x59a, 0x3, 0x2, 0x2, 0x2, 0x59a, 0x59c, 0x3, 0x2, 0x2, 0x2, 0x59b, 
-    0x599, 0x3, 0x2, 0x2, 0x2, 0x59c, 0x59d, 0x7, 0xd7, 0x2, 0x2, 0x59d, 
-    0x5be, 0x3, 0x2, 0x2, 0x2, 0x59e, 0x59f, 0x5, 0xd0, 0x69, 0x2, 0x59f, 
-    0x5a0, 0x7, 0xcd, 0x2, 0x2, 0x5a0, 0x5a5, 0x5, 0xd4, 0x6b, 0x2, 0x5a1, 
-    0x5a2, 0x7, 0xc2, 0x2, 0x2, 0x5a2, 0x5a4, 0x5, 0xd4, 0x6b, 0x2, 0x5a3, 
-    0x5a1, 0x3, 0x2, 0x2, 0x2, 0x5a4, 0x5a7, 0x3, 0x2, 0x2, 0x2, 0x5a5, 
-    0x5a3, 0x3, 0x2, 0x2, 0x2, 0x5a5, 0x5a6, 0x3, 0x2, 0x2, 0x2, 0x5a6, 
-    0x5a8, 0x3, 0x2, 0x2, 0x2, 0x5a7, 0x5a5, 0x3, 0x2, 0x2, 0x2, 0x5a8, 
-    0x5a9, 0x7, 0xd7, 0x2, 0x2, 0x5a9, 0x5be, 0x3, 0x2, 0x2, 0x2, 0x5aa, 
-    0x5ab, 0x5, 0xd0, 0x69, 0x2, 0x5ab, 0x5ac, 0x7, 0xcd, 0x2, 0x2, 0x5ac, 
-    0x5b1, 0x5, 0xa4, 0x53, 0x2, 0x5ad, 0x5ae, 0x7, 0xc2, 0x2, 0x2, 0x5ae, 
-    0x5b0, 0x5, 0xa4, 0x53, 0x2, 0x5af, 0x5ad, 0x3, 0x2, 0x2, 0x2, 0x5b0, 
-    0x5b3, 0x3, 0x2, 0x2, 0x2, 0x5b1, 0x5af, 0x3, 0x2, 0x2, 0x2, 0x5b1, 
-    0x5b2, 0x3, 0x2, 0x2, 0x2, 0x5b2, 0x5b4, 0x3, 0x2, 0x2, 0x2, 0x5b3, 
-    0x5b1, 0x3, 0x2, 0x2, 0x2, 0x5b4, 0x5b5, 0x7, 0xd7, 0x2, 0x2, 0x5b5, 
-    0x5be, 0x3, 0x2, 0x2, 0x2, 0x5b6, 0x5b7, 0x5, 0xd0, 0x69, 0x2, 0x5b7, 
-    0x5b9, 0x7, 0xcd, 0x2, 0x2, 0x5b8, 0x5ba, 0x5, 0xa6, 0x54, 0x2, 0x5b9, 
-    0x5b8, 0x3, 0x2, 0x2, 0x2, 0x5b9, 0x5ba, 0x3, 0x2, 0x2, 0x2, 0x5ba, 
-    0x5bb, 0x3, 0x2, 0x2, 0x2, 0x5bb, 0x5bc, 0x7, 0xd7, 0x2, 0x2, 0x5bc, 
-    0x5be, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x58e, 0x3, 0x2, 0x2, 0x2, 0x5bd, 
-    0x58f, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x59e, 0x3, 0x2, 0x2, 0x2, 0x5bd, 
-    0x5aa, 0x3, 0x2, 0x2, 0x2, 0x5bd, 0x5b6, 0x3, 0x2, 0x2, 0x2, 0x5be, 
-    0xa5, 0x3, 0x2, 0x2, 0x2, 0x5bf, 0x5c4, 0x5, 0xa8, 0x55, 0x2, 0x5c0, 
-    0x5c1, 0x7, 0xc2, 0x2, 0x2, 0x5c1, 0x5c3, 0x5, 0xa8, 0x55, 0x2, 0x5c2, 
-    0x5c0, 0x3, 0x2, 0x2, 0x2, 0x5c3, 0x5c6, 0x3, 0x2, 0x2, 0x2, 0x5c4, 
-    0x5c2, 0x3, 0x2, 0x2, 0x2, 0x5c4, 0x5c5, 0x3, 0x2, 0x2, 0x2, 0x5c5, 
-    0xa7, 0x3, 0x2, 0x2, 0x2, 0x5c6, 0x5c4, 0x3, 0x2, 0x2, 0x2, 0x5c7, 0x5c8, 
-    0x5, 0xba, 0x5e, 0x2, 0x5c8, 0x5c9, 0x7, 0xc5, 0x2, 0x2, 0x5c9, 0x5cb, 
-    0x3, 0x2, 0x2, 0x2, 0x5ca, 0x5c7, 0x3, 0x2, 0x2, 0x2, 0x5ca, 0x5cb, 
-    0x3, 0x2, 0x2, 0x2, 0x5cb, 0x5cc, 0x3, 0x2, 0x2, 0x2, 0x5cc, 0x5d3, 
-    0x7, 0xbe, 0x2, 0x2, 0x5cd, 0x5ce, 0x7, 0xcd, 0x2, 0x2, 0x5ce, 0x5cf, 
-    0x5, 0x64, 0x33, 0x2, 0x5cf, 0x5d0, 0x7, 0xd7, 0x2, 0x2, 0x5d0, 0x5d3, 
-    0x3, 0x2, 0x2, 0x2, 0x5d1, 0x5d3, 0x5, 0xaa, 0x56, 0x2, 0x5d2, 0x5ca, 
-    0x3, 0x2, 0x2, 0x2, 0x5d2, 0x5cd, 0x3, 0x2, 0x2, 0x2, 0x5d2, 0x5d1, 
-    0x3, 0x2, 0x2, 0x2, 0x5d3, 0xa9, 0x3, 0x2, 0x2, 0x2, 0x5d4, 0x5d5, 0x8, 
-    0x56, 0x1, 0x2, 0x5d5, 0x5d7, 0x7, 0x14, 0x2, 0x2, 0x5d6, 0x5d8, 0x5, 
-    0xaa, 0x56, 0x2, 0x5d7, 0x5d6, 0x3, 0x2, 0x2, 0x2, 0x5d7, 0x5d8, 0x3, 
-    0x2, 0x2, 0x2, 0x5d8, 0x5de, 0x3, 0x2, 0x2, 0x2, 0x5d9, 0x5da, 0x7, 
-    0xb1, 0x2, 0x2, 0x5da, 0x5db, 0x5, 0xaa, 0x56, 0x2, 0x5db, 0x5dc, 0x7, 
-    0x9b, 0x2, 0x2, 0x5dc, 0x5dd, 0x5, 0xaa, 0x56, 0x2, 0x5dd, 0x5df, 0x3, 
-    0x2, 0x2, 0x2, 0x5de, 0x5d9, 0x3, 0x2, 0x2, 0x2, 0x5df, 0x5e0, 0x3, 
-    0x2, 0x2, 0x2, 0x5e0, 0x5de, 0x3, 0x2, 0x2, 0x2, 0x5e0, 0x5e1, 0x3, 
-    0x2, 0x2, 0x2, 0x5e1, 0x5e4, 0x3, 0x2, 0x2, 0x2, 0x5e2, 0x5e3, 0x7, 
-    0x33, 0x2, 0x2, 0x5e3, 0x5e5, 0x5, 0xaa, 0x56, 0x2, 0x5e4, 0x5e2, 0x3, 
-    0x2, 0x2, 0x2, 0x5e4, 0x5e5, 0x3, 0x2, 0x2, 0x2, 0x5e5, 0x5e6, 0x3, 
-    0x2, 0x2, 0x2, 0x5e6, 0x5e7, 0x7, 0x34, 0x2, 0x2, 0x5e7, 0x640, 0x3, 
-    0x2, 0x2, 0x2, 0x5e8, 0x5e9, 0x7, 0x15, 0x2, 0x2, 0x5e9, 0x5ea, 0x7, 
-    0xcd, 0x2, 0x2, 0x5ea, 0x5eb, 0x5, 0xaa, 0x56, 0x2, 0x5eb, 0x5ec, 0x7, 
-    0xc, 0x2, 0x2, 0x5ec, 0x5ed, 0x5, 0xa4, 0x53, 0x2, 0x5ed, 0x5ee, 0x7, 
-    0xd7, 0x2, 0x2, 0x5ee, 0x640, 0x3, 0x2, 0x2, 0x2, 0x5ef, 0x5f0, 0x7, 
-    0x23, 0x2, 0x2, 0x5f0, 0x640, 0x7, 0xbc, 0x2, 0x2, 0x5f1, 0x5f2, 0x7, 
-    0x3a, 0x2, 0x2, 0x5f2, 0x5f3, 0x7, 0xcd, 0x2, 0x2, 0x5f3, 0x5f4, 0x5, 
-    0xc8, 0x65, 0x2, 0x5f4, 0x5f5, 0x7, 0x42, 0x2, 0x2, 0x5f5, 0x5f6, 0x5, 
-    0xaa, 0x56, 0x2, 0x5f6, 0x5f7, 0x7, 0xd7, 0x2, 0x2, 0x5f7, 0x640, 0x3, 
-    0x2, 0x2, 0x2, 0x5f8, 0x5f9, 0x7, 0x54, 0x2, 0x2, 0x5f9, 0x5fa, 0x5, 
-    0xaa, 0x56, 0x2, 0x5fa, 0x5fb, 0x5, 0xc8, 0x65, 0x2, 0x5fb, 0x640, 0x3, 
-    0x2, 0x2, 0x2, 0x5fc, 0x5fd, 0x7, 0x93, 0x2, 0x2, 0x5fd, 0x5fe, 0x7, 
-    0xcd, 0x2, 0x2, 0x5fe, 0x5ff, 0x5, 0xaa, 0x56, 0x2, 0x5ff, 0x600, 0x7, 
-    0x42, 0x2, 0x2, 0x600, 0x603, 0x5, 0xaa, 0x56, 0x2, 0x601, 0x602, 0x7, 
-    0x3f, 0x2, 0x2, 0x602, 0x604, 0x5, 0xaa, 0x56, 0x2, 0x603, 0x601, 0x3, 
-    0x2, 0x2, 0x2, 0x603, 0x604, 0x3, 0x2, 0x2, 0x2, 0x604, 0x605, 0x3, 
-    0x2, 0x2, 0x2, 0x605, 0x606, 0x7, 0xd7, 0x2, 0x2, 0x606, 0x640, 0x3, 
-    0x2, 0x2, 0x2, 0x607, 0x608, 0x7, 0x9e, 0x2, 0x2, 0x608, 0x640, 0x7, 
-    0xbc, 0x2, 0x2, 0x609, 0x60a, 0x7, 0xa3, 0x2, 0x2, 0x60a, 0x60b, 0x7, 
-    0xcd, 0x2, 0x2, 0x60b, 0x60c, 0x9, 0x14, 0x2, 0x2, 0x60c, 0x60d, 0x7, 
-    0xbc, 0x2, 0x2, 0x60d, 0x60e, 0x7, 0x42, 0x2, 0x2, 0x60e, 0x60f, 0x5, 
-    0xaa, 0x56, 0x2, 0x60f, 0x610, 0x7, 0xd7, 0x2, 0x2, 0x610, 0x640, 0x3, 
-    0x2, 0x2, 0x2, 0x611, 0x617, 0x5, 0xd0, 0x69, 0x2, 0x612, 0x614, 0x7, 
-    0xcd, 0x2, 0x2, 0x613, 0x615, 0x5, 0xa6, 0x54, 0x2, 0x614, 0x613, 0x3, 
-    0x2, 0x2, 0x2, 0x614, 0x615, 0x3, 0x2, 0x2, 0x2, 0x615, 0x616, 0x3, 
-    0x2, 0x2, 0x2, 0x616, 0x618, 0x7, 0xd7, 0x2, 0x2, 0x617, 0x612, 0x3, 
-    0x2, 0x2, 0x2, 0x617, 0x618, 0x3, 0x2, 0x2, 0x2, 0x618, 0x619, 0x3, 
-    0x2, 0x2, 0x2, 0x619, 0x61b, 0x7, 0xcd, 0x2, 0x2, 0x61a, 0x61c, 0x7, 
-    0x30, 0x2, 0x2, 0x61b, 0x61a, 0x3, 0x2, 0x2, 0x2, 0x61b, 0x61c, 0x3, 
-    0x2, 0x2, 0x2, 0x61c, 0x61e, 0x3, 0x2, 0x2, 0x2, 0x61d, 0x61f, 0x5, 
-    0xac, 0x57, 0x2, 0x61e, 0x61d, 0x3, 0x2, 0x2, 0x2, 0x61e, 0x61f, 0x3, 
-    0x2, 0x2, 0x2, 0x61f, 0x620, 0x3, 0x2, 0x2, 0x2, 0x620, 0x621, 0x7, 
-    0xd7, 0x2, 0x2, 0x621, 0x640, 0x3, 0x2, 0x2, 0x2, 0x622, 0x640, 0x5, 
-    0xc6, 0x64, 0x2, 0x623, 0x624, 0x7, 0xc4, 0x2, 0x2, 0x624, 0x640, 0x5, 
-    0xaa, 0x56, 0x13, 0x625, 0x626, 0x7, 0x70, 0x2, 0x2, 0x626, 0x640, 0x5, 
-    0xaa, 0x56, 0xe, 0x627, 0x628, 0x5, 0xba, 0x5e, 0x2, 0x628, 0x629, 0x7, 
-    0xc5, 0x2, 0x2, 0x629, 0x62b, 0x3, 0x2, 0x2, 0x2, 0x62a, 0x627, 0x3, 
-    0x2, 0x2, 0x2, 0x62a, 0x62b, 0x3, 0x2, 0x2, 0x2, 0x62b, 0x62c, 0x3, 
-    0x2, 0x2, 0x2, 0x62c, 0x640, 0x7, 0xbe, 0x2, 0x2, 0x62d, 0x62e, 0x7, 
-    0xcd, 0x2, 0x2, 0x62e, 0x62f, 0x5, 0x64, 0x33, 0x2, 0x62f, 0x630, 0x7, 
-    0xd7, 0x2, 0x2, 0x630, 0x640, 0x3, 0x2, 0x2, 0x2, 0x631, 0x632, 0x7, 
-    0xcd, 0x2, 0x2, 0x632, 0x633, 0x5, 0xaa, 0x56, 0x2, 0x633, 0x634, 0x7, 
-    0xd7, 0x2, 0x2, 0x634, 0x640, 0x3, 0x2, 0x2, 0x2, 0x635, 0x636, 0x7, 
-    0xcd, 0x2, 0x2, 0x636, 0x637, 0x5, 0xa6, 0x54, 0x2, 0x637, 0x638, 0x7, 
-    0xd7, 0x2, 0x2, 0x638, 0x640, 0x3, 0x2, 0x2, 0x2, 0x639, 0x63b, 0x7, 
-    0xcb, 0x2, 0x2, 0x63a, 0x63c, 0x5, 0xa6, 0x54, 0x2, 0x63b, 0x63a, 0x3, 
-    0x2, 0x2, 0x2, 0x63b, 0x63c, 0x3, 0x2, 0x2, 0x2, 0x63c, 0x63d, 0x3, 
-    0x2, 0x2, 0x2, 0x63d, 0x640, 0x7, 0xd6, 0x2, 0x2, 0x63e, 0x640, 0x5, 
-    0xb2, 0x5a, 0x2, 0x63f, 0x5d4, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x5e8, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x5ef, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x5f1, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x5f8, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x5fc, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x607, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x609, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x611, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x622, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x623, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x625, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x62a, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x62d, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x631, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x635, 0x3, 
-    0x2, 0x2, 0x2, 0x63f, 0x639, 0x3, 0x2, 0x2, 0x2, 0x63f, 0x63e, 0x3, 
-    0x2, 0x2, 0x2, 0x640, 0x688, 0x3, 0x2, 0x2, 0x2, 0x641, 0x642, 0xc, 
-    0x12, 0x2, 0x2, 0x642, 0x643, 0x9, 0x15, 0x2, 0x2, 0x643, 0x687, 0x5, 
-    0xaa, 0x56, 0x13, 0x644, 0x645, 0xc, 0x11, 0x2, 0x2, 0x645, 0x646, 0x9, 
-    0x16, 0x2, 0x2, 0x646, 0x687, 0x5, 0xaa, 0x56, 0x12, 0x647, 0x65a, 0xc, 
-    0x10, 0x2, 0x2, 0x648, 0x65b, 0x7, 0xc6, 0x2, 0x2, 0x649, 0x65b, 0x7, 
-    0xc7, 0x2, 0x2, 0x64a, 0x65b, 0x7, 0xcf, 0x2, 0x2, 0x64b, 0x65b, 0x7, 
-    0xcc, 0x2, 0x2, 0x64c, 0x65b, 0x7, 0xc8, 0x2, 0x2, 0x64d, 0x65b, 0x7, 
-    0xce, 0x2, 0x2, 0x64e, 0x65b, 0x7, 0xc9, 0x2, 0x2, 0x64f, 0x651, 0x7, 
-    0x45, 0x2, 0x2, 0x650, 0x64f, 0x3, 0x2, 0x2, 0x2, 0x650, 0x651, 0x3, 
-    0x2, 0x2, 0x2, 0x651, 0x653, 0x3, 0x2, 0x2, 0x2, 0x652, 0x654, 0x7, 
-    0x70, 0x2, 0x2, 0x653, 0x652, 0x3, 0x2, 0x2, 0x2, 0x653, 0x654, 0x3, 
-    0x2, 0x2, 0x2, 0x654, 0x655, 0x3, 0x2, 0x2, 0x2, 0x655, 0x65b, 0x7, 
-    0x4e, 0x2, 0x2, 0x656, 0x658, 0x7, 0x70, 0x2, 0x2, 0x657, 0x656, 0x3, 
-    0x2, 0x2, 0x2, 0x657, 0x658, 0x3, 0x2, 0x2, 0x2, 0x658, 0x659, 0x3, 
-    0x2, 0x2, 0x2, 0x659, 0x65b, 0x9, 0x17, 0x2, 0x2, 0x65a, 0x648, 0x3, 
-    0x2, 0x2, 0x2, 0x65a, 0x649, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x64a, 0x3, 
-    0x2, 0x2, 0x2, 0x65a, 0x64b, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x64c, 0x3, 
-    0x2, 0x2, 0x2, 0x65a, 0x64d, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x64e, 0x3, 
-    0x2, 0x2, 0x2, 0x65a, 0x650, 0x3, 0x2, 0x2, 0x2, 0x65a, 0x657, 0x3, 
-    0x2, 0x2, 0x2, 0x65b, 0x65c, 0x3, 0x2, 0x2, 0x2, 0x65c, 0x687, 0x5, 
-    0xaa, 0x56, 0x11, 0x65d, 0x65e, 0xc, 0xd, 0x2, 0x2, 0x65e, 0x65f, 0x7, 
-    0x8, 0x2, 0x2, 0x65f, 0x687, 0x5, 0xaa, 0x56, 0xe, 0x660, 0x661, 0xc, 
-    0xc, 0x2, 0x2, 0x661, 0x662, 0x7, 0x76, 0x2, 0x2, 0x662, 0x687, 0x5, 
-    0xaa, 0x56, 0xd, 0x663, 0x665, 0xc, 0xb, 0x2, 0x2, 0x664, 0x666, 0x7, 
-    0x70, 0x2, 0x2, 0x665, 0x664, 0x3, 0x2, 0x2, 0x2, 0x665, 0x666, 0x3, 
-    0x2, 0x2, 0x2, 0x666, 0x667, 0x3, 0x2, 0x2, 0x2, 0x667, 0x668, 0x7, 
-    0x11, 0x2, 0x2, 0x668, 0x669, 0x5, 0xaa, 0x56, 0x2, 0x669, 0x66a, 0x7, 
-    0x8, 0x2, 0x2, 0x66a, 0x66b, 0x5, 0xaa, 0x56, 0xc, 0x66b, 0x687, 0x3, 
-    0x2, 0x2, 0x2, 0x66c, 0x66d, 0xc, 0xa, 0x2, 0x2, 0x66d, 0x66e, 0x7, 
-    0xd2, 0x2, 0x2, 0x66e, 0x66f, 0x5, 0xaa, 0x56, 0x2, 0x66f, 0x670, 0x7, 
-    0xc1, 0x2, 0x2, 0x670, 0x671, 0x5, 0xaa, 0x56, 0xa, 0x671, 0x687, 0x3, 
-    0x2, 0x2, 0x2, 0x672, 0x673, 0xc, 0x15, 0x2, 0x2, 0x673, 0x674, 0x7, 
-    0xcb, 0x2, 0x2, 0x674, 0x675, 0x5, 0xaa, 0x56, 0x2, 0x675, 0x676, 0x7, 
-    0xd6, 0x2, 0x2, 0x676, 0x687, 0x3, 0x2, 0x2, 0x2, 0x677, 0x678, 0xc, 
-    0x14, 0x2, 0x2, 0x678, 0x679, 0x7, 0xc5, 0x2, 0x2, 0x679, 0x687, 0x7, 
-    0xba, 0x2, 0x2, 0x67a, 0x67b, 0xc, 0xf, 0x2, 0x2, 0x67b, 0x67d, 0x7, 
-    0x56, 0x2, 0x2, 0x67c, 0x67e, 0x7, 0x70, 0x2, 0x2, 0x67d, 0x67c, 0x3, 
-    0x2, 0x2, 0x2, 0x67d, 0x67e, 0x3, 0x2, 0x2, 0x2, 0x67e, 0x67f, 0x3, 
-    0x2, 0x2, 0x2, 0x67f, 0x687, 0x7, 0x71, 0x2, 0x2, 0x680, 0x684, 0xc, 
-    0x9, 0x2, 0x2, 0x681, 0x685, 0x5, 0xce, 0x68, 0x2, 0x682, 0x683, 0x7, 
-    0xc, 0x2, 0x2, 0x683, 0x685, 0x5, 0xd0, 0x69, 0x2, 0x684, 0x681, 0x3, 
-    0x2, 0x2, 0x2, 0x684, 0x682, 0x3, 0x2, 0x2, 0x2, 0x685, 0x687, 0x3, 
-    0x2, 0x2, 0x2, 0x686, 0x641, 0x3, 0x2, 0x2, 0x2, 0x686, 0x644, 0x3, 
-    0x2, 0x2, 0x2, 0x686, 0x647, 0x3, 0x2, 0x2, 0x2, 0x686, 0x65d, 0x3, 
-    0x2, 0x2, 0x2, 0x686, 0x660, 0x3, 0x2, 0x2, 0x2, 0x686, 0x663, 0x3, 
-    0x2, 0x2, 0x2, 0x686, 0x66c, 0x3, 0x2, 0x2, 0x2, 0x686, 0x672, 0x3, 
-    0x2, 0x2, 0x2, 0x686, 0x677, 0x3, 0x2, 0x2, 0x2, 0x686, 0x67a, 0x3, 
-    0x2, 0x2, 0x2, 0x686, 0x680, 0x3, 0x2, 0x2, 0x2, 0x687, 0x68a, 0x3, 
-    0x2, 0x2, 0x2, 0x688, 0x686, 0x3, 0x2, 0x2, 0x2, 0x688, 0x689, 0x3, 
-    0x2, 0x2, 0x2, 0x689, 0xab, 0x3, 0x2, 0x2, 0x2, 0x68a, 0x688, 0x3, 0x2, 
-    0x2, 0x2, 0x68b, 0x690, 0x5, 0xae, 0x58, 0x2, 0x68c, 0x68d, 0x7, 0xc2, 
-    0x2, 0x2, 0x68d, 0x68f, 0x5, 0xae, 0x58, 0x2, 0x68e, 0x68c, 0x3, 0x2, 
-    0x2, 0x2, 0x68f, 0x692, 0x3, 0x2, 0x2, 0x2, 0x690, 0x68e, 0x3, 0x2, 
-    0x2, 0x2, 0x690, 0x691, 0x3, 0x2, 0x2, 0x2, 0x691, 0xad, 0x3, 0x2, 0x2, 
-    0x2, 0x692, 0x690, 0x3, 0x2, 0x2, 0x2, 0x693, 0x696, 0x5, 0xb0, 0x59, 
-    0x2, 0x694, 0x696, 0x5, 0xaa, 0x56, 0x2, 0x695, 0x693, 0x3, 0x2, 0x2, 
-    0x2, 0x695, 0x694, 0x3, 0x2, 0x2, 0x2, 0x696, 0xaf, 0x3, 0x2, 0x2, 0x2, 
-    0x697, 0x698, 0x7, 0xcd, 0x2, 0x2, 0x698, 0x69d, 0x5, 0xd0, 0x69, 0x2, 
-    0x699, 0x69a, 0x7, 0xc2, 0x2, 0x2, 0x69a, 0x69c, 0x5, 0xd0, 0x69, 0x2, 
-    0x69b, 0x699, 0x3, 0x2, 0x2, 0x2, 0x69c, 0x69f, 0x3, 0x2, 0x2, 0x2, 
-    0x69d, 0x69b, 0x3, 0x2, 0x2, 0x2, 0x69d, 0x69e, 0x3, 0x2, 0x2, 0x2, 
-    0x69e, 0x6a0, 0x3, 0x2, 0x2, 0x2, 0x69f, 0x69d, 0x3, 0x2, 0x2, 0x2, 
-    0x6a0, 0x6a1, 0x7, 0xd7, 0x2, 0x2, 0x6a1, 0x6ab, 0x3, 0x2, 0x2, 0x2, 
-    0x6a2, 0x6a7, 0x5, 0xd0, 0x69, 0x2, 0x6a3, 0x6a4, 0x7, 0xc2, 0x2, 0x2, 
-    0x6a4, 0x6a6, 0x5, 0xd0, 0x69, 0x2, 0x6a5, 0x6a3, 0x3, 0x2, 0x2, 0x2, 
-    0x6a6, 0x6a9, 0x3, 0x2, 0x2, 0x2, 0x6a7, 0x6a5, 0x3, 0x2, 0x2, 0x2, 
-    0x6a7, 0x6a8, 0x3, 0x2, 0x2, 0x2, 0x6a8, 0x6ab, 0x3, 0x2, 0x2, 0x2, 
-    0x6a9, 0x6a7, 0x3, 0x2, 0x2, 0x2, 0x6aa, 0x697, 0x3, 0x2, 0x2, 0x2, 
-    0x6aa, 0x6a2, 0x3, 0x2, 0x2, 0x2, 0x6ab, 0x6ac, 0x3, 0x2, 0x2, 0x2, 
-    0x6ac, 0x6ad, 0x7, 0xbd, 0x2, 0x2, 0x6ad, 0x6ae, 0x5, 0xaa, 0x56, 0x2, 
-    0x6ae, 0xb1, 0x3, 0x2, 0x2, 0x2, 0x6af, 0x6b0, 0x5, 0xba, 0x5e, 0x2, 
-    0x6b0, 0x6b1, 0x7, 0xc5, 0x2, 0x2, 0x6b1, 0x6b3, 0x3, 0x2, 0x2, 0x2, 
-    0x6b2, 0x6af, 0x3, 0x2, 0x2, 0x2, 0x6b2, 0x6b3, 0x3, 0x2, 0x2, 0x2, 
-    0x6b3, 0x6b4, 0x3, 0x2, 0x2, 0x2, 0x6b4, 0x6b5, 0x5, 0xb4, 0x5b, 0x2, 
-    0x6b5, 0xb3, 0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6b9, 0x5, 0xd0, 0x69, 0x2, 
-    0x6b7, 0x6b8, 0x7, 0xc5, 0x2, 0x2, 0x6b8, 0x6ba, 0x5, 0xd0, 0x69, 0x2, 
-    0x6b9, 0x6b7, 0x3, 0x2, 0x2, 0x2, 0x6b9, 0x6ba, 0x3, 0x2, 0x2, 0x2, 
-    0x6ba, 0xb5, 0x3, 0x2, 0x2, 0x2, 0x6bb, 0x6bc, 0x8, 0x5c, 0x1, 0x2, 
-    0x6bc, 0x6c3, 0x5, 0xba, 0x5e, 0x2, 0x6bd, 0x6c3, 0x5, 0xb8, 0x5d, 0x2, 
-    0x6be, 0x6bf, 0x7, 0xcd, 0x2, 0x2, 0x6bf, 0x6c0, 0x5, 0x64, 0x33, 0x2, 
-    0x6c0, 0x6c1, 0x7, 0xd7, 0x2, 0x2, 0x6c1, 0x6c3, 0x3, 0x2, 0x2, 0x2, 
-    0x6c2, 0x6bb, 0x3, 0x2, 0x2, 0x2, 0x6c2, 0x6bd, 0x3, 0x2, 0x2, 0x2, 
-    0x6c2, 0x6be, 0x3, 0x2, 0x2, 0x2, 0x6c3, 0x6cc, 0x3, 0x2, 0x2, 0x2, 
-    0x6c4, 0x6c8, 0xc, 0x3, 0x2, 0x2, 0x6c5, 0x6c9, 0x5, 0xce, 0x68, 0x2, 
-    0x6c6, 0x6c7, 0x7, 0xc, 0x2, 0x2, 0x6c7, 0x6c9, 0x5, 0xd0, 0x69, 0x2, 
-    0x6c8, 0x6c5, 0x3, 0x2, 0x2, 0x2, 0x6c8, 0x6c6, 0x3, 0x2, 0x2, 0x2, 
-    0x6c9, 0x6cb, 0x3, 0x2, 0x2, 0x2, 0x6ca, 0x6c4, 0x3, 0x2, 0x2, 0x2, 
-    0x6cb, 0x6ce, 0x3, 0x2, 0x2, 0x2, 0x6cc, 0x6ca, 0x3, 0x2, 0x2, 0x2, 
-    0x6cc, 0x6cd, 0x3, 0x2, 0x2, 0x2, 0x6cd, 0xb7, 0x3, 0x2, 0x2, 0x2, 0x6ce, 
-    0x6cc, 0x3, 0x2, 0x2, 0x2, 0x6cf, 0x6d0, 0x5, 0xd0, 0x69, 0x2, 0x6d0, 
-    0x6d2, 0x7, 0xcd, 0x2, 0x2, 0x6d1, 0x6d3, 0x5, 0xbc, 0x5f, 0x2, 0x6d2, 
-    0x6d1, 0x3, 0x2, 0x2, 0x2, 0x6d2, 0x6d3, 0x3, 0x2, 0x2, 0x2, 0x6d3, 
-    0x6d4, 0x3, 0x2, 0x2, 0x2, 0x6d4, 0x6d5, 0x7, 0xd7, 0x2, 0x2, 0x6d5, 
-    0xb9, 0x3, 0x2, 0x2, 0x2, 0x6d6, 0x6d7, 0x5, 0xc0, 0x61, 0x2, 0x6d7, 
-    0x6d8, 0x7, 0xc5, 0x2, 0x2, 0x6d8, 0x6da, 0x3, 0x2, 0x2, 0x2, 0x6d9, 
-    0x6d6, 0x3, 0x2, 0x2, 0x2, 0x6d9, 0x6da, 0x3, 0x2, 0x2, 0x2, 0x6da, 
-    0x6db, 0x3, 0x2, 0x2, 0x2, 0x6db, 0x6dc, 0x5, 0xd0, 0x69, 0x2, 0x6dc, 
-    0xbb, 0x3, 0x2, 0x2, 0x2, 0x6dd, 0x6e2, 0x5, 0xbe, 0x60, 0x2, 0x6de, 
-    0x6df, 0x7, 0xc2, 0x2, 0x2, 0x6df, 0x6e1, 0x5, 0xbe, 0x60, 0x2, 0x6e0, 
-    0x6de, 0x3, 0x2, 0x2, 0x2, 0x6e1, 0x6e4, 0x3, 0x2, 0x2, 0x2, 0x6e2, 
-    0x6e0, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6e3, 0x3, 0x2, 0x2, 0x2, 0x6e3, 
-    0xbd, 0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6e2, 0x3, 0x2, 0x2, 0x2, 0x6e5, 0x6e9, 
-    0x5, 0xba, 0x5e, 0x2, 0x6e6, 0x6e9, 0x5, 0xb8, 0x5d, 0x2, 0x6e7, 0x6e9, 
-    0x5, 0xc6, 0x64, 0x2, 0x6e8, 0x6e5, 0x3, 0x2, 0x2, 0x2, 0x6e8, 0x6e6, 
-    0x3, 0x2, 0x2, 0x2, 0x6e8, 0x6e7, 0x3, 0x2, 0x2, 0x2, 0x6e9, 0xbf, 0x3, 
-    0x2, 0x2, 0x2, 0x6ea, 0x6eb, 0x5, 0xd0, 0x69, 0x2, 0x6eb, 0xc1, 0x3, 
-    0x2, 0x2, 0x2, 0x6ec, 0x6f5, 0x7, 0xb8, 0x2, 0x2, 0x6ed, 0x6ee, 0x7, 
-    0xc5, 0x2, 0x2, 0x6ee, 0x6f5, 0x9, 0x18, 0x2, 0x2, 0x6ef, 0x6f0, 0x7, 
-    0xba, 0x2, 0x2, 0x6f0, 0x6f2, 0x7, 0xc5, 0x2, 0x2, 0x6f1, 0x6f3, 0x9, 
-    0x18, 0x2, 0x2, 0x6f2, 0x6f1, 0x3, 0x2, 0x2, 0x2, 0x6f2, 0x6f3, 0x3, 
-    0x2, 0x2, 0x2, 0x6f3, 0x6f5, 0x3, 0x2, 0x2, 0x2, 0x6f4, 0x6ec, 0x3, 
-    0x2, 0x2, 0x2, 0x6f4, 0x6ed, 0x3, 0x2, 0x2, 0x2, 0x6f4, 0x6ef, 0x3, 
-    0x2, 0x2, 0x2, 0x6f5, 0xc3, 0x3, 0x2, 0x2, 0x2, 0x6f6, 0x6f8, 0x9, 0x19, 
-    0x2, 0x2, 0x6f7, 0x6f6, 0x3, 0x2, 0x2, 0x2, 0x6f7, 0x6f8, 0x3, 0x2, 
-    0x2, 0x2, 0x6f8, 0x6ff, 0x3, 0x2, 0x2, 0x2, 0x6f9, 0x700, 0x5, 0xc2, 
-    0x62, 0x2, 0x6fa, 0x700, 0x7, 0xb9, 0x2, 0x2, 0x6fb, 0x700, 0x7, 0xba, 
-    0x2, 0x2, 0x6fc, 0x700, 0x7, 0xbb, 0x2, 0x2, 0x6fd, 0x700, 0x7, 0x50, 
-    0x2, 0x2, 0x6fe, 0x700, 0x7, 0x6e, 0x2, 0x2, 0x6ff, 0x6f9, 0x3, 0x2, 
-    0x2, 0x2, 0x6ff, 0x6fa, 0x3, 0x2, 0x2, 0x2, 0x6ff, 0x6fb, 0x3, 0x2, 
-    0x2, 0x2, 0x6ff, 0x6fc, 0x3, 0x2, 0x2, 0x2, 0x6ff, 0x6fd, 0x3, 0x2, 
-    0x2, 0x2, 0x6ff, 0x6fe, 0x3, 0x2, 0x2, 0x2, 0x700, 0xc5, 0x3, 0x2, 0x2, 
-    0x2, 0x701, 0x705, 0x5, 0xc4, 0x63, 0x2, 0x702, 0x705, 0x7, 0xbc, 0x2, 
-    0x2, 0x703, 0x705, 0x7, 0x71, 0x2, 0x2, 0x704, 0x701, 0x3, 0x2, 0x2, 
-    0x2, 0x704, 0x702, 0x3, 0x2, 0x2, 0x2, 0x704, 0x703, 0x3, 0x2, 0x2, 
-    0x2, 0x705, 0xc7, 0x3, 0x2, 0x2, 0x2, 0x706, 0x707, 0x9, 0x1a, 0x2, 
-    0x2, 0x707, 0xc9, 0x3, 0x2, 0x2, 0x2, 0x708, 0x709, 0x9, 0x1b, 0x2, 
-    0x2, 0x709, 0xcb, 0x3, 0x2, 0x2, 0x2, 0x70a, 0x70b, 0x9, 0x1c, 0x2, 
-    0x2, 0x70b, 0xcd, 0x3, 0x2, 0x2, 0x2, 0x70c, 0x70f, 0x7, 0xb7, 0x2, 
-    0x2, 0x70d, 0x70f, 0x5, 0xcc, 0x67, 0x2, 0x70e, 0x70c, 0x3, 0x2, 0x2, 
-    0x2, 0x70e, 0x70d, 0x3, 0x2, 0x2, 0x2, 0x70f, 0xcf, 0x3, 0x2, 0x2, 0x2, 
-    0x710, 0x714, 0x7, 0xb7, 0x2, 0x2, 0x711, 0x714, 0x5, 0xc8, 0x65, 0x2, 
-    0x712, 0x714, 0x5, 0xca, 0x66, 0x2, 0x713, 0x710, 0x3, 0x2, 0x2, 0x2, 
-    0x713, 0x711, 0x3, 0x2, 0x2, 0x2, 0x713, 0x712, 0x3, 0x2, 0x2, 0x2, 
-    0x714, 0xd1, 0x3, 0x2, 0x2, 0x2, 0x715, 0x718, 0x5, 0xd0, 0x69, 0x2, 
-    0x716, 0x718, 0x7, 0x71, 0x2, 0x2, 0x717, 0x715, 0x3, 0x2, 0x2, 0x2, 
-    0x717, 0x716, 0x3, 0x2, 0x2, 0x2, 0x718, 0xd3, 0x3, 0x2, 0x2, 0x2, 0x719, 
-    0x71a, 0x7, 0xbc, 0x2, 0x2, 0x71a, 0x71b, 0x7, 0xc7, 0x2, 0x2, 0x71b, 
-    0x71c, 0x5, 0xc4, 0x63, 0x2, 0x71c, 0xd5, 0x3, 0x2, 0x2, 0x2, 0xf4, 
-    0xda, 0xde, 0xe1, 0xe4, 0xf8, 0xfe, 0x105, 0x10d, 0x112, 0x119, 0x11e, 
-    0x124, 0x12a, 0x12f, 0x135, 0x143, 0x14a, 0x151, 0x157, 0x160, 0x16a, 
-    0x174, 0x188, 0x190, 0x19f, 0x1a6, 0x1b4, 0x1ba, 0x1c0, 0x1c7, 0x1cb, 
-    0x1ce, 0x1d5, 0x1d9, 0x1dc, 0x1e7, 0x1eb, 0x1ee, 0x1f3, 0x1f5, 0x1f8, 
-    0x1fb, 0x205, 0x209, 0x20c, 0x20f, 0x214, 0x216, 0x21c, 0x222, 0x226, 
-    0x229, 0x22c, 0x22f, 0x232, 0x237, 0x23d, 0x241, 0x244, 0x247, 0x24b, 
-    0x253, 0x26d, 0x26f, 0x273, 0x289, 0x28b, 0x296, 0x299, 0x2a2, 0x2b3, 
-    0x2be, 0x2d0, 0x2dd, 0x2ee, 0x2f7, 0x312, 0x314, 0x329, 0x32e, 0x333, 
-    0x336, 0x340, 0x345, 0x349, 0x34c, 0x350, 0x354, 0x359, 0x35c, 0x360, 
-    0x362, 0x375, 0x37d, 0x380, 0x38a, 0x38e, 0x396, 0x39a, 0x39f, 0x3a3, 
-    0x3a7, 0x3ab, 0x3af, 0x3b1, 0x3b9, 0x3bd, 0x3c0, 0x3c9, 0x3ce, 0x3d1, 
-    0x3db, 0x3e5, 0x3e9, 0x3ee, 0x3f2, 0x3f8, 0x3fb, 0x3fe, 0x401, 0x40f, 
-    0x413, 0x41b, 0x423, 0x426, 0x42a, 0x42d, 0x431, 0x434, 0x437, 0x43a, 
-    0x43d, 0x441, 0x445, 0x448, 0x44b, 0x44e, 0x451, 0x454, 0x45d, 0x463, 
-    0x477, 0x489, 0x491, 0x494, 0x49a, 0x4a2, 0x4a5, 0x4ab, 0x4ad, 0x4b1, 
-    0x4b6, 0x4b9, 0x4bc, 0x4c0, 0x4c4, 0x4c7, 0x4c9, 0x4cc, 0x4d0, 0x4d4, 
-    0x4d7, 0x4d9, 0x4db, 0x4de, 0x4e3, 0x4ee, 0x4f4, 0x4f9, 0x500, 0x505, 
-    0x509, 0x50d, 0x512, 0x519, 0x52e, 0x531, 0x53a, 0x53e, 0x543, 0x548, 
-    0x54b, 0x54d, 0x563, 0x566, 0x571, 0x575, 0x578, 0x57c, 0x580, 0x588, 
-    0x58c, 0x599, 0x5a5, 0x5b1, 0x5b9, 0x5bd, 0x5c4, 0x5ca, 0x5d2, 0x5d7, 
-    0x5e0, 0x5e4, 0x603, 0x614, 0x617, 0x61b, 0x61e, 0x62a, 0x63b, 0x63f, 
-    0x650, 0x653, 0x657, 0x65a, 0x665, 0x67d, 0x684, 0x686, 0x688, 0x690, 
-    0x695, 0x69d, 0x6a7, 0x6aa, 0x6b2, 0x6b9, 0x6c2, 0x6c8, 0x6cc, 0x6d2, 
-    0x6d9, 0x6e2, 0x6e8, 0x6f2, 0x6f4, 0x6f7, 0x6ff, 0x704, 0x70e, 0x713, 
-    0x717, 
+    0x2, 0x44c, 0x63, 0x3, 0x2, 0x2, 0x2, 0x44d, 0x44e, 0x7, 0x84, 0x2, 
+    0x2, 0x44e, 0x44f, 0x7, 0x99, 0x2, 0x2, 0x44f, 0x450, 0x5, 0xc0, 0x61, 
+    0x2, 0x450, 0x451, 0x7, 0xa1, 0x2, 0x2, 0x451, 0x459, 0x5, 0xc0, 0x61, 
+    0x2, 0x452, 0x453, 0x7, 0xc4, 0x2, 0x2, 0x453, 0x454, 0x5, 0xc0, 0x61, 
+    0x2, 0x454, 0x455, 0x7, 0xa1, 0x2, 0x2, 0x455, 0x456, 0x5, 0xc0, 0x61, 
+    0x2, 0x456, 0x458, 0x3, 0x2, 0x2, 0x2, 0x457, 0x452, 0x3, 0x2, 0x2, 
+    0x2, 0x458, 0x45b, 0x3, 0x2, 0x2, 0x2, 0x459, 0x457, 0x3, 0x2, 0x2, 
+    0x2, 0x459, 0x45a, 0x3, 0x2, 0x2, 0x2, 0x45a, 0x45d, 0x3, 0x2, 0x2, 
+    0x2, 0x45b, 0x459, 0x3, 0x2, 0x2, 0x2, 0x45c, 0x45e, 0x5, 0x2c, 0x17, 
+    0x2, 0x45d, 0x45c, 0x3, 0x2, 0x2, 0x2, 0x45d, 0x45e, 0x3, 0x2, 0x2, 
+    0x2, 0x45e, 0x65, 0x3, 0x2, 0x2, 0x2, 0x45f, 0x461, 0x7, 0xcf, 0x2, 
+    0x2, 0x460, 0x462, 0x5, 0x6e, 0x38, 0x2, 0x461, 0x460, 0x3, 0x2, 0x2, 
+    0x2, 0x461, 0x462, 0x3, 0x2, 0x2, 0x2, 0x462, 0x463, 0x3, 0x2, 0x2, 
+    0x2, 0x463, 0x464, 0x7, 0x8c, 0x2, 0x2, 0x464, 0x466, 0x5, 0xac, 0x57, 
+    0x2, 0x465, 0x467, 0x5, 0x7a, 0x3e, 0x2, 0x466, 0x465, 0x3, 0x2, 0x2, 
+    0x2, 0x466, 0x467, 0x3, 0x2, 0x2, 0x2, 0x467, 0x469, 0x3, 0x2, 0x2, 
+    0x2, 0x468, 0x46a, 0x5, 0x80, 0x41, 0x2, 0x469, 0x468, 0x3, 0x2, 0x2, 
+    0x2, 0x469, 0x46a, 0x3, 0x2, 0x2, 0x2, 0x46a, 0x46b, 0x3, 0x2, 0x2, 
+    0x2, 0x46b, 0x46c, 0x7, 0xd9, 0x2, 0x2, 0x46c, 0x67, 0x3, 0x2, 0x2, 
+    0x2, 0x46d, 0x473, 0x5, 0x6a, 0x36, 0x2, 0x46e, 0x46f, 0x7, 0xa9, 0x2, 
+    0x2, 0x46f, 0x470, 0x7, 0x6, 0x2, 0x2, 0x470, 0x472, 0x5, 0x6a, 0x36, 
+    0x2, 0x471, 0x46e, 0x3, 0x2, 0x2, 0x2, 0x472, 0x475, 0x3, 0x2, 0x2, 
+    0x2, 0x473, 0x471, 0x3, 0x2, 0x2, 0x2, 0x473, 0x474, 0x3, 0x2, 0x2, 
+    0x2, 0x474, 0x69, 0x3, 0x2, 0x2, 0x2, 0x475, 0x473, 0x3, 0x2, 0x2, 0x2, 
+    0x476, 0x47c, 0x5, 0x6c, 0x37, 0x2, 0x477, 0x478, 0x7, 0xcf, 0x2, 0x2, 
+    0x478, 0x479, 0x5, 0x68, 0x35, 0x2, 0x479, 0x47a, 0x7, 0xd9, 0x2, 0x2, 
+    0x47a, 0x47c, 0x3, 0x2, 0x2, 0x2, 0x47b, 0x476, 0x3, 0x2, 0x2, 0x2, 
+    0x47b, 0x477, 0x3, 0x2, 0x2, 0x2, 0x47c, 0x6b, 0x3, 0x2, 0x2, 0x2, 0x47d, 
+    0x47f, 0x5, 0x6e, 0x38, 0x2, 0x47e, 0x47d, 0x3, 0x2, 0x2, 0x2, 0x47e, 
+    0x47f, 0x3, 0x2, 0x2, 0x2, 0x47f, 0x480, 0x3, 0x2, 0x2, 0x2, 0x480, 
+    0x482, 0x7, 0x8c, 0x2, 0x2, 0x481, 0x483, 0x7, 0x30, 0x2, 0x2, 0x482, 
+    0x481, 0x3, 0x2, 0x2, 0x2, 0x482, 0x483, 0x3, 0x2, 0x2, 0x2, 0x483, 
+    0x485, 0x3, 0x2, 0x2, 0x2, 0x484, 0x486, 0x5, 0x70, 0x39, 0x2, 0x485, 
+    0x484, 0x3, 0x2, 0x2, 0x2, 0x485, 0x486, 0x3, 0x2, 0x2, 0x2, 0x486, 
+    0x487, 0x3, 0x2, 0x2, 0x2, 0x487, 0x489, 0x5, 0xac, 0x57, 0x2, 0x488, 
+    0x48a, 0x5, 0x72, 0x3a, 0x2, 0x489, 0x488, 0x3, 0x2, 0x2, 0x2, 0x489, 
+    0x48a, 0x3, 0x2, 0x2, 0x2, 0x48a, 0x48c, 0x3, 0x2, 0x2, 0x2, 0x48b, 
+    0x48d, 0x5, 0x74, 0x3b, 0x2, 0x48c, 0x48b, 0x3, 0x2, 0x2, 0x2, 0x48c, 
+    0x48d, 0x3, 0x2, 0x2, 0x2, 0x48d, 0x48f, 0x3, 0x2, 0x2, 0x2, 0x48e, 
+    0x490, 0x5, 0x76, 0x3c, 0x2, 0x48f, 0x48e, 0x3, 0x2, 0x2, 0x2, 0x48f, 
+    0x490, 0x3, 0x2, 0x2, 0x2, 0x490, 0x492, 0x3, 0x2, 0x2, 0x2, 0x491, 
+    0x493, 0x5, 0x78, 0x3d, 0x2, 0x492, 0x491, 0x3, 0x2, 0x2, 0x2, 0x492, 
+    0x493, 0x3, 0x2, 0x2, 0x2, 0x493, 0x495, 0x3, 0x2, 0x2, 0x2, 0x494, 
+    0x496, 0x5, 0x7a, 0x3e, 0x2, 0x495, 0x494, 0x3, 0x2, 0x2, 0x2, 0x495, 
+    0x496, 0x3, 0x2, 0x2, 0x2, 0x496, 0x499, 0x3, 0x2, 0x2, 0x2, 0x497, 
+    0x498, 0x7, 0xb5, 0x2, 0x2, 0x498, 0x49a, 0x9, 0x8, 0x2, 0x2, 0x499, 
+    0x497, 0x3, 0x2, 0x2, 0x2, 0x499, 0x49a, 0x3, 0x2, 0x2, 0x2, 0x49a, 
+    0x49d, 0x3, 0x2, 0x2, 0x2, 0x49b, 0x49c, 0x7, 0xb5, 0x2, 0x2, 0x49c, 
+    0x49e, 0x7, 0xa3, 0x2, 0x2, 0x49d, 0x49b, 0x3, 0x2, 0x2, 0x2, 0x49d, 
+    0x49e, 0x3, 0x2, 0x2, 0x2, 0x49e, 0x4a0, 0x3, 0x2, 0x2, 0x2, 0x49f, 
+    0x4a1, 0x5, 0x7c, 0x3f, 0x2, 0x4a0, 0x49f, 0x3, 0x2, 0x2, 0x2, 0x4a0, 
+    0x4a1, 0x3, 0x2, 0x2, 0x2, 0x4a1, 0x4a3, 0x3, 0x2, 0x2, 0x2, 0x4a2, 
+    0x4a4, 0x5, 0x7e, 0x40, 0x2, 0x4a3, 0x4a2, 0x3, 0x2, 0x2, 0x2, 0x4a3, 
+    0x4a4, 0x3, 0x2, 0x2, 0x2, 0x4a4, 0x4a6, 0x3, 0x2, 0x2, 0x2, 0x4a5, 
+    0x4a7, 0x5, 0x82, 0x42, 0x2, 0x4a6, 0x4a5, 0x3, 0x2, 0x2, 0x2, 0x4a6, 
+    0x4a7, 0x3, 0x2, 0x2, 0x2, 0x4a7, 0x4a9, 0x3, 0x2, 0x2, 0x2, 0x4a8, 
+    0x4aa, 0x5, 0x84, 0x43, 0x2, 0x4a9, 0x4a8, 0x3, 0x2, 0x2, 0x2, 0x4a9, 
+    0x4aa, 0x3, 0x2, 0x2, 0x2, 0x4aa, 0x4ac, 0x3, 0x2, 0x2, 0x2, 0x4ab, 
+    0x4ad, 0x5, 0x86, 0x44, 0x2, 0x4ac, 0x4ab, 0x3, 0x2, 0x2, 0x2, 0x4ac, 
+    0x4ad, 0x3, 0x2, 0x2, 0x2, 0x4ad, 0x6d, 0x3, 0x2, 0x2, 0x2, 0x4ae, 0x4af, 
+    0x7, 0xb5, 0x2, 0x2, 0x4af, 0x4b0, 0x5, 0xac, 0x57, 0x2, 0x4b0, 0x6f, 
+    0x3, 0x2, 0x2, 0x2, 0x4b1, 0x4b2, 0x7, 0xa2, 0x2, 0x2, 0x4b2, 0x4b5, 
+    0x7, 0xbc, 0x2, 0x2, 0x4b3, 0x4b4, 0x7, 0xb5, 0x2, 0x2, 0x4b4, 0x4b6, 
+    0x7, 0x9e, 0x2, 0x2, 0x4b5, 0x4b3, 0x3, 0x2, 0x2, 0x2, 0x4b5, 0x4b6, 
+    0x3, 0x2, 0x2, 0x2, 0x4b6, 0x71, 0x3, 0x2, 0x2, 0x2, 0x4b7, 0x4b8, 0x7, 
+    0x42, 0x2, 0x2, 0x4b8, 0x4b9, 0x5, 0x88, 0x45, 0x2, 0x4b9, 0x73, 0x3, 
+    0x2, 0x2, 0x2, 0x4ba, 0x4bc, 0x9, 0x9, 0x2, 0x2, 0x4bb, 0x4ba, 0x3, 
+    0x2, 0x2, 0x2, 0x4bb, 0x4bc, 0x3, 0x2, 0x2, 0x2, 0x4bc, 0x4bd, 0x3, 
+    0x2, 0x2, 0x2, 0x4bd, 0x4be, 0x7, 0xb, 0x2, 0x2, 0x4be, 0x4bf, 0x7, 
+    0x58, 0x2, 0x2, 0x4bf, 0x4c0, 0x5, 0xac, 0x57, 0x2, 0x4c0, 0x75, 0x3, 
+    0x2, 0x2, 0x2, 0x4c1, 0x4c2, 0x7, 0x7d, 0x2, 0x2, 0x4c2, 0x4c3, 0x5, 
+    0xb0, 0x59, 0x2, 0x4c3, 0x77, 0x3, 0x2, 0x2, 0x2, 0x4c4, 0x4c5, 0x7, 
+    0xb4, 0x2, 0x2, 0x4c5, 0x4c6, 0x5, 0xb0, 0x59, 0x2, 0x4c6, 0x79, 0x3, 
+    0x2, 0x2, 0x2, 0x4c7, 0x4c8, 0x7, 0x47, 0x2, 0x2, 0x4c8, 0x4cf, 0x7, 
+    0x13, 0x2, 0x2, 0x4c9, 0x4ca, 0x9, 0x8, 0x2, 0x2, 0x4ca, 0x4cb, 0x7, 
+    0xcf, 0x2, 0x2, 0x4cb, 0x4cc, 0x5, 0xac, 0x57, 0x2, 0x4cc, 0x4cd, 0x7, 
+    0xd9, 0x2, 0x2, 0x4cd, 0x4d0, 0x3, 0x2, 0x2, 0x2, 0x4ce, 0x4d0, 0x5, 
+    0xac, 0x57, 0x2, 0x4cf, 0x4c9, 0x3, 0x2, 0x2, 0x2, 0x4cf, 0x4ce, 0x3, 
+    0x2, 0x2, 0x2, 0x4d0, 0x7b, 0x3, 0x2, 0x2, 0x2, 0x4d1, 0x4d2, 0x7, 0x48, 
+    0x2, 0x2, 0x4d2, 0x4d3, 0x5, 0xb0, 0x59, 0x2, 0x4d3, 0x7d, 0x3, 0x2, 
+    0x2, 0x2, 0x4d4, 0x4d5, 0x7, 0x78, 0x2, 0x2, 0x4d5, 0x4d6, 0x7, 0x13, 
+    0x2, 0x2, 0x4d6, 0x4d7, 0x5, 0x94, 0x4b, 0x2, 0x4d7, 0x7f, 0x3, 0x2, 
+    0x2, 0x2, 0x4d8, 0x4d9, 0x7, 0x78, 0x2, 0x2, 0x4d9, 0x4da, 0x7, 0x13, 
+    0x2, 0x2, 0x4da, 0x4db, 0x5, 0xac, 0x57, 0x2, 0x4db, 0x81, 0x3, 0x2, 
+    0x2, 0x2, 0x4dc, 0x4dd, 0x7, 0x61, 0x2, 0x2, 0x4dd, 0x4de, 0x5, 0x92, 
+    0x4a, 0x2, 0x4de, 0x4df, 0x7, 0x13, 0x2, 0x2, 0x4df, 0x4e0, 0x5, 0xac, 
+    0x57, 0x2, 0x4e0, 0x83, 0x3, 0x2, 0x2, 0x2, 0x4e1, 0x4e2, 0x7, 0x61, 
+    0x2, 0x2, 0x4e2, 0x4e5, 0x5, 0x92, 0x4a, 0x2, 0x4e3, 0x4e4, 0x7, 0xb5, 
+    0x2, 0x2, 0x4e4, 0x4e6, 0x7, 0x9e, 0x2, 0x2, 0x4e5, 0x4e3, 0x3, 0x2, 
+    0x2, 0x2, 0x4e5, 0x4e6, 0x3, 0x2, 0x2, 0x2, 0x4e6, 0x85, 0x3, 0x2, 0x2, 
+    0x2, 0x4e7, 0x4e8, 0x7, 0x90, 0x2, 0x2, 0x4e8, 0x4e9, 0x5, 0x9a, 0x4e, 
+    0x2, 0x4e9, 0x87, 0x3, 0x2, 0x2, 0x2, 0x4ea, 0x4eb, 0x8, 0x45, 0x1, 
+    0x2, 0x4eb, 0x4ed, 0x5, 0xbc, 0x5f, 0x2, 0x4ec, 0x4ee, 0x7, 0x3c, 0x2, 
+    0x2, 0x4ed, 0x4ec, 0x3, 0x2, 0x2, 0x2, 0x4ed, 0x4ee, 0x3, 0x2, 0x2, 
+    0x2, 0x4ee, 0x4f0, 0x3, 0x2, 0x2, 0x2, 0x4ef, 0x4f1, 0x5, 0x90, 0x49, 
+    0x2, 0x4f0, 0x4ef, 0x3, 0x2, 0x2, 0x2, 0x4f0, 0x4f1, 0x3, 0x2, 0x2, 
+    0x2, 0x4f1, 0x4f7, 0x3, 0x2, 0x2, 0x2, 0x4f2, 0x4f3, 0x7, 0xcf, 0x2, 
+    0x2, 0x4f3, 0x4f4, 0x5, 0x88, 0x45, 0x2, 0x4f4, 0x4f5, 0x7, 0xd9, 0x2, 
+    0x2, 0x4f5, 0x4f7, 0x3, 0x2, 0x2, 0x2, 0x4f6, 0x4ea, 0x3, 0x2, 0x2, 
+    0x2, 0x4f6, 0x4f2, 0x3, 0x2, 0x2, 0x2, 0x4f7, 0x509, 0x3, 0x2, 0x2, 
+    0x2, 0x4f8, 0x4f9, 0xc, 0x5, 0x2, 0x2, 0x4f9, 0x4fa, 0x5, 0x8c, 0x47, 
+    0x2, 0x4fa, 0x4fb, 0x5, 0x88, 0x45, 0x6, 0x4fb, 0x508, 0x3, 0x2, 0x2, 
+    0x2, 0x4fc, 0x4fe, 0xc, 0x6, 0x2, 0x2, 0x4fd, 0x4ff, 0x9, 0xa, 0x2, 
+    0x2, 0x4fe, 0x4fd, 0x3, 0x2, 0x2, 0x2, 0x4fe, 0x4ff, 0x3, 0x2, 0x2, 
+    0x2, 0x4ff, 0x501, 0x3, 0x2, 0x2, 0x2, 0x500, 0x502, 0x5, 0x8a, 0x46, 
+    0x2, 0x501, 0x500, 0x3, 0x2, 0x2, 0x2, 0x501, 0x502, 0x3, 0x2, 0x2, 
+    0x2, 0x502, 0x503, 0x3, 0x2, 0x2, 0x2, 0x503, 0x504, 0x7, 0x58, 0x2, 
+    0x2, 0x504, 0x505, 0x5, 0x88, 0x45, 0x2, 0x505, 0x506, 0x5, 0x8e, 0x48, 
+    0x2, 0x506, 0x508, 0x3, 0x2, 0x2, 0x2, 0x507, 0x4f8, 0x3, 0x2, 0x2, 
+    0x2, 0x507, 0x4fc, 0x3, 0x2, 0x2, 0x2, 0x508, 0x50b, 0x3, 0x2, 0x2, 
+    0x2, 0x509, 0x507, 0x3, 0x2, 0x2, 0x2, 0x509, 0x50a, 0x3, 0x2, 0x2, 
+    0x2, 0x50a, 0x89, 0x3, 0x2, 0x2, 0x2, 0x50b, 0x509, 0x3, 0x2, 0x2, 0x2, 
+    0x50c, 0x50e, 0x9, 0xb, 0x2, 0x2, 0x50d, 0x50c, 0x3, 0x2, 0x2, 0x2, 
+    0x50d, 0x50e, 0x3, 0x2, 0x2, 0x2, 0x50e, 0x50f, 0x3, 0x2, 0x2, 0x2, 
+    0x50f, 0x516, 0x7, 0x52, 0x2, 0x2, 0x510, 0x512, 0x7, 0x52, 0x2, 0x2, 
+    0x511, 0x513, 0x9, 0xb, 0x2, 0x2, 0x512, 0x511, 0x3, 0x2, 0x2, 0x2, 
+    0x512, 0x513, 0x3, 0x2, 0x2, 0x2, 0x513, 0x516, 0x3, 0x2, 0x2, 0x2, 
+    0x514, 0x516, 0x9, 0xb, 0x2, 0x2, 0x515, 0x50d, 0x3, 0x2, 0x2, 0x2, 
+    0x515, 0x510, 0x3, 0x2, 0x2, 0x2, 0x515, 0x514, 0x3, 0x2, 0x2, 0x2, 
+    0x516, 0x538, 0x3, 0x2, 0x2, 0x2, 0x517, 0x519, 0x9, 0xc, 0x2, 0x2, 
+    0x518, 0x517, 0x3, 0x2, 0x2, 0x2, 0x518, 0x519, 0x3, 0x2, 0x2, 0x2, 
+    0x519, 0x51a, 0x3, 0x2, 0x2, 0x2, 0x51a, 0x51c, 0x9, 0xd, 0x2, 0x2, 
+    0x51b, 0x51d, 0x7, 0x79, 0x2, 0x2, 0x51c, 0x51b, 0x3, 0x2, 0x2, 0x2, 
+    0x51c, 0x51d, 0x3, 0x2, 0x2, 0x2, 0x51d, 0x526, 0x3, 0x2, 0x2, 0x2, 
+    0x51e, 0x520, 0x9, 0xd, 0x2, 0x2, 0x51f, 0x521, 0x7, 0x79, 0x2, 0x2, 
+    0x520, 0x51f, 0x3, 0x2, 0x2, 0x2, 0x520, 0x521, 0x3, 0x2, 0x2, 0x2, 
+    0x521, 0x523, 0x3, 0x2, 0x2, 0x2, 0x522, 0x524, 0x9, 0xc, 0x2, 0x2, 
+    0x523, 0x522, 0x3, 0x2, 0x2, 0x2, 0x523, 0x524, 0x3, 0x2, 0x2, 0x2, 
+    0x524, 0x526, 0x3, 0x2, 0x2, 0x2, 0x525, 0x518, 0x3, 0x2, 0x2, 0x2, 
+    0x525, 0x51e, 0x3, 0x2, 0x2, 0x2, 0x526, 0x538, 0x3, 0x2, 0x2, 0x2, 
+    0x527, 0x529, 0x9, 0xe, 0x2, 0x2, 0x528, 0x527, 0x3, 0x2, 0x2, 0x2, 
+    0x528, 0x529, 0x3, 0x2, 0x2, 0x2, 0x529, 0x52a, 0x3, 0x2, 0x2, 0x2, 
+    0x52a, 0x52c, 0x7, 0x43, 0x2, 0x2, 0x52b, 0x52d, 0x7, 0x79, 0x2, 0x2, 
+    0x52c, 0x52b, 0x3, 0x2, 0x2, 0x2, 0x52c, 0x52d, 0x3, 0x2, 0x2, 0x2, 
+    0x52d, 0x536, 0x3, 0x2, 0x2, 0x2, 0x52e, 0x530, 0x7, 0x43, 0x2, 0x2, 
+    0x52f, 0x531, 0x7, 0x79, 0x2, 0x2, 0x530, 0x52f, 0x3, 0x2, 0x2, 0x2, 
+    0x530, 0x531, 0x3, 0x2, 0x2, 0x2, 0x531, 0x533, 0x3, 0x2, 0x2, 0x2, 
+    0x532, 0x534, 0x9, 0xe, 0x2, 0x2, 0x533, 0x532, 0x3, 0x2, 0x2, 0x2, 
+    0x533, 0x534, 0x3, 0x2, 0x2, 0x2, 0x534, 0x536, 0x3, 0x2, 0x2, 0x2, 
+    0x535, 0x528, 0x3, 0x2, 0x2, 0x2, 0x535, 0x52e, 0x3, 0x2, 0x2, 0x2, 
+    0x536, 0x538, 0x3, 0x2, 0x2, 0x2, 0x537, 0x515, 0x3, 0x2, 0x2, 0x2, 
+    0x537, 0x525, 0x3, 0x2, 0x2, 0x2, 0x537, 0x535, 0x3, 0x2, 0x2, 0x2, 
+    0x538, 0x8b, 0x3, 0x2, 0x2, 0x2, 0x539, 0x53b, 0x9, 0xa, 0x2, 0x2, 0x53a, 
+    0x539, 0x3, 0x2, 0x2, 0x2, 0x53a, 0x53b, 0x3, 0x2, 0x2, 0x2, 0x53b, 
+    0x53c, 0x3, 0x2, 0x2, 0x2, 0x53c, 0x53d, 0x7, 0x1f, 0x2, 0x2, 0x53d, 
+    0x540, 0x7, 0x58, 0x2, 0x2, 0x53e, 0x540, 0x7, 0xc4, 0x2, 0x2, 0x53f, 
+    0x53a, 0x3, 0x2, 0x2, 0x2, 0x53f, 0x53e, 0x3, 0x2, 0x2, 0x2, 0x540, 
+    0x8d, 0x3, 0x2, 0x2, 0x2, 0x541, 0x542, 0x7, 0x75, 0x2, 0x2, 0x542, 
+    0x54b, 0x5, 0xac, 0x57, 0x2, 0x543, 0x544, 0x7, 0xac, 0x2, 0x2, 0x544, 
+    0x545, 0x7, 0xcf, 0x2, 0x2, 0x545, 0x546, 0x5, 0xac, 0x57, 0x2, 0x546, 
+    0x547, 0x7, 0xd9, 0x2, 0x2, 0x547, 0x54b, 0x3, 0x2, 0x2, 0x2, 0x548, 
+    0x549, 0x7, 0xac, 0x2, 0x2, 0x549, 0x54b, 0x5, 0xac, 0x57, 0x2, 0x54a, 
+    0x541, 0x3, 0x2, 0x2, 0x2, 0x54a, 0x543, 0x3, 0x2, 0x2, 0x2, 0x54a, 
+    0x548, 0x3, 0x2, 0x2, 0x2, 0x54b, 0x8f, 0x3, 0x2, 0x2, 0x2, 0x54c, 0x54d, 
+    0x7, 0x8a, 0x2, 0x2, 0x54d, 0x550, 0x5, 0x98, 0x4d, 0x2, 0x54e, 0x54f, 
+    0x7, 0x74, 0x2, 0x2, 0x54f, 0x551, 0x5, 0x98, 0x4d, 0x2, 0x550, 0x54e, 
+    0x3, 0x2, 0x2, 0x2, 0x550, 0x551, 0x3, 0x2, 0x2, 0x2, 0x551, 0x91, 0x3, 
+    0x2, 0x2, 0x2, 0x552, 0x555, 0x5, 0xb0, 0x59, 0x2, 0x553, 0x554, 0x9, 
+    0xf, 0x2, 0x2, 0x554, 0x556, 0x5, 0xb0, 0x59, 0x2, 0x555, 0x553, 0x3, 
+    0x2, 0x2, 0x2, 0x555, 0x556, 0x3, 0x2, 0x2, 0x2, 0x556, 0x93, 0x3, 0x2, 
+    0x2, 0x2, 0x557, 0x55c, 0x5, 0x96, 0x4c, 0x2, 0x558, 0x559, 0x7, 0xc4, 
+    0x2, 0x2, 0x559, 0x55b, 0x5, 0x96, 0x4c, 0x2, 0x55a, 0x558, 0x3, 0x2, 
+    0x2, 0x2, 0x55b, 0x55e, 0x3, 0x2, 0x2, 0x2, 0x55c, 0x55a, 0x3, 0x2, 
+    0x2, 0x2, 0x55c, 0x55d, 0x3, 0x2, 0x2, 0x2, 0x55d, 0x95, 0x3, 0x2, 0x2, 
+    0x2, 0x55e, 0x55c, 0x3, 0x2, 0x2, 0x2, 0x55f, 0x561, 0x5, 0xb0, 0x59, 
+    0x2, 0x560, 0x562, 0x9, 0x10, 0x2, 0x2, 0x561, 0x560, 0x3, 0x2, 0x2, 
+    0x2, 0x561, 0x562, 0x3, 0x2, 0x2, 0x2, 0x562, 0x565, 0x3, 0x2, 0x2, 
+    0x2, 0x563, 0x564, 0x7, 0x73, 0x2, 0x2, 0x564, 0x566, 0x9, 0x11, 0x2, 
+    0x2, 0x565, 0x563, 0x3, 0x2, 0x2, 0x2, 0x565, 0x566, 0x3, 0x2, 0x2, 
+    0x2, 0x566, 0x569, 0x3, 0x2, 0x2, 0x2, 0x567, 0x568, 0x7, 0x1a, 0x2, 
+    0x2, 0x568, 0x56a, 0x7, 0xbe, 0x2, 0x2, 0x569, 0x567, 0x3, 0x2, 0x2, 
+    0x2, 0x569, 0x56a, 0x3, 0x2, 0x2, 0x2, 0x56a, 0x97, 0x3, 0x2, 0x2, 0x2, 
+    0x56b, 0x56e, 0x5, 0xca, 0x66, 0x2, 0x56c, 0x56d, 0x7, 0xdb, 0x2, 0x2, 
+    0x56d, 0x56f, 0x5, 0xca, 0x66, 0x2, 0x56e, 0x56c, 0x3, 0x2, 0x2, 0x2, 
+    0x56e, 0x56f, 0x3, 0x2, 0x2, 0x2, 0x56f, 0x99, 0x3, 0x2, 0x2, 0x2, 0x570, 
+    0x575, 0x5, 0x9c, 0x4f, 0x2, 0x571, 0x572, 0x7, 0xc4, 0x2, 0x2, 0x572, 
+    0x574, 0x5, 0x9c, 0x4f, 0x2, 0x573, 0x571, 0x3, 0x2, 0x2, 0x2, 0x574, 
+    0x577, 0x3, 0x2, 0x2, 0x2, 0x575, 0x573, 0x3, 0x2, 0x2, 0x2, 0x575, 
+    0x576, 0x3, 0x2, 0x2, 0x2, 0x576, 0x9b, 0x3, 0x2, 0x2, 0x2, 0x577, 0x575, 
+    0x3, 0x2, 0x2, 0x2, 0x578, 0x579, 0x5, 0xd6, 0x6c, 0x2, 0x579, 0x57a, 
+    0x7, 0xc9, 0x2, 0x2, 0x57a, 0x57b, 0x5, 0xcc, 0x67, 0x2, 0x57b, 0x9d, 
+    0x3, 0x2, 0x2, 0x2, 0x57c, 0x57d, 0x7, 0x8f, 0x2, 0x2, 0x57d, 0x57e, 
+    0x5, 0x9a, 0x4e, 0x2, 0x57e, 0x9f, 0x3, 0x2, 0x2, 0x2, 0x57f, 0x580, 
+    0x7, 0x91, 0x2, 0x2, 0x580, 0x581, 0x7, 0x1e, 0x2, 0x2, 0x581, 0x582, 
+    0x7, 0x21, 0x2, 0x2, 0x582, 0x5aa, 0x5, 0xc6, 0x64, 0x2, 0x583, 0x584, 
+    0x7, 0x91, 0x2, 0x2, 0x584, 0x585, 0x7, 0x1e, 0x2, 0x2, 0x585, 0x586, 
+    0x7, 0x2e, 0x2, 0x2, 0x586, 0x5aa, 0x5, 0xc0, 0x61, 0x2, 0x587, 0x588, 
+    0x7, 0x91, 0x2, 0x2, 0x588, 0x58a, 0x7, 0x1e, 0x2, 0x2, 0x589, 0x58b, 
+    0x7, 0x9b, 0x2, 0x2, 0x58a, 0x589, 0x3, 0x2, 0x2, 0x2, 0x58a, 0x58b, 
+    0x3, 0x2, 0x2, 0x2, 0x58b, 0x58d, 0x3, 0x2, 0x2, 0x2, 0x58c, 0x58e, 
+    0x7, 0x99, 0x2, 0x2, 0x58d, 0x58c, 0x3, 0x2, 0x2, 0x2, 0x58d, 0x58e, 
+    0x3, 0x2, 0x2, 0x2, 0x58e, 0x58f, 0x3, 0x2, 0x2, 0x2, 0x58f, 0x5aa, 
+    0x5, 0xc0, 0x61, 0x2, 0x590, 0x591, 0x7, 0x91, 0x2, 0x2, 0x591, 0x5aa, 
+    0x7, 0x22, 0x2, 0x2, 0x592, 0x593, 0x7, 0x91, 0x2, 0x2, 0x593, 0x596, 
+    0x7, 0x2d, 0x2, 0x2, 0x594, 0x595, 0x7, 0x42, 0x2, 0x2, 0x595, 0x597, 
+    0x5, 0xc6, 0x64, 0x2, 0x596, 0x594, 0x3, 0x2, 0x2, 0x2, 0x596, 0x597, 
+    0x3, 0x2, 0x2, 0x2, 0x597, 0x5aa, 0x3, 0x2, 0x2, 0x2, 0x598, 0x59a, 
+    0x7, 0x91, 0x2, 0x2, 0x599, 0x59b, 0x7, 0x9b, 0x2, 0x2, 0x59a, 0x599, 
+    0x3, 0x2, 0x2, 0x2, 0x59a, 0x59b, 0x3, 0x2, 0x2, 0x2, 0x59b, 0x59c, 
+    0x3, 0x2, 0x2, 0x2, 0x59c, 0x59f, 0x7, 0x9a, 0x2, 0x2, 0x59d, 0x59e, 
+    0x9, 0x12, 0x2, 0x2, 0x59e, 0x5a0, 0x5, 0xc6, 0x64, 0x2, 0x59f, 0x59d, 
+    0x3, 0x2, 0x2, 0x2, 0x59f, 0x5a0, 0x3, 0x2, 0x2, 0x2, 0x5a0, 0x5a4, 
+    0x3, 0x2, 0x2, 0x2, 0x5a1, 0x5a2, 0x7, 0x60, 0x2, 0x2, 0x5a2, 0x5a5, 
+    0x7, 0xbe, 0x2, 0x2, 0x5a3, 0x5a5, 0x5, 0x78, 0x3d, 0x2, 0x5a4, 0x5a1, 
+    0x3, 0x2, 0x2, 0x2, 0x5a4, 0x5a3, 0x3, 0x2, 0x2, 0x2, 0x5a4, 0x5a5, 
+    0x3, 0x2, 0x2, 0x2, 0x5a5, 0x5a7, 0x3, 0x2, 0x2, 0x2, 0x5a6, 0x5a8, 
+    0x5, 0x84, 0x43, 0x2, 0x5a7, 0x5a6, 0x3, 0x2, 0x2, 0x2, 0x5a7, 0x5a8, 
+    0x3, 0x2, 0x2, 0x2, 0x5a8, 0x5aa, 0x3, 0x2, 0x2, 0x2, 0x5a9, 0x57f, 
+    0x3, 0x2, 0x2, 0x2, 0x5a9, 0x583, 0x3, 0x2, 0x2, 0x2, 0x5a9, 0x587, 
+    0x3, 0x2, 0x2, 0x2, 0x5a9, 0x590, 0x3, 0x2, 0x2, 0x2, 0x5a9, 0x592, 
+    0x3, 0x2, 0x2, 0x2, 0x5a9, 0x598, 0x3, 0x2, 0x2, 0x2, 0x5aa, 0xa1, 0x3, 
+    0x2, 0x2, 0x2, 0x5ab, 0x5ac, 0x7, 0x98, 0x2, 0x2, 0x5ac, 0x5ad, 0x7, 
+    0x3e, 0x2, 0x2, 0x5ad, 0x5ae, 0x7, 0x31, 0x2, 0x2, 0x5ae, 0x5ce, 0x5, 
+    0xc0, 0x61, 0x2, 0x5af, 0x5b0, 0x7, 0x98, 0x2, 0x2, 0x5b0, 0x5b1, 0x7, 
+    0x3e, 0x2, 0x2, 0x5b1, 0x5ce, 0x7, 0x64, 0x2, 0x2, 0x5b2, 0x5b3, 0x7, 
+    0x98, 0x2, 0x2, 0x5b3, 0x5b4, 0x7, 0x82, 0x2, 0x2, 0x5b4, 0x5ce, 0x7, 
+    0x2d, 0x2, 0x2, 0x5b5, 0x5b6, 0x7, 0x98, 0x2, 0x2, 0x5b6, 0x5b7, 0x7, 
+    0x82, 0x2, 0x2, 0x5b7, 0x5b8, 0x7, 0x2e, 0x2, 0x2, 0x5b8, 0x5ce, 0x5, 
+    0xc0, 0x61, 0x2, 0x5b9, 0x5ba, 0x7, 0x98, 0x2, 0x2, 0x5ba, 0x5c2, 0x9, 
+    0x13, 0x2, 0x2, 0x5bb, 0x5bc, 0x7, 0x31, 0x2, 0x2, 0x5bc, 0x5c3, 0x7, 
+    0x8e, 0x2, 0x2, 0x5bd, 0x5c3, 0x7, 0x3b, 0x2, 0x2, 0x5be, 0x5c0, 0x7, 
+    0xa7, 0x2, 0x2, 0x5bf, 0x5be, 0x3, 0x2, 0x2, 0x2, 0x5bf, 0x5c0, 0x3, 
+    0x2, 0x2, 0x2, 0x5c0, 0x5c1, 0x3, 0x2, 0x2, 0x2, 0x5c1, 0x5c3, 0x7, 
+    0x68, 0x2, 0x2, 0x5c2, 0x5bb, 0x3, 0x2, 0x2, 0x2, 0x5c2, 0x5bd, 0x3, 
+    0x2, 0x2, 0x2, 0x5c2, 0x5bf, 0x3, 0x2, 0x2, 0x2, 0x5c3, 0x5c4, 0x3, 
+    0x2, 0x2, 0x2, 0x5c4, 0x5ce, 0x5, 0xc0, 0x61, 0x2, 0x5c5, 0x5c6, 0x7, 
+    0x98, 0x2, 0x2, 0x5c6, 0x5c7, 0x9, 0x13, 0x2, 0x2, 0x5c7, 0x5c8, 0x7, 
+    0x87, 0x2, 0x2, 0x5c8, 0x5ce, 0x7, 0x8e, 0x2, 0x2, 0x5c9, 0x5ca, 0x7, 
+    0x98, 0x2, 0x2, 0x5ca, 0x5cb, 0x7, 0x96, 0x2, 0x2, 0x5cb, 0x5cc, 0x7, 
+    0x86, 0x2, 0x2, 0x5cc, 0x5ce, 0x5, 0xc0, 0x61, 0x2, 0x5cd, 0x5ab, 0x3, 
+    0x2, 0x2, 0x2, 0x5cd, 0x5af, 0x3, 0x2, 0x2, 0x2, 0x5cd, 0x5b2, 0x3, 
+    0x2, 0x2, 0x2, 0x5cd, 0x5b5, 0x3, 0x2, 0x2, 0x2, 0x5cd, 0x5b9, 0x3, 
+    0x2, 0x2, 0x2, 0x5cd, 0x5c5, 0x3, 0x2, 0x2, 0x2, 0x5cd, 0x5c9, 0x3, 
+    0x2, 0x2, 0x2, 0x5ce, 0xa3, 0x3, 0x2, 0x2, 0x2, 0x5cf, 0x5d1, 0x7, 0xa6, 
+    0x2, 0x2, 0x5d0, 0x5d2, 0x7, 0x9b, 0x2, 0x2, 0x5d1, 0x5d0, 0x3, 0x2, 
+    0x2, 0x2, 0x5d1, 0x5d2, 0x3, 0x2, 0x2, 0x2, 0x5d2, 0x5d4, 0x3, 0x2, 
+    0x2, 0x2, 0x5d3, 0x5d5, 0x7, 0x99, 0x2, 0x2, 0x5d4, 0x5d3, 0x3, 0x2, 
+    0x2, 0x2, 0x5d4, 0x5d5, 0x3, 0x2, 0x2, 0x2, 0x5d5, 0x5d8, 0x3, 0x2, 
+    0x2, 0x2, 0x5d6, 0x5d7, 0x7, 0x4c, 0x2, 0x2, 0x5d7, 0x5d9, 0x7, 0x37, 
+    0x2, 0x2, 0x5d8, 0x5d6, 0x3, 0x2, 0x2, 0x2, 0x5d8, 0x5d9, 0x3, 0x2, 
+    0x2, 0x2, 0x5d9, 0x5da, 0x3, 0x2, 0x2, 0x2, 0x5da, 0x5dc, 0x5, 0xc0, 
+    0x61, 0x2, 0x5db, 0x5dd, 0x5, 0x2c, 0x17, 0x2, 0x5dc, 0x5db, 0x3, 0x2, 
+    0x2, 0x2, 0x5dc, 0x5dd, 0x3, 0x2, 0x2, 0x2, 0x5dd, 0xa5, 0x3, 0x2, 0x2, 
+    0x2, 0x5de, 0x5df, 0x7, 0xab, 0x2, 0x2, 0x5df, 0x5e0, 0x5, 0xc6, 0x64, 
+    0x2, 0x5e0, 0xa7, 0x3, 0x2, 0x2, 0x2, 0x5e1, 0x5e2, 0x7, 0xb1, 0x2, 
+    0x2, 0x5e2, 0x5e4, 0x5, 0xc0, 0x61, 0x2, 0x5e3, 0x5e5, 0x7, 0x36, 0x2, 
+    0x2, 0x5e4, 0x5e3, 0x3, 0x2, 0x2, 0x2, 0x5e4, 0x5e5, 0x3, 0x2, 0x2, 
+    0x2, 0x5e5, 0x5e8, 0x3, 0x2, 0x2, 0x2, 0x5e6, 0x5e7, 0x7, 0x61, 0x2, 
+    0x2, 0x5e7, 0x5e9, 0x7, 0xbc, 0x2, 0x2, 0x5e8, 0x5e6, 0x3, 0x2, 0x2, 
+    0x2, 0x5e8, 0x5e9, 0x3, 0x2, 0x2, 0x2, 0x5e9, 0xa9, 0x3, 0x2, 0x2, 0x2, 
+    0x5ea, 0x61a, 0x5, 0xd6, 0x6c, 0x2, 0x5eb, 0x5ec, 0x5, 0xd6, 0x6c, 0x2, 
+    0x5ec, 0x5ed, 0x7, 0xcf, 0x2, 0x2, 0x5ed, 0x5ee, 0x5, 0xd6, 0x6c, 0x2, 
+    0x5ee, 0x5f5, 0x5, 0xaa, 0x56, 0x2, 0x5ef, 0x5f0, 0x7, 0xc4, 0x2, 0x2, 
+    0x5f0, 0x5f1, 0x5, 0xd6, 0x6c, 0x2, 0x5f1, 0x5f2, 0x5, 0xaa, 0x56, 0x2, 
+    0x5f2, 0x5f4, 0x3, 0x2, 0x2, 0x2, 0x5f3, 0x5ef, 0x3, 0x2, 0x2, 0x2, 
+    0x5f4, 0x5f7, 0x3, 0x2, 0x2, 0x2, 0x5f5, 0x5f3, 0x3, 0x2, 0x2, 0x2, 
+    0x5f5, 0x5f6, 0x3, 0x2, 0x2, 0x2, 0x5f6, 0x5f8, 0x3, 0x2, 0x2, 0x2, 
+    0x5f7, 0x5f5, 0x3, 0x2, 0x2, 0x2, 0x5f8, 0x5f9, 0x7, 0xd9, 0x2, 0x2, 
+    0x5f9, 0x61a, 0x3, 0x2, 0x2, 0x2, 0x5fa, 0x5fb, 0x5, 0xd6, 0x6c, 0x2, 
+    0x5fb, 0x5fc, 0x7, 0xcf, 0x2, 0x2, 0x5fc, 0x601, 0x5, 0xda, 0x6e, 0x2, 
+    0x5fd, 0x5fe, 0x7, 0xc4, 0x2, 0x2, 0x5fe, 0x600, 0x5, 0xda, 0x6e, 0x2, 
+    0x5ff, 0x5fd, 0x3, 0x2, 0x2, 0x2, 0x600, 0x603, 0x3, 0x2, 0x2, 0x2, 
+    0x601, 0x5ff, 0x3, 0x2, 0x2, 0x2, 0x601, 0x602, 0x3, 0x2, 0x2, 0x2, 
+    0x602, 0x604, 0x3, 0x2, 0x2, 0x2, 0x603, 0x601, 0x3, 0x2, 0x2, 0x2, 
+    0x604, 0x605, 0x7, 0xd9, 0x2, 0x2, 0x605, 0x61a, 0x3, 0x2, 0x2, 0x2, 
+    0x606, 0x607, 0x5, 0xd6, 0x6c, 0x2, 0x607, 0x608, 0x7, 0xcf, 0x2, 0x2, 
+    0x608, 0x60d, 0x5, 0xaa, 0x56, 0x2, 0x609, 0x60a, 0x7, 0xc4, 0x2, 0x2, 
+    0x60a, 0x60c, 0x5, 0xaa, 0x56, 0x2, 0x60b, 0x609, 0x3, 0x2, 0x2, 0x2, 
+    0x60c, 0x60f, 0x3, 0x2, 0x2, 0x2, 0x60d, 0x60b, 0x3, 0x2, 0x2, 0x2, 
+    0x60d, 0x60e, 0x3, 0x2, 0x2, 0x2, 0x60e, 0x610, 0x3, 0x2, 0x2, 0x2, 
+    0x60f, 0x60d, 0x3, 0x2, 0x2, 0x2, 0x610, 0x611, 0x7, 0xd9, 0x2, 0x2, 
+    0x611, 0x61a, 0x3, 0x2, 0x2, 0x2, 0x612, 0x613, 0x5, 0xd6, 0x6c, 0x2, 
+    0x613, 0x615, 0x7, 0xcf, 0x2, 0x2, 0x614, 0x616, 0x5, 0xac, 0x57, 0x2, 
+    0x615, 0x614, 0x3, 0x2, 0x2, 0x2, 0x615, 0x616, 0x3, 0x2, 0x2, 0x2, 
+    0x616, 0x617, 0x3, 0x2, 0x2, 0x2, 0x617, 0x618, 0x7, 0xd9, 0x2, 0x2, 
+    0x618, 0x61a, 0x3, 0x2, 0x2, 0x2, 0x619, 0x5ea, 0x3, 0x2, 0x2, 0x2, 
+    0x619, 0x5eb, 0x3, 0x2, 0x2, 0x2, 0x619, 0x5fa, 0x3, 0x2, 0x2, 0x2, 
+    0x619, 0x606, 0x3, 0x2, 0x2, 0x2, 0x619, 0x612, 0x3, 0x2, 0x2, 0x2, 
+    0x61a, 0xab, 0x3, 0x2, 0x2, 0x2, 0x61b, 0x620, 0x5, 0xae, 0x58, 0x2, 
+    0x61c, 0x61d, 0x7, 0xc4, 0x2, 0x2, 0x61d, 0x61f, 0x5, 0xae, 0x58, 0x2, 
+    0x61e, 0x61c, 0x3, 0x2, 0x2, 0x2, 0x61f, 0x622, 0x3, 0x2, 0x2, 0x2, 
+    0x620, 0x61e, 0x3, 0x2, 0x2, 0x2, 0x620, 0x621, 0x3, 0x2, 0x2, 0x2, 
+    0x621, 0xad, 0x3, 0x2, 0x2, 0x2, 0x622, 0x620, 0x3, 0x2, 0x2, 0x2, 0x623, 
+    0x624, 0x5, 0xc0, 0x61, 0x2, 0x624, 0x625, 0x7, 0xc7, 0x2, 0x2, 0x625, 
+    0x627, 0x3, 0x2, 0x2, 0x2, 0x626, 0x623, 0x3, 0x2, 0x2, 0x2, 0x626, 
+    0x627, 0x3, 0x2, 0x2, 0x2, 0x627, 0x628, 0x3, 0x2, 0x2, 0x2, 0x628, 
+    0x62f, 0x7, 0xc0, 0x2, 0x2, 0x629, 0x62a, 0x7, 0xcf, 0x2, 0x2, 0x62a, 
+    0x62b, 0x5, 0x68, 0x35, 0x2, 0x62b, 0x62c, 0x7, 0xd9, 0x2, 0x2, 0x62c, 
+    0x62f, 0x3, 0x2, 0x2, 0x2, 0x62d, 0x62f, 0x5, 0xb0, 0x59, 0x2, 0x62e, 
+    0x626, 0x3, 0x2, 0x2, 0x2, 0x62e, 0x629, 0x3, 0x2, 0x2, 0x2, 0x62e, 
+    0x62d, 0x3, 0x2, 0x2, 0x2, 0x62f, 0xaf, 0x3, 0x2, 0x2, 0x2, 0x630, 0x631, 
+    0x8, 0x59, 0x1, 0x2, 0x631, 0x633, 0x7, 0x14, 0x2, 0x2, 0x632, 0x634, 
+    0x5, 0xb0, 0x59, 0x2, 0x633, 0x632, 0x3, 0x2, 0x2, 0x2, 0x633, 0x634, 
+    0x3, 0x2, 0x2, 0x2, 0x634, 0x63a, 0x3, 0x2, 0x2, 0x2, 0x635, 0x636, 
+    0x7, 0xb3, 0x2, 0x2, 0x636, 0x637, 0x5, 0xb0, 0x59, 0x2, 0x637, 0x638, 
+    0x7, 0x9d, 0x2, 0x2, 0x638, 0x639, 0x5, 0xb0, 0x59, 0x2, 0x639, 0x63b, 
+    0x3, 0x2, 0x2, 0x2, 0x63a, 0x635, 0x3, 0x2, 0x2, 0x2, 0x63b, 0x63c, 
+    0x3, 0x2, 0x2, 0x2, 0x63c, 0x63a, 0x3, 0x2, 0x2, 0x2, 0x63c, 0x63d, 
+    0x3, 0x2, 0x2, 0x2, 0x63d, 0x640, 0x3, 0x2, 0x2, 0x2, 0x63e, 0x63f, 
+    0x7, 0x33, 0x2, 0x2, 0x63f, 0x641, 0x5, 0xb0, 0x59, 0x2, 0x640, 0x63e, 
+    0x3, 0x2, 0x2, 0x2, 0x640, 0x641, 0x3, 0x2, 0x2, 0x2, 0x641, 0x642, 
+    0x3, 0x2, 0x2, 0x2, 0x642, 0x643, 0x7, 0x34, 0x2, 0x2, 0x643, 0x69c, 
+    0x3, 0x2, 0x2, 0x2, 0x644, 0x645, 0x7, 0x15, 0x2, 0x2, 0x645, 0x646, 
+    0x7, 0xcf, 0x2, 0x2, 0x646, 0x647, 0x5, 0xb0, 0x59, 0x2, 0x647, 0x648, 
+    0x7, 0xc, 0x2, 0x2, 0x648, 0x649, 0x5, 0xaa, 0x56, 0x2, 0x649, 0x64a, 
+    0x7, 0xd9, 0x2, 0x2, 0x64a, 0x69c, 0x3, 0x2, 0x2, 0x2, 0x64b, 0x64c, 
+    0x7, 0x23, 0x2, 0x2, 0x64c, 0x69c, 0x7, 0xbe, 0x2, 0x2, 0x64d, 0x64e, 
+    0x7, 0x3a, 0x2, 0x2, 0x64e, 0x64f, 0x7, 0xcf, 0x2, 0x2, 0x64f, 0x650, 
+    0x5, 0xce, 0x68, 0x2, 0x650, 0x651, 0x7, 0x42, 0x2, 0x2, 0x651, 0x652, 
+    0x5, 0xb0, 0x59, 0x2, 0x652, 0x653, 0x7, 0xd9, 0x2, 0x2, 0x653, 0x69c, 
+    0x3, 0x2, 0x2, 0x2, 0x654, 0x655, 0x7, 0x54, 0x2, 0x2, 0x655, 0x656, 
+    0x5, 0xb0, 0x59, 0x2, 0x656, 0x657, 0x5, 0xce, 0x68, 0x2, 0x657, 0x69c, 
+    0x3, 0x2, 0x2, 0x2, 0x658, 0x659, 0x7, 0x95, 0x2, 0x2, 0x659, 0x65a, 
+    0x7, 0xcf, 0x2, 0x2, 0x65a, 0x65b, 0x5, 0xb0, 0x59, 0x2, 0x65b, 0x65c, 
+    0x7, 0x42, 0x2, 0x2, 0x65c, 0x65f, 0x5, 0xb0, 0x59, 0x2, 0x65d, 0x65e, 
+    0x7, 0x3f, 0x2, 0x2, 0x65e, 0x660, 0x5, 0xb0, 0x59, 0x2, 0x65f, 0x65d, 
+    0x3, 0x2, 0x2, 0x2, 0x65f, 0x660, 0x3, 0x2, 0x2, 0x2, 0x660, 0x661, 
+    0x3, 0x2, 0x2, 0x2, 0x661, 0x662, 0x7, 0xd9, 0x2, 0x2, 0x662, 0x69c, 
+    0x3, 0x2, 0x2, 0x2, 0x663, 0x664, 0x7, 0xa0, 0x2, 0x2, 0x664, 0x69c, 
+    0x7, 0xbe, 0x2, 0x2, 0x665, 0x666, 0x7, 0xa5, 0x2, 0x2, 0x666, 0x667, 
+    0x7, 0xcf, 0x2, 0x2, 0x667, 0x668, 0x9, 0x14, 0x2, 0x2, 0x668, 0x669, 
+    0x7, 0xbe, 0x2, 0x2, 0x669, 0x66a, 0x7, 0x42, 0x2, 0x2, 0x66a, 0x66b, 
+    0x5, 0xb0, 0x59, 0x2, 0x66b, 0x66c, 0x7, 0xd9, 0x2, 0x2, 0x66c, 0x69c, 
+    0x3, 0x2, 0x2, 0x2, 0x66d, 0x673, 0x5, 0xd6, 0x6c, 0x2, 0x66e, 0x670, 
+    0x7, 0xcf, 0x2, 0x2, 0x66f, 0x671, 0x5, 0xac, 0x57, 0x2, 0x670, 0x66f, 
+    0x3, 0x2, 0x2, 0x2, 0x670, 0x671, 0x3, 0x2, 0x2, 0x2, 0x671, 0x672, 
+    0x3, 0x2, 0x2, 0x2, 0x672, 0x674, 0x7, 0xd9, 0x2, 0x2, 0x673, 0x66e, 
+    0x3, 0x2, 0x2, 0x2, 0x673, 0x674, 0x3, 0x2, 0x2, 0x2, 0x674, 0x675, 
+    0x3, 0x2, 0x2, 0x2, 0x675, 0x677, 0x7, 0xcf, 0x2, 0x2, 0x676, 0x678, 
+    0x7, 0x30, 0x2, 0x2, 0x677, 0x676, 0x3, 0x2, 0x2, 0x2, 0x677, 0x678, 
+    0x3, 0x2, 0x2, 0x2, 0x678, 0x67a, 0x3, 0x2, 0x2, 0x2, 0x679, 0x67b, 
+    0x5, 0xb2, 0x5a, 0x2, 0x67a, 0x679, 0x3, 0x2, 0x2, 0x2, 0x67a, 0x67b, 
+    0x3, 0x2, 0x2, 0x2, 0x67b, 0x67c, 0x3, 0x2, 0x2, 0x2, 0x67c, 0x67d, 
+    0x7, 0xd9, 0x2, 0x2, 0x67d, 0x69c, 0x3, 0x2, 0x2, 0x2, 0x67e, 0x69c, 
+    0x5, 0xcc, 0x67, 0x2, 0x67f, 0x680, 0x7, 0xc6, 0x2, 0x2, 0x680, 0x69c, 
+    0x5, 0xb0, 0x59, 0x13, 0x681, 0x682, 0x7, 0x71, 0x2, 0x2, 0x682, 0x69c, 
+    0x5, 0xb0, 0x59, 0xe, 0x683, 0x684, 0x5, 0xc0, 0x61, 0x2, 0x684, 0x685, 
+    0x7, 0xc7, 0x2, 0x2, 0x685, 0x687, 0x3, 0x2, 0x2, 0x2, 0x686, 0x683, 
+    0x3, 0x2, 0x2, 0x2, 0x686, 0x687, 0x3, 0x2, 0x2, 0x2, 0x687, 0x688, 
+    0x3, 0x2, 0x2, 0x2, 0x688, 0x69c, 0x7, 0xc0, 0x2, 0x2, 0x689, 0x68a, 
+    0x7, 0xcf, 0x2, 0x2, 0x68a, 0x68b, 0x5, 0x68, 0x35, 0x2, 0x68b, 0x68c, 
+    0x7, 0xd9, 0x2, 0x2, 0x68c, 0x69c, 0x3, 0x2, 0x2, 0x2, 0x68d, 0x68e, 
+    0x7, 0xcf, 0x2, 0x2, 0x68e, 0x68f, 0x5, 0xb0, 0x59, 0x2, 0x68f, 0x690, 
+    0x7, 0xd9, 0x2, 0x2, 0x690, 0x69c, 0x3, 0x2, 0x2, 0x2, 0x691, 0x692, 
+    0x7, 0xcf, 0x2, 0x2, 0x692, 0x693, 0x5, 0xac, 0x57, 0x2, 0x693, 0x694, 
+    0x7, 0xd9, 0x2, 0x2, 0x694, 0x69c, 0x3, 0x2, 0x2, 0x2, 0x695, 0x697, 
+    0x7, 0xcd, 0x2, 0x2, 0x696, 0x698, 0x5, 0xac, 0x57, 0x2, 0x697, 0x696, 
+    0x3, 0x2, 0x2, 0x2, 0x697, 0x698, 0x3, 0x2, 0x2, 0x2, 0x698, 0x699, 
+    0x3, 0x2, 0x2, 0x2, 0x699, 0x69c, 0x7, 0xd8, 0x2, 0x2, 0x69a, 0x69c, 
+    0x5, 0xb8, 0x5d, 0x2, 0x69b, 0x630, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x644, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x64b, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x64d, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x654, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x658, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x663, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x665, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x66d, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x67e, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x67f, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x681, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x686, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x689, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x68d, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x691, 
+    0x3, 0x2, 0x2, 0x2, 0x69b, 0x695, 0x3, 0x2, 0x2, 0x2, 0x69b, 0x69a, 
+    0x3, 0x2, 0x2, 0x2, 0x69c, 0x6e4, 0x3, 0x2, 0x2, 0x2, 0x69d, 0x69e, 
+    0xc, 0x12, 0x2, 0x2, 0x69e, 0x69f, 0x9, 0x15, 0x2, 0x2, 0x69f, 0x6e3, 
+    0x5, 0xb0, 0x59, 0x13, 0x6a0, 0x6a1, 0xc, 0x11, 0x2, 0x2, 0x6a1, 0x6a2, 
+    0x9, 0x16, 0x2, 0x2, 0x6a2, 0x6e3, 0x5, 0xb0, 0x59, 0x12, 0x6a3, 0x6b6, 
+    0xc, 0x10, 0x2, 0x2, 0x6a4, 0x6b7, 0x7, 0xc8, 0x2, 0x2, 0x6a5, 0x6b7, 
+    0x7, 0xc9, 0x2, 0x2, 0x6a6, 0x6b7, 0x7, 0xd1, 0x2, 0x2, 0x6a7, 0x6b7, 
+    0x7, 0xce, 0x2, 0x2, 0x6a8, 0x6b7, 0x7, 0xca, 0x2, 0x2, 0x6a9, 0x6b7, 
+    0x7, 0xd0, 0x2, 0x2, 0x6aa, 0x6b7, 0x7, 0xcb, 0x2, 0x2, 0x6ab, 0x6ad, 
+    0x7, 0x45, 0x2, 0x2, 0x6ac, 0x6ab, 0x3, 0x2, 0x2, 0x2, 0x6ac, 0x6ad, 
+    0x3, 0x2, 0x2, 0x2, 0x6ad, 0x6af, 0x3, 0x2, 0x2, 0x2, 0x6ae, 0x6b0, 
+    0x7, 0x71, 0x2, 0x2, 0x6af, 0x6ae, 0x3, 0x2, 0x2, 0x2, 0x6af, 0x6b0, 
+    0x3, 0x2, 0x2, 0x2, 0x6b0, 0x6b1, 0x3, 0x2, 0x2, 0x2, 0x6b1, 0x6b7, 
+    0x7, 0x4e, 0x2, 0x2, 0x6b2, 0x6b4, 0x7, 0x71, 0x2, 0x2, 0x6b3, 0x6b2, 
+    0x3, 0x2, 0x2, 0x2, 0x6b3, 0x6b4, 0x3, 0x2, 0x2, 0x2, 0x6b4, 0x6b5, 
+    0x3, 0x2, 0x2, 0x2, 0x6b5, 0x6b7, 0x9, 0x17, 0x2, 0x2, 0x6b6, 0x6a4, 
+    0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6a5, 0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6a6, 
+    0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6a7, 0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6a8, 
+    0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6a9, 0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6aa, 
+    0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6ac, 0x3, 0x2, 0x2, 0x2, 0x6b6, 0x6b3, 
+    0x3, 0x2, 0x2, 0x2, 0x6b7, 0x6b8, 0x3, 0x2, 0x2, 0x2, 0x6b8, 0x6e3, 
+    0x5, 0xb0, 0x59, 0x11, 0x6b9, 0x6ba, 0xc, 0xd, 0x2, 0x2, 0x6ba, 0x6bb, 
+    0x7, 0x8, 0x2, 0x2, 0x6bb, 0x6e3, 0x5, 0xb0, 0x59, 0xe, 0x6bc, 0x6bd, 
+    0xc, 0xc, 0x2, 0x2, 0x6bd, 0x6be, 0x7, 0x77, 0x2, 0x2, 0x6be, 0x6e3, 
+    0x5, 0xb0, 0x59, 0xd, 0x6bf, 0x6c1, 0xc, 0xb, 0x2, 0x2, 0x6c0, 0x6c2, 
+    0x7, 0x71, 0x2, 0x2, 0x6c1, 0x6c0, 0x3, 0x2, 0x2, 0x2, 0x6c1, 0x6c2, 
+    0x3, 0x2, 0x2, 0x2, 0x6c2, 0x6c3, 0x3, 0x2, 0x2, 0x2, 0x6c3, 0x6c4, 
+    0x7, 0x11, 0x2, 0x2, 0x6c4, 0x6c5, 0x5, 0xb0, 0x59, 0x2, 0x6c5, 0x6c6, 
+    0x7, 0x8, 0x2, 0x2, 0x6c6, 0x6c7, 0x5, 0xb0, 0x59, 0xc, 0x6c7, 0x6e3, 
+    0x3, 0x2, 0x2, 0x2, 0x6c8, 0x6c9, 0xc, 0xa, 0x2, 0x2, 0x6c9, 0x6ca, 
+    0x7, 0xd4, 0x2, 0x2, 0x6ca, 0x6cb, 0x5, 0xb0, 0x59, 0x2, 0x6cb, 0x6cc, 
+    0x7, 0xc3, 0x2, 0x2, 0x6cc, 0x6cd, 0x5, 0xb0, 0x59, 0xa, 0x6cd, 0x6e3, 
+    0x3, 0x2, 0x2, 0x2, 0x6ce, 0x6cf, 0xc, 0x15, 0x2, 0x2, 0x6cf, 0x6d0, 
+    0x7, 0xcd, 0x2, 0x2, 0x6d0, 0x6d1, 0x5, 0xb0, 0x59, 0x2, 0x6d1, 0x6d2, 
+    0x7, 0xd8, 0x2, 0x2, 0x6d2, 0x6e3, 0x3, 0x2, 0x2, 0x2, 0x6d3, 0x6d4, 
+    0xc, 0x14, 0x2, 0x2, 0x6d4, 0x6d5, 0x7, 0xc7, 0x2, 0x2, 0x6d5, 0x6e3, 
+    0x7, 0xbc, 0x2, 0x2, 0x6d6, 0x6d7, 0xc, 0xf, 0x2, 0x2, 0x6d7, 0x6d9, 
+    0x7, 0x56, 0x2, 0x2, 0x6d8, 0x6da, 0x7, 0x71, 0x2, 0x2, 0x6d9, 0x6d8, 
+    0x3, 0x2, 0x2, 0x2, 0x6d9, 0x6da, 0x3, 0x2, 0x2, 0x2, 0x6da, 0x6db, 
+    0x3, 0x2, 0x2, 0x2, 0x6db, 0x6e3, 0x7, 0x72, 0x2, 0x2, 0x6dc, 0x6e0, 
+    0xc, 0x9, 0x2, 0x2, 0x6dd, 0x6e1, 0x5, 0xd4, 0x6b, 0x2, 0x6de, 0x6df, 
+    0x7, 0xc, 0x2, 0x2, 0x6df, 0x6e1, 0x5, 0xd6, 0x6c, 0x2, 0x6e0, 0x6dd, 
+    0x3, 0x2, 0x2, 0x2, 0x6e0, 0x6de, 0x3, 0x2, 0x2, 0x2, 0x6e1, 0x6e3, 
+    0x3, 0x2, 0x2, 0x2, 0x6e2, 0x69d, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6a0, 
+    0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6a3, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6b9, 
+    0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6bc, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6bf, 
+    0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6c8, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6ce, 
+    0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6d3, 0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6d6, 
+    0x3, 0x2, 0x2, 0x2, 0x6e2, 0x6dc, 0x3, 0x2, 0x2, 0x2, 0x6e3, 0x6e6, 
+    0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6e2, 0x3, 0x2, 0x2, 0x2, 0x6e4, 0x6e5, 
+    0x3, 0x2, 0x2, 0x2, 0x6e5, 0xb1, 0x3, 0x2, 0x2, 0x2, 0x6e6, 0x6e4, 0x3, 
+    0x2, 0x2, 0x2, 0x6e7, 0x6ec, 0x5, 0xb4, 0x5b, 0x2, 0x6e8, 0x6e9, 0x7, 
+    0xc4, 0x2, 0x2, 0x6e9, 0x6eb, 0x5, 0xb4, 0x5b, 0x2, 0x6ea, 0x6e8, 0x3, 
+    0x2, 0x2, 0x2, 0x6eb, 0x6ee, 0x3, 0x2, 0x2, 0x2, 0x6ec, 0x6ea, 0x3, 
+    0x2, 0x2, 0x2, 0x6ec, 0x6ed, 0x3, 0x2, 0x2, 0x2, 0x6ed, 0xb3, 0x3, 0x2, 
+    0x2, 0x2, 0x6ee, 0x6ec, 0x3, 0x2, 0x2, 0x2, 0x6ef, 0x6f2, 0x5, 0xb6, 
+    0x5c, 0x2, 0x6f0, 0x6f2, 0x5, 0xb0, 0x59, 0x2, 0x6f1, 0x6ef, 0x3, 0x2, 
+    0x2, 0x2, 0x6f1, 0x6f0, 0x3, 0x2, 0x2, 0x2, 0x6f2, 0xb5, 0x3, 0x2, 0x2, 
+    0x2, 0x6f3, 0x6f4, 0x7, 0xcf, 0x2, 0x2, 0x6f4, 0x6f9, 0x5, 0xd6, 0x6c, 
+    0x2, 0x6f5, 0x6f6, 0x7, 0xc4, 0x2, 0x2, 0x6f6, 0x6f8, 0x5, 0xd6, 0x6c, 
+    0x2, 0x6f7, 0x6f5, 0x3, 0x2, 0x2, 0x2, 0x6f8, 0x6fb, 0x3, 0x2, 0x2, 
+    0x2, 0x6f9, 0x6f7, 0x3, 0x2, 0x2, 0x2, 0x6f9, 0x6fa, 0x3, 0x2, 0x2, 
+    0x2, 0x6fa, 0x6fc, 0x3, 0x2, 0x2, 0x2, 0x6fb, 0x6f9, 0x3, 0x2, 0x2, 
+    0x2, 0x6fc, 0x6fd, 0x7, 0xd9, 0x2, 0x2, 0x6fd, 0x707, 0x3, 0x2, 0x2, 
+    0x2, 0x6fe, 0x703, 0x5, 0xd6, 0x6c, 0x2, 0x6ff, 0x700, 0x7, 0xc4, 0x2, 
+    0x2, 0x700, 0x702, 0x5, 0xd6, 0x6c, 0x2, 0x701, 0x6ff, 0x3, 0x2, 0x2, 
+    0x2, 0x702, 0x705, 0x3, 0x2, 0x2, 0x2, 0x703, 0x701, 0x3, 0x2, 0x2, 
+    0x2, 0x703, 0x704, 0x3, 0x2, 0x2, 0x2, 0x704, 0x707, 0x3, 0x2, 0x2, 
+    0x2, 0x705, 0x703, 0x3, 0x2, 0x2, 0x2, 0x706, 0x6f3, 0x3, 0x2, 0x2, 
+    0x2, 0x706, 0x6fe, 0x3, 0x2, 0x2, 0x2, 0x707, 0x708, 0x3, 0x2, 0x2, 
+    0x2, 0x708, 0x709, 0x7, 0xbf, 0x2, 0x2, 0x709, 0x70a, 0x5, 0xb0, 0x59, 
+    0x2, 0x70a, 0xb7, 0x3, 0x2, 0x2, 0x2, 0x70b, 0x70c, 0x5, 0xc0, 0x61, 
+    0x2, 0x70c, 0x70d, 0x7, 0xc7, 0x2, 0x2, 0x70d, 0x70f, 0x3, 0x2, 0x2, 
+    0x2, 0x70e, 0x70b, 0x3, 0x2, 0x2, 0x2, 0x70e, 0x70f, 0x3, 0x2, 0x2, 
+    0x2, 0x70f, 0x710, 0x3, 0x2, 0x2, 0x2, 0x710, 0x711, 0x5, 0xba, 0x5e, 
+    0x2, 0x711, 0xb9, 0x3, 0x2, 0x2, 0x2, 0x712, 0x715, 0x5, 0xd6, 0x6c, 
+    0x2, 0x713, 0x714, 0x7, 0xc7, 0x2, 0x2, 0x714, 0x716, 0x5, 0xd6, 0x6c, 
+    0x2, 0x715, 0x713, 0x3, 0x2, 0x2, 0x2, 0x715, 0x716, 0x3, 0x2, 0x2, 
+    0x2, 0x716, 0xbb, 0x3, 0x2, 0x2, 0x2, 0x717, 0x718, 0x8, 0x5f, 0x1, 
+    0x2, 0x718, 0x71f, 0x5, 0xc0, 0x61, 0x2, 0x719, 0x71f, 0x5, 0xbe, 0x60, 
+    0x2, 0x71a, 0x71b, 0x7, 0xcf, 0x2, 0x2, 0x71b, 0x71c, 0x5, 0x68, 0x35, 
+    0x2, 0x71c, 0x71d, 0x7, 0xd9, 0x2, 0x2, 0x71d, 0x71f, 0x3, 0x2, 0x2, 
+    0x2, 0x71e, 0x717, 0x3, 0x2, 0x2, 0x2, 0x71e, 0x719, 0x3, 0x2, 0x2, 
+    0x2, 0x71e, 0x71a, 0x3, 0x2, 0x2, 0x2, 0x71f, 0x728, 0x3, 0x2, 0x2, 
+    0x2, 0x720, 0x724, 0xc, 0x3, 0x2, 0x2, 0x721, 0x725, 0x5, 0xd4, 0x6b, 
+    0x2, 0x722, 0x723, 0x7, 0xc, 0x2, 0x2, 0x723, 0x725, 0x5, 0xd6, 0x6c, 
+    0x2, 0x724, 0x721, 0x3, 0x2, 0x2, 0x2, 0x724, 0x722, 0x3, 0x2, 0x2, 
+    0x2, 0x725, 0x727, 0x3, 0x2, 0x2, 0x2, 0x726, 0x720, 0x3, 0x2, 0x2, 
+    0x2, 0x727, 0x72a, 0x3, 0x2, 0x2, 0x2, 0x728, 0x726, 0x3, 0x2, 0x2, 
+    0x2, 0x728, 0x729, 0x3, 0x2, 0x2, 0x2, 0x729, 0xbd, 0x3, 0x2, 0x2, 0x2, 
+    0x72a, 0x728, 0x3, 0x2, 0x2, 0x2, 0x72b, 0x72c, 0x5, 0xd6, 0x6c, 0x2, 
+    0x72c, 0x72e, 0x7, 0xcf, 0x2, 0x2, 0x72d, 0x72f, 0x5, 0xc2, 0x62, 0x2, 
+    0x72e, 0x72d, 0x3, 0x2, 0x2, 0x2, 0x72e, 0x72f, 0x3, 0x2, 0x2, 0x2, 
+    0x72f, 0x730, 0x3, 0x2, 0x2, 0x2, 0x730, 0x731, 0x7, 0xd9, 0x2, 0x2, 
+    0x731, 0xbf, 0x3, 0x2, 0x2, 0x2, 0x732, 0x733, 0x5, 0xc6, 0x64, 0x2, 
+    0x733, 0x734, 0x7, 0xc7, 0x2, 0x2, 0x734, 0x736, 0x3, 0x2, 0x2, 0x2, 
+    0x735, 0x732, 0x3, 0x2, 0x2, 0x2, 0x735, 0x736, 0x3, 0x2, 0x2, 0x2, 
+    0x736, 0x737, 0x3, 0x2, 0x2, 0x2, 0x737, 0x738, 0x5, 0xd6, 0x6c, 0x2, 
+    0x738, 0xc1, 0x3, 0x2, 0x2, 0x2, 0x739, 0x73e, 0x5, 0xc4, 0x63, 0x2, 
+    0x73a, 0x73b, 0x7, 0xc4, 0x2, 0x2, 0x73b, 0x73d, 0x5, 0xc4, 0x63, 0x2, 
+    0x73c, 0x73a, 0x3, 0x2, 0x2, 0x2, 0x73d, 0x740, 0x3, 0x2, 0x2, 0x2, 
+    0x73e, 0x73c, 0x3, 0x2, 0x2, 0x2, 0x73e, 0x73f, 0x3, 0x2, 0x2, 0x2, 
+    0x73f, 0xc3, 0x3, 0x2, 0x2, 0x2, 0x740, 0x73e, 0x3, 0x2, 0x2, 0x2, 0x741, 
+    0x745, 0x5, 0xc0, 0x61, 0x2, 0x742, 0x745, 0x5, 0xbe, 0x60, 0x2, 0x743, 
+    0x745, 0x5, 0xcc, 0x67, 0x2, 0x744, 0x741, 0x3, 0x2, 0x2, 0x2, 0x744, 
+    0x742, 0x3, 0x2, 0x2, 0x2, 0x744, 0x743, 0x3, 0x2, 0x2, 0x2, 0x745, 
+    0xc5, 0x3, 0x2, 0x2, 0x2, 0x746, 0x747, 0x5, 0xd6, 0x6c, 0x2, 0x747, 
+    0xc7, 0x3, 0x2, 0x2, 0x2, 0x748, 0x751, 0x7, 0xba, 0x2, 0x2, 0x749, 
+    0x74a, 0x7, 0xc7, 0x2, 0x2, 0x74a, 0x751, 0x9, 0x18, 0x2, 0x2, 0x74b, 
+    0x74c, 0x7, 0xbc, 0x2, 0x2, 0x74c, 0x74e, 0x7, 0xc7, 0x2, 0x2, 0x74d, 
+    0x74f, 0x9, 0x18, 0x2, 0x2, 0x74e, 0x74d, 0x3, 0x2, 0x2, 0x2, 0x74e, 
+    0x74f, 0x3, 0x2, 0x2, 0x2, 0x74f, 0x751, 0x3, 0x2, 0x2, 0x2, 0x750, 
+    0x748, 0x3, 0x2, 0x2, 0x2, 0x750, 0x749, 0x3, 0x2, 0x2, 0x2, 0x750, 
+    0x74b, 0x3, 0x2, 0x2, 0x2, 0x751, 0xc9, 0x3, 0x2, 0x2, 0x2, 0x752, 0x754, 
+    0x9, 0x19, 0x2, 0x2, 0x753, 0x752, 0x3, 0x2, 0x2, 0x2, 0x753, 0x754, 
+    0x3, 0x2, 0x2, 0x2, 0x754, 0x75b, 0x3, 0x2, 0x2, 0x2, 0x755, 0x75c, 
+    0x5, 0xc8, 0x65, 0x2, 0x756, 0x75c, 0x7, 0xbb, 0x2, 0x2, 0x757, 0x75c, 
+    0x7, 0xbc, 0x2, 0x2, 0x758, 0x75c, 0x7, 0xbd, 0x2, 0x2, 0x759, 0x75c, 
+    0x7, 0x50, 0x2, 0x2, 0x75a, 0x75c, 0x7, 0x6f, 0x2, 0x2, 0x75b, 0x755, 
+    0x3, 0x2, 0x2, 0x2, 0x75b, 0x756, 0x3, 0x2, 0x2, 0x2, 0x75b, 0x757, 
+    0x3, 0x2, 0x2, 0x2, 0x75b, 0x758, 0x3, 0x2, 0x2, 0x2, 0x75b, 0x759, 
+    0x3, 0x2, 0x2, 0x2, 0x75b, 0x75a, 0x3, 0x2, 0x2, 0x2, 0x75c, 0xcb, 0x3, 
+    0x2, 0x2, 0x2, 0x75d, 0x761, 0x5, 0xca, 0x66, 0x2, 0x75e, 0x761, 0x7, 
+    0xbe, 0x2, 0x2, 0x75f, 0x761, 0x7, 0x72, 0x2, 0x2, 0x760, 0x75d, 0x3, 
+    0x2, 0x2, 0x2, 0x760, 0x75e, 0x3, 0x2, 0x2, 0x2, 0x760, 0x75f, 0x3, 
+    0x2, 0x2, 0x2, 0x761, 0xcd, 0x3, 0x2, 0x2, 0x2, 0x762, 0x763, 0x9, 0x1a, 
+    0x2, 0x2, 0x763, 0xcf, 0x3, 0x2, 0x2, 0x2, 0x764, 0x765, 0x9, 0x1b, 
+    0x2, 0x2, 0x765, 0xd1, 0x3, 0x2, 0x2, 0x2, 0x766, 0x767, 0x9, 0x1c, 
+    0x2, 0x2, 0x767, 0xd3, 0x3, 0x2, 0x2, 0x2, 0x768, 0x76b, 0x7, 0xb9, 
+    0x2, 0x2, 0x769, 0x76b, 0x5, 0xd2, 0x6a, 0x2, 0x76a, 0x768, 0x3, 0x2, 
+    0x2, 0x2, 0x76a, 0x769, 0x3, 0x2, 0x2, 0x2, 0x76b, 0xd5, 0x3, 0x2, 0x2, 
+    0x2, 0x76c, 0x770, 0x7, 0xb9, 0x2, 0x2, 0x76d, 0x770, 0x5, 0xce, 0x68, 
+    0x2, 0x76e, 0x770, 0x5, 0xd0, 0x69, 0x2, 0x76f, 0x76c, 0x3, 0x2, 0x2, 
+    0x2, 0x76f, 0x76d, 0x3, 0x2, 0x2, 0x2, 0x76f, 0x76e, 0x3, 0x2, 0x2, 
+    0x2, 0x770, 0xd7, 0x3, 0x2, 0x2, 0x2, 0x771, 0x774, 0x5, 0xd6, 0x6c, 
+    0x2, 0x772, 0x774, 0x7, 0x72, 0x2, 0x2, 0x773, 0x771, 0x3, 0x2, 0x2, 
+    0x2, 0x773, 0x772, 0x3, 0x2, 0x2, 0x2, 0x774, 0xd9, 0x3, 0x2, 0x2, 0x2, 
+    0x775, 0x776, 0x7, 0xbe, 0x2, 0x2, 0x776, 0x777, 0x7, 0xc9, 0x2, 0x2, 
+    0x777, 0x778, 0x5, 0xca, 0x66, 0x2, 0x778, 0xdb, 0x3, 0x2, 0x2, 0x2, 
+    0x102, 0xe0, 0xe4, 0xe7, 0xea, 0xfe, 0x104, 0x10b, 0x113, 0x118, 0x11f, 
+    0x124, 0x12b, 0x130, 0x136, 0x13c, 0x141, 0x147, 0x14c, 0x152, 0x157, 
+    0x15d, 0x16b, 0x172, 0x179, 0x180, 0x186, 0x18b, 0x191, 0x196, 0x19c, 
+    0x1a5, 0x1af, 0x1b9, 0x1cd, 0x1d5, 0x1e4, 0x1eb, 0x1f9, 0x1ff, 0x205, 
+    0x20c, 0x210, 0x213, 0x21a, 0x21e, 0x221, 0x22c, 0x230, 0x233, 0x238, 
+    0x23a, 0x23d, 0x240, 0x24a, 0x24e, 0x251, 0x254, 0x259, 0x25b, 0x261, 
+    0x267, 0x26b, 0x26e, 0x271, 0x274, 0x277, 0x27c, 0x282, 0x286, 0x289, 
+    0x28c, 0x290, 0x298, 0x2b2, 0x2b4, 0x2b8, 0x2ce, 0x2d0, 0x2db, 0x2de, 
+    0x2e7, 0x2f8, 0x303, 0x315, 0x322, 0x333, 0x33c, 0x357, 0x359, 0x36e, 
+    0x373, 0x378, 0x37b, 0x387, 0x38c, 0x390, 0x393, 0x397, 0x39b, 0x3a0, 
+    0x3a3, 0x3a7, 0x3a9, 0x3bf, 0x3c7, 0x3ca, 0x3d4, 0x3d8, 0x3e0, 0x3e4, 
+    0x3e9, 0x3ed, 0x3f1, 0x3f5, 0x3f9, 0x3fb, 0x403, 0x407, 0x40a, 0x413, 
+    0x418, 0x41b, 0x425, 0x42f, 0x433, 0x438, 0x43c, 0x442, 0x445, 0x448, 
+    0x44b, 0x459, 0x45d, 0x461, 0x466, 0x469, 0x473, 0x47b, 0x47e, 0x482, 
+    0x485, 0x489, 0x48c, 0x48f, 0x492, 0x495, 0x499, 0x49d, 0x4a0, 0x4a3, 
+    0x4a6, 0x4a9, 0x4ac, 0x4b5, 0x4bb, 0x4cf, 0x4e5, 0x4ed, 0x4f0, 0x4f6, 
+    0x4fe, 0x501, 0x507, 0x509, 0x50d, 0x512, 0x515, 0x518, 0x51c, 0x520, 
+    0x523, 0x525, 0x528, 0x52c, 0x530, 0x533, 0x535, 0x537, 0x53a, 0x53f, 
+    0x54a, 0x550, 0x555, 0x55c, 0x561, 0x565, 0x569, 0x56e, 0x575, 0x58a, 
+    0x58d, 0x596, 0x59a, 0x59f, 0x5a4, 0x5a7, 0x5a9, 0x5bf, 0x5c2, 0x5cd, 
+    0x5d1, 0x5d4, 0x5d8, 0x5dc, 0x5e4, 0x5e8, 0x5f5, 0x601, 0x60d, 0x615, 
+    0x619, 0x620, 0x626, 0x62e, 0x633, 0x63c, 0x640, 0x65f, 0x670, 0x673, 
+    0x677, 0x67a, 0x686, 0x697, 0x69b, 0x6ac, 0x6af, 0x6b3, 0x6b6, 0x6c1, 
+    0x6d9, 0x6e0, 0x6e2, 0x6e4, 0x6ec, 0x6f1, 0x6f9, 0x703, 0x706, 0x70e, 
+    0x715, 0x71e, 0x724, 0x728, 0x72e, 0x735, 0x73e, 0x744, 0x74e, 0x750, 
+    0x753, 0x75b, 0x760, 0x76a, 0x76f, 0x773, 
   };
 
   atn::ATNDeserializer deserializer;
diff --git a/src/Parsers/New/ClickHouseParser.g4 b/src/Parsers/New/ClickHouseParser.g4
index 722eaf969c0..8c237f96a5d 100644
--- a/src/Parsers/New/ClickHouseParser.g4
+++ b/src/Parsers/New/ClickHouseParser.g4
@@ -35,31 +35,37 @@ alterStmt
     ;
 
 alterTableClause
-    : ADD COLUMN (IF NOT EXISTS)? tableColumnDfnt (AFTER nestedIdentifier)?        # AlterTableClauseAddColumn
-    | ADD INDEX (IF NOT EXISTS)? tableIndexDfnt (AFTER nestedIdentifier)?          # AlterTableClauseAddIndex
-    | ATTACH partitionClause (FROM tableIdentifier)?                               # AlterTableClauseAttach
-    | CLEAR COLUMN (IF EXISTS)? nestedIdentifier (IN partitionClause)?             # AlterTableClauseClear
-    | COMMENT COLUMN (IF EXISTS)? nestedIdentifier STRING_LITERAL                  # AlterTableClauseComment
-    | DELETE WHERE columnExpr                                                      # AlterTableClauseDelete
-    | DETACH partitionClause                                                       # AlterTableClauseDetach
-    | DROP COLUMN (IF EXISTS)? nestedIdentifier                                    # AlterTableClauseDropColumn
-    | DROP INDEX (IF EXISTS)? nestedIdentifier                                     # AlterTableClauseDropIndex
-    | DROP partitionClause                                                         # AlterTableClauseDropPartition
-    | FREEZE partitionClause?                                                      # AlterTableClauseFreezePartition
-    | MODIFY COLUMN (IF EXISTS)? nestedIdentifier codecExpr                        # AlterTableClauseModifyCodec
-    | MODIFY COLUMN (IF EXISTS)? nestedIdentifier COMMENT STRING_LITERAL           # AlterTableClauseModifyComment
-    | MODIFY COLUMN (IF EXISTS)? nestedIdentifier REMOVE tableColumnPropertyType   # AlterTableClauseModifyRemove
-    | MODIFY COLUMN (IF EXISTS)? tableColumnDfnt                                   # AlterTableClauseModify
-    | MODIFY ORDER BY columnExpr                                                   # AlterTableClauseModifyOrderBy
-    | MODIFY ttlClause                                                             # AlterTableClauseModifyTTL
+    : ADD COLUMN (IF NOT EXISTS)? tableColumnDfnt (AFTER nestedIdentifier)?           # AlterTableClauseAddColumn
+    | ADD INDEX (IF NOT EXISTS)? tableIndexDfnt (AFTER nestedIdentifier)?             # AlterTableClauseAddIndex
+    | ADD PROJECTION (IF NOT EXISTS)? tableProjectionDfnt (AFTER nestedIdentifier)?   # AlterTableClauseAddProjection
+    | ATTACH partitionClause (FROM tableIdentifier)?                                  # AlterTableClauseAttach
+    | CLEAR COLUMN (IF EXISTS)? nestedIdentifier (IN partitionClause)?                # AlterTableClauseClearColumn
+    | CLEAR INDEX (IF EXISTS)? nestedIdentifier (IN partitionClause)?                 # AlterTableClauseClearIndex
+    | CLEAR PROJECTION (IF EXISTS)? nestedIdentifier (IN partitionClause)?            # AlterTableClauseClearProjection
+    | COMMENT COLUMN (IF EXISTS)? nestedIdentifier STRING_LITERAL                     # AlterTableClauseComment
+    | DELETE WHERE columnExpr                                                         # AlterTableClauseDelete
+    | DETACH partitionClause                                                          # AlterTableClauseDetach
+    | DROP COLUMN (IF EXISTS)? nestedIdentifier                                       # AlterTableClauseDropColumn
+    | DROP INDEX (IF EXISTS)? nestedIdentifier                                        # AlterTableClauseDropIndex
+    | DROP PROJECTION (IF EXISTS)? nestedIdentifier                                   # AlterTableClauseDropProjection
+    | DROP partitionClause                                                            # AlterTableClauseDropPartition
+    | FREEZE partitionClause?                                                         # AlterTableClauseFreezePartition
+    | MATERIALIZE INDEX (IF EXISTS)? nestedIdentifier (IN partitionClause)?           # AlterTableClauseMaterializeIndex
+    | MATERIALIZE PROJECTION (IF EXISTS)? nestedIdentifier (IN partitionClause)?      # AlterTableClauseMaterializeProjection
+    | MODIFY COLUMN (IF EXISTS)? nestedIdentifier codecExpr                           # AlterTableClauseModifyCodec
+    | MODIFY COLUMN (IF EXISTS)? nestedIdentifier COMMENT STRING_LITERAL              # AlterTableClauseModifyComment
+    | MODIFY COLUMN (IF EXISTS)? nestedIdentifier REMOVE tableColumnPropertyType      # AlterTableClauseModifyRemove
+    | MODIFY COLUMN (IF EXISTS)? tableColumnDfnt                                      # AlterTableClauseModify
+    | MODIFY ORDER BY columnExpr                                                      # AlterTableClauseModifyOrderBy
+    | MODIFY ttlClause                                                                # AlterTableClauseModifyTTL
     | MOVE partitionClause ( TO DISK STRING_LITERAL
                            | TO VOLUME STRING_LITERAL
                            | TO TABLE tableIdentifier
-                           )                                                       # AlterTableClauseMovePartition
-    | REMOVE TTL                                                                   # AlterTableClauseRemoveTTL
-    | RENAME COLUMN (IF EXISTS)? nestedIdentifier TO nestedIdentifier              # AlterTableClauseRename
-    | REPLACE partitionClause FROM tableIdentifier                                 # AlterTableClauseReplace
-    | UPDATE assignmentExprList whereClause                                        # AlterTableClauseUpdate
+                           )                                                          # AlterTableClauseMovePartition
+    | REMOVE TTL                                                                      # AlterTableClauseRemoveTTL
+    | RENAME COLUMN (IF EXISTS)? nestedIdentifier TO nestedIdentifier                 # AlterTableClauseRename
+    | REPLACE partitionClause FROM tableIdentifier                                    # AlterTableClauseReplace
+    | UPDATE assignmentExprList whereClause                                           # AlterTableClauseUpdate
     ;
 
 assignmentExprList: assignmentExpr (COMMA assignmentExpr)*;
@@ -154,6 +160,7 @@ tableElementExpr
     : tableColumnDfnt                                                              # TableElementExprColumn
     | CONSTRAINT identifier CHECK columnExpr                                       # TableElementExprConstraint
     | INDEX tableIndexDfnt                                                         # TableElementExprIndex
+    | PROJECTION tableProjectionDfnt                                               # TableElementExprProjection
     ;
 tableColumnDfnt
     : nestedIdentifier columnTypeExpr tableColumnPropertyExpr? (COMMENT STRING_LITERAL)? codecExpr? (TTL columnExpr)?
@@ -161,6 +168,7 @@ tableColumnDfnt
     ;
 tableColumnPropertyExpr: (DEFAULT | MATERIALIZED | ALIAS) columnExpr;
 tableIndexDfnt: nestedIdentifier columnExpr TYPE columnTypeExpr GRANULARITY DECIMAL_LITERAL;
+tableProjectionDfnt: nestedIdentifier projectionSelectStmt;
 codecExpr: CODEC LPAREN codecArgExpr (COMMA codecArgExpr)* RPAREN;
 codecArgExpr: identifier (LPAREN columnExprList? RPAREN)?;
 ttlExpr: columnExpr (DELETE | TO DISK STRING_LITERAL | TO VOLUME STRING_LITERAL)?;
@@ -212,6 +220,17 @@ optimizeStmt: OPTIMIZE TABLE tableIdentifier clusterClause? partitionClause? FIN
 
 renameStmt: RENAME TABLE tableIdentifier TO tableIdentifier (COMMA tableIdentifier TO tableIdentifier)* clusterClause?;
 
+// PROJECTION SELECT statement
+
+projectionSelectStmt:
+    LPAREN
+    withClause?
+    SELECT columnExprList
+    groupByClause?
+    projectionOrderByClause?
+    RPAREN
+    ;
+
 // SELECT statement
 
 selectUnionStmt: selectStmtWithParens (UNION ALL selectStmtWithParens)*;
@@ -240,6 +259,7 @@ whereClause: WHERE columnExpr;
 groupByClause: GROUP BY ((CUBE | ROLLUP) LPAREN columnExprList RPAREN | columnExprList);
 havingClause: HAVING columnExpr;
 orderByClause: ORDER BY orderExprList;
+projectionOrderByClause: ORDER BY columnExprList;
 limitByClause: LIMIT limitExpr BY columnExprList;
 limitClause: LIMIT limitExpr (WITH TIES)?;
 settingsClause: SETTINGS settingExprList;
@@ -436,7 +456,7 @@ keyword
     | 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 | MATERIALIZED | MAX | MERGES | MIN | MODIFY | MOVE | MUTATION | NO
+    | 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
diff --git a/src/Parsers/New/ClickHouseParser.h b/src/Parsers/New/ClickHouseParser.h
index 35e8d81d7f8..ecaff1a5add 100644
--- a/src/Parsers/New/ClickHouseParser.h
+++ b/src/Parsers/New/ClickHouseParser.h
@@ -30,30 +30,30 @@ public:
     INSERT = 81, INTERVAL = 82, INTO = 83, IS = 84, IS_OBJECT_ID = 85, JOIN = 86, 
     KEY = 87, KILL = 88, LAST = 89, LAYOUT = 90, LEADING = 91, LEFT = 92, 
     LIFETIME = 93, LIKE = 94, LIMIT = 95, LIVE = 96, LOCAL = 97, LOGS = 98, 
-    MATERIALIZED = 99, MAX = 100, MERGES = 101, MIN = 102, MINUTE = 103, 
-    MODIFY = 104, MONTH = 105, MOVE = 106, MUTATION = 107, NAN_SQL = 108, 
-    NO = 109, NOT = 110, NULL_SQL = 111, NULLS = 112, OFFSET = 113, ON = 114, 
-    OPTIMIZE = 115, OR = 116, ORDER = 117, OUTER = 118, OUTFILE = 119, PARTITION = 120, 
-    POPULATE = 121, PREWHERE = 122, PRIMARY = 123, QUARTER = 124, RANGE = 125, 
-    RELOAD = 126, REMOVE = 127, RENAME = 128, REPLACE = 129, REPLICA = 130, 
-    REPLICATED = 131, RIGHT = 132, ROLLUP = 133, SAMPLE = 134, SECOND = 135, 
-    SELECT = 136, SEMI = 137, SENDS = 138, SET = 139, SETTINGS = 140, SHOW = 141, 
-    SOURCE = 142, START = 143, STOP = 144, SUBSTRING = 145, SYNC = 146, 
-    SYNTAX = 147, SYSTEM = 148, TABLE = 149, TABLES = 150, TEMPORARY = 151, 
-    TEST = 152, THEN = 153, TIES = 154, TIMEOUT = 155, TIMESTAMP = 156, 
-    TO = 157, TOP = 158, TOTALS = 159, TRAILING = 160, TRIM = 161, TRUNCATE = 162, 
-    TTL = 163, TYPE = 164, UNION = 165, UPDATE = 166, USE = 167, USING = 168, 
-    UUID = 169, VALUES = 170, VIEW = 171, VOLUME = 172, WATCH = 173, WEEK = 174, 
-    WHEN = 175, WHERE = 176, WITH = 177, YEAR = 178, JSON_FALSE = 179, JSON_TRUE = 180, 
-    IDENTIFIER = 181, FLOATING_LITERAL = 182, OCTAL_LITERAL = 183, DECIMAL_LITERAL = 184, 
-    HEXADECIMAL_LITERAL = 185, STRING_LITERAL = 186, ARROW = 187, ASTERISK = 188, 
-    BACKQUOTE = 189, BACKSLASH = 190, COLON = 191, COMMA = 192, CONCAT = 193, 
-    DASH = 194, DOT = 195, EQ_DOUBLE = 196, EQ_SINGLE = 197, GE = 198, GT = 199, 
-    LBRACE = 200, LBRACKET = 201, LE = 202, LPAREN = 203, LT = 204, NOT_EQ = 205, 
-    PERCENT = 206, PLUS = 207, QUERY = 208, QUOTE_DOUBLE = 209, QUOTE_SINGLE = 210, 
-    RBRACE = 211, RBRACKET = 212, RPAREN = 213, SEMICOLON = 214, SLASH = 215, 
-    UNDERSCORE = 216, MULTI_LINE_COMMENT = 217, SINGLE_LINE_COMMENT = 218, 
-    WHITESPACE = 219
+    MATERIALIZED = 99, MATERIALIZE = 100, MAX = 101, MERGES = 102, MIN = 103, 
+    MINUTE = 104, MODIFY = 105, MONTH = 106, MOVE = 107, MUTATION = 108, 
+    NAN_SQL = 109, NO = 110, NOT = 111, NULL_SQL = 112, NULLS = 113, OFFSET = 114, 
+    ON = 115, OPTIMIZE = 116, OR = 117, ORDER = 118, OUTER = 119, OUTFILE = 120, 
+    PARTITION = 121, POPULATE = 122, PREWHERE = 123, PRIMARY = 124, PROJECTION = 125, 
+    QUARTER = 126, RANGE = 127, RELOAD = 128, REMOVE = 129, RENAME = 130, 
+    REPLACE = 131, REPLICA = 132, REPLICATED = 133, RIGHT = 134, ROLLUP = 135, 
+    SAMPLE = 136, SECOND = 137, SELECT = 138, SEMI = 139, SENDS = 140, SET = 141, 
+    SETTINGS = 142, SHOW = 143, SOURCE = 144, START = 145, STOP = 146, SUBSTRING = 147, 
+    SYNC = 148, SYNTAX = 149, SYSTEM = 150, TABLE = 151, TABLES = 152, TEMPORARY = 153, 
+    TEST = 154, THEN = 155, TIES = 156, TIMEOUT = 157, TIMESTAMP = 158, 
+    TO = 159, TOP = 160, TOTALS = 161, TRAILING = 162, TRIM = 163, TRUNCATE = 164, 
+    TTL = 165, TYPE = 166, UNION = 167, UPDATE = 168, USE = 169, USING = 170, 
+    UUID = 171, VALUES = 172, VIEW = 173, VOLUME = 174, WATCH = 175, WEEK = 176, 
+    WHEN = 177, WHERE = 178, WITH = 179, YEAR = 180, JSON_FALSE = 181, JSON_TRUE = 182, 
+    IDENTIFIER = 183, FLOATING_LITERAL = 184, OCTAL_LITERAL = 185, DECIMAL_LITERAL = 186, 
+    HEXADECIMAL_LITERAL = 187, STRING_LITERAL = 188, ARROW = 189, ASTERISK = 190, 
+    BACKQUOTE = 191, BACKSLASH = 192, COLON = 193, COMMA = 194, CONCAT = 195, 
+    DASH = 196, DOT = 197, EQ_DOUBLE = 198, EQ_SINGLE = 199, GE = 200, GT = 201, 
+    LBRACE = 202, LBRACKET = 203, LE = 204, LPAREN = 205, LT = 206, NOT_EQ = 207, 
+    PERCENT = 208, PLUS = 209, QUERY = 210, QUOTE_DOUBLE = 211, QUOTE_SINGLE = 212, 
+    RBRACE = 213, RBRACKET = 214, RPAREN = 215, SEMICOLON = 216, SLASH = 217, 
+    UNDERSCORE = 218, MULTI_LINE_COMMENT = 219, SINGLE_LINE_COMMENT = 220, 
+    WHITESPACE = 221
   };
 
   enum {
@@ -68,30 +68,31 @@ public:
     RuleEngineClause = 26, RulePartitionByClause = 27, RulePrimaryKeyClause = 28, 
     RuleSampleByClause = 29, RuleTtlClause = 30, RuleEngineExpr = 31, RuleTableElementExpr = 32, 
     RuleTableColumnDfnt = 33, RuleTableColumnPropertyExpr = 34, RuleTableIndexDfnt = 35, 
-    RuleCodecExpr = 36, RuleCodecArgExpr = 37, RuleTtlExpr = 38, RuleDescribeStmt = 39, 
-    RuleDropStmt = 40, RuleExistsStmt = 41, RuleExplainStmt = 42, RuleInsertStmt = 43, 
-    RuleColumnsClause = 44, RuleDataClause = 45, RuleKillStmt = 46, RuleOptimizeStmt = 47, 
-    RuleRenameStmt = 48, RuleSelectUnionStmt = 49, RuleSelectStmtWithParens = 50, 
-    RuleSelectStmt = 51, RuleWithClause = 52, RuleTopClause = 53, RuleFromClause = 54, 
-    RuleArrayJoinClause = 55, RulePrewhereClause = 56, RuleWhereClause = 57, 
-    RuleGroupByClause = 58, RuleHavingClause = 59, RuleOrderByClause = 60, 
-    RuleLimitByClause = 61, RuleLimitClause = 62, RuleSettingsClause = 63, 
-    RuleJoinExpr = 64, RuleJoinOp = 65, RuleJoinOpCross = 66, RuleJoinConstraintClause = 67, 
-    RuleSampleClause = 68, RuleLimitExpr = 69, RuleOrderExprList = 70, RuleOrderExpr = 71, 
-    RuleRatioExpr = 72, RuleSettingExprList = 73, RuleSettingExpr = 74, 
-    RuleSetStmt = 75, RuleShowStmt = 76, RuleSystemStmt = 77, RuleTruncateStmt = 78, 
-    RuleUseStmt = 79, RuleWatchStmt = 80, RuleColumnTypeExpr = 81, RuleColumnExprList = 82, 
-    RuleColumnsExpr = 83, RuleColumnExpr = 84, RuleColumnArgList = 85, RuleColumnArgExpr = 86, 
-    RuleColumnLambdaExpr = 87, RuleColumnIdentifier = 88, RuleNestedIdentifier = 89, 
-    RuleTableExpr = 90, RuleTableFunctionExpr = 91, RuleTableIdentifier = 92, 
-    RuleTableArgList = 93, RuleTableArgExpr = 94, RuleDatabaseIdentifier = 95, 
-    RuleFloatingLiteral = 96, RuleNumberLiteral = 97, RuleLiteral = 98, 
-    RuleInterval = 99, RuleKeyword = 100, RuleKeywordForAlias = 101, RuleAlias = 102, 
-    RuleIdentifier = 103, RuleIdentifierOrNull = 104, RuleEnumValue = 105
+    RuleTableProjectionDfnt = 36, RuleCodecExpr = 37, RuleCodecArgExpr = 38, 
+    RuleTtlExpr = 39, RuleDescribeStmt = 40, RuleDropStmt = 41, RuleExistsStmt = 42, 
+    RuleExplainStmt = 43, RuleInsertStmt = 44, RuleColumnsClause = 45, RuleDataClause = 46, 
+    RuleKillStmt = 47, RuleOptimizeStmt = 48, RuleRenameStmt = 49, RuleProjectionSelectStmt = 50, 
+    RuleSelectUnionStmt = 51, RuleSelectStmtWithParens = 52, RuleSelectStmt = 53, 
+    RuleWithClause = 54, RuleTopClause = 55, RuleFromClause = 56, RuleArrayJoinClause = 57, 
+    RulePrewhereClause = 58, RuleWhereClause = 59, RuleGroupByClause = 60, 
+    RuleHavingClause = 61, RuleOrderByClause = 62, RuleProjectionOrderByClause = 63, 
+    RuleLimitByClause = 64, RuleLimitClause = 65, RuleSettingsClause = 66, 
+    RuleJoinExpr = 67, RuleJoinOp = 68, RuleJoinOpCross = 69, RuleJoinConstraintClause = 70, 
+    RuleSampleClause = 71, RuleLimitExpr = 72, RuleOrderExprList = 73, RuleOrderExpr = 74, 
+    RuleRatioExpr = 75, RuleSettingExprList = 76, RuleSettingExpr = 77, 
+    RuleSetStmt = 78, RuleShowStmt = 79, RuleSystemStmt = 80, RuleTruncateStmt = 81, 
+    RuleUseStmt = 82, RuleWatchStmt = 83, RuleColumnTypeExpr = 84, RuleColumnExprList = 85, 
+    RuleColumnsExpr = 86, RuleColumnExpr = 87, RuleColumnArgList = 88, RuleColumnArgExpr = 89, 
+    RuleColumnLambdaExpr = 90, RuleColumnIdentifier = 91, RuleNestedIdentifier = 92, 
+    RuleTableExpr = 93, RuleTableFunctionExpr = 94, RuleTableIdentifier = 95, 
+    RuleTableArgList = 96, RuleTableArgExpr = 97, RuleDatabaseIdentifier = 98, 
+    RuleFloatingLiteral = 99, RuleNumberLiteral = 100, RuleLiteral = 101, 
+    RuleInterval = 102, RuleKeyword = 103, RuleKeywordForAlias = 104, RuleAlias = 105, 
+    RuleIdentifier = 106, RuleIdentifierOrNull = 107, RuleEnumValue = 108
   };
 
   ClickHouseParser(antlr4::TokenStream *input);
-  ~ClickHouseParser() override;
+  ~ClickHouseParser();
 
   virtual std::string getGrammarFileName() const override;
   virtual const antlr4::atn::ATN& getATN() const override { return _atn; };
@@ -136,6 +137,7 @@ public:
   class TableColumnDfntContext;
   class TableColumnPropertyExprContext;
   class TableIndexDfntContext;
+  class TableProjectionDfntContext;
   class CodecExprContext;
   class CodecArgExprContext;
   class TtlExprContext;
@@ -149,6 +151,7 @@ public:
   class KillStmtContext;
   class OptimizeStmtContext;
   class RenameStmtContext;
+  class ProjectionSelectStmtContext;
   class SelectUnionStmtContext;
   class SelectStmtWithParensContext;
   class SelectStmtContext;
@@ -161,6 +164,7 @@ public:
   class GroupByClauseContext;
   class HavingClauseContext;
   class OrderByClauseContext;
+  class ProjectionOrderByClauseContext;
   class LimitByClauseContext;
   class LimitClauseContext;
   class SettingsClauseContext;
@@ -313,44 +317,6 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  AlterTableClauseRenameContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseRenameContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *RENAME();
-    antlr4::tree::TerminalNode *COLUMN();
-    std::vector<NestedIdentifierContext *> nestedIdentifier();
-    NestedIdentifierContext* nestedIdentifier(size_t i);
-    antlr4::tree::TerminalNode *TO();
-    antlr4::tree::TerminalNode *IF();
-    antlr4::tree::TerminalNode *EXISTS();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
-  class  AlterTableClauseFreezePartitionContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseFreezePartitionContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *FREEZE();
-    PartitionClauseContext *partitionClause();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
-  class  AlterTableClauseModifyContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseModifyContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *MODIFY();
-    antlr4::tree::TerminalNode *COLUMN();
-    TableColumnDfntContext *tableColumnDfnt();
-    antlr4::tree::TerminalNode *IF();
-    antlr4::tree::TerminalNode *EXISTS();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
   class  AlterTableClauseModifyOrderByContext : public AlterTableClauseContext {
   public:
     AlterTableClauseModifyOrderByContext(AlterTableClauseContext *ctx);
@@ -363,16 +329,6 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  AlterTableClauseRemoveTTLContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseRemoveTTLContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *REMOVE();
-    antlr4::tree::TerminalNode *TTL();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
   class  AlterTableClauseUpdateContext : public AlterTableClauseContext {
   public:
     AlterTableClauseUpdateContext(AlterTableClauseContext *ctx);
@@ -384,6 +340,21 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
+  class  AlterTableClauseClearProjectionContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseClearProjectionContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *CLEAR();
+    antlr4::tree::TerminalNode *PROJECTION();
+    NestedIdentifierContext *nestedIdentifier();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+    antlr4::tree::TerminalNode *IN();
+    PartitionClauseContext *partitionClause();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
   class  AlterTableClauseModifyRemoveContext : public AlterTableClauseContext {
   public:
     AlterTableClauseModifyRemoveContext(AlterTableClauseContext *ctx);
@@ -410,20 +381,6 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  AlterTableClauseModifyCodecContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseModifyCodecContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *MODIFY();
-    antlr4::tree::TerminalNode *COLUMN();
-    NestedIdentifierContext *nestedIdentifier();
-    CodecExprContext *codecExpr();
-    antlr4::tree::TerminalNode *IF();
-    antlr4::tree::TerminalNode *EXISTS();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
   class  AlterTableClauseCommentContext : public AlterTableClauseContext {
   public:
     AlterTableClauseCommentContext(AlterTableClauseContext *ctx);
@@ -438,18 +395,6 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  AlterTableClauseAttachContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseAttachContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *ATTACH();
-    PartitionClauseContext *partitionClause();
-    antlr4::tree::TerminalNode *FROM();
-    TableIdentifierContext *tableIdentifier();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
   class  AlterTableClauseDropColumnContext : public AlterTableClauseContext {
   public:
     AlterTableClauseDropColumnContext(AlterTableClauseContext *ctx);
@@ -463,21 +408,6 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  AlterTableClauseClearContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseClearContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *CLEAR();
-    antlr4::tree::TerminalNode *COLUMN();
-    NestedIdentifierContext *nestedIdentifier();
-    antlr4::tree::TerminalNode *IF();
-    antlr4::tree::TerminalNode *EXISTS();
-    antlr4::tree::TerminalNode *IN();
-    PartitionClauseContext *partitionClause();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
   class  AlterTableClauseDetachContext : public AlterTableClauseContext {
   public:
     AlterTableClauseDetachContext(AlterTableClauseContext *ctx);
@@ -488,19 +418,6 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  AlterTableClauseDropIndexContext : public AlterTableClauseContext {
-  public:
-    AlterTableClauseDropIndexContext(AlterTableClauseContext *ctx);
-
-    antlr4::tree::TerminalNode *DROP();
-    antlr4::tree::TerminalNode *INDEX();
-    NestedIdentifierContext *nestedIdentifier();
-    antlr4::tree::TerminalNode *IF();
-    antlr4::tree::TerminalNode *EXISTS();
-
-    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
   class  AlterTableClauseAddIndexContext : public AlterTableClauseContext {
   public:
     AlterTableClauseAddIndexContext(AlterTableClauseContext *ctx);
@@ -527,6 +444,182 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
+  class  AlterTableClauseMaterializeIndexContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseMaterializeIndexContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *MATERIALIZE();
+    antlr4::tree::TerminalNode *INDEX();
+    NestedIdentifierContext *nestedIdentifier();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+    antlr4::tree::TerminalNode *IN();
+    PartitionClauseContext *partitionClause();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseMaterializeProjectionContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseMaterializeProjectionContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *MATERIALIZE();
+    antlr4::tree::TerminalNode *PROJECTION();
+    NestedIdentifierContext *nestedIdentifier();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+    antlr4::tree::TerminalNode *IN();
+    PartitionClauseContext *partitionClause();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseMovePartitionContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseMovePartitionContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *MOVE();
+    PartitionClauseContext *partitionClause();
+    antlr4::tree::TerminalNode *TO();
+    antlr4::tree::TerminalNode *DISK();
+    antlr4::tree::TerminalNode *STRING_LITERAL();
+    antlr4::tree::TerminalNode *VOLUME();
+    antlr4::tree::TerminalNode *TABLE();
+    TableIdentifierContext *tableIdentifier();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseRenameContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseRenameContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *RENAME();
+    antlr4::tree::TerminalNode *COLUMN();
+    std::vector<NestedIdentifierContext *> nestedIdentifier();
+    NestedIdentifierContext* nestedIdentifier(size_t i);
+    antlr4::tree::TerminalNode *TO();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseFreezePartitionContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseFreezePartitionContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *FREEZE();
+    PartitionClauseContext *partitionClause();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseClearColumnContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseClearColumnContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *CLEAR();
+    antlr4::tree::TerminalNode *COLUMN();
+    NestedIdentifierContext *nestedIdentifier();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+    antlr4::tree::TerminalNode *IN();
+    PartitionClauseContext *partitionClause();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseModifyContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseModifyContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *MODIFY();
+    antlr4::tree::TerminalNode *COLUMN();
+    TableColumnDfntContext *tableColumnDfnt();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseClearIndexContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseClearIndexContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *CLEAR();
+    antlr4::tree::TerminalNode *INDEX();
+    NestedIdentifierContext *nestedIdentifier();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+    antlr4::tree::TerminalNode *IN();
+    PartitionClauseContext *partitionClause();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseRemoveTTLContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseRemoveTTLContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *REMOVE();
+    antlr4::tree::TerminalNode *TTL();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseModifyCodecContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseModifyCodecContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *MODIFY();
+    antlr4::tree::TerminalNode *COLUMN();
+    NestedIdentifierContext *nestedIdentifier();
+    CodecExprContext *codecExpr();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseAttachContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseAttachContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *ATTACH();
+    PartitionClauseContext *partitionClause();
+    antlr4::tree::TerminalNode *FROM();
+    TableIdentifierContext *tableIdentifier();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseDropProjectionContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseDropProjectionContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *DROP();
+    antlr4::tree::TerminalNode *PROJECTION();
+    NestedIdentifierContext *nestedIdentifier();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
+  class  AlterTableClauseDropIndexContext : public AlterTableClauseContext {
+  public:
+    AlterTableClauseDropIndexContext(AlterTableClauseContext *ctx);
+
+    antlr4::tree::TerminalNode *DROP();
+    antlr4::tree::TerminalNode *INDEX();
+    NestedIdentifierContext *nestedIdentifier();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *EXISTS();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
   class  AlterTableClauseModifyCommentContext : public AlterTableClauseContext {
   public:
     AlterTableClauseModifyCommentContext(AlterTableClauseContext *ctx);
@@ -552,18 +645,18 @@ public:
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  AlterTableClauseMovePartitionContext : public AlterTableClauseContext {
+  class  AlterTableClauseAddProjectionContext : public AlterTableClauseContext {
   public:
-    AlterTableClauseMovePartitionContext(AlterTableClauseContext *ctx);
+    AlterTableClauseAddProjectionContext(AlterTableClauseContext *ctx);
 
-    antlr4::tree::TerminalNode *MOVE();
-    PartitionClauseContext *partitionClause();
-    antlr4::tree::TerminalNode *TO();
-    antlr4::tree::TerminalNode *DISK();
-    antlr4::tree::TerminalNode *STRING_LITERAL();
-    antlr4::tree::TerminalNode *VOLUME();
-    antlr4::tree::TerminalNode *TABLE();
-    TableIdentifierContext *tableIdentifier();
+    antlr4::tree::TerminalNode *ADD();
+    antlr4::tree::TerminalNode *PROJECTION();
+    TableProjectionDfntContext *tableProjectionDfnt();
+    antlr4::tree::TerminalNode *IF();
+    antlr4::tree::TerminalNode *NOT();
+    antlr4::tree::TerminalNode *EXISTS();
+    antlr4::tree::TerminalNode *AFTER();
+    NestedIdentifierContext *nestedIdentifier();
 
     virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
@@ -1257,6 +1350,16 @@ public:
    
   };
 
+  class  TableElementExprProjectionContext : public TableElementExprContext {
+  public:
+    TableElementExprProjectionContext(TableElementExprContext *ctx);
+
+    antlr4::tree::TerminalNode *PROJECTION();
+    TableProjectionDfntContext *tableProjectionDfnt();
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+  };
+
   class  TableElementExprConstraintContext : public TableElementExprContext {
   public:
     TableElementExprConstraintContext(TableElementExprContext *ctx);
@@ -1344,6 +1447,20 @@ public:
 
   TableIndexDfntContext* tableIndexDfnt();
 
+  class  TableProjectionDfntContext : public antlr4::ParserRuleContext {
+  public:
+    TableProjectionDfntContext(antlr4::ParserRuleContext *parent, size_t invokingState);
+    virtual size_t getRuleIndex() const override;
+    NestedIdentifierContext *nestedIdentifier();
+    ProjectionSelectStmtContext *projectionSelectStmt();
+
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+   
+  };
+
+  TableProjectionDfntContext* tableProjectionDfnt();
+
   class  CodecExprContext : public antlr4::ParserRuleContext {
   public:
     CodecExprContext(antlr4::ParserRuleContext *parent, size_t invokingState);
@@ -1671,6 +1788,25 @@ public:
 
   RenameStmtContext* renameStmt();
 
+  class  ProjectionSelectStmtContext : public antlr4::ParserRuleContext {
+  public:
+    ProjectionSelectStmtContext(antlr4::ParserRuleContext *parent, size_t invokingState);
+    virtual size_t getRuleIndex() const override;
+    antlr4::tree::TerminalNode *LPAREN();
+    antlr4::tree::TerminalNode *SELECT();
+    ColumnExprListContext *columnExprList();
+    antlr4::tree::TerminalNode *RPAREN();
+    WithClauseContext *withClause();
+    GroupByClauseContext *groupByClause();
+    ProjectionOrderByClauseContext *projectionOrderByClause();
+
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+   
+  };
+
+  ProjectionSelectStmtContext* projectionSelectStmt();
+
   class  SelectUnionStmtContext : public antlr4::ParserRuleContext {
   public:
     SelectUnionStmtContext(antlr4::ParserRuleContext *parent, size_t invokingState);
@@ -1874,6 +2010,21 @@ public:
 
   OrderByClauseContext* orderByClause();
 
+  class  ProjectionOrderByClauseContext : public antlr4::ParserRuleContext {
+  public:
+    ProjectionOrderByClauseContext(antlr4::ParserRuleContext *parent, size_t invokingState);
+    virtual size_t getRuleIndex() const override;
+    antlr4::tree::TerminalNode *ORDER();
+    antlr4::tree::TerminalNode *BY();
+    ColumnExprListContext *columnExprList();
+
+
+    virtual antlrcpp::Any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
+   
+  };
+
+  ProjectionOrderByClauseContext* projectionOrderByClause();
+
   class  LimitByClauseContext : public antlr4::ParserRuleContext {
   public:
     LimitByClauseContext(antlr4::ParserRuleContext *parent, size_t invokingState);
@@ -3273,6 +3424,7 @@ public:
     antlr4::tree::TerminalNode *LIVE();
     antlr4::tree::TerminalNode *LOCAL();
     antlr4::tree::TerminalNode *LOGS();
+    antlr4::tree::TerminalNode *MATERIALIZE();
     antlr4::tree::TerminalNode *MATERIALIZED();
     antlr4::tree::TerminalNode *MAX();
     antlr4::tree::TerminalNode *MERGES();
diff --git a/src/Parsers/New/ClickHouseParserVisitor.h b/src/Parsers/New/ClickHouseParserVisitor.h
index fbe50af7e9a..0cb1876f556 100644
--- a/src/Parsers/New/ClickHouseParserVisitor.h
+++ b/src/Parsers/New/ClickHouseParserVisitor.h
@@ -30,9 +30,15 @@ public:
 
     virtual antlrcpp::Any visitAlterTableClauseAddIndex(ClickHouseParser::AlterTableClauseAddIndexContext *context) = 0;
 
+    virtual antlrcpp::Any visitAlterTableClauseAddProjection(ClickHouseParser::AlterTableClauseAddProjectionContext *context) = 0;
+
     virtual antlrcpp::Any visitAlterTableClauseAttach(ClickHouseParser::AlterTableClauseAttachContext *context) = 0;
 
-    virtual antlrcpp::Any visitAlterTableClauseClear(ClickHouseParser::AlterTableClauseClearContext *context) = 0;
+    virtual antlrcpp::Any visitAlterTableClauseClearColumn(ClickHouseParser::AlterTableClauseClearColumnContext *context) = 0;
+
+    virtual antlrcpp::Any visitAlterTableClauseClearIndex(ClickHouseParser::AlterTableClauseClearIndexContext *context) = 0;
+
+    virtual antlrcpp::Any visitAlterTableClauseClearProjection(ClickHouseParser::AlterTableClauseClearProjectionContext *context) = 0;
 
     virtual antlrcpp::Any visitAlterTableClauseComment(ClickHouseParser::AlterTableClauseCommentContext *context) = 0;
 
@@ -44,10 +50,16 @@ public:
 
     virtual antlrcpp::Any visitAlterTableClauseDropIndex(ClickHouseParser::AlterTableClauseDropIndexContext *context) = 0;
 
+    virtual antlrcpp::Any visitAlterTableClauseDropProjection(ClickHouseParser::AlterTableClauseDropProjectionContext *context) = 0;
+
     virtual antlrcpp::Any visitAlterTableClauseDropPartition(ClickHouseParser::AlterTableClauseDropPartitionContext *context) = 0;
 
     virtual antlrcpp::Any visitAlterTableClauseFreezePartition(ClickHouseParser::AlterTableClauseFreezePartitionContext *context) = 0;
 
+    virtual antlrcpp::Any visitAlterTableClauseMaterializeIndex(ClickHouseParser::AlterTableClauseMaterializeIndexContext *context) = 0;
+
+    virtual antlrcpp::Any visitAlterTableClauseMaterializeProjection(ClickHouseParser::AlterTableClauseMaterializeProjectionContext *context) = 0;
+
     virtual antlrcpp::Any visitAlterTableClauseModifyCodec(ClickHouseParser::AlterTableClauseModifyCodecContext *context) = 0;
 
     virtual antlrcpp::Any visitAlterTableClauseModifyComment(ClickHouseParser::AlterTableClauseModifyCommentContext *context) = 0;
@@ -146,12 +158,16 @@ public:
 
     virtual antlrcpp::Any visitTableElementExprIndex(ClickHouseParser::TableElementExprIndexContext *context) = 0;
 
+    virtual antlrcpp::Any visitTableElementExprProjection(ClickHouseParser::TableElementExprProjectionContext *context) = 0;
+
     virtual antlrcpp::Any visitTableColumnDfnt(ClickHouseParser::TableColumnDfntContext *context) = 0;
 
     virtual antlrcpp::Any visitTableColumnPropertyExpr(ClickHouseParser::TableColumnPropertyExprContext *context) = 0;
 
     virtual antlrcpp::Any visitTableIndexDfnt(ClickHouseParser::TableIndexDfntContext *context) = 0;
 
+    virtual antlrcpp::Any visitTableProjectionDfnt(ClickHouseParser::TableProjectionDfntContext *context) = 0;
+
     virtual antlrcpp::Any visitCodecExpr(ClickHouseParser::CodecExprContext *context) = 0;
 
     virtual antlrcpp::Any visitCodecArgExpr(ClickHouseParser::CodecArgExprContext *context) = 0;
@@ -186,6 +202,8 @@ public:
 
     virtual antlrcpp::Any visitRenameStmt(ClickHouseParser::RenameStmtContext *context) = 0;
 
+    virtual antlrcpp::Any visitProjectionSelectStmt(ClickHouseParser::ProjectionSelectStmtContext *context) = 0;
+
     virtual antlrcpp::Any visitSelectUnionStmt(ClickHouseParser::SelectUnionStmtContext *context) = 0;
 
     virtual antlrcpp::Any visitSelectStmtWithParens(ClickHouseParser::SelectStmtWithParensContext *context) = 0;
@@ -210,6 +228,8 @@ public:
 
     virtual antlrcpp::Any visitOrderByClause(ClickHouseParser::OrderByClauseContext *context) = 0;
 
+    virtual antlrcpp::Any visitProjectionOrderByClause(ClickHouseParser::ProjectionOrderByClauseContext *context) = 0;
+
     virtual antlrcpp::Any visitLimitByClause(ClickHouseParser::LimitByClauseContext *context) = 0;
 
     virtual antlrcpp::Any visitLimitClause(ClickHouseParser::LimitClauseContext *context) = 0;
diff --git a/src/Parsers/New/ParseTreeVisitor.h b/src/Parsers/New/ParseTreeVisitor.h
index 2c204ead972..3b07c1beed8 100644
--- a/src/Parsers/New/ParseTreeVisitor.h
+++ b/src/Parsers/New/ParseTreeVisitor.h
@@ -19,15 +19,21 @@ public:
     // AlterTableQuery
     antlrcpp::Any visitAlterTableClauseAddColumn(ClickHouseParser::AlterTableClauseAddColumnContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseAddIndex(ClickHouseParser::AlterTableClauseAddIndexContext * ctx) override;
+    antlrcpp::Any visitAlterTableClauseAddProjection(ClickHouseParser::AlterTableClauseAddProjectionContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseAttach(ClickHouseParser::AlterTableClauseAttachContext * ctx) override;
-    antlrcpp::Any visitAlterTableClauseClear(ClickHouseParser::AlterTableClauseClearContext * ctx) override;
+    antlrcpp::Any visitAlterTableClauseClearColumn(ClickHouseParser::AlterTableClauseClearColumnContext * ctx) override;
+    antlrcpp::Any visitAlterTableClauseClearIndex(ClickHouseParser::AlterTableClauseClearIndexContext * ctx) override;
+    antlrcpp::Any visitAlterTableClauseClearProjection(ClickHouseParser::AlterTableClauseClearProjectionContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseComment(ClickHouseParser::AlterTableClauseCommentContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseDelete(ClickHouseParser::AlterTableClauseDeleteContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseDetach(ClickHouseParser::AlterTableClauseDetachContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseDropColumn(ClickHouseParser::AlterTableClauseDropColumnContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseDropIndex(ClickHouseParser::AlterTableClauseDropIndexContext * ctx) override;
+    antlrcpp::Any visitAlterTableClauseDropProjection(ClickHouseParser::AlterTableClauseDropProjectionContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseDropPartition(ClickHouseParser::AlterTableClauseDropPartitionContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseFreezePartition(ClickHouseParser::AlterTableClauseFreezePartitionContext * ctx) override;
+    antlrcpp::Any visitAlterTableClauseMaterializeIndex(ClickHouseParser::AlterTableClauseMaterializeIndexContext * ctx) override;
+    antlrcpp::Any visitAlterTableClauseMaterializeProjection(ClickHouseParser::AlterTableClauseMaterializeProjectionContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseModify(ClickHouseParser::AlterTableClauseModifyContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseModifyCodec(ClickHouseParser::AlterTableClauseModifyCodecContext * ctx) override;
     antlrcpp::Any visitAlterTableClauseModifyComment(ClickHouseParser::AlterTableClauseModifyCommentContext * ctx) override;
@@ -162,6 +168,7 @@ public:
     antlrcpp::Any visitRenameStmt(ClickHouseParser::RenameStmtContext * ctx) override;
 
     // SelectUnionQuery
+    antlrcpp::Any visitProjectionSelectStmt(ClickHouseParser::ProjectionSelectStmtContext * ctx) override;
     antlrcpp::Any visitSelectStmt(ClickHouseParser::SelectStmtContext * ctx) override;
     antlrcpp::Any visitSelectStmtWithParens(ClickHouseParser::SelectStmtWithParensContext * ctx) override;
     antlrcpp::Any visitSelectUnionStmt(ClickHouseParser::SelectUnionStmtContext * ctx) override;
@@ -190,7 +197,9 @@ public:
     antlrcpp::Any visitTableElementExprColumn(ClickHouseParser::TableElementExprColumnContext * ctx) override;
     antlrcpp::Any visitTableElementExprConstraint(ClickHouseParser::TableElementExprConstraintContext * ctx) override;
     antlrcpp::Any visitTableElementExprIndex(ClickHouseParser::TableElementExprIndexContext * ctx) override;
+    antlrcpp::Any visitTableElementExprProjection(ClickHouseParser::TableElementExprProjectionContext * ctx) override;
     antlrcpp::Any visitTableIndexDfnt(ClickHouseParser::TableIndexDfntContext * ctx) override;
+    antlrcpp::Any visitTableProjectionDfnt(ClickHouseParser::TableProjectionDfntContext * ctx) override;
 
     // TableExpr
     antlrcpp::Any visitTableArgExpr(ClickHouseParser::TableArgExprContext * ctx) override;
@@ -236,6 +245,7 @@ public:
     antlrcpp::Any visitGroupByClause(ClickHouseParser::GroupByClauseContext *ctx) override;
     antlrcpp::Any visitHavingClause(ClickHouseParser::HavingClauseContext *ctx) override;
     antlrcpp::Any visitOrderByClause(ClickHouseParser::OrderByClauseContext *ctx) override;
+    antlrcpp::Any visitProjectionOrderByClause(ClickHouseParser::ProjectionOrderByClauseContext *ctx) override;
     antlrcpp::Any visitLimitByClause(ClickHouseParser::LimitByClauseContext *ctx) override;
     antlrcpp::Any visitLimitClause(ClickHouseParser::LimitClauseContext *ctx) override;
     antlrcpp::Any visitSettingsClause(ClickHouseParser::SettingsClauseContext *ctx) override;
diff --git a/src/Parsers/New/ParserErrorListener.cpp b/src/Parsers/New/ParserErrorListener.cpp
index 5c1b9238d15..f6ac0f0c451 100644
--- a/src/Parsers/New/ParserErrorListener.cpp
+++ b/src/Parsers/New/ParserErrorListener.cpp
@@ -23,9 +23,10 @@ extern int SYNTAX_ERROR;
 void ParserErrorListener::syntaxError(
     Recognizer * recognizer, Token * token, size_t, size_t, const std::string & message, std::exception_ptr)
 {
-    auto * parser = dynamic_cast<ClickHouseParser*>(recognizer);
+    auto * parser = dynamic_cast<ClickHouseParser *>(recognizer);
+    assert(parser);
 
-    LOG_ERROR(&Poco::Logger::get("ClickHouseParser"),
+    LOG_ERROR(&Poco::Logger::get("ClickHouseParser"), //-V522
               "Last element parsed so far:\n"
               "{}\n"
               "Parser error: (pos {}) {}", parser->getRuleContext()->toStringTree(parser, true), token->getStartIndex(), message);
diff --git a/src/Parsers/ParserAlterQuery.cpp b/src/Parsers/ParserAlterQuery.cpp
index e5cc4b1b95e..d659db64b83 100644
--- a/src/Parsers/ParserAlterQuery.cpp
+++ b/src/Parsers/ParserAlterQuery.cpp
@@ -43,6 +43,11 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_add_constraint("ADD CONSTRAINT");
     ParserKeyword s_drop_constraint("DROP CONSTRAINT");
 
+    ParserKeyword s_add_projection("ADD PROJECTION");
+    ParserKeyword s_drop_projection("DROP PROJECTION");
+    ParserKeyword s_clear_projection("CLEAR PROJECTION");
+    ParserKeyword s_materialize_projection("MATERIALIZE PROJECTION");
+
     ParserKeyword s_add("ADD");
     ParserKeyword s_drop("DROP");
     ParserKeyword s_suspend("SUSPEND");
@@ -61,6 +66,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_drop_detached_partition("DROP DETACHED PARTITION");
     ParserKeyword s_drop_detached_part("DROP DETACHED PART");
     ParserKeyword s_fetch_partition("FETCH PARTITION");
+    ParserKeyword s_fetch_part("FETCH PART");
     ParserKeyword s_replace_partition("REPLACE PARTITION");
     ParserKeyword s_freeze("FREEZE");
     ParserKeyword s_unfreeze("UNFREEZE");
@@ -78,6 +84,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_to_disk("TO DISK");
     ParserKeyword s_to_volume("TO VOLUME");
     ParserKeyword s_to_table("TO TABLE");
+    ParserKeyword s_to_shard("TO SHARD");
 
     ParserKeyword s_delete("DELETE");
     ParserKeyword s_update("UPDATE");
@@ -100,6 +107,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserCompoundColumnDeclaration parser_col_decl;
     ParserIndexDeclaration parser_idx_decl;
     ParserConstraintDeclaration parser_constraint_decl;
+    ParserProjectionDeclaration parser_projection_decl;
     ParserCompoundColumnDeclaration parser_modify_col_decl(false, false, true);
     ParserPartition parser_partition;
     ParserExpression parser_exp_elem;
@@ -254,10 +262,11 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             command->clear_index = true;
             command->detach = false;
 
-            if (!s_in_partition.ignore(pos, expected))
-                return false;
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return 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))
         {
@@ -276,6 +285,70 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & 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))
@@ -294,6 +367,10 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     return false;
                 command->move_destination_type = DataDestinationType::TABLE;
             }
+            else if (s_to_shard.ignore(pos))
+            {
+                command->move_destination_type = DataDestinationType::SHARD;
+            }
             else
                 return false;
 
@@ -428,6 +505,21 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             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))
diff --git a/src/Parsers/ParserCreateQuery.cpp b/src/Parsers/ParserCreateQuery.cpp
index bfd51b7633d..b8ac6ed09eb 100644
--- a/src/Parsers/ParserCreateQuery.cpp
+++ b/src/Parsers/ParserCreateQuery.cpp
@@ -2,6 +2,7 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTIndexDeclaration.h>
+#include <Parsers/ASTProjectionDeclaration.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSetQuery.h>
@@ -13,6 +14,7 @@
 #include <Parsers/ASTConstraintDeclaration.h>
 #include <Parsers/ParserDictionary.h>
 #include <Parsers/ParserDictionaryAttributeDeclaration.h>
+#include <Parsers/ParserProjectionSelectQuery.h>
 #include <IO/ReadHelpers.h>
 
 
@@ -152,14 +154,46 @@ bool ParserConstraintDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected &
 }
 
 
+bool ParserProjectionDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserIdentifier name_p;
+    ParserProjectionSelectQuery query_p;
+    ParserToken s_lparen(TokenType::OpeningRoundBracket);
+    ParserToken s_rparen(TokenType::ClosingRoundBracket);
+    ASTPtr name;
+    ASTPtr query;
+
+    if (!name_p.parse(pos, name, expected))
+        return false;
+
+    if (!s_lparen.ignore(pos, expected))
+        return false;
+
+    if (!query_p.parse(pos, query, expected))
+        return false;
+
+    if (!s_rparen.ignore(pos, expected))
+        return false;
+
+    auto projection = std::make_shared<ASTProjectionDeclaration>();
+    projection->name = name->as<ASTIdentifier &>().name();
+    projection->set(projection->query, query);
+    node = projection;
+
+    return true;
+}
+
+
 bool ParserTablePropertyDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserKeyword s_index("INDEX");
     ParserKeyword s_constraint("CONSTRAINT");
+    ParserKeyword s_projection("PROJECTION");
     ParserKeyword s_primary_key("PRIMARY KEY");
 
     ParserIndexDeclaration index_p;
     ParserConstraintDeclaration constraint_p;
+    ParserProjectionDeclaration projection_p;
     ParserColumnDeclaration column_p{true, true};
     ParserExpression primary_key_p;
 
@@ -175,6 +209,11 @@ bool ParserTablePropertyDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expecte
         if (!constraint_p.parse(pos, new_node, expected))
             return false;
     }
+    else if (s_projection.ignore(pos, expected))
+    {
+        if (!projection_p.parse(pos, new_node, expected))
+            return false;
+    }
     else if (s_primary_key.ignore(pos, expected))
     {
         if (!primary_key_p.parse(pos, new_node, expected))
@@ -202,6 +241,12 @@ bool ParserConstraintDeclarationList::parseImpl(Pos & pos, ASTPtr & node, Expect
             .parse(pos, node, expected);
 }
 
+bool ParserProjectionDeclarationList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    return ParserList(std::make_unique<ParserProjectionDeclaration>(), std::make_unique<ParserToken>(TokenType::Comma), false)
+            .parse(pos, node, expected);
+}
+
 bool ParserTablePropertiesDeclarationList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ASTPtr list;
@@ -214,6 +259,7 @@ bool ParserTablePropertiesDeclarationList::parseImpl(Pos & pos, ASTPtr & node, E
     ASTPtr columns = std::make_shared<ASTExpressionList>();
     ASTPtr indices = std::make_shared<ASTExpressionList>();
     ASTPtr constraints = std::make_shared<ASTExpressionList>();
+    ASTPtr projections = std::make_shared<ASTExpressionList>();
     ASTPtr primary_key;
 
     for (const auto & elem : list->children)
@@ -224,6 +270,8 @@ bool ParserTablePropertiesDeclarationList::parseImpl(Pos & pos, ASTPtr & node, E
             indices->children.push_back(elem);
         else if (elem->as<ASTConstraintDeclaration>())
             constraints->children.push_back(elem);
+        else if (elem->as<ASTProjectionDeclaration>())
+            projections->children.push_back(elem);
         else if (elem->as<ASTIdentifier>() || elem->as<ASTFunction>())
         {
             if (primary_key)
@@ -245,6 +293,8 @@ bool ParserTablePropertiesDeclarationList::parseImpl(Pos & pos, ASTPtr & node, E
         res->set(res->indices, indices);
     if (!constraints->children.empty())
         res->set(res->constraints, constraints);
+    if (!projections->children.empty())
+        res->set(res->projections, projections);
     if (primary_key)
         res->set(res->primary_key, primary_key);
 
@@ -264,11 +314,13 @@ 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;
     ParserSetQuery settings_p(/* parse_only_internals_ = */ true);
     ParserTTLExpressionList parser_ttl_list;
+    ParserStringLiteral string_literal_parser;
 
     ASTPtr engine;
     ASTPtr partition_by;
@@ -277,6 +329,7 @@ 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;
@@ -334,6 +387,13 @@ 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;
     }
 
@@ -347,6 +407,8 @@ bool ParserStorage::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     storage->set(storage->settings, settings);
 
+    storage->set(storage->comment, comment_expression);
+
     node = storage;
     return true;
 }
diff --git a/src/Parsers/ParserCreateQuery.h b/src/Parsers/ParserCreateQuery.h
index fbdc308d5bc..2c9a7870ff0 100644
--- a/src/Parsers/ParserCreateQuery.h
+++ b/src/Parsers/ParserCreateQuery.h
@@ -284,6 +284,13 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
+class ParserProjectionDeclaration : public IParserBase
+{
+protected:
+    const char * getName() const override { return "projection declaration"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 class ParserTablePropertyDeclaration : public IParserBase
 {
 protected:
@@ -306,6 +313,13 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
+class ParserProjectionDeclarationList : public IParserBase
+{
+protected:
+    const char * getName() const override { return "projection declaration list"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 
 class ParserTablePropertiesDeclarationList : public IParserBase
 {
diff --git a/src/Parsers/ParserExplainQuery.cpp b/src/Parsers/ParserExplainQuery.cpp
index 7a7abba94a9..c8d8dc10a7f 100644
--- a/src/Parsers/ParserExplainQuery.cpp
+++ b/src/Parsers/ParserExplainQuery.cpp
@@ -31,7 +31,7 @@ bool ParserExplainQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
         else if (s_pipeline.ignore(pos, expected))
             kind = ASTExplainQuery::ExplainKind::QueryPipeline;
         else if (s_plan.ignore(pos, expected))
-            kind = ASTExplainQuery::ExplainKind::QueryPlan;
+            kind = ASTExplainQuery::ExplainKind::QueryPlan; //-V1048
     }
     else
         return false;
diff --git a/src/Parsers/ParserGrantQuery.cpp b/src/Parsers/ParserGrantQuery.cpp
index d3aa62e73da..9411fa93892 100644
--- a/src/Parsers/ParserGrantQuery.cpp
+++ b/src/Parsers/ParserGrantQuery.cpp
@@ -238,8 +238,7 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         return false;
 
     String cluster;
-    if (cluster.empty())
-        parseOnCluster(pos, expected, cluster);
+    parseOnCluster(pos, expected, cluster);
 
     bool grant_option = false;
     bool admin_option = false;
diff --git a/src/Parsers/ParserProjectionSelectQuery.cpp b/src/Parsers/ParserProjectionSelectQuery.cpp
new file mode 100644
index 00000000000..0467f84de2a
--- /dev/null
+++ b/src/Parsers/ParserProjectionSelectQuery.cpp
@@ -0,0 +1,85 @@
+#include <memory>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTProjectionSelectQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ParserProjectionSelectQuery.h>
+
+
+namespace DB
+{
+bool ParserProjectionSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    auto select_query = std::make_shared<ASTProjectionSelectQuery>();
+    node = select_query;
+
+    ParserKeyword s_with("WITH");
+    ParserKeyword s_select("SELECT");
+    ParserKeyword s_group_by("GROUP BY");
+    ParserKeyword s_order_by("ORDER BY");
+
+    ParserNotEmptyExpressionList exp_list_for_with_clause(false);
+    ParserNotEmptyExpressionList exp_list_for_select_clause(true); /// Allows aliases without AS keyword.
+    ParserExpression order_expression_p;
+
+    ASTPtr with_expression_list;
+    ASTPtr select_expression_list;
+    ASTPtr group_expression_list;
+    ASTPtr order_expression;
+
+    /// WITH expr list
+    {
+        if (s_with.ignore(pos, expected))
+        {
+            if (!exp_list_for_with_clause.parse(pos, with_expression_list, expected))
+                return false;
+        }
+    }
+
+    /// SELECT [DISTINCT] [TOP N [WITH TIES]] expr list
+    {
+        if (!s_select.ignore(pos, expected))
+            return false;
+
+        if (!exp_list_for_select_clause.parse(pos, select_expression_list, expected))
+            return false;
+    }
+
+    // If group by is specified, AggregatingMergeTree engine is used, and the group by keys are implied to be order by keys
+    if (s_group_by.ignore(pos, expected))
+    {
+        if (!ParserList(std::make_unique<ParserExpression>(), std::make_unique<ParserToken>(TokenType::Comma))
+                 .parse(pos, group_expression_list, expected))
+            return false;
+    }
+
+    if (s_order_by.ignore(pos, expected))
+    {
+        ASTPtr expr_list;
+        if (!ParserList(std::make_unique<ParserExpression>(), std::make_unique<ParserToken>(TokenType::Comma)).parse(pos, expr_list, expected))
+            return false;
+
+        if (expr_list->children.size() == 1)
+        {
+            order_expression = expr_list->children.front();
+        }
+        else
+        {
+            auto function_node = std::make_shared<ASTFunction>();
+            function_node->name = "tuple";
+            function_node->arguments = expr_list;
+            function_node->children.push_back(expr_list);
+            order_expression = function_node;
+        }
+    }
+
+    select_query->setExpression(ASTProjectionSelectQuery::Expression::WITH, std::move(with_expression_list));
+    select_query->setExpression(ASTProjectionSelectQuery::Expression::SELECT, std::move(select_expression_list));
+    select_query->setExpression(ASTProjectionSelectQuery::Expression::GROUP_BY, std::move(group_expression_list));
+    select_query->setExpression(ASTProjectionSelectQuery::Expression::ORDER_BY, std::move(order_expression));
+    return true;
+}
+
+}
diff --git a/src/Parsers/ParserProjectionSelectQuery.h b/src/Parsers/ParserProjectionSelectQuery.h
new file mode 100644
index 00000000000..aed4b5a6f42
--- /dev/null
+++ b/src/Parsers/ParserProjectionSelectQuery.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <Parsers/IParserBase.h>
+
+
+namespace DB
+{
+
+
+class ParserProjectionSelectQuery : public IParserBase
+{
+protected:
+    const char * getName() const override { return "PROJECTION SELECT query"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+}
diff --git a/src/Parsers/ParserRenameQuery.cpp b/src/Parsers/ParserRenameQuery.cpp
index 7fa4e6e5408..e3b35249cd6 100644
--- a/src/Parsers/ParserRenameQuery.cpp
+++ b/src/Parsers/ParserRenameQuery.cpp
@@ -42,6 +42,7 @@ bool ParserRenameQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserKeyword s_rename_table("RENAME TABLE");
     ParserKeyword s_exchange_tables("EXCHANGE TABLES");
     ParserKeyword s_rename_dictionary("RENAME DICTIONARY");
+    ParserKeyword s_exchange_dictionaries("EXCHANGE DICTIONARIES");
     ParserKeyword s_rename_database("RENAME DATABASE");
     ParserKeyword s_to("TO");
     ParserKeyword s_and("AND");
@@ -56,6 +57,11 @@ bool ParserRenameQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         exchange = true;
     else if (s_rename_dictionary.ignore(pos, expected))
         dictionary = true;
+    else if (s_exchange_dictionaries.ignore(pos, expected))
+    {
+        exchange = true;
+        dictionary = true;
+    }
     else if (s_rename_database.ignore(pos, expected))
     {
         ASTPtr from_db;
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 491037da9a9..a1487468ab3 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -57,7 +57,35 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             break;
         }
+        case Type::RELOAD_MODEL:
+        {
+            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_model = ast->as<ASTLiteral &>().value.safeGet<String>();
+            }
+            else
+            {
+                ParserIdentifier model_parser;
+                ASTPtr model;
+                String target_model;
 
+                if (!model_parser.parse(pos, model, expected))
+                    return false;
+
+                if (!tryGetIdentifierNameInto(model, res->target_model))
+                    return false;
+            }
+
+            break;
+        }
         case Type::DROP_REPLICA:
         {
             ASTPtr ast;
@@ -106,6 +134,17 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             break;
 
+        case Type::RESTART_DISK:
+        {
+            ASTPtr ast;
+            if (ParserIdentifier{}.parse(pos, ast, expected))
+                res->disk = ast->as<ASTIdentifier &>().name();
+            else
+                return false;
+
+            break;
+        }
+
         case Type::STOP_DISTRIBUTED_SENDS:
         case Type::START_DISTRIBUTED_SENDS:
         case Type::FLUSH_DISTRIBUTED:
diff --git a/src/Parsers/tests/CMakeLists.txt b/src/Parsers/examples/CMakeLists.txt
similarity index 100%
rename from src/Parsers/tests/CMakeLists.txt
rename to src/Parsers/examples/CMakeLists.txt
diff --git a/src/Parsers/tests/create_parser.cpp b/src/Parsers/examples/create_parser.cpp
similarity index 100%
rename from src/Parsers/tests/create_parser.cpp
rename to src/Parsers/examples/create_parser.cpp
diff --git a/src/Parsers/tests/create_parser_fuzzer.cpp b/src/Parsers/examples/create_parser_fuzzer.cpp
similarity index 100%
rename from src/Parsers/tests/create_parser_fuzzer.cpp
rename to src/Parsers/examples/create_parser_fuzzer.cpp
diff --git a/src/Parsers/tests/lexer.cpp b/src/Parsers/examples/lexer.cpp
similarity index 100%
rename from src/Parsers/tests/lexer.cpp
rename to src/Parsers/examples/lexer.cpp
diff --git a/src/Parsers/tests/lexer_fuzzer.cpp b/src/Parsers/examples/lexer_fuzzer.cpp
similarity index 100%
rename from src/Parsers/tests/lexer_fuzzer.cpp
rename to src/Parsers/examples/lexer_fuzzer.cpp
diff --git a/src/Parsers/tests/select_parser.cpp b/src/Parsers/examples/select_parser.cpp
similarity index 100%
rename from src/Parsers/tests/select_parser.cpp
rename to src/Parsers/examples/select_parser.cpp
diff --git a/src/Parsers/tests/select_parser_fuzzer.cpp b/src/Parsers/examples/select_parser_fuzzer.cpp
similarity index 100%
rename from src/Parsers/tests/select_parser_fuzzer.cpp
rename to src/Parsers/examples/select_parser_fuzzer.cpp
diff --git a/src/Parsers/ya.make b/src/Parsers/ya.make
index 4bd31cb79de..62e0c2b3225 100644
--- a/src/Parsers/ya.make
+++ b/src/Parsers/ya.make
@@ -38,6 +38,8 @@ SRCS(
     ASTOptimizeQuery.cpp
     ASTOrderByElement.cpp
     ASTPartition.cpp
+    ASTProjectionDeclaration.cpp
+    ASTProjectionSelectQuery.cpp
     ASTQualifiedAsterisk.cpp
     ASTQueryParameter.cpp
     ASTQueryWithOnCluster.cpp
@@ -105,6 +107,7 @@ SRCS(
     ParserKillQueryQuery.cpp
     ParserOptimizeQuery.cpp
     ParserPartition.cpp
+    ParserProjectionSelectQuery.cpp
     ParserQuery.cpp
     ParserQueryWithOutput.cpp
     ParserRenameQuery.cpp
diff --git a/src/Parsers/ya.make.in b/src/Parsers/ya.make.in
index 0dbd6b5b593..168fe7ceb34 100644
--- a/src/Parsers/ya.make.in
+++ b/src/Parsers/ya.make.in
@@ -8,7 +8,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F New | grep -v -F tests | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F New | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Processors/CMakeLists.txt b/src/Processors/CMakeLists.txt
index 99ba159eaf4..7e965188b4c 100644
--- a/src/Processors/CMakeLists.txt
+++ b/src/Processors/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (ENABLE_TESTS)
-    add_subdirectory (tests)
+if (ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif ()
 
diff --git a/src/Processors/DelayedPortsProcessor.cpp b/src/Processors/DelayedPortsProcessor.cpp
index ae4ba4659aa..8174619f8ce 100644
--- a/src/Processors/DelayedPortsProcessor.cpp
+++ b/src/Processors/DelayedPortsProcessor.cpp
@@ -8,9 +8,35 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+InputPorts createInputPorts(
+    const Block & header,
+    size_t num_ports,
+    IProcessor::PortNumbers delayed_ports,
+    bool assert_main_ports_empty)
+{
+    if (!assert_main_ports_empty)
+        return InputPorts(num_ports, header);
+
+    InputPorts res;
+    std::sort(delayed_ports.begin(), delayed_ports.end());
+    size_t next_delayed_port = 0;
+    for (size_t i = 0; i < num_ports; ++i)
+    {
+        if (next_delayed_port < delayed_ports.size() && i == delayed_ports[next_delayed_port])
+        {
+            res.emplace_back(header);
+            ++next_delayed_port;
+        }
+        else
+            res.emplace_back(Block());
+    }
+
+    return res;
+}
+
 DelayedPortsProcessor::DelayedPortsProcessor(
     const Block & header, size_t num_ports, const PortNumbers & delayed_ports, bool assert_main_ports_empty)
-    : IProcessor(InputPorts(num_ports, header),
+    : IProcessor(createInputPorts(header, num_ports, delayed_ports, assert_main_ports_empty),
                  OutputPorts((assert_main_ports_empty ? delayed_ports.size() : num_ports), header))
     , num_delayed_ports(delayed_ports.size())
 {
diff --git a/src/Processors/Executors/PipelineExecutingBlockInputStream.cpp b/src/Processors/Executors/PipelineExecutingBlockInputStream.cpp
index 458fa0a0a90..736ad1ecefe 100644
--- a/src/Processors/Executors/PipelineExecutingBlockInputStream.cpp
+++ b/src/Processors/Executors/PipelineExecutingBlockInputStream.cpp
@@ -121,11 +121,4 @@ void PipelineExecutingBlockInputStream::setQuota(const std::shared_ptr<const Ena
                     ErrorCodes::LOGICAL_ERROR);
 }
 
-void PipelineExecutingBlockInputStream::addTotalRowsApprox(size_t)
-{
-    throw Exception("Progress is not supported by PipelineExecutingBlockInputStream",
-                    ErrorCodes::LOGICAL_ERROR);
-}
-
-
 }
diff --git a/src/Processors/Executors/PipelineExecutingBlockInputStream.h b/src/Processors/Executors/PipelineExecutingBlockInputStream.h
index e37ad41f6ab..68497938ad4 100644
--- a/src/Processors/Executors/PipelineExecutingBlockInputStream.h
+++ b/src/Processors/Executors/PipelineExecutingBlockInputStream.h
@@ -26,7 +26,6 @@ public:
     void setProcessListElement(QueryStatus * elem) final;
     void setLimits(const StreamLocalLimits & limits_) final;
     void setQuota(const std::shared_ptr<const EnabledQuota> & quota_) final;
-    void addTotalRowsApprox(size_t value) final;
 
 protected:
     void readPrefixImpl() override;
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index a724f22ed31..b1751dfd030 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -1,14 +1,15 @@
-#include <Processors/Executors/PipelineExecutor.h>
 #include <queue>
 #include <IO/WriteBufferFromString.h>
-#include <Processors/printPipeline.h>
 #include <Common/EventCounter.h>
-#include <ext/scope_guard.h>
 #include <Common/CurrentThread.h>
-#include <Processors/ISource.h>
 #include <Common/setThreadName.h>
+#include <Common/MemoryTracker.h>
+#include <Processors/Executors/PipelineExecutor.h>
+#include <Processors/printPipeline.h>
+#include <Processors/ISource.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
+#include <ext/scope_guard_safe.h>
 
 #ifndef NDEBUG
     #include <Common/Stopwatch.h>
@@ -740,7 +741,7 @@ void PipelineExecutor::executeImpl(size_t num_threads)
 
     bool finished_flag = false;
 
-    SCOPE_EXIT(
+    SCOPE_EXIT_SAFE(
         if (!finished_flag)
         {
             finish();
@@ -766,9 +767,9 @@ void PipelineExecutor::executeImpl(size_t num_threads)
                 if (thread_group)
                     CurrentThread::attachTo(thread_group);
 
-                SCOPE_EXIT(
-                        if (thread_group)
-                            CurrentThread::detachQueryIfNotDetached();
+                SCOPE_EXIT_SAFE(
+                    if (thread_group)
+                        CurrentThread::detachQueryIfNotDetached();
                 );
 
                 try
diff --git a/src/Processors/Executors/PollingQueue.h b/src/Processors/Executors/PollingQueue.h
index 0d306ddf2f7..100d762b731 100644
--- a/src/Processors/Executors/PollingQueue.h
+++ b/src/Processors/Executors/PollingQueue.h
@@ -17,7 +17,7 @@ class PollingQueue
 public:
     struct TaskData
     {
-        size_t thread_num;
+        size_t thread_num = 0;
 
         void * data = nullptr;
         int fd = -1;
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
index f1626414375..9f1999bc4a3 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
@@ -5,7 +5,7 @@
 #include <Processors/QueryPipeline.h>
 
 #include <Common/setThreadName.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 namespace DB
 {
@@ -72,7 +72,7 @@ static void threadFunction(PullingAsyncPipelineExecutor::Data & data, ThreadGrou
         if (thread_group)
             CurrentThread::attachTo(thread_group);
 
-        SCOPE_EXIT(
+        SCOPE_EXIT_SAFE(
             if (thread_group)
                 CurrentThread::detachQueryIfNotDetached();
         );
diff --git a/src/Processors/Formats/IInputFormat.cpp b/src/Processors/Formats/IInputFormat.cpp
index 069d25564b1..5594e04dc74 100644
--- a/src/Processors/Formats/IInputFormat.cpp
+++ b/src/Processors/Formats/IInputFormat.cpp
@@ -5,11 +5,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 IInputFormat::IInputFormat(Block header, ReadBuffer & in_)
     : ISource(std::move(header)), in(in_)
 {
@@ -18,9 +13,7 @@ IInputFormat::IInputFormat(Block header, ReadBuffer & in_)
 
 void IInputFormat::resetParser()
 {
-    if (in.hasPendingData())
-        throw Exception("Unread data in IInputFormat::resetParser. Most likely it's a bug.", ErrorCodes::LOGICAL_ERROR);
-
+    in.ignoreAll();
     // those are protected attributes from ISource (I didn't want to propagate resetParser up there)
     finished = false;
     got_exception = false;
diff --git a/src/Processors/Formats/IRowInputFormat.cpp b/src/Processors/Formats/IRowInputFormat.cpp
index 75a9abf6845..52e64a9d90d 100644
--- a/src/Processors/Formats/IRowInputFormat.cpp
+++ b/src/Processors/Formats/IRowInputFormat.cpp
@@ -190,7 +190,7 @@ Chunk IRowInputFormat::generate()
         if (num_errors && (params.allow_errors_num > 0 || params.allow_errors_ratio > 0))
         {
             Poco::Logger * log = &Poco::Logger::get("IRowInputFormat");
-            LOG_TRACE(log, "Skipped {} rows with errors while reading the input stream", num_errors);
+            LOG_DEBUG(log, "Skipped {} rows with errors while reading the input stream", num_errors);
         }
 
         readSuffix();
diff --git a/src/Processors/Formats/IRowInputFormat.h b/src/Processors/Formats/IRowInputFormat.h
index c802bd3066b..2ca182b7ffe 100644
--- a/src/Processors/Formats/IRowInputFormat.h
+++ b/src/Processors/Formats/IRowInputFormat.h
@@ -14,7 +14,7 @@ namespace DB
 /// Contains extra information about read data.
 struct RowReadExtension
 {
-    /// IRowInputStream.read() output. It contains non zero for columns that actually read from the source and zero otherwise.
+    /// IRowInputFormat::read output. It contains non zero for columns that actually read from the source and zero otherwise.
     /// It's used to attach defaults for partially filled rows.
     std::vector<UInt8> read_columns;
 };
@@ -22,10 +22,10 @@ struct RowReadExtension
 /// Common parameters for generating blocks.
 struct RowInputFormatParams
 {
-    size_t max_block_size;
+    size_t max_block_size = 0;
 
-    UInt64 allow_errors_num;
-    Float64 allow_errors_ratio;
+    UInt64 allow_errors_num = 0;
+    Float64 allow_errors_ratio = 0;
 
     Poco::Timespan max_execution_time = 0;
     OverflowMode timeout_overflow_mode = OverflowMode::THROW;
diff --git a/src/Processors/Formats/IRowOutputFormat.cpp b/src/Processors/Formats/IRowOutputFormat.cpp
index b714844feea..6b7a9a46eaa 100644
--- a/src/Processors/Formats/IRowOutputFormat.cpp
+++ b/src/Processors/Formats/IRowOutputFormat.cpp
@@ -103,7 +103,7 @@ void IRowOutputFormat::writeMinExtreme(const DB::Columns & columns, size_t row_n
     write(columns, row_num);
 }
 
-void IRowOutputFormat::writeMaxExtreme(const DB::Columns & columns, size_t row_num)
+void IRowOutputFormat::writeMaxExtreme(const DB::Columns & columns, size_t row_num) //-V524
 {
     write(columns, row_num);
 }
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
index 4edef1f1365..52d2cf98c25 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
@@ -24,7 +24,6 @@ namespace ErrorCodes
 ArrowBlockInputFormat::ArrowBlockInputFormat(ReadBuffer & in_, const Block & header_, bool stream_)
     : IInputFormat(header_, in_), stream{stream_}
 {
-    prepareReader();
 }
 
 Chunk ArrowBlockInputFormat::generate()
@@ -35,12 +34,18 @@ Chunk ArrowBlockInputFormat::generate()
 
     if (stream)
     {
+        if (!stream_reader)
+            prepareReader();
+
         batch_result = stream_reader->Next();
         if (batch_result.ok() && !(*batch_result))
             return res;
     }
     else
     {
+        if (!file_reader)
+            prepareReader();
+
         if (record_batch_current >= record_batch_total)
             return res;
 
@@ -71,14 +76,14 @@ void ArrowBlockInputFormat::resetParser()
         stream_reader.reset();
     else
         file_reader.reset();
-    prepareReader();
+    record_batch_current = 0;
 }
 
 void ArrowBlockInputFormat::prepareReader()
 {
     if (stream)
     {
-        auto stream_reader_status = arrow::ipc::RecordBatchStreamReader::Open(asArrowFile(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());
@@ -101,7 +106,7 @@ void ArrowBlockInputFormat::prepareReader()
     record_batch_current = 0;
 }
 
-void registerInputFormatProcessorArrow(FormatFactory &factory)
+void registerInputFormatProcessorArrow(FormatFactory & factory)
 {
     factory.registerInputFormatProcessor(
         "Arrow",
@@ -112,7 +117,7 @@ void registerInputFormatProcessorArrow(FormatFactory &factory)
         {
             return std::make_shared<ArrowBlockInputFormat>(buf, sample, false);
         });
-
+    factory.markFormatAsColumnOriented("Arrow");
     factory.registerInputFormatProcessor(
         "ArrowStream",
         [](ReadBuffer & buf,
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index c783e10debb..9582e0c3312 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -55,26 +55,23 @@ arrow::Status RandomAccessFileFromSeekableReadBuffer::Close()
 
 arrow::Result<int64_t> RandomAccessFileFromSeekableReadBuffer::Tell() const
 {
-    return arrow::Result<int64_t>(in.getPosition());
+    return in.getPosition();
 }
 
 arrow::Result<int64_t> RandomAccessFileFromSeekableReadBuffer::Read(int64_t nbytes, void * out)
 {
-    int64_t bytes_read = in.readBig(reinterpret_cast<char *>(out), nbytes);
-    return arrow::Result<int64_t>(bytes_read);
+    return in.readBig(reinterpret_cast<char *>(out), nbytes);
 }
 
 arrow::Result<std::shared_ptr<arrow::Buffer>> RandomAccessFileFromSeekableReadBuffer::Read(int64_t nbytes)
 {
-    auto buffer_status = arrow::AllocateBuffer(nbytes);
-    ARROW_RETURN_NOT_OK(buffer_status);
+    ARROW_ASSIGN_OR_RAISE(auto buffer, arrow::AllocateResizableBuffer(nbytes))
+    ARROW_ASSIGN_OR_RAISE(int64_t bytes_read, Read(nbytes, buffer->mutable_data()))
 
-    auto shared_buffer = std::shared_ptr<arrow::Buffer>(std::move(std::move(*buffer_status)));
+    if (bytes_read < nbytes)
+        RETURN_NOT_OK(buffer->Resize(bytes_read));
 
-    size_t n = in.readBig(reinterpret_cast<char *>(shared_buffer->mutable_data()), nbytes);
-
-    auto read_buffer = arrow::SliceBuffer(shared_buffer, 0, n);
-    return arrow::Result<std::shared_ptr<arrow::Buffer>>(shared_buffer);
+    return buffer;
 }
 
 arrow::Status RandomAccessFileFromSeekableReadBuffer::Seek(int64_t position)
@@ -83,6 +80,43 @@ arrow::Status RandomAccessFileFromSeekableReadBuffer::Seek(int64_t position)
     return arrow::Status::OK();
 }
 
+
+ArrowInputStreamFromReadBuffer::ArrowInputStreamFromReadBuffer(ReadBuffer & in_) : in(in_), is_open{true}
+{
+}
+
+arrow::Result<int64_t> ArrowInputStreamFromReadBuffer::Read(int64_t nbytes, void * out)
+{
+    return in.readBig(reinterpret_cast<char *>(out), nbytes);
+}
+
+arrow::Result<std::shared_ptr<arrow::Buffer>> ArrowInputStreamFromReadBuffer::Read(int64_t nbytes)
+{
+    ARROW_ASSIGN_OR_RAISE(auto buffer, arrow::AllocateResizableBuffer(nbytes))
+    ARROW_ASSIGN_OR_RAISE(int64_t bytes_read, Read(nbytes, buffer->mutable_data()))
+
+    if (bytes_read < nbytes)
+        RETURN_NOT_OK(buffer->Resize(bytes_read));
+
+    return buffer;
+}
+
+arrow::Status ArrowInputStreamFromReadBuffer::Abort()
+{
+    return arrow::Status();
+}
+
+arrow::Result<int64_t> ArrowInputStreamFromReadBuffer::Tell() const
+{
+    return in.count();
+}
+
+arrow::Status ArrowInputStreamFromReadBuffer::Close()
+{
+    is_open = false;
+    return arrow::Status();
+}
+
 std::shared_ptr<arrow::io::RandomAccessFile> asArrowFile(ReadBuffer & in)
 {
     if (auto * fd_in = dynamic_cast<ReadBufferFromFileDescriptor *>(&in))
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
index bb94535549c..a10a5bcabdb 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
@@ -61,6 +61,24 @@ private:
     ARROW_DISALLOW_COPY_AND_ASSIGN(RandomAccessFileFromSeekableReadBuffer);
 };
 
+class ArrowInputStreamFromReadBuffer : public arrow::io::InputStream
+{
+public:
+    explicit ArrowInputStreamFromReadBuffer(ReadBuffer & in);
+    arrow::Result<int64_t> Read(int64_t nbytes, void* out) override;
+    arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) override;
+    arrow::Status Abort() override;
+    arrow::Result<int64_t> Tell() const override;
+    arrow::Status Close() override;
+    bool closed() const override { return !is_open; }
+
+private:
+    ReadBuffer & in;
+    bool is_open = false;
+
+    ARROW_DISALLOW_COPY_AND_ASSIGN(ArrowInputStreamFromReadBuffer);
+};
+
 std::shared_ptr<arrow::io::RandomAccessFile> asArrowFile(ReadBuffer & in);
 
 }
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 4ad7743151a..f5a4ed89387 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -4,14 +4,15 @@
 #if USE_ARROW || USE_ORC || USE_PARQUET
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 #include <common/DateLUTImpl.h>
 #include <common/types.h>
 #include <Core/Block.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
 #include <Interpreters/castColumn.h>
 #include <algorithm>
 #include <DataTypes/DataTypeLowCardinality.h>
@@ -59,9 +60,9 @@ namespace DB
 
 /// 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, MutableColumnPtr & internal_column)
+    static void fillColumnWithNumericData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
     {
-        auto & column_data = static_cast<VectorType &>(*internal_column).getData();
+        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)
@@ -78,10 +79,10 @@ namespace DB
 /// 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, MutableColumnPtr & internal_column)
+    static void fillColumnWithStringData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
     {
-        PaddedPODArray<UInt8> & column_chars_t = assert_cast<ColumnString &>(*internal_column).getChars();
-        PaddedPODArray<UInt64> & column_offsets = assert_cast<ColumnString &>(*internal_column).getOffsets();
+        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)
@@ -116,9 +117,9 @@ namespace DB
         }
     }
 
-    static void fillColumnWithBooleanData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, MutableColumnPtr & internal_column)
+    static void fillColumnWithBooleanData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
     {
-        auto & column_data = assert_cast<ColumnVector<UInt8> &>(*internal_column).getData();
+        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)
@@ -133,9 +134,9 @@ namespace DB
     }
 
 /// 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, MutableColumnPtr & internal_column)
+    static void fillColumnWithDate32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
     {
-        PaddedPODArray<UInt16> & column_data = assert_cast<ColumnVector<UInt16> &>(*internal_column).getData();
+        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)
@@ -148,7 +149,7 @@ namespace DB
                 if (days_num > DATE_LUT_MAX_DAY_NUM)
                 {
                     // TODO: will it rollback correctly?
-                    throw Exception{"Input value " + std::to_string(days_num) + " of a column \"" + internal_column->getName()
+                    throw Exception{"Input value " + std::to_string(days_num) + " of a column \"" + internal_column.getName()
                                     + "\" is greater than "
                                       "max allowed Date value, which is "
                                     + std::to_string(DATE_LUT_MAX_DAY_NUM),
@@ -161,9 +162,9 @@ namespace DB
     }
 
 /// 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, MutableColumnPtr & internal_column)
+    static void fillColumnWithDate64Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
     {
-        auto & column_data = assert_cast<ColumnVector<UInt32> &>(*internal_column).getData();
+        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)
@@ -177,9 +178,9 @@ namespace DB
         }
     }
 
-    static void fillColumnWithTimestampData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, MutableColumnPtr & internal_column)
+    static void fillColumnWithTimestampData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
     {
-        auto & column_data = assert_cast<ColumnVector<UInt32> &>(*internal_column).getData();
+        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)
@@ -213,9 +214,9 @@ namespace DB
         }
     }
 
-    static void fillColumnWithDecimalData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, MutableColumnPtr & internal_column)
+    static void fillColumnWithDecimalData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
     {
-        auto & column = assert_cast<ColumnDecimal<Decimal128> &>(*internal_column);
+        auto & column = assert_cast<ColumnDecimal<Decimal128> &>(internal_column);
         auto & column_data = column.getData();
         column_data.reserve(arrow_column->length());
 
@@ -230,9 +231,9 @@ namespace DB
     }
 
 /// Creates a null bytemap from arrow's null bitmap
-    static void fillByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column, MutableColumnPtr & bytemap)
+    static void fillByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & bytemap)
     {
-        PaddedPODArray<UInt8> & bytemap_data = assert_cast<ColumnVector<UInt8> &>(*bytemap).getData();
+        PaddedPODArray<UInt8> & bytemap_data = assert_cast<ColumnVector<UInt8> &>(bytemap).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)
@@ -244,6 +245,143 @@ namespace DB
         }
     }
 
+    static void fillOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & offsets)
+    {
+        ColumnArray::Offsets & offsets_data = assert_cast<ColumnVector<UInt64> &>(offsets).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)
+        {
+            arrow::ListArray & list_chunk = static_cast<arrow::ListArray &>(*(arrow_column->chunk(chunk_i)));
+            auto arrow_offsets_array = list_chunk.offsets();
+            auto & arrow_offsets = static_cast<arrow::Int32Array &>(*arrow_offsets_array);
+            auto start = offsets_data.back();
+            for (int64_t i = 1; i < arrow_offsets.length(); ++i)
+                offsets_data.emplace_back(start + arrow_offsets.Value(i));
+        }
+    }
+
+    static void readColumnFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column, const std::string & column_name, const std::string format_name, bool is_nullable)
+    {
+        if (internal_column.isNullable())
+        {
+            ColumnNullable & column_nullable = typeid_cast<ColumnNullable &>(internal_column);
+            readColumnFromArrowColumn(arrow_column, column_nullable.getNestedColumn(), column_name, format_name, true);
+            fillByteMapFromArrowColumn(arrow_column, column_nullable.getNullMapColumn());
+            return;
+        }
+
+        // TODO: check if a column is const?
+        if (!is_nullable && !checkColumn<ColumnArray>(internal_column) && arrow_column->null_count())
+        {
+            throw Exception
+                {
+                    "Can not insert NULL data into non-nullable column \"" + column_name + "\"",
+                    ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN
+                };
+        }
+
+        switch (arrow_column->type()->id())
+        {
+            case arrow::Type::STRING:
+            case arrow::Type::BINARY:
+                //case arrow::Type::FIXED_SIZE_BINARY:
+                fillColumnWithStringData(arrow_column, internal_column);
+                break;
+            case arrow::Type::BOOL:
+                fillColumnWithBooleanData(arrow_column, internal_column);
+                break;
+            case arrow::Type::DATE32:
+                fillColumnWithDate32Data(arrow_column, internal_column);
+                break;
+            case arrow::Type::DATE64:
+                fillColumnWithDate64Data(arrow_column, internal_column);
+                break;
+            case arrow::Type::TIMESTAMP:
+                fillColumnWithTimestampData(arrow_column, internal_column);
+                break;
+            case arrow::Type::DECIMAL:
+                //fillColumnWithNumericData<Decimal128, ColumnDecimal<Decimal128>>(arrow_column, read_column); // Have problems with trash values under NULL, but faster
+                fillColumnWithDecimalData(arrow_column, internal_column /*, internal_nested_type*/);
+                break;
+            case arrow::Type::LIST:
+            {
+                const auto * list_type = static_cast<arrow::ListType *>(arrow_column->type().get());
+                auto list_nested_type = list_type->value_type();
+                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 = static_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 = typeid_cast<ColumnArray &>(internal_column);
+                readColumnFromArrowColumn(arrow_nested_column, column_array.getData(), column_name, format_name, false);
+                fillOffsetsFromArrowListColumn(arrow_column, column_array.getOffsetsColumn());
+                break;
+            }
+#    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
+        case ARROW_NUMERIC_TYPE: \
+            fillColumnWithNumericData<CPP_NUMERIC_TYPE>(arrow_column, internal_column); \
+            break;
+
+            FOR_ARROW_NUMERIC_TYPES(DISPATCH)
+#    undef DISPATCH
+                // TODO: support TIMESTAMP_MICROS and TIMESTAMP_MILLIS with truncated micro- and milliseconds?
+                // TODO: read JSON as a string?
+                // TODO: read UUID as a string?
+            default:
+                throw Exception
+                    {
+                        "Unsupported " + format_name + " type \"" + arrow_column->type()->name() + "\" of an input column \""
+                        + column_name + "\"",
+                        ErrorCodes::UNKNOWN_TYPE
+                    };
+        }
+    }
+
+    static DataTypePtr getInternalType(std::shared_ptr<arrow::DataType> arrow_type, const DataTypePtr & column_type, const std::string & column_name, const std::string & format_name)
+    {
+        if (column_type->isNullable())
+        {
+            DataTypePtr nested_type = typeid_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
+            return makeNullable(getInternalType(arrow_type, nested_type, column_name, format_name));
+        }
+
+        if (arrow_type->id() == arrow::Type::DECIMAL)
+        {
+            const auto * decimal_type = static_cast<arrow::DecimalType *>(arrow_type.get());
+            return std::make_shared<DataTypeDecimal<Decimal128>>(decimal_type->precision(), decimal_type->scale());
+        }
+
+        if (arrow_type->id() == arrow::Type::LIST)
+        {
+            const auto * list_type = static_cast<arrow::ListType *>(arrow_type.get());
+            auto list_nested_type = list_type->value_type();
+
+            const DataTypeArray * array_type = typeid_cast<const DataTypeArray *>(column_type.get());
+            if (!array_type)
+                throw Exception{"Cannot convert arrow LIST type to a not Array ClickHouse type " + column_type->getName(), ErrorCodes::CANNOT_CONVERT_TYPE};
+
+            return std::make_shared<DataTypeArray>(getInternalType(list_nested_type, array_type->getNestedType(), column_name, format_name));
+        }
+
+        if (const auto * internal_type_it = std::find_if(arrow_type_to_internal_type.begin(), arrow_type_to_internal_type.end(),
+                                                              [=](auto && elem) { return elem.first == arrow_type->id(); });
+            internal_type_it != arrow_type_to_internal_type.end())
+        {
+            return DataTypeFactory::instance().get(internal_type_it->second);
+        }
+        throw Exception
+            {
+                "The type \"" + arrow_type->name() + "\" of an input column \"" + column_name + "\" is not supported for conversion from a " + format_name + " data format",
+                ErrorCodes::CANNOT_CONVERT_TYPE
+            };
+    }
+
     void ArrowColumnToCHColumn::arrowTableToCHChunk(Chunk & res, std::shared_ptr<arrow::Table> & table,
                                                     const Block & header, std::string format_name)
     {
@@ -272,99 +410,16 @@ namespace DB
                                 ErrorCodes::THERE_IS_NO_COLUMN};
 
             std::shared_ptr<arrow::ChunkedArray> arrow_column = name_to_column_ptr[header_column.name];
-            arrow::Type::type arrow_type = arrow_column->type()->id();
 
-            // TODO: check if a column is const?
-            if (!column_type->isNullable() && arrow_column->null_count())
-            {
-                throw Exception{"Can not insert NULL data into non-nullable column \"" + header_column.name + "\"",
-                                ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN};
-            }
+            DataTypePtr internal_type = getInternalType(arrow_column->type(), column_type, header_column.name, format_name);
 
-            const bool target_column_is_nullable = column_type->isNullable() || arrow_column->null_count();
-
-            DataTypePtr internal_nested_type;
-
-            if (arrow_type == arrow::Type::DECIMAL)
-            {
-                const auto * decimal_type = static_cast<arrow::DecimalType *>(arrow_column->type().get());
-                internal_nested_type = std::make_shared<DataTypeDecimal<Decimal128>>(decimal_type->precision(),
-                                                                                     decimal_type->scale());
-            }
-            else if (const auto * internal_type_it = std::find_if(arrow_type_to_internal_type.begin(), arrow_type_to_internal_type.end(),
-                [=](auto && elem) { return elem.first == arrow_type; });
-                internal_type_it != arrow_type_to_internal_type.end())
-            {
-                internal_nested_type = DataTypeFactory::instance().get(internal_type_it->second);
-            }
-            else
-            {
-                throw Exception{"The type \"" + arrow_column->type()->name() + "\" of an input column \"" + header_column.name
-                        + "\" is not supported for conversion from a " + format_name + " data format",
-                        ErrorCodes::CANNOT_CONVERT_TYPE};
-            }
-
-            const DataTypePtr internal_type = target_column_is_nullable ? makeNullable(internal_nested_type)
-                                                                        : internal_nested_type;
+            MutableColumnPtr read_column = internal_type->createColumn();
+            readColumnFromArrowColumn(arrow_column, *read_column, header_column.name, format_name, false);
 
             ColumnWithTypeAndName column;
             column.name = header_column.name;
             column.type = internal_type;
-
-            /// Data
-            MutableColumnPtr read_column = internal_nested_type->createColumn();
-            switch (arrow_type)
-            {
-                case arrow::Type::STRING:
-                case arrow::Type::BINARY:
-                    //case arrow::Type::FIXED_SIZE_BINARY:
-                    fillColumnWithStringData(arrow_column, read_column);
-                    break;
-                case arrow::Type::BOOL:
-                    fillColumnWithBooleanData(arrow_column, read_column);
-                    break;
-                case arrow::Type::DATE32:
-                    fillColumnWithDate32Data(arrow_column, read_column);
-                    break;
-                case arrow::Type::DATE64:
-                    fillColumnWithDate64Data(arrow_column, read_column);
-                    break;
-                case arrow::Type::TIMESTAMP:
-                    fillColumnWithTimestampData(arrow_column, read_column);
-                    break;
-                case arrow::Type::DECIMAL:
-                    //fillColumnWithNumericData<Decimal128, ColumnDecimal<Decimal128>>(arrow_column, read_column); // Have problems with trash values under NULL, but faster
-                    fillColumnWithDecimalData(arrow_column, read_column /*, internal_nested_type*/);
-
-                    break;
-#    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
-        case ARROW_NUMERIC_TYPE: \
-            fillColumnWithNumericData<CPP_NUMERIC_TYPE>(arrow_column, read_column); \
-            break;
-
-                FOR_ARROW_NUMERIC_TYPES(DISPATCH)
-#    undef DISPATCH
-                    // TODO: support TIMESTAMP_MICROS and TIMESTAMP_MILLIS with truncated micro- and milliseconds?
-                    // TODO: read JSON as a string?
-                    // TODO: read UUID as a string?
-                default:
-                    throw Exception
-                    {
-                            "Unsupported " + format_name + " type \"" + arrow_column->type()->name() + "\" of an input column \""
-                            + header_column.name + "\"",
-                            ErrorCodes::UNKNOWN_TYPE
-                    };
-            }
-
-
-            if (column.type->isNullable())
-            {
-                MutableColumnPtr null_bytemap = DataTypeUInt8().createColumn();
-                fillByteMapFromArrowColumn(arrow_column, null_bytemap);
-                column.column = ColumnNullable::create(std::move(read_column), std::move(null_bytemap));
-            }
-            else
-                column.column = std::move(read_column);
+            column.column = std::move(read_column);
 
             column.column = castColumn(column, header_column.type);
             column.type = header_column.type;
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index 95ee42b4d09..cd576916364 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -344,7 +344,7 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::Node
             if (target.isEnum())
             {
                 const auto & enum_type = dynamic_cast<const IDataTypeEnum &>(*target_type);
-                std::vector<Field> symbol_mapping;
+                Row symbol_mapping;
                 for (size_t i = 0; i < root_node->names(); i++)
                 {
                     symbol_mapping.push_back(enum_type.castToValue(root_node->nameAt(i)));
diff --git a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
index 36b57e242d7..2d820a5985f 100644
--- a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
@@ -28,7 +28,7 @@ bool BinaryRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 
 void BinaryRowInputFormat::readPrefix()
 {
-    /// NOTE The header is completely ignored. This can be easily improved.
+    /// NOTE: The header is completely ignored. This can be easily improved.
 
     UInt64 columns = 0;
     String tmp;
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index c1fce04f3b2..0e9968bec17 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -5,12 +5,16 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnArray.h>
 #include <Core/callOnTypeIndex.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypeArray.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <arrow/api.h>
+#include <arrow/builder.h>
+#include <arrow/type.h>
 #include <arrow/util/decimal.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
@@ -47,12 +51,6 @@ namespace DB
         {"FixedString", arrow::utf8()},
     };
 
-    static const PaddedPODArray<UInt8> * extractNullBytemapPtr(ColumnPtr column)
-    {
-        ColumnPtr null_column = assert_cast<const ColumnNullable &>(*column).getNullMapColumnPtr();
-        const PaddedPODArray<UInt8> & null_bytemap = assert_cast<const ColumnVector<UInt8> &>(*null_column).getData();
-        return &null_bytemap;
-    }
 
     static void checkStatus(const arrow::Status & status, const String & column_name, const String & format_name)
     {
@@ -63,12 +61,14 @@ namespace DB
     template <typename NumericType, typename ArrowBuilderType>
     static void fillArrowArrayWithNumericColumnData(
         ColumnPtr write_column,
-        std::shared_ptr<arrow::Array> & arrow_array,
         const PaddedPODArray<UInt8> * null_bytemap,
-        const String & format_name)
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
     {
         const PaddedPODArray<NumericType> & internal_data = assert_cast<const ColumnVector<NumericType> &>(*write_column).getData();
-        ArrowBuilderType builder;
+        ArrowBuilderType & builder = assert_cast<ArrowBuilderType &>(*array_builder);
         arrow::Status status;
 
         const UInt8 * arrow_null_bytemap_raw_ptr = nullptr;
@@ -76,38 +76,75 @@ namespace DB
         if (null_bytemap)
         {
             /// Invert values since Arrow interprets 1 as a non-null value, while CH as a null
-            arrow_null_bytemap.reserve(null_bytemap->size());
-            for (auto is_null : *null_bytemap)
-                arrow_null_bytemap.emplace_back(!is_null);
+            arrow_null_bytemap.reserve(end - start);
+            for (size_t i = start; i < end; ++i)
+                arrow_null_bytemap.template emplace_back(!(*null_bytemap)[i]);
 
             arrow_null_bytemap_raw_ptr = arrow_null_bytemap.data();
         }
 
         if constexpr (std::is_same_v<NumericType, UInt8>)
             status = builder.AppendValues(
-                reinterpret_cast<const uint8_t *>(internal_data.data()),
-                internal_data.size(),
+                reinterpret_cast<const uint8_t *>(internal_data.data() + start),
+                end - start,
                 reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
         else
-            status = builder.AppendValues(internal_data.data(), internal_data.size(), reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
+            status = builder.AppendValues(internal_data.data() + start, end - start, reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
         checkStatus(status, write_column->getName(), format_name);
+    }
 
-        status = builder.Finish(&arrow_array);
-        checkStatus(status, write_column->getName(), format_name);
+    static void fillArrowArray(
+        const String & column_name,
+        ColumnPtr & column,
+        const std::shared_ptr<const IDataType> & column_type,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        arrow::ArrayBuilder * array_builder,
+        String format_name,
+        size_t start,
+        size_t end);
+
+    static void fillArrowArrayWithArrayColumnData(
+        const String & column_name,
+        ColumnPtr & column,
+        const std::shared_ptr<const IDataType> & column_type,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        arrow::ArrayBuilder * array_builder,
+        String format_name,
+        size_t start,
+        size_t end)
+    {
+        const auto * column_array = static_cast<const ColumnArray *>(column.get());
+        ColumnPtr nested_column = column_array->getDataPtr();
+        DataTypePtr nested_type = typeid_cast<const DataTypeArray *>(column_type.get())->getNestedType();
+        const auto & offsets = column_array->getOffsets();
+
+        arrow::ListBuilder & builder = assert_cast<arrow::ListBuilder &>(*array_builder);
+        arrow::ArrayBuilder * value_builder = builder.value_builder();
+        arrow::Status components_status;
+
+        for (size_t array_idx = start; array_idx < end; ++array_idx)
+        {
+            /// Start new array
+            components_status = builder.Append();
+            checkStatus(components_status, nested_column->getName(), format_name);
+            fillArrowArray(column_name, nested_column, nested_type, null_bytemap, value_builder, format_name, offsets[array_idx - 1], offsets[array_idx]);
+        }
     }
 
     template <typename ColumnType>
     static void fillArrowArrayWithStringColumnData(
         ColumnPtr write_column,
-        std::shared_ptr<arrow::Array> & arrow_array,
         const PaddedPODArray<UInt8> * null_bytemap,
-        const String & format_name)
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
     {
         const auto & internal_column = assert_cast<const ColumnType &>(*write_column);
-        arrow::StringBuilder builder;
+        arrow::StringBuilder & builder = assert_cast<arrow::StringBuilder &>(*array_builder);
         arrow::Status status;
 
-        for (size_t string_i = 0, size = internal_column.size(); string_i < size; ++string_i)
+        for (size_t string_i = start; string_i < end; ++string_i)
         {
             if (null_bytemap && (*null_bytemap)[string_i])
             {
@@ -121,23 +158,22 @@ namespace DB
 
             checkStatus(status, write_column->getName(), format_name);
         }
-
-        status = builder.Finish(&arrow_array);
-        checkStatus(status, write_column->getName(), format_name);
     }
 
     static void fillArrowArrayWithDateColumnData(
         ColumnPtr write_column,
-        std::shared_ptr<arrow::Array> & arrow_array,
         const PaddedPODArray<UInt8> * null_bytemap,
-        const String & format_name)
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
     {
         const PaddedPODArray<UInt16> & internal_data = assert_cast<const ColumnVector<UInt16> &>(*write_column).getData();
         //arrow::Date32Builder date_builder;
-        arrow::UInt16Builder builder;
+        arrow::UInt16Builder & builder = assert_cast<arrow::UInt16Builder &>(*array_builder);
         arrow::Status status;
 
-        for (size_t value_i = 0, size = internal_data.size(); value_i < size; ++value_i)
+        for (size_t value_i = start; value_i < end; ++value_i)
         {
             if (null_bytemap && (*null_bytemap)[value_i])
                 status = builder.AppendNull();
@@ -146,23 +182,22 @@ namespace DB
                 status = builder.Append(internal_data[value_i]);
             checkStatus(status, write_column->getName(), format_name);
         }
-
-        status = builder.Finish(&arrow_array);
-        checkStatus(status, write_column->getName(), format_name);
     }
 
     static void fillArrowArrayWithDateTimeColumnData(
         ColumnPtr write_column,
-        std::shared_ptr<arrow::Array> & arrow_array,
         const PaddedPODArray<UInt8> * null_bytemap,
-        const String & format_name)
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
     {
         const auto & internal_data = assert_cast<const ColumnVector<UInt32> &>(*write_column).getData();
         //arrow::Date64Builder builder;
-        arrow::UInt32Builder builder;
+        arrow::UInt32Builder & builder = assert_cast<arrow::UInt32Builder &>(*array_builder);
         arrow::Status status;
 
-        for (size_t value_i = 0, size = internal_data.size(); value_i < size; ++value_i)
+        for (size_t value_i = start; value_i < end; ++value_i)
         {
             if (null_bytemap && (*null_bytemap)[value_i])
                 status = builder.AppendNull();
@@ -173,24 +208,98 @@ namespace DB
 
             checkStatus(status, write_column->getName(), format_name);
         }
+    }
 
-        status = builder.Finish(&arrow_array);
-        checkStatus(status, write_column->getName(), format_name);
+    static void fillArrowArray(
+        const String & column_name,
+        ColumnPtr & column,
+        const std::shared_ptr<const IDataType> & column_type,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        arrow::ArrayBuilder * array_builder,
+        String format_name,
+        size_t start,
+        size_t end)
+    {
+        const String column_type_name = column_type->getFamilyName();
+
+        if ("Nullable" == column_type_name)
+        {
+            const ColumnNullable * column_nullable = checkAndGetColumn<ColumnNullable>(column.get());
+            ColumnPtr nested_column = column_nullable->getNestedColumnPtr();
+            DataTypePtr nested_type = typeid_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
+            const ColumnPtr & null_column = column_nullable->getNullMapColumnPtr();
+            const PaddedPODArray<UInt8> & bytemap = assert_cast<const ColumnVector<UInt8> &>(*null_column).getData();
+            fillArrowArray(column_name, nested_column, nested_type, &bytemap, array_builder, format_name, start, end);
+        }
+        else if ("String" == column_type_name)
+        {
+            fillArrowArrayWithStringColumnData<ColumnString>(column, null_bytemap, format_name, array_builder, start, end);
+        }
+        else if ("FixedString" == column_type_name)
+        {
+            fillArrowArrayWithStringColumnData<ColumnFixedString>(column, null_bytemap, format_name, array_builder, start, end);
+        }
+        else if ("Date" == column_type_name)
+        {
+            fillArrowArrayWithDateColumnData(column, null_bytemap, format_name, array_builder, start, end);
+        }
+        else if ("DateTime" == column_type_name)
+        {
+            fillArrowArrayWithDateTimeColumnData(column, null_bytemap, format_name, array_builder, start, end);
+        }
+        else if ("Array" == column_type_name)
+        {
+            fillArrowArrayWithArrayColumnData(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end);
+        }
+        else if (isDecimal(column_type))
+        {
+            auto fill_decimal = [&](const auto & types) -> bool
+            {
+                using Types = std::decay_t<decltype(types)>;
+                using ToDataType = typename Types::LeftType;
+                if constexpr (
+                    std::is_same_v<ToDataType,DataTypeDecimal<Decimal32>>
+                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal64>>
+                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal128>>)
+                {
+                    fillArrowArrayWithDecimalColumnData<ToDataType>(column, null_bytemap, array_builder, format_name, start, end);
+                }
+                return false;
+            };
+            callOnIndexAndDataType<void>(column_type->getTypeId(), fill_decimal);
+        }
+    #define DISPATCH(CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE) \
+                else if (#CPP_NUMERIC_TYPE == column_type_name) \
+                { \
+                    fillArrowArrayWithNumericColumnData<CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE>(column, null_bytemap, format_name, array_builder, start, end); \
+                }
+
+        FOR_INTERNAL_NUMERIC_TYPES(DISPATCH)
+    #undef DISPATCH
+        else
+        {
+            throw Exception
+                {
+                    "Internal type \"" + column_type_name + "\" of a column \"" + column_name + "\" is not supported for conversion into a " + format_name + " data format",
+                    ErrorCodes::UNKNOWN_TYPE
+                };
+        }
     }
 
     template <typename DataType>
     static void fillArrowArrayWithDecimalColumnData(
         ColumnPtr write_column,
-        std::shared_ptr<arrow::Array> & arrow_array,
         const PaddedPODArray<UInt8> * null_bytemap,
-        const DataType * decimal_type,
-        const String & format_name)
+        arrow::ArrayBuilder * array_builder,
+        const String & format_name,
+        size_t start,
+        size_t end)
     {
         const auto & column = static_cast<const typename DataType::ColumnType &>(*write_column);
-        arrow::DecimalBuilder builder(arrow::decimal(decimal_type->getPrecision(), decimal_type->getScale()));
+        arrow::DecimalBuilder & builder = assert_cast<arrow::DecimalBuilder &>(*array_builder);
         arrow::Status status;
 
-        for (size_t value_i = 0, size = column.size(); value_i < size; ++value_i)
+        for (size_t value_i = start; value_i < end; ++value_i)
         {
             if (null_bytemap && (*null_bytemap)[value_i])
                 status = builder.AppendNull();
@@ -200,10 +309,63 @@ namespace DB
 
             checkStatus(status, write_column->getName(), format_name);
         }
-        status = builder.Finish(&arrow_array);
         checkStatus(status, write_column->getName(), format_name);
     }
 
+    static std::shared_ptr<arrow::DataType> getArrowType(DataTypePtr column_type, const std::string & column_name, const std::string & format_name, bool * is_column_nullable)
+    {
+        if (column_type->isNullable())
+        {
+            DataTypePtr nested_type = typeid_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
+            auto arrow_type = getArrowType(nested_type, column_name, format_name, is_column_nullable);
+            *is_column_nullable = true;
+            return arrow_type;
+        }
+
+        if (isDecimal(column_type))
+        {
+            std::shared_ptr<arrow::DataType> arrow_type;
+            const auto create_arrow_type = [&](const auto & types) -> bool {
+                using Types = std::decay_t<decltype(types)>;
+                using ToDataType = typename Types::LeftType;
+
+                if constexpr (
+                    std::is_same_v<ToDataType, DataTypeDecimal<Decimal32>>
+                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal64>>
+                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal128>>)
+                {
+                    const auto & decimal_type = static_cast<const ToDataType *>(column_type.get());
+                    arrow_type = arrow::decimal(decimal_type->getPrecision(), decimal_type->getScale());
+                }
+
+                return false;
+            };
+            callOnIndexAndDataType<void>(column_type->getTypeId(), create_arrow_type);
+            return arrow_type;
+        }
+
+        if (isArray(column_type))
+        {
+            auto nested_type = typeid_cast<const DataTypeArray *>(column_type.get())->getNestedType();
+            auto nested_arrow_type = getArrowType(nested_type, column_name, format_name, is_column_nullable);
+            return arrow::list(nested_arrow_type);
+        }
+
+        const std::string type_name = column_type->getFamilyName();
+        if (const auto * arrow_type_it = std::find_if(
+                internal_type_to_arrow_type.begin(),
+                internal_type_to_arrow_type.end(),
+                [=](auto && elem) { return elem.first == type_name; });
+            arrow_type_it != internal_type_to_arrow_type.end())
+        {
+            return arrow_type_it->second;
+        }
+
+        throw Exception{"The type \"" + column_name + "\" of a column \"" + column_name + "\""
+                             " is not supported for conversion into a " + format_name + " data format",
+                             ErrorCodes::UNKNOWN_TYPE};
+    }
+
     void CHColumnToArrowColumn::chChunkToArrowTable(
         std::shared_ptr<arrow::Table> & res,
         const Block & header,
@@ -224,101 +386,20 @@ namespace DB
             column.column = recursiveRemoveLowCardinality(chunk.getColumns()[column_i]);
             column.type = recursiveRemoveLowCardinality(column.type);
 
-            const bool is_column_nullable = column.type->isNullable();
-            const auto & column_nested_type
-                = is_column_nullable ? static_cast<const DataTypeNullable *>(column.type.get())->getNestedType() : column.type;
-            const String column_nested_type_name = column_nested_type->getFamilyName();
+            bool is_column_nullable = false;
+            auto arrow_type = getArrowType(column.type, column.name, format_name, &is_column_nullable);
+            arrow_fields.emplace_back(std::make_shared<arrow::Field>(column.name, arrow_type, is_column_nullable));
 
-            if (isDecimal(column_nested_type))
-            {
-                const auto add_decimal_field = [&](const auto & types) -> bool {
-                    using Types = std::decay_t<decltype(types)>;
-                    using ToDataType = typename Types::LeftType;
+            arrow::MemoryPool* pool = arrow::default_memory_pool();
+            std::unique_ptr<arrow::ArrayBuilder> array_builder;
+            arrow::Status status = MakeBuilder(pool, arrow_fields[column_i]->type(), &array_builder);
+            checkStatus(status, column.column->getName(), format_name);
 
-                    if constexpr (
-                        std::is_same_v<ToDataType, DataTypeDecimal<Decimal32>>
-                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal64>>
-                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal128>>)
-                    {
-                        const auto & decimal_type = static_cast<const ToDataType *>(column_nested_type.get());
-                        arrow_fields.emplace_back(std::make_shared<arrow::Field>(
-                            column.name, arrow::decimal(decimal_type->getPrecision(), decimal_type->getScale()), is_column_nullable));
-                    }
-
-                    return false;
-                };
-                callOnIndexAndDataType<void>(column_nested_type->getTypeId(), add_decimal_field);
-            }
-            else
-            {
-                if (const auto * arrow_type_it = std::find_if(internal_type_to_arrow_type.begin(), internal_type_to_arrow_type.end(),
-                    [=](auto && elem) { return elem.first == column_nested_type_name; });
-                    arrow_type_it != internal_type_to_arrow_type.end())
-                {
-                    arrow_fields.emplace_back(std::make_shared<arrow::Field>(column.name, arrow_type_it->second, is_column_nullable));
-                } else
-                {
-                    throw Exception{"The type \"" + column_nested_type_name + "\" of a column \"" + column.name + "\""
-                                    " is not supported for conversion into a " + format_name + " data format",
-                                    ErrorCodes::UNKNOWN_TYPE};
-                }
-            }
-
-            ColumnPtr nested_column
-                = is_column_nullable ? assert_cast<const ColumnNullable &>(*column.column).getNestedColumnPtr() : column.column;
-            const PaddedPODArray<UInt8> * null_bytemap = is_column_nullable ? extractNullBytemapPtr(column.column) : nullptr;
+            fillArrowArray(column.name, column.column, column.type, nullptr, array_builder.get(), format_name, 0, column.column->size());
 
             std::shared_ptr<arrow::Array> arrow_array;
-
-            if ("String" == column_nested_type_name)
-            {
-                fillArrowArrayWithStringColumnData<ColumnString>(nested_column, arrow_array, null_bytemap, format_name);
-            }
-            else if ("FixedString" == column_nested_type_name)
-            {
-                fillArrowArrayWithStringColumnData<ColumnFixedString>(nested_column, arrow_array, null_bytemap, format_name);
-            }
-            else if ("Date" == column_nested_type_name)
-            {
-                fillArrowArrayWithDateColumnData(nested_column, arrow_array, null_bytemap, format_name);
-            }
-            else if ("DateTime" == column_nested_type_name)
-            {
-                fillArrowArrayWithDateTimeColumnData(nested_column, arrow_array, null_bytemap, format_name);
-            }
-            else if (isDecimal(column_nested_type))
-            {
-                auto fill_decimal = [&](const auto & types) -> bool
-                {
-                    using Types = std::decay_t<decltype(types)>;
-                    using ToDataType = typename Types::LeftType;
-                    if constexpr (
-                        std::is_same_v<ToDataType,DataTypeDecimal<Decimal32>>
-                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal64>>
-                    || std::is_same_v<ToDataType, DataTypeDecimal<Decimal128>>)
-                    {
-                        const auto & decimal_type = static_cast<const ToDataType *>(column_nested_type.get());
-                        fillArrowArrayWithDecimalColumnData(nested_column, arrow_array, null_bytemap, decimal_type, format_name);
-                    }
-                    return false;
-                };
-                callOnIndexAndDataType<void>(column_nested_type->getTypeId(), fill_decimal);
-            }
-#define DISPATCH(CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE) \
-            else if (#CPP_NUMERIC_TYPE == column_nested_type_name) \
-            { \
-                fillArrowArrayWithNumericColumnData<CPP_NUMERIC_TYPE, ARROW_BUILDER_TYPE>(nested_column, arrow_array, null_bytemap, format_name); \
-            }
-
-            FOR_INTERNAL_NUMERIC_TYPES(DISPATCH)
-#undef DISPATCH
-            else
-            {
-                throw Exception{"Internal type \"" + column_nested_type_name + "\" of a column \"" + column.name + "\""
-                                " is not supported for conversion into a " + format_name + " data format",
-                                ErrorCodes::UNKNOWN_TYPE};
-            }
-
+            status = array_builder->Finish(&arrow_array);
+            checkStatus(status, column.column->getName(), format_name);
             arrow_arrays.emplace_back(std::move(arrow_array));
         }
 
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
index 00381ab96d0..4ccc0db4cfe 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
@@ -201,7 +201,10 @@ void CSVRowInputFormat::readPrefix()
             return;
         }
         else
+        {
             skipRow(in, format_settings.csv, num_columns);
+            setupAllColumnsByTableSchema();
+        }
     }
     else if (!column_mapping->is_set)
         setupAllColumnsByTableSchema();
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h
index 51ed451417c..0957cd1d681 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h
@@ -50,9 +50,9 @@ private:
     struct Action
     {
         enum Type { POP, PUSH, READ };
-        Type type;
-        capnp::StructSchema::Field field = {};
-        BlockPositionList columns = {};
+        Type type{};
+        capnp::StructSchema::Field field{};
+        BlockPositionList columns{};
     };
 
     // Wrapper for classes that could throw in destructor
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index caf57ded8b7..cc9ae5e65bb 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -144,9 +144,9 @@ class ReplaceLiteralsVisitor
 {
 public:
     LiteralsInfo replaced_literals;
-    const Context & context;
+    ContextPtr context;
 
-    explicit ReplaceLiteralsVisitor(const Context & context_) : context(context_) { }
+    explicit ReplaceLiteralsVisitor(ContextPtr context_) : context(context_) { }
 
     void visit(ASTPtr & ast, bool force_nullable)
     {
@@ -293,7 +293,7 @@ private:
 /// E.g. template of "position('some string', 'other string') != 0" is
 /// ["position", "(", DataTypeString, ",", DataTypeString, ")", "!=", DataTypeUInt64]
 ConstantExpressionTemplate::TemplateStructure::TemplateStructure(LiteralsInfo & replaced_literals, TokenIterator expression_begin, TokenIterator expression_end,
-                                                                 ASTPtr & expression, const IDataType & result_type, bool null_as_default_, const Context & context)
+                                                                 ASTPtr & expression, const IDataType & result_type, bool null_as_default_, ContextPtr context)
 {
     null_as_default = null_as_default_;
 
@@ -363,7 +363,7 @@ size_t ConstantExpressionTemplate::TemplateStructure::getTemplateHash(const ASTP
     hash_state.update(salt);
 
     IAST::Hash res128;
-    hash_state.get128(res128.first, res128.second);
+    hash_state.get128(res128);
     size_t res = 0;
     boost::hash_combine(res, res128.first);
     boost::hash_combine(res, res128.second);
@@ -377,7 +377,7 @@ ConstantExpressionTemplate::Cache::getFromCacheOrConstruct(const DataTypePtr & r
                                                            TokenIterator expression_begin,
                                                            TokenIterator expression_end,
                                                            const ASTPtr & expression_,
-                                                           const Context & context,
+                                                           ContextPtr context,
                                                            bool * found_in_cache,
                                                            const String & salt)
 {
@@ -385,7 +385,7 @@ ConstantExpressionTemplate::Cache::getFromCacheOrConstruct(const DataTypePtr & r
     ASTPtr expression = expression_->clone();
     ReplaceLiteralsVisitor visitor(context);
     visitor.visit(expression, result_column_type->isNullable() || null_as_default);
-    ReplaceQueryParameterVisitor param_visitor(context.getQueryParameters());
+    ReplaceQueryParameterVisitor param_visitor(context->getQueryParameters());
     param_visitor.visit(expression);
 
     size_t template_hash = TemplateStructure::getTemplateHash(expression, visitor.replaced_literals, result_column_type, null_as_default, salt);
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.h b/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
index 4317cf4a3da..6659243df63 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
@@ -23,7 +23,7 @@ class ConstantExpressionTemplate : boost::noncopyable
     struct TemplateStructure : boost::noncopyable
     {
         TemplateStructure(LiteralsInfo & replaced_literals, TokenIterator expression_begin, TokenIterator expression_end,
-                          ASTPtr & expr, const IDataType & result_type, bool null_as_default_, const Context & context);
+                          ASTPtr & expr, const IDataType & result_type, bool null_as_default_, ContextPtr context);
 
         static void addNodesToCastResult(const IDataType & result_column_type, ASTPtr & expr, bool null_as_default);
         static size_t getTemplateHash(const ASTPtr & expression, const LiteralsInfo & replaced_literals,
@@ -59,7 +59,7 @@ public:
                                                      TokenIterator expression_begin,
                                                      TokenIterator expression_end,
                                                      const ASTPtr & expression_,
-                                                     const Context & context,
+                                                     ContextPtr context,
                                                      bool * found_in_cache = nullptr,
                                                      const String & salt = {});
     };
diff --git a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
index 5108650ff0d..ebf0384445c 100644
--- a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
@@ -17,20 +17,20 @@ void MarkdownRowOutputFormat::writePrefix()
     for (size_t i = 0; i < columns; ++i)
     {
         writeEscapedString(header.safeGetByPosition(i).name, out);
-        writeCString(" | ", out);
+        if (i == (columns - 1))
+            writeCString(" |", out);
+        else
+            writeCString(" | ", out);
     }
     writeCString("\n|", out);
     String left_alignment = ":-|";
-    String central_alignment = ":-:|";
     String right_alignment = "-:|";
     for (size_t i = 0; i < columns; ++i)
     {
-        if (isInteger(types[i]))
+        if (types[i]->shouldAlignRightInPrettyFormats())
             writeString(right_alignment, out);
-        else if (isString(types[i]))
-            writeString(left_alignment, out);
         else
-            writeString(central_alignment, out);
+            writeString(left_alignment, out);
     }
     writeChar('\n', out);
 }
diff --git a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
index 9733d479a77..0f73349c271 100644
--- a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
@@ -40,7 +40,7 @@ void MySQLOutputFormat::initialize()
             packet_endpoint->sendPacket(getColumnDefinition(column_name, data_types[i]->getTypeId()));
         }
 
-        if (!(context->mysql.client_capabilities & Capability::CLIENT_DEPRECATE_EOF))
+        if (!(getContext()->mysql.client_capabilities & Capability::CLIENT_DEPRECATE_EOF))
         {
             packet_endpoint->sendPacket(EOFPacket(0, 0));
         }
@@ -64,7 +64,7 @@ void MySQLOutputFormat::finalize()
 {
     size_t affected_rows = 0;
     std::string human_readable_info;
-    if (QueryStatus * process_list_elem = context->getProcessListElement())
+    if (QueryStatus * process_list_elem = getContext()->getProcessListElement())
     {
         CurrentThread::finalizePerformanceCounters();
         QueryStatusInfo info = process_list_elem->getInfo();
@@ -78,10 +78,11 @@ void MySQLOutputFormat::finalize()
 
     const auto & header = getPort(PortKind::Main).getHeader();
     if (header.columns() == 0)
-        packet_endpoint->sendPacket(OKPacket(0x0, context->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
-    else
-    if (context->mysql.client_capabilities & CLIENT_DEPRECATE_EOF)
-        packet_endpoint->sendPacket(OKPacket(0xfe, context->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
+        packet_endpoint->sendPacket(
+            OKPacket(0x0, getContext()->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
+    else if (getContext()->mysql.client_capabilities & CLIENT_DEPRECATE_EOF)
+        packet_endpoint->sendPacket(
+            OKPacket(0xfe, getContext()->mysql.client_capabilities, affected_rows, 0, 0, "", human_readable_info), true);
     else
         packet_endpoint->sendPacket(EOFPacket(0, 0), true);
 }
diff --git a/src/Processors/Formats/Impl/MySQLOutputFormat.h b/src/Processors/Formats/Impl/MySQLOutputFormat.h
index c47bbaadc33..01a892410df 100644
--- a/src/Processors/Formats/Impl/MySQLOutputFormat.h
+++ b/src/Processors/Formats/Impl/MySQLOutputFormat.h
@@ -15,21 +15,20 @@ namespace DB
 class IColumn;
 class IDataType;
 class WriteBuffer;
-class Context;
 
 /** A stream for outputting data in a binary line-by-line format.
   */
-class MySQLOutputFormat final : public IOutputFormat
+class MySQLOutputFormat final : public IOutputFormat, WithConstContext
 {
 public:
     MySQLOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & settings_);
 
     String getName() const override { return "MySQLOutputFormat"; }
 
-    void setContext(const Context & context_)
+    void setContext(ContextConstPtr context_)
     {
-        context = &context_;
-        packet_endpoint = std::make_unique<MySQLProtocol::PacketEndpoint>(out, const_cast<uint8_t &>(context_.mysql.sequence_id)); /// TODO: fix it
+        context = context_;
+        packet_endpoint = std::make_unique<MySQLProtocol::PacketEndpoint>(out, const_cast<uint8_t &>(getContext()->mysql.sequence_id)); /// TODO: fix it
     }
 
     void consume(Chunk) override;
@@ -40,10 +39,8 @@ public:
     void initialize();
 
 private:
-
     bool initialized = false;
 
-    const Context * context = nullptr;
     std::unique_ptr<MySQLProtocol::PacketEndpoint> packet_endpoint;
     FormatSettings format_settings;
     DataTypes data_types;
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
index 7776a904f1c..24b524faeaf 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
@@ -19,6 +19,13 @@ namespace ErrorCodes
     extern const int CANNOT_READ_ALL_DATA;
 }
 
+#define THROW_ARROW_NOT_OK(status)                                     \
+    do                                                                 \
+    {                                                                  \
+        if (::arrow::Status _s = (status); !_s.ok())                   \
+            throw Exception(_s.ToString(), ErrorCodes::BAD_ARGUMENTS); \
+    } while (false)
+
 ORCBlockInputFormat::ORCBlockInputFormat(ReadBuffer & in_, Block header_) : IInputFormat(std::move(header_), in_)
 {
 }
@@ -28,21 +35,26 @@ Chunk ORCBlockInputFormat::generate()
     Chunk res;
     const Block & header = getPort().getHeader();
 
-    if (file_reader)
+    if (!file_reader)
+        prepareReader();
+
+    if (stripe_current >= stripe_total)
         return res;
 
-    arrow::Status open_status = arrow::adapters::orc::ORCFileReader::Open(asArrowFile(in), arrow::default_memory_pool(), &file_reader);
-    if (!open_status.ok())
-        throw Exception(open_status.ToString(), ErrorCodes::BAD_ARGUMENTS);
+    std::shared_ptr<arrow::RecordBatch> batch_result;
+    arrow::Status batch_status = file_reader->ReadStripe(stripe_current, include_indices, &batch_result);
+    if (!batch_status.ok())
+        throw ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA,
+                               "Error while reading batch of ORC data: {}", batch_status.ToString());
 
-    std::shared_ptr<arrow::Table> table;
-    arrow::Status read_status = file_reader->Read(&table);
-    if (!read_status.ok())
-        throw ParsingException{"Error while reading ORC data: " + read_status.ToString(),
-                        ErrorCodes::CANNOT_READ_ALL_DATA};
+    auto table_result = arrow::Table::FromRecordBatches({batch_result});
+    if (!table_result.ok())
+        throw ParsingException(ErrorCodes::CANNOT_READ_ALL_DATA,
+                               "Error while reading batch of ORC data: {}", table_result.status().ToString());
 
-    ArrowColumnToCHColumn::arrowTableToCHChunk(res, table, header, "ORC");
+    ++stripe_current;
 
+    ArrowColumnToCHColumn::arrowTableToCHChunk(res, *table_result, header, "ORC");
     return res;
 }
 
@@ -51,6 +63,39 @@ void ORCBlockInputFormat::resetParser()
     IInputFormat::resetParser();
 
     file_reader.reset();
+    include_indices.clear();
+    stripe_current = 0;
+}
+
+size_t countIndicesForType(std::shared_ptr<arrow::DataType> type)
+{
+    if (type->id() == arrow::Type::LIST)
+        return countIndicesForType(static_cast<arrow::ListType *>(type.get())->value_type()) + 1;
+
+    return 1;
+}
+
+void ORCBlockInputFormat::prepareReader()
+{
+    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));
+
+    int index = 0;
+    for (int i = 0; i < schema->num_fields(); ++i)
+    {
+        if (getPort().getHeader().has(schema->field(i)->name()))
+        {
+            /// LIST type require 2 indices, so we should recursively
+            /// count the number of indices we need for this type.
+            int indexes_count = countIndicesForType(schema->field(i)->type());
+            for (int j = 0; j != indexes_count; ++j)
+                include_indices.push_back(index++);
+        }
+    }
 }
 
 void registerInputFormatProcessorORC(FormatFactory &factory)
@@ -64,6 +109,7 @@ void registerInputFormatProcessorORC(FormatFactory &factory)
             {
                 return std::make_shared<ORCBlockInputFormat>(buf, sample);
             });
+    factory.markFormatAsColumnOriented("ORC");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.h b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
index cff42560366..0c78290f3cc 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
@@ -25,6 +25,15 @@ private:
     // TODO: check that this class implements every part of its parent
 
     std::unique_ptr<arrow::adapters::orc::ORCFileReader> file_reader;
+
+    int stripe_total = 0;
+
+    int stripe_current = 0;
+
+    // indices of columns to read from ORC file
+    std::vector<int> include_indices;
+
+    void prepareReader();
 };
 
 }
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index 1ad913a1a59..7152c9d9916 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -2,14 +2,14 @@
 #include <IO/ReadHelpers.h>
 #include <Common/CurrentThread.h>
 #include <Common/setThreadName.h>
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 
 namespace DB
 {
 
 void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr thread_group)
 {
-    SCOPE_EXIT(
+    SCOPE_EXIT_SAFE(
         if (thread_group)
             CurrentThread::detachQueryIfNotDetached();
     );
@@ -60,7 +60,7 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
 
 void ParallelParsingInputFormat::parserThreadFunction(ThreadGroupStatusPtr thread_group, size_t current_ticket_number)
 {
-    SCOPE_EXIT(
+    SCOPE_EXIT_SAFE(
         if (thread_group)
             CurrentThread::detachQueryIfNotDetached();
     );
@@ -147,6 +147,13 @@ void ParallelParsingInputFormat::onBackgroundException(size_t offset)
 
 Chunk ParallelParsingInputFormat::generate()
 {
+    /// Delayed launching of segmentator thread
+    if (unlikely(!parsing_started.exchange(true)))
+    {
+        segmentator_thread = ThreadFromGlobalPool(
+            &ParallelParsingInputFormat::segmentatorThreadFunction, this, CurrentThread::getGroup());
+    }
+
     if (isCancelled() || parsing_finished)
     {
         /**
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index 559507055b9..dafaf9bed72 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -97,9 +97,6 @@ public:
         // bump into reader thread on wraparound.
         processing_units.resize(params.max_threads + 2);
 
-        segmentator_thread = ThreadFromGlobalPool(
-            &ParallelParsingInputFormat::segmentatorThreadFunction, this, CurrentThread::getGroup());
-
         LOG_TRACE(&Poco::Logger::get("ParallelParsingInputFormat"), "Parallel parsing is used");
     }
 
@@ -205,6 +202,7 @@ private:
 
     Poco::Event first_parser_finished;
 
+    std::atomic<bool> parsing_started{false};
     std::atomic<bool> parsing_finished{false};
 
     /// There are multiple "parsers", that's why we use thread pool.
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index bb55c71b7ca..df264406cfe 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -33,7 +33,6 @@ namespace ErrorCodes
 ParquetBlockInputFormat::ParquetBlockInputFormat(ReadBuffer & in_, Block header_)
     : IInputFormat(std::move(header_), in_)
 {
-    prepareReader();
 }
 
 Chunk ParquetBlockInputFormat::generate()
@@ -41,6 +40,9 @@ Chunk ParquetBlockInputFormat::generate()
     Chunk res;
     const Block & header = getPort().getHeader();
 
+    if (!file_reader)
+        prepareReader();
+
     if (row_group_current >= row_group_total)
         return res;
 
@@ -62,7 +64,7 @@ void ParquetBlockInputFormat::resetParser()
 
     file_reader.reset();
     column_indices.clear();
-    prepareReader();
+    row_group_current = 0;
 }
 
 void ParquetBlockInputFormat::prepareReader()
@@ -94,6 +96,7 @@ void registerInputFormatProcessorParquet(FormatFactory &factory)
             {
                 return std::make_shared<ParquetBlockInputFormat>(buf, sample);
             });
+    factory.markFormatAsColumnOriented("Parquet");
 }
 
 }
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index 0825d9f329e..8e178b6629e 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -1,4 +1,7 @@
 #include <sys/ioctl.h>
+#if defined(OS_SUNOS)
+#  include <sys/termios.h>
+#endif
 #include <unistd.h>
 #include <Processors/Formats/Impl/PrettyBlockOutputFormat.h>
 #include <Formats/FormatFactory.h>
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
index 41adb6fc612..f89b76342a4 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
@@ -7,6 +7,7 @@
 #include <Formats/verbosePrintString.h>
 #include <Formats/FormatFactory.h>
 #include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
 
 namespace DB
@@ -338,8 +339,10 @@ void TabSeparatedRowInputFormat::tryDeserializeField(const DataTypePtr & type, I
     const auto & index = column_mapping->column_indexes_for_input_fields[file_column];
     if (index)
     {
+        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 (!type->isNullable() && !in.eof())
+        if (!can_be_parsed_as_null && !in.eof())
         {
             if (*in.position() == '\\' && in.available() >= 2)
             {
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index c054145016d..1eb64682fae 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -6,7 +6,6 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Processors/Formats/Impl/ValuesBlockInputFormat.h>
 #include <Formats/FormatFactory.h>
-#include <Common/FieldVisitors.h>
 #include <Core/Block.h>
 #include <common/find_symbols.h>
 #include <Common/typeid_cast.h>
@@ -358,7 +357,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
                 TokenIterator(tokens),
                 token_iterator,
                 ast,
-                *context,
+                context,
                 &found_in_cache,
                 delimiter);
             templates[column_idx].emplace(structure);
@@ -400,7 +399,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
     /// Try to evaluate single expression if other parsers don't work
     buf.position() = const_cast<char *>(token_iterator->begin);
 
-    std::pair<Field, DataTypePtr> value_raw = evaluateConstantExpression(ast, *context);
+    std::pair<Field, DataTypePtr> value_raw = evaluateConstantExpression(ast, context);
 
     Field & expression_value = value_raw.first;
 
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
index 8e7e15c572d..ea5ab9239e0 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
@@ -1,21 +1,19 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <Processors/Formats/IInputFormat.h>
-#include <Processors/Formats/IRowInputFormat.h>
 #include <Formats/FormatSettings.h>
-#include <Processors/Formats/Impl/ConstantExpressionTemplate.h>
-
+#include <Interpreters/Context.h>
 #include <IO/PeekableReadBuffer.h>
 #include <Parsers/ExpressionListParsers.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/Formats/IRowInputFormat.h>
+#include <Processors/Formats/Impl/ConstantExpressionTemplate.h>
 
 namespace DB
 {
 
-class Context;
 class ReadBuffer;
 
-
 /** Stream to read data in VALUES format (as in INSERT query).
   */
 class ValuesBlockInputFormat final : public IInputFormat
@@ -36,7 +34,7 @@ public:
     void resetParser() override;
 
     /// TODO: remove context somehow.
-    void setContext(const Context & context_) { context = std::make_unique<Context>(context_); }
+    void setContext(ContextConstPtr context_) { context = Context::createCopy(context_); }
 
     const BlockMissingValues & getMissingValues() const override { return block_missing_values; }
 
@@ -68,12 +66,11 @@ private:
 
     bool skipToNextRow(size_t min_chunk_bytes = 0, int balance = 0);
 
-private:
     PeekableReadBuffer buf;
 
     const RowInputFormatParams params;
 
-    std::unique_ptr<Context> context;   /// pimpl
+    ContextPtr context;   /// pimpl
     const FormatSettings format_settings;
 
     const size_t num_columns;
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
index 3ef0caefd8f..3eb94ba78b7 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
@@ -24,11 +24,13 @@ FinishAggregatingInOrderAlgorithm::FinishAggregatingInOrderAlgorithm(
     const Block & header_,
     size_t num_inputs_,
     AggregatingTransformParamsPtr params_,
-    SortDescription description_)
+    SortDescription description_,
+    size_t max_block_size_)
     : header(header_)
     , num_inputs(num_inputs_)
     , params(params_)
     , description(std::move(description_))
+    , max_block_size(max_block_size_)
 {
     /// Replace column names in description to positions.
     for (auto & column_description : description)
@@ -56,6 +58,13 @@ void FinishAggregatingInOrderAlgorithm::consume(Input & input, size_t source_num
 
 IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
 {
+    if (!inputs_to_update.empty())
+    {
+        Status status(inputs_to_update.back());
+        inputs_to_update.pop_back();
+        return status;
+    }
+
     /// Find the input with smallest last row.
     std::optional<size_t> best_input;
     for (size_t i = 0; i < num_inputs; ++i)
@@ -94,16 +103,30 @@ IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
         states[i].to_row = (it == indices.end() ? states[i].num_rows : *it);
     }
 
-    Status status(*best_input);
-    status.chunk = aggregate();
+    addToAggregation();
+
+    /// At least one chunk should be fully aggregated.
+    assert(!inputs_to_update.empty());
+    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();
 
     return status;
 }
 
 Chunk FinishAggregatingInOrderAlgorithm::aggregate()
 {
-    BlocksList blocks;
+    auto aggregated = params->aggregator.mergeBlocks(blocks, false);
+    blocks.clear();
+    accumulated_rows = 0;
+    return {aggregated.getColumns(), aggregated.rows()};
+}
 
+void FinishAggregatingInOrderAlgorithm::addToAggregation()
+{
     for (size_t i = 0; i < num_inputs; ++i)
     {
         const auto & state = states[i];
@@ -112,7 +135,7 @@ Chunk FinishAggregatingInOrderAlgorithm::aggregate()
 
         if (state.to_row - state.current_row == state.num_rows)
         {
-            blocks.emplace_back(header.cloneWithColumns(states[i].all_columns));
+            blocks.emplace_back(header.cloneWithColumns(state.all_columns));
         }
         else
         {
@@ -125,10 +148,11 @@ Chunk FinishAggregatingInOrderAlgorithm::aggregate()
         }
 
         states[i].current_row = states[i].to_row;
+        accumulated_rows += blocks.back().rows();
+
+        if (!states[i].isValid())
+            inputs_to_update.push_back(i);
     }
-
-    auto aggregated = params->aggregator.mergeBlocks(blocks, false);
-    return {aggregated.getColumns(), aggregated.rows()};
 }
 
 }
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
index 2f9cd5d71a2..119aefb0ab0 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
@@ -37,7 +37,8 @@ public:
         const Block & header_,
         size_t num_inputs_,
         AggregatingTransformParamsPtr params_,
-        SortDescription description_);
+        SortDescription description_,
+        size_t max_block_size_);
 
     void initialize(Inputs inputs) override;
     void consume(Input & input, size_t source_num) override;
@@ -45,6 +46,7 @@ public:
 
 private:
     Chunk aggregate();
+    void addToAggregation();
 
     struct State
     {
@@ -66,8 +68,13 @@ private:
     size_t num_inputs;
     AggregatingTransformParamsPtr params;
     SortDescription description;
+    size_t max_block_size;
+
     Inputs current_inputs;
     std::vector<State> states;
+    std::vector<size_t> inputs_to_update;
+    BlocksList blocks;
+    size_t accumulated_rows = 0;
 };
 
 }
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
index 132241844d7..b8c788ed1fc 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
@@ -93,6 +93,10 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
         }
     }
 
+    /// If have enough rows, return block, because it prohibited to overflow requested number of rows.
+    if (merged_data.hasEnoughRows())
+        return Status(merged_data.pull());
+
     /// We will write the data for the last primary key.
     if (!selected_row.empty())
         insertRow();
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
index 749b460a934..19ead09ae4b 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
@@ -12,6 +12,7 @@
 #include <DataTypes/NestedUtils.h>
 #include <IO/WriteHelpers.h>
 
+
 namespace DB
 {
 
@@ -109,6 +110,9 @@ static bool isInPartitionKey(const std::string & column_name, const Names & part
     return is_in_partition_key != partition_key_columns.end();
 }
 
+
+using Row = std::vector<Field>;
+
 /// Returns true if merge result is not empty
 static bool mergeMap(const SummingSortedAlgorithm::MapDescription & desc,
                      Row & row, const ColumnRawPtrs & raw_columns, size_t row_number)
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
index df3749b5e88..c77bf7c0ba5 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.h
@@ -2,7 +2,7 @@
 
 #include <Processors/Merges/Algorithms/IMergingAlgorithmWithDelayedChunk.h>
 #include <Processors/Merges/Algorithms/MergedData.h>
-#include <Core/Row.h>
+
 
 namespace DB
 {
diff --git a/src/Processors/Merges/FinishAggregatingInOrderTransform.h b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
index e067b9472d9..4f9e53bd7d5 100644
--- a/src/Processors/Merges/FinishAggregatingInOrderTransform.h
+++ b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
@@ -16,13 +16,15 @@ public:
         const Block & header,
         size_t num_inputs,
         AggregatingTransformParamsPtr params,
-        SortDescription description)
+        SortDescription description,
+        size_t max_block_size)
         : IMergingTransform(
             num_inputs, header, header, true,
             header,
             num_inputs,
             params,
-            std::move(description))
+            std::move(description),
+            max_block_size)
     {
     }
 
diff --git a/src/Processors/Pipe.cpp b/src/Processors/Pipe.cpp
index 129bebf452a..abd4df1f51f 100644
--- a/src/Processors/Pipe.cpp
+++ b/src/Processors/Pipe.cpp
@@ -8,6 +8,7 @@
 #include <Processors/Transforms/ExtremesTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/Sources/NullSource.h>
+#include <Columns/ColumnConst.h>
 
 namespace DB
 {
@@ -250,12 +251,53 @@ static Pipes removeEmptyPipes(Pipes pipes)
     return res;
 }
 
-Pipe Pipe::unitePipes(Pipes pipes)
+/// Calculate common header for pipes.
+/// This function is needed only to remove ColumnConst from common header in case if some columns are const, and some not.
+/// E.g. if the first header is `x, const y, const z` and the second is `const x, y, const z`, the common header will be `x, y, const z`.
+static Block getCommonHeader(const Pipes & pipes)
 {
-    return Pipe::unitePipes(std::move(pipes), nullptr);
+    Block res;
+
+    for (const auto & pipe : pipes)
+    {
+        if (const auto & header = pipe.getHeader())
+        {
+            res = header;
+            break;
+        }
+    }
+
+    for (const auto & pipe : pipes)
+    {
+        const auto & header = pipe.getHeader();
+        for (size_t i = 0; i < res.columns(); ++i)
+        {
+            /// We do not check that headers are compatible here. Will do it later.
+
+            if (i >= header.columns())
+                break;
+
+            auto & common = res.getByPosition(i).column;
+            const auto & cur = header.getByPosition(i).column;
+
+            /// Only remove const from common header if it is not const for current pipe.
+            if (cur && common && !isColumnConst(*cur))
+            {
+                if (const auto * column_const = typeid_cast<const ColumnConst *>(common.get()))
+                    common = column_const->getDataColumnPtr();
+            }
+        }
+    }
+
+    return res;
 }
 
-Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors)
+Pipe Pipe::unitePipes(Pipes pipes)
+{
+    return Pipe::unitePipes(std::move(pipes), nullptr, false);
+}
+
+Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors, bool allow_empty_header)
 {
     Pipe res;
 
@@ -275,12 +317,14 @@ Pipe Pipe::unitePipes(Pipes pipes, Processors * collected_processors)
 
     OutputPortRawPtrs totals;
     OutputPortRawPtrs extremes;
-    res.header = pipes.front().header;
     res.collected_processors = collected_processors;
+    res.header = getCommonHeader(pipes);
 
     for (auto & pipe : pipes)
     {
-        assertBlocksHaveEqualStructure(res.header, pipe.header, "Pipe::unitePipes");
+        if (!allow_empty_header || pipe.header)
+            assertCompatibleHeader(pipe.header, res.header, "Pipe::unitePipes");
+
         res.processors.insert(res.processors.end(), pipe.processors.begin(), pipe.processors.end());
         res.output_ports.insert(res.output_ports.end(), pipe.output_ports.begin(), pipe.output_ports.end());
 
@@ -790,7 +834,7 @@ void Pipe::transform(const Transformer & transformer)
 
     if (collected_processors)
     {
-        for (const auto & processor : processors)
+        for (const auto & processor : new_processors)
             collected_processors->emplace_back(processor);
     }
 
diff --git a/src/Processors/Pipe.h b/src/Processors/Pipe.h
index f21f4761977..dc3be3289fc 100644
--- a/src/Processors/Pipe.h
+++ b/src/Processors/Pipe.h
@@ -1,8 +1,11 @@
 #pragma once
+
 #include <Processors/IProcessor.h>
-#include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/QueryPlan/QueryIdHolder.h>
 #include <Processors/QueryPlan/QueryPlan.h>
+#include <Access/EnabledQuota.h>
+#include <DataStreams/SizeLimits.h>
+#include <Storages/TableLockHolder.h>
 
 namespace DB
 {
@@ -107,7 +110,7 @@ public:
     /// Do not allow to change the table while the processors of pipe are alive.
     void addTableLock(TableLockHolder lock) { holder.table_locks.emplace_back(std::move(lock)); }
     /// This methods are from QueryPipeline. Needed to make conversion from pipeline to pipe possible.
-    void addInterpreterContext(std::shared_ptr<Context> context) { holder.interpreter_context.emplace_back(std::move(context)); }
+    void addInterpreterContext(std::shared_ptr<const Context> context) { holder.interpreter_context.emplace_back(std::move(context)); }
     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)
@@ -126,7 +129,7 @@ private:
         /// 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<Context>> interpreter_context;
+        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;
@@ -155,7 +158,7 @@ private:
     /// This methods are for QueryPipeline. It is allowed to complete graph only there.
     /// So, we may be sure that Pipe always has output port if not empty.
     bool isCompleted() const { return !empty() && output_ports.empty(); }
-    static Pipe unitePipes(Pipes pipes, Processors * collected_processors);
+    static Pipe unitePipes(Pipes pipes, Processors * collected_processors, bool allow_empty_header);
     void setSinks(const Pipe::ProcessorGetterWithStreamKind & getter);
     void setOutputFormat(ProcessorPtr output);
 
diff --git a/src/Processors/Port.cpp b/src/Processors/Port.cpp
index 7e7ccb1adad..0a6026b27f2 100644
--- a/src/Processors/Port.cpp
+++ b/src/Processors/Port.cpp
@@ -16,7 +16,7 @@ void connect(OutputPort & output, InputPort & input)
     auto out_name = output.getProcessor().getName();
     auto in_name = input.getProcessor().getName();
 
-    assertBlocksHaveEqualStructure(input.getHeader(), output.getHeader(), " function connect between " + out_name + " and " + in_name);
+    assertCompatibleHeader(output.getHeader(), input.getHeader(), " function connect between " + out_name + " and " + in_name);
 
     input.output_port = &output;
     output.input_port = &input;
diff --git a/src/Processors/QueryPipeline.cpp b/src/Processors/QueryPipeline.cpp
index 637a9480034..14b60d0b14c 100644
--- a/src/Processors/QueryPipeline.cpp
+++ b/src/Processors/QueryPipeline.cpp
@@ -7,6 +7,7 @@
 #include <Processors/Transforms/CreatingSetsTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #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>
@@ -96,6 +97,12 @@ void QueryPipeline::addTransform(ProcessorPtr transform)
     pipe.addTransform(std::move(transform));
 }
 
+void QueryPipeline::addTransform(ProcessorPtr transform, InputPort * totals, InputPort * extremes)
+{
+    checkInitializedAndNotCompleted();
+    pipe.addTransform(std::move(transform), totals, extremes);
+}
+
 void QueryPipeline::transform(const Transformer & transformer)
 {
     checkInitializedAndNotCompleted();
@@ -211,11 +218,14 @@ void QueryPipeline::setOutputFormat(ProcessorPtr output)
 
 QueryPipeline QueryPipeline::unitePipelines(
     std::vector<std::unique_ptr<QueryPipeline>> pipelines,
-    const Block & common_header,
-    const ExpressionActionsSettings & settings,
     size_t max_threads_limit,
     Processors * collected_processors)
 {
+    if (pipelines.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot unite an empty set of pipelines");
+
+    Block common_header = pipelines.front()->getHeader();
+
     /// Should we limit the number of threads for united pipeline. True if all pipelines have max_threads != 0.
     /// If true, result max_threads will be sum(max_threads).
     /// Note: it may be > than settings.max_threads, so we should apply this limit again.
@@ -229,20 +239,6 @@ QueryPipeline QueryPipeline::unitePipelines(
         pipeline.checkInitialized();
         pipeline.pipe.collected_processors = collected_processors;
 
-        if (!pipeline.isCompleted())
-        {
-            auto actions_dag = ActionsDAG::makeConvertingActions(
-                    pipeline.getHeader().getColumnsWithTypeAndName(),
-                    common_header.getColumnsWithTypeAndName(),
-                    ActionsDAG::MatchColumnsMode::Position);
-            auto actions = std::make_shared<ExpressionActions>(actions_dag, settings);
-
-            pipeline.addSimpleTransform([&](const Block & header)
-            {
-               return std::make_shared<ExpressionTransform>(header, actions);
-            });
-        }
-
         pipes.emplace_back(std::move(pipeline.pipe));
 
         max_threads += pipeline.max_threads;
@@ -255,7 +251,7 @@ QueryPipeline QueryPipeline::unitePipelines(
     }
 
     QueryPipeline pipeline;
-    pipeline.init(Pipe::unitePipes(std::move(pipes), collected_processors));
+    pipeline.init(Pipe::unitePipes(std::move(pipes), collected_processors, false));
 
     if (will_limit_max_threads)
     {
@@ -266,8 +262,98 @@ QueryPipeline QueryPipeline::unitePipelines(
     return pipeline;
 }
 
+std::unique_ptr<QueryPipeline> QueryPipeline::joinPipelines(
+    std::unique_ptr<QueryPipeline> left,
+    std::unique_ptr<QueryPipeline> right,
+    JoinPtr join,
+    size_t max_block_size,
+    Processors * collected_processors)
+{
+    left->checkInitializedAndNotCompleted();
+    right->checkInitializedAndNotCompleted();
 
-void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, const Context & context)
+    /// Extremes before join are useless. They will be calculated after if needed.
+    left->pipe.dropExtremes();
+    right->pipe.dropExtremes();
+
+    left->pipe.collected_processors = collected_processors;
+    right->pipe.collected_processors = collected_processors;
+
+    /// In case joined subquery has totals, and we don't, add default chunk to totals.
+    bool default_totals = false;
+    if (!left->hasTotals() && right->hasTotals())
+    {
+        left->addDefaultTotals();
+        default_totals = true;
+    }
+
+    ///                                     (left) ──────┐
+    ///                                                  ╞> Joining ─> (joined)
+    ///                                     (left) ─┐┌───┘
+    ///                                             └┼───┐
+    /// (right) ┐                         (totals) ──┼─┐ ╞> Joining ─> (joined)
+    ///         ╞> Resize ┐                        ╓─┘┌┼─┘
+    /// (right) ┘         │                        ╟──┘└─┐
+    ///                   ╞> FillingJoin ─> Resize ╣     ╞> Joining ─> (totals)
+    /// (totals) ─────────┘                        ╙─────┘
+
+    size_t num_streams = left->getNumStreams();
+    right->resize(1);
+
+    auto adding_joined = std::make_shared<FillingRightJoinSideTransform>(right->getHeader(), join);
+    InputPort * totals_port = nullptr;
+    if (right->hasTotals())
+        totals_port = adding_joined->addTotalsPort();
+
+    right->addTransform(std::move(adding_joined), totals_port, nullptr);
+
+    size_t num_streams_including_totals = num_streams + (left->hasTotals() ? 1 : 0);
+    right->resize(num_streams_including_totals);
+
+    /// This counter is needed for every Joining except totals, to decide which Joining will generate non joined rows.
+    auto finish_counter = std::make_shared<JoiningTransform::FinishCounter>(num_streams);
+
+    auto lit = left->pipe.output_ports.begin();
+    auto rit = right->pipe.output_ports.begin();
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto joining = std::make_shared<JoiningTransform>(left->getHeader(), join, max_block_size, false, default_totals, finish_counter);
+        connect(**lit, joining->getInputs().front());
+        connect(**rit, joining->getInputs().back());
+        *lit = &joining->getOutputs().front();
+
+        ++lit;
+        ++rit;
+
+        if (collected_processors)
+            collected_processors->emplace_back(joining);
+
+        left->pipe.processors.emplace_back(std::move(joining));
+    }
+
+    if (left->hasTotals())
+    {
+        auto joining = std::make_shared<JoiningTransform>(left->getHeader(), join, max_block_size, true, default_totals);
+        connect(*left->pipe.totals_port, joining->getInputs().front());
+        connect(**rit, joining->getInputs().back());
+        left->pipe.totals_port = &joining->getOutputs().front();
+
+        ++rit;
+
+        if (collected_processors)
+            collected_processors->emplace_back(joining);
+
+        left->pipe.processors.emplace_back(std::move(joining));
+    }
+
+    left->pipe.processors.insert(left->pipe.processors.end(), right->pipe.processors.begin(), right->pipe.processors.end());
+    left->pipe.holder = std::move(right->pipe.holder);
+    left->pipe.header = left->pipe.output_ports.front()->getHeader();
+    return left;
+}
+
+void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context)
 {
     resize(1);
 
@@ -289,7 +375,9 @@ void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryF
 void QueryPipeline::addPipelineBefore(QueryPipeline pipeline)
 {
     checkInitializedAndNotCompleted();
-    assertBlocksHaveEqualStructure(getHeader(), pipeline.getHeader(), "QueryPipeline");
+    if (pipeline.getHeader())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline for CreatingSets should have empty header. Got: {}",
+                        pipeline.getHeader().dumpStructure());
 
     IProcessor::PortNumbers delayed_streams(pipe.numOutputPorts());
     for (size_t i = 0; i < delayed_streams.size(); ++i)
@@ -300,7 +388,7 @@ void QueryPipeline::addPipelineBefore(QueryPipeline pipeline)
     Pipes pipes;
     pipes.emplace_back(std::move(pipe));
     pipes.emplace_back(QueryPipeline::getPipe(std::move(pipeline)));
-    pipe = Pipe::unitePipes(std::move(pipes), collected_processors);
+    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));
diff --git a/src/Processors/QueryPipeline.h b/src/Processors/QueryPipeline.h
index 8799237384e..1585f2532ff 100644
--- a/src/Processors/QueryPipeline.h
+++ b/src/Processors/QueryPipeline.h
@@ -1,19 +1,16 @@
 #pragma once
-#include <Processors/IProcessor.h>
-#include <Processors/Executors/PipelineExecutor.h>
-#include <Processors/Pipe.h>
 
 #include <DataStreams/IBlockInputStream.h>
 #include <DataStreams/IBlockOutputStream.h>
-
+#include <Processors/Executors/PipelineExecutor.h>
+#include <Processors/IProcessor.h>
+#include <Processors/Pipe.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
 
 namespace DB
 {
 
-class Context;
-
 class IOutputFormat;
 
 class QueryPipelineProcessorsCollector;
@@ -30,6 +27,9 @@ struct SizeLimits;
 
 struct ExpressionActionsSettings;
 
+class IJoin;
+using JoinPtr = std::shared_ptr<IJoin>;
+
 class QueryPipeline
 {
 public:
@@ -55,6 +55,7 @@ public:
     void addSimpleTransform(const Pipe::ProcessorGetterWithStreamKind & getter);
     /// Add transform with getNumStreams() input ports.
     void addTransform(ProcessorPtr transform);
+    void addTransform(ProcessorPtr transform, InputPort * totals, InputPort * extremes);
 
     using Transformer = std::function<Processors(OutputPortRawPtrs ports)>;
     /// Transform pipeline in general way.
@@ -90,16 +91,24 @@ public:
     /// 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,
-            const Block & common_header,
-            const ExpressionActionsSettings & settings,
             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,
+        JoinPtr join,
+        size_t max_block_size,
+        Processors * collected_processors = nullptr);
+
     /// Add other pipeline and execute it before current one.
-    /// Pipeline must have same header.
+    /// Pipeline must have empty header, it should not generate any chunk.
+    /// This is used for CreatingSets.
     void addPipelineBefore(QueryPipeline pipeline);
 
-    void addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, const Context & context);
+    void addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context);
 
     PipelineExecutorPtr execute();
 
@@ -110,7 +119,7 @@ public:
     const Block & getHeader() const { return pipe.getHeader(); }
 
     void addTableLock(TableLockHolder lock) { pipe.addTableLock(std::move(lock)); }
-    void addInterpreterContext(std::shared_ptr<Context> context) { pipe.addInterpreterContext(std::move(context)); }
+    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 setLimits(const StreamLocalLimits & limits) { pipe.setLimits(limits); }
@@ -126,7 +135,7 @@ public:
     {
         auto num_threads = pipe.maxParallelStreams();
 
-        if (max_threads)
+        if (max_threads) //-V1051
             num_threads = std::min(num_threads, max_threads);
 
         return std::max<size_t>(1, num_threads);
diff --git a/src/Processors/QueryPlan/AddingDelayedSourceStep.cpp b/src/Processors/QueryPlan/AddingDelayedSourceStep.cpp
deleted file mode 100644
index 1f02205dad8..00000000000
--- a/src/Processors/QueryPlan/AddingDelayedSourceStep.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <Processors/QueryPlan/AddingDelayedSourceStep.h>
-#include <Processors/QueryPipeline.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = false,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = false,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = false, /// New rows are added from delayed stream
-        }
-    };
-}
-
-AddingDelayedSourceStep::AddingDelayedSourceStep(
-    const DataStream & input_stream_,
-    ProcessorPtr source_)
-    : ITransformingStep(input_stream_, input_stream_.header, getTraits())
-    , source(std::move(source_))
-{
-}
-
-void AddingDelayedSourceStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    source->setQueryPlanStep(this);
-    pipeline.addDelayedStream(source);
-
-    /// Now, after adding delayed stream, it has implicit dependency on other port.
-    /// Here we add resize processor to remove this dependency.
-    /// Otherwise, if we add MergeSorting + MergingSorted transform to pipeline, we could get `Pipeline stuck`
-    pipeline.resize(pipeline.getNumStreams(), true);
-}
-
-}
diff --git a/src/Processors/QueryPlan/AddingDelayedSourceStep.h b/src/Processors/QueryPlan/AddingDelayedSourceStep.h
deleted file mode 100644
index 30565f2002a..00000000000
--- a/src/Processors/QueryPlan/AddingDelayedSourceStep.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
-
-namespace DB
-{
-
-class IProcessor;
-using ProcessorPtr = std::shared_ptr<IProcessor>;
-
-/// Adds another source to pipeline. Data from this source will be read after data from all other sources.
-/// NOTE: tis step is needed because of non-joined data from JOIN. Remove this step after adding JoinStep.
-class AddingDelayedSourceStep : public ITransformingStep
-{
-public:
-    AddingDelayedSourceStep(
-            const DataStream & input_stream_,
-            ProcessorPtr source_);
-
-    String getName() const override { return "AddingDelayedSource"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-
-private:
-    ProcessorPtr source;
-};
-
-}
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index b8d47fac826..772390acb32 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -100,7 +100,8 @@ void AggregatingStep::transformPipeline(QueryPipeline & pipeline, const BuildQue
                     pipeline.getHeader(),
                     pipeline.getNumStreams(),
                     transform_params,
-                    group_by_sort_description);
+                    group_by_sort_description,
+                    max_block_size);
 
                 pipeline.addTransform(std::move(transform));
                 aggregating_sorted = collector.detachProcessors(1);
@@ -162,6 +163,11 @@ void AggregatingStep::describeActions(FormatSettings & settings) const
     params.explain(settings.out, settings.offset);
 }
 
+void AggregatingStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    params.explain(map);
+}
+
 void AggregatingStep::describePipeline(FormatSettings & settings) const
 {
     if (!aggregating.empty())
diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h
index c29a3cc2836..696aabd4de7 100644
--- a/src/Processors/QueryPlan/AggregatingStep.h
+++ b/src/Processors/QueryPlan/AggregatingStep.h
@@ -29,6 +29,8 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
+
     void describeActions(FormatSettings &) const override;
     void describePipeline(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.cpp b/src/Processors/QueryPlan/ArrayJoinStep.cpp
index 7e82ec87353..fa9ea298319 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.cpp
+++ b/src/Processors/QueryPlan/ArrayJoinStep.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/ArrayJoinAction.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
-
+#include <Common/JSONBuilder.h>
 namespace DB
 {
 
@@ -60,6 +60,7 @@ void ArrayJoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQuery
                 pipeline.getHeader().getColumnsWithTypeAndName(),
                 res_header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Name);
+
         auto actions = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
 
         pipeline.addSimpleTransform([&](const Block & header)
@@ -87,4 +88,15 @@ void ArrayJoinStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 }
 
+void ArrayJoinStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    map.add("Left", array_join->is_left);
+
+    auto columns_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (const auto & column : array_join->columns)
+        columns_array->add(column);
+
+    map.add("Columns", std::move(columns_array));
+}
+
 }
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.h b/src/Processors/QueryPlan/ArrayJoinStep.h
index db1b4187549..b3e08c2023c 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.h
+++ b/src/Processors/QueryPlan/ArrayJoinStep.h
@@ -15,6 +15,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
     void updateInputStream(DataStream input_stream, Block result_header);
diff --git a/src/Processors/QueryPlan/BuildQueryPipelineSettings.cpp b/src/Processors/QueryPlan/BuildQueryPipelineSettings.cpp
index 0ff77770793..2480673d65e 100644
--- a/src/Processors/QueryPlan/BuildQueryPipelineSettings.cpp
+++ b/src/Processors/QueryPlan/BuildQueryPipelineSettings.cpp
@@ -9,13 +9,13 @@ namespace DB
 BuildQueryPipelineSettings BuildQueryPipelineSettings::fromSettings(const Settings & from)
 {
     BuildQueryPipelineSettings settings;
-    settings.actions_settings = ExpressionActionsSettings::fromSettings(from);
+    settings.actions_settings = ExpressionActionsSettings::fromSettings(from, CompileExpressions::yes);
     return settings;
 }
 
-BuildQueryPipelineSettings BuildQueryPipelineSettings::fromContext(const Context & from)
+BuildQueryPipelineSettings BuildQueryPipelineSettings::fromContext(ContextPtr from)
 {
-    return fromSettings(from.getSettingsRef());
+    return fromSettings(from->getSettingsRef());
 }
 
 }
diff --git a/src/Processors/QueryPlan/BuildQueryPipelineSettings.h b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
index 3fd37b6042e..c3282d43778 100644
--- a/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
+++ b/src/Processors/QueryPlan/BuildQueryPipelineSettings.h
@@ -1,12 +1,13 @@
 #pragma once
-#include <cstddef>
+
 #include <Interpreters/ExpressionActionsSettings.h>
 
+#include <cstddef>
+
 namespace DB
 {
 
 struct Settings;
-class Context;
 
 struct BuildQueryPipelineSettings
 {
@@ -15,7 +16,7 @@ struct BuildQueryPipelineSettings
     const ExpressionActionsSettings & getActionsSettings() const { return actions_settings; }
 
     static BuildQueryPipelineSettings fromSettings(const Settings & from);
-    static BuildQueryPipelineSettings fromContext(const Context & from);
+    static BuildQueryPipelineSettings fromContext(ContextPtr from);
 };
 
 }
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 73d5f479b98..811e5885219 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -3,6 +3,7 @@
 #include <Processors/Transforms/CreatingSetsTransform.h>
 #include <IO/Operators.h>
 #include <Interpreters/ExpressionActions.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -30,22 +31,21 @@ static ITransformingStep::Traits getTraits()
 
 CreatingSetStep::CreatingSetStep(
     const DataStream & input_stream_,
-    Block header,
     String description_,
     SubqueryForSet subquery_for_set_,
     SizeLimits network_transfer_limits_,
-    const Context & context_)
-    : ITransformingStep(input_stream_, header, getTraits())
+    ContextPtr context_)
+    : ITransformingStep(input_stream_, Block{}, getTraits())
+    , WithContext(context_)
     , description(std::move(description_))
     , subquery_for_set(std::move(subquery_for_set_))
     , network_transfer_limits(std::move(network_transfer_limits_))
-    , context(context_)
 {
 }
 
 void CreatingSetStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
 {
-    pipeline.addCreatingSetsTransform(getOutputStream().header, std::move(subquery_for_set), network_transfer_limits, context);
+    pipeline.addCreatingSetsTransform(getOutputStream().header, std::move(subquery_for_set), network_transfer_limits, getContext());
 }
 
 void CreatingSetStep::describeActions(FormatSettings & settings) const
@@ -55,12 +55,21 @@ void CreatingSetStep::describeActions(FormatSettings & settings) const
     settings.out << prefix;
     if (subquery_for_set.set)
         settings.out << "Set: ";
-    else if (subquery_for_set.join)
-        settings.out << "Join: ";
+    // else if (subquery_for_set.join)
+    //     settings.out << "Join: ";
 
     settings.out << description << '\n';
 }
 
+void CreatingSetStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    if (subquery_for_set.set)
+        map.add("Set", description);
+    // else if (subquery_for_set.join)
+    //     map.add("Join", description);
+}
+
+
 CreatingSetsStep::CreatingSetsStep(DataStreams input_streams_)
 {
     if (input_streams_.empty())
@@ -70,10 +79,12 @@ CreatingSetsStep::CreatingSetsStep(DataStreams input_streams_)
     output_stream = input_streams.front();
 
     for (size_t i = 1; i < input_streams.size(); ++i)
-        assertBlocksHaveEqualStructure(output_stream->header, input_streams[i].header, "CreatingSets");
+        if (input_streams[i].header)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Creating set input must have empty header. Got: {}",
+                            input_streams[i].header.dumpStructure());
 }
 
-QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings)
+QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &)
 {
     if (pipelines.empty())
         throw Exception("CreatingSetsStep cannot be created with no inputs", ErrorCodes::LOGICAL_ERROR);
@@ -82,14 +93,13 @@ QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines, cons
     if (pipelines.size() == 1)
         return main_pipeline;
 
-    std::swap(pipelines.front(), pipelines.back());
-    pipelines.pop_back();
+    pipelines.erase(pipelines.begin());
 
     QueryPipeline delayed_pipeline;
     if (pipelines.size() > 1)
     {
         QueryPipelineProcessorsCollector collector(delayed_pipeline, this);
-        delayed_pipeline = QueryPipeline::unitePipelines(std::move(pipelines), output_stream->header, settings.getActionsSettings());
+        delayed_pipeline = QueryPipeline::unitePipelines(std::move(pipelines));
         processors = collector.detachProcessors();
     }
     else
@@ -109,7 +119,7 @@ void CreatingSetsStep::describePipeline(FormatSettings & settings) const
 }
 
 void addCreatingSetsStep(
-    QueryPlan & query_plan, SubqueriesForSets subqueries_for_sets, const SizeLimits & limits, const Context & context)
+    QueryPlan & query_plan, SubqueriesForSets subqueries_for_sets, const SizeLimits & limits, ContextPtr context)
 {
     DataStreams input_streams;
     input_streams.emplace_back(query_plan.getCurrentDataStream());
@@ -124,17 +134,14 @@ void addCreatingSetsStep(
             continue;
 
         auto plan = std::move(set.source);
-        std::string type = (set.join != nullptr) ? "JOIN"
-                                                 : "subquery";
 
         auto creating_set = std::make_unique<CreatingSetStep>(
                 plan->getCurrentDataStream(),
-                input_streams.front().header,
                 std::move(description),
                 std::move(set),
                 limits,
                 context);
-        creating_set->setStepDescription("Create set for " + type);
+        creating_set->setStepDescription("Create set for subquery");
         plan->addStep(std::move(creating_set));
 
         input_streams.emplace_back(plan->getCurrentDataStream());
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h
index 79ae3ed65f0..fa6d34ef667 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.h
+++ b/src/Processors/QueryPlan/CreatingSetsStep.h
@@ -1,34 +1,35 @@
 #pragma once
+
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <DataStreams/SizeLimits.h>
 #include <Interpreters/SubqueryForSet.h>
+#include <Interpreters/Context_fwd.h>
 
 namespace DB
 {
 
 /// Creates sets for subqueries and JOIN. See CreatingSetsTransform.
-class CreatingSetStep : public ITransformingStep
+class CreatingSetStep : public ITransformingStep, WithContext
 {
 public:
     CreatingSetStep(
             const DataStream & input_stream_,
-            Block header,
             String description_,
             SubqueryForSet subquery_for_set_,
             SizeLimits network_transfer_limits_,
-            const Context & context_);
+            ContextPtr context_);
 
     String getName() const override { return "CreatingSet"; }
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
 private:
     String description;
     SubqueryForSet subquery_for_set;
     SizeLimits network_transfer_limits;
-    const Context & context;
 };
 
 class CreatingSetsStep : public IQueryPlanStep
@@ -38,7 +39,7 @@ public:
 
     String getName() const override { return "CreatingSets"; }
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) override;
+    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
 
     void describePipeline(FormatSettings & settings) const override;
 
@@ -50,6 +51,6 @@ void addCreatingSetsStep(
     QueryPlan & query_plan,
     SubqueriesForSets subqueries_for_sets,
     const SizeLimits & limits,
-    const Context & context);
+    ContextPtr context);
 
 }
diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index ecd7918118b..5edd2f52f47 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/Transforms/DistinctTransform.h>
 #include <Processors/QueryPipeline.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -102,4 +103,13 @@ void DistinctStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 }
 
+void DistinctStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    auto columns_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (const auto & column : columns)
+        columns_array->add(column);
+
+    map.add("Columns", std::move(columns_array));
+}
+
 }
diff --git a/src/Processors/QueryPlan/DistinctStep.h b/src/Processors/QueryPlan/DistinctStep.h
index f4a5647fbc7..815601d6253 100644
--- a/src/Processors/QueryPlan/DistinctStep.h
+++ b/src/Processors/QueryPlan/DistinctStep.h
@@ -20,6 +20,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
 private:
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index f7bb4a9e9c2..656dcd46fe9 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -4,6 +4,10 @@
 #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>
 
 namespace DB
 {
@@ -24,26 +28,10 @@ static ITransformingStep::Traits getTraits(const ActionsDAGPtr & actions)
     };
 }
 
-static ITransformingStep::Traits getJoinTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = false,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = true,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = false,
-        }
-    };
-}
-
 ExpressionStep::ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_)
     : ITransformingStep(
         input_stream_,
-        Transform::transformHeader(input_stream_.header, std::make_shared<ExpressionActions>(actions_dag_, ExpressionActionsSettings{})),
+        ExpressionTransform::transformHeader(input_stream_.header, *actions_dag_),
         getTraits(actions_dag_))
     , actions_dag(std::move(actions_dag_))
 {
@@ -54,8 +42,7 @@ ExpressionStep::ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr a
 void ExpressionStep::updateInputStream(DataStream input_stream, bool keep_header)
 {
     Block out_header = keep_header ? std::move(output_stream->header)
-                                   : Transform::transformHeader(input_stream.header,
-                                                                std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{}));
+                                   : ExpressionTransform::transformHeader(input_stream.header, *actions_dag);
     output_stream = createOutputStream(
             input_stream,
             std::move(out_header),
@@ -68,9 +55,10 @@ void ExpressionStep::updateInputStream(DataStream input_stream, bool keep_header
 void ExpressionStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
 {
     auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
+
     pipeline.addSimpleTransform([&](const Block & header)
     {
-        return std::make_shared<Transform>(header, expression);
+        return std::make_shared<ExpressionTransform>(header, expression);
     });
 
     if (!blocksHaveEqualStructure(pipeline.getHeader(), output_stream->header))
@@ -93,7 +81,7 @@ void ExpressionStep::describeActions(FormatSettings & settings) const
     String prefix(settings.offset, ' ');
     bool first = true;
 
-    auto expression = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{});
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
     for (const auto & action : expression->getActions())
     {
         settings.out << prefix << (first ? "Actions: "
@@ -108,30 +96,10 @@ void ExpressionStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 }
 
-JoinStep::JoinStep(const DataStream & input_stream_, JoinPtr join_)
-    : ITransformingStep(
-        input_stream_,
-        Transform::transformHeader(input_stream_.header, join_),
-        getJoinTraits())
-    , join(std::move(join_))
+void ExpressionStep::describeActions(JSONBuilder::JSONMap & map) const
 {
-}
-
-void JoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    /// In case joined subquery has totals, and we don't, add default chunk to totals.
-    bool add_default_totals = false;
-    if (!pipeline.hasTotals())
-    {
-        pipeline.addDefaultTotals();
-        add_default_totals = true;
-    }
-
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
-    {
-        bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
-        return std::make_shared<Transform>(header, join, on_totals, add_default_totals);
-    });
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
+    map.add("Expression", expression->toTree());
 }
 
 }
diff --git a/src/Processors/QueryPlan/ExpressionStep.h b/src/Processors/QueryPlan/ExpressionStep.h
index 71937b6f78f..43272e19536 100644
--- a/src/Processors/QueryPlan/ExpressionStep.h
+++ b/src/Processors/QueryPlan/ExpressionStep.h
@@ -7,9 +7,6 @@ namespace DB
 class ActionsDAG;
 using ActionsDAGPtr = std::shared_ptr<ActionsDAG>;
 
-class IJoin;
-using JoinPtr = std::shared_ptr<IJoin>;
-
 class ExpressionTransform;
 class JoiningTransform;
 
@@ -17,7 +14,6 @@ class JoiningTransform;
 class ExpressionStep : public ITransformingStep
 {
 public:
-    using Transform = ExpressionTransform;
 
     explicit ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_);
     String getName() const override { return "Expression"; }
@@ -30,23 +26,10 @@ public:
 
     const ActionsDAGPtr & getExpression() const { return actions_dag; }
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
+
 private:
     ActionsDAGPtr actions_dag;
 };
 
-/// TODO: add separate step for join.
-class JoinStep : public ITransformingStep
-{
-public:
-    using Transform = JoiningTransform;
-
-    explicit JoinStep(const DataStream & input_stream_, JoinPtr join_);
-    String getName() const override { return "Join"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-
-private:
-    JoinPtr join;
-};
-
 }
diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp
index 1bdd4fc468c..a4306ffed2b 100644
--- a/src/Processors/QueryPlan/FillingStep.cpp
+++ b/src/Processors/QueryPlan/FillingStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/Transforms/FillingTransform.h>
 #include <Processors/QueryPipeline.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -50,4 +51,9 @@ void FillingStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 }
 
+void FillingStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    map.add("Sort Description", explainSortDescription(sort_description, input_streams.front().header));
+}
+
 }
diff --git a/src/Processors/QueryPlan/FillingStep.h b/src/Processors/QueryPlan/FillingStep.h
index 20eb132b7a6..f4c6782e9df 100644
--- a/src/Processors/QueryPlan/FillingStep.h
+++ b/src/Processors/QueryPlan/FillingStep.h
@@ -15,6 +15,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
     const SortDescription & getSortDescription() const { return sort_description; }
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index 6930d9563f9..15fd5c7b673 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -4,6 +4,7 @@
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -33,7 +34,7 @@ FilterStep::FilterStep(
         input_stream_,
         FilterTransform::transformHeader(
             input_stream_.header,
-            std::make_shared<ExpressionActions>(actions_dag_, ExpressionActionsSettings{}),
+            *actions_dag_,
             filter_column_name_,
             remove_filter_column_),
         getTraits(actions_dag_))
@@ -51,7 +52,7 @@ void FilterStep::updateInputStream(DataStream input_stream, bool keep_header)
     if (keep_header)
         out_header = FilterTransform::transformHeader(
             input_stream.header,
-            std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{}),
+            *actions_dag,
             filter_column_name,
             remove_filter_column);
 
@@ -67,6 +68,7 @@ void FilterStep::updateInputStream(DataStream input_stream, bool keep_header)
 void FilterStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
 {
     auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
+
     pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
     {
         bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
@@ -98,7 +100,7 @@ void FilterStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 
     bool first = true;
-    auto expression = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{});
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
     for (const auto & action : expression->getActions())
     {
         settings.out << prefix << (first ? "Actions: "
@@ -113,4 +115,13 @@ void FilterStep::describeActions(FormatSettings & settings) const
     settings.out << '\n';
 }
 
+void FilterStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    map.add("Filter Column", filter_column_name);
+    map.add("Removes Filter", remove_filter_column);
+
+    auto expression = std::make_shared<ExpressionActions>(actions_dag);
+    map.add("Expression", expression->toTree());
+}
+
 }
diff --git a/src/Processors/QueryPlan/FilterStep.h b/src/Processors/QueryPlan/FilterStep.h
index 0cd48691261..d01d128a08c 100644
--- a/src/Processors/QueryPlan/FilterStep.h
+++ b/src/Processors/QueryPlan/FilterStep.h
@@ -22,6 +22,7 @@ public:
 
     void updateInputStream(DataStream input_stream, bool keep_header);
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
     const ActionsDAGPtr & getExpression() const { return actions_dag; }
diff --git a/src/Processors/QueryPlan/FinishSortingStep.cpp b/src/Processors/QueryPlan/FinishSortingStep.cpp
index d30e0bf9145..a2e056b3029 100644
--- a/src/Processors/QueryPlan/FinishSortingStep.cpp
+++ b/src/Processors/QueryPlan/FinishSortingStep.cpp
@@ -5,6 +5,7 @@
 #include <Processors/Transforms/PartialSortingTransform.h>
 #include <Processors/Transforms/FinishSortingTransform.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -47,7 +48,7 @@ void FinishSortingStep::updateLimit(size_t limit_)
     if (limit_ && (limit == 0 || limit_ < limit))
     {
         limit = limit_;
-        transform_traits.preserves_number_of_rows = limit == 0;
+        transform_traits.preserves_number_of_rows = false;
     }
 }
 
@@ -101,4 +102,13 @@ void FinishSortingStep::describeActions(FormatSettings & settings) const
         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
index c89f8fee40d..9fe031e792d 100644
--- a/src/Processors/QueryPlan/FinishSortingStep.h
+++ b/src/Processors/QueryPlan/FinishSortingStep.h
@@ -20,6 +20,7 @@ public:
 
     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.
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index 8211b52a6c4..9ff2b22e5b8 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -3,6 +3,8 @@
 #include <Core/SortDescription.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 
+namespace JSONBuilder { class JSONMap; }
+
 namespace DB
 {
 
@@ -14,6 +16,8 @@ class IProcessor;
 using ProcessorPtr = std::shared_ptr<IProcessor>;
 using Processors = std::vector<ProcessorPtr>;
 
+namespace JSONBuilder { class JSONMap; }
+
 /// Description of data stream.
 /// Single logical data stream may relate to many ports of pipeline.
 class DataStream
@@ -97,8 +101,13 @@ public:
     };
 
     /// Get detailed description of step actions. This is shown in EXPLAIN query with options `actions = 1`.
+    virtual void describeActions(JSONBuilder::JSONMap & /*map*/) const {}
     virtual void describeActions(FormatSettings & /*settings*/) const {}
 
+    /// Get detailed description of read-from-storage step indexes (if any). Shown in with options `indexes = 1`.
+    virtual void describeIndexes(JSONBuilder::JSONMap & /*map*/) const {}
+    virtual void describeIndexes(FormatSettings & /*settings*/) const {}
+
     /// Get description of processors added in current step. Should be called after updatePipeline().
     virtual void describePipeline(FormatSettings & /*settings*/) const {}
 
diff --git a/src/Processors/QueryPlan/JoinStep.cpp b/src/Processors/QueryPlan/JoinStep.cpp
new file mode 100644
index 00000000000..b06d6628dcb
--- /dev/null
+++ b/src/Processors/QueryPlan/JoinStep.cpp
@@ -0,0 +1,89 @@
+#include <Processors/QueryPlan/JoinStep.h>
+#include <Processors/QueryPipeline.h>
+#include <Processors/Transforms/JoiningTransform.h>
+#include <Interpreters/IJoin.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+JoinStep::JoinStep(
+    const DataStream & left_stream_,
+    const DataStream & right_stream_,
+    JoinPtr join_,
+    size_t max_block_size_)
+    : join(std::move(join_))
+    , max_block_size(max_block_size_)
+{
+    input_streams = {left_stream_, right_stream_};
+    output_stream = DataStream
+    {
+        .header = JoiningTransform::transformHeader(left_stream_.header, join),
+    };
+}
+
+QueryPipelinePtr JoinStep::updatePipeline(QueryPipelines 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);
+}
+
+void JoinStep::describePipeline(FormatSettings & settings) const
+{
+    IQueryPlanStep::describePipeline(processors, settings);
+}
+
+static ITransformingStep::Traits getStorageJoinTraits()
+{
+    return ITransformingStep::Traits
+    {
+        {
+            .preserves_distinct_columns = false,
+            .returns_single_stream = false,
+            .preserves_number_of_streams = true,
+            .preserves_sorting = false,
+        },
+        {
+            .preserves_number_of_rows = false,
+        }
+    };
+}
+
+FilledJoinStep::FilledJoinStep(const DataStream & input_stream_, JoinPtr join_, size_t max_block_size_)
+    : ITransformingStep(
+        input_stream_,
+        JoiningTransform::transformHeader(input_stream_.header, join_),
+        getStorageJoinTraits())
+    , join(std::move(join_))
+    , max_block_size(max_block_size_)
+{
+    if (!join->isFilled())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "FilledJoinStep expects Join to be filled");
+}
+
+void FilledJoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+{
+    bool default_totals = false;
+    if (!pipeline.hasTotals() && join->hasTotals())
+    {
+        pipeline.addDefaultTotals();
+        default_totals = true;
+    }
+
+    auto finish_counter = std::make_shared<JoiningTransform::FinishCounter>(pipeline.getNumStreams());
+
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
+    {
+        bool on_totals = stream_type == QueryPipeline::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
new file mode 100644
index 00000000000..6430f7cbd59
--- /dev/null
+++ b/src/Processors/QueryPlan/JoinStep.h
@@ -0,0 +1,50 @@
+#pragma once
+#include <Processors/QueryPlan/IQueryPlanStep.h>
+#include <Processors/QueryPlan/ITransformingStep.h>
+
+namespace DB
+{
+
+class IJoin;
+using JoinPtr = std::shared_ptr<IJoin>;
+
+/// Join two data streams.
+class JoinStep : public IQueryPlanStep
+{
+public:
+    JoinStep(
+        const DataStream & left_stream_,
+        const DataStream & right_stream_,
+        JoinPtr join_,
+        size_t max_block_size_);
+
+    String getName() const override { return "Join"; }
+
+    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
+
+    void describePipeline(FormatSettings & settings) const override;
+
+    const JoinPtr & getJoin() const { return join; }
+
+private:
+    JoinPtr join;
+    size_t max_block_size;
+    Processors processors;
+};
+
+/// Special step for the case when Join is already filled.
+/// For StorageJoin and Dictionary.
+class FilledJoinStep : public ITransformingStep
+{
+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;
+
+private:
+    JoinPtr join;
+    size_t max_block_size;
+};
+
+}
diff --git a/src/Processors/QueryPlan/LimitByStep.cpp b/src/Processors/QueryPlan/LimitByStep.cpp
index 78f96d75949..8ded0784b41 100644
--- a/src/Processors/QueryPlan/LimitByStep.cpp
+++ b/src/Processors/QueryPlan/LimitByStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/Transforms/LimitByTransform.h>
 #include <Processors/QueryPipeline.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -72,4 +73,15 @@ void LimitByStep::describeActions(FormatSettings & settings) const
     settings.out << prefix << "Offset " << group_offset << '\n';
 }
 
+void LimitByStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    auto columns_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (const auto & column : columns)
+        columns_array->add(column);
+
+    map.add("Columns", std::move(columns_array));
+    map.add("Length", group_length);
+    map.add("Offset", group_offset);
+}
+
 }
diff --git a/src/Processors/QueryPlan/LimitByStep.h b/src/Processors/QueryPlan/LimitByStep.h
index 7b978286e48..1b574cd02a1 100644
--- a/src/Processors/QueryPlan/LimitByStep.h
+++ b/src/Processors/QueryPlan/LimitByStep.h
@@ -16,6 +16,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
 private:
diff --git a/src/Processors/QueryPlan/LimitStep.cpp b/src/Processors/QueryPlan/LimitStep.cpp
index 4c6b4523a54..5f5a0bd0d64 100644
--- a/src/Processors/QueryPlan/LimitStep.cpp
+++ b/src/Processors/QueryPlan/LimitStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/QueryPipeline.h>
 #include <Processors/LimitTransform.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -76,4 +77,12 @@ void LimitStep::describeActions(FormatSettings & settings) const
     }
 }
 
+void LimitStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    map.add("Limit", limit);
+    map.add("Offset", offset);
+    map.add("With Ties", with_ties);
+    map.add("Reads All Data", always_read_till_end);
+}
+
 }
diff --git a/src/Processors/QueryPlan/LimitStep.h b/src/Processors/QueryPlan/LimitStep.h
index 4428acb9ef0..772ba0722a7 100644
--- a/src/Processors/QueryPlan/LimitStep.h
+++ b/src/Processors/QueryPlan/LimitStep.h
@@ -20,6 +20,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
     size_t getLimitForSorting() const
diff --git a/src/Processors/QueryPlan/MergeSortingStep.cpp b/src/Processors/QueryPlan/MergeSortingStep.cpp
index 0c5c5cec4e9..c9e141281f4 100644
--- a/src/Processors/QueryPlan/MergeSortingStep.cpp
+++ b/src/Processors/QueryPlan/MergeSortingStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/QueryPipeline.h>
 #include <Processors/Transforms/MergeSortingTransform.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -52,7 +53,7 @@ void MergeSortingStep::updateLimit(size_t limit_)
     if (limit_ && (limit == 0 || limit_ < limit))
     {
         limit = limit_;
-        transform_traits.preserves_number_of_rows = limit == 0;
+        transform_traits.preserves_number_of_rows = false;
     }
 }
 
@@ -84,4 +85,12 @@ void MergeSortingStep::describeActions(FormatSettings & settings) const
         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
index 9802d1a760e..dcecdffd122 100644
--- a/src/Processors/QueryPlan/MergeSortingStep.h
+++ b/src/Processors/QueryPlan/MergeSortingStep.h
@@ -26,6 +26,7 @@ public:
 
     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.
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.cpp b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
index 56e91dcbd71..71efb37b363 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.cpp
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
@@ -68,4 +68,9 @@ void MergingAggregatedStep::describeActions(FormatSettings & settings) const
     return params->params.explain(settings.out, settings.offset);
 }
 
+void MergingAggregatedStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    params->params.explain(map);
+}
+
 }
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.h b/src/Processors/QueryPlan/MergingAggregatedStep.h
index 2742a040708..2e94d536a8c 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.h
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.h
@@ -23,6 +23,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
 private:
diff --git a/src/Processors/QueryPlan/MergingFinal.cpp b/src/Processors/QueryPlan/MergingFinal.cpp
deleted file mode 100644
index 4109c5e7274..00000000000
--- a/src/Processors/QueryPlan/MergingFinal.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-#include <Processors/QueryPlan/MergingFinal.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Merges/AggregatingSortedTransform.h>
-#include <Processors/Merges/CollapsingSortedTransform.h>
-#include <Processors/Merges/MergingSortedTransform.h>
-#include <Processors/Merges/ReplacingSortedTransform.h>
-#include <Processors/Merges/SummingSortedTransform.h>
-#include <Processors/Merges/VersionedCollapsingTransform.h>
-#include <Processors/Transforms/AddingSelectorTransform.h>
-#include <Processors/Transforms/CopyTransform.h>
-#include <IO/Operators.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-static ITransformingStep::Traits getTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = false,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = true,
-        }
-    };
-}
-
-MergingFinal::MergingFinal(
-    const DataStream & input_stream,
-    size_t num_output_streams_,
-    SortDescription sort_description_,
-    MergeTreeData::MergingParams params_,
-    Names partition_key_columns_,
-    size_t max_block_size_)
-    : ITransformingStep(input_stream, input_stream.header, getTraits())
-    , num_output_streams(num_output_streams_)
-    , sort_description(std::move(sort_description_))
-    , merging_params(std::move(params_))
-    , partition_key_columns(std::move(partition_key_columns_))
-    , max_block_size(max_block_size_)
-{
-    /// 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 MergingFinal::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    const auto & header = pipeline.getHeader();
-    size_t num_outputs = pipeline.getNumStreams();
-
-    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);
-            }
-
-            case MergeTreeData::MergingParams::Collapsing:
-                return std::make_shared<CollapsingSortedTransform>(header, num_outputs,
-                           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);
-
-            case MergeTreeData::MergingParams::Aggregating:
-                return std::make_shared<AggregatingSortedTransform>(header, num_outputs,
-                           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);
-
-            case MergeTreeData::MergingParams::VersionedCollapsing:
-                return std::make_shared<VersionedCollapsingTransform>(header, num_outputs,
-                           sort_description, merging_params.sign_column, max_block_size);
-
-            case MergeTreeData::MergingParams::Graphite:
-                throw Exception("GraphiteMergeTree doesn't support FINAL", ErrorCodes::LOGICAL_ERROR);
-        }
-
-        __builtin_unreachable();
-    };
-
-    if (num_output_streams <= 1 || sort_description.empty())
-    {
-        pipeline.addTransform(get_merging_processor());
-        return;
-    }
-
-    ColumnNumbers key_columns;
-    key_columns.reserve(sort_description.size());
-
-    for (auto & desc : sort_description)
-    {
-        if (!desc.column_name.empty())
-            key_columns.push_back(header.getPositionByName(desc.column_name));
-        else
-            key_columns.emplace_back(desc.column_number);
-    }
-
-    pipeline.addSimpleTransform([&](const Block & stream_header)
-    {
-        return std::make_shared<AddingSelectorTransform>(stream_header, num_output_streams, key_columns);
-    });
-
-    pipeline.transform([&](OutputPortRawPtrs ports)
-    {
-        Processors transforms;
-        std::vector<OutputPorts::iterator> output_ports;
-        transforms.reserve(ports.size() + num_output_streams);
-        output_ports.reserve(ports.size());
-
-        for (auto & port : ports)
-        {
-            auto copier = std::make_shared<CopyTransform>(header, num_output_streams);
-            connect(*port, copier->getInputPort());
-            output_ports.emplace_back(copier->getOutputs().begin());
-            transforms.emplace_back(std::move(copier));
-        }
-
-        for (size_t i = 0; i < num_output_streams; ++i)
-        {
-            auto merge = get_merging_processor();
-            merge->setSelectorPosition(i);
-            auto input = merge->getInputs().begin();
-
-            /// Connect i-th merge with i-th input port of every copier.
-            for (size_t j = 0; j < ports.size(); ++j)
-            {
-                connect(*output_ports[j], *input);
-                ++output_ports[j];
-                ++input;
-            }
-
-            transforms.emplace_back(std::move(merge));
-        }
-
-        return transforms;
-    });
-}
-
-void MergingFinal::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';
-}
-
-}
diff --git a/src/Processors/QueryPlan/MergingFinal.h b/src/Processors/QueryPlan/MergingFinal.h
deleted file mode 100644
index 5b621e9f4b2..00000000000
--- a/src/Processors/QueryPlan/MergingFinal.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-#include <Core/SortDescription.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-
-namespace DB
-{
-
-/// Merge streams of data into single sorted stream.
-class MergingFinal : public ITransformingStep
-{
-public:
-    explicit MergingFinal(
-            const DataStream & input_stream,
-            size_t num_output_streams_,
-            SortDescription sort_description_,
-            MergeTreeData::MergingParams params_,
-            Names partition_key_columns_,
-            size_t max_block_size_);
-
-    String getName() const override { return "MergingFinal"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-
-    void describeActions(FormatSettings & settings) const override;
-
-private:
-    size_t num_output_streams;
-    SortDescription sort_description;
-    MergeTreeData::MergingParams merging_params;
-    Names partition_key_columns;
-    size_t max_block_size;
-};
-
-}
diff --git a/src/Processors/QueryPlan/MergingSortedStep.cpp b/src/Processors/QueryPlan/MergingSortedStep.cpp
index 2c3006dc637..7e866f4ccd2 100644
--- a/src/Processors/QueryPlan/MergingSortedStep.cpp
+++ b/src/Processors/QueryPlan/MergingSortedStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/QueryPipeline.h>
 #include <Processors/Merges/MergingSortedTransform.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -42,7 +43,7 @@ void MergingSortedStep::updateLimit(size_t limit_)
     if (limit_ && (limit == 0 || limit_ < limit))
     {
         limit = limit_;
-        transform_traits.preserves_number_of_rows = limit == 0;
+        transform_traits.preserves_number_of_rows = false;
     }
 }
 
@@ -73,4 +74,12 @@ void MergingSortedStep::describeActions(FormatSettings & settings) const
         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
index ac5a7f666c8..4f82e3830d0 100644
--- a/src/Processors/QueryPlan/MergingSortedStep.h
+++ b/src/Processors/QueryPlan/MergingSortedStep.h
@@ -21,6 +21,7 @@ public:
 
     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.
diff --git a/src/Processors/QueryPlan/OffsetStep.cpp b/src/Processors/QueryPlan/OffsetStep.cpp
index b455a32d5af..34ddb687ddd 100644
--- a/src/Processors/QueryPlan/OffsetStep.cpp
+++ b/src/Processors/QueryPlan/OffsetStep.cpp
@@ -2,6 +2,7 @@
 #include <Processors/OffsetTransform.h>
 #include <Processors/QueryPipeline.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -41,4 +42,9 @@ void OffsetStep::describeActions(FormatSettings & settings) const
     settings.out << String(settings.offset, ' ') << "Offset " << offset << '\n';
 }
 
+void OffsetStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    map.add("Offset", offset);
+}
+
 }
diff --git a/src/Processors/QueryPlan/OffsetStep.h b/src/Processors/QueryPlan/OffsetStep.h
index c278744ff50..a10fcc7baec 100644
--- a/src/Processors/QueryPlan/OffsetStep.h
+++ b/src/Processors/QueryPlan/OffsetStep.h
@@ -15,6 +15,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
 private:
diff --git a/src/Processors/QueryPlan/Optimizations/Optimizations.h b/src/Processors/QueryPlan/Optimizations/Optimizations.h
index f96237fc71a..10bc6293537 100644
--- a/src/Processors/QueryPlan/Optimizations/Optimizations.h
+++ b/src/Processors/QueryPlan/Optimizations/Optimizations.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <array>
 
 namespace DB
@@ -22,7 +23,8 @@ struct Optimization
 {
     using Function = size_t (*)(QueryPlan::Node *, QueryPlan::Nodes &);
     const Function apply = nullptr;
-    const char * name;
+    const char * name = "";
+    const bool QueryPlanOptimizationSettings::* const is_enabled{};
 };
 
 /// Move ARRAY JOIN up if possible.
@@ -46,11 +48,11 @@ inline const auto & getOptimizations()
 {
     static const std::array<Optimization, 5> optimizations =
     {{
-        {tryLiftUpArrayJoin, "liftUpArrayJoin"},
-        {tryPushDownLimit, "pushDownLimit"},
-        {trySplitFilter, "splitFilter"},
-        {tryMergeExpressions, "mergeExpressions"},
-        {tryPushDownFilter, "pushDownFilter"},
+        {tryLiftUpArrayJoin, "liftUpArrayJoin", &QueryPlanOptimizationSettings::optimize_plan},
+        {tryPushDownLimit, "pushDownLimit", &QueryPlanOptimizationSettings::optimize_plan},
+        {trySplitFilter, "splitFilter", &QueryPlanOptimizationSettings::optimize_plan},
+        {tryMergeExpressions, "mergeExpressions", &QueryPlanOptimizationSettings::optimize_plan},
+        {tryPushDownFilter, "pushDownFilter", &QueryPlanOptimizationSettings::filter_push_down},
      }};
 
     return optimizations;
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
index a8791f757f4..1472fb87a89 100644
--- a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
@@ -8,13 +8,15 @@ namespace DB
 QueryPlanOptimizationSettings QueryPlanOptimizationSettings::fromSettings(const Settings & from)
 {
     QueryPlanOptimizationSettings settings;
+    settings.optimize_plan = from.query_plan_enable_optimizations;
     settings.max_optimizations_to_apply = from.query_plan_max_optimizations_to_apply;
+    settings.filter_push_down = from.query_plan_filter_push_down;
     return settings;
 }
 
-QueryPlanOptimizationSettings QueryPlanOptimizationSettings::fromContext(const Context & from)
+QueryPlanOptimizationSettings QueryPlanOptimizationSettings::fromContext(ContextPtr from)
 {
-    return fromSettings(from.getSettingsRef());
+    return fromSettings(from->getSettingsRef());
 }
 
 }
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
index 64943ec40a8..b5a37bf69d6 100644
--- a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
@@ -1,12 +1,13 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 #include <cstddef>
 
 namespace DB
 {
 
 struct Settings;
-class Context;
 
 struct QueryPlanOptimizationSettings
 {
@@ -14,8 +15,14 @@ struct QueryPlanOptimizationSettings
     /// It helps to avoid infinite optimization loop.
     size_t max_optimizations_to_apply = 0;
 
+    /// If disabled, no optimization applied.
+    bool optimize_plan = true;
+
+    /// If filter push down optimization is enabled.
+    bool filter_push_down = true;
+
     static QueryPlanOptimizationSettings fromSettings(const Settings & from);
-    static QueryPlanOptimizationSettings fromContext(const Context & from);
+    static QueryPlanOptimizationSettings fromContext(ContextPtr from);
 };
 
 }
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
index 552720fa1a4..e1fac21d5c1 100644
--- a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -3,7 +3,9 @@
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/AggregatingStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/JoinStep.h>
 #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>
@@ -11,8 +13,10 @@
 #include <Processors/QueryPlan/PartialSortingStep.h>
 #include <Processors/QueryPlan/TotalsHavingStep.h>
 #include <Processors/QueryPlan/DistinctStep.h>
+#include <Processors/QueryPlan/UnionStep.h>
 #include <Interpreters/ActionsDAG.h>
 #include <Interpreters/ArrayJoinAction.h>
+#include <Interpreters/TableJoin.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 
@@ -69,12 +73,12 @@ static size_t tryAddNewFilterStep(
     /// Add new Filter step before Aggregating.
     /// Expression/Filter -> Aggregating -> Something
     auto & node = nodes.emplace_back();
-    node.children.swap(child_node->children);
-    child_node->children.emplace_back(&node);
+    node.children.emplace_back(&node);
+    std::swap(node.children[0], child_node->children[0]);
     /// Expression/Filter -> Aggregating -> Filter -> Something
 
-    /// New filter column is added to the end.
-    auto split_filter_column_name = (*split_filter->getIndex().rbegin())->result_name;
+    /// New filter column is the first one.
+    auto split_filter_column_name = (*split_filter->getIndex().begin())->result_name;
     node.step = std::make_unique<FilterStep>(
             node.children.at(0)->step->getOutputStream(),
             std::move(split_filter), std::move(split_filter_column_name), true);
@@ -82,7 +86,7 @@ static size_t tryAddNewFilterStep(
     return 3;
 }
 
-static Names getAggregatinKeys(const Aggregator::Params & params)
+static Names getAggregatingKeys(const Aggregator::Params & params)
 {
     Names keys;
     keys.reserve(params.keys.size());
@@ -112,17 +116,36 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
     if (auto * aggregating = typeid_cast<AggregatingStep *>(child.get()))
     {
         const auto & params = aggregating->getParams();
-        Names keys = getAggregatinKeys(params);
+        Names keys = getAggregatingKeys(params);
 
         if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, keys))
             return updated_steps;
     }
 
+    if (typeid_cast<CreatingSetsStep *>(child.get()))
+    {
+        /// CreatingSets does not change header.
+        /// We can push down filter and update header.
+        ///                       - Something
+        /// Filter - CreatingSets - CreatingSet
+        ///                       - CreatingSet
+        auto input_streams = child->getInputStreams();
+        input_streams.front() = filter->getOutputStream();
+        child = std::make_unique<CreatingSetsStep>(input_streams);
+        std::swap(parent, child);
+        std::swap(parent_node->children, child_node->children);
+        std::swap(parent_node->children.front(), child_node->children.front());
+        ///              - Filter - Something
+        /// CreatingSets - CreatingSet
+        ///              - CreatingSet
+        return 2;
+    }
+
     if (auto * totals_having = typeid_cast<TotalsHavingStep *>(child.get()))
     {
         /// If totals step has HAVING expression, skip it for now.
         /// TODO:
-        /// We can merge HAING expression with current filer.
+        /// We can merge HAVING expression with current filer.
         /// Also, we can push down part of HAVING which depend only on aggregation keys.
         if (totals_having->getActions())
             return 0;
@@ -168,6 +191,36 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
             return updated_steps;
     }
 
+    if (auto * join = typeid_cast<JoinStep *>(child.get()))
+    {
+        const auto & table_join  = join->getJoin()->getTableJoin();
+        /// 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)
+        {
+            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())
+            {
+                /// Skip key if it is renamed.
+                /// I don't know if it is possible. Just in case.
+                if (!left_header.has(name) || !res_header.has(name))
+                    continue;
+
+                /// Skip if type is changed. Push down expression expect equal types.
+                if (!left_header.getByName(name).type->equals(*res_header.getByName(name).type))
+                    continue;
+
+                allowed_keys.push_back(name);
+            }
+
+            if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_keys))
+                return updated_steps;
+        }
+    }
+
     /// TODO.
     /// We can filter earlier if expression does not depend on WITH FILL columns.
     /// But we cannot just push down condition, because other column may be filled with defaults.
@@ -193,6 +246,48 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
             return updated_steps;
     }
 
+    if (auto * union_step = typeid_cast<UnionStep *>(child.get()))
+    {
+        /// Union does not change header.
+        /// We can push down filter and update header.
+        auto union_input_streams = child->getInputStreams();
+        for (auto & input_stream : union_input_streams)
+            input_stream.header = filter->getOutputStream().header;
+
+        ///                - Something
+        /// Filter - Union - Something
+        ///                - Something
+
+        child = std::make_unique<UnionStep>(union_input_streams, union_step->getMaxThreads());
+
+        std::swap(parent, child);
+        std::swap(parent_node->children, child_node->children);
+        std::swap(parent_node->children.front(), child_node->children.front());
+
+        ///       - Filter - Something
+        /// Union - Something
+        ///       - Something
+
+        for (size_t i = 1; i < parent_node->children.size(); ++i)
+        {
+            auto & filter_node = nodes.emplace_back();
+            filter_node.children.push_back(parent_node->children[i]);
+            parent_node->children[i] = &filter_node;
+
+            filter_node.step = std::make_unique<FilterStep>(
+                filter_node.children.front()->step->getOutputStream(),
+                filter->getExpression()->clone(),
+                filter->getFilterColumnName(),
+                filter->removesFilterColumn());
+        }
+
+        ///       - Filter - Something
+        /// Union - Filter - Something
+        ///       - Filter - Something
+
+        return 3;
+    }
+
     return 0;
 }
 
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
index 858bde9c660..9a8dd151830 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
@@ -16,11 +16,14 @@ namespace QueryPlanOptimizations
 
 void optimizeTree(const QueryPlanOptimizationSettings & settings, QueryPlan::Node & root, QueryPlan::Nodes & nodes)
 {
+    if (!settings.optimize_plan)
+        return;
+
     const auto & optimizations = getOptimizations();
 
     struct Frame
     {
-        QueryPlan::Node * node;
+        QueryPlan::Node * node = nullptr;
 
         /// If not zero, traverse only depth_limit layers of tree (if no other optimizations happen).
         /// Otherwise, traverse all children.
@@ -63,6 +66,9 @@ void optimizeTree(const QueryPlanOptimizationSettings & settings, QueryPlan::Nod
         /// Apply all optimizations.
         for (const auto & optimization : optimizations)
         {
+            if (!(settings.*(optimization.is_enabled)))
+                continue;
+
             /// Just in case, skip optimization if it is not initialized.
             if (!optimization.apply)
                 continue;
diff --git a/src/Processors/QueryPlan/PartialSortingStep.cpp b/src/Processors/QueryPlan/PartialSortingStep.cpp
index bb8b2c8a26b..d713a63028a 100644
--- a/src/Processors/QueryPlan/PartialSortingStep.cpp
+++ b/src/Processors/QueryPlan/PartialSortingStep.cpp
@@ -3,6 +3,7 @@
 #include <Processors/Transforms/PartialSortingTransform.h>
 #include <Processors/Transforms/LimitsCheckingTransform.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -42,7 +43,7 @@ void PartialSortingStep::updateLimit(size_t limit_)
     if (limit_ && (limit == 0 || limit_ < limit))
     {
         limit = limit_;
-        transform_traits.preserves_number_of_rows = limit == 0;
+        transform_traits.preserves_number_of_rows = false;
     }
 }
 
@@ -57,7 +58,7 @@ void PartialSortingStep::transformPipeline(QueryPipeline & pipeline, const Build
     });
 
     StreamLocalLimits limits;
-    limits.mode = LimitsMode::LIMITS_CURRENT;
+    limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
     limits.size_limits = size_limits;
 
     pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
@@ -81,4 +82,12 @@ void PartialSortingStep::describeActions(FormatSettings & settings) const
         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
index e93e9e8ef93..aeca42f7096 100644
--- a/src/Processors/QueryPlan/PartialSortingStep.h
+++ b/src/Processors/QueryPlan/PartialSortingStep.h
@@ -20,6 +20,7 @@ public:
 
     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.
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 974da579d0c..44c5c48975c 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -9,6 +9,7 @@
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -141,7 +142,7 @@ QueryPipelinePtr QueryPlan::buildQueryPipeline(
 
     struct Frame
     {
-        Node * node;
+        Node * node = {};
         QueryPipelines pipelines = {};
     };
 
@@ -157,7 +158,7 @@ QueryPipelinePtr QueryPlan::buildQueryPipeline(
         if (last_pipeline)
         {
             frame.pipelines.emplace_back(std::move(last_pipeline));
-            last_pipeline = nullptr;
+            last_pipeline = nullptr; //-V1048
         }
 
         size_t next_child = frame.pipelines.size();
@@ -200,6 +201,92 @@ void QueryPlan::addInterpreterContext(std::shared_ptr<Context> context)
 }
 
 
+static void explainStep(const IQueryPlanStep & step, JSONBuilder::JSONMap & map, const QueryPlan::ExplainPlanOptions & options)
+{
+    map.add("Node Type", step.getName());
+
+    if (options.description)
+    {
+        const auto & description = step.getStepDescription();
+        if (!description.empty())
+            map.add("Description", description);
+    }
+
+    if (options.header && step.hasOutputStream())
+    {
+        auto header_array = std::make_unique<JSONBuilder::JSONArray>();
+
+        for (const auto & output_column : step.getOutputStream().header)
+        {
+            auto column_map = std::make_unique<JSONBuilder::JSONMap>();
+            column_map->add("Name", output_column.name);
+            if (output_column.type)
+                column_map->add("Type", output_column.type->getName());
+
+            header_array->add(std::move(column_map));
+        }
+
+        map.add("Header", std::move(header_array));
+    }
+
+    if (options.actions)
+        step.describeActions(map);
+
+    if (options.indexes)
+        step.describeIndexes(map);
+}
+
+JSONBuilder::ItemPtr QueryPlan::explainPlan(const ExplainPlanOptions & options)
+{
+    checkInitialized();
+
+    struct Frame
+    {
+        Node * node = {};
+        size_t next_child = 0;
+        std::unique_ptr<JSONBuilder::JSONMap> node_map = {};
+        std::unique_ptr<JSONBuilder::JSONArray> children_array = {};
+    };
+
+    std::stack<Frame> stack;
+    stack.push(Frame{.node = root});
+
+    std::unique_ptr<JSONBuilder::JSONMap> tree;
+
+    while (!stack.empty())
+    {
+        auto & frame = stack.top();
+
+        if (frame.next_child == 0)
+        {
+            if (!frame.node->children.empty())
+                frame.children_array = std::make_unique<JSONBuilder::JSONArray>();
+
+            frame.node_map = std::make_unique<JSONBuilder::JSONMap>();
+            explainStep(*frame.node->step, *frame.node_map, options);
+        }
+
+        if (frame.next_child < frame.node->children.size())
+        {
+            stack.push(Frame{frame.node->children[frame.next_child]});
+            ++frame.next_child;
+        }
+        else
+        {
+            if (frame.children_array)
+                frame.node_map->add("Plans", std::move(frame.children_array));
+
+            tree.swap(frame.node_map);
+            stack.pop();
+
+            if (!stack.empty())
+                stack.top().children_array->add(std::move(tree));
+        }
+    }
+
+    return tree;
+}
+
 static void explainStep(
     const IQueryPlanStep & step,
     IQueryPlanStep::FormatSettings & settings,
@@ -243,6 +330,9 @@ static void explainStep(
 
     if (options.actions)
         step.describeActions(settings);
+
+    if (options.indexes)
+        step.describeIndexes(settings);
 }
 
 std::string debugExplainStep(const IQueryPlanStep & step)
@@ -262,7 +352,7 @@ void QueryPlan::explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & opt
 
     struct Frame
     {
-        Node * node;
+        Node * node = {};
         bool is_description_printed = false;
         size_t next_child = 0;
     };
@@ -308,7 +398,7 @@ void QueryPlan::explainPipeline(WriteBuffer & buffer, const ExplainPipelineOptio
 
     struct Frame
     {
-        Node * node;
+        Node * node = {};
         size_t offset = 0;
         bool is_description_printed = false;
         size_t next_child = 0;
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index d5cc2e8f4e8..4c75f00cf4d 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -1,10 +1,12 @@
 #pragma once
-#include <memory>
-#include <list>
-#include <vector>
-#include <set>
 
 #include <Core/Names.h>
+#include <Interpreters/Context_fwd.h>
+
+#include <list>
+#include <memory>
+#include <set>
+#include <vector>
 
 namespace DB
 {
@@ -17,7 +19,6 @@ using QueryPlanStepPtr = std::unique_ptr<IQueryPlanStep>;
 class QueryPipeline;
 using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
 
-class Context;
 class WriteBuffer;
 
 class QueryPlan;
@@ -28,6 +29,12 @@ class Pipe;
 struct QueryPlanOptimizationSettings;
 struct BuildQueryPipelineSettings;
 
+namespace JSONBuilder
+{
+    class IItem;
+    using ItemPtr = std::unique_ptr<IItem>;
+}
+
 /// A tree of query steps.
 /// The goal of QueryPlan is to build QueryPipeline.
 /// QueryPlan let delay pipeline creation which is helpful for pipeline-level optimizations.
@@ -65,6 +72,8 @@ public:
         bool description = true;
         /// Add detailed information about step actions.
         bool actions = false;
+        /// Add information about indexes actions.
+        bool indexes = false;
     };
 
     struct ExplainPipelineOptions
@@ -73,6 +82,7 @@ public:
         bool header = false;
     };
 
+    JSONBuilder::ItemPtr explainPlan(const ExplainPlanOptions & options);
     void explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & options);
     void explainPipeline(WriteBuffer & buffer, const ExplainPipelineOptions & options);
 
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
new file mode 100644
index 00000000000..fd5de98b4c0
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -0,0 +1,1194 @@
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/QueryPipeline.h>
+#include <Processors/ConcatProcessor.h>
+#include <Processors/Transforms/ReverseTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/FilterTransform.h>
+#include <Processors/Transforms/AddingSelectorTransform.h>
+#include <Processors/Transforms/CopyTransform.h>
+#include <Processors/Sources/NullSource.h>
+#include <Processors/Merges/AggregatingSortedTransform.h>
+#include <Processors/Merges/CollapsingSortedTransform.h>
+#include <Processors/Merges/MergingSortedTransform.h>
+#include <Processors/Merges/ReplacingSortedTransform.h>
+#include <Processors/Merges/SummingSortedTransform.h>
+#include <Processors/Merges/VersionedCollapsingTransform.h>
+#include <Storages/MergeTree/MergeTreeSelectProcessor.h>
+#include <Storages/MergeTree/MergeTreeReverseSelectProcessor.h>
+#include <Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.h>
+#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/MergeTree/MergeTreeReadPool.h>
+#include <Storages/VirtualColumnUtils.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/TreeRewriter.h>
+#include <common/logger_useful.h>
+#include <Common/JSONBuilder.h>
+
+namespace ProfileEvents
+{
+    extern const Event SelectedParts;
+    extern const Event SelectedRanges;
+    extern const Event SelectedMarks;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INDEX_NOT_USED;
+    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;
+};
+
+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,
+        .save_marks_in_cache = true,
+        .checksum_on_read = settings.checksum_on_read,
+    };
+}
+
+static const PrewhereInfoPtr & getPrewhereInfo(const SelectQueryInfo & query_info)
+{
+    return query_info.projection ? query_info.projection->prewhere_info
+                                 : query_info.prewhere_info;
+}
+
+ReadFromMergeTree::ReadFromMergeTree(
+    MergeTreeData::DataPartsVector parts_,
+    Names real_column_names_,
+    Names virt_column_names_,
+    const MergeTreeData & data_,
+    const SelectQueryInfo & query_info_,
+    StorageMetadataPtr metadata_snapshot_,
+    StorageMetadataPtr metadata_snapshot_base_,
+    ContextPtr context_,
+    size_t max_block_size_,
+    size_t num_streams_,
+    bool sample_factor_column_queried_,
+    std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
+    Poco::Logger * log_)
+    : ISourceStep(DataStream{.header = MergeTreeBaseSelectProcessor::transformHeader(
+        metadata_snapshot_->getSampleBlockForColumns(real_column_names_, data_.getVirtuals(), data_.getStorageID()),
+        getPrewhereInfo(query_info_),
+        data_.getPartitionValueType(),
+        virt_column_names_)})
+    , reader_settings(getMergeTreeReaderSettings(context_))
+    , prepared_parts(std::move(parts_))
+    , real_column_names(std::move(real_column_names_))
+    , virt_column_names(std::move(virt_column_names_))
+    , data(data_)
+    , query_info(query_info_)
+    , prewhere_info(getPrewhereInfo(query_info))
+    , metadata_snapshot(std::move(metadata_snapshot_))
+    , metadata_snapshot_base(std::move(metadata_snapshot_base_))
+    , context(std::move(context_))
+    , max_block_size(max_block_size_)
+    , requested_num_streams(num_streams_)
+    , preferred_block_size_bytes(context->getSettingsRef().preferred_block_size_bytes)
+    , preferred_max_column_in_block_size_bytes(context->getSettingsRef().preferred_max_column_in_block_size_bytes)
+    , sample_factor_column_queried(sample_factor_column_queried_)
+    , max_block_numbers_to_read(std::move(max_block_numbers_to_read_))
+    , log(log_)
+{
+    if (sample_factor_column_queried)
+    {
+        /// Only _sample_factor virtual column is added by ReadFromMergeTree
+        /// Other virtual columns are added by MergeTreeBaseSelectProcessor.
+        auto type = std::make_shared<DataTypeFloat64>();
+        output_stream->header.insert({type->createColumn(), type, "_sample_factor"});
+    }
+}
+
+Pipe ReadFromMergeTree::readFromPool(
+    RangesInDataParts parts_with_range,
+    Names required_columns,
+    size_t max_streams,
+    size_t min_marks_for_concurrent_read,
+    bool use_uncompressed_cache)
+{
+    Pipes pipes;
+    size_t sum_marks = 0;
+    size_t total_rows = 0;
+
+    for (const auto & part : parts_with_range)
+    {
+        sum_marks += part.getMarksCount();
+        total_rows += part.getRowsCount();
+    }
+
+    const auto & settings = context->getSettingsRef();
+    MergeTreeReadPool::BackoffSettings backoff_settings(settings);
+
+    auto pool = std::make_shared<MergeTreeReadPool>(
+        max_streams,
+        sum_marks,
+        min_marks_for_concurrent_read,
+        std::move(parts_with_range),
+        data,
+        metadata_snapshot,
+        prewhere_info,
+        true,
+        required_columns,
+        backoff_settings,
+        settings.preferred_block_size_bytes,
+        false);
+
+    auto * logger = &Poco::Logger::get(data.getLogName() + " (SelectExecutor)");
+    LOG_DEBUG(logger, "Reading approx. {} rows with {} streams", total_rows, max_streams);
+
+    for (size_t i = 0; i < max_streams; ++i)
+    {
+        auto source = std::make_shared<MergeTreeThreadSelectBlockInputProcessor>(
+            i, pool, min_marks_for_concurrent_read, max_block_size,
+            settings.preferred_block_size_bytes, settings.preferred_max_column_in_block_size_bytes,
+            data, metadata_snapshot, use_uncompressed_cache,
+            prewhere_info, reader_settings, virt_column_names);
+
+        if (i == 0)
+        {
+            /// Set the approximate number of rows for the first source only
+            source->addTotalRowsApprox(total_rows);
+        }
+
+        pipes.emplace_back(std::move(source));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+template<typename TSource>
+ProcessorPtr ReadFromMergeTree::createSource(
+    const RangesInDataPart & part,
+    const Names & required_columns,
+    bool use_uncompressed_cache)
+{
+    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, true, reader_settings, virt_column_names, part.part_index_in_query);
+}
+
+Pipe ReadFromMergeTree::readInOrder(
+    RangesInDataParts parts_with_range,
+    Names required_columns,
+    ReadType read_type,
+    bool use_uncompressed_cache)
+{
+    Pipes pipes;
+    for (const auto & part : parts_with_range)
+    {
+        auto source = read_type == ReadType::InReverseOrder
+                    ? createSource<MergeTreeReverseSelectProcessor>(part, required_columns, use_uncompressed_cache)
+                    : createSource<MergeTreeSelectProcessor>(part, required_columns, use_uncompressed_cache);
+
+        pipes.emplace_back(std::move(source));
+    }
+
+    auto pipe = Pipe::unitePipes(std::move(pipes));
+
+    if (read_type == ReadType::InReverseOrder)
+    {
+        pipe.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<ReverseTransform>(header);
+        });
+    }
+
+    return pipe;
+}
+
+Pipe ReadFromMergeTree::read(
+    RangesInDataParts parts_with_range, Names required_columns, ReadType read_type,
+    size_t max_streams, size_t min_marks_for_concurrent_read, bool use_uncompressed_cache)
+{
+    if (read_type == ReadType::Default && max_streams > 1)
+        return readFromPool(parts_with_range, required_columns, max_streams,
+                            min_marks_for_concurrent_read, use_uncompressed_cache);
+
+    auto pipe = readInOrder(parts_with_range, required_columns, read_type, use_uncompressed_cache);
+
+    /// Use ConcatProcessor to concat sources together.
+    /// It is needed to read in parts order (and so in PK order) if single thread is used.
+    if (read_type == ReadType::Default && pipe.numOutputPorts() > 1)
+        pipe.addTransform(std::make_shared<ConcatProcessor>(pipe.getHeader(), pipe.numOutputPorts()));
+
+    return pipe;
+}
+
+namespace
+{
+
+struct PartRangesReadInfo
+{
+    std::vector<size_t> sum_marks_in_parts;
+
+    size_t sum_marks = 0;
+    size_t total_rows = 0;
+    size_t adaptive_parts = 0;
+    size_t index_granularity_bytes = 0;
+    size_t max_marks_to_use_cache = 0;
+    size_t min_marks_for_concurrent_read = 0;
+
+    bool use_uncompressed_cache = false;
+
+    PartRangesReadInfo(
+        const RangesInDataParts & parts,
+        const Settings & settings,
+        const MergeTreeSettings & data_settings)
+    {
+        /// Count marks for each part.
+        sum_marks_in_parts.resize(parts.size());
+        for (size_t i = 0; i < parts.size(); ++i)
+        {
+            total_rows += parts[i].getRowsCount();
+            sum_marks_in_parts[i] = parts[i].getMarksCount();
+            sum_marks += sum_marks_in_parts[i];
+
+            if (parts[i].data_part->index_granularity_info.is_adaptive)
+                ++adaptive_parts;
+        }
+
+        if (adaptive_parts > parts.size() / 2)
+            index_granularity_bytes = data_settings.index_granularity_bytes;
+
+        max_marks_to_use_cache = MergeTreeDataSelectExecutor::roundRowsOrBytesToMarks(
+            settings.merge_tree_max_rows_to_use_cache,
+            settings.merge_tree_max_bytes_to_use_cache,
+            data_settings.index_granularity,
+            index_granularity_bytes);
+
+        min_marks_for_concurrent_read = MergeTreeDataSelectExecutor::minMarksForConcurrentRead(
+            settings.merge_tree_min_rows_for_concurrent_read,
+            settings.merge_tree_min_bytes_for_concurrent_read,
+            data_settings.index_granularity,
+            index_granularity_bytes,
+            sum_marks);
+
+        use_uncompressed_cache = settings.use_uncompressed_cache;
+        if (sum_marks > max_marks_to_use_cache)
+            use_uncompressed_cache = false;
+    }
+};
+
+}
+
+Pipe ReadFromMergeTree::spreadMarkRangesAmongStreams(
+    RangesInDataParts && parts_with_ranges,
+    const Names & column_names)
+{
+    const auto & settings = context->getSettingsRef();
+    const auto data_settings = data.getSettings();
+
+    PartRangesReadInfo info(parts_with_ranges, settings, *data_settings);
+
+    if (0 == info.sum_marks)
+        return {};
+
+    size_t num_streams = requested_num_streams;
+    if (num_streams > 1)
+    {
+        /// Reduce the number of num_streams if the data is small.
+        if (info.sum_marks < num_streams * info.min_marks_for_concurrent_read && parts_with_ranges.size() < num_streams)
+            num_streams = std::max((info.sum_marks + info.min_marks_for_concurrent_read - 1) / info.min_marks_for_concurrent_read, parts_with_ranges.size());
+    }
+
+    return read(std::move(parts_with_ranges), column_names, ReadType::Default,
+                num_streams, info.min_marks_for_concurrent_read, info.use_uncompressed_cache);
+}
+
+static ActionsDAGPtr createProjection(const Block & header)
+{
+    auto projection = std::make_shared<ActionsDAG>(header.getNamesAndTypesList());
+    projection->removeUnusedActions(header.getNames());
+    projection->projectInput();
+    return projection;
+}
+
+Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
+    RangesInDataParts && parts_with_ranges,
+    const Names & column_names,
+    const ActionsDAGPtr & sorting_key_prefix_expr,
+    ActionsDAGPtr & out_projection,
+    const InputOrderInfoPtr & input_order_info)
+{
+    const auto & settings = context->getSettingsRef();
+    const auto data_settings = data.getSettings();
+
+    PartRangesReadInfo info(parts_with_ranges, settings, *data_settings);
+
+    Pipes res;
+
+    if (info.sum_marks == 0)
+        return {};
+
+    /// Let's split ranges to avoid reading much data.
+    auto split_ranges = [rows_granularity = data_settings->index_granularity, max_block_size = max_block_size]
+        (const auto & ranges, int direction)
+    {
+        MarkRanges new_ranges;
+        const size_t max_marks_in_range = (max_block_size + rows_granularity - 1) / rows_granularity;
+        size_t marks_in_range = 1;
+
+        if (direction == 1)
+        {
+            /// Split first few ranges to avoid reading much data.
+            bool split = false;
+            for (auto range : ranges)
+            {
+                while (!split && range.begin + marks_in_range < range.end)
+                {
+                    new_ranges.emplace_back(range.begin, range.begin + marks_in_range);
+                    range.begin += marks_in_range;
+                    marks_in_range *= 2;
+
+                    if (marks_in_range > max_marks_in_range)
+                        split = true;
+                }
+                new_ranges.emplace_back(range.begin, range.end);
+            }
+        }
+        else
+        {
+            /// Split all ranges to avoid reading much data, because we have to
+            ///  store whole range in memory to reverse it.
+            for (auto it = ranges.rbegin(); it != ranges.rend(); ++it)
+            {
+                auto range = *it;
+                while (range.begin + marks_in_range < range.end)
+                {
+                    new_ranges.emplace_front(range.end - marks_in_range, range.end);
+                    range.end -= marks_in_range;
+                    marks_in_range = std::min(marks_in_range * 2, max_marks_in_range);
+                }
+                new_ranges.emplace_front(range.begin, range.end);
+            }
+        }
+
+        return new_ranges;
+    };
+
+    const size_t min_marks_per_stream = (info.sum_marks - 1) / requested_num_streams + 1;
+    bool need_preliminary_merge = (parts_with_ranges.size() > settings.read_in_order_two_level_merge_threshold);
+
+    Pipes pipes;
+
+    for (size_t i = 0; i < requested_num_streams && !parts_with_ranges.empty(); ++i)
+    {
+        size_t need_marks = min_marks_per_stream;
+        RangesInDataParts new_parts;
+
+        /// Loop over parts.
+        /// We will iteratively take part or some subrange of a part from the back
+        ///  and assign a stream to read from it.
+        while (need_marks > 0 && !parts_with_ranges.empty())
+        {
+            RangesInDataPart part = parts_with_ranges.back();
+            parts_with_ranges.pop_back();
+
+            size_t & marks_in_part = info.sum_marks_in_parts.back();
+
+            /// We will not take too few rows from a part.
+            if (marks_in_part >= info.min_marks_for_concurrent_read &&
+                need_marks < info.min_marks_for_concurrent_read)
+                need_marks = info.min_marks_for_concurrent_read;
+
+            /// Do not leave too few rows in the part.
+            if (marks_in_part > need_marks &&
+                marks_in_part - need_marks < info.min_marks_for_concurrent_read)
+                need_marks = marks_in_part;
+
+            MarkRanges ranges_to_get_from_part;
+
+            /// We take the whole part if it is small enough.
+            if (marks_in_part <= need_marks)
+            {
+                ranges_to_get_from_part = part.ranges;
+
+                need_marks -= marks_in_part;
+                info.sum_marks_in_parts.pop_back();
+            }
+            else
+            {
+                /// Loop through ranges in part. Take enough ranges to cover "need_marks".
+                while (need_marks > 0)
+                {
+                    if (part.ranges.empty())
+                        throw Exception("Unexpected end of ranges while spreading marks among streams",
+                                        ErrorCodes::LOGICAL_ERROR);
+
+                    MarkRange & range = part.ranges.front();
+
+                    const size_t marks_in_range = range.end - range.begin;
+                    const size_t marks_to_get_from_range = std::min(marks_in_range, need_marks);
+
+                    ranges_to_get_from_part.emplace_back(range.begin, range.begin + marks_to_get_from_range);
+                    range.begin += marks_to_get_from_range;
+                    marks_in_part -= marks_to_get_from_range;
+                    need_marks -= marks_to_get_from_range;
+                    if (range.begin == range.end)
+                        part.ranges.pop_front();
+                }
+                parts_with_ranges.emplace_back(part);
+            }
+            ranges_to_get_from_part = split_ranges(ranges_to_get_from_part, input_order_info->direction);
+            new_parts.emplace_back(part.data_part, part.part_index_in_query, std::move(ranges_to_get_from_part));
+        }
+
+        auto read_type = input_order_info->direction == 1
+                       ? ReadFromMergeTree::ReadType::InOrder
+                       : ReadFromMergeTree::ReadType::InReverseOrder;
+
+        pipes.emplace_back(read(std::move(new_parts), column_names, read_type,
+                           requested_num_streams, info.min_marks_for_concurrent_read, info.use_uncompressed_cache));
+    }
+
+    if (need_preliminary_merge)
+    {
+        SortDescription sort_description;
+        for (size_t j = 0; j < input_order_info->order_key_prefix_descr.size(); ++j)
+            sort_description.emplace_back(metadata_snapshot->getSortingKey().column_names[j],
+                                          input_order_info->direction, 1);
+
+        auto sorting_key_expr = std::make_shared<ExpressionActions>(sorting_key_prefix_expr);
+
+        for (auto & pipe : pipes)
+        {
+            /// Drop temporary columns, added by 'sorting_key_prefix_expr'
+            out_projection = createProjection(pipe.getHeader());
+
+            pipe.addSimpleTransform([sorting_key_expr](const Block & header)
+            {
+                return std::make_shared<ExpressionTransform>(header, sorting_key_expr);
+            });
+
+            if (pipe.numOutputPorts() > 1)
+            {
+                auto transform = std::make_shared<MergingSortedTransform>(
+                        pipe.getHeader(),
+                        pipe.numOutputPorts(),
+                        sort_description,
+                        max_block_size);
+
+                pipe.addTransform(std::move(transform));
+            }
+        }
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+static void addMergingFinal(
+    Pipe & pipe,
+    size_t num_output_streams,
+    const SortDescription & sort_description,
+    MergeTreeData::MergingParams merging_params,
+    Names partition_key_columns,
+    size_t max_block_size)
+{
+    const auto & header = pipe.getHeader();
+    size_t num_outputs = pipe.numOutputPorts();
+
+    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);
+            }
+
+            case MergeTreeData::MergingParams::Collapsing:
+                return std::make_shared<CollapsingSortedTransform>(header, num_outputs,
+                           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);
+
+            case MergeTreeData::MergingParams::Aggregating:
+                return std::make_shared<AggregatingSortedTransform>(header, num_outputs,
+                           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);
+
+            case MergeTreeData::MergingParams::VersionedCollapsing:
+                return std::make_shared<VersionedCollapsingTransform>(header, num_outputs,
+                           sort_description, merging_params.sign_column, max_block_size);
+
+            case MergeTreeData::MergingParams::Graphite:
+                throw Exception("GraphiteMergeTree doesn't support FINAL", ErrorCodes::LOGICAL_ERROR);
+        }
+
+        __builtin_unreachable();
+    };
+
+    if (num_output_streams <= 1 || sort_description.empty())
+    {
+        pipe.addTransform(get_merging_processor());
+        return;
+    }
+
+    ColumnNumbers key_columns;
+    key_columns.reserve(sort_description.size());
+
+    for (const auto & desc : sort_description)
+    {
+        if (!desc.column_name.empty())
+            key_columns.push_back(header.getPositionByName(desc.column_name));
+        else
+            key_columns.emplace_back(desc.column_number);
+    }
+
+    pipe.addSimpleTransform([&](const Block & stream_header)
+    {
+        return std::make_shared<AddingSelectorTransform>(stream_header, num_output_streams, key_columns);
+    });
+
+    pipe.transform([&](OutputPortRawPtrs ports)
+    {
+        Processors transforms;
+        std::vector<OutputPorts::iterator> output_ports;
+        transforms.reserve(ports.size() + num_output_streams);
+        output_ports.reserve(ports.size());
+
+        for (auto & port : ports)
+        {
+            auto copier = std::make_shared<CopyTransform>(header, num_output_streams);
+            connect(*port, copier->getInputPort());
+            output_ports.emplace_back(copier->getOutputs().begin());
+            transforms.emplace_back(std::move(copier));
+        }
+
+        for (size_t i = 0; i < num_output_streams; ++i)
+        {
+            auto merge = get_merging_processor();
+            merge->setSelectorPosition(i);
+            auto input = merge->getInputs().begin();
+
+            /// Connect i-th merge with i-th input port of every copier.
+            for (size_t j = 0; j < ports.size(); ++j)
+            {
+                connect(*output_ports[j], *input);
+                ++output_ports[j];
+                ++input;
+            }
+
+            transforms.emplace_back(std::move(merge));
+        }
+
+        return transforms;
+    });
+}
+
+
+Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
+    RangesInDataParts && parts_with_ranges,
+    const Names & column_names,
+    ActionsDAGPtr & out_projection)
+{
+    const auto & settings = context->getSettingsRef();
+    const auto data_settings = data.getSettings();
+
+    PartRangesReadInfo info(parts_with_ranges, settings, *data_settings);
+
+    size_t num_streams = requested_num_streams;
+    if (num_streams > settings.max_final_threads)
+        num_streams = settings.max_final_threads;
+
+    /// If setting do_not_merge_across_partitions_select_final is true than we won't merge parts from different partitions.
+    /// We have all parts in parts vector, where parts with same partition are nearby.
+    /// So we will store iterators pointed to the beginning of each partition range (and parts.end()),
+    /// then we will create a pipe for each partition that will run selecting processor and merging processor
+    /// for the parts with this partition. In the end we will unite all the pipes.
+    std::vector<RangesInDataParts::iterator> parts_to_merge_ranges;
+    auto it = parts_with_ranges.begin();
+    parts_to_merge_ranges.push_back(it);
+
+    if (settings.do_not_merge_across_partitions_select_final)
+    {
+        while (it != parts_with_ranges.end())
+        {
+            it = std::find_if(
+                it, parts_with_ranges.end(), [&it](auto & part) { return it->data_part->info.partition_id != part.data_part->info.partition_id; });
+            parts_to_merge_ranges.push_back(it);
+        }
+        /// We divide threads for each partition equally. But we will create at least the number of partitions threads.
+        /// (So, the total number of threads could be more than initial num_streams.
+        num_streams /= (parts_to_merge_ranges.size() - 1);
+    }
+    else
+    {
+        /// If do_not_merge_across_partitions_select_final is false we just merge all the parts.
+        parts_to_merge_ranges.push_back(parts_with_ranges.end());
+    }
+
+    Pipes partition_pipes;
+
+    /// 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)
+    {
+        Pipe pipe;
+
+        {
+            RangesInDataParts new_parts;
+
+            /// If do_not_merge_across_partitions_select_final is true and there is only one part in partition
+            /// with level > 0 then we won't postprocess this part and if num_streams > 1 we
+            /// can use parallel select on such parts. We save such parts in one vector and then use
+            /// MergeTreeReadPool and MergeTreeThreadSelectBlockInputProcessor for parallel select.
+            if (num_streams > 1 && settings.do_not_merge_across_partitions_select_final &&
+                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;
+            }
+            else
+            {
+                for (auto part_it = parts_to_merge_ranges[range_index]; part_it != parts_to_merge_ranges[range_index + 1]; ++part_it)
+                {
+                    new_parts.emplace_back(part_it->data_part, part_it->part_index_in_query, part_it->ranges);
+                }
+            }
+
+            if (new_parts.empty())
+                continue;
+
+            pipe = read(std::move(new_parts), column_names, ReadFromMergeTree::ReadType::InOrder,
+                num_streams, 0, info.use_uncompressed_cache);
+
+            /// Drop temporary columns, added by 'sorting_key_expr'
+            if (!out_projection)
+                out_projection = createProjection(pipe.getHeader());
+        }
+
+        auto sorting_expr = std::make_shared<ExpressionActions>(
+            metadata_snapshot->getSortingKey().expression->getActionsDAG().clone());
+
+        pipe.addSimpleTransform([sorting_expr](const Block & header)
+        {
+            return std::make_shared<ExpressionTransform>(header, sorting_expr);
+        });
+
+        /// If do_not_merge_across_partitions_select_final is true and there is only one part in partition
+        /// with level > 0 then we won't postprocess this part
+        if (settings.do_not_merge_across_partitions_select_final &&
+            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)
+        {
+            partition_pipes.emplace_back(std::move(pipe));
+            continue;
+        }
+
+        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;
+
+        const auto & header = pipe.getHeader();
+        for (size_t i = 0; i < sort_columns_size; ++i)
+            sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1);
+
+        addMergingFinal(
+            pipe,
+            std::min<size_t>(num_streams, settings.max_final_threads),
+            sort_description, data.merging_params, partition_key_columns, max_block_size);
+
+        partition_pipes.emplace_back(std::move(pipe));
+    }
+
+    if (!lonely_parts.empty())
+    {
+        RangesInDataParts new_parts;
+
+        size_t num_streams_for_lonely_parts = num_streams * lonely_parts.size();
+
+
+        const size_t min_marks_for_concurrent_read = MergeTreeDataSelectExecutor::minMarksForConcurrentRead(
+            settings.merge_tree_min_rows_for_concurrent_read,
+            settings.merge_tree_min_bytes_for_concurrent_read,
+            data_settings->index_granularity,
+            info.index_granularity_bytes,
+            sum_marks_in_lonely_parts);
+
+        /// Reduce the number of num_streams_for_lonely_parts if the data is small.
+        if (sum_marks_in_lonely_parts < num_streams_for_lonely_parts * min_marks_for_concurrent_read && lonely_parts.size() < num_streams_for_lonely_parts)
+            num_streams_for_lonely_parts = std::max((sum_marks_in_lonely_parts + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, lonely_parts.size());
+
+        auto pipe = read(std::move(lonely_parts), column_names, ReadFromMergeTree::ReadType::Default,
+                num_streams_for_lonely_parts, min_marks_for_concurrent_read, info.use_uncompressed_cache);
+
+        /// Drop temporary columns, added by 'sorting_key_expr'
+        if (!out_projection)
+            out_projection = createProjection(pipe.getHeader());
+
+        auto sorting_expr = std::make_shared<ExpressionActions>(
+            metadata_snapshot->getSortingKey().expression->getActionsDAG().clone());
+
+        pipe.addSimpleTransform([sorting_expr](const Block & header)
+        {
+            return std::make_shared<ExpressionTransform>(header, sorting_expr);
+        });
+
+        partition_pipes.emplace_back(std::move(pipe));
+    }
+
+    return Pipe::unitePipes(std::move(partition_pipes));
+}
+
+ReadFromMergeTree::AnalysisResult ReadFromMergeTree::selectRangesToRead(MergeTreeData::DataPartsVector parts) const
+{
+    AnalysisResult result;
+    const auto & settings = context->getSettingsRef();
+
+    size_t total_parts = parts.size();
+
+    auto part_values = MergeTreeDataSelectExecutor::filterPartsByVirtualColumns(data, parts, query_info.query, context);
+    if (part_values && part_values->empty())
+        return result;
+
+    result.column_names_to_read = real_column_names;
+
+    /// If there are only virtual columns in the query, you must request at least one non-virtual one.
+    if (result.column_names_to_read.empty())
+    {
+        NamesAndTypesList available_real_columns = metadata_snapshot->getColumns().getAllPhysical();
+        result.column_names_to_read.push_back(ExpressionActions::getSmallestColumn(available_real_columns));
+    }
+
+    metadata_snapshot->check(result.column_names_to_read, data.getVirtuals(), data.getStorageID());
+
+    // Build and check if primary key is used when necessary
+    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 (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, ", "));
+    }
+    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 = parts.size();
+
+    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);
+
+    size_t sum_marks_pk = total_marks_pk;
+    for (const auto & stat : result.index_stats)
+        if (stat.type == IndexType::PrimaryKey)
+            sum_marks_pk = stat.num_granules_after;
+
+    size_t sum_marks = 0;
+    size_t sum_ranges = 0;
+
+    for (const auto & part : result.parts_with_ranges)
+    {
+        sum_ranges += part.ranges.size();
+        sum_marks += part.getMarksCount();
+    }
+
+    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);
+
+    const auto & input_order_info = query_info.input_order_info
+        ? query_info.input_order_info
+        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
+
+    if ((settings.optimize_read_in_order || settings.optimize_aggregation_in_order) && input_order_info)
+        result.read_type = (input_order_info->direction > 0) ? ReadType::InOrder
+                                                             : ReadType::InReverseOrder;
+
+    return result;
+}
+
+void ReadFromMergeTree::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+{
+    auto result = selectRangesToRead(prepared_parts);
+    auto query_id_holder = MergeTreeDataSelectExecutor::checkLimits(data, result.parts_with_ranges, context);
+
+    if (result.parts_with_ranges.empty())
+    {
+        pipeline.init(Pipe(std::make_shared<NullSource>(getOutputStream().header)));
+        return;
+    }
+
+    /// Projection, that needed to drop columns, which have appeared by execution
+    /// of some extra expressions, and to allow execute the same expressions later.
+    /// NOTE: It may lead to double computation of expressions.
+    ActionsDAGPtr result_projection;
+
+    Names column_names_to_read = std::move(result.column_names_to_read);
+    const auto & select = query_info.query->as<ASTSelectQuery &>();
+    if (!select.final() && result.sampling.use_sampling)
+    {
+        /// Add columns needed for `sample_by_ast` to `column_names_to_read`.
+        /// Skip this if final was used, because such columns were already added from PK.
+        std::vector<String> add_columns = result.sampling.filter_expression->getRequiredColumns().getNames();
+        column_names_to_read.insert(column_names_to_read.end(), add_columns.begin(), add_columns.end());
+        std::sort(column_names_to_read.begin(), column_names_to_read.end());
+        column_names_to_read.erase(std::unique(column_names_to_read.begin(), column_names_to_read.end()),
+                                   column_names_to_read.end());
+    }
+
+    const auto & input_order_info = query_info.input_order_info
+        ? query_info.input_order_info
+        : (query_info.projection ? query_info.projection->input_order_info : nullptr);
+
+    Pipe pipe;
+
+    const auto & settings = context->getSettingsRef();
+
+    if (select.final())
+    {
+        /// Add columns needed to calculate the sorting expression and the sign.
+        std::vector<String> add_columns = metadata_snapshot->getColumnsRequiredForSortingKey();
+        column_names_to_read.insert(column_names_to_read.end(), add_columns.begin(), add_columns.end());
+
+        if (!data.merging_params.sign_column.empty())
+            column_names_to_read.push_back(data.merging_params.sign_column);
+        if (!data.merging_params.version_column.empty())
+            column_names_to_read.push_back(data.merging_params.version_column);
+
+        std::sort(column_names_to_read.begin(), column_names_to_read.end());
+        column_names_to_read.erase(std::unique(column_names_to_read.begin(), column_names_to_read.end()), column_names_to_read.end());
+
+        pipe = spreadMarkRangesAmongStreamsFinal(
+            std::move(result.parts_with_ranges),
+            column_names_to_read,
+            result_projection);
+    }
+    else if ((settings.optimize_read_in_order || settings.optimize_aggregation_in_order) && input_order_info)
+    {
+        size_t prefix_size = input_order_info->order_key_prefix_descr.size();
+        auto order_key_prefix_ast = metadata_snapshot->getSortingKey().expression_list_ast->clone();
+        order_key_prefix_ast->children.resize(prefix_size);
+
+        auto syntax_result = TreeRewriter(context).analyze(order_key_prefix_ast, metadata_snapshot->getColumns().getAllPhysical());
+        auto sorting_key_prefix_expr = ExpressionAnalyzer(order_key_prefix_ast, syntax_result, context).getActionsDAG(false);
+
+        pipe = spreadMarkRangesAmongStreamsWithOrder(
+            std::move(result.parts_with_ranges),
+            column_names_to_read,
+            sorting_key_prefix_expr,
+            result_projection,
+            input_order_info);
+    }
+    else
+    {
+        pipe = spreadMarkRangesAmongStreams(
+            std::move(result.parts_with_ranges),
+            column_names_to_read);
+    }
+
+    if (pipe.empty())
+    {
+        pipeline.init(Pipe(std::make_shared<NullSource>(getOutputStream().header)));
+        return;
+    }
+
+    if (result.sampling.use_sampling)
+    {
+        auto sampling_actions = std::make_shared<ExpressionActions>(result.sampling.filter_expression);
+        pipe.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<FilterTransform>(
+                header,
+                sampling_actions,
+                result.sampling.filter_function->getColumnName(),
+                false);
+        });
+    }
+
+    Block cur_header = result_projection ? result_projection->getResultColumns()
+                                         : pipe.getHeader();
+
+    auto append_actions = [&result_projection, &cur_header](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.
+    if (sample_factor_column_queried)
+    {
+        ColumnWithTypeAndName column;
+        column.name = "_sample_factor";
+        column.type = std::make_shared<DataTypeFloat64>();
+        column.column = column.type->createColumnConst(0, Field(result.sampling.used_sample_factor));
+
+        auto adding_column = ActionsDAG::makeAddingColumnActions(std::move(column));
+        append_actions(std::move(adding_column));
+    }
+
+    /// Extra columns may be returned (for example, if sampling is used).
+    /// Convert pipe to step header structure.
+    if (!isCompatibleHeader(cur_header, getOutputStream().header))
+    {
+        auto converting = ActionsDAG::makeConvertingActions(
+            cur_header.getColumnsWithTypeAndName(),
+            getOutputStream().header.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name);
+
+        append_actions(std::move(converting));
+    }
+
+    if (result_projection)
+    {
+        auto projection_actions = std::make_shared<ExpressionActions>(result_projection);
+        pipe.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<ExpressionTransform>(header, projection_actions);
+        });
+    }
+
+    for (const auto & processor : pipe.getProcessors())
+        processors.emplace_back(processor);
+
+    // Attach QueryIdHolder if needed
+    if (query_id_holder)
+        pipe.addQueryIdHolder(std::move(query_id_holder));
+
+    pipeline.init(std::move(pipe));
+}
+
+static const char * indexTypeToString(ReadFromMergeTree::IndexType type)
+{
+    switch (type)
+    {
+        case ReadFromMergeTree::IndexType::None:
+            return "None";
+        case ReadFromMergeTree::IndexType::MinMax:
+            return "MinMax";
+        case ReadFromMergeTree::IndexType::Partition:
+            return "Partition";
+        case ReadFromMergeTree::IndexType::PrimaryKey:
+            return "PrimaryKey";
+        case ReadFromMergeTree::IndexType::Skip:
+            return "Skip";
+    }
+
+    __builtin_unreachable();
+}
+
+static const char * readTypeToString(ReadFromMergeTree::ReadType type)
+{
+    switch (type)
+    {
+        case ReadFromMergeTree::ReadType::Default:
+            return "Default";
+        case ReadFromMergeTree::ReadType::InOrder:
+            return "InOrder";
+        case ReadFromMergeTree::ReadType::InReverseOrder:
+            return "InReverseOrder";
+    }
+
+    __builtin_unreachable();
+}
+
+void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
+{
+    auto result = selectRangesToRead(prepared_parts);
+    std::string prefix(format_settings.offset, format_settings.indent_char);
+    format_settings.out << prefix << "ReadType: " << readTypeToString(result.read_type) << '\n';
+
+    if (!result.index_stats.empty())
+    {
+        format_settings.out << prefix << "Parts: " << result.index_stats.back().num_parts_after << '\n';
+        format_settings.out << prefix << "Granules: " << result.index_stats.back().num_granules_after << '\n';
+    }
+}
+
+void ReadFromMergeTree::describeActions(JSONBuilder::JSONMap & map) const
+{
+    auto result = selectRangesToRead(prepared_parts);
+    map.add("Read Type", readTypeToString(result.read_type));
+    if (!result.index_stats.empty())
+    {
+        map.add("Parts", result.index_stats.back().num_parts_after);
+        map.add("Granules", result.index_stats.back().num_granules_after);
+    }
+}
+
+void ReadFromMergeTree::describeIndexes(FormatSettings & format_settings) const
+{
+    auto result = selectRangesToRead(prepared_parts);
+    auto index_stats = std::move(result.index_stats);
+
+    std::string prefix(format_settings.offset, format_settings.indent_char);
+    if (!index_stats.empty())
+    {
+        /// Do not print anything if no indexes is applied.
+        if (index_stats.size() == 1 && index_stats.front().type == IndexType::None)
+            return;
+
+        std::string indent(format_settings.indent, format_settings.indent_char);
+        format_settings.out << prefix << "Indexes:\n";
+
+        for (size_t i = 0; i < index_stats.size(); ++i)
+        {
+            const auto & stat = index_stats[i];
+            if (stat.type == IndexType::None)
+                continue;
+
+            format_settings.out << prefix << indent << indexTypeToString(stat.type) << '\n';
+
+            if (!stat.name.empty())
+                format_settings.out << prefix << indent << indent << "Name: " << stat.name << '\n';
+
+            if (!stat.description.empty())
+                format_settings.out << prefix << indent << indent << "Description: " << stat.description << '\n';
+
+            if (!stat.used_keys.empty())
+            {
+                format_settings.out << prefix << indent << indent << "Keys: " << stat.name << '\n';
+                for (const auto & used_key : stat.used_keys)
+                    format_settings.out << prefix << indent << indent << indent << used_key << '\n';
+            }
+
+            if (!stat.condition.empty())
+                format_settings.out << prefix << indent << indent << "Condition: " << stat.condition << '\n';
+
+            format_settings.out << prefix << indent << indent << "Parts: " << stat.num_parts_after;
+            if (i)
+                format_settings.out << '/' << index_stats[i - 1].num_parts_after;
+            format_settings.out << '\n';
+
+            format_settings.out << prefix << indent << indent << "Granules: " << stat.num_granules_after;
+            if (i)
+                format_settings.out << '/' << index_stats[i - 1].num_granules_after;
+            format_settings.out << '\n';
+        }
+    }
+}
+
+void ReadFromMergeTree::describeIndexes(JSONBuilder::JSONMap & map) const
+{
+    auto result = selectRangesToRead(prepared_parts);
+    auto index_stats = std::move(result.index_stats);
+
+    if (!index_stats.empty())
+    {
+        /// Do not print anything if no indexes is applied.
+        if (index_stats.size() == 1 && index_stats.front().type == IndexType::None)
+            return;
+
+        auto indexes_array = std::make_unique<JSONBuilder::JSONArray>();
+
+        for (size_t i = 0; i < index_stats.size(); ++i)
+        {
+            const auto & stat = index_stats[i];
+            if (stat.type == IndexType::None)
+                continue;
+
+            auto index_map = std::make_unique<JSONBuilder::JSONMap>();
+
+            index_map->add("Type", indexTypeToString(stat.type));
+
+            if (!stat.name.empty())
+                index_map->add("Name", stat.name);
+
+            if (!stat.description.empty())
+                index_map->add("Description", stat.description);
+
+            if (!stat.used_keys.empty())
+            {
+                auto keys_array = std::make_unique<JSONBuilder::JSONArray>();
+
+                for (const auto & used_key : stat.used_keys)
+                    keys_array->add(used_key);
+
+                index_map->add("Keys", std::move(keys_array));
+            }
+
+            if (!stat.condition.empty())
+                index_map->add("Condition", stat.condition);
+
+            if (i)
+                index_map->add("Initial Parts", index_stats[i - 1].num_parts_after);
+            index_map->add("Selected Parts", stat.num_parts_after);
+
+            if (i)
+                index_map->add("Initial Granules", index_stats[i - 1].num_granules_after);
+            index_map->add("Selected Granules", stat.num_granules_after);
+
+            indexes_array->add(std::move(index_map));
+        }
+
+        map.add("Indexes", std::move(indexes_array));
+    }
+}
+
+}
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
new file mode 100644
index 00000000000..6e1efffdb02
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -0,0 +1,136 @@
+#pragma once
+#include <Processors/QueryPlan/ISourceStep.h>
+#include <Storages/MergeTree/RangesInDataPart.h>
+
+namespace DB
+{
+
+using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
+
+class Pipe;
+
+/// 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
+{
+public:
+
+    enum class IndexType
+    {
+        None,
+        MinMax,
+        Partition,
+        PrimaryKey,
+        Skip,
+    };
+
+    /// This is a struct with information about applied indexes.
+    /// Is used for introspection only, in EXPLAIN query.
+    struct IndexStat
+    {
+        IndexType type;
+        std::string name;
+        std::string description;
+        std::string condition;
+        std::vector<std::string> used_keys;
+        size_t num_parts_after;
+        size_t num_granules_after;
+    };
+
+    using IndexStats = std::vector<IndexStat>;
+
+    enum class ReadType
+    {
+        /// By default, read will use MergeTreeReadPool and return pipe with num_streams outputs.
+        /// If num_streams == 1, will read without pool, in order specified in parts.
+        Default,
+        /// Read in sorting key order.
+        /// Returned pipe will have the number of ports equals to parts.size().
+        /// Parameter num_streams_ is ignored in this case.
+        /// User should add MergingSorted itself if needed.
+        InOrder,
+        /// The same as InOrder, but in reverse order.
+        /// For every part, read ranges and granules from end to begin. Also add ReverseTransform.
+        InReverseOrder,
+    };
+
+    ReadFromMergeTree(
+        MergeTreeData::DataPartsVector parts_,
+        Names real_column_names_,
+        Names virt_column_names_,
+        const MergeTreeData & data_,
+        const SelectQueryInfo & query_info_,
+        StorageMetadataPtr metadata_snapshot_,
+        StorageMetadataPtr metadata_snapshot_base_,
+        ContextPtr context_,
+        size_t max_block_size_,
+        size_t num_streams_,
+        bool sample_factor_column_queried_,
+        std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
+        Poco::Logger * log_
+    );
+
+    String getName() const override { return "ReadFromMergeTree"; }
+
+    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+
+    void describeActions(FormatSettings & format_settings) const override;
+    void describeIndexes(FormatSettings & format_settings) const override;
+
+    void describeActions(JSONBuilder::JSONMap & map) const override;
+    void describeIndexes(JSONBuilder::JSONMap & map) const override;
+
+private:
+    const MergeTreeReaderSettings reader_settings;
+
+    MergeTreeData::DataPartsVector prepared_parts;
+    Names real_column_names;
+    Names virt_column_names;
+
+    const MergeTreeData & data;
+    SelectQueryInfo query_info;
+    PrewhereInfoPtr prewhere_info;
+
+    StorageMetadataPtr metadata_snapshot;
+    StorageMetadataPtr metadata_snapshot_base;
+
+    ContextPtr context;
+
+    const size_t max_block_size;
+    const size_t requested_num_streams;
+    const size_t preferred_block_size_bytes;
+    const size_t preferred_max_column_in_block_size_bytes;
+    const bool sample_factor_column_queried;
+
+    std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read;
+
+    Poco::Logger * log;
+
+    Pipe read(RangesInDataParts parts_with_range, Names required_columns, ReadType read_type, size_t max_streams, size_t min_marks_for_concurrent_read, bool use_uncompressed_cache);
+    Pipe readFromPool(RangesInDataParts parts_with_ranges, Names required_columns, size_t max_streams, size_t min_marks_for_concurrent_read, bool use_uncompressed_cache);
+    Pipe readInOrder(RangesInDataParts parts_with_range, Names required_columns, ReadType read_type, bool use_uncompressed_cache);
+
+    template<typename TSource>
+    ProcessorPtr createSource(const RangesInDataPart & part, const Names & required_columns, bool use_uncompressed_cache);
+
+    Pipe spreadMarkRangesAmongStreams(
+        RangesInDataParts && parts_with_ranges,
+        const Names & column_names);
+
+    Pipe spreadMarkRangesAmongStreamsWithOrder(
+        RangesInDataParts && parts_with_ranges,
+        const Names & column_names,
+        const ActionsDAGPtr & sorting_key_prefix_expr,
+        ActionsDAGPtr & out_projection,
+        const InputOrderInfoPtr & input_order_info);
+
+    Pipe spreadMarkRangesAmongStreamsFinal(
+        RangesInDataParts && parts,
+        const Names & column_names,
+        ActionsDAGPtr & out_projection);
+
+    struct AnalysisResult;
+    AnalysisResult selectRangesToRead(MergeTreeData::DataPartsVector parts) const;
+};
+
+}
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
index d7711abb3e1..0d1a0fdc619 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-ReadFromPreparedSource::ReadFromPreparedSource(Pipe pipe_, std::shared_ptr<Context> context_)
+ReadFromPreparedSource::ReadFromPreparedSource(Pipe pipe_, std::shared_ptr<const Context> context_)
     : ISourceStep(DataStream{.header = pipe_.getHeader()})
     , pipe(std::move(pipe_))
     , context(std::move(context_))
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.h b/src/Processors/QueryPlan/ReadFromPreparedSource.h
index 69297c3c9ae..0d4e9653806 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.h
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.h
@@ -9,7 +9,7 @@ namespace DB
 class ReadFromPreparedSource : public ISourceStep
 {
 public:
-    explicit ReadFromPreparedSource(Pipe pipe_, std::shared_ptr<Context> context_ = nullptr);
+    explicit ReadFromPreparedSource(Pipe pipe_, std::shared_ptr<const Context> context_ = nullptr);
 
     String getName() const override { return "ReadFromPreparedSource"; }
 
@@ -17,7 +17,7 @@ public:
 
 private:
     Pipe pipe;
-    std::shared_ptr<Context> context;
+    std::shared_ptr<const Context> context;
 };
 
 class ReadFromStorageStep : public ReadFromPreparedSource
diff --git a/src/Processors/QueryPlan/ReverseRowsStep.cpp b/src/Processors/QueryPlan/ReverseRowsStep.cpp
deleted file mode 100644
index 0a2e9f20cd9..00000000000
--- a/src/Processors/QueryPlan/ReverseRowsStep.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <Processors/QueryPlan/ReverseRowsStep.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/ReverseTransform.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits()
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = true,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = true,
-        }
-    };
-}
-
-ReverseRowsStep::ReverseRowsStep(const DataStream & input_stream_)
-    : ITransformingStep(input_stream_, input_stream_.header, getTraits())
-{
-}
-
-void ReverseRowsStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    pipeline.addSimpleTransform([&](const Block & header)
-    {
-        return std::make_shared<ReverseTransform>(header);
-    });
-}
-
-}
diff --git a/src/Processors/QueryPlan/ReverseRowsStep.h b/src/Processors/QueryPlan/ReverseRowsStep.h
deleted file mode 100644
index 08d7833d130..00000000000
--- a/src/Processors/QueryPlan/ReverseRowsStep.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-
-namespace DB
-{
-
-/// Reverse rows in chunk.
-class ReverseRowsStep : public ITransformingStep
-{
-public:
-    explicit ReverseRowsStep(const DataStream & input_stream_);
-
-    String getName() const override { return "ReverseRows"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-};
-
-}
diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
index e1f72b2bb04..734e6db318d 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
@@ -28,7 +28,7 @@ SettingQuotaAndLimitsStep::SettingQuotaAndLimitsStep(
     StreamLocalLimits & limits_,
     SizeLimits & leaf_limits_,
     std::shared_ptr<const EnabledQuota> quota_,
-    std::shared_ptr<Context> context_)
+    ContextPtr context_)
     : ITransformingStep(input_stream_, input_stream_.header, getTraits())
     , context(std::move(context_))
     , storage(std::move(storage_))
diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
index 167e644e26d..3c73c208b70 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
@@ -1,4 +1,6 @@
 #pragma once
+
+#include <Interpreters/Context_fwd.h>
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Storages/TableLockHolder.h>
 #include <DataStreams/StreamLocalLimits.h>
@@ -26,14 +28,14 @@ public:
         StreamLocalLimits & limits_,
         SizeLimits & leaf_limits_,
         std::shared_ptr<const EnabledQuota> quota_,
-        std::shared_ptr<Context> context_);
+        ContextPtr context_);
 
     String getName() const override { return "SettingQuotaAndLimits"; }
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
-    std::shared_ptr<Context> context;
+    ContextPtr context;
     StoragePtr storage;
     TableLockHolder table_lock;
     StreamLocalLimits limits;
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.cpp b/src/Processors/QueryPlan/TotalsHavingStep.cpp
index 7a60f0a6f36..db82538d5a0 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.cpp
+++ b/src/Processors/QueryPlan/TotalsHavingStep.cpp
@@ -4,6 +4,7 @@
 #include <Processors/Transforms/TotalsHavingTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -36,7 +37,7 @@ TotalsHavingStep::TotalsHavingStep(
             input_stream_,
             TotalsHavingTransform::transformHeader(
                     input_stream_.header,
-                    (actions_dag_ ? std::make_shared<ExpressionActions>(actions_dag_, ExpressionActionsSettings{}) : nullptr),
+                    actions_dag_.get(),
                     final_),
             getTraits(!filter_column_.empty()))
     , overflow_row(overflow_row_)
@@ -50,10 +51,16 @@ TotalsHavingStep::TotalsHavingStep(
 
 void TotalsHavingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
 {
+    auto expression_actions = actions_dag ? std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings()) : nullptr;
+
     auto totals_having = std::make_shared<TotalsHavingTransform>(
-            pipeline.getHeader(), overflow_row,
-            (actions_dag ? std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings()) : nullptr),
-            filter_column_name, totals_mode, auto_include_threshold, final);
+        pipeline.getHeader(),
+        overflow_row,
+        expression_actions,
+        filter_column_name,
+        totals_mode,
+        auto_include_threshold,
+        final);
 
     pipeline.addTotalsHavingTransform(std::move(totals_having));
 }
@@ -84,7 +91,7 @@ void TotalsHavingStep::describeActions(FormatSettings & settings) const
     if (actions_dag)
     {
         bool first = true;
-        auto expression = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings{});
+        auto expression = std::make_shared<ExpressionActions>(actions_dag);
         for (const auto & action : expression->getActions())
         {
             settings.out << prefix << (first ? "Actions: "
@@ -95,4 +102,15 @@ void TotalsHavingStep::describeActions(FormatSettings & settings) const
     }
 }
 
+void TotalsHavingStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    map.add("Mode", totalsModeToString(totals_mode, auto_include_threshold));
+    if (actions_dag)
+    {
+        map.add("Filter column", filter_column_name);
+        auto expression = std::make_shared<ExpressionActions>(actions_dag);
+        map.add("Expression", expression->toTree());
+    }
+}
+
 }
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.h b/src/Processors/QueryPlan/TotalsHavingStep.h
index 4041960de28..bc053c96970 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.h
+++ b/src/Processors/QueryPlan/TotalsHavingStep.h
@@ -26,6 +26,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
     const ActionsDAGPtr & getActions() const { return actions_dag; }
diff --git a/src/Processors/QueryPlan/UnionStep.cpp b/src/Processors/QueryPlan/UnionStep.cpp
index 66fb3ba8593..418e9b4e2e7 100644
--- a/src/Processors/QueryPlan/UnionStep.cpp
+++ b/src/Processors/QueryPlan/UnionStep.cpp
@@ -1,13 +1,32 @@
 #include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPipeline.h>
 #include <Processors/Sources/NullSource.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Interpreters/ExpressionActions.h>
+#include <common/defines.h>
 
 namespace DB
 {
 
-UnionStep::UnionStep(DataStreams input_streams_, Block result_header, size_t max_threads_)
-    : header(std::move(result_header))
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+static Block checkHeaders(const DataStreams & input_streams)
+{
+    if (input_streams.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot unite an empty set of query plan steps");
+
+    Block res = input_streams.front().header;
+    for (const auto & stream : input_streams)
+        assertBlocksHaveEqualStructure(stream.header, res, "UnionStep");
+
+    return res;
+}
+
+UnionStep::UnionStep(DataStreams input_streams_, size_t max_threads_)
+    : header(checkHeaders(input_streams_))
     , max_threads(max_threads_)
 {
     input_streams = std::move(input_streams_);
@@ -18,7 +37,7 @@ UnionStep::UnionStep(DataStreams input_streams_, Block result_header, size_t max
         output_stream = DataStream{.header = header};
 }
 
-QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings)
+QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &)
 {
     auto pipeline = std::make_unique<QueryPipeline>();
     QueryPipelineProcessorsCollector collector(*pipeline, this);
@@ -30,7 +49,29 @@ QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines, const Build
         return pipeline;
     }
 
-    *pipeline = QueryPipeline::unitePipelines(std::move(pipelines), output_stream->header, settings.getActionsSettings(), max_threads);
+    for (auto & cur_pipeline : pipelines)
+    {
+#if !defined(NDEBUG)
+        assertCompatibleHeader(cur_pipeline->getHeader(), getOutputStream().header, "UnionStep");
+#endif
+        /// Headers for union must be equal.
+        /// But, just in case, convert it to the same header if not.
+        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);
+            });
+        }
+    }
+
+    *pipeline = QueryPipeline::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 2d997e0a36d..81bd033d045 100644
--- a/src/Processors/QueryPlan/UnionStep.h
+++ b/src/Processors/QueryPlan/UnionStep.h
@@ -9,14 +9,16 @@ class UnionStep : public IQueryPlanStep
 {
 public:
     /// max_threads is used to limit the number of threads for result pipeline.
-    UnionStep(DataStreams input_streams_, Block result_header, size_t max_threads_ = 0);
+    explicit UnionStep(DataStreams input_streams_, size_t max_threads_ = 0);
 
     String getName() const override { return "Union"; }
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) override;
+    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
 
     void describePipeline(FormatSettings & settings) const override;
 
+    size_t getMaxThreads() const { return max_threads; }
+
 private:
     Block header;
     size_t max_threads;
diff --git a/src/Processors/QueryPlan/WindowStep.cpp b/src/Processors/QueryPlan/WindowStep.cpp
index 76191eba51a..29f2999ec83 100644
--- a/src/Processors/QueryPlan/WindowStep.cpp
+++ b/src/Processors/QueryPlan/WindowStep.cpp
@@ -5,6 +5,7 @@
 #include <Processors/QueryPipeline.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
 
 namespace DB
 {
@@ -64,6 +65,11 @@ WindowStep::WindowStep(const DataStream & input_stream_,
 
 void WindowStep::transformPipeline(QueryPipeline & 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
+    // have resized it.
+    pipeline.resize(1);
+
     pipeline.addSimpleTransform([&](const Block & /*header*/)
     {
         return std::make_shared<WindowTransform>(input_header,
@@ -111,4 +117,25 @@ void WindowStep::describeActions(FormatSettings & settings) const
     }
 }
 
+void WindowStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    if (!window_description.partition_by.empty())
+    {
+        auto partion_columns_array = std::make_unique<JSONBuilder::JSONArray>();
+        for (const auto & descr : window_description.partition_by)
+            partion_columns_array->add(descr.column_name);
+
+        map.add("Partition By", std::move(partion_columns_array));
+    }
+
+    if (!window_description.order_by.empty())
+        map.add("Sort Description", explainSortDescription(window_description.order_by, {}));
+
+    auto functions_array = std::make_unique<JSONBuilder::JSONArray>();
+    for (const auto & func : window_functions)
+        functions_array->add(func.column_name);
+
+    map.add("Functions", std::move(functions_array));
+}
+
 }
diff --git a/src/Processors/QueryPlan/WindowStep.h b/src/Processors/QueryPlan/WindowStep.h
index 9e3c18c0b16..b5018b1d5a7 100644
--- a/src/Processors/QueryPlan/WindowStep.h
+++ b/src/Processors/QueryPlan/WindowStep.h
@@ -22,6 +22,7 @@ public:
 
     void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
 
+    void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
 
 private:
diff --git a/src/Processors/Sources/SourceWithProgress.cpp b/src/Processors/Sources/SourceWithProgress.cpp
index 021bf04d86d..66168e7d73a 100644
--- a/src/Processors/Sources/SourceWithProgress.cpp
+++ b/src/Processors/Sources/SourceWithProgress.cpp
@@ -23,6 +23,30 @@ SourceWithProgress::SourceWithProgress(Block header, bool enable_auto_progress)
 {
 }
 
+void SourceWithProgress::setProcessListElement(QueryStatus * elem)
+{
+    process_list_elem = elem;
+
+    /// Update total_rows_approx as soon as possible.
+    ///
+    /// It is important to do this, since you will not get correct
+    /// total_rows_approx until the query will start reading all parts (in case
+    /// of query needs to read from multiple parts), and this is especially a
+    /// problem in case of max_threads=1.
+    ///
+    /// NOTE: This can be done only if progress callback already set, since
+    /// otherwise total_rows_approx will lost.
+    if (total_rows_approx != 0 && progress_callback)
+    {
+        Progress total_rows_progress = {0, 0, total_rows_approx};
+
+        progress_callback(total_rows_progress);
+        process_list_elem->updateProgressIn(total_rows_progress);
+
+        total_rows_approx = 0;
+    }
+}
+
 void SourceWithProgress::work()
 {
     if (!limits.speed_limits.checkTimeLimit(total_stopwatch.elapsed(), limits.timeout_overflow_mode))
diff --git a/src/Processors/Sources/SourceWithProgress.h b/src/Processors/Sources/SourceWithProgress.h
index 3aa7a81f418..78e56eafb52 100644
--- a/src/Processors/Sources/SourceWithProgress.h
+++ b/src/Processors/Sources/SourceWithProgress.h
@@ -51,7 +51,7 @@ public:
     void setLimits(const StreamLocalLimits & limits_) final { limits = limits_; }
     void setLeafLimits(const SizeLimits & leaf_limits_) final {leaf_limits = leaf_limits_; }
     void setQuota(const std::shared_ptr<const EnabledQuota> & quota_) final { quota = quota_; }
-    void setProcessListElement(QueryStatus * elem) final { process_list_elem = elem; }
+    void setProcessListElement(QueryStatus * elem) final;
     void setProgressCallback(const ProgressCallback & callback) final { progress_callback = callback; }
     void addTotalRowsApprox(size_t value) final { total_rows_approx += value; }
 
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
index d448d31611d..c19d6bd00b5 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
@@ -1,6 +1,7 @@
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Core/SortCursor.h>
+#include <ext/range.h>
 
 namespace DB
 {
@@ -58,6 +59,7 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         LOG_TRACE(log, "Aggregating in order");
         is_consume_started = true;
     }
+
     src_rows += rows;
     src_bytes += chunk.bytes();
 
@@ -82,58 +84,55 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         res_aggregate_columns.resize(params->params.aggregates_size);
 
         for (size_t i = 0; i < params->params.keys_size; ++i)
-        {
             res_key_columns[i] = res_header.safeGetByPosition(i).type->createColumn();
-        }
+
         for (size_t i = 0; i < params->params.aggregates_size; ++i)
-        {
             res_aggregate_columns[i] = res_header.safeGetByPosition(i + params->params.keys_size).type->createColumn();
-        }
+
         params->aggregator.createStatesAndFillKeyColumnsWithSingleKey(variants, key_columns, key_begin, res_key_columns);
+        params->aggregator.addArenasToAggregateColumns(variants, res_aggregate_columns);
         ++cur_block_size;
     }
-    ssize_t mid = 0;
-    ssize_t high = 0;
-    ssize_t low = -1;
+
+
     /// Will split block into segments with the same key
     while (key_end != rows)
     {
-        high = rows;
         /// Find the first position of new (not current) key in current chunk
-        while (high - low > 1)
-        {
-            mid = (low + high) / 2;
-            if (!less(res_key_columns, key_columns, cur_block_size - 1, mid, group_by_description))
-                low = mid;
-            else
-                high = mid;
-        }
-        key_end = high;
+        auto indices = ext::range(key_begin, rows);
+        auto it = std::upper_bound(indices.begin(), indices.end(), cur_block_size - 1,
+            [&](size_t lhs_row, size_t rhs_row)
+            {
+                return less(res_key_columns, key_columns, lhs_row, rhs_row, group_by_description);
+            });
+
+        key_end = (it == indices.end() ? rows : *it);
+
         /// Add data to aggr. state if interval is not empty. Empty when haven't found current key in new block.
         if (key_begin != key_end)
-        {
             params->aggregator.executeOnIntervalWithoutKeyImpl(variants.without_key, key_begin, key_end, aggregate_function_instructions.data(), variants.aggregates_pool);
-        }
 
-        low = key_begin = key_end;
         /// We finalize last key aggregation state if a new key found.
-        if (key_begin != rows)
+        if (key_end != rows)
         {
-            params->aggregator.fillAggregateColumnsWithSingleKey(variants, res_aggregate_columns);
+            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)
             {
                 Columns source_columns = chunk.detachColumns();
 
                 for (auto & source_column : source_columns)
-                    source_column = source_column->cut(key_begin, rows - key_begin);
+                    source_column = source_column->cut(key_end, rows - key_end);
 
-                current_chunk = Chunk(source_columns, rows - key_begin);
+                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
@@ -155,10 +154,13 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
             }
 
             /// We create a new state for the new key and update res_key_columns
-            params->aggregator.createStatesAndFillKeyColumnsWithSingleKey(variants, key_columns, key_begin, res_key_columns);
+            params->aggregator.createStatesAndFillKeyColumnsWithSingleKey(variants, key_columns, key_end, res_key_columns);
             ++cur_block_size;
         }
+
+        key_begin = key_end;
     }
+
     block_end_reached = false;
 }
 
@@ -212,8 +214,8 @@ IProcessor::Status AggregatingInOrderTransform::prepare()
         {
             output.push(std::move(to_push_chunk));
             output.finish();
-            LOG_TRACE(log, "Aggregated. {} to {} rows (from {})", src_rows, res_rows,
-                                        formatReadableSizeWithBinarySuffix(src_bytes));
+            LOG_DEBUG(log, "Aggregated. {} to {} rows (from {})",
+                src_rows, res_rows, formatReadableSizeWithBinarySuffix(src_bytes));
             return Status::Finished;
         }
         if (input.isFinished())
@@ -227,14 +229,18 @@ IProcessor::Status AggregatingInOrderTransform::prepare()
         input.setNeeded();
         return Status::NeedData;
     }
-    current_chunk = input.pull(!is_consume_finished);
+    assert(!is_consume_finished);
+    current_chunk = input.pull(true /* set_not_needed */);
     return Status::Ready;
 }
 
 void AggregatingInOrderTransform::generate()
 {
     if (cur_block_size && is_consume_finished)
-        params->aggregator.fillAggregateColumnsWithSingleKey(variants, res_aggregate_columns);
+    {
+        params->aggregator.addSingleKeyToAggregateColumns(variants, res_aggregate_columns);
+        variants.without_key = nullptr;
+    }
 
     Block res = res_header.cloneEmpty();
 
diff --git a/src/Processors/Transforms/AggregatingTransform.cpp b/src/Processors/Transforms/AggregatingTransform.cpp
index c6907202d31..7802bf6e3bf 100644
--- a/src/Processors/Transforms/AggregatingTransform.cpp
+++ b/src/Processors/Transforms/AggregatingTransform.cpp
@@ -4,7 +4,7 @@
 #include <Processors/ISource.h>
 #include <Processors/Pipe.h>
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
-
+#include <DataStreams/materializeBlock.h>
 
 namespace ProfileEvents
 {
@@ -95,7 +95,7 @@ public:
     struct SharedData
     {
         std::atomic<UInt32> next_bucket_to_merge = 0;
-        std::array<std::atomic<bool>, NUM_BUCKETS> is_bucket_processed;
+        std::array<std::atomic<bool>, NUM_BUCKETS> is_bucket_processed{};
         std::atomic<bool> is_cancelled = false;
 
         SharedData()
@@ -339,7 +339,7 @@ private:
         {
             params->aggregator.mergeWithoutKeyDataImpl(*data);
             auto block = params->aggregator.prepareBlockAndFillWithoutKey(
-                    *first, params->final, first->type != AggregatedDataVariants::Type::without_key);
+                *first, params->final, first->type != AggregatedDataVariants::Type::without_key);
 
             setCurrentChunk(convertToChunk(block));
         }
@@ -381,8 +381,7 @@ private:
         {
             /// Select Arena to avoid race conditions
             Arena * arena = first->aggregates_pools.at(thread).get();
-            auto source = std::make_shared<ConvertingAggregatedToChunksSource>(
-                    params, data, shared_data, arena);
+            auto source = std::make_shared<ConvertingAggregatedToChunksSource>(params, data, shared_data, arena);
 
             processors.emplace_back(std::move(source));
         }
@@ -522,8 +521,18 @@ void AggregatingTransform::consume(Chunk chunk)
     src_rows += num_rows;
     src_bytes += chunk.bytes();
 
-    if (!params->aggregator.executeOnBlock(chunk.detachColumns(), num_rows, variants, key_columns, aggregate_columns, no_more_keys))
-        is_consume_finished = true;
+    if (params->only_merge)
+    {
+        auto block = getInputs().front().getHeader().cloneWithColumns(chunk.detachColumns());
+        block = materializeBlock(block);
+        if (!params->aggregator.mergeBlock(block, variants, no_more_keys))
+            is_consume_finished = true;
+    }
+    else
+    {
+        if (!params->aggregator.executeOnBlock(chunk.detachColumns(), num_rows, variants, key_columns, aggregate_columns, no_more_keys))
+            is_consume_finished = true;
+    }
 }
 
 void AggregatingTransform::initGenerate()
@@ -536,12 +545,17 @@ void AggregatingTransform::initGenerate()
     /// If there was no data, and we aggregate without keys, and we must return single row with the result of empty aggregation.
     /// To do this, we pass a block with zero rows to aggregate.
     if (variants.empty() && params->params.keys_size == 0 && !params->params.empty_result_for_aggregation_by_empty_set)
-        params->aggregator.executeOnBlock(getInputs().front().getHeader(), variants, key_columns, aggregate_columns, no_more_keys);
+    {
+        if (params->only_merge)
+            params->aggregator.mergeBlock(getInputs().front().getHeader(), variants, no_more_keys);
+        else
+            params->aggregator.executeOnBlock(getInputs().front().getHeader(), variants, key_columns, aggregate_columns, no_more_keys);
+    }
 
     double elapsed_seconds = watch.elapsedSeconds();
     size_t rows = variants.sizeWithoutOverflowRow();
 
-    LOG_TRACE(log, "Aggregated. {} to {} rows (from {}) in {} sec. ({} rows/sec., {}/sec.)",
+    LOG_DEBUG(log, "Aggregated. {} to {} rows (from {}) in {} sec. ({:.3f} rows/sec., {}/sec.)",
         src_rows, rows, ReadableSize(src_bytes),
         elapsed_seconds, src_rows / elapsed_seconds,
         ReadableSize(src_bytes / elapsed_seconds));
@@ -599,7 +613,12 @@ void AggregatingTransform::initGenerate()
             pipe = Pipe::unitePipes(std::move(pipes));
         }
 
-        LOG_TRACE(log, "Will merge {} temporary files of size {} compressed, {} uncompressed.", files.files.size(), ReadableSize(files.sum_size_compressed), ReadableSize(files.sum_size_uncompressed));
+        LOG_DEBUG(
+            log,
+            "Will merge {} temporary files of size {} compressed, {} uncompressed.",
+            files.files.size(),
+            ReadableSize(files.sum_size_compressed),
+            ReadableSize(files.sum_size_uncompressed));
 
         addMergingAggregatedMemoryEfficientTransform(pipe, params, temporary_data_merge_threads);
 
diff --git a/src/Processors/Transforms/AggregatingTransform.h b/src/Processors/Transforms/AggregatingTransform.h
index 86f6ecb4a36..9512a7a2811 100644
--- a/src/Processors/Transforms/AggregatingTransform.h
+++ b/src/Processors/Transforms/AggregatingTransform.h
@@ -32,6 +32,7 @@ struct AggregatingTransformParams
     Aggregator::Params params;
     Aggregator aggregator;
     bool final;
+    bool only_merge = false;
 
     AggregatingTransformParams(const Aggregator::Params & params_, bool final_)
         : params(params_), aggregator(params), final(final_) {}
diff --git a/src/Processors/Transforms/CreatingSetsTransform.cpp b/src/Processors/Transforms/CreatingSetsTransform.cpp
index c5fb4f3a952..86051019235 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.cpp
+++ b/src/Processors/Transforms/CreatingSetsTransform.cpp
@@ -25,11 +25,11 @@ CreatingSetsTransform::CreatingSetsTransform(
     Block out_header_,
     SubqueryForSet subquery_for_set_,
     SizeLimits network_transfer_limits_,
-    const Context & context_)
+    ContextPtr context_)
     : IAccumulatingTransform(std::move(in_header_), std::move(out_header_))
+    , WithContext(context_)
     , subquery(std::move(subquery_for_set_))
     , network_transfer_limits(std::move(network_transfer_limits_))
-    , context(context_)
 {
 }
 
@@ -45,19 +45,16 @@ void CreatingSetsTransform::startSubquery()
 {
     if (subquery.set)
         LOG_TRACE(log, "Creating set.");
-    if (subquery.join)
-        LOG_TRACE(log, "Creating join.");
     if (subquery.table)
         LOG_TRACE(log, "Filling temporary table.");
 
     if (subquery.table)
-        table_out = subquery.table->write({}, subquery.table->getInMemoryMetadataPtr(), context);
+        table_out = subquery.table->write({}, subquery.table->getInMemoryMetadataPtr(), getContext());
 
     done_with_set = !subquery.set;
-    done_with_join = !subquery.join;
     done_with_table = !subquery.table;
 
-    if (done_with_set && done_with_join && done_with_table)
+    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)
@@ -72,8 +69,6 @@ void CreatingSetsTransform::finishSubquery()
 
         if (subquery.set)
             LOG_DEBUG(log, "Created Set with {} entries from {} rows in {} sec.", subquery.set->getTotalRowCount(), read_rows, seconds);
-        if (subquery.join)
-            LOG_DEBUG(log, "Created Join with {} entries from {} rows in {} sec.", subquery.join->getTotalRowCount(), read_rows, seconds);
         if (subquery.table)
             LOG_DEBUG(log, "Created Table with {} rows in {} sec.", read_rows, seconds);
     }
@@ -81,12 +76,6 @@ void CreatingSetsTransform::finishSubquery()
     {
         LOG_DEBUG(log, "Subquery has empty result.");
     }
-
-    if (totals)
-        subquery.setTotals(getInputPort().getHeader().cloneWithColumns(totals.detachColumns()));
-    else
-        /// Set empty totals anyway, it is needed for MergeJoin.
-        subquery.setTotals({});
 }
 
 void CreatingSetsTransform::init()
@@ -111,12 +100,6 @@ void CreatingSetsTransform::consume(Chunk chunk)
             done_with_set = true;
     }
 
-    if (!done_with_join)
-    {
-        if (!subquery.insertJoinedBlock(block))
-            done_with_join = true;
-    }
-
     if (!done_with_table)
     {
         block = materializeBlock(block);
@@ -130,7 +113,7 @@ void CreatingSetsTransform::consume(Chunk chunk)
             done_with_table = true;
     }
 
-    if (done_with_set && done_with_join && done_with_table)
+    if (done_with_set && done_with_table)
         finishConsume();
 }
 
diff --git a/src/Processors/Transforms/CreatingSetsTransform.h b/src/Processors/Transforms/CreatingSetsTransform.h
index 3452de63ea0..a847582a988 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.h
+++ b/src/Processors/Transforms/CreatingSetsTransform.h
@@ -1,9 +1,13 @@
 #pragma once
-#include <Poco/Logger.h>
-#include <Processors/IAccumulatingTransform.h>
-#include <Interpreters/SubqueryForSet.h>
-#include <Common/Stopwatch.h>
+
 #include <DataStreams/SizeLimits.h>
+#include <DataStreams/IBlockStream_fwd.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/SubqueryForSet.h>
+#include <Processors/IAccumulatingTransform.h>
+#include <Common/Stopwatch.h>
+
+#include <Poco/Logger.h>
 
 namespace DB
 {
@@ -16,7 +20,7 @@ using ProgressCallback = std::function<void(const Progress & progress)>;
 /// Don't return any data. Sets are created when Finish status is returned.
 /// In general, several work() methods need to be called to finish.
 /// Independent processors is created for each subquery.
-class CreatingSetsTransform : public IAccumulatingTransform
+class CreatingSetsTransform : public IAccumulatingTransform, WithContext
 {
 public:
     CreatingSetsTransform(
@@ -24,7 +28,7 @@ public:
         Block out_header_,
         SubqueryForSet subquery_for_set_,
         SizeLimits network_transfer_limits_,
-        const Context & context_);
+        ContextPtr context_);
 
     String getName() const override { return "CreatingSetsTransform"; }
 
@@ -40,11 +44,10 @@ private:
     Stopwatch watch;
 
     bool done_with_set = true;
-    bool done_with_join = true;
+    //bool done_with_join = true;
     bool done_with_table = true;
 
     SizeLimits network_transfer_limits;
-    const Context & context;
 
     size_t rows_to_transfer = 0;
     size_t bytes_to_transfer = 0;
diff --git a/src/Processors/Transforms/ExpressionTransform.cpp b/src/Processors/Transforms/ExpressionTransform.cpp
index e60fc65e96e..efdff086efa 100644
--- a/src/Processors/Transforms/ExpressionTransform.cpp
+++ b/src/Processors/Transforms/ExpressionTransform.cpp
@@ -3,16 +3,14 @@
 namespace DB
 {
 
-Block ExpressionTransform::transformHeader(Block header, const ExpressionActionsPtr & expression)
+Block ExpressionTransform::transformHeader(Block header, const ActionsDAG & expression)
 {
-    size_t num_rows = header.rows();
-    expression->execute(header, num_rows, true);
-    return header;
+    return expression.updateHeader(std::move(header));
 }
 
 
 ExpressionTransform::ExpressionTransform(const Block & header_, ExpressionActionsPtr expression_)
-    : ISimpleTransform(header_, transformHeader(header_, expression_), false)
+    : ISimpleTransform(header_, transformHeader(header_, expression_->getActionsDAG()), false)
     , expression(std::move(expression_))
 {
 }
diff --git a/src/Processors/Transforms/ExpressionTransform.h b/src/Processors/Transforms/ExpressionTransform.h
index 525273bad81..d4cc1c8f78a 100644
--- a/src/Processors/Transforms/ExpressionTransform.h
+++ b/src/Processors/Transforms/ExpressionTransform.h
@@ -7,6 +7,8 @@ namespace DB
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
+class ActionsDAG;
+
 /** 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%'
@@ -21,7 +23,7 @@ public:
 
     String getName() const override { return "ExpressionTransform"; }
 
-    static Block transformHeader(Block header, const ExpressionActionsPtr & expression);
+    static Block transformHeader(Block header, const ActionsDAG & expression);
 
 protected:
     void transform(Chunk & chunk) override;
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index 3f3a0e75223..8419daf9186 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -1,6 +1,11 @@
 #include <Processors/Transforms/FillingTransform.h>
 #include <Interpreters/convertFieldToType.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/IDataType.h>
+#include <Core/Types.h>
+#include <DataTypes/DataTypesDecimal.h>
+
 
 namespace DB
 {
@@ -36,18 +41,31 @@ FillingTransform::FillingTransform(
         auto max_type = Field::Types::Null;
         WhichDataType which(type);
         DataTypePtr to_type;
-        if (isInteger(type) || which.isDateOrDateTime())
+
+        /// TODO Wrong results for big integers.
+        if (isInteger(type) || which.isDate() || which.isDateTime())
         {
             max_type = Field::Types::Int64;
             to_type = std::make_shared<DataTypeInt64>();
         }
+        else if (which.isDateTime64())
+        {
+            max_type = Field::Types::Decimal64;
+            const auto & date_type = static_cast<const DataTypeDateTime64 &>(*type);
+            size_t precision = date_type.getPrecision();
+            size_t scale = date_type.getScale();
+            to_type = std::make_shared<DataTypeDecimal<Decimal64>>(precision, scale);
+        }
         else if (which.isFloat())
         {
             max_type = Field::Types::Float64;
             to_type = std::make_shared<DataTypeFloat64>();
         }
+        else
+            return false;
 
-        if (descr.fill_from.getType() > max_type || descr.fill_to.getType() > max_type
+        if (descr.fill_from.getType() > max_type
+            || descr.fill_to.getType() > max_type
             || descr.fill_step.getType() > max_type)
             return false;
 
diff --git a/src/Processors/Transforms/FilterTransform.cpp b/src/Processors/Transforms/FilterTransform.cpp
index 23b1bf8a984..364fb8e1958 100644
--- a/src/Processors/Transforms/FilterTransform.cpp
+++ b/src/Processors/Transforms/FilterTransform.cpp
@@ -29,12 +29,11 @@ static void replaceFilterToConstant(Block & block, const String & filter_column_
 
 Block FilterTransform::transformHeader(
     Block header,
-    const ExpressionActionsPtr & expression,
+    const ActionsDAG & expression,
     const String & filter_column_name,
     bool remove_filter_column)
 {
-    size_t num_rows = header.rows();
-    expression->execute(header, num_rows);
+    header = expression.updateHeader(std::move(header));
 
     if (remove_filter_column)
         header.erase(filter_column_name);
@@ -50,7 +49,10 @@ FilterTransform::FilterTransform(
     String filter_column_name_,
     bool remove_filter_column_,
     bool on_totals_)
-    : ISimpleTransform(header_, transformHeader(header_, expression_, filter_column_name_, remove_filter_column_), true)
+    : ISimpleTransform(
+            header_,
+            transformHeader(header_, expression_->getActionsDAG(), filter_column_name_, remove_filter_column_),
+            true)
     , expression(std::move(expression_))
     , filter_column_name(std::move(filter_column_name_))
     , remove_filter_column(remove_filter_column_)
diff --git a/src/Processors/Transforms/FilterTransform.h b/src/Processors/Transforms/FilterTransform.h
index c0ccf0fd072..39f1f1c42db 100644
--- a/src/Processors/Transforms/FilterTransform.h
+++ b/src/Processors/Transforms/FilterTransform.h
@@ -8,6 +8,8 @@ namespace DB
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
+class ActionsDAG;
+
 /** Implements WHERE, HAVING operations.
   * Takes an expression, which adds to the block one ColumnUInt8 column containing the filtering conditions.
   * The expression is evaluated and result chunks contain only the filtered rows.
@@ -22,7 +24,7 @@ public:
 
     static Block transformHeader(
             Block header,
-            const ExpressionActionsPtr & expression,
+            const ActionsDAG & expression,
             const String & filter_column_name,
             bool remove_filter_column);
 
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index dea887fd7d7..31b2da46ab3 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -1,10 +1,17 @@
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/ExpressionActions.h>
+#include <DataStreams/IBlockInputStream.h>
+#include <DataTypes/DataTypesNumber.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 Block JoiningTransform::transformHeader(Block header, const JoinPtr & join)
 {
     ExtraBlockPtr tmp;
@@ -12,13 +19,128 @@ Block JoiningTransform::transformHeader(Block header, const JoinPtr & join)
     return header;
 }
 
-JoiningTransform::JoiningTransform(Block input_header, JoinPtr join_,
-                                   bool on_totals_, bool default_totals_)
-    : ISimpleTransform(input_header, transformHeader(input_header, join_), on_totals_)
+JoiningTransform::JoiningTransform(
+    Block input_header,
+    JoinPtr join_,
+    size_t max_block_size_,
+    bool on_totals_,
+    bool default_totals_,
+    FinishCounterPtr finish_counter_)
+    : IProcessor({input_header}, {transformHeader(input_header, join_)})
     , join(std::move(join_))
     , on_totals(on_totals_)
     , default_totals(default_totals_)
-{}
+    , finish_counter(std::move(finish_counter_))
+    , max_block_size(max_block_size_)
+{
+    if (!join->isFilled())
+        inputs.emplace_back(Block(), this);
+}
+
+IProcessor::Status JoiningTransform::prepare()
+{
+    auto & output = outputs.front();
+
+    /// Check can output.
+    if (output.isFinished() || stop_reading)
+    {
+        output.finish();
+        for (auto & input : inputs)
+            input.close();
+        return Status::Finished;
+    }
+
+    if (!output.canPush())
+    {
+        for (auto & input : inputs)
+            input.setNotNeeded();
+        return Status::PortFull;
+    }
+
+    /// Output if has data.
+    if (has_output)
+    {
+        output.push(std::move(output_chunk));
+        has_output = false;
+
+        return Status::PortFull;
+    }
+
+    if (inputs.size() > 1)
+    {
+        auto & last_in = inputs.back();
+        if (!last_in.isFinished())
+        {
+            last_in.setNeeded();
+            if (last_in.hasData())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "No data is expected from second JoiningTransform port");
+
+            return Status::NeedData;
+        }
+    }
+
+    if (has_input)
+        return Status::Ready;
+
+    auto & input = inputs.front();
+    if (input.isFinished())
+    {
+        if (process_non_joined)
+            return Status::Ready;
+
+        output.finish();
+        return Status::Finished;
+    }
+
+    input.setNeeded();
+
+    if (!input.hasData())
+        return Status::NeedData;
+
+    input_chunk = input.pull(true);
+    has_input = true;
+    return Status::Ready;
+}
+
+void JoiningTransform::work()
+{
+    if (has_input)
+    {
+        transform(input_chunk);
+        output_chunk.swap(input_chunk);
+        has_input = not_processed != nullptr;
+        has_output = !output_chunk.empty();
+    }
+    else
+    {
+        if (!non_joined_stream)
+        {
+            if (!finish_counter || !finish_counter->isLast())
+            {
+                process_non_joined = false;
+                return;
+            }
+
+            non_joined_stream = join->createStreamWithNonJoinedRows(outputs.front().getHeader(), max_block_size);
+            if (!non_joined_stream)
+            {
+                process_non_joined = false;
+                return;
+            }
+        }
+
+        auto block = non_joined_stream->read();
+        if (!block)
+        {
+            process_non_joined = false;
+            return;
+        }
+
+        auto rows = block.rows();
+        output_chunk.setColumns(block.getColumns(), rows);
+        has_output = true;
+    }
+}
 
 void JoiningTransform::transform(Chunk & chunk)
 {
@@ -28,7 +150,7 @@ void JoiningTransform::transform(Chunk & chunk)
 
         if (join->alwaysReturnsEmptySet() && !on_totals)
         {
-            stopReading();
+            stop_reading = true;
             chunk.clear();
             return;
         }
@@ -42,7 +164,7 @@ void JoiningTransform::transform(Chunk & chunk)
         auto cols = chunk.detachColumns();
         for (auto & col : cols)
             col = col->cloneResized(1);
-        block = getInputPort().getHeader().cloneWithColumns(std::move(cols));
+        block = inputs.front().getHeader().cloneWithColumns(std::move(cols));
 
         /// Drop totals if both out stream and joined stream doesn't have ones.
         /// See comment in ExpressionTransform.h
@@ -61,29 +183,122 @@ void JoiningTransform::transform(Chunk & chunk)
 Block JoiningTransform::readExecute(Chunk & chunk)
 {
     Block res;
+    // std::cerr << "=== Chunk rows " << chunk.getNumRows() << " cols " << chunk.getNumColumns() << std::endl;
 
     if (!not_processed)
     {
+        // std::cerr << "!not_processed " << std::endl;
         if (chunk.hasColumns())
-            res = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
+            res = inputs.front().getHeader().cloneWithColumns(chunk.detachColumns());
 
         if (res)
             join->joinBlock(res, not_processed);
     }
     else if (not_processed->empty()) /// There's not processed data inside expression.
     {
+        // std::cerr << "not_processed->empty() " << std::endl;
         if (chunk.hasColumns())
-            res = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
+            res = inputs.front().getHeader().cloneWithColumns(chunk.detachColumns());
 
         not_processed.reset();
         join->joinBlock(res, not_processed);
     }
     else
     {
+        // std::cerr << "not not_processed->empty() " << std::endl;
         res = std::move(not_processed->block);
         join->joinBlock(res, not_processed);
     }
+
+    // std::cerr << "Res block rows " << res.rows() << " cols " << res.columns() << std::endl;
     return res;
 }
 
+FillingRightJoinSideTransform::FillingRightJoinSideTransform(Block input_header, JoinPtr join_)
+    : IProcessor({input_header}, {Block()})
+    , join(std::move(join_))
+{}
+
+InputPort * FillingRightJoinSideTransform::addTotalsPort()
+{
+    if (inputs.size() > 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Totals port was already added to FillingRightJoinSideTransform");
+
+    return &inputs.emplace_back(inputs.front().getHeader(), this);
+}
+
+IProcessor::Status FillingRightJoinSideTransform::prepare()
+{
+    auto & output = outputs.front();
+
+    /// Check can output.
+    if (output.isFinished())
+    {
+        for (auto & input : inputs)
+            input.close();
+        return Status::Finished;
+    }
+
+    if (!output.canPush())
+    {
+        for (auto & input : inputs)
+            input.setNotNeeded();
+        return Status::PortFull;
+    }
+
+    auto & input = inputs.front();
+
+    if (stop_reading)
+    {
+        input.close();
+    }
+    else if (!input.isFinished())
+    {
+        input.setNeeded();
+
+        if (!input.hasData())
+            return Status::NeedData;
+
+        chunk = input.pull(true);
+        return Status::Ready;
+    }
+
+    if (inputs.size() > 1)
+    {
+        auto & totals_input = inputs.back();
+        if (!totals_input.isFinished())
+        {
+            totals_input.setNeeded();
+
+            if (!totals_input.hasData())
+                return Status::NeedData;
+
+            chunk = totals_input.pull(true);
+            for_totals = true;
+            return Status::Ready;
+        }
+    }
+    else if (!set_totals)
+    {
+        chunk.setColumns(inputs.front().getHeader().cloneEmpty().getColumns(), 0);
+        for_totals = true;
+        return Status::Ready;
+    }
+
+    output.finish();
+    return Status::Finished;
+}
+
+void FillingRightJoinSideTransform::work()
+{
+    auto block = inputs.front().getHeader().cloneWithColumns(chunk.detachColumns());
+
+    if (for_totals)
+        join->setTotals(block);
+    else
+        stop_reading = !join->addJoinedBlock(block);
+
+    set_totals = for_totals;
+}
+
 }
diff --git a/src/Processors/Transforms/JoiningTransform.h b/src/Processors/Transforms/JoiningTransform.h
index 15a203635e2..98038946f3b 100644
--- a/src/Processors/Transforms/JoiningTransform.h
+++ b/src/Processors/Transforms/JoiningTransform.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Processors/ISimpleTransform.h>
+#include <Processors/IProcessor.h>
 
 
 namespace DB
@@ -8,21 +8,63 @@ namespace DB
 class IJoin;
 using JoinPtr = std::shared_ptr<IJoin>;
 
-class JoiningTransform : public ISimpleTransform
+class IBlockInputStream;
+using BlockInputStreamPtr = std::shared_ptr<IBlockInputStream>;
+
+/// Join rows to chunk form left table.
+/// This transform usually has two input ports and one output.
+/// First input is for data from left table.
+/// Second input has empty header and is connected with FillingRightJoinSide.
+/// We can process left table only when Join is filled. Second input is used to signal that FillingRightJoinSide is finished.
+class JoiningTransform : public IProcessor
 {
 public:
-    JoiningTransform(Block input_header, JoinPtr join_,
-                     bool on_totals_ = false, bool default_totals_ = false);
+
+    /// Count streams and check which is last.
+    /// The last one should process non-joined rows.
+    class FinishCounter
+    {
+    public:
+        explicit FinishCounter(size_t total_) : total(total_) {}
+
+        bool isLast()
+        {
+            return finished.fetch_add(1) + 1 >= total;
+        }
+
+    private:
+        const size_t total;
+        std::atomic<size_t> finished{0};
+    };
+
+    using FinishCounterPtr = std::shared_ptr<FinishCounter>;
+
+    JoiningTransform(
+        Block input_header,
+        JoinPtr join_,
+        size_t max_block_size_,
+        bool on_totals_ = false,
+        bool default_totals_ = false,
+        FinishCounterPtr finish_counter_ = nullptr);
 
     String getName() const override { return "JoiningTransform"; }
 
     static Block transformHeader(Block header, const JoinPtr & join);
 
+    Status prepare() override;
+    void work() override;
+
 protected:
-    void transform(Chunk & chunk) override;
-    bool needInputData() const override { return !not_processed; }
+    void transform(Chunk & chunk);
 
 private:
+    Chunk input_chunk;
+    Chunk output_chunk;
+    bool has_input = false;
+    bool has_output = false;
+    bool stop_reading = false;
+    bool process_non_joined = true;
+
     JoinPtr join;
     bool on_totals;
     /// This flag means that we have manually added totals to our pipeline.
@@ -33,7 +75,33 @@ private:
 
     ExtraBlockPtr not_processed;
 
+    FinishCounterPtr finish_counter;
+    BlockInputStreamPtr non_joined_stream;
+    size_t max_block_size;
+
     Block readExecute(Chunk & chunk);
 };
 
+/// Fills Join with block from right table.
+/// Has single input and single output port.
+/// Output port has empty header. It is closed when al data is inserted in join.
+class FillingRightJoinSideTransform : public IProcessor
+{
+public:
+    FillingRightJoinSideTransform(Block input_header, JoinPtr join_);
+    String getName() const override { return "FillingRightJoinSide"; }
+
+    InputPort * addTotalsPort();
+
+    Status prepare() override;
+    void work() override;
+
+private:
+    JoinPtr join;
+    Chunk chunk;
+    bool stop_reading = false;
+    bool for_totals = false;
+    bool set_totals = false;
+};
+
 }
diff --git a/src/Processors/Transforms/LimitByTransform.cpp b/src/Processors/Transforms/LimitByTransform.cpp
index 5c405046a83..cb2804007bd 100644
--- a/src/Processors/Transforms/LimitByTransform.cpp
+++ b/src/Processors/Transforms/LimitByTransform.cpp
@@ -33,13 +33,13 @@ void LimitByTransform::transform(Chunk & chunk)
 
     for (UInt64 row = 0; row < num_rows; ++row)
     {
-        UInt128 key(0, 0);
+        UInt128 key{};
         SipHash hash;
 
         for (auto position : key_positions)
             columns[position]->updateHashWithValue(row, hash);
 
-        hash.get128(key.low, key.high);
+        hash.get128(key);
 
         auto count = keys_counts[key]++;
         if (count >= group_offset
diff --git a/src/Processors/Transforms/LimitByTransform.h b/src/Processors/Transforms/LimitByTransform.h
index 9773f637f40..8c2b46af69e 100644
--- a/src/Processors/Transforms/LimitByTransform.h
+++ b/src/Processors/Transforms/LimitByTransform.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Processors/ISimpleTransform.h>
 #include <Common/HashTable/HashMap.h>
-#include <Common/UInt128.h>
+
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
index 83c1e35ad12..df2ea4b03f0 100644
--- a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
@@ -228,13 +228,14 @@ IProcessor::Status GroupingAggregatedTransform::prepare()
             return Status::PortFull;
 
         /// Sanity check. If new bucket was read, we should be able to push it.
-        if (!all_inputs_finished)
+        /// This is always false, but we still keep this condition in case the code will be changed.
+        if (!all_inputs_finished) // -V547
             throw Exception("GroupingAggregatedTransform has read new two-level bucket, but couldn't push it.",
                             ErrorCodes::LOGICAL_ERROR);
     }
     else
     {
-        if (!all_inputs_finished)
+        if (!all_inputs_finished) // -V547
             throw Exception("GroupingAggregatedTransform should have read all chunks for single level aggregation, "
                             "but not all of the inputs are finished.", ErrorCodes::LOGICAL_ERROR);
 
diff --git a/src/Processors/Transforms/MergingAggregatedTransform.cpp b/src/Processors/Transforms/MergingAggregatedTransform.cpp
index 1a04f85fd9c..ddc58d830da 100644
--- a/src/Processors/Transforms/MergingAggregatedTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedTransform.cpp
@@ -52,7 +52,7 @@ Chunk MergingAggregatedTransform::generate()
     if (!generate_started)
     {
         generate_started = true;
-        LOG_TRACE(log, "Read {} blocks of partially aggregated data, total {} rows.", total_input_blocks, total_input_rows);
+        LOG_DEBUG(log, "Read {} blocks of partially aggregated data, total {} rows.", total_input_blocks, total_input_rows);
 
         /// Exception safety. Make iterator valid in case any method below throws.
         next_block = blocks.begin();
diff --git a/src/Processors/Transforms/TotalsHavingTransform.cpp b/src/Processors/Transforms/TotalsHavingTransform.cpp
index c81c389b6fa..9724d332f15 100644
--- a/src/Processors/Transforms/TotalsHavingTransform.cpp
+++ b/src/Processors/Transforms/TotalsHavingTransform.cpp
@@ -28,15 +28,13 @@ void finalizeChunk(Chunk & chunk)
     chunk.setColumns(std::move(columns), num_rows);
 }
 
-Block TotalsHavingTransform::transformHeader(Block block, const ExpressionActionsPtr & expression, bool final)
+Block TotalsHavingTransform::transformHeader(Block block, const ActionsDAG * expression, bool final)
 {
     if (final)
         finalizeBlock(block);
 
-    size_t num_rows = block.rows();
-
     if (expression)
-        expression->execute(block, num_rows);
+        block = expression->updateHeader(std::move(block));
 
     return block;
 }
@@ -49,7 +47,7 @@ TotalsHavingTransform::TotalsHavingTransform(
     TotalsMode totals_mode_,
     double auto_include_threshold_,
     bool final_)
-    : ISimpleTransform(header, transformHeader(header, expression_, final_), true)
+    : ISimpleTransform(header, transformHeader(header, expression_  ? &expression_->getActionsDAG() : nullptr, final_), true)
     , overflow_row(overflow_row_)
     , expression(expression_)
     , filter_column_name(filter_column_)
diff --git a/src/Processors/Transforms/TotalsHavingTransform.h b/src/Processors/Transforms/TotalsHavingTransform.h
index 8191ec763b0..5809f382e0e 100644
--- a/src/Processors/Transforms/TotalsHavingTransform.h
+++ b/src/Processors/Transforms/TotalsHavingTransform.h
@@ -12,6 +12,8 @@ using ArenaPtr = std::shared_ptr<Arena>;
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
+class ActionsDAG;
+
 enum class TotalsMode;
 
 /** Takes blocks after grouping, with non-finalized aggregate functions.
@@ -37,7 +39,7 @@ public:
     Status prepare() override;
     void work() override;
 
-    static Block transformHeader(Block block, const ExpressionActionsPtr & expression, bool final);
+    static Block transformHeader(Block block, const ActionsDAG * expression, bool final);
 
 protected:
     void transform(Chunk & chunk) override;
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 16d028f0fc1..03e7d958edd 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -3,6 +3,7 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Common/Arena.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
+#include <common/arithmeticOverflow.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Interpreters/ExpressionActions.h>
@@ -12,6 +13,8 @@
 namespace DB
 {
 
+struct Settings;
+
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
@@ -67,15 +70,9 @@ static int compareValuesWithOffset(const IColumn * _compared_column,
 
     bool is_overflow;
     if (offset_is_preceding)
-    {
-        is_overflow = __builtin_sub_overflow(reference_value, offset,
-            &reference_value);
-    }
+        is_overflow = common::subOverflow(reference_value, offset, reference_value);
     else
-    {
-        is_overflow = __builtin_add_overflow(reference_value, offset,
-            &reference_value);
-    }
+        is_overflow = common::addOverflow(reference_value, offset, reference_value);
 
 //    fmt::print(stderr,
 //        "compared [{}] = {}, old ref {}, shifted ref [{}] = {}, offset {} preceding {} overflow {} to negative {}\n",
@@ -257,10 +254,9 @@ WindowTransform::WindowTransform(const Block & input_header_,
         const IColumn * column = entry.column.get();
         APPLY_FOR_TYPES(compareValuesWithOffset)
 
-        // Check that the offset type matches the window type.
         // Convert the offsets to the ORDER BY column type. We can't just check
-        // that it matches, because e.g. the int literals are always (U)Int64,
-        // but the column might be Int8 and so on.
+        // that the type matches, because e.g. the int literals are always
+        // (U)Int64, but the column might be Int8 and so on.
         if (window_description.frame.begin_type
             == WindowFrame::BoundaryType::Offset)
         {
@@ -435,6 +431,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
+            // this negation should always work.
+            assert(offset >= -INT_MAX);
             if (x.row >= static_cast<uint64_t>(-offset))
             {
                 x.row -= -offset;
@@ -973,7 +972,14 @@ void WindowTransform::appendChunk(Chunk & chunk)
     // have it if it's end of data, though.
     if (!input_is_finished)
     {
-        assert(chunk.hasRows());
+        if (!chunk.hasRows())
+        {
+            // Joins may generate empty input chunks when it's not yet end of
+            // input. Just ignore them. They probably shouldn't be sending empty
+            // chunks up the pipeline, but oh well.
+            return;
+        }
+
         blocks.push_back({});
         auto & block = blocks.back();
         // Use the number of rows from the Chunk, because it is correct even in
@@ -1375,6 +1381,8 @@ struct WindowFunctionRank final : public WindowFunction
     DataTypePtr getReturnType() const override
     { return std::make_shared<DataTypeUInt64>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) override
     {
@@ -1395,6 +1403,8 @@ struct WindowFunctionDenseRank final : public WindowFunction
     DataTypePtr getReturnType() const override
     { return std::make_shared<DataTypeUInt64>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) override
     {
@@ -1415,6 +1425,8 @@ struct WindowFunctionRowNumber final : public WindowFunction
     DataTypePtr getReturnType() const override
     { return std::make_shared<DataTypeUInt64>(); }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) override
     {
@@ -1450,7 +1462,7 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             return;
         }
 
-        if (!isInt64FieldType(argument_types[1]->getDefault().getType()))
+        if (!isInt64OrUInt64FieldType(argument_types[1]->getDefault().getType()))
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Offset must be an integer, '{}' given",
@@ -1481,6 +1493,8 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
     DataTypePtr getReturnType() const override
     { return argument_types[0]; }
 
+    bool allocatesMemoryInArena() const override { return false; }
+
     void windowInsertResultInto(const WindowTransform * transform,
         size_t function_index) override
     {
@@ -1488,7 +1502,7 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
         IColumn & to = *current_block.output_columns[function_index];
         const auto & workspace = transform->workspaces[function_index];
 
-        int offset = 1;
+        int64_t offset = 1;
         if (argument_types.size() > 1)
         {
             offset = (*current_block.input_columns[
@@ -1500,6 +1514,12 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
                     "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);
+            }
         }
 
         const auto [target_row, offset_left] = transform->moveRowNumber(
@@ -1553,35 +1573,35 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
     // instead of adding separate logic for them.
 
     factory.registerFunction("rank", [](const std::string & name,
-            const DataTypes & argument_types, const Array & parameters)
+            const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionRank>(name, argument_types,
                 parameters);
         });
 
     factory.registerFunction("dense_rank", [](const std::string & name,
-            const DataTypes & argument_types, const Array & parameters)
+            const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionDenseRank>(name, argument_types,
                 parameters);
         });
 
     factory.registerFunction("row_number", [](const std::string & name,
-            const DataTypes & argument_types, const Array & parameters)
+            const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionRowNumber>(name, argument_types,
                 parameters);
         });
 
     factory.registerFunction("lagInFrame", [](const std::string & name,
-            const DataTypes & argument_types, const Array & parameters)
+            const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionLagLeadInFrame<false>>(
                 name, argument_types, parameters);
         });
 
     factory.registerFunction("leadInFrame", [](const std::string & name,
-            const DataTypes & argument_types, const Array & parameters)
+            const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionLagLeadInFrame<true>>(
                 name, argument_types, parameters);
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index 882bf429c0a..611b03ebf72 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -8,6 +8,7 @@
 
 #include <deque>
 
+
 namespace DB
 {
 
diff --git a/src/Functions/tests/CMakeLists.txt b/src/Processors/examples/CMakeLists.txt
similarity index 100%
rename from src/Functions/tests/CMakeLists.txt
rename to src/Processors/examples/CMakeLists.txt
diff --git a/src/Processors/tests/processors_test_aggregation.cpp b/src/Processors/examples/processors_test_aggregation.cpp
similarity index 100%
rename from src/Processors/tests/processors_test_aggregation.cpp
rename to src/Processors/examples/processors_test_aggregation.cpp
diff --git a/src/Processors/tests/processors_test_merge_sorting_transform.cpp b/src/Processors/examples/processors_test_merge_sorting_transform.cpp
similarity index 100%
rename from src/Processors/tests/processors_test_merge_sorting_transform.cpp
rename to src/Processors/examples/processors_test_merge_sorting_transform.cpp
diff --git a/src/Processors/ya.make b/src/Processors/ya.make
index 35abfbae756..86a40685d1f 100644
--- a/src/Processors/ya.make
+++ b/src/Processors/ya.make
@@ -93,7 +93,6 @@ SRCS(
     Pipe.cpp
     Port.cpp
     QueryPipeline.cpp
-    QueryPlan/AddingDelayedSourceStep.cpp
     QueryPlan/AggregatingStep.cpp
     QueryPlan/ArrayJoinStep.cpp
     QueryPlan/BuildQueryPipelineSettings.cpp
@@ -108,11 +107,11 @@ SRCS(
     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/MergingFinal.cpp
     QueryPlan/MergingSortedStep.cpp
     QueryPlan/OffsetStep.cpp
     QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
@@ -125,9 +124,9 @@ SRCS(
     QueryPlan/PartialSortingStep.cpp
     QueryPlan/QueryIdHolder.cpp
     QueryPlan/QueryPlan.cpp
+    QueryPlan/ReadFromMergeTree.cpp
     QueryPlan/ReadFromPreparedSource.cpp
     QueryPlan/ReadNothingStep.cpp
-    QueryPlan/ReverseRowsStep.cpp
     QueryPlan/RollupStep.cpp
     QueryPlan/SettingQuotaAndLimitsStep.cpp
     QueryPlan/TotalsHavingStep.cpp
diff --git a/src/Processors/ya.make.in b/src/Processors/ya.make.in
index f33dd041a32..06230b96be8 100644
--- a/src/Processors/ya.make.in
+++ b/src/Processors/ya.make.in
@@ -10,7 +10,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -P 'Arrow|Avro|ORC|Parquet|CapnProto' | sed 's/^\.\//    /' | sort ?>
+<? 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/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index 52a2c106488..2d6de423c5b 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -521,7 +521,7 @@ namespace
         Poco::Logger * log = nullptr;
 
         std::shared_ptr<NamedSession> session;
-        std::optional<Context> query_context;
+        ContextMutablePtr query_context;
         std::optional<CurrentThread::QueryScope> query_scope;
         String query_text;
         ASTPtr ast;
@@ -651,7 +651,7 @@ namespace
         }
 
         /// Create context.
-        query_context.emplace(iserver.context());
+        query_context = Context::createCopy(iserver.context());
 
         /// Authentication.
         query_context->setUser(user, password, user_address);
@@ -665,11 +665,11 @@ namespace
         {
             session = query_context->acquireNamedSession(
                 query_info.session_id(), getSessionTimeout(query_info, iserver.config()), query_info.session_check());
-            query_context = session->context;
+            query_context = Context::createCopy(session->context);
             query_context->setSessionContext(session->context);
         }
 
-        query_scope.emplace(*query_context);
+        query_scope.emplace(query_context);
 
         /// Set client info.
         ClientInfo & client_info = query_context->getClientInfo();
@@ -741,26 +741,26 @@ namespace
             output_format = query_context->getDefaultFormat();
 
         /// Set callback to create and fill external tables
-        query_context->setExternalTablesInitializer([this] (Context & context)
+        query_context->setExternalTablesInitializer([this] (ContextPtr context)
         {
-            if (&context != &*query_context)
+            if (context != query_context)
                 throw Exception("Unexpected context in external tables initializer", ErrorCodes::LOGICAL_ERROR);
             createExternalTables();
         });
 
         /// Set callbacks to execute function input().
-        query_context->setInputInitializer([this] (Context & context, const StoragePtr & input_storage)
+        query_context->setInputInitializer([this] (ContextPtr context, const StoragePtr & input_storage)
         {
-            if (&context != &query_context.value())
+            if (context != query_context)
                 throw Exception("Unexpected context in Input initializer", ErrorCodes::LOGICAL_ERROR);
             input_function_is_used = true;
             initializeBlockInputStream(input_storage->getInMemoryMetadataPtr()->getSampleBlock());
             block_input_stream->readPrefix();
         });
 
-        query_context->setInputBlocksReaderCallback([this](Context & context) -> Block
+        query_context->setInputBlocksReaderCallback([this](ContextPtr context) -> Block
         {
-            if (&context != &query_context.value())
+            if (context != query_context)
                 throw Exception("Unexpected context in InputBlocksReader", ErrorCodes::LOGICAL_ERROR);
             auto block = block_input_stream->read();
             if (!block)
@@ -775,7 +775,7 @@ 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(query, query_context, false, QueryProcessingStage::Complete, true, true);
     }
 
     void Call::processInput()
@@ -878,10 +878,10 @@ namespace
                 auto table_id = query_context->resolveStorageID(insert_query->table_id, Context::ResolveOrdinary);
                 if (query_context->getSettingsRef().input_format_defaults_for_omitted_fields && table_id)
                 {
-                    StoragePtr storage = DatabaseCatalog::instance().getTable(table_id, *query_context);
+                    StoragePtr storage = DatabaseCatalog::instance().getTable(table_id, query_context);
                     const auto & columns = storage->getInMemoryMetadataPtr()->getColumns();
                     if (!columns.empty())
-                        block_input_stream = std::make_shared<AddingDefaultsBlockInputStream>(block_input_stream, columns, *query_context);
+                        block_input_stream = std::make_shared<AddingDefaultsBlockInputStream>(block_input_stream, columns, query_context);
                 }
             }
         }
@@ -903,7 +903,7 @@ namespace
                 StoragePtr storage;
                 if (auto resolved = query_context->tryResolveStorageID(temporary_id, Context::ResolveExternal))
                 {
-                    storage = DatabaseCatalog::instance().getTable(resolved, *query_context);
+                    storage = DatabaseCatalog::instance().getTable(resolved, query_context);
                 }
                 else
                 {
@@ -918,7 +918,7 @@ namespace
                         column.type = DataTypeFactory::instance().get(name_and_type.type());
                         columns.emplace_back(std::move(column));
                     }
-                    auto temporary_table = TemporaryTableHolder(*query_context, ColumnsDescription{columns}, {});
+                    auto temporary_table = TemporaryTableHolder(query_context, ColumnsDescription{columns}, {});
                     storage = temporary_table.getTable();
                     query_context->addExternalTable(temporary_id.table_name, std::move(temporary_table));
                 }
@@ -927,17 +927,17 @@ namespace
                 {
                     /// The data will be written directly to the table.
                     auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-                    auto out_stream = storage->write(ASTPtr(), metadata_snapshot, *query_context);
+                    auto out_stream = 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())
                         format = "TabSeparated";
-                    Context * external_table_context = &*query_context;
-                    std::optional<Context> temp_context;
+                    ContextMutablePtr external_table_context = query_context;
+                    ContextMutablePtr temp_context;
                     if (!external_table.settings().empty())
                     {
-                        temp_context = *query_context;
-                        external_table_context = &*temp_context;
+                        temp_context = Context::createCopy(query_context);
+                        external_table_context = temp_context;
                         SettingsChanges settings_changes;
                         for (const auto & [key, value] : external_table.settings())
                             settings_changes.push_back({key, value});
diff --git a/src/Server/HTTP/HTMLForm.cpp b/src/Server/HTTP/HTMLForm.cpp
index 7a87f484b5c..9e0f74dcc33 100644
--- a/src/Server/HTTP/HTMLForm.cpp
+++ b/src/Server/HTTP/HTMLForm.cpp
@@ -244,7 +244,7 @@ bool HTMLForm::MultipartReadBuffer::skipToNextBoundary()
 
     while (!in.eof())
     {
-        auto line = readLine();
+        auto line = readLine(true);
         if (startsWith(line, boundary))
         {
             set(in.position(), 0);
@@ -256,29 +256,36 @@ bool HTMLForm::MultipartReadBuffer::skipToNextBoundary()
     throw Poco::Net::HTMLFormException("No boundary line found");
 }
 
-std::string HTMLForm::MultipartReadBuffer::readLine(bool strict)
+std::string HTMLForm::MultipartReadBuffer::readLine(bool append_crlf)
 {
     std::string line;
     char ch = 0;  // silence "uninitialized" warning from gcc-*
 
-    while (in.read(ch) && ch != '\r' && ch != '\n')
+    /// If we don't append CRLF, it means that we may have to prepend CRLF from previous content line, which wasn't the boundary.
+    if (in.read(ch))
         line += ch;
-
-    if (in.eof())
-    {
-        if (strict)
-            throw Poco::Net::HTMLFormException("Unexpected end of message");
+    if (in.read(ch))
+        line += ch;
+    if (append_crlf && line == "\r\n")
         return line;
-    }
 
-    line += ch;
-
-    if (ch == '\r')
+    while (!in.eof())
     {
-        if (!in.read(ch) || ch != '\n')
-            throw Poco::Net::HTMLFormException("No CRLF found");
-        else
+        while (in.read(ch) && ch != '\r')
             line += ch;
+
+        if (in.eof()) break;
+
+        assert(ch == '\r');
+
+        if (in.peek(ch) && ch == '\n')
+        {
+            in.ignore();
+            if (append_crlf) line += "\r\n";
+            break;
+        }
+
+        line += ch;
     }
 
     return line;
@@ -300,19 +307,12 @@ bool HTMLForm::MultipartReadBuffer::nextImpl()
     /// FIXME: there is an extra copy because we cannot traverse PeekableBuffer from checkpoint to position()
     ///        since it may store different data parts in different sub-buffers,
     ///        anyway calling makeContinuousMemoryFromCheckpointToPos() will also make an extra copy.
-    std::string line = readLine(false);
-
     /// According to RFC2046 the preceding CRLF is a part of boundary line.
-    if (line == "\r\n")
-    {
-        line = readLine(false);
-        boundary_hit = startsWith(line, boundary);
-        if (!boundary_hit) line = "\r\n";
-    }
-    else
-        boundary_hit = startsWith(line, boundary);
+    std::string line = readLine(false);
+    boundary_hit = startsWith(line, "\r\n" + boundary);
+    bool has_next = !boundary_hit && !line.empty();
 
-    if (!line.empty())
+    if (has_next)
         /// If we don't make sure that memory is contiguous then situation may happen, when part of the line is inside internal memory
         /// and other part is inside sub-buffer, thus we'll be unable to setup our working buffer properly.
         in.makeContinuousMemoryFromCheckpointToPos();
@@ -323,7 +323,7 @@ bool HTMLForm::MultipartReadBuffer::nextImpl()
     /// Limit readable data to a single line.
     BufferBase::set(in.position(), line.size(), 0);
 
-    return !boundary_hit && !line.empty();
+    return has_next;
 }
 
 }
diff --git a/src/Server/HTTP/HTMLForm.h b/src/Server/HTTP/HTMLForm.h
index 8d8fb0d1719..ca6bb9048f1 100644
--- a/src/Server/HTTP/HTMLForm.h
+++ b/src/Server/HTTP/HTMLForm.h
@@ -118,7 +118,7 @@ private:
     const std::string boundary;
     bool boundary_hit = true;
 
-    std::string readLine(bool strict = true);
+    std::string readLine(bool append_crlf);
 
     bool nextImpl() override;
 };
diff --git a/src/Server/HTTP/HTTPServer.cpp b/src/Server/HTTP/HTTPServer.cpp
index 5554a0ee31d..42e6467d0af 100644
--- a/src/Server/HTTP/HTTPServer.cpp
+++ b/src/Server/HTTP/HTTPServer.cpp
@@ -6,7 +6,7 @@
 namespace DB
 {
 HTTPServer::HTTPServer(
-    const Context & context,
+    ContextPtr context,
     HTTPRequestHandlerFactoryPtr factory_,
     UInt16 port_number,
     Poco::Net::HTTPServerParams::Ptr params)
@@ -15,7 +15,7 @@ HTTPServer::HTTPServer(
 }
 
 HTTPServer::HTTPServer(
-    const Context & context,
+    ContextPtr context,
     HTTPRequestHandlerFactoryPtr factory_,
     const Poco::Net::ServerSocket & socket,
     Poco::Net::HTTPServerParams::Ptr params)
@@ -24,7 +24,7 @@ HTTPServer::HTTPServer(
 }
 
 HTTPServer::HTTPServer(
-    const Context & context,
+    ContextPtr context,
     HTTPRequestHandlerFactoryPtr factory_,
     Poco::ThreadPool & thread_pool,
     const Poco::Net::ServerSocket & socket,
diff --git a/src/Server/HTTP/HTTPServer.h b/src/Server/HTTP/HTTPServer.h
index 3d2a2ac9cf4..d95bdff0baa 100644
--- a/src/Server/HTTP/HTTPServer.h
+++ b/src/Server/HTTP/HTTPServer.h
@@ -17,19 +17,19 @@ class HTTPServer : public Poco::Net::TCPServer
 {
 public:
     explicit HTTPServer(
-        const Context & context,
+        ContextPtr context,
         HTTPRequestHandlerFactoryPtr factory,
         UInt16 port_number = 80,
         Poco::Net::HTTPServerParams::Ptr params = new Poco::Net::HTTPServerParams);
 
     HTTPServer(
-        const Context & context,
+        ContextPtr context,
         HTTPRequestHandlerFactoryPtr factory,
         const Poco::Net::ServerSocket & socket,
         Poco::Net::HTTPServerParams::Ptr params);
 
     HTTPServer(
-        const Context & context,
+        ContextPtr context,
         HTTPRequestHandlerFactoryPtr factory,
         Poco::ThreadPool & thread_pool,
         const Poco::Net::ServerSocket & socket,
diff --git a/src/Server/HTTP/HTTPServerConnection.cpp b/src/Server/HTTP/HTTPServerConnection.cpp
index 7a6cd4cab54..19985949005 100644
--- a/src/Server/HTTP/HTTPServerConnection.cpp
+++ b/src/Server/HTTP/HTTPServerConnection.cpp
@@ -6,11 +6,11 @@ namespace DB
 {
 
 HTTPServerConnection::HTTPServerConnection(
-    const Context & context_,
+    ContextPtr context_,
     const Poco::Net::StreamSocket & socket,
     Poco::Net::HTTPServerParams::Ptr params_,
     HTTPRequestHandlerFactoryPtr factory_)
-    : TCPServerConnection(socket), context(context_), params(params_), factory(factory_), stopped(false)
+    : TCPServerConnection(socket), context(Context::createCopy(context_)), params(params_), factory(factory_), stopped(false)
 {
     poco_check_ptr(factory);
 }
diff --git a/src/Server/HTTP/HTTPServerConnection.h b/src/Server/HTTP/HTTPServerConnection.h
index 55b6e921d9f..1c7ae6cd2b7 100644
--- a/src/Server/HTTP/HTTPServerConnection.h
+++ b/src/Server/HTTP/HTTPServerConnection.h
@@ -14,7 +14,7 @@ class HTTPServerConnection : public Poco::Net::TCPServerConnection
 {
 public:
     HTTPServerConnection(
-        const Context & context,
+        ContextPtr context,
         const Poco::Net::StreamSocket & socket,
         Poco::Net::HTTPServerParams::Ptr params,
         HTTPRequestHandlerFactoryPtr factory);
@@ -25,7 +25,7 @@ protected:
     static void sendErrorResponse(Poco::Net::HTTPServerSession & session, Poco::Net::HTTPResponse::HTTPStatus status);
 
 private:
-    Context context;
+    ContextPtr context;
     Poco::Net::HTTPServerParams::Ptr params;
     HTTPRequestHandlerFactoryPtr factory;
     bool stopped;
diff --git a/src/Server/HTTP/HTTPServerConnectionFactory.cpp b/src/Server/HTTP/HTTPServerConnectionFactory.cpp
index 876ccb9096b..0e4fb6cfcec 100644
--- a/src/Server/HTTP/HTTPServerConnectionFactory.cpp
+++ b/src/Server/HTTP/HTTPServerConnectionFactory.cpp
@@ -5,8 +5,8 @@
 namespace DB
 {
 HTTPServerConnectionFactory::HTTPServerConnectionFactory(
-    const Context & context_, Poco::Net::HTTPServerParams::Ptr params_, HTTPRequestHandlerFactoryPtr factory_)
-    : context(context_), params(params_), factory(factory_)
+    ContextPtr context_, Poco::Net::HTTPServerParams::Ptr params_, HTTPRequestHandlerFactoryPtr factory_)
+    : context(Context::createCopy(context_)), params(params_), factory(factory_)
 {
     poco_check_ptr(factory);
 }
diff --git a/src/Server/HTTP/HTTPServerConnectionFactory.h b/src/Server/HTTP/HTTPServerConnectionFactory.h
index 4f8ca43cbfb..3f11eca0f69 100644
--- a/src/Server/HTTP/HTTPServerConnectionFactory.h
+++ b/src/Server/HTTP/HTTPServerConnectionFactory.h
@@ -12,12 +12,12 @@ namespace DB
 class HTTPServerConnectionFactory : public Poco::Net::TCPServerConnectionFactory
 {
 public:
-    HTTPServerConnectionFactory(const Context & context, Poco::Net::HTTPServerParams::Ptr params, HTTPRequestHandlerFactoryPtr factory);
+    HTTPServerConnectionFactory(ContextPtr context, Poco::Net::HTTPServerParams::Ptr params, HTTPRequestHandlerFactoryPtr factory);
 
     Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket) override;
 
 private:
-    Context context;
+    ContextPtr context;
     Poco::Net::HTTPServerParams::Ptr params;
     HTTPRequestHandlerFactoryPtr factory;
 };
diff --git a/src/Server/HTTP/HTTPServerRequest.cpp b/src/Server/HTTP/HTTPServerRequest.cpp
index ab8b803c29d..69dc8d4dbda 100644
--- a/src/Server/HTTP/HTTPServerRequest.cpp
+++ b/src/Server/HTTP/HTTPServerRequest.cpp
@@ -15,8 +15,8 @@
 
 namespace DB
 {
-HTTPServerRequest::HTTPServerRequest(const Context & context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session)
-    : max_uri_size(context.getSettingsRef().http_max_uri_size)
+HTTPServerRequest::HTTPServerRequest(ContextPtr context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session)
+    : max_uri_size(context->getSettingsRef().http_max_uri_size)
 {
     response.attachRequest(this);
 
@@ -24,8 +24,8 @@ HTTPServerRequest::HTTPServerRequest(const Context & context, HTTPServerResponse
     client_address = session.clientAddress();
     server_address = session.serverAddress();
 
-    auto receive_timeout = context.getSettingsRef().http_receive_timeout;
-    auto send_timeout = context.getSettingsRef().http_send_timeout;
+    auto receive_timeout = context->getSettingsRef().http_receive_timeout;
+    auto send_timeout = context->getSettingsRef().http_send_timeout;
 
     session.socket().setReceiveTimeout(receive_timeout);
     session.socket().setSendTimeout(send_timeout);
diff --git a/src/Server/HTTP/HTTPServerRequest.h b/src/Server/HTTP/HTTPServerRequest.h
index a0f022f32ec..a560f907cf0 100644
--- a/src/Server/HTTP/HTTPServerRequest.h
+++ b/src/Server/HTTP/HTTPServerRequest.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <IO/ReadBuffer.h>
 #include <Server/HTTP/HTTPRequest.h>
 
@@ -8,14 +9,13 @@
 namespace DB
 {
 
-class Context;
 class HTTPServerResponse;
 class ReadBufferFromPocoSocket;
 
 class HTTPServerRequest : public HTTPRequest
 {
 public:
-    HTTPServerRequest(const Context & context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session);
+    HTTPServerRequest(ContextPtr context, HTTPServerResponse & response, Poco::Net::HTTPServerSession & session);
 
     /// FIXME: it's a little bit inconvenient interface. The rationale is that all other ReadBuffer's wrap each other
     ///        via unique_ptr - but we can't inherit HTTPServerRequest from ReadBuffer and pass it around,
diff --git a/src/Server/HTTP/HTTPServerResponse.cpp b/src/Server/HTTP/HTTPServerResponse.cpp
index db5cfb132e3..25e7604a515 100644
--- a/src/Server/HTTP/HTTPServerResponse.cpp
+++ b/src/Server/HTTP/HTTPServerResponse.cpp
@@ -1,11 +1,8 @@
 #include <Server/HTTP/HTTPServerResponse.h>
-
 #include <Server/HTTP/HTTPServerRequest.h>
-
 #include <Poco/CountingStream.h>
 #include <Poco/DateTimeFormat.h>
 #include <Poco/DateTimeFormatter.h>
-#include <Poco/File.h>
 #include <Poco/FileStream.h>
 #include <Poco/Net/HTTPChunkedStream.h>
 #include <Poco/Net/HTTPFixedLengthStream.h>
@@ -13,6 +10,7 @@
 #include <Poco/Net/HTTPStream.h>
 #include <Poco/StreamCopier.h>
 
+
 namespace DB
 {
 
diff --git a/src/Server/HTTP/ReadHeaders.cpp b/src/Server/HTTP/ReadHeaders.cpp
index 77ec48c11b1..b7057501064 100644
--- a/src/Server/HTTP/ReadHeaders.cpp
+++ b/src/Server/HTTP/ReadHeaders.cpp
@@ -51,7 +51,7 @@ void readHeaders(
             if (name.size() > max_name_length)
                 throw Poco::Net::MessageException("Field name is too long");
             if (ch != ':')
-                throw Poco::Net::MessageException("Field name is invalid or no colon found");
+                throw Poco::Net::MessageException(fmt::format("Field name is invalid or no colon found: \"{}\"", name));
         }
 
         in.ignore();
@@ -68,9 +68,6 @@ void readHeaders(
         if (in.eof())
             throw Poco::Net::MessageException("Field is invalid");
 
-        if (value.empty())
-            throw Poco::Net::MessageException("Field value is empty");
-
         if (ch == '\n')
             throw Poco::Net::MessageException("No CRLF found");
 
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
index 355af038da9..a4fe3649e6f 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
@@ -196,7 +196,7 @@ void WriteBufferFromHTTPServerResponse::finalize()
 WriteBufferFromHTTPServerResponse::~WriteBufferFromHTTPServerResponse()
 {
     /// FIXME move final flush into the caller
-    MemoryTracker::LockExceptionInThread lock;
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
     finalize();
 }
 
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 6b4981beae0..6eab6cdda5e 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -39,7 +39,6 @@
 
 #include <Poco/Base64Decoder.h>
 #include <Poco/Base64Encoder.h>
-#include <Poco/File.h>
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/Net/HTTPStream.h>
 #include <Poco/Net/NetException.h>
@@ -277,7 +276,7 @@ HTTPHandler::~HTTPHandler()
 
 
 bool HTTPHandler::authenticateUser(
-    Context & context,
+    ContextMutablePtr context,
     HTTPServerRequest & request,
     HTMLForm & params,
     HTTPServerResponse & response)
@@ -381,7 +380,7 @@ bool HTTPHandler::authenticateUser(
 
     /// Set client info. It will be used for quota accounting parameters in 'setUser' method.
 
-    ClientInfo & client_info = context.getClientInfo();
+    ClientInfo & client_info = context->getClientInfo();
     client_info.query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
     client_info.interface = ClientInfo::Interface::HTTP;
 
@@ -398,7 +397,7 @@ bool HTTPHandler::authenticateUser(
 
     try
     {
-        context.setUser(*request_credentials, request.clientAddress());
+        context->setUser(*request_credentials, request.clientAddress());
     }
     catch (const Authentication::Require<BasicCredentials> & required_credentials)
     {
@@ -430,7 +429,7 @@ bool HTTPHandler::authenticateUser(
     request_credentials.reset();
 
     if (!quota_key.empty())
-        context.setQuotaKey(quota_key);
+        context->setQuotaKey(quota_key);
 
     /// Query sent through HTTP interface is initial.
     client_info.initial_user = client_info.current_user;
@@ -441,7 +440,7 @@ bool HTTPHandler::authenticateUser(
 
 
 void HTTPHandler::processQuery(
-    Context & context,
+    ContextMutablePtr context,
     HTTPServerRequest & request,
     HTMLForm & params,
     HTTPServerResponse & response,
@@ -470,10 +469,10 @@ void HTTPHandler::processQuery(
         session_timeout = parseSessionTimeout(config, params);
         std::string session_check = params.get("session_check", "");
 
-        session = context.acquireNamedSession(session_id, session_timeout, session_check == "1");
+        session = context->acquireNamedSession(session_id, session_timeout, session_check == "1");
 
-        context = session->context;
-        context.setSessionContext(session->context);
+        context->copyFrom(session->context);  /// FIXME: maybe move this part to HandleRequest(), copyFrom() is used only here.
+        context->setSessionContext(session->context);
     }
 
     SCOPE_EXIT({
@@ -489,7 +488,7 @@ void HTTPHandler::processQuery(
     {
         std::string opentelemetry_traceparent = request.get("traceparent");
         std::string error;
-        if (!context.getClientInfo().client_trace_context.parseTraceparentHeader(
+        if (!context->getClientInfo().client_trace_context.parseTraceparentHeader(
             opentelemetry_traceparent, error))
         {
             throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER,
@@ -497,14 +496,14 @@ void HTTPHandler::processQuery(
                 opentelemetry_traceparent, error);
         }
 
-        context.getClientInfo().client_trace_context.tracestate = request.get("tracestate", "");
+        context->getClientInfo().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", "")));
+    context->setCurrentQueryId(params.get("query_id", request.get("X-ClickHouse-Query-Id", "")));
 
-    ClientInfo & client_info = context.getClientInfo();
+    ClientInfo & client_info = context->getClientInfo();
     client_info.initial_query_id = client_info.current_query_id;
 
     /// The client can pass a HTTP header indicating supported compression method (gzip or deflate).
@@ -570,7 +569,7 @@ void HTTPHandler::processQuery(
 
         if (buffer_until_eof)
         {
-            const std::string tmp_path(context.getTemporaryVolume()->getDisk()->getPath());
+            const std::string tmp_path(context->getTemporaryVolume()->getDisk()->getPath());
             const std::string tmp_path_template(tmp_path + "http_buffers/");
 
             auto create_tmp_disk_buffer = [tmp_path_template] (const WriteBufferPtr &)
@@ -658,13 +657,13 @@ void HTTPHandler::processQuery(
 
     /// In theory if initially readonly = 0, the client can change any setting and then set readonly
     /// to some other value.
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     /// Only readonly queries are allowed for HTTP GET requests.
     if (request.getMethod() == HTTPServerRequest::HTTP_GET)
     {
         if (settings.readonly == 0)
-            context.setSetting("readonly", 2);
+            context->setSetting("readonly", 2);
     }
 
     bool has_external_data = startsWith(request.getContentType(), "multipart/form-data");
@@ -707,14 +706,14 @@ void HTTPHandler::processQuery(
     }
 
     if (!database.empty())
-        context.setCurrentDatabase(database);
+        context->setCurrentDatabase(database);
 
     if (!default_format.empty())
-        context.setDefaultFormat(default_format);
+        context->setDefaultFormat(default_format);
 
     /// For external data we also want settings
-    context.checkSettingsConstraints(settings_changes);
-    context.applySettingsChanges(settings_changes);
+    context->checkSettingsConstraints(settings_changes);
+    context->applySettingsChanges(settings_changes);
 
     const auto & query = getQuery(request, params, context);
     std::unique_ptr<ReadBuffer> in_param = std::make_unique<ReadBufferFromString>(query);
@@ -737,11 +736,11 @@ void HTTPHandler::processQuery(
     /// Origin header.
     used_output.out->addHeaderCORS(settings.add_http_cors_header && !request.get("Origin", "").empty());
 
-    auto append_callback = [&context] (ProgressCallback callback)
+    auto append_callback = [context] (ProgressCallback callback)
     {
-        auto prev = context.getProgressCallback();
+        auto prev = context->getProgressCallback();
 
-        context.setProgressCallback([prev, callback] (const Progress & progress)
+        context->setProgressCallback([prev, callback] (const Progress & progress)
         {
             if (prev)
                 prev(progress);
@@ -756,12 +755,12 @@ void HTTPHandler::processQuery(
 
     if (settings.readonly > 0 && settings.cancel_http_readonly_queries_on_client_close)
     {
-        append_callback([&context, &request](const Progress &)
+        append_callback([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.
             if (!request.checkPeerConnected())
-                context.killCurrentQuery();
+                context->killCurrentQuery();
         });
     }
 
@@ -877,7 +876,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
     if (!request_context)
     {
         // Context should be initialized before anything, for correct memory accounting.
-        request_context = std::make_unique<Context>(server.context());
+        request_context = Context::createCopy(server.context());
         request_credentials.reset();
     }
 
@@ -899,6 +898,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         HTMLForm params(request);
         with_stacktrace = params.getParsed<bool>("stacktrace", false);
 
+        /// FIXME: maybe this check is already unnecessary.
         /// Workaround. Poco does not detect 411 Length Required case.
         if (request.getMethod() == HTTPRequest::HTTP_POST && !request.getChunkedTransferEncoding() && !request.hasContentLength())
         {
@@ -907,7 +907,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
                 ErrorCodes::HTTP_LENGTH_REQUIRED);
         }
 
-        processQuery(*request_context, request, params, response, used_output, query_scope);
+        processQuery(request_context, request, params, response, used_output, query_scope);
         LOG_DEBUG(log, (request_credentials ? "Authentication in progress..." : "Done processing query"));
     }
     catch (...)
@@ -936,7 +936,7 @@ DynamicQueryHandler::DynamicQueryHandler(IServer & server_, const std::string &
 {
 }
 
-bool DynamicQueryHandler::customizeQueryParam(Context & context, const std::string & key, const std::string & value)
+bool DynamicQueryHandler::customizeQueryParam(ContextMutablePtr context, const std::string & key, const std::string & value)
 {
     if (key == param_name)
         return true;    /// do nothing
@@ -945,14 +945,14 @@ bool DynamicQueryHandler::customizeQueryParam(Context & context, const std::stri
     {
         /// Save name and values of substitution in dictionary.
         const String parameter_name = key.substr(strlen("param_"));
-        context.setQueryParameter(parameter_name, value);
+        context->setQueryParameter(parameter_name, value);
         return true;
     }
 
     return false;
 }
 
-std::string DynamicQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context)
+std::string DynamicQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, ContextMutablePtr context)
 {
     if (likely(!startsWith(request.getContentType(), "multipart/form-data")))
     {
@@ -978,25 +978,31 @@ std::string DynamicQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm
 }
 
 PredefinedQueryHandler::PredefinedQueryHandler(
-    IServer & server_, const NameSet & receive_params_, const std::string & predefined_query_
-    , const CompiledRegexPtr & url_regex_, const std::unordered_map<String, CompiledRegexPtr> & header_name_with_regex_)
-    : HTTPHandler(server_, "PredefinedQueryHandler"), receive_params(receive_params_), predefined_query(predefined_query_)
-    , url_regex(url_regex_), header_name_with_capture_regex(header_name_with_regex_)
+    IServer & server_,
+    const NameSet & receive_params_,
+    const std::string & predefined_query_,
+    const CompiledRegexPtr & url_regex_,
+    const std::unordered_map<String, CompiledRegexPtr> & header_name_with_regex_)
+    : HTTPHandler(server_, "PredefinedQueryHandler")
+    , receive_params(receive_params_)
+    , predefined_query(predefined_query_)
+    , url_regex(url_regex_)
+    , header_name_with_capture_regex(header_name_with_regex_)
 {
 }
 
-bool PredefinedQueryHandler::customizeQueryParam(Context & context, const std::string & key, const std::string & value)
+bool PredefinedQueryHandler::customizeQueryParam(ContextMutablePtr context, const std::string & key, const std::string & value)
 {
     if (receive_params.count(key))
     {
-        context.setQueryParameter(key, value);
+        context->setQueryParameter(key, value);
         return true;
     }
 
     return false;
 }
 
-void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, DB::Context & context)
+void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, ContextMutablePtr context)
 {
     /// If in the configuration file, the handler's header is regex and contains named capture group
     /// We will extract regex named capture groups as query parameters
@@ -1014,7 +1020,7 @@ void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, DB::C
                 const auto & capturing_value = matches[capturing_index];
 
                 if (capturing_value.data())
-                    context.setQueryParameter(capturing_name, String(capturing_value.data(), capturing_value.size()));
+                    context->setQueryParameter(capturing_name, String(capturing_value.data(), capturing_value.size()));
             }
         }
     };
@@ -1032,7 +1038,7 @@ void PredefinedQueryHandler::customizeContext(HTTPServerRequest & request, DB::C
     }
 }
 
-std::string PredefinedQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context)
+std::string PredefinedQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm & params, ContextMutablePtr context)
 {
     if (unlikely(startsWith(request.getContentType(), "multipart/form-data")))
     {
diff --git a/src/Server/HTTPHandler.h b/src/Server/HTTPHandler.h
index 0f1d75664bd..2149a7ca55c 100644
--- a/src/Server/HTTPHandler.h
+++ b/src/Server/HTTPHandler.h
@@ -18,7 +18,6 @@ namespace Poco { class Logger; }
 namespace DB
 {
 
-class Context;
 class Credentials;
 class IServer;
 class WriteBufferFromHTTPServerResponse;
@@ -34,11 +33,11 @@ public:
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response) override;
 
     /// This method is called right before the query execution.
-    virtual void customizeContext(HTTPServerRequest & /* request */, Context & /* context */) {}
+    virtual void customizeContext(HTTPServerRequest & /* request */, ContextMutablePtr /* context */) {}
 
-    virtual bool customizeQueryParam(Context & context, const std::string & key, const std::string & value) = 0;
+    virtual bool customizeQueryParam(ContextMutablePtr context, const std::string & key, const std::string & value) = 0;
 
-    virtual std::string getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context) = 0;
+    virtual std::string getQuery(HTTPServerRequest & request, HTMLForm & params, ContextMutablePtr context) = 0;
 
 private:
     struct Output
@@ -74,7 +73,7 @@ private:
 
     // The request_context and the request_credentials instances 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).
-    std::unique_ptr<Context> request_context;
+    ContextMutablePtr request_context;
     std::unique_ptr<Credentials> request_credentials;
 
     // Returns true when the user successfully authenticated,
@@ -83,14 +82,14 @@ private:
     //  the request_context and request_credentials instances are preserved.
     // Throws an exception if authentication failed.
     bool authenticateUser(
-        Context & context,
+        ContextMutablePtr context,
         HTTPServerRequest & request,
         HTMLForm & params,
         HTTPServerResponse & response);
 
     /// Also initializes 'used_output'.
     void processQuery(
-        Context & context,
+        ContextMutablePtr context,
         HTTPServerRequest & request,
         HTMLForm & params,
         HTTPServerResponse & response,
@@ -114,9 +113,9 @@ private:
 public:
     explicit DynamicQueryHandler(IServer & server_, const std::string & param_name_ = "query");
 
-    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context) override;
+    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, ContextMutablePtr context) override;
 
-    bool customizeQueryParam(Context &context, const std::string &key, const std::string &value) override;
+    bool customizeQueryParam(ContextMutablePtr context, const std::string &key, const std::string &value) override;
 };
 
 class PredefinedQueryHandler : public HTTPHandler
@@ -131,11 +130,11 @@ public:
         IServer & server_, const NameSet & receive_params_, const std::string & predefined_query_
         , const CompiledRegexPtr & url_regex_, const std::unordered_map<String, CompiledRegexPtr> & header_name_with_regex_);
 
-    virtual void customizeContext(HTTPServerRequest & request, Context & context) override;
+    virtual void customizeContext(HTTPServerRequest & request, ContextMutablePtr context) override;
 
-    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, Context & context) override;
+    std::string getQuery(HTTPServerRequest & request, HTMLForm & params, ContextMutablePtr context) override;
 
-    bool customizeQueryParam(Context & context, const std::string & key, const std::string & value) override;
+    bool customizeQueryParam(ContextMutablePtr context, const std::string & key, const std::string & value) override;
 };
 
 }
diff --git a/src/Server/IServer.h b/src/Server/IServer.h
index 131e7443646..c55b045d2a5 100644
--- a/src/Server/IServer.h
+++ b/src/Server/IServer.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
+
 namespace Poco
 {
 
@@ -7,6 +9,7 @@ namespace Util
 {
 class LayeredConfiguration;
 }
+
 class Logger;
 
 }
@@ -15,8 +18,6 @@ class Logger;
 namespace DB
 {
 
-class Context;
-
 class IServer
 {
 public:
@@ -27,12 +28,12 @@ public:
     virtual Poco::Logger & logger() const = 0;
 
     /// Returns global application's context.
-    virtual Context & context() const = 0;
+    virtual ContextMutablePtr context() const = 0;
 
     /// Returns true if shutdown signaled.
     virtual bool isCancelled() const = 0;
 
-    virtual ~IServer() {}
+    virtual ~IServer() = default;
 };
 
 }
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index 426e4ca2138..64af8860b23 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -25,29 +25,26 @@ namespace ErrorCodes
 
 std::pair<String, bool> InterserverIOHTTPHandler::checkAuthentication(HTTPServerRequest & request) const
 {
-    const auto & config = server.config();
-
-    if (config.has("interserver_http_credentials.user"))
+    auto server_credentials = server.context()->getInterserverCredentials();
+    if (server_credentials)
     {
         if (!request.hasCredentials())
-            return {"Server requires HTTP Basic authentication, but client doesn't provide it", false};
+            return server_credentials->isValidUser("", "");
+
         String scheme, info;
         request.getCredentials(scheme, info);
 
         if (scheme != "Basic")
             return {"Server requires HTTP Basic authentication but client provides another method", false};
 
-        String user = config.getString("interserver_http_credentials.user");
-        String password = config.getString("interserver_http_credentials.password", "");
-
         Poco::Net::HTTPBasicCredentials credentials(info);
-        if (std::make_pair(user, password) != std::make_pair(credentials.getUsername(), credentials.getPassword()))
-            return {"Incorrect user or password in HTTP Basic authentication", false};
+        return server_credentials->isValidUser(credentials.getUsername(), credentials.getPassword());
     }
     else if (request.hasCredentials())
     {
         return {"Client requires HTTP Basic authentication, but server doesn't provide it", false};
     }
+
     return {"", true};
 }
 
@@ -62,7 +59,7 @@ void InterserverIOHTTPHandler::processQuery(HTTPServerRequest & request, HTTPSer
 
     auto & body = request.getStream();
 
-    auto endpoint = server.context().getInterserverIOHandler().getEndpoint(endpoint_name);
+    auto endpoint = server.context()->getInterserverIOHandler().getEndpoint(endpoint_name);
     /// Locked for read while query processing
     std::shared_lock lock(endpoint->rwlock);
     if (endpoint->blocker.isCancelled())
diff --git a/src/Server/InterserverIOHTTPHandler.h b/src/Server/InterserverIOHTTPHandler.h
index 47892aa678f..c0d776115e1 100644
--- a/src/Server/InterserverIOHTTPHandler.h
+++ b/src/Server/InterserverIOHTTPHandler.h
@@ -2,10 +2,12 @@
 
 #include <Server/HTTP/HTTPRequestHandler.h>
 #include <Common/CurrentMetrics.h>
+#include <Interpreters/InterserverCredentials.h>
 
 #include <Poco/Logger.h>
 
 #include <memory>
+#include <string>
 
 
 namespace CurrentMetrics
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index bf725581a29..2d5f41fe666 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -192,11 +192,11 @@ struct SocketInterruptablePollWrapper
 KeeperTCPHandler::KeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
-    , log(&Poco::Logger::get("KeeperTCPHandler"))
-    , global_context(server.context())
-    , nu_keeper_storage_dispatcher(global_context.getKeeperStorageDispatcher())
-    , 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)
+    , log(&Poco::Logger::get("NuKeeperTCPHandler"))
+    , 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)
     , poll_wrapper(std::make_unique<SocketInterruptablePollWrapper>(socket_))
     , responses(std::make_unique<ThreadSafeResponseQueue>())
 {
@@ -258,8 +258,8 @@ void KeeperTCPHandler::runImpl()
 {
     setThreadName("TstKprHandler");
     ThreadStatus thread_status;
-    auto global_receive_timeout = global_context.getSettingsRef().receive_timeout;
-    auto global_send_timeout = global_context.getSettingsRef().send_timeout;
+    auto global_receive_timeout = global_context->getSettingsRef().receive_timeout;
+    auto global_send_timeout = global_context->getSettingsRef().send_timeout;
 
     socket().setReceiveTimeout(global_receive_timeout);
     socket().setSendTimeout(global_send_timeout);
@@ -286,12 +286,12 @@ void KeeperTCPHandler::runImpl()
         return;
     }
 
-    if (nu_keeper_storage_dispatcher->hasLeader())
+    if (keeper_dispatcher->hasLeader())
     {
         try
         {
             LOG_INFO(log, "Requesting session ID for the new client");
-            session_id = nu_keeper_storage_dispatcher->getSessionID(session_timeout.totalMilliseconds());
+            session_id = keeper_dispatcher->getSessionID(session_timeout.totalMilliseconds());
             LOG_INFO(log, "Received session ID {}", session_id);
         }
         catch (const Exception & e)
@@ -318,7 +318,7 @@ void KeeperTCPHandler::runImpl()
         UInt8 single_byte = 1;
         [[maybe_unused]] int result = write(response_fd, &single_byte, sizeof(single_byte));
     };
-    nu_keeper_storage_dispatcher->registerSession(session_id, response_callback);
+    keeper_dispatcher->registerSession(session_id, response_callback);
 
     session_stopwatch.start();
     bool close_received = false;
@@ -368,7 +368,7 @@ void KeeperTCPHandler::runImpl()
                 if (response->error == Coordination::Error::ZSESSIONEXPIRED)
                 {
                     LOG_DEBUG(log, "Session #{} expired because server shutting down or quorum is not alive", session_id);
-                    nu_keeper_storage_dispatcher->finishSession(session_id);
+                    keeper_dispatcher->finishSession(session_id);
                     return;
                 }
 
@@ -381,7 +381,7 @@ void KeeperTCPHandler::runImpl()
             if (session_stopwatch.elapsedMicroseconds() > static_cast<UInt64>(session_timeout.totalMicroseconds()))
             {
                 LOG_DEBUG(log, "Session #{} expired", session_id);
-                nu_keeper_storage_dispatcher->finishSession(session_id);
+                keeper_dispatcher->finishSession(session_id);
                 break;
             }
         }
@@ -389,7 +389,7 @@ void KeeperTCPHandler::runImpl()
     catch (const Exception & ex)
     {
         LOG_INFO(log, "Got exception processing session #{}: {}", session_id, getExceptionMessage(ex, true));
-        nu_keeper_storage_dispatcher->finishSession(session_id);
+        keeper_dispatcher->finishSession(session_id);
     }
 }
 
@@ -407,7 +407,7 @@ std::pair<Coordination::OpNum, Coordination::XID> KeeperTCPHandler::receiveReque
     request->xid = xid;
     request->readImpl(*in);
 
-    if (!nu_keeper_storage_dispatcher->putRequest(request, session_id))
+    if (!keeper_dispatcher->putRequest(request, session_id))
         throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Session {} already disconnected", session_id);
     return std::make_pair(opnum, xid);
 }
diff --git a/src/Server/KeeperTCPHandler.h b/src/Server/KeeperTCPHandler.h
index fecaf1cc38f..76371ed1a0c 100644
--- a/src/Server/KeeperTCPHandler.h
+++ b/src/Server/KeeperTCPHandler.h
@@ -37,8 +37,8 @@ public:
 private:
     IServer & server;
     Poco::Logger * log;
-    Context global_context;
-    std::shared_ptr<KeeperStorageDispatcher> nu_keeper_storage_dispatcher;
+    ContextPtr global_context;
+    std::shared_ptr<KeeperStorageDispatcher> 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 adeb829b4c3..132a8b96c23 100644
--- a/src/Server/KeeperTCPHandlerFactory.h
+++ b/src/Server/KeeperTCPHandlerFactory.h
@@ -5,6 +5,7 @@
 #include <Poco/Net/NetException.h>
 #include <common/logger_useful.h>
 #include <Server/IServer.h>
+#include <string>
 
 namespace DB
 {
@@ -21,9 +22,9 @@ private:
         void run() override {}
     };
 public:
-    KeeperTCPHandlerFactory(IServer & server_)
+    KeeperTCPHandlerFactory(IServer & server_, bool secure)
         : server(server_)
-        , log(&Poco::Logger::get("KeeperTCPHandlerFactory"))
+        , log(&Poco::Logger::get(std::string{"KeeperTCP"} + (secure ? "S" : "") + "HandlerFactory"))
     {
     }
 
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index 75c88a6ff93..7b1df092aa1 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -72,7 +72,7 @@ MySQLHandler::MySQLHandler(IServer & server_, const Poco::Net::StreamSocket & so
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
     , log(&Poco::Logger::get("MySQLHandler"))
-    , connection_context(server.context())
+    , connection_context(Context::createCopy(server.context()))
     , connection_id(connection_id_)
     , auth_plugin(new MySQLProtocol::Authentication::Native41())
 {
@@ -89,14 +89,14 @@ 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->makeSessionContext();
+    connection_context->getClientInfo().interface = ClientInfo::Interface::MYSQL;
+    connection_context->setDefaultFormat("MySQLWire");
+    connection_context->getClientInfo().connection_id = connection_id;
 
     in = std::make_shared<ReadBufferFromPocoSocket>(socket());
     out = std::make_shared<WriteBufferFromPocoSocket>(socket());
-    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context.mysql.sequence_id);
+    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context->mysql.sequence_id);
 
     try
     {
@@ -108,11 +108,11 @@ void MySQLHandler::run()
 
         HandshakeResponse handshake_response;
         finishHandshake(handshake_response);
-        connection_context.mysql.client_capabilities = handshake_response.capability_flags;
+        connection_context->mysql.client_capabilities = handshake_response.capability_flags;
         if (handshake_response.max_packet_size)
-            connection_context.mysql.max_packet_size = handshake_response.max_packet_size;
-        if (!connection_context.mysql.max_packet_size)
-            connection_context.mysql.max_packet_size = MAX_PACKET_LENGTH;
+            connection_context->mysql.max_packet_size = handshake_response.max_packet_size;
+        if (!connection_context->mysql.max_packet_size)
+            connection_context->mysql.max_packet_size = MAX_PACKET_LENGTH;
 
         LOG_TRACE(log,
             "Capabilities: {}, max_packet_size: {}, character_set: {}, user: {}, auth_response length: {}, database: {}, auth_plugin_name: {}",
@@ -133,8 +133,8 @@ void MySQLHandler::run()
         try
         {
             if (!handshake_response.database.empty())
-                connection_context.setCurrentDatabase(handshake_response.database);
-            connection_context.setCurrentQueryId(Poco::format("mysql:%lu", connection_id));
+                connection_context->setCurrentDatabase(handshake_response.database);
+            connection_context->setCurrentQueryId(Poco::format("mysql:%lu", connection_id));
 
         }
         catch (const Exception & exc)
@@ -252,7 +252,7 @@ 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);
+        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)
         {
@@ -276,7 +276,7 @@ void MySQLHandler::comInitDB(ReadBuffer & payload)
     String database;
     readStringUntilEOF(database, payload);
     LOG_DEBUG(log, "Setting current database to {}", database);
-    connection_context.setCurrentDatabase(database);
+    connection_context->setCurrentDatabase(database);
     packet_endpoint->sendPacket(OKPacket(0, client_capability_flags, 0, 0, 1), true);
 }
 
@@ -284,7 +284,7 @@ void MySQLHandler::comFieldList(ReadBuffer & payload)
 {
     ComFieldList packet;
     packet.readPayloadWithUnpacked(payload);
-    String database = connection_context.getCurrentDatabase();
+    String database = connection_context->getCurrentDatabase();
     StoragePtr table_ptr = DatabaseCatalog::instance().getTable({database, packet.table}, connection_context);
     auto metadata_snapshot = table_ptr->getInMemoryMetadataPtr();
     for (const NameAndTypePair & column : metadata_snapshot->getColumns().getAll())
@@ -332,11 +332,11 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
 
         ReadBufferFromString replacement(replacement_query);
 
-        Context query_context = connection_context;
+        auto query_context = Context::createCopy(connection_context);
 
         std::atomic<size_t> affected_rows {0};
-        auto prev = query_context.getProgressCallback();
-        query_context.setProgressCallback([&, prev = prev](const Progress & progress)
+        auto prev = query_context->getProgressCallback();
+        query_context->setProgressCallback([&, prev = prev](const Progress & progress)
         {
             if (prev)
                 prev(progress);
@@ -391,14 +391,14 @@ void MySQLHandlerSSL::finishHandshakeSSL(
     ReadBufferFromMemory payload(buf, pos);
     payload.ignore(PACKET_HEADER_SIZE);
     ssl_request.readPayloadWithUnpacked(payload);
-    connection_context.mysql.client_capabilities = ssl_request.capability_flags;
-    connection_context.mysql.max_packet_size = ssl_request.max_packet_size ? ssl_request.max_packet_size : MAX_PACKET_LENGTH;
+    connection_context->mysql.client_capabilities = ssl_request.capability_flags;
+    connection_context->mysql.max_packet_size = ssl_request.max_packet_size ? ssl_request.max_packet_size : MAX_PACKET_LENGTH;
     secure_connection = true;
     ss = std::make_shared<SecureStreamSocket>(SecureStreamSocket::attach(socket(), SSLManager::instance().defaultServerContext()));
     in = std::make_shared<ReadBufferFromPocoSocket>(*ss);
     out = std::make_shared<WriteBufferFromPocoSocket>(*ss);
-    connection_context.mysql.sequence_id = 2;
-    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context.mysql.sequence_id);
+    connection_context->mysql.sequence_id = 2;
+    packet_endpoint = std::make_shared<PacketEndpoint>(*in, *out, connection_context->mysql.sequence_id);
     packet_endpoint->receivePacket(packet); /// Reading HandshakeResponse from secure socket.
 }
 
diff --git a/src/Server/MySQLHandler.h b/src/Server/MySQLHandler.h
index 1418d068ffd..e681ad2e6f6 100644
--- a/src/Server/MySQLHandler.h
+++ b/src/Server/MySQLHandler.h
@@ -56,7 +56,7 @@ private:
 protected:
     Poco::Logger * log;
 
-    Context connection_context;
+    ContextMutablePtr connection_context;
 
     std::shared_ptr<MySQLProtocol::PacketEndpoint> packet_endpoint;
 
diff --git a/src/Server/PostgreSQLHandler.cpp b/src/Server/PostgreSQLHandler.cpp
index b3a3bbf2aaa..01887444c65 100644
--- a/src/Server/PostgreSQLHandler.cpp
+++ b/src/Server/PostgreSQLHandler.cpp
@@ -33,7 +33,7 @@ PostgreSQLHandler::PostgreSQLHandler(
     std::vector<std::shared_ptr<PostgreSQLProtocol::PGAuthentication::AuthenticationMethod>> & auth_methods_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
-    , connection_context(server.context())
+    , connection_context(Context::createCopy(server.context()))
     , ssl_enabled(ssl_enabled_)
     , connection_id(connection_id_)
     , authentication_manager(auth_methods_)
@@ -52,9 +52,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->makeSessionContext();
+    connection_context->getClientInfo().interface = ClientInfo::Interface::POSTGRESQL;
+    connection_context->setDefaultFormat("PostgreSQLWire");
 
     try
     {
@@ -132,8 +132,8 @@ bool PostgreSQLHandler::startup()
     try
     {
         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));
+            connection_context->setCurrentDatabase(start_up_msg->database);
+        connection_context->setCurrentQueryId(Poco::format("postgres:%d:%d", connection_id, secret_key));
     }
     catch (const Exception & exc)
     {
@@ -213,8 +213,8 @@ void PostgreSQLHandler::sendParameterStatusData(PostgreSQLProtocol::Messaging::S
 
 void PostgreSQLHandler::cancelRequest()
 {
-    connection_context.setCurrentQueryId("");
-    connection_context.setDefaultFormat("Null");
+    connection_context->setCurrentQueryId("");
+    connection_context->setDefaultFormat("Null");
 
     std::unique_ptr<PostgreSQLProtocol::Messaging::CancelRequest> msg =
         message_transport->receiveWithPayloadSize<PostgreSQLProtocol::Messaging::CancelRequest>(8);
@@ -268,7 +268,7 @@ void PostgreSQLHandler::processQuery()
             return;
         }
 
-        const auto & settings = connection_context.getSettingsRef();
+        const auto & settings = connection_context->getSettingsRef();
         std::vector<String> queries;
         auto parse_res = splitMultipartQuery(query->query, queries, settings.max_query_size, settings.max_parser_depth);
         if (!parse_res.second)
diff --git a/src/Server/PostgreSQLHandler.h b/src/Server/PostgreSQLHandler.h
index 697aa9b6744..9aaad1d7aa7 100644
--- a/src/Server/PostgreSQLHandler.h
+++ b/src/Server/PostgreSQLHandler.h
@@ -37,10 +37,10 @@ private:
     Poco::Logger * log = &Poco::Logger::get("PostgreSQLHandler");
 
     IServer & server;
-    Context connection_context;
-    bool ssl_enabled;
-    Int32 connection_id;
-    Int32 secret_key;
+    ContextMutablePtr connection_context;
+    bool ssl_enabled = false;
+    Int32 connection_id = 0;
+    Int32 secret_key = 0;
 
     std::shared_ptr<ReadBuffer> in;
     std::shared_ptr<WriteBuffer> out;
diff --git a/src/Server/ReplicasStatusHandler.cpp b/src/Server/ReplicasStatusHandler.cpp
index 778f9827131..86295cc5170 100644
--- a/src/Server/ReplicasStatusHandler.cpp
+++ b/src/Server/ReplicasStatusHandler.cpp
@@ -34,7 +34,7 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
         /// Even if lag is small, output detailed information about the lag.
         bool verbose = params.get("verbose", "") == "1";
 
-        const MergeTreeSettings & settings = context.getReplicatedMergeTreeSettings();
+        const MergeTreeSettings & settings = context->getReplicatedMergeTreeSettings();
 
         bool ok = true;
         WriteBufferFromOwnString message;
@@ -73,7 +73,7 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             }
         }
 
-        const auto & config = context.getConfigRef();
+        const auto & config = context->getConfigRef();
         setResponseDefaultHeaders(response, config.getUInt("keep_alive_timeout", 10));
 
         if (!ok)
diff --git a/src/Server/ReplicasStatusHandler.h b/src/Server/ReplicasStatusHandler.h
index 8a790b13ad6..eda0b15ed6f 100644
--- a/src/Server/ReplicasStatusHandler.h
+++ b/src/Server/ReplicasStatusHandler.h
@@ -12,7 +12,7 @@ class IServer;
 class ReplicasStatusHandler : public HTTPRequestHandler
 {
 private:
-    Context & context;
+    ContextPtr context;
 
 public:
     explicit ReplicasStatusHandler(IServer & server_);
diff --git a/src/Server/StaticRequestHandler.cpp b/src/Server/StaticRequestHandler.cpp
index 9f959239be9..19b91ae9c42 100644
--- a/src/Server/StaticRequestHandler.cpp
+++ b/src/Server/StaticRequestHandler.cpp
@@ -14,14 +14,15 @@
 
 #include <Common/Exception.h>
 
-#include <Poco/Path.h>
-#include <Poco/File.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/Net/HTTPRequestHandlerFactory.h>
 #include <Poco/Util/LayeredConfiguration.h>
+#include <filesystem>
 
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
@@ -137,11 +138,14 @@ void StaticRequestHandler::writeResponse(WriteBuffer & out)
 
     if (startsWith(response_expression, file_prefix))
     {
-        const auto & user_files_absolute_path = Poco::Path(server.context().getUserFilesPath()).makeAbsolute().makeDirectory().toString();
-        const auto & file_name = response_expression.substr(file_prefix.size(), response_expression.size() - file_prefix.size());
+        auto file_name = response_expression.substr(file_prefix.size(), response_expression.size() - file_prefix.size());
+        if (file_name.starts_with('/'))
+            file_name = file_name.substr(1);
 
-        const auto & file_path = Poco::Path(user_files_absolute_path, file_name).makeAbsolute().toString();
-        if (!Poco::File(file_path).exists())
+        fs::path user_files_absolute_path = fs::canonical(fs::path(server.context()->getUserFilesPath()));
+        String file_path = fs::weakly_canonical(user_files_absolute_path / file_name);
+
+        if (!fs::exists(file_path))
             throw Exception("Invalid file name " + file_path + " for static HTTPHandler. ", ErrorCodes::INCORRECT_FILE_NAME);
 
         ReadBufferFromFile in(file_path);
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index efda9bbfec3..9ef0292ee06 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -25,6 +25,7 @@
 #include <Interpreters/OpenTelemetrySpanLog.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
+#include <Storages/StorageS3Cluster.h>
 #include <Core/ExternalTable.h>
 #include <Storages/ColumnDefault.h>
 #include <DataTypes/DataTypeLowCardinality.h>
@@ -33,6 +34,7 @@
 
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 
+#include "Core/Protocol.h"
 #include "TCPHandler.h"
 
 #if !defined(ARCADIA_BUILD)
@@ -55,6 +57,7 @@ namespace ErrorCodes
     extern const int SOCKET_TIMEOUT;
     extern const int UNEXPECTED_PACKET_FROM_CLIENT;
     extern const int SUPPORT_IS_DISABLED;
+    extern const int UNKNOWN_PROTOCOL;
 }
 
 TCPHandler::TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_)
@@ -62,8 +65,8 @@ TCPHandler::TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket
     , server(server_)
     , parse_proxy_protocol(parse_proxy_protocol_)
     , log(&Poco::Logger::get("TCPHandler"))
-    , connection_context(server.context())
-    , query_context(server.context())
+    , connection_context(Context::createCopy(server.context()))
+    , query_context(Context::createCopy(server.context()))
     , server_display_name(std::move(server_display_name_))
 {
 }
@@ -72,7 +75,8 @@ TCPHandler::~TCPHandler()
     try
     {
         state.reset();
-        out->next();
+        if (out)
+            out->next();
     }
     catch (...)
     {
@@ -85,13 +89,13 @@ void TCPHandler::runImpl()
     setThreadName("TCPHandler");
     ThreadStatus thread_status;
 
-    connection_context = server.context();
-    connection_context.makeSessionContext();
+    connection_context = Context::createCopy(server.context());
+    connection_context->makeSessionContext();
 
     /// 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;
+    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);
@@ -132,7 +136,7 @@ void TCPHandler::runImpl()
         try
         {
             /// We try to send error information to the client.
-            sendException(e, connection_context.getSettingsRef().calculate_text_stack_trace);
+            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
         }
         catch (...) {}
 
@@ -146,28 +150,30 @@ void TCPHandler::runImpl()
         {
             Exception e("Database " + backQuote(default_database) + " doesn't exist", ErrorCodes::UNKNOWN_DATABASE);
             LOG_ERROR(log, "Code: {}, e.displayText() = {}, Stack trace:\n\n{}", e.code(), e.displayText(), e.getStackTraceString());
-            sendException(e, connection_context.getSettingsRef().calculate_text_stack_trace);
+            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
             return;
         }
 
-        connection_context.setCurrentDatabase(default_database);
+        connection_context->setCurrentDatabase(default_database);
     }
 
-    Settings connection_settings = connection_context.getSettings();
+    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); });
+    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.
         {
             Stopwatch idle_time;
-            while (!server.isCancelled() && !static_cast<ReadBufferFromPocoSocket &>(*in).poll(
-                std::min(connection_settings.poll_interval, connection_settings.idle_connection_timeout) * 1000000))
+            UInt64 timeout_ms = std::min(poll_interval, idle_connection_timeout) * 1000000;
+            while (!server.isCancelled() && !static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_ms))
             {
-                if (idle_time.elapsedSeconds() > connection_settings.idle_connection_timeout)
+                if (idle_time.elapsedSeconds() > idle_connection_timeout)
                 {
                     LOG_TRACE(log, "Closing idle connection");
                     return;
@@ -180,7 +186,7 @@ void TCPHandler::runImpl()
             break;
 
         /// Set context of request.
-        query_context = connection_context;
+        query_context = Context::createCopy(connection_context);
 
         Stopwatch watch;
         state.reset();
@@ -208,12 +214,21 @@ 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())
                 continue;
 
-            query_scope.emplace(*query_context);
+            query_scope.emplace(query_context);
 
             send_exception_with_stack_trace = query_context->getSettingsRef().calculate_text_stack_trace;
 
@@ -228,9 +243,9 @@ void TCPHandler::runImpl()
                 CurrentThread::setFatalErrorCallback([this]{ sendLogs(); });
             }
 
-            query_context->setExternalTablesInitializer([&connection_settings, this] (Context & context)
+            query_context->setExternalTablesInitializer([&connection_settings, this] (ContextPtr context)
             {
-                if (&context != &*query_context)
+                if (context != query_context)
                     throw Exception("Unexpected context in external tables initializer", ErrorCodes::LOGICAL_ERROR);
 
                 /// Get blocks of temporary tables
@@ -245,9 +260,9 @@ void TCPHandler::runImpl()
             });
 
             /// Send structure of columns to client for function input()
-            query_context->setInputInitializer([this] (Context & context, const StoragePtr & input_storage)
+            query_context->setInputInitializer([this] (ContextPtr context, const StoragePtr & input_storage)
             {
-                if (&context != &query_context.value())
+                if (context != query_context)
                     throw Exception("Unexpected context in Input initializer", ErrorCodes::LOGICAL_ERROR);
 
                 auto metadata_snapshot = input_storage->getInMemoryMetadataPtr();
@@ -265,15 +280,15 @@ void TCPHandler::runImpl()
                 sendData(state.input_header);
             });
 
-            query_context->setInputBlocksReaderCallback([&connection_settings, this] (Context & context) -> Block
+            query_context->setInputBlocksReaderCallback([&connection_settings, this] (ContextPtr context) -> Block
             {
-                if (&context != &query_context.value())
+                if (context != query_context)
                     throw Exception("Unexpected context in InputBlocksReader", ErrorCodes::LOGICAL_ERROR);
 
-                size_t poll_interval;
+                size_t poll_interval_ms;
                 int receive_timeout;
-                std::tie(poll_interval, receive_timeout) = getReadTimeouts(connection_settings);
-                if (!readDataNext(poll_interval, receive_timeout))
+                std::tie(poll_interval_ms, receive_timeout) = getReadTimeouts(connection_settings);
+                if (!readDataNext(poll_interval_ms, receive_timeout))
                 {
                     state.block_in.reset();
                     state.maybe_compressed_in.reset();
@@ -282,11 +297,21 @@ void TCPHandler::runImpl()
                 return state.block_for_input;
             });
 
-            customizeContext(*query_context);
+            customizeContext(query_context);
+
+            /// This callback is needed for requesting read tasks inside pipeline for distributed processing
+            query_context->setReadTaskCallback([this]() -> String
+            {
+                std::lock_guard lock(task_callback_mutex);
+                sendReadTaskRequestAssumeLocked();
+                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);
+            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;
 
             after_check_cancelled.restart();
             after_send_progress.restart();
@@ -450,7 +475,7 @@ void TCPHandler::runImpl()
 }
 
 
-bool TCPHandler::readDataNext(const size_t & poll_interval, const int & receive_timeout)
+bool TCPHandler::readDataNext(size_t poll_interval, time_t receive_timeout)
 {
     Stopwatch watch(CLOCK_MONOTONIC_COARSE);
 
@@ -468,8 +493,8 @@ bool TCPHandler::readDataNext(const size_t & poll_interval, const int & receive_
          *  If we periodically poll, the receive_timeout of the socket itself does not work.
          *  Therefore, an additional check is added.
          */
-        double elapsed = watch.elapsedSeconds();
-        if (elapsed > receive_timeout)
+        Float64 elapsed = watch.elapsedSeconds();
+        if (elapsed > static_cast<Float64>(receive_timeout))
         {
             throw Exception(ErrorCodes::SOCKET_TIMEOUT,
                             "Timeout exceeded while receiving data from client. Waited for {} seconds, timeout is {} seconds.",
@@ -510,10 +535,7 @@ std::tuple<size_t, int> TCPHandler::getReadTimeouts(const Settings & connection_
 
 void TCPHandler::readData(const Settings & connection_settings)
 {
-    size_t poll_interval;
-    int receive_timeout;
-
-    std::tie(poll_interval, receive_timeout) = getReadTimeouts(connection_settings);
+    auto [poll_interval, receive_timeout] = getReadTimeouts(connection_settings);
     sendLogs();
 
     while (readDataNext(poll_interval, receive_timeout))
@@ -536,7 +558,7 @@ void TCPHandler::processInsertQuery(const Settings & connection_settings)
         {
             if (!table_id.empty())
             {
-                auto storage_ptr = DatabaseCatalog::instance().getTable(table_id, *query_context);
+                auto storage_ptr = DatabaseCatalog::instance().getTable(table_id, query_context);
                 sendTableColumns(storage_ptr->getInMemoryMetadataPtr()->getColumns());
             }
         }
@@ -545,7 +567,16 @@ void TCPHandler::processInsertQuery(const Settings & connection_settings)
     /// Send block to the client - table structure.
     sendData(state.io.out->getHeader());
 
-    readData(connection_settings);
+    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();
 }
 
@@ -643,6 +674,8 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
         Block block;
         while (executor.pull(block, query_context->getSettingsRef().interactive_delay / 1000))
         {
+            std::lock_guard lock(task_callback_mutex);
+
             if (isQueryCancelled())
             {
                 /// A packet was received requesting to stop execution of the request.
@@ -700,7 +733,7 @@ void TCPHandler::processTablesStatusRequest()
     TablesStatusResponse response;
     for (const QualifiedTableName & table_name: request.tables)
     {
-        auto resolved_id = connection_context.tryResolveStorageID({table_name.database, table_name.table});
+        auto resolved_id = connection_context->tryResolveStorageID({table_name.database, table_name.table});
         StoragePtr table = DatabaseCatalog::instance().tryGetTable(resolved_id, connection_context);
         if (!table)
             continue;
@@ -712,7 +745,7 @@ void TCPHandler::processTablesStatusRequest()
             status.absolute_delay = replicated_table->getAbsoluteDelay();
         }
         else
-            status.is_replicated = false;
+            status.is_replicated = false; //-V1048
 
         response.table_states_by_id.emplace(table_name, std::move(status));
     }
@@ -754,6 +787,13 @@ void TCPHandler::sendPartUUIDs()
     }
 }
 
+
+void TCPHandler::sendReadTaskRequestAssumeLocked()
+{
+    writeVarUInt(Protocol::Server::ReadTaskRequest, *out);
+    out->next();
+}
+
 void TCPHandler::sendProfileInfo(const BlockStreamProfileInfo & info)
 {
     writeVarUInt(Protocol::Server::ProfileInfo, *out);
@@ -861,7 +901,7 @@ bool TCPHandler::receiveProxyHeader()
     }
 
     LOG_TRACE(log, "Forwarded client address from PROXY header: {}", forwarded_address);
-    connection_context.getClientInfo().forwarded_for = forwarded_address;
+    connection_context->getClientInfo().forwarded_for = forwarded_address;
     return true;
 }
 
@@ -914,7 +954,7 @@ void TCPHandler::receiveHello()
 
     if (user != USER_INTERSERVER_MARKER)
     {
-        connection_context.setUser(user, password, socket().peerAddress());
+        connection_context->setUser(user, password, socket().peerAddress());
     }
     else
     {
@@ -962,8 +1002,6 @@ bool TCPHandler::receivePacket()
     UInt64 packet_type = 0;
     readVarUInt(packet_type, *in);
 
-//    std::cerr << "Server got packet: " << Protocol::Client::toString(packet_type) << "\n";
-
     switch (packet_type)
     {
         case Protocol::Client::IgnoredPartUUIDs:
@@ -1015,6 +1053,34 @@ void TCPHandler::receiveIgnoredPartUUIDs()
         query_context->getIgnoredPartUUIDs()->add(uuids);
 }
 
+
+String TCPHandler::receiveReadTaskResponseAssumeLocked()
+{
+    UInt64 packet_type = 0;
+    readVarUInt(packet_type, *in);
+    if (packet_type != Protocol::Client::ReadTaskResponse)
+    {
+        if (packet_type == Protocol::Client::Cancel)
+        {
+            state.is_cancelled = true;
+            return {};
+        }
+        else
+        {
+            throw Exception(fmt::format("Received {} packet after requesting read task",
+                    Protocol::Client::toString(packet_type)), ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
+        }
+    }
+    UInt64 version;
+    readVarUInt(version, *in);
+    if (version != DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION)
+        throw Exception("Protocol version for distributed processing mismatched", ErrorCodes::UNKNOWN_PROTOCOL);
+    String response;
+    readStringBinary(response, *in);
+    return response;
+}
+
+
 void TCPHandler::receiveClusterNameAndSalt()
 {
     readStringBinary(cluster, *in);
@@ -1032,7 +1098,7 @@ void TCPHandler::receiveClusterNameAndSalt()
         try
         {
             /// We try to send error information to the client.
-            sendException(e, connection_context.getSettingsRef().calculate_text_stack_trace);
+            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
         }
         catch (...) {}
 
@@ -1235,18 +1301,18 @@ bool TCPHandler::receiveData(bool scalar)
             /// If such a table does not exist, create it.
             if (resolved)
             {
-                storage = DatabaseCatalog::instance().getTable(resolved, *query_context);
+                storage = DatabaseCatalog::instance().getTable(resolved, query_context);
             }
             else
             {
                 NamesAndTypesList columns = block.getNamesAndTypesList();
-                auto temporary_table = TemporaryTableHolder(*query_context, ColumnsDescription{columns}, {});
+                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 = storage->write(ASTPtr(), metadata_snapshot, *query_context);
+            auto temporary_table_out = storage->write(ASTPtr(), metadata_snapshot, query_context);
             temporary_table_out->write(block);
             temporary_table_out->writeSuffix();
 
@@ -1345,7 +1411,7 @@ void TCPHandler::initBlockOutput(const Block & block)
             *state.maybe_compressed_out,
             client_tcp_protocol_version,
             block.cloneEmpty(),
-            !connection_context.getSettingsRef().low_cardinality_allow_in_native_format);
+            !connection_context->getSettingsRef().low_cardinality_allow_in_native_format);
     }
 }
 
@@ -1358,7 +1424,7 @@ void TCPHandler::initLogsBlockOutput(const Block & block)
             *out,
             client_tcp_protocol_version,
             block.cloneEmpty(),
-            !connection_context.getSettingsRef().low_cardinality_allow_in_native_format);
+            !connection_context->getSettingsRef().low_cardinality_allow_in_native_format);
     }
 }
 
@@ -1414,6 +1480,14 @@ void TCPHandler::sendData(const Block & block)
 
     try
     {
+        /// For testing hedged requests
+        if (unknown_packet_in_send_data)
+        {
+            --unknown_packet_in_send_data;
+            if (unknown_packet_in_send_data == 0)
+                writeVarUInt(UInt64(-1), *out);
+        }
+
         writeVarUInt(Protocol::Server::Data, *out);
         /// Send external table name (empty name is the main table)
         writeStringBinary("", *out);
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index c3dd8346c8e..086c1f7d5e5 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -89,7 +89,7 @@ struct QueryState
         *this = QueryState();
     }
 
-    bool empty()
+    bool empty() const
     {
         return is_empty;
     }
@@ -113,14 +113,13 @@ public:
       *  because it allows to check the IP ranges of the trusted proxy.
       * Proxy-forwarded (original client) IP address is used for quota accounting if quota is keyed by forwarded IP.
       */
-    TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_,
-        std::string server_display_name_);
+    TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_);
     ~TCPHandler() override;
 
     void run() override;
 
     /// This method is called right before the query execution.
-    virtual void customizeContext(DB::Context & /*context*/) {}
+    virtual void customizeContext(ContextMutablePtr /*context*/) {}
 
 private:
     IServer & server;
@@ -133,8 +132,10 @@ private:
     UInt64 client_version_patch = 0;
     UInt64 client_tcp_protocol_version = 0;
 
-    Context connection_context;
-    std::optional<Context> query_context;
+    ContextMutablePtr connection_context;
+    ContextMutablePtr query_context;
+
+    size_t unknown_packet_in_send_data = 0;
 
     /// Streams for reading/writing from/to client connection socket.
     std::shared_ptr<ReadBuffer> in;
@@ -151,6 +152,7 @@ private:
     String cluster;
     String cluster_secret;
 
+    std::mutex task_callback_mutex;
 
     /// At the moment, only one ongoing query in the connection is supported at a time.
     QueryState state;
@@ -170,9 +172,11 @@ private:
     bool receivePacket();
     void receiveQuery();
     void receiveIgnoredPartUUIDs();
+    String receiveReadTaskResponseAssumeLocked();
     bool receiveData(bool scalar);
-    bool readDataNext(const size_t & poll_interval, const int & receive_timeout);
+    bool readDataNext(size_t poll_interval, time_t receive_timeout);
     void readData(const Settings & connection_settings);
+    void receiveClusterNameAndSalt();
     std::tuple<size_t, int> getReadTimeouts(const Settings & connection_settings);
 
     [[noreturn]] void receiveUnexpectedData();
@@ -199,12 +203,11 @@ private:
     void sendLogs();
     void sendEndOfStream();
     void sendPartUUIDs();
+    void sendReadTaskRequestAssumeLocked();
     void sendProfileInfo(const BlockStreamProfileInfo & info);
     void sendTotals(const Block & totals);
     void sendExtremes(const Block & extremes);
 
-    void receiveClusterNameAndSalt();
-
     /// Creates state.block_in/block_out for blocks read/write, depending on whether compression is enabled.
     void initBlockInput();
     void initBlockOutput(const Block & block);
diff --git a/src/Server/ya.make.in b/src/Server/ya.make.in
index c0c1dcc7b15..fd1b414edf5 100644
--- a/src/Server/ya.make.in
+++ b/src/Server/ya.make.in
@@ -9,7 +9,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | sed 's/^\.\//    /' | sort ?>
+<? find . -name '*.cpp' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
 )
 
 END()
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 7043a32760b..d0d995ba3a6 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -20,6 +20,7 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTIndexDeclaration.h>
+#include <Parsers/ASTProjectionDeclaration.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/queryToString.h>
@@ -228,6 +229,25 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
 
         return command;
     }
+    else if (command_ast->type == ASTAlterCommand::ADD_PROJECTION)
+    {
+        AlterCommand command;
+        command.ast = command_ast->clone();
+        command.projection_decl = command_ast->projection_decl;
+        command.type = AlterCommand::ADD_PROJECTION;
+
+        const auto & ast_projection_decl = command_ast->projection_decl->as<ASTProjectionDeclaration &>();
+
+        command.projection_name = ast_projection_decl.name;
+
+        if (command_ast->projection)
+            command.after_projection_name = command_ast->projection->as<ASTIdentifier &>().name();
+
+        command.first = command_ast->first;
+        command.if_not_exists = command_ast->if_not_exists;
+
+        return command;
+    }
     else if (command_ast->type == ASTAlterCommand::DROP_CONSTRAINT)
     {
         AlterCommand command;
@@ -253,6 +273,21 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
 
         return command;
     }
+    else if (command_ast->type == ASTAlterCommand::DROP_PROJECTION)
+    {
+        AlterCommand command;
+        command.ast = command_ast->clone();
+        command.type = AlterCommand::DROP_PROJECTION;
+        command.projection_name = command_ast->projection->as<ASTIdentifier &>().name();
+        command.if_exists = command_ast->if_exists;
+        if (command_ast->clear_projection)
+            command.clear = true;
+
+        if (command_ast->partition)
+            command.partition = command_ast->partition;
+
+        return command;
+    }
     else if (command_ast->type == ASTAlterCommand::MODIFY_TTL)
     {
         AlterCommand command;
@@ -299,7 +334,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
 }
 
 
-void AlterCommand::apply(StorageInMemoryMetadata & metadata, const Context & context) const
+void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (type == ADD_COLUMN)
     {
@@ -320,7 +355,7 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, const Context & con
         metadata.columns.add(column, after_column, first);
 
         /// Slow, because each time a list is copied
-        if (context.getSettingsRef().flatten_nested)
+        if (context->getSettingsRef().flatten_nested)
             metadata.columns.flattenNested();
     }
     else if (type == DROP_COLUMN)
@@ -499,6 +534,16 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, const Context & con
         }
         metadata.constraints.constraints.erase(erase_it);
     }
+    else if (type == ADD_PROJECTION)
+    {
+        auto projection = ProjectionDescription::getProjectionFromAST(projection_decl, metadata.columns, context);
+        metadata.projections.add(std::move(projection), after_projection_name, first, if_not_exists);
+    }
+    else if (type == DROP_PROJECTION)
+    {
+        if (!partition && !clear)
+            metadata.projections.remove(projection_name, if_exists);
+    }
     else if (type == MODIFY_TTL)
     {
         metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(ttl, metadata.columns, context, metadata.primary_key);
@@ -645,7 +690,7 @@ bool AlterCommand::isRequireMutationStage(const StorageInMemoryMetadata & metada
     if (isRemovingProperty() || type == REMOVE_TTL)
         return false;
 
-    if (type == DROP_COLUMN || type == DROP_INDEX || type == RENAME_COLUMN)
+    if (type == DROP_COLUMN || type == DROP_INDEX || type == DROP_PROJECTION || type == RENAME_COLUMN)
         return true;
 
     if (type != MODIFY_COLUMN || data_type == nullptr)
@@ -702,7 +747,7 @@ bool AlterCommand::isRemovingProperty() const
     return to_remove != RemoveProperty::NO_PROPERTY;
 }
 
-std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, const Context & context) const
+std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!isRequireMutationStage(metadata))
         return {};
@@ -737,6 +782,17 @@ std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(Storage
 
         result.predicate = nullptr;
     }
+    else if (type == DROP_PROJECTION)
+    {
+        result.type = MutationCommand::Type::DROP_PROJECTION;
+        result.column_name = projection_name;
+        if (clear)
+            result.clear = true;
+        if (partition)
+            result.partition = partition;
+
+        result.predicate = nullptr;
+    }
     else if (type == RENAME_COLUMN)
     {
         result.type = MutationCommand::Type::RENAME_COLUMN;
@@ -760,6 +816,8 @@ String alterTypeToString(const AlterCommand::Type type)
         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:
@@ -768,6 +826,8 @@ String alterTypeToString(const AlterCommand::Type type)
         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:
@@ -784,11 +844,13 @@ String alterTypeToString(const AlterCommand::Type type)
         return "RENAME COLUMN";
     case AlterCommand::Type::REMOVE_TTL:
         return "REMOVE TTL";
+    default:
+        throw Exception("Uninitialized ALTER command", ErrorCodes::LOGICAL_ERROR);
     }
-    __builtin_unreachable();
+
 }
 
-void AlterCommands::apply(StorageInMemoryMetadata & metadata, const Context & context) const
+void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!prepared)
         throw DB::Exception("Alter commands is not prepared. Cannot apply. It's a bug", ErrorCodes::LOGICAL_ERROR);
@@ -821,7 +883,33 @@ void AlterCommands::apply(StorageInMemoryMetadata & metadata, const Context & co
 
     /// Changes in columns may lead to changes in secondary indices
     for (auto & index : metadata_copy.secondary_indices)
-        index = IndexDescription::getIndexFromAST(index.definition_ast, metadata_copy.columns, context);
+    {
+        try
+        {
+            index = IndexDescription::getIndexFromAST(index.definition_ast, metadata_copy.columns, context);
+        }
+        catch (Exception & exception)
+        {
+            exception.addMessage("Cannot apply mutation because it breaks skip index " + index.name);
+            throw;
+        }
+    }
+
+    /// Changes in columns may lead to changes in projections
+    ProjectionsDescription new_projections;
+    for (const auto & projection : metadata_copy.projections)
+    {
+        try
+        {
+            new_projections.add(ProjectionDescription::getProjectionFromAST(projection.definition_ast, metadata_copy.columns, context));
+        }
+        catch (Exception & exception)
+        {
+            exception.addMessage("Cannot apply mutation because it breaks projection " + projection.name);
+            throw;
+        }
+    }
+    metadata_copy.projections = std::move(new_projections);
 
     /// Changes in columns may lead to changes in TTL expressions.
     auto column_ttl_asts = metadata_copy.columns.getColumnTTLs();
@@ -880,7 +968,7 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata)
     prepared = true;
 }
 
-void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Context & context) const
+void AlterCommands::validate(const StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     auto all_columns = metadata.columns;
     /// Default expression for all added/modified columns
@@ -907,7 +995,7 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
                                 ErrorCodes::BAD_ARGUMENTS};
 
             if (command.codec)
-                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context.getSettingsRef().allow_suspicious_codecs);
+                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context->getSettingsRef().allow_suspicious_codecs);
 
             all_columns.add(ColumnDescription(column_name, command.data_type));
         }
@@ -927,7 +1015,7 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
                                 ErrorCodes::NOT_IMPLEMENTED};
 
             if (command.codec)
-                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context.getSettingsRef().allow_suspicious_codecs);
+                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context->getSettingsRef().allow_suspicious_codecs);
             auto column_default = all_columns.getDefault(column_name);
             if (column_default)
             {
@@ -1172,7 +1260,7 @@ static MutationCommand createMaterializeTTLCommand()
     return command;
 }
 
-MutationCommands AlterCommands::getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, const Context & context) const
+MutationCommands AlterCommands::getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, ContextPtr context) const
 {
     MutationCommands result;
     for (const auto & alter_cmd : *this)
diff --git a/src/Storages/AlterCommands.h b/src/Storages/AlterCommands.h
index c973b0b6a6f..4e9c9764753 100644
--- a/src/Storages/AlterCommands.h
+++ b/src/Storages/AlterCommands.h
@@ -23,6 +23,7 @@ struct AlterCommand
 
     enum Type
     {
+        UNKNOWN,
         ADD_COLUMN,
         DROP_COLUMN,
         MODIFY_COLUMN,
@@ -33,6 +34,8 @@ struct AlterCommand
         DROP_INDEX,
         ADD_CONSTRAINT,
         DROP_CONSTRAINT,
+        ADD_PROJECTION,
+        DROP_PROJECTION,
         MODIFY_TTL,
         MODIFY_SETTING,
         MODIFY_QUERY,
@@ -55,7 +58,7 @@ struct AlterCommand
         TTL
     };
 
-    Type type;
+    Type type = UNKNOWN;
 
     String column_name;
 
@@ -102,6 +105,13 @@ struct AlterCommand
     // For ADD/DROP CONSTRAINT
     String constraint_name;
 
+    /// For ADD PROJECTION
+    ASTPtr projection_decl = nullptr;
+    String after_projection_name;
+
+    /// For ADD/DROP PROJECTION
+    String projection_name;
+
     /// For MODIFY TTL
     ASTPtr ttl = nullptr;
 
@@ -128,7 +138,7 @@ struct AlterCommand
 
     static std::optional<AlterCommand> parse(const ASTAlterCommand * command);
 
-    void apply(StorageInMemoryMetadata & metadata, const Context & context) const;
+    void apply(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 
     /// Check that alter command require data modification (mutation) to be
     /// executed. For example, cast from Date to UInt16 type can be executed
@@ -151,7 +161,7 @@ struct AlterCommand
     /// If possible, convert alter command to mutation command. In other case
     /// return empty optional. Some storages may execute mutations after
     /// metadata changes.
-    std::optional<MutationCommand> tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, const Context & context) const;
+    std::optional<MutationCommand> tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 };
 
 /// Return string representation of AlterCommand::Type
@@ -170,7 +180,7 @@ public:
     /// Checks that all columns exist and dependencies between them.
     /// This check is lightweight and base only on metadata.
     /// More accurate check have to be performed with storage->checkAlterIsPossible.
-    void validate(const StorageInMemoryMetadata & metadata, const Context & context) const;
+    void validate(const StorageInMemoryMetadata & metadata, ContextPtr context) const;
 
     /// Prepare alter commands. Set ignore flag to some of them and set some
     /// parts to commands from storage's metadata (for example, absent default)
@@ -178,7 +188,7 @@ public:
 
     /// Apply all alter command in sequential order to storage metadata.
     /// Commands have to be prepared before apply.
-    void apply(StorageInMemoryMetadata & metadata, const Context & context) const;
+    void apply(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 
     /// At least one command modify settings.
     bool isSettingsAlter() const;
@@ -190,7 +200,7 @@ public:
     /// alter. If alter can be performed as pure metadata update, than result is
     /// empty. If some TTL changes happened than, depending on materialize_ttl
     /// additional mutation command (MATERIALIZE_TTL) will be returned.
-    MutationCommands getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, const Context & context) const;
+    MutationCommands getMutationCommands(StorageInMemoryMetadata metadata, bool materialize_ttl, ContextPtr context) const;
 };
 
 }
diff --git a/src/Storages/CMakeLists.txt b/src/Storages/CMakeLists.txt
index deb1c9f6716..ff22e9fa9e1 100644
--- a/src/Storages/CMakeLists.txt
+++ b/src/Storages/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(MergeTree)
 add_subdirectory(System)
 
-if(ENABLE_TESTS)
-    add_subdirectory(tests)
+if(ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif()
diff --git a/src/Storages/ColumnDefault.h b/src/Storages/ColumnDefault.h
index 1035bfcc834..38b61415a9a 100644
--- a/src/Storages/ColumnDefault.h
+++ b/src/Storages/ColumnDefault.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <Parsers/IAST.h>
+
 #include <string>
 #include <unordered_map>
 
-#include <Parsers/IAST.h>
-
 
 namespace DB
 {
@@ -18,7 +18,7 @@ enum class ColumnDefaultKind
 
 
 ColumnDefaultKind columnDefaultKindFromString(const std::string & str);
-std::string toString(const ColumnDefaultKind kind);
+std::string toString(ColumnDefaultKind kind);
 
 
 struct ColumnDefault
diff --git a/src/Storages/ColumnDependency.h b/src/Storages/ColumnDependency.h
index 606b8b3dc5f..79bdaa06efa 100644
--- a/src/Storages/ColumnDependency.h
+++ b/src/Storages/ColumnDependency.h
@@ -17,6 +17,9 @@ struct ColumnDependency
         /// Exists any skip index, that requires @column_name
         SKIP_INDEX,
 
+        /// Exists any projection, that requires @column_name
+        PROJECTION,
+
         /// Exists any TTL expression, that requires @column_name
         TTL_EXPRESSION,
 
@@ -32,7 +35,7 @@ struct ColumnDependency
 
     bool isReadOnly() const
     {
-        return kind == SKIP_INDEX || kind == TTL_EXPRESSION;
+        return kind == SKIP_INDEX || kind == PROJECTION || kind == TTL_EXPRESSION;
     }
 
     bool operator==(const ColumnDependency & other) const
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index fc6bb661986..545911f1465 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -582,7 +582,7 @@ void ColumnsDescription::removeSubcolumns(const String & name_in_storage, const
         subcolumns.erase(name_in_storage + "." + subcolumn_name);
 }
 
-Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, const Context & context)
+Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, ContextPtr context)
 {
     for (const auto & child : default_expr_list->children)
         if (child->as<ASTSelectQuery>() || child->as<ASTSelectWithUnionQuery>() || child->as<ASTSubquery>())
diff --git a/src/Storages/ColumnsDescription.h b/src/Storages/ColumnsDescription.h
index 26e30004544..7fff22abf71 100644
--- a/src/Storages/ColumnsDescription.h
+++ b/src/Storages/ColumnsDescription.h
@@ -1,18 +1,20 @@
 #pragma once
 
-#include <Core/NamesAndTypes.h>
-#include <Core/Names.h>
-#include <Core/Block.h>
-#include <Common/Exception.h>
-#include <Storages/ColumnDefault.h>
-#include <Storages/ColumnCodec.h>
-#include <optional>
 #include <Compression/CompressionFactory.h>
+#include <Core/Block.h>
+#include <Core/Names.h>
+#include <Core/NamesAndTypes.h>
+#include <Interpreters/Context_fwd.h>
+#include <Storages/ColumnCodec.h>
+#include <Storages/ColumnDefault.h>
+#include <Common/Exception.h>
 
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/member.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/sequenced_index.hpp>
+#include <boost/multi_index_container.hpp>
+
+#include <optional>
 
 
 namespace DB
@@ -159,5 +161,5 @@ private:
 /// default expression result can be casted to column_type. Also checks, that we
 /// don't have strange constructions in default expression like SELECT query or
 /// arrayJoin function.
-Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, const Context & context);
+Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, ContextPtr context);
 }
diff --git a/src/Storages/ConstraintsDescription.cpp b/src/Storages/ConstraintsDescription.cpp
index e6315872a66..7015c3f8e48 100644
--- a/src/Storages/ConstraintsDescription.cpp
+++ b/src/Storages/ConstraintsDescription.cpp
@@ -41,7 +41,7 @@ ConstraintsDescription ConstraintsDescription::parse(const String & str)
     return res;
 }
 
-ConstraintsExpressions ConstraintsDescription::getExpressions(const DB::Context & context,
+ConstraintsExpressions ConstraintsDescription::getExpressions(const DB::ContextPtr context,
                                                               const DB::NamesAndTypesList & source_columns_) const
 {
     ConstraintsExpressions res;
@@ -52,7 +52,7 @@ ConstraintsExpressions ConstraintsDescription::getExpressions(const DB::Context
         auto * constraint_ptr = constraint->as<ASTConstraintDeclaration>();
         ASTPtr expr = constraint_ptr->expr->clone();
         auto syntax_result = TreeRewriter(context).analyze(expr, source_columns_);
-        res.push_back(ExpressionAnalyzer(constraint_ptr->expr->clone(), syntax_result, context).getActions(false));
+        res.push_back(ExpressionAnalyzer(constraint_ptr->expr->clone(), syntax_result, context).getActions(false, true, CompileExpressions::yes));
     }
     return res;
 }
diff --git a/src/Storages/ConstraintsDescription.h b/src/Storages/ConstraintsDescription.h
index d6d2baefbd2..5e6416822bb 100644
--- a/src/Storages/ConstraintsDescription.h
+++ b/src/Storages/ConstraintsDescription.h
@@ -19,7 +19,7 @@ struct ConstraintsDescription
 
     static ConstraintsDescription parse(const String & str);
 
-    ConstraintsExpressions getExpressions(const Context & context, const NamesAndTypesList & source_columns_) const;
+    ConstraintsExpressions getExpressions(ContextPtr context, const NamesAndTypesList & source_columns_) const;
 
     ConstraintsDescription(const ConstraintsDescription & other);
     ConstraintsDescription & operator=(const ConstraintsDescription & other);
diff --git a/src/Storages/DataDestinationType.h b/src/Storages/DataDestinationType.h
index 05d1d89c2b5..4729019b5cb 100644
--- a/src/Storages/DataDestinationType.h
+++ b/src/Storages/DataDestinationType.h
@@ -10,6 +10,7 @@ enum class DataDestinationType
     VOLUME,
     TABLE,
     DELETE,
+    SHARD,
 };
 
 }
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index fb5e5080314..e8835132f8f 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -9,6 +9,8 @@
 #include <Common/quoteString.h>
 #include <Common/hex.h>
 #include <Common/ActionBlocker.h>
+#include <Common/formatReadable.h>
+#include <Common/Stopwatch.h>
 #include <common/StringRef.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Cluster.h>
@@ -23,19 +25,20 @@
 #include <IO/ConnectionTimeoutsContext.h>
 #include <IO/Operators.h>
 #include <Disks/IDisk.h>
-
 #include <boost/algorithm/string/find_iterator.hpp>
 #include <boost/algorithm/string/finder.hpp>
-
-#include <Poco/DirectoryIterator.h>
+#include <filesystem>
 
 
 namespace CurrentMetrics
 {
     extern const Metric DistributedSend;
     extern const Metric DistributedFilesToInsert;
+    extern const Metric BrokenDistributedFilesToInsert;
 }
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
@@ -104,12 +107,14 @@ namespace
         size_t rows = 0;
         size_t bytes = 0;
 
-        std::string header;
+        /// dumpStructure() of the header -- obsolete
+        std::string block_header_string;
+        Block block_header;
     };
 
-    DistributedHeader readDistributedHeader(ReadBuffer & in, Poco::Logger * log)
+    DistributedHeader readDistributedHeader(ReadBufferFromFile & in, Poco::Logger * log)
     {
-        DistributedHeader header;
+        DistributedHeader distributed_header;
 
         UInt64 query_size;
         readVarUInt(query_size, in);
@@ -135,17 +140,25 @@ namespace
                 LOG_WARNING(log, "ClickHouse shard version is older than ClickHouse initiator version. It may lack support for new features.");
             }
 
-            readStringBinary(header.insert_query, header_buf);
-            header.insert_settings.read(header_buf);
+            readStringBinary(distributed_header.insert_query, header_buf);
+            distributed_header.insert_settings.read(header_buf);
 
             if (header_buf.hasPendingData())
-                header.client_info.read(header_buf, initiator_revision);
+                distributed_header.client_info.read(header_buf, initiator_revision);
 
             if (header_buf.hasPendingData())
             {
-                readVarUInt(header.rows, header_buf);
-                readVarUInt(header.bytes, header_buf);
-                readStringBinary(header.header, header_buf);
+                readVarUInt(distributed_header.rows, header_buf);
+                readVarUInt(distributed_header.bytes, header_buf);
+                readStringBinary(distributed_header.block_header_string, header_buf);
+            }
+
+            if (header_buf.hasPendingData())
+            {
+                NativeBlockInputStream 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());
             }
 
             /// Add handling new data here, for example:
@@ -155,20 +168,20 @@ namespace
             ///
             /// And note that it is safe, because we have checksum and size for header.
 
-            return header;
+            return distributed_header;
         }
 
         if (query_size == DBMS_DISTRIBUTED_SIGNATURE_HEADER_OLD_FORMAT)
         {
-            header.insert_settings.read(in, SettingsWriteFormat::BINARY);
-            readStringBinary(header.insert_query, in);
-            return header;
+            distributed_header.insert_settings.read(in, SettingsWriteFormat::BINARY);
+            readStringBinary(distributed_header.insert_query, in);
+            return distributed_header;
         }
 
-        header.insert_query.resize(query_size);
-        in.readStrict(header.insert_query.data(), query_size);
+        distributed_header.insert_query.resize(query_size);
+        in.readStrict(distributed_header.insert_query.data(), query_size);
 
-        return header;
+        return distributed_header;
     }
 
     /// remote_error argument is used to decide whether some errors should be
@@ -200,35 +213,71 @@ namespace
         return nullptr;
     }
 
-    void writeRemoteConvert(const DistributedHeader & header, RemoteBlockOutputStream & remote, ReadBufferFromFile & in, Poco::Logger * log)
+    void writeAndConvert(RemoteBlockOutputStream & remote, ReadBufferFromFile & in)
     {
-        if (remote.getHeader() && header.header != remote.getHeader().dumpStructure())
+        CompressedReadBuffer decompressing_in(in);
+        NativeBlockInputStream block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
+        block_in.readPrefix();
+
+        while (Block block = block_in.read())
         {
-            LOG_WARNING(log,
-                "Structure does not match (remote: {}, local: {}), implicit conversion will be done",
-                remote.getHeader().dumpStructure(), header.header);
-
-            CompressedReadBuffer decompressing_in(in);
-            /// Lack of header, requires to read blocks
-            NativeBlockInputStream block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
-
-            block_in.readPrefix();
-            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);
-            }
-            block_in.readSuffix();
+            ConvertingBlockInputStream convert(
+                std::make_shared<OneBlockInputStream>(block),
+                remote.getHeader(),
+                ConvertingBlockInputStream::MatchColumnsMode::Name);
+            auto adopted_block = convert.read();
+            remote.write(adopted_block);
         }
-        else
+
+        block_in.readSuffix();
+    }
+
+    void writeRemoteConvert(
+        const DistributedHeader & distributed_header,
+        RemoteBlockOutputStream & remote,
+        bool compression_expected,
+        ReadBufferFromFile & in,
+        Poco::Logger * log)
+    {
+        if (!remote.getHeader())
         {
             CheckingCompressedReadBuffer checking_in(in);
             remote.writePrepared(checking_in);
+            return;
         }
+
+        /// This is old format, that does not have header for the block in the file header,
+        /// applying ConvertingBlockInputStream in this case is not a big overhead.
+        ///
+        /// Anyway we can get header only from the first block, which contain all rows anyway.
+        if (!distributed_header.block_header)
+        {
+            LOG_TRACE(log, "Processing batch {} with old format (no header)", in.getFileName());
+
+            writeAndConvert(remote, in);
+            return;
+        }
+
+        if (!blocksHaveEqualStructure(distributed_header.block_header, remote.getHeader()))
+        {
+            LOG_WARNING(log,
+                "Structure does not match (remote: {}, local: {}), implicit conversion will be done",
+                remote.getHeader().dumpStructure(), distributed_header.block_header.dumpStructure());
+
+            writeAndConvert(remote, in);
+            return;
+        }
+
+        /// If connection does not use compression, we have to uncompress the data.
+        if (!compression_expected)
+        {
+            writeAndConvert(remote, in);
+            return;
+        }
+
+        /// Otherwise write data as it was already prepared (more efficient path).
+        CheckingCompressedReadBuffer checking_in(in);
+        remote.writePrepared(checking_in);
     }
 }
 
@@ -244,18 +293,19 @@ StorageDistributedDirectoryMonitor::StorageDistributedDirectoryMonitor(
     , pool(std::move(pool_))
     , disk(disk_)
     , relative_path(relative_path_)
-    , path(disk->getPath() + relative_path + '/')
-    , should_batch_inserts(storage.global_context.getSettingsRef().distributed_directory_monitor_batch_inserts)
+    , path(fs::path(disk->getPath()) / relative_path / "")
+    , should_batch_inserts(storage.getContext()->getSettingsRef().distributed_directory_monitor_batch_inserts)
     , dir_fsync(storage.getDistributedSettingsRef().fsync_directories)
-    , min_batched_block_size_rows(storage.global_context.getSettingsRef().min_insert_block_size_rows)
-    , min_batched_block_size_bytes(storage.global_context.getSettingsRef().min_insert_block_size_bytes)
+    , min_batched_block_size_rows(storage.getContext()->getSettingsRef().min_insert_block_size_rows)
+    , min_batched_block_size_bytes(storage.getContext()->getSettingsRef().min_insert_block_size_bytes)
     , current_batch_file_path(path + "current_batch.txt")
-    , default_sleep_time(storage.global_context.getSettingsRef().distributed_directory_monitor_sleep_time_ms.totalMilliseconds())
+    , default_sleep_time(storage.getContext()->getSettingsRef().distributed_directory_monitor_sleep_time_ms.totalMilliseconds())
     , sleep_time(default_sleep_time)
-    , max_sleep_time(storage.global_context.getSettingsRef().distributed_directory_monitor_max_sleep_time_ms.totalMilliseconds())
+    , max_sleep_time(storage.getContext()->getSettingsRef().distributed_directory_monitor_max_sleep_time_ms.totalMilliseconds())
     , log(&Poco::Logger::get(getLoggerName()))
     , monitor_blocker(monitor_blocker_)
     , metric_pending_files(CurrentMetrics::DistributedFilesToInsert, 0)
+    , metric_broken_files(CurrentMetrics::BrokenDistributedFilesToInsert, 0)
 {
     task_handle = bg_pool.createTask(getLoggerName() + "/Bg", [this]{ run(); });
     task_handle->activateAndSchedule();
@@ -297,7 +347,7 @@ void StorageDistributedDirectoryMonitor::shutdownAndDropAllData()
     }
 
     auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
-    Poco::File(path).remove(true);
+    fs::remove_all(path);
 }
 
 
@@ -320,20 +370,20 @@ void StorageDistributedDirectoryMonitor::run()
             {
                 do_sleep = !processFiles(files);
 
-                std::lock_guard metrics_lock(metrics_mutex);
-                last_exception = std::exception_ptr{};
+                std::lock_guard status_lock(status_mutex);
+                status.last_exception = std::exception_ptr{};
             }
             catch (...)
             {
-                std::lock_guard metrics_lock(metrics_mutex);
+                std::lock_guard status_lock(status_mutex);
 
                 do_sleep = true;
-                ++error_count;
+                ++status.error_count;
                 sleep_time = std::min(
-                    std::chrono::milliseconds{Int64(default_sleep_time.count() * std::exp2(error_count))},
+                    std::chrono::milliseconds{Int64(default_sleep_time.count() * std::exp2(status.error_count))},
                     max_sleep_time);
                 tryLogCurrentException(getLoggerName().data());
-                last_exception = std::current_exception();
+                status.last_exception = std::current_exception();
             }
         }
         else
@@ -344,9 +394,9 @@ void StorageDistributedDirectoryMonitor::run()
         const auto now = std::chrono::system_clock::now();
         if (now - last_decrease_time > decrease_error_count_period)
         {
-            std::lock_guard metrics_lock(metrics_mutex);
+            std::lock_guard status_lock(status_mutex);
 
-            error_count /= 2;
+            status.error_count /= 2;
             last_decrease_time = now;
         }
 
@@ -427,7 +477,7 @@ ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::stri
 
     auto pools = createPoolsForAddresses(name, pool_factory, storage.log);
 
-    const auto settings = storage.global_context.getSettings();
+    const auto settings = storage.getContext()->getSettings();
     return pools.size() == 1 ? pools.front() : std::make_shared<ConnectionPoolWithFailover>(pools,
         settings.load_balancing,
         settings.distributed_replica_error_half_life.totalSeconds(),
@@ -440,30 +490,28 @@ std::map<UInt64, std::string> StorageDistributedDirectoryMonitor::getFiles()
     std::map<UInt64, std::string> files;
     size_t new_bytes_count = 0;
 
-    Poco::DirectoryIterator end;
-    for (Poco::DirectoryIterator it{path}; it != end; ++it)
+    fs::directory_iterator end;
+    for (fs::directory_iterator it{path}; it != end; ++it)
     {
         const auto & file_path_str = it->path();
-        Poco::Path file_path{file_path_str};
-
-        if (!it->isDirectory() && startsWith(file_path.getExtension(), "bin"))
+        if (!it->is_directory() && startsWith(fs::path(file_path_str).extension(), ".bin"))
         {
-            files[parse<UInt64>(file_path.getBaseName())] = file_path_str;
-            new_bytes_count += Poco::File(file_path).getSize();
+            files[parse<UInt64>(fs::path(file_path_str).stem())] = file_path_str;
+            new_bytes_count += fs::file_size(fs::path(file_path_str));
         }
     }
 
     {
-        std::lock_guard metrics_lock(metrics_mutex);
+        std::lock_guard status_lock(status_mutex);
 
-        if (files_count != files.size())
-            LOG_TRACE(log, "Files set to {} (was {})", files.size(), files_count);
-        if (bytes_count != new_bytes_count)
-            LOG_TRACE(log, "Bytes set to {} (was {})", new_bytes_count, bytes_count);
+        if (status.files_count != files.size())
+            LOG_TRACE(log, "Files set to {} (was {})", files.size(), status.files_count);
+        if (status.bytes_count != new_bytes_count)
+            LOG_TRACE(log, "Bytes set to {} (was {})", new_bytes_count, status.bytes_count);
 
         metric_pending_files.changeTo(files.size());
-        files_count = files.size();
-        bytes_count = new_bytes_count;
+        status.files_count = files.size();
+        status.bytes_count = new_bytes_count;
     }
 
     return files;
@@ -490,32 +538,40 @@ bool StorageDistributedDirectoryMonitor::processFiles(const std::map<UInt64, std
 
 void StorageDistributedDirectoryMonitor::processFile(const std::string & file_path)
 {
-    LOG_TRACE(log, "Started processing `{}`", file_path);
-    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.global_context.getSettingsRef());
+    Stopwatch watch;
+    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.getContext()->getSettingsRef());
 
     try
     {
         CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
 
         ReadBufferFromFile in(file_path);
-        const auto & header = readDistributedHeader(in, log);
+        const auto & distributed_header = readDistributedHeader(in, log);
 
-        auto connection = pool->get(timeouts, &header.insert_settings);
+        LOG_DEBUG(log, "Started processing `{}` ({} rows, {} bytes)", file_path,
+            formatReadableQuantity(distributed_header.rows),
+            formatReadableSizeWithBinarySuffix(distributed_header.bytes));
+
+        auto connection = pool->get(timeouts, &distributed_header.insert_settings);
         RemoteBlockOutputStream remote{*connection, timeouts,
-            header.insert_query, header.insert_settings, header.client_info};
+            distributed_header.insert_query,
+            distributed_header.insert_settings,
+            distributed_header.client_info};
         remote.writePrefix();
-        writeRemoteConvert(header, remote, in, log);
+        bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+        writeRemoteConvert(distributed_header, remote, compression_expected, in, log);
         remote.writeSuffix();
     }
-    catch (const Exception & e)
+    catch (Exception & e)
     {
+        e.addMessage(fmt::format("While sending {}", file_path));
         maybeMarkAsBroken(file_path, e);
         throw;
     }
 
     auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
     markAsSend(file_path);
-    LOG_TRACE(log, "Finished processing `{}`", file_path);
+    LOG_TRACE(log, "Finished processing `{}` (took {} ms)", file_path, watch.elapsedMilliseconds());
 }
 
 struct StorageDistributedDirectoryMonitor::BatchHeader
@@ -523,20 +579,21 @@ struct StorageDistributedDirectoryMonitor::BatchHeader
     Settings settings;
     String query;
     ClientInfo client_info;
-    String sample_block_structure;
+    Block header;
 
-    BatchHeader(Settings settings_, String query_, ClientInfo client_info_, String sample_block_structure_)
+    BatchHeader(Settings settings_, String query_, ClientInfo client_info_, Block header_)
         : settings(std::move(settings_))
         , query(std::move(query_))
         , client_info(std::move(client_info_))
-        , sample_block_structure(std::move(sample_block_structure_))
+        , header(std::move(header_))
     {
     }
 
     bool operator==(const BatchHeader & other) const
     {
-        return std::tie(settings, query, client_info.query_kind, sample_block_structure) ==
-               std::tie(other.settings, other.query, other.client_info.query_kind, other.sample_block_structure);
+        return std::tie(settings, query, client_info.query_kind) ==
+               std::tie(other.settings, other.query, other.client_info.query_kind) &&
+               blocksHaveEqualStructure(header, other.header);
     }
 
     struct Hash
@@ -545,7 +602,7 @@ struct StorageDistributedDirectoryMonitor::BatchHeader
         {
             SipHash hash_state;
             hash_state.update(batch_header.query.data(), batch_header.query.size());
-            hash_state.update(batch_header.sample_block_structure.data(), batch_header.sample_block_structure.size());
+            batch_header.header.updateHash(hash_state);
             return hash_state.get64();
         }
     };
@@ -587,6 +644,12 @@ struct StorageDistributedDirectoryMonitor::Batch
 
         CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
 
+        Stopwatch watch;
+
+        LOG_DEBUG(parent.log, "Sending a batch of {} files ({} rows, {} bytes).", file_indices.size(),
+            formatReadableQuantity(total_rows),
+            formatReadableSizeWithBinarySuffix(total_bytes));
+
         if (!recovered)
         {
             /// For deduplication in Replicated tables to work, in case of error
@@ -598,8 +661,7 @@ struct StorageDistributedDirectoryMonitor::Batch
             String tmp_file{parent.current_batch_file_path + ".tmp"};
 
             auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, parent.disk, parent.relative_path);
-
-            if (Poco::File{tmp_file}.exists())
+            if (fs::exists(tmp_file))
                 LOG_ERROR(parent.log, "Temporary file {} exists. Unclean shutdown?", backQuote(tmp_file));
 
             {
@@ -611,9 +673,9 @@ struct StorageDistributedDirectoryMonitor::Batch
                     out.sync();
             }
 
-            Poco::File{tmp_file}.renameTo(parent.current_batch_file_path);
+            fs::rename(tmp_file, parent.current_batch_file_path);
         }
-        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(parent.storage.global_context.getSettingsRef());
+        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(parent.storage.getContext()->getSettingsRef());
         auto connection = parent.pool->get(timeouts);
 
         bool batch_broken = false;
@@ -632,22 +694,24 @@ struct StorageDistributedDirectoryMonitor::Batch
                 }
 
                 ReadBufferFromFile in(file_path->second);
-                const auto & header = readDistributedHeader(in, parent.log);
+                const auto & distributed_header = readDistributedHeader(in, parent.log);
 
                 if (!remote)
                 {
                     remote = std::make_unique<RemoteBlockOutputStream>(*connection, timeouts,
-                        header.insert_query, header.insert_settings, header.client_info);
+                        distributed_header.insert_query,
+                        distributed_header.insert_settings,
+                        distributed_header.client_info);
                     remote->writePrefix();
                 }
-
-                writeRemoteConvert(header, *remote, in, parent.log);
+                bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
+                writeRemoteConvert(distributed_header, *remote, compression_expected, in, parent.log);
             }
 
             if (remote)
                 remote->writeSuffix();
         }
-        catch (const Exception & e)
+        catch (Exception & e)
         {
             if (isFileBrokenErrorCode(e.code(), e.isRemoteException()))
             {
@@ -655,12 +719,19 @@ struct StorageDistributedDirectoryMonitor::Batch
                 batch_broken = true;
             }
             else
+            {
+                std::vector<std::string> files(file_index_to_path.size());
+                for (const auto & [index, name] : file_index_to_path)
+                    files.push_back(name);
+                e.addMessage(fmt::format("While sending batch {}", fmt::join(files, "\n")));
+
                 throw;
+            }
         }
 
         if (!batch_broken)
         {
-            LOG_TRACE(parent.log, "Sent a batch of {} files.", file_indices.size());
+            LOG_TRACE(parent.log, "Sent a batch of {} files (took {} ms).", file_indices.size(), watch.elapsedMilliseconds());
 
             auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, parent.disk, parent.relative_path);
             for (UInt64 file_index : file_indices)
@@ -683,7 +754,7 @@ struct StorageDistributedDirectoryMonitor::Batch
         total_bytes = 0;
         recovered = false;
 
-        Poco::File{parent.current_batch_file_path}.setSize(0);
+        fs::resize_file(parent.current_batch_file_path, 0);
     }
 
     void writeText(WriteBuffer & out)
@@ -756,10 +827,10 @@ bool StorageDistributedDirectoryMonitor::addAndSchedule(size_t file_size, size_t
         return false;
 
     {
-        std::lock_guard metrics_lock(metrics_mutex);
+        std::lock_guard status_lock(status_mutex);
         metric_pending_files.add();
-        bytes_count += file_size;
-        ++files_count;
+        status.bytes_count += file_size;
+        ++status.files_count;
     }
 
     return task_handle->scheduleAfter(ms, false);
@@ -767,23 +838,16 @@ bool StorageDistributedDirectoryMonitor::addAndSchedule(size_t file_size, size_t
 
 StorageDistributedDirectoryMonitor::Status StorageDistributedDirectoryMonitor::getStatus()
 {
-    std::lock_guard metrics_lock(metrics_mutex);
-
-    return Status{
-        path,
-        last_exception,
-        error_count,
-        files_count,
-        bytes_count,
-        monitor_blocker.isCancelled(),
-    };
+    std::lock_guard status_lock(status_mutex);
+    Status current_status{status, path, monitor_blocker.isCancelled()};
+    return current_status;
 }
 
 void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map<UInt64, std::string> & files)
 {
     std::unordered_set<UInt64> file_indices_to_skip;
 
-    if (Poco::File{current_batch_file_path}.exists())
+    if (fs::exists(current_batch_file_path))
     {
         /// Possibly, we failed to send a batch on the previous iteration. Try to send exactly the same batch.
         Batch batch(*this, files);
@@ -808,22 +872,27 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
 
         size_t total_rows = 0;
         size_t total_bytes = 0;
-        std::string sample_block_structure;
-        DistributedHeader header;
+        Block header;
+        DistributedHeader distributed_header;
         try
         {
             /// Determine metadata of the current file and check if it is not broken.
             ReadBufferFromFile in{file_path};
-            header = readDistributedHeader(in, log);
+            distributed_header = readDistributedHeader(in, log);
 
-            if (header.rows)
+            if (distributed_header.rows)
             {
-                total_rows += header.rows;
-                total_bytes += header.bytes;
-                sample_block_structure = header.header;
+                total_rows += distributed_header.rows;
+                total_bytes += distributed_header.bytes;
             }
-            else
+
+            if (distributed_header.block_header)
+                header = distributed_header.block_header;
+
+            if (!total_rows || !header)
             {
+                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();
@@ -833,8 +902,8 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
                     total_rows += block.rows();
                     total_bytes += block.bytes();
 
-                    if (sample_block_structure.empty())
-                        sample_block_structure = block.cloneEmpty().dumpStructure();
+                    if (!header)
+                        header = block.cloneEmpty();
                 }
                 block_in.readSuffix();
             }
@@ -850,7 +919,12 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
                 throw;
         }
 
-        BatchHeader batch_header(std::move(header.insert_settings), std::move(header.insert_query), std::move(header.client_info), std::move(sample_block_structure));
+        BatchHeader batch_header(
+            std::move(distributed_header.insert_settings),
+            std::move(distributed_header.insert_query),
+            std::move(distributed_header.client_info),
+            std::move(header)
+        );
         Batch & batch = header_to_batch.try_emplace(batch_header, *this, files).first->second;
 
         batch.file_indices.push_back(file_idx);
@@ -874,8 +948,8 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
 
         /// current_batch.txt will not exist if there was no send
         /// (this is the case when all batches that was pending has been marked as pending)
-        if (Poco::File{current_batch_file_path}.exists())
-            Poco::File{current_batch_file_path}.remove();
+        if (fs::exists(current_batch_file_path))
+            fs::remove(current_batch_file_path);
     }
 }
 
@@ -884,42 +958,44 @@ void StorageDistributedDirectoryMonitor::markAsBroken(const std::string & file_p
     const auto last_path_separator_pos = file_path.rfind('/');
     const auto & base_path = file_path.substr(0, last_path_separator_pos + 1);
     const auto & file_name = file_path.substr(last_path_separator_pos + 1);
-    const auto & broken_path = base_path + "broken/";
-    const auto & broken_file_path = broken_path + file_name;
+    const String & broken_path = fs::path(base_path) / "broken/";
+    const String & broken_file_path = fs::path(broken_path) / file_name;
 
-    Poco::File{broken_path}.createDirectory();
+    fs::create_directory(broken_path);
 
     auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
-    auto broken_dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path + "/broken/");
-
-    Poco::File file(file_path);
+    auto broken_dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, fs::path(relative_path) / "broken/");
 
     {
-        std::lock_guard metrics_lock(metrics_mutex);
+        std::lock_guard status_lock(status_mutex);
 
-        size_t file_size = file.getSize();
-        --files_count;
-        bytes_count -= file_size;
+        size_t file_size = fs::file_size(file_path);
+
+        --status.files_count;
+        status.bytes_count -= file_size;
+
+        ++status.broken_files_count;
+        status.broken_bytes_count += file_size;
+
+        metric_broken_files.add();
     }
 
-    file.renameTo(broken_file_path);
-
+    fs::rename(file_path, broken_file_path);
     LOG_ERROR(log, "Renamed `{}` to `{}`", file_path, broken_file_path);
 }
+
 void StorageDistributedDirectoryMonitor::markAsSend(const std::string & file_path)
 {
-    Poco::File file(file_path);
-
-    size_t file_size = file.getSize();
+    size_t file_size = fs::file_size(file_path);
 
     {
-        std::lock_guard metrics_lock(metrics_mutex);
+        std::lock_guard status_lock(status_mutex);
         metric_pending_files.sub();
-        --files_count;
-        bytes_count -= file_size;
+        --status.files_count;
+        status.bytes_count -= file_size;
     }
 
-    file.remove();
+    fs::remove(file_path);
 }
 
 bool StorageDistributedDirectoryMonitor::maybeMarkAsBroken(const std::string & file_path, const Exception & e)
@@ -945,9 +1021,9 @@ void StorageDistributedDirectoryMonitor::updatePath(const std::string & new_rela
     std::lock_guard lock{mutex};
 
     {
-        std::lock_guard metrics_lock(metrics_mutex);
+        std::lock_guard status_lock(status_mutex);
         relative_path = new_relative_path;
-        path = disk->getPath() + relative_path + '/';
+        path = fs::path(disk->getPath()) / relative_path / "";
     }
     current_batch_file_path = path + "current_batch.txt";
 
diff --git a/src/Storages/Distributed/DirectoryMonitor.h b/src/Storages/Distributed/DirectoryMonitor.h
index 1ccac4522d7..ab9b8592294 100644
--- a/src/Storages/Distributed/DirectoryMonitor.h
+++ b/src/Storages/Distributed/DirectoryMonitor.h
@@ -50,15 +50,23 @@ public:
     /// For scheduling via DistributedBlockOutputStream
     bool addAndSchedule(size_t file_size, size_t ms);
 
+    struct InternalStatus
+    {
+        std::exception_ptr last_exception;
+
+        size_t error_count = 0;
+
+        size_t files_count = 0;
+        size_t bytes_count = 0;
+
+        size_t broken_files_count = 0;
+        size_t broken_bytes_count = 0;
+    };
     /// system.distribution_queue interface
-    struct Status
+    struct Status : InternalStatus
     {
         std::string path;
-        std::exception_ptr last_exception;
-        size_t error_count;
-        size_t files_count;
-        size_t bytes_count;
-        bool is_blocked;
+        bool is_blocked = false;
     };
     Status getStatus();
 
@@ -92,11 +100,8 @@ private:
     struct BatchHeader;
     struct Batch;
 
-    std::mutex metrics_mutex;
-    size_t error_count = 0;
-    size_t files_count = 0;
-    size_t bytes_count = 0;
-    std::exception_ptr last_exception;
+    std::mutex status_mutex;
+    InternalStatus status;
 
     const std::chrono::milliseconds default_sleep_time;
     std::chrono::milliseconds sleep_time;
@@ -110,6 +115,7 @@ private:
     BackgroundSchedulePoolTaskHolder task_handle;
 
     CurrentMetrics::Increment metric_pending_files;
+    CurrentMetrics::Increment metric_broken_files;
 
     friend class DirectoryMonitorBlockInputStream;
 };
diff --git a/src/Storages/Distributed/DistributedBlockOutputStream.cpp b/src/Storages/Distributed/DistributedBlockOutputStream.cpp
index f8ba4221842..ea694fb0cfe 100644
--- a/src/Storages/Distributed/DistributedBlockOutputStream.cpp
+++ b/src/Storages/Distributed/DistributedBlockOutputStream.cpp
@@ -33,11 +33,10 @@
 #include <ext/range.h>
 #include <ext/scope_guard.h>
 
-#include <Poco/DirectoryIterator.h>
-
 #include <future>
 #include <condition_variable>
 #include <mutex>
+#include <filesystem>
 
 
 namespace CurrentMetrics
@@ -50,14 +49,16 @@ namespace ProfileEvents
     extern const Event DistributedSyncInsertionTimeoutExceeded;
 }
 
+namespace fs = std::filesystem;
+
 namespace DB
 {
 
-
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int TIMEOUT_EXCEEDED;
+    extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
 }
 
 static Block adoptBlock(const Block & header, const Block & block, Poco::Logger * log)
@@ -86,14 +87,15 @@ static void writeBlockConvert(const BlockOutputStreamPtr & out, const Block & bl
 
 
 DistributedBlockOutputStream::DistributedBlockOutputStream(
-    const Context & context_,
+    ContextPtr context_,
     StorageDistributed & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const ASTPtr & query_ast_,
     const ClusterPtr & cluster_,
     bool insert_sync_,
-    UInt64 insert_timeout_)
-    : context(context_)
+    UInt64 insert_timeout_,
+    StorageID main_table_)
+    : context(Context::createCopy(context_))
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , query_ast(query_ast_)
@@ -101,8 +103,13 @@ DistributedBlockOutputStream::DistributedBlockOutputStream(
     , cluster(cluster_)
     , insert_sync(insert_sync_)
     , insert_timeout(insert_timeout_)
+    , main_table(main_table_)
     , log(&Poco::Logger::get("DistributedBlockOutputStream"))
 {
+    const auto & settings = context->getSettingsRef();
+    if (settings.max_distributed_depth && context->getClientInfo().distributed_depth > settings.max_distributed_depth)
+        throw Exception("Maximum distributed depth exceeded", ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH);
+    context->getClientInfo().distributed_depth += 1;
 }
 
 
@@ -143,7 +150,7 @@ void DistributedBlockOutputStream::write(const Block & block)
 
 void DistributedBlockOutputStream::writeAsync(const Block & block)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     bool random_shard_insert = settings.insert_distributed_one_random_shard && !storage.has_sharding_key;
 
     if (random_shard_insert)
@@ -194,7 +201,7 @@ std::string DistributedBlockOutputStream::getCurrentStateDescription()
 
 void DistributedBlockOutputStream::initWritingJobs(const Block & first_block, size_t start, size_t end)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     const auto & addresses_with_failovers = cluster->getShardsAddresses();
     const auto & shards_info = cluster->getShardsInfo();
     size_t num_shards = end - start;
@@ -303,7 +310,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
         }
 
         const Block & shard_block = (num_shards > 1) ? job.current_shard_block : current_block;
-        const Settings & settings = context.getSettingsRef();
+        const Settings & settings = context->getSettingsRef();
 
         /// Do not initiate INSERT for empty block.
         if (shard_block.rows() == 0)
@@ -321,11 +328,11 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
                         throw Exception("There are several writing job for an automatically replicated shard", ErrorCodes::LOGICAL_ERROR);
 
                     /// TODO: it make sense to rewrite skip_unavailable_shards and max_parallel_replicas here
-                    auto connections = shard_info.pool->getMany(timeouts, &settings, PoolMode::GET_ONE);
-                    if (connections.empty() || connections.front().isNull())
+                    auto results = shard_info.pool->getManyChecked(timeouts, &settings, PoolMode::GET_ONE, main_table.getQualifiedName());
+                    if (results.empty() || results.front().entry.isNull())
                         throw Exception("Expected exactly one connection for shard " + toString(job.shard_index), ErrorCodes::LOGICAL_ERROR);
 
-                    job.connection_entry = std::move(connections.front());
+                    job.connection_entry = std::move(results.front().entry);
                 }
                 else
                 {
@@ -343,7 +350,8 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
                 if (throttler)
                     job.connection_entry->setThrottler(throttler);
 
-                job.stream = std::make_shared<RemoteBlockOutputStream>(*job.connection_entry, timeouts, query_string, settings, context.getClientInfo());
+                job.stream = std::make_shared<RemoteBlockOutputStream>(
+                    *job.connection_entry, timeouts, query_string, settings, context->getClientInfo());
                 job.stream->writePrefix();
             }
 
@@ -357,7 +365,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
             if (!job.stream)
             {
                 /// Forward user settings
-                job.local_context = std::make_unique<Context>(context);
+                job.local_context = Context::createCopy(context);
 
                 /// Copying of the query AST is required to avoid race,
                 /// in case of INSERT into multiple local shards.
@@ -367,7 +375,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
                 /// to resolve tables (in InterpreterInsertQuery::getTable())
                 auto copy_query_ast = query_ast->clone();
 
-                InterpreterInsertQuery interp(copy_query_ast, *job.local_context);
+                InterpreterInsertQuery interp(copy_query_ast, job.local_context);
                 auto block_io = interp.execute();
 
                 job.stream = block_io.out;
@@ -385,7 +393,7 @@ DistributedBlockOutputStream::runWritingJob(DistributedBlockOutputStream::JobRep
 
 void DistributedBlockOutputStream::writeSync(const Block & block)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     const auto & shards_info = cluster->getShardsInfo();
     bool random_shard_insert = settings.insert_distributed_one_random_shard && !storage.has_sharding_key;
     size_t start = 0;
@@ -471,7 +479,9 @@ void DistributedBlockOutputStream::writeSuffix()
         LOG_DEBUG(log, "It took {} sec. to insert {} blocks, {} rows per second. {}", elapsed, inserted_blocks, inserted_rows / elapsed, getCurrentStateDescription());
     };
 
-    if (insert_sync && pool)
+    /// Pool finished means that some exception had been thrown before,
+    /// and scheduling new jobs will return "Cannot schedule a task" error.
+    if (insert_sync && pool && !pool->finished())
     {
         finished_jobs_count = 0;
         try
@@ -562,7 +572,7 @@ void DistributedBlockOutputStream::writeSplitAsync(const Block & block)
 void DistributedBlockOutputStream::writeAsyncImpl(const Block & block, size_t shard_id)
 {
     const auto & shard_info = cluster->getShardsInfo()[shard_id];
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
 
     if (shard_info.hasInternalReplication())
     {
@@ -610,7 +620,7 @@ void DistributedBlockOutputStream::writeToLocal(const Block & block, size_t repe
 
 void DistributedBlockOutputStream::writeToShard(const Block & block, const std::vector<std::string> & dir_names)
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = context->getSettingsRef();
     const auto & distributed_settings = storage.getDistributedSettingsRef();
 
     bool fsync = distributed_settings.fsync_after_insert;
@@ -650,10 +660,10 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
     /// hardlinking to ensure the inode is not freed until we're done
     {
         const std::string path(disk_path + data_path + *it);
-        Poco::File(path).createDirectory();
-
         const std::string tmp_path(path + "/tmp/");
-        Poco::File(tmp_path).createDirectory();
+
+        fs::create_directory(path);
+        fs::create_directory(tmp_path);
 
         const std::string file_name(toString(storage.file_names_increment.get()) + ".bin");
 
@@ -675,11 +685,17 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
             WriteBufferFromOwnString header_buf;
             writeVarUInt(DBMS_TCP_PROTOCOL_VERSION, header_buf);
             writeStringBinary(query_string, header_buf);
-            context.getSettingsRef().write(header_buf);
-            context.getClientInfo().write(header_buf, DBMS_TCP_PROTOCOL_VERSION);
+            context->getSettingsRef().write(header_buf);
+            context->getClientInfo().write(header_buf, DBMS_TCP_PROTOCOL_VERSION);
             writeVarUInt(block.rows(), header_buf);
             writeVarUInt(block.bytes(), header_buf);
-            writeStringBinary(block.cloneEmpty().dumpStructure(), header_buf);
+            writeStringBinary(block.cloneEmpty().dumpStructure(), header_buf); /// obsolete
+            /// 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()};
+                header_stream.write(block.cloneEmpty());
+            }
 
             /// Add new fields here, for example:
             /// writeVarUInt(my_new_data, header_buf);
@@ -701,7 +717,7 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
         }
 
         // Create hardlink here to reuse increment number
-        const std::string block_file_path(path + '/' + file_name);
+        const std::string block_file_path(fs::path(path) / file_name);
         createHardLink(first_file_tmp_path, block_file_path);
         auto dir_sync_guard = make_directory_sync_guard(*it);
     }
@@ -710,21 +726,21 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
     /// Make hardlinks
     for (; it != dir_names.end(); ++it)
     {
-        const std::string path(disk_path + data_path + *it);
-        Poco::File(path).createDirectory();
+        const std::string path(fs::path(disk_path) / (data_path + *it));
+        fs::create_directory(path);
 
-        const std::string block_file_path(path + '/' + toString(storage.file_names_increment.get()) + ".bin");
+        const std::string block_file_path(fs::path(path) / (toString(storage.file_names_increment.get()) + ".bin"));
         createHardLink(first_file_tmp_path, block_file_path);
         auto dir_sync_guard = make_directory_sync_guard(*it);
     }
 
-    auto file_size = Poco::File(first_file_tmp_path).getSize();
+    auto file_size = fs::file_size(first_file_tmp_path);
     /// remove the temporary file, enabling the OS to reclaim inode after all threads
     /// have removed their corresponding files
-    Poco::File(first_file_tmp_path).remove();
+    fs::remove(first_file_tmp_path);
 
     /// Notify
-    auto sleep_ms = context.getSettingsRef().distributed_directory_monitor_sleep_time_ms;
+    auto sleep_ms = context->getSettingsRef().distributed_directory_monitor_sleep_time_ms;
     for (const auto & dir_name : dir_names)
     {
         auto & directory_monitor = storage.requireDirectoryMonitor(disk, dir_name);
@@ -732,5 +748,4 @@ void DistributedBlockOutputStream::writeToShard(const Block & block, const std::
     }
 }
 
-
 }
diff --git a/src/Storages/Distributed/DistributedBlockOutputStream.h b/src/Storages/Distributed/DistributedBlockOutputStream.h
index ca57ad46fbb..a17e7d6565b 100644
--- a/src/Storages/Distributed/DistributedBlockOutputStream.h
+++ b/src/Storages/Distributed/DistributedBlockOutputStream.h
@@ -38,13 +38,14 @@ class DistributedBlockOutputStream : public IBlockOutputStream
 {
 public:
     DistributedBlockOutputStream(
-        const Context & context_,
+        ContextPtr context_,
         StorageDistributed & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         const ASTPtr & query_ast_,
         const ClusterPtr & cluster_,
         bool insert_sync_,
-        UInt64 insert_timeout_);
+        UInt64 insert_timeout_,
+        StorageID main_table_);
 
     Block getHeader() const override;
     void write(const Block & block) override;
@@ -83,8 +84,7 @@ private:
     /// Returns the number of blocks was written for each cluster node. Uses during exception handling.
     std::string getCurrentStateDescription();
 
-private:
-    const Context & context;
+    ContextMutablePtr context;
     StorageDistributed & storage;
     StorageMetadataPtr metadata_snapshot;
     ASTPtr query_ast;
@@ -97,6 +97,7 @@ private:
 
     /// Sync-related stuff
     UInt64 insert_timeout; // in seconds
+    StorageID main_table;
     Stopwatch watch;
     Stopwatch watch_current_block;
     std::optional<ThreadPool> pool;
@@ -115,7 +116,7 @@ private:
         Block current_shard_block;
 
         ConnectionPool::Entry connection_entry;
-        std::unique_ptr<Context> local_context;
+        ContextPtr local_context;
         BlockOutputStreamPtr stream;
 
         UInt64 blocks_written = 0;
diff --git a/src/Storages/HDFS/HDFSCommon.cpp b/src/Storages/HDFS/HDFSCommon.cpp
index e5ec8a06139..d7e57a0f9eb 100644
--- a/src/Storages/HDFS/HDFSCommon.cpp
+++ b/src/Storages/HDFS/HDFSCommon.cpp
@@ -9,14 +9,15 @@
 #include <IO/Operators.h>
 #include <common/logger_useful.h>
 
+
 namespace DB
 {
 namespace ErrorCodes
 {
-extern const int BAD_ARGUMENTS;
-extern const int NETWORK_ERROR;
-extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
-extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int BAD_ARGUMENTS;
+    extern const int NETWORK_ERROR;
+    extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
+    extern const int NO_ELEMENTS_IN_CONFIG;
 }
 
 const String HDFSBuilderWrapper::CONFIG_PREFIX = "hdfs";
@@ -144,6 +145,7 @@ HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::A
 
         hdfsBuilderSetUserName(builder.get(), user.c_str());
     }
+
     hdfsBuilderSetNameNode(builder.get(), host.c_str());
     if (port != 0)
     {
diff --git a/src/Storages/HDFS/HDFSCommon.h b/src/Storages/HDFS/HDFSCommon.h
index fa1ca88464e..5c70a8997c3 100644
--- a/src/Storages/HDFS/HDFSCommon.h
+++ b/src/Storages/HDFS/HDFSCommon.h
@@ -1,13 +1,15 @@
 #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>
+#include <hdfs/hdfs.h> // Y_IGNORE
 #include <common/types.h>
 #include <mutex>
 
@@ -17,6 +19,7 @@
 
 namespace DB
 {
+
 namespace detail
 {
     struct HDFSFsDeleter
@@ -28,16 +31,14 @@ namespace detail
     };
 }
 
+
 struct HDFSFileInfo
 {
     hdfsFileInfo * file_info;
     int length;
 
-    HDFSFileInfo()
-        : file_info(nullptr)
-        , length(0)
-    {
-    }
+    HDFSFileInfo() : file_info(nullptr) , length(0) {}
+
     HDFSFileInfo(const HDFSFileInfo & other) = delete;
     HDFSFileInfo(HDFSFileInfo && other) = default;
     HDFSFileInfo & operator=(const HDFSFileInfo & other) = delete;
@@ -49,17 +50,30 @@ struct HDFSFileInfo
     }
 };
 
+
 class HDFSBuilderWrapper
 {
-    hdfsBuilder * hdfs_builder;
-    String hadoop_kerberos_keytab;
-    String hadoop_kerberos_principal;
-    String hadoop_kerberos_kinit_command = "kinit";
-    String hadoop_security_kerberos_ticket_cache_path;
 
-    static std::mutex kinit_mtx;
+friend HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::AbstractConfiguration &);
 
-    std::vector<std::pair<String, String>> config_stor;
+static const String CONFIG_PREFIX;
+
+public:
+    HDFSBuilderWrapper() : hdfs_builder(hdfsNewBuilder()) {}
+
+    ~HDFSBuilderWrapper() { hdfsFreeBuilder(hdfs_builder); }
+
+    HDFSBuilderWrapper(const HDFSBuilderWrapper &) = delete;
+    HDFSBuilderWrapper(HDFSBuilderWrapper &&) = default;
+
+    hdfsBuilder * get() { return hdfs_builder; }
+
+private:
+    void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const String & config_path, bool isUser = false);
+
+    String getKinitCmd();
+
+    void runKinit();
 
     // hdfs builder relies on an external config data storage
     std::pair<String, String>& keep(const String & k, const String & v)
@@ -67,48 +81,24 @@ class HDFSBuilderWrapper
         return config_stor.emplace_back(std::make_pair(k, v));
     }
 
+    hdfsBuilder * hdfs_builder;
+    String hadoop_kerberos_keytab;
+    String hadoop_kerberos_principal;
+    String hadoop_kerberos_kinit_command = "kinit";
+    String hadoop_security_kerberos_ticket_cache_path;
+
+    static std::mutex kinit_mtx;
+    std::vector<std::pair<String, String>> config_stor;
     bool need_kinit{false};
-
-    static const String CONFIG_PREFIX;
-
-private:
-
-    void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const String & config_path, bool isUser = false);
-
-    String getKinitCmd();
-
-    void runKinit();
-
-public:
-
-    hdfsBuilder *
-    get()
-    {
-        return hdfs_builder;
-    }
-
-    HDFSBuilderWrapper()
-        : hdfs_builder(hdfsNewBuilder())
-    {
-    }
-
-    ~HDFSBuilderWrapper()
-    {
-        hdfsFreeBuilder(hdfs_builder);
-
-    }
-
-    HDFSBuilderWrapper(const HDFSBuilderWrapper &) = delete;
-    HDFSBuilderWrapper(HDFSBuilderWrapper &&) = default;
-
-    friend HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::AbstractConfiguration &);
 };
 
 using HDFSFSPtr = std::unique_ptr<std::remove_pointer_t<hdfsFS>, detail::HDFSFsDeleter>;
 
+
 // set read/connect timeout, default value in libhdfs3 is about 1 hour, and too large
 /// TODO Allow to tune from query Settings.
 HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::AbstractConfiguration &);
 HDFSFSPtr createHDFSFS(hdfsBuilder * builder);
+
 }
 #endif
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.cpp b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
index affb76314b1..f81d7736db3 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
@@ -8,10 +8,13 @@
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int NETWORK_ERROR;
     extern const int CANNOT_OPEN_FILE;
+    extern const int CANNOT_SEEK_THROUGH_FILE;
+    extern const int SEEK_POSITION_OUT_OF_BOUND;
 }
 
 ReadBufferFromHDFS::~ReadBufferFromHDFS() = default;
@@ -21,35 +24,33 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl
     /// HDFS create/open functions are not thread safe
     static std::mutex hdfs_init_mutex;
 
-    std::string hdfs_uri;
+    String hdfs_uri;
+    String hdfs_file_path;
+
     hdfsFile fin;
     HDFSBuilderWrapper builder;
     HDFSFSPtr fs;
 
-    ReadBufferFromHDFSImpl(const std::string & hdfs_name_,
+    off_t offset = 0;
+    bool initialized = false;
+
+    explicit ReadBufferFromHDFSImpl(
+        const std::string & hdfs_uri_,
+        const std::string & hdfs_file_path_,
         const Poco::Util::AbstractConfiguration & config_)
-        : hdfs_uri(hdfs_name_),
-          builder(createHDFSBuilder(hdfs_uri, config_))
+        : hdfs_uri(hdfs_uri_)
+        , hdfs_file_path(hdfs_file_path_)
+        , builder(createHDFSBuilder(hdfs_uri_, config_))
     {
         std::lock_guard lock(hdfs_init_mutex);
 
         fs = createHDFSFS(builder.get());
-        const size_t begin_of_path = hdfs_uri.find('/', hdfs_uri.find("//") + 2);
-        const std::string path = hdfs_uri.substr(begin_of_path);
-        fin = hdfsOpenFile(fs.get(), path.c_str(), O_RDONLY, 0, 0, 0);
+        fin = hdfsOpenFile(fs.get(), hdfs_file_path.c_str(), O_RDONLY, 0, 0, 0);
 
         if (fin == nullptr)
-            throw Exception("Unable to open HDFS file: " + path + " error: " + std::string(hdfsGetLastError()),
-                ErrorCodes::CANNOT_OPEN_FILE);
-    }
-
-    int read(char * start, size_t size) const
-    {
-        int bytes_read = hdfsRead(fs.get(), fin, start, size);
-        if (bytes_read < 0)
-            throw Exception("Fail to read HDFS file: " + hdfs_uri + " " + std::string(hdfsGetLastError()),
-                ErrorCodes::NETWORK_ERROR);
-        return bytes_read;
+            throw Exception(ErrorCodes::CANNOT_OPEN_FILE,
+                "Unable to open HDFS file: {}. Error: {}",
+                hdfs_uri + hdfs_file_path, std::string(hdfsGetLastError()));
     }
 
     ~ReadBufferFromHDFSImpl()
@@ -57,16 +58,65 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl
         std::lock_guard lock(hdfs_init_mutex);
         hdfsCloseFile(fs.get(), fin);
     }
+
+    void initialize() const
+    {
+        if (!offset)
+            return;
+
+        int seek_status = hdfsSeek(fs.get(), fin, offset);
+        if (seek_status != 0)
+            throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Fail to seek HDFS file: {}, error: {}", hdfs_uri, std::string(hdfsGetLastError()));
+    }
+
+    int read(char * start, size_t size)
+    {
+        if (!initialized)
+        {
+            initialize();
+            initialized = true;
+        }
+
+        int bytes_read = hdfsRead(fs.get(), fin, start, size);
+        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()));
+        return bytes_read;
+    }
+
+    int seek(off_t offset_, int whence)
+    {
+        if (initialized)
+            throw Exception("Seek is allowed only before first read attempt from the buffer.", ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
+
+        if (whence != SEEK_SET)
+            throw Exception("Only SEEK_SET mode is allowed.", ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
+
+        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;
+    }
+
+    int tell() const
+    {
+        return offset;
+    }
 };
 
 
 std::mutex ReadBufferFromHDFS::ReadBufferFromHDFSImpl::hdfs_init_mutex;
 
-ReadBufferFromHDFS::ReadBufferFromHDFS(const std::string & hdfs_name_,
-    const Poco::Util::AbstractConfiguration & config_,
-    size_t buf_size_)
-    : BufferWithOwnMemory<ReadBuffer>(buf_size_)
-    , impl(std::make_unique<ReadBufferFromHDFSImpl>(hdfs_name_, config_))
+ReadBufferFromHDFS::ReadBufferFromHDFS(
+        const String & hdfs_uri_,
+        const String & hdfs_file_path_,
+        const Poco::Util::AbstractConfiguration & config_,
+        size_t buf_size_)
+    : BufferWithOwnMemory<SeekableReadBuffer>(buf_size_)
+    , impl(std::make_unique<ReadBufferFromHDFSImpl>(hdfs_uri_, hdfs_file_path_, config_))
 {
 }
 
@@ -82,6 +132,18 @@ bool ReadBufferFromHDFS::nextImpl()
     return true;
 }
 
+
+off_t ReadBufferFromHDFS::seek(off_t off, int whence)
+{
+    return impl->seek(off, whence);
+}
+
+
+off_t ReadBufferFromHDFS::getPosition()
+{
+    return impl->tell() + count();
+}
+
 }
 
 #endif
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.h b/src/Storages/HDFS/ReadBufferFromHDFS.h
index 8d26c001b2e..498056ea376 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.h
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.h
@@ -7,28 +7,37 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <string>
 #include <memory>
-
-#include <hdfs/hdfs.h>
-
+#include <hdfs/hdfs.h> // Y_IGNORE
 #include <common/types.h>
-
 #include <Interpreters/Context.h>
+#include <IO/SeekableReadBuffer.h>
 
 
 namespace DB
 {
+
 /** Accepts HDFS path to file and opens it.
  * Closes file by himself (thus "owns" a file descriptor).
  */
-class ReadBufferFromHDFS : public BufferWithOwnMemory<ReadBuffer>
+class ReadBufferFromHDFS : public BufferWithOwnMemory<SeekableReadBuffer>
 {
-    struct ReadBufferFromHDFSImpl;
-    std::unique_ptr<ReadBufferFromHDFSImpl> impl;
+struct ReadBufferFromHDFSImpl;
+
 public:
-    ReadBufferFromHDFS(const std::string & hdfs_name_, const Poco::Util::AbstractConfiguration &, size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
+    ReadBufferFromHDFS(const String & hdfs_uri_, const String & hdfs_file_path_,
+        const Poco::Util::AbstractConfiguration & config_, size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
+
     ~ReadBufferFromHDFS() override;
 
     bool nextImpl() override;
+
+    off_t seek(off_t offset_, int whence) override;
+
+    off_t getPosition() override;
+
+private:
+    std::unique_ptr<ReadBufferFromHDFSImpl> impl;
 };
 }
+
 #endif
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index e26d3375c33..e3fd287bad8 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -18,7 +18,6 @@
 #include <DataStreams/IBlockOutputStream.h>
 #include <DataStreams/OwningBlockInputStream.h>
 #include <DataStreams/IBlockInputStream.h>
-
 #include <Common/parseGlobs.h>
 #include <Poco/URI.h>
 #include <re2/re2.h>
@@ -26,7 +25,9 @@
 #include <hdfs/hdfs.h>
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/Pipe.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -35,37 +36,35 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-StorageHDFS::StorageHDFS(const String & uri_,
+StorageHDFS::StorageHDFS(
+    const String & uri_,
     const StorageID & table_id_,
     const String & format_name_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    Context & context_,
+    const String & comment,
+    ContextPtr context_,
     const String & compression_method_ = "")
-    : IStorage(table_id_)
-    , uri(uri_)
-    , format_name(format_name_)
-    , context(context_)
-    , compression_method(compression_method_)
+    : IStorage(table_id_), WithContext(context_), uri(uri_), format_name(format_name_), compression_method(compression_method_)
 {
-    context.getRemoteHostFilter().checkURL(Poco::URI(uri));
+    context_->getRemoteHostFilter().checkURL(Poco::URI(uri));
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
 namespace
 {
 
-class HDFSSource : public SourceWithProgress
+class HDFSSource : public SourceWithProgress, WithContext
 {
 public:
     struct SourcesInfo
     {
         std::vector<String> uris;
-
         std::atomic<size_t> next_uri_to_read = 0;
 
         bool need_path_column = false;
@@ -90,16 +89,16 @@ public:
         String format_,
         String compression_method_,
         Block sample_block_,
-        const Context & context_,
+        ContextPtr context_,
         UInt64 max_block_size_)
         : SourceWithProgress(getHeader(sample_block_, source_info_->need_path_column, source_info_->need_file_column))
+        , WithContext(context_)
         , source_info(std::move(source_info_))
         , uri(std::move(uri_))
         , format(std::move(format_))
         , compression_method(compression_method_)
         , max_block_size(max_block_size_)
         , sample_block(std::move(sample_block_))
-        , context(context_)
     {
     }
 
@@ -122,11 +121,10 @@ public:
                 current_path = uri + path;
 
                 auto compression = chooseCompressionMethod(path, compression_method);
-                auto read_buf = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromHDFS>(current_path, context.getGlobalContext().getConfigRef()), compression);
-                auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size);
-                auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
+                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);
 
-                reader = std::make_shared<OwningBlockInputStream<ReadBuffer>>(input_stream, std::move(read_buf));
+                reader = std::make_shared<InputStreamFromInputFormat>(input_format);
                 reader->readPrefix();
             }
 
@@ -156,10 +154,12 @@ public:
 
             reader->readSuffix();
             reader.reset();
+            read_buf.reset();
         }
     }
 
 private:
+    std::unique_ptr<ReadBuffer> read_buf;
     BlockInputStreamPtr reader;
     SourcesInfoPtr source_info;
     String uri;
@@ -169,7 +169,6 @@ private:
 
     UInt64 max_block_size;
     Block sample_block;
-    const Context & context;
 };
 
 class HDFSBlockOutputStream : public IBlockOutputStream
@@ -178,11 +177,11 @@ public:
     HDFSBlockOutputStream(const String & uri,
         const String & format,
         const Block & sample_block_,
-        const Context & context,
+        ContextPtr context,
         const CompressionMethod compression_method)
         : sample_block(sample_block_)
     {
-        write_buf = wrapWriteBufferWithCompressionMethod(std::make_unique<WriteBufferFromHDFS>(uri, context.getGlobalContext().getConfigRef()), compression_method, 3);
+        write_buf = wrapWriteBufferWithCompressionMethod(std::make_unique<WriteBufferFromHDFS>(uri, context->getGlobalContext()->getConfigRef()), compression_method, 3);
         writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, *write_buf, sample_block, context);
     }
 
@@ -203,9 +202,18 @@ public:
 
     void writeSuffix() override
     {
-        writer->writeSuffix();
-        writer->flush();
-        write_buf->sync();
+        try
+        {
+            writer->writeSuffix();
+            writer->flush();
+            write_buf->sync();
+            write_buf->finalize();
+        }
+        catch (...)
+        {
+            writer.reset();
+            throw;
+        }
     }
 
 private:
@@ -250,7 +258,7 @@ Strings LSWithRegexpMatching(const String & path_for_ls, const HDFSFSPtr & fs, c
         {
             if (re2::RE2::FullMatch(file_name, matcher))
             {
-                Strings result_part = LSWithRegexpMatching(full_path + "/", fs, suffix_with_globs.substr(next_slash));
+                Strings result_part = LSWithRegexpMatching(fs::path(full_path) / "", fs, suffix_with_globs.substr(next_slash));
                 /// Recursion depth is limited by pattern. '*' works only for depth = 1, for depth = 2 pattern path is '*/*'. So we do not need additional check.
                 std::move(result_part.begin(), result_part.end(), std::back_inserter(result));
             }
@@ -267,21 +275,32 @@ Pipe StorageHDFS::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context_,
+    ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
 {
-    const size_t begin_of_path = uri.find('/', uri.find("//") + 2);
+    size_t begin_of_path;
+    /// This uri is checked for correctness in constructor of StorageHDFS and never modified afterwards
+    auto two_slash = uri.find("//");
+
+    if (two_slash == std::string::npos)
+        begin_of_path = uri.find('/');
+    else
+        begin_of_path = uri.find('/', two_slash + 2);
+
     const String path_from_uri = uri.substr(begin_of_path);
     const String uri_without_path = uri.substr(0, begin_of_path);
 
-    HDFSBuilderWrapper builder = createHDFSBuilder(uri_without_path + "/", context_.getGlobalContext().getConfigRef());
+    HDFSBuilderWrapper builder = createHDFSBuilder(uri_without_path + "/", context_->getGlobalContext()->getConfigRef());
     HDFSFSPtr fs = createHDFSFS(builder.get());
 
     auto sources_info = std::make_shared<HDFSSource::SourcesInfo>();
     sources_info->uris = LSWithRegexpMatching("/", fs, path_from_uri);
 
+    if (sources_info->uris.empty())
+        LOG_WARNING(log, "No file in HDFS matches the path: {}", uri);
+
     for (const auto & column : column_names)
     {
         if (column == "_path")
@@ -302,12 +321,12 @@ Pipe StorageHDFS::read(
     return Pipe::unitePipes(std::move(pipes));
 }
 
-BlockOutputStreamPtr StorageHDFS::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageHDFS::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<HDFSBlockOutputStream>(uri,
         format_name,
         metadata_snapshot->getSampleBlock(),
-        context,
+        getContext(),
         chooseCompressionMethod(uri, compression_method));
 }
 
@@ -321,22 +340,23 @@ void registerStorageHDFS(StorageFactory & factory)
             throw Exception(
                 "Storage HDFS 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.local_context);
+        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.getLocalContext());
 
         String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
 
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
 
         String format_name = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
 
         String compression_method;
         if (engine_args.size() == 3)
         {
-            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context);
+            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
             compression_method = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         } else compression_method = "auto";
 
-        return StorageHDFS::create(url, args.table_id, format_name, args.columns, args.constraints, args.context, compression_method);
+        return StorageHDFS::create(
+            url, args.table_id, format_name, args.columns, args.constraints, args.comment, args.getContext(), compression_method);
     },
     {
         .source_access_type = AccessType::HDFS,
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index 4172bce1cd1..5e446c76f03 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -13,7 +13,7 @@ namespace DB
  * This class represents table engine for external hdfs files.
  * Read method is supported for now.
  */
-class StorageHDFS final : public ext::shared_ptr_helper<StorageHDFS>, public IStorage
+class StorageHDFS final : public ext::shared_ptr_helper<StorageHDFS>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageHDFS>;
 public:
@@ -23,28 +23,29 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     NamesAndTypesList getVirtuals() const override;
 
 protected:
-    StorageHDFS(const String & uri_,
+    StorageHDFS(
+        const String & uri_,
         const StorageID & table_id_,
         const String & format_name_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        Context & context_,
+        const String & comment,
+        ContextPtr context_,
         const String & compression_method_);
 
 private:
-    String uri;
+    const String uri;
     String format_name;
-    Context & context;
     String compression_method;
 
     Poco::Logger * log = &Poco::Logger::get("StorageHDFS");
diff --git a/src/Storages/HDFS/WriteBufferFromHDFS.cpp b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
index 3873eace10d..5696e8f247f 100644
--- a/src/Storages/HDFS/WriteBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
@@ -27,19 +27,24 @@ struct WriteBufferFromHDFS::WriteBufferFromHDFSImpl
     HDFSBuilderWrapper builder;
     HDFSFSPtr fs;
 
-    explicit WriteBufferFromHDFSImpl(const std::string & hdfs_name_, const Poco::Util::AbstractConfiguration & config_)
-        : hdfs_uri(hdfs_name_)
-        , builder(createHDFSBuilder(hdfs_uri,config_))
+    explicit WriteBufferFromHDFSImpl(
+            const std::string & hdfs_uri_,
+            const Poco::Util::AbstractConfiguration & config_,
+            int flags)
+        : hdfs_uri(hdfs_uri_)
+        , builder(createHDFSBuilder(hdfs_uri, config_))
         , fs(createHDFSFS(builder.get()))
     {
         const size_t begin_of_path = hdfs_uri.find('/', hdfs_uri.find("//") + 2);
-        const std::string path = hdfs_uri.substr(begin_of_path);
+        const String path = hdfs_uri.substr(begin_of_path);
+
         if (path.find_first_of("*?{") != std::string::npos)
-            throw Exception("URI '" + hdfs_uri + "' contains globs, so the table is in readonly mode", ErrorCodes::CANNOT_OPEN_FILE);
+            throw Exception(ErrorCodes::CANNOT_OPEN_FILE, "URI '{}' contains globs, so the table is in readonly mode", hdfs_uri);
 
         if (!hdfsExists(fs.get(), path.c_str()))
-            throw Exception("File: " + path + " is already exists", ErrorCodes::BAD_ARGUMENTS);
-        fout = hdfsOpenFile(fs.get(), path.c_str(), O_WRONLY, 0, 0, 0);     /// O_WRONLY meaning create or overwrite i.e., implies O_TRUNCAT here
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "File {} already exists", path);
+
+        fout = hdfsOpenFile(fs.get(), path.c_str(), flags, 0, 0, 0);     /// O_WRONLY meaning create or overwrite i.e., implies O_TRUNCAT here
 
         if (fout == nullptr)
         {
@@ -58,9 +63,11 @@ struct WriteBufferFromHDFS::WriteBufferFromHDFSImpl
     int write(const char * start, size_t size) const
     {
         int bytes_written = hdfsWrite(fs.get(), fout, start, size);
+
         if (bytes_written < 0)
             throw Exception("Fail to write HDFS file: " + hdfs_uri + " " + std::string(hdfsGetLastError()),
                 ErrorCodes::NETWORK_ERROR);
+
         return bytes_written;
     }
 
@@ -73,9 +80,13 @@ struct WriteBufferFromHDFS::WriteBufferFromHDFSImpl
     }
 };
 
-WriteBufferFromHDFS::WriteBufferFromHDFS(const std::string & hdfs_name_, const Poco::Util::AbstractConfiguration & config_, size_t buf_size_)
+WriteBufferFromHDFS::WriteBufferFromHDFS(
+        const std::string & hdfs_name_,
+        const Poco::Util::AbstractConfiguration & config_,
+        size_t buf_size_,
+        int flags_)
     : BufferWithOwnMemory<WriteBuffer>(buf_size_)
-    , impl(std::make_unique<WriteBufferFromHDFSImpl>(hdfs_name_, config_))
+    , impl(std::make_unique<WriteBufferFromHDFSImpl>(hdfs_name_, config_, flags_))
 {
 }
 
@@ -97,7 +108,8 @@ void WriteBufferFromHDFS::sync()
     impl->sync();
 }
 
-WriteBufferFromHDFS::~WriteBufferFromHDFS()
+
+void WriteBufferFromHDFS::finalize()
 {
     try
     {
@@ -109,5 +121,11 @@ WriteBufferFromHDFS::~WriteBufferFromHDFS()
     }
 }
 
+
+WriteBufferFromHDFS::~WriteBufferFromHDFS()
+{
+    finalize();
+}
+
 }
 #endif
diff --git a/src/Storages/HDFS/WriteBufferFromHDFS.h b/src/Storages/HDFS/WriteBufferFromHDFS.h
index 339ec0c2a7c..9dc74e69d40 100644
--- a/src/Storages/HDFS/WriteBufferFromHDFS.h
+++ b/src/Storages/HDFS/WriteBufferFromHDFS.h
@@ -8,24 +8,36 @@
 #include <string>
 #include <memory>
 
+
 namespace DB
 {
 /** Accepts HDFS path to file and opens it.
  * Closes file by himself (thus "owns" a file descriptor).
  */
-class WriteBufferFromHDFS : public BufferWithOwnMemory<WriteBuffer>
+class WriteBufferFromHDFS final : public BufferWithOwnMemory<WriteBuffer>
 {
-    struct WriteBufferFromHDFSImpl;
-    std::unique_ptr<WriteBufferFromHDFSImpl> impl;
-public:
-    WriteBufferFromHDFS(const std::string & hdfs_name_, const Poco::Util::AbstractConfiguration &, size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
-    WriteBufferFromHDFS(WriteBufferFromHDFS &&) = default;
 
-    void nextImpl() override;
+public:
+    WriteBufferFromHDFS(
+        const std::string & hdfs_name_,
+        const Poco::Util::AbstractConfiguration & config_,
+        size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE,
+        int flags = O_WRONLY);
+
+    WriteBufferFromHDFS(WriteBufferFromHDFS &&) = default;
 
     ~WriteBufferFromHDFS() override;
 
+    void nextImpl() override;
+
     void sync() override;
+
+    void finalize() override;
+
+private:
+    struct WriteBufferFromHDFSImpl;
+    std::unique_ptr<WriteBufferFromHDFSImpl> impl;
 };
+
 }
 #endif
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 39f6d1f632e..83c91dffd7f 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -84,7 +84,7 @@ Pipe IStorage::read(
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
@@ -97,7 +97,7 @@ void IStorage::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned num_streams)
@@ -105,8 +105,9 @@ void IStorage::read(
     auto pipe = read(column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
     if (pipe.empty())
     {
-        auto header = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
-        InterpreterSelectQuery::addEmptySourceToQueryPlan(query_plan, header, query_info);
+        auto header = (query_info.projection ? query_info.projection->desc->metadata : metadata_snapshot)
+                          ->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
+        InterpreterSelectQuery::addEmptySourceToQueryPlan(query_plan, header, query_info, context);
     }
     else
     {
@@ -116,12 +117,12 @@ void IStorage::read(
 }
 
 Pipe IStorage::alterPartition(
-    const StorageMetadataPtr & /* metadata_snapshot */, const PartitionCommands & /* commands */, const Context & /* context */)
+    const StorageMetadataPtr & /* metadata_snapshot */, const PartitionCommands & /* commands */, ContextPtr /* context */)
 {
     throw Exception("Partition operations are not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
 }
 
-void IStorage::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void IStorage::alter(const AlterCommands & params, ContextPtr context, TableLockHolder &)
 {
     auto table_id = getStorageID();
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
@@ -131,7 +132,7 @@ void IStorage::alter(const AlterCommands & params, const Context & context, Tabl
 }
 
 
-void IStorage::checkAlterIsPossible(const AlterCommands & commands, const Context & /* context */) const
+void IStorage::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /* context */) const
 {
     for (const auto & command : commands)
     {
@@ -179,7 +180,7 @@ Names IStorage::getAllRegisteredNames() const
     return result;
 }
 
-NameDependencies IStorage::getDependentViewsByColumn(const Context & context) const
+NameDependencies IStorage::getDependentViewsByColumn(ContextPtr context) const
 {
     NameDependencies name_deps;
     auto dependencies = DatabaseCatalog::instance().getDependencies(storage_id);
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 4dfd2ca50f3..a96748ceb63 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -5,13 +5,15 @@
 #include <DataStreams/IBlockStream_fwd.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/CancellationCode.h>
-#include <Storages/IStorage_fwd.h>
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
-#include <Storages/TableLockHolder.h>
+#include <Processors/QueryPipeline.h>
 #include <Storages/CheckResults.h>
-#include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/ColumnDependency.h>
+#include <Storages/IStorage_fwd.h>
 #include <Storages/SelectQueryDescription.h>
+#include <Storages/StorageInMemoryMetadata.h>
+#include <Storages/TableLockHolder.h>
 #include <Common/ActionLock.h>
 #include <Common/Exception.h>
 #include <Common/RWLock.h>
@@ -29,11 +31,10 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-class Context;
-
 using StorageActionBlockType = size_t;
 
 class ASTCreateQuery;
+class ASTInsertQuery;
 
 struct Settings;
 
@@ -50,6 +51,9 @@ class Pipe;
 class QueryPlan;
 using QueryPlanPtr = std::unique_ptr<QueryPlan>;
 
+class QueryPipeline;
+using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
+
 class IStoragePolicy;
 using StoragePolicyPtr = std::shared_ptr<const IStoragePolicy>;
 
@@ -104,6 +108,9 @@ public:
     /// Returns true if the storage is a view of a table or another view.
     virtual bool isView() const { return false; }
 
+    /// Returns true if the storage is dictionary
+    virtual bool isDictionary() const { return false; }
+
     /// Returns true if the storage supports queries with the SAMPLE section.
     virtual bool supportsSampling() const { return getInMemoryMetadataPtr()->hasSamplingKey(); }
 
@@ -176,7 +183,7 @@ public:
 
     Names getAllRegisteredNames() const override;
 
-    NameDependencies getDependentViewsByColumn(const Context & context) const;
+    NameDependencies getDependentViewsByColumn(ContextPtr context) const;
 
 protected:
     /// Returns whether the column is virtual - by default all columns are real.
@@ -217,16 +224,19 @@ public:
 
     /** Returns stage to which query is going to be processed in read() function.
       * (Normally, the function only reads the columns from the list, but in other cases,
-      *  for example, the request can be partially processed on a remote server.)
+      *  for example, the request can be partially processed on a remote server, or an aggregate projection.)
       *
       * SelectQueryInfo is required since the stage can depends on the query
-      * (see Distributed() engine and optimize_skip_unused_shards).
+      * (see Distributed() engine and optimize_skip_unused_shards,
+      *  see also MergeTree engine and allow_experimental_projection_optimization).
       * And to store optimized cluster (after optimize_skip_unused_shards).
+      * It will also store needed stuff for projection query pipeline.
       *
       * QueryProcessingStage::Enum required for Distributed over Distributed,
       * since it cannot return Complete for intermediate queries never.
       */
-    virtual QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const
+    virtual QueryProcessingStage::Enum
+    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageMetadataPtr &, SelectQueryInfo &) const
     {
         return QueryProcessingStage::FetchColumns;
     }
@@ -253,7 +263,7 @@ public:
     virtual BlockInputStreams watch(
         const Names & /*column_names*/,
         const SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum & /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/)
@@ -285,7 +295,7 @@ public:
         const Names & /*column_names*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/);
@@ -297,7 +307,7 @@ public:
         const Names & /*column_names*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/);
@@ -314,11 +324,24 @@ public:
     virtual BlockOutputStreamPtr write(
         const ASTPtr & /*query*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
-        const Context & /*context*/)
+        ContextPtr /*context*/)
     {
         throw Exception("Method write is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    /** Writes the data to a table in distributed manner.
+      * It is supposed that implementation looks into SELECT part of the query and executes distributed
+      * INSERT SELECT if it is possible with current storage as a receiver and query SELECT part as a producer.
+      *
+      * Returns query pipeline if distributed writing is possible, and nullptr otherwise.
+      */
+    virtual QueryPipelinePtr distributedWrite(
+        const ASTInsertQuery & /*query*/,
+        ContextPtr /*context*/)
+    {
+        return nullptr;
+    }
+
     /** Delete the table data. Called before deleting the directory with the data.
       * The method can be called only after detaching table from Context (when no queries are performed with table).
       * The table is not usable during and after call to this method.
@@ -333,7 +356,7 @@ public:
     virtual void truncate(
         const ASTPtr & /*query*/,
         const StorageMetadataPtr & /* metadata_snapshot */,
-        const Context & /* context */,
+        ContextPtr /* context */,
         TableExclusiveLockHolder &)
     {
         throw Exception("Truncate is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
@@ -361,12 +384,12 @@ 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, const Context & context, TableLockHolder & alter_lock_holder);
+    virtual void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & 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.
       */
-    virtual void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const;
+    virtual void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const;
 
     /**
       * Checks that mutation commands can be applied to storage.
@@ -379,7 +402,7 @@ public:
     virtual Pipe alterPartition(
         const StorageMetadataPtr & /* metadata_snapshot */,
         const PartitionCommands & /* commands */,
-        const Context & /* context */);
+        ContextPtr /* context */);
 
     /// Checks that partition commands can be applied to storage.
     virtual void checkAlterPartitionIsPossible(const PartitionCommands & commands, const StorageMetadataPtr & metadata_snapshot, const Settings & settings) const;
@@ -394,13 +417,13 @@ public:
         bool /*final*/,
         bool /*deduplicate*/,
         const Names & /* deduplicate_by_columns */,
-        const Context & /*context*/)
+        ContextPtr /*context*/)
     {
         throw Exception("Method optimize is not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
     /// Mutate the table contents
-    virtual void mutate(const MutationCommands &, const Context &)
+    virtual void mutate(const MutationCommands &, ContextPtr)
     {
         throw Exception("Mutations are not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
@@ -421,6 +444,21 @@ public:
       */
     virtual void startup() {}
 
+    /**
+      * If the storage requires some complicated work on destroying,
+      * then you have two virtual methods:
+      * - flush()
+      * - shutdown()
+      *
+      * @see shutdown()
+      * @see flush()
+      */
+    void flushAndShutdown()
+    {
+        flush();
+        shutdown();
+    }
+
     /** If the table have to do some complicated work when destroying an object - do it in advance.
       * For example, if the table contains any threads for background work - ask them to complete and wait for completion.
       * By default, does nothing.
@@ -428,6 +466,10 @@ public:
       */
     virtual void shutdown() {}
 
+    /// Called before shutdown() to flush data to underlying storage
+    /// (for Buffer)
+    virtual void flush() {}
+
     /// Asks table to stop executing some action identified by action_type
     /// If table does not support such type of lock, and empty lock is returned
     virtual ActionLock getActionLock(StorageActionBlockType /* action_type */)
@@ -444,10 +486,10 @@ public:
     virtual bool supportsIndexForIn() const { return false; }
 
     /// Provides a hint that the storage engine may evaluate the IN-condition by using an index.
-    virtual bool mayBenefitFromIndexForIn(const ASTPtr & /* left_in_operand */, const Context & /* query_context */, const StorageMetadataPtr & /* metadata_snapshot */) const { return false; }
+    virtual bool mayBenefitFromIndexForIn(const ASTPtr & /* left_in_operand */, ContextPtr /* query_context */, const StorageMetadataPtr & /* metadata_snapshot */) const { return false; }
 
     /// Checks validity of the data
-    virtual CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) { throw Exception("Check query is not supported for " + getName() + " storage", ErrorCodes::NOT_IMPLEMENTED); }
+    virtual CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) { throw Exception("Check query is not supported for " + getName() + " storage", ErrorCodes::NOT_IMPLEMENTED); }
 
     /// Checks that table could be dropped right now
     /// Otherwise - throws an exception with detailed information.
@@ -473,14 +515,14 @@ public:
 
     /// 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() opimization
+    /// - Simple count() optimization
     /// - For total_rows column in system.tables
     ///
     /// Does takes underlying Storage (if any) into account.
     virtual std::optional<UInt64> totalRows(const Settings &) const { return {}; }
 
     /// Same as above but also take partition predicate into account.
-    virtual std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, const Context &) const { return {}; }
+    virtual std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, ContextPtr) const { return {}; }
 
     /// If it is possible to quickly determine exact number of bytes for the table on storage:
     /// - memory (approximated, resident)
diff --git a/src/Storages/IndicesDescription.cpp b/src/Storages/IndicesDescription.cpp
index dbc95615383..3147ad70696 100644
--- a/src/Storages/IndicesDescription.cpp
+++ b/src/Storages/IndicesDescription.cpp
@@ -67,7 +67,7 @@ IndexDescription & IndexDescription::operator=(const IndexDescription & other)
     return *this;
 }
 
-IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context)
+IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context)
 {
     const auto * index_definition = definition_ast->as<ASTIndexDeclaration>();
     if (!index_definition)
@@ -118,7 +118,7 @@ IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast
     return result;
 }
 
-void IndexDescription::recalculateWithNewColumns(const ColumnsDescription & new_columns, const Context & context)
+void IndexDescription::recalculateWithNewColumns(const ColumnsDescription & new_columns, ContextPtr context)
 {
     *this = getIndexFromAST(definition_ast, new_columns, context);
 }
@@ -144,7 +144,7 @@ String IndicesDescription::toString() const
 }
 
 
-IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDescription & columns, const Context & context)
+IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDescription & columns, ContextPtr context)
 {
     IndicesDescription result;
     if (str.empty())
@@ -160,7 +160,7 @@ IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDe
 }
 
 
-ExpressionActionsPtr IndicesDescription::getSingleExpressionForIndices(const ColumnsDescription & columns, const Context & context) const
+ExpressionActionsPtr IndicesDescription::getSingleExpressionForIndices(const ColumnsDescription & columns, ContextPtr context) const
 {
     ASTPtr combined_expr_list = std::make_shared<ASTExpressionList>();
     for (const auto & index : *this)
diff --git a/src/Storages/IndicesDescription.h b/src/Storages/IndicesDescription.h
index f383029837e..d9c7efdb75c 100644
--- a/src/Storages/IndicesDescription.h
+++ b/src/Storages/IndicesDescription.h
@@ -46,7 +46,7 @@ struct IndexDescription
     size_t granularity;
 
     /// Parse index from definition AST
-    static IndexDescription getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context);
+    static IndexDescription getIndexFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context);
 
     IndexDescription() = default;
 
@@ -57,7 +57,7 @@ struct IndexDescription
 
     /// Recalculate index with new columns because index expression may change
     /// if something change in columns.
-    void recalculateWithNewColumns(const ColumnsDescription & new_columns, const Context & context);
+    void recalculateWithNewColumns(const ColumnsDescription & new_columns, ContextPtr context);
 };
 
 /// All secondary indices in storage
@@ -68,10 +68,10 @@ struct IndicesDescription : public std::vector<IndexDescription>
     /// Convert description to string
     String toString() const;
     /// Parse description from string
-    static IndicesDescription parse(const String & str, const ColumnsDescription & columns, const Context & context);
+    static IndicesDescription parse(const String & str, const ColumnsDescription & columns, ContextPtr context);
 
     /// Return common expression for all stored indices
-    ExpressionActionsPtr getSingleExpressionForIndices(const ColumnsDescription & columns, const Context & context) const;
+    ExpressionActionsPtr getSingleExpressionForIndices(const ColumnsDescription & columns, ContextPtr context) const;
 };
 
 }
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.cpp b/src/Storages/Kafka/KafkaBlockInputStream.cpp
index bf985902b4d..5d9b19b1972 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockInputStream.cpp
@@ -35,8 +35,8 @@ KafkaBlockInputStream::KafkaBlockInputStream(
     , max_block_size(max_block_size_)
     , commit_in_suffix(commit_in_suffix_)
     , non_virtual_header(metadata_snapshot->getSampleBlockNonMaterialized())
-    , virtual_header(metadata_snapshot->getSampleBlockForColumns(
-            {"_topic", "_key", "_offset", "_partition", "_timestamp", "_timestamp_ms", "_headers.name", "_headers.value"}, storage.getVirtuals(), storage.getStorageID()))
+    , virtual_header(metadata_snapshot->getSampleBlockForColumns(storage.getVirtualColumnNames(), storage.getVirtuals(), storage.getStorageID()))
+    , handle_error_mode(storage.getHandleKafkaErrorMode())
 {
 }
 
@@ -78,21 +78,22 @@ Block KafkaBlockInputStream::readImpl()
     // 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;
+
     auto input_format = FormatFactory::instance().getInputFormat(
-        storage.getFormatName(), *buffer, non_virtual_header, *context, max_block_size);
+        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 new_rows = 0;
-
         while (true)
         {
             auto status = input_format->prepare();
@@ -136,7 +137,41 @@ Block KafkaBlockInputStream::readImpl()
 
     while (true)
     {
-        auto new_rows = buffer->poll() ? read_kafka_message() : 0;
+        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;
+                }
+            }
+        }
 
         if (new_rows)
         {
@@ -189,6 +224,20 @@ Block KafkaBlockInputStream::readImpl()
                 }
                 virtual_columns[6]->insert(headers_names);
                 virtual_columns[7]->insert(headers_values);
+                if (put_error_to_stream)
+                {
+                    if (exception_message)
+                    {
+                        auto payload = buffer->currentPayload();
+                        virtual_columns[8]->insert(payload);
+                        virtual_columns[9]->insert(*exception_message);
+                    }
+                    else
+                    {
+                        virtual_columns[8]->insertDefault();
+                        virtual_columns[9]->insertDefault();
+                    }
+                }
             }
 
             total_rows = total_rows + new_rows;
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.h b/src/Storages/Kafka/KafkaBlockInputStream.h
index 517df6ecaf7..98e4b8982e0 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.h
+++ b/src/Storages/Kafka/KafkaBlockInputStream.h
@@ -39,7 +39,7 @@ public:
 private:
     StorageKafka & storage;
     StorageMetadataPtr metadata_snapshot;
-    const std::shared_ptr<Context> context;
+    ContextPtr context;
     Names column_names;
     Poco::Logger * log;
     UInt64 max_block_size;
@@ -51,6 +51,7 @@ private:
 
     const Block non_virtual_header;
     const Block virtual_header;
+    const HandleKafkaErrorMode handle_error_mode;
 };
 
 }
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.cpp b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
index 2cb0fd98c71..21de27708b4 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
@@ -9,7 +9,7 @@ namespace DB
 KafkaBlockOutputStream::KafkaBlockOutputStream(
     StorageKafka & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const std::shared_ptr<Context> & context_)
+    const ContextPtr & context_)
     : storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , context(context_)
@@ -25,11 +25,11 @@ void KafkaBlockOutputStream::writePrefix()
 {
     buffer = storage.createWriteBuffer(getHeader());
 
-    auto format_settings = getFormatSettings(*context);
+    auto format_settings = getFormatSettings(context);
     format_settings.protobuf.allow_multiple_rows_without_delimiter = true;
 
     child = FormatFactory::instance().getOutputStream(storage.getFormatName(), *buffer,
-        getHeader(), *context,
+        getHeader(), context,
         [this](const Columns & columns, size_t row)
         {
             buffer->countRow(columns, row);
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.h b/src/Storages/Kafka/KafkaBlockOutputStream.h
index 715ed39b8d6..9f413ae527f 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.h
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.h
@@ -12,7 +12,7 @@ public:
     explicit KafkaBlockOutputStream(
         StorageKafka & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const std::shared_ptr<Context> & context_);
+        const std::shared_ptr<const Context> & context_);
 
     Block getHeader() const override;
 
@@ -25,7 +25,7 @@ public:
 private:
     StorageKafka & storage;
     StorageMetadataPtr metadata_snapshot;
-    const std::shared_ptr<Context> context;
+    const std::shared_ptr<const Context> context;
     ProducerBufferPtr buffer;
     BlockOutputStreamPtr child;
 };
diff --git a/src/Storages/Kafka/KafkaSettings.h b/src/Storages/Kafka/KafkaSettings.h
index 1df10d16339..1010c486abb 100644
--- a/src/Storages/Kafka/KafkaSettings.h
+++ b/src/Storages/Kafka/KafkaSettings.h
@@ -29,7 +29,8 @@ class ASTStorage;
     M(Char, kafka_row_delimiter, '\0', "The character to be considered as a delimiter in Kafka message.", 0) \
     M(String, kafka_schema, "", "Schema identifier (used by schema-based formats) for Kafka engine", 0) \
     M(UInt64, kafka_skip_broken_messages, 0, "Skip at least this number of broken messages from Kafka topic per block", 0) \
-    M(Bool, kafka_thread_per_consumer, false, "Provide independent thread for each consumer", 0)
+    M(Bool, kafka_thread_per_consumer, false, "Provide independent thread for each consumer", 0) \
+    M(HandleKafkaErrorMode, kafka_handle_error_mode, HandleKafkaErrorMode::DEFAULT, "How to handle errors for Kafka engine. Passible values: default, stream.", 0) \
 
     /** TODO: */
     /* https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md */
diff --git a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
index 1d889655941..49d3df0e180 100644
--- a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
+++ b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
@@ -63,6 +63,7 @@ public:
     auto currentPartition() const { return current[-1].get_partition(); }
     auto currentTimestamp() const { return current[-1].get_timestamp(); }
     const auto & currentHeaderList() const { return current[-1].get_header_list(); }
+    String currentPayload() const { return current[-1].get_payload(); }
 
 private:
     using Messages = std::vector<cppkafka::Message>;
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index 45e4ec538a1..15dd5b553b0 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -28,6 +28,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
+#include <Common/formatReadable.h>
 #include <Common/config_version.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
@@ -169,20 +170,19 @@ namespace
 }
 
 StorageKafka::StorageKafka(
-    const StorageID & table_id_,
-    const Context & context_,
-    const ColumnsDescription & columns_,
-    std::unique_ptr<KafkaSettings> kafka_settings_)
+    const StorageID & table_id_, ContextPtr context_, const ColumnsDescription & columns_, std::unique_ptr<KafkaSettings> kafka_settings_)
     : IStorage(table_id_)
-    , global_context(context_.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
     , kafka_settings(std::move(kafka_settings_))
-    , topics(parseTopics(global_context.getMacros()->expand(kafka_settings->kafka_topic_list.value)))
-    , brokers(global_context.getMacros()->expand(kafka_settings->kafka_broker_list.value))
-    , group(global_context.getMacros()->expand(kafka_settings->kafka_group_name.value))
-    , client_id(kafka_settings->kafka_client_id.value.empty() ? getDefaultClientId(table_id_) : global_context.getMacros()->expand(kafka_settings->kafka_client_id.value))
-    , format_name(global_context.getMacros()->expand(kafka_settings->kafka_format.value))
+    , topics(parseTopics(getContext()->getMacros()->expand(kafka_settings->kafka_topic_list.value)))
+    , brokers(getContext()->getMacros()->expand(kafka_settings->kafka_broker_list.value))
+    , group(getContext()->getMacros()->expand(kafka_settings->kafka_group_name.value))
+    , client_id(
+          kafka_settings->kafka_client_id.value.empty() ? getDefaultClientId(table_id_)
+                                                        : getContext()->getMacros()->expand(kafka_settings->kafka_client_id.value))
+    , format_name(getContext()->getMacros()->expand(kafka_settings->kafka_format.value))
     , row_delimiter(kafka_settings->kafka_row_delimiter.value)
-    , schema_name(global_context.getMacros()->expand(kafka_settings->kafka_schema.value))
+    , schema_name(getContext()->getMacros()->expand(kafka_settings->kafka_schema.value))
     , num_consumers(kafka_settings->kafka_num_consumers.value)
     , log(&Poco::Logger::get("StorageKafka (" + table_id_.table_name + ")"))
     , semaphore(0, num_consumers)
@@ -190,13 +190,18 @@ StorageKafka::StorageKafka(
     , settings_adjustments(createSettingsAdjustments())
     , thread_per_consumer(kafka_settings->kafka_thread_per_consumer.value)
 {
+    if (kafka_settings->kafka_handle_error_mode == HandleKafkaErrorMode::STREAM)
+    {
+        kafka_settings->input_format_allow_errors_num = 0;
+        kafka_settings->input_format_allow_errors_ratio = 0;
+    }
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
     auto task_count = thread_per_consumer ? num_consumers : 1;
     for (size_t i = 0; i < task_count; ++i)
     {
-        auto task = global_context.getMessageBrokerSchedulePool().createTask(log->name(), [this, i]{ threadFunc(i); });
+        auto task = getContext()->getMessageBrokerSchedulePool().createTask(log->name(), [this, i]{ threadFunc(i); });
         task->deactivate();
         tasks.emplace_back(std::make_shared<TaskContext>(std::move(task)));
     }
@@ -255,7 +260,7 @@ Pipe StorageKafka::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /* query_info */,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t /* max_block_size */,
     unsigned /* num_streams */)
@@ -266,7 +271,7 @@ Pipe StorageKafka::read(
     /// Always use all consumers at once, otherwise SELECT may not read messages from all partitions.
     Pipes pipes;
     pipes.reserve(num_created_consumers);
-    auto modified_context = std::make_shared<Context>(context);
+    auto modified_context = Context::createCopy(local_context);
     modified_context->applySettingsChanges(settings_adjustments);
 
     // Claim as many consumers as requested, but don't block
@@ -284,9 +289,9 @@ Pipe StorageKafka::read(
 }
 
 
-BlockOutputStreamPtr StorageKafka::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageKafka::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    auto modified_context = std::make_shared<Context>(context);
+    auto modified_context = Context::createCopy(local_context);
     modified_context->applySettingsChanges(settings_adjustments);
 
     if (topics.size() > 1)
@@ -382,7 +387,7 @@ ProducerBufferPtr StorageKafka::createWriteBuffer(const Block & header)
     updateConfiguration(conf);
 
     auto producer = std::make_shared<cppkafka::Producer>(conf);
-    const Settings & settings = global_context.getSettingsRef();
+    const Settings & settings = getContext()->getSettingsRef();
     size_t poll_timeout = settings.stream_poll_timeout_ms.totalMilliseconds();
 
     return std::make_shared<WriteBufferToKafkaProducer>(
@@ -438,14 +443,14 @@ size_t StorageKafka::getMaxBlockSize() const
 {
     return kafka_settings->kafka_max_block_size.changed
         ? kafka_settings->kafka_max_block_size.value
-        : (global_context.getSettingsRef().max_insert_block_size.value / num_consumers);
+        : (getContext()->getSettingsRef().max_insert_block_size.value / num_consumers);
 }
 
 size_t StorageKafka::getPollMaxBatchSize() const
 {
     size_t batch_size = kafka_settings->kafka_poll_max_batch_size.changed
                         ? kafka_settings->kafka_poll_max_batch_size.value
-                        : global_context.getSettingsRef().max_block_size.value;
+                        : getContext()->getSettingsRef().max_block_size.value;
 
     return std::min(batch_size,getMaxBlockSize());
 }
@@ -454,13 +459,13 @@ size_t StorageKafka::getPollTimeoutMillisecond() const
 {
     return kafka_settings->kafka_poll_timeout_ms.changed
         ? kafka_settings->kafka_poll_timeout_ms.totalMilliseconds()
-        : global_context.getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
+        : getContext()->getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
 }
 
 void StorageKafka::updateConfiguration(cppkafka::Configuration & conf)
 {
     // Update consumer configuration from the configuration
-    const auto & config = global_context.getConfigRef();
+    const auto & config = getContext()->getConfigRef();
     if (config.has(CONFIG_PREFIX))
         loadFromConfig(conf, config, CONFIG_PREFIX);
 
@@ -512,7 +517,7 @@ bool StorageKafka::checkDependencies(const StorageID & table_id)
     // Check the dependencies are ready?
     for (const auto & db_tab : dependencies)
     {
-        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, global_context);
+        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, getContext());
         if (!table)
             return false;
 
@@ -581,8 +586,10 @@ void StorageKafka::threadFunc(size_t idx)
 
 bool StorageKafka::streamToViews()
 {
+    Stopwatch watch;
+
     auto table_id = getStorageID();
-    auto table = DatabaseCatalog::instance().getTable(table_id, global_context);
+    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();
@@ -593,13 +600,13 @@ bool StorageKafka::streamToViews()
 
     size_t block_size = getMaxBlockSize();
 
-    auto kafka_context = std::make_shared<Context>(global_context);
+    auto kafka_context = Context::createCopy(getContext());
     kafka_context->makeQueryContext();
     kafka_context->applySettingsChanges(settings_adjustments);
 
     // Create a stream for each consumer and join them in a union stream
     // Only insert into dependent views and expect that input blocks contain virtual columns
-    InterpreterInsertQuery interpreter(insert, *kafka_context, false, true, true);
+    InterpreterInsertQuery interpreter(insert, kafka_context, false, true, true);
     auto block_io = interpreter.execute();
 
     // Create a stream for each consumer and join them in a union stream
@@ -617,7 +624,7 @@ bool StorageKafka::streamToViews()
 
         limits.speed_limits.max_execution_time = kafka_settings->kafka_flush_interval_ms.changed
                                                  ? kafka_settings->kafka_flush_interval_ms
-                                                 : global_context.getSettingsRef().stream_flush_interval_ms;
+                                                 : getContext()->getSettingsRef().stream_flush_interval_ms;
 
         limits.timeout_overflow_mode = OverflowMode::BREAK;
         stream->setLimits(limits);
@@ -633,7 +640,11 @@ bool StorageKafka::streamToViews()
     // 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};
-    copyData(*in, *block_io.out, &stub);
+    size_t rows = 0;
+    copyData(*in, *block_io.out, [&rows](const Block & block)
+    {
+        rows += block.rows();
+    }, &stub);
 
     bool some_stream_is_stalled = false;
     for (auto & stream : streams)
@@ -642,6 +653,10 @@ bool StorageKafka::streamToViews()
         stream->as<KafkaBlockInputStream>()->commit();
     }
 
+    UInt64 milliseconds = watch.elapsedMilliseconds();
+    LOG_DEBUG(log, "Pushing {} rows to {} took {} ms.",
+        formatReadableQuantity(rows), table_id.getNameForLogs(), milliseconds);
+
     return some_stream_is_stalled;
 }
 
@@ -690,14 +705,14 @@ void registerStorageKafka(StorageFactory & factory)
                         engine_args[(ARG_NUM)-1] =                          \
                             evaluateConstantExpressionAsLiteral(            \
                                 engine_args[(ARG_NUM)-1],                   \
-                                args.local_context);                        \
+                                args.getLocalContext());                    \
                     }                                                       \
                     if ((EVAL) == 2)                                        \
                     {                                                       \
                         engine_args[(ARG_NUM)-1] =                          \
                            evaluateConstantExpressionOrIdentifierAsLiteral( \
                                 engine_args[(ARG_NUM)-1],                   \
-                                args.local_context);                        \
+                                args.getLocalContext());                    \
                     }                                                       \
                     kafka_settings->PAR_NAME =                              \
                         engine_args[(ARG_NUM)-1]->as<ASTLiteral &>().value; \
@@ -752,7 +767,7 @@ void registerStorageKafka(StorageFactory & factory)
             throw Exception("kafka_poll_max_batch_size can not be lower than 1", ErrorCodes::BAD_ARGUMENTS);
         }
 
-        return StorageKafka::create(args.table_id, args.context, args.columns, std::move(kafka_settings));
+        return StorageKafka::create(args.table_id, args.getContext(), args.columns, std::move(kafka_settings));
     };
 
     factory.registerStorage("Kafka", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
@@ -760,7 +775,7 @@ void registerStorageKafka(StorageFactory & factory)
 
 NamesAndTypesList StorageKafka::getVirtuals() const
 {
-    return NamesAndTypesList{
+    auto result = NamesAndTypesList{
         {"_topic", std::make_shared<DataTypeString>()},
         {"_key", std::make_shared<DataTypeString>()},
         {"_offset", std::make_shared<DataTypeUInt64>()},
@@ -770,6 +785,32 @@ NamesAndTypesList StorageKafka::getVirtuals() const
         {"_headers.name", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"_headers.value", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}
     };
+    if (kafka_settings->kafka_handle_error_mode == HandleKafkaErrorMode::STREAM)
+    {
+        result.push_back({"_raw_message", std::make_shared<DataTypeString>()});
+        result.push_back({"_error", std::make_shared<DataTypeString>()});
+    }
+    return result;
+}
+
+Names StorageKafka::getVirtualColumnNames() const
+{
+    auto result = Names {
+        "_topic",
+        "_key",
+        "_offset",
+        "_partition",
+        "_timestamp",
+        "_timestamp_ms",
+        "_headers.name",
+        "_headers.value",
+    };
+    if (kafka_settings->kafka_handle_error_mode == HandleKafkaErrorMode::STREAM)
+    {
+        result.push_back({"_raw_message"});
+        result.push_back({"_error"});
+    }
+    return result;
 }
 
 }
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index 53871990810..b09b2ecd39e 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -28,7 +28,7 @@ struct StorageKafkaInterceptors;
 /** Implements a Kafka queue table engine that can be used as a persistent queue / buffer,
   * or as a basic building block for creating pipelines with a continuous insertion / ETL.
   */
-class StorageKafka final : public ext::shared_ptr_helper<StorageKafka>, public IStorage
+class StorageKafka final : public ext::shared_ptr_helper<StorageKafka>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageKafka>;
     friend struct StorageKafkaInterceptors;
@@ -45,7 +45,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -53,7 +53,7 @@ public:
     BlockOutputStreamPtr write(
         const ASTPtr & query,
         const StorageMetadataPtr & /*metadata_snapshot*/,
-        const Context & context) override;
+        ContextPtr context) override;
 
     void pushReadBuffer(ConsumerBufferPtr buf);
     ConsumerBufferPtr popReadBuffer();
@@ -64,16 +64,17 @@ public:
     const auto & getFormatName() const { return format_name; }
 
     NamesAndTypesList getVirtuals() const override;
+    Names getVirtualColumnNames() const;
+    HandleKafkaErrorMode getHandleKafkaErrorMode() const { return kafka_settings->kafka_handle_error_mode; }
 protected:
     StorageKafka(
         const StorageID & table_id_,
-        const Context & context_,
+        ContextPtr context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<KafkaSettings> kafka_settings_);
 
 private:
     // Configuration and state
-    const Context & global_context;
     std::unique_ptr<KafkaSettings> kafka_settings;
     const Names topics;
     const String brokers;
@@ -112,6 +113,9 @@ private:
     std::mutex thread_statuses_mutex;
     std::list<std::shared_ptr<ThreadStatus>> thread_statuses;
 
+    /// Handle error mode
+    HandleKafkaErrorMode handle_error_mode;
+
     SettingsChanges createSettingsAdjustments();
     ConsumerBufferPtr createReadBuffer(const size_t consumer_number);
 
diff --git a/src/Storages/KeyDescription.cpp b/src/Storages/KeyDescription.cpp
index ee4a20bfc4f..264a3ab45be 100644
--- a/src/Storages/KeyDescription.cpp
+++ b/src/Storages/KeyDescription.cpp
@@ -2,6 +2,7 @@
 
 #include <Functions/IFunction.h>
 #include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
@@ -66,14 +67,14 @@ KeyDescription & KeyDescription::operator=(const KeyDescription & other)
 void KeyDescription::recalculateWithNewAST(
     const ASTPtr & new_ast,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context)
 {
     *this = getSortingKeyFromAST(new_ast, columns, context, additional_column);
 }
 
 void KeyDescription::recalculateWithNewColumns(
     const ColumnsDescription & new_columns,
-    const Context & context)
+    ContextPtr context)
 {
     *this = getSortingKeyFromAST(definition_ast, new_columns, context, additional_column);
 }
@@ -81,15 +82,39 @@ void KeyDescription::recalculateWithNewColumns(
 KeyDescription KeyDescription::getKeyFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context)
 {
     return getSortingKeyFromAST(definition_ast, columns, context, {});
 }
 
+bool KeyDescription::moduloToModuloLegacyRecursive(ASTPtr node_expr)
+{
+    if (!node_expr)
+        return false;
+
+    auto * function_expr = node_expr->as<ASTFunction>();
+    bool modulo_in_ast = false;
+    if (function_expr)
+    {
+        if (function_expr->name == "modulo")
+        {
+            function_expr->name = "moduloLegacy";
+            modulo_in_ast = true;
+        }
+        if (function_expr->arguments)
+        {
+            auto children = function_expr->arguments->children;
+            for (const auto & child : children)
+                modulo_in_ast |= moduloToModuloLegacyRecursive(child);
+        }
+    }
+    return modulo_in_ast;
+}
+
 KeyDescription KeyDescription::getSortingKeyFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context,
+    ContextPtr context,
     const std::optional<String> & additional_column)
 {
     KeyDescription result;
diff --git a/src/Storages/KeyDescription.h b/src/Storages/KeyDescription.h
index 7d1e7efb55f..c99c7ebc5c5 100644
--- a/src/Storages/KeyDescription.h
+++ b/src/Storages/KeyDescription.h
@@ -40,28 +40,28 @@ struct KeyDescription
     static KeyDescription getKeyFromAST(
         const ASTPtr & definition_ast,
         const ColumnsDescription & columns,
-        const Context & context);
+        ContextPtr context);
 
     /// Sorting key can contain additional column defined by storage type (like
     /// Version column in VersionedCollapsingMergeTree).
     static KeyDescription getSortingKeyFromAST(
         const ASTPtr & definition_ast,
         const ColumnsDescription & columns,
-        const Context & context,
+        ContextPtr context,
         const std::optional<String> & additional_column);
 
     /// Recalculate all expressions and fields for key with new columns without
     /// changes in constant fields. Just wrapper for static methods.
     void recalculateWithNewColumns(
         const ColumnsDescription & new_columns,
-        const Context & context);
+        ContextPtr context);
 
     /// Recalculate all expressions and fields for key with new ast without
     /// changes in constant fields. Just wrapper for static methods.
     void recalculateWithNewAST(
         const ASTPtr & new_ast,
         const ColumnsDescription & columns,
-        const Context & context);
+        ContextPtr context);
 
     KeyDescription() = default;
 
@@ -69,6 +69,9 @@ struct KeyDescription
     /// unintentionaly share AST variables and modify them.
     KeyDescription(const KeyDescription & other);
     KeyDescription & operator=(const KeyDescription & other);
+
+    /// Substitute modulo with moduloLegacy. Used in KeyCondition to allow proper comparison with keys.
+    static bool moduloToModuloLegacyRecursive(ASTPtr node_expr);
 };
 
 }
diff --git a/src/Storages/LiveView/LiveViewBlockOutputStream.h b/src/Storages/LiveView/LiveViewBlockOutputStream.h
index 5a1f75a8c2f..6b8a5a2cb9e 100644
--- a/src/Storages/LiveView/LiveViewBlockOutputStream.h
+++ b/src/Storages/LiveView/LiveViewBlockOutputStream.h
@@ -3,6 +3,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataStreams/IBlockOutputStream.h>
 #include <Storages/LiveView/StorageLiveView.h>
+#include <Common/hex.h>
 
 
 namespace DB
@@ -25,8 +26,8 @@ public:
         UInt128 key;
         String key_str;
 
-        new_hash->get128(key.low, key.high);
-        key_str = key.toHexString();
+        new_hash->get128(key);
+        key_str = getHexUIntLowercase(key);
 
         std::lock_guard lock(storage.mutex);
 
diff --git a/src/Storages/LiveView/StorageBlocks.h b/src/Storages/LiveView/StorageBlocks.h
index 4ad0ffb93ca..6cf7ce59fa2 100644
--- a/src/Storages/LiveView/StorageBlocks.h
+++ b/src/Storages/LiveView/StorageBlocks.h
@@ -33,13 +33,17 @@ public:
     bool supportsSampling() const override { return true; }
     bool supportsFinal() const override { return true; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override { return to_stage; }
+    QueryProcessingStage::Enum
+    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageMetadataPtr &, SelectQueryInfo &) const override
+    {
+        return to_stage;
+    }
 
     Pipe read(
         const Names & /*column_names*/,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & /*query_info*/,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/) override
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index bfec7bffc8c..19c3992276f 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -23,6 +23,7 @@ limitations under the License. */
 #include <common/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>
@@ -56,13 +57,13 @@ namespace ErrorCodes
 }
 
 
-static StorageID extractDependentTable(ASTPtr & query, Context & context, const String & table_name, ASTPtr & inner_subquery)
+static StorageID extractDependentTable(ASTPtr & query, ContextPtr context, const String & table_name, ASTPtr & inner_subquery)
 {
     ASTSelectQuery & select_query = typeid_cast<ASTSelectQuery &>(*query);
 
     if (auto db_and_table = getDatabaseAndTable(select_query, 0))
     {
-        String select_database_name = context.getCurrentDatabase();
+        String select_database_name = context->getCurrentDatabase();
         String select_table_name = db_and_table->table;
 
         if (db_and_table->database.empty())
@@ -98,7 +99,7 @@ static StorageID extractDependentTable(ASTPtr & query, Context & context, const
     }
 }
 
-MergeableBlocksPtr StorageLiveView::collectMergeableBlocks(const Context & context)
+MergeableBlocksPtr StorageLiveView::collectMergeableBlocks(ContextPtr local_context)
 {
     ASTPtr mergeable_query = inner_query;
 
@@ -109,7 +110,7 @@ MergeableBlocksPtr StorageLiveView::collectMergeableBlocks(const Context & conte
     BlocksPtrs new_blocks = std::make_shared<std::vector<BlocksPtr>>();
     BlocksPtr base_blocks = std::make_shared<Blocks>();
 
-    InterpreterSelectQuery interpreter(mergeable_query->clone(), context, SelectQueryOptions(QueryProcessingStage::WithMergeableState), Names());
+    InterpreterSelectQuery interpreter(mergeable_query->clone(), local_context, SelectQueryOptions(QueryProcessingStage::WithMergeableState), Names());
 
     auto view_mergeable_stream = std::make_shared<MaterializingBlockInputStream>(interpreter.execute().getInputStream());
 
@@ -137,7 +138,7 @@ Pipes StorageLiveView::blocksToPipes(BlocksPtrs blocks, Block & sample_block)
 BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
 {
     //FIXME it's dangerous to create Context on stack
-    auto block_context = std::make_unique<Context>(global_context);
+    auto block_context = Context::createCopy(getContext());
     block_context->makeQueryContext();
 
     auto creator = [&](const StorageID & blocks_id_global)
@@ -147,17 +148,17 @@ BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
             blocks_id_global, parent_table_metadata->getColumns(),
             std::move(pipes), QueryProcessingStage::WithMergeableState);
     };
-    block_context->addExternalTable(getBlocksTableName(), TemporaryTableHolder(global_context, creator));
+    block_context->addExternalTable(getBlocksTableName(), TemporaryTableHolder(getContext(), creator));
 
-    InterpreterSelectQuery select(getInnerBlocksQuery(), *block_context, StoragePtr(), nullptr, SelectQueryOptions(QueryProcessingStage::Complete));
+    InterpreterSelectQuery select(getInnerBlocksQuery(), block_context, StoragePtr(), nullptr, SelectQueryOptions(QueryProcessingStage::Complete));
     BlockInputStreamPtr data = std::make_shared<MaterializingBlockInputStream>(select.execute().getInputStream());
 
     /// 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, global_context.getSettingsRef().min_insert_block_size_rows,
-        global_context.getSettingsRef().min_insert_block_size_bytes);
+        data, getContext()->getSettingsRef().min_insert_block_size_rows,
+        getContext()->getSettingsRef().min_insert_block_size_bytes);
 
     return data;
 }
@@ -165,7 +166,7 @@ BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
 void StorageLiveView::writeIntoLiveView(
     StorageLiveView & live_view,
     const Block & block,
-    const Context & context)
+    ContextPtr local_context)
 {
     BlockOutputStreamPtr output = std::make_shared<LiveViewBlockOutputStream>(live_view);
 
@@ -190,9 +191,9 @@ void StorageLiveView::writeIntoLiveView(
         std::lock_guard lock(live_view.mutex);
 
         mergeable_blocks = live_view.getMergeableBlocks();
-        if (!mergeable_blocks || mergeable_blocks->blocks->size() >= context.getGlobalContext().getSettingsRef().max_live_view_insert_blocks_before_refresh)
+        if (!mergeable_blocks || mergeable_blocks->blocks->size() >= local_context->getGlobalContext()->getSettingsRef().max_live_view_insert_blocks_before_refresh)
         {
-            mergeable_blocks = live_view.collectMergeableBlocks(context);
+            mergeable_blocks = live_view.collectMergeableBlocks(local_context);
             live_view.setMergeableBlocks(mergeable_blocks);
             from = live_view.blocksToPipes(mergeable_blocks->blocks, mergeable_blocks->sample_block);
             is_block_processed = true;
@@ -216,9 +217,9 @@ void StorageLiveView::writeIntoLiveView(
                 blocks_id_global, parent_metadata->getColumns(),
                 std::move(pipes), QueryProcessingStage::FetchColumns);
         };
-        TemporaryTableHolder blocks_storage(context, creator);
+        TemporaryTableHolder blocks_storage(local_context, creator);
 
-        InterpreterSelectQuery select_block(mergeable_query, context, blocks_storage.getTable(), blocks_storage.getTable()->getInMemoryMetadataPtr(),
+        InterpreterSelectQuery select_block(mergeable_query, local_context, blocks_storage.getTable(), blocks_storage.getTable()->getInMemoryMetadataPtr(),
             QueryProcessingStage::WithMergeableState);
 
         auto data_mergeable_stream = std::make_shared<MaterializingBlockInputStream>(
@@ -246,13 +247,13 @@ void StorageLiveView::writeIntoLiveView(
 
 StorageLiveView::StorageLiveView(
     const StorageID & table_id_,
-    Context & local_context,
+    ContextPtr context_,
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_)
     : IStorage(table_id_)
-    , global_context(local_context.getGlobalContext())
+    , WithContext(context_->getGlobalContext())
 {
-    live_view_context = std::make_unique<Context>(global_context);
+    live_view_context = Context::createCopy(getContext());
     live_view_context->makeQueryContext();
 
     log = &Poco::Logger::get("StorageLiveView (" + table_id_.database_name + "." + table_id_.table_name + ")");
@@ -271,7 +272,7 @@ StorageLiveView::StorageLiveView(
     inner_query = query.select->list_of_selects->children.at(0);
 
     auto inner_query_tmp = inner_query->clone();
-    select_table_id = extractDependentTable(inner_query_tmp, global_context, table_id_.table_name, inner_subquery);
+    select_table_id = extractDependentTable(inner_query_tmp, getContext(), table_id_.table_name, inner_subquery);
 
     DatabaseCatalog::instance().addDependency(select_table_id, table_id_);
 
@@ -291,7 +292,7 @@ StorageLiveView::StorageLiveView(
     blocks_metadata_ptr = std::make_shared<BlocksMetadataPtr>();
     active_ptr = std::make_shared<bool>(true);
 
-    periodic_refresh_task = global_context.getSchedulePool().createTask("LieViewPeriodicRefreshTask", [this]{ periodicRefreshTaskFunc(); });
+    periodic_refresh_task = getContext()->getSchedulePool().createTask("LieViewPeriodicRefreshTask", [this]{ periodicRefreshTaskFunc(); });
     periodic_refresh_task->deactivate();
 }
 
@@ -301,7 +302,7 @@ Block StorageLiveView::getHeader() const
 
     if (!sample_block)
     {
-        sample_block = InterpreterSelectQuery(inner_query->clone(), *live_view_context, SelectQueryOptions(QueryProcessingStage::Complete)).getSampleBlock();
+        sample_block = InterpreterSelectQuery(inner_query->clone(), live_view_context, SelectQueryOptions(QueryProcessingStage::Complete)).getSampleBlock();
         sample_block.insert({DataTypeUInt64().createColumnConst(
             sample_block.rows(), 0)->convertToFullColumnIfConst(),
             std::make_shared<DataTypeUInt64>(),
@@ -318,7 +319,7 @@ Block StorageLiveView::getHeader() const
 
 StoragePtr StorageLiveView::getParentStorage() const
 {
-    return DatabaseCatalog::instance().getTable(select_table_id, global_context);
+    return DatabaseCatalog::instance().getTable(select_table_id, getContext());
 }
 
 ASTPtr StorageLiveView::getInnerBlocksQuery()
@@ -330,9 +331,9 @@ ASTPtr StorageLiveView::getInnerBlocksQuery()
         /// Rewrite inner query with right aliases for JOIN.
         /// It cannot be done in constructor or startup() because InterpreterSelectQuery may access table,
         /// which is not loaded yet during server startup, so we do it lazily
-        InterpreterSelectQuery(inner_blocks_query, *live_view_context, SelectQueryOptions().modify().analyze()); // NOLINT
+        InterpreterSelectQuery(inner_blocks_query, live_view_context, SelectQueryOptions().modify().analyze()); // NOLINT
         auto table_id = getStorageID();
-        extractDependentTable(inner_blocks_query, global_context, table_id.table_name, inner_subquery);
+        extractDependentTable(inner_blocks_query, getContext(), table_id.table_name, inner_subquery);
     }
     return inner_blocks_query->clone();
 }
@@ -350,7 +351,7 @@ bool StorageLiveView::getNewBlocks()
     /// called before writeIntoLiveView function is called which can lead to
     /// the same block added twice to the mergeable_blocks leading to
     /// inserted data to be duplicated
-    auto new_mergeable_blocks = collectMergeableBlocks(*live_view_context);
+    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));
 
@@ -366,20 +367,20 @@ bool StorageLiveView::getNewBlocks()
         new_blocks->push_back(block);
     }
 
-    hash.get128(key.low, key.high);
+    hash.get128(key);
 
     /// Update blocks only if hash keys do not match
     /// NOTE: hash could be different for the same result
     ///       if blocks are not in the same order
     bool updated = false;
     {
-        if (getBlocksHashKey() != key.toHexString())
+        if (getBlocksHashKey() != getHexUIntLowercase(key))
         {
             if (new_blocks->empty())
             {
                 new_blocks->push_back(getHeader());
             }
-            new_blocks_metadata->hash = key.toHexString();
+            new_blocks_metadata->hash = getHexUIntLowercase(key);
             new_blocks_metadata->version = getBlocksVersion() + 1;
             new_blocks_metadata->time = std::chrono::system_clock::now();
 
@@ -500,7 +501,7 @@ Pipe StorageLiveView::read(
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -525,7 +526,7 @@ Pipe StorageLiveView::read(
 BlockInputStreams StorageLiveView::watch(
     const Names & /*column_names*/,
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum & processed_stage,
     size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -546,12 +547,12 @@ BlockInputStreams StorageLiveView::watch(
         reader = std::make_shared<LiveViewEventsBlockInputStream>(
             std::static_pointer_cast<StorageLiveView>(shared_from_this()),
             blocks_ptr, blocks_metadata_ptr, active_ptr, has_limit, limit,
-            context.getSettingsRef().live_view_heartbeat_interval.totalSeconds());
+            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds());
     else
         reader = std::make_shared<LiveViewBlockInputStream>(
             std::static_pointer_cast<StorageLiveView>(shared_from_this()),
             blocks_ptr, blocks_metadata_ptr, active_ptr, has_limit, limit,
-            context.getSettingsRef().live_view_heartbeat_interval.totalSeconds());
+            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds());
 
     {
         std::lock_guard lock(mutex);
@@ -578,10 +579,12 @@ void registerStorageLiveView(StorageFactory & factory)
 {
     factory.registerStorage("LiveView", [](const StorageFactory::Arguments & args)
     {
-        if (!args.attach && !args.local_context.getSettingsRef().allow_experimental_live_view)
-            throw Exception("Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')", ErrorCodes::SUPPORT_IS_DISABLED);
+        if (!args.attach && !args.getLocalContext()->getSettingsRef().allow_experimental_live_view)
+            throw Exception(
+                "Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')",
+                ErrorCodes::SUPPORT_IS_DISABLED);
 
-        return StorageLiveView::create(args.table_id, args.local_context, args.query, args.columns);
+        return StorageLiveView::create(args.table_id, args.getLocalContext(), args.query, args.columns);
     });
 }
 
diff --git a/src/Storages/LiveView/StorageLiveView.h b/src/Storages/LiveView/StorageLiveView.h
index e30a8f51705..e787b7bf939 100644
--- a/src/Storages/LiveView/StorageLiveView.h
+++ b/src/Storages/LiveView/StorageLiveView.h
@@ -49,7 +49,7 @@ class Pipe;
 using Pipes = std::vector<Pipe>;
 
 
-class StorageLiveView final : public ext::shared_ptr_helper<StorageLiveView>, public IStorage
+class StorageLiveView final : public ext::shared_ptr_helper<StorageLiveView>, public IStorage, WithContext
 {
 friend struct ext::shared_ptr_helper<StorageLiveView>;
 friend class LiveViewBlockInputStream;
@@ -142,13 +142,13 @@ public:
     void startup() override;
     void shutdown() override;
 
-    void refresh(const bool grab_lock = true);
+    void refresh(bool grab_lock = true);
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -156,7 +156,7 @@ public:
     BlockInputStreams watch(
         const Names & column_names,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -165,7 +165,7 @@ public:
     MergeableBlocksPtr getMergeableBlocks() { return mergeable_blocks; }
 
     /// Collect mergeable blocks and their sample. Must be called holding mutex
-    MergeableBlocksPtr collectMergeableBlocks(const Context & context);
+    MergeableBlocksPtr collectMergeableBlocks(ContextPtr context);
     /// Complete query using input streams from mergeable blocks
     BlockInputStreamPtr completeQuery(Pipes pipes);
 
@@ -183,7 +183,7 @@ public:
     static void writeIntoLiveView(
         StorageLiveView & live_view,
         const Block & block,
-        const Context & context);
+        ContextPtr context);
 
 private:
     /// TODO move to common struct SelectQueryDescription
@@ -191,8 +191,7 @@ private:
     ASTPtr inner_query; /// stored query : SELECT * FROM ( SELECT a FROM A)
     ASTPtr inner_subquery; /// stored query's innermost subquery if any
     ASTPtr inner_blocks_query; /// query over the mergeable blocks to produce final result
-    Context & global_context;
-    std::unique_ptr<Context> live_view_context;
+    ContextMutablePtr live_view_context;
 
     Poco::Logger * log;
 
@@ -231,7 +230,7 @@ private:
 
     StorageLiveView(
         const StorageID & table_id_,
-        Context & local_context,
+        ContextPtr context_,
         const ASTCreateQuery & query,
         const ColumnsDescription & columns
     );
diff --git a/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp b/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp
index 143e7460cc3..69369cbc1a3 100644
--- a/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp
+++ b/src/Storages/LiveView/TemporaryLiveViewCleaner.cpp
@@ -1,8 +1,9 @@
 #include <Storages/LiveView/TemporaryLiveViewCleaner.h>
-#include <Storages/LiveView/StorageLiveView.h>
+
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Storages/LiveView/StorageLiveView.h>
 
 
 namespace DB
@@ -15,7 +16,7 @@ namespace ErrorCodes
 
 namespace
 {
-    void executeDropQuery(const StorageID & storage_id, Context & context)
+    void executeDropQuery(const StorageID & storage_id, ContextMutablePtr context)
     {
         if (!DatabaseCatalog::instance().isTableExist(storage_id, context))
             return;
@@ -41,45 +42,20 @@ namespace
 std::unique_ptr<TemporaryLiveViewCleaner> TemporaryLiveViewCleaner::the_instance;
 
 
-void TemporaryLiveViewCleaner::init(Context & global_context_)
+void TemporaryLiveViewCleaner::init(ContextMutablePtr global_context_)
 {
     if (the_instance)
         throw Exception("TemporaryLiveViewCleaner already initialized", ErrorCodes::LOGICAL_ERROR);
     the_instance.reset(new TemporaryLiveViewCleaner(global_context_));
 }
 
-void TemporaryLiveViewCleaner::startupIfNecessary()
+void TemporaryLiveViewCleaner::startup()
 {
+    background_thread_can_start = true;
+
     std::lock_guard lock{mutex};
-    if (background_thread_should_exit)
-        return;
     if (!views.empty())
-        startupIfNecessaryImpl(lock);
-    else
-        can_start_background_thread = true;
-}
-
-void TemporaryLiveViewCleaner::startupIfNecessaryImpl(const std::lock_guard<std::mutex> &)
-{
-    /// If views.empty() the background thread isn't running or it's going to stop right now.
-    /// If can_start_background_thread is false, then the thread has not been started previously.
-    bool background_thread_is_running;
-    if (can_start_background_thread)
-    {
-        background_thread_is_running = !views.empty();
-    }
-    else
-    {
-        can_start_background_thread = true;
-        background_thread_is_running = false;
-    }
-
-    if (!background_thread_is_running)
-    {
-        if (background_thread.joinable())
-            background_thread.join();
-        background_thread = ThreadFromGlobalPool{&TemporaryLiveViewCleaner::backgroundThreadFunc, this};
-    }
+        startBackgroundThread();
 }
 
 void TemporaryLiveViewCleaner::shutdown()
@@ -87,13 +63,10 @@ void TemporaryLiveViewCleaner::shutdown()
     the_instance.reset();
 }
 
-
-TemporaryLiveViewCleaner::TemporaryLiveViewCleaner(Context & global_context_)
-    : global_context(global_context_)
+TemporaryLiveViewCleaner::TemporaryLiveViewCleaner(ContextMutablePtr global_context_) : WithMutableContext(global_context_)
 {
 }
 
-
 TemporaryLiveViewCleaner::~TemporaryLiveViewCleaner()
 {
     stopBackgroundThread();
@@ -108,27 +81,29 @@ void TemporaryLiveViewCleaner::addView(const std::shared_ptr<StorageLiveView> &
     auto current_time = std::chrono::system_clock::now();
     auto time_of_next_check = current_time + view->getTimeout();
 
-    std::lock_guard lock{mutex};
-    if (background_thread_should_exit)
-        return;
-
-    if (can_start_background_thread)
-        startupIfNecessaryImpl(lock);
-
     /// Keep the vector `views` sorted by time of next check.
     StorageAndTimeOfCheck storage_and_time_of_check{view, time_of_next_check};
+    std::lock_guard lock{mutex};
     views.insert(std::upper_bound(views.begin(), views.end(), storage_and_time_of_check), storage_and_time_of_check);
 
-    background_thread_wake_up.notify_one();
+    if (background_thread_can_start)
+    {
+        startBackgroundThread();
+        background_thread_wake_up.notify_one();
+    }
 }
 
 
 void TemporaryLiveViewCleaner::backgroundThreadFunc()
 {
     std::unique_lock lock{mutex};
-    while (!background_thread_should_exit && !views.empty())
+    while (!background_thread_should_exit)
     {
-        background_thread_wake_up.wait_until(lock, views.front().time_of_check);
+        if (views.empty())
+            background_thread_wake_up.wait(lock);
+        else
+            background_thread_wake_up.wait_until(lock, views.front().time_of_check);
+
         if (background_thread_should_exit)
             break;
 
@@ -167,20 +142,24 @@ void TemporaryLiveViewCleaner::backgroundThreadFunc()
 
         lock.unlock();
         for (const auto & storage_id : storages_to_drop)
-            executeDropQuery(storage_id, global_context);
+            executeDropQuery(storage_id, getContext());
         lock.lock();
     }
 }
 
 
+void TemporaryLiveViewCleaner::startBackgroundThread()
+{
+    if (!background_thread.joinable() && background_thread_can_start && !background_thread_should_exit)
+        background_thread = ThreadFromGlobalPool{&TemporaryLiveViewCleaner::backgroundThreadFunc, this};
+}
+
 void TemporaryLiveViewCleaner::stopBackgroundThread()
 {
+    background_thread_should_exit = true;
+    background_thread_wake_up.notify_one();
     if (background_thread.joinable())
-    {
-        background_thread_should_exit = true;
-        background_thread_wake_up.notify_one();
         background_thread.join();
-    }
 }
 
 }
diff --git a/src/Storages/LiveView/TemporaryLiveViewCleaner.h b/src/Storages/LiveView/TemporaryLiveViewCleaner.h
index 8d57aa9fbfa..3fe0079a46f 100644
--- a/src/Storages/LiveView/TemporaryLiveViewCleaner.h
+++ b/src/Storages/LiveView/TemporaryLiveViewCleaner.h
@@ -1,17 +1,20 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <Common/ThreadPool.h>
+
 #include <chrono>
 
 
 namespace DB
 {
+
 class StorageLiveView;
 struct StorageID;
 
 /// This class removes temporary live views in the background thread when it's possible.
 /// There should only a single instance of this class.
-class TemporaryLiveViewCleaner
+class TemporaryLiveViewCleaner : WithMutableContext
 {
 public:
     static TemporaryLiveViewCleaner & instance() { return *the_instance; }
@@ -20,19 +23,19 @@ public:
     void addView(const std::shared_ptr<StorageLiveView> & view);
 
     /// Should be called once.
-    static void init(Context & global_context_);
+    static void init(ContextMutablePtr global_context_);
     static void shutdown();
 
-    void startupIfNecessary();
-    void startupIfNecessaryImpl(const std::lock_guard<std::mutex> &);
+    void startup();
 
 private:
     friend std::unique_ptr<TemporaryLiveViewCleaner>::deleter_type;
 
-    TemporaryLiveViewCleaner(Context & global_context_);
+    TemporaryLiveViewCleaner(ContextMutablePtr global_context_);
     ~TemporaryLiveViewCleaner();
 
     void backgroundThreadFunc();
+    void startBackgroundThread();
     void stopBackgroundThread();
 
     struct StorageAndTimeOfCheck
@@ -43,11 +46,10 @@ private:
     };
 
     static std::unique_ptr<TemporaryLiveViewCleaner> the_instance;
-    Context & global_context;
     std::mutex mutex;
     std::vector<StorageAndTimeOfCheck> views;
     ThreadFromGlobalPool background_thread;
-    bool can_start_background_thread = false;
+    std::atomic<bool> background_thread_can_start = false;
     std::atomic<bool> background_thread_should_exit = false;
     std::condition_variable background_thread_wake_up;
 };
diff --git a/src/Storages/MarkCache.h b/src/Storages/MarkCache.h
index 5dfaa9ef0ea..ccf8a2e606d 100644
--- a/src/Storages/MarkCache.h
+++ b/src/Storages/MarkCache.h
@@ -50,7 +50,7 @@ public:
 
         SipHash hash;
         hash.update(path_to_file.data(), path_to_file.size() + 1);
-        hash.get128(key.low, key.high);
+        hash.get128(key);
 
         return key;
     }
diff --git a/src/Storages/MergeTree/ActiveDataPartSet.cpp b/src/Storages/MergeTree/ActiveDataPartSet.cpp
index e4d7465b360..bbf05afa42c 100644
--- a/src/Storages/MergeTree/ActiveDataPartSet.cpp
+++ b/src/Storages/MergeTree/ActiveDataPartSet.cpp
@@ -1,10 +1,16 @@
 #include <Storages/MergeTree/ActiveDataPartSet.h>
+#include <Common/Exception.h>
 #include <algorithm>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 ActiveDataPartSet::ActiveDataPartSet(MergeTreeDataFormatVersion format_version_, const Strings & names)
     : format_version(format_version_)
 {
@@ -15,6 +21,7 @@ ActiveDataPartSet::ActiveDataPartSet(MergeTreeDataFormatVersion format_version_,
 
 bool ActiveDataPartSet::add(const String & name, Strings * out_replaced_parts)
 {
+    /// TODO make it exception safe (out_replaced_parts->push_back(...) may throw)
     auto part_info = MergeTreePartInfo::fromPartName(name, format_version);
 
     if (getContainingPartImpl(part_info) != part_info_to_name.end())
@@ -32,6 +39,8 @@ bool ActiveDataPartSet::add(const String & name, Strings * out_replaced_parts)
         --it;
         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());
             ++it;
             break;
         }
@@ -47,11 +56,16 @@ bool ActiveDataPartSet::add(const String & name, Strings * out_replaced_parts)
     /// Let's go to the right.
     while (it != part_info_to_name.end() && part_info.contains(it->first))
     {
+        if (part_info == it->first)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected duplicate part {}. It is a bug.", name);
         if (out_replaced_parts)
             out_replaced_parts->push_back(it->second);
         part_info_to_name.erase(it++);
     }
 
+    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());
+
     part_info_to_name.emplace(part_info, name);
     return true;
 }
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp b/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
index 8e5a0e8a3b8..c42ea46847c 100644
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
+++ b/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
@@ -16,10 +16,10 @@ namespace DB
 {
 
 IBackgroundJobExecutor::IBackgroundJobExecutor(
-        Context & global_context_,
+        ContextPtr global_context_,
         const BackgroundTaskSchedulingSettings & sleep_settings_,
         const std::vector<PoolConfig> & pools_configs_)
-    : global_context(global_context_)
+    : WithContext(global_context_)
     , sleep_settings(sleep_settings_)
     , rng(randomSeed())
 {
@@ -116,8 +116,8 @@ try
                     }
                     catch (...)
                     {
-                        tryLogCurrentException(__PRETTY_FUNCTION__);
                         CurrentMetrics::values[pool_config.tasks_metric]--;
+                        tryLogCurrentException(__PRETTY_FUNCTION__);
                         scheduleTask(/* with_backoff = */ true);
                     }
                 });
@@ -128,8 +128,8 @@ try
             catch (...)
             {
                 /// With our Pool settings scheduleOrThrowOnError shouldn't throw exceptions, but for safety catch added here
-                tryLogCurrentException(__PRETTY_FUNCTION__);
                 CurrentMetrics::values[pool_config.tasks_metric]--;
+                tryLogCurrentException(__PRETTY_FUNCTION__);
                 scheduleTask(/* with_backoff = */ true);
             }
         }
@@ -155,7 +155,7 @@ void IBackgroundJobExecutor::start()
     std::lock_guard lock(scheduling_task_mutex);
     if (!scheduling_task)
     {
-        scheduling_task = global_context.getSchedulePool().createTask(
+        scheduling_task = getContext()->getSchedulePool().createTask(
             getBackgroundTaskName(), [this]{ jobExecutingTask(); });
     }
 
@@ -187,12 +187,12 @@ IBackgroundJobExecutor::~IBackgroundJobExecutor()
 
 BackgroundJobsExecutor::BackgroundJobsExecutor(
        MergeTreeData & data_,
-       Context & global_context_)
+       ContextPtr global_context_)
     : IBackgroundJobExecutor(
         global_context_,
-        global_context_.getBackgroundProcessingTaskSchedulingSettings(),
-        {PoolConfig{PoolType::MERGE_MUTATE, global_context_.getSettingsRef().background_pool_size, CurrentMetrics::BackgroundPoolTask},
-         PoolConfig{PoolType::FETCH, global_context_.getSettingsRef().background_fetches_pool_size, CurrentMetrics::BackgroundFetchesPoolTask}})
+        global_context_->getBackgroundProcessingTaskSchedulingSettings(),
+        {PoolConfig{PoolType::MERGE_MUTATE, global_context_->getSettingsRef().background_pool_size, CurrentMetrics::BackgroundPoolTask},
+         PoolConfig{PoolType::FETCH, global_context_->getSettingsRef().background_fetches_pool_size, CurrentMetrics::BackgroundFetchesPoolTask}})
     , data(data_)
 {
 }
@@ -209,11 +209,11 @@ std::optional<JobAndPool> BackgroundJobsExecutor::getBackgroundJob()
 
 BackgroundMovesExecutor::BackgroundMovesExecutor(
        MergeTreeData & data_,
-       Context & global_context_)
+       ContextPtr global_context_)
     : IBackgroundJobExecutor(
         global_context_,
-        global_context_.getBackgroundMoveTaskSchedulingSettings(),
-      {PoolConfig{PoolType::MOVE, global_context_.getSettingsRef().background_move_pool_size, CurrentMetrics::BackgroundMovePoolTask}})
+        global_context_->getBackgroundMoveTaskSchedulingSettings(),
+      {PoolConfig{PoolType::MOVE, global_context_->getSettingsRef().background_move_pool_size, CurrentMetrics::BackgroundMovePoolTask}})
     , data(data_)
 {
 }
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.h b/src/Storages/MergeTree/BackgroundJobsExecutor.h
index da22c752e1b..e9cefc7a6b0 100644
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.h
+++ b/src/Storages/MergeTree/BackgroundJobsExecutor.h
@@ -50,11 +50,9 @@ struct JobAndPool
 /// 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
+class IBackgroundJobExecutor : protected WithContext
 {
 protected:
-    Context & global_context;
-
     /// Configuration for single background ThreadPool
     struct PoolConfig
     {
@@ -106,7 +104,7 @@ public:
 
 protected:
     IBackgroundJobExecutor(
-        Context & global_context_,
+        ContextPtr global_context_,
         const BackgroundTaskSchedulingSettings & sleep_settings_,
         const std::vector<PoolConfig> & pools_configs_);
 
@@ -134,7 +132,7 @@ private:
 public:
     BackgroundJobsExecutor(
         MergeTreeData & data_,
-        Context & global_context_);
+        ContextPtr global_context_);
 
 protected:
     String getBackgroundTaskName() const override;
@@ -150,7 +148,7 @@ private:
 public:
     BackgroundMovesExecutor(
         MergeTreeData & data_,
-        Context & global_context_);
+        ContextPtr global_context_);
 
 protected:
     String getBackgroundTaskName() const override;
diff --git a/src/Storages/MergeTree/CMakeLists.txt b/src/Storages/MergeTree/CMakeLists.txt
index 36cab0b3590..390835f17ae 100644
--- a/src/Storages/MergeTree/CMakeLists.txt
+++ b/src/Storages/MergeTree/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(ENABLE_TESTS)
-    add_subdirectory(tests)
+if(ENABLE_EXAMPLES)
+    add_subdirectory(examples)
 endif()
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 862a3088f89..47f446a0b8b 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -9,15 +9,16 @@
 #include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
 #include <Storages/MergeTree/ReplicatedFetchList.h>
+#include <Storages/StorageReplicatedMergeTree.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/NetException.h>
 #include <IO/createReadBufferFromFileBase.h>
 #include <ext/scope_guard.h>
-
-#include <Poco/File.h>
 #include <Poco/Net/HTTPRequest.h>
 
 
+namespace fs = std::filesystem;
+
 namespace CurrentMetrics
 {
     extern const Metric ReplicatedSend;
@@ -52,6 +53,7 @@ constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_TYPE = 3;
 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_S3_COPY = 6;
+constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION = 7;
 
 
 std::string getEndpointId(const std::string & node_id)
@@ -85,6 +87,10 @@ struct ReplicatedFetchReadCallback
 
 }
 
+
+Service::Service(StorageReplicatedMergeTree & data_) :
+    data(data_), log(&Poco::Logger::get(data.getLogName() + " (Replicated PartsService)")) {}
+
 std::string Service::getId(const std::string & node_id) const
 {
     return getEndpointId(node_id);
@@ -116,7 +122,7 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
     }
 
     /// 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_S3_COPY))});
+    response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION))});
 
     ++total_sends;
     SCOPE_EXIT({--total_sends;});
@@ -126,9 +132,23 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
 
     LOG_TRACE(log, "Sending part {}", part_name);
 
+    MergeTreeData::DataPartPtr part;
+
+    auto report_broken_part = [&]()
+    {
+        if (part && part->isProjectionPart())
+        {
+            data.reportBrokenPart(part->getParentPart()->name);
+        }
+        else
+        {
+            data.reportBrokenPart(part_name);
+        }
+    };
+
     try
     {
-        MergeTreeData::DataPartPtr part = findPart(part_name);
+        part = findPart(part_name);
 
         CurrentMetrics::Increment metric_increment{CurrentMetrics::ReplicatedSend};
 
@@ -148,34 +168,41 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
         if (client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)
             writeUUIDText(part->uuid, out);
 
-        if (isInMemoryPart(part))
-            sendPartFromMemory(part, out);
-        else
-        {
-            bool try_use_s3_copy = false;
+        bool try_use_s3_copy = false;
 
-            if (data_settings->allow_s3_zero_copy_replication
-                    && client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY)
-            { /// if source and destination are in the same S3 storage we try to use S3 CopyObject request first
-                int send_s3_metadata = parse<int>(params.get("send_s3_metadata", "0"));
-                if (send_s3_metadata == 1)
+        if (data_settings->allow_s3_zero_copy_replication
+                && client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY)
+        { /// if source and destination are in the same S3 storage we try to use S3 CopyObject request first
+            int send_s3_metadata = parse<int>(params.get("send_s3_metadata", "0"));
+            if (send_s3_metadata == 1)
+            {
+                auto disk = part->volume->getDisk();
+                if (disk->getType() == DB::DiskType::Type::S3)
                 {
-                    auto disk = part->volume->getDisk();
-                    if (disk->getType() == DB::DiskType::Type::S3)
-                    {
-                        try_use_s3_copy = true;
-                    }
+                    try_use_s3_copy = true;
                 }
             }
-            if (try_use_s3_copy)
-            {
-                response.addCookie({"send_s3_metadata", "1"});
-                sendPartS3Metadata(part, out);
-            }
+        }
+        if (try_use_s3_copy)
+        {
+            response.addCookie({"send_s3_metadata", "1"});
+            sendPartS3Metadata(part, out);
+        }
+        else if (client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION)
+        {
+            const auto & projections = part->getProjectionParts();
+            writeBinary(projections.size(), out);
+            if (isInMemoryPart(part))
+                sendPartFromMemory(part, out, projections);
+            else
+                sendPartFromDisk(part, out, client_protocol_version, projections);
+        }
+        else
+        {
+            if (isInMemoryPart(part))
+                sendPartFromMemory(part, out);
             else
-            {
                 sendPartFromDisk(part, out, client_protocol_version);
-            }
         }
     }
     catch (const NetException &)
@@ -186,19 +213,34 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
     catch (const Exception & e)
     {
         if (e.code() != ErrorCodes::ABORTED && e.code() != ErrorCodes::CANNOT_WRITE_TO_OSTREAM)
-            data.reportBrokenPart(part_name);
+            report_broken_part();
+
         throw;
     }
     catch (...)
     {
-        data.reportBrokenPart(part_name);
+        report_broken_part();
         throw;
     }
 }
 
-void Service::sendPartFromMemory(const MergeTreeData::DataPartPtr & part, WriteBuffer & out)
+void Service::sendPartFromMemory(
+    const MergeTreeData::DataPartPtr & part, WriteBuffer & out, const std::map<String, std::shared_ptr<IMergeTreeDataPart>> & projections)
 {
     auto metadata_snapshot = data.getInMemoryMetadataPtr();
+    for (const auto & [name, projection] : projections)
+    {
+        auto projection_sample_block = metadata_snapshot->projections.get(name).sample_block;
+        auto part_in_memory = asInMemoryPart(projection);
+        if (!part_in_memory)
+            throw Exception("Projection " + name + " of part " + part->name + " is not stored in memory", ErrorCodes::LOGICAL_ERROR);
+
+        writeStringBinary(name, out);
+        projection->checksums.write(out);
+        NativeBlockOutputStream block_out(out, 0, projection_sample_block);
+        block_out.write(part_in_memory->block);
+    }
+
     auto part_in_memory = asInMemoryPart(part);
     if (!part_in_memory)
         throw Exception("Part " + part->name + " is not stored in memory", ErrorCodes::LOGICAL_ERROR);
@@ -206,9 +248,15 @@ void Service::sendPartFromMemory(const MergeTreeData::DataPartPtr & part, WriteB
     NativeBlockOutputStream block_out(out, 0, metadata_snapshot->getSampleBlock());
     part->checksums.write(out);
     block_out.write(part_in_memory->block);
+
+    data.getSendsThrottler()->add(part_in_memory->block.bytes());
 }
 
-void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuffer & out, int client_protocol_version)
+MergeTreeData::DataPart::Checksums Service::sendPartFromDisk(
+    const MergeTreeData::DataPartPtr & part,
+    WriteBuffer & out,
+    int client_protocol_version,
+    const std::map<String, std::shared_ptr<IMergeTreeDataPart>> & projections)
 {
     /// We'll take a list of files from the list of checksums.
     MergeTreeData::DataPart::Checksums checksums = part->checksums;
@@ -224,13 +272,31 @@ void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuf
 
     auto disk = part->volume->getDisk();
     MergeTreeData::DataPart::Checksums data_checksums;
+    for (const auto & [name, projection] : part->getProjectionParts())
+    {
+        // Get rid of projection files
+        checksums.files.erase(name + ".proj");
+        auto it = projections.find(name);
+        if (it != projections.end())
+        {
+            writeStringBinary(name, out);
+            MergeTreeData::DataPart::Checksums projection_checksum = sendPartFromDisk(it->second, out, client_protocol_version);
+            data_checksums.addFile(name + ".proj", projection_checksum.getTotalSizeOnDisk(), projection_checksum.getTotalChecksumUInt128());
+        }
+        else if (part->checksums.has(name + ".proj"))
+        {
+            // We don't send this projection, just add out checksum to bypass the following check
+            const auto & our_checksum = part->checksums.files.find(name + ".proj")->second;
+            data_checksums.addFile(name + ".proj", our_checksum.file_size, our_checksum.file_hash);
+        }
+    }
 
     writeBinary(checksums.files.size(), out);
     for (const auto & it : checksums.files)
     {
         String file_name = it.first;
 
-        String path = part->getFullRelativePath() + file_name;
+        String path = fs::path(part->getFullRelativePath()) / file_name;
 
         UInt64 size = disk->getFileSize(path);
 
@@ -239,7 +305,7 @@ void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuf
 
         auto file_in = disk->readFile(path);
         HashingWriteBuffer hashing_out(out);
-        copyData(*file_in, hashing_out, blocker.getCounter());
+        copyDataWithThrottler(*file_in, hashing_out, blocker.getCounter(), data.getSendsThrottler());
 
         if (blocker.isCancelled())
             throw Exception("Transferring part to replica was cancelled", ErrorCodes::ABORTED);
@@ -254,6 +320,7 @@ void Service::sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuf
     }
 
     part->checksums.checkEqual(data_checksums, false);
+    return data_checksums;
 }
 
 void Service::sendPartS3Metadata(const MergeTreeData::DataPartPtr & part, WriteBuffer & out)
@@ -279,22 +346,22 @@ void Service::sendPartS3Metadata(const MergeTreeData::DataPartPtr & part, WriteB
     {
         String file_name = it.first;
 
-        String metadata_file = disk->getPath() + part->getFullRelativePath() + file_name;
+        String metadata_file = fs::path(disk->getPath()) / part->getFullRelativePath() / file_name;
 
-        Poco::File metadata(metadata_file);
+        fs::path metadata(metadata_file);
 
-        if (!metadata.exists())
+        if (!fs::exists(metadata))
             throw Exception("S3 metadata '" + file_name + "' is not exists", ErrorCodes::CORRUPTED_DATA);
-        if (!metadata.isFile())
+        if (!fs::is_regular_file(metadata))
             throw Exception("S3 metadata '" + file_name + "' is not a file", ErrorCodes::CORRUPTED_DATA);
-        UInt64 file_size = metadata.getSize();
+        UInt64 file_size = fs::file_size(metadata);
 
         writeStringBinary(it.first, out);
         writeBinary(file_size, out);
 
         auto file_in = createReadBufferFromFileBase(metadata_file, 0, 0, 0, nullptr, DBMS_DEFAULT_BUFFER_SIZE);
         HashingWriteBuffer hashing_out(out);
-        copyData(*file_in, hashing_out, blocker.getCounter());
+        copyDataWithThrottler(*file_in, hashing_out, blocker.getCounter(), data.getSendsThrottler());
         if (blocker.isCancelled())
             throw Exception("Transferring part to replica was cancelled", ErrorCodes::ABORTED);
 
@@ -319,6 +386,7 @@ MergeTreeData::DataPartPtr Service::findPart(const String & name)
 
 MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
     const String & part_name,
     const String & replica_path,
     const String & host,
@@ -327,6 +395,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     const String & user,
     const String & password,
     const String & interserver_scheme,
+    ThrottlerPtr throttler,
     bool to_detached,
     const String & tmp_prefix_,
     std::optional<CurrentlySubmergingEmergingTagger> * tagger_ptr,
@@ -348,7 +417,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     {
         {"endpoint",                getEndpointId(replica_path)},
         {"part",                    part_name},
-        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_PARTS_S3_COPY)},
+        {"client_protocol_version", toString(REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION)},
         {"compress",                "false"}
     });
 
@@ -410,29 +479,58 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
         size_t sum_files_size = 0;
         readBinary(sum_files_size, in);
         IMergeTreeDataPart::TTLInfos ttl_infos;
-        /// Skip ttl infos, not required for S3 metadata
         String ttl_infos_string;
         readBinary(ttl_infos_string, in);
+        ReadBufferFromString ttl_infos_buffer(ttl_infos_string);
+        assertString("ttl format version: 1\n", ttl_infos_buffer);
+        ttl_infos.read(ttl_infos_buffer);
+
+        ReservationPtr reservation
+            = data.balancedReservation(metadata_snapshot, sum_files_size, 0, part_name, part_info, {}, tagger_ptr, &ttl_infos, true);
+        if (!reservation)
+            reservation
+                = data.reserveSpacePreferringTTLRules(metadata_snapshot, sum_files_size, ttl_infos, std::time(nullptr), 0, true);
+        if (reservation)
+        {
+            /// When we have multi-volume storage, one of them was chosen, depends on TTL, free space, etc.
+            /// Chosen one may be S3 or not.
+            DiskPtr disk = reservation->getDisk();
+            if (disk && disk->getType() == DiskType::Type::S3)
+            {
+                for (const auto & d : disks_s3)
+                {
+                    if (d->getPath() == disk->getPath())
+                    {
+                        Disks disks_tmp = { disk };
+                        disks_s3.swap(disks_tmp);
+                        break;
+                    }
+                }
+            }
+        }
+
         String part_type = "Wide";
         readStringBinary(part_type, in);
         if (part_type == "InMemory")
             throw Exception("Got 'send_s3_metadata' cookie for in-memory part", ErrorCodes::INCORRECT_PART_TYPE);
 
         UUID part_uuid = UUIDHelpers::Nil;
-        if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID)
+
+        /// Always true due to values of constants. But we keep this condition just in case.
+        if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID) //-V547
             readUUIDText(part_uuid, in);
 
         try
         {
-            return downloadPartToS3(part_name, replica_path, to_detached, tmp_prefix_, std::move(disks_s3), in);
+            return downloadPartToS3(part_name, replica_path, to_detached, tmp_prefix_, std::move(disks_s3), in, throttler);
         }
         catch (const Exception & e)
         {
             if (e.code() != ErrorCodes::S3_ERROR)
                 throw;
             /// Try again but without S3 copy
-            return fetchPart(metadata_snapshot, part_name, replica_path, host, port, timeouts,
-                user, password, interserver_scheme, to_detached, tmp_prefix_, nullptr, false);
+            return fetchPart(metadata_snapshot, context, part_name, replica_path, host, port, timeouts,
+                user, password, interserver_scheme, throttler, to_detached, tmp_prefix_, nullptr, false);
         }
     }
 
@@ -480,8 +578,8 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
         readUUIDText(part_uuid, in);
 
     auto storage_id = data.getStorageID();
-    String new_part_path = part_type == "InMemory" ? "memory" : data.getFullPathOnDisk(reservation->getDisk()) + part_name + "/";
-    auto entry = data.global_context.getReplicatedFetchList().insert(
+    String new_part_path = part_type == "InMemory" ? "memory" : fs::path(data.getFullPathOnDisk(reservation->getDisk())) / part_name / "";
+    auto entry = data.getContext()->getReplicatedFetchList().insert(
         storage_id.getDatabaseName(), storage_id.getTableName(),
         part_info.partition_id, part_name, new_part_path,
         replica_path, uri, to_detached, sum_files_size);
@@ -489,35 +587,82 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     in.setNextCallback(ReplicatedFetchReadCallback(*entry));
 
 
-    return part_type == "InMemory" ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, std::move(reservation), in)
-                                   : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, std::move(reservation), in);
+    size_t projections = 0;
+    if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION)
+        readBinary(projections, in);
+
+    MergeTreeData::DataPart::Checksums checksums;
+    return part_type == "InMemory"
+        ? downloadPartToMemory(part_name, part_uuid, metadata_snapshot, context, std::move(reservation), in, projections, throttler)
+        : downloadPartToDisk(part_name, replica_path, to_detached, tmp_prefix_, sync, reservation->getDisk(), in, projections, checksums, throttler);
 }
 
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     const String & part_name,
     const UUID & part_uuid,
     const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
     ReservationPtr reservation,
-    PooledReadWriteBufferFromHTTP & in)
+    PooledReadWriteBufferFromHTTP & in,
+    size_t projections,
+    ThrottlerPtr throttler)
 {
+    auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, reservation->getDisk(), 0);
+    MergeTreeData::MutableDataPartPtr new_data_part =
+        std::make_shared<MergeTreeDataPartInMemory>(data, part_name, volume);
+
+    for (auto i = 0ul; i < projections; ++i)
+    {
+        String projection_name;
+        readStringBinary(projection_name, in);
+        MergeTreeData::DataPart::Checksums checksums;
+        if (!checksums.read(in))
+            throw Exception("Cannot deserialize checksums", ErrorCodes::CORRUPTED_DATA);
+
+        NativeBlockInputStream block_in(in, 0);
+        auto block = block_in.read();
+        throttler->add(block.bytes());
+
+        MergeTreePartInfo new_part_info("all", 0, 0, 0);
+        MergeTreeData::MutableDataPartPtr new_projection_part =
+            std::make_shared<MergeTreeDataPartInMemory>(data, projection_name, new_part_info, volume, projection_name, new_data_part.get());
+
+        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);
+
+        MergedBlockOutputStream part_out(
+            new_projection_part,
+            metadata_snapshot->projections.get(projection_name).metadata,
+            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);
+        new_data_part->addProjectionPart(projection_name, std::move(new_projection_part));
+    }
+
     MergeTreeData::DataPart::Checksums checksums;
     if (!checksums.read(in))
         throw Exception("Cannot deserialize checksums", ErrorCodes::CORRUPTED_DATA);
 
     NativeBlockInputStream block_in(in, 0);
     auto block = block_in.read();
-
-    auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, reservation->getDisk(), 0);
-    MergeTreeData::MutableDataPartPtr new_data_part =
-        std::make_shared<MergeTreeDataPartInMemory>(data, part_name, volume);
+    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->partition.create(metadata_snapshot, block, 0);
+    new_data_part->partition.create(metadata_snapshot, block, 0, context);
 
-    MergedBlockOutputStream part_out(new_data_part, metadata_snapshot, block.getNamesAndTypesList(), {}, CompressionCodecFactory::instance().get("NONE", {}));
+    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);
@@ -526,25 +671,81 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     return new_data_part;
 }
 
+void Fetcher::downloadBaseOrProjectionPartToDisk(
+    const String & replica_path,
+    const String & part_download_path,
+    bool sync,
+    DiskPtr disk,
+    PooledReadWriteBufferFromHTTP & in,
+    MergeTreeData::DataPart::Checksums & checksums,
+    ThrottlerPtr throttler) const
+{
+    size_t files;
+    readBinary(files, in);
+
+    for (size_t i = 0; i < files; ++i)
+    {
+        String file_name;
+        UInt64 file_size;
+
+        readStringBinary(file_name, in);
+        readBinary(file_size, in);
+
+        /// File must be inside "absolute_part_path" directory.
+        /// Otherwise malicious ClickHouse replica may force us to write to arbitrary path.
+        String absolute_file_path = fs::weakly_canonical(fs::path(part_download_path) / file_name);
+        if (!startsWith(absolute_file_path, fs::weakly_canonical(part_download_path).string()))
+            throw Exception("File path (" + absolute_file_path + ") doesn't appear to be inside part path (" + part_download_path + ")."
+                " This may happen if we are trying to download part from malicious replica or logical error.",
+                ErrorCodes::INSECURE_PATH);
+
+        auto file_out = disk->writeFile(fs::path(part_download_path) / file_name);
+        HashingWriteBuffer hashing_out(*file_out);
+        copyDataWithThrottler(in, hashing_out, file_size, blocker.getCounter(), throttler);
+
+        if (blocker.isCancelled())
+        {
+            /// NOTE The is_cancelled flag also makes sense to check every time you read over the network,
+            /// performing a poll with a not very large timeout.
+            /// And now we check it only between read chunks (in the `copyData` function).
+            disk->removeRecursive(part_download_path);
+            throw Exception("Fetching of part was cancelled", ErrorCodes::ABORTED);
+        }
+
+        MergeTreeDataPartChecksum::uint128 expected_hash;
+        readPODBinary(expected_hash, in);
+
+        if (expected_hash != hashing_out.getHash())
+            throw Exception("Checksum mismatch for file " + fullPath(disk, (fs::path(part_download_path) / file_name).string()) + " transferred from " + replica_path,
+                ErrorCodes::CHECKSUM_DOESNT_MATCH);
+
+        if (file_name != "checksums.txt" &&
+            file_name != "columns.txt" &&
+            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
+            checksums.addFile(file_name, file_size, expected_hash);
+
+        if (sync)
+            hashing_out.sync();
+    }
+}
+
 MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     const String & part_name,
     const String & replica_path,
     bool to_detached,
     const String & tmp_prefix_,
     bool sync,
-    const ReservationPtr reservation,
-    PooledReadWriteBufferFromHTTP & in)
+    DiskPtr disk,
+    PooledReadWriteBufferFromHTTP & in,
+    size_t projections,
+    MergeTreeData::DataPart::Checksums & checksums,
+    ThrottlerPtr throttler)
 {
-    size_t files;
-    readBinary(files, in);
-
-    auto disk = reservation->getDisk();
-
     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.
-    if (tmp_prefix.empty()
+    if (tmp_prefix.empty() //-V560
         || part_name.empty()
         || std::string::npos != tmp_prefix.find_first_of("/.")
         || std::string::npos != part_name.find_first_of("/."))
@@ -566,61 +767,30 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     if (data.getSettings()->fsync_part_directory)
         sync_guard = disk->getDirectorySyncGuard(part_download_path);
 
-    MergeTreeData::DataPart::Checksums checksums;
-    for (size_t i = 0; i < files; ++i)
+    CurrentMetrics::Increment metric_increment{CurrentMetrics::ReplicatedFetch};
+
+    for (auto i = 0ul; i < projections; ++i)
     {
-        String file_name;
-        UInt64 file_size;
-
-        readStringBinary(file_name, in);
-        readBinary(file_size, in);
-
-        /// File must be inside "absolute_part_path" directory.
-        /// Otherwise malicious ClickHouse replica may force us to write to arbitrary path.
-        String absolute_file_path = Poco::Path(part_download_path + file_name).absolute().toString();
-        if (!startsWith(absolute_file_path, Poco::Path(part_download_path).absolute().toString()))
-            throw Exception("File path (" + absolute_file_path + ") doesn't appear to be inside part path (" + part_download_path + ")."
-                " This may happen if we are trying to download part from malicious replica or logical error.",
-                ErrorCodes::INSECURE_PATH);
-
-        auto file_out = disk->writeFile(part_download_path + file_name);
-        HashingWriteBuffer hashing_out(*file_out);
-        copyData(in, hashing_out, file_size, blocker.getCounter());
-
-        if (blocker.isCancelled())
-        {
-            /// NOTE The is_cancelled flag also makes sense to check every time you read over the network,
-            /// performing a poll with a not very large timeout.
-            /// And now we check it only between read chunks (in the `copyData` function).
-            disk->removeRecursive(part_download_path);
-            throw Exception("Fetching of part was cancelled", ErrorCodes::ABORTED);
-        }
-
-        MergeTreeDataPartChecksum::uint128 expected_hash;
-        readPODBinary(expected_hash, in);
-
-        if (expected_hash != hashing_out.getHash())
-            throw Exception("Checksum mismatch for file " + fullPath(disk, part_download_path + file_name) + " transferred from " + replica_path,
-                ErrorCodes::CHECKSUM_DOESNT_MATCH);
-
-        if (file_name != "checksums.txt" &&
-            file_name != "columns.txt" &&
-            file_name != IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME)
-            checksums.addFile(file_name, file_size, expected_hash);
-
-        if (sync)
-            hashing_out.sync();
+        String projection_name;
+        readStringBinary(projection_name, in);
+        MergeTreeData::DataPart::Checksums projection_checksum;
+        disk->createDirectories(part_download_path + projection_name + ".proj/");
+        downloadBaseOrProjectionPartToDisk(
+            replica_path, part_download_path + projection_name + ".proj/", sync, disk, in, projection_checksum, throttler);
+        checksums.addFile(
+            projection_name + ".proj", projection_checksum.getTotalSizeOnDisk(), projection_checksum.getTotalChecksumUInt128());
     }
 
-    assertEOF(in);
+    // Download the base part
+    downloadBaseOrProjectionPartToDisk(replica_path, part_download_path, sync, disk, in, checksums, throttler);
 
+    assertEOF(in);
     auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
     MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(part_name, volume, part_relative_path);
     new_data_part->is_temp = true;
     new_data_part->modification_time = time(nullptr);
     new_data_part->loadColumnsChecksumsIndexes(true, false);
     new_data_part->checksums.checkEqual(checksums, false);
-
     return new_data_part;
 }
 
@@ -630,8 +800,8 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToS3(
     bool to_detached,
     const String & tmp_prefix_,
     const Disks & disks_s3,
-    PooledReadWriteBufferFromHTTP & in
-    )
+    PooledReadWriteBufferFromHTTP & in,
+    ThrottlerPtr throttler)
 {
     if (disks_s3.empty())
         throw Exception("No S3 disks anymore", ErrorCodes::LOGICAL_ERROR);
@@ -654,7 +824,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToS3(
     String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
 
     String part_relative_path = String(to_detached ? "detached/" : "") + tmp_prefix + part_name;
-    String part_download_path = data.getRelativeDataPath() + part_relative_path + "/";
+    String part_download_path = fs::path(data.getRelativeDataPath()) / part_relative_path / "";
 
     if (disk->exists(part_download_path))
         throw Exception("Directory " + fullPath(disk, part_download_path) + " already exists.", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
@@ -667,7 +837,6 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToS3(
     readBinary(files, in);
 
     auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk);
-    MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(part_name, volume, part_relative_path);
 
     for (size_t i = 0; i < files; ++i)
     {
@@ -677,7 +846,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToS3(
         readStringBinary(file_name, in);
         readBinary(file_size, in);
 
-        String data_path = new_data_part->getFullRelativePath() + file_name;
+        String data_path = fs::path(part_download_path) / file_name;
         String metadata_file = fullPath(disk, data_path);
 
         {
@@ -685,7 +854,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToS3(
 
             HashingWriteBuffer hashing_out(*file_out);
 
-            copyData(in, hashing_out, file_size, blocker.getCounter());
+            copyDataWithThrottler(in, hashing_out, file_size, blocker.getCounter(), throttler);
 
             if (blocker.isCancelled())
             {
@@ -709,6 +878,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToS3(
 
     assertEOF(in);
 
+    MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(part_name, volume, part_relative_path);
     new_data_part->is_temp = true;
     new_data_part->modification_time = time(nullptr);
     new_data_part->loadColumnsChecksumsIndexes(true, false);
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index e9b3d443fcd..eb776c33f0f 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -7,6 +7,7 @@
 #include <IO/copyData.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
+#include <Common/Throttler.h>
 
 
 namespace zkutil
@@ -18,15 +19,17 @@ namespace zkutil
 namespace DB
 {
 
+class StorageReplicatedMergeTree;
+
 namespace DataPartsExchange
 {
 
-/** Service for sending parts from the table *MergeTree.
+/** Service for sending parts from the table *ReplicatedMergeTree.
   */
 class Service final : public InterserverIOEndpoint
 {
 public:
-    explicit Service(MergeTreeData & data_) : data(data_), log(&Poco::Logger::get(data.getLogName() + " (Replicated PartsService)")) {}
+    explicit Service(StorageReplicatedMergeTree & data_);
 
     Service(const Service &) = delete;
     Service & operator=(const Service &) = delete;
@@ -36,13 +39,22 @@ public:
 
 private:
     MergeTreeData::DataPartPtr findPart(const String & name);
-    void sendPartFromMemory(const MergeTreeData::DataPartPtr & part, WriteBuffer & out);
-    void sendPartFromDisk(const MergeTreeData::DataPartPtr & part, WriteBuffer & out, int client_protocol_version);
+    void sendPartFromMemory(
+        const MergeTreeData::DataPartPtr & part,
+        WriteBuffer & out,
+        const std::map<String, std::shared_ptr<IMergeTreeDataPart>> & projections = {});
+
+    MergeTreeData::DataPart::Checksums sendPartFromDisk(
+        const MergeTreeData::DataPartPtr & part,
+        WriteBuffer & out,
+        int client_protocol_version,
+        const std::map<String, std::shared_ptr<IMergeTreeDataPart>> & projections = {});
+
     void sendPartS3Metadata(const MergeTreeData::DataPartPtr & part, WriteBuffer & out);
 
     /// StorageReplicatedMergeTree::shutdown() waits for all parts exchange handlers to finish,
     /// so Service will never access dangling reference to storage
-    MergeTreeData & data;
+    StorageReplicatedMergeTree & data;
     Poco::Logger * log;
 };
 
@@ -56,6 +68,7 @@ public:
     /// Downloads a part to tmp_directory. If to_detached - downloads to the `detached` directory.
     MergeTreeData::MutableDataPartPtr fetchPart(
         const StorageMetadataPtr & metadata_snapshot,
+        ContextPtr context,
         const String & part_name,
         const String & replica_path,
         const String & host,
@@ -64,6 +77,7 @@ public:
         const String & user,
         const String & password,
         const String & interserver_scheme,
+        ThrottlerPtr throttler,
         bool to_detached = false,
         const String & tmp_prefix_ = "",
         std::optional<CurrentlySubmergingEmergingTagger> * tagger_ptr = nullptr,
@@ -74,21 +88,37 @@ public:
     ActionBlocker blocker;
 
 private:
+    void downloadBaseOrProjectionPartToDisk(
+            const String & replica_path,
+            const String & part_download_path,
+            bool sync,
+            DiskPtr disk,
+            PooledReadWriteBufferFromHTTP & in,
+            MergeTreeData::DataPart::Checksums & checksums,
+            ThrottlerPtr throttler) const;
+
+
     MergeTreeData::MutableDataPartPtr downloadPartToDisk(
             const String & part_name,
             const String & replica_path,
             bool to_detached,
             const String & tmp_prefix_,
             bool sync,
-            ReservationPtr reservation,
-            PooledReadWriteBufferFromHTTP & in);
+            DiskPtr disk,
+            PooledReadWriteBufferFromHTTP & in,
+            size_t projections,
+            MergeTreeData::DataPart::Checksums & checksums,
+            ThrottlerPtr throttler);
 
     MergeTreeData::MutableDataPartPtr downloadPartToMemory(
             const String & part_name,
             const UUID & part_uuid,
             const StorageMetadataPtr & metadata_snapshot,
+            ContextPtr context,
             ReservationPtr reservation,
-            PooledReadWriteBufferFromHTTP & in);
+            PooledReadWriteBufferFromHTTP & in,
+            size_t projections,
+            ThrottlerPtr throttler);
 
     MergeTreeData::MutableDataPartPtr downloadPartToS3(
             const String & part_name,
@@ -96,7 +126,8 @@ private:
             bool to_detached,
             const String & tmp_prefix_,
             const Disks & disks_s3,
-            PooledReadWriteBufferFromHTTP & in);
+            PooledReadWriteBufferFromHTTP & in,
+            ThrottlerPtr throttler);
 
     MergeTreeData & data;
     Poco::Logger * log;
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index c79e754f61a..703cf32f743 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -69,7 +69,7 @@ void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const Dis
     hyperrectangle.reserve(minmax_idx_size);
     for (size_t i = 0; i < minmax_idx_size; ++i)
     {
-        String file_name = part_path + "minmax_" + escapeForFileName(minmax_column_names[i]) + ".idx";
+        String file_name = fs::path(part_path) / ("minmax_" + escapeForFileName(minmax_column_names[i]) + ".idx");
         auto file = openForReading(disk_, file_name);
         auto serialization = minmax_column_types[i]->getDefaultSerialization();
 
@@ -111,7 +111,7 @@ void IMergeTreeDataPart::MinMaxIndex::store(
         String file_name = "minmax_" + escapeForFileName(column_names[i]) + ".idx";
         auto serialization = data_types.at(i)->getDefaultSerialization();
 
-        auto out = disk_->writeFile(part_path + file_name);
+        auto out = disk_->writeFile(fs::path(part_path) / file_name);
         HashingWriteBuffer out_hashing(*out);
         serialization->serializeBinary(hyperrectangle[i].left, out_hashing);
         serialization->serializeBinary(hyperrectangle[i].right, out_hashing);
@@ -255,15 +255,23 @@ static void decrementTypeMetric(MergeTreeDataPartType type)
 
 
 IMergeTreeDataPart::IMergeTreeDataPart(
-    MergeTreeData & storage_, const String & name_, const VolumePtr & volume_, const std::optional<String> & relative_path_, Type part_type_)
+    MergeTreeData & storage_,
+    const String & name_,
+    const VolumePtr & volume_,
+    const std::optional<String> & relative_path_,
+    Type part_type_,
+    const IMergeTreeDataPart * parent_part_)
     : storage(storage_)
     , name(name_)
     , info(MergeTreePartInfo::fromPartName(name_, storage.format_version))
-    , volume(volume_)
+    , volume(parent_part_ ? parent_part_->volume : volume_)
     , relative_path(relative_path_.value_or(name_))
     , index_granularity_info(storage_, part_type_)
     , part_type(part_type_)
+    , parent_part(parent_part_)
 {
+    if (parent_part)
+        state = State::Committed;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
 }
@@ -274,15 +282,19 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     const MergeTreePartInfo & info_,
     const VolumePtr & volume_,
     const std::optional<String> & relative_path_,
-    Type part_type_)
+    Type part_type_,
+    const IMergeTreeDataPart * parent_part_)
     : storage(storage_)
     , name(name_)
     , info(info_)
-    , volume(volume_)
+    , volume(parent_part_ ? parent_part_->volume : volume_)
     , relative_path(relative_path_.value_or(name_))
     , index_granularity_info(storage_, part_type_)
     , part_type(part_type_)
+    , parent_part(parent_part_)
 {
+    if (parent_part)
+        state = State::Committed;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
 }
@@ -416,7 +428,10 @@ void IMergeTreeDataPart::removeIfNeeded()
                 }
             }
 
-            remove(false);
+            if (parent_part)
+                projectionRemove(parent_part->getFullRelativePath(), keep_s3_on_delete);
+            else
+                remove(keep_s3_on_delete);
 
             if (state == State::DeleteOnDestroy)
             {
@@ -509,7 +524,9 @@ size_t IMergeTreeDataPart::getFileSizeOrZero(const String & file_name) const
 String IMergeTreeDataPart::getColumnNameWithMinimumCompressedSize(const StorageMetadataPtr & metadata_snapshot) const
 {
     const auto & storage_columns = metadata_snapshot->getColumns().getAllPhysical();
-    auto alter_conversions = storage.getAlterConversionsForPart(shared_from_this());
+    MergeTreeData::AlterConversions alter_conversions;
+    if (!parent_part)
+        alter_conversions = storage.getAlterConversionsForPart(shared_from_this());
 
     std::optional<std::string> minimum_size_column;
     UInt64 minimum_size = std::numeric_limits<UInt64>::max();
@@ -543,7 +560,7 @@ String IMergeTreeDataPart::getFullPath() const
     if (relative_path.empty())
         throw Exception("Part relative_path cannot be empty. It's bug.", ErrorCodes::LOGICAL_ERROR);
 
-    return storage.getFullPathOnDisk(volume->getDisk()) + relative_path + "/";
+    return fs::path(storage.getFullPathOnDisk(volume->getDisk())) / (parent_part ? parent_part->relative_path : "") / relative_path / "";
 }
 
 String IMergeTreeDataPart::getFullRelativePath() const
@@ -551,7 +568,7 @@ String IMergeTreeDataPart::getFullRelativePath() const
     if (relative_path.empty())
         throw Exception("Part relative_path cannot be empty. It's bug.", ErrorCodes::LOGICAL_ERROR);
 
-    return storage.relative_data_path + relative_path + "/";
+    return fs::path(storage.relative_data_path) / (parent_part ? parent_part->relative_path : "") / relative_path / "";
 }
 
 void IMergeTreeDataPart::loadColumnsChecksumsIndexes(bool require_columns_checksums, bool check_consistency)
@@ -571,13 +588,33 @@ void IMergeTreeDataPart::loadColumnsChecksumsIndexes(bool require_columns_checks
     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();
-    loadTTLInfos();
+    if (!parent_part)
+    {
+        loadTTLInfos();
+        loadProjections(require_columns_checksums, check_consistency);
+    }
+
     if (check_consistency)
         checkConsistency(require_columns_checksums);
     loadDefaultCompressionCodec();
 
 }
 
+void IMergeTreeDataPart::loadProjections(bool require_columns_checksums, bool check_consistency)
+{
+    auto metadata_snapshot = storage.getInMemoryMetadataPtr();
+    for (const auto & projection : metadata_snapshot->projections)
+    {
+        String path = getFullRelativePath() + projection.name + ".proj";
+        if (volume->getDisk()->exists(path))
+        {
+            auto part = storage.createPart(projection.name, {"all", 0, 0, 0}, volume, projection.name + ".proj", this);
+            part->loadColumnsChecksumsIndexes(require_columns_checksums, check_consistency);
+            projection_parts.emplace(projection.name, std::move(part));
+        }
+    }
+}
+
 void IMergeTreeDataPart::loadIndexGranularity()
 {
     throw Exception("Method 'loadIndexGranularity' is not implemented for part with type " + getType().toString(), ErrorCodes::NOT_IMPLEMENTED);
@@ -590,6 +627,8 @@ void IMergeTreeDataPart::loadIndex()
         throw Exception("Index granularity is not loaded before index loading", ErrorCodes::LOGICAL_ERROR);
 
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
+    if (parent_part)
+        metadata_snapshot = metadata_snapshot->projections.get(name).metadata;
     const auto & primary_key = metadata_snapshot->getPrimaryKey();
     size_t key_size = primary_key.column_names.size();
 
@@ -604,14 +643,18 @@ void IMergeTreeDataPart::loadIndex()
             loaded_index[i]->reserve(index_granularity.getMarksCount());
         }
 
-        String index_path = getFullRelativePath() + "primary.idx";
+        String index_path = fs::path(getFullRelativePath()) / "primary.idx";
         auto index_file = openForReading(volume->getDisk(), index_path);
 
         size_t marks_count = index_granularity.getMarksCount();
 
+        Serializations serializations(key_size);
+        for (size_t j = 0; j < key_size; ++j)
+            serializations[j] = primary_key.data_types[j]->getDefaultSerialization();
+
         for (size_t i = 0; i < marks_count; ++i) //-V756
             for (size_t j = 0; j < key_size; ++j)
-                primary_key.data_types[j]->getDefaultSerialization()->deserializeBinary(*loaded_index[j], *index_file);
+                serializations[j]->deserializeBinary(*loaded_index[j], *index_file);
 
         for (size_t i = 0; i < key_size; ++i)
         {
@@ -635,7 +678,7 @@ NameSet IMergeTreeDataPart::getFileNamesWithoutChecksums() const
         return {};
 
     NameSet result = {"checksums.txt", "columns.txt"};
-    String default_codec_path = getFullRelativePath() + DEFAULT_COMPRESSION_CODEC_FILE_NAME;
+    String default_codec_path = fs::path(getFullRelativePath()) / DEFAULT_COMPRESSION_CODEC_FILE_NAME;
 
     if (volume->getDisk()->exists(default_codec_path))
         result.emplace(DEFAULT_COMPRESSION_CODEC_FILE_NAME);
@@ -652,7 +695,7 @@ void IMergeTreeDataPart::loadDefaultCompressionCodec()
         return;
     }
 
-    String path = getFullRelativePath() + DEFAULT_COMPRESSION_CODEC_FILE_NAME;
+    String path = fs::path(getFullRelativePath()) / DEFAULT_COMPRESSION_CODEC_FILE_NAME;
     if (!volume->getDisk()->exists(path))
     {
         default_codec = detectDefaultCompressionCodec();
@@ -713,7 +756,7 @@ CompressionCodecPtr IMergeTreeDataPart::detectDefaultCompressionCodec() const
             {
                 if (path_to_data_file.empty())
                 {
-                    String candidate_path = getFullRelativePath() + ISerialization::getFileNameForStream(part_column, substream_path) + ".bin";
+                    String candidate_path = fs::path(getFullRelativePath()) / (ISerialization::getFileNameForStream(part_column, substream_path) + ".bin");
 
                     /// We can have existing, but empty .bin files. Example: LowCardinality(Nullable(...)) columns and column_name.dict.null.bin file.
                     if (volume->getDisk()->exists(candidate_path) && volume->getDisk()->getFileSize(candidate_path) != 0)
@@ -740,7 +783,7 @@ CompressionCodecPtr IMergeTreeDataPart::detectDefaultCompressionCodec() const
 
 void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
 {
-    if (storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+    if (storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING && !parent_part)
     {
         DayNum min_date;
         DayNum max_date;
@@ -753,9 +796,19 @@ void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
     else
     {
         String path = getFullRelativePath();
-        partition.load(storage, volume->getDisk(), path);
+        if (!parent_part)
+            partition.load(storage, volume->getDisk(), path);
+
         if (!isEmpty())
-            minmax_idx.load(storage, volume->getDisk(), path);
+        {
+            if (parent_part)
+                // projection parts don't have minmax_idx, and it's always initialized
+                minmax_idx.initialized = true;
+            else
+                minmax_idx.load(storage, volume->getDisk(), path);
+        }
+        if (parent_part)
+            return;
     }
 
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
@@ -769,7 +822,7 @@ void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
 
 void IMergeTreeDataPart::loadChecksums(bool require)
 {
-    const String path = getFullRelativePath() + "checksums.txt";
+    const String path = fs::path(getFullRelativePath()) / "checksums.txt";
 
     if (volume->getDisk()->exists(path))
     {
@@ -794,11 +847,11 @@ void IMergeTreeDataPart::loadChecksums(bool require)
         checksums = checkDataPart(shared_from_this(), false);
 
         {
-            auto out = volume->getDisk()->writeFile(getFullRelativePath() + "checksums.txt.tmp", 4096);
+            auto out = volume->getDisk()->writeFile(fs::path(getFullRelativePath()) / "checksums.txt.tmp", 4096);
             checksums.write(*out);
         }
 
-        volume->getDisk()->moveFile(getFullRelativePath() + "checksums.txt.tmp", getFullRelativePath() + "checksums.txt");
+        volume->getDisk()->moveFile(fs::path(getFullRelativePath()) / "checksums.txt.tmp", fs::path(getFullRelativePath()) / "checksums.txt");
 
         bytes_on_disk = checksums.getTotalSizeOnDisk();
     }
@@ -806,12 +859,12 @@ void IMergeTreeDataPart::loadChecksums(bool require)
 
 void IMergeTreeDataPart::loadRowsCount()
 {
-    String path = getFullRelativePath() + "count.txt";
+    String path = fs::path(getFullRelativePath()) / "count.txt";
     if (index_granularity.empty())
     {
         rows_count = 0;
     }
-    else if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || part_type == Type::COMPACT)
+    else if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || part_type == Type::COMPACT || parent_part)
     {
         if (!volume->getDisk()->exists(path))
             throw Exception("No count.txt in part " + name, ErrorCodes::NO_FILE_IN_DATA_PART);
@@ -907,7 +960,7 @@ void IMergeTreeDataPart::loadRowsCount()
 
 void IMergeTreeDataPart::loadTTLInfos()
 {
-    String path = getFullRelativePath() + "ttl.txt";
+    String path = fs::path(getFullRelativePath()) / "ttl.txt";
     if (volume->getDisk()->exists(path))
     {
         auto in = openForReading(volume->getDisk(), path);
@@ -934,7 +987,7 @@ void IMergeTreeDataPart::loadTTLInfos()
 
 void IMergeTreeDataPart::loadUUID()
 {
-    String path = getFullRelativePath() + UUID_FILE_NAME;
+    String path = fs::path(getFullRelativePath()) / UUID_FILE_NAME;
 
     if (volume->getDisk()->exists(path))
     {
@@ -947,8 +1000,10 @@ void IMergeTreeDataPart::loadUUID()
 
 void IMergeTreeDataPart::loadColumns(bool require)
 {
-    String path = getFullRelativePath() + "columns.txt";
+    String path = fs::path(getFullRelativePath()) / "columns.txt";
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
+    if (parent_part)
+        metadata_snapshot = metadata_snapshot->projections.get(name).metadata;
     NamesAndTypesList loaded_columns;
 
     if (!volume->getDisk()->exists(path))
@@ -960,7 +1015,7 @@ void IMergeTreeDataPart::loadColumns(bool require)
 
         /// If there is no file with a list of columns, write it down.
         for (const NameAndTypePair & column : metadata_snapshot->getColumns().getAllPhysical())
-            if (volume->getDisk()->exists(getFullRelativePath() + getFileNameForColumn(column) + ".bin"))
+            if (volume->getDisk()->exists(fs::path(getFullRelativePath()) / (getFileNameForColumn(column) + ".bin")))
                 loaded_columns.push_back(column);
 
         if (columns.empty())
@@ -998,7 +1053,7 @@ UInt64 IMergeTreeDataPart::calculateTotalSizeOnDisk(const DiskPtr & disk_, const
     disk_->listFiles(from, files);
     UInt64 res = 0;
     for (const auto & file : files)
-        res += calculateTotalSizeOnDisk(disk_, from + file);
+        res += calculateTotalSizeOnDisk(disk_, fs::path(from) / file);
     return res;
 }
 
@@ -1008,7 +1063,7 @@ void IMergeTreeDataPart::renameTo(const String & new_relative_path, bool remove_
     assertOnDisk();
 
     String from = getFullRelativePath();
-    String to = storage.relative_data_path + new_relative_path + "/";
+    String to = fs::path(storage.relative_data_path) / (parent_part ? parent_part->relative_path : "") / new_relative_path / "";
 
     if (!volume->getDisk()->exists(from))
         throw Exception("Part directory " + fullPath(volume->getDisk(), from) + " doesn't exist. Most likely it is a logical error.", ErrorCodes::FILE_DOESNT_EXIST);
@@ -1050,6 +1105,13 @@ void IMergeTreeDataPart::remove(bool keep_s3) const
     if (relative_path.empty())
         throw Exception("Part relative_path cannot be empty. This is bug.", ErrorCodes::LOGICAL_ERROR);
 
+    if (isProjectionPart())
+    {
+        LOG_WARNING(storage.log, "Projection part {} should be removed by its parent {}.", name, parent_part->name);
+        projectionRemove(parent_part->getFullRelativePath(), keep_s3);
+        return;
+    }
+
     /** Atomic directory removal:
       * - rename directory to temporary name;
       * - remove it recursive.
@@ -1062,40 +1124,52 @@ void IMergeTreeDataPart::remove(bool keep_s3) const
       * And a race condition can happen that will lead to "File not found" error here.
       */
 
-    String from = storage.relative_data_path + relative_path;
-    String to = storage.relative_data_path + "delete_tmp_" + name;
+    fs::path from = fs::path(storage.relative_data_path) / relative_path;
+    fs::path to = fs::path(storage.relative_data_path) / ("delete_tmp_" + name);
     // TODO directory delete_tmp_<name> is never removed if server crashes before returning from this function
 
-    if (volume->getDisk()->exists(to))
+    auto disk = volume->getDisk();
+    if (disk->exists(to))
     {
-        LOG_WARNING(storage.log, "Directory {} (to which part must be renamed before removing) already exists. Most likely this is due to unclean restart. Removing it.", fullPath(volume->getDisk(), to));
-
+        LOG_WARNING(storage.log, "Directory {} (to which part must be renamed before removing) already exists. Most likely this is due to unclean restart. Removing it.", fullPath(disk, to));
         try
         {
-            volume->getDisk()->removeSharedRecursive(to + "/", keep_s3);
+            disk->removeSharedRecursive(fs::path(to) / "", keep_s3);
         }
         catch (...)
         {
-            LOG_ERROR(storage.log, "Cannot recursively remove directory {}. Exception: {}", fullPath(volume->getDisk(), to), getCurrentExceptionMessage(false));
+            LOG_ERROR(storage.log, "Cannot recursively remove directory {}. Exception: {}", fullPath(disk, to), getCurrentExceptionMessage(false));
             throw;
         }
     }
 
     try
     {
-        volume->getDisk()->moveDirectory(from, to);
+        disk->moveDirectory(from, to);
     }
-    catch (const Poco::FileNotFoundException &)
+    catch (const fs::filesystem_error & e)
     {
-        LOG_ERROR(storage.log, "Directory {} (part to remove) doesn't exist or one of nested files has gone. Most likely this is due to manual removing. This should be discouraged. Ignoring.", fullPath(volume->getDisk(), to));
-
-        return;
+        if (e.code() == std::errc::no_such_file_or_directory)
+        {
+            LOG_ERROR(storage.log, "Directory {} (part to remove) doesn't exist or one of nested files has gone. Most likely this is due to manual removing. This should be discouraged. Ignoring.", fullPath(disk, to));
+            return;
+        }
+        throw;
     }
 
+    // Record existing projection directories so we don't remove them twice
+    std::unordered_set<String> projection_directories;
+    for (const auto & [p_name, projection_part] : projection_parts)
+    {
+        projection_part->projectionRemove(to, keep_s3);
+        projection_directories.emplace(p_name + ".proj");
+    }
+
+
     if (checksums.empty())
     {
         /// If the part is not completely written, we cannot use fast path by listing files.
-        volume->getDisk()->removeSharedRecursive(to + "/", keep_s3);
+        disk->removeSharedRecursive(fs::path(to) / "", keep_s3);
     }
     else
     {
@@ -1103,35 +1177,87 @@ void IMergeTreeDataPart::remove(bool keep_s3) const
         {
             /// Remove each expected file in directory, then remove directory itself.
 
-    #if !__clang__
+    #if !defined(__clang__)
     #    pragma GCC diagnostic push
     #    pragma GCC diagnostic ignored "-Wunused-variable"
     #endif
             for (const auto & [file, _] : checksums.files)
-                volume->getDisk()->removeSharedFile(to + "/" + file, keep_s3);
-    #if !__clang__
+            {
+                if (projection_directories.find(file) == projection_directories.end())
+                    disk->removeSharedFile(fs::path(to) / file, keep_s3);
+            }
+    #if !defined(__clang__)
     #    pragma GCC diagnostic pop
     #endif
 
             for (const auto & file : {"checksums.txt", "columns.txt"})
-                volume->getDisk()->removeSharedFile(to + "/" + file, keep_s3);
+                disk->removeSharedFile(fs::path(to) / file, keep_s3);
 
-            volume->getDisk()->removeSharedFileIfExists(to + "/" + DEFAULT_COMPRESSION_CODEC_FILE_NAME, keep_s3);
-            volume->getDisk()->removeSharedFileIfExists(to + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME, keep_s3);
+            disk->removeSharedFileIfExists(fs::path(to) / DEFAULT_COMPRESSION_CODEC_FILE_NAME, keep_s3);
+            disk->removeSharedFileIfExists(fs::path(to) / DELETE_ON_DESTROY_MARKER_FILE_NAME, keep_s3);
 
-            volume->getDisk()->removeDirectory(to);
+            disk->removeDirectory(to);
         }
         catch (...)
         {
             /// Recursive directory removal does many excessive "stat" syscalls under the hood.
 
-            LOG_ERROR(storage.log, "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: {}", fullPath(volume->getDisk(), to), getCurrentExceptionMessage(false));
+            LOG_ERROR(storage.log, "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: {}", fullPath(disk, to), getCurrentExceptionMessage(false));
 
-            volume->getDisk()->removeSharedRecursive(to + "/", keep_s3);
+            disk->removeSharedRecursive(fs::path(to) / "", keep_s3);
         }
     }
 }
 
+
+void IMergeTreeDataPart::projectionRemove(const String & parent_to, bool keep_s3) const
+{
+    String to = parent_to + "/" + relative_path;
+    auto disk = volume->getDisk();
+    if (checksums.empty())
+    {
+
+        LOG_ERROR(
+            storage.log,
+            "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: checksums.txt is missing",
+            fullPath(disk, to));
+        /// If the part is not completely written, we cannot use fast path by listing files.
+        disk->removeSharedRecursive(to + "/", keep_s3);
+    }
+    else
+    {
+        try
+        {
+            /// Remove each expected file in directory, then remove directory itself.
+
+    #if !defined(__clang__)
+    #    pragma GCC diagnostic push
+    #    pragma GCC diagnostic ignored "-Wunused-variable"
+    #endif
+            for (const auto & [file, _] : checksums.files)
+                disk->removeSharedFile(to + "/" + file, keep_s3);
+    #if !defined(__clang__)
+    #    pragma GCC diagnostic pop
+    #endif
+
+            for (const auto & file : {"checksums.txt", "columns.txt"})
+                disk->removeSharedFile(to + "/" + file, keep_s3);
+            disk->removeSharedFileIfExists(to + "/" + DEFAULT_COMPRESSION_CODEC_FILE_NAME, keep_s3);
+            disk->removeSharedFileIfExists(to + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME, keep_s3);
+
+            disk->removeSharedRecursive(to, keep_s3);
+        }
+        catch (...)
+        {
+            /// Recursive directory removal does many excessive "stat" syscalls under the hood.
+
+            LOG_ERROR(storage.log, "Cannot quickly remove directory {} by removing files; fallback to recursive removal. Reason: {}", fullPath(disk, to), getCurrentExceptionMessage(false));
+
+            disk->removeSharedRecursive(to + "/", keep_s3);
+         }
+     }
+ }
+
 String IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix) const
 {
     String res;
@@ -1145,7 +1271,7 @@ String IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix) const
     {
         res = (prefix.empty() ? "" : prefix + "_") + name + (try_no ? "_try" + DB::toString(try_no) : "");
 
-        if (!volume->getDisk()->exists(getFullRelativePath() + res))
+        if (!volume->getDisk()->exists(fs::path(getFullRelativePath()) / res))
             return res;
 
         LOG_WARNING(storage.log, "Directory {} (to detach to) already exists. Will detach to directory with '_tryN' suffix.", res);
@@ -1168,11 +1294,11 @@ void IMergeTreeDataPart::renameToDetached(const String & prefix) const
 
 void IMergeTreeDataPart::makeCloneInDetached(const String & prefix, const StorageMetadataPtr & /*metadata_snapshot*/) const
 {
-    String destination_path = storage.relative_data_path + getRelativePathForDetachedPart(prefix);
+    String destination_path = fs::path(storage.relative_data_path) / getRelativePathForDetachedPart(prefix);
 
     /// Backup is not recursive (max_level is 0), so do not copy inner directories
     localBackup(volume->getDisk(), getFullRelativePath(), destination_path, 0);
-    volume->getDisk()->removeFileIfExists(destination_path + "/" + DELETE_ON_DESTROY_MARKER_FILE_NAME);
+    volume->getDisk()->removeFileIfExists(fs::path(destination_path) / DELETE_ON_DESTROY_MARKER_FILE_NAME);
 }
 
 void IMergeTreeDataPart::makeCloneOnDisk(const DiskPtr & disk, const String & directory_name) const
@@ -1184,16 +1310,16 @@ void IMergeTreeDataPart::makeCloneOnDisk(const DiskPtr & disk, const String & di
     if (directory_name.empty())
         throw Exception("Can not clone data part " + name + " to empty directory.", ErrorCodes::LOGICAL_ERROR);
 
-    String path_to_clone = storage.relative_data_path + directory_name + '/';
+    String path_to_clone = fs::path(storage.relative_data_path) / directory_name / "";
 
-    if (disk->exists(path_to_clone + relative_path))
+    if (disk->exists(fs::path(path_to_clone) / relative_path))
     {
         LOG_WARNING(storage.log, "Path " + fullPath(disk, path_to_clone + relative_path) + " already exists. Will remove it and clone again.");
-        disk->removeRecursive(path_to_clone + relative_path + '/');
+        disk->removeRecursive(fs::path(path_to_clone) / relative_path / "");
     }
     disk->createDirectories(path_to_clone);
     volume->getDisk()->copy(getFullRelativePath(), disk, path_to_clone);
-    volume->getDisk()->removeFileIfExists(path_to_clone + '/' + DELETE_ON_DESTROY_MARKER_FILE_NAME);
+    volume->getDisk()->removeFileIfExists(fs::path(path_to_clone) / DELETE_ON_DESTROY_MARKER_FILE_NAME);
 }
 
 void IMergeTreeDataPart::checkConsistencyBase() const
@@ -1201,6 +1327,13 @@ void IMergeTreeDataPart::checkConsistencyBase() const
     String path = getFullRelativePath();
 
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
+    if (parent_part)
+        metadata_snapshot = metadata_snapshot->projections.get(name).metadata;
+    else
+    {
+        // No need to check projections here because we already did consistent checking when loading projections if necessary.
+    }
+
     const auto & pk = metadata_snapshot->getPrimaryKey();
     const auto & partition_key = metadata_snapshot->getPartitionKey();
     if (!checksums.empty())
@@ -1216,7 +1349,7 @@ void IMergeTreeDataPart::checkConsistencyBase() const
             if (metadata_snapshot->hasPartitionKey() && !checksums.files.count("partition.dat"))
                 throw Exception("No checksum for partition.dat", ErrorCodes::NO_FILE_IN_DATA_PART);
 
-            if (!isEmpty())
+            if (!isEmpty() && !parent_part)
             {
                 for (const String & col_name : storage.getMinMaxColumnsNames(partition_key))
                 {
@@ -1240,17 +1373,20 @@ void IMergeTreeDataPart::checkConsistencyBase() const
 
         /// Check that the primary key index is not empty.
         if (!pk.column_names.empty())
-            check_file_not_empty(volume->getDisk(), path + "primary.idx");
+            check_file_not_empty(volume->getDisk(), fs::path(path) / "primary.idx");
 
         if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
         {
-            check_file_not_empty(volume->getDisk(), path + "count.txt");
+            check_file_not_empty(volume->getDisk(), fs::path(path) / "count.txt");
 
             if (metadata_snapshot->hasPartitionKey())
-                check_file_not_empty(volume->getDisk(), path + "partition.dat");
+                check_file_not_empty(volume->getDisk(), fs::path(path) / "partition.dat");
 
-            for (const String & col_name : storage.getMinMaxColumnsNames(partition_key))
-                check_file_not_empty(volume->getDisk(), path + "minmax_" + escapeForFileName(col_name) + ".idx");
+            if (!parent_part)
+            {
+                for (const String & col_name : storage.getMinMaxColumnsNames(partition_key))
+                    check_file_not_empty(volume->getDisk(), fs::path(path) / ("minmax_" + escapeForFileName(col_name) + ".idx"));
+            }
         }
     }
 }
@@ -1344,7 +1480,7 @@ String IMergeTreeDataPart::getUniqueId() const
     auto disk = volume->getDisk();
 
     if (disk->getType() == DB::DiskType::Type::S3)
-        id = disk->getUniqueId(getFullRelativePath() + "checksums.txt");
+        id = disk->getUniqueId(fs::path(getFullRelativePath()) / "checksums.txt");
 
     if (id.empty())
         throw Exception("Can't get unique S3 object", ErrorCodes::LOGICAL_ERROR);
@@ -1352,6 +1488,24 @@ String IMergeTreeDataPart::getUniqueId() const
     return id;
 }
 
+
+String IMergeTreeDataPart::getZeroLevelPartBlockID() const
+{
+    if (info.level != 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to get block id for non zero level part {}", name);
+
+    SipHash hash;
+    checksums.computeTotalChecksumDataOnly(hash);
+    union
+    {
+        char bytes[16];
+        UInt64 words[2];
+    } hash_value;
+    hash.get128(hash_value.bytes);
+
+    return info.partition_id + "_" + toString(hash_value.words[0]) + "_" + toString(hash_value.words[1]);
+}
+
 bool isCompactPart(const MergeTreeDataPartPtr & data_part)
 {
     return (data_part && data_part->getType() == MergeTreeDataPartType::COMPACT);
@@ -1368,4 +1522,3 @@ bool isInMemoryPart(const MergeTreeDataPartPtr & data_part)
 }
 
 }
-
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 03f6564788a..53640b41507 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -2,7 +2,6 @@
 
 #include <DataStreams/IBlockInputStream.h>
 
-#include <Core/Row.h>
 #include <Core/Block.h>
 #include <common/types.h>
 #include <Core/NamesAndTypes.h>
@@ -10,6 +9,7 @@
 #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,8 +17,6 @@
 #include <Storages/MergeTree/MergeTreeIOSettings.h>
 #include <Storages/MergeTree/KeyCondition.h>
 
-#include <Poco/Path.h>
-
 #include <shared_mutex>
 
 namespace zkutil
@@ -44,11 +42,6 @@ class IMergeTreeDataPartWriter;
 class MarkCache;
 class UncompressedCache;
 
-
-namespace ErrorCodes
-{
-}
-
 /// Description of the data part.
 class IMergeTreeDataPart : public std::enable_shared_from_this<IMergeTreeDataPart>
 {
@@ -74,14 +67,16 @@ public:
         const MergeTreePartInfo & info_,
         const VolumePtr & volume,
         const std::optional<String> & relative_path,
-        Type part_type_);
+        Type part_type_,
+        const IMergeTreeDataPart * parent_part_);
 
     IMergeTreeDataPart(
         MergeTreeData & storage_,
         const String & name_,
         const VolumePtr & volume,
         const std::optional<String> & relative_path,
-        Type part_type_);
+        Type part_type_,
+        const IMergeTreeDataPart * parent_part_);
 
     virtual MergeTreeReaderPtr getReader(
         const NamesAndTypesList & columns_,
@@ -133,6 +128,8 @@ public:
 
     void remove(bool keep_s3 = false) const;
 
+    void projectionRemove(const String & parent_to, bool keep_s3 = false) const;
+
     /// Initialize columns (from columns.txt if exists, or create from column files if not).
     /// Load checksums from checksums.txt if exists. Load index if required.
     void loadColumnsChecksumsIndexes(bool require_columns_checksums, bool check_consistency);
@@ -164,6 +161,9 @@ public:
 
     bool isEmpty() const { return rows_count == 0; }
 
+    /// Compute part block id for zero level part. Otherwise throws an exception.
+    String getZeroLevelPartBlockID() const;
+
     const MergeTreeData & storage;
 
     String name;
@@ -197,18 +197,21 @@ public:
     /// Frozen by ALTER TABLE ... FREEZE ... It is used for information purposes in system.parts table.
     mutable std::atomic<bool> is_frozen {false};
 
+    /// Flag for keep S3 data when zero-copy replication over S3 turned on.
+    mutable bool keep_s3_on_delete = false;
+
     /**
      * Part state is a stage of its lifetime. States are ordered and state of a part could be increased only.
      * Part state should be modified under data_parts mutex.
      *
      * Possible state transitions:
-     * Temporary -> Precommitted:   we are trying to commit a fetched, inserted or merged part to active set
-     * Precommitted -> Outdated:    we could not add a part to active set and are doing a rollback (for example it is duplicated part)
-     * Precommitted -> Committed:   we successfully committed a part to active dataset
-     * Precommitted -> Outdated:    a part was replaced by a covering part or DROP PARTITION
-     * Outdated -> Deleting:        a cleaner selected this part for deletion
-     * Deleting -> Outdated:        if an ZooKeeper error occurred during the deletion, we will retry deletion
-     * Committed -> DeleteOnDestroy if part was moved to another disk
+     * Temporary -> Precommitted:    we are trying to commit a fetched, inserted or merged part to active set
+     * Precommitted -> Outdated:     we could not add a part to active set and are doing a rollback (for example it is duplicated part)
+     * Precommitted -> Committed:    we successfully committed a part to active dataset
+     * Precommitted -> Outdated:     a part was replaced by a covering part or DROP PARTITION
+     * Outdated -> Deleting:         a cleaner selected this part for deletion
+     * Deleting -> Outdated:         if an ZooKeeper error occurred during the deletion, we will retry deletion
+     * Committed -> DeleteOnDestroy: if part was moved to another disk
      */
     enum class State
     {
@@ -347,6 +350,23 @@ public:
 
     String getRelativePathForPrefix(const String & prefix) const;
 
+    bool isProjectionPart() const { return parent_part != nullptr; }
+
+    const IMergeTreeDataPart * getParentPart() const { return parent_part; }
+
+    const std::map<String, std::shared_ptr<IMergeTreeDataPart>> & getProjectionParts() const { return projection_parts; }
+
+    void addProjectionPart(const String & projection_name, std::shared_ptr<IMergeTreeDataPart> && projection_part)
+    {
+        projection_parts.emplace(projection_name, std::move(projection_part));
+    }
+
+    bool hasProjection(const String & projection_name) const
+    {
+        return projection_parts.find(projection_name) != projection_parts.end();
+    }
+
+    void loadProjections(bool require_columns_checksums, bool check_consistency);
 
     /// Return set of metadat file names without checksums. For example,
     /// columns.txt or checksums.txt itself.
@@ -389,6 +409,11 @@ protected:
     NamesAndTypesList columns;
     const Type part_type;
 
+    /// Not null when it's a projection part.
+    const IMergeTreeDataPart * parent_part;
+
+    std::map<String, std::shared_ptr<IMergeTreeDataPart>> projection_parts;
+
     void removeIfNeeded();
 
     virtual void checkConsistency(bool require_part_metadata) const;
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index 53ab4713267..14187564536 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -6,7 +6,6 @@
 #include <Interpreters/inplaceBlockConversions.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Common/typeid_cast.h>
-#include <Poco/File.h>
 
 
 namespace DB
@@ -187,12 +186,12 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
         }
 
         auto dag = DB::evaluateMissingDefaults(
-                additional_columns, columns, metadata_snapshot->getColumns(), storage.global_context);
+                additional_columns, columns, metadata_snapshot->getColumns(), storage.getContext());
         if (dag)
         {
             auto actions = std::make_shared<
                 ExpressionActions>(std::move(dag),
-                ExpressionActionsSettings::fromSettings(storage.global_context.getSettingsRef()));
+                ExpressionActionsSettings::fromSettings(storage.getContext()->getSettingsRef()));
             actions->execute(additional_columns);
         }
 
@@ -270,7 +269,7 @@ void IMergeTreeReader::performRequiredConversions(Columns & res_columns)
             copy_block.insert({res_columns[pos], getColumnFromPart(*name_and_type).type, name_and_type->name});
         }
 
-        DB::performRequiredConversions(copy_block, columns, storage.global_context);
+        DB::performRequiredConversions(copy_block, columns, storage.getContext());
 
         /// Move columns from block.
         name_and_type = columns.begin();
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 6833d2e2fd4..268c45c305f 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -21,9 +21,12 @@
 #include <Parsers/ASTIdentifier.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
+#include <Storages/KeyDescription.h>
 
 #include <cassert>
 #include <stack>
+#include <limits>
+
 
 namespace DB
 {
@@ -91,7 +94,7 @@ static String extractFixedPrefixFromLikePattern(const String & like_pattern)
   */
 static String firstStringThatIsGreaterThanAllStringsWithPrefix(const String & prefix)
 {
-    /** Increment the last byte of the prefix by one. But if it is 255, then remove it and increase the previous one.
+    /** Increment the last byte of the prefix by one. But if it is max (255), then remove it and increase the previous one.
       * Example (for convenience, suppose that the maximum value of byte is `z`)
       * abcx -> abcy
       * abcz -> abd
@@ -101,7 +104,7 @@ static String firstStringThatIsGreaterThanAllStringsWithPrefix(const String & pr
 
     String res = prefix;
 
-    while (!res.empty() && static_cast<UInt8>(res.back()) == 255)
+    while (!res.empty() && static_cast<UInt8>(res.back()) == std::numeric_limits<UInt8>::max())
         res.pop_back();
 
     if (res.empty())
@@ -309,11 +312,11 @@ static const std::map<std::string, std::string> inverse_relations = {
 
 bool isLogicalOperator(const String & func_name)
 {
-    return (func_name == "and" || func_name == "or" || func_name == "not");
+    return (func_name == "and" || func_name == "or" || func_name == "not" || func_name == "indexHint");
 }
 
 /// The node can be one of:
-///   - Logical operator (AND, OR, NOT)
+///   - Logical operator (AND, OR, NOT and indexHint() - logical NOOP)
 ///   - An "atom" (relational operator, constant, expression)
 ///   - A logical constant expression
 ///   - Any other function
@@ -330,7 +333,8 @@ ASTPtr cloneASTWithInversionPushDown(const ASTPtr node, const bool need_inversio
 
         const auto result_node = makeASTFunction(func->name);
 
-        if (need_inversion)
+        /// indexHint() is a special case - logical NOOP function
+        if (result_node->name != "indexHint" && need_inversion)
         {
             result_node->name = (result_node->name == "and") ? "or" : "and";
         }
@@ -370,7 +374,7 @@ inline bool Range::less(const Field & lhs, const Field & rhs) { return applyVisi
   * For index to work when something like "WHERE Date = toDate(now())" is written.
   */
 Block KeyCondition::getBlockWithConstants(
-    const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, const Context & context)
+    const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, ContextPtr context)
 {
     Block result
     {
@@ -387,7 +391,7 @@ Block KeyCondition::getBlockWithConstants(
 
 KeyCondition::KeyCondition(
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     const Names & key_column_names,
     const ExpressionActionsPtr & key_expr_,
     bool single_point_,
@@ -556,7 +560,7 @@ static FieldRef applyFunction(const FunctionBasePtr & func, const DataTypePtr &
     return {field.columns, field.row_idx, result_idx};
 }
 
-void KeyCondition::traverseAST(const ASTPtr & node, const Context & context, Block & block_with_constants)
+void KeyCondition::traverseAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants)
 {
     RPNElement element;
 
@@ -588,6 +592,30 @@ void KeyCondition::traverseAST(const ASTPtr & node, const Context & context, Blo
     rpn.emplace_back(std::move(element));
 }
 
+bool KeyCondition::canConstantBeWrapped(const ASTPtr & node, const String & expr_name, String & result_expr_name)
+{
+    const auto & sample_block = key_expr->getSampleBlock();
+
+    /// sample_block from key_expr cannot contain modulo and moduloLegacy at the same time.
+    /// For partition key it is always moduloLegacy.
+    if (sample_block.has(expr_name))
+    {
+        result_expr_name = expr_name;
+    }
+    else
+    {
+        auto adjusted_ast = node->clone();
+        KeyDescription::moduloToModuloLegacyRecursive(adjusted_ast);
+        String adjusted_expr_name = adjusted_ast->getColumnName();
+
+        if (!sample_block.has(adjusted_expr_name))
+            return false;
+
+        result_expr_name = adjusted_expr_name;
+    }
+
+    return true;
+}
 
 bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
     const ASTPtr & node,
@@ -596,23 +624,13 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
     Field & out_value,
     DataTypePtr & out_type)
 {
-    /// We don't look for inversed key transformations when strict is true, which is required for trivial count().
-    /// Consider the following test case:
-    ///
-    /// create table test1(p DateTime, k int) engine MergeTree partition by toDate(p) order by k;
-    /// insert into test1 values ('2020-09-01 00:01:02', 1), ('2020-09-01 20:01:03', 2), ('2020-09-02 00:01:03', 3);
-    /// select count() from test1 where p > toDateTime('2020-09-01 10:00:00');
-    ///
-    /// toDate(DateTime) is always monotonic, but we cannot relaxing the predicates to be
-    /// >= toDate(toDateTime('2020-09-01 10:00:00')), which returns 3 instead of the right count: 2.
-    if (strict)
+    // Constant expr should use alias names if any
+    String passed_expr_name = node->getColumnName();
+    String expr_name;
+    if (!canConstantBeWrapped(node, passed_expr_name, expr_name))
         return false;
 
-    // Constant expr should use alias names if any
-    String expr_name = node->getColumnName();
     const auto & sample_block = key_expr->getSampleBlock();
-    if (!sample_block.has(expr_name))
-        return false;
 
     /// TODO Nullable index is not yet landed.
     if (out_value.isNull())
@@ -621,8 +639,8 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
     bool found_transformation = false;
     auto input_column = sample_block.getByName(expr_name);
     auto const_column = out_type->createColumnConst(1, out_value);
-    out_value = (*castColumn({const_column, out_type, "c"}, input_column.type))[0];
-    out_type = input_column.type;
+    auto const_value = (*castColumn({const_column, out_type, "c"}, input_column.type))[0];
+    auto const_type = input_column.type;
     for (const auto & action : key_expr->getActions())
     {
         /** The key functional expression constraint may be inferred from a plain column in the expression.
@@ -644,14 +662,14 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
                 return false;
 
             /// Range is irrelevant in this case.
-            IFunction::Monotonicity monotonicity = action.node->function_base->getMonotonicityForRange(*out_type, Field(), Field());
+            IFunction::Monotonicity monotonicity = action.node->function_base->getMonotonicityForRange(*const_type, Field(), Field());
             if (!monotonicity.is_always_monotonic)
                 return false;
 
             /// Apply the next transformation step.
-            std::tie(out_value, out_type) = applyFunctionForFieldOfUnknownType(
+            std::tie(const_value, const_type) = applyFunctionForFieldOfUnknownType(
                 action.node->function_builder,
-                out_type, out_value);
+                const_type, const_value);
 
             expr_name = action.node->result_name;
 
@@ -661,6 +679,8 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
             {
                 out_key_column_num = it->second;
                 out_key_column_type = sample_block.getByName(it->first).type;
+                out_value = const_value;
+                out_type = const_type;
                 found_transformation = true;
                 break;
             }
@@ -674,14 +694,13 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
 bool KeyCondition::canConstantBeWrappedByFunctions(
     const ASTPtr & ast, size_t & out_key_column_num, DataTypePtr & out_key_column_type, Field & out_value, DataTypePtr & out_type)
 {
-    if (strict)
+    // Constant expr should use alias names if any
+    String passed_expr_name = ast->getColumnName();
+    String expr_name;
+    if (!canConstantBeWrapped(ast, passed_expr_name, expr_name))
         return false;
 
-    // Constant expr should use alias names if any
-    String expr_name = ast->getColumnName();
     const auto & sample_block = key_expr->getSampleBlock();
-    if (!sample_block.has(expr_name))
-        return false;
 
     /// TODO Nullable index is not yet landed.
     if (out_value.isNull())
@@ -734,12 +753,10 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
 
             if (is_valid_chain)
             {
-                {
-                    auto input_column = sample_block.getByName(expr_name);
-                    auto const_column = out_type->createColumnConst(1, out_value);
-                    out_value = (*castColumn({const_column, out_type, "c"}, input_column.type))[0];
-                    out_type = input_column.type;
-                }
+                auto input_column = sample_block.getByName(expr_name);
+                auto const_column = out_type->createColumnConst(1, out_value);
+                auto const_value = (*castColumn({const_column, out_type, "c"}, input_column.type))[0];
+                auto const_type = input_column.type;
 
                 while (!chain.empty())
                 {
@@ -751,7 +768,7 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
 
                     if (func->children.size() == 1)
                     {
-                        std::tie(out_value, out_type) = applyFunctionForFieldOfUnknownType(func->function_builder, out_type, out_value);
+                        std::tie(const_value, const_type) = applyFunctionForFieldOfUnknownType(func->function_builder, const_type, const_value);
                     }
                     else if (func->children.size() == 2)
                     {
@@ -761,21 +778,23 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
                         {
                             auto left_arg_type = left->result_type;
                             auto left_arg_value = (*left->column)[0];
-                            std::tie(out_value, out_type) = applyBinaryFunctionForFieldOfUnknownType(
-                                    func->function_builder, left_arg_type, left_arg_value, out_type, out_value);
+                            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(out_value, out_type) = applyBinaryFunctionForFieldOfUnknownType(
-                                    func->function_builder, out_type, out_value, right_arg_type, right_arg_value);
+                            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;
             }
         }
@@ -786,7 +805,7 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
 
 bool KeyCondition::tryPrepareSetIndex(
     const ASTs & args,
-    const Context & context,
+    ContextPtr context,
     RPNElement & out,
     size_t & out_key_column_num)
 {
@@ -938,6 +957,9 @@ public:
         return func->getMonotonicityForRange(type, left, right);
     }
 
+    Kind getKind() const { return kind; }
+    const ColumnWithTypeAndName & getConstArg() const { return const_arg; }
+
 private:
     FunctionBasePtr func;
     ColumnWithTypeAndName const_arg;
@@ -947,7 +969,7 @@ private:
 
 bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctions(
     const ASTPtr & node,
-    const Context & context,
+    ContextPtr context,
     size_t & out_key_column_num,
     DataTypePtr & out_key_res_column_type,
     MonotonicFunctionsChain & out_functions_chain)
@@ -962,6 +984,8 @@ bool KeyCondition::isKeyPossiblyWrappedByMonotonicFunctions(
     {
         const auto & args = (*it)->arguments->children;
         auto func_builder = FunctionFactory::instance().tryGet((*it)->name, context);
+        if (!func_builder)
+            return false;
         ColumnsWithTypeAndName arguments;
         ColumnWithTypeAndName const_arg;
         FunctionWithOptionalConstArg::Kind kind = FunctionWithOptionalConstArg::Kind::NO_CONST;
@@ -1075,7 +1099,7 @@ static void castValueToType(const DataTypePtr & desired_type, Field & src_value,
 }
 
 
-bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out)
+bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out)
 {
     /** Functions < > = != <= >= in `notIn`, where one argument is a constant, and the other is one of columns of key,
       *  or itself, wrapped in a chain of possibly-monotonic functions,
@@ -1109,6 +1133,23 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & cont
             bool is_set_const = false;
             bool is_constant_transformed = false;
 
+            /// We don't look for inversed key transformations when strict is true, which is required for trivial count().
+            /// Consider the following test case:
+            ///
+            /// create table test1(p DateTime, k int) engine MergeTree partition by toDate(p) order by k;
+            /// insert into test1 values ('2020-09-01 00:01:02', 1), ('2020-09-01 20:01:03', 2), ('2020-09-02 00:01:03', 3);
+            /// select count() from test1 where p > toDateTime('2020-09-01 10:00:00');
+            ///
+            /// toDate(DateTime) is always monotonic, but we cannot relax the predicates to be
+            /// >= toDate(toDateTime('2020-09-01 10:00:00')), which returns 3 instead of the right count: 2.
+            bool strict_condition = strict;
+
+            /// If we use this key condition to prune partitions by single value, we cannot relax conditions for NOT.
+            if (single_point
+                && (func_name == "notLike" || func_name == "notIn" || func_name == "globalNotIn" || func_name == "notEquals"
+                    || func_name == "notEmpty"))
+                strict_condition = true;
+
             if (functionIsInOrGlobalInOperator(func_name))
             {
                 if (tryPrepareSetIndex(args, context, out, key_column_num))
@@ -1125,13 +1166,15 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & cont
                 {
                     key_arg_pos = 0;
                 }
-                else if (canConstantBeWrappedByMonotonicFunctions(args[0], key_column_num, key_expr_type, const_value, const_type))
+                else if (
+                    !strict_condition
+                    && canConstantBeWrappedByMonotonicFunctions(args[0], key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 0;
                     is_constant_transformed = true;
                 }
                 else if (
-                    single_point && func_name == "equals"
+                    single_point && func_name == "equals" && !strict_condition
                     && canConstantBeWrappedByFunctions(args[0], key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 0;
@@ -1146,13 +1189,15 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & cont
                 {
                     key_arg_pos = 1;
                 }
-                else if (canConstantBeWrappedByMonotonicFunctions(args[1], key_column_num, key_expr_type, const_value, const_type))
+                else if (
+                    !strict_condition
+                    && canConstantBeWrappedByMonotonicFunctions(args[1], key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 1;
                     is_constant_transformed = true;
                 }
                 else if (
-                    single_point && func_name == "equals"
+                    single_point && func_name == "equals" && !strict_condition
                     && canConstantBeWrappedByFunctions(args[1], key_column_num, key_expr_type, const_value, const_type))
                 {
                     key_arg_pos = 0;
@@ -1216,8 +1261,7 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & cont
                     {
                         ColumnsWithTypeAndName arguments{
                             {nullptr, key_expr_type, ""}, {DataTypeString().createColumnConst(1, common_type->getName()), common_type, ""}};
-                        FunctionOverloadResolverPtr func_builder_cast
-                                = std::make_shared<FunctionOverloadResolverAdaptor>(CastOverloadResolver<CastType::nonAccurate>::createImpl(false));
+                        FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<CastType::nonAccurate>::createImpl(false);
                         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.
@@ -1274,6 +1318,8 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, const Context & cont
 bool KeyCondition::tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNElement & out)
 {
     /// Functions AND, OR, NOT.
+    /// Also a special function `indexHint` - works as if instead of calling a function there are just parentheses
+    /// (or, the same thing - calling the function `and` from one argument).
     const ASTs & args = func->arguments->children;
 
     if (func->name == "not")
@@ -1285,7 +1331,7 @@ bool KeyCondition::tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNE
     }
     else
     {
-        if (func->name == "and")
+        if (func->name == "and" || func->name == "indexHint")
             out.function = RPNElement::FUNCTION_AND;
         else if (func->name == "or")
             out.function = RPNElement::FUNCTION_OR;
@@ -1308,6 +1354,235 @@ String KeyCondition::toString() const
     return res;
 }
 
+KeyCondition::Description KeyCondition::getDescription() const
+{
+    /// This code may seem to be too difficult.
+    /// Here we want to convert RPN back to tree, and also simplify some logical expressions like `and(x, true) -> x`.
+    Description description;
+
+    /// That's a binary tree. Explicit.
+    /// Build and optimize it simultaneously.
+    struct Node
+    {
+        enum class Type
+        {
+            /// Leaf, which is RPNElement.
+            Leaf,
+            /// Leafs, which are logical constants.
+            True,
+            False,
+            /// Binary operators.
+            And,
+            Or,
+        };
+
+        Type type{};
+
+        /// Only for Leaf
+        const RPNElement * element = nullptr;
+        /// This means that logical NOT is applied to leaf.
+        bool negate = false;
+
+        std::unique_ptr<Node> left = nullptr;
+        std::unique_ptr<Node> right = nullptr;
+    };
+
+    /// The algorithm is the same as in KeyCondition::checkInHyperrectangle
+    /// We build a pair of trees on stack. For checking if key condition may be true, and if it may be false.
+    /// We need only `can_be_true` in result.
+    struct Frame
+    {
+        std::unique_ptr<Node> can_be_true;
+        std::unique_ptr<Node> can_be_false;
+    };
+
+    /// Combine two subtrees using logical operator.
+    auto combine = [](std::unique_ptr<Node> left, std::unique_ptr<Node> right, Node::Type type)
+    {
+        /// Simplify operators with for one constant condition.
+
+        if (type == Node::Type::And)
+        {
+            /// false AND right
+            if (left->type == Node::Type::False)
+                return left;
+
+            /// left AND false
+            if (right->type == Node::Type::False)
+                return right;
+
+            /// true AND right
+            if (left->type == Node::Type::True)
+                return right;
+
+            /// left AND true
+            if (right->type == Node::Type::True)
+                return left;
+        }
+
+        if (type == Node::Type::Or)
+        {
+            /// false OR right
+            if (left->type == Node::Type::False)
+                return right;
+
+            /// left OR false
+            if (right->type == Node::Type::False)
+                return left;
+
+            /// true OR right
+            if (left->type == Node::Type::True)
+                return left;
+
+            /// left OR true
+            if (right->type == Node::Type::True)
+                return right;
+        }
+
+        return std::make_unique<Node>(Node{
+                .type = type,
+                .left = std::move(left),
+                .right = std::move(right)
+            });
+    };
+
+    std::vector<Frame> rpn_stack;
+    for (const auto & element : rpn)
+    {
+        if (element.function == RPNElement::FUNCTION_UNKNOWN)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::True});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::True});
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else if (
+               element.function == RPNElement::FUNCTION_IN_RANGE
+            || element.function == RPNElement::FUNCTION_NOT_IN_RANGE
+            || element.function == RPNElement::FUNCTION_IN_SET
+            || element.function == RPNElement::FUNCTION_NOT_IN_SET)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::Leaf, .element = &element, .negate = false});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::Leaf, .element = &element, .negate = true});
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else if (element.function == RPNElement::FUNCTION_NOT)
+        {
+            assert(!rpn_stack.empty());
+
+            std::swap(rpn_stack.back().can_be_true, rpn_stack.back().can_be_false);
+        }
+        else if (element.function == RPNElement::FUNCTION_AND)
+        {
+            assert(!rpn_stack.empty());
+            auto arg1 = std::move(rpn_stack.back());
+
+            rpn_stack.pop_back();
+
+            assert(!rpn_stack.empty());
+            auto arg2 = std::move(rpn_stack.back());
+
+            Frame frame;
+            frame.can_be_true = combine(std::move(arg1.can_be_true), std::move(arg2.can_be_true), Node::Type::And);
+            frame.can_be_false = combine(std::move(arg1.can_be_false), std::move(arg2.can_be_false), Node::Type::Or);
+
+            rpn_stack.back() = std::move(frame);
+        }
+        else if (element.function == RPNElement::FUNCTION_OR)
+        {
+            assert(!rpn_stack.empty());
+            auto arg1 = std::move(rpn_stack.back());
+
+            rpn_stack.pop_back();
+
+            assert(!rpn_stack.empty());
+            auto arg2 = std::move(rpn_stack.back());
+
+            Frame frame;
+            frame.can_be_true = combine(std::move(arg1.can_be_true), std::move(arg2.can_be_true), Node::Type::Or);
+            frame.can_be_false = combine(std::move(arg1.can_be_false), std::move(arg2.can_be_false), Node::Type::And);
+
+            rpn_stack.back() = std::move(frame);
+        }
+        else if (element.function == RPNElement::ALWAYS_FALSE)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::False});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::True});
+
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else if (element.function == RPNElement::ALWAYS_TRUE)
+        {
+            auto can_be_true = std::make_unique<Node>(Node{.type = Node::Type::True});
+            auto can_be_false = std::make_unique<Node>(Node{.type = Node::Type::False});
+            rpn_stack.emplace_back(Frame{.can_be_true = std::move(can_be_true), .can_be_false = std::move(can_be_false)});
+        }
+        else
+            throw Exception("Unexpected function type in KeyCondition::RPNElement", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    if (rpn_stack.size() != 1)
+        throw Exception("Unexpected stack size in KeyCondition::checkInRange", ErrorCodes::LOGICAL_ERROR);
+
+    std::vector<std::string_view> key_names(key_columns.size());
+    std::vector<bool> is_key_used(key_columns.size(), false);
+
+    for (const auto & key : key_columns)
+        key_names[key.second] = key.first;
+
+    WriteBufferFromOwnString buf;
+
+    std::function<void(const Node *)> describe;
+    describe = [&describe, &key_names, &is_key_used, &buf](const Node * node)
+    {
+        switch (node->type)
+        {
+            case Node::Type::Leaf:
+            {
+                is_key_used[node->element->key_column] = true;
+
+                /// Note: for condition with double negation, like `not(x not in set)`,
+                /// we can replace it to `x in set` here.
+                /// But I won't do it, because `cloneASTWithInversionPushDown` already push down `not`.
+                /// So, this seem to be impossible for `can_be_true` tree.
+                if (node->negate)
+                    buf << "not(";
+                buf << node->element->toString(key_names[node->element->key_column], true);
+                if (node->negate)
+                    buf << ")";
+                break;
+            }
+            case Node::Type::True:
+                buf << "true";
+                break;
+            case Node::Type::False:
+                buf << "false";
+                break;
+            case Node::Type::And:
+                buf << "and(";
+                describe(node->left.get());
+                buf << ", ";
+                describe(node->right.get());
+                buf << ")";
+                break;
+            case Node::Type::Or:
+                buf << "or(";
+                describe(node->left.get());
+                buf << ", ";
+                describe(node->right.get());
+                buf << ")";
+                break;
+        }
+    };
+
+    describe(rpn_stack.front().can_be_true.get());
+    description.condition = std::move(buf.str());
+
+    for (size_t i = 0; i < key_names.size(); ++i)
+        if (is_key_used[i])
+            description.used_keys.emplace_back(key_names[i]);
+
+    return description;
+}
 
 /** Index is the value of key every `index_granularity` rows.
   * This value is called a "mark". That is, the index consists of marks.
@@ -1326,11 +1601,12 @@ String KeyCondition::toString() const
   * The set of all possible tuples can be considered as an n-dimensional space, where n is the size of the tuple.
   * A range of tuples specifies some subset of this space.
   *
-  * Hyperrectangles (you can also find the term "rail")
-  *  will be the subrange of an n-dimensional space that is a direct product of one-dimensional ranges.
-  * In this case, the one-dimensional range can be: a period, a segment, an interval, a half-interval, unlimited on the left, unlimited on the right ...
+  * Hyperrectangles will be the subrange of an n-dimensional space that is a direct product of one-dimensional ranges.
+  * In this case, the one-dimensional range can be:
+  * a point, a segment, an open interval, a half-open interval;
+  * unlimited on the left, unlimited on the right ...
   *
-  * The range of tuples can always be represented as a combination of hyperrectangles.
+  * The range of tuples can always be represented as a combination (union) of hyperrectangles.
   * For example, the range [ x1 y1 .. x2 y2 ] given x1 != x2 is equal to the union of the following three hyperrectangles:
   * [x1]       x [y1 .. +inf)
   * (x1 .. x2) x (-inf .. +inf)
@@ -1732,18 +2008,38 @@ bool KeyCondition::mayBeTrueAfter(
     return checkInRange(used_key_size, left_key, nullptr, data_types, false, BoolMask::consider_only_can_be_true).can_be_true;
 }
 
-
-String KeyCondition::RPNElement::toString() const
+String KeyCondition::RPNElement::toString() const { return toString("column " + std::to_string(key_column), false); }
+String KeyCondition::RPNElement::toString(const std::string_view & column_name, bool print_constants) const
 {
-    auto print_wrapped_column = [this](WriteBuffer & buf)
+    auto print_wrapped_column = [this, &column_name, print_constants](WriteBuffer & buf)
     {
         for (auto it = monotonic_functions_chain.rbegin(); it != monotonic_functions_chain.rend(); ++it)
+        {
             buf << (*it)->getName() << "(";
+            if (print_constants)
+            {
+                if (const auto * func = typeid_cast<const FunctionWithOptionalConstArg *>(it->get()))
+                {
+                    if (func->getKind() == FunctionWithOptionalConstArg::Kind::LEFT_CONST)
+                        buf << applyVisitor(FieldVisitorToString(), (*func->getConstArg().column)[0]) << ", ";
+                }
+            }
+        }
 
-        buf << "column " << key_column;
+        buf << column_name;
 
         for (auto it = monotonic_functions_chain.rbegin(); it != monotonic_functions_chain.rend(); ++it)
+        {
+            if (print_constants)
+            {
+                if (const auto * func = typeid_cast<const FunctionWithOptionalConstArg *>(it->get()))
+                {
+                    if (func->getKind() == FunctionWithOptionalConstArg::Kind::RIGHT_CONST)
+                        buf << ", " << applyVisitor(FieldVisitorToString(), (*func->getConstArg().column)[0]);
+                }
+            }
             buf << ")";
+        }
     };
 
     WriteBufferFromOwnString buf;
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index b8167f406bd..fc28d4a93c9 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -229,7 +229,7 @@ public:
     /// Does not take into account the SAMPLE section. all_columns - the set of all columns of the table.
     KeyCondition(
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         const Names & key_column_names,
         const ExpressionActionsPtr & key_expr,
         bool single_point_ = false,
@@ -293,6 +293,16 @@ public:
 
     String toString() const;
 
+    /// Condition description for EXPLAIN query.
+    struct Description
+    {
+        /// Which columns from PK were used, in PK order.
+        std::vector<std::string> used_keys;
+        /// Condition which was applied, mostly human-readable.
+        std::string condition;
+    };
+
+    Description getDescription() const;
 
     /** A chain of possibly monotone functions.
       * If the key column is wrapped in functions that can be monotonous in some value ranges
@@ -307,7 +317,7 @@ public:
             const ASTPtr & expr, Block & block_with_constants, Field & out_value, DataTypePtr & out_type);
 
     static Block getBlockWithConstants(
-        const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, const Context & context);
+        const ASTPtr & query, const TreeRewriterResultPtr & syntax_analyzer_result, ContextPtr context);
 
     static std::optional<Range> applyMonotonicFunctionsChainToRange(
         Range key_range,
@@ -345,6 +355,7 @@ private:
             : function(function_), range(range_), key_column(key_column_) {}
 
         String toString() const;
+        String toString(const std::string_view & column_name, bool print_constants) const;
 
         Function function = FUNCTION_UNKNOWN;
 
@@ -375,8 +386,8 @@ private:
         bool right_bounded,
         BoolMask initial_mask) const;
 
-    void traverseAST(const ASTPtr & node, const Context & context, Block & block_with_constants);
-    bool tryParseAtomFromAST(const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out);
+    void traverseAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants);
+    bool tryParseAtomFromAST(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out);
     static bool tryParseLogicalOperatorFromAST(const ASTFunction * func, RPNElement & out);
 
     /** Is node the key column
@@ -387,7 +398,7 @@ private:
       */
     bool isKeyPossiblyWrappedByMonotonicFunctions(
         const ASTPtr & node,
-        const Context & context,
+        ContextPtr context,
         size_t & out_key_column_num,
         DataTypePtr & out_key_res_column_type,
         MonotonicFunctionsChain & out_functions_chain);
@@ -408,12 +419,18 @@ private:
     bool canConstantBeWrappedByFunctions(
         const ASTPtr & ast, size_t & out_key_column_num, DataTypePtr & out_key_column_type, Field & out_value, DataTypePtr & out_type);
 
+    /// Check if ASTPtr node, passed to canConstantBeWrappedBy*, can be used by them for further checks.
+    /// Always call this method at start of other methods, which require key comparison, because it also checks if adjusted
+    /// key expression can also be used (with substitution from modulo to moduloLegacy). This is needed because partition key
+    /// is always modified, when passed into keyCondition, - with recursive substitution from modulo to moduloLegacy.
+    bool canConstantBeWrapped(const ASTPtr & node, const String & expr_name, String & result_expr_name);
+
     /// If it's possible to make an RPNElement
     /// that will filter values (possibly tuples) by the content of 'prepared_set',
     /// do it and return true.
     bool tryPrepareSetIndex(
         const ASTs & args,
-        const Context & context,
+        ContextPtr context,
         RPNElement & out,
         size_t & out_key_column_num);
 
diff --git a/src/Storages/MergeTree/LeaderElection.h b/src/Storages/MergeTree/LeaderElection.h
index 7cdfd8e566d..2810385e9e5 100644
--- a/src/Storages/MergeTree/LeaderElection.h
+++ b/src/Storages/MergeTree/LeaderElection.h
@@ -83,7 +83,7 @@ private:
     void createNode()
     {
         shutdown_called = false;
-        node = EphemeralNodeHolder::createSequential(path + "/leader_election-", zookeeper, identifier);
+        node = EphemeralNodeHolder::createSequential(fs::path(path) / "leader_election-", zookeeper, identifier);
 
         std::string node_path = node->getPath();
         node_name = node_path.substr(node_path.find_last_of('/') + 1);
diff --git a/src/Storages/MergeTree/MergeSelector.h b/src/Storages/MergeTree/MergeSelector.h
index 5a92b4c5dd6..aac805823a9 100644
--- a/src/Storages/MergeTree/MergeSelector.h
+++ b/src/Storages/MergeTree/MergeSelector.h
@@ -31,16 +31,16 @@ public:
     struct Part
     {
         /// Size of data part in bytes.
-        size_t size;
+        size_t size = 0;
 
         /// How old this data part in seconds.
-        time_t age;
+        time_t age = 0;
 
         /// Depth of tree of merges by which this part was created. New parts has zero level.
-        unsigned level;
+        unsigned level = 0;
 
         /// Opaque pointer to avoid dependencies (it is not possible to do forward declaration of typedef).
-        const void * data;
+        const void * data = nullptr;
 
         /// Information about different TTLs for part. Can be used by
         /// TTLSelector to assign merges with TTL.
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
index 6bf164dd824..d9cb949042c 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
@@ -8,6 +8,8 @@
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Processors/Transforms/AggregatingTransform.h>
 
 
 namespace DB
@@ -30,7 +32,7 @@ MergeTreeBaseSelectProcessor::MergeTreeBaseSelectProcessor(
     const MergeTreeReaderSettings & reader_settings_,
     bool use_uncompressed_cache_,
     const Names & virt_column_names_)
-    : SourceWithProgress(getHeader(std::move(header), prewhere_info_, virt_column_names_))
+    : SourceWithProgress(transformHeader(std::move(header), prewhere_info_, storage_.getPartitionValueType(), virt_column_names_))
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , prewhere_info(prewhere_info_)
@@ -40,6 +42,7 @@ MergeTreeBaseSelectProcessor::MergeTreeBaseSelectProcessor(
     , reader_settings(reader_settings_)
     , use_uncompressed_cache(use_uncompressed_cache_)
     , virt_column_names(virt_column_names_)
+    , partition_value_type(storage.getPartitionValueType())
 {
     header_without_virtual_columns = getPort().getHeader();
 
@@ -60,7 +63,7 @@ Chunk MergeTreeBaseSelectProcessor::generate()
 
         if (res.hasRows())
         {
-            injectVirtualColumns(res, task.get(), virt_column_names);
+            injectVirtualColumns(res, task.get(), partition_value_type, virt_column_names);
             return res;
         }
     }
@@ -204,14 +207,25 @@ namespace
     {
         virtual ~VirtualColumnsInserter() = default;
 
+        virtual void insertArrayOfStringsColumn(const ColumnPtr & column, const String & name) = 0;
         virtual void insertStringColumn(const ColumnPtr & column, const String & name) = 0;
         virtual void insertUInt64Column(const ColumnPtr & column, const String & name) = 0;
         virtual void insertUUIDColumn(const ColumnPtr & column, const String & name) = 0;
+
+        virtual void insertPartitionValueColumn(
+            size_t rows,
+            const Row & partition_value,
+            const DataTypePtr & partition_value_type,
+            const String & name) = 0;
     };
 }
 
-static void injectVirtualColumnsImpl(size_t rows, VirtualColumnsInserter & inserter,
-                                     MergeTreeReadTask * task, const Names & virtual_columns)
+static void injectVirtualColumnsImpl(
+    size_t rows,
+    VirtualColumnsInserter & inserter,
+    MergeTreeReadTask * task,
+    const DataTypePtr & partition_value_type,
+    const Names & virtual_columns)
 {
     /// add virtual columns
     /// Except _sample_factor, which is added from the outside.
@@ -221,13 +235,20 @@ static void injectVirtualColumnsImpl(size_t rows, VirtualColumnsInserter & inser
             throw Exception("Cannot insert virtual columns to non-empty chunk without specified task.",
                             ErrorCodes::LOGICAL_ERROR);
 
+        const IMergeTreeDataPart * part = nullptr;
+        if (rows)
+        {
+            part = task->data_part.get();
+            if (part->isProjectionPart())
+                part = part->getParentPart();
+        }
         for (const auto & virtual_column_name : virtual_columns)
         {
             if (virtual_column_name == "_part")
             {
                 ColumnPtr column;
                 if (rows)
-                    column = DataTypeString().createColumnConst(rows, task->data_part->name)->convertToFullColumnIfConst();
+                    column = DataTypeString().createColumnConst(rows, part->name)->convertToFullColumnIfConst();
                 else
                     column = DataTypeString().createColumn();
 
@@ -257,12 +278,19 @@ static void injectVirtualColumnsImpl(size_t rows, VirtualColumnsInserter & inser
             {
                 ColumnPtr column;
                 if (rows)
-                    column = DataTypeString().createColumnConst(rows, task->data_part->info.partition_id)->convertToFullColumnIfConst();
+                    column = DataTypeString().createColumnConst(rows, part->info.partition_id)->convertToFullColumnIfConst();
                 else
                     column = DataTypeString().createColumn();
 
                 inserter.insertStringColumn(column, virtual_column_name);
             }
+            else if (virtual_column_name == "_partition_value")
+            {
+                if (rows)
+                    inserter.insertPartitionValueColumn(rows, task->data_part->partition.value, partition_value_type, virtual_column_name);
+                else
+                    inserter.insertPartitionValueColumn(rows, {}, partition_value_type, virtual_column_name);
+            }
         }
     }
 }
@@ -273,6 +301,11 @@ namespace
     {
         explicit VirtualColumnsInserterIntoBlock(Block & block_) : block(block_) {}
 
+        void insertArrayOfStringsColumn(const ColumnPtr & column, const String & name) final
+        {
+            block.insert({column, std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), name});
+        }
+
         void insertStringColumn(const ColumnPtr & column, const String & name) final
         {
             block.insert({column, std::make_shared<DataTypeString>(), name});
@@ -288,6 +321,19 @@ namespace
             block.insert({column, std::make_shared<DataTypeUUID>(), name});
         }
 
+        void insertPartitionValueColumn(
+            size_t rows, const Row & partition_value, const DataTypePtr & partition_value_type, const String & name) final
+        {
+            ColumnPtr column;
+            if (rows)
+                column = partition_value_type->createColumnConst(rows, Tuple(partition_value.begin(), partition_value.end()))
+                             ->convertToFullColumnIfConst();
+            else
+                column = partition_value_type->createColumn();
+
+            block.insert({column, partition_value_type, name});
+        }
+
         Block & block;
     };
 
@@ -295,6 +341,11 @@ namespace
     {
         explicit VirtualColumnsInserterIntoColumns(Columns & columns_) : columns(columns_) {}
 
+        void insertArrayOfStringsColumn(const ColumnPtr & column, const String &) final
+        {
+            columns.push_back(column);
+        }
+
         void insertStringColumn(const ColumnPtr & column, const String &) final
         {
             columns.push_back(column);
@@ -309,23 +360,38 @@ namespace
         {
             columns.push_back(column);
         }
+
+        void insertPartitionValueColumn(
+            size_t rows, const Row & partition_value, const DataTypePtr & partition_value_type, const String &) final
+        {
+            ColumnPtr column;
+            if (rows)
+                column = partition_value_type->createColumnConst(rows, Tuple(partition_value.begin(), partition_value.end()))
+                             ->convertToFullColumnIfConst();
+            else
+                column = partition_value_type->createColumn();
+            columns.push_back(column);
+        }
+
         Columns & columns;
     };
 }
 
-void MergeTreeBaseSelectProcessor::injectVirtualColumns(Block & block, MergeTreeReadTask * task, const Names & virtual_columns)
+void MergeTreeBaseSelectProcessor::injectVirtualColumns(
+    Block & block, MergeTreeReadTask * task, const DataTypePtr & partition_value_type, const Names & virtual_columns)
 {
-    VirtualColumnsInserterIntoBlock inserter { block };
-    injectVirtualColumnsImpl(block.rows(), inserter, task, virtual_columns);
+    VirtualColumnsInserterIntoBlock inserter{block};
+    injectVirtualColumnsImpl(block.rows(), inserter, task, partition_value_type, virtual_columns);
 }
 
-void MergeTreeBaseSelectProcessor::injectVirtualColumns(Chunk & chunk, MergeTreeReadTask * task, const Names & virtual_columns)
+void MergeTreeBaseSelectProcessor::injectVirtualColumns(
+    Chunk & chunk, MergeTreeReadTask * task, const DataTypePtr & partition_value_type, const Names & virtual_columns)
 {
     UInt64 num_rows = chunk.getNumRows();
     auto columns = chunk.detachColumns();
 
-    VirtualColumnsInserterIntoColumns inserter { columns };
-    injectVirtualColumnsImpl(num_rows, inserter, task, virtual_columns);
+    VirtualColumnsInserterIntoColumns inserter{columns};
+    injectVirtualColumnsImpl(num_rows, inserter, task, partition_value_type, virtual_columns);
 
     chunk.setColumns(columns, num_rows);
 }
@@ -370,11 +436,11 @@ void MergeTreeBaseSelectProcessor::executePrewhereActions(Block & block, const P
     }
 }
 
-Block MergeTreeBaseSelectProcessor::getHeader(
-    Block block, const PrewhereInfoPtr & prewhere_info, const Names & virtual_columns)
+Block MergeTreeBaseSelectProcessor::transformHeader(
+    Block block, const PrewhereInfoPtr & prewhere_info, const DataTypePtr & partition_value_type, const Names & virtual_columns)
 {
     executePrewhereActions(block, prewhere_info);
-    injectVirtualColumns(block, nullptr, virtual_columns);
+    injectVirtualColumns(block, nullptr, partition_value_type, virtual_columns);
     return block;
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
index 00ef131ae45..4615dec089f 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
@@ -33,6 +33,9 @@ public:
 
     ~MergeTreeBaseSelectProcessor() override;
 
+    static Block transformHeader(
+        Block block, const PrewhereInfoPtr & prewhere_info, const DataTypePtr & partition_value_type, const Names & virtual_columns);
+
     static void executePrewhereActions(Block & block, const PrewhereInfoPtr & prewhere_info);
 
 protected:
@@ -46,10 +49,10 @@ protected:
     Chunk readFromPartImpl();
 
     /// Two versions for header and chunk.
-    static void injectVirtualColumns(Block & block, MergeTreeReadTask * task, const Names & virtual_columns);
-    static void injectVirtualColumns(Chunk & chunk, MergeTreeReadTask * task, const Names & virtual_columns);
-
-    static Block getHeader(Block block, const PrewhereInfoPtr & prewhere_info, const Names & virtual_columns);
+    static void
+    injectVirtualColumns(Block & block, MergeTreeReadTask * task, const DataTypePtr & partition_value_type, const Names & virtual_columns);
+    static void
+    injectVirtualColumns(Chunk & chunk, MergeTreeReadTask * task, const DataTypePtr & partition_value_type, const Names & virtual_columns);
 
     void initializeRangeReaders(MergeTreeReadTask & task);
 
@@ -68,6 +71,9 @@ protected:
     bool use_uncompressed_cache;
 
     Names virt_column_names;
+
+    DataTypePtr partition_value_type;
+
     /// This header is used for chunks from readFromPart().
     Block header_without_virtual_columns;
 
diff --git a/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp b/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp
index bb5644567ae..11feb905bb6 100644
--- a/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp
@@ -23,24 +23,26 @@ void MergeTreeBlockOutputStream::writePrefix()
 
 void MergeTreeBlockOutputStream::write(const Block & block)
 {
-    auto part_blocks = storage.writer.splitBlockIntoParts(block, max_parts_per_block, metadata_snapshot);
+    auto part_blocks = storage.writer.splitBlockIntoParts(block, max_parts_per_block, metadata_snapshot, context);
     for (auto & current_block : part_blocks)
     {
         Stopwatch watch;
 
-        MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, metadata_snapshot, optimize_on_insert);
+        MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, metadata_snapshot, context);
 
         /// If optimize_on_insert setting is true, current_block could become empty after merge
         /// and we didn't create part.
         if (!part)
             continue;
 
-        storage.renameTempPartAndAdd(part, &storage.increment);
+        /// Part can be deduplicated, so increment counters and add to part log only if it's really added
+        if (storage.renameTempPartAndAdd(part, &storage.increment, nullptr, storage.getDeduplicationLog()))
+        {
+            PartLog::addNewPart(storage.getContext(), part, watch.elapsed());
 
-        PartLog::addNewPart(storage.global_context, 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();
+            /// 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();
+        }
     }
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeBlockOutputStream.h b/src/Storages/MergeTree/MergeTreeBlockOutputStream.h
index 8caa53382dc..32a5b8fccc2 100644
--- a/src/Storages/MergeTree/MergeTreeBlockOutputStream.h
+++ b/src/Storages/MergeTree/MergeTreeBlockOutputStream.h
@@ -14,11 +14,15 @@ class StorageMergeTree;
 class MergeTreeBlockOutputStream : public IBlockOutputStream
 {
 public:
-    MergeTreeBlockOutputStream(StorageMergeTree & storage_, const StorageMetadataPtr metadata_snapshot_, size_t max_parts_per_block_, bool optimize_on_insert_)
+    MergeTreeBlockOutputStream(
+        StorageMergeTree & storage_,
+        const StorageMetadataPtr metadata_snapshot_,
+        size_t max_parts_per_block_,
+        ContextPtr context_)
         : storage(storage_)
         , metadata_snapshot(metadata_snapshot_)
         , max_parts_per_block(max_parts_per_block_)
-        , optimize_on_insert(optimize_on_insert_)
+        , context(context_)
     {
     }
 
@@ -30,7 +34,7 @@ private:
     StorageMergeTree & storage;
     StorageMetadataPtr metadata_snapshot;
     size_t max_parts_per_block;
-    bool optimize_on_insert;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
index 10ce061a864..15b4fbd31c0 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
@@ -87,7 +87,9 @@ NameSet injectRequiredColumns(const MergeTreeData & storage, const StorageMetada
     bool have_at_least_one_physical_column = false;
 
     const auto & storage_columns = metadata_snapshot->getColumns();
-    auto alter_conversions = storage.getAlterConversionsForPart(part);
+    MergeTreeData::AlterConversions alter_conversions;
+    if (!part->isProjectionPart())
+        alter_conversions = storage.getAlterConversionsForPart(part);
     for (size_t i = 0; i < columns.size(); ++i)
     {
         /// We are going to fetch only physical columns
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 71564cb1f54..acf362e5b1f 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -7,6 +7,7 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/NestedUtils.h>
 #include <Formats/FormatFactory.h>
 #include <Functions/FunctionFactory.h>
@@ -15,12 +16,12 @@
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/WriteBufferFromString.h>
-#include <Interpreters/Context.h>
 #include <Interpreters/ExpressionAnalyzer.h>
-#include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/PartLog.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/inplaceBlockConversions.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSelectQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTNameTypePair.h>
@@ -51,11 +52,11 @@
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
 
-#include <Poco/DirectoryIterator.h>
-
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/algorithm/string/join.hpp>
 
+#include <ext/scope_guard_safe.h>
+
 #include <algorithm>
 #include <iomanip>
 #include <optional>
@@ -64,13 +65,17 @@
 #include <typeinfo>
 #include <typeindex>
 #include <unordered_set>
+#include <filesystem>
 
 
+namespace fs = std::filesystem;
+
 namespace ProfileEvents
 {
     extern const Event RejectedInserts;
     extern const Event DelayedInserts;
     extern const Event DelayedInsertsMilliseconds;
+    extern const Event DuplicatedInsertedBlocks;
 }
 
 namespace CurrentMetrics
@@ -132,7 +137,7 @@ MergeTreeData::MergeTreeData(
     const StorageID & table_id_,
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
-    Context & context_,
+    ContextMutablePtr context_,
     const String & date_column_name,
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> storage_settings_,
@@ -140,7 +145,7 @@ MergeTreeData::MergeTreeData(
     bool attach,
     BrokenPartCallback broken_part_callback_)
     : IStorage(table_id_)
-    , global_context(context_.getGlobalContext())
+    , WithMutableContext(context_->getGlobalContext())
     , merging_params(merging_params_)
     , require_part_metadata(require_part_metadata_)
     , relative_data_path(relative_data_path_)
@@ -148,6 +153,7 @@ MergeTreeData::MergeTreeData(
     , log_name(table_id_.getNameForLogs())
     , log(&Poco::Logger::get(log_name))
     , storage_settings(std::move(storage_settings_))
+    , pinned_part_uuids(std::make_shared<PinnedPartUUIDs>())
     , data_parts_by_info(data_parts_indexes.get<TagByInfo>())
     , data_parts_by_state_and_info(data_parts_indexes.get<TagByStateAndInfo>())
     , parts_mover(this)
@@ -160,7 +166,7 @@ MergeTreeData::MergeTreeData(
 
     /// Check sanity of MergeTreeSettings. Only when table is created.
     if (!attach)
-        settings->sanityCheck(global_context.getSettingsRef());
+        settings->sanityCheck(getContext()->getSettingsRef());
 
     MergeTreeDataFormatVersion min_format_version(0);
     if (!date_column_name.empty())
@@ -205,8 +211,8 @@ MergeTreeData::MergeTreeData(
     for (const auto & [path, disk] : getRelativeDataPathsWithDisks())
     {
         disk->createDirectories(path);
-        disk->createDirectories(path + MergeTreeData::DETACHED_DIR_NAME);
-        auto current_version_file_path = path + MergeTreeData::FORMAT_VERSION_FILE_NAME;
+        disk->createDirectories(fs::path(path) / MergeTreeData::DETACHED_DIR_NAME);
+        String current_version_file_path = fs::path(path) / MergeTreeData::FORMAT_VERSION_FILE_NAME;
         if (disk->exists(current_version_file_path))
         {
             if (!version_file.first.empty())
@@ -220,7 +226,7 @@ MergeTreeData::MergeTreeData(
 
     /// If not choose any
     if (version_file.first.empty())
-        version_file = {relative_data_path + MergeTreeData::FORMAT_VERSION_FILE_NAME, getStoragePolicy()->getAnyDisk()};
+        version_file = {fs::path(relative_data_path) / MergeTreeData::FORMAT_VERSION_FILE_NAME, getStoragePolicy()->getAnyDisk()};
 
     bool version_file_exists = version_file.second->exists(version_file.first);
 
@@ -230,7 +236,7 @@ MergeTreeData::MergeTreeData(
         format_version = min_format_version;
         auto buf = version_file.second->writeFile(version_file.first);
         writeIntText(format_version.toUnderType(), *buf);
-        if (global_context.getSettingsRef().fsync_metadata)
+        if (getContext()->getSettingsRef().fsync_metadata)
             buf->sync();
     }
     else
@@ -259,7 +265,7 @@ MergeTreeData::MergeTreeData(
 
 StoragePolicyPtr MergeTreeData::getStoragePolicy() const
 {
-    return global_context.getStoragePolicy(getSettings()->storage_policy);
+    return getContext()->getStoragePolicy(getSettings()->storage_policy);
 }
 
 static void checkKeyExpression(const ExpressionActions & expr, const Block & sample_block, const String & key_name, bool allow_nullable_key)
@@ -316,8 +322,8 @@ void MergeTreeData::checkProperties(
         {
             const String & pk_column = new_primary_key.column_names[i];
             if (pk_column != sorting_key_column)
-                throw Exception("Primary key must be a prefix of the sorting key, but in position "
-                    + toString(i) + " its column is " + pk_column + ", not " + sorting_key_column,
+                throw Exception("Primary key must be a prefix of the sorting key, but the column in the position "
+                    + toString(i) + " is " + sorting_key_column +", not " + pk_column,
                     ErrorCodes::BAD_ARGUMENTS);
 
             if (!primary_key_columns_set.emplace(pk_column).second)
@@ -354,7 +360,7 @@ void MergeTreeData::checkProperties(
 
         if (!added_key_column_expr_list->children.empty())
         {
-            auto syntax = TreeRewriter(global_context).analyze(added_key_column_expr_list, all_columns);
+            auto syntax = TreeRewriter(getContext()).analyze(added_key_column_expr_list, all_columns);
             Names used_columns = syntax->requiredSourceColumns();
 
             NamesAndTypesList deleted_columns;
@@ -394,6 +400,23 @@ void MergeTreeData::checkProperties(
         }
     }
 
+    if (!new_metadata.projections.empty())
+    {
+        std::unordered_set<String> projections_names;
+
+        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",
+                        ErrorCodes::LOGICAL_ERROR);
+
+            projections_names.insert(projection.name);
+        }
+    }
+
     checkKeyExpression(*new_sorting_key.expression, new_sorting_key.sample_block, "Sorting", allow_nullable_key);
 
 }
@@ -411,7 +434,7 @@ ExpressionActionsPtr getCombinedIndicesExpression(
     const KeyDescription & key,
     const IndicesDescription & indices,
     const ColumnsDescription & columns,
-    const Context & context)
+    ContextPtr context)
 {
     ASTPtr combined_expr_list = key.expression_list_ast->clone();
 
@@ -450,12 +473,12 @@ DataTypes MergeTreeData::getMinMaxColumnsTypes(const KeyDescription & partition_
 
 ExpressionActionsPtr MergeTreeData::getPrimaryKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const
 {
-    return getCombinedIndicesExpression(metadata_snapshot->getPrimaryKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), global_context);
+    return getCombinedIndicesExpression(metadata_snapshot->getPrimaryKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), getContext());
 }
 
 ExpressionActionsPtr MergeTreeData::getSortingKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const
 {
-    return getCombinedIndicesExpression(metadata_snapshot->getSortingKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), global_context);
+    return getCombinedIndicesExpression(metadata_snapshot->getSortingKey(), metadata_snapshot->getSecondaryIndices(), metadata_snapshot->getColumns(), getContext());
 }
 
 
@@ -627,7 +650,7 @@ void MergeTreeData::MergingParams::check(const StorageInMemoryMetadata & metadat
                     throw Exception("The column " + version_column +
                         " cannot be used as a version column for storage " + storage +
                         " because it is of type " + column.type->getName() +
-                        " (must be of an integer type or of type Date or DateTime)", ErrorCodes::BAD_TYPE_OF_FIELD);
+                        " (must be of an integer type or of type Date/DateTime/DateTime64)", ErrorCodes::BAD_TYPE_OF_FIELD);
                 miss_column = false;
                 break;
             }
@@ -682,25 +705,84 @@ void MergeTreeData::MergingParams::check(const StorageInMemoryMetadata & metadat
 }
 
 
-std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
-    const SelectQueryInfo & query_info, const Context & context, const DataPartsVector & parts) const
+DataTypePtr MergeTreeData::getPartitionValueType() const
 {
+    DataTypePtr partition_value_type;
+    auto partition_types = getInMemoryMetadataPtr()->partition_key.sample_block.getDataTypes();
+    if (partition_types.empty())
+        partition_value_type = std::make_shared<DataTypeUInt8>();
+    else
+        partition_value_type = std::make_shared<DataTypeTuple>(std::move(partition_types));
+    return partition_value_type;
+}
+
+
+Block MergeTreeData::getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool one_part) const
+{
+    DataTypePtr partition_value_type = getPartitionValueType();
+    bool has_partition_value = typeid_cast<const DataTypeTuple *>(partition_value_type.get());
+    Block block{
+        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")};
+
+    MutableColumns columns = block.mutateColumns();
+
+    auto & part_column = columns[0];
+    auto & partition_id_column = columns[1];
+    auto & part_uuid_column = columns[2];
+    auto & partition_value_column = columns[3];
+
+    for (const auto & part_or_projection : parts)
+    {
+        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);
+        part_uuid_column->insert(part->uuid);
+        Tuple tuple(part->partition.value.begin(), part->partition.value.end());
+        if (has_partition_value)
+            partition_value_column->insert(tuple);
+
+        if (one_part)
+        {
+            part_column = ColumnConst::create(std::move(part_column), 1);
+            partition_id_column = ColumnConst::create(std::move(partition_id_column), 1);
+            part_uuid_column = ColumnConst::create(std::move(part_uuid_column), 1);
+            if (has_partition_value)
+                partition_value_column = ColumnConst::create(std::move(partition_value_column), 1);
+            break;
+        }
+    }
+
+    block.setColumns(std::move(columns));
+    if (!has_partition_value)
+        block.erase("_partition_value");
+    return block;
+}
+
+
+std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
+    const SelectQueryInfo & query_info, ContextPtr local_context, const DataPartsVector & parts) const
+{
+    if (parts.empty())
+        return 0u;
     auto metadata_snapshot = getInMemoryMetadataPtr();
     ASTPtr expression_ast;
-    Block virtual_columns_block = MergeTreeDataSelectExecutor::getSampleBlockWithVirtualPartColumns();
+    Block virtual_columns_block = getBlockWithVirtualPartColumns(parts, true /* one_part */);
 
     // Generate valid expressions for filtering
-    bool valid = VirtualColumnUtils::prepareFilterBlockWithQuery(query_info.query, context, virtual_columns_block, expression_ast);
+    bool valid = VirtualColumnUtils::prepareFilterBlockWithQuery(query_info.query, local_context, virtual_columns_block, expression_ast);
 
-    PartitionPruner partition_pruner(metadata_snapshot->getPartitionKey(), query_info, context, true /* strict */);
+    PartitionPruner partition_pruner(metadata_snapshot, query_info, local_context, true /* strict */);
     if (partition_pruner.isUseless() && !valid)
         return {};
 
     std::unordered_set<String> part_values;
     if (valid && expression_ast)
     {
-        MergeTreeDataSelectExecutor::fillBlockWithVirtualPartColumns(parts, virtual_columns_block);
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, context, expression_ast);
+        virtual_columns_block = getBlockWithVirtualPartColumns(parts, false /* one_part */);
+        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, local_context, expression_ast);
         part_values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
         if (part_values.empty())
             return 0;
@@ -710,7 +792,7 @@ std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
     size_t res = 0;
     for (const auto & part : parts)
     {
-        if ((part_values.empty() || part_values.find(part->name) != part_values.end()) && !partition_pruner.canBePruned(part))
+        if ((part_values.empty() || part_values.find(part->name) != part_values.end()) && !partition_pruner.canBePruned(*part))
             res += part->rows_count;
     }
     return res;
@@ -765,7 +847,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
         for (const auto & disk_ptr : disks)
             defined_disk_names.insert(disk_ptr->getName());
 
-        for (const auto & [disk_name, disk] : global_context.getDisksMap())
+        for (const auto & [disk_name, disk] : getContext()->getDisksMap())
         {
             if (defined_disk_names.count(disk_name) == 0 && disk->exists(relative_data_path))
             {
@@ -796,13 +878,13 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             {
                 /// 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))
+                for (auto && part : write_ahead_log->restore(metadata_snapshot, getContext()))
                     parts_from_wal.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))
+                for (auto && part : wal.restore(metadata_snapshot, getContext()))
                     parts_from_wal.push_back(std::move(part));
             }
         }
@@ -813,7 +895,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
 
     if (part_names_with_disks.empty() && parts_from_wal.empty())
     {
-        LOG_DEBUG(log, "There is no data parts");
+        LOG_DEBUG(log, "There are no data parts");
         return;
     }
 
@@ -846,8 +928,8 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             auto part = createPart(part_name, part_info, single_disk_volume, part_name);
             bool broken = false;
 
-            String part_path = relative_data_path + "/" + part_name;
-            String marker_path = part_path + "/" + IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
+            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);
@@ -935,7 +1017,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             else
                 has_adaptive_parts.store(true, std::memory_order_relaxed);
 
-            part->modification_time = part_disk_ptr->getLastModified(relative_data_path + part_name).epochTime();
+            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);
 
@@ -1079,9 +1161,14 @@ void MergeTreeData::clearOldTemporaryDirectories(ssize_t custom_directories_life
                         disk->removeRecursive(it->path());
                     }
                 }
-                catch (const Poco::FileNotFoundException &)
+                catch (const fs::filesystem_error & e)
                 {
-                    /// If the file is already deleted, do nothing.
+                    if (e.code() == std::errc::no_such_file_or_directory)
+                    {
+                        /// If the file is already deleted, do nothing.
+                    }
+                    else
+                        throw;
                 }
             }
         }
@@ -1168,13 +1255,13 @@ void MergeTreeData::removePartsFinally(const MergeTreeData::DataPartsVector & pa
     /// NOTE: There is no need to log parts deletion somewhere else, all deleting parts pass through this function and pass away
 
     auto table_id = getStorageID();
-    if (auto part_log = global_context.getPartLog(table_id.database_name))
+    if (auto part_log = getContext()->getPartLog(table_id.database_name))
     {
         PartLogElement part_log_elem;
 
         part_log_elem.event_type = PartLogElement::REMOVE_PART;
         part_log_elem.event_time = time(nullptr);
-        part_log_elem.duration_ms = 0;
+        part_log_elem.duration_ms = 0; //-V1048
 
         part_log_elem.database_name = table_id.database_name;
         part_log_elem.table_name = table_id.table_name;
@@ -1200,7 +1287,7 @@ void MergeTreeData::clearOldPartsFromFilesystem(bool force)
     /// This is needed to close files to avoid they reside on disk after being deleted.
     /// NOTE: we can drop files from cache more selectively but this is good enough.
     if (!parts_to_remove.empty())
-        global_context.dropMMappedFileCache();
+        getContext()->dropMMappedFileCache();
 }
 
 void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts_to_remove)
@@ -1210,14 +1297,21 @@ void MergeTreeData::clearPartsFromFilesystem(const DataPartsVector & parts_to_re
     {
         /// Parallel parts removal.
 
-        size_t num_threads = std::min(size_t(settings->max_part_removal_threads), parts_to_remove.size());
+        size_t num_threads = std::min<size_t>(settings->max_part_removal_threads, parts_to_remove.size());
         ThreadPool pool(num_threads);
 
         /// NOTE: Under heavy system load you may get "Cannot schedule a task" from ThreadPool.
         for (const DataPartPtr & part : parts_to_remove)
         {
-            pool.scheduleOrThrowOnError([&]
+            pool.scheduleOrThrowOnError([&, thread_group = CurrentThread::getGroup()]
             {
+                SCOPE_EXIT_SAFE(
+                    if (thread_group)
+                        CurrentThread::detachQueryIfNotDetached();
+                );
+                if (thread_group)
+                    CurrentThread::attachTo(thread_group);
+
                 LOG_DEBUG(log, "Removing part from filesystem {}", part->name);
                 part->remove();
             });
@@ -1299,11 +1393,7 @@ void MergeTreeData::clearEmptyParts()
     for (const auto & part : parts)
     {
         if (part->rows_count == 0)
-        {
-            ASTPtr literal = std::make_shared<ASTLiteral>(part->name);
-            /// If another replica has already started drop, it's ok, no need to throw.
-            dropPartition(literal, /* detach = */ false, /*drop_part = */ true, global_context, /* throw_if_noop = */ false);
-        }
+            dropPartNoWaitNoThrow(part->name);
     }
 }
 
@@ -1325,7 +1415,7 @@ void MergeTreeData::rename(const String & new_table_path, const StorageID & new_
     }
 
     if (!getStorageID().hasUUID())
-        global_context.dropCaches();
+        getContext()->dropCaches();
 
     relative_data_path = new_table_path;
     renameInMemory(new_table_id);
@@ -1347,7 +1437,7 @@ void MergeTreeData::dropAllData()
     /// Tables in atomic databases have UUID and stored in persistent locations.
     /// No need to drop caches (that are keyed by filesystem path) because collision is not possible.
     if (!getStorageID().hasUUID())
-        global_context.dropCaches();
+        getContext()->dropCaches();
 
     LOG_TRACE(log, "dropAllData: removing data from filesystem.");
 
@@ -1360,10 +1450,15 @@ void MergeTreeData::dropAllData()
         {
             disk->removeRecursive(path);
         }
-        catch (const Poco::FileNotFoundException &)
+        catch (const fs::filesystem_error & e)
         {
-            /// If the file is already deleted, log the error message and do nothing.
-            tryLogCurrentException(__PRETTY_FUNCTION__);
+            if (e.code() == std::errc::no_such_file_or_directory)
+            {
+                /// If the file is already deleted, log the error message and do nothing.
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+            else
+                throw;
         }
     }
 
@@ -1381,12 +1476,20 @@ void MergeTreeData::dropIfEmpty()
     if (!data_parts_by_info.empty())
         return;
 
-    for (const auto & [path, disk] : getRelativeDataPathsWithDisks())
+    try
     {
-        /// Non recursive, exception is thrown if there are more files.
-        disk->removeFile(path + MergeTreeData::FORMAT_VERSION_FILE_NAME);
-        disk->removeDirectory(path + MergeTreeData::DETACHED_DIR_NAME);
-        disk->removeDirectory(path);
+        for (const auto & [path, disk] : getRelativeDataPathsWithDisks())
+        {
+            /// Non recursive, exception is thrown if there are more files.
+            disk->removeFileIfExists(fs::path(path) / MergeTreeData::FORMAT_VERSION_FILE_NAME);
+            disk->removeDirectory(fs::path(path) / MergeTreeData::DETACHED_DIR_NAME);
+            disk->removeDirectory(path);
+        }
+    }
+    catch (...)
+    {
+        // On unsuccessful creation of ReplicatedMergeTree table with multidisk configuration some files may not exist.
+        tryLogCurrentException(__PRETTY_FUNCTION__);
     }
 }
 
@@ -1472,23 +1575,23 @@ void checkVersionColumnTypesConversion(const IDataType * old_type, const IDataTy
 
 }
 
-void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const Context & context) const
+void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
     /// Check that needed transformations can be applied to the list of columns without considering type conversions.
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
 
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
 
     if (!settings.allow_non_metadata_alters)
     {
 
-        auto mutation_commands = commands.getMutationCommands(new_metadata, settings.materialize_ttl_after_modify, global_context);
+        auto mutation_commands = commands.getMutationCommands(new_metadata, settings.materialize_ttl_after_modify, getContext());
 
         if (!mutation_commands.empty())
             throw Exception(ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN, "The following alter commands: '{}' will modify data on disk, but setting `allow_non_metadata_alters` is disabled", queryToString(mutation_commands.ast()));
     }
-    commands.apply(new_metadata, global_context);
+    commands.apply(new_metadata, getContext());
 
     /// Set of columns that shouldn't be altered.
     NameSet columns_alter_type_forbidden;
@@ -1551,13 +1654,13 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const C
         old_types.emplace(column.name, column.type.get());
 
     NamesAndTypesList columns_to_check_conversion;
-    auto name_deps = getDependentViewsByColumn(context);
+    auto name_deps = getDependentViewsByColumn(local_context);
     for (const AlterCommand & command : commands)
     {
         /// Just validate partition expression
         if (command.partition)
         {
-            getPartitionIDFromQuery(command.partition, global_context);
+            getPartitionIDFromQuery(command.partition, getContext());
         }
 
         if (command.column_name == merging_params.version_column)
@@ -1568,7 +1671,8 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const C
                 const IDataType * new_type = command.data_type.get();
                 const IDataType * old_type = old_types[command.column_name];
 
-                checkVersionColumnTypesConversion(old_type, new_type, command.column_name);
+                if (new_type)
+                    checkVersionColumnTypesConversion(old_type, new_type, command.column_name);
 
                 /// No other checks required
                 continue;
@@ -1614,6 +1718,12 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const C
                 "ALTER ADD INDEX is not supported for tables with the old syntax",
                 ErrorCodes::BAD_ARGUMENTS);
         }
+        if (command.type == AlterCommand::ADD_PROJECTION && !is_custom_partitioned)
+        {
+            throw Exception(
+                "ALTER ADD PROJECTION is not supported for tables with the old syntax",
+                ErrorCodes::BAD_ARGUMENTS);
+        }
         if (command.type == AlterCommand::RENAME_COLUMN)
         {
             if (columns_in_keys.count(command.column_name))
@@ -1632,13 +1742,16 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const C
                     ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
             }
 
-            const auto & deps_mv = name_deps[command.column_name];
-            if (!deps_mv.empty())
+            if (!command.clear)
             {
-                throw Exception(
-                    "Trying to ALTER DROP column " + backQuoteIfNeed(command.column_name) + " which is referenced by materialized view "
-                        + toString(deps_mv),
-                    ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
+                const auto & deps_mv = name_deps[command.column_name];
+                if (!deps_mv.empty())
+                {
+                    throw Exception(
+                        "Trying to ALTER DROP column " + backQuoteIfNeed(command.column_name) + " which is referenced by materialized view "
+                            + toString(deps_mv),
+                        ErrorCodes::ALTER_OF_COLUMN_IS_FORBIDDEN);
+                }
             }
 
             dropped_columns.emplace(command.column_name);
@@ -1691,7 +1804,7 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const C
     if (!columns_to_check_conversion.empty())
     {
         auto old_header = old_metadata.getSampleBlock();
-        performRequiredConversions(old_header, columns_to_check_conversion, global_context);
+        performRequiredConversions(old_header, columns_to_check_conversion, getContext());
     }
 
     if (old_metadata.hasSettingsChanges())
@@ -1722,7 +1835,7 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const C
             }
 
             if (setting_name == "storage_policy")
-                checkStoragePolicy(global_context.getStoragePolicy(new_value.safeGet<String>()));
+                checkStoragePolicy(getContext()->getStoragePolicy(new_value.safeGet<String>()));
         }
     }
 
@@ -1784,14 +1897,14 @@ MergeTreeDataPartType MergeTreeData::choosePartTypeOnDisk(size_t bytes_uncompres
 
 MergeTreeData::MutableDataPartPtr MergeTreeData::createPart(const String & name,
     MergeTreeDataPartType type, const MergeTreePartInfo & part_info,
-    const VolumePtr & volume, const String & relative_path) const
+    const VolumePtr & volume, const String & relative_path, const IMergeTreeDataPart * parent_part) const
 {
     if (type == MergeTreeDataPartType::COMPACT)
-        return std::make_shared<MergeTreeDataPartCompact>(*this, name, part_info, volume, relative_path);
+        return std::make_shared<MergeTreeDataPartCompact>(*this, name, part_info, volume, relative_path, parent_part);
     else if (type == MergeTreeDataPartType::WIDE)
-        return std::make_shared<MergeTreeDataPartWide>(*this, name, part_info, volume, relative_path);
+        return std::make_shared<MergeTreeDataPartWide>(*this, name, part_info, volume, relative_path, parent_part);
     else if (type == MergeTreeDataPartType::IN_MEMORY)
-        return std::make_shared<MergeTreeDataPartInMemory>(*this, name, part_info, volume, relative_path);
+        return std::make_shared<MergeTreeDataPartInMemory>(*this, name, part_info, volume, relative_path, parent_part);
     else
         throw Exception("Unknown type of part " + relative_path, ErrorCodes::UNKNOWN_PART_TYPE);
 }
@@ -1809,17 +1922,17 @@ static MergeTreeDataPartType getPartTypeFromMarkExtension(const String & mrk_ext
 }
 
 MergeTreeData::MutableDataPartPtr MergeTreeData::createPart(
-    const String & name, const VolumePtr & volume, const String & relative_path) const
+    const String & name, const VolumePtr & volume, const String & relative_path, const IMergeTreeDataPart * parent_part) const
 {
-    return createPart(name, MergeTreePartInfo::fromPartName(name, format_version), volume, relative_path);
+    return createPart(name, MergeTreePartInfo::fromPartName(name, format_version), volume, relative_path, parent_part);
 }
 
 MergeTreeData::MutableDataPartPtr MergeTreeData::createPart(
     const String & name, const MergeTreePartInfo & part_info,
-    const VolumePtr & volume, const String & relative_path) const
+    const VolumePtr & volume, const String & relative_path, const IMergeTreeDataPart * parent_part) const
 {
     MergeTreeDataPartType type;
-    auto full_path = relative_data_path + relative_path + "/";
+    auto full_path = fs::path(relative_data_path) / (parent_part ? parent_part->relative_path : "") / relative_path / "";
     auto mrk_ext = MergeTreeIndexGranularityInfo::getMarksExtensionFromFilesystem(volume->getDisk(), full_path);
 
     if (mrk_ext)
@@ -1830,7 +1943,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::createPart(
         type = choosePartTypeOnDisk(0, 0);
     }
 
-    return createPart(name, type, part_info, volume, relative_path);
+    return createPart(name, type, part_info, volume, relative_path, parent_part);
 }
 
 void MergeTreeData::changeSettings(
@@ -1847,7 +1960,7 @@ void MergeTreeData::changeSettings(
         {
             if (change.name == "storage_policy")
             {
-                StoragePolicyPtr new_storage_policy = global_context.getStoragePolicy(change.value.safeGet<String>());
+                StoragePolicyPtr new_storage_policy = getContext()->getStoragePolicy(change.value.safeGet<String>());
                 StoragePolicyPtr old_storage_policy = getStoragePolicy();
 
                 /// StoragePolicy of different version or name is guaranteed to have different pointer
@@ -1872,7 +1985,7 @@ void MergeTreeData::changeSettings(
                     {
                         auto disk = new_storage_policy->getDiskByName(disk_name);
                         disk->createDirectories(relative_data_path);
-                        disk->createDirectories(relative_data_path + MergeTreeData::DETACHED_DIR_NAME);
+                        disk->createDirectories(fs::path(relative_data_path) / MergeTreeData::DETACHED_DIR_NAME);
                     }
                     /// FIXME how would that be done while reloading configuration???
 
@@ -1884,7 +1997,7 @@ void MergeTreeData::changeSettings(
         MergeTreeSettings copy = *getSettings();
         copy.applyChanges(new_changes);
 
-        copy.sanityCheck(global_context.getSettingsRef());
+        copy.sanityCheck(getContext()->getSettingsRef());
 
         storage_settings.set(std::make_unique<const MergeTreeSettings>(copy));
         StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
@@ -1901,7 +2014,7 @@ void MergeTreeData::PartsTemporaryRename::addPart(const String & old_name, const
     old_and_new_names.push_back({old_name, new_name});
     for (const auto & [path, disk] : storage.getRelativeDataPathsWithDisks())
     {
-        for (auto it = disk->iterateDirectory(path + source_dir); it->isValid(); it->next())
+        for (auto it = disk->iterateDirectory(fs::path(path) / source_dir); it->isValid(); it->next())
         {
             if (it->name() == old_name)
             {
@@ -1923,8 +2036,8 @@ void MergeTreeData::PartsTemporaryRename::tryRenameAll()
             if (old_name.empty() || new_name.empty())
                 throw DB::Exception("Empty part name. Most likely it's a bug.", ErrorCodes::INCORRECT_FILE_NAME);
             const auto & [path, disk] = old_part_name_to_path_and_disk[old_name];
-            const auto full_path = path + source_dir; /// for old_name
-            disk->moveFile(full_path + old_name, full_path + new_name);
+            const auto full_path = fs::path(path) / source_dir; /// for old_name
+            disk->moveFile(fs::path(full_path) / old_name, fs::path(full_path) / new_name);
         }
         catch (...)
         {
@@ -1948,8 +2061,8 @@ MergeTreeData::PartsTemporaryRename::~PartsTemporaryRename()
         try
         {
             const auto & [path, disk] = old_part_name_to_path_and_disk[old_name];
-            const auto full_path = path + source_dir; /// for old_name
-            disk->moveFile(full_path + new_name, full_path + old_name);
+            const String full_path = fs::path(path) / source_dir; /// for old_name
+            disk->moveFile(fs::path(full_path) / new_name, fs::path(full_path) / old_name);
         }
         catch (...)
         {
@@ -1984,8 +2097,8 @@ MergeTreeData::DataPartsVector MergeTreeData::getActivePartsToReplace(
             }
 
             if (!new_part_info.isDisjoint((*prev)->info))
-                throw Exception("Part " + new_part_name + " intersects previous part " + (*prev)->getNameWithState() +
-                    ". It is a bug.", ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects previous part {}. It is a bug.",
+                                new_part_name, (*prev)->getNameWithState());
 
             break;
         }
@@ -1998,7 +2111,7 @@ MergeTreeData::DataPartsVector MergeTreeData::getActivePartsToReplace(
     while (end != committed_parts_range.end())
     {
         if ((*end)->info == new_part_info)
-            throw Exception("Unexpected duplicate part " + (*end)->getNameWithState() + ". It is a bug.", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected duplicate part {}. It is a bug.", (*end)->getNameWithState());
 
         if (!new_part_info.contains((*end)->info))
         {
@@ -2009,8 +2122,8 @@ MergeTreeData::DataPartsVector MergeTreeData::getActivePartsToReplace(
             }
 
             if (!new_part_info.isDisjoint((*end)->info))
-                throw Exception("Part " + new_part_name + " intersects next part " + (*end)->getNameWithState() +
-                    ". It is a bug.", ErrorCodes::LOGICAL_ERROR);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects next part {}. It is a bug.",
+                                new_part_name, (*end)->getNameWithState());
 
             break;
         }
@@ -2022,7 +2135,7 @@ MergeTreeData::DataPartsVector MergeTreeData::getActivePartsToReplace(
 }
 
 
-bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction)
+bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction, MergeTreeDeduplicationLog * deduplication_log)
 {
     if (out_transaction && &out_transaction->data != this)
         throw Exception("MergeTreeData::Transaction for one table cannot be used with another. It is a bug.",
@@ -2031,7 +2144,7 @@ bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrem
     DataPartsVector covered_parts;
     {
         auto lock = lockParts();
-        if (!renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts))
+        if (!renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts, deduplication_log))
             return false;
     }
     if (!covered_parts.empty())
@@ -2044,7 +2157,7 @@ bool MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrem
 
 bool MergeTreeData::renameTempPartAndReplace(
     MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction,
-    std::unique_lock<std::mutex> & lock, DataPartsVector * out_covered_parts)
+    std::unique_lock<std::mutex> & lock, DataPartsVector * out_covered_parts, MergeTreeDeduplicationLog * deduplication_log)
 {
     if (out_transaction && &out_transaction->data != this)
         throw Exception("MergeTreeData::Transaction for one table cannot be used with another. It is a bug.",
@@ -2099,6 +2212,22 @@ bool MergeTreeData::renameTempPartAndReplace(
         return false;
     }
 
+    /// Deduplication log used only from non-replicated MergeTree. Replicated
+    /// tables have their own mechanism. We try to deduplicate at such deep
+    /// level, because only here we know real part name which is required for
+    /// deduplication.
+    if (deduplication_log)
+    {
+        String block_id = part->getZeroLevelPartBlockID();
+        auto res = deduplication_log->addPart(block_id, part_info);
+        if (!res.second)
+        {
+            ProfileEvents::increment(ProfileEvents::DuplicatedInsertedBlocks);
+            LOG_INFO(log, "Block with ID {} already exists as part {}; ignoring it", block_id, res.first.getPartName());
+            return false;
+        }
+    }
+
     /// All checks are passed. Now we can rename the part on disk.
     /// So, we maintain invariant: if a non-temporary part in filesystem then it is in data_parts
     ///
@@ -2155,7 +2284,7 @@ bool MergeTreeData::renameTempPartAndReplace(
 }
 
 MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(
-    MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction)
+    MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction, MergeTreeDeduplicationLog * deduplication_log)
 {
     if (out_transaction && &out_transaction->data != this)
         throw Exception("MergeTreeData::Transaction for one table cannot be used with another. It is a bug.",
@@ -2164,7 +2293,7 @@ MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(
     DataPartsVector covered_parts;
     {
         auto lock = lockParts();
-        renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts);
+        renameTempPartAndReplace(part, increment, out_transaction, lock, &covered_parts, deduplication_log);
     }
     return covered_parts;
 }
@@ -2224,12 +2353,12 @@ void MergeTreeData::removePartsFromWorkingSet(const DataPartsVector & remove, bo
 }
 
 MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSet(const MergeTreePartInfo & drop_range, bool clear_without_timeout,
-                                                                               bool skip_intersecting_parts, DataPartsLock & lock)
+                                                                               DataPartsLock & lock)
 {
     DataPartsVector parts_to_remove;
 
     if (drop_range.min_block > drop_range.max_block)
-        return parts_to_remove;
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid drop range: {}", drop_range.getPartName());
 
     auto partition_range = getDataPartsPartitionRange(drop_range.partition_id);
 
@@ -2238,16 +2367,13 @@ MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSet(c
         if (part->info.partition_id != drop_range.partition_id)
             throw Exception("Unexpected partition_id of part " + part->name + ". This is a bug.", ErrorCodes::LOGICAL_ERROR);
 
-        if (part->info.min_block < drop_range.min_block)
+        if (part->info.min_block < drop_range.min_block)    /// NOTE Always false, because drop_range.min_block == 0
         {
             if (drop_range.min_block <= part->info.max_block)
             {
                 /// Intersect left border
-                String error = "Unexpected merged part " + part->name + " intersecting drop range " + drop_range.getPartName();
-                if (!skip_intersecting_parts)
-                    throw Exception(error, ErrorCodes::LOGICAL_ERROR);
-
-                LOG_WARNING(log, error);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected merged part {} intersecting drop range {}",
+                                part->name, drop_range.getPartName());
             }
 
             continue;
@@ -2260,12 +2386,8 @@ MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSet(c
         if (part->info.min_block <= drop_range.max_block && drop_range.max_block < part->info.max_block)
         {
             /// Intersect right border
-            String error = "Unexpected merged part " + part->name + " intersecting drop range " + drop_range.getPartName();
-            if (!skip_intersecting_parts)
-                throw Exception(error, ErrorCodes::LOGICAL_ERROR);
-
-            LOG_WARNING(log, error);
-            continue;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected merged part {} intersecting drop range {}",
+                            part->name, drop_range.getPartName());
         }
 
         if (part->getState() != DataPartState::Deleting)
@@ -2521,7 +2643,7 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until) const
     if (settings->inactive_parts_to_throw_insert > 0 || settings->inactive_parts_to_delay_insert > 0)
     {
         size_t inactive_parts_count_in_partition = getMaxInactivePartsCountForPartition();
-        if (inactive_parts_count_in_partition >= settings->inactive_parts_to_throw_insert)
+        if (settings->inactive_parts_to_throw_insert > 0 && inactive_parts_count_in_partition >= settings->inactive_parts_to_throw_insert)
         {
             ProfileEvents::increment(ProfileEvents::RejectedInserts);
             throw Exception(
@@ -2537,7 +2659,7 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until) const
         ProfileEvents::increment(ProfileEvents::RejectedInserts);
         throw Exception(
             ErrorCodes::TOO_MANY_PARTS,
-            "Too many parts ({}). Parts cleaning are processing significantly slower than inserts",
+            "Too many parts ({}). Merges are processing significantly slower than inserts",
             parts_count_in_partition);
     }
 
@@ -2611,6 +2733,22 @@ void MergeTreeData::swapActivePart(MergeTreeData::DataPartPtr part_copy)
             if (active_part_it == data_parts_by_info.end())
                 throw Exception("Cannot swap part '" + part_copy->name + "', no such active part.", ErrorCodes::NO_SUCH_DATA_PART);
 
+            /// We do not check allow_s3_zero_copy_replication here because data may be shared
+            /// when allow_s3_zero_copy_replication turned on and off again
+
+            original_active_part->keep_s3_on_delete = false;
+
+            if (original_active_part->volume->getDisk()->getType() == DiskType::Type::S3)
+            {
+                if (part_copy->volume->getDisk()->getType() == DiskType::Type::S3
+                        && original_active_part->getUniqueId() == part_copy->getUniqueId())
+                {   /// May be when several volumes use the same S3 storage
+                    original_active_part->keep_s3_on_delete = true;
+                }
+                else
+                    original_active_part->keep_s3_on_delete = !unlockSharedData(*original_active_part);
+            }
+
             modifyPartState(original_active_part, DataPartState::DeleteOnDestroy);
             data_parts_indexes.erase(active_part_it);
 
@@ -2621,7 +2759,7 @@ void MergeTreeData::swapActivePart(MergeTreeData::DataPartPtr part_copy)
             addPartContributionToDataVolume(part_copy);
 
             auto disk = original_active_part->volume->getDisk();
-            String marker_path = original_active_part->getFullRelativePath() + IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
+            String marker_path = fs::path(original_active_part->getFullRelativePath()) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
             try
             {
                 disk->createFile(marker_path);
@@ -2732,7 +2870,8 @@ void MergeTreeData::removePartContributionToColumnSizes(const DataPartPtr & part
     }
 }
 
-void MergeTreeData::checkAlterPartitionIsPossible(const PartitionCommands & commands, const StorageMetadataPtr & /*metadata_snapshot*/, const Settings & settings) const
+void MergeTreeData::checkAlterPartitionIsPossible(
+    const PartitionCommands & commands, const StorageMetadataPtr & /*metadata_snapshot*/, const Settings & settings) const
 {
     for (const auto & command : commands)
     {
@@ -2752,7 +2891,7 @@ void MergeTreeData::checkAlterPartitionIsPossible(const PartitionCommands & comm
             else
             {
                 /// We are able to parse it
-                getPartitionIDFromQuery(command.partition, global_context);
+                getPartitionIDFromQuery(command.partition, getContext());
             }
         }
     }
@@ -2760,7 +2899,7 @@ void MergeTreeData::checkAlterPartitionIsPossible(const PartitionCommands & comm
 
 void MergeTreeData::checkPartitionCanBeDropped(const ASTPtr & partition)
 {
-    const String partition_id = getPartitionIDFromQuery(partition, global_context);
+    const String partition_id = getPartitionIDFromQuery(partition, getContext());
     auto parts_to_remove = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
 
     UInt64 partition_size = 0;
@@ -2769,28 +2908,27 @@ void MergeTreeData::checkPartitionCanBeDropped(const ASTPtr & partition)
         partition_size += part->getBytesOnDisk();
 
     auto table_id = getStorageID();
-    global_context.checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, partition_size);
+    getContext()->checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, partition_size);
 }
 
-void MergeTreeData::checkPartCanBeDropped(const ASTPtr & part_ast)
+void MergeTreeData::checkPartCanBeDropped(const String & part_name)
 {
-    String part_name = part_ast->as<ASTLiteral &>().value.safeGet<String>();
     auto part = getPartIfExists(part_name, {MergeTreeDataPartState::Committed});
     if (!part)
         throw Exception(ErrorCodes::NO_SUCH_DATA_PART, "No part {} in committed state", part_name);
 
     auto table_id = getStorageID();
-    global_context.checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, part->getBytesOnDisk());
+    getContext()->checkPartitionCanBeDropped(table_id.database_name, table_id.table_name, part->getBytesOnDisk());
 }
 
-void MergeTreeData::movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, const Context & context)
+void MergeTreeData::movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr local_context)
 {
     String partition_id;
 
     if (moving_part)
         partition_id = partition->as<ASTLiteral &>().value.safeGet<String>();
     else
-        partition_id = getPartitionIDFromQuery(partition, context);
+        partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector parts;
     if (moving_part)
@@ -2828,14 +2966,14 @@ void MergeTreeData::movePartitionToDisk(const ASTPtr & partition, const String &
 }
 
 
-void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, const Context & context)
+void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr local_context)
 {
     String partition_id;
 
     if (moving_part)
         partition_id = partition->as<ASTLiteral &>().value.safeGet<String>();
     else
-        partition_id = getPartitionIDFromQuery(partition, context);
+        partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector parts;
     if (moving_part)
@@ -2853,7 +2991,7 @@ void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String
         throw Exception("Volume " + name + " does not exists on policy " + getStoragePolicy()->getName(), ErrorCodes::UNKNOWN_DISK);
 
     if (parts.empty())
-        throw Exception("Nothing to move", ErrorCodes::NO_SUCH_DATA_PART);
+        throw Exception("Nothing to move (сheck that the partition exists).", ErrorCodes::NO_SUCH_DATA_PART);
 
     parts.erase(std::remove_if(parts.begin(), parts.end(), [&](auto part_ptr)
         {
@@ -2882,7 +3020,17 @@ void MergeTreeData::movePartitionToVolume(const ASTPtr & partition, const String
         throw Exception("Cannot move parts because moves are manually disabled", ErrorCodes::ABORTED);
 }
 
-void MergeTreeData::fetchPartition(const ASTPtr & /*partition*/, const StorageMetadataPtr & /*metadata_snapshot*/, const String & /*from*/, const Context & /*query_context*/)
+void MergeTreeData::movePartitionToShard(const ASTPtr & /*partition*/, bool /*move_part*/, const String & /*to*/, ContextPtr /*query_context*/)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "MOVE PARTITION TO SHARD is not supported by storage {}", getName());
+}
+
+void MergeTreeData::fetchPartition(
+    const ASTPtr & /*partition*/,
+    const StorageMetadataPtr & /*metadata_snapshot*/,
+    const String & /*from*/,
+    bool /*fetch_part*/,
+    ContextPtr /*query_context*/)
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "FETCH PARTITION is not supported by storage {}", getName());
 }
@@ -2890,7 +3038,7 @@ void MergeTreeData::fetchPartition(const ASTPtr & /*partition*/, const StorageMe
 Pipe MergeTreeData::alterPartition(
     const StorageMetadataPtr & metadata_snapshot,
     const PartitionCommands & commands,
-    const Context & query_context)
+    ContextPtr query_context)
 {
     PartitionCommandsResultInfo result;
     for (const PartitionCommand & command : commands)
@@ -2899,12 +3047,20 @@ Pipe MergeTreeData::alterPartition(
         switch (command.type)
         {
             case PartitionCommand::DROP_PARTITION:
+            {
                 if (command.part)
-                    checkPartCanBeDropped(command.partition);
+                {
+                    auto part_name = command.partition->as<ASTLiteral &>().value.safeGet<String>();
+                    checkPartCanBeDropped(part_name);
+                    dropPart(part_name, command.detach, query_context);
+                }
                 else
+                {
                     checkPartitionCanBeDropped(command.partition);
-                dropPartition(command.partition, command.detach, command.part, query_context);
-                break;
+                    dropPartition(command.partition, command.detach, query_context);
+                }
+            }
+            break;
 
             case PartitionCommand::DROP_DETACHED_PARTITION:
                 dropDetached(command.partition, command.part, query_context);
@@ -2926,11 +3082,23 @@ Pipe MergeTreeData::alterPartition(
                         break;
 
                     case PartitionCommand::MoveDestinationType::TABLE:
+                    {
                         checkPartitionCanBeDropped(command.partition);
-                        String dest_database = query_context.resolveDatabase(command.to_database);
+                        String dest_database = query_context->resolveDatabase(command.to_database);
                         auto dest_storage = DatabaseCatalog::instance().getTable({dest_database, command.to_table}, query_context);
                         movePartitionToTable(dest_storage, command.partition, query_context);
-                        break;
+                    }
+                    break;
+
+                    case PartitionCommand::MoveDestinationType::SHARD:
+                    {
+                        if (!getSettings()->part_moves_between_shards_enable)
+                            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                                            "Moving parts between shards is experimental and work in progress"
+                                            ", see part_moves_between_shards_enable setting");
+                        movePartitionToShard(command.partition, command.part, command.move_destination_name, query_context);
+                    }
+                    break;
                 }
             }
             break;
@@ -2938,57 +3106,60 @@ Pipe MergeTreeData::alterPartition(
             case PartitionCommand::REPLACE_PARTITION:
             {
                 checkPartitionCanBeDropped(command.partition);
-                String from_database = query_context.resolveDatabase(command.from_database);
+                String from_database = query_context->resolveDatabase(command.from_database);
                 auto from_storage = DatabaseCatalog::instance().getTable({from_database, command.from_table}, query_context);
                 replacePartitionFrom(from_storage, command.partition, command.replace, query_context);
             }
             break;
 
             case PartitionCommand::FETCH_PARTITION:
-                fetchPartition(command.partition, metadata_snapshot, command.from_zookeeper_path, query_context);
+                fetchPartition(command.partition, metadata_snapshot, command.from_zookeeper_path, command.part, query_context);
                 break;
 
             case PartitionCommand::FREEZE_PARTITION:
             {
-                auto lock = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
                 current_command_results = freezePartition(command.partition, metadata_snapshot, command.with_name, query_context, lock);
             }
             break;
 
             case PartitionCommand::FREEZE_ALL_PARTITIONS:
             {
-                auto lock = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
                 current_command_results = freezeAll(command.with_name, metadata_snapshot, query_context, lock);
             }
             break;
 
             case PartitionCommand::UNFREEZE_PARTITION:
             {
-                auto lock = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
                 current_command_results = unfreezePartition(command.partition, command.with_name, query_context, lock);
             }
             break;
 
             case PartitionCommand::UNFREEZE_ALL_PARTITIONS:
             {
-                auto lock = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+                auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
                 current_command_results = unfreezeAll(command.with_name, query_context, lock);
             }
 
             break;
+
+            default:
+                throw Exception("Uninitialized partition command", ErrorCodes::LOGICAL_ERROR);
         }
         for (auto & command_result : current_command_results)
             command_result.command_type = command.typeToString();
         result.insert(result.end(), current_command_results.begin(), current_command_results.end());
     }
 
-    if (query_context.getSettingsRef().alter_partition_verbose_result)
+    if (query_context->getSettingsRef().alter_partition_verbose_result)
         return convertCommandsResultToSource(result);
 
     return {};
 }
 
-String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, const Context & context) const
+String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr local_context) const
 {
     const auto & partition_ast = ast->as<ASTPartition &>();
 
@@ -3030,7 +3201,12 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, const Context
         ReadBufferFromMemory right_paren_buf(")", 1);
         ConcatReadBuffer buf({&left_paren_buf, &fields_buf, &right_paren_buf});
 
-        auto input_format = FormatFactory::instance().getInput("Values", buf, metadata_snapshot->getPartitionKey().sample_block, context, context.getSettingsRef().max_block_size);
+        auto input_format = FormatFactory::instance().getInput(
+            "Values",
+            buf,
+            metadata_snapshot->getPartitionKey().sample_block,
+            local_context,
+            local_context->getSettingsRef().max_block_size);
         auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
 
         auto block = input_stream->read();
@@ -3063,7 +3239,8 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, const Context
     return partition_id;
 }
 
-MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVector(const DataPartStates & affordable_states, DataPartStateVector * out_states) const
+MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVector(
+    const DataPartStates & affordable_states, DataPartStateVector * out_states, bool require_projection_parts) const
 {
     DataPartsVector res;
     DataPartsVector buf;
@@ -3072,27 +3249,64 @@ MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVector(const DataPartS
 
         for (auto state : affordable_states)
         {
-            std::swap(buf, res);
-            res.clear();
-
             auto range = getDataPartsStateRange(state);
-            std::merge(range.begin(), range.end(), buf.begin(), buf.end(), std::back_inserter(res), LessDataPart());
+
+            if (require_projection_parts)
+            {
+                for (const auto & part : range)
+                {
+                    for (const auto & [p_name, projection_part] : part->getProjectionParts())
+                        res.push_back(projection_part);
+                }
+            }
+            else
+            {
+                std::swap(buf, res);
+                res.clear();
+                std::merge(range.begin(), range.end(), buf.begin(), buf.end(), std::back_inserter(res), LessDataPart()); //-V783
+            }
         }
 
         if (out_states != nullptr)
         {
             out_states->resize(res.size());
-            for (size_t i = 0; i < res.size(); ++i)
-                (*out_states)[i] = res[i]->getState();
+            if (require_projection_parts)
+            {
+                for (size_t i = 0; i < res.size(); ++i)
+                    (*out_states)[i] = res[i]->getParentPart()->getState();
+            }
+            else
+            {
+                for (size_t i = 0; i < res.size(); ++i)
+                    (*out_states)[i] = res[i]->getState();
+            }
         }
     }
 
     return res;
 }
 
-MergeTreeData::DataPartsVector MergeTreeData::getAllDataPartsVector(MergeTreeData::DataPartStateVector * out_states) const
+MergeTreeData::DataPartsVector
+MergeTreeData::getAllDataPartsVector(MergeTreeData::DataPartStateVector * out_states, bool require_projection_parts) const
 {
     DataPartsVector res;
+    if (require_projection_parts)
+    {
+        auto lock = lockParts();
+        for (const auto & part : data_parts_by_info)
+        {
+            for (const auto & [p_name, projection_part] : part->getProjectionParts())
+                res.push_back(projection_part);
+        }
+
+        if (out_states != nullptr)
+        {
+            out_states->resize(res.size());
+            for (size_t i = 0; i < res.size(); ++i)
+                (*out_states)[i] = res[i]->getParentPart()->getState();
+        }
+    }
+    else
     {
         auto lock = lockParts();
         res.assign(data_parts_by_info.begin(), data_parts_by_info.end());
@@ -3115,7 +3329,7 @@ MergeTreeData::getDetachedParts() const
 
     for (const auto & [path, disk] : getRelativeDataPathsWithDisks())
     {
-        for (auto it = disk->iterateDirectory(path + MergeTreeData::DETACHED_DIR_NAME); it->isValid(); it->next())
+        for (auto it = disk->iterateDirectory(fs::path(path) / MergeTreeData::DETACHED_DIR_NAME); it->isValid(); it->next())
         {
             res.emplace_back();
             auto & part = res.back();
@@ -3143,7 +3357,7 @@ void MergeTreeData::validateDetachedPartName(const String & name) const
                             ErrorCodes::BAD_DATA_PART_NAME);
 }
 
-void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, const Context & context)
+void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, ContextPtr local_context)
 {
     PartsTemporaryRename renamed_parts(*this, "detached/");
 
@@ -3155,7 +3369,7 @@ void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, const Cont
     }
     else
     {
-        String partition_id = getPartitionIDFromQuery(partition, context);
+        String partition_id = getPartitionIDFromQuery(partition, local_context);
         DetachedPartsInfo detached_parts = getDetachedParts();
         for (const auto & part_info : detached_parts)
             if (part_info.valid_name && part_info.partition_id == partition_id
@@ -3170,14 +3384,14 @@ void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, const Cont
     for (auto & [old_name, new_name] : renamed_parts.old_and_new_names)
     {
         const auto & [path, disk] = renamed_parts.old_part_name_to_path_and_disk[old_name];
-        disk->removeRecursive(path + "detached/" + new_name + "/");
+        disk->removeRecursive(fs::path(path) / "detached" / new_name / "");
         LOG_DEBUG(log, "Dropped detached part {}", old_name);
         old_name.clear();
     }
 }
 
 MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const ASTPtr & partition, bool attach_part,
-        const Context & context, PartsTemporaryRename & renamed_parts)
+        ContextPtr local_context, PartsTemporaryRename & renamed_parts)
 {
     const String source_dir = "detached/";
 
@@ -3196,7 +3410,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
     }
     else
     {
-        String partition_id = getPartitionIDFromQuery(partition, context);
+        String partition_id = getPartitionIDFromQuery(partition, local_context);
         LOG_DEBUG(log, "Looking for parts for partition {} in {}", partition_id, source_dir);
         ActiveDataPartSet active_parts(format_version);
 
@@ -3231,8 +3445,8 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
 
             if (!containing_part.empty() && containing_part != name)
                 // TODO maybe use PartsTemporaryRename here?
-                disk->moveDirectory(relative_data_path + source_dir + name,
-                    relative_data_path + source_dir + "inactive_" + name);
+                disk->moveDirectory(fs::path(relative_data_path) / source_dir / name,
+                    fs::path(relative_data_path) / source_dir / ("inactive_" + name));
             else
                 renamed_parts.addPart(name, "attaching_" + name);
         }
@@ -3422,7 +3636,7 @@ CompressionCodecPtr MergeTreeData::getCompressionCodecForPart(size_t part_size_c
     if (best_ttl_entry)
         return CompressionCodecFactory::instance().get(best_ttl_entry->recompression_codec, {});
 
-    return global_context.chooseCompressionCodec(
+    return getContext()->chooseCompressionCodec(
         part_size_compressed,
         static_cast<double>(part_size_compressed) / getTotalActiveSizeInBytes());
 }
@@ -3583,7 +3797,7 @@ bool MergeTreeData::isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(
 }
 
 bool MergeTreeData::mayBenefitFromIndexForIn(
-    const ASTPtr & left_in_operand, const Context &, const StorageMetadataPtr & metadata_snapshot) const
+    const ASTPtr & left_in_operand, ContextPtr, const StorageMetadataPtr & metadata_snapshot) const
 {
     /// Make sure that the left side of the IN operator contain part of the key.
     /// If there is a tuple on the left side of the IN operator, at least one item of the tuple
@@ -3599,9 +3813,17 @@ bool MergeTreeData::mayBenefitFromIndexForIn(
             for (const auto & index : metadata_snapshot->getSecondaryIndices())
                 if (index_wrapper_factory.get(index)->mayBenefitFromIndexForIn(item))
                     return true;
+            if (metadata_snapshot->selected_projection
+                && metadata_snapshot->selected_projection->isPrimaryKeyColumnPossiblyWrappedInFunctions(item))
+                return true;
         }
         /// The tuple itself may be part of the primary key, so check that as a last resort.
-        return isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(left_in_operand, metadata_snapshot);
+        if (isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(left_in_operand, metadata_snapshot))
+            return true;
+        if (metadata_snapshot->selected_projection
+            && metadata_snapshot->selected_projection->isPrimaryKeyColumnPossiblyWrappedInFunctions(left_in_operand))
+            return true;
+        return false;
     }
     else
     {
@@ -3609,10 +3831,408 @@ bool MergeTreeData::mayBenefitFromIndexForIn(
             if (index_wrapper_factory.get(index)->mayBenefitFromIndexForIn(left_in_operand))
                 return true;
 
+        if (metadata_snapshot->selected_projection
+            && metadata_snapshot->selected_projection->isPrimaryKeyColumnPossiblyWrappedInFunctions(left_in_operand))
+            return true;
+
         return isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(left_in_operand, metadata_snapshot);
     }
 }
 
+using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
+
+static void selectBestProjection(
+    const MergeTreeDataSelectExecutor & reader,
+    const StorageMetadataPtr & metadata_snapshot,
+    const SelectQueryInfo & query_info,
+    const Names & required_columns,
+    ProjectionCandidate & candidate,
+    ContextPtr query_context,
+    std::shared_ptr<PartitionIdToMaxBlock> max_added_blocks,
+    const Settings & settings,
+    const MergeTreeData::DataPartsVector & parts,
+    ProjectionCandidate *& selected_candidate,
+    size_t & min_sum_marks)
+{
+    MergeTreeData::DataPartsVector projection_parts;
+    MergeTreeData::DataPartsVector normal_parts;
+    for (const auto & part : parts)
+    {
+        const auto & projections = part->getProjectionParts();
+        auto it = projections.find(candidate.desc->name);
+        if (it != projections.end())
+            projection_parts.push_back(it->second);
+        else
+            normal_parts.push_back(part);
+    }
+
+    if (projection_parts.empty())
+        return;
+
+    auto sum_marks = reader.estimateNumMarksToRead(
+        projection_parts,
+        candidate.required_columns,
+        metadata_snapshot,
+        candidate.desc->metadata,
+        query_info, // TODO syntax_analysis_result set in index
+        query_context,
+        settings.max_threads,
+        max_added_blocks);
+
+    if (normal_parts.empty())
+    {
+        // All parts are projection parts which allows us to use in_order_optimization.
+        // TODO It might be better to use a complete projection even with more marks to read.
+        candidate.complete = true;
+    }
+    else
+    {
+        sum_marks += reader.estimateNumMarksToRead(
+            normal_parts,
+            required_columns,
+            metadata_snapshot,
+            metadata_snapshot,
+            query_info, // TODO syntax_analysis_result set in index
+            query_context,
+            settings.max_threads,
+            max_added_blocks);
+    }
+
+    // We choose the projection with least sum_marks to read.
+    if (sum_marks < min_sum_marks)
+    {
+        selected_candidate = &candidate;
+        min_sum_marks = sum_marks;
+    }
+}
+
+
+bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
+    ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot, SelectQueryInfo & query_info) const
+{
+    const auto & settings = query_context->getSettingsRef();
+    if (!settings.allow_experimental_projection_optimization || query_info.ignore_projections)
+        return false;
+
+    const auto & query_ptr = query_info.query;
+
+    InterpreterSelectQuery select(
+        query_ptr, query_context, SelectQueryOptions{QueryProcessingStage::WithMergeableState}.ignoreProjections().ignoreAlias());
+    const auto & analysis_result = select.getAnalysisResult();
+
+    bool can_use_aggregate_projection = true;
+    /// If the first stage of the query pipeline is more complex than Aggregating - Expression - Filter - ReadFromStorage,
+    /// we cannot use aggregate projection.
+    if (analysis_result.join != nullptr || analysis_result.array_join != nullptr)
+        can_use_aggregate_projection = false;
+
+    /// Check if all needed columns can be provided by some aggregate projection. Here we also try
+    /// to find expression matches. For example, suppose an aggregate projection contains a column
+    /// named sum(x) and the given query also has an expression called sum(x), it's a match. This is
+    /// why we need to ignore all aliases during projection creation and the above query planning.
+    /// It's also worth noting that, sqrt(sum(x)) will also work because we can treat sum(x) as a
+    /// required column.
+
+    /// The ownership of ProjectionDescription is hold in metadata_snapshot which lives along with
+    /// InterpreterSelect, thus we can store the raw pointer here.
+    std::vector<ProjectionCandidate> candidates;
+    NameSet keys;
+    std::unordered_map<std::string_view, size_t> key_name_pos_map;
+    size_t pos = 0;
+    for (const auto & desc : select.getQueryAnalyzer()->aggregationKeys())
+    {
+        keys.insert(desc.name);
+        key_name_pos_map.insert({desc.name, pos++});
+    }
+    auto actions_settings = ExpressionActionsSettings::fromSettings(settings);
+
+    // All required columns should be provided by either current projection or previous actions
+    // Let's traverse backward to finish the check.
+    // TODO what if there is a column with name sum(x) and an aggregate sum(x)?
+    auto rewrite_before_where =
+        [&](ProjectionCandidate & candidate, const ProjectionDescription & projection,
+            NameSet & required_columns, const Block & source_block, const Block & aggregates)
+    {
+        if (analysis_result.before_where)
+        {
+            candidate.where_column_name = analysis_result.where_column_name;
+            candidate.remove_where_filter = analysis_result.remove_where_filter;
+            candidate.before_where = analysis_result.before_where->clone();
+            // std::cerr << fmt::format("before_where_actions = \n{}", candidate.before_where->dumpDAG()) << std::endl;
+            required_columns = candidate.before_where->foldActionsByProjection(
+                required_columns,
+                projection.sample_block_for_keys,
+                candidate.where_column_name);
+            // std::cerr << fmt::format("before_where_actions = \n{}", candidate.before_where->dumpDAG()) << std::endl;
+            // std::cerr << fmt::format("where_required_columns = \n{}", fmt::join(required_columns, ", ")) << std::endl;
+
+            if (required_columns.empty())
+                return false;
+            candidate.before_where->addAggregatesViaProjection(aggregates);
+        }
+
+        if (analysis_result.prewhere_info)
+        {
+            const auto & prewhere_info = analysis_result.prewhere_info;
+            candidate.prewhere_info = std::make_shared<PrewhereInfo>();
+            candidate.prewhere_info->prewhere_column_name = prewhere_info->prewhere_column_name;
+            candidate.prewhere_info->remove_prewhere_column = prewhere_info->remove_prewhere_column;
+            // std::cerr << fmt::format("remove prewhere column : {}", candidate.prewhere_info->remove_prewhere_column) << std::endl;
+            candidate.prewhere_info->row_level_column_name = prewhere_info->row_level_column_name;
+            candidate.prewhere_info->need_filter = prewhere_info->need_filter;
+
+            auto prewhere_actions = prewhere_info->prewhere_actions->clone();
+            auto prewhere_required_columns = required_columns;
+            // required_columns should not contain columns generated by prewhere
+            for (const auto & column : prewhere_actions->getResultColumns())
+                required_columns.erase(column.name);
+            // std::cerr << fmt::format("prewhere_actions = \n{}", prewhere_actions->dumpDAG()) << std::endl;
+            // Prewhere_action should not add missing keys.
+            prewhere_required_columns = prewhere_actions->foldActionsByProjection(
+                prewhere_required_columns, projection.sample_block_for_keys, prewhere_info->prewhere_column_name, false);
+            // std::cerr << fmt::format("prewhere_actions = \n{}", prewhere_actions->dumpDAG()) << std::endl;
+            // std::cerr << fmt::format("prewhere_required_columns = \n{}", fmt::join(prewhere_required_columns, ", ")) << std::endl;
+            if (prewhere_required_columns.empty())
+                return false;
+            candidate.prewhere_info->prewhere_actions = std::make_shared<ExpressionActions>(prewhere_actions, actions_settings);
+
+            if (prewhere_info->row_level_filter_actions)
+            {
+                auto row_level_filter_actions = prewhere_info->row_level_filter_actions->clone();
+                prewhere_required_columns = row_level_filter_actions->foldActionsByProjection(
+                    prewhere_required_columns, projection.sample_block_for_keys, prewhere_info->row_level_column_name, false);
+                // std::cerr << fmt::format("row_level_filter_required_columns = \n{}", fmt::join(prewhere_required_columns, ", ")) << std::endl;
+                if (prewhere_required_columns.empty())
+                    return false;
+                candidate.prewhere_info->row_level_filter
+                    = std::make_shared<ExpressionActions>(row_level_filter_actions, actions_settings);
+            }
+
+            if (prewhere_info->alias_actions)
+            {
+                auto alias_actions = prewhere_info->alias_actions->clone();
+                // std::cerr << fmt::format("alias_actions = \n{}", alias_actions->dumpDAG()) << std::endl;
+                prewhere_required_columns
+                    = alias_actions->foldActionsByProjection(prewhere_required_columns, projection.sample_block_for_keys, {}, false);
+                // std::cerr << fmt::format("alias_actions = \n{}", alias_actions->dumpDAG()) << std::endl;
+                // std::cerr << fmt::format("alias_required_columns = \n{}", fmt::join(prewhere_required_columns, ", ")) << std::endl;
+                if (prewhere_required_columns.empty())
+                    return false;
+                candidate.prewhere_info->alias_actions = std::make_shared<ExpressionActions>(alias_actions, actions_settings);
+            }
+            required_columns.insert(prewhere_required_columns.begin(), prewhere_required_columns.end());
+        }
+
+        bool match = true;
+        for (const auto & column : required_columns)
+        {
+            /// There are still missing columns, fail to match
+            if (!source_block.has(column))
+            {
+                match = false;
+                break;
+            }
+        }
+        return match;
+    };
+
+    for (const auto & projection : metadata_snapshot->projections)
+    {
+        ProjectionCandidate candidate{};
+        candidate.desc = &projection;
+
+        if (projection.type == ProjectionDescription::Type::Aggregate && analysis_result.need_aggregate && can_use_aggregate_projection)
+        {
+            // std::cerr << fmt::format("====== aggregate projection analysis: {} ======", projection.name) << std::endl;
+            bool match = true;
+            Block aggregates;
+            // 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);
+                if (column)
+                {
+                    aggregates.insert(*column);
+                }
+                else
+                {
+                    match = false;
+                    break;
+                }
+            }
+
+            if (!match)
+                continue;
+
+            // 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.
+            candidate.before_aggregation = analysis_result.before_aggregation->clone();
+            // std::cerr << fmt::format("keys = {}", fmt::join(keys, ", ")) << std::endl;
+            // std::cerr << fmt::format("before_aggregation = \n{}", candidate.before_aggregation->dumpDAG()) << std::endl;
+            auto required_columns = candidate.before_aggregation->foldActionsByProjection(keys, projection.sample_block_for_keys);
+            // std::cerr << fmt::format("before_aggregation = \n{}", candidate.before_aggregation->dumpDAG()) << std::endl;
+            // std::cerr << fmt::format("aggregate_required_columns = \n{}", fmt::join(required_columns, ", ")) << std::endl;
+            if (required_columns.empty() && !keys.empty())
+                continue;
+
+            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);
+                    candidate.group_by_elements_actions.emplace_back(std::make_shared<ExpressionActions>(actions_dag, actions_settings));
+                }
+            }
+
+            // Reorder aggregation keys and attach aggregates
+            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))
+            {
+                candidate.required_columns = {required_columns.begin(), required_columns.end()};
+                for (const auto & aggregate : aggregates)
+                    candidate.required_columns.push_back(aggregate.name);
+                candidates.push_back(std::move(candidate));
+            }
+            // std::cerr << fmt::format("====== aggregate projection analysis end: {} ======", projection.name) << std::endl;
+        }
+
+        if (projection.type == ProjectionDescription::Type::Normal && (analysis_result.hasWhere() || analysis_result.hasPrewhere()))
+        {
+            // std::cerr << fmt::format("====== normal projection analysis: {} ======", projection.name) << std::endl;
+            const auto & actions
+                = analysis_result.before_aggregation ? analysis_result.before_aggregation : analysis_result.before_order_by;
+            NameSet required_columns;
+            for (const auto & column : actions->getRequiredColumns())
+                required_columns.insert(column.name);
+
+            if (rewrite_before_where(candidate, projection, required_columns, projection.sample_block, {}))
+            {
+                candidate.required_columns = {required_columns.begin(), required_columns.end()};
+                candidates.push_back(std::move(candidate));
+            }
+            // std::cerr << fmt::format("====== normal projection analysis end: {} ======", projection.name) << std::endl;
+        }
+    }
+
+    // Let's select the best projection to execute the query.
+    if (!candidates.empty())
+    {
+        // First build a MergeTreeDataSelectCache to check if a projection is indeed better than base
+        // query_info.merge_tree_data_select_cache = std::make_unique<MergeTreeDataSelectCache>();
+
+        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();
+        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)
+        {
+            if (candidate.desc->type == ProjectionDescription::Type::Aggregate)
+            {
+                selectBestProjection(
+                    reader,
+                    metadata_snapshot,
+                    query_info,
+                    analysis_result.required_columns,
+                    candidate,
+                    query_context,
+                    max_added_blocks,
+                    settings,
+                    parts,
+                    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)
+        {
+            min_sum_marks = reader.estimateNumMarksToRead(
+                parts,
+                analysis_result.required_columns,
+                metadata_snapshot,
+                metadata_snapshot,
+                query_info, // TODO syntax_analysis_result set in index
+                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)
+                {
+                    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;
+}
+
+
+QueryProcessingStage::Enum MergeTreeData::getQueryProcessingStage(
+    ContextPtr query_context,
+    QueryProcessingStage::Enum to_stage,
+    const StorageMetadataPtr & metadata_snapshot,
+    SelectQueryInfo & query_info) const
+{
+    if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
+    {
+        if (getQueryProcessingStageWithAggregateProjection(query_context, metadata_snapshot, query_info))
+        {
+            if (query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
+                return QueryProcessingStage::Enum::WithMergeableState;
+        }
+    }
+
+    return QueryProcessingStage::Enum::FetchColumns;
+}
+
+
 MergeTreeData & MergeTreeData::checkStructureAndGetMergeTreeData(IStorage & source_table, const StorageMetadataPtr & src_snapshot, const StorageMetadataPtr & my_snapshot) const
 {
     MergeTreeData * src_data = dynamic_cast<MergeTreeData *>(&source_table);
@@ -3685,12 +4305,12 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::cloneAndLoadDataPartOnSameDisk(
         const auto & src_relative_data_path = src_part_in_memory->storage.relative_data_path;
         auto flushed_part_path = src_part_in_memory->getRelativePathForPrefix(tmp_part_prefix);
         src_part_in_memory->flushToDisk(src_relative_data_path, flushed_part_path, metadata_snapshot);
-        src_part_path = src_relative_data_path + flushed_part_path + "/";
+        src_part_path = fs::path(src_relative_data_path) / flushed_part_path / "";
     }
 
     LOG_DEBUG(log, "Cloning part {} to {}", fullPath(disk, src_part_path), fullPath(disk, dst_part_path));
     localBackup(disk, src_part_path, dst_part_path);
-    disk->removeFileIfExists(dst_part_path + "/" + IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
+    disk->removeFileIfExists(fs::path(dst_part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
 
     auto single_disk_volume = std::make_shared<SingleDiskVolume>(disk->getName(), disk, 0);
     auto dst_data_part = createPart(dst_part_name, dst_part_info, single_disk_volume, tmp_dst_part_name);
@@ -3747,7 +4367,7 @@ MergeTreeData::PathsWithDisks MergeTreeData::getRelativeDataPathsWithDisks() con
     return res;
 }
 
-MergeTreeData::MatcherFn MergeTreeData::getPartitionMatcher(const ASTPtr & partition_ast, const Context & context) const
+MergeTreeData::MatcherFn MergeTreeData::getPartitionMatcher(const ASTPtr & partition_ast, ContextPtr local_context) const
 {
     bool prefixed = false;
     String id;
@@ -3763,10 +4383,10 @@ MergeTreeData::MatcherFn MergeTreeData::getPartitionMatcher(const ASTPtr & parti
             prefixed = true;
         }
         else
-            id = getPartitionIDFromQuery(partition_ast, context);
+            id = getPartitionIDFromQuery(partition_ast, local_context);
     }
     else
-        id = getPartitionIDFromQuery(partition_ast, context);
+        id = getPartitionIDFromQuery(partition_ast, local_context);
 
     return [prefixed, id](const String & partition_id)
     {
@@ -3781,31 +4401,31 @@ PartitionCommandsResultInfo MergeTreeData::freezePartition(
     const ASTPtr & partition_ast,
     const StorageMetadataPtr & metadata_snapshot,
     const String & with_name,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder &)
 {
-    return freezePartitionsByMatcher(getPartitionMatcher(partition_ast, context), metadata_snapshot, with_name, context);
+    return freezePartitionsByMatcher(getPartitionMatcher(partition_ast, local_context), metadata_snapshot, with_name, local_context);
 }
 
 PartitionCommandsResultInfo MergeTreeData::freezeAll(
     const String & with_name,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder &)
 {
-    return freezePartitionsByMatcher([] (const String &) { return true; }, metadata_snapshot, with_name, context);
+    return freezePartitionsByMatcher([] (const String &) { return true; }, metadata_snapshot, with_name, local_context);
 }
 
 PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
     MatcherFn matcher,
     const StorageMetadataPtr & metadata_snapshot,
     const String & with_name,
-    const Context & context)
+    ContextPtr local_context)
 {
-    String clickhouse_path = Poco::Path(context.getPath()).makeAbsolute().toString();
-    String default_shadow_path = clickhouse_path + "shadow/";
-    Poco::File(default_shadow_path).createDirectories();
-    auto increment = Increment(default_shadow_path + "increment.txt").get(true);
+    String clickhouse_path = fs::canonical(local_context->getPath());
+    String default_shadow_path = fs::path(clickhouse_path) / "shadow/";
+    fs::create_directories(default_shadow_path);
+    auto increment = Increment(fs::path(default_shadow_path) / "increment.txt").get(true);
 
     const String shadow_path = "shadow/";
 
@@ -3813,7 +4433,7 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
     const auto data_parts = getDataParts();
 
     String backup_name = (!with_name.empty() ? escapeForFileName(with_name) : toString(increment));
-    String backup_path = shadow_path + backup_name + "/";
+    String backup_path = fs::path(shadow_path) / backup_name / "";
 
     for (const auto & disk : getStoragePolicy()->getDisks())
         disk->onFreeze(backup_path);
@@ -3830,20 +4450,20 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
 
         part->volume->getDisk()->createDirectories(backup_path);
 
-        String backup_part_path = backup_path + relative_data_path + part->relative_path;
+        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(backup_path + relative_data_path, part->relative_path, metadata_snapshot);
+            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);
 
-        part->volume->getDisk()->removeFileIfExists(backup_part_path + "/" + IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
+        part->volume->getDisk()->removeFileIfExists(fs::path(backup_part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
 
         part->is_frozen.store(true, std::memory_order_relaxed);
         result.push_back(PartitionCommandResultInfo{
             .partition_id = part->info.partition_id,
             .part_name = part->name,
-            .backup_path = part->volume->getDisk()->getPath() + backup_path,
-            .part_backup_path = part->volume->getDisk()->getPath() + backup_part_path,
+            .backup_path = fs::path(part->volume->getDisk()->getPath()) / backup_path,
+            .part_backup_path = fs::path(part->volume->getDisk()->getPath()) / backup_part_path,
             .backup_name = backup_name,
         });
         ++parts_processed;
@@ -3856,23 +4476,23 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
 PartitionCommandsResultInfo MergeTreeData::unfreezePartition(
     const ASTPtr & partition,
     const String & backup_name,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder &)
 {
-    return unfreezePartitionsByMatcher(getPartitionMatcher(partition, context), backup_name, context);
+    return unfreezePartitionsByMatcher(getPartitionMatcher(partition, local_context), backup_name, local_context);
 }
 
 PartitionCommandsResultInfo MergeTreeData::unfreezeAll(
     const String & backup_name,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder &)
 {
-    return unfreezePartitionsByMatcher([] (const String &) { return true; }, backup_name, context);
+    return unfreezePartitionsByMatcher([] (const String &) { return true; }, backup_name, local_context);
 }
 
-PartitionCommandsResultInfo MergeTreeData::unfreezePartitionsByMatcher(MatcherFn matcher, const String & backup_name, const Context &)
+PartitionCommandsResultInfo MergeTreeData::unfreezePartitionsByMatcher(MatcherFn matcher, const String & backup_name, ContextPtr)
 {
-    auto backup_path = std::filesystem::path("shadow") / escapeForFileName(backup_name) / relative_data_path;
+    auto backup_path = fs::path("shadow") / escapeForFileName(backup_name) / relative_data_path;
 
     LOG_DEBUG(log, "Unfreezing parts by path {}", backup_path.generic_string());
 
@@ -3953,7 +4573,7 @@ void MergeTreeData::writePartLog(
 try
 {
     auto table_id = getStorageID();
-    auto part_log = global_context.getPartLog(table_id.database_name);
+    auto part_log = getContext()->getPartLog(table_id.database_name);
     if (!part_log)
         return;
 
@@ -4006,6 +4626,12 @@ catch (...)
     tryLogCurrentException(log, __PRETTY_FUNCTION__);
 }
 
+StorageMergeTree::PinnedPartUUIDsPtr MergeTreeData::getPinnedPartUUIDs() const
+{
+    std::lock_guard lock(pinned_part_uuids_mutex);
+    return pinned_part_uuids;
+}
+
 MergeTreeData::CurrentlyMovingPartsTagger::CurrentlyMovingPartsTagger(MergeTreeMovingParts && moving_parts_, MergeTreeData & data_)
     : parts_to_move(std::move(moving_parts_)), data(data_)
 {
@@ -4156,6 +4782,18 @@ bool MergeTreeData::moveParts(const CurrentlyMovingPartsTaggerPtr & moving_tagge
     return true;
 }
 
+bool MergeTreeData::partsContainSameProjections(const DataPartPtr & left, const DataPartPtr & right)
+{
+    if (left->getProjectionParts().size() != right->getProjectionParts().size())
+        return false;
+    for (const auto & [name, _] : left->getProjectionParts())
+    {
+        if (!right->hasProjection(name))
+            return false;
+    }
+    return true;
+}
+
 bool MergeTreeData::canUsePolymorphicParts(const MergeTreeSettings & settings, String * out_reason) const
 {
     if (!canUseAdaptiveGranularity())
@@ -4214,13 +4852,14 @@ NamesAndTypesList MergeTreeData::getVirtuals() const
         NameAndTypePair("_part_index", std::make_shared<DataTypeUInt64>()),
         NameAndTypePair("_part_uuid", std::make_shared<DataTypeUUID>()),
         NameAndTypePair("_partition_id", std::make_shared<DataTypeString>()),
+        NameAndTypePair("_partition_value", getPartitionValueType()),
         NameAndTypePair("_sample_factor", std::make_shared<DataTypeFloat64>()),
     };
 }
 
 size_t MergeTreeData::getTotalMergesWithTTLInMergeList() const
 {
-    return global_context.getMergeList().getMergesWithTTLCount();
+    return getContext()->getMergeList().getMergesWithTTLCount();
 }
 
 void MergeTreeData::addPartContributionToDataVolume(const DataPartPtr & part)
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 63d776a838c..4f33aa30bdc 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -20,6 +20,7 @@
 #include <Storages/IndicesDescription.h>
 #include <Storages/MergeTree/MergeTreePartsMover.h>
 #include <Storages/MergeTree/MergeTreeWriteAheadLog.h>
+#include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Interpreters/PartLog.h>
 #include <Disks/StoragePolicy.h>
 #include <Interpreters/Aggregator.h>
@@ -51,9 +52,11 @@ struct EmergingPartInfo
 
 struct CurrentlySubmergingEmergingTagger;
 
+struct SelectQueryOptions;
 class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 using ManyExpressionActions = std::vector<ExpressionActionsPtr>;
+class MergeTreeDeduplicationLog;
 
 namespace ErrorCodes
 {
@@ -110,7 +113,7 @@ namespace ErrorCodes
 /// - MergeTreeDataWriter
 /// - MergeTreeDataMergerMutator
 
-class MergeTreeData : public IStorage
+class MergeTreeData : public IStorage, public WithMutableContext
 {
 public:
     /// Function to call if the part is suspected to contain corrupt data.
@@ -126,6 +129,8 @@ public:
     using DataPartStates = std::initializer_list<DataPartState>;
     using DataPartStateVector = std::vector<DataPartState>;
 
+    using PinnedPartUUIDsPtr = std::shared_ptr<const PinnedPartUUIDs>;
+
     constexpr static auto FORMAT_VERSION_FILE_NAME = "format_version.txt";
     constexpr static auto DETACHED_DIR_NAME = "detached";
 
@@ -215,15 +220,15 @@ public:
     /// After this method setColumns must be called
     MutableDataPartPtr createPart(const String & name,
         MergeTreeDataPartType type, const MergeTreePartInfo & part_info,
-        const VolumePtr & volume, const String & relative_path) const;
+        const VolumePtr & volume, const String & relative_path, const IMergeTreeDataPart * parent_part = nullptr) const;
 
     /// Create part, that already exists on filesystem.
     /// After this methods 'loadColumnsChecksumsIndexes' must be called.
     MutableDataPartPtr createPart(const String & name,
-        const VolumePtr & volume, const String & relative_path) const;
+        const VolumePtr & volume, const String & relative_path, const IMergeTreeDataPart * parent_part = nullptr) const;
 
     MutableDataPartPtr createPart(const String & name, const MergeTreePartInfo & part_info,
-        const VolumePtr & volume, const String & relative_path) const;
+        const VolumePtr & volume, const String & relative_path, const IMergeTreeDataPart * parent_part = nullptr) const;
 
     /// Auxiliary object to add a set of parts into the working set in two steps:
     /// * First, as PreCommitted parts (the parts are ready, but not yet in the active set).
@@ -348,7 +353,7 @@ public:
     MergeTreeData(const StorageID & table_id_,
                   const String & relative_data_path_,
                   const StorageInMemoryMetadata & metadata_,
-                  Context & context_,
+                  ContextMutablePtr context_,
                   const String & date_column_name,
                   const MergingParams & merging_params_,
                   std::unique_ptr<MergeTreeSettings> settings_,
@@ -356,6 +361,18 @@ public:
                   bool attach,
                   BrokenPartCallback broken_part_callback_ = [](const String &){});
 
+    bool getQueryProcessingStageWithAggregateProjection(
+        ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot, SelectQueryInfo & query_info) const;
+
+    QueryProcessingStage::Enum getQueryProcessingStage(
+        ContextPtr query_context,
+        QueryProcessingStage::Enum to_stage,
+        const StorageMetadataPtr & metadata_snapshot,
+        SelectQueryInfo & info) const override;
+
+    ReservationPtr reserveSpace(UInt64 expected_size, VolumePtr & volume) const;
+
+    static bool partsContainSameProjections(const DataPartPtr & left, const DataPartPtr & right);
 
     StoragePolicyPtr getStoragePolicy() const override;
 
@@ -374,7 +391,7 @@ public:
 
     NamesAndTypesList getVirtuals() const override;
 
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context &, const StorageMetadataPtr & metadata_snapshot) const override;
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr, const StorageMetadataPtr & metadata_snapshot) const override;
 
     /// Load the set of data parts from disk. Call once - immediately after the object is created.
     void loadDataParts(bool skip_sanity_checks);
@@ -387,20 +404,21 @@ public:
     DataParts getDataParts(const DataPartStates & affordable_states) const;
     /// Returns sorted list of the parts with specified states
     ///  out_states will contain snapshot of each part state
-    DataPartsVector getDataPartsVector(const DataPartStates & affordable_states, DataPartStateVector * out_states = nullptr) const;
+    DataPartsVector getDataPartsVector(
+        const DataPartStates & affordable_states, DataPartStateVector * out_states = nullptr, bool require_projection_parts = false) const;
 
     /// Returns absolutely all parts (and snapshot of their states)
-    DataPartsVector getAllDataPartsVector(DataPartStateVector * out_states = nullptr) const;
+    DataPartsVector getAllDataPartsVector(DataPartStateVector * out_states = nullptr, bool require_projection_parts = false) const;
 
     /// Returns all detached parts
     DetachedPartsInfo getDetachedParts() const;
 
     void validateDetachedPartName(const String & name) const;
 
-    void dropDetached(const ASTPtr & partition, bool part, const Context & context);
+    void dropDetached(const ASTPtr & partition, bool part, ContextPtr context);
 
     MutableDataPartsVector tryLoadPartsToAttach(const ASTPtr & partition, bool attach_part,
-            const Context & context, PartsTemporaryRename & renamed_parts);
+            ContextPtr context, PartsTemporaryRename & renamed_parts);
 
     /// Returns Committed parts
     DataParts getDataParts() const;
@@ -447,18 +465,18 @@ public:
     /// active set later with out_transaction->commit()).
     /// Else, commits the part immediately.
     /// Returns true if part was added. Returns false if part is covered by bigger part.
-    bool renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr);
+    bool renameTempPartAndAdd(MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr, MergeTreeDeduplicationLog * deduplication_log = nullptr);
 
     /// The same as renameTempPartAndAdd but the block range of the part can contain existing parts.
     /// Returns all parts covered by the added part (in ascending order).
     /// If out_transaction == nullptr, marks covered parts as Outdated.
     DataPartsVector renameTempPartAndReplace(
-        MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr);
+        MutableDataPartPtr & part, SimpleIncrement * increment = nullptr, Transaction * out_transaction = nullptr, MergeTreeDeduplicationLog * deduplication_log = nullptr);
 
     /// Low-level version of previous one, doesn't lock mutex
     bool renameTempPartAndReplace(
             MutableDataPartPtr & part, SimpleIncrement * increment, Transaction * out_transaction, DataPartsLock & lock,
-            DataPartsVector * out_covered_parts = nullptr);
+            DataPartsVector * out_covered_parts = nullptr, MergeTreeDeduplicationLog * deduplication_log = nullptr);
 
 
     /// Remove parts from working set immediately (without wait for background
@@ -475,10 +493,9 @@ public:
 
     /// Removes all parts from the working set parts
     ///  for which (partition_id = drop_range.partition_id && min_block >= drop_range.min_block && max_block <= drop_range.max_block).
-    /// If a part intersecting drop_range.max_block is found, an exception will be thrown.
     /// Used in REPLACE PARTITION command;
     DataPartsVector removePartsInRangeFromWorkingSet(const MergeTreePartInfo & drop_range, bool clear_without_timeout,
-                                                     bool skip_intersecting_parts, DataPartsLock & lock);
+                                                     DataPartsLock & lock);
 
     /// Renames the part to detached/<prefix>_<part> and removes it from data_parts,
     //// so it will not be deleted in clearOldParts.
@@ -530,7 +547,7 @@ public:
     /// - all type conversions can be done.
     /// - columns corresponding to primary key, indices, sign, sampling expression and date are not affected.
     /// If something is wrong, throws an exception.
-    void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
     /// Checks if the Mutation can be performed.
     /// (currently no additional checks: always ok)
@@ -565,44 +582,43 @@ public:
         const ASTPtr & partition,
         const StorageMetadataPtr & metadata_snapshot,
         const String & with_name,
-        const Context & context,
+        ContextPtr context,
         TableLockHolder & table_lock_holder);
 
     /// Freezes all parts.
     PartitionCommandsResultInfo freezeAll(
         const String & with_name,
         const StorageMetadataPtr & metadata_snapshot,
-        const Context & context,
+        ContextPtr context,
         TableLockHolder & table_lock_holder);
 
     /// Unfreezes particular partition.
     PartitionCommandsResultInfo unfreezePartition(
         const ASTPtr & partition,
         const String & backup_name,
-        const Context & context,
+        ContextPtr context,
         TableLockHolder & table_lock_holder);
 
     /// Unfreezes all parts.
     PartitionCommandsResultInfo unfreezeAll(
         const String & backup_name,
-        const Context & context,
+        ContextPtr context,
         TableLockHolder & table_lock_holder);
 
-public:
     /// Moves partition to specified Disk
-    void movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, const Context & context);
+    void movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr context);
 
     /// Moves partition to specified Volume
-    void movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, const Context & context);
+    void movePartitionToVolume(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr context);
 
     void checkPartitionCanBeDropped(const ASTPtr & partition) override;
 
-    void checkPartCanBeDropped(const ASTPtr & part);
+    void checkPartCanBeDropped(const String & part_name);
 
     Pipe alterPartition(
         const StorageMetadataPtr & metadata_snapshot,
         const PartitionCommands & commands,
-        const Context & query_context) override;
+        ContextPtr query_context) override;
 
     size_t getColumnCompressedSize(const std::string & name) const
     {
@@ -618,7 +634,7 @@ public:
     }
 
     /// For ATTACH/DETACH/DROP PARTITION.
-    String getPartitionIDFromQuery(const ASTPtr & ast, const Context & context) const;
+    String getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr context) const;
 
     /// Extracts MergeTreeData of other *MergeTree* storage
     ///  and checks that their structure suitable for ALTER TABLE ATTACH PARTITION FROM
@@ -709,12 +725,12 @@ public:
 
     /// Choose disk with max available free space
     /// Reserves 0 bytes
-    ReservationPtr makeEmptyReservationOnLargestDisk() { return getStoragePolicy()->makeEmptyReservationOnLargestDisk(); }
+    ReservationPtr makeEmptyReservationOnLargestDisk() const { return getStoragePolicy()->makeEmptyReservationOnLargestDisk(); }
 
     Disks getDisksByType(DiskType::Type type) const { return getStoragePolicy()->getDisksByType(type); }
 
     /// Return alter conversions for part which must be applied on fly.
-    AlterConversions getAlterConversionsForPart(const MergeTreeDataPartPtr part) const;
+    AlterConversions getAlterConversionsForPart(MergeTreeDataPartPtr part) const;
     /// Returns destination disk or volume for the TTL rule according to current storage policy
     /// 'is_insert' - is TTL move performed on new data part insert.
     SpacePtr getDestinationForMoveTTL(const TTLDescription & move_ttl, bool is_insert = false) const;
@@ -733,8 +749,6 @@ public:
 
     MergeTreeDataFormatVersion format_version;
 
-    Context & global_context;
-
     /// Merging params - what additional actions to perform during merge.
     const MergingParams merging_params;
 
@@ -764,6 +778,13 @@ public:
     /// Remove current query id after query finished.
     void removeQueryId(const String & query_id) const;
 
+    /// Return the partition expression types as a Tuple type. Return DataTypeUInt8 if partition expression is empty.
+    DataTypePtr getPartitionValueType() 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};
 
@@ -783,6 +804,8 @@ public:
     /// Mutex for currently_moving_parts
     mutable std::mutex moving_parts_mutex;
 
+    PinnedPartUUIDsPtr getPinnedPartUUIDs() const;
+
     /// Return main processing background job, like merge/mutate/fetch and so on
     virtual std::optional<JobAndPool> getDataProcessingJob() = 0;
     /// Return job to move parts between disks/volumes and so on.
@@ -837,6 +860,10 @@ protected:
     /// Use get and set to receive readonly versions.
     MultiVersion<MergeTreeSettings> storage_settings;
 
+    /// Used to determine which UUIDs to send to root query executor for deduplication.
+    mutable std::shared_mutex pinned_part_uuids_mutex;
+    PinnedPartUUIDsPtr pinned_part_uuids;
+
     /// Work with data parts
 
     struct TagByInfo{};
@@ -894,7 +921,7 @@ protected:
     }
 
     std::optional<UInt64> totalRowsByPartitionPredicateImpl(
-        const SelectQueryInfo & query_info, const Context & context, const DataPartsVector & parts) const;
+        const SelectQueryInfo & query_info, ContextPtr context, const DataPartsVector & parts) const;
 
     static decltype(auto) getStateModifier(DataPartState state)
     {
@@ -960,19 +987,29 @@ protected:
 
     /// Common part for |freezePartition()| and |freezeAll()|.
     using MatcherFn = std::function<bool(const String &)>;
-    PartitionCommandsResultInfo freezePartitionsByMatcher(MatcherFn matcher, const StorageMetadataPtr & metadata_snapshot, const String & with_name, const Context & context);
-    PartitionCommandsResultInfo unfreezePartitionsByMatcher(MatcherFn matcher, const String & backup_name, const Context & context);
+    PartitionCommandsResultInfo freezePartitionsByMatcher(MatcherFn matcher, const StorageMetadataPtr & metadata_snapshot, const String & with_name, ContextPtr context);
+    PartitionCommandsResultInfo unfreezePartitionsByMatcher(MatcherFn matcher, const String & backup_name, ContextPtr context);
 
     // Partition helpers
     bool canReplacePartition(const DataPartPtr & src_part) const;
 
-    virtual void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & context, bool throw_if_noop = true) = 0;
-    virtual PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, const Context & context) = 0;
-    virtual void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context) = 0;
-    virtual void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & context) = 0;
+    /// Tries to drop part in background without any waits or throwing exceptions in case of errors.
+    virtual void dropPartNoWaitNoThrow(const String & part_name) = 0;
 
-    /// Makes sense only for replicated tables
-    virtual void fetchPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, const String & from, const Context & query_context);
+    virtual void dropPart(const String & part_name, bool detach, ContextPtr context) = 0;
+    virtual void dropPartition(const ASTPtr & partition, bool detach, ContextPtr context) = 0;
+    virtual PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, ContextPtr context) = 0;
+    virtual void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr context) = 0;
+    virtual void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr context) = 0;
+
+    virtual void fetchPartition(
+        const ASTPtr & partition,
+        const StorageMetadataPtr & metadata_snapshot,
+        const String & from,
+        bool fetch_part,
+        ContextPtr query_context);
+
+    virtual void movePartitionToShard(const ASTPtr & partition, bool move_part, const String & to, ContextPtr query_context);
 
     void writePartLog(
         PartLogElement::Type type,
@@ -1047,7 +1084,7 @@ private:
     mutable std::mutex query_id_set_mutex;
 
     // Get partition matcher for FREEZE / UNFREEZE queries.
-    MatcherFn getPartitionMatcher(const ASTPtr & partition, const Context & context) const;
+    MatcherFn getPartitionMatcher(const ASTPtr & partition, ContextPtr context) const;
 };
 
 /// RAII struct to record big parts that are submerging or emerging.
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 4269aa89ad1..846ad7b026d 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -7,12 +7,14 @@
 #include <Storages/MergeTree/AllMergeSelector.h>
 #include <Storages/MergeTree/TTLMergeSelector.h>
 #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 <Processors/Merges/MergingSortedTransform.h>
 #include <Processors/Merges/CollapsingSortedTransform.h>
 #include <Processors/Merges/SummingSortedTransform.h>
@@ -20,6 +22,7 @@
 #include <Processors/Merges/GraphiteRollupSortedTransform.h>
 #include <Processors/Merges/AggregatingSortedTransform.h>
 #include <Processors/Merges/VersionedCollapsingTransform.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Executors/PipelineExecutingBlockInputStream.h>
@@ -245,12 +248,13 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
         {
             if (parts_ranges.empty() || !parts_ranges.back().empty())
                 parts_ranges.emplace_back();
+
             /// New partition frame.
             prev_partition_id = &partition_id;
             prev_part = nullptr;
         }
 
-        /// Check predicate only for first part in each partition.
+        /// Check predicate only for the first part in each range.
         if (!prev_part)
         {
             /* Parts can be merged with themselves for TTL needs for example.
@@ -259,6 +263,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
             * of each partition because it will be automatically checked for a pair of parts. */
             if (!can_merge_callback(nullptr, part, nullptr))
                 continue;
+
         }
         else
         {
@@ -267,8 +272,8 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
             if (!can_merge_callback(*prev_part, part, nullptr))
             {
                 /// Starting new interval in the same partition
-                if (!parts_ranges.back().empty())
-                    parts_ranges.emplace_back();
+                assert(!parts_ranges.back().empty());
+                parts_ranges.emplace_back();
 
                 /// Now we have no previous part, but it affects only logging
                 prev_part = nullptr;
@@ -292,7 +297,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
         if (prev_part && part->info.partition_id == (*prev_part)->info.partition_id
             && part->info.min_block <= (*prev_part)->info.max_block)
         {
-            LOG_ERROR(log, "Part {} intersects previous part {}", part->name, (*prev_part)->name);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects previous part {}", part->name, (*prev_part)->name);
         }
 
         prev_part = &part;
@@ -338,6 +343,9 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     if (parts_to_merge.empty())
     {
         SimpleMergeSelector::Settings merge_settings;
+        /// Override value from table settings
+        merge_settings.max_parts_to_merge_at_once = data_settings->max_parts_to_merge_at_once;
+
         if (aggressive)
             merge_settings.base = 1;
 
@@ -472,6 +480,7 @@ 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)
@@ -485,6 +494,13 @@ static void extractMergingAndGatheringColumns(
                   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);
@@ -649,14 +665,17 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     const FutureMergedMutatedPart & future_part,
     const StorageMetadataPtr & metadata_snapshot,
     MergeList::Entry & merge_entry,
-    TableLockHolder &,
+    TableLockHolder & holder,
     time_t time_of_merge,
-    const Context & context,
+    ContextPtr context,
     const ReservationPtr & space_reservation,
     bool deduplicate,
-    const Names & deduplicate_by_columns)
+    const Names & deduplicate_by_columns,
+    const MergeTreeData::MergingParams & merging_params,
+    const IMergeTreeDataPart * parent_part,
+    const String & prefix)
 {
-    static const String TMP_PREFIX = "tmp_merge_";
+    const String tmp_prefix = parent_part ? prefix : "tmp_merge_";
 
     if (merges_blocker.isCancelled())
         throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
@@ -679,7 +698,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
 
     auto disk = space_reservation->getDisk();
     String part_path = data.relative_data_path;
-    String new_part_tmp_path = part_path + TMP_PREFIX + future_part.name + "/";
+    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);
 
@@ -695,7 +714,8 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
         storage_columns,
         metadata_snapshot->getSortingKey().expression,
         metadata_snapshot->getSecondaryIndices(),
-        data.merging_params,
+        metadata_snapshot->getProjections(),
+        merging_params,
         gathering_columns,
         gathering_column_names,
         merging_columns,
@@ -707,12 +727,13 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
         future_part.type,
         future_part.part_info,
         single_disk_volume,
-        TMP_PREFIX + future_part.name);
+        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 = true;
+    new_data_part->is_temp = parent_part == nullptr;
 
     bool need_remove_expired_values = false;
     bool force_ttl = false;
@@ -739,7 +760,8 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
 
     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);
+    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));
@@ -751,7 +773,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     /// 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();
+    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;
@@ -852,7 +874,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     bool blocks_are_granules_size = (chosen_merge_algorithm == MergeAlgorithm::Vertical);
 
     UInt64 merge_block_size = data_settings->merge_max_block_size;
-    switch (data.merging_params.mode)
+    switch (merging_params.mode)
     {
         case MergeTreeData::MergingParams::Ordinary:
             merged_transform = std::make_unique<MergingSortedTransform>(
@@ -861,13 +883,13 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
 
         case MergeTreeData::MergingParams::Collapsing:
             merged_transform = std::make_unique<CollapsingSortedTransform>(
-                header, pipes.size(), sort_description, data.merging_params.sign_column, false,
+                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, data.merging_params.columns_to_sum, partition_key_columns, merge_block_size);
+                header, pipes.size(), sort_description, merging_params.columns_to_sum, partition_key_columns, merge_block_size);
             break;
 
         case MergeTreeData::MergingParams::Aggregating:
@@ -877,19 +899,19 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
 
         case MergeTreeData::MergingParams::Replacing:
             merged_transform = std::make_unique<ReplacingSortedTransform>(
-                header, pipes.size(), sort_description, data.merging_params.version_column,
+                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,
-                data.merging_params.graphite_params, time_of_merge);
+                merging_params.graphite_params, time_of_merge);
             break;
 
         case MergeTreeData::MergingParams::VersionedCollapsing:
             merged_transform = std::make_unique<VersionedCollapsingTransform>(
-                header, pipes.size(), sort_description, data.merging_params.sign_column,
+                header, pipes.size(), sort_description, merging_params.sign_column,
                 merge_block_size, rows_sources_write_buf.get(), blocks_are_granules_size);
             break;
     }
@@ -910,7 +932,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
     {
         const auto & indices = metadata_snapshot->getSecondaryIndices();
         merged_stream = std::make_shared<ExpressionBlockInputStream>(
-            merged_stream, indices.getSingleExpressionForIndices(metadata_snapshot->getColumns(), data.global_context));
+            merged_stream, indices.getSingleExpressionForIndices(metadata_snapshot->getColumns(), data.getContext()));
         merged_stream = std::make_shared<MaterializingBlockInputStream>(merged_stream);
     }
 
@@ -1084,6 +1106,55 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
             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
@@ -1099,9 +1170,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     const MutationCommands & commands,
     MergeListEntry & merge_entry,
     time_t time_of_mutation,
-    const Context & context,
+    ContextPtr context,
     const ReservationPtr & space_reservation,
-    TableLockHolder &)
+    TableLockHolder & holder)
 {
     checkOperationIsNotCanceled(merge_entry);
 
@@ -1113,12 +1184,12 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     const auto & source_part = future_part.parts[0];
     auto storage_from_source_part = StorageFromMergeTreeDataPart::create(source_part);
 
-    auto context_for_reading = context;
-    context_for_reading.setSetting("max_streams_to_max_threads_ratio", 1);
-    context_for_reading.setSetting("max_threads", 1);
+    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));
+    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)
@@ -1129,7 +1200,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     }
 
     if (source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
-        storage_from_source_part, metadata_snapshot, commands_for_part, context_for_reading))
+        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);
@@ -1153,11 +1224,18 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     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));
@@ -1179,8 +1257,6 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     auto disk = new_data_part->volume->getDisk();
     String new_part_tmp_path = new_data_part->getFullRelativePath();
 
-    disk->createDirectories(new_part_tmp_path);
-
     SyncGuardPtr sync_guard;
     if (data.getSettings()->fsync_part_directory)
         sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
@@ -1195,8 +1271,12 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
         need_remove_expired_values = true;
 
     /// All columns from part are changed and may be some more that were missing before in part
-    if (!isWidePart(source_part) || (interpreter && interpreter->isAffectingAllColumns()))
+    /// 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
@@ -1205,16 +1285,22 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
         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);
+            need_sync,
+            space_reservation,
+            holder,
+            context);
 
         /// no finalization required, because mutateAllPartColumns use
         /// MergedBlockOutputStream which finilaze all part fields itself
@@ -1222,13 +1308,39 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
     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.
-        auto indices_to_recalc = getIndicesToRecalculate(in, updated_header.getNamesAndTypesList(), metadata_snapshot, context);
+        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);
+        }
 
-        NameSet files_to_skip = collectFilesToSkip(source_part, updated_header, indices_to_recalc, mrk_extension);
+        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())
         {
@@ -1249,7 +1361,20 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
                 destination += it->name();
             }
 
-            disk->createHardLink(it->path(), destination);
+            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();
@@ -1264,14 +1389,19 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
                 source_part,
                 metadata_snapshot,
                 indices_to_recalc,
-                updated_header,
+                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);
+                need_sync,
+                space_reservation,
+                holder,
+                context);
         }
 
         for (const auto & [rename_from, rename_to] : files_to_rename)
@@ -1296,8 +1426,12 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
 
 
 MergeAlgorithm MergeTreeDataMergerMutator::chooseMergeAlgorithm(
-    const MergeTreeData::DataPartsVector & parts, size_t sum_rows_upper_bound,
-    const NamesAndTypesList & gathering_columns, bool deduplicate, bool need_remove_expired_values) const
+    const MergeTreeData::DataPartsVector & parts,
+    size_t sum_rows_upper_bound,
+    const NamesAndTypesList & gathering_columns,
+    bool deduplicate,
+    bool need_remove_expired_values,
+    const MergeTreeData::MergingParams & merging_params) const
 {
     const auto data_settings = data.getSettings();
 
@@ -1313,10 +1447,10 @@ MergeAlgorithm MergeTreeDataMergerMutator::chooseMergeAlgorithm(
             return MergeAlgorithm::Horizontal;
 
     bool is_supported_storage =
-        data.merging_params.mode == MergeTreeData::MergingParams::Ordinary ||
-        data.merging_params.mode == MergeTreeData::MergingParams::Collapsing ||
-        data.merging_params.mode == MergeTreeData::MergingParams::Replacing ||
-        data.merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing;
+        merging_params.mode == MergeTreeData::MergingParams::Ordinary ||
+        merging_params.mode == MergeTreeData::MergingParams::Collapsing ||
+        merging_params.mode == MergeTreeData::MergingParams::Replacing ||
+        merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing;
 
     bool enough_ordinary_cols = gathering_columns.size() >= data_settings->vertical_merge_algorithm_min_columns_to_activate;
 
@@ -1405,6 +1539,7 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
         for (const auto & command : commands)
         {
             if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
                 || command.type == MutationCommand::Type::MATERIALIZE_TTL
                 || command.type == MutationCommand::Type::DELETE
                 || command.type == MutationCommand::Type::UPDATE)
@@ -1413,7 +1548,7 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
                 for (const auto & [column_name, expr] : command.column_to_update_expression)
                     mutated_columns.emplace(column_name);
             }
-            else if (command.type == MutationCommand::Type::DROP_INDEX)
+            else if (command.type == MutationCommand::Type::DROP_INDEX || command.type == MutationCommand::Type::DROP_PROJECTION)
             {
                 for_file_renames.push_back(command);
             }
@@ -1435,7 +1570,7 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
                 }
             }
         }
-        /// If it's compact part than we don't need to actually remove files
+        /// 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())
         {
@@ -1449,13 +1584,14 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
         for (const auto & command : commands)
         {
             if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || 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)
+            else if (command.type == MutationCommand::Type::DROP_INDEX || command.type == MutationCommand::Type::DROP_PROJECTION)
             {
                 for_file_renames.push_back(command);
             }
@@ -1499,13 +1635,21 @@ NameToNameVector MergeTreeDataMergerMutator::collectFilesForRenames(
     }
 
     NameToNameVector rename_vector;
-    /// Remove old indices
+    /// Remove old data
     for (const auto & command : commands_for_removes)
     {
         if (command.type == MutationCommand::Type::DROP_INDEX)
         {
-            rename_vector.emplace_back("skp_idx_" + command.column_name + ".idx", "");
-            rename_vector.emplace_back("skp_idx_" + command.column_name + mrk_extension, "");
+            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)
         {
@@ -1561,7 +1705,8 @@ NameSet MergeTreeDataMergerMutator::collectFilesToSkip(
     const MergeTreeDataPartPtr & source_part,
     const Block & updated_header,
     const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-    const String & mrk_extension)
+    const String & mrk_extension,
+    const std::set<MergeTreeProjectionPtr> & projections_to_recalc)
 {
     NameSet files_to_skip = source_part->getFileNamesWithoutChecksums();
 
@@ -1583,6 +1728,10 @@ NameSet MergeTreeDataMergerMutator::collectFilesToSkip(
         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;
 }
@@ -1686,27 +1835,65 @@ MergeTreeIndices MergeTreeDataMergerMutator::getIndicesForNewDataPart(
     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 NamesAndTypesList & updated_columns,
+    const NameSet & updated_columns,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context)
+    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>();
-    for (const auto & col : updated_columns.getNames())
-    {
-        const auto & indices = metadata_snapshot->getSecondaryIndices();
-        for (size_t i = 0; i < indices.size(); ++i)
-        {
-            const auto & index = indices[i];
-            const auto & index_cols = index.expression->getRequiredColumns();
-            auto it = std::find(std::cbegin(index_cols), std::cend(index_cols), col);
+    const auto & indices = metadata_snapshot->getSecondaryIndices();
 
-            if (it != std::cend(index_cols)
-                && indices_to_recalc.insert(index_factory.get(index)).second)
+    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)
@@ -1733,6 +1920,42 @@ std::set<MergeTreeIndexPtr> MergeTreeDataMergerMutator::getIndicesToRecalculate(
     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 Names & columns, const MutationCommands & commands)
 {
     if (!metadata_snapshot->hasAnyTTL())
@@ -1750,16 +1973,182 @@ bool MergeTreeDataMergerMutator::shouldExecuteTTL(const StorageMetadataPtr & met
     return false;
 }
 
+// 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)
+{
+    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
+    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);
@@ -1783,15 +2172,18 @@ void MergeTreeDataMergerMutator::mutateAllPartColumns(
     mutating_stream->readPrefix();
     out.writePrefix();
 
-    Block block;
-    while (checkOperationIsNotCanceled(merge_entry) && (block = mutating_stream->read()))
-    {
-        minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
-        out.write(block);
-
-        merge_entry->rows_written += block.rows();
-        merge_entry->bytes_written_uncompressed += block.bytes();
-    }
+    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();
@@ -1802,6 +2194,7 @@ 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,
@@ -1809,7 +2202,10 @@ void MergeTreeDataMergerMutator::mutateSomePartColumns(
     const CompressionCodecPtr & compression_codec,
     MergeListEntry & merge_entry,
     bool need_remove_expired_values,
-    bool need_sync) const
+    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);
@@ -1832,14 +2228,18 @@ void MergeTreeDataMergerMutator::mutateSomePartColumns(
     mutating_stream->readPrefix();
     out.writePrefix();
 
-    Block block;
-    while (checkOperationIsNotCanceled(merge_entry) && (block = mutating_stream->read()))
-    {
-        out.write(block);
-
-        merge_entry->rows_written += block.rows();
-        merge_entry->bytes_written_uncompressed += block.bytes();
-    }
+    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();
 
@@ -1868,7 +2268,7 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
     if (need_remove_expired_values)
     {
         /// Write a file with ttl infos in json format.
-        auto out_ttl = disk->writeFile(new_data_part->getFullRelativePath() + "ttl.txt", 4096);
+        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();
@@ -1877,7 +2277,7 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
 
     {
         /// Write file with checksums.
-        auto out_checksums = disk->writeFile(new_data_part->getFullRelativePath() + "checksums.txt", 4096);
+        auto out_checksums = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "checksums.txt", 4096);
         new_data_part->checksums.write(*out_checksums);
     } /// close fd
 
@@ -1888,7 +2288,7 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
 
     {
         /// Write a file with a description of columns.
-        auto out_columns = disk->writeFile(new_data_part->getFullRelativePath() + "columns.txt", 4096);
+        auto out_columns = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "columns.txt", 4096);
         new_data_part->getColumns().writeText(*out_columns);
     } /// close fd
 
@@ -1897,6 +2297,7 @@ void MergeTreeDataMergerMutator::finalizeMutatedPart(
     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;
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index 2f3a898ba84..b082d063dcf 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -8,6 +8,7 @@
 #include <Storages/MergeTree/TTLMergeSelector.h>
 #include <Storages/MergeTree/MergeAlgorithm.h>
 #include <Storages/MergeTree/MergeType.h>
+#include <Storages/MergeTree/IMergedBlockOutputStream.h>
 
 
 namespace DB
@@ -125,10 +126,13 @@ public:
         MergeListEntry & merge_entry,
         TableLockHolder & table_lock_holder,
         time_t time_of_merge,
-        const Context & context,
+        ContextPtr context,
         const ReservationPtr & space_reservation,
         bool deduplicate,
-        const Names & deduplicate_by_columns);
+        const Names & deduplicate_by_columns,
+        const MergeTreeData::MergingParams & merging_params,
+        const IMergeTreeDataPart * parent_part = nullptr,
+        const String & prefix = "");
 
     /// Mutate a single data part with the specified commands. Will create and return a temporary part.
     MergeTreeData::MutableDataPartPtr mutatePartToTemporaryPart(
@@ -137,7 +141,7 @@ public:
         const MutationCommands & commands,
         MergeListEntry & merge_entry,
         time_t time_of_mutation,
-        const Context & context,
+        ContextPtr context,
         const ReservationPtr & space_reservation,
         TableLockHolder & table_lock_holder);
 
@@ -177,7 +181,8 @@ private:
         const MergeTreeDataPartPtr & source_part,
         const Block & updated_header,
         const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-        const String & mrk_extension);
+        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(
@@ -191,41 +196,74 @@ private:
         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 Names & columns, 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 NamesAndTypesList & updated_columns,
+        const NameSet & updated_columns,
         const StorageMetadataPtr & metadata_snapshot,
-        const Context & context);
+        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 & codec,
+        const CompressionCodecPtr & compression_codec,
         MergeListEntry & merge_entry,
         bool need_remove_expired_values,
-        bool need_sync) const;
+        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 & codec,
+        const CompressionCodecPtr & compression_codec,
         MergeListEntry & merge_entry,
         bool need_remove_expired_values,
-        bool need_sync) const;
+        bool need_sync,
+        const ReservationPtr & space_reservation,
+        TableLockHolder & holder,
+        ContextPtr context);
 
     /// Initialize and write to disk new part fields like checksums, columns,
     /// etc.
@@ -246,7 +284,11 @@ private:
 
     MergeAlgorithm chooseMergeAlgorithm(
         const MergeTreeData::DataPartsVector & parts,
-        size_t rows_upper_bound, const NamesAndTypesList & gathering_columns, bool deduplicate, bool need_remove_expired_values) const;
+        size_t rows_upper_bound,
+        const NamesAndTypesList & gathering_columns,
+        bool deduplicate,
+        bool need_remove_expired_values,
+        const MergeTreeData::MergingParams & merging_params) const;
 
     bool checkOperationIsNotCanceled(const MergeListEntry & merge_entry) const;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
index b0eb1cbea70..1df97dc9241 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
@@ -7,7 +7,6 @@
 #include <IO/WriteBufferFromString.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedWriteBuffer.h>
-#include <Poco/File.h>
 
 
 namespace DB
@@ -48,6 +47,9 @@ void MergeTreeDataPartChecksum::checkSize(const DiskPtr & disk, const String & p
 {
     if (!disk->exists(path))
         throw Exception(fullPath(disk, path) + " doesn't exist", ErrorCodes::FILE_DOESNT_EXIST);
+    if (disk->isDirectory(path))
+        // This is a projection, no need to check its size.
+        return;
     UInt64 size = disk->getFileSize(path);
     if (size != file_size)
         throw Exception(fullPath(disk, path) + " has unexpected size: " + toString(size) + " instead of " + toString(file_size),
@@ -299,12 +301,31 @@ String MergeTreeDataPartChecksums::getTotalChecksumHex() const
         hash_of_all_files.update(checksum.file_hash);
     }
 
-    UInt64 lo, hi;
+    UInt64 lo;
+    UInt64 hi;
     hash_of_all_files.get128(lo, hi);
 
     return getHexUIntUppercase(hi) + getHexUIntUppercase(lo);
 }
 
+MergeTreeDataPartChecksums::Checksum::uint128 MergeTreeDataPartChecksums::getTotalChecksumUInt128() const
+{
+    SipHash hash_of_all_files;
+
+    for (const auto & elem : files)
+    {
+        const String & name = elem.first;
+        const auto & checksum = elem.second;
+
+        updateHash(hash_of_all_files, name);
+        hash_of_all_files.update(checksum.file_hash);
+    }
+
+    MergeTreeDataPartChecksums::Checksum::uint128 ret;
+    hash_of_all_files.get128(reinterpret_cast<char *>(&ret));
+    return ret;
+}
+
 void MinimalisticDataPartChecksums::serialize(WriteBuffer & to) const
 {
     writeString("checksums format version: 5\n", to);
@@ -394,7 +415,7 @@ void MinimalisticDataPartChecksums::computeTotalChecksums(const MergeTreeDataPar
 
     auto get_hash = [] (SipHash & hash, uint128 & data)
     {
-        hash.get128(data.first, data.second);
+        hash.get128(data);
     };
 
     get_hash(hash_of_all_files_state, hash_of_all_files);
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
index 3aa77678520..759e6a79ee4 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
@@ -52,6 +52,8 @@ struct MergeTreeDataPartChecksums
 
     void add(MergeTreeDataPartChecksums && rhs_checksums);
 
+    bool has(const String & file_name) const { return files.find(file_name) != files.end(); }
+
     bool empty() const
     {
         return files.empty();
@@ -83,6 +85,8 @@ struct MergeTreeDataPartChecksums
     /// SipHash of all all files hashes represented as hex string
     String getTotalChecksumHex() const;
 
+    Checksum::uint128 getTotalChecksumUInt128() const;
+
     String getSerializedString() const;
     static MergeTreeDataPartChecksums deserializeFrom(const String & s);
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
index 32f54e3b782..7b1641a0537 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
@@ -2,7 +2,6 @@
 #include <DataTypes/NestedUtils.h>
 #include <Storages/MergeTree/MergeTreeReaderCompact.h>
 #include <Storages/MergeTree/MergeTreeDataPartWriterCompact.h>
-#include <Poco/File.h>
 
 
 namespace DB
@@ -21,8 +20,9 @@ MergeTreeDataPartCompact::MergeTreeDataPartCompact(
        MergeTreeData & storage_,
         const String & name_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_)
-    : IMergeTreeDataPart(storage_, name_, volume_, relative_path_, Type::COMPACT)
+        const std::optional<String> & relative_path_,
+        const IMergeTreeDataPart * parent_part_)
+    : IMergeTreeDataPart(storage_, name_, volume_, relative_path_, Type::COMPACT, parent_part_)
 {
 }
 
@@ -31,8 +31,9 @@ MergeTreeDataPartCompact::MergeTreeDataPartCompact(
         const String & name_,
         const MergeTreePartInfo & info_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_)
-    : IMergeTreeDataPart(storage_, name_, info_, volume_, relative_path_, Type::COMPACT)
+        const std::optional<String> & relative_path_,
+        const IMergeTreeDataPart * parent_part_)
+    : IMergeTreeDataPart(storage_, name_, info_, volume_, relative_path_, Type::COMPACT, parent_part_)
 {
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.h b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
index 564d59c9198..2fcc7b7034b 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
@@ -26,13 +26,15 @@ public:
         const String & name_,
         const MergeTreePartInfo & info_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_ = {});
+        const std::optional<String> & relative_path_ = {},
+        const IMergeTreeDataPart * parent_part_ = nullptr);
 
     MergeTreeDataPartCompact(
         MergeTreeData & storage_,
         const String & name_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_ = {});
+        const std::optional<String> & relative_path_ = {},
+        const IMergeTreeDataPart * parent_part_ = nullptr);
 
     MergeTreeReaderPtr getReader(
         const NamesAndTypesList & columns,
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index 96fa411339c..e929bfc6862 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -5,7 +5,6 @@
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <DataTypes/NestedUtils.h>
 #include <Interpreters/Context.h>
-#include <Poco/File.h>
 #include <Poco/Logger.h>
 #include <common/logger_useful.h>
 
@@ -22,8 +21,9 @@ MergeTreeDataPartInMemory::MergeTreeDataPartInMemory(
        MergeTreeData & storage_,
         const String & name_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_)
-    : IMergeTreeDataPart(storage_, name_, volume_, relative_path_, Type::IN_MEMORY)
+        const std::optional<String> & relative_path_,
+        const IMergeTreeDataPart * parent_part_)
+    : IMergeTreeDataPart(storage_, name_, volume_, relative_path_, Type::IN_MEMORY, parent_part_)
 {
     default_codec = CompressionCodecFactory::instance().get("NONE", {});
 }
@@ -33,8 +33,9 @@ MergeTreeDataPartInMemory::MergeTreeDataPartInMemory(
         const String & name_,
         const MergeTreePartInfo & info_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_)
-    : IMergeTreeDataPart(storage_, name_, info_, volume_, relative_path_, Type::IN_MEMORY)
+        const std::optional<String> & relative_path_,
+        const IMergeTreeDataPart * parent_part_)
+    : IMergeTreeDataPart(storage_, name_, info_, volume_, relative_path_, Type::IN_MEMORY, parent_part_)
 {
     default_codec = CompressionCodecFactory::instance().get("NONE", {});
 }
@@ -77,7 +78,7 @@ void MergeTreeDataPartInMemory::flushToDisk(const String & base_path, const Stri
 
     new_data_part->uuid = uuid;
     new_data_part->setColumns(columns);
-    new_data_part->partition.value.assign(partition.value);
+    new_data_part->partition.value = partition.value;
     new_data_part->minmax_idx = minmax_idx;
 
     if (disk->exists(destination_path))
@@ -88,7 +89,7 @@ void MergeTreeDataPartInMemory::flushToDisk(const String & base_path, const Stri
 
     disk->createDirectories(destination_path);
 
-    auto compression_codec = storage.global_context.chooseCompressionCodec(0, 0);
+    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();
@@ -125,7 +126,7 @@ IMergeTreeDataPart::Checksum MergeTreeDataPartInMemory::calculateBlockChecksum()
         column.column->updateHashFast(hash);
 
     checksum.uncompressed_size = block.bytes();
-    hash.get128(checksum.uncompressed_hash.first, checksum.uncompressed_hash.second);
+    hash.get128(checksum.uncompressed_hash);
     return checksum;
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h b/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
index 397d3d2036c..118340f0233 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
@@ -15,13 +15,15 @@ public:
         const String & name_,
         const MergeTreePartInfo & info_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_ = {});
+        const std::optional<String> & relative_path_ = {},
+        const IMergeTreeDataPart * parent_part_ = nullptr);
 
     MergeTreeDataPartInMemory(
         MergeTreeData & storage_,
         const String & name_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_ = {});
+        const std::optional<String> & relative_path_ = {},
+        const IMergeTreeDataPart * parent_part_ = nullptr);
 
     MergeTreeReaderPtr getReader(
         const NamesAndTypesList & columns,
diff --git a/src/Storages/MergeTree/MergeTreeDataPartUUID.cpp b/src/Storages/MergeTree/MergeTreeDataPartUUID.cpp
index 17d19855798..3c3a6ecee7f 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartUUID.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartUUID.cpp
@@ -1,5 +1,7 @@
+#include <vector>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 
+
 namespace DB
 {
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
index 1da115efa70..4eebd729dd8 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
@@ -1,5 +1,4 @@
 #include "MergeTreeDataPartWide.h"
-#include <Poco/File.h>
 #include <Storages/MergeTree/MergeTreeReaderWide.h>
 #include <Storages/MergeTree/MergeTreeDataPartWriterWide.h>
 #include <Storages/MergeTree/IMergeTreeDataPartWriter.h>
@@ -23,8 +22,9 @@ MergeTreeDataPartWide::MergeTreeDataPartWide(
        MergeTreeData & storage_,
         const String & name_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_)
-    : IMergeTreeDataPart(storage_, name_, volume_, relative_path_, Type::WIDE)
+        const std::optional<String> & relative_path_,
+        const IMergeTreeDataPart * parent_part_)
+    : IMergeTreeDataPart(storage_, name_, volume_, relative_path_, Type::WIDE, parent_part_)
 {
 }
 
@@ -33,8 +33,9 @@ MergeTreeDataPartWide::MergeTreeDataPartWide(
         const String & name_,
         const MergeTreePartInfo & info_,
         const VolumePtr & volume_,
-        const std::optional<String> & relative_path_)
-    : IMergeTreeDataPart(storage_, name_, info_, volume_, relative_path_, Type::WIDE)
+        const std::optional<String> & relative_path_,
+        const IMergeTreeDataPart * parent_part_)
+    : IMergeTreeDataPart(storage_, name_, info_, volume_, relative_path_, Type::WIDE, parent_part_)
 {
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.h b/src/Storages/MergeTree/MergeTreeDataPartWide.h
index 30d3021d003..a43396f8cd5 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.h
@@ -20,13 +20,15 @@ public:
         const String & name_,
         const MergeTreePartInfo & info_,
         const VolumePtr & volume,
-        const std::optional<String> & relative_path = {});
+        const std::optional<String> & relative_path_ = {},
+        const IMergeTreeDataPart * parent_part_ = nullptr);
 
     MergeTreeDataPartWide(
         MergeTreeData & storage_,
         const String & name_,
         const VolumePtr & volume,
-        const std::optional<String> & relative_path = {});
+        const std::optional<String> & relative_path_ = {},
+        const IMergeTreeDataPart * parent_part_ = nullptr);
 
     MergeTreeReaderPtr getReader(
         const NamesAndTypesList & columns,
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
index 2efda206cf9..23a7b205a1b 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
@@ -114,8 +114,8 @@ void writeColumnSingleGranule(
     ISerialization::SerializeBinaryBulkSettings serialize_settings;
 
     serialize_settings.getter = stream_getter;
-    serialize_settings.position_independent_encoding = true;
-    serialize_settings.low_cardinality_max_dictionary_size = 0;
+    serialize_settings.position_independent_encoding = true; //-V1048
+    serialize_settings.low_cardinality_max_dictionary_size = 0; //-V1048
 
     serialization->serializeBinaryBulkStatePrefix(serialize_settings, state);
     serialization->serializeBinaryBulkWithMultipleStreams(*column.column, from_row, number_of_rows, serialize_settings, state);
@@ -355,7 +355,9 @@ size_t MergeTreeDataPartWriterCompact::ColumnsBuffer::size() const
 
 void MergeTreeDataPartWriterCompact::finish(IMergeTreeDataPart::Checksums & checksums, bool sync)
 {
-    finishDataSerialization(checksums, sync);
+    // If we don't have anything to write, skip finalization.
+    if (!columns_list.empty())
+        finishDataSerialization(checksums, sync);
 
     if (settings.rewrite_primary_key)
         finishPrimaryIndexSerialization(checksums, sync);
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index a2f7440b2e3..2666ba1518f 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -3,6 +3,7 @@
 #include <Compression/CompressionFactory.h>
 #include <Compression/CompressedReadBufferFromFile.h>
 #include <DataTypes/Serializations/ISerialization.h>
+#include <Common/escapeForFileName.h>
 
 namespace DB
 {
@@ -337,7 +338,7 @@ void MergeTreeDataPartWriterWide::writeColumn(
         serializations[name]->serializeBinaryBulkStatePrefix(serialize_settings, it->second);
     }
 
-    const auto & global_settings = storage.global_context.getSettingsRef();
+    const auto & global_settings = storage.getContext()->getSettingsRef();
     ISerialization::SerializeBinaryBulkSettings serialize_settings;
     serialize_settings.getter = createStreamGetter(name_and_type, offset_columns);
     serialize_settings.low_cardinality_max_dictionary_size = global_settings.low_cardinality_max_dictionary_size;
@@ -393,8 +394,9 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot validate column of non fixed type {}", type.getName());
 
     auto disk = data_part->volume->getDisk();
-    String mrk_path = fullPath(disk, part_path + name + marks_file_extension);
-    String bin_path = fullPath(disk, part_path + name + DATA_FILE_EXTENSION);
+    String escaped_name = escapeForFileName(name);
+    String mrk_path = fullPath(disk, part_path + escaped_name + marks_file_extension);
+    String bin_path = fullPath(disk, part_path + escaped_name + DATA_FILE_EXTENSION);
     DB::ReadBufferFromFile mrk_in(mrk_path);
     DB::CompressedReadBufferFromFile bin_in(bin_path, 0, 0, 0, nullptr);
     bool must_be_last = false;
@@ -501,7 +503,7 @@ void MergeTreeDataPartWriterWide::validateColumnOfFixedSize(const String & name,
 
 void MergeTreeDataPartWriterWide::finishDataSerialization(IMergeTreeDataPart::Checksums & checksums, bool sync)
 {
-    const auto & global_settings = storage.global_context.getSettingsRef();
+    const auto & global_settings = storage.getContext()->getSettingsRef();
     ISerialization::SerializeBinaryBulkSettings serialize_settings;
     serialize_settings.low_cardinality_max_dictionary_size = global_settings.low_cardinality_max_dictionary_size;
     serialize_settings.low_cardinality_use_single_dictionary_for_part = global_settings.low_cardinality_use_single_dictionary_for_part != 0;
@@ -557,7 +559,10 @@ void MergeTreeDataPartWriterWide::finishDataSerialization(IMergeTreeDataPart::Ch
 
 void MergeTreeDataPartWriterWide::finish(IMergeTreeDataPart::Checksums & checksums, bool sync)
 {
-    finishDataSerialization(checksums, sync);
+    // If we don't have anything to write, skip finalization.
+    if (!columns_list.empty())
+        finishDataSerialization(checksums, sync);
+
     if (settings.rewrite_primary_key)
         finishPrimaryIndexSerialization(checksums, sync);
 
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index f3759107912..894e57d41e5 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -1,16 +1,10 @@
 #include <boost/rational.hpp>   /// For calculations related to sampling coefficients.
-#include <ext/scope_guard.h>
+#include <ext/scope_guard_safe.h>
 #include <optional>
 #include <unordered_set>
 
-#include <Poco/File.h>
-
-#include <Common/FieldVisitors.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
-#include <Storages/MergeTree/MergeTreeSelectProcessor.h>
-#include <Storages/MergeTree/MergeTreeReverseSelectProcessor.h>
 #include <Storages/MergeTree/MergeTreeReadPool.h>
-#include <Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/MergeTreeIndexReader.h>
 #include <Storages/MergeTree/KeyCondition.h>
@@ -28,18 +22,23 @@
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
-#include <Processors/QueryPlan/ReverseRowsStep.h>
-#include <Processors/QueryPlan/MergingSortedStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Processors/QueryPlan/UnionStep.h>
-#include <Processors/QueryPlan/MergingFinal.h>
 
 #include <Core/UUID.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 #include <Storages/VirtualColumnUtils.h>
-#include <DataStreams/materializeBlock.h>
+
+#include <Interpreters/InterpreterSelectQuery.h>
+
+#include <Processors/Transforms/AggregatingTransform.h>
+#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
+#include <IO/WriteBufferFromOStream.h>
 
 namespace ProfileEvents
 {
@@ -63,6 +62,8 @@ namespace ErrorCodes
     extern const int CANNOT_PARSE_TEXT;
     extern const int TOO_MANY_PARTITIONS;
     extern const int DUPLICATED_PART_UUIDS;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
+    extern const int PROJECTION_NOT_USED;
 }
 
 
@@ -71,39 +72,12 @@ MergeTreeDataSelectExecutor::MergeTreeDataSelectExecutor(const MergeTreeData & d
 {
 }
 
-
-Block MergeTreeDataSelectExecutor::getSampleBlockWithVirtualPartColumns()
-{
-    return Block(std::initializer_list<ColumnWithTypeAndName>{
-        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")});
-}
-
-void MergeTreeDataSelectExecutor::fillBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, Block & block)
-{
-    MutableColumns columns = block.mutateColumns();
-
-    auto & part_column = columns[0];
-    auto & partition_id_column = columns[1];
-    auto & part_uuid_column = columns[2];
-
-    for (const auto & part : parts)
-    {
-        part_column->insert(part->name);
-        partition_id_column->insert(part->info.partition_id);
-        part_uuid_column->insert(part->uuid);
-    }
-
-    block.setColumns(std::move(columns));
-}
-
-
 size_t MergeTreeDataSelectExecutor::getApproximateTotalRowsToRead(
     const MergeTreeData::DataPartsVector & parts,
     const StorageMetadataPtr & metadata_snapshot,
     const KeyCondition & key_condition,
-    const Settings & settings) const
+    const Settings & settings,
+    Poco::Logger * log)
 {
     size_t rows_count = 0;
 
@@ -152,152 +126,268 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     const Names & column_names_to_return,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     const UInt64 max_block_size,
     const unsigned num_streams,
-    const PartitionIdToMaxBlock * max_block_numbers_to_read) const
+    QueryProcessingStage::Enum processed_stage,
+    std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
 {
-    return readFromParts(
-        data.getDataPartsVector(), column_names_to_return, metadata_snapshot,
-        query_info, context, max_block_size, num_streams,
-        max_block_numbers_to_read);
+    const auto & settings = context->getSettingsRef();
+    auto parts = data.getDataPartsVector();
+    if (!query_info.projection)
+    {
+        auto plan = readFromParts(
+            parts,
+            column_names_to_return,
+            metadata_snapshot,
+            metadata_snapshot,
+            query_info,
+            context,
+            max_block_size,
+            num_streams,
+            max_block_numbers_to_read);
+
+        if (plan->isInitialized() && settings.allow_experimental_projection_optimization && settings.force_optimize_projection
+            && !metadata_snapshot->projections.empty())
+            throw Exception(
+                "No projection is used when allow_experimental_projection_optimization = 1 and force_optimize_projection = 1",
+                ErrorCodes::PROJECTION_NOT_USED);
+
+        return plan;
+    }
+
+    LOG_DEBUG(
+        log,
+        "Choose {} projection {}",
+        ProjectionDescription::typeToString(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;
+
+    const auto & given_select = query_info.query->as<const ASTSelectQuery &>();
+    if (!projection_parts.empty())
+    {
+        LOG_DEBUG(log, "projection required columns: {}", fmt::join(query_info.projection->required_columns, ", "));
+        auto plan = readFromParts(
+            projection_parts,
+            query_info.projection->required_columns,
+            metadata_snapshot,
+            query_info.projection->desc->metadata,
+            query_info,
+            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)
+            {
+                // std::cerr << fmt::format("projection before_where: {}", query_info.projection->before_where->dumpDAG());
+                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)
+            {
+                // std::cerr << fmt::format("projection before_aggregation: {}", query_info.projection->before_aggregation->dumpDAG());
+                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));
+        }
+    }
+
+    if (!normal_parts.empty())
+    {
+        auto storage_from_base_parts_of_projection = StorageFromMergeTreeDataPart::create(std::move(normal_parts));
+        auto ast = query_info.projection->desc->query_ast->clone();
+        auto & select = ast->as<ASTSelectQuery &>();
+        if (given_select.where())
+            select.setExpression(ASTSelectQuery::Expression::WHERE, given_select.where()->clone());
+        if (given_select.prewhere())
+            select.setExpression(ASTSelectQuery::Expression::WHERE, given_select.prewhere()->clone());
+        // TODO will row policy filter work?
+
+        // After overriding the group by clause, we finish the possible aggregations directly
+        if (processed_stage >= QueryProcessingStage::Enum::WithMergeableState && given_select.groupBy())
+            select.setExpression(ASTSelectQuery::Expression::GROUP_BY, given_select.groupBy()->clone());
+        auto interpreter = InterpreterSelectQuery(
+            ast,
+            context,
+            storage_from_base_parts_of_projection,
+            nullptr,
+            SelectQueryOptions{processed_stage}.ignoreAggregation().ignoreProjections());
+        ordinary_pipe = QueryPipeline::getPipe(interpreter.execute().pipeline);
+    }
+
+    if (query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
+    {
+        /// Here we create shared ManyAggregatedData for both projection and ordinary data.
+        /// For ordinary data, AggregatedData is filled in a usual way.
+        /// For projection data, AggregatedData is filled by merging aggregation states.
+        /// When all AggregatedData is filled, we merge aggregation states together in a usual way.
+        /// Pipeline will look like:
+        /// ReadFromProjection   -> Aggregating (only merge states) ->
+        /// ReadFromProjection   -> Aggregating (only merge states) ->
+        /// ...                                                     -> Resize -> ConvertingAggregatedToChunks
+        /// ReadFromOrdinaryPart -> Aggregating (usual)             ->           (added by last Aggregating)
+        /// ReadFromOrdinaryPart -> Aggregating (usual)             ->
+        /// ...
+        auto many_data = std::make_shared<ManyAggregatedData>(projection_pipe.numOutputPorts() + ordinary_pipe.numOutputPorts());
+        size_t counter = 0;
+
+        // TODO apply in_order_optimization here
+        auto build_aggregate_pipe = [&](Pipe & pipe, bool projection)
+        {
+            const auto & header_before_aggregation = pipe.getHeader();
+
+            // std::cerr << "============ header before aggregation" << std::endl;
+            // std::cerr << header_before_aggregation.dumpStructure() << std::endl;
+
+            ColumnNumbers keys;
+            for (const auto & key : query_info.projection->aggregation_keys)
+                keys.push_back(header_before_aggregation.getPositionByName(key.name));
+
+            AggregateDescriptions aggregates = query_info.projection->aggregate_descriptions;
+            if (!projection)
+            {
+                for (auto & descr : aggregates)
+                    if (descr.arguments.empty())
+                        for (const auto & name : descr.argument_names)
+                            descr.arguments.push_back(header_before_aggregation.getPositionByName(name));
+            }
+
+            AggregatingTransformParamsPtr transform_params;
+            if (projection)
+            {
+                Aggregator::Params params(
+                    header_before_aggregation,
+                    keys,
+                    aggregates,
+                    query_info.projection->aggregate_overflow_row,
+                    settings.max_rows_to_group_by,
+                    settings.group_by_overflow_mode,
+                    settings.group_by_two_level_threshold,
+                    settings.group_by_two_level_threshold_bytes,
+                    settings.max_bytes_before_external_group_by,
+                    settings.empty_result_for_aggregation_by_empty_set,
+                    context->getTemporaryVolume(),
+                    settings.max_threads,
+                    settings.min_free_disk_space_for_temporary_data,
+                    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);
+
+                /// This part is hacky.
+                /// We want AggregatingTransform to work with aggregate states instead of normal columns.
+                /// It is almost the same, just instead of adding new data to aggregation state we merge it with existing.
+                ///
+                /// It is needed because data in projection:
+                /// * is not merged completely (we may have states with the same key in different parts)
+                /// * is not split into buckets (so if we just use MergingAggregated, it will use single thread)
+                transform_params->only_merge = true;
+            }
+            else
+            {
+                Aggregator::Params params(
+                    header_before_aggregation,
+                    keys,
+                    aggregates,
+                    query_info.projection->aggregate_overflow_row,
+                    settings.max_rows_to_group_by,
+                    settings.group_by_overflow_mode,
+                    settings.group_by_two_level_threshold,
+                    settings.group_by_two_level_threshold_bytes,
+                    settings.max_bytes_before_external_group_by,
+                    settings.empty_result_for_aggregation_by_empty_set,
+                    context->getTemporaryVolume(),
+                    settings.max_threads,
+                    settings.min_free_disk_space_for_temporary_data);
+
+                transform_params = std::make_shared<AggregatingTransformParams>(std::move(params), query_info.projection->aggregate_final);
+            }
+
+            pipe.resize(pipe.numOutputPorts(), true, true);
+
+            auto merge_threads = num_streams;
+            auto temporary_data_merge_threads = settings.aggregation_memory_efficient_merge_threads
+                ? static_cast<size_t>(settings.aggregation_memory_efficient_merge_threads)
+                : static_cast<size_t>(settings.max_threads);
+
+            pipe.addSimpleTransform([&](const Block & header)
+            {
+                return std::make_shared<AggregatingTransform>(
+                    header, transform_params, many_data, counter++, merge_threads, temporary_data_merge_threads);
+            });
+
+            // std::cerr << "============ header after aggregation" << std::endl;
+            // std::cerr << pipe.getHeader().dumpStructure() << std::endl;
+        };
+
+        if (!projection_pipe.empty())
+            build_aggregate_pipe(projection_pipe, true);
+        if (!ordinary_pipe.empty())
+            build_aggregate_pipe(ordinary_pipe, false);
+    }
+
+    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>();
+    plan->addStep(std::move(step));
+    return plan;
 }
 
-QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
-    MergeTreeData::DataPartsVector parts,
-    const Names & column_names_to_return,
+MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
+    const ASTSelectQuery & select,
+    NamesAndTypesList available_real_columns,
+    const MergeTreeData::DataPartsVector & parts,
+    KeyCondition & key_condition,
+    const MergeTreeData & data,
     const StorageMetadataPtr & metadata_snapshot,
-    const SelectQueryInfo & query_info,
-    const Context & context,
-    const UInt64 max_block_size,
-    const unsigned num_streams,
-    const PartitionIdToMaxBlock * max_block_numbers_to_read) const
+    ContextPtr context,
+    bool sample_factor_column_queried,
+    Poco::Logger * log)
 {
-    /// If query contains restrictions on the virtual column `_part` or `_part_index`, select only parts suitable for it.
-    /// The virtual column `_sample_factor` (which is equal to 1 / used sample rate) can be requested in the query.
-    Names virt_column_names;
-    Names real_column_names;
-
-    size_t total_parts = parts.size();
-
-    bool sample_factor_column_queried = false;
-    Float64 used_sample_factor = 1;
-
-    for (const String & name : column_names_to_return)
-    {
-        if (name == "_part")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_part_index")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_partition_id")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_part_uuid")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_sample_factor")
-        {
-            sample_factor_column_queried = true;
-            virt_column_names.push_back(name);
-        }
-        else
-        {
-            real_column_names.push_back(name);
-        }
-    }
-
-    NamesAndTypesList available_real_columns = metadata_snapshot->getColumns().getAllPhysical();
-
-    /// If there are only virtual columns in the query, you must request at least one non-virtual one.
-    if (real_column_names.empty())
-        real_column_names.push_back(ExpressionActions::getSmallestColumn(available_real_columns));
-
-    std::unordered_set<String> part_values;
-    ASTPtr expression_ast;
-    auto virtual_columns_block = getSampleBlockWithVirtualPartColumns();
-
-    // Generate valid expressions for filtering
-    VirtualColumnUtils::prepareFilterBlockWithQuery(query_info.query, context, virtual_columns_block, expression_ast);
-
-    // If there is still something left, fill the virtual block and do the filtering.
-    if (expression_ast)
-    {
-        fillBlockWithVirtualPartColumns(parts, virtual_columns_block);
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, context, expression_ast);
-        part_values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
-        if (part_values.empty())
-            return std::make_unique<QueryPlan>();
-    }
-    // At this point, empty `part_values` means all parts.
-
-    metadata_snapshot->check(real_column_names, data.getVirtuals(), data.getStorageID());
-
-    const Settings & settings = context.getSettingsRef();
-    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 (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.",
-                        boost::algorithm::join(primary_key_columns, ", "));
-    }
-
-    std::optional<KeyCondition> minmax_idx_condition;
-    std::optional<PartitionPruner> partition_pruner;
-    DataTypes minmax_columns_types;
-    if (metadata_snapshot->hasPartitionKey())
-    {
-        const auto & partition_key = metadata_snapshot->getPartitionKey();
-        auto minmax_columns_names = data.getMinMaxColumnsNames(partition_key);
-        minmax_columns_types = data.getMinMaxColumnsTypes(partition_key);
-
-        minmax_idx_condition.emplace(query_info, context, minmax_columns_names, data.getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(context)));
-        partition_pruner.emplace(metadata_snapshot->getPartitionKey(), query_info, context, false /* strict */);
-
-        if (settings.force_index_by_date && (minmax_idx_condition->alwaysUnknownOrTrue() && partition_pruner->isUseless()))
-        {
-            String msg = "Neither MinMax index by columns (";
-            bool first = true;
-            for (const String & col : minmax_columns_names)
-            {
-                if (first)
-                    first = false;
-                else
-                    msg += ", ";
-                msg += col;
-            }
-            msg += ") nor partition expr is used and setting 'force_index_by_date' is set";
-
-            throw Exception(msg, ErrorCodes::INDEX_NOT_USED);
-        }
-    }
-
-    const Context & query_context = context.hasQueryContext() ? context.getQueryContext() : context;
-
-    if (query_context.getSettingsRef().allow_experimental_query_deduplication)
-        selectPartsToReadWithUUIDFilter(parts, part_values, minmax_idx_condition, minmax_columns_types, partition_pruner, max_block_numbers_to_read, query_context);
-    else
-        selectPartsToRead(parts, part_values, minmax_idx_condition, minmax_columns_types, partition_pruner, max_block_numbers_to_read);
-
-
+    const Settings & settings = context->getSettingsRef();
     /// Sampling.
-    Names column_names_to_read = real_column_names;
-    std::shared_ptr<ASTFunction> filter_function;
-    ActionsDAGPtr filter_expression;
+    MergeTreeDataSelectSamplingData sampling;
 
     RelativeSize relative_sample_size = 0;
     RelativeSize relative_sample_offset = 0;
 
-    const auto & select = query_info.query->as<ASTSelectQuery &>();
-
     auto select_sample_size = select.sampleSize();
     auto select_sample_offset = select.sampleOffset();
 
@@ -319,10 +409,11 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         if (relative_sample_offset < 0)
             throw Exception("Negative sample offset", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
 
-        /// Convert absolute value of the sampling (in form `SAMPLE 1000000` - how many rows to read) into the relative `SAMPLE 0.1` (how much data to read).
+        /// Convert absolute value of the sampling (in form `SAMPLE 1000000` - how many rows to
+        /// read) into the relative `SAMPLE 0.1` (how much data to read).
         size_t approx_total_rows = 0;
         if (relative_sample_size > 1 || relative_sample_offset > 1)
-            approx_total_rows = getApproximateTotalRowsToRead(parts, metadata_snapshot, key_condition, settings);
+            approx_total_rows = getApproximateTotalRowsToRead(parts, metadata_snapshot, key_condition, settings, log);
 
         if (relative_sample_size > 1)
         {
@@ -345,37 +436,37 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     }
 
     /** Which range of sampling key values do I need to read?
-      * First, in the whole range ("universe") we select the interval
-      *  of relative `relative_sample_size` size, offset from the beginning by `relative_sample_offset`.
-      *
-      * Example: SAMPLE 0.4 OFFSET 0.3
-      *
-      * [------********------]
-      *        ^ - offset
-      *        <------> - size
-      *
-      * If the interval passes through the end of the universe, then cut its right side.
-      *
-      * Example: SAMPLE 0.4 OFFSET 0.8
-      *
-      * [----------------****]
-      *                  ^ - offset
-      *                  <------> - size
-      *
-      * Next, if the `parallel_replicas_count`, `parallel_replica_offset` settings are set,
-      *  then it is necessary to break the received interval into pieces of the number `parallel_replicas_count`,
-      *  and select a piece with the number `parallel_replica_offset` (from zero).
-      *
-      * Example: SAMPLE 0.4 OFFSET 0.3, parallel_replicas_count = 2, parallel_replica_offset = 1
-      *
-      * [----------****------]
-      *        ^ - offset
-      *        <------> - size
-      *        <--><--> - pieces for different `parallel_replica_offset`, select the second one.
-      *
-      * It is very important that the intervals for different `parallel_replica_offset` cover the entire range without gaps and overlaps.
-      * It is also important that the entire universe can be covered using SAMPLE 0.1 OFFSET 0, ... OFFSET 0.9 and similar decimals.
-      */
+        * First, in the whole range ("universe") we select the interval
+        *  of relative `relative_sample_size` size, offset from the beginning by `relative_sample_offset`.
+        *
+        * Example: SAMPLE 0.4 OFFSET 0.3
+        *
+        * [------********------]
+        *        ^ - offset
+        *        <------> - size
+        *
+        * If the interval passes through the end of the universe, then cut its right side.
+        *
+        * Example: SAMPLE 0.4 OFFSET 0.8
+        *
+        * [----------------****]
+        *                  ^ - offset
+        *                  <------> - size
+        *
+        * Next, if the `parallel_replicas_count`, `parallel_replica_offset` settings are set,
+        *  then it is necessary to break the received interval into pieces of the number `parallel_replicas_count`,
+        *  and select a piece with the number `parallel_replica_offset` (from zero).
+        *
+        * Example: SAMPLE 0.4 OFFSET 0.3, parallel_replicas_count = 2, parallel_replica_offset = 1
+        *
+        * [----------****------]
+        *        ^ - offset
+        *        <------> - size
+        *        <--><--> - pieces for different `parallel_replica_offset`, select the second one.
+        *
+        * It is very important that the intervals for different `parallel_replica_offset` cover the entire range without gaps and overlaps.
+        * It is also important that the entire universe can be covered using SAMPLE 0.1 OFFSET 0, ... OFFSET 0.9 and similar decimals.
+        */
 
     /// Parallel replicas has been requested but there is no way to sample data.
     /// Select all data from first replica and no data from other replicas.
@@ -383,16 +474,17 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     {
         LOG_DEBUG(log, "Will use no data on this replica because parallel replicas processing has been requested"
             " (the setting 'max_parallel_replicas') but the table does not support sampling and this replica is not the first.");
-        return std::make_unique<QueryPlan>();
+        sampling.read_nothing = true;
+        return sampling;
     }
 
-    bool use_sampling = relative_sample_size > 0 || (settings.parallel_replicas_count > 1 && data.supportsSampling());
+    sampling.use_sampling = relative_sample_size > 0 || (settings.parallel_replicas_count > 1 && data.supportsSampling());
     bool no_data = false;   /// There is nothing left after sampling.
 
-    if (use_sampling)
+    if (sampling.use_sampling)
     {
         if (sample_factor_column_queried && relative_sample_size != RelativeSize(0))
-            used_sample_factor = 1.0 / boost::rational_cast<Float64>(relative_sample_size);
+            sampling.used_sample_factor = 1.0 / boost::rational_cast<Float64>(relative_sample_size);
 
         RelativeSize size_of_universum = 0;
         const auto & sampling_key = metadata_snapshot->getSamplingKey();
@@ -458,7 +550,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
         if (no_data || (!has_lower_limit && !has_upper_limit))
         {
-            use_sampling = false;
+            sampling.use_sampling = false;
         }
         else
         {
@@ -493,7 +585,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
                 lower_function->arguments = args;
                 lower_function->children.push_back(lower_function->arguments);
 
-                filter_function = lower_function;
+                sampling.filter_function = lower_function;
             }
 
             if (has_upper_limit)
@@ -510,7 +602,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
                 upper_function->arguments = args;
                 upper_function->children.push_back(upper_function->arguments);
 
-                filter_function = upper_function;
+                sampling.filter_function = upper_function;
             }
 
             if (has_lower_limit && has_upper_limit)
@@ -519,48 +611,163 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
                 args->children.push_back(lower_function);
                 args->children.push_back(upper_function);
 
-                filter_function = std::make_shared<ASTFunction>();
-                filter_function->name = "and";
-                filter_function->arguments = args;
-                filter_function->children.push_back(filter_function->arguments);
+                sampling.filter_function = std::make_shared<ASTFunction>();
+                sampling.filter_function->name = "and";
+                sampling.filter_function->arguments = args;
+                sampling.filter_function->children.push_back(sampling.filter_function->arguments);
             }
 
-            ASTPtr query = filter_function;
+            ASTPtr query = sampling.filter_function;
             auto syntax_result = TreeRewriter(context).analyze(query, available_real_columns);
-            filter_expression = ExpressionAnalyzer(filter_function, syntax_result, context).getActionsDAG(false);
-
-            if (!select.final())
-            {
-                /// Add columns needed for `sample_by_ast` to `column_names_to_read`.
-                /// Skip this if final was used, because such columns were already added from PK.
-                std::vector<String> add_columns = filter_expression->getRequiredColumns().getNames();
-                column_names_to_read.insert(column_names_to_read.end(), add_columns.begin(), add_columns.end());
-                std::sort(column_names_to_read.begin(), column_names_to_read.end());
-                column_names_to_read.erase(std::unique(column_names_to_read.begin(), column_names_to_read.end()),
-                                           column_names_to_read.end());
-            }
+            sampling.filter_expression = ExpressionAnalyzer(sampling.filter_function, syntax_result, context).getActionsDAG(false);
         }
     }
 
     if (no_data)
     {
         LOG_DEBUG(log, "Sampling yields no data.");
-        return std::make_unique<QueryPlan>();
+        sampling.read_nothing = true;
     }
 
-    LOG_DEBUG(log, "Key condition: {}", key_condition.toString());
-    if (minmax_idx_condition)
-        LOG_DEBUG(log, "MinMax index condition: {}", minmax_idx_condition->toString());
+    return sampling;
+}
 
-    MergeTreeReaderSettings reader_settings =
+std::optional<std::unordered_set<String>> MergeTreeDataSelectExecutor::filterPartsByVirtualColumns(
+    const MergeTreeData & data,
+    const MergeTreeData::DataPartsVector & parts,
+    const ASTPtr & query,
+    ContextPtr context)
+{
+    std::unordered_set<String> part_values;
+    ASTPtr expression_ast;
+    auto virtual_columns_block = data.getBlockWithVirtualPartColumns(parts, true /* one_part */);
+
+    // Generate valid expressions for filtering
+    VirtualColumnUtils::prepareFilterBlockWithQuery(query, context, virtual_columns_block, expression_ast);
+
+    // If there is still something left, fill the virtual block and do the filtering.
+    if (expression_ast)
     {
-        .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,
-        .save_marks_in_cache = true,
-        .checksum_on_read = settings.checksum_on_read,
-    };
+        virtual_columns_block = data.getBlockWithVirtualPartColumns(parts, false /* one_part */);
+        VirtualColumnUtils::filterBlockWithQuery(query, virtual_columns_block, context, expression_ast);
+        return VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
+    }
+
+    return {};
+}
+
+void MergeTreeDataSelectExecutor::filterPartsByPartition(
+    MergeTreeData::DataPartsVector & parts,
+    const std::optional<std::unordered_set<String>> & part_values,
+    const StorageMetadataPtr & metadata_snapshot,
+    const MergeTreeData & data,
+    const SelectQueryInfo & query_info,
+    const ContextPtr & context,
+    const PartitionIdToMaxBlock * max_block_numbers_to_read,
+    Poco::Logger * log,
+    ReadFromMergeTree::IndexStats & index_stats)
+{
+    const Settings & settings = context->getSettingsRef();
+    std::optional<PartitionPruner> partition_pruner;
+    std::optional<KeyCondition> minmax_idx_condition;
+    DataTypes minmax_columns_types;
+    if (metadata_snapshot->hasPartitionKey())
+    {
+        const auto & partition_key = metadata_snapshot->getPartitionKey();
+        auto minmax_columns_names = data.getMinMaxColumnsNames(partition_key);
+        minmax_columns_types = data.getMinMaxColumnsTypes(partition_key);
+
+        minmax_idx_condition.emplace(
+            query_info, context, minmax_columns_names, data.getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(context)));
+        partition_pruner.emplace(metadata_snapshot, query_info, context, false /* strict */);
+
+        if (settings.force_index_by_date && (minmax_idx_condition->alwaysUnknownOrTrue() && partition_pruner->isUseless()))
+        {
+            String msg = "Neither MinMax index by columns (";
+            bool first = true;
+            for (const String & col : minmax_columns_names)
+            {
+                if (first)
+                    first = false;
+                else
+                    msg += ", ";
+                msg += col;
+            }
+            msg += ") nor partition expr is used and setting 'force_index_by_date' is set";
+
+            throw Exception(msg, ErrorCodes::INDEX_NOT_USED);
+        }
+    }
+
+    auto query_context = context->hasQueryContext() ? context->getQueryContext() : context;
+    PartFilterCounters part_filter_counters;
+    if (query_context->getSettingsRef().allow_experimental_query_deduplication)
+        selectPartsToReadWithUUIDFilter(
+            parts,
+            part_values,
+            data.getPinnedPartUUIDs(),
+            minmax_idx_condition,
+            minmax_columns_types,
+            partition_pruner,
+            max_block_numbers_to_read,
+            query_context,
+            part_filter_counters,
+            log);
+    else
+        selectPartsToRead(
+            parts,
+            part_values,
+            minmax_idx_condition,
+            minmax_columns_types,
+            partition_pruner,
+            max_block_numbers_to_read,
+            part_filter_counters);
+
+    index_stats.emplace_back(ReadFromMergeTree::IndexStat{
+        .type = ReadFromMergeTree::IndexType::None,
+        .num_parts_after = part_filter_counters.num_initial_selected_parts,
+        .num_granules_after = part_filter_counters.num_initial_selected_granules});
+
+    if (minmax_idx_condition)
+    {
+        auto description = minmax_idx_condition->getDescription();
+        index_stats.emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::MinMax,
+            .condition = std::move(description.condition),
+            .used_keys = std::move(description.used_keys),
+            .num_parts_after = part_filter_counters.num_parts_after_minmax,
+            .num_granules_after = part_filter_counters.num_granules_after_minmax});
+        LOG_DEBUG(log, "MinMax index condition: {}", minmax_idx_condition->toString());
+    }
+
+    if (partition_pruner)
+    {
+        auto description = partition_pruner->getKeyCondition().getDescription();
+        index_stats.emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::Partition,
+            .condition = std::move(description.condition),
+            .used_keys = std::move(description.used_keys),
+            .num_parts_after = part_filter_counters.num_parts_after_partition_pruner,
+            .num_granules_after = part_filter_counters.num_granules_after_partition_pruner});
+    }
+}
+
+RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
+    MergeTreeData::DataPartsVector && parts,
+    StorageMetadataPtr metadata_snapshot,
+    const SelectQueryInfo & query_info,
+    const ContextPtr & context,
+    const KeyCondition & key_condition,
+    const MergeTreeReaderSettings & reader_settings,
+    Poco::Logger * log,
+    size_t num_streams,
+    ReadFromMergeTree::IndexStats & index_stats,
+    bool use_skip_indexes)
+{
+    RangesInDataParts parts_with_ranges(parts.size());
+    const Settings & settings = context->getSettingsRef();
+
+    /// Let's start analyzing all useful indices
 
     struct DataSkippingIndexAndCondition
     {
@@ -568,24 +775,28 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         MergeTreeIndexConditionPtr condition;
         std::atomic<size_t> total_granules{0};
         std::atomic<size_t> granules_dropped{0};
+        std::atomic<size_t> total_parts{0};
+        std::atomic<size_t> parts_dropped{0};
 
         DataSkippingIndexAndCondition(MergeTreeIndexPtr index_, MergeTreeIndexConditionPtr condition_)
-            : index(index_)
-            , condition(condition_)
+            : index(index_), condition(condition_)
         {
         }
     };
     std::list<DataSkippingIndexAndCondition> useful_indices;
 
-    for (const auto & index : metadata_snapshot->getSecondaryIndices())
+    if (use_skip_indexes)
     {
-        auto index_helper = MergeTreeIndexFactory::instance().get(index);
-        auto condition = index_helper->createIndexCondition(query_info, context);
-        if (!condition->alwaysUnknownOrTrue())
-            useful_indices.emplace_back(index_helper, condition);
+        for (const auto & index : metadata_snapshot->getSecondaryIndices())
+        {
+            auto index_helper = MergeTreeIndexFactory::instance().get(index);
+            auto condition = index_helper->createIndexCondition(query_info, context);
+            if (!condition->alwaysUnknownOrTrue())
+                useful_indices.emplace_back(index_helper, condition);
+        }
     }
 
-    if (settings.force_data_skipping_indices.changed)
+    if (use_skip_indexes && settings.force_data_skipping_indices.changed)
     {
         const auto & indices = settings.force_data_skipping_indices.toString();
 
@@ -595,8 +806,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
             IParser::Pos pos(tokens, settings.max_parser_depth);
             Expected expected;
             if (!parseIdentifiersOrStringLiterals(pos, expected, forced_indices))
-                throw Exception(ErrorCodes::CANNOT_PARSE_TEXT,
-                    "Cannot parse force_data_skipping_indices ('{}')", indices);
+                throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Cannot parse force_data_skipping_indices ('{}')", indices);
         }
 
         if (forced_indices.empty())
@@ -610,23 +820,20 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         {
             if (!useful_indices_names.count(index_name))
             {
-                throw Exception(ErrorCodes::INDEX_NOT_USED,
+                throw Exception(
+                    ErrorCodes::INDEX_NOT_USED,
                     "Index {} is not used and setting 'force_data_skipping_indices' contains it",
                     backQuote(index_name));
             }
         }
     }
 
-    RangesInDataParts parts_with_ranges(parts.size());
-    size_t sum_marks = 0;
     std::atomic<size_t> sum_marks_pk = 0;
-    std::atomic<size_t> total_marks_pk = 0;
-
-    size_t sum_ranges = 0;
+    std::atomic<size_t> sum_parts_pk = 0;
 
     /// Let's find what range to read from each part.
     {
-        std::atomic<size_t> total_rows {0};
+        std::atomic<size_t> total_rows{0};
 
         SizeLimits limits;
         if (settings.read_overflow_mode == OverflowMode::THROW && settings.max_rows_to_read)
@@ -642,36 +849,43 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
 
             RangesInDataPart ranges(part, part_index);
 
-            total_marks_pk.fetch_add(part->index_granularity.getMarksCount(), std::memory_order_relaxed);
+            size_t total_marks_count = part->index_granularity.getMarksCountWithoutFinal();
 
             if (metadata_snapshot->hasPrimaryKey())
                 ranges.ranges = markRangesFromPKRange(part, metadata_snapshot, key_condition, settings, log);
-            else
-            {
-                size_t total_marks_count = part->getMarksCount();
-                if (total_marks_count)
-                {
-                    if (part->index_granularity.hasFinalMark())
-                        --total_marks_count;
-                    ranges.ranges = MarkRanges{MarkRange{0, total_marks_count}};
-                }
-            }
+            else if (total_marks_count)
+                ranges.ranges = MarkRanges{MarkRange{0, total_marks_count}};
 
             sum_marks_pk.fetch_add(ranges.getMarksCount(), std::memory_order_relaxed);
 
+            if (!ranges.ranges.empty())
+                sum_parts_pk.fetch_add(1, std::memory_order_relaxed);
+
             for (auto & index_and_condition : useful_indices)
             {
+                if (ranges.ranges.empty())
+                    break;
+
+                index_and_condition.total_parts.fetch_add(1, std::memory_order_relaxed);
+
                 size_t total_granules = 0;
                 size_t granules_dropped = 0;
                 ranges.ranges = filterMarksUsingIndex(
-                    index_and_condition.index, index_and_condition.condition,
-                    part, ranges.ranges,
-                    settings, reader_settings,
-                    total_granules, granules_dropped,
+                    index_and_condition.index,
+                    index_and_condition.condition,
+                    part,
+                    ranges.ranges,
+                    settings,
+                    reader_settings,
+                    total_granules,
+                    granules_dropped,
                     log);
 
                 index_and_condition.total_granules.fetch_add(total_granules, std::memory_order_relaxed);
                 index_and_condition.granules_dropped.fetch_add(granules_dropped, std::memory_order_relaxed);
+
+                if (ranges.ranges.empty())
+                    index_and_condition.parts_dropped.fetch_add(1, std::memory_order_relaxed);
             }
 
             if (!ranges.ranges.empty())
@@ -683,7 +897,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
                     size_t prev_total_rows_estimate = total_rows.fetch_add(current_rows_estimate);
                     size_t total_rows_estimate = current_rows_estimate + prev_total_rows_estimate;
                     limits.check(total_rows_estimate, 0, "rows (controlled by 'max_rows_to_read' setting)", ErrorCodes::TOO_MANY_ROWS);
-                    leaf_limits.check(total_rows_estimate, 0, "rows (controlled by 'max_rows_to_read_leaf' setting)", ErrorCodes::TOO_MANY_ROWS);
+                    leaf_limits.check(
+                        total_rows_estimate, 0, "rows (controlled by 'max_rows_to_read_leaf' setting)", ErrorCodes::TOO_MANY_ROWS);
                 }
 
                 parts_with_ranges[part_index] = std::move(ranges);
@@ -703,11 +918,9 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
             ThreadPool pool(num_threads);
 
             for (size_t part_index = 0; part_index < parts.size(); ++part_index)
-                pool.scheduleOrThrowOnError([&, part_index, thread_group = CurrentThread::getGroup()] {
-                    SCOPE_EXIT(
-                        if (thread_group)
-                            CurrentThread::detachQueryIfNotDetached();
-                    );
+                pool.scheduleOrThrowOnError([&, part_index, thread_group = CurrentThread::getGroup()]
+                {
+                    SCOPE_EXIT_SAFE(if (thread_group) CurrentThread::detachQueryIfNotDetached(););
                     if (thread_group)
                         CurrentThread::attachTo(thread_group);
 
@@ -725,9 +938,6 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
             if (!part.data_part)
                 continue;
 
-            sum_ranges += part.ranges.size();
-            sum_marks += part.getMarksCount();
-
             if (next_part != part_index)
                 std::swap(parts_with_ranges[next_part], part);
 
@@ -737,186 +947,267 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         parts_with_ranges.resize(next_part);
     }
 
+    if (metadata_snapshot->hasPrimaryKey())
+    {
+        auto description = key_condition.getDescription();
+
+        index_stats.emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::PrimaryKey,
+            .condition = std::move(description.condition),
+            .used_keys = std::move(description.used_keys),
+            .num_parts_after = sum_parts_pk.load(std::memory_order_relaxed),
+            .num_granules_after = sum_marks_pk.load(std::memory_order_relaxed)});
+    }
+
     for (const auto & index_and_condition : useful_indices)
     {
         const auto & index_name = index_and_condition.index->index.name;
-        LOG_DEBUG(log, "Index {} has dropped {}/{} granules.",
+        LOG_DEBUG(
+            log,
+            "Index {} has dropped {}/{} granules.",
             backQuote(index_name),
-            index_and_condition.granules_dropped, index_and_condition.total_granules);
+            index_and_condition.granules_dropped,
+            index_and_condition.total_granules);
+
+        std::string description
+            = index_and_condition.index->index.type + " GRANULARITY " + std::to_string(index_and_condition.index->index.granularity);
+
+        index_stats.emplace_back(ReadFromMergeTree::IndexStat{
+            .type = ReadFromMergeTree::IndexType::Skip,
+            .name = index_name,
+            .description = std::move(description),
+            .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});
     }
 
-    LOG_DEBUG(log, "Selected {}/{} parts by partition key, {} parts by primary key, {}/{} marks by primary key, {} marks to read from {} ranges",
-        parts.size(), total_parts, parts_with_ranges.size(),
-        sum_marks_pk.load(std::memory_order_relaxed),
-        total_marks_pk.load(std::memory_order_relaxed),
-        sum_marks, sum_ranges);
-
-    if (parts_with_ranges.empty())
-        return std::make_unique<QueryPlan>();
-
-    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 (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);
-    }
+    return parts_with_ranges;
+}
 
+std::shared_ptr<QueryIdHolder> MergeTreeDataSelectExecutor::checkLimits(
+    const MergeTreeData & data,
+    const RangesInDataParts & parts_with_ranges,
+    const ContextPtr & context)
+{
+    const auto & settings = context->getSettingsRef();
+    // Check limitations. query_id is used as the quota RAII's resource key.
     String query_id;
-    if (data_settings->max_concurrent_queries > 0)
     {
-        if (data_settings->min_marks_to_honor_max_concurrent_queries > 0
-            && sum_marks >= data_settings->min_marks_to_honor_max_concurrent_queries)
+        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)
         {
-            query_id = context.getCurrentQueryId();
-            if (!query_id.empty())
-                data.insertQueryIdOrThrow(query_id, data_settings->max_concurrent_queries);
+            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);
+        }
+
+        if (data_settings->max_concurrent_queries > 0 && data_settings->min_marks_to_honor_max_concurrent_queries > 0)
+        {
+            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)
+            {
+                query_id = context->getCurrentQueryId();
+                if (!query_id.empty())
+                    data.insertQueryIdOrThrow(query_id, data_settings->max_concurrent_queries);
+            }
         }
     }
 
-    ProfileEvents::increment(ProfileEvents::SelectedParts, parts_with_ranges.size());
-    ProfileEvents::increment(ProfileEvents::SelectedRanges, sum_ranges);
-    ProfileEvents::increment(ProfileEvents::SelectedMarks, sum_marks);
+    if (!query_id.empty())
+        return std::make_shared<QueryIdHolder>(query_id, data);
 
-    QueryPlanPtr plan;
+    return nullptr;
+}
 
-    /// Projection, that needed to drop columns, which have appeared by execution
-    /// of some extra expressions, and to allow execute the same expressions later.
-    /// NOTE: It may lead to double computation of expressions.
-    ActionsDAGPtr result_projection;
+static void selectColumnNames(
+    const Names & column_names_to_return,
+    const MergeTreeData & data,
+    Names & real_column_names,
+    Names & virt_column_names,
+    bool & sample_factor_column_queried)
+{
+    sample_factor_column_queried = false;
 
-    if (select.final())
+    for (const String & name : column_names_to_return)
     {
-        /// Add columns needed to calculate the sorting expression and the sign.
-        std::vector<String> add_columns = metadata_snapshot->getColumnsRequiredForSortingKey();
-        column_names_to_read.insert(column_names_to_read.end(), add_columns.begin(), add_columns.end());
+        if (name == "_part")
+        {
+            virt_column_names.push_back(name);
+        }
+        else if (name == "_part_index")
+        {
+            virt_column_names.push_back(name);
+        }
+        else if (name == "_partition_id")
+        {
+            virt_column_names.push_back(name);
+        }
+        else if (name == "_part_uuid")
+        {
+            virt_column_names.push_back(name);
+        }
+        else if (name == "_partition_value")
+        {
+            if (!typeid_cast<const DataTypeTuple *>(data.getPartitionValueType().get()))
+            {
+                throw Exception(
+                    ErrorCodes::NO_SUCH_COLUMN_IN_TABLE,
+                    "Missing column `_partition_value` because there is no partition column in table {}",
+                    data.getStorageID().getTableName());
+            }
 
-        if (!data.merging_params.sign_column.empty())
-            column_names_to_read.push_back(data.merging_params.sign_column);
-        if (!data.merging_params.version_column.empty())
-            column_names_to_read.push_back(data.merging_params.version_column);
-
-        std::sort(column_names_to_read.begin(), column_names_to_read.end());
-        column_names_to_read.erase(std::unique(column_names_to_read.begin(), column_names_to_read.end()), column_names_to_read.end());
-
-        plan = spreadMarkRangesAmongStreamsFinal(
-            std::move(parts_with_ranges),
-            num_streams,
-            column_names_to_read,
-            metadata_snapshot,
-            max_block_size,
-            settings.use_uncompressed_cache,
-            query_info,
-            virt_column_names,
-            settings,
-            reader_settings,
-            result_projection,
-            query_id);
+            virt_column_names.push_back(name);
+        }
+        else if (name == "_sample_factor")
+        {
+            sample_factor_column_queried = true;
+            virt_column_names.push_back(name);
+        }
+        else
+        {
+            real_column_names.push_back(name);
+        }
     }
-    else if ((settings.optimize_read_in_order || settings.optimize_aggregation_in_order) && query_info.input_order_info)
-    {
-        size_t prefix_size = query_info.input_order_info->order_key_prefix_descr.size();
-        auto order_key_prefix_ast = metadata_snapshot->getSortingKey().expression_list_ast->clone();
-        order_key_prefix_ast->children.resize(prefix_size);
+}
 
-        auto syntax_result = TreeRewriter(context).analyze(order_key_prefix_ast, metadata_snapshot->getColumns().getAllPhysical());
-        auto sorting_key_prefix_expr = ExpressionAnalyzer(order_key_prefix_ast, syntax_result, context).getActionsDAG(false);
+size_t MergeTreeDataSelectExecutor::estimateNumMarksToRead(
+    MergeTreeData::DataPartsVector parts,
+    const Names & column_names_to_return,
+    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
+{
+    size_t total_parts = parts.size();
+    if (total_parts == 0)
+        return 0;
 
-        plan = spreadMarkRangesAmongStreamsWithOrder(
-            std::move(parts_with_ranges),
-            num_streams,
-            column_names_to_read,
-            metadata_snapshot,
-            max_block_size,
-            settings.use_uncompressed_cache,
-            query_info,
-            sorting_key_prefix_expr,
-            virt_column_names,
-            settings,
-            reader_settings,
-            result_projection,
-            query_id);
-    }
-    else
+    Names real_column_names;
+    Names virt_column_names;
+    /// If query contains restrictions on the virtual column `_part` or `_part_index`, select only parts suitable for it.
+    /// The virtual column `_sample_factor` (which is equal to 1 / used sample rate) can be requested in the query.
+    bool sample_factor_column_queried = false;
+
+    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())
     {
-        plan = spreadMarkRangesAmongStreams(
-            std::move(parts_with_ranges),
-            num_streams,
-            column_names_to_read,
-            metadata_snapshot,
-            max_block_size,
-            settings.use_uncompressed_cache,
-            query_info,
-            virt_column_names,
-            settings,
-            reader_settings,
-            query_id);
+        NamesAndTypesList available_real_columns = metadata_snapshot->getColumns().getAllPhysical();
+        real_column_names.push_back(ExpressionActions::getSmallestColumn(available_real_columns));
     }
 
-    if (!plan)
+    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(
+        std::move(parts),
+        metadata_snapshot,
+        query_info,
+        context,
+        key_condition,
+        reader_settings,
+        log,
+        num_streams,
+        index_stats,
+        false);
+
+    return index_stats.back().num_granules_after;
+}
+
+QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
+    MergeTreeData::DataPartsVector parts,
+    const Names & column_names_to_return,
+    const StorageMetadataPtr & metadata_snapshot_base,
+    const StorageMetadataPtr & metadata_snapshot,
+    const SelectQueryInfo & query_info,
+    ContextPtr context,
+    const UInt64 max_block_size,
+    const unsigned num_streams,
+    std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
+{
+    size_t total_parts = parts.size();
+    if (total_parts == 0)
         return std::make_unique<QueryPlan>();
 
-    if (use_sampling)
-    {
-        auto sampling_step = std::make_unique<FilterStep>(
-                plan->getCurrentDataStream(),
-                filter_expression,
-                filter_function->getColumnName(),
-                false);
+    Names real_column_names;
+    Names virt_column_names;
+    /// If query contains restrictions on the virtual column `_part` or `_part_index`, select only parts suitable for it.
+    /// The virtual column `_sample_factor` (which is equal to 1 / used sample rate) can be requested in the query.
+    bool sample_factor_column_queried = false;
 
-        sampling_step->setStepDescription("Sampling");
-        plan->addStep(std::move(sampling_step));
-    }
+    selectColumnNames(column_names_to_return, data, real_column_names, virt_column_names, sample_factor_column_queried);
 
-    if (result_projection)
-    {
-        auto projection_step = std::make_unique<ExpressionStep>(plan->getCurrentDataStream(), result_projection);
-        projection_step->setStepDescription("Remove unused columns after reading from storage");
-        plan->addStep(std::move(projection_step));
-    }
-
-    /// By the way, if a distributed query or query to a Merge table is made, then the `_sample_factor` column can have different values.
-    if (sample_factor_column_queried)
-    {
-        ColumnWithTypeAndName column;
-        column.name = "_sample_factor";
-        column.type = std::make_shared<DataTypeFloat64>();
-        column.column = column.type->createColumnConst(0, Field(used_sample_factor));
-
-        auto adding_column_action = ActionsDAG::makeAddingColumnActions(std::move(column));
-
-        auto adding_column = std::make_unique<ExpressionStep>(plan->getCurrentDataStream(), std::move(adding_column_action));
-        adding_column->setStepDescription("Add _sample_factor column");
-        plan->addStep(std::move(adding_column));
-    }
-
-    if (query_info.prewhere_info && query_info.prewhere_info->remove_columns_actions)
-    {
-        auto expression_step = std::make_unique<ExpressionStep>(
-                plan->getCurrentDataStream(),
-                query_info.prewhere_info->remove_columns_actions->getActionsDAG().clone());
-
-        expression_step->setStepDescription("Remove unused columns after PREWHERE");
-        plan->addStep(std::move(expression_step));
-    }
+    auto read_from_merge_tree = std::make_unique<ReadFromMergeTree>(
+        parts,
+        real_column_names,
+        virt_column_names,
+        data,
+        query_info,
+        metadata_snapshot,
+        metadata_snapshot_base,
+        context,
+        max_block_size,
+        num_streams,
+        sample_factor_column_queried,
+        max_block_numbers_to_read,
+        log
+    );
 
+    QueryPlanPtr plan = std::make_unique<QueryPlan>();
+    plan->addStep(std::move(read_from_merge_tree));
     return plan;
 }
 
-namespace
-{
 
 /// Marks are placed whenever threshold on rows or bytes is met.
 /// So we have to return the number of marks on whatever estimate is higher - by rows or by bytes.
-size_t roundRowsOrBytesToMarks(
+size_t MergeTreeDataSelectExecutor::roundRowsOrBytesToMarks(
     size_t rows_setting,
     size_t bytes_setting,
     size_t rows_granularity,
@@ -929,8 +1220,9 @@ size_t roundRowsOrBytesToMarks(
     else
         return std::max(res, (bytes_setting + bytes_granularity - 1) / bytes_granularity);
 }
+
 /// Same as roundRowsOrBytesToMarks() but do not return more then max_marks
-size_t minMarksForConcurrentRead(
+size_t MergeTreeDataSelectExecutor::minMarksForConcurrentRead(
     size_t rows_setting,
     size_t bytes_setting,
     size_t rows_granularity,
@@ -958,673 +1250,6 @@ size_t minMarksForConcurrentRead(
     }
 }
 
-}
-
-static QueryPlanPtr createPlanFromPipe(Pipe pipe, const String & query_id, const MergeTreeData & data, const std::string & description = "")
-{
-    auto plan = std::make_unique<QueryPlan>();
-
-    std::string storage_name = "MergeTree";
-    if (!description.empty())
-        storage_name += ' ' + description;
-
-    // Attach QueryIdHolder if needed
-    if (!query_id.empty())
-        pipe.addQueryIdHolder(std::make_shared<QueryIdHolder>(query_id, data));
-
-    auto step = std::make_unique<ReadFromStorageStep>(std::move(pipe), storage_name);
-    plan->addStep(std::move(step));
-    return plan;
-}
-
-QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreams(
-    RangesInDataParts && parts,
-    size_t num_streams,
-    const Names & column_names,
-    const StorageMetadataPtr & metadata_snapshot,
-    UInt64 max_block_size,
-    bool use_uncompressed_cache,
-    const SelectQueryInfo & query_info,
-    const Names & virt_columns,
-    const Settings & settings,
-    const MergeTreeReaderSettings & reader_settings,
-    const String & query_id) const
-{
-    /// Count marks for each part.
-    std::vector<size_t> sum_marks_in_parts(parts.size());
-    size_t sum_marks = 0;
-    size_t total_rows = 0;
-
-    const auto data_settings = data.getSettings();
-    size_t adaptive_parts = 0;
-    for (size_t i = 0; i < parts.size(); ++i)
-    {
-        total_rows += parts[i].getRowsCount();
-        sum_marks_in_parts[i] = parts[i].getMarksCount();
-        sum_marks += sum_marks_in_parts[i];
-
-        if (parts[i].data_part->index_granularity_info.is_adaptive)
-            ++adaptive_parts;
-    }
-
-    size_t index_granularity_bytes = 0;
-    if (adaptive_parts > parts.size() / 2)
-        index_granularity_bytes = data_settings->index_granularity_bytes;
-
-    const size_t max_marks_to_use_cache = roundRowsOrBytesToMarks(
-        settings.merge_tree_max_rows_to_use_cache,
-        settings.merge_tree_max_bytes_to_use_cache,
-        data_settings->index_granularity,
-        index_granularity_bytes);
-
-    const size_t min_marks_for_concurrent_read = minMarksForConcurrentRead(
-        settings.merge_tree_min_rows_for_concurrent_read,
-        settings.merge_tree_min_bytes_for_concurrent_read,
-        data_settings->index_granularity,
-        index_granularity_bytes,
-        sum_marks);
-
-    if (sum_marks > max_marks_to_use_cache)
-        use_uncompressed_cache = false;
-
-    if (0 == sum_marks)
-        return {};
-
-    if (num_streams > 1)
-    {
-        /// Parallel query execution.
-        Pipes res;
-
-        /// Reduce the number of num_streams if the data is small.
-        if (sum_marks < num_streams * min_marks_for_concurrent_read && parts.size() < num_streams)
-            num_streams = std::max((sum_marks + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, parts.size());
-
-        MergeTreeReadPoolPtr pool = std::make_shared<MergeTreeReadPool>(
-            num_streams,
-            sum_marks,
-            min_marks_for_concurrent_read,
-            std::move(parts),
-            data,
-            metadata_snapshot,
-            query_info.prewhere_info,
-            true,
-            column_names,
-            MergeTreeReadPool::BackoffSettings(settings),
-            settings.preferred_block_size_bytes,
-            false);
-
-        /// Let's estimate total number of rows for progress bar.
-        LOG_TRACE(log, "Reading approx. {} rows with {} streams", total_rows, num_streams);
-
-        for (size_t i = 0; i < num_streams; ++i)
-        {
-            auto source = std::make_shared<MergeTreeThreadSelectBlockInputProcessor>(
-                i, pool, min_marks_for_concurrent_read, max_block_size,
-                settings.preferred_block_size_bytes, settings.preferred_max_column_in_block_size_bytes,
-                data, metadata_snapshot, use_uncompressed_cache,
-                query_info.prewhere_info, reader_settings, virt_columns);
-
-            if (i == 0)
-            {
-                /// Set the approximate number of rows for the first source only
-                source->addTotalRowsApprox(total_rows);
-            }
-
-            res.emplace_back(std::move(source));
-        }
-
-        return createPlanFromPipe(Pipe::unitePipes(std::move(res)), query_id, data);
-    }
-    else
-    {
-        /// Sequential query execution.
-        Pipes res;
-
-        for (const auto & part : parts)
-        {
-            auto source = std::make_shared<MergeTreeSelectProcessor>(
-                data, metadata_snapshot, part.data_part, max_block_size, settings.preferred_block_size_bytes,
-                settings.preferred_max_column_in_block_size_bytes, column_names, part.ranges, use_uncompressed_cache,
-                query_info.prewhere_info, true, reader_settings, virt_columns, part.part_index_in_query);
-
-            res.emplace_back(std::move(source));
-        }
-
-        auto pipe = Pipe::unitePipes(std::move(res));
-
-        /// Use ConcatProcessor to concat sources together.
-        /// It is needed to read in parts order (and so in PK order) if single thread is used.
-        if (pipe.numOutputPorts() > 1)
-            pipe.addTransform(std::make_shared<ConcatProcessor>(pipe.getHeader(), pipe.numOutputPorts()));
-
-        return createPlanFromPipe(std::move(pipe), query_id, data);
-    }
-}
-
-static ActionsDAGPtr createProjection(const Block & header)
-{
-    auto projection = std::make_shared<ActionsDAG>(header.getNamesAndTypesList());
-    projection->removeUnusedActions(header.getNames());
-    projection->projectInput();
-    return projection;
-}
-
-QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
-    RangesInDataParts && parts,
-    size_t num_streams,
-    const Names & column_names,
-    const StorageMetadataPtr & metadata_snapshot,
-    UInt64 max_block_size,
-    bool use_uncompressed_cache,
-    const SelectQueryInfo & query_info,
-    const ActionsDAGPtr & sorting_key_prefix_expr,
-    const Names & virt_columns,
-    const Settings & settings,
-    const MergeTreeReaderSettings & reader_settings,
-    ActionsDAGPtr & out_projection,
-    const String & query_id) const
-{
-    size_t sum_marks = 0;
-    const InputOrderInfoPtr & input_order_info = query_info.input_order_info;
-
-    size_t adaptive_parts = 0;
-    std::vector<size_t> sum_marks_in_parts(parts.size());
-    const auto data_settings = data.getSettings();
-
-    for (size_t i = 0; i < parts.size(); ++i)
-    {
-        sum_marks_in_parts[i] = parts[i].getMarksCount();
-        sum_marks += sum_marks_in_parts[i];
-
-        if (parts[i].data_part->index_granularity_info.is_adaptive)
-            ++adaptive_parts;
-    }
-
-    size_t index_granularity_bytes = 0;
-    if (adaptive_parts > parts.size() / 2)
-        index_granularity_bytes = data_settings->index_granularity_bytes;
-
-    const size_t max_marks_to_use_cache = roundRowsOrBytesToMarks(
-        settings.merge_tree_max_rows_to_use_cache,
-        settings.merge_tree_max_bytes_to_use_cache,
-        data_settings->index_granularity,
-        index_granularity_bytes);
-
-    const size_t min_marks_for_concurrent_read = minMarksForConcurrentRead(
-        settings.merge_tree_min_rows_for_concurrent_read,
-        settings.merge_tree_min_bytes_for_concurrent_read,
-        data_settings->index_granularity,
-        index_granularity_bytes,
-        sum_marks);
-
-    if (sum_marks > max_marks_to_use_cache)
-        use_uncompressed_cache = false;
-
-    Pipes res;
-
-    if (sum_marks == 0)
-        return {};
-
-    /// Let's split ranges to avoid reading much data.
-    auto split_ranges = [rows_granularity = data_settings->index_granularity, max_block_size](const auto & ranges, int direction)
-    {
-        MarkRanges new_ranges;
-        const size_t max_marks_in_range = (max_block_size + rows_granularity - 1) / rows_granularity;
-        size_t marks_in_range = 1;
-
-        if (direction == 1)
-        {
-            /// Split first few ranges to avoid reading much data.
-            bool split = false;
-            for (auto range : ranges)
-            {
-                while (!split && range.begin + marks_in_range < range.end)
-                {
-                    new_ranges.emplace_back(range.begin, range.begin + marks_in_range);
-                    range.begin += marks_in_range;
-                    marks_in_range *= 2;
-
-                    if (marks_in_range > max_marks_in_range)
-                        split = true;
-                }
-                new_ranges.emplace_back(range.begin, range.end);
-            }
-        }
-        else
-        {
-            /// Split all ranges to avoid reading much data, because we have to
-            ///  store whole range in memory to reverse it.
-            for (auto it = ranges.rbegin(); it != ranges.rend(); ++it)
-            {
-                auto range = *it;
-                while (range.begin + marks_in_range < range.end)
-                {
-                    new_ranges.emplace_front(range.end - marks_in_range, range.end);
-                    range.end -= marks_in_range;
-                    marks_in_range = std::min(marks_in_range * 2, max_marks_in_range);
-                }
-                new_ranges.emplace_front(range.begin, range.end);
-            }
-        }
-
-        return new_ranges;
-    };
-
-    const size_t min_marks_per_stream = (sum_marks - 1) / num_streams + 1;
-    bool need_preliminary_merge = (parts.size() > settings.read_in_order_two_level_merge_threshold);
-
-    std::vector<QueryPlanPtr> plans;
-
-    for (size_t i = 0; i < num_streams && !parts.empty(); ++i)
-    {
-        size_t need_marks = min_marks_per_stream;
-
-        Pipes pipes;
-
-        /// Loop over parts.
-        /// We will iteratively take part or some subrange of a part from the back
-        ///  and assign a stream to read from it.
-        while (need_marks > 0 && !parts.empty())
-        {
-            RangesInDataPart part = parts.back();
-            parts.pop_back();
-
-            size_t & marks_in_part = sum_marks_in_parts.back();
-
-            /// We will not take too few rows from a part.
-            if (marks_in_part >= min_marks_for_concurrent_read &&
-                need_marks < min_marks_for_concurrent_read)
-                need_marks = min_marks_for_concurrent_read;
-
-            /// Do not leave too few rows in the part.
-            if (marks_in_part > need_marks &&
-                marks_in_part - need_marks < min_marks_for_concurrent_read)
-                need_marks = marks_in_part;
-
-            MarkRanges ranges_to_get_from_part;
-
-            /// We take the whole part if it is small enough.
-            if (marks_in_part <= need_marks)
-            {
-                ranges_to_get_from_part = part.ranges;
-
-                need_marks -= marks_in_part;
-                sum_marks_in_parts.pop_back();
-            }
-            else
-            {
-                /// Loop through ranges in part. Take enough ranges to cover "need_marks".
-                while (need_marks > 0)
-                {
-                    if (part.ranges.empty())
-                        throw Exception("Unexpected end of ranges while spreading marks among streams", ErrorCodes::LOGICAL_ERROR);
-
-                    MarkRange & range = part.ranges.front();
-
-                    const size_t marks_in_range = range.end - range.begin;
-                    const size_t marks_to_get_from_range = std::min(marks_in_range, need_marks);
-
-                    ranges_to_get_from_part.emplace_back(range.begin, range.begin + marks_to_get_from_range);
-                    range.begin += marks_to_get_from_range;
-                    marks_in_part -= marks_to_get_from_range;
-                    need_marks -= marks_to_get_from_range;
-                    if (range.begin == range.end)
-                        part.ranges.pop_front();
-                }
-                parts.emplace_back(part);
-            }
-            ranges_to_get_from_part = split_ranges(ranges_to_get_from_part, input_order_info->direction);
-
-            if (input_order_info->direction == 1)
-            {
-                pipes.emplace_back(std::make_shared<MergeTreeSelectProcessor>(
-                    data,
-                    metadata_snapshot,
-                    part.data_part,
-                    max_block_size,
-                    settings.preferred_block_size_bytes,
-                    settings.preferred_max_column_in_block_size_bytes,
-                    column_names,
-                    ranges_to_get_from_part,
-                    use_uncompressed_cache,
-                    query_info.prewhere_info,
-                    true,
-                    reader_settings,
-                    virt_columns,
-                    part.part_index_in_query));
-            }
-            else
-            {
-                pipes.emplace_back(std::make_shared<MergeTreeReverseSelectProcessor>(
-                    data,
-                    metadata_snapshot,
-                    part.data_part,
-                    max_block_size,
-                    settings.preferred_block_size_bytes,
-                    settings.preferred_max_column_in_block_size_bytes,
-                    column_names,
-                    ranges_to_get_from_part,
-                    use_uncompressed_cache,
-                    query_info.prewhere_info,
-                    true,
-                    reader_settings,
-                    virt_columns,
-                    part.part_index_in_query));
-            }
-        }
-
-        auto plan = createPlanFromPipe(Pipe::unitePipes(std::move(pipes)), query_id, data, "with order");
-
-        if (input_order_info->direction != 1)
-        {
-            auto reverse_step = std::make_unique<ReverseRowsStep>(plan->getCurrentDataStream());
-            plan->addStep(std::move(reverse_step));
-        }
-
-        plans.emplace_back(std::move(plan));
-    }
-
-    if (need_preliminary_merge)
-    {
-        SortDescription sort_description;
-        for (size_t j = 0; j < input_order_info->order_key_prefix_descr.size(); ++j)
-            sort_description.emplace_back(metadata_snapshot->getSortingKey().column_names[j],
-                                          input_order_info->direction, 1);
-
-        for (auto & plan : plans)
-        {
-            /// Drop temporary columns, added by 'sorting_key_prefix_expr'
-            out_projection = createProjection(plan->getCurrentDataStream().header);
-
-            auto expression_step = std::make_unique<ExpressionStep>(
-                    plan->getCurrentDataStream(),
-                    sorting_key_prefix_expr);
-
-            expression_step->setStepDescription("Calculate sorting key prefix");
-            plan->addStep(std::move(expression_step));
-
-            auto merging_sorted = std::make_unique<MergingSortedStep>(
-                    plan->getCurrentDataStream(),
-                    sort_description,
-                    max_block_size);
-
-            merging_sorted->setStepDescription("Merge sorting mark ranges");
-            plan->addStep(std::move(merging_sorted));
-        }
-    }
-
-    if (plans.size() == 1)
-        return std::move(plans.front());
-
-    DataStreams input_streams;
-    for (const auto & plan : plans)
-        input_streams.emplace_back(plan->getCurrentDataStream());
-
-    const auto & common_header = plans.front()->getCurrentDataStream().header;
-    auto union_step = std::make_unique<UnionStep>(std::move(input_streams), common_header);
-
-    auto plan = std::make_unique<QueryPlan>();
-    plan->unitePlans(std::move(union_step), std::move(plans));
-
-    return plan;
-}
-
-
-QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
-    RangesInDataParts && parts,
-    size_t num_streams,
-    const Names & column_names,
-    const StorageMetadataPtr & metadata_snapshot,
-    UInt64 max_block_size,
-    bool use_uncompressed_cache,
-    const SelectQueryInfo & query_info,
-    const Names & virt_columns,
-    const Settings & settings,
-    const MergeTreeReaderSettings & reader_settings,
-    ActionsDAGPtr & out_projection,
-    const String & query_id) const
-{
-    const auto data_settings = data.getSettings();
-    size_t sum_marks = 0;
-    size_t adaptive_parts = 0;
-    for (const auto & part : parts)
-    {
-        for (const auto & range : part.ranges)
-            sum_marks += range.end - range.begin;
-
-        if (part.data_part->index_granularity_info.is_adaptive)
-            ++adaptive_parts;
-    }
-
-    size_t index_granularity_bytes = 0;
-    if (adaptive_parts >= parts.size() / 2)
-        index_granularity_bytes = data_settings->index_granularity_bytes;
-
-    const size_t max_marks_to_use_cache = roundRowsOrBytesToMarks(
-        settings.merge_tree_max_rows_to_use_cache,
-        settings.merge_tree_max_bytes_to_use_cache,
-        data_settings->index_granularity,
-        index_granularity_bytes);
-
-    if (sum_marks > max_marks_to_use_cache)
-        use_uncompressed_cache = false;
-
-    if (num_streams > settings.max_final_threads)
-        num_streams = settings.max_final_threads;
-
-    /// If setting do_not_merge_across_partitions_select_final is true than we won't merge parts from different partitions.
-    /// We have all parts in parts vector, where parts with same partition are nerby.
-    /// So we will store iterators pointed to the beginning of each partition range (and parts.end()),
-    /// then we will create a pipe for each partition that will run selecting processor and merging processor
-    /// for the parts with this partition. In the end we will unite all the pipes.
-    std::vector<RangesInDataParts::iterator> parts_to_merge_ranges;
-    auto it = parts.begin();
-    parts_to_merge_ranges.push_back(it);
-
-    if (settings.do_not_merge_across_partitions_select_final)
-    {
-        while (it != parts.end())
-        {
-            it = std::find_if(
-                it, parts.end(), [&it](auto & part) { return it->data_part->info.partition_id != part.data_part->info.partition_id; });
-            parts_to_merge_ranges.push_back(it);
-        }
-        /// We divide threads for each partition equally. But we will create at least the number of partitions threads.
-        /// (So, the total number of threads could be more than initial num_streams.
-        num_streams /= (parts_to_merge_ranges.size() - 1);
-    }
-    else
-    {
-        /// If do_not_merge_across_partitions_select_final is false we just merge all the parts.
-        parts_to_merge_ranges.push_back(parts.end());
-    }
-
-    std::vector<QueryPlanPtr> partition_plans;
-
-    /// 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)
-    {
-        QueryPlanPtr plan;
-
-        {
-            Pipes pipes;
-
-            /// If do_not_merge_across_partitions_select_final is true and there is only one part in partition
-            /// with level > 0 then we won't postprocess this part and if num_streams > 1 we
-            /// can use parallel select on such parts. We save such parts in one vector and then use
-            /// MergeTreeReadPool and MergeTreeThreadSelectBlockInputProcessor for parallel select.
-            if (num_streams > 1 && settings.do_not_merge_across_partitions_select_final &&
-                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;
-            }
-            else
-            {
-                for (auto part_it = parts_to_merge_ranges[range_index]; part_it != parts_to_merge_ranges[range_index + 1]; ++part_it)
-                {
-                    auto source_processor = std::make_shared<MergeTreeSelectProcessor>(
-                        data,
-                        metadata_snapshot,
-                        part_it->data_part,
-                        max_block_size,
-                        settings.preferred_block_size_bytes,
-                        settings.preferred_max_column_in_block_size_bytes,
-                        column_names,
-                        part_it->ranges,
-                        use_uncompressed_cache,
-                        query_info.prewhere_info,
-                        true,
-                        reader_settings,
-                        virt_columns,
-                        part_it->part_index_in_query);
-
-                    pipes.emplace_back(std::move(source_processor));
-                }
-            }
-
-            if (pipes.empty())
-                continue;
-
-            auto pipe = Pipe::unitePipes(std::move(pipes));
-
-            /// Drop temporary columns, added by 'sorting_key_expr'
-            if (!out_projection)
-                out_projection = createProjection(pipe.getHeader());
-
-            plan = createPlanFromPipe(std::move(pipe), query_id, data, "with final");
-        }
-
-        auto expression_step = std::make_unique<ExpressionStep>(
-            plan->getCurrentDataStream(),
-            metadata_snapshot->getSortingKey().expression->getActionsDAG().clone());
-
-        expression_step->setStepDescription("Calculate sorting key expression");
-        plan->addStep(std::move(expression_step));
-
-        /// If do_not_merge_across_partitions_select_final is true and there is only one part in partition
-        /// with level > 0 then we won't postprocess this part
-        if (settings.do_not_merge_across_partitions_select_final &&
-            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)
-        {
-            partition_plans.emplace_back(std::move(plan));
-            continue;
-        }
-
-        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;
-
-        const auto & header = plan->getCurrentDataStream().header;
-        for (size_t i = 0; i < sort_columns_size; ++i)
-            sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1);
-
-        auto final_step = std::make_unique<MergingFinal>(
-            plan->getCurrentDataStream(),
-            std::min<size_t>(num_streams, settings.max_final_threads),
-            sort_description,
-            data.merging_params,
-            partition_key_columns,
-            max_block_size);
-
-        final_step->setStepDescription("Merge rows for FINAL");
-        plan->addStep(std::move(final_step));
-
-        partition_plans.emplace_back(std::move(plan));
-    }
-
-    if (!lonely_parts.empty())
-    {
-        Pipes pipes;
-
-        size_t num_streams_for_lonely_parts = num_streams * lonely_parts.size();
-
-        const size_t min_marks_for_concurrent_read = minMarksForConcurrentRead(
-            settings.merge_tree_min_rows_for_concurrent_read,
-            settings.merge_tree_min_bytes_for_concurrent_read,
-            data_settings->index_granularity,
-            index_granularity_bytes,
-            sum_marks_in_lonely_parts);
-
-        /// Reduce the number of num_streams_for_lonely_parts if the data is small.
-        if (sum_marks_in_lonely_parts < num_streams_for_lonely_parts * min_marks_for_concurrent_read && lonely_parts.size() < num_streams_for_lonely_parts)
-            num_streams_for_lonely_parts = std::max((sum_marks_in_lonely_parts + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, lonely_parts.size());
-
-
-        MergeTreeReadPoolPtr pool = std::make_shared<MergeTreeReadPool>(
-            num_streams_for_lonely_parts,
-            sum_marks_in_lonely_parts,
-            min_marks_for_concurrent_read,
-            std::move(lonely_parts),
-            data,
-            metadata_snapshot,
-            query_info.prewhere_info,
-            true,
-            column_names,
-            MergeTreeReadPool::BackoffSettings(settings),
-            settings.preferred_block_size_bytes,
-            false);
-
-        LOG_TRACE(log, "Reading approx. {} rows with {} streams", total_rows_in_lonely_parts, num_streams_for_lonely_parts);
-
-        for (size_t i = 0; i < num_streams_for_lonely_parts; ++i)
-        {
-            auto source = std::make_shared<MergeTreeThreadSelectBlockInputProcessor>(
-                i, pool, min_marks_for_concurrent_read, max_block_size,
-                settings.preferred_block_size_bytes, settings.preferred_max_column_in_block_size_bytes,
-                data, metadata_snapshot, use_uncompressed_cache,
-                query_info.prewhere_info, reader_settings, virt_columns);
-
-            pipes.emplace_back(std::move(source));
-        }
-
-        auto pipe = Pipe::unitePipes(std::move(pipes));
-
-        /// Drop temporary columns, added by 'sorting_key_expr'
-        if (!out_projection)
-            out_projection = createProjection(pipe.getHeader());
-
-        QueryPlanPtr plan = createPlanFromPipe(std::move(pipe), query_id, data, "with final");
-
-        auto expression_step = std::make_unique<ExpressionStep>(
-            plan->getCurrentDataStream(),
-            metadata_snapshot->getSortingKey().expression->getActionsDAG().clone());
-
-        expression_step->setStepDescription("Calculate sorting key expression");
-        plan->addStep(std::move(expression_step));
-
-        partition_plans.emplace_back(std::move(plan));
-    }
-
-    if (partition_plans.empty())
-        return {};
-
-    if (partition_plans.size() == 1)
-        return std::move(partition_plans.front());
-
-    auto result_header = partition_plans.front()->getCurrentDataStream().header;
-    DataStreams input_streams;
-    for (const auto & partition_plan : partition_plans)
-        input_streams.push_back(partition_plan->getCurrentDataStream());
-
-    auto union_step = std::make_unique<UnionStep>(std::move(input_streams), result_header);
-    union_step->setStepDescription("Unite sources after FINAL");
-    QueryPlanPtr plan = std::make_unique<QueryPlan>();
-    plan->unitePlans(std::move(union_step), std::move(partition_plans));
-    return plan;
-}
 
 /// Calculates a set of mark ranges, that could possibly contain keys, required by condition.
 /// In other words, it removes subranges from whole range, that definitely could not contain required keys.
@@ -1893,33 +1518,24 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
 
 void MergeTreeDataSelectExecutor::selectPartsToRead(
     MergeTreeData::DataPartsVector & parts,
-    const std::unordered_set<String> & part_values,
+    const std::optional<std::unordered_set<String>> & part_values,
     const std::optional<KeyCondition> & minmax_idx_condition,
     const DataTypes & minmax_columns_types,
     std::optional<PartitionPruner> & partition_pruner,
-    const PartitionIdToMaxBlock * max_block_numbers_to_read)
+    const PartitionIdToMaxBlock * max_block_numbers_to_read,
+    PartFilterCounters & counters)
 {
-    auto prev_parts = parts;
-    parts.clear();
-
-    for (const auto & part : prev_parts)
+    MergeTreeData::DataPartsVector prev_parts;
+    std::swap(prev_parts, parts);
+    for (const auto & part_or_projection : prev_parts)
     {
-        if (!part_values.empty() && part_values.find(part->name) == part_values.end())
+        const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
+        if (part_values && part_values->find(part->name) == part_values->end())
             continue;
 
         if (part->isEmpty())
             continue;
 
-        if (minmax_idx_condition && !minmax_idx_condition->checkInHyperrectangle(
-                part->minmax_idx.hyperrectangle, minmax_columns_types).can_be_true)
-            continue;
-
-        if (partition_pruner)
-        {
-            if (partition_pruner->canBePruned(part))
-                continue;
-        }
-
         if (max_block_numbers_to_read)
         {
             auto blocks_iterator = max_block_numbers_to_read->find(part->info.partition_id);
@@ -1927,51 +1543,65 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
                 continue;
         }
 
-        parts.push_back(part);
+        size_t num_granules = part->getMarksCount();
+        if (num_granules && part->index_granularity.hasFinalMark())
+            --num_granules;
+
+        counters.num_initial_selected_parts += 1;
+        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)
+            continue;
+
+        counters.num_parts_after_minmax += 1;
+        counters.num_granules_after_minmax += num_granules;
+
+        if (partition_pruner)
+        {
+            if (partition_pruner->canBePruned(*part))
+                continue;
+        }
+
+        counters.num_parts_after_partition_pruner += 1;
+        counters.num_granules_after_partition_pruner += num_granules;
+
+        parts.push_back(part_or_projection);
     }
 }
 
 void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     MergeTreeData::DataPartsVector & parts,
-    const std::unordered_set<String> & part_values,
+    const std::optional<std::unordered_set<String>> & part_values,
+    MergeTreeData::PinnedPartUUIDsPtr pinned_part_uuids,
     const std::optional<KeyCondition> & minmax_idx_condition,
     const DataTypes & minmax_columns_types,
     std::optional<PartitionPruner> & partition_pruner,
     const PartitionIdToMaxBlock * max_block_numbers_to_read,
-    const Context & query_context) const
+    ContextPtr query_context,
+    PartFilterCounters & counters,
+    Poco::Logger * log)
 {
-    /// const_cast to add UUIDs to context. Bad practice.
-    Context & non_const_context = const_cast<Context &>(query_context);
+    const Settings & settings = query_context->getSettings();
 
     /// process_parts prepare parts that have to be read for the query,
     /// returns false if duplicated parts' UUID have been met
     auto select_parts = [&] (MergeTreeData::DataPartsVector & selected_parts) -> bool
     {
-        auto ignored_part_uuids = non_const_context.getIgnoredPartUUIDs();
+        auto ignored_part_uuids = query_context->getIgnoredPartUUIDs();
         std::unordered_set<UUID> temp_part_uuids;
 
-        auto prev_parts = selected_parts;
-        selected_parts.clear();
-
-        for (const auto & part : prev_parts)
+        MergeTreeData::DataPartsVector prev_parts;
+        std::swap(prev_parts, selected_parts);
+        for (const auto & part_or_projection : prev_parts)
         {
-            if (!part_values.empty() && part_values.find(part->name) == part_values.end())
+            const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
+            if (part_values && part_values->find(part->name) == part_values->end())
                 continue;
 
             if (part->isEmpty())
                 continue;
 
-            if (minmax_idx_condition
-                && !minmax_idx_condition->checkInHyperrectangle(part->minmax_idx.hyperrectangle, minmax_columns_types)
-                        .can_be_true)
-                continue;
-
-            if (partition_pruner)
-            {
-                if (partition_pruner->canBePruned(part))
-                    continue;
-            }
-
             if (max_block_numbers_to_read)
             {
                 auto blocks_iterator = max_block_numbers_to_read->find(part->info.partition_id);
@@ -1979,29 +1609,56 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
                     continue;
             }
 
+            /// Skip the part if its uuid is meant to be excluded
+            if (part->uuid != UUIDHelpers::Nil && ignored_part_uuids->has(part->uuid))
+                continue;
+
+            size_t num_granules = part->getMarksCount();
+            if (num_granules && part->index_granularity.hasFinalMark())
+                --num_granules;
+
+            counters.num_initial_selected_parts += 1;
+            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)
+                continue;
+
+            counters.num_parts_after_minmax += 1;
+            counters.num_granules_after_minmax += num_granules;
+
+            if (partition_pruner)
+            {
+                if (partition_pruner->canBePruned(*part))
+                    continue;
+            }
+
+            counters.num_parts_after_partition_pruner += 1;
+            counters.num_granules_after_partition_pruner += num_granules;
+
             /// populate UUIDs and exclude ignored parts if enabled
             if (part->uuid != UUIDHelpers::Nil)
             {
-                /// Skip the part if its uuid is meant to be excluded
-                if (ignored_part_uuids->has(part->uuid))
-                    continue;
-
-                auto result = temp_part_uuids.insert(part->uuid);
-                if (!result.second)
-                    throw Exception("Found a part with the same UUID on the same replica.", ErrorCodes::LOGICAL_ERROR);
+                if (settings.experimental_query_deduplication_send_all_part_uuids || pinned_part_uuids->contains(part->uuid))
+                {
+                    auto result = temp_part_uuids.insert(part->uuid);
+                    if (!result.second)
+                        throw Exception("Found a part with the same UUID on the same replica.", ErrorCodes::LOGICAL_ERROR);
+                }
             }
 
-            selected_parts.push_back(part);
+            selected_parts.push_back(part_or_projection);
         }
 
         if (!temp_part_uuids.empty())
         {
-            auto duplicates = non_const_context.getPartUUIDs()->add(std::vector<UUID>{temp_part_uuids.begin(), temp_part_uuids.end()});
+            auto duplicates = query_context->getPartUUIDs()->add(std::vector<UUID>{temp_part_uuids.begin(), temp_part_uuids.end()});
             if (!duplicates.empty())
             {
                 /// on a local replica with prefer_localhost_replica=1 if any duplicates appeared during the first pass,
                 /// adding them to the exclusion, so they will be skipped on second pass
-                non_const_context.getIgnoredPartUUIDs()->add(duplicates);
+                query_context->getIgnoredPartUUIDs()->add(duplicates);
                 return false;
             }
         }
@@ -2012,11 +1669,14 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     /// Process parts that have to be read for a query.
     auto needs_retry = !select_parts(parts);
 
-    /// If any duplicated part UUIDs met during the first step, try to ignore them in second pass
+    /// If any duplicated part UUIDs met during the first step, try to ignore them in second pass.
+    /// This may happen when `prefer_localhost_replica` is set and "distributed" stage runs in the same process with "remote" stage.
     if (needs_retry)
     {
         LOG_DEBUG(log, "Found duplicate uuids locally, will retry part selection without them");
 
+        counters = PartFilterCounters();
+
         /// Second attempt didn't help, throw an exception
         if (!select_parts(parts))
             throw Exception("Found duplicate UUIDs while processing query.", ErrorCodes::DUPLICATED_PART_UUIDS);
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index 0702605a539..bd2a79f0aee 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -5,6 +5,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/PartitionPruner.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
 
 
 namespace DB
@@ -12,6 +13,16 @@ 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.
   */
@@ -23,87 +34,53 @@ public:
     /** When reading, selects a set of parts that covers the desired range of the index.
       * max_blocks_number_to_read - if not nullptr, do not read all the parts whose right border is greater than max_block in partition.
       */
-    using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
 
     QueryPlanPtr read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         UInt64 max_block_size,
         unsigned num_streams,
-        const PartitionIdToMaxBlock * max_block_numbers_to_read = nullptr) const;
+        QueryProcessingStage::Enum processed_stage,
+        std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr) const;
 
+    /// The same as read, but with specified set of parts.
     QueryPlanPtr readFromParts(
         MergeTreeData::DataPartsVector parts,
         const Names & column_names,
+        const StorageMetadataPtr & metadata_snapshot_base,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         UInt64 max_block_size,
         unsigned num_streams,
-        const PartitionIdToMaxBlock * max_block_numbers_to_read = nullptr) const;
+        std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr) const;
 
-    /// Construct a sample block consisting only of possible virtual columns for part pruning.
-    static Block getSampleBlockWithVirtualPartColumns();
-
-    /// Fill in values of possible virtual columns for part pruning.
-    static void fillBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, Block & block);
+    /// 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(
+        MergeTreeData::DataPartsVector parts,
+        const Names & column_names,
+        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 = nullptr) const;
 
 private:
     const MergeTreeData & data;
-
     Poco::Logger * log;
 
-    QueryPlanPtr spreadMarkRangesAmongStreams(
-        RangesInDataParts && parts,
-        size_t num_streams,
-        const Names & column_names,
-        const StorageMetadataPtr & metadata_snapshot,
-        UInt64 max_block_size,
-        bool use_uncompressed_cache,
-        const SelectQueryInfo & query_info,
-        const Names & virt_columns,
-        const Settings & settings,
-        const MergeTreeReaderSettings & reader_settings,
-        const String & query_id) const;
-
-    /// out_projection - save projection only with columns, requested to read
-    QueryPlanPtr spreadMarkRangesAmongStreamsWithOrder(
-        RangesInDataParts && parts,
-        size_t num_streams,
-        const Names & column_names,
-        const StorageMetadataPtr & metadata_snapshot,
-        UInt64 max_block_size,
-        bool use_uncompressed_cache,
-        const SelectQueryInfo & query_info,
-        const ActionsDAGPtr & sorting_key_prefix_expr,
-        const Names & virt_columns,
-        const Settings & settings,
-        const MergeTreeReaderSettings & reader_settings,
-        ActionsDAGPtr & out_projection,
-        const String & query_id) const;
-
-    QueryPlanPtr spreadMarkRangesAmongStreamsFinal(
-        RangesInDataParts && parts,
-        size_t num_streams,
-        const Names & column_names,
-        const StorageMetadataPtr & metadata_snapshot,
-        UInt64 max_block_size,
-        bool use_uncompressed_cache,
-        const SelectQueryInfo & query_info,
-        const Names & virt_columns,
-        const Settings & settings,
-        const MergeTreeReaderSettings & reader_settings,
-        ActionsDAGPtr & out_projection,
-        const String & query_id) const;
-
     /// Get the approximate value (bottom estimate - only by full marks) of the number of rows falling under the index.
-    size_t getApproximateTotalRowsToRead(
+    static size_t getApproximateTotalRowsToRead(
         const MergeTreeData::DataPartsVector & parts,
         const StorageMetadataPtr & metadata_snapshot,
         const KeyCondition & key_condition,
-        const Settings & settings) const;
+        const Settings & settings,
+        Poco::Logger * log);
 
     static MarkRanges markRangesFromPKRange(
         const MergeTreeData::DataPartPtr & part,
@@ -123,25 +100,112 @@ private:
         size_t & granules_dropped,
         Poco::Logger * log);
 
+    struct PartFilterCounters
+    {
+        size_t num_initial_selected_parts = 0;
+        size_t num_initial_selected_granules = 0;
+        size_t num_parts_after_minmax = 0;
+        size_t num_granules_after_minmax = 0;
+        size_t num_parts_after_partition_pruner = 0;
+        size_t num_granules_after_partition_pruner = 0;
+    };
+
     /// Select the parts in which there can be data that satisfy `minmax_idx_condition` and that match the condition on `_part`,
     ///  as well as `max_block_number_to_read`.
     static void selectPartsToRead(
         MergeTreeData::DataPartsVector & parts,
-        const std::unordered_set<String> & part_values,
-        const std::optional<KeyCondition> & minmax_idx_condition,
-        const DataTypes & minmax_columns_types,
-        std::optional<PartitionPruner> & partition_pruner,
-        const PartitionIdToMaxBlock * max_block_numbers_to_read);
-
-    /// Same as previous but also skip parts uuids if any to the query context, or skip parts which uuids marked as excluded.
-    void selectPartsToReadWithUUIDFilter(
-        MergeTreeData::DataPartsVector & parts,
-        const std::unordered_set<String> & part_values,
+        const std::optional<std::unordered_set<String>> & part_values,
         const std::optional<KeyCondition> & minmax_idx_condition,
         const DataTypes & minmax_columns_types,
         std::optional<PartitionPruner> & partition_pruner,
         const PartitionIdToMaxBlock * max_block_numbers_to_read,
-        const Context & query_context) const;
+        PartFilterCounters & counters);
+
+    /// Same as previous but also skip parts uuids if any to the query context, or skip parts which uuids marked as excluded.
+    static void selectPartsToReadWithUUIDFilter(
+        MergeTreeData::DataPartsVector & parts,
+        const std::optional<std::unordered_set<String>> & part_values,
+        MergeTreeData::PinnedPartUUIDsPtr pinned_part_uuids,
+        const std::optional<KeyCondition> & minmax_idx_condition,
+        const DataTypes & minmax_columns_types,
+        std::optional<PartitionPruner> & partition_pruner,
+        const PartitionIdToMaxBlock * max_block_numbers_to_read,
+        ContextPtr query_context,
+        PartFilterCounters & counters,
+        Poco::Logger * log);
+
+public:
+    /// For given number rows and bytes, get the number of marks to read.
+    /// It is a minimal number of marks which contain so many rows and bytes.
+    static size_t roundRowsOrBytesToMarks(
+        size_t rows_setting,
+        size_t bytes_setting,
+        size_t rows_granularity,
+        size_t bytes_granularity);
+
+    /// The same as roundRowsOrBytesToMarks, but return no more than max_marks.
+    static size_t minMarksForConcurrentRead(
+        size_t rows_setting,
+        size_t bytes_setting,
+        size_t rows_granularity,
+        size_t bytes_granularity,
+        size_t max_marks);
+
+    /// If possible, filter using expression on virtual columns.
+    /// Example: SELECT count() FROM table WHERE _part = 'part_name'
+    /// If expression found, return a set with allowed part names (std::nullopt otherwise).
+    static std::optional<std::unordered_set<String>> filterPartsByVirtualColumns(
+        const MergeTreeData & data,
+        const MergeTreeData::DataPartsVector & parts,
+        const ASTPtr & query,
+        ContextPtr context);
+
+    /// Filter parts using minmax index and partition key.
+    static void filterPartsByPartition(
+        MergeTreeData::DataPartsVector & parts,
+        const std::optional<std::unordered_set<String>> & part_values,
+        const StorageMetadataPtr & metadata_snapshot,
+        const MergeTreeData & data,
+        const SelectQueryInfo & query_info,
+        const ContextPtr & context,
+        const PartitionIdToMaxBlock * max_block_numbers_to_read,
+        Poco::Logger * log,
+        ReadFromMergeTree::IndexStats & index_stats);
+
+    /// Filter parts using primary key and secondary indexes.
+    /// For every part, select mark ranges to read.
+    static RangesInDataParts filterPartsByPrimaryKeyAndSkipIndexes(
+        MergeTreeData::DataPartsVector && parts,
+        StorageMetadataPtr metadata_snapshot,
+        const SelectQueryInfo & query_info,
+        const ContextPtr & context,
+        const KeyCondition & key_condition,
+        const MergeTreeReaderSettings & reader_settings,
+        Poco::Logger * log,
+        size_t num_streams,
+        ReadFromMergeTree::IndexStats & index_stats,
+        bool use_skip_indexes);
+
+    /// Create expression for sampling.
+    /// Also, calculate _sample_factor if needed.
+    /// Also, update key condition with selected sampling range.
+    static MergeTreeDataSelectSamplingData getSampling(
+        const ASTSelectQuery & select,
+        NamesAndTypesList available_real_columns,
+        const MergeTreeData::DataPartsVector & parts,
+        KeyCondition & key_condition,
+        const MergeTreeData & data,
+        const StorageMetadataPtr & metadata_snapshot,
+        ContextPtr context,
+        bool sample_factor_column_queried,
+        Poco::Logger * log);
+
+    /// Check query limits: max_partitions_to_read, max_concurrent_queries.
+    /// 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 ContextPtr & context);
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 3b4cb385a34..0b05650b42c 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -6,13 +6,15 @@
 #include <Disks/createVolume.h>
 #include <Interpreters/AggregationCommon.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSelectQuery.h>
 #include <IO/HashingWriteBuffer.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDate.h>
 #include <IO/WriteHelpers.h>
-#include <Poco/File.h>
 #include <Common/typeid_cast.h>
 #include <DataStreams/ITTLAlgorithm.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/SquashingBlockInputStream.h>
 
 #include <Parsers/queryToString.h>
 
@@ -23,6 +25,7 @@
 #include <Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h>
 #include <Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h>
 #include <Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 
 namespace ProfileEvents
 {
@@ -31,6 +34,11 @@ namespace ProfileEvents
     extern const Event MergeTreeDataWriterRows;
     extern const Event MergeTreeDataWriterUncompressedBytes;
     extern const Event MergeTreeDataWriterCompressedBytes;
+    extern const Event MergeTreeDataProjectionWriterBlocks;
+    extern const Event MergeTreeDataProjectionWriterBlocksAlreadySorted;
+    extern const Event MergeTreeDataProjectionWriterRows;
+    extern const Event MergeTreeDataProjectionWriterUncompressedBytes;
+    extern const Event MergeTreeDataProjectionWriterCompressedBytes;
 }
 
 namespace DB
@@ -131,7 +139,8 @@ void updateTTL(
 
 }
 
-BlocksWithPartition MergeTreeDataWriter::splitBlockIntoParts(const Block & block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot)
+BlocksWithPartition MergeTreeDataWriter::splitBlockIntoParts(
+        const Block & block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     BlocksWithPartition result;
     if (!block || !block.rows())
@@ -141,17 +150,17 @@ BlocksWithPartition MergeTreeDataWriter::splitBlockIntoParts(const Block & block
 
     if (!metadata_snapshot->hasPartitionKey()) /// Table is not partitioned.
     {
-        result.emplace_back(Block(block), Row());
+        result.emplace_back(Block(block), Row{});
         return result;
     }
 
     Block block_copy = block;
-    const auto & partition_key = metadata_snapshot->getPartitionKey();
-    partition_key.expression->execute(block_copy);
+    /// After expression execution partition key columns will be added to block_copy with names regarding partition function.
+    auto partition_key_names_and_types = MergeTreePartition::executePartitionByExpression(metadata_snapshot, block_copy, context);
 
     ColumnRawPtrs partition_columns;
-    partition_columns.reserve(partition_key.sample_block.columns());
-    for (const ColumnWithTypeAndName & element : partition_key.sample_block)
+    partition_columns.reserve(partition_key_names_and_types.size());
+    for (const auto & element : partition_key_names_and_types)
         partition_columns.emplace_back(block_copy.getByName(element.name).column.get());
 
     PODArray<size_t> partition_num_to_first_row;
@@ -258,7 +267,8 @@ Block MergeTreeDataWriter::mergeBlock(const Block & block, SortDescription sort_
     return block.cloneWithColumns(status.chunk.getColumns());
 }
 
-MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPartition & block_with_partition, const StorageMetadataPtr & metadata_snapshot, bool optimize_on_insert)
+MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
+    BlockWithPartition & block_with_partition, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     Block & block = block_with_partition.block;
 
@@ -321,7 +331,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
     }
 
     Names partition_key_columns = metadata_snapshot->getPartitionKey().column_names;
-    if (optimize_on_insert)
+    if (context->getSettingsRef().optimize_on_insert)
         block = mergeBlock(block, sort_description, partition_key_columns, perm_ptr);
 
     /// Size of part would not be greater than block.bytes() + epsilon
@@ -376,6 +386,31 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
             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);
 
@@ -396,7 +431,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
 
     /// This effectively chooses minimal compression method:
     ///  either default lz4 or compression method with zero thresholds on absolute and relative part size.
-    auto compression_codec = data.global_context.chooseCompressionCodec(0, 0);
+    auto compression_codec = data.getContext()->chooseCompressionCodec(0, 0);
 
     const auto & index_factory = MergeTreeIndexFactory::instance();
     MergedBlockOutputStream out(new_data_part, metadata_snapshot, columns, index_factory.getMany(metadata_snapshot->getSecondaryIndices()), compression_codec);
@@ -413,4 +448,128 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithPa
     return new_data_part;
 }
 
+MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeProjectionPartImpl(
+    MergeTreeData & data,
+    Poco::Logger * log,
+    Block block,
+    const StorageMetadataPtr & metadata_snapshot,
+    MergeTreeData::MutableDataPartPtr && new_data_part)
+{
+    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())
+    {
+        /// The name could be non-unique in case of stale files from previous runs.
+        String full_path = new_data_part->getFullRelativePath();
+
+        if (new_data_part->volume->getDisk()->exists(full_path))
+        {
+            LOG_WARNING(log, "Removing old temporary directory {}", fullPath(new_data_part->volume->getDisk(), full_path));
+            new_data_part->volume->getDisk()->removeRecursive(full_path);
+        }
+
+        new_data_part->volume->getDisk()->createDirectories(full_path);
+    }
+
+    /// If we need to calculate some columns to sort.
+    if (metadata_snapshot->hasSortingKey() || metadata_snapshot->hasSecondaryIndices())
+        data.getSortingKeyAndSkipIndicesExpression(metadata_snapshot)->execute(block);
+
+    Names sort_columns = metadata_snapshot->getSortingKeyColumns();
+    SortDescription sort_description;
+    size_t sort_columns_size = sort_columns.size();
+    sort_description.reserve(sort_columns_size);
+
+    for (size_t i = 0; i < sort_columns_size; ++i)
+        sort_description.emplace_back(block.getPositionByName(sort_columns[i]), 1, 1);
+
+    ProfileEvents::increment(ProfileEvents::MergeTreeDataProjectionWriterBlocks);
+
+    /// Sort
+    IColumn::Permutation * perm_ptr = nullptr;
+    IColumn::Permutation perm;
+    if (!sort_description.empty())
+    {
+        if (!isAlreadySorted(block, sort_description))
+        {
+            stableGetPermutation(block, sort_description, perm);
+            perm_ptr = &perm;
+        }
+        else
+            ProfileEvents::increment(ProfileEvents::MergeTreeDataProjectionWriterBlocksAlreadySorted);
+    }
+
+    /// This effectively chooses minimal compression method:
+    ///  either default lz4 or compression method with zero thresholds on absolute and relative part size.
+    auto compression_codec = data.getContext()->chooseCompressionCodec(0, 0);
+
+    MergedBlockOutputStream out(
+        new_data_part,
+        metadata_snapshot,
+        columns,
+        {},
+        compression_codec);
+
+    out.writePrefix();
+    out.writeWithPermutation(block, perm_ptr);
+    out.writeSuffixAndFinalizePart(new_data_part);
+
+    ProfileEvents::increment(ProfileEvents::MergeTreeDataProjectionWriterRows, block.rows());
+    ProfileEvents::increment(ProfileEvents::MergeTreeDataProjectionWriterUncompressedBytes, block.bytes());
+    ProfileEvents::increment(ProfileEvents::MergeTreeDataProjectionWriterCompressedBytes, new_data_part->getBytesOnDisk());
+
+    return std::move(new_data_part);
+}
+
+MergeTreeData::MutableDataPartPtr
+MergeTreeDataWriter::writeProjectionPart(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
+
+    return writeProjectionPartImpl(data, log, block, projection.metadata, std::move(new_data_part));
+}
+
+MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempProjectionPart(
+    MergeTreeData & data,
+    Poco::Logger * log,
+    Block block,
+    const ProjectionDescription & projection,
+    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(
+        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
+
+    return writeProjectionPartImpl(data, log, block, projection.metadata, std::move(new_data_part));
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.h b/src/Storages/MergeTree/MergeTreeDataWriter.h
index 685d1adf947..feb2f1e2b12 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.h
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <Core/Row.h>
 
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
@@ -40,16 +39,37 @@ public:
       *  (split rows by partition)
       * Works deterministically: if same block was passed, function will return same result in same order.
       */
-    static BlocksWithPartition splitBlockIntoParts(const Block & block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot);
+    static BlocksWithPartition splitBlockIntoParts(const Block & block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot, ContextPtr context);
 
     /** All rows must correspond to same partition.
       * Returns part with unique name starting with 'tmp_', yet not added to MergeTreeData.
       */
     MergeTreeData::MutableDataPartPtr writeTempPart(BlockWithPartition & block, const StorageMetadataPtr & metadata_snapshot, bool optimize_on_insert);
 
+    MergeTreeData::MutableDataPartPtr
+    writeTempPart(BlockWithPartition & block, const StorageMetadataPtr & metadata_snapshot, ContextPtr context);
+
+    MergeTreeData::MutableDataPartPtr writeProjectionPart(
+        Block block, const ProjectionDescription & projection, const IMergeTreeDataPart * parent_part);
+
+    static MergeTreeData::MutableDataPartPtr writeTempProjectionPart(
+        MergeTreeData & data,
+        Poco::Logger * log,
+        Block block,
+        const ProjectionDescription & projection,
+        const IMergeTreeDataPart * parent_part,
+        size_t block_num);
+
     Block mergeBlock(const Block & block, SortDescription sort_description, Names & partition_key_columns, IColumn::Permutation *& permutation);
 
 private:
+    static MergeTreeData::MutableDataPartPtr writeProjectionPartImpl(
+        MergeTreeData & data,
+        Poco::Logger * log,
+        Block block,
+        const StorageMetadataPtr & metadata_snapshot,
+        MergeTreeData::MutableDataPartPtr && new_data_part);
+
     MergeTreeData & data;
 
     Poco::Logger * log;
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
new file mode 100644
index 00000000000..33960e2e1ff
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
@@ -0,0 +1,311 @@
+#include <Storages/MergeTree/MergeTreeDeduplicationLog.h>
+#include <filesystem>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/trim.hpp>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+
+namespace DB
+{
+
+namespace
+{
+
+/// Deduplication operation part was dropped or added
+enum class MergeTreeDeduplicationOp : uint8_t
+{
+    ADD = 1,
+    DROP = 2,
+};
+
+/// Record for deduplication on disk
+struct MergeTreeDeduplicationLogRecord
+{
+    MergeTreeDeduplicationOp operation;
+    std::string part_name;
+    std::string block_id;
+};
+
+void writeRecord(const MergeTreeDeduplicationLogRecord & record, WriteBuffer & out)
+{
+    writeIntText(static_cast<uint8_t>(record.operation), out);
+    writeChar('\t', out);
+    writeString(record.part_name, out);
+    writeChar('\t', out);
+    writeString(record.block_id, out);
+    writeChar('\n', out);
+    out.next();
+}
+
+void readRecord(MergeTreeDeduplicationLogRecord & record, ReadBuffer & in)
+{
+    uint8_t op;
+    readIntText(op, in);
+    record.operation = static_cast<MergeTreeDeduplicationOp>(op);
+    assertChar('\t', in);
+    readString(record.part_name, in);
+    assertChar('\t', in);
+    readString(record.block_id, in);
+    assertChar('\n', in);
+}
+
+
+std::string getLogPath(const std::string & prefix, size_t number)
+{
+    std::filesystem::path path(prefix);
+    path /= std::filesystem::path(std::string{"deduplication_log_"} + std::to_string(number) + ".txt");
+    return path;
+}
+
+size_t getLogNumber(const std::string & path_str)
+{
+    std::filesystem::path path(path_str);
+    std::string filename = path.stem();
+    Strings filename_parts;
+    boost::split(filename_parts, filename, boost::is_any_of("_"));
+
+    return parse<size_t>(filename_parts[2]);
+}
+
+}
+
+MergeTreeDeduplicationLog::MergeTreeDeduplicationLog(
+    const std::string & logs_dir_,
+    size_t deduplication_window_,
+    const MergeTreeDataFormatVersion & format_version_)
+    : logs_dir(logs_dir_)
+    , deduplication_window(deduplication_window_)
+    , rotate_interval(deduplication_window_ * 2) /// actually it doesn't matter
+    , format_version(format_version_)
+    , deduplication_map(deduplication_window)
+{
+    namespace fs = std::filesystem;
+    if (deduplication_window != 0 && !fs::exists(logs_dir))
+        fs::create_directories(logs_dir);
+}
+
+void MergeTreeDeduplicationLog::load()
+{
+    namespace fs = std::filesystem;
+    if (!fs::exists(logs_dir))
+        return;
+
+    for (const auto & p : fs::directory_iterator(logs_dir))
+    {
+        const auto & path = p.path();
+        auto log_number = getLogNumber(path);
+        existing_logs[log_number] = {path, 0};
+    }
+
+    /// We should know which logs are exist even in case
+    /// of deduplication_window = 0
+    if (!existing_logs.empty())
+        current_log_number = existing_logs.rbegin()->first;
+
+    if (deduplication_window != 0)
+    {
+        /// Order important, we load history from the begging to the end
+        for (auto & [log_number, desc] : existing_logs)
+        {
+            try
+            {
+                desc.entries_count = loadSingleLog(desc.path);
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__, "Error while loading MergeTree deduplication log on path " + desc.path);
+            }
+        }
+
+        /// Start new log, drop previous
+        rotateAndDropIfNeeded();
+
+        /// Can happen in case we have unfinished log
+        if (!current_writer)
+            current_writer = std::make_unique<WriteBufferFromFile>(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    }
+}
+
+size_t MergeTreeDeduplicationLog::loadSingleLog(const std::string & path)
+{
+    ReadBufferFromFile read_buf(path);
+
+    size_t total_entries = 0;
+    while (!read_buf.eof())
+    {
+        MergeTreeDeduplicationLogRecord record;
+        readRecord(record, read_buf);
+        if (record.operation == MergeTreeDeduplicationOp::DROP)
+            deduplication_map.erase(record.block_id);
+        else
+            deduplication_map.insert(record.block_id, MergeTreePartInfo::fromPartName(record.part_name, format_version));
+        total_entries++;
+    }
+    return total_entries;
+}
+
+void MergeTreeDeduplicationLog::rotate()
+{
+    /// We don't deduplicate anything so we don't need any writers
+    if (deduplication_window == 0)
+        return;
+
+    current_log_number++;
+    auto new_path = getLogPath(logs_dir, current_log_number);
+    MergeTreeDeduplicationLogNameDescription log_description{new_path, 0};
+    existing_logs.emplace(current_log_number, log_description);
+
+    if (current_writer)
+        current_writer->sync();
+
+    current_writer = std::make_unique<WriteBufferFromFile>(log_description.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+}
+
+void MergeTreeDeduplicationLog::dropOutdatedLogs()
+{
+    size_t current_sum = 0;
+    size_t remove_from_value = 0;
+    /// Go from end to the beginning
+    for (auto itr = existing_logs.rbegin(); itr != existing_logs.rend(); ++itr)
+    {
+        if (current_sum > deduplication_window)
+        {
+            /// We have more logs than required, all older files (including current) can be dropped
+            remove_from_value = itr->first;
+            break;
+        }
+
+        auto & description = itr->second;
+        current_sum += description.entries_count;
+    }
+
+    /// If we found some logs to drop
+    if (remove_from_value != 0)
+    {
+        /// Go from the beginning to the end and drop all outdated logs
+        for (auto itr = existing_logs.begin(); itr != existing_logs.end();)
+        {
+            size_t number = itr->first;
+            std::filesystem::remove(itr->second.path);
+            itr = existing_logs.erase(itr);
+            if (remove_from_value == number)
+                break;
+        }
+    }
+
+}
+
+void MergeTreeDeduplicationLog::rotateAndDropIfNeeded()
+{
+    /// If we don't have logs at all or already have enough records in current
+    if (existing_logs.empty() || existing_logs[current_log_number].entries_count >= rotate_interval)
+    {
+        rotate();
+        dropOutdatedLogs();
+    }
+}
+
+std::pair<MergeTreePartInfo, bool> MergeTreeDeduplicationLog::addPart(const std::string & block_id, const MergeTreePartInfo & part_info)
+{
+    std::lock_guard lock(state_mutex);
+
+    /// We support zero case because user may want to disable deduplication with
+    /// ALTER MODIFY SETTING query. It's much more simpler to handle zero case
+    /// here then destroy whole object, check for null pointer from different
+    /// threads and so on.
+    if (deduplication_window == 0)
+        return std::make_pair(part_info, true);
+
+    /// If we already have this block let's deduplicate it
+    if (deduplication_map.contains(block_id))
+    {
+        auto info = deduplication_map.get(block_id);
+        return std::make_pair(info, false);
+    }
+
+    assert(current_writer != nullptr);
+
+    /// Create new record
+    MergeTreeDeduplicationLogRecord record;
+    record.operation = MergeTreeDeduplicationOp::ADD;
+    record.part_name = part_info.getPartName();
+    record.block_id = block_id;
+    /// Write it to disk
+    writeRecord(record, *current_writer);
+    /// We have one more record in current log
+    existing_logs[current_log_number].entries_count++;
+    /// Add to deduplication map
+    deduplication_map.insert(record.block_id, part_info);
+    /// Rotate and drop old logs if needed
+    rotateAndDropIfNeeded();
+
+    return std::make_pair(part_info, true);
+}
+
+void MergeTreeDeduplicationLog::dropPart(const MergeTreePartInfo & drop_part_info)
+{
+    std::lock_guard lock(state_mutex);
+
+    /// We support zero case because user may want to disable deduplication with
+    /// ALTER MODIFY SETTING query. It's much more simpler to handle zero case
+    /// here then destroy whole object, check for null pointer from different
+    /// threads and so on.
+    if (deduplication_window == 0)
+        return;
+
+    assert(current_writer != nullptr);
+
+    for (auto itr = deduplication_map.begin(); itr != deduplication_map.end(); /* no increment here, we erasing from map */)
+    {
+        const auto & part_info = itr->value;
+        /// Part is covered by dropped part, let's remove it from
+        /// deduplication history
+        if (drop_part_info.contains(part_info))
+        {
+            /// Create drop record
+            MergeTreeDeduplicationLogRecord record;
+            record.operation = MergeTreeDeduplicationOp::DROP;
+            record.part_name = part_info.getPartName();
+            record.block_id = itr->key;
+            /// Write it to disk
+            writeRecord(record, *current_writer);
+            /// We have one more record on disk
+            existing_logs[current_log_number].entries_count++;
+
+            /// Increment itr before erase, otherwise it will invalidated
+            ++itr;
+            /// Remove block_id from in-memory table
+            deduplication_map.erase(record.block_id);
+
+            /// Rotate and drop old logs if needed
+            rotateAndDropIfNeeded();
+        }
+        else
+        {
+            ++itr;
+        }
+    }
+}
+
+void MergeTreeDeduplicationLog::setDeduplicationWindowSize(size_t deduplication_window_)
+{
+    std::lock_guard lock(state_mutex);
+
+    deduplication_window = deduplication_window_;
+    rotate_interval = deduplication_window * 2;
+
+    /// If settings was set for the first time with ALTER MODIFY SETTING query
+    if (deduplication_window != 0 && !std::filesystem::exists(logs_dir))
+        std::filesystem::create_directories(logs_dir);
+
+    deduplication_map.setMaxSize(deduplication_window);
+    rotateAndDropIfNeeded();
+
+    /// Can happen in case we have unfinished log
+    if (!current_writer)
+        current_writer = std::make_unique<WriteBufferFromFile>(existing_logs.rbegin()->second.path, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
new file mode 100644
index 00000000000..281a76050a2
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
@@ -0,0 +1,192 @@
+#pragma once
+#include <Core/Types.h>
+#include <common/StringRef.h>
+#include <IO/WriteBufferFromFile.h>
+#include <Storages/MergeTree/MergeTreePartInfo.h>
+#include <map>
+#include <list>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+
+namespace DB
+{
+
+/// Description of dedupliction log
+struct MergeTreeDeduplicationLogNameDescription
+{
+    /// Path to log
+    std::string path;
+
+    /// How many entries we have in log
+    size_t entries_count;
+};
+
+/// Simple string-key HashTable with fixed size based on STL containers.
+/// Preserves order using linked list and remove elements
+/// on overflow in FIFO order.
+template <typename V>
+class LimitedOrderedHashMap
+{
+private:
+    struct ListNode
+    {
+        std::string key;
+        V value;
+    };
+    using Queue = std::list<ListNode>;
+    using IndexMap = std::unordered_map<StringRef, typename Queue::iterator, StringRefHash>;
+
+    Queue queue;
+    IndexMap map;
+    size_t max_size;
+public:
+    using iterator = typename Queue::iterator;
+    using const_iterator = typename Queue::const_iterator;
+    using reverse_iterator = typename Queue::reverse_iterator;
+    using const_reverse_iterator = typename Queue::const_reverse_iterator;
+
+    explicit LimitedOrderedHashMap(size_t max_size_)
+        : max_size(max_size_)
+    {}
+
+    bool contains(const std::string & key) const
+    {
+        return map.find(key) != map.end();
+    }
+
+    V get(const std::string & key) const
+    {
+        return map.at(key)->value;
+    }
+
+    size_t size() const
+    {
+        return queue.size();
+    }
+
+    void setMaxSize(size_t max_size_)
+    {
+        max_size = max_size_;
+        while (size() > max_size)
+        {
+            map.erase(queue.front().key);
+            queue.pop_front();
+        }
+    }
+
+    bool erase(const std::string & key)
+    {
+        auto it = map.find(key);
+        if (it == map.end())
+            return false;
+
+        auto queue_itr = it->second;
+        map.erase(it);
+        queue.erase(queue_itr);
+
+        return true;
+    }
+
+    bool insert(const std::string & key, const V & value)
+    {
+        auto it = map.find(key);
+        if (it != map.end())
+            return false;
+
+        if (size() == max_size)
+        {
+            map.erase(queue.front().key);
+            queue.pop_front();
+        }
+
+        ListNode elem{key, value};
+        auto itr = queue.insert(queue.end(), elem);
+        map.emplace(itr->key, itr);
+        return true;
+    }
+
+    void clear()
+    {
+        map.clear();
+        queue.clear();
+    }
+
+    iterator begin() { return queue.begin(); }
+    const_iterator begin() const { return queue.cbegin(); }
+    iterator end() { return queue.end(); }
+    const_iterator end() const { return queue.cend(); }
+
+    reverse_iterator rbegin() { return queue.rbegin(); }
+    const_reverse_iterator rbegin() const { return queue.crbegin(); }
+    reverse_iterator rend() { return queue.rend(); }
+    const_reverse_iterator rend() const { return queue.crend(); }
+};
+
+/// Fixed-size log for deduplication in non-replicated MergeTree.
+/// Stores records on disk for zero-level parts in human-readable format:
+///  operation   part_name       partition_id_check_sum
+///  1           88_18_18_0      88_10619499460461868496_9553701830997749308
+///  2           77_14_14_0      77_15147918179036854170_6725063583757244937
+///  2           77_15_15_0      77_14977227047908934259_8047656067364802772
+///  1           77_20_20_0      77_15147918179036854170_6725063583757244937
+/// Also stores them in memory in hash table with limited size.
+class MergeTreeDeduplicationLog
+{
+public:
+    MergeTreeDeduplicationLog(
+        const std::string & logs_dir_,
+        size_t deduplication_window_,
+        const MergeTreeDataFormatVersion & format_version_);
+
+    /// Add part into in-memory hash table and to disk
+    /// Return true and part info if insertion was successful.
+    /// Otherwise, in case of duplicate, return false and previous part name with same hash (useful for logging)
+    std::pair<MergeTreePartInfo, bool> addPart(const std::string & block_id, const MergeTreePartInfo & part);
+
+    /// Remove all covered parts from in memory table and add DROP records to the disk
+    void dropPart(const MergeTreePartInfo & drop_part_info);
+
+    /// Load history from disk. Ignores broken logs.
+    void load();
+
+    void setDeduplicationWindowSize(size_t deduplication_window_);
+private:
+    const std::string logs_dir;
+    /// Size of deduplication window
+    size_t deduplication_window;
+
+    /// How often we create new logs. Not very important,
+    /// default value equals deduplication_window * 2
+    size_t rotate_interval;
+    const MergeTreeDataFormatVersion format_version;
+
+    /// Current log number. Always growing number.
+    size_t current_log_number = 0;
+
+    /// All existing logs in order of their numbers
+    std::map<size_t, MergeTreeDeduplicationLogNameDescription> existing_logs;
+
+    /// In memory hash-table
+    LimitedOrderedHashMap<MergeTreePartInfo> deduplication_map;
+
+    /// Writer to the current log file
+    std::unique_ptr<WriteBufferFromFile> current_writer;
+
+    /// Overall mutex because we can have a lot of cocurrent inserts
+    std::mutex state_mutex;
+
+    /// Start new log
+    void rotate();
+
+    /// Remove all old logs with non-needed records for deduplication_window
+    void dropOutdatedLogs();
+
+    /// Execute both previous methods if needed
+    void rotateAndDropIfNeeded();
+
+    /// Load single log from disk. In case of corruption throws exceptions
+    size_t loadSingleLog(const std::string & path);
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
index a98ba16978d..c37d710ec8f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -67,7 +67,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexBloomFilter::createIndexAggregator() c
     return std::make_shared<MergeTreeIndexAggregatorBloomFilter>(bits_per_row, hash_functions, index.column_names);
 }
 
-MergeTreeIndexConditionPtr MergeTreeIndexBloomFilter::createIndexCondition(const SelectQueryInfo & query_info, const Context & context) const
+MergeTreeIndexConditionPtr MergeTreeIndexBloomFilter::createIndexCondition(const SelectQueryInfo & query_info, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionBloomFilter>(query_info, context, index.sample_block, hash_functions);
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
index 1aac2c22aa0..9112f23ee64 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.h
@@ -20,7 +20,7 @@ public:
 
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
-    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo & query_info, const Context & context) const override;
+    MergeTreeIndexConditionPtr createIndexCondition(const SelectQueryInfo & query_info, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
index a9915f01645..031129a35f4 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -87,11 +87,11 @@ bool maybeTrueOnBloomFilter(const IColumn * hash_column, const BloomFilterPtr &
 }
 
 MergeTreeIndexConditionBloomFilter::MergeTreeIndexConditionBloomFilter(
-    const SelectQueryInfo & info_, const Context & context_, const Block & header_, size_t hash_functions_)
-    : header(header_), context(context_), query_info(info_), hash_functions(hash_functions_)
+    const SelectQueryInfo & info_, ContextPtr context_, const Block & header_, size_t hash_functions_)
+    : WithContext(context_), header(header_), query_info(info_), hash_functions(hash_functions_)
 {
-    auto atom_from_ast = [this](auto & node, auto &, auto & constants, auto & out) { return traverseAtomAST(node, constants, out); };
-    rpn = std::move(RPNBuilder<RPNElement>(info_, context, atom_from_ast).extractRPN());
+    auto atom_from_ast = [this](auto & node, auto, auto & constants, auto & out) { return traverseAtomAST(node, constants, out); };
+    rpn = std::move(RPNBuilder<RPNElement>(info_, getContext(), atom_from_ast).extractRPN());
 }
 
 bool MergeTreeIndexConditionBloomFilter::alwaysUnknownOrTrue() const
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
index 0b02e64d43c..61e796fb6f7 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
@@ -13,7 +13,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-class MergeTreeIndexConditionBloomFilter final : public IMergeTreeIndexCondition
+class MergeTreeIndexConditionBloomFilter final : public IMergeTreeIndexCondition, WithContext
 {
 public:
     struct RPNElement
@@ -42,7 +42,7 @@ public:
         std::vector<std::pair<size_t, ColumnPtr>> predicate;
     };
 
-    MergeTreeIndexConditionBloomFilter(const SelectQueryInfo & info_, const Context & context_, const Block & header_, size_t hash_functions_);
+    MergeTreeIndexConditionBloomFilter(const SelectQueryInfo & info_, ContextPtr context_, const Block & header_, size_t hash_functions_);
 
     bool alwaysUnknownOrTrue() const override;
 
@@ -56,7 +56,6 @@ public:
 
 private:
     const Block & header;
-    const Context & context;
     const SelectQueryInfo & query_info;
     const size_t hash_functions;
     std::vector<RPNElement> rpn;
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index 419a417c3e8..10136cd1069 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -166,7 +166,7 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
 
 MergeTreeConditionFullText::MergeTreeConditionFullText(
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     const Block & index_sample_block,
     const BloomFilterParameters & params_,
     TokenExtractorPtr token_extactor_)
@@ -179,7 +179,7 @@ MergeTreeConditionFullText::MergeTreeConditionFullText(
     rpn = std::move(
             RPNBuilder<RPNElement>(
                     query_info, context,
-                    [this] (const ASTPtr & node, const Context & /* context */, Block & block_with_constants, RPNElement & out) -> bool
+                    [this] (const ASTPtr & node, ContextPtr /* context */, Block & block_with_constants, RPNElement & out) -> bool
                     {
                         return this->atomFromAST(node, block_with_constants, out);
                     }).extractRPN());
@@ -566,7 +566,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexFullText::createIndexAggregator() cons
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexFullText::createIndexCondition(
-        const SelectQueryInfo & query, const Context & context) const
+        const SelectQueryInfo & query, ContextPtr context) const
 {
     return std::make_shared<MergeTreeConditionFullText>(query, context, index.sample_block, params, token_extractor.get());
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index d861751c7df..1385621f97f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -87,7 +87,7 @@ class MergeTreeConditionFullText final : public IMergeTreeIndexCondition
 public:
     MergeTreeConditionFullText(
             const SelectQueryInfo & query_info,
-            const Context & context,
+            ContextPtr context,
             const Block & index_sample_block,
             const BloomFilterParameters & params_,
             TokenExtractorPtr token_extactor_);
@@ -208,7 +208,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-            const SelectQueryInfo & query, const Context & context) const override;
+            const SelectQueryInfo & query, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
index ed0e7e55fc8..6da0a822f7f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
@@ -1,6 +1,8 @@
 #include <Storages/MergeTree/MergeTreeIndexGranularityInfo.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <Poco/Path.h>
+
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -17,8 +19,7 @@ std::optional<std::string> MergeTreeIndexGranularityInfo::getMarksExtensionFromF
     {
         for (DiskDirectoryIteratorPtr it = disk->iterateDirectory(path_to_part); it->isValid(); it->next())
         {
-            Poco::Path path(it->path());
-            const auto & ext = "." + path.getExtension();
+            const auto & ext = fs::path(it->path()).extension();
             if (ext == getNonAdaptiveMrkExtension()
                 || ext == getAdaptiveMrkExtension(MergeTreeDataPartType::WIDE)
                 || ext == getAdaptiveMrkExtension(MergeTreeDataPartType::COMPACT))
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index e8b526d1426..099d561cf80 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -138,7 +138,7 @@ void MergeTreeIndexAggregatorMinMax::update(const Block & block, size_t * pos, s
 MergeTreeIndexConditionMinMax::MergeTreeIndexConditionMinMax(
     const IndexDescription & index,
     const SelectQueryInfo & query,
-    const Context & context)
+    ContextPtr context)
     : index_data_types(index.data_types)
     , condition(query, context, index.column_names, index.expression)
 {
@@ -175,7 +175,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexMinMax::createIndexAggregator() const
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexMinMax::createIndexCondition(
-    const SelectQueryInfo & query, const Context & context) const
+    const SelectQueryInfo & query, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionMinMax>(index, query, context);
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.h b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
index 8d782d9a7dc..97b9b874484 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.h
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
@@ -52,7 +52,7 @@ public:
     MergeTreeIndexConditionMinMax(
         const IndexDescription & index,
         const SelectQueryInfo & query,
-        const Context & context);
+        ContextPtr context);
 
     bool alwaysUnknownOrTrue() const override;
 
@@ -78,7 +78,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-        const SelectQueryInfo & query, const Context & context) const override;
+        const SelectQueryInfo & query, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index 4ab6ae01c8c..6cee80983d6 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -69,7 +69,7 @@ void MergeTreeIndexGranuleSet::serializeBinary(WriteBuffer & ostr) const
         ISerialization::SerializeBinaryBulkSettings settings;
         settings.getter = [&ostr](ISerialization::SubstreamPath) -> WriteBuffer * { return &ostr; };
         settings.position_independent_encoding = false;
-        settings.low_cardinality_max_dictionary_size = 0;
+        settings.low_cardinality_max_dictionary_size = 0; //-V1048
 
         auto serialization = type->getDefaultSerialization();
         ISerialization::SerializeBinaryBulkStatePtr state;
@@ -241,7 +241,7 @@ MergeTreeIndexConditionSet::MergeTreeIndexConditionSet(
     const Block & index_sample_block_,
     size_t max_rows_,
     const SelectQueryInfo & query,
-    const Context & context)
+    ContextPtr context)
     : index_name(index_name_)
     , max_rows(max_rows_)
     , index_sample_block(index_sample_block_)
@@ -299,6 +299,10 @@ bool MergeTreeIndexConditionSet::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
 
     auto column
         = result.getByName(expression_ast->getColumnName()).column->convertToFullColumnIfConst()->convertToFullColumnIfLowCardinality();
+
+    if (column->onlyNull())
+        return false;
+
     const auto * col_uint8 = typeid_cast<const ColumnUInt8 *>(column.get());
 
     const NullMap * null_map = nullptr;
@@ -388,7 +392,7 @@ bool MergeTreeIndexConditionSet::operatorFromAST(ASTPtr & node)
 
         func->name = "__bitSwapLastTwo";
     }
-    else if (func->name == "and")
+    else if (func->name == "and" || func->name == "indexHint")
     {
         auto last_arg = args.back();
         args.pop_back();
@@ -444,7 +448,7 @@ bool MergeTreeIndexConditionSet::checkASTUseless(const ASTPtr & node, bool atomi
 
         const ASTs & args = func->arguments->children;
 
-        if (func->name == "and")
+        if (func->name == "and" || func->name == "indexHint")
             return checkASTUseless(args[0], atomic) && checkASTUseless(args[1], atomic);
         else if (func->name == "or")
             return checkASTUseless(args[0], atomic) || checkASTUseless(args[1], atomic);
@@ -474,7 +478,7 @@ MergeTreeIndexAggregatorPtr MergeTreeIndexSet::createIndexAggregator() const
 }
 
 MergeTreeIndexConditionPtr MergeTreeIndexSet::createIndexCondition(
-    const SelectQueryInfo & query, const Context & context) const
+    const SelectQueryInfo & query, ContextPtr context) const
 {
     return std::make_shared<MergeTreeIndexConditionSet>(index.name, index.sample_block, max_rows, query, context);
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.h b/src/Storages/MergeTree/MergeTreeIndexSet.h
index 90389264d53..28afe4f714d 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.h
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.h
@@ -87,7 +87,7 @@ public:
         const Block & index_sample_block_,
         size_t max_rows_,
         const SelectQueryInfo & query,
-        const Context & context);
+        ContextPtr context);
 
     bool alwaysUnknownOrTrue() const override;
 
@@ -129,7 +129,7 @@ public:
     MergeTreeIndexAggregatorPtr createIndexAggregator() const override;
 
     MergeTreeIndexConditionPtr createIndexCondition(
-            const SelectQueryInfo & query, const Context & context) const override;
+            const SelectQueryInfo & query, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
index c7b9dfb123e..674daeb480d 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.h
+++ b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -84,7 +84,7 @@ struct IMergeTreeIndex
     virtual MergeTreeIndexAggregatorPtr createIndexAggregator() const = 0;
 
     virtual MergeTreeIndexConditionPtr createIndexCondition(
-            const SelectQueryInfo & query_info, const Context & context) const = 0;
+            const SelectQueryInfo & query_info, ContextPtr context) const = 0;
 
     Names getColumnsRequiredForIndexCalc() const { return index.expression->getRequiredColumns(); }
 
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
index c5a99b128e9..717179e5f26 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
@@ -1,7 +1,6 @@
 #include <Storages/MergeTree/MergeTreeMarksLoader.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <IO/ReadBufferFromFile.h>
-#include <Poco/File.h>
 
 #include <utility>
 
diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
index 49c4e93eb1d..2aefb3df2be 100644
--- a/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
+++ b/src/Storages/MergeTree/MergeTreeMutationEntry.cpp
@@ -4,9 +4,6 @@
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromString.h>
 
-#include <Poco/File.h>
-#include <Poco/Path.h>
-
 #include <utility>
 
 
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.cpp b/src/Storages/MergeTree/MergeTreePartInfo.cpp
index d30f6470bb1..94430de422e 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreePartInfo.cpp
@@ -93,6 +93,15 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
         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;
     }
@@ -146,7 +155,15 @@ String MergeTreePartInfo::getPartName() const
     writeChar('_', wb);
     writeIntText(max_block, wb);
     writeChar('_', wb);
-    writeIntText(level, wb);
+    if (use_leagcy_max_level)
+    {
+        assert(level == MAX_LEVEL);
+        writeIntText(LEGACY_MAX_LEVEL, wb);
+    }
+    else
+    {
+        writeIntText(level, wb);
+    }
 
     if (mutation)
     {
@@ -177,7 +194,15 @@ String MergeTreePartInfo::getPartNameV0(DayNum left_date, DayNum right_date) con
     writeChar('_', wb);
     writeIntText(max_block, wb);
     writeChar('_', wb);
-    writeIntText(level, wb);
+    if (use_leagcy_max_level)
+    {
+        assert(level == MAX_LEVEL);
+        writeIntText(LEGACY_MAX_LEVEL, wb);
+    }
+    else
+    {
+        writeIntText(level, wb);
+    }
 
     if (mutation)
     {
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 416308861b7..e81143de8c2 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -19,6 +19,8 @@ struct MergeTreePartInfo
     UInt32 level = 0;
     Int64 mutation = 0;   /// If the part has been mutated or contains mutated parts, is equal to mutation version number.
 
+    bool use_leagcy_max_level = false;  /// For compatibility. TODO remove it
+
     MergeTreePartInfo() = default;
 
     MergeTreePartInfo(String partition_id_, Int64 min_block_, Int64 max_block_, UInt32 level_)
@@ -86,6 +88,8 @@ struct MergeTreePartInfo
 
     static constexpr UInt32 MAX_LEVEL = 999999999;
     static constexpr UInt32 MAX_BLOCK_NUMBER = 999999999;
+
+    static constexpr UInt32 LEGACY_MAX_LEVEL = std::numeric_limits<decltype(level)>::max();
 };
 
 /// Information about detached part, which includes its prefix in
diff --git a/src/Storages/MergeTree/MergeTreePartition.cpp b/src/Storages/MergeTree/MergeTreePartition.cpp
index 897b868db25..a19bd263dbf 100644
--- a/src/Storages/MergeTree/MergeTreePartition.cpp
+++ b/src/Storages/MergeTree/MergeTreePartition.cpp
@@ -129,7 +129,7 @@ void MergeTreePartition::load(const MergeTreeData & storage, const DiskPtr & dis
     if (!metadata_snapshot->hasPartitionKey())
         return;
 
-    const auto & partition_key_sample = metadata_snapshot->getPartitionKey().sample_block;
+    const auto & partition_key_sample = adjustPartitionKey(metadata_snapshot, storage.getContext()).sample_block;
     auto partition_file_path = part_path + "partition.dat";
     auto file = openForReading(disk, partition_file_path);
     value.resize(partition_key_sample.columns());
@@ -140,7 +140,7 @@ void MergeTreePartition::load(const MergeTreeData & storage, const DiskPtr & dis
 void MergeTreePartition::store(const MergeTreeData & storage, const DiskPtr & disk, const String & part_path, MergeTreeDataPartChecksums & checksums) const
 {
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
-    const auto & partition_key_sample = metadata_snapshot->getPartitionKey().sample_block;
+    const auto & partition_key_sample = adjustPartitionKey(metadata_snapshot, storage.getContext()).sample_block;
     store(partition_key_sample, disk, part_path, checksums);
 }
 
@@ -153,28 +153,62 @@ void MergeTreePartition::store(const Block & partition_key_sample, const DiskPtr
     HashingWriteBuffer out_hashing(*out);
     for (size_t i = 0; i < value.size(); ++i)
         partition_key_sample.getByPosition(i).type->getDefaultSerialization()->serializeBinary(value[i], out_hashing);
+
     out_hashing.next();
     checksums.files["partition.dat"].file_size = out_hashing.count();
     checksums.files["partition.dat"].file_hash = out_hashing.getHash();
     out->finalize();
 }
 
-void MergeTreePartition::create(const StorageMetadataPtr & metadata_snapshot, Block block, size_t row)
+void MergeTreePartition::create(const StorageMetadataPtr & metadata_snapshot, Block block, size_t row, ContextPtr context)
 {
     if (!metadata_snapshot->hasPartitionKey())
         return;
 
-    const auto & partition_key = metadata_snapshot->getPartitionKey();
-    partition_key.expression->execute(block);
-    size_t partition_columns_num = partition_key.sample_block.columns();
-    value.resize(partition_columns_num);
+    auto partition_key_names_and_types = executePartitionByExpression(metadata_snapshot, block, context);
+    value.resize(partition_key_names_and_types.size());
 
-    for (size_t i = 0; i < partition_columns_num; ++i)
+    /// Executing partition_by expression adds new columns to passed block according to partition functions.
+    /// The block is passed by reference and is used afterwards. `moduloLegacy` needs to be substituted back
+    /// with just `modulo`, because it was a temporary substitution.
+    static constexpr auto modulo_legacy_function_name = "moduloLegacy";
+
+    size_t i = 0;
+    for (const auto & element : partition_key_names_and_types)
     {
-        const auto & column_name = partition_key.sample_block.getByPosition(i).name;
-        const auto & partition_column = block.getByName(column_name).column;
-        partition_column->get(row, value[i]);
+        auto & partition_column = block.getByName(element.name);
+
+        if (element.name.starts_with(modulo_legacy_function_name))
+            partition_column.name = "modulo" + partition_column.name.substr(std::strlen(modulo_legacy_function_name));
+
+        partition_column.column->get(row, value[i++]);
     }
 }
 
+NamesAndTypesList MergeTreePartition::executePartitionByExpression(const StorageMetadataPtr & metadata_snapshot, Block & block, ContextPtr context)
+{
+    auto adjusted_partition_key = adjustPartitionKey(metadata_snapshot, context);
+    adjusted_partition_key.expression->execute(block);
+    return adjusted_partition_key.sample_block.getNamesAndTypesList();
+}
+
+KeyDescription MergeTreePartition::adjustPartitionKey(const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
+{
+    const auto & partition_key = metadata_snapshot->getPartitionKey();
+    if (!partition_key.definition_ast)
+        return partition_key;
+
+    ASTPtr ast_copy = partition_key.definition_ast->clone();
+
+    /// Implementation of modulo function was changed from 8bit result type to 16bit. For backward compatibility partition by expression is always
+    /// calculated according to previous version - `moduloLegacy`.
+    if (KeyDescription::moduloToModuloLegacyRecursive(ast_copy))
+    {
+        auto adjusted_partition_key = KeyDescription::getKeyFromAST(ast_copy, metadata_snapshot->columns, context);
+        return adjusted_partition_key;
+    }
+
+    return partition_key;
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreePartition.h b/src/Storages/MergeTree/MergeTreePartition.h
index f89b6f22d4f..67e7a246c30 100644
--- a/src/Storages/MergeTree/MergeTreePartition.h
+++ b/src/Storages/MergeTree/MergeTreePartition.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <Core/Row.h>
 #include <common/types.h>
 #include <Disks/IDisk.h>
 #include <IO/WriteBuffer.h>
+#include <Storages/KeyDescription.h>
+#include <Core/Field.h>
 
 namespace DB
 {
@@ -38,9 +39,15 @@ public:
     void store(const MergeTreeData & storage, const DiskPtr & disk, const String & part_path, MergeTreeDataPartChecksums & checksums) const;
     void store(const Block & partition_key_sample, const DiskPtr & disk, const String & part_path, MergeTreeDataPartChecksums & checksums) const;
 
-    void assign(const MergeTreePartition & other) { value.assign(other.value); }
+    void assign(const MergeTreePartition & other) { value = other.value; }
 
-    void create(const StorageMetadataPtr & metadata_snapshot, Block block, size_t row);
+    void create(const StorageMetadataPtr & metadata_snapshot, Block block, size_t row, ContextPtr context);
+
+    /// Adjust partition key and execute its expression on block. Return sample block according to used expression.
+    static NamesAndTypesList executePartitionByExpression(const StorageMetadataPtr & metadata_snapshot, Block & block, ContextPtr context);
+
+    /// Make a modified partition key with substitution from modulo to moduloLegacy. Used in paritionPruner.
+    static KeyDescription adjustPartitionKey(const StorageMetadataPtr & metadata_snapshot, ContextPtr context);
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreePartsMover.cpp b/src/Storages/MergeTree/MergeTreePartsMover.cpp
index cb21f50f9a0..5b77ac9ec4a 100644
--- a/src/Storages/MergeTree/MergeTreePartsMover.cpp
+++ b/src/Storages/MergeTree/MergeTreePartsMover.cpp
@@ -182,7 +182,7 @@ bool MergeTreePartsMover::selectPartsForMove(
 
     if (!parts_to_move.empty())
     {
-        LOG_TRACE(log, "Selected {} parts to move according to storage policy rules and {} parts according to TTL rules, {} total", parts_to_move_by_policy_rules, parts_to_move_by_ttl_rules, ReadableSize(parts_to_move_total_size_bytes));
+        LOG_DEBUG(log, "Selected {} parts to move according to storage policy rules and {} parts according to TTL rules, {} total", parts_to_move_by_policy_rules, parts_to_move_by_ttl_rules, ReadableSize(parts_to_move_total_size_bytes));
         return true;
     }
     else
@@ -206,18 +206,18 @@ MergeTreeData::DataPartPtr MergeTreePartsMover::clonePart(const MergeTreeMoveEnt
         /// Try to fetch part from S3 without copy and fallback to default copy
         /// if it's not possible
         moving_part.part->assertOnDisk();
-        String path_to_clone = data->getRelativeDataPath() + directory_to_move + "/";
+        String path_to_clone = fs::path(data->getRelativeDataPath()) / directory_to_move / "";
         String relative_path = part->relative_path;
         if (disk->exists(path_to_clone + relative_path))
         {
             LOG_WARNING(log, "Path " + fullPath(disk, path_to_clone + relative_path) + " already exists. Will remove it and clone again.");
-            disk->removeRecursive(path_to_clone + relative_path + "/");
+            disk->removeRecursive(fs::path(path_to_clone) / relative_path / "");
         }
         disk->createDirectories(path_to_clone);
-        bool is_fetched = data->tryToFetchIfShared(*part, disk, path_to_clone + "/" + part->name);
+        bool is_fetched = data->tryToFetchIfShared(*part, disk, fs::path(path_to_clone) / part->name);
         if (!is_fetched)
-            part->volume->getDisk()->copy(data->getRelativeDataPath() + relative_path + "/", disk, path_to_clone);
-        part->volume->getDisk()->removeFileIfExists(path_to_clone + "/" + IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
+            part->volume->getDisk()->copy(fs::path(data->getRelativeDataPath()) / relative_path / "", disk, path_to_clone);
+        part->volume->getDisk()->removeFileIfExists(fs::path(path_to_clone) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
     }
     else
     {
@@ -226,7 +226,7 @@ MergeTreeData::DataPartPtr MergeTreePartsMover::clonePart(const MergeTreeMoveEnt
 
     auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part->name, moving_part.reserved_space->getDisk(), 0);
     MergeTreeData::MutableDataPartPtr cloned_part =
-        data->createPart(part->name, single_disk_volume, directory_to_move + '/' + part->name);
+        data->createPart(part->name, single_disk_volume, fs::path(directory_to_move) / part->name);
     LOG_TRACE(log, "Part {} was cloned to {}", part->name, cloned_part->getFullPath());
 
     cloned_part->loadColumnsChecksumsIndexes(true, true);
diff --git a/src/Storages/MergeTree/MergeTreeProjections.cpp b/src/Storages/MergeTree/MergeTreeProjections.cpp
new file mode 100644
index 00000000000..b20aa07b70c
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeProjections.cpp
@@ -0,0 +1,78 @@
+#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
new file mode 100644
index 00000000000..434e0390845
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeProjections.h
@@ -0,0 +1,88 @@
+#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 e72039f7172..bef67f0ade2 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -486,9 +486,13 @@ void MergeTreeRangeReader::ReadResult::setFilter(const ColumnPtr & new_filter)
 
     ConstantFilterDescription const_description(*new_filter);
     if (const_description.always_true)
+    {
         setFilterConstTrue();
+    }
     else if (const_description.always_false)
+    {
         clear();
+    }
     else
     {
         FilterDescription filter_description(*new_filter);
@@ -633,17 +637,14 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::read(size_t max_rows, Mar
             return read_result;
 
         bool has_columns = false;
-        for (auto & column : columns)
-        {
-            if (column)
-                has_columns = true;
-        }
-
         size_t total_bytes = 0;
         for (auto & column : columns)
         {
             if (column)
+            {
                 total_bytes += column->byteSize();
+                has_columns = true;
+            }
         }
 
         read_result.addNumBytesRead(total_bytes);
@@ -937,7 +938,10 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
 
             auto columns = block.getColumns();
             filterColumns(columns, row_level_filter);
-            block.setColumns(columns);
+            if (columns.empty())
+                block = block.cloneEmpty();
+            else
+                block.setColumns(columns);
         }
 
         prewhere_info->prewhere_actions->execute(block);
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index 366e9a2381a..9949bdf86f8 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -100,7 +100,7 @@ private:
 
     const MergeTreeData & data;
     StorageMetadataPtr metadata_snapshot;
-    Names column_names;
+    const Names column_names;
     bool do_not_steal_tasks;
     bool predict_block_size_bytes;
     std::vector<NameSet> per_part_column_name_set;
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index da28f75b57f..783a37cce60 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -2,7 +2,6 @@
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/NestedUtils.h>
-#include <Poco/File.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
index 5ee4aa555e6..cf5c850daa1 100644
--- a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
@@ -3,7 +3,6 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/NestedUtils.h>
 #include <Columns/ColumnArray.h>
-#include <Poco/File.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index 0da2f643eb0..f2357a87535 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -173,7 +173,7 @@ void MergeTreeReaderWide::readData(
 {
     auto get_stream_getter = [&](bool stream_for_prefix) -> ISerialization::InputStreamGetter
     {
-        return [&, stream_for_prefix](const ISerialization::SubstreamPath & substream_path) -> ReadBuffer *
+        return [&, stream_for_prefix](const ISerialization::SubstreamPath & substream_path) -> ReadBuffer * //-V1047
         {
             /// If substream have already been read.
             if (cache.count(ISerialization::getSubcolumnNameForStream(substream_path)))
diff --git a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
index ee0a77ba3cf..e9527efaa4a 100644
--- a/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
@@ -44,12 +44,11 @@ MergeTreeReverseSelectProcessor::MergeTreeReverseSelectProcessor(
     for (const auto & range : all_mark_ranges)
         total_marks_count += range.end - range.begin;
 
-    size_t total_rows = data_part->index_granularity.getTotalRows();
+    size_t total_rows = data_part->index_granularity.getRowsCountInRanges(all_mark_ranges);
 
     if (!quiet)
-        LOG_TRACE(log, "Reading {} ranges in reverse order from part {}, approx. {}, up to {} rows starting from {}",
+        LOG_DEBUG(log, "Reading {} ranges in reverse order from part {}, approx. {} rows starting from {}",
             all_mark_ranges.size(), data_part->name, total_rows,
-            data_part->index_granularity.getRowsCountInRanges(all_mark_ranges),
             data_part->index_granularity.getMarkStartingRow(all_mark_ranges.front().begin));
 
     addTotalRowsApprox(total_rows);
@@ -63,9 +62,9 @@ MergeTreeReverseSelectProcessor::MergeTreeReverseSelectProcessor(
     column_name_set = NameSet{column_names.begin(), column_names.end()};
 
     if (use_uncompressed_cache)
-        owned_uncompressed_cache = storage.global_context.getUncompressedCache();
+        owned_uncompressed_cache = storage.getContext()->getUncompressedCache();
 
-    owned_mark_cache = storage.global_context.getMarkCache();
+    owned_mark_cache = storage.getContext()->getMarkCache();
 
     reader = data_part->getReader(task_columns.columns, metadata_snapshot,
         all_mark_ranges, owned_uncompressed_cache.get(),
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
index 65f9b1eba3b..980afa170e9 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
@@ -47,7 +47,7 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
     size_t total_rows = data_part->index_granularity.getRowsCountInRanges(all_mark_ranges);
 
     if (!quiet)
-        LOG_TRACE(log, "Reading {} ranges from part {}, approx. {} rows starting from {}",
+        LOG_DEBUG(log, "Reading {} ranges from part {}, approx. {} rows starting from {}",
             all_mark_ranges.size(), data_part->name, total_rows,
             data_part->index_granularity.getMarkStartingRow(all_mark_ranges.front().begin));
 
@@ -87,9 +87,9 @@ try
     if (!reader)
     {
         if (use_uncompressed_cache)
-            owned_uncompressed_cache = storage.global_context.getUncompressedCache();
+            owned_uncompressed_cache = storage.getContext()->getUncompressedCache();
 
-        owned_mark_cache = storage.global_context.getMarkCache();
+        owned_mark_cache = storage.getContext()->getMarkCache();
 
         reader = data_part->getReader(task_columns.columns, metadata_snapshot, all_mark_ranges,
             owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings);
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index edd63aadd29..e82b1966461 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -23,16 +23,16 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
     , data_part(std::move(data_part_))
     , columns_to_read(std::move(columns_to_read_))
     , read_with_direct_io(read_with_direct_io_)
-    , mark_cache(storage.global_context.getMarkCache())
+    , mark_cache(storage.getContext()->getMarkCache())
 {
     if (!quiet)
     {
         /// Print column name but don't pollute logs in case of many columns.
         if (columns_to_read.size() == 1)
-            LOG_TRACE(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part, column {}",
+            LOG_DEBUG(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part, column {}",
                 data_part->getMarksCount(), data_part->name, data_part->rows_count, columns_to_read.front());
         else
-            LOG_TRACE(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part",
+            LOG_DEBUG(log, "Reading {} marks from part {}, total {} rows starting from the beginning of the part",
                 data_part->getMarksCount(), data_part->name, data_part->rows_count);
     }
 
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index 7a1ef8aeed6..888ca80e015 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -2,6 +2,7 @@
 
 #include <Core/Defines.h>
 #include <Core/BaseSettings.h>
+#include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
 
 
 namespace Poco::Util
@@ -54,6 +55,8 @@ struct Settings;
     M(UInt64, write_ahead_log_bytes_to_fsync, 100ULL * 1024 * 1024, "Amount of bytes, accumulated in WAL to do fsync.", 0) \
     M(UInt64, write_ahead_log_interval_ms_to_fsync, 100, "Interval in milliseconds after which fsync for WAL is being done.", 0) \
     M(Bool, in_memory_parts_insert_sync, false, "If true insert of part with in-memory format will wait for fsync of WAL", 0) \
+    M(UInt64, non_replicated_deduplication_window, 0, "How many last blocks of hashes should be kept on disk (0 - disabled).", 0) \
+    M(UInt64, max_parts_to_merge_at_once, 100, "Max amount of parts which can be merged at once (0 - disabled). Doesn't affect OPTIMIZE FINAL query.", 0) \
     \
     /** Inserts settings. */ \
     M(UInt64, parts_to_delay_insert, 150, "If table contains at least that many active parts in single partition, artificially slow down insert into table.", 0) \
@@ -89,6 +92,8 @@ struct Settings;
     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(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) \
     \
     /** Check delay of replicas settings. */ \
     M(UInt64, min_relative_delay_to_measure, 120, "Calculate relative replica delay only if absolute delay is not less that this value.", 0) \
@@ -126,6 +131,10 @@ struct Settings;
     M(UInt64, min_marks_to_honor_max_concurrent_queries, 0, "Minimal number of marks to honor the MergeTree-level's max_concurrent_queries (0 - disabled). Queries will still be limited by other max_concurrent_queries settings.", 0) \
     M(UInt64, min_bytes_to_rebalance_partition_over_jbod, 0, "Minimal amount of bytes to enable part rebalance over JBOD array (0 - disabled).", 0) \
     \
+    /** Experimental/work in progress feature. Unsafe for production. */ \
+    M(UInt64, part_moves_between_shards_enable, 0, "Experimental/Incomplete feature to move parts between shards. Does not take into account sharding expressions.", 0) \
+    M(UInt64, part_moves_between_shards_delay_seconds, 30, "Time to wait before/after moving parts between shards.", 0) \
+    \
     /** Obsolete settings. Kept for backward compatibility only. */ \
     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) \
diff --git a/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp b/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp
index f57247e39ab..2f0aad77d96 100644
--- a/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeThreadSelectBlockInputProcessor.cpp
@@ -23,8 +23,7 @@ MergeTreeThreadSelectBlockInputProcessor::MergeTreeThreadSelectBlockInputProcess
     const Names & virt_column_names_)
     :
     MergeTreeBaseSelectProcessor{
-        pool_->getHeader(), storage_, metadata_snapshot_, prewhere_info_,
-        max_block_size_rows_,
+        pool_->getHeader(), storage_, metadata_snapshot_, prewhere_info_, max_block_size_rows_,
         preferred_block_size_bytes_, preferred_max_column_in_block_size_bytes_,
         reader_settings_, use_uncompressed_cache_, virt_column_names_},
     thread{thread_},
@@ -61,7 +60,7 @@ bool MergeTreeThreadSelectBlockInputProcessor::getNewTask()
         return false;
     }
 
-    const std::string part_name = task->data_part->name;
+    const std::string part_name = task->data_part->isProjectionPart() ? task->data_part->getParentPart()->name : task->data_part->name;
 
     /// Allows pool to reduce number of threads in case of too slow reads.
     auto profile_callback = [this](ReadBufferFromFileBase::ProfileInfo info_) { pool->profileFeedback(info_); };
@@ -71,8 +70,8 @@ bool MergeTreeThreadSelectBlockInputProcessor::getNewTask()
         auto rest_mark_ranges = pool->getRestMarks(*task->data_part, task->mark_ranges[0]);
 
         if (use_uncompressed_cache)
-            owned_uncompressed_cache = storage.global_context.getUncompressedCache();
-        owned_mark_cache = storage.global_context.getMarkCache();
+            owned_uncompressed_cache = storage.getContext()->getUncompressedCache();
+        owned_mark_cache = storage.getContext()->getMarkCache();
 
         reader = task->data_part->getReader(task->columns, metadata_snapshot, rest_mark_ranges,
             owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings,
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index f0f178cb71c..2b27a51ba5e 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -29,7 +29,7 @@ static constexpr auto threshold = 2;
 
 MergeTreeWhereOptimizer::MergeTreeWhereOptimizer(
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     std::unordered_map<std::string, UInt64> column_sizes_,
     const StorageMetadataPtr & metadata_snapshot,
     const Names & queried_columns_,
@@ -218,14 +218,20 @@ void MergeTreeWhereOptimizer::optimize(ASTSelectQuery & select) const
         if (!it->viable)
             break;
 
-        /// 10% ratio is just a guess.
-        /// If sizes of compressed columns cannot be calculated, e.g. for compact parts,
-        /// use number of moved columns as a fallback.
-        bool moved_enough =
-            (total_size_of_queried_columns > 0 && total_size_of_moved_conditions > 0
-            && (total_size_of_moved_conditions + it->columns_size) * 10 > total_size_of_queried_columns)
-                || (total_number_of_moved_columns > 0
-                    && (total_number_of_moved_columns + it->identifiers.size()) * 10 > queried_columns.size());
+        bool moved_enough = false;
+        if (total_size_of_queried_columns > 0)
+        {
+            /// If we know size of queried columns use it as threshold. 10% ratio is just a guess.
+            moved_enough = total_size_of_moved_conditions > 0
+                && (total_size_of_moved_conditions + it->columns_size) * 10 > total_size_of_queried_columns;
+        }
+        else
+        {
+            /// Otherwise, use number of moved columns as a fallback.
+            /// It can happen, if table has only compact parts. 25% ratio is just a guess.
+            moved_enough = total_number_of_moved_columns > 0
+                && (total_number_of_moved_columns + it->identifiers.size()) * 4 > queried_columns.size();
+        }
 
         if (moved_enough)
             break;
@@ -339,6 +345,10 @@ bool MergeTreeWhereOptimizer::cannotBeMoved(const ASTPtr & ptr, bool is_final) c
         if ("globalIn" == function_ptr->name
             || "globalNotIn" == function_ptr->name)
             return true;
+
+        /// indexHint is a special function that it does not make sense to transfer to PREWHERE
+        if ("indexHint" == function_ptr->name)
+            return true;
     }
     else if (auto opt_name = IdentifierSemantic::getColumnName(ptr))
     {
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
index 8fd973e9ba3..0559fdee2ae 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
@@ -1,12 +1,15 @@
 #pragma once
 
-#include <memory>
-#include <unordered_map>
-#include <set>
-#include <boost/noncopyable.hpp>
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <Storages/SelectQueryInfo.h>
 
+#include <boost/noncopyable.hpp>
+
+#include <memory>
+#include <set>
+#include <unordered_map>
+
 
 namespace Poco { class Logger; }
 
@@ -32,7 +35,7 @@ class MergeTreeWhereOptimizer : private boost::noncopyable
 public:
     MergeTreeWhereOptimizer(
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         std::unordered_map<std::string, UInt64> column_sizes_,
         const StorageMetadataPtr & metadata_snapshot,
         const Names & queried_columns_,
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 4ca20572e90..ba6a53026fb 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -30,7 +30,7 @@ MergeTreeWriteAheadLog::MergeTreeWriteAheadLog(
     , disk(disk_)
     , name(name_)
     , path(storage.getRelativeDataPath() + name_)
-    , pool(storage.global_context.getSchedulePool())
+    , pool(storage.getContext()->getSchedulePool())
 {
     init();
     sync_task = pool.createTask("MergeTreeWriteAheadLog::sync", [this]
@@ -111,7 +111,7 @@ void MergeTreeWriteAheadLog::rotate(const std::unique_lock<std::mutex> &)
     init();
 }
 
-MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const StorageMetadataPtr & metadata_snapshot)
+MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     std::unique_lock lock(write_mutex);
 
@@ -192,7 +192,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
             MergedBlockOutputStream part_out(part, metadata_snapshot, block.getNamesAndTypesList(), {}, CompressionCodecFactory::instance().get("NONE", {}));
 
             part->minmax_idx.update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
-            part->partition.create(metadata_snapshot, block, 0);
+            part->partition.create(metadata_snapshot, block, 0, context);
             if (metadata_snapshot->hasSortingKey())
                 metadata_snapshot->getSortingKey().expression->execute(block);
 
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
index 3b8dc5befc0..e01911aa8b8 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
@@ -62,7 +62,7 @@ public:
 
     void addPart(DataPartInMemoryPtr & part);
     void dropPart(const String & part_name);
-    std::vector<MergeTreeMutableDataPartPtr> restore(const StorageMetadataPtr & metadata_snapshot);
+    std::vector<MergeTreeMutableDataPartPtr> restore(const StorageMetadataPtr & metadata_snapshot, ContextPtr context);
 
     using MinMaxBlockNumber = std::pair<Int64, Int64>;
     static std::optional<MinMaxBlockNumber> tryParseMinMaxBlockNumber(const String & filename);
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 6988d48b18c..6de01caa833 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -1,6 +1,5 @@
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
 #include <Interpreters/Context.h>
-#include <Poco/File.h>
 #include <Parsers/queryToString.h>
 
 
@@ -26,7 +25,7 @@ MergedBlockOutputStream::MergedBlockOutputStream(
     , default_codec(default_codec_)
 {
     MergeTreeWriterSettings writer_settings(
-        storage.global_context.getSettings(),
+        storage.getContext()->getSettings(),
         storage.getSettings(),
         data_part->index_granularity_info.is_adaptive,
         /* rewrite_primary_key = */ true,
@@ -72,6 +71,12 @@ void MergedBlockOutputStream::writeSuffixAndFinalizePart(
     /// Finish columns serialization.
     writer->finish(checksums, sync);
 
+    for (const auto & [projection_name, projection_part] : new_part->getProjectionParts())
+        checksums.addFile(
+            projection_name + ".proj",
+            projection_part->checksums.getTotalSizeOnDisk(),
+            projection_part->checksums.getTotalChecksumUInt128());
+
     NamesAndTypesList part_columns;
     if (!total_columns_list)
         part_columns = columns_list;
@@ -100,42 +105,58 @@ void MergedBlockOutputStream::finalizePartOnDisk(
     MergeTreeData::DataPart::Checksums & checksums,
     bool sync)
 {
-    if (new_part->uuid != UUIDHelpers::Nil)
+
+    if (new_part->isProjectionPart())
     {
-        auto out = volume->getDisk()->writeFile(part_path + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
-        HashingWriteBuffer out_hashing(*out);
-        writeUUIDText(new_part->uuid, out_hashing);
-        checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
-        checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
-        out->finalize();
-        if (sync)
-            out->sync();
+        if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || isCompactPart(new_part))
+        {
+            auto count_out = volume->getDisk()->writeFile(part_path + "count.txt", 4096);
+            HashingWriteBuffer count_out_hashing(*count_out);
+            writeIntText(rows_count, count_out_hashing);
+            count_out_hashing.next();
+            checksums.files["count.txt"].file_size = count_out_hashing.count();
+            checksums.files["count.txt"].file_hash = count_out_hashing.getHash();
+        }
     }
-
-    if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || isCompactPart(new_part))
+    else
     {
-        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);
-        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);
+        if (new_part->uuid != UUIDHelpers::Nil)
+        {
+            auto out = volume->getDisk()->writeFile(fs::path(part_path) / IMergeTreeDataPart::UUID_FILE_NAME, 4096);
+            HashingWriteBuffer out_hashing(*out);
+            writeUUIDText(new_part->uuid, out_hashing);
+            checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
+            checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
+            out->finalize();
+            if (sync)
+                out->sync();
+        }
 
-        auto count_out = volume->getDisk()->writeFile(part_path + "count.txt", 4096);
-        HashingWriteBuffer count_out_hashing(*count_out);
-        writeIntText(rows_count, count_out_hashing);
-        count_out_hashing.next();
-        checksums.files["count.txt"].file_size = count_out_hashing.count();
-        checksums.files["count.txt"].file_hash = count_out_hashing.getHash();
-        count_out->finalize();
-        if (sync)
-            count_out->sync();
+        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);
+            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);
+
+            auto count_out = volume->getDisk()->writeFile(fs::path(part_path) / "count.txt", 4096);
+            HashingWriteBuffer count_out_hashing(*count_out);
+            writeIntText(rows_count, count_out_hashing);
+            count_out_hashing.next();
+            checksums.files["count.txt"].file_size = count_out_hashing.count();
+            checksums.files["count.txt"].file_hash = count_out_hashing.getHash();
+            count_out->finalize();
+            if (sync)
+                count_out->sync();
+        }
     }
 
     if (!new_part->ttl_infos.empty())
     {
         /// Write a file with ttl infos in json format.
-        auto out = volume->getDisk()->writeFile(part_path + "ttl.txt", 4096);
+        auto out = volume->getDisk()->writeFile(fs::path(part_path) / "ttl.txt", 4096);
         HashingWriteBuffer out_hashing(*out);
         new_part->ttl_infos.write(out_hashing);
         checksums.files["ttl.txt"].file_size = out_hashing.count();
@@ -149,7 +170,7 @@ void MergedBlockOutputStream::finalizePartOnDisk(
 
     {
         /// Write a file with a description of columns.
-        auto out = volume->getDisk()->writeFile(part_path + "columns.txt", 4096);
+        auto out = volume->getDisk()->writeFile(fs::path(part_path) / "columns.txt", 4096);
         part_columns.writeText(*out);
         out->finalize();
         if (sync)
@@ -170,7 +191,7 @@ void MergedBlockOutputStream::finalizePartOnDisk(
 
     {
         /// Write file with checksums.
-        auto out = volume->getDisk()->writeFile(part_path + "checksums.txt", 4096);
+        auto out = volume->getDisk()->writeFile(fs::path(part_path) / "checksums.txt", 4096);
         checksums.write(*out);
         out->finalize();
         if (sync)
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index 41479f104f3..3638212b320 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -21,7 +21,7 @@ MergedColumnOnlyOutputStream::MergedColumnOnlyOutputStream(
     : IMergedBlockOutputStream(data_part, metadata_snapshot_)
     , header(header_)
 {
-    const auto & global_settings = data_part->storage.global_context.getSettings();
+    const auto & global_settings = data_part->storage.getContext()->getSettings();
     const auto & storage_settings = data_part->storage.getSettings();
 
     MergeTreeWriterSettings writer_settings(
@@ -68,6 +68,12 @@ MergedColumnOnlyOutputStream::writeSuffixAndGetChecksums(
     MergeTreeData::DataPart::Checksums checksums;
     writer->finish(checksums, sync);
 
+    for (const auto & [projection_name, projection_part] : new_part->getProjectionParts())
+        checksums.addFile(
+            projection_name + ".proj",
+            projection_part->checksums.getTotalSizeOnDisk(),
+            projection_part->checksums.getTotalChecksumUInt128());
+
     auto columns = new_part->getColumns();
 
     auto removed_files = removeEmptyColumnsFromPart(new_part, columns, checksums);
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
new file mode 100644
index 00000000000..4c187109ac6
--- /dev/null
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
@@ -0,0 +1,459 @@
+#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
+{
+PartMovesBetweenShardsOrchestrator::PartMovesBetweenShardsOrchestrator(StorageReplicatedMergeTree & storage_)
+    : storage(storage_)
+    , zookeeper_path(storage.zookeeper_path)
+    , logger_name(storage.getStorageID().getFullTableName() + " (PartMovesBetweenShardsOrchestrator)")
+    , log(&Poco::Logger::get(logger_name))
+    , entries_znode_path(zookeeper_path + "/part_moves_shard")
+{
+    /// Schedule pool is not designed for long-running tasks. TODO replace with a separate thread?
+    task = storage.getContext()->getSchedulePool().createTask(logger_name, [this]{ run(); });
+}
+
+void PartMovesBetweenShardsOrchestrator::run()
+{
+    if (!storage.getSettings()->part_moves_between_shards_enable)
+        return;
+
+    if (need_stop)
+        return;
+
+    auto sleep_ms = 10;
+
+    try
+    {
+        fetchStateFromZK();
+
+        if (step())
+            fetchStateFromZK();
+        else
+            sleep_ms = 3 * 1000;
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, __PRETTY_FUNCTION__);
+    }
+
+
+    task->scheduleAfter(sleep_ms);
+}
+
+void PartMovesBetweenShardsOrchestrator::shutdown()
+{
+    need_stop = true;
+    task->deactivate();
+    LOG_TRACE(log, "PartMovesBetweenShardsOrchestrator thread finished");
+}
+
+void PartMovesBetweenShardsOrchestrator::fetchStateFromZK()
+{
+    std::lock_guard lock(state_mutex);
+
+    entries.clear();
+
+    auto zk = storage.getZooKeeper();
+
+    Strings task_names = zk->getChildren(entries_znode_path);
+    for (auto const & task_name : task_names)
+    {
+        PartMovesBetweenShardsOrchestrator::Entry e;
+        Coordination::Stat stat;
+
+        e.znode_path = entries_znode_path + "/" + task_name;
+
+        auto entry_str = zk->get(e.znode_path, &stat);
+        e.fromString(entry_str);
+
+        e.version = stat.version;
+        e.znode_name = task_name;
+
+        entries[task_name] = std::move(e);
+    }
+}
+
+bool PartMovesBetweenShardsOrchestrator::step()
+{
+    if (!storage.is_leader)
+        return false;
+
+    auto zk = storage.getZooKeeper();
+
+    std::optional<Entry> entry_to_process;
+
+    /// Try find an entry to process and copy it.
+    {
+        std::lock_guard lock(state_mutex);
+
+        for (auto const & entry : entries | boost::adaptors::map_values)
+        {
+            if (entry.state.value == EntryState::DONE || entry.state.value == EntryState::CANCELLED)
+                continue;
+
+            entry_to_process.emplace(entry);
+            break;
+        }
+    }
+
+    if (!entry_to_process.has_value())
+        return false;
+
+    /// Since some state transitions are long running (waiting on replicas acknowledgement we create this lock to avoid
+    /// other replicas trying to do the same work. All state transitions should be idempotent so is is safe to lose the
+    /// lock and have another replica retry.
+    ///
+    /// Note: This blocks all other entries from being executed. Technical debt.
+    zkutil::EphemeralNodeHolder::Ptr entry_node_holder;
+
+    try
+    {
+        entry_node_holder = zkutil::EphemeralNodeHolder::create(entry_to_process->znode_path + "/lock_holder", *zk, storage.replica_name);
+    }
+    catch (const Coordination::Exception & e)
+    {
+        if (e.code == Coordination::Error::ZNODEEXISTS)
+        {
+            LOG_DEBUG(log, "Task {} is being processed by another replica", entry_to_process->znode_name);
+            return false;
+        }
+
+        throw;
+    }
+
+    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);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, __PRETTY_FUNCTION__);
+
+        Entry entry_copy = entry_to_process.value();
+        entry_copy.last_exception_msg = getCurrentExceptionMessage(false);
+        entry_copy.update_time = std::time(nullptr);
+        zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+
+        return false;
+    }
+
+    return true;
+}
+
+void PartMovesBetweenShardsOrchestrator::stepEntry(const Entry & entry, zkutil::ZooKeeperPtr zk)
+{
+    switch (entry.state.value)
+    {
+        case EntryState::DONE:
+            break;
+
+        case EntryState::CANCELLED:
+            break;
+
+        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);
+        }
+        break;
+
+        case EntryState::SYNC_SOURCE:
+        {
+            {
+                /// 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);
+            }
+
+            {
+                /// 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);
+            }
+        }
+        break;
+
+        case EntryState::SYNC_DESTINATION:
+        {
+            {
+                /// 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);
+            }
+        }
+        break;
+
+        case EntryState::DESTINATION_FETCH:
+        {
+            /// Make sure table structure doesn't change when there are part movements in progress.
+            {
+                Coordination::Requests ops;
+                ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
+
+                /// 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);
+            }
+
+            {
+                /// 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);
+            }
+        }
+        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.
+            {
+                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 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);
+
+                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::SOURCE_DROP_PRE_DELAY;
+                entry_copy.update_time = std::time(nullptr);
+                zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+            }
+        }
+        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);
+        }
+        break;
+
+        case EntryState::SOURCE_DROP:
+        {
+            {
+                ReplicatedMergeTreeLogEntry log_entry;
+                if (storage.dropPartImpl(zk, entry.part_name, log_entry, false, false))
+                    storage.waitForAllReplicasToProcessLogEntry(log_entry, true);
+            }
+
+            {
+                /// 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);
+            }
+        }
+        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);
+        }
+        break;
+
+        case EntryState::REMOVE_UUID_PIN:
+        {
+            {
+                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);
+                }
+
+                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);
+            }
+
+            /// 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;
+    }
+}
+
+std::vector<PartMovesBetweenShardsOrchestrator::Entry> PartMovesBetweenShardsOrchestrator::getEntries() const
+{
+    std::lock_guard lock(state_mutex);
+
+    std::vector<Entry> res;
+
+    for (const auto & e : entries)
+        res.push_back(e.second);
+
+    return res;
+}
+
+String PartMovesBetweenShardsOrchestrator::Entry::toString() const
+{
+    Poco::JSON::Object json;
+
+    json.set(JSON_KEY_CREATE_TIME, DB::toString(create_time));
+    json.set(JSON_KEY_UPDATE_TIME, DB::toString(update_time));
+    json.set(JSON_KEY_TASK_UUID, DB::toString(task_uuid));
+    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_STATE, state.toString());
+    json.set(JSON_KEY_LAST_EX_MSG, last_exception_msg);
+
+    std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    oss.exceptions(std::ios::failbit);
+    json.stringify(oss);
+
+    return oss.str();
+}
+
+void PartMovesBetweenShardsOrchestrator::Entry::fromString(const String & buf)
+{
+    Poco::JSON::Parser parser;
+    auto json = parser.parse(buf).extract<Poco::JSON::Object::Ptr>();
+
+    create_time = parseFromString<time_t>(json->getValue<std::string>(JSON_KEY_CREATE_TIME));
+    update_time = parseFromString<time_t>(json->getValue<std::string>(JSON_KEY_UPDATE_TIME));
+    task_uuid = parseFromString<UUID>(json->getValue<std::string>(JSON_KEY_TASK_UUID));
+    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);
+    state.value = EntryState::fromString(json->getValue<std::string>(JSON_KEY_STATE));
+    last_exception_msg = json->getValue<std::string>(JSON_KEY_LAST_EX_MSG);
+}
+
+}
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
new file mode 100644
index 00000000000..9e54ae8a8ed
--- /dev/null
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
@@ -0,0 +1,162 @@
+#pragma once
+
+#include <vector>
+#include <common/logger_useful.h>
+#include <common/types.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Core/UUID.h>
+#include <Core/BackgroundSchedulePool.h>
+#include <IO/WriteHelpers.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+class StorageReplicatedMergeTree;
+
+/// Cross shard part movement workflow orchestration.
+class PartMovesBetweenShardsOrchestrator
+{
+public:
+    struct EntryState
+    {
+        enum Value
+        {
+            TODO,
+            SYNC_SOURCE,
+            SYNC_DESTINATION,
+            DESTINATION_FETCH,
+            DESTINATION_ATTACH,
+            SOURCE_DROP_PRE_DELAY,
+            SOURCE_DROP,
+            SOURCE_DROP_POST_DELAY,
+            REMOVE_UUID_PIN,
+            DONE,
+            CANCELLED,
+        };
+
+        EntryState(): value(TODO) {}
+        EntryState(Value value_): value(value_) {}
+
+        Value value;
+
+        String toString() const
+        {
+            switch (value)
+            {
+                case TODO: return "TODO";
+                case SYNC_SOURCE: return "SYNC_SOURCE";
+                case SYNC_DESTINATION: return "SYNC_DESTINATION";
+                case DESTINATION_FETCH: return "DESTINATION_FETCH";
+                case DESTINATION_ATTACH: return "DESTINATION_ATTACH";
+                case SOURCE_DROP_PRE_DELAY: return "SOURCE_DROP_PRE_DELAY";
+                case SOURCE_DROP: return "SOURCE_DROP";
+                case SOURCE_DROP_POST_DELAY: return "SOURCE_DROP_POST_DELAY";
+                case REMOVE_UUID_PIN: return "REMOVE_UUID_PIN";
+                case DONE: return "DONE";
+                case CANCELLED: return "CANCELLED";
+            }
+
+            throw Exception("Unknown EntryState: " + DB::toString<int>(value), ErrorCodes::LOGICAL_ERROR);
+        }
+
+        static EntryState::Value fromString(String in)
+        {
+            if (in == "TODO") return TODO;
+            else if (in == "SYNC_SOURCE") return SYNC_SOURCE;
+            else if (in == "SYNC_DESTINATION") return SYNC_DESTINATION;
+            else if (in == "DESTINATION_FETCH") return DESTINATION_FETCH;
+            else if (in == "DESTINATION_ATTACH") return DESTINATION_ATTACH;
+            else if (in == "SOURCE_DROP_PRE_DELAY") return SOURCE_DROP_PRE_DELAY;
+            else if (in == "SOURCE_DROP") return SOURCE_DROP;
+            else if (in == "SOURCE_DROP_POST_DELAY") return SOURCE_DROP_POST_DELAY;
+            else if (in == "REMOVE_UUID_PIN") return REMOVE_UUID_PIN;
+            else if (in == "DONE") return DONE;
+            else if (in == "CANCELLED") return CANCELLED;
+            else throw Exception("Unknown state: " + in, ErrorCodes::LOGICAL_ERROR);
+        }
+    };
+
+    struct Entry
+    {
+        friend class PartMovesBetweenShardsOrchestrator;
+
+        time_t create_time = 0;
+        time_t update_time = 0;
+
+        /// Globally unique identifier used for attaching parts on destination.
+        /// Using `part_uuid` results in part names being reused when moving parts back and forth.
+        UUID task_uuid;
+
+        String part_name;
+        UUID part_uuid;
+        String to_shard;
+
+        EntryState state;
+
+        String last_exception_msg;
+
+        String znode_name;
+
+    private:
+        /// Transient value for CAS.
+        uint32_t version = 0;
+
+        String znode_path;
+
+    public:
+        String toString() const;
+        void fromString(const String & buf);
+    };
+
+private:
+    static constexpr auto JSON_KEY_CREATE_TIME = "create_time";
+    static constexpr auto JSON_KEY_UPDATE_TIME = "update_time";
+    static constexpr auto JSON_KEY_TASK_UUID = "task_uuid";
+    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_STATE = "state";
+    static constexpr auto JSON_KEY_LAST_EX_MSG = "last_exception";
+
+public:
+    PartMovesBetweenShardsOrchestrator(StorageReplicatedMergeTree & storage_);
+
+    void start() { task->activateAndSchedule(); }
+    void wakeup() { task->schedule(); }
+    void shutdown();
+
+    void fetchStateFromZK();
+
+    /// 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;
+
+private:
+    void run();
+    void stepEntry(const Entry & entry, zkutil::ZooKeeperPtr zk);
+
+private:
+    StorageReplicatedMergeTree & storage;
+
+    String zookeeper_path;
+    String logger_name;
+    Poco::Logger * log = nullptr;
+    std::atomic<bool> need_stop{false};
+
+    BackgroundSchedulePool::TaskHolder task;
+
+    mutable std::mutex state_mutex;
+    std::map<String, Entry> entries;
+
+public:
+    String entries_znode_path;
+};
+
+}
diff --git a/src/Storages/MergeTree/PartitionPruner.cpp b/src/Storages/MergeTree/PartitionPruner.cpp
index 8888367ebe5..e85e8e833f8 100644
--- a/src/Storages/MergeTree/PartitionPruner.cpp
+++ b/src/Storages/MergeTree/PartitionPruner.cpp
@@ -3,17 +3,17 @@
 namespace DB
 {
 
-bool PartitionPruner::canBePruned(const DataPartPtr & part)
+bool PartitionPruner::canBePruned(const DataPart & part)
 {
-    if (part->isEmpty())
+    if (part.isEmpty())
         return true;
-    const auto & partition_id = part->info.partition_id;
+    const auto & partition_id = part.info.partition_id;
     bool is_valid;
     if (auto it = partition_filter_map.find(partition_id); it != partition_filter_map.end())
         is_valid = it->second;
     else
     {
-        const auto & partition_value = part->partition.value;
+        const auto & partition_value = part.partition.value;
         std::vector<FieldRef> index_value(partition_value.begin(), partition_value.end());
         is_valid = partition_condition.mayBeTrueInRange(
             partition_value.size(), index_value.data(), index_value.data(), partition_key.data_types);
diff --git a/src/Storages/MergeTree/PartitionPruner.h b/src/Storages/MergeTree/PartitionPruner.h
index 3cb7552c427..fbed0e6ab99 100644
--- a/src/Storages/MergeTree/PartitionPruner.h
+++ b/src/Storages/MergeTree/PartitionPruner.h
@@ -14,24 +14,29 @@ class PartitionPruner
 {
 private:
     std::unordered_map<String, bool> partition_filter_map;
-    const KeyDescription & partition_key;
+
+    /// partition_key is adjusted here (with substitution from modulo to moduloLegacy).
+    KeyDescription partition_key;
+
     KeyCondition partition_condition;
     bool useless;
     using DataPart = IMergeTreeDataPart;
     using DataPartPtr = std::shared_ptr<const DataPart>;
 
 public:
-    PartitionPruner(const KeyDescription & partition_key_, const SelectQueryInfo & query_info, const Context & context, bool strict)
-        : partition_key(partition_key_)
+    PartitionPruner(const StorageMetadataPtr & metadata, const SelectQueryInfo & query_info, ContextPtr context, bool strict)
+        : partition_key(MergeTreePartition::adjustPartitionKey(metadata, context))
         , partition_condition(
               query_info, context, partition_key.column_names, partition_key.expression, true /* single_point */, strict)
         , useless(strict ? partition_condition.anyUnknownOrAlwaysTrue() : partition_condition.alwaysUnknownOrTrue())
     {
     }
 
-    bool canBePruned(const DataPartPtr & part);
+    bool canBePruned(const DataPart & part);
 
     bool isUseless() const { return useless; }
+
+    const KeyCondition & getKeyCondition() const { return partition_condition; }
 };
 
 }
diff --git a/src/Storages/MergeTree/PinnedPartUUIDs.cpp b/src/Storages/MergeTree/PinnedPartUUIDs.cpp
new file mode 100644
index 00000000000..1302d492c8c
--- /dev/null
+++ b/src/Storages/MergeTree/PinnedPartUUIDs.cpp
@@ -0,0 +1,36 @@
+#include "PinnedPartUUIDs.h"
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Poco/JSON/JSON.h>
+#include <Poco/JSON/Object.h>
+#include <Poco/JSON/Parser.h>
+
+namespace DB
+{
+
+String PinnedPartUUIDs::toString() const
+{
+    std::vector<UUID> vec(part_uuids.begin(), part_uuids.end());
+
+    Poco::JSON::Object json;
+    json.set(JSON_KEY_UUIDS, DB::toString(vec));
+
+    std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    oss.exceptions(std::ios::failbit);
+    json.stringify(oss);
+
+    return oss.str();
+}
+
+void PinnedPartUUIDs::fromString(const String & buf)
+{
+    Poco::JSON::Parser parser;
+    auto json = parser.parse(buf).extract<Poco::JSON::Object::Ptr>();
+
+    std::vector<UUID> vec = parseFromString<std::vector<UUID>>(json->getValue<std::string>(PinnedPartUUIDs::JSON_KEY_UUIDS));
+
+    part_uuids.clear();
+    std::copy(vec.begin(), vec.end(), std::inserter(part_uuids, part_uuids.begin()));
+}
+
+}
diff --git a/src/Storages/MergeTree/PinnedPartUUIDs.h b/src/Storages/MergeTree/PinnedPartUUIDs.h
new file mode 100644
index 00000000000..a8f6c1fceda
--- /dev/null
+++ b/src/Storages/MergeTree/PinnedPartUUIDs.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <Common/ZooKeeper/IKeeper.h>
+#include <Core/UUID.h>
+#include <set>
+
+namespace DB
+{
+
+struct PinnedPartUUIDs
+{
+    std::set<UUID> part_uuids;
+    Coordination::Stat stat{};
+
+    bool contains(const UUID & part_uuid) const
+    {
+        return part_uuids.contains(part_uuid);
+    }
+
+    String toString() const;
+    void fromString(const String & buf);
+
+private:
+    static constexpr auto JSON_KEY_UUIDS = "part_uuids";
+};
+
+}
diff --git a/src/Storages/MergeTree/RPNBuilder.h b/src/Storages/MergeTree/RPNBuilder.h
index 292a120d28a..d63781db67d 100644
--- a/src/Storages/MergeTree/RPNBuilder.h
+++ b/src/Storages/MergeTree/RPNBuilder.h
@@ -1,35 +1,34 @@
 #pragma once
 
-#include <Common/typeid_cast.h>
 #include <Core/Block.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTFunction.h>
-#include <Storages/SelectQueryInfo.h>
+#include <Parsers/ASTSelectQuery.h>
 #include <Storages/MergeTree/KeyCondition.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
 {
-class Context;
 
 /// Builds reverse polish notation
 template <typename RPNElement>
-class RPNBuilder
+class RPNBuilder : WithContext
 {
 public:
     using RPN = std::vector<RPNElement>;
     using AtomFromASTFunc = std::function<
-            bool(const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out)>;
+            bool(const ASTPtr & node, ContextPtr context, Block & block_with_constants, RPNElement & out)>;
 
-    RPNBuilder(const SelectQueryInfo & query_info, const Context & context_, const AtomFromASTFunc & atomFromAST_)
-        : context(context_), atomFromAST(atomFromAST_)
+    RPNBuilder(const SelectQueryInfo & query_info, ContextPtr context_, const AtomFromASTFunc & atomFromAST_)
+        : WithContext(context_), atomFromAST(atomFromAST_)
     {
         /** Evaluation of expressions that depend only on constants.
           * For the index to be used, if it is written, for example `WHERE Date = toDate(now())`.
           */
-        block_with_constants = KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, context);
+        block_with_constants = KeyCondition::getBlockWithConstants(query_info.query, query_info.syntax_analyzer_result, getContext());
 
         /// Transform WHERE section to Reverse Polish notation
         const ASTSelectQuery & select = typeid_cast<const ASTSelectQuery &>(*query_info.query);
@@ -80,7 +79,7 @@ private:
             }
         }
 
-        if (!atomFromAST(node, context, block_with_constants, element))
+        if (!atomFromAST(node, getContext(), block_with_constants, element))
         {
             element.function = RPNElement::FUNCTION_UNKNOWN;
         }
@@ -91,6 +90,8 @@ private:
     bool operatorFromAST(const ASTFunction * func, RPNElement & out)
     {
         /// Functions AND, OR, NOT.
+        /// Also a special function `indexHint` - works as if instead of calling a function there are just parentheses
+        /// (or, the same thing - calling the function `and` from one argument).
         const ASTs & args = typeid_cast<const ASTExpressionList &>(*func->arguments).children;
 
         if (func->name == "not")
@@ -102,7 +103,7 @@ private:
         }
         else
         {
-            if (func->name == "and")
+            if (func->name == "and" || func->name == "indexHint")
                 out.function = RPNElement::FUNCTION_AND;
             else if (func->name == "or")
                 out.function = RPNElement::FUNCTION_OR;
@@ -113,7 +114,6 @@ private:
         return true;
     }
 
-    const Context & context;
     const AtomFromASTFunc & atomFromAST;
     Block block_with_constants;
     RPN rpn;
diff --git a/src/Storages/MergeTree/ReplicatedFetchList.cpp b/src/Storages/MergeTree/ReplicatedFetchList.cpp
index 82bc8ae21e0..6d4451ad3e0 100644
--- a/src/Storages/MergeTree/ReplicatedFetchList.cpp
+++ b/src/Storages/MergeTree/ReplicatedFetchList.cpp
@@ -39,7 +39,6 @@ ReplicatedFetchInfo ReplicatedFetchListElement::getInfo() const
     res.source_replica_port = source_replica_port;
     res.interserver_scheme = interserver_scheme;
     res.uri = uri;
-    res.interserver_scheme = interserver_scheme;
     res.to_detached = to_detached;
     res.elapsed = watch.elapsedSeconds();
     res.progress = progress.load(std::memory_order_relaxed);
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
index 529e3d2ab49..7f167f929e5 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
@@ -41,7 +41,7 @@ ReplicatedMergeTreeBlockOutputStream::ReplicatedMergeTreeBlockOutputStream(
     size_t max_parts_per_block_,
     bool quorum_parallel_,
     bool deduplicate_,
-    bool optimize_on_insert_,
+    ContextPtr context_,
     bool is_attach_)
     : storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
@@ -52,7 +52,7 @@ ReplicatedMergeTreeBlockOutputStream::ReplicatedMergeTreeBlockOutputStream(
     , quorum_parallel(quorum_parallel_)
     , deduplicate(deduplicate_)
     , log(&Poco::Logger::get(storage.getLogName() + " (Replicated OutputStream)"))
-    , optimize_on_insert(optimize_on_insert_)
+    , context(context_)
 {
     /// The quorum value `1` has the same meaning as if it is disabled.
     if (quorum == 1)
@@ -136,7 +136,7 @@ void ReplicatedMergeTreeBlockOutputStream::write(const Block & block)
     if (quorum)
         checkQuorumPrecondition(zookeeper);
 
-    auto part_blocks = storage.writer.splitBlockIntoParts(block, max_parts_per_block, metadata_snapshot);
+    auto part_blocks = storage.writer.splitBlockIntoParts(block, max_parts_per_block, metadata_snapshot, context);
 
     for (auto & current_block : part_blocks)
     {
@@ -144,7 +144,7 @@ void ReplicatedMergeTreeBlockOutputStream::write(const Block & block)
 
         /// Write part to the filesystem under temporary name. Calculate a checksum.
 
-        MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, metadata_snapshot, optimize_on_insert);
+        MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, metadata_snapshot, context);
 
         /// If optimize_on_insert setting is true, current_block could become empty after merge
         /// and we didn't create part.
@@ -155,18 +155,9 @@ void ReplicatedMergeTreeBlockOutputStream::write(const Block & block)
 
         if (deduplicate)
         {
-            SipHash hash;
-            part->checksums.computeTotalChecksumDataOnly(hash);
-            union
-            {
-                char bytes[16];
-                UInt64 words[2];
-            } hash_value;
-            hash.get128(hash_value.bytes);
-
             /// We add the hash from the data and partition identifier to deduplication ID.
             /// That is, do not insert the same data to the same partition twice.
-            block_id = part->info.partition_id + "_" + toString(hash_value.words[0]) + "_" + toString(hash_value.words[1]);
+            block_id = part->getZeroLevelPartBlockID();
 
             LOG_DEBUG(log, "Wrote block with ID '{}', {} rows", block_id, current_block.block.rows());
         }
@@ -181,11 +172,11 @@ void ReplicatedMergeTreeBlockOutputStream::write(const Block & block)
 
             /// Set a special error code if the block is duplicate
             int error = (deduplicate && last_block_is_duplicate) ? ErrorCodes::INSERT_WAS_DEDUPLICATED : 0;
-            PartLog::addNewPart(storage.global_context, part, watch.elapsed(), ExecutionStatus(error));
+            PartLog::addNewPart(storage.getContext(), part, watch.elapsed(), ExecutionStatus(error));
         }
         catch (...)
         {
-            PartLog::addNewPart(storage.global_context, part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
+            PartLog::addNewPart(storage.getContext(), part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
             throw;
         }
     }
@@ -209,11 +200,11 @@ void ReplicatedMergeTreeBlockOutputStream::writeExistingPart(MergeTreeData::Muta
     try
     {
         commitPart(zookeeper, part, "");
-        PartLog::addNewPart(storage.global_context, part, watch.elapsed());
+        PartLog::addNewPart(storage.getContext(), part, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewPart(storage.global_context, part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
+        PartLog::addNewPart(storage.getContext(), part, watch.elapsed(), ExecutionStatus::fromCurrentException(__PRETTY_FUNCTION__));
         throw;
     }
 }
@@ -350,13 +341,28 @@ void ReplicatedMergeTreeBlockOutputStream::commitPart(
             /// If it exists on our replica, ignore it.
             if (storage.getActiveContainingPart(existing_part_name))
             {
-                LOG_INFO(log, "Block with ID {} already exists locally as part {}; ignoring it.", block_id, existing_part_name);
                 part->is_duplicate = true;
                 last_block_is_duplicate = true;
                 ProfileEvents::increment(ProfileEvents::DuplicatedInsertedBlocks);
+                if (quorum)
+                {
+                    LOG_INFO(log, "Block with ID {} already exists locally as part {}; ignoring it, but checking quorum.", block_id, existing_part_name);
+
+                    std::string quorum_path;
+                    if (quorum_parallel)
+                        quorum_path = storage.zookeeper_path + "/quorum/parallel/" + existing_part_name;
+                    else
+                        quorum_path = storage.zookeeper_path + "/quorum/status";
+
+                    waitForQuorum(zookeeper, existing_part_name, quorum_path, quorum_info.is_active_node_value);
+                }
+                else
+                {
+                    LOG_INFO(log, "Block with ID {} already exists locally as part {}; ignoring it.", block_id, existing_part_name);
+                }
+
                 return;
             }
-
             LOG_INFO(log, "Block with ID {} already exists on other replicas as part {}; will write it locally with that name.",
                 block_id, existing_part_name);
 
@@ -495,50 +501,7 @@ void ReplicatedMergeTreeBlockOutputStream::commitPart(
                 storage.updateQuorum(part->name, false);
         }
 
-        /// We are waiting for quorum to be satisfied.
-        LOG_TRACE(log, "Waiting for quorum");
-
-        try
-        {
-            while (true)
-            {
-                zkutil::EventPtr event = std::make_shared<Poco::Event>();
-
-                std::string value;
-                /// `get` instead of `exists` so that `watch` does not leak if the node is no longer there.
-                if (!zookeeper->tryGet(quorum_info.status_path, value, nullptr, event))
-                    break;
-
-                LOG_TRACE(log, "Quorum node {} still exists, will wait for updates", quorum_info.status_path);
-
-                ReplicatedMergeTreeQuorumEntry quorum_entry(value);
-
-                /// If the node has time to disappear, and then appear again for the next insert.
-                if (quorum_entry.part_name != part->name)
-                    break;
-
-                if (!event->tryWait(quorum_timeout_ms))
-                    throw Exception("Timeout while waiting for quorum", ErrorCodes::TIMEOUT_EXCEEDED);
-
-                LOG_TRACE(log, "Quorum {} updated, will check quorum node still exists", quorum_info.status_path);
-            }
-
-            /// And what if it is possible that the current replica at this time has ceased to be active
-            /// and the quorum is marked as failed and deleted?
-            String value;
-            if (!zookeeper->tryGet(storage.replica_path + "/is_active", value, nullptr)
-                || value != quorum_info.is_active_node_value)
-                throw Exception("Replica become inactive while waiting for quorum", ErrorCodes::NO_ACTIVE_REPLICAS);
-        }
-        catch (...)
-        {
-            /// We do not know whether or not data has been inserted
-            /// - whether other replicas have time to download the part and mark the quorum as done.
-            throw Exception("Unknown status, client must retry. Reason: " + getCurrentExceptionMessage(false),
-                ErrorCodes::UNKNOWN_STATUS_OF_INSERT);
-        }
-
-        LOG_TRACE(log, "Quorum satisfied");
+        waitForQuorum(zookeeper, part->name, quorum_info.status_path, quorum_info.is_active_node_value);
     }
 }
 
@@ -550,4 +513,57 @@ void ReplicatedMergeTreeBlockOutputStream::writePrefix()
 }
 
 
+void ReplicatedMergeTreeBlockOutputStream::waitForQuorum(
+    zkutil::ZooKeeperPtr & zookeeper,
+    const std::string & part_name,
+    const std::string & quorum_path,
+    const std::string & is_active_node_value) const
+{
+    /// We are waiting for quorum to be satisfied.
+    LOG_TRACE(log, "Waiting for quorum");
+
+    try
+    {
+        while (true)
+        {
+            zkutil::EventPtr event = std::make_shared<Poco::Event>();
+
+            std::string value;
+            /// `get` instead of `exists` so that `watch` does not leak if the node is no longer there.
+            if (!zookeeper->tryGet(quorum_path, value, nullptr, event))
+                break;
+
+            LOG_TRACE(log, "Quorum node {} still exists, will wait for updates", quorum_path);
+
+            ReplicatedMergeTreeQuorumEntry quorum_entry(value);
+
+            /// If the node has time to disappear, and then appear again for the next insert.
+            if (quorum_entry.part_name != part_name)
+                break;
+
+            if (!event->tryWait(quorum_timeout_ms))
+                throw Exception("Timeout while waiting for quorum", ErrorCodes::TIMEOUT_EXCEEDED);
+
+            LOG_TRACE(log, "Quorum {} updated, will check quorum node still exists", quorum_path);
+        }
+
+        /// And what if it is possible that the current replica at this time has ceased to be active
+        /// and the quorum is marked as failed and deleted?
+        String value;
+        if (!zookeeper->tryGet(storage.replica_path + "/is_active", value, nullptr)
+            || value != is_active_node_value)
+            throw Exception("Replica become inactive while waiting for quorum", ErrorCodes::NO_ACTIVE_REPLICAS);
+    }
+    catch (...)
+    {
+        /// We do not know whether or not data has been inserted
+        /// - whether other replicas have time to download the part and mark the quorum as done.
+        throw Exception("Unknown status, client must retry. Reason: " + getCurrentExceptionMessage(false),
+            ErrorCodes::UNKNOWN_STATUS_OF_INSERT);
+    }
+
+    LOG_TRACE(log, "Quorum satisfied");
+}
+
+
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
index 860b0c4ed12..a3fce65a840 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
@@ -30,7 +30,7 @@ public:
         size_t max_parts_per_block_,
         bool quorum_parallel_,
         bool deduplicate_,
-        bool optimize_on_insert,
+        ContextPtr context_,
         // special flag to determine the ALTER TABLE ATTACH PART without the query context,
         // needed to set the special LogEntryType::ATTACH_PART
         bool is_attach_ = false);
@@ -63,6 +63,12 @@ private:
     /// Rename temporary part and commit to ZooKeeper.
     void commitPart(zkutil::ZooKeeperPtr & zookeeper, MergeTreeData::MutableDataPartPtr & part, const String & block_id);
 
+    /// Wait for quorum to be satisfied on path (quorum_path) form part (part_name)
+    /// Also checks that replica still alive.
+    void waitForQuorum(
+        zkutil::ZooKeeperPtr & zookeeper, const std::string & part_name,
+        const std::string & quorum_path, const std::string & is_active_node_value) const;
+
     StorageReplicatedMergeTree & storage;
     StorageMetadataPtr metadata_snapshot;
     size_t quorum;
@@ -77,7 +83,7 @@ private:
     using Logger = Poco::Logger;
     Poco::Logger * log;
 
-    bool optimize_on_insert;
+    ContextPtr context;
 };
 
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 701cb2fa1ed..10e2d77eb27 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -24,7 +24,7 @@ ReplicatedMergeTreeCleanupThread::ReplicatedMergeTreeCleanupThread(StorageReplic
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreeCleanupThread)")
     , log(&Poco::Logger::get(log_name))
 {
-    task = storage.global_context.getSchedulePool().createTask(log_name, [this]{ run(); });
+    task = storage.getContext()->getSchedulePool().createTask(log_name, [this]{ run(); });
 }
 
 void ReplicatedMergeTreeCleanupThread::run()
@@ -291,7 +291,7 @@ void ReplicatedMergeTreeCleanupThread::markLostReplicas(const std::unordered_map
 
     std::vector<zkutil::ZooKeeper::FutureMulti> futures;
     for (size_t i = 0; i < candidate_lost_replicas.size(); ++i)
-        futures.emplace_back(zookeeper->tryAsyncMulti(requests[i]));
+        futures.emplace_back(zookeeper->asyncTryMultiNoThrow(requests[i]));
 
     for (size_t i = 0; i < candidate_lost_replicas.size(); ++i)
     {
@@ -307,8 +307,9 @@ struct ReplicatedMergeTreeCleanupThread::NodeWithStat
 {
     String node;
     Int64 ctime = 0;
+    Int32 version = 0;
 
-    NodeWithStat(String node_, Int64 ctime_) : node(std::move(node_)), ctime(ctime_) {}
+    NodeWithStat(String node_, Int64 ctime_, Int32 version_) : node(std::move(node_)), ctime(ctime_), version(version_) {}
 
     static bool greaterByTime(const NodeWithStat & lhs, const NodeWithStat & rhs)
     {
@@ -334,7 +335,7 @@ void ReplicatedMergeTreeCleanupThread::clearOldBlocks()
         current_time - static_cast<Int64>(1000 * storage_settings->replicated_deduplication_window_seconds));
 
     /// Virtual node, all nodes that are "greater" than this one will be deleted
-    NodeWithStat block_threshold{{}, time_threshold};
+    NodeWithStat block_threshold{{}, time_threshold, 0};
 
     size_t current_deduplication_window = std::min<size_t>(timed_blocks.size(), storage_settings->replicated_deduplication_window);
     auto first_outdated_block_fixed_threshold = timed_blocks.begin() + current_deduplication_window;
@@ -342,11 +343,20 @@ void ReplicatedMergeTreeCleanupThread::clearOldBlocks()
         timed_blocks.begin(), timed_blocks.end(), block_threshold, NodeWithStat::greaterByTime);
     auto first_outdated_block = std::min(first_outdated_block_fixed_threshold, first_outdated_block_time_threshold);
 
+    auto num_nodes_to_delete = timed_blocks.end() - first_outdated_block;
+    if (!num_nodes_to_delete)
+        return;
+
+    auto last_outdated_block = timed_blocks.end() - 1;
+    LOG_TRACE(log, "Will clear {} old blocks from {} (ctime {}) to {} (ctime {})", num_nodes_to_delete,
+              first_outdated_block->node, first_outdated_block->ctime,
+              last_outdated_block->node, last_outdated_block->ctime);
+
     zkutil::AsyncResponses<Coordination::RemoveResponse> try_remove_futures;
     for (auto it = first_outdated_block; it != timed_blocks.end(); ++it)
     {
         String path = storage.zookeeper_path + "/blocks/" + it->node;
-        try_remove_futures.emplace_back(path, zookeeper->asyncTryRemove(path));
+        try_remove_futures.emplace_back(path, zookeeper->asyncTryRemove(path, it->version));
     }
 
     for (auto & pair : try_remove_futures)
@@ -359,7 +369,7 @@ void ReplicatedMergeTreeCleanupThread::clearOldBlocks()
             zookeeper->removeRecursive(path);
             cached_block_stats.erase(first_outdated_block->node);
         }
-        else if (rc == Coordination::Error::ZOK || rc == Coordination::Error::ZNONODE)
+        else if (rc == Coordination::Error::ZOK || rc == Coordination::Error::ZNONODE || rc == Coordination::Error::ZBADVERSION)
         {
             /// No node is Ok. Another replica is removing nodes concurrently.
             /// Successfully removed blocks have to be removed from cache
@@ -372,9 +382,7 @@ void ReplicatedMergeTreeCleanupThread::clearOldBlocks()
         first_outdated_block++;
     }
 
-    auto num_nodes_to_delete = timed_blocks.end() - first_outdated_block;
-    if (num_nodes_to_delete)
-        LOG_TRACE(log, "Cleared {} old blocks from ZooKeeper", num_nodes_to_delete);
+    LOG_TRACE(log, "Cleared {} old blocks from ZooKeeper", num_nodes_to_delete);
 }
 
 
@@ -419,7 +427,8 @@ void ReplicatedMergeTreeCleanupThread::getBlocksSortedByTime(zkutil::ZooKeeper &
         else
         {
             /// Cached block
-            timed_blocks.emplace_back(block, it->second);
+            const auto & ctime_and_version = it->second;
+            timed_blocks.emplace_back(block, ctime_and_version.first, ctime_and_version.second);
         }
     }
 
@@ -429,8 +438,8 @@ void ReplicatedMergeTreeCleanupThread::getBlocksSortedByTime(zkutil::ZooKeeper &
         auto status = elem.second.get();
         if (status.error != Coordination::Error::ZNONODE)
         {
-            cached_block_stats.emplace(elem.first, status.stat.ctime);
-            timed_blocks.emplace_back(elem.first, status.stat.ctime);
+            cached_block_stats.emplace(elem.first, std::make_pair(status.stat.ctime, status.stat.version));
+            timed_blocks.emplace_back(elem.first, status.stat.ctime, status.stat.version);
         }
     }
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
index 520af888621..939a40db8c8 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
@@ -58,8 +58,8 @@ private:
     /// Remove old mutations that are done from ZooKeeper. This is done by the leader replica.
     void clearOldMutations();
 
-    using NodeCTimeCache = std::map<String, Int64>;
-    NodeCTimeCache cached_block_stats;
+    using NodeCTimeAndVersionCache = std::map<String, std::pair<Int64, Int32>>;
+    NodeCTimeAndVersionCache cached_block_stats;
 
     struct NodeWithStat;
     /// Returns list of blocks (with their stat) sorted by ctime in descending order.
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index 7d8ba0e4a30..dbd55bc4ff3 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -3,6 +3,7 @@
 
 #include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h>
+#include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
@@ -53,6 +54,12 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             out << "get\n" << new_part_name;
             break;
 
+        case CLONE_PART_FROM_SHARD:
+            out << "clone_part_from_shard\n"
+                << new_part_name << "\n"
+                << "source_shard: " << source_shard;
+            break;
+
         case ATTACH_PART:
             out << "attach\n" << new_part_name << "\n"
                 << "part_checksum: " << part_checksum;
@@ -141,6 +148,10 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
             out << metadata_str;
             break;
 
+        case SYNC_PINNED_PART_UUIDS:
+            out << "sync_pinned_part_uuids\n";
+            break;
+
         default:
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown log entry type: {}", static_cast<int>(type));
     }
@@ -305,6 +316,16 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
         metadata_str.resize(metadata_size);
         in.readStrict(&metadata_str[0], metadata_size);
     }
+    else if (type_str == "sync_pinned_part_uuids")
+    {
+        type = SYNC_PINNED_PART_UUIDS;
+    }
+    else if (type_str == "clone_part_from_shard")
+    {
+        type = CLONE_PART_FROM_SHARD;
+        in >> new_part_name;
+        in >> "\nsource_shard: " >> source_shard;
+    }
 
     if (!trailing_newline_found)
         in >> "\n";
@@ -366,6 +387,12 @@ void ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry::readText(ReadBuffer & i
     in >> "columns_version: " >> columns_version;
 }
 
+bool ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry::isMovePartitionOrAttachFrom(const MergeTreePartInfo & drop_range_info)
+{
+    assert(drop_range_info.getBlocksCount() != 0);
+    return drop_range_info.getBlocksCount() == 1;
+}
+
 String ReplicatedMergeTreeLogEntryData::toString() const
 {
     WriteBufferFromOwnString out;
@@ -386,4 +413,41 @@ ReplicatedMergeTreeLogEntry::Ptr ReplicatedMergeTreeLogEntry::parse(const String
     return res;
 }
 
+Strings ReplicatedMergeTreeLogEntryData::getVirtualPartNames(MergeTreeDataFormatVersion format_version) const
+{
+    /// Doesn't produce any part
+    if (type == ALTER_METADATA)
+        return {};
+
+    /// DROP_RANGE does not add a real part, but we must disable merges in that range
+    if (type == DROP_RANGE)
+        return {new_part_name};
+
+    /// CLEAR_COLUMN and CLEAR_INDEX are deprecated since 20.3
+    if (type == CLEAR_COLUMN || type == CLEAR_INDEX)
+        return {};
+
+    if (type == REPLACE_RANGE)
+    {
+        Strings res = replace_range_entry->new_part_names;
+        auto drop_range_info = MergeTreePartInfo::fromPartName(replace_range_entry->drop_range_part_name, format_version);
+        if (!ReplaceRangeEntry::isMovePartitionOrAttachFrom(drop_range_info))
+        {
+            /// It's REPLACE, not MOVE or ATTACH, so drop range is real
+            res.emplace_back(replace_range_entry->drop_range_part_name);
+        }
+        return res;
+    }
+
+    /// Doesn't produce any part.
+    if (type == SYNC_PINNED_PART_UUIDS)
+        return {};
+
+    /// Doesn't produce any part by itself.
+    if (type == CLONE_PART_FROM_SHARD)
+        return {};
+
+    return {new_part_name};
+}
+
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index 309120560e7..12f1c78fb5d 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -6,6 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
 #include <Storages/MergeTree/MergeType.h>
+#include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
 #include <Disks/IDisk.h>
 
 #include <mutex>
@@ -18,6 +19,7 @@ namespace DB
 class ReadBuffer;
 class WriteBuffer;
 class ReplicatedMergeTreeQueue;
+struct MergeTreePartInfo;
 
 namespace ErrorCodes
 {
@@ -41,6 +43,8 @@ struct ReplicatedMergeTreeLogEntryData
         REPLACE_RANGE,  /// Drop certain range of partitions and replace them by new ones
         MUTATE_PART,    /// Apply one or several mutations to the part.
         ALTER_METADATA, /// Apply alter modification according to global /metadata and /columns paths
+        SYNC_PINNED_PART_UUIDS, /// Synchronization point for ensuring that all replicas have up to date in-memory state.
+        CLONE_PART_FROM_SHARD,  /// Clone part from another shard.
     };
 
     static String typeToString(Type type)
@@ -56,6 +60,8 @@ struct ReplicatedMergeTreeLogEntryData
             case ReplicatedMergeTreeLogEntryData::REPLACE_RANGE:    return "REPLACE_RANGE";
             case ReplicatedMergeTreeLogEntryData::MUTATE_PART:      return "MUTATE_PART";
             case ReplicatedMergeTreeLogEntryData::ALTER_METADATA:   return "ALTER_METADATA";
+            case ReplicatedMergeTreeLogEntryData::SYNC_PINNED_PART_UUIDS: return "SYNC_PINNED_PART_UUIDS";
+            case ReplicatedMergeTreeLogEntryData::CLONE_PART_FROM_SHARD:  return "CLONE_PART_FROM_SHARD";
             default:
                 throw Exception("Unknown log entry type: " + DB::toString<int>(type), ErrorCodes::LOGICAL_ERROR);
         }
@@ -74,6 +80,7 @@ struct ReplicatedMergeTreeLogEntryData
 
     Type type = EMPTY;
     String source_replica; /// Empty string means that this entry was added to the queue immediately, and not copied from the log.
+    String source_shard;
 
     String part_checksum; /// Part checksum for ATTACH_PART, empty otherwise.
 
@@ -109,6 +116,8 @@ struct ReplicatedMergeTreeLogEntryData
 
         void writeText(WriteBuffer & out) const;
         void readText(ReadBuffer & in);
+
+        static bool isMovePartitionOrAttachFrom(const MergeTreePartInfo & drop_range_info);
     };
 
     std::shared_ptr<ReplaceRangeEntry> replace_range_entry;
@@ -121,6 +130,7 @@ struct ReplicatedMergeTreeLogEntryData
     int alter_version = -1; /// May be equal to -1, if it's normal mutation, not metadata update.
 
     /// only ALTER METADATA command
+    /// NOTE It's never used
     bool have_mutation = false; /// If this alter requires additional mutation step, for data update
 
     String columns_str; /// New columns data corresponding to alter_version
@@ -128,36 +138,13 @@ struct ReplicatedMergeTreeLogEntryData
 
     /// Returns a set of parts that will appear after executing the entry + parts to block
     /// selection of merges. These parts are added to queue.virtual_parts.
-    Strings getVirtualPartNames() const
-    {
-        /// Doesn't produce any part
-        if (type == ALTER_METADATA)
-            return {};
-
-        /// DROP_RANGE does not add a real part, but we must disable merges in that range
-        if (type == DROP_RANGE)
-            return {new_part_name};
-
-        /// Return {} because selection of merges in the partition where the column is cleared
-        /// should not be blocked (only execution of merges should be blocked).
-        if (type == CLEAR_COLUMN || type == CLEAR_INDEX)
-            return {};
-
-        if (type == REPLACE_RANGE)
-        {
-            Strings res = replace_range_entry->new_part_names;
-            res.emplace_back(replace_range_entry->drop_range_part_name);
-            return res;
-        }
-
-        return {new_part_name};
-    }
+    Strings getVirtualPartNames(MergeTreeDataFormatVersion format_version) const;
 
     /// Returns set of parts that denote the block number ranges that should be blocked during the entry execution.
     /// These parts are added to future_parts.
-    Strings getBlockingPartNames() const
+    Strings getBlockingPartNames(MergeTreeDataFormatVersion format_version) const
     {
-        Strings res = getVirtualPartNames();
+        Strings res = getVirtualPartNames(format_version);
 
         if (type == CLEAR_COLUMN)
             res.emplace_back(new_part_name);
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index 95883c65abb..09b2a23767c 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -28,7 +28,7 @@ ReplicatedMergeTreePartCheckThread::ReplicatedMergeTreePartCheckThread(StorageRe
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreePartCheckThread)")
     , log(&Poco::Logger::get(log_name))
 {
-    task = storage.global_context.getSchedulePool().createTask(log_name, [this] { run(); });
+    task = storage.getContext()->getSchedulePool().createTask(log_name, [this] { run(); });
     task->schedule();
 }
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index ad41bbe1a08..439d4970aa8 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -16,7 +16,6 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int UNEXPECTED_NODE_IN_ZOOKEEPER;
-    extern const int UNFINISHED;
     extern const int ABORTED;
 }
 
@@ -63,7 +62,7 @@ bool ReplicatedMergeTreeQueue::isVirtualPart(const MergeTreeData::DataPartPtr &
 
 bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
 {
-    auto queue_path = replica_path + "/queue";
+    String queue_path = fs::path(replica_path) / "queue";
     LOG_DEBUG(log, "Loading queue from {}", queue_path);
 
     bool updated = false;
@@ -75,7 +74,7 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
         /// Reset batch size on initialization to recover from possible errors of too large batch size.
         current_multi_batch_size = 1;
 
-        String log_pointer_str = zookeeper->get(replica_path + "/log_pointer");
+        String log_pointer_str = zookeeper->get(fs::path(replica_path) / "log_pointer");
         log_pointer = log_pointer_str.empty() ? 0 : parse<UInt64>(log_pointer_str);
 
         std::unordered_set<String> already_loaded_paths;
@@ -102,7 +101,7 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
         futures.reserve(children.size());
 
         for (const String & child : children)
-            futures.emplace_back(child, zookeeper->asyncGet(queue_path + "/" + child));
+            futures.emplace_back(child, zookeeper->asyncGet(fs::path(queue_path) / child));
 
         for (auto & future : futures)
         {
@@ -117,7 +116,7 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
             updated = true;
         }
 
-        zookeeper->tryGet(replica_path + "/mutation_pointer", mutation_pointer);
+        zookeeper->tryGet(fs::path(replica_path) / "mutation_pointer", mutation_pointer);
     }
 
     updateTimesInZooKeeper(zookeeper, min_unprocessed_insert_time_changed, {});
@@ -133,7 +132,7 @@ 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())
+    for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
     {
         virtual_parts.add(virtual_part_name);
         addPartToMutations(virtual_part_name);
@@ -220,7 +219,7 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
             removeCoveredPartsFromMutations(entry->actual_new_part_name, /*remove_part = */ false, /*remove_covered_parts = */ true);
         }
 
-        for (const String & virtual_part_name : entry->getVirtualPartNames())
+        for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
         {
             current_parts.add(virtual_part_name);
 
@@ -249,7 +248,7 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
     }
     else
     {
-        for (const String & virtual_part_name : entry->getVirtualPartNames())
+        for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
         {
             /// Because execution of the entry is unsuccessful,
             /// `virtual_part_name` will never appear so we won't need to mutate
@@ -269,10 +268,9 @@ void ReplicatedMergeTreeQueue::removeCoveredPartsFromMutations(const String & pa
 
     bool some_mutations_are_probably_done = false;
 
-    auto from_it = in_partition->second.lower_bound(part_info.getDataVersion());
-    for (auto it = from_it; it != in_partition->second.end(); ++it)
+    for (auto & it : in_partition->second)
     {
-        MutationStatus & status = *it->second;
+        MutationStatus & status = *it.second;
 
         if (remove_part && remove_covered_parts)
             status.parts_to_do.removePartAndCoveredParts(part_name);
@@ -401,7 +399,7 @@ void ReplicatedMergeTreeQueue::removeProcessedEntry(zkutil::ZooKeeperPtr zookeep
     if (!need_remove_from_zk)
         return;
 
-    auto code = zookeeper->tryRemove(replica_path + "/queue/" + entry->znode_name);
+    auto code = zookeeper->tryRemove(fs::path(replica_path) / "queue" / entry->znode_name);
     if (code != Coordination::Error::ZOK)
         LOG_ERROR(log, "Couldn't remove {}/queue/{}: {}. This shouldn't happen often.", replica_path, entry->znode_name, Coordination::errorMessage(code));
 
@@ -457,7 +455,7 @@ bool ReplicatedMergeTreeQueue::remove(zkutil::ZooKeeperPtr zookeeper, const Stri
 
     notifySubscribers(queue_size);
 
-    zookeeper->tryRemove(replica_path + "/queue/" + found->znode_name);
+    zookeeper->tryRemove(fs::path(replica_path) / "queue" / found->znode_name);
     updateTimesInZooKeeper(zookeeper, min_unprocessed_insert_time_changed, max_processed_insert_time_changed);
 
     return true;
@@ -476,14 +474,14 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
     if (pull_log_blocker.isCancelled())
         throw Exception("Log pulling is cancelled", ErrorCodes::ABORTED);
 
-    String index_str = zookeeper->get(replica_path + "/log_pointer");
+    String index_str = zookeeper->get(fs::path(replica_path) / "log_pointer");
     UInt64 index;
 
     /// The version of "/log" is modified when new entries to merge/mutate/drop appear.
     Coordination::Stat stat;
-    zookeeper->get(zookeeper_path + "/log", &stat);
+    zookeeper->get(fs::path(zookeeper_path) / "log", &stat);
 
-    Strings log_entries = zookeeper->getChildrenWatch(zookeeper_path + "/log", nullptr, watch_callback);
+    Strings log_entries = zookeeper->getChildrenWatch(fs::path(zookeeper_path) / "log", nullptr, watch_callback);
 
     /// We update mutations after we have loaded the list of log entries, but before we insert them
     /// in the queue.
@@ -496,7 +494,7 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
         /// If we do not already have a pointer to the log, put a pointer to the first entry in it.
         index = log_entries.empty() ? 0 : parse<UInt64>(std::min_element(log_entries.begin(), log_entries.end())->substr(strlen("log-")));
 
-        zookeeper->set(replica_path + "/log_pointer", toString(index));
+        zookeeper->set(fs::path(replica_path) / "log_pointer", toString(index));
     }
     else
     {
@@ -543,7 +541,7 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
             futures.reserve(end - begin);
 
             for (auto it = begin; it != end; ++it)
-                futures.emplace_back(*it, zookeeper->asyncGet(zookeeper_path + "/log/" + *it));
+                futures.emplace_back(*it, zookeeper->asyncGet(fs::path(zookeeper_path) / "log" / *it));
 
             /// Simultaneously add all new entries to the queue and move the pointer to the log.
 
@@ -560,7 +558,7 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
                 copied_entries.emplace_back(LogEntry::parse(res.data, res.stat));
 
                 ops.emplace_back(zkutil::makeCreateRequest(
-                    replica_path + "/queue/queue-", res.data, zkutil::CreateMode::PersistentSequential));
+                    fs::path(replica_path) / "queue/queue-", res.data, zkutil::CreateMode::PersistentSequential));
 
                 const auto & entry = *copied_entries.back();
                 if (entry.type == LogEntry::GET_PART || entry.type == LogEntry::ATTACH_PART)
@@ -575,11 +573,11 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
             }
 
             ops.emplace_back(zkutil::makeSetRequest(
-                replica_path + "/log_pointer", toString(last_entry_index + 1), -1));
+                fs::path(replica_path) / "log_pointer", toString(last_entry_index + 1), -1));
 
             if (min_unprocessed_insert_time_changed)
                 ops.emplace_back(zkutil::makeSetRequest(
-                    replica_path + "/min_unprocessed_insert_time", toString(*min_unprocessed_insert_time_changed), -1));
+                    fs::path(replica_path) / "min_unprocessed_insert_time", toString(*min_unprocessed_insert_time_changed), -1));
 
             auto responses = zookeeper->multi(ops);
 
@@ -657,7 +655,7 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
 {
     std::lock_guard lock(update_mutations_mutex);
 
-    Strings entries_in_zk = zookeeper->getChildrenWatch(zookeeper_path + "/mutations", nullptr, watch_callback);
+    Strings entries_in_zk = zookeeper->getChildrenWatch(fs::path(zookeeper_path) / "mutations", nullptr, watch_callback);
     StringSet entries_in_zk_set(entries_in_zk.begin(), entries_in_zk.end());
 
     /// Compare with the local state, delete obsolete entries and determine which new entries to load.
@@ -714,7 +712,7 @@ 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(zookeeper_path + "/mutations/" + entry));
+            futures.emplace_back(zookeeper->asyncGet(fs::path(zookeeper_path) / "mutations" / entry));
 
         std::vector<ReplicatedMergeTreeMutationEntryPtr> new_mutations;
         for (size_t i = 0; i < entries_to_load.size(); ++i)
@@ -752,7 +750,7 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
                 /// mutation block number that would appear as a result of executing the queue.
                 for (const auto & queue_entry : queue)
                 {
-                    for (const String & produced_part_name : queue_entry->getVirtualPartNames())
+                    for (const String & produced_part_name : queue_entry->getVirtualPartNames(format_version))
                     {
                         auto part_info = MergeTreePartInfo::fromPartName(produced_part_name, format_version);
 
@@ -798,7 +796,7 @@ ReplicatedMergeTreeMutationEntryPtr ReplicatedMergeTreeQueue::removeMutation(
 {
     std::lock_guard lock(update_mutations_mutex);
 
-    auto rc = zookeeper->tryRemove(zookeeper_path + "/mutations/" + mutation_id);
+    auto rc = zookeeper->tryRemove(fs::path(zookeeper_path) / "mutations" / mutation_id);
     if (rc == Coordination::Error::ZOK)
         LOG_DEBUG(log, "Removed mutation {} from ZooKeeper.", mutation_id);
 
@@ -891,18 +889,25 @@ bool ReplicatedMergeTreeQueue::checkReplaceRangeCanBeRemoved(const MergeTreePart
 {
     if (entry_ptr->type != LogEntry::REPLACE_RANGE)
         return false;
+    assert(entry_ptr->replace_range_entry);
 
     if (current.type != LogEntry::REPLACE_RANGE && current.type != LogEntry::DROP_RANGE)
         return false;
 
-    if (entry_ptr->replace_range_entry != nullptr && entry_ptr->replace_range_entry == current.replace_range_entry) /// same partition, don't want to drop ourselves
+    if (entry_ptr->replace_range_entry == current.replace_range_entry) /// same partition, don't want to drop ourselves
         return false;
 
+    size_t number_of_covered_parts = 0;
     for (const String & new_part_name : entry_ptr->replace_range_entry->new_part_names)
-        if (!part_info.contains(MergeTreePartInfo::fromPartName(new_part_name, format_version)))
-            return false;
+    {
+        if (part_info.contains(MergeTreePartInfo::fromPartName(new_part_name, format_version)))
+            ++number_of_covered_parts;
+    }
 
-    return true;
+    /// It must either cover all new parts from REPLACE_RANGE or no one. Otherwise it's a bug in replication,
+    /// which may lead to intersecting entries.
+    assert(number_of_covered_parts == 0 || number_of_covered_parts == entry_ptr->replace_range_entry->new_part_names.size());
+    return number_of_covered_parts == entry_ptr->replace_range_entry->new_part_names.size();
 }
 
 void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
@@ -926,21 +931,21 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
     {
         auto type = (*it)->type;
 
-        if (((type == LogEntry::GET_PART ||
-              type == LogEntry::ATTACH_PART ||
-              type == LogEntry::MERGE_PARTS ||
-              type == LogEntry::MUTATE_PART)
-             && part_info.contains(MergeTreePartInfo::fromPartName((*it)->new_part_name, format_version)))
-            || checkReplaceRangeCanBeRemoved(part_info, *it, current))
+        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))
         {
             if ((*it)->currently_executing)
                 to_wait.push_back(*it);
-            auto code = zookeeper->tryRemove(replica_path + "/queue/" + (*it)->znode_name);
+            auto code = zookeeper->tryRemove(fs::path(replica_path) / "queue" / (*it)->znode_name);
             /// FIXME it's probably unsafe to remove entries non-atomically
             /// when this method called directly from alter query (not from replication queue task),
             /// because entries will be lost if ALTER fails.
             if (code != Coordination::Error::ZOK)
-                LOG_INFO(log, "Couldn't remove {}: {}", replica_path + "/queue/" + (*it)->znode_name, Coordination::errorMessage(code));
+                LOG_INFO(log, "Couldn't remove {}: {}", (fs::path(replica_path) / "queue" / (*it)->znode_name).string(), Coordination::errorMessage(code));
 
             updateStateOnQueueEntryRemoval(
                 *it, /* is_successful = */ false,
@@ -964,50 +969,6 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
 }
 
 
-size_t ReplicatedMergeTreeQueue::getConflictsCountForRange(
-    const MergeTreePartInfo & range, const LogEntry & entry,
-    String * out_description, std::lock_guard<std::mutex> & /* queue_lock */) const
-{
-    std::vector<std::pair<String, LogEntryPtr>> conflicts;
-
-    for (const auto & future_part_elem : future_parts)
-    {
-        /// Do not check itself log entry
-        if (future_part_elem.second->znode_name == entry.znode_name)
-            continue;
-
-        if (!range.isDisjoint(MergeTreePartInfo::fromPartName(future_part_elem.first, format_version)))
-        {
-            conflicts.emplace_back(future_part_elem.first, future_part_elem.second);
-            continue;
-        }
-    }
-
-    if (out_description)
-    {
-        WriteBufferFromOwnString ss;
-        ss << "Can't execute command for range " << range.getPartName() << " (entry " << entry.znode_name << "). ";
-        ss << "There are " << conflicts.size() << " currently executing entries blocking it: ";
-        for (const auto & conflict : conflicts)
-            ss << conflict.second->typeToString() << " part " << conflict.first << ", ";
-
-        *out_description = ss.str();
-    }
-
-    return conflicts.size();
-}
-
-
-void ReplicatedMergeTreeQueue::checkThereAreNoConflictsInRange(const MergeTreePartInfo & range, const LogEntry & entry)
-{
-    String conflicts_description;
-    std::lock_guard lock(state_mutex);
-
-    if (0 != getConflictsCountForRange(range, entry, &conflicts_description, lock))
-        throw Exception(conflicts_description, ErrorCodes::UNFINISHED);
-}
-
-
 bool ReplicatedMergeTreeQueue::isNotCoveredByFuturePartsImpl(const String & log_entry_name, const String & new_part_name,
                                                              String & out_reason, std::lock_guard<std::mutex> & /* queue_lock */) const
 {
@@ -1077,7 +1038,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
         || entry.type == LogEntry::ATTACH_PART
         || entry.type == LogEntry::MUTATE_PART)
     {
-        for (const String & new_part_name : entry.getBlockingPartNames())
+        for (const String & new_part_name : entry.getBlockingPartNames(format_version))
         {
             if (!isNotCoveredByFuturePartsImpl(entry.znode_name, new_part_name, out_postpone_reason, state_lock))
                 return false;
@@ -1295,7 +1256,7 @@ ReplicatedMergeTreeQueue::CurrentlyExecuting::CurrentlyExecuting(const Replicate
     ++entry->num_tries;
     entry->last_attempt_time = time(nullptr);
 
-    for (const String & new_part_name : entry->getBlockingPartNames())
+    for (const String & new_part_name : entry->getBlockingPartNames(queue.format_version))
     {
         if (!queue.future_parts.emplace(new_part_name, entry).second)
             throw Exception("Tagging already tagged future part " + new_part_name + ". This is a bug.", ErrorCodes::LOGICAL_ERROR);
@@ -1332,7 +1293,7 @@ ReplicatedMergeTreeQueue::CurrentlyExecuting::~CurrentlyExecuting()
     entry->currently_executing = false;
     entry->execution_complete.notify_all();
 
-    for (const String & new_part_name : entry->getBlockingPartNames())
+    for (const String & new_part_name : entry->getBlockingPartNames(queue.format_version))
     {
         if (!queue.future_parts.erase(new_part_name))
             LOG_ERROR(queue.log, "Untagging already untagged future part {}. This is a bug.", new_part_name);
@@ -1593,7 +1554,7 @@ bool ReplicatedMergeTreeQueue::tryFinalizeMutations(zkutil::ZooKeeperPtr zookeep
 
     if (!finished.empty())
     {
-        zookeeper->set(replica_path + "/mutation_pointer", finished.back()->znode_name);
+        zookeeper->set(fs::path(replica_path) / "mutation_pointer", finished.back()->znode_name);
 
         std::lock_guard lock(state_mutex);
 
@@ -1623,13 +1584,6 @@ bool ReplicatedMergeTreeQueue::tryFinalizeMutations(zkutil::ZooKeeperPtr zookeep
 }
 
 
-void ReplicatedMergeTreeQueue::disableMergesInBlockRange(const String & part_name)
-{
-    std::lock_guard lock(state_mutex);
-    virtual_parts.add(part_name);
-}
-
-
 ReplicatedMergeTreeQueue::Status ReplicatedMergeTreeQueue::getStatus() const
 {
     std::lock_guard lock(state_mutex);
@@ -1796,22 +1750,22 @@ ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
     }
 
     /// Load current quorum status.
-    auto quorum_status_future = zookeeper->asyncTryGet(queue.zookeeper_path + "/quorum/status");
+    auto quorum_status_future = zookeeper->asyncTryGet(fs::path(queue.zookeeper_path) / "quorum" / "status");
 
     /// Load current inserts
     std::unordered_set<String> lock_holder_paths;
-    for (const String & entry : zookeeper->getChildren(queue.zookeeper_path + "/temp"))
+    for (const String & entry : zookeeper->getChildren(fs::path(queue.zookeeper_path) / "temp"))
     {
         if (startsWith(entry, "abandonable_lock-"))
-            lock_holder_paths.insert(queue.zookeeper_path + "/temp/" + entry);
+            lock_holder_paths.insert(fs::path(queue.zookeeper_path) / "temp" / entry);
     }
 
     if (!lock_holder_paths.empty())
     {
-        Strings partitions = zookeeper->getChildren(queue.zookeeper_path + "/block_numbers");
+        Strings partitions = zookeeper->getChildren(fs::path(queue.zookeeper_path) / "block_numbers");
         std::vector<std::future<Coordination::ListResponse>> lock_futures;
         for (const String & partition : partitions)
-            lock_futures.push_back(zookeeper->asyncGetChildren(queue.zookeeper_path + "/block_numbers/" + partition));
+            lock_futures.push_back(zookeeper->asyncGetChildren(fs::path(queue.zookeeper_path) / "block_numbers" / partition));
 
         struct BlockInfoInZooKeeper
         {
@@ -1832,7 +1786,7 @@ ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
                 if (startsWith(entry, "block-"))
                 {
                     Int64 block_number = parse<Int64>(entry.substr(strlen("block-")));
-                    String zk_path = queue.zookeeper_path + "/block_numbers/" + partitions[i] + "/" + entry;
+                    String zk_path = fs::path(queue.zookeeper_path) / "block_numbers" / partitions[i] / entry;
                     block_infos.emplace_back(
                         BlockInfoInZooKeeper{partitions[i], block_number, zk_path, zookeeper->asyncTryGet(zk_path)});
                 }
@@ -1849,6 +1803,17 @@ ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
 
     merges_version = queue_.pullLogsToQueue(zookeeper);
 
+    {
+        /// We avoid returning here a version to be used in a lightweight transaction.
+        ///
+        /// When pinned parts set is changed a log entry is added to the queue in the same transaction.
+        /// The log entry serves as a synchronization point, and it also increments `merges_version`.
+        ///
+        /// If pinned parts are fetched after logs are pulled then we can safely say that it contains all locks up to `merges_version`.
+        String s = zookeeper->get(queue.zookeeper_path + "/pinned_part_uuids");
+        pinned_part_uuids.fromString(s);
+    }
+
     Coordination::GetResponse quorum_status_response = quorum_status_future.get();
     if (quorum_status_response.error == Coordination::Error::ZOK)
     {
@@ -1912,13 +1877,18 @@ bool ReplicatedMergeTreeMergePredicate::canMergeTwoParts(
 
     if (left->info.partition_id != right->info.partition_id)
     {
-        if (out_reason)
-            *out_reason = "Parts " + left->name + " and " + right->name + " belong to different partitions";
-        return false;
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Parts {} and {} belong to different partitions", left->name, right->name);
     }
 
     for (const MergeTreeData::DataPartPtr & part : {left, right})
     {
+        if (pinned_part_uuids.part_uuids.contains(part->uuid))
+        {
+            if (out_reason)
+                *out_reason = "Part " + part->name + " has uuid " + toString(part->uuid) + " which is currently pinned";
+            return false;
+        }
+
         if (part->name == inprogress_quorum_part)
         {
             if (out_reason)
@@ -2007,13 +1977,20 @@ bool ReplicatedMergeTreeMergePredicate::canMergeTwoParts(
         return false;
     }
 
-    return true;
+    return MergeTreeData::partsContainSameProjections(left, right);
 }
 
 bool ReplicatedMergeTreeMergePredicate::canMergeSinglePart(
     const MergeTreeData::DataPartPtr & part,
     String * out_reason) const
 {
+    if (pinned_part_uuids.part_uuids.contains(part->uuid))
+    {
+        if (out_reason)
+            *out_reason = "Part " + part->name + " has uuid " + toString(part->uuid) + " which is currently pinned";
+        return false;
+    }
+
     if (part->name == inprogress_quorum_part)
     {
         if (out_reason)
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index 00ef3ee7292..496f277d132 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -8,6 +8,7 @@
 #include <Storages/MergeTree/ActiveDataPartSet.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeMutationStatus.h>
+#include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeAltersSequence.h>
 
@@ -237,11 +238,6 @@ private:
         std::optional<time_t> min_unprocessed_insert_time_changed,
         std::optional<time_t> max_processed_insert_time_changed) const;
 
-    /// Returns list of currently executing parts blocking execution a command modifying specified range
-    size_t getConflictsCountForRange(
-        const MergeTreePartInfo & range, const LogEntry & entry, String * out_description,
-        std::lock_guard<std::mutex> & state_lock) const;
-
     /// Marks the element of the queue as running.
     class CurrentlyExecuting
     {
@@ -322,10 +318,6 @@ public:
       */
     void removePartProducingOpsInRange(zkutil::ZooKeeperPtr zookeeper, const MergeTreePartInfo & part_info, const ReplicatedMergeTreeLogEntryData & current);
 
-    /** Throws and exception if there are currently executing entries in the range .
-     */
-    void checkThereAreNoConflictsInRange(const MergeTreePartInfo & range, const LogEntry & 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
       * (in order to download a already merged part from another replica).
@@ -386,12 +378,6 @@ public:
     /// (because some mutations are probably done but we are not sure yet), returns true.
     bool tryFinalizeMutations(zkutil::ZooKeeperPtr zookeeper);
 
-    /// Prohibit merges in the specified blocks range.
-    /// Add part to virtual_parts, which means that part must exist
-    /// after processing replication log up to log_pointer.
-    /// Part maybe fake (look at ReplicatedMergeTreeMergePredicate).
-    void disableMergesInBlockRange(const String & part_name);
-
     /// Checks that part is already in virtual parts
     bool isVirtualPart(const MergeTreeData::DataPartPtr & data_part) const;
 
@@ -477,7 +463,7 @@ public:
 
     /// Can we assign a merge this part and some other part?
     /// For example a merge of a part and itself is needed for TTL.
-    /// This predicate is checked for the first part of each partitition.
+    /// This predicate is checked for the first part of each range.
     bool canMergeSinglePart(const MergeTreeData::DataPartPtr & part, String * out_reason) const;
 
     /// Return nonempty optional of desired mutation version and alter version.
@@ -501,6 +487,9 @@ private:
     /// (loaded at some later time than prev_virtual_parts).
     std::unordered_map<String, std::set<Int64>> committing_blocks;
 
+    /// List of UUIDs for parts that have their identity "pinned".
+    PinnedPartUUIDs pinned_part_uuids;
+
     /// Quorum state taken at some later time than prev_virtual_parts.
     String inprogress_quorum_part;
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index b3cb7c92def..7288396b58b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -47,7 +47,7 @@ ReplicatedMergeTreeRestartingThread::ReplicatedMergeTreeRestartingThread(Storage
     const auto storage_settings = storage.getSettings();
     check_period_ms = storage_settings->zookeeper_session_expiration_check_period.totalSeconds() * 1000;
 
-    task = storage.global_context.getSchedulePool().createTask(log_name, [this]{ run(); });
+    task = storage.getContext()->getSchedulePool().createTask(log_name, [this]{ run(); });
 }
 
 void ReplicatedMergeTreeRestartingThread::run()
@@ -57,7 +57,7 @@ void ReplicatedMergeTreeRestartingThread::run()
 
     try
     {
-        if (first_time || storage.getZooKeeper()->expired())
+        if (first_time || readonly_mode_was_set || storage.getZooKeeper()->expired())
         {
             startup_completed = false;
 
@@ -67,15 +67,15 @@ void ReplicatedMergeTreeRestartingThread::run()
             }
             else
             {
-                LOG_WARNING(log, "ZooKeeper session has expired. Switching to a new session.");
-
-                bool old_val = false;
-                if (storage.is_readonly.compare_exchange_strong(old_val, true))
+                if (storage.getZooKeeper()->expired())
                 {
-                    incr_readonly = true;
-                    CurrentMetrics::add(CurrentMetrics::ReadonlyReplica);
+                    LOG_WARNING(log, "ZooKeeper session has expired. Switching to a new session.");
+                    setReadonly();
+                }
+                else if (readonly_mode_was_set)
+                {
+                    LOG_WARNING(log, "Table was in readonly mode. Will try to activate it.");
                 }
-
                 partialShutdown();
             }
 
@@ -98,8 +98,14 @@ void ReplicatedMergeTreeRestartingThread::run()
 
                 if (!need_stop && !tryStartup())
                 {
+                    /// We couldn't startup replication. Table must be readonly.
+                    /// Otherwise it can have partially initialized queue and other
+                    /// strange parts of state.
+                    setReadonly();
+
                     if (first_time)
                         storage.startup_event.set();
+
                     task->scheduleAfter(retry_period_ms);
                     return;
                 }
@@ -116,7 +122,7 @@ void ReplicatedMergeTreeRestartingThread::run()
             bool old_val = true;
             if (storage.is_readonly.compare_exchange_strong(old_val, false))
             {
-                incr_readonly = false;
+                readonly_mode_was_set = false;
                 CurrentMetrics::sub(CurrentMetrics::ReadonlyReplica);
             }
 
@@ -125,6 +131,8 @@ void ReplicatedMergeTreeRestartingThread::run()
     }
     catch (...)
     {
+        /// We couldn't activate table let's set it into readonly mode
+        setReadonly();
         storage.startup_event.set();
         tryLogCurrentException(log, __PRETTY_FUNCTION__);
     }
@@ -184,7 +192,7 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
         }
         catch (const Coordination::Exception & e)
         {
-            LOG_ERROR(log, "Couldn't start replication: {}. {}", e.what(), DB::getCurrentExceptionMessage(true));
+            LOG_ERROR(log, "Couldn't start replication (table will be in readonly mode): {}. {}", e.what(), DB::getCurrentExceptionMessage(true));
             return false;
         }
         catch (const Exception & e)
@@ -192,7 +200,7 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
             if (e.code() != ErrorCodes::REPLICA_IS_ALREADY_ACTIVE)
                 throw;
 
-            LOG_ERROR(log, "Couldn't start replication: {}. {}", e.what(), DB::getCurrentExceptionMessage(true));
+            LOG_ERROR(log, "Couldn't start replication (table will be in readonly mode): {}. {}", e.what(), DB::getCurrentExceptionMessage(true));
             return false;
         }
     }
@@ -230,7 +238,7 @@ void ReplicatedMergeTreeRestartingThread::updateQuorumIfWeHavePart()
     auto zookeeper = storage.getZooKeeper();
 
     String quorum_str;
-    if (zookeeper->tryGet(storage.zookeeper_path + "/quorum/status", quorum_str))
+    if (zookeeper->tryGet(fs::path(storage.zookeeper_path) / "quorum" / "status", quorum_str))
     {
         ReplicatedMergeTreeQuorumEntry quorum_entry(quorum_str);
 
@@ -243,12 +251,12 @@ void ReplicatedMergeTreeRestartingThread::updateQuorumIfWeHavePart()
     }
 
     Strings part_names;
-    String parallel_quorum_parts_path = storage.zookeeper_path + "/quorum/parallel";
+    String parallel_quorum_parts_path = fs::path(storage.zookeeper_path) / "quorum" / "parallel";
     if (zookeeper->tryGetChildren(parallel_quorum_parts_path, part_names) == Coordination::Error::ZOK)
     {
         for (auto & part_name : part_names)
         {
-            if (zookeeper->tryGet(parallel_quorum_parts_path + "/" + part_name, quorum_str))
+            if (zookeeper->tryGet(fs::path(parallel_quorum_parts_path) / part_name, quorum_str))
             {
                 ReplicatedMergeTreeQuorumEntry quorum_entry(quorum_str);
                 if (!quorum_entry.replicas.count(storage.replica_name)
@@ -270,7 +278,7 @@ void ReplicatedMergeTreeRestartingThread::activateReplica()
     /// How other replicas can access this one.
     ReplicatedMergeTreeAddress address = storage.getReplicatedMergeTreeAddress();
 
-    String is_active_path = storage.replica_path + "/is_active";
+    String is_active_path = fs::path(storage.replica_path) / "is_active";
 
     /** If the node is marked as active, but the mark is made in the same instance, delete it.
       * This is possible only when session in ZooKeeper expires.
@@ -294,7 +302,7 @@ void ReplicatedMergeTreeRestartingThread::activateReplica()
     /// Simultaneously declare that this replica is active, and update the host.
     Coordination::Requests ops;
     ops.emplace_back(zkutil::makeCreateRequest(is_active_path, active_node_identifier, zkutil::CreateMode::Ephemeral));
-    ops.emplace_back(zkutil::makeSetRequest(storage.replica_path + "/host", address.toString(), -1));
+    ops.emplace_back(zkutil::makeSetRequest(fs::path(storage.replica_path) / "host", address.toString(), -1));
 
     try
     {
@@ -303,7 +311,7 @@ void ReplicatedMergeTreeRestartingThread::activateReplica()
     catch (const Coordination::Exception & e)
     {
         String existing_replica_host;
-        zookeeper->tryGet(storage.replica_path + "/host", existing_replica_host);
+        zookeeper->tryGet(fs::path(storage.replica_path) / "host", existing_replica_host);
 
         if (existing_replica_host.empty())
             existing_replica_host = "without host node";
@@ -356,14 +364,24 @@ void ReplicatedMergeTreeRestartingThread::shutdown()
     LOG_TRACE(log, "Restarting thread finished");
 
     /// For detach table query, we should reset the ReadonlyReplica metric.
-    if (incr_readonly)
+    if (readonly_mode_was_set)
     {
         CurrentMetrics::sub(CurrentMetrics::ReadonlyReplica);
-        incr_readonly = false;
+        readonly_mode_was_set = false;
     }
 
     /// Stop other tasks.
     partialShutdown();
 }
 
+void ReplicatedMergeTreeRestartingThread::setReadonly()
+{
+    bool old_val = false;
+    if (storage.is_readonly.compare_exchange_strong(old_val, true))
+    {
+        readonly_mode_was_set = true;
+        CurrentMetrics::add(CurrentMetrics::ReadonlyReplica);
+    }
+}
+
 }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index 824ed73c171..cb10d628349 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -37,7 +37,7 @@ private:
     std::atomic<bool> need_stop {false};
 
     // We need it besides `storage.is_readonly`, because `shutdown()` may be called many times, that way `storage.is_readonly` will not change.
-    bool incr_readonly = false;
+    bool readonly_mode_was_set = false;
 
     /// The random data we wrote into `/replicas/me/is_active`.
     String active_node_identifier;
@@ -62,6 +62,9 @@ private:
     void updateQuorumIfWeHavePart();
 
     void partialShutdown();
+
+    /// Set readonly mode for table
+    void setReadonly();
 };
 
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
index ac1c92849d5..db1c2bc89af 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
@@ -56,6 +56,9 @@ ReplicatedMergeTreeTableMetadata::ReplicatedMergeTreeTableMetadata(const MergeTr
     ttl_table = formattedAST(metadata_snapshot->getTableTTLs().definition_ast);
 
     skip_indices = metadata_snapshot->getSecondaryIndices().toString();
+
+    projections = metadata_snapshot->getProjections().toString();
+
     if (data.canUseAdaptiveGranularity())
         index_granularity_bytes = data_settings->index_granularity_bytes;
     else
@@ -89,6 +92,9 @@ void ReplicatedMergeTreeTableMetadata::write(WriteBuffer & out) const
     if (!skip_indices.empty())
         out << "indices: " << skip_indices << "\n";
 
+    if (!projections.empty())
+        out << "projections: " << projections << "\n";
+
     if (index_granularity_bytes != 0)
         out << "granularity bytes: " << index_granularity_bytes << "\n";
 
@@ -130,6 +136,9 @@ void ReplicatedMergeTreeTableMetadata::read(ReadBuffer & in)
     if (checkString("indices: ", in))
         in >> skip_indices >> "\n";
 
+    if (checkString("projections: ", in))
+        in >> projections >> "\n";
+
     if (checkString("granularity bytes: ", in))
     {
         in >> index_granularity_bytes >> "\n";
@@ -205,7 +214,7 @@ void ReplicatedMergeTreeTableMetadata::checkImmutableFieldsEquals(const Replicat
 
 }
 
-void ReplicatedMergeTreeTableMetadata::checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, const Context & context) const
+void ReplicatedMergeTreeTableMetadata::checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, ContextPtr context) const
 {
 
     checkImmutableFieldsEquals(from_zk);
@@ -243,6 +252,17 @@ void ReplicatedMergeTreeTableMetadata::checkEquals(const ReplicatedMergeTreeTabl
                 ErrorCodes::METADATA_MISMATCH);
     }
 
+    String parsed_zk_projections = ProjectionsDescription::parse(from_zk.projections, columns, context).toString();
+    if (projections != parsed_zk_projections)
+    {
+        throw Exception(
+                "Existing table metadata in ZooKeeper differs in projections."
+                " Stored in ZooKeeper: " + from_zk.projections +
+                ", parsed from ZooKeeper: " + parsed_zk_projections +
+                ", local: " + projections,
+                ErrorCodes::METADATA_MISMATCH);
+    }
+
     String parsed_zk_constraints = ConstraintsDescription::parse(from_zk.constraints).toString();
     if (constraints != parsed_zk_constraints)
     {
@@ -293,6 +313,12 @@ ReplicatedMergeTreeTableMetadata::checkAndFindDiff(const ReplicatedMergeTreeTabl
         diff.new_skip_indices = from_zk.skip_indices;
     }
 
+    if (projections != from_zk.projections)
+    {
+        diff.projections_changed = true;
+        diff.new_projections = from_zk.projections;
+    }
+
     if (constraints != from_zk.constraints)
     {
         diff.constraints_changed = true;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
index c1c34637664..d7cd215c2db 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
@@ -27,6 +27,7 @@ struct ReplicatedMergeTreeTableMetadata
     String partition_key;
     String sorting_key;
     String skip_indices;
+    String projections;
     String constraints;
     String ttl_table;
     UInt64 index_granularity_bytes;
@@ -54,16 +55,20 @@ struct ReplicatedMergeTreeTableMetadata
         bool constraints_changed = false;
         String new_constraints;
 
+        bool projections_changed = false;
+        String new_projections;
+
         bool ttl_table_changed = false;
         String new_ttl_table;
 
         bool empty() const
         {
-            return !sorting_key_changed && !sampling_expression_changed && !skip_indices_changed && !ttl_table_changed && !constraints_changed;
+            return !sorting_key_changed && !sampling_expression_changed && !skip_indices_changed && !projections_changed
+                && !ttl_table_changed && !constraints_changed;
         }
     };
 
-    void checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, const Context & context) const;
+    void checkEquals(const ReplicatedMergeTreeTableMetadata & from_zk, const ColumnsDescription & columns, ContextPtr context) const;
 
     Diff checkAndFindDiff(const ReplicatedMergeTreeTableMetadata & from_zk) const;
 
diff --git a/src/Storages/MergeTree/SimpleMergeSelector.cpp b/src/Storages/MergeTree/SimpleMergeSelector.cpp
index 972c6ea6ecb..0775e021c76 100644
--- a/src/Storages/MergeTree/SimpleMergeSelector.cpp
+++ b/src/Storages/MergeTree/SimpleMergeSelector.cpp
@@ -3,6 +3,7 @@
 #include <Common/interpolate.h>
 
 #include <cmath>
+#include <cassert>
 #include <iostream>
 
 
@@ -168,7 +169,8 @@ void selectWithinPartition(
 
         for (size_t end = begin + 2; end <= parts_count; ++end)
         {
-            if (settings.max_parts_to_merge_at_once && end - begin > settings.max_parts_to_merge_at_once)
+            assert(end > begin);
+            if (settings.max_parts_to_merge_at_once && end - begin > settings.max_parts_to_merge_at_once) //-V658
                 break;
 
             if (!parts[end - 1].shall_participate_in_merges)
diff --git a/src/Storages/MergeTree/SimpleMergeSelector.h b/src/Storages/MergeTree/SimpleMergeSelector.h
index 4f277ad74cd..af339dbfa24 100644
--- a/src/Storages/MergeTree/SimpleMergeSelector.h
+++ b/src/Storages/MergeTree/SimpleMergeSelector.h
@@ -88,7 +88,7 @@ class SimpleMergeSelector final : public IMergeSelector
 public:
     struct Settings
     {
-        /// Zero means unlimited.
+        /// Zero means unlimited. Can be overridden by the same merge tree setting.
         size_t max_parts_to_merge_at_once = 100;
 
         /** Minimum ratio of size of one part to all parts in set of parts to merge (for usual cases).
diff --git a/src/Storages/MergeTree/StorageFromBasePartsOfProjection.h b/src/Storages/MergeTree/StorageFromBasePartsOfProjection.h
new file mode 100644
index 00000000000..13d835d13a0
--- /dev/null
+++ b/src/Storages/MergeTree/StorageFromBasePartsOfProjection.h
@@ -0,0 +1,75 @@
+#pragma once
+
+#include <Core/Defines.h>
+#include <Processors/QueryPipeline.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Storages/IStorage.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+
+#include <ext/shared_ptr_helper.h>
+
+
+namespace DB
+{
+/// A Storage that allows reading from a single MergeTree data part.
+class StorageFromBasePartsOfProjection final : public ext::shared_ptr_helper<StorageFromBasePartsOfProjection>, public IStorage
+{
+    friend struct ext::shared_ptr_helper<StorageFromBasePartsOfProjection>;
+
+public:
+    String getName() const override { return "FromBasePartsOfProjection"; }
+
+    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
+    {
+        // NOTE: It's used to read normal parts only
+        QueryPlan query_plan = std::move(*MergeTreeDataSelectExecutor(storage).readFromParts(
+            {},
+            column_names,
+            metadata_snapshot,
+            metadata_snapshot,
+            query_info,
+            context,
+            max_block_size,
+            num_streams,
+            nullptr,
+            query_info.projection ? query_info.projection->merge_tree_data_select_base_cache.get()
+                                  : query_info.merge_tree_data_select_cache.get()));
+
+        return query_plan.convertToPipe(
+            QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
+    }
+
+
+    bool supportsIndexForIn() const override { return true; }
+
+    bool mayBenefitFromIndexForIn(
+        const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override
+    {
+        return storage.mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
+    }
+
+    NamesAndTypesList getVirtuals() const override { return storage.getVirtuals(); }
+
+protected:
+    StorageFromBasePartsOfProjection(const MergeTreeData & storage_, const StorageMetadataPtr & metadata_snapshot)
+        : IStorage(storage_.getStorageID()), storage(storage_)
+    {
+        setInMemoryMetadata(*metadata_snapshot);
+    }
+
+
+private:
+    const MergeTreeData & storage;
+};
+
+}
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index b7579a3b7ea..dff864bc58c 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -26,58 +26,81 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
         unsigned num_streams) override
     {
-        QueryPlan query_plan =
-            std::move(*MergeTreeDataSelectExecutor(part->storage)
-                      .readFromParts({part}, column_names, metadata_snapshot, query_info, context, max_block_size, num_streams));
+        // NOTE: It's used to read normal parts only
+        QueryPlan query_plan = std::move(*MergeTreeDataSelectExecutor(parts.front()->storage)
+                                              .readFromParts(
+                                                  parts,
+                                                  column_names,
+                                                  metadata_snapshot,
+                                                  metadata_snapshot,
+                                                  query_info,
+                                                  context,
+                                                  max_block_size,
+                                                  num_streams));
 
-        return query_plan.convertToPipe(QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
+        return query_plan.convertToPipe(
+            QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
     }
 
 
     bool supportsIndexForIn() const override { return true; }
 
     bool mayBenefitFromIndexForIn(
-        const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override
+        const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override
     {
-        return part->storage.mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
+        return parts.front()->storage.mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
     }
 
     NamesAndTypesList getVirtuals() const override
     {
-        return part->storage.getVirtuals();
+        return parts.front()->storage.getVirtuals();
     }
 
     String getPartitionId() const
     {
-        return part->info.partition_id;
+        return parts.front()->info.partition_id;
     }
 
-    String getPartitionIDFromQuery(const ASTPtr & ast, const Context & context) const
+    String getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr context) const
     {
-        return part->storage.getPartitionIDFromQuery(ast, context);
+        return parts.front()->storage.getPartitionIDFromQuery(ast, context);
     }
 
 protected:
     StorageFromMergeTreeDataPart(const MergeTreeData::DataPartPtr & part_)
         : IStorage(getIDFromPart(part_))
-        , part(part_)
+        , parts({part_})
     {
         setInMemoryMetadata(part_->storage.getInMemoryMetadata());
     }
 
+    StorageFromMergeTreeDataPart(MergeTreeData::DataPartsVector && parts_)
+        : IStorage(getIDFromParts(parts_))
+        , parts(std::move(parts_))
+    {
+        setInMemoryMetadata(parts.front()->storage.getInMemoryMetadata());
+    }
+
 private:
-    MergeTreeData::DataPartPtr part;
+    MergeTreeData::DataPartsVector parts;
 
     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/checkDataPart.cpp b/src/Storages/MergeTree/checkDataPart.cpp
index ac28f84db43..8a234833da7 100644
--- a/src/Storages/MergeTree/checkDataPart.cpp
+++ b/src/Storages/MergeTree/checkDataPart.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <optional>
 
-#include <Poco/File.h>
 #include <Poco/DirectoryIterator.h>
 
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
@@ -29,6 +28,7 @@ namespace ErrorCodes
     extern const int CANNOT_ALLOCATE_MEMORY;
     extern const int CANNOT_MUNMAP;
     extern const int CANNOT_MREMAP;
+    extern const int UNEXPECTED_FILE_IN_DATA_PART;
 }
 
 
@@ -45,6 +45,7 @@ bool isNotEnoughMemoryErrorCode(int code)
 
 
 IMergeTreeDataPart::Checksums checkDataPart(
+    MergeTreeData::DataPartPtr data_part,
     const DiskPtr & disk,
     const String & full_relative_path,
     const NamesAndTypesList & columns_list,
@@ -68,7 +69,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
     NamesAndTypesList columns_txt;
 
     {
-        auto buf = disk->readFile(path + "columns.txt");
+        auto buf = disk->readFile(fs::path(path) / "columns.txt");
         columns_txt.readText(*buf);
         assertEOF(*buf);
     }
@@ -98,12 +99,100 @@ IMergeTreeDataPart::Checksums checkDataPart(
     };
 
     /// This function calculates only checksum of file content (compressed or uncompressed).
-    auto checksum_file = [](const DiskPtr & disk_, const String & file_path)
+    /// It also calculates checksum of projections.
+    auto checksum_file = [&](const String & file_path, const String & file_name)
     {
-        auto file_buf = disk_->readFile(file_path);
-        HashingReadBuffer hashing_buf(*file_buf);
-        hashing_buf.ignoreAll();
-        return IMergeTreeDataPart::Checksums::Checksum{hashing_buf.count(), hashing_buf.getHash()};
+        if (disk->isDirectory(file_path) && endsWith(file_name, ".proj") && !startsWith(file_name, "tmp_")) // ignore projection tmp merge dir
+        {
+            auto projection_name = file_name.substr(0, file_name.size() - sizeof(".proj") + 1);
+            auto pit = data_part->getProjectionParts().find(projection_name);
+            if (pit == data_part->getProjectionParts().end())
+            {
+                if (require_checksums)
+                    throw Exception("Unexpected file " + file_name + " in data part", ErrorCodes::UNEXPECTED_FILE_IN_DATA_PART);
+                else
+                    return;
+            }
+
+            const auto & projection = pit->second;
+            IMergeTreeDataPart::Checksums projection_checksums_data;
+            const auto & projection_path = file_path;
+
+            if (part_type == MergeTreeDataPartType::COMPACT)
+            {
+                auto proj_path = file_path + MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION;
+                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());
+            }
+            else
+            {
+                const NamesAndTypesList & projection_columns_list = projection->getColumns();
+                for (const auto & projection_column : projection_columns_list)
+                {
+                    auto serialization = IDataType::getSerialization(projection_column, [&](const String & stream_name)
+                    {
+                        return disk->exists(stream_name + IMergeTreeDataPart::DATA_FILE_EXTENSION);
+                    });
+
+                    serialization->enumerateStreams(
+                        [&](const ISerialization::SubstreamPath & substream_path)
+                        {
+                            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);
+                        },
+                        {});
+                }
+            }
+
+            IMergeTreeDataPart::Checksums projection_checksums_txt;
+
+            if (require_checksums || disk->exists(projection_path + "checksums.txt"))
+            {
+                auto buf = disk->readFile(projection_path + "checksums.txt");
+                projection_checksums_txt.read(*buf);
+                assertEOF(*buf);
+            }
+
+            const auto & projection_checksum_files_txt = projection_checksums_txt.files;
+            for (auto projection_it = disk->iterateDirectory(projection_path); projection_it->isValid(); projection_it->next())
+            {
+                const String & projection_file_name = projection_it->name();
+                auto projection_checksum_it = projection_checksums_data.files.find(projection_file_name);
+
+                /// Skip files that we already calculated. Also skip metadata files that are not checksummed.
+                if (projection_checksum_it == projection_checksums_data.files.end() && !files_without_checksums.count(projection_file_name))
+                {
+                    auto projection_txt_checksum_it = projection_checksum_files_txt.find(file_name);
+                    if (projection_txt_checksum_it == projection_checksum_files_txt.end()
+                        || projection_txt_checksum_it->second.uncompressed_size == 0)
+                    {
+                        auto projection_file_buf = disk->readFile(projection_it->path());
+                        HashingReadBuffer projection_hashing_buf(*projection_file_buf);
+                        projection_hashing_buf.ignoreAll();
+                        projection_checksums_data.files[projection_file_name] = IMergeTreeDataPart::Checksums::Checksum(
+                            projection_hashing_buf.count(), projection_hashing_buf.getHash());
+                    }
+                    else
+                    {
+                        projection_checksums_data.files[projection_file_name] = checksum_compressed_file(disk, projection_it->path());
+                    }
+                }
+            }
+            checksums_data.files[file_name] = IMergeTreeDataPart::Checksums::Checksum(
+                projection_checksums_data.getTotalSizeOnDisk(), projection_checksums_data.getTotalChecksumUInt128());
+
+            if (require_checksums || !projection_checksums_txt.files.empty())
+                projection_checksums_txt.checkEqual(projection_checksums_data, false);
+        }
+        else
+        {
+            auto file_buf = disk->readFile(file_path);
+            HashingReadBuffer hashing_buf(*file_buf);
+            hashing_buf.ignoreAll();
+            checksums_data.files[file_name] = IMergeTreeDataPart::Checksums::Checksum(hashing_buf.count(), hashing_buf.getHash());
+        }
     };
 
     bool check_uncompressed = true;
@@ -111,7 +200,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
     if (part_type == MergeTreeDataPartType::COMPACT)
     {
         const auto & file_name = MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION;
-        checksums_data.files[file_name] = checksum_file(disk, path + file_name);
+        checksum_file(path + file_name, file_name);
         /// Uncompressed checksums in compact parts are computed in a complex way.
         /// We check only checksum of compressed file.
         check_uncompressed = false;
@@ -141,9 +230,9 @@ IMergeTreeDataPart::Checksums checkDataPart(
     /// Checksums from the rest files listed in checksums.txt. May be absent. If present, they are subsequently compared with the actual data checksums.
     IMergeTreeDataPart::Checksums checksums_txt;
 
-    if (require_checksums || disk->exists(path + "checksums.txt"))
+    if (require_checksums || disk->exists(fs::path(path) / "checksums.txt"))
     {
-        auto buf = disk->readFile(path + "checksums.txt");
+        auto buf = disk->readFile(fs::path(path) / "checksums.txt");
         checksums_txt.read(*buf);
         assertEOF(*buf);
     }
@@ -161,9 +250,9 @@ IMergeTreeDataPart::Checksums checkDataPart(
             if (txt_checksum_it == checksum_files_txt.end() || txt_checksum_it->second.uncompressed_size == 0)
             {
                 /// The file is not compressed.
-                checksums_data.files[file_name] = checksum_file(disk, it->path());
+                checksum_file(it->path(), file_name);
             }
-            else /// If we have both compressed and uncompressed in txt, than calculate them
+            else /// If we have both compressed and uncompressed in txt, then calculate them
             {
                 checksums_data.files[file_name] = checksum_compressed_file(disk, it->path());
             }
@@ -196,6 +285,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
         return checkDataPartInMemory(part_in_memory);
 
     return checkDataPart(
+        data_part,
         data_part->volume->getDisk(),
         data_part->getFullRelativePath(),
         data_part->getColumns(),
diff --git a/src/Storages/MergeTree/tests/CMakeLists.txt b/src/Storages/MergeTree/examples/CMakeLists.txt
similarity index 100%
rename from src/Storages/MergeTree/tests/CMakeLists.txt
rename to src/Storages/MergeTree/examples/CMakeLists.txt
diff --git a/src/Storages/MergeTree/tests/wal_action_metadata.cpp b/src/Storages/MergeTree/examples/wal_action_metadata.cpp
similarity index 100%
rename from src/Storages/MergeTree/tests/wal_action_metadata.cpp
rename to src/Storages/MergeTree/examples/wal_action_metadata.cpp
diff --git a/src/Storages/MergeTree/localBackup.cpp b/src/Storages/MergeTree/localBackup.cpp
index 7d7dacaeaf1..2e02481e065 100644
--- a/src/Storages/MergeTree/localBackup.cpp
+++ b/src/Storages/MergeTree/localBackup.cpp
@@ -29,7 +29,7 @@ static void localBackupImpl(const DiskPtr & disk, const String & source_path, co
     for (auto it = disk->iterateDirectory(source_path); it->isValid(); it->next())
     {
         auto source = it->path();
-        auto destination = destination_path + "/" + it->name();
+        auto destination = fs::path(destination_path) / it->name();
 
         if (!disk->isDirectory(source))
         {
@@ -74,13 +74,16 @@ void localBackup(const DiskPtr & disk, const String & source_path, const String
 
             continue;
         }
-        catch (const Poco::FileNotFoundException &)
+        catch (const fs::filesystem_error & e)
         {
-            ++try_no;
-            if (try_no == max_tries)
-                throw;
-
-            continue;
+            if (e.code() == std::errc::no_such_file_or_directory)
+            {
+                ++try_no;
+                if (try_no == max_tries)
+                    throw;
+                continue;
+            }
+            throw;
         }
 
         break;
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 6dd005736f0..ce7fc38b904 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -184,9 +184,9 @@ appendGraphitePattern(const Poco::Util::AbstractConfiguration & config, const St
     patterns.emplace_back(pattern);
 }
 
-static void setGraphitePatternsFromConfig(const Context & context, const String & config_element, Graphite::Params & params)
+static void setGraphitePatternsFromConfig(ContextPtr context, const String & config_element, Graphite::Params & params)
 {
-    const auto & config = context.getConfigRef();
+    const auto & config = context->getConfigRef();
 
     if (!config.has(config_element))
         throw Exception("No '" + config_element + "' element in configuration file", ErrorCodes::NO_ELEMENTS_IN_CONFIG);
@@ -290,7 +290,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
     bool is_extended_storage_def = args.storage_def->partition_by || args.storage_def->primary_key || args.storage_def->order_by
         || args.storage_def->sample_by || (args.query.columns_list->indices && !args.query.columns_list->indices->children.empty())
-        || args.storage_def->settings;
+        || (args.query.columns_list->projections && !args.query.columns_list->projections->children.empty()) || args.storage_def->settings;
 
     String name_part = args.engine_name.substr(0, args.engine_name.size() - strlen("MergeTree"));
 
@@ -429,7 +429,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
                 /// Do not try evaluate array or tuple, because it's array or tuple of column identifiers.
                 if (arg_func->name == "array" || arg_func->name == "tuple")
                     continue;
-                Field value = evaluateConstantExpression(arg, args.local_context).first;
+                Field value = evaluateConstantExpression(arg, args.getLocalContext()).first;
                 arg = std::make_shared<ASTLiteral>(value);
             }
         }
@@ -481,9 +481,9 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         {
             /// Try use default values if arguments are not specified.
             /// Note: {uuid} macro works for ON CLUSTER queries when database engine is Atomic.
-            zookeeper_path = args.context.getConfigRef().getString("default_replica_path", "/clickhouse/tables/{uuid}/{shard}");
+            zookeeper_path = args.getContext()->getConfigRef().getString("default_replica_path", "/clickhouse/tables/{uuid}/{shard}");
             /// TODO maybe use hostname if {replica} is not defined?
-            replica_name = args.context.getConfigRef().getString("default_replica_name", "{replica}");
+            replica_name = args.getContext()->getConfigRef().getString("default_replica_name", "{replica}");
 
             /// Modify query, so default values will be written to metadata
             assert(arg_num == 0);
@@ -503,8 +503,8 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             throw Exception("Expected two string literal arguments: zookeeper_path and replica_name", ErrorCodes::BAD_ARGUMENTS);
 
         /// Allow implicit {uuid} macros only for zookeeper_path in ON CLUSTER queries
-        bool is_on_cluster = args.local_context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
-        bool is_replicated_database = args.local_context.getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY &&
+        bool is_on_cluster = args.getLocalContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
+        bool is_replicated_database = args.getLocalContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY &&
                                       DatabaseCatalog::instance().getDatabase(args.table_id.database_name)->getEngineName() == "Replicated";
         bool allow_uuid_macro = is_on_cluster || is_replicated_database || args.query.attach;
 
@@ -521,11 +521,11 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             info.table_id = args.table_id;
             if (!allow_uuid_macro)
                 info.table_id.uuid = UUIDHelpers::Nil;
-            zookeeper_path = args.context.getMacros()->expand(zookeeper_path, info);
+            zookeeper_path = args.getContext()->getMacros()->expand(zookeeper_path, info);
 
             info.level = 0;
             info.table_id.uuid = UUIDHelpers::Nil;
-            replica_name = args.context.getMacros()->expand(replica_name, info);
+            replica_name = args.getContext()->getMacros()->expand(replica_name, info);
         }
 
         ast_zk_path->value = zookeeper_path;
@@ -537,11 +537,11 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         info.table_id = args.table_id;
         if (!allow_uuid_macro)
             info.table_id.uuid = UUIDHelpers::Nil;
-        zookeeper_path = args.context.getMacros()->expand(zookeeper_path, info);
+        zookeeper_path = args.getContext()->getMacros()->expand(zookeeper_path, info);
 
         info.level = 0;
         info.table_id.uuid = UUIDHelpers::Nil;
-        replica_name = args.context.getMacros()->expand(replica_name, info);
+        replica_name = args.getContext()->getMacros()->expand(replica_name, info);
 
         /// We do not allow renaming table with these macros in metadata, because zookeeper_path will be broken after RENAME TABLE.
         /// NOTE: it may happen if table was created by older version of ClickHouse (< 20.10) and macros was not unfolded on table creation
@@ -600,7 +600,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             throw Exception(error_msg, ErrorCodes::BAD_ARGUMENTS);
 
         --arg_cnt;
-        setGraphitePatternsFromConfig(args.context, graphite_config_name, merging_params.graphite_params);
+        setGraphitePatternsFromConfig(args.getContext(), graphite_config_name, merging_params.graphite_params);
     }
     else if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
     {
@@ -625,13 +625,14 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     String date_column_name;
 
     StorageInMemoryMetadata metadata;
-    metadata.columns = args.columns;
+    metadata.setColumns(args.columns);
+    metadata.setComment(args.comment);
 
     std::unique_ptr<MergeTreeSettings> storage_settings;
     if (replicated)
-        storage_settings = std::make_unique<MergeTreeSettings>(args.context.getReplicatedMergeTreeSettings());
+        storage_settings = std::make_unique<MergeTreeSettings>(args.getContext()->getReplicatedMergeTreeSettings());
     else
-        storage_settings = std::make_unique<MergeTreeSettings>(args.context.getMergeTreeSettings());
+        storage_settings = std::make_unique<MergeTreeSettings>(args.getContext()->getMergeTreeSettings());
 
     if (is_extended_storage_def)
     {
@@ -642,7 +643,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// Partition key may be undefined, but despite this we store it's empty
         /// value in partition_key structure. MergeTree checks this case and use
         /// single default partition with name "all".
-        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_key, metadata.columns, args.context);
+        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_key, metadata.columns, args.getContext());
 
         /// PRIMARY KEY without ORDER BY is allowed and considered as ORDER BY.
         if (!args.storage_def->order_by && args.storage_def->primary_key)
@@ -660,33 +661,40 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// before storage creation. After that storage will just copy this
         /// column if sorting key will be changed.
         metadata.sorting_key = KeyDescription::getSortingKeyFromAST(
-            args.storage_def->order_by->ptr(), metadata.columns, args.context, merging_param_key_arg);
+            args.storage_def->order_by->ptr(), metadata.columns, args.getContext(), merging_param_key_arg);
 
         /// If primary key explicitly defined, than get it from AST
         if (args.storage_def->primary_key)
         {
-            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.context);
+            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.getContext());
         }
         else /// Otherwise we don't have explicit primary key and copy it from order by
         {
-            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->order_by->ptr(), metadata.columns, args.context);
+            metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->order_by->ptr(), metadata.columns, args.getContext());
             /// and set it's definition_ast to nullptr (so isPrimaryKeyDefined()
             /// will return false but hasPrimaryKey() will return true.
             metadata.primary_key.definition_ast = nullptr;
         }
 
         if (args.storage_def->sample_by)
-            metadata.sampling_key = KeyDescription::getKeyFromAST(args.storage_def->sample_by->ptr(), metadata.columns, args.context);
+            metadata.sampling_key = KeyDescription::getKeyFromAST(args.storage_def->sample_by->ptr(), metadata.columns, args.getContext());
 
         if (args.storage_def->ttl_table)
         {
             metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
-                args.storage_def->ttl_table->ptr(), metadata.columns, args.context, metadata.primary_key);
+                args.storage_def->ttl_table->ptr(), metadata.columns, args.getContext(), metadata.primary_key);
         }
 
         if (args.query.columns_list && args.query.columns_list->indices)
             for (auto & index : args.query.columns_list->indices->children)
-                metadata.secondary_indices.push_back(IndexDescription::getIndexFromAST(index, args.columns, args.context));
+                metadata.secondary_indices.push_back(IndexDescription::getIndexFromAST(index, args.columns, args.getContext()));
+
+        if (args.query.columns_list && args.query.columns_list->projections)
+            for (auto & projection_ast : args.query.columns_list->projections->children)
+            {
+                auto projection = ProjectionDescription::getProjectionFromAST(projection_ast, args.columns, args.getContext());
+                metadata.projections.add(std::move(projection));
+            }
 
         if (args.query.columns_list && args.query.columns_list->constraints)
             for (auto & constraint : args.query.columns_list->constraints->children)
@@ -695,7 +703,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         auto column_ttl_asts = args.columns.getColumnTTLs();
         for (const auto & [name, ast] : column_ttl_asts)
         {
-            auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, args.columns, args.context, metadata.primary_key);
+            auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, args.columns, args.getContext(), metadata.primary_key);
             metadata.column_ttls_by_name[name] = new_ttl_entry;
         }
 
@@ -716,7 +724,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         auto partition_by_ast = makeASTFunction("toYYYYMM", std::make_shared<ASTIdentifier>(date_column_name));
 
-        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_ast, metadata.columns, args.context);
+        metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_ast, metadata.columns, args.getContext());
 
 
         ++arg_num;
@@ -724,7 +732,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// If there is an expression for sampling
         if (arg_cnt - arg_num == 3)
         {
-            metadata.sampling_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.context);
+            metadata.sampling_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.getContext());
             ++arg_num;
         }
 
@@ -734,10 +742,10 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// before storage creation. After that storage will just copy this
         /// column if sorting key will be changed.
         metadata.sorting_key
-            = KeyDescription::getSortingKeyFromAST(engine_args[arg_num], metadata.columns, args.context, merging_param_key_arg);
+            = KeyDescription::getSortingKeyFromAST(engine_args[arg_num], metadata.columns, args.getContext(), merging_param_key_arg);
 
         /// In old syntax primary_key always equals to sorting key.
-        metadata.primary_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.context);
+        metadata.primary_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, args.getContext());
         /// But it's not explicitly defined, so we evaluate definition to
         /// nullptr
         metadata.primary_key.definition_ast = nullptr;
@@ -762,8 +770,8 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     {
         for (size_t i = 0; i < data_types.size(); ++i)
             if (isFloat(data_types[i]))
-                throw Exception(
-                    "Donot support float point as partition key: " + metadata.partition_key.column_names[i], ErrorCodes::BAD_ARGUMENTS);
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Floating point partition key is not supported: {}", metadata.partition_key.column_names[i]);
     }
 
     if (arg_num != arg_cnt)
@@ -777,7 +785,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             args.table_id,
             args.relative_data_path,
             metadata,
-            args.context,
+            args.getContext(),
             date_column_name,
             merging_params,
             std::move(storage_settings),
@@ -789,7 +797,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             args.relative_data_path,
             metadata,
             args.attach,
-            args.context,
+            args.getContext(),
             date_column_name,
             merging_params,
             std::move(storage_settings),
@@ -802,6 +810,7 @@ void registerStorageMergeTree(StorageFactory & factory)
     StorageFactory::StorageFeatures features{
         .supports_settings = true,
         .supports_skipping_indices = true,
+        .supports_projections = true,
         .supports_sort_order = true,
         .supports_ttl = true,
         .supports_parallel_insert = true,
diff --git a/src/Storages/MergeTree/tests/gtest_ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/tests/gtest_ReplicatedMergeTreeLogEntry.cpp
deleted file mode 100644
index 03f36d866bb..00000000000
--- a/src/Storages/MergeTree/tests/gtest_ReplicatedMergeTreeLogEntry.cpp
+++ /dev/null
@@ -1,348 +0,0 @@
-#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
-
-#include <IO/ReadBufferFromString.h>
-
-#include <Core/iostream_debug_helpers.h>
-
-#include <type_traits>
-#include <regex>
-
-#include <gtest/gtest.h>
-
-namespace DB
-{
-std::ostream & operator<<(std::ostream & ostr, const MergeTreeDataPartType & type)
-{
-    return ostr << type.toString();
-}
-
-std::ostream & operator<<(std::ostream & ostr, const UInt128 & v)
-{
-    return ostr << v.toHexString();
-}
-
-template <typename T, typename Tag>
-std::ostream & operator<<(std::ostream & ostr, const StrongTypedef<T, Tag> & v)
-{
-    return ostr << v.toUnderType();
-}
-
-std::ostream & operator<<(std::ostream & ostr, const MergeType & v)
-{
-    return ostr << toString(v);
-}
-
-}
-
-namespace std
-{
-
-std::ostream & operator<<(std::ostream & ostr, const std::exception_ptr & exception)
-{
-    try
-    {
-        if (exception)
-        {
-            std::rethrow_exception(exception);
-        }
-        return ostr << "<NULL EXCEPTION>";
-    }
-    catch (const std::exception& e)
-    {
-        return ostr << e.what();
-    }
-}
-
-template <typename T>
-inline std::ostream& operator<<(std::ostream & ostr, const std::vector<T> & v)
-{
-    ostr << "[";
-    for (size_t i = 0; i < v.size(); ++i)
-    {
-        ostr << i;
-        if (i != v.size() - 1)
-            ostr << ", ";
-    }
-    return ostr << "] (" << v.size() << ") items";
-}
-
-}
-
-namespace
-{
-using namespace DB;
-
-template <typename T>
-void compareAttributes(::testing::AssertionResult & result, const char * name, const T & expected_value, const T & actual_value);
-
-#define CMP_ATTRIBUTE(attribute) compareAttributes(result, #attribute, expected.attribute, actual.attribute)
-
-::testing::AssertionResult compare(
-        const ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry & expected,
-        const ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry & actual)
-{
-    auto result = ::testing::AssertionSuccess();
-
-    CMP_ATTRIBUTE(drop_range_part_name);
-    CMP_ATTRIBUTE(from_database);
-    CMP_ATTRIBUTE(from_table);
-    CMP_ATTRIBUTE(src_part_names);
-    CMP_ATTRIBUTE(new_part_names);
-    CMP_ATTRIBUTE(part_names_checksums);
-    CMP_ATTRIBUTE(columns_version);
-
-    return result;
-}
-
-template <typename T>
-bool compare(const T & expected, const T & actual)
-{
-    return expected == actual;
-}
-
-template <typename T>
-::testing::AssertionResult compare(const std::shared_ptr<T> & expected, const std::shared_ptr<T> & actual)
-{
-    if (!!expected != !!actual)
-        return ::testing::AssertionFailure()
-                << "expected : " << static_cast<const void*>(expected.get())
-                << "\nactual   : " << static_cast<const void*>(actual.get());
-
-    if (expected && actual)
-        return compare(*expected, *actual);
-
-    return ::testing::AssertionSuccess();
-}
-
-template <typename T>
-void compareAttributes(::testing::AssertionResult & result, const char * name, const T & expected_value, const T & actual_value)
-{
-    const auto cmp_result = compare(expected_value, actual_value);
-    if (cmp_result == false)
-    {
-        if (result)
-            result = ::testing::AssertionFailure();
-
-        result << "\nMismatching attribute: \"" << name << "\"";
-        if constexpr (std::is_same_v<std::decay_t<decltype(cmp_result)>, ::testing::AssertionResult>)
-            result << "\n" << cmp_result.message();
-        else
-            result << "\n\texpected: " << expected_value
-                   << "\n\tactual  : " << actual_value;
-    }
-};
-
-::testing::AssertionResult compare(const ReplicatedMergeTreeLogEntryData & expected, const ReplicatedMergeTreeLogEntryData & actual)
-{
-    ::testing::AssertionResult result = ::testing::AssertionSuccess();
-
-    CMP_ATTRIBUTE(znode_name);
-    CMP_ATTRIBUTE(type);
-    CMP_ATTRIBUTE(source_replica);
-    CMP_ATTRIBUTE(new_part_name);
-    CMP_ATTRIBUTE(new_part_type);
-    CMP_ATTRIBUTE(block_id);
-    CMP_ATTRIBUTE(actual_new_part_name);
-    CMP_ATTRIBUTE(new_part_uuid);
-    CMP_ATTRIBUTE(source_parts);
-    CMP_ATTRIBUTE(deduplicate);
-    CMP_ATTRIBUTE(deduplicate_by_columns);
-    CMP_ATTRIBUTE(merge_type);
-    CMP_ATTRIBUTE(column_name);
-    CMP_ATTRIBUTE(index_name);
-    CMP_ATTRIBUTE(detach);
-    CMP_ATTRIBUTE(replace_range_entry);
-    CMP_ATTRIBUTE(alter_version);
-    CMP_ATTRIBUTE(have_mutation);
-    CMP_ATTRIBUTE(columns_str);
-    CMP_ATTRIBUTE(metadata_str);
-    CMP_ATTRIBUTE(currently_executing);
-    CMP_ATTRIBUTE(removed_by_other_entry);
-    CMP_ATTRIBUTE(num_tries);
-    CMP_ATTRIBUTE(exception);
-    CMP_ATTRIBUTE(last_attempt_time);
-    CMP_ATTRIBUTE(num_postponed);
-    CMP_ATTRIBUTE(postpone_reason);
-    CMP_ATTRIBUTE(last_postpone_time);
-    CMP_ATTRIBUTE(create_time);
-    CMP_ATTRIBUTE(quorum);
-
-    return result;
-}
-}
-
-
-class ReplicatedMergeTreeLogEntryDataTest : public ::testing::TestWithParam<std::tuple<ReplicatedMergeTreeLogEntryData, const char* /* serialized RE*/>>
-{};
-
-TEST_P(ReplicatedMergeTreeLogEntryDataTest, transcode)
-{
-    const auto & [expected, match_regex] = GetParam();
-    const auto str = expected.toString();
-
-    if (match_regex)
-    {
-        try
-        {
-            // egrep since "." matches newline and we can also use "\n" explicitly
-            std::regex re(match_regex, std::regex::egrep);
-            EXPECT_TRUE(std::regex_match(str, re))
-                    << "Failed to match serialized ReplicatedMergeTreeLogEntryData: {\n"
-                    << str << "} \nwith regex: \"" << match_regex << "\"\n";
-        }
-        catch (const std::regex_error &e)
-        {
-            FAIL() << e.what()
-                   << " on regex: " << match_regex
-                   << " (" << strlen(match_regex) << " bytes)" << std::endl;
-        }
-        catch (...)
-        {
-            throw;
-        }
-    }
-
-    ReplicatedMergeTreeLogEntryData actual;
-    {
-        DB::ReadBufferFromString buffer(str);
-        EXPECT_NO_THROW(actual.readText(buffer)) << "While reading:\n" << str;
-    }
-
-    ASSERT_TRUE(compare(expected, actual)) << "Via text:\n" << str;
-}
-
-// Enabling this warning would ruin test brievity without adding anything else in return,
-// since most of the fields have default constructors or be will be zero-initialized as by standard,
-// so values are predicatable and stable across runs.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-
-INSTANTIATE_TEST_SUITE_P(Merge, ReplicatedMergeTreeLogEntryDataTest,
-        ::testing::ValuesIn(std::initializer_list<std::tuple<ReplicatedMergeTreeLogEntryData, const char*>>{
-    {
-        {
-            // Basic: minimal set of attributes.
-            .type = ReplicatedMergeTreeLogEntryData::MERGE_PARTS,
-            .new_part_type = MergeTreeDataPartType::WIDE,
-            .create_time = 123, // 0 means 'now' which could cause flaky tests.
-        },
-        R"re(^format version: 4.+merge.+into.+deduplicate: 0.+$)re"
-    },
-    {
-        {
-            .type = ReplicatedMergeTreeLogEntryData::MERGE_PARTS,
-            .new_part_type = MergeTreeDataPartType::WIDE,
-
-            // Format version 4
-            .deduplicate = true,
-
-            .create_time = 123,
-        },
-        R"re(^format version: 4.+merge.+into.+deduplicate: 1.+$)re"
-    },
-    {
-        {
-            .type = ReplicatedMergeTreeLogEntryData::MERGE_PARTS,
-            .new_part_type = MergeTreeDataPartType::WIDE,
-
-            // Format version 5
-            .new_part_uuid = UUID(UInt128(123456789, 10111213141516)),
-
-            .create_time = 123,
-        },
-        R"re(^format version: 5.+merge.+into.+deduplicate: 0.+into_uuid: 00000000-075b-cd15-0000-093233447e0c.+$)re"
-    },
-    {
-        {
-            .type = ReplicatedMergeTreeLogEntryData::MERGE_PARTS,
-            .new_part_type = MergeTreeDataPartType::WIDE,
-
-            // Format version 6
-            .deduplicate = true,
-            .deduplicate_by_columns = {"foo", "bar", "qux"},
-
-            .create_time = 123,
-        },
-        R"re(^format version: 6.+merge.+into.+deduplicate: 1.+deduplicate_by_columns: 'foo','bar','qux'.*$)re"
-    },
-    {
-        {
-            .type = ReplicatedMergeTreeLogEntryData::MERGE_PARTS,
-            .new_part_type = MergeTreeDataPartType::WIDE,
-
-            // Mixing features
-            .new_part_uuid = UUID(UInt128(123456789, 10111213141516)),
-            .deduplicate = true,
-            .deduplicate_by_columns = {"foo", "bar", "qux"},
-
-            .create_time = 123,
-        },
-        R"re(^format version: 6.+merge.+into.+deduplicate: 1.+into_uuid: 00000000-075b-cd15-0000-093233447e0c.+deduplicate_by_columns: 'foo','bar','qux'.*$)re"
-    },
-    {
-        // Validate that exotic column names are serialized/deserialized properly
-        {
-            .type = ReplicatedMergeTreeLogEntryData::MERGE_PARTS,
-            .new_part_type = MergeTreeDataPartType::WIDE,
-
-            // Mixing features
-            .new_part_uuid = UUID(UInt128(123456789, 10111213141516)),
-            .deduplicate = true,
-            .deduplicate_by_columns = {"name with space", "\"column\"", "'column'", "колонка", "\u30ab\u30e9\u30e0", "\x01\x03 column \x10\x11\x12"},
-
-            .create_time = 123,
-        },
-        R"re(^format version: 6.+merge.+deduplicate_by_columns: 'name with space','"column"','\\'column\\'','колонка')re"
-                ",'\u30ab\u30e9\u30e0','\x01\x03 column \x10\x11\x12'.*$"
-    },
-}));
-
-#pragma GCC diagnostic pop
-
-// This is just an example of how to set all fields. Can't be used as is since depending on type,
-// only some fields are serialized/deserialized, and even if everything works perfectly,
-// some fields in deserialized object would be unset (hence differ from expected).
-// INSTANTIATE_TEST_SUITE_P(Full, ReplicatedMergeTreeLogEntryDataTest,
-//         ::testing::ValuesIn(std::initializer_list<ReplicatedMergeTreeLogEntryData>{
-//     {
-//         .znode_name = "znode name",
-//         .type = ReplicatedMergeTreeLogEntryData::MERGE_PARTS,
-//         .source_replica = "source replica",
-//         .new_part_name = "new part name",
-//         .new_part_type = MergeTreeDataPartType::WIDE,
-//         .block_id = "block id",
-//         .actual_new_part_name = "new part name",
-//         .new_part_uuid = UUID(UInt128(123456789, 10111213141516)),
-//         .source_parts = {"part1", "part2"},
-//         .deduplicate = true,
-//         .deduplicate_by_columns = {"col1", "col2"},
-//         .merge_type = MergeType::REGULAR,
-//         .column_name = "column name",
-//         .index_name = "index name",
-//         .detach = false,
-//         .replace_range_entry = std::make_shared<ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry>(
-//             ReplicatedMergeTreeLogEntryData::ReplaceRangeEntry
-//             {
-//                 .drop_range_part_name = "drop range part name",
-//                 .from_database = "from database",
-//                 .src_part_names = {"src part name1", "src part name2"},
-//                 .new_part_names = {"new part name1", "new part name2"},
-//                 .columns_version = 123456,
-//             }),
-//         .alter_version = 56789,
-//         .have_mutation = false,
-//         .columns_str = "columns str",
-//         .metadata_str = "metadata str",
-//         // Those attributes are not serialized to string, hence it makes no sense to set.
-//         // .currently_executing
-//         // .removed_by_other_entry
-//         // .num_tries
-//         // .exception
-//         // .last_attempt_time
-//         // .num_postponed
-//         // .postpone_reason
-//         // .last_postpone_time,
-//         .create_time = static_cast<time_t>(123456789),
-//         .quorum = 321,
-//     },
-// }));
diff --git a/src/Storages/MutationCommands.cpp b/src/Storages/MutationCommands.cpp
index 8902707ab64..17112ac469f 100644
--- a/src/Storages/MutationCommands.cpp
+++ b/src/Storages/MutationCommands.cpp
@@ -65,6 +65,16 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         res.index_name = command->index->as<ASTIdentifier &>().name();
         return res;
     }
+    else if (command->type == ASTAlterCommand::MATERIALIZE_PROJECTION)
+    {
+        MutationCommand res;
+        res.ast = command->ptr();
+        res.type = MATERIALIZE_PROJECTION;
+        res.partition = command->partition;
+        res.predicate = nullptr;
+        res.projection_name = command->projection->as<ASTIdentifier &>().name();
+        return res;
+    }
     else if (parse_alter_commands && command->type == ASTAlterCommand::MODIFY_COLUMN)
     {
         MutationCommand res;
@@ -100,6 +110,18 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
             res.clear = true;
         return res;
     }
+    else if (parse_alter_commands && command->type == ASTAlterCommand::DROP_PROJECTION)
+    {
+        MutationCommand res;
+        res.ast = command->ptr();
+        res.type = MutationCommand::Type::DROP_PROJECTION;
+        res.column_name = command->projection->as<ASTIdentifier &>().name();
+        if (command->partition)
+            res.partition = command->partition;
+        if (command->clear_projection)
+            res.clear = true;
+        return res;
+    }
     else if (parse_alter_commands && command->type == ASTAlterCommand::RENAME_COLUMN)
     {
         MutationCommand res;
diff --git a/src/Storages/MutationCommands.h b/src/Storages/MutationCommands.h
index ecf819eed9b..09808543068 100644
--- a/src/Storages/MutationCommands.h
+++ b/src/Storages/MutationCommands.h
@@ -28,9 +28,11 @@ struct MutationCommand
         DELETE,
         UPDATE,
         MATERIALIZE_INDEX,
+        MATERIALIZE_PROJECTION,
         READ_COLUMN, /// Read column and apply conversions (MODIFY COLUMN alter query).
         DROP_COLUMN,
         DROP_INDEX,
+        DROP_PROJECTION,
         MATERIALIZE_TTL,
         RENAME_COLUMN,
     };
@@ -43,8 +45,9 @@ struct MutationCommand
     /// Columns with corresponding actions
     std::unordered_map<String, ASTPtr> column_to_update_expression;
 
-    /// For MATERIALIZE INDEX.
+    /// For MATERIALIZE INDEX and PROJECTION
     String index_name;
+    String projection_name;
 
     /// For MATERIALIZE INDEX, UPDATE and DELETE.
     ASTPtr partition;
diff --git a/src/Storages/MySQL/MySQLSettings.cpp b/src/Storages/MySQL/MySQLSettings.cpp
new file mode 100644
index 00000000000..1a8f0804777
--- /dev/null
+++ b/src/Storages/MySQL/MySQLSettings.cpp
@@ -0,0 +1,42 @@
+#include <Storages/MySQL/MySQLSettings.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Common/Exception.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_SETTING;
+}
+
+IMPLEMENT_SETTINGS_TRAITS(MySQLSettingsTraits, LIST_OF_MYSQL_SETTINGS)
+
+void MySQLSettings::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/MySQL/MySQLSettings.h b/src/Storages/MySQL/MySQLSettings.h
new file mode 100644
index 00000000000..da8723c2ea6
--- /dev/null
+++ b/src/Storages/MySQL/MySQLSettings.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Core/Defines.h>
+#include <Core/BaseSettings.h>
+
+
+namespace Poco::Util
+{
+    class AbstractConfiguration;
+}
+
+
+namespace DB
+{
+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(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)
+
+
+/** Settings for the MySQL family of engines.
+  */
+struct MySQLSettings : public BaseSettings<MySQLSettingsTraits>
+{
+    void loadFromQuery(ASTStorage & storage_def);
+};
+
+}
diff --git a/src/Storages/PartitionCommands.cpp b/src/Storages/PartitionCommands.cpp
index e51a64d5d81..917ea156ab7 100644
--- a/src/Storages/PartitionCommands.cpp
+++ b/src/Storages/PartitionCommands.cpp
@@ -13,6 +13,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand * command_ast)
 {
     if (command_ast->type == ASTAlterCommand::DROP_PARTITION)
@@ -59,8 +64,11 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
                 res.to_database = command_ast->to_database;
                 res.to_table = command_ast->to_table;
                 break;
-            default:
+            case DataDestinationType::SHARD:
+                res.move_destination_type = PartitionCommand::MoveDestinationType::SHARD;
                 break;
+            case DataDestinationType::DELETE:
+                throw Exception("ALTER with this destination type is not handled. This is a bug.", ErrorCodes::LOGICAL_ERROR);
         }
         if (res.move_destination_type != PartitionCommand::MoveDestinationType::TABLE)
             res.move_destination_name = command_ast->move_destination_name;
@@ -82,6 +90,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
         res.type = FETCH_PARTITION;
         res.partition = command_ast->partition;
         res.from_zookeeper_path = command_ast->from;
+        res.part = command_ast->part;
         return res;
     }
     else if (command_ast->type == ASTAlterCommand::FREEZE_PARTITION)
@@ -140,7 +149,10 @@ std::string PartitionCommand::typeToString() const
         else
             return "DROP DETACHED PARTITION";
     case PartitionCommand::Type::FETCH_PARTITION:
-        return "FETCH PARTITION";
+        if (part)
+            return "FETCH PART";
+        else
+            return "FETCH PARTITION";
     case PartitionCommand::Type::FREEZE_ALL_PARTITIONS:
         return "FREEZE ALL";
     case PartitionCommand::Type::FREEZE_PARTITION:
@@ -151,8 +163,9 @@ std::string PartitionCommand::typeToString() const
         return "UNFREEZE ALL";
     case PartitionCommand::Type::REPLACE_PARTITION:
         return "REPLACE PARTITION";
+    default:
+        throw Exception("Uninitialized partition command", ErrorCodes::LOGICAL_ERROR);
     }
-    __builtin_unreachable();
 }
 
 Pipe convertCommandsResultToSource(const PartitionCommandsResultInfo & commands_result)
diff --git a/src/Storages/PartitionCommands.h b/src/Storages/PartitionCommands.h
index 9f89d44bd4e..554b86f4e76 100644
--- a/src/Storages/PartitionCommands.h
+++ b/src/Storages/PartitionCommands.h
@@ -20,6 +20,8 @@ struct PartitionCommand
 {
     enum Type
     {
+        UNKNOWN,
+
         ATTACH_PARTITION,
         MOVE_PARTITION,
         DROP_PARTITION,
@@ -32,7 +34,7 @@ struct PartitionCommand
         REPLACE_PARTITION,
     };
 
-    Type type;
+    Type type = UNKNOWN;
 
     ASTPtr partition;
 
@@ -62,6 +64,7 @@ struct PartitionCommand
         DISK,
         VOLUME,
         TABLE,
+        SHARD,
     };
 
     std::optional<MoveDestinationType> move_destination_type;
diff --git a/src/Storages/PostgreSQL/ConnectionHolder.h b/src/Storages/PostgreSQL/ConnectionHolder.h
new file mode 100644
index 00000000000..98ab7df182d
--- /dev/null
+++ b/src/Storages/PostgreSQL/ConnectionHolder.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <pqxx/pqxx> // Y_IGNORE
+#include <Core/Types.h>
+#include <common/BorrowedObjectPool.h>
+
+
+namespace postgres
+{
+
+using ConnectionPtr = std::unique_ptr<pqxx::connection>;
+using Pool = BorrowedObjectPool<ConnectionPtr>;
+using PoolPtr = std::shared_ptr<Pool>;
+
+class ConnectionHolder
+{
+
+public:
+    ConnectionHolder(PoolPtr pool_, ConnectionPtr connection_) : pool(pool_), connection(std::move(connection_)) {}
+
+    ConnectionHolder(const ConnectionHolder & other) = delete;
+
+    ~ConnectionHolder() { pool->returnObject(std::move(connection)); }
+
+    pqxx::connection & get()
+    {
+        assert(connection != nullptr);
+        return *connection;
+    }
+
+private:
+    PoolPtr pool;
+    ConnectionPtr connection;
+};
+
+using ConnectionHolderPtr = std::unique_ptr<ConnectionHolder>;
+}
diff --git a/src/Storages/PostgreSQL/PoolWithFailover.cpp b/src/Storages/PostgreSQL/PoolWithFailover.cpp
new file mode 100644
index 00000000000..d3cf9c881e1
--- /dev/null
+++ b/src/Storages/PostgreSQL/PoolWithFailover.cpp
@@ -0,0 +1,150 @@
+#include <Storages/PostgreSQL/PoolWithFailover.h>
+#include <Common/parseRemoteDescription.h>
+#include <Common/Exception.h>
+#include <IO/Operators.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int POSTGRESQL_CONNECTION_FAILURE;
+}
+}
+
+namespace postgres
+{
+
+String formatConnectionString(String dbname, String host, UInt16 port, String user, String password)
+{
+    DB::WriteBufferFromOwnString out;
+    out << "dbname=" << DB::quote << dbname
+        << " host=" << DB::quote << host
+        << " port=" << port
+        << " user=" << DB::quote << user
+        << " password=" << DB::quote << password
+        << " connect_timeout=10";
+    return out.str();
+}
+
+PoolWithFailover::PoolWithFailover(
+        const Poco::Util::AbstractConfiguration & config, const String & config_prefix,
+        size_t pool_size, size_t pool_wait_timeout_, size_t max_tries_)
+        : pool_wait_timeout(pool_wait_timeout_)
+        , max_tries(max_tries_)
+{
+    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"))
+    {
+        Poco::Util::AbstractConfiguration::Keys config_keys;
+        config.keys(config_prefix, config_keys);
+
+        for (const auto & config_key : config_keys)
+        {
+            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);
+                replicas_with_priority[priority].emplace_back(connection_string, pool_size);
+            }
+        }
+    }
+    else
+    {
+        auto connection_string = formatConnectionString(db, host, port, user, password);
+        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,
+        size_t pool_size, size_t pool_wait_timeout_, size_t max_tries_)
+    : pool_wait_timeout(pool_wait_timeout_)
+    , max_tries(max_tries_)
+{
+    LOG_TRACE(&Poco::Logger::get("PostgreSQLConnectionPool"), "PostgreSQL connection pool size: {}, connection wait timeout: {}, max failover tries: {}",
+              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)
+    {
+        LOG_DEBUG(&Poco::Logger::get("PostgreSQLPoolWithFailover"), "Adding address host: {}, port: {} to connection pool", host, port);
+        auto connection_string = formatConnectionString(database, host, port, user, password);
+        replicas_with_priority[0].emplace_back(connection_string, pool_size);
+    }
+}
+
+ConnectionHolderPtr PoolWithFailover::get()
+{
+    std::lock_guard lock(mutex);
+
+    for (size_t try_idx = 0; try_idx < max_tries; ++try_idx)
+    {
+        for (auto & priority : replicas_with_priority)
+        {
+            auto & replicas = priority.second;
+            for (size_t i = 0; i < replicas.size(); ++i)
+            {
+                auto & replica = replicas[i];
+
+                ConnectionPtr connection;
+                auto connection_available = replica.pool->tryBorrowObject(connection, []() { return nullptr; }, pool_wait_timeout);
+
+                if (!connection_available)
+                {
+                    LOG_WARNING(log, "Unable to fetch connection within the timeout");
+                    continue;
+                }
+
+                try
+                {
+                    /// Create a new connection or reopen an old connection if it became invalid.
+                    if (!connection || !connection->is_open())
+                    {
+                        connection = std::make_unique<pqxx::connection>(replica.connection_string);
+                        LOG_DEBUG(log, "New connection to {}:{}", connection->hostname(), connection->port());
+                    }
+                }
+                catch (const pqxx::broken_connection & pqxx_error)
+                {
+                    LOG_ERROR(log, "Connection error: {}", pqxx_error.what());
+
+                    replica.pool->returnObject(std::move(connection));
+                    continue;
+                }
+                catch (...)
+                {
+                    replica.pool->returnObject(std::move(connection));
+                    throw;
+                }
+
+                auto connection_holder = std::make_unique<ConnectionHolder>(replica.pool, std::move(connection));
+
+                /// Move all traversed replicas to the end.
+                if (replicas.size() > 1)
+                    std::rotate(replicas.begin(), replicas.begin() + i + 1, replicas.end());
+
+                return connection_holder;
+            }
+        }
+    }
+
+    throw DB::Exception(DB::ErrorCodes::POSTGRESQL_CONNECTION_FAILURE, "Unable to connect to any of the replicas");
+}
+}
diff --git a/src/Storages/PostgreSQL/PoolWithFailover.h b/src/Storages/PostgreSQL/PoolWithFailover.h
new file mode 100644
index 00000000000..bd6f10d84e0
--- /dev/null
+++ b/src/Storages/PostgreSQL/PoolWithFailover.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <mutex>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Storages/PostgreSQL/ConnectionHolder.h>
+#include <common/logger_useful.h>
+
+
+namespace postgres
+{
+
+String formatConnectionString(String dbname, String host, UInt16 port, String user, String password);
+
+class PoolWithFailover
+{
+
+using RemoteDescription = std::vector<std::pair<String, uint16_t>>;
+
+public:
+    static constexpr inline auto POSTGRESQL_POOL_DEFAULT_SIZE = 16;
+    static constexpr inline auto POSTGRESQL_POOL_WAIT_TIMEOUT = 5000;
+    static constexpr inline auto POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES = 5;
+
+    PoolWithFailover(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        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,
+        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 PoolWithFailover & other) = delete;
+
+    ConnectionHolderPtr get();
+
+private:
+    struct PoolHolder
+    {
+        String connection_string;
+        PoolPtr pool;
+
+        PoolHolder(const String & connection_string_, size_t pool_size)
+            : connection_string(connection_string_), pool(std::make_shared<Pool>(pool_size)) {}
+    };
+
+    /// Highest priority is 0, the bigger the number in map, the less the priority
+    using Replicas = std::vector<PoolHolder>;
+    using ReplicasWithPriority = std::map<size_t, Replicas>;
+
+    ReplicasWithPriority replicas_with_priority;
+    size_t pool_wait_timeout;
+    size_t max_tries;
+    std::mutex mutex;
+    Poco::Logger * log = &Poco::Logger::get("PostgreSQLConnectionPool");
+};
+
+using PoolWithFailoverPtr = std::shared_ptr<PoolWithFailover>;
+
+}
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnection.cpp b/src/Storages/PostgreSQL/PostgreSQLConnection.cpp
deleted file mode 100644
index 61caba8ac81..00000000000
--- a/src/Storages/PostgreSQL/PostgreSQLConnection.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#if !defined(ARCADIA_BUILD)
-#include "config_core.h"
-#endif
-
-#if USE_LIBPQXX
-#include "PostgreSQLConnection.h"
-#include <common/logger_useful.h>
-#include <IO/Operators.h>
-
-
-namespace DB
-{
-
-PostgreSQLConnection::PostgreSQLConnection(
-        const String & connection_str_,
-        const String & address_)
-    : connection_str(connection_str_)
-    , address(address_)
-{
-}
-
-
-PostgreSQLConnection::ConnectionPtr PostgreSQLConnection::get()
-{
-    connectIfNeeded();
-    return connection;
-}
-
-
-PostgreSQLConnection::ConnectionPtr PostgreSQLConnection::tryGet()
-{
-    if (tryConnectIfNeeded())
-        return connection;
-    return nullptr;
-}
-
-
-void PostgreSQLConnection::connectIfNeeded()
-{
-    if (!connection || !connection->is_open())
-    {
-        LOG_DEBUG(&Poco::Logger::get("PostgreSQLConnection"), "New connection to {}", getAddress());
-        connection = std::make_shared<pqxx::connection>(connection_str);
-    }
-}
-
-
-bool PostgreSQLConnection::tryConnectIfNeeded()
-{
-    try
-    {
-        connectIfNeeded();
-    }
-    catch (const pqxx::broken_connection & pqxx_error)
-    {
-        LOG_ERROR(
-            &Poco::Logger::get("PostgreSQLConnection"),
-            "Unable to setup connection to {}, reason: {}",
-            getAddress(), pqxx_error.what());
-        return false;
-    }
-    catch (...)
-    {
-        throw;
-    }
-
-    return true;
-}
-
-}
-
-#endif
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnection.h b/src/Storages/PostgreSQL/PostgreSQLConnection.h
deleted file mode 100644
index c8e1c3dcc91..00000000000
--- a/src/Storages/PostgreSQL/PostgreSQLConnection.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-#if !defined(ARCADIA_BUILD)
-#include "config_core.h"
-#endif
-
-#if USE_LIBPQXX
-#include <pqxx/pqxx> // Y_IGNORE
-#include <Core/Types.h>
-#include <Common/ConcurrentBoundedQueue.h>
-
-
-namespace DB
-{
-
-class PostgreSQLConnection
-{
-
-using ConnectionPtr = std::shared_ptr<pqxx::connection>;
-
-public:
-    PostgreSQLConnection(
-        const String & connection_str_,
-        const String & address_);
-
-    PostgreSQLConnection(const PostgreSQLConnection & other) = delete;
-
-    ConnectionPtr get();
-
-    ConnectionPtr tryGet();
-
-    bool isConnected() { return tryConnectIfNeeded(); }
-
-private:
-    void connectIfNeeded();
-
-    bool tryConnectIfNeeded();
-
-    const std::string & getAddress() { return address; }
-
-    ConnectionPtr connection;
-    std::string connection_str, address;
-};
-
-using PostgreSQLConnectionPtr = std::shared_ptr<PostgreSQLConnection>;
-
-
-class PostgreSQLConnectionHolder
-{
-
-using Pool = ConcurrentBoundedQueue<PostgreSQLConnectionPtr>;
-static constexpr inline auto POSTGRESQL_POOL_WAIT_MS = 50;
-
-public:
-    PostgreSQLConnectionHolder(PostgreSQLConnectionPtr connection_, Pool & pool_)
-        : connection(std::move(connection_))
-        , pool(pool_)
-    {
-    }
-
-    PostgreSQLConnectionHolder(const PostgreSQLConnectionHolder & other) = delete;
-
-    ~PostgreSQLConnectionHolder() { pool.tryPush(connection, POSTGRESQL_POOL_WAIT_MS); }
-
-    pqxx::connection & conn() const { return *connection->get(); }
-
-    bool isConnected() { return connection->isConnected(); }
-
-private:
-    PostgreSQLConnectionPtr connection;
-    Pool & pool;
-};
-
-using PostgreSQLConnectionHolderPtr = std::shared_ptr<PostgreSQLConnectionHolder>;
-
-}
-
-
-#endif
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnectionPool.cpp b/src/Storages/PostgreSQL/PostgreSQLConnectionPool.cpp
deleted file mode 100644
index 659877b6b49..00000000000
--- a/src/Storages/PostgreSQL/PostgreSQLConnectionPool.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#if !defined(ARCADIA_BUILD)
-#include "config_core.h"
-#endif
-
-#if USE_LIBPQXX
-#include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
-#include "PostgreSQLConnectionPool.h"
-#include "PostgreSQLConnection.h"
-#include <common/logger_useful.h>
-
-
-namespace DB
-{
-
-PostgreSQLConnectionPool::PostgreSQLConnectionPool(
-        std::string dbname,
-        std::string host,
-        UInt16 port,
-        std::string user,
-        std::string password,
-        size_t pool_size_,
-        int64_t pool_wait_timeout_)
-        : pool(std::make_shared<Pool>(pool_size_))
-        , pool_size(pool_size_)
-        , pool_wait_timeout(pool_wait_timeout_)
-        , block_on_empty_pool(pool_wait_timeout == -1)
-{
-    LOG_INFO(
-        &Poco::Logger::get("PostgreSQLConnectionPool"),
-        "New connection pool. Size: {}, blocks on empty pool: {}",
-        pool_size, block_on_empty_pool);
-
-    address = host + ':' + std::to_string(port);
-    connection_str = formatConnectionString(std::move(dbname), std::move(host), port, std::move(user), std::move(password));
-    initialize();
-}
-
-
-PostgreSQLConnectionPool::PostgreSQLConnectionPool(const PostgreSQLConnectionPool & other)
-        : pool(std::make_shared<Pool>(other.pool_size))
-        , connection_str(other.connection_str)
-        , address(other.address)
-        , pool_size(other.pool_size)
-        , pool_wait_timeout(other.pool_wait_timeout)
-        , block_on_empty_pool(other.block_on_empty_pool)
-{
-    initialize();
-}
-
-
-void PostgreSQLConnectionPool::initialize()
-{
-    /// No connection is made, just fill pool with non-connected connection objects.
-    for (size_t i = 0; i < pool_size; ++i)
-        pool->push(std::make_shared<PostgreSQLConnection>(connection_str, address));
-}
-
-
-std::string PostgreSQLConnectionPool::formatConnectionString(
-    std::string dbname, std::string host, UInt16 port, std::string user, std::string password)
-{
-    WriteBufferFromOwnString out;
-    out << "dbname=" << quote << dbname
-        << " host=" << quote << host
-        << " port=" << port
-        << " user=" << quote << user
-        << " password=" << quote << password;
-    return out.str();
-}
-
-
-PostgreSQLConnectionHolderPtr PostgreSQLConnectionPool::get()
-{
-    PostgreSQLConnectionPtr connection;
-
-    /// Always blocks by default.
-    if (block_on_empty_pool)
-    {
-        /// pop to ConcurrentBoundedQueue will block until it is non-empty.
-        pool->pop(connection);
-        return std::make_shared<PostgreSQLConnectionHolder>(connection, *pool);
-    }
-
-    if (pool->tryPop(connection, pool_wait_timeout))
-    {
-        return std::make_shared<PostgreSQLConnectionHolder>(connection, *pool);
-    }
-
-    connection = std::make_shared<PostgreSQLConnection>(connection_str, address);
-    return std::make_shared<PostgreSQLConnectionHolder>(connection, *pool);
-}
-
-}
-
-#endif
diff --git a/src/Storages/PostgreSQL/PostgreSQLConnectionPool.h b/src/Storages/PostgreSQL/PostgreSQLConnectionPool.h
deleted file mode 100644
index a66254f81af..00000000000
--- a/src/Storages/PostgreSQL/PostgreSQLConnectionPool.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#if !defined(ARCADIA_BUILD)
-#include "config_core.h"
-#endif
-
-#if USE_LIBPQXX
-#include "PostgreSQLConnection.h"
-
-
-namespace DB
-{
-
-class PostgreSQLReplicaConnection;
-
-
-/// Connection pool size is defined by user with setting `postgresql_connection_pool_size` (default 16).
-/// If pool is empty, it will block until there are available connections.
-/// If setting `connection_pool_wait_timeout` is defined, it will not block on empty pool and will
-/// wait until the timeout and then create a new connection. (only for storage/db engine)
-class PostgreSQLConnectionPool
-{
-
-friend class PostgreSQLReplicaConnection;
-
-static constexpr inline auto POSTGRESQL_POOL_DEFAULT_SIZE = 16;
-
-public:
-
-    PostgreSQLConnectionPool(
-            std::string dbname,
-            std::string host,
-            UInt16 port,
-            std::string user,
-            std::string password,
-            size_t pool_size_ = POSTGRESQL_POOL_DEFAULT_SIZE,
-            int64_t pool_wait_timeout_ = -1);
-
-    PostgreSQLConnectionPool(const PostgreSQLConnectionPool & other);
-
-    PostgreSQLConnectionPool operator =(const PostgreSQLConnectionPool &) = delete;
-
-    PostgreSQLConnectionHolderPtr get();
-
-private:
-    using Pool = ConcurrentBoundedQueue<PostgreSQLConnectionPtr>;
-    using PoolPtr = std::shared_ptr<Pool>;
-
-    static std::string formatConnectionString(
-        std::string dbname, std::string host, UInt16 port, std::string user, std::string password);
-
-    void initialize();
-
-    PoolPtr pool;
-    std::string connection_str, address;
-    size_t pool_size;
-    int64_t pool_wait_timeout;
-    bool block_on_empty_pool;
-};
-
-using PostgreSQLConnectionPoolPtr = std::shared_ptr<PostgreSQLConnectionPool>;
-
-}
-
-#endif
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.cpp b/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.cpp
deleted file mode 100644
index 30e06d4c17c..00000000000
--- a/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "PostgreSQLReplicaConnection.h"
-#include "PostgreSQLConnection.h"
-#include <Common/Exception.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int POSTGRESQL_CONNECTION_FAILURE;
-}
-
-
-PostgreSQLReplicaConnection::PostgreSQLReplicaConnection(
-        const Poco::Util::AbstractConfiguration & config,
-        const String & config_prefix,
-        const size_t num_retries_)
-        : num_retries(num_retries_)
-{
-    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"))
-    {
-        Poco::Util::AbstractConfiguration::Keys config_keys;
-        config.keys(config_prefix, config_keys);
-
-        for (const auto & config_key : config_keys)
-        {
-            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);
-
-                replicas[priority] = std::make_shared<PostgreSQLConnectionPool>(db, replica_host, replica_port, replica_user, replica_password);
-            }
-        }
-    }
-    else
-    {
-        replicas[0] = std::make_shared<PostgreSQLConnectionPool>(db, host, port, user, password);
-    }
-}
-
-
-PostgreSQLReplicaConnection::PostgreSQLReplicaConnection(const PostgreSQLReplicaConnection & other)
-        : replicas(other.replicas)
-        , num_retries(other.num_retries)
-{
-}
-
-
-PostgreSQLConnectionHolderPtr PostgreSQLReplicaConnection::get()
-{
-    std::lock_guard lock(mutex);
-
-    for (size_t i = 0; i < num_retries; ++i)
-    {
-        for (auto & replica : replicas)
-        {
-            auto connection = replica.second->get();
-            if (connection->isConnected())
-                return connection;
-        }
-    }
-
-    throw Exception(ErrorCodes::POSTGRESQL_CONNECTION_FAILURE, "Unable to connect to any of the replicas");
-}
-
-}
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.h b/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.h
deleted file mode 100644
index 1ed442873a2..00000000000
--- a/src/Storages/PostgreSQL/PostgreSQLReplicaConnection.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <Core/Types.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include "PostgreSQLConnectionPool.h"
-#include <mutex>
-
-
-namespace DB
-{
-
-class PostgreSQLReplicaConnection
-{
-
-public:
-    static constexpr inline auto POSTGRESQL_CONNECTION_DEFAULT_RETRIES_NUM = 5;
-
-    PostgreSQLReplicaConnection(
-        const Poco::Util::AbstractConfiguration & config,
-        const String & config_prefix,
-        const size_t num_retries_ = POSTGRESQL_CONNECTION_DEFAULT_RETRIES_NUM);
-
-    PostgreSQLReplicaConnection(const PostgreSQLReplicaConnection & other);
-
-    PostgreSQLConnectionHolderPtr get();
-
-
-private:
-    /// Highest priority is 0, the bigger the number in map, the less the priority
-    using ReplicasByPriority = std::map<size_t, PostgreSQLConnectionPoolPtr>;
-
-    ReplicasByPriority replicas;
-    size_t num_retries;
-    std::mutex mutex;
-};
-
-using PostgreSQLReplicaConnectionPtr = std::shared_ptr<PostgreSQLReplicaConnection>;
-
-}
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
new file mode 100644
index 00000000000..dd48b23ecc3
--- /dev/null
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -0,0 +1,294 @@
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/TreeRewriter.h>
+#include <Storages/ProjectionsDescription.h>
+
+#include <Parsers/ASTProjectionDeclaration.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
+
+#include <Core/Defines.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Parsers/ASTProjectionSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Processors/Pipe.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int INCORRECT_QUERY;
+    extern const int NO_SUCH_PROJECTION_IN_TABLE;
+    extern const int ILLEGAL_PROJECTION;
+    extern const int NOT_IMPLEMENTED;
+};
+
+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();
+
+    for (const auto & key_name : metadata->getPrimaryKeyColumns())
+        if (column_name == key_name)
+            return true;
+
+    if (const auto * func = node->as<ASTFunction>())
+        if (func->arguments->children.size() == 1)
+            return isPrimaryKeyColumnPossiblyWrappedInFunctions(func->arguments->children.front());
+
+    return false;
+}
+
+
+ProjectionDescription ProjectionDescription::clone() const
+{
+    ProjectionDescription other;
+    if (definition_ast)
+        other.definition_ast = definition_ast->clone();
+    if (query_ast)
+        other.query_ast = query_ast->clone();
+
+    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;
+
+    return other;
+}
+
+ProjectionsDescription ProjectionsDescription::clone() const
+{
+    ProjectionsDescription other;
+    for (const auto & projection : projections)
+        other.add(projection.clone());
+
+    return other;
+}
+
+bool ProjectionDescription::operator==(const ProjectionDescription & other) const
+{
+    return name == other.name && queryToString(definition_ast) == queryToString(other.definition_ast);
+}
+
+ProjectionDescription
+ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr query_context)
+{
+    const auto * projection_definition = definition_ast->as<ASTProjectionDeclaration>();
+
+    if (!projection_definition)
+        throw Exception("Cannot create projection from non ASTProjectionDeclaration AST", ErrorCodes::INCORRECT_QUERY);
+
+    if (projection_definition->name.empty())
+        throw Exception("Projection must have name in definition.", ErrorCodes::INCORRECT_QUERY);
+
+    if (!projection_definition->query)
+        throw Exception("QUERY is required for projection", ErrorCodes::INCORRECT_QUERY);
+
+    ProjectionDescription result;
+    result.definition_ast = projection_definition->clone();
+    result.name = projection_definition->name;
+
+    auto query = projection_definition->query->as<ASTProjectionSelectQuery &>();
+    result.query_ast = 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();
+
+    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, {});
+
+    const auto & query_select = result.query_ast->as<const ASTSelectQuery &>();
+    if (select.hasAggregation())
+    {
+        result.type = ProjectionDescription::Type::Aggregate;
+        if (const auto & group_expression_list = query_select.groupBy())
+        {
+            ASTPtr order_expression;
+            if (group_expression_list->children.size() == 1)
+            {
+                result.key_size = 1;
+                order_expression = std::make_shared<ASTIdentifier>(group_expression_list->children.front()->getColumnName());
+            }
+            else
+            {
+                auto function_node = std::make_shared<ASTFunction>();
+                function_node->name = "tuple";
+                function_node->arguments = group_expression_list->clone();
+                result.key_size = function_node->arguments->children.size();
+                for (auto & child : function_node->arguments->children)
+                    child = std::make_shared<ASTIdentifier>(child->getColumnName());
+                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);
+        }
+        else
+        {
+            metadata.sorting_key = KeyDescription::getSortingKeyFromAST({}, metadata.columns, query_context, {});
+            metadata.primary_key = KeyDescription::getKeyFromAST({}, metadata.columns, query_context);
+        }
+        if (query.orderBy())
+            throw Exception(
+                "When aggregation is used in projection, ORDER BY cannot be specified", ErrorCodes::ILLEGAL_PROJECTION);
+    }
+    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.primary_key.definition_ast = nullptr;
+    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);
+}
+
+String ProjectionsDescription::toString() const
+{
+    if (empty())
+        return {};
+
+    ASTExpressionList list;
+    for (const auto & projection : projections)
+        list.children.push_back(projection.definition_ast);
+
+    return serializeAST(list, true);
+}
+
+ProjectionsDescription ProjectionsDescription::parse(const String & str, const ColumnsDescription & columns, ContextPtr query_context)
+{
+    ProjectionsDescription result;
+    if (str.empty())
+        return result;
+
+    ParserProjectionDeclarationList parser;
+    ASTPtr list = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+
+    for (const auto & projection_ast : list->children)
+    {
+        auto projection = ProjectionDescription::getProjectionFromAST(projection_ast, columns, query_context);
+        result.add(std::move(projection));
+    }
+
+    return result;
+}
+
+bool ProjectionsDescription::has(const String & projection_name) const
+{
+    return map.count(projection_name) > 0;
+}
+
+const ProjectionDescription & ProjectionsDescription::get(const String & projection_name) const
+{
+    auto it = map.find(projection_name);
+    if (it == map.end())
+        throw Exception("There is no projection " + projection_name + " in table", ErrorCodes::NO_SUCH_PROJECTION_IN_TABLE);
+
+    return *(it->second);
+}
+
+void ProjectionsDescription::add(ProjectionDescription && projection, const String & after_projection, bool first, bool if_not_exists)
+{
+    if (has(projection.name))
+    {
+        if (if_not_exists)
+            return;
+        throw Exception(
+            "Cannot add projection " + projection.name + ": projection with this name already exists", ErrorCodes::ILLEGAL_PROJECTION);
+    }
+
+    auto insert_it = projections.cend();
+
+    if (first)
+        insert_it = projections.cbegin();
+    else if (!after_projection.empty())
+    {
+        auto it = std::find_if(projections.cbegin(), projections.cend(), [&after_projection](const auto & projection_)
+        {
+            return projection_.name == after_projection;
+        });
+        if (it != projections.cend())
+            ++it;
+        insert_it = it;
+    }
+
+    auto it = projections.insert(insert_it, std::move(projection));
+    map[it->name] = it;
+}
+
+void ProjectionsDescription::remove(const String & projection_name, bool if_exists)
+{
+    auto it = map.find(projection_name);
+    if (it == map.end())
+    {
+        if (if_exists)
+            return;
+        throw Exception("There is no projection " + projection_name + " in table.", ErrorCodes::NO_SUCH_PROJECTION_IN_TABLE);
+    }
+
+    projections.erase(it->second);
+    map.erase(it);
+}
+
+ExpressionActionsPtr
+ProjectionsDescription::getSingleExpressionForProjections(const ColumnsDescription & columns, ContextPtr query_context) const
+{
+    ASTPtr combined_expr_list = std::make_shared<ASTExpressionList>();
+    for (const auto & projection : projections)
+        for (const auto & projection_expr : projection.query_ast->children)
+            combined_expr_list->children.push_back(projection_expr->clone());
+
+    auto syntax_result = TreeRewriter(query_context).analyze(combined_expr_list, columns.getAllPhysical());
+    return ExpressionAnalyzer(combined_expr_list, syntax_result, query_context).getActions(false);
+}
+
+}
diff --git a/src/Storages/ProjectionsDescription.h b/src/Storages/ProjectionsDescription.h
new file mode 100644
index 00000000000..fd505c4fe06
--- /dev/null
+++ b/src/Storages/ProjectionsDescription.h
@@ -0,0 +1,132 @@
+#pragma once
+
+#include <Core/Types.h>
+
+#include <memory>
+#include <vector>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/AggregateDescription.h>
+#include <Parsers/IAST_fwd.h>
+#include <Storages/ColumnsDescription.h>
+
+#include <boost/multi_index/member.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/sequenced_index.hpp>
+#include <boost/multi_index_container.hpp>
+
+namespace DB
+{
+struct StorageInMemoryMetadata;
+using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
+
+/// Description of projections for Storage
+struct ProjectionDescription
+{
+    enum class Type
+    {
+        Normal,
+        Aggregate,
+    };
+
+    static const char * typeToString(Type type);
+
+    /// Definition AST of projection
+    ASTPtr definition_ast;
+
+    /// Subquery AST for projection calculation
+    ASTPtr query_ast;
+
+    /// Projection name
+    String name;
+
+    /// Projection type (normal, aggregate, etc.)
+    Type type = Type::Normal;
+
+    /// Columns which are required for query_ast.
+    Names required_columns;
+
+    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;
+
+    Block sample_block_for_keys;
+
+    StorageMetadataPtr metadata;
+
+    size_t key_size = 0;
+
+    /// Parse projection from definition AST
+    static ProjectionDescription
+    getProjectionFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr query_context);
+
+    ProjectionDescription() = default;
+
+    /// We need custom copy constructors because we don't want
+    /// unintentionally share AST variables and modify them.
+    ProjectionDescription(const ProjectionDescription & other) = delete;
+    ProjectionDescription(ProjectionDescription && other) = default;
+    ProjectionDescription & operator=(const ProjectionDescription & other) = delete;
+    ProjectionDescription & operator=(ProjectionDescription && other) = default;
+
+    ProjectionDescription clone() const;
+
+    bool operator==(const ProjectionDescription & other) const;
+    bool operator!=(const ProjectionDescription & other) const { return !(*this == other); }
+
+    /// Recalculate projection with new columns because projection expression may change
+    /// if something change in columns.
+    void recalculateWithNewColumns(const ColumnsDescription & new_columns, ContextPtr query_context);
+
+    bool isPrimaryKeyColumnPossiblyWrappedInFunctions(const ASTPtr & node) const;
+};
+
+/// All projections in storage
+struct ProjectionsDescription
+{
+    ProjectionsDescription() = default;
+    ProjectionsDescription(ProjectionsDescription && other) = default;
+    ProjectionsDescription & operator=(ProjectionsDescription && other) = default;
+
+    ProjectionsDescription clone() const;
+
+    /// Convert description to string
+    String toString() const;
+    /// Parse description from string
+    static ProjectionsDescription parse(const String & str, const ColumnsDescription & columns, ContextPtr query_context);
+
+    /// Return common expression for all stored projections
+    ExpressionActionsPtr getSingleExpressionForProjections(const ColumnsDescription & columns, ContextPtr query_context) const;
+
+    bool operator==(const ProjectionsDescription & other) const { return projections == other.projections; }
+    bool operator!=(const ProjectionsDescription & other) const { return !(*this == other); }
+
+    auto begin() const { return projections.begin(); }
+    auto end() const { return projections.end(); }
+
+    size_t size() const { return projections.size(); }
+    bool empty() const { return projections.empty(); }
+
+    bool has(const String & projection_name) const;
+    const ProjectionDescription & get(const String & projection_name) const;
+
+    void
+    add(ProjectionDescription && projection, const String & after_projection = String(), bool first = false, bool if_not_exists = false);
+    void remove(const String & projection_name, bool if_exists);
+
+private:
+    /// Keep the sequence of columns and allow to lookup by name.
+    using Container = std::list<ProjectionDescription>;
+    using Map = std::unordered_map<std::string, Container::iterator>;
+
+    Container projections;
+    Map map;
+};
+
+}
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
index c5c43440228..6c3d3a53c21 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
@@ -16,7 +16,7 @@ namespace DB
 RabbitMQBlockInputStream::RabbitMQBlockInputStream(
     StorageRabbitMQ & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    std::shared_ptr<Context> context_,
+    ContextPtr context_,
     const Names & columns,
     size_t max_block_size_,
     bool ack_in_suffix_)
@@ -91,7 +91,7 @@ Block RabbitMQBlockInputStream::readImpl()
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
 
     auto input_format = FormatFactory::instance().getInputFormat(
-            storage.getFormatName(), *buffer, non_virtual_header, *context, max_block_size);
+            storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
 
     InputPort port(input_format->getPort().getHeader(), input_format.get());
     connect(input_format->getPort(), port);
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
index 8b93ca4e911..5ce1c96bf33 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
+++ b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
@@ -15,7 +15,7 @@ public:
     RabbitMQBlockInputStream(
             StorageRabbitMQ & storage_,
             const StorageMetadataPtr & metadata_snapshot_,
-            std::shared_ptr<Context> context_,
+            ContextPtr context_,
             const Names & columns,
             size_t max_block_size_,
             bool ack_in_suffix = true);
@@ -38,7 +38,7 @@ public:
 private:
     StorageRabbitMQ & storage;
     StorageMetadataPtr metadata_snapshot;
-    std::shared_ptr<Context> context;
+    ContextPtr context;
     Names column_names;
     const size_t max_block_size;
     bool ack_in_suffix;
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp
index a987fff3c64..3c837cb95b1 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.cpp
@@ -11,7 +11,7 @@ namespace DB
 RabbitMQBlockOutputStream::RabbitMQBlockOutputStream(
     StorageRabbitMQ & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const Context & context_)
+    ContextPtr context_)
     : storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , context(context_)
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
index 7e5c22f9f39..3941875ea86 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
+++ b/src/Storages/RabbitMQ/RabbitMQBlockOutputStream.h
@@ -11,7 +11,7 @@ class RabbitMQBlockOutputStream : public IBlockOutputStream
 {
 
 public:
-    explicit RabbitMQBlockOutputStream(StorageRabbitMQ & storage_, const StorageMetadataPtr & metadata_snapshot_, const Context & context_);
+    explicit RabbitMQBlockOutputStream(StorageRabbitMQ & storage_, const StorageMetadataPtr & metadata_snapshot_, ContextPtr context_);
 
     Block getHeader() const override;
 
@@ -22,7 +22,7 @@ public:
 private:
     StorageRabbitMQ & storage;
     StorageMetadataPtr metadata_snapshot;
-    const Context & context;
+    ContextPtr context;
     ProducerBufferPtr buffer;
     BlockOutputStreamPtr child;
 };
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.cpp b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
index d08b4806db8..c994ab22494 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
@@ -53,4 +53,16 @@ void RabbitMQHandler::iterateLoop()
         uv_run(loop, UV_RUN_NOWAIT);
 }
 
+/// Do not need synchronization as in iterateLoop(), because this method is used only for
+/// initial RabbitMQ setup - at this point there is no background loop thread.
+void RabbitMQHandler::startBlockingLoop()
+{
+    uv_run(loop, UV_RUN_DEFAULT);
+}
+
+void RabbitMQHandler::stopLoop()
+{
+    uv_stop(loop);
+}
+
 }
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.h b/src/Storages/RabbitMQ/RabbitMQHandler.h
index 51cfbdc1144..78ccf56dec2 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.h
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.h
@@ -17,6 +17,7 @@ namespace Loop
     static const UInt8 STOP = 2;
 }
 
+
 class RabbitMQHandler : public AMQP::LibUvHandler
 {
 
@@ -26,9 +27,19 @@ public:
     void onError(AMQP::TcpConnection * connection, const char * message) override;
     void onReady(AMQP::TcpConnection * connection) override;
 
+    /// Loop for background thread worker.
     void startLoop();
+
+    /// Loop to wait for small tasks in a non-blocking mode.
+    /// Adds synchronization with main background loop.
     void iterateLoop();
 
+    /// Loop to wait for small tasks in a blocking mode.
+    /// No synchronization is done with the main loop thread.
+    void startBlockingLoop();
+
+    void stopLoop();
+
     bool connectionRunning() { return connection_running.load(); }
     bool loopRunning() { return loop_running.load(); }
 
diff --git a/src/Storages/RabbitMQ/RabbitMQSettings.h b/src/Storages/RabbitMQ/RabbitMQSettings.h
index 66348d61424..ff7c79b89c6 100644
--- a/src/Storages/RabbitMQ/RabbitMQSettings.h
+++ b/src/Storages/RabbitMQ/RabbitMQSettings.h
@@ -19,11 +19,13 @@ namespace DB
     M(UInt64, rabbitmq_num_consumers, 1, "The number of consumer channels per table.", 0) \
     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(String, rabbitmq_deadletter_exchange, "", "Exchange name to be passed as a dead-letter-exchange name.", 0) \
-    M(Bool, rabbitmq_persistent, false, "If set, delivery mode will be set to 2 (makes messages 'persistent', durable).", 0) \
+    M(Bool, rabbitmq_persistent, false, "For insert query messages will be made 'persistent', durable.", 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) \
+    M(String, rabbitmq_vhost, "/", "RabbitMQ vhost.", 0) \
+    M(String, rabbitmq_queue_settings_list, "", "A list of rabbitmq queue settings", 0) \
+    M(Bool, rabbitmq_queue_consume, false, "Use user-defined queues and do not make any RabbitMQ setup: declaring exchanges, queues, bindings", 0) \
 
 #define LIST_OF_RABBITMQ_SETTINGS(M) \
     RABBITMQ_RELATED_SETTINGS(M) \
diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
index 23e1d3f0649..1a06c5ebf60 100644
--- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
+++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
@@ -48,14 +48,15 @@ public:
     {
         String message;
         String message_id;
-        uint64_t timestamp;
-        bool redelivered;
-        AckTracker track;
+        uint64_t timestamp = 0;
+        bool redelivered = false;
+        AckTracker track{};
     };
 
     ChannelPtr & getChannel() { return consumer_channel; }
     void setupChannel();
     bool needChannelUpdate();
+    void closeChannel() { consumer_channel->close(); }
 
     void updateQueues(std::vector<String> & queues_) { queues = queues_; }
     size_t queuesCount() { return queues.size(); }
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index 0ecf85e5c3d..60f0ce313f8 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -23,6 +23,7 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
+#include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
 #include <Common/config_version.h>
@@ -42,6 +43,7 @@ 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;
+static const auto BACKOFF_TRESHOLD = 32000;
 static const auto MAX_THREAD_WORK_DURATION_MS = 60000;
 
 namespace ErrorCodes
@@ -70,34 +72,36 @@ namespace ExchangeType
 
 StorageRabbitMQ::StorageRabbitMQ(
         const StorageID & table_id_,
-        const Context & context_,
+        ContextPtr context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<RabbitMQSettings> rabbitmq_settings_)
         : IStorage(table_id_)
-        , global_context(context_.getGlobalContext())
+        , WithContext(context_->getGlobalContext())
         , rabbitmq_settings(std::move(rabbitmq_settings_))
-        , exchange_name(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_name.value))
-        , format_name(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_format.value))
-        , exchange_type(defineExchangeType(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_type.value)))
-        , routing_keys(parseRoutingKeys(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_routing_key_list.value)))
+        , 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))
         , row_delimiter(rabbitmq_settings->rabbitmq_row_delimiter.value)
-        , schema_name(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_schema.value))
+        , schema_name(rabbitmq_settings->rabbitmq_schema.value)
         , num_consumers(rabbitmq_settings->rabbitmq_num_consumers.value)
         , num_queues(rabbitmq_settings->rabbitmq_num_queues.value)
-        , queue_base(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_queue_base.value))
-        , deadletter_exchange(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_deadletter_exchange.value))
+        , queue_base(rabbitmq_settings->rabbitmq_queue_base.value)
+        , queue_settings_list(parseSettings(rabbitmq_settings->rabbitmq_queue_settings_list.value))
         , 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(global_context.getMacros()->expand(rabbitmq_settings->rabbitmq_host_port.value))
+        , address(rabbitmq_settings->rabbitmq_host_port.value)
         , parsed_address(parseAddress(address, 5672))
         , login_password(std::make_pair(
-                    global_context.getConfigRef().getString("rabbitmq.username"),
-                    global_context.getConfigRef().getString("rabbitmq.password")))
-        , vhost(global_context.getConfigRef().getString("rabbitmq.vhost", "/"))
+                    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)
 {
     event_handler = std::make_shared<RabbitMQHandler>(loop.getLoop(), log);
     restoreConnection(false);
@@ -106,18 +110,18 @@ StorageRabbitMQ::StorageRabbitMQ(
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
 
-    rabbitmq_context = addSettings(global_context);
+    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 = global_context.getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
+    looping_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
     looping_task->deactivate();
 
-    streaming_task = global_context.getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
+    streaming_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
     streaming_task->deactivate();
 
-    connection_task = global_context.getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
+    connection_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
     connection_task->deactivate();
 
     if (queue_base.empty())
@@ -147,10 +151,12 @@ StorageRabbitMQ::StorageRabbitMQ(
 }
 
 
-Names StorageRabbitMQ::parseRoutingKeys(String routing_key_list)
+Names StorageRabbitMQ::parseSettings(String settings_list)
 {
     Names result;
-    boost::split(result, routing_key_list, [](char c){ return c == ','; });
+    if (settings_list.empty())
+        return result;
+    boost::split(result, settings_list, [](char c){ return c == ','; });
     for (String & key : result)
         boost::trim(key);
 
@@ -188,10 +194,10 @@ String StorageRabbitMQ::getTableBasedName(String name, const StorageID & table_i
 }
 
 
-std::shared_ptr<Context> StorageRabbitMQ::addSettings(const Context & context) const
+std::shared_ptr<Context> StorageRabbitMQ::addSettings(ContextPtr local_context) const
 {
-    auto modified_context = std::make_shared<Context>(context);
-    modified_context->setSetting("input_format_skip_unknown_fields", true);
+    auto modified_context = Context::createCopy(local_context);
+    modified_context->setSetting("input_format_skip_unknown_fields", Field{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);
 
@@ -250,55 +256,65 @@ void StorageRabbitMQ::deactivateTask(BackgroundSchedulePool::TaskHolder & task,
 
 
 size_t StorageRabbitMQ::getMaxBlockSize() const
- {
+{
      return rabbitmq_settings->rabbitmq_max_block_size.changed
          ? rabbitmq_settings->rabbitmq_max_block_size.value
-         : (global_context.getSettingsRef().max_insert_block_size.value / num_consumers);
- }
+         : (getContext()->getSettingsRef().max_insert_block_size.value / num_consumers);
+}
 
 
 void StorageRabbitMQ::initRabbitMQ()
 {
-    setup_channel = std::make_shared<AMQP::TcpChannel>(connection.get());
+    if (use_user_setup)
+    {
+        queues.emplace_back(queue_base);
+        rabbit_is_ready = true;
+        return;
+    }
 
-    initExchange();
-    bindExchange();
+    AMQP::TcpChannel rabbit_channel(connection.get());
+
+    /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
+
+    initExchange(rabbit_channel);
+    bindExchange(rabbit_channel);
 
     for (const auto i : ext::range(0, num_queues))
-        bindQueue(i + 1);
+        bindQueue(i + 1, rabbit_channel);
 
     LOG_TRACE(log, "RabbitMQ setup completed");
-
     rabbit_is_ready = true;
-    setup_channel->close();
+    rabbit_channel.close();
 }
 
 
-void StorageRabbitMQ::initExchange()
+void StorageRabbitMQ::initExchange(AMQP::TcpChannel & rabbit_channel)
 {
-    /* Binding scheme is the following: client's exchange -> key bindings by routing key list -> bridge exchange (fanout) ->
-     * -> sharding exchange (only if needed) -> queues
-     */
-    setup_channel->declareExchange(exchange_name, exchange_type, AMQP::durable)
+    /// Exchange hierarchy:
+    /// 1. Main exchange (defined with table settings - rabbitmq_exchange_name, rabbitmq_exchange_type).
+    /// 2. Bridge exchange (fanout). Used to easily disconnect main exchange and to simplify queue bindings.
+    /// 3. Sharding (or hash) exchange. Used in case of multiple queues.
+    /// 4. Consumer exchange. Just an alias for bridge_exchange or sharding exchange to know to what exchange
+    ///    queues will be bound.
+
+    /// All exchanges are declared with options:
+    /// 1. `durable` (survive RabbitMQ server restart)
+    /// 2. `autodelete` (auto delete in case of queue bindings are dropped).
+
+    rabbit_channel.declareExchange(exchange_name, exchange_type, AMQP::durable)
     .onError([&](const char * message)
     {
-        /* This error can be a result of attempt to declare exchange if it was already declared but
-         * 1) with different exchange type. In this case can
-         * - manually delete previously declared exchange and create a new one.
-         * - throw an error that the exchange with this name but another type is already declared and ask client to delete it himself
-         *   if it is not needed anymore or use another exchange name.
-         * 2) with different exchange settings. This can only happen if client himself declared exchange with the same name and
-         * specified its own settings, which differ from this implementation.
-         */
+        /// This error can be a result of attempt to declare exchange if it was already declared but
+        /// 1) with different exchange type.
+        /// 2) with different exchange settings.
         throw Exception("Unable to declare exchange. Make sure specified exchange is not already declared. Error: "
                 + std::string(message), ErrorCodes::CANNOT_DECLARE_RABBITMQ_EXCHANGE);
     });
 
-    /// Bridge exchange is needed to easily disconnect consumer queues and also simplifies queue bindings
-    setup_channel->declareExchange(bridge_exchange, AMQP::fanout, AMQP::durable + AMQP::autodelete)
+    rabbit_channel.declareExchange(bridge_exchange, AMQP::fanout, AMQP::durable | AMQP::autodelete)
     .onError([&](const char * message)
     {
-        /// This error is not supposed to happen as this exchange name is always unique to type and its settings
+        /// This error is not supposed to happen as this exchange name is always unique to type and its settings.
         throw Exception(
             ErrorCodes::CANNOT_DECLARE_RABBITMQ_EXCHANGE, "Unable to declare bridge exchange ({}). Reason: {}", bridge_exchange, std::string(message));
     });
@@ -309,26 +325,26 @@ void StorageRabbitMQ::initExchange()
         return;
     }
 
-    /* Change hash property because by default it will be routing key, which has to be an integer, but with support for any exchange
-     * type - routing keys might be of any type
-     */
     AMQP::Table binding_arguments;
+
+    /// Default routing key property in case of hash exchange is a routing key, which is required to be an integer.
+    /// Support for arbitrary exchange type (i.e. arbitrary pattern of routing keys) requires to eliminate this dependency.
+    /// This settings changes hash property to message_id.
     binding_arguments["hash-property"] = "message_id";
 
-    /// Declare exchange for sharding.
-    setup_channel->declareExchange(sharding_exchange, AMQP::consistent_hash, AMQP::durable + AMQP::autodelete, binding_arguments)
+    /// Declare hash exchange for sharding.
+    rabbit_channel.declareExchange(sharding_exchange, AMQP::consistent_hash, AMQP::durable | AMQP::autodelete, binding_arguments)
     .onError([&](const char * message)
     {
-        /* This error can be a result of same reasons as above for exchange_name, i.e. it will mean that sharding exchange name appeared
-         * to be the same as some other exchange (which purpose is not for sharding). So probably actual error reason: queue_base parameter
-         * is bad.
-         */
+        /// This error can be a result of same reasons as above for exchange_name, i.e. it will mean that sharding exchange name appeared
+        /// to be the same as some other exchange (which purpose is not for sharding). So probably actual error reason: queue_base parameter
+        /// is bad.
         throw Exception(
            ErrorCodes::CANNOT_DECLARE_RABBITMQ_EXCHANGE,
            "Unable to declare sharding exchange ({}). Reason: {}", sharding_exchange, std::string(message));
     });
 
-    setup_channel->bindExchange(bridge_exchange, sharding_exchange, routing_keys[0])
+    rabbit_channel.bindExchange(bridge_exchange, sharding_exchange, routing_keys[0])
     .onError([&](const char * message)
     {
         throw Exception(
@@ -343,9 +359,8 @@ void StorageRabbitMQ::initExchange()
 }
 
 
-void StorageRabbitMQ::bindExchange()
+void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
 {
-    std::atomic<bool> binding_created = false;
     size_t bound_keys = 0;
 
     if (exchange_type == AMQP::ExchangeType::headers)
@@ -358,8 +373,8 @@ void StorageRabbitMQ::bindExchange()
             bind_headers[matching[0]] = matching[1];
         }
 
-        setup_channel->bindExchange(exchange_name, bridge_exchange, routing_keys[0], bind_headers)
-        .onSuccess([&]() { binding_created = true; })
+        rabbit_channel.bindExchange(exchange_name, bridge_exchange, routing_keys[0], bind_headers)
+        .onSuccess([&]() { event_handler->stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -370,8 +385,8 @@ void StorageRabbitMQ::bindExchange()
     }
     else if (exchange_type == AMQP::ExchangeType::fanout || exchange_type == AMQP::ExchangeType::consistent_hash)
     {
-        setup_channel->bindExchange(exchange_name, bridge_exchange, routing_keys[0])
-        .onSuccess([&]() { binding_created = true; })
+        rabbit_channel.bindExchange(exchange_name, bridge_exchange, routing_keys[0])
+        .onSuccess([&]() { event_handler->stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -384,12 +399,12 @@ void StorageRabbitMQ::bindExchange()
     {
         for (const auto & routing_key : routing_keys)
         {
-            setup_channel->bindExchange(exchange_name, bridge_exchange, routing_key)
+            rabbit_channel.bindExchange(exchange_name, bridge_exchange, routing_key)
             .onSuccess([&]()
             {
                 ++bound_keys;
                 if (bound_keys == routing_keys.size())
-                    binding_created = true;
+                    event_handler->stopLoop();
             })
             .onError([&](const char * message)
             {
@@ -401,17 +416,12 @@ void StorageRabbitMQ::bindExchange()
         }
     }
 
-    while (!binding_created)
-    {
-        event_handler->iterateLoop();
-    }
+    event_handler->startBlockingLoop();
 }
 
 
-void StorageRabbitMQ::bindQueue(size_t queue_id)
+void StorageRabbitMQ::bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_channel)
 {
-    std::atomic<bool> binding_created = false;
-
     auto success_callback = [&](const std::string &  queue_name, int msgcount, int /* consumercount */)
     {
         queues.emplace_back(queue_name);
@@ -424,8 +434,8 @@ void StorageRabbitMQ::bindQueue(size_t queue_id)
         * done between client's exchange and local bridge exchange. Binding key must be a string integer in case of hash exchange, for
         * fanout exchange it can be arbitrary
         */
-        setup_channel->bindQueue(consumer_exchange, queue_name, std::to_string(queue_id))
-        .onSuccess([&] { binding_created = true; })
+        rabbit_channel.bindQueue(consumer_exchange, queue_name, std::to_string(queue_id))
+        .onSuccess([&] { event_handler->stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -449,23 +459,49 @@ void StorageRabbitMQ::bindQueue(size_t queue_id)
 
     AMQP::Table queue_settings;
 
-    queue_settings["x-max-length"] = queue_size;
+    std::unordered_set<String> integer_settings = {"x-max-length", "x-max-length-bytes", "x-message-ttl", "x-expires", "x-priority", "x-max-priority"};
+    std::unordered_set<String> string_settings = {"x-overflow", "x-dead-letter-exchange", "x-queue-type"};
 
-    if (!deadletter_exchange.empty())
-        queue_settings["x-dead-letter-exchange"] = deadletter_exchange;
-    else
-        queue_settings["x-overflow"] = "reject-publish";
-
-    /* The first option not just simplifies queue_name, but also implements the possibility to be able to resume reading from one
-     * specific queue when its name is specified in queue_base setting
-     */
-    const String queue_name = !hash_exchange ? queue_base : std::to_string(queue_id) + "_" + queue_base;
-    setup_channel->declareQueue(queue_name, AMQP::durable, queue_settings).onSuccess(success_callback).onError(error_callback);
-
-    while (!binding_created)
+    /// Check user-defined settings.
+    if (!queue_settings_list.empty())
     {
-        event_handler->iterateLoop();
+        for (const auto & setting : queue_settings_list)
+        {
+            Strings setting_values;
+            splitInto<'='>(setting_values, setting);
+            if (setting_values.size() != 2)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid settings string: {}", setting);
+
+            String key = setting_values[0], value = setting_values[1];
+
+            if (integer_settings.contains(key))
+                queue_settings[key] = parse<uint64_t>(value);
+            else if (string_settings.find(key) != string_settings.end())
+                queue_settings[key] = value;
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unsupported queue setting: {}", value);
+        }
     }
+
+    /// Impose default settings if there are no user-defined settings.
+    if (!queue_settings.contains("x-max-length"))
+    {
+        queue_settings["x-max-length"] = queue_size;
+    }
+    if (!queue_settings.contains("x-overflow"))
+    {
+        queue_settings["x-overflow"] = "reject-publish";
+    }
+
+    /// If queue_base - a single name, then it can be used as one specific queue, from which to read.
+    /// Otherwise it is used as a generator (unique for current table) of queue names, because it allows to
+    /// maximize performance - via setting `rabbitmq_num_queues`.
+    const String queue_name = !hash_exchange ? queue_base : std::to_string(queue_id) + "_" + queue_base;
+
+    /// 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();
 }
 
 
@@ -537,8 +573,8 @@ void StorageRabbitMQ::unbindExchange()
         event_handler->updateLoopState(Loop::STOP);
         looping_task->deactivate();
 
-        setup_channel = std::make_shared<AMQP::TcpChannel>(connection.get());
-        setup_channel->removeExchange(bridge_exchange)
+        AMQP::TcpChannel rabbit_channel(connection.get());
+        rabbit_channel.removeExchange(bridge_exchange)
         .onSuccess([&]()
         {
             exchange_removed.store(true);
@@ -552,8 +588,7 @@ void StorageRabbitMQ::unbindExchange()
         {
             event_handler->iterateLoop();
         }
-
-        setup_channel->close();
+        rabbit_channel.close();
     });
 }
 
@@ -562,7 +597,7 @@ Pipe StorageRabbitMQ::read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & /* query_info */,
-        const Context & context,
+        ContextPtr local_context,
         QueryProcessingStage::Enum /* processed_stage */,
         size_t /* max_block_size */,
         unsigned /* num_streams */)
@@ -574,7 +609,7 @@ Pipe StorageRabbitMQ::read(
         return {};
 
     auto sample_block = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
-    auto modified_context = addSettings(context);
+    auto modified_context = addSettings(local_context);
     auto block_size = getMaxBlockSize();
 
     if (!event_handler->connectionRunning())
@@ -607,9 +642,9 @@ Pipe StorageRabbitMQ::read(
 }
 
 
-BlockOutputStreamPtr StorageRabbitMQ::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageRabbitMQ::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    return std::make_shared<RabbitMQBlockOutputStream>(*this, metadata_snapshot, context);
+    return std::make_shared<RabbitMQBlockOutputStream>(*this, metadata_snapshot, local_context);
 }
 
 
@@ -644,12 +679,27 @@ void StorageRabbitMQ::shutdown()
     stream_cancelled = true;
     wait_confirm = false;
 
-    deactivateTask(streaming_task, true, false);
-    deactivateTask(looping_task, true, true);
+    /// In case it has not yet been able to setup connection;
     deactivateTask(connection_task, true, false);
 
+    /// The order of deactivating tasks is important: wait for streamingToViews() func to finish and
+    /// then wait for background event loop to finish.
+    deactivateTask(streaming_task, true, false);
+    deactivateTask(looping_task, true, true);
+
+    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->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();
@@ -663,6 +713,40 @@ void StorageRabbitMQ::shutdown()
 }
 
 
+/// The only thing publishers are supposed to be aware of is _exchanges_ and queues are a responsibility of a consumer.
+/// Therefore, if a table is dropped, a clean up is needed.
+void StorageRabbitMQ::cleanupRabbitMQ() const
+{
+    if (use_user_setup)
+        return;
+
+    AMQP::TcpChannel rabbit_channel(connection.get());
+    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)
+        .onSuccess([&](uint32_t num_messages)
+        {
+            LOG_TRACE(log, "Successfully deleted queue {}, messages contained {}", queue, num_messages);
+            event_handler->stopLoop();
+        })
+        .onError([&](const char * message)
+        {
+            LOG_ERROR(log, "Failed to delete queue {}. Error message: {}", queue, message);
+            event_handler->stopLoop();
+        });
+    }
+    event_handler->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.
+}
+
+
 void StorageRabbitMQ::pushReadBuffer(ConsumerBufferPtr buffer)
 {
     std::lock_guard lock(buffers_mutex);
@@ -712,7 +796,7 @@ ConsumerBufferPtr StorageRabbitMQ::createReadBuffer()
 ProducerBufferPtr StorageRabbitMQ::createWriteBuffer()
 {
     return std::make_shared<WriteBufferToRabbitMQProducer>(
-        parsed_address, global_context, login_password, vhost, routing_keys, exchange_name, exchange_type,
+        parsed_address, getContext(), login_password, vhost, 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);
 }
@@ -728,7 +812,7 @@ bool StorageRabbitMQ::checkDependencies(const StorageID & table_id)
     // Check the dependencies are ready?
     for (const auto & db_tab : dependencies)
     {
-        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, global_context);
+        auto table = DatabaseCatalog::instance().tryGetTable(db_tab, getContext());
         if (!table)
             return false;
 
@@ -770,7 +854,17 @@ void StorageRabbitMQ::streamingToViewsFunc()
                     LOG_DEBUG(log, "Started streaming to {} attached views", dependencies_count);
 
                     if (streamToViews())
+                    {
+                        /// Reschedule with backoff.
+                        if (milliseconds_to_wait < BACKOFF_TRESHOLD)
+                            milliseconds_to_wait *= 2;
+                        event_handler->updateLoopState(Loop::STOP);
                         break;
+                    }
+                    else
+                    {
+                        milliseconds_to_wait = RESCHEDULE_MS;
+                    }
 
                     auto end_time = std::chrono::steady_clock::now();
                     auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time);
@@ -789,16 +883,15 @@ void StorageRabbitMQ::streamingToViewsFunc()
         }
     }
 
-    /// Wait for attached views
     if (!stream_cancelled)
-        streaming_task->scheduleAfter(RESCHEDULE_MS);
+        streaming_task->scheduleAfter(milliseconds_to_wait);
 }
 
 
 bool StorageRabbitMQ::streamToViews()
 {
     auto table_id = getStorageID();
-    auto table = DatabaseCatalog::instance().getTable(table_id, global_context);
+    auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
     if (!table)
         throw Exception("Engine table " + table_id.getNameForLogs() + " doesn't exist.", ErrorCodes::LOGICAL_ERROR);
 
@@ -807,7 +900,7 @@ bool StorageRabbitMQ::streamToViews()
     insert->table_id = table_id;
 
     // Only insert into dependent views and expect that input blocks contain virtual columns
-    InterpreterInsertQuery interpreter(insert, *rabbitmq_context, false, true, true);
+    InterpreterInsertQuery interpreter(insert, rabbitmq_context, false, true, true);
     auto block_io = interpreter.execute();
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
@@ -831,7 +924,7 @@ bool StorageRabbitMQ::streamToViews()
 
         limits.speed_limits.max_execution_time = rabbitmq_settings->rabbitmq_flush_interval_ms.changed
                                                   ? rabbitmq_settings->rabbitmq_flush_interval_ms
-                                                  : global_context.getSettingsRef().stream_flush_interval_ms;
+                                                  : getContext()->getSettingsRef().stream_flush_interval_ms;
 
         limits.timeout_overflow_mode = OverflowMode::BREAK;
 
@@ -937,6 +1030,7 @@ bool StorageRabbitMQ::streamToViews()
         looping_task->activateAndSchedule();
     }
 
+    /// Do not reschedule, do not stop event loop.
     return false;
 }
 
@@ -956,7 +1050,7 @@ void registerStorageRabbitMQ(StorageFactory & factory)
         // 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) <= 3 && !rabbitmq_settings->ARG_NAME.changed)            \
+            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);                                           \
@@ -971,9 +1065,8 @@ void registerStorageRabbitMQ(StorageFactory & factory)
             }
 
         CHECK_RABBITMQ_STORAGE_ARGUMENT(1, rabbitmq_host_port)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(2, rabbitmq_exchange_name)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(3, rabbitmq_format)
-
+        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)
@@ -981,16 +1074,17 @@ void registerStorageRabbitMQ(StorageFactory & factory)
         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_deadletter_exchange)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(12, rabbitmq_persistent)
-
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(13, rabbitmq_skip_broken_messages)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(14, rabbitmq_max_block_size)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(15, rabbitmq_flush_interval_ms)
+        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)
 
         #undef CHECK_RABBITMQ_STORAGE_ARGUMENT
 
-        return StorageRabbitMQ::create(args.table_id, args.context, args.columns, std::move(rabbitmq_settings));
+        return StorageRabbitMQ::create(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings));
     };
 
     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 9f573ea4a3e..129e231e46a 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -19,11 +19,9 @@
 namespace DB
 {
 
-class Context;
-
 using ChannelPtr = std::shared_ptr<AMQP::TcpChannel>;
 
-class StorageRabbitMQ final: public ext::shared_ptr_helper<StorageRabbitMQ>, public IStorage
+class StorageRabbitMQ final: public ext::shared_ptr_helper<StorageRabbitMQ>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageRabbitMQ>;
 
@@ -35,12 +33,19 @@ public:
     void startup() override;
     void shutdown() override;
 
+    /// This is a bad way to let storage know in shutdown() that table is going to be dropped. There are some actions which need
+    /// to be done only when table is dropped (not when detached). Also connection must be closed only in shutdown, but those
+    /// actions require an open connection. Therefore there needs to be a way inside shutdown() method to know whether it is called
+    /// because of drop query. And drop() method is not suitable at all, because it will not only require to reopen connection, but also
+    /// it can be called considerable time after table is dropped (for example, in case of Atomic database), which is not appropriate for the case.
+    void checkTableCanBeDropped() const override { drop_table = true; }
+
     /// Always return virtual columns in addition to required columns
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -48,7 +53,7 @@ public:
     BlockOutputStreamPtr write(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
-        const Context & context) override;
+        ContextPtr context) override;
 
     void pushReadBuffer(ConsumerBufferPtr buf);
     ConsumerBufferPtr popReadBuffer();
@@ -59,7 +64,7 @@ public:
     const String & getFormatName() const { return format_name; }
     NamesAndTypesList getVirtuals() const override;
 
-    const String getExchange() const { return exchange_name; }
+    String getExchange() const { return exchange_name; }
     void unbindExchange();
     bool exchangeRemoved() { return exchange_removed.load(); }
 
@@ -69,13 +74,12 @@ public:
 protected:
     StorageRabbitMQ(
             const StorageID & table_id_,
-            const Context & context_,
+            ContextPtr context_,
             const ColumnsDescription & columns_,
             std::unique_ptr<RabbitMQSettings> rabbitmq_settings_);
 
 private:
-    const Context & global_context;
-    std::shared_ptr<Context> rabbitmq_context;
+    ContextMutablePtr rabbitmq_context;
     std::unique_ptr<RabbitMQSettings> rabbitmq_settings;
 
     const String exchange_name;
@@ -87,9 +91,16 @@ private:
     size_t num_consumers;
     size_t num_queues;
     String queue_base;
-    const String deadletter_exchange;
+    Names queue_settings_list;
+
+    /// For insert query. Mark messages as durable.
     const bool persistent;
 
+    /// A table setting. It is possible not to perform any RabbitMQ setup, which is supposed to be consumer-side setup:
+    /// declaring exchanges, queues, bindings. Instead everything needed from RabbitMQ table is to connect to a specific queue.
+    /// This solution disables all optimizations and is not really optimal, but allows user to fully control all RabbitMQ setup.
+    bool use_user_setup;
+
     bool hash_exchange;
     Poco::Logger * log;
     String address;
@@ -111,12 +122,12 @@ private:
     /// maximum number of messages in RabbitMQ queue (x-max-length). Also used
     /// to setup size of inner buffer for received messages
     uint32_t queue_size;
+
     String sharding_exchange, bridge_exchange, consumer_exchange;
     size_t consumer_id = 0; /// counter for consumer buffer, needed for channel id
     std::atomic<size_t> producer_id = 1; /// counter for producer buffer, needed for channel id
     std::atomic<bool> wait_confirm = true; /// needed to break waiting for confirmations for producer
     std::atomic<bool> exchange_removed = false, rabbit_is_ready = false;
-    ChannelPtr setup_channel;
     std::vector<String> queues;
 
     std::once_flag flag; /// remove exchange only once
@@ -125,8 +136,11 @@ private:
     BackgroundSchedulePool::TaskHolder looping_task;
     BackgroundSchedulePool::TaskHolder connection_task;
 
+    uint64_t milliseconds_to_wait;
+
     std::atomic<bool> stream_cancelled{false};
     size_t read_attempts = 0;
+    mutable bool drop_table = false;
 
     ConsumerBufferPtr createReadBuffer();
 
@@ -135,18 +149,20 @@ private:
     void loopingFunc();
     void connectionFunc();
 
-    static Names parseRoutingKeys(String routing_key_list);
+    static Names parseSettings(String settings_list);
     static AMQP::ExchangeType defineExchangeType(String exchange_type_);
     static String getTableBasedName(String name, const StorageID & table_id);
 
-    std::shared_ptr<Context> addSettings(const Context & context) const;
+    std::shared_ptr<Context> addSettings(ContextPtr context) const;
     size_t getMaxBlockSize() const;
     void deactivateTask(BackgroundSchedulePool::TaskHolder & task, bool wait, bool stop_loop);
 
     void initRabbitMQ();
-    void initExchange();
-    void bindExchange();
-    void bindQueue(size_t queue_id);
+    void cleanupRabbitMQ() const;
+
+    void initExchange(AMQP::TcpChannel & rabbit_channel);
+    void bindExchange(AMQP::TcpChannel & rabbit_channel);
+    void bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_channel);
 
     bool restoreConnection(bool reconnecting);
     bool streamToViews();
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
index ebee27faf17..b9af60eb66f 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
@@ -27,7 +27,7 @@ namespace ErrorCodes
 
 WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         std::pair<String, UInt16> & parsed_address_,
-        const Context & global_context,
+        ContextPtr global_context,
         const std::pair<String, String> & login_password_,
         const String & vhost_,
         const Names & routing_keys_,
@@ -72,7 +72,7 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
                 ErrorCodes::CANNOT_CONNECT_RABBITMQ);
     }
 
-    writing_task = global_context.getSchedulePool().createTask("RabbitMQWritingTask", [this]{ writingFunc(); });
+    writing_task = global_context->getSchedulePool().createTask("RabbitMQWritingTask", [this]{ writingFunc(); });
     writing_task->deactivate();
 
     if (exchange_type == AMQP::ExchangeType::headers)
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
index e88f5e10e74..452cc38d751 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
@@ -20,7 +20,7 @@ class WriteBufferToRabbitMQProducer : public WriteBuffer
 public:
     WriteBufferToRabbitMQProducer(
             std::pair<String, UInt16> & parsed_address_,
-            const Context & global_context,
+            ContextPtr global_context,
             const std::pair<String, String> & login_password_,
             const String & vhost_,
             const Names & routing_keys_,
diff --git a/src/Storages/ReadInOrderOptimizer.cpp b/src/Storages/ReadInOrderOptimizer.cpp
index 2b751329208..3bb7034b588 100644
--- a/src/Storages/ReadInOrderOptimizer.cpp
+++ b/src/Storages/ReadInOrderOptimizer.cpp
@@ -34,7 +34,7 @@ ReadInOrderOptimizer::ReadInOrderOptimizer(
     forbidden_columns = syntax_result->getArrayJoinSourceNameSet();
 }
 
-InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr & metadata_snapshot, const Context & context) const
+InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr & metadata_snapshot, ContextPtr context) const
 {
     Names sorting_key_columns = metadata_snapshot->getSortingKeyColumns();
     if (!metadata_snapshot->hasSortingKey())
@@ -44,7 +44,7 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
     int read_direction = required_sort_description.at(0).direction;
 
     size_t prefix_size = std::min(required_sort_description.size(), sorting_key_columns.size());
-    auto aliase_columns = metadata_snapshot->getColumns().getAliases();
+    auto aliased_columns = metadata_snapshot->getColumns().getAliases();
 
     for (size_t i = 0; i < prefix_size; ++i)
     {
@@ -55,13 +55,18 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
         ///  or in some simple cases when order key element is wrapped into monotonic function.
         auto apply_order_judge = [&] (const ExpressionActions::Actions & actions, const String & sort_column)
         {
+            /// If required order depend on collation, it cannot be matched with primary key order.
+            /// Because primary keys cannot have collations.
+            if (required_sort_description[i].collator)
+                return false;
+
             int current_direction = required_sort_description[i].direction;
-            /// For the path:  order by (sort_column, ...)
+            /// For the path: order by (sort_column, ...)
             if (sort_column == sorting_key_columns[i] && current_direction == read_direction)
             {
                 return true;
             }
-            /// For the path:  order by (function(sort_column), ...)
+            /// For the path: order by (function(sort_column), ...)
             /// Allow only one simple monotonic functions with one argument
             /// Why not allow multi monotonic functions?
             else
@@ -125,7 +130,7 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
         /// currently we only support alias column without any function wrapper
         /// ie: `order by aliased_column` can have this optimization, but `order by function(aliased_column)` can not.
         /// This suits most cases.
-        if (context.getSettingsRef().optimize_respect_aliases && aliase_columns.contains(required_sort_description[i].column_name))
+        if (context->getSettingsRef().optimize_respect_aliases && aliased_columns.contains(required_sort_description[i].column_name))
         {
             auto column_expr = metadata_snapshot->getColumns().get(required_sort_description[i].column_name).default_desc.expression->clone();
             replaceAliasColumnsInQuery(column_expr, metadata_snapshot->getColumns(), forbidden_columns, context);
diff --git a/src/Storages/ReadInOrderOptimizer.h b/src/Storages/ReadInOrderOptimizer.h
index 3676f4cc88c..0af1121db32 100644
--- a/src/Storages/ReadInOrderOptimizer.h
+++ b/src/Storages/ReadInOrderOptimizer.h
@@ -22,7 +22,7 @@ public:
         const SortDescription & required_sort_description,
         const TreeRewriterResultPtr & syntax_result);
 
-    InputOrderInfoPtr getInputOrder(const StorageMetadataPtr & metadata_snapshot, const Context & context) const;
+    InputOrderInfoPtr getInputOrder(const StorageMetadataPtr & metadata_snapshot, ContextPtr context) const;
 
 private:
     /// Actions for every element of order expression to analyze functions for monotonicity
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 9b0a0c36b45..70cc173e38a 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -16,6 +16,7 @@
 #include <Parsers/ASTCreateQuery.h>
 
 #include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
 
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Pipe.h>
@@ -26,14 +27,16 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/convertFieldToType.h>
 
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Poco/Logger.h>
 #include <common/logger_useful.h>
 
 #include <rocksdb/db.h>
 #include <rocksdb/table.h>
 
+#include <filesystem>
+
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -245,24 +248,24 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata_,
         bool attach,
-        Context & context_,
+        ContextPtr context_,
         const String & primary_key_)
     : IStorage(table_id_), primary_key{primary_key_}
 {
     setInMemoryMetadata(metadata_);
-    rocksdb_dir = context_.getPath() + relative_data_path_;
+    rocksdb_dir = context_->getPath() + relative_data_path_;
     if (!attach)
     {
-        Poco::File(rocksdb_dir).createDirectories();
+        fs::create_directories(rocksdb_dir);
     }
     initDb();
 }
 
-void StorageEmbeddedRocksDB::truncate(const ASTPtr &, const StorageMetadataPtr & , const Context &, TableExclusiveLockHolder &)
+void StorageEmbeddedRocksDB::truncate(const ASTPtr &, const StorageMetadataPtr & , ContextPtr, TableExclusiveLockHolder &)
 {
     rocksdb_ptr->Close();
-    Poco::File(rocksdb_dir).remove(true);
-    Poco::File(rocksdb_dir).createDirectories();
+    fs::remove_all(rocksdb_dir);
+    fs::create_directories(rocksdb_dir);
     initDb();
 }
 
@@ -284,7 +287,7 @@ Pipe StorageEmbeddedRocksDB::read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t max_block_size,
         unsigned num_streams)
@@ -331,7 +334,7 @@ Pipe StorageEmbeddedRocksDB::read(
 }
 
 BlockOutputStreamPtr StorageEmbeddedRocksDB::write(
-    const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+    const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<EmbeddedRocksDBBlockOutputStream>(*this, metadata_snapshot);
 }
@@ -352,13 +355,13 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     if (!args.storage_def->primary_key)
         throw Exception("StorageEmbeddedRocksDB must require one column in primary key", ErrorCodes::BAD_ARGUMENTS);
 
-    metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.context);
+    metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->primary_key->ptr(), metadata.columns, args.getContext());
     auto primary_key_names = metadata.getColumnsRequiredForPrimaryKey();
     if (primary_key_names.size() != 1)
     {
         throw Exception("StorageEmbeddedRocksDB must require one column in primary key", ErrorCodes::BAD_ARGUMENTS);
     }
-    return StorageEmbeddedRocksDB::create(args.table_id, args.relative_data_path, metadata, args.attach, args.context, primary_key_names[0]);
+    return StorageEmbeddedRocksDB::create(args.table_id, args.relative_data_path, metadata, args.attach, args.getContext(), primary_key_names[0]);
 }
 
 
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index f1a8c4713eb..64255392c35 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -29,18 +29,18 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
     bool supportsParallelInsert() const override { return true; }
     bool supportsIndexForIn() const override { return true; }
     bool mayBenefitFromIndexForIn(
-        const ASTPtr & node, const Context & /*query_context*/, const StorageMetadataPtr & /*metadata_snapshot*/) const override
+        const ASTPtr & node, ContextPtr /*query_context*/, const StorageMetadataPtr & /*metadata_snapshot*/) const override
     {
         return node->getColumnName() == primary_key;
     }
@@ -53,7 +53,7 @@ protected:
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata,
         bool attach,
-        Context & context_,
+        ContextPtr context_,
         const String & primary_key_);
 
 private:
diff --git a/src/Storages/SelectQueryDescription.cpp b/src/Storages/SelectQueryDescription.cpp
index c11e6bd74f8..05747a9a260 100644
--- a/src/Storages/SelectQueryDescription.cpp
+++ b/src/Storages/SelectQueryDescription.cpp
@@ -44,11 +44,11 @@ SelectQueryDescription & SelectQueryDescription::SelectQueryDescription::operato
 namespace
 {
 
-StorageID extractDependentTableFromSelectQuery(ASTSelectQuery & query, const Context & context, bool add_default_db = true)
+StorageID extractDependentTableFromSelectQuery(ASTSelectQuery & query, ContextPtr context, bool add_default_db = true)
 {
     if (add_default_db)
     {
-        AddDefaultDatabaseVisitor visitor(context.getCurrentDatabase(), false, nullptr);
+        AddDefaultDatabaseVisitor visitor(context->getCurrentDatabase(), false, nullptr);
         visitor.visit(query);
     }
 
@@ -114,7 +114,7 @@ static bool isSingleSelect(const ASTPtr & select, ASTPtr & res)
         return isSingleSelect(new_inner_query, res);
 }
 
-SelectQueryDescription SelectQueryDescription::getSelectQueryFromASTForMatView(const ASTPtr & select, const Context & context)
+SelectQueryDescription SelectQueryDescription::getSelectQueryFromASTForMatView(const ASTPtr & select, ContextPtr context)
 {
     ASTPtr new_inner_query;
 
diff --git a/src/Storages/SelectQueryDescription.h b/src/Storages/SelectQueryDescription.h
index ce3ca44c147..28a0a186a07 100644
--- a/src/Storages/SelectQueryDescription.h
+++ b/src/Storages/SelectQueryDescription.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
 
 namespace DB
@@ -17,7 +18,7 @@ struct SelectQueryDescription
 
     /// Parse description from select query for materialized view. Also
     /// validates query.
-    static SelectQueryDescription getSelectQueryFromASTForMatView(const ASTPtr & select, const Context & context);
+    static SelectQueryDescription getSelectQueryFromASTForMatView(const ASTPtr & select, ContextPtr context);
 
     SelectQueryDescription() = default;
     SelectQueryDescription(const SelectQueryDescription & other);
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index fea9a7bad68..73cf3893a89 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -4,6 +4,9 @@
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Core/SortDescription.h>
 #include <Core/Names.h>
+#include <Storages/ProjectionsDescription.h>
+#include <Interpreters/AggregateDescription.h>
+
 #include <memory>
 
 namespace DB
@@ -110,6 +113,34 @@ struct InputOrderInfo
     bool operator !=(const InputOrderInfo & other) const { return !(*this == other); }
 };
 
+class IMergeTreeDataPart;
+
+using ManyExpressionActions = std::vector<ExpressionActionsPtr>;
+
+struct MergeTreeDataSelectCache;
+
+// The projection selected to execute current query
+struct ProjectionCandidate
+{
+    const ProjectionDescription * desc{};
+    PrewhereInfoPtr prewhere_info;
+    ActionsDAGPtr before_where;
+    String where_column_name;
+    bool remove_where_filter = false;
+    ActionsDAGPtr before_aggregation;
+    Names required_columns;
+    NamesAndTypesList aggregation_keys;
+    AggregateDescriptions aggregate_descriptions;
+    bool aggregate_overflow_row = false;
+    bool aggregate_final = false;
+    bool complete = false;
+    ReadInOrderOptimizerPtr order_optimizer;
+    InputOrderInfoPtr input_order_info;
+    ManyExpressionActions group_by_elements_actions;
+    // std::shared_ptr<MergeTreeDataSelectCache> merge_tree_data_select_base_cache;
+    // std::shared_ptr<MergeTreeDataSelectCache> merge_tree_data_select_projection_cache;
+};
+
 /** Query along with some additional data,
   *  that can be used during query processing
   *  inside storage engines.
@@ -119,9 +150,13 @@ struct SelectQueryInfo
     ASTPtr query;
     ASTPtr view_query; /// Optimized VIEW query
 
-    /// For optimize_skip_unused_shards.
-    /// Can be modified in getQueryProcessingStage()
+    /// Cluster for the query.
     ClusterPtr cluster;
+    /// Optimized cluster for the query.
+    /// In case of optimize_skip_unused_shards it may differs from original cluster.
+    ///
+    /// Configured in StorageDistributed::getQueryProcessingStage()
+    ClusterPtr optimized_cluster;
 
     TreeRewriterResultPtr syntax_analyzer_result;
 
@@ -134,6 +169,16 @@ struct SelectQueryInfo
     /// Prepared sets are used for indices by storage engine.
     /// Example: x IN (1, 2, 3)
     PreparedSets sets;
+
+    /// Cached value of ExpressionAnalysisResult::has_window
+    bool has_window = false;
+
+    ClusterPtr getCluster() const { return !optimized_cluster ? cluster : optimized_cluster; }
+
+    /// If not null, it means we choose a projection to execute current query.
+    std::optional<ProjectionCandidate> projection;
+    bool ignore_projections = false;
+    std::shared_ptr<MergeTreeDataSelectCache> merge_tree_data_select_cache;
 };
 
 }
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index 6dc32f4c880..e5af154d7bd 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -40,6 +40,11 @@ namespace ProfileEvents
     extern const Event StorageBufferPassedTimeMaxThreshold;
     extern const Event StorageBufferPassedRowsMaxThreshold;
     extern const Event StorageBufferPassedBytesMaxThreshold;
+    extern const Event StorageBufferPassedTimeFlushThreshold;
+    extern const Event StorageBufferPassedRowsFlushThreshold;
+    extern const Event StorageBufferPassedBytesFlushThreshold;
+    extern const Event StorageBufferLayerLockReadersWaitMilliseconds;
+    extern const Event StorageBufferLayerLockWritersWaitMilliseconds;
 }
 
 namespace CurrentMetrics
@@ -63,29 +68,64 @@ namespace ErrorCodes
 }
 
 
+std::unique_lock<std::mutex> StorageBuffer::Buffer::lockForReading() const
+{
+    return lockImpl(/* read= */true);
+}
+std::unique_lock<std::mutex> StorageBuffer::Buffer::lockForWriting() const
+{
+    return lockImpl(/* read= */false);
+}
+std::unique_lock<std::mutex> StorageBuffer::Buffer::tryLock() const
+{
+    std::unique_lock lock(mutex, std::try_to_lock);
+    return lock;
+}
+std::unique_lock<std::mutex> StorageBuffer::Buffer::lockImpl(bool read) const
+{
+    std::unique_lock lock(mutex, std::defer_lock);
+
+    Stopwatch watch(CLOCK_MONOTONIC_COARSE);
+    lock.lock();
+    UInt64 elapsed = watch.elapsedMilliseconds();
+
+    if (read)
+        ProfileEvents::increment(ProfileEvents::StorageBufferLayerLockReadersWaitMilliseconds, elapsed);
+    else
+        ProfileEvents::increment(ProfileEvents::StorageBufferLayerLockWritersWaitMilliseconds, elapsed);
+
+    return lock;
+}
+
+
 StorageBuffer::StorageBuffer(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_,
+    const String & comment,
+    ContextPtr context_,
     size_t num_shards_,
     const Thresholds & min_thresholds_,
     const Thresholds & max_thresholds_,
+    const Thresholds & flush_thresholds_,
     const StorageID & destination_id_,
     bool allow_materialized_)
     : IStorage(table_id_)
-    , buffer_context(context_.getBufferContext())
-    , num_shards(num_shards_), buffers(num_shards_)
+    , WithContext(context_->getBufferContext())
+    , num_shards(num_shards_)
+    , buffers(num_shards_)
     , min_thresholds(min_thresholds_)
     , max_thresholds(max_thresholds_)
+    , flush_thresholds(flush_thresholds_)
     , destination_id(destination_id_)
     , allow_materialized(allow_materialized_)
     , log(&Poco::Logger::get("StorageBuffer (" + table_id_.getFullTableName() + ")"))
-    , bg_pool(buffer_context.getBufferFlushSchedulePool())
+    , bg_pool(getContext()->getBufferFlushSchedulePool())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -111,7 +151,7 @@ protected:
             return res;
         has_been_read = true;
 
-        std::lock_guard lock(buffer.mutex);
+        std::unique_lock lock(buffer.lockForReading());
 
         if (!buffer.data.rows())
             return res;
@@ -141,16 +181,20 @@ private:
 };
 
 
-QueryProcessingStage::Enum StorageBuffer::getQueryProcessingStage(const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+QueryProcessingStage::Enum StorageBuffer::getQueryProcessingStage(
+    ContextPtr local_context,
+    QueryProcessingStage::Enum to_stage,
+    const StorageMetadataPtr &,
+    SelectQueryInfo & query_info) const
 {
     if (destination_id)
     {
-        auto destination = DatabaseCatalog::instance().getTable(destination_id, context);
+        auto destination = DatabaseCatalog::instance().getTable(destination_id, local_context);
 
         if (destination.get() == this)
             throw Exception("Destination table is myself. Read will cause infinite loop.", ErrorCodes::INFINITE_LOOP);
 
-        return destination->getQueryProcessingStage(context, to_stage, query_info);
+        return destination->getQueryProcessingStage(local_context, to_stage, destination->getInMemoryMetadataPtr(), query_info);
     }
 
     return QueryProcessingStage::FetchColumns;
@@ -161,16 +205,16 @@ Pipe StorageBuffer::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
     return plan.convertToPipe(
-        QueryPlanOptimizationSettings::fromContext(context),
-        BuildQueryPipelineSettings::fromContext(context));
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 void StorageBuffer::read(
@@ -178,19 +222,19 @@ void StorageBuffer::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned num_streams)
 {
     if (destination_id)
     {
-        auto destination = DatabaseCatalog::instance().getTable(destination_id, context);
+        auto destination = DatabaseCatalog::instance().getTable(destination_id, local_context);
 
         if (destination.get() == this)
             throw Exception("Destination table is myself. Read will cause infinite loop.", ErrorCodes::INFINITE_LOOP);
 
-        auto destination_lock = destination->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+        auto destination_lock = destination->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
         auto destination_metadata_snapshot = destination->getInMemoryMetadataPtr();
 
@@ -205,12 +249,12 @@ void StorageBuffer::read(
         if (dst_has_same_structure)
         {
             if (query_info.order_optimizer)
-                query_info.input_order_info = query_info.order_optimizer->getInputOrder(destination_metadata_snapshot, context);
+                query_info.input_order_info = query_info.order_optimizer->getInputOrder(destination_metadata_snapshot, local_context);
 
             /// The destination table has the same structure of the requested columns and we can simply read blocks from there.
             destination->read(
                 query_plan, column_names, destination_metadata_snapshot, query_info,
-                context, processed_stage, max_block_size, num_streams);
+                local_context, processed_stage, max_block_size, num_streams);
         }
         else
         {
@@ -245,7 +289,7 @@ void StorageBuffer::read(
             {
                 destination->read(
                         query_plan, columns_intersection, destination_metadata_snapshot, query_info,
-                        context, processed_stage, max_block_size, num_streams);
+                        local_context, processed_stage, max_block_size, num_streams);
 
                 if (query_plan.isInitialized())
                 {
@@ -254,7 +298,7 @@ void StorageBuffer::read(
                             query_plan.getCurrentDataStream().header,
                             header_after_adding_defaults.getNamesAndTypesList(),
                             metadata_snapshot->getColumns(),
-                            context);
+                            local_context);
 
                     auto adding_missed = std::make_unique<ExpressionStep>(
                             query_plan.getCurrentDataStream(),
@@ -317,7 +361,7 @@ void StorageBuffer::read(
     if (processed_stage > QueryProcessingStage::FetchColumns)
     {
         auto interpreter = InterpreterSelectQuery(
-                query_info.query, context, std::move(pipe_from_buffers),
+                query_info.query, local_context, std::move(pipe_from_buffers),
                 SelectQueryOptions(processed_stage));
         interpreter.buildQueryPlan(buffers_plan);
     }
@@ -391,7 +435,7 @@ void StorageBuffer::read(
     plans.emplace_back(std::make_unique<QueryPlan>(std::move(buffers_plan)));
     query_plan = QueryPlan();
 
-    auto union_step = std::make_unique<UnionStep>(std::move(input_streams), result_header);
+    auto union_step = std::make_unique<UnionStep>(std::move(input_streams));
     union_step->setStepDescription("Unite sources from Buffer table");
     query_plan.unitePlans(std::move(union_step), std::move(plans));
 }
@@ -495,22 +539,22 @@ public:
         StoragePtr destination;
         if (storage.destination_id)
         {
-            destination = DatabaseCatalog::instance().tryGetTable(storage.destination_id, storage.buffer_context);
+            destination = DatabaseCatalog::instance().tryGetTable(storage.destination_id, storage.getContext());
             if (destination.get() == &storage)
                 throw Exception("Destination table is myself. Write will cause infinite loop.", ErrorCodes::INFINITE_LOOP);
         }
 
         size_t bytes = block.bytes();
 
-        storage.writes.rows += rows;
-        storage.writes.bytes += bytes;
+        storage.lifetime_writes.rows += rows;
+        storage.lifetime_writes.bytes += bytes;
 
         /// If the block already exceeds the maximum limit, then we skip the buffer.
         if (rows > storage.max_thresholds.rows || bytes > storage.max_thresholds.bytes)
         {
             if (storage.destination_id)
             {
-                LOG_TRACE(storage.log, "Writing block with {} rows, {} bytes directly.", rows, bytes);
+                LOG_DEBUG(storage.log, "Writing block with {} rows, {} bytes directly.", rows, bytes);
                 storage.writeBlockToDestination(block, destination);
             }
             return;
@@ -528,7 +572,7 @@ public:
 
         for (size_t try_no = 0; try_no < storage.num_shards; ++try_no)
         {
-            std::unique_lock lock(storage.buffers[shard_num].mutex, std::try_to_lock);
+            std::unique_lock lock(storage.buffers[shard_num].tryLock());
 
             if (lock.owns_lock())
             {
@@ -548,7 +592,7 @@ public:
         if (!least_busy_buffer)
         {
             least_busy_buffer = &storage.buffers[start_shard_num];
-            least_busy_lock = std::unique_lock(least_busy_buffer->mutex);
+            least_busy_lock = least_busy_buffer->lockForWriting();
         }
         insertIntoBuffer(block, *least_busy_buffer);
         least_busy_lock.unlock();
@@ -569,8 +613,11 @@ private:
         if (!buffer.data)
         {
             buffer.data = sorted_block.cloneEmpty();
+
+            storage.total_writes.rows += buffer.data.rows();
+            storage.total_writes.bytes += buffer.data.allocatedBytes();
         }
-        else if (storage.checkThresholds(buffer, current_time, sorted_block.rows(), sorted_block.bytes()))
+        else if (storage.checkThresholds(buffer, /* direct= */true, current_time, sorted_block.rows(), sorted_block.bytes()))
         {
             /** If, after inserting the buffer, the constraints are exceeded, then we will reset the buffer.
               * This also protects against unlimited consumption of RAM, since if it is impossible to write to the table,
@@ -583,19 +630,25 @@ private:
         if (!buffer.first_write_time)
             buffer.first_write_time = current_time;
 
+        size_t old_rows = buffer.data.rows();
+        size_t old_bytes = buffer.data.allocatedBytes();
+
         appendBlock(sorted_block, buffer.data);
+
+        storage.total_writes.rows += (buffer.data.rows() - old_rows);
+        storage.total_writes.bytes += (buffer.data.allocatedBytes() - old_bytes);
     }
 };
 
 
-BlockOutputStreamPtr StorageBuffer::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageBuffer::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<BufferBlockOutputStream>(*this, metadata_snapshot);
 }
 
 
 bool StorageBuffer::mayBenefitFromIndexForIn(
-    const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
+    const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
 {
     if (!destination_id)
         return false;
@@ -611,7 +664,7 @@ bool StorageBuffer::mayBenefitFromIndexForIn(
 
 void StorageBuffer::startup()
 {
-    if (buffer_context.getSettingsRef().readonly)
+    if (getContext()->getSettingsRef().readonly)
     {
         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());
     }
@@ -621,7 +674,7 @@ void StorageBuffer::startup()
 }
 
 
-void StorageBuffer::shutdown()
+void StorageBuffer::flush()
 {
     if (!flush_handle)
         return;
@@ -630,7 +683,7 @@ void StorageBuffer::shutdown()
 
     try
     {
-        optimize(nullptr /*query*/, getInMemoryMetadataPtr(), {} /*partition*/, false /*final*/, false /*deduplicate*/, {}, buffer_context);
+        optimize(nullptr /*query*/, getInMemoryMetadataPtr(), {} /*partition*/, false /*final*/, false /*deduplicate*/, {}, getContext());
     }
     catch (...)
     {
@@ -656,7 +709,7 @@ bool StorageBuffer::optimize(
     bool final,
     bool deduplicate,
     const Names & /* deduplicate_by_columns */,
-    const Context & /*context*/)
+    ContextPtr /*context*/)
 {
     if (partition)
         throw Exception("Partition cannot be specified when optimizing table of type Buffer", ErrorCodes::NOT_IMPLEMENTED);
@@ -675,13 +728,13 @@ bool StorageBuffer::supportsPrewhere() const
 {
     if (!destination_id)
         return false;
-    auto dest = DatabaseCatalog::instance().tryGetTable(destination_id, buffer_context);
+    auto dest = DatabaseCatalog::instance().tryGetTable(destination_id, getContext());
     if (dest && dest.get() != this)
         return dest->supportsPrewhere();
     return false;
 }
 
-bool StorageBuffer::checkThresholds(const Buffer & buffer, time_t current_time, size_t additional_rows, size_t additional_bytes) const
+bool StorageBuffer::checkThresholds(const Buffer & buffer, bool direct, time_t current_time, size_t additional_rows, size_t additional_bytes) const
 {
     time_t time_passed = 0;
     if (buffer.first_write_time)
@@ -690,11 +743,11 @@ bool StorageBuffer::checkThresholds(const Buffer & buffer, time_t current_time,
     size_t rows = buffer.data.rows() + additional_rows;
     size_t bytes = buffer.data.bytes() + additional_bytes;
 
-    return checkThresholdsImpl(rows, bytes, time_passed);
+    return checkThresholdsImpl(direct, rows, bytes, time_passed);
 }
 
 
-bool StorageBuffer::checkThresholdsImpl(size_t rows, size_t bytes, time_t time_passed) const
+bool StorageBuffer::checkThresholdsImpl(bool direct, size_t rows, size_t bytes, time_t time_passed) const
 {
     if (time_passed > min_thresholds.time && rows > min_thresholds.rows && bytes > min_thresholds.bytes)
     {
@@ -720,6 +773,27 @@ bool StorageBuffer::checkThresholdsImpl(size_t rows, size_t bytes, time_t time_p
         return true;
     }
 
+    if (!direct)
+    {
+        if (flush_thresholds.time && time_passed > flush_thresholds.time)
+        {
+            ProfileEvents::increment(ProfileEvents::StorageBufferPassedTimeFlushThreshold);
+            return true;
+        }
+
+        if (flush_thresholds.rows && rows > flush_thresholds.rows)
+        {
+            ProfileEvents::increment(ProfileEvents::StorageBufferPassedRowsFlushThreshold);
+            return true;
+        }
+
+        if (flush_thresholds.bytes && bytes > flush_thresholds.bytes)
+        {
+            ProfileEvents::increment(ProfileEvents::StorageBufferPassedBytesFlushThreshold);
+            return true;
+        }
+    }
+
     return false;
 }
 
@@ -740,9 +814,9 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
     size_t bytes = 0;
     time_t time_passed = 0;
 
-    std::unique_lock lock(buffer.mutex, std::defer_lock);
+    std::optional<std::unique_lock<std::mutex>> lock;
     if (!locked)
-        lock.lock();
+        lock.emplace(buffer.lockForReading());
 
     block_to_write = buffer.data.cloneEmpty();
 
@@ -753,7 +827,7 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
 
     if (check_thresholds)
     {
-        if (!checkThresholdsImpl(rows, bytes, time_passed))
+        if (!checkThresholdsImpl(/* direct= */false, rows, bytes, time_passed))
             return;
     }
     else
@@ -765,14 +839,21 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
     buffer.data.swap(block_to_write);
     buffer.first_write_time = 0;
 
-    CurrentMetrics::sub(CurrentMetrics::StorageBufferRows, block_to_write.rows());
-    CurrentMetrics::sub(CurrentMetrics::StorageBufferBytes, block_to_write.bytes());
+    size_t block_rows = block_to_write.rows();
+    size_t block_bytes = block_to_write.bytes();
+    size_t block_allocated_bytes_delta = block_to_write.allocatedBytes() - buffer.data.allocatedBytes();
+
+    CurrentMetrics::sub(CurrentMetrics::StorageBufferRows, block_rows);
+    CurrentMetrics::sub(CurrentMetrics::StorageBufferBytes, block_bytes);
 
     ProfileEvents::increment(ProfileEvents::StorageBufferFlush);
 
     if (!destination_id)
     {
-        LOG_TRACE(log, "Flushing buffer with {} rows (discarded), {} bytes, age {} seconds {}.", rows, bytes, time_passed, (check_thresholds ? "(bg)" : "(direct)"));
+        total_writes.rows -= block_rows;
+        total_writes.bytes -= block_allocated_bytes_delta;
+
+        LOG_DEBUG(log, "Flushing buffer with {} rows (discarded), {} bytes, age {} seconds {}.", rows, bytes, time_passed, (check_thresholds ? "(bg)" : "(direct)"));
         return;
     }
 
@@ -786,7 +867,7 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
     Stopwatch watch;
     try
     {
-        writeBlockToDestination(block_to_write, DatabaseCatalog::instance().tryGetTable(destination_id, buffer_context));
+        writeBlockToDestination(block_to_write, DatabaseCatalog::instance().tryGetTable(destination_id, getContext()));
         if (reset_block_structure)
             buffer.data.clear();
     }
@@ -801,15 +882,18 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds, bool loc
 
         buffer.data.swap(block_to_write);
 
-        if (!buffer.first_write_time)
+        if (!buffer.first_write_time) // -V547
             buffer.first_write_time = current_time;
 
         /// After a while, the next write attempt will happen.
         throw;
     }
 
+    total_writes.rows -= block_rows;
+    total_writes.bytes -= block_allocated_bytes_delta;
+
     UInt64 milliseconds = watch.elapsedMilliseconds();
-    LOG_TRACE(log, "Flushing buffer with {} rows, {} bytes, age {} seconds, took {} ms {}.", rows, bytes, time_passed, milliseconds, (check_thresholds ? "(bg)" : "(direct)"));
+    LOG_DEBUG(log, "Flushing buffer with {} rows, {} bytes, age {} seconds, took {} ms {}.", rows, bytes, time_passed, milliseconds, (check_thresholds ? "(bg)" : "(direct)"));
 }
 
 
@@ -868,8 +952,8 @@ void StorageBuffer::writeBlockToDestination(const Block & block, StoragePtr tabl
     for (const auto & column : block_to_write)
         list_of_columns->children.push_back(std::make_shared<ASTIdentifier>(column.name));
 
-    auto insert_context = Context(buffer_context);
-    insert_context.makeQueryContext();
+    auto insert_context = Context::createCopy(getContext());
+    insert_context->makeQueryContext();
 
     InterpreterInsertQuery interpreter{insert, insert_context, allow_materialized};
 
@@ -910,7 +994,7 @@ void StorageBuffer::reschedule()
         /// try_to_lock is also ok for background flush, since if there is
         /// INSERT contended, then the reschedule will be done after
         /// INSERT will be done.
-        std::unique_lock lock(buffer.mutex, std::try_to_lock);
+        std::unique_lock lock(buffer.tryLock());
         if (lock.owns_lock())
         {
             min_first_write_time = buffer.first_write_time;
@@ -930,9 +1014,9 @@ void StorageBuffer::reschedule()
     flush_handle->scheduleAfter(std::min(min, max) * 1000);
 }
 
-void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, const Context & context) const
+void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
-    auto name_deps = getDependentViewsByColumn(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
@@ -940,7 +1024,7 @@ void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, const C
             throw Exception(
                 "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
-        if (command.type == AlterCommand::Type::DROP_COLUMN)
+        if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
             if (!deps_mv.empty())
@@ -957,47 +1041,35 @@ void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, const C
 std::optional<UInt64> StorageBuffer::totalRows(const Settings & settings) const
 {
     std::optional<UInt64> underlying_rows;
-    auto underlying = DatabaseCatalog::instance().tryGetTable(destination_id, buffer_context);
+    auto underlying = DatabaseCatalog::instance().tryGetTable(destination_id, getContext());
 
     if (underlying)
         underlying_rows = underlying->totalRows(settings);
     if (!underlying_rows)
         return underlying_rows;
 
-    UInt64 rows = 0;
-    for (const auto & buffer : buffers)
-    {
-        std::lock_guard lock(buffer.mutex);
-        rows += buffer.data.rows();
-    }
-    return rows + *underlying_rows;
+    return total_writes.rows + *underlying_rows;
 }
 
 std::optional<UInt64> StorageBuffer::totalBytes(const Settings & /*settings*/) const
 {
-    UInt64 bytes = 0;
-    for (const auto & buffer : buffers)
-    {
-        std::lock_guard lock(buffer.mutex);
-        bytes += buffer.data.allocatedBytes();
-    }
-    return bytes;
+    return total_writes.bytes;
 }
 
-void StorageBuffer::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void StorageBuffer::alter(const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
 {
     auto table_id = getStorageID();
-    checkAlterIsPossible(params, context);
+    checkAlterIsPossible(params, local_context);
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
     /// Flush all buffers to storages, so that no non-empty blocks of the old
     /// structure remain. Structure of empty blocks will be updated during first
     /// insert.
-    optimize({} /*query*/, metadata_snapshot, {} /*partition_id*/, false /*final*/, false /*deduplicate*/, {}, context);
+    optimize({} /*query*/, metadata_snapshot, {} /*partition_id*/, false /*final*/, false /*deduplicate*/, {}, local_context);
 
     StorageInMemoryMetadata new_metadata = *metadata_snapshot;
-    params.apply(new_metadata, context);
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    params.apply(new_metadata, local_context);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
 }
 
@@ -1008,25 +1080,26 @@ void registerStorageBuffer(StorageFactory & factory)
       *
       * db, table - in which table to put data from buffer.
       * num_buckets - level of parallelism.
-      * min_time, max_time, min_rows, max_rows, min_bytes, max_bytes - conditions for flushing the buffer.
+      * min_time, max_time, min_rows, max_rows, min_bytes, max_bytes - conditions for flushing the buffer,
+      * flush_time, flush_rows, flush_bytes - conditions for flushing.
       */
 
     factory.registerStorage("Buffer", [](const StorageFactory::Arguments & args)
     {
         ASTs & engine_args = args.engine_args;
 
-        if (engine_args.size() != 9)
-            throw Exception("Storage Buffer requires 9 parameters: "
-                " destination_database, destination_table, num_buckets, min_time, max_time, min_rows, max_rows, min_bytes, max_bytes.",
+        if (engine_args.size() < 9 || engine_args.size() > 12)
+            throw Exception("Storage Buffer requires from 9 to 12 parameters: "
+                " destination_database, destination_table, num_buckets, min_time, max_time, min_rows, max_rows, min_bytes, max_bytes[, flush_time, flush_rows, flush_bytes].",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         // Table and database name arguments accept expressions, evaluate them.
-        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.local_context);
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
+        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.getLocalContext());
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
 
         // After we evaluated all expressions, check that all arguments are
         // literals.
-        for (size_t i = 0; i < 9; i++)
+        for (size_t i = 0; i < engine_args.size(); i++)
         {
             if (!typeid_cast<ASTLiteral *>(engine_args[i].get()))
             {
@@ -1036,23 +1109,35 @@ void registerStorageBuffer(StorageFactory & factory)
             }
         }
 
-        String destination_database = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        String destination_table = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        size_t i = 0;
 
-        UInt64 num_buckets = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[2]->as<ASTLiteral &>().value);
+        String destination_database = engine_args[i++]->as<ASTLiteral &>().value.safeGet<String>();
+        String destination_table = engine_args[i++]->as<ASTLiteral &>().value.safeGet<String>();
 
-        Int64 min_time = applyVisitor(FieldVisitorConvertToNumber<Int64>(), engine_args[3]->as<ASTLiteral &>().value);
-        Int64 max_time = applyVisitor(FieldVisitorConvertToNumber<Int64>(), engine_args[4]->as<ASTLiteral &>().value);
-        UInt64 min_rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[5]->as<ASTLiteral &>().value);
-        UInt64 max_rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[6]->as<ASTLiteral &>().value);
-        UInt64 min_bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[7]->as<ASTLiteral &>().value);
-        UInt64 max_bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[8]->as<ASTLiteral &>().value);
+        UInt64 num_buckets = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+
+        StorageBuffer::Thresholds min;
+        StorageBuffer::Thresholds max;
+        StorageBuffer::Thresholds flush;
+
+        min.time = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        max.time = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        min.rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        max.rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        min.bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        max.bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        if (engine_args.size() > i)
+            flush.time = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        if (engine_args.size() > i)
+            flush.rows = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
+        if (engine_args.size() > i)
+            flush.bytes = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), engine_args[i++]->as<ASTLiteral &>().value);
 
         /// If destination_id is not set, do not write data from the buffer, but simply empty the buffer.
         StorageID destination_id = StorageID::createEmpty();
         if (!destination_table.empty())
         {
-            destination_id.database_name = args.context.resolveDatabase(destination_database);
+            destination_id.database_name = args.getContext()->resolveDatabase(destination_database);
             destination_id.table_name = destination_table;
         }
 
@@ -1060,12 +1145,14 @@ void registerStorageBuffer(StorageFactory & factory)
             args.table_id,
             args.columns,
             args.constraints,
-            args.context,
+            args.comment,
+            args.getContext(),
             num_buckets,
-            StorageBuffer::Thresholds{min_time, min_rows, min_bytes},
-            StorageBuffer::Thresholds{max_time, max_rows, max_bytes},
+            min,
+            max,
+            flush,
             destination_id,
-            static_cast<bool>(args.local_context.getSettingsRef().insert_allow_materialized_columns));
+            static_cast<bool>(args.getLocalContext()->getSettingsRef().insert_allow_materialized_columns));
     },
     {
         .supports_parallel_insert = true,
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index f6904ddb0e4..d9cb22ef446 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -1,15 +1,17 @@
 #pragma once
 
-#include <mutex>
-#include <atomic>
-#include <thread>
-#include <ext/shared_ptr_helper.h>
-#include <Core/NamesAndTypes.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <Storages/IStorage.h>
+#include <Core/NamesAndTypes.h>
 #include <DataStreams/IBlockOutputStream.h>
+#include <Storages/IStorage.h>
+#include <ext/shared_ptr_helper.h>
+
 #include <Poco/Event.h>
 
+#include <atomic>
+#include <mutex>
+#include <thread>
+
 
 namespace Poco { class Logger; }
 
@@ -33,33 +35,37 @@ namespace DB
   * Thresholds can be exceeded. For example, if max_rows = 1 000 000, the buffer already had 500 000 rows,
   *  and a part of 800 000 rows is added, then there will be 1 300 000 rows in the buffer, and then such a block will be written to the subordinate table.
   *
+  * There are also separate thresholds for flush, those thresholds are checked only for non-direct flush.
+  * This maybe useful if you do not want to add extra latency for INSERT queries,
+  * so you can set max_rows=1e6 and flush_rows=500e3, then each 500e3 rows buffer will be flushed in background only.
+  *
   * When you destroy a Buffer table, all remaining data is flushed to the subordinate table.
   * The data in the buffer is not replicated, not logged to disk, not indexed. With a rough restart of the server, the data is lost.
   */
-class StorageBuffer final : public ext::shared_ptr_helper<StorageBuffer>, public IStorage
+class StorageBuffer final : public ext::shared_ptr_helper<StorageBuffer>, public IStorage, WithContext
 {
 friend struct ext::shared_ptr_helper<StorageBuffer>;
 friend class BufferSource;
 friend class BufferBlockOutputStream;
 
 public:
-    /// Thresholds.
     struct Thresholds
     {
-        time_t time;    /// The number of seconds from the insertion of the first row into the block.
-        size_t rows;    /// The number of rows in the block.
-        size_t bytes;   /// The number of (uncompressed) bytes in the block.
+        time_t time = 0;  /// The number of seconds from the insertion of the first row into the block.
+        size_t rows = 0;  /// The number of rows in the block.
+        size_t bytes = 0; /// The number of (uncompressed) bytes in the block.
     };
 
     std::string getName() const override { return "Buffer"; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum
+    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageMetadataPtr &, SelectQueryInfo &) const override;
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -69,7 +75,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -78,11 +84,11 @@ public:
 
     bool supportsSubcolumns() const override { return true; }
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void startup() override;
     /// Flush all buffers into the subordinate table and stop background thread.
-    void shutdown() override;
+    void flush() override;
     bool optimize(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
@@ -90,35 +96,41 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & context) override;
+        ContextPtr context) override;
 
     bool supportsSampling() const override { return true; }
     bool supportsPrewhere() const override;
     bool supportsFinal() const override { return true; }
     bool supportsIndexForIn() const override { return true; }
 
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override;
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override;
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const override;
+    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, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
 
-    std::optional<UInt64> lifetimeRows() const override { return writes.rows; }
-    std::optional<UInt64> lifetimeBytes() const override { return writes.bytes; }
+    std::optional<UInt64> lifetimeRows() const override { return lifetime_writes.rows; }
+    std::optional<UInt64> lifetimeBytes() const override { return lifetime_writes.bytes; }
 
 
 private:
-    const Context & buffer_context;
-
     struct Buffer
     {
         time_t first_write_time = 0;
         Block data;
+
+        std::unique_lock<std::mutex> lockForReading() const;
+        std::unique_lock<std::mutex> lockForWriting() const;
+        std::unique_lock<std::mutex> tryLock() const;
+
+    private:
         mutable std::mutex mutex;
+
+        std::unique_lock<std::mutex> lockImpl(bool read) const;
     };
 
     /// There are `num_shards` of independent buffers.
@@ -127,16 +139,18 @@ private:
 
     const Thresholds min_thresholds;
     const Thresholds max_thresholds;
+    const Thresholds flush_thresholds;
 
     StorageID destination_id;
     bool allow_materialized;
 
-    /// Lifetime
-    struct LifeTimeWrites
+    struct Writes
     {
         std::atomic<size_t> rows = 0;
         std::atomic<size_t> bytes = 0;
-    } writes;
+    };
+    Writes lifetime_writes;
+    Writes total_writes;
 
     Poco::Logger * log;
 
@@ -145,8 +159,8 @@ private:
     /// are exceeded. If reset_block_structure is set - clears inner block
     /// structure inside buffer (useful in OPTIMIZE and ALTER).
     void flushBuffer(Buffer & buffer, bool check_thresholds, bool locked = false, bool reset_block_structure = false);
-    bool checkThresholds(const Buffer & buffer, time_t current_time, size_t additional_rows = 0, size_t additional_bytes = 0) const;
-    bool checkThresholdsImpl(size_t rows, size_t bytes, time_t time_passed) const;
+    bool checkThresholds(const Buffer & buffer, bool direct, time_t current_time, size_t additional_rows = 0, size_t additional_bytes = 0) const;
+    bool checkThresholdsImpl(bool direct, size_t rows, size_t bytes, time_t time_passed) const;
 
     /// `table` argument is passed, as it is sometimes evaluated beforehand. It must match the `destination`.
     void writeBlockToDestination(const Block & block, StoragePtr table);
@@ -165,10 +179,12 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_,
+        const String & comment,
+        ContextPtr context_,
         size_t num_shards_,
         const Thresholds & min_thresholds_,
         const Thresholds & max_thresholds_,
+        const Thresholds & flush_thresholds_,
         const StorageID & destination_id,
         bool allow_materialized_);
 };
diff --git a/src/Storages/StorageDictionary.cpp b/src/Storages/StorageDictionary.cpp
index 36241cd5582..5aeaff590e1 100644
--- a/src/Storages/StorageDictionary.cpp
+++ b/src/Storages/StorageDictionary.cpp
@@ -5,11 +5,13 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h>
 #include <Parsers/ASTLiteral.h>
 #include <Common/quoteString.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Pipe.h>
 #include <IO/Operators.h>
+#include <Dictionaries/getDictionaryConfigurationFromAST.h>
 
 
 namespace DB
@@ -19,6 +21,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int THERE_IS_NO_COLUMN;
     extern const int CANNOT_DETACH_DICTIONARY_AS_TABLE;
+    extern const int DICTIONARY_ALREADY_EXISTS;
 }
 
 namespace
@@ -93,30 +96,61 @@ StorageDictionary::StorageDictionary(
     const StorageID & table_id_,
     const String & dictionary_name_,
     const ColumnsDescription & columns_,
-    Location location_)
-    : IStorage(table_id_)
-    , dictionary_name(dictionary_name_)
-    , location(location_)
+    const String & comment,
+    Location location_,
+    ContextPtr context_)
+    : IStorage(table_id_), WithContext(context_->getGlobalContext()), dictionary_name(dictionary_name_), location(location_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
 
 StorageDictionary::StorageDictionary(
-    const StorageID & table_id_, const String & dictionary_name_, const DictionaryStructure & dictionary_structure_, Location location_)
-    : StorageDictionary(table_id_, dictionary_name_, ColumnsDescription{getNamesAndTypes(dictionary_structure_)}, location_)
+    const StorageID & table_id_,
+    const String & dictionary_name_,
+    const DictionaryStructure & dictionary_structure_,
+    Location location_,
+    ContextPtr context_)
+    : StorageDictionary(
+        table_id_, dictionary_name_, ColumnsDescription{getNamesAndTypes(dictionary_structure_)}, String{}, location_, context_)
 {
 }
 
+StorageDictionary::StorageDictionary(
+    const StorageID & table_id,
+    LoadablesConfigurationPtr dictionary_configuration,
+    ContextPtr context_)
+    : StorageDictionary(
+        table_id,
+        table_id.getFullNameNotQuoted(),
+        context_->getExternalDictionariesLoader().getDictionaryStructure(*dictionary_configuration),
+        Location::SameDatabaseAndNameAsDictionary,
+        context_)
+{
+    configuration = dictionary_configuration;
+
+    auto repository = std::make_unique<ExternalLoaderDictionaryStorageConfigRepository>(*this);
+    remove_repository_callback = context_->getExternalDictionariesLoader().addConfigRepository(std::move(repository));
+}
+
+StorageDictionary::~StorageDictionary()
+{
+    removeDictionaryConfigurationFromRepository();
+}
 
 void StorageDictionary::checkTableCanBeDropped() const
 {
     if (location == Location::SameDatabaseAndNameAsDictionary)
-        throw Exception("Cannot drop/detach dictionary " + backQuote(dictionary_name) + " as table, use DROP DICTIONARY or DETACH DICTIONARY query instead", ErrorCodes::CANNOT_DETACH_DICTIONARY_AS_TABLE);
+        throw Exception(ErrorCodes::CANNOT_DETACH_DICTIONARY_AS_TABLE,
+            "Cannot drop/detach dictionary {} as table, use DROP DICTIONARY or DETACH DICTIONARY query instead",
+            dictionary_name);
     if (location == Location::DictionaryDatabase)
-        throw Exception("Cannot drop/detach table " + getStorageID().getFullTableName() + " from a database with DICTIONARY engine", ErrorCodes::CANNOT_DETACH_DICTIONARY_AS_TABLE);
+        throw Exception(ErrorCodes::CANNOT_DETACH_DICTIONARY_AS_TABLE,
+            "Cannot drop/detach table from a database with DICTIONARY engine, use DROP DICTIONARY or DETACH DICTIONARY query instead",
+            dictionary_name);
 }
 
 void StorageDictionary::checkTableCanBeDetached() const
@@ -128,38 +162,131 @@ Pipe StorageDictionary::read(
     const Names & column_names,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*threads*/)
 {
-    auto dictionary = context.getExternalDictionariesLoader().getDictionary(dictionary_name, context);
+    auto dictionary = getContext()->getExternalDictionariesLoader().getDictionary(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));
 }
 
+void StorageDictionary::shutdown()
+{
+    removeDictionaryConfigurationFromRepository();
+}
+
+void StorageDictionary::startup()
+{
+    auto global_context = getContext();
+
+    bool lazy_load = global_context->getConfigRef().getBool("dictionaries_lazy_load", true);
+    if (!lazy_load)
+    {
+        const auto & external_dictionaries_loader = global_context->getExternalDictionariesLoader();
+
+        /// reloadConfig() is called here to force loading the dictionary.
+        external_dictionaries_loader.reloadConfig(getStorageID().getInternalDictionaryName());
+    }
+}
+
+void StorageDictionary::removeDictionaryConfigurationFromRepository()
+{
+    if (remove_repository_callback_executed)
+        return;
+
+    remove_repository_callback_executed = true;
+    remove_repository_callback.reset();
+}
+
+Poco::Timestamp StorageDictionary::getUpdateTime() const
+{
+    std::lock_guard<std::mutex> lock(dictionary_config_mutex);
+    return update_time;
+}
+
+LoadablesConfigurationPtr StorageDictionary::getConfiguration() const
+{
+    std::lock_guard<std::mutex> lock(dictionary_config_mutex);
+    return configuration;
+}
+
+void StorageDictionary::renameInMemory(const StorageID & new_table_id)
+{
+    if (configuration)
+    {
+        configuration->setString("dictionary.database", new_table_id.database_name);
+        configuration->setString("dictionary.name", new_table_id.table_name);
+
+        const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
+        external_dictionaries_loader.reloadConfig(getStorageID().getInternalDictionaryName());
+
+        auto result = external_dictionaries_loader.getLoadResult(getStorageID().getInternalDictionaryName());
+        if (!result.object)
+            return;
+
+        const auto dictionary = std::static_pointer_cast<const IDictionary>(result.object);
+        dictionary->updateDictionaryName(new_table_id);
+    }
+
+    IStorage::renameInMemory(new_table_id);
+}
 
 void registerStorageDictionary(StorageFactory & factory)
 {
     factory.registerStorage("Dictionary", [](const StorageFactory::Arguments & args)
     {
-        if (args.engine_args.size() != 1)
-            throw Exception("Storage Dictionary requires single parameter: name of dictionary",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+        auto query = args.query;
 
-        args.engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(args.engine_args[0], args.local_context);
-        String dictionary_name = args.engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        auto local_context = args.getLocalContext();
 
-        if (!args.attach)
+        if (query.is_dictionary)
         {
-            const auto & context = args.context;
-            const auto & dictionary = context.getExternalDictionariesLoader().getDictionary(dictionary_name, context);
-            const DictionaryStructure & dictionary_structure = dictionary->getStructure();
-            checkNamesAndTypesCompatibleWithDictionary(dictionary_name, args.columns, dictionary_structure);
-        }
+            auto dictionary_id = args.table_id;
+            auto & external_dictionaries_loader = local_context->getExternalDictionariesLoader();
 
-        return StorageDictionary::create(args.table_id, dictionary_name, args.columns, StorageDictionary::Location::Custom);
+            /// A dictionary with the same full name could be defined in *.xml config files.
+            if (external_dictionaries_loader.getCurrentStatus(dictionary_id.getFullNameNotQuoted()) != ExternalLoader::Status::NOT_EXIST)
+                throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS,
+                        "Dictionary {} already exists.", dictionary_id.getFullNameNotQuoted());
+
+            /// Create dictionary storage that owns underlying dictionary
+            auto abstract_dictionary_configuration = getDictionaryConfigurationFromAST(args.query, local_context, dictionary_id.database_name);
+            auto result_storage = StorageDictionary::create(dictionary_id, abstract_dictionary_configuration, local_context);
+
+            bool lazy_load = local_context->getConfigRef().getBool("dictionaries_lazy_load", true);
+            if (!args.attach && !lazy_load)
+            {
+                /// load() is called here to force loading the dictionary, wait until the loading is finished,
+                /// and throw an exception if the loading is failed.
+                external_dictionaries_loader.load(dictionary_id.getInternalDictionaryName());
+            }
+
+            return result_storage;
+        }
+        else
+        {
+            /// Create dictionary storage that is view of underlying dictionary
+
+            if (args.engine_args.size() != 1)
+                throw Exception("Storage Dictionary requires single parameter: name of dictionary",
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+            args.engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(args.engine_args[0], local_context);
+            String dictionary_name = args.engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+
+            if (!args.attach)
+            {
+                const auto & dictionary = args.getContext()->getExternalDictionariesLoader().getDictionary(dictionary_name, args.getContext());
+                const DictionaryStructure & dictionary_structure = dictionary->getStructure();
+                checkNamesAndTypesCompatibleWithDictionary(dictionary_name, args.columns, dictionary_structure);
+            }
+
+            return StorageDictionary::create(
+                args.table_id, dictionary_name, args.columns, args.comment, StorageDictionary::Location::Custom, local_context);
+        }
     });
 }
 
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index 563def8672b..9c92cd90d36 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -1,21 +1,26 @@
 #pragma once
 
-#include <Storages/IStorage.h>
+#include <atomic>
 #include <ext/shared_ptr_helper.h>
 
+#include <Storages/IStorage.h>
+#include <Interpreters/IExternalLoaderConfigRepository.h>
+
 
 namespace DB
 {
 struct DictionaryStructure;
 class TableFunctionDictionary;
 
-class StorageDictionary final : public ext::shared_ptr_helper<StorageDictionary>, public IStorage
+class StorageDictionary final : public ext::shared_ptr_helper<StorageDictionary>, public IStorage, public WithContext
 {
     friend struct ext::shared_ptr_helper<StorageDictionary>;
     friend class TableFunctionDictionary;
 public:
     std::string getName() const override { return "Dictionary"; }
 
+    ~StorageDictionary() override;
+
     void checkTableCanBeDropped() const override;
     void checkTableCanBeDetached() const override;
 
@@ -23,7 +28,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned threads) override;
@@ -31,7 +36,16 @@ public:
     static NamesAndTypesList getNamesAndTypes(const DictionaryStructure & dictionary_structure);
     static String generateNamesAndTypesDescription(const NamesAndTypesList & list);
 
-    const String & dictionaryName() const { return dictionary_name; }
+    bool isDictionary() const override { return true; }
+    void shutdown() override;
+    void startup() override;
+
+    void renameInMemory(const StorageID & new_table_id) override;
+
+    Poco::Timestamp getUpdateTime() const;
+    LoadablesConfigurationPtr getConfiguration() const;
+
+    const String & getDictionaryName() const { return dictionary_name; }
 
     /// Specifies where the table is located relative to the dictionary.
     enum class Location
@@ -55,18 +69,34 @@ private:
     const String dictionary_name;
     const Location location;
 
-protected:
+    mutable std::mutex dictionary_config_mutex;
+    Poco::Timestamp update_time;
+    LoadablesConfigurationPtr configuration;
+
+    std::atomic<bool> remove_repository_callback_executed = false;
+    ext::scope_guard remove_repository_callback;
+
+    void removeDictionaryConfigurationFromRepository();
+
     StorageDictionary(
         const StorageID & table_id_,
         const String & dictionary_name_,
         const ColumnsDescription & columns_,
-        Location location_);
+        const String & comment,
+        Location location_,
+        ContextPtr context_);
 
     StorageDictionary(
         const StorageID & table_id_,
         const String & dictionary_name_,
         const DictionaryStructure & dictionary_structure,
-        Location location_);
+        Location location_,
+        ContextPtr context_);
+
+    StorageDictionary(
+        const StorageID & table_id_,
+        LoadablesConfigurationPtr dictionary_configuration_,
+        ContextPtr context_);
 };
 
 }
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index 28156458342..256875454db 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -1,8 +1,11 @@
 #include <Storages/StorageDistributed.h>
 
 #include <Databases/IDatabase.h>
+
 #include <Disks/IDisk.h>
 
+#include <DataStreams/RemoteBlockInputStream.h>
+
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -31,9 +34,7 @@
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
 #include <Parsers/parseQuery.h>
-
-#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
-#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Parsers/queryToString.h>
 
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
@@ -42,6 +43,7 @@
 #include <Interpreters/InterpreterAlterQuery.h>
 #include <Interpreters/InterpreterDescribeQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/JoinedTables.h>
 #include <Interpreters/TranslateQualifiedNamesVisitor.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/Context.h>
@@ -51,8 +53,12 @@
 #include <Interpreters/getTableExpressions.h>
 #include <Functions/IFunction.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/SourceFromInputStream.h>
+#include <Processors/NullSink.h>
 
 #include <Core/Field.h>
 #include <Core/Settings.h>
@@ -60,6 +66,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
+#include <IO/ConnectionTimeoutsContext.h>
 
 #include <Poco/DirectoryIterator.h>
 
@@ -69,12 +76,16 @@
 #include <cassert>
 
 
+namespace fs = std::filesystem;
+
 namespace
 {
 const UInt64 FORCE_OPTIMIZE_SKIP_UNUSED_SHARDS_HAS_SHARDING_KEY = 1;
 const UInt64 FORCE_OPTIMIZE_SKIP_UNUSED_SHARDS_ALWAYS           = 2;
 
 const UInt64 DISTRIBUTED_GROUP_BY_NO_MERGE_AFTER_AGGREGATION = 2;
+
+const UInt64 PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL = 2;
 }
 
 namespace ProfileEvents
@@ -212,7 +223,7 @@ std::string makeFormattedListOfShards(const ClusterPtr & cluster)
     return buf.str();
 }
 
-ExpressionActionsPtr buildShardingKeyExpression(const ASTPtr & sharding_key, const Context & context, const NamesAndTypesList & columns, bool project)
+ExpressionActionsPtr buildShardingKeyExpression(const ASTPtr & sharding_key, ContextPtr context, const NamesAndTypesList & columns, bool project)
 {
     ASTPtr query = sharding_key;
     auto syntax_result = TreeRewriter(context).analyze(query, columns);
@@ -260,7 +271,7 @@ public:
 
 void replaceConstantExpressions(
     ASTPtr & node,
-    const Context & context,
+    ContextPtr context,
     const NamesAndTypesList & columns,
     ConstStoragePtr storage,
     const StorageMetadataPtr & metadata_snapshot)
@@ -272,13 +283,15 @@ void replaceConstantExpressions(
     visitor.visit(node);
 }
 
-/// Returns one of the following:
+/// 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
 /// - none (in this case regular WithMergeableState should be used)
-std::optional<QueryProcessingStage::Enum> getOptimizedQueryProcessingStage(const ASTPtr & query_ptr, bool extremes, const Block & sharding_key_block)
+std::optional<QueryProcessingStage::Enum> getOptimizedQueryProcessingStage(const SelectQueryInfo & query_info, bool extremes, const Block & sharding_key_block)
 {
-    const auto & select = query_ptr->as<ASTSelectQuery &>();
+    const auto & select = query_info.query->as<ASTSelectQuery &>();
 
     auto sharding_block_has = [&](const auto & exprs, size_t limit = SIZE_MAX) -> bool
     {
@@ -305,6 +318,10 @@ std::optional<QueryProcessingStage::Enum> getOptimizedQueryProcessingStage(const
     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 {};
@@ -377,10 +394,11 @@ StorageDistributed::StorageDistributed(
     const StorageID & id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
+    const String & comment,
     const String & remote_database_,
     const String & remote_table_,
     const String & cluster_name_,
-    const Context & context_,
+    ContextPtr context_,
     const ASTPtr & sharding_key_,
     const String & storage_policy_name_,
     const String & relative_data_path_,
@@ -388,12 +406,12 @@ StorageDistributed::StorageDistributed(
     bool attach_,
     ClusterPtr owned_cluster_)
     : IStorage(id_)
+    , WithContext(context_->getGlobalContext())
     , remote_database(remote_database_)
     , remote_table(remote_table_)
-    , global_context(context_.getGlobalContext())
     , log(&Poco::Logger::get("StorageDistributed (" + id_.table_name + ")"))
     , owned_cluster(std::move(owned_cluster_))
-    , cluster_name(global_context.getMacros()->expand(cluster_name_))
+    , cluster_name(getContext()->getMacros()->expand(cluster_name_))
     , has_sharding_key(sharding_key_)
     , relative_data_path(relative_data_path_)
     , distributed_settings(distributed_settings_)
@@ -402,18 +420,19 @@ StorageDistributed::StorageDistributed(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
     if (sharding_key_)
     {
-        sharding_key_expr = buildShardingKeyExpression(sharding_key_, global_context, storage_metadata.getColumns().getAllPhysical(), false);
+        sharding_key_expr = buildShardingKeyExpression(sharding_key_, getContext(), storage_metadata.getColumns().getAllPhysical(), false);
         sharding_key_column_name = sharding_key_->getColumnName();
         sharding_key_is_deterministic = isExpressionActionsDeterministics(sharding_key_expr);
     }
 
     if (!relative_data_path.empty())
     {
-        storage_policy = global_context.getStoragePolicy(storage_policy_name_);
+        storage_policy = getContext()->getStoragePolicy(storage_policy_name_);
         data_volume = storage_policy->getVolume(0);
         if (storage_policy->getVolumes().size() > 1)
             LOG_WARNING(log, "Storage policy for Distributed table has multiple volumes. "
@@ -423,7 +442,7 @@ StorageDistributed::StorageDistributed(
     /// Sanity check. Skip check if the table is already created to allow the server to start.
     if (!attach_ && !cluster_name.empty())
     {
-        size_t num_local_shards = global_context.getCluster(cluster_name)->getLocalShardCount();
+        size_t num_local_shards = getContext()->getCluster(cluster_name)->getLocalShardCount();
         if (num_local_shards && remote_database == id_.database_name && remote_table == id_.table_name)
             throw Exception("Distributed table " + id_.table_name + " looks at itself", ErrorCodes::INFINITE_LOOP);
     }
@@ -436,41 +455,59 @@ StorageDistributed::StorageDistributed(
     const ConstraintsDescription & constraints_,
     ASTPtr remote_table_function_ptr_,
     const String & cluster_name_,
-    const Context & context_,
+    ContextPtr context_,
     const ASTPtr & sharding_key_,
     const String & storage_policy_name_,
     const String & relative_data_path_,
     const DistributedSettings & distributed_settings_,
     bool attach,
     ClusterPtr owned_cluster_)
-    : StorageDistributed(id_, columns_, constraints_, String{}, String{}, cluster_name_, context_, sharding_key_, storage_policy_name_, relative_data_path_, distributed_settings_, attach, std::move(owned_cluster_))
+    : StorageDistributed(
+        id_,
+        columns_,
+        constraints_,
+        String{},
+        String{},
+        String{},
+        cluster_name_,
+        context_,
+        sharding_key_,
+        storage_policy_name_,
+        relative_data_path_,
+        distributed_settings_,
+        attach,
+        std::move(owned_cluster_))
 {
     remote_table_function_ptr = std::move(remote_table_function_ptr_);
 }
 
 QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
-    const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+    ContextPtr local_context,
+    QueryProcessingStage::Enum to_stage,
+    const StorageMetadataPtr & metadata_snapshot,
+    SelectQueryInfo & query_info) const
 {
-    const auto & settings = context.getSettingsRef();
-    auto metadata_snapshot = getInMemoryMetadataPtr();
+    const auto & settings = local_context->getSettingsRef();
 
     ClusterPtr cluster = getCluster();
     query_info.cluster = cluster;
 
     /// Always calculate optimized cluster here, to avoid conditions during read()
     /// (Anyway it will be calculated in the read())
-    if (settings.optimize_skip_unused_shards)
+    if (getClusterQueriedNodes(settings, cluster) > 1 && settings.optimize_skip_unused_shards)
     {
-        ClusterPtr optimized_cluster = getOptimizedCluster(context, metadata_snapshot, query_info.query);
+        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));
+            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.cluster = cluster;
+            query_info.optimized_cluster = cluster;
         }
         else
         {
-            LOG_DEBUG(log, "Unable to figure out irrelevant shards from WHERE/PREWHERE clauses - the query will be sent to all shards of the cluster{}", has_sharding_key ? "" : " (no sharding key)");
+            LOG_DEBUG(log, "Unable to figure out irrelevant shards from WHERE/PREWHERE clauses - the query will be sent to all shards of the cluster{}",
+                    has_sharding_key ? "" : " (no sharding key)");
         }
     }
 
@@ -498,7 +535,7 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
         (settings.allow_nondeterministic_optimize_skip_unused_shards || sharding_key_is_deterministic))
     {
         Block sharding_key_block = sharding_key_expr->getSampleBlock();
-        auto stage = getOptimizedQueryProcessingStage(query_info.query, settings.extremes, sharding_key_block);
+        auto stage = getOptimizedQueryProcessingStage(query_info, settings.extremes, sharding_key_block);
         if (stage)
         {
             LOG_DEBUG(log, "Force processing stage to {}", QueryProcessingStage::toString(*stage));
@@ -513,16 +550,16 @@ Pipe StorageDistributed::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
     return plan.convertToPipe(
-        QueryPlanOptimizationSettings::fromContext(context),
-        BuildQueryPipelineSettings::fromContext(context));
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 void StorageDistributed::read(
@@ -530,7 +567,7 @@ void StorageDistributed::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -539,10 +576,10 @@ void StorageDistributed::read(
         query_info.query, remote_database, remote_table, remote_table_function_ptr);
 
     Block header =
-        InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+        InterpreterSelectQuery(query_info.query, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
 
     /// Return directly (with correct header) if no shard to query.
-    if (query_info.cluster->getShardsInfo().empty())
+    if (query_info.getCluster()->getShardsInfo().empty())
     {
         Pipe pipe(std::make_shared<NullSource>(header));
         auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
@@ -552,7 +589,7 @@ void StorageDistributed::read(
         return;
     }
 
-    const Scalars & scalars = context.hasQueryContext() ? context.getQueryContext().getScalars() : Scalars{};
+    const Scalars & scalars = local_context->hasQueryContext() ? local_context->getQueryContext()->getScalars() : Scalars{};
 
     bool has_virtual_shard_num_column = std::find(column_names.begin(), column_names.end(), "_shard_num") != column_names.end();
     if (has_virtual_shard_num_column && !isVirtualColumn("_shard_num", metadata_snapshot))
@@ -560,12 +597,19 @@ void StorageDistributed::read(
 
     ClusterProxy::SelectStreamFactory select_stream_factory = remote_table_function_ptr
         ? ClusterProxy::SelectStreamFactory(
-            header, processed_stage, remote_table_function_ptr, scalars, has_virtual_shard_num_column, context.getExternalTables())
+            header, processed_stage, remote_table_function_ptr, scalars, has_virtual_shard_num_column, local_context->getExternalTables())
         : ClusterProxy::SelectStreamFactory(
-            header, processed_stage, StorageID{remote_database, remote_table}, scalars, has_virtual_shard_num_column, context.getExternalTables());
+            header,
+            processed_stage,
+            StorageID{remote_database, remote_table},
+            scalars,
+            has_virtual_shard_num_column,
+            local_context->getExternalTables());
 
     ClusterProxy::executeQuery(query_plan, select_stream_factory, log,
-        modified_query_ast, context, query_info);
+        modified_query_ast, local_context, query_info,
+        sharding_key_expr, sharding_key_column_name,
+        getCluster());
 
     /// This is a bug, it is possible only when there is no shards to query, and this is handled earlier.
     if (!query_plan.isInitialized())
@@ -573,10 +617,10 @@ void StorageDistributed::read(
 }
 
 
-BlockOutputStreamPtr StorageDistributed::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageDistributed::write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     auto cluster = getCluster();
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
 
     /// Ban an attempt to make async insert into the table belonging to DatabaseMemory
     if (!storage_policy && !owned_cluster && !settings.insert_distributed_sync && !settings.insert_shard_id)
@@ -606,16 +650,94 @@ BlockOutputStreamPtr StorageDistributed::write(const ASTPtr &, const StorageMeta
 
     /// DistributedBlockOutputStream will not own cluster, but will own ConnectionPools of the cluster
     return std::make_shared<DistributedBlockOutputStream>(
-        context, *this, metadata_snapshot,
+        local_context, *this, metadata_snapshot,
         createInsertToRemoteTableQuery(
             remote_database, remote_table, metadata_snapshot->getSampleBlockNonMaterialized()),
-        cluster, insert_sync, timeout);
+        cluster, insert_sync, timeout, StorageID{remote_database, remote_table});
 }
 
 
-void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, const Context & context) const
+QueryPipelinePtr StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
 {
-    auto name_deps = getDependentViewsByColumn(context);
+    const Settings & settings = local_context->getSettingsRef();
+    std::shared_ptr<StorageDistributed> storage_src;
+    auto & select = query.select->as<ASTSelectWithUnionQuery &>();
+    auto new_query = std::dynamic_pointer_cast<ASTInsertQuery>(query.clone());
+    if (select.list_of_selects->children.size() == 1)
+    {
+        if (auto * select_query = select.list_of_selects->children.at(0)->as<ASTSelectQuery>())
+        {
+            JoinedTables joined_tables(Context::createCopy(local_context), *select_query);
+
+            if (joined_tables.tablesCount() == 1)
+            {
+                storage_src = std::dynamic_pointer_cast<StorageDistributed>(joined_tables.getLeftTableStorage());
+                if (storage_src)
+                {
+                    const auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
+                    select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
+
+                    auto new_select_query = std::dynamic_pointer_cast<ASTSelectQuery>(select_query->clone());
+                    select_with_union_query->list_of_selects->children.push_back(new_select_query);
+
+                    new_select_query->replaceDatabaseAndTable(storage_src->getRemoteDatabaseName(), storage_src->getRemoteTableName());
+
+                    new_query->select = select_with_union_query;
+                }
+            }
+        }
+    }
+
+    if (!storage_src || storage_src->getClusterName() != getClusterName())
+    {
+        return nullptr;
+    }
+
+    if (settings.parallel_distributed_insert_select == PARALLEL_DISTRIBUTED_INSERT_SELECT_ALL)
+    {
+        new_query->table_id = StorageID(getRemoteDatabaseName(), getRemoteTableName());
+    }
+
+    const auto & cluster = getCluster();
+    const auto & shards_info = cluster->getShardsInfo();
+
+    std::vector<std::unique_ptr<QueryPipeline>> pipelines;
+
+    String new_query_str = queryToString(new_query);
+    for (size_t shard_index : ext::range(0, shards_info.size()))
+    {
+        const auto & shard_info = shards_info[shard_index];
+        if (shard_info.isLocal())
+        {
+            InterpreterInsertQuery interpreter(new_query, local_context);
+            pipelines.emplace_back(std::make_unique<QueryPipeline>(interpreter.execute().pipeline));
+        }
+        else
+        {
+            auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
+            auto connections = shard_info.pool->getMany(timeouts, &settings, PoolMode::GET_ONE);
+            if (connections.empty() || connections.front().isNull())
+                throw Exception(
+                    "Expected exactly one connection for shard " + toString(shard_info.shard_num), ErrorCodes::LOGICAL_ERROR);
+
+            ///  INSERT SELECT query returns empty block
+            auto in_stream = std::make_shared<RemoteBlockInputStream>(std::move(connections), new_query_str, Block{}, local_context);
+            pipelines.emplace_back(std::make_unique<QueryPipeline>());
+            pipelines.back()->init(Pipe(std::make_shared<SourceFromInputStream>(std::move(in_stream))));
+            pipelines.back()->setSinks([](const Block & header, QueryPipeline::StreamType) -> ProcessorPtr
+            {
+                return std::make_shared<EmptySink>(header);
+            });
+        }
+    }
+
+    return std::make_unique<QueryPipeline>(QueryPipeline::unitePipelines(std::move(pipelines)));
+}
+
+
+void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
+{
+    auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN
@@ -626,7 +748,7 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, co
 
             throw Exception("Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
-        if (command.type == AlterCommand::DROP_COLUMN)
+        if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
             if (!deps_mv.empty())
@@ -640,21 +762,21 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, co
     }
 }
 
-void StorageDistributed::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void StorageDistributed::alter(const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
 {
     auto table_id = getStorageID();
 
-    checkAlterIsPossible(params, context);
+    checkAlterIsPossible(params, local_context);
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
-    params.apply(new_metadata, context);
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    params.apply(new_metadata, local_context);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
 }
 
 
 void StorageDistributed::startup()
 {
-    if (remote_database.empty() && !remote_table_function_ptr)
+    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)
@@ -721,7 +843,7 @@ Strings StorageDistributed::getDataPaths() const
     return paths;
 }
 
-void StorageDistributed::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+void StorageDistributed::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     std::lock_guard lock(cluster_nodes_mutex);
 
@@ -744,7 +866,7 @@ StoragePolicyPtr StorageDistributed::getStoragePolicy() const
 void StorageDistributed::createDirectoryMonitors(const DiskPtr & disk)
 {
     const std::string path(disk->getPath() + relative_data_path);
-    Poco::File{path}.createDirectories();
+    fs::create_directories(path);
 
     std::filesystem::directory_iterator begin(path);
     std::filesystem::directory_iterator end;
@@ -788,7 +910,7 @@ StorageDistributedDirectoryMonitor& StorageDistributed::requireDirectoryMonitor(
             *this, disk, relative_data_path + name,
             node_data.connection_pool,
             monitors_blocker,
-            global_context.getDistributedSchedulePool());
+            getContext()->getDistributedSchedulePool());
     }
     return *node_data.directory_monitor;
 }
@@ -818,19 +940,20 @@ size_t StorageDistributed::getShardCount() const
 
 ClusterPtr StorageDistributed::getCluster() const
 {
-    return owned_cluster ? owned_cluster : global_context.getCluster(cluster_name);
+    return owned_cluster ? owned_cluster : getContext()->getCluster(cluster_name);
 }
 
-ClusterPtr StorageDistributed::getOptimizedCluster(const Context & context, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const
+ClusterPtr StorageDistributed::getOptimizedCluster(
+    ContextPtr local_context, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const
 {
     ClusterPtr cluster = getCluster();
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = local_context->getSettingsRef();
 
     bool sharding_key_is_usable = settings.allow_nondeterministic_optimize_skip_unused_shards || sharding_key_is_deterministic;
 
     if (has_sharding_key && sharding_key_is_usable)
     {
-        ClusterPtr optimized = skipUnusedShards(cluster, query_ptr, metadata_snapshot, context);
+        ClusterPtr optimized = skipUnusedShards(cluster, query_ptr, metadata_snapshot, local_context);
         if (optimized)
             return optimized;
     }
@@ -852,7 +975,7 @@ ClusterPtr StorageDistributed::getOptimizedCluster(const Context & context, cons
             throw Exception(exception_message.str(), ErrorCodes::UNABLE_TO_SKIP_UNUSED_SHARDS);
     }
 
-    return cluster;
+    return {};
 }
 
 IColumn::Selector StorageDistributed::createSelector(const ClusterPtr cluster, const ColumnWithTypeAndName & result)
@@ -887,7 +1010,7 @@ ClusterPtr StorageDistributed::skipUnusedShards(
     ClusterPtr cluster,
     const ASTPtr & query_ptr,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context) const
+    ContextPtr local_context) const
 {
     const auto & select = query_ptr->as<ASTSelectQuery &>();
 
@@ -906,9 +1029,9 @@ ClusterPtr StorageDistributed::skipUnusedShards(
         condition_ast = select.prewhere() ? select.prewhere()->clone() : select.where()->clone();
     }
 
-    replaceConstantExpressions(condition_ast, context, metadata_snapshot->getColumns().getAll(), shared_from_this(), metadata_snapshot);
+    replaceConstantExpressions(condition_ast, local_context, metadata_snapshot->getColumns().getAll(), shared_from_this(), metadata_snapshot);
 
-    size_t limit = context.getSettingsRef().optimize_skip_unused_shards_limit;
+    size_t limit = local_context->getSettingsRef().optimize_skip_unused_shards_limit;
     if (!limit || limit > SSIZE_MAX)
     {
         throw Exception("optimize_skip_unused_shards_limit out of range (0, {}]", ErrorCodes::ARGUMENT_OUT_OF_BOUND, SSIZE_MAX);
@@ -922,7 +1045,7 @@ ClusterPtr StorageDistributed::skipUnusedShards(
         LOG_TRACE(log,
             "Number of values for sharding key exceeds optimize_skip_unused_shards_limit={}, "
             "try to increase it, but note that this may increase query processing time.",
-            context.getSettingsRef().optimize_skip_unused_shards_limit);
+            local_context->getSettingsRef().optimize_skip_unused_shards_limit);
         return nullptr;
     }
 
@@ -955,10 +1078,10 @@ ActionLock StorageDistributed::getActionLock(StorageActionBlockType type)
     return {};
 }
 
-void StorageDistributed::flushClusterNodesAllData(const Context & context)
+void StorageDistributed::flushClusterNodesAllData(ContextPtr local_context)
 {
     /// Sync SYSTEM FLUSH DISTRIBUTED with TRUNCATE
-    auto table_lock = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto table_lock = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
     std::vector<std::shared_ptr<StorageDistributedDirectoryMonitor>> directory_monitors;
 
@@ -1033,7 +1156,7 @@ void StorageDistributed::delayInsertOrThrowIfNeeded() const
         !distributed_settings.bytes_to_delay_insert)
         return;
 
-    UInt64 total_bytes = *totalBytes(global_context.getSettingsRef());
+    UInt64 total_bytes = *totalBytes(getContext()->getSettingsRef());
 
     if (distributed_settings.bytes_to_throw_insert && total_bytes > distributed_settings.bytes_to_throw_insert)
     {
@@ -1054,12 +1177,12 @@ void StorageDistributed::delayInsertOrThrowIfNeeded() const
         do {
             delayed_ms += step_ms;
             std::this_thread::sleep_for(std::chrono::milliseconds(step_ms));
-        } while (*totalBytes(global_context.getSettingsRef()) > distributed_settings.bytes_to_delay_insert && delayed_ms < distributed_settings.max_delay_to_insert*1000);
+        } while (*totalBytes(getContext()->getSettingsRef()) > distributed_settings.bytes_to_delay_insert && delayed_ms < distributed_settings.max_delay_to_insert*1000);
 
         ProfileEvents::increment(ProfileEvents::DistributedDelayedInserts);
         ProfileEvents::increment(ProfileEvents::DistributedDelayedInsertsMilliseconds, delayed_ms);
 
-        UInt64 new_total_bytes = *totalBytes(global_context.getSettingsRef());
+        UInt64 new_total_bytes = *totalBytes(getContext()->getSettingsRef());
         LOG_INFO(log, "Too many bytes pending for async INSERT: was {}, now {}, INSERT was delayed to {} ms",
             formatReadableSizeWithBinarySuffix(total_bytes),
             formatReadableSizeWithBinarySuffix(new_total_bytes),
@@ -1109,8 +1232,8 @@ void registerStorageDistributed(StorageFactory & factory)
 
         String cluster_name = getClusterNameAndMakeLiteral(engine_args[0]);
 
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
-        engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context);
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
+        engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
 
         String remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
         String remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
@@ -1121,7 +1244,7 @@ void registerStorageDistributed(StorageFactory & factory)
         /// Check that sharding_key exists in the table and has numeric type.
         if (sharding_key)
         {
-            auto sharding_expr = buildShardingKeyExpression(sharding_key, args.context, args.columns.getAllPhysical(), true);
+            auto sharding_expr = buildShardingKeyExpression(sharding_key, args.getContext(), args.columns.getAllPhysical(), true);
             const Block & block = sharding_expr->getSampleBlock();
 
             if (block.columns() != 1)
@@ -1153,9 +1276,14 @@ void registerStorageDistributed(StorageFactory & factory)
         }
 
         return StorageDistributed::create(
-            args.table_id, args.columns, args.constraints,
-            remote_database, remote_table, cluster_name,
-            args.context,
+            args.table_id,
+            args.columns,
+            args.constraints,
+            args.comment,
+            remote_database,
+            remote_table,
+            cluster_name,
+            args.getContext(),
             sharding_key,
             storage_policy,
             args.relative_data_path,
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 5904124505a..9849ce7625c 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -36,7 +36,7 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
   * You can pass one address, not several.
   * In this case, the table can be considered remote, rather than distributed.
   */
-class StorageDistributed final : public ext::shared_ptr_helper<StorageDistributed>, public IStorage
+class StorageDistributed final : public ext::shared_ptr_helper<StorageDistributed>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageDistributed>;
     friend class DistributedBlockOutputStream;
@@ -51,17 +51,19 @@ public:
     bool supportsSampling() const override { return true; }
     bool supportsFinal() const override { return true; }
     bool supportsPrewhere() const override { return true; }
+    bool supportsSubcolumns() const override { return true; }
     StoragePolicyPtr getStoragePolicy() const override;
 
     bool isRemote() const override { return true; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum
+    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageMetadataPtr &, SelectQueryInfo &) const override;
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -71,7 +73,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/) override;
@@ -79,18 +81,20 @@ public:
     bool supportsParallelInsert() const override { return true; }
     std::optional<UInt64> totalBytes(const Settings &) const override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
+
+    QueryPipelinePtr distributedWrite(const ASTInsertQuery & query, ContextPtr context) override;
 
     /// Removes temporary data in local filesystem.
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
     /// 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, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     void startup() override;
     void shutdown() override;
@@ -111,7 +115,7 @@ public:
     ClusterPtr getCluster() const;
 
     /// Used by InterpreterSystemQuery
-    void flushClusterNodesAllData(const Context & context);
+    void flushClusterNodesAllData(ContextPtr context);
 
     /// Used by ClusterCopier
     size_t getShardCount() const;
@@ -121,10 +125,11 @@ private:
         const StorageID & id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         const String & remote_database_,
         const String & remote_table_,
         const String & cluster_name_,
-        const Context & context_,
+        ContextPtr context_,
         const ASTPtr & sharding_key_,
         const String & storage_policy_name_,
         const String & relative_data_path_,
@@ -138,7 +143,7 @@ private:
         const ConstraintsDescription & constraints_,
         ASTPtr remote_table_function_ptr_,
         const String & cluster_name_,
-        const Context & context_,
+        ContextPtr context_,
         const ASTPtr & sharding_key_,
         const String & storage_policy_name_,
         const String & relative_data_path_,
@@ -163,12 +168,13 @@ private:
     /// Used by StorageSystemDistributionQueue
     std::vector<StorageDistributedDirectoryMonitor::Status> getDirectoryMonitorsStatuses() const;
 
-    static IColumn::Selector createSelector(const ClusterPtr cluster, const ColumnWithTypeAndName & result);
+    static IColumn::Selector createSelector(ClusterPtr cluster, const ColumnWithTypeAndName & result);
     /// Apply the following settings:
     /// - optimize_skip_unused_shards
     /// - force_optimize_skip_unused_shards
-    ClusterPtr getOptimizedCluster(const Context &, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const;
-    ClusterPtr skipUnusedShards(ClusterPtr cluster, const ASTPtr & query_ptr, const StorageMetadataPtr & metadata_snapshot, const Context & context) const;
+    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;
 
     size_t getRandomShardIndex(const Cluster::ShardsInfo & shards);
 
@@ -176,12 +182,10 @@ private:
 
     void delayInsertOrThrowIfNeeded() const;
 
-private:
     String remote_database;
     String remote_table;
     ASTPtr remote_table_function_ptr;
 
-    const Context & global_context;
     Poco::Logger * log;
 
     /// Used to implement TableFunctionRemote.
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
new file mode 100644
index 00000000000..32b9c7e9245
--- /dev/null
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -0,0 +1,279 @@
+#include "StorageExternalDistributed.h"
+
+
+#include <Storages/StorageFactory.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#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 <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>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+}
+
+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 ColumnsDescription & columns_,
+    const ConstraintsDescription & constraints_,
+    const String & comment,
+    ContextPtr context)
+    : IStorage(table_id_)
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns_);
+    storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
+    setInMemoryMetadata(storage_metadata);
+
+    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+    std::vector<String> shards_descriptions = parseRemoteDescription(cluster_description, 0, cluster_description.size(), ',', max_addresses);
+    std::vector<std::pair<std::string, UInt16>> addresses;
+
+#if USE_MYSQL || USE_LIBPQXX
+
+    /// For each shard pass replicas description into storage, replicas are managed by storage's PoolWithFailover.
+    for (const auto & shard_description : shards_descriptions)
+    {
+        StoragePtr shard;
+
+        switch (table_engine)
+        {
+#if USE_MYSQL
+            case ExternalStorageEngine::MySQL:
+            {
+                addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 3306);
+
+                mysqlxx::PoolWithFailover pool(
+                    remote_database,
+                    addresses,
+                    username, password);
+
+                shard = StorageMySQL::create(
+                    table_id_,
+                    std::move(pool),
+                    remote_database,
+                    remote_table,
+                    /* replace_query = */ false,
+                    /* on_duplicate_clause = */ "",
+                    columns_,
+                    constraints_,
+                    String{},
+                    context,
+                    MySQLSettings{});
+                break;
+            }
+#endif
+#if USE_LIBPQXX
+
+            case ExternalStorageEngine::PostgreSQL:
+            {
+                addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 5432);
+
+                auto pool = std::make_shared<postgres::PoolWithFailover>(
+                    remote_database,
+                    addresses,
+                    username, password,
+                    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);
+                break;
+            }
+#endif
+            default:
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Unsupported table engine. Supported engines are: MySQL, PostgreSQL, URL");
+            }
+        }
+
+        shards.emplace(std::move(shard));
+    }
+
+#else
+    (void)table_engine;
+    (void)remote_database;
+    (void)remote_table;
+    (void)username;
+    (void)password;
+    (void)shards_descriptions;
+    (void)addresses;
+#endif
+}
+
+
+StorageExternalDistributed::StorageExternalDistributed(
+            const String & addresses_description,
+            const StorageID & table_id,
+            const String & format_name,
+            const std::optional<FormatSettings> & format_settings,
+            const String & compression_method,
+            const ColumnsDescription & columns,
+            const ConstraintsDescription & constraints,
+            ContextPtr context)
+        : IStorage(table_id)
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns);
+    storage_metadata.setConstraints(constraints);
+    setInMemoryMetadata(storage_metadata);
+
+    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+    /// Generate addresses without splitting for failover options
+    std::vector<String> url_descriptions = parseRemoteDescription(addresses_description, 0, addresses_description.size(), ',', max_addresses);
+    std::vector<String> uri_options;
+
+    for (const auto & url_description : url_descriptions)
+    {
+        /// For each uri (which acts like shard) check if it has failover options
+        uri_options = parseRemoteDescription(url_description, 0, url_description.size(), '|', max_addresses);
+        StoragePtr shard;
+
+        if (uri_options.size() > 1)
+        {
+            shard = std::make_shared<StorageURLWithFailover>(
+                uri_options,
+                table_id,
+                format_name,
+                format_settings,
+                columns, constraints, context,
+                compression_method);
+        }
+        else
+        {
+            Poco::URI uri(url_description);
+            shard = std::make_shared<StorageURL>(
+                uri, table_id, format_name, format_settings, columns, constraints, String{}, context, compression_method);
+
+            LOG_DEBUG(&Poco::Logger::get("StorageURLDistributed"), "Adding URL: {}", url_description);
+        }
+
+        shards.emplace(std::move(shard));
+    }
+}
+
+
+Pipe StorageExternalDistributed::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)
+{
+    Pipes pipes;
+    for (const auto & shard : shards)
+    {
+        pipes.emplace_back(shard->read(
+            column_names,
+            metadata_snapshot,
+            query_info,
+            context,
+            processed_stage,
+            max_block_size,
+            num_streams
+        ));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+
+void registerStorageExternalDistributed(StorageFactory & factory)
+{
+    factory.registerStorage("ExternalDistributed", [](const StorageFactory::Arguments & args)
+    {
+        ASTs & engine_args = args.engine_args;
+
+        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>();
+
+        StorageExternalDistributed::ExternalStorageEngine table_engine;
+        if (engine_name == "URL")
+        {
+            table_engine = StorageExternalDistributed::ExternalStorageEngine::URL;
+
+            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,
+                args.table_id,
+                format_name,
+                format_settings,
+                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);
+
+            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,
+                args.columns,
+                args.constraints,
+                args.comment,
+                args.getContext());
+        }
+    },
+    {
+        .source_access_type = AccessType::SOURCES,
+    });
+}
+
+}
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
new file mode 100644
index 00000000000..00ec868b460
--- /dev/null
+++ b/src/Storages/StorageExternalDistributed.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#include "config_core.h"
+#endif
+
+#include <ext/shared_ptr_helper.h>
+#include <Storages/IStorage.h>
+
+
+namespace DB
+{
+
+/// 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`
+class StorageExternalDistributed final : public ext::shared_ptr_helper<StorageExternalDistributed>, public DB::IStorage
+{
+    friend struct ext::shared_ptr_helper<StorageExternalDistributed>;
+
+public:
+    enum class ExternalStorageEngine
+    {
+        MySQL,
+        PostgreSQL,
+        URL
+    };
+
+    std::string getName() const override { return "ExternalDistributed"; }
+
+    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;
+
+protected:
+    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 ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        const String & comment,
+        ContextPtr context_);
+
+    StorageExternalDistributed(
+        const String & addresses_description,
+        const StorageID & table_id,
+        const String & format_name,
+        const std::optional<FormatSettings> & format_settings,
+        const String & compression_method,
+        const ColumnsDescription & columns,
+        const ConstraintsDescription & constraints,
+        ContextPtr context);
+
+private:
+    using Shards = std::unordered_set<StoragePtr>;
+    Shards shards;
+};
+
+}
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index 7aaec9b7e76..5ca423b449a 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -31,6 +31,23 @@ static void checkAllTypesAreAllowedInTable(const NamesAndTypesList & names_and_t
 }
 
 
+ContextMutablePtr StorageFactory::Arguments::getContext() const
+{
+    auto ptr = context.lock();
+    if (!ptr)
+        throw Exception("Context has expired", ErrorCodes::LOGICAL_ERROR);
+    return ptr;
+}
+
+ContextMutablePtr StorageFactory::Arguments::getLocalContext() const
+{
+    auto ptr = local_context.lock();
+    if (!ptr)
+        throw Exception("Context has expired", ErrorCodes::LOGICAL_ERROR);
+    return ptr;
+}
+
+
 void StorageFactory::registerStorage(const std::string & name, CreatorFn creator_fn, StorageFeatures features)
 {
     if (!storages.emplace(name, Creator{std::move(creator_fn), features}).second)
@@ -42,13 +59,13 @@ void StorageFactory::registerStorage(const std::string & name, CreatorFn creator
 StoragePtr StorageFactory::get(
     const ASTCreateQuery & query,
     const String & relative_data_path,
-    Context & local_context,
-    Context & context,
+    ContextMutablePtr local_context,
+    ContextMutablePtr context,
     const ColumnsDescription & columns,
     const ConstraintsDescription & constraints,
     bool has_force_restore_data_flag) const
 {
-    String name;
+    String name, comment;
     ASTStorage * storage_def = query.storage;
 
     bool has_engine_args = false;
@@ -62,12 +79,18 @@ StoragePtr StorageFactory::get(
     }
     else if (query.is_live_view)
     {
-
         if (query.storage)
             throw Exception("Specifying ENGINE is not allowed for a LiveView", ErrorCodes::INCORRECT_QUERY);
 
         name = "LiveView";
     }
+    else if (query.is_dictionary)
+    {
+        if (query.storage)
+            throw Exception("Specifying ENGINE is not allowed for a Dictionary", ErrorCodes::INCORRECT_QUERY);
+
+        name = "Dictionary";
+    }
     else
     {
         /// Check for some special types, that are not allowed to be stored in tables. Example: NULL data type.
@@ -123,6 +146,9 @@ 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>();
+
             auto check_feature = [&](String feature_description, FeatureMatcherFn feature_matcher_fn)
             {
                 if (!feature_matcher_fn(it->second.features))
@@ -160,12 +186,16 @@ StoragePtr StorageFactory::get(
                 check_feature(
                     "skipping indices",
                     [](StorageFeatures features) { return features.supports_skipping_indices; });
+
+            if (query.columns_list && query.columns_list->projections && !query.columns_list->projections->children.empty())
+                check_feature(
+                    "projections",
+                    [](StorageFeatures features) { return features.supports_projections; });
         }
     }
 
     ASTs empty_engine_args;
-    Arguments arguments
-    {
+    Arguments arguments{
         .engine_name = name,
         .engine_args = has_engine_args ? storage_def->engine->arguments->children : empty_engine_args,
         .storage_def = storage_def,
@@ -177,12 +207,13 @@ StoragePtr StorageFactory::get(
         .columns = columns,
         .constraints = constraints,
         .attach = query.attach,
-        .has_force_restore_data_flag = has_force_restore_data_flag
-    };
-    assert(&arguments.context == &arguments.context.getGlobalContext());
+        .has_force_restore_data_flag = has_force_restore_data_flag,
+        .comment = comment};
+
+    assert(arguments.getContext() == arguments.getContext()->getGlobalContext());
 
     auto res = storages.at(name).creator_fn(arguments);
-    if (!empty_engine_args.empty())
+    if (!empty_engine_args.empty()) //-V547
     {
         /// Storage creator modified empty arguments list, so we should modify the query
         assert(storage_def && storage_def->engine && !storage_def->engine->arguments);
@@ -191,8 +222,8 @@ StoragePtr StorageFactory::get(
         storage_def->engine->arguments->children = empty_engine_args;
     }
 
-    if (local_context.hasQueryContext() && context.getSettingsRef().log_queries)
-        local_context.getQueryContext().addQueryFactoriesInfo(Context::QueryLogFactories::Storage, name);
+    if (local_context->hasQueryContext() && context->getSettingsRef().log_queries)
+        local_context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Storage, name);
 
     return res;
 }
diff --git a/src/Storages/StorageFactory.h b/src/Storages/StorageFactory.h
index 18dd24e10db..bdc57bfdc6d 100644
--- a/src/Storages/StorageFactory.h
+++ b/src/Storages/StorageFactory.h
@@ -39,12 +39,16 @@ public:
         /// Relative to <path> from server config (possibly <path> of some <disk> of some <volume> for *MergeTree)
         const String & relative_data_path;
         const StorageID & table_id;
-        Context & local_context;
-        Context & context;
+        ContextWeakMutablePtr local_context;
+        ContextWeakMutablePtr context;
         const ColumnsDescription & columns;
         const ConstraintsDescription & constraints;
         bool attach;
         bool has_force_restore_data_flag;
+        const String & comment;
+
+        ContextMutablePtr getContext() const;
+        ContextMutablePtr getLocalContext() const;
     };
 
     /// Analog of the IStorage::supports*() helpers
@@ -53,6 +57,7 @@ public:
     {
         bool supports_settings = false;
         bool supports_skipping_indices = false;
+        bool supports_projections = false;
         bool supports_sort_order = false;
         bool supports_ttl = false;
         /// See also IStorage::supportsReplication()
@@ -76,8 +81,8 @@ public:
     StoragePtr get(
         const ASTCreateQuery & query,
         const String & relative_data_path,
-        Context & local_context,
-        Context & context,
+        ContextMutablePtr local_context,
+        ContextMutablePtr context,
         const ColumnsDescription & columns,
         const ConstraintsDescription & constraints,
         bool has_force_restore_data_flag) const;
@@ -87,6 +92,7 @@ public:
     void registerStorage(const std::string & name, CreatorFn creator_fn, StorageFeatures features = StorageFeatures{
         .supports_settings = false,
         .supports_skipping_indices = false,
+        .supports_projections = false,
         .supports_sort_order = false,
         .supports_ttl = false,
         .supports_replication = false,
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 5524569e1f0..aac1b708567 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -22,13 +22,12 @@
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
 #include <Common/parseGlobs.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/StorageInMemoryMetadata.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <Poco/Path.h>
-#include <Poco/File.h>
-
 #include <re2/re2.h>
 #include <filesystem>
 #include <Storages/Distributed/DirectoryMonitor.h>
@@ -37,6 +36,7 @@
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Pipe.h>
 
+
 namespace fs = std::filesystem;
 
 namespace DB
@@ -76,10 +76,9 @@ std::vector<std::string> listFilesWithRegexpMatching(const std::string & path_fo
 
     std::vector<std::string> result;
     const std::string prefix_without_globs = path_for_ls + for_match.substr(1, end_of_path_without_globs);
-    if (!fs::exists(fs::path(prefix_without_globs)))
-    {
+    if (!fs::exists(prefix_without_globs))
         return result;
-    }
+
     const fs::directory_iterator end;
     for (fs::directory_iterator it(prefix_without_globs); it != end; ++it)
     {
@@ -100,7 +99,7 @@ std::vector<std::string> listFilesWithRegexpMatching(const std::string & path_fo
             if (re2::RE2::FullMatch(file_name, matcher))
             {
                 /// Recursion depth is limited by pattern. '*' works only for depth = 1, for depth = 2 pattern path is '*/*'. So we do not need additional check.
-                Strings result_part = listFilesWithRegexpMatching(full_path + "/", suffix_with_globs.substr(next_slash));
+                Strings result_part = listFilesWithRegexpMatching(fs::path(full_path) / "", suffix_with_globs.substr(next_slash));
                 std::move(result_part.begin(), result_part.end(), std::back_inserter(result));
             }
         }
@@ -114,30 +113,29 @@ std::string getTablePath(const std::string & table_dir_path, const std::string &
 }
 
 /// Both db_dir_path and table_path must be converted to absolute paths (in particular, path cannot contain '..').
-void checkCreationIsAllowed(const Context & context_global, const std::string & db_dir_path, const std::string & table_path)
+void checkCreationIsAllowed(ContextPtr context_global, const std::string & db_dir_path, const std::string & table_path)
 {
-    if (context_global.getApplicationType() != Context::ApplicationType::SERVER)
+    if (context_global->getApplicationType() != Context::ApplicationType::SERVER)
         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);
 
-    Poco::File table_path_poco_file = Poco::File(table_path);
-    if (table_path_poco_file.exists() && table_path_poco_file.isDirectory())
+    if (fs::exists(table_path) && fs::is_directory(table_path))
         throw Exception("File must not be a directory", ErrorCodes::INCORRECT_FILE_NAME);
 }
 }
 
-Strings StorageFile::getPathsList(const String & table_path, const String & user_files_path, const Context & context)
+Strings StorageFile::getPathsList(const String & table_path, const String & user_files_path, ContextPtr context)
 {
-    String user_files_absolute_path = Poco::Path(user_files_path).makeAbsolute().makeDirectory().toString();
-    Poco::Path poco_path = Poco::Path(table_path);
-    if (poco_path.isRelative())
-        poco_path = Poco::Path(user_files_absolute_path, poco_path);
+    fs::path user_files_absolute_path = fs::weakly_canonical(user_files_path);
+    fs::path fs_table_path(table_path);
+    if (fs_table_path.is_relative())
+        fs_table_path = user_files_absolute_path / fs_table_path;
 
     Strings paths;
-    const String path = poco_path.absolute().toString();
+    const String path = fs::weakly_canonical(fs_table_path);
     if (path.find_first_of("*?{") == std::string::npos)
         paths.push_back(path);
     else
@@ -149,10 +147,15 @@ Strings StorageFile::getPathsList(const String & table_path, const String & user
     return paths;
 }
 
+bool StorageFile::isColumnOriented() const
+{
+    return format_name != "Distributed" && FormatFactory::instance().checkIfFormatIsColumnOriented(format_name);
+}
+
 StorageFile::StorageFile(int table_fd_, CommonArguments args)
     : StorageFile(args)
 {
-    if (args.context.getApplicationType() == Context::ApplicationType::SERVER)
+    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")
         throw Exception("Distributed format is allowed only with explicit file path", ErrorCodes::INCORRECT_FILE_NAME);
@@ -170,7 +173,7 @@ StorageFile::StorageFile(const std::string & table_path_, const std::string & us
     : StorageFile(args)
 {
     is_db_table = false;
-    paths = getPathsList(table_path_, user_files_path, args.context);
+    paths = getPathsList(table_path_, user_files_path, args.getContext());
 
     if (args.format_name == "Distributed")
     {
@@ -197,8 +200,8 @@ StorageFile::StorageFile(const std::string & relative_table_dir_path, CommonArgu
     if (args.format_name == "Distributed")
         throw Exception("Distributed format is allowed only with explicit file path", ErrorCodes::INCORRECT_FILE_NAME);
 
-    String table_dir_path = base_path + relative_table_dir_path + "/";
-    Poco::File(table_dir_path).createDirectories();
+    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)};
 }
 
@@ -207,26 +210,29 @@ StorageFile::StorageFile(CommonArguments args)
     , format_name(args.format_name)
     , format_settings(args.format_settings)
     , compression_method(args.compression_method)
-    , base_path(args.context.getPath())
+    , base_path(args.getContext()->getPath())
 {
     StorageInMemoryMetadata storage_metadata;
     if (args.format_name != "Distributed")
         storage_metadata.setColumns(args.columns);
 
     storage_metadata.setConstraints(args.constraints);
+    storage_metadata.setComment(args.comment);
     setInMemoryMetadata(storage_metadata);
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
     return std::chrono::seconds{lock_timeout};
 }
 
+using StorageFilePtr = std::shared_ptr<StorageFile>;
+
 
 class StorageFileSource : public SourceWithProgress
 {
@@ -257,14 +263,26 @@ public:
         return header;
     }
 
+    static Block getBlockForSource(
+        const StorageFilePtr & storage,
+        const StorageMetadataPtr & metadata_snapshot,
+        const ColumnsDescription & columns_description,
+        const FilesInfoPtr & files_info)
+    {
+        if (storage->isColumnOriented())
+            return metadata_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical(), storage->getVirtuals(), storage->getStorageID());
+        else
+            return getHeader(metadata_snapshot, files_info->need_path_column, files_info->need_file_column);
+    }
+
     StorageFileSource(
         std::shared_ptr<StorageFile> storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const Context & context_,
+        ContextPtr context_,
         UInt64 max_block_size_,
         FilesInfoPtr files_info_,
         ColumnsDescription columns_description_)
-        : SourceWithProgress(getHeader(metadata_snapshot_, files_info_->need_path_column, files_info_->need_file_column))
+        : SourceWithProgress(getBlockForSource(storage_, metadata_snapshot_, columns_description_, files_info_))
         , storage(std::move(storage_))
         , metadata_snapshot(metadata_snapshot_)
         , files_info(std::move(files_info_))
@@ -344,8 +362,16 @@ public:
                 }
 
                 read_buf = wrapReadBufferWithCompressionMethod(std::move(nested_buffer), method);
+
+                auto get_block_for_format = [&]() -> Block
+                {
+                    if (storage->isColumnOriented())
+                        return metadata_snapshot->getSampleBlockForColumns(columns_description.getNamesOfPhysical());
+                    return metadata_snapshot->getSampleBlock();
+                };
+
                 auto format = FormatFactory::instance().getInput(
-                        storage->format_name, *read_buf, metadata_snapshot->getSampleBlock(), context, max_block_size, storage->format_settings);
+                    storage->format_name, *read_buf, get_block_for_format(), context, max_block_size, storage->format_settings);
 
                 reader = std::make_shared<InputStreamFromInputFormat>(format);
 
@@ -403,7 +429,7 @@ private:
 
     ColumnsDescription columns_description;
 
-    const Context & context;    /// TODO Untangle potential issues with context lifetime.
+    ContextPtr context;    /// TODO Untangle potential issues with context lifetime.
     UInt64 max_block_size;
 
     bool finished_generate = false;
@@ -412,12 +438,11 @@ private:
     std::unique_lock<std::shared_timed_mutex> unique_lock;
 };
 
-
 Pipe StorageFile::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
@@ -427,9 +452,9 @@ Pipe StorageFile::read(
     if (use_table_fd)   /// need to call ctr BlockInputStream
         paths = {""};   /// when use fd, paths are empty
     else
-        if (paths.size() == 1 && !Poco::File(paths[0]).exists())
+        if (paths.size() == 1 && !fs::exists(paths[0]))
         {
-            if (context.getSettingsRef().engine_file_empty_if_not_exists)
+            if (context->getSettingsRef().engine_file_empty_if_not_exists)
                 return Pipe(std::make_shared<NullSource>(metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));
             else
                 throw Exception("File " + paths[0] + " doesn't exist", ErrorCodes::FILE_DOESNT_EXIST);
@@ -457,9 +482,16 @@ Pipe StorageFile::read(
 
     for (size_t i = 0; i < num_streams; ++i)
     {
+        const auto get_columns_for_format = [&]() -> ColumnsDescription
+        {
+            if (isColumnOriented())
+                return ColumnsDescription{
+                    metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID()).getNamesAndTypesList()};
+            else
+                return metadata_snapshot->getColumns();
+        };
         pipes.emplace_back(std::make_shared<StorageFileSource>(
-            this_ptr, metadata_snapshot, context, max_block_size, files_info,
-            metadata_snapshot->getColumns()));
+            this_ptr, metadata_snapshot, context, max_block_size, files_info, get_columns_for_format()));
     }
 
     return Pipe::unitePipes(std::move(pipes));
@@ -474,7 +506,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot_,
         std::unique_lock<std::shared_timed_mutex> && lock_,
         const CompressionMethod compression_method,
-        const Context & context,
+        ContextPtr context,
         const std::optional<FormatSettings> & format_settings,
         int & flags)
         : storage(storage_)
@@ -549,7 +581,7 @@ private:
 BlockOutputStreamPtr StorageFile::write(
     const ASTPtr & /*query*/,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context)
+    ContextPtr context)
 {
     if (format_name == "Distributed")
         throw Exception("Method write is not implemented for Distributed format", ErrorCodes::NOT_IMPLEMENTED);
@@ -557,13 +589,13 @@ BlockOutputStreamPtr StorageFile::write(
     int flags = 0;
 
     std::string path;
-    if (context.getSettingsRef().engine_file_truncate_on_insert)
+    if (context->getSettingsRef().engine_file_truncate_on_insert)
         flags |= O_TRUNC;
 
     if (!paths.empty())
     {
         path = paths[0];
-        Poco::File(Poco::Path(path).makeParent()).createDirectories();
+        fs::create_directories(fs::path(path).parent_path());
     }
 
     return std::make_shared<StorageFileBlockOutputStream>(
@@ -600,8 +632,8 @@ void StorageFile::rename(const String & new_path_to_table_data, const StorageID
     if (path_new == paths[0])
         return;
 
-    Poco::File(Poco::Path(path_new).parent()).createDirectories();
-    Poco::File(paths[0]).renameTo(path_new);
+    fs::create_directories(fs::path(path_new).parent_path());
+    fs::rename(paths[0], path_new);
 
     paths[0] = std::move(path_new);
     renameInMemory(new_table_id);
@@ -610,7 +642,7 @@ void StorageFile::rename(const String & new_path_to_table_data, const StorageID
 void StorageFile::truncate(
     const ASTPtr & /*query*/,
     const StorageMetadataPtr & /* metadata_snapshot */,
-    const Context & /* context */,
+    ContextPtr /* context */,
     TableExclusiveLockHolder &)
 {
     if (paths.size() != 1)
@@ -623,7 +655,7 @@ void StorageFile::truncate(
     }
     else
     {
-        if (!Poco::File(paths[0]).exists())
+        if (!fs::exists(paths[0]))
             return;
 
         if (0 != ::truncate(paths[0].c_str(), 0))
@@ -643,11 +675,16 @@ void registerStorageFile(StorageFactory & factory)
         "File",
         [](const StorageFactory::Arguments & factory_args)
         {
-            StorageFile::CommonArguments storage_args{
-                .table_id = factory_args.table_id,
-                .columns = factory_args.columns,
-                .constraints = factory_args.constraints,
-                .context = factory_args.context
+            StorageFile::CommonArguments storage_args
+            {
+                WithContext(factory_args.getContext()),
+                factory_args.table_id,
+                {},
+                {},
+                {},
+                factory_args.columns,
+                factory_args.constraints,
+                factory_args.comment,
             };
 
             ASTs & engine_args_ast = factory_args.engine_args;
@@ -657,7 +694,7 @@ void registerStorageFile(StorageFactory & factory)
                     "Storage File requires from 1 to 3 arguments: name of used format, source and compression_method.",
                     ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-            engine_args_ast[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[0], factory_args.local_context);
+            engine_args_ast[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[0], factory_args.getLocalContext());
             storage_args.format_name = engine_args_ast[0]->as<ASTLiteral &>().value.safeGet<String>();
 
             // Use format settings from global server context + settings from
@@ -669,7 +706,7 @@ void registerStorageFile(StorageFactory & factory)
 
                 // Apply changed settings from global context, but ignore the
                 // unknown ones, because we only have the format settings here.
-                const auto & changes = factory_args.context.getSettingsRef().changes();
+                const auto & changes = factory_args.getContext()->getSettingsRef().changes();
                 for (const auto & change : changes)
                 {
                     if (user_format_settings.has(change.name))
@@ -683,12 +720,12 @@ void registerStorageFile(StorageFactory & factory)
                     factory_args.storage_def->settings->changes);
 
                 storage_args.format_settings = getFormatSettings(
-                    factory_args.context, user_format_settings);
+                    factory_args.getContext(), user_format_settings);
             }
             else
             {
                 storage_args.format_settings = getFormatSettings(
-                    factory_args.context);
+                    factory_args.getContext());
             }
 
             if (engine_args_ast.size() == 1) /// Table in database
@@ -725,7 +762,7 @@ void registerStorageFile(StorageFactory & factory)
 
             if (engine_args_ast.size() == 3)
             {
-                engine_args_ast[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[2], factory_args.local_context);
+                engine_args_ast[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args_ast[2], factory_args.getLocalContext());
                 storage_args.compression_method = engine_args_ast[2]->as<ASTLiteral &>().value.safeGet<String>();
             }
             else
@@ -734,7 +771,7 @@ void registerStorageFile(StorageFactory & factory)
             if (0 <= source_fd) /// File descriptor
                 return StorageFile::create(source_fd, storage_args);
             else /// User's file
-                return StorageFile::create(source_path, factory_args.context.getUserFilesPath(), storage_args);
+                return StorageFile::create(source_path, factory_args.getContext()->getUserFilesPath(), storage_args);
         },
         storage_features);
 }
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index c316412f808..91758931ed1 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -1,10 +1,6 @@
 #pragma once
 
 #include <Storages/IStorage.h>
-
-#include <Poco/File.h>
-#include <Poco/Path.h>
-
 #include <common/logger_useful.h>
 
 #include <atomic>
@@ -28,7 +24,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -36,12 +32,12 @@ public:
     BlockOutputStreamPtr write(
         const ASTPtr & query,
         const StorageMetadataPtr & /*metadata_snapshot*/,
-        const Context & context) override;
+        ContextPtr context) override;
 
     void truncate(
         const ASTPtr & /*query*/,
         const StorageMetadataPtr & /* metadata_snapshot */,
-        const Context & /* context */,
+        ContextPtr /* context */,
         TableExclusiveLockHolder &) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
@@ -49,7 +45,7 @@ public:
     bool storesDataOnDisk() const override;
     Strings getDataPaths() const override;
 
-    struct CommonArguments
+    struct CommonArguments : public WithContext
     {
         StorageID table_id;
         std::string format_name;
@@ -57,12 +53,18 @@ public:
         std::string compression_method;
         const ColumnsDescription & columns;
         const ConstraintsDescription & constraints;
-        const Context & context;
+        const String & comment;
     };
 
     NamesAndTypesList getVirtuals() const override;
 
-    static Strings getPathsList(const String & table_path, const String & user_files_path, const Context & context);
+    static Strings getPathsList(const String & table_path, const String & user_files_path, ContextPtr context);
+
+    /// Check if the format is column-oriented.
+    /// Is is useful because column oriented formats could effectively skip unknown columns
+    /// So we can create a header of only required columns in read method and ask
+    /// format to read only them. Note: this hack cannot be done with ordinary formats like TSV.
+    bool isColumnOriented() const;
 
 protected:
     friend class StorageFileSource;
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index f06daa3a2bd..abe288bd999 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -65,7 +65,7 @@ ColumnPtr fillColumnWithRandomData(
     UInt64 max_array_length,
     UInt64 max_string_length,
     pcg64 & rng,
-    const Context & context)
+    ContextPtr context)
 {
     TypeIndex idx = type->getTypeId();
 
@@ -213,10 +213,7 @@ ColumnPtr fillColumnWithRandomData(
         {
             auto column = ColumnUInt16::create();
             column->getData().resize(limit);
-
-            for (size_t i = 0; i < limit; ++i)
-                column->getData()[i] = rng() % (DATE_LUT_MAX_DAY_NUM + 1);
-
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt16), rng);
             return column;
         }
         case TypeIndex::UInt32: [[fallthrough]];
@@ -234,14 +231,28 @@ ColumnPtr fillColumnWithRandomData(
             fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt64), rng);
             return column;
         }
-        case TypeIndex::UInt128: [[fallthrough]];
-        case TypeIndex::UUID:
+        case TypeIndex::UInt128:
         {
             auto column = ColumnUInt128::create();
             column->getData().resize(limit);
             fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt128), rng);
             return column;
         }
+        case TypeIndex::UInt256:
+        {
+            auto column = ColumnUInt256::create();
+            column->getData().resize(limit);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UInt256), rng);
+            return column;
+        }
+        case TypeIndex::UUID:
+        {
+            auto column = ColumnUUID::create();
+            column->getData().resize(limit);
+            /// NOTE This is slightly incorrect as random UUIDs should have fixed version 4.
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(UUID), rng);
+            return column;
+        }
         case TypeIndex::Int8:
         {
             auto column = ColumnInt8::create();
@@ -270,6 +281,20 @@ ColumnPtr fillColumnWithRandomData(
             fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int64), rng);
             return column;
         }
+        case TypeIndex::Int128:
+        {
+            auto column = ColumnInt128::create();
+            column->getData().resize(limit);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int128), rng);
+            return column;
+        }
+        case TypeIndex::Int256:
+        {
+            auto column = ColumnInt256::create();
+            column->getData().resize(limit);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column->getData().data()), limit * sizeof(Int256), rng);
+            return column;
+        }
         case TypeIndex::Float32:
         {
             auto column = ColumnFloat32::create();
@@ -308,6 +333,14 @@ ColumnPtr fillColumnWithRandomData(
             fillBufferWithRandomData(reinterpret_cast<char *>(column_concrete.getData().data()), limit * sizeof(Decimal128), rng);
             return column;
         }
+        case TypeIndex::Decimal256:
+        {
+            auto column = type->createColumn();
+            auto & column_concrete = typeid_cast<ColumnDecimal<Decimal256> &>(*column);
+            column_concrete.getData().resize(limit);
+            fillBufferWithRandomData(reinterpret_cast<char *>(column_concrete.getData().data()), limit * sizeof(Decimal256), rng);
+            return column;
+        }
         case TypeIndex::FixedString:
         {
             size_t n = typeid_cast<const DataTypeFixedString &>(*type).getN();
@@ -339,7 +372,7 @@ ColumnPtr fillColumnWithRandomData(
 class GenerateSource : public SourceWithProgress
 {
 public:
-    GenerateSource(UInt64 block_size_, UInt64 max_array_length_, UInt64 max_string_length_, UInt64 random_seed_, Block block_header_, const Context & context_)
+    GenerateSource(UInt64 block_size_, UInt64 max_array_length_, UInt64 max_string_length_, UInt64 random_seed_, Block block_header_, ContextPtr context_)
         : SourceWithProgress(Nested::flatten(prepareBlockToFill(block_header_)))
         , block_size(block_size_), max_array_length(max_array_length_), max_string_length(max_string_length_)
         , block_to_fill(std::move(block_header_)), rng(random_seed_), context(context_) {}
@@ -367,7 +400,7 @@ private:
 
     pcg64 rng;
 
-    const Context & context;
+    ContextPtr context;
 
     static Block & prepareBlockToFill(Block & block)
     {
@@ -385,8 +418,13 @@ private:
 }
 
 
-StorageGenerateRandom::StorageGenerateRandom(const StorageID & table_id_, const ColumnsDescription & columns_,
-    UInt64 max_array_length_, UInt64 max_string_length_, std::optional<UInt64> random_seed_)
+StorageGenerateRandom::StorageGenerateRandom(
+    const StorageID & table_id_,
+    const ColumnsDescription & columns_,
+    const String & comment,
+    UInt64 max_array_length_,
+    UInt64 max_string_length_,
+    std::optional<UInt64> random_seed_)
     : IStorage(table_id_), max_array_length(max_array_length_), max_string_length(max_string_length_)
 {
     static constexpr size_t MAX_ARRAY_SIZE = 1 << 30;
@@ -402,6 +440,7 @@ StorageGenerateRandom::StorageGenerateRandom(const StorageID & table_id_, const
     random_seed = random_seed_ ? sipHash64(*random_seed_) : randomSeed();
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -434,7 +473,7 @@ void registerStorageGenerateRandom(StorageFactory & factory)
         if (engine_args.size() == 3)
             max_array_length = engine_args[2]->as<const ASTLiteral &>().value.safeGet<UInt64>();
 
-        return StorageGenerateRandom::create(args.table_id, args.columns, max_array_length, max_string_length, random_seed);
+        return StorageGenerateRandom::create(args.table_id, args.columns, args.comment, max_array_length, max_string_length, random_seed);
     });
 }
 
@@ -442,7 +481,7 @@ Pipe StorageGenerateRandom::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
diff --git a/src/Storages/StorageGenerateRandom.h b/src/Storages/StorageGenerateRandom.h
index 965c5b3a9d3..4a4015ebc0d 100644
--- a/src/Storages/StorageGenerateRandom.h
+++ b/src/Storages/StorageGenerateRandom.h
@@ -19,7 +19,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -30,8 +30,13 @@ private:
     UInt64 random_seed = 0;
 
 protected:
-    StorageGenerateRandom(const StorageID & table_id_, const ColumnsDescription & columns_,
-        UInt64 max_array_length, UInt64 max_string_length, std::optional<UInt64> random_seed);
+    StorageGenerateRandom(
+        const StorageID & table_id_,
+        const ColumnsDescription & columns_,
+        const String & comment,
+        UInt64 max_array_length,
+        UInt64 max_string_length,
+        std::optional<UInt64> random_seed);
 };
 
 }
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index 871ff38c07f..39081648248 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -27,6 +27,7 @@ StorageInMemoryMetadata::StorageInMemoryMetadata(const StorageInMemoryMetadata &
     : columns(other.columns)
     , secondary_indices(other.secondary_indices)
     , constraints(other.constraints)
+    , projections(other.projections.clone())
     , partition_key(other.partition_key)
     , primary_key(other.primary_key)
     , sorting_key(other.sorting_key)
@@ -35,6 +36,7 @@ StorageInMemoryMetadata::StorageInMemoryMetadata(const StorageInMemoryMetadata &
     , table_ttl(other.table_ttl)
     , settings_changes(other.settings_changes ? other.settings_changes->clone() : nullptr)
     , select(other.select)
+    , comment(other.comment)
 {
 }
 
@@ -46,6 +48,7 @@ StorageInMemoryMetadata & StorageInMemoryMetadata::operator=(const StorageInMemo
     columns = other.columns;
     secondary_indices = other.secondary_indices;
     constraints = other.constraints;
+    projections = other.projections.clone();
     partition_key = other.partition_key;
     primary_key = other.primary_key;
     sorting_key = other.sorting_key;
@@ -57,9 +60,14 @@ StorageInMemoryMetadata & StorageInMemoryMetadata::operator=(const StorageInMemo
     else
         settings_changes.reset();
     select = other.select;
+    comment = other.comment;
     return *this;
 }
 
+void StorageInMemoryMetadata::setComment(const String & comment_)
+{
+    comment = comment_;
+}
 
 void StorageInMemoryMetadata::setColumns(ColumnsDescription columns_)
 {
@@ -78,6 +86,11 @@ void StorageInMemoryMetadata::setConstraints(ConstraintsDescription constraints_
     constraints = std::move(constraints_);
 }
 
+void StorageInMemoryMetadata::setProjections(ProjectionsDescription projections_)
+{
+    projections = std::move(projections_);
+}
+
 void StorageInMemoryMetadata::setTableTTLs(const TTLTableDescription & table_ttl_)
 {
     table_ttl = table_ttl_;
@@ -121,6 +134,16 @@ const ConstraintsDescription & StorageInMemoryMetadata::getConstraints() const
     return constraints;
 }
 
+const ProjectionsDescription & StorageInMemoryMetadata::getProjections() const
+{
+    return projections;
+}
+
+bool StorageInMemoryMetadata::hasProjections() const
+{
+    return !projections.empty();
+}
+
 TTLTableDescription StorageInMemoryMetadata::getTableTTLs() const
 {
     return table_ttl;
@@ -199,6 +222,7 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet
     ColumnDependencies res;
 
     NameSet indices_columns;
+    NameSet projections_columns;
     NameSet required_ttl_columns;
     NameSet updated_ttl_columns;
 
@@ -220,6 +244,9 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet
     for (const auto & index : getSecondaryIndices())
         add_dependent_columns(index.expression, indices_columns);
 
+    for (const auto & projection : getProjections())
+        add_dependent_columns(&projection, projections_columns);
+
     if (hasRowsTTL())
     {
         auto rows_expression = getRowsTTL().expression;
@@ -245,6 +272,8 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet
 
     for (const auto & column : indices_columns)
         res.emplace(column, ColumnDependency::SKIP_INDEX);
+    for (const auto & column : projections_columns)
+        res.emplace(column, ColumnDependency::PROJECTION);
     for (const auto & column : required_ttl_columns)
         res.emplace(column, ColumnDependency::TTL_EXPRESSION);
     for (const auto & column : updated_ttl_columns)
@@ -291,9 +320,10 @@ Block StorageInMemoryMetadata::getSampleBlockForColumns(
 {
     Block res;
 
-    std::unordered_map<String, DataTypePtr> columns_map;
-
     auto all_columns = getColumns().getAllWithSubcolumns();
+    std::unordered_map<String, DataTypePtr> columns_map;
+    columns_map.reserve(all_columns.size());
+
     for (const auto & elem : all_columns)
         columns_map.emplace(elem.name, elem.type);
 
@@ -306,15 +336,11 @@ Block StorageInMemoryMetadata::getSampleBlockForColumns(
     {
         auto it = columns_map.find(name);
         if (it != columns_map.end())
-        {
             res.insert({it->second->createColumn(), it->second, it->first});
-        }
         else
-        {
             throw Exception(
-                "Column " + backQuote(name) + " not found in table " + storage_id.getNameForLogs(),
+                "Column " + backQuote(name) + " not found in table " + (storage_id.empty() ? "" : storage_id.getNameForLogs()),
                 ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK);
-        }
     }
 
     return res;
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index 038416aff7d..861cb5866ee 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -5,6 +5,7 @@
 #include <Storages/ColumnsDescription.h>
 #include <Storages/ConstraintsDescription.h>
 #include <Storages/IndicesDescription.h>
+#include <Storages/ProjectionsDescription.h>
 #include <Storages/KeyDescription.h>
 #include <Storages/SelectQueryDescription.h>
 #include <Storages/TTLDescription.h>
@@ -25,6 +26,9 @@ struct StorageInMemoryMetadata
     IndicesDescription secondary_indices;
     /// Table constraints. Currently supported for MergeTree only.
     ConstraintsDescription constraints;
+    /// Table projections. Currently supported for MergeTree only.
+    ProjectionsDescription projections;
+    mutable const ProjectionDescription * selected_projection{};
     /// PARTITION BY expression. Currently supported for MergeTree only.
     KeyDescription partition_key;
     /// PRIMARY KEY expression. If absent, than equal to order_by_ast.
@@ -43,6 +47,8 @@ struct StorageInMemoryMetadata
     /// SELECT QUERY. Supported for MaterializedView and View (have to support LiveView).
     SelectQueryDescription select;
 
+    String comment;
+
     StorageInMemoryMetadata() = default;
 
     StorageInMemoryMetadata(const StorageInMemoryMetadata & other);
@@ -52,6 +58,9 @@ struct StorageInMemoryMetadata
     /// structure from different threads. It should be used as MultiVersion
     /// object. See example in IStorage.
 
+    /// Sets a user-defined comment for a table
+    void setComment(const String & comment_);
+
     /// Sets only real columns, possibly overwrites virtual ones.
     void setColumns(ColumnsDescription columns_);
 
@@ -61,6 +70,9 @@ struct StorageInMemoryMetadata
     /// Sets constraints
     void setConstraints(ConstraintsDescription constraints_);
 
+    /// Sets projections
+    void setProjections(ProjectionsDescription projections_);
+
     /// Set partition key for storage (methods below, are just wrappers for this struct).
     void setPartitionKey(const KeyDescription & partition_key_);
     /// Set sorting key for storage (methods below, are just wrappers for this struct).
@@ -85,15 +97,20 @@ struct StorageInMemoryMetadata
 
     /// Returns combined set of columns
     const ColumnsDescription & getColumns() const;
-    /// Returns secondary indices
 
+    /// Returns secondary indices
     const IndicesDescription & getSecondaryIndices() const;
+
     /// Has at least one non primary index
     bool hasSecondaryIndices() const;
 
     /// Return table constraints
     const ConstraintsDescription & getConstraints() const;
 
+    const ProjectionsDescription & getProjections() const;
+    /// Has at least one projection
+    bool hasProjections() const;
+
     /// Returns true if there is set table TTL, any column TTL or any move TTL.
     bool hasAnyTTL() const { return hasAnyColumnTTL() || hasAnyTableTTL(); }
 
@@ -146,8 +163,7 @@ struct StorageInMemoryMetadata
     /// Storage metadata. StorageID required only for more clear exception
     /// message.
     Block getSampleBlockForColumns(
-        const Names & column_names, const NamesAndTypesList & virtuals, const StorageID & storage_id) const;
-
+        const Names & column_names, const NamesAndTypesList & virtuals = {}, const StorageID & storage_id = StorageID::createEmpty()) const;
     /// Returns structure with partition key.
     const KeyDescription & getPartitionKey() const;
     /// Returns ASTExpressionList of partition key expression for storage or nullptr if there is none.
diff --git a/src/Storages/StorageInput.cpp b/src/Storages/StorageInput.cpp
index 1f881bccf07..63b440aff08 100644
--- a/src/Storages/StorageInput.cpp
+++ b/src/Storages/StorageInput.cpp
@@ -27,17 +27,14 @@ StorageInput::StorageInput(const StorageID & table_id, const ColumnsDescription
 }
 
 
-class StorageInputSource : public SourceWithProgress
+class StorageInputSource : public SourceWithProgress, WithContext
 {
 public:
-    StorageInputSource(Context & context_, Block sample_block)
-        : SourceWithProgress(std::move(sample_block)), context(context_)
-    {
-    }
+    StorageInputSource(ContextPtr context_, Block sample_block) : SourceWithProgress(std::move(sample_block)), WithContext(context_) {}
 
     Chunk generate() override
     {
-        auto block = context.getInputBlocksReaderCallback()(context);
+        auto block = getContext()->getInputBlocksReaderCallback()(getContext());
         if (!block)
             return {};
 
@@ -46,9 +43,6 @@ public:
     }
 
     String getName() const override { return "Input"; }
-
-private:
-    Context & context;
 };
 
 
@@ -62,18 +56,18 @@ Pipe StorageInput::read(
     const Names & /*column_names*/,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
 {
     Pipes pipes;
-    Context & query_context = const_cast<Context &>(context).getQueryContext();
+    auto query_context = context->getQueryContext();
     /// It is TCP request if we have callbacks for input().
-    if (query_context.getInputBlocksReaderCallback())
+    if (query_context->getInputBlocksReaderCallback())
     {
         /// Send structure to the client.
-        query_context.initializeInput(shared_from_this());
+        query_context->initializeInput(shared_from_this());
         return Pipe(std::make_shared<StorageInputSource>(query_context, metadata_snapshot->getSampleBlock()));
     }
 
diff --git a/src/Storages/StorageInput.h b/src/Storages/StorageInput.h
index 3cb64993d45..106c22db385 100644
--- a/src/Storages/StorageInput.h
+++ b/src/Storages/StorageInput.h
@@ -21,7 +21,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index a449cebba51..fd3ca00520a 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -1,24 +1,25 @@
 #include <Storages/StorageJoin.h>
 #include <Storages/StorageFactory.h>
+#include <Storages/StorageSet.h>
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Core/ColumnNumbers.h>
 #include <DataStreams/IBlockInputStream.h>
 #include <DataTypes/NestedUtils.h>
 #include <Disks/IDisk.h>
 #include <Interpreters/joinDispatch.h>
+#include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/castColumn.h>
-#include <Common/assert_cast.h>
 #include <Common/quoteString.h>
+#include <Common/Exception.h>
 
-#include <Poco/String.h>    /// toLower
-#include <Poco/File.h>
+#include <Compression/CompressedWriteBuffer.h>
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/Pipe.h>
+#include <Poco/String.h> /// toLower
 
 
 namespace DB
@@ -46,9 +47,10 @@ StorageJoin::StorageJoin(
     ASTTableJoin::Strictness strictness_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
+    const String & comment,
     bool overwrite_,
     bool persistent_)
-    : StorageSetOrJoinBase{disk_, relative_path_, table_id_, columns_, constraints_, persistent_}
+    : StorageSetOrJoinBase{disk_, relative_path_, table_id_, columns_, constraints_, comment, persistent_}
     , key_names(key_names_)
     , use_nulls(use_nulls_)
     , limits(limits_)
@@ -66,10 +68,18 @@ StorageJoin::StorageJoin(
     restore();
 }
 
+BlockOutputStreamPtr 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, const Context &, TableExclusiveLockHolder&)
+    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder&)
 {
+    std::lock_guard mutate_lock(mutate_mutex);
+    std::unique_lock<std::shared_mutex> lock(rwlock);
+
     disk->removeRecursive(path);
     disk->createDirectories(path);
     disk->createDirectories(path + "tmp/");
@@ -78,6 +88,70 @@ void StorageJoin::truncate(
     join = std::make_shared<HashJoin>(table_join, metadata_snapshot->getSampleBlock().sortColumns(), overwrite);
 }
 
+void StorageJoin::checkMutationIsPossible(const MutationCommands & commands, const Settings & /* settings */) const
+{
+    for (const auto & command : commands)
+        if (command.type != MutationCommand::DELETE)
+            throw Exception("Table engine Join supports only DELETE mutations", ErrorCodes::NOT_IMPLEMENTED);
+}
+
+void StorageJoin::mutate(const MutationCommands & commands, ContextPtr context)
+{
+    /// Firstly accuire lock for mutation, that locks changes of data.
+    /// We cannot accuire rwlock here, because read lock is needed
+    /// for execution of mutation interpreter.
+    std::lock_guard mutate_lock(mutate_mutex);
+
+    constexpr auto tmp_backup_file_name = "tmp/mut.bin";
+    auto metadata_snapshot = getInMemoryMetadataPtr();
+
+    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 new_data = std::make_shared<HashJoin>(table_join, metadata_snapshot->getSampleBlock().sortColumns(), overwrite);
+
+    // New scope controls lifetime of InputStream.
+    {
+        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();
+
+        while (const Block & block = in->read())
+        {
+            new_data->addJoinedBlock(block, true);
+            if (persistent)
+                backup_stream.write(block);
+        }
+
+        in->readSuffix();
+    }
+
+    /// Now accuire exclusive lock and modify storage.
+    std::unique_lock<std::shared_mutex> lock(rwlock);
+
+    join = std::move(new_data);
+    increment = 1;
+
+    if (persistent)
+    {
+        backup_stream.flush();
+        compressed_backup_buf.next();
+        backup_buf->next();
+        backup_buf->finalize();
+
+        std::vector<std::string> files;
+        disk->listFiles(path, files);
+        for (const auto & file_name: files)
+        {
+            if (file_name.ends_with(".bin"))
+                disk->removeFileIfExists(path + file_name);
+        }
+
+        disk->replaceFile(path + tmp_backup_file_name, path + std::to_string(increment) + ".bin");
+    }
+}
 
 HashJoinPtr StorageJoin::getJoinLocked(std::shared_ptr<TableJoin> analyzed_join) const
 {
@@ -92,7 +166,9 @@ HashJoinPtr StorageJoin::getJoinLocked(std::shared_ptr<TableJoin> analyzed_join)
 
     /// TODO: check key columns
 
-    /// Some HACK to remove wrong names qualifiers: table.column -> column.
+    /// Set names qualifiers: table.column -> column
+    /// It's required because storage join stores non-qualified names
+    /// Qualifies will be added by join implementation (HashJoin)
     analyzed_join->setRightKeys(key_names);
 
     HashJoinPtr join_clone = std::make_shared<HashJoin>(analyzed_join, metadata_snapshot->getSampleBlock().sortColumns());
@@ -146,7 +222,7 @@ void registerStorageJoin(StorageFactory & factory)
 
         ASTs & engine_args = args.engine_args;
 
-        const auto & settings = args.context.getSettingsRef();
+        const auto & settings = args.getContext()->getSettingsRef();
 
         auto join_use_nulls = settings.join_use_nulls;
         auto max_rows_in_join = settings.max_rows_in_join;
@@ -186,7 +262,7 @@ void registerStorageJoin(StorageFactory & factory)
             }
         }
 
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         if (engine_args.size() < 3)
             throw Exception(
@@ -263,6 +339,7 @@ void registerStorageJoin(StorageFactory & factory)
             strictness,
             args.columns,
             args.constraints,
+            args.comment,
             join_any_take_last_row,
             persistent);
     };
@@ -408,7 +485,7 @@ private:
 
         if (!position)
             position = decltype(position)(
-                static_cast<void *>(new typename Map::const_iterator(map.begin())),
+                static_cast<void *>(new typename Map::const_iterator(map.begin())), //-V572
                 [](void * ptr) { delete reinterpret_cast<typename Map::const_iterator *>(ptr); });
 
         auto & it = *reinterpret_cast<typename Map::const_iterator *>(position.get());
@@ -492,7 +569,7 @@ Pipe StorageJoin::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned /*num_streams*/)
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index 5f0f9f92404..78d8b9768e9 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -27,7 +27,11 @@ class StorageJoin final : public ext::shared_ptr_helper<StorageJoin>, public Sto
 public:
     String getName() const override { return "Join"; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
+
+    /// Only delete is supported.
+    void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
 
     /// 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.
@@ -41,11 +45,13 @@ public:
     /// (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;
 
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override;
+
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -68,6 +74,7 @@ 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 std::mutex mutate_mutex;
 
     void insertBlock(const Block & block) override;
     void finishInsert() override {}
@@ -81,9 +88,11 @@ protected:
         const Names & key_names_,
         bool use_nulls_,
         SizeLimits limits_,
-        ASTTableJoin::Kind kind_, ASTTableJoin::Strictness strictness_,
+        ASTTableJoin::Kind kind_,
+        ASTTableJoin::Strictness strictness_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         bool overwrite,
         bool persistent_);
 };
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index ddb0cadc148..61fbbbc3086 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -172,7 +172,7 @@ void LogSource::readData(const NameAndTypePair & name_and_type, ColumnPtr & colu
 
     auto create_stream_getter = [&](bool stream_for_prefix)
     {
-        return [&, stream_for_prefix] (const ISerialization::SubstreamPath & path) -> ReadBuffer *
+        return [&, stream_for_prefix] (const ISerialization::SubstreamPath & path) -> ReadBuffer * //-V1047
         {
             if (cache.count(ISerialization::getSubcolumnNameForStream(path)))
                 return nullptr;
@@ -357,6 +357,11 @@ void LogBlockOutputStream::writeSuffix()
 
     streams.clear();
     done = true;
+
+    /// unlock should be done from the same thread as lock, and dtor may be
+    /// called from different thread, so it should be done here (at least in
+    /// case of no exceptions occurred)
+    lock.unlock();
 }
 
 
@@ -460,6 +465,7 @@ StorageLog::StorageLog(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
+    const String & comment,
     bool attach,
     size_t max_compress_block_size_)
     : IStorage(table_id_)
@@ -471,6 +477,7 @@ StorageLog::StorageLog(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
     if (relative_path_.empty())
@@ -586,7 +593,7 @@ void StorageLog::rename(const String & new_path_to_table_data, const StorageID &
     renameInMemory(new_table_id);
 }
 
-void StorageLog::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &)
+void StorageLog::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &)
 {
     files.clear();
     file_count = 0;
@@ -628,9 +635,9 @@ const StorageLog::Marks & StorageLog::getMarksWithRealRowCount(const StorageMeta
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
@@ -642,7 +649,7 @@ Pipe StorageLog::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
@@ -667,7 +674,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;
+    size_t max_read_buffer_size = context->getSettingsRef().max_read_buffer_size;
 
     for (size_t stream = 0; stream < num_streams; ++stream)
     {
@@ -690,7 +697,7 @@ Pipe StorageLog::read(
     return Pipe::unitePipes(std::move(pipes));
 }
 
-BlockOutputStreamPtr StorageLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     auto lock_timeout = getLockTimeout(context);
     loadMarks(lock_timeout);
@@ -702,7 +709,7 @@ BlockOutputStreamPtr StorageLog::write(const ASTPtr & /*query*/, const StorageMe
     return std::make_shared<LogBlockOutputStream>(*this, metadata_snapshot, std::move(lock));
 }
 
-CheckResults StorageLog::checkData(const ASTPtr & /* query */, const Context & context)
+CheckResults StorageLog::checkData(const ASTPtr & /* query */, ContextPtr context)
 {
     std::shared_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -726,11 +733,17 @@ void registerStorageLog(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         String disk_name = getDiskName(*args.storage_def);
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         return StorageLog::create(
-            disk, args.relative_data_path, args.table_id, args.columns, args.constraints,
-            args.attach, args.context.getSettings().max_compress_block_size);
+            disk,
+            args.relative_data_path,
+            args.table_id,
+            args.columns,
+            args.constraints,
+            args.comment,
+            args.attach,
+            args.getContext()->getSettings().max_compress_block_size);
     }, features);
 }
 
diff --git a/src/Storages/StorageLog.h b/src/Storages/StorageLog.h
index acb03658182..20103f51479 100644
--- a/src/Storages/StorageLog.h
+++ b/src/Storages/StorageLog.h
@@ -29,18 +29,18 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) override;
+    CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) override;
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {DB::fullPath(disk, table_path)}; }
@@ -57,6 +57,7 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         bool attach,
         size_t max_compress_block_size_);
 
@@ -86,7 +87,7 @@ private:
     DiskPtr disk;
     String table_path;
 
-    mutable std::shared_timed_mutex rwlock;
+    std::shared_timed_mutex rwlock;
 
     Files files;
 
diff --git a/src/Storages/StorageMaterializeMySQL.cpp b/src/Storages/StorageMaterializeMySQL.cpp
index e59f1e22958..8e6f2e1ad63 100644
--- a/src/Storages/StorageMaterializeMySQL.cpp
+++ b/src/Storages/StorageMaterializeMySQL.cpp
@@ -39,7 +39,7 @@ Pipe StorageMaterializeMySQL::read(
     const Names & column_names,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned int num_streams)
@@ -48,7 +48,7 @@ Pipe StorageMaterializeMySQL::read(
     rethrowSyncExceptionIfNeed(database);
 
     NameSet column_names_set = NameSet(column_names.begin(), column_names.end());
-    auto lock = nested_storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock = nested_storage->lockForShare(context->getCurrentQueryId(), context->getSettingsRef().lock_acquire_timeout);
     const StorageMetadataPtr & nested_metadata = nested_storage->getInMemoryMetadataPtr();
 
     Block nested_header = nested_metadata->getSampleBlock();
@@ -92,7 +92,7 @@ Pipe StorageMaterializeMySQL::read(
     {
         Block pipe_header = pipe.getHeader();
         auto syntax = TreeRewriter(context).analyze(expressions, pipe_header.getNamesAndTypesList());
-        ExpressionActionsPtr expression_actions = ExpressionAnalyzer(expressions, syntax, context).getActions(true);
+        ExpressionActionsPtr expression_actions = ExpressionAnalyzer(expressions, syntax, context).getActions(true /* add_aliases */, false /* project_result */);
 
         pipe.addSimpleTransform([&](const Block & header)
         {
diff --git a/src/Storages/StorageMaterializeMySQL.h b/src/Storages/StorageMaterializeMySQL.h
index f787470e2d2..8a4b88cbbb4 100644
--- a/src/Storages/StorageMaterializeMySQL.h
+++ b/src/Storages/StorageMaterializeMySQL.h
@@ -26,9 +26,9 @@ public:
 
     Pipe read(
         const Names & column_names, const StorageMetadataPtr & metadata_snapshot, SelectQueryInfo & query_info,
-        const Context & context, QueryProcessingStage::Enum processed_stage, size_t max_block_size, unsigned num_streams) override;
+        ContextPtr context, QueryProcessingStage::Enum processed_stage, size_t max_block_size, unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr &, const Context &) override { throwNotAllowed(); }
+    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr &, ContextPtr) override { throwNotAllowed(); }
 
     NamesAndTypesList getVirtuals() const override;
     ColumnSizeByName getColumnSizes() const override;
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index c89187a46e2..a66b24ff931 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -50,11 +50,11 @@ static inline String generateInnerTableName(const StorageID & view_id)
 
 StorageMaterializedView::StorageMaterializedView(
     const StorageID & table_id_,
-    Context & local_context,
+    ContextPtr local_context,
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_,
     bool attach_)
-    : IStorage(table_id_), global_context(local_context.getGlobalContext())
+    : IStorage(table_id_), WithMutableContext(local_context->getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -76,10 +76,15 @@ StorageMaterializedView::StorageMaterializedView(
     storage_metadata.setSelectQuery(select);
     setInMemoryMetadata(storage_metadata);
 
+    bool point_to_itself_by_uuid = has_inner_table && query.to_inner_uuid != UUIDHelpers::Nil
+                                                   && query.to_inner_uuid == table_id_.uuid;
+    bool point_to_itself_by_name = !has_inner_table && query.to_table_id.database_name == table_id_.database_name
+                                                    && query.to_table_id.table_name == table_id_.table_name;
+    if (point_to_itself_by_uuid || point_to_itself_by_name)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Materialized view {} cannot point to itself", table_id_.getFullTableName());
+
     if (!has_inner_table)
     {
-        if (query.to_table_id.database_name == table_id_.database_name && query.to_table_id.table_name == table_id_.table_name)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Materialized view {} cannot point to itself", table_id_.getFullTableName());
         target_table_id = query.to_table_id;
     }
     else if (attach_)
@@ -90,7 +95,7 @@ StorageMaterializedView::StorageMaterializedView(
     else
     {
         /// We will create a query to create an internal table.
-        auto create_context = Context(local_context);
+        auto create_context = Context::createCopy(local_context);
         auto manual_create_query = std::make_shared<ASTCreateQuery>();
         manual_create_query->database = getStorageID().database_name;
         manual_create_query->table = generateInnerTableName(getStorageID());
@@ -106,32 +111,36 @@ StorageMaterializedView::StorageMaterializedView(
         create_interpreter.setInternal(true);
         create_interpreter.execute();
 
-        target_table_id = DatabaseCatalog::instance().getTable({manual_create_query->database, manual_create_query->table}, global_context)->getStorageID();
+        target_table_id = DatabaseCatalog::instance().getTable({manual_create_query->database, manual_create_query->table}, getContext())->getStorageID();
     }
 
     if (!select.select_table_id.empty())
         DatabaseCatalog::instance().addDependency(select.select_table_id, getStorageID());
 }
 
-QueryProcessingStage::Enum StorageMaterializedView::getQueryProcessingStage(const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+QueryProcessingStage::Enum StorageMaterializedView::getQueryProcessingStage(
+    ContextPtr local_context,
+    QueryProcessingStage::Enum to_stage,
+    const StorageMetadataPtr &,
+    SelectQueryInfo & query_info) const
 {
-    return getTargetTable()->getQueryProcessingStage(context, to_stage, query_info);
+    return getTargetTable()->getQueryProcessingStage(local_context, to_stage, getTargetTable()->getInMemoryMetadataPtr(), query_info);
 }
 
 Pipe StorageMaterializedView::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
     return plan.convertToPipe(
-        QueryPlanOptimizationSettings::fromContext(context),
-        BuildQueryPipelineSettings::fromContext(context));
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 void StorageMaterializedView::read(
@@ -139,23 +148,23 @@ void StorageMaterializedView::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     auto storage = getTargetTable();
-    auto lock = storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock = storage->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
     auto target_metadata_snapshot = storage->getInMemoryMetadataPtr();
 
     if (query_info.order_optimizer)
-        query_info.input_order_info = query_info.order_optimizer->getInputOrder(target_metadata_snapshot, context);
+        query_info.input_order_info = query_info.order_optimizer->getInputOrder(target_metadata_snapshot, local_context);
 
-    storage->read(query_plan, column_names, target_metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    storage->read(query_plan, column_names, target_metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
 
     if (query_plan.isInitialized())
     {
-        auto mv_header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, context, processed_stage);
+        auto mv_header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, local_context, processed_stage);
         auto target_header = query_plan.getCurrentDataStream().header;
         if (!blocksHaveEqualStructure(mv_header, target_header))
         {
@@ -185,20 +194,20 @@ void StorageMaterializedView::read(
     }
 }
 
-BlockOutputStreamPtr StorageMaterializedView::write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context)
+BlockOutputStreamPtr StorageMaterializedView::write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr local_context)
 {
     auto storage = getTargetTable();
-    auto lock = storage->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock = storage->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
     auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-    auto stream = storage->write(query, metadata_snapshot, context);
+    auto stream = storage->write(query, metadata_snapshot, local_context);
 
     stream->addTableLock(lock);
     return stream;
 }
 
 
-static void executeDropQuery(ASTDropQuery::Kind kind, const Context & global_context, const Context & current_context, const StorageID & target_table_id, bool no_delay)
+static void executeDropQuery(ASTDropQuery::Kind kind, ContextPtr global_context, ContextPtr current_context, const StorageID & target_table_id, bool no_delay)
 {
     if (DatabaseCatalog::instance().tryGetTable(target_table_id, current_context))
     {
@@ -214,13 +223,13 @@ static void executeDropQuery(ASTDropQuery::Kind kind, const Context & global_con
         /// to avoid "Not enough privileges" error if current user has only DROP VIEW ON mat_view_name privilege
         /// and not allowed to drop inner table explicitly. Allowing to drop inner table without explicit grant
         /// looks like expected behaviour and we have tests for it.
-        auto drop_context = Context(global_context);
-        drop_context.getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
-        if (auto txn = current_context.getZooKeeperMetadataTransaction())
+        auto drop_context = Context::createCopy(global_context);
+        drop_context->getClientInfo().query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+        if (auto txn = current_context->getZooKeeperMetadataTransaction())
         {
             /// For Replicated database
-            drop_context.setQueryContext(const_cast<Context &>(current_context));
-            drop_context.initZooKeeperMetadataTransaction(txn, true);
+            drop_context->setQueryContext(std::const_pointer_cast<Context>(current_context));
+            drop_context->initZooKeeperMetadataTransaction(txn, true);
         }
         InterpreterDropQuery drop_interpreter(ast_drop_query, drop_context);
         drop_interpreter.execute();
@@ -235,19 +244,19 @@ void StorageMaterializedView::drop()
     if (!select_query.select_table_id.empty())
         DatabaseCatalog::instance().removeDependency(select_query.select_table_id, table_id);
 
-    dropInnerTable(true, global_context);
+    dropInnerTable(true, getContext());
 }
 
-void StorageMaterializedView::dropInnerTable(bool no_delay, const Context & context)
+void StorageMaterializedView::dropInnerTable(bool no_delay, ContextPtr local_context)
 {
     if (has_inner_table && tryGetTargetTable())
-        executeDropQuery(ASTDropQuery::Kind::Drop, global_context, context, target_table_id, no_delay);
+        executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), local_context, target_table_id, no_delay);
 }
 
-void StorageMaterializedView::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context & context, TableExclusiveLockHolder &)
+void StorageMaterializedView::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr local_context, TableExclusiveLockHolder &)
 {
     if (has_inner_table)
-        executeDropQuery(ASTDropQuery::Kind::Truncate, global_context, context, target_table_id, true);
+        executeDropQuery(ASTDropQuery::Kind::Truncate, getContext(), local_context, target_table_id, true);
 }
 
 void StorageMaterializedView::checkStatementCanBeForwarded() const
@@ -265,26 +274,26 @@ bool StorageMaterializedView::optimize(
     bool final,
     bool deduplicate,
     const Names & deduplicate_by_columns,
-    const Context & context)
+    ContextPtr local_context)
 {
     checkStatementCanBeForwarded();
     auto storage_ptr = getTargetTable();
     auto metadata_snapshot = storage_ptr->getInMemoryMetadataPtr();
-    return getTargetTable()->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, context);
+    return getTargetTable()->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, local_context);
 }
 
 void StorageMaterializedView::alter(
     const AlterCommands & params,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder &)
 {
     auto table_id = getStorageID();
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
-    params.apply(new_metadata, context);
+    params.apply(new_metadata, local_context);
 
     /// start modify query
-    if (context.getSettingsRef().allow_experimental_alter_materialized_view_structure)
+    if (local_context->getSettingsRef().allow_experimental_alter_materialized_view_structure)
     {
         const auto & new_select = new_metadata.select;
         const auto & old_select = old_metadata.getSelectQuery();
@@ -295,14 +304,14 @@ void StorageMaterializedView::alter(
     }
     /// end modify query
 
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
 }
 
 
-void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & commands, const Context & context) const
+void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
     if (settings.allow_experimental_alter_materialized_view_structure)
     {
         for (const auto & command : commands)
@@ -332,10 +341,10 @@ void StorageMaterializedView::checkMutationIsPossible(const MutationCommands & c
 }
 
 Pipe StorageMaterializedView::alterPartition(
-    const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, const Context & context)
+    const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, ContextPtr local_context)
 {
     checkStatementCanBeForwarded();
-    return getTargetTable()->alterPartition(metadata_snapshot, commands, context);
+    return getTargetTable()->alterPartition(metadata_snapshot, commands, local_context);
 }
 
 void StorageMaterializedView::checkAlterPartitionIsPossible(
@@ -345,10 +354,10 @@ void StorageMaterializedView::checkAlterPartitionIsPossible(
     getTargetTable()->checkAlterPartitionIsPossible(commands, metadata_snapshot, settings);
 }
 
-void StorageMaterializedView::mutate(const MutationCommands & commands, const Context & context)
+void StorageMaterializedView::mutate(const MutationCommands & commands, ContextPtr local_context)
 {
     checkStatementCanBeForwarded();
-    getTargetTable()->mutate(commands, context);
+    getTargetTable()->mutate(commands, local_context);
 }
 
 void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
@@ -357,17 +366,18 @@ void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
     auto metadata_snapshot = getInMemoryMetadataPtr();
     bool from_atomic_to_atomic_database = old_table_id.hasUUID() && new_table_id.hasUUID();
 
-    if (has_inner_table && tryGetTargetTable() && !from_atomic_to_atomic_database)
+    if (!from_atomic_to_atomic_database && has_inner_table && tryGetTargetTable())
     {
         auto new_target_table_name = generateInnerTableName(new_table_id);
         auto rename = std::make_shared<ASTRenameQuery>();
 
         ASTRenameQuery::Table from;
+        assert(target_table_id.database_name == old_table_id.database_name);
         from.database = target_table_id.database_name;
         from.table = target_table_id.table_name;
 
         ASTRenameQuery::Table to;
-        to.database = target_table_id.database_name;
+        to.database = new_table_id.database_name;
         to.table = new_target_table_name;
 
         ASTRenameQuery::Element elem;
@@ -375,11 +385,17 @@ void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
         elem.to = to;
         rename->elements.emplace_back(elem);
 
-        InterpreterRenameQuery(rename, global_context).execute();
+        InterpreterRenameQuery(rename, getContext()).execute();
+        target_table_id.database_name = new_table_id.database_name;
         target_table_id.table_name = new_target_table_name;
     }
 
     IStorage::renameInMemory(new_table_id);
+    if (from_atomic_to_atomic_database && has_inner_table)
+    {
+        assert(target_table_id.database_name == old_table_id.database_name);
+        target_table_id.database_name = new_table_id.database_name;
+    }
     const auto & select_query = metadata_snapshot->getSelectQuery();
     // TODO Actually we don't need to update dependency if MV has UUID, but then db and table name will be outdated
     DatabaseCatalog::instance().updateDependency(select_query.select_table_id, old_table_id, select_query.select_table_id, getStorageID());
@@ -397,13 +413,13 @@ void StorageMaterializedView::shutdown()
 StoragePtr StorageMaterializedView::getTargetTable() const
 {
     checkStackSize();
-    return DatabaseCatalog::instance().getTable(target_table_id, global_context);
+    return DatabaseCatalog::instance().getTable(target_table_id, getContext());
 }
 
 StoragePtr StorageMaterializedView::tryGetTargetTable() const
 {
     checkStackSize();
-    return DatabaseCatalog::instance().tryGetTable(target_table_id, global_context);
+    return DatabaseCatalog::instance().tryGetTable(target_table_id, getContext());
 }
 
 Strings StorageMaterializedView::getDataPaths() const
@@ -415,7 +431,12 @@ Strings StorageMaterializedView::getDataPaths() const
 
 ActionLock StorageMaterializedView::getActionLock(StorageActionBlockType type)
 {
-    return has_inner_table ? getTargetTable()->getActionLock(type) : ActionLock{};
+    if (has_inner_table)
+    {
+        if (auto target_table = tryGetTargetTable())
+            return target_table->getActionLock(type);
+    }
+    return ActionLock{};
 }
 
 void registerStorageMaterializedView(StorageFactory & factory)
@@ -424,7 +445,7 @@ void registerStorageMaterializedView(StorageFactory & factory)
     {
         /// Pass local_context here to convey setting for inner table
         return StorageMaterializedView::create(
-            args.table_id, args.local_context, args.query,
+            args.table_id, args.getLocalContext(), args.query,
             args.columns, args.attach);
     });
 }
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index a5dc089d68e..8e2b8bdc9f5 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -12,7 +12,7 @@
 namespace DB
 {
 
-class StorageMaterializedView final : public ext::shared_ptr_helper<StorageMaterializedView>, public IStorage
+class StorageMaterializedView final : public ext::shared_ptr_helper<StorageMaterializedView>, public IStorage, WithMutableContext
 {
     friend struct ext::shared_ptr_helper<StorageMaterializedView>;
 public:
@@ -27,19 +27,19 @@ public:
     bool supportsIndexForIn() const override { return getTargetTable()->supportsIndexForIn(); }
     bool supportsParallelInsert() const override { return getTargetTable()->supportsParallelInsert(); }
     bool supportsSubcolumns() const override { return getTargetTable()->supportsSubcolumns(); }
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & /* metadata_snapshot */) const override
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & /* metadata_snapshot */) const override
     {
         auto target_table = getTargetTable();
         auto metadata_snapshot = target_table->getInMemoryMetadataPtr();
         return target_table->mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
     }
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void drop() override;
-    void dropInnerTable(bool no_delay, const Context & context);
+    void dropInnerTable(bool no_delay, ContextPtr context);
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
     bool optimize(
         const ASTPtr & query,
@@ -48,25 +48,26 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & context) override;
+        ContextPtr context) override;
 
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
-    Pipe alterPartition(const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, const Context & context) override;
+    Pipe alterPartition(const StorageMetadataPtr & metadata_snapshot, const PartitionCommands & commands, ContextPtr context) override;
 
     void checkAlterPartitionIsPossible(const PartitionCommands & commands, const StorageMetadataPtr & metadata_snapshot, const Settings & settings) const override;
 
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
 
     void renameInMemory(const StorageID & new_table_id) override;
 
     void shutdown() override;
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum
+    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageMetadataPtr &, SelectQueryInfo &) const override;
 
     StoragePtr getTargetTable() const;
     StoragePtr tryGetTargetTable() const;
@@ -77,7 +78,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -87,7 +88,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -98,7 +99,6 @@ private:
     /// Will be initialized in constructor
     StorageID target_table_id = StorageID::createEmpty();
 
-    Context & global_context;
     bool has_inner_table = false;
 
     void checkStatementCanBeForwarded() const;
@@ -106,7 +106,7 @@ private:
 protected:
     StorageMaterializedView(
         const StorageID & table_id_,
-        Context & local_context,
+        ContextPtr local_context,
         const ASTCreateQuery & query,
         const ColumnsDescription & columns_,
         bool attach_);
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index d98cd4212e9..7f7f68335bb 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -26,10 +26,6 @@ class MemorySource : public SourceWithProgress
 {
     using InitializerFunc = std::function<void(std::shared_ptr<const Blocks> &)>;
 public:
-    /// Blocks are stored in std::list which may be appended in another thread.
-    /// We use pointer to the beginning of the list and its current size.
-    /// We don't need synchronisation in this reader, because while we hold SharedLock on storage,
-    /// only new elements can be added to the back of the list, so our iterators remain valid
 
     MemorySource(
         Names column_names_,
@@ -59,7 +55,7 @@ protected:
 
         size_t current_index = getAndIncrementExecutionIndex();
 
-        if (current_index >= data->size())
+        if (!data || current_index >= data->size())
         {
             return {};
         }
@@ -168,12 +164,14 @@ StorageMemory::StorageMemory(
     const StorageID & table_id_,
     ColumnsDescription columns_description_,
     ConstraintsDescription constraints_,
+    const String & comment,
     bool compress_)
     : IStorage(table_id_), data(std::make_unique<const Blocks>()), compress(compress_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(std::move(columns_description_));
     storage_metadata.setConstraints(std::move(constraints_));
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -182,7 +180,7 @@ Pipe StorageMemory::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned num_streams)
@@ -230,7 +228,7 @@ Pipe StorageMemory::read(
 }
 
 
-BlockOutputStreamPtr StorageMemory::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageMemory::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     return std::make_shared<MemoryBlockOutputStream>(*this, metadata_snapshot);
 }
@@ -258,13 +256,20 @@ void StorageMemory::checkMutationIsPossible(const MutationCommands & /*commands*
     /// Some validation will be added
 }
 
-void StorageMemory::mutate(const MutationCommands & commands, const Context & context)
+void StorageMemory::mutate(const MutationCommands & commands, ContextPtr context)
 {
     std::lock_guard lock(mutex);
     auto metadata_snapshot = getInMemoryMetadataPtr();
     auto storage = getStorageID();
     auto storage_ptr = DatabaseCatalog::instance().getTable(storage, context);
-    auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, context, true);
+
+    /// When max_threads > 1, the order of returning blocks is uncentain,
+    /// which will lead to inconsistency after updateBlockData.
+    auto new_context = Context::createCopy(context);
+    new_context->setSetting("max_streams_to_max_threads_ratio", 1);
+    new_context->setSetting("max_threads", 1);
+
+    auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, new_context, true);
     auto in = interpreter->execute();
 
     in->readPrefix();
@@ -313,14 +318,14 @@ void StorageMemory::mutate(const MutationCommands & commands, const Context & co
         rows += buffer.rows();
         bytes += buffer.bytes();
     }
-    total_size_bytes.store(rows, std::memory_order_relaxed);
-    total_size_rows.store(bytes, std::memory_order_relaxed);
+    total_size_bytes.store(bytes, std::memory_order_relaxed);
+    total_size_rows.store(rows, std::memory_order_relaxed);
     data.set(std::move(new_data));
 }
 
 
 void StorageMemory::truncate(
-    const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+    const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     data.set(std::make_unique<Blocks>());
     total_size_bytes.store(0, std::memory_order_relaxed);
@@ -353,7 +358,7 @@ void registerStorageMemory(StorageFactory & factory)
         if (has_settings)
             settings.loadFromQuery(*args.storage_def);
 
-        return StorageMemory::create(args.table_id, args.columns, args.constraints, settings.compress);
+        return StorageMemory::create(args.table_id, args.columns, args.constraints, args.comment, settings.compress);
     },
     {
         .supports_settings = true,
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index b7fa4d7b222..e623f29e2e6 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -34,7 +34,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -47,14 +47,14 @@ public:
 
     bool hasEvenlyDistributedRead() const override { return true; }
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override;
 
     void drop() override;
 
     void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
     std::optional<UInt64> totalBytes(const Settings &) const override;
@@ -97,7 +97,7 @@ public:
     void delayReadForGlobalSubqueries() { delay_read_for_global_subqueries = true; }
 
 private:
-    /// MultiVersion data storage, so that we can copy the list of blocks to readers.
+    /// MultiVersion data storage, so that we can copy the vector of blocks to readers.
 
     MultiVersion<Blocks> data;
 
@@ -115,6 +115,7 @@ protected:
         const StorageID & table_id_,
         ColumnsDescription columns_description_,
         ConstraintsDescription constraints_,
+        const String & comment,
         bool compress_ = false);
 };
 
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index b8aaa52f92c..15d520c13aa 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTLiteral.h>
@@ -43,12 +44,15 @@ namespace ErrorCodes
 namespace
 {
 
-void modifySelect(ASTSelectQuery & select, const TreeRewriterResult & rewriter_result)
+TreeRewriterResult modifySelect(ASTSelectQuery & select, const TreeRewriterResult & rewriter_result, ContextPtr context)
 {
+
+    TreeRewriterResult new_rewriter_result = rewriter_result;
     if (removeJoin(select))
     {
         /// Also remove GROUP BY cause ExpressionAnalyzer would check if it has all aggregate columns but joined columns would be missed.
         select.setExpression(ASTSelectQuery::Expression::GROUP_BY, {});
+        new_rewriter_result.aggregates.clear();
 
         /// Replace select list to remove joined columns
         auto select_list = std::make_shared<ASTExpressionList>();
@@ -57,12 +61,40 @@ void modifySelect(ASTSelectQuery & select, const TreeRewriterResult & rewriter_r
 
         select.setExpression(ASTSelectQuery::Expression::SELECT, select_list);
 
-        /// TODO: keep WHERE/PREWHERE. We have to remove joined columns and their expressions but keep others.
-        select.setExpression(ASTSelectQuery::Expression::WHERE, {});
-        select.setExpression(ASTSelectQuery::Expression::PREWHERE, {});
+        const DB::IdentifierMembershipCollector membership_collector{select, context};
+
+        /// Remove unknown identifiers from where, leave only ones from left table
+        auto replace_where = [&membership_collector](ASTSelectQuery & query, ASTSelectQuery::Expression expr)
+        {
+            auto where = query.getExpression(expr, false);
+            if (!where)
+                return;
+
+            const size_t left_table_pos = 0;
+            /// Test each argument of `and` function and select ones related to only left table
+            std::shared_ptr<ASTFunction> new_conj = makeASTFunction("and");
+            for (const auto & node : collectConjunctions(where))
+            {
+                if (membership_collector.getIdentsMembership(node) == left_table_pos)
+                    new_conj->arguments->children.push_back(std::move(node));
+            }
+
+            if (new_conj->arguments->children.empty())
+                /// No identifiers from left table
+                query.setExpression(expr, {});
+            else if (new_conj->arguments->children.size() == 1)
+                /// Only one expression, lift from `and`
+                query.setExpression(expr, std::move(new_conj->arguments->children[0]));
+            else
+                /// Set new expression
+                query.setExpression(expr, std::move(new_conj));
+        };
+        replace_where(select,ASTSelectQuery::Expression::WHERE);
+        replace_where(select,ASTSelectQuery::Expression::PREWHERE);
         select.setExpression(ASTSelectQuery::Expression::HAVING, {});
         select.setExpression(ASTSelectQuery::Expression::ORDER_BY, {});
     }
+    return new_rewriter_result;
 }
 
 }
@@ -70,39 +102,43 @@ void modifySelect(ASTSelectQuery & select, const TreeRewriterResult & rewriter_r
 StorageMerge::StorageMerge(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
+    const String & comment,
     const String & source_database_,
     const Strings & source_tables_,
-    const Context & context_)
+    ContextPtr context_)
     : IStorage(table_id_)
+    , WithContext(context_->getGlobalContext())
     , source_database(source_database_)
     , source_tables(std::in_place, source_tables_.begin(), source_tables_.end())
-    , global_context(context_.getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
 StorageMerge::StorageMerge(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
+    const String & comment,
     const String & source_database_,
     const String & source_table_regexp_,
-    const Context & context_)
+    ContextPtr context_)
     : IStorage(table_id_)
+    , WithContext(context_->getGlobalContext())
     , source_database(source_database_)
     , source_table_regexp(source_table_regexp_)
-    , global_context(context_.getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
 template <typename F>
 StoragePtr StorageMerge::getFirstTable(F && predicate) const
 {
-    auto iterator = getDatabaseIterator(global_context);
+    auto iterator = getDatabaseIterator(getContext());
 
     while (iterator->isValid())
     {
@@ -124,11 +160,10 @@ bool StorageMerge::isRemote() const
 }
 
 
-bool StorageMerge::mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
+bool StorageMerge::mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & /*metadata_snapshot*/) const
 {
     /// It's beneficial if it is true for at least one table.
-    StorageListWithLocks selected_tables = getSelectedTables(
-            query_context.getCurrentQueryId(), query_context.getSettingsRef());
+    StorageListWithLocks selected_tables = getSelectedTables(query_context);
 
     size_t i = 0;
     for (const auto & table : selected_tables)
@@ -148,10 +183,12 @@ bool StorageMerge::mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, cons
 }
 
 
-QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & query_info) const
+QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(
+    ContextPtr local_context,
+    QueryProcessingStage::Enum to_stage,
+    const StorageMetadataPtr &,
+    SelectQueryInfo & query_info) const
 {
-    ASTPtr modified_query = query_info.query->clone();
-    auto & modified_select = modified_query->as<ASTSelectQuery &>();
     /// In case of JOIN the first stage (which includes JOIN)
     /// should be done on the initiator always.
     ///
@@ -159,12 +196,12 @@ QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(const Context &
     /// (see modifySelect()/removeJoin())
     ///
     /// And for this we need to return FetchColumns.
-    if (removeJoin(modified_select))
+    if (const auto * select = query_info.query->as<ASTSelectQuery>(); select && hasJoin(*select))
         return QueryProcessingStage::FetchColumns;
 
     auto stage_in_source_tables = QueryProcessingStage::FetchColumns;
 
-    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(context);
+    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(local_context);
 
     size_t selected_table_size = 0;
 
@@ -174,7 +211,9 @@ QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(const Context &
         if (table && table.get() != this)
         {
             ++selected_table_size;
-            stage_in_source_tables = std::max(stage_in_source_tables, table->getQueryProcessingStage(context, to_stage, query_info));
+            stage_in_source_tables = std::max(
+                stage_in_source_tables,
+                table->getQueryProcessingStage(local_context, to_stage, table->getInMemoryMetadataPtr(), query_info));
         }
 
         iterator->next();
@@ -188,7 +227,7 @@ Pipe StorageMerge::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     unsigned num_streams)
@@ -210,17 +249,16 @@ Pipe StorageMerge::read(
     /** Just in case, turn off optimization "transfer to PREWHERE",
       * since there is no certainty that it works when one of table is MergeTree and other is not.
       */
-    auto modified_context = std::make_shared<Context>(context);
-    modified_context->setSetting("optimize_move_to_prewhere", false);
+    auto modified_context = Context::createCopy(local_context);
+    modified_context->setSetting("optimize_move_to_prewhere", Field{false});
 
     /// What will be result structure depending on query processed stage in source tables?
-    Block header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, context, processed_stage);
+    Block header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, local_context, processed_stage);
 
     /** First we make list of selected tables to find out its size.
       * This is necessary to correctly pass the recommended number of threads to each table.
       */
-    StorageListWithLocks selected_tables
-        = getSelectedTables(query_info, has_table_virtual_column, context.getCurrentQueryId(), context.getSettingsRef());
+    StorageListWithLocks selected_tables = getSelectedTables(local_context, query_info.query, has_table_virtual_column);
 
     if (selected_tables.empty())
         /// FIXME: do we support sampling in this case?
@@ -228,7 +266,8 @@ Pipe StorageMerge::read(
             {}, query_info, processed_stage, max_block_size, header, {}, real_column_names, modified_context, 0, has_table_virtual_column);
 
     size_t tables_count = selected_tables.size();
-    Float64 num_streams_multiplier = std::min(unsigned(tables_count), std::max(1U, unsigned(context.getSettingsRef().max_streams_multiplier_for_merge_tables)));
+    Float64 num_streams_multiplier
+        = std::min(unsigned(tables_count), std::max(1U, unsigned(local_context->getSettingsRef().max_streams_multiplier_for_merge_tables)));
     num_streams *= num_streams_multiplier;
     size_t remaining_streams = num_streams;
 
@@ -239,7 +278,7 @@ Pipe StorageMerge::read(
         {
             auto storage_ptr = std::get<0>(*it);
             auto storage_metadata_snapshot = storage_ptr->getInMemoryMetadataPtr();
-            auto current_info = query_info.order_optimizer->getInputOrder(storage_metadata_snapshot, context);
+            auto current_info = query_info.order_optimizer->getInputOrder(storage_metadata_snapshot, local_context);
             if (it == selected_tables.begin())
                 input_sorting_info = current_info;
             else if (!current_info || (input_sorting_info && *current_info != *input_sorting_info))
@@ -293,7 +332,7 @@ Pipe StorageMerge::createSources(
     const Block & header,
     const StorageWithLockAndName & storage_with_lock,
     Names & real_column_names,
-    const std::shared_ptr<Context> & modified_context,
+    ContextMutablePtr modified_context,
     size_t streams_num,
     bool has_table_virtual_column,
     bool concat_streams)
@@ -304,7 +343,8 @@ Pipe StorageMerge::createSources(
 
     /// Original query could contain JOIN but we need only the first joined table and its columns.
     auto & modified_select = modified_query_info.query->as<ASTSelectQuery &>();
-    modifySelect(modified_select, *query_info.syntax_analyzer_result);
+    auto new_analyzer_res = modifySelect(modified_select, *query_info.syntax_analyzer_result, modified_context);
+    modified_query_info.syntax_analyzer_result = std::make_shared<TreeRewriterResult>(std::move(new_analyzer_res));
 
     VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_table", table_name);
 
@@ -313,7 +353,7 @@ Pipe StorageMerge::createSources(
     if (!storage)
     {
         pipe = QueryPipeline::getPipe(InterpreterSelectQuery(
-            modified_query_info.query, *modified_context,
+            modified_query_info.query, modified_context,
             std::make_shared<OneBlockInputStream>(header),
             SelectQueryOptions(processed_stage).analyze()).execute().pipeline);
 
@@ -321,15 +361,22 @@ Pipe StorageMerge::createSources(
         return pipe;
     }
 
-    auto storage_stage = storage->getQueryProcessingStage(*modified_context, QueryProcessingStage::Complete, modified_query_info);
+    auto storage_stage
+        = storage->getQueryProcessingStage(modified_context, QueryProcessingStage::Complete, metadata_snapshot, modified_query_info);
     if (processed_stage <= storage_stage)
     {
         /// If there are only virtual columns in query, you must request at least one other column.
         if (real_column_names.empty())
             real_column_names.push_back(ExpressionActions::getSmallestColumn(metadata_snapshot->getColumns().getAllPhysical()));
 
-
-        pipe = storage->read(real_column_names, metadata_snapshot, modified_query_info, *modified_context, processed_stage, max_block_size, UInt32(streams_num));
+        pipe = storage->read(
+            real_column_names,
+            metadata_snapshot,
+            modified_query_info,
+            modified_context,
+            processed_stage,
+            max_block_size,
+            UInt32(streams_num));
     }
     else if (processed_stage > storage_stage)
     {
@@ -339,7 +386,7 @@ Pipe StorageMerge::createSources(
         modified_context->setSetting("max_threads", streams_num);
         modified_context->setSetting("max_streams_to_max_threads_ratio", 1);
 
-        InterpreterSelectQuery interpreter{modified_query_info.query, *modified_context, SelectQueryOptions(processed_stage)};
+        InterpreterSelectQuery interpreter{modified_query_info.query, modified_context, SelectQueryOptions(processed_stage)};
 
 
         pipe = QueryPipeline::getPipe(interpreter.execute().pipeline);
@@ -368,7 +415,7 @@ Pipe StorageMerge::createSources(
             auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
             auto adding_column_actions = std::make_shared<ExpressionActions>(
                 std::move(adding_column_dag),
-                ExpressionActionsSettings::fromContext(*modified_context));
+                ExpressionActionsSettings::fromContext(modified_context, CompileExpressions::yes));
 
             pipe.addSimpleTransform([&](const Block & stream_header)
             {
@@ -378,7 +425,7 @@ Pipe StorageMerge::createSources(
 
         /// Subordinary tables could have different but convertible types, like numeric types of different width.
         /// We must return streams with structure equals to structure of Merge table.
-        convertingSourceStream(header, metadata_snapshot, *modified_context, modified_query_info.query, pipe, processed_stage);
+        convertingSourceStream(header, metadata_snapshot, modified_context, modified_query_info.query, pipe, processed_stage);
 
         pipe.addTableLock(struct_lock);
         pipe.addStorageHolder(storage);
@@ -388,34 +435,20 @@ Pipe StorageMerge::createSources(
     return pipe;
 }
 
-
-StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(const String & query_id, const Settings & settings) const
-{
-    StorageListWithLocks selected_tables;
-    auto iterator = getDatabaseIterator(global_context);
-
-    while (iterator->isValid())
-    {
-        const auto & table = iterator->table();
-        if (table && table.get() != this)
-            selected_tables.emplace_back(
-                    table, table->lockForShare(query_id, settings.lock_acquire_timeout), iterator->name());
-
-        iterator->next();
-    }
-
-    return selected_tables;
-}
-
-
 StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(
-        const SelectQueryInfo & query_info, bool has_virtual_column, const String & query_id, const Settings & settings) const
+        ContextPtr query_context,
+        const ASTPtr & query /* = nullptr */,
+        bool filter_by_virtual_column /* = false */) const
 {
-    const ASTPtr & query = query_info.query;
-    StorageListWithLocks selected_tables;
-    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(global_context);
+    assert(!filter_by_virtual_column || query);
 
-    auto virtual_column = ColumnString::create();
+    const Settings & settings = query_context->getSettingsRef();
+    StorageListWithLocks selected_tables;
+    DatabaseTablesIteratorPtr iterator = getDatabaseIterator(getContext());
+
+    MutableColumnPtr table_name_virtual_column;
+    if (filter_by_virtual_column)
+        table_name_virtual_column = ColumnString::create();
 
     while (iterator->isValid())
     {
@@ -428,18 +461,20 @@ StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(
 
         if (storage.get() != this)
         {
-            selected_tables.emplace_back(
-                    storage, storage->lockForShare(query_id, settings.lock_acquire_timeout), iterator->name());
-            virtual_column->insert(iterator->name());
+            auto table_lock = storage->lockForShare(query_context->getCurrentQueryId(), settings.lock_acquire_timeout);
+            selected_tables.emplace_back(storage, std::move(table_lock), iterator->name());
+            if (filter_by_virtual_column)
+                table_name_virtual_column->insert(iterator->name());
         }
 
         iterator->next();
     }
 
-    if (has_virtual_column)
+    if (filter_by_virtual_column)
     {
-        Block virtual_columns_block = Block{ColumnWithTypeAndName(std::move(virtual_column), std::make_shared<DataTypeString>(), "_table")};
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, global_context);
+        /// Filter names of selected tables if there is a condition on "_table" virtual column in WHERE clause
+        Block virtual_columns_block = Block{ColumnWithTypeAndName(std::move(table_name_virtual_column), std::make_shared<DataTypeString>(), "_table")};
+        VirtualColumnUtils::filterBlockWithQuery(query, virtual_columns_block, query_context);
         auto values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_table");
 
         /// Remove unused tables from the list
@@ -449,8 +484,7 @@ StorageMerge::StorageListWithLocks StorageMerge::getSelectedTables(
     return selected_tables;
 }
 
-
-DatabaseTablesIteratorPtr StorageMerge::getDatabaseIterator(const Context & context) const
+DatabaseTablesIteratorPtr StorageMerge::getDatabaseIterator(ContextPtr local_context) const
 {
     try
     {
@@ -472,13 +506,13 @@ DatabaseTablesIteratorPtr StorageMerge::getDatabaseIterator(const Context & cont
             return source_table_regexp->match(table_name_);
     };
 
-    return database->getTablesIterator(context, table_name_match);
+    return database->getTablesIterator(local_context, table_name_match);
 }
 
 
-void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, const Context & context) const
+void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
-    auto name_deps = getDependentViewsByColumn(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
@@ -486,7 +520,7 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, const Co
             throw Exception(
                 "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
-        if (command.type == AlterCommand::Type::DROP_COLUMN)
+        if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
             if (!deps_mv.empty())
@@ -501,20 +535,20 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, const Co
 }
 
 void StorageMerge::alter(
-    const AlterCommands & params, const Context & context, TableLockHolder &)
+    const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
 {
     auto table_id = getStorageID();
 
     StorageInMemoryMetadata storage_metadata = getInMemoryMetadata();
-    params.apply(storage_metadata, context);
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, storage_metadata);
+    params.apply(storage_metadata, local_context);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, storage_metadata);
     setInMemoryMetadata(storage_metadata);
 }
 
 void StorageMerge::convertingSourceStream(
     const Block & header,
     const StorageMetadataPtr & metadata_snapshot,
-    const Context & context,
+    ContextPtr local_context,
     ASTPtr & query,
     Pipe & pipe,
     QueryProcessingStage::Enum processed_stage)
@@ -525,7 +559,7 @@ void StorageMerge::convertingSourceStream(
             pipe.getHeader().getColumnsWithTypeAndName(),
             header.getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Name);
-    auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag, ExpressionActionsSettings::fromContext(context));
+    auto convert_actions = std::make_shared<ExpressionActions>(convert_actions_dag, ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
 
     pipe.addSimpleTransform([&](const Block & stream_header)
     {
@@ -549,8 +583,8 @@ void StorageMerge::convertingSourceStream(
             NamesAndTypesList source_columns = metadata_snapshot->getSampleBlock().getNamesAndTypesList();
             auto virtual_column = *getVirtuals().tryGetByName("_table");
             source_columns.emplace_back(NameAndTypePair{virtual_column.name, virtual_column.type});
-            auto syntax_result = TreeRewriter(context).analyze(where_expression, source_columns);
-            ExpressionActionsPtr actions = ExpressionAnalyzer{where_expression, syntax_result, context}.getActions(false, false);
+            auto syntax_result = TreeRewriter(local_context).analyze(where_expression, source_columns);
+            ExpressionActionsPtr actions = ExpressionAnalyzer{where_expression, syntax_result, local_context}.getActions(false, false);
             Names required_columns = actions->getRequiredColumns();
 
             for (const auto & required_column : required_columns)
@@ -587,15 +621,13 @@ void registerStorageMerge(StorageFactory & factory)
                 " - name of source database and regexp for table names.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.local_context);
-        engine_args[1] = evaluateConstantExpressionAsLiteral(engine_args[1], args.local_context);
+        engine_args[0] = evaluateConstantExpressionForDatabaseName(engine_args[0], args.getLocalContext());
+        engine_args[1] = evaluateConstantExpressionAsLiteral(engine_args[1], args.getLocalContext());
 
         String source_database = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         String table_name_regexp = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
 
-        return StorageMerge::create(
-            args.table_id, args.columns,
-            source_database, table_name_regexp, args.context);
+        return StorageMerge::create(args.table_id, args.columns, args.comment, source_database, table_name_regexp, args.getContext());
     });
 }
 
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index ea8667aa186..b9d44bfa27e 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -12,7 +12,7 @@ namespace DB
 /** A table that represents the union of an arbitrary number of other tables.
   * All tables must have the same structure.
   */
-class StorageMerge final : public ext::shared_ptr_helper<StorageMerge>, public IStorage
+class StorageMerge final : public ext::shared_ptr_helper<StorageMerge>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageMerge>;
 public:
@@ -27,44 +27,42 @@ public:
     bool supportsIndexForIn() const override { return true; }
     bool supportsSubcolumns() const override { return true; }
 
-    QueryProcessingStage::Enum getQueryProcessingStage(const Context &, QueryProcessingStage::Enum /*to_stage*/, SelectQueryInfo &) const override;
+    QueryProcessingStage::Enum
+    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageMetadataPtr &, SelectQueryInfo &) const override;
 
     Pipe read(
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
     /// 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, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     bool mayBenefitFromIndexForIn(
-        const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override;
+        const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override;
 
 private:
     String source_database;
     std::optional<std::unordered_set<String>> source_tables;
     std::optional<OptimizedRegularExpression> source_table_regexp;
-    const Context & global_context;
 
     using StorageWithLockAndName = std::tuple<StoragePtr, TableLockHolder, String>;
     using StorageListWithLocks = std::list<StorageWithLockAndName>;
 
-    StorageListWithLocks getSelectedTables(const String & query_id, const Settings & settings) const;
-
     StorageMerge::StorageListWithLocks getSelectedTables(
-        const SelectQueryInfo & query_info, bool has_virtual_column, const String & query_id, const Settings & settings) const;
+            ContextPtr query_context, const ASTPtr & query = nullptr, bool filter_by_virtual_column = false) const;
 
     template <typename F>
     StoragePtr getFirstTable(F && predicate) const;
 
-    DatabaseTablesIteratorPtr getDatabaseIterator(const Context & context) const;
+    DatabaseTablesIteratorPtr getDatabaseIterator(ContextPtr context) const;
 
     NamesAndTypesList getVirtuals() const override;
     ColumnSizeByName getColumnSizes() const override;
@@ -73,33 +71,35 @@ protected:
     StorageMerge(
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
+        const String & comment,
         const String & source_database_,
         const Strings & source_tables_,
-        const Context & context_);
+        ContextPtr context_);
 
     StorageMerge(
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
+        const String & comment,
         const String & source_database_,
         const String & source_table_regexp_,
-        const Context & context_);
+        ContextPtr context_);
 
     Pipe createSources(
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
         const QueryProcessingStage::Enum & processed_stage,
-        const UInt64 max_block_size,
+        UInt64 max_block_size,
         const Block & header,
         const StorageWithLockAndName & storage_with_lock,
         Names & real_column_names,
-        const std::shared_ptr<Context> & modified_context,
+        ContextMutablePtr modified_context,
         size_t streams_num,
         bool has_table_virtual_column,
         bool concat_streams = false);
 
     void convertingSourceStream(
         const Block & header, const StorageMetadataPtr & metadata_snapshot,
-        const Context & context, ASTPtr & query,
+        ContextPtr context, ASTPtr & query,
         Pipe & pipe, QueryProcessingStage::Enum processed_stage);
 };
 
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 10790057ac9..3d3530825d9 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -3,7 +3,6 @@
 #include <Databases/IDatabase.h>
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
-#include <Common/FieldVisitors.h>
 #include <Common/ThreadPool.h>
 #include <Interpreters/InterpreterAlterQuery.h>
 #include <Interpreters/PartLog.h>
@@ -63,7 +62,7 @@ StorageMergeTree::StorageMergeTree(
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
     bool attach,
-    Context & context_,
+    ContextMutablePtr context_,
     const String & date_column_name,
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> storage_settings_,
@@ -80,9 +79,9 @@ StorageMergeTree::StorageMergeTree(
         attach)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this, global_context.getSettingsRef().background_pool_size)
-    , background_executor(*this, global_context)
-    , background_moves_executor(*this, global_context)
+    , merger_mutator(*this, getContext()->getSettingsRef().background_pool_size)
+    , background_executor(*this, getContext())
+    , background_moves_executor(*this, getContext())
 
 {
     loadDataParts(has_force_restore_data_flag);
@@ -93,6 +92,8 @@ StorageMergeTree::StorageMergeTree(
     increment.set(getMaxBlockNumber());
 
     loadMutations();
+
+    loadDeduplicationLog();
 }
 
 
@@ -156,7 +157,7 @@ void StorageMergeTree::shutdown()
     {
         /// We clear all old parts after stopping all background operations.
         /// It's important, because background operations can produce temporary
-        /// parts which will remove themselves in their descrutors. If so, we
+        /// parts which will remove themselves in their destructors. If so, we
         /// may have race condition between our remove call and background
         /// process.
         clearOldPartsFromFilesystem(true);
@@ -180,12 +181,12 @@ void StorageMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
-    QueryProcessingStage::Enum /*processed_stage*/,
+    ContextPtr local_context,
+    QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned num_streams)
 {
-    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams))
+    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, local_context, max_block_size, num_streams, processed_stage))
         query_plan = std::move(*plan);
 }
 
@@ -193,16 +194,16 @@ Pipe StorageMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
     return plan.convertToPipe(
-        QueryPlanOptimizationSettings::fromContext(context),
-        BuildQueryPipelineSettings::fromContext(context));
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 std::optional<UInt64> StorageMergeTree::totalRows(const Settings &) const
@@ -210,10 +211,10 @@ std::optional<UInt64> StorageMergeTree::totalRows(const Settings &) const
     return getTotalActiveSizeInRows();
 }
 
-std::optional<UInt64> StorageMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, const Context & context) const
+std::optional<UInt64> StorageMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, ContextPtr local_context) const
 {
     auto parts = getDataPartsVector({DataPartState::Committed});
-    return totalRowsByPartitionPredicateImpl(query_info, context, parts);
+    return totalRowsByPartitionPredicateImpl(query_info, local_context, parts);
 }
 
 std::optional<UInt64> StorageMergeTree::totalBytes(const Settings &) const
@@ -221,18 +222,18 @@ std::optional<UInt64> StorageMergeTree::totalBytes(const Settings &) const
     return getTotalActiveSizeInBytes();
 }
 
-BlockOutputStreamPtr StorageMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr
+StorageMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-
-    const auto & settings = context.getSettingsRef();
+    const auto & settings = local_context->getSettingsRef();
     return std::make_shared<MergeTreeBlockOutputStream>(
-        *this, metadata_snapshot, settings.max_partitions_per_insert_block, context.getSettingsRef().optimize_on_insert);
+        *this, metadata_snapshot, settings.max_partitions_per_insert_block, local_context);
 }
 
 void StorageMergeTree::checkTableCanBeDropped() const
 {
     auto table_id = getStorageID();
-    global_context.checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
+    getContext()->checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
 }
 
 void StorageMergeTree::drop()
@@ -241,7 +242,7 @@ void StorageMergeTree::drop()
     dropAllData();
 }
 
-void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     {
         /// Asks to complete merges and does not allow them to start.
@@ -261,24 +262,25 @@ void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, cons
 
 void StorageMergeTree::alter(
     const AlterCommands & commands,
-    const Context & context,
+    ContextPtr local_context,
     TableLockHolder & table_lock_holder)
 {
     auto table_id = getStorageID();
+    auto old_storage_settings = getSettings();
 
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
-    auto maybe_mutation_commands = commands.getMutationCommands(new_metadata, context.getSettingsRef().materialize_ttl_after_modify, context);
+    auto maybe_mutation_commands = commands.getMutationCommands(new_metadata, local_context->getSettingsRef().materialize_ttl_after_modify, local_context);
     String mutation_file_name;
     Int64 mutation_version = -1;
-    commands.apply(new_metadata, context);
+    commands.apply(new_metadata, local_context);
 
     /// This alter can be performed at new_metadata level only
     if (commands.isSettingsAlter())
     {
         changeSettings(new_metadata.settings_changes, table_lock_holder);
 
-        DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+        DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     }
     else
     {
@@ -288,7 +290,7 @@ void StorageMergeTree::alter(
             /// Reinitialize primary key because primary key column types might have changed.
             setProperties(new_metadata, old_metadata);
 
-            DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+            DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
 
             if (!maybe_mutation_commands.empty())
                 mutation_version = startMutation(maybe_mutation_commands, mutation_file_name);
@@ -299,6 +301,21 @@ void StorageMergeTree::alter(
         if (!maybe_mutation_commands.empty())
             waitForMutation(mutation_version, mutation_file_name);
     }
+
+    {
+        /// Some additional changes in settings
+        auto new_storage_settings = getSettings();
+
+        if (old_storage_settings->non_replicated_deduplication_window != new_storage_settings->non_replicated_deduplication_window)
+        {
+            /// We cannot place this check into settings sanityCheck because it depends on format_version.
+            /// sanityCheck must work event without storage.
+            if (new_storage_settings->non_replicated_deduplication_window != 0 && format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+                throw Exception("Deduplication for non-replicated MergeTree in old syntax is not supported", ErrorCodes::BAD_ARGUMENTS);
+
+            deduplication_log->setDeduplicationWindowSize(new_storage_settings->non_replicated_deduplication_window);
+        }
+    }
 }
 
 
@@ -456,17 +473,25 @@ void StorageMergeTree::waitForMutation(Int64 version, const String & file_name)
     mutation_ids.insert(file_name);
 
     auto mutation_status = getIncompleteMutationsStatus(version, &mutation_ids);
-    checkMutationStatus(mutation_status, mutation_ids);
+    try
+    {
+        checkMutationStatus(mutation_status, mutation_ids);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        throw;
+    }
 
     LOG_INFO(log, "Mutation {} done", file_name);
 }
 
-void StorageMergeTree::mutate(const MutationCommands & commands, const Context & query_context)
+void StorageMergeTree::mutate(const MutationCommands & commands, ContextPtr query_context)
 {
     String mutation_file_name;
     Int64 version = startMutation(commands, mutation_file_name);
 
-    if (query_context.getSettingsRef().mutations_sync > 0)
+    if (query_context->getSettingsRef().mutations_sync > 0)
         waitForMutation(version, mutation_file_name);
 }
 
@@ -600,7 +625,7 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
     if (!to_kill)
         return CancellationCode::NotFound;
 
-    global_context.getMergeList().cancelPartMutations({}, to_kill->block_number);
+    getContext()->getMergeList().cancelPartMutations({}, to_kill->block_number);
     to_kill->removeFile();
     LOG_TRACE(log, "Cancelled part mutations and removed mutation file {}", mutation_id);
     {
@@ -614,6 +639,16 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
     return CancellationCode::CancelSent;
 }
 
+void StorageMergeTree::loadDeduplicationLog()
+{
+    auto settings = getSettings();
+    if (settings->non_replicated_deduplication_window != 0 && format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+        throw Exception("Deduplication for non-replicated MergeTree in old syntax is not supported", ErrorCodes::BAD_ARGUMENTS);
+
+    std::string path = getDataPaths()[0] + "/deduplication_logs";
+    deduplication_log = std::make_unique<MergeTreeDeduplicationLog>(path, settings->non_replicated_deduplication_window, format_version);
+    deduplication_log->load();
+}
 
 void StorageMergeTree::loadMutations()
 {
@@ -655,14 +690,14 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     CurrentlyMergingPartsTaggerPtr merging_tagger;
     MergeList::EntryPtr merge_entry;
 
-    auto can_merge = [this, &lock] (const DataPartPtr & left, const DataPartPtr & right, String *) -> bool
+    auto can_merge = [this, &lock](const DataPartPtr & left, const DataPartPtr & right, String *) -> bool
     {
-        /// This predicate is checked for the first part of each partition.
+        /// This predicate is checked for the first part of each range.
         /// (left = nullptr, right = "first part of partition")
         if (!left)
             return !currently_merging_mutating_parts.count(right);
         return !currently_merging_mutating_parts.count(left) && !currently_merging_mutating_parts.count(right)
-            && getCurrentMutationVersion(left, lock) == getCurrentMutationVersion(right, lock);
+            && getCurrentMutationVersion(left, lock) == getCurrentMutationVersion(right, lock) && partsContainSameProjections(left, right);
     };
 
     SelectPartsDecision select_decision = SelectPartsDecision::CANNOT_SELECT;
@@ -695,9 +730,10 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
             UInt64 disk_space = getStoragePolicy()->getMaxUnreservedFreeSpace();
             select_decision = merger_mutator.selectAllPartsToMergeWithinPartition(
                 future_part, disk_space, can_merge, partition_id, final, metadata_snapshot, out_disable_reason, optimize_skip_merged_partitions);
+            auto timeout_ms = getSettings()->lock_acquire_timeout_for_background_operations.totalMilliseconds();
+            auto timeout = std::chrono::milliseconds(timeout_ms);
 
             /// If final - we will wait for currently processing merges to finish and continue.
-            /// TODO Respect query settings for timeout
             if (final
                 && select_decision != SelectPartsDecision::SELECTED
                 && !currently_merging_mutating_parts.empty()
@@ -707,10 +743,9 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
                 LOG_DEBUG(log, "Waiting for currently running merges ({} parts are merging right now) to perform OPTIMIZE FINAL",
                     currently_merging_mutating_parts.size());
 
-                if (std::cv_status::timeout == currently_processing_in_background_condition.wait_for(
-                    lock, std::chrono::seconds(DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC)))
+                if (std::cv_status::timeout == currently_processing_in_background_condition.wait_for(lock, timeout))
                 {
-                    *out_disable_reason = "Timeout while waiting for already running merges before running OPTIMIZE with FINAL";
+                    *out_disable_reason = fmt::format("Timeout ({} ms) while waiting for already running merges before running OPTIMIZE with FINAL", timeout_ms);
                     break;
                 }
             }
@@ -740,7 +775,7 @@ 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))
-        global_context.getMergeList().bookMergeWithTTL();
+        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{});
@@ -784,7 +819,7 @@ bool StorageMergeTree::mergeSelectedParts(
     MutableDataPartPtr new_part;
     auto table_id = getStorageID();
 
-    auto merge_list_entry = global_context.getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
+    auto merge_list_entry = getContext()->getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
 
     auto write_part_log = [&] (const ExecutionStatus & execution_status)
     {
@@ -801,8 +836,16 @@ bool StorageMergeTree::mergeSelectedParts(
     try
     {
         new_part = merger_mutator.mergePartsToTemporaryPart(
-            future_part, metadata_snapshot, *(merge_list_entry), table_lock_holder, time(nullptr),
-            global_context, merge_mutate_entry.tagger->reserved_space, deduplicate, deduplicate_by_columns);
+            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({});
@@ -826,7 +869,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     const StorageMetadataPtr & metadata_snapshot, String * /* disable_reason */, TableLockHolder & /* table_lock_holder */)
 {
     std::lock_guard lock(currently_processing_in_background_mutex);
-    size_t max_ast_elements = global_context.getSettingsRef().max_expanded_ast_elements;
+    size_t max_ast_elements = getContext()->getSettingsRef().max_expanded_ast_elements;
 
     FutureMergedMutatedPart future_part;
     if (storage_settings.get()->assign_part_uuids)
@@ -839,6 +882,16 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     if (current_mutations_by_version.empty())
         return {};
 
+    size_t max_source_part_size = merger_mutator.getMaxSourcePartSizeForMutation();
+    if (max_source_part_size == 0)
+    {
+        LOG_DEBUG(
+            log,
+            "Not enough idle threads to apply mutations at the moment. See settings 'number_of_free_entries_in_pool_to_execute_mutation' "
+            "and 'background_pool_size'");
+        return {};
+    }
+
     auto mutations_end_it = current_mutations_by_version.end();
     for (const auto & part : getDataPartsVector())
     {
@@ -849,13 +902,14 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
         if (mutations_begin_it == mutations_end_it)
             continue;
 
-        size_t max_source_part_size = merger_mutator.getMaxSourcePartSizeForMutation();
         if (max_source_part_size < part->getBytesOnDisk())
         {
-            LOG_DEBUG(log, "Current max source part size for mutation is {} but part size {}. Will not mutate part {}. "
-                "Max size depends not only on available space, but also on settings "
-                "'number_of_free_entries_in_pool_to_execute_mutation' and 'background_pool_size'",
-                max_source_part_size, part->getBytesOnDisk(), part->name);
+            LOG_DEBUG(
+                log,
+                "Current max source part size for mutation is {} but part size {}. Will not mutate part {} yet",
+                max_source_part_size,
+                part->getBytesOnDisk(),
+                part->name);
             continue;
         }
 
@@ -868,6 +922,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
             {
                 if (command.type != MutationCommand::Type::DROP_COLUMN
                     && command.type != MutationCommand::Type::DROP_INDEX
+                    && command.type != MutationCommand::Type::DROP_PROJECTION
                     && command.type != MutationCommand::Type::RENAME_COLUMN)
                 {
                     commands_for_size_validation.push_back(command);
@@ -881,7 +936,7 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
             if (!commands_for_size_validation.empty())
             {
                 MutationsInterpreter interpreter(
-                    shared_from_this(), metadata_snapshot, commands_for_size_validation, global_context, false);
+                    shared_from_this(), metadata_snapshot, commands_for_size_validation, getContext(), false);
                 commands_size += interpreter.evaluateCommandsSize();
             }
 
@@ -911,7 +966,7 @@ bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_sn
     auto & future_part = merge_mutate_entry.future_part;
     auto table_id = getStorageID();
 
-    auto merge_list_entry = global_context.getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
+    auto merge_list_entry = getContext()->getMergeList().insert(table_id.database_name, table_id.table_name, future_part);
     Stopwatch stopwatch;
     MutableDataPartPtr new_part;
 
@@ -931,7 +986,7 @@ bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_sn
     {
         new_part = merger_mutator.mutatePartToTemporaryPart(
             future_part, metadata_snapshot, merge_mutate_entry.commands, *(merge_list_entry),
-            time(nullptr), global_context, merge_mutate_entry.tagger->reserved_space, table_lock_holder);
+            time(nullptr), getContext(), merge_mutate_entry.tagger->reserved_space, table_lock_holder);
 
         renameTempPartAndReplace(new_part);
 
@@ -948,7 +1003,7 @@ bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_sn
     return true;
 }
 
-std::optional<JobAndPool> StorageMergeTree::getDataProcessingJob()
+std::optional<JobAndPool> StorageMergeTree::getDataProcessingJob() //-V657
 {
     if (shutdown_called)
         return {};
@@ -1056,7 +1111,7 @@ bool StorageMergeTree::optimize(
     bool final,
     bool deduplicate,
     const Names & deduplicate_by_columns,
-    const Context & context)
+    ContextPtr local_context)
 {
     if (deduplicate)
     {
@@ -1077,14 +1132,21 @@ bool StorageMergeTree::optimize(
 
         for (const String & partition_id : partition_ids)
         {
-            if (!merge(true, partition_id, true, deduplicate, deduplicate_by_columns, &disable_reason, context.getSettingsRef().optimize_skip_merged_partitions))
+            if (!merge(
+                    true,
+                    partition_id,
+                    true,
+                    deduplicate,
+                    deduplicate_by_columns,
+                    &disable_reason,
+                    local_context->getSettingsRef().optimize_skip_merged_partitions))
             {
                 constexpr const char * message = "Cannot OPTIMIZE table: {}";
                 if (disable_reason.empty())
                     disable_reason = "unknown reason";
                 LOG_INFO(log, message, disable_reason);
 
-                if (context.getSettingsRef().optimize_throw_if_noop)
+                if (local_context->getSettingsRef().optimize_throw_if_noop)
                     throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason);
                 return false;
             }
@@ -1094,16 +1156,23 @@ bool StorageMergeTree::optimize(
     {
         String partition_id;
         if (partition)
-            partition_id = getPartitionIDFromQuery(partition, context);
+            partition_id = getPartitionIDFromQuery(partition, local_context);
 
-        if (!merge(true, partition_id, final, deduplicate, deduplicate_by_columns, &disable_reason, context.getSettingsRef().optimize_skip_merged_partitions))
+        if (!merge(
+                true,
+                partition_id,
+                final,
+                deduplicate,
+                deduplicate_by_columns,
+                &disable_reason,
+                local_context->getSettingsRef().optimize_skip_merged_partitions))
         {
             constexpr const char * message = "Cannot OPTIMIZE table: {}";
             if (disable_reason.empty())
                 disable_reason = "unknown reason";
             LOG_INFO(log, message, disable_reason);
 
-            if (context.getSettingsRef().optimize_throw_if_noop)
+            if (local_context->getSettingsRef().optimize_throw_if_noop)
                 throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason);
             return false;
         }
@@ -1171,61 +1240,77 @@ MergeTreeDataPartPtr StorageMergeTree::outdatePart(const String & part_name, boo
     }
 }
 
-void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & context, bool throw_if_noop)
+void StorageMergeTree::dropPartNoWaitNoThrow(const String & part_name)
 {
+    if (auto part = outdatePart(part_name, /*force=*/ false))
+        dropPartsImpl({part}, /*detach=*/ false);
+
+    /// Else nothing to do, part was removed in some different way
+}
+
+void StorageMergeTree::dropPart(const String & part_name, bool detach, ContextPtr /*query_context*/)
+{
+    if (auto part = outdatePart(part_name, /*force=*/ true))
+        dropPartsImpl({part}, detach);
+}
+
+void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, ContextPtr local_context)
+{
+    DataPartsVector parts_to_remove;
+    /// New scope controls lifetime of merge_blocker.
     {
-        MergeTreeData::DataPartsVector parts_to_remove;
-        auto metadata_snapshot = getInMemoryMetadataPtr();
+        /// Asks to complete merges and does not allow them to start.
+        /// This protects against "revival" of data for a removed partition after completion of merge.
+        auto merge_blocker = stopMergesAndWait();
+        String partition_id = getPartitionIDFromQuery(partition, local_context);
+        parts_to_remove = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
 
-        if (drop_part)
-        {
-            auto part = outdatePart(partition->as<ASTLiteral &>().value.safeGet<String>(), throw_if_noop);
-            /// Nothing to do, part was removed in some different way
-            if (!part)
-                return;
-
-            parts_to_remove.push_back(part);
-        }
-        else
-        {
-            /// Asks to complete merges and does not allow them to start.
-            /// This protects against "revival" of data for a removed partition after completion of merge.
-            auto merge_blocker = stopMergesAndWait();
-            String partition_id = getPartitionIDFromQuery(partition, context);
-            parts_to_remove = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
-
-            /// TODO should we throw an exception if parts_to_remove is empty?
-            removePartsFromWorkingSet(parts_to_remove, true);
-        }
-
-        if (detach)
-        {
-            /// If DETACH clone parts to detached/ directory
-            /// NOTE: no race with background cleanup until we hold pointers to parts
-            for (const auto & part : parts_to_remove)
-            {
-                LOG_INFO(log, "Detaching {}", part->relative_path);
-                part->makeCloneInDetached("", metadata_snapshot);
-            }
-        }
-
-        if (detach)
-            LOG_INFO(log, "Detached {} parts.", parts_to_remove.size());
-        else
-            LOG_INFO(log, "Removed {} parts.", parts_to_remove.size());
+        /// TODO should we throw an exception if parts_to_remove is empty?
+        removePartsFromWorkingSet(parts_to_remove, true);
     }
 
+    dropPartsImpl(std::move(parts_to_remove), detach);
+}
+
+void StorageMergeTree::dropPartsImpl(DataPartsVector && parts_to_remove, bool detach)
+{
+    auto metadata_snapshot = getInMemoryMetadataPtr();
+
+    if (detach)
+    {
+        /// If DETACH clone parts to detached/ directory
+        /// NOTE: no race with background cleanup until we hold pointers to parts
+        for (const auto & part : parts_to_remove)
+        {
+            LOG_INFO(log, "Detaching {}", part->relative_path);
+            part->makeCloneInDetached("", metadata_snapshot);
+        }
+    }
+
+    if (deduplication_log)
+    {
+        for (const auto & part : parts_to_remove)
+            deduplication_log->dropPart(part->info);
+    }
+
+    if (detach)
+        LOG_INFO(log, "Detached {} parts.", parts_to_remove.size());
+    else
+        LOG_INFO(log, "Removed {} parts.", parts_to_remove.size());
+
+    /// Need to destroy part objects before clearing them from filesystem.
+    parts_to_remove.clear();
     clearOldPartsFromFilesystem();
 }
 
 
 PartitionCommandsResultInfo StorageMergeTree::attachPartition(
     const ASTPtr & partition, const StorageMetadataPtr & /* metadata_snapshot */,
-    bool attach_part, const Context & context)
+    bool attach_part, ContextPtr local_context)
 {
     PartitionCommandsResultInfo results;
     PartsTemporaryRename renamed_parts(*this, "detached/");
-    MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, context, renamed_parts);
+    MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, local_context, renamed_parts);
 
     for (size_t i = 0; i < loaded_parts.size(); ++i)
     {
@@ -1244,20 +1329,20 @@ PartitionCommandsResultInfo StorageMergeTree::attachPartition(
     }
 
     /// New parts with other data may appear in place of deleted parts.
-    context.dropCaches();
+    local_context->dropCaches();
     return results;
 }
 
-void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context)
+void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr local_context)
 {
-    auto lock1 = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = source_table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    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 source_metadata_snapshot = source_table->getInMemoryMetadataPtr();
     auto my_metadata_snapshot = getInMemoryMetadataPtr();
 
     Stopwatch watch;
     MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, my_metadata_snapshot);
-    String partition_id = getPartitionIDFromQuery(partition, context);
+    String partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector src_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     MutableDataPartsVector dst_parts;
@@ -1309,22 +1394,22 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
 
             /// If it is REPLACE (not ATTACH), remove all parts which max_block_number less then min_block_number of the first new block
             if (replace)
-                removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
+                removePartsInRangeFromWorkingSet(drop_range, true, data_parts_lock);
         }
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 }
 
-void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & context)
+void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr local_context)
 {
-    auto lock1 = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = dest_table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    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 dest_table_storage = std::dynamic_pointer_cast<StorageMergeTree>(dest_table);
     if (!dest_table_storage)
@@ -1341,7 +1426,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
     Stopwatch watch;
 
     MergeTreeData & src_data = dest_table_storage->checkStructureAndGetMergeTreeData(*this, metadata_snapshot, dest_metadata_snapshot);
-    String partition_id = getPartitionIDFromQuery(partition, context);
+    String partition_id = getPartitionIDFromQuery(partition, local_context);
 
     DataPartsVector src_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     MutableDataPartsVector dst_parts;
@@ -1388,11 +1473,11 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
         clearOldMutations(true);
         clearOldPartsFromFilesystem();
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 }
@@ -1417,13 +1502,13 @@ void StorageMergeTree::onActionLockRemove(StorageActionBlockType action_type)
         background_moves_executor.triggerTask();
 }
 
-CheckResults StorageMergeTree::checkData(const ASTPtr & query, const Context & context)
+CheckResults StorageMergeTree::checkData(const ASTPtr & query, ContextPtr local_context)
 {
     CheckResults results;
     DataPartsVector data_parts;
     if (const auto & check_query = query->as<ASTCheckQuery &>(); check_query.partition)
     {
-        String partition_id = getPartitionIDFromQuery(check_query.partition, context);
+        String partition_id = getPartitionIDFromQuery(check_query.partition, local_context);
         data_parts = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     }
     else
@@ -1434,8 +1519,8 @@ CheckResults StorageMergeTree::checkData(const ASTPtr & query, const Context & c
         auto disk = part->volume->getDisk();
         String part_path = part->getFullRelativePath();
         /// If the checksums file is not present, calculate the checksums and write them to disk.
-        String checksums_path = part_path + "checksums.txt";
-        String tmp_checksums_path = part_path + "checksums.txt.tmp";
+        String checksums_path = fs::path(part_path) / "checksums.txt";
+        String tmp_checksums_path = fs::path(part_path) / "checksums.txt.tmp";
         if (part->isStoredOnDisk() && !disk->exists(checksums_path))
         {
             try
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index 246ce151a02..72fbb37bdd9 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -12,6 +12,8 @@
 #include <Storages/MergeTree/MergeTreePartsMover.h>
 #include <Storages/MergeTree/MergeTreeMutationEntry.h>
 #include <Storages/MergeTree/MergeTreeMutationStatus.h>
+#include <Storages/MergeTree/MergeTreeDeduplicationLog.h>
+
 #include <Disks/StoragePolicy.h>
 #include <Common/SimpleIncrement.h>
 #include <Storages/MergeTree/BackgroundJobsExecutor.h>
@@ -40,7 +42,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -50,16 +52,16 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
-    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, const Context &) const override;
+    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo &, ContextPtr) const override;
     std::optional<UInt64> totalBytes(const Settings &) const override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     /** Perform the next step in combining the parts.
       */
@@ -70,9 +72,9 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & context) override;
+        ContextPtr context) override;
 
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
 
     /// Return introspection information about currently processing or recently processed mutations.
     std::vector<MergeTreeMutationStatus> getMutationsStatus() const override;
@@ -80,9 +82,9 @@ public:
     CancellationCode killMutation(const String & mutation_id) override;
 
     void drop() override;
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
-    void alter(const AlterCommands & commands, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & commands, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     void checkTableCanBeDropped() const override;
 
@@ -90,9 +92,11 @@ public:
 
     void onActionLockRemove(StorageActionBlockType action_type) override;
 
-    CheckResults checkData(const ASTPtr & query, const Context & context) override;
+    CheckResults checkData(const ASTPtr & query, ContextPtr context) override;
 
     std::optional<JobAndPool> getDataProcessingJob() override;
+
+    MergeTreeDeduplicationLog * getDeduplicationLog() { return deduplication_log.get(); }
 private:
 
     /// Mutex and condvar for synchronous mutations wait
@@ -105,6 +109,8 @@ private:
     BackgroundJobsExecutor background_executor;
     BackgroundMovesExecutor background_moves_executor;
 
+    std::unique_ptr<MergeTreeDeduplicationLog> deduplication_log;
+
     /// For block numbers.
     SimpleIncrement increment;
 
@@ -128,6 +134,10 @@ private:
 
     void loadMutations();
 
+    /// Load and initialize deduplication logs. Even if deduplication setting
+    /// equals zero creates object with deduplication window equals zero.
+    void loadDeduplicationLog();
+
     /** Determines what parts should be merged and merges it.
       * If aggressive - when selects parts don't takes into account their ratio size and novelty (used for OPTIMIZE query).
       * Returns true if merge is finished successfully.
@@ -201,11 +211,14 @@ private:
     void clearOldMutations(bool truncate = false);
 
     // Partition helpers
-    void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & context, bool throw_if_noop) override;
-    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, const Context & context) override;
+    void dropPartNoWaitNoThrow(const String & part_name) override;
+    void dropPart(const String & part_name, bool detach, ContextPtr context) override;
+    void dropPartition(const ASTPtr & partition, bool detach, ContextPtr context) override;
+    void dropPartsImpl(DataPartsVector && parts_to_remove, bool detach);
+    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, ContextPtr context) override;
 
-    void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context) override;
-    void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & context) override;
+    void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr context) override;
+    void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr context) override;
     bool partIsAssignedToBackgroundOperation(const DataPartPtr & part) const override;
     /// Update mutation entries after part mutation execution. May reset old
     /// errors if mutation was successful. Otherwise update last_failed* fields
@@ -222,6 +235,7 @@ private:
 
     void startBackgroundMovesIfNeeded() override;
 
+    friend class MergeTreeProjectionBlockOutputStream;
     friend class MergeTreeBlockOutputStream;
     friend class MergeTreeData;
 
@@ -239,7 +253,7 @@ protected:
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata,
         bool attach,
-        Context & context_,
+        ContextMutablePtr context_,
         const String & date_column_name,
         const MergingParams & merging_params_,
         std::unique_ptr<MergeTreeSettings> settings_,
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index 09fd413af75..f5f604c6f41 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -34,7 +34,8 @@ StorageMongoDB::StorageMongoDB(
     const std::string & username_,
     const std::string & password_,
     const ColumnsDescription & columns_,
-    const ConstraintsDescription & constraints_)
+    const ConstraintsDescription & constraints_,
+    const String & comment)
     : IStorage(table_id_)
     , host(host_)
     , port(port_)
@@ -46,6 +47,7 @@ StorageMongoDB::StorageMongoDB(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -74,7 +76,7 @@ Pipe StorageMongoDB::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned)
@@ -106,7 +108,7 @@ void registerStorageMongoDB(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
         /// 27017 is the default MongoDB port.
         auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 27017);
@@ -125,7 +127,8 @@ void registerStorageMongoDB(StorageFactory & factory)
             username,
             password,
             args.columns,
-            args.constraints);
+            args.constraints,
+            args.comment);
     },
     {
         .source_access_type = AccessType::MONGO,
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 589ab276539..e5f60f59c1a 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -27,7 +27,8 @@ public:
         const std::string & username_,
         const std::string & password_,
         const ColumnsDescription & columns_,
-        const ConstraintsDescription & constraints_);
+        const ConstraintsDescription & constraints_,
+        const String & comment);
 
     std::string getName() const override { return "MongoDB"; }
 
@@ -35,7 +36,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index caac7c5d95e..1dadcfe986b 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -15,9 +15,11 @@
 #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/Pipe.h>
+#include <Common/parseRemoteDescription.h>
 
 
 namespace DB
@@ -41,25 +43,29 @@ static String backQuoteMySQL(const String & x)
 
 StorageMySQL::StorageMySQL(
     const StorageID & table_id_,
-    mysqlxx::Pool && pool_,
+    mysqlxx::PoolWithFailover && pool_,
     const std::string & remote_database_name_,
     const std::string & remote_table_name_,
     const bool replace_query_,
     const std::string & on_duplicate_clause_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_)
+    const String & comment,
+    ContextPtr context_,
+    const MySQLSettings & mysql_settings_)
     : IStorage(table_id_)
+    , WithContext(context_->getGlobalContext())
     , remote_database_name(remote_database_name_)
     , remote_table_name(remote_table_name_)
     , replace_query{replace_query_}
     , on_duplicate_clause{on_duplicate_clause_}
-    , pool(std::move(pool_))
-    , global_context(context_.getGlobalContext())
+    , mysql_settings(mysql_settings_)
+    , pool(std::make_shared<mysqlxx::PoolWithFailover>(pool_))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -68,9 +74,9 @@ Pipe StorageMySQL::read(
     const Names & column_names_,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info_,
-    const Context & context_,
+    ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
-    size_t max_block_size_,
+    size_t /*max_block_size*/,
     unsigned)
 {
     metadata_snapshot->check(column_names_, getVirtuals(), getStorageID());
@@ -94,9 +100,11 @@ Pipe StorageMySQL::read(
         sample_block.insert({ column_data.type, column_data.name });
     }
 
-    /// TODO: rewrite MySQLBlockInputStream
+
+    StreamSettings mysql_input_stream_settings(context_->getSettingsRef(),
+        mysql_settings.connection_auto_close);
     return Pipe(std::make_shared<SourceFromInputStream>(
-            std::make_shared<MySQLLazyBlockInputStream>(pool, query, sample_block, max_block_size_, /* auto_close = */ true)));
+            std::make_shared<MySQLWithFailoverBlockInputStream>(pool, query, sample_block, mysql_input_stream_settings)));
 }
 
 
@@ -144,10 +152,12 @@ public:
     {
         WriteBufferFromOwnString sqlbuf;
         sqlbuf << (storage.replace_query ? "REPLACE" : "INSERT") << " INTO ";
-        sqlbuf << backQuoteMySQL(remote_database_name) << "." << backQuoteMySQL(remote_table_name);
+        if (!remote_database_name.empty())
+            sqlbuf << backQuoteMySQL(remote_database_name) << ".";
+        sqlbuf << backQuoteMySQL(remote_table_name);
         sqlbuf << " (" << dumpNamesWithBackQuote(block) << ") VALUES ";
 
-        auto writer = FormatFactory::instance().getOutputStream("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.global_context);
+        auto writer = FormatFactory::instance().getOutputStream("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.getContext());
         writer->write(block);
 
         if (!storage.on_duplicate_clause.empty())
@@ -211,9 +221,15 @@ private:
 };
 
 
-BlockOutputStreamPtr StorageMySQL::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageMySQL::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    return std::make_shared<StorageMySQLBlockOutputStream>(*this, metadata_snapshot, remote_database_name, remote_table_name, pool.get(), context.getSettingsRef().mysql_max_rows_to_insert);
+    return std::make_shared<StorageMySQLBlockOutputStream>(
+        *this,
+        metadata_snapshot,
+        remote_database_name,
+        remote_table_name,
+        pool->get(),
+        local_context->getSettingsRef().mysql_max_rows_to_insert);
 }
 
 void registerStorageMySQL(StorageFactory & factory)
@@ -224,21 +240,36 @@ void registerStorageMySQL(StorageFactory & factory)
 
         if (engine_args.size() < 5 || engine_args.size() > 7)
             throw Exception(
-                "Storage MySQL requires 5-7 parameters: MySQL('host:port', database, table, 'user', 'password'[, replace_query, 'on_duplicate_clause']).",
+                "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.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
         /// 3306 is the default MySQL port.
-        auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 3306);
-
+        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;
 
-        mysqlxx::Pool pool(remote_database, parsed_host_port.first, username, password, parsed_host_port.second);
+        /// TODO: move some arguments from the arguments to the SETTINGS.
+        MySQLSettings mysql_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_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;
@@ -261,9 +292,12 @@ void registerStorageMySQL(StorageFactory & factory)
             on_duplicate_clause,
             args.columns,
             args.constraints,
-            args.context);
+            args.comment,
+            args.getContext(),
+            mysql_settings);
     },
     {
+        .supports_settings = true,
         .source_access_type = AccessType::MYSQL,
     });
 }
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index 645f3600eee..5eb9ed14524 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -1,15 +1,16 @@
 #pragma once
 
 #if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
+#include "config_core.h"
 #endif
 
 #if USE_MYSQL
 
-#    include <ext/shared_ptr_helper.h>
+#include <ext/shared_ptr_helper.h>
 
-#    include <Storages/IStorage.h>
-#    include <mysqlxx/Pool.h>
+#include <Storages/IStorage.h>
+#include <Storages/MySQL/MySQLSettings.h>
+#include <mysqlxx/PoolWithFailover.h>
 
 
 namespace DB
@@ -19,20 +20,22 @@ namespace DB
   * Use ENGINE = mysql(host_port, database_name, table_name, user_name, password)
   * Read only.
   */
-class StorageMySQL final : public ext::shared_ptr_helper<StorageMySQL>, public IStorage
+class StorageMySQL final : public ext::shared_ptr_helper<StorageMySQL>, public IStorage, WithContext
 {
     friend struct ext::shared_ptr_helper<StorageMySQL>;
 public:
     StorageMySQL(
         const StorageID & table_id_,
-        mysqlxx::Pool && pool_,
+        mysqlxx::PoolWithFailover && pool_,
         const std::string & remote_database_name_,
         const std::string & remote_table_name_,
-        const bool replace_query_,
+        bool replace_query_,
         const std::string & on_duplicate_clause_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_);
+        const String & comment,
+        ContextPtr context_,
+        const MySQLSettings & mysql_settings_);
 
     std::string getName() const override { return "MySQL"; }
 
@@ -40,12 +43,12 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
 private:
     friend class StorageMySQLBlockOutputStream;
@@ -55,8 +58,9 @@ private:
     bool replace_query;
     std::string on_duplicate_clause;
 
-    mysqlxx::Pool pool;
-    const Context & global_context;
+    MySQLSettings mysql_settings;
+
+    mysqlxx::PoolWithFailoverPtr pool;
 };
 
 }
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index ed9a7fffc63..85f0daf3fa8 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -29,14 +29,14 @@ void registerStorageNull(StorageFactory & factory)
                 "Engine " + args.engine_name + " doesn't support any arguments (" + toString(args.engine_args.size()) + " given)",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        return StorageNull::create(args.table_id, args.columns, args.constraints);
+        return StorageNull::create(args.table_id, args.columns, args.constraints, args.comment);
     },
     {
         .supports_parallel_insert = true,
     });
 }
 
-void StorageNull::checkAlterIsPossible(const AlterCommands & commands, const Context & context) const
+void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const
 {
     auto name_deps = getDependentViewsByColumn(context);
     for (const auto & command : commands)
@@ -46,7 +46,7 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, const Con
             throw Exception(
                 "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
                 ErrorCodes::NOT_IMPLEMENTED);
-        if (command.type == AlterCommand::DROP_COLUMN)
+        if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
             if (!deps_mv.empty())
@@ -61,7 +61,7 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, const Con
 }
 
 
-void StorageNull::alter(const AlterCommands & params, const Context & context, TableLockHolder &)
+void StorageNull::alter(const AlterCommands & params, ContextPtr context, TableLockHolder &)
 {
     auto table_id = getStorageID();
 
diff --git a/src/Storages/StorageNull.h b/src/Storages/StorageNull.h
index 943c056a588..85fae2cc470 100644
--- a/src/Storages/StorageNull.h
+++ b/src/Storages/StorageNull.h
@@ -25,7 +25,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo &,
-        const Context & /*context*/,
+        ContextPtr /*context*/,
         QueryProcessingStage::Enum /*processing_stage*/,
         size_t,
         unsigned) override
@@ -36,14 +36,14 @@ public:
 
     bool supportsParallelInsert() const override { return true; }
 
-    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &) override
+    BlockOutputStreamPtr write(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr) override
     {
         return std::make_shared<NullBlockOutputStream>(metadata_snapshot->getSampleBlock());
     }
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const override;
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override
     {
@@ -57,12 +57,14 @@ public:
 private:
 
 protected:
-    StorageNull(const StorageID & table_id_, ColumnsDescription columns_description_, ConstraintsDescription constraints_)
+    StorageNull(
+        const StorageID & table_id_, ColumnsDescription columns_description_, ConstraintsDescription constraints_, const String & comment)
         : IStorage(table_id_)
     {
         StorageInMemoryMetadata metadata_;
         metadata_.setColumns(columns_description_);
         metadata_.setConstraints(constraints_);
+        metadata_.setComment(comment);
         setInMemoryMetadata(metadata_);
     }
 };
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index e1b927027f9..1d863a43b29 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -4,7 +4,6 @@
 
 #include <Storages/StorageFactory.h>
 #include <Storages/transformQueryForExternalDatabase.h>
-#include <Storages/PostgreSQL/PostgreSQLConnection.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeString.h>
@@ -26,6 +25,7 @@
 #include <Formats/FormatFactory.h>
 #include <Formats/FormatSettings.h>
 #include <Processors/Sources/SourceFromInputStream.h>
+#include <Common/parseRemoteDescription.h>
 #include <Processors/Pipe.h>
 #include <IO/WriteHelpers.h>
 
@@ -41,21 +41,23 @@ namespace ErrorCodes
 
 StoragePostgreSQL::StoragePostgreSQL(
     const StorageID & table_id_,
+    postgres::PoolWithFailoverPtr pool_,
     const String & remote_table_name_,
-    PostgreSQLConnectionPoolPtr connection_pool_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_,
+    const String & comment,
+    ContextPtr context_,
     const String & remote_table_schema_)
     : IStorage(table_id_)
     , remote_table_name(remote_table_name_)
     , remote_table_schema(remote_table_schema_)
     , global_context(context_)
-    , connection_pool(std::move(connection_pool_))
+    , pool(std::move(pool_))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -64,7 +66,7 @@ Pipe StoragePostgreSQL::read(
     const Names & column_names_,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info_,
-    const Context & context_,
+    ContextPtr context_,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size_,
     unsigned)
@@ -88,7 +90,7 @@ Pipe StoragePostgreSQL::read(
     }
 
     return Pipe(std::make_shared<SourceFromInputStream>(
-            std::make_shared<PostgreSQLBlockInputStream>(connection_pool->get(), query, sample_block, max_block_size_)));
+            std::make_shared<PostgreSQLBlockInputStream>(pool->get(), query, sample_block, max_block_size_)));
 }
 
 
@@ -97,10 +99,10 @@ class PostgreSQLBlockOutputStream : public IBlockOutputStream
 public:
     explicit PostgreSQLBlockOutputStream(
         const StorageMetadataPtr & metadata_snapshot_,
-        PostgreSQLConnectionHolderPtr connection_,
+        postgres::ConnectionHolderPtr connection_holder_,
         const std::string & remote_table_name_)
         : metadata_snapshot(metadata_snapshot_)
-        , connection(std::move(connection_))
+        , connection_holder(std::move(connection_holder_))
         , remote_table_name(remote_table_name_)
     {
     }
@@ -110,7 +112,7 @@ public:
 
     void writePrefix() override
     {
-        work = std::make_unique<pqxx::work>(connection->conn());
+        work = std::make_unique<pqxx::work>(connection_holder->get());
     }
 
 
@@ -276,7 +278,7 @@ public:
 
 private:
     StorageMetadataPtr metadata_snapshot;
-    PostgreSQLConnectionHolderPtr connection;
+    postgres::ConnectionHolderPtr connection_holder;
     std::string remote_table_name;
 
     std::unique_ptr<pqxx::work> work;
@@ -285,9 +287,9 @@ private:
 
 
 BlockOutputStreamPtr StoragePostgreSQL::write(
-        const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /* context */)
+        const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /* context */)
 {
-    return std::make_shared<PostgreSQLBlockOutputStream>(metadata_snapshot, connection_pool->get(), remote_table_name);
+    return std::make_shared<PostgreSQLBlockOutputStream>(metadata_snapshot, pool->get(), remote_table_name);
 }
 
 
@@ -303,26 +305,39 @@ void registerStoragePostgreSQL(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
-        auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 5432);
+        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 connection_pool = std::make_shared<PostgreSQLConnectionPool>(
-            engine_args[1]->as<ASTLiteral &>().value.safeGet<String>(),
-            parsed_host_port.first,
-            parsed_host_port.second,
-            engine_args[3]->as<ASTLiteral &>().value.safeGet<String>(),
-            engine_args[4]->as<ASTLiteral &>().value.safeGet<String>(),
-            args.context.getSettingsRef().postgresql_connection_pool_size,
-            args.context.getSettingsRef().postgresql_connection_pool_wait_timeout);
+        auto pool = std::make_shared<postgres::PoolWithFailover>(
+            remote_database,
+            addresses,
+            username,
+            password,
+            args.getContext()->getSettingsRef().postgresql_connection_pool_size,
+            args.getContext()->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
         return StoragePostgreSQL::create(
-            args.table_id, remote_table, connection_pool, args.columns, args.constraints, args.context, remote_table_schema);
+            args.table_id,
+            std::move(pool),
+            remote_table,
+            args.columns,
+            args.constraints,
+            args.comment,
+            args.getContext(),
+            remote_table_schema);
     },
     {
         .source_access_type = AccessType::POSTGRES,
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index fb80352f58d..76e10bebf67 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -9,8 +9,7 @@
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
 #include <DataStreams/IBlockOutputStream.h>
-#include <Storages/PostgreSQL/PostgreSQLConnectionPool.h>
-#include <pqxx/pqxx>
+#include <Storages/PostgreSQL/PoolWithFailover.h>
 
 
 namespace DB
@@ -23,11 +22,12 @@ class StoragePostgreSQL final : public ext::shared_ptr_helper<StoragePostgreSQL>
 public:
     StoragePostgreSQL(
         const StorageID & table_id_,
+        postgres::PoolWithFailoverPtr pool_,
         const String & remote_table_name_,
-        PostgreSQLConnectionPoolPtr connection_pool_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_,
+        const String & comment,
+        ContextPtr context_,
         const std::string & remote_table_schema_ = "");
 
     String getName() const override { return "PostgreSQL"; }
@@ -36,20 +36,20 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
 private:
     friend class PostgreSQLBlockOutputStream;
 
     String remote_table_name;
     String remote_table_schema;
-    Context global_context;
-    PostgreSQLConnectionPoolPtr connection_pool;
+    ContextPtr global_context;
+    postgres::PoolWithFailoverPtr pool;
 };
 
 }
diff --git a/src/Storages/StorageProxy.h b/src/Storages/StorageProxy.h
index 0349319d8fa..60e7bf24046 100644
--- a/src/Storages/StorageProxy.h
+++ b/src/Storages/StorageProxy.h
@@ -11,7 +11,7 @@ class StorageProxy : public IStorage
 {
 public:
 
-    StorageProxy(const StorageID & table_id_) : IStorage(table_id_) {}
+    explicit StorageProxy(const StorageID & table_id_) : IStorage(table_id_) {}
 
     virtual StoragePtr getNested() const = 0;
 
@@ -32,15 +32,18 @@ public:
     NamesAndTypesList getVirtuals() const override { return getNested()->getVirtuals(); }
 
     QueryProcessingStage::Enum getQueryProcessingStage(
-        const Context & context, QueryProcessingStage::Enum to_stage, SelectQueryInfo & ast) const override
+        ContextPtr context,
+        QueryProcessingStage::Enum to_stage,
+        const StorageMetadataPtr &,
+        SelectQueryInfo & info) const override
     {
-        return getNested()->getQueryProcessingStage(context, to_stage, ast);
+        return getNested()->getQueryProcessingStage(context, to_stage, getNested()->getInMemoryMetadataPtr(), info);
     }
 
     BlockInputStreams watch(
         const Names & column_names,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size,
         unsigned num_streams) override
@@ -52,7 +55,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override
@@ -60,10 +63,7 @@ public:
         return getNested()->read(column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
     }
 
-    BlockOutputStreamPtr write(
-        const ASTPtr & query,
-        const StorageMetadataPtr & metadata_snapshot,
-        const Context & context) override
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override
     {
         return getNested()->write(query, metadata_snapshot, context);
     }
@@ -73,7 +73,7 @@ public:
     void truncate(
         const ASTPtr & query,
         const StorageMetadataPtr & metadata_snapshot,
-        const Context & context,
+        ContextPtr context,
         TableExclusiveLockHolder & lock) override
     {
         getNested()->truncate(query, metadata_snapshot, context, lock);
@@ -91,13 +91,13 @@ public:
         IStorage::renameInMemory(new_table_id);
     }
 
-    void alter(const AlterCommands & params, const Context & context, TableLockHolder & alter_lock_holder) override
+    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & alter_lock_holder) override
     {
         getNested()->alter(params, context, alter_lock_holder);
         IStorage::setInMemoryMetadata(getNested()->getInMemoryMetadata());
     }
 
-    void checkAlterIsPossible(const AlterCommands & commands, const Context & context) const override
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override
     {
         getNested()->checkAlterIsPossible(commands, context);
     }
@@ -105,7 +105,7 @@ public:
     Pipe alterPartition(
             const StorageMetadataPtr & metadata_snapshot,
             const PartitionCommands & commands,
-            const Context & context) override
+            ContextPtr context) override
     {
         return getNested()->alterPartition(metadata_snapshot, commands, context);
     }
@@ -122,27 +122,28 @@ public:
             bool final,
             bool deduplicate,
             const Names & deduplicate_by_columns,
-            const Context & context) override
+            ContextPtr context) override
     {
         return getNested()->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, context);
     }
 
-    void mutate(const MutationCommands & commands, const Context & context) override { getNested()->mutate(commands, context); }
+    void mutate(const MutationCommands & commands, ContextPtr context) override { getNested()->mutate(commands, context); }
 
     CancellationCode killMutation(const String & mutation_id) override { return getNested()->killMutation(mutation_id); }
 
     void startup() override { getNested()->startup(); }
     void shutdown() override { getNested()->shutdown(); }
+    void flush() override { getNested()->flush(); }
 
     ActionLock getActionLock(StorageActionBlockType action_type) override { return getNested()->getActionLock(action_type); }
 
     bool supportsIndexForIn() const override { return getNested()->supportsIndexForIn(); }
-    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, const Context & query_context, const StorageMetadataPtr & metadata_snapshot) const override
+    bool mayBenefitFromIndexForIn(const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override
     {
         return getNested()->mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
     }
 
-    CheckResults checkData(const ASTPtr & query , const Context & context) override { return getNested()->checkData(query, context); }
+    CheckResults checkData(const ASTPtr & query , ContextPtr context) override { return getNested()->checkData(query, context); }
     void checkTableCanBeDropped() const override { getNested()->checkTableCanBeDropped(); }
     void checkPartitionCanBeDropped(const ASTPtr & partition) override { getNested()->checkPartitionCanBeDropped(partition); }
     bool storesDataOnDisk() const override { return getNested()->storesDataOnDisk(); }
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index f9d63132a1b..305d48e28e9 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -1,6 +1,5 @@
 #include <Core/Defines.h>
 
-#include <Common/FieldVisitors.h>
 #include <Common/Macros.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ThreadPool.h>
@@ -17,6 +16,7 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeList.h>
+#include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Storages/MergeTree/PartitionPruner.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
@@ -26,6 +26,7 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h>
 #include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
 #include <Storages/VirtualColumnUtils.h>
+#include <Storages/MergeTree/MergeTreeReaderCompact.h>
 
 
 #include <Databases/IDatabase.h>
@@ -51,6 +52,7 @@
 #include <Interpreters/PartLog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DDLTask.h>
+#include <Interpreters/InterserverCredentials.h>
 
 #include <DataStreams/RemoteBlockInputStream.h>
 #include <DataStreams/copyData.h>
@@ -59,14 +61,17 @@
 
 #include <ext/range.h>
 #include <ext/scope_guard.h>
-#include "Storages/MergeTree/MergeTreeReaderCompact.h"
+#include <ext/scope_guard_safe.h>
 
 #include <ctime>
 #include <thread>
 #include <future>
+#include <filesystem>
 
 #include <boost/algorithm/string/join.hpp>
 
+namespace fs = std::filesystem;
+
 namespace ProfileEvents
 {
     extern const Event ReplicatedPartMerges;
@@ -128,6 +133,8 @@ namespace ErrorCodes
     extern const int UNKNOWN_POLICY;
     extern const int NO_SUCH_DATA_PART;
     extern const int INTERSERVER_SCHEME_DOESNT_MATCH;
+    extern const int DUPLICATE_DATA_PART;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace ActionLocks
@@ -161,11 +168,11 @@ void StorageReplicatedMergeTree::setZooKeeper()
     std::lock_guard lock(current_zookeeper_mutex);
     if (zookeeper_name == default_zookeeper_name)
     {
-        current_zookeeper = global_context.getZooKeeper();
+        current_zookeeper = getContext()->getZooKeeper();
     }
     else
     {
-        current_zookeeper = global_context.getAuxiliaryZooKeeper(zookeeper_name);
+        current_zookeeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
     }
 }
 
@@ -222,6 +229,26 @@ static String extractZooKeeperPath(const String & path)
     return normalizeZooKeeperPath(path);
 }
 
+static MergeTreePartInfo makeDummyDropRangeForMovePartitionOrAttachPartitionFrom(const String & partition_id)
+{
+    /// NOTE We don't have special log entry type for MOVE PARTITION/ATTACH PARTITION FROM,
+    /// so we use REPLACE_RANGE with dummy range of one block, which means "attach, not replace".
+    /// It's safe to fill drop range for MOVE PARTITION/ATTACH PARTITION FROM with zeros,
+    /// because drop range for REPLACE PARTITION must contain at least 2 blocks,
+    /// so we can distinguish dummy drop range from any real or virtual part.
+    /// But we should never construct such part name, even for virtual part,
+    /// because it can be confused with real part <partition>_0_0_0.
+    /// TODO get rid of this.
+
+    MergeTreePartInfo drop_range;
+    drop_range.partition_id = partition_id;
+    drop_range.min_block = 0;
+    drop_range.max_block = 0;
+    drop_range.level = 0;
+    drop_range.mutation = 0;
+    return drop_range;
+}
+
 StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     const String & zookeeper_path_,
     const String & replica_name_,
@@ -229,7 +256,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     const StorageID & table_id_,
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
-    Context & context_,
+    ContextMutablePtr context_,
     const String & date_column_name,
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> settings_,
@@ -248,37 +275,40 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     , zookeeper_name(extractZooKeeperName(zookeeper_path_))
     , zookeeper_path(extractZooKeeperPath(zookeeper_path_))
     , replica_name(replica_name_)
-    , replica_path(zookeeper_path + "/replicas/" + replica_name_)
+    , replica_path(fs::path(zookeeper_path) / "replicas" / replica_name_)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this, global_context.getSettingsRef().background_pool_size)
+    , merger_mutator(*this, getContext()->getSettingsRef().background_pool_size)
     , merge_strategy_picker(*this)
     , queue(*this, merge_strategy_picker)
     , fetcher(*this)
-    , background_executor(*this, global_context)
-    , background_moves_executor(*this, global_context)
+    , background_executor(*this, getContext())
+    , background_moves_executor(*this, getContext())
     , cleanup_thread(*this)
     , part_check_thread(*this)
     , restarting_thread(*this)
+    , part_moves_between_shards_orchestrator(*this)
     , allow_renaming(allow_renaming_)
-    , replicated_fetches_pool_size(global_context.getSettingsRef().background_fetches_pool_size)
+    , replicated_fetches_pool_size(getContext()->getSettingsRef().background_fetches_pool_size)
+    , replicated_fetches_throttler(std::make_shared<Throttler>(getSettings()->max_replicated_fetches_network_bandwidth, getContext()->getReplicatedFetchesThrottler()))
+    , replicated_sends_throttler(std::make_shared<Throttler>(getSettings()->max_replicated_sends_network_bandwidth, getContext()->getReplicatedSendsThrottler()))
 {
-    queue_updating_task = global_context.getSchedulePool().createTask(
+    queue_updating_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::queueUpdatingTask)", [this]{ queueUpdatingTask(); });
 
-    mutations_updating_task = global_context.getSchedulePool().createTask(
+    mutations_updating_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mutationsUpdatingTask)", [this]{ mutationsUpdatingTask(); });
 
-    merge_selecting_task = global_context.getSchedulePool().createTask(
+    merge_selecting_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mergeSelectingTask)", [this] { mergeSelectingTask(); });
 
     /// Will be activated if we win leader election.
     merge_selecting_task->deactivate();
 
-    mutations_finalizing_task = global_context.getSchedulePool().createTask(
+    mutations_finalizing_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName() + " (StorageReplicatedMergeTree::mutationsFinalizingTask)", [this] { mutationsFinalizingTask(); });
 
-    if (global_context.hasZooKeeper() || global_context.hasAuxiliaryZooKeeper(zookeeper_name))
+    if (getContext()->hasZooKeeper() || getContext()->hasAuxiliaryZooKeeper(zookeeper_name))
     {
         /// It's possible for getZooKeeper() to timeout if  zookeeper host(s) can't
         /// be reached. In such cases Poco::Exception is thrown after a connection
@@ -297,11 +327,11 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         {
             if (zookeeper_name == default_zookeeper_name)
             {
-                current_zookeeper = global_context.getZooKeeper();
+                current_zookeeper = getContext()->getZooKeeper();
             }
             else
             {
-                current_zookeeper = global_context.getAuxiliaryZooKeeper(zookeeper_name);
+                current_zookeeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
             }
         }
         catch (...)
@@ -437,6 +467,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     }
 
     createNewZooKeeperNodes();
+    syncPinnedPartUUIDs();
 }
 
 
@@ -455,26 +486,26 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
     if (replicas.empty())
         return;
 
-    zkutil::EventPtr wait_event = std::make_shared<Poco::Event>();
 
     std::set<String> inactive_replicas;
     for (const String & replica : replicas)
     {
         LOG_DEBUG(log, "Waiting for {} to apply mutation {}", replica, mutation_id);
+        zkutil::EventPtr wait_event = std::make_shared<Poco::Event>();
 
         while (!partial_shutdown_called)
         {
             /// Mutation maybe killed or whole replica was deleted.
             /// Wait event will unblock at this moment.
             Coordination::Stat exists_stat;
-            if (!getZooKeeper()->exists(zookeeper_path + "/mutations/" + mutation_id, &exists_stat, wait_event))
+            if (!getZooKeeper()->exists(fs::path(zookeeper_path) / "mutations" / mutation_id, &exists_stat, wait_event))
             {
                 throw Exception(ErrorCodes::UNFINISHED, "Mutation {} was killed, manually removed or table was dropped", mutation_id);
             }
 
             auto zookeeper = getZooKeeper();
             /// Replica could be inactive.
-            if (!zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active"))
+            if (!zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "is_active"))
             {
                 LOG_WARNING(log, "Replica {} is not active during mutation. Mutation will be done asynchronously when replica becomes active.", replica);
 
@@ -482,11 +513,10 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
                 break;
             }
 
-            String mutation_pointer = zookeeper_path + "/replicas/" + replica + "/mutation_pointer";
+            String mutation_pointer = fs::path(zookeeper_path) / "replicas" / replica / "mutation_pointer";
             std::string mutation_pointer_value;
-            Coordination::Stat get_stat;
             /// Replica could be removed
-            if (!zookeeper->tryGet(mutation_pointer, mutation_pointer_value, &get_stat, wait_event))
+            if (!zookeeper->tryGet(mutation_pointer, mutation_pointer_value, nullptr, wait_event))
             {
                 LOG_WARNING(log, "Replica {} was removed", replica);
                 break;
@@ -496,16 +526,19 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
 
             /// Replica can become inactive, so wait with timeout and recheck it
             if (wait_event->tryWait(1000))
-                break;
+                continue;
 
+            /// Here we check mutation for errors on local replica. If they happen on this replica
+            /// they will happen on each replica, so we can check only in-memory info.
             auto mutation_status = queue.getIncompleteMutationsStatus(mutation_id);
-            if (!mutation_status || !mutation_status->latest_fail_reason.empty())
+            /// If mutation status is empty, than local replica may just not loaded it into memory.
+            if (mutation_status && !mutation_status->latest_fail_reason.empty())
                 break;
         }
 
         /// It maybe already removed from zk, but local in-memory mutations
         /// state was not updated.
-        if (!getZooKeeper()->exists(zookeeper_path + "/mutations/" + mutation_id))
+        if (!getZooKeeper()->exists(fs::path(zookeeper_path) / "mutations" / mutation_id))
         {
             throw Exception(ErrorCodes::UNFINISHED, "Mutation {} was killed, manually removed or table was dropped", mutation_id);
         }
@@ -514,6 +547,8 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
         std::set<String> mutation_ids;
         mutation_ids.insert(mutation_id);
 
+        /// Here we check mutation for errors or kill on local replica. If they happen on this replica
+        /// they will happen on each replica, so we can check only in-memory info.
         auto mutation_status = queue.getIncompleteMutationsStatus(mutation_id, &mutation_ids);
         checkMutationStatus(mutation_status, mutation_ids);
 
@@ -554,6 +589,12 @@ void StorageReplicatedMergeTree::createNewZooKeeperNodes()
         zookeeper->createIfNotExists(zookeeper_path + "/zero_copy_s3", String());
         zookeeper->createIfNotExists(zookeeper_path + "/zero_copy_s3/shared", String());
     }
+
+    /// Part movement.
+    zookeeper->createIfNotExists(zookeeper_path + "/part_moves_shard", String());
+    zookeeper->createIfNotExists(zookeeper_path + "/pinned_part_uuids", getPinnedPartUUIDs()->toString());
+    /// For ALTER PARTITION with multi-leaders
+    zookeeper->createIfNotExists(zookeeper_path + "/alter_partition_version", String());
 }
 
 
@@ -579,42 +620,24 @@ bool StorageReplicatedMergeTree::createTableIfNotExists(const StorageMetadataPtr
             /// This is Ok because another replica is definitely going to drop the table.
 
             LOG_WARNING(log, "Removing leftovers from table {} (this might take several minutes)", zookeeper_path);
+            String drop_lock_path = zookeeper_path + "/dropped/lock";
+            Coordination::Error code = zookeeper->tryCreate(drop_lock_path, "", zkutil::CreateMode::Ephemeral);
 
-            Strings children;
-            Coordination::Error code = zookeeper->tryGetChildren(zookeeper_path, children);
-            if (code == Coordination::Error::ZNONODE)
+            if (code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
             {
-                LOG_WARNING(log, "Table {} is already finished removing by another replica right now", replica_path);
+                LOG_WARNING(log, "The leftovers from table {} were removed by another replica", zookeeper_path);
+            }
+            else if (code != Coordination::Error::ZOK)
+            {
+                throw Coordination::Exception(code, drop_lock_path);
             }
             else
             {
-                for (const auto & child : children)
-                    if (child != "dropped")
-                        zookeeper->tryRemoveRecursive(zookeeper_path + "/" + child);
-
-                Coordination::Requests ops;
-                Coordination::Responses responses;
-                ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/dropped", -1));
-                ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path, -1));
-                code = zookeeper->tryMulti(ops, responses);
-
-                if (code == Coordination::Error::ZNONODE)
+                auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(drop_lock_path, *zookeeper);
+                if (!removeTableNodesFromZooKeeper(zookeeper, zookeeper_path, metadata_drop_lock, log))
                 {
-                    LOG_WARNING(log, "Table {} is already finished removing by another replica right now", replica_path);
-                }
-                else if (code == Coordination::Error::ZNOTEMPTY)
-                {
-                    throw Exception(fmt::format(
-                        "The old table was not completely removed from ZooKeeper, {} still exists and may contain some garbage. But it should never happen according to the logic of operations (it's a bug).", zookeeper_path), ErrorCodes::LOGICAL_ERROR);
-                }
-                else if (code != Coordination::Error::ZOK)
-                {
-                    /// It is still possible that ZooKeeper session is expired or server is killed in the middle of the delete operation.
-                    zkutil::KeeperMultiException::check(code, ops, responses);
-                }
-                else
-                {
-                    LOG_WARNING(log, "The leftovers from table {} was successfully removed from ZooKeeper", zookeeper_path);
+                    /// Someone is recursively removing table right now, we cannot create new table until old one is removed
+                    continue;
                 }
             }
         }
@@ -627,10 +650,6 @@ bool StorageReplicatedMergeTree::createTableIfNotExists(const StorageMetadataPtr
         Coordination::Requests ops;
         ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "", zkutil::CreateMode::Persistent));
 
-        /// Check that the table is not being dropped right now.
-        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/dropped", "", zkutil::CreateMode::Persistent));
-        ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/dropped", -1));
-
         ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/metadata", metadata_str,
             zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/columns", metadata_snapshot->getColumns().toString(),
@@ -773,9 +792,9 @@ void StorageReplicatedMergeTree::drop()
         /// and calling StorageReplicatedMergeTree::getZooKeeper()/getAuxiliaryZooKeeper() won't suffice.
         zkutil::ZooKeeperPtr zookeeper;
         if (zookeeper_name == default_zookeeper_name)
-            zookeeper = global_context.getZooKeeper();
+            zookeeper = getContext()->getZooKeeper();
         else
-            zookeeper = global_context.getAuxiliaryZooKeeper(zookeeper_name);
+            zookeeper = getContext()->getAuxiliaryZooKeeper(zookeeper_name);
 
         /// If probably there is metadata in ZooKeeper, we don't allow to drop the table.
         if (!zookeeper)
@@ -818,10 +837,18 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
       * because table creation is executed in single transaction that will conflict with remaining nodes.
       */
 
+    /// Node /dropped works like a lock that protects from concurrent removal of old table and creation of new table.
+    /// But recursive removal may fail in the middle of operation leaving some garbage in zookeeper_path, so
+    /// we remove it on table creation if there is /dropped node. Creating thread may remove /dropped node created by
+    /// removing thread, and it causes race condition if removing thread is not finished yet.
+    /// To avoid this we also create ephemeral child before starting recursive removal.
+    /// (The existence of child node does not allow to remove parent node).
     Coordination::Requests ops;
     Coordination::Responses responses;
+    String drop_lock_path = zookeeper_path + "/dropped/lock";
     ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/replicas", -1));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/dropped", "", zkutil::CreateMode::Persistent));
+    ops.emplace_back(zkutil::makeCreateRequest(drop_lock_path, "", zkutil::CreateMode::Ephemeral));
     Coordination::Error code = zookeeper->tryMulti(ops, responses);
 
     if (code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
@@ -838,48 +865,57 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
     }
     else
     {
+        auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(drop_lock_path, *zookeeper);
         LOG_INFO(logger, "Removing table {} (this might take several minutes)", zookeeper_path);
-
-        Strings children;
-        code = zookeeper->tryGetChildren(zookeeper_path, children);
-        if (code == Coordination::Error::ZNONODE)
-        {
-            LOG_WARNING(logger, "Table {} is already finished removing by another replica right now", remote_replica_path);
-        }
-        else
-        {
-            for (const auto & child : children)
-                if (child != "dropped")
-                    zookeeper->tryRemoveRecursive(zookeeper_path + "/" + child);
-
-            ops.clear();
-            responses.clear();
-            ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/dropped", -1));
-            ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path, -1));
-            code = zookeeper->tryMulti(ops, responses);
-
-            if (code == Coordination::Error::ZNONODE)
-            {
-                LOG_WARNING(logger, "Table {} is already finished removing by another replica right now", remote_replica_path);
-            }
-            else if (code == Coordination::Error::ZNOTEMPTY)
-            {
-                LOG_ERROR(logger, "Table was not completely removed from ZooKeeper, {} still exists and may contain some garbage.",
-                          zookeeper_path);
-            }
-            else if (code != Coordination::Error::ZOK)
-            {
-                /// It is still possible that ZooKeeper session is expired or server is killed in the middle of the delete operation.
-                zkutil::KeeperMultiException::check(code, ops, responses);
-            }
-            else
-            {
-                LOG_INFO(logger, "Table {} was successfully removed from ZooKeeper", zookeeper_path);
-            }
-        }
+        removeTableNodesFromZooKeeper(zookeeper, zookeeper_path, metadata_drop_lock, logger);
     }
 }
 
+bool StorageReplicatedMergeTree::removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper,
+        const String & zookeeper_path, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger)
+{
+    bool completely_removed = false;
+    Strings children;
+    Coordination::Error code = zookeeper->tryGetChildren(zookeeper_path, children);
+    if (code == Coordination::Error::ZNONODE)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is a race condition between creation and removal of replicated table. It's a bug");
+
+
+    for (const auto & child : children)
+        if (child != "dropped")
+            zookeeper->tryRemoveRecursive(fs::path(zookeeper_path) / child);
+
+    Coordination::Requests ops;
+    Coordination::Responses responses;
+    ops.emplace_back(zkutil::makeRemoveRequest(metadata_drop_lock->getPath(), -1));
+    ops.emplace_back(zkutil::makeRemoveRequest(fs::path(zookeeper_path) / "dropped", -1));
+    ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path, -1));
+    code = zookeeper->tryMulti(ops, responses);
+
+    if (code == Coordination::Error::ZNONODE)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is a race condition between creation and removal of replicated table. It's a bug");
+    }
+    else if (code == Coordination::Error::ZNOTEMPTY)
+    {
+        LOG_ERROR(logger, "Table was not completely removed from ZooKeeper, {} still exists and may contain some garbage,"
+                          "but someone is removing it right now.", zookeeper_path);
+    }
+    else if (code != Coordination::Error::ZOK)
+    {
+        /// It is still possible that ZooKeeper session is expired or server is killed in the middle of the delete operation.
+        zkutil::KeeperMultiException::check(code, ops, responses);
+    }
+    else
+    {
+        metadata_drop_lock->setAlreadyRemoved();
+        completely_removed = true;
+        LOG_INFO(logger, "Table {} was successfully removed from ZooKeeper", zookeeper_path);
+    }
+
+    return completely_removed;
+}
+
 
 /** Verify that list of columns and table storage_settings_ptr match those specified in ZK (/metadata).
   * If not, throw an exception.
@@ -891,12 +927,12 @@ void StorageReplicatedMergeTree::checkTableStructure(const String & zookeeper_pr
     ReplicatedMergeTreeTableMetadata old_metadata(*this, metadata_snapshot);
 
     Coordination::Stat metadata_stat;
-    String metadata_str = zookeeper->get(zookeeper_prefix + "/metadata", &metadata_stat);
+    String metadata_str = zookeeper->get(fs::path(zookeeper_prefix) / "metadata", &metadata_stat);
     auto metadata_from_zk = ReplicatedMergeTreeTableMetadata::parse(metadata_str);
-    old_metadata.checkEquals(metadata_from_zk, metadata_snapshot->getColumns(), global_context);
+    old_metadata.checkEquals(metadata_from_zk, metadata_snapshot->getColumns(), getContext());
 
     Coordination::Stat columns_stat;
-    auto columns_from_zk = ColumnsDescription::parse(zookeeper->get(zookeeper_prefix + "/columns", &columns_stat));
+    auto columns_from_zk = ColumnsDescription::parse(zookeeper->get(fs::path(zookeeper_prefix) / "columns", &columns_stat));
 
     const ColumnsDescription & old_columns = metadata_snapshot->getColumns();
     if (columns_from_zk != old_columns)
@@ -938,7 +974,7 @@ void StorageReplicatedMergeTree::setTableStructure(
             auto & sorting_key = new_metadata.sorting_key;
             auto & primary_key = new_metadata.primary_key;
 
-            sorting_key.recalculateWithNewAST(order_by_ast, new_metadata.columns, global_context);
+            sorting_key.recalculateWithNewAST(order_by_ast, new_metadata.columns, getContext());
 
             if (primary_key.definition_ast == nullptr)
             {
@@ -946,22 +982,25 @@ void StorageReplicatedMergeTree::setTableStructure(
                 /// save the old ORDER BY expression as the new primary key.
                 auto old_sorting_key_ast = old_metadata.getSortingKey().definition_ast;
                 primary_key = KeyDescription::getKeyFromAST(
-                    old_sorting_key_ast, new_metadata.columns, global_context);
+                    old_sorting_key_ast, new_metadata.columns, getContext());
             }
         }
 
         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, global_context);
+            new_metadata.sampling_key.recalculateWithNewAST(sample_by_ast, new_metadata.columns, getContext());
         }
 
         if (metadata_diff.skip_indices_changed)
-            new_metadata.secondary_indices = IndicesDescription::parse(metadata_diff.new_skip_indices, new_columns, global_context);
+            new_metadata.secondary_indices = IndicesDescription::parse(metadata_diff.new_skip_indices, new_columns, getContext());
 
         if (metadata_diff.constraints_changed)
             new_metadata.constraints = ConstraintsDescription::parse(metadata_diff.new_constraints);
 
+        if (metadata_diff.projections_changed)
+            new_metadata.projections = ProjectionsDescription::parse(metadata_diff.new_projections, new_columns, getContext());
+
         if (metadata_diff.ttl_table_changed)
         {
             if (!metadata_diff.new_ttl_table.empty())
@@ -969,7 +1008,7 @@ void StorageReplicatedMergeTree::setTableStructure(
                 ParserTTLExpressionList parser;
                 auto ttl_for_table_ast = parseQuery(parser, metadata_diff.new_ttl_table, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
                 new_metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
-                    ttl_for_table_ast, new_metadata.columns, global_context, new_metadata.primary_key);
+                    ttl_for_table_ast, new_metadata.columns, getContext(), new_metadata.primary_key);
             }
             else /// TTL was removed
             {
@@ -982,39 +1021,39 @@ void StorageReplicatedMergeTree::setTableStructure(
     new_metadata.column_ttls_by_name.clear();
     for (const auto & [name, ast] : new_metadata.columns.getColumnTTLs())
     {
-        auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, new_metadata.columns, global_context, new_metadata.primary_key);
+        auto new_ttl_entry = TTLDescription::getTTLFromAST(ast, new_metadata.columns, getContext(), new_metadata.primary_key);
         new_metadata.column_ttls_by_name[name] = new_ttl_entry;
     }
 
     if (new_metadata.partition_key.definition_ast != nullptr)
-        new_metadata.partition_key.recalculateWithNewColumns(new_metadata.columns, global_context);
+        new_metadata.partition_key.recalculateWithNewColumns(new_metadata.columns, getContext());
 
     if (!metadata_diff.sorting_key_changed) /// otherwise already updated
-        new_metadata.sorting_key.recalculateWithNewColumns(new_metadata.columns, global_context);
+        new_metadata.sorting_key.recalculateWithNewColumns(new_metadata.columns, getContext());
 
     /// Primary key is special, it exists even if not defined
     if (new_metadata.primary_key.definition_ast != nullptr)
     {
-        new_metadata.primary_key.recalculateWithNewColumns(new_metadata.columns, global_context);
+        new_metadata.primary_key.recalculateWithNewColumns(new_metadata.columns, getContext());
     }
     else
     {
-        new_metadata.primary_key = KeyDescription::getKeyFromAST(new_metadata.sorting_key.definition_ast, new_metadata.columns, global_context);
+        new_metadata.primary_key = KeyDescription::getKeyFromAST(new_metadata.sorting_key.definition_ast, new_metadata.columns, getContext());
         new_metadata.primary_key.definition_ast = nullptr;
     }
 
     if (!metadata_diff.sampling_expression_changed && new_metadata.sampling_key.definition_ast != nullptr)
-        new_metadata.sampling_key.recalculateWithNewColumns(new_metadata.columns, global_context);
+        new_metadata.sampling_key.recalculateWithNewColumns(new_metadata.columns, getContext());
 
     if (!metadata_diff.skip_indices_changed) /// otherwise already updated
     {
         for (auto & index : new_metadata.secondary_indices)
-            index.recalculateWithNewColumns(new_metadata.columns, global_context);
+            index.recalculateWithNewColumns(new_metadata.columns, getContext());
     }
 
     if (!metadata_diff.ttl_table_changed && new_metadata.table_ttl.definition_ast != nullptr)
         new_metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
-            new_metadata.table_ttl.definition_ast, new_metadata.columns, global_context, new_metadata.primary_key);
+            new_metadata.table_ttl.definition_ast, new_metadata.columns, getContext(), new_metadata.primary_key);
 
     /// Even if the primary/sorting/partition keys didn't change we must reinitialize it
     /// because primary/partition key column types might have changed.
@@ -1022,7 +1061,7 @@ void StorageReplicatedMergeTree::setTableStructure(
     setProperties(new_metadata, old_metadata);
 
     auto table_id = getStorageID();
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(global_context, table_id, new_metadata);
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(getContext(), table_id, new_metadata);
 }
 
 
@@ -1038,7 +1077,7 @@ static time_t tryGetPartCreateTime(zkutil::ZooKeeperPtr & zookeeper, const Strin
     /// We get creation time of part, if it still exists (was not merged, for example).
     Coordination::Stat stat;
     String unused;
-    if (zookeeper->tryGet(replica_path + "/parts/" + part_name, unused, &stat))
+    if (zookeeper->tryGet(fs::path(replica_path) / "parts" / part_name, unused, &stat))
         res = stat.ctime / 1000;
 
     return res;
@@ -1049,7 +1088,7 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
 {
     auto zookeeper = getZooKeeper();
 
-    Strings expected_parts_vec = zookeeper->getChildren(replica_path + "/parts");
+    Strings expected_parts_vec = zookeeper->getChildren(fs::path(replica_path) / "parts");
 
     /// Parts in ZK.
     NameSet expected_parts(expected_parts_vec.begin(), expected_parts_vec.end());
@@ -1152,7 +1191,7 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
     exists_futures.reserve(parts_to_fetch.size());
     for (const String & part_name : parts_to_fetch)
     {
-        String part_path = replica_path + "/parts/" + part_name;
+        String part_path = fs::path(replica_path) / "parts" / part_name;
         exists_futures.emplace_back(zookeeper->asyncExists(part_path));
     }
 
@@ -1181,7 +1220,7 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
 
         /// We assume that this occurs before the queue is loaded (queue.initialize).
         ops.emplace_back(zkutil::makeCreateRequest(
-            replica_path + "/queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+            fs::path(replica_path) / "queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
 
         enqueue_futures.emplace_back(zookeeper->asyncMulti(ops));
     }
@@ -1198,6 +1237,27 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
 }
 
 
+void StorageReplicatedMergeTree::syncPinnedPartUUIDs()
+{
+    auto zookeeper = getZooKeeper();
+
+    Coordination::Stat stat;
+    String s = zookeeper->get(zookeeper_path + "/pinned_part_uuids", &stat);
+
+    std::lock_guard lock(pinned_part_uuids_mutex);
+
+    /// Unsure whether or not this can be called concurrently.
+    if (pinned_part_uuids->stat.version < stat.version)
+    {
+        auto new_pinned_part_uuids = std::make_shared<PinnedPartUUIDs>();
+        new_pinned_part_uuids->fromString(s);
+        new_pinned_part_uuids->stat = stat;
+
+        pinned_part_uuids = new_pinned_part_uuids;
+    }
+}
+
+
 void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil::ZooKeeperPtr & zookeeper,
     const DataPartPtr & part, Coordination::Requests & ops, String part_name, NameSet * absent_replicas_paths)
 {
@@ -1207,13 +1267,13 @@ void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil:
     auto local_part_header = ReplicatedMergeTreePartHeader::fromColumnsAndChecksums(
         part->getColumns(), part->checksums);
 
-    Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+    Strings replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
     std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
     bool has_been_already_added = false;
 
     for (const String & replica : replicas)
     {
-        String current_part_path = zookeeper_path + "/replicas/" + replica + "/parts/" + part_name;
+        String current_part_path = fs::path(zookeeper_path) / "replicas" / replica / "parts" / part_name;
 
         String part_zk_str;
         if (!zookeeper->tryGet(current_part_path, part_zk_str))
@@ -1234,9 +1294,9 @@ void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil:
             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(current_part_path + "/columns", columns_str, &columns_stat_before) ||
-                !zookeeper->tryGet(current_part_path + "/checksums", checksums_str) ||
-                !zookeeper->exists(current_part_path + "/columns", &columns_stat_after) ||
+            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)
             {
                 LOG_INFO(log, "Not checking checksums of part {} with replica {} because part changed while we were reading its checksums", part_name, replica);
@@ -1270,7 +1330,7 @@ void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil:
     if (!has_been_already_added)
     {
         const auto storage_settings_ptr = getSettings();
-        String part_path = replica_path + "/parts/" + part_name;
+        String part_path = fs::path(replica_path) / "parts" / part_name;
 
         //ops.emplace_back(zkutil::makeCheckRequest(
         //    zookeeper_path + "/columns", expected_columns_version));
@@ -1285,14 +1345,15 @@ void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil:
             ops.emplace_back(zkutil::makeCreateRequest(
                 part_path, "", zkutil::CreateMode::Persistent));
             ops.emplace_back(zkutil::makeCreateRequest(
-                part_path + "/columns", part->getColumns().toString(), zkutil::CreateMode::Persistent));
+                fs::path(part_path) / "columns", part->getColumns().toString(), zkutil::CreateMode::Persistent));
             ops.emplace_back(zkutil::makeCreateRequest(
-                part_path + "/checksums", getChecksumsForZooKeeper(part->checksums), zkutil::CreateMode::Persistent));
+                fs::path(part_path) / "checksums", getChecksumsForZooKeeper(part->checksums), zkutil::CreateMode::Persistent));
         }
     }
     else
     {
-        LOG_WARNING(log, "checkPartAndAddToZooKeeper: node {} already exists. Will not commit any nodes.", replica_path + "/parts/" + part_name);
+        LOG_WARNING(log, "checkPartAndAddToZooKeeper: node {} already exists. Will not commit any nodes.",
+                    (fs::path(replica_path) / "parts" / part_name).string());
     }
 }
 
@@ -1360,7 +1421,7 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFo
     const String part_new_name = actual_part_info.getPartName();
 
     for (const DiskPtr & disk : getStoragePolicy()->getDisks())
-        for (const auto it = disk->iterateDirectory(relative_data_path + "detached/"); it->isValid(); it->next())
+        for (const auto it = disk->iterateDirectory(fs::path(relative_data_path) / "detached/"); it->isValid(); it->next())
         {
             MergeTreePartInfo part_info;
 
@@ -1369,7 +1430,7 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFo
                 continue;
 
             const String part_old_name = part_info.getPartName();
-            const String part_path = "detached/" + part_old_name;
+            const String part_path = fs::path("detached") / part_old_name;
 
             const VolumePtr volume = std::make_shared<SingleDiskVolume>("volume_" + part_old_name, disk);
 
@@ -1424,7 +1485,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
             existing_part = 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 && getZooKeeper()->exists(replica_path + "/parts/" + existing_part->name))
+        if (existing_part && getZooKeeper()->exists(fs::path(replica_path) / "parts" / existing_part->name))
         {
             if (!is_get_or_attach || entry.source_replica != replica_name)
                 LOG_DEBUG(log, "Skipping action for part {} because part {} already exists.",
@@ -1459,7 +1520,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
 
     /// Perhaps we don't need this part, because during write with quorum, the quorum has failed
     /// (see below about `/quorum/failed_parts`).
-    if (entry.quorum && getZooKeeper()->exists(zookeeper_path + "/quorum/failed_parts/" + entry.new_part_name))
+    if (entry.quorum && getZooKeeper()->exists(fs::path(zookeeper_path) / "quorum" / "failed_parts" / entry.new_part_name))
     {
         LOG_DEBUG(log, "Skipping action for part {} because quorum for that part was failed.", entry.new_part_name);
         return true;    /// NOTE Deletion from `virtual_parts` is not done, but it is only necessary for merge.
@@ -1486,6 +1547,12 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
             break;
         case LogEntry::ALTER_METADATA:
             return executeMetadataAlter(entry);
+        case LogEntry::SYNC_PINNED_PART_UUIDS:
+            syncPinnedPartUUIDs();
+            return true;
+        case LogEntry::CLONE_PART_FROM_SHARD:
+            executeClonePartFromShard(entry);
+            return true;
         default:
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected log entry type: {}", static_cast<int>(entry.type));
     }
@@ -1541,33 +1608,38 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
     }
 
     DataPartsVector parts;
-    bool have_all_parts = true;
 
-    for (const String & name : entry.source_parts)
+    for (const String & source_part_name : entry.source_parts)
     {
-        DataPartPtr part = getActiveContainingPart(name);
+        DataPartPtr source_part_or_covering = getActiveContainingPart(source_part_name);
 
-        if (!part)
+        if (!source_part_or_covering)
         {
-            have_all_parts = false;
-            break;
+            /// 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 (part->name != name)
+
+        if (source_part_or_covering->name != source_part_name)
         {
-            LOG_WARNING(log, "Part {} is covered by {} but should be merged into {}. This shouldn't happen often.", name, part->name, entry.new_part_name);
-            have_all_parts = false;
-            break;
+            /// 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(part);
+
+        parts.push_back(source_part_or_covering);
     }
 
-    if (!have_all_parts)
-    {
-        /// If you do not have all the necessary parts, 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;
-    }
-    else if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr))
+    /// 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.
@@ -1649,13 +1721,12 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
 
     /// Account TTL merge
     if (isTTLMergeType(future_merged_part.merge_type))
-        global_context.getMergeList().bookMergeWithTTL();
+        getContext()->getMergeList().bookMergeWithTTL();
 
     auto table_id = getStorageID();
 
     /// Add merge to list
-    MergeList::EntryPtr merge_entry = global_context.getMergeList().insert(
-        table_id.database_name, table_id.table_name, future_merged_part);
+    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(table_id.database_name, table_id.table_name, future_merged_part);
 
     Transaction transaction(*this);
     MutableDataPartPtr part;
@@ -1672,8 +1743,16 @@ bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
     try
     {
         part = merger_mutator.mergePartsToTemporaryPart(
-            future_merged_part, metadata_snapshot, *merge_entry,
-            table_lock, entry.create_time, global_context, reserved_space, entry.deduplicate, entry.deduplicate_by_columns);
+            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);
 
@@ -1793,7 +1872,7 @@ bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedM
     future_mutated_part.type = source_part->getType();
 
     auto table_id = getStorageID();
-    MergeList::EntryPtr merge_entry = global_context.getMergeList().insert(
+    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(
         table_id.database_name, table_id.table_name, future_mutated_part);
 
     Stopwatch stopwatch;
@@ -1809,7 +1888,7 @@ bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedM
     {
         new_part = merger_mutator.mutatePartToTemporaryPart(
             future_mutated_part, metadata_snapshot, commands, *merge_entry,
-            entry.create_time, global_context, reserved_space, table_lock);
+            entry.create_time, getContext(), reserved_space, table_lock);
         renameTempPartAndReplace(new_part, nullptr, &transaction);
 
         try
@@ -1911,14 +1990,14 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
 
                 auto zookeeper = getZooKeeper();
 
-                Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+                Strings replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
 
                 Coordination::Requests ops;
 
                 for (const auto & path_part : replicas)
                 {
                     Coordination::Stat stat;
-                    String path = zookeeper_path + "/replicas/" + path_part + "/host";
+                    String path = fs::path(zookeeper_path) / "replicas" / path_part / "host";
                     zookeeper->get(path, &stat);
                     ops.emplace_back(zkutil::makeCheckRequest(path, stat.version));
                 }
@@ -1932,8 +2011,8 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
                 if (replica.empty())
                 {
                     Coordination::Stat quorum_stat;
-                    const String quorum_unparallel_path = zookeeper_path + "/quorum/status";
-                    const String quorum_parallel_path = zookeeper_path + "/quorum/parallel/" + entry.new_part_name;
+                    const String quorum_unparallel_path = fs::path(zookeeper_path) / "quorum" / "status";
+                    const String quorum_parallel_path = fs::path(zookeeper_path) / "quorum" / "parallel" / entry.new_part_name;
                     String quorum_str, quorum_path;
                     ReplicatedMergeTreeQuorumEntry quorum_entry;
 
@@ -1957,13 +2036,13 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
                                 ErrorCodes::LOGICAL_ERROR);
 
                         ops.emplace_back(zkutil::makeCreateRequest(
-                            zookeeper_path + "/quorum/failed_parts/" + entry.new_part_name,
+                            fs::path(zookeeper_path) / "quorum" / "failed_parts" / entry.new_part_name,
                             "",
                             zkutil::CreateMode::Persistent));
 
                         /// Deleting from `blocks`.
-                        if (!entry.block_id.empty() && zookeeper->exists(zookeeper_path + "/blocks/" + entry.block_id))
-                            ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path + "/blocks/" + entry.block_id, -1));
+                        if (!entry.block_id.empty() && zookeeper->exists(fs::path(zookeeper_path) / "blocks" / entry.block_id))
+                            ops.emplace_back(zkutil::makeRemoveRequest(fs::path(zookeeper_path) / "blocks" / entry.block_id, -1));
 
                         Coordination::Responses responses;
                         auto code = zookeeper->tryMulti(ops, responses);
@@ -1976,7 +2055,8 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
                         }
                         else if (code == Coordination::Error::ZBADVERSION || code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
                         {
-                            LOG_DEBUG(log, "State was changed or isn't expected when trying to mark quorum for part {} as failed. Code: {}", entry.new_part_name, Coordination::errorMessage(code));
+                            LOG_DEBUG(log, "State was changed or isn't expected when trying to mark quorum for part {} as failed. Code: {}",
+                                      entry.new_part_name, Coordination::errorMessage(code));
                         }
                         else
                             throw Coordination::Exception(code);
@@ -1998,7 +2078,7 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
         try
         {
             String part_name = entry.actual_new_part_name.empty() ? entry.new_part_name : entry.actual_new_part_name;
-            if (!fetchPart(part_name, metadata_snapshot, zookeeper_path + "/replicas/" + replica, false, entry.quorum))
+            if (!fetchPart(part_name, metadata_snapshot, fs::path(zookeeper_path) / "replicas" / replica, false, entry.quorum))
                 return false;
         }
         catch (Exception & e)
@@ -2082,7 +2162,7 @@ bool StorageReplicatedMergeTree::executeFetchShared(
 
     try
     {
-        if (!fetchExistsPart(new_part_name, metadata_snapshot, zookeeper_path + "/replicas/" + source_replica, disk, path))
+        if (!fetchExistsPart(new_part_name, metadata_snapshot, fs::path(zookeeper_path) / "replicas" / source_replica, disk, path))
             return false;
     }
     catch (Exception & e)
@@ -2117,7 +2197,7 @@ void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
     DataPartsVector parts_to_remove;
     {
         auto data_parts_lock = lockParts();
-        parts_to_remove = removePartsInRangeFromWorkingSet(drop_range_info, true, true, data_parts_lock);
+        parts_to_remove = removePartsInRangeFromWorkingSet(drop_range_info, true, data_parts_lock);
     }
 
     if (entry.detach)
@@ -2149,22 +2229,36 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
 {
     Stopwatch watch;
     auto & entry_replace = *entry.replace_range_entry;
+    LOG_DEBUG(log, "Executing log entry {} to replace parts range {} with {} parts from {}.{}",
+              entry.znode_name, entry_replace.drop_range_part_name, entry_replace.new_part_names.size(),
+              entry_replace.from_database, entry_replace.from_table);
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
     MergeTreePartInfo drop_range = MergeTreePartInfo::fromPartName(entry_replace.drop_range_part_name, format_version);
-    /// Range with only one block has special meaning ATTACH PARTITION
-    bool replace = drop_range.getBlocksCount() > 1;
+    /// Range with only one block has special meaning: it's ATTACH PARTITION or MOVE PARTITION, so there is no drop range
+    bool replace = !LogEntry::ReplaceRangeEntry::isMovePartitionOrAttachFrom(drop_range);
 
-    queue.removePartProducingOpsInRange(getZooKeeper(), drop_range, entry);
+    if (replace)
+        queue.removePartProducingOpsInRange(getZooKeeper(), drop_range, entry);
+    else
+        drop_range = {};
 
     struct PartDescription
     {
-        PartDescription(size_t index_, const String & src_part_name_, const String & new_part_name_, const String & checksum_hex_,
-                        MergeTreeDataFormatVersion format_version)
-            : index(index_),
-            src_part_name(src_part_name_), src_part_info(MergeTreePartInfo::fromPartName(src_part_name_, format_version)),
-            new_part_name(new_part_name_), new_part_info(MergeTreePartInfo::fromPartName(new_part_name_, format_version)),
-            checksum_hex(checksum_hex_) {}
+        PartDescription(
+            size_t index_,
+            const String & src_part_name_,
+            const String & new_part_name_,
+            const String & checksum_hex_,
+            MergeTreeDataFormatVersion format_version)
+            : index(index_)
+            , src_part_name(src_part_name_)
+            , src_part_info(MergeTreePartInfo::fromPartName(src_part_name_, format_version))
+            , new_part_name(new_part_name_)
+            , new_part_info(MergeTreePartInfo::fromPartName(new_part_name_, format_version))
+            , checksum_hex(checksum_hex_)
+        {
+        }
 
         size_t index; // in log entry arrays
         String src_part_name;
@@ -2218,7 +2312,16 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
         }
 
         if (parts_to_add.empty() && replace)
-            parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
+        {
+            parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, data_parts_lock);
+            String parts_to_remove_str;
+            for (const auto & part : parts_to_remove)
+            {
+                parts_to_remove_str += part->name;
+                parts_to_remove_str += " ";
+            }
+            LOG_TRACE(log, "Replacing {} parts {}with empty set", parts_to_remove.size(), parts_to_remove_str);
+        }
     }
 
     if (parts_to_add.empty())
@@ -2239,7 +2342,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
 
     auto clone_data_parts_from_source_table = [&] () -> size_t
     {
-        source_table = DatabaseCatalog::instance().tryGetTable(source_table_id, global_context);
+        source_table = DatabaseCatalog::instance().tryGetTable(source_table_id, getContext());
         if (!source_table)
         {
             LOG_DEBUG(log, "Can't use {} as source table for REPLACE PARTITION command. It does not exist.", source_table_id.getNameForLogs());
@@ -2353,8 +2456,9 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
 
     /// Filter covered parts
     PartDescriptions final_parts;
+    Strings final_part_names;
     {
-        Strings final_part_names = adding_parts_active_set.getParts();
+        final_part_names = adding_parts_active_set.getParts();
 
         for (const String & final_part_name : final_part_names)
         {
@@ -2372,7 +2476,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
                 if (!prev.found_new_part_info.isDisjoint(curr.found_new_part_info))
                 {
                     throw Exception("Intersected final parts detected: " + prev.found_new_part_name
-                        + " and " + curr.found_new_part_name + ". It should be investigated.", ErrorCodes::INCORRECT_DATA);
+                        + " and " + curr.found_new_part_name + ". It should be investigated.", ErrorCodes::LOGICAL_ERROR);
                 }
             }
         }
@@ -2393,19 +2497,20 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
         }
         else if (!part_desc->replica.empty())
         {
-            String source_replica_path = zookeeper_path + "/replicas/" + part_desc->replica;
-            ReplicatedMergeTreeAddress address(getZooKeeper()->get(source_replica_path + "/host"));
-            auto timeouts = getFetchPartHTTPTimeouts(global_context);
+            String source_replica_path = fs::path(zookeeper_path) / "replicas" / part_desc->replica;
+            ReplicatedMergeTreeAddress address(getZooKeeper()->get(fs::path(source_replica_path) / "host"));
+            auto timeouts = getFetchPartHTTPTimeouts(getContext());
 
-            auto [user, password] = global_context.getInterserverCredentials();
-            String interserver_scheme = global_context.getInterserverScheme();
+            auto credentials = getContext()->getInterserverCredentials();
+            String interserver_scheme = getContext()->getInterserverScheme();
 
             if (interserver_scheme != address.scheme)
                 throw Exception("Interserver schemas are different '" + interserver_scheme + "' != '" + address.scheme + "', can't fetch part from " + address.host, ErrorCodes::LOGICAL_ERROR);
 
             part_desc->res_part = fetcher.fetchPart(
-                metadata_snapshot, part_desc->found_new_part_name, source_replica_path,
-                address.host, address.replication_port, timeouts, user, password, interserver_scheme, false, TMP_PREFIX + "fetch_");
+                metadata_snapshot, getContext(), part_desc->found_new_part_name, source_replica_path,
+                address.host, address.replication_port, timeouts, credentials->getUser(), credentials->getPassword(),
+                interserver_scheme, replicated_fetches_throttler, false, TMP_PREFIX + "fetch_");
 
             /// TODO: check columns_version of fetched part
 
@@ -2451,14 +2556,24 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
 
             transaction.commit(&data_parts_lock);
             if (replace)
-                parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
+            {
+                parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, data_parts_lock);
+                String parts_to_remove_str;
+                for (const auto & part : parts_to_remove)
+                {
+                    parts_to_remove_str += part->name;
+                    parts_to_remove_str += " ";
+                }
+                LOG_TRACE(log, "Replacing {} parts {}with {} parts {}", parts_to_remove.size(), parts_to_remove_str,
+                          final_parts.size(), boost::algorithm::join(final_part_names, ", "));
+            }
         }
 
-        PartLog::addNewParts(global_context, res_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), res_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, res_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), res_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 
@@ -2471,20 +2586,74 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
 }
 
 
+void StorageReplicatedMergeTree::executeClonePartFromShard(const LogEntry & entry)
+{
+    auto zookeeper = getZooKeeper();
+
+    Strings replicas = zookeeper->getChildren(entry.source_shard + "/replicas");
+    std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
+    String replica;
+    for (const String & candidate : replicas)
+    {
+        if (zookeeper->exists(entry.source_shard + "/replicas/" + candidate + "/is_active"))
+        {
+            replica = candidate;
+            break;
+        }
+    }
+
+    if (replica.empty())
+        throw Exception(ErrorCodes::NO_REPLICA_HAS_PART, "Not found active replica on shard {} to clone part {}", entry.source_shard, entry.new_part_name);
+
+    LOG_INFO(log, "Will clone part from shard " + entry.source_shard + " and replica " + replica);
+
+    MutableDataPartPtr part;
+
+    {
+        auto metadata_snapshot = getInMemoryMetadataPtr();
+        String source_replica_path = entry.source_shard + "/replicas/" + replica;
+        ReplicatedMergeTreeAddress address(getZooKeeper()->get(source_replica_path + "/host"));
+        auto timeouts = ConnectionTimeouts::getHTTPTimeouts(getContext());
+        auto credentials = getContext()->getInterserverCredentials();
+        String interserver_scheme = getContext()->getInterserverScheme();
+
+        auto get_part = [&, address, timeouts, credentials, interserver_scheme]()
+        {
+            if (interserver_scheme != address.scheme)
+                throw Exception("Interserver schemes are different: '" + interserver_scheme
+                                + "' != '" + address.scheme + "', can't fetch part from " + address.host,
+                                ErrorCodes::LOGICAL_ERROR);
+
+            return fetcher.fetchPart(
+                metadata_snapshot, getContext(), entry.new_part_name, source_replica_path,
+                address.host, address.replication_port,
+                timeouts, credentials->getUser(), credentials->getPassword(), interserver_scheme,
+                replicated_fetches_throttler, true);
+        };
+
+        part = get_part();
+        // The fetched part is valuable and should not be cleaned like a temp part.
+        part->is_temp = false;
+        part->renameTo("detached/" + entry.new_part_name, true);
+        LOG_INFO(log, "Cloned part {} to detached directory", part->name);
+    }
+}
+
+
 void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coordination::Stat source_is_lost_stat, zkutil::ZooKeeperPtr & zookeeper)
 {
-    String source_path = zookeeper_path + "/replicas/" + source_replica;
+    String source_path = fs::path(zookeeper_path) / "replicas" / source_replica;
 
     /** TODO: it will be deleted! (It is only to support old version of CH server).
       * In current code, the replica is created in single transaction.
       * If the reference/master replica is not yet fully created, let's wait.
       */
-    while (!zookeeper->exists(source_path + "/columns"))
+    while (!zookeeper->exists(fs::path(source_path) / "columns"))
     {
         LOG_INFO(log, "Waiting for replica {} to be fully created", source_path);
 
         zkutil::EventPtr event = std::make_shared<Poco::Event>();
-        if (zookeeper->exists(source_path + "/columns", nullptr, event))
+        if (zookeeper->exists(fs::path(source_path) / "columns", nullptr, event))
         {
             LOG_WARNING(log, "Oops, a watch has leaked");
             break;
@@ -2501,29 +2670,29 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
     while (true)
     {
         Coordination::Stat log_pointer_stat;
-        String raw_log_pointer = zookeeper->get(source_path + "/log_pointer", &log_pointer_stat);
+        String raw_log_pointer = zookeeper->get(fs::path(source_path) / "log_pointer", &log_pointer_stat);
 
         Coordination::Requests ops;
-        ops.push_back(zkutil::makeSetRequest(replica_path + "/log_pointer", raw_log_pointer, -1));
+        ops.push_back(zkutil::makeSetRequest(fs::path(replica_path) / "log_pointer", raw_log_pointer, -1));
 
         /// For support old versions CH.
         if (source_is_lost_stat.version == -1)
         {
             /// We check that it was not suddenly upgraded to new version.
             /// Otherwise it can be upgraded and instantly become lost, but we cannot notice that.
-            ops.push_back(zkutil::makeCreateRequest(source_path + "/is_lost", "0", zkutil::CreateMode::Persistent));
-            ops.push_back(zkutil::makeRemoveRequest(source_path + "/is_lost", -1));
+            ops.push_back(zkutil::makeCreateRequest(fs::path(source_path) / "is_lost", "0", zkutil::CreateMode::Persistent));
+            ops.push_back(zkutil::makeRemoveRequest(fs::path(source_path) / "is_lost", -1));
         }
         else /// The replica we clone should not suddenly become lost.
-            ops.push_back(zkutil::makeCheckRequest(source_path + "/is_lost", source_is_lost_stat.version));
+            ops.push_back(zkutil::makeCheckRequest(fs::path(source_path) / "is_lost", source_is_lost_stat.version));
 
         Coordination::Responses responses;
 
         /// Let's remember the queue of the reference/master replica.
-        source_queue_names = zookeeper->getChildren(source_path + "/queue");
+        source_queue_names = zookeeper->getChildren(fs::path(source_path) / "queue");
 
-        /// Check that our log pointer didn't changed while we read queue entries
-        ops.push_back(zkutil::makeCheckRequest(source_path + "/log_pointer", log_pointer_stat.version));
+        /// Check that log pointer of source replica didn't changed while we read queue entries
+        ops.push_back(zkutil::makeCheckRequest(fs::path(source_path) / "log_pointer", log_pointer_stat.version));
 
         auto rc = zookeeper->tryMulti(ops, responses);
 
@@ -2563,19 +2732,22 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
     for (const String & entry_name : source_queue_names)
     {
         String entry;
-        if (!zookeeper->tryGet(source_path + "/queue/" + entry_name, entry))
+        if (!zookeeper->tryGet(fs::path(source_path) / "queue" / entry_name, entry))
             continue;
         source_queue.push_back(entry);
     }
 
+    /// We should do it after copying queue, because some ALTER_METADATA entries can be lost otherwise.
+    cloneMetadataIfNeeded(source_replica, source_path, zookeeper);
+
     /// Add to the queue jobs to receive all the active parts that the reference/master replica has.
-    Strings source_replica_parts = zookeeper->getChildren(source_path + "/parts");
+    Strings source_replica_parts = zookeeper->getChildren(fs::path(source_path) / "parts");
     ActiveDataPartSet active_parts_set(format_version, source_replica_parts);
 
     Strings active_parts = active_parts_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(replica_path + "/parts");
+    Strings local_parts_in_zk = zookeeper->getChildren(fs::path(replica_path) / "parts");
     Strings parts_to_remove_from_zk;
     for (const auto & part : local_parts_in_zk)
     {
@@ -2619,7 +2791,7 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
         log_entry.new_part_name = name;
         log_entry.create_time = tryGetPartCreateTime(zookeeper, source_path, name);
 
-        zookeeper->create(replica_path + "/queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential);
+        zookeeper->create(fs::path(replica_path) / "queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential);
     }
 
     LOG_DEBUG(log, "Queued {} parts to be fetched", active_parts.size());
@@ -2627,19 +2799,94 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
     /// Add content of the reference/master replica queue to the queue.
     for (const String & entry : source_queue)
     {
-        zookeeper->create(replica_path + "/queue/queue-", entry, zkutil::CreateMode::PersistentSequential);
+        zookeeper->create(fs::path(replica_path) / "queue/queue-", entry, zkutil::CreateMode::PersistentSequential);
     }
 
     LOG_DEBUG(log, "Copied {} queue entries", source_queue.size());
 }
 
 
+void StorageReplicatedMergeTree::cloneMetadataIfNeeded(const String & source_replica, const String & source_path, zkutil::ZooKeeperPtr & zookeeper)
+{
+    String source_metadata_version_str;
+    bool metadata_version_exists = zookeeper->tryGet(source_path + "/metadata_version", source_metadata_version_str);
+    if (!metadata_version_exists)
+    {
+        /// For compatibility with version older than 20.3
+        /// TODO fix tests and delete it
+        LOG_WARNING(log, "Node {} does not exist. "
+                         "Most likely it's because too old version of ClickHouse is running on replica {}. "
+                         "Will not check metadata consistency",
+                         source_path + "/metadata_version", source_replica);
+        return;
+    }
+
+    Int32 source_metadata_version = parse<Int32>(source_metadata_version_str);
+    if (metadata_version == source_metadata_version)
+        return;
+
+    /// Our metadata it not up to date with source replica metadata.
+    /// Metadata is updated by ALTER_METADATA entries, but some entries are probably cleaned up from the log.
+    /// It's also possible that some newer ALTER_METADATA entries are present in source_queue list,
+    /// and source replica are executing such entry right now (or had executed recently).
+    /// More than that, /metadata_version update is not atomic with /columns and /metadata update...
+
+    /// Fortunately, ALTER_METADATA seems to be idempotent,
+    /// and older entries of such type can be replaced with newer entries.
+    /// Let's try to get consistent values of source replica's /columns and /metadata
+    /// and prepend dummy ALTER_METADATA to our replication queue.
+    /// It should not break anything if source_queue already contains ALTER_METADATA entry
+    /// with greater or equal metadata_version, but it will update our metadata
+    /// if all such entries were cleaned up from the log and source_queue.
+
+    LOG_WARNING(log, "Metadata version ({}) on replica is not up to date with metadata ({}) on source replica {}",
+                metadata_version, source_metadata_version, source_replica);
+
+    String source_metadata;
+    String source_columns;
+    while (true)
+    {
+        Coordination::Stat metadata_stat;
+        Coordination::Stat columns_stat;
+        source_metadata = zookeeper->get(source_path + "/metadata", &metadata_stat);
+        source_columns = zookeeper->get(source_path + "/columns", &columns_stat);
+
+        Coordination::Requests ops;
+        Coordination::Responses responses;
+        ops.emplace_back(zkutil::makeCheckRequest(source_path + "/metadata", metadata_stat.version));
+        ops.emplace_back(zkutil::makeCheckRequest(source_path + "/columns", columns_stat.version));
+
+        Coordination::Error code = zookeeper->tryMulti(ops, responses);
+        if (code == Coordination::Error::ZOK)
+            break;
+        else if (code == Coordination::Error::ZBADVERSION)
+            LOG_WARNING(log, "Metadata of replica {} was changed", source_path);
+        else
+            zkutil::KeeperMultiException::check(code, ops, responses);
+    }
+
+    ReplicatedMergeTreeLogEntryData dummy_alter;
+    dummy_alter.type = LogEntry::ALTER_METADATA;
+    dummy_alter.source_replica = source_replica;
+    dummy_alter.metadata_str = source_metadata;
+    dummy_alter.columns_str = source_columns;
+    dummy_alter.alter_version = source_metadata_version;
+    dummy_alter.create_time = time(nullptr);
+
+    zookeeper->create(replica_path + "/queue/queue-", dummy_alter.toString(), zkutil::CreateMode::PersistentSequential);
+
+    /// We don't need to do anything with mutation_pointer, because mutation log cleanup process is different from
+    /// replication log cleanup. A mutation is removed from ZooKeeper only if all replicas had executed the mutation,
+    /// so all mutations which are greater or equal to our mutation pointer are still present in ZooKeeper.
+}
+
+
 void StorageReplicatedMergeTree::cloneReplicaIfNeeded(zkutil::ZooKeeperPtr zookeeper)
 {
     Coordination::Stat is_lost_stat;
     bool is_new_replica = true;
     String res;
-    if (zookeeper->tryGet(replica_path + "/is_lost", res, &is_lost_stat))
+    if (zookeeper->tryGet(fs::path(replica_path) / "is_lost", res, &is_lost_stat))
     {
         if (res == "0")
             return;
@@ -2651,14 +2898,14 @@ void StorageReplicatedMergeTree::cloneReplicaIfNeeded(zkutil::ZooKeeperPtr zooke
         /// Replica was created by old version of CH, so me must create "/is_lost".
         /// Note that in old version of CH there was no "lost" replicas possible.
         /// TODO is_lost node should always exist since v18.12, maybe we can replace `tryGet` with `get` and remove old code?
-        zookeeper->create(replica_path + "/is_lost", "0", zkutil::CreateMode::Persistent);
+        zookeeper->create(fs::path(replica_path) / "is_lost", "0", zkutil::CreateMode::Persistent);
         return;
     }
 
     /// is_lost is "1": it means that we are in repair mode.
     /// Try choose source replica to clone.
     /// Source replica must not be lost and should have minimal queue size and maximal log pointer.
-    Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+    Strings replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
     std::vector<zkutil::ZooKeeper::FutureGet> futures;
     for (const String & source_replica_name : replicas)
     {
@@ -2666,20 +2913,20 @@ void StorageReplicatedMergeTree::cloneReplicaIfNeeded(zkutil::ZooKeeperPtr zooke
         if (source_replica_name == replica_name)
             continue;
 
-        String source_replica_path = zookeeper_path + "/replicas/" + source_replica_name;
+        String source_replica_path = fs::path(zookeeper_path) / "replicas" / source_replica_name;
 
         /// Obviously the following get operations are not atomic, but it's ok to choose good enough replica, not the best one.
         /// NOTE: We may count some entries twice if log_pointer is moved.
-        futures.emplace_back(zookeeper->asyncTryGet(source_replica_path + "/is_lost"));
-        futures.emplace_back(zookeeper->asyncTryGet(source_replica_path + "/log_pointer"));
-        futures.emplace_back(zookeeper->asyncTryGet(source_replica_path + "/queue"));
+        futures.emplace_back(zookeeper->asyncTryGet(fs::path(source_replica_path) / "is_lost"));
+        futures.emplace_back(zookeeper->asyncTryGet(fs::path(source_replica_path) / "log_pointer"));
+        futures.emplace_back(zookeeper->asyncTryGet(fs::path(source_replica_path) / "queue"));
     }
 
     /// Wait for results before getting log entries
     for (auto & future : futures)
         future.wait();
 
-    Strings log_entries = zookeeper->getChildren(zookeeper_path + "/log");
+    Strings log_entries = zookeeper->getChildren(fs::path(zookeeper_path) / "log");
     size_t max_log_entry = 0;
     if (!log_entries.empty())
     {
@@ -2750,14 +2997,14 @@ void StorageReplicatedMergeTree::cloneReplicaIfNeeded(zkutil::ZooKeeperPtr zooke
         LOG_WARNING(log, "Will mimic {}", source_replica);
 
     /// Clear obsolete queue that we no longer need.
-    zookeeper->removeChildren(replica_path + "/queue");
+    zookeeper->removeChildren(fs::path(replica_path) / "queue");
 
     /// Will do repair from the selected replica.
     cloneReplica(source_replica, source_is_lost_stat, zookeeper);
     /// If repair fails to whatever reason, the exception is thrown, is_lost will remain "1" and the replica will be repaired later.
 
     /// If replica is repaired successfully, we remove is_lost flag.
-    zookeeper->set(replica_path + "/is_lost", "0");
+    zookeeper->set(fs::path(replica_path) / "is_lost", "0");
 }
 
 
@@ -2920,6 +3167,13 @@ bool StorageReplicatedMergeTree::canExecuteFetch(const ReplicatedMergeTreeLogEnt
         return false;
     }
 
+    if (replicated_fetches_throttler->isThrottling())
+    {
+        disable_reason = fmt::format("Not executing fetch of part {} because fetches have already throttled by network settings "
+                                     "<max_replicated_fetches_network_bandwidth> or <max_replicated_fetches_network_bandwidth_for_server>.", entry.new_part_name);
+        return false;
+    }
+
     return true;
 }
 
@@ -3084,7 +3338,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     std::vector<std::future<Coordination::ExistsResponse>> exists_futures;
     exists_futures.reserve(parts.size());
     for (const auto & part : parts)
-        exists_futures.emplace_back(zookeeper->asyncExists(replica_path + "/parts/" + part->name));
+        exists_futures.emplace_back(zookeeper->asyncExists(fs::path(replica_path) / "parts" / part->name));
 
     bool all_in_zk = true;
     for (size_t i = 0; i < parts.size(); ++i)
@@ -3115,7 +3369,6 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     entry.merge_type = merge_type;
     entry.deduplicate = deduplicate;
     entry.deduplicate_by_columns = deduplicate_by_columns;
-    entry.merge_type = merge_type;
     entry.create_time = time(nullptr);
 
     for (const auto & part : parts)
@@ -3125,11 +3378,11 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     Coordination::Responses responses;
 
     ops.emplace_back(zkutil::makeCreateRequest(
-        zookeeper_path + "/log/log-", entry.toString(),
+        fs::path(zookeeper_path) / "log/log-", entry.toString(),
         zkutil::CreateMode::PersistentSequential));
 
     ops.emplace_back(zkutil::makeSetRequest(
-        zookeeper_path + "/log", "", log_version)); /// Check and update version.
+        fs::path(zookeeper_path) / "log", "", log_version)); /// Check and update version.
 
     Coordination::Error code = zookeeper->tryMulti(ops, responses);
 
@@ -3165,7 +3418,7 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     auto zookeeper = getZooKeeper();
 
     /// If there is no information about part in ZK, we will not mutate it.
-    if (!zookeeper->exists(replica_path + "/parts/" + part.name))
+    if (!zookeeper->exists(fs::path(replica_path) / "parts" / part.name))
     {
         if (part.modification_time + MAX_AGE_OF_LOCAL_PART_THAT_WASNT_ADDED_TO_ZOOKEEPER < time(nullptr))
         {
@@ -3195,11 +3448,11 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
     Coordination::Responses responses;
 
     ops.emplace_back(zkutil::makeCreateRequest(
-        zookeeper_path + "/log/log-", entry.toString(),
+        fs::path(zookeeper_path) / "log/log-", entry.toString(),
         zkutil::CreateMode::PersistentSequential));
 
     ops.emplace_back(zkutil::makeSetRequest(
-        zookeeper_path + "/log", "", log_version)); /// Check and update version.
+        fs::path(zookeeper_path) / "log", "", log_version)); /// Check and update version.
 
     Coordination::Error code = zookeeper->tryMulti(ops, responses);
 
@@ -3220,12 +3473,12 @@ StorageReplicatedMergeTree::CreateMergeEntryResult StorageReplicatedMergeTree::c
 
 void StorageReplicatedMergeTree::removePartFromZooKeeper(const String & part_name, Coordination::Requests & ops, bool has_children)
 {
-    String part_path = replica_path + "/parts/" + part_name;
+    String part_path = fs::path(replica_path) / "parts" / part_name;
 
     if (has_children)
     {
-        ops.emplace_back(zkutil::makeRemoveRequest(part_path + "/checksums", -1));
-        ops.emplace_back(zkutil::makeRemoveRequest(part_path + "/columns", -1));
+        ops.emplace_back(zkutil::makeRemoveRequest(fs::path(part_path) / "checksums", -1));
+        ops.emplace_back(zkutil::makeRemoveRequest(fs::path(part_path) / "columns", -1));
     }
     ops.emplace_back(zkutil::makeRemoveRequest(part_path, -1));
 }
@@ -3233,7 +3486,7 @@ void StorageReplicatedMergeTree::removePartFromZooKeeper(const String & part_nam
 void StorageReplicatedMergeTree::removePartFromZooKeeper(const String & part_name)
 {
     auto zookeeper = getZooKeeper();
-    String part_path = replica_path + "/parts/" + part_name;
+    String part_path = fs::path(replica_path) / "parts" / part_name;
     Coordination::Stat stat;
 
     /// Part doesn't exist, nothing to remove
@@ -3250,7 +3503,7 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
 {
     auto zookeeper = getZooKeeper();
 
-    String part_path = replica_path + "/parts/" + part_name;
+    String part_path = fs::path(replica_path) / "parts" / part_name;
 
     Coordination::Requests ops;
 
@@ -3269,7 +3522,7 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
     log_entry->new_part_name = part_name;
 
     ops.emplace_back(zkutil::makeCreateRequest(
-        replica_path + "/queue/queue-", log_entry->toString(),
+        fs::path(replica_path) / "queue/queue-", log_entry->toString(),
         zkutil::CreateMode::PersistentSequential));
 
     auto results = zookeeper->multi(ops);
@@ -3293,8 +3546,8 @@ void StorageReplicatedMergeTree::enterLeaderElection()
     try
     {
         leader_election = std::make_shared<zkutil::LeaderElection>(
-            global_context.getSchedulePool(),
-            zookeeper_path + "/leader_election",
+            getContext()->getSchedulePool(),
+            fs::path(zookeeper_path) / "leader_election",
             *current_zookeeper,    /// current_zookeeper lives for the lifetime of leader_election,
                                    ///  since before changing `current_zookeeper`, `leader_election` object is destroyed in `partialShutdown` method.
             callback,
@@ -3329,9 +3582,9 @@ void StorageReplicatedMergeTree::exitLeaderElection()
     leader_election = nullptr;
 }
 
-ConnectionTimeouts StorageReplicatedMergeTree::getFetchPartHTTPTimeouts(const Context & context)
+ConnectionTimeouts StorageReplicatedMergeTree::getFetchPartHTTPTimeouts(ContextPtr local_context)
 {
-    auto timeouts = ConnectionTimeouts::getHTTPTimeouts(context);
+    auto timeouts = ConnectionTimeouts::getHTTPTimeouts(local_context);
     auto settings = getSettings();
 
     if (settings->replicated_fetches_http_connection_timeout.changed)
@@ -3349,13 +3602,13 @@ ConnectionTimeouts StorageReplicatedMergeTree::getFetchPartHTTPTimeouts(const Co
 bool StorageReplicatedMergeTree::checkReplicaHavePart(const String & replica, const String & part_name)
 {
     auto zookeeper = getZooKeeper();
-    return zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/parts/" + part_name);
+    return zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "parts" / part_name);
 }
 
 String StorageReplicatedMergeTree::findReplicaHavingPart(const String & part_name, bool active)
 {
     auto zookeeper = getZooKeeper();
-    Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+    Strings replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
 
     /// Select replicas in uniformly random order.
     std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
@@ -3371,7 +3624,7 @@ String StorageReplicatedMergeTree::findReplicaHavingPart(const String & part_nam
         LOG_TRACE(log, "Candidate replica: {}", replica);
 
         if (checkReplicaHavePart(replica, part_name) &&
-            (!active || zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active")))
+            (!active || zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "is_active")))
             return replica;
 
         /// Obviously, replica could become inactive or even vanish after return from this method.
@@ -3383,7 +3636,7 @@ String StorageReplicatedMergeTree::findReplicaHavingPart(const String & part_nam
 String StorageReplicatedMergeTree::findReplicaHavingCoveringPart(LogEntry & entry, bool active)
 {
     auto zookeeper = getZooKeeper();
-    Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+    Strings replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
 
     /// Select replicas in uniformly random order.
     std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
@@ -3393,11 +3646,11 @@ String StorageReplicatedMergeTree::findReplicaHavingCoveringPart(LogEntry & entr
         if (replica == replica_name)
             continue;
 
-        if (active && !zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active"))
+        if (active && !zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "is_active"))
             continue;
 
         String largest_part_found;
-        Strings parts = zookeeper->getChildren(zookeeper_path + "/replicas/" + replica + "/parts");
+        Strings parts = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas" / replica / "parts");
         for (const String & part_on_replica : parts)
         {
             if (part_on_replica == entry.new_part_name
@@ -3438,7 +3691,7 @@ String StorageReplicatedMergeTree::findReplicaHavingCoveringPart(
     const String & part_name, bool active, String & found_part_name)
 {
     auto zookeeper = getZooKeeper();
-    Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+    Strings replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
 
     /// Select replicas in uniformly random order.
     std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
@@ -3451,10 +3704,10 @@ String StorageReplicatedMergeTree::findReplicaHavingCoveringPart(
         if (replica == replica_name)
             continue;
 
-        if (active && !zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active"))
+        if (active && !zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "is_active"))
             continue;
 
-        Strings parts = zookeeper->getChildren(zookeeper_path + "/replicas/" + replica + "/parts");
+        Strings parts = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas" / replica / "parts");
         for (const String & part_on_replica : parts)
         {
             if (part_on_replica == part_name
@@ -3482,11 +3735,11 @@ void StorageReplicatedMergeTree::updateQuorum(const String & part_name, bool is_
     auto zookeeper = getZooKeeper();
 
     /// Information on which replicas a part has been added, if the quorum has not yet been reached.
-    String quorum_status_path = zookeeper_path + "/quorum/status";
+    String quorum_status_path = fs::path(zookeeper_path) / "quorum" / "status";
     if (is_parallel)
-        quorum_status_path = zookeeper_path + "/quorum/parallel/" + part_name;
+        quorum_status_path = fs::path(zookeeper_path) / "quorum" / "parallel" / part_name;
     /// The name of the previous part for which the quorum was reached.
-    const String quorum_last_part_path = zookeeper_path + "/quorum/last_part";
+    const String quorum_last_part_path = fs::path(zookeeper_path) / "quorum" / "last_part";
 
     String value;
     Coordination::Stat stat;
@@ -3588,7 +3841,7 @@ void StorageReplicatedMergeTree::cleanLastPartNode(const String & partition_id)
     auto zookeeper = getZooKeeper();
 
     /// The name of the previous part for which the quorum was reached.
-    const String quorum_last_part_path = zookeeper_path + "/quorum/last_part";
+    const String quorum_last_part_path = fs::path(zookeeper_path) / "quorum" / "last_part";
 
     /// Delete information from "last_part" node.
 
@@ -3638,7 +3891,7 @@ void StorageReplicatedMergeTree::cleanLastPartNode(const String & partition_id)
 bool StorageReplicatedMergeTree::partIsInsertingWithParallelQuorum(const MergeTreePartInfo & part_info) const
 {
     auto zookeeper = getZooKeeper();
-    return zookeeper->exists(zookeeper_path + "/quorum/parallel/" + part_info.getPartName());
+    return zookeeper->exists(fs::path(zookeeper_path) / "quorum" / "parallel" / part_info.getPartName());
 }
 
 
@@ -3646,7 +3899,7 @@ bool StorageReplicatedMergeTree::partIsLastQuorumPart(const MergeTreePartInfo &
 {
     auto zookeeper = getZooKeeper();
 
-    const String parts_with_quorum_path = zookeeper_path + "/quorum/last_part";
+    const String parts_with_quorum_path = fs::path(zookeeper_path) / "quorum" / "last_part";
 
     String parts_with_quorum_str = zookeeper->get(parts_with_quorum_path);
 
@@ -3690,7 +3943,7 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
         }
     }
 
-    SCOPE_EXIT
+    SCOPE_EXIT_MEMORY
     ({
         std::lock_guard lock(currently_fetching_parts_mutex);
         currently_fetching_parts.erase(part_name);
@@ -3730,13 +3983,13 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
             source_part_checksums.computeTotalChecksums(source_part->checksums);
 
             MinimalisticDataPartChecksums desired_checksums;
-            String part_path = source_replica_path + "/parts/" + part_name;
+            String part_path = fs::path(source_replica_path) / "parts" / part_name;
             String part_znode = zookeeper->get(part_path);
             if (!part_znode.empty())
                 desired_checksums = ReplicatedMergeTreePartHeader::fromString(part_znode).getChecksums();
             else
             {
-                String desired_checksums_str = zookeeper->get(part_path + "/checksums");
+                String desired_checksums_str = zookeeper->get(fs::path(part_path) / "checksums");
                 desired_checksums = MinimalisticDataPartChecksums::deserializeFrom(desired_checksums_str);
             }
 
@@ -3751,8 +4004,8 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
 
     ReplicatedMergeTreeAddress address;
     ConnectionTimeouts timeouts;
-    std::pair<String, String> user_password;
     String interserver_scheme;
+    InterserverCredentialsPtr credentials;
     std::optional<CurrentlySubmergingEmergingTagger> tagger_ptr;
     std::function<MutableDataPartPtr()> get_part;
 
@@ -3765,13 +4018,13 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
     }
     else
     {
-        address.fromString(zookeeper->get(source_replica_path + "/host"));
-        timeouts = getFetchPartHTTPTimeouts(global_context);
+        address.fromString(zookeeper->get(fs::path(source_replica_path) / "host"));
+        timeouts = getFetchPartHTTPTimeouts(getContext());
 
-        user_password = global_context.getInterserverCredentials();
-        interserver_scheme = global_context.getInterserverScheme();
+        credentials = getContext()->getInterserverCredentials();
+        interserver_scheme = getContext()->getInterserverScheme();
 
-        get_part = [&, address, timeouts, user_password, interserver_scheme]()
+        get_part = [&, address, timeouts, credentials, interserver_scheme]()
         {
             if (interserver_scheme != address.scheme)
                 throw Exception("Interserver schemes are different: '" + interserver_scheme
@@ -3780,14 +4033,16 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
 
             return fetcher.fetchPart(
                 metadata_snapshot,
+                getContext(),
                 part_name,
                 source_replica_path,
                 address.host,
                 address.replication_port,
                 timeouts,
-                user_password.first,
-                user_password.second,
+                credentials->getUser(),
+                credentials->getPassword(),
                 interserver_scheme,
+                replicated_fetches_throttler,
                 to_detached,
                 "",
                 &tagger_ptr,
@@ -3812,16 +4067,16 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
             if (quorum)
             {
                 /// Check if this quorum insert is parallel or not
-                if (zookeeper->exists(zookeeper_path + "/quorum/parallel/" + part_name))
+                if (zookeeper->exists(fs::path(zookeeper_path) / "quorum" / "parallel" / part_name))
                     updateQuorum(part_name, true);
-                else if (zookeeper->exists(zookeeper_path + "/quorum/status"))
+                else if (zookeeper->exists(fs::path(zookeeper_path) / "quorum" / "status"))
                     updateQuorum(part_name, false);
             }
 
             /// merged parts that are still inserted with quorum. if it only contains one block, it hasn't been merged before
             if (part_info.level != 0 || part_info.mutation != 0)
             {
-                Strings quorum_parts = zookeeper->getChildren(zookeeper_path + "/quorum/parallel");
+                Strings quorum_parts = zookeeper->getChildren(fs::path(zookeeper_path) / "quorum" / "parallel");
                 for (const String & quorum_part : quorum_parts)
                 {
                     auto quorum_part_info = MergeTreePartInfo::fromPartName(quorum_part, format_version);
@@ -3844,7 +4099,7 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Stora
         {
             // The fetched part is valuable and should not be cleaned like a temp part.
             part->is_temp = false;
-            part->renameTo("detached/" + part_name, true);
+            part->renameTo(fs::path("detached") / part_name, true);
         }
     }
     catch (const Exception & e)
@@ -3898,7 +4153,7 @@ bool StorageReplicatedMergeTree::fetchExistsPart(const String & part_name, const
         }
     }
 
-    SCOPE_EXIT
+    SCOPE_EXIT_MEMORY
     ({
         std::lock_guard lock(currently_fetching_parts_mutex);
         currently_fetching_parts.erase(part_name);
@@ -3922,12 +4177,12 @@ bool StorageReplicatedMergeTree::fetchExistsPart(const String & part_name, const
 
     std::function<MutableDataPartPtr()> get_part;
 
-    ReplicatedMergeTreeAddress address(zookeeper->get(source_replica_path + "/host"));
-    auto timeouts = ConnectionTimeouts::getHTTPTimeouts(global_context);
-    auto user_password = global_context.getInterserverCredentials();
-    String interserver_scheme = global_context.getInterserverScheme();
+    ReplicatedMergeTreeAddress address(zookeeper->get(fs::path(source_replica_path) / "host"));
+    auto timeouts = ConnectionTimeouts::getHTTPTimeouts(getContext());
+    auto credentials = getContext()->getInterserverCredentials();
+    String interserver_scheme = getContext()->getInterserverScheme();
 
-    get_part = [&, address, timeouts, user_password, interserver_scheme]()
+    get_part = [&, address, timeouts, interserver_scheme, credentials]()
     {
         if (interserver_scheme != address.scheme)
             throw Exception("Interserver schemes are different: '" + interserver_scheme
@@ -3935,9 +4190,10 @@ bool StorageReplicatedMergeTree::fetchExistsPart(const String & part_name, const
                 ErrorCodes::INTERSERVER_SCHEME_DOESNT_MATCH);
 
         return fetcher.fetchPart(
-            metadata_snapshot, part_name, source_replica_path,
+            metadata_snapshot, getContext(), part_name, source_replica_path,
             address.host, address.replication_port,
-            timeouts, user_password.first, user_password.second, interserver_scheme, false, "", nullptr, true,
+            timeouts, credentials->getUser(), credentials->getPassword(),
+            interserver_scheme, replicated_fetches_throttler, false, "", nullptr, true,
             replaced_disk);
     };
 
@@ -3985,7 +4241,7 @@ void StorageReplicatedMergeTree::startup()
         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);
-        global_context.getInterserverIOHandler().addEndpoint(data_parts_exchange_ptr->getId(replica_path), data_parts_exchange_ptr);
+        getContext()->getInterserverIOHandler().addEndpoint(data_parts_exchange_ptr->getId(replica_path), data_parts_exchange_ptr);
 
         /// In this thread replica will be activated.
         restarting_thread.start();
@@ -3997,6 +4253,8 @@ void StorageReplicatedMergeTree::startup()
         /// 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();
     }
     catch (...)
     {
@@ -4027,6 +4285,7 @@ void StorageReplicatedMergeTree::shutdown()
 
     restarting_thread.shutdown();
     background_executor.finish();
+    part_moves_between_shards_orchestrator.shutdown();
 
     {
         auto lock = queue.lockQueue();
@@ -4040,7 +4299,7 @@ void StorageReplicatedMergeTree::shutdown()
     auto data_parts_exchange_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, InterserverIOEndpointPtr{});
     if (data_parts_exchange_ptr)
     {
-        global_context.getInterserverIOHandler().removeEndpointIfExists(data_parts_exchange_ptr->getId(replica_path));
+        getContext()->getInterserverIOHandler().removeEndpointIfExists(data_parts_exchange_ptr->getId(replica_path));
         /// Ask all parts exchange handlers to finish asap. New ones will fail to start
         data_parts_exchange_ptr->blocker.cancelForever();
         /// Wait for all of them
@@ -4080,7 +4339,7 @@ ReplicatedMergeTreeQuorumAddedParts::PartitionIdToMaxBlock StorageReplicatedMerg
 
     auto zookeeper = getZooKeeper();
 
-    const String quorum_status_path = zookeeper_path + "/quorum/status";
+    const String quorum_status_path = fs::path(zookeeper_path) / "quorum" / "status";
 
     String value;
     Coordination::Stat stat;
@@ -4096,7 +4355,7 @@ ReplicatedMergeTreeQuorumAddedParts::PartitionIdToMaxBlock StorageReplicatedMerg
     }
 
     String added_parts_str;
-    if (zookeeper->tryGet(zookeeper_path + "/quorum/last_part", added_parts_str))
+    if (zookeeper->tryGet(fs::path(zookeeper_path) / "quorum" / "last_part", added_parts_str))
     {
         if (!added_parts_str.empty())
         {
@@ -4126,8 +4385,8 @@ void StorageReplicatedMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
-    QueryProcessingStage::Enum /*processed_stage*/,
+    ContextPtr local_context,
+    QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
@@ -4136,15 +4395,16 @@ void StorageReplicatedMergeTree::read(
     * 2. Do not read parts that have not yet been written to the quorum of the replicas.
     * For this you have to synchronously go to ZooKeeper.
     */
-    if (context.getSettingsRef().select_sequential_consistency)
+    if (local_context->getSettingsRef().select_sequential_consistency)
     {
-        auto max_added_blocks = getMaxAddedBlocks();
-        if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams, &max_added_blocks))
+        auto max_added_blocks = std::make_shared<ReplicatedMergeTreeQuorumAddedParts::PartitionIdToMaxBlock>(getMaxAddedBlocks());
+        if (auto plan = reader.read(
+                column_names, metadata_snapshot, query_info, local_context, max_block_size, num_streams, processed_stage, std::move(max_added_blocks)))
             query_plan = std::move(*plan);
         return;
     }
 
-    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams))
+    if (auto plan = reader.read(column_names, metadata_snapshot, query_info, local_context, max_block_size, num_streams, processed_stage))
         query_plan = std::move(*plan);
 }
 
@@ -4152,16 +4412,16 @@ Pipe StorageReplicatedMergeTree::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
 {
     QueryPlan plan;
-    read(plan, column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    read(plan, column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
     return plan.convertToPipe(
-        QueryPlanOptimizationSettings::fromContext(context),
-        BuildQueryPipelineSettings::fromContext(context));
+        QueryPlanOptimizationSettings::fromContext(local_context),
+        BuildQueryPipelineSettings::fromContext(local_context));
 }
 
 
@@ -4200,11 +4460,11 @@ std::optional<UInt64> StorageReplicatedMergeTree::totalRows(const Settings & set
     return res;
 }
 
-std::optional<UInt64> StorageReplicatedMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, const Context & context) const
+std::optional<UInt64> StorageReplicatedMergeTree::totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, ContextPtr local_context) const
 {
     DataPartsVector parts;
-    foreachCommittedParts([&](auto & part) { parts.push_back(part); }, context.getSettingsRef().select_sequential_consistency);
-    return totalRowsByPartitionPredicateImpl(query_info, context, parts);
+    foreachCommittedParts([&](auto & part) { parts.push_back(part); }, local_context->getSettingsRef().select_sequential_consistency);
+    return totalRowsByPartitionPredicateImpl(query_info, local_context, parts);
 }
 
 std::optional<UInt64> StorageReplicatedMergeTree::totalBytes(const Settings & settings) const
@@ -4222,12 +4482,12 @@ void StorageReplicatedMergeTree::assertNotReadonly() const
 }
 
 
-BlockOutputStreamPtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     const auto storage_settings_ptr = getSettings();
     assertNotReadonly();
 
-    const Settings & query_settings = context.getSettingsRef();
+    const Settings & query_settings = local_context->getSettingsRef();
     bool deduplicate = storage_settings_ptr->replicated_deduplication_window != 0 && query_settings.insert_deduplicate;
 
     // TODO: should we also somehow pass list of columns to deduplicate on to the ReplicatedMergeTreeBlockOutputStream ?
@@ -4237,7 +4497,7 @@ BlockOutputStreamPtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/,
         query_settings.max_partitions_per_insert_block,
         query_settings.insert_quorum_parallel,
         deduplicate,
-        context.getSettingsRef().optimize_on_insert);
+        local_context);
 }
 
 
@@ -4248,11 +4508,11 @@ bool StorageReplicatedMergeTree::optimize(
     bool final,
     bool deduplicate,
     const Names & deduplicate_by_columns,
-    const Context & query_context)
+    ContextPtr query_context)
 {
     /// NOTE: exclusive lock cannot be used here, since this may lead to deadlock (see comments below),
     /// but it should be safe to use non-exclusive to avoid dropping parts that may be required for processing queue.
-    auto table_lock = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+    auto table_lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
 
     assertNotReadonly();
 
@@ -4267,7 +4527,7 @@ bool StorageReplicatedMergeTree::optimize(
 
         auto handle_noop = [&] (const String & message)
         {
-            if (query_context.getSettingsRef().optimize_throw_if_noop)
+            if (query_context->getSettingsRef().optimize_throw_if_noop)
                 throw Exception(message, ErrorCodes::CANNOT_ASSIGN_OPTIMIZE);
             return false;
         };
@@ -4301,7 +4561,7 @@ bool StorageReplicatedMergeTree::optimize(
                         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);
+                        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;
@@ -4352,7 +4612,7 @@ bool StorageReplicatedMergeTree::optimize(
                     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);
+                        future_merged_part, disk_space, can_merge, partition_id, final, metadata_snapshot, &disable_reason, query_context->getSettingsRef().optimize_skip_merged_partitions);
                 }
 
                 /// If there is nothing to merge then we treat this merge as successful (needed for optimize final optimization)
@@ -4390,7 +4650,7 @@ bool StorageReplicatedMergeTree::optimize(
         }
     }
 
-    if (query_context.getSettingsRef().replication_alter_partitions_sync != 0)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync != 0)
     {
         /// 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)
@@ -4402,6 +4662,17 @@ bool StorageReplicatedMergeTree::optimize(
 
 bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMergeTree::LogEntry & entry)
 {
+    if (entry.alter_version < metadata_version)
+    {
+        /// TODO Can we replace it with LOGICAL_ERROR?
+        /// As for now, it may rerely happen due to reordering of ALTER_METADATA entries in the queue of
+        /// non-initial replica and also may happen after stale replica recovery.
+        LOG_WARNING(log, "Attempt to update metadata of version {} "
+                         "to older version {} when processing log entry {}: {}",
+                         metadata_version, entry.alter_version, entry.znode_name, entry.toString());
+        return true;
+    }
+
     auto zookeeper = getZooKeeper();
 
     auto columns_from_entry = ColumnsDescription::parse(entry.columns_str);
@@ -4411,8 +4682,8 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
 
     /// If metadata nodes have changed, we will update table structure locally.
     Coordination::Requests requests;
-    requests.emplace_back(zkutil::makeSetRequest(replica_path + "/columns", entry.columns_str, -1));
-    requests.emplace_back(zkutil::makeSetRequest(replica_path + "/metadata", entry.metadata_str, -1));
+    requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "columns", entry.columns_str, -1));
+    requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "metadata", entry.metadata_str, -1));
 
     zookeeper->multi(requests);
 
@@ -4428,14 +4699,14 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
     }
 
     /// This transaction may not happen, but it's OK, because on the next retry we will eventually create/update this node
-    zookeeper->createOrUpdate(replica_path + "/metadata_version", std::to_string(metadata_version), zkutil::CreateMode::Persistent);
+    zookeeper->createOrUpdate(fs::path(replica_path) / "metadata_version", std::to_string(metadata_version), zkutil::CreateMode::Persistent);
 
     return true;
 }
 
 
 std::set<String> StorageReplicatedMergeTree::getPartitionIdsAffectedByCommands(
-    const MutationCommands & commands, const Context & query_context) const
+    const MutationCommands & commands, ContextPtr query_context) const
 {
     std::set<String> affected_partition_ids;
 
@@ -4457,7 +4728,7 @@ std::set<String> StorageReplicatedMergeTree::getPartitionIdsAffectedByCommands(
 
 
 PartitionBlockNumbersHolder StorageReplicatedMergeTree::allocateBlockNumbersInAffectedPartitions(
-    const MutationCommands & commands, const Context & query_context, const zkutil::ZooKeeperPtr & zookeeper) const
+    const MutationCommands & commands, ContextPtr query_context, const zkutil::ZooKeeperPtr & zookeeper) const
 {
     const std::set<String> mutation_affected_partition_ids = getPartitionIdsAffectedByCommands(commands, query_context);
 
@@ -4474,7 +4745,7 @@ PartitionBlockNumbersHolder StorageReplicatedMergeTree::allocateBlockNumbersInAf
     {
         /// TODO: Implement optimal block number aqcuisition algorithm in multiple (but not all) partitions
         EphemeralLocksInAllPartitions lock_holder(
-            zookeeper_path + "/block_numbers", "block-", zookeeper_path + "/temp", *zookeeper);
+            fs::path(zookeeper_path) / "block_numbers", "block-", fs::path(zookeeper_path) / "temp", *zookeeper);
 
         PartitionBlockNumbersHolder::BlockNumbersType block_numbers;
         for (const auto & lock : lock_holder.getLocks())
@@ -4489,7 +4760,7 @@ PartitionBlockNumbersHolder StorageReplicatedMergeTree::allocateBlockNumbersInAf
 
 
 void StorageReplicatedMergeTree::alter(
-    const AlterCommands & commands, const Context & query_context, TableLockHolder & table_lock_holder)
+    const AlterCommands & commands, ContextPtr query_context, TableLockHolder & table_lock_holder)
 {
     assertNotReadonly();
 
@@ -4561,6 +4832,10 @@ void StorageReplicatedMergeTree::alter(
         if (new_indices_str != current_metadata->secondary_indices.toString())
             future_metadata_in_zk.skip_indices = new_indices_str;
 
+        String new_projections_str = future_metadata.projections.toString();
+        if (new_projections_str != current_metadata->projections.toString())
+            future_metadata_in_zk.projections = new_projections_str;
+
         String new_constraints_str = future_metadata.constraints.toString();
         if (new_constraints_str != current_metadata->constraints.toString())
             future_metadata_in_zk.constraints = new_constraints_str;
@@ -4570,10 +4845,10 @@ void StorageReplicatedMergeTree::alter(
         size_t mutation_path_idx = std::numeric_limits<size_t>::max();
 
         String new_metadata_str = future_metadata_in_zk.toString();
-        ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/metadata", new_metadata_str, metadata_version));
+        ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "metadata", new_metadata_str, metadata_version));
 
         String new_columns_str = future_metadata.columns.toString();
-        ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/columns", new_columns_str, -1));
+        ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "columns", new_columns_str, -1));
 
         if (ast_to_str(current_metadata->settings_changes) != ast_to_str(future_metadata.settings_changes))
         {
@@ -4596,17 +4871,18 @@ void StorageReplicatedMergeTree::alter(
         alter_entry->create_time = time(nullptr);
 
         auto maybe_mutation_commands = commands.getMutationCommands(
-            *current_metadata, query_context.getSettingsRef().materialize_ttl_after_modify, query_context);
-        alter_entry->have_mutation = !maybe_mutation_commands.empty();
+            *current_metadata, query_context->getSettingsRef().materialize_ttl_after_modify, query_context);
+        bool have_mutation = !maybe_mutation_commands.empty();
+        alter_entry->have_mutation = have_mutation;
 
         alter_path_idx = ops.size();
         ops.emplace_back(zkutil::makeCreateRequest(
-            zookeeper_path + "/log/log-", alter_entry->toString(), zkutil::CreateMode::PersistentSequential));
+            fs::path(zookeeper_path) / "log/log-", alter_entry->toString(), zkutil::CreateMode::PersistentSequential));
 
         PartitionBlockNumbersHolder partition_block_numbers_holder;
-        if (alter_entry->have_mutation)
+        if (have_mutation)
         {
-            const String mutations_path(zookeeper_path + "/mutations");
+            const String mutations_path(fs::path(zookeeper_path) / "mutations");
 
             ReplicatedMergeTreeMutationEntry mutation_entry;
             mutation_entry.alter_version = new_metadata_version;
@@ -4617,7 +4893,7 @@ void StorageReplicatedMergeTree::alter(
             zookeeper->get(mutations_path, &mutations_stat);
 
             partition_block_numbers_holder =
-                    allocateBlockNumbersInAffectedPartitions(mutation_entry.commands, query_context, zookeeper);
+                allocateBlockNumbersInAffectedPartitions(mutation_entry.commands, query_context, zookeeper);
 
             mutation_entry.block_numbers = partition_block_numbers_holder.getBlockNumbers();
             mutation_entry.create_time = time(nullptr);
@@ -4625,15 +4901,15 @@ void StorageReplicatedMergeTree::alter(
             ops.emplace_back(zkutil::makeSetRequest(mutations_path, String(), mutations_stat.version));
             mutation_path_idx = ops.size();
             ops.emplace_back(
-                zkutil::makeCreateRequest(mutations_path + "/", mutation_entry.toString(), zkutil::CreateMode::PersistentSequential));
+                zkutil::makeCreateRequest(fs::path(mutations_path) / "", mutation_entry.toString(), zkutil::CreateMode::PersistentSequential));
         }
 
-        if (auto txn = query_context.getZooKeeperMetadataTransaction())
+        if (auto txn = query_context->getZooKeeperMetadataTransaction())
         {
             txn->moveOpsTo(ops);
             /// NOTE: IDatabase::alterTable(...) is called when executing ALTER_METADATA queue entry without query context,
             /// so we have to update metadata of DatabaseReplicated here.
-            String metadata_zk_path = txn->getDatabaseZooKeeperPath() + "/metadata/" + escapeForFileName(table_id.table_name);
+            String metadata_zk_path = fs::path(txn->getDatabaseZooKeeperPath()) / "metadata" / escapeForFileName(table_id.table_name);
             auto ast = DatabaseCatalog::instance().getDatabase(table_id.database_name)->getCreateTableQuery(table_id.table_name, query_context);
             applyMetadataChangesToCreateQuery(ast, future_metadata);
             ops.emplace_back(zkutil::makeSetRequest(metadata_zk_path, getObjectDefinitionFromCreateQuery(ast), -1));
@@ -4649,7 +4925,7 @@ void StorageReplicatedMergeTree::alter(
 
         if (rc == Coordination::Error::ZOK)
         {
-            if (alter_entry->have_mutation)
+            if (have_mutation)
             {
                 /// ALTER_METADATA record in replication /log
                 String alter_path = dynamic_cast<const Coordination::CreateResponse &>(*results[alter_path_idx]).path_created;
@@ -4684,12 +4960,12 @@ void StorageReplicatedMergeTree::alter(
     table_lock_holder.reset();
 
     std::vector<String> unwaited;
-    if (query_context.getSettingsRef().replication_alter_partitions_sync == 2)
+    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)
+    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);
@@ -4701,7 +4977,7 @@ void StorageReplicatedMergeTree::alter(
     if (mutation_znode)
     {
         LOG_DEBUG(log, "Metadata changes applied. Will wait for data changes.");
-        waitMutation(*mutation_znode, query_context.getSettingsRef().replication_alter_partitions_sync);
+        waitMutation(*mutation_znode, query_context->getSettingsRef().replication_alter_partitions_sync);
         LOG_DEBUG(log, "Data changes applied.");
     }
 }
@@ -4723,7 +4999,8 @@ static String getPartNamePossiblyFake(MergeTreeDataFormatVersion format_version,
     return part_info.getPartName();
 }
 
-bool StorageReplicatedMergeTree::getFakePartCoveringAllPartsInPartition(const String & partition_id, MergeTreePartInfo & part_info, bool for_replace_partition)
+bool StorageReplicatedMergeTree::getFakePartCoveringAllPartsInPartition(const String & partition_id, MergeTreePartInfo & part_info,
+                                                                        std::optional<EphemeralLockInZooKeeper> & delimiting_block_lock, bool for_replace_range)
 {
     /// Even if there is no data in the partition, you still need to mark the range for deletion.
     /// - Because before executing DETACH, tasks for downloading parts to this partition can be executed.
@@ -4740,75 +5017,93 @@ bool StorageReplicatedMergeTree::getFakePartCoveringAllPartsInPartition(const St
 
     {
         auto zookeeper = getZooKeeper();
-        auto block_number_lock = allocateBlockNumber(partition_id, zookeeper);
-        right = block_number_lock->getNumber();
-        block_number_lock->unlock();
-        mutation_version = queue.getCurrentMutationVersion(partition_id, right);
+        delimiting_block_lock = allocateBlockNumber(partition_id, zookeeper);
+        right = delimiting_block_lock->getNumber();
+        /// Make sure we cover all parts in drop range.
+        /// There might be parts with mutation version greater than current block number
+        /// if some part mutation has been assigned after block number allocation, but before creation of DROP_RANGE entry.
+        mutation_version = MergeTreePartInfo::MAX_BLOCK_NUMBER;
     }
 
-    /// REPLACE PARTITION uses different max level and does not decrement max_block of DROP_RANGE for unknown (probably historical) reason.
-    auto max_level = std::numeric_limits<decltype(part_info.level)>::max();
-    if (!for_replace_partition)
+    if (for_replace_range)
     {
-        max_level = MergeTreePartInfo::MAX_LEVEL;
+        /// NOTE Do not decrement max block number for REPLACE_RANGE, because there are invariants:
+        /// - drop range for REPLACE PARTITION must contain at least 2 blocks (1 skipped block and at least 1 real block)
+        /// - drop range for MOVE PARTITION/ATTACH PARTITION FROM always contains 1 block
 
-        /// Empty partition.
-        if (right == 0)
-            return false;
-
-        --right;
+        /// NOTE UINT_MAX was previously used as max level for REPLACE/MOVE PARTITION (it was incorrect)
+        part_info = MergeTreePartInfo(partition_id, left, right, MergeTreePartInfo::MAX_LEVEL, mutation_version);
+        return right != 0;
     }
 
+    /// Empty partition.
+    if (right == 0)
+        return false;
+
+    --right;
+
     /// Artificial high level is chosen, to make this part "covering" all parts inside.
-    part_info = MergeTreePartInfo(partition_id, left, right, max_level, mutation_version);
+    part_info = MergeTreePartInfo(partition_id, left, right, MergeTreePartInfo::MAX_LEVEL, mutation_version);
     return true;
 }
 
-
-void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & query_context, bool throw_if_noop)
+void StorageReplicatedMergeTree::dropPartNoWaitNoThrow(const String & part_name)
 {
     assertNotReadonly();
     if (!is_leader)
-        throw Exception("DROP PART|PARTITION cannot be done on this replica because it is not a leader", ErrorCodes::NOT_A_LEADER);
+        throw Exception("DROP PART cannot be done on this replica because it is not a leader", ErrorCodes::NOT_A_LEADER);
 
     zkutil::ZooKeeperPtr zookeeper = getZooKeeper();
-
     LogEntry entry;
-    bool did_drop;
 
-    if (drop_part)
-    {
-        String part_name = partition->as<ASTLiteral &>().value.safeGet<String>();
-        did_drop = dropPart(zookeeper, part_name, entry, detach, throw_if_noop);
-    }
-    else
-    {
-        String partition_id = getPartitionIDFromQuery(partition, query_context);
-        did_drop = dropAllPartsInPartition(*zookeeper, partition_id, entry, query_context, detach);
-    }
+    dropPartImpl(zookeeper, part_name, entry, /*detach=*/ false, /*throw_if_noop=*/ false);
+}
+
+void StorageReplicatedMergeTree::dropPart(const String & part_name, bool detach, ContextPtr query_context)
+{
+    assertNotReadonly();
+    if (!is_leader)
+        throw Exception("DROP PART cannot be done on this replica because it is not a leader", ErrorCodes::NOT_A_LEADER);
+
+    zkutil::ZooKeeperPtr zookeeper = getZooKeeper();
+    LogEntry entry;
+
+    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);
+}
+
+void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool detach, ContextPtr query_context)
+{
+    assertNotReadonly();
+    if (!is_leader)
+        throw Exception("DROP PARTITION cannot be done on this replica because it is not a leader", ErrorCodes::NOT_A_LEADER);
+
+    zkutil::ZooKeeperPtr zookeeper = getZooKeeper();
+    LogEntry entry;
+
+    String partition_id = getPartitionIDFromQuery(partition, query_context);
+    bool did_drop = dropAllPartsInPartition(*zookeeper, partition_id, entry, query_context, detach);
 
     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 != 0)
-        {
-            if (query_context.getSettingsRef().replication_alter_partitions_sync == 1)
-                waitForReplicaToProcessLogEntry(replica_name, entry);
-            else
-                waitForAllReplicasToProcessLogEntry(entry);
-        }
-    }
+        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);
 
-    if (!drop_part)
-    {
-        String partition_id = getPartitionIDFromQuery(partition, query_context);
         cleanLastPartNode(partition_id);
     }
 }
 
 
 void StorageReplicatedMergeTree::truncate(
-    const ASTPtr &, const StorageMetadataPtr &, const Context & query_context, TableExclusiveLockHolder & table_lock)
+    const ASTPtr &, const StorageMetadataPtr &, ContextPtr query_context, TableExclusiveLockHolder & table_lock)
 {
     table_lock.release();   /// Truncate is done asynchronously.
 
@@ -4818,7 +5113,7 @@ void StorageReplicatedMergeTree::truncate(
 
     zkutil::ZooKeeperPtr zookeeper = getZooKeeper();
 
-    Strings partitions = zookeeper->getChildren(zookeeper_path + "/block_numbers");
+    Strings partitions = zookeeper->getChildren(fs::path(zookeeper_path) / "block_numbers");
 
     for (String & partition_id : partitions)
     {
@@ -4834,7 +5129,7 @@ PartitionCommandsResultInfo StorageReplicatedMergeTree::attachPartition(
     const ASTPtr & partition,
     const StorageMetadataPtr & metadata_snapshot,
     bool attach_part,
-    const Context & query_context)
+    ContextPtr query_context)
 {
     assertNotReadonly();
 
@@ -4843,7 +5138,7 @@ PartitionCommandsResultInfo StorageReplicatedMergeTree::attachPartition(
     MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, query_context, renamed_parts);
 
     /// TODO Allow to use quorum here.
-    ReplicatedMergeTreeBlockOutputStream output(*this, metadata_snapshot, 0, 0, 0, false, false, false,
+    ReplicatedMergeTreeBlockOutputStream output(*this, metadata_snapshot, 0, 0, 0, false, false, query_context,
         /*is_attach*/true);
 
     for (size_t i = 0; i < loaded_parts.size(); ++i)
@@ -4869,7 +5164,7 @@ PartitionCommandsResultInfo StorageReplicatedMergeTree::attachPartition(
 void StorageReplicatedMergeTree::checkTableCanBeDropped() const
 {
     auto table_id = getStorageID();
-    global_context.checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
+    getContext()->checkTableCanBeDropped(table_id.database_name, table_id.table_name, getTotalActiveSizeInBytes());
 }
 
 void StorageReplicatedMergeTree::checkTableCanBeRenamed() const
@@ -4893,7 +5188,7 @@ void StorageReplicatedMergeTree::rename(const String & new_path_to_table_data, c
         try
         {
             auto zookeeper = getZooKeeper();
-            zookeeper->set(replica_path + "/host", getReplicatedMergeTreeAddress().toString());
+            zookeeper->set(fs::path(replica_path) / "host", getReplicatedMergeTreeAddress().toString());
         }
         catch (Coordination::Exception & e)
         {
@@ -4927,8 +5222,14 @@ bool StorageReplicatedMergeTree::existsNodeCached(const std::string & path) cons
 
 std::optional<EphemeralLockInZooKeeper>
 StorageReplicatedMergeTree::allocateBlockNumber(
-    const String & partition_id, const zkutil::ZooKeeperPtr & zookeeper, const String & zookeeper_block_id_path) const
+    const String & partition_id, const zkutil::ZooKeeperPtr & zookeeper, const String & zookeeper_block_id_path, const String & zookeeper_path_prefix) const
 {
+    String zookeeper_table_path;
+    if (zookeeper_path_prefix.empty())
+        zookeeper_table_path = zookeeper_path;
+    else
+        zookeeper_table_path = zookeeper_path_prefix;
+
     /// Lets check for duplicates in advance, to avoid superfluous block numbers allocation
     Coordination::Requests deduplication_check_ops;
     if (!zookeeper_block_id_path.empty())
@@ -4937,8 +5238,8 @@ StorageReplicatedMergeTree::allocateBlockNumber(
         deduplication_check_ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_block_id_path, -1));
     }
 
-    String block_numbers_path = zookeeper_path + "/block_numbers";
-    String partition_path = block_numbers_path + "/" + partition_id;
+    String block_numbers_path = fs::path(zookeeper_table_path) / "block_numbers";
+    String partition_path = fs::path(block_numbers_path) / partition_id;
 
     if (!existsNodeCached(partition_path))
     {
@@ -4960,7 +5261,7 @@ StorageReplicatedMergeTree::allocateBlockNumber(
     try
     {
         lock = EphemeralLockInZooKeeper(
-            partition_path + "/block-", zookeeper_path + "/temp", *zookeeper, &deduplication_check_ops);
+            fs::path(partition_path) / "block-", fs::path(zookeeper_table_path) / "temp", *zookeeper, &deduplication_check_ops);
     }
     catch (const zkutil::KeeperMultiException & e)
     {
@@ -4984,11 +5285,11 @@ Strings StorageReplicatedMergeTree::waitForAllTableReplicasToProcessLogEntry(
     LOG_DEBUG(log, "Waiting for all replicas to process {}", entry.znode_name);
 
     auto zookeeper = getZooKeeper();
-    Strings replicas = zookeeper->getChildren(table_zookeeper_path + "/replicas");
+    Strings replicas = zookeeper->getChildren(fs::path(table_zookeeper_path) / "replicas");
     Strings unwaited;
     for (const String & replica : replicas)
     {
-        if (wait_for_non_active || zookeeper->exists(table_zookeeper_path + "/replicas/" + replica + "/is_active"))
+        if (wait_for_non_active || zookeeper->exists(fs::path(table_zookeeper_path) / "replicas" / replica / "is_active"))
         {
             if (!waitForTableReplicaToProcessLogEntry(table_zookeeper_path, replica, entry, wait_for_non_active))
                 unwaited.push_back(replica);
@@ -5038,7 +5339,7 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
     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(table_zookeeper_path + "/replicas/" + replica + "/is_active");
+        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;
     };
 
@@ -5060,7 +5361,7 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
         {
             zkutil::EventPtr event = std::make_shared<Poco::Event>();
 
-            String log_pointer = getZooKeeper()->get(table_zookeeper_path + "/replicas/" + replica + "/log_pointer", nullptr, 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)
                 break;
 
@@ -5077,9 +5378,9 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
           *  looking for a node with the same content. And if we do not find it - then the replica has already taken this entry in its queue.
           */
 
-        String log_pointer = getZooKeeper()->get(table_zookeeper_path + "/replicas/" + replica + "/log_pointer");
+        String log_pointer = getZooKeeper()->get(fs::path(table_zookeeper_path) / "replicas" / replica / "log_pointer");
 
-        Strings log_entries = getZooKeeper()->getChildren(table_zookeeper_path + "/log");
+        Strings log_entries = getZooKeeper()->getChildren(fs::path(table_zookeeper_path) / "log");
         UInt64 log_index = 0;
         bool found = false;
 
@@ -5091,7 +5392,7 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
                 continue;
 
             String log_entry_str;
-            bool exists = getZooKeeper()->tryGet(table_zookeeper_path + "/log/" + log_entry_name, log_entry_str);
+            bool exists = getZooKeeper()->tryGet(fs::path(table_zookeeper_path) / "log" / log_entry_name, log_entry_str);
             if (exists && entry_str == log_entry_str)
             {
                 found = true;
@@ -5109,7 +5410,7 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
             {
                 zkutil::EventPtr event = std::make_shared<Poco::Event>();
 
-                String log_pointer_new = getZooKeeper()->get(table_zookeeper_path + "/replicas/" + replica + "/log_pointer", nullptr, event);
+                String log_pointer_new = getZooKeeper()->get(fs::path(table_zookeeper_path) / "replicas" / replica / "log_pointer", nullptr, event);
                 if (!log_pointer_new.empty() && parse<UInt64>(log_pointer_new) > log_index)
                     break;
 
@@ -5134,13 +5435,13 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
       * Therefore, we search by comparing the content.
       */
 
-    Strings queue_entries = getZooKeeper()->getChildren(table_zookeeper_path + "/replicas/" + replica + "/queue");
+    Strings queue_entries = getZooKeeper()->getChildren(fs::path(table_zookeeper_path) / "replicas" / replica / "queue");
     String queue_entry_to_wait_for;
 
     for (const String & entry_name : queue_entries)
     {
         String queue_entry_str;
-        bool exists = getZooKeeper()->tryGet(table_zookeeper_path + "/replicas/" + replica + "/queue/" + entry_name, queue_entry_str);
+        bool exists = getZooKeeper()->tryGet(fs::path(table_zookeeper_path) / "replicas" / replica / "queue" / entry_name, queue_entry_str);
         if (exists && queue_entry_str == entry_str)
         {
             queue_entry_to_wait_for = entry_name;
@@ -5158,7 +5459,7 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
     LOG_DEBUG(log, "Waiting for {} to disappear from {} queue", queue_entry_to_wait_for, replica);
 
     /// Third - wait until the entry disappears from the replica queue or replica become inactive.
-    String path_to_wait_on = table_zookeeper_path + "/replicas/" + replica + "/queue/" + queue_entry_to_wait_for;
+    String path_to_wait_on = fs::path(table_zookeeper_path) / "replicas" / replica / "queue" / queue_entry_to_wait_for;
 
     return getZooKeeper()->waitForDisappear(path_to_wait_on, stop_waiting);
 }
@@ -5200,27 +5501,22 @@ void StorageReplicatedMergeTree::getStatus(Status & res, bool with_zk_fields)
     {
         try
         {
-            auto log_entries = zookeeper->getChildren(zookeeper_path + "/log");
+            auto log_entries = zookeeper->getChildren(fs::path(zookeeper_path) / "log");
 
-            if (log_entries.empty())
-            {
-                res.log_max_index = 0;
-            }
-            else
+            if (!log_entries.empty())
             {
                 const String & last_log_entry = *std::max_element(log_entries.begin(), log_entries.end());
                 res.log_max_index = parse<UInt64>(last_log_entry.substr(strlen("log-")));
             }
 
-            String log_pointer_str = zookeeper->get(replica_path + "/log_pointer");
+            String log_pointer_str = zookeeper->get(fs::path(replica_path) / "log_pointer");
             res.log_pointer = log_pointer_str.empty() ? 0 : parse<UInt64>(log_pointer_str);
 
-            auto all_replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+            auto all_replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
             res.total_replicas = all_replicas.size();
 
-            res.active_replicas = 0;
             for (const String & replica : all_replicas)
-                if (zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active"))
+                if (zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "is_active"))
                     ++res.active_replicas;
         }
         catch (const Coordination::Exception &)
@@ -5237,6 +5533,11 @@ void StorageReplicatedMergeTree::getQueue(LogEntriesData & res, String & replica
     queue.getEntries(res);
 }
 
+std::vector<PartMovesBetweenShardsOrchestrator::Entry> StorageReplicatedMergeTree::getPartMovesBetweenShardsEntries()
+{
+    return part_moves_between_shards_orchestrator.getEntries();
+}
+
 time_t StorageReplicatedMergeTree::getAbsoluteDelay() const
 {
     time_t min_unprocessed_insert_time = 0;
@@ -5298,7 +5599,7 @@ void StorageReplicatedMergeTree::getReplicaDelays(time_t & out_absolute_delay, t
     time_t max_replicas_unprocessed_insert_time = 0;
     bool have_replica_with_nothing_unprocessed = false;
 
-    Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+    Strings replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
 
     for (const auto & replica : replicas)
     {
@@ -5306,11 +5607,11 @@ void StorageReplicatedMergeTree::getReplicaDelays(time_t & out_absolute_delay, t
             continue;
 
         /// Skip dead replicas.
-        if (!zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active"))
+        if (!zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "is_active"))
             continue;
 
         String value;
-        if (!zookeeper->tryGet(zookeeper_path + "/replicas/" + replica + "/min_unprocessed_insert_time", value))
+        if (!zookeeper->tryGet(fs::path(zookeeper_path) / "replicas" / replica / "min_unprocessed_insert_time", value))
             continue;
 
         time_t replica_time = value.empty() ? 0 : parse<time_t>(value);
@@ -5344,57 +5645,71 @@ void StorageReplicatedMergeTree::getReplicaDelays(time_t & out_absolute_delay, t
     }
 }
 
-
 void StorageReplicatedMergeTree::fetchPartition(
     const ASTPtr & partition,
     const StorageMetadataPtr & metadata_snapshot,
     const String & from_,
-    const Context & query_context)
+    bool fetch_part,
+    ContextPtr query_context)
 {
     Macros::MacroExpansionInfo info;
-    info.expand_special_macros_only = false;
+    info.expand_special_macros_only = false; //-V1048
     info.table_id = getStorageID();
     info.table_id.uuid = UUIDHelpers::Nil;
-    auto expand_from = query_context.getMacros()->expand(from_, info);
+    auto expand_from = query_context->getMacros()->expand(from_, info);
     String auxiliary_zookeeper_name = extractZooKeeperName(expand_from);
     String from = extractZooKeeperPath(expand_from);
     if (from.empty())
         throw Exception("ZooKeeper path should not be empty", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-    String partition_id = getPartitionIDFromQuery(partition, query_context);
     zkutil::ZooKeeperPtr zookeeper;
     if (auxiliary_zookeeper_name != default_zookeeper_name)
-    {
-        zookeeper = global_context.getAuxiliaryZooKeeper(auxiliary_zookeeper_name);
-
-        LOG_INFO(log, "Will fetch partition {} from shard {} (auxiliary zookeeper '{}')", partition_id, from_, auxiliary_zookeeper_name);
-    }
+        zookeeper = getContext()->getAuxiliaryZooKeeper(auxiliary_zookeeper_name);
     else
-    {
         zookeeper = getZooKeeper();
 
-        LOG_INFO(log, "Will fetch partition {} from shard {}", partition_id, from_);
-    }
-
     if (from.back() == '/')
         from.resize(from.size() - 1);
 
+    if (fetch_part)
+    {
+        String part_name = partition->as<ASTLiteral &>().value.safeGet<String>();
+        auto part_path = findReplicaHavingPart(part_name, from, zookeeper);
+
+        if (part_path.empty())
+            throw Exception(ErrorCodes::NO_REPLICA_HAS_PART, "Part {} does not exist on any replica", part_name);
+        /** Let's check that there is no such part in the `detached` directory (where we will write the downloaded parts).
+          * Unreliable (there is a race condition) - such a part may appear a little later.
+          */
+        if (checkIfDetachedPartExists(part_name))
+            throw Exception(ErrorCodes::DUPLICATE_DATA_PART, "Detached part " + part_name + " already exists.");
+        LOG_INFO(log, "Will fetch part {} from shard {} (zookeeper '{}')", part_name, from_, auxiliary_zookeeper_name);
+
+        try
+        {
+            /// part name , metadata, part_path , true, 0, zookeeper
+            if (!fetchPart(part_name, metadata_snapshot, part_path, true, 0, zookeeper))
+                throw Exception(ErrorCodes::UNFINISHED, "Failed to fetch part {} from {}", part_name, from_);
+        }
+        catch (const DB::Exception & e)
+        {
+            if (e.code() != ErrorCodes::RECEIVED_ERROR_FROM_REMOTE_IO_SERVER && e.code() != ErrorCodes::RECEIVED_ERROR_TOO_MANY_REQUESTS
+                && e.code() != ErrorCodes::CANNOT_READ_ALL_DATA)
+                throw;
+
+            LOG_INFO(log, e.displayText());
+        }
+        return;
+    }
+
+    String partition_id = getPartitionIDFromQuery(partition, query_context);
+    LOG_INFO(log, "Will fetch partition {} from shard {} (zookeeper '{}')", partition_id, from_, auxiliary_zookeeper_name);
 
     /** Let's check that there is no such partition in the `detached` directory (where we will write the downloaded parts).
       * Unreliable (there is a race condition) - such a partition may appear a little later.
       */
-    Poco::DirectoryIterator dir_end;
-    for (const std::string & path : getDataPaths())
-    {
-        for (Poco::DirectoryIterator dir_it{path + "detached/"}; dir_it != dir_end; ++dir_it)
-        {
-            MergeTreePartInfo part_info;
-            if (MergeTreePartInfo::tryParsePartName(dir_it.name(), &part_info, format_version)
-                && part_info.partition_id == partition_id)
-                throw Exception("Detached partition " + partition_id + " already exists.", ErrorCodes::PARTITION_ALREADY_EXISTS);
-        }
-
-    }
+    if (checkIfDetachedPartitionExists(partition_id))
+        throw Exception("Detached partition " + partition_id + " already exists.", ErrorCodes::PARTITION_ALREADY_EXISTS);
 
     zkutil::Strings replicas;
     zkutil::Strings active_replicas;
@@ -5403,13 +5718,13 @@ void StorageReplicatedMergeTree::fetchPartition(
     {
 
         /// List of replicas of source shard.
-        replicas = zookeeper->getChildren(from + "/replicas");
+        replicas = zookeeper->getChildren(fs::path(from) / "replicas");
 
         /// Leave only active replicas.
         active_replicas.reserve(replicas.size());
 
         for (const String & replica : replicas)
-            if (zookeeper->exists(from + "/replicas/" + replica + "/is_active"))
+            if (zookeeper->exists(fs::path(from) / "replicas" / replica / "is_active"))
                 active_replicas.push_back(replica);
 
         if (active_replicas.empty())
@@ -5426,13 +5741,13 @@ void StorageReplicatedMergeTree::fetchPartition(
 
         for (const String & replica : active_replicas)
         {
-            String current_replica_path = from + "/replicas/" + replica;
+            String current_replica_path = fs::path(from) / "replicas" / replica;
 
-            String log_pointer_str = zookeeper->get(current_replica_path + "/log_pointer");
+            String log_pointer_str = zookeeper->get(fs::path(current_replica_path) / "log_pointer");
             Int64 log_pointer = log_pointer_str.empty() ? 0 : parse<UInt64>(log_pointer_str);
 
             Coordination::Stat stat;
-            zookeeper->get(current_replica_path + "/queue", &stat);
+            zookeeper->get(fs::path(current_replica_path) / "queue", &stat);
             size_t queue_size = stat.numChildren;
 
             if (log_pointer > max_log_pointer
@@ -5450,7 +5765,7 @@ void StorageReplicatedMergeTree::fetchPartition(
 
     LOG_INFO(log, "Found {} replicas, {} of them are active. Selected {} to fetch from.", replicas.size(), active_replicas.size(), best_replica);
 
-    String best_replica_path = from + "/replicas/" + best_replica;
+    String best_replica_path = fs::path(from) / "replicas" / best_replica;
 
     /// Let's find out which parts are on the best replica.
 
@@ -5466,10 +5781,10 @@ void StorageReplicatedMergeTree::fetchPartition(
         if (try_no)
             LOG_INFO(log, "Some of parts ({}) are missing. Will try to fetch covering parts.", missing_parts.size());
 
-        if (try_no >= query_context.getSettings().max_fetch_partition_retries_count)
+        if (try_no >= query_context->getSettings().max_fetch_partition_retries_count)
             throw Exception("Too many retries to fetch parts from " + best_replica_path, ErrorCodes::TOO_MANY_RETRIES_TO_FETCH_PARTS);
 
-        Strings parts = zookeeper->getChildren(best_replica_path + "/parts");
+        Strings parts = zookeeper->getChildren(fs::path(best_replica_path) / "parts");
         ActiveDataPartSet active_parts_set(format_version, parts);
         Strings parts_to_fetch;
 
@@ -5531,7 +5846,7 @@ void StorageReplicatedMergeTree::fetchPartition(
 }
 
 
-void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const Context & query_context)
+void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, ContextPtr query_context)
 {
     /// Overview of the mutation algorithm.
     ///
@@ -5590,7 +5905,7 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const
     mutation_entry.source_replica = replica_name;
     mutation_entry.commands = commands;
 
-    const String mutations_path = zookeeper_path + "/mutations";
+    const String mutations_path = fs::path(zookeeper_path) / "mutations";
     const auto zookeeper = getZooKeeper();
 
     /// Update the mutations_path node when creating the mutation and check its version to ensure that
@@ -5613,9 +5928,9 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const
         Coordination::Requests requests;
         requests.emplace_back(zkutil::makeSetRequest(mutations_path, String(), mutations_stat.version));
         requests.emplace_back(zkutil::makeCreateRequest(
-            mutations_path + "/", mutation_entry.toString(), zkutil::CreateMode::PersistentSequential));
+            fs::path(mutations_path) / "", mutation_entry.toString(), zkutil::CreateMode::PersistentSequential));
 
-        if (auto txn = query_context.getZooKeeperMetadataTransaction())
+        if (auto txn = query_context->getZooKeeperMetadataTransaction())
             txn->moveOpsTo(requests);
 
         Coordination::Responses responses;
@@ -5640,7 +5955,7 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, const
             throw Coordination::Exception("Unable to create a mutation znode", rc);
     }
 
-    waitMutation(mutation_entry.znode_name, query_context.getSettingsRef().mutations_sync);
+    waitMutation(mutation_entry.znode_name, query_context->getSettingsRef().mutations_sync);
 }
 
 void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t mutations_sync) const
@@ -5652,7 +5967,7 @@ 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(zookeeper_path + "/replicas");
+        replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
     else if (mutations_sync == 1) /// just wait for ourself
         replicas.push_back(replica_name);
 
@@ -5684,11 +5999,61 @@ CancellationCode StorageReplicatedMergeTree::killMutation(const String & mutatio
     {
         const String & partition_id = pair.first;
         Int64 block_number = pair.second;
-        global_context.getMergeList().cancelPartMutations(partition_id, block_number);
+        getContext()->getMergeList().cancelPartMutations(partition_id, block_number);
     }
     return CancellationCode::CancelSent;
 }
 
+void StorageReplicatedMergeTree::removePartsFromFilesystem(const DataPartsVector & parts)
+{
+    auto remove_part = [&](const auto & part)
+    {
+        LOG_DEBUG(log, "Removing part from filesystem {}", part.name);
+        try
+        {
+            bool keep_s3 = !this->unlockSharedData(part);
+            part.remove(keep_s3);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "There is a problem with deleting part " + part.name + " from filesystem");
+        }
+    };
+
+    const auto settings = getSettings();
+    if (settings->max_part_removal_threads > 1 && parts.size() > settings->concurrent_part_removal_threshold)
+    {
+        /// Parallel parts removal.
+
+        size_t num_threads = std::min<size_t>(settings->max_part_removal_threads, parts.size());
+        ThreadPool pool(num_threads);
+
+        /// NOTE: Under heavy system load you may get "Cannot schedule a task" from ThreadPool.
+        for (const DataPartPtr & part : parts)
+        {
+            pool.scheduleOrThrowOnError([&, thread_group = CurrentThread::getGroup()]
+            {
+                SCOPE_EXIT_SAFE(
+                    if (thread_group)
+                        CurrentThread::detachQueryIfNotDetached();
+                );
+                if (thread_group)
+                    CurrentThread::attachTo(thread_group);
+
+                remove_part(*part);
+            });
+        }
+
+        pool.wait();
+    }
+    else
+    {
+        for (const DataPartPtr & part : parts)
+        {
+            remove_part(*part);
+        }
+    }
+}
 
 void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
 {
@@ -5714,26 +6079,10 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
     }
     parts.clear();
 
-    auto remove_parts_from_filesystem = [log=log, this] (const DataPartsVector & parts_to_remove)
-    {
-        for (const auto & part : parts_to_remove)
-        {
-            try
-            {
-                bool keep_s3 = !this->unlockSharedData(*part);
-                part->remove(keep_s3);
-            }
-            catch (...)
-            {
-                tryLogCurrentException(log, "There is a problem with deleting part " + part->name + " from filesystem");
-            }
-        }
-    };
-
     /// Delete duplicate parts from filesystem
     if (!parts_to_delete_only_from_filesystem.empty())
     {
-        remove_parts_from_filesystem(parts_to_delete_only_from_filesystem);
+        removePartsFromFilesystem(parts_to_delete_only_from_filesystem);
         removePartsFinally(parts_to_delete_only_from_filesystem);
 
         LOG_DEBUG(log, "Removed {} old duplicate parts", parts_to_delete_only_from_filesystem.size());
@@ -5778,7 +6127,7 @@ void StorageReplicatedMergeTree::clearOldPartsAndRemoveFromZK()
     /// Remove parts from filesystem and finally from data_parts
     if (!parts_to_remove_from_filesystem.empty())
     {
-        remove_parts_from_filesystem(parts_to_remove_from_filesystem);
+        removePartsFromFilesystem(parts_to_remove_from_filesystem);
         removePartsFinally(parts_to_remove_from_filesystem);
 
         LOG_DEBUG(log, "Removed {} old parts", parts_to_remove_from_filesystem.size());
@@ -5813,7 +6162,7 @@ bool StorageReplicatedMergeTree::tryRemovePartsFromZooKeeperWithRetries(const St
             exists_futures.reserve(part_names.size());
             for (const String & part_name : part_names)
             {
-                String part_path = replica_path + "/parts/" + part_name;
+                String part_path = fs::path(replica_path) / "parts" / part_name;
                 exists_futures.emplace_back(zookeeper->asyncExists(part_path));
             }
 
@@ -5826,7 +6175,7 @@ bool StorageReplicatedMergeTree::tryRemovePartsFromZooKeeperWithRetries(const St
                 {
                     Coordination::Requests ops;
                     removePartFromZooKeeper(part_names[i], ops, exists_resp.stat.numChildren > 0);
-                    remove_futures.emplace_back(zookeeper->tryAsyncMulti(ops));
+                    remove_futures.emplace_back(zookeeper->asyncTryMultiNoThrow(ops));
                 }
             }
 
@@ -5876,7 +6225,7 @@ void StorageReplicatedMergeTree::removePartsFromZooKeeper(
         /// if zk session will be dropped
         for (const String & part_name : part_names)
         {
-            String part_path = replica_path + "/parts/" + part_name;
+            String part_path = fs::path(replica_path) / "parts" / part_name;
             exists_futures.emplace_back(zookeeper->asyncExists(part_path));
         }
 
@@ -5887,7 +6236,7 @@ void StorageReplicatedMergeTree::removePartsFromZooKeeper(
             {
                 Coordination::Requests ops;
                 removePartFromZooKeeper(part_names[i], ops, exists_resp.stat.numChildren > 0);
-                remove_futures.emplace_back(zookeeper->tryAsyncMulti(ops));
+                remove_futures.emplace_back(zookeeper->asyncTryMultiNoThrow(ops));
             }
             else
             {
@@ -5935,7 +6284,7 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
     Coordination::Requests & ops, zkutil::ZooKeeper & zookeeper, const String & partition_id, Int64 min_block_num, Int64 max_block_num)
 {
     Strings blocks;
-    if (Coordination::Error::ZOK != zookeeper.tryGetChildren(zookeeper_path + "/blocks", blocks))
+    if (Coordination::Error::ZOK != zookeeper.tryGetChildren(fs::path(zookeeper_path) / "blocks", blocks))
         throw Exception(zookeeper_path + "/blocks doesn't exist", ErrorCodes::NOT_FOUND_NODE);
 
     String partition_prefix = partition_id + "_";
@@ -5944,7 +6293,7 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
     {
         if (startsWith(block_id, partition_prefix))
         {
-            String path = zookeeper_path + "/blocks/" + block_id;
+            String path = fs::path(zookeeper_path) / "blocks" / block_id;
             get_futures.emplace_back(path, zookeeper.asyncTryGet(path));
         }
     }
@@ -5983,18 +6332,18 @@ void StorageReplicatedMergeTree::clearBlocksInPartition(
 }
 
 void StorageReplicatedMergeTree::replacePartitionFrom(
-    const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & context)
+    const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr query_context)
 {
     /// First argument is true, because we possibly will add new data to current table.
-    auto lock1 = lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = source_table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+    auto lock1 = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+    auto lock2 = source_table->lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
 
     auto source_metadata_snapshot = source_table->getInMemoryMetadataPtr();
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
     Stopwatch watch;
     MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, metadata_snapshot);
-    String partition_id = getPartitionIDFromQuery(partition, context);
+    String partition_id = getPartitionIDFromQuery(partition, query_context);
 
     DataPartsVector src_all_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     DataPartsVector src_parts;
@@ -6008,32 +6357,34 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     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;
+    zookeeper->get(alter_partition_version_path, &alter_partition_version_stat);
+
     /// Firstly, generate last block number and compute drop_range
     /// NOTE: Even if we make ATTACH PARTITION instead of REPLACE PARTITION drop_range will not be empty, it will contain a block.
     /// So, such case has special meaning, if drop_range contains only one block it means that nothing to drop.
     /// TODO why not to add normal DROP_RANGE entry to replication queue if `replace` is true?
     MergeTreePartInfo drop_range;
-    getFakePartCoveringAllPartsInPartition(partition_id, drop_range, true);
+    std::optional<EphemeralLockInZooKeeper> delimiting_block_lock;
+    bool partition_was_empty = !getFakePartCoveringAllPartsInPartition(partition_id, drop_range, delimiting_block_lock, true);
+    if (replace && partition_was_empty)
+    {
+        /// Nothing to drop, will just attach new parts
+        LOG_INFO(log, "Partition {} was empty, REPLACE PARTITION will work as ATTACH PARTITION FROM", drop_range.partition_id);
+        replace = false;
+    }
+
     if (!replace)
-        drop_range.min_block = drop_range.max_block;
+    {
+        /// It's ATTACH PARTITION FROM, not REPLACE PARTITION. We have to reset drop range
+        drop_range = makeDummyDropRangeForMovePartitionOrAttachPartitionFrom(partition_id);
+    }
+
+    assert(replace == !LogEntry::ReplaceRangeEntry::isMovePartitionOrAttachFrom(drop_range));
 
     String drop_range_fake_part_name = getPartNamePossiblyFake(format_version, drop_range);
 
-    if (drop_range.getBlocksCount() > 1)
-    {
-        /// We have to prohibit merges in drop_range, since new merge log entry appeared after this REPLACE FROM entry
-        ///  could produce new merged part instead in place of just deleted parts.
-        /// It is better to prohibit them on leader replica (like DROP PARTITION makes),
-        ///  but it is inconvenient for a user since he could actually use source table from this replica.
-        /// Therefore prohibit merges on the initializer server now and on the remaining servers when log entry will be executed.
-        /// It does not provides strong guarantees, but is suitable for intended use case (assume merges are quite rare).
-
-        {
-            std::lock_guard merge_selecting_lock(merge_selecting_mutex);
-            queue.disableMergesInBlockRange(drop_range_fake_part_name);
-        }
-    }
-
     for (const auto & src_part : src_all_parts)
     {
         /// We also make some kind of deduplication to avoid duplicated parts in case of ATTACH PARTITION
@@ -6052,7 +6403,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
         else
             LOG_INFO(log, "Trying to attach {} with hash_hex {}", src_part->name, hash_hex);
 
-        String block_id_path = replace ? "" : (zookeeper_path + "/blocks/" + partition_id + "_replace_from_" + hash_hex);
+        String block_id_path = replace ? "" : (fs::path(zookeeper_path) / "blocks" / (partition_id + "_replace_from_" + hash_hex));
 
         auto lock = allocateBlockNumber(partition_id, zookeeper, block_id_path);
         if (!lock)
@@ -6093,10 +6444,6 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
         entry_replace.columns_version = -1;
     }
 
-    /// We are almost ready to commit changes, remove fetches and merges from drop range
-    /// FIXME it's unsafe to remove queue entries before we actually commit REPLACE_RANGE to replication log
-    queue.removePartProducingOpsInRange(zookeeper, drop_range, entry);
-
     /// Remove deduplication block_ids of replacing parts
     if (replace)
         clearBlocksInPartition(*zookeeper, drop_range.partition_id, drop_range.max_block, drop_range.max_block);
@@ -6120,11 +6467,16 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
             }
         }
 
-        if (auto txn = context.getZooKeeperMetadataTransaction())
+        if (auto txn = query_context->getZooKeeperMetadataTransaction())
             txn->moveOpsTo(ops);
 
-        ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));  /// Just update version
-        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
+        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));
+        /// 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));
 
         Transaction transaction(*this);
         {
@@ -6134,21 +6486,27 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
                 renameTempPartAndReplace(part, nullptr, &transaction, data_parts_lock);
         }
 
-        op_results = zookeeper->multi(ops);
+        Coordination::Error code = zookeeper->tryMulti(ops, op_results);
+        if (code == Coordination::Error::ZOK)
+            delimiting_block_lock->assumeUnlocked();
+        else if (code == Coordination::Error::ZBADVERSION)
+            throw Exception(ErrorCodes::CANNOT_ASSIGN_ALTER, "Cannot assign ALTER PARTITION, because another ALTER PARTITION query was concurrently executed");
+        else
+            zkutil::KeeperMultiException::check(code, ops, op_results);
 
         {
             auto data_parts_lock = lockParts();
 
             transaction.commit(&data_parts_lock);
             if (replace)
-                parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
+                parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, data_parts_lock);
         }
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 
@@ -6166,7 +6524,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     cleanup_thread.wakeup();
 
     /// If necessary, wait until the operation is performed on all replicas.
-    if (context.getSettingsRef().replication_alter_partitions_sync > 1)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
     {
         lock2.reset();
         lock1.reset();
@@ -6174,10 +6532,10 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     }
 }
 
-void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & query_context)
+void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr query_context)
 {
-    auto lock1 = lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
-    auto lock2 = dest_table->lockForShare(query_context.getCurrentQueryId(), query_context.getSettingsRef().lock_acquire_timeout);
+    auto lock1 = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
+    auto lock2 = dest_table->lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
 
     auto dest_table_storage = std::dynamic_pointer_cast<StorageReplicatedMergeTree>(dest_table);
     if (!dest_table_storage)
@@ -6212,17 +6570,16 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
     /// A range for log entry to remove parts from the source table (myself).
 
     MergeTreePartInfo drop_range;
-    getFakePartCoveringAllPartsInPartition(partition_id, drop_range, true);
+    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);
 
-    if (drop_range.getBlocksCount() > 1)
-    {
-        std::lock_guard merge_selecting_lock(merge_selecting_mutex);
-        queue.disableMergesInBlockRange(drop_range_fake_part_name);
-    }
-
     /// 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);
+
     for (const auto & src_part : src_all_parts)
     {
         if (!dest_table_storage->canReplacePartition(src_part))
@@ -6256,18 +6613,13 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
         entry_delete.type = LogEntry::DROP_RANGE;
         entry_delete.source_replica = replica_name;
         entry_delete.new_part_name = drop_range_fake_part_name;
-        entry_delete.detach = false;
+        entry_delete.detach = false; //-V1048
         entry_delete.create_time = time(nullptr);
     }
 
     ReplicatedMergeTreeLogEntryData entry;
     {
-        MergeTreePartInfo drop_range_dest;
-        drop_range_dest.partition_id = drop_range.partition_id;
-        drop_range_dest.max_block = drop_range.max_block;
-        drop_range_dest.min_block = drop_range.max_block;
-        drop_range_dest.level = drop_range.level;
-        drop_range_dest.mutation = drop_range.mutation;
+        MergeTreePartInfo drop_range_dest = makeDummyDropRangeForMovePartitionOrAttachPartitionFrom(partition_id);
 
         entry.type = ReplicatedMergeTreeLogEntryData::REPLACE_RANGE;
         entry.source_replica = dest_table_storage->replica_name;
@@ -6287,8 +6639,6 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
         entry_replace.columns_version = -1;
     }
 
-    queue.removePartProducingOpsInRange(zookeeper, drop_range, entry);
-
     clearBlocksInPartition(*zookeeper, drop_range.partition_id, drop_range.max_block, drop_range.max_block);
 
     DataPartsVector parts_to_remove;
@@ -6309,7 +6659,12 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
             }
         }
 
-        ops.emplace_back(zkutil::makeCreateRequest(dest_table_storage->zookeeper_path + "/log/log-",
+        /// 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));
+        /// 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-",
                                                    entry.toString(), zkutil::CreateMode::PersistentSequential));
 
         {
@@ -6324,17 +6679,21 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
             for (MutableDataPartPtr & part : dst_parts)
                 dest_table_storage->renameTempPartAndReplace(part, nullptr, &transaction, lock);
 
-            op_results = zookeeper->multi(ops);
+            Coordination::Error code = zookeeper->tryMulti(ops, op_results);
+            if (code == Coordination::Error::ZBADVERSION)
+                throw Exception(ErrorCodes::CANNOT_ASSIGN_ALTER, "Cannot assign ALTER PARTITION, because another ALTER PARTITION query was concurrently executed");
+            else
+                zkutil::KeeperMultiException::check(code, ops, op_results);
 
-            parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, lock);
+            parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, lock);
             transaction.commit(&lock);
         }
 
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
     }
     catch (...)
     {
-        PartLog::addNewParts(global_context, dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
+        PartLog::addNewParts(getContext(), dst_parts, watch.elapsed(), ExecutionStatus::fromCurrentException());
         throw;
     }
 
@@ -6349,24 +6708,38 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
     parts_to_remove.clear();
     cleanup_thread.wakeup();
 
-    if (query_context.getSettingsRef().replication_alter_partitions_sync > 1)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
     {
         lock2.reset();
         dest_table_storage->waitForAllReplicasToProcessLogEntry(entry);
     }
 
-    Coordination::Requests ops_dest;
+    /// 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);
 
-    ops_dest.emplace_back(zkutil::makeCreateRequest(
-        zookeeper_path + "/log/log-", entry_delete.toString(), zkutil::CreateMode::PersistentSequential));
-    ops_dest.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));  /// Just update version
+    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);
 
-    op_results = zookeeper->multi(ops_dest);
+    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);
 
     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)
+    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
     {
         lock1.reset();
         waitForAllReplicasToProcessLogEntry(entry_delete);
@@ -6376,6 +6749,100 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
     cleanLastPartNode(partition_id);
 }
 
+void StorageReplicatedMergeTree::movePartitionToShard(
+    const ASTPtr & partition, bool move_part, const String & to, ContextPtr /*query_context*/)
+{
+    /// This is a lightweight operation that only optimistically checks if it could succeed and queues tasks.
+
+    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))
+        throw Exception("Source and destination are the same", ErrorCodes::BAD_ARGUMENTS);
+
+    auto zookeeper = getZooKeeper();
+
+    String part_name = partition->as<ASTLiteral &>().value.safeGet<String>();
+    auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
+
+    auto part = getPartIfExists(part_info, {MergeTreeDataPartState::Committed});
+    if (!part)
+        throw Exception(ErrorCodes::NO_SUCH_DATA_PART, "Part {} not found locally", part_name);
+
+    if (part->uuid == UUIDHelpers::Nil)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Part {} does not have an uuid assigned and it can't be moved between shards", part_name);
+
+
+    ReplicatedMergeTreeMergePredicate merge_pred = queue.getMergePredicate(zookeeper);
+
+    /// The following block is pretty much copy & paste from StorageReplicatedMergeTree::dropPart to avoid conflicts while this is WIP.
+    /// Extract it to a common method and re-use it before merging.
+    {
+        if (partIsLastQuorumPart(part->info))
+        {
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Part {} is last inserted part with quorum in partition. Would not be able to drop", part_name);
+        }
+
+        /// canMergeSinglePart is overlapping with dropPart, let's try to use the same code.
+        String out_reason;
+        if (!merge_pred.canMergeSinglePart(part, &out_reason))
+            throw Exception(ErrorCodes::PART_IS_TEMPORARILY_LOCKED, "Part is busy, reason: " + out_reason);
+    }
+
+    {
+        /// Optimistic check that for compatible destination table structure.
+        checkTableStructure(to, getInMemoryMetadataPtr());
+    }
+
+    PinnedPartUUIDs src_pins;
+    PinnedPartUUIDs dst_pins;
+
+    {
+        String s = zookeeper->get(zookeeper_path + "/pinned_part_uuids", &src_pins.stat);
+        src_pins.fromString(s);
+    }
+
+    {
+        String s = zookeeper->get(to + "/pinned_part_uuids", &dst_pins.stat);
+        dst_pins.fromString(s);
+    }
+
+    if (src_pins.part_uuids.contains(part->uuid) || dst_pins.part_uuids.contains(part->uuid))
+        throw Exception(ErrorCodes::PART_IS_TEMPORARILY_LOCKED, "Part {} has it's uuid ({}) already pinned.", part_name, toString(part->uuid));
+
+    src_pins.part_uuids.insert(part->uuid);
+    dst_pins.part_uuids.insert(part->uuid);
+
+    PartMovesBetweenShardsOrchestrator::Entry part_move_entry;
+    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();
+    part_move_entry.part_name = part->name;
+    part_move_entry.part_uuid = part->uuid;
+    part_move_entry.to_shard = to;
+
+    Coordination::Requests ops;
+    ops.emplace_back(zkutil::makeCheckRequest(zookeeper_path + "/log", merge_pred.getVersion())); /// Make sure no new events were added to the log.
+    ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/pinned_part_uuids", src_pins.toString(), src_pins.stat.version));
+    ops.emplace_back(zkutil::makeSetRequest(to + "/pinned_part_uuids", dst_pins.toString(), dst_pins.stat.version));
+    ops.emplace_back(zkutil::makeCreateRequest(
+        part_moves_between_shards_orchestrator.entries_znode_path + "/task-",
+        part_move_entry.toString(),
+        zkutil::CreateMode::PersistentSequential));
+
+    Coordination::Responses responses;
+    Coordination::Error rc = zookeeper->tryMulti(ops, responses);
+    zkutil::KeeperMultiException::check(rc, ops, responses);
+
+    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: Add support for `replication_alter_partitions_sync`.
+}
+
 void StorageReplicatedMergeTree::getCommitPartOps(
     Coordination::Requests & ops,
     MutableDataPartPtr & part,
@@ -6398,22 +6865,22 @@ void StorageReplicatedMergeTree::getCommitPartOps(
     if (storage_settings_ptr->use_minimalistic_part_header_in_zookeeper)
     {
         ops.emplace_back(zkutil::makeCreateRequest(
-            replica_path + "/parts/" + part->name,
+            fs::path(replica_path) / "parts" / part->name,
             ReplicatedMergeTreePartHeader::fromColumnsAndChecksums(part->getColumns(), part->checksums).toString(),
             zkutil::CreateMode::Persistent));
     }
     else
     {
         ops.emplace_back(zkutil::makeCreateRequest(
-            replica_path + "/parts/" + part->name,
+            fs::path(replica_path) / "parts" / part->name,
             "",
             zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(
-            replica_path + "/parts/" + part->name + "/columns",
+            fs::path(replica_path) / "parts" / part->name / "columns",
             part->getColumns().toString(),
             zkutil::CreateMode::Persistent));
         ops.emplace_back(zkutil::makeCreateRequest(
-            replica_path + "/parts/" + part->name + "/checksums",
+            fs::path(replica_path) / "parts" / part->name / "checksums",
             getChecksumsForZooKeeper(part->checksums),
             zkutil::CreateMode::Persistent));
     }
@@ -6421,16 +6888,16 @@ void StorageReplicatedMergeTree::getCommitPartOps(
 
 ReplicatedMergeTreeAddress StorageReplicatedMergeTree::getReplicatedMergeTreeAddress() const
 {
-    auto host_port = global_context.getInterserverIOAddress();
+    auto host_port = getContext()->getInterserverIOAddress();
     auto table_id = getStorageID();
 
     ReplicatedMergeTreeAddress res;
     res.host = host_port.first;
     res.replication_port = host_port.second;
-    res.queries_port = global_context.getTCPPort();
+    res.queries_port = getContext()->getTCPPort();
     res.database = table_id.database_name;
     res.table = table_id.table_name;
-    res.scheme = global_context.getInterserverScheme();
+    res.scheme = getContext()->getInterserverScheme();
     return res;
 }
 
@@ -6501,7 +6968,7 @@ bool StorageReplicatedMergeTree::waitForShrinkingQueueSize(size_t queue_size, UI
     return true;
 }
 
-bool StorageReplicatedMergeTree::dropPart(
+bool StorageReplicatedMergeTree::dropPartImpl(
     zkutil::ZooKeeperPtr & zookeeper, String part_name, LogEntry & entry, bool detach, bool throw_if_noop)
 {
     LOG_TRACE(log, "Will try to insert a log entry to DROP_RANGE for part: " + part_name);
@@ -6564,9 +7031,10 @@ bool StorageReplicatedMergeTree::dropPart(
         entry.detach = detach;
         entry.create_time = time(nullptr);
 
-        ops.emplace_back(zkutil::makeCheckRequest(zookeeper_path + "/log", merge_pred.getVersion())); /// Make sure no new events were added to the log.
-        ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
-        ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));  /// Just update version.
+        ops.emplace_back(zkutil::makeCheckRequest(fs::path(zookeeper_path) / "log", merge_pred.getVersion())); /// Make sure no new events were added to the log.
+        ops.emplace_back(zkutil::makeCreateRequest(fs::path(zookeeper_path) / "log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
+        /// Just update version, because merges assignment relies on it
+        ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "log", "", -1));
         Coordination::Responses responses;
         Coordination::Error rc = zookeeper->tryMulti(ops, responses);
 
@@ -6591,10 +7059,16 @@ bool StorageReplicatedMergeTree::dropPart(
 }
 
 bool StorageReplicatedMergeTree::dropAllPartsInPartition(
-    zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, const Context & query_context, bool detach)
+    zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, ContextPtr query_context, bool detach)
 {
+    String alter_partition_version_path = zookeeper_path + "/alter_partition_version";
+    Coordination::Stat alter_partition_version_stat;
+    zookeeper.get(alter_partition_version_path, &alter_partition_version_stat);
+
     MergeTreePartInfo drop_range_info;
-    if (!getFakePartCoveringAllPartsInPartition(partition_id, drop_range_info))
+    /// It prevent other replicas from assigning merges which intersect locked block number.
+    std::optional<EphemeralLockInZooKeeper> delimiting_block_lock;
+    if (!getFakePartCoveringAllPartsInPartition(partition_id, drop_range_info, delimiting_block_lock))
     {
         LOG_INFO(log, "Will not drop partition {}, it is empty.", partition_id);
         return false;
@@ -6602,14 +7076,7 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
 
     clearBlocksInPartition(zookeeper, partition_id, drop_range_info.min_block, drop_range_info.max_block);
 
-    /** Forbid to choose the parts to be deleted for merging.
-      * Invariant: after the `DROP_RANGE` entry appears in the log, merge of deleted parts will not appear in the log.
-      */
     String drop_range_fake_part_name = getPartNamePossiblyFake(format_version, drop_range_info);
-    {
-        std::lock_guard merge_selecting_lock(merge_selecting_mutex);
-        queue.disableMergesInBlockRange(drop_range_fake_part_name);
-    }
 
     LOG_DEBUG(log, "Disabled merges covered by range {}", drop_range_fake_part_name);
 
@@ -6621,11 +7088,25 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
     entry.create_time = time(nullptr);
 
     Coordination::Requests ops;
-    ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
-    ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));  /// Just update version.
-    if (auto txn = query_context.getZooKeeperMetadataTransaction())
+    ops.emplace_back(zkutil::makeCreateRequest(fs::path(zookeeper_path) / "log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
+    /// 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));
+    /// Just update version, because merges assignment relies on it
+    ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "log", "", -1));
+    delimiting_block_lock->getUnlockOps(ops);
+    if (auto txn = query_context->getZooKeeperMetadataTransaction())
         txn->moveOpsTo(ops);
-    Coordination::Responses responses = zookeeper.multi(ops);
+    Coordination::Responses responses;
+    Coordination::Error code = zookeeper.tryMulti(ops, responses);
+    if (code == Coordination::Error::ZOK)
+        delimiting_block_lock->assumeUnlocked();
+    else if (code == Coordination::Error::ZBADVERSION)
+        throw Exception(ErrorCodes::CANNOT_ASSIGN_ALTER, "Cannot assign ALTER PARTITION, because another ALTER PARTITION query was concurrently executed");
+    else
+        zkutil::KeeperMultiException::check(code, ops, responses);
 
     String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.front()).path_created;
     entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
@@ -6634,13 +7115,13 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
 }
 
 
-CheckResults StorageReplicatedMergeTree::checkData(const ASTPtr & query, const Context & context)
+CheckResults StorageReplicatedMergeTree::checkData(const ASTPtr & query, ContextPtr local_context)
 {
     CheckResults results;
     DataPartsVector data_parts;
     if (const auto & check_query = query->as<ASTCheckQuery &>(); check_query.partition)
     {
-        String partition_id = getPartitionIDFromQuery(check_query.partition, context);
+        String partition_id = getPartitionIDFromQuery(check_query.partition, local_context);
         data_parts = getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     }
     else
@@ -6700,7 +7181,7 @@ void StorageReplicatedMergeTree::lockSharedData(const IMergeTreeDataPart & part)
     String id = part.getUniqueId();
     boost::replace_all(id, "/", "_");
 
-    String zookeeper_node = zookeeper_path + "/zero_copy_s3/shared/" + part.name + "/" + id + "/" + replica_name;
+    String zookeeper_node = fs::path(zookeeper_path) / "zero_copy_s3" / "shared" / part.name / id / replica_name;
 
     LOG_TRACE(log, "Set zookeeper lock {}", zookeeper_node);
 
@@ -6741,9 +7222,9 @@ bool StorageReplicatedMergeTree::unlockSharedData(const IMergeTreeDataPart & par
     String id = part.getUniqueId();
     boost::replace_all(id, "/", "_");
 
-    String zookeeper_part_node = zookeeper_path + "/zero_copy_s3/shared/" + part.name;
-    String zookeeper_part_uniq_node = zookeeper_part_node + "/" + id;
-    String zookeeper_node = zookeeper_part_uniq_node + "/" + replica_name;
+    String zookeeper_part_node = fs::path(zookeeper_path) / "zero_copy_s3" / "shared" / part.name;
+    String zookeeper_part_uniq_node = fs::path(zookeeper_part_node) / id;
+    String zookeeper_node = fs::path(zookeeper_part_uniq_node) / replica_name;
 
     LOG_TRACE(log, "Remove zookeeper lock {}", zookeeper_node);
 
@@ -6802,7 +7283,7 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
     if (!zookeeper)
         return best_replica;
 
-    String zookeeper_part_node = zookeeper_path + "/zero_copy_s3/shared/" + part.name;
+    String zookeeper_part_node = fs::path(zookeeper_path) / "zero_copy_s3" / "shared" / part.name;
 
     Strings ids;
     zookeeper->tryGetChildren(zookeeper_part_node, ids);
@@ -6810,7 +7291,7 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
     Strings replicas;
     for (const auto & id : ids)
     {
-        String zookeeper_part_uniq_node = zookeeper_part_node + "/" + id;
+        String zookeeper_part_uniq_node = fs::path(zookeeper_part_node) / id;
         Strings id_replicas;
         zookeeper->tryGetChildren(zookeeper_part_uniq_node, id_replicas);
         LOG_TRACE(log, "Found zookeper replicas for {}: {}", zookeeper_part_uniq_node, id_replicas.size());
@@ -6827,7 +7308,7 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
     active_replicas.reserve(replicas.size());
 
     for (const String & replica : replicas)
-        if ((replica != replica_name) && (zookeeper->exists(zookeeper_path + "/replicas/" + replica + "/is_active")))
+        if ((replica != replica_name) && (zookeeper->exists(fs::path(zookeeper_path) / "replicas" / replica / "is_active")))
             active_replicas.push_back(replica);
 
     LOG_TRACE(log, "Found zookeper active replicas for part {}: {}", part.name, active_replicas.size());
@@ -6846,13 +7327,13 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
 
     for (const String & replica : active_replicas)
     {
-        String current_replica_path = zookeeper_path + "/replicas/" + replica;
+        String current_replica_path = fs::path(zookeeper_path) / "replicas" / replica;
 
-        String log_pointer_str = zookeeper->get(current_replica_path + "/log_pointer");
+        String log_pointer_str = zookeeper->get(fs::path(current_replica_path) / "log_pointer");
         Int64 log_pointer = log_pointer_str.empty() ? 0 : parse<UInt64>(log_pointer_str);
 
         Coordination::Stat stat;
-        zookeeper->get(current_replica_path + "/queue", &stat);
+        zookeeper->get(fs::path(current_replica_path) / "queue", &stat);
         size_t queue_size = stat.numChildren;
 
         if (log_pointer > max_log_pointer
@@ -6867,4 +7348,46 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
     return best_replica;
 }
 
+String StorageReplicatedMergeTree::findReplicaHavingPart(
+    const String & part_name, const String & zookeeper_path_, zkutil::ZooKeeper::Ptr zookeeper_)
+{
+    Strings replicas = zookeeper_->getChildren(fs::path(zookeeper_path_) / "replicas");
+
+    /// Select replicas in uniformly random order.
+    std::shuffle(replicas.begin(), replicas.end(), thread_local_rng);
+
+    for (const String & replica : replicas)
+    {
+        if (zookeeper_->exists(fs::path(zookeeper_path_) / "replicas" / replica / "parts" / part_name)
+            && zookeeper_->exists(fs::path(zookeeper_path_) / "replicas" / replica / "is_active"))
+            return fs::path(zookeeper_path_) / "replicas" / replica;
+    }
+
+    return {};
+}
+
+bool StorageReplicatedMergeTree::checkIfDetachedPartExists(const String & part_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)
+            if (dir_it->path().filename().string() == part_name)
+                return true;
+    return false;
+}
+
+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)
+                return true;
+        }
+    }
+    return false;
+}
 }
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index 0c8aca18c6a..8ffb4974cb3 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -20,11 +20,13 @@
 #include <Storages/MergeTree/DataPartsExchange.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
 #include <Storages/MergeTree/LeaderElection.h>
+#include <Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/PartLog.h>
 #include <Common/randomSeed.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/Throttler.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Processors/Pipe.h>
 #include <Storages/MergeTree/BackgroundJobsExecutor.h>
@@ -96,7 +98,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -106,16 +108,16 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
-    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, const Context & context) const override;
+    std::optional<UInt64> totalRowsByPartitionPredicate(const SelectQueryInfo & query_info, ContextPtr context) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     bool optimize(
         const ASTPtr & query,
@@ -124,11 +126,11 @@ public:
         bool final,
         bool deduplicate,
         const Names & deduplicate_by_columns,
-        const Context & query_context) override;
+        ContextPtr query_context) override;
 
-    void alter(const AlterCommands & commands, const Context & query_context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & commands, ContextPtr query_context, TableLockHolder & table_lock_holder) override;
 
-    void mutate(const MutationCommands & commands, const Context & context) override;
+    void mutate(const MutationCommands & commands, ContextPtr context) override;
     void waitMutation(const String & znode_name, size_t mutations_sync) const;
     std::vector<MergeTreeMutationStatus> getMutationsStatus() const override;
     CancellationCode killMutation(const String & mutation_id) override;
@@ -137,7 +139,7 @@ public:
       */
     void drop() override;
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context & query_context, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr query_context, TableExclusiveLockHolder &) override;
 
     void checkTableCanBeRenamed() const override;
 
@@ -183,6 +185,8 @@ public:
     using LogEntriesData = std::vector<ReplicatedMergeTreeLogEntryData>;
     void getQueue(LogEntriesData & res, String & replica_name);
 
+    std::vector<PartMovesBetweenShardsOrchestrator::Entry> getPartMovesBetweenShardsEntries();
+
     /// Get replica delay relative to current time.
     time_t getAbsoluteDelay() const;
 
@@ -197,7 +201,7 @@ public:
         part_check_thread.enqueuePart(part_name, delay_to_check_seconds);
     }
 
-    CheckResults checkData(const ASTPtr & query, const Context & context) override;
+    CheckResults checkData(const ASTPtr & query, ContextPtr context) override;
 
     /// Checks ability to use granularity
     bool canUseAdaptiveGranularity() const override;
@@ -208,6 +212,10 @@ public:
      */
     static void dropReplica(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path, const String & replica, Poco::Logger * logger);
 
+    /// Removes table from ZooKeeper after the last replica was dropped
+    static bool removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path,
+                                              const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger);
+
     /// Get job to execute in background pool (merge, mutate, drop range and so on)
     std::optional<JobAndPool> getDataProcessingJob() override;
 
@@ -232,6 +240,18 @@ public:
     /// Get best replica having this partition on S3
     String getSharedDataReplica(const IMergeTreeDataPart & part) const;
 
+    /// Get throttler for replicated fetches
+    ThrottlerPtr getFetchesThrottler() const
+    {
+        return replicated_fetches_throttler;
+    }
+
+    /// Get throttler for replicated sends
+    ThrottlerPtr getSendsThrottler() const
+    {
+        return replicated_sends_throttler;
+    }
+
 private:
     /// Get a sequential consistent view of current parts.
     ReplicatedMergeTreeQuorumAddedParts::PartitionIdToMaxBlock getMaxAddedBlocks() const;
@@ -248,6 +268,7 @@ private:
     friend struct ReplicatedMergeTreeLogEntry;
     friend class ScopedPartitionMergeLock;
     friend class ReplicatedMergeTreeQueue;
+    friend class PartMovesBetweenShardsOrchestrator;
     friend class MergeTreeData;
 
     using MergeStrategyPicker = ReplicatedMergeTreeMergeStrategyPicker;
@@ -301,7 +322,6 @@ private:
 
     DataPartsExchange::Fetcher fetcher;
 
-
     /// When activated, replica is initialized and startup() method could exit
     Poco::Event startup_event;
 
@@ -346,6 +366,8 @@ private:
     /// A thread that processes reconnection to ZooKeeper when the session expires.
     ReplicatedMergeTreeRestartingThread restarting_thread;
 
+    PartMovesBetweenShardsOrchestrator part_moves_between_shards_orchestrator;
+
     /// True if replica was created for existing table with fixed granularity
     bool other_replicas_fixed_granularity = false;
 
@@ -354,6 +376,11 @@ private:
 
     const size_t replicated_fetches_pool_size;
 
+    /// Throttlers used in DataPartsExchange to lower maximum fetch/sends
+    /// speed.
+    ThrottlerPtr replicated_fetches_throttler;
+    ThrottlerPtr replicated_sends_throttler;
+
     template <class Func>
     void foreachCommittedParts(Func && func, bool select_sequential_consistency) const;
 
@@ -383,6 +410,10 @@ private:
       */
     void checkParts(bool skip_sanity_checks);
 
+    /// Synchronize the list of part uuids which are currently pinned. These should be sent to root query executor
+    /// to be used for deduplication.
+    void syncPinnedPartUUIDs();
+
     /** Check that the part's checksum is the same as the checksum of the same part on some other replica.
       * If no one has such a part, nothing checks.
       * Not very reliable: if two replicas add a part almost at the same time, no checks will occur.
@@ -408,6 +439,8 @@ private:
     /// Just removes part from ZooKeeper using previous method
     void removePartFromZooKeeper(const String & part_name);
 
+    void removePartsFromFilesystem(const DataPartsVector & parts);
+
     /// Quickly removes big set of parts from ZooKeeper (using async multi queries)
     void removePartsFromZooKeeper(zkutil::ZooKeeperPtr & zookeeper, const Strings & part_names,
                                   NameSet * parts_should_be_retried = nullptr);
@@ -451,6 +484,7 @@ private:
     bool executeFetch(LogEntry & entry);
 
     bool executeReplaceRange(const LogEntry & entry);
+    void executeClonePartFromShard(const LogEntry & entry);
 
     /** Updates the queue.
       */
@@ -463,6 +497,9 @@ private:
       */
     void cloneReplica(const String & source_replica, Coordination::Stat source_is_lost_stat, zkutil::ZooKeeperPtr & zookeeper);
 
+    /// Repairs metadata of staled replica. Called from cloneReplica(...)
+    void cloneMetadataIfNeeded(const String & source_replica, const String & source_path, zkutil::ZooKeeperPtr & zookeeper);
+
     /// Clone replica if it is lost.
     void cloneReplicaIfNeeded(zkutil::ZooKeeperPtr zookeeper);
 
@@ -515,13 +552,16 @@ private:
 
     /// Exchange parts.
 
-    ConnectionTimeouts getFetchPartHTTPTimeouts(const Context & context);
+    ConnectionTimeouts getFetchPartHTTPTimeouts(ContextPtr context);
 
     /** Returns an empty string if no one has a part.
       */
     String findReplicaHavingPart(const String & part_name, bool active);
+    static String findReplicaHavingPart(const String & part_name, const String & zookeeper_path_, zkutil::ZooKeeper::Ptr zookeeper_);
 
     bool checkReplicaHavePart(const String & replica, const String & part_name);
+    bool checkIfDetachedPartExists(const String & part_name);
+    bool checkIfDetachedPartitionExists(const String & partition_name);
 
     /** Find replica having specified part or any part that covers it.
       * If active = true, consider only active replicas.
@@ -573,9 +613,11 @@ private:
     bool partIsInsertingWithParallelQuorum(const MergeTreePartInfo & part_info) const;
 
     /// Creates new block number if block with such block_id does not exist
+    /// If zookeeper_path_prefix specified then allocate block number on this path
+    /// (can be used if we want to allocate blocks on other replicas)
     std::optional<EphemeralLockInZooKeeper> allocateBlockNumber(
         const String & partition_id, const zkutil::ZooKeeperPtr & zookeeper,
-        const String & zookeeper_block_id_path = "") const;
+        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 .
@@ -600,7 +642,10 @@ private:
 
     /// Produce an imaginary part info covering all parts in the specified partition (at the call moment).
     /// Returns false if the partition doesn't exist yet.
-    bool getFakePartCoveringAllPartsInPartition(const String & partition_id, MergeTreePartInfo & part_info, bool for_replace_partition = false);
+    /// Caller must hold delimiting_block_lock until creation of drop/replace entry in log.
+    /// Otherwise some replica may assign merge which intersects part_info.
+    bool getFakePartCoveringAllPartsInPartition(const String & partition_id, MergeTreePartInfo & part_info,
+                                                std::optional<EphemeralLockInZooKeeper> & delimiting_block_lock, bool for_replace_range = false);
 
     /// Check for a node in ZK. If it is, remember this information, and then immediately answer true.
     mutable std::unordered_set<std::string> existing_nodes_cache;
@@ -615,16 +660,26 @@ private:
     /// Info about how other replicas can access this one.
     ReplicatedMergeTreeAddress getReplicatedMergeTreeAddress() const;
 
-    bool dropPart(zkutil::ZooKeeperPtr & zookeeper, String part_name, LogEntry & entry, bool detach, bool throw_if_noop);
     bool dropAllPartsInPartition(
-        zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, const Context & query_context, bool detach);
+        zkutil::ZooKeeper & zookeeper, String & partition_id, LogEntry & entry, ContextPtr query_context, bool detach);
+
+    void dropPartNoWaitNoThrow(const String & part_name) override;
+    void dropPart(const String & part_name, bool detach, ContextPtr query_context) override;
 
     // Partition helpers
-    void dropPartition(const ASTPtr & partition, bool detach, bool drop_part, const Context & query_context, bool throw_if_noop) override;
-    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, const Context & query_context) override;
-    void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, const Context & query_context) override;
-    void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, const Context & query_context) override;
-    void fetchPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, const String & from, const Context & query_context) override;
+    void dropPartition(const ASTPtr & partition, bool detach, ContextPtr query_context) override;
+    PartitionCommandsResultInfo attachPartition(const ASTPtr & partition, const StorageMetadataPtr & metadata_snapshot, bool part, ContextPtr query_context) override;
+    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;
+    void fetchPartition(
+        const ASTPtr & partition,
+        const StorageMetadataPtr & metadata_snapshot,
+        const String & from,
+        bool fetch_part,
+        ContextPtr query_context) override;
+
+    bool dropPartImpl(zkutil::ZooKeeperPtr & zookeeper, String part_name, LogEntry & entry, bool detach, bool throw_if_noop);
 
     /// Check granularity of already existing replicated table in zookeeper if it exists
     /// return true if it's fixed
@@ -638,9 +693,9 @@ private:
 
     void startBackgroundMovesIfNeeded() override;
 
-    std::set<String> getPartitionIdsAffectedByCommands(const MutationCommands & commands, const Context & query_context) const;
+    std::set<String> getPartitionIdsAffectedByCommands(const MutationCommands & commands, ContextPtr query_context) const;
     PartitionBlockNumbersHolder allocateBlockNumbersInAffectedPartitions(
-        const MutationCommands & commands, const Context & query_context, const zkutil::ZooKeeperPtr & zookeeper) const;
+        const MutationCommands & commands, ContextPtr query_context, const zkutil::ZooKeeperPtr & zookeeper) const;
 
 protected:
     /** If not 'attach', either creates a new table in ZK, or adds a replica to an existing table.
@@ -652,7 +707,7 @@ protected:
         const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata_,
-        Context & context_,
+        ContextMutablePtr context_,
         const String & date_column_name,
         const MergingParams & merging_params_,
         std::unique_ptr<MergeTreeSettings> settings_,
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 6a6a9b8b7b9..fd9ff596329 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -35,7 +35,10 @@
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Processors/Pipe.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -45,152 +48,276 @@ namespace ErrorCodes
     extern const int UNEXPECTED_EXPRESSION;
     extern const int S3_ERROR;
 }
-
-
-namespace
+class StorageS3Source::DisclosedGlobIterator::Impl
 {
-    class StorageS3Source : public SourceWithProgress
+
+public:
+    Impl(Aws::S3::S3Client & client_, const S3::URI & globbed_uri_)
+        : client(client_), globbed_uri(globbed_uri_)
     {
-    public:
+        std::lock_guard lock(mutex);
 
-        static Block getHeader(Block sample_block, bool with_path_column, bool with_file_column)
+        if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
+            throw Exception("Expression can not have wildcards inside bucket name", ErrorCodes::UNEXPECTED_EXPRESSION);
+
+        const String key_prefix = globbed_uri.key.substr(0, globbed_uri.key.find_first_of("*?{"));
+
+        /// We don't have to list bucket, because there is no asterics.
+        if (key_prefix.size() == globbed_uri.key.size())
         {
-            if (with_path_column)
-                sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_path"});
-            if (with_file_column)
-                sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_file"});
-
-            return sample_block;
+            buffer.emplace_back(globbed_uri.key);
+            buffer_iter = buffer.begin();
+            is_finished = true;
+            return;
         }
 
-        StorageS3Source(
-            bool need_path,
-            bool need_file,
-            const String & format,
-            String name_,
-            const Block & sample_block,
-            const Context & context,
-            const ColumnsDescription & columns,
-            UInt64 max_block_size,
-            const CompressionMethod compression_method,
-            const std::shared_ptr<Aws::S3::S3Client> & client,
-            const String & bucket,
-            const String & key)
-            : SourceWithProgress(getHeader(sample_block, need_path, need_file))
-            , name(std::move(name_))
-            , with_file_column(need_file)
-            , with_path_column(need_path)
-            , file_path(bucket + "/" + key)
-        {
-            read_buf = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromS3>(client, bucket, key), compression_method);
-            auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size);
-            reader = std::make_shared<InputStreamFromInputFormat>(input_format);
+        request.SetBucket(globbed_uri.bucket);
+        request.SetPrefix(key_prefix);
+        matcher = std::make_unique<re2::RE2>(makeRegexpPatternFromGlobs(globbed_uri.key));
+        fillInternalBufferAssumeLocked();
+    }
 
-            if (columns.hasDefaults())
-                reader = std::make_shared<AddingDefaultsBlockInputStream>(reader, columns, context);
+    String next()
+    {
+        std::lock_guard lock(mutex);
+        return nextAssumeLocked();
+    }
+
+private:
+
+    String nextAssumeLocked()
+    {
+        if (buffer_iter != buffer.end())
+        {
+            auto answer = *buffer_iter;
+            ++buffer_iter;
+            return answer;
         }
 
-        String getName() const override
-        {
-            return name;
-        }
-
-        Chunk generate() override
-        {
-            if (!reader)
-                return {};
-
-            if (!initialized)
-            {
-                reader->readSuffix();
-                initialized = true;
-            }
-
-            if (auto block = reader->read())
-            {
-                auto columns = block.getColumns();
-                UInt64 num_rows = block.rows();
-
-                if (with_path_column)
-                    columns.push_back(DataTypeString().createColumnConst(num_rows, file_path)->convertToFullColumnIfConst());
-                if (with_file_column)
-                {
-                    size_t last_slash_pos = file_path.find_last_of('/');
-                    columns.push_back(DataTypeString().createColumnConst(num_rows, file_path.substr(
-                            last_slash_pos + 1))->convertToFullColumnIfConst());
-                }
-
-                return Chunk(std::move(columns), num_rows);
-            }
-
-            reader.reset();
-
+        if (is_finished)
             return {};
-        }
 
-    private:
-        String name;
-        std::unique_ptr<ReadBuffer> read_buf;
-        BlockInputStreamPtr reader;
-        bool initialized = false;
-        bool with_file_column = false;
-        bool with_path_column = false;
-        String file_path;
-    };
+        fillInternalBufferAssumeLocked();
 
-    class StorageS3BlockOutputStream : public IBlockOutputStream
+        return nextAssumeLocked();
+    }
+
+    void fillInternalBufferAssumeLocked()
     {
-    public:
-        StorageS3BlockOutputStream(
-            const String & format,
-            const Block & sample_block_,
-            const Context & context,
-            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)
-            : sample_block(sample_block_)
+        buffer.clear();
+
+        outcome = client.ListObjectsV2(request);
+        if (!outcome.IsSuccess())
+            throw Exception(ErrorCodes::S3_ERROR, "Could not list objects in bucket {} with prefix {}, S3 exception: {}, message: {}",
+                            quoteString(request.GetBucket()), quoteString(request.GetPrefix()),
+                            backQuote(outcome.GetError().GetExceptionName()), quoteString(outcome.GetError().GetMessage()));
+
+        const auto & result_batch = outcome.GetResult().GetContents();
+
+        buffer.reserve(result_batch.size());
+        for (const auto & row : result_batch)
         {
-            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);
+            String key = row.GetKey();
+            if (re2::RE2::FullMatch(key, *matcher))
+                buffer.emplace_back(std::move(key));
+        }
+        /// Set iterator only after the whole batch is processed
+        buffer_iter = buffer.begin();
+
+        request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
+
+        /// It returns false when all objects were returned
+        is_finished = !outcome.GetResult().GetIsTruncated();
+    }
+
+    std::mutex mutex;
+    Strings buffer;
+    Strings::iterator buffer_iter;
+    Aws::S3::S3Client client;
+    S3::URI globbed_uri;
+    Aws::S3::Model::ListObjectsV2Request request;
+    Aws::S3::Model::ListObjectsV2Outcome outcome;
+    std::unique_ptr<re2::RE2> matcher;
+    bool is_finished{false};
+};
+
+StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(Aws::S3::S3Client & client_, const S3::URI & globbed_uri_)
+    : pimpl(std::make_shared<StorageS3Source::DisclosedGlobIterator::Impl>(client_, globbed_uri_)) {}
+
+String StorageS3Source::DisclosedGlobIterator::next()
+{
+    return pimpl->next();
+}
+
+
+Block StorageS3Source::getHeader(Block sample_block, bool with_path_column, bool with_file_column)
+{
+    if (with_path_column)
+        sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_path"});
+    if (with_file_column)
+        sample_block.insert({DataTypeString().createColumn(), std::make_shared<DataTypeString>(), "_file"});
+
+    return sample_block;
+}
+
+StorageS3Source::StorageS3Source(
+    bool need_path,
+    bool need_file,
+    const String & format_,
+    String name_,
+    const Block & sample_block_,
+    ContextPtr context_,
+    const ColumnsDescription & columns_,
+    UInt64 max_block_size_,
+    UInt64 s3_max_single_read_retries_,
+    const String compression_hint_,
+    const std::shared_ptr<Aws::S3::S3Client> & client_,
+    const String & bucket_,
+    std::shared_ptr<IteratorWrapper> file_iterator_)
+    : SourceWithProgress(getHeader(sample_block_, need_path, need_file))
+    , WithContext(context_)
+    , name(std::move(name_))
+    , bucket(bucket_)
+    , format(format_)
+    , columns_desc(columns_)
+    , max_block_size(max_block_size_)
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
+    , compression_hint(compression_hint_)
+    , client(client_)
+    , sample_block(sample_block_)
+    , with_file_column(need_file)
+    , with_path_column(need_path)
+    , file_iterator(file_iterator_)
+{
+    initialize();
+}
+
+
+bool StorageS3Source::initialize()
+{
+    String current_key = (*file_iterator)();
+    if (current_key.empty())
+        return false;
+
+    file_path = fs::path(bucket) / current_key;
+
+    read_buf = wrapReadBufferWithCompressionMethod(
+        std::make_unique<ReadBufferFromS3>(client, bucket, current_key, s3_max_single_read_retries), chooseCompressionMethod(current_key, compression_hint));
+    auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, getContext(), max_block_size);
+    reader = std::make_shared<InputStreamFromInputFormat>(input_format);
+
+    if (columns_desc.hasDefaults())
+        reader = std::make_shared<AddingDefaultsBlockInputStream>(reader, columns_desc, getContext());
+
+    initialized = false;
+    return true;
+}
+
+String StorageS3Source::getName() const
+{
+    return name;
+}
+
+Chunk StorageS3Source::generate()
+{
+    if (!reader)
+        return {};
+
+    if (!initialized)
+    {
+        reader->readPrefix();
+        initialized = true;
+    }
+
+    if (auto block = reader->read())
+    {
+        auto columns = block.getColumns();
+        UInt64 num_rows = block.rows();
+
+        if (with_path_column)
+            columns.push_back(DataTypeString().createColumnConst(num_rows, file_path)->convertToFullColumnIfConst());
+        if (with_file_column)
+        {
+            size_t last_slash_pos = file_path.find_last_of('/');
+            columns.push_back(DataTypeString().createColumnConst(num_rows, file_path.substr(
+                    last_slash_pos + 1))->convertToFullColumnIfConst());
         }
 
-        Block getHeader() const override
-        {
-            return sample_block;
-        }
+        return Chunk(std::move(columns), num_rows);
+    }
 
-        void write(const Block & block) override
-        {
-            writer->write(block);
-        }
+    reader->readSuffix();
+    reader.reset();
+    read_buf.reset();
 
-        void writePrefix() override
-        {
-            writer->writePrefix();
-        }
+    if (!initialize())
+        return {};
 
-        void flush() override
-        {
-            writer->flush();
-        }
+    return generate();
+}
 
-        void writeSuffix() override
+
+class StorageS3BlockOutputStream : public IBlockOutputStream
+{
+public:
+    StorageS3BlockOutputStream(
+        const String & format,
+        const Block & sample_block_,
+        ContextPtr context,
+        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)
+        : sample_block(sample_block_)
+    {
+        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);
+    }
+
+    Block getHeader() const override
+    {
+        return sample_block;
+    }
+
+    void write(const Block & block) override
+    {
+        writer->write(block);
+    }
+
+    void writePrefix() override
+    {
+        writer->writePrefix();
+    }
+
+    void flush() override
+    {
+        writer->flush();
+    }
+
+    void writeSuffix() override
+    {
+        try
         {
             writer->writeSuffix();
             writer->flush();
             write_buf->finalize();
         }
+        catch (...)
+        {
+            /// Stop ParallelFormattingOutputFormat correctly.
+            writer.reset();
+            throw;
+        }
+    }
 
-    private:
-        Block sample_block;
-        std::unique_ptr<WriteBuffer> write_buf;
-        BlockOutputStreamPtr writer;
-    };
-}
+private:
+    Block sample_block;
+    std::unique_ptr<WriteBuffer> write_buf;
+    BlockOutputStreamPtr writer;
+};
 
 
 StorageS3::StorageS3(
@@ -199,90 +326,33 @@ StorageS3::StorageS3(
     const String & secret_access_key_,
     const StorageID & table_id_,
     const String & format_name_,
+    UInt64 s3_max_single_read_retries_,
     UInt64 min_upload_part_size_,
     UInt64 max_single_part_upload_size_,
     UInt64 max_connections_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const Context & context_,
-    const String & compression_method_)
+    const String & comment,
+    ContextPtr context_,
+    const String & compression_method_,
+    bool distributed_processing_)
     : IStorage(table_id_)
-    , uri(uri_)
-    , access_key_id(access_key_id_)
-    , secret_access_key(secret_access_key_)
-    , max_connections(max_connections_)
-    , global_context(context_.getGlobalContext())
+    , client_auth{uri_, access_key_id_, secret_access_key_, max_connections_, {}, {}} /// Client and settings will be updated later
     , format_name(format_name_)
+    , s3_max_single_read_retries(s3_max_single_read_retries_)
     , min_upload_part_size(min_upload_part_size_)
     , max_single_part_upload_size(max_single_part_upload_size_)
     , compression_method(compression_method_)
     , name(uri_.storage_name)
+    , distributed_processing(distributed_processing_)
 {
-    global_context.getRemoteHostFilter().checkURL(uri_.uri);
+    context_->getGlobalContext()->getRemoteHostFilter().checkURL(uri_.uri);
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
-    updateAuthSettings(context_);
-}
-
-
-namespace
-{
-    /* "Recursive" directory listing with matched paths as a result.
- * Have the same method in StorageFile.
- */
-Strings listFilesWithRegexpMatching(Aws::S3::S3Client & client, const S3::URI & globbed_uri)
-{
-    if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
-    {
-        throw Exception("Expression can not have wildcards inside bucket name", ErrorCodes::UNEXPECTED_EXPRESSION);
-    }
-
-    const String key_prefix = globbed_uri.key.substr(0, globbed_uri.key.find_first_of("*?{"));
-    if (key_prefix.size() == globbed_uri.key.size())
-    {
-        return {globbed_uri.key};
-    }
-
-    Aws::S3::Model::ListObjectsV2Request request;
-    request.SetBucket(globbed_uri.bucket);
-    request.SetPrefix(key_prefix);
-
-    re2::RE2 matcher(makeRegexpPatternFromGlobs(globbed_uri.key));
-    Strings result;
-    Aws::S3::Model::ListObjectsV2Outcome outcome;
-    int page = 0;
-    do
-    {
-        ++page;
-        outcome = client.ListObjectsV2(request);
-        if (!outcome.IsSuccess())
-        {
-            if (page > 1)
-                throw Exception(ErrorCodes::S3_ERROR, "Could not list objects in bucket {} with prefix {}, page {}, S3 exception: {}, message: {}",
-                            quoteString(request.GetBucket()), quoteString(request.GetPrefix()), page,
-                            backQuote(outcome.GetError().GetExceptionName()), quoteString(outcome.GetError().GetMessage()));
-
-            throw Exception(ErrorCodes::S3_ERROR, "Could not list objects in bucket {} with prefix {}, S3 exception: {}, message: {}",
-                            quoteString(request.GetBucket()), quoteString(request.GetPrefix()),
-                            backQuote(outcome.GetError().GetExceptionName()), quoteString(outcome.GetError().GetMessage()));
-        }
-
-        for (const auto & row : outcome.GetResult().GetContents())
-        {
-            String key = row.GetKey();
-            if (re2::RE2::FullMatch(key, matcher))
-                result.emplace_back(std::move(key));
-        }
-
-        request.SetContinuationToken(outcome.GetResult().GetNextContinuationToken());
-    }
-    while (outcome.GetResult().GetIsTruncated());
-
-    return result;
-}
-
+    updateClientAndAuthSettings(context_, client_auth);
 }
 
 
@@ -290,12 +360,12 @@ Pipe StorageS3::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
 {
-    updateAuthSettings(context);
+    updateClientAndAuthSettings(local_context, client_auth);
 
     Pipes pipes;
     bool need_path_column = false;
@@ -308,73 +378,94 @@ Pipe StorageS3::read(
             need_file_column = true;
     }
 
-    for (const String & key : listFilesWithRegexpMatching(*client, uri))
+    std::shared_ptr<StorageS3Source::IteratorWrapper> iterator_wrapper{nullptr};
+    if (distributed_processing)
+    {
+        iterator_wrapper = std::make_shared<StorageS3Source::IteratorWrapper>(
+            [callback = local_context->getReadTaskCallback()]() -> String {
+                return callback();
+        });
+    }
+    else
+    {
+        /// Iterate through disclosed globs and make a source for each file
+        auto glob_iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(*client_auth.client, client_auth.uri);
+        iterator_wrapper = std::make_shared<StorageS3Source::IteratorWrapper>([glob_iterator]()
+        {
+            return glob_iterator->next();
+        });
+    }
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
         pipes.emplace_back(std::make_shared<StorageS3Source>(
             need_path_column,
             need_file_column,
             format_name,
             getName(),
             metadata_snapshot->getSampleBlock(),
-            context,
+            local_context,
             metadata_snapshot->getColumns(),
             max_block_size,
-            chooseCompressionMethod(uri.key, compression_method),
-            client,
-            uri.bucket,
-            key));
-
+            s3_max_single_read_retries,
+            compression_method,
+            client_auth.client,
+            client_auth.uri.bucket,
+            iterator_wrapper));
+    }
     auto pipe = Pipe::unitePipes(std::move(pipes));
-    // It's possible to have many buckets read from s3, resize(num_streams) might open too many handles at the same time.
-    // Using narrowPipe instead.
+
     narrowPipe(pipe, num_streams);
     return pipe;
 }
 
-BlockOutputStreamPtr StorageS3::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageS3::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
-    updateAuthSettings(context);
+    updateClientAndAuthSettings(local_context, client_auth);
     return std::make_shared<StorageS3BlockOutputStream>(
         format_name,
         metadata_snapshot->getSampleBlock(),
-        global_context,
-        chooseCompressionMethod(uri.key, compression_method),
-        client,
-        uri.bucket,
-        uri.key,
+        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);
 }
 
-void StorageS3::updateAuthSettings(const Context & context)
+void StorageS3::updateClientAndAuthSettings(ContextPtr ctx, StorageS3::ClientAuthentificaiton & upd)
 {
-    auto settings = context.getStorageS3Settings().getSettings(uri.uri.toString());
-    if (client && (!access_key_id.empty() || settings == auth_settings))
+    auto settings = ctx->getStorageS3Settings().getSettings(upd.uri.uri.toString());
+    if (upd.client && (!upd.access_key_id.empty() || settings == upd.auth_settings))
         return;
 
-    Aws::Auth::AWSCredentials credentials(access_key_id, secret_access_key);
+    Aws::Auth::AWSCredentials credentials(upd.access_key_id, upd.secret_access_key);
     HeaderCollection headers;
-    if (access_key_id.empty())
+    if (upd.access_key_id.empty())
     {
         credentials = Aws::Auth::AWSCredentials(settings.access_key_id, settings.secret_access_key);
         headers = settings.headers;
     }
 
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
-        context.getRemoteHostFilter(), context.getGlobalContext().getSettingsRef().s3_max_redirects);
+        settings.region,
+        ctx->getRemoteHostFilter(), ctx->getGlobalContext()->getSettingsRef().s3_max_redirects);
 
-    client_configuration.endpointOverride = uri.endpoint;
-    client_configuration.maxConnections = max_connections;
+    client_configuration.endpointOverride = upd.uri.endpoint;
+    client_configuration.maxConnections = upd.max_connections;
 
-    client = S3::ClientFactory::instance().create(
+    upd.client = S3::ClientFactory::instance().create(
         client_configuration,
-        uri.is_virtual_hosted_style,
+        upd.uri.is_virtual_hosted_style,
         credentials.GetAWSAccessKeyId(),
         credentials.GetAWSSecretKey(),
         settings.server_side_encryption_customer_key_base64,
         std::move(headers),
-        settings.use_environment_credentials.value_or(global_context.getConfigRef().getBool("s3.use_environment_credentials", false)));
+        settings.use_environment_credentials.value_or(ctx->getConfigRef().getBool("s3.use_environment_credentials", false)),
+        settings.use_insecure_imds_request.value_or(ctx->getConfigRef().getBool("s3.use_insecure_imds_request", false)));
 
-    auth_settings = std::move(settings);
+    upd.auth_settings = std::move(settings);
 }
 
 void registerStorageS3Impl(const String & name, StorageFactory & factory)
@@ -385,10 +476,11 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
 
         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);
+                "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.local_context);
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
 
         String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         Poco::URI uri (url);
@@ -402,9 +494,10 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             secret_access_key = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         }
 
-        UInt64 min_upload_part_size = args.local_context.getSettingsRef().s3_min_upload_part_size;
-        UInt64 max_single_part_upload_size = args.local_context.getSettingsRef().s3_max_single_part_upload_size;
-        UInt64 max_connections = args.local_context.getSettingsRef().s3_max_connections;
+        UInt64 s3_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;
@@ -425,14 +518,15 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             secret_access_key,
             args.table_id,
             format_name,
+            s3_max_single_read_retries,
             min_upload_part_size,
             max_single_part_upload_size,
             max_connections,
             args.columns,
             args.constraints,
-            args.context,
-            compression_method
-        );
+            args.comment,
+            args.getContext(),
+            compression_method);
     },
     {
         .source_access_type = AccessType::S3,
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index 46d8c9276a2..694dec4c0dc 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -4,11 +4,20 @@
 
 #if USE_AWS_S3
 
+#include <Core/Types.h>
+
+#include <Compression/CompressionInfo.h>
+
 #include <Storages/IStorage.h>
 #include <Storages/StorageS3Settings.h>
+
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Poco/URI.h>
 #include <common/logger_useful.h>
 #include <ext/shared_ptr_helper.h>
+#include <IO/S3Common.h>
+#include <IO/CompressionMethod.h>
+#include <Interpreters/Context.h>
 
 namespace Aws::S3
 {
@@ -18,26 +27,92 @@ namespace Aws::S3
 namespace DB
 {
 
+class StorageS3SequentialSource;
+class StorageS3Source : public SourceWithProgress, WithContext
+{
+public:
+    class DisclosedGlobIterator
+    {
+        public:
+            DisclosedGlobIterator(Aws::S3::S3Client &, const S3::URI &);
+            String next();
+        private:
+            class Impl;
+            /// shared_ptr to have copy constructor
+            std::shared_ptr<Impl> pimpl;
+    };
+
+    using IteratorWrapper = std::function<String()>;
+
+    static Block getHeader(Block sample_block, bool with_path_column, bool with_file_column);
+
+    StorageS3Source(
+        bool need_path,
+        bool need_file,
+        const String & format,
+        String name_,
+        const Block & sample_block,
+        ContextPtr context_,
+        const ColumnsDescription & columns_,
+        UInt64 max_block_size_,
+        UInt64 s3_max_single_read_retries_,
+        const String compression_hint_,
+        const std::shared_ptr<Aws::S3::S3Client> & client_,
+        const String & bucket,
+        std::shared_ptr<IteratorWrapper> file_iterator_);
+
+    String getName() const override;
+
+    Chunk generate() override;
+
+private:
+    String name;
+    String bucket;
+    String file_path;
+    String format;
+    ColumnsDescription columns_desc;
+    UInt64 max_block_size;
+    UInt64 s3_max_single_read_retries;
+    String compression_hint;
+    std::shared_ptr<Aws::S3::S3Client> client;
+    Block sample_block;
+
+
+    std::unique_ptr<ReadBuffer> read_buf;
+    BlockInputStreamPtr reader;
+    bool initialized = false;
+    bool with_file_column = false;
+    bool with_path_column = false;
+    std::shared_ptr<IteratorWrapper> file_iterator;
+
+    /// Recreate ReadBuffer and BlockInputStream for each file.
+    bool initialize();
+};
+
 /**
  * This class represents table engine for external S3 urls.
  * It sends HTTP GET to server when select is called and
  * HTTP PUT when insert is called.
  */
-class StorageS3 : public ext::shared_ptr_helper<StorageS3>, public IStorage
+class StorageS3 : public ext::shared_ptr_helper<StorageS3>, public IStorage, WithContext
 {
 public:
-    StorageS3(const S3::URI & uri,
+    StorageS3(
+        const S3::URI & uri,
         const String & access_key_id,
         const String & secret_access_key,
         const StorageID & table_id_,
         const String & format_name_,
+        UInt64 s3_max_single_read_retries_,
         UInt64 min_upload_part_size_,
         UInt64 max_single_part_upload_size_,
         UInt64 max_connections_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const Context & context_,
-        const String & compression_method_ = "");
+        const String & comment,
+        ContextPtr context_,
+        const String & compression_method_ = "",
+        bool distributed_processing_ = false);
 
     String getName() const override
     {
@@ -48,31 +123,41 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     NamesAndTypesList getVirtuals() const override;
 
 private:
-    const S3::URI uri;
-    const String access_key_id;
-    const String secret_access_key;
-    const UInt64 max_connections;
-    const Context & global_context;
+
+    friend class StorageS3Cluster;
+    friend class TableFunctionS3Cluster;
+
+    struct ClientAuthentificaiton
+    {
+        const S3::URI uri;
+        const String access_key_id;
+        const String secret_access_key;
+        const UInt64 max_connections;
+        std::shared_ptr<Aws::S3::S3Client> client;
+        S3AuthSettings auth_settings;
+    };
+
+    ClientAuthentificaiton client_auth;
 
     String format_name;
+    UInt64 s3_max_single_read_retries;
     size_t min_upload_part_size;
     size_t max_single_part_upload_size;
     String compression_method;
-    std::shared_ptr<Aws::S3::S3Client> client;
     String name;
-    S3AuthSettings auth_settings;
+    const bool distributed_processing;
 
-    void updateAuthSettings(const Context & context);
+    static void updateClientAndAuthSettings(ContextPtr, ClientAuthentificaiton &);
 };
 
 }
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
new file mode 100644
index 00000000000..8a320190036
--- /dev/null
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -0,0 +1,164 @@
+#include "Storages/StorageS3Cluster.h"
+
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
+
+#if USE_AWS_S3
+
+#include "Common/Exception.h"
+#include <Common/Throttler.h>
+#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>
+#include <Interpreters/Context.h>
+#include <Interpreters/getHeaderForProcessingStage.h>
+#include <Interpreters/SelectQueryOptions.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/getTableExpressions.h>
+#include <Formats/FormatFactory.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/AddingDefaultsBlockInputStream.h>
+#include <DataStreams/narrowBlockInputStreams.h>
+#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Pipe.h>
+#include <Processors/Sources/SourceFromInputStream.h>
+#include "Processors/Sources/SourceWithProgress.h"
+#include <Processors/Sources/RemoteSource.h>
+#include <Parsers/queryToString.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Storages/IStorage.h>
+#include <Storages/SelectQueryInfo.h>
+#include <common/logger_useful.h>
+
+#include <aws/core/auth/AWSCredentials.h>
+#include <aws/s3/S3Client.h>
+#include <aws/s3/model/ListObjectsV2Request.h>
+
+#include <ios>
+#include <memory>
+#include <string>
+#include <thread>
+#include <cassert>
+
+namespace DB
+{
+StorageS3Cluster::StorageS3Cluster(
+    const String & filename_,
+    const String & access_key_id_,
+    const String & secret_access_key_,
+    const StorageID & table_id_,
+    String cluster_name_,
+    const String & format_name_,
+    UInt64 max_connections_,
+    const ColumnsDescription & columns_,
+    const ConstraintsDescription & constraints_,
+    ContextPtr context_,
+    const String & compression_method_)
+    : IStorage(table_id_)
+    , client_auth{S3::URI{Poco::URI{filename_}}, access_key_id_, secret_access_key_, max_connections_, {}, {}}
+    , filename(filename_)
+    , cluster_name(cluster_name_)
+    , format_name(format_name_)
+    , compression_method(compression_method_)
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns_);
+    storage_metadata.setConstraints(constraints_);
+    setInMemoryMetadata(storage_metadata);
+    StorageS3::updateClientAndAuthSettings(context_, client_auth);
+}
+
+/// The code executes on initiator
+Pipe StorageS3Cluster::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*/)
+{
+    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);
+    auto callback = std::make_shared<StorageS3Source::IteratorWrapper>([iterator]() mutable -> String
+    {
+        return iterator->next();
+    });
+
+    /// Calculate the header. This is significant, because some columns could be thrown away in some cases like query with count(*)
+    Block header =
+        InterpreterSelectQuery(query_info.query, context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+
+    const Scalars & scalars = context->hasQueryContext() ? context->getQueryContext()->getScalars() : Scalars{};
+
+    Pipes pipes;
+    connections.reserve(cluster->getShardCount());
+
+    const bool add_agg_info = processed_stage == QueryProcessingStage::WithMergeableState;
+
+    for (const auto & replicas : cluster->getShardsAddresses())
+    {
+        /// There will be only one replica, because we consider each replica as a shard
+        for (const auto & node : replicas)
+        {
+            connections.emplace_back(std::make_shared<Connection>(
+                node.host_name, node.port, context->getGlobalContext()->getCurrentDatabase(),
+                node.user, node.password, node.cluster, node.cluster_secret,
+                "S3ClusterInititiator",
+                node.compression,
+                node.secure
+            ));
+
+            /// For unknown reason global context is passed to IStorage::read() method
+            /// So, task_identifier is passed as constructor argument. It is more obvious.
+            auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
+                    *connections.back(), queryToString(query_info.query), header, context,
+                    /*throttler=*/nullptr, scalars, Tables(), processed_stage, callback);
+
+            pipes.emplace_back(std::make_shared<RemoteSource>(remote_query_executor, add_agg_info, false));
+        }
+    }
+
+    metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+QueryProcessingStage::Enum StorageS3Cluster::getQueryProcessingStage(
+    ContextPtr context, QueryProcessingStage::Enum to_stage, const StorageMetadataPtr &, SelectQueryInfo &) const
+{
+    /// Initiator executes query on remote node.
+    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        if (to_stage >= QueryProcessingStage::Enum::WithMergeableState)
+            return QueryProcessingStage::Enum::WithMergeableState;
+
+    /// Follower just reads the data.
+    return QueryProcessingStage::Enum::FetchColumns;
+}
+
+
+NamesAndTypesList StorageS3Cluster::getVirtuals() const
+{
+    return NamesAndTypesList{
+        {"_path", std::make_shared<DataTypeString>()},
+        {"_file", std::make_shared<DataTypeString>()}
+    };
+}
+
+
+}
+
+#endif
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
new file mode 100644
index 00000000000..a2d7c63e7b6
--- /dev/null
+++ b/src/Storages/StorageS3Cluster.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
+
+#if USE_AWS_S3
+
+#include "Client/Connection.h"
+#include <Interpreters/Cluster.h>
+#include <IO/S3Common.h>
+#include <Storages/StorageS3.h>
+
+#include <memory>
+#include <optional>
+#include "ext/shared_ptr_helper.h"
+
+namespace DB
+{
+
+class Context;
+
+struct ClientAuthentificationBuilder
+{
+    String access_key_id;
+    String secret_access_key;
+    UInt64 max_connections;
+};
+
+class StorageS3Cluster : public ext::shared_ptr_helper<StorageS3Cluster>, public IStorage
+{
+    friend struct ext::shared_ptr_helper<StorageS3Cluster>;
+public:
+    std::string getName() const override { return "S3Cluster"; }
+
+    Pipe read(const Names &, const StorageMetadataPtr &, SelectQueryInfo &,
+        ContextPtr, QueryProcessingStage::Enum, size_t /*max_block_size*/, unsigned /*num_streams*/) override;
+
+    QueryProcessingStage::Enum
+    getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageMetadataPtr &, SelectQueryInfo &) const override;
+
+    NamesAndTypesList getVirtuals() const override;
+
+protected:
+    StorageS3Cluster(
+        const String & filename_,
+        const String & access_key_id_,
+        const String & secret_access_key_,
+        const StorageID & table_id_,
+        String cluster_name_,
+        const String & format_name_,
+        UInt64 max_connections_,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        ContextPtr context_,
+        const String & compression_method_);
+
+private:
+    /// Connections from initiator to other nodes
+    std::vector<std::shared_ptr<Connection>> connections;
+    StorageS3::ClientAuthentificaiton client_auth;
+
+    String filename;
+    String cluster_name;
+    String format_name;
+    String compression_method;
+};
+
+
+}
+
+#endif
diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
index 6d97e6fae95..ea0466690dc 100644
--- a/src/Storages/StorageS3Settings.cpp
+++ b/src/Storages/StorageS3Settings.cpp
@@ -30,12 +30,18 @@ void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::U
             auto endpoint = config.getString(config_elem + "." + key + ".endpoint");
             auto access_key_id = config.getString(config_elem + "." + key + ".access_key_id", "");
             auto secret_access_key = config.getString(config_elem + "." + key + ".secret_access_key", "");
+            auto region = config.getString(config_elem + "." + key + ".region", "");
             auto server_side_encryption_customer_key_base64 = config.getString(config_elem + "." + key + ".server_side_encryption_customer_key_base64", "");
             std::optional<bool> use_environment_credentials;
             if (config.has(config_elem + "." + key + ".use_environment_credentials"))
             {
                 use_environment_credentials = config.getBool(config_elem + "." + key + ".use_environment_credentials");
             }
+            std::optional<bool> use_insecure_imds_request;
+            if (config.has(config_elem + "." + key + ".use_insecure_imds_request"))
+            {
+                use_insecure_imds_request = config.getBool(config_elem + "." + key + ".use_insecure_imds_request");
+            }
 
             HeaderCollection headers;
             Poco::Util::AbstractConfiguration::Keys subconfig_keys;
@@ -52,7 +58,14 @@ void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::U
                 }
             }
 
-            settings.emplace(endpoint, S3AuthSettings{std::move(access_key_id), std::move(secret_access_key), std::move(server_side_encryption_customer_key_base64), std::move(headers), use_environment_credentials});
+            settings.emplace(endpoint, S3AuthSettings{
+                    std::move(access_key_id), std::move(secret_access_key),
+                    std::move(region),
+                    std::move(server_side_encryption_customer_key_base64),
+                    std::move(headers),
+                    use_environment_credentials,
+                    use_insecure_imds_request
+                });
         }
     }
 }
diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h
index 29c6c3bb415..63f758c816e 100644
--- a/src/Storages/StorageS3Settings.h
+++ b/src/Storages/StorageS3Settings.h
@@ -28,17 +28,22 @@ struct S3AuthSettings
 {
     String access_key_id;
     String secret_access_key;
+    String region;
     String server_side_encryption_customer_key_base64;
 
     HeaderCollection headers;
 
     std::optional<bool> use_environment_credentials;
+    std::optional<bool> use_insecure_imds_request;
 
     inline bool operator==(const S3AuthSettings & other) const
     {
         return access_key_id == other.access_key_id && secret_access_key == other.secret_access_key
-            && server_side_encryption_customer_key_base64 == other.server_side_encryption_customer_key_base64 && headers == other.headers
-            && use_environment_credentials == other.use_environment_credentials;
+            && region == other.region
+            && server_side_encryption_customer_key_base64 == other.server_side_encryption_customer_key_base64
+            && headers == other.headers
+            && use_environment_credentials == other.use_environment_credentials
+            && use_insecure_imds_request == other.use_insecure_imds_request;
     }
 };
 
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index d64042f0c1e..f585a5747b8 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -99,7 +99,7 @@ void SetOrJoinBlockOutputStream::writeSuffix()
 }
 
 
-BlockOutputStreamPtr StorageSetOrJoinBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & /*context*/)
+BlockOutputStreamPtr StorageSetOrJoinBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
 {
     UInt64 id = ++increment;
     return std::make_shared<SetOrJoinBlockOutputStream>(*this, metadata_snapshot, path, path + "tmp/", toString(id) + ".bin", persistent);
@@ -112,14 +112,14 @@ StorageSetOrJoinBase::StorageSetOrJoinBase(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
+    const String & comment,
     bool persistent_)
-    : IStorage(table_id_),
-    disk(disk_),
-    persistent(persistent_)
+    : IStorage(table_id_), disk(disk_), persistent(persistent_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
 
@@ -136,9 +136,10 @@ StorageSet::StorageSet(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
+    const String & comment,
     bool persistent_)
-    : StorageSetOrJoinBase{disk_, relative_path_, table_id_, columns_, constraints_, persistent_},
-    set(std::make_shared<Set>(SizeLimits(), false, true))
+    : StorageSetOrJoinBase{disk_, relative_path_, table_id_, columns_, constraints_, comment, persistent_}
+    , set(std::make_shared<Set>(SizeLimits(), false, true))
 {
 
     Block header = getInMemoryMetadataPtr()->getSampleBlock();
@@ -156,7 +157,7 @@ size_t StorageSet::getSize() 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(); }
 
-void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &)
+void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &)
 {
     disk->removeRecursive(path);
     disk->createDirectories(path);
@@ -246,8 +247,9 @@ void registerStorageSet(StorageFactory & factory)
         if (has_settings)
             set_settings.loadFromQuery(*args.storage_def);
 
-        DiskPtr disk = args.context.getDisk(set_settings.disk);
-        return StorageSet::create(disk, args.relative_data_path, args.table_id, args.columns, args.constraints, set_settings.persistent);
+        DiskPtr disk = args.getContext()->getDisk(set_settings.disk);
+        return StorageSet::create(
+            disk, args.relative_data_path, args.table_id, args.columns, args.constraints, args.comment, set_settings.persistent);
     }, StorageFactory::StorageFeatures{ .supports_settings = true, });
 }
 
diff --git a/src/Storages/StorageSet.h b/src/Storages/StorageSet.h
index 9b9078f7dd5..5dd497527a9 100644
--- a/src/Storages/StorageSet.h
+++ b/src/Storages/StorageSet.h
@@ -23,7 +23,7 @@ class StorageSetOrJoinBase : public IStorage
 public:
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {path}; }
@@ -35,6 +35,7 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         bool persistent_);
 
     DiskPtr disk;
@@ -72,7 +73,7 @@ public:
     /// Access the insides.
     SetPtr & getSet() { return set; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
@@ -91,6 +92,7 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         bool persistent_);
 };
 
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index db4fbff78cd..36b10dfd2bb 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -228,6 +228,11 @@ public:
         storage.file_checker.save();
 
         done = true;
+
+        /// unlock should be done from the same thread as lock, and dtor may be
+        /// called from different thread, so it should be done here (at least in
+        /// case of no exceptions occurred)
+        lock.unlock();
     }
 
 private:
@@ -253,6 +258,7 @@ StorageStripeLog::StorageStripeLog(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
+    const String & comment,
     bool attach,
     size_t max_compress_block_size_)
     : IStorage(table_id_)
@@ -265,6 +271,7 @@ StorageStripeLog::StorageStripeLog(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
     if (relative_path_.empty())
@@ -302,9 +309,9 @@ void StorageStripeLog::rename(const String & new_path_to_table_data, const Stora
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
@@ -316,7 +323,7 @@ Pipe StorageStripeLog::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     unsigned num_streams)
@@ -353,7 +360,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, context->getSettingsRef().max_read_buffer_size, 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.
@@ -362,7 +369,7 @@ Pipe StorageStripeLog::read(
 }
 
 
-BlockOutputStreamPtr StorageStripeLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageStripeLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     std::unique_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -372,7 +379,7 @@ BlockOutputStreamPtr StorageStripeLog::write(const ASTPtr & /*query*/, const Sto
 }
 
 
-CheckResults StorageStripeLog::checkData(const ASTPtr & /* query */, const Context & context)
+CheckResults StorageStripeLog::checkData(const ASTPtr & /* query */, ContextPtr context)
 {
     std::shared_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -381,7 +388,7 @@ CheckResults StorageStripeLog::checkData(const ASTPtr & /* query */, const Conte
     return file_checker.check();
 }
 
-void StorageStripeLog::truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder &)
+void StorageStripeLog::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
 {
     disk->clearDirectory(table_path);
     file_checker = FileChecker{disk, table_path + "sizes.json"};
@@ -402,11 +409,17 @@ void registerStorageStripeLog(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         String disk_name = getDiskName(*args.storage_def);
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         return StorageStripeLog::create(
-            disk, args.relative_data_path, args.table_id, args.columns, args.constraints,
-            args.attach, args.context.getSettings().max_compress_block_size);
+            disk,
+            args.relative_data_path,
+            args.table_id,
+            args.columns,
+            args.constraints,
+            args.comment,
+            args.attach,
+            args.getContext()->getSettings().max_compress_block_size);
     }, features);
 }
 
diff --git a/src/Storages/StorageStripeLog.h b/src/Storages/StorageStripeLog.h
index 5782e2526d3..21dbbd4bae8 100644
--- a/src/Storages/StorageStripeLog.h
+++ b/src/Storages/StorageStripeLog.h
@@ -29,21 +29,21 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) override;
+    CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {DB::fullPath(disk, table_path)}; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr &, const Context &, TableExclusiveLockHolder&) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder&) override;
 
 protected:
     StorageStripeLog(
@@ -52,6 +52,7 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         bool attach,
         size_t max_compress_block_size_);
 
@@ -68,7 +69,7 @@ private:
     size_t max_compress_block_size;
 
     FileChecker file_checker;
-    mutable std::shared_timed_mutex rwlock;
+    std::shared_timed_mutex rwlock;
 
     Poco::Logger * log;
 };
diff --git a/src/Storages/StorageTableFunction.h b/src/Storages/StorageTableFunction.h
index adb54d65bb4..859735fec5b 100644
--- a/src/Storages/StorageTableFunction.h
+++ b/src/Storages/StorageTableFunction.h
@@ -62,6 +62,13 @@ public:
             nested->shutdown();
     }
 
+    void flush() override
+    {
+        std::lock_guard lock{nested_mutex};
+        if (nested)
+            nested->flush();
+    }
+
     void drop() override
     {
         std::lock_guard lock{nested_mutex};
@@ -73,7 +80,7 @@ public:
             const Names & column_names,
             const StorageMetadataPtr & metadata_snapshot,
             SelectQueryInfo & query_info,
-            const Context & context,
+            ContextPtr context,
             QueryProcessingStage::Enum processed_stage,
             size_t max_block_size,
             unsigned num_streams) override
@@ -96,7 +103,7 @@ public:
                     ActionsDAG::MatchColumnsMode::Name);
             auto convert_actions = std::make_shared<ExpressionActions>(
                 convert_actions_dag,
-                ExpressionActionsSettings::fromSettings(context.getSettingsRef()));
+                ExpressionActionsSettings::fromSettings(context->getSettingsRef(), CompileExpressions::yes));
 
             pipe.addSimpleTransform([&](const Block & header)
             {
@@ -109,7 +116,7 @@ public:
     BlockOutputStreamPtr write(
             const ASTPtr & query,
             const StorageMetadataPtr & metadata_snapshot,
-            const Context & context) override
+            ContextPtr context) override
     {
         auto storage = getNested();
         auto cached_structure = metadata_snapshot->getSampleBlock();
diff --git a/src/Storages/StorageTinyLog.cpp b/src/Storages/StorageTinyLog.cpp
index 6ce41dac614..689b1307f4d 100644
--- a/src/Storages/StorageTinyLog.cpp
+++ b/src/Storages/StorageTinyLog.cpp
@@ -358,6 +358,9 @@ void TinyLogBlockOutputStream::writeSuffix()
         storage.file_checker.update(file);
     storage.file_checker.save();
 
+    /// unlock should be done from the same thread as lock, and dtor may be
+    /// called from different thread, so it should be done here (at least in
+    /// case of no exceptions occurred)
     lock.unlock();
 }
 
@@ -383,6 +386,7 @@ StorageTinyLog::StorageTinyLog(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
+    const String & comment,
     bool attach,
     size_t max_compress_block_size_)
     : IStorage(table_id_)
@@ -395,6 +399,7 @@ StorageTinyLog::StorageTinyLog(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
     if (relative_path_.empty())
@@ -462,9 +467,9 @@ void StorageTinyLog::rename(const String & new_path_to_table_data, const Storage
 }
 
 
-static std::chrono::seconds getLockTimeout(const Context & context)
+static std::chrono::seconds getLockTimeout(ContextPtr context)
 {
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
     if (settings.max_execution_time.totalSeconds() != 0 && settings.max_execution_time.totalSeconds() < lock_timeout)
         lock_timeout = settings.max_execution_time.totalSeconds();
@@ -476,7 +481,7 @@ Pipe StorageTinyLog::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*num_streams*/)
@@ -487,7 +492,7 @@ 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();
+    const Settings & settings = context->getSettingsRef();
 
     std::shared_lock lock{rwlock, getLockTimeout(context)};
     if (!lock)
@@ -503,13 +508,13 @@ Pipe StorageTinyLog::read(
 }
 
 
-BlockOutputStreamPtr StorageTinyLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageTinyLog::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     return std::make_shared<TinyLogBlockOutputStream>(*this, metadata_snapshot, std::unique_lock{rwlock, getLockTimeout(context)});
 }
 
 
-CheckResults StorageTinyLog::checkData(const ASTPtr & /* query */, const Context & context)
+CheckResults StorageTinyLog::checkData(const ASTPtr & /* query */, ContextPtr context)
 {
     std::shared_lock lock(rwlock, getLockTimeout(context));
     if (!lock)
@@ -519,7 +524,7 @@ CheckResults StorageTinyLog::checkData(const ASTPtr & /* query */, const Context
 }
 
 void StorageTinyLog::truncate(
-    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &)
+    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &)
 {
     disk->clearDirectory(table_path);
 
@@ -545,11 +550,17 @@ void registerStorageTinyLog(StorageFactory & factory)
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         String disk_name = getDiskName(*args.storage_def);
-        DiskPtr disk = args.context.getDisk(disk_name);
+        DiskPtr disk = args.getContext()->getDisk(disk_name);
 
         return StorageTinyLog::create(
-            disk, args.relative_data_path, args.table_id, args.columns, args.constraints,
-            args.attach, args.context.getSettings().max_compress_block_size);
+            disk,
+            args.relative_data_path,
+            args.table_id,
+            args.columns,
+            args.constraints,
+            args.comment,
+            args.attach,
+            args.getContext()->getSettings().max_compress_block_size);
     }, features);
 }
 
diff --git a/src/Storages/StorageTinyLog.h b/src/Storages/StorageTinyLog.h
index 1187f7f905d..72cf1ce7e2e 100644
--- a/src/Storages/StorageTinyLog.h
+++ b/src/Storages/StorageTinyLog.h
@@ -28,22 +28,22 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     void rename(const String & new_path_to_table_data, const StorageID & new_table_id) override;
 
-    CheckResults checkData(const ASTPtr & /* query */, const Context & /* context */) override;
+    CheckResults checkData(const ASTPtr & /* query */, ContextPtr /* context */) override;
 
     bool storesDataOnDisk() const override { return true; }
     Strings getDataPaths() const override { return {DB::fullPath(disk, table_path)}; }
     bool supportsSubcolumns() const override { return true; }
 
-    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, const Context &, TableExclusiveLockHolder &) override;
+    void truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder &) override;
 
 protected:
     StorageTinyLog(
@@ -52,6 +52,7 @@ protected:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         bool attach,
         size_t max_compress_block_size_);
 
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 2d3879340dc..fd9453e632c 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -1,4 +1,3 @@
-#include <Storages/StorageFactory.h>
 #include <Storages/StorageURL.h>
 
 #include <Interpreters/Context.h>
@@ -22,6 +21,8 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/Pipe.h>
+#include <common/logger_useful.h>
+#include <algorithm>
 
 
 namespace DB
@@ -29,26 +30,25 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int NETWORK_ERROR;
 }
 
 IStorageURLBase::IStorageURLBase(
     const Poco::URI & uri_,
-    const Context & /*context_*/,
+    ContextPtr /*context_*/,
     const StorageID & table_id_,
     const String & format_name_,
     const std::optional<FormatSettings> & format_settings_,
     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_)
+    : IStorage(table_id_), uri(uri_), compression_method(compression_method_), format_name(format_name_), format_settings(format_settings_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     storage_metadata.setConstraints(constraints_);
+    storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -64,7 +64,7 @@ namespace
             const std::optional<FormatSettings> & format_settings,
             String name_,
             const Block & sample_block,
-            const Context & context,
+            ContextPtr context,
             const ColumnsDescription & columns,
             UInt64 max_block_size,
             const ConnectionTimeouts & timeouts,
@@ -77,7 +77,7 @@ namespace
             if (CurrentThread::isInitialized())
             {
                 const auto & thread_trace_context = CurrentThread::get().thread_trace_context;
-                if (thread_trace_context.trace_id)
+                if (thread_trace_context.trace_id != UUID())
                 {
                     header.emplace_back("traceparent",
                         thread_trace_context.composeTraceparentHeader());
@@ -96,11 +96,11 @@ namespace
                     method,
                     std::move(callback),
                     timeouts,
-                    context.getSettingsRef().max_http_get_redirects,
+                    context->getSettingsRef().max_http_get_redirects,
                     Poco::Net::HTTPBasicCredentials{},
                     DBMS_DEFAULT_BUFFER_SIZE,
                     header,
-                    context.getRemoteHostFilter()),
+                    context->getRemoteHostFilter()),
                 compression_method);
 
             auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size, format_settings);
@@ -144,7 +144,7 @@ StorageURLBlockOutputStream::StorageURLBlockOutputStream(const Poco::URI & uri,
         const String & format,
         const std::optional<FormatSettings> & format_settings,
         const Block & sample_block_,
-        const Context & context,
+        ContextPtr context,
         const ConnectionTimeouts & timeouts,
         const CompressionMethod compression_method)
         : sample_block(sample_block_)
@@ -184,7 +184,7 @@ std::vector<std::pair<std::string, std::string>> IStorageURLBase::getReadURIPara
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     const SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -195,7 +195,7 @@ std::function<void(std::ostream &)> IStorageURLBase::getReadPOSTDataCallback(
     const Names & /*column_names*/,
     const StorageMetadataPtr & /*metadata_snapshot*/,
     const SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -207,13 +207,13 @@ Pipe IStorageURLBase::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned /*num_streams*/)
 {
     auto request_uri = uri;
-    auto params = getReadURIParams(column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size);
+    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);
 
@@ -222,19 +222,74 @@ Pipe IStorageURLBase::read(
         getReadMethod(),
         getReadPOSTDataCallback(
             column_names, metadata_snapshot, query_info,
-            context, processed_stage, max_block_size),
+            local_context, processed_stage, max_block_size),
         format_name,
         format_settings,
         getName(),
         getHeaderBlock(column_names, metadata_snapshot),
-        context,
+        local_context,
         metadata_snapshot->getColumns(),
         max_block_size,
-        ConnectionTimeouts::getHTTPTimeouts(context),
+        ConnectionTimeouts::getHTTPTimeouts(local_context),
         chooseCompressionMethod(request_uri.getPath(), compression_method)));
 }
 
-BlockOutputStreamPtr IStorageURLBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+
+Pipe StorageURLWithFailover::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*/)
+{
+    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());
+}
+
+
+BlockOutputStreamPtr IStorageURLBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     return std::make_shared<StorageURLBlockOutputStream>(uri, format_name,
         format_settings, metadata_snapshot->getSampleBlock(), context,
@@ -242,20 +297,79 @@ BlockOutputStreamPtr IStorageURLBase::write(const ASTPtr & /*query*/, const Stor
         chooseCompressionMethod(uri.toString(), compression_method));
 }
 
-StorageURL::StorageURL(const Poco::URI & uri_,
-           const StorageID & table_id_,
-           const String & format_name_,
-           const std::optional<FormatSettings> & format_settings_,
-           const ColumnsDescription & columns_,
-           const ConstraintsDescription & constraints_,
-           Context & context_,
-           const String & compression_method_)
-    : IStorageURLBase(uri_, context_, table_id_, format_name_,
-                      format_settings_, columns_, constraints_, compression_method_)
+StorageURL::StorageURL(
+    const Poco::URI & uri_,
+    const StorageID & table_id_,
+    const String & format_name_,
+    const std::optional<FormatSettings> & format_settings_,
+    const ColumnsDescription & columns_,
+    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_)
 {
-    context_.getRemoteHostFilter().checkURL(uri);
+    context_->getRemoteHostFilter().checkURL(uri);
 }
 
+
+StorageURLWithFailover::StorageURLWithFailover(
+    const std::vector<String> & uri_options_,
+    const StorageID & table_id_,
+    const String & format_name_,
+    const std::optional<FormatSettings> & format_settings_,
+    const ColumnsDescription & columns_,
+    const ConstraintsDescription & constraints_,
+    ContextPtr context_,
+    const String & compression_method_)
+    : StorageURL(Poco::URI(), table_id_, format_name_, format_settings_, columns_, constraints_, String{}, context_, compression_method_)
+{
+    for (const auto & uri_option : uri_options_)
+    {
+        Poco::URI poco_uri(uri_option);
+        context_->getRemoteHostFilter().checkURL(poco_uri);
+        uri_options.emplace_back(std::move(poco_uri));
+        LOG_DEBUG(&Poco::Logger::get("StorageURLDistributed"), "Adding URL option: {}", uri_option);
+    }
+}
+
+
+FormatSettings StorageURL::getFormatSettingsFromArgs(const StorageFactory::Arguments & args)
+{
+    // Use format settings from global server context + settings from
+    // the SETTINGS clause of the create query. Settings from current
+    // session and user are ignored.
+    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());
+    }
+
+    return format_settings;
+}
+
+
 void registerStorageURL(StorageFactory & factory)
 {
     factory.registerStorage("URL", [](const StorageFactory::Arguments & args)
@@ -266,62 +380,33 @@ void registerStorageURL(StorageFactory & factory)
             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.local_context);
+        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.getLocalContext());
 
-        String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         Poco::URI uri(url);
 
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
+        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
 
-        String format_name = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        const String & format_name = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
 
-        String compression_method;
+        String compression_method = "auto";
         if (engine_args.size() == 3)
         {
-            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context);
+            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
             compression_method = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         }
-        else
-        {
-            compression_method = "auto";
-        }
 
-        // Use format settings from global server context + settings from
-        // the SETTINGS clause of the create query. Settings from current
-        // session and user are ignored.
-        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.context.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.context,
-                user_format_settings);
-        }
-        else
-        {
-            format_settings = getFormatSettings(args.context);
-        }
+        auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
 
         return StorageURL::create(
             uri,
             args.table_id,
             format_name,
             format_settings,
-            args.columns, args.constraints, args.context,
+            args.columns,
+            args.constraints,
+            args.comment,
+            args.getContext(),
             compression_method);
     },
     {
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 2b2384b1043..e1aa1735936 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -6,6 +6,7 @@
 #include <DataStreams/IBlockOutputStream.h>
 #include <Formats/FormatSettings.h>
 #include <IO/CompressionMethod.h>
+#include <Storages/StorageFactory.h>
 
 
 namespace DB
@@ -26,22 +27,23 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
 protected:
     IStorageURLBase(
         const Poco::URI & uri_,
-        const Context & context_,
+        ContextPtr context_,
         const StorageID & id_,
         const String & format_name_,
         const std::optional<FormatSettings> & format_settings_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
+        const String & comment,
         const String & compression_method_);
 
     Poco::URI uri;
@@ -53,14 +55,13 @@ protected:
     // In this case, format_settings is not set.
     std::optional<FormatSettings> format_settings;
 
-private:
     virtual std::string getReadMethod() const;
 
     virtual std::vector<std::pair<std::string, std::string>> getReadURIParams(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const;
 
@@ -68,10 +69,11 @@ private:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const;
 
+private:
     virtual Block getHeaderBlock(const Names & column_names, const StorageMetadataPtr & metadata_snapshot) const = 0;
 };
 
@@ -83,9 +85,9 @@ public:
         const String & format,
         const std::optional<FormatSettings> & format_settings,
         const Block & sample_block_,
-        const Context & context,
+        ContextPtr context,
         const ConnectionTimeouts & timeouts,
-        const CompressionMethod compression_method);
+        CompressionMethod compression_method);
 
     Block getHeader() const override
     {
@@ -102,18 +104,20 @@ private:
     BlockOutputStreamPtr writer;
 };
 
-class StorageURL final : public ext::shared_ptr_helper<StorageURL>, public IStorageURLBase
+class StorageURL : public ext::shared_ptr_helper<StorageURL>, public IStorageURLBase
 {
     friend struct ext::shared_ptr_helper<StorageURL>;
 public:
-    StorageURL(const Poco::URI & uri_,
-            const StorageID & table_id_,
-            const String & format_name_,
-            const std::optional<FormatSettings> & format_settings_,
-            const ColumnsDescription & columns_,
-            const ConstraintsDescription & constraints_,
-            Context & context_,
-            const String & compression_method_);
+    StorageURL(
+        const Poco::URI & uri_,
+        const StorageID & table_id_,
+        const String & format_name_,
+        const std::optional<FormatSettings> & format_settings_,
+        const ColumnsDescription & columns_,
+        const ConstraintsDescription & constraints_,
+        const String & comment,
+        ContextPtr context_,
+        const String & compression_method_);
 
     String getName() const override
     {
@@ -124,5 +128,35 @@ public:
     {
         return metadata_snapshot->getSampleBlock();
     }
+
+    static FormatSettings getFormatSettingsFromArgs(const StorageFactory::Arguments & args);
+};
+
+
+/// StorageURLWithFailover is allowed only for URL table function, not as a separate storage.
+class StorageURLWithFailover final : public StorageURL
+{
+public:
+    StorageURLWithFailover(
+            const std::vector<String> & uri_options_,
+            const StorageID & table_id_,
+            const String & format_name_,
+            const std::optional<FormatSettings> & format_settings_,
+            const ColumnsDescription & columns_,
+            const ConstraintsDescription & constraints_,
+            ContextPtr context_,
+            const String & compression_method_);
+
+    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;
+
+private:
+    std::vector<Poco::URI> uri_options;
 };
 }
diff --git a/src/Storages/StorageValues.cpp b/src/Storages/StorageValues.cpp
index 500deac5f25..ace5ca3667c 100644
--- a/src/Storages/StorageValues.cpp
+++ b/src/Storages/StorageValues.cpp
@@ -24,7 +24,7 @@ Pipe StorageValues::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     unsigned /*num_streams*/)
diff --git a/src/Storages/StorageValues.h b/src/Storages/StorageValues.h
index 5729f245149..6ae33ed70f1 100644
--- a/src/Storages/StorageValues.h
+++ b/src/Storages/StorageValues.h
@@ -19,7 +19,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index bcaf63152c1..a83e0f62c29 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -31,13 +31,12 @@ namespace ErrorCodes
 
 
 StorageView::StorageView(
-    const StorageID & table_id_,
-    const ASTCreateQuery & query,
-    const ColumnsDescription & columns_)
+    const StorageID & table_id_, const ASTCreateQuery & query, const ColumnsDescription & columns_, const String & comment)
     : IStorage(table_id_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
+    storage_metadata.setComment(comment);
 
     if (!query.select)
         throw Exception("SELECT query is not specified for " + getName(), ErrorCodes::INCORRECT_QUERY);
@@ -54,7 +53,7 @@ Pipe StorageView::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     const size_t max_block_size,
     const unsigned num_streams)
@@ -71,7 +70,7 @@ void StorageView::read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         const size_t /*max_block_size*/,
         const unsigned /*num_streams*/)
@@ -173,7 +172,7 @@ void registerStorageView(StorageFactory & factory)
         if (args.query.storage)
             throw Exception("Specifying ENGINE is not allowed for a View", ErrorCodes::INCORRECT_QUERY);
 
-        return StorageView::create(args.table_id, args.query, args.columns);
+        return StorageView::create(args.table_id, args.query, args.columns, args.comment);
     });
 }
 
diff --git a/src/Storages/StorageView.h b/src/Storages/StorageView.h
index 6f894ce2775..b5b8ae2dd8e 100644
--- a/src/Storages/StorageView.h
+++ b/src/Storages/StorageView.h
@@ -25,7 +25,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -35,7 +35,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -49,10 +49,7 @@ public:
     static ASTPtr restoreViewName(ASTSelectQuery & select_query, const ASTPtr & view_name);
 
 protected:
-    StorageView(
-        const StorageID & table_id_,
-        const ASTCreateQuery & query,
-        const ColumnsDescription & columns_);
+    StorageView(const StorageID & table_id_, const ASTCreateQuery & query, const ColumnsDescription & columns_, const String & comment);
 };
 
 }
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index f2f8cdb23f5..9cffc32fda1 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -8,12 +8,13 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTLiteral.h>
 #include <Poco/Net/HTTPRequest.h>
-#include <Poco/Path.h>
 #include <Processors/Pipe.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageURL.h>
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <common/logger_useful.h>
+#include <Common/escapeForFileName.h>
+
 
 namespace DB
 {
@@ -28,17 +29,20 @@ StorageXDBC::StorageXDBC(
     const std::string & remote_database_name_,
     const std::string & remote_table_name_,
     const ColumnsDescription & columns_,
-    const Context & context_,
+    const String & comment,
+    ContextPtr context_,
     const BridgeHelperPtr bridge_helper_)
     /// Please add support for constraints as soon as StorageODBC or JDBC will support insertion.
-    : IStorageURLBase(Poco::URI(),
-                      context_,
-                      table_id_,
-                      IXDBCBridgeHelper::DEFAULT_FORMAT,
-                      getFormatSettings(context_),
-                      columns_,
-                      ConstraintsDescription{},
-                      "" /* CompressionMethod */)
+    : IStorageURLBase(
+        Poco::URI(),
+        context_,
+        table_id_,
+        IXDBCBridgeHelper::DEFAULT_FORMAT,
+        getFormatSettings(context_),
+        columns_,
+        ConstraintsDescription{},
+        comment,
+        "" /* CompressionMethod */)
     , bridge_helper(bridge_helper_)
     , remote_database_name(remote_database_name_)
     , remote_table_name(remote_table_name_)
@@ -53,27 +57,21 @@ std::string StorageXDBC::getReadMethod() const
 }
 
 std::vector<std::pair<std::string, std::string>> StorageXDBC::getReadURIParams(
-    const Names & column_names,
-    const StorageMetadataPtr & metadata_snapshot,
+    const Names & /* column_names */,
+    const StorageMetadataPtr & /* metadata_snapshot */,
     const SelectQueryInfo & /*query_info*/,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t max_block_size) const
 {
-    NamesAndTypesList cols;
-    for (const String & name : column_names)
-    {
-        auto column_data = metadata_snapshot->getColumns().getPhysical(name);
-        cols.emplace_back(column_data.name, column_data.type);
-    }
-    return bridge_helper->getURLParams(cols.toString(), max_block_size);
+    return bridge_helper->getURLParams(max_block_size);
 }
 
 std::function<void(std::ostream &)> StorageXDBC::getReadPOSTDataCallback(
-    const Names & /*column_names*/,
+    const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -82,16 +80,30 @@ std::function<void(std::ostream &)> StorageXDBC::getReadPOSTDataCallback(
         bridge_helper->getIdentifierQuotingStyle(),
         remote_database_name,
         remote_table_name,
-        context);
+        local_context);
 
-    return [query](std::ostream & os) { os << "query=" << query; };
+    NamesAndTypesList cols;
+    for (const String & name : column_names)
+    {
+        auto column_data = metadata_snapshot->getColumns().getPhysical(name);
+        cols.emplace_back(column_data.name, column_data.type);
+    }
+
+    auto write_body_callback = [query, cols](std::ostream & os)
+    {
+        os << "sample_block=" << escapeForFileName(cols.toString());
+        os << "&";
+        os << "query=" << escapeForFileName(query);
+    };
+
+    return write_body_callback;
 }
 
 Pipe StorageXDBC::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr local_context,
     QueryProcessingStage::Enum processed_stage,
     size_t max_block_size,
     unsigned num_streams)
@@ -99,35 +111,32 @@ Pipe StorageXDBC::read(
     metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
 
     bridge_helper->startBridgeSync();
-    return IStorageURLBase::read(column_names, metadata_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
+    return IStorageURLBase::read(column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
 }
 
-BlockOutputStreamPtr StorageXDBC::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, const Context & context)
+BlockOutputStreamPtr StorageXDBC::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     bridge_helper->startBridgeSync();
 
-    NamesAndTypesList cols;
     Poco::URI request_uri = uri;
     request_uri.setPath("/write");
-    for (const String & name : metadata_snapshot->getSampleBlock().getNames())
-    {
-        auto column_data = metadata_snapshot->getColumns().getPhysical(name);
-        cols.emplace_back(column_data.name, column_data.type);
-    }
-    auto url_params = bridge_helper->getURLParams(cols.toString(), 65536);
+
+    auto url_params = bridge_helper->getURLParams(65536);
     for (const auto & [param, value] : url_params)
         request_uri.addQueryParameter(param, value);
+
     request_uri.addQueryParameter("db_name", remote_database_name);
     request_uri.addQueryParameter("table_name", remote_table_name);
     request_uri.addQueryParameter("format_name", format_name);
+    request_uri.addQueryParameter("sample_block", metadata_snapshot->getSampleBlock().getNamesAndTypesList().toString());
 
     return std::make_shared<StorageURLBlockOutputStream>(
         request_uri,
         format_name,
-        getFormatSettings(context),
+        getFormatSettings(local_context),
         metadata_snapshot->getSampleBlock(),
-        context,
-        ConnectionTimeouts::getHTTPTimeouts(context),
+        local_context,
+        ConnectionTimeouts::getHTTPTimeouts(local_context),
         chooseCompressionMethod(uri.toString(), compression_method));
 }
 
@@ -155,16 +164,18 @@ namespace
                     ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
             for (size_t i = 0; i < 3; ++i)
-                engine_args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[i], args.local_context);
+                engine_args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[i], args.getLocalContext());
 
-            BridgeHelperPtr bridge_helper = std::make_shared<XDBCBridgeHelper<BridgeHelperMixin>>(args.context,
-                args.context.getSettingsRef().http_receive_timeout.value,
+            BridgeHelperPtr bridge_helper = std::make_shared<XDBCBridgeHelper<BridgeHelperMixin>>(args.getContext(),
+                args.getContext()->getSettingsRef().http_receive_timeout.value,
                 engine_args[0]->as<ASTLiteral &>().value.safeGet<String>());
-            return std::make_shared<StorageXDBC>(args.table_id,
+            return std::make_shared<StorageXDBC>(
+                args.table_id,
                 engine_args[1]->as<ASTLiteral &>().value.safeGet<String>(),
                 engine_args[2]->as<ASTLiteral &>().value.safeGet<String>(),
                 args.columns,
-                args.context,
+                args.comment,
+                args.getContext(),
                 bridge_helper);
 
         },
diff --git a/src/Storages/StorageXDBC.h b/src/Storages/StorageXDBC.h
index 8524a03503a..db0b506546d 100644
--- a/src/Storages/StorageXDBC.h
+++ b/src/Storages/StorageXDBC.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/StorageURL.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 
 
 namespace DB
@@ -19,7 +19,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
@@ -29,10 +29,11 @@ public:
         const std::string & remote_database_name,
         const std::string & remote_table_name,
         const ColumnsDescription & columns_,
-        const Context & context_,
+        const String & comment,
+        ContextPtr context_,
         BridgeHelperPtr bridge_helper_);
 
-    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, const Context & context) override;
+    BlockOutputStreamPtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
     std::string getName() const override;
 private:
@@ -49,7 +50,7 @@ private:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const override;
 
@@ -57,7 +58,7 @@ private:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const override;
 
diff --git a/src/Storages/System/CMakeLists.txt b/src/Storages/System/CMakeLists.txt
index a1eb525dceb..7e350932038 100644
--- a/src/Storages/System/CMakeLists.txt
+++ b/src/Storages/System/CMakeLists.txt
@@ -1,17 +1,16 @@
 # The file StorageSystemContributors.cpp is generated at release time and committed to the source tree.
 # You can also regenerate it manually this way:
-# execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/StorageSystemContributors.sh)
+# execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/StorageSystemContributors.sh")
 
-set (CONFIG_BUILD ${CMAKE_CURRENT_BINARY_DIR}/StorageSystemBuildOptions.generated.cpp)
+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)
 
 get_property(TZDATA_VERSION GLOBAL PROPERTY TZDATA_VERSION_PROP)
 
-string (TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
 configure_file (StorageSystemBuildOptions.generated.cpp.in ${CONFIG_BUILD})
 
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(storages_system .)
 list (APPEND storages_system_sources ${CONFIG_BUILD})
 
@@ -28,8 +27,8 @@ endif()
 
 add_dependencies(generate-source generate-contributors)
 
-set(GENERATED_LICENSES_SRC ${CMAKE_CURRENT_BINARY_DIR}/StorageSystemLicenses.generated.cpp)
-set(GENERATED_TIMEZONES_SRC ${CMAKE_CURRENT_BINARY_DIR}/StorageSystemTimeZones.generated.cpp)
+set(GENERATED_LICENSES_SRC "${CMAKE_CURRENT_BINARY_DIR}/StorageSystemLicenses.generated.cpp")
+set(GENERATED_TIMEZONES_SRC "${CMAKE_CURRENT_BINARY_DIR}/StorageSystemTimeZones.generated.cpp")
 
 add_custom_command(
     OUTPUT StorageSystemLicenses.generated.cpp
diff --git a/src/Storages/System/IStorageSystemOneBlock.h b/src/Storages/System/IStorageSystemOneBlock.h
index d83a71c2592..fdc966130ad 100644
--- a/src/Storages/System/IStorageSystemOneBlock.h
+++ b/src/Storages/System/IStorageSystemOneBlock.h
@@ -12,13 +12,22 @@ namespace DB
 class Context;
 
 
-/** Base class for system tables whose all columns have String type.
+/** IStorageSystemOneBlock is base class for system tables whose all columns can be synchronously fetched.
+  *
+  * Client class need to provide static method static NamesAndTypesList getNamesAndTypes() that will return list of column names and
+  * their types. IStorageSystemOneBlock during read will create result columns in same order as result of getNamesAndTypes
+  * and pass it with fillData method.
+  *
+  * Client also must override fillData and fill result columns.
+  *
+  * If subclass want to support virtual columns, it should override getVirtuals method of IStorage interface.
+  * IStorageSystemOneBlock will add virtuals columns at the end of result columns of fillData method.
   */
 template <typename Self>
 class IStorageSystemOneBlock : public IStorage
 {
 protected:
-    virtual void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const = 0;
+    virtual void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const = 0;
 
 public:
 #if defined(ARCADIA_BUILD)
@@ -36,14 +45,15 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum /*processed_stage*/,
         size_t /*max_block_size*/,
         unsigned /*num_streams*/) override
     {
-        metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
+        auto virtuals_names_and_types = getVirtuals();
+        metadata_snapshot->check(column_names, virtuals_names_and_types, getStorageID());
 
-        Block sample_block = metadata_snapshot->getSampleBlock();
+        Block sample_block = metadata_snapshot->getSampleBlockWithVirtuals(virtuals_names_and_types);
         MutableColumns res_columns = sample_block.cloneEmptyColumns();
         fillData(res_columns, context, query_info);
 
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
index c0dd5cc85d3..c2d82c6cd7c 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
@@ -12,13 +12,13 @@ NamesAndTypesList StorageSystemAggregateFunctionCombinators::getNamesAndTypes()
     };
 }
 
-void StorageSystemAggregateFunctionCombinators::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemAggregateFunctionCombinators::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & combinators = AggregateFunctionCombinatorFactory::instance().getAllAggregateFunctionCombinators();
     for (const auto & pair : combinators)
     {
-        res_columns[0]->insert(pair.first);
-        res_columns[1]->insert(pair.second->isForInternalUsageOnly());
+        res_columns[0]->insert(pair.name);
+        res_columns[1]->insert(pair.combinator_ptr->isForInternalUsageOnly());
     }
 }
 
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
index 8d204020160..a978bfbface 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
@@ -12,7 +12,7 @@ class StorageSystemAggregateFunctionCombinators final : public ext::shared_ptr_h
 {
     friend struct ext::shared_ptr_helper<StorageSystemAggregateFunctionCombinators>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 public:
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.cpp b/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
index 8dabac4fb49..70e12440678 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
@@ -21,7 +21,7 @@ StorageSystemAsynchronousMetrics::StorageSystemAsynchronousMetrics(const Storage
 {
 }
 
-void StorageSystemAsynchronousMetrics::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemAsynchronousMetrics::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     auto async_metrics_values = async_metrics.getValues();
     for (const auto & name_value : async_metrics_values)
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.h b/src/Storages/System/StorageSystemAsynchronousMetrics.h
index a2a92d248d8..eee029bbe51 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.h
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.h
@@ -33,7 +33,7 @@ protected:
 #endif
     StorageSystemAsynchronousMetrics(const StorageID & table_id_, const AsynchronousMetrics & async_metrics_);
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    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 a63afcf4ce5..01a60a0235c 100644
--- a/src/Storages/System/StorageSystemBuildOptions.cpp
+++ b/src/Storages/System/StorageSystemBuildOptions.cpp
@@ -16,7 +16,7 @@ NamesAndTypesList StorageSystemBuildOptions::getNamesAndTypes()
     };
 }
 
-void StorageSystemBuildOptions::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemBuildOptions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
 #if !defined(ARCADIA_BUILD)
     for (auto * it = auto_config_build; *it; it += 2)
diff --git a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
index 8ece4219d0c..8fe574da643 100644
--- a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
@@ -1,22 +1,14 @@
 // .cpp autogenerated by cmake
 
-#cmakedefine01 BUILD_DETERMINISTIC
-
 const char * auto_config_build[]
 {
     "VERSION_FULL", "@VERSION_FULL@",
     "VERSION_DESCRIBE", "@VERSION_DESCRIBE@",
     "VERSION_INTEGER", "@VERSION_INTEGER@",
-
-#if BUILD_DETERMINISTIC
     "SYSTEM", "@CMAKE_SYSTEM_NAME@",
-#else
     "VERSION_GITHASH", "@VERSION_GITHASH@",
     "VERSION_REVISION", "@VERSION_REVISION@",
-    "BUILD_DATE", "@BUILD_DATE@",
-    "SYSTEM", "@CMAKE_SYSTEM@",
-#endif
-
+    "VERSION_DATE", "@VERSION_DATE@",
     "BUILD_TYPE", "@CMAKE_BUILD_TYPE@",
     "SYSTEM_PROCESSOR", "@CMAKE_SYSTEM_PROCESSOR@",
     "LIBRARY_ARCHITECTURE", "@CMAKE_LIBRARY_ARCHITECTURE@",
diff --git a/src/Storages/System/StorageSystemBuildOptions.h b/src/Storages/System/StorageSystemBuildOptions.h
index afd27f00bcc..8a22a3dcb45 100644
--- a/src/Storages/System/StorageSystemBuildOptions.h
+++ b/src/Storages/System/StorageSystemBuildOptions.h
@@ -16,7 +16,7 @@ class StorageSystemBuildOptions final : public ext::shared_ptr_helper<StorageSys
 {
     friend struct ext::shared_ptr_helper<StorageSystemBuildOptions>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index e20ce233190..8a3227aafdb 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -29,9 +29,9 @@ NamesAndTypesList StorageSystemClusters::getNamesAndTypes()
 }
 
 
-void StorageSystemClusters::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    for (const auto & name_and_cluster : context.getClusters().getContainer())
+    for (const auto & name_and_cluster : context->getClusters().getContainer())
         writeCluster(res_columns, name_and_cluster);
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index 4f2a843999f..81aefaff1c4 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -28,7 +28,7 @@ protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
     using NameAndCluster = std::pair<String, std::shared_ptr<Cluster>>;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
     static void writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster);
 };
 
diff --git a/src/Storages/System/StorageSystemCollations.cpp b/src/Storages/System/StorageSystemCollations.cpp
index a870a7c7c78..c9343ccd146 100644
--- a/src/Storages/System/StorageSystemCollations.cpp
+++ b/src/Storages/System/StorageSystemCollations.cpp
@@ -13,7 +13,7 @@ NamesAndTypesList StorageSystemCollations::getNamesAndTypes()
     };
 }
 
-void StorageSystemCollations::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemCollations::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (const auto & [locale, lang]: AvailableCollationLocales::instance().getAvailableCollations())
     {
diff --git a/src/Storages/System/StorageSystemCollations.h b/src/Storages/System/StorageSystemCollations.h
index 133acd937a1..454fd968511 100644
--- a/src/Storages/System/StorageSystemCollations.h
+++ b/src/Storages/System/StorageSystemCollations.h
@@ -10,7 +10,7 @@ class StorageSystemCollations final : public ext::shared_ptr_helper<StorageSyste
 {
     friend struct ext::shared_ptr_helper<StorageSystemCollations>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 public:
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index 6726d502071..8f65147bb11 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -65,12 +65,12 @@ public:
         ColumnPtr databases_,
         ColumnPtr tables_,
         Storages storages_,
-        const Context & context)
+        ContextPtr context)
         : SourceWithProgress(header_)
         , columns_mask(std::move(columns_mask_)), max_block_size(max_block_size_)
         , databases(std::move(databases_)), tables(std::move(tables_)), storages(std::move(storages_))
-        , total_tables(tables->size()), access(context.getAccess())
-        , query_id(context.getCurrentQueryId()), lock_acquire_timeout(context.getSettingsRef().lock_acquire_timeout)
+        , total_tables(tables->size()), access(context->getAccess())
+        , query_id(context->getCurrentQueryId()), lock_acquire_timeout(context->getSettingsRef().lock_acquire_timeout)
     {
     }
 
@@ -243,7 +243,7 @@ Pipe StorageSystemColumns::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*num_streams*/)
@@ -289,9 +289,9 @@ Pipe StorageSystemColumns::read(
         }
 
         Tables external_tables;
-        if (context.hasSessionContext())
+        if (context->hasSessionContext())
         {
-            external_tables = context.getSessionContext().getExternalTables();
+            external_tables = context->getSessionContext()->getExternalTables();
             if (!external_tables.empty())
                 database_column_mut->insertDefault(); /// Empty database for external tables.
         }
diff --git a/src/Storages/System/StorageSystemColumns.h b/src/Storages/System/StorageSystemColumns.h
index c4f35485612..5cd8c5b38fd 100644
--- a/src/Storages/System/StorageSystemColumns.h
+++ b/src/Storages/System/StorageSystemColumns.h
@@ -21,7 +21,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemContributors.cpp b/src/Storages/System/StorageSystemContributors.cpp
index cd0f31975cc..ed28be2a4ab 100644
--- a/src/Storages/System/StorageSystemContributors.cpp
+++ b/src/Storages/System/StorageSystemContributors.cpp
@@ -16,7 +16,7 @@ NamesAndTypesList StorageSystemContributors::getNamesAndTypes()
     };
 }
 
-void StorageSystemContributors::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemContributors::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     std::vector<const char *> contributors;
     for (auto * it = auto_contributors; *it; ++it)
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index 46ead225102..a5524aee6ae 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -1,33 +1,43 @@
 // autogenerated by ./StorageSystemContributors.sh
 const char * auto_contributors[] {
+    "박현우",
     "0xflotus",
     "20018712",
     "243f6a88 85a308d3",
     "243f6a8885a308d313198a2e037",
     "3ldar-nasyrov",
     "821008736@qq.com",
+    "abdrakhmanov",
+    "abel-wang",
+    "abyss7",
+    "achimbab",
+    "achulkov2",
+    "adevyatova",
+    "ageraab",
+    "akazz",
     "Akazz",
+    "akonyaev",
+    "akuzm",
     "Alain BERRIER",
     "Albert Kidrachev",
     "Alberto",
-    "Aleksandr Karo",
     "Aleksandra (Ася)",
+    "Aleksandr Karo",
     "Aleksandrov Vladimir",
+    "alekseik1",
     "Aleksei Levushkin",
     "Aleksei Semiglazov",
     "Aleksey",
     "Aleksey Akulovich",
-    "Alex Bocharov",
-    "Alex Karo",
-    "Alex Krash",
-    "Alex Ryndin",
-    "Alex Zatelepin",
+    "alesapin",
+    "Alex",
     "Alexander Avdonkin",
     "Alexander Burmak",
     "Alexander Ermolaev",
-    "Alexander GQ Gerasiov",
     "Alexander Gololobov",
+    "Alexander GQ Gerasiov",
     "Alexander Kazakov",
+    "alexander kozhikhov",
     "Alexander Kozhikhov",
     "Alexander Krasheninnikov",
     "Alexander Kuranoff",
@@ -43,37 +53,53 @@ const char * auto_contributors[] {
     "Alexander Sapin",
     "Alexander Tokmakov",
     "Alexander Tretiakov",
+    "Alexandra Latysheva",
+    "Alexandre Snarskii",
     "Alexandr Kondratev",
     "Alexandr Krasheninnikov",
     "Alexandr Orlov",
-    "Alexandra Latysheva",
-    "Alexandre Snarskii",
+    "Alex Bocharov",
     "Alexei Averchenko",
     "Alexey",
     "Alexey Arno",
     "Alexey Dushechkin",
     "Alexey Elymanov",
     "Alexey Ilyukhov",
+    "alexey-milovidov",
     "Alexey Milovidov",
     "Alexey Tronov",
     "Alexey Vasiliev",
     "Alexey Zatelepin",
+    "Alex Karo",
+    "Alex Krash",
+    "alex.lvxin",
+    "Alex Ryndin",
     "Alexsey Shestakov",
-    "Ali Demirci",
+    "alex-zaitsev",
+    "Alex Zatelepin",
+    "alfredlu",
     "Aliaksandr Pliutau",
     "Aliaksandr Shylau",
+    "Ali Demirci",
+    "amesaru",
+    "Amesaru",
     "Amos Bird",
+    "amoschen",
+    "amudong",
     "Amy Krishnevsky",
-    "AnaUvarova",
     "Anastasiya Rodigina",
     "Anastasiya Tsarkova",
     "Anatoly Pugachev",
+    "ana-uvarova",
+    "AnaUvarova",
     "AndreevDm",
     "Andrei Bodrov",
     "Andrei Chulkov",
+    "andrei-karpliuk",
     "Andrei Nekrashevich",
     "Andrew Grigorev",
     "Andrew Onyshchuk",
+    "andrewsg",
     "Andrey",
     "Andrey Chulkov",
     "Andrey Dudin",
@@ -84,11 +110,16 @@ const char * auto_contributors[] {
     "Andrey Mironov",
     "Andrey Skobtsov",
     "Andrey Urusov",
+    "Andrey Z",
     "Andy Yang",
     "Anmol Arora",
     "Anna",
     "Anna Shakhova",
+    "annvsh",
+    "anrodigina",
     "Anthony N. Simon",
+    "antikvist",
+    "anton",
     "Anton Ivashkin",
     "Anton Kobzev",
     "Anton Kvasha",
@@ -100,81 +131,136 @@ const char * auto_contributors[] {
     "Anton Tikhonov",
     "Anton Yuzhaninov",
     "Anton Zhabolenko",
+    "ap11",
+    "a.palagashvili",
+    "aprudaev",
     "Ariel Robaldo",
     "Arsen Hakobyan",
     "ArtCorp",
     "Artem Andreenko",
+    "Artemeey",
     "Artem Gavrilov",
     "Artem Hnilov",
+    "Artemkin Pavel",
     "Artem Konovalov",
     "Artem Streltsov",
     "Artem Zuikov",
-    "Artemeey",
-    "Artemkin Pavel",
     "Arthur Petukhovsky",
     "Arthur Tokarchuk",
     "Arthur Wong",
+    "artpaul",
     "Artur",
     "Artur Beglaryan",
     "AsiaKorushkina",
+    "asiana21",
     "Atri Sharma",
+    "avasiliev",
+    "avogar",
     "Avogar",
+    "avsharapov",
+    "awesomeleo",
     "Azat Khuzhin",
-    "BSD_Conqueror",
     "Babacar Diassé",
     "Bakhtiyor Ruziev",
     "BanyRule",
     "Baudouin Giard",
     "BayoNet",
+    "benamazing",
+    "benbiti",
+    "Benjamin Naecker",
     "Bertrand Junqua",
+    "bgranvea",
     "Bharat Nallan",
+    "bharatnc",
     "Big Elephant",
     "Bill",
     "BlahGeek",
+    "blazerer",
+    "bluebirddm",
+    "bobrovskij artemij",
     "Bogdan",
     "Bogdan Voronin",
     "BohuTANG",
     "Bolinov",
+    "booknouse",
     "Boris Granveaud",
     "Bowen Masco",
+    "bo zeng",
     "Brett Hoerner",
+    "BSD_Conqueror",
+    "bseng",
     "Bulat Gaifullin",
     "Carbyn",
+    "cekc",
+    "centos7",
+    "champtar",
+    "chang.chen",
+    "changvvb",
     "Chao Ma",
     "Chao Wang",
+    "chasingegg",
+    "chengy8934",
+    "chenqi",
+    "chenxing-xc",
+    "chenxing.xc",
     "Chen Yufei",
+    "chertus",
     "Chienlung Cheung",
+    "chou.fan",
+    "Christian",
     "Ciprian Hacman",
     "Clement Rodriguez",
     "Clément Rodriguez",
     "Colum",
+    "comunodi",
     "Constantin S. Pan",
+    "coraxster",
     "CurtizJ",
-    "DIAOZHAFENG",
+    "damozhaeva",
     "Daniel Bershatsky",
     "Daniel Dao",
     "Daniel Qin",
     "Danila Kutenin",
+    "dankondr",
     "Dao Minh Thuc",
+    "daoready",
     "Daria Mozhaeva",
     "Dario",
-    "DarkWanderer",
     "Darío",
+    "DarkWanderer",
+    "dasmfm",
+    "davydovska",
+    "decaseal",
     "Denis Burlaka",
     "Denis Glazachev",
     "Denis Krivak",
     "Denis Zhuravlev",
     "Denny Crane",
+    "dependabot[bot]",
+    "dependabot-preview[bot]",
     "Derek Perkins",
+    "detailyang",
+    "dfenelonov",
+    "dgrr",
+    "DIAOZHAFENG",
+    "dimarub2000",
     "Ding Xiang Fei",
+    "dinosaur",
+    "divanorama",
+    "dkxiaohei",
+    "dmi-feo",
     "Dmitriev Mikhail",
+    "dmitrii",
     "Dmitrii Kovalkov",
     "Dmitrii Raev",
+    "dmitriiut",
     "Dmitriy",
     "Dmitry",
     "Dmitry Belyavtsev",
     "Dmitry Bilunov",
     "Dmitry Galuza",
+    "Dmitry Krylov",
+    "dmitry kuzmin",
     "Dmitry Luhtionov",
     "Dmitry Moskowski",
     "Dmitry Muzyka",
@@ -185,68 +271,126 @@ const char * auto_contributors[] {
     "Dongdong Yang",
     "DoomzD",
     "Dr. Strange Looker",
+    "eaxdev",
+    "eejoin",
+    "egatov",
+    "Egor O'Sten",
+    "Egor Savin",
     "Ekaterina",
+    "elBroom",
     "Eldar Zaitov",
     "Elena Baskakova",
+    "elenaspb2019",
     "Elghazal Ahmed",
     "Elizaveta Mironyuk",
+    "emakarov",
+    "emhlbmc",
+    "emironyuk",
     "Emmanuel Donin de Rosière",
     "Eric",
     "Eric Daniel",
     "Erixonich",
+    "ermaotech",
     "Ernest Poletaev",
     "Eugene Klimov",
     "Eugene Konkov",
     "Evgenia Sudarikova",
-    "Evgenii Pravda",
     "Evgeniia Sudarikova",
+    "Evgenii Pravda",
     "Evgeniy Gatov",
     "Evgeniy Udodov",
     "Evgeny Konkov",
     "Evgeny Markov",
+    "evtan",
     "Ewout",
-    "Fabian Stäber",
+    "exprmntr",
+    "ezhaka",
+    "f1yegor",
     "Fabiano Francesconi",
+    "Fabian Stäber",
     "Fadi Hadzh",
     "Fan()",
+    "fancno",
+    "FArthur-cmd",
+    "fastio",
+    "favstovol",
     "FawnD2",
     "FeehanG",
+    "felixoid",
+    "felixxdu",
+    "feng lv",
+    "fenglv",
+    "fessmage",
     "FgoDt",
+    "filimonov",
+    "filipe",
     "Filipe Caixeta",
+    "flow",
     "Flowyi",
+    "flynn",
+    "foxxmary",
     "Francisco Barón",
+    "frank",
+    "franklee",
     "Frank Zhao",
+    "fredchenbj",
     "Fruit of Eden",
     "Fullstop000",
+    "fuqi",
+    "Fuwang Hu",
+    "fuwhu",
+    "Fu Zhe",
+    "fuzhe1989",
     "Gagan Arneja",
     "Gao Qiang",
+    "g-arslan",
     "Gary Dotzler",
     "George",
-    "George G",
     "George3d6",
+    "George G",
     "Gervasio Varela",
+    "ggerogery",
+    "giordyb",
     "Gleb Kanterov",
     "Gleb Novikov",
     "Gleb-Tretyakov",
+    "glockbender",
+    "glushkovds",
     "Gregory",
     "Grigory",
     "Grigory Buteyko",
     "Grigory Pervakov",
     "Guillaume Tassery",
+    "guoleiyi",
+    "gyuton",
     "Haavard Kvaalen",
     "Habibullah Oladepo",
     "Hamoon",
+    "hao.he",
     "Hasitha Kanchana",
     "Hasnat",
+    "hchen9",
+    "hcz",
+    "heng zhao",
+    "hexiaoting",
     "Hiroaki Nakamura",
+    "hotid",
     "HuFuwang",
     "Hui Wang",
+    "hustnn",
+    "huzhichengdd",
+    "ice1x",
+    "idfer",
+    "igor",
     "Igor",
     "Igor Hatarist",
+    "igor.lapko",
     "Igor Mineev",
     "Igor Strykhar",
     "Igr",
     "Igr Mineev",
+    "ikarishinjieva",
+    "ikopylov",
     "Ildar Musin",
     "Ildus Kurbangaliev",
     "Ilya",
@@ -261,41 +405,60 @@ const char * auto_contributors[] {
     "Ilya Skrypitsa",
     "Ilya Yatsishin",
     "ImgBotApp",
+    "imgbot[bot]",
+    "ip",
     "Islam Israfilov",
     "Islam Israfilov (Islam93)",
+    "it1804",
     "Ivan",
     "Ivan A. Torgashov",
     "Ivan Babrou",
     "Ivan Blinkov",
     "Ivan He",
+    "ivan-kush",
     "Ivan Kush",
     "Ivan Kushnarenko",
     "Ivan Lezhankin",
     "Ivan Remen",
     "Ivan Starkov",
+    "ivanzhukov",
     "Ivan Zhukov",
     "JackyWoo",
     "Jacob Hayes",
+    "jakalletti",
     "JaosnHsieh",
     "Jason",
+    "javartisan",
+    "javi",
+    "javi santana",
     "Javi Santana",
     "Javi santana bot",
     "Jean Baptiste Favre",
+    "jennyma",
+    "jetgm",
     "Jiading Guo",
     "Jiang Tao",
+    "jianmei zhang",
     "Jochen Schalanda",
     "John",
     "John Hummel",
+    "John Skopis",
     "Jonatas Freitas",
+    "Julian Zhou",
+    "jyz0309",
     "Kang Liu",
     "Karl Pietrzak",
+    "keenwolf",
     "Keiji Yoshida",
     "Ken Chen",
     "Kevin Chiang",
+    "kevin wan",
     "Kiran",
     "Kirill Danshin",
+    "kirillikoff",
     "Kirill Malev",
     "Kirill Shvakov",
+    "kmeaw",
     "Koblikov Mihail",
     "KochetovNicolai",
     "Konstantin Grabar",
@@ -303,30 +466,60 @@ const char * auto_contributors[] {
     "Konstantin Malanchev",
     "Konstantin Podshumok",
     "Korviakov Andrey",
+    "koshachy",
     "Kozlov Ivan",
+    "kreuzerkrieg",
     "Kruglov Pavel",
+    "ks1322",
     "Kseniia Sumarokova",
+    "kshvakov",
+    "kssenii",
+    "l",
+    "lalex",
     "Latysheva Alexandra",
+    "lehasm",
+    "Léo Ercolanelli",
     "Leonardo Cecchi",
     "Leopold Schabel",
+    "leozhang",
     "Lev Borodin",
+    "levushkin aleksej",
+    "levysh",
     "Lewinma",
+    "liangqian",
+    "libenwang",
+    "lichengxiang",
+    "linceyou",
+    "litao91",
+    "liu-bov",
     "Liu Cong",
     "LiuCong",
+    "liuyangkuan",
     "LiuYangkuan",
+    "liuyimin",
+    "liyang",
+    "lomberts",
+    "long2ice",
     "Lopatin Konstantin",
     "Loud_Scream",
+    "luc1ph3r",
+    "Lucid Dreams",
     "Luis Bosque",
+    "lulichao",
     "Lv Feng",
-    "Léo Ercolanelli",
     "M0r64n",
-    "Maks Skorokhod",
+    "madianjun",
+    "maiha",
     "Maksim",
     "Maksim Fedotov",
     "Maksim Kita",
+    "Maks Skorokhod",
+    "malkfilipp",
+    "manmitya",
+    "maqroll",
     "Marat IDRISOV",
-    "Marek Vavrusa",
     "Marek Vavruša",
+    "Marek Vavrusa",
     "Marek Vavruša",
     "Mariano Benítez Mulet",
     "Mark Andreev",
@@ -335,16 +528,19 @@ const char * auto_contributors[] {
     "Maroun Maroun",
     "Marquitos",
     "Marsel Arduanov",
-    "Marti Raudsepp",
     "Martijn Bakker",
+    "Marti Raudsepp",
     "Marvin Taschenberger",
     "Masha",
+    "mastertheknife",
     "Matthew Peveler",
     "Matwey V. Kornilov",
     "Max",
     "Max Akhmedov",
-    "Max Vetrov",
+    "maxim",
     "Maxim Akhmedov",
+    "MaximAL",
+    "maxim-babenko",
     "Maxim Babenko",
     "Maxim Fedotov",
     "Maxim Fridental",
@@ -355,54 +551,81 @@ const char * auto_contributors[] {
     "Maxim Serebryakov",
     "Maxim Smirnov",
     "Maxim Ulanovskiy",
-    "MaximAL",
+    "maxkuzn",
+    "maxulan",
+    "Max Vetrov",
     "Mc.Spring",
+    "mehanizm",
     "MeiK",
+    "melin",
+    "memo",
+    "meo",
+    "mergify[bot]",
     "Metehan Çetinkaya",
     "Metikov Vadim",
+    "mf5137",
+    "mfridental",
     "Michael Furmur",
     "Michael Kolupaev",
     "Michael Monashev",
     "Michael Razuvaev",
     "Michael Smitasin",
     "Michal Lisowski",
+    "michon470",
     "MicrochipQ",
+    "miha-g",
     "Mihail Fandyushin",
     "Mikahil Nacharov",
     "Mike",
     "Mike F",
     "Mike Kot",
+    "mikepop7",
     "Mikhail",
     "Mikhail Cheshkov",
     "Mikhail Fandyushin",
     "Mikhail Filimonov",
+    "Mikhail f. Shiryaev",
     "Mikhail Gaidamaka",
     "Mikhail Korotov",
     "Mikhail Malafeev",
     "Mikhail Nacharov",
     "Mikhail Salosin",
     "Mikhail Surin",
-    "Mikhail f. Shiryaev",
     "MikuSugar",
     "Milad Arabi",
+    "millb",
+    "mnkonkova",
     "Mohammad Hossein Sekhavat",
+    "morty",
+    "moscas",
     "MovElb",
     "Mr.General",
     "Murat Kabilov",
+    "m-ves",
+    "mwish",
     "MyroTk",
-    "NIKITA MIKHAILOV",
+    "myrrc",
+    "nagorny",
     "Narek Galstyan",
-    "NeZeD [Mac Pro]",
+    "nauta",
+    "nautaa",
     "Neeke Gao",
     "Neng Liu",
+    "never lee",
+    "NeZeD [Mac Pro]",
+    "nicelulu",
+    "Nickolay Yastrebov",
+    "Nicolae Vartolomei",
     "Nico Mandery",
     "Nico Piderman",
-    "Nicolae Vartolomei",
     "Nik",
     "Nikhil Nadig",
     "Nikhil Raman",
     "Nikita Lapkov",
     "Nikita Mikhailov",
+    "NIKITA MIKHAILOV",
+    "Nikita Mikhalev",
+    "nikitamikhaylov",
     "Nikita Mikhaylov",
     "Nikita Orlov",
     "Nikita Vasilev",
@@ -415,18 +638,29 @@ const char * auto_contributors[] {
     "Nikolay Vasiliev",
     "Nikolay Volosatov",
     "Niu Zhaojie",
+    "nonexistence",
+    "ns-vasilev",
+    "nvartolomei",
+    "oandrew",
+    "objatie_groba",
+    "ocadaruma",
     "Odin Hultgren Van Der Horst",
+    "ogorbacheva",
     "Okada Haruki",
     "Oleg Favstov",
     "Oleg Komarov",
+    "olegkv",
     "Oleg Matrokhin",
     "Oleg Obleukhov",
+    "Oleg Strokachuk",
     "Olga Khvostikova",
+    "olgarev",
     "Olga Revyakina",
+    "orantius",
     "Orivej Desh",
     "Oskar Wojciski",
     "OuO",
-    "PHO",
+    "palasonicq",
     "Paramtamtam",
     "Patrick Zippenfenig",
     "Pavel",
@@ -443,40 +677,67 @@ const char * auto_contributors[] {
     "Persiyanov Dmitriy Andreevich",
     "Pervakov Grigorii",
     "Pervakov Grigory",
+    "peshkurov",
+    "philip.han",
     "Philippe Ombredanne",
+    "PHO",
+    "pingyu",
+    "potya",
     "Potya",
     "Pradeep Chhetri",
+    "proller",
+    "pufit",
+    "pyos",
     "Pysaoke",
+    "qianlixiang",
+    "qianmoQ",
+    "quid",
     "Quid37",
+    "r1j1k",
     "Rafael David Tinoco",
+    "rainbowsysu",
     "Ramazan Polat",
+    "Raúl Marín",
     "Ravengg",
     "RegulusZ",
     "Reilee",
     "Reto Kromer",
     "Ri",
+    "ritaank",
+    "robert",
     "Robert Hodges",
+    "robot-clickhouse",
+    "robot-metrika-test",
+    "rodrigargar",
+    "roman",
     "Roman Bug",
     "Roman Lipovsky",
     "Roman Nikolaev",
     "Roman Nozdrin",
     "Roman Peshkurov",
     "Roman Tsisyk",
+    "romanzhukov",
+    "root",
+    "roverxu",
     "Ruslan",
     "Ruslan Savchenko",
     "Russ Frank",
     "Ruzal Ibragimov",
-    "S.M.A. Djawadi",
     "Sabyanin Maxim",
     "SaltTan",
     "Sami Kerola",
     "Samuel Chou",
+    "santaux",
+    "satanson",
     "Saulius Valatka",
-    "Serge Rider",
+    "sdk2",
+    "Sébastien Launay",
+    "serebrserg",
     "Sergei Bocharov",
     "Sergei Semin",
     "Sergei Shtykov",
     "Sergei Tsetlin (rekub)",
+    "Serge Rider",
     "Sergey Demurin",
     "Sergey Elantsev",
     "Sergey Fedorov",
@@ -490,63 +751,102 @@ const char * auto_contributors[] {
     "Sergey Zaikin",
     "Sergi Almacellas Abellana",
     "Sergi Vladykin",
+    "Serg Kulakov",
+    "sev7e0",
     "SevaCode",
+    "sevirov",
+    "sfod",
+    "shangshujie",
+    "shedx",
     "Sherry Wang",
     "Silviu Caragea",
     "Simeon Emanuilov",
     "Simon Liu",
     "Simon Podlipsky",
+    "Šimon Podlipský",
+    "simon-says",
     "Sina",
     "Sjoerd Mulder",
     "Slach",
+    "S.M.A. Djawadi",
     "Snow",
     "Sofia Antipushina",
+    "songenjie",
+    "spff",
+    "spongedc",
+    "spyros87",
     "Stanislav Pavlovichev",
     "Stas Pavlovichev",
+    "stavrolia",
     "Stefan Thies",
     "Stepan",
     "Stepan Herold",
+    "stepenhu",
     "Steve-金勇",
     "Stig Bakken",
     "Stupnikov Andrey",
+    "su-houzhen",
+    "sundy",
+    "sundy-li",
+    "sundyli",
     "SuperBot",
-    "Sébastien Launay",
+    "svladykin",
     "TAC",
-    "TCeason",
     "Tagir Kuskarov",
+    "tai",
+    "taichong",
     "Tai White",
+    "taiyang-li",
     "Taleh Zaliyev",
     "Tangaev",
+    "tao jiang",
     "Tatiana Kirillova",
+    "tavplubix",
+    "TCeason",
     "Tema Novikov",
+    "templarzq",
     "The-Alchemist",
+    "tiger.yan",
+    "tison",
     "TiunovNN",
     "Tobias Adamson",
     "Tom Bombadil",
+    "topvisor",
     "Tsarkova Anastasia",
     "TszkitLo40",
+    "turbo jason",
+    "tyrionhuang",
+    "ubuntu",
     "Ubuntu",
     "Ubus",
     "UnamedRus",
+    "unegare",
+    "unknown",
+    "urgordeadbeef",
     "V",
-    "VDimir",
     "Vadim",
+    "VadimPE",
     "Vadim Plakhtinskiy",
     "Vadim Skipin",
-    "VadimPE",
     "Val",
     "Valera Ryaboshapko",
+    "Vasilyev Nikita",
     "Vasily Kozhukhovskiy",
     "Vasily Morozov",
     "Vasily Nemkov",
     "Vasily Okunev",
     "Vasily Vasilkov",
-    "Vasilyev Nikita",
+    "vdimir",
+    "VDimir",
+    "velom",
     "Veloman Yunkan",
     "Veniamin Gvozdikov",
     "Veselkov Konstantin",
+    "vic",
+    "vicdashkov",
     "Victor Tarnavsky",
     "Viktor Taranenko",
+    "vinity",
     "Vitaliy Fedorchenko",
     "Vitaliy Karnienko",
     "Vitaliy Kozlovskiy",
@@ -555,12 +855,15 @@ const char * auto_contributors[] {
     "Vitaly",
     "Vitaly Baranov",
     "Vitaly Samigullin",
+    "vitstn",
+    "vivarum",
     "Vivien Maisonneuve",
     "Vlad Arkhipov",
     "Vladimir",
     "Vladimir Bunchuk",
     "Vladimir Ch",
     "Vladimir Chebotarev",
+    "vladimir golovchenko",
     "Vladimir Golovchenko",
     "Vladimir Goncharov",
     "Vladimir Klimontovich",
@@ -573,22 +876,39 @@ const char * auto_contributors[] {
     "Vojtech Splichal",
     "Volodymyr Kuznetsov",
     "Vsevolod Orlov",
+    "vxider",
     "Vxider",
     "Vyacheslav Alipov",
+    "vzakaznikov",
+    "wangchao",
     "Wang Fenjin",
+    "weeds085490",
     "Weiqing Xu",
     "William Shallum",
     "Winter Zhang",
+    "wzl",
     "Xianda Ke",
     "Xiang Zhou",
-    "Y Lu",
-    "Yangkuan Liu",
-    "Yatsishin Ilya",
+    "xPoSx",
     "Yağızcan Değirmenci",
+    "Yangkuan Liu",
+    "yangshuai",
+    "Yatsishin Ilya",
     "Yegor Andreenko",
-    "Yingchun Lai",
+    "Yegor Levankov",
+    "ygrek",
+    "yhgcn",
     "Yiğit Konur",
+    "yiguolei",
+    "Yingchun Lai",
+    "yingjinghan",
+    "ylchou",
+    "Y Lu",
     "Yohann Jardin",
+    "yonesko",
+    "yuefoo",
+    "yulu86",
+    "yuluxu",
     "Yuntao Wu",
     "Yuri Dyachenko",
     "Yurii Vlasenko",
@@ -598,309 +918,34 @@ const char * auto_contributors[] {
     "Yuriy Korzhenevskiy",
     "Yury Karpovich",
     "Yury Stankevich",
-    "Zhichang Yu",
-    "Zhipeng",
-    "Zoran Pandovski",
-    "a.palagashvili",
-    "abdrakhmanov",
-    "abyss7",
-    "achimbab",
-    "achulkov2",
-    "ageraab",
-    "akazz",
-    "akonyaev",
-    "akuzm",
-    "alekseik1",
-    "alesapin",
-    "alex-zaitsev",
-    "alex.lvxin",
-    "alexander kozhikhov",
-    "alexey-milovidov",
-    "alfredlu",
-    "amoschen",
-    "amudong",
-    "ana-uvarova",
-    "andrei-karpliuk",
-    "andrewsg",
-    "annvsh",
-    "anrodigina",
-    "antikvist",
-    "anton",
-    "ap11",
-    "aprudaev",
-    "artpaul",
-    "asiana21",
-    "avasiliev",
-    "avsharapov",
-    "awesomeleo",
-    "benamazing",
-    "benbiti",
-    "bgranvea",
-    "bharatnc",
-    "blazerer",
-    "bluebirddm",
-    "bo zeng",
-    "bobrovskij artemij",
-    "booknouse",
-    "bseng",
-    "cekc",
-    "centos7",
-    "champtar",
-    "chang.chen",
-    "chengy8934",
-    "chenqi",
-    "chenxing-xc",
-    "chenxing.xc",
-    "chertus",
-    "comunodi",
-    "coraxster",
-    "damozhaeva",
-    "dankondr",
-    "daoready",
-    "dasmfm",
-    "davydovska",
-    "decaseal",
-    "dependabot-preview[bot]",
-    "dependabot[bot]",
-    "detailyang",
-    "dfenelonov",
-    "dgrr",
-    "dimarub2000",
-    "dinosaur",
-    "dkxiaohei",
-    "dmi-feo",
-    "dmitrii",
-    "dmitriiut",
-    "dmitry kuzmin",
-    "eejoin",
-    "egatov",
-    "elBroom",
-    "elenaspb2019",
-    "emakarov",
-    "emhlbmc",
-    "emironyuk",
-    "evtan",
-    "exprmntr",
-    "ezhaka",
-    "f1yegor",
-    "fastio",
-    "favstovol",
-    "felixoid",
-    "felixxdu",
-    "feng lv",
-    "fenglv",
-    "fessmage",
-    "filimonov",
-    "filipe",
-    "flow",
-    "flynn",
-    "foxxmary",
-    "frank",
-    "franklee",
-    "fredchenbj",
-    "fuqi",
-    "fuwhu",
-    "g-arslan",
-    "ggerogery",
-    "giordyb",
-    "glockbender",
-    "glushkovds",
-    "guoleiyi",
-    "gyuton",
-    "hao.he",
-    "hchen9",
-    "hcz",
-    "heng zhao",
-    "hexiaoting",
-    "hotid",
-    "hustnn",
-    "idfer",
-    "igor",
-    "igor.lapko",
-    "ikarishinjieva",
-    "ikopylov",
-    "imgbot[bot]",
-    "ip",
-    "it1804",
-    "ivan-kush",
-    "ivanzhukov",
-    "jakalletti",
-    "javartisan",
-    "javi",
-    "javi santana",
-    "jennyma",
-    "jetgm",
-    "jianmei zhang",
-    "jyz0309",
-    "keenwolf",
-    "kevin wan",
-    "kirillikoff",
-    "kmeaw",
-    "koshachy",
-    "kreuzerkrieg",
-    "ks1322",
-    "kshvakov",
-    "kssenii",
-    "l",
-    "lalex",
-    "lehasm",
-    "leozhang",
-    "levushkin aleksej",
-    "levysh",
-    "liangqian",
-    "libenwang",
-    "lichengxiang",
-    "linceyou",
-    "litao91",
-    "liu-bov",
-    "liuyangkuan",
-    "liuyimin",
-    "liyang",
-    "lomberts",
-    "long2ice",
-    "luc1ph3r",
-    "madianjun",
-    "maiha",
-    "malkfilipp",
-    "manmitya",
-    "maqroll",
-    "mastertheknife",
-    "maxim",
-    "maxim-babenko",
-    "maxkuzn",
-    "maxulan",
-    "melin",
-    "memo",
-    "meo",
-    "mergify[bot]",
-    "mf5137",
-    "mfridental",
-    "michon470",
-    "miha-g",
-    "mikepop7",
-    "millb",
-    "mnkonkova",
-    "morty",
-    "moscas",
-    "myrrc",
-    "nagorny",
-    "nauta",
-    "nautaa",
-    "never lee",
-    "nicelulu",
-    "nikitamikhaylov",
-    "nonexistence",
-    "ns-vasilev",
-    "nvartolomei",
-    "oandrew",
-    "objatie_groba",
-    "ocadaruma",
-    "ogorbacheva",
-    "olegkv",
-    "olgarev",
-    "orantius",
-    "palasonicq",
-    "peshkurov",
-    "philip.han",
-    "pingyu",
-    "potya",
-    "proller",
-    "pufit",
-    "pyos",
-    "qianlixiang",
-    "qianmoQ",
-    "quid",
-    "r1j1k",
-    "rainbowsysu",
-    "ritaank",
-    "robert",
-    "robot-clickhouse",
-    "robot-metrika-test",
-    "rodrigargar",
-    "roman",
-    "romanzhukov",
-    "root",
-    "roverxu",
-    "santaux",
-    "satanson",
-    "sdk2",
-    "serebrserg",
-    "sev7e0",
-    "sevirov",
-    "sfod",
-    "shangshujie",
-    "shedx",
-    "simon-says",
-    "spff",
-    "spongedc",
-    "spyros87",
-    "stavrolia",
-    "stepenhu",
-    "su-houzhen",
-    "sundy",
-    "sundy-li",
-    "sundyli",
-    "svladykin",
-    "tai",
-    "taichong",
-    "taiyang-li",
-    "tao jiang",
-    "tavplubix",
-    "templarzq",
-    "tiger.yan",
-    "tison",
-    "topvisor",
-    "turbo jason",
-    "tyrionhuang",
-    "ubuntu",
-    "unegare",
-    "unknown",
-    "urgordeadbeef",
-    "vdimir",
-    "velom",
-    "vic",
-    "vicdashkov",
-    "vinity",
-    "vitstn",
-    "vivarum",
-    "vladimir golovchenko",
-    "vxider",
-    "vzakaznikov",
-    "wangchao",
-    "weeds085490",
-    "xPoSx",
-    "yangshuai",
-    "ygrek",
-    "yhgcn",
-    "yiguolei",
-    "yingjinghan",
-    "ylchou",
-    "yonesko",
-    "yuefoo",
-    "yulu86",
-    "yuluxu",
     "zamulla",
     "zhang2014",
     "zhangshengyu",
     "zhangxiao018",
     "zhangxiao871",
     "zhen ni",
+    "Zhichang Yu",
+    "Zhichun Wu",
+    "Zhipeng",
     "zhukai",
     "zlx19950903",
+    "Zoran Pandovski",
     "zvonand",
     "zvrr",
     "zvvr",
     "zzsmdfj",
-    "Šimon Podlipský",
     "Артем Стрельцов",
     "Георгий Кондратьев",
     "Дмитрий Канатников",
     "Иванов Евгений",
+    "Илья Исаев",
     "Павел Литвиненко",
     "Смитюх Вячеслав",
     "Сундуков Алексей",
+    "万康",
     "吴健",
     "小路",
+    "张中南",
     "张健",
     "张风啸",
     "徐炘",
@@ -912,5 +957,4 @@ const char * auto_contributors[] {
     "靳阳",
     "黄朝晖",
     "黄璞",
-    "박현우",
     nullptr};
diff --git a/src/Storages/System/StorageSystemContributors.h b/src/Storages/System/StorageSystemContributors.h
index 0fd77f78655..c4a50263c5b 100644
--- a/src/Storages/System/StorageSystemContributors.h
+++ b/src/Storages/System/StorageSystemContributors.h
@@ -16,7 +16,7 @@ class StorageSystemContributors final : public ext::shared_ptr_helper<StorageSys
 {
     friend struct ext::shared_ptr_helper<StorageSystemContributors>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemContributors.sh b/src/Storages/System/StorageSystemContributors.sh
index c4c4eb5ad30..e34bf8ee7c8 100755
--- a/src/Storages/System/StorageSystemContributors.sh
+++ b/src/Storages/System/StorageSystemContributors.sh
@@ -2,6 +2,8 @@
 
 set -x
 
+LC_ALL=C
+
 # doesn't actually cd to directory, but return absolute path
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # cd to directory
@@ -10,7 +12,7 @@ cd $CUR_DIR
 CONTRIBUTORS_FILE=${CONTRIBUTORS_FILE=$CUR_DIR/StorageSystemContributors.generated.cpp}
 
 # if you don't specify HEAD here, without terminal `git shortlog` would expect input from stdin
-git shortlog HEAD --summary | perl -lnE 's/^\s+\d+\s+(.+)/    "$1",/; next unless $1; say $_' > $CONTRIBUTORS_FILE.tmp
+git shortlog HEAD --summary | perl -lnE 's/^\s+\d+\s+(.+)/    "$1",/; next unless $1; say $_' | sort > $CONTRIBUTORS_FILE.tmp
 
 # If git history not available - dont make target file
 if [ ! -s $CONTRIBUTORS_FILE.tmp ]; then
diff --git a/src/Storages/System/StorageSystemCurrentRoles.cpp b/src/Storages/System/StorageSystemCurrentRoles.cpp
index b0667f2f3ca..a5b3566f5f7 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.cpp
+++ b/src/Storages/System/StorageSystemCurrentRoles.cpp
@@ -22,10 +22,10 @@ NamesAndTypesList StorageSystemCurrentRoles::getNamesAndTypes()
 }
 
 
-void StorageSystemCurrentRoles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemCurrentRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    auto roles_info = context.getRolesInfo();
-    auto user = context.getUser();
+    auto roles_info = context->getRolesInfo();
+    auto user = context->getUser();
     if (!roles_info || !user)
         return;
 
diff --git a/src/Storages/System/StorageSystemCurrentRoles.h b/src/Storages/System/StorageSystemCurrentRoles.h
index 807db661371..77ab95547fa 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.h
+++ b/src/Storages/System/StorageSystemCurrentRoles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemCurrentRoles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
index 04321544f5d..98b15bfa6e2 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -95,7 +95,7 @@ NamesAndTypesList StorageSystemDDLWorkerQueue::getNamesAndTypes()
     };
 }
 
-static String clusterNameFromDDLQuery(const Context & context, const DDLLogEntry & entry)
+static String clusterNameFromDDLQuery(ContextPtr context, const DDLLogEntry & entry)
 {
     const char * begin = entry.query.data();
     const char * end = begin + entry.query.size();
@@ -104,15 +104,15 @@ static String clusterNameFromDDLQuery(const Context & context, const DDLLogEntry
     String cluster_name;
     ParserQuery parser_query(end);
     String description;
-    query = parseQuery(parser_query, begin, end, description, 0, context.getSettingsRef().max_parser_depth);
+    query = parseQuery(parser_query, begin, end, description, 0, context->getSettingsRef().max_parser_depth);
     if (query && (query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query.get())))
         cluster_name = query_on_cluster->cluster;
     return cluster_name;
 }
 
-void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    zkutil::ZooKeeperPtr zookeeper = context.getZooKeeper();
+    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;
@@ -130,7 +130,7 @@ void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, const C
     if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
         zk_exception_code = code;
 
-    const auto & clusters = context.getClusters();
+    const auto & clusters = context->getClusters();
     for (const auto & name_and_cluster : clusters.getContainer())
     {
         const ClusterPtr & cluster = name_and_cluster.second;
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.h b/src/Storages/System/StorageSystemDDLWorkerQueue.h
index 9326d4dcb26..d1afa2d546a 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.h
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.h
@@ -22,7 +22,7 @@ class StorageSystemDDLWorkerQueue final : public ext::shared_ptr_helper<StorageS
     Poco::Util::LayeredConfiguration & config = Poco::Util::Application::instance().config();
 
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.cpp b/src/Storages/System/StorageSystemDataTypeFamilies.cpp
index 0957e8f8349..c34589d85b1 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.cpp
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.cpp
@@ -16,7 +16,7 @@ NamesAndTypesList StorageSystemDataTypeFamilies::getNamesAndTypes()
     };
 }
 
-void StorageSystemDataTypeFamilies::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemDataTypeFamilies::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & factory = DataTypeFactory::instance();
     auto names = factory.getAllRegisteredNames();
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.h b/src/Storages/System/StorageSystemDataTypeFamilies.h
index 2a89ae77647..4de2ed99252 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.h
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.h
@@ -11,7 +11,7 @@ class StorageSystemDataTypeFamilies final : public ext::shared_ptr_helper<Storag
 {
     friend struct ext::shared_ptr_helper<StorageSystemDataTypeFamilies>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDatabases.cpp b/src/Storages/System/StorageSystemDatabases.cpp
index 88ac987014d..e09e47d8baf 100644
--- a/src/Storages/System/StorageSystemDatabases.cpp
+++ b/src/Storages/System/StorageSystemDatabases.cpp
@@ -20,9 +20,9 @@ NamesAndTypesList StorageSystemDatabases::getNamesAndTypes()
     };
 }
 
-void StorageSystemDatabases::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_DATABASES);
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
@@ -36,7 +36,7 @@ void StorageSystemDatabases::fillData(MutableColumns & res_columns, const Contex
 
         res_columns[0]->insert(database_name);
         res_columns[1]->insert(database->getEngineName());
-        res_columns[2]->insert(context.getPath() + database->getDataPath());
+        res_columns[2]->insert(context->getPath() + database->getDataPath());
         res_columns[3]->insert(database->getMetadataPath());
         res_columns[4]->insert(database->getUUID());
    }
diff --git a/src/Storages/System/StorageSystemDatabases.h b/src/Storages/System/StorageSystemDatabases.h
index fe517c0f651..33f91fee837 100644
--- a/src/Storages/System/StorageSystemDatabases.h
+++ b/src/Storages/System/StorageSystemDatabases.h
@@ -26,7 +26,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index f96566026b1..56644620f97 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -33,7 +33,7 @@ Pipe StorageSystemDetachedParts::read(
     const Names & /* column_names */,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
diff --git a/src/Storages/System/StorageSystemDetachedParts.h b/src/Storages/System/StorageSystemDetachedParts.h
index 4c6970dadd6..18a6f5576d6 100644
--- a/src/Storages/System/StorageSystemDetachedParts.h
+++ b/src/Storages/System/StorageSystemDetachedParts.h
@@ -26,7 +26,7 @@ protected:
             const Names & /* column_names */,
             const StorageMetadataPtr & metadata_snapshot,
             SelectQueryInfo & query_info,
-            const Context & context,
+            ContextPtr context,
             QueryProcessingStage::Enum /*processed_stage*/,
             const size_t /*max_block_size*/,
             const unsigned /*num_streams*/) override;
diff --git a/src/Storages/System/StorageSystemDictionaries.cpp b/src/Storages/System/StorageSystemDictionaries.cpp
index 378905b7dc0..eb313f93a25 100644
--- a/src/Storages/System/StorageSystemDictionaries.cpp
+++ b/src/Storages/System/StorageSystemDictionaries.cpp
@@ -37,6 +37,7 @@ NamesAndTypesList StorageSystemDictionaries::getNamesAndTypes()
         {"bytes_allocated", std::make_shared<DataTypeUInt64>()},
         {"query_count", std::make_shared<DataTypeUInt64>()},
         {"hit_rate", std::make_shared<DataTypeFloat64>()},
+        {"found_rate", std::make_shared<DataTypeFloat64>()},
         {"element_count", std::make_shared<DataTypeUInt64>()},
         {"load_factor", std::make_shared<DataTypeFloat64>()},
         {"source", std::make_shared<DataTypeString>()},
@@ -50,12 +51,23 @@ NamesAndTypesList StorageSystemDictionaries::getNamesAndTypes()
     };
 }
 
-void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & /*query_info*/) const
+NamesAndTypesList StorageSystemDictionaries::getVirtuals() const
 {
-    const auto access = context.getAccess();
-    const bool check_access_for_dictionaries = !access->isGranted(AccessType::SHOW_DICTIONARIES);
+    return {
+        {"key", std::make_shared<DataTypeString>()}
+    };
+}
+
+void StorageSystemDictionaries::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & /*query_info*/) const
+{
+    const auto access = context->getAccess();
+    const bool check_access_for_dictionaries = access->isGranted(AccessType::SHOW_DICTIONARIES);
+
+    const auto & external_dictionaries = context->getExternalDictionariesLoader();
+
+    if (!check_access_for_dictionaries)
+        return;
 
-    const auto & external_dictionaries = context.getExternalDictionariesLoader();
     for (const auto & load_result : external_dictionaries.getLoadResults())
     {
         const auto dict_ptr = std::dynamic_pointer_cast<const IDictionary>(load_result.object);
@@ -70,8 +82,7 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
             dict_id.table_name = load_result.name;
 
         String db_or_tag = dict_id.database_name.empty() ? IDictionary::NO_DATABASE_TAG : dict_id.database_name;
-        if (check_access_for_dictionaries
-            && !access->isGranted(AccessType::SHOW_DICTIONARIES, db_or_tag, dict_id.table_name))
+        if (!access->isGranted(AccessType::SHOW_DICTIONARIES, db_or_tag, dict_id.table_name))
             continue;
 
         size_t i = 0;
@@ -103,6 +114,7 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
             res_columns[i++]->insert(dict_ptr->getBytesAllocated());
             res_columns[i++]->insert(dict_ptr->getQueryCount());
             res_columns[i++]->insert(dict_ptr->getHitRate());
+            res_columns[i++]->insert(dict_ptr->getFoundRate());
             res_columns[i++]->insert(dict_ptr->getElementCount());
             res_columns[i++]->insert(dict_ptr->getLoadFactor());
             res_columns[i++]->insert(dict_ptr->getSource()->toString());
@@ -115,7 +127,7 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
         }
         else
         {
-            for (size_t j = 0; j != 8; ++j) // Number of empty fields if dict_ptr is null
+            for (size_t j = 0; j != 9; ++j) // Number of empty fields if dict_ptr is null
                 res_columns[i++]->insertDefault();
         }
 
@@ -128,6 +140,9 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, const Con
         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 5139ce3c5f6..aa65a946127 100644
--- a/src/Storages/System/StorageSystemDictionaries.h
+++ b/src/Storages/System/StorageSystemDictionaries.h
@@ -18,10 +18,12 @@ public:
 
     static NamesAndTypesList getNamesAndTypes();
 
+    NamesAndTypesList getVirtuals() const override;
+
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDisks.cpp b/src/Storages/System/StorageSystemDisks.cpp
index b04d24cc705..5d7628acb2a 100644
--- a/src/Storages/System/StorageSystemDisks.cpp
+++ b/src/Storages/System/StorageSystemDisks.cpp
@@ -30,7 +30,7 @@ Pipe StorageSystemDisks::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -44,7 +44,7 @@ Pipe StorageSystemDisks::read(
     MutableColumnPtr col_keep = ColumnUInt64::create();
     MutableColumnPtr col_type = ColumnString::create();
 
-    for (const auto & [disk_name, disk_ptr] : context.getDisksMap())
+    for (const auto & [disk_name, disk_ptr] : context->getDisksMap())
     {
         col_name->insert(disk_name);
         col_path->insert(disk_ptr->getPath());
diff --git a/src/Storages/System/StorageSystemDisks.h b/src/Storages/System/StorageSystemDisks.h
index cff05242019..fa0f6fe4b8a 100644
--- a/src/Storages/System/StorageSystemDisks.h
+++ b/src/Storages/System/StorageSystemDisks.h
@@ -24,7 +24,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemDistributionQueue.cpp b/src/Storages/System/StorageSystemDistributionQueue.cpp
index db649e7e1ba..d8879c3655e 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.cpp
+++ b/src/Storages/System/StorageSystemDistributionQueue.cpp
@@ -98,14 +98,16 @@ NamesAndTypesList StorageSystemDistributionQueue::getNamesAndTypes()
         { "error_count",           std::make_shared<DataTypeUInt64>() },
         { "data_files",            std::make_shared<DataTypeUInt64>() },
         { "data_compressed_bytes", std::make_shared<DataTypeUInt64>() },
+        { "broken_data_files",            std::make_shared<DataTypeUInt64>() },
+        { "broken_data_compressed_bytes", std::make_shared<DataTypeUInt64>() },
         { "last_exception",        std::make_shared<DataTypeString>() },
     };
 }
 
 
-void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     std::map<String, std::map<String, StoragePtr>> tables;
@@ -181,6 +183,8 @@ void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, cons
             res_columns[col_num++]->insert(status.error_count);
             res_columns[col_num++]->insert(status.files_count);
             res_columns[col_num++]->insert(status.bytes_count);
+            res_columns[col_num++]->insert(status.broken_files_count);
+            res_columns[col_num++]->insert(status.broken_bytes_count);
 
             if (status.last_exception)
                 res_columns[col_num++]->insert(getExceptionMessage(status.last_exception, false));
diff --git a/src/Storages/System/StorageSystemDistributionQueue.h b/src/Storages/System/StorageSystemDistributionQueue.h
index 88e7fa45cf5..9314418d242 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.h
+++ b/src/Storages/System/StorageSystemDistributionQueue.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemEnabledRoles.cpp b/src/Storages/System/StorageSystemEnabledRoles.cpp
index 27a42ca6f8b..99370dd647d 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.cpp
+++ b/src/Storages/System/StorageSystemEnabledRoles.cpp
@@ -23,10 +23,10 @@ NamesAndTypesList StorageSystemEnabledRoles::getNamesAndTypes()
 }
 
 
-void StorageSystemEnabledRoles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemEnabledRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    auto roles_info = context.getRolesInfo();
-    auto user = context.getUser();
+    auto roles_info = context->getRolesInfo();
+    auto user = context->getUser();
     if (!roles_info || !user)
         return;
 
diff --git a/src/Storages/System/StorageSystemEnabledRoles.h b/src/Storages/System/StorageSystemEnabledRoles.h
index 18df31c646a..13b0533b790 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.h
+++ b/src/Storages/System/StorageSystemEnabledRoles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemEnabledRoles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemErrors.cpp b/src/Storages/System/StorageSystemErrors.cpp
index 09d0aaddb3d..d08ffd730ac 100644
--- a/src/Storages/System/StorageSystemErrors.cpp
+++ b/src/Storages/System/StorageSystemErrors.cpp
@@ -23,11 +23,11 @@ NamesAndTypesList StorageSystemErrors::getNamesAndTypes()
 }
 
 
-void StorageSystemErrors::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemErrors::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     auto add_row = [&](std::string_view name, size_t code, const auto & error, bool remote)
     {
-        if (error.count || context.getSettingsRef().system_events_show_zero_values)
+        if (error.count || context->getSettingsRef().system_events_show_zero_values)
         {
             size_t col_num = 0;
             res_columns[col_num++]->insert(name);
diff --git a/src/Storages/System/StorageSystemErrors.h b/src/Storages/System/StorageSystemErrors.h
index 569a7a998b7..ff3af11d251 100644
--- a/src/Storages/System/StorageSystemErrors.h
+++ b/src/Storages/System/StorageSystemErrors.h
@@ -25,7 +25,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemEvents.cpp b/src/Storages/System/StorageSystemEvents.cpp
index ddb00659473..be2d3f8d49e 100644
--- a/src/Storages/System/StorageSystemEvents.cpp
+++ b/src/Storages/System/StorageSystemEvents.cpp
@@ -16,13 +16,13 @@ NamesAndTypesList StorageSystemEvents::getNamesAndTypes()
     };
 }
 
-void StorageSystemEvents::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemEvents::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     for (size_t i = 0, end = ProfileEvents::end(); i < end; ++i)
     {
         UInt64 value = ProfileEvents::global_counters[i];
 
-        if (0 != value || context.getSettingsRef().system_events_show_zero_values)
+        if (0 != value || context->getSettingsRef().system_events_show_zero_values)
         {
             res_columns[0]->insert(ProfileEvents::getName(ProfileEvents::Event(i)));
             res_columns[1]->insert(value);
diff --git a/src/Storages/System/StorageSystemEvents.h b/src/Storages/System/StorageSystemEvents.h
index f1687e42233..6071cb7b2b3 100644
--- a/src/Storages/System/StorageSystemEvents.h
+++ b/src/Storages/System/StorageSystemEvents.h
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemFormats.cpp b/src/Storages/System/StorageSystemFormats.cpp
index 7048ab98a0d..86e0212a523 100644
--- a/src/Storages/System/StorageSystemFormats.cpp
+++ b/src/Storages/System/StorageSystemFormats.cpp
@@ -15,7 +15,7 @@ NamesAndTypesList StorageSystemFormats::getNamesAndTypes()
     };
 }
 
-void StorageSystemFormats::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemFormats::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & formats = FormatFactory::instance().getAllFormats();
     for (const auto & pair : formats)
diff --git a/src/Storages/System/StorageSystemFormats.h b/src/Storages/System/StorageSystemFormats.h
index f90839e44e9..ed65cd2af88 100644
--- a/src/Storages/System/StorageSystemFormats.h
+++ b/src/Storages/System/StorageSystemFormats.h
@@ -9,7 +9,7 @@ class StorageSystemFormats final : public ext::shared_ptr_helper<StorageSystemFo
 {
     friend struct ext::shared_ptr_helper<StorageSystemFormats>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 public:
diff --git a/src/Storages/System/StorageSystemFunctions.cpp b/src/Storages/System/StorageSystemFunctions.cpp
index e46b7007dc2..973bf493cd1 100644
--- a/src/Storages/System/StorageSystemFunctions.cpp
+++ b/src/Storages/System/StorageSystemFunctions.cpp
@@ -34,7 +34,7 @@ NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
     };
 }
 
-void StorageSystemFunctions::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & functions_factory = FunctionFactory::instance();
     const auto & function_names = functions_factory.getAllRegisteredNames();
diff --git a/src/Storages/System/StorageSystemFunctions.h b/src/Storages/System/StorageSystemFunctions.h
index f62d731f288..62942721995 100644
--- a/src/Storages/System/StorageSystemFunctions.h
+++ b/src/Storages/System/StorageSystemFunctions.h
@@ -24,7 +24,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemGrants.cpp b/src/Storages/System/StorageSystemGrants.cpp
index 0c06ad99b22..1ba5e6d96a4 100644
--- a/src/Storages/System/StorageSystemGrants.cpp
+++ b/src/Storages/System/StorageSystemGrants.cpp
@@ -35,10 +35,10 @@ NamesAndTypesList StorageSystemGrants::getNamesAndTypes()
 }
 
 
-void StorageSystemGrants::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemGrants::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
     boost::range::push_back(ids, access_control.findAll<Role>());
 
diff --git a/src/Storages/System/StorageSystemGrants.h b/src/Storages/System/StorageSystemGrants.h
index 39c38deed85..8c8a0f9f7bf 100644
--- a/src/Storages/System/StorageSystemGrants.h
+++ b/src/Storages/System/StorageSystemGrants.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemGrants>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemGraphite.cpp b/src/Storages/System/StorageSystemGraphite.cpp
index 93bc16785b2..dd592600d18 100644
--- a/src/Storages/System/StorageSystemGraphite.cpp
+++ b/src/Storages/System/StorageSystemGraphite.cpp
@@ -25,7 +25,7 @@ NamesAndTypesList StorageSystemGraphite::getNamesAndTypes()
 /*
  * Looking for (Replicated)*GraphiteMergeTree and get all configuration parameters for them
  */
-static StorageSystemGraphite::Configs getConfigs(const Context & context)
+static StorageSystemGraphite::Configs getConfigs(ContextPtr context)
 {
     const Databases databases = DatabaseCatalog::instance().getDatabases();
     StorageSystemGraphite::Configs graphite_configs;
@@ -73,7 +73,7 @@ static StorageSystemGraphite::Configs getConfigs(const Context & context)
     return graphite_configs;
 }
 
-void StorageSystemGraphite::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemGraphite::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     Configs graphite_configs = getConfigs(context);
 
diff --git a/src/Storages/System/StorageSystemGraphite.h b/src/Storages/System/StorageSystemGraphite.h
index 703db41dc39..256ad50e472 100644
--- a/src/Storages/System/StorageSystemGraphite.h
+++ b/src/Storages/System/StorageSystemGraphite.h
@@ -32,7 +32,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemLicenses.cpp b/src/Storages/System/StorageSystemLicenses.cpp
index 894c861de29..6f880f03e10 100644
--- a/src/Storages/System/StorageSystemLicenses.cpp
+++ b/src/Storages/System/StorageSystemLicenses.cpp
@@ -18,7 +18,7 @@ NamesAndTypesList StorageSystemLicenses::getNamesAndTypes()
     };
 }
 
-void StorageSystemLicenses::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemLicenses::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (const auto * it = library_licenses; *it; it += 4)
     {
diff --git a/src/Storages/System/StorageSystemLicenses.h b/src/Storages/System/StorageSystemLicenses.h
index cee48abacab..43bb1c20c22 100644
--- a/src/Storages/System/StorageSystemLicenses.h
+++ b/src/Storages/System/StorageSystemLicenses.h
@@ -17,7 +17,7 @@ class StorageSystemLicenses final :
 {
     friend struct ext::shared_ptr_helper<StorageSystemLicenses>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemMacros.cpp b/src/Storages/System/StorageSystemMacros.cpp
index 8e6420add8b..576fbc69039 100644
--- a/src/Storages/System/StorageSystemMacros.cpp
+++ b/src/Storages/System/StorageSystemMacros.cpp
@@ -14,9 +14,9 @@ NamesAndTypesList StorageSystemMacros::getNamesAndTypes()
     };
 }
 
-void StorageSystemMacros::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemMacros::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    auto macros = context.getMacros();
+    auto macros = context->getMacros();
 
     for (const auto & macro : macros->getMacroMap())
     {
diff --git a/src/Storages/System/StorageSystemMacros.h b/src/Storages/System/StorageSystemMacros.h
index 52336bd6f69..298aa488265 100644
--- a/src/Storages/System/StorageSystemMacros.h
+++ b/src/Storages/System/StorageSystemMacros.h
@@ -24,7 +24,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.cpp b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
index 19cbf76f252..626319af63f 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.cpp
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
@@ -20,9 +20,9 @@ NamesAndTypesList SystemMergeTreeSettings<replicated>::getNamesAndTypes()
 }
 
 template <bool replicated>
-void SystemMergeTreeSettings<replicated>::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void SystemMergeTreeSettings<replicated>::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto & settings = replicated ? context.getReplicatedMergeTreeSettings().all() : context.getMergeTreeSettings().all();
+    const auto & settings = replicated ? context->getReplicatedMergeTreeSettings().all() : context->getMergeTreeSettings().all();
     for (const auto & setting : settings)
     {
         res_columns[0]->insert(setting.getName());
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.h b/src/Storages/System/StorageSystemMergeTreeSettings.h
index 9f61fa6f780..b02b191fb69 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.h
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.h
@@ -28,7 +28,7 @@ public:
 protected:
     using IStorageSystemOneBlock<SystemMergeTreeSettings<replicated>>::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMerges.cpp b/src/Storages/System/StorageSystemMerges.cpp
index b61324818e4..b29836206d0 100644
--- a/src/Storages/System/StorageSystemMerges.cpp
+++ b/src/Storages/System/StorageSystemMerges.cpp
@@ -36,12 +36,12 @@ NamesAndTypesList StorageSystemMerges::getNamesAndTypes()
 }
 
 
-void StorageSystemMerges::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemMerges::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
 
-    for (const auto & merge : context.getMergeList().get())
+    for (const auto & merge : context->getMergeList().get())
     {
         if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, merge.database, merge.table))
             continue;
diff --git a/src/Storages/System/StorageSystemMerges.h b/src/Storages/System/StorageSystemMerges.h
index 81c03c4e397..5898bf62825 100644
--- a/src/Storages/System/StorageSystemMerges.h
+++ b/src/Storages/System/StorageSystemMerges.h
@@ -24,7 +24,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMetrics.cpp b/src/Storages/System/StorageSystemMetrics.cpp
index b2332c52817..6007c8a7c71 100644
--- a/src/Storages/System/StorageSystemMetrics.cpp
+++ b/src/Storages/System/StorageSystemMetrics.cpp
@@ -17,7 +17,7 @@ NamesAndTypesList StorageSystemMetrics::getNamesAndTypes()
     };
 }
 
-void StorageSystemMetrics::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemMetrics::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
     {
diff --git a/src/Storages/System/StorageSystemMetrics.h b/src/Storages/System/StorageSystemMetrics.h
index c47bcea656f..af5d32ec46b 100644
--- a/src/Storages/System/StorageSystemMetrics.h
+++ b/src/Storages/System/StorageSystemMetrics.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemModels.cpp b/src/Storages/System/StorageSystemModels.cpp
index 9fae9803b96..3df48e830bb 100644
--- a/src/Storages/System/StorageSystemModels.cpp
+++ b/src/Storages/System/StorageSystemModels.cpp
@@ -25,9 +25,9 @@ NamesAndTypesList StorageSystemModels::getNamesAndTypes()
     };
 }
 
-void StorageSystemModels::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemModels::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto & external_models_loader = context.getExternalModelsLoader();
+    const auto & external_models_loader = context->getExternalModelsLoader();
     auto load_results = external_models_loader.getLoadResults();
 
     for (const auto & load_result : load_results)
diff --git a/src/Storages/System/StorageSystemModels.h b/src/Storages/System/StorageSystemModels.h
index cee5200e7de..832a9d550db 100644
--- a/src/Storages/System/StorageSystemModels.h
+++ b/src/Storages/System/StorageSystemModels.h
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMutations.cpp b/src/Storages/System/StorageSystemMutations.cpp
index f66f57ef5d1..fa521c632b8 100644
--- a/src/Storages/System/StorageSystemMutations.cpp
+++ b/src/Storages/System/StorageSystemMutations.cpp
@@ -35,9 +35,9 @@ NamesAndTypesList StorageSystemMutations::getNamesAndTypes()
 }
 
 
-void StorageSystemMutations::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemMutations::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     /// Collect a set of *MergeTree tables.
diff --git a/src/Storages/System/StorageSystemMutations.h b/src/Storages/System/StorageSystemMutations.h
index f7bc5f6f33c..1f41ff6051b 100644
--- a/src/Storages/System/StorageSystemMutations.h
+++ b/src/Storages/System/StorageSystemMutations.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemNumbers.cpp b/src/Storages/System/StorageSystemNumbers.cpp
index 677e0c02400..545f2c8be9a 100644
--- a/src/Storages/System/StorageSystemNumbers.cpp
+++ b/src/Storages/System/StorageSystemNumbers.cpp
@@ -126,7 +126,7 @@ Pipe StorageSystemNumbers::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo &,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
@@ -144,7 +144,7 @@ Pipe StorageSystemNumbers::read(
 
     Pipe pipe;
 
-    if (num_streams > 1 && !even_distribution && *limit)
+    if (num_streams > 1 && !even_distribution && limit)
     {
         auto state = std::make_shared<NumbersMultiThreadedState>(offset);
         UInt64 max_counter = offset + *limit;
diff --git a/src/Storages/System/StorageSystemNumbers.h b/src/Storages/System/StorageSystemNumbers.h
index d12c28c1ce2..708ace7a4cd 100644
--- a/src/Storages/System/StorageSystemNumbers.h
+++ b/src/Storages/System/StorageSystemNumbers.h
@@ -33,7 +33,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemOne.cpp b/src/Storages/System/StorageSystemOne.cpp
index c456b22e97b..7c28f897121 100644
--- a/src/Storages/System/StorageSystemOne.cpp
+++ b/src/Storages/System/StorageSystemOne.cpp
@@ -24,7 +24,7 @@ Pipe StorageSystemOne::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo &,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
diff --git a/src/Storages/System/StorageSystemOne.h b/src/Storages/System/StorageSystemOne.h
index 8228ce465e0..a14d5e15726 100644
--- a/src/Storages/System/StorageSystemOne.h
+++ b/src/Storages/System/StorageSystemOne.h
@@ -25,13 +25,13 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
 
 protected:
-    StorageSystemOne(const StorageID & table_id_);
+    explicit StorageSystemOne(const StorageID & table_id_);
 };
 
 }
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
new file mode 100644
index 00000000000..70bc473e241
--- /dev/null
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
@@ -0,0 +1,135 @@
+#include <Access/ContextAccess.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Databases/IDatabase.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/System/StorageSystemPartMovesBetweenShards.h>
+#include <Storages/VirtualColumnUtils.h>
+#include <Common/typeid_cast.h>
+
+
+namespace DB
+{
+
+
+NamesAndTypesList StorageSystemPartMovesBetweenShards::getNamesAndTypes()
+{
+    return {
+        /// Table properties.
+        { "database",                std::make_shared<DataTypeString>() },
+        { "table",                   std::make_shared<DataTypeString>() },
+
+        /// Constant element properties.
+        { "task_name",               std::make_shared<DataTypeString>() },
+        { "task_uuid",               std::make_shared<DataTypeUUID>() },
+        { "create_time",             std::make_shared<DataTypeDateTime>() },
+        { "part_name",               std::make_shared<DataTypeString>() },
+        { "part_uuid",               std::make_shared<DataTypeUUID>() },
+        { "to_shard",                std::make_shared<DataTypeString>() },
+
+        /// Processing status of item.
+        { "update_time",             std::make_shared<DataTypeDateTime>() },
+        { "state",                   std::make_shared<DataTypeString>() },
+        { "num_tries",               std::make_shared<DataTypeUInt32>() },
+        { "last_exception",          std::make_shared<DataTypeString>() },
+    };
+}
+
+
+void StorageSystemPartMovesBetweenShards::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+{
+    const auto access = context->getAccess();
+    const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
+
+    std::map<String, std::map<String, StoragePtr>> replicated_tables;
+    for (const auto & db : DatabaseCatalog::instance().getDatabases())
+    {
+        /// Check if database can contain replicated tables
+        if (!db.second->canContainMergeTreeTables())
+            continue;
+
+        const bool check_access_for_tables = check_access_for_databases && !access->isGranted(AccessType::SHOW_TABLES, db.first);
+
+        for (auto iterator = db.second->getTablesIterator(context); iterator->isValid(); iterator->next())
+        {
+            const auto & table = iterator->table();
+            if (!table)
+                continue;
+            if (!dynamic_cast<const StorageReplicatedMergeTree *>(table.get()))
+                continue;
+            if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, db.first, iterator->name()))
+                continue;
+            replicated_tables[db.first][iterator->name()] = table;
+        }
+    }
+
+
+    MutableColumnPtr col_database_mut = ColumnString::create();
+    MutableColumnPtr col_table_mut = ColumnString::create();
+
+    for (auto & db : replicated_tables)
+    {
+        for (auto & table : db.second)
+        {
+            col_database_mut->insert(db.first);
+            col_table_mut->insert(table.first);
+        }
+    }
+
+    ColumnPtr col_database_to_filter = std::move(col_database_mut);
+    ColumnPtr col_table_to_filter = std::move(col_table_mut);
+
+    /// Determine what tables are needed by the conditions in the query.
+    {
+        Block filtered_block
+        {
+            { col_database_to_filter, std::make_shared<DataTypeString>(), "database" },
+            { col_table_to_filter, std::make_shared<DataTypeString>(), "table" },
+        };
+
+        VirtualColumnUtils::filterBlockWithQuery(query_info.query, filtered_block, context);
+
+        if (!filtered_block.rows())
+            return;
+
+        col_database_to_filter = filtered_block.getByName("database").column;
+        col_table_to_filter = filtered_block.getByName("table").column;
+    }
+
+    for (size_t i = 0, tables_size = col_database_to_filter->size(); i < tables_size; ++i)
+    {
+        String database = (*col_database_to_filter)[i].safeGet<const String &>();
+        String table = (*col_table_to_filter)[i].safeGet<const String &>();
+
+        auto moves = dynamic_cast<StorageReplicatedMergeTree &>(*replicated_tables[database][table]).getPartMovesBetweenShardsEntries();
+
+        for (auto & entry : moves)
+        {
+            size_t col_num = 0;
+
+            /// Table properties.
+            res_columns[col_num++]->insert(database);
+            res_columns[col_num++]->insert(table);
+
+            /// Constant element properties.
+            res_columns[col_num++]->insert(entry.znode_name);
+            res_columns[col_num++]->insert(entry.task_uuid);
+            res_columns[col_num++]->insert(entry.create_time);
+            res_columns[col_num++]->insert(entry.part_name);
+            res_columns[col_num++]->insert(entry.part_uuid);
+            res_columns[col_num++]->insert(entry.to_shard);
+
+            /// 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.last_exception_msg);
+        }
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.h b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
new file mode 100644
index 00000000000..892f816d48e
--- /dev/null
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <ext/shared_ptr_helper.h>
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+class StorageSystemPartMovesBetweenShards final : public ext::shared_ptr_helper<StorageSystemPartMovesBetweenShards>, public IStorageSystemOneBlock<StorageSystemPartMovesBetweenShards>
+{
+    friend struct ext::shared_ptr_helper<StorageSystemPartMovesBetweenShards>;
+public:
+    std::string getName() const override { return "SystemShardMoves"; }
+
+    static NamesAndTypesList getNamesAndTypes();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemPartsBase.cpp b/src/Storages/System/StorageSystemPartsBase.cpp
index 02627a3ba03..7243e5aa3ba 100644
--- a/src/Storages/System/StorageSystemPartsBase.cpp
+++ b/src/Storages/System/StorageSystemPartsBase.cpp
@@ -47,23 +47,26 @@ bool StorageSystemPartsBase::hasStateColumn(const Names & column_names, const St
 }
 
 MergeTreeData::DataPartsVector
-StoragesInfo::getParts(MergeTreeData::DataPartStateVector & state, bool has_state_column) const
+StoragesInfo::getParts(MergeTreeData::DataPartStateVector & state, bool has_state_column, bool require_projection_parts) const
 {
+    if (require_projection_parts && data->getInMemoryMetadataPtr()->projections.empty())
+        return {};
+
     using State = MergeTreeData::DataPartState;
     if (need_inactive_parts)
     {
         /// If has_state_column is requested, return all states.
         if (!has_state_column)
-            return data->getDataPartsVector({State::Committed, State::Outdated}, &state);
+            return data->getDataPartsVector({State::Committed, State::Outdated}, &state, require_projection_parts);
 
-        return data->getAllDataPartsVector(&state);
+        return data->getAllDataPartsVector(&state, require_projection_parts);
     }
 
-    return data->getDataPartsVector({State::Committed}, &state);
+    return data->getDataPartsVector({State::Committed}, &state, require_projection_parts);
 }
 
-StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, const Context & context)
-    : query_id(context.getCurrentQueryId()), settings(context.getSettings())
+StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context)
+    : query_id(context->getCurrentQueryId()), settings(context->getSettings())
 {
     /// Will apply WHERE to subset of columns and then add more columns.
     /// This is kind of complicated, but we use WHERE to do less work.
@@ -74,7 +77,7 @@ StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, const
     MutableColumnPtr engine_column_mut = ColumnString::create();
     MutableColumnPtr active_column_mut = ColumnUInt8::create();
 
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
 
     {
@@ -234,7 +237,7 @@ Pipe StorageSystemPartsBase::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index 3f63d75e2b6..45057616dad 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -24,14 +24,15 @@ struct StoragesInfo
     MergeTreeData * data = nullptr;
 
     operator bool() const { return storage != nullptr; }
-    MergeTreeData::DataPartsVector getParts(MergeTreeData::DataPartStateVector & state, bool has_state_column) const;
+    MergeTreeData::DataPartsVector
+    getParts(MergeTreeData::DataPartStateVector & state, bool has_state_column, bool require_projection_parts = false) const;
 };
 
 /** A helper class that enumerates the storages that match given query. */
 class StoragesInfoStream
 {
 public:
-    StoragesInfoStream(const SelectQueryInfo & query_info, const Context & context);
+    StoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context);
     StoragesInfo next();
 
 private:
@@ -59,7 +60,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemPartsColumns.cpp b/src/Storages/System/StorageSystemPartsColumns.cpp
index 703de70d17f..33ec5c457f6 100644
--- a/src/Storages/System/StorageSystemPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemPartsColumns.cpp
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeUUID.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Databases/IDatabase.h>
 #include <Parsers/queryToString.h>
@@ -19,6 +20,7 @@ StorageSystemPartsColumns::StorageSystemPartsColumns(const StorageID & table_id_
     {
         {"partition",                                  std::make_shared<DataTypeString>()},
         {"name",                                       std::make_shared<DataTypeString>()},
+        {"uuid",                                       std::make_shared<DataTypeUUID>()},
         {"part_type",                                  std::make_shared<DataTypeString>()},
         {"active",                                     std::make_shared<DataTypeUInt8>()},
         {"marks",                                      std::make_shared<DataTypeUInt64>()},
@@ -119,6 +121,8 @@ void StorageSystemPartsColumns::processNextStorage(
             }
             if (columns_mask[src_index++])
                 columns[res_index++]->insert(part->name);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->uuid);
             if (columns_mask[src_index++])
                 columns[res_index++]->insert(part->getTypeName());
             if (columns_mask[src_index++])
diff --git a/src/Storages/System/StorageSystemPrivileges.cpp b/src/Storages/System/StorageSystemPrivileges.cpp
index 5dda0caf201..ca369efe43a 100644
--- a/src/Storages/System/StorageSystemPrivileges.cpp
+++ b/src/Storages/System/StorageSystemPrivileges.cpp
@@ -74,7 +74,7 @@ NamesAndTypesList StorageSystemPrivileges::getNamesAndTypes()
 }
 
 
-void StorageSystemPrivileges::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemPrivileges::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     size_t column_index = 0;
     auto & column_access_type = assert_cast<ColumnInt8 &>(*res_columns[column_index++]).getData();
diff --git a/src/Storages/System/StorageSystemPrivileges.h b/src/Storages/System/StorageSystemPrivileges.h
index 8540e3d7ec3..618e1c91597 100644
--- a/src/Storages/System/StorageSystemPrivileges.h
+++ b/src/Storages/System/StorageSystemPrivileges.h
@@ -19,7 +19,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemPrivileges>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemProcesses.cpp b/src/Storages/System/StorageSystemProcesses.cpp
index e6266503095..785b4c0df11 100644
--- a/src/Storages/System/StorageSystemProcesses.cpp
+++ b/src/Storages/System/StorageSystemProcesses.cpp
@@ -70,9 +70,9 @@ NamesAndTypesList StorageSystemProcesses::getNamesAndTypes()
 }
 
 
-void StorageSystemProcesses::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemProcesses::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    ProcessList::Info info = context.getProcessList().getInfo(true, true, true);
+    ProcessList::Info info = context->getProcessList().getInfo(true, true, true);
 
     for (const auto & process : info)
     {
diff --git a/src/Storages/System/StorageSystemProcesses.h b/src/Storages/System/StorageSystemProcesses.h
index 62c568970e7..4f876348a4b 100644
--- a/src/Storages/System/StorageSystemProcesses.h
+++ b/src/Storages/System/StorageSystemProcesses.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
new file mode 100644
index 00000000000..7ae8a91ad60
--- /dev/null
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -0,0 +1,289 @@
+#include "StorageSystemProjectionParts.h"
+
+#include <Common/escapeForFileName.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Storages/VirtualColumnUtils.h>
+#include <Databases/IDatabase.h>
+#include <Parsers/queryToString.h>
+#include <Common/hex.h>
+
+namespace DB
+{
+
+StorageSystemProjectionParts::StorageSystemProjectionParts(const StorageID & table_id_)
+    : StorageSystemPartsBase(table_id_,
+    {
+        {"partition",                                   std::make_shared<DataTypeString>()},
+        {"name",                                        std::make_shared<DataTypeString>()},
+        {"part_type",                                   std::make_shared<DataTypeString>()},
+        {"parent_name",                                 std::make_shared<DataTypeString>()},
+        {"parent_uuid",                                 std::make_shared<DataTypeUUID>()},
+        {"parent_part_type",                            std::make_shared<DataTypeString>()},
+        {"active",                                      std::make_shared<DataTypeUInt8>()},
+        {"marks",                                       std::make_shared<DataTypeUInt64>()},
+        {"rows",                                        std::make_shared<DataTypeUInt64>()},
+        {"bytes_on_disk",                               std::make_shared<DataTypeUInt64>()},
+        {"data_compressed_bytes",                       std::make_shared<DataTypeUInt64>()},
+        {"data_uncompressed_bytes",                     std::make_shared<DataTypeUInt64>()},
+        {"marks_bytes",                                 std::make_shared<DataTypeUInt64>()},
+        {"parent_marks",                                std::make_shared<DataTypeUInt64>()},
+        {"parent_rows",                                 std::make_shared<DataTypeUInt64>()},
+        {"parent_bytes_on_disk",                        std::make_shared<DataTypeUInt64>()},
+        {"parent_data_compressed_bytes",                std::make_shared<DataTypeUInt64>()},
+        {"parent_data_uncompressed_bytes",              std::make_shared<DataTypeUInt64>()},
+        {"parent_marks_bytes",                          std::make_shared<DataTypeUInt64>()},
+        {"modification_time",                           std::make_shared<DataTypeDateTime>()},
+        {"remove_time",                                 std::make_shared<DataTypeDateTime>()},
+        {"refcount",                                    std::make_shared<DataTypeUInt32>()},
+        {"min_date",                                    std::make_shared<DataTypeDate>()},
+        {"max_date",                                    std::make_shared<DataTypeDate>()},
+        {"min_time",                                    std::make_shared<DataTypeDateTime>()},
+        {"max_time",                                    std::make_shared<DataTypeDateTime>()},
+        {"partition_id",                                std::make_shared<DataTypeString>()},
+        {"min_block_number",                            std::make_shared<DataTypeInt64>()},
+        {"max_block_number",                            std::make_shared<DataTypeInt64>()},
+        {"level",                                       std::make_shared<DataTypeUInt32>()},
+        {"data_version",                                std::make_shared<DataTypeUInt64>()},
+        {"primary_key_bytes_in_memory",                 std::make_shared<DataTypeUInt64>()},
+        {"primary_key_bytes_in_memory_allocated",       std::make_shared<DataTypeUInt64>()},
+        {"is_frozen",                                   std::make_shared<DataTypeUInt8>()},
+
+        {"database",                                    std::make_shared<DataTypeString>()},
+        {"table",                                       std::make_shared<DataTypeString>()},
+        {"engine",                                      std::make_shared<DataTypeString>()},
+        {"disk_name",                                   std::make_shared<DataTypeString>()},
+        {"path",                                        std::make_shared<DataTypeString>()},
+
+        {"hash_of_all_files",                           std::make_shared<DataTypeString>()},
+        {"hash_of_uncompressed_files",                  std::make_shared<DataTypeString>()},
+        {"uncompressed_hash_of_compressed_files",       std::make_shared<DataTypeString>()},
+
+        {"delete_ttl_info_min",                         std::make_shared<DataTypeDateTime>()},
+        {"delete_ttl_info_max",                         std::make_shared<DataTypeDateTime>()},
+
+        {"move_ttl_info.expression",                    std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"move_ttl_info.min",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"move_ttl_info.max",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+
+        {"default_compression_codec",                   std::make_shared<DataTypeString>()},
+
+        {"recompression_ttl_info.expression",           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"recompression_ttl_info.min",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"recompression_ttl_info.max",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+
+        {"group_by_ttl_info.expression",                std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"group_by_ttl_info.min",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"group_by_ttl_info.max",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+
+        {"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>())}
+    }
+    )
+{
+}
+
+void StorageSystemProjectionParts::processNextStorage(
+    MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
+{
+    using State = IMergeTreeDataPart::State;
+    MergeTreeData::DataPartStateVector all_parts_state;
+    MergeTreeData::DataPartsVector all_parts;
+
+    all_parts = info.getParts(all_parts_state, has_state_column, true /* require_projection_parts */);
+
+    for (size_t part_number = 0; part_number < all_parts.size(); ++part_number)
+    {
+        const auto & part = all_parts[part_number];
+        const auto * parent_part = part->getParentPart();
+        auto part_state = all_parts_state[part_number];
+
+        ColumnSize columns_size = part->getTotalColumnsSize();
+        ColumnSize parent_columns_size = parent_part->getTotalColumnsSize();
+
+        size_t src_index = 0, res_index = 0;
+        if (columns_mask[src_index++])
+        {
+            WriteBufferFromOwnString out;
+            parent_part->partition.serializeText(*info.data, out, format_settings);
+            columns[res_index++]->insert(out.str());
+        }
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->name);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getTypeName());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->name);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->uuid);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->getTypeName());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part_state == State::Committed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getMarksCount());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->rows_count);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getBytesOnDisk());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(columns_size.data_compressed);
+        if (columns_mask[src_index++])
+            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(parent_part->getMarksCount());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->rows_count);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->getBytesOnDisk());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_columns_size.data_compressed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_columns_size.data_uncompressed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_columns_size.marks);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt64>(part->modification_time));
+
+        if (columns_mask[src_index++])
+        {
+            time_t remove_time = part->remove_time.load(std::memory_order_relaxed);
+            columns[res_index++]->insert(static_cast<UInt64>(remove_time == std::numeric_limits<time_t>::max() ? 0 : remove_time));
+        }
+
+        /// For convenience, in returned refcount, don't add references that was due to local variables in this method: all_parts, active_parts.
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt64>(part.use_count() - 1));
+
+        auto min_max_date = parent_part->getMinMaxDate();
+        auto min_max_time = parent_part->getMinMaxTime();
+
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(min_max_date.first);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(min_max_date.second);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(min_max_time.first));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(min_max_time.second));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->info.partition_id);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->info.min_block);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->info.max_block);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(parent_part->info.level);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt64>(parent_part->info.getDataVersion()));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getIndexSizeInBytes());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->getIndexSizeInAllocatedBytes());
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(part->is_frozen.load(std::memory_order_relaxed));
+
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(info.database);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(info.table);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(info.engine);
+
+        if (part->isStoredOnDisk())
+        {
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->volume->getDisk()->getName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getFullPath());
+        }
+        else
+        {
+            if (columns_mask[src_index++])
+                columns[res_index++]->insertDefault();
+            if (columns_mask[src_index++])
+                columns[res_index++]->insertDefault();
+        }
+
+
+        {
+            MinimalisticDataPartChecksums helper;
+            if (columns_mask[src_index] || columns_mask[src_index + 1] || columns_mask[src_index + 2])
+                helper.computeTotalChecksums(part->checksums);
+
+            if (columns_mask[src_index++])
+            {
+                auto checksum = helper.hash_of_all_files;
+                columns[res_index++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+            }
+            if (columns_mask[src_index++])
+            {
+                auto checksum = helper.hash_of_uncompressed_files;
+                columns[res_index++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+            }
+            if (columns_mask[src_index++])
+            {
+                auto checksum = helper.uncompressed_hash_of_compressed_files;
+                columns[res_index++]->insert(getHexUIntLowercase(checksum.first) + getHexUIntLowercase(checksum.second));
+            }
+        }
+
+        /// delete_ttl_info
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(part->ttl_infos.table_ttl.min));
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(static_cast<UInt32>(part->ttl_infos.table_ttl.max));
+
+        auto add_ttl_info_map = [&](const TTLInfoMap & ttl_info_map)
+        {
+            Array expression_array;
+            Array min_array;
+            Array max_array;
+            if (columns_mask[src_index])
+                expression_array.reserve(ttl_info_map.size());
+            if (columns_mask[src_index + 1])
+                min_array.reserve(ttl_info_map.size());
+            if (columns_mask[src_index + 2])
+                max_array.reserve(ttl_info_map.size());
+            for (const auto & [expression, ttl_info] : ttl_info_map)
+            {
+                if (columns_mask[src_index])
+                    expression_array.emplace_back(expression);
+                if (columns_mask[src_index + 1])
+                    min_array.push_back(static_cast<UInt32>(ttl_info.min));
+                if (columns_mask[src_index + 2])
+                    max_array.push_back(static_cast<UInt32>(ttl_info.max));
+            }
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(expression_array);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(min_array);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(max_array);
+        };
+
+        add_ttl_info_map(part->ttl_infos.moves_ttl);
+
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(queryToString(part->default_codec->getCodecDesc()));
+
+        add_ttl_info_map(part->ttl_infos.recompression_ttl);
+        add_ttl_info_map(part->ttl_infos.group_by_ttl);
+        add_ttl_info_map(part->ttl_infos.rows_where_ttl);
+
+        /// _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));
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemProjectionParts.h b/src/Storages/System/StorageSystemProjectionParts.h
new file mode 100644
index 00000000000..11a7b034b6e
--- /dev/null
+++ b/src/Storages/System/StorageSystemProjectionParts.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <ext/shared_ptr_helper.h>
+#include <Storages/System/StorageSystemPartsBase.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+/** Implements system table 'projection_parts' which allows to get information about projection parts for tables of MergeTree family.
+  */
+class StorageSystemProjectionParts final : public ext::shared_ptr_helper<StorageSystemProjectionParts>, public StorageSystemPartsBase
+{
+    friend struct ext::shared_ptr_helper<StorageSystemProjectionParts>;
+public:
+    std::string getName() const override { return "SystemProjectionParts"; }
+
+protected:
+    explicit StorageSystemProjectionParts(const StorageID & table_id_);
+    void processNextStorage(
+        MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column) override;
+};
+}
diff --git a/src/Storages/System/StorageSystemProjectionPartsColumns.cpp b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
new file mode 100644
index 00000000000..bdbe9a46846
--- /dev/null
+++ b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
@@ -0,0 +1,256 @@
+#include "StorageSystemProjectionPartsColumns.h"
+
+#include <Common/escapeForFileName.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Storages/VirtualColumnUtils.h>
+#include <Databases/IDatabase.h>
+#include <Parsers/queryToString.h>
+
+namespace DB
+{
+
+
+StorageSystemProjectionPartsColumns::StorageSystemProjectionPartsColumns(const StorageID & table_id_)
+    : StorageSystemPartsBase(table_id_,
+    {
+        {"partition",                                  std::make_shared<DataTypeString>()},
+        {"name",                                       std::make_shared<DataTypeString>()},
+        {"part_type",                                  std::make_shared<DataTypeString>()},
+        {"parent_name",                                std::make_shared<DataTypeString>()},
+        {"parent_uuid",                                std::make_shared<DataTypeUUID>()},
+        {"parent_part_type",                           std::make_shared<DataTypeString>()},
+        {"active",                                     std::make_shared<DataTypeUInt8>()},
+        {"marks",                                      std::make_shared<DataTypeUInt64>()},
+        {"rows",                                       std::make_shared<DataTypeUInt64>()},
+        {"bytes_on_disk",                              std::make_shared<DataTypeUInt64>()},
+        {"data_compressed_bytes",                      std::make_shared<DataTypeUInt64>()},
+        {"data_uncompressed_bytes",                    std::make_shared<DataTypeUInt64>()},
+        {"marks_bytes",                                std::make_shared<DataTypeUInt64>()},
+        {"parent_marks",                               std::make_shared<DataTypeUInt64>()},
+        {"parent_rows",                                std::make_shared<DataTypeUInt64>()},
+        {"parent_bytes_on_disk",                       std::make_shared<DataTypeUInt64>()},
+        {"parent_data_compressed_bytes",               std::make_shared<DataTypeUInt64>()},
+        {"parent_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>()},
+        {"parent_marks_bytes",                         std::make_shared<DataTypeUInt64>()},
+        {"modification_time",                          std::make_shared<DataTypeDateTime>()},
+        {"remove_time",                                std::make_shared<DataTypeDateTime>()},
+        {"refcount",                                   std::make_shared<DataTypeUInt32>()},
+        {"min_date",                                   std::make_shared<DataTypeDate>()},
+        {"max_date",                                   std::make_shared<DataTypeDate>()},
+        {"min_time",                                   std::make_shared<DataTypeDateTime>()},
+        {"max_time",                                   std::make_shared<DataTypeDateTime>()},
+        {"partition_id",                               std::make_shared<DataTypeString>()},
+        {"min_block_number",                           std::make_shared<DataTypeInt64>()},
+        {"max_block_number",                           std::make_shared<DataTypeInt64>()},
+        {"level",                                      std::make_shared<DataTypeUInt32>()},
+        {"data_version",                               std::make_shared<DataTypeUInt64>()},
+        {"primary_key_bytes_in_memory",                std::make_shared<DataTypeUInt64>()},
+        {"primary_key_bytes_in_memory_allocated",      std::make_shared<DataTypeUInt64>()},
+
+        {"database",                                   std::make_shared<DataTypeString>()},
+        {"table",                                      std::make_shared<DataTypeString>()},
+        {"engine",                                     std::make_shared<DataTypeString>()},
+        {"disk_name",                                  std::make_shared<DataTypeString>()},
+        {"path",                                       std::make_shared<DataTypeString>()},
+
+        {"column",                                     std::make_shared<DataTypeString>()},
+        {"type",                                       std::make_shared<DataTypeString>()},
+        {"column_position",                            std::make_shared<DataTypeUInt64>()},
+        {"default_kind",                               std::make_shared<DataTypeString>()},
+        {"default_expression",                         std::make_shared<DataTypeString>()},
+        {"column_bytes_on_disk",                       std::make_shared<DataTypeUInt64>()},
+        {"column_data_compressed_bytes",               std::make_shared<DataTypeUInt64>()},
+        {"column_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>()},
+        {"column_marks_bytes",                         std::make_shared<DataTypeUInt64>()}
+    }
+    )
+{
+}
+
+void StorageSystemProjectionPartsColumns::processNextStorage(
+    MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column)
+{
+    /// Prepare information about columns in storage.
+    struct ColumnInfo
+    {
+        String default_kind;
+        String default_expression;
+    };
+
+    auto storage_metadata = info.storage->getInMemoryMetadataPtr();
+    std::unordered_map<String, std::unordered_map<String, ColumnInfo>> projection_columns_info;
+    for (const auto & projection : storage_metadata->getProjections())
+    {
+        auto & columns_info = projection_columns_info[projection.name];
+        for (const auto & column : projection.metadata->getColumns())
+        {
+            ColumnInfo column_info;
+            if (column.default_desc.expression)
+            {
+                column_info.default_kind = toString(column.default_desc.kind);
+                column_info.default_expression = queryToString(column.default_desc.expression);
+            }
+
+            columns_info[column.name] = column_info;
+        }
+    }
+
+    /// Go through the list of parts.
+    MergeTreeData::DataPartStateVector all_parts_state;
+    MergeTreeData::DataPartsVector all_parts;
+    all_parts = info.getParts(all_parts_state, has_state_column, true /* require_projection_parts */);
+    for (size_t part_number = 0; part_number < all_parts.size(); ++part_number)
+    {
+        const auto & part = all_parts[part_number];
+        const auto * parent_part = part->getParentPart();
+        auto part_state = all_parts_state[part_number];
+        auto columns_size = part->getTotalColumnsSize();
+        auto parent_columns_size = parent_part->getTotalColumnsSize();
+
+        /// For convenience, in returned refcount, don't add references that was due to local variables in this method: all_parts, active_parts.
+        auto use_count = part.use_count() - 1;
+
+        auto min_max_date = parent_part->getMinMaxDate();
+        auto min_max_time = parent_part->getMinMaxTime();
+
+        auto index_size_in_bytes = part->getIndexSizeInBytes();
+        auto index_size_in_allocated_bytes = part->getIndexSizeInAllocatedBytes();
+
+        using State = IMergeTreeDataPart::State;
+
+        size_t column_position = 0;
+        auto & columns_info = projection_columns_info[part->name];
+        for (const auto & column : part->getColumns())
+        {
+            ++column_position;
+            size_t src_index = 0, res_index = 0;
+            if (columns_mask[src_index++])
+            {
+                WriteBufferFromOwnString out;
+                parent_part->partition.serializeText(*info.data, out, format_settings);
+                columns[res_index++]->insert(out.str());
+            }
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->name);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getTypeName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->name);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->uuid);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->getTypeName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part_state == State::Committed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getMarksCount());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->rows_count);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getBytesOnDisk());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(columns_size.data_compressed);
+            if (columns_mask[src_index++])
+                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(parent_part->getMarksCount());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->rows_count);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->getBytesOnDisk());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_columns_size.data_compressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_columns_size.data_uncompressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_columns_size.marks);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(part->modification_time));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(part->remove_time.load(std::memory_order_relaxed)));
+
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(use_count));
+
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(min_max_date.first);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(min_max_date.second);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(static_cast<UInt32>(min_max_time.first));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(static_cast<UInt32>(min_max_time.second));
+
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->info.partition_id);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->info.min_block);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->info.max_block);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(parent_part->info.level);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(UInt64(parent_part->info.getDataVersion()));
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(index_size_in_bytes);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(index_size_in_allocated_bytes);
+
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(info.database);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(info.table);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(info.engine);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->volume->getDisk()->getName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->getFullPath());
+
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column.name);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column.type->getName());
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_position);
+
+            auto column_info_it = columns_info.find(column.name);
+            if (column_info_it != columns_info.end())
+            {
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insert(column_info_it->second.default_kind);
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insert(column_info_it->second.default_expression);
+            }
+            else
+            {
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insertDefault();
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insertDefault();
+            }
+
+            ColumnSize column_size = part->getColumnSize(column.name, *column.type);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.data_compressed + column_size.marks);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.data_compressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.data_uncompressed);
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(column_size.marks);
+
+            if (has_state_column)
+                columns[res_index++]->insert(part->stateString());
+        }
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemProjectionPartsColumns.h b/src/Storages/System/StorageSystemProjectionPartsColumns.h
new file mode 100644
index 00000000000..16a32823db8
--- /dev/null
+++ b/src/Storages/System/StorageSystemProjectionPartsColumns.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <ext/shared_ptr_helper.h>
+#include <Storages/System/StorageSystemPartsBase.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+/** Implements system table 'projection_parts_columns' which allows to get information about
+ * columns in projection parts for tables of MergeTree family.
+ */
+class StorageSystemProjectionPartsColumns final
+        : public ext::shared_ptr_helper<StorageSystemProjectionPartsColumns>, public StorageSystemPartsBase
+{
+    friend struct ext::shared_ptr_helper<StorageSystemProjectionPartsColumns>;
+public:
+    std::string getName() const override { return "SystemProjectionPartsColumns"; }
+
+protected:
+    StorageSystemProjectionPartsColumns(const StorageID & table_id_);
+    void processNextStorage(
+        MutableColumns & columns, std::vector<UInt8> & columns_mask, const StoragesInfo & info, bool has_state_column) override;
+};
+}
diff --git a/src/Storages/System/StorageSystemQuotaLimits.cpp b/src/Storages/System/StorageSystemQuotaLimits.cpp
index c6e99cc9203..63a419e213c 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.cpp
+++ b/src/Storages/System/StorageSystemQuotaLimits.cpp
@@ -69,10 +69,10 @@ NamesAndTypesList StorageSystemQuotaLimits::getNamesAndTypes()
 }
 
 
-void StorageSystemQuotaLimits::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotaLimits::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<Quota>();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemQuotaLimits.h b/src/Storages/System/StorageSystemQuotaLimits.h
index e9ae7fc09d0..8f496734e0f 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.h
+++ b/src/Storages/System/StorageSystemQuotaLimits.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotaLimits>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotaUsage.cpp b/src/Storages/System/StorageSystemQuotaUsage.cpp
index 6d6e22e7be6..a25a130bf6c 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotaUsage.cpp
@@ -81,10 +81,10 @@ NamesAndTypesList StorageSystemQuotaUsage::getNamesAndTypesImpl(bool add_column_
 }
 
 
-void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    auto usage = context.getQuotaUsage();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    auto usage = context->getQuotaUsage();
     if (!usage)
         return;
 
@@ -94,7 +94,7 @@ void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, const Conte
 
 void StorageSystemQuotaUsage::fillDataImpl(
     MutableColumns & res_columns,
-    const Context & context,
+    ContextPtr context,
     bool add_column_is_current,
     const std::vector<QuotaUsage> & quotas_usage)
 {
@@ -128,7 +128,7 @@ void StorageSystemQuotaUsage::fillDataImpl(
     std::optional<UUID> current_quota_id;
     if (add_column_is_current)
     {
-        if (auto current_usage = context.getQuotaUsage())
+        if (auto current_usage = context->getQuotaUsage())
             current_quota_id = current_usage->quota_id;
     }
 
diff --git a/src/Storages/System/StorageSystemQuotaUsage.h b/src/Storages/System/StorageSystemQuotaUsage.h
index abb9505eb5a..806c3eb3f4a 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.h
+++ b/src/Storages/System/StorageSystemQuotaUsage.h
@@ -20,12 +20,12 @@ public:
     static NamesAndTypesList getNamesAndTypes();
 
     static NamesAndTypesList getNamesAndTypesImpl(bool add_column_is_current);
-    static void fillDataImpl(MutableColumns & res_columns, const Context & context, bool add_column_is_current, const std::vector<QuotaUsage> & quotas_usage);
+    static void fillDataImpl(MutableColumns & res_columns, ContextPtr context, bool add_column_is_current, const std::vector<QuotaUsage> & quotas_usage);
 
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotaUsage>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotas.cpp b/src/Storages/System/StorageSystemQuotas.cpp
index fab6384e6a8..5e1ce220bec 100644
--- a/src/Storages/System/StorageSystemQuotas.cpp
+++ b/src/Storages/System/StorageSystemQuotas.cpp
@@ -52,15 +52,15 @@ NamesAndTypesList StorageSystemQuotas::getNamesAndTypes()
 }
 
 
-void StorageSystemQuotas::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotas::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<Quota>();
 
     size_t column_index = 0;
     auto & column_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
-    auto & column_id = assert_cast<ColumnUInt128 &>(*res_columns[column_index++]).getData();
+    auto & column_id = assert_cast<ColumnUUID &>(*res_columns[column_index++]).getData();
     auto & column_storage = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_key_types = assert_cast<ColumnInt8 &>(assert_cast<ColumnArray &>(*res_columns[column_index]).getData()).getData();
     auto & column_key_types_offsets = assert_cast<ColumnArray &>(*res_columns[column_index++]).getOffsets();
@@ -80,7 +80,7 @@ void StorageSystemQuotas::fillData(MutableColumns & res_columns, const Context &
                        const RolesOrUsersSet & apply_to)
     {
         column_name.insertData(name.data(), name.length());
-        column_id.push_back(id);
+        column_id.push_back(id.toUnderType());
         column_storage.insertData(storage_name.data(), storage_name.length());
 
         if (key_type != KeyType::NONE)
diff --git a/src/Storages/System/StorageSystemQuotas.h b/src/Storages/System/StorageSystemQuotas.h
index 8d1da53d641..fb74ea9b05f 100644
--- a/src/Storages/System/StorageSystemQuotas.h
+++ b/src/Storages/System/StorageSystemQuotas.h
@@ -19,7 +19,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotas>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotasUsage.cpp b/src/Storages/System/StorageSystemQuotasUsage.cpp
index 5c6879cd143..363562bce19 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotasUsage.cpp
@@ -13,10 +13,10 @@ NamesAndTypesList StorageSystemQuotasUsage::getNamesAndTypes()
     return StorageSystemQuotaUsage::getNamesAndTypesImpl(/* add_column_is_current = */ true);
 }
 
-void StorageSystemQuotasUsage::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemQuotasUsage::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_QUOTAS);
-    auto all_quotas_usage = context.getAccessControlManager().getAllQuotasUsage();
+    context->checkAccess(AccessType::SHOW_QUOTAS);
+    auto all_quotas_usage = context->getAccessControlManager().getAllQuotasUsage();
     StorageSystemQuotaUsage::fillDataImpl(res_columns, context, /* add_column_is_current = */ true, all_quotas_usage);
 }
 }
diff --git a/src/Storages/System/StorageSystemQuotasUsage.h b/src/Storages/System/StorageSystemQuotasUsage.h
index d4fd93b577d..1f29ea9b886 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.h
+++ b/src/Storages/System/StorageSystemQuotasUsage.h
@@ -20,7 +20,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemQuotasUsage>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index 0af67ab6986..fc33c6b421b 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -60,14 +60,14 @@ Pipe StorageSystemReplicas::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
 {
     metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
 
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     /// We collect a set of replicated tables.
diff --git a/src/Storages/System/StorageSystemReplicas.h b/src/Storages/System/StorageSystemReplicas.h
index d9e364a28c0..2352d7ccdf2 100644
--- a/src/Storages/System/StorageSystemReplicas.h
+++ b/src/Storages/System/StorageSystemReplicas.h
@@ -22,7 +22,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.cpp b/src/Storages/System/StorageSystemReplicatedFetches.cpp
index 53bec5aa42f..453568e3b86 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.cpp
+++ b/src/Storages/System/StorageSystemReplicatedFetches.cpp
@@ -30,12 +30,12 @@ NamesAndTypesList StorageSystemReplicatedFetches::getNamesAndTypes()
     };
 }
 
-void StorageSystemReplicatedFetches::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemReplicatedFetches::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
 
-    for (const auto & fetch : context.getReplicatedFetchList().get())
+    for (const auto & fetch : context->getReplicatedFetchList().get())
     {
         if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, fetch.database, fetch.table))
             continue;
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.h b/src/Storages/System/StorageSystemReplicatedFetches.h
index 34081923e4f..ed25e75eb70 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.h
+++ b/src/Storages/System/StorageSystemReplicatedFetches.h
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemReplicationQueue.cpp b/src/Storages/System/StorageSystemReplicationQueue.cpp
index 9cd5e8b8ff3..8acd192eac4 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.cpp
+++ b/src/Storages/System/StorageSystemReplicationQueue.cpp
@@ -47,9 +47,9 @@ NamesAndTypesList StorageSystemReplicationQueue::getNamesAndTypes()
 }
 
 
-void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
-    const auto access = context.getAccess();
+    const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
     std::map<String, std::map<String, StoragePtr>> replicated_tables;
diff --git a/src/Storages/System/StorageSystemReplicationQueue.h b/src/Storages/System/StorageSystemReplicationQueue.h
index 36841fb9be9..f85f23a2b20 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.h
+++ b/src/Storages/System/StorageSystemReplicationQueue.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRoleGrants.cpp b/src/Storages/System/StorageSystemRoleGrants.cpp
index cf0fad8f8ce..32984afcfc5 100644
--- a/src/Storages/System/StorageSystemRoleGrants.cpp
+++ b/src/Storages/System/StorageSystemRoleGrants.cpp
@@ -31,10 +31,10 @@ NamesAndTypesList StorageSystemRoleGrants::getNamesAndTypes()
 }
 
 
-void StorageSystemRoleGrants::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemRoleGrants::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_USERS | AccessType::SHOW_ROLES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
     boost::range::push_back(ids, access_control.findAll<Role>());
 
diff --git a/src/Storages/System/StorageSystemRoleGrants.h b/src/Storages/System/StorageSystemRoleGrants.h
index 0a02303abc3..a290dcf320d 100644
--- a/src/Storages/System/StorageSystemRoleGrants.h
+++ b/src/Storages/System/StorageSystemRoleGrants.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemRoleGrants>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRoles.cpp b/src/Storages/System/StorageSystemRoles.cpp
index c560bc2bc6e..42983670466 100644
--- a/src/Storages/System/StorageSystemRoles.cpp
+++ b/src/Storages/System/StorageSystemRoles.cpp
@@ -23,15 +23,15 @@ NamesAndTypesList StorageSystemRoles::getNamesAndTypes()
 }
 
 
-void StorageSystemRoles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_ROLES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_ROLES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<Role>();
 
     size_t column_index = 0;
     auto & column_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
-    auto & column_id = assert_cast<ColumnUInt128 &>(*res_columns[column_index++]).getData();
+    auto & column_id = assert_cast<ColumnUUID &>(*res_columns[column_index++]).getData();
     auto & column_storage = assert_cast<ColumnString &>(*res_columns[column_index++]);
 
     auto add_row = [&](const String & name,
@@ -39,7 +39,7 @@ void StorageSystemRoles::fillData(MutableColumns & res_columns, const Context &
                        const String & storage_name)
     {
         column_name.insertData(name.data(), name.length());
-        column_id.push_back(id);
+        column_id.push_back(id.toUnderType());
         column_storage.insertData(storage_name.data(), storage_name.length());
     };
 
diff --git a/src/Storages/System/StorageSystemRoles.h b/src/Storages/System/StorageSystemRoles.h
index fb44194baff..38c7ed05f1e 100644
--- a/src/Storages/System/StorageSystemRoles.h
+++ b/src/Storages/System/StorageSystemRoles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemRoles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRowPolicies.cpp b/src/Storages/System/StorageSystemRowPolicies.cpp
index 9b11a781d6f..c7a403a4abe 100644
--- a/src/Storages/System/StorageSystemRowPolicies.cpp
+++ b/src/Storages/System/StorageSystemRowPolicies.cpp
@@ -52,10 +52,10 @@ NamesAndTypesList StorageSystemRowPolicies::getNamesAndTypes()
 }
 
 
-void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_ROW_POLICIES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_ROW_POLICIES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<RowPolicy>();
 
     size_t column_index = 0;
@@ -63,7 +63,7 @@ void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, const Cont
     auto & column_short_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_database = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_table = assert_cast<ColumnString &>(*res_columns[column_index++]);
-    auto & column_id = assert_cast<ColumnUInt128 &>(*res_columns[column_index++]).getData();
+    auto & column_id = assert_cast<ColumnUUID &>(*res_columns[column_index++]).getData();
     auto & column_storage = assert_cast<ColumnString &>(*res_columns[column_index++]);
 
     ColumnString * column_condition[MAX_CONDITION_TYPE];
@@ -93,7 +93,7 @@ void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, const Cont
         column_short_name.insertData(name_parts.short_name.data(), name_parts.short_name.length());
         column_database.insertData(name_parts.database.data(), name_parts.database.length());
         column_table.insertData(name_parts.table_name.data(), name_parts.table_name.length());
-        column_id.push_back(id);
+        column_id.push_back(id.toUnderType());
         column_storage.insertData(storage_name.data(), storage_name.length());
 
         for (auto condition_type : ext::range(MAX_CONDITION_TYPE))
diff --git a/src/Storages/System/StorageSystemRowPolicies.h b/src/Storages/System/StorageSystemRowPolicies.h
index b81020b421c..3b9ebfcc25a 100644
--- a/src/Storages/System/StorageSystemRowPolicies.h
+++ b/src/Storages/System/StorageSystemRowPolicies.h
@@ -20,7 +20,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemRowPolicies>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettings.cpp b/src/Storages/System/StorageSystemSettings.cpp
index 07a2d450b12..1aca7e45190 100644
--- a/src/Storages/System/StorageSystemSettings.cpp
+++ b/src/Storages/System/StorageSystemSettings.cpp
@@ -26,10 +26,10 @@ NamesAndTypesList StorageSystemSettings::getNamesAndTypes()
 #pragma GCC optimize("-fno-var-tracking-assignments")
 #endif
 
-void StorageSystemSettings::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemSettings::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const Settings & settings = context.getSettingsRef();
-    auto settings_constraints = context.getSettingsConstraints();
+    const Settings & settings = context->getSettingsRef();
+    auto settings_constraints = context->getSettingsConstraints();
     for (const auto & setting : settings.all())
     {
         const auto & setting_name = setting.getName();
diff --git a/src/Storages/System/StorageSystemSettings.h b/src/Storages/System/StorageSystemSettings.h
index 6cb5e18e1d7..d93c09d3f80 100644
--- a/src/Storages/System/StorageSystemSettings.h
+++ b/src/Storages/System/StorageSystemSettings.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.cpp b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
index cf47416e188..fa824091238 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
@@ -37,10 +37,10 @@ NamesAndTypesList StorageSystemSettingsProfileElements::getNamesAndTypes()
 }
 
 
-void StorageSystemSettingsProfileElements::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemSettingsProfileElements::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
     boost::range::push_back(ids, access_control.findAll<Role>());
     boost::range::push_back(ids, access_control.findAll<SettingsProfile>());
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.h b/src/Storages/System/StorageSystemSettingsProfileElements.h
index 2dc79fed0e7..2262ea96dde 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.h
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemSettingsProfileElements>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.cpp b/src/Storages/System/StorageSystemSettingsProfiles.cpp
index a678290d447..87847fb80bc 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfiles.cpp
@@ -30,15 +30,15 @@ NamesAndTypesList StorageSystemSettingsProfiles::getNamesAndTypes()
 }
 
 
-void StorageSystemSettingsProfiles::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemSettingsProfiles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_SETTINGS_PROFILES);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<SettingsProfile>();
 
     size_t column_index = 0;
     auto & column_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
-    auto & column_id = assert_cast<ColumnUInt128 &>(*res_columns[column_index++]).getData();
+    auto & column_id = assert_cast<ColumnUUID &>(*res_columns[column_index++]).getData();
     auto & column_storage = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_num_elements = assert_cast<ColumnUInt64 &>(*res_columns[column_index++]).getData();
     auto & column_apply_to_all = assert_cast<ColumnUInt8 &>(*res_columns[column_index++]).getData();
@@ -54,7 +54,7 @@ void StorageSystemSettingsProfiles::fillData(MutableColumns & res_columns, const
                        const RolesOrUsersSet & apply_to)
     {
         column_name.insertData(name.data(), name.length());
-        column_id.push_back(id);
+        column_id.push_back(id.toUnderType());
         column_storage.insertData(storage_name.data(), storage_name.length());
         column_num_elements.push_back(elements.size());
 
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.h b/src/Storages/System/StorageSystemSettingsProfiles.h
index c6b887c99df..580430dc28b 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.h
+++ b/src/Storages/System/StorageSystemSettingsProfiles.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemSettingsProfiles>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index e74d56108ad..406e154029d 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -13,6 +13,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFile.h>
 #include <Common/PipeFDs.h>
 #include <Common/CurrentThread.h>
 #include <common/getThreadId.h>
@@ -176,6 +177,7 @@ NamesAndTypesList StorageSystemStackTrace::getNamesAndTypes()
 {
     return
     {
+        { "thread_name", std::make_shared<DataTypeString>() },
         { "thread_id", std::make_shared<DataTypeUInt64>() },
         { "query_id", std::make_shared<DataTypeString>() },
         { "trace", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()) }
@@ -183,7 +185,7 @@ NamesAndTypesList StorageSystemStackTrace::getNamesAndTypes()
 }
 
 
-void StorageSystemStackTrace::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemStackTrace::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     /// It shouldn't be possible to do concurrent reads from this table.
     std::lock_guard lock(mutex);
@@ -213,6 +215,18 @@ void StorageSystemStackTrace::fillData(MutableColumns & res_columns, const Conte
             throwFromErrno("Cannot send signal with sigqueue", ErrorCodes::CANNOT_SIGQUEUE);
         }
 
+        std::filesystem::path thread_name_path = it->path();
+        thread_name_path.append("comm");
+
+        String thread_name;
+        if (std::filesystem::exists(thread_name_path))
+        {
+            constexpr size_t comm_buf_size = 32; /// More than enough for thread name
+            ReadBufferFromFile comm(thread_name_path.string(), comm_buf_size);
+            readStringUntilEOF(thread_name, comm);
+            comm.close();
+        }
+
         /// Just in case we will wait for pipe with timeout. In case signal didn't get processed.
 
         if (wait(100) && sig_value.sival_int == data_ready_num.load(std::memory_order_acquire))
@@ -225,9 +239,10 @@ void StorageSystemStackTrace::fillData(MutableColumns & res_columns, const Conte
             for (size_t i = stack_trace_offset; i < stack_trace_size; ++i)
                 arr.emplace_back(reinterpret_cast<intptr_t>(stack_trace.getFramePointers()[i]));
 
-            res_columns[0]->insert(tid);
-            res_columns[1]->insertData(query_id_data, query_id_size);
-            res_columns[2]->insert(arr);
+            res_columns[0]->insert(thread_name);
+            res_columns[1]->insert(tid);
+            res_columns[2]->insertData(query_id_data, query_id_size);
+            res_columns[3]->insert(arr);
         }
         else
         {
@@ -235,9 +250,10 @@ void StorageSystemStackTrace::fillData(MutableColumns & res_columns, const Conte
 
             /// Cannot obtain a stack trace. But create a record in result nevertheless.
 
-            res_columns[0]->insert(tid);
-            res_columns[1]->insertDefault();
+            res_columns[0]->insert(thread_name);
+            res_columns[1]->insert(tid);
             res_columns[2]->insertDefault();
+            res_columns[3]->insertDefault();
         }
 
         /// Signed integer overflow is undefined behavior in both C and C++. However, according to
diff --git a/src/Storages/System/StorageSystemStackTrace.h b/src/Storages/System/StorageSystemStackTrace.h
index 582618d2ecd..7f10e309775 100644
--- a/src/Storages/System/StorageSystemStackTrace.h
+++ b/src/Storages/System/StorageSystemStackTrace.h
@@ -31,7 +31,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     mutable std::mutex mutex;
 
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 7a10b986c11..48dfadd2b3c 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -39,7 +39,7 @@ Pipe StorageSystemStoragePolicies::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t /*max_block_size*/,
     const unsigned /*num_streams*/)
@@ -55,7 +55,7 @@ Pipe StorageSystemStoragePolicies::read(
     MutableColumnPtr col_move_factor = ColumnFloat32::create();
     MutableColumnPtr col_prefer_not_to_merge = ColumnUInt8::create();
 
-    for (const auto & [policy_name, policy_ptr] : context.getPoliciesMap())
+    for (const auto & [policy_name, policy_ptr] : context->getPoliciesMap())
     {
         const auto & volumes = policy_ptr->getVolumes();
         for (size_t i = 0; i != volumes.size(); ++i)
diff --git a/src/Storages/System/StorageSystemStoragePolicies.h b/src/Storages/System/StorageSystemStoragePolicies.h
index afd5e672d66..70053ebc1bc 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.h
+++ b/src/Storages/System/StorageSystemStoragePolicies.h
@@ -24,7 +24,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemTableEngines.cpp b/src/Storages/System/StorageSystemTableEngines.cpp
index 3f06faf6736..e74b2670426 100644
--- a/src/Storages/System/StorageSystemTableEngines.cpp
+++ b/src/Storages/System/StorageSystemTableEngines.cpp
@@ -12,6 +12,7 @@ NamesAndTypesList StorageSystemTableEngines::getNamesAndTypes()
         {"name", std::make_shared<DataTypeString>()},
         {"supports_settings", std::make_shared<DataTypeUInt8>()},
         {"supports_skipping_indices", std::make_shared<DataTypeUInt8>()},
+        {"supports_projections", std::make_shared<DataTypeUInt8>()},
         {"supports_sort_order", std::make_shared<DataTypeUInt8>()},
         {"supports_ttl", std::make_shared<DataTypeUInt8>()},
         {"supports_replication", std::make_shared<DataTypeUInt8>()},
@@ -20,7 +21,7 @@ NamesAndTypesList StorageSystemTableEngines::getNamesAndTypes()
     };
 }
 
-void StorageSystemTableEngines::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemTableEngines::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (const auto & pair : StorageFactory::instance().getAllStorages())
     {
@@ -28,6 +29,7 @@ void StorageSystemTableEngines::fillData(MutableColumns & res_columns, const Con
         res_columns[i++]->insert(pair.first);
         res_columns[i++]->insert(pair.second.features.supports_settings);
         res_columns[i++]->insert(pair.second.features.supports_skipping_indices);
+        res_columns[i++]->insert(pair.second.features.supports_projections);
         res_columns[i++]->insert(pair.second.features.supports_sort_order);
         res_columns[i++]->insert(pair.second.features.supports_ttl);
         res_columns[i++]->insert(pair.second.features.supports_replication);
diff --git a/src/Storages/System/StorageSystemTableEngines.h b/src/Storages/System/StorageSystemTableEngines.h
index 1c080c3040b..37f7f354073 100644
--- a/src/Storages/System/StorageSystemTableEngines.h
+++ b/src/Storages/System/StorageSystemTableEngines.h
@@ -12,7 +12,7 @@ class StorageSystemTableEngines final : public ext::shared_ptr_helper<StorageSys
 {
     friend struct ext::shared_ptr_helper<StorageSystemTableEngines>;
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemTableFunctions.cpp b/src/Storages/System/StorageSystemTableFunctions.cpp
index 65b1dc41879..2824e1726e9 100644
--- a/src/Storages/System/StorageSystemTableFunctions.cpp
+++ b/src/Storages/System/StorageSystemTableFunctions.cpp
@@ -9,7 +9,7 @@ NamesAndTypesList StorageSystemTableFunctions::getNamesAndTypes()
     return {{"name", std::make_shared<DataTypeString>()}};
 }
 
-void StorageSystemTableFunctions::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemTableFunctions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     const auto & functions_names = TableFunctionFactory::instance().getAllRegisteredNames();
     for (const auto & function_name : functions_names)
diff --git a/src/Storages/System/StorageSystemTableFunctions.h b/src/Storages/System/StorageSystemTableFunctions.h
index 95e025b9881..a5db5450d20 100644
--- a/src/Storages/System/StorageSystemTableFunctions.h
+++ b/src/Storages/System/StorageSystemTableFunctions.h
@@ -14,7 +14,7 @@ protected:
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
 public:
 
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 4599dad2e3d..1d38ca6ebbb 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -34,8 +34,7 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
     : IStorage(table_id_)
 {
     StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(ColumnsDescription(
-    {
+    storage_metadata.setColumns(ColumnsDescription({
         {"database", std::make_shared<DataTypeString>()},
         {"name", std::make_shared<DataTypeString>()},
         {"uuid", std::make_shared<DataTypeUUID>()},
@@ -57,12 +56,13 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
         {"total_bytes", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
         {"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>()},
     }));
     setInMemoryMetadata(storage_metadata);
 }
 
 
-static ColumnPtr getFilteredDatabases(const SelectQueryInfo & query_info, const Context & context)
+static ColumnPtr getFilteredDatabases(const SelectQueryInfo & query_info, ContextPtr context)
 {
     MutableColumnPtr column = ColumnString::create();
 
@@ -104,12 +104,12 @@ public:
         Block header,
         UInt64 max_block_size_,
         ColumnPtr databases_,
-        const Context & context_)
+        ContextPtr context_)
         : SourceWithProgress(std::move(header))
         , columns_mask(std::move(columns_mask_))
         , max_block_size(max_block_size_)
         , databases(std::move(databases_))
-        , context(context_) {}
+        , context(Context::createCopy(context_)) {}
 
     String getName() const override { return "Tables"; }
 
@@ -121,7 +121,7 @@ protected:
 
         MutableColumns res_columns = getPort().getHeader().cloneEmptyColumns();
 
-        const auto access = context.getAccess();
+        const auto access = context->getAccess();
         const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
         size_t rows_count = 0;
@@ -148,9 +148,9 @@ protected:
             /// This is for temporary tables. They are output in single block regardless to max_block_size.
             if (database_idx >= databases->size())
             {
-                if (context.hasSessionContext())
+                if (context->hasSessionContext())
                 {
-                    Tables external_tables = context.getSessionContext().getExternalTables();
+                    Tables external_tables = context->getSessionContext()->getExternalTables();
 
                     for (auto & table : external_tables)
                     {
@@ -244,6 +244,10 @@ protected:
                         // lifetime_bytes
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insertDefault();
+
+                        // comment
+                        if (columns_mask[src_index++])
+                            res_columns[res_index++]->insertDefault();
                     }
                 }
 
@@ -278,7 +282,7 @@ protected:
                     }
                     try
                     {
-                        lock = table->lockForShare(context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
+                        lock = table->lockForShare(context->getCurrentQueryId(), context->getSettingsRef().lock_acquire_timeout);
                     }
                     catch (const Exception & e)
                     {
@@ -355,7 +359,7 @@ protected:
                 {
                     ASTPtr ast = database->tryGetCreateTableQuery(table_name, context);
 
-                    if (ast && !context.getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
+                    if (ast && !context->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
                     {
                         auto & create = ast->as<ASTCreateQuery &>();
                         create.uuid = UUIDHelpers::Nil;
@@ -389,14 +393,13 @@ protected:
                     src_index += 2;
 
                 StorageMetadataPtr metadata_snapshot;
-                if (table != nullptr)
+                if (table)
                     metadata_snapshot = table->getInMemoryMetadataPtr();
 
                 ASTPtr expression_ptr;
                 if (columns_mask[src_index++])
                 {
-                    assert(metadata_snapshot != nullptr);
-                    if ((expression_ptr = metadata_snapshot->getPartitionKeyAST()))
+                    if (metadata_snapshot && (expression_ptr = metadata_snapshot->getPartitionKeyAST()))
                         res_columns[res_index++]->insert(queryToString(expression_ptr));
                     else
                         res_columns[res_index++]->insertDefault();
@@ -404,8 +407,7 @@ protected:
 
                 if (columns_mask[src_index++])
                 {
-                    assert(metadata_snapshot != nullptr);
-                    if ((expression_ptr = metadata_snapshot->getSortingKey().expression_list_ast))
+                    if (metadata_snapshot && (expression_ptr = metadata_snapshot->getSortingKey().expression_list_ast))
                         res_columns[res_index++]->insert(queryToString(expression_ptr));
                     else
                         res_columns[res_index++]->insertDefault();
@@ -413,8 +415,7 @@ protected:
 
                 if (columns_mask[src_index++])
                 {
-                    assert(metadata_snapshot != nullptr);
-                    if ((expression_ptr = metadata_snapshot->getPrimaryKey().expression_list_ast))
+                    if (metadata_snapshot && (expression_ptr = metadata_snapshot->getPrimaryKey().expression_list_ast))
                         res_columns[res_index++]->insert(queryToString(expression_ptr));
                     else
                         res_columns[res_index++]->insertDefault();
@@ -422,8 +423,7 @@ protected:
 
                 if (columns_mask[src_index++])
                 {
-                    assert(metadata_snapshot != nullptr);
-                    if ((expression_ptr = metadata_snapshot->getSamplingKeyAST()))
+                    if (metadata_snapshot && (expression_ptr = metadata_snapshot->getSamplingKeyAST()))
                         res_columns[res_index++]->insert(queryToString(expression_ptr));
                     else
                         res_columns[res_index++]->insertDefault();
@@ -431,18 +431,18 @@ protected:
 
                 if (columns_mask[src_index++])
                 {
-                    assert(table != nullptr);
-                    auto policy = table->getStoragePolicy();
+                    auto policy = table ? table->getStoragePolicy() : nullptr;
                     if (policy)
                         res_columns[res_index++]->insert(policy->getName());
                     else
                         res_columns[res_index++]->insertDefault();
                 }
 
+                auto settings = context->getSettingsRef();
+                settings.select_sequential_consistency = 0;
                 if (columns_mask[src_index++])
                 {
-                    assert(table != nullptr);
-                    auto total_rows = table->totalRows(context.getSettingsRef());
+                    auto total_rows = table ? table->totalRows(settings) : std::nullopt;
                     if (total_rows)
                         res_columns[res_index++]->insert(*total_rows);
                     else
@@ -451,8 +451,7 @@ protected:
 
                 if (columns_mask[src_index++])
                 {
-                    assert(table != nullptr);
-                    auto total_bytes = table->totalBytes(context.getSettingsRef());
+                    auto total_bytes = table ? table->totalBytes(settings) : std::nullopt;
                     if (total_bytes)
                         res_columns[res_index++]->insert(*total_bytes);
                     else
@@ -461,8 +460,7 @@ protected:
 
                 if (columns_mask[src_index++])
                 {
-                    assert(table != nullptr);
-                    auto lifetime_rows = table->lifetimeRows();
+                    auto lifetime_rows = table ? table->lifetimeRows() : std::nullopt;
                     if (lifetime_rows)
                         res_columns[res_index++]->insert(*lifetime_rows);
                     else
@@ -471,13 +469,20 @@ protected:
 
                 if (columns_mask[src_index++])
                 {
-                    assert(table != nullptr);
-                    auto lifetime_bytes = table->lifetimeBytes();
+                    auto lifetime_bytes = table ? table->lifetimeBytes() : std::nullopt;
                     if (lifetime_bytes)
                         res_columns[res_index++]->insert(*lifetime_bytes);
                     else
                         res_columns[res_index++]->insertDefault();
                 }
+
+                if (columns_mask[src_index++])
+                {
+                    if (metadata_snapshot)
+                        res_columns[res_index++]->insert(metadata_snapshot->comment);
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
             }
         }
 
@@ -490,7 +495,7 @@ private:
     ColumnPtr databases;
     size_t database_idx = 0;
     DatabaseTablesIteratorPtr tables_it;
-    const Context context;
+    ContextPtr context;
     bool done = false;
     DatabasePtr database;
     std::string database_name;
@@ -501,7 +506,7 @@ Pipe StorageSystemTables::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & query_info,
-    const Context & context,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
     const unsigned /*num_streams*/)
diff --git a/src/Storages/System/StorageSystemTables.h b/src/Storages/System/StorageSystemTables.h
index 2e0b3386f8c..da5e236b33f 100644
--- a/src/Storages/System/StorageSystemTables.h
+++ b/src/Storages/System/StorageSystemTables.h
@@ -22,7 +22,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemTimeZones.cpp b/src/Storages/System/StorageSystemTimeZones.cpp
index e5523f54caf..dc3711812a6 100644
--- a/src/Storages/System/StorageSystemTimeZones.cpp
+++ b/src/Storages/System/StorageSystemTimeZones.cpp
@@ -15,7 +15,7 @@ NamesAndTypesList StorageSystemTimeZones::getNamesAndTypes()
     };
 }
 
-void StorageSystemTimeZones::fillData(MutableColumns & res_columns, const Context &, const SelectQueryInfo &) const
+void StorageSystemTimeZones::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
     for (auto * it = auto_time_zones; *it; ++it)
         res_columns[0]->insert(String(*it));
diff --git a/src/Storages/System/StorageSystemTimeZones.h b/src/Storages/System/StorageSystemTimeZones.h
index b7544ecb16d..0f68b2de293 100644
--- a/src/Storages/System/StorageSystemTimeZones.h
+++ b/src/Storages/System/StorageSystemTimeZones.h
@@ -17,7 +17,7 @@ class StorageSystemTimeZones final : public ext::shared_ptr_helper<StorageSystem
     friend struct ext::shared_ptr_helper<StorageSystemTimeZones>;
 
 protected:
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemUserDirectories.cpp b/src/Storages/System/StorageSystemUserDirectories.cpp
index 519f0c0dcb0..7858af25365 100644
--- a/src/Storages/System/StorageSystemUserDirectories.cpp
+++ b/src/Storages/System/StorageSystemUserDirectories.cpp
@@ -22,9 +22,9 @@ NamesAndTypesList StorageSystemUserDirectories::getNamesAndTypes()
 }
 
 
-void StorageSystemUserDirectories::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemUserDirectories::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    const auto & access_control = context.getAccessControlManager();
+    const auto & access_control = context->getAccessControlManager();
     auto storages = access_control.getStorages();
 
     size_t column_index = 0;
diff --git a/src/Storages/System/StorageSystemUserDirectories.h b/src/Storages/System/StorageSystemUserDirectories.h
index 902c890fe29..0ddb0ad49d8 100644
--- a/src/Storages/System/StorageSystemUserDirectories.h
+++ b/src/Storages/System/StorageSystemUserDirectories.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemUserDirectories>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemUsers.cpp b/src/Storages/System/StorageSystemUsers.cpp
index eaebf759a85..74ac48c145c 100644
--- a/src/Storages/System/StorageSystemUsers.cpp
+++ b/src/Storages/System/StorageSystemUsers.cpp
@@ -55,15 +55,15 @@ NamesAndTypesList StorageSystemUsers::getNamesAndTypes()
 }
 
 
-void StorageSystemUsers::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const
+void StorageSystemUsers::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
-    context.checkAccess(AccessType::SHOW_USERS);
-    const auto & access_control = context.getAccessControlManager();
+    context->checkAccess(AccessType::SHOW_USERS);
+    const auto & access_control = context->getAccessControlManager();
     std::vector<UUID> ids = access_control.findAll<User>();
 
     size_t column_index = 0;
     auto & column_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
-    auto & column_id = assert_cast<ColumnUInt128 &>(*res_columns[column_index++]).getData();
+    auto & column_id = assert_cast<ColumnUUID &>(*res_columns[column_index++]).getData();
     auto & column_storage = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_auth_type = assert_cast<ColumnInt8 &>(*res_columns[column_index++]).getData();
     auto & column_auth_params = assert_cast<ColumnString &>(*res_columns[column_index++]);
@@ -95,7 +95,7 @@ void StorageSystemUsers::fillData(MutableColumns & res_columns, const Context &
                        const RolesOrUsersSet & grantees)
     {
         column_name.insertData(name.data(), name.length());
-        column_id.push_back(id);
+        column_id.push_back(id.toUnderType());
         column_storage.insertData(storage_name.data(), storage_name.length());
         column_auth_type.push_back(static_cast<Int8>(authentication.getType()));
 
diff --git a/src/Storages/System/StorageSystemUsers.h b/src/Storages/System/StorageSystemUsers.h
index 707ea94591d..3c463a23db9 100644
--- a/src/Storages/System/StorageSystemUsers.h
+++ b/src/Storages/System/StorageSystemUsers.h
@@ -18,7 +18,7 @@ public:
 protected:
     friend struct ext::shared_ptr_helper<StorageSystemUsers>;
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemZeros.cpp b/src/Storages/System/StorageSystemZeros.cpp
index ed5ab93369a..d1456d72685 100644
--- a/src/Storages/System/StorageSystemZeros.cpp
+++ b/src/Storages/System/StorageSystemZeros.cpp
@@ -94,7 +94,7 @@ Pipe StorageSystemZeros::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo &,
-    const Context & /*context*/,
+    ContextPtr /*context*/,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned num_streams)
diff --git a/src/Storages/System/StorageSystemZeros.h b/src/Storages/System/StorageSystemZeros.h
index 04733f550c1..2ccdcf9c944 100644
--- a/src/Storages/System/StorageSystemZeros.h
+++ b/src/Storages/System/StorageSystemZeros.h
@@ -24,7 +24,7 @@ public:
         const Names & column_names,
         const StorageMetadataPtr & /*metadata_snapshot*/,
         SelectQueryInfo & query_info,
-        const Context & context,
+        ContextPtr context,
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         unsigned num_streams) override;
diff --git a/src/Storages/System/StorageSystemZooKeeper.cpp b/src/Storages/System/StorageSystemZooKeeper.cpp
index 8fa5ccbd630..1a8aac3b277 100644
--- a/src/Storages/System/StorageSystemZooKeeper.cpp
+++ b/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -63,7 +63,7 @@ static String pathCorrected(const String & path)
 }
 
 
-static bool extractPathImpl(const IAST & elem, Paths & res, const Context & context)
+static bool extractPathImpl(const IAST & elem, Paths & res, ContextPtr context)
 {
     const auto * function = elem.as<ASTFunction>();
     if (!function)
@@ -94,8 +94,8 @@ static bool extractPathImpl(const IAST & elem, Paths & res, const Context & cont
         {
             auto interpreter_subquery = interpretSubquery(value, context, {}, {});
             auto stream = interpreter_subquery->execute().getInputStream();
-            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);
+            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());
 
             stream->readPrefix();
@@ -165,7 +165,7 @@ static bool extractPathImpl(const IAST & elem, Paths & res, const Context & cont
 
 /** Retrieve from the query a condition of the form `path = 'path'`, from conjunctions in the WHERE clause.
   */
-static Paths extractPath(const ASTPtr & query, const Context & context)
+static Paths extractPath(const ASTPtr & query, ContextPtr context)
 {
     const auto & select = query->as<ASTSelectQuery &>();
     if (!select.where())
@@ -176,13 +176,13 @@ static Paths extractPath(const ASTPtr & query, const Context & context)
 }
 
 
-void StorageSystemZooKeeper::fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const
+void StorageSystemZooKeeper::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
 {
     const Paths & paths = extractPath(query_info.query, context);
     if (paths.empty())
         throw Exception("SELECT from system.zookeeper table must contain condition like path = 'path' or path IN ('path1','path2'...) or path IN (subquery) in WHERE clause.", ErrorCodes::BAD_ARGUMENTS);
 
-    zkutil::ZooKeeperPtr zookeeper = context.getZooKeeper();
+    zkutil::ZooKeeperPtr zookeeper = context->getZooKeeper();
 
     std::unordered_set<String> paths_corrected;
     for (const auto & path : paths)
diff --git a/src/Storages/System/StorageSystemZooKeeper.h b/src/Storages/System/StorageSystemZooKeeper.h
index 06611f61dae..226ca79facf 100644
--- a/src/Storages/System/StorageSystemZooKeeper.h
+++ b/src/Storages/System/StorageSystemZooKeeper.h
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, const Context & context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
 };
 
 }
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index 673cf671548..830a6c4fcd3 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -25,8 +25,11 @@
 #include <Storages/System/StorageSystemMutations.h>
 #include <Storages/System/StorageSystemNumbers.h>
 #include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemPartMovesBetweenShards.h>
 #include <Storages/System/StorageSystemParts.h>
+#include <Storages/System/StorageSystemProjectionParts.h>
 #include <Storages/System/StorageSystemPartsColumns.h>
+#include <Storages/System/StorageSystemProjectionPartsColumns.h>
 #include <Storages/System/StorageSystemProcesses.h>
 #include <Storages/System/StorageSystemReplicas.h>
 #include <Storages/System/StorageSystemReplicationQueue.h>
@@ -126,8 +129,10 @@ void attachSystemTablesServer(IDatabase & system_database, bool has_zookeeper)
     attachSystemTablesLocal(system_database);
 
     attach<StorageSystemParts>(system_database, "parts");
+    attach<StorageSystemProjectionParts>(system_database, "projection_parts");
     attach<StorageSystemDetachedParts>(system_database, "detached_parts");
     attach<StorageSystemPartsColumns>(system_database, "parts_columns");
+    attach<StorageSystemProjectionPartsColumns>(system_database, "projection_parts_columns");
     attach<StorageSystemDisks>(system_database, "disks");
     attach<StorageSystemStoragePolicies>(system_database, "storage_policies");
     attach<StorageSystemProcesses>(system_database, "processes");
@@ -144,6 +149,7 @@ void attachSystemTablesServer(IDatabase & system_database, bool has_zookeeper)
     attach<StorageSystemGraphite>(system_database, "graphite_retentions");
     attach<StorageSystemMacros>(system_database, "macros");
     attach<StorageSystemReplicatedFetches>(system_database, "replicated_fetches");
+    attach<StorageSystemPartMovesBetweenShards>(system_database, "part_moves_between_shards");
 
     if (has_zookeeper)
         attach<StorageSystemZooKeeper>(system_database, "zookeeper");
diff --git a/src/Storages/TTLDescription.cpp b/src/Storages/TTLDescription.cpp
index 41c20b2714b..95ea4f07f18 100644
--- a/src/Storages/TTLDescription.cpp
+++ b/src/Storages/TTLDescription.cpp
@@ -162,7 +162,7 @@ TTLDescription & TTLDescription::operator=(const TTLDescription & other)
 TTLDescription TTLDescription::getTTLFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context,
+    ContextPtr context,
     const KeyDescription & primary_key)
 {
     TTLDescription result;
@@ -289,7 +289,7 @@ TTLDescription TTLDescription::getTTLFromAST(
         {
             result.recompression_codec =
                 CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(
-                    ttl_element->recompression_codec, {}, !context.getSettingsRef().allow_suspicious_codecs);
+                    ttl_element->recompression_codec, {}, !context->getSettingsRef().allow_suspicious_codecs);
         }
     }
 
@@ -330,7 +330,7 @@ TTLTableDescription & TTLTableDescription::operator=(const TTLTableDescription &
 TTLTableDescription TTLTableDescription::getTTLForTableFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
-    const Context & context,
+    ContextPtr context,
     const KeyDescription & primary_key)
 {
     TTLTableDescription result;
diff --git a/src/Storages/TTLDescription.h b/src/Storages/TTLDescription.h
index a2340ad6bcd..6288098b3c5 100644
--- a/src/Storages/TTLDescription.h
+++ b/src/Storages/TTLDescription.h
@@ -80,7 +80,7 @@ struct TTLDescription
 
     /// Parse TTL structure from definition. Able to parse both column and table
     /// TTLs.
-    static TTLDescription getTTLFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context, const KeyDescription & primary_key);
+    static TTLDescription getTTLFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context, const KeyDescription & primary_key);
 
     TTLDescription() = default;
     TTLDescription(const TTLDescription & other);
@@ -117,7 +117,7 @@ struct TTLTableDescription
     TTLTableDescription & operator=(const TTLTableDescription & other);
 
     static TTLTableDescription getTTLForTableFromAST(
-        const ASTPtr & definition_ast, const ColumnsDescription & columns, const Context & context, const KeyDescription & primary_key);
+        const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr context, const KeyDescription & primary_key);
 };
 
 }
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index 0002d7c9c28..248b734195a 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -14,6 +14,7 @@
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
 
+#include <Columns/ColumnConst.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/FilterDescription.h>
@@ -27,6 +28,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 namespace
 {
 
@@ -122,8 +128,23 @@ void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & va
     }
 }
 
-bool prepareFilterBlockWithQuery(const ASTPtr & query, const Context & context, Block block, ASTPtr & expression_ast)
+bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block block, ASTPtr & expression_ast)
 {
+    if (block.rows() == 0)
+        throw Exception("Cannot prepare filter with empty block", ErrorCodes::LOGICAL_ERROR);
+
+    /// Take the first row of the input block to build a constant block
+    auto columns = block.getColumns();
+    Columns const_columns(columns.size());
+    for (size_t i = 0; i < columns.size(); ++i)
+    {
+        if (isColumnConst(*columns[i]))
+            const_columns[i] = columns[i]->cloneResized(1);
+        else
+            const_columns[i] = ColumnConst::create(columns[i]->cloneResized(1), 1);
+    }
+    block.setColumns(const_columns);
+
     bool unmodified = true;
     const auto & select = query->as<ASTSelectQuery &>();
     if (!select.where() && !select.prewhere())
@@ -135,10 +156,6 @@ bool prepareFilterBlockWithQuery(const ASTPtr & query, const Context & context,
     else
         condition_ast = select.prewhere() ? select.prewhere()->clone() : select.where()->clone();
 
-    // Prepare a constant block with valid expressions
-    for (size_t i = 0; i < block.columns(); ++i)
-        block.getByPosition(i).column = block.getByPosition(i).type->createColumnConstWithDefaultValue(1);
-
     // Provide input columns as constant columns to check if an expression is constant.
     std::function<bool(const ASTPtr &)> is_constant = [&block, &context](const ASTPtr & node)
     {
@@ -167,8 +184,11 @@ bool prepareFilterBlockWithQuery(const ASTPtr & query, const Context & context,
     return unmodified;
 }
 
-void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & context, ASTPtr expression_ast)
+void filterBlockWithQuery(const ASTPtr & query, Block & block, ContextPtr context, ASTPtr expression_ast)
 {
+    if (block.rows() == 0)
+        return;
+
     if (!expression_ast)
         prepareFilterBlockWithQuery(query, context, block, expression_ast);
 
@@ -179,7 +199,7 @@ void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & c
     auto syntax_result = TreeRewriter(context).analyze(expression_ast, block.getNamesAndTypesList());
     ExpressionAnalyzer analyzer(expression_ast, syntax_result, context);
     buildSets(expression_ast, analyzer);
-    ExpressionActionsPtr actions = analyzer.getActions(false);
+    ExpressionActionsPtr actions = analyzer.getActions(false /* add alises */, true /* project result */, CompileExpressions::yes);
 
     Block block_with_filter = block;
     actions->execute(block_with_filter);
@@ -191,10 +211,15 @@ void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & c
     ConstantFilterDescription constant_filter(*filter_column);
 
     if (constant_filter.always_true)
+    {
         return;
+    }
 
     if (constant_filter.always_false)
+    {
         block = block.cloneEmpty();
+        return;
+    }
 
     FilterDescription filter(*filter_column);
 
diff --git a/src/Storages/VirtualColumnUtils.h b/src/Storages/VirtualColumnUtils.h
index 78e3d62472e..15783f6e79f 100644
--- a/src/Storages/VirtualColumnUtils.h
+++ b/src/Storages/VirtualColumnUtils.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <unordered_set>
-
 #include <Core/Block.h>
+#include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/SelectQueryInfo.h>
 
+#include <unordered_set>
+
 
 namespace DB
 {
 
-class Context;
 class NamesAndTypesList;
 
 
@@ -27,12 +27,12 @@ void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & va
 
 /// Prepare `expression_ast` to filter block. Returns true if `expression_ast` is not trimmed, that is,
 /// `block` provides all needed columns for `expression_ast`, else return false.
-bool prepareFilterBlockWithQuery(const ASTPtr & query, const Context & context, Block block, ASTPtr & expression_ast);
+bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block block, ASTPtr & expression_ast);
 
 /// Leave in the block only the rows that fit under the WHERE clause and the PREWHERE clause of the query.
 /// Only elements of the outer conjunction are considered, depending only on the columns present in the block.
 /// If `expression_ast` is passed, use it to filter block.
-void filterBlockWithQuery(const ASTPtr & query, Block & block, const Context & context, ASTPtr expression_ast = {});
+void filterBlockWithQuery(const ASTPtr & query, Block & block, ContextPtr context, ASTPtr expression_ast = {});
 
 /// Extract from the input stream a set of `name` column values
 template <typename T>
diff --git a/src/Storages/tests/CMakeLists.txt b/src/Storages/examples/CMakeLists.txt
similarity index 100%
rename from src/Storages/tests/CMakeLists.txt
rename to src/Storages/examples/CMakeLists.txt
diff --git a/src/Storages/tests/active_parts.py b/src/Storages/examples/active_parts.py
similarity index 100%
rename from src/Storages/tests/active_parts.py
rename to src/Storages/examples/active_parts.py
diff --git a/src/Storages/tests/columns_description_fuzzer.cpp b/src/Storages/examples/columns_description_fuzzer.cpp
similarity index 100%
rename from src/Storages/tests/columns_description_fuzzer.cpp
rename to src/Storages/examples/columns_description_fuzzer.cpp
diff --git a/src/Storages/tests/get_abandonable_lock_in_all_partitions.cpp b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
similarity index 100%
rename from src/Storages/tests/get_abandonable_lock_in_all_partitions.cpp
rename to src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
diff --git a/src/Storages/tests/get_current_inserts_in_replicated.cpp b/src/Storages/examples/get_current_inserts_in_replicated.cpp
similarity index 88%
rename from src/Storages/tests/get_current_inserts_in_replicated.cpp
rename to src/Storages/examples/get_current_inserts_in_replicated.cpp
index fa998d20f66..56364997643 100644
--- a/src/Storages/tests/get_current_inserts_in_replicated.cpp
+++ b/src/Storages/examples/get_current_inserts_in_replicated.cpp
@@ -4,11 +4,12 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/Exception.h>
 #include <Common/Stopwatch.h>
-
 #include <ext/scope_guard.h>
 
+#include <filesystem>
 #include <iostream>
 
+namespace fs = std::filesystem;
 
 using namespace DB;
 
@@ -36,10 +37,10 @@ try
     Stopwatch stage;
     /// Load current inserts
     std::unordered_set<String> lock_holder_paths;
-    for (const String & entry : zookeeper->getChildren(zookeeper_path + "/temp"))
+    for (const String & entry : zookeeper->getChildren(fs::path(zookeeper_path) / "temp"))
     {
         if (startsWith(entry, "abandonable_lock-"))
-            lock_holder_paths.insert(zookeeper_path + "/temp/" + entry);
+            lock_holder_paths.insert(fs::path(zookeeper_path) / "temp" / entry);
     }
     std::cerr << "Stage 1 (get lock holders): " << lock_holder_paths.size()
               << " lock holders, elapsed: " << stage.elapsedSeconds() << "s." << std::endl;
@@ -47,14 +48,14 @@ try
 
     if (!lock_holder_paths.empty())
     {
-        Strings partitions = zookeeper->getChildren(zookeeper_path + "/block_numbers");
+        Strings partitions = zookeeper->getChildren(fs::path(zookeeper_path) / "block_numbers");
         std::cerr << "Stage 2 (get partitions): " << partitions.size()
                   << " partitions, elapsed: " << stage.elapsedSeconds() << "s." << std::endl;
         stage.restart();
 
         std::vector<std::future<Coordination::ListResponse>> lock_futures;
         for (const String & partition : partitions)
-            lock_futures.push_back(zookeeper->asyncGetChildren(zookeeper_path + "/block_numbers/" + partition));
+            lock_futures.push_back(zookeeper->asyncGetChildren(fs::path(zookeeper_path) / "block_numbers" / partition));
 
         struct BlockInfo
         {
@@ -71,7 +72,7 @@ try
             for (const String & entry : partition_block_numbers)
             {
                 Int64 block_number = parse<Int64>(entry.substr(strlen("block-")));
-                String zk_path = zookeeper_path + "/block_numbers/" + partitions[i] + "/" + entry;
+                String zk_path = fs::path(zookeeper_path) / "block_numbers" / partitions[i] / entry;
                 block_infos.push_back(
                     BlockInfo{partitions[i], block_number, zk_path, zookeeper->asyncTryGet(zk_path)});
             }
diff --git a/src/Storages/tests/merge_selector.cpp b/src/Storages/examples/merge_selector.cpp
similarity index 100%
rename from src/Storages/tests/merge_selector.cpp
rename to src/Storages/examples/merge_selector.cpp
diff --git a/src/Storages/tests/merge_selector2.cpp b/src/Storages/examples/merge_selector2.cpp
similarity index 100%
rename from src/Storages/tests/merge_selector2.cpp
rename to src/Storages/examples/merge_selector2.cpp
diff --git a/src/Storages/tests/mergetree_checksum_fuzzer.cpp b/src/Storages/examples/mergetree_checksum_fuzzer.cpp
similarity index 100%
rename from src/Storages/tests/mergetree_checksum_fuzzer.cpp
rename to src/Storages/examples/mergetree_checksum_fuzzer.cpp
diff --git a/src/Storages/tests/remove_symlink_directory.cpp b/src/Storages/examples/remove_symlink_directory.cpp
similarity index 62%
rename from src/Storages/tests/remove_symlink_directory.cpp
rename to src/Storages/examples/remove_symlink_directory.cpp
index ae5fa72fa66..db436c0a608 100644
--- a/src/Storages/tests/remove_symlink_directory.cpp
+++ b/src/Storages/examples/remove_symlink_directory.cpp
@@ -1,9 +1,10 @@
 #include <unistd.h>
 #include <iostream>
-#include <Poco/File.h>
-#include <Poco/Path.h>
 #include <Common/Exception.h>
+#include <Common/filesystemHelpers.h>
+#include <filesystem>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -16,18 +17,15 @@ namespace DB
 int main(int, char **)
 try
 {
-    Poco::File dir("./test_dir/");
-    dir.createDirectories();
-
-    Poco::File("./test_dir/file").createFile();
+    fs::path dir("./test_dir/");
+    fs::create_directories(dir);
+    FS::createFile("./test_dir/file");
 
     if (0 != symlink("./test_dir", "./test_link"))
         DB::throwFromErrnoWithPath("Cannot create symlink", "./test_link", DB::ErrorCodes::SYSTEM_ERROR);
 
-    Poco::File link("./test_link");
-    link.renameTo("./test_link2");
-
-    Poco::File("./test_link2").remove(true);
+    fs::rename("./test_link", "./test_link2");
+    fs::remove_all("./test_link2");
     return 0;
 }
 catch (...)
diff --git a/src/Storages/tests/transform_part_zk_nodes.cpp b/src/Storages/examples/transform_part_zk_nodes.cpp
similarity index 100%
rename from src/Storages/tests/transform_part_zk_nodes.cpp
rename to src/Storages/examples/transform_part_zk_nodes.cpp
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index de5f3924ca9..fb828b8f744 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -29,7 +29,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     const Cluster & cluster,
     const Cluster::ShardInfo & shard_info,
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & table_func_ptr)
 {
     String query;
@@ -59,7 +59,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
 
     ColumnsDescription res;
 
-    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context.getSettingsRef());
+    auto new_context = ClusterProxy::updateSettingsForCluster(cluster, context, context->getSettingsRef());
 
     /// Expect only needed columns from the result of DESC TABLE. NOTE 'comment' column is ignored for compatibility reasons.
     Block sample_block
@@ -71,7 +71,7 @@ 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);
+    auto input = std::make_shared<RemoteBlockInputStream>(shard_info.pool, query, sample_block, new_context);
     input->setPoolMode(PoolMode::GET_ONE);
     if (!table_func_ptr)
         input->setMainTable(table_id);
@@ -104,7 +104,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
                 column.default_desc.kind = columnDefaultKindFromString(kind_name);
                 String expr_str = (*default_expr)[i].get<const String &>();
                 column.default_desc.expression = parseQuery(
-                    expr_parser, expr_str.data(), expr_str.data() + expr_str.size(), "default expression", 0, context.getSettingsRef().max_parser_depth);
+                    expr_parser, expr_str.data(), expr_str.data() + expr_str.size(), "default expression", 0, context->getSettingsRef().max_parser_depth);
             }
 
             res.add(column);
@@ -117,7 +117,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
 ColumnsDescription getStructureOfRemoteTable(
     const Cluster & cluster,
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & table_func_ptr)
 {
     const auto & shards_info = cluster.getShardsInfo();
diff --git a/src/Storages/getStructureOfRemoteTable.h b/src/Storages/getStructureOfRemoteTable.h
index af418144cb0..3f77236c756 100644
--- a/src/Storages/getStructureOfRemoteTable.h
+++ b/src/Storages/getStructureOfRemoteTable.h
@@ -16,7 +16,7 @@ struct StorageID;
 ColumnsDescription getStructureOfRemoteTable(
     const Cluster & cluster,
     const StorageID & table_id,
-    const Context & context,
+    ContextPtr context,
     const ASTPtr & table_func_ptr = nullptr);
 
 }
diff --git a/src/Storages/registerStorages.cpp b/src/Storages/registerStorages.cpp
index 0022ee6bd4f..7100afa6909 100644
--- a/src/Storages/registerStorages.cpp
+++ b/src/Storages/registerStorages.cpp
@@ -62,6 +62,10 @@ void registerStorageEmbeddedRocksDB(StorageFactory & factory);
 void registerStoragePostgreSQL(StorageFactory & factory);
 #endif
 
+#if USE_MYSQL || USE_LIBPQXX
+void registerStorageExternalDistributed(StorageFactory & factory);
+#endif
+
 void registerStorages()
 {
     auto & factory = StorageFactory::instance();
@@ -118,6 +122,10 @@ void registerStorages()
     #if USE_LIBPQXX
     registerStoragePostgreSQL(factory);
     #endif
+
+    #if USE_MYSQL || USE_LIBPQXX
+    registerStorageExternalDistributed(factory);
+    #endif
 }
 
 }
diff --git a/src/Storages/tests/gtest_background_executor.cpp b/src/Storages/tests/gtest_background_executor.cpp
index 0ddf2d9ea2a..283cdf3fbf8 100644
--- a/src/Storages/tests/gtest_background_executor.cpp
+++ b/src/Storages/tests/gtest_background_executor.cpp
@@ -17,9 +17,9 @@ static std::atomic<Int64> counter{0};
 class TestJobExecutor : public IBackgroundJobExecutor
 {
 public:
-    explicit TestJobExecutor(Context & context)
+    explicit TestJobExecutor(ContextPtr local_context)
         :IBackgroundJobExecutor(
-            context,
+            local_context,
             BackgroundTaskSchedulingSettings{},
             {PoolConfig{PoolType::MERGE_MUTATE, 4, CurrentMetrics::BackgroundPoolTask}})
         {}
@@ -43,7 +43,7 @@ TEST(BackgroundExecutor, TestMetric)
     const auto & context_holder = getContext();
     std::vector<TestExecutorPtr> executors;
     for (size_t i = 0; i < 100; ++i)
-        executors.emplace_back(std::make_unique<TestJobExecutor>(const_cast<Context &>(context_holder.context)));
+        executors.emplace_back(std::make_unique<TestJobExecutor>(context_holder.context));
 
     for (size_t i = 0; i < 100; ++i)
         executors[i]->start();
diff --git a/src/Storages/tests/gtest_storage_log.cpp b/src/Storages/tests/gtest_storage_log.cpp
index cbb894c7420..e8057c54a0f 100644
--- a/src/Storages/tests/gtest_storage_log.cpp
+++ b/src/Storages/tests/gtest_storage_log.cpp
@@ -19,7 +19,7 @@
 #include <Processors/Executors/PipelineExecutingBlockInputStream.h>
 #include <Processors/QueryPipeline.h>
 
-#if !__clang__
+#if !defined(__clang__)
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wsuggest-override"
 #endif
@@ -33,7 +33,7 @@ DB::StoragePtr createStorage(DB::DiskPtr & disk)
     names_and_types.emplace_back("a", std::make_shared<DataTypeUInt64>());
 
     StoragePtr table = StorageLog::create(
-        disk, "table/", StorageID("test", "test"), ColumnsDescription{names_and_types}, ConstraintsDescription{}, false, 1048576);
+        disk, "table/", StorageID("test", "test"), ColumnsDescription{names_and_types}, ConstraintsDescription{}, String{}, false, 1048576);
 
     table->startup();
 
@@ -53,7 +53,7 @@ public:
 
     void TearDown() override
     {
-        table->shutdown();
+        table->flushAndShutdown();
         destroyDisk<T>(disk);
     }
 
@@ -70,7 +70,7 @@ using DiskImplementations = testing::Types<DB::DiskMemory, DB::DiskLocal>;
 TYPED_TEST_SUITE(StorageLogTest, DiskImplementations);
 
 // Returns data written to table in Values format.
-std::string writeData(int rows, DB::StoragePtr & table, const DB::Context & context)
+std::string writeData(int rows, DB::StoragePtr & table, const DB::ContextPtr context)
 {
     using namespace DB;
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
@@ -108,7 +108,7 @@ std::string writeData(int rows, DB::StoragePtr & table, const DB::Context & cont
 }
 
 // Returns all table data in Values format.
-std::string readData(DB::StoragePtr & table, const DB::Context & context)
+std::string readData(DB::StoragePtr & table, const DB::ContextPtr context)
 {
     using namespace DB;
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
@@ -118,7 +118,7 @@ std::string readData(DB::StoragePtr & table, const DB::Context & context)
 
     SelectQueryInfo query_info;
     QueryProcessingStage::Enum stage = table->getQueryProcessingStage(
-        context, QueryProcessingStage::Complete, query_info);
+        context, QueryProcessingStage::Complete, metadata_snapshot, query_info);
 
     QueryPipeline pipeline;
     pipeline.init(table->read(column_names, metadata_snapshot, query_info, context, stage, 8192, 1));
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 d40c62fef60..e61123a3aa8 100644
--- a/src/Storages/tests/gtest_transform_query_for_external_database.cpp
+++ b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
@@ -22,7 +22,7 @@ struct State
 {
     State(const State&) = delete;
 
-    Context context;
+    ContextMutablePtr context;
 
     static const State & instance()
     {
@@ -74,7 +74,7 @@ private:
     };
 
     explicit State()
-        : context(getContext().context)
+        : context(Context::createCopy(getContext().context))
     {
         tryRegisterFunctions();
         DatabasePtr database = std::make_shared<DatabaseMemory>("test", context);
@@ -85,10 +85,11 @@ private:
             const auto & db_name = tab.table.database;
             database->attachTable(
                 table_name,
-                StorageMemory::create(StorageID(db_name, table_name), ColumnsDescription{getColumns()}, ConstraintsDescription{}));
+                StorageMemory::create(
+                    StorageID(db_name, table_name), ColumnsDescription{getColumns()}, ConstraintsDescription{}, String{}));
         }
         DatabaseCatalog::instance().attachDatabase(database->getDatabaseName(), database);
-        context.setCurrentDatabase("test");
+        context->setCurrentDatabase("test");
     }
 };
 
diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index 59d357f72e6..b3fe788d874 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -88,7 +88,7 @@ public:
     }
 };
 
-void replaceConstantExpressions(ASTPtr & node, const Context & context, const NamesAndTypesList & all_columns)
+void replaceConstantExpressions(ASTPtr & node, ContextPtr context, const NamesAndTypesList & all_columns)
 {
     auto syntax_result = TreeRewriter(context).analyze(node, all_columns);
     Block block_with_constants = KeyCondition::getBlockWithConstants(node, syntax_result, context);
@@ -239,7 +239,7 @@ String transformQueryForExternalDatabase(
     IdentifierQuotingStyle identifier_quoting_style,
     const String & database,
     const String & table,
-    const Context & context)
+    ContextPtr context)
 {
     auto clone_query = query_info.query->clone();
     const Names used_columns = query_info.syntax_analyzer_result->requiredSourceColumns();
diff --git a/src/Storages/transformQueryForExternalDatabase.h b/src/Storages/transformQueryForExternalDatabase.h
index c760c628970..215afab8b30 100644
--- a/src/Storages/transformQueryForExternalDatabase.h
+++ b/src/Storages/transformQueryForExternalDatabase.h
@@ -4,13 +4,13 @@
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Interpreters/Context_fwd.h>
 
 
 namespace DB
 {
 
 class IAST;
-class Context;
 
 /** For given ClickHouse query,
   * creates another query in a form of
@@ -29,6 +29,6 @@ String transformQueryForExternalDatabase(
     IdentifierQuotingStyle identifier_quoting_style,
     const String & database,
     const String & table,
-    const Context & context);
+    ContextPtr context);
 
 }
diff --git a/src/Storages/ya.make b/src/Storages/ya.make
index e3e1807c566..d8692524210 100644
--- a/src/Storages/ya.make
+++ b/src/Storages/ya.make
@@ -57,6 +57,7 @@ SRCS(
     MergeTree/MergeTreeDataPartWriterWide.cpp
     MergeTree/MergeTreeDataSelectExecutor.cpp
     MergeTree/MergeTreeDataWriter.cpp
+    MergeTree/MergeTreeDeduplicationLog.cpp
     MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
     MergeTree/MergeTreeIndexBloomFilter.cpp
     MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -74,6 +75,7 @@ SRCS(
     MergeTree/MergeTreePartInfo.cpp
     MergeTree/MergeTreePartition.cpp
     MergeTree/MergeTreePartsMover.cpp
+    MergeTree/MergeTreeProjections.cpp
     MergeTree/MergeTreeRangeReader.cpp
     MergeTree/MergeTreeReadPool.cpp
     MergeTree/MergeTreeReaderCompact.cpp
@@ -90,7 +92,9 @@ SRCS(
     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
@@ -110,13 +114,16 @@ SRCS(
     MergeTree/localBackup.cpp
     MergeTree/registerStorageMergeTree.cpp
     MutationCommands.cpp
+    MySQL/MySQLSettings.cpp
     PartitionCommands.cpp
+    ProjectionsDescription.cpp
     ReadInOrderOptimizer.cpp
     SelectQueryDescription.cpp
     SetSettings.cpp
     StorageBuffer.cpp
     StorageDictionary.cpp
     StorageDistributed.cpp
+    StorageExternalDistributed.cpp
     StorageFactory.cpp
     StorageFile.cpp
     StorageGenerateRandom.cpp
@@ -172,11 +179,14 @@ SRCS(
     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
diff --git a/src/Storages/ya.make.in b/src/Storages/ya.make.in
index 2e8727b53fd..f7efe5870d3 100644
--- a/src/Storages/ya.make.in
+++ b/src/Storages/ya.make.in
@@ -10,7 +10,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -P 'Kafka|RabbitMQ|S3|HDFS|Licenses|TimeZones|RocksDB|PostgreSQL' | sed 's/^\.\//    /' | sort ?>
+<? 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/CMakeLists.txt b/src/TableFunctions/CMakeLists.txt
index 8e9eedadf53..576d1ea23ff 100644
--- a/src/TableFunctions/CMakeLists.txt
+++ b/src/TableFunctions/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
+include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_table_functions .)
 
 list(REMOVE_ITEM clickhouse_table_functions_sources ITableFunction.cpp TableFunctionFactory.cpp)
diff --git a/src/TableFunctions/ITableFunction.cpp b/src/TableFunctions/ITableFunction.cpp
index b637838c6da..218d86fe4a2 100644
--- a/src/TableFunctions/ITableFunction.cpp
+++ b/src/TableFunctions/ITableFunction.cpp
@@ -14,11 +14,11 @@ namespace ProfileEvents
 namespace DB
 {
 
-StoragePtr ITableFunction::execute(const ASTPtr & ast_function, const Context & context, const std::string & table_name,
+StoragePtr ITableFunction::execute(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name,
                                    ColumnsDescription cached_columns) const
 {
     ProfileEvents::increment(ProfileEvents::TableFunctionExecute);
-    context.checkAccess(AccessType::CREATE_TEMPORARY_TABLE | StorageFactory::instance().getSourceAccessType(getStorageTypeName()));
+    context->checkAccess(AccessType::CREATE_TEMPORARY_TABLE | StorageFactory::instance().getSourceAccessType(getStorageTypeName()));
 
     if (cached_columns.empty())
         return executeImpl(ast_function, context, table_name, std::move(cached_columns));
@@ -26,12 +26,12 @@ StoragePtr ITableFunction::execute(const ASTPtr & ast_function, const Context &
     /// We have table structure, so it's CREATE AS table_function().
     /// We should use global context here because there will be no query context on server startup
     /// and because storage lifetime is bigger than query context lifetime.
-    const Context & global_context = context.getGlobalContext();
+    auto global_context = context->getGlobalContext();
     if (hasStaticStructure() && cached_columns == getActualTableStructure(context))
         return executeImpl(ast_function, global_context, table_name, std::move(cached_columns));
 
     auto this_table_function = shared_from_this();
-    auto get_storage = [=, &global_context]() -> StoragePtr
+    auto get_storage = [=]() -> StoragePtr
     {
         return this_table_function->executeImpl(ast_function, global_context, table_name, cached_columns);
     };
diff --git a/src/TableFunctions/ITableFunction.h b/src/TableFunctions/ITableFunction.h
index eb5e1618b3c..56147ffd598 100644
--- a/src/TableFunctions/ITableFunction.h
+++ b/src/TableFunctions/ITableFunction.h
@@ -47,18 +47,20 @@ public:
     /// Returns false if storage returned by table function supports type conversion (e.g. StorageDistributed)
     virtual bool needStructureConversion() const { return true; }
 
-    virtual void parseArguments(const ASTPtr & /*ast_function*/, const Context & /*context*/) {}
+    virtual void parseArguments(const ASTPtr & /*ast_function*/, ContextPtr /*context*/) {}
 
     /// Returns actual table structure probably requested from remote server, may fail
-    virtual ColumnsDescription getActualTableStructure(const Context & /*context*/) const = 0;
+    virtual ColumnsDescription getActualTableStructure(ContextPtr /*context*/) const = 0;
 
     /// Create storage according to the query.
-    StoragePtr execute(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns_ = {}) const;
+    StoragePtr
+    execute(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns_ = {}) const;
 
     virtual ~ITableFunction() = default;
 
 private:
-    virtual StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const = 0;
+    virtual StoragePtr executeImpl(
+        const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const = 0;
     virtual const char * getStorageTypeName() const = 0;
 };
 
diff --git a/src/TableFunctions/ITableFunctionFileLike.cpp b/src/TableFunctions/ITableFunctionFileLike.cpp
index 1349c166474..65a536d5d30 100644
--- a/src/TableFunctions/ITableFunctionFileLike.cpp
+++ b/src/TableFunctions/ITableFunctionFileLike.cpp
@@ -26,7 +26,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, const Context & context)
+void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     /// Parse args
     ASTs & args_func = ast_function->children;
@@ -58,26 +58,28 @@ void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, const C
 
     structure = args[2]->as<ASTLiteral &>().value.safeGet<String>();
     if (structure.empty())
-        throw Exception("Table structure is empty", ErrorCodes::BAD_ARGUMENTS);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Table structure is empty for table function '{}'",
+            ast_function->formatForErrorMessage());
 
     if (args.size() == 4)
         compression_method = args[3]->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-StoragePtr ITableFunctionFileLike::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr ITableFunctionFileLike::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
-    StoragePtr storage = getStorage(filename, format, columns, const_cast<Context &>(context), table_name, compression_method);
+    StoragePtr storage = getStorage(filename, format, columns, context, table_name, compression_method);
     storage->startup();
     return storage;
 }
 
-ColumnsDescription ITableFunctionFileLike::getActualTableStructure(const Context & context) const
+ColumnsDescription ITableFunctionFileLike::getActualTableStructure(ContextPtr context) const
 {
     if (structure.empty())
     {
         assert(getName() == "file" && format == "Distributed");
-        Strings paths = StorageFile::getPathsList(filename, context.getUserFilesPath(), context);
+        Strings paths = StorageFile::getPathsList(filename, context->getUserFilesPath(), context);
         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::createStreamFromFile(paths[0]);
diff --git a/src/TableFunctions/ITableFunctionFileLike.h b/src/TableFunctions/ITableFunctionFileLike.h
index f1c648ac0aa..7c96ce610b3 100644
--- a/src/TableFunctions/ITableFunctionFileLike.h
+++ b/src/TableFunctions/ITableFunctionFileLike.h
@@ -13,15 +13,15 @@ class Context;
 class ITableFunctionFileLike : public ITableFunction
 {
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
 
     virtual StoragePtr getStorage(
-        const String & source, const String & format, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method) const = 0;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     bool hasStaticStructure() const override { return true; }
 
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index 21c78d199db..9aa099c1333 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -28,7 +28,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-void ITableFunctionXDBC::parseArguments(const ASTPtr & ast_function, const Context & context)
+void ITableFunctionXDBC::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & args_func = ast_function->as<ASTFunction &>();
 
@@ -57,17 +57,17 @@ void ITableFunctionXDBC::parseArguments(const ASTPtr & ast_function, const Conte
     }
 }
 
-void ITableFunctionXDBC::startBridgeIfNot(const Context & context) const
+void ITableFunctionXDBC::startBridgeIfNot(ContextPtr context) const
 {
     if (!helper)
     {
         /// Have to const_cast, because bridges store their commands inside context
-        helper = createBridgeHelper(const_cast<Context &>(context), context.getSettingsRef().http_receive_timeout.value, connection_string);
+        helper = createBridgeHelper(context, context->getSettingsRef().http_receive_timeout.value, connection_string);
         helper->startBridgeSync();
     }
 }
 
-ColumnsDescription ITableFunctionXDBC::getActualTableStructure(const Context & context) const
+ColumnsDescription ITableFunctionXDBC::getActualTableStructure(ContextPtr context) const
 {
     startBridgeIfNot(context);
 
@@ -78,7 +78,7 @@ ColumnsDescription ITableFunctionXDBC::getActualTableStructure(const Context & c
         columns_info_uri.addQueryParameter("schema", schema_name);
     columns_info_uri.addQueryParameter("table", remote_table_name);
 
-    const auto use_nulls = context.getSettingsRef().external_table_functions_use_nulls;
+    const auto use_nulls = context->getSettingsRef().external_table_functions_use_nulls;
     columns_info_uri.addQueryParameter("external_table_functions_use_nulls",
                                        Poco::NumberFormatter::format(use_nulls));
 
@@ -91,11 +91,12 @@ ColumnsDescription ITableFunctionXDBC::getActualTableStructure(const Context & c
     return ColumnsDescription{columns};
 }
 
-StoragePtr ITableFunctionXDBC::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr ITableFunctionXDBC::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     startBridgeIfNot(context);
     auto columns = getActualTableStructure(context);
-    auto result = std::make_shared<StorageXDBC>(StorageID(getDatabaseName(), table_name), schema_name, remote_table_name, columns, context, helper);
+    auto result = std::make_shared<StorageXDBC>(
+        StorageID(getDatabaseName(), table_name), schema_name, remote_table_name, columns, String{}, context, helper);
     result->startup();
     return result;
 }
diff --git a/src/TableFunctions/ITableFunctionXDBC.h b/src/TableFunctions/ITableFunctionXDBC.h
index f3ff64c2f2d..4f6656773b1 100644
--- a/src/TableFunctions/ITableFunctionXDBC.h
+++ b/src/TableFunctions/ITableFunctionXDBC.h
@@ -3,7 +3,7 @@
 #include <Storages/StorageXDBC.h>
 #include <TableFunctions/ITableFunction.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/XDBCBridgeHelper.h>
+#include <Bridge/XDBCBridgeHelper.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
@@ -18,18 +18,18 @@ namespace DB
 class ITableFunctionXDBC : public ITableFunction
 {
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
 
     /* A factory method to create bridge helper, that will assist in remote interaction */
-    virtual BridgeHelperPtr createBridgeHelper(Context & context,
-        const Poco::Timespan & http_timeout_,
+    virtual BridgeHelperPtr createBridgeHelper(ContextPtr context,
+        Poco::Timespan http_timeout_,
         const std::string & connection_string_) const = 0;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    void startBridgeIfNot(const Context & context) const;
+    void startBridgeIfNot(ContextPtr context) const;
 
     String connection_string;
     String schema_name;
@@ -47,8 +47,8 @@ public:
     }
 
 private:
-    BridgeHelperPtr createBridgeHelper(Context & context,
-        const Poco::Timespan & http_timeout_,
+    BridgeHelperPtr createBridgeHelper(ContextPtr context,
+        Poco::Timespan http_timeout_,
         const std::string & connection_string_) const override
     {
         return std::make_shared<XDBCBridgeHelper<JDBCBridgeMixin>>(context, http_timeout_, connection_string_);
@@ -67,8 +67,8 @@ public:
     }
 
 private:
-    BridgeHelperPtr createBridgeHelper(Context & context,
-        const Poco::Timespan & http_timeout_,
+    BridgeHelperPtr createBridgeHelper(ContextPtr context,
+        Poco::Timespan http_timeout_,
         const std::string & connection_string_) const override
     {
         return std::make_shared<XDBCBridgeHelper<ODBCBridgeMixin>>(context, http_timeout_, connection_string_);
diff --git a/src/TableFunctions/TableFunctionDictionary.cpp b/src/TableFunctions/TableFunctionDictionary.cpp
index 722ffccc07d..0eb3c286be0 100644
--- a/src/TableFunctions/TableFunctionDictionary.cpp
+++ b/src/TableFunctions/TableFunctionDictionary.cpp
@@ -19,7 +19,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-void TableFunctionDictionary::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionDictionary::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     // Parse args
     ASTs & args_func = ast_function->children;
@@ -38,9 +38,9 @@ void TableFunctionDictionary::parseArguments(const ASTPtr & ast_function, const
     dictionary_name = args[0]->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionDictionary::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionDictionary::getActualTableStructure(ContextPtr context) const
 {
-    const ExternalDictionariesLoader & external_loader = context.getExternalDictionariesLoader();
+    const ExternalDictionariesLoader & external_loader = context->getExternalDictionariesLoader();
     auto dictionary_structure = external_loader.getDictionaryStructure(dictionary_name, context);
     auto result = ColumnsDescription(StorageDictionary::getNamesAndTypes(dictionary_structure));
 
@@ -48,11 +48,15 @@ ColumnsDescription TableFunctionDictionary::getActualTableStructure(const Contex
 }
 
 StoragePtr TableFunctionDictionary::executeImpl(
-    const ASTPtr &, const Context & context, const std::string & table_name, ColumnsDescription) const
+    const ASTPtr &, ContextPtr context, const std::string & table_name, ColumnsDescription) const
 {
     StorageID dict_id(getDatabaseName(), table_name);
     auto dictionary_table_structure = getActualTableStructure(context);
-    return StorageDictionary::create(dict_id, dictionary_name, std::move(dictionary_table_structure), StorageDictionary::Location::Custom);
+
+    auto result = StorageDictionary::create(
+        dict_id, dictionary_name, std::move(dictionary_table_structure), String{}, StorageDictionary::Location::Custom, context);
+
+    return result;
 }
 
 void registerTableFunctionDictionary(TableFunctionFactory & factory)
diff --git a/src/TableFunctions/TableFunctionDictionary.h b/src/TableFunctions/TableFunctionDictionary.h
index 8c518eb7929..aed435bebfd 100644
--- a/src/TableFunctions/TableFunctionDictionary.h
+++ b/src/TableFunctions/TableFunctionDictionary.h
@@ -20,11 +20,11 @@ public:
         return name;
     }
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription) const override;
 
     const char * getStorageTypeName() const override { return "Dictionary"; }
 
diff --git a/src/TableFunctions/TableFunctionFactory.cpp b/src/TableFunctions/TableFunctionFactory.cpp
index e8f844e8074..15e61354f6d 100644
--- a/src/TableFunctions/TableFunctionFactory.cpp
+++ b/src/TableFunctions/TableFunctionFactory.cpp
@@ -31,7 +31,7 @@ void TableFunctionFactory::registerFunction(const std::string & name, Value crea
 
 TableFunctionPtr TableFunctionFactory::get(
     const ASTPtr & ast_function,
-    const Context & context) const
+    ContextPtr context) const
 {
     const auto * table_function = ast_function->as<ASTFunction>();
     auto res = tryGet(table_function->name, context);
@@ -50,7 +50,7 @@ TableFunctionPtr TableFunctionFactory::get(
 
 TableFunctionPtr TableFunctionFactory::tryGet(
         const std::string & name_param,
-        const Context &) const
+        ContextPtr) const
 {
     String name = getAliasToOrName(name_param);
     TableFunctionPtr res;
@@ -70,7 +70,7 @@ TableFunctionPtr TableFunctionFactory::tryGet(
 
     if (CurrentThread::isInitialized())
     {
-        const auto * query_context = CurrentThread::get().getQueryContext();
+        auto query_context = CurrentThread::get().getQueryContext();
         if (query_context && query_context->getSettingsRef().log_queries)
             query_context->addQueryFactoriesInfo(Context::QueryLogFactories::TableFunction, name);
     }
diff --git a/src/TableFunctions/TableFunctionFactory.h b/src/TableFunctions/TableFunctionFactory.h
index 820b5eb1c7b..59b4ffb9fd5 100644
--- a/src/TableFunctions/TableFunctionFactory.h
+++ b/src/TableFunctions/TableFunctionFactory.h
@@ -41,10 +41,10 @@ public:
     }
 
     /// Throws an exception if not found.
-    TableFunctionPtr get(const ASTPtr & ast_function, const Context & context) const;
+    TableFunctionPtr get(const ASTPtr & ast_function, ContextPtr context) const;
 
     /// Returns nullptr if not found.
-    TableFunctionPtr tryGet(const std::string & name, const Context & context) const;
+    TableFunctionPtr tryGet(const std::string & name, ContextPtr context) const;
 
     bool isTableFunctionName(const std::string & name) const;
 
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 13ac6dc2145..f732e160751 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -12,20 +12,23 @@ namespace DB
 {
 StoragePtr TableFunctionFile::getStorage(const String & source,
     const String & format_, const ColumnsDescription & columns,
-    Context & global_context, const std::string & table_name,
+    ContextPtr global_context, const std::string & table_name,
     const std::string & compression_method_) const
 {
     // For `file` table function, we are going to use format settings from the
     // query context.
-    StorageFile::CommonArguments args{StorageID(getDatabaseName(), table_name),
+    StorageFile::CommonArguments args{
+        WithContext(global_context),
+        StorageID(getDatabaseName(), table_name),
         format_,
         std::nullopt /*format settings*/,
         compression_method_,
         columns,
         ConstraintsDescription{},
-        global_context};
+        String{},
+    };
 
-    return StorageFile::create(source, global_context.getUserFilesPath(), args);
+    return StorageFile::create(source, global_context->getUserFilesPath(), args);
 }
 
 void registerTableFunctionFile(TableFunctionFactory & factory)
diff --git a/src/TableFunctions/TableFunctionFile.h b/src/TableFunctions/TableFunctionFile.h
index 02704e4bf7f..460656a7218 100644
--- a/src/TableFunctions/TableFunctionFile.h
+++ b/src/TableFunctions/TableFunctionFile.h
@@ -5,7 +5,6 @@
 
 namespace DB
 {
-class Context;
 
 /* file(path, format, structure) - creates a temporary storage from file
  *
@@ -23,7 +22,7 @@ public:
 
 private:
     StoragePtr getStorage(
-        const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const std::string & compression_method_) const override;
     const char * getStorageTypeName() const override { return "File"; }
 };}
diff --git a/src/TableFunctions/TableFunctionGenerateRandom.cpp b/src/TableFunctions/TableFunctionGenerateRandom.cpp
index 15c2c2bfa1f..ff9630eabd8 100644
--- a/src/TableFunctions/TableFunctionGenerateRandom.cpp
+++ b/src/TableFunctions/TableFunctionGenerateRandom.cpp
@@ -26,7 +26,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, const Context & /*context*/)
+void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, ContextPtr /*context*/)
 {
     ASTs & args_func = ast_function->children;
 
@@ -74,15 +74,16 @@ void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, co
         max_array_length = args[3]->as<const ASTLiteral &>().value.safeGet<UInt64>();
 }
 
-ColumnsDescription TableFunctionGenerateRandom::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionGenerateRandom::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionGenerateRandom::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionGenerateRandom::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
-    auto res = StorageGenerateRandom::create(StorageID(getDatabaseName(), table_name), columns, max_array_length, max_string_length, random_seed);
+    auto res = StorageGenerateRandom::create(
+        StorageID(getDatabaseName(), table_name), columns, String{}, max_array_length, max_string_length, random_seed);
     res->startup();
     return res;
 }
diff --git a/src/TableFunctions/TableFunctionGenerateRandom.h b/src/TableFunctions/TableFunctionGenerateRandom.h
index 1d8839ba6d4..bcad11156be 100644
--- a/src/TableFunctions/TableFunctionGenerateRandom.h
+++ b/src/TableFunctions/TableFunctionGenerateRandom.h
@@ -15,11 +15,11 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "GenerateRandom"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String structure;
     UInt64 max_string_length = 10;
diff --git a/src/TableFunctions/TableFunctionHDFS.cpp b/src/TableFunctions/TableFunctionHDFS.cpp
index 700cb93ca06..245674b0e06 100644
--- a/src/TableFunctions/TableFunctionHDFS.cpp
+++ b/src/TableFunctions/TableFunctionHDFS.cpp
@@ -10,7 +10,7 @@
 namespace DB
 {
 StoragePtr TableFunctionHDFS::getStorage(
-    const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+    const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
     const std::string & table_name, const String & compression_method_) const
 {
     return StorageHDFS::create(
@@ -19,6 +19,7 @@ StoragePtr TableFunctionHDFS::getStorage(
         format_,
         columns,
         ConstraintsDescription{},
+        String{},
         global_context,
         compression_method_);
 }
diff --git a/src/TableFunctions/TableFunctionHDFS.h b/src/TableFunctions/TableFunctionHDFS.h
index 47e040f7593..d9ee9b47868 100644
--- a/src/TableFunctions/TableFunctionHDFS.h
+++ b/src/TableFunctions/TableFunctionHDFS.h
@@ -26,7 +26,7 @@ public:
 
 private:
     StoragePtr getStorage(
-        const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method_) const override;
     const char * getStorageTypeName() const override { return "HDFS"; }
 };
diff --git a/src/TableFunctions/TableFunctionInput.cpp b/src/TableFunctions/TableFunctionInput.cpp
index 41c41835434..677a6ff3ce4 100644
--- a/src/TableFunctions/TableFunctionInput.cpp
+++ b/src/TableFunctions/TableFunctionInput.cpp
@@ -22,7 +22,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-void TableFunctionInput::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionInput::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto * function = ast_function->as<ASTFunction>();
 
@@ -38,12 +38,12 @@ void TableFunctionInput::parseArguments(const ASTPtr & ast_function, const Conte
     structure = evaluateConstantExpressionOrIdentifierAsLiteral(args[0], context)->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionInput::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionInput::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionInput::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionInput::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto storage = StorageInput::create(StorageID(getDatabaseName(), table_name), getActualTableStructure(context));
     storage->startup();
diff --git a/src/TableFunctions/TableFunctionInput.h b/src/TableFunctions/TableFunctionInput.h
index 5809d48a77c..5953693e711 100644
--- a/src/TableFunctions/TableFunctionInput.h
+++ b/src/TableFunctions/TableFunctionInput.h
@@ -18,11 +18,11 @@ public:
     bool hasStaticStructure() const override { return true; }
 
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Input"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String structure;
 };
diff --git a/src/TableFunctions/TableFunctionMerge.cpp b/src/TableFunctions/TableFunctionMerge.cpp
index c5fb9a7686d..051aa38398f 100644
--- a/src/TableFunctions/TableFunctionMerge.cpp
+++ b/src/TableFunctions/TableFunctionMerge.cpp
@@ -33,7 +33,7 @@ namespace
 }
 
 
-void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     ASTs & args_func = ast_function->children;
 
@@ -57,7 +57,7 @@ void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, const Conte
 }
 
 
-const Strings & TableFunctionMerge::getSourceTables(const Context & context) const
+const Strings & TableFunctionMerge::getSourceTables(ContextPtr context) const
 {
     if (source_tables)
         return *source_tables;
@@ -67,7 +67,7 @@ const Strings & TableFunctionMerge::getSourceTables(const Context & context) con
     OptimizedRegularExpression re(source_table_regexp);
     auto table_name_match = [&](const String & table_name_) { return re.match(table_name_); };
 
-    auto access = context.getAccess();
+    auto access = context->getAccess();
     bool granted_show_on_all_tables = access->isGranted(AccessType::SHOW_TABLES, source_database);
     bool granted_select_on_all_tables = access->isGranted(AccessType::SELECT, source_database);
 
@@ -91,7 +91,7 @@ const Strings & TableFunctionMerge::getSourceTables(const Context & context) con
 }
 
 
-ColumnsDescription TableFunctionMerge::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionMerge::getActualTableStructure(ContextPtr context) const
 {
     for (const auto & table_name : getSourceTables(context))
     {
@@ -104,11 +104,12 @@ ColumnsDescription TableFunctionMerge::getActualTableStructure(const Context & c
 }
 
 
-StoragePtr TableFunctionMerge::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionMerge::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto res = StorageMerge::create(
         StorageID(getDatabaseName(), table_name),
         getActualTableStructure(context),
+        String{},
         source_database,
         getSourceTables(context),
         context);
diff --git a/src/TableFunctions/TableFunctionMerge.h b/src/TableFunctions/TableFunctionMerge.h
index 8f9f4522d17..04027b9d76a 100644
--- a/src/TableFunctions/TableFunctionMerge.h
+++ b/src/TableFunctions/TableFunctionMerge.h
@@ -16,12 +16,12 @@ public:
     static constexpr auto name = "merge";
     std::string getName() const override { return name; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Merge"; }
 
-    const Strings & getSourceTables(const Context & context) const;
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    const Strings & getSourceTables(ContextPtr context) const;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String source_database;
     String source_table_regexp;
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index d6a62dc68b4..0b60e11f490 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -1,29 +1,31 @@
 #if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
+#include "config_core.h"
 #endif
 
 #if USE_MYSQL
-#    include <Core/Defines.h>
-#    include <Databases/MySQL/FetchTablesColumnsList.h>
-#    include <DataTypes/DataTypeString.h>
-#    include <DataTypes/DataTypesNumber.h>
-#    include <DataTypes/convertMySQLDataType.h>
-#    include <Formats/MySQLBlockInputStream.h>
-#    include <IO/Operators.h>
-#    include <Interpreters/Context.h>
-#    include <Interpreters/evaluateConstantExpression.h>
-#    include <Parsers/ASTFunction.h>
-#    include <Parsers/ASTLiteral.h>
-#    include <Storages/StorageMySQL.h>
-#    include <TableFunctions/ITableFunction.h>
-#    include <TableFunctions/TableFunctionFactory.h>
-#    include <TableFunctions/TableFunctionMySQL.h>
-#    include <Common/Exception.h>
-#    include <Common/parseAddress.h>
-#    include <Common/quoteString.h>
-#    include "registerTableFunctions.h"
+#include <Core/Defines.h>
+#include <Databases/MySQL/FetchTablesColumnsList.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/convertMySQLDataType.h>
+#include <Formats/MySQLBlockInputStream.h>
+#include <IO/Operators.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Storages/StorageMySQL.h>
+#include <Storages/MySQL/MySQLSettings.h>
+#include <TableFunctions/ITableFunction.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionMySQL.h>
+#include <Common/Exception.h>
+#include <Common/parseAddress.h>
+#include <Common/quoteString.h>
+#include "registerTableFunctions.h"
 
-#    include <Databases/MySQL/DatabaseConnectionMySQL.h> // for fetchTablesColumnsList
+#include <Databases/MySQL/DatabaseConnectionMySQL.h> // for fetchTablesColumnsList
+#include <Common/parseRemoteDescription.h>
 
 
 namespace DB
@@ -37,7 +39,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_TABLE;
 }
 
-void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & args_func = ast_function->as<ASTFunction &>();
 
@@ -59,6 +61,11 @@ void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, const Conte
     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)
@@ -68,33 +75,27 @@ void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, const Conte
         throw Exception(
             "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them",
             ErrorCodes::BAD_ARGUMENTS);
-
-    /// 3306 is the default MySQL port number
-    parsed_host_port = parseAddress(host_port, 3306);
 }
 
-ColumnsDescription TableFunctionMySQL::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionMySQL::getActualTableStructure(ContextPtr context) const
 {
-    assert(!parsed_host_port.first.empty());
-    if (!pool)
-        pool.emplace(remote_database_name, parsed_host_port.first, user_name, password, parsed_host_port.second);
-
-    const auto & settings = context.getSettingsRef();
-    const auto tables_and_columns = fetchTablesColumnsList(*pool, remote_database_name, {remote_table_name}, settings.external_table_functions_use_nulls, settings.mysql_datatypes_support_level);
+    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 columns = tables_and_columns.find(remote_table_name);
     if (columns == tables_and_columns.end())
-        throw Exception("MySQL table " + backQuoteIfNeed(remote_database_name) + "." + backQuoteIfNeed(remote_table_name) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
+        throw Exception("MySQL table " + (remote_database_name.empty() ? "" : (backQuote(remote_database_name) + "."))
+            + backQuote(remote_table_name) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
 
     return ColumnsDescription{columns->second};
 }
 
-StoragePtr TableFunctionMySQL::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionMySQL::executeImpl(
+    const ASTPtr & /*ast_function*/,
+    ContextPtr context,
+    const std::string & table_name,
+    ColumnsDescription /*cached_columns*/) const
 {
-    assert(!parsed_host_port.first.empty());
-    if (!pool)
-        pool.emplace(remote_database_name, parsed_host_port.first, user_name, password, parsed_host_port.second);
-
     auto columns = getActualTableStructure(context);
 
     auto res = StorageMySQL::create(
@@ -106,7 +107,9 @@ StoragePtr TableFunctionMySQL::executeImpl(const ASTPtr & /*ast_function*/, cons
         on_duplicate_clause,
         columns,
         ConstraintsDescription{},
-        context);
+        String{},
+        context,
+        MySQLSettings{});
 
     pool.reset();
 
diff --git a/src/TableFunctions/TableFunctionMySQL.h b/src/TableFunctions/TableFunctionMySQL.h
index 1fe5a4aa4ac..64c7d56cf2a 100644
--- a/src/TableFunctions/TableFunctionMySQL.h
+++ b/src/TableFunctions/TableFunctionMySQL.h
@@ -24,13 +24,12 @@ public:
         return name;
     }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "MySQL"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    std::pair<std::string, UInt16> parsed_host_port;
     String remote_database_name;
     String remote_table_name;
     String user_name;
@@ -38,7 +37,7 @@ private:
     bool replace_query = false;
     String on_duplicate_clause;
 
-    mutable std::optional<mysqlxx::Pool> pool;
+    mutable std::optional<mysqlxx::PoolWithFailover> pool;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionNull.cpp b/src/TableFunctions/TableFunctionNull.cpp
index 6abe0319394..63e496ecd0c 100644
--- a/src/TableFunctions/TableFunctionNull.cpp
+++ b/src/TableFunctions/TableFunctionNull.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-void TableFunctionNull::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionNull::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto * function = ast_function->as<ASTFunction>();
     if (!function || !function->arguments)
@@ -30,15 +30,15 @@ void TableFunctionNull::parseArguments(const ASTPtr & ast_function, const Contex
     structure = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[0], context)->as<ASTLiteral>()->value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionNull::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionNull::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionNull::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionNull::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
-    auto res = StorageNull::create(StorageID(getDatabaseName(), table_name), columns, ConstraintsDescription());
+    auto res = StorageNull::create(StorageID(getDatabaseName(), table_name), columns, ConstraintsDescription(), String{});
     res->startup();
     return res;
 }
diff --git a/src/TableFunctions/TableFunctionNull.h b/src/TableFunctions/TableFunctionNull.h
index 4d4cecb0292..6734fb8efb6 100644
--- a/src/TableFunctions/TableFunctionNull.h
+++ b/src/TableFunctions/TableFunctionNull.h
@@ -17,11 +17,11 @@ public:
     static constexpr auto name = "null";
     std::string getName() const override { return name; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const String & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const String & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Null"; }
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
     String structure;
 };
diff --git a/src/TableFunctions/TableFunctionNumbers.cpp b/src/TableFunctions/TableFunctionNumbers.cpp
index 594075b1c82..01ffd2b2e3d 100644
--- a/src/TableFunctions/TableFunctionNumbers.cpp
+++ b/src/TableFunctions/TableFunctionNumbers.cpp
@@ -23,14 +23,14 @@ namespace ErrorCodes
 
 
 template <bool multithreaded>
-ColumnsDescription TableFunctionNumbers<multithreaded>::getActualTableStructure(const Context & /*context*/) const
+ColumnsDescription TableFunctionNumbers<multithreaded>::getActualTableStructure(ContextPtr /*context*/) const
 {
     /// NOTE: https://bugs.llvm.org/show_bug.cgi?id=47418
     return ColumnsDescription{{{"number", std::make_shared<DataTypeUInt64>()}}};
 }
 
 template <bool multithreaded>
-StoragePtr TableFunctionNumbers<multithreaded>::executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionNumbers<multithreaded>::executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     if (const auto * function = ast_function->as<ASTFunction>())
     {
@@ -56,7 +56,7 @@ void registerTableFunctionNumbers(TableFunctionFactory & factory)
 }
 
 template <bool multithreaded>
-UInt64 TableFunctionNumbers<multithreaded>::evaluateArgument(const Context & context, ASTPtr & argument) const
+UInt64 TableFunctionNumbers<multithreaded>::evaluateArgument(ContextPtr context, ASTPtr & argument) const
 {
     const auto & [field, type] = evaluateConstantExpression(argument, context);
 
diff --git a/src/TableFunctions/TableFunctionNumbers.h b/src/TableFunctions/TableFunctionNumbers.h
index c27bb7319ba..6cee752390e 100644
--- a/src/TableFunctions/TableFunctionNumbers.h
+++ b/src/TableFunctions/TableFunctionNumbers.h
@@ -19,12 +19,12 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "SystemNumbers"; }
 
-    UInt64 evaluateArgument(const Context & context, ASTPtr & argument) const;
+    UInt64 evaluateArgument(ContextPtr context, ASTPtr & argument) const;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 };
 
 
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.cpp b/src/TableFunctions/TableFunctionPostgreSQL.cpp
index f20aae11648..6c3d77f226e 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.cpp
+++ b/src/TableFunctions/TableFunctionPostgreSQL.cpp
@@ -10,8 +10,9 @@
 #include <Common/parseAddress.h>
 #include "registerTableFunctions.h"
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
-#include <Storages/PostgreSQL/PostgreSQLConnection.h>
 #include <Common/quoteString.h>
+#include <Common/parseRemoteDescription.h>
+#include <Storages/StoragePostgreSQL.h>
 
 
 namespace DB
@@ -25,21 +26,27 @@ namespace ErrorCodes
 
 
 StoragePtr TableFunctionPostgreSQL::executeImpl(const ASTPtr & /*ast_function*/,
-        const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+        ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
     auto result = std::make_shared<StoragePostgreSQL>(
-            StorageID(getDatabaseName(), table_name), remote_table_name,
-            connection_pool, columns, ConstraintsDescription{}, context, remote_table_schema);
+        StorageID(getDatabaseName(), table_name),
+        connection_pool,
+        remote_table_name,
+        columns,
+        ConstraintsDescription{},
+        String{},
+        context,
+        remote_table_schema);
 
     result->startup();
     return result;
 }
 
 
-ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(ContextPtr context) const
 {
-    const bool use_nulls = context.getSettingsRef().external_table_functions_use_nulls;
+    const bool use_nulls = context->getSettingsRef().external_table_functions_use_nulls;
     auto columns = fetchPostgreSQLTableStructure(
             connection_pool->get(),
             remote_table_schema.empty() ? doubleQuoteString(remote_table_name)
@@ -50,7 +57,7 @@ ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(const Contex
 }
 
 
-void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & func_args = ast_function->as<ASTFunction &>();
 
@@ -67,16 +74,19 @@ void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, const
     for (auto & arg : args)
         arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
-    auto parsed_host_port = parseAddress(args[0]->as<ASTLiteral &>().value.safeGet<String>(), 5432);
+    /// 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<PostgreSQLConnectionPool>(
+    connection_pool = std::make_shared<postgres::PoolWithFailover>(
         args[1]->as<ASTLiteral &>().value.safeGet<String>(),
-        parsed_host_port.first,
-        parsed_host_port.second,
+        addresses,
         args[3]->as<ASTLiteral &>().value.safeGet<String>(),
         args[4]->as<ASTLiteral &>().value.safeGet<String>());
 }
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.h b/src/TableFunctions/TableFunctionPostgreSQL.h
index 601b2a090b2..a3d024c1a50 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.h
+++ b/src/TableFunctions/TableFunctionPostgreSQL.h
@@ -5,14 +5,12 @@
 
 #if USE_LIBPQXX
 #include <TableFunctions/ITableFunction.h>
+#include <Storages/PostgreSQL/PoolWithFailover.h>
 
 
 namespace DB
 {
 
-class PostgreSQLConnectionPool;
-using PostgreSQLConnectionPoolPtr = std::shared_ptr<PostgreSQLConnectionPool>;
-
 class TableFunctionPostgreSQL : public ITableFunction
 {
 public:
@@ -21,17 +19,17 @@ public:
 
 private:
     StoragePtr executeImpl(
-            const ASTPtr & ast_function, const Context & context,
+            const ASTPtr & ast_function, ContextPtr context,
             const std::string & table_name, ColumnsDescription cached_columns) const override;
 
     const char * getStorageTypeName() const override { return "PostgreSQL"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    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;
-    PostgreSQLConnectionPoolPtr connection_pool;
+    postgres::PoolWithFailoverPtr connection_pool;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 0e7623c0ac3..8539705a2d2 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -28,7 +28,7 @@ namespace ErrorCodes
 }
 
 
-void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     ASTs & args_func = ast_function->children;
 
@@ -162,14 +162,14 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
     {
         /// Use an existing cluster from the main config
         if (name != "clusterAllReplicas")
-            cluster = context.getCluster(cluster_name);
+            cluster = context->getCluster(cluster_name);
         else
-            cluster = context.getCluster(cluster_name)->getClusterWithReplicasAsShards(context.getSettings());
+            cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettings());
     }
     else
     {
         /// Create new cluster from the scratch
-        size_t max_addresses = context.getSettingsRef().table_function_remote_max_addresses;
+        size_t max_addresses = context->getSettingsRef().table_function_remote_max_addresses;
         std::vector<String> shards = parseRemoteDescription(cluster_description, 0, cluster_description.size(), ',', max_addresses);
 
         std::vector<std::vector<String>> names;
@@ -180,7 +180,7 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
         if (names.empty())
             throw Exception("Shard list is empty after parsing first argument", ErrorCodes::BAD_ARGUMENTS);
 
-        auto maybe_secure_port = context.getTCPPortSecure();
+        auto maybe_secure_port = context->getTCPPortSecure();
 
         /// Check host and port on affiliation allowed hosts.
         for (const auto & hosts : names)
@@ -189,20 +189,20 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
             {
                 size_t colon = host.find(':');
                 if (colon == String::npos)
-                    context.getRemoteHostFilter().checkHostAndPort(
+                    context->getRemoteHostFilter().checkHostAndPort(
                         host,
-                        toString((secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context.getTCPPort())));
+                        toString((secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort())));
                 else
-                    context.getRemoteHostFilter().checkHostAndPort(host.substr(0, colon), host.substr(colon + 1));
+                    context->getRemoteHostFilter().checkHostAndPort(host.substr(0, colon), host.substr(colon + 1));
             }
         }
 
         cluster = std::make_shared<Cluster>(
-            context.getSettings(),
+            context->getSettings(),
             names,
             username,
             password,
-            (secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context.getTCPPort()),
+            (secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort()),
             false,
             secure);
     }
@@ -214,7 +214,7 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, const Cont
     remote_table_id.table_name = remote_table;
 }
 
-StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const
+StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const
 {
     /// StorageDistributed supports mismatching structure of remote table, so we can use outdated structure for CREATE ... AS remote(...)
     /// without additional conversion in StorageTableFunctionProxy
@@ -240,6 +240,7 @@ StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, con
             StorageID(getDatabaseName(), table_name),
             cached_columns,
             ConstraintsDescription{},
+            String{},
             remote_table_id.database_name,
             remote_table_id.table_name,
             String{},
@@ -255,7 +256,7 @@ StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, con
     return res;
 }
 
-ColumnsDescription TableFunctionRemote::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionRemote::getActualTableStructure(ContextPtr context) const
 {
     assert(cluster);
     return getStructureOfRemoteTable(*cluster, remote_table_id, context, remote_table_function_ptr);
diff --git a/src/TableFunctions/TableFunctionRemote.h b/src/TableFunctions/TableFunctionRemote.h
index d485440d604..845c36182dc 100644
--- a/src/TableFunctions/TableFunctionRemote.h
+++ b/src/TableFunctions/TableFunctionRemote.h
@@ -18,19 +18,19 @@ namespace DB
 class TableFunctionRemote : public ITableFunction
 {
 public:
-    TableFunctionRemote(const std::string & name_, bool secure_ = false);
+    explicit TableFunctionRemote(const std::string & name_, bool secure_ = false);
 
     std::string getName() const override { return name; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
     bool needStructureConversion() const override { return false; }
 
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Distributed"; }
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     std::string name;
     bool is_cluster_function;
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index 6dc9230ca46..1eddbf69b7c 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -17,72 +17,92 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-void TableFunctionS3::parseArguments(const ASTPtr & ast_function, const Context & context)
+void TableFunctionS3::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     /// Parse args
     ASTs & args_func = ast_function->children;
 
+    const auto message = fmt::format(
+        "The signature of table function {} could be the following:\n" \
+        " - url, format, structure\n" \
+        " - url, format, structure, compression_method\n" \
+        " - url, access_key_id, secret_access_key, format, structure\n" \
+        " - url, access_key_id, secret_access_key, format, structure, compression_method",
+        getName());
+
     if (args_func.size() != 1)
-        throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
     ASTs & args = args_func.at(0)->children;
 
     if (args.size() < 3 || args.size() > 6)
-        throw Exception("Table function '" + getName() + "' requires 3 to 6 arguments: url, [access_key_id, secret_access_key,] format, structure and [compression_method].",
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+        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>>
+    {
+        {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}}}
+    };
+
+    /// This argument is always the first
     filename = args[0]->as<ASTLiteral &>().value.safeGet<String>();
 
-    if (args.size() < 5)
-    {
-        format = args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        structure = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-    }
-    else
-    {
-        access_key_id = args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        secret_access_key = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        format = args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        structure = args[4]->as<ASTLiteral &>().value.safeGet<String>();
-    }
+    auto & args_to_idx = size_to_args[args.size()];
 
-    if (args.size() == 4 || args.size() == 6)
-        compression_method = args.back()->as<ASTLiteral &>().value.safeGet<String>();
+    if (args_to_idx.contains("format"))
+        format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("structure"))
+        structure = args[args_to_idx["structure"]]->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>();
+
+    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("secret_access_key"))
+        secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionS3::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionS3::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     Poco::URI uri (filename);
     S3::URI s3_uri (uri);
-    UInt64 min_upload_part_size = context.getSettingsRef().s3_min_upload_part_size;
-    UInt64 max_single_part_upload_size = context.getSettingsRef().s3_max_single_part_upload_size;
-    UInt64 max_connections = context.getSettingsRef().s3_max_connections;
+    UInt64 s3_max_single_read_retries = context->getSettingsRef().s3_max_single_read_retries;
+    UInt64 min_upload_part_size = context->getSettingsRef().s3_min_upload_part_size;
+    UInt64 max_single_part_upload_size = context->getSettingsRef().s3_max_single_part_upload_size;
+    UInt64 max_connections = context->getSettingsRef().s3_max_connections;
 
     StoragePtr storage = StorageS3::create(
-            s3_uri,
-            access_key_id,
-            secret_access_key,
-            StorageID(getDatabaseName(), table_name),
-            format,
-            min_upload_part_size,
-            max_single_part_upload_size,
-            max_connections,
-            getActualTableStructure(context),
-            ConstraintsDescription{},
-            const_cast<Context &>(context),
-            compression_method);
+        s3_uri,
+        access_key_id,
+        secret_access_key,
+        StorageID(getDatabaseName(), table_name),
+        format,
+        s3_max_single_read_retries,
+        min_upload_part_size,
+        max_single_part_upload_size,
+        max_connections,
+        getActualTableStructure(context),
+        ConstraintsDescription{},
+        String{},
+        context,
+        compression_method);
 
     storage->startup();
 
diff --git a/src/TableFunctions/TableFunctionS3.h b/src/TableFunctions/TableFunctionS3.h
index 722fb9eb23c..1835fa3daa9 100644
--- a/src/TableFunctions/TableFunctionS3.h
+++ b/src/TableFunctions/TableFunctionS3.h
@@ -27,14 +27,14 @@ public:
 protected:
     StoragePtr executeImpl(
         const ASTPtr & ast_function,
-        const Context & context,
+        ContextPtr context,
         const std::string & table_name,
         ColumnsDescription cached_columns) const override;
 
     const char * getStorageTypeName() const override { return "S3"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String filename;
     String format;
diff --git a/src/TableFunctions/TableFunctionS3Cluster.cpp b/src/TableFunctions/TableFunctionS3Cluster.cpp
new file mode 100644
index 00000000000..7b0d50a6a0a
--- /dev/null
+++ b/src/TableFunctions/TableFunctionS3Cluster.cpp
@@ -0,0 +1,156 @@
+#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 <IO/S3Common.h>
+#include <Storages/StorageS3.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ClientInfo.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionS3.h>
+#include <TableFunctions/TableFunctionS3Cluster.h>
+#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/IAST_fwd.h>
+#include <Processors/Sources/SourceFromInputStream.h>
+
+#include "registerTableFunctions.h"
+
+#include <memory>
+#include <thread>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+
+void TableFunctionS3Cluster::parseArguments(const ASTPtr & ast_function, ContextPtr context)
+{
+    /// Parse args
+    ASTs & args_func = ast_function->children;
+
+    if (args_func.size() != 1)
+        throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    ASTs & args = args_func.at(0)->children;
+
+    const auto message = fmt::format(
+        "The signature of table function {} could be the following:\n" \
+        " - cluster, url, format, structure\n" \
+        " - cluster, url, format, structure, compression_method\n" \
+        " - cluster, url, access_key_id, secret_access_key, format, structure\n" \
+        " - cluster, url, access_key_id, secret_access_key, format, structure, compression_method",
+        getName());
+
+    if (args.size() < 4 || args.size() > 7)
+        throw Exception(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    for (auto & arg : args)
+        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
+
+    /// This arguments are always the first
+    cluster_name = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+    filename = args[1]->as<ASTLiteral &>().value.safeGet<String>();
+
+    /// Size -> argument indexes
+    static auto size_to_args = std::map<size_t, std::map<String, size_t>>
+    {
+        {4, {{"format", 2}, {"structure", 3}}},
+        {5, {{"format", 2}, {"structure", 3}, {"compression_method", 4}}},
+        {6, {{"access_key_id", 2}, {"secret_access_key", 3}, {"format", 4}, {"structure", 5}}},
+        {7, {{"access_key_id", 2}, {"secret_access_key", 3}, {"format", 4}, {"structure", 5}, {"compression_method", 6}}}
+    };
+
+    auto & args_to_idx = size_to_args[args.size()];
+
+    if (args_to_idx.contains("format"))
+        format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+    if (args_to_idx.contains("structure"))
+        structure = args[args_to_idx["structure"]]->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>();
+
+    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("secret_access_key"))
+        secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
+}
+
+
+ColumnsDescription TableFunctionS3Cluster::getActualTableStructure(ContextPtr context) const
+{
+    return parseColumnsListFromString(structure, context);
+}
+
+StoragePtr TableFunctionS3Cluster::executeImpl(
+    const ASTPtr & /*function*/, ContextPtr context,
+    const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+{
+    StoragePtr storage;
+    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY)
+    {
+        /// On worker node this filename won't contains globs
+        Poco::URI uri (filename);
+        S3::URI s3_uri (uri);
+        /// Actually this parameters are not used
+        UInt64 s3_max_single_read_retries = context->getSettingsRef().s3_max_single_read_retries;
+        UInt64 min_upload_part_size = context->getSettingsRef().s3_min_upload_part_size;
+        UInt64 max_single_part_upload_size = context->getSettingsRef().s3_max_single_part_upload_size;
+        UInt64 max_connections = context->getSettingsRef().s3_max_connections;
+        storage = StorageS3::create(
+            s3_uri,
+            access_key_id,
+            secret_access_key,
+            StorageID(getDatabaseName(), table_name),
+            format,
+            s3_max_single_read_retries,
+            min_upload_part_size,
+            max_single_part_upload_size,
+            max_connections,
+            getActualTableStructure(context),
+            ConstraintsDescription{},
+            String{},
+            context,
+            compression_method,
+            /*distributed_processing=*/true);
+    }
+    else
+    {
+        storage = StorageS3Cluster::create(
+            filename, access_key_id, secret_access_key, StorageID(getDatabaseName(), table_name),
+            cluster_name, format, context->getSettingsRef().s3_max_connections,
+            getActualTableStructure(context), ConstraintsDescription{},
+            context, compression_method);
+    }
+
+    storage->startup();
+
+    return storage;
+}
+
+
+void registerTableFunctionS3Cluster(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionS3Cluster>();
+}
+
+
+}
+
+#endif
diff --git a/src/TableFunctions/TableFunctionS3Cluster.h b/src/TableFunctions/TableFunctionS3Cluster.h
new file mode 100644
index 00000000000..cc857725ce6
--- /dev/null
+++ b/src/TableFunctions/TableFunctionS3Cluster.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <Common/config.h>
+
+#if USE_AWS_S3
+
+#include <TableFunctions/ITableFunction.h>
+
+
+namespace DB
+{
+
+class Context;
+
+/**
+ * s3Cluster(cluster_name, source, [access_key_id, secret_access_key,] format, structure)
+ * A table function, which allows to process many files from S3 on a specific cluster
+ * On initiator it creates a connection to _all_ nodes in cluster, discloses asterics
+ * in S3 file path and dispatch each file dynamically.
+ * On worker node it asks initiator about next task to process, processes it.
+ * This is repeated until the tasks are finished.
+ */
+class TableFunctionS3Cluster : public ITableFunction
+{
+public:
+    static constexpr auto name = "s3Cluster";
+    std::string getName() const override
+    {
+        return name;
+    }
+    bool hasStaticStructure() const override { return true; }
+
+protected:
+    StoragePtr executeImpl(
+        const ASTPtr & ast_function,
+        ContextPtr context,
+        const std::string & table_name,
+        ColumnsDescription cached_columns) const override;
+
+    const char * getStorageTypeName() const override { return "S3Cluster"; }
+
+    ColumnsDescription getActualTableStructure(ContextPtr) const override;
+    void parseArguments(const ASTPtr &, ContextPtr) override;
+
+    String cluster_name;
+    String filename;
+    String format;
+    String structure;
+    String access_key_id;
+    String secret_access_key;
+    String compression_method = "auto";
+};
+
+}
+
+#endif
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index 1c0109e892b..a1fe142bea6 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -7,18 +7,42 @@
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageURL.h>
 #include <TableFunctions/TableFunctionFactory.h>
+#include <Storages/StorageExternalDistributed.h>
 
 
 namespace DB
 {
 StoragePtr TableFunctionURL::getStorage(
-    const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+    const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
     const std::string & table_name, const String & compression_method_) const
 {
-    Poco::URI uri(source);
-    return StorageURL::create(uri, StorageID(getDatabaseName(), table_name),
-        format_, std::nullopt /*format settings*/, columns,
-        ConstraintsDescription{}, global_context, compression_method_);
+    /// If url contains {1..k} or failover options with separator `|`, use a separate storage
+    if ((source.find('{') == std::string::npos || source.find('}') == std::string::npos) && source.find('|') == std::string::npos)
+    {
+        Poco::URI uri(source);
+        return StorageURL::create(
+            uri,
+            StorageID(getDatabaseName(), table_name),
+            format_,
+            std::nullopt /*format settings*/,
+            columns,
+            ConstraintsDescription{},
+            String{},
+            global_context,
+            compression_method_);
+    }
+    else
+    {
+        return StorageExternalDistributed::create(
+            source,
+            StorageID(getDatabaseName(), table_name),
+            format_,
+            std::nullopt,
+            compression_method_,
+            columns,
+            ConstraintsDescription{},
+            global_context);
+    }
 }
 
 void registerTableFunctionURL(TableFunctionFactory & factory)
diff --git a/src/TableFunctions/TableFunctionURL.h b/src/TableFunctions/TableFunctionURL.h
index 5eb027e2b8a..fde361e8bbb 100644
--- a/src/TableFunctions/TableFunctionURL.h
+++ b/src/TableFunctions/TableFunctionURL.h
@@ -21,7 +21,7 @@ public:
 
 private:
     StoragePtr getStorage(
-        const String & source, const String & format_, const ColumnsDescription & columns, Context & global_context,
+        const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
         const std::string & table_name, const String & compression_method_) const override;
     const char * getStorageTypeName() const override { return "URL"; }
 };
diff --git a/src/TableFunctions/TableFunctionValues.cpp b/src/TableFunctions/TableFunctionValues.cpp
index 4127a30892f..c66ebe7322e 100644
--- a/src/TableFunctions/TableFunctionValues.cpp
+++ b/src/TableFunctions/TableFunctionValues.cpp
@@ -30,7 +30,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args, const Block & sample_block, const Context & context)
+static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args, const Block & sample_block, ContextPtr context)
 {
     if (res_columns.size() == 1) /// Parsing arguments as Fields
     {
@@ -68,7 +68,7 @@ static void parseAndInsertValues(MutableColumns & res_columns, const ASTs & args
     }
 }
 
-void TableFunctionValues::parseArguments(const ASTPtr & ast_function, const Context & /*context*/)
+void TableFunctionValues::parseArguments(const ASTPtr & ast_function, ContextPtr /*context*/)
 {
     ASTs & args_func = ast_function->children;
 
@@ -93,12 +93,12 @@ void TableFunctionValues::parseArguments(const ASTPtr & ast_function, const Cont
     structure = args[0]->as<ASTLiteral &>().value.safeGet<String>();
 }
 
-ColumnsDescription TableFunctionValues::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionValues::getActualTableStructure(ContextPtr context) const
 {
     return parseColumnsListFromString(structure, context);
 }
 
-StoragePtr TableFunctionValues::executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionValues::executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
 
diff --git a/src/TableFunctions/TableFunctionValues.h b/src/TableFunctions/TableFunctionValues.h
index 549fa2de507..058f5f1d2ed 100644
--- a/src/TableFunctions/TableFunctionValues.h
+++ b/src/TableFunctions/TableFunctionValues.h
@@ -14,11 +14,11 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "Values"; }
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
     String structure;
 };
diff --git a/src/TableFunctions/TableFunctionView.cpp b/src/TableFunctions/TableFunctionView.cpp
index 62a833dabc4..8ca061c43d5 100644
--- a/src/TableFunctions/TableFunctionView.cpp
+++ b/src/TableFunctions/TableFunctionView.cpp
@@ -15,7 +15,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-void TableFunctionView::parseArguments(const ASTPtr & ast_function, const Context & /*context*/)
+void TableFunctionView::parseArguments(const ASTPtr & ast_function, ContextPtr /*context*/)
 {
     const auto * function = ast_function->as<ASTFunction>();
     if (function)
@@ -29,7 +29,7 @@ void TableFunctionView::parseArguments(const ASTPtr & ast_function, const Contex
     throw Exception("Table function '" + getName() + "' requires a query argument.", ErrorCodes::BAD_ARGUMENTS);
 }
 
-ColumnsDescription TableFunctionView::getActualTableStructure(const Context & context) const
+ColumnsDescription TableFunctionView::getActualTableStructure(ContextPtr context) const
 {
     assert(create.select);
     assert(create.children.size() == 1);
@@ -39,10 +39,10 @@ ColumnsDescription TableFunctionView::getActualTableStructure(const Context & co
 }
 
 StoragePtr TableFunctionView::executeImpl(
-    const ASTPtr & /*ast_function*/, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+    const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     auto columns = getActualTableStructure(context);
-    auto res = StorageView::create(StorageID(getDatabaseName(), table_name), create, columns);
+    auto res = StorageView::create(StorageID(getDatabaseName(), table_name), create, columns, String{});
     res->startup();
     return res;
 }
diff --git a/src/TableFunctions/TableFunctionView.h b/src/TableFunctions/TableFunctionView.h
index 0ed66ff712c..9ef634746eb 100644
--- a/src/TableFunctions/TableFunctionView.h
+++ b/src/TableFunctions/TableFunctionView.h
@@ -17,11 +17,11 @@ public:
     static constexpr auto name = "view";
     std::string getName() const override { return name; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const String & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const String & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "View"; }
 
-    void parseArguments(const ASTPtr & ast_function, const Context & context) override;
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
     ASTCreateQuery create;
 };
diff --git a/src/TableFunctions/TableFunctionZeros.cpp b/src/TableFunctions/TableFunctionZeros.cpp
index 9b0c6c6e78b..9fd14eec4af 100644
--- a/src/TableFunctions/TableFunctionZeros.cpp
+++ b/src/TableFunctions/TableFunctionZeros.cpp
@@ -20,14 +20,14 @@ extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 
 
 template <bool multithreaded>
-ColumnsDescription TableFunctionZeros<multithreaded>::getActualTableStructure(const Context & /*context*/) const
+ColumnsDescription TableFunctionZeros<multithreaded>::getActualTableStructure(ContextPtr /*context*/) const
 {
     /// NOTE: https://bugs.llvm.org/show_bug.cgi?id=47418
     return ColumnsDescription{{{"zero", std::make_shared<DataTypeUInt8>()}}};
 }
 
 template <bool multithreaded>
-StoragePtr TableFunctionZeros<multithreaded>::executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+StoragePtr TableFunctionZeros<multithreaded>::executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
     if (const auto * function = ast_function->as<ASTFunction>())
     {
@@ -53,7 +53,7 @@ void registerTableFunctionZeros(TableFunctionFactory & factory)
 }
 
 template <bool multithreaded>
-UInt64 TableFunctionZeros<multithreaded>::evaluateArgument(const Context & context, ASTPtr & argument) const
+UInt64 TableFunctionZeros<multithreaded>::evaluateArgument(ContextPtr context, ASTPtr & argument) const
 {
     return evaluateConstantExpressionOrIdentifierAsLiteral(argument, context)->as<ASTLiteral &>().value.safeGet<UInt64>();
 }
diff --git a/src/TableFunctions/TableFunctionZeros.h b/src/TableFunctions/TableFunctionZeros.h
index 48a2d8019f6..0407eff2f78 100644
--- a/src/TableFunctions/TableFunctionZeros.h
+++ b/src/TableFunctions/TableFunctionZeros.h
@@ -19,12 +19,12 @@ public:
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, const Context & context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
     const char * getStorageTypeName() const override { return "SystemZeros"; }
 
-    UInt64 evaluateArgument(const Context & context, ASTPtr & argument) const;
+    UInt64 evaluateArgument(ContextPtr context, ASTPtr & argument) const;
 
-    ColumnsDescription getActualTableStructure(const Context & context) const override;
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 };
 
 
diff --git a/src/TableFunctions/parseColumnsListForTableFunction.cpp b/src/TableFunctions/parseColumnsListForTableFunction.cpp
index 5221d96e086..08e80ef425a 100644
--- a/src/TableFunctions/parseColumnsListForTableFunction.cpp
+++ b/src/TableFunctions/parseColumnsListForTableFunction.cpp
@@ -14,10 +14,10 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-ColumnsDescription parseColumnsListFromString(const std::string & structure, const Context & context)
+ColumnsDescription parseColumnsListFromString(const std::string & structure, ContextPtr context)
 {
     ParserColumnDeclarationList parser;
-    const Settings & settings = context.getSettingsRef();
+    const Settings & settings = context->getSettingsRef();
 
     ASTPtr columns_list_raw = parseQuery(parser, structure, "columns declaration list", settings.max_query_size, settings.max_parser_depth);
 
@@ -25,7 +25,7 @@ ColumnsDescription parseColumnsListFromString(const std::string & structure, con
     if (!columns_list)
         throw Exception("Could not cast AST to ASTExpressionList", ErrorCodes::LOGICAL_ERROR);
 
-    return InterpreterCreateQuery::getColumnsDescription(*columns_list, context, !settings.allow_suspicious_codecs);
+    return InterpreterCreateQuery::getColumnsDescription(*columns_list, context, false);
 }
 
 }
diff --git a/src/TableFunctions/parseColumnsListForTableFunction.h b/src/TableFunctions/parseColumnsListForTableFunction.h
index d077d308e37..e0130a2618d 100644
--- a/src/TableFunctions/parseColumnsListForTableFunction.h
+++ b/src/TableFunctions/parseColumnsListForTableFunction.h
@@ -10,6 +10,6 @@ namespace DB
 class Context;
 
 /// Parses a common argument for table functions such as table structure given in string
-ColumnsDescription parseColumnsListFromString(const std::string & structure, const Context & context);
+ColumnsDescription parseColumnsListFromString(const std::string & structure, ContextPtr context);
 
 }
diff --git a/src/TableFunctions/registerTableFunctions.cpp b/src/TableFunctions/registerTableFunctions.cpp
index 2e55c16d815..6cf40c4f090 100644
--- a/src/TableFunctions/registerTableFunctions.cpp
+++ b/src/TableFunctions/registerTableFunctions.cpp
@@ -21,6 +21,7 @@ void registerTableFunctions()
 
 #if USE_AWS_S3
     registerTableFunctionS3(factory);
+    registerTableFunctionS3Cluster(factory);
     registerTableFunctionCOS(factory);
 #endif
 
diff --git a/src/TableFunctions/registerTableFunctions.h b/src/TableFunctions/registerTableFunctions.h
index 2654ab2afc2..c49fafc5f86 100644
--- a/src/TableFunctions/registerTableFunctions.h
+++ b/src/TableFunctions/registerTableFunctions.h
@@ -21,6 +21,7 @@ void registerTableFunctionGenerate(TableFunctionFactory & factory);
 
 #if USE_AWS_S3
 void registerTableFunctionS3(TableFunctionFactory & factory);
+void registerTableFunctionS3Cluster(TableFunctionFactory & factory);
 void registerTableFunctionCOS(TableFunctionFactory & factory);
 #endif
 
diff --git a/src/TableFunctions/ya.make.in b/src/TableFunctions/ya.make.in
index 0d5aa172cb4..6f351b3f646 100644
--- a/src/TableFunctions/ya.make.in
+++ b/src/TableFunctions/ya.make.in
@@ -8,7 +8,7 @@ PEERDIR(
 
 
 SRCS(
-<? find . -name '*.cpp' | grep -v -P 'S3|HDFS|PostgreSQL' | sed 's/^\.\//    /' | sort ?>
+<? 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
index 5361c8a5695..6537f67d66f 100644
--- a/src/ya.make
+++ b/src/ya.make
@@ -5,6 +5,7 @@ LIBRARY()
 PEERDIR(
     clickhouse/src/Access
     clickhouse/src/AggregateFunctions
+    clickhouse/src/Bridge
     clickhouse/src/Client
     clickhouse/src/Columns
     clickhouse/src/Common
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index 0e467319285..54f4e19bd94 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -71,16 +71,6 @@
             "tidy": "disable",
             "with_coverage": false
         },
-        {
-            "compiler": "clang-10",
-            "build-type": "",
-            "sanitizer": "",
-            "package-type": "deb",
-            "bundled": "bundled",
-            "splitted": "unsplitted",
-            "tidy": "disable",
-            "with_coverage": false
-        },
         {
             "compiler": "clang-11",
             "build-type": "debug",
@@ -92,7 +82,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-9",
+            "compiler": "gcc-10",
             "build-type": "",
             "sanitizer": "",
             "package-type": "deb",
@@ -359,7 +349,7 @@
         },
         "Functional stateless tests (unbundled)": {
             "required_build_properties": {
-                "compiler": "gcc-9",
+                "compiler": "gcc-10",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index a44f7972397..177d28ce965 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -4,8 +4,10 @@ import shutil
 import sys
 import os
 import os.path
+import signal
 import re
 import json
+import copy
 import traceback
 
 from argparse import ArgumentParser
@@ -30,11 +32,26 @@ from contextlib import closing
 
 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",
     "Operation timed out",
     "ConnectionPoolWithFailover: Connection failed at try",
+    "DB::Exception: New table appeared in database being dropped or detached. Try again"
 ]
 
+class Terminated(KeyboardInterrupt):
+    pass
+def signal_handler(sig, frame):
+    raise Terminated(f'Terminated with {sig} signal')
+
+def stop_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):
     """
@@ -113,12 +130,14 @@ def get_db_engine(args, database_name):
         return " ENGINE=" + args.db_engine
     return ""   # Will use default engine
 
-def run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file, suite_tmp_dir):
-    # print(client_options)
+def configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file):
+    testcase_args = copy.deepcopy(args)
 
-    start_time = datetime.now()
-    if args.database:
-        database = args.database
+    testcase_args.testcase_start_time = datetime.now()
+    testcase_args.testcase_client = f"{testcase_args.client} --log_comment='{case_file}'"
+
+    if testcase_args.database:
+        database = testcase_args.database
         os.environ.setdefault("CLICKHOUSE_DATABASE", database)
         os.environ.setdefault("CLICKHOUSE_TMP", suite_tmp_dir)
 
@@ -130,26 +149,36 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
             return ''.join(random.choice(alphabet) for _ in range(length))
         database = 'test_{suffix}'.format(suffix=random_str())
 
-        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
-        try:
-            clickhouse_proc_create.communicate(("CREATE DATABASE " + database + get_db_engine(args, database)), timeout=args.timeout)
-        except TimeoutExpired:
-            total_time = (datetime.now() - start_time).total_seconds()
-            return clickhouse_proc_create, "", "Timeout creating database {} before test".format(database), total_time
+        with open(stderr_file, 'w') as stderr:
+            clickhouse_proc_create = Popen(shlex.split(testcase_args.testcase_client), 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.
-        test_tmp_dir = os.path.join(suite_tmp_dir, database)
-        os.mkdir(test_tmp_dir)
-        os.environ.setdefault("CLICKHOUSE_TMP", test_tmp_dir)
+        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.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': args.client + ' --database=' + database,
+        'client': client + ' --database=' + database,
         'logs_level': server_logs_level,
         'options': client_options,
         'test': case_file,
@@ -157,15 +186,18 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
         'stderr': stderr_file,
     }
 
-    pattern = '{test} > {stdout} 2> {stderr}'
+    # >> 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} --log_comment='{test}' < " + pattern
+        pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} < " + pattern
 
     command = pattern.format(**params)
 
-    # print(command)
-
     proc = Popen(command, shell=True, env=os.environ)
 
     while (datetime.now() - start_time).total_seconds() < args.timeout and proc.poll() is None:
@@ -177,7 +209,8 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
         need_drop_database = not maybe_passed
 
     if need_drop_database:
-        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
+        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
@@ -196,7 +229,7 @@ def run_single_test(args, ext, server_logs_level, client_options, case_file, std
             total_time = (datetime.now() - start_time).total_seconds()
             return clickhouse_proc_create, "", "Timeout dropping database {} after test".format(database), total_time
 
-        shutil.rmtree(test_tmp_dir)
+        shutil.rmtree(args.test_tmp_dir)
 
     total_time = (datetime.now() - start_time).total_seconds()
 
@@ -283,11 +316,12 @@ def colored(text, args, color=None, on_color=None, attrs=None):
 SERVER_DIED = False
 exit_code = 0
 stop_time = None
+queue = multiprocessing.Queue(maxsize=1)
 
 
 # def run_tests_array(all_tests, suite, suite_dir, suite_tmp_dir, run_total):
 def run_tests_array(all_tests_with_params):
-    all_tests, suite, suite_dir, suite_tmp_dir = all_tests_with_params
+    all_tests, num_tests, suite, suite_dir, suite_tmp_dir = all_tests_with_params
     global exit_code
     global SERVER_DIED
     global stop_time
@@ -317,15 +351,28 @@ def run_tests_array(all_tests_with_params):
         else:
             return ''
 
-    if all_tests:
-        print(f"\nRunning {len(all_tests)} {suite} tests ({multiprocessing.current_process().name}).\n")
+    if num_tests > 0:
+        about = 'about ' if is_concurrent else ''
+        print(f"\nRunning {about}{num_tests} {suite} tests ({multiprocessing.current_process().name}).\n")
+
+    while True:
+        if is_concurrent:
+            case = queue.get()
+            if not case:
+                break
+        else:
+            if all_tests:
+                case = all_tests.pop(0)
+            else:
+                break
 
-    for case in all_tests:
         if SERVER_DIED:
+            stop_tests()
             break
 
         if stop_time and time() > stop_time:
             print("\nStop tests run because global time limit is exceeded.\n")
+            stop_tests()
             break
 
         case_file = os.path.join(suite_dir, case)
@@ -382,6 +429,7 @@ def run_tests_array(all_tests_with_params):
                             failures += 1
                             print("Server does not respond to health check")
                             SERVER_DIED = True
+                            stop_tests()
                             break
 
                     file_suffix = ('.' + str(os.getpid())) if is_concurrent and args.test_runs > 1 else ''
@@ -389,7 +437,9 @@ def run_tests_array(all_tests_with_params):
                     stdout_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stdout'
                     stderr_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stderr'
 
-                    proc, stdout, stderr, total_time = run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file, suite_tmp_dir)
+
+                    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:
@@ -404,10 +454,12 @@ def run_tests_array(all_tests_with_params):
                         status += " - Timeout!\n"
                         if stderr:
                             status += stderr
+                        status += 'Database: ' + testcase_args.testcase_database
                     else:
                         counter = 1
-                        while proc.returncode != 0 and need_retry(stderr):
-                            proc, stdout, stderr, total_time = run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file, suite_tmp_dir)
+                        while need_retry(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 counter > 6:
@@ -427,7 +479,7 @@ def run_tests_array(all_tests_with_params):
                             if ' <Fatal> ' in stderr:
                                 SERVER_DIED = True
 
-                            if args.stop and ('Connection refused' in stderr or 'Attempt to read after eof' in stderr) and not 'Received exception from server' in stderr:
+                            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 = True
 
                             if os.path.isfile(stdout_file):
@@ -436,6 +488,8 @@ def run_tests_array(all_tests_with_params):
                                     open(stdout_file).read().split('\n')[:100])
                                 status += '\n'
 
+                            status += 'Database: ' + testcase_args.testcase_database
+
                         elif stderr:
                             failures += 1
                             failures_chain += 1
@@ -443,6 +497,7 @@ def run_tests_array(all_tests_with_params):
                             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
@@ -450,27 +505,31 @@ def run_tests_array(all_tests_with_params):
                             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 not os.path.isfile(reference_file):
                             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(args.unified), reference_file, stdout_file], stdout=PIPE, universal_newlines=True).communicate()[0]
+                                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 args.test_runs > 1 and total_time > 30 and 'long' not in name:
+                                if testcase_args.test_runs > 1 and total_time > 30 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 (> 30s). Make it faster."
+                                    status += " - Test runs too long (> 30s). Make it faster.\n"
+                                    status += 'Database: ' + testcase_args.testcase_database
                                 else:
                                     passed_total += 1
                                     failures_chain = 0
@@ -489,6 +548,7 @@ def run_tests_array(all_tests_with_params):
             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()
@@ -496,6 +556,7 @@ def run_tests_array(all_tests_with_params):
             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
@@ -630,6 +691,47 @@ def collect_build_flags(client):
     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")
+        run_n, run_total = parallel.split('/')
+        run_n = float(run_n)
+        run_total = float(run_total)
+        tests_n = len(parallel_tests)
+        if run_total > tests_n:
+            run_total = tests_n
+
+        if jobs > tests_n:
+            jobs = tests_n
+        if jobs > run_total:
+            run_total = jobs
+
+        batch_size = max(1, len(parallel_tests) // jobs)
+        parallel_tests_array = []
+        for _ in range(jobs):
+            parallel_tests_array.append((None, batch_size, suite, suite_dir, suite_tmp_dir))
+
+        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 _ in range(jobs):
+                queue.put(None)
+
+            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)
+    else:
+        num_tests = len(all_tests)
+        run_tests_array((all_tests, num_tests, suite, suite_dir, suite_tmp_dir))
+        return num_tests
+
+
 def main(args):
     global SERVER_DIED
     global stop_time
@@ -704,10 +806,10 @@ def main(args):
             args.shard = False
 
     if args.database and args.database != "test":
-        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
+        clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=None, universal_newlines=True)
         clickhouse_proc_create.communicate(("CREATE DATABASE IF NOT EXISTS " + args.database + get_db_engine(args, args.database)))
 
-    clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
+    clickhouse_proc_create = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=None, universal_newlines=True)
     clickhouse_proc_create.communicate(("CREATE DATABASE IF NOT EXISTS test" + get_db_engine(args, 'test')))
 
     def is_test_from_dir(suite_dir, case):
@@ -780,7 +882,7 @@ def main(args):
             all_tests = os.listdir(suite_dir)
             all_tests = [case for case in all_tests if is_test_from_dir(suite_dir, case)]
             if args.test:
-                all_tests = [t for t in all_tests if any([re.search(r, t) for r in args.test])]
+                all_tests = [t for t in all_tests if any(re.search(r, t) for r in args.test)]
             all_tests = all_tests * args.test_runs
             all_tests.sort(key=key_func)
 
@@ -793,34 +895,8 @@ def main(args):
                 else:
                     parallel_tests.append(test)
 
-            if jobs > 1 and len(parallel_tests) > 0:
-                print("Found", len(parallel_tests), "parallel tests and", len(sequential_tests), "sequential tests")
-                run_n, run_total = args.parallel.split('/')
-                run_n = float(run_n)
-                run_total = float(run_total)
-                tests_n = len(parallel_tests)
-                if run_total > tests_n:
-                    run_total = tests_n
-
-                if jobs > tests_n:
-                    jobs = tests_n
-                if jobs > run_total:
-                    run_total = jobs
-
-                # Create two batches per process for more uniform execution time.
-                batch_size = max(1, len(parallel_tests) // (jobs * 2))
-                parallel_tests_array = []
-                for i in range(0, len(parallel_tests), batch_size):
-                    parallel_tests_array.append((parallel_tests[i:i+batch_size], suite, suite_dir, suite_tmp_dir))
-
-                with closing(multiprocessing.Pool(processes=jobs)) as pool:
-                    pool.map(run_tests_array, parallel_tests_array)
-
-                run_tests_array((sequential_tests, suite, suite_dir, suite_tmp_dir))
-                total_tests_run += len(sequential_tests) + len(parallel_tests)
-            else:
-                run_tests_array((all_tests, suite, suite_dir, suite_tmp_dir))
-                total_tests_run += len(all_tests)
+            total_tests_run += do_run_tests(
+                jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, args.parallel)
 
     if args.hung_check:
 
@@ -936,6 +1012,14 @@ def collect_sequential_list(skip_list_path):
 
 
 if __name__ == '__main__':
+    # 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)
+    os.setpgid(0, 0)
+    signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGHUP, signal_handler)
+
     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')
diff --git a/tests/config/config.d/clusters.xml b/tests/config/config.d/clusters.xml
index 86dba46e07a..28d3ae03745 100644
--- a/tests/config/config.d/clusters.xml
+++ b/tests/config/config.d/clusters.xml
@@ -15,18 +15,32 @@
                      <port>9000</port>
                  </replica>
              </shard>
-         </test_cluster_two_shards_different_databases>
-	    <test_cluster_one_shard_two_replicas>
-           <shard>
-               <replica>
-                   <host>127.0.0.1</host>
-                   <port>9000</port>
-               </replica>
-               <replica>
-                   <host>127.0.0.2</host>
-                   <port>9000</port>
-               </replica>
-           </shard>
+        </test_cluster_two_shards_different_databases>
+        <test_cluster_one_shard_two_replicas>
+             <shard>
+                 <replica>
+                     <host>127.0.0.1</host>
+                     <port>9000</port>
+                 </replica>
+                 <replica>
+                     <host>127.0.0.2</host>
+                     <port>9000</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>9000</port>
+                 </replica>
+                 <replica>
+                     <default_database>shard_1</default_database>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+        </test_cluster_two_replicas_different_databases>
     </remote_servers>
 </yandex>
diff --git a/tests/config/config.d/database_replicated.xml b/tests/config/config.d/database_replicated.xml
index c2e62f9645a..9a3b4d68ea6 100644
--- a/tests/config/config.d/database_replicated.xml
+++ b/tests/config/config.d/database_replicated.xml
@@ -19,13 +19,15 @@
         <server_id>1</server_id>
 
         <coordination_settings>
-            <operation_timeout_ms>5000</operation_timeout_ms>
-            <session_timeout_ms>10000</session_timeout_ms>
+            <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>
             <force_sync>false</force_sync>
+            <!-- we want all logs for complex problems investigation -->
+            <reserved_log_items>1000000000000000</reserved_log_items>
         </coordination_settings>
 
         <raft_configuration>
diff --git a/tests/config/config.d/keeper_port.xml b/tests/config/config.d/keeper_port.xml
index c41040f1613..b21df47bc85 100644
--- a/tests/config/config.d/keeper_port.xml
+++ b/tests/config/config.d/keeper_port.xml
@@ -8,6 +8,8 @@
             <session_timeout_ms>30000</session_timeout_ms>
             <force_sync>false</force_sync>
             <startup_timeout>60000</startup_timeout>
+            <!-- we want all logs for complex problems investigation -->
+            <reserved_log_items>1000000000000000</reserved_log_items>
         </coordination_settings>
 
         <raft_configuration>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 9c4f8caca07..7e01860e241 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -71,8 +71,8 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
 
     # There is a bug in config reloading, so we cannot override macros using --macros.replica r2
     # And we have to copy configs...
-    mkdir /etc/clickhouse-server1
-    mkdir /etc/clickhouse-server2
+    mkdir -p /etc/clickhouse-server1
+    mkdir -p /etc/clickhouse-server2
     chown clickhouse /etc/clickhouse-server1
     chown clickhouse /etc/clickhouse-server2
     chgrp clickhouse /etc/clickhouse-server1
@@ -84,8 +84,8 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<replica>r1</replica>|<replica>r2</replica>|" > /etc/clickhouse-server1/config.d/macros.xml
     sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<shard>s1</shard>|<shard>s2</shard>|" > /etc/clickhouse-server2/config.d/macros.xml
 
-    sudo mkdir /var/lib/clickhouse1
-    sudo mkdir /var/lib/clickhouse2
+    sudo mkdir -p /var/lib/clickhouse1
+    sudo mkdir -p /var/lib/clickhouse2
     sudo chown clickhouse /var/lib/clickhouse1
     sudo chown clickhouse /var/lib/clickhouse2
     sudo chgrp clickhouse /var/lib/clickhouse1
diff --git a/tests/executable_pool_dictionary.xml b/tests/executable_pool_dictionary.xml
new file mode 120000
index 00000000000..83f18b95f20
--- /dev/null
+++ b/tests/executable_pool_dictionary.xml
@@ -0,0 +1 @@
+config/executable_pool_dictionary.xml
\ No newline at end of file
diff --git a/tests/fuzz/ast.dict b/tests/fuzz/ast.dict
index 8327f276b31..7befb36c840 100644
--- a/tests/fuzz/ast.dict
+++ b/tests/fuzz/ast.dict
@@ -156,6 +156,7 @@
 "extractURLParameterNames"
 "extractURLParameters"
 "FETCH PARTITION"
+"FETCH PART"
 "FINAL"
 "FIRST"
 "firstSignificantSubdomain"
diff --git a/tests/integration/README.md b/tests/integration/README.md
index e4073f96449..cc504f01f82 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -52,11 +52,10 @@ To check, that you have access to Docker, run `docker ps`.
 Run the tests with the `pytest` command. To select which tests to run, use: `pytest -k <test_name_pattern>`
 
 By default tests are run with system-wide client binary, server binary and base configs. To change that,
-set the following environment variables:`
+set the following environment variables:
 * `CLICKHOUSE_TESTS_SERVER_BIN_PATH` to choose the server binary.
 * `CLICKHOUSE_TESTS_CLIENT_BIN_PATH` to choose the client binary.
-* `CLICKHOUSE_TESTS_BASE_CONFIG_DIR` to choose the directory from which base configs (`config.xml` and
-  `users.xml`) are taken.
+* `CLICKHOUSE_TESTS_BASE_CONFIG_DIR` to choose the directory from which base configs (`config.xml` and`users.xml`) are taken.
 
 For tests that use common docker compose files you may need to set up their path with environment variable: `DOCKER_COMPOSE_DIR=$HOME/ClickHouse/docker/test/integration/runner/compose`
 
@@ -147,3 +146,11 @@ sudo service docker stop
 sudo bash -c 'rm -rf /var/lib/docker/*'
 sudo service docker start
 ```
+
+#### `iptables-nft`
+
+On Ubuntu 20.10 and later in host network mode (default) one may encounter problem with nested containers not seeing each other. It happens because legacy and nftables rules are out of sync. Problem can be solved by:
+
+```
+sudo iptables -P FORWARD ACCEPT
+```
diff --git a/tests/integration/ci-runner.py b/tests/integration/ci-runner.py
index 9215cc56a50..a21f3d344ba 100755
--- a/tests/integration/ci-runner.py
+++ b/tests/integration/ci-runner.py
@@ -15,6 +15,7 @@ MAX_RETRY = 2
 SLEEP_BETWEEN_RETRIES = 5
 CLICKHOUSE_BINARY_PATH = "/usr/bin/clickhouse"
 CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH = "/usr/bin/clickhouse-odbc-bridge"
+CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH = "/usr/bin/clickhouse-library-bridge"
 
 TRIES_COUNT = 10
 MAX_TIME_SECONDS = 3600
@@ -238,10 +239,13 @@ class ClickhouseIntegrationTestsRunner:
         logging.info("All packages installed")
         os.chmod(CLICKHOUSE_BINARY_PATH, 0o777)
         os.chmod(CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH, 0o777)
+        os.chmod(CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH, 0o777)
         result_path_bin = os.path.join(str(self.base_path()), "clickhouse")
-        result_path_bridge = os.path.join(str(self.base_path()), "clickhouse-odbc-bridge")
+        result_path_odbc_bridge = os.path.join(str(self.base_path()), "clickhouse-odbc-bridge")
+        result_path_library_bridge = os.path.join(str(self.base_path()), "clickhouse-library-bridge")
         shutil.copy(CLICKHOUSE_BINARY_PATH, result_path_bin)
-        shutil.copy(CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH, result_path_bridge)
+        shutil.copy(CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH, result_path_odbc_bridge)
+        shutil.copy(CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH, result_path_library_bridge)
         return None, None
 
     def _compress_logs(self, path, result_path):
@@ -330,12 +334,11 @@ class ClickhouseIntegrationTestsRunner:
                 logging.info("Task timeout exceeded, skipping %s", test)
                 counters["SKIPPED"].append(test)
                 tests_times[test] = 0
-            log_name = None
-            log_path = None
-            return counters, tests_times, log_name, log_path
+            return counters, tests_times, []
 
         image_cmd = self._get_runner_image_cmd(repo_path)
         test_group_str = test_group.replace('/', '_').replace('.', '_')
+        log_paths = []
 
         for i in range(num_tries):
             logging.info("Running test group %s for the %s retry", test_group, i)
@@ -344,6 +347,7 @@ class ClickhouseIntegrationTestsRunner:
             output_path = os.path.join(str(self.path()), "test_output_" + test_group_str + "_" + str(i) + ".log")
             log_name = "integration_run_" + test_group_str + "_" + str(i) + ".txt"
             log_path = os.path.join(str(self.path()), log_name)
+            log_paths.append(log_path)
             logging.info("Will wait output inside %s", output_path)
 
             test_names = set([])
@@ -386,7 +390,7 @@ class ClickhouseIntegrationTestsRunner:
                 if test not in counters["PASSED"] and test not in counters["ERROR"] and test not in counters["FAILED"]:
                     counters["ERROR"].append(test)
 
-        return counters, tests_times, log_name, log_path
+        return counters, tests_times, log_paths
 
     def run_flaky_check(self, repo_path, build_path):
         pr_info = self.params['pr_info']
@@ -404,12 +408,12 @@ class ClickhouseIntegrationTestsRunner:
         start = time.time()
         logging.info("Starting check with retries")
         final_retry = 0
-        log_paths = []
+        logs = []
         for i in range(TRIES_COUNT):
             final_retry += 1
             logging.info("Running tests for the %s time", i)
-            counters, tests_times, _, log_path = self.run_test_group(repo_path, "flaky", tests_to_run, 1)
-            log_paths.append(log_path)
+            counters, tests_times, log_paths = self.run_test_group(repo_path, "flaky", tests_to_run, 1)
+            logs += log_paths
             if counters["FAILED"]:
                 logging.info("Found failed tests: %s", ' '.join(counters["FAILED"]))
                 description_prefix = "Flaky tests found: "
@@ -431,7 +435,7 @@ class ClickhouseIntegrationTestsRunner:
             time.sleep(5)
 
         logging.info("Finally all tests done, going to compress test dir")
-        test_logs = os.path.join(str(self.path()), "./test_dir.tar")
+        test_logs = os.path.join(str(self.path()), "./test_dir.tar.gz")
         self._compress_logs("{}/tests/integration".format(repo_path), test_logs)
         logging.info("Compression finished")
 
@@ -446,7 +450,7 @@ class ClickhouseIntegrationTestsRunner:
             test_result += [(c + ' (✕' + str(final_retry) + ')', text_state, "{:.2f}".format(tests_times[c])) for c in counters[state]]
         status_text = description_prefix + ', '.join([str(n).lower().replace('failed', 'fail') + ': ' + str(len(c)) for n, c in counters.items()])
 
-        return result_state, status_text, test_result, [test_logs] + log_paths
+        return result_state, status_text, test_result, [test_logs] + logs
 
     def run_impl(self, repo_path, build_path):
         if self.flaky_check:
@@ -467,8 +471,8 @@ class ClickhouseIntegrationTestsRunner:
             "FLAKY": [],
         }
         tests_times = defaultdict(float)
+        tests_log_paths = defaultdict(list)
 
-        logs = []
         items_to_run = list(grouped_tests.items())
 
         logging.info("Total test groups %s", len(items_to_run))
@@ -478,7 +482,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_path = self.run_test_group(repo_path, group, tests, MAX_RETRY)
+            group_counters, group_test_times, log_paths = self.run_test_group(repo_path, group, tests, MAX_RETRY)
             total_tests = 0
             for counter, value in group_counters.items():
                 logging.info("Tests from group %s stats, %s count %s", group, counter, len(value))
@@ -489,13 +493,14 @@ class ClickhouseIntegrationTestsRunner:
 
             for test_name, test_time in group_test_times.items():
                 tests_times[test_name] = test_time
-            logs.append(log_path)
+                tests_log_paths[test_name] = log_paths
+
             if len(counters["FAILED"]) + len(counters["ERROR"]) >= 20:
                 logging.info("Collected more than 20 failed/error tests, stopping")
                 break
 
         logging.info("Finally all tests done, going to compress test dir")
-        test_logs = os.path.join(str(self.path()), "./test_dir.tar")
+        test_logs = os.path.join(str(self.path()), "./test_dir.tar.gz")
         self._compress_logs("{}/tests/integration".format(repo_path), test_logs)
         logging.info("Compression finished")
 
@@ -514,7 +519,7 @@ class ClickhouseIntegrationTestsRunner:
                 text_state = "FAIL"
             else:
                 text_state = state
-            test_result += [(c, text_state, "{:.2f}".format(tests_times[c])) for c in counters[state]]
+            test_result += [(c, text_state, "{:.2f}".format(tests_times[c]), tests_log_paths[c]) for c in counters[state]]
 
         failed_sum = len(counters['FAILED']) + len(counters['ERROR'])
         status_text = "fail: {}, passed: {}, flaky: {}".format(failed_sum, len(counters['PASSED']), len(counters['FLAKY']))
@@ -531,7 +536,7 @@ class ClickhouseIntegrationTestsRunner:
         if '(memory)' in self.params['context_name']:
             result_state = "success"
 
-        return result_state, status_text, test_result, [test_logs] + logs
+        return result_state, status_text, test_result, [test_logs]
 
 def write_results(results_file, status_file, results, status):
     with open(results_file, 'w') as f:
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 00ada45398f..733af0cb8f9 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -37,7 +37,6 @@ DEFAULT_ENV_NAME = 'env_file'
 
 SANITIZER_SIGN = "=================="
 
-
 def _create_env_file(path, variables, fname=DEFAULT_ENV_NAME):
     full_path = os.path.join(path, fname)
     with open(full_path, 'w') as f:
@@ -54,6 +53,26 @@ def run_and_check(args, env=None, shell=False, stdout=subprocess.PIPE, stderr=su
         raise Exception('Command {} return non-zero code {}: {}'.format(args, res.returncode, res.stderr.decode('utf-8')))
 
 
+def retry_exception(num, delay, func, exception=Exception, *args, **kwargs):
+    """
+    Retry if `func()` throws, `num` times.
+
+    :param func: func to run
+    :param num: number of retries
+
+    :throws StopIteration
+    """
+    i = 0
+    while i <= num:
+        try:
+            func(*args, **kwargs)
+            time.sleep(delay)
+        except exception: # pylint: disable=broad-except
+            i += 1
+            continue
+        return
+    raise StopIteration('Function did not finished successfully')
+
 def subprocess_check_call(args):
     # Uncomment for debugging
     # print('run:', ' ' . join(args))
@@ -75,6 +94,15 @@ def get_odbc_bridge_path():
             return '/usr/bin/clickhouse-odbc-bridge'
     return path
 
+def get_library_bridge_path():
+    path = os.environ.get('CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH')
+    if path is None:
+        server_path = os.environ.get('CLICKHOUSE_TESTS_SERVER_BIN_PATH')
+        if server_path is not None:
+            return os.path.join(os.path.dirname(server_path), 'clickhouse-library-bridge')
+        else:
+            return '/usr/bin/clickhouse-library-bridge'
+    return path
 
 def get_docker_compose_path():
     compose_path = os.environ.get('DOCKER_COMPOSE_DIR')
@@ -98,7 +126,8 @@ class ClickHouseCluster:
     """
 
     def __init__(self, base_path, name=None, base_config_dir=None, server_bin_path=None, client_bin_path=None,
-                 odbc_bridge_bin_path=None, zookeeper_config_path=None, custom_dockerd_host=None):
+                 odbc_bridge_bin_path=None, library_bridge_bin_path=None, zookeeper_config_path=None,
+                 custom_dockerd_host=None):
         for param in list(os.environ.keys()):
             print("ENV %40s %s" % (param, os.environ[param]))
         self.base_dir = p.dirname(base_path)
@@ -109,6 +138,7 @@ class ClickHouseCluster:
         self.server_bin_path = p.realpath(
             server_bin_path or os.environ.get('CLICKHOUSE_TESTS_SERVER_BIN_PATH', '/usr/bin/clickhouse'))
         self.odbc_bridge_bin_path = p.realpath(odbc_bridge_bin_path or get_odbc_bridge_path())
+        self.library_bridge_bin_path = p.realpath(library_bridge_bin_path or get_library_bridge_path())
         self.client_bin_path = p.realpath(
             client_bin_path or os.environ.get('CLICKHOUSE_TESTS_CLIENT_BIN_PATH', '/usr/bin/clickhouse-client'))
         self.zookeeper_config_path = p.join(self.base_dir, zookeeper_config_path) if zookeeper_config_path else p.join(
@@ -139,7 +169,9 @@ class ClickHouseCluster:
         self.instances = {}
         self.with_zookeeper = False
         self.with_mysql = False
+        self.with_mysql_cluster = False
         self.with_postgres = False
+        self.with_postgres_cluster = False
         self.with_kafka = False
         self.with_kerberized_kafka = False
         self.with_rabbitmq = False
@@ -167,9 +199,11 @@ class ClickHouseCluster:
         self.schema_registry_port = 8081
 
         self.zookeeper_use_tmpfs = True
+        self.use_keeper = True
 
         self.docker_client = None
         self.is_up = False
+        self.env = os.environ.copy()
         print("CLUSTER INIT base_config_dir:{}".format(self.base_config_dir))
 
     def get_client_cmd(self):
@@ -180,13 +214,15 @@ class ClickHouseCluster:
 
     def add_instance(self, name, base_config_dir=None, main_configs=None, user_configs=None, dictionaries=None,
                      macros=None,
-                     with_zookeeper=False, with_mysql=False, with_kafka=False, with_kerberized_kafka=False, with_rabbitmq=False,
+                     with_zookeeper=False, with_mysql=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_hdfs=False, with_kerberized_hdfs=False, with_mongo=False,
+                     with_odbc_drivers=False, with_postgres=False, with_postgres_cluster=False, with_hdfs=False, with_kerberized_hdfs=False, with_mongo=False,
                      with_redis=False, with_minio=False, with_cassandra=False,
                      hostname=None, env_variables=None, image="yandex/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, zookeeper_use_tmpfs=True, minio_certs_dir=None):
+                     zookeeper_docker_compose_path=None, zookeeper_use_tmpfs=True, minio_certs_dir=None, use_keeper=True,
+                     main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True):
+
         """Add an instance to the cluster.
 
         name - the name of the instance directory and the value of the 'instance' macro in ClickHouse.
@@ -207,6 +243,8 @@ class ClickHouseCluster:
         if not env_variables:
             env_variables = {}
 
+        self.use_keeper = use_keeper
+
         # Code coverage files will be placed in database directory
         # (affect only WITH_COVERAGE=1 build)
         env_variables['LLVM_PROFILE_FILE'] = '/var/lib/clickhouse/server_%h_%p_%m.profraw'
@@ -223,6 +261,7 @@ class ClickHouseCluster:
             with_zookeeper=with_zookeeper,
             zookeeper_config_path=self.zookeeper_config_path,
             with_mysql=with_mysql,
+            with_mysql_cluster=with_mysql_cluster,
             with_kafka=with_kafka,
             with_kerberized_kafka=with_kerberized_kafka,
             with_rabbitmq=with_rabbitmq,
@@ -233,6 +272,7 @@ class ClickHouseCluster:
             with_cassandra=with_cassandra,
             server_bin_path=self.server_bin_path,
             odbc_bridge_bin_path=self.odbc_bridge_bin_path,
+            library_bridge_bin_path=self.library_bridge_bin_path,
             clickhouse_path_dir=clickhouse_path_dir,
             with_odbc_drivers=with_odbc_drivers,
             hostname=hostname,
@@ -243,6 +283,9 @@ class ClickHouseCluster:
             ipv4_address=ipv4_address,
             ipv6_address=ipv6_address,
             with_installed_binary=with_installed_binary,
+            main_config_name=main_config_name,
+            users_config_name=users_config_name,
+            copy_common_configs=copy_common_configs,
             tmpfs=tmpfs or [])
 
         docker_compose_yml_dir = get_docker_compose_path()
@@ -257,7 +300,10 @@ class ClickHouseCluster:
         cmds = []
         if with_zookeeper and not self.with_zookeeper:
             if not zookeeper_docker_compose_path:
-                zookeeper_docker_compose_path = p.join(docker_compose_yml_dir, 'docker_compose_zookeeper.yml')
+                if self.use_keeper:
+                    zookeeper_docker_compose_path = p.join(docker_compose_yml_dir, 'docker_compose_keeper.yml')
+                else:
+                    zookeeper_docker_compose_path = p.join(docker_compose_yml_dir, 'docker_compose_zookeeper.yml')
 
             self.with_zookeeper = True
             self.zookeeper_use_tmpfs = zookeeper_use_tmpfs
@@ -274,6 +320,14 @@ class ClickHouseCluster:
 
             cmds.append(self.base_mysql_cmd)
 
+        if with_mysql_cluster and not self.with_mysql_cluster:
+            self.with_mysql_cluster = True
+            self.base_cmd.extend(['--file', p.join(docker_compose_yml_dir, 'docker_compose_mysql_cluster.yml')])
+            self.base_mysql_cluster_cmd = ['docker-compose', '--project-name', self.project_name,
+                                   '--file', p.join(docker_compose_yml_dir, 'docker_compose_mysql_cluster.yml')]
+
+            cmds.append(self.base_mysql_cluster_cmd)
+
         if with_postgres and not self.with_postgres:
             self.with_postgres = True
             self.base_cmd.extend(['--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres.yml')])
@@ -281,6 +335,13 @@ class ClickHouseCluster:
                                       '--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres.yml')]
             cmds.append(self.base_postgres_cmd)
 
+        if with_postgres_cluster and not self.with_postgres_cluster:
+            self.with_postgres_cluster = True
+            self.base_cmd.extend(['--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres.yml')])
+            self.base_postgres_cluster_cmd = ['docker-compose', '--project-name', self.project_name,
+                                      '--file', p.join(docker_compose_yml_dir, 'docker_compose_postgres_cluster.yml')]
+            cmds.append(self.base_postgres_cluster_cmd)
+
         if with_odbc_drivers and not self.with_odbc_drivers:
             self.with_odbc_drivers = True
             if not self.with_mysql:
@@ -394,8 +455,10 @@ class ClickHouseCluster:
         run_and_check(self.base_cmd + ["up", "--force-recreate", "--no-deps", "-d", node.name])
         node.ip_address = self.get_instance_ip(node.name)
         node.client = Client(node.ip_address, command=self.client_bin_path)
-        start_deadline = time.time() + 20.0  # seconds
-        node.wait_for_start(start_deadline)
+        print("Restart node with ip change")
+        # In builds with sanitizer the server can take a long time to start
+        node.wait_for_start(start_timeout=60.0, connection_timeout=600.0)  # seconds
+        print("Restarted")
         return node
 
     def get_instance_ip(self, instance_name):
@@ -449,11 +512,11 @@ class ClickHouseCluster:
                                    ["bash", "-c", "echo {} | base64 --decode > {}".format(encodedStr, dest_path)],
                                    user='root')
 
-    def wait_mysql_to_start(self, timeout=60):
+    def wait_mysql_to_start(self, timeout=60, port=3308):
         start = time.time()
         while time.time() - start < timeout:
             try:
-                conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=3308)
+                conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=port)
                 conn.close()
                 print("Mysql Started")
                 return
@@ -464,11 +527,11 @@ class ClickHouseCluster:
         subprocess_call(['docker-compose', 'ps', '--services', '--all'])
         raise Exception("Cannot wait MySQL container")
 
-    def wait_postgres_to_start(self, timeout=60):
+    def wait_postgres_to_start(self, timeout=60, port=5432):
         start = time.time()
         while time.time() - start < timeout:
             try:
-                conn_string = "host='localhost' user='postgres' password='mysecretpassword'"
+                conn_string = "host='localhost' port={} user='postgres' password='mysecretpassword'".format(port)
                 conn = psycopg2.connect(conn_string)
                 conn.close()
                 print("Postgres Started")
@@ -603,16 +666,6 @@ class ClickHouseCluster:
         if self.is_up:
             return
 
-        # Just in case kill unstopped containers from previous launch
-        try:
-            print("Trying to kill unstopped containers...")
-
-            if not subprocess_call(['docker-compose', 'kill']):
-                subprocess_call(['docker-compose', 'down', '--volumes'])
-            print("Unstopped containers killed")
-        except:
-            pass
-
         try:
             if destroy_dirs and p.exists(self.instances_dir):
                 print(("Removing instances dir %s", self.instances_dir))
@@ -622,25 +675,70 @@ class ClickHouseCluster:
                 print(('Setup directory for instance: {} destroy_dirs: {}'.format(instance.name, destroy_dirs)))
                 instance.create_dir(destroy_dir=destroy_dirs)
 
+            # In case of multiple cluster we should not stop compose services.
+            if destroy_dirs:
+                # Just in case kill unstopped containers from previous launch
+                try:
+                    print("Trying to kill unstopped containers...")
+                    subprocess_call(['docker-compose', 'kill'])
+                    subprocess_call(self.base_cmd + ['down', '--volumes', '--remove-orphans'])
+                    print("Unstopped containers killed")
+                except:
+                    pass
+
+            clickhouse_pull_cmd = self.base_cmd + ['pull']
+            print(f"Pulling images for {self.base_cmd}")
+            retry_exception(10, 5, subprocess_check_call, Exception, clickhouse_pull_cmd)
+
             self.docker_client = docker.from_env(version=self.docker_api_version)
 
-            common_opts = ['up', '-d', '--force-recreate']
+            common_opts = ['up', '-d']
 
             if self.with_zookeeper and self.base_zookeeper_cmd:
-                print('Setup ZooKeeper')
-                env = os.environ.copy()
-                if not self.zookeeper_use_tmpfs:
-                    env['ZK_FS'] = 'bind'
-                    for i in range(1, 4):
-                        zk_data_path = self.instances_dir + '/zkdata' + str(i)
-                        zk_log_data_path = self.instances_dir + '/zklog' + str(i)
-                        if not os.path.exists(zk_data_path):
-                            os.mkdir(zk_data_path)
-                        if not os.path.exists(zk_log_data_path):
-                            os.mkdir(zk_log_data_path)
-                        env['ZK_DATA' + str(i)] = zk_data_path
-                        env['ZK_DATA_LOG' + str(i)] = zk_log_data_path
-                run_and_check(self.base_zookeeper_cmd + common_opts, env=env)
+                if self.use_keeper:
+                    print('Setup Keeper')
+                    binary_path = self.server_bin_path
+                    if binary_path.endswith('-server'):
+                        binary_path = binary_path[:-len('-server')]
+
+                    self.env['keeper_binary'] = binary_path
+                    self.env['image'] = "yandex/clickhouse-integration-test:" + self.docker_base_tag
+                    self.env['user'] = str(os.getuid())
+                    if not self.zookeeper_use_tmpfs:
+                        self.env['keeper_fs'] = 'bind'
+
+                    for i in range (1, 4):
+                        instance_dir = p.join(self.instances_dir, f"keeper{i}")
+                        logs_dir = p.join(instance_dir, "logs")
+                        configs_dir = p.join(instance_dir, "configs")
+                        coordination_dir = p.join(instance_dir, "coordination")
+                        if not os.path.exists(instance_dir):
+                            os.mkdir(instance_dir)
+                            os.mkdir(configs_dir)
+                            os.mkdir(logs_dir)
+                            if not self.zookeeper_use_tmpfs:
+                                os.mkdir(coordination_dir)
+                            shutil.copy(os.path.join(HELPERS_DIR, f'keeper_config{i}.xml'), configs_dir)
+
+                        self.env[f'keeper_logs_dir{i}'] = p.abspath(logs_dir)
+                        self.env[f'keeper_config_dir{i}'] = p.abspath(configs_dir)
+                        if not self.zookeeper_use_tmpfs:
+                            self.env[f'keeper_db_dir{i}'] = p.abspath(coordination_dir)
+                else:
+                    print('Setup ZooKeeper')
+                    if not self.zookeeper_use_tmpfs:
+                        self.env['ZK_FS'] = 'bind'
+                        for i in range(1, 4):
+                            zk_data_path = self.instances_dir + '/zkdata' + str(i)
+                            zk_log_data_path = self.instances_dir + '/zklog' + str(i)
+                            if not os.path.exists(zk_data_path):
+                                os.mkdir(zk_data_path)
+                            if not os.path.exists(zk_log_data_path):
+                                os.mkdir(zk_log_data_path)
+                            self.env['ZK_DATA' + str(i)] = zk_data_path
+                            self.env['ZK_DATA_LOG' + str(i)] = zk_log_data_path
+
+                run_and_check(self.base_zookeeper_cmd + common_opts, env=self.env)
                 for command in self.pre_zookeeper_commands:
                     self.run_kazoo_commands_with_retries(command, repeats=5)
                 self.wait_zookeeper_to_start(120)
@@ -650,11 +748,25 @@ class ClickHouseCluster:
                 subprocess_check_call(self.base_mysql_cmd + common_opts)
                 self.wait_mysql_to_start(120)
 
+            if self.with_mysql_cluster and self.base_mysql_cluster_cmd:
+                print('Setup MySQL')
+                subprocess_check_call(self.base_mysql_cluster_cmd + common_opts)
+                self.wait_mysql_to_start(120, port=3348)
+                self.wait_mysql_to_start(120, port=3368)
+                self.wait_mysql_to_start(120, port=3388)
+
             if self.with_postgres and self.base_postgres_cmd:
                 print('Setup Postgres')
                 subprocess_check_call(self.base_postgres_cmd + common_opts)
                 self.wait_postgres_to_start(120)
 
+            if self.with_postgres_cluster and self.base_postgres_cluster_cmd:
+                print('Setup Postgres')
+                subprocess_check_call(self.base_postgres_cluster_cmd + common_opts)
+                self.wait_postgres_to_start(120, port=5421)
+                self.wait_postgres_to_start(120, port=5441)
+                self.wait_postgres_to_start(120, port=5461)
+
             if self.with_kafka and self.base_kafka_cmd:
                 print('Setup Kafka')
                 subprocess_check_call(self.base_kafka_cmd + common_opts + ['--renew-anon-volumes'])
@@ -663,9 +775,8 @@ class ClickHouseCluster:
 
             if self.with_kerberized_kafka and self.base_kerberized_kafka_cmd:
                 print('Setup kerberized kafka')
-                env = os.environ.copy()
-                env['KERBERIZED_KAFKA_DIR'] = instance.path + '/'
-                run_and_check(self.base_kerberized_kafka_cmd + common_opts + ['--renew-anon-volumes'], env=env)
+                self.env['KERBERIZED_KAFKA_DIR'] = instance.path + '/'
+                run_and_check(self.base_kerberized_kafka_cmd + common_opts + ['--renew-anon-volumes'], env=self.env)
                 self.kerberized_kafka_docker_id = self.get_instance_docker_id('kerberized_kafka1')
             if self.with_rabbitmq and self.base_rabbitmq_cmd:
                 subprocess_check_call(self.base_rabbitmq_cmd + common_opts + ['--renew-anon-volumes'])
@@ -679,9 +790,8 @@ class ClickHouseCluster:
 
             if self.with_kerberized_hdfs and self.base_kerberized_hdfs_cmd:
                 print('Setup kerberized HDFS')
-                env = os.environ.copy()
-                env['KERBERIZED_HDFS_DIR'] = instance.path + '/'
-                run_and_check(self.base_kerberized_hdfs_cmd + common_opts, env=env)
+                self.env['KERBERIZED_HDFS_DIR'] = instance.path + '/'
+                run_and_check(self.base_kerberized_hdfs_cmd + common_opts, env=self.env)
                 self.make_hdfs_api(kerberized=True)
                 self.wait_hdfs_to_start(timeout=300)
 
@@ -692,27 +802,26 @@ class ClickHouseCluster:
 
             if self.with_redis and self.base_redis_cmd:
                 print('Setup Redis')
-                subprocess_check_call(self.base_redis_cmd + ['up', '-d', '--force-recreate'])
+                subprocess_check_call(self.base_redis_cmd + ['up', '-d'])
                 time.sleep(10)
 
             if self.with_minio and self.base_minio_cmd:
-                env = os.environ.copy()
                 prev_ca_certs = os.environ.get('SSL_CERT_FILE')
                 if self.minio_certs_dir:
                     minio_certs_dir = p.join(self.base_dir, self.minio_certs_dir)
-                    env['MINIO_CERTS_DIR'] = minio_certs_dir
+                    self.env['MINIO_CERTS_DIR'] = minio_certs_dir
                     # Minio client (urllib3) uses SSL_CERT_FILE for certificate validation.
                     os.environ['SSL_CERT_FILE'] = p.join(minio_certs_dir, 'public.crt')
                 else:
                     # Attach empty certificates directory to ensure non-secure mode.
                     minio_certs_dir = p.join(self.instances_dir, 'empty_minio_certs_dir')
                     os.mkdir(minio_certs_dir)
-                    env['MINIO_CERTS_DIR'] = minio_certs_dir
+                    self.env['MINIO_CERTS_DIR'] = minio_certs_dir
 
                 minio_start_cmd = self.base_minio_cmd + common_opts
 
                 logging.info("Trying to create Minio instance by command %s", ' '.join(map(str, minio_start_cmd)))
-                run_and_check(minio_start_cmd, env=env)
+                run_and_check(minio_start_cmd, env=self.env)
 
                 try:
                     logging.info("Trying to connect to Minio...")
@@ -726,21 +835,21 @@ class ClickHouseCluster:
                             os.environ.pop('SSL_CERT_FILE')
 
             if self.with_cassandra and self.base_cassandra_cmd:
-                subprocess_check_call(self.base_cassandra_cmd + ['up', '-d', '--force-recreate'])
+                subprocess_check_call(self.base_cassandra_cmd + ['up', '-d'])
                 self.wait_cassandra_to_start()
 
             clickhouse_start_cmd = self.base_cmd + ['up', '-d', '--no-recreate']
             print(("Trying to create ClickHouse instance by command %s", ' '.join(map(str, clickhouse_start_cmd))))
-            subprocess_check_call(clickhouse_start_cmd)
+            run_and_check(clickhouse_start_cmd, env=self.env)
             print("ClickHouse instance created")
 
-            start_deadline = time.time() + 20.0  # seconds
+            start_timeout = 20.0  # seconds
             for instance in self.instances.values():
                 instance.docker_client = self.docker_client
                 instance.ip_address = self.get_instance_ip(instance.name)
 
                 print("Waiting for ClickHouse start...")
-                instance.wait_for_start(start_deadline)
+                instance.wait_for_start(start_timeout)
                 print("ClickHouse started")
 
                 instance.client = Client(instance.ip_address, command=self.client_bin_path)
@@ -757,7 +866,7 @@ class ClickHouseCluster:
         sanitizer_assert_instance = None
         with open(self.docker_logs_path, "w+") as f:
             try:
-                subprocess.check_call(self.base_cmd + ['logs'], stdout=f)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+                subprocess.check_call(self.base_cmd + ['logs'], env=self.env, stdout=f)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
             except Exception as e:
                 print("Unable to get logs from docker.")
             f.seek(0)
@@ -768,14 +877,14 @@ class ClickHouseCluster:
 
         if kill:
             try:
-                subprocess_check_call(self.base_cmd + ['stop', '--timeout', '20'])
+                run_and_check(self.base_cmd + ['stop', '--timeout', '20'], env=self.env)
             except Exception as e:
                 print("Kill command failed during shutdown. {}".format(repr(e)))
                 print("Trying to kill forcefully")
                 subprocess_check_call(self.base_cmd + ['kill'])
 
         try:
-            subprocess_check_call(self.base_cmd + ['down', '--volumes', '--remove-orphans'])
+            run_and_check(self.base_cmd + ['down', '--volumes', '--remove-orphans'], env=self.env)
         except Exception as e:
             print("Down + remove orphans failed durung shutdown. {}".format(repr(e)))
 
@@ -844,7 +953,7 @@ class ClickHouseCluster:
             subprocess_check_call(self.base_zookeeper_cmd + ["start", n])
 
 
-CLICKHOUSE_START_COMMAND = "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
+CLICKHOUSE_START_COMMAND = "clickhouse server --config-file=/etc/clickhouse-server/{main_config_file} --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)
 
@@ -861,6 +970,7 @@ services:
             - /etc/passwd:/etc/passwd:ro
             {binary_volume}
             {odbc_bridge_volume}
+            {library_bridge_volume}
             {odbc_ini_path}
             {keytab_path}
             {krb5_conf}
@@ -896,9 +1006,11 @@ class ClickHouseInstance:
     def __init__(
             self, cluster, base_path, name, base_config_dir, custom_main_configs, custom_user_configs,
             custom_dictionaries,
-            macros, with_zookeeper, zookeeper_config_path, with_mysql, with_kafka, with_kerberized_kafka, with_rabbitmq, with_kerberized_hdfs,
+            macros, with_zookeeper, zookeeper_config_path, with_mysql, with_mysql_cluster, with_kafka, with_kerberized_kafka, with_rabbitmq, with_kerberized_hdfs,
             with_mongo, with_redis, with_minio,
-            with_cassandra, server_bin_path, odbc_bridge_bin_path, clickhouse_path_dir, with_odbc_drivers,
+            with_cassandra, server_bin_path, odbc_bridge_bin_path, library_bridge_bin_path, clickhouse_path_dir, with_odbc_drivers,
+            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):
@@ -922,8 +1034,10 @@ class ClickHouseInstance:
 
         self.server_bin_path = server_bin_path
         self.odbc_bridge_bin_path = odbc_bridge_bin_path
+        self.library_bridge_bin_path = library_bridge_bin_path
 
         self.with_mysql = with_mysql
+        self.with_mysql_cluster = with_mysql_cluster
         self.with_kafka = with_kafka
         self.with_kerberized_kafka = with_kerberized_kafka
         self.with_rabbitmq = with_rabbitmq
@@ -933,6 +1047,12 @@ class ClickHouseInstance:
         self.with_minio = with_minio
         self.with_cassandra = with_cassandra
 
+        self.main_config_name = main_config_name
+        self.users_config_name = users_config_name
+        self.copy_common_configs = copy_common_configs
+
+        self.clickhouse_start_command = clickhouse_start_command.replace("{main_config_file}", self.main_config_name)
+
         self.path = p.join(self.cluster.instances_dir, name)
         self.docker_compose_path = p.join(self.path, 'docker-compose.yml')
         self.env_variables = env_variables or {}
@@ -960,13 +1080,18 @@ class ClickHouseInstance:
         self.ipv6_address = ipv6_address
         self.with_installed_binary = with_installed_binary
 
-    def is_built_with_thread_sanitizer(self):
+    def is_built_with_sanitizer(self, sanitizer_name=''):
         build_opts = self.query("SELECT value FROM system.build_options WHERE name = 'CXX_FLAGS'")
-        return "-fsanitize=thread" in build_opts
+        return "-fsanitize={}".format(sanitizer_name) in build_opts
+
+    def is_built_with_thread_sanitizer(self):
+        return self.is_built_with_sanitizer('thread')
 
     def is_built_with_address_sanitizer(self):
-        build_opts = self.query("SELECT value FROM system.build_options WHERE name = 'CXX_FLAGS'")
-        return "-fsanitize=address" in build_opts
+        return self.is_built_with_sanitizer('address')
+
+    def is_built_with_memory_sanitizer(self):
+        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,
@@ -1053,23 +1178,28 @@ class ClickHouseInstance:
         return self.http_query(sql=sql, data=data, params=params, user=user, password=password,
                                expect_fail_and_get_error=True)
 
-    def stop_clickhouse(self, start_wait_sec=5, kill=False):
+    def stop_clickhouse(self, stop_wait_sec=30, kill=False):
         if not self.stay_alive:
             raise Exception("clickhouse can be stopped only with stay_alive=True instance")
 
         self.exec_in_container(["bash", "-c", "pkill {} clickhouse".format("-9" if kill else "")], user='root')
-        time.sleep(start_wait_sec)
+        deadline = time.time() + stop_wait_sec
+        while time.time() < deadline:
+            time.sleep(0.5)
+            if self.get_process_pid("clickhouse") is None:
+                break
+        assert self.get_process_pid("clickhouse") is None, "ClickHouse was not stopped"
 
-    def start_clickhouse(self, stop_wait_sec=5):
+    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")
 
-        self.exec_in_container(["bash", "-c", "{} --daemon".format(CLICKHOUSE_START_COMMAND)], user=str(os.getuid()))
+        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(stop_wait_sec / 0.5), sleep_time=0.5)
+        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=5, kill=False):
+    def restart_clickhouse(self, stop_start_wait_sec=30, kill=False):
         self.stop_clickhouse(stop_start_wait_sec, kill)
         self.start_clickhouse(stop_start_wait_sec)
 
@@ -1150,7 +1280,7 @@ class ClickHouseInstance:
         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(CLICKHOUSE_START_COMMAND)], user=str(os.getuid()))
+        self.exec_in_container(["bash", "-c", "{} --daemon".format(self.clickhouse_start_command)], user=str(os.getuid()))
         from helpers.test_tools import assert_eq_with_retry
         # wait start
         assert_eq_with_retry(self, "select 1", "1", retry_count=retries)
@@ -1164,32 +1294,54 @@ class ClickHouseInstance:
     def start(self):
         self.get_docker_handle().start()
 
-    def wait_for_start(self, deadline=None, timeout=None):
-        start_time = time.time()
+    def wait_for_start(self, start_timeout=None, connection_timeout=None):
 
-        if timeout is not None:
-            deadline = start_time + timeout
+        if start_timeout is None or start_timeout <= 0:
+            raise Exception("Invalid timeout: {}".format(start_timeout))
+
+        if connection_timeout is not None and connection_timeout < start_timeout:
+            raise Exception("Connection timeout {} should be grater then start timeout {}"
+                            .format(connection_timeout, start_timeout))
+
+        start_time = time.time()
+        prev_rows_in_log = 0
+
+        def has_new_rows_in_log():
+            nonlocal prev_rows_in_log
+            try:
+                rows_in_log = int(self.count_in_log(".*").strip())
+                res = rows_in_log > prev_rows_in_log
+                prev_rows_in_log = rows_in_log
+                return res
+            except ValueError:
+                return False
 
         while True:
             handle = self.get_docker_handle()
             status = handle.status
             if status == 'exited':
-                raise Exception(
-                    "Instance `{}' failed to start. Container status: {}, logs: {}".format(self.name, status,
-                                                                                           handle.logs().decode('utf-8')))
+                raise Exception("Instance `{}' failed to start. Container status: {}, logs: {}"
+                                .format(self.name, status, handle.logs().decode('utf-8')))
+
+            deadline = start_time + start_timeout
+            # It is possible that server starts slowly.
+            # If container is running, and there is some progress in log, check connection_timeout.
+            if connection_timeout and status == 'running' and has_new_rows_in_log():
+                deadline = start_time + connection_timeout
 
             current_time = time.time()
-            time_left = deadline - current_time
-            if deadline is not None and current_time >= deadline:
+            if current_time >= deadline:
                 raise Exception("Timed out while waiting for instance `{}' with ip address {} to start. "
                                 "Container status: {}, logs: {}".format(self.name, self.ip_address, status,
                                                                         handle.logs().decode('utf-8')))
 
+            socket_timeout = min(start_timeout, deadline - current_time)
+
             # Repeatedly poll the instance address until there is something that listens there.
             # Usually it means that ClickHouse is ready to accept queries.
             try:
                 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.settimeout(time_left)
+                sock.settimeout(socket_timeout)
                 sock.connect((self.ip_address, 9000))
                 return
             except socket.timeout:
@@ -1269,8 +1421,10 @@ class ClickHouseInstance:
         os.makedirs(instance_config_dir)
 
         print("Copy common default production configuration from {}".format(self.base_config_dir))
-        shutil.copyfile(p.join(self.base_config_dir, 'config.xml'), p.join(instance_config_dir, 'config.xml'))
-        shutil.copyfile(p.join(self.base_config_dir, 'users.xml'), p.join(instance_config_dir, 'users.xml'))
+
+        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))
 
         print("Create directory for configuration generated in this helper")
         # used by all utils with any config
@@ -1288,7 +1442,9 @@ class ClickHouseInstance:
 
         print("Copy common configuration from helpers")
         # The file is named with 0_ prefix to be processed before other configuration overloads.
-        shutil.copy(p.join(HELPERS_DIR, '0_common_instance_config.xml'), self.config_d_dir)
+        if self.copy_common_configs:
+            shutil.copy(p.join(HELPERS_DIR, '0_common_instance_config.xml'), self.config_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)
@@ -1367,10 +1523,10 @@ class ClickHouseInstance:
             self._create_odbc_config_file()
             odbc_ini_path = '- ' + self.odbc_ini_path
 
-        entrypoint_cmd = CLICKHOUSE_START_COMMAND
+        entrypoint_cmd = self.clickhouse_start_command
 
         if self.stay_alive:
-            entrypoint_cmd = CLICKHOUSE_STAY_ALIVE_COMMAND
+            entrypoint_cmd = CLICKHOUSE_STAY_ALIVE_COMMAND.replace("{main_config_file}", self.main_config_name)
 
         print("Entrypoint cmd: {}".format(entrypoint_cmd))
 
@@ -1389,9 +1545,11 @@ class ClickHouseInstance:
         if not self.with_installed_binary:
             binary_volume = "- " + self.server_bin_path + ":/usr/bin/clickhouse"
             odbc_bridge_volume = "- " + self.odbc_bridge_bin_path + ":/usr/bin/clickhouse-odbc-bridge"
+            library_bridge_volume = "- " + self.library_bridge_bin_path + ":/usr/bin/clickhouse-library-bridge"
         else:
             binary_volume = "- " + self.server_bin_path + ":/usr/share/clickhouse_fresh"
             odbc_bridge_volume = "- " + self.odbc_bridge_bin_path + ":/usr/share/clickhouse-odbc-bridge_fresh"
+            library_bridge_volume = "- " + self.library_bridge_bin_path + ":/usr/share/clickhouse-library-bridge_fresh"
 
         with open(self.docker_compose_path, 'w') as docker_compose:
             docker_compose.write(DOCKER_COMPOSE_TEMPLATE.format(
@@ -1401,6 +1559,7 @@ class ClickHouseInstance:
                 hostname=self.hostname,
                 binary_volume=binary_volume,
                 odbc_bridge_volume=odbc_bridge_volume,
+                library_bridge_volume=library_bridge_volume,
                 instance_config_dir=instance_config_dir,
                 config_d_dir=self.config_d_dir,
                 db_dir=db_dir,
diff --git a/tests/integration/helpers/hdfs_api.py b/tests/integration/helpers/hdfs_api.py
index cb742662855..ae0e4cffc7a 100644
--- a/tests/integration/helpers/hdfs_api.py
+++ b/tests/integration/helpers/hdfs_api.py
@@ -90,9 +90,8 @@ class HDFSApi(object):
         if kerberized:
             self._run_kinit()
             self.kerberos_auth = reqkerb.HTTPKerberosAuth(mutual_authentication=reqkerb.DISABLED, hostname_override=self.host, principal=self.principal)
-                #principal=self.principal,
-                #hostname_override=self.host, principal=self.principal)
-                # , mutual_authentication=reqkerb.REQUIRED, force_preemptive=True)
+            if self.kerberos_auth is None:
+                print("failed to obtain kerberos_auth")
         else:
             self.kerberos_auth = None
 
@@ -122,20 +121,24 @@ class HDFSApi(object):
 
         raise Exception("Kinit running failure")
 
-    def read_data(self, path, universal_newlines=True):
+    def req_wrapper(self, func, expected_code, cnt=2, **kwargs):
         with dns_hook(self):
-            response = requests.get("{protocol}://{host}:{port}/webhdfs/v1{path}?op=OPEN".format(protocol=self.protocol, host=self.host, port=self.proxy_port, path=path), headers={'host': 'localhost'}, allow_redirects=False, verify=False, auth=self.kerberos_auth)
-        if response.status_code != 307:
-            response.raise_for_status()
+            for i in range(0, cnt):
+                response_data = func(**kwargs)
+                if response_data.status_code == expected_code:
+                    return response_data
+                else:
+                    print("unexpected response_data.status_code {}", response_data.status_code)
+        response_data.raise_for_status()
+
+    def read_data(self, path, universal_newlines=True):
+        response = self.req_wrapper(requests.get, 307, url="{protocol}://{host}:{port}/webhdfs/v1{path}?op=OPEN".format(protocol=self.protocol, host=self.host, port=self.proxy_port, path=path), headers={'host': 'localhost'}, allow_redirects=False, verify=False, auth=self.kerberos_auth)
         # additional_params = '&'.join(response.headers['Location'].split('&')[1:2])
         url = "{location}".format(location=response.headers['Location'])
         # print("redirected to ", url)
-        with dns_hook(self):
-            response_data = requests.get(url,
-                                         headers={'host': 'localhost'},
-                                         verify=False, auth=self.kerberos_auth)
-        if response_data.status_code != 200:
-            response_data.raise_for_status()
+        response_data = self.req_wrapper(requests.get, 200, url=url,
+                                    headers={'host': 'localhost'},
+                                    verify=False, auth=self.kerberos_auth)
         if universal_newlines:
             return response_data.text
         else:
@@ -149,42 +152,36 @@ class HDFSApi(object):
         named_file.write(content)
         named_file.flush()
 
-
         if self.kerberized:
             self._run_kinit()
             self.kerberos_auth = reqkerb.HTTPKerberosAuth(mutual_authentication=reqkerb.DISABLED, hostname_override=self.host, principal=self.principal)
             # print(self.kerberos_auth)
 
-        with dns_hook(self):
-            response = requests.put(
-                "{protocol}://{host}:{port}/webhdfs/v1{path}?op=CREATE".format(protocol=self.protocol, host=self.host,
-                                                                               port=self.proxy_port,
-                                                                               path=path, user=self.user),
-                allow_redirects=False,
-                headers={'host': 'localhost'},
-                params={'overwrite' : 'true'},
-                verify=False, auth=self.kerberos_auth
+        response = self.req_wrapper(requests.put, 307,
+                                    url="{protocol}://{host}:{port}/webhdfs/v1{path}?op=CREATE".format(
+                                        protocol=self.protocol, host=self.host,
+                                        port=self.proxy_port,
+                                        path=path, user=self.user),
+                                    allow_redirects=False,
+                                    headers={'host': 'localhost'},
+                                    params={'overwrite' : 'true'},
+                                    verify=False, auth=self.kerberos_auth
             )
-        if response.status_code != 307:
-            # print(response.headers)
-            response.raise_for_status()
-
         additional_params = '&'.join(
             response.headers['Location'].split('&')[1:2] + ["user.name={}".format(self.user), "overwrite=true"])
 
-        with dns_hook(self), open(fpath, mode="rb") as fh:
+        with open(fpath, mode="rb") as fh:
             file_data = fh.read()
             protocol = "http" # self.protocol
-            response = requests.put(
-                "{location}".format(location=response.headers['Location']),
-                data=file_data,
-                headers={'content-type':'text/plain', 'host': 'localhost'},
-                params={'file': path, 'user.name' : self.user},
-                allow_redirects=False, verify=False, auth=self.kerberos_auth
+            response = self.req_wrapper(requests.put, 201,
+                                        url="{location}".format(
+                                            location=response.headers['Location']),
+                                        data=file_data,
+                                        headers={'content-type':'text/plain', 'host': 'localhost'},
+                                        params={'file': path, 'user.name' : self.user},
+                                        allow_redirects=False, verify=False, auth=self.kerberos_auth
             )
-            # print(response)
-            if response.status_code != 201:
-                response.raise_for_status()
+        # print(response)
 
 
     def write_gzip_data(self, path, content):
diff --git a/tests/integration/helpers/keeper_config1.xml b/tests/integration/helpers/keeper_config1.xml
new file mode 100644
index 00000000000..d80f30ebd42
--- /dev/null
+++ b/tests/integration/helpers/keeper_config1.xml
@@ -0,0 +1,41 @@
+<yandex>
+    <listen_try>true</listen_try>
+    <listen_host>::</listen_host>
+    <listen_host>0.0.0.0</listen_host>
+
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+    </logger>
+
+    <keeper_server>
+        <tcp_port>2181</tcp_port>
+        <server_id>1</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <force_sync>false</force_sync>
+        </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>
+</yandex>
diff --git a/tests/integration/helpers/keeper_config2.xml b/tests/integration/helpers/keeper_config2.xml
new file mode 100644
index 00000000000..8a125cecdb3
--- /dev/null
+++ b/tests/integration/helpers/keeper_config2.xml
@@ -0,0 +1,41 @@
+<yandex>
+    <listen_try>true</listen_try>
+    <listen_host>::</listen_host>
+    <listen_host>0.0.0.0</listen_host>
+
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+    </logger>
+
+    <keeper_server>
+        <tcp_port>2181</tcp_port>
+        <server_id>2</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <force_sync>false</force_sync>
+        </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>
+</yandex>
diff --git a/tests/integration/helpers/keeper_config3.xml b/tests/integration/helpers/keeper_config3.xml
new file mode 100644
index 00000000000..04b41677039
--- /dev/null
+++ b/tests/integration/helpers/keeper_config3.xml
@@ -0,0 +1,41 @@
+<yandex>
+    <listen_try>true</listen_try>
+    <listen_host>::</listen_host>
+    <listen_host>0.0.0.0</listen_host>
+
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+    </logger>
+
+    <keeper_server>
+        <tcp_port>2181</tcp_port>
+        <server_id>3</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <force_sync>false</force_sync>
+        </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>
+</yandex>
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index aa697c63d72..4a64ccee809 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -219,3 +219,61 @@ class _NetworkManager:
             raise subprocess.CalledProcessError(exit_code, cmd)
 
         return output
+
+# Approximately mesure network I/O speed for interface
+class NetThroughput(object):
+    def __init__(self, node, interface="eth0"):
+        self.interface = interface
+        self.node = node
+        try:
+            check = subprocess.check_output(f'grep "^ *{self.interface}:" /proc/net/dev', shell=True)
+            if not check:
+                raise Exception(f"No such interface {self.interface} found in /proc/net/dev")
+        except:
+            raise Exception(f"No such interface {self.interface} found in /proc/net/dev")
+
+        self.current_in = self._get_in_bytes()
+        self.current_out = self._get_out_bytes()
+        self.measure_time = time.time()
+
+    def _get_in_bytes(self):
+        try:
+            result = self.node.exec_in_container(['bash', '-c', f'awk "/^ *{self.interface}:/"\' {{ if ($1 ~ /.*:[0-9][0-9]*/) {{ sub(/^.*:/, "") ; print $1 }} else {{ print $2 }} }}\' /proc/net/dev'])
+        except:
+            raise Exception(f"Cannot receive in bytes from /proc/net/dev for interface {self.interface}")
+
+        try:
+            return int(result)
+        except:
+            raise Exception(f"Got non-numeric in bytes '{result}' from /proc/net/dev for interface {self.interface}")
+
+    def _get_out_bytes(self):
+        try:
+            result = self.node.exec_in_container(['bash', '-c', f'awk "/^ *{self.interface}:/"\' {{ if ($1 ~ /.*:[0-9][0-9]*/) {{ print $9 }} else {{ print $10 }} }}\' /proc/net/dev'])
+        except:
+            raise Exception(f"Cannot receive out bytes from /proc/net/dev for interface {self.interface}")
+
+        try:
+            return int(result)
+        except:
+            raise Exception(f"Got non-numeric out bytes '{result}' from /proc/net/dev for interface {self.interface}")
+
+    def measure_speed(self, measure='bytes'):
+        new_in = self._get_in_bytes()
+        new_out = self._get_out_bytes()
+        current_time = time.time()
+        in_speed = (new_in - self.current_in) / (current_time - self.measure_time)
+        out_speed = (new_out - self.current_out) / (current_time - self.measure_time)
+
+        self.current_out = new_out
+        self.current_in = new_in
+        self.measure_time = current_time
+
+        if measure == 'bytes':
+            return in_speed, out_speed
+        elif measure == 'kilobytes':
+            return in_speed / 1024., out_speed / 1024.
+        elif measure == 'megabytes':
+            return in_speed / (1024 * 1024), out_speed / (1024 * 1024)
+        else:
+            raise Exception(f"Unknown measure {measure}")
diff --git a/tests/integration/helpers/test_tools.py b/tests/integration/helpers/test_tools.py
index 5fedadd3380..93478c4dd49 100644
--- a/tests/integration/helpers/test_tools.py
+++ b/tests/integration/helpers/test_tools.py
@@ -80,3 +80,16 @@ def assert_logs_contain_with_retry(instance, substring, retry_count=20, sleep_ti
             time.sleep(sleep_time)
     else:
         raise AssertionError("'{}' not found in logs".format(substring))
+
+def exec_query_with_retry(instance, query, retry_count=40, sleep_time=0.5, settings={}):
+    exception = None
+    for _ in range(retry_count):
+        try:
+            instance.query(query, timeout=30, settings=settings)
+            break
+        except Exception as ex:
+            exception = ex
+            print("Failed to execute query '", query, "' on instance", instance.name, "will retry")
+            time.sleep(sleep_time)
+    else:
+        raise exception
diff --git a/tests/integration/runner b/tests/integration/runner
index 6dca7663310..16eb31dfd5e 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -33,10 +33,15 @@ def check_args_and_update_paths(args):
     if not os.path.isabs(args.binary):
         args.binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.binary))
 
-    if not args.bridge_binary:
-        args.bridge_binary = os.path.join(os.path.dirname(args.binary), 'clickhouse-odbc-bridge')
-    elif not os.path.isabs(args.bridge_binary):
-        args.bridge_binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.bridge_binary))
+    if not args.odbc_bridge_binary:
+        args.odbc_bridge_binary = os.path.join(os.path.dirname(args.binary), 'clickhouse-odbc-bridge')
+    elif not os.path.isabs(args.odbc_bridge_binary):
+        args.odbc_bridge_binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.odbc_bridge_binary))
+
+    if not args.library_bridge_binary:
+        args.library_bridge_binary = os.path.join(os.path.dirname(args.binary), 'clickhouse-library-bridge')
+    elif not os.path.isabs(args.library_bridge_binary):
+        args.library_bridge_binary = os.path.abspath(os.path.join(CURRENT_WORK_DIR, args.library_bridge_binary))
 
     if args.base_configs_dir:
         if not os.path.isabs(args.base_configs_dir):
@@ -59,17 +64,17 @@ def check_args_and_update_paths(args):
         args.src_dir = os.path.abspath(os.path.join(CLICKHOUSE_ROOT, SRC_DIR_IN_REPO))
         logging.info("src dir is not set. Will use {}".format(args.src_dir))
 
-    logging.info("base_configs_dir: {},  binary: {}, cases_dir: {} ".format(args.base_configs_dir, args.binary, args.cases_dir))
+    logging.info("base_configs_dir: {}, binary: {}, cases_dir: {} ".format(args.base_configs_dir, args.binary, args.cases_dir))
 
-    for path in [args.binary, args.bridge_binary, args.base_configs_dir, args.cases_dir, CLICKHOUSE_ROOT]:
+    for path in [args.binary, args.odbc_bridge_binary, args.library_bridge_binary, args.base_configs_dir, args.cases_dir, CLICKHOUSE_ROOT]:
         if not os.path.exists(path):
             raise Exception("Path {} doesn't exist".format(path))
 
-    if not os.path.exists(os.path.join(args.base_configs_dir, "config.xml")):
-        raise Exception("No configs.xml in {}".format(args.base_configs_dir))
+    if (not os.path.exists(os.path.join(args.base_configs_dir, "config.xml"))) and (not os.path.exists(os.path.join(args.base_configs_dir, "config.yaml"))):
+        raise Exception("No configs.xml or configs.yaml in {}".format(args.base_configs_dir))
 
-    if not os.path.exists(os.path.join(args.base_configs_dir, "users.xml")):
-        raise Exception("No users.xml in {}".format(args.base_configs_dir))
+    if (not os.path.exists(os.path.join(args.base_configs_dir, "users.xml"))) and (not os.path.exists(os.path.join(args.base_configs_dir, "users.yaml"))):
+        raise Exception("No users.xml or users.yaml in {}".format(args.base_configs_dir))
 
 def docker_kill_handler_handler(signum, frame):
     subprocess.check_call('docker kill $(docker ps -a -q --filter name={name} --format="{{{{.ID}}}}")'.format(name=CONTAINER_NAME), shell=True)
@@ -82,7 +87,8 @@ signal.signal(signal.SIGINT, docker_kill_handler_handler)
 # To run integration tests following artfacts should be sufficient:
 #   - clickhouse binaries (env CLICKHOUSE_TESTS_SERVER_BIN_PATH or --binary arg)
 #   - clickhouse default configs(config.xml, users.xml) from same version as binary (env CLICKHOUSE_TESTS_BASE_CONFIG_DIR or --base-configs-dir arg)
-#   - odbc bridge binary (env CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH or --bridge-binary arg)
+#   - odbc bridge binary (env CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH or --odbc-bridge-binary arg)
+#   - library bridge binary (env CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH or --library-bridge-binary)
 #   - tests/integration directory with all test cases and configs (env CLICKHOUSE_TESTS_INTEGRATION_PATH or --cases-dir)
 #
 # 1) --clickhouse-root is only used to determine other paths on default places
@@ -98,10 +104,15 @@ if __name__ == "__main__":
         help="Path to clickhouse binary. For example /usr/bin/clickhouse")
 
     parser.add_argument(
-        "--bridge-binary",
+        "--odbc-bridge-binary",
         default=os.environ.get("CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH", ""),
         help="Path to clickhouse-odbc-bridge binary. Defaults to clickhouse-odbc-bridge in the same dir as clickhouse.")
 
+    parser.add_argument(
+        "--library-bridge-binary",
+        default=os.environ.get("CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH", ""),
+        help="Path to clickhouse-library-bridge binary. Defaults to clickhouse-library-bridge in the same dir as clickhouse.")
+
     parser.add_argument(
         "--base-configs-dir",
         default=os.environ.get("CLICKHOUSE_TESTS_BASE_CONFIG_DIR"),
@@ -185,14 +196,17 @@ if __name__ == "__main__":
     if sys.stdout.isatty() and sys.stdin.isatty():
         tty = "-it"
 
-    cmd = "docker run {net} {tty} --rm --name {name} --privileged --volume={bridge_bin}:/clickhouse-odbc-bridge --volume={bin}:/clickhouse \
+    cmd = "docker run {net} {tty} --rm --name {name} --privileged \
+        --volume={odbc_bridge_bin}:/clickhouse-odbc-bridge --volume={bin}:/clickhouse \
+        --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={name}_volume:/var/lib/docker {env_tags} -e PYTEST_OPTS='{opts}' {img} {command}".format(
         net=net,
         tty=tty,
         bin=args.binary,
-        bridge_bin=args.bridge_binary,
+        odbc_bridge_bin=args.odbc_bridge_binary,
+        library_bridge_bin=args.library_bridge_binary,
         base_cfg=args.base_configs_dir,
         cases_dir=args.cases_dir,
         src_dir=args.src_dir,
diff --git a/tests/integration/test_live_view_over_distributed/__init__.py b/tests/integration/test_catboost_model_config_reload/__init__.py
similarity index 100%
rename from tests/integration/test_live_view_over_distributed/__init__.py
rename to tests/integration/test_catboost_model_config_reload/__init__.py
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
new file mode 100644
index 00000000000..745be7cebe6
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
+</yandex>
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
new file mode 100644
index 00000000000..7e62283a83c
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/config/models_config.xml
@@ -0,0 +1,2 @@
+<yandex>
+</yandex>
diff --git a/tests/integration/test_catboost_model_config_reload/model/libcatboostmodel.so b/tests/integration/test_catboost_model_config_reload/model/libcatboostmodel.so
new file mode 100755
index 00000000000..388d9f887b4
Binary files /dev/null and b/tests/integration/test_catboost_model_config_reload/model/libcatboostmodel.so differ
diff --git a/tests/integration/test_catboost_model_config_reload/model/model.bin b/tests/integration/test_catboost_model_config_reload/model/model.bin
new file mode 100644
index 00000000000..118e099d176
Binary files /dev/null and b/tests/integration/test_catboost_model_config_reload/model/model.bin differ
diff --git a/tests/integration/test_catboost_model_config_reload/model/model_config.xml b/tests/integration/test_catboost_model_config_reload/model/model_config.xml
new file mode 100644
index 00000000000..af9778097fa
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/model/model_config.xml
@@ -0,0 +1,8 @@
+<models>
+    <model>
+        <type>catboost</type>
+        <name>model1</name>
+        <path>/etc/clickhouse-server/model/model.bin</path>
+        <lifetime>0</lifetime>
+    </model>
+</models>
diff --git a/tests/integration/test_catboost_model_config_reload/model/model_config2.xml b/tests/integration/test_catboost_model_config_reload/model/model_config2.xml
new file mode 100644
index 00000000000..b81120ec900
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/model/model_config2.xml
@@ -0,0 +1,8 @@
+<models>
+    <model>
+        <type>catboost</type>
+        <name>model2</name>
+        <path>/etc/clickhouse-server/model/model.bin</path>
+        <lifetime>0</lifetime>
+    </model>
+</models>
diff --git a/tests/integration/test_catboost_model_config_reload/test.py b/tests/integration/test_catboost_model_config_reload/test.py
new file mode 100644
index 00000000000..27652ba365e
--- /dev/null
+++ b/tests/integration/test_catboost_model_config_reload/test.py
@@ -0,0 +1,61 @@
+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=['config/models_config.xml', 'config/catboost_lib.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>
+    <models_config>/etc/clickhouse-server/model/{model_config}</models_config>
+</yandex>'''
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'model/.'), '/etc/clickhouse-server/model', node.docker_id)
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def change_config(model_config):
+    node.replace_config("/etc/clickhouse-server/config.d/models_config.xml", config.format(model_config=model_config))
+    node.query("SYSTEM RELOAD CONFIG;")
+
+
+def test(started_cluster):
+    if node.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
+    # Set config with the path to the first model.
+    change_config("model_config.xml")
+
+    node.query("SELECT modelEvaluate('model1', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
+
+    # Change path to the second model in config.
+    change_config("model_config2.xml")
+
+    # Check that the new model is loaded.
+    node.query("SELECT modelEvaluate('model2', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
+
+    # Check that the old model was unloaded.
+    node.query_and_get_error("SELECT modelEvaluate('model1', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
+
diff --git a/tests/integration/test_catboost_model_first_evaluate/test.py b/tests/integration/test_catboost_model_first_evaluate/test.py
index 1c3723b9d06..7e498ccfe21 100644
--- a/tests/integration/test_catboost_model_first_evaluate/test.py
+++ b/tests/integration/test_catboost_model_first_evaluate/test.py
@@ -32,5 +32,8 @@ def started_cluster():
 
 
 def test(started_cluster):
+    if node.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
     node.query("select modelEvaluate('titanic', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);")
-    
+
diff --git a/programs/server/data/default/.gitignore b/tests/integration/test_catboost_model_reload/__init__.py
similarity index 100%
rename from programs/server/data/default/.gitignore
rename to tests/integration/test_catboost_model_reload/__init__.py
diff --git a/tests/integration/test_catboost_model_reload/config/catboost_lib.xml b/tests/integration/test_catboost_model_reload/config/catboost_lib.xml
new file mode 100644
index 00000000000..745be7cebe6
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/config/catboost_lib.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
+</yandex>
diff --git a/tests/integration/test_catboost_model_reload/config/models_config.xml b/tests/integration/test_catboost_model_reload/config/models_config.xml
new file mode 100644
index 00000000000..e84ca8b5285
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/config/models_config.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <models_config>/etc/clickhouse-server/model/model_config.xml</models_config>
+</yandex>
diff --git a/tests/integration/test_catboost_model_reload/model/conjunction.cbm b/tests/integration/test_catboost_model_reload/model/conjunction.cbm
new file mode 100644
index 00000000000..7b75fb5f886
Binary files /dev/null and b/tests/integration/test_catboost_model_reload/model/conjunction.cbm differ
diff --git a/tests/integration/test_catboost_model_reload/model/disjunction.cbm b/tests/integration/test_catboost_model_reload/model/disjunction.cbm
new file mode 100644
index 00000000000..8145c24637f
Binary files /dev/null and b/tests/integration/test_catboost_model_reload/model/disjunction.cbm differ
diff --git a/tests/integration/test_catboost_model_reload/model/libcatboostmodel.so b/tests/integration/test_catboost_model_reload/model/libcatboostmodel.so
new file mode 100755
index 00000000000..388d9f887b4
Binary files /dev/null and b/tests/integration/test_catboost_model_reload/model/libcatboostmodel.so differ
diff --git a/tests/integration/test_catboost_model_reload/model/model_config.xml b/tests/integration/test_catboost_model_reload/model/model_config.xml
new file mode 100644
index 00000000000..7cbda165ce9
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/model/model_config.xml
@@ -0,0 +1,8 @@
+<models>
+    <model>
+        <type>catboost</type>
+        <name>model</name>
+        <path>/etc/clickhouse-server/model/model.cbm</path>
+        <lifetime>0</lifetime>
+    </model>
+</models>
diff --git a/tests/integration/test_catboost_model_reload/test.py b/tests/integration/test_catboost_model_reload/test.py
new file mode 100644
index 00000000000..3d88c19cd2c
--- /dev/null
+++ b/tests/integration/test_catboost_model_reload/test.py
@@ -0,0 +1,80 @@
+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=['config/models_config.xml', 'config/catboost_lib.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))
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'model/.'), '/etc/clickhouse-server/model', node.docker_id)
+        node.query("CREATE TABLE binary (x UInt64, y UInt64) ENGINE = TinyLog()")
+        node.query("INSERT INTO binary VALUES (1, 1), (1, 0), (0, 1), (0, 0)")
+
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def test_model_reload(started_cluster):
+    if node.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
+    node.exec_in_container(["bash", "-c", "rm -f /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/conjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODEL model")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n0\n0\n0\n'
+
+    node.exec_in_container(["bash", "-c", "rm /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/disjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODEL model")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n1\n1\n0\n'
+
+def test_models_reload(started_cluster):
+    if node.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
+    node.exec_in_container(["bash", "-c", "rm -f /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/conjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODELS")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n0\n0\n0\n'
+
+    node.exec_in_container(["bash", "-c", "rm /etc/clickhouse-server/model/model.cbm"])
+    node.exec_in_container(["bash", "-c", "ln /etc/clickhouse-server/model/disjunction.cbm /etc/clickhouse-server/model/model.cbm"])
+    node.query("SYSTEM RELOAD MODELS")
+
+    result = node.query("""
+        WITH modelEvaluate('model', toFloat64(x), toFloat64(y)) as prediction, exp(prediction) / (1 + exp(prediction)) as probability
+        SELECT if(probability > 0.5, 1, 0) FROM binary;
+        """)
+    assert result == '1\n1\n1\n0\n'
diff --git a/tests/integration/test_cluster_copier/configs/users.xml b/tests/integration/test_cluster_copier/configs/users.xml
index e742d4f05a6..d27ca56eec7 100644
--- a/tests/integration/test_cluster_copier/configs/users.xml
+++ b/tests/integration/test_cluster_copier/configs/users.xml
@@ -17,6 +17,14 @@
             <profile>default</profile>
             <quota>default</quota>
         </default>
+        <dbuser>
+            <password>12345678</password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </dbuser>
     </users>
 
     <quotas>
diff --git a/tests/integration/test_cluster_copier/task_self_copy.xml b/tests/integration/test_cluster_copier/task_self_copy.xml
new file mode 100644
index 00000000000..e0e35ccfe99
--- /dev/null
+++ b/tests/integration/test_cluster_copier/task_self_copy.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<yandex>
+    <tcp_port_secure>9440</tcp_port_secure>
+    <remote_servers>
+        <source_cluster>
+            <shard>
+                <internal_replication>false</internal_replication>
+                <replica>
+                    <host>s0_0_0</host>
+                    <port>9000</port>
+                    <user>dbuser</user>
+                    <password>12345678</password>
+                    <secure>0</secure>
+                </replica>
+            </shard>
+        </source_cluster>
+
+        <destination_cluster>
+            <shard>
+                <internal_replication>false</internal_replication>
+                <replica>
+                    <host>s0_0_0</host>
+                    <port>9000</port>
+                    <user>dbuser</user>
+                    <password>12345678</password>
+                    <secure>0</secure>
+                </replica>
+            </shard>
+        </destination_cluster>
+    </remote_servers>
+
+    <max_workers>2</max_workers>
+
+    <settings_pull>
+        <readonly>1</readonly>
+    </settings_pull>
+
+    <settings_push>
+        <readonly>0</readonly>
+    </settings_push>
+
+    <settings>
+        <connect_timeout>3</connect_timeout>
+        <insert_distributed_sync>1</insert_distributed_sync>
+    </settings>
+
+    <tables>
+        <table1>
+            <cluster_pull>source_cluster</cluster_pull>
+    	    <database_pull>db1</database_pull>
+            <table_pull>source_table</table_pull>
+
+            <cluster_push>destination_cluster</cluster_push>
+            <database_push>db2</database_push>
+            <table_push>destination_table</table_push>
+
+            <engine>
+	            ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192
+	        </engine>
+
+    	    <sharding_key>rand()</sharding_key>
+        </table1>
+    </tables>
+</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/test.py b/tests/integration/test_cluster_copier/test.py
index d87969630cd..57f9d150c8d 100644
--- a/tests/integration/test_cluster_copier/test.py
+++ b/tests/integration/test_cluster_copier/test.py
@@ -251,6 +251,31 @@ class Task_non_partitioned_table:
         instance = cluster.instances['s1_1_0']
         instance.query("DROP TABLE copier_test1_1")
 
+class Task_self_copy:
+
+    def __init__(self, cluster):
+        self.cluster = cluster
+        self.zk_task_path = "/clickhouse-copier/task_self_copy"
+        self.copier_task_config = open(os.path.join(CURRENT_TEST_DIR, 'task_self_copy.xml'), 'r').read()
+
+    def start(self):
+        instance = cluster.instances['s0_0_0']
+        instance.query("CREATE DATABASE db1;")
+        instance.query(
+            "CREATE TABLE db1.source_table (`a` Int8, `b` String, `c` Int8) ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192")
+        instance.query("CREATE DATABASE db2;")
+        instance.query(
+            "CREATE TABLE db2.destination_table (`a` Int8, `b` String, `c` Int8) ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192")
+        instance.query("INSERT INTO db1.source_table VALUES (1, 'ClickHouse', 1);")
+        instance.query("INSERT INTO db1.source_table VALUES (2, 'Copier', 2);")
+
+    def check(self):
+        instance = cluster.instances['s0_0_0']
+        assert TSV(instance.query("SELECT * FROM db2.destination_table ORDER BY a")) == TSV(instance.query("SELECT * FROM db1.source_table ORDER BY a"))
+        instance = cluster.instances['s0_0_0']
+        instance.query("DROP DATABASE db1 SYNC")
+        instance.query("DROP DATABASE db2 SYNC")
+
 
 def execute_task(task, cmd_options):
     task.start()
@@ -380,9 +405,14 @@ def test_no_index(started_cluster):
 def test_no_arg(started_cluster):
     execute_task(Task_no_arg(started_cluster), [])
 
+
 def test_non_partitioned_table(started_cluster):
     execute_task(Task_non_partitioned_table(started_cluster), [])
 
+
+def test_self_copy(started_cluster):
+    execute_task(Task_self_copy(started_cluster), [])
+
 if __name__ == '__main__':
     with contextmanager(started_cluster)() as cluster:
         for name, instance in list(cluster.instances.items()):
diff --git a/programs/server/metadata/default/.gitignore b/tests/integration/test_config_xml_full/__init__.py
similarity index 100%
rename from programs/server/metadata/default/.gitignore
rename to tests/integration/test_config_xml_full/__init__.py
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
new file mode 100644
index 00000000000..6567c39f171
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/access_control.xml
@@ -0,0 +1,13 @@
+<yandex>
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories replace="replace">
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>access/</path>
+        </local_directory>
+    </user_directories>
+</yandex>
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
new file mode 100644
index 00000000000..b21df47bc85
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml
@@ -0,0 +1,23 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <force_sync>false</force_sync>
+            <startup_timeout>60000</startup_timeout>
+            <!-- we want all logs for complex problems investigation -->
+            <reserved_log_items>1000000000000000</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
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
new file mode 100644
index 00000000000..227c53647f3
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/log_to_console.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <logger>
+        <console>true</console>
+        <log remove="remove"/>
+        <errorlog remove="remove"/>
+    </logger>
+</yandex>
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
new file mode 100644
index 00000000000..2c34585437b
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/logging_no_rotate.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <logger>
+        <!-- Disable rotation
+             https://pocoproject.org/docs/Poco.FileChannel.html
+        -->
+        <size>never</size>
+    </logger>
+</yandex>
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
new file mode 100644
index 00000000000..4902b12bc81
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/macros.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <test>Hello, world!</test>
+        <shard>s1</shard>
+        <replica>r1</replica>
+        <default_path_test>/clickhouse/tables/{database}/{shard}/</default_path_test>
+        <default_name_test>table_{table}</default_name_test>
+    </macros>
+</yandex>
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
new file mode 100644
index 00000000000..0ca9f162416
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/metric_log.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <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>
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
new file mode 100644
index 00000000000..aecbf9e0ba7
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/more_clusters.xml
@@ -0,0 +1,49 @@
+<yandex>
+    <remote_servers>
+
+        <![CDATA[
+            You can run additional servers simply as
+             ./clickhouse-server -- --path=9001 --tcp_port=9001
+        ]]>
+
+        <single_remote_shard_at_port_9001>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9001</port>
+                </replica>
+            </shard>
+        </single_remote_shard_at_port_9001>
+
+        <two_remote_shards_at_port_9001_9002>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9001</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9002</port>
+                </replica>
+            </shard>
+        </two_remote_shards_at_port_9001_9002>
+
+        <two_shards_one_local_one_remote_at_port_9001>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9001</port>
+                </replica>
+            </shard>
+        </two_shards_one_local_one_remote_at_port_9001>
+
+    </remote_servers>
+</yandex>
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
new file mode 100644
index 00000000000..6c6fc9c6982
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/part_log.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
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
new file mode 100644
index 00000000000..466ed0d1663
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/path.xml
@@ -0,0 +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>
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
new file mode 100644
index 00000000000..5a854848f3d
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- Config for test server -->
+<yandex>
+    <query_masking_rules>
+        <rule>
+            <regexp>TOPSECRET.TOPSECRET</regexp>
+            <replace>[hidden]</replace>
+        </rule>
+    </query_masking_rules>
+</yandex>
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
new file mode 100644
index 00000000000..19046054c16
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/tcp_with_proxy.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <tcp_with_proxy_port>9010</tcp_with_proxy_port>
+</yandex>
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
new file mode 100644
index 00000000000..3699a23578c
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/text_log.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+</yandex>
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
new file mode 100644
index 00000000000..06ed7fcd39f
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.d/zookeeper.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <zookeeper>
+        <node index="1">
+            <host>localhost</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml
new file mode 100644
index 00000000000..a7bb9d49e95
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/config.xml
@@ -0,0 +1,1118 @@
+<?xml version="1.0"?>
+<!--
+  NOTE: User and query level settings are set up in "users.xml" file.
+  If you have accidentally specified user-level settings here, server won't start.
+  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>
+    <logger>
+        <!-- Possible levels [1]:
+
+          - none (turns off logging)
+          - fatal
+          - critical
+          - error
+          - warning
+          - notice
+          - information
+          - debug
+          - trace
+
+            [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
+        -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <!-- Rotation policy
+             See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
+          -->
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+
+        <!-- Per level overrides (legacy):
+
+        For example to suppress logging of the ConfigReloader you can use:
+        NOTE: levels.logger is reserved, see below.
+        -->
+        <!--
+        <levels>
+          <ConfigReloader>none</ConfigReloader>
+        </levels>
+        -->
+
+        <!-- Per level overrides:
+
+        For example to suppress logging of the RBAC for default user you can use:
+        (But please note that the logger name maybe changed from version to version, even after minor upgrade)
+        -->
+        <!--
+        <levels>
+          <logger>
+            <name>ContextAccess (default)</name>
+            <level>none</level>
+          </logger>
+          <logger>
+            <name>DatabaseOrdinary (test)</name>
+            <level>none</level>
+          </logger>
+        </levels>
+        -->
+    </logger>
+
+    <!-- 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.
+    -->
+    <!--display_name>production</display_name-->
+
+    <!-- Port for HTTP API. See also 'https_port' for secure connections.
+         This interface is also used by ODBC and JDBC drivers (DataGrip, Dbeaver, ...)
+         and by most of web interfaces (embedded UI, Grafana, Redash, ...).
+      -->
+    <http_port>8123</http_port>
+
+    <!-- Port for interaction by native protocol with:
+         - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
+         - clickhouse-server with other clickhouse-servers for distributed query processing;
+         - ClickHouse drivers and applications supporting native protocol
+         (this protocol is also informally called as "the TCP protocol");
+         See also 'tcp_port_secure' for secure connections.
+    -->
+    <tcp_port>9000</tcp_port>
+
+    <!-- Compatibility with MySQL protocol.
+         ClickHouse will pretend to be MySQL for applications connecting to this port.
+    -->
+    <mysql_port>9004</mysql_port>
+
+    <!-- Compatibility with PostgreSQL protocol.
+         ClickHouse will pretend to be PostgreSQL for applications connecting to this port.
+    -->
+    <postgresql_port>9005</postgresql_port>
+
+    <!-- HTTP API with TLS (HTTPS).
+         You have to configure certificate to enable this interface.
+         See the openSSL section below.
+    -->
+    <!-- <https_port>8443</https_port> -->
+
+    <!-- Native interface with TLS.
+         You have to configure certificate to enable this interface.
+         See the openSSL section below.
+    -->
+    <!-- <tcp_port_secure>9440</tcp_port_secure> -->
+
+    <!-- Native interface wrapped with PROXYv1 protocol
+         PROXYv1 header sent for every connection.
+         ClickHouse will extract information about proxy-forwarded client address from the header.
+    -->
+    <!-- <tcp_with_proxy_port>9011</tcp_with_proxy_port> -->
+
+    <!-- Port for communication between replicas. Used for data exchange.
+         It provides low-level data access between servers.
+         This port should not be accessible from untrusted networks.
+         See also 'interserver_http_credentials'.
+         Data transferred over connections to this port should not go through untrusted networks.
+         See also 'interserver_https_port'.
+      -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Port for communication between replicas with TLS.
+         You have to configure certificate to enable this interface.
+         See the openSSL section below.
+         See also 'interserver_http_credentials'.
+      -->
+    <!-- <interserver_https_port>9010</interserver_https_port> -->
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analogous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface
+         (the server may be connected to multiple networks via multiple addresses)
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- You can specify credentials for authenthication between replicas.
+         This is required when interserver_https_port is accessible from untrusted networks,
+         and also recommended to avoid SSRF attacks from possibly compromised services in your network.
+      -->
+    <!--<interserver_http_credentials>
+        <user>interserver</user>
+        <password></password>
+    </interserver_http_credentials>-->
+
+    <!-- Listen specified address.
+         Use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere.
+         Notes:
+         If you open connections from wildcard address, make sure that at least one of the following measures applied:
+         - server is protected by firewall and not accessible from untrusted networks;
+         - all users are restricted to subset of network addresses (see users.xml);
+         - all users have strong passwords, only secure (TLS) interfaces are accessible, or connections are only made via TLS interfaces.
+         - users without password have readonly access.
+         See also: https://www.shodan.io/search?query=clickhouse
+      -->
+    <!-- <listen_host>::</listen_host> -->
+
+    <!-- Same for hosts without support for IPv6: -->
+    <!-- <listen_host>0.0.0.0</listen_host> -->
+
+    <!-- Default values - try listen localhost on IPv4 and IPv6. -->
+    <!--
+    <listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host>
+    -->
+
+    <!-- Don't exit if IPv6 or IPv4 networks are unavailable while trying to listen. -->
+    <!-- <listen_try>0</listen_try> -->
+
+    <!-- Allow multiple servers to listen on the same address:port. This is not recommended.
+      -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+
+    <!-- For 'Connection: keep-alive' in HTTP 1.1 -->
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- gRPC protocol (see src/Server/grpc_protos/clickhouse_grpc.proto for the API) -->
+    <!-- <grpc_port>9100</grpc_port> -->
+    <grpc>
+        <enable_ssl>false</enable_ssl>
+
+        <!-- The following two files are used only if enable_ssl=1 -->
+        <ssl_cert_file>/path/to/ssl_cert_file</ssl_cert_file>
+        <ssl_key_file>/path/to/ssl_key_file</ssl_key_file>
+
+        <!-- Whether server will request client for a certificate -->
+        <ssl_require_client_auth>false</ssl_require_client_auth>
+
+        <!-- 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).
+             Supported algorithms: none, deflate, gzip, stream_gzip -->
+        <compression>deflate</compression>
+
+        <!-- Default compression level (applied if client doesn't specify another level).
+             Supported levels: none, low, medium, high -->
+        <compression_level>medium</compression_level>
+
+        <!-- Send/receive message size limits in bytes. -1 means unlimited -->
+        <max_send_message_size>-1</max_send_message_size>
+        <max_receive_message_size>-1</max_receive_message_size>
+
+        <!-- Enable if you want very detailed logs -->
+        <verbose_logs>false</verbose_logs>
+    </grpc>
+
+    <!-- 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 -->
+            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
+            <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- dhparams are optional. You can delete the <dhParamsFile> element.
+                 To generate dhparams, use the following command:
+                  openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096
+                 Only file format with BEGIN DH PARAMETERS is supported.
+              -->
+            <dhParamsFile>/etc/clickhouse-server/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>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <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>
+    -->
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Maximum memory usage (resident set size) for server process.
+         Zero value or unset means default. Default is "max_server_memory_usage_to_ram_ratio" of available physical RAM.
+         If the value is larger than "max_server_memory_usage_to_ram_ratio" of available physical RAM, it will be cut down.
+
+         The constraint is checked on query execution time.
+         If a query tries to allocate memory and the current memory usage plus allocation is greater
+          than specified threshold, exception will be thrown.
+
+         It is not practical to set this constraint to small values like just a few gigabytes,
+          because memory allocator will keep this amount of memory in caches and the server will deny service of queries.
+      -->
+    <max_server_memory_usage>0</max_server_memory_usage>
+
+    <!-- Maximum number of threads in the Global thread pool.
+    This will default to a maximum of 10000 threads if not specified.
+    This setting will be useful in scenarios where there are a large number
+    of distributed queries that are running concurrently but are idling most
+    of the time, in which case a higher number of threads might be required.
+    -->
+
+    <max_thread_pool_size>10000</max_thread_pool_size>
+
+    <!-- On memory constrained environments you may have to set this to value larger than 1.
+      -->
+    <max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>
+
+    <!-- Simple server-wide memory profiler. Collect a stack trace at every peak allocation step (in bytes).
+         Data will be stored in system.trace_log table with query_id = empty string.
+         Zero means disabled.
+      -->
+    <total_memory_profiler_step>4194304</total_memory_profiler_step>
+
+    <!-- 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 the untracked memory limit,
+          which is 4 MiB by default but can be lowered if 'total_memory_profiler_step' is lowered.
+         You may want to set 'total_memory_profiler_step' to 1 for extra fine grained sampling.
+      -->
+    <total_memory_tracker_sample_probability>0</total_memory_tracker_sample_probability>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+
+         Note: uncompressed cache can be pointless for lz4, because memory bandwidth
+         is slower than multi-core decompression on some server configurations.
+         Enabling it can sometimes paradoxically make queries slower.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- If you enable the `min_bytes_to_use_mmap_io` setting,
+         the data in MergeTree tables can be read with mmap to avoid copying from kernel to userspace.
+         It makes sense only for large files and helps only if data reside in page cache.
+         To avoid frequent open/mmap/munmap/close calls (which are very expensive due to consequent page faults)
+         and to reuse mappings from several threads and queries,
+         the cache of mapped files is maintained. Its size is the number of mapped regions (usually equal to the number of mapped files).
+         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
+         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.
+         The cache is dropped (the files are closed) automatically on removal of old parts in MergeTree,
+         also it can be dropped manually by the SYSTEM DROP MMAP CACHE query.
+      -->
+    <mmap_cache_size>1000</mmap_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Policy from the <storage_configuration> for the temporary files.
+         If not set <tmp_path> is used, otherwise <tmp_path> is ignored.
+
+         Notes:
+         - move_factor              is ignored
+         - keep_free_space_bytes    is ignored
+         - max_data_part_size_bytes is ignored
+         - you must have exactly one volume in that policy
+    -->
+    <!-- <tmp_policy>tmp</tmp_policy> -->
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- LDAP server definitions. -->
+    <ldap_servers>
+        <!-- List LDAP servers with their connection parameters here to later 1) use them as authenticators for dedicated local users,
+              who have 'ldap' authentication mechanism specified instead of 'password', or to 2) use them as remote user directories.
+             Parameters:
+                host - LDAP server hostname or IP, this parameter is mandatory and cannot be empty.
+                port - LDAP server port, default is 636 if enable_tls is set to true, 389 otherwise.
+                bind_dn - template used to construct the DN to bind to.
+                        The resulting DN will be constructed by replacing all '{user_name}' substrings of the template with the actual
+                         user name during each authentication attempt.
+                verification_cooldown - a period of time, in seconds, after a successful bind attempt, during which a user will be assumed
+                         to be successfully authenticated for all consecutive requests without contacting the LDAP server.
+                        Specify 0 (the default) to disable caching and force contacting the LDAP server for each authentication request.
+                enable_tls - flag to trigger use of secure connection to the LDAP server.
+                        Specify 'no' for plain text (ldap://) protocol (not recommended).
+                        Specify 'yes' for LDAP over SSL/TLS (ldaps://) protocol (recommended, the default).
+                        Specify 'starttls' for legacy StartTLS protocol (plain text (ldap://) protocol, upgraded to TLS).
+                tls_minimum_protocol_version - the minimum protocol version of SSL/TLS.
+                        Accepted values are: 'ssl2', 'ssl3', 'tls1.0', 'tls1.1', 'tls1.2' (the default).
+                tls_require_cert - SSL/TLS peer certificate verification behavior.
+                        Accepted values are: 'never', 'allow', 'try', 'demand' (the default).
+                tls_cert_file - path to certificate file.
+                tls_key_file - path to certificate key file.
+                tls_ca_cert_file - path to CA certificate file.
+                tls_ca_cert_dir - path to the directory containing CA certificates.
+                tls_cipher_suite - allowed cipher suite (in OpenSSL notation).
+             Example:
+                <my_ldap_server>
+                    <host>localhost</host>
+                    <port>636</port>
+                    <bind_dn>uid={user_name},ou=users,dc=example,dc=com</bind_dn>
+                    <verification_cooldown>300</verification_cooldown>
+                    <enable_tls>yes</enable_tls>
+                    <tls_minimum_protocol_version>tls1.2</tls_minimum_protocol_version>
+                    <tls_require_cert>demand</tls_require_cert>
+                    <tls_cert_file>/path/to/tls_cert_file</tls_cert_file>
+                    <tls_key_file>/path/to/tls_key_file</tls_key_file>
+                    <tls_ca_cert_file>/path/to/tls_ca_cert_file</tls_ca_cert_file>
+                    <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>
+        -->
+    </ldap_servers>
+
+    <!-- To enable Kerberos authentication support for HTTP requests (GSS-SPNEGO), for those users who are explicitly configured
+          to authenticate via Kerberos, define a single 'kerberos' section here.
+         Parameters:
+            principal - canonical service principal name, that will be acquired and used when accepting security contexts.
+                    This parameter is optional, if omitted, the default principal will be used.
+                    This parameter cannot be specified together with 'realm' parameter.
+            realm - a realm, that will be used to restrict authentication to only those requests whose initiator's realm matches it.
+                    This parameter is optional, if omitted, no additional filtering by realm will be applied.
+                    This parameter cannot be specified together with 'principal' parameter.
+         Example:
+            <kerberos />
+         Example:
+            <kerberos>
+                <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
+            </kerberos>
+         Example:
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+    -->
+
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories>
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+
+        <!-- To add an LDAP server as a remote user directory of users that are not defined locally, define a single 'ldap' section
+              with the following parameters:
+                server - one of LDAP server names defined in 'ldap_servers' config section above.
+                        This parameter is mandatory and cannot be empty.
+                roles - section with a list of locally defined roles that will be assigned to each user retrieved from the LDAP server.
+                        If no roles are specified here or assigned during role mapping (below), user will not be able to perform any
+                         actions after authentication.
+                role_mapping - section with LDAP search parameters and mapping rules.
+                        When a user authenticates, while still bound to LDAP, an LDAP search is performed using search_filter and the
+                         name of the logged in user. For each entry found during that search, the value of the specified attribute is
+                         extracted. For each attribute value that has the specified prefix, the prefix is removed, and the rest of the
+                         value becomes the name of a local role defined in ClickHouse, which is expected to be created beforehand by
+                         CREATE ROLE command.
+                        There can be multiple 'role_mapping' sections defined inside the same 'ldap' section. All of them will be
+                         applied.
+                    base_dn - template used to construct the base DN for the LDAP search.
+                            The resulting DN will be constructed by replacing all '{user_name}' and '{bind_dn}' substrings
+                             of the template with the actual user name and bind DN during each LDAP search.
+                    scope - scope of the LDAP search.
+                            Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
+                    search_filter - template used to construct the search filter for the LDAP search.
+                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', and '{base_dn}'
+                             substrings of the template with the actual user name, bind DN, and base DN during each LDAP search.
+                            Note, that the special characters must be escaped properly in XML.
+                    attribute - attribute name whose values will be returned by the LDAP search.
+                    prefix - prefix, that will be expected to be in front of each string in the original list of strings returned by
+                             the LDAP search. Prefix will be removed from the original strings and resulting strings will be treated
+                             as local role names. Empty, by default.
+             Example:
+                <ldap>
+                    <server>my_ldap_server</server>
+                    <roles>
+                        <my_local_role1 />
+                        <my_local_role2 />
+                    </roles>
+                    <role_mapping>
+                        <base_dn>ou=groups,dc=example,dc=com</base_dn>
+                        <scope>subtree</scope>
+                        <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
+                        <attribute>cn</attribute>
+                        <prefix>clickhouse_</prefix>
+                    </role_mapping>
+                </ldap>
+        -->
+    </user_directories>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- Comma-separated list of prefixes for user-defined settings. -->
+    <custom_settings_prefixes></custom_settings_prefixes>
+
+    <!-- System profile of settings. This settings are used by internal processes (Distributed DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Buffer profile of settings.
+         This settings are used by Buffer storage to flush data to the underlying table.
+         Default: used from system_profile directive.
+    -->
+    <!-- <buffer_profile>default</buffer_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Perform mlockall after startup to lower first queries latency
+          and to prevent clickhouse executable from being paged out under high IO load.
+         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+    -->
+    <mlock_executable>true</mlock_executable>
+
+    <!-- Reallocate memory for machine code ("text") using huge pages. Highly experimental. -->
+    <remap_executable>false</remap_executable>
+
+    <![CDATA[
+         Uncomment below in order to use JDBC table engine and function.
+
+         To install and run JDBC bridge in background:
+         * [Debian/Ubuntu]
+           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
+           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
+           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+           apt install --no-install-recommends -f ./clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
+           clickhouse-jdbc-bridge &
+
+         * [CentOS/RHEL]
+           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
+           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
+           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+           yum localinstall -y clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
+           clickhouse-jdbc-bridge &
+
+         Please refer to https://github.com/ClickHouse/clickhouse-jdbc-bridge#usage for more information.
+    ]]>
+    <!--
+    <jdbc_bridge>
+        <host>127.0.0.1</host>
+        <port>9019</port>
+    </jdbc_bridge>
+    -->
+  
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.tech/docs/en/operations/table_engines/distributed/
+      -->
+    <remote_servers>
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <!-- Inter-server per-cluster secret for Distributed queries
+                 default: no secret (no authentication will be performed)
+
+                 If set, then Distributed queries will be validated on shards, so at least:
+                 - such cluster should exist on the shard,
+                 - such cluster should have the same secret.
+
+                 And also (and which is more important), the initial_user will
+                 be used as current user for the query.
+
+                 Right now the protocol is pretty simple and it only takes into account:
+                 - cluster name
+                 - query
+
+                 Also it will be nice if the following will be implemented:
+                 - source hostname (see interserver_http_host), but then it will depends from DNS,
+                   it can use IP address instead, but then the you need to get correct on the initiator node.
+                 - target hostname / ip address (same notes as for source hostname)
+                 - time-based security tokens
+            -->
+            <!-- <secret></secret> -->
+
+            <shard>
+                <!-- Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas). -->
+                <!-- <internal_replication>false</internal_replication> -->
+                <!-- Optional. Shard weight when writing data. Default: 1. -->
+                <!-- <weight>1</weight> -->
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                    <!-- Optional. Priority of the replica for load_balancing. Default: 1 (less value has more priority). -->
+                    <!-- <priority>1</priority> -->
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+        </test_cluster_two_shards_localhost>
+        <test_cluster_two_shards>
+            <shard>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>127.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_two_shards>
+        <test_cluster_two_shards_internal_replication>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>127.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_two_shards_internal_replication>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </remote_servers>
+
+    <!-- The list of hosts allowed to use in URL-related storage engines and table functions.
+        If this section is not present in configuration, all hosts are allowed.
+    -->
+    <!--<remote_url_allow_hosts>-->
+        <!-- Host should be specified exactly as in URL. The name is checked before DNS resolution.
+            Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
+                    If port is explicitly specified in URL, the host:port is checked as a whole.
+                    If host specified here without port, any port with this host allowed.
+                    "yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed.
+            If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
+            If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked.
+        -->
+
+        <!-- Regular expression can be specified. RE2 engine is used for regexps.
+            Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
+            (forgetting to do so is a common source of error).
+        -->
+    <!--</remote_url_allow_hosts>-->
+
+    <!-- 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.
+      -->
+
+    <!-- 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/
+      -->
+
+    <!--
+    <zookeeper>
+        <node>
+            <host>example1</host>
+            <port>2181</port>
+        </node>
+        <node>
+            <host>example2</host>
+            <port>2181</port>
+        </node>
+        <node>
+            <host>example3</host>
+            <port>2181</port>
+        </node>
+    </zookeeper>
+    -->
+
+    <!-- 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
+      -->
+    <!--
+    <macros>
+        <shard>01</shard>
+        <replica>example01-01-1</replica>
+    </macros>
+    -->
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <events_cumulative>false</events_cumulative>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <events_cumulative>false</events_cumulative>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+    <!-- Serve endpoint for Prometheus monitoring. -->
+    <!--
+        endpoint - mertics path (relative to root, statring with "/")
+        port - port to setup server. If not defined or 0 than http_port used
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+        status_info - send data from different component from CH, ex: Dictionaries status
+    -->
+    <!--
+    <prometheus>
+        <endpoint>/metrics</endpoint>
+        <port>9363</port>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+        <status_info>true</status_info>
+    </prometheus>
+    -->
+
+    <!-- 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.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr: https://clickhouse.yandex/docs/en/table_engines/mergetree-family/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!--
+            Table TTL specification: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
+            Example:
+                event_date + INTERVAL 1 WEEK
+                event_date + INTERVAL 7 DAY DELETE
+                event_date + INTERVAL 2 WEEK TO DISK 'bbb'
+
+        <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
+        -->
+
+        <!-- Instead of partition_by, you can provide full engine expression (starting with ENGINE = ) with parameters,
+             Example: <engine>ENGINE = MergeTree PARTITION BY toYYYYMM(event_date) ORDER BY (event_date, event_time) SETTINGS index_granularity = 1024</engine>
+          -->
+
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <!-- Trace log. Stores stack traces collected by query profilers.
+         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <!-- Query thread log. Has information about all threads participated in query execution.
+         Used only for queries with setting log_query_threads = 1. -->
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </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>
+        <database>system</database>
+        <table>part_log</table>
+        <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.
+         The level of the messages that goes to the table can be limited (<level>), if not specified all messages will go to the table.
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <level></level>
+    </text_log>
+    -->
+
+    <!-- Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval. -->
+    <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>
+
+    <!--
+        Asynchronous metric log contains values of metrics from
+        system.asynchronous_metrics.
+    -->
+    <asynchronous_metric_log>
+        <database>system</database>
+        <table>asynchronous_metric_log</table>
+        <!--
+            Asynchronous metrics are updated once a minute, so there is
+            no need to flush more often.
+        -->
+        <flush_interval_milliseconds>60000</flush_interval_milliseconds>
+    </asynchronous_metric_log>
+
+    <!--
+        OpenTelemetry log contains OpenTelemetry trace spans.
+    -->
+    <opentelemetry_span_log>
+        <!--
+            The default table creation code is insufficient, this <engine> spec
+            is a workaround. There is no 'event_time' for this log, but two times,
+            start and finish. It is sorted by finish time, to avoid inserting
+            data too far away in the past (probably we can sometimes insert a span
+            that is seconds earlier than the last span in the table, due to a race
+            between several spans inserted in parallel). This gives the spans a
+            global order that we can use to e.g. retry insertion into some external
+            system.
+        -->
+        <engine>
+            engine MergeTree
+            partition by toYYYYMM(finish_date)
+            order by (finish_date, finish_time_us, trace_id)
+        </engine>
+        <database>system</database>
+        <table>opentelemetry_span_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </opentelemetry_span_log>
+
+
+    <!-- Crash log. Stores stack traces for fatal errors.
+         This table is normally empty. -->
+    <crash_log>
+        <database>system</database>
+        <table>crash_log</table>
+
+        <partition_by />
+        <flush_interval_milliseconds>1000</flush_interval_milliseconds>
+    </crash_log>
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- <top_level_domains_path>/var/lib/clickhouse/top_level_domains/</top_level_domains_path> -->
+    <!-- Custom TLD lists.
+         Format: <name>/path/to/file</name>
+
+         Changes will not be applied w/o server restart.
+         Path to the list is under top_level_domains_path (see above).
+    -->
+    <top_level_domains_lists>
+        <!--
+        <public_suffix_list>/path/to/public_suffix_list.dat</public_suffix_list>
+        -->
+    </top_level_domains_lists>
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.tech/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <!--
+    <compression>
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    </compression>
+    -->
+
+    <!-- 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. -->
+    <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>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to change clickhouse-server config, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+    <!-- Default query masking rules, matching lines would be replaced with something else in the logs
+        (both text logs and system.query_log).
+        name - name for the rule (optional)
+        regexp - RE2 compatible regular expression (mandatory)
+        replace - substitution string for sensitive data (optional, by default - six asterisks)
+    -->
+    <query_masking_rules>
+        <rule>
+            <name>hide encrypt/decrypt arguments</name>
+            <regexp>((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:'(?:\\'|.)+'|.*?)\s*\)</regexp>
+            <!-- or more secure, but also more invasive:
+                (aes_\w+)\s*\(.*\)
+            -->
+            <replace>\1(???)</replace>
+        </rule>
+    </query_masking_rules>
+
+    <!-- Uncomment to use custom http handlers.
+        rules are checked from top to bottom, first match runs the handler
+            url - to match request URL, you can use 'regex:' prefix to use regex match(optional)
+            methods - to match request method, you can use commas to separate multiple method matches(optional)
+            headers - to match request headers, match each child element(child element name is header name), you can use 'regex:' prefix to use regex match(optional)
+        handler is request handler
+            type - supported types: static, dynamic_query_handler, predefined_query_handler
+            query - use with predefined_query_handler type, executes query when the handler is called
+            query_param_name - use with dynamic_query_handler type, extracts and executes the value corresponding to the <query_param_name> value in HTTP request params
+            status - use with static type, response status code
+            content_type - use with static type, response content-type
+            response_content - use with static type, Response content sent to client, when using the prefix 'file://' or 'config://', find the content from the file or configuration send to client.
+
+    <http_handlers>
+        <rule>
+            <url>/</url>
+            <methods>POST,GET</methods>
+            <headers><pragma>no-cache</pragma></headers>
+            <handler>
+                <type>dynamic_query_handler</type>
+                <query_param_name>query</query_param_name>
+            </handler>
+        </rule>
+
+        <rule>
+            <url>/predefined_query</url>
+            <methods>POST,GET</methods>
+            <handler>
+                <type>predefined_query_handler</type>
+                <query>SELECT * FROM system.settings</query>
+            </handler>
+        </rule>
+
+        <rule>
+            <handler>
+                <type>static</type>
+                <status>200</status>
+                <content_type>text/plain; charset=UTF-8</content_type>
+                <response_content>config://http_server_default_response</response_content>
+            </handler>
+        </rule>
+    </http_handlers>
+    -->
+
+    <send_crash_reports>
+        <!-- Changing <enabled> to true allows sending crash reports to -->
+        <!-- the ClickHouse core developers team via Sentry https://sentry.io -->
+        <!-- Doing so at least in pre-production environments is highly appreciated -->
+        <enabled>false</enabled>
+        <!-- Change <anonymize> to true if you don't feel comfortable attaching the server hostname to the crash report -->
+        <anonymize>false</anonymize>
+        <!-- Default endpoint should be changed to different Sentry DSN only if you have -->
+        <!-- some in-house engineers or hired consultants who're going to debug ClickHouse issues for you -->
+        <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
+    </send_crash_reports>
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>
diff --git a/tests/integration/test_config_xml_full/configs/embedded.xml b/tests/integration/test_config_xml_full/configs/embedded.xml
new file mode 100644
index 00000000000..a66f57d1eb7
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/embedded.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!-- Config that is used when server is run without config file. -->
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</yandex>
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
new file mode 100644
index 00000000000..b94e95bc043
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <allow_introspection_functions>1</allow_introspection_functions>
+        </default>
+    </profiles>
+</yandex>
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
new file mode 100644
index 00000000000..25261072ade
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/users.d/log_queries.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <profiles>
+        <default>
+            <log_queries>1</log_queries>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_config_xml_full/configs/users.xml b/tests/integration/test_config_xml_full/configs/users.xml
new file mode 100644
index 00000000000..829748dafb1
--- /dev/null
+++ b/tests/integration/test_config_xml_full/configs/users.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<yandex>
+    <!-- Profiles of settings. -->
+    <profiles>
+        <!-- Default settings. -->
+        <default>
+            <!-- Maximum memory usage for processing single query, in bytes. -->
+            <max_memory_usage>10000000000</max_memory_usage>
+            <max_block_size>64999</max_block_size>
+
+            <!-- How to choose between replicas during distributed query processing.
+                 random - choose random replica from set of replicas with minimum number of errors
+                 nearest_hostname - from set of replicas with minimum number of errors, choose replica
+                  with minimum number of different symbols between replica's hostname and local hostname
+                  (Hamming distance).
+                 in_order - first live replica is chosen in specified order.
+                 first_or_random - if first replica one has higher number of errors, pick a random one from replicas with minimum number of errors.
+            -->
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <!-- Profile that allows only read queries. -->
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <!-- Users and ACL. -->
+    <users>
+        <!-- If user name was not specified, 'default' user is used. -->
+        <default>
+            <!-- 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>.
+                 Password could be empty.
+
+                 If you want to specify SHA256, place it in 'password_sha256_hex' element.
+                 Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
+                 Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
+
+                 If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
+                 Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
+
+                 If you want to specify a previously defined LDAP server (see 'ldap_servers' in the main config) for authentication,
+                  place its name in 'server' element inside 'ldap' element.
+                 Example: <ldap><server>my_ldap_server</server></ldap>
+
+                 If you want to authenticate the user via Kerberos (assuming Kerberos is enabled, see 'kerberos' in the main config),
+                  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. 
+                 Example: <kerberos />
+                 Example: <kerberos><realm>EXAMPLE.COM</realm></kerberos>
+
+                 How to generate decent password:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+                 In first line will be password and in second - corresponding SHA256.
+
+                 How to generate double SHA1:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha1sum | tr -d '-' | xxd -r -p | sha1sum | tr -d '-'
+                 In first line will be password and in second - corresponding double SHA1.
+            -->
+            <password></password>
+
+            <!-- List of networks with open access.
+
+                 To open access from everywhere, specify:
+                    <ip>::/0</ip>
+
+                 To open access only from localhost, specify:
+                    <ip>::1</ip>
+                    <ip>127.0.0.1</ip>
+
+                 Each element of list has one of the following forms:
+                 <ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+                     2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+                 <host> Hostname. Example: server01.yandex.ru.
+                     To check access, DNS query is performed, and all received addresses compared to peer address.
+                 <host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+                     To check access, DNS PTR query is performed for peer address and then regexp is applied.
+                     Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+                     Strongly recommended that regexp is ends with $
+                 All results of DNS requests are cached till server restart.
+            -->
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <!-- Settings profile for user. -->
+            <profile>default</profile>
+
+            <!-- Quota for user. -->
+            <quota>default</quota>
+
+            <!-- User can create other users and grant rights to them. -->
+            <!-- <access_management>1</access_management> -->
+        </default>
+    </users>
+
+    <!-- Quotas. -->
+    <quotas>
+        <!-- Name of quota. -->
+        <default>
+            <!-- Limits for time interval. You could specify many intervals with different limits. -->
+            <interval>
+                <!-- Length of interval. -->
+                <duration>3600</duration>
+
+                <!-- No limits. Just calculate resource usage for time interval. -->
+                <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>
diff --git a/tests/integration/test_config_xml_full/test.py b/tests/integration/test_config_xml_full/test.py
new file mode 100644
index 00000000000..a8650a0dc55
--- /dev/null
+++ b/tests/integration/test_config_xml_full/test.py
@@ -0,0 +1,40 @@
+import time
+import threading
+from os import path as p, unlink
+from tempfile import NamedTemporaryFile
+
+import helpers
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+
+def test_xml_full_conf():
+    # all configs are in XML
+    cluster = ClickHouseCluster(__file__, zookeeper_config_path='configs/config.d/zookeeper.xml')
+
+    all_confd = ['configs/config.d/access_control.xml',
+                'configs/config.d/keeper_port.xml',
+                'configs/config.d/logging_no_rotate.xml',
+                'configs/config.d/log_to_console.xml',
+                'configs/config.d/macros.xml',
+                'configs/config.d/metric_log.xml',
+                'configs/config.d/more_clusters.xml',
+                'configs/config.d/part_log.xml',
+                'configs/config.d/path.xml',
+                'configs/config.d/query_masking_rules.xml',
+                'configs/config.d/tcp_with_proxy.xml',
+                'configs/config.d/text_log.xml',
+                'configs/config.d/zookeeper.xml']
+
+    all_userd = ['configs/users.d/allow_introspection_functions.xml',
+                '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)
+
+    try:
+        cluster.start()
+        assert(node.query("select value from system.settings where name = 'max_memory_usage'") == "10000000000\n")
+        assert(node.query("select value from system.settings where name = 'max_block_size'") == "64999\n")
+
+    finally:
+        cluster.shutdown()
diff --git a/src/Processors/tests/CMakeLists.txt b/tests/integration/test_config_xml_main/__init__.py
similarity index 100%
rename from src/Processors/tests/CMakeLists.txt
rename to tests/integration/test_config_xml_main/__init__.py
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
new file mode 100644
index 00000000000..d8ead517c86
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
@@ -0,0 +1,7 @@
+user_directories:
+  users_xml:
+    path: users.xml
+  local_directory:
+    path: access/
+  "@replace": replace
+
diff --git a/tests/integration/test_config_xml_main/configs/config.d/keeper_port.yaml b/tests/integration/test_config_xml_main/configs/config.d/keeper_port.yaml
new file mode 100644
index 00000000000..91723bc372f
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/keeper_port.yaml
@@ -0,0 +1,15 @@
+keeper_server:
+  tcp_port: 9181
+  server_id: 1
+  coordination_settings:
+    operation_timeout_ms: 10000
+    session_timeout_ms: 30000
+    force_sync: false
+    startup_timeout: 60000
+    reserved_log_items: 1000000000000000
+  raft_configuration:
+    server:
+      id: 1
+      hostname: localhost
+      port: 44444
+
diff --git a/tests/integration/test_config_xml_main/configs/config.d/log_to_console.yaml b/tests/integration/test_config_xml_main/configs/config.d/log_to_console.yaml
new file mode 100644
index 00000000000..7b59339800b
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/log_to_console.yaml
@@ -0,0 +1,7 @@
+logger:
+  console: true
+  log:
+    "@remove": remove
+  errorlog:
+    "@remove": remove
+
diff --git a/tests/integration/test_config_xml_main/configs/config.d/logging_no_rotate.yaml b/tests/integration/test_config_xml_main/configs/config.d/logging_no_rotate.yaml
new file mode 100644
index 00000000000..513cd3f7dc5
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/logging_no_rotate.yaml
@@ -0,0 +1,2 @@
+logger:
+  size: never
diff --git a/tests/integration/test_config_xml_main/configs/config.d/macros.yaml b/tests/integration/test_config_xml_main/configs/config.d/macros.yaml
new file mode 100644
index 00000000000..a9c61e270ab
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/macros.yaml
@@ -0,0 +1,7 @@
+macros:
+  test: 'Hello, world!'
+  shard: s1
+  replica: r1
+  default_path_test: '/clickhouse/tables/{database}/{shard}/'
+  default_name_test: 'table_{table}'
+
diff --git a/tests/integration/test_config_xml_main/configs/config.d/metric_log.yaml b/tests/integration/test_config_xml_main/configs/config.d/metric_log.yaml
new file mode 100644
index 00000000000..aafad939c37
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/metric_log.yaml
@@ -0,0 +1,6 @@
+metric_log:
+  database: system
+  table: metric_log
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
+
diff --git a/tests/integration/test_config_xml_main/configs/config.d/more_clusters.yaml b/tests/integration/test_config_xml_main/configs/config.d/more_clusters.yaml
new file mode 100644
index 00000000000..7da07190894
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/more_clusters.yaml
@@ -0,0 +1,23 @@
+remote_servers:
+  single_remote_shard_at_port_9001:
+    shard:
+      replica:
+        host: localhost
+        port: 9001
+  two_remote_shards_at_port_9001_9002:
+    shard:
+      - replica:
+          host: localhost
+          port: 9001
+      - replica:
+          host: localhost
+          port: 9002
+  two_shards_one_local_one_remote_at_port_9001:
+    shard:
+      - replica:
+          host: localhost
+          port: 9000
+      - replica:
+          host: localhost
+          port: 9001
+
diff --git a/tests/integration/test_config_xml_main/configs/config.d/part_log.yaml b/tests/integration/test_config_xml_main/configs/config.d/part_log.yaml
new file mode 100644
index 00000000000..43f60146dca
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/part_log.yaml
@@ -0,0 +1,5 @@
+part_log:
+  database: system
+  table: part_log
+  flush_interval_milliseconds: 7500
+
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
new file mode 100644
index 00000000000..3e26e8906ee
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/path.yaml
@@ -0,0 +1,18 @@
+path:
+  - ./
+  - "@replace": replace
+tmp_path:
+  - ./tmp/
+  - "@replace": replace
+user_files_path:
+  - ./user_files/
+  - "@replace": replace
+format_schema_path:
+  - ./format_schemas/
+  - "@replace": replace
+access_control_path:
+  - ./access/
+  - "@replace": replace
+top_level_domains_path:
+  - ./top_level_domains/
+  - "@replace": replace
diff --git a/tests/integration/test_config_xml_main/configs/config.d/query_masking_rules.yaml b/tests/integration/test_config_xml_main/configs/config.d/query_masking_rules.yaml
new file mode 100644
index 00000000000..38163429d81
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/query_masking_rules.yaml
@@ -0,0 +1,4 @@
+query_masking_rules:
+  rule:
+    regexp: TOPSECRET.TOPSECRET
+    replace: '[hidden]'
diff --git a/tests/integration/test_config_xml_main/configs/config.d/tcp_with_proxy.yaml b/tests/integration/test_config_xml_main/configs/config.d/tcp_with_proxy.yaml
new file mode 100644
index 00000000000..b0349f5a9b9
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/tcp_with_proxy.yaml
@@ -0,0 +1 @@
+tcp_with_proxy_port: 9010
diff --git a/tests/integration/test_config_xml_main/configs/config.d/test_cluster_with_incorrect_pw.yaml b/tests/integration/test_config_xml_main/configs/config.d/test_cluster_with_incorrect_pw.yaml
new file mode 100644
index 00000000000..309a7daa81d
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/test_cluster_with_incorrect_pw.yaml
@@ -0,0 +1,11 @@
+remote_servers:
+  test_cluster_with_incorrect_pw:
+    shard:
+      internal_replication: true
+      replica:
+        - host: 127.0.0.1
+          port: 9000
+          password: foo
+        - host: 127.0.0.2
+          port: 9000
+          password: foo
diff --git a/tests/integration/test_config_xml_main/configs/config.d/text_log.yaml b/tests/integration/test_config_xml_main/configs/config.d/text_log.yaml
new file mode 100644
index 00000000000..4d188020e37
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/text_log.yaml
@@ -0,0 +1,4 @@
+text_log:
+  database: system
+  table: text_log
+  flush_interval_milliseconds: 7500
diff --git a/tests/integration/test_config_xml_main/configs/config.d/zookeeper.yaml b/tests/integration/test_config_xml_main/configs/config.d/zookeeper.yaml
new file mode 100644
index 00000000000..be02c516798
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.d/zookeeper.yaml
@@ -0,0 +1,5 @@
+zookeeper:
+  node:
+    host: localhost
+    port: 9181
+    "@index": 1
diff --git a/tests/integration/test_config_xml_main/configs/config.xml b/tests/integration/test_config_xml_main/configs/config.xml
new file mode 100644
index 00000000000..3b5dab50ffe
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/config.xml
@@ -0,0 +1,277 @@
+<?xml version="1.0"?>
+<yandex>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+    </logger>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+    <postgresql_port>9005</postgresql_port>
+    <interserver_http_port>9009</interserver_http_port>
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+    <grpc>
+        <enable_ssl>false</enable_ssl>
+        <ssl_cert_file>/path/to/ssl_cert_file</ssl_cert_file>
+        <ssl_key_file>/path/to/ssl_key_file</ssl_key_file>
+        <ssl_require_client_auth>false</ssl_require_client_auth>
+        <ssl_ca_cert_file>/path/to/ssl_ca_cert_file</ssl_ca_cert_file>
+        <compression>deflate</compression>
+        <compression_level>medium</compression_level>
+        <max_send_message_size>-1</max_send_message_size>
+        <max_receive_message_size>-1</max_receive_message_size>
+        <verbose_logs>false</verbose_logs>
+    </grpc>
+    <openSSL>
+        <server> 
+            <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+
+        <client>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <invalidCertificateHandler>
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+    <max_concurrent_queries>100</max_concurrent_queries>
+    <max_server_memory_usage>0</max_server_memory_usage>
+    <max_thread_pool_size>10000</max_thread_pool_size>
+
+    <max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>
+
+    <total_memory_profiler_step>4194304</total_memory_profiler_step>
+
+    <total_memory_tracker_sample_probability>0</total_memory_tracker_sample_probability>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <mark_cache_size>5368709120</mark_cache_size>
+
+    <mmap_cache_size>1000</mmap_cache_size>
+
+    <path>/var/lib/clickhouse/</path>
+
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <ldap_servers>
+    </ldap_servers>
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+    <default_profile>default</default_profile>
+    <custom_settings_prefixes></custom_settings_prefixes>
+    <default_database>default</default_database>
+    <mlock_executable>true</mlock_executable>
+
+    <remap_executable>false</remap_executable>
+    <remote_servers>
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+        </test_cluster_two_shards_localhost>
+        <test_cluster_two_shards>
+            <shard>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>127.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_two_shards>
+        <test_cluster_two_shards_internal_replication>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>127.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_two_shards_internal_replication>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </remote_servers>
+
+    <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>
+        
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_thread_log>
+
+    <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>
+
+    <asynchronous_metric_log>
+        <database>system</database>
+        <table>asynchronous_metric_log</table>
+
+        <flush_interval_milliseconds>60000</flush_interval_milliseconds>
+    </asynchronous_metric_log>
+
+    <opentelemetry_span_log>
+        <engine>
+            engine MergeTree
+            partition by toYYYYMM(finish_date)
+            order by (finish_date, finish_time_us, trace_id)
+        </engine>
+        <database>system</database>
+        <table>opentelemetry_span_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </opentelemetry_span_log>
+
+    <crash_log>
+        <database>system</database>
+        <table>crash_log</table>
+
+        <partition_by />
+        <flush_interval_milliseconds>1000</flush_interval_milliseconds>
+    </crash_log>
+
+    <top_level_domains_lists>
+    </top_level_domains_lists>
+
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+    <distributed_ddl>
+        <path>/clickhouse/task_queue/ddl</path>
+    </distributed_ddl>
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+    <query_masking_rules>
+        <rule>
+            <name>hide encrypt/decrypt arguments</name>
+            <regexp>((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:'(?:\\'|.)+'|.*?)\s*\)</regexp>
+            <replace>\1(???)</replace>
+        </rule>
+    </query_masking_rules>
+    <send_crash_reports>
+        <enabled>false</enabled>
+        <anonymize>false</anonymize>
+        <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
+    </send_crash_reports>
+</yandex>
diff --git a/tests/integration/test_config_xml_main/configs/embedded.xml b/tests/integration/test_config_xml_main/configs/embedded.xml
new file mode 100644
index 00000000000..a66f57d1eb7
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/embedded.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!-- Config that is used when server is run without config file. -->
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</yandex>
diff --git a/tests/integration/test_config_xml_main/configs/users.d/allow_introspection_functions.yaml b/tests/integration/test_config_xml_main/configs/users.d/allow_introspection_functions.yaml
new file mode 100644
index 00000000000..84612c198c9
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/users.d/allow_introspection_functions.yaml
@@ -0,0 +1,3 @@
+profiles:
+  default:
+    allow_introspection_functions: 1
diff --git a/tests/integration/test_config_xml_main/configs/users.d/log_queries.yaml b/tests/integration/test_config_xml_main/configs/users.d/log_queries.yaml
new file mode 100644
index 00000000000..88574e8f764
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/users.d/log_queries.yaml
@@ -0,0 +1,3 @@
+profiles:
+  default:
+    log_queries: 1
diff --git a/tests/integration/test_config_xml_main/configs/users.xml b/tests/integration/test_config_xml_main/configs/users.xml
new file mode 100644
index 00000000000..b473413bdfa
--- /dev/null
+++ b/tests/integration/test_config_xml_main/configs/users.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <max_memory_usage>10000000000</max_memory_usage>
+            <max_block_size>64999</max_block_size>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_config_xml_main/test.py b/tests/integration/test_config_xml_main/test.py
new file mode 100644
index 00000000000..052f9adb01f
--- /dev/null
+++ b/tests/integration/test_config_xml_main/test.py
@@ -0,0 +1,43 @@
+
+
+import time
+import threading
+from os import path as p, unlink
+from tempfile import NamedTemporaryFile
+
+import helpers
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+
+def test_xml_main_conf():
+    # main configs are in XML; config.d and users.d are in YAML
+    cluster = ClickHouseCluster(__file__, zookeeper_config_path='configs/config.d/zookeeper.yaml')
+
+    all_confd = ['configs/config.d/access_control.yaml',
+                'configs/config.d/keeper_port.yaml',
+                'configs/config.d/logging_no_rotate.yaml',
+                'configs/config.d/log_to_console.yaml',
+                'configs/config.d/macros.yaml',
+                'configs/config.d/metric_log.yaml',
+                'configs/config.d/more_clusters.yaml',
+                'configs/config.d/part_log.yaml',
+                'configs/config.d/path.yaml',
+                'configs/config.d/query_masking_rules.yaml',
+                'configs/config.d/tcp_with_proxy.yaml',
+                'configs/config.d/test_cluster_with_incorrect_pw.yaml',
+                'configs/config.d/text_log.yaml',
+                'configs/config.d/zookeeper.yaml']
+
+    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)
+
+    try:
+        cluster.start()
+        assert(node.query("select value from system.settings where name = 'max_memory_usage'") == "10000000000\n")
+        assert(node.query("select value from system.settings where name = 'max_block_size'") == "64999\n")
+
+    finally:
+        cluster.shutdown()
diff --git a/tests/queries/0_stateless/00938_fix_rwlock_segfault.reference b/tests/integration/test_config_xml_yaml_mix/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00938_fix_rwlock_segfault.reference
rename to tests/integration/test_config_xml_yaml_mix/__init__.py
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/0_common_instance_config.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/0_common_instance_config.yaml
new file mode 100644
index 00000000000..62e4ba8c744
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/0_common_instance_config.yaml
@@ -0,0 +1,6 @@
+timezone: Europe/Moscow
+listen_host: 0.0.0.0
+custom_settings_prefixes: custom_
+path: /var/lib/clickhouse/
+tmp_path: /var/lib/clickhouse/tmp/
+users_config: users.yaml
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
new file mode 100644
index 00000000000..ce2e23839ef
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
@@ -0,0 +1,7 @@
+user_directories:
+  users_xml:
+    path: users.yaml
+  local_directory:
+    path: 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
new file mode 100644
index 00000000000..b21df47bc85
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
@@ -0,0 +1,23 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <force_sync>false</force_sync>
+            <startup_timeout>60000</startup_timeout>
+            <!-- we want all logs for complex problems investigation -->
+            <reserved_log_items>1000000000000000</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/log_to_console.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/log_to_console.yaml
new file mode 100644
index 00000000000..7b59339800b
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/log_to_console.yaml
@@ -0,0 +1,7 @@
+logger:
+  console: true
+  log:
+    "@remove": remove
+  errorlog:
+    "@remove": remove
+
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
new file mode 100644
index 00000000000..2c34585437b
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <logger>
+        <!-- Disable rotation
+             https://pocoproject.org/docs/Poco.FileChannel.html
+        -->
+        <size>never</size>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/macros.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/macros.yaml
new file mode 100644
index 00000000000..a9c61e270ab
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/macros.yaml
@@ -0,0 +1,7 @@
+macros:
+  test: 'Hello, world!'
+  shard: s1
+  replica: r1
+  default_path_test: '/clickhouse/tables/{database}/{shard}/'
+  default_name_test: 'table_{table}'
+
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
new file mode 100644
index 00000000000..0ca9f162416
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <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>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/more_clusters.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/more_clusters.yaml
new file mode 100644
index 00000000000..7da07190894
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/more_clusters.yaml
@@ -0,0 +1,23 @@
+remote_servers:
+  single_remote_shard_at_port_9001:
+    shard:
+      replica:
+        host: localhost
+        port: 9001
+  two_remote_shards_at_port_9001_9002:
+    shard:
+      - replica:
+          host: localhost
+          port: 9001
+      - replica:
+          host: localhost
+          port: 9002
+  two_shards_one_local_one_remote_at_port_9001:
+    shard:
+      - replica:
+          host: localhost
+          port: 9000
+      - replica:
+          host: localhost
+          port: 9001
+
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
new file mode 100644
index 00000000000..6c6fc9c6982
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
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
new file mode 100644
index 00000000000..3e26e8906ee
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
@@ -0,0 +1,18 @@
+path:
+  - ./
+  - "@replace": replace
+tmp_path:
+  - ./tmp/
+  - "@replace": replace
+user_files_path:
+  - ./user_files/
+  - "@replace": replace
+format_schema_path:
+  - ./format_schemas/
+  - "@replace": replace
+access_control_path:
+  - ./access/
+  - "@replace": replace
+top_level_domains_path:
+  - ./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
new file mode 100644
index 00000000000..5a854848f3d
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- Config for test server -->
+<yandex>
+    <query_masking_rules>
+        <rule>
+            <regexp>TOPSECRET.TOPSECRET</regexp>
+            <replace>[hidden]</replace>
+        </rule>
+    </query_masking_rules>
+</yandex>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/tcp_with_proxy.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/tcp_with_proxy.yaml
new file mode 100644
index 00000000000..b0349f5a9b9
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/tcp_with_proxy.yaml
@@ -0,0 +1 @@
+tcp_with_proxy_port: 9010
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
new file mode 100644
index 00000000000..109e35afc37
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
@@ -0,0 +1,21 @@
+<yandex>
+    <remote_servers>
+        <test_cluster_with_incorrect_pw>
+             <shard>
+                 <internal_replication>true</internal_replication>
+                 <replica>
+                     <host>127.0.0.1</host>
+                     <port>9000</port>
+                     <!-- password is incorrect -->
+                     <password>foo</password>
+                 </replica>
+                 <replica>
+                     <host>127.0.0.2</host>
+                     <port>9000</port>
+                     <!-- password is incorrect -->
+                     <password>foo</password>
+                 </replica>
+             </shard>
+         </test_cluster_with_incorrect_pw>
+    </remote_servers>
+</yandex>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/text_log.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/text_log.yaml
new file mode 100644
index 00000000000..4d188020e37
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/text_log.yaml
@@ -0,0 +1,4 @@
+text_log:
+  database: system
+  table: text_log
+  flush_interval_milliseconds: 7500
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
new file mode 100644
index 00000000000..06ed7fcd39f
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <zookeeper>
+        <node index="1">
+            <host>localhost</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
new file mode 100644
index 00000000000..e6a2b6d5324
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
@@ -0,0 +1,277 @@
+<?xml version="1.0"?>
+<yandex>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+    </logger>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+    <postgresql_port>9005</postgresql_port>
+    <interserver_http_port>9009</interserver_http_port>
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+    <grpc>
+        <enable_ssl>false</enable_ssl>
+        <ssl_cert_file>/path/to/ssl_cert_file</ssl_cert_file>
+        <ssl_key_file>/path/to/ssl_key_file</ssl_key_file>
+        <ssl_require_client_auth>false</ssl_require_client_auth>
+        <ssl_ca_cert_file>/path/to/ssl_ca_cert_file</ssl_ca_cert_file>
+        <compression>deflate</compression>
+        <compression_level>medium</compression_level>
+        <max_send_message_size>-1</max_send_message_size>
+        <max_receive_message_size>-1</max_receive_message_size>
+        <verbose_logs>false</verbose_logs>
+    </grpc>
+    <openSSL>
+        <server> 
+            <certificateFile>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+
+        <client>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <invalidCertificateHandler>
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+    <max_concurrent_queries>100</max_concurrent_queries>
+    <max_server_memory_usage>0</max_server_memory_usage>
+    <max_thread_pool_size>10000</max_thread_pool_size>
+
+    <max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>
+
+    <total_memory_profiler_step>4194304</total_memory_profiler_step>
+
+    <total_memory_tracker_sample_probability>0</total_memory_tracker_sample_probability>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <mark_cache_size>5368709120</mark_cache_size>
+
+    <mmap_cache_size>1000</mmap_cache_size>
+
+    <path>/var/lib/clickhouse/</path>
+
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <ldap_servers>
+    </ldap_servers>
+    <user_directories>
+        <users_xml>
+            <path>users.yaml</path>
+        </users_xml>
+        <local_directory>
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+    <default_profile>default</default_profile>
+    <custom_settings_prefixes></custom_settings_prefixes>
+    <default_database>default</default_database>
+    <mlock_executable>true</mlock_executable>
+
+    <remap_executable>false</remap_executable>
+    <remote_servers>
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+        </test_cluster_two_shards_localhost>
+        <test_cluster_two_shards>
+            <shard>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>127.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_two_shards>
+        <test_cluster_two_shards_internal_replication>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>127.0.0.1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>127.0.0.2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster_two_shards_internal_replication>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </remote_servers>
+
+    <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>
+        
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_thread_log>
+
+    <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>
+
+    <asynchronous_metric_log>
+        <database>system</database>
+        <table>asynchronous_metric_log</table>
+
+        <flush_interval_milliseconds>60000</flush_interval_milliseconds>
+    </asynchronous_metric_log>
+
+    <opentelemetry_span_log>
+        <engine>
+            engine MergeTree
+            partition by toYYYYMM(finish_date)
+            order by (finish_date, finish_time_us, trace_id)
+        </engine>
+        <database>system</database>
+        <table>opentelemetry_span_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </opentelemetry_span_log>
+
+    <crash_log>
+        <database>system</database>
+        <table>crash_log</table>
+
+        <partition_by />
+        <flush_interval_milliseconds>1000</flush_interval_milliseconds>
+    </crash_log>
+
+    <top_level_domains_lists>
+    </top_level_domains_lists>
+
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+    <distributed_ddl>
+        <path>/clickhouse/task_queue/ddl</path>
+    </distributed_ddl>
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+    <query_masking_rules>
+        <rule>
+            <name>hide encrypt/decrypt arguments</name>
+            <regexp>((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:'(?:\\'|.)+'|.*?)\s*\)</regexp>
+            <replace>\1(???)</replace>
+        </rule>
+    </query_masking_rules>
+    <send_crash_reports>
+        <enabled>false</enabled>
+        <anonymize>false</anonymize>
+        <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
+    </send_crash_reports>
+</yandex>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
new file mode 100644
index 00000000000..a66f57d1eb7
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!-- Config that is used when server is run without config file. -->
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</yandex>
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
new file mode 100644
index 00000000000..b94e95bc043
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <allow_introspection_functions>1</allow_introspection_functions>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/users.d/log_queries.yaml b/tests/integration/test_config_xml_yaml_mix/configs/users.d/log_queries.yaml
new file mode 100644
index 00000000000..88574e8f764
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/users.d/log_queries.yaml
@@ -0,0 +1,3 @@
+profiles:
+  default:
+    log_queries: 1
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/users.yaml b/tests/integration/test_config_xml_yaml_mix/configs/users.yaml
new file mode 100644
index 00000000000..a87a8c82819
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/configs/users.yaml
@@ -0,0 +1,12 @@
+profiles:
+  default:
+    max_memory_usage: 10000000000
+    max_block_size: 64999
+users:
+  default:
+    password: ''
+    networks:
+      "@replace": replace
+      ip: '::/0'
+    profile: default
+
diff --git a/tests/integration/test_config_xml_yaml_mix/test.py b/tests/integration/test_config_xml_yaml_mix/test.py
new file mode 100644
index 00000000000..90ee8a2dea5
--- /dev/null
+++ b/tests/integration/test_config_xml_yaml_mix/test.py
@@ -0,0 +1,43 @@
+import time
+import threading
+from os import path as p, unlink
+from tempfile import NamedTemporaryFile
+
+import helpers
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+
+def test_extra_yaml_mix():
+    # some configs are written in XML, others are written in YAML
+    cluster = ClickHouseCluster(__file__, zookeeper_config_path='configs/config.d/zookeeper.xml')
+
+    all_confd = ['configs/config.d/0_common_instance_config.yaml',
+                'configs/config.d/access_control.yaml',
+                'configs/config.d/keeper_port.xml',
+                'configs/config.d/logging_no_rotate.xml',
+                'configs/config.d/log_to_console.yaml',
+                'configs/config.d/macros.yaml',
+                'configs/config.d/metric_log.xml',
+                'configs/config.d/more_clusters.yaml',
+                'configs/config.d/part_log.xml',
+                'configs/config.d/path.yaml',
+                'configs/config.d/query_masking_rules.xml',
+                'configs/config.d/tcp_with_proxy.yaml',
+                'configs/config.d/test_cluster_with_incorrect_pw.xml',
+                'configs/config.d/text_log.yaml',
+                'configs/config.d/zookeeper.xml']
+
+    all_userd = ['configs/users.d/allow_introspection_functions.xml',
+                '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)
+
+    try:
+        cluster.start()
+        assert(node.query("select value from system.settings where name = 'max_memory_usage'") == "10000000000\n")
+        assert(node.query("select value from system.settings where name = 'max_block_size'") == "64999\n")
+
+    finally:
+        cluster.shutdown()
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition.reference b/tests/integration/test_config_yaml_full/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00991_system_parts_race_condition.reference
rename to tests/integration/test_config_yaml_full/__init__.py
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/0_common_instance_config.yaml b/tests/integration/test_config_yaml_full/configs/config.d/0_common_instance_config.yaml
new file mode 100644
index 00000000000..62e4ba8c744
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/0_common_instance_config.yaml
@@ -0,0 +1,6 @@
+timezone: Europe/Moscow
+listen_host: 0.0.0.0
+custom_settings_prefixes: custom_
+path: /var/lib/clickhouse/
+tmp_path: /var/lib/clickhouse/tmp/
+users_config: users.yaml
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
new file mode 100644
index 00000000000..ce2e23839ef
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml
@@ -0,0 +1,7 @@
+user_directories:
+  users_xml:
+    path: users.yaml
+  local_directory:
+    path: access/
+  "@replace": replace
+
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/keeper_port.yaml b/tests/integration/test_config_yaml_full/configs/config.d/keeper_port.yaml
new file mode 100644
index 00000000000..91723bc372f
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/keeper_port.yaml
@@ -0,0 +1,15 @@
+keeper_server:
+  tcp_port: 9181
+  server_id: 1
+  coordination_settings:
+    operation_timeout_ms: 10000
+    session_timeout_ms: 30000
+    force_sync: false
+    startup_timeout: 60000
+    reserved_log_items: 1000000000000000
+  raft_configuration:
+    server:
+      id: 1
+      hostname: localhost
+      port: 44444
+
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/log_to_console.yaml b/tests/integration/test_config_yaml_full/configs/config.d/log_to_console.yaml
new file mode 100644
index 00000000000..7b59339800b
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/log_to_console.yaml
@@ -0,0 +1,7 @@
+logger:
+  console: true
+  log:
+    "@remove": remove
+  errorlog:
+    "@remove": remove
+
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/logging_no_rotate.yaml b/tests/integration/test_config_yaml_full/configs/config.d/logging_no_rotate.yaml
new file mode 100644
index 00000000000..513cd3f7dc5
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/logging_no_rotate.yaml
@@ -0,0 +1,2 @@
+logger:
+  size: never
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/macros.yaml b/tests/integration/test_config_yaml_full/configs/config.d/macros.yaml
new file mode 100644
index 00000000000..a9c61e270ab
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/macros.yaml
@@ -0,0 +1,7 @@
+macros:
+  test: 'Hello, world!'
+  shard: s1
+  replica: r1
+  default_path_test: '/clickhouse/tables/{database}/{shard}/'
+  default_name_test: 'table_{table}'
+
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/metric_log.yaml b/tests/integration/test_config_yaml_full/configs/config.d/metric_log.yaml
new file mode 100644
index 00000000000..aafad939c37
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/metric_log.yaml
@@ -0,0 +1,6 @@
+metric_log:
+  database: system
+  table: metric_log
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
+
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/more_clusters.yaml b/tests/integration/test_config_yaml_full/configs/config.d/more_clusters.yaml
new file mode 100644
index 00000000000..7da07190894
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/more_clusters.yaml
@@ -0,0 +1,23 @@
+remote_servers:
+  single_remote_shard_at_port_9001:
+    shard:
+      replica:
+        host: localhost
+        port: 9001
+  two_remote_shards_at_port_9001_9002:
+    shard:
+      - replica:
+          host: localhost
+          port: 9001
+      - replica:
+          host: localhost
+          port: 9002
+  two_shards_one_local_one_remote_at_port_9001:
+    shard:
+      - replica:
+          host: localhost
+          port: 9000
+      - replica:
+          host: localhost
+          port: 9001
+
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/part_log.yaml b/tests/integration/test_config_yaml_full/configs/config.d/part_log.yaml
new file mode 100644
index 00000000000..43f60146dca
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/part_log.yaml
@@ -0,0 +1,5 @@
+part_log:
+  database: system
+  table: part_log
+  flush_interval_milliseconds: 7500
+
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
new file mode 100644
index 00000000000..3e26e8906ee
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
@@ -0,0 +1,18 @@
+path:
+  - ./
+  - "@replace": replace
+tmp_path:
+  - ./tmp/
+  - "@replace": replace
+user_files_path:
+  - ./user_files/
+  - "@replace": replace
+format_schema_path:
+  - ./format_schemas/
+  - "@replace": replace
+access_control_path:
+  - ./access/
+  - "@replace": replace
+top_level_domains_path:
+  - ./top_level_domains/
+  - "@replace": replace
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/query_masking_rules.yaml b/tests/integration/test_config_yaml_full/configs/config.d/query_masking_rules.yaml
new file mode 100644
index 00000000000..38163429d81
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/query_masking_rules.yaml
@@ -0,0 +1,4 @@
+query_masking_rules:
+  rule:
+    regexp: TOPSECRET.TOPSECRET
+    replace: '[hidden]'
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/tcp_with_proxy.yaml b/tests/integration/test_config_yaml_full/configs/config.d/tcp_with_proxy.yaml
new file mode 100644
index 00000000000..b0349f5a9b9
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/tcp_with_proxy.yaml
@@ -0,0 +1 @@
+tcp_with_proxy_port: 9010
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/test_cluster_with_incorrect_pw.yaml b/tests/integration/test_config_yaml_full/configs/config.d/test_cluster_with_incorrect_pw.yaml
new file mode 100644
index 00000000000..309a7daa81d
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/test_cluster_with_incorrect_pw.yaml
@@ -0,0 +1,11 @@
+remote_servers:
+  test_cluster_with_incorrect_pw:
+    shard:
+      internal_replication: true
+      replica:
+        - host: 127.0.0.1
+          port: 9000
+          password: foo
+        - host: 127.0.0.2
+          port: 9000
+          password: foo
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/text_log.yaml b/tests/integration/test_config_yaml_full/configs/config.d/text_log.yaml
new file mode 100644
index 00000000000..4d188020e37
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/text_log.yaml
@@ -0,0 +1,4 @@
+text_log:
+  database: system
+  table: text_log
+  flush_interval_milliseconds: 7500
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/zookeeper.yaml b/tests/integration/test_config_yaml_full/configs/config.d/zookeeper.yaml
new file mode 100644
index 00000000000..be02c516798
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.d/zookeeper.yaml
@@ -0,0 +1,5 @@
+zookeeper:
+  node:
+    host: localhost
+    port: 9181
+    "@index": 1
diff --git a/tests/integration/test_config_yaml_full/configs/config.yaml b/tests/integration/test_config_yaml_full/configs/config.yaml
new file mode 100644
index 00000000000..619a3735269
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/config.yaml
@@ -0,0 +1,183 @@
+logger:
+  level: trace
+  log: /var/log/clickhouse-server/clickhouse-server.log
+  errorlog: /var/log/clickhouse-server/clickhouse-server.err.log
+  size: 1000M
+  count: 10
+http_port: 8123
+tcp_port: 9000
+mysql_port: 9004
+postgresql_port: 9005
+interserver_http_port: 9009
+max_connections: 4096
+keep_alive_timeout: 3
+grpc:
+  enable_ssl: false
+  ssl_cert_file: /path/to/ssl_cert_file
+  ssl_key_file: /path/to/ssl_key_file
+  ssl_require_client_auth: false
+  ssl_ca_cert_file: /path/to/ssl_ca_cert_file
+  compression: deflate
+  compression_level: medium
+  max_send_message_size: -1
+  max_receive_message_size: -1
+  verbose_logs: false
+openSSL:
+  server:
+    certificateFile: /etc/clickhouse-server/server.crt
+    privateKeyFile: /etc/clickhouse-server/server.key
+    dhParamsFile: /etc/clickhouse-server/dhparam.pem
+    verificationMode: none
+    loadDefaultCAFile: true
+    cacheSessions: true
+    disableProtocols: 'sslv2,sslv3'
+    preferServerCiphers: true
+  client:
+    loadDefaultCAFile: true
+    cacheSessions: true
+    disableProtocols: 'sslv2,sslv3'
+    preferServerCiphers: true
+    invalidCertificateHandler:
+      name: RejectCertificateHandler
+max_concurrent_queries: 100
+max_server_memory_usage: 0
+max_thread_pool_size: 10000
+max_server_memory_usage_to_ram_ratio: 0.9
+total_memory_profiler_step: 4194304
+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/
+ldap_servers: ''
+user_directories:
+  users_xml:
+    path: users.yaml
+  local_directory:
+    path: /var/lib/clickhouse/access/
+default_profile: default
+custom_settings_prefixes: ''
+default_database: default
+mlock_executable: true
+remap_executable: false
+remote_servers:
+  test_shard_localhost:
+    shard:
+      replica:
+        host: localhost
+        port: 9000
+  test_cluster_two_shards_localhost:
+    shard:
+      - replica:
+          host: localhost
+          port: 9000
+      - replica:
+          host: localhost
+          port: 9000
+  test_cluster_two_shards:
+    shard:
+      - replica:
+          host: 127.0.0.1
+          port: 9000
+      - replica:
+          host: 127.0.0.2
+          port: 9000
+  test_cluster_two_shards_internal_replication:
+    shard:
+      - internal_replication: true
+        replica:
+          host: 127.0.0.1
+          port: 9000
+      - internal_replication: true
+        replica:
+          host: 127.0.0.2
+          port: 9000
+  test_shard_localhost_secure:
+    shard:
+      replica:
+        host: localhost
+        port: 9440
+        secure: 1
+  test_unavailable_shard:
+    shard:
+      - replica:
+          host: localhost
+          port: 9000
+      - replica:
+          host: localhost
+          port: 1
+builtin_dictionaries_reload_interval: 3600
+max_session_timeout: 3600
+default_session_timeout: 60
+query_log:
+  database: system
+  table: query_log
+  partition_by: toYYYYMM(event_date)
+  flush_interval_milliseconds: 7500
+trace_log:
+  database: system
+  table: trace_log
+  partition_by: toYYYYMM(event_date)
+  flush_interval_milliseconds: 7500
+query_thread_log:
+  database: system
+  table: query_thread_log
+  partition_by: toYYYYMM(event_date)
+  flush_interval_milliseconds: 7500
+metric_log:
+  database: system
+  table: metric_log
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
+asynchronous_metric_log:
+  database: system
+  table: asynchronous_metric_log
+  flush_interval_milliseconds: 60000
+opentelemetry_span_log:
+  engine: |-
+    engine MergeTree
+                partition by toYYYYMM(finish_date)
+                order by (finish_date, finish_time_us, trace_id)
+  database: system
+  table: opentelemetry_span_log
+  flush_interval_milliseconds: 7500
+crash_log:
+  database: system
+  table: crash_log
+  partition_by: ''
+  flush_interval_milliseconds: 1000
+top_level_domains_lists: ''
+dictionaries_config: '*_dictionary.xml'
+distributed_ddl:
+  path: /clickhouse/task_queue/ddl
+graphite_rollup_example:
+  pattern:
+    regexp: click_cost
+    function: any
+    retention:
+      - age: 0
+        precision: 3600
+      - age: 86400
+        precision: 60
+  default:
+    function: max
+    retention:
+      - age: 0
+        precision: 60
+      - age: 3600
+        precision: 300
+      - age: 86400
+        precision: 3600
+format_schema_path: /var/lib/clickhouse/format_schemas/
+query_masking_rules:
+  rule:
+    name: hide encrypt/decrypt arguments
+    regexp: '((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:''(?:\\''|.)+''|.*?)\s*\)'
+    replace: \1(???)
+send_crash_reports:
+  enabled: false
+  anonymize: false
+  endpoint: 'https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277'
+
diff --git a/tests/integration/test_config_yaml_full/configs/embedded.xml b/tests/integration/test_config_yaml_full/configs/embedded.xml
new file mode 100644
index 00000000000..a66f57d1eb7
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/embedded.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!-- Config that is used when server is run without config file. -->
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</yandex>
diff --git a/tests/integration/test_config_yaml_full/configs/users.d/allow_introspection_functions.yaml b/tests/integration/test_config_yaml_full/configs/users.d/allow_introspection_functions.yaml
new file mode 100644
index 00000000000..84612c198c9
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/users.d/allow_introspection_functions.yaml
@@ -0,0 +1,3 @@
+profiles:
+  default:
+    allow_introspection_functions: 1
diff --git a/tests/integration/test_config_yaml_full/configs/users.d/log_queries.yaml b/tests/integration/test_config_yaml_full/configs/users.d/log_queries.yaml
new file mode 100644
index 00000000000..88574e8f764
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/users.d/log_queries.yaml
@@ -0,0 +1,3 @@
+profiles:
+  default:
+    log_queries: 1
diff --git a/tests/integration/test_config_yaml_full/configs/users.yaml b/tests/integration/test_config_yaml_full/configs/users.yaml
new file mode 100644
index 00000000000..a87a8c82819
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/configs/users.yaml
@@ -0,0 +1,12 @@
+profiles:
+  default:
+    max_memory_usage: 10000000000
+    max_block_size: 64999
+users:
+  default:
+    password: ''
+    networks:
+      "@replace": replace
+      ip: '::/0'
+    profile: default
+
diff --git a/tests/integration/test_config_yaml_full/test.py b/tests/integration/test_config_yaml_full/test.py
new file mode 100644
index 00000000000..bc4fa40384c
--- /dev/null
+++ b/tests/integration/test_config_yaml_full/test.py
@@ -0,0 +1,42 @@
+import time
+import threading
+from os import path as p, unlink
+from tempfile import NamedTemporaryFile
+
+import helpers
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+def test_yaml_full_conf():
+    # all configs are in YAML
+    cluster = ClickHouseCluster(__file__, zookeeper_config_path='configs/config.d/zookeeper.yaml')
+
+    all_confd = ['configs/config.d/0_common_instance_config.yaml',
+                'configs/config.d/access_control.yaml',
+                'configs/config.d/keeper_port.yaml',
+                'configs/config.d/logging_no_rotate.yaml',
+                'configs/config.d/log_to_console.yaml',
+                'configs/config.d/macros.yaml',
+                'configs/config.d/metric_log.yaml',
+                'configs/config.d/more_clusters.yaml',
+                'configs/config.d/part_log.yaml',
+                'configs/config.d/path.yaml',
+                'configs/config.d/query_masking_rules.yaml',
+                'configs/config.d/tcp_with_proxy.yaml',
+                'configs/config.d/test_cluster_with_incorrect_pw.yaml',
+                'configs/config.d/text_log.yaml',
+                'configs/config.d/zookeeper.yaml']
+
+    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, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False)
+
+    try:
+        cluster.start()
+        assert(node.query("select value from system.settings where name = 'max_memory_usage'") == "10000000000\n")
+        assert(node.query("select value from system.settings where name = 'max_block_size'") == "64999\n")
+
+    finally:
+        cluster.shutdown()
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize_long.reference b/tests/integration/test_config_yaml_main/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/01641_memory_tracking_insert_optimize_long.reference
rename to tests/integration/test_config_yaml_main/__init__.py
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/0_common_instance_config.yaml b/tests/integration/test_config_yaml_main/configs/config.d/0_common_instance_config.yaml
new file mode 100644
index 00000000000..62e4ba8c744
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/0_common_instance_config.yaml
@@ -0,0 +1,6 @@
+timezone: Europe/Moscow
+listen_host: 0.0.0.0
+custom_settings_prefixes: custom_
+path: /var/lib/clickhouse/
+tmp_path: /var/lib/clickhouse/tmp/
+users_config: users.yaml
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
new file mode 100644
index 00000000000..b61f89bd904
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
@@ -0,0 +1,13 @@
+<yandex>
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories replace="replace">
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.yaml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>access/</path>
+        </local_directory>
+    </user_directories>
+</yandex>
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
new file mode 100644
index 00000000000..b21df47bc85
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
@@ -0,0 +1,23 @@
+<yandex>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+
+        <coordination_settings>
+            <operation_timeout_ms>10000</operation_timeout_ms>
+            <session_timeout_ms>30000</session_timeout_ms>
+            <force_sync>false</force_sync>
+            <startup_timeout>60000</startup_timeout>
+            <!-- we want all logs for complex problems investigation -->
+            <reserved_log_items>1000000000000000</reserved_log_items>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
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
new file mode 100644
index 00000000000..227c53647f3
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <logger>
+        <console>true</console>
+        <log remove="remove"/>
+        <errorlog remove="remove"/>
+    </logger>
+</yandex>
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
new file mode 100644
index 00000000000..2c34585437b
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <logger>
+        <!-- Disable rotation
+             https://pocoproject.org/docs/Poco.FileChannel.html
+        -->
+        <size>never</size>
+    </logger>
+</yandex>
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
new file mode 100644
index 00000000000..4902b12bc81
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <macros>
+        <test>Hello, world!</test>
+        <shard>s1</shard>
+        <replica>r1</replica>
+        <default_path_test>/clickhouse/tables/{database}/{shard}/</default_path_test>
+        <default_name_test>table_{table}</default_name_test>
+    </macros>
+</yandex>
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
new file mode 100644
index 00000000000..0ca9f162416
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <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>
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
new file mode 100644
index 00000000000..aecbf9e0ba7
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
@@ -0,0 +1,49 @@
+<yandex>
+    <remote_servers>
+
+        <![CDATA[
+            You can run additional servers simply as
+             ./clickhouse-server -- --path=9001 --tcp_port=9001
+        ]]>
+
+        <single_remote_shard_at_port_9001>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9001</port>
+                </replica>
+            </shard>
+        </single_remote_shard_at_port_9001>
+
+        <two_remote_shards_at_port_9001_9002>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9001</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9002</port>
+                </replica>
+            </shard>
+        </two_remote_shards_at_port_9001_9002>
+
+        <two_shards_one_local_one_remote_at_port_9001>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9001</port>
+                </replica>
+            </shard>
+        </two_shards_one_local_one_remote_at_port_9001>
+
+    </remote_servers>
+</yandex>
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
new file mode 100644
index 00000000000..6c6fc9c6982
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
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
new file mode 100644
index 00000000000..466ed0d1663
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/path.xml
@@ -0,0 +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>
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
new file mode 100644
index 00000000000..5a854848f3d
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- Config for test server -->
+<yandex>
+    <query_masking_rules>
+        <rule>
+            <regexp>TOPSECRET.TOPSECRET</regexp>
+            <replace>[hidden]</replace>
+        </rule>
+    </query_masking_rules>
+</yandex>
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
new file mode 100644
index 00000000000..19046054c16
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <tcp_with_proxy_port>9010</tcp_with_proxy_port>
+</yandex>
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
new file mode 100644
index 00000000000..109e35afc37
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
@@ -0,0 +1,21 @@
+<yandex>
+    <remote_servers>
+        <test_cluster_with_incorrect_pw>
+             <shard>
+                 <internal_replication>true</internal_replication>
+                 <replica>
+                     <host>127.0.0.1</host>
+                     <port>9000</port>
+                     <!-- password is incorrect -->
+                     <password>foo</password>
+                 </replica>
+                 <replica>
+                     <host>127.0.0.2</host>
+                     <port>9000</port>
+                     <!-- password is incorrect -->
+                     <password>foo</password>
+                 </replica>
+             </shard>
+         </test_cluster_with_incorrect_pw>
+    </remote_servers>
+</yandex>
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
new file mode 100644
index 00000000000..3699a23578c
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+</yandex>
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
new file mode 100644
index 00000000000..06ed7fcd39f
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <zookeeper>
+        <node index="1">
+            <host>localhost</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_config_yaml_main/configs/config.yaml b/tests/integration/test_config_yaml_main/configs/config.yaml
new file mode 100644
index 00000000000..e5a36b1e49b
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/config.yaml
@@ -0,0 +1,183 @@
+logger:
+  level: trace
+  log: /var/log/clickhouse-server/clickhouse-server.log
+  errorlog: /var/log/clickhouse-server/clickhouse-server.err.log
+  size: 1000M
+  count: 10
+http_port: 8123
+tcp_port: 9000
+mysql_port: 9004
+postgresql_port: 9005
+interserver_http_port: 9009
+max_connections: 4096
+keep_alive_timeout: 3
+grpc:
+  enable_ssl: false
+  ssl_cert_file: /path/to/ssl_cert_file
+  ssl_key_file: /path/to/ssl_key_file
+  ssl_require_client_auth: false
+  ssl_ca_cert_file: /path/to/ssl_ca_cert_file
+  compression: deflate
+  compression_level: medium
+  max_send_message_size: -1
+  max_receive_message_size: -1
+  verbose_logs: false
+openSSL:
+  server:
+    certificateFile: /etc/clickhouse-server/server.crt
+    privateKeyFile: /etc/clickhouse-server/server.key
+    dhParamsFile: /etc/clickhouse-server/dhparam.pem
+    verificationMode: none
+    loadDefaultCAFile: true
+    cacheSessions: true
+    disableProtocols: 'sslv2,sslv3'
+    preferServerCiphers: true
+  client:
+    loadDefaultCAFile: true
+    cacheSessions: true
+    disableProtocols: 'sslv2,sslv3'
+    preferServerCiphers: true
+    invalidCertificateHandler:
+      name: RejectCertificateHandler
+max_concurrent_queries: 100
+max_server_memory_usage: 0
+max_thread_pool_size: 10000
+max_server_memory_usage_to_ram_ratio: 0.9
+total_memory_profiler_step: 4194304
+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/
+ldap_servers: ''
+user_directories:
+  users_xml:
+    path: users.yml
+  local_directory:
+    path: /var/lib/clickhouse/access/
+default_profile: default
+custom_settings_prefixes: ''
+default_database: default
+mlock_executable: true
+remap_executable: false
+remote_servers:
+  test_shard_localhost:
+    shard:
+      replica:
+        host: localhost
+        port: 9000
+  test_cluster_two_shards_localhost:
+    shard:
+      - replica:
+          host: localhost
+          port: 9000
+      - replica:
+          host: localhost
+          port: 9000
+  test_cluster_two_shards:
+    shard:
+      - replica:
+          host: 127.0.0.1
+          port: 9000
+      - replica:
+          host: 127.0.0.2
+          port: 9000
+  test_cluster_two_shards_internal_replication:
+    shard:
+      - internal_replication: true
+        replica:
+          host: 127.0.0.1
+          port: 9000
+      - internal_replication: true
+        replica:
+          host: 127.0.0.2
+          port: 9000
+  test_shard_localhost_secure:
+    shard:
+      replica:
+        host: localhost
+        port: 9440
+        secure: 1
+  test_unavailable_shard:
+    shard:
+      - replica:
+          host: localhost
+          port: 9000
+      - replica:
+          host: localhost
+          port: 1
+builtin_dictionaries_reload_interval: 3600
+max_session_timeout: 3600
+default_session_timeout: 60
+query_log:
+  database: system
+  table: query_log
+  partition_by: toYYYYMM(event_date)
+  flush_interval_milliseconds: 7500
+trace_log:
+  database: system
+  table: trace_log
+  partition_by: toYYYYMM(event_date)
+  flush_interval_milliseconds: 7500
+query_thread_log:
+  database: system
+  table: query_thread_log
+  partition_by: toYYYYMM(event_date)
+  flush_interval_milliseconds: 7500
+metric_log:
+  database: system
+  table: metric_log
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
+asynchronous_metric_log:
+  database: system
+  table: asynchronous_metric_log
+  flush_interval_milliseconds: 60000
+opentelemetry_span_log:
+  engine: |-
+    engine MergeTree
+                partition by toYYYYMM(finish_date)
+                order by (finish_date, finish_time_us, trace_id)
+  database: system
+  table: opentelemetry_span_log
+  flush_interval_milliseconds: 7500
+crash_log:
+  database: system
+  table: crash_log
+  partition_by: ''
+  flush_interval_milliseconds: 1000
+top_level_domains_lists: ''
+dictionaries_config: '*_dictionary.xml'
+distributed_ddl:
+  path: /clickhouse/task_queue/ddl
+graphite_rollup_example:
+  pattern:
+    regexp: click_cost
+    function: any
+    retention:
+      - age: 0
+        precision: 3600
+      - age: 86400
+        precision: 60
+  default:
+    function: max
+    retention:
+      - age: 0
+        precision: 60
+      - age: 3600
+        precision: 300
+      - age: 86400
+        precision: 3600
+format_schema_path: /var/lib/clickhouse/format_schemas/
+query_masking_rules:
+  rule:
+    name: hide encrypt/decrypt arguments
+    regexp: '((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:''(?:\\''|.)+''|.*?)\s*\)'
+    replace: \1(???)
+send_crash_reports:
+  enabled: false
+  anonymize: false
+  endpoint: 'https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277'
+
diff --git a/tests/integration/test_config_yaml_main/configs/embedded.xml b/tests/integration/test_config_yaml_main/configs/embedded.xml
new file mode 100644
index 00000000000..a66f57d1eb7
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/embedded.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!-- Config that is used when server is run without config file. -->
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+    <mysql_port>9004</mysql_port>
+
+    <path>./</path>
+
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <mlock_executable>true</mlock_executable>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</yandex>
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
new file mode 100644
index 00000000000..b94e95bc043
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <allow_introspection_functions>1</allow_introspection_functions>
+        </default>
+    </profiles>
+</yandex>
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
new file mode 100644
index 00000000000..25261072ade
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <profiles>
+        <default>
+            <log_queries>1</log_queries>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_config_yaml_main/configs/users.yaml b/tests/integration/test_config_yaml_main/configs/users.yaml
new file mode 100644
index 00000000000..a87a8c82819
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/configs/users.yaml
@@ -0,0 +1,12 @@
+profiles:
+  default:
+    max_memory_usage: 10000000000
+    max_block_size: 64999
+users:
+  default:
+    password: ''
+    networks:
+      "@replace": replace
+      ip: '::/0'
+    profile: default
+
diff --git a/tests/integration/test_config_yaml_main/test.py b/tests/integration/test_config_yaml_main/test.py
new file mode 100644
index 00000000000..f4de16c35a2
--- /dev/null
+++ b/tests/integration/test_config_yaml_main/test.py
@@ -0,0 +1,43 @@
+import time
+import threading
+from os import path as p, unlink
+from tempfile import NamedTemporaryFile
+
+import helpers
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+
+def test_yaml_main_conf():
+    # main configs are in YAML; config.d and users.d are in XML
+    cluster = ClickHouseCluster(__file__, zookeeper_config_path='configs/config.d/zookeeper.xml')
+
+    all_confd = ['configs/config.d/0_common_instance_config.yaml',
+                'configs/config.d/access_control.xml',
+                'configs/config.d/keeper_port.xml',
+                'configs/config.d/logging_no_rotate.xml',
+                'configs/config.d/log_to_console.xml',
+                'configs/config.d/macros.xml',
+                'configs/config.d/metric_log.xml',
+                'configs/config.d/more_clusters.xml',
+                'configs/config.d/part_log.xml',
+                'configs/config.d/path.xml',
+                'configs/config.d/query_masking_rules.xml',
+                'configs/config.d/tcp_with_proxy.xml',
+                'configs/config.d/test_cluster_with_incorrect_pw.xml',
+                'configs/config.d/text_log.xml',
+                'configs/config.d/zookeeper.xml']
+
+    all_userd = ['configs/users.d/allow_introspection_functions.xml',
+                '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)
+
+    try:
+        cluster.start()
+        assert(node.query("select value from system.settings where name = 'max_memory_usage'") == "10000000000\n")
+        assert(node.query("select value from system.settings where name = 'max_block_size'") == "64999\n")
+
+    finally:
+        cluster.shutdown()
diff --git a/tests/integration/test_dictionaries_ddl/test.py b/tests/integration/test_dictionaries_ddl/test.py
index 3ea64383fbf..d96d6864ba3 100644
--- a/tests/integration/test_dictionaries_ddl/test.py
+++ b/tests/integration/test_dictionaries_ddl/test.py
@@ -288,6 +288,23 @@ def test_clickhouse_remote(started_cluster):
             time.sleep(0.5)
 
     node3.query("detach dictionary if exists test.clickhouse_remote")
+
+    with pytest.raises(QueryRuntimeException):
+        node3.query("""
+            CREATE DICTIONARY test.clickhouse_remote(
+                id UInt64,
+                SomeValue1 UInt8,
+                SomeValue2 String
+            )
+            PRIMARY KEY id
+            LAYOUT(FLAT())
+            SOURCE(CLICKHOUSE(HOST 'node4' PORT 9000 USER 'default' PASSWORD 'default' TABLE 'xml_dictionary_table' DB 'test'))
+            LIFETIME(MIN 1 MAX 10)
+            """)
+
+    node3.query("attach dictionary test.clickhouse_remote")
+    node3.query("drop dictionary test.clickhouse_remote")
+
     node3.query("""
         CREATE DICTIONARY test.clickhouse_remote(
             id UInt64,
diff --git a/tests/integration/test_dictionaries_postgresql/test.py b/tests/integration/test_dictionaries_postgresql/test.py
index 10d9f4213e1..2f7c0594438 100644
--- a/tests/integration/test_dictionaries_postgresql/test.py
+++ b/tests/integration/test_dictionaries_postgresql/test.py
@@ -1,6 +1,7 @@
 import pytest
 import time
 import psycopg2
+from multiprocessing.dummy import Pool
 
 from helpers.cluster import ClickHouseCluster
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
@@ -9,7 +10,7 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', main_configs=[
     'configs/config.xml',
     'configs/dictionaries/postgres_dict.xml',
-    'configs/log_conf.xml'], with_postgres=True)
+    'configs/log_conf.xml'], with_postgres=True, with_postgres_cluster=True)
 
 postgres_dict_table_template = """
     CREATE TABLE IF NOT EXISTS {} (
@@ -62,7 +63,7 @@ def started_cluster():
         print("postgres1 connected")
         create_postgres_db(postgres_conn, 'clickhouse')
 
-        postgres_conn = get_postgres_conn(port=5441)
+        postgres_conn = get_postgres_conn(port=5421)
         print("postgres2 connected")
         create_postgres_db(postgres_conn, 'clickhouse')
 
@@ -131,7 +132,7 @@ def test_invalidate_query(started_cluster):
 def test_dictionary_with_replicas(started_cluster):
     conn1 = get_postgres_conn(port=5432, database=True)
     cursor1 = conn1.cursor()
-    conn2 = get_postgres_conn(port=5441, database=True)
+    conn2 = get_postgres_conn(port=5421, database=True)
     cursor2 = conn2.cursor()
 
     create_postgres_table(cursor1, 'test1')
@@ -144,7 +145,7 @@ def test_dictionary_with_replicas(started_cluster):
     result = node1.query("SELECT * FROM `test`.`dict_table_test1` ORDER BY id")
 
     # priority 0 - non running port
-    assert node1.contains_in_log('Unable to setup connection to postgres2:5433*')
+    assert node1.contains_in_log('PostgreSQLConnectionPool: Connection error*')
 
     # priority 1 - postgres2, table contains rows with values 100-200
     # priority 2 - postgres1, table contains rows with values 0-100
@@ -158,6 +159,35 @@ def test_dictionary_with_replicas(started_cluster):
     node1.query("DROP DICTIONARY IF EXISTS dict1")
 
 
+def test_postgres_scema(started_cluster):
+    conn = get_postgres_conn(port=5432, database=True)
+    cursor = conn.cursor()
+
+    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, i FROM generate_series(0, 99) as t(i)')
+
+    node1.query('''
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(
+        port 5432
+        host 'postgres1'
+        user  'postgres'
+        password 'mysecretpassword'
+        db 'clickhouse'
+        table 'test_schema.test_table'))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(1))")
+    assert(int(result.strip()) == 1)
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 99)
+    node1.query("DROP DICTIONARY IF EXISTS postgres_dict")
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
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 2a937b5444d..da848355660 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
@@ -8,7 +8,7 @@
           <format>TabSeparated</format>
         </file>
       </source>
-      <lifetime>1</lifetime>
+      <lifetime>5</lifetime>
       <layout><flat/></layout>
       <structure><id><name>key</name> </id>
         <attribute><name>a</name><type>Int32</type>
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference b/tests/integration/test_dictionaries_update_field/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/01676_clickhouse_client_autocomplete.reference
rename to tests/integration/test_dictionaries_update_field/__init__.py
diff --git a/tests/integration/test_dictionaries_update_field/configs/config.xml b/tests/integration/test_dictionaries_update_field/configs/config.xml
new file mode 100644
index 00000000000..a1518083be3
--- /dev/null
+++ b/tests/integration/test_dictionaries_update_field/configs/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<yandex>
+<logger>
+	<level>trace</level>
+	<log>/var/log/clickhouse-server/clickhouse-server.log</log>
+	<errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+	<size>1000M</size>
+	<count>10</count>
+	</logger>
+
+    <tcp_port>9000</tcp_port>
+    <listen_host>127.0.0.1</listen_host>
+
+    <openSSL>
+        <client>
+            <cacheSessions>true</cacheSessions>
+            <verificationMode>none</verificationMode>
+            <invalidCertificateHandler>
+                <name>AcceptCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <max_concurrent_queries>500</max_concurrent_queries>
+    <mark_cache_size>5368709120</mark_cache_size>
+    <path>./clickhouse/</path>
+    <users_config>users.xml</users_config>
+
+    <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
+</yandex>
diff --git a/tests/integration/test_dictionaries_update_field/configs/users.xml b/tests/integration/test_dictionaries_update_field/configs/users.xml
new file mode 100644
index 00000000000..6061af8e33d
--- /dev/null
+++ b/tests/integration/test_dictionaries_update_field/configs/users.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+    </users>
+
+    <quotas>
+        <default>
+        </default>
+    </quotas>
+</yandex>
diff --git a/tests/integration/test_dictionaries_update_field/test.py b/tests/integration/test_dictionaries_update_field/test.py
new file mode 100644
index 00000000000..c52c836b4f7
--- /dev/null
+++ b/tests/integration/test_dictionaries_update_field/test.py
@@ -0,0 +1,77 @@
+## sudo -H pip install PyMySQL
+import time
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseKiller
+from helpers.network import PartitionManager
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance('main_node', main_configs=[])
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        node.query(
+            """
+            CREATE TABLE table_for_update_field_dictionary
+            (
+                key UInt64,
+                value String,
+                last_insert_time DateTime
+            )
+            ENGINE = TinyLog;
+            """
+        )
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+@pytest.mark.parametrize("dictionary_name,dictionary_type", [
+    ("flat_update_field_dictionary", "FLAT"),
+    ("simple_key_hashed_update_field_dictionary", "HASHED"),
+    ("complex_key_hashed_update_field_dictionary", "HASHED")
+])
+def test_update_field(started_cluster, dictionary_name, dictionary_type):
+    create_dictionary_query = """
+        CREATE DICTIONARY {dictionary_name}
+        (
+            key UInt64,
+            value String,
+            last_insert_time DateTime
+        )
+        PRIMARY KEY key
+        SOURCE(CLICKHOUSE(table 'table_for_update_field_dictionary' update_field 'last_insert_time'))
+        LAYOUT({dictionary_type}())
+        LIFETIME(1);
+        """.format(dictionary_name=dictionary_name, dictionary_type=dictionary_type)
+
+    node.query(create_dictionary_query)
+
+    node.query("INSERT INTO table_for_update_field_dictionary VALUES (1, 'First', now());")
+    query_result = node.query("SELECT key, value FROM {dictionary_name} ORDER BY key ASC".format(dictionary_name=dictionary_name))
+    assert query_result == '1\tFirst\n'
+
+    node.query("INSERT INTO table_for_update_field_dictionary VALUES (2, 'Second', now());")
+    time.sleep(10)
+
+    query_result = node.query("SELECT key, value FROM {dictionary_name} ORDER BY key ASC".format(dictionary_name=dictionary_name))
+
+    assert query_result == '1\tFirst\n2\tSecond\n'
+
+    node.query("INSERT INTO table_for_update_field_dictionary VALUES (2, 'SecondUpdated', now());")
+    node.query("INSERT INTO table_for_update_field_dictionary VALUES (3, 'Third', now());")
+
+    time.sleep(10)
+
+    query_result = node.query("SELECT key, value FROM {dictionary_name} ORDER BY key ASC".format(dictionary_name=dictionary_name))
+
+    assert query_result == '1\tFirst\n2\tSecondUpdated\n3\tThird\n'
+
+    node.query("TRUNCATE TABLE table_for_update_field_dictionary")
+    node.query("DROP DICTIONARY {dictionary_name}".format(dictionary_name=dictionary_name))
diff --git a/tests/integration/test_disk_types/configs/storage.xml b/tests/integration/test_disk_types/configs/storage.xml
index 2bf9a2e363a..1167a4f7382 100644
--- a/tests/integration/test_disk_types/configs/storage.xml
+++ b/tests/integration/test_disk_types/configs/storage.xml
@@ -11,6 +11,10 @@
             <disk_memory>
                 <type>memory</type>
             </disk_memory>
+            <disk_hdfs>
+                <type>hdfs</type>
+                <endpoint>http://hdfs1:9000/data/</endpoint>
+            </disk_hdfs>
         </disks>
     </storage_configuration>
 </yandex>
diff --git a/tests/integration/test_disk_types/test.py b/tests/integration/test_disk_types/test.py
index ad09519a484..3f1a656d98f 100644
--- a/tests/integration/test_disk_types/test.py
+++ b/tests/integration/test_disk_types/test.py
@@ -5,6 +5,7 @@ disk_types = {
     "default": "local",
     "disk_s3": "s3",
     "disk_memory": "memory",
+    "disk_hdfs": "hdfs",
 }
 
 
@@ -12,7 +13,7 @@ disk_types = {
 def cluster():
     try:
         cluster = ClickHouseCluster(__file__)
-        cluster.add_instance("node", main_configs=["configs/storage.xml"], with_minio=True)
+        cluster.add_instance("node", main_configs=["configs/storage.xml"], with_minio=True, with_hdfs=True)
         cluster.start()
         yield cluster
     finally:
@@ -35,3 +36,4 @@ def test_select_by_type(cluster):
     node = cluster.instances["node"]
     for name, disk_type in list(disk_types.items()):
         assert node.query("SELECT name FROM system.disks WHERE type='" + disk_type + "'") == name + "\n"
+
diff --git a/tests/integration/test_distributed_ddl/test.py b/tests/integration/test_distributed_ddl/test.py
index 9af27738eed..68d8a2dab53 100755
--- a/tests/integration/test_distributed_ddl/test.py
+++ b/tests/integration/test_distributed_ddl/test.py
@@ -341,8 +341,8 @@ def test_replicated_without_arguments(test_cluster):
                                  "CREATE TABLE test_atomic.rmt ON CLUSTER cluster (n UInt64, s String) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{uuid}/{shard}', '{replica}') ORDER BY n")
     test_cluster.ddl_check_query(instance,
                                  "EXCHANGE TABLES test_atomic.rmt AND test_atomic.rmt_renamed ON CLUSTER cluster")
-    assert instance.query("SELECT countDistinct(uuid) from clusterAllReplicas('cluster', 'system', 'databases') WHERE uuid != 0 AND name='test_atomic'") == "1\n"
-    assert instance.query("SELECT countDistinct(uuid) from clusterAllReplicas('cluster', 'system', 'tables') WHERE uuid != 0 AND name='rmt'") == "1\n"
+    assert instance.query("SELECT countDistinct(uuid) from clusterAllReplicas('cluster', 'system', 'databases') WHERE uuid != '00000000-0000-0000-0000-000000000000' AND name='test_atomic'") == "1\n"
+    assert instance.query("SELECT countDistinct(uuid) from clusterAllReplicas('cluster', 'system', 'tables') WHERE uuid != '00000000-0000-0000-0000-000000000000' AND name='rmt'") == "1\n"
     test_cluster.ddl_check_query(instance,
                                  "CREATE TABLE test_atomic.rrmt ON CLUSTER cluster (n UInt64, m UInt64) ENGINE=ReplicatedReplacingMergeTree(m) ORDER BY n")
     test_cluster.ddl_check_query(instance,
diff --git a/tests/integration/test_distributed_ddl_on_cross_replication/test.py b/tests/integration/test_distributed_ddl_on_cross_replication/test.py
index 85800b2e5e6..833a3fb1f04 100644
--- a/tests/integration/test_distributed_ddl_on_cross_replication/test.py
+++ b/tests/integration/test_distributed_ddl_on_cross_replication/test.py
@@ -20,23 +20,23 @@ def started_cluster():
         node1.query('''
             CREATE DATABASE replica_1 ON CLUSTER cross_3shards_2replicas;
             CREATE DATABASE replica_2 ON CLUSTER cross_3shards_2replicas;
-            
-            CREATE TABLE replica_1.replicated_local  
+
+            CREATE TABLE replica_1.replicated_local
             ON CLUSTER cross_3shards_2replicas (part_key Date, id UInt32, shard_id UInt32)
-            ENGINE = ReplicatedMergeTree('/clickhouse/tables/{shard}/replicated', '{replica}') 
+            ENGINE = ReplicatedMergeTree('/clickhouse/tables/{shard}/replicated', '{replica}')
             partition by part_key order by id;
-            
-            CREATE TABLE replica_1.replicated  
-            ON CLUSTER cross_3shards_2replicas as replica_1.replicated_local  
+
+            CREATE TABLE replica_1.replicated
+            ON CLUSTER cross_3shards_2replicas as replica_1.replicated_local
             ENGINE = Distributed(cross_3shards_2replicas, '', replicated_local, shard_id);
-                
-            CREATE TABLE replica_2.replicated_local 
+
+            CREATE TABLE replica_2.replicated_local
             ON CLUSTER cross_3shards_2replicas (part_key Date, id UInt32, shard_id UInt32)
-            ENGINE = ReplicatedMergeTree('/clickhouse/tables/{shard_bk}/replicated', '{replica_bk}') 
+            ENGINE = ReplicatedMergeTree('/clickhouse/tables/{shard_bk}/replicated', '{replica_bk}')
             partition by part_key order by id;
-            
-            CREATE TABLE replica_2.replicated  
-            ON CLUSTER cross_3shards_2replicas as replica_2.replicated_local  
+
+            CREATE TABLE replica_2.replicated
+            ON CLUSTER cross_3shards_2replicas as replica_2.replicated_local
             ENGINE = Distributed(cross_3shards_2replicas, '', replicated_local, shard_id);
             ''')
 
@@ -98,8 +98,8 @@ def test_atomic_database(started_cluster):
     node1.query("CREATE TABLE replica_1.rmt ON CLUSTER cross_3shards_2replicas (n UInt64, s String) ENGINE=ReplicatedMergeTree('/tables/{shard}/rmt/', '{replica}') ORDER BY n")
     node1.query("CREATE TABLE replica_2.rmt ON CLUSTER cross_3shards_2replicas (n UInt64, s String) ENGINE=ReplicatedMergeTree('/tables/{shard_bk}/rmt/', '{replica_bk}') ORDER BY n")
 
-    assert node1.query("SELECT countDistinct(uuid) from remote('node1,node2,node3', 'system', 'databases') WHERE uuid != 0 AND name='replica_1'") == "1\n"
-    assert node1.query("SELECT countDistinct(uuid) from remote('node1,node2,node3', 'system', 'tables') WHERE uuid != 0 AND name='rmt'") == "2\n"
+    assert node1.query("SELECT countDistinct(uuid) from remote('node1,node2,node3', 'system', 'databases') WHERE uuid != '00000000-0000-0000-0000-000000000000' AND name='replica_1'") == "1\n"
+    assert node1.query("SELECT countDistinct(uuid) from remote('node1,node2,node3', 'system', 'tables') WHERE uuid != '00000000-0000-0000-0000-000000000000' AND name='rmt'") == "2\n"
 
     node1.query("INSERT INTO replica_1.rmt VALUES (1, 'test')")
     node2.query("SYSTEM SYNC REPLICA replica_2.rmt", timeout=5)
diff --git a/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py b/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py
index f9c10d68fe3..7bce2d50011 100644
--- a/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py
+++ b/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/test.py
@@ -1,5 +1,3 @@
-
-
 import pytest
 from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
@@ -18,23 +16,33 @@ def start_cluster():
         cluster.shutdown()
 
 
-def test_fetch_part_from_allowed_zookeeper(start_cluster):
+@pytest.mark.parametrize(
+    ('part', 'date', 'part_name'),
+    [
+        ('PARTITION', '2020-08-27', '2020-08-27'),
+        ('PART', '2020-08-28', '20200828_0_0_0'),
+    ]
+)
+def test_fetch_part_from_allowed_zookeeper(start_cluster, part, date, part_name):
     node.query(
-        "CREATE TABLE simple (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/simple', 'node') ORDER BY tuple() PARTITION BY date;"
+        "CREATE TABLE IF NOT EXISTS simple (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/simple', 'node') ORDER BY tuple() PARTITION BY date;"
     )
-    node.query("INSERT INTO simple VALUES ('2020-08-27', 1)")
+
+    node.query("""INSERT INTO simple VALUES ('{date}', 1)""".format(date=date))
 
     node.query(
-        "CREATE TABLE simple2 (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/1/simple', 'node') ORDER BY tuple() PARTITION BY date;"
+        "CREATE TABLE IF NOT EXISTS simple2 (date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/1/simple', 'node') ORDER BY tuple() PARTITION BY date;"
     )
+
     node.query(
-        "ALTER TABLE simple2 FETCH PARTITION '2020-08-27' FROM 'zookeeper2:/clickhouse/tables/0/simple';"
-    )
-    node.query("ALTER TABLE simple2 ATTACH PARTITION '2020-08-27';")
+        """ALTER TABLE simple2 FETCH {part} '{part_name}' FROM 'zookeeper2:/clickhouse/tables/0/simple';""".format(
+            part=part, part_name=part_name))
+
+    node.query("""ALTER TABLE simple2 ATTACH {part} '{part_name}';""".format(part=part, part_name=part_name))
 
     with pytest.raises(QueryRuntimeException):
         node.query(
-            "ALTER TABLE simple2 FETCH PARTITION '2020-08-27' FROM 'zookeeper:/clickhouse/tables/0/simple';"
-        )
+            """ALTER TABLE simple2 FETCH {part} '{part_name}' FROM 'zookeeper:/clickhouse/tables/0/simple';""".format(
+                part=part, part_name=part_name))
 
-    assert node.query("SELECT id FROM simple2").strip() == "1"
+    assert node.query("""SELECT id FROM simple2 where date = '{date}'""".format(date=date)).strip() == "1"
diff --git a/tests/integration/test_hedged_requests/configs/users.xml b/tests/integration/test_hedged_requests/configs/users.xml
index a3ab176b811..ac42155a18a 100644
--- a/tests/integration/test_hedged_requests/configs/users.xml
+++ b/tests/integration/test_hedged_requests/configs/users.xml
@@ -5,6 +5,8 @@
             <load_balancing>in_order</load_balancing>
             <hedged_connection_timeout_ms>100</hedged_connection_timeout_ms>
             <receive_data_timeout_ms>2000</receive_data_timeout_ms>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/integration/test_hedged_requests/test.py b/tests/integration/test_hedged_requests/test.py
index a1693206ecc..e40b3109c44 100644
--- a/tests/integration/test_hedged_requests/test.py
+++ b/tests/integration/test_hedged_requests/test.py
@@ -87,7 +87,10 @@ def check_settings(node_name, sleep_in_send_tables_status_ms, sleep_in_send_data
 
 def check_changing_replica_events(expected_count):
     result = NODES['node'].query("SELECT value FROM system.events WHERE event='HedgedRequestsChangeReplica'")
-    assert int(result) == expected_count
+
+    # If server load is high we can see more than expected
+    # replica change events, but never less than expected
+    assert int(result) >= expected_count
 
 
 def update_configs(node_1_sleep_in_send_tables_status=0, node_1_sleep_in_send_data=0,
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users.xml b/tests/integration/test_hedged_requests_parallel/configs/users.xml
index 3f3578903b4..9600c0c7124 100644
--- a/tests/integration/test_hedged_requests_parallel/configs/users.xml
+++ b/tests/integration/test_hedged_requests_parallel/configs/users.xml
@@ -6,6 +6,8 @@
             <max_parallel_replicas>2</max_parallel_replicas>
             <hedged_connection_timeout_ms>100</hedged_connection_timeout_ms>
             <receive_data_timeout_ms>2000</receive_data_timeout_ms>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/integration/test_hedged_requests_parallel/test.py b/tests/integration/test_hedged_requests_parallel/test.py
index 33f70da00ca..7abc2eb1d2a 100644
--- a/tests/integration/test_hedged_requests_parallel/test.py
+++ b/tests/integration/test_hedged_requests_parallel/test.py
@@ -88,7 +88,10 @@ def check_settings(node_name, sleep_in_send_tables_status_ms, sleep_in_send_data
 
 def check_changing_replica_events(expected_count):
     result = NODES['node'].query("SELECT value FROM system.events WHERE event='HedgedRequestsChangeReplica'")
-    assert int(result) == expected_count
+
+    # If server load is high we can see more than expected
+    # replica change events, but never less than expected
+    assert int(result) >= expected_count
 
 
 def update_configs(node_1_sleep_in_send_tables_status=0, node_1_sleep_in_send_data=0,
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 320766c18ae..07fd52751b7 100644
--- a/tests/integration/test_insert_into_distributed/configs/remote_servers.xml
+++ b/tests/integration/test_insert_into_distributed/configs/remote_servers.xml
@@ -28,14 +28,27 @@
                 </replica>
             </shard>
         </shard_with_local_replica>
-	<shard_with_low_cardinality>
+        <shard_with_local_replica_internal_replication>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </shard_with_local_replica_internal_replication>
+        <shard_with_low_cardinality>
             <shard>
                 <replica>
                     <host>shard1</host>
                     <port>9000</port>
                 </replica>
-	    </shard>
-	    <shard>
+            </shard>
+            <shard>
                 <replica>
                     <host>shard2</host>
                     <port>9000</port>
diff --git a/tests/integration/test_insert_into_distributed/test.py b/tests/integration/test_insert_into_distributed/test.py
index d71d1075c70..47200df4a85 100644
--- a/tests/integration/test_insert_into_distributed/test.py
+++ b/tests/integration/test_insert_into_distributed/test.py
@@ -1,6 +1,7 @@
 import time
 
 import pytest
+from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 from helpers.test_tools import TSV
@@ -75,6 +76,26 @@ CREATE TABLE table_function (n UInt8, s String) ENGINE = MergeTree() ORDER BY n'
         node2.query('''
 CREATE TABLE table_function (n UInt8, s String) ENGINE = MergeTree() ORDER BY n''')
 
+        node1.query('''
+CREATE TABLE distributed_one_replica_internal_replication (date Date, id UInt32) ENGINE = Distributed('shard_with_local_replica_internal_replication', 'default', 'single_replicated')
+''')
+
+        node2.query('''
+CREATE TABLE distributed_one_replica_internal_replication (date Date, id UInt32) ENGINE = Distributed('shard_with_local_replica_internal_replication', 'default', 'single_replicated')
+''')
+
+        node1.query('''
+CREATE TABLE distributed_one_replica_no_internal_replication (date Date, id UInt32) ENGINE = Distributed('shard_with_local_replica', 'default', 'single_replicated')
+''')
+
+        node2.query('''
+CREATE TABLE distributed_one_replica_no_internal_replication (date Date, id UInt32) ENGINE = Distributed('shard_with_local_replica', 'default', 'single_replicated')
+''')
+
+        node2.query('''
+CREATE TABLE single_replicated(date Date, id UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/0/single_replicated', 'node2', date, id, 8192)
+''')
+
         yield cluster
 
     finally:
@@ -162,6 +183,51 @@ def test_inserts_local(started_cluster):
     assert instance.query("SELECT count(*) FROM local").strip() == '1'
 
 
+def test_inserts_single_replica_local_internal_replication(started_cluster):
+    with pytest.raises(QueryRuntimeException, match="Table default.single_replicated doesn't exist"):
+        node1.query(
+            "INSERT INTO distributed_one_replica_internal_replication VALUES ('2000-01-01', 1)",
+            settings={
+                "insert_distributed_sync": "1",
+                "prefer_localhost_replica": "1",
+                # to make the test more deterministic
+                "load_balancing": "first_or_random",
+            },
+        )
+    assert node2.query("SELECT count(*) FROM single_replicated").strip() == '0'
+
+
+def test_inserts_single_replica_internal_replication(started_cluster):
+    try:
+        node1.query(
+            "INSERT INTO distributed_one_replica_internal_replication VALUES ('2000-01-01', 1)",
+            settings={
+                "insert_distributed_sync": "1",
+                "prefer_localhost_replica": "0",
+                # to make the test more deterministic
+                "load_balancing": "first_or_random",
+            },
+        )
+        assert node2.query("SELECT count(*) FROM single_replicated").strip() == '1'
+    finally:
+        node2.query("TRUNCATE TABLE single_replicated")
+
+
+def test_inserts_single_replica_no_internal_replication(started_cluster):
+    try:
+        with pytest.raises(QueryRuntimeException, match="Table default.single_replicated doesn't exist"):
+            node1.query(
+                "INSERT INTO distributed_one_replica_no_internal_replication VALUES ('2000-01-01', 1)",
+                settings={
+                    "insert_distributed_sync": "1",
+                    "prefer_localhost_replica": "0",
+                },
+            )
+        assert node2.query("SELECT count(*) FROM single_replicated").strip() == '1'
+    finally:
+        node2.query("TRUNCATE TABLE single_replicated")
+
+
 def test_prefer_localhost_replica(started_cluster):
     test_query = "SELECT * FROM distributed ORDER BY id"
 
diff --git a/tests/integration/test_jbod_balancer/test.py b/tests/integration/test_jbod_balancer/test.py
index abc6a0bff11..ef0308cc658 100644
--- a/tests/integration/test_jbod_balancer/test.py
+++ b/tests/integration/test_jbod_balancer/test.py
@@ -92,7 +92,10 @@ def test_jbod_balanced_merge(start_cluster):
         node1.query("create table tmp1 as tbl")
         node1.query("create table tmp2 as tbl")
 
-        for i in range(200):
+        p = Pool(20)
+
+        def task(i):
+            print("Processing insert {}/{}".format(i, 200))
             # around 1k per block
             node1.query(
                 "insert into tbl select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
@@ -104,6 +107,8 @@ def test_jbod_balanced_merge(start_cluster):
                 "insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
             )
 
+        p.map(task, range(200))
+
         time.sleep(1)
 
         check_balance(node1, "tbl")
@@ -151,8 +156,10 @@ def test_replicated_balanced_merge_fetch(start_cluster):
             node.query("create table tmp2 as tmp1")
 
         node2.query("alter table tbl modify setting always_fetch_merged_part = 1")
+        p = Pool(20)
 
-        for i in range(200):
+        def task(i):
+            print("Processing insert {}/{}".format(i, 200))
             # around 1k per block
             node1.query(
                 "insert into tbl select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
@@ -170,6 +177,8 @@ def test_replicated_balanced_merge_fetch(start_cluster):
                 "insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
             )
 
+        p.map(task, range(200))
+
         node2.query("SYSTEM SYNC REPLICA tbl", timeout=10)
 
         check_balance(node1, "tbl")
diff --git a/tests/integration/test_keeper_auth/__init__.py b/tests/integration/test_keeper_auth/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_auth/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_auth/configs/keeper_config.xml b/tests/integration/test_keeper_auth/configs/keeper_config.xml
new file mode 100644
index 00000000000..bb3c9a5d94a
--- /dev/null
+++ b/tests/integration/test_keeper_auth/configs/keeper_config.xml
@@ -0,0 +1,24 @@
+<yandex>
+    <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>
+        <superdigest>super:0DPiKuNIrrVmD8IUCuw1hQxNqZc=</superdigest>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+            <snapshot_distance>75</snapshot_distance>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_auth/configs/logs_conf.xml b/tests/integration/test_keeper_auth/configs/logs_conf.xml
new file mode 100644
index 00000000000..3384320992a
--- /dev/null
+++ b/tests/integration/test_keeper_auth/configs/logs_conf.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<yandex>
+    <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>
+</yandex>
diff --git a/tests/integration/test_keeper_auth/test.py b/tests/integration/test_keeper_auth/test.py
new file mode 100644
index 00000000000..5f60d5b8bdb
--- /dev/null
+++ b/tests/integration/test_keeper_auth/test.py
@@ -0,0 +1,302 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+from kazoo.client import KazooClient, KazooState
+from kazoo.security import ACL, make_digest_acl, make_acl
+from kazoo.exceptions import AuthFailedError, InvalidACLError, NoAuthError, KazooException
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', main_configs=['configs/keeper_config.xml', 'configs/logs_conf.xml'], with_zookeeper=True, use_keeper=False, stay_alive=True)
+
+SUPERAUTH = "super:admin"
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_fake_zk(timeout=30.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():
+    print("Zoo1", cluster.get_instance_ip("zoo1"))
+    return cluster.get_kazoo_client('zoo1')
+
+@pytest.mark.parametrize(
+    ('get_zk'),
+    [
+        get_genuine_zk,
+        get_fake_zk
+    ]
+)
+def test_digest_auth_basic(started_cluster, get_zk):
+    auth_connection = get_zk()
+
+    auth_connection.add_auth('digest', 'user1:password1')
+
+    auth_connection.create("/test_no_acl", b"")
+    auth_connection.create("/test_all_acl", b"data", acl=[make_acl("auth", "", all=True)])
+    # for some reason original zookeeper accepts this ACL, but doesn't allow to do anything with this node
+    # even with correct credentials.
+    auth_connection.create("/test_all_digest_acl", b"dataX", acl=[make_acl("digest", "user1:password1", all=True)])
+
+    assert auth_connection.get("/test_all_acl")[0] == b"data"
+    #assert auth_connection.get("/test_all_digest_acl")[0] == b"dataX"
+
+    no_auth_connection = get_zk()
+    no_auth_connection.set("/test_no_acl", b"hello")
+
+    # no ACL, so cannot access these nodes
+    assert no_auth_connection.get("/test_no_acl")[0] == b"hello"
+
+    with pytest.raises(NoAuthError):
+        no_auth_connection.set("/test_all_acl", b"hello")
+
+    with pytest.raises(NoAuthError):
+        no_auth_connection.get("/test_all_acl")
+
+    with pytest.raises(NoAuthError):
+        no_auth_connection.get("/test_all_digest_acl")
+
+    # still doesn't help
+    with pytest.raises(AuthFailedError):
+        no_auth_connection.add_auth("world", "anyone")
+
+    # session became broken, reconnect
+    no_auth_connection = get_zk()
+
+    # wrong auth
+    no_auth_connection.add_auth('digest', 'user2:password2')
+
+    with pytest.raises(NoAuthError):
+        no_auth_connection.set("/test_all_acl", b"hello")
+
+    with pytest.raises(NoAuthError):
+        no_auth_connection.set("/test_all_acl", b"hello")
+
+    with pytest.raises(NoAuthError):
+        no_auth_connection.get("/test_all_acl")
+
+    with pytest.raises(NoAuthError):
+        no_auth_connection.get("/test_all_digest_acl")
+
+    # but can access some non restricted nodes
+    no_auth_connection.create("/some_allowed_node", b"data")
+
+    # auth added, go on
+    no_auth_connection.add_auth('digest', 'user1:password1')
+    for path in ["/test_no_acl", "/test_all_acl"]:
+        no_auth_connection.set(path, b"auth_added")
+        assert no_auth_connection.get(path)[0] == b"auth_added"
+
+
+def test_super_auth(started_cluster):
+    auth_connection = get_fake_zk()
+
+    auth_connection.add_auth('digest', 'user1:password1')
+
+    auth_connection.create("/test_super_no_acl", b"")
+    auth_connection.create("/test_super_all_acl", b"data", acl=[make_acl("auth", "", all=True)])
+
+    super_connection = get_fake_zk()
+    super_connection.add_auth('digest', 'super:admin')
+
+    for path in ["/test_super_no_acl", "/test_super_all_acl"]:
+        super_connection.set(path, b"value")
+        assert super_connection.get(path)[0] == b"value"
+
+
+@pytest.mark.parametrize(
+    ('get_zk'),
+    [
+        get_genuine_zk,
+        get_fake_zk
+    ]
+)
+def test_digest_auth_multiple(started_cluster, get_zk):
+    auth_connection = get_zk()
+    auth_connection.add_auth('digest', 'user1:password1')
+    auth_connection.add_auth('digest', 'user2:password2')
+    auth_connection.add_auth('digest', 'user3:password3')
+
+    auth_connection.create("/test_multi_all_acl", b"data", acl=[make_acl("auth", "", all=True)])
+
+    one_auth_connection = get_zk()
+    one_auth_connection.add_auth('digest', 'user1:password1')
+
+    one_auth_connection.set("/test_multi_all_acl", b"X")
+    assert one_auth_connection.get("/test_multi_all_acl")[0] == b"X"
+
+    other_auth_connection = get_zk()
+    other_auth_connection.add_auth('digest', 'user2:password2')
+
+    other_auth_connection.set("/test_multi_all_acl", b"Y")
+
+    assert other_auth_connection.get("/test_multi_all_acl")[0] == b"Y"
+
+@pytest.mark.parametrize(
+    ('get_zk'),
+    [
+        get_genuine_zk,
+        get_fake_zk
+    ]
+)
+def test_partial_auth(started_cluster, get_zk):
+    auth_connection = get_zk()
+    auth_connection.add_auth('digest', 'user1:password1')
+
+    auth_connection.create("/test_partial_acl", b"data", acl=[make_acl("auth", "", read=False, write=True, create=True, delete=True, admin=True)])
+
+    auth_connection.set("/test_partial_acl", b"X")
+    auth_connection.create("/test_partial_acl/subnode", b"X", acl=[make_acl("auth", "", read=False, write=True, create=True, delete=True, admin=True)])
+
+    with pytest.raises(NoAuthError):
+        auth_connection.get("/test_partial_acl")
+
+    with pytest.raises(NoAuthError):
+        auth_connection.get_children("/test_partial_acl")
+
+    # exists works without read perm
+    assert auth_connection.exists("/test_partial_acl") is not None
+
+    auth_connection.create("/test_partial_acl_create", b"data", acl=[make_acl("auth", "", read=True, write=True, create=False, delete=True, admin=True)])
+    with pytest.raises(NoAuthError):
+        auth_connection.create("/test_partial_acl_create/subnode")
+
+    auth_connection.create("/test_partial_acl_set", b"data", acl=[make_acl("auth", "", read=True, write=False, create=True, delete=True, admin=True)])
+    with pytest.raises(NoAuthError):
+        auth_connection.set("/test_partial_acl_set", b"X")
+
+    # not allowed to delete child node
+    auth_connection.create("/test_partial_acl_delete", b"data", acl=[make_acl("auth", "", read=True, write=True, create=True, delete=False, admin=True)])
+    auth_connection.create("/test_partial_acl_delete/subnode")
+    with pytest.raises(NoAuthError):
+        auth_connection.delete("/test_partial_acl_delete/subnode")
+
+
+def test_bad_auth(started_cluster):
+    auth_connection = get_fake_zk()
+
+    with pytest.raises(AuthFailedError):
+        auth_connection.add_auth('world', 'anyone')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(AuthFailedError):
+        print("Sending 1")
+        auth_connection.add_auth('adssagf', 'user1:password1')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(AuthFailedError):
+        print("Sending 2")
+        auth_connection.add_auth('digest', '')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(AuthFailedError):
+        print("Sending 3")
+        auth_connection.add_auth('', 'user1:password1')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(AuthFailedError):
+        print("Sending 4")
+        auth_connection.add_auth('digest', 'user1')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(AuthFailedError):
+        print("Sending 5")
+        auth_connection.add_auth('digest', 'user1:password:otherpassword')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(AuthFailedError):
+        print("Sending 6")
+        auth_connection.add_auth('auth', 'user1:password')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(AuthFailedError):
+        print("Sending 7")
+        auth_connection.add_auth('world', 'somebody')
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(InvalidACLError):
+        print("Sending 8")
+        auth_connection.create("/test_bad_acl", b"data", acl=[make_acl("dasd", "", read=True, write=False, create=True, delete=True, admin=True)])
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(InvalidACLError):
+        print("Sending 9")
+        auth_connection.create("/test_bad_acl", b"data", acl=[make_acl("digest", "", read=True, write=False, create=True, delete=True, admin=True)])
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(InvalidACLError):
+        print("Sending 10")
+        auth_connection.create("/test_bad_acl", b"data", acl=[make_acl("", "", read=True, write=False, create=True, delete=True, admin=True)])
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(InvalidACLError):
+        print("Sending 11")
+        auth_connection.create("/test_bad_acl", b"data", acl=[make_acl("digest", "dsdasda", read=True, write=False, create=True, delete=True, admin=True)])
+
+    auth_connection = get_fake_zk()
+    with pytest.raises(InvalidACLError):
+        print("Sending 12")
+        auth_connection.create("/test_bad_acl", b"data", acl=[make_acl("digest", "dsad:DSAa:d", read=True, write=False, create=True, delete=True, admin=True)])
+
+def test_auth_snapshot(started_cluster):
+    connection = get_fake_zk()
+    connection.add_auth('digest', 'user1:password1')
+
+    connection.create("/test_snapshot_acl", b"data", acl=[make_acl("auth", "", all=True)])
+
+    connection1 = get_fake_zk()
+    connection1.add_auth('digest', 'user2:password2')
+
+    connection1.create("/test_snapshot_acl1", b"data", acl=[make_acl("auth", "", all=True)])
+
+    connection2 = get_fake_zk()
+
+    connection2.create("/test_snapshot_acl2", b"data")
+
+    for i in range(100):
+        connection.create(f"/test_snapshot_acl/path{i}", b"data", acl=[make_acl("auth", "", all=True)])
+
+    node.restart_clickhouse()
+
+    connection = get_fake_zk()
+
+    with pytest.raises(NoAuthError):
+        connection.get("/test_snapshot_acl")
+
+    connection.add_auth('digest', 'user1:password1')
+
+    assert connection.get("/test_snapshot_acl")[0] == b"data"
+
+    with pytest.raises(NoAuthError):
+        connection.get("/test_snapshot_acl1")
+
+    assert connection.get("/test_snapshot_acl2")[0] == b"data"
+
+    for i in range(100):
+        assert connection.get(f"/test_snapshot_acl/path{i}")[0] == b"data"
+
+    connection1 = get_fake_zk()
+    connection1.add_auth('digest', 'user2:password2')
+
+    assert connection1.get("/test_snapshot_acl1")[0] == b"data"
+
+    with pytest.raises(NoAuthError):
+        connection1.get("/test_snapshot_acl")
+
+
+    connection2 = get_fake_zk()
+    assert connection2.get("/test_snapshot_acl2")[0] == b"data"
+    with pytest.raises(NoAuthError):
+        connection2.get("/test_snapshot_acl")
+
+    with pytest.raises(NoAuthError):
+        connection2.get("/test_snapshot_acl1")
diff --git a/tests/integration/test_keeper_back_to_back/test.py b/tests/integration/test_keeper_back_to_back/test.py
index 8abd4321fd9..4cb539e448c 100644
--- a/tests/integration/test_keeper_back_to_back/test.py
+++ b/tests/integration/test_keeper_back_to_back/test.py
@@ -7,7 +7,7 @@ import time
 from multiprocessing.dummy import Pool
 
 cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance('node', main_configs=['configs/enable_keeper.xml', 'configs/logs_conf.xml'], with_zookeeper=True)
+node = cluster.add_instance('node', main_configs=['configs/enable_keeper.xml', 'configs/logs_conf.xml'], with_zookeeper=True, use_keeper=False)
 from kazoo.client import KazooClient, KazooState, KeeperState
 
 def get_genuine_zk():
diff --git a/tests/integration/test_keeper_internal_secure/__init__.py b/tests/integration/test_keeper_internal_secure/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
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
new file mode 100644
index 00000000000..ecbd50c72a6
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <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>
+            <secure>true</secure>
+            <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>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
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
new file mode 100644
index 00000000000..53129ae0a75
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <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>
+            <secure>true</secure>
+            <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>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
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
new file mode 100644
index 00000000000..4c685764ec0
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
@@ -0,0 +1,42 @@
+<yandex>
+    <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>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <secure>true</secure>
+            <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>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_internal_secure/configs/rootCA.pem b/tests/integration/test_keeper_internal_secure/configs/rootCA.pem
new file mode 100644
index 00000000000..ec16533d98a
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/rootCA.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIUUiyhAav08YhTLfUIXLN/0Ln09n4wDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTA0MTIxMTQ1MjBaFw0yMTA1
+MTIxMTQ1MjBaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDK0Ww4voPlkePBPS2MsEi7e1ePS+CDxTdDuOwWWEA7
+JiOyqIGqdyL6AE2EqjL3sSdVFVxytpGQWDuM6JHXdb01AnMngBuql9Jkiln7i267
+v54HtMWdm8o3rik/b/mB+kkn/sP715tI49Ybh/RobtvtK16ZgHr1ombkq6rXiom2
+8GmSmpYFwZtZsXtm2JwbZVayupQpWwdu3KrTXKBtVyKVvvWdgkf47DWYtWDS3vqE
+cShM1H97G4DvI+4RX1WtQevQ0yCx1aFTg4xMHFkpUxlP8iW6mQaQPqy9rnI57e3L
+RHc2I/B56xa43R3GmQ2S7bE4hvm1SrZDtVgrZLf4nvwNAgMBAAGjUzBRMB0GA1Ud
+DgQWBBQ4+o0x1FzK7nRbcnm2pNLwaywCdzAfBgNVHSMEGDAWgBQ4+o0x1FzK7nRb
+cnm2pNLwaywCdzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDE
+YmM8MH6RKcaqMqCBefWLj0LTcZ/Wm4G/eCFC51PkAIsf7thnzViemBHRXUSF8wzc
+1MBPD6II6OB1F0i7ntGjtlhnL2WcPYbo2Np59p7fo9SMbYwF49OZ40twsuKeeoAp
+pfow+y/EBZqa99MY2q6FU6FDA3Rpv0Sdk+/5PHdsSP6cgeMszFBUS0tCQEvEl83n
+FJUb0vjEX4x3J64XO/0DKXyCxFyF77OwHG2ZV5BeCpIhGXu+d/e221LJkGI2orKR
+kgsaUwrkS8HQt3Hd0gYpLI1Opx/JlRpB0VLYLzRGj7kDpbAcTj3SMEUp/FAZmlXR
+Iiebt73eE3rOWVFgyY9f
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_keeper_internal_secure/configs/server.crt b/tests/integration/test_keeper_internal_secure/configs/server.crt
new file mode 100644
index 00000000000..dfa32da5444
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/server.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDETCCAfkCFHL+gKBQnU0P73/nrFrGaVPauTPmMA0GCSqGSIb3DQEBCwUAMEUx
+CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
+cm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMjEwNDEyMTE0NzI5WhcNMjEwNTEyMTE0
+NzI5WjBFMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UE
+CgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA1iPeYn1Vy4QnQi6uNVqQnFLr0u3qdrMjGEBNAOuGmtIdhIn8
+rMCzaehNr3y2YTMRbZAqmv28P/wOXpzR1uQaFlQzTOjmsn/HOZ9JX2hv5sBUv7SU
+UiPJS7UtptKDPbLv3N/v1dOXbY+vVyzo8U1Q9OS1J5yhYW6KtxP++hfSrOsFu669
+d1pqWFWaNBsmf0zF+ETvi6lywhyTFA1/PazcStP5GntcDL7eDvGq+DDsRC40oRpy
+S4xRQRSteCTtGGmWpx+Jmt+90wFnLgruUbWT0veCoLxLvz0tJUk3ueUVnMkrxBQG
+Fz+IWm+SQppNU5LlAcBcu9wJfo3h34BXp0NFNQIDAQABMA0GCSqGSIb3DQEBCwUA
+A4IBAQCUnvQsv+GsPwGnIWqH9iiFVhgDx5QbSTW94Fyqk8dcIJBzWAiCshmLBWPJ
+pfy4y2nxJbzovFsd9DA49pxqqILeLjue99yma2DVKeo+XDLDN3OX5faIMTBd7AnL
+0MKqW7gUSLRUZrNOvFciAY8xRezgBQQBo4mcmmMbAbk5wKndGY6ZZOcY+JwXlqGB
+5hyi6ishO8ciiZi3GMFNWWk9ViSfo27IqjKdSkQq1pr3FULvepd6SkdX+NvfZTAH
+rG+CSoFGiJcOBbhDkvpY32cAJEnJOA1vHpFxfnGP8/1haeVZHqSwH1cySD78HVtF
+fBs000wGHzBYWNI2KkwjNtYf06P4
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_keeper_internal_secure/configs/server.key b/tests/integration/test_keeper_internal_secure/configs/server.key
new file mode 100644
index 00000000000..7e57c8b6b34
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/server.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA1iPeYn1Vy4QnQi6uNVqQnFLr0u3qdrMjGEBNAOuGmtIdhIn8
+rMCzaehNr3y2YTMRbZAqmv28P/wOXpzR1uQaFlQzTOjmsn/HOZ9JX2hv5sBUv7SU
+UiPJS7UtptKDPbLv3N/v1dOXbY+vVyzo8U1Q9OS1J5yhYW6KtxP++hfSrOsFu669
+d1pqWFWaNBsmf0zF+ETvi6lywhyTFA1/PazcStP5GntcDL7eDvGq+DDsRC40oRpy
+S4xRQRSteCTtGGmWpx+Jmt+90wFnLgruUbWT0veCoLxLvz0tJUk3ueUVnMkrxBQG
+Fz+IWm+SQppNU5LlAcBcu9wJfo3h34BXp0NFNQIDAQABAoIBAHYDso2o8V2F6XTp
+8QxqawQcFudaQztDonW9CjMVmks8vRPMUDqMwNP/OMEcBA8xa8tsBm8Ao3zH1suB
+tYuujkn8AYHDYVDCZvN0u6UfE3yiRpKYXJ2gJ1HX+d7UaYvZT6P0rmKzh+LTqxhq
+Ib7Kk3FDkirQgYgGueAH3x/JfUvaAGvFrq+HvvlhHOs7M7iFU4nJA8jNfBolpTnG
+v5MMI+f8/GHGreVICJUoclE+4V/4LDHUlrc3l1kQk0keeD6ECw/pl48TNL6ncXKu
+baez1rfKbMPjhLUy2q5UZa93oW+olchEOXs1nUNKUhIOOr0f0YweYhUHNTineVM9
+yTecMIkCgYEA7CFQMyeLVeBA6C9AHBe8Zf/k64cMPyr0lUz6548ulil580PNPbvW
+kd2vIKfUMgCO5lMA47ArL4bXZ7cjTvJmPYE1Yv8z+F0Tk03fnTrudHOSBEiGXAu3
+MPTxCDU7Se5Dwj0Fq81aFRtCHl8Rrss+WiBD8eRoxb/vwXKFc6VUAWMCgYEA6CjZ
+XrZz11lySBhjkyVXcdLj89hDZ+bPxA7b3VB7TfCxsn5xVck7U3TFkg5Z9XwEQ7Ob
+XFAPuwT9GKm7QPp6L8T2RltoJ3ys40UH1RtcNLz2aIo/xSP7lopPdAfWHef5r4y9
+kRw+Gh4NP/l5wefXsRz/D0jY3+t+QnwnhuCKbocCgYEAiR6bPOlkvzyXVH1DxEyA
+Sdb8b00f7nqaRyzJsrfxvJ9fQsWHpKa0ZkYOUW9ECLlMQjHHHXEK0vGBmqe9qDWY
+63RhtRgvbLVYDb018k7rc9I846Hd7AudmJ9UbIjE4hyrWlsnNOntur32ej6IvTEn
+Bx0fd5NEyDi6GGLRXiOOkbMCgYAressLE/yqDlR68CZl/o5cAPU0TAKDyRSMUYQX
+9OTC+hstpMSxHlkADlSaQBnVAf8CdvbX2R65FfwYzGEHkGGl5KuDDcd57b2rathG
+rzMbpXA4r/u1fkG2Nf0fbABL5ZA7so4mSTXQSmSM4LpO+I7K2vVh9XC4rzAcX4g/
+mHoUrQKBgBf3rxp5h9P3HWoZYjzBDo2FqXUjKLLjE9ed5e/VqecqfHIkmueuNHlN
+xifHr7lpsYu6IXkTnlK14pvLoPuwP59dCIOUYwAFz8RlH4MSUGNhYeGA8cqRrhmJ
+tYk3OKExuN/+O12kUPVTy6BMH1hBdRJP+7y7lapWsRhZt18y+8Za
+-----END RSA PRIVATE KEY-----
diff --git a/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml b/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml
new file mode 100644
index 00000000000..babc7cf0f18
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml
@@ -0,0 +1,15 @@
+
+<yandex>
+    <openSSL>
+        <server>
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <caConfig>/etc/clickhouse-server/config.d/rootCA.pem</caConfig>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <verificationMode>none</verificationMode>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+    </openSSL>
+</yandex>
diff --git a/tests/integration/test_keeper_internal_secure/test.py b/tests/integration/test_keeper_internal_secure/test.py
new file mode 100644
index 00000000000..b4bf62f9a37
--- /dev/null
+++ b/tests/integration/test_keeper_internal_secure/test.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_secure_keeper1.xml', 'configs/ssl_conf.xml', 'configs/server.crt', 'configs/server.key', 'configs/rootCA.pem'])
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_secure_keeper2.xml', 'configs/ssl_conf.xml', 'configs/server.crt', 'configs/server.key', 'configs/rootCA.pem'])
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_secure_keeper3.xml', 'configs/ssl_conf.xml', 'configs/server.crt', 'configs/server.key', 'configs/rootCA.pem'])
+
+from kazoo.client import KazooClient, KazooState
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+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_secure_raft_works(started_cluster):
+    try:
+        node1_zk = get_fake_zk("node1")
+        node2_zk = get_fake_zk("node2")
+        node3_zk = get_fake_zk("node3")
+
+        node1_zk.create("/test_node", b"somedata1")
+        node2_zk.sync("/test_node")
+        node3_zk.sync("/test_node")
+
+        assert node1_zk.exists("/test_node") is not None
+        assert node2_zk.exists("/test_node") is not None
+        assert node3_zk.exists("/test_node") 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_multinode_blocade_leader/test.py b/tests/integration/test_keeper_multinode_blocade_leader/test.py
index e74ccc80fe8..9ae81ccdcc6 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/test.py
+++ b/tests/integration/test_keeper_multinode_blocade_leader/test.py
@@ -66,12 +66,6 @@ def wait_nodes():
 
 def get_fake_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
-    def reset_listener(state):
-        nonlocal _fake_zk_instance
-        if state != KazooState.CONNECTED:
-            _fake_zk_instance._reset()
-
-    _fake_zk_instance.add_listener(reset_listener)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
diff --git a/tests/integration/test_keeper_multinode_simple/test.py b/tests/integration/test_keeper_multinode_simple/test.py
index 18420c9910d..9e57567d8b1 100644
--- a/tests/integration/test_keeper_multinode_simple/test.py
+++ b/tests/integration/test_keeper_multinode_simple/test.py
@@ -54,13 +54,6 @@ def wait_nodes():
 
 def get_fake_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
-    def reset_listener(state):
-        nonlocal _fake_zk_instance
-        print("Fake zk callback called for state", state)
-        if state != KazooState.CONNECTED:
-            _fake_zk_instance._reset()
-
-    _fake_zk_instance.add_listener(reset_listener)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
diff --git a/tests/integration/test_keeper_persistent_log/test.py b/tests/integration/test_keeper_persistent_log/test.py
index 36ee20ae9e7..b0cd9155afb 100644
--- a/tests/integration/test_keeper_persistent_log/test.py
+++ b/tests/integration/test_keeper_persistent_log/test.py
@@ -33,13 +33,6 @@ def started_cluster():
 
 def get_connection_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
-    def reset_listener(state):
-        nonlocal _fake_zk_instance
-        print("Fake zk callback called for state", state)
-        if state != KazooState.CONNECTED:
-            _fake_zk_instance._reset()
-
-    _fake_zk_instance.add_listener(reset_listener)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
diff --git a/tests/integration/test_keeper_persistent_log_multinode/test.py b/tests/integration/test_keeper_persistent_log_multinode/test.py
index 052f38b0bff..306139369fb 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/test.py
+++ b/tests/integration/test_keeper_persistent_log_multinode/test.py
@@ -25,13 +25,6 @@ def started_cluster():
 
 def get_fake_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
-    def reset_listener(state):
-        nonlocal _fake_zk_instance
-        print("Fake zk callback called for state", state)
-        if state != KazooState.CONNECTED:
-            _fake_zk_instance._reset()
-
-    _fake_zk_instance.add_listener(reset_listener)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
diff --git a/tests/integration/test_keeper_restore_from_snapshot/test.py b/tests/integration/test_keeper_restore_from_snapshot/test.py
index eee49f8a319..5f6156800bb 100644
--- a/tests/integration/test_keeper_restore_from_snapshot/test.py
+++ b/tests/integration/test_keeper_restore_from_snapshot/test.py
@@ -25,13 +25,6 @@ def started_cluster():
 
 def get_fake_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
-    def reset_listener(state):
-        nonlocal _fake_zk_instance
-        print("Fake zk callback called for state", state)
-        if state != KazooState.CONNECTED:
-            _fake_zk_instance._reset()
-
-    _fake_zk_instance.add_listener(reset_listener)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
@@ -77,6 +70,7 @@ def test_recover_from_snapshot(started_cluster):
     # stale node should recover from leader's snapshot
     # with some sanitizers can start longer than 5 seconds
     node3.start_clickhouse(20)
+    print("Restarted")
 
     try:
         node1_zk = node2_zk = node3_zk = None
diff --git a/tests/integration/test_keeper_secure_client/__init__.py b/tests/integration/test_keeper_secure_client/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_secure_client/configs/dhparam.pem b/tests/integration/test_keeper_secure_client/configs/dhparam.pem
new file mode 100644
index 00000000000..2e6cee0798d
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/dhparam.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAua92DDli13gJ+//ZXyGaggjIuidqB0crXfhUlsrBk9BV1hH3i7fR
+XGP9rUdk2ubnB3k2ejBStL5oBrkHm9SzUFSQHqfDjLZjKoUpOEmuDc4cHvX1XTR5
+Pr1vf5cd0yEncJWG5W4zyUB8k++SUdL2qaeslSs+f491HBLDYn/h8zCgRbBvxhxb
+9qeho1xcbnWeqkN6Kc9bgGozA16P9NLuuLttNnOblkH+lMBf42BSne/TWt3AlGZf
+slKmmZcySUhF8aKfJnLKbkBCFqOtFRh8zBA9a7g+BT/lSANATCDPaAk1YVih2EKb
+dpc3briTDbRsiqg2JKMI7+VdULY9bh3EawIBAg==
+-----END DH PARAMETERS-----
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
new file mode 100644
index 00000000000..af815f4a3bc
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<yandex>
+    <keeper_server>
+        <tcp_port_secure>10181</tcp_port_secure>
+        <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>
+            <force_sync>false</force_sync>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>localhost</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</yandex>
diff --git a/tests/integration/test_keeper_secure_client/configs/server.crt b/tests/integration/test_keeper_secure_client/configs/server.crt
new file mode 100644
index 00000000000..7ade2d96273
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/server.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/TCCAeWgAwIBAgIJANjx1QSR77HBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAgFw0xODA3MzAxODE2MDhaGA8yMjkyMDUxNDE4MTYwOFow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs9uSo6lJG8o8pw0fbVGVu0tPOljSWcVSXH9uiJBwlZLQnhN4SFSFohfI
+4K8U1tBDTnxPLUo/V1K9yzoLiRDGMkwVj6+4+hE2udS2ePTQv5oaMeJ9wrs+5c9T
+4pOtlq3pLAdm04ZMB1nbrEysceVudHRkQbGHzHp6VG29Fw7Ga6YpqyHQihRmEkTU
+7UCYNA+Vk7aDPdMS/khweyTpXYZimaK9f0ECU3/VOeG3fH6Sp2X6FN4tUj/aFXEj
+sRmU5G2TlYiSIUMF2JPdhSihfk1hJVALrHPTU38SOL+GyyBRWdNcrIwVwbpvsvPg
+pryMSNxnpr0AK0dFhjwnupIv5hJIOQIDAQABo1AwTjAdBgNVHQ4EFgQUjPLb3uYC
+kcamyZHK4/EV8jAP0wQwHwYDVR0jBBgwFoAUjPLb3uYCkcamyZHK4/EV8jAP0wQw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAM/ocuDvfPus/KpMVD51j
+4IdlU8R0vmnYLQ+ygzOAo7+hUWP5j0yvq4ILWNmQX6HNvUggCgFv9bjwDFhb/5Vr
+85ieWfTd9+LTjrOzTw4avdGwpX9G+6jJJSSq15tw5ElOIFb/qNA9O4dBiu8vn03C
+L/zRSXrARhSqTW5w/tZkUcSTT+M5h28+Lgn9ysx4Ff5vi44LJ1NnrbJbEAIYsAAD
++UA+4MBFKx1r6hHINULev8+lCfkpwIaeS8RL+op4fr6kQPxnULw8wT8gkuc8I4+L
+P9gg/xDHB44T3ADGZ5Ib6O0DJaNiToO6rnoaaxs0KkotbvDWvRoxEytSbXKoYjYp
+0g==
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_keeper_secure_client/configs/server.key b/tests/integration/test_keeper_secure_client/configs/server.key
new file mode 100644
index 00000000000..f0fb61ac443
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz25KjqUkbyjyn
+DR9tUZW7S086WNJZxVJcf26IkHCVktCeE3hIVIWiF8jgrxTW0ENOfE8tSj9XUr3L
+OguJEMYyTBWPr7j6ETa51LZ49NC/mhox4n3Cuz7lz1Pik62WreksB2bThkwHWdus
+TKxx5W50dGRBsYfMenpUbb0XDsZrpimrIdCKFGYSRNTtQJg0D5WTtoM90xL+SHB7
+JOldhmKZor1/QQJTf9U54bd8fpKnZfoU3i1SP9oVcSOxGZTkbZOViJIhQwXYk92F
+KKF+TWElUAusc9NTfxI4v4bLIFFZ01ysjBXBum+y8+CmvIxI3GemvQArR0WGPCe6
+ki/mEkg5AgMBAAECggEATrbIBIxwDJOD2/BoUqWkDCY3dGevF8697vFuZKIiQ7PP
+TX9j4vPq0DfsmDjHvAPFkTHiTQXzlroFik3LAp+uvhCCVzImmHq0IrwvZ9xtB43f
+7Pkc5P6h1l3Ybo8HJ6zRIY3TuLtLxuPSuiOMTQSGRL0zq3SQ5DKuGwkz+kVjHXUN
+MR2TECFwMHKQ5VLrC+7PMpsJYyOMlDAWhRfUalxC55xOXTpaN8TxNnwQ8K2ISVY5
+212Jz/a4hn4LdwxSz3Tiu95PN072K87HLWx3EdT6vW4Ge5P/A3y+smIuNAlanMnu
+plHBRtpATLiTxZt/n6npyrfQVbYjSH7KWhB8hBHtaQKBgQDh9Cq1c/KtqDtE0Ccr
+/r9tZNTUwBE6VP+3OJeKdEdtsfuxjOCkS1oAjgBJiSDOiWPh1DdoDeVZjPKq6pIu
+Mq12OE3Doa8znfCXGbkSzEKOb2unKZMJxzrz99kXt40W5DtrqKPNb24CNqTiY8Aa
+CjtcX+3weat82VRXvph6U8ltMwKBgQDLxjiQQzNoY7qvg7CwJCjf9qq8jmLK766g
+1FHXopqS+dTxDLM8eJSRrpmxGWJvNeNc1uPhsKsKgotqAMdBUQTf7rSTbt4MyoH5
+bUcRLtr+0QTK9hDWMOOvleqNXha68vATkohWYfCueNsC60qD44o8RZAS6UNy3ENq
+cM1cxqe84wKBgQDKkHutWnooJtajlTxY27O/nZKT/HA1bDgniMuKaz4R4Gr1PIez
+on3YW3V0d0P7BP6PWRIm7bY79vkiMtLEKdiKUGWeyZdo3eHvhDb/3DCawtau8L2K
+GZsHVp2//mS1Lfz7Qh8/L/NedqCQ+L4iWiPnZ3THjjwn3CoZ05ucpvrAMwKBgB54
+nay039MUVq44Owub3KDg+dcIU62U+cAC/9oG7qZbxYPmKkc4oL7IJSNecGHA5SbU
+2268RFdl/gLz6tfRjbEOuOHzCjFPdvAdbysanpTMHLNc6FefJ+zxtgk9sJh0C4Jh
+vxFrw9nTKKzfEl12gQ1SOaEaUIO0fEBGbe8ZpauRAoGAMAlGV+2/K4ebvAJKOVTa
+dKAzQ+TD2SJmeR1HZmKDYddNqwtZlzg3v4ZhCk4eaUmGeC1Bdh8MDuB3QQvXz4Dr
+vOIP4UVaOr+uM+7TgAgVnP4/K6IeJGzUDhX93pmpWhODfdu/oojEKVcpCojmEmS1
+KCBtmIrQLqzMpnBpLNuSY+Q=
+-----END PRIVATE KEY-----
diff --git a/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml b/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml
new file mode 100644
index 00000000000..7ca51acde22
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml
@@ -0,0 +1,26 @@
+<yandex>
+    <openSSL>
+        <server>
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <dhParamsFile>/etc/clickhouse-server/config.d/dhparam.pem</dhParamsFile>
+            <verificationMode>none</verificationMode>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+        </server>
+        <client>
+            <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/config.d/server.key</privateKeyFile>
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <verificationMode>none</verificationMode>
+            <invalidCertificateHandler>
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+</yandex>
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
new file mode 100644
index 00000000000..a0d19300022
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml
@@ -0,0 +1,9 @@
+<yandex>
+    <zookeeper>
+        <node index="1">
+            <host>node1</host>
+            <port>10181</port>
+            <secure>1</secure>
+        </node>
+    </zookeeper>
+</yandex>
diff --git a/tests/integration/test_keeper_secure_client/test.py b/tests/integration/test_keeper_secure_client/test.py
new file mode 100644
index 00000000000..fe03ed8dcf8
--- /dev/null
+++ b/tests/integration/test_keeper_secure_client/test.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_secure_keeper.xml', 'configs/ssl_conf.xml', "configs/dhparam.pem", "configs/server.crt", "configs/server.key"])
+node2 = cluster.add_instance('node2', main_configs=['configs/use_secure_keeper.xml', 'configs/ssl_conf.xml', "configs/server.crt", "configs/server.key"])
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_connection(started_cluster):
+    # just nothrow
+    node2.query("SELECT * FROM system.zookeeper WHERE path = '/'")
diff --git a/tests/integration/test_keeper_snapshots/test.py b/tests/integration/test_keeper_snapshots/test.py
index 9879c0003be..7d5b69bf5d1 100644
--- a/tests/integration/test_keeper_snapshots/test.py
+++ b/tests/integration/test_keeper_snapshots/test.py
@@ -35,13 +35,6 @@ def started_cluster():
 
 def get_connection_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
-    def reset_listener(state):
-        nonlocal _fake_zk_instance
-        print("Fake zk callback called for state", state)
-        if state != KazooState.CONNECTED:
-            _fake_zk_instance._reset()
-
-    _fake_zk_instance.add_listener(reset_listener)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
diff --git a/tests/integration/test_keeper_snapshots_multinode/test.py b/tests/integration/test_keeper_snapshots_multinode/test.py
index b4e82d62f09..96d19592d29 100644
--- a/tests/integration/test_keeper_snapshots_multinode/test.py
+++ b/tests/integration/test_keeper_snapshots_multinode/test.py
@@ -25,13 +25,6 @@ def started_cluster():
 
 def get_fake_zk(nodename, timeout=30.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
-    def reset_listener(state):
-        nonlocal _fake_zk_instance
-        print("Fake zk callback called for state", state)
-        if state != KazooState.CONNECTED:
-            _fake_zk_instance._reset()
-
-    _fake_zk_instance.add_listener(reset_listener)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.reference b/tests/integration/test_library_bridge/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.reference
rename to tests/integration/test_library_bridge/__init__.py
diff --git a/tests/integration/test_library_bridge/configs/config.d/config.xml b/tests/integration/test_library_bridge/configs/config.d/config.xml
new file mode 100644
index 00000000000..9bea75fbb6f
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/config.d/config.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <dictionaries_lib_path>/etc/clickhouse-server/config.d/dictionaries_lib</dictionaries_lib_path>
+    <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>
+</yandex>
diff --git a/tests/integration/test_library_bridge/configs/dict_lib.cpp b/tests/integration/test_library_bridge/configs/dict_lib.cpp
new file mode 100644
index 00000000000..be25804ed64
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/dict_lib.cpp
@@ -0,0 +1,298 @@
+/// c++ sample dictionary library
+
+#include <cstdint>
+#include <functional>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <vector>
+
+namespace ClickHouseLibrary
+{
+using CString = const char *;
+using ColumnName = CString;
+using ColumnNames = ColumnName[];
+
+struct CStrings
+{
+    CString * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct VectorUInt64
+{
+    const uint64_t * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct ColumnsUInt64
+{
+    VectorUInt64 * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Field
+{
+    const void * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Row
+{
+    const Field * data = nullptr;
+    uint64_t size = 0;
+};
+
+struct Table
+{
+    const Row * data = nullptr;
+    uint64_t size = 0;
+    uint64_t error_code = 0; // 0 = ok; !0 = error, with message in error_string
+    const char * error_string = nullptr;
+};
+
+enum LogLevel
+{
+    FATAL = 1,
+    CRITICAL,
+    ERROR,
+    WARNING,
+    NOTICE,
+    INFORMATION,
+    DEBUG,
+    TRACE,
+};
+
+void log(LogLevel level, CString msg);
+}
+
+
+#define LOG(logger, message)                                             \
+    do                                                                   \
+    {                                                                    \
+        std::stringstream builder;                                       \
+        builder << message;                                              \
+        (logger)(ClickHouseLibrary::INFORMATION, builder.str().c_str()); \
+    } while (false)
+
+
+struct LibHolder
+{
+    std::function<void(ClickHouseLibrary::LogLevel, ClickHouseLibrary::CString)> log;
+};
+
+
+struct DataHolder
+{
+    std::vector<std::vector<uint64_t>> dataHolder; // Actual data storage
+    std::vector<std::vector<ClickHouseLibrary::Field>> fieldHolder; // Pointers and sizes of data
+    std::unique_ptr<ClickHouseLibrary::Row[]> rowHolder;
+    ClickHouseLibrary::Table ctable; // Result data prepared for transfer via c-style interface
+    LibHolder * lib = nullptr;
+
+    size_t num_rows;
+    size_t num_cols;
+};
+
+
+template <typename T>
+void MakeColumnsFromVector(T * ptr)
+{
+    if (ptr->dataHolder.empty())
+    {
+        LOG(ptr->lib->log, "generating null values, cols: " << ptr->num_cols);
+        std::vector<ClickHouseLibrary::Field> fields;
+        for (size_t i = 0; i < ptr->num_cols; ++i)
+            fields.push_back({nullptr, 0});
+        ptr->fieldHolder.push_back(fields);
+    }
+    else
+    {
+        for (const auto & row : ptr->dataHolder)
+        {
+            std::vector<ClickHouseLibrary::Field> fields;
+            for (const auto & field : row)
+                fields.push_back({&field, sizeof(field)});
+            ptr->fieldHolder.push_back(fields);
+        }
+    }
+
+    const auto rows_num = ptr->fieldHolder.size();
+    ptr->rowHolder = std::make_unique<ClickHouseLibrary::Row[]>(rows_num);
+    size_t i = 0;
+    for (auto & row : ptr->fieldHolder)
+    {
+        ptr->rowHolder[i].size = row.size();
+        ptr->rowHolder[i].data = row.data();
+        ++i;
+    }
+    ptr->ctable.size = rows_num;
+    ptr->ctable.data = ptr->rowHolder.get();
+}
+
+
+extern "C"
+{
+
+void * ClickHouseDictionary_v3_loadIds(void * data_ptr,
+    ClickHouseLibrary::CStrings * settings,
+    ClickHouseLibrary::CStrings * columns,
+    const struct ClickHouseLibrary::VectorUInt64 * ids)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+
+    if (ids)
+        LOG(ptr->lib->log, "loadIds lib call ptr=" << data_ptr << " => " << ptr << " size=" << ids->size);
+
+    if (!ptr)
+        return nullptr;
+
+    if (settings)
+    {
+        LOG(ptr->lib->log, "settings passed: " << settings->size);
+        for (size_t i = 0; i < settings->size; ++i)
+        {
+            LOG(ptr->lib->log, "setting " << i << " :" << settings->data[i]);
+        }
+    }
+
+    if (columns)
+    {
+        LOG(ptr->lib->log, "columns passed:" << columns->size);
+        for (size_t i = 0; i < columns->size; ++i)
+        {
+            LOG(ptr->lib->log, "column " << i << " :" << columns->data[i]);
+        }
+    }
+
+    if (ids)
+    {
+        LOG(ptr->lib->log, "ids passed: " << ids->size);
+        for (size_t i = 0; i < ids->size; ++i)
+        {
+            LOG(ptr->lib->log, "id " << i << " :" << ids->data[i] << " generating.");
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{ids->data[i], ids->data[i] + 100, ids->data[i] + 200, ids->data[i] + 300});
+        }
+    }
+
+    MakeColumnsFromVector(ptr);
+    return static_cast<void *>(&ptr->ctable);
+}
+
+
+void * ClickHouseDictionary_v3_loadAll(void * data_ptr, ClickHouseLibrary::CStrings * settings, ClickHouseLibrary::CStrings * /*columns*/)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+
+    LOG(ptr->lib->log, "loadAll lib call ptr=" << data_ptr << " => " << ptr);
+
+    if (!ptr)
+        return nullptr;
+
+    size_t num_rows = 0, num_cols = 4;
+    std::string test_type;
+    std::vector<std::string> settings_values;
+    if (settings)
+    {
+        LOG(ptr->lib->log, "settings size: " << settings->size);
+
+        for (size_t i = 0; i < settings->size; ++i)
+        {
+            std::string setting_name = settings->data[i];
+            std::string setting_value = settings->data[++i];
+            LOG(ptr->lib->log, "setting " + std::to_string(i) + " name " + setting_name + " value " + setting_value);
+
+            if (setting_name == "num_rows")
+                num_rows = std::atoi(setting_value.data());
+            else if (setting_name == "num_cols")
+                num_cols = std::atoi(setting_value.data());
+            else if (setting_name == "test_type")
+                test_type = setting_value;
+            else
+            {
+                LOG(ptr->lib->log, "Adding setting " + setting_name);
+                settings_values.push_back(setting_value);
+            }
+        }
+    }
+
+    if (test_type == "test_simple")
+    {
+        for (size_t i = 0; i < 10; ++i)
+        {
+            LOG(ptr->lib->log, "id " << i << " :" << " generating.");
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{i, i + 10, i + 20, i + 30});
+        }
+    }
+    else if (test_type == "test_many_rows" && num_rows)
+    {
+        for (size_t i = 0; i < num_rows; ++i)
+        {
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{i, i, i, i});
+        }
+    }
+
+    ptr->num_cols = num_cols;
+    ptr->num_rows = num_rows;
+
+    MakeColumnsFromVector(ptr);
+    return static_cast<void *>(&ptr->ctable);
+}
+
+
+void * ClickHouseDictionary_v3_loadKeys(void * data_ptr, ClickHouseLibrary::CStrings * settings, ClickHouseLibrary::Table * requested_keys)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+    LOG(ptr->lib->log, "loadKeys lib call ptr=" << data_ptr << " => " << ptr);
+    if (settings)
+    {
+        LOG(ptr->lib->log, "settings passed: " << settings->size);
+        for (size_t i = 0; i < settings->size; ++i)
+        {
+            LOG(ptr->lib->log, "setting " << i << " :" << settings->data[i]);
+        }
+    }
+    if (requested_keys)
+    {
+        LOG(ptr->lib->log, "requested_keys columns passed: " << requested_keys->size);
+        for (size_t i = 0; i < requested_keys->size; ++i)
+        {
+            LOG(ptr->lib->log, "requested_keys at column " << i << " passed: " << requested_keys->data[i].size);
+            ptr->dataHolder.emplace_back(std::vector<uint64_t>{i, i + 100, i + 200, i + 300});
+        }
+    }
+
+    MakeColumnsFromVector(ptr);
+    return static_cast<void *>(&ptr->ctable);
+}
+
+void * ClickHouseDictionary_v3_libNew(
+    ClickHouseLibrary::CStrings * /*settings*/, void (*logFunc)(ClickHouseLibrary::LogLevel, ClickHouseLibrary::CString))
+{
+    auto lib_ptr = new LibHolder;
+    lib_ptr->log = logFunc;
+    return lib_ptr;
+}
+
+void ClickHouseDictionary_v3_libDelete(void * lib_ptr)
+{
+    auto ptr = static_cast<LibHolder *>(lib_ptr);
+    delete ptr;
+    return;
+}
+
+void * ClickHouseDictionary_v3_dataNew(void * lib_ptr)
+{
+    auto data_ptr = new DataHolder;
+    data_ptr->lib = static_cast<decltype(data_ptr->lib)>(lib_ptr);
+    return data_ptr;
+}
+
+void ClickHouseDictionary_v3_dataDelete(void * /*lib_ptr*/, void * data_ptr)
+{
+    auto ptr = static_cast<DataHolder *>(data_ptr);
+    delete ptr;
+    return;
+}
+
+}
diff --git a/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml
new file mode 100644
index 00000000000..9be21aea1e3
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<yandex>
+    <dictionary>
+        <name>dict1</name>
+        <source>
+            <library>
+                <path>/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so</path>
+                <settings>
+                    <test_type>test_simple</test_type>
+                    <key>nice key</key>
+                    <value>interesting, nice value</value>
+                    <table>//home/interesting-path/to-/interesting_data</table>
+                    <pass>11</pass>
+                    <user>user-u -user</user>
+                </settings>
+            </library>
+        </source>
+        <layout>
+            <hashed/>
+        </layout>
+        <lifetime>
+            <max>1</max>
+            <min>1</min>
+        </lifetime>
+        <structure>
+            <id>
+                <name>key</name>
+                <type>UInt64</type>
+            </id>
+            <attribute>
+                <name>value1</name>
+                <null_value></null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value2</name>
+                <null_value></null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value3</name>
+                <null_value></null_value>
+                <type>UInt64</type>
+            </attribute>
+        </structure>
+    </dictionary>
+    <dictionary>
+        <name>dict2</name>
+        <source>
+            <library>
+                <path>/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so</path>
+                <settings>
+                    <test_type>test_nulls</test_type>
+                </settings>
+            </library>
+        </source>
+        <layout>
+            <hashed/>
+        </layout>
+        <lifetime>
+            <max>1</max>
+            <min>1</min>
+        </lifetime>
+        <structure>
+            <id>
+                <name>key</name>
+                <type>UInt64</type>
+            </id>
+            <attribute>
+                <name>value1</name>
+                <null_value>12</null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value2</name>
+                <null_value>12</null_value>
+                <type>UInt64</type>
+            </attribute>
+            <attribute>
+                <name>value3</name>
+                <null_value>12</null_value>
+                <type>UInt64</type>
+            </attribute>
+        </structure>
+    </dictionary>
+</yandex>
diff --git a/tests/integration/test_library_bridge/configs/enable_dict.xml b/tests/integration/test_library_bridge/configs/enable_dict.xml
new file mode 100644
index 00000000000..264f1f667b1
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/enable_dict.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<yandex>
+    <dictionaries_config>/etc/clickhouse-server/config.d/dict*.xml</dictionaries_config>
+</yandex>
diff --git a/tests/integration/test_library_bridge/configs/log_conf.xml b/tests/integration/test_library_bridge/configs/log_conf.xml
new file mode 100644
index 00000000000..eed7a435b68
--- /dev/null
+++ b/tests/integration/test_library_bridge/configs/log_conf.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<yandex>
+    <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>
+        <library_bridge_log>/var/log/clickhouse-server/clickhouse-library-bridge.log</library_bridge_log>
+        <library_bridge_errlog>/var/log/clickhouse-server/clickhouse-library-bridge.err.log</library_bridge_errlog>
+        <library_bridge_stdout>/var/log/clickhouse-server/clickhouse-library-bridge.stdout</library_bridge_stdout>
+        <library_bridge_stderr>/var/log/clickhouse-server/clickhouse-library-bridge.stderr</library_bridge_stderr>
+        <library_bridge_level>trace</library_bridge_level>
+    </logger>
+</yandex>
diff --git a/tests/integration/test_library_bridge/test.py b/tests/integration/test_library_bridge/test.py
new file mode 100644
index 00000000000..422a7ee954f
--- /dev/null
+++ b/tests/integration/test_library_bridge/test.py
@@ -0,0 +1,169 @@
+import os
+import os.path as p
+import pytest
+import time
+
+from helpers.cluster import ClickHouseCluster, run_and_check
+
+cluster = ClickHouseCluster(__file__)
+
+instance = cluster.add_instance('instance',
+        main_configs=[
+            'configs/enable_dict.xml',
+            'configs/config.d/config.xml',
+            'configs/dictionaries/dict1.xml',
+            'configs/log_conf.xml'])
+
+@pytest.fixture(scope="module")
+def ch_cluster():
+    try:
+        cluster.start()
+        instance.query('CREATE DATABASE test')
+        container_lib_path = '/etc/clickhouse-server/config.d/dictionarites_lib/dict_lib.cpp'
+
+        instance.copy_file_to_container(os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs/dict_lib.cpp"),
+                                                        "/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.cpp")
+
+        instance.query("SYSTEM RELOAD CONFIG")
+
+        instance.exec_in_container(
+                ['bash', '-c',
+                '/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')
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def setup_teardown():
+    yield  # run test
+
+
+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('''
+        CREATE DICTIONARY lib_dict (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+        PRIMARY KEY key
+        SOURCE(library(
+            PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'
+            SETTINGS (test_type test_simple)))
+        LAYOUT(HASHED())
+        LIFETIME (MIN 0 MAX 10)
+    ''')
+
+    result = instance.query('SELECT * FROM lib_dict ORDER BY key')
+    expected = (
+"0\t10\t20\t30\n" +
+"1\t11\t21\t31\n" +
+"2\t12\t22\t32\n" +
+"3\t13\t23\t33\n" +
+"4\t14\t24\t34\n" +
+"5\t15\t25\t35\n" +
+"6\t16\t26\t36\n" +
+"7\t17\t27\t37\n" +
+"8\t18\t28\t38\n" +
+"9\t19\t29\t39\n"
+)
+    instance.query('SYSTEM RELOAD DICTIONARY dict1')
+    instance.query('DROP DICTIONARY lib_dict')
+    assert(result == expected)
+
+    instance.query("""
+        CREATE TABLE IF NOT EXISTS `dict1_table` (
+             key UInt64, value1 UInt64, value2 UInt64, value3 UInt64
+        ) ENGINE = Dictionary(dict1)
+        """)
+
+    result = instance.query('SELECT * FROM dict1_table ORDER BY key')
+    assert(result == expected)
+
+
+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('''
+        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'))
+        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(0));''')
+    assert(result.strip() == '100')
+    result = instance.query('''select dictGet(lib_dict_c, 'value1', toUInt64(1));''')
+    assert(result.strip() == '101')
+    instance.query('DROP DICTIONARY lib_dict_c')
+
+
+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('''
+        CREATE DICTIONARY lib_dict_ckc (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+        PRIMARY KEY key
+        SOURCE(library(PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'))
+        LAYOUT(COMPLEX_KEY_CACHE( SIZE_IN_CELLS 10000000))
+        LIFETIME(2);
+    ''')
+
+    result = instance.query('''select dictGet(lib_dict_ckc, 'value1', tuple(toUInt64(0)));''')
+    assert(result.strip() == '100')
+    result = instance.query('''select dictGet(lib_dict_ckc, 'value2', tuple(toUInt64(0)));''')
+    assert(result.strip() == '200')
+    instance.query('DROP DICTIONARY lib_dict_ckc')
+
+
+def test_load_all_many_rows(ch_cluster):
+    if instance.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
+    num_rows = [1000, 10000, 100000, 1000000]
+    for num in num_rows:
+        instance.query('''
+            CREATE DICTIONARY lib_dict (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+            PRIMARY KEY key
+            SOURCE(library(
+                PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'
+                SETTINGS (num_rows {} test_type test_many_rows)))
+            LAYOUT(HASHED())
+            LIFETIME (MIN 0 MAX 10)
+        '''.format(num))
+
+        result = instance.query('SELECT * FROM lib_dict ORDER BY key')
+        expected = instance.query('SELECT number, number, number, number FROM numbers({})'.format(num))
+        instance.query('DROP DICTIONARY lib_dict')
+        assert(result == expected)
+
+
+def test_null_values(ch_cluster):
+    if instance.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
+    instance.query('SYSTEM RELOAD DICTIONARY dict2')
+    instance.query("""
+        CREATE TABLE IF NOT EXISTS `dict2_table` (
+             key UInt64, value1 UInt64, value2 UInt64, value3 UInt64
+        ) ENGINE = Dictionary(dict2)
+        """)
+
+    result = instance.query('SELECT * FROM dict2_table ORDER BY key')
+    expected = "0\t12\t12\t12\n"
+    assert(result == expected)
+
+
+if __name__ == '__main__':
+    cluster.start()
+    input("Cluster created, press any key to destroy...")
+    cluster.shutdown()
diff --git a/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml b/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml
new file mode 100644
index 00000000000..b5e6bb80891
--- /dev/null
+++ b/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <profiles>
+        <default>
+            <background_fetches_pool_size>3</background_fetches_pool_size>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_limited_replicated_fetches/test.py b/tests/integration/test_limited_replicated_fetches/test.py
index 9b9b8befd67..7b0c7aed15d 100644
--- a/tests/integration/test_limited_replicated_fetches/test.py
+++ b/tests/integration/test_limited_replicated_fetches/test.py
@@ -6,12 +6,14 @@ from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 import random
 import string
+import os
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', with_zookeeper=True)
-node2 = cluster.add_instance('node2', with_zookeeper=True)
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+node1 = cluster.add_instance('node1', user_configs=['configs/custom_settings.xml'], with_zookeeper=True)
+node2 = cluster.add_instance('node2', user_configs=['configs/custom_settings.xml'], with_zookeeper=True)
 
-DEFAULT_MAX_THREADS_FOR_FETCH = 3
+MAX_THREADS_FOR_FETCH = 3
 
 @pytest.fixture(scope="module")
 def started_cluster():
@@ -64,11 +66,11 @@ def test_limited_fetches(started_cluster):
                 time.sleep(0.1)
 
     for concurrently_fetching_parts in fetches_result:
-        if len(concurrently_fetching_parts) > DEFAULT_MAX_THREADS_FOR_FETCH:
-            assert False, "Found more than {} concurrently fetching parts: {}".format(DEFAULT_MAX_THREADS_FOR_FETCH, ', '.join(concurrently_fetching_parts))
+        if len(concurrently_fetching_parts) > MAX_THREADS_FOR_FETCH:
+            assert False, "Found more than {} concurrently fetching parts: {}".format(MAX_THREADS_FOR_FETCH, ', '.join(concurrently_fetching_parts))
 
     assert max([len(parts) for parts in fetches_result]) == 3, "Strange, but we don't utilize max concurrent threads for fetches"
     assert(max(background_fetches_metric)) == 3, "Just checking metric consistent with table"
 
     node1.query("DROP TABLE IF EXISTS t SYNC")
-    node2.query("DROP TABLE IF EXISTS t SYNC")
\ No newline at end of file
+    node2.query("DROP TABLE IF EXISTS t SYNC")
diff --git a/tests/integration/test_live_view_over_distributed/configs/set_distributed_defaults.xml b/tests/integration/test_live_view_over_distributed/configs/set_distributed_defaults.xml
deleted file mode 100644
index 194eb1ebb87..00000000000
--- a/tests/integration/test_live_view_over_distributed/configs/set_distributed_defaults.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<yandex>
-    <profiles>
-        <default>
-            <connections_with_failover_max_tries>3</connections_with_failover_max_tries>
-            <connect_timeout_with_failover_ms>1000</connect_timeout_with_failover_ms>
-            <min_insert_block_size_rows>1</min_insert_block_size_rows>
-        </default>
-        <delays>
-            <connections_with_failover_max_tries>5</connections_with_failover_max_tries>
-            <connect_timeout_with_failover_ms>3000</connect_timeout_with_failover_ms>
-            <min_insert_block_size_rows>1</min_insert_block_size_rows>
-        </delays>
-    </profiles>
-
-    <users>
-        <default>
-            <password></password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>default</quota>
-        </default>
-        <ready_to_wait>
-            <password></password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>delays</profile>
-            <quota>default</quota>
-        </ready_to_wait>
-    </users>
-
-    <quotas><default></default></quotas>
-</yandex>
diff --git a/tests/integration/test_live_view_over_distributed/test.py b/tests/integration/test_live_view_over_distributed/test.py
deleted file mode 100644
index a21eeb772e5..00000000000
--- a/tests/integration/test_live_view_over_distributed/test.py
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-import sys
-
-import pytest
-from helpers.cluster import ClickHouseCluster
-from helpers.uclient import client, prompt, end_of_block
-
-cluster = ClickHouseCluster(__file__)
-# log = sys.stdout
-log = None
-
-NODES = {'node' + str(i): cluster.add_instance(
-    'node' + str(i),
-    main_configs=['configs/remote_servers.xml'],
-    user_configs=['configs/set_distributed_defaults.xml'],
-) for i in (1, 2)}
-
-CREATE_TABLES_SQL = '''
-DROP TABLE IF EXISTS lv_over_distributed_table;
-DROP TABLE IF EXISTS distributed_table;
-DROP TABLE IF EXISTS base_table;
-
-SET allow_experimental_live_view = 1;
-
-CREATE TABLE
-    base_table(
-        node String,
-        key Int32,
-        value Int32
-    )
-ENGINE = Memory;
-
-CREATE TABLE
-    distributed_table
-AS base_table
-ENGINE = Distributed(test_cluster, default, base_table, rand());
-
-CREATE LIVE VIEW lv_over_distributed_table AS SELECT * FROM distributed_table;
-'''
-
-INSERT_SQL_TEMPLATE = "INSERT INTO base_table VALUES ('{node_id}', {key}, {value})"
-
-
-@pytest.fixture(scope="function")
-def started_cluster():
-    try:
-        cluster.start()
-        for node_index, (node_name, node) in enumerate(NODES.items()):
-            node.query(CREATE_TABLES_SQL)
-            for i in range(0, 2):
-                sql = INSERT_SQL_TEMPLATE.format(node_id=node_name, key=i, value=i + (node_index * 10))
-                node.query(sql)
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-@pytest.mark.parametrize("node", list(NODES.values())[:1])
-@pytest.mark.parametrize("source", ["lv_over_distributed_table"])
-class TestLiveViewOverDistributedSuite:
-    def test_select_with_order_by_node(self, started_cluster, node, source):
-        r = node.query("SELECT * FROM {source} ORDER BY node, key".format(source=source))
-        assert r == """node1\t0\t0
-node1\t1\t1
-node2\t0\t10
-node2\t1\t11
-"""
-
-    def test_select_with_order_by_key(self, started_cluster, node, source):
-        assert node.query("SELECT * FROM {source} ORDER BY key, node".format(source=source)) \
-               == """node1\t0\t0
-node2\t0\t10
-node1\t1\t1
-node2\t1\t11
-"""
-
-    def test_select_with_group_by_node(self, started_cluster, node, source):
-        assert node.query("SELECT node, SUM(value) FROM {source} GROUP BY node ORDER BY node".format(source=source)) \
-               == "node1\t1\nnode2\t21\n"
-
-    def test_select_with_group_by_key(self, started_cluster, node, source):
-        assert node.query("SELECT key, SUM(value) FROM {source} GROUP BY key ORDER BY key".format(source=source)) \
-               == "0\t10\n1\t12\n"
-
-    def test_select_sum(self, started_cluster, node, source):
-        assert node.query("SELECT SUM(value) FROM {source}".format(source=source)) \
-               == "22\n"
-
-    def test_watch_live_view_order_by_node(self, started_cluster, node, source):
-        command = " ".join(node.client.command)
-        args = dict(log=log, command=command)
-
-        with client(name="client1> ", **args) as client1, client(name="client2> ", **args) as client2:
-            client1.expect(prompt)
-            client2.expect(prompt)
-
-            client1.send("SET allow_experimental_live_view = 1")
-            client1.expect(prompt)
-            client2.send("SET allow_experimental_live_view = 1")
-            client2.expect(prompt)
-
-            client1.send("DROP TABLE IF EXISTS lv")
-            client1.expect(prompt)
-            client1.send("CREATE LIVE VIEW lv AS SELECT * FROM distributed_table ORDER BY node, key")
-            client1.expect(prompt)
-
-            client1.send("WATCH lv FORMAT CSV")
-            client1.expect('"node1",0,0,1')
-            client1.expect('"node1",1,1,1')
-            client1.expect('"node2",0,10,1')
-            client1.expect('"node2",1,11,1')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 2, 2)")
-            client2.expect(prompt)
-            client1.expect('"node1",0,0,2')
-            client1.expect('"node1",1,1,2')
-            client1.expect('"node1",2,2,2')
-            client1.expect('"node2",0,10,2')
-            client1.expect('"node2",1,11,2')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 0, 3), ('node3', 3, 3)")
-            client2.expect(prompt)
-            client1.expect('"node1",0,0,3')
-            client1.expect('"node1",0,3,3')
-            client1.expect('"node1",1,1,3')
-            client1.expect('"node1",2,2,3')
-            client1.expect('"node2",0,10,3')
-            client1.expect('"node2",1,11,3')
-            client1.expect('"node3",3,3,3')
-
-    def test_watch_live_view_order_by_key(self, started_cluster, node, source):
-        command = " ".join(node.client.command)
-        args = dict(log=log, command=command)
-
-        with client(name="client1> ", **args) as client1, client(name="client2> ", **args) as client2:
-            client1.expect(prompt)
-            client2.expect(prompt)
-
-            client1.send("SET allow_experimental_live_view = 1")
-            client1.expect(prompt)
-            client2.send("SET allow_experimental_live_view = 1")
-            client2.expect(prompt)
-
-            client1.send("DROP TABLE IF EXISTS lv")
-            client1.expect(prompt)
-            client1.send("CREATE LIVE VIEW lv AS SELECT * FROM distributed_table ORDER BY key, node")
-            client1.expect(prompt)
-
-            client1.send("WATCH lv FORMAT CSV")
-            client1.expect('"node1",0,0,1')
-            client1.expect('"node2",0,10,1')
-            client1.expect('"node1",1,1,1')
-            client1.expect('"node2",1,11,1')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 2, 2)")
-            client2.expect(prompt)
-            client1.expect('"node1",0,0,2')
-            client1.expect('"node2",0,10,2')
-            client1.expect('"node1",1,1,2')
-            client1.expect('"node2",1,11,2')
-            client1.expect('"node1",2,2,2')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 0, 3), ('node3', 3, 3)")
-            client2.expect(prompt)
-            client1.expect('"node1",0,0,3')
-            client1.expect('"node1",0,3,3')
-            client1.expect('"node2",0,10,3')
-            client1.expect('"node1",1,1,3')
-            client1.expect('"node2",1,11,3')
-            client1.expect('"node1",2,2,3')
-            client1.expect('"node3",3,3,3')
-
-    def test_watch_live_view_group_by_node(self, started_cluster, node, source):
-        command = " ".join(node.client.command)
-        args = dict(log=log, command=command)
-
-        with client(name="client1> ", **args) as client1, client(name="client2> ", **args) as client2:
-            client1.expect(prompt)
-            client2.expect(prompt)
-
-            client1.send("SET allow_experimental_live_view = 1")
-            client1.expect(prompt)
-            client2.send("SET allow_experimental_live_view = 1")
-            client2.expect(prompt)
-
-            client1.send("DROP TABLE IF EXISTS lv")
-            client1.expect(prompt)
-            client1.send(
-                "CREATE LIVE VIEW lv AS SELECT node, SUM(value) FROM distributed_table GROUP BY node ORDER BY node")
-            client1.expect(prompt)
-
-            client1.send("WATCH lv FORMAT CSV")
-            client1.expect('"node1",1,1')
-            client1.expect('"node2",21,1')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 2, 2)")
-            client2.expect(prompt)
-            client1.expect('"node1",3,2')
-            client1.expect('"node2",21,2')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 0, 3), ('node3', 3, 3)")
-            client2.expect(prompt)
-            client1.expect('"node1",6,3')
-            client1.expect('"node2",21,3')
-            client1.expect('"node3",3,3')
-
-    def test_watch_live_view_group_by_key(self, started_cluster, node, source):
-        command = " ".join(node.client.command)
-        args = dict(log=log, command=command)
-        sep = ' \xe2\x94\x82'
-        with client(name="client1> ", **args) as client1, client(name="client2> ", **args) as client2:
-            client1.expect(prompt)
-            client2.expect(prompt)
-
-            client1.send("SET allow_experimental_live_view = 1")
-            client1.expect(prompt)
-            client2.send("SET allow_experimental_live_view = 1")
-            client2.expect(prompt)
-
-            client1.send("DROP TABLE IF EXISTS lv")
-            client1.expect(prompt)
-            client1.send(
-                "CREATE LIVE VIEW lv AS SELECT key, SUM(value) FROM distributed_table GROUP BY key ORDER BY key")
-            client1.expect(prompt)
-
-            client1.send("WATCH lv FORMAT CSV")
-            client1.expect('0,10,1')
-            client1.expect('1,12,1')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 2, 2)")
-            client2.expect(prompt)
-            client1.expect('0,10,2')
-            client1.expect('1,12,2')
-            client1.expect('2,2,2')
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 0, 3), ('node1', 3, 3)")
-            client2.expect(prompt)
-            client1.expect('0,13,3')
-            client1.expect('1,12,3')
-            client1.expect('2,2,3')
-            client1.expect('3,3,3')
-
-    def test_watch_live_view_sum(self, started_cluster, node, source):
-        command = " ".join(node.client.command)
-        args = dict(log=log, command=command)
-
-        with client(name="client1> ", **args) as client1, client(name="client2> ", **args) as client2:
-            client1.expect(prompt)
-            client2.expect(prompt)
-
-            client1.send("SET allow_experimental_live_view = 1")
-            client1.expect(prompt)
-            client2.send("SET allow_experimental_live_view = 1")
-            client2.expect(prompt)
-
-            client1.send("DROP TABLE IF EXISTS lv")
-            client1.expect(prompt)
-            client1.send("CREATE LIVE VIEW lv AS SELECT sum(value) FROM distributed_table")
-            client1.expect(prompt)
-
-            client1.send("WATCH lv")
-            client1.expect(r"22.*1" + end_of_block)
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 2, 2)")
-            client2.expect(prompt)
-            client1.expect(r"24.*2" + end_of_block)
-
-            client2.send("INSERT INTO distributed_table VALUES ('node1', 3, 3), ('node1', 4, 4)")
-            client2.expect(prompt)
-            client1.expect(r"31.*3" + end_of_block)
diff --git a/tests/integration/test_log_family_hdfs/__init__.py b/tests/integration/test_log_family_hdfs/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_log_family_hdfs/configs/config.d/log_conf.xml b/tests/integration/test_log_family_hdfs/configs/config.d/log_conf.xml
new file mode 100644
index 00000000000..318a6bca95d
--- /dev/null
+++ b/tests/integration/test_log_family_hdfs/configs/config.d/log_conf.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <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>
+</yandex>
diff --git a/tests/integration/test_log_family_hdfs/configs/storage_conf.xml b/tests/integration/test_log_family_hdfs/configs/storage_conf.xml
new file mode 100644
index 00000000000..15ff3891474
--- /dev/null
+++ b/tests/integration/test_log_family_hdfs/configs/storage_conf.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<yandex>
+    <storage_configuration>
+        <disks>
+            <hdfs>
+                <type>hdfs</type>
+                <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
+            </hdfs>
+        </disks>
+    </storage_configuration>
+</yandex>
diff --git a/tests/integration/test_log_family_hdfs/test.py b/tests/integration/test_log_family_hdfs/test.py
new file mode 100644
index 00000000000..44f6904e8ea
--- /dev/null
+++ b/tests/integration/test_log_family_hdfs/test.py
@@ -0,0 +1,59 @@
+import logging
+import sys
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+from pyhdfs import HdfsClient
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance("node",
+                             main_configs=["configs/storage_conf.xml", "configs/config.d/log_conf.xml"],
+                             with_hdfs=True)
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        fs = HdfsClient(hosts='localhost')
+        fs.mkdirs('/clickhouse')
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def assert_objects_count(cluster, objects_count, path='data/'):
+    fs = HdfsClient(hosts='localhost')
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert objects_count == len(hdfs_objects)
+
+
+@pytest.mark.parametrize(
+    "log_engine,files_overhead,files_overhead_per_insert",
+    [("TinyLog", 1, 1), ("Log", 2, 1), ("StripeLog", 1, 2)])
+def test_log_family_hdfs(cluster, log_engine, files_overhead, files_overhead_per_insert):
+    node = cluster.instances["node"]
+
+    node.query("CREATE TABLE hdfs_test (id UInt64) ENGINE={} SETTINGS disk = 'hdfs'".format(log_engine))
+
+    node.query("INSERT INTO hdfs_test SELECT number FROM numbers(5)")
+    assert node.query("SELECT * FROM hdfs_test") == "0\n1\n2\n3\n4\n"
+    assert_objects_count(cluster, files_overhead_per_insert + files_overhead)
+
+    node.query("INSERT INTO hdfs_test SELECT number + 5 FROM numbers(3)")
+    assert node.query("SELECT * FROM hdfs_test order by id") == "0\n1\n2\n3\n4\n5\n6\n7\n"
+    assert_objects_count(cluster, files_overhead_per_insert * 2 + files_overhead)
+
+    node.query("INSERT INTO hdfs_test SELECT number + 8 FROM numbers(1)")
+    assert node.query("SELECT * FROM hdfs_test order by id") == "0\n1\n2\n3\n4\n5\n6\n7\n8\n"
+    assert_objects_count(cluster, files_overhead_per_insert * 3 + files_overhead)
+
+    node.query("TRUNCATE TABLE hdfs_test")
+    assert_objects_count(cluster, 0)
+
+    node.query("DROP TABLE hdfs_test")
+
diff --git a/tests/integration/test_materialize_mysql_database/configs/users_disable_bytes_settings.xml b/tests/integration/test_materialize_mysql_database/configs/users_disable_bytes_settings.xml
new file mode 100644
index 00000000000..4516cb80c17
--- /dev/null
+++ b/tests/integration/test_materialize_mysql_database/configs/users_disable_bytes_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <allow_experimental_database_materialize_mysql>1</allow_experimental_database_materialize_mysql>
+            <default_database_engine>Atomic</default_database_engine>
+            <external_storage_max_read_rows>1</external_storage_max_read_rows>
+            <external_storage_max_read_bytes>0</external_storage_max_read_bytes>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_materialize_mysql_database/configs/users_disable_rows_settings.xml b/tests/integration/test_materialize_mysql_database/configs/users_disable_rows_settings.xml
new file mode 100644
index 00000000000..dea20eb9e12
--- /dev/null
+++ b/tests/integration/test_materialize_mysql_database/configs/users_disable_rows_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <allow_experimental_database_materialize_mysql>1</allow_experimental_database_materialize_mysql>
+            <default_database_engine>Atomic</default_database_engine>
+            <external_storage_max_read_rows>0</external_storage_max_read_rows>
+            <external_storage_max_read_bytes>1</external_storage_max_read_bytes>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
index 1675b72e0c4..813a654add3 100644
--- a/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialize_mysql_database/materialize_with_ddl.py
@@ -117,6 +117,45 @@ def dml_with_materialize_mysql_database(clickhouse_node, mysql_node, service_nam
     mysql_node.query("DROP DATABASE test_database")
 
 
+def materialize_mysql_database_with_views(clickhouse_node, mysql_node, service_name):
+    mysql_node.query("DROP DATABASE IF EXISTS test_database")
+    clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+    mysql_node.query("CREATE DATABASE test_database DEFAULT CHARACTER SET 'utf8'")
+    # existed before the mapping was created
+
+    mysql_node.query("CREATE TABLE test_database.test_table_1 ("
+                     "`key` INT NOT NULL PRIMARY KEY, "
+                     "unsigned_tiny_int TINYINT UNSIGNED, tiny_int TINYINT, "
+                     "unsigned_small_int SMALLINT UNSIGNED, small_int SMALLINT, "
+                     "unsigned_medium_int MEDIUMINT UNSIGNED, medium_int MEDIUMINT, "
+                     "unsigned_int INT UNSIGNED, _int INT, "
+                     "unsigned_integer INTEGER UNSIGNED, _integer INTEGER, "
+                     "unsigned_bigint BIGINT UNSIGNED, _bigint BIGINT, "
+                     "/* Need ClickHouse support read mysql decimal unsigned_decimal DECIMAL(19, 10) UNSIGNED, _decimal DECIMAL(19, 10), */"
+                     "unsigned_float FLOAT UNSIGNED, _float FLOAT, "
+                     "unsigned_double DOUBLE UNSIGNED, _double DOUBLE, "
+                     "_varchar VARCHAR(10), _char CHAR(10), binary_col BINARY(8), "
+                     "/* Need ClickHouse support Enum('a', 'b', 'v') _enum ENUM('a', 'b', 'c'), */"
+                     "_date Date, _datetime DateTime, _timestamp TIMESTAMP, _bool BOOLEAN) ENGINE = InnoDB;")
+
+    mysql_node.query("CREATE VIEW test_database.test_table_1_view AS SELECT SUM(tiny_int) FROM test_database.test_table_1 GROUP BY _date;")
+
+    # it already has some data
+    mysql_node.query("""
+        INSERT INTO test_database.test_table_1 VALUES(1, 1, -1, 2, -2, 3, -3, 4, -4, 5, -5, 6, -6, 3.2, -3.2, 3.4, -3.4, 'varchar', 'char', 'binary',
+        '2020-01-01', '2020-01-01 00:00:00', '2020-01-01 00:00:00', true);
+        """)
+    clickhouse_node.query(
+        "CREATE DATABASE test_database ENGINE = MaterializeMySQL('{}:3306', 'test_database', 'root', 'clickhouse')".format(
+            service_name))
+
+    assert "test_database" in clickhouse_node.query("SHOW DATABASES")
+    check_query(clickhouse_node, "SHOW TABLES FROM test_database FORMAT TSV", "test_table_1\n")
+
+    clickhouse_node.query("DROP DATABASE test_database")
+    mysql_node.query("DROP DATABASE test_database")
+
+
 def materialize_mysql_database_with_datetime_and_decimal(clickhouse_node, mysql_node, service_name):
     mysql_node.query("DROP DATABASE IF EXISTS test_database")
     clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
@@ -803,3 +842,31 @@ def system_tables_test(clickhouse_node, mysql_node, service_name):
     mysql_node.query("CREATE TABLE system_tables_test.test (id int NOT NULL PRIMARY KEY) ENGINE=InnoDB")
     clickhouse_node.query("CREATE DATABASE system_tables_test ENGINE = MaterializeMySQL('{}:3306', 'system_tables_test', 'root', 'clickhouse')".format(service_name))
     check_query(clickhouse_node, "SELECT partition_key, sorting_key, primary_key FROM system.tables WHERE database = 'system_tables_test' AND name = 'test'", "intDiv(id, 4294967)\tid\tid\n")
+
+def move_to_prewhere_and_column_filtering(clickhouse_node, mysql_node, service_name):
+    clickhouse_node.query("DROP DATABASE IF EXISTS cond_on_key_col")
+    mysql_node.query("DROP DATABASE IF EXISTS cond_on_key_col")
+    mysql_node.query("CREATE DATABASE cond_on_key_col")
+    clickhouse_node.query("CREATE DATABASE cond_on_key_col ENGINE = MaterializeMySQL('{}:3306', 'cond_on_key_col', 'root', 'clickhouse')".format(service_name))
+    mysql_node.query("create table cond_on_key_col.products (id int primary key, product_id int not null, catalog_id int not null, brand_id int not null, name text)")
+    mysql_node.query("insert into cond_on_key_col.products (id, name, catalog_id, brand_id, product_id) values (915, 'ertyui', 5287, 15837, 0), (990, 'wer', 1053, 24390, 1), (781, 'qwerty', 1041, 1176, 2);")
+    check_query(clickhouse_node, "SELECT DISTINCT P.id, P.name, P.catalog_id FROM cond_on_key_col.products P WHERE P.name ILIKE '%e%' and P.catalog_id=5287", '915\tertyui\t5287\n')
+    clickhouse_node.query("DROP DATABASE cond_on_key_col")
+    mysql_node.query("DROP DATABASE cond_on_key_col")
+
+def mysql_settings_test(clickhouse_node, mysql_node, service_name):
+    mysql_node.query("DROP DATABASE IF EXISTS test_database")
+    clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+    mysql_node.query("CREATE DATABASE test_database")
+    mysql_node.query("CREATE TABLE test_database.a (id INT(11) NOT NULL PRIMARY KEY, value VARCHAR(255))")
+    mysql_node.query("INSERT INTO test_database.a VALUES(1, 'foo')")
+    mysql_node.query("INSERT INTO test_database.a VALUES(2, 'bar')")
+
+    clickhouse_node.query("CREATE DATABASE test_database ENGINE = MaterializeMySQL('{}:3306', 'test_database', 'root', 'clickhouse')".format(service_name))
+    check_query(clickhouse_node, "SELECT COUNT() FROM test_database.a FORMAT TSV", "2\n")
+
+    assert clickhouse_node.query("SELECT COUNT(DISTINCT  blockNumber()) FROM test_database.a FORMAT TSV") == "2\n"
+
+    clickhouse_node.query("DROP DATABASE test_database")
+    mysql_node.query("DROP DATABASE test_database")
+
diff --git a/tests/integration/test_materialize_mysql_database/test.py b/tests/integration/test_materialize_mysql_database/test.py
index 730305a6f16..19067db3eca 100644
--- a/tests/integration/test_materialize_mysql_database/test.py
+++ b/tests/integration/test_materialize_mysql_database/test.py
@@ -16,7 +16,8 @@ cluster = ClickHouseCluster(__file__)
 
 node_db_ordinary = cluster.add_instance('node1', user_configs=["configs/users.xml"], with_mysql=False, stay_alive=True)
 node_db_atomic = cluster.add_instance('node2', user_configs=["configs/users_db_atomic.xml"], with_mysql=False, stay_alive=True)
-
+node_disable_bytes_settings = cluster.add_instance('node3', user_configs=["configs/users_disable_bytes_settings.xml"], with_mysql=False, stay_alive=True)
+node_disable_rows_settings = cluster.add_instance('node4', user_configs=["configs/users_disable_rows_settings.xml"], with_mysql=False, stay_alive=True)
 
 @pytest.fixture(scope="module")
 def started_cluster():
@@ -124,7 +125,7 @@ mysql_5_7_docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mys
 mysql_5_7_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 3308, mysql_5_7_docker_compose)
 
 mysql_8_0_docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_8_0_for_materialize_mysql.yml')
-mysql_8_0_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 33308, mysql_8_0_docker_compose)
+mysql_8_0_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 3309, mysql_8_0_docker_compose)
 
 
 @pytest.fixture(scope="module")
@@ -150,13 +151,17 @@ def started_mysql_8_0():
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_dml_with_mysql_5_7(started_cluster, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.dml_with_materialize_mysql_database(clickhouse_node, started_mysql_5_7, "mysql1")
+    materialize_with_ddl.materialize_mysql_database_with_views(clickhouse_node, started_mysql_5_7, "mysql1")
     materialize_with_ddl.materialize_mysql_database_with_datetime_and_decimal(clickhouse_node, started_mysql_5_7, "mysql1")
+    materialize_with_ddl.move_to_prewhere_and_column_filtering(clickhouse_node, started_mysql_5_7, "mysql1")
 
 
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
 def test_materialize_database_dml_with_mysql_8_0(started_cluster, started_mysql_8_0, clickhouse_node):
     materialize_with_ddl.dml_with_materialize_mysql_database(clickhouse_node, started_mysql_8_0, "mysql8_0")
+    materialize_with_ddl.materialize_mysql_database_with_views(clickhouse_node, started_mysql_8_0, "mysql8_0")
     materialize_with_ddl.materialize_mysql_database_with_datetime_and_decimal(clickhouse_node, started_mysql_8_0, "mysql8_0")
+    materialize_with_ddl.move_to_prewhere_and_column_filtering(clickhouse_node, started_mysql_8_0, "mysql8_0")
 
 
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_atomic])
@@ -287,5 +292,12 @@ def test_multi_table_update(started_cluster, started_mysql_8_0, started_mysql_5_
 
 
 @pytest.mark.parametrize(('clickhouse_node'), [node_db_ordinary, node_db_ordinary])
-def test_system_tables_table(started_cluster, started_mysql_8_0, clickhouse_node):
+def test_system_tables_table(started_cluster, started_mysql_8_0, started_mysql_5_7, clickhouse_node):
+    materialize_with_ddl.system_tables_test(clickhouse_node, started_mysql_5_7, "mysql1")
     materialize_with_ddl.system_tables_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
+
+
+@pytest.mark.parametrize(('clickhouse_node'), [node_disable_bytes_settings, node_disable_rows_settings])
+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, "mysql1")
+    materialize_with_ddl.mysql_settings_test(clickhouse_node, started_mysql_8_0, "mysql8_0")
diff --git a/tests/integration/test_merge_tree_hdfs/__init__.py b/tests/integration/test_merge_tree_hdfs/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_merge_tree_hdfs/configs/config.d/log_conf.xml b/tests/integration/test_merge_tree_hdfs/configs/config.d/log_conf.xml
new file mode 100644
index 00000000000..318a6bca95d
--- /dev/null
+++ b/tests/integration/test_merge_tree_hdfs/configs/config.d/log_conf.xml
@@ -0,0 +1,12 @@
+<yandex>
+    <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>
+</yandex>
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
new file mode 100644
index 00000000000..d43e18fa99c
--- /dev/null
+++ b/tests/integration/test_merge_tree_hdfs/configs/config.d/storage_conf.xml
@@ -0,0 +1,30 @@
+<yandex>
+    <storage_configuration>
+        <disks>
+            <hdfs>
+                <type>hdfs</type>
+                <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
+            </hdfs>
+            <hdd>
+                <type>local</type>
+                <path>/</path>
+            </hdd>
+        </disks>
+        <policies>
+            <hdfs>
+                <volumes>
+                    <main>
+                        <disk>hdfs</disk>
+                    </main>
+                    <external>
+                        <disk>hdd</disk>
+                    </external>
+                </volumes>
+            </hdfs>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+    </merge_tree>
+</yandex>
diff --git a/tests/integration/test_merge_tree_hdfs/test.py b/tests/integration/test_merge_tree_hdfs/test.py
new file mode 100644
index 00000000000..2d0d9d9fb1e
--- /dev/null
+++ b/tests/integration/test_merge_tree_hdfs/test.py
@@ -0,0 +1,317 @@
+import logging
+import random
+import string
+import time
+import threading
+import os
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+from pyhdfs import HdfsClient
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+CONFIG_PATH = os.path.join(SCRIPT_DIR, './_instances/node/configs/config.d/storage_conf.xml')
+
+
+def create_table(cluster, table_name, additional_settings=None):
+    node = cluster.instances["node"]
+
+    create_table_statement = """
+        CREATE TABLE {} (
+            dt Date, id Int64, data String,
+            INDEX min_max (id) TYPE minmax GRANULARITY 3
+        ) ENGINE=MergeTree()
+        PARTITION BY dt
+        ORDER BY (dt, id)
+        SETTINGS
+            storage_policy='hdfs',
+            old_parts_lifetime=0,
+            index_granularity=512
+        """.format(table_name)
+
+    if additional_settings:
+        create_table_statement += ","
+        create_table_statement += additional_settings
+
+    node.query(create_table_statement)
+
+
+FILES_OVERHEAD = 1
+FILES_OVERHEAD_PER_COLUMN = 2  # Data and mark files
+FILES_OVERHEAD_PER_PART_WIDE = FILES_OVERHEAD_PER_COLUMN * 3 + 2 + 6 + 1
+FILES_OVERHEAD_PER_PART_COMPACT = 10 + 1
+
+
+def random_string(length):
+    letters = string.ascii_letters
+    return ''.join(random.choice(letters) for i in range(length))
+
+
+def generate_values(date_str, count, sign=1):
+    data = [[date_str, sign * (i + 1), random_string(10)] for i in range(count)]
+    data.sort(key=lambda tup: tup[1])
+    return ",".join(["('{}',{},'{}')".format(x, y, z) for x, y, z in data])
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance("node", main_configs=["configs/config.d/storage_conf.xml",
+                                                   "configs/config.d/log_conf.xml"], with_hdfs=True)
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        fs = HdfsClient(hosts='localhost')
+        fs.mkdirs('/clickhouse')
+
+        logging.info("Created HDFS directory")
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def wait_for_delete_hdfs_objects(cluster, expected, num_tries=30):
+    fs = HdfsClient(hosts='localhost')
+    while num_tries > 0:
+        num_hdfs_objects = len(fs.listdir('/clickhouse'))
+        if num_hdfs_objects == expected:
+            break;
+        num_tries -= 1
+        time.sleep(1)
+    assert(len(fs.listdir('/clickhouse')) == expected)
+
+
+@pytest.fixture(autouse=True)
+def drop_table(cluster):
+    node = cluster.instances["node"]
+
+    fs = HdfsClient(hosts='localhost')
+    hdfs_objects = fs.listdir('/clickhouse')
+    print('Number of hdfs objects to delete:', len(hdfs_objects), sep=' ')
+
+    node.query("DROP TABLE IF EXISTS hdfs_test SYNC")
+
+    try:
+        wait_for_delete_hdfs_objects(cluster, 0)
+    finally:
+        hdfs_objects = fs.listdir('/clickhouse')
+        if len(hdfs_objects) == 0:
+            return
+        print("Manually removing extra objects to prevent tests cascade failing: ", hdfs_objects)
+        for path in hdfs_objects:
+            fs.delete(path)
+
+
+@pytest.mark.parametrize("min_rows_for_wide_part,files_per_part", [(0, FILES_OVERHEAD_PER_PART_WIDE), (8192, FILES_OVERHEAD_PER_PART_COMPACT)])
+def test_simple_insert_select(cluster, min_rows_for_wide_part, files_per_part):
+    create_table(cluster, "hdfs_test", additional_settings="min_rows_for_wide_part={}".format(min_rows_for_wide_part))
+
+    node = cluster.instances["node"]
+
+    values1 = generate_values('2020-01-03', 4096)
+    node.query("INSERT INTO hdfs_test VALUES {}".format(values1))
+    assert node.query("SELECT * FROM hdfs_test order by dt, id FORMAT Values") == values1
+
+    fs = HdfsClient(hosts='localhost')
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    print(hdfs_objects)
+    assert len(hdfs_objects) == FILES_OVERHEAD + files_per_part
+
+    values2 = generate_values('2020-01-04', 4096)
+    node.query("INSERT INTO hdfs_test VALUES {}".format(values2))
+    assert node.query("SELECT * FROM hdfs_test ORDER BY dt, id FORMAT Values") == values1 + "," + values2
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + files_per_part * 2
+
+    assert node.query("SELECT count(*) FROM hdfs_test where id = 1 FORMAT Values") == "(2)"
+
+
+def test_alter_table_columns(cluster):
+    create_table(cluster, "hdfs_test")
+
+    node = cluster.instances["node"]
+    fs = HdfsClient(hosts='localhost')
+
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-03', 4096, -1)))
+
+    node.query("ALTER TABLE hdfs_test ADD COLUMN col1 UInt64 DEFAULT 1")
+    # To ensure parts have merged
+    node.query("OPTIMIZE TABLE hdfs_test")
+
+    assert node.query("SELECT sum(col1) FROM hdfs_test FORMAT Values") == "(8192)"
+    assert node.query("SELECT sum(col1) FROM hdfs_test WHERE id > 0 FORMAT Values") == "(4096)"
+    wait_for_delete_hdfs_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN)
+
+    node.query("ALTER TABLE hdfs_test MODIFY COLUMN col1 String", settings={"mutations_sync": 2})
+
+    assert node.query("SELECT distinct(col1) FROM hdfs_test FORMAT Values") == "('1')"
+    # and file with mutation
+    wait_for_delete_hdfs_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN + 1)
+
+    node.query("ALTER TABLE hdfs_test DROP COLUMN col1", settings={"mutations_sync": 2})
+
+    # and 2 files with mutations
+    wait_for_delete_hdfs_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + 2)
+
+
+def test_attach_detach_partition(cluster):
+    create_table(cluster, "hdfs_test")
+
+    node = cluster.instances["node"]
+    fs = HdfsClient(hosts='localhost')
+
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-04', 4096)))
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+    node.query("ALTER TABLE hdfs_test DETACH PARTITION '2020-01-03'")
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(4096)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+    node.query("ALTER TABLE hdfs_test ATTACH PARTITION '2020-01-03'")
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+    node.query("ALTER TABLE hdfs_test DROP PARTITION '2020-01-03'")
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(4096)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE
+
+    node.query("ALTER TABLE hdfs_test DETACH PARTITION '2020-01-04'")
+    node.query("ALTER TABLE hdfs_test DROP DETACHED PARTITION '2020-01-04'", settings={"allow_drop_detached": 1})
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(0)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD
+
+
+def test_move_partition_to_another_disk(cluster):
+    create_table(cluster, "hdfs_test")
+
+    node = cluster.instances["node"]
+    fs = HdfsClient(hosts='localhost')
+
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-04', 4096)))
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+    node.query("ALTER TABLE hdfs_test MOVE PARTITION '2020-01-04' TO DISK 'hdd'")
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE
+
+    node.query("ALTER TABLE hdfs_test MOVE PARTITION '2020-01-04' TO DISK 'hdfs'")
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+
+def test_table_manipulations(cluster):
+    create_table(cluster, "hdfs_test")
+
+    node = cluster.instances["node"]
+    fs = HdfsClient(hosts='localhost')
+
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-04', 4096)))
+
+    node.query("RENAME TABLE hdfs_test TO hdfs_renamed")
+    assert node.query("SELECT count(*) FROM hdfs_renamed FORMAT Values") == "(8192)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+    node.query("RENAME TABLE hdfs_renamed TO hdfs_test")
+    assert node.query("CHECK TABLE hdfs_test FORMAT Values") == "(1)"
+
+    node.query("DETACH TABLE hdfs_test")
+    node.query("ATTACH TABLE hdfs_test")
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
+
+    node.query("TRUNCATE TABLE hdfs_test")
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(0)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD
+
+
+def test_move_replace_partition_to_another_table(cluster):
+    create_table(cluster, "hdfs_test")
+
+    node = cluster.instances["node"]
+    fs = HdfsClient(hosts='localhost')
+
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-04', 4096)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-05', 4096, -1)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-06', 4096, -1)))
+    assert node.query("SELECT sum(id) FROM hdfs_test FORMAT Values") == "(0)"
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(16384)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 4
+
+    create_table(cluster, "hdfs_clone")
+
+    node.query("ALTER TABLE hdfs_test MOVE PARTITION '2020-01-03' TO TABLE hdfs_clone")
+    node.query("ALTER TABLE hdfs_test MOVE PARTITION '2020-01-05' TO TABLE hdfs_clone")
+    assert node.query("SELECT sum(id) FROM hdfs_test FORMAT Values") == "(0)"
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(8192)"
+    assert node.query("SELECT sum(id) FROM hdfs_clone FORMAT Values") == "(0)"
+    assert node.query("SELECT count(*) FROM hdfs_clone FORMAT Values") == "(8192)"
+
+    # Number of objects in HDFS should be unchanged.
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4
+
+    # Add new partitions to source table, but with different values and replace them from copied table.
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-03', 4096, -1)))
+    node.query("INSERT INTO hdfs_test VALUES {}".format(generate_values('2020-01-05', 4096)))
+    assert node.query("SELECT sum(id) FROM hdfs_test FORMAT Values") == "(0)"
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(16384)"
+
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 6
+
+    node.query("ALTER TABLE hdfs_test REPLACE PARTITION '2020-01-03' FROM hdfs_clone")
+    node.query("ALTER TABLE hdfs_test REPLACE PARTITION '2020-01-05' FROM hdfs_clone")
+    assert node.query("SELECT sum(id) FROM hdfs_test FORMAT Values") == "(0)"
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(16384)"
+    assert node.query("SELECT sum(id) FROM hdfs_clone FORMAT Values") == "(0)"
+    assert node.query("SELECT count(*) FROM hdfs_clone FORMAT Values") == "(8192)"
+
+    # Wait for outdated partitions deletion.
+    print(1)
+    wait_for_delete_hdfs_objects(cluster, FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4)
+
+    node.query("DROP TABLE hdfs_clone NO DELAY")
+    assert node.query("SELECT sum(id) FROM hdfs_test FORMAT Values") == "(0)"
+    assert node.query("SELECT count(*) FROM hdfs_test FORMAT Values") == "(16384)"
+
+    # Data should remain in hdfs
+    hdfs_objects = fs.listdir('/clickhouse')
+    assert len(hdfs_objects) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 4
+
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 343f248c5fb..2d9778af32a 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
@@ -6,6 +6,7 @@
                 <endpoint>http://minio1:9001/root/data/</endpoint>
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>minio123</secret_access_key>
+                <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
             </s3>
             <hdd>
                 <type>local</type>
diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/users.xml b/tests/integration/test_merge_tree_s3/configs/config.d/users.xml
deleted file mode 100644
index 797113053f4..00000000000
--- a/tests/integration/test_merge_tree_s3/configs/config.d/users.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<yandex>
-    <profiles>
-        <default/>
-    </profiles>
-</yandex>
diff --git a/tests/integration/test_merge_tree_s3/test.py b/tests/integration/test_merge_tree_s3/test.py
index 3ab8d5d006b..c0c05355def 100644
--- a/tests/integration/test_merge_tree_s3/test.py
+++ b/tests/integration/test_merge_tree_s3/test.py
@@ -2,6 +2,8 @@ import logging
 import random
 import string
 import time
+import threading
+import os
 
 import pytest
 from helpers.cluster import ClickHouseCluster
@@ -10,13 +12,47 @@ logging.getLogger().setLevel(logging.INFO)
 logging.getLogger().addHandler(logging.StreamHandler())
 
 
+# By default the exceptions that was throwed in threads will be ignored
+# (they will not mark the test as failed, only printed to stderr).
+#
+# Wrap thrading.Thread and re-throw exception on join()
+class SafeThread(threading.Thread):
+    def __init__(self, target):
+        super().__init__()
+        self.target = target
+        self.exception = None
+    def run(self):
+        try:
+            self.target()
+        except Exception as e: # pylint: disable=broad-except
+            self.exception = e
+    def join(self, timeout=None):
+        super().join(timeout)
+        if self.exception:
+            raise self.exception
+
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+CONFIG_PATH = os.path.join(SCRIPT_DIR, './_instances/node/configs/config.d/storage_conf.xml')
+
+
+def replace_config(old, new):
+    config = open(CONFIG_PATH, 'r')
+    config_lines = config.readlines()
+    config.close()
+    config_lines = [line.replace(old, new) for line in config_lines]
+    config = open(CONFIG_PATH, 'w')
+    config.writelines(config_lines)
+    config.close()
+
+
 @pytest.fixture(scope="module")
 def cluster():
     try:
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance("node", main_configs=["configs/config.d/storage_conf.xml",
                                                    "configs/config.d/bg_processing_pool_conf.xml",
-                                                   "configs/config.d/log_conf.xml"], user_configs=[], with_minio=True)
+                                                   "configs/config.d/log_conf.xml"], with_minio=True)
         logging.info("Starting cluster...")
         cluster.start()
         logging.info("Cluster started")
@@ -68,6 +104,16 @@ def create_table(cluster, table_name, additional_settings=None):
     node.query(create_table_statement)
 
 
+def wait_for_delete_s3_objects(cluster, expected, timeout=30):
+    minio = cluster.minio_client
+    while timeout > 0:
+        if len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == expected:
+            return
+        timeout -= 1
+        time.sleep(1)
+    assert(len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == expected)
+
+
 @pytest.fixture(autouse=True)
 def drop_table(cluster):
     yield
@@ -75,8 +121,9 @@ def drop_table(cluster):
     minio = cluster.minio_client
 
     node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
+
     try:
-        assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == 0
+        wait_for_delete_s3_objects(cluster, 0)
     finally:
         # Remove extra objects to prevent tests cascade failing
         for obj in list(minio.list_objects(cluster.minio_bucket, 'data/')):
@@ -151,7 +198,7 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical):
 
     assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
     assert node.query("SELECT count(distinct(id)) FROM s3_test FORMAT Values") == "(8192)"
-    assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD)
 
 
 def test_alter_table_columns(cluster):
@@ -167,32 +214,20 @@ def test_alter_table_columns(cluster):
     # To ensure parts have merged
     node.query("OPTIMIZE TABLE s3_test")
 
-    # Wait for merges, mutations and old parts deletion
-    time.sleep(3)
-
     assert node.query("SELECT sum(col1) FROM s3_test FORMAT Values") == "(8192)"
     assert node.query("SELECT sum(col1) FROM s3_test WHERE id > 0 FORMAT Values") == "(4096)"
-    assert len(list(minio.list_objects(cluster.minio_bucket,
-                                       'data/'))) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN)
 
     node.query("ALTER TABLE s3_test MODIFY COLUMN col1 String", settings={"mutations_sync": 2})
 
-    # Wait for old parts deletion
-    time.sleep(3)
-
     assert node.query("SELECT distinct(col1) FROM s3_test FORMAT Values") == "('1')"
     # and file with mutation
-    assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == (
-            FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN + 1)
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD_PER_COLUMN + 1)
 
     node.query("ALTER TABLE s3_test DROP COLUMN col1", settings={"mutations_sync": 2})
 
-    # Wait for old parts deletion
-    time.sleep(3)
-
     # and 2 files with mutations
-    assert len(
-        list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + 2
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + 2)
 
 
 def test_attach_detach_partition(cluster):
@@ -320,9 +355,7 @@ def test_move_replace_partition_to_another_table(cluster):
     assert node.query("SELECT count(*) FROM s3_clone FORMAT Values") == "(8192)"
 
     # Wait for outdated partitions deletion.
-    time.sleep(3)
-    assert len(list(
-        minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD * 2 + FILES_OVERHEAD_PER_PART_WIDE * 4)
 
     node.query("DROP TABLE s3_clone NO DELAY")
     assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
@@ -338,7 +371,8 @@ def test_move_replace_partition_to_another_table(cluster):
 
     node.query("DROP TABLE s3_test NO DELAY")
     # Backup data should remain in S3.
-    assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD_PER_PART_WIDE * 4
+
+    wait_for_delete_s3_objects(cluster, FILES_OVERHEAD_PER_PART_WIDE * 4)
 
     for obj in list(minio.list_objects(cluster.minio_bucket, 'data/')):
         minio.remove_object(cluster.minio_bucket, obj.object_name)
@@ -367,3 +401,63 @@ def test_freeze_unfreeze(cluster):
     # Data should be removed from S3.
     assert len(
         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"]
+
+    def get_s3_requests():
+        node.query("SYSTEM FLUSH LOGS")
+        return int(node.query("SELECT value FROM system.events WHERE event='S3WriteRequestsCount'"))
+
+    s3_requests_before = get_s3_requests()
+    node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    s3_requests_to_write_partition = get_s3_requests() - s3_requests_before
+
+    # Force multi-part upload mode.
+    replace_config("<s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>",
+                   "<s3_max_single_part_upload_size>0</s3_max_single_part_upload_size>")
+
+    node.query("SYSTEM RELOAD CONFIG")
+
+    s3_requests_before = get_s3_requests()
+    node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-04', 4096, -1)))
+
+    # There should be 3 times more S3 requests because multi-part upload mode uses 3 requests to upload object.
+    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"]
+
+    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)))
+
+    def read():
+        for ii in range(0, 20):
+            logging.info("Executing %d query", ii)
+            assert node.query("SELECT sum(id) FROM s3_test FORMAT Values") == "(0)"
+            logging.info("Query %d executed", ii)
+            time.sleep(0.2)
+
+    def restart_disk():
+        for iii in range(0, 5):
+            logging.info("Restarting disk, attempt %d", iii)
+            node.query("SYSTEM RESTART DISK s3")
+            logging.info("Disk restarted, attempt %d", iii)
+            time.sleep(0.5)
+
+    threads = []
+    for i in range(0, 4):
+        threads.append(SafeThread(target=read))
+
+    threads.append(SafeThread(target=restart_disk))
+
+    for thread in threads:
+        thread.start()
+
+    for thread in threads:
+        thread.join()
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 e7614dd9536..1754b1f175c 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
@@ -34,7 +34,8 @@ def server(_bucket, _path):
             cache['request_number'] = request_number
         else:
             response.status = 500
-            return 'Expected Error'
+            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>'
 
     response.set_header("Location", "http://minio1:9001/" + _bucket + '/' + _path)
     response.status = 307
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
new file mode 100644
index 00000000000..4808ae4bc4a
--- /dev/null
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<yandex>
+    <remote_servers>
+        <node>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </node>
+        <node_another_bucket>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node_another_bucket</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </node_another_bucket>
+    </remote_servers>
+</yandex>
diff --git a/tests/integration/test_merge_tree_s3_restore/test.py b/tests/integration/test_merge_tree_s3_restore/test.py
index c0ebce68480..1ad49eec7d2 100644
--- a/tests/integration/test_merge_tree_s3_restore/test.py
+++ b/tests/integration/test_merge_tree_s3_restore/test.py
@@ -7,20 +7,21 @@ import time
 import pytest
 from helpers.cluster import ClickHouseCluster
 
+
 logging.getLogger().setLevel(logging.INFO)
 logging.getLogger().addHandler(logging.StreamHandler())
 
-
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CONFIG_PATH = os.path.join(SCRIPT_DIR, './_instances/node_not_restorable/configs/config.d/storage_conf_not_restorable.xml')
+NOT_RESTORABLE_CONFIG_PATH = os.path.join(SCRIPT_DIR, './_instances/node_not_restorable/configs/config.d/storage_conf_not_restorable.xml')
+COMMON_CONFIGS = ["configs/config.d/bg_processing_pool_conf.xml", "configs/config.d/log_conf.xml", "configs/config.d/clusters.xml"]
 
 
 def replace_config(old, new):
-    config = open(CONFIG_PATH, 'r')
+    config = open(NOT_RESTORABLE_CONFIG_PATH, 'r')
     config_lines = config.readlines()
     config.close()
     config_lines = [line.replace(old, new) for line in config_lines]
-    config = open(CONFIG_PATH, 'w')
+    config = open(NOT_RESTORABLE_CONFIG_PATH, 'w')
     config.writelines(config_lines)
     config.close()
 
@@ -29,22 +30,22 @@ def replace_config(old, new):
 def cluster():
     try:
         cluster = ClickHouseCluster(__file__)
-        cluster.add_instance("node", main_configs=[
-            "configs/config.d/storage_conf.xml",
-            "configs/config.d/bg_processing_pool_conf.xml",
-            "configs/config.d/log_conf.xml"], user_configs=[], with_minio=True, stay_alive=True)
-        cluster.add_instance("node_another_bucket", main_configs=[
-            "configs/config.d/storage_conf_another_bucket.xml",
-            "configs/config.d/bg_processing_pool_conf.xml",
-            "configs/config.d/log_conf.xml"], user_configs=[], stay_alive=True)
-        cluster.add_instance("node_another_bucket_path", main_configs=[
-            "configs/config.d/storage_conf_another_bucket_path.xml",
-            "configs/config.d/bg_processing_pool_conf.xml",
-            "configs/config.d/log_conf.xml"], user_configs=[], stay_alive=True)
-        cluster.add_instance("node_not_restorable", main_configs=[
-            "configs/config.d/storage_conf_not_restorable.xml",
-            "configs/config.d/bg_processing_pool_conf.xml",
-            "configs/config.d/log_conf.xml"], user_configs=[], stay_alive=True)
+
+        cluster.add_instance("node",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf.xml"],
+                             macros={"cluster": "node", "replica": "0"},
+                             with_minio=True, with_zookeeper=True, stay_alive=True)
+        cluster.add_instance("node_another_bucket",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf_another_bucket.xml"],
+                             macros={"cluster": "node_another_bucket", "replica": "0"},
+                             with_zookeeper=True, stay_alive=True)
+        cluster.add_instance("node_another_bucket_path",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf_another_bucket_path.xml"],
+                             stay_alive=True)
+        cluster.add_instance("node_not_restorable",
+                             main_configs=COMMON_CONFIGS + ["configs/config.d/storage_conf_not_restorable.xml"],
+                             stay_alive=True)
+
         logging.info("Starting cluster...")
         cluster.start()
         logging.info("Cluster started")
@@ -65,28 +66,27 @@ def generate_values(date_str, count, sign=1):
     return ",".join(["('{}',{},'{}',{})".format(x, y, z, 0) for x, y, z in data])
 
 
-def create_table(node, table_name, additional_settings=None):
+def create_table(node, table_name, attach=False, replicated=False):
     node.query("CREATE DATABASE IF NOT EXISTS s3 ENGINE = Ordinary")
 
     create_table_statement = """
-        CREATE TABLE s3.{} (
+        {create} TABLE s3.{table_name} {on_cluster} (
             dt Date,
             id Int64,
             data String,
             counter Int64,
             INDEX min_max (id) TYPE minmax GRANULARITY 3
-        ) ENGINE=MergeTree()
+        ) ENGINE={engine}
         PARTITION BY dt
         ORDER BY (dt, id)
         SETTINGS
             storage_policy='s3',
             old_parts_lifetime=600,
             index_granularity=512
-        """.format(table_name)
-
-    if additional_settings:
-        create_table_statement += ","
-        create_table_statement += additional_settings
+        """.format(create="ATTACH" if attach else "CREATE",
+                   table_name=table_name,
+                   on_cluster="ON CLUSTER '{}'".format(node.name) if replicated else "",
+                   engine="ReplicatedMergeTree('/clickhouse/tables/{cluster}/test', '{replica}')" if replicated else "MergeTree()")
 
     node.query(create_table_statement)
 
@@ -107,17 +107,24 @@ def drop_shadow_information(node):
     node.exec_in_container(['bash', '-c', 'rm -rf /var/lib/clickhouse/shadow/*'], user='root')
 
 
-def create_restore_file(node, revision=0, bucket=None, path=None):
-    add_restore_option = 'echo -en "{}\n" >> /var/lib/clickhouse/disks/s3/restore'
-    node.exec_in_container(['bash', '-c', add_restore_option.format(revision)], user='root')
+def create_restore_file(node, revision=None, bucket=None, path=None, detached=None):
+    node.exec_in_container(['bash', '-c', 'mkdir -p /var/lib/clickhouse/disks/s3/'], user='root')
+    node.exec_in_container(['bash', '-c', 'touch /var/lib/clickhouse/disks/s3/restore'], user='root')
+
+    add_restore_option = 'echo -en "{}={}\n" >> /var/lib/clickhouse/disks/s3/restore'
+    if revision:
+        node.exec_in_container(['bash', '-c', add_restore_option.format('revision', revision)], user='root')
     if bucket:
-        node.exec_in_container(['bash', '-c', add_restore_option.format(bucket)], user='root')
+        node.exec_in_container(['bash', '-c', add_restore_option.format('source_bucket', bucket)], user='root')
     if path:
-        node.exec_in_container(['bash', '-c', add_restore_option.format(path)], user='root')
+        node.exec_in_container(['bash', '-c', add_restore_option.format('source_path', path)], user='root')
+    if detached:
+        node.exec_in_container(['bash', '-c', add_restore_option.format('detached', 'true')], user='root')
 
 
 def get_revision_counter(node, backup_number):
-    return int(node.exec_in_container(['bash', '-c', 'cat /var/lib/clickhouse/disks/s3/shadow/{}/revision.txt'.format(backup_number)], user='root'))
+    return int(node.exec_in_container(
+        ['bash', '-c', 'cat /var/lib/clickhouse/disks/s3/shadow/{}/revision.txt'.format(backup_number)], user='root'))
 
 
 @pytest.fixture(autouse=True)
@@ -128,7 +135,8 @@ def drop_table(cluster):
 
     for node_name in node_names:
         node = cluster.instances[node_name]
-        node.query("DROP TABLE IF EXISTS s3.test NO DELAY")
+        node.query("DROP TABLE IF EXISTS s3.test SYNC")
+        node.query("DROP DATABASE IF EXISTS s3 SYNC")
 
         drop_s3_metadata(node)
         drop_shadow_information(node)
@@ -138,32 +146,24 @@ def drop_table(cluster):
         purge_s3(cluster, bucket)
 
 
-def test_full_restore(cluster):
+@pytest.mark.parametrize(
+   "replicated", [False, True]
+)
+def test_full_restore(cluster, replicated):
     node = cluster.instances["node"]
 
-    create_table(node, "test")
+    create_table(node, "test", attach=False, replicated=replicated)
 
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-03', 4096)))
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-04', 4096, -1)))
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096)))
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096, -1)))
 
-    # To ensure parts have merged
-    node.query("OPTIMIZE TABLE s3.test")
-
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
-    assert node.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
-
-    node.stop_clickhouse()
+    node.query("DETACH TABLE s3.test")
     drop_s3_metadata(node)
-    node.start_clickhouse()
-
-    # All data is removed.
-    assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(0)
-
-    node.stop_clickhouse()
     create_restore_file(node)
-    node.start_clickhouse(10)
+    node.query("SYSTEM RESTART DISK s3")
+    node.query("ATTACH TABLE s3.test")
 
     assert node.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -187,22 +187,18 @@ def test_restore_another_bucket_path(cluster):
 
     node_another_bucket = cluster.instances["node_another_bucket"]
 
-    create_table(node_another_bucket, "test")
-
-    node_another_bucket.stop_clickhouse()
     create_restore_file(node_another_bucket, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    create_table(node_another_bucket, "test", attach=True)
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
 
     node_another_bucket_path = cluster.instances["node_another_bucket_path"]
 
-    create_table(node_another_bucket_path, "test")
-
-    node_another_bucket_path.stop_clickhouse()
     create_restore_file(node_another_bucket_path, bucket="root2", path="data")
-    node_another_bucket_path.start_clickhouse(10)
+    node_another_bucket_path.query("SYSTEM RESTART DISK s3")
+    create_table(node_another_bucket_path, "test", attach=True)
 
     assert node_another_bucket_path.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket_path.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -237,36 +233,30 @@ def test_restore_different_revisions(cluster):
 
     node_another_bucket = cluster.instances["node_another_bucket"]
 
-    create_table(node_another_bucket, "test")
-
     # Restore to revision 1 (2 parts).
-    node_another_bucket.stop_clickhouse()
-    drop_s3_metadata(node_another_bucket)
-    purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision1, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    create_table(node_another_bucket, "test", attach=True)
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 2)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
     assert node_another_bucket.query("SELECT count(*) from system.parts where table = 'test'") == '2\n'
 
     # Restore to revision 2 (4 parts).
-    node_another_bucket.stop_clickhouse()
-    drop_s3_metadata(node_another_bucket)
-    purge_s3(cluster, cluster.minio_bucket_2)
+    node_another_bucket.query("DETACH TABLE s3.test")
     create_restore_file(node_another_bucket, revision=revision2, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    node_another_bucket.query("ATTACH TABLE s3.test")
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
     assert node_another_bucket.query("SELECT count(*) from system.parts where table = 'test'") == '4\n'
 
     # Restore to revision 3 (4 parts + 1 merged).
-    node_another_bucket.stop_clickhouse()
-    drop_s3_metadata(node_another_bucket)
-    purge_s3(cluster, cluster.minio_bucket_2)
+    node_another_bucket.query("DETACH TABLE s3.test")
     create_restore_file(node_another_bucket, revision=revision3, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    node_another_bucket.query("ATTACH TABLE s3.test")
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -291,25 +281,20 @@ def test_restore_mutations(cluster):
 
     node_another_bucket = cluster.instances["node_another_bucket"]
 
-    create_table(node_another_bucket, "test")
-
     # Restore to revision before mutation.
-    node_another_bucket.stop_clickhouse()
-    drop_s3_metadata(node_another_bucket)
-    purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision_before_mutation, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    create_table(node_another_bucket, "test", attach=True)
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 2)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
     assert node_another_bucket.query("SELECT sum(counter) FROM s3.test FORMAT Values") == "({})".format(0)
 
     # Restore to revision after mutation.
-    node_another_bucket.stop_clickhouse()
-    drop_s3_metadata(node_another_bucket)
-    purge_s3(cluster, cluster.minio_bucket_2)
+    node_another_bucket.query("DETACH TABLE s3.test")
     create_restore_file(node_another_bucket, revision=revision_after_mutation, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    node_another_bucket.query("ATTACH TABLE s3.test")
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 2)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
@@ -318,12 +303,11 @@ def test_restore_mutations(cluster):
 
     # Restore to revision in the middle of mutation.
     # Unfinished mutation should be completed after table startup.
-    node_another_bucket.stop_clickhouse()
-    drop_s3_metadata(node_another_bucket)
-    purge_s3(cluster, cluster.minio_bucket_2)
+    node_another_bucket.query("DETACH TABLE s3.test")
     revision = (revision_before_mutation + revision_after_mutation) // 2
     create_restore_file(node_another_bucket, revision=revision, bucket="root")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    node_another_bucket.query("ATTACH TABLE s3.test")
 
     # Wait for unfinished mutation completion.
     time.sleep(3)
@@ -345,7 +329,6 @@ def test_migrate_to_restorable_schema(cluster):
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096, -1)))
 
     replace_config("<send_metadata>false</send_metadata>", "<send_metadata>true</send_metadata>")
-
     node.restart_clickhouse()
 
     node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-06', 4096)))
@@ -358,14 +341,58 @@ def test_migrate_to_restorable_schema(cluster):
 
     node_another_bucket = cluster.instances["node_another_bucket"]
 
-    create_table(node_another_bucket, "test")
-
     # Restore to revision before mutation.
-    node_another_bucket.stop_clickhouse()
-    drop_s3_metadata(node_another_bucket)
-    purge_s3(cluster, cluster.minio_bucket_2)
     create_restore_file(node_another_bucket, revision=revision, bucket="root", path="another_data")
-    node_another_bucket.start_clickhouse(10)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    create_table(node_another_bucket, "test", attach=True)
 
     assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 6)
     assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
+
+
+@pytest.mark.parametrize(
+    "replicated", [False, True]
+)
+def test_restore_to_detached(cluster, replicated):
+    node = cluster.instances["node"]
+
+    create_table(node, "test", attach=False, replicated=replicated)
+
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-03', 4096)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-04', 4096, -1)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-05', 4096)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-06', 4096, -1)))
+    node.query("INSERT INTO s3.test VALUES {}".format(generate_values('2020-01-07', 4096, 0)))
+
+    # Add some mutation.
+    node.query("ALTER TABLE s3.test UPDATE counter = 1 WHERE 1", settings={"mutations_sync": 2})
+
+    # Detach some partition.
+    node.query("ALTER TABLE s3.test DETACH PARTITION '2020-01-07'")
+
+    node.query("ALTER TABLE s3.test FREEZE")
+    revision = get_revision_counter(node, 1)
+
+    node_another_bucket = cluster.instances["node_another_bucket"]
+
+    create_restore_file(node_another_bucket, revision=revision, bucket="root", path="data", detached=True)
+    node_another_bucket.query("SYSTEM RESTART DISK s3")
+    create_table(node_another_bucket, "test", replicated=replicated)
+
+    assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(0)
+
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-03'")
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-04'")
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-05'")
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-06'")
+
+    assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
+    assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
+    assert node_another_bucket.query("SELECT sum(counter) FROM s3.test FORMAT Values") == "({})".format(4096 * 4)
+
+    # Attach partition that was already detached before backup-restore.
+    node_another_bucket.query("ALTER TABLE s3.test ATTACH PARTITION '2020-01-07'")
+
+    assert node_another_bucket.query("SELECT count(*) FROM s3.test FORMAT Values") == "({})".format(4096 * 5)
+    assert node_another_bucket.query("SELECT sum(id) FROM s3.test FORMAT Values") == "({})".format(0)
+    assert node_another_bucket.query("SELECT sum(counter) FROM s3.test FORMAT Values") == "({})".format(4096 * 5)
diff --git a/tests/integration/test_multiple_disks/test.py b/tests/integration/test_multiple_disks/test.py
index 24ee6c0493b..c01289c8114 100644
--- a/tests/integration/test_multiple_disks/test.py
+++ b/tests/integration/test_multiple_disks/test.py
@@ -335,9 +335,9 @@ def get_random_string(length):
 
 
 def get_used_disks_for_table(node, table_name):
-    return node.query(
+    return tuple(node.query(
         "select disk_name from system.parts where table == '{}' and active=1 order by modification_time".format(
-            table_name)).strip().split('\n')
+            table_name)).strip().split('\n'))
 
 
 def get_used_parts_for_table(node, table_name):
@@ -450,7 +450,7 @@ def test_jbod_overflow(start_cluster, name, engine):
             node1.query("INSERT INTO {} VALUES {}".format(name, ','.join(["('" + x + "')" for x in data])))
 
         used_disks = get_used_disks_for_table(node1, name)
-        assert all(disk == 'jbod1' for disk in used_disks)
+        assert used_disks == tuple('jbod1' for _ in used_disks)
 
         # should go to the external disk (jbod is overflown)
         data = []  # 10MB in total
@@ -469,11 +469,11 @@ def test_jbod_overflow(start_cluster, name, engine):
         node1.query("OPTIMIZE TABLE {} FINAL".format(name))
         time.sleep(2)
 
-        disks_for_merges = node1.query(
+        disks_for_merges = tuple(node1.query(
             "SELECT disk_name FROM system.parts WHERE table == '{}' AND level >= 1 and active = 1 ORDER BY modification_time".format(
-                name)).strip().split('\n')
+                name)).strip().split('\n'))
 
-        assert all(disk == 'external' for disk in disks_for_merges)
+        assert disks_for_merges == tuple('external' for _ in disks_for_merges)
 
     finally:
         node1.query(f"DROP TABLE IF EXISTS {name} SYNC")
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 7f7d59674bc..43daeebeaf5 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -149,8 +149,8 @@ def test_mysql_client_exception(mysql_client, server_address):
         -e "CREATE TABLE default.t1_remote_mysql AS mysql('127.0.0.1:10086','default','t1_local','default','');"
     '''.format(host=server_address, port=server_port), demux=True)
 
-    assert stderr[0:266].decode() == "mysql: [Warning] Using a password on the command line interface can be insecure.\n" \
-                            "ERROR 1000 (00000) at line 1: Poco::Exception. Code: 1000, e.code() = 2002, e.displayText() = mysqlxx::ConnectionFailed: Can't connect to MySQL server on '127.0.0.1' (115) ((nullptr):0)"
+    assert stderr[0:258].decode() == "mysql: [Warning] Using a password on the command line interface can be insecure.\n" \
+            "ERROR 1000 (00000) at line 1: Poco::Exception. Code: 1000, e.code() = 0, e.displayText() = Exception: Connections to all replicas failed: default@127.0.0.1:10086 as user default"
 
 
 def test_mysql_affected_rows(mysql_client, server_address):
diff --git a/tests/integration/test_odbc_interaction/test.py b/tests/integration/test_odbc_interaction/test.py
index 2ef71927bdf..25668737885 100644
--- a/tests/integration/test_odbc_interaction/test.py
+++ b/tests/integration/test_odbc_interaction/test.py
@@ -6,6 +6,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
+from multiprocessing.dummy import Pool
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', with_odbc_drivers=True, with_mysql=True,
@@ -26,6 +27,11 @@ create_table_sql_template = """
     """
 
 
+def skip_test_msan(instance):
+    if instance.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
+
 def get_mysql_conn():
     conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=3308)
     return conn
@@ -104,6 +110,8 @@ def started_cluster():
 
 
 def test_mysql_simple_select_works(started_cluster):
+    skip_test_msan(node1)
+
     mysql_setup = node1.odbc_drivers["MySQL"]
 
     table_name = 'test_insert_select'
@@ -144,6 +152,8 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, column_x Nulla
 
 
 def test_mysql_insert(started_cluster):
+    skip_test_msan(node1)
+
     mysql_setup = node1.odbc_drivers["MySQL"]
     table_name = 'test_insert'
     conn = get_mysql_conn()
@@ -165,6 +175,8 @@ def test_mysql_insert(started_cluster):
 
 
 def test_sqlite_simple_select_function_works(started_cluster):
+    skip_test_msan(node1)
+
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
 
@@ -181,6 +193,8 @@ def test_sqlite_simple_select_function_works(started_cluster):
         "select count(), sum(x) from odbc('DSN={}', '{}') group by x".format(sqlite_setup["DSN"], 't1')) == "1\t1\n"
 
 def test_sqlite_table_function(started_cluster):
+    skip_test_msan(node1)
+
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
 
@@ -197,6 +211,8 @@ def test_sqlite_table_function(started_cluster):
     assert node1.query("select count(), sum(x) from odbc_tf group by x") == "1\t1\n"
 
 def test_sqlite_simple_select_storage_works(started_cluster):
+    skip_test_msan(node1)
+
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
 
@@ -215,6 +231,8 @@ def test_sqlite_simple_select_storage_works(started_cluster):
 
 
 def test_sqlite_odbc_hashed_dictionary(started_cluster):
+    skip_test_msan(node1)
+
     sqlite_db = node1.odbc_drivers["SQLite3"]["Database"]
     node1.exec_in_container(["bash", "-c", "echo 'INSERT INTO t2 values(1, 2, 3);' | sqlite3 {}".format(sqlite_db)],
                             privileged=True, user='root')
@@ -259,6 +277,8 @@ def test_sqlite_odbc_hashed_dictionary(started_cluster):
 
 
 def test_sqlite_odbc_cached_dictionary(started_cluster):
+    skip_test_msan(node1)
+
     sqlite_db = node1.odbc_drivers["SQLite3"]["Database"]
     node1.exec_in_container(["bash", "-c", "echo 'INSERT INTO t3 values(1, 2, 3);' | sqlite3 {}".format(sqlite_db)],
                             privileged=True, user='root')
@@ -269,7 +289,7 @@ def test_sqlite_odbc_cached_dictionary(started_cluster):
     node1.exec_in_container(["bash", "-c", "chmod a+rw /tmp"], privileged=True, user='root')
     node1.exec_in_container(["bash", "-c", "chmod a+rw {}".format(sqlite_db)], privileged=True, user='root')
 
-    node1.query("insert into table function odbc('DSN={};', '', 't3') values (200, 2, 7)".format(
+    node1.query("insert into table function odbc('DSN={};ReadOnly=0', '', 't3') values (200, 2, 7)".format(
         node1.odbc_drivers["SQLite3"]["DSN"]))
 
     assert node1.query("select dictGetUInt8('sqlite3_odbc_cached', 'Z', toUInt64(200))") == "7\n"  # new value
@@ -281,6 +301,8 @@ def test_sqlite_odbc_cached_dictionary(started_cluster):
 
 
 def test_postgres_odbc_hashed_dictionary_with_schema(started_cluster):
+    skip_test_msan(node1)
+
     conn = get_postgres_conn()
     cursor = conn.cursor()
     cursor.execute("truncate table clickhouse.test_table")
@@ -291,6 +313,8 @@ def test_postgres_odbc_hashed_dictionary_with_schema(started_cluster):
 
 
 def test_postgres_odbc_hashed_dictionary_no_tty_pipe_overflow(started_cluster):
+    skip_test_msan(node1)
+
     conn = get_postgres_conn()
     cursor = conn.cursor()
     cursor.execute("truncate table clickhouse.test_table")
@@ -305,6 +329,8 @@ def test_postgres_odbc_hashed_dictionary_no_tty_pipe_overflow(started_cluster):
 
 
 def test_postgres_insert(started_cluster):
+    skip_test_msan(node1)
+
     conn = get_postgres_conn()
     conn.cursor().execute("truncate table clickhouse.test_table")
 
@@ -325,11 +351,13 @@ def test_postgres_insert(started_cluster):
 
 
 def test_bridge_dies_with_parent(started_cluster):
+    skip_test_msan(node1)
+
     if node1.is_built_with_address_sanitizer():
         # TODO: Leak sanitizer falsely reports about a leak of 16 bytes in clickhouse-odbc-bridge in this test and
         # that's linked somehow with that we have replaced getauxval() in glibc-compatibility.
         # The leak sanitizer calls getauxval() for its own purposes, and our replaced version doesn't seem to be equivalent in that case.
-        return
+        pytest.skip("Leak sanitizer falsely reports about a leak of 16 bytes in clickhouse-odbc-bridge")
 
     node1.query("select dictGetString('postgres_odbc_hashed', 'column2', toUInt64(1))")
 
@@ -364,6 +392,8 @@ def test_bridge_dies_with_parent(started_cluster):
 
 
 def test_odbc_postgres_date_data_type(started_cluster):
+    skip_test_msan(node1)
+
     conn = get_postgres_conn();
     cursor = conn.cursor()
     cursor.execute("CREATE TABLE IF NOT EXISTS clickhouse.test_date (column1 integer, column2 date)")
@@ -381,5 +411,194 @@ def test_odbc_postgres_date_data_type(started_cluster):
     expected = '1\t2020-12-01\n2\t2020-12-02\n3\t2020-12-03\n'
     result = node1.query('SELECT * FROM test_date');
     assert(result == expected)
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_date")
+    node1.query("DROP TABLE IF EXISTS test_date")
 
 
+def test_odbc_postgres_conversions(started_cluster):
+    skip_test_msan(node1)
+
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    cursor.execute(
+        '''CREATE TABLE IF NOT EXISTS clickhouse.test_types (
+        a smallint, b integer, c bigint, d real, e double precision, f serial, g bigserial,
+        h timestamp)''')
+
+    node1.query('''
+        INSERT INTO TABLE FUNCTION
+        odbc('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_types')
+        VALUES (-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12')''')
+
+    result = node1.query('''
+        SELECT a, b, c, d, e, f, g, h
+        FROM odbc('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_types')
+        ''')
+
+    assert(result == '-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12\n')
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_types")
+
+    cursor.execute("""CREATE TABLE IF NOT EXISTS clickhouse.test_types (column1 Timestamp, column2 Numeric)""")
+
+    node1.query(
+        '''
+        CREATE TABLE test_types (column1 DateTime64, column2 Decimal(5, 1))
+        ENGINE=ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_types')''')
+
+    node1.query(
+        """INSERT INTO test_types
+        SELECT toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow'), toDecimal32(1.1, 1)""")
+
+    expected = node1.query("SELECT toDateTime64('2019-01-01 00:00:00', 3, 'Europe/Moscow'), toDecimal32(1.1, 1)")
+    result = node1.query("SELECT * FROM test_types")
+    print(result)
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_types")
+    assert(result == expected)
+
+
+def test_odbc_cyrillic_with_varchar(started_cluster):
+    skip_test_msan(node1)
+
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_cyrillic")
+    cursor.execute("CREATE TABLE clickhouse.test_cyrillic (name varchar(11))")
+
+    node1.query('''
+        CREATE TABLE test_cyrillic (name String)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_cyrillic')''')
+
+    cursor.execute("INSERT INTO clickhouse.test_cyrillic VALUES ('A-nice-word')")
+    cursor.execute("INSERT INTO clickhouse.test_cyrillic VALUES ('Красивенько')")
+
+    result = node1.query(''' SELECT * FROM test_cyrillic ORDER BY name''')
+    assert(result == 'A-nice-word\nКрасивенько\n')
+    result = node1.query(''' SELECT name FROM odbc('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_cyrillic') ''')
+    assert(result == 'A-nice-word\nКрасивенько\n')
+
+
+def test_many_connections(started_cluster):
+    skip_test_msan(node1)
+
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    cursor.execute('DROP TABLE IF EXISTS clickhouse.test_pg_table')
+    cursor.execute('CREATE TABLE clickhouse.test_pg_table (key integer, value integer)')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_pg_table;
+        CREATE TABLE test_pg_table (key UInt32, value UInt32)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_pg_table')''')
+
+    node1.query("INSERT INTO test_pg_table SELECT number, number FROM numbers(10)")
+
+    query = "SELECT count() FROM ("
+    for i in range (24):
+        query += "SELECT key FROM {t} UNION ALL "
+    query += "SELECT key FROM {t})"
+
+    assert node1.query(query.format(t='test_pg_table')) == '250\n'
+
+
+def test_concurrent_queries(started_cluster):
+    skip_test_msan(node1)
+
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_pg_table;
+        CREATE TABLE test_pg_table (key UInt32, value UInt32)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_pg_table')''')
+
+    cursor.execute('DROP TABLE IF EXISTS clickhouse.test_pg_table')
+    cursor.execute('CREATE TABLE clickhouse.test_pg_table (key integer, value integer)')
+
+    def node_insert(_):
+        for i in range(5):
+            node1.query("INSERT INTO test_pg_table SELECT number, number FROM numbers(1000)", user='default')
+
+    busy_pool = Pool(5)
+    p = busy_pool.map_async(node_insert, range(5))
+    p.wait()
+    result = node1.query("SELECT count() FROM test_pg_table", user='default')
+    print(result)
+    assert(int(result) == 5 * 5 * 1000)
+
+    def node_insert_select(_):
+        for i in range(5):
+            result = node1.query("INSERT INTO test_pg_table SELECT number, number FROM numbers(1000)", user='default')
+            result = node1.query("SELECT * FROM test_pg_table LIMIT 100", user='default')
+
+    busy_pool = Pool(5)
+    p = busy_pool.map_async(node_insert_select, range(5))
+    p.wait()
+    result = node1.query("SELECT count() FROM test_pg_table", user='default')
+    print(result)
+    assert(int(result) == 5 * 5 * 1000  * 2)
+
+    node1.query('DROP TABLE test_pg_table;')
+    cursor.execute('DROP TABLE clickhouse.test_pg_table;')
+
+
+def test_odbc_long_column_names(started_cluster):
+    skip_test_msan(node1)
+
+    conn = get_postgres_conn();
+    cursor = conn.cursor()
+
+    column_name = "column" * 8
+    create_table = "CREATE TABLE clickhouse.test_long_column_names ("
+    for i in range(1000):
+        if i != 0:
+            create_table += ", "
+        create_table += "{} integer".format(column_name + str(i))
+    create_table += ")"
+    cursor.execute(create_table)
+    insert = "INSERT INTO clickhouse.test_long_column_names SELECT i" + ", i" * 999 + " FROM generate_series(0, 99) as t(i)"
+    cursor.execute(insert)
+    conn.commit()
+
+    create_table = "CREATE TABLE test_long_column_names ("
+    for i in range(1000):
+        if i != 0:
+            create_table += ", "
+        create_table += "{} UInt32".format(column_name + str(i))
+    create_table += ") ENGINE=ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_long_column_names')"
+    result = node1.query(create_table);
+
+    result = node1.query('SELECT * FROM test_long_column_names');
+    expected = node1.query("SELECT number" + ", number" * 999 + " FROM numbers(100)")
+    assert(result == expected)
+
+    cursor.execute("DROP TABLE IF EXISTS clickhouse.test_long_column_names")
+    node1.query("DROP TABLE IF EXISTS test_long_column_names")
+
+
+def test_odbc_long_text(started_cluster):
+    skip_test_msan(node1)
+
+    conn = get_postgres_conn()
+    cursor = conn.cursor()
+    cursor.execute("drop table if exists clickhouse.test_long_text")
+    cursor.execute("create table clickhouse.test_long_text(flen int, field1 text)");
+
+    # sample test from issue 9363
+    text_from_issue = """BEGIN These examples only show the order that data is arranged in. The values from different columns are stored separately, and data from the same column is stored together.      Examples of a column-oriented DBMS: Vertica, Paraccel (Actian Matrix and Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB (VectorWise and Actian Vector), LucidDB, SAP HANA, Google Dremel, Google PowerDrill, Druid, and kdb+.      Different orders for storing data are better suited to different scenarios. The data access scenario refers to what queries are made, how often, and in what proportion; how much data is read for each type of query – rows, columns, and bytes; the relationship between reading and updating data; the working size of the data and how locally it is used; whether transactions are used, and how isolated they are; requirements for data replication and logical integrity; requirements for latency and throughput for each type of query, and so on.      The higher the load on the system, the more important it is to customize the system set up to match the requirements of the usage scenario, and the more fine grained this customization becomes. There is no system that is equally well-suited to significantly different scenarios. If a system is adaptable to a wide set of scenarios, under a high load, the system will handle all the scenarios equally poorly, or will work well for just one or few of possible scenarios.   Key Properties of OLAP Scenario¶          The vast majority of requests are for read access.       Data is updated in fairly large batches (> 1000 rows), not by single rows; or it is not updated at all.       Data is added to the DB but is not modified.       For reads, quite a large number of rows are extracted from the DB, but only a small subset of columns.       Tables are "wide," meaning they contain a large number of columns.       Queries are relatively rare (usually hundreds of queries per server or less per second).       For simple queries, latencies around 50 ms are allowed.       Column values are fairly small: numbers and short strings (for example, 60 bytes per URL).       Requires high throughput when processing a single query (up to billions of rows per second per server).       Transactions are not necessary.       Low requirements for data consistency.       There is one large table per query. All tables are small, except for one.       A query result is significantly smaller than the source data. In other words, data is filtered or aggregated, so the result fits in a single server"s RAM.      It is easy to see that the OLAP scenario is very different from other popular scenarios (such as OLTP or Key-Value access). So it doesn"t make sense to try to use OLTP or a Key-Value DB for processing analytical queries if you want to get decent performance. For example, if you try to use MongoDB or Redis for analytics, you will get very poor performance compared to OLAP databases.   Why Column-Oriented Databases Work Better in the OLAP Scenario¶      Column-oriented databases are better suited to OLAP scenarios: they are at least 100 times faster in processing most queries. The reasons are explained in detail below, but the fact is easier to demonstrate visually. END"""
+    cursor.execute("""insert into clickhouse.test_long_text (flen, field1) values (3248, '{}')""".format(text_from_issue));
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_long_test;
+        CREATE TABLE test_long_text (flen UInt32, field1 String)
+        ENGINE = ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_long_text')''')
+    result = node1.query("select field1 from test_long_text;")
+    assert(result.strip() == text_from_issue)
+
+    long_text = "text" * 1000000
+    cursor.execute("""insert into clickhouse.test_long_text (flen, field1) values (400000, '{}')""".format(long_text));
+    result = node1.query("select field1 from test_long_text where flen=400000;")
+    assert(result.strip() == long_text)
+
diff --git a/tests/integration/test_part_moves_between_shards/__init__.py b/tests/integration/test_part_moves_between_shards/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
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
new file mode 100644
index 00000000000..7bf77e26249
--- /dev/null
+++ b/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <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>
diff --git a/tests/integration/test_live_view_over_distributed/configs/remote_servers.xml b/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
similarity index 52%
rename from tests/integration/test_live_view_over_distributed/configs/remote_servers.xml
rename to tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
index ebce4697529..4812d84a918 100644
--- a/tests/integration/test_live_view_over_distributed/configs/remote_servers.xml
+++ b/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
@@ -3,13 +3,21 @@
         <test_cluster>
             <shard>
                 <replica>
-                    <host>node1</host>
+                    <host>s0r0</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>s0r1</host>
                     <port>9000</port>
                 </replica>
             </shard>
             <shard>
                 <replica>
-                    <host>node2</host>
+                    <host>s1r0</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>s1r1</host>
                     <port>9000</port>
                 </replica>
             </shard>
diff --git a/tests/integration/test_part_moves_between_shards/test.py b/tests/integration/test_part_moves_between_shards/test.py
new file mode 100644
index 00000000000..00407f95389
--- /dev/null
+++ b/tests/integration/test_part_moves_between_shards/test.py
@@ -0,0 +1,159 @@
+import random
+import time
+
+import pytest
+
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+
+s0r0 = cluster.add_instance(
+    's0r0',
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    with_zookeeper=True)
+
+s0r1 = cluster.add_instance(
+    's0r1',
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    with_zookeeper=True)
+
+s1r0 = cluster.add_instance(
+    's1r0',
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    with_zookeeper=True)
+
+s1r1 = cluster.add_instance(
+    's1r1',
+    main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    with_zookeeper=True)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_move(started_cluster):
+    for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
+        for replica_ix, r in enumerate(rs):
+            r.query("""
+            CREATE TABLE test_move(v UInt64)
+            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_move', '{}')
+            ORDER BY tuple()
+            """.format(shard_ix, replica_ix))
+
+    s0r0.query("SYSTEM STOP MERGES test_move")
+
+    s0r0.query("INSERT INTO test_move VALUES (1)")
+    s0r0.query("INSERT INTO test_move VALUES (2)")
+
+    assert "2" == s0r0.query("SELECT count() FROM test_move").strip()
+    assert "0" == s1r0.query("SELECT count() FROM test_move").strip()
+
+    s0r0.query("ALTER TABLE test_move MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_move'")
+
+    print(s0r0.query("SELECT * FROM system.part_moves_between_shards"))
+
+    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
+
+    for n in [s0r0, s0r1]:
+        assert "1" == n.query("SELECT count() FROM test_move").strip()
+
+    for n in [s1r0, s1r1]:
+        assert "1" == n.query("SELECT count() FROM test_move").strip()
+
+    # 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
+
+    for n in [s0r0, s0r1]:
+        assert "2" == n.query("SELECT count() FROM test_move").strip()
+
+    for n in [s1r0, s1r1]:
+        assert "0" == n.query("SELECT count() FROM test_move").strip()
+
+
+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("""
+            CREATE TABLE test_deduplication(v UInt64)
+            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_deduplication', '{}')
+            ORDER BY tuple()
+            """.format(shard_ix, replica_ix))
+
+            r.query("""
+            CREATE TABLE t_d AS test_deduplication
+            ENGINE Distributed('test_cluster', '', test_deduplication)
+            """)
+
+    s0r0.query("SYSTEM STOP MERGES test_deduplication")
+
+    s0r0.query("INSERT INTO test_deduplication VALUES (1)")
+    s0r0.query("INSERT INTO test_deduplication VALUES (2)")
+    s0r1.query("SYSTEM SYNC REPLICA test_deduplication", timeout=20)
+
+    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("SYSTEM START MERGES test_deduplication")
+
+    expected = """
+1
+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():
+        n = random.choice(list(started_cluster.instances.values()))
+
+        assert TSV(n.query("SELECT * FROM t_d ORDER BY v", settings={
+            "allow_experimental_query_deduplication": 1
+        })) == TSV(expected)
+
+
+def test_move_not_permitted(started_cluster):
+    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))
+
+    s0r0.query("INSERT INTO not_permitted VALUES (1)")
+
+    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'")
+
+    assert "DB::Exception: Table columns structure in ZooKeeper is different from local table structure." in str(exc.value)
+
+    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'")
+
+    assert "DB::Exception: Source and destination are the same" in str(exc.value)
diff --git a/tests/integration/test_polymorphic_parts/test.py b/tests/integration/test_polymorphic_parts/test.py
index 50a8192fbc5..9fe3ef77da8 100644
--- a/tests/integration/test_polymorphic_parts/test.py
+++ b/tests/integration/test_polymorphic_parts/test.py
@@ -7,7 +7,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 from helpers.test_tools import TSV
-from helpers.test_tools import assert_eq_with_retry
+from helpers.test_tools import assert_eq_with_retry, exec_query_with_retry
 
 cluster = ClickHouseCluster(__file__)
 
@@ -376,74 +376,6 @@ def test_in_memory(start_cluster):
         "Wide\t1\n")
 
 
-def test_in_memory_wal(start_cluster):
-    # Merges are disabled in config
-
-    for i in range(5):
-        insert_random_data('wal_table', node11, 50)
-    node12.query("SYSTEM SYNC REPLICA wal_table", timeout=20)
-
-    def check(node, rows, parts):
-        node.query("SELECT count() FROM wal_table") == "{}\n".format(rows)
-        node.query(
-            "SELECT count() FROM system.parts WHERE table = 'wal_table' AND part_type = 'InMemory'") == "{}\n".format(
-            parts)
-
-    check(node11, 250, 5)
-    check(node12, 250, 5)
-
-    # WAL works at inserts
-    node11.restart_clickhouse(kill=True)
-    check(node11, 250, 5)
-
-    # WAL works at fetches
-    node12.restart_clickhouse(kill=True)
-    check(node12, 250, 5)
-
-    insert_random_data('wal_table', node11, 50)
-    node12.query("SYSTEM SYNC REPLICA wal_table", timeout=20)
-
-    # Disable replication
-    with PartitionManager() as pm:
-        pm.partition_instances(node11, node12)
-        check(node11, 300, 6)
-
-        wal_file = "/var/lib/clickhouse/data/default/wal_table/wal.bin"
-        # Corrupt wal file
-        # Truncate it to it's size minus 10 bytes
-        node11.exec_in_container(['bash', '-c', 'truncate --size="$(($(stat -c "%s" {}) - 10))" {}'.format(wal_file, wal_file)],
-                                 privileged=True, user='root')
-        node11.restart_clickhouse(kill=True)
-
-        # Broken part is lost, but other restored successfully
-        check(node11, 250, 5)
-        # WAL with blocks from 0 to 4
-        broken_wal_file = "/var/lib/clickhouse/data/default/wal_table/wal_0_4.bin"
-        # Check file exists
-        node11.exec_in_container(['bash', '-c', 'test -f {}'.format(broken_wal_file)])
-
-    # Fetch lost part from replica
-    node11.query("SYSTEM SYNC REPLICA wal_table", timeout=20)
-    check(node11, 300, 6)
-
-    # Check that new data is written to new wal, but old is still exists for restoring
-    # Check file not empty
-    node11.exec_in_container(['bash', '-c', 'test -s {}'.format(wal_file)])
-    # Check file exists
-    node11.exec_in_container(['bash', '-c', 'test -f {}'.format(broken_wal_file)])
-
-    # Data is lost without WAL
-    node11.query("ALTER TABLE wal_table MODIFY SETTING in_memory_parts_enable_wal = 0")
-    with PartitionManager() as pm:
-        pm.partition_instances(node11, node12)
-
-        insert_random_data('wal_table', node11, 50)
-        check(node11, 350, 7)
-
-        node11.restart_clickhouse(kill=True)
-        check(node11, 300, 6)
-
-
 def test_in_memory_wal_rotate(start_cluster):
     # Write every part to single wal
     node11.query("ALTER TABLE restore_table MODIFY SETTING write_ahead_log_max_bytes = 10")
@@ -476,8 +408,9 @@ def test_in_memory_wal_rotate(start_cluster):
 
 def test_in_memory_deduplication(start_cluster):
     for i in range(3):
-        node9.query("INSERT INTO deduplication_table (date, id, s) VALUES (toDate('2020-03-03'), 1, 'foo')")
-        node10.query("INSERT INTO deduplication_table (date, id, s) VALUES (toDate('2020-03-03'), 1, 'foo')")
+        # table can be in readonly node
+        exec_query_with_retry(node9, "INSERT INTO deduplication_table (date, id, s) VALUES (toDate('2020-03-03'), 1, 'foo')")
+        exec_query_with_retry(node10, "INSERT INTO deduplication_table (date, id, s) VALUES (toDate('2020-03-03'), 1, 'foo')")
 
     node9.query("SYSTEM SYNC REPLICA deduplication_table", timeout=20)
     node10.query("SYSTEM SYNC REPLICA deduplication_table", timeout=20)
@@ -498,10 +431,10 @@ def test_in_memory_alters(start_cluster):
     node9.restart_clickhouse(kill=True)
 
     expected = "1\tab\t0\n2\tcd\t0\n"
-    assert node9.query("SELECT id, s, col1 FROM alters_table") == expected
+    assert node9.query("SELECT id, s, col1 FROM alters_table ORDER BY id") == expected
     check_parts_type(1)
-
-    node9.query("INSERT INTO alters_table (date, id, col1) VALUES (toDate('2020-10-10'), 3, 100)")
+    # After hard restart table can be in readonly mode
+    exec_query_with_retry(node9, "INSERT INTO alters_table (date, id, col1) VALUES (toDate('2020-10-10'), 3, 100)")
     node9.query("ALTER TABLE alters_table MODIFY COLUMN col1 String")
     node9.query("ALTER TABLE alters_table DROP COLUMN s")
     node9.restart_clickhouse(kill=True)
@@ -510,8 +443,10 @@ def test_in_memory_alters(start_cluster):
     with pytest.raises(Exception):
         node9.query("SELECT id, s, col1 FROM alters_table")
 
-    expected = expected = "1\t0_foo\n2\t0_foo\n3\t100_foo\n"
-    assert node9.query("SELECT id, col1 || '_foo' FROM alters_table")
+    # Values of col1 was not materialized as integers, so they have
+    # default string values after alter
+    expected = "1\t_foo\n2\t_foo\n3\t100_foo\n"
+    assert node9.query("SELECT id, col1 || '_foo' FROM alters_table ORDER BY id") == expected
 
 
 def test_polymorphic_parts_index(start_cluster):
diff --git a/tests/integration/test_query_deduplication/configs/profiles.xml b/tests/integration/test_query_deduplication/configs/profiles.xml
new file mode 100644
index 00000000000..4c15556ab99
--- /dev/null
+++ b/tests/integration/test_query_deduplication/configs/profiles.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <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
diff --git a/tests/integration/test_query_deduplication/test.py b/tests/integration/test_query_deduplication/test.py
index 8d935b98579..1088b539414 100644
--- a/tests/integration/test_query_deduplication/test.py
+++ b/tests/integration/test_query_deduplication/test.py
@@ -11,15 +11,18 @@ cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance(
     'node1',
-    main_configs=['configs/remote_servers.xml', 'configs/deduplication_settings.xml'])
+    main_configs=['configs/remote_servers.xml', 'configs/deduplication_settings.xml'],
+    user_configs=['configs/profiles.xml'])
 
 node2 = cluster.add_instance(
     'node2',
-    main_configs=['configs/remote_servers.xml', 'configs/deduplication_settings.xml'])
+    main_configs=['configs/remote_servers.xml', 'configs/deduplication_settings.xml'],
+    user_configs=['configs/profiles.xml'])
 
 node3 = cluster.add_instance(
     'node3',
-    main_configs=['configs/remote_servers.xml', 'configs/deduplication_settings.xml'])
+    main_configs=['configs/remote_servers.xml', 'configs/deduplication_settings.xml'],
+    user_configs=['configs/profiles.xml'])
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/test_recovery_replica/test.py b/tests/integration/test_recovery_replica/test.py
index 22dba7aafec..bf869d0de31 100644
--- a/tests/integration/test_recovery_replica/test.py
+++ b/tests/integration/test_recovery_replica/test.py
@@ -4,28 +4,34 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import assert_eq_with_retry
 
+SETTINGS = "SETTINGS min_replicated_logs_to_keep=3, max_replicated_logs_to_keep=5, cleanup_delay_period=0, cleanup_delay_period_random_add=0"
 
-def fill_nodes(nodes, shard):
+def fill_nodes(nodes):
     for node in nodes:
         node.query(
             '''
                 CREATE TABLE test_table(date Date, id UInt32)
-                ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/replicated', '{replica}') ORDER BY id PARTITION BY toYYYYMM(date) SETTINGS min_replicated_logs_to_keep=3, max_replicated_logs_to_keep=5, cleanup_delay_period=0, cleanup_delay_period_random_add=0;
-            '''.format(shard=shard, replica=node.name))
+                ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/replicated', '{replica}') ORDER BY id PARTITION BY toYYYYMM(date) 
+                {settings};
+            '''.format(replica=node.name, settings=SETTINGS))
 
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', with_zookeeper=True)
 node2 = cluster.add_instance('node2', with_zookeeper=True)
 node3 = cluster.add_instance('node3', with_zookeeper=True)
+nodes = [node1, node2, node3]
 
+def sync_replicas(table):
+    for node in nodes:
+        node.query("SYSTEM SYNC REPLICA {}".format(table))
 
 @pytest.fixture(scope="module")
 def start_cluster():
     try:
         cluster.start()
 
-        fill_nodes([node1, node2, node3], 1)
+        fill_nodes([node1, node2, node3])
 
         yield cluster
 
@@ -37,11 +43,11 @@ def start_cluster():
 
 
 def test_recovery(start_cluster):
-    node1.query("INSERT INTO test_table VALUES (1, 1)")
-    time.sleep(1)
+    node1.query("INSERT INTO test_table VALUES (1, 0)")
+    sync_replicas("test_table")
     node2.query("DETACH TABLE test_table")
 
-    for i in range(100):
+    for i in range(1, 11):
         node1.query("INSERT INTO test_table VALUES (1, {})".format(i))
 
     node2.query_with_retry("ATTACH TABLE test_table",
@@ -51,13 +57,17 @@ def test_recovery(start_cluster):
     lost_marker = "Will mark replica node2 as lost"
     assert node1.contains_in_log(lost_marker) or node3.contains_in_log(lost_marker)
 
+    sync_replicas("test_table")
+    for node in nodes:
+        assert node.query("SELECT count(), sum(id) FROM test_table WHERE date=toDate(1)") == "11\t55\n"
+
 def test_choose_source_replica(start_cluster):
-    node3.query("INSERT INTO test_table VALUES (2, 1)")
-    time.sleep(1)
+    node3.query("INSERT INTO test_table VALUES (2, 0)")
+    sync_replicas("test_table")
     node2.query("DETACH TABLE test_table")
     node1.query("SYSTEM STOP FETCHES test_table")   # node1 will have many entries in queue, so node2 will clone node3
 
-    for i in range(100):
+    for i in range(1, 11):
         node3.query("INSERT INTO test_table VALUES (2, {})".format(i))
 
     node2.query_with_retry("ATTACH TABLE test_table",
@@ -74,3 +84,81 @@ def test_choose_source_replica(start_cluster):
     assert node1.contains_in_log(lost_marker) or node3.contains_in_log(lost_marker)
     assert node2.contains_in_log("Will mimic node3")
 
+    sync_replicas("test_table")
+    for node in nodes:
+        assert node.query("SELECT count(), sum(id) FROM test_table WHERE date=toDate(2)") == "11\t55\n"
+
+
+def test_update_metadata(start_cluster):
+    for node in nodes:
+        node.query(
+            '''
+                CREATE TABLE update_metadata(key UInt32)
+                ENGINE = ReplicatedMergeTree('/test/update_metadata', '{replica}') ORDER BY key PARTITION BY key % 10
+                {settings};
+            '''.format(replica=node.name, settings=SETTINGS))
+
+    for i in range(1, 11):
+        node1.query("INSERT INTO update_metadata VALUES ({})".format(i))
+
+    node2.query("DETACH TABLE update_metadata")
+    # alter without mutation
+    node1.query("ALTER TABLE update_metadata ADD COLUMN col1 UInt32")
+
+    for i in range(1, 11):
+        node1.query("INSERT INTO update_metadata VALUES ({}, {})".format(i * 10, i * 10))
+
+    lost_marker = "Will mark replica node2 as lost"
+    assert node1.contains_in_log(lost_marker) or node3.contains_in_log(lost_marker)
+
+    node2.query("ATTACH TABLE update_metadata")
+    sync_replicas("update_metadata")
+    assert node1.query("DESC TABLE update_metadata") == node2.query("DESC TABLE update_metadata")
+    assert node1.query("DESC TABLE update_metadata") == node3.query("DESC TABLE update_metadata")
+    for node in nodes:
+        assert node.query("SELECT count(), sum(key), sum(col1) FROM update_metadata") == "20\t605\t550\n"
+
+    node2.query("DETACH TABLE update_metadata")
+    # alter with mutation
+    node1.query("ALTER TABLE update_metadata DROP COLUMN col1")
+    for i in range(1, 11):
+        node1.query("INSERT INTO update_metadata VALUES ({})".format(i * 100))
+
+    lost_marker = "Will mark replica node2 as lost"
+    assert node1.contains_in_log(lost_marker) or node3.contains_in_log(lost_marker)
+
+    node2.query("ATTACH TABLE update_metadata")
+    sync_replicas("update_metadata")
+    assert node1.query("DESC TABLE update_metadata") == node2.query("DESC TABLE update_metadata")
+    assert node1.query("DESC TABLE update_metadata") == node3.query("DESC TABLE update_metadata")
+
+    # check that it's possible to execute alter on cloned replica
+    node2.query("ALTER TABLE update_metadata ADD COLUMN col1 UInt32")
+    sync_replicas("update_metadata")
+    for node in nodes:
+        assert node.query("SELECT count(), sum(key), sum(col1) FROM update_metadata") == "30\t6105\t0\n"
+
+    # more complex case with multiple alters
+    node2.query("TRUNCATE TABLE update_metadata")
+    for i in range(1, 11):
+        node1.query("INSERT INTO update_metadata VALUES ({}, {})".format(i, i))
+
+    # The following alters hang because of "No active replica has part ... or covering part"
+    #node2.query("SYSTEM STOP REPLICATED SENDS update_metadata")
+    #node2.query("INSERT INTO update_metadata VALUES (42, 42)") # this part will be lost
+    node2.query("DETACH TABLE update_metadata")
+
+    node1.query("ALTER TABLE update_metadata MODIFY COLUMN col1 String")
+    node1.query("ALTER TABLE update_metadata ADD COLUMN col2 INT")
+    for i in range(1, 11):
+        node3.query("INSERT INTO update_metadata VALUES ({}, '{}', {})".format(i * 10, i * 10, i * 10))
+    node1.query("ALTER TABLE update_metadata DROP COLUMN col1")
+    node1.query("ALTER TABLE update_metadata ADD COLUMN col3 Date")
+
+    node2.query("ATTACH TABLE update_metadata")
+    sync_replicas("update_metadata")
+    assert node1.query("DESC TABLE update_metadata") == node2.query("DESC TABLE update_metadata")
+    assert node1.query("DESC TABLE update_metadata") == node3.query("DESC TABLE update_metadata")
+    for node in nodes:
+        assert node.query("SELECT count(), sum(key), sum(col2) FROM update_metadata") == "20\t605\t550\n"
+
diff --git a/tests/integration/test_redirect_url_storage/test.py b/tests/integration/test_redirect_url_storage/test.py
index f2731794d43..d899d316abc 100644
--- a/tests/integration/test_redirect_url_storage/test.py
+++ b/tests/integration/test_redirect_url_storage/test.py
@@ -26,6 +26,32 @@ def test_url_without_redirect(started_cluster):
     assert node1.query("select * from WebHDFSStorage") == "1\tMark\t72.53\n"
 
 
+def test_url_with_globs(started_cluster):
+    started_cluster.hdfs_api.write_data("/simple_storage_1_1", "1\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_1_2", "2\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_1_3", "3\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_2_1", "4\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_2_2", "5\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_2_3", "6\n")
+
+    result = node1.query(
+        "select * from url('http://hdfs1:50075/webhdfs/v1/simple_storage_{1..2}_{1..3}?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', 'TSV', 'data String') as data order by data")
+    assert result == "1\n2\n3\n4\n5\n6\n"
+
+
+def test_url_with_globs_and_failover(started_cluster):
+    started_cluster.hdfs_api.write_data("/simple_storage_1_1", "1\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_1_2", "2\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_1_3", "3\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_3_1", "4\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_3_2", "5\n")
+    started_cluster.hdfs_api.write_data("/simple_storage_3_3", "6\n")
+
+    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"
+
+
 def test_url_with_redirect_not_allowed(started_cluster):
     started_cluster.hdfs_api.write_data("/simple_storage", "1\tMark\t72.53\n")
     assert started_cluster.hdfs_api.read_data("/simple_storage") == "1\tMark\t72.53\n"
diff --git a/tests/integration/test_rename_column/test.py b/tests/integration/test_rename_column/test.py
index 0e5cc9f5d9d..3a818303f40 100644
--- a/tests/integration/test_rename_column/test.py
+++ b/tests/integration/test_rename_column/test.py
@@ -3,6 +3,7 @@
 import random
 import time
 from multiprocessing.dummy import Pool
+import datetime
 
 import pytest
 from helpers.client import QueryRuntimeException
@@ -111,7 +112,7 @@ def insert(node, table_name, chunk=1000, col_names=None, iterations=1, ignore_ex
         try:
             query = ["SET max_partitions_per_insert_block = 10000000"]
             if with_many_parts:
-                query.append("SET max_insert_block_size = 64")
+                query.append("SET max_insert_block_size = 256")
             if with_time_column:
                 query.append(
                     "INSERT INTO {table_name} ({col0}, {col1}, time) SELECT number AS {col0}, number + 1 AS {col1}, now() + 10 AS time FROM numbers_mt({chunk})"
@@ -305,35 +306,45 @@ def test_rename_with_parallel_merges(started_cluster):
     table_name = "test_rename_with_parallel_merges"
     drop_table(nodes, table_name)
     try:
+        print("Creating tables", datetime.datetime.now())
         create_table(nodes, table_name)
-        for i in range(20):
+        for i in range(5):
             insert(node1, table_name, 100, ["num", "num2"], 1, False, False, True, offset=i * 100)
 
-        def merge_parts(node, table_name, iterations=1):
-            for i in range(iterations):
-                node.query("OPTIMIZE TABLE %s FINAL" % table_name)
+        print("Data inserted", datetime.datetime.now())
 
+        def merge_parts(node, table_name, iterations=1):
+            for _ in range(iterations):
+                try:
+                    node.query("OPTIMIZE TABLE %s FINAL" % table_name)
+                except Exception as ex:
+                    print("Got an exception while optimizing table", ex)
+
+        print("Creating pool")
         p = Pool(15)
         tasks = []
-        for i in range(1):
-            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, "foo3", "num2", 5, True)))
-            tasks.append(p.apply_async(merge_parts, (node1, table_name, 5)))
-            tasks.append(p.apply_async(merge_parts, (node2, table_name, 5)))
-            tasks.append(p.apply_async(merge_parts, (node3, table_name, 5)))
+        tasks.append(p.apply_async(rename_column, (node1, table_name, "num2", "foo2", 2, True)))
+        tasks.append(p.apply_async(rename_column, (node2, table_name, "foo2", "foo3", 2, True)))
+        tasks.append(p.apply_async(rename_column, (node3, table_name, "foo3", "num2", 2, True)))
+        tasks.append(p.apply_async(merge_parts, (node1, table_name, 2)))
+        tasks.append(p.apply_async(merge_parts, (node2, table_name, 2)))
+        tasks.append(p.apply_async(merge_parts, (node3, table_name, 2)))
 
+        print("Waiting for tasks", datetime.datetime.now())
         for task in tasks:
             task.get(timeout=240)
+        print("Finished waiting", datetime.datetime.now())
 
+        print("Renaming columns", datetime.datetime.now())
         # rename column back to the original name
         rename_column(node1, table_name, "foo3", "num2", 1, True)
         rename_column(node1, table_name, "foo2", "num2", 1, True)
+        print("Finished renaming", datetime.datetime.now())
 
         # check that select still works
-        select(node1, table_name, "num2", "1998\n")
-        select(node2, table_name, "num2", "1998\n")
-        select(node3, table_name, "num2", "1998\n")
+        select(node1, table_name, "num2", "500\n")
+        select(node2, table_name, "num2", "500\n")
+        select(node3, table_name, "num2", "500\n")
     finally:
         drop_table(nodes, table_name)
 
diff --git a/tests/integration/test_replicated_fetches_bandwidth/__init__.py b/tests/integration/test_replicated_fetches_bandwidth/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_replicated_fetches_bandwidth/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
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
new file mode 100644
index 00000000000..566c7c07f5c
--- /dev/null
+++ b/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<yandex>
+    <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>
diff --git a/tests/integration/test_replicated_fetches_bandwidth/test.py b/tests/integration/test_replicated_fetches_bandwidth/test.py
new file mode 100644
index 00000000000..5b8332cda16
--- /dev/null
+++ b/tests/integration/test_replicated_fetches_bandwidth/test.py
@@ -0,0 +1,205 @@
+#!/usr/bin/env python3
+from helpers.cluster import ClickHouseCluster
+import pytest
+import random
+import string
+from helpers.network import NetThroughput
+import subprocess
+import time
+import statistics
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', with_zookeeper=True)
+node2 = cluster.add_instance('node2', with_zookeeper=True)
+node3 = cluster.add_instance('node3', user_configs=['configs/limit_replication_config.xml'], with_zookeeper=True)
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+def get_random_string(length):
+    return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(length))
+
+def test_limited_fetch_single_table(start_cluster):
+    print("Limited fetches single table")
+    try:
+        for i, node in enumerate([node1, node2]):
+            node.query(f"CREATE TABLE limited_fetch_table(key UInt64, data String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/limited_fetch_table', '{i}') ORDER BY tuple() PARTITION BY key SETTINGS max_replicated_fetches_network_bandwidth=10485760")
+
+        node2.query("SYSTEM STOP FETCHES limited_fetch_table")
+
+        for i in range(5):
+            node1.query("INSERT INTO limited_fetch_table SELECT {}, '{}' FROM numbers(300)".format(i, get_random_string(104857)))
+
+        n1_net = NetThroughput(node1)
+        n2_net = NetThroughput(node2)
+
+        node2.query("SYSTEM START FETCHES limited_fetch_table")
+        n2_fetch_speed = []
+        for i in range(10):
+            n1_in, n1_out = n1_net.measure_speed('megabytes')
+            n2_in, n2_out = n2_net.measure_speed('megabytes')
+            print("[N1] input:", n1_in, 'MB/s', "output:", n1_out, "MB/s")
+            print("[N2] input:", n2_in, 'MB/s', "output:", n2_out, "MB/s")
+            n2_fetch_speed.append(n2_in)
+            time.sleep(0.5)
+
+        median_speed = statistics.median(n2_fetch_speed)
+        # approximate border. Without limit we will have more than 100 MB/s for very slow builds.
+        assert median_speed <= 15, "We exceeded max fetch speed for more than 10MB/s. Must be around 10 (+- 5), got " + str(median_speed)
+
+    finally:
+        for node in [node1, node2]:
+            node.query("DROP TABLE IF EXISTS limited_fetch_table SYNC")
+
+def test_limited_send_single_table(start_cluster):
+    print("Limited sends single table")
+    try:
+        for i, node in enumerate([node1, node2]):
+            node.query(f"CREATE TABLE limited_send_table(key UInt64, data String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/limited_fetch_table', '{i}') ORDER BY tuple() PARTITION BY key SETTINGS max_replicated_sends_network_bandwidth=5242880")
+
+        node2.query("SYSTEM STOP FETCHES limited_send_table")
+
+        for i in range(5):
+            node1.query("INSERT INTO limited_send_table SELECT {}, '{}' FROM numbers(150)".format(i, get_random_string(104857)))
+
+        n1_net = NetThroughput(node1)
+        n2_net = NetThroughput(node2)
+
+        node2.query("SYSTEM START FETCHES limited_send_table")
+        n1_sends_speed = []
+        for i in range(10):
+            n1_in, n1_out = n1_net.measure_speed('megabytes')
+            n2_in, n2_out = n2_net.measure_speed('megabytes')
+            print("[N1] input:", n1_in, 'MB/s', "output:", n1_out, "MB/s")
+            print("[N2] input:", n2_in, 'MB/s', "output:", n2_out, "MB/s")
+            n1_sends_speed.append(n1_out)
+            time.sleep(0.5)
+
+        median_speed = statistics.median(n1_sends_speed)
+        # approximate border. Without limit we will have more than 100 MB/s for very slow builds.
+        assert median_speed <= 10, "We exceeded max send speed for more than 5MB/s. Must be around 5 (+- 5), got " + str(median_speed)
+
+    finally:
+        for node in [node1, node2]:
+            node.query("DROP TABLE IF EXISTS limited_send_table SYNC")
+
+
+def test_limited_fetches_for_server(start_cluster):
+    print("Limited fetches for server")
+    try:
+        for i, node in enumerate([node1, node3]):
+            for j in range(5):
+                node.query(f"CREATE TABLE limited_fetches{j}(key UInt64, data String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/limited_fetches{j}', '{i}') ORDER BY tuple() PARTITION BY key")
+
+        for j in range(5):
+            node3.query(f"SYSTEM STOP FETCHES limited_fetches{j}")
+            for i in range(5):
+                node1.query("INSERT INTO limited_fetches{} SELECT {}, '{}' FROM numbers(50)".format(j, i, get_random_string(104857)))
+
+        n1_net = NetThroughput(node1)
+        n3_net = NetThroughput(node3)
+
+        for j in range(5):
+            node3.query(f"SYSTEM START FETCHES limited_fetches{j}")
+
+        n3_fetches_speed = []
+        for i in range(5):
+            n1_in, n1_out = n1_net.measure_speed('megabytes')
+            n3_in, n3_out = n3_net.measure_speed('megabytes')
+            print("[N1] input:", n1_in, 'MB/s', "output:", n1_out, "MB/s")
+            print("[N3] input:", n3_in, 'MB/s', "output:", n3_out, "MB/s")
+            n3_fetches_speed.append(n3_in)
+            time.sleep(0.5)
+
+        median_speed = statistics.median(n3_fetches_speed)
+        # approximate border. Without limit we will have more than 100 MB/s for very slow builds.
+        assert median_speed <= 15, "We exceeded max fetch speed for more than 15MB/s. Must be around 5 (+- 10), got " + str(median_speed)
+
+    finally:
+        for node in [node1, node3]:
+            for j in range(5):
+                node.query(f"DROP TABLE IF EXISTS limited_fetches{j} SYNC")
+
+
+def test_limited_sends_for_server(start_cluster):
+    print("Limited sends for server")
+    try:
+        for i, node in enumerate([node1, node3]):
+            for j in range(5):
+                node.query(f"CREATE TABLE limited_sends{j}(key UInt64, data String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/limited_sends{j}', '{i}') ORDER BY tuple() PARTITION BY key")
+
+        for j in range(5):
+            node1.query(f"SYSTEM STOP FETCHES limited_sends{j}")
+            for i in range(5):
+                node3.query("INSERT INTO limited_sends{} SELECT {}, '{}' FROM numbers(50)".format(j, i, get_random_string(104857)))
+
+        n1_net = NetThroughput(node1)
+        n3_net = NetThroughput(node3)
+
+        for j in range(5):
+            node1.query(f"SYSTEM START FETCHES limited_sends{j}")
+
+        n3_sends_speed = []
+        for i in range(5):
+            n1_in, n1_out = n1_net.measure_speed('megabytes')
+            n3_in, n3_out = n3_net.measure_speed('megabytes')
+            print("[N1] input:", n1_in, 'MB/s', "output:", n1_out, "MB/s")
+            print("[N3] input:", n3_in, 'MB/s', "output:", n3_out, "MB/s")
+            n3_sends_speed.append(n3_out)
+            time.sleep(0.5)
+
+        median_speed = statistics.median(n3_sends_speed)
+        # approximate border. Without limit we will have more than 100 MB/s for very slow builds.
+        assert median_speed <= 20, "We exceeded max send speed for more than 20MB/s. Must be around 5 (+- 10), got " + str(median_speed)
+
+    finally:
+        for node in [node1, node3]:
+            for j in range(5):
+                node.query(f"DROP TABLE IF EXISTS limited_sends{j} SYNC")
+
+
+def test_should_execute_fetch(start_cluster):
+    print("Should execute fetch")
+    try:
+        for i, node in enumerate([node1, node2]):
+            node.query(f"CREATE TABLE should_execute_table(key UInt64, data String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/should_execute_table', '{i}') ORDER BY tuple() PARTITION BY key SETTINGS max_replicated_fetches_network_bandwidth=3505253")
+
+        node2.query("SYSTEM STOP FETCHES should_execute_table")
+
+        for i in range(3):
+            node1.query("INSERT INTO should_execute_table SELECT {}, '{}' FROM numbers(200)".format(i, get_random_string(104857)))
+
+        n1_net = NetThroughput(node1)
+        n2_net = NetThroughput(node2)
+
+        node2.query("SYSTEM START FETCHES should_execute_table")
+
+        for i in range(10):
+            node1.query("INSERT INTO should_execute_table SELECT {}, '{}' FROM numbers(3)".format(i, get_random_string(104857)))
+
+        n2_fetch_speed = []
+        replication_queue_data = []
+        for i in range(10):
+            n1_in, n1_out = n1_net.measure_speed('megabytes')
+            n2_in, n2_out = n2_net.measure_speed('megabytes')
+            fetches_count = node2.query("SELECT count() FROM system.replicated_fetches")
+            if fetches_count == "0\n":
+                break
+
+            print("Fetches count", fetches_count)
+            replication_queue_data.append(node2.query("SELECT count() FROM system.replication_queue WHERE postpone_reason like '%fetches have already throttled%'"))
+            n2_fetch_speed.append(n2_in)
+            time.sleep(0.5)
+
+        node2.query("SYSTEM SYNC REPLICA should_execute_table")
+        assert any(int(f.strip()) != 0 for f in replication_queue_data)
+        assert node2.query("SELECT COUNT() FROM should_execute_table") == "630\n"
+    finally:
+        for node in [node1, node2]:
+            node.query("DROP TABLE IF EXISTS should_execute_table SYNC")
diff --git a/tests/integration/test_replication_credentials/test.py b/tests/integration/test_replication_credentials/test.py
index 4f07d6966a6..9181c515adf 100644
--- a/tests/integration/test_replication_credentials/test.py
+++ b/tests/integration/test_replication_credentials/test.py
@@ -9,7 +9,6 @@ def _fill_nodes(nodes, shard):
         node.query(
             '''
                 CREATE DATABASE test;
-    
                 CREATE TABLE test_table(date Date, id UInt32, dummy UInt32)
                 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test{shard}/replicated', '{replica}', date, id, 8192);
             '''.format(shard=shard, replica=node.name))
@@ -114,6 +113,32 @@ def test_different_credentials(different_credentials_cluster):
     assert node5.query("SELECT id FROM test_table order by id") == '111\n'
     assert node6.query("SELECT id FROM test_table order by id") == '222\n'
 
+    add_old = """
+    <yandex>
+        <interserver_http_port>9009</interserver_http_port>
+        <interserver_http_credentials>
+            <user>admin</user>
+            <password>222</password>
+            <old>
+                <user>root</user>
+                <password>111</password>
+            </old>
+            <old>
+                <user>aaa</user>
+                <password>333</password>
+            </old>
+        </interserver_http_credentials>
+    </yandex>
+    """
+
+    node5.replace_config("/etc/clickhouse-server/config.d/credentials1.xml", add_old)
+
+    node5.query("SYSTEM RELOAD CONFIG")
+    node5.query("INSERT INTO test_table values('2017-06-21', 333, 1)")
+    node6.query("SYSTEM SYNC REPLICA test_table", timeout=10)
+
+    assert node6.query("SELECT id FROM test_table order by id") == '111\n222\n333\n'
+
 
 node7 = cluster.add_instance('node7', main_configs=['configs/remote_servers.xml', 'configs/credentials1.xml'],
                              with_zookeeper=True)
@@ -146,3 +171,23 @@ def test_credentials_and_no_credentials(credentials_and_no_credentials_cluster):
 
     assert node7.query("SELECT id FROM test_table order by id") == '111\n'
     assert node8.query("SELECT id FROM test_table order by id") == '222\n'
+
+    allow_empty = """
+    <yandex>
+        <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>
+    """
+
+    # change state: Flip node7 to mixed auth/non-auth (allow node8)
+    node7.replace_config("/etc/clickhouse-server/config.d/credentials1.xml",
+                         allow_empty)
+
+    node7.query("SYSTEM RELOAD CONFIG")
+    node7.query("insert into test_table values ('2017-06-22', 333, 1)")
+    node8.query("SYSTEM SYNC REPLICA test_table", timeout=10)
+    assert node8.query("SELECT id FROM test_table order by id") == '111\n222\n333\n'
diff --git a/tests/integration/test_s3_cluster/__init__.py b/tests/integration/test_s3_cluster/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_s3_cluster/configs/cluster.xml b/tests/integration/test_s3_cluster/configs/cluster.xml
new file mode 100644
index 00000000000..8334ace15eb
--- /dev/null
+++ b/tests/integration/test_s3_cluster/configs/cluster.xml
@@ -0,0 +1,24 @@
+
+<yandex>
+    <remote_servers>
+    <cluster_simple>
+        <shard>
+            <replica>
+                <host>s0_0_0</host>
+                <port>9000</port>
+            </replica>
+            <replica>
+                <host>s0_0_1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+        <shard>
+            <replica>
+                <host>s0_1_0</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster_simple>
+
+    </remote_servers>
+</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/clickhouse/part1.csv b/tests/integration/test_s3_cluster/data/clickhouse/part1.csv
new file mode 100644
index 00000000000..a44d3ca1ffb
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/clickhouse/part1.csv
@@ -0,0 +1,10 @@
+"fSRH",976027584,"[[(-1.5346513608456012e-204,-2.867937504545497e266),(3.1627675144114637e-231,-2.20343471241604e-54),(-1.866886218651809e-89,-7.695893036366416e100),(8.196307577166986e-169,-8.203793887684096e-263),(-1.6150328830402252e-215,8.531116551449711e-296),(4.3378407855931477e92,1.1313645428723989e117),(-4.238081208165573e137,-8.969951719788361e67)],[(-3.409639554701108e169,-7.277093176871153e-254),(1.1466207153308928e-226,3.429893348531029e96),(6.451302850199177e-189,-7.52379443153242e125),(-1.7132078539493614e-127,-2.3177814806867505e241),(1.4996520594989919e-257,4.271017883966942e128)],[(65460976657479156000,1.7055814145588595e253),(-1.921491101580189e154,3.2912740465446566e-286),(0.0008437955075350972,-5.143493717005472e-107),(8.637208599142187e-150,7.825076274945548e136),(1.8077733932468565e-159,5.51061479974026e-77),(1.300406236793709e-260,10669142.497111017),(-1.731981751951159e91,-1.270795062098902e102)],[(3.336706342781395e-7,-1.1919528866481513e266)]]"
+"sX6>",733011552,"[[(-3.737863336077909e-44,3.066510481088993e-161),(-1.0047259170558555e-31,8.066145272086467e-274)],[(1.2261835328136691e-58,-6.154561379350395e258),(8.26019994651558e35,-6.736984599062694e-19),(-1.4143671344485664e-238,-1.220003479858045e203),(2.466089772925698e-207,1.0025476904532926e-242),(-6.3786667153054354e240,-7.010834902137467e-103),(-6.766918514324285e-263,7.404639608483947e188),(2.753493977757937e126,-4.089565842001999e-152)],[(4.339873790493155e239,-5.022554811588342e24),(-1.7712390083519473e-66,1.3290563068463308e112),(3.3648764781548893e233,1.1123394188044336e112),(-5.415278137684864e195,5.590597851016202e-270),(-2.1032310903543943e99,-2.2335799924679948e-184)]]"
+"",2396526460,"[[(1.9925796792641788e-261,1.647618305107044e158),(3.014593666207223e-222,-9.016473078578002e-20),(-1.5307802021477097e-230,-7.867078587209265e-243),(-7.330317098800564e295,1.7496539408601967e-281)],[(2.2816938730052074e98,-3.3089122320442997e-136),(-4.930983789361344e-263,-6.526758521792829e59),(-2.6482873886835413e34,-4.1985691142515947e83),(1.5496810029349365e238,-4.790553105593492e71),(-7.597436233325566e83,-1.3791763752378415e137),(-1.917321980700588e-307,-1.5913257477581824e62)]]"
+"=@ep",3618088392,"[[(-2.2303235811290024e-306,8.64070367587338e-13),(-7.403012423264767e-129,-1.0825508572345856e-147),(-3.6080301450167e286,1.7302718548299961e285),(-1.3839239794870825e-156,4.255424291564323e107),(2.3191305762555e-33,-2.873899421579949e-145),(7.237414513124649e-159,-4.926574547865783e178),(4.251831312243431e-199,1.2164714479391436e201)],[(-5.114074387943793e242,2.0119340496886292e295),(-3.3663670765548e-262,-6.1992631068472835e221),(1.1539386993255106e-261,1.582903697171063e-33),(-6.1914577817088e118,-1.0401495621681123e145)],[],[(-5.9815907467493136e82,4.369047439375412e219),(-4.485368440431237e89,-3.633023372434946e-59),(-2.087497331251707e-180,1.0524018118646965e257)],[(-1.2636503461000215e-228,-4.8426877075223456e204),(2.74943107551342e281,-7.453097760262003e-14)]]"
+"",3467776823,"[]"
+"b'zQ",484159052,"[[(3.041838095219909e276,-6.956822159518612e-87)],[(6.636906358770296e-97,1.0531865724169307e-214)],[(-8.429249069245283e-243,-2.134779842898037e243)],[(-0.4657586598569572,2.799768548127799e187),(-5.961335445789657e-129,2.560331789344886e293),(-3.139409694983184e45,2.8011384557268085e-47)]]"
+"6xGw",4126129912,"[]"
+"Q",3109335413,"[[(-2.8435266267772945e39,9.548278488724291e26),(-1.1682790407223344e46,-3.925561182768867e-266),(2.8381633655721614e-202,-3.472921303086527e40),(3.3968328275944204e-150,-2.2188876184777275e-69),(-1.2612795000783405e-88,-1.2942793285205966e-49),(1.3678466236967012e179,1.721664680964459e97),(-1.1020844667744628e198,-3.403142062758506e-47)],[],[(1.343149099058239e-279,9.397894929770352e-132),(-5.280854317597215e250,9.862550191577643e-292),(-7.11468799151533e-58,7.510011657942604e96),(1.183774454157175e-288,-1.5697197095936546e272),(-3.727289017361602e120,2.422831380775067e-107),(1.4345094301262986e-177,2.4990983297605437e-91)],[(9.195226893854516e169,6.546374357272709e-236),(2.320311199531441e-126,2.2257031285964243e-185),(3.351868475505779e-184,1.84394695526876e88)],[(1.6290814396647987e-112,-3.589542711073253e38),(4.0060174859833907e-261,-1.9900431208726192e-296),(2.047468933030435e56,8.483912759156179e-57),(3.1165727272872075e191,-1.5487136748040008e-156),(0.43564020198461034,4.618165048931035e-244),(-7.674951896752824e-214,1.1652522629091777e-105),(4.838653901829244e-89,5.3085904574780206e169)],[(1.8286703553352283e-246,2.0403170465657044e255),(2.040810692623279e267,4.3956975402250484e-8),(2.4101343663018673e131,-8.672394158504762e167),(3.092080945239809e-219,-3.775474693770226e293),(-1.527991241079512e-15,-1.2603969180963007e226),(9.17470637459212e-56,1.6021090930395906e-133),(7.877647227721046e58,3.2592118033868903e-108)],[(1.4334765313272463e170,2.6971234798957105e-50)]]"
+"^ip",1015254922,"[[(-2.227414144223298e-63,1.2391785738638914e276),(1.2668491759136862e207,2.5656762953078853e-67),(2.385410876813441e-268,1.451107969531624e25),(-5.475956161647574e131,2239495689376746),(1.5591286361054593e180,3.672868971445151e117)]]"
+"5N]",1720727300,"[[(-2.0670321228319122e-258,-2.6893477429616666e-32),(-2.2424105705209414e225,3.547832127050775e25),(4.452916756606404e-121,-3.71114618421911e156),(-1.966961937965055e-110,3.1217044497868816e227),(20636923519704216,1.3500210618276638e30),(3.3195926701816527e-276,1.5557140338374535e234)],[]]"
diff --git a/tests/integration/test_s3_cluster/data/clickhouse/part123.csv b/tests/integration/test_s3_cluster/data/clickhouse/part123.csv
new file mode 100644
index 00000000000..1ca3353b741
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/clickhouse/part123.csv
@@ -0,0 +1,3 @@
+"b'zQ",2960084897,"[[(3.014593666207223e-222,-7.277093176871153e-254),(-1.5307802021477097e-230,3.429893348531029e96),(-7.330317098800564e295,-7.52379443153242e125),(2.2816938730052074e98,-2.3177814806867505e241),(-4.930983789361344e-263,4.271017883966942e128)],[(-2.6482873886835413e34,1.7055814145588595e253),(1.5496810029349365e238,3.2912740465446566e-286),(-7.597436233325566e83,-5.143493717005472e-107),(-1.917321980700588e-307,7.825076274945548e136)],[(-2.2303235811290024e-306,5.51061479974026e-77),(-7.403012423264767e-129,10669142.497111017),(-3.6080301450167e286,-1.270795062098902e102),(-1.3839239794870825e-156,-1.1919528866481513e266),(2.3191305762555e-33,3.066510481088993e-161),(7.237414513124649e-159,8.066145272086467e-274)],[(4.251831312243431e-199,-6.154561379350395e258),(-5.114074387943793e242,-6.736984599062694e-19),(-3.3663670765548e-262,-1.220003479858045e203),(1.1539386993255106e-261,1.0025476904532926e-242),(-6.1914577817088e118,-7.010834902137467e-103),(-5.9815907467493136e82,7.404639608483947e188),(-4.485368440431237e89,-4.089565842001999e-152)]]"
+"6xGw",2107128550,"[[(-2.087497331251707e-180,-5.022554811588342e24),(-1.2636503461000215e-228,1.3290563068463308e112),(2.74943107551342e281,1.1123394188044336e112),(3.041838095219909e276,5.590597851016202e-270)],[],[(6.636906358770296e-97,-2.2335799924679948e-184),(-8.429249069245283e-243,1.647618305107044e158),(-0.4657586598569572,-9.016473078578002e-20)]]"
+"Q",2713167232,"[[(-5.961335445789657e-129,-7.867078587209265e-243),(-3.139409694983184e45,1.7496539408601967e-281)],[(-2.8435266267772945e39,-3.3089122320442997e-136)]]"
diff --git a/tests/integration/test_s3_cluster/data/database/part2.csv b/tests/integration/test_s3_cluster/data/database/part2.csv
new file mode 100644
index 00000000000..572676e47c6
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/database/part2.csv
@@ -0,0 +1,5 @@
+"~m`",820408404,"[]"
+"~E",3621610983,"[[(1.183772215004139e-238,-1.282774073199881e211),(1.6787305112393978e-46,7.500499989257719e25),(-2.458759475104641e-260,3.1724599388651864e-171),(-2.0163203163062471e118,-4.677226438945462e-162),(-5.52491070012707e-135,7.051780441780731e-236)]]"
+"~1",1715555780,"[[(-6.847404226505131e-267,5.939552045362479e-272),(8.02275075985457e-160,8.369250185716419e-104),(-1.193940928527857e-258,-1.132580458849774e39)],[(1.1866087552639048e253,3.104988412734545e57),(-3.37278669639914e84,-2.387628643569968e287),(-2.452136349495753e73,3.194309776006896e-204),(-1001997440265471100,3.482122851077378e-182)],[],[(-5.754682082202988e-20,6.598766936241908e156)],[(8.386764833095757e300,1.2049637765877942e229),(3.136243074210055e53,5.764669663844127e-100),(-4.190632347661851e195,-5.053553379163823e302),(2.0805194731736336e-19,-1.0849036699112485e-271),(1.1292361211411365e227,-8.767824448179629e229),(-3.6938137156625264e-19,-5.387931698392423e109),(-1.2240482125885677e189,-1.5631467861525635e-103)],[(-2.3917431782202442e138,7.817228281030191e-242),(-1.1462343232899826e279,-1.971215065504208e-225),(5.4316119855340265e-62,3.761081156597423e-60),(8.111852137718836e306,8.115485489580134e-208)],[]]"
+"~%]",1606443384,"[[]]"
+"}or",726681547,"[]"
\ No newline at end of file
diff --git a/tests/integration/test_s3_cluster/data/database/partition675.csv b/tests/integration/test_s3_cluster/data/database/partition675.csv
new file mode 100644
index 00000000000..e8496680368
--- /dev/null
+++ b/tests/integration/test_s3_cluster/data/database/partition675.csv
@@ -0,0 +1,7 @@
+"kvUES",4281162618,"[[(2.4538308454074088e303,1.2209370543175666e178),(1.4564007891121754e-186,2.340773478952682e-273),(-1.01791181533976e165,-3.9617466227377253e248)]]"
+"Gu",4280623186,"[[(-1.623487579335014e38,-1.0633405021023563e225),(-4.373688812751571e180,2.5511550357717127e138)]]"
+"J_u1",4277430503,"[[(2.981826196369429e-294,-6.059236590410922e236),(8.502045137575854e-296,3.0210403188125657e-91),(-9.370591842861745e175,4.150870185764185e129),(1.011801592194125e275,-9.236010982686472e266),(-3.1830638196303316e277,2.417706446545472e-105),(-1.4369143023804266e-201,4.7529126795899655e238)],[(-2.118789593804697e186,-1.8760231612433755e-280),(2.5982563179976053e200,-1.4683025762313524e-40)],[(-1.873397623255704e-240,1.4363190147949886e-283),(-1.5760337746177136e153,1.5272278536086246e-34),(-8.117473317695919e155,2.4375370926733504e150),(-1.179230972881795e99,1.7693459774706515e-259),(2.2102106250558424e-40,4.734162675762768e-56),(6.058833110550111e-8,8.892471775821198e164),(-1.8208740799996599e59,6.446958261080721e178)]]"
+"s:\",4265055390,"[[(-3.291651377214531e-167,3.9198636942402856e185),(2.4897781692770126e176,2.579309759138358e188),(4.653945381397663e205,3.216314556208208e158),(-5.3373279440714224e-39,2.404386813826413e212),(-1.4217294382527138e307,8.874978978402512e-173)],[(8.527603121149904e-58,-5.0520795335878225e88),(-0.00022870878520550814,-3.2334214176860943e-68),(-6.97683613433404e304,-2.1573757788072144e-82),(-1.1394163455875937e36,-3.817990182461824e271),(2.4099027412881423e-209,8.542179392011098e-156),(3.2610511540394803e174,1.1692631657517616e-20)],[(3.625474290538107e261,-5.359205062039837e-193),(-3.574126569378072e-112,-5.421804160994412e265),(-4.873653931207849e-76,3219678918284.317),(-7.030770825898911e-57,1.4647389742249787e-274),(-4.4882439220492357e-203,6.569338333730439e-38)],[(-2.2418056002374865e-136,5.113251922954469e-16),(2.5156744571032497e297,-3.0536957683846124e-192)],[(1.861112291954516e306,-1.8160882143331256e129),(1.982573454900027e290,-2.451412311394593e170)],[(-2.8292230178712157e-18,1.2570198161962067e216),(6.24832495972797e-164,-2.0770908334330718e-273)],[(980143647.1858811,1.2738714961511727e106),(6.516450532397311e-184,4.088688742052062e31),(-2.246311532913914e269,-7.418103885850518e-179),(1.2222973942835046e-289,2.750544834553288e-46),(9.503169349701076e159,-1.355457053256579e215)]]"
+":hzO",4263726959,"[[(-2.553206398375626e-90,1.6536977728640226e199),(1.5630078027143848e-36,2.805242683101373e-211),(2.2573933085983554e-92,3.450501333524858e292),(-1.215900901292646e-275,-3.860558658606121e272),(6.65716072773856e-145,2.5359010031217893e217)],[(-1.3308039625779135e308,1.7464622720773261e258),(-3.2986890093446374e179,3.9038871583175653e-69),(-4.3594764087383885e-95,4.229921973278908e-123),(-5.455694205415656e137,3.597894902167716e108),(1.2480860990110662e-29,-1.4873488392480292e-185),(7.563210285835444e55,-5624068447.488605)],[(3.9517937289943195e181,-3.2799189227094424e-68),(8.906762198487649e-167,3.952452177941537e-159)]]"
+"a",4258301804,"[[(5.827965576703262e-281,2.2523852665173977e90)],[(-6.837604072282348e-97,8.125864241406046e-61)],[(-2.3047912084435663e53,-8.814499720685194e36),(1.2072558137199047e-79,1.2096862541827071e142),(2.2000026293774143e275,-3.2571689055108606e-199),(1.1822278574921316e134,2.9571188365006754e-86),(1.0448954272555034e-169,1.2182183489600953e-60)],[(-3.1366540817730525e89,9.327128058982966e-306),(6.588968210928936e73,-11533531378.938957),(-2.6715943555840563e44,-4.557428011172859e224),(-3.8334913754415923e285,-4.748721454106074e-173),(-1.6912052107425128e275,-4.789382438422238e-219),(1.8538365229016863e151,-3.5698172075468775e-37)],[(-2.1963131282037294e49,-5.53604352524995e-296)],[(-8.834414834987965e167,1.3186354307320576e247),(2.109209547987338e298,1.2191009105107557e-32),(-3.896880410603213e-92,-3.4589588698231044e-121),(-3.252529090888335e138,-7.862741341454407e204)],[(-9.673078095447289e-207,8.839303128607278e123),(2.6043620378793597e-244,-6.898328199987363e-308),(-2.5921142292355475e-54,1.0352159149517285e-143)]]"
+"S+",4257734123,"[[(1.5714269203495863e245,-15651321.549208183),(-3.7292056272445236e-254,-4.556927533596056e-234),(-3.0309414401442555e-203,-3.84393827531526e-12)],[(1.7718777510571518e219,3.972086323144777e139),(1.5723805735454373e-67,-3.805243648123396e226),(154531069271292800000,1.1384408025183933e-285),(-2.009892367470994e-247,2.0325742976832167e81)],[(1.2145787097670788e55,-5.0579298233321666e-30),(5.05577441452021e-182,-2.968914705509665e-175),(-1.702335524921919e67,-2.852552828587631e-226),(-2.7664498327826963e-99,-1.2967072085088717e-305),(7.68881162387673e-68,-1.2506915095983359e-142),(-7.60308693295946e-40,5.414853590549086e218)],[(8.595602987813848e226,-3.9708286611967497e-206),(-5.80352787694746e-52,5.610493934761672e236),(2.1336999375861025e217,-5.431988994371099e-154),(-6.2758614367782974e29,-8.359901046980544e-55)],[(1.6910790690897504e54,9.798739710823911e197),(-6.530270107036228e-284,8.758552462406328e-302),(2.931625032390877e-118,2.8793800873550273e83),(-3.293986884112906e-88,11877326093331202),(0.0008071321465157103,1.0720860516457485e-298)]]"
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
new file mode 100644
index 00000000000..f60e6e6862f
--- /dev/null
+++ b/tests/integration/test_s3_cluster/test.py
@@ -0,0 +1,129 @@
+import logging
+import os
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+logging.getLogger().setLevel(logging.INFO)
+logging.getLogger().addHandler(logging.StreamHandler())
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+S3_DATA = ['data/clickhouse/part1.csv', 'data/clickhouse/part123.csv', 'data/database/part2.csv', 'data/database/partition675.csv']
+
+def create_buckets_s3(cluster):
+    minio = cluster.minio_client
+    for file in S3_DATA:
+        minio.fput_object(bucket_name=cluster.minio_bucket, object_name=file, file_path=os.path.join(SCRIPT_DIR, file))
+    for obj in minio.list_objects(cluster.minio_bucket, recursive=True):
+        print(obj.object_name)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance('s0_0_0', main_configs=["configs/cluster.xml"], with_minio=True)
+        cluster.add_instance('s0_0_1', main_configs=["configs/cluster.xml"])
+        cluster.add_instance('s0_1_0', main_configs=["configs/cluster.xml"])
+            
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        create_buckets_s3(cluster)
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_select_all(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    pure_s3 = node.query("""
+    SELECT * from s3(
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+    ORDER BY (name, value, polygon)""")
+    # print(pure_s3)
+    s3_distibuted = node.query("""
+    SELECT * from s3Cluster(
+        'cluster_simple', 
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)""")
+    # print(s3_distibuted)
+
+    assert TSV(pure_s3) == TSV(s3_distibuted)
+
+
+def test_count(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    pure_s3 = node.query("""
+    SELECT count(*) from s3(
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
+    # print(pure_s3)
+    s3_distibuted = node.query("""
+    SELECT count(*) from s3Cluster(
+        'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV',
+        'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
+    # print(s3_distibuted)
+
+    assert TSV(pure_s3) == TSV(s3_distibuted)
+
+
+def test_union_all(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    pure_s3 = node.query("""
+    SELECT * FROM
+    (
+        SELECT * from s3(
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 
+            'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 
+        UNION ALL
+        SELECT * from s3(
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 
+            'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    )
+    ORDER BY (name, value, polygon)
+    """)
+    # print(pure_s3)
+    s3_distibuted = node.query("""
+    SELECT * FROM
+    (
+        SELECT * from s3Cluster(
+            'cluster_simple', 
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+        UNION ALL
+        SELECT * from s3Cluster(
+            'cluster_simple', 
+            'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 
+            'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    )
+    ORDER BY (name, value, polygon)
+    """)
+    # print(s3_distibuted)
+
+    assert TSV(pure_s3) == TSV(s3_distibuted)
+
+
+def test_wrong_cluster(started_cluster):
+    node = started_cluster.instances['s0_0_0']
+    error = node.query_and_get_error("""
+    SELECT count(*) from s3Cluster(
+        'non_existent_cluster',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
+    UNION ALL
+    SELECT count(*) from s3Cluster(
+        'non_existent_cluster',
+        'http://minio1:9001/root/data/{clickhouse,database}/*', 
+        'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
+    
+    assert "not found" in error
\ No newline at end of file
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 88eb49d9f17..db639cabb63 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
@@ -8,6 +8,18 @@
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>minio123</secret_access_key>
             </s31>
+            <s31_again>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </s31_again>
+            <s32>
+                <type>s3</type>
+                <endpoint>http://minio1:9001/root/data2/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+            </s32>
         </disks>
         <policies>
             <s3>
@@ -26,12 +38,33 @@
                         <disk>s31</disk>
                     </external>
                 </volumes>
+                <move_factor>0.0</move_factor>
             </hybrid>
+            <tiered>
+                <volumes>
+                    <main>
+                        <disk>s31</disk>
+                    </main>
+                    <external>
+                        <disk>s32</disk>
+                    </external>
+                </volumes>
+            </tiered>
+            <tiered_copy>
+                <volumes>
+                    <main>
+                        <disk>s31</disk>
+                    </main>
+                    <external>
+                        <disk>s31_again</disk>
+                    </external>
+                </volumes>
+            </tiered_copy>
         </policies>
     </storage_configuration>
 
     <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+        <min_bytes_for_wide_part>1024</min_bytes_for_wide_part>
         <old_parts_lifetime>1</old_parts_lifetime>
         <allow_s3_zero_copy_replication>1</allow_s3_zero_copy_replication>
     </merge_tree>
diff --git a/tests/integration/test_s3_zero_copy_replication/test.py b/tests/integration/test_s3_zero_copy_replication/test.py
index 5bc30ab1d6b..d9f7cca4a3a 100644
--- a/tests/integration/test_s3_zero_copy_replication/test.py
+++ b/tests/integration/test_s3_zero_copy_replication/test.py
@@ -1,3 +1,4 @@
+import datetime
 import logging
 import time
 
@@ -27,15 +28,24 @@ def cluster():
         cluster.shutdown()
 
 
-def get_large_objects_count(cluster, size=100):
+def get_large_objects_count(cluster, size=100, folder='data'):
     minio = cluster.minio_client
     counter = 0
-    for obj in minio.list_objects(cluster.minio_bucket, 'data/'):
+    for obj in minio.list_objects(cluster.minio_bucket, '{}/'.format(folder)):
         if obj.size >= size:
             counter = counter + 1
     return counter
 
 
+def wait_for_large_objects_count(cluster, expected, size=100, timeout=30):
+    while timeout > 0:
+        if get_large_objects_count(cluster, size=size) == expected:
+            return
+        timeout -= 1
+        time.sleep(1)
+    assert get_large_objects_count(cluster, size=size) == expected
+
+
 @pytest.mark.parametrize(
     "policy", ["s3"]
 )
@@ -54,7 +64,7 @@ def test_s3_zero_copy_replication(cluster, policy):
     )
 
     node1.query("INSERT INTO s3_test VALUES (0,'data'),(1,'data')")
-    time.sleep(1)
+    node2.query("SYSTEM SYNC REPLICA s3_test")
     assert node1.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data')"
     assert node2.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data')"
 
@@ -62,28 +72,21 @@ def test_s3_zero_copy_replication(cluster, policy):
     assert get_large_objects_count(cluster) == 1
 
     node2.query("INSERT INTO s3_test VALUES (2,'data'),(3,'data')")
-    time.sleep(1)
+    node1.query("SYSTEM SYNC REPLICA s3_test")
+
     assert node2.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data'),(2,'data'),(3,'data')"
     assert node1.query("SELECT * FROM s3_test order by id FORMAT Values") == "(0,'data'),(1,'data'),(2,'data'),(3,'data')"
 
     # Based on version 20.x - two parts
-    assert get_large_objects_count(cluster) == 2
+    wait_for_large_objects_count(cluster, 2)
 
-    node1.query("OPTIMIZE TABLE s3_test")
-
-    time.sleep(1)
+    node1.query("OPTIMIZE TABLE s3_test FINAL")
 
     # Based on version 20.x - after merge, two old parts and one merged
-    assert get_large_objects_count(cluster) == 3
+    wait_for_large_objects_count(cluster, 3)
 
     # Based on version 20.x - after cleanup - only one merged part
-    countdown = 60
-    while countdown > 0:
-        if get_large_objects_count(cluster) == 1:
-            break
-        time.sleep(1)
-        countdown -= 1
-    assert get_large_objects_count(cluster) == 1
+    wait_for_large_objects_count(cluster, 1, timeout=60)
 
     node1.query("DROP TABLE IF EXISTS s3_test NO DELAY")
     node2.query("DROP TABLE IF EXISTS s3_test NO DELAY")
@@ -104,8 +107,7 @@ def test_s3_zero_copy_on_hybrid_storage(cluster):
     )
 
     node1.query("INSERT INTO hybrid_test VALUES (0,'data'),(1,'data')")
-
-    time.sleep(1)
+    node2.query("SYSTEM SYNC REPLICA hybrid_test")
 
     assert node1.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
     assert node2.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
@@ -119,7 +121,7 @@ def test_s3_zero_copy_on_hybrid_storage(cluster):
     assert node2.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','default')"
 
     # Total objects in S3
-    s3_objects = get_large_objects_count(cluster, 0)
+    s3_objects = get_large_objects_count(cluster, size=0)
 
     node2.query("ALTER TABLE hybrid_test MOVE PARTITION ID 'all' TO DISK 's31'")
 
@@ -127,10 +129,122 @@ def test_s3_zero_copy_on_hybrid_storage(cluster):
     assert node2.query("SELECT partition_id,disk_name FROM system.parts WHERE table='hybrid_test' FORMAT Values") == "('all','s31')"
 
     # Check that after moving partition on node2 no new obects on s3
-    assert get_large_objects_count(cluster, 0) == s3_objects
+    wait_for_large_objects_count(cluster, s3_objects, size=0)
 
     assert node1.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
     assert node2.query("SELECT * FROM hybrid_test ORDER BY id FORMAT Values") == "(0,'data'),(1,'data')"
 
     node1.query("DROP TABLE IF EXISTS hybrid_test NO DELAY")
     node2.query("DROP TABLE IF EXISTS hybrid_test NO DELAY")
+
+
+def insert_data_time(node, table, number_of_mb, time, start=0):
+    values = ','.join(f"({x},{time})" for x in range(start, int((1024 * 1024 * number_of_mb) / 8) + start + 1))
+    node.query(f"INSERT INTO {table} VALUES {values}")
+
+
+def insert_large_data(node, table):
+    tm = time.mktime((datetime.date.today() - datetime.timedelta(days=7)).timetuple())
+    insert_data_time(node, table, 1, tm, 0)
+    tm = time.mktime((datetime.date.today() - datetime.timedelta(days=3)).timetuple())
+    insert_data_time(node, table, 1, tm, 1024*1024)
+    tm = time.mktime(datetime.date.today().timetuple())
+    insert_data_time(node, table, 10, tm, 1024*1024*2)
+
+
+@pytest.mark.parametrize(
+    ("storage_policy", "large_data", "iterations"),
+    [
+        ("tiered", False, 10),
+        ("tiered_copy", False, 10),
+        ("tiered", True, 3),
+        ("tiered_copy", True, 3),
+    ]
+)
+def test_s3_zero_copy_with_ttl_move(cluster, storage_policy, large_data, iterations):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node2"]
+
+    node1.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
+    node2.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
+
+    for i in range(iterations):
+        node1.query(
+            """
+            CREATE TABLE ttl_move_test ON CLUSTER test_cluster (d UInt64, d1 DateTime)
+            ENGINE=ReplicatedMergeTree('/clickhouse/tables/ttl_move_test', '{}')
+            ORDER BY d
+            TTL d1 + INTERVAL 2 DAY TO VOLUME 'external'
+            SETTINGS storage_policy='{}'
+            """
+                .format('{replica}', storage_policy)
+        )
+
+        if large_data:
+            insert_large_data(node1, 'ttl_move_test')
+        else:
+            node1.query("INSERT INTO ttl_move_test VALUES (10, now() - INTERVAL 3 DAY)")
+            node1.query("INSERT INTO ttl_move_test VALUES (11, now() - INTERVAL 1 DAY)")
+
+        node1.query("OPTIMIZE TABLE ttl_move_test FINAL")
+        node2.query("SYSTEM SYNC REPLICA ttl_move_test")
+
+        if large_data:
+            assert node1.query("SELECT count() FROM ttl_move_test FORMAT Values") == "(1572867)"
+            assert node2.query("SELECT count() FROM ttl_move_test FORMAT Values") == "(1572867)"
+        else:
+            assert node1.query("SELECT count() FROM ttl_move_test FORMAT Values") == "(2)"
+            assert node2.query("SELECT count() FROM ttl_move_test FORMAT Values") == "(2)"
+            assert node1.query("SELECT d FROM ttl_move_test ORDER BY d FORMAT Values") == "(10),(11)"
+            assert node2.query("SELECT d FROM ttl_move_test ORDER BY d FORMAT Values") == "(10),(11)"
+
+        node1.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
+        node2.query("DROP TABLE IF EXISTS ttl_move_test NO DELAY")
+
+
+@pytest.mark.parametrize(
+    ("large_data", "iterations"),
+    [
+        (False, 10),
+        (True, 3),
+    ]
+)
+def test_s3_zero_copy_with_ttl_delete(cluster, large_data, iterations):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node2"]
+
+    node1.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
+    node2.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
+
+    for i in range(iterations):
+        node1.query(
+            """
+            CREATE TABLE ttl_delete_test ON CLUSTER test_cluster (d UInt64, d1 DateTime)
+            ENGINE=ReplicatedMergeTree('/clickhouse/tables/ttl_delete_test', '{}')
+            ORDER BY d
+            TTL d1 + INTERVAL 2 DAY
+            SETTINGS storage_policy='tiered'
+            """
+                .format('{replica}')
+        )
+
+        if large_data:
+            insert_large_data(node1, 'ttl_delete_test')
+        else:
+            node1.query("INSERT INTO ttl_delete_test VALUES (10, now() - INTERVAL 3 DAY)")
+            node1.query("INSERT INTO ttl_delete_test VALUES (11, now() - INTERVAL 1 DAY)")
+
+        node1.query("OPTIMIZE TABLE ttl_delete_test FINAL")
+        node2.query("SYSTEM SYNC REPLICA ttl_delete_test")
+
+        if large_data:
+            assert node1.query("SELECT count() FROM ttl_delete_test FORMAT Values") == "(1310721)"
+            assert node2.query("SELECT count() FROM ttl_delete_test FORMAT Values") == "(1310721)"
+        else:
+            assert node1.query("SELECT count() FROM ttl_delete_test FORMAT Values") == "(1)"
+            assert node2.query("SELECT count() FROM ttl_delete_test FORMAT Values") == "(1)"
+            assert node1.query("SELECT d FROM ttl_delete_test ORDER BY d FORMAT Values") == "(11)"
+            assert node2.query("SELECT d FROM ttl_delete_test ORDER BY d FORMAT Values") == "(11)"
+
+        node1.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
+        node2.query("DROP TABLE IF EXISTS ttl_delete_test NO DELAY")
diff --git a/tests/integration/test_secure_socket/test.py b/tests/integration/test_secure_socket/test.py
index 0ca6e6a6e6b..65c789f9d02 100644
--- a/tests/integration/test_secure_socket/test.py
+++ b/tests/integration/test_secure_socket/test.py
@@ -64,7 +64,7 @@ def test(started_cluster):
     assert end - start < 10
 
     start = time.time()
-    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=0;')
+    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=0, async_socket_for_remote=1;')
     end = time.time()
 
     assert end - start < 10
@@ -73,7 +73,7 @@ def test(started_cluster):
     assert error.find('DB::ReadBufferFromPocoSocket::nextImpl()') == -1
 
     start = time.time()
-    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5;')
+    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=1, async_socket_for_remote=1;')
     end = time.time()
 
     assert end - start < 10
diff --git a/tests/integration/test_select_access_rights/test.py b/tests/integration/test_select_access_rights/test.py
index 14eae1700d0..213df529ef7 100644
--- a/tests/integration/test_select_access_rights/test.py
+++ b/tests/integration/test_select_access_rights/test.py
@@ -96,7 +96,7 @@ def test_alias_columns():
 
     select_query = "SELECT s FROM table1"
     assert "it's necessary to have grant SELECT(s) ON default.table1" in instance.query_and_get_error(select_query, user = 'A')
-    
+
     instance.query("GRANT SELECT(s) ON default.table1 TO A")
     assert instance.query(select_query, user = 'A') == ""
 
diff --git a/tests/integration/test_send_crash_reports/test.py b/tests/integration/test_send_crash_reports/test.py
index 65d49637b13..ab52879c7c3 100644
--- a/tests/integration/test_send_crash_reports/test.py
+++ b/tests/integration/test_send_crash_reports/test.py
@@ -23,8 +23,8 @@ def started_node():
         cluster.shutdown()
 
 
-def test_send_segfault(started_node, ):
-    if started_node.is_built_with_thread_sanitizer():
+def test_send_segfault(started_node):
+    if started_node.is_built_with_thread_sanitizer() or started_node.is_built_with_memory_sanitizer():
         pytest.skip("doesn't fit in timeouts for stacktrace generation")
 
     started_node.copy_file_to_container(os.path.join(SCRIPT_DIR, "fake_sentry_server.py"), "/fake_sentry_server.py")
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index a6c8b7e1ee9..a0dc342e910 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -201,6 +201,24 @@ def test_write_gzip_storage(started_cluster):
     assert started_cluster.hdfs_api.read_gzip_data("/gzip_storage") == "1\tMark\t72.53\n"
     assert node1.query("select * from GZIPHDFSStorage") == "1\tMark\t72.53\n"
 
+
+def test_virtual_columns(started_cluster):
+    node1.query("create table virtual_cols (id UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/file*', 'TSV')")
+    started_cluster.hdfs_api.write_data("/file1", "1\n")
+    started_cluster.hdfs_api.write_data("/file2", "2\n")
+    started_cluster.hdfs_api.write_data("/file3", "3\n")
+    expected = "1\tfile1\thdfs://hdfs1:9000//file1\n2\tfile2\thdfs://hdfs1:9000//file2\n3\tfile3\thdfs://hdfs1:9000//file3\n"
+    assert node1.query("select id, _file as file_name, _path as file_path from virtual_cols order by id") == expected
+
+    
+def test_read_files_with_spaces(started_cluster):
+    started_cluster.hdfs_api.write_data("/test test test 1.txt", "1\n")
+    started_cluster.hdfs_api.write_data("/test test test 2.txt", "2\n")
+    started_cluster.hdfs_api.write_data("/test test test 3.txt", "3\n")
+    node1.query("create table test (id UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/test*', 'TSV')")
+    assert node1.query("select * from test order by id") == "1\n2\n3\n"
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index 9b2f54a49a0..eca0f254d8e 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -6,6 +6,7 @@ import subprocess
 import threading
 import time
 import io
+import string
 
 import avro.schema
 import avro.io
@@ -573,39 +574,13 @@ def test_kafka_formats(kafka_cluster):
             ],
             'extra_settings': ", kafka_schema='test:TestRecordStruct'"
         },
-
-        # 'Parquet' : {
-        # not working at all with Kafka: DB::Exception: IOError: Invalid Parquet file size is 0 bytes
-        # /contrib/libcxx/include/exception:129: std::exception::capture() @ 0x15c33fe8 in /usr/bin/clickhouse
-        # /contrib/libcxx/include/exception:109: std::exception::exception() @ 0x15c33fb5 in /usr/bin/clickhouse
-        # /contrib/poco/Foundation/src/Exception.cpp:27: Poco::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x21877833 in /usr/bin/clickhouse
-        # /src/Common/Exception.cpp:37: DB::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x15c2d2a3 in /usr/bin/clickhouse
-        # /src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp:70: DB::ParquetBlockInputFormat::prepareReader() @ 0x1df2b0c2 in /usr/bin/clickhouse
-        # /src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp:36: DB::ParquetBlockInputFormat::ParquetBlockInputFormat(DB::ReadBuffer&, DB::Block) @ 0x1df2af8b in /usr/bin/clickhouse
-        # /contrib/libcxx/include/memory:2214: std::__1::__compressed_pair_elem<DB::ParquetBlockInputFormat, 1, false>::__compressed_pair_elem<DB::ReadBuffer&, DB::Block const&, 0ul, 1ul>(std::__1::piecewise_construct_t, std::__1::tuple<DB::ReadBuffer&, DB::Block const&>, std::__1::__tuple_indices<0ul, 1ul>) @ 0x1df2dc88 in /usr/bin/clickhouse
-        # /contrib/libcxx/include/memory:2299: std::__1::__compressed_pair<std::__1::allocator<DB::ParquetBlockInputFormat>, DB::ParquetBlockInputFormat>::__compressed_pair<std::__1::allocator<DB::ParquetBlockInputFormat>&, DB::ReadBuffer&, DB::Block const&>(std::__1::piecewise_construct_t, std::__1::tuple<std::__1::allocator<DB::ParquetBlockInputFormat>&>, std::__1::tuple<DB::ReadBuffer&, DB::Block const&>) @ 0x1df2d9c8 in /usr/bin/clickhouse
-        # /contrib/libcxx/include/memory:3569: std::__1::__shared_ptr_emplace<DB::ParquetBlockInputFormat, std::__1::allocator<DB::ParquetBlockInputFormat> >::__shared_ptr_emplace<DB::ReadBuffer&, DB::Block const&>(std::__1::allocator<DB::ParquetBlockInputFormat>, DB::ReadBuffer&, DB::Block const&) @ 0x1df2d687 in /usr/bin/clickhouse
-        # /contrib/libcxx/include/memory:4400: std::__1::enable_if<!(is_array<DB::ParquetBlockInputFormat>::value), std::__1::shared_ptr<DB::ParquetBlockInputFormat> >::type std::__1::make_shared<DB::ParquetBlockInputFormat, DB::ReadBuffer&, DB::Block const&>(DB::ReadBuffer&, DB::Block const&) @ 0x1df2d455 in /usr/bin/clickhouse
-        # /src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp:95: DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) const @ 0x1df2cec7 in /usr/bin/clickhouse
-        # /contrib/libcxx/include/type_traits:3519: decltype(std::__1::forward<DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0&>(fp)(std::__1::forward<DB::ReadBuffer&>(fp0), std::__1::forward<DB::Block const&>(fp0), std::__1::forward<DB::RowInputFormatParams const&>(fp0), std::__1::forward<DB::FormatSettings const&>(fp0))) std::__1::__invoke<DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&>(DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1df2ce6a in /usr/bin/clickhouse
-        # /contrib/libcxx/include/__functional_base:317: std::__1::shared_ptr<DB::IInputFormat> std::__1::__invoke_void_return_wrapper<std::__1::shared_ptr<DB::IInputFormat> >::__call<DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&>(DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1df2cd7d in /usr/bin/clickhouse
-        # /contrib/libcxx/include/functional:1540: std::__1::__function::__alloc_func<DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0, std::__1::allocator<DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0>, std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1df2ccda in /usr/bin/clickhouse
-        # /contrib/libcxx/include/functional:1714: std::__1::__function::__func<DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0, std::__1::allocator<DB::registerInputFormatProcessorParquet(DB::FormatFactory&)::$_0>, std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1df2bdec in /usr/bin/clickhouse
-        # /contrib/libcxx/include/functional:1867: std::__1::__function::__value_func<std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) const @ 0x1dd14dbd in /usr/bin/clickhouse
-        # /contrib/libcxx/include/functional:2473: std::__1::function<std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) const @ 0x1dd07035 in /usr/bin/clickhouse
-        # /src/Formats/FormatFactory.cpp:258: DB::FormatFactory::getInputFormat(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, DB::ReadBuffer&, DB::Block const&, DB::Context const&, unsigned long, std::__1::function<void ()>) const @ 0x1dd04007 in /usr/bin/clickhouse
-        # /src/Storages/Kafka/KafkaBlockInputStream.cpp:76: DB::KafkaBlockInputStream::readImpl() @ 0x1d8f6559 in /usr/bin/clickhouse
-        # /src/DataStreams/IBlockInputStream.cpp:60: DB::IBlockInputStream::read() @ 0x1c9c92fd in /usr/bin/clickhouse
-        # /src/DataStreams/copyData.cpp:26: void DB::copyDataImpl<DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::atomic<bool>*)::$_0&, void (&)(DB::Block const&)>(DB::IBlockInputStream&, DB::IBlockOutputStream&, DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::atomic<bool>*)::$_0&, void (&)(DB::Block const&)) @ 0x1c9ea01c in /usr/bin/clickhouse
-        # /src/DataStreams/copyData.cpp:63: DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::atomic<bool>*) @ 0x1c9e9fc7 in /usr/bin/clickhouse
-        # /src/Storages/Kafka/StorageKafka.cpp:565: DB::StorageKafka::streamToViews() @ 0x1d8cc3fa in /usr/bin/clickhouse
-        #     # 'data_sample' : [
-        #     #     b'\x50\x41\x52\x31\x15\x04\x15\x10\x15\x14\x4c\x15\x02\x15\x04\x12\x00\x00\x08\x1c\x00\x00\x00\x00\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x0c\x15\x10\x4c\x15\x02\x15\x04\x12\x00\x00\x06\x14\x02\x00\x00\x00\x41\x4d\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x03\x08\x01\x02\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x3f\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x03\x08\x01\x02\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x01\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x15\x02\x19\x6c\x35\x00\x18\x06\x73\x63\x68\x65\x6d\x61\x15\x0a\x00\x15\x04\x25\x00\x18\x02\x69\x64\x00\x15\x02\x25\x00\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x25\x18\x4c\xac\x13\x10\x12\x00\x00\x00\x15\x0c\x25\x00\x18\x04\x76\x61\x6c\x31\x25\x00\x4c\x1c\x00\x00\x00\x15\x08\x25\x00\x18\x04\x76\x61\x6c\x32\x00\x15\x02\x25\x00\x18\x04\x76\x61\x6c\x33\x25\x16\x4c\xac\x13\x08\x12\x00\x00\x00\x16\x02\x19\x1c\x19\x5c\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x16\x98\x05\x16\x02\x00\x28\x22\x70\x61\x72\x71\x75\x65\x74\x2d\x63\x70\x70\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x31\x2e\x35\x2e\x31\x2d\x53\x4e\x41\x50\x53\x48\x4f\x54\x19\x5c\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x00\xc4\x01\x00\x00\x50\x41\x52\x31',
-        #     #     b'\x50\x41\x52\x31\x15\x04\x15\xf0\x01\x15\x90\x01\x4c\x15\x1e\x15\x04\x12\x00\x00\x78\x04\x01\x00\x09\x01\x00\x02\x09\x07\x04\x00\x03\x0d\x08\x00\x04\x0d\x08\x00\x05\x0d\x08\x00\x06\x0d\x08\x00\x07\x0d\x08\x00\x08\x0d\x08\x00\x09\x0d\x08\x00\x0a\x0d\x08\x00\x0b\x0d\x08\x00\x0c\x0d\x08\x00\x0d\x0d\x08\x3c\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x15\x00\x15\x14\x15\x18\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x18\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x24\x04\x05\x10\x32\x54\x76\x98\xba\xdc\x0e\x26\xca\x02\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x1e\x16\x9e\x03\x16\xc2\x02\x26\xb8\x01\x26\x08\x1c\x18\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x1e\x00\x26\xd8\x04\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\x8c\x04\x26\xe4\x03\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x0c\x15\x10\x4c\x15\x02\x15\x04\x12\x00\x00\x06\x14\x02\x00\x00\x00\x41\x4d\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x03\x08\x01\x1e\x00\x26\xb2\x06\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x1e\x16\x68\x16\x70\x26\xee\x05\x26\xc2\x05\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x3f\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x03\x08\x01\x1e\x00\x26\x9a\x08\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x1e\x16\x84\x01\x16\x8c\x01\x26\xb6\x07\x26\x8e\x07\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x01\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x03\x08\x01\x1e\x00\x26\x8e\x0a\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\xc2\x09\x26\x9a\x09\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x15\x02\x19\x6c\x35\x00\x18\x06\x73\x63\x68\x65\x6d\x61\x15\x0a\x00\x15\x04\x25\x00\x18\x02\x69\x64\x00\x15\x02\x25\x00\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x25\x18\x4c\xac\x13\x10\x12\x00\x00\x00\x15\x0c\x25\x00\x18\x04\x76\x61\x6c\x31\x25\x00\x4c\x1c\x00\x00\x00\x15\x08\x25\x00\x18\x04\x76\x61\x6c\x32\x00\x15\x02\x25\x00\x18\x04\x76\x61\x6c\x33\x25\x16\x4c\xac\x13\x08\x12\x00\x00\x00\x16\x1e\x19\x1c\x19\x5c\x26\xca\x02\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x1e\x16\x9e\x03\x16\xc2\x02\x26\xb8\x01\x26\x08\x1c\x18\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x26\xd8\x04\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\x8c\x04\x26\xe4\x03\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x26\xb2\x06\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x1e\x16\x68\x16\x70\x26\xee\x05\x26\xc2\x05\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x26\x9a\x08\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x1e\x16\x84\x01\x16\x8c\x01\x26\xb6\x07\x26\x8e\x07\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x26\x8e\x0a\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\xc2\x09\x26\x9a\x09\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x16\xa6\x06\x16\x1e\x00\x28\x22\x70\x61\x72\x71\x75\x65\x74\x2d\x63\x70\x70\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x31\x2e\x35\x2e\x31\x2d\x53\x4e\x41\x50\x53\x48\x4f\x54\x19\x5c\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x00\xc5\x01\x00\x00\x50\x41\x52\x31',
-        #     #     b'\x50\x41\x52\x31\x15\x04\x15\x10\x15\x14\x4c\x15\x02\x15\x04\x12\x00\x00\x08\x1c\x00\x00\x00\x00\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x0c\x15\x10\x4c\x15\x02\x15\x04\x12\x00\x00\x06\x14\x02\x00\x00\x00\x41\x4d\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x03\x08\x01\x02\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x3f\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x03\x08\x01\x02\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x01\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x15\x02\x19\x6c\x35\x00\x18\x06\x73\x63\x68\x65\x6d\x61\x15\x0a\x00\x15\x04\x25\x00\x18\x02\x69\x64\x00\x15\x02\x25\x00\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x25\x18\x4c\xac\x13\x10\x12\x00\x00\x00\x15\x0c\x25\x00\x18\x04\x76\x61\x6c\x31\x25\x00\x4c\x1c\x00\x00\x00\x15\x08\x25\x00\x18\x04\x76\x61\x6c\x32\x00\x15\x02\x25\x00\x18\x04\x76\x61\x6c\x33\x25\x16\x4c\xac\x13\x08\x12\x00\x00\x00\x16\x02\x19\x1c\x19\x5c\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x16\x98\x05\x16\x02\x00\x28\x22\x70\x61\x72\x71\x75\x65\x74\x2d\x63\x70\x70\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x31\x2e\x35\x2e\x31\x2d\x53\x4e\x41\x50\x53\x48\x4f\x54\x19\x5c\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x00\xc4\x01\x00\x00\x50\x41\x52\x31',
-        #     #     ''
-        #     # ],
-        # },
+        'Parquet' : {
+            'data_sample': [
+                 b'\x50\x41\x52\x31\x15\x04\x15\x10\x15\x14\x4c\x15\x02\x15\x04\x12\x00\x00\x08\x1c\x00\x00\x00\x00\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x0c\x15\x10\x4c\x15\x02\x15\x04\x12\x00\x00\x06\x14\x02\x00\x00\x00\x41\x4d\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x03\x08\x01\x02\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x3f\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x03\x08\x01\x02\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x01\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x15\x02\x19\x6c\x35\x00\x18\x06\x73\x63\x68\x65\x6d\x61\x15\x0a\x00\x15\x04\x25\x00\x18\x02\x69\x64\x00\x15\x02\x25\x00\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x25\x18\x4c\xac\x13\x10\x12\x00\x00\x00\x15\x0c\x25\x00\x18\x04\x76\x61\x6c\x31\x25\x00\x4c\x1c\x00\x00\x00\x15\x08\x25\x00\x18\x04\x76\x61\x6c\x32\x00\x15\x02\x25\x00\x18\x04\x76\x61\x6c\x33\x25\x16\x4c\xac\x13\x08\x12\x00\x00\x00\x16\x02\x19\x1c\x19\x5c\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x16\x98\x05\x16\x02\x00\x28\x22\x70\x61\x72\x71\x75\x65\x74\x2d\x63\x70\x70\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x31\x2e\x35\x2e\x31\x2d\x53\x4e\x41\x50\x53\x48\x4f\x54\x19\x5c\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x00\xc4\x01\x00\x00\x50\x41\x52\x31',
+                 b'\x50\x41\x52\x31\x15\x04\x15\xf0\x01\x15\x90\x01\x4c\x15\x1e\x15\x04\x12\x00\x00\x78\x04\x01\x00\x09\x01\x00\x02\x09\x07\x04\x00\x03\x0d\x08\x00\x04\x0d\x08\x00\x05\x0d\x08\x00\x06\x0d\x08\x00\x07\x0d\x08\x00\x08\x0d\x08\x00\x09\x0d\x08\x00\x0a\x0d\x08\x00\x0b\x0d\x08\x00\x0c\x0d\x08\x00\x0d\x0d\x08\x3c\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x15\x00\x15\x14\x15\x18\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x18\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x24\x04\x05\x10\x32\x54\x76\x98\xba\xdc\x0e\x26\xca\x02\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x1e\x16\x9e\x03\x16\xc2\x02\x26\xb8\x01\x26\x08\x1c\x18\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x1e\x00\x26\xd8\x04\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\x8c\x04\x26\xe4\x03\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x0c\x15\x10\x4c\x15\x02\x15\x04\x12\x00\x00\x06\x14\x02\x00\x00\x00\x41\x4d\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x03\x08\x01\x1e\x00\x26\xb2\x06\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x1e\x16\x68\x16\x70\x26\xee\x05\x26\xc2\x05\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x3f\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x03\x08\x01\x1e\x00\x26\x9a\x08\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x1e\x16\x84\x01\x16\x8c\x01\x26\xb6\x07\x26\x8e\x07\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x01\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x1e\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x03\x08\x01\x1e\x00\x26\x8e\x0a\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\xc2\x09\x26\x9a\x09\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x15\x02\x19\x6c\x35\x00\x18\x06\x73\x63\x68\x65\x6d\x61\x15\x0a\x00\x15\x04\x25\x00\x18\x02\x69\x64\x00\x15\x02\x25\x00\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x25\x18\x4c\xac\x13\x10\x12\x00\x00\x00\x15\x0c\x25\x00\x18\x04\x76\x61\x6c\x31\x25\x00\x4c\x1c\x00\x00\x00\x15\x08\x25\x00\x18\x04\x76\x61\x6c\x32\x00\x15\x02\x25\x00\x18\x04\x76\x61\x6c\x33\x25\x16\x4c\xac\x13\x08\x12\x00\x00\x00\x16\x1e\x19\x1c\x19\x5c\x26\xca\x02\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x1e\x16\x9e\x03\x16\xc2\x02\x26\xb8\x01\x26\x08\x1c\x18\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x0f\x00\x00\x00\x00\x00\x00\x00\x18\x08\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x26\xd8\x04\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\x8c\x04\x26\xe4\x03\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x26\xb2\x06\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x1e\x16\x68\x16\x70\x26\xee\x05\x26\xc2\x05\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x26\x9a\x08\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x1e\x16\x84\x01\x16\x8c\x01\x26\xb6\x07\x26\x8e\x07\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x26\x8e\x0a\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x1e\x16\x6c\x16\x74\x26\xc2\x09\x26\x9a\x09\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x16\xa6\x06\x16\x1e\x00\x28\x22\x70\x61\x72\x71\x75\x65\x74\x2d\x63\x70\x70\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x31\x2e\x35\x2e\x31\x2d\x53\x4e\x41\x50\x53\x48\x4f\x54\x19\x5c\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x00\xc5\x01\x00\x00\x50\x41\x52\x31',
+                 b'\x50\x41\x52\x31\x15\x04\x15\x10\x15\x14\x4c\x15\x02\x15\x04\x12\x00\x00\x08\x1c\x00\x00\x00\x00\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x15\x04\x15\x0c\x15\x10\x4c\x15\x02\x15\x04\x12\x00\x00\x06\x14\x02\x00\x00\x00\x41\x4d\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x03\x08\x01\x02\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x00\x00\x00\x3f\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x03\x08\x01\x02\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x15\x04\x15\x08\x15\x0c\x4c\x15\x02\x15\x04\x12\x00\x00\x04\x0c\x01\x00\x00\x00\x15\x00\x15\x06\x15\x0a\x2c\x15\x02\x15\x04\x15\x06\x15\x06\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x03\x08\x01\x02\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x15\x02\x19\x6c\x35\x00\x18\x06\x73\x63\x68\x65\x6d\x61\x15\x0a\x00\x15\x04\x25\x00\x18\x02\x69\x64\x00\x15\x02\x25\x00\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x25\x18\x4c\xac\x13\x10\x12\x00\x00\x00\x15\x0c\x25\x00\x18\x04\x76\x61\x6c\x31\x25\x00\x4c\x1c\x00\x00\x00\x15\x08\x25\x00\x18\x04\x76\x61\x6c\x32\x00\x15\x02\x25\x00\x18\x04\x76\x61\x6c\x33\x25\x16\x4c\xac\x13\x08\x12\x00\x00\x00\x16\x02\x19\x1c\x19\x5c\x26\xbc\x01\x1c\x15\x04\x19\x35\x04\x00\x06\x19\x18\x02\x69\x64\x15\x02\x16\x02\x16\xac\x01\x16\xb4\x01\x26\x38\x26\x08\x1c\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x16\x00\x28\x08\x00\x00\x00\x00\x00\x00\x00\x00\x18\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x26\xc8\x03\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xfc\x02\x26\xd4\x02\x1c\x36\x00\x28\x04\x00\x00\x00\x00\x18\x04\x00\x00\x00\x00\x00\x00\x00\x26\xa2\x05\x1c\x15\x0c\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x31\x15\x02\x16\x02\x16\x68\x16\x70\x26\xde\x04\x26\xb2\x04\x1c\x36\x00\x28\x02\x41\x4d\x18\x02\x41\x4d\x00\x00\x00\x26\x8a\x07\x1c\x15\x08\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x32\x15\x02\x16\x02\x16\x84\x01\x16\x8c\x01\x26\xa6\x06\x26\xfe\x05\x1c\x18\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x16\x00\x28\x04\x00\x00\x00\x3f\x18\x04\x00\x00\x00\x3f\x00\x00\x00\x26\xfe\x08\x1c\x15\x02\x19\x35\x04\x00\x06\x19\x18\x04\x76\x61\x6c\x33\x15\x02\x16\x02\x16\x6c\x16\x74\x26\xb2\x08\x26\x8a\x08\x1c\x36\x00\x28\x04\x01\x00\x00\x00\x18\x04\x01\x00\x00\x00\x00\x00\x00\x16\x98\x05\x16\x02\x00\x28\x22\x70\x61\x72\x71\x75\x65\x74\x2d\x63\x70\x70\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x31\x2e\x35\x2e\x31\x2d\x53\x4e\x41\x50\x53\x48\x4f\x54\x19\x5c\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x1c\x00\x00\x00\xc4\x01\x00\x00\x50\x41\x52\x31',
+            ],
+        },
         'AvroConfluent': {
             'data_sample': [
                 avro_confluent_message(cluster.schema_registry_client,
@@ -636,49 +611,21 @@ def test_kafka_formats(kafka_cluster):
                 avro_message({'id': 0, 'blockNo': 0, 'val1': str('AM'), 'val2': 0.5, "val3": 1}),
             ],
             'supports_empty_value': False,
-        }
-        # 'Arrow' : {
-        #     # Not working at all: DB::Exception: Error while opening a table: Invalid: File is too small: 0, Stack trace (when copying this message, always include the lines below):
-        #     # /src/Common/Exception.cpp:37: DB::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int) @ 0x15c2d2a3 in /usr/bin/clickhouse
-        #     # /src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp:88: DB::ArrowBlockInputFormat::prepareReader() @ 0x1ddff1c3 in /usr/bin/clickhouse
-        #     # /src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp:26: DB::ArrowBlockInputFormat::ArrowBlockInputFormat(DB::ReadBuffer&, DB::Block const&, bool) @ 0x1ddfef63 in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:2214: std::__1::__compressed_pair_elem<DB::ArrowBlockInputFormat, 1, false>::__compressed_pair_elem<DB::ReadBuffer&, DB::Block const&, bool&&, 0ul, 1ul, 2ul>(std::__1::piecewise_construct_t, std::__1::tuple<DB::ReadBuffer&, DB::Block const&, bool&&>, std::__1::__tuple_indices<0ul, 1ul, 2ul>) @ 0x1de0470f in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:2299: std::__1::__compressed_pair<std::__1::allocator<DB::ArrowBlockInputFormat>, DB::ArrowBlockInputFormat>::__compressed_pair<std::__1::allocator<DB::ArrowBlockInputFormat>&, DB::ReadBuffer&, DB::Block const&, bool&&>(std::__1::piecewise_construct_t, std::__1::tuple<std::__1::allocator<DB::ArrowBlockInputFormat>&>, std::__1::tuple<DB::ReadBuffer&, DB::Block const&, bool&&>) @ 0x1de04375 in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:3569: std::__1::__shared_ptr_emplace<DB::ArrowBlockInputFormat, std::__1::allocator<DB::ArrowBlockInputFormat> >::__shared_ptr_emplace<DB::ReadBuffer&, DB::Block const&, bool>(std::__1::allocator<DB::ArrowBlockInputFormat>, DB::ReadBuffer&, DB::Block const&, bool&&) @ 0x1de03f97 in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:4400: std::__1::enable_if<!(is_array<DB::ArrowBlockInputFormat>::value), std::__1::shared_ptr<DB::ArrowBlockInputFormat> >::type std::__1::make_shared<DB::ArrowBlockInputFormat, DB::ReadBuffer&, DB::Block const&, bool>(DB::ReadBuffer&, DB::Block const&, bool&&) @ 0x1de03d4c in /usr/bin/clickhouse
-        #     # /src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp:107: DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_0::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) const @ 0x1de010df in /usr/bin/clickhouse
-        #     'data_sample' : [
-        #         '\x41\x52\x52\x4f\x57\x31\x00\x00\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00\x10\x00\x00\x00\x0c\x00\x14\x00\x06\x00\x08\x00\x0c\x00\x10\x00\x0c\x00\x00\x00\x00\x00\x03\x00\x3c\x00\x00\x00\x28\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x58\x01\x00\x00\x00\x00\x00\x00\x60\x01\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\x78\x01\x00\x00\x41\x52\x52\x4f\x57\x31',
-        #         '\x41\x52\x52\x4f\x57\x31\x00\x00\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x48\x01\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\xd8\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x08\x00\x00\x00\x0a\x00\x00\x00\x0c\x00\x00\x00\x0e\x00\x00\x00\x10\x00\x00\x00\x12\x00\x00\x00\x14\x00\x00\x00\x16\x00\x00\x00\x18\x00\x00\x00\x1a\x00\x00\x00\x1c\x00\x00\x00\x1e\x00\x00\x00\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x00\xff\xff\xff\xff\x00\x00\x00\x00\x10\x00\x00\x00\x0c\x00\x14\x00\x06\x00\x08\x00\x0c\x00\x10\x00\x0c\x00\x00\x00\x00\x00\x03\x00\x3c\x00\x00\x00\x28\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x58\x01\x00\x00\x00\x00\x00\x00\x60\x01\x00\x00\x00\x00\x00\x00\x48\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\x78\x01\x00\x00\x41\x52\x52\x4f\x57\x31',
-        #         '\x41\x52\x52\x4f\x57\x31\x00\x00\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00\x10\x00\x00\x00\x0c\x00\x14\x00\x06\x00\x08\x00\x0c\x00\x10\x00\x0c\x00\x00\x00\x00\x00\x03\x00\x3c\x00\x00\x00\x28\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x58\x01\x00\x00\x00\x00\x00\x00\x60\x01\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\x78\x01\x00\x00\x41\x52\x52\x4f\x57\x31',
-        #     ],
-        # },
-        # 'ArrowStream' : {
-        #     # Not working at all:
-        #     # Error while opening a table: Invalid: Tried reading schema message, was null or length 0, Stack trace (when copying this message, always include the lines below):
-        #     # /src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp:88: DB::ArrowBlockInputFormat::prepareReader() @ 0x1ddff1c3 in /usr/bin/clickhouse
-        #     # /src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp:26: DB::ArrowBlockInputFormat::ArrowBlockInputFormat(DB::ReadBuffer&, DB::Block const&, bool) @ 0x1ddfef63 in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:2214: std::__1::__compressed_pair_elem<DB::ArrowBlockInputFormat, 1, false>::__compressed_pair_elem<DB::ReadBuffer&, DB::Block const&, bool&&, 0ul, 1ul, 2ul>(std::__1::piecewise_construct_t, std::__1::tuple<DB::ReadBuffer&, DB::Block const&, bool&&>, std::__1::__tuple_indices<0ul, 1ul, 2ul>) @ 0x1de0470f in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:2299: std::__1::__compressed_pair<std::__1::allocator<DB::ArrowBlockInputFormat>, DB::ArrowBlockInputFormat>::__compressed_pair<std::__1::allocator<DB::ArrowBlockInputFormat>&, DB::ReadBuffer&, DB::Block const&, bool&&>(std::__1::piecewise_construct_t, std::__1::tuple<std::__1::allocator<DB::ArrowBlockInputFormat>&>, std::__1::tuple<DB::ReadBuffer&, DB::Block const&, bool&&>) @ 0x1de04375 in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:3569: std::__1::__shared_ptr_emplace<DB::ArrowBlockInputFormat, std::__1::allocator<DB::ArrowBlockInputFormat> >::__shared_ptr_emplace<DB::ReadBuffer&, DB::Block const&, bool>(std::__1::allocator<DB::ArrowBlockInputFormat>, DB::ReadBuffer&, DB::Block const&, bool&&) @ 0x1de03f97 in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/memory:4400: std::__1::enable_if<!(is_array<DB::ArrowBlockInputFormat>::value), std::__1::shared_ptr<DB::ArrowBlockInputFormat> >::type std::__1::make_shared<DB::ArrowBlockInputFormat, DB::ReadBuffer&, DB::Block const&, bool>(DB::ReadBuffer&, DB::Block const&, bool&&) @ 0x1de03d4c in /usr/bin/clickhouse
-        #     # /src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp:117: DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) const @ 0x1de0273f in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/type_traits:3519: decltype(std::__1::forward<DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1&>(fp)(std::__1::forward<DB::ReadBuffer&>(fp0), std::__1::forward<DB::Block const&>(fp0), std::__1::forward<DB::RowInputFormatParams const&>(fp0), std::__1::forward<DB::FormatSettings const&>(fp0))) std::__1::__invoke<DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&>(DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1de026da in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/__functional_base:317: std::__1::shared_ptr<DB::IInputFormat> std::__1::__invoke_void_return_wrapper<std::__1::shared_ptr<DB::IInputFormat> >::__call<DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&>(DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1&, DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1de025ed in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/functional:1540: std::__1::__function::__alloc_func<DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1, std::__1::allocator<DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1>, std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1de0254a in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/functional:1714: std::__1::__function::__func<DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1, std::__1::allocator<DB::registerInputFormatProcessorArrow(DB::FormatFactory&)::$_1>, std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) @ 0x1de0165c in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/functional:1867: std::__1::__function::__value_func<std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) const @ 0x1dd14dbd in /usr/bin/clickhouse
-        #     # /contrib/libcxx/include/functional:2473: std::__1::function<std::__1::shared_ptr<DB::IInputFormat> (DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&)>::operator()(DB::ReadBuffer&, DB::Block const&, DB::RowInputFormatParams const&, DB::FormatSettings const&) const @ 0x1dd07035 in /usr/bin/clickhouse
-        #     # /src/Formats/FormatFactory.cpp:258: DB::FormatFactory::getInputFormat(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, DB::ReadBuffer&, DB::Block const&, DB::Context const&, unsigned long, std::__1::function<void ()>) const @ 0x1dd04007 in /usr/bin/clickhouse
-        #     # /src/Storages/Kafka/KafkaBlockInputStream.cpp:76: DB::KafkaBlockInputStream::readImpl() @ 0x1d8f6559 in /usr/bin/clickhouse
-        #     # /src/DataStreams/IBlockInputStream.cpp:60: DB::IBlockInputStream::read() @ 0x1c9c92fd in /usr/bin/clickhouse
-        #     # /src/DataStreams/copyData.cpp:26: void DB::copyDataImpl<DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::atomic<bool>*)::$_0&, void (&)(DB::Block const&)>(DB::IBlockInputStream&, DB::IBlockOutputStream&, DB::copyData(DB::IBlockInputStream&, DB::IBlockOutputStream&, std::__1::atomic<bool>*)::$_0&, void (&)(DB::Block const&)) @ 0x1c9ea01c in /usr/bin/clickhouse
-        #     'data_sample' : [
-        #         '\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00',
-        #         '\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x48\x01\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\xd8\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x08\x00\x00\x00\x0a\x00\x00\x00\x0c\x00\x00\x00\x0e\x00\x00\x00\x10\x00\x00\x00\x12\x00\x00\x00\x14\x00\x00\x00\x16\x00\x00\x00\x18\x00\x00\x00\x1a\x00\x00\x00\x1c\x00\x00\x00\x1e\x00\x00\x00\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x00\xff\xff\xff\xff\x00\x00\x00\x00',
-        #         '\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00',
-        #     ],
-        # },
+        },
+        'Arrow' : {
+            'data_sample' : [
+                b'\x41\x52\x52\x4f\x57\x31\x00\x00\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00\x10\x00\x00\x00\x0c\x00\x14\x00\x06\x00\x08\x00\x0c\x00\x10\x00\x0c\x00\x00\x00\x00\x00\x03\x00\x3c\x00\x00\x00\x28\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x58\x01\x00\x00\x00\x00\x00\x00\x60\x01\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\x78\x01\x00\x00\x41\x52\x52\x4f\x57\x31',
+                b'\x41\x52\x52\x4f\x57\x31\x00\x00\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x48\x01\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\xd8\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x08\x00\x00\x00\x0a\x00\x00\x00\x0c\x00\x00\x00\x0e\x00\x00\x00\x10\x00\x00\x00\x12\x00\x00\x00\x14\x00\x00\x00\x16\x00\x00\x00\x18\x00\x00\x00\x1a\x00\x00\x00\x1c\x00\x00\x00\x1e\x00\x00\x00\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x00\xff\xff\xff\xff\x00\x00\x00\x00\x10\x00\x00\x00\x0c\x00\x14\x00\x06\x00\x08\x00\x0c\x00\x10\x00\x0c\x00\x00\x00\x00\x00\x03\x00\x3c\x00\x00\x00\x28\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x58\x01\x00\x00\x00\x00\x00\x00\x60\x01\x00\x00\x00\x00\x00\x00\x48\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\x78\x01\x00\x00\x41\x52\x52\x4f\x57\x31',
+                b'\x41\x52\x52\x4f\x57\x31\x00\x00\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00\x10\x00\x00\x00\x0c\x00\x14\x00\x06\x00\x08\x00\x0c\x00\x10\x00\x0c\x00\x00\x00\x00\x00\x03\x00\x3c\x00\x00\x00\x28\x00\x00\x00\x04\x00\x00\x00\x01\x00\x00\x00\x58\x01\x00\x00\x00\x00\x00\x00\x60\x01\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\x78\x01\x00\x00\x41\x52\x52\x4f\x57\x31',
+            ],
+        },
+        'ArrowStream' : {
+            'data_sample' : [
+                b'\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00',
+                b'\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x48\x01\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x78\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\xd8\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf8\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x38\x01\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x08\x00\x00\x00\x0a\x00\x00\x00\x0c\x00\x00\x00\x0e\x00\x00\x00\x10\x00\x00\x00\x12\x00\x00\x00\x14\x00\x00\x00\x16\x00\x00\x00\x18\x00\x00\x00\x1a\x00\x00\x00\x1c\x00\x00\x00\x1e\x00\x00\x00\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x41\x4d\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x00\xff\xff\xff\xff\x00\x00\x00\x00',
+                b'\xff\xff\xff\xff\x48\x01\x00\x00\x10\x00\x00\x00\x00\x00\x0a\x00\x0c\x00\x06\x00\x05\x00\x08\x00\x0a\x00\x00\x00\x00\x01\x03\x00\x0c\x00\x00\x00\x08\x00\x08\x00\x00\x00\x04\x00\x08\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\xe4\x00\x00\x00\x9c\x00\x00\x00\x6c\x00\x00\x00\x34\x00\x00\x00\x04\x00\x00\x00\x40\xff\xff\xff\x00\x00\x00\x02\x18\x00\x00\x00\x0c\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x72\xff\xff\xff\x08\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x33\x00\x00\x00\x00\x6c\xff\xff\xff\x00\x00\x00\x03\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x06\x00\x06\x00\x00\x00\x00\x00\x01\x00\x04\x00\x00\x00\x76\x61\x6c\x32\x00\x00\x00\x00\xa0\xff\xff\xff\x00\x00\x00\x05\x18\x00\x00\x00\x10\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x04\x00\x00\x00\x04\x00\x00\x00\x76\x61\x6c\x31\x00\x00\x00\x00\xcc\xff\xff\xff\x00\x00\x00\x02\x20\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x08\x00\x04\x00\x06\x00\x00\x00\x10\x00\x00\x00\x07\x00\x00\x00\x62\x6c\x6f\x63\x6b\x4e\x6f\x00\x10\x00\x14\x00\x08\x00\x00\x00\x07\x00\x0c\x00\x00\x00\x10\x00\x10\x00\x00\x00\x00\x00\x00\x02\x24\x00\x00\x00\x14\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x08\x00\x0c\x00\x08\x00\x07\x00\x08\x00\x00\x00\x00\x00\x00\x01\x40\x00\x00\x00\x02\x00\x00\x00\x69\x64\x00\x00\xff\xff\xff\xff\x58\x01\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x16\x00\x06\x00\x05\x00\x08\x00\x0c\x00\x0c\x00\x00\x00\x00\x03\x03\x00\x18\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x18\x00\x0c\x00\x04\x00\x08\x00\x0a\x00\x00\x00\xcc\x00\x00\x00\x10\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x18\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x41\x4d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3f\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\x00\x00',
+            ],
+        },
     }
 
     for format_name, format_opts in list(all_formats.items()):
@@ -1676,25 +1623,22 @@ def test_kafka_virtual_columns2(kafka_cluster):
     producer.send(topic='virt2_0', value=json.dumps({'value': 2}), partition=0, key='k2', timestamp_ms=1577836802002,
                   headers=[('empty_value', b''), ('', b'empty name'), ('', b''), ('repetition', b'1'), ('repetition', b'2')])
     producer.flush()
-    time.sleep(1)
 
     producer.send(topic='virt2_0', value=json.dumps({'value': 3}), partition=1, key='k3', timestamp_ms=1577836803003,
                   headers=[('b', b'b'), ('a', b'a')])
     producer.send(topic='virt2_0', value=json.dumps({'value': 4}), partition=1, key='k4', timestamp_ms=1577836804004,
                   headers=[('a', b'a'), ('b', b'b')])
     producer.flush()
-    time.sleep(1)
 
     producer.send(topic='virt2_1', value=json.dumps({'value': 5}), partition=0, key='k5', timestamp_ms=1577836805005)
     producer.send(topic='virt2_1', value=json.dumps({'value': 6}), partition=0, key='k6', timestamp_ms=1577836806006)
     producer.flush()
-    time.sleep(1)
 
     producer.send(topic='virt2_1', value=json.dumps({'value': 7}), partition=1, key='k7', timestamp_ms=1577836807007)
     producer.send(topic='virt2_1', value=json.dumps({'value': 8}), partition=1, key='k8', timestamp_ms=1577836808008)
     producer.flush()
 
-    time.sleep(10)
+    instance.wait_for_log_line('kafka.*Committed offset 2.*virt2_[01]', repetitions=4, look_behind_lines=6000)
 
     members = describe_consumer_group('virt2')
     # pprint.pprint(members)
@@ -1760,8 +1704,7 @@ def test_kafka_produce_key_timestamp(kafka_cluster):
                                                                                                               1577836804))
     instance.query("INSERT INTO test.kafka_writer VALUES ({},{},'{}',toDateTime({}))".format(5, 5, 'k5', 1577836805))
 
-    while int(instance.query("SELECT count() FROM test.view")) < 5:
-        time.sleep(1)
+    instance.wait_for_log_line("Committed offset 5")
 
     result = instance.query("SELECT * FROM test.view ORDER BY value", ignore_error=True)
 
@@ -2494,8 +2437,6 @@ def test_kafka_issue14202(kafka_cluster):
                      kafka_format = 'JSONEachRow';
         ''')
 
-    time.sleep(3)
-
     instance.query(
         'INSERT INTO test.kafka_q SELECT t, some_string  FROM ( SELECT dt AS t, some_string FROM test.empty_table )')
     # check instance is alive
@@ -2512,8 +2453,8 @@ def test_kafka_csv_with_thread_per_consumer(kafka_cluster):
         CREATE TABLE test.kafka (key UInt64, value UInt64)
             ENGINE = Kafka
             SETTINGS kafka_broker_list = 'kafka1:19092',
-                     kafka_topic_list = 'csv',
-                     kafka_group_name = 'csv',
+                     kafka_topic_list = 'csv_with_thread_per_consumer',
+                     kafka_group_name = 'csv_with_thread_per_consumer',
                      kafka_format = 'CSV',
                      kafka_row_delimiter = '\\n',
                      kafka_num_consumers = 4,
@@ -2523,7 +2464,7 @@ def test_kafka_csv_with_thread_per_consumer(kafka_cluster):
     messages = []
     for i in range(50):
         messages.append('{i}, {i}'.format(i=i))
-    kafka_produce('csv', messages)
+    kafka_produce('csv_with_thread_per_consumer', messages)
 
     result = ''
     while True:
@@ -2533,6 +2474,379 @@ def test_kafka_csv_with_thread_per_consumer(kafka_cluster):
 
     kafka_check_result(result, True)
 
+def random_string(size=8):
+    return ''.join(random.choices(string.ascii_uppercase + string.digits, k=size))
+
+@pytest.mark.timeout(180)
+def test_kafka_engine_put_errors_to_stream(kafka_cluster):
+    instance.query('''
+        DROP TABLE IF EXISTS test.kafka;
+        DROP TABLE IF EXISTS test.kafka_data;
+        DROP TABLE IF EXISTS test.kafka_errors;
+        CREATE TABLE test.kafka (i Int64, s String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'kafka_engine_put_errors_to_stream',
+                     kafka_group_name = 'kafka_engine_put_errors_to_stream',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 128,
+                     kafka_handle_error_mode = 'stream';
+        CREATE MATERIALIZED VIEW test.kafka_data (i Int64, s String)
+            ENGINE = MergeTree
+            ORDER BY i
+            AS SELECT i, s FROM test.kafka WHERE length(_error) == 0;
+        CREATE MATERIALIZED VIEW test.kafka_errors (topic String, partition Int64, offset Int64, raw String, error String)
+            ENGINE = MergeTree
+            ORDER BY (topic, offset)
+            AS SELECT
+               _topic AS topic,
+               _partition AS partition,
+               _offset AS offset,
+               _raw_message AS raw,
+               _error AS error
+               FROM test.kafka WHERE length(_error) > 0;
+        ''')
+
+    messages = []
+    for i in range(128):
+        if i % 2 == 0:
+            messages.append(json.dumps({'i': i, 's': random_string(8)}))
+        else:
+            # Unexpected json content for table test.kafka.
+            messages.append(json.dumps({'i': 'n_' + random_string(4), 's': random_string(8)}))
+
+    kafka_produce('kafka_engine_put_errors_to_stream', messages)
+    instance.wait_for_log_line("Committed offset 128")
+
+    assert TSV(instance.query('SELECT count() FROM test.kafka_data')) == TSV('64')
+    assert TSV(instance.query('SELECT count() FROM test.kafka_errors')) == TSV('64')
+
+    instance.query('''
+        DROP TABLE test.kafka;
+        DROP TABLE test.kafka_data;
+        DROP TABLE test.kafka_errors;
+    ''')
+
+def gen_normal_json():
+    return '{"i":1000, "s":"ABC123abc"}'
+
+def gen_malformed_json():
+    return '{"i":"n1000", "s":"1000"}'
+
+def gen_message_with_jsons(jsons = 10, malformed = 0):
+    s = io.StringIO()
+
+    # we don't care on which position error will be added
+    # (we skip whole broken message), but we need to be
+    # sure that at least one error will be added,
+    # otherwise test will fail.
+    error_pos = random.randint(0,jsons-1)
+
+    for i in range (jsons):
+        if malformed and i == error_pos:
+            s.write(gen_malformed_json())
+        else:
+            s.write(gen_normal_json())
+        s.write(' ')
+    return s.getvalue()
+
+
+def test_kafka_engine_put_errors_to_stream_with_random_malformed_json(kafka_cluster):
+    instance.query('''
+        DROP TABLE IF EXISTS test.kafka;
+        DROP TABLE IF EXISTS test.kafka_data;
+        DROP TABLE IF EXISTS test.kafka_errors;
+        CREATE TABLE test.kafka (i Int64, s String)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = 'kafka_engine_put_errors_to_stream_with_random_malformed_json',
+                     kafka_group_name = 'kafka_engine_put_errors_to_stream_with_random_malformed_json',
+                     kafka_format = 'JSONEachRow',
+                     kafka_max_block_size = 100,
+                     kafka_poll_max_batch_size = 1,
+                     kafka_handle_error_mode = 'stream';
+        CREATE MATERIALIZED VIEW test.kafka_data (i Int64, s String)
+            ENGINE = MergeTree
+            ORDER BY i
+            AS SELECT i, s FROM test.kafka WHERE length(_error) == 0;
+        CREATE MATERIALIZED VIEW test.kafka_errors (topic String, partition Int64, offset Int64, raw String, error String)
+            ENGINE = MergeTree
+            ORDER BY (topic, offset)
+            AS SELECT
+               _topic AS topic,
+               _partition AS partition,
+               _offset AS offset,
+               _raw_message AS raw,
+               _error AS error
+               FROM test.kafka WHERE length(_error) > 0;
+        ''')
+
+    messages = []
+    for i in range(128):
+        if i % 2 == 0:
+            messages.append(gen_message_with_jsons(10, 1))
+        else:
+            messages.append(gen_message_with_jsons(10, 0))
+
+    kafka_produce('kafka_engine_put_errors_to_stream_with_random_malformed_json', messages)
+
+    instance.wait_for_log_line("Committed offset 128")
+    # 64 good messages, each containing 10 rows
+    assert TSV(instance.query('SELECT count() FROM test.kafka_data')) == TSV('640')
+    # 64 bad messages, each containing some broken row
+    assert TSV(instance.query('SELECT count() FROM test.kafka_errors')) == TSV('64')
+
+    instance.query('''
+        DROP TABLE test.kafka;
+        DROP TABLE test.kafka_data;
+        DROP TABLE test.kafka_errors;
+    ''')
+
+@pytest.mark.timeout(120)
+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'
+
+    all_formats = {
+        ## Text formats ##
+        # dumped with clickhouse-client ... | perl -pe 's/\n/\\n/; s/\t/\\t/g;'
+        'JSONEachRow': {
+            'data_sample': [
+                '{"id":"0","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n',
+                '{"id":"1","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"2","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"3","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"4","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"5","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"6","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"7","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"8","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"9","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"10","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"11","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"12","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"13","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"14","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n{"id":"15","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n',
+                '{"id":"0","blockNo":0,"val1":"AM","val2":0.5,"val3":1}\n',
+                # broken message
+                '{"id":"0","blockNo":"BAD","val1":"AM","val2":0.5,"val3":1}',
+            ],
+            'expected':'''{"raw_message":"{\\"id\\":\\"0\\",\\"blockNo\\":\\"BAD\\",\\"val1\\":\\"AM\\",\\"val2\\":0.5,\\"val3\\":1}","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"val1\\":\\"AM\\",\\"val2\\":0.5,\\"val3\\":1}': (while reading the value of key blockNo)"}''',
+            'supports_empty_value': True,
+            'printable': True,
+        },
+        # JSONAsString doesn't fit to that test, and tested separately
+        'JSONCompactEachRow': {
+            'data_sample': [
+                '["0", 0, "AM", 0.5, 1]\n',
+                '["1", 0, "AM", 0.5, 1]\n["2", 0, "AM", 0.5, 1]\n["3", 0, "AM", 0.5, 1]\n["4", 0, "AM", 0.5, 1]\n["5", 0, "AM", 0.5, 1]\n["6", 0, "AM", 0.5, 1]\n["7", 0, "AM", 0.5, 1]\n["8", 0, "AM", 0.5, 1]\n["9", 0, "AM", 0.5, 1]\n["10", 0, "AM", 0.5, 1]\n["11", 0, "AM", 0.5, 1]\n["12", 0, "AM", 0.5, 1]\n["13", 0, "AM", 0.5, 1]\n["14", 0, "AM", 0.5, 1]\n["15", 0, "AM", 0.5, 1]\n',
+                '["0", 0, "AM", 0.5, 1]\n',
+                # broken message
+                '["0", "BAD", "AM", 0.5, 1]',
+            ],
+            'expected':'''{"raw_message":"[\\"0\\", \\"BAD\\", \\"AM\\", 0.5, 1]","error":"Cannot parse input: expected '\\"' before: 'BAD\\", \\"AM\\", 0.5, 1]': (while reading the value of key blockNo)"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'JSONCompactEachRowWithNamesAndTypes': {
+            'data_sample': [
+                '["id", "blockNo", "val1", "val2", "val3"]\n["Int64", "UInt16", "String", "Float32", "UInt8"]\n["0", 0, "AM", 0.5, 1]\n',
+                '["id", "blockNo", "val1", "val2", "val3"]\n["Int64", "UInt16", "String", "Float32", "UInt8"]\n["1", 0, "AM", 0.5, 1]\n["2", 0, "AM", 0.5, 1]\n["3", 0, "AM", 0.5, 1]\n["4", 0, "AM", 0.5, 1]\n["5", 0, "AM", 0.5, 1]\n["6", 0, "AM", 0.5, 1]\n["7", 0, "AM", 0.5, 1]\n["8", 0, "AM", 0.5, 1]\n["9", 0, "AM", 0.5, 1]\n["10", 0, "AM", 0.5, 1]\n["11", 0, "AM", 0.5, 1]\n["12", 0, "AM", 0.5, 1]\n["13", 0, "AM", 0.5, 1]\n["14", 0, "AM", 0.5, 1]\n["15", 0, "AM", 0.5, 1]\n',
+                '["id", "blockNo", "val1", "val2", "val3"]\n["Int64", "UInt16", "String", "Float32", "UInt8"]\n["0", 0, "AM", 0.5, 1]\n',
+                # broken message
+                '["0", "BAD", "AM", 0.5, 1]',
+            ],
+            'expected':'''{"raw_message":"[\\"0\\", \\"BAD\\", \\"AM\\", 0.5, 1]","error":"Cannot parse JSON string: expected opening quote"}''',
+            'printable':True,
+        },
+        'TSKV': {
+            'data_sample': [
+                'id=0\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\n',
+                'id=1\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=2\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=3\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=4\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=5\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=6\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=7\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=8\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=9\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=10\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=11\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=12\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=13\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=14\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\nid=15\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\n',
+                'id=0\tblockNo=0\tval1=AM\tval2=0.5\tval3=1\n',
+                # broken message
+                'id=0\tblockNo=BAD\tval1=AM\tval2=0.5\tval3=1\n',
+            ],
+            'expected':'{"raw_message":"id=0\\tblockNo=BAD\\tval1=AM\\tval2=0.5\\tval3=1\\n","error":"Found garbage after field in TSKV format: blockNo: (at row 1)\\n"}',
+            'printable':True,
+        },
+        'CSV': {
+            'data_sample': [
+                '0,0,"AM",0.5,1\n',
+                '1,0,"AM",0.5,1\n2,0,"AM",0.5,1\n3,0,"AM",0.5,1\n4,0,"AM",0.5,1\n5,0,"AM",0.5,1\n6,0,"AM",0.5,1\n7,0,"AM",0.5,1\n8,0,"AM",0.5,1\n9,0,"AM",0.5,1\n10,0,"AM",0.5,1\n11,0,"AM",0.5,1\n12,0,"AM",0.5,1\n13,0,"AM",0.5,1\n14,0,"AM",0.5,1\n15,0,"AM",0.5,1\n',
+                '0,0,"AM",0.5,1\n',
+                # broken message
+                '0,"BAD","AM",0.5,1\n',
+            ],
+            'expected':'''{"raw_message":"0,\\"BAD\\",\\"AM\\",0.5,1\\n","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"AM\\",0.5,1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'printable':True,
+            'supports_empty_value': True,
+        },
+        'TSV': {
+            'data_sample': [
+                '0\t0\tAM\t0.5\t1\n',
+                '1\t0\tAM\t0.5\t1\n2\t0\tAM\t0.5\t1\n3\t0\tAM\t0.5\t1\n4\t0\tAM\t0.5\t1\n5\t0\tAM\t0.5\t1\n6\t0\tAM\t0.5\t1\n7\t0\tAM\t0.5\t1\n8\t0\tAM\t0.5\t1\n9\t0\tAM\t0.5\t1\n10\t0\tAM\t0.5\t1\n11\t0\tAM\t0.5\t1\n12\t0\tAM\t0.5\t1\n13\t0\tAM\t0.5\t1\n14\t0\tAM\t0.5\t1\n15\t0\tAM\t0.5\t1\n',
+                '0\t0\tAM\t0.5\t1\n',
+                # broken message
+                '0\tBAD\tAM\t0.5\t1\n',
+            ],
+            'expected':'''{"raw_message":"0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'CSVWithNames': {
+            'data_sample': [
+                '"id","blockNo","val1","val2","val3"\n0,0,"AM",0.5,1\n',
+                '"id","blockNo","val1","val2","val3"\n1,0,"AM",0.5,1\n2,0,"AM",0.5,1\n3,0,"AM",0.5,1\n4,0,"AM",0.5,1\n5,0,"AM",0.5,1\n6,0,"AM",0.5,1\n7,0,"AM",0.5,1\n8,0,"AM",0.5,1\n9,0,"AM",0.5,1\n10,0,"AM",0.5,1\n11,0,"AM",0.5,1\n12,0,"AM",0.5,1\n13,0,"AM",0.5,1\n14,0,"AM",0.5,1\n15,0,"AM",0.5,1\n',
+                '"id","blockNo","val1","val2","val3"\n0,0,"AM",0.5,1\n',
+                # broken message
+                '"id","blockNo","val1","val2","val3"\n0,"BAD","AM",0.5,1\n',
+            ],
+            'expected':'''{"raw_message":"\\"id\\",\\"blockNo\\",\\"val1\\",\\"val2\\",\\"val3\\"\\n0,\\"BAD\\",\\"AM\\",0.5,1\\n","error":"Cannot parse input: expected '\\"' before: 'BAD\\",\\"AM\\",0.5,1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'printable':True,
+        },
+        'Values': {
+            'data_sample': [
+                "(0,0,'AM',0.5,1)",
+                "(1,0,'AM',0.5,1),(2,0,'AM',0.5,1),(3,0,'AM',0.5,1),(4,0,'AM',0.5,1),(5,0,'AM',0.5,1),(6,0,'AM',0.5,1),(7,0,'AM',0.5,1),(8,0,'AM',0.5,1),(9,0,'AM',0.5,1),(10,0,'AM',0.5,1),(11,0,'AM',0.5,1),(12,0,'AM',0.5,1),(13,0,'AM',0.5,1),(14,0,'AM',0.5,1),(15,0,'AM',0.5,1)",
+                "(0,0,'AM',0.5,1)",
+                # 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'"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'TSVWithNames': {
+            'data_sample': [
+                'id\tblockNo\tval1\tval2\tval3\n0\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\n1\t0\tAM\t0.5\t1\n2\t0\tAM\t0.5\t1\n3\t0\tAM\t0.5\t1\n4\t0\tAM\t0.5\t1\n5\t0\tAM\t0.5\t1\n6\t0\tAM\t0.5\t1\n7\t0\tAM\t0.5\t1\n8\t0\tAM\t0.5\t1\n9\t0\tAM\t0.5\t1\n10\t0\tAM\t0.5\t1\n11\t0\tAM\t0.5\t1\n12\t0\tAM\t0.5\t1\n13\t0\tAM\t0.5\t1\n14\t0\tAM\t0.5\t1\n15\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\n0\t0\tAM\t0.5\t1\n',
+                # broken message
+                'id\tblockNo\tval1\tval2\tval3\n0\tBAD\tAM\t0.5\t1\n',
+            ],
+            'expected':'''{"raw_message":"id\\tblockNo\\tval1\\tval2\\tval3\\n0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'supports_empty_value': True,
+            'printable':True,
+        },
+        'TSVWithNamesAndTypes': {
+            'data_sample': [
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n1\t0\tAM\t0.5\t1\n2\t0\tAM\t0.5\t1\n3\t0\tAM\t0.5\t1\n4\t0\tAM\t0.5\t1\n5\t0\tAM\t0.5\t1\n6\t0\tAM\t0.5\t1\n7\t0\tAM\t0.5\t1\n8\t0\tAM\t0.5\t1\n9\t0\tAM\t0.5\t1\n10\t0\tAM\t0.5\t1\n11\t0\tAM\t0.5\t1\n12\t0\tAM\t0.5\t1\n13\t0\tAM\t0.5\t1\n14\t0\tAM\t0.5\t1\n15\t0\tAM\t0.5\t1\n',
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\t0\tAM\t0.5\t1\n',
+                # broken message
+                'id\tblockNo\tval1\tval2\tval3\nInt64\tUInt16\tString\tFloat32\tUInt8\n0\tBAD\tAM\t0.5\t1\n',
+            ],
+            'expected':'''{"raw_message":"id\\tblockNo\\tval1\\tval2\\tval3\\nInt64\\tUInt16\\tString\\tFloat32\\tUInt8\\n0\\tBAD\\tAM\\t0.5\\t1\\n","error":"Cannot parse input: expected '\\\\t' before: 'BAD\\\\tAM\\\\t0.5\\\\t1\\\\n': Could not print diagnostic info because two last rows aren't in buffer (rare case)\\n"}''',
+            'printable':True,
+        },
+      'Native': {
+            'data_sample': [
+                b'\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x55\x49\x6e\x74\x31\x36\x00\x00\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01',
+                b'\x05\x0f\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x01\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x55\x49\x6e\x74\x31\x36\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01',
+                b'\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x55\x49\x6e\x74\x31\x36\x00\x00\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01',
+                # broken message
+           b'\x05\x01\x02\x69\x64\x05\x49\x6e\x74\x36\x34\x00\x00\x00\x00\x00\x00\x00\x00\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x06\x53\x74\x72\x69\x6e\x67\x03\x42\x41\x44\x04\x76\x61\x6c\x31\x06\x53\x74\x72\x69\x6e\x67\x02\x41\x4d\x04\x76\x61\x6c\x32\x07\x46\x6c\x6f\x61\x74\x33\x32\x00\x00\x00\x3f\x04\x76\x61\x6c\x33\x05\x55\x49\x6e\x74\x38\x01',
+            ],
+            'expected':'''{"raw_message":"050102696405496E743634000000000000000007626C6F636B4E6F06537472696E67034241440476616C3106537472696E6702414D0476616C3207466C6F617433320000003F0476616C330555496E743801","error":"Cannot convert: String to UInt16"}''',
+            'printable':False,
+        },
+        'RowBinary': {
+            'data_sample': [
+                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                # broken message
+                b'\x00\x00\x00\x00\x00\x00\x00\x00\x03\x42\x41\x44\x02\x41\x4d\x00\x00\x00\x3f\x01',
+            ],
+            'expected':'{"raw_message":"00000000000000000342414402414D0000003F01","error":"Cannot read all data. Bytes read: 9. Bytes expected: 65.: (at row 1)\\n"}',
+            'printable':False,
+        },
+        'RowBinaryWithNamesAndTypes': {
+            'data_sample': [
+                b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x55\x49\x6e\x74\x31\x36\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x55\x49\x6e\x74\x31\x36\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x07\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01\x0f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x55\x49\x6e\x74\x31\x36\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x41\x4d\x00\x00\x00\x3f\x01',
+                # broken message
+            b'\x05\x02\x69\x64\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x04\x76\x61\x6c\x31\x04\x76\x61\x6c\x32\x04\x76\x61\x6c\x33\x05\x49\x6e\x74\x36\x34\x06\x53\x74\x72\x69\x6e\x67\x06\x53\x74\x72\x69\x6e\x67\x07\x46\x6c\x6f\x61\x74\x33\x32\x05\x55\x49\x6e\x74\x38\x00\x00\x00\x00\x00\x00\x00\x00\x03\x42\x41\x44\x02\x41\x4d\x00\x00\x00\x3f\x01',
+            ],
+            'expected':'{"raw_message":"0502696407626C6F636B4E6F0476616C310476616C320476616C3305496E74363406537472696E6706537472696E6707466C6F617433320555496E743800000000000000000342414402414D0000003F01","error":"Cannot read all data. Bytes read: 9. Bytes expected: 65.: (at row 1)\\n"}',
+            'printable':False,
+        },
+        'ORC': {
+            'data_sample': [
+                b'\x4f\x52\x43\x11\x00\x00\x0a\x06\x12\x04\x08\x01\x50\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x30\x00\x00\xe3\x12\xe7\x62\x65\x00\x01\x21\x3e\x0e\x46\x25\x0e\x2e\x46\x03\x21\x46\x03\x09\xa6\x00\x06\x00\x32\x00\x00\xe3\x92\xe4\x62\x65\x00\x01\x21\x01\x0e\x46\x25\x2e\x2e\x26\x47\x5f\x21\x20\x96\x60\x09\x60\x00\x00\x36\x00\x00\xe3\x92\xe1\x62\x65\x00\x01\x21\x61\x0e\x46\x23\x5e\x2e\x46\x03\x21\x66\x03\x3d\x53\x29\x10\x11\xc0\x00\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x05\x00\x00\xff\x00\x03\x00\x00\x30\x07\x00\x00\x40\x00\x80\x05\x00\x00\x41\x4d\x07\x00\x00\x42\x00\x80\x03\x00\x00\x0a\x07\x00\x00\x42\x00\x80\x05\x00\x00\xff\x01\x88\x00\x00\x4d\xca\xc1\x0a\x80\x30\x0c\x03\xd0\x2e\x6b\xcb\x98\x17\xf1\x14\x50\xfc\xff\xcf\xb4\x66\x1e\x3c\x84\x47\x9a\xce\x1c\xb9\x1b\xb7\xf9\xda\x48\x09\x9e\xb2\xf3\x92\xce\x5b\x86\xf6\x56\x7f\x21\x41\x2f\x51\xa6\x7a\xd7\x1d\xe5\xea\xae\x3d\xca\xd5\x83\x71\x60\xd8\x17\xfc\x62\x0f\xa8\x00\x00\xe3\x4a\xe6\x62\xe1\x60\x0c\x60\xe0\xe2\xe3\x60\x14\x62\xe3\x60\x10\x60\x90\x60\x08\x60\x88\x60\xe5\x12\xe0\x60\x54\xe2\xe0\x62\x34\x10\x62\x34\x90\x60\x02\x8a\x70\x71\x09\x01\x45\xb8\xb8\x98\x1c\x7d\x85\x80\x58\x82\x05\x28\xc6\xcd\x25\xca\xc1\x68\xc4\x0b\x52\xc5\x6c\xa0\x67\x2a\x05\x22\xc0\x4a\x21\x86\x31\x09\x30\x81\xb5\xb2\x02\x00\x36\x01\x00\x25\x8c\xbd\x0a\xc2\x30\x14\x85\x73\x6f\x92\xf6\x92\x6a\x09\x01\x21\x64\x92\x4e\x75\x91\x58\x71\xc9\x64\x27\x5d\x2c\x1d\x5d\xfd\x59\xc4\x42\x37\x5f\xc0\x17\xe8\x23\x9b\xc6\xe1\x3b\x70\x0f\xdf\xb9\xc4\xf5\x17\x5d\x41\x5c\x4f\x60\x37\xeb\x53\x0d\x55\x4d\x0b\x23\x01\xb9\x90\x2e\xbf\x0f\xe3\xe3\xdd\x8d\x0e\x5f\x4f\x27\x3e\xb7\x61\x97\xb2\x49\xb9\xaf\x90\x20\x92\x27\x32\x2a\x6b\xf4\xf3\x0d\x1e\x82\x20\xe8\x59\x28\x09\x4c\x46\x4c\x33\xcb\x7a\x76\x95\x41\x47\x9f\x14\x78\x03\xde\x62\x6c\x54\x30\xb1\x51\x0a\xdb\x8b\x89\x58\x11\xbb\x22\xac\x08\x9a\xe5\x6c\x71\xbf\x3d\xb8\x39\x92\xfa\x7f\x86\x1a\xd3\x54\x1e\xa7\xee\xcc\x7e\x08\x9e\x01\x10\x01\x18\x80\x80\x10\x22\x02\x00\x0c\x28\x57\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+                b'\x4f\x52\x43\x11\x00\x00\x0a\x06\x12\x04\x08\x0f\x50\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x0f\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x30\x00\x00\xe3\x12\xe7\x62\x65\x00\x01\x21\x3e\x0e\x7e\x25\x0e\x2e\x46\x43\x21\x46\x4b\x09\xad\x00\x06\x00\x33\x00\x00\x0a\x17\x0a\x03\x00\x00\x00\x12\x10\x08\x0f\x22\x0a\x0a\x02\x41\x4d\x12\x02\x41\x4d\x18\x3c\x50\x00\x3a\x00\x00\xe3\x92\xe1\x62\x65\x00\x01\x21\x61\x0e\x7e\x23\x5e\x2e\x46\x03\x21\x66\x03\x3d\x53\x29\x66\x73\x3d\xd3\x00\x06\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x0f\x12\x06\x08\x02\x10\x02\x18\x1e\x50\x00\x05\x00\x00\x0c\x00\x2b\x00\x00\x31\x32\x33\x34\x35\x36\x37\x38\x39\x31\x30\x31\x31\x31\x32\x31\x33\x31\x34\x31\x35\x09\x00\x00\x06\x01\x03\x02\x09\x00\x00\xc0\x0e\x00\x00\x07\x00\x00\x42\x00\x80\x05\x00\x00\x41\x4d\x0a\x00\x00\xe3\xe2\x42\x01\x00\x09\x00\x00\xc0\x0e\x02\x00\x05\x00\x00\x0c\x01\x94\x00\x00\x2d\xca\xc1\x0e\x80\x30\x08\x03\xd0\xc1\x60\x2e\xf3\x62\x76\x6a\xe2\x0e\xfe\xff\x57\x5a\x3b\x0f\xe4\x51\xe8\x68\xbd\x5d\x05\xe7\xf8\x34\x40\x3a\x6e\x59\xb1\x64\xe0\x91\xa9\xbf\xb1\x97\xd2\x95\x9d\x1e\xca\x55\x3a\x6d\xb4\xd2\xdd\x0b\x74\x9a\x74\xf7\x12\x39\xbd\x97\x7f\x7c\x06\xbb\xa6\x8d\x97\x17\xb4\x00\x00\xe3\x4a\xe6\x62\xe1\xe0\x0f\x60\xe0\xe2\xe3\xe0\x17\x62\xe3\x60\x10\x60\x90\x60\x08\x60\x88\x60\xe5\x12\xe0\xe0\x57\xe2\xe0\x62\x34\x14\x62\xb4\x94\xd0\x02\x8a\xc8\x73\x09\x01\x45\xb8\xb8\x98\x1c\x7d\x85\x80\x58\xc2\x06\x28\x26\xc4\x25\xca\xc1\x6f\xc4\xcb\xc5\x68\x20\xc4\x6c\xa0\x67\x2a\xc5\x6c\xae\x67\x0a\x14\xe6\x87\x1a\xc6\x24\xc0\x24\x21\x07\x32\x0c\x00\x4a\x01\x00\xe3\x60\x16\x58\xc3\x24\xc5\xcd\xc1\x2c\x30\x89\x51\xc2\x4b\xc1\x57\x83\x5f\x49\x83\x83\x47\x88\x95\x91\x89\x99\x85\x55\x8a\x3d\x29\x27\x3f\x39\xdb\x2f\x5f\x8a\x29\x33\x45\x8a\xa5\x2c\x31\xc7\x10\x4c\x1a\x81\x49\x63\x25\x26\x0e\x46\x20\x66\x07\x63\x36\x0e\x3e\x0d\x26\x03\x10\x9f\xd1\x80\xdf\x8a\x85\x83\x3f\x80\xc1\x8a\x8f\x83\x5f\x88\x8d\x83\x41\x80\x41\x82\x21\x80\x21\x82\xd5\x4a\x80\x83\x5f\x89\x83\x8b\xd1\x50\x88\xd1\x52\x42\x0b\x28\x22\x6f\x25\x04\x14\xe1\xe2\x62\x72\xf4\x15\x02\x62\x09\x1b\xa0\x98\x90\x95\x28\x07\xbf\x11\x2f\x17\xa3\x81\x10\xb3\x81\x9e\xa9\x14\xb3\xb9\x9e\x29\x50\x98\x1f\x6a\x18\x93\x00\x93\x84\x1c\xc8\x30\x87\x09\x7e\x1e\x0c\x00\x08\xa8\x01\x10\x01\x18\x80\x80\x10\x22\x02\x00\x0c\x28\x5d\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+                b'\x4f\x52\x43\x11\x00\x00\x0a\x06\x12\x04\x08\x01\x50\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x30\x00\x00\xe3\x12\xe7\x62\x65\x00\x01\x21\x3e\x0e\x46\x25\x0e\x2e\x46\x03\x21\x46\x03\x09\xa6\x00\x06\x00\x32\x00\x00\xe3\x92\xe4\x62\x65\x00\x01\x21\x01\x0e\x46\x25\x2e\x2e\x26\x47\x5f\x21\x20\x96\x60\x09\x60\x00\x00\x36\x00\x00\xe3\x92\xe1\x62\x65\x00\x01\x21\x61\x0e\x46\x23\x5e\x2e\x46\x03\x21\x66\x03\x3d\x53\x29\x10\x11\xc0\x00\x00\x2b\x00\x00\x0a\x13\x0a\x03\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x05\x00\x00\xff\x00\x03\x00\x00\x30\x07\x00\x00\x40\x00\x80\x05\x00\x00\x41\x4d\x07\x00\x00\x42\x00\x80\x03\x00\x00\x0a\x07\x00\x00\x42\x00\x80\x05\x00\x00\xff\x01\x88\x00\x00\x4d\xca\xc1\x0a\x80\x30\x0c\x03\xd0\x2e\x6b\xcb\x98\x17\xf1\x14\x50\xfc\xff\xcf\xb4\x66\x1e\x3c\x84\x47\x9a\xce\x1c\xb9\x1b\xb7\xf9\xda\x48\x09\x9e\xb2\xf3\x92\xce\x5b\x86\xf6\x56\x7f\x21\x41\x2f\x51\xa6\x7a\xd7\x1d\xe5\xea\xae\x3d\xca\xd5\x83\x71\x60\xd8\x17\xfc\x62\x0f\xa8\x00\x00\xe3\x4a\xe6\x62\xe1\x60\x0c\x60\xe0\xe2\xe3\x60\x14\x62\xe3\x60\x10\x60\x90\x60\x08\x60\x88\x60\xe5\x12\xe0\x60\x54\xe2\xe0\x62\x34\x10\x62\x34\x90\x60\x02\x8a\x70\x71\x09\x01\x45\xb8\xb8\x98\x1c\x7d\x85\x80\x58\x82\x05\x28\xc6\xcd\x25\xca\xc1\x68\xc4\x0b\x52\xc5\x6c\xa0\x67\x2a\x05\x22\xc0\x4a\x21\x86\x31\x09\x30\x81\xb5\xb2\x02\x00\x36\x01\x00\x25\x8c\xbd\x0a\xc2\x30\x14\x85\x73\x6f\x92\xf6\x92\x6a\x09\x01\x21\x64\x92\x4e\x75\x91\x58\x71\xc9\x64\x27\x5d\x2c\x1d\x5d\xfd\x59\xc4\x42\x37\x5f\xc0\x17\xe8\x23\x9b\xc6\xe1\x3b\x70\x0f\xdf\xb9\xc4\xf5\x17\x5d\x41\x5c\x4f\x60\x37\xeb\x53\x0d\x55\x4d\x0b\x23\x01\xb9\x90\x2e\xbf\x0f\xe3\xe3\xdd\x8d\x0e\x5f\x4f\x27\x3e\xb7\x61\x97\xb2\x49\xb9\xaf\x90\x20\x92\x27\x32\x2a\x6b\xf4\xf3\x0d\x1e\x82\x20\xe8\x59\x28\x09\x4c\x46\x4c\x33\xcb\x7a\x76\x95\x41\x47\x9f\x14\x78\x03\xde\x62\x6c\x54\x30\xb1\x51\x0a\xdb\x8b\x89\x58\x11\xbb\x22\xac\x08\x9a\xe5\x6c\x71\xbf\x3d\xb8\x39\x92\xfa\x7f\x86\x1a\xd3\x54\x1e\xa7\xee\xcc\x7e\x08\x9e\x01\x10\x01\x18\x80\x80\x10\x22\x02\x00\x0c\x28\x57\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+                # broken message
+            b'\x4f\x52\x43\x0a\x0b\x0a\x03\x00\x00\x00\x12\x04\x08\x01\x50\x00\x0a\x15\x0a\x05\x00\x00\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x0a\x12\x0a\x06\x00\x00\x00\x00\x00\x00\x12\x08\x08\x01\x42\x02\x08\x06\x50\x00\x0a\x12\x0a\x06\x00\x00\x00\x00\x00\x00\x12\x08\x08\x01\x42\x02\x08\x04\x50\x00\x0a\x29\x0a\x04\x00\x00\x00\x00\x12\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x0a\x15\x0a\x05\x00\x00\x00\x00\x00\x12\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\xff\x80\xff\x80\xff\x00\xff\x80\xff\x03\x42\x41\x44\xff\x80\xff\x02\x41\x4d\xff\x80\x00\x00\x00\x3f\xff\x80\xff\x01\x0a\x06\x08\x06\x10\x00\x18\x0d\x0a\x06\x08\x06\x10\x01\x18\x17\x0a\x06\x08\x06\x10\x02\x18\x14\x0a\x06\x08\x06\x10\x03\x18\x14\x0a\x06\x08\x06\x10\x04\x18\x2b\x0a\x06\x08\x06\x10\x05\x18\x17\x0a\x06\x08\x00\x10\x00\x18\x02\x0a\x06\x08\x00\x10\x01\x18\x02\x0a\x06\x08\x01\x10\x01\x18\x02\x0a\x06\x08\x00\x10\x02\x18\x02\x0a\x06\x08\x02\x10\x02\x18\x02\x0a\x06\x08\x01\x10\x02\x18\x03\x0a\x06\x08\x00\x10\x03\x18\x02\x0a\x06\x08\x02\x10\x03\x18\x02\x0a\x06\x08\x01\x10\x03\x18\x02\x0a\x06\x08\x00\x10\x04\x18\x02\x0a\x06\x08\x01\x10\x04\x18\x04\x0a\x06\x08\x00\x10\x05\x18\x02\x0a\x06\x08\x01\x10\x05\x18\x02\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x12\x04\x08\x00\x10\x00\x1a\x03\x47\x4d\x54\x0a\x59\x0a\x04\x08\x01\x50\x00\x0a\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x0a\x08\x08\x01\x42\x02\x08\x06\x50\x00\x0a\x08\x08\x01\x42\x02\x08\x04\x50\x00\x0a\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x0a\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x08\x03\x10\xec\x02\x1a\x0c\x08\x03\x10\x8e\x01\x18\x1d\x20\xc1\x01\x28\x01\x22\x2e\x08\x0c\x12\x05\x01\x02\x03\x04\x05\x1a\x02\x69\x64\x1a\x07\x62\x6c\x6f\x63\x6b\x4e\x6f\x1a\x04\x76\x61\x6c\x31\x1a\x04\x76\x61\x6c\x32\x1a\x04\x76\x61\x6c\x33\x20\x00\x28\x00\x30\x00\x22\x08\x08\x04\x20\x00\x28\x00\x30\x00\x22\x08\x08\x08\x20\x00\x28\x00\x30\x00\x22\x08\x08\x08\x20\x00\x28\x00\x30\x00\x22\x08\x08\x05\x20\x00\x28\x00\x30\x00\x22\x08\x08\x01\x20\x00\x28\x00\x30\x00\x30\x01\x3a\x04\x08\x01\x50\x00\x3a\x0c\x08\x01\x12\x06\x08\x00\x10\x00\x18\x00\x50\x00\x3a\x08\x08\x01\x42\x02\x08\x06\x50\x00\x3a\x08\x08\x01\x42\x02\x08\x04\x50\x00\x3a\x21\x08\x01\x1a\x1b\x09\x00\x00\x00\x00\x00\x00\xe0\x3f\x11\x00\x00\x00\x00\x00\x00\xe0\x3f\x19\x00\x00\x00\x00\x00\x00\xe0\x3f\x50\x00\x3a\x0c\x08\x01\x12\x06\x08\x02\x10\x02\x18\x02\x50\x00\x40\x90\x4e\x48\x01\x08\xd5\x01\x10\x00\x18\x80\x80\x04\x22\x02\x00\x0b\x28\x5b\x30\x06\x82\xf4\x03\x03\x4f\x52\x43\x18',
+            ],
+            'expected':r'''{"raw_message":"4F52430A0B0A030000001204080150000A150A050000000000120C0801120608001000180050000A120A06000000000000120808014202080650000A120A06000000000000120808014202080450000A290A0400000000122108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A150A050000000000120C080112060802100218025000FF80FF80FF00FF80FF03424144FF80FF02414DFF800000003FFF80FF010A0608061000180D0A060806100118170A060806100218140A060806100318140A0608061004182B0A060806100518170A060800100018020A060800100118020A060801100118020A060800100218020A060802100218020A060801100218030A060800100318020A060802100318020A060801100318020A060800100418020A060801100418040A060800100518020A060801100518021204080010001204080010001204080010001204080010001204080010001204080010001A03474D540A590A04080150000A0C0801120608001000180050000A0808014202080650000A0808014202080450000A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50000A0C080112060802100218025000080310EC021A0C0803108E01181D20C1012801222E080C120501020304051A0269641A07626C6F636B4E6F1A0476616C311A0476616C321A0476616C33200028003000220808042000280030002208080820002800300022080808200028003000220808052000280030002208080120002800300030013A04080150003A0C0801120608001000180050003A0808014202080650003A0808014202080450003A2108011A1B09000000000000E03F11000000000000E03F19000000000000E03F50003A0C08011206080210021802500040904E480108D5011000188080042202000B285B300682F403034F524318","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."}''',
+            'printable':False,
+        }
+    }
+
+    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)
+        data_sample = format_opts['data_sample']
+        data_prefix = []
+        raw_message = '_raw_message'
+        # prepend empty value when supported
+        if format_opts.get('supports_empty_value', False):
+            data_prefix = data_prefix + ['']
+        if format_opts.get('printable', False) == False:
+            raw_message = 'hex(_raw_message)'
+        kafka_produce(topic_name, data_prefix + data_sample)
+        instance.query('''
+            DROP TABLE IF EXISTS test.kafka_{format_name};
+
+            CREATE TABLE test.kafka_{format_name} (
+                id Int64,
+                blockNo UInt16,
+                val1 String,
+                val2 Float32,
+                val3 UInt8
+            ) ENGINE = Kafka()
+                SETTINGS kafka_broker_list = 'kafka1:19092',
+                        kafka_topic_list = '{topic_name}',
+                        kafka_group_name = '{topic_name}',
+                        kafka_format = '{format_name}',
+                        kafka_handle_error_mode = 'stream',
+                        kafka_flush_interval_ms = 1000 {extra_settings};
+
+            DROP TABLE IF EXISTS test.kafka_data_{format_name}_mv;
+            CREATE MATERIALIZED VIEW test.kafka_data_{format_name}_mv Engine=Log AS
+                SELECT *, _topic, _partition, _offset FROM test.kafka_{format_name}
+                WHERE length(_error) = 0;
+
+            DROP TABLE IF EXISTS test.kafka_errors_{format_name}_mv;
+            CREATE MATERIALIZED VIEW test.kafka_errors_{format_name}_mv Engine=Log AS
+                SELECT {raw_message} as raw_message, _error as error, _topic as topic, _partition as partition, _offset as offset FROM test.kafka_{format_name}
+                WHERE length(_error) > 0;
+            '''.format(topic_name=topic_name, format_name=format_name, raw_message=raw_message,
+                       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)
+        # 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))
+        expected = '''\
+0	0	AM	0.5	1	{topic_name}	0	{offset_0}
+1	0	AM	0.5	1	{topic_name}	0	{offset_1}
+2	0	AM	0.5	1	{topic_name}	0	{offset_1}
+3	0	AM	0.5	1	{topic_name}	0	{offset_1}
+4	0	AM	0.5	1	{topic_name}	0	{offset_1}
+5	0	AM	0.5	1	{topic_name}	0	{offset_1}
+6	0	AM	0.5	1	{topic_name}	0	{offset_1}
+7	0	AM	0.5	1	{topic_name}	0	{offset_1}
+8	0	AM	0.5	1	{topic_name}	0	{offset_1}
+9	0	AM	0.5	1	{topic_name}	0	{offset_1}
+10	0	AM	0.5	1	{topic_name}	0	{offset_1}
+11	0	AM	0.5	1	{topic_name}	0	{offset_1}
+12	0	AM	0.5	1	{topic_name}	0	{offset_1}
+13	0	AM	0.5	1	{topic_name}	0	{offset_1}
+14	0	AM	0.5	1	{topic_name}	0	{offset_1}
+15	0	AM	0.5	1	{topic_name}	0	{offset_1}
+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])
+        # 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']
+        # print(errors_result.strip())
+        # print(errors_expected.strip())
+        assert  errors_result.strip() == errors_expected.strip(), 'Proper errors for format: {}'.format(format_name)
 
 if __name__ == '__main__':
     cluster.start()
diff --git a/tests/integration/test_storage_mysql/configs/users.xml b/tests/integration/test_storage_mysql/configs/users.xml
new file mode 100644
index 00000000000..27c4d46984e
--- /dev/null
+++ b/tests/integration/test_storage_mysql/configs/users.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<yandex>
+    <profiles>
+        <default>
+            <max_block_size>2</max_block_size>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+        </default>
+    </users>
+</yandex>
diff --git a/tests/integration/test_storage_mysql/test.py b/tests/integration/test_storage_mysql/test.py
index 7b23e20e200..9c3abd799af 100644
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@@ -8,6 +8,9 @@ from helpers.cluster import ClickHouseCluster
 cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance('node1', main_configs=['configs/remote_servers.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)
+
 create_table_sql_template = """
     CREATE TABLE `clickhouse`.`{}` (
     `id` int(11) NOT NULL,
@@ -18,15 +21,30 @@ create_table_sql_template = """
     PRIMARY KEY (`id`)) ENGINE=InnoDB;
     """
 
+def get_mysql_conn(port=3308):
+    conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=port)
+    return conn
+
+
+def create_mysql_db(conn, name):
+    with conn.cursor() as cursor:
+        cursor.execute(
+            "CREATE DATABASE {} DEFAULT CHARACTER SET 'utf8'".format(name))
+
+
+def create_mysql_table(conn, tableName):
+    with conn.cursor() as cursor:
+        cursor.execute(create_table_sql_template.format(tableName))
+
 
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster.start()
 
-        conn = get_mysql_conn()
         ## create mysql db and table
-        create_mysql_db(conn, 'clickhouse')
+        conn1 = get_mysql_conn(port=3308)
+        create_mysql_db(conn1, 'clickhouse')
         yield cluster
 
     finally:
@@ -52,6 +70,7 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
     assert node1.query(query.format(t=table_name)) == '250\n'
     conn.close()
 
+
 def test_insert_select(started_cluster):
     table_name = 'test_insert_select'
     conn = get_mysql_conn()
@@ -148,6 +167,7 @@ def test_table_function(started_cluster):
     assert node1.query("SELECT sum(`money`) FROM {}".format(table_function)).rstrip() == '60000'
     conn.close()
 
+
 def test_binary_type(started_cluster):
     conn = get_mysql_conn()
     with conn.cursor() as cursor:
@@ -156,6 +176,7 @@ def test_binary_type(started_cluster):
     node1.query("INSERT INTO {} VALUES (42, 'clickhouse')".format('TABLE FUNCTION ' + table_function))
     assert node1.query("SELECT * FROM {}".format(table_function)) == '42\tclickhouse\\0\\0\\0\\0\\0\\0\n'
 
+
 def test_enum_type(started_cluster):
     table_name = 'test_enum_type'
     conn = get_mysql_conn()
@@ -168,20 +189,95 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, source Enum8('
     conn.close()
 
 
-def get_mysql_conn():
-    conn = pymysql.connect(user='root', password='clickhouse', host='127.0.0.1', port=3308)
-    return conn
+def test_mysql_distributed(started_cluster):
+    table_name = 'test_replicas'
+
+    conn1 = get_mysql_conn(port=3348)
+    conn2 = get_mysql_conn(port=3388)
+    conn3 = get_mysql_conn(port=3368)
+    conn4 = get_mysql_conn(port=3308)
+
+    create_mysql_db(conn1, 'clickhouse')
+    create_mysql_db(conn2, 'clickhouse')
+    create_mysql_db(conn3, 'clickhouse')
+
+    create_mysql_table(conn1, table_name)
+    create_mysql_table(conn2, table_name)
+    create_mysql_table(conn3, table_name)
+    create_mysql_table(conn4, table_name)
+
+    # Storage with with 3 replicas
+    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'); ''')
+
+    # Fill remote tables with different data to be able to check
+    nodes = [node1, node2, node2, node2]
+    for i in range(1, 5):
+        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, 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{1|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(`mysql1: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
+    query = "SELECT * FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_replicas UNION DISTINCT "
+    query += "SELECT name FROM test_replicas)"
+
+    result = node2.query(query)
+    assert(result == 'host2\nhost3\nhost4\n')
+
+    # Storage with with two shards, each has 2 replicas
+    node2.query('''
+        CREATE TABLE test_shards
+        (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE = ExternalDistributed('MySQL', `mysql{1|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")
+    assert(result == 'host1\nhost3\n')
+
+    # check all replicas are traversed
+    query = "SELECT name FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_shards UNION DISTINCT "
+    query += "SELECT name FROM test_shards) ORDER BY name"
+    result = node2.query(query)
+    assert(result == 'host1\nhost2\nhost3\nhost4\n')
+
+    # disconnect mysql1
+    started_cluster.pause_container('mysql1')
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
+    started_cluster.unpause_container('mysql1')
+    assert(result == 'host2\nhost4\n' or result == 'host3\nhost4\n')
 
 
-def create_mysql_db(conn, name):
-    with conn.cursor() as cursor:
-        cursor.execute(
-            "CREATE DATABASE {} DEFAULT CHARACTER SET 'utf8'".format(name))
+def test_external_settings(started_cluster):
+    table_name = 'test_external_settings'
+    conn = get_mysql_conn()
+    create_mysql_table(conn, table_name)
 
-
-def create_mysql_table(conn, tableName):
-    with conn.cursor() as cursor:
-        cursor.execute(create_table_sql_template.format(tableName))
+    node3.query('''
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql1:3306', 'clickhouse', '{}', 'root', 'clickhouse');
+'''.format(table_name, table_name))
+    node3.query(
+        "INSERT INTO {}(id, name, money) select number, concat('name_', toString(number)), 3 from numbers(100) ".format(
+            table_name))
+    assert node3.query("SELECT count() FROM {}".format(table_name)).rstrip() == '100'
+    assert node3.query("SELECT sum(money) FROM {}".format(table_name)).rstrip() == '300'
+    node3.query("select value from system.settings where name = 'max_block_size' FORMAT TSV") == "2\n"
+    node3.query("select value from system.settings where name = 'external_storage_max_read_rows' FORMAT TSV") == "0\n"
+    assert node3.query("SELECT COUNT(DISTINCT blockNumber()) FROM {} FORMAT TSV".format(table_name)) == '50\n'
+    conn.close()
 
 
 if __name__ == '__main__':
diff --git a/tests/integration/test_storage_postgresql/test.py b/tests/integration/test_storage_postgresql/test.py
index 86a1d3b4547..4daf46360d3 100644
--- a/tests/integration/test_storage_postgresql/test.py
+++ b/tests/integration/test_storage_postgresql/test.py
@@ -10,12 +10,14 @@ from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', main_configs=["configs/log_conf.xml"], with_postgres=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/log_conf.xml'], with_postgres_cluster=True)
 
-def get_postgres_conn(database=False):
+def get_postgres_conn(database=False, port=5432):
     if database == True:
-        conn_string = "host='localhost' dbname='clickhouse' user='postgres' password='mysecretpassword'"
+        conn_string = "host='localhost' port={} dbname='clickhouse' user='postgres' password='mysecretpassword'".format(port)
     else:
-        conn_string = "host='localhost' user='postgres' password='mysecretpassword'"
+        conn_string = "host='localhost' port={} user='postgres' password='mysecretpassword'".format(port)
+
     conn = psycopg2.connect(conn_string)
     conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
     conn.autocommit = True
@@ -30,9 +32,20 @@ def create_postgres_db(conn, name):
 def started_cluster():
     try:
         cluster.start()
-        postgres_conn = get_postgres_conn()
-        print("postgres connected")
+
+        postgres_conn = get_postgres_conn(port=5432)
         create_postgres_db(postgres_conn, 'clickhouse')
+
+        postgres_conn = get_postgres_conn(port=5421)
+        create_postgres_db(postgres_conn, 'clickhouse')
+
+        postgres_conn = get_postgres_conn(port=5441)
+        create_postgres_db(postgres_conn, 'clickhouse')
+
+        postgres_conn = get_postgres_conn(port=5461)
+        create_postgres_db(postgres_conn, 'clickhouse')
+
+        print("postgres connected")
         yield cluster
 
     finally:
@@ -65,13 +78,19 @@ def test_postgres_conversions(started_cluster):
     cursor.execute(
         '''CREATE TABLE IF NOT EXISTS test_types (
         a smallint, b integer, c bigint, d real, e double precision, f serial, g bigserial,
-        h timestamp, i date, j decimal(5, 3), k numeric)''')
+        h timestamp, i date, j decimal(5, 3), k numeric, l boolean)''')
     node1.query('''
         INSERT INTO TABLE FUNCTION postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword') VALUES
-        (-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12', '2000-05-12', 22.222, 22.222)''')
+        (-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12', '2000-05-12', 22.222, 22.222, 1)''')
     result = node1.query('''
-        SELECT a, b, c, d, e, f, g, h, i, j, toDecimal128(k, 3) FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''')
-    assert(result == '-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12\t2000-05-12\t22.222\t22.222\n')
+        SELECT a, b, c, d, e, f, g, h, i, j, toDecimal128(k, 3), l FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''')
+    assert(result == '-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12\t2000-05-12\t22.222\t22.222\t1\n')
+
+    cursor.execute("INSERT INTO test_types (l) VALUES (TRUE), (true), ('yes'), ('y'), ('1');")
+    cursor.execute("INSERT INTO test_types (l) VALUES (FALSE), (false), ('no'), ('off'), ('0');")
+    expected = "1\n1\n1\n1\n1\n1\n0\n0\n0\n0\n0\n"
+    result = node1.query('''SELECT l FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''')
+    assert(result == expected)
 
     cursor.execute(
         '''CREATE TABLE IF NOT EXISTS test_array_dimensions
@@ -186,7 +205,7 @@ def test_concurrent_queries(started_cluster):
     count =  node1.count_in_log('New connection to postgres1:5432')
     print(count, prev_count)
     # 16 is default size for connection pool
-    assert(int(count) == int(prev_count) + 16)
+    assert(int(count) <= int(prev_count) + 16)
 
     def node_insert(_):
         for i in range(5):
@@ -216,7 +235,68 @@ def test_concurrent_queries(started_cluster):
 
     count =  node1.count_in_log('New connection to postgres1:5432')
     print(count, prev_count)
-    assert(int(count) == int(prev_count) + 16)
+    assert(int(count) <= int(prev_count) + 16)
+
+
+def test_postgres_distributed(started_cluster):
+    conn0 = get_postgres_conn(port=5432, database=True)
+    conn1 = get_postgres_conn(port=5421, database=True)
+    conn2 = get_postgres_conn(port=5441, database=True)
+    conn3 = get_postgres_conn(port=5461, database=True)
+
+    cursor0 = conn0.cursor()
+    cursor1 = conn1.cursor()
+    cursor2 = conn2.cursor()
+    cursor3 = conn3.cursor()
+    cursors = [cursor0, cursor1, cursor2, cursor3]
+
+    for i in range(4):
+        cursors[i].execute('CREATE TABLE test_replicas (id Integer, name Text)')
+        cursors[i].execute("""INSERT INTO test_replicas select i, 'host{}' from generate_series(0, 99) as t(i);""".format(i + 1));
+
+    # test multiple ports parsing
+    result = node2.query('''SELECT DISTINCT(name) FROM postgresql(`postgres{1|2|3}:5432`, 'clickhouse', '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`, 'clickhouse', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+    assert(result == 'host3\n' or result == 'host2\n')
+
+    # Create storage with with 3 replicas
+    node2.query('''
+        CREATE TABLE test_replicas
+        (id UInt32, name String)
+        ENGINE = PostgreSQL(`postgres{2|3|4}:5432`, 'clickhouse', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+
+    # Check all replicas are traversed
+    query = "SELECT name FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_replicas UNION DISTINCT "
+    query += "SELECT name FROM test_replicas) ORDER BY name"
+    result = node2.query(query)
+    assert(result == 'host2\nhost3\nhost4\n')
+
+    # Create storage with with two two shards, each has 2 replicas
+    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`, 'clickhouse', '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')
+
+    # Check all replicas are traversed
+    query = "SELECT name FROM ("
+    for i in range (3):
+        query += "SELECT name FROM test_shards UNION DISTINCT "
+    query += "SELECT name FROM test_shards) ORDER BY name"
+    result = node2.query(query)
+    assert(result == 'host1\nhost2\nhost3\nhost4\n')
+
+    # Disconnect postgres1
+    started_cluster.pause_container('postgres1')
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
+    started_cluster.unpause_container('postgres1')
+    assert(result == 'host2\nhost4\n' or result == 'host3\nhost4\n')
 
 
 if __name__ == '__main__':
diff --git a/tests/integration/test_storage_rabbitmq/test.py b/tests/integration/test_storage_rabbitmq/test.py
index 50fcdd8d77e..1f14886e50f 100644
--- a/tests/integration/test_storage_rabbitmq/test.py
+++ b/tests/integration/test_storage_rabbitmq/test.py
@@ -26,24 +26,13 @@ rabbitmq_id = ''
 # Helpers
 
 def check_rabbitmq_is_available():
-    p = subprocess.Popen(('docker',
-                          'exec',
-                          '-i',
-                          rabbitmq_id,
-                          'rabbitmqctl',
-                          'await_startup'),
-                         stdout=subprocess.PIPE)
+    p = subprocess.Popen(('docker', 'exec', '-i', rabbitmq_id, 'rabbitmqctl', 'await_startup'), stdout=subprocess.PIPE)
     p.communicate()
     return p.returncode == 0
 
 
 def enable_consistent_hash_plugin():
-    p = subprocess.Popen(('docker',
-                          'exec',
-                          '-i',
-                          rabbitmq_id,
-                          "rabbitmq-plugins", "enable", "rabbitmq_consistent_hash_exchange"),
-                         stdout=subprocess.PIPE)
+    p = subprocess.Popen(('docker', 'exec', '-i', rabbitmq_id, "rabbitmq-plugins", "enable", "rabbitmq_consistent_hash_exchange"), stdout=subprocess.PIPE)
     p.communicate()
     return p.returncode == 0
 
@@ -1834,23 +1823,12 @@ def test_rabbitmq_commit_on_block_write(rabbitmq_cluster):
 
     cancel.set()
 
-    instance.query('''
-        DROP TABLE test.rabbitmq;
-    ''')
+    instance.query('DETACH TABLE test.rabbitmq;')
 
     while int(instance.query("SELECT count() FROM system.tables WHERE database='test' AND name='rabbitmq'")) == 1:
         time.sleep(1)
 
-    instance.query('''
-        CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
-            ENGINE = RabbitMQ
-            SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
-                     rabbitmq_exchange_name = 'block',
-                     rabbitmq_format = 'JSONEachRow',
-                     rabbitmq_max_block_size = 100,
-                     rabbitmq_queue_base = 'block',
-                     rabbitmq_row_delimiter = '\\n';
-    ''')
+    instance.query('ATTACH TABLE test.rabbitmq;')
 
     while int(instance.query('SELECT uniqExact(key) FROM test.view')) < i[0]:
         time.sleep(1)
@@ -1971,6 +1949,164 @@ def test_rabbitmq_format_factory_settings(rabbitmq_cluster):
     assert(result == expected)
 
 
+@pytest.mark.timeout(120)
+def test_rabbitmq_vhost(rabbitmq_cluster):
+    instance.query('''
+        CREATE TABLE test.rabbitmq_vhost (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
+                     rabbitmq_exchange_name = 'vhost',
+                     rabbitmq_format = 'JSONEachRow',
+                     rabbitmq_vhost = '/'
+        ''')
+
+    credentials = pika.PlainCredentials('root', 'clickhouse')
+    parameters = pika.ConnectionParameters('localhost', 5672, '/', credentials)
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+    channel.basic_publish(exchange='vhost', routing_key='', body=json.dumps({'key': 1, 'value': 2}))
+    connection.close()
+    while True:
+        result = instance.query('SELECT * FROM test.rabbitmq_vhost ORDER BY key', ignore_error=True)
+        if result == "1\t2\n":
+            break
+
+
+@pytest.mark.timeout(120)
+def test_rabbitmq_drop_table_properly(rabbitmq_cluster):
+    instance.query('''
+        CREATE TABLE test.rabbitmq_drop (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
+                     rabbitmq_exchange_name = 'drop',
+                     rabbitmq_format = 'JSONEachRow',
+                     rabbitmq_queue_base = 'rabbit_queue_drop'
+        ''')
+
+    credentials = pika.PlainCredentials('root', 'clickhouse')
+    parameters = pika.ConnectionParameters('localhost', 5672, '/', credentials)
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+
+    channel.basic_publish(exchange='drop', routing_key='', body=json.dumps({'key': 1, 'value': 2}))
+    while True:
+        result = instance.query('SELECT * FROM test.rabbitmq_drop ORDER BY key', ignore_error=True)
+        if result == "1\t2\n":
+            break
+
+    exists = channel.queue_declare(queue='rabbit_queue_drop', passive=True)
+    assert(exists)
+
+    instance.query("DROP TABLE test.rabbitmq_drop")
+    time.sleep(30)
+
+    try:
+        exists = channel.queue_declare(callback, queue='rabbit_queue_drop', passive=True)
+    except Exception as e:
+        exists = False
+
+    assert(not exists)
+
+
+@pytest.mark.timeout(120)
+def test_rabbitmq_queue_settings(rabbitmq_cluster):
+    instance.query('''
+        CREATE TABLE test.rabbitmq_settings (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
+                     rabbitmq_exchange_name = 'rabbit_exchange',
+                     rabbitmq_format = 'JSONEachRow',
+                     rabbitmq_queue_base = 'rabbit_queue_settings',
+                     rabbitmq_queue_settings_list = 'x-max-length=10,x-overflow=reject-publish'
+        ''')
+
+    credentials = pika.PlainCredentials('root', 'clickhouse')
+    parameters = pika.ConnectionParameters('localhost', 5672, '/', credentials)
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+
+    for i in range(50):
+        channel.basic_publish(exchange='rabbit_exchange', routing_key='', body=json.dumps({'key': 1, 'value': 2}))
+    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
+            SELECT * FROM test.rabbitmq_settings;
+        ''')
+
+    time.sleep(5)
+
+    result = instance.query('SELECT count() FROM test.rabbitmq_settings', ignore_error=True)
+    while int(result) != 10:
+        time.sleep(0.5)
+        result = instance.query('SELECT count() FROM test.view', ignore_error=True)
+
+    instance.query('DROP TABLE test.rabbitmq_settings')
+
+    # queue size is 10, but 50 messages were sent, they will be dropped (setting x-overflow = reject-publish) and only 10 will remain.
+    assert(int(result) == 10)
+
+
+@pytest.mark.timeout(120)
+def test_rabbitmq_queue_consume(rabbitmq_cluster):
+    credentials = pika.PlainCredentials('root', 'clickhouse')
+    parameters = pika.ConnectionParameters('localhost', 5672, '/', credentials)
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+    channel.queue_declare(queue='rabbit_queue', durable=True)
+
+    i = [0]
+    messages_num = 1000
+    def produce():
+        connection = pika.BlockingConnection(parameters)
+        channel = connection.channel()
+        messages = []
+        for _ in range(messages_num):
+            message = json.dumps({'key': i[0], 'value': i[0]})
+            channel.basic_publish(exchange='', routing_key='rabbit_queue', body=message)
+            i[0] += 1
+
+    threads = []
+    threads_num = 10
+    for _ in range(threads_num):
+        threads.append(threading.Thread(target=produce))
+    for thread in threads:
+        time.sleep(random.uniform(0, 1))
+        thread.start()
+
+    instance.query('''
+        CREATE TABLE test.rabbitmq_queue (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
+                     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
+            SELECT * FROM test.rabbitmq_queue;
+        ''')
+
+    result = ''
+    while True:
+        result = instance.query('SELECT count() FROM test.view')
+        if int(result) == messages_num * threads_num:
+            break
+        time.sleep(1)
+
+    for thread in threads:
+        thread.join()
+
+    instance.query('DROP TABLE test.rabbitmq_queue')
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_s3/s3_mocks/echo.py b/tests/integration/test_storage_s3/s3_mocks/echo.py
new file mode 100644
index 00000000000..ced84e54d62
--- /dev/null
+++ b/tests/integration/test_storage_s3/s3_mocks/echo.py
@@ -0,0 +1,33 @@
+import http.server
+import sys
+
+
+class RequestHandler(http.server.BaseHTTPRequestHandler):
+    def do_HEAD(self):
+        if self.path.startswith("/get-my-path/"):
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
+        elif self.path == "/":
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
+        else:
+            self.send_response(404)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
+
+    def do_GET(self):
+        self.do_HEAD()
+        if self.path.startswith("/get-my-path/"):
+            self.wfile.write(b'/' + self.path.split('/', maxsplit=2)[2].encode())
+
+        elif self.path == "/":
+            self.wfile.write(b"OK")
+
+
+httpd = http.server.HTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
+httpd.serve_forever()
diff --git a/tests/integration/test_storage_s3/s3_mock/mock_s3.py b/tests/integration/test_storage_s3/s3_mocks/mock_s3.py
similarity index 60%
rename from tests/integration/test_storage_s3/s3_mock/mock_s3.py
rename to tests/integration/test_storage_s3/s3_mocks/mock_s3.py
index 088cc883e57..9009d345f49 100644
--- a/tests/integration/test_storage_s3/s3_mock/mock_s3.py
+++ b/tests/integration/test_storage_s3/s3_mocks/mock_s3.py
@@ -1,3 +1,5 @@
+import sys
+
 from bottle import abort, route, run, request, response
 
 
@@ -13,7 +15,9 @@ def server(_bucket, _path):
     for name in request.headers:
         if name == 'Authorization' and request.headers[name] == 'Bearer TOKEN':
             return '1, 2, 3'
-    abort(403)
+    response.status = 403
+    response.content_type = 'text/xml'
+    return '<?xml version="1.0" encoding="UTF-8"?><Error><Code>ForbiddenError</Code><Message>Forbidden Error</Message><RequestId>txfbd566d03042474888193-00608d7537</RequestId></Error>'
 
 
 @route('/')
@@ -21,4 +25,4 @@ def ping():
     return 'OK'
 
 
-run(host='0.0.0.0', port=8080)
+run(host='0.0.0.0', port=int(sys.argv[1]))
diff --git a/tests/integration/test_storage_s3/s3_mocks/unstable_server.py b/tests/integration/test_storage_s3/s3_mocks/unstable_server.py
new file mode 100644
index 00000000000..4a27845ff9f
--- /dev/null
+++ b/tests/integration/test_storage_s3/s3_mocks/unstable_server.py
@@ -0,0 +1,90 @@
+import http.server
+import random
+import re
+import socket
+import struct
+import sys
+
+
+def gen_n_digit_number(n):
+    assert 0 < n < 19
+    return random.randint(10**(n-1), 10**n-1)
+
+
+def gen_line():
+    columns = 4
+
+    row = []
+    def add_number():
+        digits = random.randint(1, 18)
+        row.append(gen_n_digit_number(digits))
+
+    for i in range(columns // 2):
+        add_number()
+    row.append(1)
+    for i in range(columns - 1 - columns // 2):
+        add_number()
+
+    line = ",".join(map(str, row)) + "\n"
+    return line.encode()
+
+
+random.seed("Unstable server/1.0")
+lines = b"".join((gen_line() for _ in range(500000)))
+
+
+class RequestHandler(http.server.BaseHTTPRequestHandler):
+    def do_HEAD(self):
+        if self.path == "/root/test.csv":
+            self.from_bytes = 0
+            self.end_bytes = len(lines)
+            self.size = self.end_bytes
+            self.send_block_size = 256
+            self.stop_at = random.randint(900000, 1200000) // self.send_block_size # Block size is 1024**2.
+
+            if "Range" in self.headers:
+                cr = self.headers["Range"]
+                parts = re.split("[ -/=]+", cr)
+                assert parts[0] == "bytes"
+                self.from_bytes = int(parts[1])
+                if parts[2]:
+                    self.end_bytes = int(parts[2])+1
+                self.send_response(206)
+                self.send_header("Content-Range", f"bytes {self.from_bytes}-{self.end_bytes-1}/{self.size}")
+            else:
+                self.send_response(200)
+
+            self.send_header("Accept-Ranges", "bytes")
+            self.send_header("Content-Type", "text/plain")
+            self.send_header("Content-Length", f"{self.end_bytes-self.from_bytes}")
+            self.end_headers()
+
+        elif self.path == "/":
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
+        else:
+            self.send_response(404)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+
+
+    def do_GET(self):
+        self.do_HEAD()
+        if self.path == "/root/test.csv":
+            for c, i in enumerate(range(self.from_bytes, self.end_bytes, self.send_block_size)):
+                self.wfile.write(lines[i:min(i+self.send_block_size, self.end_bytes)])
+                if (c + 1) % self.stop_at == 0:
+                    #self.wfile._sock.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, struct.pack("ii", 0, 0))
+                    #self.wfile._sock.shutdown(socket.SHUT_RDWR)
+                    #self.wfile._sock.close()
+                    print('Dropping connection')
+                    break
+
+        elif self.path == "/":
+            self.wfile.write(b"OK")
+
+
+httpd = http.server.HTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
+httpd.serve_forever()
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 8baa1cd64b0..667b8219b00 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -96,7 +96,7 @@ def cluster():
 
         prepare_s3_bucket(cluster)
         logging.info("S3 bucket created")
-        run_s3_mock(cluster)
+        run_s3_mocks(cluster)
 
         yield cluster
     finally:
@@ -113,13 +113,18 @@ def run_query(instance, query, stdin=None, settings=None):
     return result
 
 
-# Test simple put.
-@pytest.mark.parametrize("maybe_auth,positive", [
-    ("", True),
-    ("'minio','minio123',", True),
-    ("'wrongid','wrongkey',", False)
+# Test simple put. Also checks that wrong credentials produce an error with every compression method.
+@pytest.mark.parametrize("maybe_auth,positive,compression", [
+    ("", True, 'auto'),
+    ("'minio','minio123',", True, 'auto'),
+    ("'wrongid','wrongkey',", False, 'auto'),
+    ("'wrongid','wrongkey',", False, 'gzip'),
+    ("'wrongid','wrongkey',", False, 'deflate'),
+    ("'wrongid','wrongkey',", False, 'brotli'),
+    ("'wrongid','wrongkey',", False, 'xz'),
+    ("'wrongid','wrongkey',", False, 'zstd')
 ])
-def test_put(cluster, maybe_auth, positive):
+def test_put(cluster, maybe_auth, positive, compression):
     # type: (ClickHouseCluster) -> None
 
     bucket = cluster.minio_bucket if not maybe_auth else cluster.minio_restricted_bucket
@@ -128,8 +133,8 @@ def test_put(cluster, maybe_auth, positive):
     values = "(1, 2, 3), (3, 2, 1), (78, 43, 45)"
     values_csv = "1,2,3\n3,2,1\n78,43,45\n"
     filename = "test.csv"
-    put_query = "insert into table function s3('http://{}:{}/{}/{}', {}'CSV', '{}') values {}".format(
-        cluster.minio_host, cluster.minio_port, bucket, filename, maybe_auth, table_format, values)
+    put_query = f"""insert into table function s3('http://{cluster.minio_host}:{cluster.minio_port}/{bucket}/{filename}',
+                    {maybe_auth}'CSV', '{table_format}', {compression}) values {values}"""
 
     try:
         run_query(instance, put_query)
@@ -141,6 +146,47 @@ def test_put(cluster, maybe_auth, positive):
         assert values_csv == get_s3_file_content(cluster, bucket, filename)
 
 
+@pytest.mark.parametrize("special", [
+    "space",
+    "plus"
+])
+def test_get_file_with_special(cluster, special):
+    symbol = {"space": " ", "plus": "+"}[special]
+    urlsafe_symbol = {"space": "%20", "plus": "%2B"}[special]
+    auth = "'minio','minio123',"
+    bucket = cluster.minio_restricted_bucket
+    instance = cluster.instances["dummy"]
+    table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
+    values = [[12549, 2463, 19893], [64021, 38652, 66703], [81611, 39650, 83516], [11079, 59507, 61546], [51764, 69952, 6876], [41165, 90293, 29095], [40167, 78432, 48309], [81629, 81327, 11855], [55852, 21643, 98507], [6738, 54643, 41155]]
+    values_csv = ('\n'.join((','.join(map(str, row)) for row in values)) + '\n').encode()
+    filename = f"get_file_with_{special}_{symbol}two.csv"
+    put_s3_file_content(cluster, bucket, filename, values_csv)
+
+    get_query = f"SELECT * FROM s3('http://{cluster.minio_host}:{cluster.minio_port}/{bucket}/get_file_with_{special}_{urlsafe_symbol}two.csv', {auth}'CSV', '{table_format}') FORMAT TSV"
+    assert [list(map(int, l.split())) for l in run_query(instance, get_query).splitlines()] == values
+
+    get_query = f"SELECT * FROM s3('http://{cluster.minio_host}:{cluster.minio_port}/{bucket}/get_file_with_{special}*.csv', {auth}'CSV', '{table_format}') FORMAT TSV"
+    assert [list(map(int, l.split())) for l in run_query(instance, get_query).splitlines()] == values
+
+    get_query = f"SELECT * FROM s3('http://{cluster.minio_host}:{cluster.minio_port}/{bucket}/get_file_with_{special}_{urlsafe_symbol}*.csv', {auth}'CSV', '{table_format}') FORMAT TSV"
+    assert [list(map(int, l.split())) for l in run_query(instance, get_query).splitlines()] == values
+
+
+@pytest.mark.parametrize("special", [
+    "space",
+    "plus",
+    "plus2"
+])
+def test_get_path_with_special(cluster, special):
+    symbol = {"space": "%20", "plus": "%2B", "plus2": "%2B"}[special]
+    safe_symbol = {"space": "%20", "plus": "+", "plus2": "%2B"}[special]
+    auth = "'minio','minio123',"
+    table_format = "column1 String"
+    instance = cluster.instances["dummy"]
+    get_query = f"SELECT * FROM s3('http://resolver:8082/get-my-path/{safe_symbol}.csv', {auth}'CSV', '{table_format}') FORMAT TSV"
+    assert run_query(instance, get_query).splitlines() == [f"/{symbol}.csv"]
+
+
 # Test put no data to S3.
 @pytest.mark.parametrize("auth", [
     "'minio','minio123',"
@@ -379,26 +425,33 @@ def test_s3_glob_scheherazade(cluster):
     assert run_query(instance, query).splitlines() == ["1001\t1001\t1001\t1001"]
 
 
-def run_s3_mock(cluster):
-    logging.info("Starting s3 mock")
-    container_id = cluster.get_container_id('resolver')
-    current_dir = os.path.dirname(__file__)
-    cluster.copy_file_to_container(container_id, os.path.join(current_dir, "s3_mock", "mock_s3.py"), "mock_s3.py")
-    cluster.exec_in_container(container_id, ["python", "mock_s3.py"], detach=True)
+def run_s3_mocks(cluster):
+    logging.info("Starting s3 mocks")
+    mocks = (
+        ("mock_s3.py", "resolver", "8080"),
+        ("unstable_server.py", "resolver", "8081"),
+        ("echo.py", "resolver", "8082"),
+    )
+    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 mock start
-    for attempt in range(10):
-        ping_response = cluster.exec_in_container(cluster.get_container_id('resolver'),
-                                                  ["curl", "-s", "http://resolver:8080/"], nothrow=True)
-        if ping_response != 'OK':
-            if attempt == 9:
-                assert ping_response == 'OK', 'Expected "OK", but got "{}"'.format(ping_response)
+    # Wait for S3 mocks to start
+    for mock_filename, container, port in mocks:
+        for attempt in range(10):
+            ping_response = cluster.exec_in_container(cluster.get_container_id(container),
+                                                      ["curl", "-s", f"http://{container}:{port}/"], nothrow=True)
+            if ping_response != 'OK':
+                if attempt == 9:
+                    assert ping_response == 'OK', 'Expected "OK", but got "{}"'.format(ping_response)
+                else:
+                    time.sleep(1)
             else:
-                time.sleep(1)
-        else:
-            break
+                break
 
-    logging.info("S3 mock started")
+    logging.info("S3 mocks started")
 
 
 def replace_config(old, new):
@@ -451,7 +504,7 @@ def test_custom_auth_headers_exclusion(cluster):
         print(result)
 
     assert ei.value.returncode == 243
-    assert '403 Forbidden' in ei.value.stderr
+    assert 'Forbidden Error' in ei.value.stderr
 
 
 def test_infinite_redirect(cluster):
@@ -518,6 +571,15 @@ def test_storage_s3_get_gzip(cluster, extension, method):
         run_query(instance, f"DROP TABLE {name}")
 
 
+def test_storage_s3_get_unstable(cluster):
+    bucket = cluster.minio_bucket
+    instance = cluster.instances["dummy"]
+    table_format = "column1 Int64, column2 Int64, column3 Int64, column4 Int64"
+    get_query = f"SELECT count(), sum(column3) FROM s3('http://resolver:8081/{cluster.minio_bucket}/test.csv', 'CSV', '{table_format}') FORMAT CSV"
+    result = run_query(instance, get_query)
+    assert result.splitlines() == ["500000,500000"]
+
+
 def test_storage_s3_put_uncompressed(cluster):
     bucket = cluster.minio_bucket
     instance = cluster.instances["dummy"]
diff --git a/tests/integration/test_ttl_replicated/test.py b/tests/integration/test_ttl_replicated/test.py
index 67614b88029..f32edc36a71 100644
--- a/tests/integration/test_ttl_replicated/test.py
+++ b/tests/integration/test_ttl_replicated/test.py
@@ -3,7 +3,7 @@ import time
 import helpers.client as client
 import pytest
 from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
+from helpers.test_tools import TSV, exec_query_with_retry
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', with_zookeeper=True)
@@ -392,11 +392,13 @@ def test_ttl_compatibility(started_cluster, node_left, node_right, num_run):
     
     time.sleep(5) # Wait for TTL
 
-    node_right.query("OPTIMIZE TABLE test_ttl_delete FINAL")
+    # after restart table can be in readonly mode
+    exec_query_with_retry(node_right, "OPTIMIZE TABLE test_ttl_delete FINAL")
+
     node_right.query("OPTIMIZE TABLE test_ttl_group_by FINAL")
     node_right.query("OPTIMIZE TABLE test_ttl_where FINAL")
+    exec_query_with_retry(node_left, "SYSTEM SYNC REPLICA test_ttl_delete")
 
-    node_left.query("SYSTEM SYNC REPLICA test_ttl_delete", timeout=20)
     node_left.query("SYSTEM SYNC REPLICA test_ttl_group_by", timeout=20)
     node_left.query("SYSTEM SYNC REPLICA test_ttl_where", timeout=20)
 
diff --git a/tests/integration/test_version_update/__init__.py b/tests/integration/test_version_update/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_version_update/test.py b/tests/integration/test_version_update/test.py
new file mode 100644
index 00000000000..ecf24a7b194
--- /dev/null
+++ b/tests/integration/test_version_update/test.py
@@ -0,0 +1,28 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance('node1', with_zookeeper=True, image='yandex/clickhouse-server', tag='21.2', with_installed_binary=True, stay_alive=True)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_modulo_partition_key_after_update(start_cluster):
+    node1.query("CREATE TABLE test (id Int64, v UInt64, value String) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/table1', '1', v) PARTITION BY id % 20 ORDER BY (id, v)")
+    node1.query("INSERT INTO test SELECT number, number, toString(number) FROM numbers(10)")
+    expected = node1.query("SELECT number, number, toString(number) FROM numbers(10)")
+    partition_data = node1.query("SELECT partition, name FROM system.parts WHERE table='test' ORDER BY partition")
+    assert(expected == node1.query("SELECT * FROM test ORDER BY id"))
+    node1.restart_with_latest_version(signal=9)
+    assert(expected == node1.query("SELECT * FROM test ORDER BY id"))
+    assert(partition_data == node1.query("SELECT partition, name FROM system.parts WHERE table='test' ORDER BY partition"))
diff --git a/tests/integration/test_version_update_after_mutation/test.py b/tests/integration/test_version_update_after_mutation/test.py
index 79e5dece174..1ef65512959 100644
--- a/tests/integration/test_version_update_after_mutation/test.py
+++ b/tests/integration/test_version_update_after_mutation/test.py
@@ -1,7 +1,8 @@
 import pytest
+import time
 
 from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import assert_eq_with_retry
+from helpers.test_tools import assert_eq_with_retry, exec_query_with_retry
 
 cluster = ClickHouseCluster(__file__)
 
@@ -34,12 +35,12 @@ def test_mutate_and_upgrade(start_cluster):
     node1.query("ALTER TABLE mt DELETE WHERE id = 2", settings={"mutations_sync": "2"})
     node2.query("SYSTEM SYNC REPLICA mt", timeout=5)
 
-    node1.restart_with_latest_version()
-    node2.restart_with_latest_version()
+    node1.restart_with_latest_version(signal=9)
+    node2.restart_with_latest_version(signal=9)
 
-    node2.query("INSERT INTO mt VALUES ('2020-02-13', 3);")
-
-    node1.query("SYSTEM SYNC REPLICA mt", timeout=5)
+    # After hard restart table can be in readonly mode
+    exec_query_with_retry(node2, "INSERT INTO mt VALUES ('2020-02-13', 3)")
+    exec_query_with_retry(node1, "SYSTEM SYNC REPLICA mt")
 
     assert node1.query("SELECT COUNT() FROM mt") == "2\n"
     assert node2.query("SELECT COUNT() FROM mt") == "2\n"
@@ -73,12 +74,12 @@ def test_upgrade_while_mutation(start_cluster):
 
     node3.query("INSERT INTO mt1 select '2020-02-13', number from numbers(100000)")
 
-    node3.query("SYSTEM STOP MERGES")
+    node3.query("SYSTEM STOP MERGES mt1")
     node3.query("ALTER TABLE mt1 DELETE WHERE id % 2 == 0")
 
-    node3.restart_with_latest_version()
+    node3.restart_with_latest_version(signal=9)
 
+    exec_query_with_retry(node3, "ALTER TABLE mt1 DELETE WHERE id > 100000", settings={"mutations_sync": "2"})
     # will delete nothing, but previous async mutation will finish with this query
-    node3.query("ALTER TABLE mt1 DELETE WHERE id > 100000", settings={"mutations_sync": "2"})
 
     assert_eq_with_retry(node3, "SELECT COUNT() from mt1", "50000\n")
diff --git a/tests/integration/test_zookeeper_config/test.py b/tests/integration/test_zookeeper_config/test.py
index 584f76c80f0..432765e6dd2 100644
--- a/tests/integration/test_zookeeper_config/test.py
+++ b/tests/integration/test_zookeeper_config/test.py
@@ -126,6 +126,7 @@ def test_identity():
         cluster_2.shutdown()
 
 
+# NOTE this test have to be ported to Keeper
 def test_secure_connection():
     # We need absolute path in zookeeper volumes. Generate it dynamically.
     TEMPLATE = '''
@@ -162,12 +163,12 @@ def test_secure_connection():
                                                         "configs_secure/conf.d/remote_servers.xml",
                                                         "configs_secure/conf.d/ssl_conf.xml"],
                                  with_zookeeper=True, zookeeper_docker_compose_path=docker_compose.name,
-                                 zookeeper_use_tmpfs=False)
+                                 zookeeper_use_tmpfs=False, use_keeper=False)
     node2 = cluster.add_instance('node2', main_configs=["configs_secure/client.crt", "configs_secure/client.key",
                                                         "configs_secure/conf.d/remote_servers.xml",
                                                         "configs_secure/conf.d/ssl_conf.xml"],
                                  with_zookeeper=True, zookeeper_docker_compose_path=docker_compose.name,
-                                 zookeeper_use_tmpfs=False)
+                                 zookeeper_use_tmpfs=False, use_keeper=False)
 
     try:
         cluster.start()
diff --git a/tests/jepsen.clickhouse-keeper/resources/config.xml b/tests/jepsen.clickhouse-keeper/resources/config.xml
deleted file mode 120000
index c7596baa075..00000000000
--- a/tests/jepsen.clickhouse-keeper/resources/config.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../programs/server/config.xml
\ No newline at end of file
diff --git a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
index 223481bdaea..f06d9683990 100644
--- a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
+++ b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
@@ -1,4 +1,12 @@
 <yandex>
+    <listen_host>::</listen_host>
+
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+    </logger>
+
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>{id}</server_id>
@@ -9,6 +17,9 @@
             <force_sync>false</force_sync>
             <startup_timeout>120000</startup_timeout>
             <raft_logs_level>trace</raft_logs_level>
+            <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>
             <quorum_reads>{quorum_reads}</quorum_reads>
             <snapshot_distance>{snapshot_distance}</snapshot_distance>
             <stale_log_gap>{stale_log_gap}</stale_log_gap>
diff --git a/tests/jepsen.clickhouse-keeper/resources/listen.xml b/tests/jepsen.clickhouse-keeper/resources/listen.xml
deleted file mode 100644
index de8c737ff75..00000000000
--- a/tests/jepsen.clickhouse-keeper/resources/listen.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<yandex>
-    <listen_host>::</listen_host>
-</yandex>
diff --git a/tests/jepsen.clickhouse-keeper/resources/users.xml b/tests/jepsen.clickhouse-keeper/resources/users.xml
deleted file mode 120000
index 41b137a130f..00000000000
--- a/tests/jepsen.clickhouse-keeper/resources/users.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../programs/server/users.xml
\ No newline at end of file
diff --git a/tests/jepsen.clickhouse-keeper/resources/zoo.cfg b/tests/jepsen.clickhouse-keeper/resources/zoo.cfg
new file mode 100644
index 00000000000..fd49be16d0f
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/resources/zoo.cfg
@@ -0,0 +1,23 @@
+# http://hadoop.apache.org/zookeeper/docs/current/zookeeperAdmin.html
+
+# The number of milliseconds of each tick
+tickTime=2000
+# The number of ticks that the initial
+# synchronization phase can take
+initLimit=10
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
+syncLimit=5
+# the directory where the snapshot is stored.
+dataDir=/var/lib/zookeeper
+# Place the dataLogDir to a separate physical disc for better performance
+# dataLogDir=/disk2/zookeeper
+
+# the port at which the clients will connect
+clientPort=2181
+
+# Leader accepts client connections. Default value is "yes". The leader machine
+# coordinates updates. For higher update throughput at thes slight expense of
+# read throughput the leader can be configured to not accept clients and focus
+# on coordination.
+leaderServes=yes
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/bench.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/bench.clj
new file mode 100644
index 00000000000..040d2eaa77b
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/bench.clj
@@ -0,0 +1,39 @@
+(ns jepsen.clickhouse-keeper.bench
+  (:require [clojure.tools.logging :refer :all]
+            [jepsen
+             [client :as client]])
+  (:import (java.lang ProcessBuilder)
+           (java.lang ProcessBuilder$Redirect)))
+
+(defn exec-process-builder
+  [command & args]
+  (let [pbuilder (ProcessBuilder. (into-array (cons command args)))]
+    (.redirectOutput pbuilder ProcessBuilder$Redirect/INHERIT)
+    (.redirectError pbuilder ProcessBuilder$Redirect/INHERIT)
+    (let [p (.start pbuilder)]
+      (.waitFor p))))
+
+(defrecord BenchClient [port]
+  client/Client
+  (open! [this test node]
+    this)
+
+  (setup! [this test]
+    this)
+
+  (invoke! [this test op]
+    (let [bench-opts (into [] (clojure.string/split (:bench-opts op) #" "))
+          bench-path (:bench-path op)
+          nodes (into [] (flatten (map (fn [x] (identity ["-h" (str x ":" port)])) (:nodes test))))
+          all-args (concat [bench-path] bench-opts nodes)]
+      (info "Running cmd" all-args)
+      (apply exec-process-builder all-args)
+      (assoc op :type :ok :value "ok")))
+
+  (teardown! [_ test])
+
+  (close! [_ test]))
+
+(defn bench-client
+  [port]
+  (BenchClient. port))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/constants.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/constants.clj
index 15dafa1a514..cd62d66e652 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/constants.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/constants.clj
@@ -16,3 +16,5 @@
 (def coordination-logs-dir (str coordination-data-dir "/logs"))
 
 (def stderr-file (str logs-dir "/stderr.log"))
+
+(def binaries-cache-dir (str common-prefix "/binaries"))
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 0f86347d1f8..30c2c0eaf4f 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
@@ -17,9 +17,11 @@
 
 (defn get-clickhouse-url
   [url]
-  (let [download-result (cu/wget! url)]
-    (do (c/exec :mv download-result common-prefix)
-        (str common-prefix "/" download-result))))
+  (non-precise-cached-wget! url))
+
+(defn get-clickhouse-scp
+  [path]
+  (c/upload path (str common-prefix "/clickhouse")))
 
 (defn download-clickhouse
   [source]
@@ -27,6 +29,7 @@
   (cond
     (clojure.string/starts-with? source "rbtorrent:") (get-clickhouse-sky source)
     (clojure.string/starts-with? source "http") (get-clickhouse-url source)
+    (.exists (io/file source)) (get-clickhouse-scp source)
     :else (throw (Exception. (str "Don't know how to download clickhouse from" source)))))
 
 (defn unpack-deb
@@ -49,6 +52,7 @@
 
 (defn chmod-binary
   [path]
+  (info "Binary path chmod" path)
   (c/exec :chmod :+x path))
 
 (defn install-downloaded-clickhouse
@@ -85,10 +89,14 @@
 
 (defn install-configs
   [test node]
-  (c/exec :echo (slurp (io/resource "config.xml")) :> (str configs-dir "/config.xml"))
-  (c/exec :echo (slurp (io/resource "users.xml")) :> (str configs-dir "/users.xml"))
-  (c/exec :echo (slurp (io/resource "listen.xml")) :> (str sub-configs-dir "/listen.xml"))
-  (c/exec :echo (cluster-config test node (slurp (io/resource "keeper_config.xml"))) :> (str sub-configs-dir "/keeper_config.xml")))
+  (c/exec :echo (cluster-config test node (slurp (io/resource "keeper_config.xml"))) :> (str configs-dir "/keeper_config.xml")))
+
+(defn collect-traces
+  [test node]
+  (let [pid (c/exec :pidof "clickhouse")]
+    (c/exec :timeout :-s "KILL" "60" :gdb :-ex "set pagination off" :-ex (str "set logging file " logs-dir "/gdb.log") :-ex
+            "set logging on" :-ex "backtrace" :-ex "thread apply all backtrace"
+            :-ex "backtrace" :-ex "detach" :-ex "quit" :--pid pid :|| :true)))
 
 (defn db
   [version reuse-binary]
@@ -110,19 +118,31 @@
 
     (teardown! [_ test node]
       (info node "Tearing down clickhouse")
-      (kill-clickhouse! node test)
       (c/su
+       (kill-clickhouse! node test)
        (if (not reuse-binary)
          (c/exec :rm :-rf binary-path))
        (c/exec :rm :-rf pid-file-path)
        (c/exec :rm :-rf data-dir)
-       ;(c/exec :rm :-rf logs-dir)
+       (c/exec :rm :-rf logs-dir)
        (c/exec :rm :-rf configs-dir)))
 
     db/LogFiles
     (log-files [_ test node]
       (c/su
+       ;(if (cu/exists? pid-file-path)
+         ;(do
+         ;  (info node "Collecting traces")
+         ;  (collect-traces test node))
+         ;(info node "Pid files doesn't exists"))
        (kill-clickhouse! node test)
-       (c/cd data-dir
-             (c/exec :tar :czf "coordination.tar.gz" "coordination")))
-      [stderr-file (str logs-dir "/clickhouse-server.log") (str data-dir "/coordination.tar.gz")])))
+       (if (cu/exists? coordination-data-dir)
+         (do
+           (info node "Coordination files exists, going to compress")
+           (c/cd data-dir
+                 (c/exec :tar :czf "coordination.tar.gz" "coordination")))))
+      (let [common-logs [stderr-file (str logs-dir "/clickhouse-keeper.log") (str data-dir "/coordination.tar.gz")]
+            gdb-log (str logs-dir "/gdb.log")]
+        (if (cu/exists? (str logs-dir "/gdb.log"))
+          (conj common-logs gdb-log)
+          common-logs)))))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj
index f88026500e6..0384d4d583a 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/main.clj
@@ -4,11 +4,13 @@
             [clojure.pprint :refer [pprint]]
             [jepsen.clickhouse-keeper.set :as set]
             [jepsen.clickhouse-keeper.db :refer :all]
+            [jepsen.clickhouse-keeper.zookeeperdb :refer :all]
             [jepsen.clickhouse-keeper.nemesis :as custom-nemesis]
             [jepsen.clickhouse-keeper.register :as register]
             [jepsen.clickhouse-keeper.unique :as unique]
             [jepsen.clickhouse-keeper.queue :as queue]
             [jepsen.clickhouse-keeper.counter :as counter]
+            [jepsen.clickhouse-keeper.bench :as bench]
             [jepsen.clickhouse-keeper.constants :refer :all]
             [clojure.string :as str]
             [jepsen
@@ -72,12 +74,29 @@
     :validate [pos? "Must be a positive integer."]]
    [nil, "--lightweight-run" "Subset of workloads/nemesises which is simple to validate"]
    [nil, "--reuse-binary" "Use already downloaded binary if it exists, don't remove it on shutdown"]
+   [nil, "--bench" "Run perf-test mode"]
+   [nil, "--zookeeper-version VERSION" "Run zookeeper with version"
+    :default ""]
+   [nil, "--bench-opts STR" "Run perf-test mode"
+    :default "--generator list_medium_nodes -c 30 -i 1000"]
    ["-c" "--clickhouse-source URL" "URL for clickhouse deb or tgz package"
-    :default "https://clickhouse-builds.s3.yandex.net/21677/ef82333089156907a0979669d9374c2e18daabe5/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_deb/clickhouse-common-static_21.4.1.6313_amd64.deb"]])
+    :default "https://clickhouse-builds.s3.yandex.net/21677/ef82333089156907a0979669d9374c2e18daabe5/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_deb/clickhouse-common-static_21.4.1.6313_amd64.deb"]
+   [nil "--bench-path path" "Path to keeper-bench util"
+    :default "/home/alesap/code/cpp/BuildCH/utils/keeper-bench/keeper-bench"]])
 
-(defn clickhouse-keeper-test
-  "Given an options map from the command line runner (e.g. :nodes, :ssh,
-  :concurrency, ...), constructs a test map."
+(defn get-db
+  [opts]
+  (if (empty? (:zookeeper-version opts))
+    (db (:clickhouse-source opts) (boolean (:reuse-binary opts)))
+    (zookeeper-db (:zookeeper-version opts))))
+
+(defn get-port
+  [opts]
+  (if (empty? (:zookeeper-version opts))
+    9181
+    2181))
+
+(defn clickhouse-func-tests
   [opts]
   (info "Test opts\n" (with-out-str (pprint opts)))
   (let [quorum (boolean (:quorum opts))
@@ -87,7 +106,7 @@
            opts
            {:name (str "clickhouse-keeper-quorum=" quorum "-"  (name (:workload opts)) "-" (name (:nemesis opts)))
             :os ubuntu/os
-            :db (db (:clickhouse-source opts) (boolean (:reuse-binary opts)))
+            :db (get-db opts)
             :pure-generators true
             :client (:client workload)
             :nemesis (:nemesis current-nemesis)
@@ -105,6 +124,30 @@
                         (gen/sleep 10)
                         (gen/clients (:final-generator workload)))})))
 
+(defn clickhouse-perf-test
+  [opts]
+  (info "Starting performance test")
+  (let [dct {:type :invoke :bench-opts (:bench-opts opts) :bench-path (:bench-path opts)}]
+    (merge tests/noop-test
+           opts
+           {:name (str "clickhouse-keeper-perf")
+            :os ubuntu/os
+            :db (get-db opts)
+            :pure-generators true
+            :client (bench/bench-client (get-port opts))
+            :nemesis nemesis/noop
+            :generator (->> dct
+                            (gen/stagger 1)
+                            (gen/nemesis nil))})))
+
+(defn clickhouse-keeper-test
+  "Given an options map from the command line runner (e.g. :nodes, :ssh,
+  :concurrency, ...), constructs a test map."
+  [opts]
+  (if (boolean (:bench opts))
+    (clickhouse-perf-test opts)
+    (clickhouse-func-tests opts)))
+
 (def all-nemesises (keys custom-nemesis/custom-nemesises))
 
 (def all-workloads (keys workloads))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj
index a05338a7bc4..79ec4f824bb 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/set.clj
@@ -18,7 +18,8 @@
      :nodename node))
 
   (setup! [this test]
-    (zk-create-if-not-exists conn k "#{}"))
+    (exec-with-retries 30 (fn []
+                            (zk-create-if-not-exists conn k "#{}"))))
 
   (invoke! [this test op]
     (case (:f op)
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
index ffb948041d1..0457ff6eae2 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
@@ -6,11 +6,24 @@
             [jepsen.control.util :as cu]
             [jepsen.clickhouse-keeper.constants :refer :all]
             [jepsen.control :as c]
-            [clojure.tools.logging :refer :all])
+            [clojure.tools.logging :refer :all]
+            [clojure.java.io :as io])
   (:import (org.apache.zookeeper.data Stat)
            (org.apache.zookeeper CreateMode
                                  ZooKeeper)
-           (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)))
+           (org.apache.zookeeper ZooKeeper KeeperException KeeperException$BadVersionException)
+           (java.security MessageDigest)))
+
+(defn exec-with-retries
+  [retries f & args]
+  (let [res (try {:value (apply f args)}
+                 (catch Exception e
+                   (if (zero? retries)
+                     (throw e)
+                     {:exception e})))]
+    (if (:exception res)
+      (do (Thread/sleep 1000) (recur (dec retries) f args))
+      (:value res))))
 
 (defn parse-long
   "Parses a string to a Long. Passes through `nil` and empty strings."
@@ -32,7 +45,7 @@
 
 (defn zk-connect
   [host port timeout]
-  (zk/connect (str host ":" port) :timeout-msec timeout))
+  (exec-with-retries 30 (fn [] (zk/connect (str host ":" port) :timeout-msec timeout))))
 
 (defn zk-create-range
   [conn n]
@@ -130,7 +143,7 @@
   [node test]
   (info "Checking server alive on" node)
   (try
-    (c/exec binary-path :client :--query "SELECT 1")
+    (zk-connect (name node) 9181 30000)
     (catch Exception _ false)))
 
 (defn wait-clickhouse-alive!
@@ -156,25 +169,32 @@
      :logfile stderr-file
      :chdir data-dir}
     binary-path
-    :server
-    :--config (str configs-dir "/config.xml")
+    :keeper
+    :--config (str configs-dir "/keeper_config.xml")
     :--
-    :--path (str data-dir "/")
-    :--user_files_path (str data-dir "/user_files")
-    :--top_level_domains_path (str data-dir "/top_level_domains")
-    :--logger.log (str logs-dir "/clickhouse-server.log")
-    :--logger.errorlog (str logs-dir "/clickhouse-server.err.log")
+    :--logger.log (str logs-dir "/clickhouse-keeper.log")
+    :--logger.errorlog (str logs-dir "/clickhouse-keeper.err.log")
     :--keeper_server.snapshot_storage_path coordination-snapshots-dir
-    :--keeper_server.logs_storage_path coordination-logs-dir)
+    :--keeper_server.log_storage_path coordination-logs-dir)
    (wait-clickhouse-alive! node test)))
 
-(defn exec-with-retries
-  [retries f & args]
-  (let [res (try {:value (apply f args)}
-                 (catch Exception e
-                   (if (zero? retries)
-                     (throw e)
-                     {:exception e})))]
-    (if (:exception res)
-      (do (Thread/sleep 1000) (recur (dec retries) f args))
-      (:value res))))
+(defn md5 [^String s]
+  (let [algorithm (MessageDigest/getInstance "MD5")
+        raw (.digest algorithm (.getBytes s))]
+    (format "%032x" (BigInteger. 1 raw))))
+
+(defn non-precise-cached-wget!
+  [url]
+  (let [encoded-url (md5 url)
+        expected-file-name (.getName (io/file url))
+        dest-file (str binaries-cache-dir "/" encoded-url)
+        dest-symlink (str common-prefix "/" expected-file-name)
+        wget-opts (concat cu/std-wget-opts [:-O dest-file])]
+    (when-not (cu/exists? dest-file)
+      (info "Downloading" url)
+      (do (c/exec :mkdir :-p binaries-cache-dir)
+          (c/cd binaries-cache-dir
+                (cu/wget-helper! wget-opts url))))
+    (c/exec :rm :-rf dest-symlink)
+    (c/exec :ln :-s dest-file dest-symlink)
+    dest-symlink))
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/zookeeperdb.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/zookeeperdb.clj
new file mode 100644
index 00000000000..7cb88cd1fd9
--- /dev/null
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/zookeeperdb.clj
@@ -0,0 +1,64 @@
+(ns jepsen.clickhouse-keeper.zookeeperdb
+  (:require [clojure.tools.logging :refer :all]
+            [jepsen.clickhouse-keeper.utils :refer :all]
+            [clojure.java.io :as io]
+            [jepsen
+             [control :as c]
+             [db :as db]]
+            [jepsen.os.ubuntu :as ubuntu]))
+
+(defn zk-node-ids
+  "Returns a map of node names to node ids."
+  [test]
+  (->> test
+       :nodes
+       (map-indexed (fn [i node] [node (inc i)]))
+       (into {})))
+
+(defn zk-node-id
+  "Given a test and a node name from that test, returns the ID for that node."
+  [test node]
+  ((zk-node-ids test) node))
+
+(defn zoo-cfg-servers
+  "Constructs a zoo.cfg fragment for servers."
+  [test mynode]
+  (->> (zk-node-ids test)
+       (map (fn [[node id]]
+              (str "server." id "=" (if (= (name node) mynode) "0.0.0.0" (name node)) ":2888:3888")))
+       (clojure.string/join "\n")))
+
+(defn zookeeper-db
+  "Zookeeper DB for a particular version."
+  [version]
+  (reify db/DB
+    (setup! [_ test node]
+      (c/su
+       (info node "Installing ZK" version)
+       (c/exec :apt-get :update)
+       (c/exec :apt-get :install (str "zookeeper=" version))
+       (c/exec :apt-get :install (str "zookeeperd=" version))
+       (c/exec :echo (zk-node-id test node) :> "/etc/zookeeper/conf/myid")
+
+       (c/exec :echo (str (slurp (io/resource "zoo.cfg"))
+                          "\n"
+                          (zoo-cfg-servers test node))
+               :> "/etc/zookeeper/conf/zoo.cfg")
+
+       (info node "ZK restarting")
+       (c/exec :service :zookeeper :restart)
+       (info "Connecting to zk" (name node))
+       (zk-connect (name node) 2181 1000)
+       (info node "ZK ready")))
+
+    (teardown! [_ test node]
+      (info node "tearing down ZK")
+      (c/su
+       (c/exec :service :zookeeper :stop :|| true)
+       (c/exec :rm :-rf
+               (c/lit "/var/lib/zookeeper/version-*")
+               (c/lit "/var/log/zookeeper/*"))))
+
+    db/LogFiles
+    (log-files [_ test node]
+      ["/var/log/zookeeper/zookeeper.log"])))
diff --git a/tests/msan_suppressions.txt b/tests/msan_suppressions.txt
index 4c7aeaf4a4c..cf468b0be96 100644
--- a/tests/msan_suppressions.txt
+++ b/tests/msan_suppressions.txt
@@ -7,7 +7,6 @@ fun:tolower
 
 # Suppress some failures in contrib so that we can enable MSan in CI.
 # Ideally, we should report these upstream.
-src:*/contrib/zlib-ng/*
 
 # Hyperscan
 fun:roseRunProgram
diff --git a/tests/performance/ColumnMap.xml b/tests/performance/ColumnMap.xml
index f6393985377..144603960f0 100644
--- a/tests/performance/ColumnMap.xml
+++ b/tests/performance/ColumnMap.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
     <settings>
         <allow_experimental_map_type>1</allow_experimental_map_type>
@@ -26,10 +26,13 @@ FROM
         arrayMap(x -> toString(x), range(100)) AS keys,
         arrayMap(x -> toString(x * x), range(100)) AS values,
         cast((keys, values), 'Map(String, String)') AS map
-    FROM numbers(10000)
+    FROM numbers_mt(10000)
 )
+SETTINGS max_insert_threads = 8
     </create_query>
 
+    <fill_query>optimize table column_map_test final</fill_query>
+
     <query>SELECT count() FROM column_map_test WHERE NOT ignore(arrayMap(x -> map[CONCAT(toString(x), {key_suffix})], range(0, 100, 10)))</query>
 
     <drop_query>DROP TABLE IF EXISTS column_map_test</drop_query>
diff --git a/tests/performance/agg_functions_min_max_any.xml b/tests/performance/agg_functions_min_max_any.xml
index 79c9e2c6976..6ca9e3eb65a 100644
--- a/tests/performance/agg_functions_min_max_any.xml
+++ b/tests/performance/agg_functions_min_max_any.xml
@@ -6,7 +6,9 @@
     <substitutions>
         <substitution>
             <name>group_scale</name>
-            <value>1000000</value>
+            <values>
+                <value>1000000</value>
+            </values>
         </substitution>
     </substitutions>
 
diff --git a/tests/performance/arithmetic.xml b/tests/performance/arithmetic.xml
index bf5e7662e37..0be61eb5823 100644
--- a/tests/performance/arithmetic.xml
+++ b/tests/performance/arithmetic.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <max_memory_usage>30000000000</max_memory_usage>
     </settings>
diff --git a/tests/performance/array_auc.xml b/tests/performance/array_auc.xml
index 5a2f41ead5e..59d321b3c62 100644
--- a/tests/performance/array_auc.xml
+++ b/tests/performance/array_auc.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
     <query>SELECT avg(ifNotFinite(arrayAUC(arrayMap(x -> rand(x) / 0x100000000, range(2 + rand() % 100)), arrayMap(x -> rand(x) % 2, range(2 + rand() % 100))), 0)) FROM numbers(100000)</query>
 </test>
diff --git a/tests/performance/array_join.xml b/tests/performance/array_join.xml
index cf92b51f545..ca280ce28ad 100644
--- a/tests/performance/array_join.xml
+++ b/tests/performance/array_join.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
 
 
diff --git a/tests/performance/async_remote_read.xml b/tests/performance/async_remote_read.xml
index 7f0ee6473ab..4ea159f9a97 100644
--- a/tests/performance/async_remote_read.xml
+++ b/tests/performance/async_remote_read.xml
@@ -1,4 +1,7 @@
 <test>
+    <settings>
+        <async_socket_for_remote>1</async_socket_for_remote>
+    </settings>
     <query>
         SELECT sum(x)
         FROM
diff --git a/tests/performance/avg_weighted.xml b/tests/performance/avg_weighted.xml
index df9e7c21068..fa39dd552cd 100644
--- a/tests/performance/avg_weighted.xml
+++ b/tests/performance/avg_weighted.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.4">
+<test>
     <settings>
         <allow_experimental_bigint_types>1</allow_experimental_bigint_types>
         <max_threads>1</max_threads>
@@ -11,8 +11,8 @@
 
     <create_query>CREATE TABLE perf_avg(
         num UInt64,
-        num_u Decimal256(75) DEFAULT toDecimal256(num / 400000, 75),
-        num_f Float64 DEFAULT num / 100
+        num_u Decimal256(75) MATERIALIZED toDecimal256(num / 400000, 75),
+        num_f Float64 MATERIALIZED num / 100
         ) ENGINE = MergeTree() ORDER BY num
     </create_query>
 
@@ -23,6 +23,8 @@
         LIMIT 50000000
     </fill_query>
 
+    <fill_query>optimize table perf_avg final</fill_query>
+
     <query>SELECT avg(num)                  FROM perf_avg FORMAT Null</query>
     <query>SELECT avg(2 * num)              FROM perf_avg FORMAT Null</query>
     <query>SELECT avg(num_u)                FROM perf_avg FORMAT Null</query>
diff --git a/tests/performance/bounding_ratio.xml b/tests/performance/bounding_ratio.xml
index e430136b624..e3a15f90013 100644
--- a/tests/performance/bounding_ratio.xml
+++ b/tests/performance/bounding_ratio.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <query>SELECT boundingRatio(number, number) FROM numbers(100000000)</query>
     <query>SELECT (argMax(number, number) - argMin(number, number)) / (max(number) - min(number)) FROM numbers(100000000)</query>
 </test>
diff --git a/tests/performance/codecs_float_insert.xml b/tests/performance/codecs_float_insert.xml
index b282bcc268f..b31e0eafdd7 100644
--- a/tests/performance/codecs_float_insert.xml
+++ b/tests/performance/codecs_float_insert.xml
@@ -1,5 +1,4 @@
-<!-- FIXME this instability is abysmal, investigate the unstable queries -->
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <allow_suspicious_codecs>1</allow_suspicious_codecs>
     </settings>
diff --git a/tests/performance/codecs_int_insert.xml b/tests/performance/codecs_int_insert.xml
index 662df80ae70..caefaba3725 100644
--- a/tests/performance/codecs_int_insert.xml
+++ b/tests/performance/codecs_int_insert.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <allow_suspicious_codecs>1</allow_suspicious_codecs>
     </settings>
diff --git a/tests/performance/collations.xml b/tests/performance/collations.xml
index 52ccede3798..17b2d36b7e3 100644
--- a/tests/performance/collations.xml
+++ b/tests/performance/collations.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
 
 
diff --git a/tests/performance/column_column_comparison.xml b/tests/performance/column_column_comparison.xml
deleted file mode 100644
index 2b59a65a54b..00000000000
--- a/tests/performance/column_column_comparison.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<test>
-    <tags>
-        <tag>comparison</tag>
-    </tags>
-
-    <preconditions>
-        <table_exists>hits_100m_single</table_exists>
-    </preconditions>
-
-
-    <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE URL < URL]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE URL < PageCharset]]></query>
-    <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE SearchPhrase < SearchPhrase SETTINGS max_threads = 2]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE SearchPhrase < URL]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE SearchPhrase < PageCharset SETTINGS max_threads = 2]]></query>
-    <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(SearchPhrase) AND SearchPhrase < SearchPhrase SETTINGS max_threads = 2]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(SearchPhrase) AND SearchPhrase < URL]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(SearchPhrase) AND SearchPhrase < PageCharset SETTINGS max_threads = 2]]></query>
-    <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE MobilePhoneModel < MobilePhoneModel SETTINGS max_threads = 1]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE MobilePhoneModel < URL]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE MobilePhoneModel < PageCharset SETTINGS max_threads = 2]]></query>
-    <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(MobilePhoneModel) AND MobilePhoneModel < MobilePhoneModel SETTINGS max_threads = 1]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(MobilePhoneModel) AND MobilePhoneModel < URL]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(MobilePhoneModel) AND MobilePhoneModel < PageCharset SETTINGS max_threads = 2]]></query>
-    <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE PageCharset < PageCharset SETTINGS max_threads = 2]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE PageCharset < URL]]></query>
-    <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE Title < Title]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE Title < URL]]></query>
-    <query><![CDATA[SELECT count() FROM hits_100m_single WHERE Title < PageCharset]]></query>
-
-</test>
diff --git a/tests/performance/constant_column_search.xml b/tests/performance/constant_column_search.xml
index 71d8185d818..cb76fd4cefb 100644
--- a/tests/performance/constant_column_search.xml
+++ b/tests/performance/constant_column_search.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <tags>
         <tag>search</tag>
     </tags>
diff --git a/tests/performance/date_time_64.xml b/tests/performance/date_time_64.xml
index fd883416a33..838aba34d87 100644
--- a/tests/performance/date_time_64.xml
+++ b/tests/performance/date_time_64.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
     </preconditions>
diff --git a/tests/performance/date_time_long.xml b/tests/performance/date_time_long.xml
index c2eb42d3318..0c3d85f9659 100644
--- a/tests/performance/date_time_long.xml
+++ b/tests/performance/date_time_long.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <substitutions>
        <substitution>
            <name>datetime_transform</name>
diff --git a/tests/performance/decimal_aggregates.xml b/tests/performance/decimal_aggregates.xml
index f7bc2ac1868..7078cb16002 100644
--- a/tests/performance/decimal_aggregates.xml
+++ b/tests/performance/decimal_aggregates.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.5">
+<test>
     <settings>
         <max_memory_usage>35G</max_memory_usage>
     </settings>
@@ -18,7 +18,7 @@
 
     <query>SELECT uniq(d32), uniqCombined(d32), uniqExact(d32), uniqHLL12(d32) FROM     (SELECT * FROM t LIMIT 10000000)</query>
     <query>SELECT uniq(d64), uniqCombined(d64), uniqExact(d64), uniqHLL12(d64) FROM     (SELECT * FROM t LIMIT 10000000)</query>
-    <query>SELECT uniq(d128), uniqCombined(d128), uniqExact(d128), uniqHLL12(d128) FROM (SELECT * FROM t LIMIT 1000000)</query>
+    <query>SELECT uniq(d128), uniqCombined(d128), uniqExact(d128), uniqHLL12(d128) FROM (SELECT * FROM t LIMIT 10000000)</query>
 
     <query>SELECT median(d32), medianExact(d32), medianExactWeighted(d32, 2) FROM    (SELECT * FROM t LIMIT 10000000)</query>
     <query>SELECT median(d64), medianExact(d64), medianExactWeighted(d64, 2) FROM    (SELECT * FROM t LIMIT 1000000)</query>
diff --git a/tests/performance/direct_dictionary.xml b/tests/performance/direct_dictionary.xml
index 97ecdfe3e95..aa7b99e39de 100644
--- a/tests/performance/direct_dictionary.xml
+++ b/tests/performance/direct_dictionary.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <create_query>
         CREATE TABLE simple_key_direct_dictionary_source_table
         (
@@ -55,14 +55,14 @@
         INSERT INTO simple_key_direct_dictionary_source_table
         SELECT number, number, toString(number), toDecimal64(number, 8), toString(number)
         FROM system.numbers
-        LIMIT 100000;
+        LIMIT 50000;
     </fill_query>
 
     <fill_query>
         INSERT INTO complex_key_direct_dictionary_source_table
         SELECT number, toString(number), number, toString(number), toDecimal64(number, 8), toString(number)
         FROM system.numbers
-        LIMIT 100000;
+        LIMIT 50000;
     </fill_query>
 
     <substitutions>
@@ -79,35 +79,51 @@
         <substitution>
             <name>elements_count</name>
             <values>
-                <value>25000</value>
                 <value>50000</value>
                 <value>75000</value>
-                <value>100000</value>
             </values>
         </substitution>
     </substitutions>
 
     <query>
-        SELECT dictGet('default.simple_key_direct_dictionary', {column_name}, number)
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_direct_dictionary', {column_name}, key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
     </query>
     <query>
-        SELECT dictHas('default.simple_key_direct_dictionary', number)
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_direct_dictionary', ('value_int', 'value_string', 'value_decimal', 'value_string_nullable'), key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictHas('default.simple_key_direct_dictionary', key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
     </query>
 
     <query>
-        SELECT dictGet('default.complex_key_direct_dictionary', {column_name}, (number, toString(number)))
+        WITH (number, toString(number)) as key
+        SELECT dictGet('default.complex_key_direct_dictionary', {column_name}, key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
     </query>
     <query>
-        SELECT dictHas('default.complex_key_direct_dictionary', (number, toString(number)))
+        WITH (number, toString(number)) as key
+        SELECT dictGet('default.complex_key_direct_dictionary', ('value_int', 'value_string', 'value_decimal', 'value_string_nullable'), key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+    <query>
+        WITH (number, toString(number)) as key
+        SELECT dictHas('default.complex_key_direct_dictionary', key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
diff --git a/tests/performance/encodeXMLComponent.xml b/tests/performance/encodeXMLComponent.xml
index 45241941ac3..7379a0ff89e 100644
--- a/tests/performance/encodeXMLComponent.xml
+++ b/tests/performance/encodeXMLComponent.xml
@@ -1,7 +1,7 @@
 <test>
     <preconditions>
-        <table_exists>test.hits</table_exists>
+        <table_exists>hits_100m_single</table_exists>
     </preconditions>
 
-    <query>SELECT count() FROM test.hits WHERE NOT ignore(encodeXMLComponent(URL))</query>
+    <query>SELECT count() FROM hits_100m_single WHERE NOT ignore(encodeXMLComponent(URL))</query>
 </test>
diff --git a/tests/performance/flat_dictionary.xml b/tests/performance/flat_dictionary.xml
index 426aa929bbc..243f90a8e59 100644
--- a/tests/performance/flat_dictionary.xml
+++ b/tests/performance/flat_dictionary.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <create_query>
         CREATE TABLE simple_key_flat_dictionary_source_table
         (
@@ -21,7 +21,7 @@
         )
         PRIMARY KEY id
         SOURCE(CLICKHOUSE(DB 'default' TABLE 'simple_key_flat_dictionary_source_table'))
-        LAYOUT(FLAT())
+        LAYOUT(FLAT(INITIAL_ARRAY_SIZE 50000 MAX_ARRAY_SIZE 5000000))
         LIFETIME(MIN 0 MAX 1000)
     </create_query>
 
@@ -29,7 +29,7 @@
         INSERT INTO simple_key_flat_dictionary_source_table
         SELECT number, number, toString(number), toDecimal64(number, 8), toString(number)
         FROM system.numbers
-        LIMIT 500000;
+        LIMIT 5000000;
     </fill_query>
 
     <substitutions>
@@ -46,25 +46,30 @@
         <substitution>
             <name>elements_count</name>
             <values>
-                <value>250000</value>
-                <value>500000</value>
-                <value>750000</value>
-                <value>1000000</value>
+                <value>5000000</value>
+                <value>7500000</value>
             </values>
         </substitution>
     </substitutions>
 
     <query>
-        SELECT dictGet('default.simple_key_flat_dictionary', {column_name}, number)
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_flat_dictionary', {column_name}, key)
         FROM system.numbers
         LIMIT {elements_count}
-        FORMAR Null;
+        FORMAT Null;
     </query>
 
     <query>
-        SELECT dictHas('default.simple_key_flat_dictionary', number)
+        SELECT * FROM simple_key_flat_dictionary
+        FORMAT Null;
+    </query>
+
+    <query>
+        WITH rand64() % toUInt64(75000000) as key
+        SELECT dictHas('default.simple_key_flat_dictionary', key)
         FROM system.numbers
-        LIMIT {elements_count}
+        LIMIT 75000000
         FORMAT Null;
     </query>
 
diff --git a/tests/performance/float_parsing.xml b/tests/performance/float_parsing.xml
index eb8577bd127..33ab8ba6f10 100644
--- a/tests/performance/float_parsing.xml
+++ b/tests/performance/float_parsing.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <substitutions>
        <substitution>
            <name>expr</name>
diff --git a/tests/performance/format_readable.xml b/tests/performance/format_readable.xml
index c43a314be85..5a76ac67333 100644
--- a/tests/performance/format_readable.xml
+++ b/tests/performance/format_readable.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 <query>SELECT count() FROM numbers(10000000) WHERE NOT ignore(formatReadableSize(number))</query>
 <query>SELECT count() FROM numbers(10000000) WHERE NOT ignore(formatReadableQuantity(number))</query>
 <query>SELECT count() FROM numbers(10000000) WHERE NOT ignore(formatReadableTimeDelta(number))</query>
diff --git a/tests/performance/fuse_sumcount.xml b/tests/performance/fuse_sumcount.xml
new file mode 100644
index 00000000000..b2eb0e678e2
--- /dev/null
+++ b/tests/performance/fuse_sumcount.xml
@@ -0,0 +1,33 @@
+<test>
+    <!-- We test rewriting sum(), avg(), count() to a single call of sumCount() here.
+         As a reference, we use the same queries with the optimization disabled.
+         sum() has a highly optimized algorithm, so alone it will be faster than sumCount(),
+         but when we add count() or avg(), the sumCount() should win.
+         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>
+    </settings>
+
+    <substitutions>
+        <substitution>
+            <name>key</name>
+            <values>
+                <value>1</value>
+                <value>intHash32(number) % 1000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <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), 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)                             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), 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>
+</test>
diff --git a/tests/performance/fuzz_bits.xml b/tests/performance/fuzz_bits.xml
index 87064e520c2..2679977cb1d 100644
--- a/tests/performance/fuzz_bits.xml
+++ b/tests/performance/fuzz_bits.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
 
 
 
diff --git a/tests/performance/generate_table_function.xml b/tests/performance/generate_table_function.xml
index 0339a8c19e8..bc49a7de1bd 100644
--- a/tests/performance/generate_table_function.xml
+++ b/tests/performance/generate_table_function.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('ui64 UInt64, i64 Int64, ui32 UInt32, i32 Int32, ui16 UInt16, i16 Int16, ui8 UInt8, i8 Int8') LIMIT 1000000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('ui64 UInt64, i64 Int64, ui32 UInt32, i32 Int32, ui16 UInt16, i16 Int16, ui8 UInt8, i8 Int8', 0, 10, 10) LIMIT 1000000000);</query>
     <query>SELECT sum(NOT ignore(*)) FROM (SELECT * FROM generateRandom('i Enum8(\'hello\' = 1, \'world\' = 5)', 0, 10, 10) LIMIT 1000000000);</query>
diff --git a/tests/performance/great_circle_dist.xml b/tests/performance/great_circle_dist.xml
index b5e271ddfa8..ad445f34417 100644
--- a/tests/performance/great_circle_dist.xml
+++ b/tests/performance/great_circle_dist.xml
@@ -2,6 +2,6 @@
     <!-- lon [-180; 180], lat [-90; 90] -->
     <query>SELECT count() FROM numbers(1000000) WHERE NOT ignore(greatCircleDistance((rand(1) % 360) * 1. - 180, (number % 150) * 1.2 - 90, (number % 360) + toFloat64(rand(2)) / 4294967296 - 180, (rand(3) % 180) * 1. - 90))</query>
     <!-- 55.755830, 37.617780 is center of Moscow -->
-    <query>SELECT count() FROM zeros(1000000) WHERE NOT ignore(greatCircleDistance(55. + toFloat64(rand(1)) / 4294967296, 37. + toFloat64(rand(2)) / 4294967296, 55. + toFloat64(rand(3)) / 4294967296, 37. + toFloat64(rand(4)) / 4294967296))</query>
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(greatCircleDistance(55. + toFloat64(rand(1)) / 4294967296, 37. + toFloat64(rand(2)) / 4294967296, 55. + toFloat64(rand(3)) / 4294967296, 37. + toFloat64(rand(4)) / 4294967296))</query>
 </test>
 
diff --git a/tests/performance/group_array_moving_sum.xml b/tests/performance/group_array_moving_sum.xml
index 21b36988e13..c5f55b3c179 100644
--- a/tests/performance/group_array_moving_sum.xml
+++ b/tests/performance/group_array_moving_sum.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <max_memory_usage>30000000000</max_memory_usage>
     </settings>
diff --git a/tests/performance/group_by_sundy_li.xml b/tests/performance/group_by_sundy_li.xml
index aebc305335c..f1187e48528 100644
--- a/tests/performance/group_by_sundy_li.xml
+++ b/tests/performance/group_by_sundy_li.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.4">
+<test>
     <settings>
         <max_insert_threads>8</max_insert_threads>
     </settings>
diff --git a/tests/performance/hashed_dictionary.xml b/tests/performance/hashed_dictionary.xml
index a38d2f30c23..91ccc0b1075 100644
--- a/tests/performance/hashed_dictionary.xml
+++ b/tests/performance/hashed_dictionary.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <create_query>
         CREATE TABLE simple_key_hashed_dictionary_source_table
         (
@@ -81,35 +81,37 @@
         <substitution>
             <name>elements_count</name>
             <values>
-                <value>2500000</value>
                 <value>5000000</value>
                 <value>7500000</value>
-                <value>10000000</value>
             </values>
         </substitution>
     </substitutions>
 
     <query>
-        SELECT dictGet('default.simple_key_hashed_dictionary', {column_name}, number)
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_hashed_dictionary', {column_name}, key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
     </query>
     <query>
-        SELECT dictHas('default.simple_key_hashed_dictionary', number)
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictHas('default.simple_key_hashed_dictionary', key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
     </query>
 
     <query>
-        SELECT dictGet('default.complex_key_hashed_dictionary', {column_name}, (number, toString(number)))
+        WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
+        SELECT dictGet('default.complex_key_hashed_dictionary', {column_name}, key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
     </query>
     <query>
-        SELECT dictHas('default.complex_key_hashed_dictionary', (number, toString(number)))
+        WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
+        SELECT dictHas('default.complex_key_hashed_dictionary', key)
         FROM system.numbers
         LIMIT {elements_count}
         FORMAT Null;
diff --git a/tests/performance/if_array_string.xml b/tests/performance/if_array_string.xml
index 773509e1c4b..0449c5d3271 100644
--- a/tests/performance/if_array_string.xml
+++ b/tests/performance/if_array_string.xml
@@ -1,8 +1,8 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? ['Hello', 'World'] : ['a', 'b', 'c'])</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['Hello', 'World']) : ['a', 'b', 'c'])</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? ['Hello', 'World'] : materialize(['a', 'b', 'c']))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['Hello', 'World']) : materialize(['a', 'b', 'c']))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['', '']) : emptyArrayString())</query>
-    <query>SELECT count() FROM zeros(1000000) WHERE NOT ignore(rand() % 2 ? materialize(['https://github.com/ClickHouse/ClickHouse/pull/1070', 'https://www.google.ru/search?newwindow=1&amp;site=&amp;source=hp&amp;q=zookeeper+wire+protocol+exists&amp;oq=zookeeper+wire+protocol+exists&amp;gs_l=psy-ab.3...330.6300.0.6687.33.28.0.0.0.0.386.4838.0j5j9j5.19.0....0...1.1.64.psy-ab..14.17.4448.0..0j35i39k1j0i131k1j0i22i30k1j0i19k1j33i21k1.r_3uFoNOrSU']) : emptyArrayString())</query>
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(rand() % 2 ? materialize(['https://github.com/ClickHouse/ClickHouse/pull/1070', 'https://www.google.ru/search?newwindow=1&amp;site=&amp;source=hp&amp;q=zookeeper+wire+protocol+exists&amp;oq=zookeeper+wire+protocol+exists&amp;gs_l=psy-ab.3...330.6300.0.6687.33.28.0.0.0.0.386.4838.0j5j9j5.19.0....0...1.1.64.psy-ab..14.17.4448.0..0j35i39k1j0i131k1j0i22i30k1j0i19k1j33i21k1.r_3uFoNOrSU']) : emptyArrayString())</query>
 </test>
diff --git a/tests/performance/inserts_arrays_lowcardinality.xml b/tests/performance/inserts_arrays_lowcardinality.xml
index 0c05e2333c8..505156d4fd5 100644
--- a/tests/performance/inserts_arrays_lowcardinality.xml
+++ b/tests/performance/inserts_arrays_lowcardinality.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     
     <create_query>CREATE TABLE lot_of_string_arrays_src (`id` UInt64, `col00` Array(String), `col01` Array(String), `col02` Array(String), `col03` Array(String), `col04` Array(String), `col05` Array(String), `col06` Array(String), `col07` Array(String), `col08` Array(String), `col09` Array(String), `col10` Array(String), `col11` Array(String), `col12` Array(String), `col13` Array(String), `col14` Array(String), `col15` Array(String), `col16` Array(String), `col17` Array(String), `col18` Array(String), `col19` Array(String), `col20` Array(String), `col21` Array(String), `col22` Array(String), `col23` Array(String), `col24` Array(String), `col25` Array(String), `col26` Array(String), `col27` Array(String), `col28` Array(String), `col29` Array(String), `col30` Array(String), `col31` Array(String), `col32` Array(String), `col33` Array(String), `col34` Array(String), `col35` Array(String), `col36` Array(String), `col37` Array(String), `col38` Array(String), `col39` Array(String), `col40` Array(String), `col41` Array(String), `col42` Array(String), `col43` Array(String), `col44` Array(String), `col45` Array(String), `col46` Array(String), `col47` Array(String), `col48` Array(String), `col49` Array(String)) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192;</create_query>
     <create_query>CREATE TABLE lot_of_string_arrays_dst_lowcardinality (`id` UInt64, `col00` Array(LowCardinality(String)), `col01` Array(LowCardinality(String)), `col02` Array(LowCardinality(String)), `col03` Array(LowCardinality(String)), `col04` Array(LowCardinality(String)), `col05` Array(LowCardinality(String)), `col06` Array(LowCardinality(String)), `col07` Array(LowCardinality(String)), `col08` Array(LowCardinality(String)), `col09` Array(LowCardinality(String)), `col10` Array(LowCardinality(String)), `col11` Array(LowCardinality(String)), `col12` Array(LowCardinality(String)), `col13` Array(LowCardinality(String)), `col14` Array(LowCardinality(String)), `col15` Array(LowCardinality(String)), `col16` Array(LowCardinality(String)), `col17` Array(LowCardinality(String)), `col18` Array(LowCardinality(String)), `col19` Array(LowCardinality(String)), `col20` Array(LowCardinality(String)), `col21` Array(LowCardinality(String)), `col22` Array(LowCardinality(String)), `col23` Array(LowCardinality(String)), `col24` Array(LowCardinality(String)), `col25` Array(LowCardinality(String)), `col26` Array(LowCardinality(String)), `col27` Array(LowCardinality(String)), `col28` Array(LowCardinality(String)), `col29` Array(LowCardinality(String)), `col30` Array(LowCardinality(String)), `col31` Array(LowCardinality(String)), `col32` Array(LowCardinality(String)), `col33` Array(LowCardinality(String)), `col34` Array(LowCardinality(String)), `col35` Array(LowCardinality(String)), `col36` Array(LowCardinality(String)), `col37` Array(LowCardinality(String)), `col38` Array(LowCardinality(String)), `col39` Array(LowCardinality(String)), `col40` Array(LowCardinality(String)), `col41` Array(LowCardinality(String)), `col42` Array(LowCardinality(String)), `col43` Array(LowCardinality(String)), `col44` Array(LowCardinality(String)), `col45` Array(LowCardinality(String)), `col46` Array(LowCardinality(String)), `col47` Array(LowCardinality(String)), `col48` Array(LowCardinality(String)), `col49` Array(LowCardinality(String))) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192;</create_query>
diff --git a/tests/performance/intDiv.xml b/tests/performance/intDiv.xml
new file mode 100644
index 00000000000..c6fa0238986
--- /dev/null
+++ b/tests/performance/intDiv.xml
@@ -0,0 +1,5 @@
+<test>
+    <query>SELECT count() FROM numbers(200000000) WHERE NOT ignore(intDiv(number, 1000000000))</query>
+    <query>SELECT count() FROM numbers(200000000) WHERE NOT ignore(divide(number, 1000000000))</query>
+    <query>SELECT count() FROM numbers(200000000) WHERE NOT ignore(toUInt32(divide(number, 1000000000)))</query>
+</test>
diff --git a/tests/performance/int_parsing.xml b/tests/performance/int_parsing.xml
index 32f904331ce..3b8620e46c3 100644
--- a/tests/performance/int_parsing.xml
+++ b/tests/performance/int_parsing.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
         <table_exists>hits_10m_single</table_exists>
diff --git a/tests/performance/jit_small_requests.xml b/tests/performance/jit_small_requests.xml
index d8f917fb9af..c9abec0926b 100644
--- a/tests/performance/jit_small_requests.xml
+++ b/tests/performance/jit_small_requests.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <query>
         WITH
             bitXor(number, 0x4CF2D2BAAE6DA887) AS x0,
diff --git a/tests/performance/joins_in_memory.xml b/tests/performance/joins_in_memory.xml
index fac6f2659c6..7ff6a803d04 100644
--- a/tests/performance/joins_in_memory.xml
+++ b/tests/performance/joins_in_memory.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <create_query>CREATE TABLE ints (i64 Int64, i32 Int32, i16 Int16, i8 Int8) ENGINE = Memory</create_query>
 
     <fill_query>INSERT INTO ints SELECT number AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
@@ -13,12 +13,12 @@
     <query short='1' tag='ANY LEFT IN'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
 
     <query tag='INNER'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
+    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
     <query tag='INNER ON'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
     <query tag='INNER IN'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
 
     <query tag='LEFT'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
+    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
     <query tag='LEFT ON'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
     <query tag='LEFT IN'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
 
diff --git a/tests/performance/joins_in_memory_pmj.xml b/tests/performance/joins_in_memory_pmj.xml
index 87d1c0df14c..6eaf0bdd81a 100644
--- a/tests/performance/joins_in_memory_pmj.xml
+++ b/tests/performance/joins_in_memory_pmj.xml
@@ -1,55 +1,56 @@
-<test max_ignored_relative_change="0.7">
+<test>
     <create_query>CREATE TABLE ints (i64 Int64, i32 Int32, i16 Int16, i8 Int8) ENGINE = Memory</create_query>
 
     <settings>
         <join_algorithm>partial_merge</join_algorithm>
+        <query_plan_filter_push_down>0</query_plan_filter_push_down>
     </settings>
 
-    <fill_query>INSERT INTO ints SELECT number AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 10000 + number % 1000 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 20000 + number % 100 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 30000 + number % 10 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
-    <fill_query>INSERT INTO ints SELECT 40000 + number % 1 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000)</fill_query>
+    <fill_query>INSERT INTO ints SELECT number AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 10000 + number % 1000 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 20000 + number % 100 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 30000 + number % 10 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
+    <fill_query>INSERT INTO ints SELECT 40000 + number % 1 AS i64, i64 AS i32, i64 AS i16, i64 AS i8 FROM numbers(10000) settings query_plan_filter_push_down = 0</fill_query>
 
-    <query short='1' tag='ANY LEFT'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query short='1' tag='ANY LEFT KEY'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query short='1' tag='ANY LEFT ON'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query short='1' tag='ANY LEFT IN'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query short='1' tag='ANY LEFT'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT KEY'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT ON'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT IN'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query tag='INNER'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='INNER ON'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='INNER IN'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='INNER'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='INNER KEY'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='INNER ON'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='INNER IN'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query tag='LEFT'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='LEFT ON'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='LEFT IN'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='LEFT'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='LEFT KEY'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='LEFT ON'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='LEFT IN'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query short='1' tag='ANY LEFT (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query short='1' tag='ANY LEFT KEY (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query short='1' tag='ANY LEFT ON (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query short='1' tag='ANY LEFT IN (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0</query>
+    <query short='1' tag='ANY LEFT (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT KEY (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT ON (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query short='1' tag='ANY LEFT IN (noopt)'>SELECT COUNT() FROM ints l ANY LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
 
-    <query tag='INNER (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='INNER KEY (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='INNER ON (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='INNER IN (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0</query>
+    <query tag='INNER (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='INNER KEY (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='INNER ON (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='INNER IN (noopt)'>SELECT COUNT() FROM ints l INNER JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
 
-    <query tag='LEFT (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='LEFT KEY (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='LEFT ON (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0</query>
-    <query tag='LEFT IN (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0</query>
+    <query tag='LEFT (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='LEFT KEY (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='LEFT ON (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
+    <query tag='LEFT IN (noopt)'>SELECT COUNT() FROM ints l LEFT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) SETTINGS partial_merge_join_optimizations = 0, query_plan_filter_push_down = 0</query>
 
-    <query tag='RIGHT'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='RIGHT KEY'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='RIGHT ON'>SELECT COUNT() FROM ints l RIGHT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='RIGHT IN'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='RIGHT'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='RIGHT KEY'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='RIGHT ON'>SELECT COUNT() FROM ints l RIGHT JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='RIGHT IN'>SELECT COUNT() FROM ints l RIGHT JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
-    <query tag='FULL'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 = 20042</query>
-    <query tag='FULL KEY'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042</query>
-    <query tag='FULL ON'>SELECT COUNT() FROM ints l FULL JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042</query>
-    <query tag='FULL IN'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042)</query>
+    <query tag='FULL'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='FULL KEY'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64,i32,i16,i8 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='FULL ON'>SELECT COUNT() FROM ints l FULL JOIN ints r ON l.i64 = r.i64 WHERE i32 = 20042 settings query_plan_filter_push_down = 0</query>
+    <query tag='FULL IN'>SELECT COUNT() FROM ints l FULL JOIN ints r USING i64 WHERE i32 IN(42, 10042, 20042, 30042, 40042) settings query_plan_filter_push_down = 0</query>
 
     <drop_query>DROP TABLE IF EXISTS ints</drop_query>
 </test>
diff --git a/tests/performance/json_extract_rapidjson.xml b/tests/performance/json_extract_rapidjson.xml
index 2a34acfe10f..f8d40c1e58d 100644
--- a/tests/performance/json_extract_rapidjson.xml
+++ b/tests/performance/json_extract_rapidjson.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
 
 
diff --git a/tests/performance/json_extract_simdjson.xml b/tests/performance/json_extract_simdjson.xml
index f9f6df5140e..9ec3613d5e8 100644
--- a/tests/performance/json_extract_simdjson.xml
+++ b/tests/performance/json_extract_simdjson.xml
@@ -1,7 +1,4 @@
 <test>
-
-
-
     <substitutions>
         <substitution>
            <name>json</name>
@@ -21,19 +18,19 @@
         <allow_simdjson>1</allow_simdjson>
     </settings>
 
-    <query>SELECT 'simdjson-1', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam'))</query>
-    <query>SELECT 'simdjson-2', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam', 'nested_1'))</query>
-    <query>SELECT 'simdjson-3', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractInt(materialize({json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-4', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractUInt(materialize({json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-5', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractFloat(materialize({json}), 'fparam'))</query>
+    <query>SELECT 'simdjson-1',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam'))</query>
+    <query>SELECT 'simdjson-2',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({json}), 'sparam', 'nested_1'))</query>
+    <query>SELECT 'simdjson-3',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractInt(materialize({json}), 'nparam'))</query>
+    <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(1000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam'))</query>
-    <query>SELECT 'simdjson-7', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam', 'nested_1'))</query>
-    <query>SELECT 'simdjson-8', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractInt(materialize({long_json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-9', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractUInt(materialize({long_json}), 'nparam'))</query>
-    <query>SELECT 'simdjson-10', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractRaw(materialize({long_json}), 'fparam'))</query>
-    <query>SELECT 'simdjson-11', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam'))</query>
-    <query>SELECT 'simdjson-12', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam', 'nested_2', -2))</query>
-    <query>SELECT 'simdjson-13', count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractBool(materialize({long_json}), 'bparam'))</query>
+    <query>SELECT 'simdjson-6',  count() FROM zeros(5000000) 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>
+    <query>SELECT 'simdjson-10', count() FROM zeros(3000000) WHERE NOT ignore(JSONExtractRaw(materialize({long_json}), 'fparam'))</query>
+    <query>SELECT 'simdjson-11', count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam'))</query>
+    <query>SELECT 'simdjson-12', count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractFloat(materialize({long_json}), 'fparam', 'nested_2', -2))</query>
+    <query>SELECT 'simdjson-13', count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractBool(materialize({long_json}), 'bparam'))</query>
 
 </test>
diff --git a/tests/performance/logical_functions_medium.xml b/tests/performance/logical_functions_medium.xml
index 19572191532..be474894b54 100644
--- a/tests/performance/logical_functions_medium.xml
+++ b/tests/performance/logical_functions_medium.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <max_threads>1</max_threads>
     </settings>
diff --git a/tests/performance/logical_functions_small.xml b/tests/performance/logical_functions_small.xml
index d5f6a7b99cb..3d70ef6811d 100644
--- a/tests/performance/logical_functions_small.xml
+++ b/tests/performance/logical_functions_small.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <max_threads>1</max_threads>
     </settings>
diff --git a/tests/performance/math.xml b/tests/performance/math.xml
index 35250351683..006e33548c9 100644
--- a/tests/performance/math.xml
+++ b/tests/performance/math.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <substitutions>
         <substitution>
            <name>func_slow</name>
diff --git a/tests/performance/merge_tree_many_partitions_2.xml b/tests/performance/merge_tree_many_partitions_2.xml
index 0b8a4650835..6799153ed65 100644
--- a/tests/performance/merge_tree_many_partitions_2.xml
+++ b/tests/performance/merge_tree_many_partitions_2.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
     <create_query>CREATE TABLE bad_partitions (a UInt64, b UInt64, c UInt64, d UInt64, e UInt64, f UInt64, g UInt64, h UInt64, i UInt64, j UInt64, k UInt64, l UInt64, m UInt64, n UInt64, o UInt64, p UInt64, q UInt64, r UInt64, s UInt64, t UInt64, u UInt64, v UInt64, w UInt64, x UInt64, y UInt64, z UInt64) ENGINE = MergeTree PARTITION BY x ORDER BY x</create_query>
     <fill_query>INSERT INTO bad_partitions (x) SELECT * FROM numbers_mt(3000)</fill_query>
diff --git a/tests/performance/number_formatting_formats.xml b/tests/performance/number_formatting_formats.xml
index 77b39da8e92..92e04a62024 100644
--- a/tests/performance/number_formatting_formats.xml
+++ b/tests/performance/number_formatting_formats.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <substitutions>
         <substitution>
             <name>format</name>
diff --git a/tests/performance/optimized_select_final.xml b/tests/performance/optimized_select_final.xml
index d70fccc1330..46b408d0cb4 100644
--- a/tests/performance/optimized_select_final.xml
+++ b/tests/performance/optimized_select_final.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <settings>
         <do_not_merge_across_partitions_select_final>1</do_not_merge_across_partitions_select_final>
     </settings>
diff --git a/tests/performance/order_by_decimals.xml b/tests/performance/order_by_decimals.xml
index 4889137865d..20b860f0a2d 100644
--- a/tests/performance/order_by_decimals.xml
+++ b/tests/performance/order_by_decimals.xml
@@ -4,13 +4,10 @@
         <tag>comparison</tag>
     </tags>
 
+    <query>SELECT toInt32(number)          AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal32(number, 0)   AS n FROM numbers(10000000) ORDER BY n      FORMAT Null</query>
 
-
-    <query>SELECT toInt32(number) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n FORMAT Null</query>
-
-    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-    <query>SELECT toDecimal64(number, 8) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-    <query>SELECT toDecimal128(number, 10) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
-
+    <query>SELECT toDecimal32(number, 0)   AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal64(number, 8)   AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal128(number, 10) AS n FROM numbers(10000000) ORDER BY n DESC FORMAT Null</query>
 </test>
diff --git a/tests/performance/order_by_read_in_order.xml b/tests/performance/order_by_read_in_order.xml
index b91cd14baf4..cdbf477c335 100644
--- a/tests/performance/order_by_read_in_order.xml
+++ b/tests/performance/order_by_read_in_order.xml
@@ -3,10 +3,11 @@
         <table_exists>hits_100m_single</table_exists>
     </preconditions>
 
-<query>SELECT * FROM hits_100m_single ORDER BY CounterID, EventDate LIMIT 1000</query>
-<query>SELECT * FROM hits_100m_single ORDER BY CounterID DESC, toStartOfWeek(EventDate) DESC LIMIT 100</query>
+<!-- Some queries are almost instantaneous index lookups, so we mark them as short. -->
+<query short="1">SELECT * FROM hits_100m_single ORDER BY CounterID, EventDate LIMIT 100</query>
+<query short="1">SELECT * FROM hits_100m_single ORDER BY CounterID DESC, toStartOfWeek(EventDate) DESC LIMIT 100</query>
 <query>SELECT * FROM hits_100m_single ORDER BY CounterID, EventDate, URL LIMIT 100</query>
-<query>SELECT * FROM hits_100m_single WHERE CounterID IN (152220, 168777, 149234, 149234) ORDER BY CounterID DESC, EventDate DESC LIMIT 100</query>
+<query short="1">SELECT * FROM hits_100m_single WHERE CounterID IN (152220, 168777, 149234, 149234) ORDER BY CounterID DESC, EventDate DESC LIMIT 100</query>
 <query>SELECT * FROM hits_100m_single WHERE UserID=1988954671305023629 ORDER BY CounterID, EventDate LIMIT 100</query>
 
 </test>
diff --git a/tests/performance/parallel_index.xml b/tests/performance/parallel_index.xml
index 78acf6001f0..033e47ee8ee 100644
--- a/tests/performance/parallel_index.xml
+++ b/tests/performance/parallel_index.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <create_query>create table test_parallel_index (x UInt64, y UInt64, z UInt64, INDEX a (y) TYPE minmax GRANULARITY 2,
         INDEX b (z) TYPE set(8) GRANULARITY 2) engine = MergeTree order by x partition by bitAnd(x, 63 * 64) settings index_granularity = 4;</create_query>
 
diff --git a/tests/performance/parallel_mv.xml b/tests/performance/parallel_mv.xml
index e6635a74b96..1e9b92c54df 100644
--- a/tests/performance/parallel_mv.xml
+++ b/tests/performance/parallel_mv.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <parallel_view_processing>1</parallel_view_processing>
     </settings>
diff --git a/tests/performance/parse_engine_file.xml b/tests/performance/parse_engine_file.xml
index d49670b36b5..2740b680b67 100644
--- a/tests/performance/parse_engine_file.xml
+++ b/tests/performance/parse_engine_file.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
 <preconditions>
     <table_exists>test.hits</table_exists>
@@ -30,7 +30,7 @@
 
 <fill_query>INSERT INTO table_{format} SELECT * FROM test.hits LIMIT 100000</fill_query>
 
-<query>SELECT * FROM table_{format} FORMAT Null</query>
+<query short="'{format}' == 'Native'">SELECT * FROM table_{format} FORMAT Null</query>
 
 <drop_query>DROP TABLE IF EXISTS table_{format}</drop_query>
 
diff --git a/tests/performance/point_in_polygon.xml b/tests/performance/point_in_polygon.xml
index 403c2d62cba..31c24eb006f 100644
--- a/tests/performance/point_in_polygon.xml
+++ b/tests/performance/point_in_polygon.xml
@@ -1,5 +1,9 @@
 <test>
     <settings>
+        <!--
+            Not sure why it's needed. Maybe it has something to do with the
+            resulting block size of Memory table.
+         -->
         <optimize_trivial_insert_select>0</optimize_trivial_insert_select>
     </settings>
 
@@ -8,7 +12,8 @@
         INSERT INTO polygons
         WITH number + 1 AS radius
         SELECT [arrayMap(x -> (cos(x / 90. * pi()) * radius, sin(x / 90. * pi()) * radius), range(180))]
-        FROM numbers(1000000)
+        FROM numbers_mt(5000000)
+        SETTINGS max_insert_threads = 2, max_memory_usage = 30000000000
     </create_query>
 
     <query>SELECT pointInPolygon((100, 100), polygon) FROM polygons FORMAT Null</query>
diff --git a/tests/performance/polymorphic_parts_l.xml b/tests/performance/polymorphic_parts_l.xml
index 539422aa6e3..d2ae9417bf7 100644
--- a/tests/performance/polymorphic_parts_l.xml
+++ b/tests/performance/polymorphic_parts_l.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <create_query>
         CREATE TABLE hits_wide AS hits_10m_single ENGINE = MergeTree()
         PARTITION BY toYYYYMM(EventDate)
diff --git a/tests/performance/polymorphic_parts_m.xml b/tests/performance/polymorphic_parts_m.xml
index ed29ac43d64..54a81def55e 100644
--- a/tests/performance/polymorphic_parts_m.xml
+++ b/tests/performance/polymorphic_parts_m.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <create_query>
         CREATE TABLE hits_wide AS hits_10m_single ENGINE = MergeTree()
         PARTITION BY toYYYYMM(EventDate)
diff --git a/tests/performance/polymorphic_parts_s.xml b/tests/performance/polymorphic_parts_s.xml
index 0496692b087..5021e135bb9 100644
--- a/tests/performance/polymorphic_parts_s.xml
+++ b/tests/performance/polymorphic_parts_s.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <create_query>
         CREATE TABLE hits_wide AS hits_10m_single ENGINE = MergeTree()
         PARTITION BY toYYYYMM(EventDate)
diff --git a/tests/performance/quantile.xml b/tests/performance/quantile.xml
new file mode 100644
index 00000000000..4718c129db6
--- /dev/null
+++ b/tests/performance/quantile.xml
@@ -0,0 +1,29 @@
+<test>
+    <preconditions>
+        <table_exists>hits_100m_single</table_exists>
+    </preconditions>
+
+    <substitutions>
+        <substitution>
+           <name>key</name>
+           <values>
+               <value>SearchEngineID</value>
+               <value>RegionID</value>
+               <value>SearchPhrase</value>
+               <value>ClientIP</value>
+           </values>
+        </substitution>
+        <substitution>
+           <name>func</name>
+           <values>
+               <value>quantile</value>
+               <value>quantileExact</value>
+               <value>quantileTDigest</value>
+               <value>quantileTiming</value>
+               <value>quantileBFloat16</value>
+           </values>
+       </substitution>
+    </substitutions>
+
+    <query>SELECT {key} AS k, {func}(ResolutionWidth) FROM hits_100m_single GROUP BY k FORMAT Null</query>
+</test>
diff --git a/tests/performance/questdb_sum_int32.xml b/tests/performance/questdb_sum_int32.xml
index ae13210107e..613ef3dc058 100644
--- a/tests/performance/questdb_sum_int32.xml
+++ b/tests/performance/questdb_sum_int32.xml
@@ -25,7 +25,8 @@
     </substitutions>
 
     <create_query>CREATE TABLE `zz_{type}_{engine}` (x {type}) ENGINE {engine}</create_query>
-    <fill_query>INSERT INTO `zz_{type}_{engine}` SELECT rand() FROM numbers(1000000000)</fill_query>
+    <fill_query>INSERT INTO `zz_{type}_{engine}` SELECT rand() FROM numbers_mt(1000000000) SETTINGS max_insert_threads = 8</fill_query>
+    <fill_query>OPTIMIZE TABLE `zz_{type}_MergeTree ORDER BY tuple()` FINAL</fill_query>
 
     <query>SELECT sum(x) FROM `zz_{type}_{engine}`</query>
 
diff --git a/tests/performance/random_printable_ascii.xml b/tests/performance/random_printable_ascii.xml
index 97cadef24c2..a55779f748d 100644
--- a/tests/performance/random_printable_ascii.xml
+++ b/tests/performance/random_printable_ascii.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(randomPrintableASCII(10))</query>
     <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(randomPrintableASCII(100))</query>
     <query>SELECT count() FROM zeros(100000) WHERE NOT ignore(randomPrintableASCII(1000))</query>
diff --git a/tests/performance/random_string.xml b/tests/performance/random_string.xml
index 79f12373f1c..1a740ae077a 100644
--- a/tests/performance/random_string.xml
+++ b/tests/performance/random_string.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <query>SELECT count() FROM zeros(100000000) WHERE NOT ignore(randomString(10))</query>
     <query>SELECT count() FROM zeros(100000000) WHERE NOT ignore(randomString(100))</query>
     <query>SELECT count() FROM zeros(1000000) WHERE NOT ignore(randomString(1000))</query>
diff --git a/tests/performance/redundant_functions_in_order_by.xml b/tests/performance/redundant_functions_in_order_by.xml
index 894e8dc1917..b259e08c973 100644
--- a/tests/performance/redundant_functions_in_order_by.xml
+++ b/tests/performance/redundant_functions_in_order_by.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
     </preconditions>
diff --git a/tests/performance/reinterpret_as.xml b/tests/performance/reinterpret_as.xml
index b9b6fec2084..79ce167a363 100644
--- a/tests/performance/reinterpret_as.xml
+++ b/tests/performance/reinterpret_as.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <settings>
         <allow_experimental_bigint_types>1</allow_experimental_bigint_types>
         <max_memory_usage>15G</max_memory_usage>
diff --git a/tests/performance/rewrite_sumIf.xml b/tests/performance/rewrite_sumIf.xml
index 4ba4916bdbf..cc25b28adb7 100644
--- a/tests/performance/rewrite_sumIf.xml
+++ b/tests/performance/rewrite_sumIf.xml
@@ -1,4 +1,5 @@
 <test>
-    <query>SELECT sumIf(1, 0) FROM numbers(100000000)</query>
-    <query>SELECT sumIf(1, 1) FROM numbers(100000000)</query>
+    <!-- Shouldn't have been a perf test, but an EXPLAIN one. -->
+    <query>SELECT sumIf(1, 0) FROM numbers(1000000000)</query>
+    <query>SELECT sumIf(1, 1) FROM numbers(1000000000)</query>
 </test>
diff --git a/tests/performance/select_format.xml b/tests/performance/select_format.xml
index 5f9c2e3f73b..985ec0f2b52 100644
--- a/tests/performance/select_format.xml
+++ b/tests/performance/select_format.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <settings>
         <output_format_pretty_max_rows>1000000</output_format_pretty_max_rows>
         <max_threads>1</max_threads>
diff --git a/tests/performance/set_index.xml b/tests/performance/set_index.xml
index 76f1087a1bf..1fb7cf967f3 100644
--- a/tests/performance/set_index.xml
+++ b/tests/performance/set_index.xml
@@ -19,7 +19,7 @@
         means it is considered "short" and compared qualitatively, not quantitatively.
     -->
     <query short="1">SELECT toString(rand()) IN ('41577', '83972', '51697', '50014', '37553', '93459', '87438', '95971', '83186', '74326', '67871', '50406', '83678', '29655', '18580', '83905', '61518', '29059', '56700', '82787', '98672', '30884', '81822', '39850', '80852', '57627', '91346', '64522', '17781', '49467', '41099', '41929', '85618', '91389', '68564', '91769', '81219', '52218', '37220', '97097', '2129', '9886', '52049', '34847', '25364', '36429', '76897', '71868', '58121', '71199', '84819', '69991', '34046', '64507', '34892', '24228', '36986', '28588', '51159', '53444', '80531', '9941', '20256', '48103', '32565', '62890', '5379', '60302', '46434', '3205', '18821', '31030', '19794', '71557', '71703', '15024', '14004', '82164', '95659', '40227', '83358', '24395', '9610', '19814', '48491', '66412', '16012', '71586', '42143', '51103', '24463', '89949', '35694', '39193', '63904', '40489', '77144', '94014', '84836', '9980', '46554', '43905', '25588', '25205', '72624', '10249', '35888', '98478', '99030', '26834', '31', '81499', '14847', '82997', '92357', '92893', '17426', '56630', '22252', '68119', '62710', '8740', '82144', '79916', '23391', '30192', '99271', '96435', '44237', '98327', '69481', '16691', '13643', '84554', '38571', '70926', '99283', '79000', '20926', '86495', '4834', '1222', '39486', '57697', '58002', '40790', '15623', '3999', '31515', '12694', '26143', '35951', '54085', '97534', '35329', '73535', '88715', '29572', '75799', '45166', '32066', '48023', '69523', '93150', '8740', '96790', '15534', '63252', '5142', '67045', '93992', '16663', '292', '63924', '6588', '12190', '31506', '69590', '35394', '55168', '65223', '79183', '32600', '69676', '28316', '72111', '53531', '15073', '41127', '73451', '24725', '61647', '65315', '41143', '26493', '95608', '34407', '76098', '53105', '83691', '48755', '35696', '62587', '81826', '3963', '45766', '82751', '12430', '97685', '29919', '78155', '71636', '50215', '89734', '9892', '47151', '54855', '3428', '9712', '52592', '2403', '79602', '81243', '79859', '57361', '82000', '42107', '28860', '99591', '28296', '57337', '64969', '32332', '25535', '30924', '21313', '32554', '17342', '87311', '19825', '24898', '61323', '83209', '79322', '79009', '50746', '33396', '62033', '16548', '17427', '24073', '34640', '52368', '4724', '80408', '40', '33787', '16666', '19665', '86751', '27264', '2241', '88134', '53566', '10589', '79711', '92823', '58972', '91767', '60885', '51659', '7867', '96849', '30360', '20914', '9584', '1250', '22871', '23282', '99312', '4683', '33429', '68361', '82614', '81440', '47863', '69790', '11968', '75210', '66854', '37002', '61142', '71514', '1588', '42336', '11069', '26291', '2261', '71056', '13492', '9133', '91216', '72207', '71586', '86535', '83898', '24392', '45384', '48545', '61972', '503', '80180', '35834', '97025', '70411', '55039', '35430', '27631', '82533', '96831', '74077', '42533', '14451', '26943', '53783', '69489', '71969', '8432', '37230', '61348', '19472', '59115', '9886', '50951', '57109', '7141', '1902', '84130', '4323', '55889', '47784', '2220', '75988', '66988', '63721', '8131', '95601', '95207', '2311', '26541', '50991', '6717', '2969', '71857', '51034', '65958', '94716', '90275', '21012', '46859', '7984', '31131', '46457', '69578', '44540', '7294', '80117', '9925', '60155', '90608', '82684', '32193', '87071', '28006', '87604', '24501', '79087', '2848', '29237', '11221', '81319', '40966', '87641', '35325', '78705', '88636', '78717', '62831', '56390', '99271', '43821', '14453', '17923', '62695', '77322', '21038', '67677', '41271', '4376', '65426', '46091', '19887', '97251', '55583', '58763', '3826', '35037', '73533', '64267', '82319', '9836', '42622', '96829', '16363', '10455', '49290', '99992', '98229', '66356', '59087', '73998', '25986', '4279', '56790', '69540', '588', '36620', '60358', '45056', '89297', '42740', '8323', '19245', '82417', '41431', '699', '11554', '73910', '44491', '56019', '68901', '45816', '68126', '89379', '23885', '13263', '56395', '73130', '19089', '23771', '10335', '48547', '16903', '6453', '33560', '89668', '38159', '43177', '90655', '49712', '62', '66920', '34180', '12150', '48564', '39538', '85026', '87195', '14928', '8956', '71157', '53287', '39161', '67583', '83309', '92054', '86977', '56188', '15229', '88170', '60894', '58497', '89254', '40082', '86890', '60161', '97291', '45878', '23368', '14577', '92870', '37017', '97356', '99426', '76061', '89186', '99751', '85153', '61580', '39360', '90107', '25603', '26798', '76224', '6469', '7912', '69838', '16404', '67497', '28965', '80836', '80365', '91249', '48713', '17113', '33090', '40793', '70450', '66689', '83698', '17802', '43869', '13355', '18959', '79411', '87930', '9265', '37504', '44876', '97234', '94149', '35040', '22049', '49248', '6535', '36080', '28346', '94437', '78319', '17961', '89056', '56161', '35810', '41632', '45494', '53351', '89729', '99510', '51584', '59688', '6193', '70809', '51093', '92589', '90247', '34910', '78235', '17362', '49423', '63324', '525', '37638', '72325', '89356', '15298', '59116', '17848', '65429', '27029', '84781', '70247', '8825', '35082', '70451', '22522', '58125', '91879', '90531', '2478', '463', '37902', '54405', '87267', '72688', '22803', '33134', '35177', '84551', '44974', '88375', '76407', '27774', '33849', '19915', '82014', '80434', '26380', '48777', '53811', '14838', '26829', '56441', '99869', '49574', '85476', '19723', '16907', '4018', '37338', '78510', '47912', '13030', '65277', '95716', '67363', '21393', '89887', '78842', '81650', '903', '17436', '30704', '49223', '27198', '25500', '52214', '54258', '70082', '53950', '49312', '43615', '99473', '94348', '53661', '96213', '96346', '62010', '38268', '32861', '75660', '10392', '89491', '68335', '29817', '88706', '24184', '36298', '43440', '21626', '26535', '44560', '46363', '12534', '99070', '95606', '33714', '73070', '8303', '29853', '23014', '99982', '4530', '14955', '45803', '50', '90750', '30394', '81276', '95563', '47314', '58520', '91299', '88944', '54402', '67405', '29253', '47079', '71734', '99728', '17652', '13307', '35556', '18962', '26780', '17771', '53712', '60055', '37628', '35830', '90739', '61151', '41309', '27652', '3051', '53167', '98417', '19382', '36833', '75085', '65374', '87732', '30352', '31776', '32765', '97565', '92199', '49050', '29503', '51024', '18834', '8515', '24069', '96216', '10777', '90680', '18974', '68884', '85305', '36007', '56707', '4212', '47352', '34426', '13185', '92939', '95782', '70577', '58080', '98279', '3906', '5065', '56896', '16382', '31273', '17117', '98602', '12786', '24086', '63970', '72756', '35798', '82367', '7356', '53398', '68503', '2962', '16425', '67334', '68461', '65439', '15620', '70906', '29649', '46461', '74602', '38012', '71714', '16825', '89480', '53386', '88532', '35104', '28556', '82120', '23155', '23347', '24797', '60061', '54962', '99427', '82248', '82447', '39968', '63727', '27431', '81511', '91168', '71425', '80740', '84127', '40717', '15503', '15419', '46594', '61263', '19212', '53175', '70724', '74445', '23034', '71818', '40246', '18886', '53066', '4880', '83701', '86107', '87862', '44751', '392', '73440', '90291', '93395', '20894', '38463', '32664', '55158', '20090', '50004', '79070', '98471', '85478', '96615', '68149', '78334', '97752', '73207', '71678', '91238', '96757', '82598', '194', '35797', '45120', '60782', '28721', '17676', '78066', '60957', '11826', '51563', '50516', '16485', '47053', '31738', '48923', '23554', '96850', '42033', '73701', '78607', '45979', '54571', '12415', '31693', '15356', '36902', '9126', '3767', '3295', '90402', '24005', '95350', '67033', '49137', '72606', '51899', '17522', '31957', '44641', '53982', '23767', '68257', '15766', '19995', '2107', '48788', '11765', '91055', '46576', '54651', '50381', '62827', '73636', '46606', '98753', '37631', '70441', '87916', '66983', '33870', '31125', '12904', '57040', '4874', '58632', '42037', '18782', '5998', '18974', '57949', '81010', '90407', '99874', '20462', '89949', '10952', '71454', '95130', '46115', '3518', '13384', '69039', '79482', '22076', '59782', '32042', '40930', '60243', '29298', '6790', '46985', '44398', '85631', '14380', '66179', '2629', '32126', '49833', '14118', '58492', '31493', '81172', '96638', '8745', '89663', '76842', '78633', '41373', '83721', '42886', '11123', '32739', '11051', '1303', '92314', '83324', '85600', '44276', '69064', '56125', '84650', '31028', '12628', '14502', '64764', '39405', '44855', '79046', '51716', '46824', '83389', '1941', '1257', '9280', '73176', '84729', '2579', '63366', '22606', '35541', '51096', '13447', '18355', '68037', '28436', '94116', '81070', '78355', '67897', '5296', '32742', '77645', '91853', '18767', '67949', '40963', '5792', '17278', '25597', '41884', '80829', '7099', '18645', '60295', '12082', '81800', '78415', '18082', '38789', '16295', '72377', '74949', '55583', '66853', '15402', '72977', '15123', '99434', '34999', '21687', '76049', '42987', '83748', '88256', '66688', '21766', '20304', '29271', '10069', '19822', '11792', '42526', '74143', '17289', '30253', '6367', '20888', '12975', '94073', '98639', '30134', '26320', '65507', '69002', '53120', '4550', '38893', '18954', '38283', '54863', '17698', '99670', '10521', '92467', '60994', '18052', '48673', '35811', '87282', '62706', '16061', '53112', '22652', '37780', '55662', '26331', '49410', '79074', '10623', '69577', '79613', '9491', '31229', '43922', '84231', '58409', '36386', '46875', '74431', '76735', '38776', '23350', '7314', '9079', '51519', '98544', '70216', '63380', '90381', '1295', '46901', '58225', '55339', '89918', '75522', '35431', '89460', '49552', '89302', '23068', '28493', '3042', '25194', '59520', '9810', '95706', '81297', '89638', '54794', '94527', '45262', '97932', '78685', '6947', '22818', '48700', '9153', '12289', '22011', '58825', '93854', '65438', '4509', '33741', '28208', '69061', '48578', '40247', '77725', '31837', '39003', '69363', '78113', '76398', '97262', '67795',
-    '68446', '58896', '60969', '19849', '6722', '91854', '49519', '13949', '67109', '48824', '31723', '75554', '69575', '94986', '75350', '18628', '15284', '41943', '15433', '52607', '41', '22340', '29528', '24059', '34145', '72517', '46316', '10667', '54510', '19882', '47764', '69124', '41963', '84350', '48420', '4646', '24958', '69020', '97121', '26178', '62664', '50622', '32554', '49655', '45398', '11267', '72222', '73363', '89554', '89046', '57384', '29259', '37888', '24850', '74353', '57343', '34762', '2900', '11393', '42154', '94306', '70552', '75265', '921', '26003', '64352', '89857', '83171', '58249', '48940', '53512', '66335', '44865', '68729', '19299', '58003', '39854', '99122', '3860', '80173', '52242', '90966', '53183', '71982', '82325', '87842', '15000', '55627', '71132', '6354', '42402', '91719', '91644', '94533', '74925', '66278', '66911', '85576', '40495', '70919', '71797', '87835', '29845', '71832', '3390', '7994', '33499', '70715', '54897', '82710', '63077', '78105', '24758', '89585', '84607', '46477', '78618', '10989', '39222', '98749', '51685', '94664', '31008', '32823', '89521', '72160', '26952', '4001', '21421', '5737', '74027', '88179', '45553', '83743', '19913', '49435', '65616', '82641', '5149', '76959', '40681', '73023', '2670', '30845', '18863', '35094', '88400', '80963', '9154', '16571', '64192', '59694', '41317', '59942', '58856', '99281', '67260', '66971', '22716', '76089', '58047', '67071', '53707', '462', '52518', '72277', '10681', '69', '98855', '12593', '88842', '67242', '73543', '37439', '18413', '67211', '93495', '45576', '70614', '27988', '53210', '18618', '21318', '68059', '25518', '55917', '56522', '16548', '2404', '93538', '61452', '66358', '3709', '23914', '92426', '81439', '38070', '28988', '29939', '2948', '85720', '45628', '51101', '89431', '86365', '17571', '50987', '83849', '11015', '83812', '66187', '26362', '66786', '22024', '93866', '36161', '90080', '64874', '37294', '83860', '73821', '80279', '36766', '73117', '44620', '84556', '42070', '90383', '27862', '20665', '67576', '34997', '57958', '80638', '84351', '63961', '1362', '14338', '80377', '24192', '41294', '57368', '51189', '27287', '45764', '86289', '65600', '708', '84090', '96005', '55676', '84855', '72385', '70018', '9336', '82701', '3710', '52083', '74045', '96454', '30956', '67369', '78941', '81810', '71906', '23194', '33042', '50794', '61256', '24449', '48639', '22916', '78303', '13666', '40762', '43942', '51075', '89783', '95786', '90462', '6181', '36482', '40675', '4970', '6388', '91849', '72579', '94983', '86084', '20140', '68427', '48123', '43122', '98066', '37560', '6927', '72803', '5546', '62259', '98439', '6457', '98568', '70499', '33022', '28226', '29675', '20917', '75365', '20900', '8190', '56736', '99153', '77779', '49333', '50293', '97650', '4067', '47278', '42761', '71875', '13966', '11223', '46783', '18059', '61355', '29638', '75681', '24466', '89634', '20759', '83252', '37780', '15931', '74893', '6703', '64524', '80656', '85990', '78427', '18411', '20696', '86432', '93176', '69889', '15072', '15180', '9935', '10467', '60248', '42430', '62590', '89596', '27743', '26398', '79912', '60048', '50943', '38870', '69383', '72261', '98059', '55242', '74905', '5667', '54321', '70415', '39903', '49711', '85318', '79979', '59262', '82321', '15263', '17416', '74554', '94733', '72112', '49872', '54849', '73883', '78250', '74935', '68559', '57564', '50541', '45730', '41595', '5588', '83723', '42891', '11898', '14348', '99732', '14481', '85233', '21277', '94508', '52551', '74187', '7634', '42912', '25100', '43536', '35798', '48190', '86477', '22680', '48148', '59501', '56563', '16802', '81496', '97568', '68657', '51462', '67953', '99660', '39002', '54170', '57190', '68086', '52700', '6487', '55709', '70418', '62629', '70420', '35695', '36152', '45360', '53503', '46623', '76000', '50648', '97876', '44815', '29163', '1356', '64123', '71388', '17658', '99084', '58727', '59437', '38773', '71254', '81286', '97545', '18786', '56834', '20346', '36401', '62316', '58082', '67959', '99876', '69895', '80099', '62747', '20517', '99777', '6472', '49189', '31321', '39992', '68073', '13378', '51806', '21776', '52060', '96983', '25754', '93709', '96627', '8644', '93726', '14002', '37716', '87620', '34507', '76339', '24491', '5849', '44110', '522', '66521', '12776', '44887', '80535', '14548', '75248', '671', '73071', '35715', '59474', '7061', '82243', '56170', '20179', '59717', '1725', '24634', '11270', '77023', '63840', '46608', '44667', '22422', '59771', '94768', '73033', '82905', '16463', '40971', '22204', '58366', '28721', '14907', '76468', '81872', '38418', '36989', '61439', '10610', '131', '44296', '35453', '10117', '75856', '94603', '99602', '68075', '35949', '13599', '50030', '69633', '55956', '85465', '16429', '86081', '11145', '6195', '82207', '90598', '92814', '23725', '83204', '80346', '71542', '46634', '15820', '54123', '45397', '15322', '61743', '9273', '71347', '6835', '64006', '91718', '43677', '32923', '21486', '17098', '61694', '43347', '40019', '4071', '52443', '42386', '56839', '83514', '27633', '40780', '51749', '92101', '62384', '92206', '56044', '66174', '11137', '73966', '78471', '30468', '31643', '33197', '6888', '8066', '86603', '74383', '6098', '54411', '98819', '89862', '88639', '94422', '89371', '80526', '91747', '91220', '64944', '76658', '42046', '58518', '27249', '6646', '3028', '1346', '33763', '9734', '31737', '65527', '5892', '60813', '3410', '35464', '43009', '98382', '70580', '93898', '56404', '32995', '62771', '71556', '40538', '55612', '45656', '10758', '20268', '33603', '38310', '14242', '74397', '10722', '71575', '22590', '49043', '91439', '9055', '23668', '9101', '5268', '64133', '77501', '64684', '11337', '47575', '50732', '88680', '93730', '46785', '17589', '3520', '57595', '71241', '34994', '8753', '36147', '88844', '41914', '11250', '94632', '71927', '4624', '86279', '7664', '2659', '94853', '65386', '30438', '86005', '92883', '84629', '59910', '44484', '1306', '8404', '56962', '29990', '38445', '96191', '73013', '66590', '40951', '24712', '18825', '37268', '87843', '18972', '12154', '7779', '52149', '76152', '65799', '86011', '35475', '78083', '88232', '91551', '65532', '93516', '73827', '24227', '44687', '55759', '83819', '45088', '10856', '60488', '39051', '14103', '76650', '81181', '46731', '737', '58788', '78945', '42096', '66731', '66740', '72273', '88969', '5655', '86590', '41096', '80038', '32430', '51877', '23970', '91900', '13082', '45880', '94367', '19739', '61998', '71665', '16083', '57035', '26916', '10166', '18834', '46798', '66881', '28444', '68840', '10459', '81087', '4728', '76224', '39257', '23470', '93524', '37345', '30074', '49856', '22022', '55279', '5159', '5193', '58030', '57539', '12514', '49759', '96222', '52597', '67192', '88187', '53614', '16084', '79915', '28212', '79334', '85283', '32306', '31058', '43113', '74707', '74869', '2213', '32134', '6379', '85426', '87098', '35984', '51105', '69287', '16803', '83337', '14913', '62531', '58098', '7914', '20105', '28850', '1384', '43173', '62983', '87113', '76066', '86320', '77684', '45191', '95225', '41503', '36713', '48404', '91228', '53865', '98981', '59161', '61237', '84561', '17455', '14379', '57789', '80895', '99260', '84595', '72942', '53220', '84448', '81332', '49437', '83086', '93414', '54519', '52288', '74772', '22460', '49324', '11168', '96071', '61985', '38284', '6405', '54698', '71727', '60093', '37340', '87884', '83403', '4542', '94949', '19636', '15855', '39105', '10424', '67418', '91022', '69254', '8481', '38411', '3832', '44354', '93548', '57172', '28481', '372', '81497', '52179', '41060', '72141', '41396', '65590', '70432', '82819', '93814', '26118', '84780', '88485', '70821', '8222', '83000', '47067', '38516', '33347', '47681', '48202', '60749', '52112', '7937', '28105', '11394', '45746', '43252', '34494', '2979', '69715', '42486', '82315', '71760', '97413', '66137', '94487', '7429', '74434', '22964', '55251', '3448', '53534', '2574', '9693', '96157', '2955', '4348', '19566', '56930', '83319', '31310', '53905', '1148', '41726', '22233', '76045', '37351', '10545', '17581', '28047', '30199', '4741', '58111', '33497', '67796', '67730', '31247', '43772', '29461', '45970', '73353', '22534', '53962', '32147', '71392', '62579', '66345', '58246', '33442', '9581', '29705', '14058', '86471', '76125', '59363', '94982', '74810', '89149', '20066', '3366', '3568', '25752', '80036', '64119', '27270', '40061', '91052', '69022', '9852', '77112', '83075', '43924', '61661', '56133', '96652', '57944', '72576', '82170', '79236', '55745', '15309', '88878', '72761', '37647', '67465', '12777', '97309', '93202', '41470', '8787', '64920', '48514', '18917', '35157', '59151', '4640', '5317', '38134', '76548', '82788', '9214', '58418', '73185', '90554', '10543', '47182', '62936', '91765', '89751', '68931', '48865', '64607', '7150', '77862', '14297', '14828', '33013', '91698', '67593', '98096', '16595', '51639', '86531', '24719', '1703', '78788', '43810', '38918', '95491', '99903', '82671', '8291', '68288', '31224', '39863', '4265', '77798', '7698', '33804', '92286', '4744', '37038', '44203', '98212', '17369', '77442', '62879', '4145', '96881', '15646', '36824', '19959', '45451', '76049', '54272', '97577', '95298', '81115', '30204', '82041', '8037', '10052', '8756', '76833', '82851', '24276', '75574', '36037', '78079', '92807', '29064', '90000', '84150', '17102', '75092', '49424', '35597', '4693', '82853', '42511', '16119', '23478', '65240', '55585', '91762', '71671', '46682', '72479', '97696', '24615', '12579', '30274', '48255', '2336', '90202', '5808', '45426', '76308', '74639', '31245', '99894', '89638', '6233', '33893', '71899', '85273', '89429', '29761', '50231', '57249', '99347', '22642', '66972', '86221', '47514', '88274', '10819', '73150', '53754', '13304', '20478', '38099', '619', '14669', '8011', '97657', '26569', '65430', '13467', '38180', '23675', '72350', '42257', '39875', '23529', '53407', '11833', 
+    '68446', '58896', '60969', '19849', '6722', '91854', '49519', '13949', '67109', '48824', '31723', '75554', '69575', '94986', '75350', '18628', '15284', '41943', '15433', '52607', '41', '22340', '29528', '24059', '34145', '72517', '46316', '10667', '54510', '19882', '47764', '69124', '41963', '84350', '48420', '4646', '24958', '69020', '97121', '26178', '62664', '50622', '32554', '49655', '45398', '11267', '72222', '73363', '89554', '89046', '57384', '29259', '37888', '24850', '74353', '57343', '34762', '2900', '11393', '42154', '94306', '70552', '75265', '921', '26003', '64352', '89857', '83171', '58249', '48940', '53512', '66335', '44865', '68729', '19299', '58003', '39854', '99122', '3860', '80173', '52242', '90966', '53183', '71982', '82325', '87842', '15000', '55627', '71132', '6354', '42402', '91719', '91644', '94533', '74925', '66278', '66911', '85576', '40495', '70919', '71797', '87835', '29845', '71832', '3390', '7994', '33499', '70715', '54897', '82710', '63077', '78105', '24758', '89585', '84607', '46477', '78618', '10989', '39222', '98749', '51685', '94664', '31008', '32823', '89521', '72160', '26952', '4001', '21421', '5737', '74027', '88179', '45553', '83743', '19913', '49435', '65616', '82641', '5149', '76959', '40681', '73023', '2670', '30845', '18863', '35094', '88400', '80963', '9154', '16571', '64192', '59694', '41317', '59942', '58856', '99281', '67260', '66971', '22716', '76089', '58047', '67071', '53707', '462', '52518', '72277', '10681', '69', '98855', '12593', '88842', '67242', '73543', '37439', '18413', '67211', '93495', '45576', '70614', '27988', '53210', '18618', '21318', '68059', '25518', '55917', '56522', '16548', '2404', '93538', '61452', '66358', '3709', '23914', '92426', '81439', '38070', '28988', '29939', '2948', '85720', '45628', '51101', '89431', '86365', '17571', '50987', '83849', '11015', '83812', '66187', '26362', '66786', '22024', '93866', '36161', '90080', '64874', '37294', '83860', '73821', '80279', '36766', '73117', '44620', '84556', '42070', '90383', '27862', '20665', '67576', '34997', '57958', '80638', '84351', '63961', '1362', '14338', '80377', '24192', '41294', '57368', '51189', '27287', '45764', '86289', '65600', '708', '84090', '96005', '55676', '84855', '72385', '70018', '9336', '82701', '3710', '52083', '74045', '96454', '30956', '67369', '78941', '81810', '71906', '23194', '33042', '50794', '61256', '24449', '48639', '22916', '78303', '13666', '40762', '43942', '51075', '89783', '95786', '90462', '6181', '36482', '40675', '4970', '6388', '91849', '72579', '94983', '86084', '20140', '68427', '48123', '43122', '98066', '37560', '6927', '72803', '5546', '62259', '98439', '6457', '98568', '70499', '33022', '28226', '29675', '20917', '75365', '20900', '8190', '56736', '99153', '77779', '49333', '50293', '97650', '4067', '47278', '42761', '71875', '13966', '11223', '46783', '18059', '61355', '29638', '75681', '24466', '89634', '20759', '83252', '37780', '15931', '74893', '6703', '64524', '80656', '85990', '78427', '18411', '20696', '86432', '93176', '69889', '15072', '15180', '9935', '10467', '60248', '42430', '62590', '89596', '27743', '26398', '79912', '60048', '50943', '38870', '69383', '72261', '98059', '55242', '74905', '5667', '54321', '70415', '39903', '49711', '85318', '79979', '59262', '82321', '15263', '17416', '74554', '94733', '72112', '49872', '54849', '73883', '78250', '74935', '68559', '57564', '50541', '45730', '41595', '5588', '83723', '42891', '11898', '14348', '99732', '14481', '85233', '21277', '94508', '52551', '74187', '7634', '42912', '25100', '43536', '35798', '48190', '86477', '22680', '48148', '59501', '56563', '16802', '81496', '97568', '68657', '51462', '67953', '99660', '39002', '54170', '57190', '68086', '52700', '6487', '55709', '70418', '62629', '70420', '35695', '36152', '45360', '53503', '46623', '76000', '50648', '97876', '44815', '29163', '1356', '64123', '71388', '17658', '99084', '58727', '59437', '38773', '71254', '81286', '97545', '18786', '56834', '20346', '36401', '62316', '58082', '67959', '99876', '69895', '80099', '62747', '20517', '99777', '6472', '49189', '31321', '39992', '68073', '13378', '51806', '21776', '52060', '96983', '25754', '93709', '96627', '8644', '93726', '14002', '37716', '87620', '34507', '76339', '24491', '5849', '44110', '522', '66521', '12776', '44887', '80535', '14548', '75248', '671', '73071', '35715', '59474', '7061', '82243', '56170', '20179', '59717', '1725', '24634', '11270', '77023', '63840', '46608', '44667', '22422', '59771', '94768', '73033', '82905', '16463', '40971', '22204', '58366', '28721', '14907', '76468', '81872', '38418', '36989', '61439', '10610', '131', '44296', '35453', '10117', '75856', '94603', '99602', '68075', '35949', '13599', '50030', '69633', '55956', '85465', '16429', '86081', '11145', '6195', '82207', '90598', '92814', '23725', '83204', '80346', '71542', '46634', '15820', '54123', '45397', '15322', '61743', '9273', '71347', '6835', '64006', '91718', '43677', '32923', '21486', '17098', '61694', '43347', '40019', '4071', '52443', '42386', '56839', '83514', '27633', '40780', '51749', '92101', '62384', '92206', '56044', '66174', '11137', '73966', '78471', '30468', '31643', '33197', '6888', '8066', '86603', '74383', '6098', '54411', '98819', '89862', '88639', '94422', '89371', '80526', '91747', '91220', '64944', '76658', '42046', '58518', '27249', '6646', '3028', '1346', '33763', '9734', '31737', '65527', '5892', '60813', '3410', '35464', '43009', '98382', '70580', '93898', '56404', '32995', '62771', '71556', '40538', '55612', '45656', '10758', '20268', '33603', '38310', '14242', '74397', '10722', '71575', '22590', '49043', '91439', '9055', '23668', '9101', '5268', '64133', '77501', '64684', '11337', '47575', '50732', '88680', '93730', '46785', '17589', '3520', '57595', '71241', '34994', '8753', '36147', '88844', '41914', '11250', '94632', '71927', '4624', '86279', '7664', '2659', '94853', '65386', '30438', '86005', '92883', '84629', '59910', '44484', '1306', '8404', '56962', '29990', '38445', '96191', '73013', '66590', '40951', '24712', '18825', '37268', '87843', '18972', '12154', '7779', '52149', '76152', '65799', '86011', '35475', '78083', '88232', '91551', '65532', '93516', '73827', '24227', '44687', '55759', '83819', '45088', '10856', '60488', '39051', '14103', '76650', '81181', '46731', '737', '58788', '78945', '42096', '66731', '66740', '72273', '88969', '5655', '86590', '41096', '80038', '32430', '51877', '23970', '91900', '13082', '45880', '94367', '19739', '61998', '71665', '16083', '57035', '26916', '10166', '18834', '46798', '66881', '28444', '68840', '10459', '81087', '4728', '76224', '39257', '23470', '93524', '37345', '30074', '49856', '22022', '55279', '5159', '5193', '58030', '57539', '12514', '49759', '96222', '52597', '67192', '88187', '53614', '16084', '79915', '28212', '79334', '85283', '32306', '31058', '43113', '74707', '74869', '2213', '32134', '6379', '85426', '87098', '35984', '51105', '69287', '16803', '83337', '14913', '62531', '58098', '7914', '20105', '28850', '1384', '43173', '62983', '87113', '76066', '86320', '77684', '45191', '95225', '41503', '36713', '48404', '91228', '53865', '98981', '59161', '61237', '84561', '17455', '14379', '57789', '80895', '99260', '84595', '72942', '53220', '84448', '81332', '49437', '83086', '93414', '54519', '52288', '74772', '22460', '49324', '11168', '96071', '61985', '38284', '6405', '54698', '71727', '60093', '37340', '87884', '83403', '4542', '94949', '19636', '15855', '39105', '10424', '67418', '91022', '69254', '8481', '38411', '3832', '44354', '93548', '57172', '28481', '372', '81497', '52179', '41060', '72141', '41396', '65590', '70432', '82819', '93814', '26118', '84780', '88485', '70821', '8222', '83000', '47067', '38516', '33347', '47681', '48202', '60749', '52112', '7937', '28105', '11394', '45746', '43252', '34494', '2979', '69715', '42486', '82315', '71760', '97413', '66137', '94487', '7429', '74434', '22964', '55251', '3448', '53534', '2574', '9693', '96157', '2955', '4348', '19566', '56930', '83319', '31310', '53905', '1148', '41726', '22233', '76045', '37351', '10545', '17581', '28047', '30199', '4741', '58111', '33497', '67796', '67730', '31247', '43772', '29461', '45970', '73353', '22534', '53962', '32147', '71392', '62579', '66345', '58246', '33442', '9581', '29705', '14058', '86471', '76125', '59363', '94982', '74810', '89149', '20066', '3366', '3568', '25752', '80036', '64119', '27270', '40061', '91052', '69022', '9852', '77112', '83075', '43924', '61661', '56133', '96652', '57944', '72576', '82170', '79236', '55745', '15309', '88878', '72761', '37647', '67465', '12777', '97309', '93202', '41470', '8787', '64920', '48514', '18917', '35157', '59151', '4640', '5317', '38134', '76548', '82788', '9214', '58418', '73185', '90554', '10543', '47182', '62936', '91765', '89751', '68931', '48865', '64607', '7150', '77862', '14297', '14828', '33013', '91698', '67593', '98096', '16595', '51639', '86531', '24719', '1703', '78788', '43810', '38918', '95491', '99903', '82671', '8291', '68288', '31224', '39863', '4265', '77798', '7698', '33804', '92286', '4744', '37038', '44203', '98212', '17369', '77442', '62879', '4145', '96881', '15646', '36824', '19959', '45451', '76049', '54272', '97577', '95298', '81115', '30204', '82041', '8037', '10052', '8756', '76833', '82851', '24276', '75574', '36037', '78079', '92807', '29064', '90000', '84150', '17102', '75092', '49424', '35597', '4693', '82853', '42511', '16119', '23478', '65240', '55585', '91762', '71671', '46682', '72479', '97696', '24615', '12579', '30274', '48255', '2336', '90202', '5808', '45426', '76308', '74639', '31245', '99894', '89638', '6233', '33893', '71899', '85273', '89429', '29761', '50231', '57249', '99347', '22642', '66972', '86221', '47514', '88274', '10819', '73150', '53754', '13304', '20478', '38099', '619', '14669', '8011', '97657', '26569', '65430', '13467', '38180', '23675', '72350', '42257', '39875', '23529', '53407', '11833',
     '29599', '95621', '7727', '59527', '86846', '22860', '5358', '3730', '87555', '362', '95755', '54565', '29935', '68950', '52349', '98344', '86576', '7420', '12236', '15844', '48099', '97535', '97081', '50261', '31187', '60496', '24123', '24042', '6376', '6679', '99806', '20306', '60676', '36881', '77309', '5247', '96569', '53417', '73252', '64179', '35318', '75732', '65119', '32621', '40464', '22887', '96152', '65161', '83381', '8915', '68142', '7328', '85031', '15688', '72519', '93992', '86927', '75538', '38205', '50877', '70039', '97538', '94822', '52131', '49643', '85206', '1347', '14574', '88736', '53442', '49991', '64925', '72283', '82213', '60905', '36118', '62963', '16983', '79185', '15111', '26059', '17792', '98218', '33214', '1094', '41754', '77275', '65173', '13190', '91004', '90422', '44387', '92672', '98641', '54609', '83295', '37395', '70104', '32986', '72524', '82478', '5837', '83916', '52736', '57112', '55985', '42642', '42136', '89642', '35712', '49489', '19726', '65824', '24384', '48112', '15366', '99206', '68384', '51389', '529', '21475', '75749', '95182', '60110', '70571', '74174', '38105', '78107', '4101', '8982', '11215', '23987', '3303', '28706', '54629', '98000', '67510', '30036', '99140', '48896', '40971', '7735', '79984', '50134', '94928', '57023', '52880', '83067', '41940', '62994', '89213', '38593', '19283', '68206', '22234', '19245', '26266', '32403', '65889', '17022', '64280', '42797', '27161', '57675', '42313', '93606', '93082', '20659', '90824', '1226', '66266', '12503', '57104', '15247', '51160', '92398', '71967', '59476', '44465', '35765', '10787', '47737', '45792', '2292', '47599', '89612', '8162', '87622', '69410', '45727', '31158', '99791', '89544', '27214', '99588', '40516', '75616', '36505', '46079', '95448', '97999', '47462', '47799', '82729', '34038', '60789', '96938', '22682', '79062', '93307', '36038', '49016', '90983', '48219', '50889', '32517', '72219', '71229', '82643', '1195', '70543', '17', '22178', '23544', '72371', '1163', '28527', '7336', '39846', '31956', '80963', '41804', '59791', '41831', '1940', '52377', '79494', '12531', '81112', '44320', '18746', '5774', '63869', '4085', '59922', '12751', '99443', '13530', '23872', '36026', '83360', '32711', '92980', '11140', '99323', '57263', '98149', '29265', '25548', '65995', '4818', '15593', '8535', '37863', '12217', '14474', '66584', '89272', '86690', '58777', '39666', '44756', '18442', '52586', '98030', '40850', '38708', '49304', '68923', '65008', '84388', '83639', '29866', '63675', '26793', '49227', '82099', '24090', '57535', '24201', '65776', '74054', '89833', '62979', '26613', '5851', '99766', '63484', '66605', '37179', '90760', '59336', '58390', '93239', '84578', '11396', '93994', '73818', '23972', '37720', '72369', '25063', '32952', '71036', '76612', '31285', '34090', '19136', '53783', '66436', '61478', '96749', '43658', '7399', '31574', '67073', '40480', '20727', '70993', '65549', '30800', '21507', '53785', '89574', '86381', '56492', '62603', '44856', '68687', '63794', '70996', '7475', '84238', '71939', '86886', '94792', '15036', '36936', '95722', '17771', '67850', '33371', '49314', '40744', '5432', '81057', '41201', '75986', '22961', '15323', '1570', '18657', '95219', '19130', '53127', '15867', '81135', '73206', '76668', '36386', '48828', '31417', '56916', '70891', '60534', '95777', '10022', '94053', '2928', '56326', '16559', '79656', '6414', '81247', '78270', '55687', '19151', '61597', '99857', '81142', '27725', '53493', '12185', '1455', '48501', '59425', '20591', '24900', '66079', '84889', '32024', '18919', '2043', '7076', '71201', '88258', '86521', '93348', '26395', '39646', '44145', '33911', '46231', '67054', '39979', '11630', '23020', '76278', '88056', '11480', '4723', '78612', '70211', '60622', '84687', '59092', '65675', '38479', '64399', '64699', '95964', '42764', '69060', '28189', '4193', '95805', '75462', '17245', '59640', '94773', '84292', '53092', '98507', '61353', '32483', '53027', '48912', '87221', '47788', '59263', '65196', '35567', '17494', '64253', '50223', '7057', '87467', '62414', '2523', '50910', '72353', '78986', '78104', '47719', '29108', '12957', '5114', '64435', '66707', '37449', '70399', '45334', '71606', '55338', '55072', '58765', '12151', '22012', '16954', '87366', '14240', '98041', '72296', '47408', '56879', '99584', '63172', '92316', '28071', '29880', '19608', '13839', '87484', '56541', '88662', '87098', '72124', '78282', '27653', '38993', '31870', '67239', '99445', '7376', '78487', '98880', '12180', '86773', '67773', '15416', '58172', '13075', '67559', '97510', '29705', '86985', '57024', '11827', '31236', '91920', '26116', '94614', '14486', '46252', '78847', '43786', '70048', '96739', '35240', '39933', '58209', '27852', '65669', '47323', '58150', '84444', '44344', '95882', '41258', '31314', '69060', '19916', '6979', '19436', '45572', '16259', '74566', '6306', '24705', '53422', '593', '97031', '22308', '26875', '23042', '78035', '34229', '61976', '23175', '50072', '90896', '50810', '71730', '86468', '94807', '8218', '36032', '58628', '60560', '51206', '37943', '27987', '15014', '49905', '70018', '66799', '80851', '23594', '29982', '6438', '97381', '47715', '96294', '17985', '48545', '12672', '5250', '9988', '24601', '3736', '97815', '54363', '64703', '44167', '68376', '16595', '38073', '29630', '59630', '1858', '71823', '75580', '70083', '14493', '93821', '93394', '85369', '3818', '8435', '59988', '43966', '13961', '15855', '83332', '80312', '27299', '88840', '76964', '56173', '62794', '79389', '82642', '85843', '47116', '43064', '16061', '28905', '54415', '72832', '91252', '93488', '79457', '99336', '70744', '80432', '6487', '880', '87701', '154', '86574', '86677', '17892', '81488', '95260', '12515', '43189', '9211', '55403', '41417', '60046', '54785', '83655', '28274', '65745', '63062', '44549', '36391', '48051', '7328', '3572', '33226', '49177', '25123', '59065', '19691', '15109', '10172', '95578', '29497', '48152', '20276', '36270', '78866', '48309', '53209', '55475', '30073', '19717', '16004', '45692', '83430', '9291', '45935', '57030', '92613', '91656', '67697', '34915', '28156', '56594', '3273', '11194', '98270', '34370', '2621', '66679', '97451', '97717', '87923', '48310', '37725', '69743', '75103', '84956', '75163', '16069', '65304', '19397', '18071', '27273', '49823', '57595', '98324', '82174', '10293', '80943', '64184', '19472', '4198', '9410', '25927', '65961', '33155', '95168', '33692', '61712', '69877', '13308', '17415', '10022', '2491', '67310', '96140', '68050', '76272', '17143', '76805', '57176', '7539', '22690', '95483', '87592', '27221', '90821', '51154', '99828', '68998', '54581', '74222', '10269', '65057', '45467', '96089', '55058', '89779', '60837', '74122', '52886', '58055', '14880', '93208', '66652', '68830', '24121', '62407', '87257', '18802', '14925', '45423', '98624', '55195', '59072', '41414', '77840', '66075', '62705', '26549', '19063', '57552', '2507', '52069', '57620', '66688', '14833', '33700', '90666', '98052', '5367', '2268', '43093', '69063', '22030', '85564', '92258', '1847', '24446', '65835', '38660', '91899', '87732', '52396', '31952', '36000', '86944', '16109', '80729', '53757', '60226', '59103', '84187', '36674', '72823', '29884', '4654', '69139', '20440', '57413', '3651', '39639', '44564', '57492', '84159', '751', '99748', '9659', '72661', '39220', '99742', '74734', '75729', '38071', '69934', '73640', '65294', '54524', '64372', '37927', '17187', '7863', '12732', '40296', '36197', '15821', '76831', '4400', '71933', '4040', '22072', '33064', '25702', '13324', '91275', '27388', '97729', '14620', '45989', '80737', '17934', '4219', '3032', '43457', '31051', '24469', '67041', '29328', '75499', '80951', '88212', '92595', '49969', '24612', '58732', '2718', '3805', '50918', '99426', '8614', '35580', '93273', '989', '24385', '41185', '25687', '47146', '25227', '95839', '56355', '98536', '79824', '31725', '46447', '26690', '68418', '47783', '33725', '21729', '70797', '59038', '60376', '25087', '68332', '67950', '12411', '95918', '64736', '65336', '74947', '64605', '4106', '42712', '96640', '28492', '28648', '42429', '821', '24333', '69677', '38959', '23484', '92005', '29352', '29159', '52873', '99947', '21834', '85347', '93479', '28298', '55608', '3226', '69714', '80283', '6577', '18849', '44605', '75286', '28139', '26541', '12867', '57500', '86617', '33005', '57498', '60223', '74954', '51401', '55246', '5648', '16513', '40930', '43821', '32090', '66002', '65530', '76083', '6047', '6879', '94987', '80787', '11688', '77161', '92670', '6696', '400', '28572', '47234', '51375', '88518', '762', '92617', '54260', '7560', '60180', '43331', '64059', '27616', '75839', '21392', '47756', '46254', '19486', '88533', '30130', '93694', '8557', '66534', '94447', '16910', '6480', '77440', '24366', '6195', '48946', '28597', '44429', '50300', '73556', '40638', '98709', '94413', '15987', '43860', '64871', '93953', '34506', '7296', '31753', '30626', '77510', '39829', '25696', '39776', '69185', '36540', '65413', '31528', '43446', '73532', '49776', '30282', '30004', '26725', '15200', '33958', '90320', '71836', '48051', '31970', '5326', '96194', '69695', '60898', '60945', '18271', '50868', '61468', '23593', '68985', '20628', '58044', '8942', '34849', '7384', '50500', '62895', '78780', '48946', '65278', '4067', '973', '34761', '15512', '73739', '23138', '47322', '55568', '32259', '71816', '49277', '75218', '76104', '19579', '68312', '67904', '33886', '53888', '26421', '43859', '40291', '39068', '31711', '36542', '10195', '39781', '72352', '13188', '34113', '9428', '60443', '4987', '13783', '80744', '63483', '18266', '11961', '87167', '46987', '28480', '74214', '39191', '8146', '38090', '75727', '79245', '47720', '52547', '45321', '4972', '49701', '74354', '69672', '63455', '41902', '5667', '54166', '4962', '25873', '44509', '73332', '73383', '29438', '21455', '12320', '11997', '16921', '49379', '63027', '86175', '8110', '76149', '2520', '11256', '25863', '50518', '69001',
     '79113', '9447', '91840', '5242', '10998', '46496', '2448', '56058', '20970', '10517', '17783', '25723', '97137', '62840', '1264', '78691', '81020', '55335', '48524', '2088', '90413', '76651', '26855', '16177', '14954', '62914', '21344', '5708', '75560', '39311', '95865', '28783', '64902', '95657', '46276', '33426', '4799', '11588', '57513', '73689', '77677', '63011', '97795', '34954', '76866', '32043', '32697', '26643', '36890', '53476', '3011', '13963', '49551', '87671', '67761', '17488', '94770', '50599', '33272', '23091', '38079', '41177', '22395', '91656', '79679', '38687', '57384', '80118', '42507', '4098', '78949', '45669', '48802', '83915', '78292', '4369', '57657', '49146', '45192', '98491', '72457', '46331', '207', '81601', '7409', '70856', '91605', '70295', '9171', '72293', '32997', '78025', '16795', '73534', '68780', '21284', '31767', '94381', '86439', '12420', '53285', '99563', '60502', '67954', '55012', '99809', '5431', '69978', '99712', '14401', '79498', '4495', '3045', '528', '72542', '91604', '72725', '39378', '80378', '41996', '20138', '54545', '59730', '36951', '45157', '37964', '97690', '12184', '4944', '53803', '93605', '60851', '68938', '46285', '89663', '90309', '6907', '87239', '81791', '83292', '90013', '68927', '14725', '81840', '63836', '52068', '43830', '4794', '931', '59255', '8263', '99057', '94401', '69033', '7437', '20364', '92884', '28193', '43932', '37629', '59426', '18891', '8583', '79551', '87242', '1483', '6725', '65786', '16844', '12650', '99305', '42841', '9811', '18800', '39313', '51373', '31874', '84558', '27831', '48614', '48975', '55509', '83363', '31854', '64001', '94028', '76125', '79314', '24893', '81132', '9441', '86015', '28356', '40358', '10160', '23328', '7330', '76538', '37611', '89351', '84132', '97047', '26109', '95222', '35130', '75600', '88602', '15073', '87835', '71649', '28948', '81615', '37498', '28674', '59776', '44095', '65924', '64368', '94536', '12518', '61711', '55619', '82949', '4114', '21540', '70544', '28022', '79983', '28781', '7749', '97873', '4951', '50076', '47611', '99522', '56820', '38653', '49047', '36283', '83908', '72452', '85625', '10811', '36998', '44083', '34864', '44975', '39057', '4551', '68450', '24781', '1503', '9871', '46885', '11424', '21259', '54900', '97669', '85669', '6015', '2521', '37661', '14915', '57423', '91903', '94789', '32059', '64972', '4600', '61465', '27118', '79785', '13547', '49766', '38410', '68860', '63756', '23621', '64387', '46255', '63408', '11297', '41081', '56326', '58349', '98703', '72268', '73574', '32098', '42534', '91502', '38083', '11241', '56828', '12098', '25377', '37054', '56328', '30034', '26922', '68401', '93478', '63275', '62650', '81407', '773', '79499', '14970', '47217', '1187', '57428', '69980', '77764', '74791', '22107', '54363', '39247', '56028', '56982', '84244', '21464', '18716', '25533', '94589', '94768', '21537', '18436', '81135', '27654', '79713', '56630', '61571', '58453', '26758', '68450', '68449', '2994', '15347', '83954', '71823', '6428', '44210', '79597', '95144', '32871', '1991', '320', '77157', '63607', '31154', '48846', '71125', '61750', '59608', '33038', '35733', '68915', '94127', '50383', '64242', '49708', '57270', '65019', '8581', '12111', '18487', '50013', '58664', '22214', '19033', '33681', '44754', '28830', '10381', '52318', '34959', '20682', '55453', '53800', '65774', '99164', '72102', '36986', '44157', '56716', '7974', '81475', '25926', '39402', '33688', '99671', '95312', '42268', '26536', '14482', '67377', '57993', '89147', '15834', '64995', '4700', '18714', '30221', '39095', '32749', '69257', '55204', '30497', '31839', '63045', '30009', '62683', '31232', '77680', '93551', '63589', '6989', '77246', '42169', '46117', '73226', '37427', '1858', '83649', '37410', '86369', '4641', '74481', '66168', '48041', '22597', '14670', '27464', '57165', '20939', '36282', '76940', '73358', '50521', '69603', '8895', '81793', '57743', '81903', '64025', '91641', '25276', '34040', '62642', '64015', '57657', '84890', '73832', '782', '60160', '16998', '40023', '24590', '88613', '76640', '53091', '67600', '80183', '45674', '64464', '25163', '42384', '66972', '13953', '41966', '66048', '15135', '73745', '19466', '53657', '34619', '13462', '15905', '48257', '73297', '238', '93525', '80556', '5942', '5411', '66169', '9090', '95130', '74316', '57321', '48083', '62355', '68113', '15239', '36644', '80326', '65817', '54428', '61955', '58849', '77206', '16073', '98261', '92091', '39178', '35464', '85109', '85452', '21128', '25665', '81860', '44664', '24024', '56960', '95124', '39786', '18836', '11121', '44163', '81074', '79064', '46219', '94694', '44233', '81469', '24642', '15030', '21995', '13587', '40755', '6669', '81093', '74305', '1881', '55649', '37273', '80827', '98643', '46694', '59281', '79231', '42813', '84984', '7052', '98113', '17296', '84434', '31205', '46894', '71219', '74530', '44686', '70744', '91388', '20692', '96853', '73803', '15836', '18126', '49686', '4179', '47588', '87892', '65425', '68012', '97468', '92510', '99271', '58694', '11918', '37051', '18644', '57228', '14265', '57572', '57022', '52186', '30193', '93570', '87872', '5257', '26784', '6476', '61746', '68559', '1720', '26202', '16519', '27688', '10645', '87174', '60845', '73385', '82075', '6933', '98828', '56895', '17344', '84253', '36561', '51648', '24939', '63470', '31034', '95052', '51090', '51465', '87979', '68650', '30181', '29598', '19137', '43221', '81353', '90170', '96985', '61115', '17385', '92314', '80650', '55821', '17874', '84333', '93272', '48260', '87272', '22764', '59957', '51870', '85988', '39222', '77241', '62535', '28344', '6011', '80831', '64551', '46299', '75195', '71177', '8660', '58943', '57003', '3306', '74413', '74068', '15073', '89016', '93140', '13911', '57170', '19880', '41870', '9131', '57495', '73032', '86979', '60094', '87026', '30880', '4736', '86301', '92707', '21689', '83565', '71275', '47665', '65687', '71184', '89897', '32490', '97577', '38723', '79113', '37531', '97500', '94450', '15699', '58019', '84423', '27057', '56017', '97148', '47365', '30669', '33818', '80406', '99690', '33012', '95178', '46809', '48448', '79350', '9146', '99701', '98976', '71197', '44161', '75069', '36602', '79650', '97301', '12020', '56658', '25701', '46392', '78609', '63073', '69419', '57736', '20102', '42415', '79044', '20277', '56280', '47903', '94311', '25558', '40336', '91305', '90505', '66769', '64562', '83737', '62892', '10375', '71024', '19988', '56946', '76110', '21847', '43162', '50578', '46086', '54167', '61722', '53463', '63134', '69288', '12838', '14116', '71687', '50846', '59810', '24826', '84138', '82885', '91496', '98600', '82769', '40049', '4125', '50694', '1294', '2805', '29691', '82321', '76462', '85945', '115', '29188', '66918', '71340', '31585', '61638', '95472', '52978', '50622', '81990', '60955', '70519', '22270', '35610', '95871', '89222', '41038', '52546', '1163', '67943', '1793', '92010', '35755', '74509', '66665', '95759', '8568', '44299', '67822', '5806', '85839', '13895', '87675', '31357', '88014', '40026', '53050', '28951', '31992', '42495', '82892', '51567', '2869', '45808', '20238', '20781', '56098', '66307', '95701', '614', '60833', '3091', '81339', '24195', '65639', '85976', '28116', '66224', '51502', '73637', '13207', '88302', '36488', '65518', '98187', '26', '74367', '64706', '53943', '86760', '25783', '82112', '34958', '86621', '20848', '63459', '14049', '84943', '91873', '50238', '77773', '64109', '8602', '87934', '47583', '66053', '30287', '5507', '80312', '37464', '57457', '86200', '17806', '16522', '38843', '94334', '59958', '63864', '53427', '74506', '33980', '90449', '30842', '53616', '36738', '52', '13595', '53051', '13174', '60163', '71420', '73835', '67119', '79018', '42782', '45059', '952', '46360', '85879', '71552', '84741', '29746', '32577', '10041', '7208', '97528', '51256', '916', '55973', '17684', '99046', '38782', '58660', '97798', '66032', '48339', '51329', '12532', '97904', '95454', '42737', '62541', '96702', '82953', '94610', '26645', '86813', '25480', '99713', '26078', '23028', '93056', '21445', '73209', '89318', '69987', '34705', '30064', '17094', '51135', '54141', '26625', '1086', '13082', '30843', '98672', '56864', '42605', '5833', '60850', '69366', '27351', '16456', '92609', '48030', '54322', '69891', '46502', '34578', '77918', '63276', '75958', '42519', '60266', '85576', '4855', '14258', '67017', '10545', '35078', '53012', '71922', '85784', '73402', '74363', '58457', '94102', '23510', '51559', '39482', '87057', '9377', '10106', '82985', '33931', '16523', '6484', '97749', '83172', '53753', '27466', '23073', '96083', '67302', '57465', '21877', '18013', '99804', '32873', '43123', '72365', '53197', '80578', '69770', '97471', '86954', '67183', '98497', '78474', '28450', '63183', '98699', '42738', '61433', '3491', '27304', '49311', '94980', '92740', '43272', '86549', '11406', '79636', '85582', '38086', '657', '2354', '26567', '77450', '42086', '21600', '49011', '44059', '47872', '75761', '96577', '11642', '83471', '79616', '23749', '77082', '96876', '65302', '84027', '48955', '59887', '20657', '75090', '9058', '50347', '66088', '70745', '76342', '58026', '95568', '61504', '93473', '84590', '47089', '74717', '93090', '46334', '68273', '59500', '54345', '72608', '54048', '86156', '40296', '74046', '6813', '36369', '74543', '18305', '85236', '31316', '37061', '96893', '23112', '5529', '10166', '19037', '1467', '70810', '30932', '18410', '92837', '81324', '12268', '54705', '25207', '90366', '56528', '3392', '88747', '39951', '97957', '99404', '23685', '13533', '15640', '11434', '66516', '71025', '65770', '88000', '52232', '32360', '10787', '37438', '2264', '94460', '80214', '42288', '59062', '29010', '64093', '21225', '22297', '36935', '19202', '5925', '85373', '27414', '28991', '9191', '42273', '56587', '89719', '77191', '64334', '61542', '28763', '28978', '79184', '59815', '95200', '30246', '54022', '287', '91808', '66347', '50833', '15356', '78614',
     '65087', '9664', '67555', '58222', '20787', '72382', '83712', '15858', '72040', '59451', '7428', '47586', '83509', '45969', '28759', '94033', '88618', '46', '1753', '28290', '71934', '99070', '52517', '65865', '15904', '68134', '87595', '39779', '99174', '13366', '50847', '69037', '77911', '19709', '84404', '24370', '18920', '1746', '28059', '4653', '6892', '25496', '48810', '82943', '7069', '44018', '1617', '56497', '27582', '29576', '47883', '8385', '54975', '96245', '77257', '31194', '34512', '19198', '50926', '50886', '91577', '49260', '49604', '58464', '18198', '90887', '15379', '74883', '36644', '63967', '34545', '20539', '12884', '6010', '98636', '94832', '47702', '98318', '6078', '42517', '97030', '93707', '39286', '10245', '66230', '99574', '74563', '81937', '22153', '10659', '67579', '85147', '69686', '32017', '8199', '20027', '64266', '60707', '55426', '22027', '13823', '81404', '86757', '3754', '197', '45469', '68736', '17656', '92453', '6784', '35531', '33538', '27558', '35825', '13471', '16377', '66978', '44601', '69943', '84635', '7335', '67725', '88064', '78201', '64380', '66771', '62221', '60427', '32028', '37857', '5491', '2757', '10537', '2199', '60244', '14726', '29734', '34433', '81241', '39778', '65831', '56153', '81696', '25113', '17371', '79022', '3587', '60439', '96582', '37801', '82496', '68242', '19561', '53140', '17171', '13165', '58750', '80612', '19818', '16753', '70009', '75290', '48846', '89851', '25190', '35525', '84348', '65298', '23161', '60583', '89611', '18798', '85422', '60713', '17660', '41915', '65757', '4781', '48374', '10712', '40330', '2409', '41020', '28042', '51857', '81224', '93917', '90366', '58848', '8012', '92070', '75349', '80066', '83228', '55170', '78376', '94127', '29418', '58660', '74006', '63909', '59502', '63255', '32318', '28904', '26117', '88103', '50656', '58517', '16372', '43392', '77876', '65997', '63501', '45927', '17444', '84021', '54886', '57082', '47456', '73816', '66900', '82958', '49722', '95843', '23458', '4560', '67276', '59080', '81486', '2967', '26133', '87694', '74183', '22100', '45306', '33895', '26512', '71426', '54994', '47367', '10171', '45681', '36268', '3166', '2179', '64197', '90037', '4641', '96073', '72989', '55123', '48825', '2862', '66974', '30115', '41554', '26727', '54025', '69504', '38284', '7816', '36370', '75764', '69774', '43208', '43598', '39461', '21655', '12169', '77790', '44578', '70959', '13500', '40823', '52952', '88095', '82193', '66424', '79814', '25651', '58125', '42724', '11752', '64533', '34827', '72755', '96727', '82066', '60268', '55535', '4230', '73018', '69602', '16912', '66088', '21859', '38654', '38638', '51444', '37999', '18595', '15209', '21801', '21130', '53741', '54954', '91590', '83660', '74071', '82627', '4311', '45268', '94735', '65747', '72428', '22621', '70828', '64394', '647', '23570', '17677', '84377', '63993', '10268', '47426', '72750', '83772', '29090', '73284', '36683', '91143', '64546', '99836', '21999', '61793', '41557', '16714', '20586', '14251', '56633', '46146', '84730', '5445', '8367', '52621', '79252', '89737', '18431', '32134', '86975', '58939', '63385', '8504', '25998', '79549', '70558', '4870', '57604', '48374', '32388', '97871', '75590', '10919', '43825', '82858', '25807', '50366', '2841', '2716', '51315', '79719', '33159', '63382', '11327', '65184', '87243', '17850', '40149', '12171', '48486', '26380', '85432', '35427', '59256', '57601', '29529', '20553', '3006', '69997', '87919', '47626', '96026', '37445', '51735', '89296', '26702', '22837', '61279', '85193', '30624', '10676', '83075', '21477', '54708', '47485', '80297', '86204', '25192', '55197', '81177', '70551', '11003', '7001', '55017', '487', '40926', '99463', '79514', '69697', '52854', '88640', '44464', '66314', '48240', '49787', '81333', '14914', '12919', '51037', '88609', '25572', '61019', '85184', '12051', '61246', '52108', '98895', '24549', '86944', '73303', '9012', '25151', '97424', '43531', '44790', '63034', '86713', '76483', '17499', '86891', '3267', '45091', '39126', '94419', '35750', '35239', '49413', '62381', '92010', '7246', '26997', '47446', '26930', '22668', '43961', '51741', '63058', '41977', '62933', '9197', '94303', '29044', '53755', '22391', '85373', '66572', '74650', '7824', '49712', '40021', '99958', '60404', '37370', '89264', '52343', '90901', '44730', '4252', '5811', '22283', '25102', '86636', '75509', '47088', '62971', '85519', '7495', '16798', '25708', '59258', '89361', '43455', '86768', '29961', '4362', '60956', '81059', '87604', '46241', '98362', '21030', '76182', '83545', '59150', '99333', '68271', '32629', '3364', '96467', '40427', '307', '84267', '239', '11711', '40933', '24518', '33854', '60291', '94179', '5564', '33196', '73818', '22201', '97078', '69360', '94513', '42623', '6510', '67378', '79468', '10394', '96430', '87701', '2667', '64162', '93266', '48941', '55345', '56127', '22704', '8793', '57008', '36920', '80845', '81203', '98715', '84158', '49194', '72718', '52919', '4951', '8715', '82384', '8570', '26733', '62399', '27297', '79038', '57916', '46155', '82381', '1027', '20541', '40580', '44836', '17336', '55548', '87454', '63549', '61401', '88819', '23326', '37546', '49089', '50707', '23099', '20724', '67184', '3394', '95941', '76045', '20523', '30393', '14157', '69381', '94104', '15406', '46707', '36234', '9136', '96805', '4904', '20310', '77164', '15400', '87198', '48310', '59729', '35230', '61503', '42015', '86910', '23264', '23542', '49105', '58334', '52855', '78865', '73516', '43820', '96593', '33168', '26170', '88241', '4016', '79862', '39617', '95329', '57881', '71750', '89690', '22519', '59367', '19825', '12638', '36100', '14355', '79540', '8411', '94571', '80462', '11953', '55629', '14598', '81066', '48968', '74149', '36938', '4564', '59157', '75517', '14309', '64905', '59893', '62803', '6968', '33003', '40894', '48816', '77710', '16692', '19135', '98381', '49397', '24048', '17804', '26829', '24046', '44546', '28174', '2639', '27957', '38625', '85902', '9908', '77666', '14096', '89851', '23600', '20717', '32860', '44070', '67853', '85907', '23761', '789', '73370', '15649', '26472', '9174', '20081', '49415', '97463', '14565', '19834', '94738', '68045', '67542', '3552', '77093', '99071', '16832', '95177', '49571', '85821', '9368', '85170', '58449', '89633', '99302', '94158', '50274', '50223', '51128', '52847', '53598', '47826', '2883', '28192', '84324', '9530', '14385', '37292', '74795', '16821', '5010', '77101', '96596', '72384', '41399', '83046', '37927', '48213', '84574', '55438', '79315', '71005', '45190', '56133', '14016', '92180', '28365', '34307', '90665', '74758', '45080', '38017', '80599', '91174', '47907', '19299', '9707', '92260', '36784', '55855', '25939', '74472', '47402', '12352', '75591', '31459', '76711', '57940', '95535', '55231', '80645', '84613', '90280', '3500', '83695', '42992', '77226', '25326', '8093', '49838', '6457', '44814', '82819', '94986', '81818', '65186', '21378', '49711', '66248', '72391', '65826', '21284', '41399', '72858', '32223', '35915', '45221', '36871', '16193', '2522', '52963', '24506', '98239', '56752', '15192', '8451', '62802', '54777', '67983', '82177', '7303', '71445', '40559', '58655', '73468', '40491', '52864', '81558', '36789', '53134', '38801', '90600', '36385', '90996', '20526', '13627', '62253', '96989', '88864', '11928', '14681', '77082', '95659', '47182', '16085', '26894', '39758', '32803', '26458', '65779', '66110', '38888', '15490', '48120', '90238', '8736', '233', '76851', '86938', '8873', '95387', '33400', '50788', '13568', '43139', '29821', '70427', '21022', '93285', '57243', '51675', '77459', '33170', '81485', '85303', '44133', '203', '44175', '89151', '26705', '32990', '10885', '10208', '58477', '97729', '699', '40581', '8065', '95864', '89797', '47506', '19160', '85728', '58599', '96271', '75849', '30736', '18808', '25828', '52011', '66179', '70244', '81312', '19570', '14287', '61078', '81922', '63361', '80858', '306', '22156', '82923', '53176', '24864', '49193', '2961', '96536', '62449', '13213', '85347', '11442', '76615', '43037', '86122', '99676', '74309', '46017', '16175', '12685', '53550', '19080', '37283', '44921', '34991', '4433', '99561', '38215', '35662', '13892', '7814', '41718', '41231', '85589', '74048', '72169', '26946', '61732', '9135', '39009', '63534', '4114', '40417', '83412', '22562', '65546', '720', '90064', '73027', '50736', '71086', '12445', '3681', '65140', '56291', '47452', '48916', '65136', '53941', '15484', '21038', '47251', '78461', '31031', '4838', '87483', '732', '16111', '68263', '4811', '65979', '44283', '51659', '29997', '11280', '3880', '12399', '63450', '93862', '50981', '62790', '76784', '76696', '40906', '49261', '35863', '43747', '65954', '36125', '73713', '98678', '13409', '38773', '59417', '9763', '429', '66203', '7350', '32754', '36079', '72447', '63925', '12958', '65292', '80270', '78432', '50925', '74946', '7649', '13689', '68001', '52318', '5804', '51584', '63637', '85697', '50929', '25279', '20963', '83038', '31199', '64189', '17152', '20459', '66108', '66005', '53159', '53971', '32528', '77145', '52981', '88941', '68593', '86343', '97770', '25625', '17598', '55249', '89640', '94162', '65874', '36511', '21906', '70401', '30914', '24085', '42945', '55597', '78393', '98120', '38283', '44967', '76077', '45739', '92432', '11846', '59131', '26322', '82651', '94792', '37726', '23301', '11275', '98813', '34229', '65440', '51369', '55580', '35207', '84314', '35696', '50231', '9399', '18679', '27219', '22519', '26725', '63451', '79357', '55915', '77027', '30354', '45890', '10745', '60035', '7914', '43562', '12219', '30220', '29382', '72520', '87475', '83634', '15163', '32468', '72904', '18200', '84666', '43560', '58483', '64613', '52170', '55490', '45954', '99323', '26401', '61210', '10450', '70360', '42906', '32851', '70022', '49966', '62331', '84249', '98093', '62146', '88171', '73246', '48314', '45730', '56348', '59081', '16642', '57872', '81564', '32305', '4158', '47263',
@@ -30,7 +30,7 @@
 
     <!-- The same as above, but interpret tuple as function -->
     <query short="1">SELECT toString(rand()) IN tuple('41577', '83972', '51697', '50014', '37553', '93459', '87438', '95971', '83186', '74326', '67871', '50406', '83678', '29655', '18580', '83905', '61518', '29059', '56700', '82787', '98672', '30884', '81822', '39850', '80852', '57627', '91346', '64522', '17781', '49467', '41099', '41929', '85618', '91389', '68564', '91769', '81219', '52218', '37220', '97097', '2129', '9886', '52049', '34847', '25364', '36429', '76897', '71868', '58121', '71199', '84819', '69991', '34046', '64507', '34892', '24228', '36986', '28588', '51159', '53444', '80531', '9941', '20256', '48103', '32565', '62890', '5379', '60302', '46434', '3205', '18821', '31030', '19794', '71557', '71703', '15024', '14004', '82164', '95659', '40227', '83358', '24395', '9610', '19814', '48491', '66412', '16012', '71586', '42143', '51103', '24463', '89949', '35694', '39193', '63904', '40489', '77144', '94014', '84836', '9980', '46554', '43905', '25588', '25205', '72624', '10249', '35888', '98478', '99030', '26834', '31', '81499', '14847', '82997', '92357', '92893', '17426', '56630', '22252', '68119', '62710', '8740', '82144', '79916', '23391', '30192', '99271', '96435', '44237', '98327', '69481', '16691', '13643', '84554', '38571', '70926', '99283', '79000', '20926', '86495', '4834', '1222', '39486', '57697', '58002', '40790', '15623', '3999', '31515', '12694', '26143', '35951', '54085', '97534', '35329', '73535', '88715', '29572', '75799', '45166', '32066', '48023', '69523', '93150', '8740', '96790', '15534', '63252', '5142', '67045', '93992', '16663', '292', '63924', '6588', '12190', '31506', '69590', '35394', '55168', '65223', '79183', '32600', '69676', '28316', '72111', '53531', '15073', '41127', '73451', '24725', '61647', '65315', '41143', '26493', '95608', '34407', '76098', '53105', '83691', '48755', '35696', '62587', '81826', '3963', '45766', '82751', '12430', '97685', '29919', '78155', '71636', '50215', '89734', '9892', '47151', '54855', '3428', '9712', '52592', '2403', '79602', '81243', '79859', '57361', '82000', '42107', '28860', '99591', '28296', '57337', '64969', '32332', '25535', '30924', '21313', '32554', '17342', '87311', '19825', '24898', '61323', '83209', '79322', '79009', '50746', '33396', '62033', '16548', '17427', '24073', '34640', '52368', '4724', '80408', '40', '33787', '16666', '19665', '86751', '27264', '2241', '88134', '53566', '10589', '79711', '92823', '58972', '91767', '60885', '51659', '7867', '96849', '30360', '20914', '9584', '1250', '22871', '23282', '99312', '4683', '33429', '68361', '82614', '81440', '47863', '69790', '11968', '75210', '66854', '37002', '61142', '71514', '1588', '42336', '11069', '26291', '2261', '71056', '13492', '9133', '91216', '72207', '71586', '86535', '83898', '24392', '45384', '48545', '61972', '503', '80180', '35834', '97025', '70411', '55039', '35430', '27631', '82533', '96831', '74077', '42533', '14451', '26943', '53783', '69489', '71969', '8432', '37230', '61348', '19472', '59115', '9886', '50951', '57109', '7141', '1902', '84130', '4323', '55889', '47784', '2220', '75988', '66988', '63721', '8131', '95601', '95207', '2311', '26541', '50991', '6717', '2969', '71857', '51034', '65958', '94716', '90275', '21012', '46859', '7984', '31131', '46457', '69578', '44540', '7294', '80117', '9925', '60155', '90608', '82684', '32193', '87071', '28006', '87604', '24501', '79087', '2848', '29237', '11221', '81319', '40966', '87641', '35325', '78705', '88636', '78717', '62831', '56390', '99271', '43821', '14453', '17923', '62695', '77322', '21038', '67677', '41271', '4376', '65426', '46091', '19887', '97251', '55583', '58763', '3826', '35037', '73533', '64267', '82319', '9836', '42622', '96829', '16363', '10455', '49290', '99992', '98229', '66356', '59087', '73998', '25986', '4279', '56790', '69540', '588', '36620', '60358', '45056', '89297', '42740', '8323', '19245', '82417', '41431', '699', '11554', '73910', '44491', '56019', '68901', '45816', '68126', '89379', '23885', '13263', '56395', '73130', '19089', '23771', '10335', '48547', '16903', '6453', '33560', '89668', '38159', '43177', '90655', '49712', '62', '66920', '34180', '12150', '48564', '39538', '85026', '87195', '14928', '8956', '71157', '53287', '39161', '67583', '83309', '92054', '86977', '56188', '15229', '88170', '60894', '58497', '89254', '40082', '86890', '60161', '97291', '45878', '23368', '14577', '92870', '37017', '97356', '99426', '76061', '89186', '99751', '85153', '61580', '39360', '90107', '25603', '26798', '76224', '6469', '7912', '69838', '16404', '67497', '28965', '80836', '80365', '91249', '48713', '17113', '33090', '40793', '70450', '66689', '83698', '17802', '43869', '13355', '18959', '79411', '87930', '9265', '37504', '44876', '97234', '94149', '35040', '22049', '49248', '6535', '36080', '28346', '94437', '78319', '17961', '89056', '56161', '35810', '41632', '45494', '53351', '89729', '99510', '51584', '59688', '6193', '70809', '51093', '92589', '90247', '34910', '78235', '17362', '49423', '63324', '525', '37638', '72325', '89356', '15298', '59116', '17848', '65429', '27029', '84781', '70247', '8825', '35082', '70451', '22522', '58125', '91879', '90531', '2478', '463', '37902', '54405', '87267', '72688', '22803', '33134', '35177', '84551', '44974', '88375', '76407', '27774', '33849', '19915', '82014', '80434', '26380', '48777', '53811', '14838', '26829', '56441', '99869', '49574', '85476', '19723', '16907', '4018', '37338', '78510', '47912', '13030', '65277', '95716', '67363', '21393', '89887', '78842', '81650', '903', '17436', '30704', '49223', '27198', '25500', '52214', '54258', '70082', '53950', '49312', '43615', '99473', '94348', '53661', '96213', '96346', '62010', '38268', '32861', '75660', '10392', '89491', '68335', '29817', '88706', '24184', '36298', '43440', '21626', '26535', '44560', '46363', '12534', '99070', '95606', '33714', '73070', '8303', '29853', '23014', '99982', '4530', '14955', '45803', '50', '90750', '30394', '81276', '95563', '47314', '58520', '91299', '88944', '54402', '67405', '29253', '47079', '71734', '99728', '17652', '13307', '35556', '18962', '26780', '17771', '53712', '60055', '37628', '35830', '90739', '61151', '41309', '27652', '3051', '53167', '98417', '19382', '36833', '75085', '65374', '87732', '30352', '31776', '32765', '97565', '92199', '49050', '29503', '51024', '18834', '8515', '24069', '96216', '10777', '90680', '18974', '68884', '85305', '36007', '56707', '4212', '47352', '34426', '13185', '92939', '95782', '70577', '58080', '98279', '3906', '5065', '56896', '16382', '31273', '17117', '98602', '12786', '24086', '63970', '72756', '35798', '82367', '7356', '53398', '68503', '2962', '16425', '67334', '68461', '65439', '15620', '70906', '29649', '46461', '74602', '38012', '71714', '16825', '89480', '53386', '88532', '35104', '28556', '82120', '23155', '23347', '24797', '60061', '54962', '99427', '82248', '82447', '39968', '63727', '27431', '81511', '91168', '71425', '80740', '84127', '40717', '15503', '15419', '46594', '61263', '19212', '53175', '70724', '74445', '23034', '71818', '40246', '18886', '53066', '4880', '83701', '86107', '87862', '44751', '392', '73440', '90291', '93395', '20894', '38463', '32664', '55158', '20090', '50004', '79070', '98471', '85478', '96615', '68149', '78334', '97752', '73207', '71678', '91238', '96757', '82598', '194', '35797', '45120', '60782', '28721', '17676', '78066', '60957', '11826', '51563', '50516', '16485', '47053', '31738', '48923', '23554', '96850', '42033', '73701', '78607', '45979', '54571', '12415', '31693', '15356', '36902', '9126', '3767', '3295', '90402', '24005', '95350', '67033', '49137', '72606', '51899', '17522', '31957', '44641', '53982', '23767', '68257', '15766', '19995', '2107', '48788', '11765', '91055', '46576', '54651', '50381', '62827', '73636', '46606', '98753', '37631', '70441', '87916', '66983', '33870', '31125', '12904', '57040', '4874', '58632', '42037', '18782', '5998', '18974', '57949', '81010', '90407', '99874', '20462', '89949', '10952', '71454', '95130', '46115', '3518', '13384', '69039', '79482', '22076', '59782', '32042', '40930', '60243', '29298', '6790', '46985', '44398', '85631', '14380', '66179', '2629', '32126', '49833', '14118', '58492', '31493', '81172', '96638', '8745', '89663', '76842', '78633', '41373', '83721', '42886', '11123', '32739', '11051', '1303', '92314', '83324', '85600', '44276', '69064', '56125', '84650', '31028', '12628', '14502', '64764', '39405', '44855', '79046', '51716', '46824', '83389', '1941', '1257', '9280', '73176', '84729', '2579', '63366', '22606', '35541', '51096', '13447', '18355', '68037', '28436', '94116', '81070', '78355', '67897', '5296', '32742', '77645', '91853', '18767', '67949', '40963', '5792', '17278', '25597', '41884', '80829', '7099', '18645', '60295', '12082', '81800', '78415', '18082', '38789', '16295', '72377', '74949', '55583', '66853', '15402', '72977', '15123', '99434', '34999', '21687', '76049', '42987', '83748', '88256', '66688', '21766', '20304', '29271', '10069', '19822', '11792', '42526', '74143', '17289', '30253', '6367', '20888', '12975', '94073', '98639', '30134', '26320', '65507', '69002', '53120', '4550', '38893', '18954', '38283', '54863', '17698', '99670', '10521', '92467', '60994', '18052', '48673', '35811', '87282', '62706', '16061', '53112', '22652', '37780', '55662', '26331', '49410', '79074', '10623', '69577', '79613', '9491', '31229', '43922', '84231', '58409', '36386', '46875', '74431', '76735', '38776', '23350', '7314', '9079', '51519', '98544', '70216', '63380', '90381', '1295', '46901', '58225', '55339', '89918', '75522', '35431', '89460', '49552', '89302', '23068', '28493', '3042', '25194', '59520', '9810', '95706', '81297', '89638', '54794', '94527', '45262', '97932', '78685', '6947', '22818', '48700', '9153', '12289', '22011', '58825', '93854', '65438', '4509', '33741', '28208', '69061', '48578', '40247', '77725', '31837', '39003', '69363', '78113', '76398', '97262', '67795',
-    '68446', '58896', '60969', '19849', '6722', '91854', '49519', '13949', '67109', '48824', '31723', '75554', '69575', '94986', '75350', '18628', '15284', '41943', '15433', '52607', '41', '22340', '29528', '24059', '34145', '72517', '46316', '10667', '54510', '19882', '47764', '69124', '41963', '84350', '48420', '4646', '24958', '69020', '97121', '26178', '62664', '50622', '32554', '49655', '45398', '11267', '72222', '73363', '89554', '89046', '57384', '29259', '37888', '24850', '74353', '57343', '34762', '2900', '11393', '42154', '94306', '70552', '75265', '921', '26003', '64352', '89857', '83171', '58249', '48940', '53512', '66335', '44865', '68729', '19299', '58003', '39854', '99122', '3860', '80173', '52242', '90966', '53183', '71982', '82325', '87842', '15000', '55627', '71132', '6354', '42402', '91719', '91644', '94533', '74925', '66278', '66911', '85576', '40495', '70919', '71797', '87835', '29845', '71832', '3390', '7994', '33499', '70715', '54897', '82710', '63077', '78105', '24758', '89585', '84607', '46477', '78618', '10989', '39222', '98749', '51685', '94664', '31008', '32823', '89521', '72160', '26952', '4001', '21421', '5737', '74027', '88179', '45553', '83743', '19913', '49435', '65616', '82641', '5149', '76959', '40681', '73023', '2670', '30845', '18863', '35094', '88400', '80963', '9154', '16571', '64192', '59694', '41317', '59942', '58856', '99281', '67260', '66971', '22716', '76089', '58047', '67071', '53707', '462', '52518', '72277', '10681', '69', '98855', '12593', '88842', '67242', '73543', '37439', '18413', '67211', '93495', '45576', '70614', '27988', '53210', '18618', '21318', '68059', '25518', '55917', '56522', '16548', '2404', '93538', '61452', '66358', '3709', '23914', '92426', '81439', '38070', '28988', '29939', '2948', '85720', '45628', '51101', '89431', '86365', '17571', '50987', '83849', '11015', '83812', '66187', '26362', '66786', '22024', '93866', '36161', '90080', '64874', '37294', '83860', '73821', '80279', '36766', '73117', '44620', '84556', '42070', '90383', '27862', '20665', '67576', '34997', '57958', '80638', '84351', '63961', '1362', '14338', '80377', '24192', '41294', '57368', '51189', '27287', '45764', '86289', '65600', '708', '84090', '96005', '55676', '84855', '72385', '70018', '9336', '82701', '3710', '52083', '74045', '96454', '30956', '67369', '78941', '81810', '71906', '23194', '33042', '50794', '61256', '24449', '48639', '22916', '78303', '13666', '40762', '43942', '51075', '89783', '95786', '90462', '6181', '36482', '40675', '4970', '6388', '91849', '72579', '94983', '86084', '20140', '68427', '48123', '43122', '98066', '37560', '6927', '72803', '5546', '62259', '98439', '6457', '98568', '70499', '33022', '28226', '29675', '20917', '75365', '20900', '8190', '56736', '99153', '77779', '49333', '50293', '97650', '4067', '47278', '42761', '71875', '13966', '11223', '46783', '18059', '61355', '29638', '75681', '24466', '89634', '20759', '83252', '37780', '15931', '74893', '6703', '64524', '80656', '85990', '78427', '18411', '20696', '86432', '93176', '69889', '15072', '15180', '9935', '10467', '60248', '42430', '62590', '89596', '27743', '26398', '79912', '60048', '50943', '38870', '69383', '72261', '98059', '55242', '74905', '5667', '54321', '70415', '39903', '49711', '85318', '79979', '59262', '82321', '15263', '17416', '74554', '94733', '72112', '49872', '54849', '73883', '78250', '74935', '68559', '57564', '50541', '45730', '41595', '5588', '83723', '42891', '11898', '14348', '99732', '14481', '85233', '21277', '94508', '52551', '74187', '7634', '42912', '25100', '43536', '35798', '48190', '86477', '22680', '48148', '59501', '56563', '16802', '81496', '97568', '68657', '51462', '67953', '99660', '39002', '54170', '57190', '68086', '52700', '6487', '55709', '70418', '62629', '70420', '35695', '36152', '45360', '53503', '46623', '76000', '50648', '97876', '44815', '29163', '1356', '64123', '71388', '17658', '99084', '58727', '59437', '38773', '71254', '81286', '97545', '18786', '56834', '20346', '36401', '62316', '58082', '67959', '99876', '69895', '80099', '62747', '20517', '99777', '6472', '49189', '31321', '39992', '68073', '13378', '51806', '21776', '52060', '96983', '25754', '93709', '96627', '8644', '93726', '14002', '37716', '87620', '34507', '76339', '24491', '5849', '44110', '522', '66521', '12776', '44887', '80535', '14548', '75248', '671', '73071', '35715', '59474', '7061', '82243', '56170', '20179', '59717', '1725', '24634', '11270', '77023', '63840', '46608', '44667', '22422', '59771', '94768', '73033', '82905', '16463', '40971', '22204', '58366', '28721', '14907', '76468', '81872', '38418', '36989', '61439', '10610', '131', '44296', '35453', '10117', '75856', '94603', '99602', '68075', '35949', '13599', '50030', '69633', '55956', '85465', '16429', '86081', '11145', '6195', '82207', '90598', '92814', '23725', '83204', '80346', '71542', '46634', '15820', '54123', '45397', '15322', '61743', '9273', '71347', '6835', '64006', '91718', '43677', '32923', '21486', '17098', '61694', '43347', '40019', '4071', '52443', '42386', '56839', '83514', '27633', '40780', '51749', '92101', '62384', '92206', '56044', '66174', '11137', '73966', '78471', '30468', '31643', '33197', '6888', '8066', '86603', '74383', '6098', '54411', '98819', '89862', '88639', '94422', '89371', '80526', '91747', '91220', '64944', '76658', '42046', '58518', '27249', '6646', '3028', '1346', '33763', '9734', '31737', '65527', '5892', '60813', '3410', '35464', '43009', '98382', '70580', '93898', '56404', '32995', '62771', '71556', '40538', '55612', '45656', '10758', '20268', '33603', '38310', '14242', '74397', '10722', '71575', '22590', '49043', '91439', '9055', '23668', '9101', '5268', '64133', '77501', '64684', '11337', '47575', '50732', '88680', '93730', '46785', '17589', '3520', '57595', '71241', '34994', '8753', '36147', '88844', '41914', '11250', '94632', '71927', '4624', '86279', '7664', '2659', '94853', '65386', '30438', '86005', '92883', '84629', '59910', '44484', '1306', '8404', '56962', '29990', '38445', '96191', '73013', '66590', '40951', '24712', '18825', '37268', '87843', '18972', '12154', '7779', '52149', '76152', '65799', '86011', '35475', '78083', '88232', '91551', '65532', '93516', '73827', '24227', '44687', '55759', '83819', '45088', '10856', '60488', '39051', '14103', '76650', '81181', '46731', '737', '58788', '78945', '42096', '66731', '66740', '72273', '88969', '5655', '86590', '41096', '80038', '32430', '51877', '23970', '91900', '13082', '45880', '94367', '19739', '61998', '71665', '16083', '57035', '26916', '10166', '18834', '46798', '66881', '28444', '68840', '10459', '81087', '4728', '76224', '39257', '23470', '93524', '37345', '30074', '49856', '22022', '55279', '5159', '5193', '58030', '57539', '12514', '49759', '96222', '52597', '67192', '88187', '53614', '16084', '79915', '28212', '79334', '85283', '32306', '31058', '43113', '74707', '74869', '2213', '32134', '6379', '85426', '87098', '35984', '51105', '69287', '16803', '83337', '14913', '62531', '58098', '7914', '20105', '28850', '1384', '43173', '62983', '87113', '76066', '86320', '77684', '45191', '95225', '41503', '36713', '48404', '91228', '53865', '98981', '59161', '61237', '84561', '17455', '14379', '57789', '80895', '99260', '84595', '72942', '53220', '84448', '81332', '49437', '83086', '93414', '54519', '52288', '74772', '22460', '49324', '11168', '96071', '61985', '38284', '6405', '54698', '71727', '60093', '37340', '87884', '83403', '4542', '94949', '19636', '15855', '39105', '10424', '67418', '91022', '69254', '8481', '38411', '3832', '44354', '93548', '57172', '28481', '372', '81497', '52179', '41060', '72141', '41396', '65590', '70432', '82819', '93814', '26118', '84780', '88485', '70821', '8222', '83000', '47067', '38516', '33347', '47681', '48202', '60749', '52112', '7937', '28105', '11394', '45746', '43252', '34494', '2979', '69715', '42486', '82315', '71760', '97413', '66137', '94487', '7429', '74434', '22964', '55251', '3448', '53534', '2574', '9693', '96157', '2955', '4348', '19566', '56930', '83319', '31310', '53905', '1148', '41726', '22233', '76045', '37351', '10545', '17581', '28047', '30199', '4741', '58111', '33497', '67796', '67730', '31247', '43772', '29461', '45970', '73353', '22534', '53962', '32147', '71392', '62579', '66345', '58246', '33442', '9581', '29705', '14058', '86471', '76125', '59363', '94982', '74810', '89149', '20066', '3366', '3568', '25752', '80036', '64119', '27270', '40061', '91052', '69022', '9852', '77112', '83075', '43924', '61661', '56133', '96652', '57944', '72576', '82170', '79236', '55745', '15309', '88878', '72761', '37647', '67465', '12777', '97309', '93202', '41470', '8787', '64920', '48514', '18917', '35157', '59151', '4640', '5317', '38134', '76548', '82788', '9214', '58418', '73185', '90554', '10543', '47182', '62936', '91765', '89751', '68931', '48865', '64607', '7150', '77862', '14297', '14828', '33013', '91698', '67593', '98096', '16595', '51639', '86531', '24719', '1703', '78788', '43810', '38918', '95491', '99903', '82671', '8291', '68288', '31224', '39863', '4265', '77798', '7698', '33804', '92286', '4744', '37038', '44203', '98212', '17369', '77442', '62879', '4145', '96881', '15646', '36824', '19959', '45451', '76049', '54272', '97577', '95298', '81115', '30204', '82041', '8037', '10052', '8756', '76833', '82851', '24276', '75574', '36037', '78079', '92807', '29064', '90000', '84150', '17102', '75092', '49424', '35597', '4693', '82853', '42511', '16119', '23478', '65240', '55585', '91762', '71671', '46682', '72479', '97696', '24615', '12579', '30274', '48255', '2336', '90202', '5808', '45426', '76308', '74639', '31245', '99894', '89638', '6233', '33893', '71899', '85273', '89429', '29761', '50231', '57249', '99347', '22642', '66972', '86221', '47514', '88274', '10819', '73150', '53754', '13304', '20478', '38099', '619', '14669', '8011', '97657', '26569', '65430', '13467', '38180', '23675', '72350', '42257', '39875', '23529', '53407', '11833', 
+    '68446', '58896', '60969', '19849', '6722', '91854', '49519', '13949', '67109', '48824', '31723', '75554', '69575', '94986', '75350', '18628', '15284', '41943', '15433', '52607', '41', '22340', '29528', '24059', '34145', '72517', '46316', '10667', '54510', '19882', '47764', '69124', '41963', '84350', '48420', '4646', '24958', '69020', '97121', '26178', '62664', '50622', '32554', '49655', '45398', '11267', '72222', '73363', '89554', '89046', '57384', '29259', '37888', '24850', '74353', '57343', '34762', '2900', '11393', '42154', '94306', '70552', '75265', '921', '26003', '64352', '89857', '83171', '58249', '48940', '53512', '66335', '44865', '68729', '19299', '58003', '39854', '99122', '3860', '80173', '52242', '90966', '53183', '71982', '82325', '87842', '15000', '55627', '71132', '6354', '42402', '91719', '91644', '94533', '74925', '66278', '66911', '85576', '40495', '70919', '71797', '87835', '29845', '71832', '3390', '7994', '33499', '70715', '54897', '82710', '63077', '78105', '24758', '89585', '84607', '46477', '78618', '10989', '39222', '98749', '51685', '94664', '31008', '32823', '89521', '72160', '26952', '4001', '21421', '5737', '74027', '88179', '45553', '83743', '19913', '49435', '65616', '82641', '5149', '76959', '40681', '73023', '2670', '30845', '18863', '35094', '88400', '80963', '9154', '16571', '64192', '59694', '41317', '59942', '58856', '99281', '67260', '66971', '22716', '76089', '58047', '67071', '53707', '462', '52518', '72277', '10681', '69', '98855', '12593', '88842', '67242', '73543', '37439', '18413', '67211', '93495', '45576', '70614', '27988', '53210', '18618', '21318', '68059', '25518', '55917', '56522', '16548', '2404', '93538', '61452', '66358', '3709', '23914', '92426', '81439', '38070', '28988', '29939', '2948', '85720', '45628', '51101', '89431', '86365', '17571', '50987', '83849', '11015', '83812', '66187', '26362', '66786', '22024', '93866', '36161', '90080', '64874', '37294', '83860', '73821', '80279', '36766', '73117', '44620', '84556', '42070', '90383', '27862', '20665', '67576', '34997', '57958', '80638', '84351', '63961', '1362', '14338', '80377', '24192', '41294', '57368', '51189', '27287', '45764', '86289', '65600', '708', '84090', '96005', '55676', '84855', '72385', '70018', '9336', '82701', '3710', '52083', '74045', '96454', '30956', '67369', '78941', '81810', '71906', '23194', '33042', '50794', '61256', '24449', '48639', '22916', '78303', '13666', '40762', '43942', '51075', '89783', '95786', '90462', '6181', '36482', '40675', '4970', '6388', '91849', '72579', '94983', '86084', '20140', '68427', '48123', '43122', '98066', '37560', '6927', '72803', '5546', '62259', '98439', '6457', '98568', '70499', '33022', '28226', '29675', '20917', '75365', '20900', '8190', '56736', '99153', '77779', '49333', '50293', '97650', '4067', '47278', '42761', '71875', '13966', '11223', '46783', '18059', '61355', '29638', '75681', '24466', '89634', '20759', '83252', '37780', '15931', '74893', '6703', '64524', '80656', '85990', '78427', '18411', '20696', '86432', '93176', '69889', '15072', '15180', '9935', '10467', '60248', '42430', '62590', '89596', '27743', '26398', '79912', '60048', '50943', '38870', '69383', '72261', '98059', '55242', '74905', '5667', '54321', '70415', '39903', '49711', '85318', '79979', '59262', '82321', '15263', '17416', '74554', '94733', '72112', '49872', '54849', '73883', '78250', '74935', '68559', '57564', '50541', '45730', '41595', '5588', '83723', '42891', '11898', '14348', '99732', '14481', '85233', '21277', '94508', '52551', '74187', '7634', '42912', '25100', '43536', '35798', '48190', '86477', '22680', '48148', '59501', '56563', '16802', '81496', '97568', '68657', '51462', '67953', '99660', '39002', '54170', '57190', '68086', '52700', '6487', '55709', '70418', '62629', '70420', '35695', '36152', '45360', '53503', '46623', '76000', '50648', '97876', '44815', '29163', '1356', '64123', '71388', '17658', '99084', '58727', '59437', '38773', '71254', '81286', '97545', '18786', '56834', '20346', '36401', '62316', '58082', '67959', '99876', '69895', '80099', '62747', '20517', '99777', '6472', '49189', '31321', '39992', '68073', '13378', '51806', '21776', '52060', '96983', '25754', '93709', '96627', '8644', '93726', '14002', '37716', '87620', '34507', '76339', '24491', '5849', '44110', '522', '66521', '12776', '44887', '80535', '14548', '75248', '671', '73071', '35715', '59474', '7061', '82243', '56170', '20179', '59717', '1725', '24634', '11270', '77023', '63840', '46608', '44667', '22422', '59771', '94768', '73033', '82905', '16463', '40971', '22204', '58366', '28721', '14907', '76468', '81872', '38418', '36989', '61439', '10610', '131', '44296', '35453', '10117', '75856', '94603', '99602', '68075', '35949', '13599', '50030', '69633', '55956', '85465', '16429', '86081', '11145', '6195', '82207', '90598', '92814', '23725', '83204', '80346', '71542', '46634', '15820', '54123', '45397', '15322', '61743', '9273', '71347', '6835', '64006', '91718', '43677', '32923', '21486', '17098', '61694', '43347', '40019', '4071', '52443', '42386', '56839', '83514', '27633', '40780', '51749', '92101', '62384', '92206', '56044', '66174', '11137', '73966', '78471', '30468', '31643', '33197', '6888', '8066', '86603', '74383', '6098', '54411', '98819', '89862', '88639', '94422', '89371', '80526', '91747', '91220', '64944', '76658', '42046', '58518', '27249', '6646', '3028', '1346', '33763', '9734', '31737', '65527', '5892', '60813', '3410', '35464', '43009', '98382', '70580', '93898', '56404', '32995', '62771', '71556', '40538', '55612', '45656', '10758', '20268', '33603', '38310', '14242', '74397', '10722', '71575', '22590', '49043', '91439', '9055', '23668', '9101', '5268', '64133', '77501', '64684', '11337', '47575', '50732', '88680', '93730', '46785', '17589', '3520', '57595', '71241', '34994', '8753', '36147', '88844', '41914', '11250', '94632', '71927', '4624', '86279', '7664', '2659', '94853', '65386', '30438', '86005', '92883', '84629', '59910', '44484', '1306', '8404', '56962', '29990', '38445', '96191', '73013', '66590', '40951', '24712', '18825', '37268', '87843', '18972', '12154', '7779', '52149', '76152', '65799', '86011', '35475', '78083', '88232', '91551', '65532', '93516', '73827', '24227', '44687', '55759', '83819', '45088', '10856', '60488', '39051', '14103', '76650', '81181', '46731', '737', '58788', '78945', '42096', '66731', '66740', '72273', '88969', '5655', '86590', '41096', '80038', '32430', '51877', '23970', '91900', '13082', '45880', '94367', '19739', '61998', '71665', '16083', '57035', '26916', '10166', '18834', '46798', '66881', '28444', '68840', '10459', '81087', '4728', '76224', '39257', '23470', '93524', '37345', '30074', '49856', '22022', '55279', '5159', '5193', '58030', '57539', '12514', '49759', '96222', '52597', '67192', '88187', '53614', '16084', '79915', '28212', '79334', '85283', '32306', '31058', '43113', '74707', '74869', '2213', '32134', '6379', '85426', '87098', '35984', '51105', '69287', '16803', '83337', '14913', '62531', '58098', '7914', '20105', '28850', '1384', '43173', '62983', '87113', '76066', '86320', '77684', '45191', '95225', '41503', '36713', '48404', '91228', '53865', '98981', '59161', '61237', '84561', '17455', '14379', '57789', '80895', '99260', '84595', '72942', '53220', '84448', '81332', '49437', '83086', '93414', '54519', '52288', '74772', '22460', '49324', '11168', '96071', '61985', '38284', '6405', '54698', '71727', '60093', '37340', '87884', '83403', '4542', '94949', '19636', '15855', '39105', '10424', '67418', '91022', '69254', '8481', '38411', '3832', '44354', '93548', '57172', '28481', '372', '81497', '52179', '41060', '72141', '41396', '65590', '70432', '82819', '93814', '26118', '84780', '88485', '70821', '8222', '83000', '47067', '38516', '33347', '47681', '48202', '60749', '52112', '7937', '28105', '11394', '45746', '43252', '34494', '2979', '69715', '42486', '82315', '71760', '97413', '66137', '94487', '7429', '74434', '22964', '55251', '3448', '53534', '2574', '9693', '96157', '2955', '4348', '19566', '56930', '83319', '31310', '53905', '1148', '41726', '22233', '76045', '37351', '10545', '17581', '28047', '30199', '4741', '58111', '33497', '67796', '67730', '31247', '43772', '29461', '45970', '73353', '22534', '53962', '32147', '71392', '62579', '66345', '58246', '33442', '9581', '29705', '14058', '86471', '76125', '59363', '94982', '74810', '89149', '20066', '3366', '3568', '25752', '80036', '64119', '27270', '40061', '91052', '69022', '9852', '77112', '83075', '43924', '61661', '56133', '96652', '57944', '72576', '82170', '79236', '55745', '15309', '88878', '72761', '37647', '67465', '12777', '97309', '93202', '41470', '8787', '64920', '48514', '18917', '35157', '59151', '4640', '5317', '38134', '76548', '82788', '9214', '58418', '73185', '90554', '10543', '47182', '62936', '91765', '89751', '68931', '48865', '64607', '7150', '77862', '14297', '14828', '33013', '91698', '67593', '98096', '16595', '51639', '86531', '24719', '1703', '78788', '43810', '38918', '95491', '99903', '82671', '8291', '68288', '31224', '39863', '4265', '77798', '7698', '33804', '92286', '4744', '37038', '44203', '98212', '17369', '77442', '62879', '4145', '96881', '15646', '36824', '19959', '45451', '76049', '54272', '97577', '95298', '81115', '30204', '82041', '8037', '10052', '8756', '76833', '82851', '24276', '75574', '36037', '78079', '92807', '29064', '90000', '84150', '17102', '75092', '49424', '35597', '4693', '82853', '42511', '16119', '23478', '65240', '55585', '91762', '71671', '46682', '72479', '97696', '24615', '12579', '30274', '48255', '2336', '90202', '5808', '45426', '76308', '74639', '31245', '99894', '89638', '6233', '33893', '71899', '85273', '89429', '29761', '50231', '57249', '99347', '22642', '66972', '86221', '47514', '88274', '10819', '73150', '53754', '13304', '20478', '38099', '619', '14669', '8011', '97657', '26569', '65430', '13467', '38180', '23675', '72350', '42257', '39875', '23529', '53407', '11833',
     '29599', '95621', '7727', '59527', '86846', '22860', '5358', '3730', '87555', '362', '95755', '54565', '29935', '68950', '52349', '98344', '86576', '7420', '12236', '15844', '48099', '97535', '97081', '50261', '31187', '60496', '24123', '24042', '6376', '6679', '99806', '20306', '60676', '36881', '77309', '5247', '96569', '53417', '73252', '64179', '35318', '75732', '65119', '32621', '40464', '22887', '96152', '65161', '83381', '8915', '68142', '7328', '85031', '15688', '72519', '93992', '86927', '75538', '38205', '50877', '70039', '97538', '94822', '52131', '49643', '85206', '1347', '14574', '88736', '53442', '49991', '64925', '72283', '82213', '60905', '36118', '62963', '16983', '79185', '15111', '26059', '17792', '98218', '33214', '1094', '41754', '77275', '65173', '13190', '91004', '90422', '44387', '92672', '98641', '54609', '83295', '37395', '70104', '32986', '72524', '82478', '5837', '83916', '52736', '57112', '55985', '42642', '42136', '89642', '35712', '49489', '19726', '65824', '24384', '48112', '15366', '99206', '68384', '51389', '529', '21475', '75749', '95182', '60110', '70571', '74174', '38105', '78107', '4101', '8982', '11215', '23987', '3303', '28706', '54629', '98000', '67510', '30036', '99140', '48896', '40971', '7735', '79984', '50134', '94928', '57023', '52880', '83067', '41940', '62994', '89213', '38593', '19283', '68206', '22234', '19245', '26266', '32403', '65889', '17022', '64280', '42797', '27161', '57675', '42313', '93606', '93082', '20659', '90824', '1226', '66266', '12503', '57104', '15247', '51160', '92398', '71967', '59476', '44465', '35765', '10787', '47737', '45792', '2292', '47599', '89612', '8162', '87622', '69410', '45727', '31158', '99791', '89544', '27214', '99588', '40516', '75616', '36505', '46079', '95448', '97999', '47462', '47799', '82729', '34038', '60789', '96938', '22682', '79062', '93307', '36038', '49016', '90983', '48219', '50889', '32517', '72219', '71229', '82643', '1195', '70543', '17', '22178', '23544', '72371', '1163', '28527', '7336', '39846', '31956', '80963', '41804', '59791', '41831', '1940', '52377', '79494', '12531', '81112', '44320', '18746', '5774', '63869', '4085', '59922', '12751', '99443', '13530', '23872', '36026', '83360', '32711', '92980', '11140', '99323', '57263', '98149', '29265', '25548', '65995', '4818', '15593', '8535', '37863', '12217', '14474', '66584', '89272', '86690', '58777', '39666', '44756', '18442', '52586', '98030', '40850', '38708', '49304', '68923', '65008', '84388', '83639', '29866', '63675', '26793', '49227', '82099', '24090', '57535', '24201', '65776', '74054', '89833', '62979', '26613', '5851', '99766', '63484', '66605', '37179', '90760', '59336', '58390', '93239', '84578', '11396', '93994', '73818', '23972', '37720', '72369', '25063', '32952', '71036', '76612', '31285', '34090', '19136', '53783', '66436', '61478', '96749', '43658', '7399', '31574', '67073', '40480', '20727', '70993', '65549', '30800', '21507', '53785', '89574', '86381', '56492', '62603', '44856', '68687', '63794', '70996', '7475', '84238', '71939', '86886', '94792', '15036', '36936', '95722', '17771', '67850', '33371', '49314', '40744', '5432', '81057', '41201', '75986', '22961', '15323', '1570', '18657', '95219', '19130', '53127', '15867', '81135', '73206', '76668', '36386', '48828', '31417', '56916', '70891', '60534', '95777', '10022', '94053', '2928', '56326', '16559', '79656', '6414', '81247', '78270', '55687', '19151', '61597', '99857', '81142', '27725', '53493', '12185', '1455', '48501', '59425', '20591', '24900', '66079', '84889', '32024', '18919', '2043', '7076', '71201', '88258', '86521', '93348', '26395', '39646', '44145', '33911', '46231', '67054', '39979', '11630', '23020', '76278', '88056', '11480', '4723', '78612', '70211', '60622', '84687', '59092', '65675', '38479', '64399', '64699', '95964', '42764', '69060', '28189', '4193', '95805', '75462', '17245', '59640', '94773', '84292', '53092', '98507', '61353', '32483', '53027', '48912', '87221', '47788', '59263', '65196', '35567', '17494', '64253', '50223', '7057', '87467', '62414', '2523', '50910', '72353', '78986', '78104', '47719', '29108', '12957', '5114', '64435', '66707', '37449', '70399', '45334', '71606', '55338', '55072', '58765', '12151', '22012', '16954', '87366', '14240', '98041', '72296', '47408', '56879', '99584', '63172', '92316', '28071', '29880', '19608', '13839', '87484', '56541', '88662', '87098', '72124', '78282', '27653', '38993', '31870', '67239', '99445', '7376', '78487', '98880', '12180', '86773', '67773', '15416', '58172', '13075', '67559', '97510', '29705', '86985', '57024', '11827', '31236', '91920', '26116', '94614', '14486', '46252', '78847', '43786', '70048', '96739', '35240', '39933', '58209', '27852', '65669', '47323', '58150', '84444', '44344', '95882', '41258', '31314', '69060', '19916', '6979', '19436', '45572', '16259', '74566', '6306', '24705', '53422', '593', '97031', '22308', '26875', '23042', '78035', '34229', '61976', '23175', '50072', '90896', '50810', '71730', '86468', '94807', '8218', '36032', '58628', '60560', '51206', '37943', '27987', '15014', '49905', '70018', '66799', '80851', '23594', '29982', '6438', '97381', '47715', '96294', '17985', '48545', '12672', '5250', '9988', '24601', '3736', '97815', '54363', '64703', '44167', '68376', '16595', '38073', '29630', '59630', '1858', '71823', '75580', '70083', '14493', '93821', '93394', '85369', '3818', '8435', '59988', '43966', '13961', '15855', '83332', '80312', '27299', '88840', '76964', '56173', '62794', '79389', '82642', '85843', '47116', '43064', '16061', '28905', '54415', '72832', '91252', '93488', '79457', '99336', '70744', '80432', '6487', '880', '87701', '154', '86574', '86677', '17892', '81488', '95260', '12515', '43189', '9211', '55403', '41417', '60046', '54785', '83655', '28274', '65745', '63062', '44549', '36391', '48051', '7328', '3572', '33226', '49177', '25123', '59065', '19691', '15109', '10172', '95578', '29497', '48152', '20276', '36270', '78866', '48309', '53209', '55475', '30073', '19717', '16004', '45692', '83430', '9291', '45935', '57030', '92613', '91656', '67697', '34915', '28156', '56594', '3273', '11194', '98270', '34370', '2621', '66679', '97451', '97717', '87923', '48310', '37725', '69743', '75103', '84956', '75163', '16069', '65304', '19397', '18071', '27273', '49823', '57595', '98324', '82174', '10293', '80943', '64184', '19472', '4198', '9410', '25927', '65961', '33155', '95168', '33692', '61712', '69877', '13308', '17415', '10022', '2491', '67310', '96140', '68050', '76272', '17143', '76805', '57176', '7539', '22690', '95483', '87592', '27221', '90821', '51154', '99828', '68998', '54581', '74222', '10269', '65057', '45467', '96089', '55058', '89779', '60837', '74122', '52886', '58055', '14880', '93208', '66652', '68830', '24121', '62407', '87257', '18802', '14925', '45423', '98624', '55195', '59072', '41414', '77840', '66075', '62705', '26549', '19063', '57552', '2507', '52069', '57620', '66688', '14833', '33700', '90666', '98052', '5367', '2268', '43093', '69063', '22030', '85564', '92258', '1847', '24446', '65835', '38660', '91899', '87732', '52396', '31952', '36000', '86944', '16109', '80729', '53757', '60226', '59103', '84187', '36674', '72823', '29884', '4654', '69139', '20440', '57413', '3651', '39639', '44564', '57492', '84159', '751', '99748', '9659', '72661', '39220', '99742', '74734', '75729', '38071', '69934', '73640', '65294', '54524', '64372', '37927', '17187', '7863', '12732', '40296', '36197', '15821', '76831', '4400', '71933', '4040', '22072', '33064', '25702', '13324', '91275', '27388', '97729', '14620', '45989', '80737', '17934', '4219', '3032', '43457', '31051', '24469', '67041', '29328', '75499', '80951', '88212', '92595', '49969', '24612', '58732', '2718', '3805', '50918', '99426', '8614', '35580', '93273', '989', '24385', '41185', '25687', '47146', '25227', '95839', '56355', '98536', '79824', '31725', '46447', '26690', '68418', '47783', '33725', '21729', '70797', '59038', '60376', '25087', '68332', '67950', '12411', '95918', '64736', '65336', '74947', '64605', '4106', '42712', '96640', '28492', '28648', '42429', '821', '24333', '69677', '38959', '23484', '92005', '29352', '29159', '52873', '99947', '21834', '85347', '93479', '28298', '55608', '3226', '69714', '80283', '6577', '18849', '44605', '75286', '28139', '26541', '12867', '57500', '86617', '33005', '57498', '60223', '74954', '51401', '55246', '5648', '16513', '40930', '43821', '32090', '66002', '65530', '76083', '6047', '6879', '94987', '80787', '11688', '77161', '92670', '6696', '400', '28572', '47234', '51375', '88518', '762', '92617', '54260', '7560', '60180', '43331', '64059', '27616', '75839', '21392', '47756', '46254', '19486', '88533', '30130', '93694', '8557', '66534', '94447', '16910', '6480', '77440', '24366', '6195', '48946', '28597', '44429', '50300', '73556', '40638', '98709', '94413', '15987', '43860', '64871', '93953', '34506', '7296', '31753', '30626', '77510', '39829', '25696', '39776', '69185', '36540', '65413', '31528', '43446', '73532', '49776', '30282', '30004', '26725', '15200', '33958', '90320', '71836', '48051', '31970', '5326', '96194', '69695', '60898', '60945', '18271', '50868', '61468', '23593', '68985', '20628', '58044', '8942', '34849', '7384', '50500', '62895', '78780', '48946', '65278', '4067', '973', '34761', '15512', '73739', '23138', '47322', '55568', '32259', '71816', '49277', '75218', '76104', '19579', '68312', '67904', '33886', '53888', '26421', '43859', '40291', '39068', '31711', '36542', '10195', '39781', '72352', '13188', '34113', '9428', '60443', '4987', '13783', '80744', '63483', '18266', '11961', '87167', '46987', '28480', '74214', '39191', '8146', '38090', '75727', '79245', '47720', '52547', '45321', '4972', '49701', '74354', '69672', '63455', '41902', '5667', '54166', '4962', '25873', '44509', '73332', '73383', '29438', '21455', '12320', '11997', '16921', '49379', '63027', '86175', '8110', '76149', '2520', '11256', '25863', '50518', '69001',
     '79113', '9447', '91840', '5242', '10998', '46496', '2448', '56058', '20970', '10517', '17783', '25723', '97137', '62840', '1264', '78691', '81020', '55335', '48524', '2088', '90413', '76651', '26855', '16177', '14954', '62914', '21344', '5708', '75560', '39311', '95865', '28783', '64902', '95657', '46276', '33426', '4799', '11588', '57513', '73689', '77677', '63011', '97795', '34954', '76866', '32043', '32697', '26643', '36890', '53476', '3011', '13963', '49551', '87671', '67761', '17488', '94770', '50599', '33272', '23091', '38079', '41177', '22395', '91656', '79679', '38687', '57384', '80118', '42507', '4098', '78949', '45669', '48802', '83915', '78292', '4369', '57657', '49146', '45192', '98491', '72457', '46331', '207', '81601', '7409', '70856', '91605', '70295', '9171', '72293', '32997', '78025', '16795', '73534', '68780', '21284', '31767', '94381', '86439', '12420', '53285', '99563', '60502', '67954', '55012', '99809', '5431', '69978', '99712', '14401', '79498', '4495', '3045', '528', '72542', '91604', '72725', '39378', '80378', '41996', '20138', '54545', '59730', '36951', '45157', '37964', '97690', '12184', '4944', '53803', '93605', '60851', '68938', '46285', '89663', '90309', '6907', '87239', '81791', '83292', '90013', '68927', '14725', '81840', '63836', '52068', '43830', '4794', '931', '59255', '8263', '99057', '94401', '69033', '7437', '20364', '92884', '28193', '43932', '37629', '59426', '18891', '8583', '79551', '87242', '1483', '6725', '65786', '16844', '12650', '99305', '42841', '9811', '18800', '39313', '51373', '31874', '84558', '27831', '48614', '48975', '55509', '83363', '31854', '64001', '94028', '76125', '79314', '24893', '81132', '9441', '86015', '28356', '40358', '10160', '23328', '7330', '76538', '37611', '89351', '84132', '97047', '26109', '95222', '35130', '75600', '88602', '15073', '87835', '71649', '28948', '81615', '37498', '28674', '59776', '44095', '65924', '64368', '94536', '12518', '61711', '55619', '82949', '4114', '21540', '70544', '28022', '79983', '28781', '7749', '97873', '4951', '50076', '47611', '99522', '56820', '38653', '49047', '36283', '83908', '72452', '85625', '10811', '36998', '44083', '34864', '44975', '39057', '4551', '68450', '24781', '1503', '9871', '46885', '11424', '21259', '54900', '97669', '85669', '6015', '2521', '37661', '14915', '57423', '91903', '94789', '32059', '64972', '4600', '61465', '27118', '79785', '13547', '49766', '38410', '68860', '63756', '23621', '64387', '46255', '63408', '11297', '41081', '56326', '58349', '98703', '72268', '73574', '32098', '42534', '91502', '38083', '11241', '56828', '12098', '25377', '37054', '56328', '30034', '26922', '68401', '93478', '63275', '62650', '81407', '773', '79499', '14970', '47217', '1187', '57428', '69980', '77764', '74791', '22107', '54363', '39247', '56028', '56982', '84244', '21464', '18716', '25533', '94589', '94768', '21537', '18436', '81135', '27654', '79713', '56630', '61571', '58453', '26758', '68450', '68449', '2994', '15347', '83954', '71823', '6428', '44210', '79597', '95144', '32871', '1991', '320', '77157', '63607', '31154', '48846', '71125', '61750', '59608', '33038', '35733', '68915', '94127', '50383', '64242', '49708', '57270', '65019', '8581', '12111', '18487', '50013', '58664', '22214', '19033', '33681', '44754', '28830', '10381', '52318', '34959', '20682', '55453', '53800', '65774', '99164', '72102', '36986', '44157', '56716', '7974', '81475', '25926', '39402', '33688', '99671', '95312', '42268', '26536', '14482', '67377', '57993', '89147', '15834', '64995', '4700', '18714', '30221', '39095', '32749', '69257', '55204', '30497', '31839', '63045', '30009', '62683', '31232', '77680', '93551', '63589', '6989', '77246', '42169', '46117', '73226', '37427', '1858', '83649', '37410', '86369', '4641', '74481', '66168', '48041', '22597', '14670', '27464', '57165', '20939', '36282', '76940', '73358', '50521', '69603', '8895', '81793', '57743', '81903', '64025', '91641', '25276', '34040', '62642', '64015', '57657', '84890', '73832', '782', '60160', '16998', '40023', '24590', '88613', '76640', '53091', '67600', '80183', '45674', '64464', '25163', '42384', '66972', '13953', '41966', '66048', '15135', '73745', '19466', '53657', '34619', '13462', '15905', '48257', '73297', '238', '93525', '80556', '5942', '5411', '66169', '9090', '95130', '74316', '57321', '48083', '62355', '68113', '15239', '36644', '80326', '65817', '54428', '61955', '58849', '77206', '16073', '98261', '92091', '39178', '35464', '85109', '85452', '21128', '25665', '81860', '44664', '24024', '56960', '95124', '39786', '18836', '11121', '44163', '81074', '79064', '46219', '94694', '44233', '81469', '24642', '15030', '21995', '13587', '40755', '6669', '81093', '74305', '1881', '55649', '37273', '80827', '98643', '46694', '59281', '79231', '42813', '84984', '7052', '98113', '17296', '84434', '31205', '46894', '71219', '74530', '44686', '70744', '91388', '20692', '96853', '73803', '15836', '18126', '49686', '4179', '47588', '87892', '65425', '68012', '97468', '92510', '99271', '58694', '11918', '37051', '18644', '57228', '14265', '57572', '57022', '52186', '30193', '93570', '87872', '5257', '26784', '6476', '61746', '68559', '1720', '26202', '16519', '27688', '10645', '87174', '60845', '73385', '82075', '6933', '98828', '56895', '17344', '84253', '36561', '51648', '24939', '63470', '31034', '95052', '51090', '51465', '87979', '68650', '30181', '29598', '19137', '43221', '81353', '90170', '96985', '61115', '17385', '92314', '80650', '55821', '17874', '84333', '93272', '48260', '87272', '22764', '59957', '51870', '85988', '39222', '77241', '62535', '28344', '6011', '80831', '64551', '46299', '75195', '71177', '8660', '58943', '57003', '3306', '74413', '74068', '15073', '89016', '93140', '13911', '57170', '19880', '41870', '9131', '57495', '73032', '86979', '60094', '87026', '30880', '4736', '86301', '92707', '21689', '83565', '71275', '47665', '65687', '71184', '89897', '32490', '97577', '38723', '79113', '37531', '97500', '94450', '15699', '58019', '84423', '27057', '56017', '97148', '47365', '30669', '33818', '80406', '99690', '33012', '95178', '46809', '48448', '79350', '9146', '99701', '98976', '71197', '44161', '75069', '36602', '79650', '97301', '12020', '56658', '25701', '46392', '78609', '63073', '69419', '57736', '20102', '42415', '79044', '20277', '56280', '47903', '94311', '25558', '40336', '91305', '90505', '66769', '64562', '83737', '62892', '10375', '71024', '19988', '56946', '76110', '21847', '43162', '50578', '46086', '54167', '61722', '53463', '63134', '69288', '12838', '14116', '71687', '50846', '59810', '24826', '84138', '82885', '91496', '98600', '82769', '40049', '4125', '50694', '1294', '2805', '29691', '82321', '76462', '85945', '115', '29188', '66918', '71340', '31585', '61638', '95472', '52978', '50622', '81990', '60955', '70519', '22270', '35610', '95871', '89222', '41038', '52546', '1163', '67943', '1793', '92010', '35755', '74509', '66665', '95759', '8568', '44299', '67822', '5806', '85839', '13895', '87675', '31357', '88014', '40026', '53050', '28951', '31992', '42495', '82892', '51567', '2869', '45808', '20238', '20781', '56098', '66307', '95701', '614', '60833', '3091', '81339', '24195', '65639', '85976', '28116', '66224', '51502', '73637', '13207', '88302', '36488', '65518', '98187', '26', '74367', '64706', '53943', '86760', '25783', '82112', '34958', '86621', '20848', '63459', '14049', '84943', '91873', '50238', '77773', '64109', '8602', '87934', '47583', '66053', '30287', '5507', '80312', '37464', '57457', '86200', '17806', '16522', '38843', '94334', '59958', '63864', '53427', '74506', '33980', '90449', '30842', '53616', '36738', '52', '13595', '53051', '13174', '60163', '71420', '73835', '67119', '79018', '42782', '45059', '952', '46360', '85879', '71552', '84741', '29746', '32577', '10041', '7208', '97528', '51256', '916', '55973', '17684', '99046', '38782', '58660', '97798', '66032', '48339', '51329', '12532', '97904', '95454', '42737', '62541', '96702', '82953', '94610', '26645', '86813', '25480', '99713', '26078', '23028', '93056', '21445', '73209', '89318', '69987', '34705', '30064', '17094', '51135', '54141', '26625', '1086', '13082', '30843', '98672', '56864', '42605', '5833', '60850', '69366', '27351', '16456', '92609', '48030', '54322', '69891', '46502', '34578', '77918', '63276', '75958', '42519', '60266', '85576', '4855', '14258', '67017', '10545', '35078', '53012', '71922', '85784', '73402', '74363', '58457', '94102', '23510', '51559', '39482', '87057', '9377', '10106', '82985', '33931', '16523', '6484', '97749', '83172', '53753', '27466', '23073', '96083', '67302', '57465', '21877', '18013', '99804', '32873', '43123', '72365', '53197', '80578', '69770', '97471', '86954', '67183', '98497', '78474', '28450', '63183', '98699', '42738', '61433', '3491', '27304', '49311', '94980', '92740', '43272', '86549', '11406', '79636', '85582', '38086', '657', '2354', '26567', '77450', '42086', '21600', '49011', '44059', '47872', '75761', '96577', '11642', '83471', '79616', '23749', '77082', '96876', '65302', '84027', '48955', '59887', '20657', '75090', '9058', '50347', '66088', '70745', '76342', '58026', '95568', '61504', '93473', '84590', '47089', '74717', '93090', '46334', '68273', '59500', '54345', '72608', '54048', '86156', '40296', '74046', '6813', '36369', '74543', '18305', '85236', '31316', '37061', '96893', '23112', '5529', '10166', '19037', '1467', '70810', '30932', '18410', '92837', '81324', '12268', '54705', '25207', '90366', '56528', '3392', '88747', '39951', '97957', '99404', '23685', '13533', '15640', '11434', '66516', '71025', '65770', '88000', '52232', '32360', '10787', '37438', '2264', '94460', '80214', '42288', '59062', '29010', '64093', '21225', '22297', '36935', '19202', '5925', '85373', '27414', '28991', '9191', '42273', '56587', '89719', '77191', '64334', '61542', '28763', '28978', '79184', '59815', '95200', '30246', '54022', '287', '91808', '66347', '50833', '15356', '78614',
     '65087', '9664', '67555', '58222', '20787', '72382', '83712', '15858', '72040', '59451', '7428', '47586', '83509', '45969', '28759', '94033', '88618', '46', '1753', '28290', '71934', '99070', '52517', '65865', '15904', '68134', '87595', '39779', '99174', '13366', '50847', '69037', '77911', '19709', '84404', '24370', '18920', '1746', '28059', '4653', '6892', '25496', '48810', '82943', '7069', '44018', '1617', '56497', '27582', '29576', '47883', '8385', '54975', '96245', '77257', '31194', '34512', '19198', '50926', '50886', '91577', '49260', '49604', '58464', '18198', '90887', '15379', '74883', '36644', '63967', '34545', '20539', '12884', '6010', '98636', '94832', '47702', '98318', '6078', '42517', '97030', '93707', '39286', '10245', '66230', '99574', '74563', '81937', '22153', '10659', '67579', '85147', '69686', '32017', '8199', '20027', '64266', '60707', '55426', '22027', '13823', '81404', '86757', '3754', '197', '45469', '68736', '17656', '92453', '6784', '35531', '33538', '27558', '35825', '13471', '16377', '66978', '44601', '69943', '84635', '7335', '67725', '88064', '78201', '64380', '66771', '62221', '60427', '32028', '37857', '5491', '2757', '10537', '2199', '60244', '14726', '29734', '34433', '81241', '39778', '65831', '56153', '81696', '25113', '17371', '79022', '3587', '60439', '96582', '37801', '82496', '68242', '19561', '53140', '17171', '13165', '58750', '80612', '19818', '16753', '70009', '75290', '48846', '89851', '25190', '35525', '84348', '65298', '23161', '60583', '89611', '18798', '85422', '60713', '17660', '41915', '65757', '4781', '48374', '10712', '40330', '2409', '41020', '28042', '51857', '81224', '93917', '90366', '58848', '8012', '92070', '75349', '80066', '83228', '55170', '78376', '94127', '29418', '58660', '74006', '63909', '59502', '63255', '32318', '28904', '26117', '88103', '50656', '58517', '16372', '43392', '77876', '65997', '63501', '45927', '17444', '84021', '54886', '57082', '47456', '73816', '66900', '82958', '49722', '95843', '23458', '4560', '67276', '59080', '81486', '2967', '26133', '87694', '74183', '22100', '45306', '33895', '26512', '71426', '54994', '47367', '10171', '45681', '36268', '3166', '2179', '64197', '90037', '4641', '96073', '72989', '55123', '48825', '2862', '66974', '30115', '41554', '26727', '54025', '69504', '38284', '7816', '36370', '75764', '69774', '43208', '43598', '39461', '21655', '12169', '77790', '44578', '70959', '13500', '40823', '52952', '88095', '82193', '66424', '79814', '25651', '58125', '42724', '11752', '64533', '34827', '72755', '96727', '82066', '60268', '55535', '4230', '73018', '69602', '16912', '66088', '21859', '38654', '38638', '51444', '37999', '18595', '15209', '21801', '21130', '53741', '54954', '91590', '83660', '74071', '82627', '4311', '45268', '94735', '65747', '72428', '22621', '70828', '64394', '647', '23570', '17677', '84377', '63993', '10268', '47426', '72750', '83772', '29090', '73284', '36683', '91143', '64546', '99836', '21999', '61793', '41557', '16714', '20586', '14251', '56633', '46146', '84730', '5445', '8367', '52621', '79252', '89737', '18431', '32134', '86975', '58939', '63385', '8504', '25998', '79549', '70558', '4870', '57604', '48374', '32388', '97871', '75590', '10919', '43825', '82858', '25807', '50366', '2841', '2716', '51315', '79719', '33159', '63382', '11327', '65184', '87243', '17850', '40149', '12171', '48486', '26380', '85432', '35427', '59256', '57601', '29529', '20553', '3006', '69997', '87919', '47626', '96026', '37445', '51735', '89296', '26702', '22837', '61279', '85193', '30624', '10676', '83075', '21477', '54708', '47485', '80297', '86204', '25192', '55197', '81177', '70551', '11003', '7001', '55017', '487', '40926', '99463', '79514', '69697', '52854', '88640', '44464', '66314', '48240', '49787', '81333', '14914', '12919', '51037', '88609', '25572', '61019', '85184', '12051', '61246', '52108', '98895', '24549', '86944', '73303', '9012', '25151', '97424', '43531', '44790', '63034', '86713', '76483', '17499', '86891', '3267', '45091', '39126', '94419', '35750', '35239', '49413', '62381', '92010', '7246', '26997', '47446', '26930', '22668', '43961', '51741', '63058', '41977', '62933', '9197', '94303', '29044', '53755', '22391', '85373', '66572', '74650', '7824', '49712', '40021', '99958', '60404', '37370', '89264', '52343', '90901', '44730', '4252', '5811', '22283', '25102', '86636', '75509', '47088', '62971', '85519', '7495', '16798', '25708', '59258', '89361', '43455', '86768', '29961', '4362', '60956', '81059', '87604', '46241', '98362', '21030', '76182', '83545', '59150', '99333', '68271', '32629', '3364', '96467', '40427', '307', '84267', '239', '11711', '40933', '24518', '33854', '60291', '94179', '5564', '33196', '73818', '22201', '97078', '69360', '94513', '42623', '6510', '67378', '79468', '10394', '96430', '87701', '2667', '64162', '93266', '48941', '55345', '56127', '22704', '8793', '57008', '36920', '80845', '81203', '98715', '84158', '49194', '72718', '52919', '4951', '8715', '82384', '8570', '26733', '62399', '27297', '79038', '57916', '46155', '82381', '1027', '20541', '40580', '44836', '17336', '55548', '87454', '63549', '61401', '88819', '23326', '37546', '49089', '50707', '23099', '20724', '67184', '3394', '95941', '76045', '20523', '30393', '14157', '69381', '94104', '15406', '46707', '36234', '9136', '96805', '4904', '20310', '77164', '15400', '87198', '48310', '59729', '35230', '61503', '42015', '86910', '23264', '23542', '49105', '58334', '52855', '78865', '73516', '43820', '96593', '33168', '26170', '88241', '4016', '79862', '39617', '95329', '57881', '71750', '89690', '22519', '59367', '19825', '12638', '36100', '14355', '79540', '8411', '94571', '80462', '11953', '55629', '14598', '81066', '48968', '74149', '36938', '4564', '59157', '75517', '14309', '64905', '59893', '62803', '6968', '33003', '40894', '48816', '77710', '16692', '19135', '98381', '49397', '24048', '17804', '26829', '24046', '44546', '28174', '2639', '27957', '38625', '85902', '9908', '77666', '14096', '89851', '23600', '20717', '32860', '44070', '67853', '85907', '23761', '789', '73370', '15649', '26472', '9174', '20081', '49415', '97463', '14565', '19834', '94738', '68045', '67542', '3552', '77093', '99071', '16832', '95177', '49571', '85821', '9368', '85170', '58449', '89633', '99302', '94158', '50274', '50223', '51128', '52847', '53598', '47826', '2883', '28192', '84324', '9530', '14385', '37292', '74795', '16821', '5010', '77101', '96596', '72384', '41399', '83046', '37927', '48213', '84574', '55438', '79315', '71005', '45190', '56133', '14016', '92180', '28365', '34307', '90665', '74758', '45080', '38017', '80599', '91174', '47907', '19299', '9707', '92260', '36784', '55855', '25939', '74472', '47402', '12352', '75591', '31459', '76711', '57940', '95535', '55231', '80645', '84613', '90280', '3500', '83695', '42992', '77226', '25326', '8093', '49838', '6457', '44814', '82819', '94986', '81818', '65186', '21378', '49711', '66248', '72391', '65826', '21284', '41399', '72858', '32223', '35915', '45221', '36871', '16193', '2522', '52963', '24506', '98239', '56752', '15192', '8451', '62802', '54777', '67983', '82177', '7303', '71445', '40559', '58655', '73468', '40491', '52864', '81558', '36789', '53134', '38801', '90600', '36385', '90996', '20526', '13627', '62253', '96989', '88864', '11928', '14681', '77082', '95659', '47182', '16085', '26894', '39758', '32803', '26458', '65779', '66110', '38888', '15490', '48120', '90238', '8736', '233', '76851', '86938', '8873', '95387', '33400', '50788', '13568', '43139', '29821', '70427', '21022', '93285', '57243', '51675', '77459', '33170', '81485', '85303', '44133', '203', '44175', '89151', '26705', '32990', '10885', '10208', '58477', '97729', '699', '40581', '8065', '95864', '89797', '47506', '19160', '85728', '58599', '96271', '75849', '30736', '18808', '25828', '52011', '66179', '70244', '81312', '19570', '14287', '61078', '81922', '63361', '80858', '306', '22156', '82923', '53176', '24864', '49193', '2961', '96536', '62449', '13213', '85347', '11442', '76615', '43037', '86122', '99676', '74309', '46017', '16175', '12685', '53550', '19080', '37283', '44921', '34991', '4433', '99561', '38215', '35662', '13892', '7814', '41718', '41231', '85589', '74048', '72169', '26946', '61732', '9135', '39009', '63534', '4114', '40417', '83412', '22562', '65546', '720', '90064', '73027', '50736', '71086', '12445', '3681', '65140', '56291', '47452', '48916', '65136', '53941', '15484', '21038', '47251', '78461', '31031', '4838', '87483', '732', '16111', '68263', '4811', '65979', '44283', '51659', '29997', '11280', '3880', '12399', '63450', '93862', '50981', '62790', '76784', '76696', '40906', '49261', '35863', '43747', '65954', '36125', '73713', '98678', '13409', '38773', '59417', '9763', '429', '66203', '7350', '32754', '36079', '72447', '63925', '12958', '65292', '80270', '78432', '50925', '74946', '7649', '13689', '68001', '52318', '5804', '51584', '63637', '85697', '50929', '25279', '20963', '83038', '31199', '64189', '17152', '20459', '66108', '66005', '53159', '53971', '32528', '77145', '52981', '88941', '68593', '86343', '97770', '25625', '17598', '55249', '89640', '94162', '65874', '36511', '21906', '70401', '30914', '24085', '42945', '55597', '78393', '98120', '38283', '44967', '76077', '45739', '92432', '11846', '59131', '26322', '82651', '94792', '37726', '23301', '11275', '98813', '34229', '65440', '51369', '55580', '35207', '84314', '35696', '50231', '9399', '18679', '27219', '22519', '26725', '63451', '79357', '55915', '77027', '30354', '45890', '10745', '60035', '7914', '43562', '12219', '30220', '29382', '72520', '87475', '83634', '15163', '32468', '72904', '18200', '84666', '43560', '58483', '64613', '52170', '55490', '45954', '99323', '26401', '61210', '10450', '70360', '42906', '32851', '70022', '49966', '62331', '84249', '98093', '62146', '88171', '73246', '48314', '45730', '56348', '59081', '16642', '57872', '81564', '32305', '4158', '47263',
@@ -39,6 +39,30 @@
     '37674', '44977', '54370', '97381', '60218', '2423', '99591', '69913', '26507', '19708', '6279', '58955', '20126', '1495', '57894', '7638', '38700', '77148', '36844', '7539', '91452', '6914', '74349', '66850', '49104', '6516', '58535', '20851', '27859', '32881', '72919', '28203', '32882', '2419', '77583', '63822', '37703', '66793', '65784', '62281', '55867', '70703', '89344', '1498', '33770', '87176', '95636', '64891', '90736', '95521', '10989', '5237', '99010', '21106', '11422', '1831', '67239', '52557', '36468', '71713', '39637', '49574', '50455', '14953', '96900', '70852', '96982', '4341', '44585', '95651', '79669', '29652', '87294', '74692', '16221', '768', '35380', '21352', '50907', '27259', '11718', '5017', '55964', '94137', '52347', '10595', '12968', '85602', '97965', '18836', '90511', '70960', '97336', '44575', '23791', '42195', '64776', '29363', '42379', '1805', '28919', '6772', '78143', '54797', '27362', '56149', '59048', '38567', '6339', '27787', '42167', '45990', '95532', '54839', '26572', '38496', '89797', '6634', '16468', '24898', '66814', '98126', '31762', '36133', '64539', '43167', '87022', '61295', '30364', '89249', '25756', '63570', '91484', '10564', '79648', '5756', '41376', '61897', '40388', '88927', '62891', '79708', '25495', '22204', '33892', '36871', '19879', '58646', '57061', '73100', '75831', '20029', '67462', '54675', '7766', '2409', '24506', '7877', '11720', '86252', '9897', '8080', '70684', '74497', '2242', '24604', '31969', '83999', '56635', '5283', '64971', '79152', '27470', '89042', '22835', '21476', '50292', '56081', '96342', '32763', '84487', '64856', '79152', '64656', '72169', '69971', '93094', '52804', '80917', '53152', '56016', '28496', '79110', '17133', '12581', '91742', '78929', '2676', '46700', '59528', '93808', '4535', '54035', '40161', '62796', '3598', '97088', '13599', '36337', '73395', '17494', '86275', '62058', '61937', '87747', '94883', '90677', '88544', '72553', '50210', '75481', '64378', '74464', '21659', '30970', '71989', '84846', '72289', '88716', '39143', '8487', '4912', '91013', '18623', '19122', '36507', '76438', '7516', '67970', '72350', '69873', '33635', '55983', '69008', '49545', '3134', '60056', '52509', '63304', '15560', '23651', '81090', '7027', '8317', '33060', '37295', '51961', '53037', '97431', '40512', '23536', '25168', '78455', '85613', '12304', '40733', '99890', '51238', '55439', '96201', '73559', '92533', '90173', '16721', '6078', '29854', '38894', '31117', '63040', '86795', '81786', '21149', '38998', '61811', '48622', '73019', '59296', '13576', '92559', '36300', '77294', '26794', '50912', '98380', '13176', '57746', '75286', '15330', '40921', '7337', '4664', '20384', '4674', '44516', '27633', '31950', '88210', '54536', '9839', '80137', '77491', '18434', '45152', '96942', '41005', '76103', '34825', '86869', '14772', '13384', '21051', '37348', '34434', '97210', '54960', '26598', '60981', '41889', '6446', '64492', '95310', '86236', '81885', '35684', '16539', '98476', '32028', '96470', '6318', '99576', '93935', '48609', '86090', '2476', '65576', '80636', '44817', '99646', '98963', '20486', '26261', '27334', '72946', '82023', '33506', '80193', '13762', '98133', '21134', '33268', '63477', '74609', '30454', '51477', '93391', '96805', '68653', '2714', '63642', '51520', '22972', '13305', '96058', '42336', '74461', '31597', '12050', '81712', '37977', '25718', '4834', '56608', '75731', '406', '28585', '63924', '23702', '29849', '16941', '91921', '65842', '76525', '68534', '50902', '17609', '23852', '53703', '31286', '58526', '9633', '87596', '10654', '2085', '52766', '22135', '76524', '32295', '90072', '70078', '77786', '93741', '87320', '70309', '44024', '95286', '12361', '29682', '59766', '26685', '90686', '81691', '49704', '23431', '53955', '39023', '47261', '1530', '58265', '80065', '95620', '90621', '63760', '90676', '81653', '36397', '20252', '81754', '20256', '67098', '7838', '49408', '88400', '87941', '84533', '6570', '22567', '18850', '55472', '40129', '48425', '23497', '39308', '34698', '53092', '89480', '47785', '57282', '25508', '19006', '50604', '86917', '9436', '88921', '3168', '70537', '3185', '34988', '5462', '69482', '45768', '91955', '56898', '15307', '99731', '89292', '19356', '20646', '66712', '7281', '12856', '31174', '19577', '8726', '62971', '33008', '37118', '59055', '84101', '68445', '91957', '47526', '15627', '79914', '20013', '26147', '80821', '56372', '74205', '28531', '25352', '51775', '93948', '55212', '17863', '91521', '74911', '88160', '2360', '98260', '18294', '62402', '84268', '9580', '42668', '1467', '40059', '5221', '4216', '9917', '35420', '16496', '34369', '50253', '95234', '95114', '84193', '28322', '37031', '81284', '88628', '36782', '42572', '73347', '66188', '43342', '77285', '16513', '89064', '63066', '72645', '67075', '48208', '18181', '77898', '65795', '53707', '39856', '92883', '92567', '49733', '30236', '10273', '53029', '69773', '78379', '72108', '47696', '97557', '95184', '14688', '29853', '62694', '70431', '88435', '58799', '21883', '99866', '69178', '55870', '14414', '85274', '27321', '55555', '613', '15067', '88217', '73655', '99548', '13631', '78789', '36690', '7952', '60830', '77438', '40059', '95602', '43097', '3429', '93731', '90537', '2932', '35702', '16125', '6652', '39632', '39349', '9910', '38103', '78608', '73565', '48556', '28978', '7128', '82326', '53980', '28059', '28212', '87101', '77752', '99170', '56753', '30484', '71470', '32607', '24674', '32687', '25098', '94712', '64024', '48239', '90408', '17316', '99243', '3656', '67402', '48009', '98427', '52800', '56024', '4417', '89747', '93338', '18758', '56411', '44810', '82456', '30808', '75470', '67115', '66876', '53906', '78403', '56059', '34383', '60056', '89136', '7237', '11129', '21351', '78662', '43606', '37454', '45465', '9292', '38099', '81699', '50195', '49368', '47503', '44605', '6523', '81478', '37910', '397', '20256', '6835', '2787', '80383', '4241', '65986', '83870', '21205', '10879', '26593', '44357', '72604', '56131', '43423', '80206', '26240', '87198', '99445', '53504', '10632', '2465', '31793', '89575', '64184', '39988', '60049', '87100', '37151', '61585', '82180', '52065', '72519', '72935', '3201', '5862', '20560', '95339', '21661', '17533', '17182', '71189', '91564', '57999', '35490', '94773', '95056', '51583', '59394', '10727', '8655', '48123', '10701', '25314', '20100', '6533', '46435', '43188', '23001', '23018', '76637', '32018', '36603', '18701', '9550', '61550', '47541', '36500', '67507', '81574', '95490', '69169', '32584', '30045', '64699', '83539', '89396', '42517', '61979', '41528', '8271', '88377', '61423', '1158', '89724', '70789', '14886', '64823', '56675', '97747', '23990', '58495', '82064', '17062', '90258', '86854', '93304', '12925', '49975', '45074', '87155', '72223', '67344', '42733', '42516', '40110', '15444', '88285', '39371', '23198', '61544', '90205', '6192', '15718', '19803', '92712', '20081', '31397', '5555', '70463', '19521', '80401', '74097', '32060', '26495', '20507', '40473', '1449', '57215', '46142', '39303', '50359', '35898', '46908', '90752', '7823', '27416', '73770', '98790', '17907', '29999', '76417', '49926', '76752', '21608', '26524', '88209', '6000', '88897', '19541', '41451', '59538', '56560', '1456', '67828', '82407', '45722', '93344', '54279', '78594', '38354', '93807', '10929', '91560', '60681', '70615', '32527', '10108', '48303', '63134', '28500', '18257', '57081', '24801', '99077', '52197', '15390', '52300', '57116', '417', '7503', '20054', '75315', '81359', '69091', '18853', '2465', '25600', '13522', '74575', '12661', '83071', '15191', '27543', '21730', '60853', '18961', '14773', '89185', '33694', '51143', '1449', '68831', '78062', '65173', '32697', '41674', '9429', '22156', '96022', '46305', '97534', '5685', '48870', '89988', '20686', '66705', '6865', '94250', '16872', '13178', '7420', '73531', '92723', '60620', '48843', '74207', '60016', '50943', '62699', '63507', '76537', '87066', '76922', '24711', '34809', '5021', '31293', '53854', '77607', '52322', '10934', '50284', '87804', '36730', '86946', '80749', '43325', '97958', '7362', '39582', '10042', '42053', '66236', '69931', '23463', '87996', '33563', '4468', '32905', '50815', '79478', '28658', '46018', '23186', '26080', '13494', '6237', '42762', '86440', '77407', '10426', '62902', '73251', '36861', '92357', '98754', '1839', '46391', '11420', '27132', '93028', '39609', '42015', '68218', '54228', '5456', '38705', '64307', '49483', '878', '54360', '54480', '66684', '55089', '4537', '82073', '72602', '96238', '56708', '58625', '32991', '74205', '72868', '79086', '64250', '56376', '10621', '76607', '47706', '72760', '70303', '60715', '14644', '44186', '36264', '29489', '14184', '62699', '30567', '16700', '31222', '15650', '1500', '22950', '54628', '41004', '96094', '70028', '74178', '65328', '26605', '63076', '75271', '79285', '8151', '42101', '56362', '25961', '87864', '972', '29510', '2747', '8877', '9780', '61052', '84105', '15573', '27475', '44570', '25334', '18517', '44237', '84094', '67524', '76761', '65678', '79284', '2462', '42631', '22696', '19223', '29728', '67742', '11883', '59027', '12377', '80538', '2165', '17377', '15030', '49838', '23920', '26025', '68179', '75894', '43783', '97106', '75558', '35528', '52081', '16951', '68855', '402', '21459', '97550', '16948', '5369', '4641', '2663', '15233', '79974', '71093', '15234', '42690', '22322', '54282', '95845', '90010', '40530', '88298', '41885', '7079', '6098', '72786', '36603', '77378', '48393', '45723', '41996', '96025', '89297', '75586', '8422', '24360', '170', '46036', '46725', '67944', '74029', '73069', '45371', '99916', '71085', '42608', '89904', '6393', '51274', '42729', '58924', '82497', '64143', '88622', '18818', '89041', '56090', '21369', '78224', '90450', '45488', '58830', '4133', '98062', '81113', '11285', '51457', '3183', '38800', '65278', '42169', '28602', '52648', '44683', '75647', '11778', '32151', '33528', '23773', '68268', '23367', '70964', '23548',
     '35575', '67570', '77681', '74158', '25374', '62714', '43100', '4977', '51678', '83460', '29755', '15890', '64626', '54044', '14793', '64339', '94008', '97126', '49202', '33889', '12601', '12275', '56123', '94557', '68226', '67200', '9374', '70687', '29211', '8039', '14598', '74548', '37433', '98991', '29933', '37203', '23973', '96482', '64774', '58350', '61781', '31824', '57193', '26476', '21814', '32297', '32627', '44277', '33876', '55468', '81715', '82505', '61462', '20324', '84293', '40116', '51087', '43594', '6854', '59077', '39841', '26023', '22777', '66859', '82460', '89515', '41712', '33711', '71875', '10685', '12655', '50138', '31063', '37040', '95819', '38919', '27391', '29833', '34350', '65646', '7697', '2688', '41146', '13241', '50305', '86568', '24487', '78741', '96370', '21015', '31719', '39750', '25014', '72415', '8486', '90668', '51143', '49488', '21057', '92803', '53528', '39550', '76039', '44185', '32404', '30217', '19796', '38084', '49161', '80140', '20241', '39357', '68908', '93083', '77231', '6952', '36322', '50790', '623', '29730', '13616', '57546', '17434', '93811', '35148', '81419', '40250', '40329', '89126', '72402', '16053', '27107', '28919', '16829', '96582', '65057', '28416', '30801', '77742', '27420', '73118', '89352', '54706', '23035', '88413', '64608', '61930', '15037', '47327', '59596', '18700', '57576', '63628', '56823', '60091', '68209', '21001', '14962', '72257', '83802', '33721', '86343', '11133', '65737', '68477', '90725', '86869', '98403', '47393', '25356', '61372', '8873', '19888', '48836', '66005', '23531', '72520', '26461', '78508', '28213', '96394', '22983', '37856', '71814', '27425', '72753', '27511', '65471', '38592', '3683', '24652', '64505', '92543', '53201', '40639', '99542', '53425', '35321', '47669', '14134', '47727', '48202', '71931', '32119', '50086', '50266', '67159', '89317', '81905', '30315', '49154', '8690', '69365', '56881', '46473', '64100', '38365', '59377', '65630', '54871', '52745', '91536', '16106', '70066', '62063', '84530', '88103', '33599', '51063', '87299', '41880', '25335', '51252', '42788', '13568', '1721', '62424', '83308', '36787', '91536', '92555', '27600', '24030', '12267', '66336', '30242', '7183', '67624', '28471', '48593', '79766', '31178', '47818', '94522', '88855', '45262', '43670', '18065', '25062', '44558', '37189', '69225', '35216', '42683', '26289', '72816', '31947', '65871', '45715', '59452', '22014', '56669', '60331', '33450', '60601', '95047', '30789', '90107', '81565', '32266', '3252', '5446', '58756', '55370', '34034', '81071', '2560', '39054', '39564', '15010', '5389', '60002', '53320', '49545', '48444', '31415', '39278', '79879', '30148', '10186', '60358', '29011', '14419', '95159', '94815', '55251', '90910', '80582', '92304', '11697', '60061', '38577', '84439', '76196', '34542', '50963', '36294', '11123', '59763', '29873', '47383', '12979', '22119', '21723', '64725', '48377', '77132', '9817', '79920', '47653', '60069', '12924', '53808', '55962', '66969', '13757', '60615', '10994', '9138', '34119', '58436', '64407', '75170', '73524', '51864', '94183', '86847', '15585', '57616', '96267', '5340', '52929', '49096', '50291', '5559', '32382', '84077', '6598', '87921', '59719', '31726', '44772', '63373', '75420', '66829', '47275', '98264', '61387', '94945', '44540', '50098', '13078', '44729', '95332', '63555', '30782', '63203', '15071', '60996', '72812', '17418', '80215', '37610', '30670', '44674', '74822', '15471', '25236', '16266', '76213', '35820', '19567', '8715', '72003', '90606', '1434', '53545', '88170', '75014', '62287', '35436', '38669', '12927', '83877', '38622', '28313', '82884', '73969', '38671', '10450', '24158', '22941', '73162', '86548', '42482', '95315', '92016', '96156', '44012', '35962', '6366', '3881', '74300', '26248', '30182', '19164', '67105', '66771', '52587', '69894', '61820', '16551', '50743', '10096', '69030', '24451', '89165', '23929', '96291', '30685', '64413', '19913', '9049', '71383', '61684', '45384', '45927', '81840', '49521', '89594', '30055', '83430', '14930', '60316', '86585', '99375', '80170', '14207', '19584', '20067', '82874', '30159', '46647', '6942', '66777', '32638', '55662', '75470', '77622', '26893', '96149', '14373', '33252', '50574', '7945', '20696', '56662', '94348', '3384', '20956', '89668', '99052', '65131', '56847', '17589', '16419', '2670', '10705', '59587', '92902', '92424', '48570', '11034', '69149', '35733', '17315', '84966', '69353', '69590', '52834', '32561', '6049', '50156', '71676', '76423', '32361', '61509', '8845', '75709', '35956', '21912', '31188', '59083', '43459', '38614', '92206', '55645', '38737', '34193', '6451', '94163', '24326', '49976', '71600', '58024', '67160', '4365', '38270', '59558', '80834', '60739', '54318', '19738', '42196', '43191', '13463', '88914', '99239', '66869', '75691', '33085', '4323', '7170', '46184', '41423', '89835', '46877', '20349', '14365', '32727', '35322', '841', '23597', '43370', '57527', '73250', '32553', '71489', '44617', '98323', '37672', '59549', '96023', '63176', '13524', '15621', '30448', '28136', '45549', '3513', '64153', '19839', '24219', '41987', '51083', '90268', '52052', '31430', '4727', '99409', '43595', '82374', '61251', '51470', '66562', '98724', '23529', '53895', '67562', '87573', '89964', '30821', '15733', '33062', '86963', '33450', '75338', '32570', '14453', '38080', '36335', '84226', '52790', '42883', '61156', '42789', '57846', '60096', '29946', '80178', '15882', '1971', '60722', '62458', '8754', '59991', '89321', '584', '70565', '36458', '21226', '23561', '9837', '39364', '23065', '30675', '9306', '40085', '52082', '89976', '73283', '77851', '36174', '54470', '63250', '72111', '70853', '26723', '42590', '91230', '47512', '13983', '70898', '70927', '40721', '30642', '41628', '90010', '27306', '1933', '43304', '44499', '87890', '22201', '89249', '63935', '48438', '58588', '1061', '70061', '63075', '9676', '65820', '82156', '82668', '111', '54350', '10328', '23466', '98936', '18285', '53919', '32422', '84859', '58387', '24022', '32423', '6010', '56417', '49452', '69999', '14885', '47102', '59577', '24999', '75984', '96464', '59088', '85987', '71442', '88789', '4753', '8229', '76883', '15284', '90610', '40507', '78882', '55575', '25315', '7214', '70602', '4796', '35767', '54657', '42153', '16050', '93607', '99249', '77236', '59949', '52871', '47837', '33534', '30023', '89137', '99938', '35824', '50775', '30282', '82798', '53312', '65277', '68375', '91445', '58166', '43344', '6589', '82515', '34632', '78588', '152', '67554', '15877', '74334', '32783', '45147', '39483', '92067', '59029', '38298', '55229', '28268', '85140', '33451', '15424', '46695', '23201', '83329', '28372', '19518', '89198', '33305', '43892', '470', '37662', '9407', '14376', '80310', '21459', '72381', '80414', '88305', '69073', '63101', '91054', '47190', '48595', '24696', '41426', '35133', '94399', '21790', '55040', '73279', '20809', '67805', '94115', '58633', '78053', '89444', '4112', '8', '34517', '22106', '85934', '86814', '53333', '93437', '85062', '32791', '72744', '99843', '51161', '22730', '34908', '82918', '92566', '22467', '41226', '98518', '29235', '94042', '84371', '79100', '25214', '7764', '59427', '47891', '61092', '23775', '13641', '30837', '77377', '43032', '38441', '29462', '20300', '19070', '20982', '73987', '87836', '68062', '6419', '51563', '40084', '85694', '86677', '47142', '27222', '17844', '19158', '45120', '88524', '74724', '73229', '42470', '38751', '1132', '28603', '61188', '55021', '88825', '58005', '62411', '8843', '94852', '93664', '39253', '27473', '247', '43824', '1804', '8905', '11509', '95659', '7811', '80691', '15779', '49794', '8991', '76099', '29223', '36060', '85399', '41369', '22885', '38473', '22376', '50446', '89578', '25818', '61333', '78787', '47605', '83654', '99068', '52120', '48367', '86381', '19803', '72600', '31998', '37755', '88031', '83969', '42319', '27974', '35780', '93662', '46808', '60529', '15491', '10447', '48829', '33886', '68333', '44855', '86554', '64794', '66376', '58222', '14021', '52043', '56375', '1300', '38105', '89159', '97456', '26800', '93124', '3673', '32279', '30658', '84475', '3708', '93952', '39245', '91980', '55333', '79440', '64407', '46559', '60759', '10688', '49872', '45810', '87405', '66932', '56530', '57751', '9619', '27361', '6356', '65848', '7524', '20273', '22362', '20504', '28042', '39475', '51677', '85733', '32426', '54558', '17222', '56485', '34928', '90917', '70528', '51732', '61014', '98420', '67265', '41383', '3883', '47642', '53324', '93679', '93088', '57534', '44449', '46779', '81482', '54279', '80135', '11216', '92545', '18426', '96005', '57801', '21898', '5104', '83467', '72015', '43783', '89674', '57468', '96686', '95167', '38507', '95187', '64923', '71214', '42834', '93219', '47342', '24476', '84834', '29080', '86533', '30687', '68400', '26933', '37396', '65169', '89767', '20642', '53843', '85167', '77306', '46723', '68501', '4243', '35044', '15950', '40388', '53630', '76125', '10816', '83285', '4120', '11402', '91344', '95169')</query>
 
+    <!-- The same as above, but IN array -->
+    <query short="1">SELECT rand() IN [41577, 83972, 51697, 50014, 37553, 93459, 87438, 95971, 83186, 74326, 67871, 50406, 83678, 29655, 18580, 83905, 61518, 29059, 56700, 82787, 98672, 30884, 81822, 39850, 80852, 57627, 91346, 64522, 17781, 49467, 41099, 41929, 85618, 91389, 68564, 91769, 81219, 52218, 37220, 97097, 2129, 9886, 52049, 34847, 25364, 36429, 76897, 71868, 58121, 71199, 84819, 69991, 34046, 64507, 34892, 24228, 36986, 28588, 51159, 53444, 80531, 9941, 20256, 48103, 32565, 62890, 5379, 60302, 46434, 3205, 18821, 31030, 19794, 71557, 71703, 15024, 14004, 82164, 95659, 40227, 83358, 24395, 9610, 19814, 48491, 66412, 16012, 71586, 42143, 51103, 24463, 89949, 35694, 39193, 63904, 40489, 77144, 94014, 84836, 9980, 46554, 43905, 25588, 25205, 72624, 10249, 35888, 98478, 99030, 26834, 31, 81499, 14847, 82997, 92357, 92893, 17426, 56630, 22252, 68119, 62710, 8740, 82144, 79916, 23391, 30192, 99271, 96435, 44237, 98327, 69481, 16691, 13643, 84554, 38571, 70926, 99283, 79000, 20926, 86495, 4834, 1222, 39486, 57697, 58002, 40790, 15623, 3999, 31515, 12694, 26143, 35951, 54085, 97534, 35329, 73535, 88715, 29572, 75799, 45166, 32066, 48023, 69523, 93150, 8740, 96790, 15534, 63252, 5142, 67045, 93992, 16663, 292, 63924, 6588, 12190, 31506, 69590, 35394, 55168, 65223, 79183, 32600, 69676, 28316, 72111, 53531, 15073, 41127, 73451, 24725, 61647, 65315, 41143, 26493, 95608, 34407, 76098, 53105, 83691, 48755, 35696, 62587, 81826, 3963, 45766, 82751, 12430, 97685, 29919, 78155, 71636, 50215, 89734, 9892, 47151, 54855, 3428, 9712, 52592, 2403, 79602, 81243, 79859, 57361, 82000, 42107, 28860, 99591, 28296, 57337, 64969, 32332, 25535, 30924, 21313, 32554, 17342, 87311, 19825, 24898, 61323, 83209, 79322, 79009, 50746, 33396, 62033, 16548, 17427, 24073, 34640, 52368, 4724, 80408, 40, 33787, 16666, 19665, 86751, 27264, 2241, 88134, 53566, 10589, 79711, 92823, 58972, 91767, 60885, 51659, 7867, 96849, 30360, 20914, 9584, 1250, 22871, 23282, 99312, 4683, 33429, 68361, 82614, 81440, 47863, 69790, 11968, 75210, 66854, 37002, 61142, 71514, 1588, 42336, 11069, 26291, 2261, 71056, 13492, 9133, 91216, 72207, 71586, 86535, 83898, 24392, 45384, 48545, 61972, 503, 80180, 35834, 97025, 70411, 55039, 35430, 27631, 82533, 96831, 74077, 42533, 14451, 26943, 53783, 69489, 71969, 8432, 37230, 61348, 19472, 59115, 9886, 50951, 57109, 7141, 1902, 84130, 4323, 55889, 47784, 2220, 75988, 66988, 63721, 8131, 95601, 95207, 2311, 26541, 50991, 6717, 2969, 71857, 51034, 65958, 94716, 90275, 21012, 46859, 7984, 31131, 46457, 69578, 44540, 7294, 80117, 9925, 60155, 90608, 82684, 32193, 87071, 28006, 87604, 24501, 79087, 2848, 29237, 11221, 81319, 40966, 87641, 35325, 78705, 88636, 78717, 62831, 56390, 99271, 43821, 14453, 17923, 62695, 77322, 21038, 67677, 41271, 4376, 65426, 46091, 19887, 97251, 55583, 58763, 3826, 35037, 73533, 64267, 82319, 9836, 42622, 96829, 16363, 10455, 49290, 99992, 98229, 66356, 59087, 73998, 25986, 4279, 56790, 69540, 588, 36620, 60358, 45056, 89297, 42740, 8323, 19245, 82417, 41431, 699, 11554, 73910, 44491, 56019, 68901, 45816, 68126, 89379, 23885, 13263, 56395, 73130, 19089, 23771, 10335, 48547, 16903, 6453, 33560, 89668, 38159, 43177, 90655, 49712, 62, 66920, 34180, 12150, 48564, 39538, 85026, 87195, 14928, 8956, 71157, 53287, 39161, 67583, 83309, 92054, 86977, 56188, 15229, 88170, 60894, 58497, 89254, 40082, 86890, 60161, 97291, 45878, 23368, 14577, 92870, 37017, 97356, 99426, 76061, 89186, 99751, 85153, 61580, 39360, 90107, 25603, 26798, 76224, 6469, 7912, 69838, 16404, 67497, 28965, 80836, 80365, 91249, 48713, 17113, 33090, 40793, 70450, 66689, 83698, 17802, 43869, 13355, 18959, 79411, 87930, 9265, 37504, 44876, 97234, 94149, 35040, 22049, 49248, 6535, 36080, 28346, 94437, 78319, 17961, 89056, 56161, 35810, 41632, 45494, 53351, 89729, 99510, 51584, 59688, 6193, 70809, 51093, 92589, 90247, 34910, 78235, 17362, 49423, 63324, 525, 37638, 72325, 89356, 15298, 59116, 17848, 65429, 27029, 84781, 70247, 8825, 35082, 70451, 22522, 58125, 91879, 90531, 2478, 463, 37902, 54405, 87267, 72688, 22803, 33134, 35177, 84551, 44974, 88375, 76407, 27774, 33849, 19915, 82014, 80434, 26380, 48777, 53811, 14838, 26829, 56441, 99869, 49574, 85476, 19723, 16907, 4018, 37338, 78510, 47912, 13030, 65277, 95716, 67363, 21393, 89887, 78842, 81650, 903, 17436, 30704, 49223, 27198, 25500, 52214, 54258, 70082, 53950, 49312, 43615, 99473, 94348, 53661, 96213, 96346, 62010, 38268, 32861, 75660, 10392, 89491, 68335, 29817, 88706, 24184, 36298, 43440, 21626, 26535, 44560, 46363, 12534, 99070, 95606, 33714, 73070, 8303, 29853, 23014, 99982, 4530, 14955, 45803, 50, 90750, 30394, 81276, 95563, 47314, 58520, 91299, 88944, 54402, 67405, 29253, 47079, 71734, 99728, 17652, 13307, 35556, 18962, 26780, 17771, 53712, 60055, 37628, 35830, 90739, 61151, 41309, 27652, 3051, 53167, 98417, 19382, 36833, 75085, 65374, 87732, 30352, 31776, 32765, 97565, 92199, 49050, 29503, 51024, 18834, 8515, 24069, 96216, 10777, 90680, 18974, 68884, 85305, 36007, 56707, 4212, 47352, 34426, 13185, 92939, 95782, 70577, 58080, 98279, 3906, 5065, 56896, 16382, 31273, 17117, 98602, 12786, 24086, 63970, 72756, 35798, 82367, 7356, 53398, 68503, 2962, 16425, 67334, 68461, 65439, 15620, 70906, 29649, 46461, 74602, 38012, 71714, 16825, 89480, 53386, 88532, 35104, 28556, 82120, 23155, 23347, 24797, 60061, 54962, 99427, 82248, 82447, 39968, 63727, 27431, 81511, 91168, 71425, 80740, 84127, 40717, 15503, 15419, 46594, 61263, 19212, 53175, 70724, 74445, 23034, 71818, 40246, 18886, 53066, 4880, 83701, 86107, 87862, 44751, 392, 73440, 90291, 93395, 20894, 38463, 32664, 55158, 20090, 50004, 79070, 98471, 85478, 96615, 68149, 78334, 97752, 73207, 71678, 91238, 96757, 82598, 194, 35797, 45120, 60782, 28721, 17676, 78066, 60957, 11826, 51563, 50516, 16485, 47053, 31738, 48923, 23554, 96850, 42033, 73701, 78607, 45979, 54571, 12415, 31693, 15356, 36902, 9126, 3767, 3295, 90402, 24005, 95350, 67033, 49137, 72606, 51899, 17522, 31957, 44641, 53982, 23767, 68257, 15766, 19995, 2107, 48788, 11765, 91055, 46576, 54651, 50381, 62827, 73636, 46606, 98753, 37631, 70441, 87916, 66983, 33870, 31125, 12904, 57040, 4874, 58632, 42037, 18782, 5998, 18974, 57949, 81010, 90407, 99874, 20462, 89949, 10952, 71454, 95130, 46115, 3518, 13384, 69039, 79482, 22076, 59782, 32042, 40930, 60243, 29298, 6790, 46985, 44398, 85631, 14380, 66179, 2629, 32126, 49833, 14118, 58492, 31493, 81172, 96638, 8745, 89663, 76842, 78633, 41373, 83721, 42886, 11123, 32739, 11051, 1303, 92314, 83324, 85600, 44276, 69064, 56125, 84650, 31028, 12628, 14502, 64764, 39405, 44855, 79046, 51716, 46824, 83389, 1941, 1257, 9280, 73176, 84729, 2579, 63366, 22606, 35541, 51096, 13447, 18355, 68037, 28436, 94116, 81070, 78355, 67897, 5296, 32742, 77645, 91853, 18767, 67949, 40963, 5792, 17278, 25597, 41884, 80829, 7099, 18645, 60295, 12082, 81800, 78415, 18082, 38789, 16295, 72377, 74949, 55583, 66853, 15402, 72977, 15123, 99434, 34999, 21687, 76049, 42987, 83748, 88256, 66688, 21766, 20304, 29271, 10069, 19822, 11792, 42526, 74143, 17289, 30253, 6367, 20888, 12975, 94073, 98639, 30134, 26320, 65507, 69002, 53120, 4550, 38893, 18954, 38283, 54863, 17698, 99670, 10521, 92467, 60994, 18052, 48673, 35811, 87282, 62706, 16061, 53112, 22652, 37780, 55662, 26331, 49410, 79074, 10623, 69577, 79613, 9491, 31229, 43922, 84231, 58409, 36386, 46875, 74431, 76735, 38776, 23350, 7314, 9079, 51519, 98544, 70216, 63380, 90381, 1295, 46901, 58225, 55339, 89918, 75522, 35431, 89460, 49552, 89302, 23068, 28493, 3042, 25194, 59520, 9810, 95706, 81297, 89638, 54794, 94527, 45262, 97932, 78685, 6947, 22818, 48700, 9153, 12289, 22011, 58825, 93854, 65438, 4509, 33741, 28208, 69061, 48578, 40247, 77725, 31837, 39003, 69363, 78113, 76398, 97262, 67795,
+    68446, 58896, 60969, 19849, 6722, 91854, 49519, 13949, 67109, 48824, 31723, 75554, 69575, 94986, 75350, 18628, 15284, 41943, 15433, 52607, 41, 22340, 29528, 24059, 34145, 72517, 46316, 10667, 54510, 19882, 47764, 69124, 41963, 84350, 48420, 4646, 24958, 69020, 97121, 26178, 62664, 50622, 32554, 49655, 45398, 11267, 72222, 73363, 89554, 89046, 57384, 29259, 37888, 24850, 74353, 57343, 34762, 2900, 11393, 42154, 94306, 70552, 75265, 921, 26003, 64352, 89857, 83171, 58249, 48940, 53512, 66335, 44865, 68729, 19299, 58003, 39854, 99122, 3860, 80173, 52242, 90966, 53183, 71982, 82325, 87842, 15000, 55627, 71132, 6354, 42402, 91719, 91644, 94533, 74925, 66278, 66911, 85576, 40495, 70919, 71797, 87835, 29845, 71832, 3390, 7994, 33499, 70715, 54897, 82710, 63077, 78105, 24758, 89585, 84607, 46477, 78618, 10989, 39222, 98749, 51685, 94664, 31008, 32823, 89521, 72160, 26952, 4001, 21421, 5737, 74027, 88179, 45553, 83743, 19913, 49435, 65616, 82641, 5149, 76959, 40681, 73023, 2670, 30845, 18863, 35094, 88400, 80963, 9154, 16571, 64192, 59694, 41317, 59942, 58856, 99281, 67260, 66971, 22716, 76089, 58047, 67071, 53707, 462, 52518, 72277, 10681, 69, 98855, 12593, 88842, 67242, 73543, 37439, 18413, 67211, 93495, 45576, 70614, 27988, 53210, 18618, 21318, 68059, 25518, 55917, 56522, 16548, 2404, 93538, 61452, 66358, 3709, 23914, 92426, 81439, 38070, 28988, 29939, 2948, 85720, 45628, 51101, 89431, 86365, 17571, 50987, 83849, 11015, 83812, 66187, 26362, 66786, 22024, 93866, 36161, 90080, 64874, 37294, 83860, 73821, 80279, 36766, 73117, 44620, 84556, 42070, 90383, 27862, 20665, 67576, 34997, 57958, 80638, 84351, 63961, 1362, 14338, 80377, 24192, 41294, 57368, 51189, 27287, 45764, 86289, 65600, 708, 84090, 96005, 55676, 84855, 72385, 70018, 9336, 82701, 3710, 52083, 74045, 96454, 30956, 67369, 78941, 81810, 71906, 23194, 33042, 50794, 61256, 24449, 48639, 22916, 78303, 13666, 40762, 43942, 51075, 89783, 95786, 90462, 6181, 36482, 40675, 4970, 6388, 91849, 72579, 94983, 86084, 20140, 68427, 48123, 43122, 98066, 37560, 6927, 72803, 5546, 62259, 98439, 6457, 98568, 70499, 33022, 28226, 29675, 20917, 75365, 20900, 8190, 56736, 99153, 77779, 49333, 50293, 97650, 4067, 47278, 42761, 71875, 13966, 11223, 46783, 18059, 61355, 29638, 75681, 24466, 89634, 20759, 83252, 37780, 15931, 74893, 6703, 64524, 80656, 85990, 78427, 18411, 20696, 86432, 93176, 69889, 15072, 15180, 9935, 10467, 60248, 42430, 62590, 89596, 27743, 26398, 79912, 60048, 50943, 38870, 69383, 72261, 98059, 55242, 74905, 5667, 54321, 70415, 39903, 49711, 85318, 79979, 59262, 82321, 15263, 17416, 74554, 94733, 72112, 49872, 54849, 73883, 78250, 74935, 68559, 57564, 50541, 45730, 41595, 5588, 83723, 42891, 11898, 14348, 99732, 14481, 85233, 21277, 94508, 52551, 74187, 7634, 42912, 25100, 43536, 35798, 48190, 86477, 22680, 48148, 59501, 56563, 16802, 81496, 97568, 68657, 51462, 67953, 99660, 39002, 54170, 57190, 68086, 52700, 6487, 55709, 70418, 62629, 70420, 35695, 36152, 45360, 53503, 46623, 76000, 50648, 97876, 44815, 29163, 1356, 64123, 71388, 17658, 99084, 58727, 59437, 38773, 71254, 81286, 97545, 18786, 56834, 20346, 36401, 62316, 58082, 67959, 99876, 69895, 80099, 62747, 20517, 99777, 6472, 49189, 31321, 39992, 68073, 13378, 51806, 21776, 52060, 96983, 25754, 93709, 96627, 8644, 93726, 14002, 37716, 87620, 34507, 76339, 24491, 5849, 44110, 522, 66521, 12776, 44887, 80535, 14548, 75248, 671, 73071, 35715, 59474, 7061, 82243, 56170, 20179, 59717, 1725, 24634, 11270, 77023, 63840, 46608, 44667, 22422, 59771, 94768, 73033, 82905, 16463, 40971, 22204, 58366, 28721, 14907, 76468, 81872, 38418, 36989, 61439, 10610, 131, 44296, 35453, 10117, 75856, 94603, 99602, 68075, 35949, 13599, 50030, 69633, 55956, 85465, 16429, 86081, 11145, 6195, 82207, 90598, 92814, 23725, 83204, 80346, 71542, 46634, 15820, 54123, 45397, 15322, 61743, 9273, 71347, 6835, 64006, 91718, 43677, 32923, 21486, 17098, 61694, 43347, 40019, 4071, 52443, 42386, 56839, 83514, 27633, 40780, 51749, 92101, 62384, 92206, 56044, 66174, 11137, 73966, 78471, 30468, 31643, 33197, 6888, 8066, 86603, 74383, 6098, 54411, 98819, 89862, 88639, 94422, 89371, 80526, 91747, 91220, 64944, 76658, 42046, 58518, 27249, 6646, 3028, 1346, 33763, 9734, 31737, 65527, 5892, 60813, 3410, 35464, 43009, 98382, 70580, 93898, 56404, 32995, 62771, 71556, 40538, 55612, 45656, 10758, 20268, 33603, 38310, 14242, 74397, 10722, 71575, 22590, 49043, 91439, 9055, 23668, 9101, 5268, 64133, 77501, 64684, 11337, 47575, 50732, 88680, 93730, 46785, 17589, 3520, 57595, 71241, 34994, 8753, 36147, 88844, 41914, 11250, 94632, 71927, 4624, 86279, 7664, 2659, 94853, 65386, 30438, 86005, 92883, 84629, 59910, 44484, 1306, 8404, 56962, 29990, 38445, 96191, 73013, 66590, 40951, 24712, 18825, 37268, 87843, 18972, 12154, 7779, 52149, 76152, 65799, 86011, 35475, 78083, 88232, 91551, 65532, 93516, 73827, 24227, 44687, 55759, 83819, 45088, 10856, 60488, 39051, 14103, 76650, 81181, 46731, 737, 58788, 78945, 42096, 66731, 66740, 72273, 88969, 5655, 86590, 41096, 80038, 32430, 51877, 23970, 91900, 13082, 45880, 94367, 19739, 61998, 71665, 16083, 57035, 26916, 10166, 18834, 46798, 66881, 28444, 68840, 10459, 81087, 4728, 76224, 39257, 23470, 93524, 37345, 30074, 49856, 22022, 55279, 5159, 5193, 58030, 57539, 12514, 49759, 96222, 52597, 67192, 88187, 53614, 16084, 79915, 28212, 79334, 85283, 32306, 31058, 43113, 74707, 74869, 2213, 32134, 6379, 85426, 87098, 35984, 51105, 69287, 16803, 83337, 14913, 62531, 58098, 7914, 20105, 28850, 1384, 43173, 62983, 87113, 76066, 86320, 77684, 45191, 95225, 41503, 36713, 48404, 91228, 53865, 98981, 59161, 61237, 84561, 17455, 14379, 57789, 80895, 99260, 84595, 72942, 53220, 84448, 81332, 49437, 83086, 93414, 54519, 52288, 74772, 22460, 49324, 11168, 96071, 61985, 38284, 6405, 54698, 71727, 60093, 37340, 87884, 83403, 4542, 94949, 19636, 15855, 39105, 10424, 67418, 91022, 69254, 8481, 38411, 3832, 44354, 93548, 57172, 28481, 372, 81497, 52179, 41060, 72141, 41396, 65590, 70432, 82819, 93814, 26118, 84780, 88485, 70821, 8222, 83000, 47067, 38516, 33347, 47681, 48202, 60749, 52112, 7937, 28105, 11394, 45746, 43252, 34494, 2979, 69715, 42486, 82315, 71760, 97413, 66137, 94487, 7429, 74434, 22964, 55251, 3448, 53534, 2574, 9693, 96157, 2955, 4348, 19566, 56930, 83319, 31310, 53905, 1148, 41726, 22233, 76045, 37351, 10545, 17581, 28047, 30199, 4741, 58111, 33497, 67796, 67730, 31247, 43772, 29461, 45970, 73353, 22534, 53962, 32147, 71392, 62579, 66345, 58246, 33442, 9581, 29705, 14058, 86471, 76125, 59363, 94982, 74810, 89149, 20066, 3366, 3568, 25752, 80036, 64119, 27270, 40061, 91052, 69022, 9852, 77112, 83075, 43924, 61661, 56133, 96652, 57944, 72576, 82170, 79236, 55745, 15309, 88878, 72761, 37647, 67465, 12777, 97309, 93202, 41470, 8787, 64920, 48514, 18917, 35157, 59151, 4640, 5317, 38134, 76548, 82788, 9214, 58418, 73185, 90554, 10543, 47182, 62936, 91765, 89751, 68931, 48865, 64607, 7150, 77862, 14297, 14828, 33013, 91698, 67593, 98096, 16595, 51639, 86531, 24719, 1703, 78788, 43810, 38918, 95491, 99903, 82671, 8291, 68288, 31224, 39863, 4265, 77798, 7698, 33804, 92286, 4744, 37038, 44203, 98212, 17369, 77442, 62879, 4145, 96881, 15646, 36824, 19959, 45451, 76049, 54272, 97577, 95298, 81115, 30204, 82041, 8037, 10052, 8756, 76833, 82851, 24276, 75574, 36037, 78079, 92807, 29064, 90000, 84150, 17102, 75092, 49424, 35597, 4693, 82853, 42511, 16119, 23478, 65240, 55585, 91762, 71671, 46682, 72479, 97696, 24615, 12579, 30274, 48255, 2336, 90202, 5808, 45426, 76308, 74639, 31245, 99894, 89638, 6233, 33893, 71899, 85273, 89429, 29761, 50231, 57249, 99347, 22642, 66972, 86221, 47514, 88274, 10819, 73150, 53754, 13304, 20478, 38099, 619, 14669, 8011, 97657, 26569, 65430, 13467, 38180, 23675, 72350, 42257, 39875, 23529, 53407, 11833,
+    29599, 95621, 7727, 59527, 86846, 22860, 5358, 3730, 87555, 362, 95755, 54565, 29935, 68950, 52349, 98344, 86576, 7420, 12236, 15844, 48099, 97535, 97081, 50261, 31187, 60496, 24123, 24042, 6376, 6679, 99806, 20306, 60676, 36881, 77309, 5247, 96569, 53417, 73252, 64179, 35318, 75732, 65119, 32621, 40464, 22887, 96152, 65161, 83381, 8915, 68142, 7328, 85031, 15688, 72519, 93992, 86927, 75538, 38205, 50877, 70039, 97538, 94822, 52131, 49643, 85206, 1347, 14574, 88736, 53442, 49991, 64925, 72283, 82213, 60905, 36118, 62963, 16983, 79185, 15111, 26059, 17792, 98218, 33214, 1094, 41754, 77275, 65173, 13190, 91004, 90422, 44387, 92672, 98641, 54609, 83295, 37395, 70104, 32986, 72524, 82478, 5837, 83916, 52736, 57112, 55985, 42642, 42136, 89642, 35712, 49489, 19726, 65824, 24384, 48112, 15366, 99206, 68384, 51389, 529, 21475, 75749, 95182, 60110, 70571, 74174, 38105, 78107, 4101, 8982, 11215, 23987, 3303, 28706, 54629, 98000, 67510, 30036, 99140, 48896, 40971, 7735, 79984, 50134, 94928, 57023, 52880, 83067, 41940, 62994, 89213, 38593, 19283, 68206, 22234, 19245, 26266, 32403, 65889, 17022, 64280, 42797, 27161, 57675, 42313, 93606, 93082, 20659, 90824, 1226, 66266, 12503, 57104, 15247, 51160, 92398, 71967, 59476, 44465, 35765, 10787, 47737, 45792, 2292, 47599, 89612, 8162, 87622, 69410, 45727, 31158, 99791, 89544, 27214, 99588, 40516, 75616, 36505, 46079, 95448, 97999, 47462, 47799, 82729, 34038, 60789, 96938, 22682, 79062, 93307, 36038, 49016, 90983, 48219, 50889, 32517, 72219, 71229, 82643, 1195, 70543, 17, 22178, 23544, 72371, 1163, 28527, 7336, 39846, 31956, 80963, 41804, 59791, 41831, 1940, 52377, 79494, 12531, 81112, 44320, 18746, 5774, 63869, 4085, 59922, 12751, 99443, 13530, 23872, 36026, 83360, 32711, 92980, 11140, 99323, 57263, 98149, 29265, 25548, 65995, 4818, 15593, 8535, 37863, 12217, 14474, 66584, 89272, 86690, 58777, 39666, 44756, 18442, 52586, 98030, 40850, 38708, 49304, 68923, 65008, 84388, 83639, 29866, 63675, 26793, 49227, 82099, 24090, 57535, 24201, 65776, 74054, 89833, 62979, 26613, 5851, 99766, 63484, 66605, 37179, 90760, 59336, 58390, 93239, 84578, 11396, 93994, 73818, 23972, 37720, 72369, 25063, 32952, 71036, 76612, 31285, 34090, 19136, 53783, 66436, 61478, 96749, 43658, 7399, 31574, 67073, 40480, 20727, 70993, 65549, 30800, 21507, 53785, 89574, 86381, 56492, 62603, 44856, 68687, 63794, 70996, 7475, 84238, 71939, 86886, 94792, 15036, 36936, 95722, 17771, 67850, 33371, 49314, 40744, 5432, 81057, 41201, 75986, 22961, 15323, 1570, 18657, 95219, 19130, 53127, 15867, 81135, 73206, 76668, 36386, 48828, 31417, 56916, 70891, 60534, 95777, 10022, 94053, 2928, 56326, 16559, 79656, 6414, 81247, 78270, 55687, 19151, 61597, 99857, 81142, 27725, 53493, 12185, 1455, 48501, 59425, 20591, 24900, 66079, 84889, 32024, 18919, 2043, 7076, 71201, 88258, 86521, 93348, 26395, 39646, 44145, 33911, 46231, 67054, 39979, 11630, 23020, 76278, 88056, 11480, 4723, 78612, 70211, 60622, 84687, 59092, 65675, 38479, 64399, 64699, 95964, 42764, 69060, 28189, 4193, 95805, 75462, 17245, 59640, 94773, 84292, 53092, 98507, 61353, 32483, 53027, 48912, 87221, 47788, 59263, 65196, 35567, 17494, 64253, 50223, 7057, 87467, 62414, 2523, 50910, 72353, 78986, 78104, 47719, 29108, 12957, 5114, 64435, 66707, 37449, 70399, 45334, 71606, 55338, 55072, 58765, 12151, 22012, 16954, 87366, 14240, 98041, 72296, 47408, 56879, 99584, 63172, 92316, 28071, 29880, 19608, 13839, 87484, 56541, 88662, 87098, 72124, 78282, 27653, 38993, 31870, 67239, 99445, 7376, 78487, 98880, 12180, 86773, 67773, 15416, 58172, 13075, 67559, 97510, 29705, 86985, 57024, 11827, 31236, 91920, 26116, 94614, 14486, 46252, 78847, 43786, 70048, 96739, 35240, 39933, 58209, 27852, 65669, 47323, 58150, 84444, 44344, 95882, 41258, 31314, 69060, 19916, 6979, 19436, 45572, 16259, 74566, 6306, 24705, 53422, 593, 97031, 22308, 26875, 23042, 78035, 34229, 61976, 23175, 50072, 90896, 50810, 71730, 86468, 94807, 8218, 36032, 58628, 60560, 51206, 37943, 27987, 15014, 49905, 70018, 66799, 80851, 23594, 29982, 6438, 97381, 47715, 96294, 17985, 48545, 12672, 5250, 9988, 24601, 3736, 97815, 54363, 64703, 44167, 68376, 16595, 38073, 29630, 59630, 1858, 71823, 75580, 70083, 14493, 93821, 93394, 85369, 3818, 8435, 59988, 43966, 13961, 15855, 83332, 80312, 27299, 88840, 76964, 56173, 62794, 79389, 82642, 85843, 47116, 43064, 16061, 28905, 54415, 72832, 91252, 93488, 79457, 99336, 70744, 80432, 6487, 880, 87701, 154, 86574, 86677, 17892, 81488, 95260, 12515, 43189, 9211, 55403, 41417, 60046, 54785, 83655, 28274, 65745, 63062, 44549, 36391, 48051, 7328, 3572, 33226, 49177, 25123, 59065, 19691, 15109, 10172, 95578, 29497, 48152, 20276, 36270, 78866, 48309, 53209, 55475, 30073, 19717, 16004, 45692, 83430, 9291, 45935, 57030, 92613, 91656, 67697, 34915, 28156, 56594, 3273, 11194, 98270, 34370, 2621, 66679, 97451, 97717, 87923, 48310, 37725, 69743, 75103, 84956, 75163, 16069, 65304, 19397, 18071, 27273, 49823, 57595, 98324, 82174, 10293, 80943, 64184, 19472, 4198, 9410, 25927, 65961, 33155, 95168, 33692, 61712, 69877, 13308, 17415, 10022, 2491, 67310, 96140, 68050, 76272, 17143, 76805, 57176, 7539, 22690, 95483, 87592, 27221, 90821, 51154, 99828, 68998, 54581, 74222, 10269, 65057, 45467, 96089, 55058, 89779, 60837, 74122, 52886, 58055, 14880, 93208, 66652, 68830, 24121, 62407, 87257, 18802, 14925, 45423, 98624, 55195, 59072, 41414, 77840, 66075, 62705, 26549, 19063, 57552, 2507, 52069, 57620, 66688, 14833, 33700, 90666, 98052, 5367, 2268, 43093, 69063, 22030, 85564, 92258, 1847, 24446, 65835, 38660, 91899, 87732, 52396, 31952, 36000, 86944, 16109, 80729, 53757, 60226, 59103, 84187, 36674, 72823, 29884, 4654, 69139, 20440, 57413, 3651, 39639, 44564, 57492, 84159, 751, 99748, 9659, 72661, 39220, 99742, 74734, 75729, 38071, 69934, 73640, 65294, 54524, 64372, 37927, 17187, 7863, 12732, 40296, 36197, 15821, 76831, 4400, 71933, 4040, 22072, 33064, 25702, 13324, 91275, 27388, 97729, 14620, 45989, 80737, 17934, 4219, 3032, 43457, 31051, 24469, 67041, 29328, 75499, 80951, 88212, 92595, 49969, 24612, 58732, 2718, 3805, 50918, 99426, 8614, 35580, 93273, 989, 24385, 41185, 25687, 47146, 25227, 95839, 56355, 98536, 79824, 31725, 46447, 26690, 68418, 47783, 33725, 21729, 70797, 59038, 60376, 25087, 68332, 67950, 12411, 95918, 64736, 65336, 74947, 64605, 4106, 42712, 96640, 28492, 28648, 42429, 821, 24333, 69677, 38959, 23484, 92005, 29352, 29159, 52873, 99947, 21834, 85347, 93479, 28298, 55608, 3226, 69714, 80283, 6577, 18849, 44605, 75286, 28139, 26541, 12867, 57500, 86617, 33005, 57498, 60223, 74954, 51401, 55246, 5648, 16513, 40930, 43821, 32090, 66002, 65530, 76083, 6047, 6879, 94987, 80787, 11688, 77161, 92670, 6696, 400, 28572, 47234, 51375, 88518, 762, 92617, 54260, 7560, 60180, 43331, 64059, 27616, 75839, 21392, 47756, 46254, 19486, 88533, 30130, 93694, 8557, 66534, 94447, 16910, 6480, 77440, 24366, 6195, 48946, 28597, 44429, 50300, 73556, 40638, 98709, 94413, 15987, 43860, 64871, 93953, 34506, 7296, 31753, 30626, 77510, 39829, 25696, 39776, 69185, 36540, 65413, 31528, 43446, 73532, 49776, 30282, 30004, 26725, 15200, 33958, 90320, 71836, 48051, 31970, 5326, 96194, 69695, 60898, 60945, 18271, 50868, 61468, 23593, 68985, 20628, 58044, 8942, 34849, 7384, 50500, 62895, 78780, 48946, 65278, 4067, 973, 34761, 15512, 73739, 23138, 47322, 55568, 32259, 71816, 49277, 75218, 76104, 19579, 68312, 67904, 33886, 53888, 26421, 43859, 40291, 39068, 31711, 36542, 10195, 39781, 72352, 13188, 34113, 9428, 60443, 4987, 13783, 80744, 63483, 18266, 11961, 87167, 46987, 28480, 74214, 39191, 8146, 38090, 75727, 79245, 47720, 52547, 45321, 4972, 49701, 74354, 69672, 63455, 41902, 5667, 54166, 4962, 25873, 44509, 73332, 73383, 29438, 21455, 12320, 11997, 16921, 49379, 63027, 86175, 8110, 76149, 2520, 11256, 25863, 50518, 69001,
+    79113, 9447, 91840, 5242, 10998, 46496, 2448, 56058, 20970, 10517, 17783, 25723, 97137, 62840, 1264, 78691, 81020, 55335, 48524, 2088, 90413, 76651, 26855, 16177, 14954, 62914, 21344, 5708, 75560, 39311, 95865, 28783, 64902, 95657, 46276, 33426, 4799, 11588, 57513, 73689, 77677, 63011, 97795, 34954, 76866, 32043, 32697, 26643, 36890, 53476, 3011, 13963, 49551, 87671, 67761, 17488, 94770, 50599, 33272, 23091, 38079, 41177, 22395, 91656, 79679, 38687, 57384, 80118, 42507, 4098, 78949, 45669, 48802, 83915, 78292, 4369, 57657, 49146, 45192, 98491, 72457, 46331, 207, 81601, 7409, 70856, 91605, 70295, 9171, 72293, 32997, 78025, 16795, 73534, 68780, 21284, 31767, 94381, 86439, 12420, 53285, 99563, 60502, 67954, 55012, 99809, 5431, 69978, 99712, 14401, 79498, 4495, 3045, 528, 72542, 91604, 72725, 39378, 80378, 41996, 20138, 54545, 59730, 36951, 45157, 37964, 97690, 12184, 4944, 53803, 93605, 60851, 68938, 46285, 89663, 90309, 6907, 87239, 81791, 83292, 90013, 68927, 14725, 81840, 63836, 52068, 43830, 4794, 931, 59255, 8263, 99057, 94401, 69033, 7437, 20364, 92884, 28193, 43932, 37629, 59426, 18891, 8583, 79551, 87242, 1483, 6725, 65786, 16844, 12650, 99305, 42841, 9811, 18800, 39313, 51373, 31874, 84558, 27831, 48614, 48975, 55509, 83363, 31854, 64001, 94028, 76125, 79314, 24893, 81132, 9441, 86015, 28356, 40358, 10160, 23328, 7330, 76538, 37611, 89351, 84132, 97047, 26109, 95222, 35130, 75600, 88602, 15073, 87835, 71649, 28948, 81615, 37498, 28674, 59776, 44095, 65924, 64368, 94536, 12518, 61711, 55619, 82949, 4114, 21540, 70544, 28022, 79983, 28781, 7749, 97873, 4951, 50076, 47611, 99522, 56820, 38653, 49047, 36283, 83908, 72452, 85625, 10811, 36998, 44083, 34864, 44975, 39057, 4551, 68450, 24781, 1503, 9871, 46885, 11424, 21259, 54900, 97669, 85669, 6015, 2521, 37661, 14915, 57423, 91903, 94789, 32059, 64972, 4600, 61465, 27118, 79785, 13547, 49766, 38410, 68860, 63756, 23621, 64387, 46255, 63408, 11297, 41081, 56326, 58349, 98703, 72268, 73574, 32098, 42534, 91502, 38083, 11241, 56828, 12098, 25377, 37054, 56328, 30034, 26922, 68401, 93478, 63275, 62650, 81407, 773, 79499, 14970, 47217, 1187, 57428, 69980, 77764, 74791, 22107, 54363, 39247, 56028, 56982, 84244, 21464, 18716, 25533, 94589, 94768, 21537, 18436, 81135, 27654, 79713, 56630, 61571, 58453, 26758, 68450, 68449, 2994, 15347, 83954, 71823, 6428, 44210, 79597, 95144, 32871, 1991, 320, 77157, 63607, 31154, 48846, 71125, 61750, 59608, 33038, 35733, 68915, 94127, 50383, 64242, 49708, 57270, 65019, 8581, 12111, 18487, 50013, 58664, 22214, 19033, 33681, 44754, 28830, 10381, 52318, 34959, 20682, 55453, 53800, 65774, 99164, 72102, 36986, 44157, 56716, 7974, 81475, 25926, 39402, 33688, 99671, 95312, 42268, 26536, 14482, 67377, 57993, 89147, 15834, 64995, 4700, 18714, 30221, 39095, 32749, 69257, 55204, 30497, 31839, 63045, 30009, 62683, 31232, 77680, 93551, 63589, 6989, 77246, 42169, 46117, 73226, 37427, 1858, 83649, 37410, 86369, 4641, 74481, 66168, 48041, 22597, 14670, 27464, 57165, 20939, 36282, 76940, 73358, 50521, 69603, 8895, 81793, 57743, 81903, 64025, 91641, 25276, 34040, 62642, 64015, 57657, 84890, 73832, 782, 60160, 16998, 40023, 24590, 88613, 76640, 53091, 67600, 80183, 45674, 64464, 25163, 42384, 66972, 13953, 41966, 66048, 15135, 73745, 19466, 53657, 34619, 13462, 15905, 48257, 73297, 238, 93525, 80556, 5942, 5411, 66169, 9090, 95130, 74316, 57321, 48083, 62355, 68113, 15239, 36644, 80326, 65817, 54428, 61955, 58849, 77206, 16073, 98261, 92091, 39178, 35464, 85109, 85452, 21128, 25665, 81860, 44664, 24024, 56960, 95124, 39786, 18836, 11121, 44163, 81074, 79064, 46219, 94694, 44233, 81469, 24642, 15030, 21995, 13587, 40755, 6669, 81093, 74305, 1881, 55649, 37273, 80827, 98643, 46694, 59281, 79231, 42813, 84984, 7052, 98113, 17296, 84434, 31205, 46894, 71219, 74530, 44686, 70744, 91388, 20692, 96853, 73803, 15836, 18126, 49686, 4179, 47588, 87892, 65425, 68012, 97468, 92510, 99271, 58694, 11918, 37051, 18644, 57228, 14265, 57572, 57022, 52186, 30193, 93570, 87872, 5257, 26784, 6476, 61746, 68559, 1720, 26202, 16519, 27688, 10645, 87174, 60845, 73385, 82075, 6933, 98828, 56895, 17344, 84253, 36561, 51648, 24939, 63470, 31034, 95052, 51090, 51465, 87979, 68650, 30181, 29598, 19137, 43221, 81353, 90170, 96985, 61115, 17385, 92314, 80650, 55821, 17874, 84333, 93272, 48260, 87272, 22764, 59957, 51870, 85988, 39222, 77241, 62535, 28344, 6011, 80831, 64551, 46299, 75195, 71177, 8660, 58943, 57003, 3306, 74413, 74068, 15073, 89016, 93140, 13911, 57170, 19880, 41870, 9131, 57495, 73032, 86979, 60094, 87026, 30880, 4736, 86301, 92707, 21689, 83565, 71275, 47665, 65687, 71184, 89897, 32490, 97577, 38723, 79113, 37531, 97500, 94450, 15699, 58019, 84423, 27057, 56017, 97148, 47365, 30669, 33818, 80406, 99690, 33012, 95178, 46809, 48448, 79350, 9146, 99701, 98976, 71197, 44161, 75069, 36602, 79650, 97301, 12020, 56658, 25701, 46392, 78609, 63073, 69419, 57736, 20102, 42415, 79044, 20277, 56280, 47903, 94311, 25558, 40336, 91305, 90505, 66769, 64562, 83737, 62892, 10375, 71024, 19988, 56946, 76110, 21847, 43162, 50578, 46086, 54167, 61722, 53463, 63134, 69288, 12838, 14116, 71687, 50846, 59810, 24826, 84138, 82885, 91496, 98600, 82769, 40049, 4125, 50694, 1294, 2805, 29691, 82321, 76462, 85945, 115, 29188, 66918, 71340, 31585, 61638, 95472, 52978, 50622, 81990, 60955, 70519, 22270, 35610, 95871, 89222, 41038, 52546, 1163, 67943, 1793, 92010, 35755, 74509, 66665, 95759, 8568, 44299, 67822, 5806, 85839, 13895, 87675, 31357, 88014, 40026, 53050, 28951, 31992, 42495, 82892, 51567, 2869, 45808, 20238, 20781, 56098, 66307, 95701, 614, 60833, 3091, 81339, 24195, 65639, 85976, 28116, 66224, 51502, 73637, 13207, 88302, 36488, 65518, 98187, 26, 74367, 64706, 53943, 86760, 25783, 82112, 34958, 86621, 20848, 63459, 14049, 84943, 91873, 50238, 77773, 64109, 8602, 87934, 47583, 66053, 30287, 5507, 80312, 37464, 57457, 86200, 17806, 16522, 38843, 94334, 59958, 63864, 53427, 74506, 33980, 90449, 30842, 53616, 36738, 52, 13595, 53051, 13174, 60163, 71420, 73835, 67119, 79018, 42782, 45059, 952, 46360, 85879, 71552, 84741, 29746, 32577, 10041, 7208, 97528, 51256, 916, 55973, 17684, 99046, 38782, 58660, 97798, 66032, 48339, 51329, 12532, 97904, 95454, 42737, 62541, 96702, 82953, 94610, 26645, 86813, 25480, 99713, 26078, 23028, 93056, 21445, 73209, 89318, 69987, 34705, 30064, 17094, 51135, 54141, 26625, 1086, 13082, 30843, 98672, 56864, 42605, 5833, 60850, 69366, 27351, 16456, 92609, 48030, 54322, 69891, 46502, 34578, 77918, 63276, 75958, 42519, 60266, 85576, 4855, 14258, 67017, 10545, 35078, 53012, 71922, 85784, 73402, 74363, 58457, 94102, 23510, 51559, 39482, 87057, 9377, 10106, 82985, 33931, 16523, 6484, 97749, 83172, 53753, 27466, 23073, 96083, 67302, 57465, 21877, 18013, 99804, 32873, 43123, 72365, 53197, 80578, 69770, 97471, 86954, 67183, 98497, 78474, 28450, 63183, 98699, 42738, 61433, 3491, 27304, 49311, 94980, 92740, 43272, 86549, 11406, 79636, 85582, 38086, 657, 2354, 26567, 77450, 42086, 21600, 49011, 44059, 47872, 75761, 96577, 11642, 83471, 79616, 23749, 77082, 96876, 65302, 84027, 48955, 59887, 20657, 75090, 9058, 50347, 66088, 70745, 76342, 58026, 95568, 61504, 93473, 84590, 47089, 74717, 93090, 46334, 68273, 59500, 54345, 72608, 54048, 86156, 40296, 74046, 6813, 36369, 74543, 18305, 85236, 31316, 37061, 96893, 23112, 5529, 10166, 19037, 1467, 70810, 30932, 18410, 92837, 81324, 12268, 54705, 25207, 90366, 56528, 3392, 88747, 39951, 97957, 99404, 23685, 13533, 15640, 11434, 66516, 71025, 65770, 88000, 52232, 32360, 10787, 37438, 2264, 94460, 80214, 42288, 59062, 29010, 64093, 21225, 22297, 36935, 19202, 5925, 85373, 27414, 28991, 9191, 42273, 56587, 89719, 77191, 64334, 61542, 28763, 28978, 79184, 59815, 95200, 30246, 54022, 287, 91808, 66347, 50833, 15356, 78614,
+    65087, 9664, 67555, 58222, 20787, 72382, 83712, 15858, 72040, 59451, 7428, 47586, 83509, 45969, 28759, 94033, 88618, 46, 1753, 28290, 71934, 99070, 52517, 65865, 15904, 68134, 87595, 39779, 99174, 13366, 50847, 69037, 77911, 19709, 84404, 24370, 18920, 1746, 28059, 4653, 6892, 25496, 48810, 82943, 7069, 44018, 1617, 56497, 27582, 29576, 47883, 8385, 54975, 96245, 77257, 31194, 34512, 19198, 50926, 50886, 91577, 49260, 49604, 58464, 18198, 90887, 15379, 74883, 36644, 63967, 34545, 20539, 12884, 6010, 98636, 94832, 47702, 98318, 6078, 42517, 97030, 93707, 39286, 10245, 66230, 99574, 74563, 81937, 22153, 10659, 67579, 85147, 69686, 32017, 8199, 20027, 64266, 60707, 55426, 22027, 13823, 81404, 86757, 3754, 197, 45469, 68736, 17656, 92453, 6784, 35531, 33538, 27558, 35825, 13471, 16377, 66978, 44601, 69943, 84635, 7335, 67725, 88064, 78201, 64380, 66771, 62221, 60427, 32028, 37857, 5491, 2757, 10537, 2199, 60244, 14726, 29734, 34433, 81241, 39778, 65831, 56153, 81696, 25113, 17371, 79022, 3587, 60439, 96582, 37801, 82496, 68242, 19561, 53140, 17171, 13165, 58750, 80612, 19818, 16753, 70009, 75290, 48846, 89851, 25190, 35525, 84348, 65298, 23161, 60583, 89611, 18798, 85422, 60713, 17660, 41915, 65757, 4781, 48374, 10712, 40330, 2409, 41020, 28042, 51857, 81224, 93917, 90366, 58848, 8012, 92070, 75349, 80066, 83228, 55170, 78376, 94127, 29418, 58660, 74006, 63909, 59502, 63255, 32318, 28904, 26117, 88103, 50656, 58517, 16372, 43392, 77876, 65997, 63501, 45927, 17444, 84021, 54886, 57082, 47456, 73816, 66900, 82958, 49722, 95843, 23458, 4560, 67276, 59080, 81486, 2967, 26133, 87694, 74183, 22100, 45306, 33895, 26512, 71426, 54994, 47367, 10171, 45681, 36268, 3166, 2179, 64197, 90037, 4641, 96073, 72989, 55123, 48825, 2862, 66974, 30115, 41554, 26727, 54025, 69504, 38284, 7816, 36370, 75764, 69774, 43208, 43598, 39461, 21655, 12169, 77790, 44578, 70959, 13500, 40823, 52952, 88095, 82193, 66424, 79814, 25651, 58125, 42724, 11752, 64533, 34827, 72755, 96727, 82066, 60268, 55535, 4230, 73018, 69602, 16912, 66088, 21859, 38654, 38638, 51444, 37999, 18595, 15209, 21801, 21130, 53741, 54954, 91590, 83660, 74071, 82627, 4311, 45268, 94735, 65747, 72428, 22621, 70828, 64394, 647, 23570, 17677, 84377, 63993, 10268, 47426, 72750, 83772, 29090, 73284, 36683, 91143, 64546, 99836, 21999, 61793, 41557, 16714, 20586, 14251, 56633, 46146, 84730, 5445, 8367, 52621, 79252, 89737, 18431, 32134, 86975, 58939, 63385, 8504, 25998, 79549, 70558, 4870, 57604, 48374, 32388, 97871, 75590, 10919, 43825, 82858, 25807, 50366, 2841, 2716, 51315, 79719, 33159, 63382, 11327, 65184, 87243, 17850, 40149, 12171, 48486, 26380, 85432, 35427, 59256, 57601, 29529, 20553, 3006, 69997, 87919, 47626, 96026, 37445, 51735, 89296, 26702, 22837, 61279, 85193, 30624, 10676, 83075, 21477, 54708, 47485, 80297, 86204, 25192, 55197, 81177, 70551, 11003, 7001, 55017, 487, 40926, 99463, 79514, 69697, 52854, 88640, 44464, 66314, 48240, 49787, 81333, 14914, 12919, 51037, 88609, 25572, 61019, 85184, 12051, 61246, 52108, 98895, 24549, 86944, 73303, 9012, 25151, 97424, 43531, 44790, 63034, 86713, 76483, 17499, 86891, 3267, 45091, 39126, 94419, 35750, 35239, 49413, 62381, 92010, 7246, 26997, 47446, 26930, 22668, 43961, 51741, 63058, 41977, 62933, 9197, 94303, 29044, 53755, 22391, 85373, 66572, 74650, 7824, 49712, 40021, 99958, 60404, 37370, 89264, 52343, 90901, 44730, 4252, 5811, 22283, 25102, 86636, 75509, 47088, 62971, 85519, 7495, 16798, 25708, 59258, 89361, 43455, 86768, 29961, 4362, 60956, 81059, 87604, 46241, 98362, 21030, 76182, 83545, 59150, 99333, 68271, 32629, 3364, 96467, 40427, 307, 84267, 239, 11711, 40933, 24518, 33854, 60291, 94179, 5564, 33196, 73818, 22201, 97078, 69360, 94513, 42623, 6510, 67378, 79468, 10394, 96430, 87701, 2667, 64162, 93266, 48941, 55345, 56127, 22704, 8793, 57008, 36920, 80845, 81203, 98715, 84158, 49194, 72718, 52919, 4951, 8715, 82384, 8570, 26733, 62399, 27297, 79038, 57916, 46155, 82381, 1027, 20541, 40580, 44836, 17336, 55548, 87454, 63549, 61401, 88819, 23326, 37546, 49089, 50707, 23099, 20724, 67184, 3394, 95941, 76045, 20523, 30393, 14157, 69381, 94104, 15406, 46707, 36234, 9136, 96805, 4904, 20310, 77164, 15400, 87198, 48310, 59729, 35230, 61503, 42015, 86910, 23264, 23542, 49105, 58334, 52855, 78865, 73516, 43820, 96593, 33168, 26170, 88241, 4016, 79862, 39617, 95329, 57881, 71750, 89690, 22519, 59367, 19825, 12638, 36100, 14355, 79540, 8411, 94571, 80462, 11953, 55629, 14598, 81066, 48968, 74149, 36938, 4564, 59157, 75517, 14309, 64905, 59893, 62803, 6968, 33003, 40894, 48816, 77710, 16692, 19135, 98381, 49397, 24048, 17804, 26829, 24046, 44546, 28174, 2639, 27957, 38625, 85902, 9908, 77666, 14096, 89851, 23600, 20717, 32860, 44070, 67853, 85907, 23761, 789, 73370, 15649, 26472, 9174, 20081, 49415, 97463, 14565, 19834, 94738, 68045, 67542, 3552, 77093, 99071, 16832, 95177, 49571, 85821, 9368, 85170, 58449, 89633, 99302, 94158, 50274, 50223, 51128, 52847, 53598, 47826, 2883, 28192, 84324, 9530, 14385, 37292, 74795, 16821, 5010, 77101, 96596, 72384, 41399, 83046, 37927, 48213, 84574, 55438, 79315, 71005, 45190, 56133, 14016, 92180, 28365, 34307, 90665, 74758, 45080, 38017, 80599, 91174, 47907, 19299, 9707, 92260, 36784, 55855, 25939, 74472, 47402, 12352, 75591, 31459, 76711, 57940, 95535, 55231, 80645, 84613, 90280, 3500, 83695, 42992, 77226, 25326, 8093, 49838, 6457, 44814, 82819, 94986, 81818, 65186, 21378, 49711, 66248, 72391, 65826, 21284, 41399, 72858, 32223, 35915, 45221, 36871, 16193, 2522, 52963, 24506, 98239, 56752, 15192, 8451, 62802, 54777, 67983, 82177, 7303, 71445, 40559, 58655, 73468, 40491, 52864, 81558, 36789, 53134, 38801, 90600, 36385, 90996, 20526, 13627, 62253, 96989, 88864, 11928, 14681, 77082, 95659, 47182, 16085, 26894, 39758, 32803, 26458, 65779, 66110, 38888, 15490, 48120, 90238, 8736, 233, 76851, 86938, 8873, 95387, 33400, 50788, 13568, 43139, 29821, 70427, 21022, 93285, 57243, 51675, 77459, 33170, 81485, 85303, 44133, 203, 44175, 89151, 26705, 32990, 10885, 10208, 58477, 97729, 699, 40581, 8065, 95864, 89797, 47506, 19160, 85728, 58599, 96271, 75849, 30736, 18808, 25828, 52011, 66179, 70244, 81312, 19570, 14287, 61078, 81922, 63361, 80858, 306, 22156, 82923, 53176, 24864, 49193, 2961, 96536, 62449, 13213, 85347, 11442, 76615, 43037, 86122, 99676, 74309, 46017, 16175, 12685, 53550, 19080, 37283, 44921, 34991, 4433, 99561, 38215, 35662, 13892, 7814, 41718, 41231, 85589, 74048, 72169, 26946, 61732, 9135, 39009, 63534, 4114, 40417, 83412, 22562, 65546, 720, 90064, 73027, 50736, 71086, 12445, 3681, 65140, 56291, 47452, 48916, 65136, 53941, 15484, 21038, 47251, 78461, 31031, 4838, 87483, 732, 16111, 68263, 4811, 65979, 44283, 51659, 29997, 11280, 3880, 12399, 63450, 93862, 50981, 62790, 76784, 76696, 40906, 49261, 35863, 43747, 65954, 36125, 73713, 98678, 13409, 38773, 59417, 9763, 429, 66203, 7350, 32754, 36079, 72447, 63925, 12958, 65292, 80270, 78432, 50925, 74946, 7649, 13689, 68001, 52318, 5804, 51584, 63637, 85697, 50929, 25279, 20963, 83038, 31199, 64189, 17152, 20459, 66108, 66005, 53159, 53971, 32528, 77145, 52981, 88941, 68593, 86343, 97770, 25625, 17598, 55249, 89640, 94162, 65874, 36511, 21906, 70401, 30914, 24085, 42945, 55597, 78393, 98120, 38283, 44967, 76077, 45739, 92432, 11846, 59131, 26322, 82651, 94792, 37726, 23301, 11275, 98813, 34229, 65440, 51369, 55580, 35207, 84314, 35696, 50231, 9399, 18679, 27219, 22519, 26725, 63451, 79357, 55915, 77027, 30354, 45890, 10745, 60035, 7914, 43562, 12219, 30220, 29382, 72520, 87475, 83634, 15163, 32468, 72904, 18200, 84666, 43560, 58483, 64613, 52170, 55490, 45954, 99323, 26401, 61210, 10450, 70360, 42906, 32851, 70022, 49966, 62331, 84249, 98093, 62146, 88171, 73246, 48314, 45730, 56348, 59081, 16642, 57872, 81564, 32305, 4158, 47263,
+    97234, 74415, 36159, 30014, 22241, 77574, 27990, 67395, 81471, 18512, 47546, 23386, 6156, 72893, 15332, 57667, 92657, 35148, 45316, 90482, 93819, 38065, 74899, 10850, 63285, 50968, 88081, 42486, 56089, 43288, 11239, 55127, 26637, 85974, 93879, 78540, 42451, 35082, 93809, 63793, 51039, 13518, 20239, 26933, 19322, 26648, 83711, 93163, 95951, 77389, 43771, 36873, 66976, 38082, 59476, 53984, 6951, 42615, 80733, 1120, 80595, 10500, 67420, 38885, 8892, 36205, 17170, 46564, 66415, 36372, 68305, 41470, 38699, 60900, 23468, 6927, 498, 55896, 4005, 50692, 67984, 91012, 97314, 94177, 57676, 36734, 32671, 44733, 34981, 52186, 15599, 75642, 82652, 22773, 97106, 20691, 38085, 50368, 74916, 76281, 54002, 85721, 99186, 78438, 27865, 34827, 61315, 8817, 93105, 71539, 35484, 58033, 17540, 32806, 87253, 15780, 80123, 34241, 70383, 95515, 27998, 47682, 32682, 93658, 15116, 93030, 71866, 35516, 70161, 7556, 64122, 54622, 14312, 64375, 28863, 27886, 34040, 10010, 1460, 58765, 71496, 37785, 5616, 84850, 2194, 55514, 33636, 7138, 36937, 44763, 61308, 63574, 8069, 24109, 17821, 82144, 53309, 26183, 84238, 36684, 45285, 41353, 29380, 93726, 59560, 96422, 34218, 66851, 49001, 4855, 46849, 19877, 76540, 61415, 32053, 38801, 74623, 92808, 6660, 85031, 97706, 34417, 51085, 72292, 30903, 45126, 69978, 11572, 68622, 64123, 59344, 67118, 46014, 59248, 69321, 31897, 72232, 48016, 36455, 87125, 85356, 96888, 28316, 23149, 34823, 29944, 18522, 14045, 973, 49472, 89165, 84112, 94087, 47881, 87600, 86330, 13384, 4528, 94572, 30634, 86728, 48525, 53243, 35911, 96382, 22525, 89914, 52213, 23007, 54827, 35721, 49121, 40203, 99040, 55039, 94543, 85440, 75098, 12566, 15579, 40603, 51321, 28805, 46550, 42499, 69794, 51322, 37286, 72035, 15494, 39787, 97639, 24343, 36299, 72759, 96672, 58801, 57467, 97185, 19493, 4431, 33940, 950, 46713, 12503, 35185, 31106, 93821, 1086, 31767, 17484, 52751, 70411, 12196, 502, 45391, 70720, 27507, 1282, 18633, 45031, 10475, 83570, 29539, 16753, 63494, 17010, 76069, 38913, 53948, 34175, 36761, 37575, 73655, 76272, 1069, 74456, 10440, 65502, 95286, 39384, 83461, 76477, 4167, 46503, 22373, 24523, 46024, 28959, 83219, 27807, 80905, 88626, 70234, 86888, 60954, 95397, 47973, 47944, 30154, 42698, 15144, 53223, 21123, 19281, 62933, 24952, 84744, 58456, 38446, 26768, 40797, 107, 52101, 8348, 8531, 17772, 97826, 34009, 15825, 48977, 54939, 78886, 31784, 42842, 22773, 9095, 25113, 65362, 83953, 55921, 92797, 26776, 59312, 56428, 52218, 50141, 52535, 22564, 50708, 50384, 16261, 529, 31406, 46452, 30954, 5385, 60190, 38790, 65440, 11891, 2196, 83560, 68884, 72400, 47795, 7501, 8916, 63267, 35567, 39889, 61818, 94343, 46612, 75029, 46988, 12411, 6123, 60904, 43704, 31143, 72544, 45919, 67953, 97776, 49517, 60476, 54437, 46261, 99778, 18541, 77626, 12537, 68459, 12688, 36284, 54901, 89375, 10538, 38415, 33160, 78777, 33532, 82538, 21329, 34359, 29544, 57035, 61945, 49098, 32484, 68236, 11088, 57533, 11044, 96786, 58861, 51390, 9582, 24229, 32604, 66195, 7311, 46441, 73383, 58033, 41866, 19293, 73085, 50627, 19818, 40498, 56436, 99865, 55516, 38917, 89889, 49571, 99408, 20144, 76122, 49593, 47906, 94763, 26488, 86343, 98334, 70112, 85244, 45622, 47828, 35306, 86838, 57186, 69907, 90594, 68206, 25118, 75445, 71715, 15800, 67558, 17783, 56525, 22970, 17354, 17139, 76827, 50325, 95314, 65432, 44045, 57928, 66247, 10673, 69744, 99485, 57467, 66889, 55246, 15095, 23540, 32890, 22959, 59472, 62237, 6956, 34669, 16547, 54868, 22598, 65120, 48525, 72750, 70559, 75706, 61831, 14032, 36146, 90211, 36082, 79712, 43018, 53903, 82490, 45698, 54202, 83079, 4867, 18044, 55144, 49189, 33278, 48387, 68822, 73057, 58118, 89796, 47318, 98383, 58759, 172, 56627, 79861, 86734, 25758, 80779, 55741, 40924, 24568, 23090, 62934, 94264, 58331, 18747, 15802, 81585, 92542, 97426, 18205, 11820, 62702, 16439, 18613, 45918, 47584, 98743, 39808, 33357, 16033, 87378, 87036, 88920, 99300, 89343, 7384, 36867, 36712, 96947, 92141, 85779, 81735, 86121, 19511, 70519, 62537, 10398, 99308, 63922, 45419, 17708, 2093, 85127, 55753, 97149, 82877, 64642, 30417, 151, 75464, 75992, 99440, 58040, 32083, 90604, 47830, 40087, 78899, 43638, 59066, 46579, 44828, 35130, 10670, 62051, 94127, 32024, 85455, 80408, 18295, 8106, 89380, 90499, 3196, 3826, 63462, 64317, 55570, 77162, 48564, 59842, 80241, 76221, 57327, 48049, 74336, 43168, 19559, 32059, 99226, 46384, 48111, 56013, 58953, 68426, 22, 72641, 16207, 595, 71706, 61213, 65921, 67517, 92618, 57660, 76414, 60998, 1829, 90176, 62932, 15052, 94997, 41, 58848, 56411, 18129, 86542, 16330, 2803, 5651, 47351, 57866, 3560, 97530, 8338, 59434, 50183, 39076, 2516, 16293, 6559, 31189, 83713, 58214, 32016, 56581, 46226, 74599, 33513, 51530, 20163, 56512, 1694, 8165, 17370, 2510, 46015, 80417, 77195, 69062, 717, 33699, 37638, 82238, 5436, 67991, 98554, 26668, 19565, 26500, 30133, 54349, 36668, 56773, 55187, 25458, 54126, 11833, 32007, 38881, 20038, 42186, 67850, 12001, 96089, 63397, 75035, 16744, 45208, 84186, 82044, 34818, 55858, 1623, 41600, 34753, 92242, 16416, 49800, 45309, 56520, 38893, 42865, 37476, 78860, 32503, 18086, 55004, 65795, 82926, 75725, 52917, 75463, 82202, 35158, 67065, 38454, 90106, 79681, 57317, 68357, 66487, 99640, 13182, 68684, 96739, 89887, 54307, 98357, 4597, 47645, 38560, 17334, 46291, 91096, 22675, 12995, 35767, 76173, 54754, 75206, 13345, 78860, 19929, 12740, 13007, 69737, 52454, 6784, 77198, 59565, 44548, 22924, 38773, 9522, 59392, 45244, 64754, 39640, 75795, 22725, 78314, 24738, 83167, 31049, 92122, 62117, 47314, 34032, 76951, 63164, 22515, 46057, 81625, 72164, 60013, 26171, 55608, 50486, 51422, 18277, 13682, 70130, 49689, 32278, 25430, 84394, 57371, 93398, 14139, 461, 37302, 25705, 25642, 70311, 81778, 66948, 51187, 99649, 44509, 12753, 39827, 57393, 40288, 26496, 1500, 32979, 62062, 5170, 25273, 26343, 21058, 66749, 52257, 26335, 4347, 82427, 51381, 66857, 58330, 15097, 23881, 93865, 97929, 11233, 67910, 22731, 70911, 93941, 46169, 31920, 16027, 1635, 16338, 49712, 29345, 26316, 15221, 54771, 34715, 35399, 80287, 90881, 33758, 46569, 52450, 40564, 34885, 5679, 53232, 85632, 87510, 4008, 87014, 49611, 94569, 96432, 57394, 66064, 34144, 67269, 83546, 5901, 25386, 57588, 55055, 6940, 8414, 31432, 75407, 86922, 33925, 24600, 48261, 94439, 34234, 69028, 37145, 32386, 68275, 13237, 3521, 57395, 55029, 16426, 87797, 18559, 72744, 1155, 30384, 19799, 50001, 85831, 19583, 83898, 13465, 58160, 51160, 89216, 90725, 37151, 32241, 6319, 95146, 10376, 55137, 64094, 14990, 19747, 85852, 50692, 63214, 53123, 97058, 60203, 29272, 14439, 69712, 13023, 75808, 67150, 76276, 54521, 46621, 78807, 89302, 30273, 85103, 63180, 75468, 98474, 37749, 66275, 61712, 39381, 2740, 83025, 18083, 42030, 3391, 56204, 3960, 34780, 22476, 50074, 79854, 89447, 3695, 2986, 85090, 71529, 77995, 51572, 60278, 69314, 70777, 46754, 22085, 94517, 98052, 5700, 43157, 12345, 34663, 40350, 5739, 84384, 8354, 81566, 75500, 88934, 67062, 52877, 30428, 95593, 13288, 51836, 25264, 19278, 81290, 47555, 7606, 46694, 29735, 25723, 81597, 26221, 24545, 98576, 63395, 36061, 58752, 8486, 97817, 27235, 18579, 2387, 88017, 42855, 5111, 49094, 28448, 82227, 63436, 89135, 86591, 2922, 72163, 83000, 14378, 81829, 5610, 93513, 78135, 55292, 80776, 21212, 40604, 44442, 50505, 22750, 47985, 19367, 63494, 4363, 64500, 79444, 36504, 43418, 72523, 85981, 13740, 302, 76267, 14962, 79643, 26144, 27125, 13364, 82935, 8936, 8340, 38025, 80742, 42829, 95357, 11131, 6806, 10497, 70527, 3004, 54217, 51051, 34722, 57348, 50489, 76514, 76546, 29498, 40587, 52697, 37808, 32509, 68927, 68051, 53328, 41926, 9344, 67795, 98626, 44058, 46817, 95773, 57539, 13352, 96292, 72647, 47111, 48595, 82684, 43566, 93381, 3081, 27653, 25045, 34753, 80870, 92013, 21935, 89454, 14127, 73278, 87015,
+    65232, 97216, 26840, 21272, 8226, 42347, 44358, 26715, 7860, 31989, 14091, 15648, 85801, 20463, 85221, 77969, 87196, 28563, 69663, 55169, 11372, 38915, 74678, 1183, 14845, 85696, 54995, 62342, 83227, 73536, 64251, 46556, 78421, 89058, 41036, 79746, 42148, 77720, 33923, 24979, 98428, 80202, 36845, 20584, 13506, 97375, 48434, 14863, 29237, 99014, 20650, 48496, 61825, 89100, 51501, 22632, 89030, 22901, 54072, 68093, 98140, 1631, 43266, 34532, 35780, 17763, 41731, 19580, 72266, 66530, 55650, 51506, 92256, 5332, 85143, 65002, 30530, 21358, 88420, 81349, 94086, 68143, 95343, 30490, 61605, 40296, 61665, 21032, 498, 67165, 3151, 94788, 36502, 77434, 88776, 67565, 4404, 51177, 49030, 88502, 92552, 31170, 92051, 79960, 43784, 17864, 54179, 91590, 39153, 75017, 11161, 31100, 27964, 30263, 54908, 57991, 89272, 14642, 40576, 20224, 48887, 93479, 87862, 19858, 78238, 4113, 32369, 70072, 82752, 85122, 72450, 53113, 53806, 45347, 55032, 77242, 70401, 83685, 41229, 47489, 36964, 40556, 2619, 64080, 7354, 10159, 74827, 11846, 64587, 88667, 20940, 93594, 43669, 38592, 20211, 96055, 65995, 89957, 18941, 82750, 90753, 49989, 63331, 52911, 1675, 98447, 35516, 28539, 91592, 80615, 68066, 63922, 52509, 26025, 14634, 69439, 19820, 89983, 38306, 84048, 66264, 26855, 3634, 92094, 61088, 28293, 11428, 68748, 10665, 27114, 20151, 65883, 86423, 77069, 74997, 147, 41427, 26124, 22163, 82452, 61186, 89370, 58583, 2692, 54969, 84679, 26237, 46229, 16041, 28473, 38684, 43587, 37886, 68790, 92030, 85066, 13673, 30280, 91844, 43115, 10005, 1481, 84393, 10008, 60291, 90687, 99338, 95570, 39916, 68643, 41309, 24724, 57188, 75473, 21647, 50206, 6820, 73756, 51102, 76169, 99840, 32863, 17306, 43063, 90483, 15894, 59042, 53797, 93961, 12248, 12125, 39393, 17056, 11576, 6145, 43960, 74245, 86805, 95665, 58855, 50039, 14867, 85076, 3939, 55501, 18184, 62019, 16312, 37518, 18544, 67431, 68250, 70766, 74635, 41835, 74538, 77822, 47918, 90863, 17526, 78930, 47473, 67945, 70385, 19404, 45030, 13476, 46186, 28191, 22019, 18700, 90915, 41408, 63333, 52902, 87336, 72833, 47707, 46692, 47873, 82012, 22597, 46379, 69109, 72108, 47439, 51130, 41894, 29827, 88403, 75040, 37504, 69925, 19034, 57998, 46633, 1021, 48358, 55923, 3536, 26350, 36696, 29658, 25247, 65614, 19042, 34463, 85938, 26155, 49801, 74604, 17581, 91632, 12935, 97966, 14947, 71196, 32270, 51915, 41692, 83274, 6608, 37190, 35363, 85313, 97545, 5696, 23700, 39334, 38434, 20192, 27349, 71340, 19732, 96142, 17152, 32995, 34829, 71157, 36376, 11522, 26646, 19239, 34033, 4200, 39023, 64291, 7931, 42807, 2800, 75490, 4515, 84571, 59557, 13421, 69465, 69121, 82358, 18134, 18536, 74294, 24013, 43777, 94192, 77031, 33341, 98070, 27534, 34419, 40107, 17826, 48196, 82843, 37592, 40484, 49019, 59822, 26118, 89788, 5990, 99595, 35178, 49473, 54699, 81618, 23497, 87025, 29421, 1685, 31406, 54115, 25193, 44525, 44886, 4885, 74482, 63280, 57532, 29773, 83104, 5354, 35313, 12558, 16165, 52712, 82282, 73541, 97334, 7283, 29405, 87694, 64717, 98840, 2868, 17727, 61847, 32417, 91009, 12117, 35077, 36279, 87552, 12441, 70576, 505, 57332, 56191, 33846, 78645, 58506, 48692, 27712, 86722, 46677, 81512, 14807, 30337, 7863, 457, 71893, 32256, 21897, 95811, 73552, 24929, 4893, 49448, 33836, 24781, 43236, 30853, 81985, 60625, 20087, 30674, 39280, 10779, 97785, 11298, 65057, 17589, 44085, 10126, 72351, 4165, 30539, 97124, 20545, 50087, 13490, 4055, 62365, 24046, 63110, 99045, 47122, 74389, 29843, 89082, 71686, 40321, 15789, 63062, 23403, 27718, 72550, 36098, 47309, 60568, 22266, 20542, 59018, 76386, 89381, 9164, 42093, 19931, 90426, 73695, 26948, 17363, 15727, 75439, 45425, 42518, 32966, 80703, 4659, 74566, 22464, 49383, 53167, 80720, 45464, 179, 29789, 19444, 97663, 6466, 51290, 56374, 17869, 97520, 45148, 92149, 54757, 94455, 80125, 98584, 70174, 77708, 59260, 50275, 49211, 60730, 29875, 90935, 29676, 95390, 18263, 73189, 41364, 39707, 75110, 59156, 11770, 38655, 55173, 62547, 16328, 70585, 81958, 61191, 90906, 45978, 59134, 24609, 32956, 30518, 27341, 84512, 24987, 65295, 75210, 97931, 56717, 6751, 83338, 82808, 96570, 27038, 93274, 399, 9330, 54319, 24848, 39269, 92692, 50625, 52306, 93262, 48756, 66694, 50517, 41763, 42231, 8589, 41923, 87839, 9579, 5104, 41634, 63030, 15100, 59593, 38288, 88852, 81957, 84267, 56380, 89329, 74372, 16026, 15795, 29456, 93173, 76367, 37598, 68153, 72405, 55181, 77543, 30730, 27564, 98764, 48711, 22180, 51352, 80150, 50091, 19481, 97962, 74879, 75369, 84410, 54712, 68399, 60910, 57922, 8896, 94118, 5276, 54049, 11614, 98854, 65979, 75156, 39456, 30226, 27357, 71087, 30814, 6416, 56480, 70259, 56525, 69945, 63874, 87262, 97398, 77972, 76745, 97191, 26739, 10957, 48743, 18175, 74688, 49853, 83675, 79232, 72211, 77255, 44445, 81053, 5506, 21366, 99015, 57598, 9467, 65131, 73794, 25679, 3609, 70041, 14653, 93792, 7076, 87326, 12978, 20886, 24089, 82187, 55203, 96649, 51205, 26250, 98219, 64275, 18634, 94004, 50999, 99611, 72380, 28685, 33246, 49116, 44972, 44273, 26558, 84799, 51310, 39480, 16713, 34371, 94308, 38743, 14592, 47430, 74505, 38866, 69596, 84705, 20236, 49353, 28259, 16255, 27665, 94271, 98652, 18279, 4805, 57471, 7944, 72567, 55603, 47327, 32268, 1256, 47608, 80225, 15744, 75492, 74652, 96812, 77976, 72595, 86791, 97736, 83149, 57030, 58553, 7121, 53544, 94894, 57236, 55850, 52762, 36303, 97740, 25314, 43196, 74248, 52320, 60448, 10606, 7010, 21765, 20357, 61825, 34331, 15898, 67485, 70353, 41657, 49212, 21628, 11783, 90514, 33883, 85668, 73432, 55374, 53880, 864, 66975, 51190, 18268, 45344, 99680, 91098, 3893, 90773, 55611, 5914, 14977, 29463, 38339, 94390, 15379, 74717, 78721, 10689, 90966, 33191, 32384, 4363, 61992, 37456, 28402, 51633, 14358, 99226, 23024, 22114, 86438, 70682, 27242, 46237, 92467, 83997, 71994, 59256, 44728, 51372, 50328, 66925, 16487, 7348, 69501, 23328, 55945, 98064, 92561, 5275, 67097, 37616, 8561, 14378, 83858, 44306, 60514, 89238, 28781, 11864, 31540, 3809, 16629, 4336, 70961, 10787, 58719, 39587, 46840, 48993, 18578, 30890, 71438, 29672, 54785, 77570, 25012, 70696, 25935, 279, 74327, 33944, 55060, 72194, 28269, 47600, 2132, 56618, 77029, 26410, 25682, 13744, 31968, 27115, 57065, 49313, 31237, 70475, 38549, 33723, 66622, 19646, 93518, 4052, 29390, 10163, 19879, 10765, 71024, 71339, 69114, 78385, 64440, 79577, 48109, 81114, 4708, 44863, 72410, 71161, 55491, 3433, 88675, 48496, 97875, 17184, 840, 16960, 32880, 48533, 82430, 44005, 36654, 96011, 16158, 21530, 88485, 91231, 77831, 39266, 9833, 96154, 89200, 2021, 57813, 897, 27643, 65750, 27447, 29043, 50691, 74683, 78027, 99590, 6052, 22867, 4567, 3918, 27143, 77750, 32003, 14011, 59006, 33140, 12165, 72413, 89931, 59389, 45281, 52596, 31993, 88613, 85332, 8016, 34419, 80901, 76317, 34932, 71099, 23354, 19296, 42671, 12646, 47189, 67982, 79803, 28449, 6229, 44873, 48970, 10012, 6871, 88240, 1277, 71039, 47959, 45051, 74358, 68394, 49093, 78063, 26981, 8704, 18470, 14458, 38195, 75691, 64683, 44910, 93423, 67591, 36833, 63204, 29507, 38894, 59524, 12141, 36543, 86914, 91250, 45459, 30156, 119, 95390, 75872, 28827, 67609, 99869, 91237, 70358, 60292, 3499, 3133, 45478, 5800, 47576, 50558, 71500, 65579, 84252, 68999, 59495, 79395, 28634, 44121, 26503, 11922, 22058, 34164, 32668, 10422, 62793, 41303, 2030, 76875, 17151, 42101, 22133, 82998, 19499, 14247, 95259, 746, 38449, 72450, 99138, 61259, 65623, 13439, 45597, 55234, 19347, 70266, 4828, 79316, 16983, 49723, 95468, 9747, 81126, 31999, 33796, 15270, 60644, 61048, 98848, 26685, 40980, 23733, 13676, 98363, 17970, 76451, 42657, 13165, 27870, 49193, 56279, 34647, 1652, 47674, 95555, 80556, 52419, 61110, 26124, 49097, 90600, 53605, 97544, 8694, 94739, 59652, 41807, 87155, 83539, 61468, 20614, 12652, 86562, 82894, 94360, 56182, 30513, 65379, 6522, 86486,
+    37674, 44977, 54370, 97381, 60218, 2423, 99591, 69913, 26507, 19708, 6279, 58955, 20126, 1495, 57894, 7638, 38700, 77148, 36844, 7539, 91452, 6914, 74349, 66850, 49104, 6516, 58535, 20851, 27859, 32881, 72919, 28203, 32882, 2419, 77583, 63822, 37703, 66793, 65784, 62281, 55867, 70703, 89344, 1498, 33770, 87176, 95636, 64891, 90736, 95521, 10989, 5237, 99010, 21106, 11422, 1831, 67239, 52557, 36468, 71713, 39637, 49574, 50455, 14953, 96900, 70852, 96982, 4341, 44585, 95651, 79669, 29652, 87294, 74692, 16221, 768, 35380, 21352, 50907, 27259, 11718, 5017, 55964, 94137, 52347, 10595, 12968, 85602, 97965, 18836, 90511, 70960, 97336, 44575, 23791, 42195, 64776, 29363, 42379, 1805, 28919, 6772, 78143, 54797, 27362, 56149, 59048, 38567, 6339, 27787, 42167, 45990, 95532, 54839, 26572, 38496, 89797, 6634, 16468, 24898, 66814, 98126, 31762, 36133, 64539, 43167, 87022, 61295, 30364, 89249, 25756, 63570, 91484, 10564, 79648, 5756, 41376, 61897, 40388, 88927, 62891, 79708, 25495, 22204, 33892, 36871, 19879, 58646, 57061, 73100, 75831, 20029, 67462, 54675, 7766, 2409, 24506, 7877, 11720, 86252, 9897, 8080, 70684, 74497, 2242, 24604, 31969, 83999, 56635, 5283, 64971, 79152, 27470, 89042, 22835, 21476, 50292, 56081, 96342, 32763, 84487, 64856, 79152, 64656, 72169, 69971, 93094, 52804, 80917, 53152, 56016, 28496, 79110, 17133, 12581, 91742, 78929, 2676, 46700, 59528, 93808, 4535, 54035, 40161, 62796, 3598, 97088, 13599, 36337, 73395, 17494, 86275, 62058, 61937, 87747, 94883, 90677, 88544, 72553, 50210, 75481, 64378, 74464, 21659, 30970, 71989, 84846, 72289, 88716, 39143, 8487, 4912, 91013, 18623, 19122, 36507, 76438, 7516, 67970, 72350, 69873, 33635, 55983, 69008, 49545, 3134, 60056, 52509, 63304, 15560, 23651, 81090, 7027, 8317, 33060, 37295, 51961, 53037, 97431, 40512, 23536, 25168, 78455, 85613, 12304, 40733, 99890, 51238, 55439, 96201, 73559, 92533, 90173, 16721, 6078, 29854, 38894, 31117, 63040, 86795, 81786, 21149, 38998, 61811, 48622, 73019, 59296, 13576, 92559, 36300, 77294, 26794, 50912, 98380, 13176, 57746, 75286, 15330, 40921, 7337, 4664, 20384, 4674, 44516, 27633, 31950, 88210, 54536, 9839, 80137, 77491, 18434, 45152, 96942, 41005, 76103, 34825, 86869, 14772, 13384, 21051, 37348, 34434, 97210, 54960, 26598, 60981, 41889, 6446, 64492, 95310, 86236, 81885, 35684, 16539, 98476, 32028, 96470, 6318, 99576, 93935, 48609, 86090, 2476, 65576, 80636, 44817, 99646, 98963, 20486, 26261, 27334, 72946, 82023, 33506, 80193, 13762, 98133, 21134, 33268, 63477, 74609, 30454, 51477, 93391, 96805, 68653, 2714, 63642, 51520, 22972, 13305, 96058, 42336, 74461, 31597, 12050, 81712, 37977, 25718, 4834, 56608, 75731, 406, 28585, 63924, 23702, 29849, 16941, 91921, 65842, 76525, 68534, 50902, 17609, 23852, 53703, 31286, 58526, 9633, 87596, 10654, 2085, 52766, 22135, 76524, 32295, 90072, 70078, 77786, 93741, 87320, 70309, 44024, 95286, 12361, 29682, 59766, 26685, 90686, 81691, 49704, 23431, 53955, 39023, 47261, 1530, 58265, 80065, 95620, 90621, 63760, 90676, 81653, 36397, 20252, 81754, 20256, 67098, 7838, 49408, 88400, 87941, 84533, 6570, 22567, 18850, 55472, 40129, 48425, 23497, 39308, 34698, 53092, 89480, 47785, 57282, 25508, 19006, 50604, 86917, 9436, 88921, 3168, 70537, 3185, 34988, 5462, 69482, 45768, 91955, 56898, 15307, 99731, 89292, 19356, 20646, 66712, 7281, 12856, 31174, 19577, 8726, 62971, 33008, 37118, 59055, 84101, 68445, 91957, 47526, 15627, 79914, 20013, 26147, 80821, 56372, 74205, 28531, 25352, 51775, 93948, 55212, 17863, 91521, 74911, 88160, 2360, 98260, 18294, 62402, 84268, 9580, 42668, 1467, 40059, 5221, 4216, 9917, 35420, 16496, 34369, 50253, 95234, 95114, 84193, 28322, 37031, 81284, 88628, 36782, 42572, 73347, 66188, 43342, 77285, 16513, 89064, 63066, 72645, 67075, 48208, 18181, 77898, 65795, 53707, 39856, 92883, 92567, 49733, 30236, 10273, 53029, 69773, 78379, 72108, 47696, 97557, 95184, 14688, 29853, 62694, 70431, 88435, 58799, 21883, 99866, 69178, 55870, 14414, 85274, 27321, 55555, 613, 15067, 88217, 73655, 99548, 13631, 78789, 36690, 7952, 60830, 77438, 40059, 95602, 43097, 3429, 93731, 90537, 2932, 35702, 16125, 6652, 39632, 39349, 9910, 38103, 78608, 73565, 48556, 28978, 7128, 82326, 53980, 28059, 28212, 87101, 77752, 99170, 56753, 30484, 71470, 32607, 24674, 32687, 25098, 94712, 64024, 48239, 90408, 17316, 99243, 3656, 67402, 48009, 98427, 52800, 56024, 4417, 89747, 93338, 18758, 56411, 44810, 82456, 30808, 75470, 67115, 66876, 53906, 78403, 56059, 34383, 60056, 89136, 7237, 11129, 21351, 78662, 43606, 37454, 45465, 9292, 38099, 81699, 50195, 49368, 47503, 44605, 6523, 81478, 37910, 397, 20256, 6835, 2787, 80383, 4241, 65986, 83870, 21205, 10879, 26593, 44357, 72604, 56131, 43423, 80206, 26240, 87198, 99445, 53504, 10632, 2465, 31793, 89575, 64184, 39988, 60049, 87100, 37151, 61585, 82180, 52065, 72519, 72935, 3201, 5862, 20560, 95339, 21661, 17533, 17182, 71189, 91564, 57999, 35490, 94773, 95056, 51583, 59394, 10727, 8655, 48123, 10701, 25314, 20100, 6533, 46435, 43188, 23001, 23018, 76637, 32018, 36603, 18701, 9550, 61550, 47541, 36500, 67507, 81574, 95490, 69169, 32584, 30045, 64699, 83539, 89396, 42517, 61979, 41528, 8271, 88377, 61423, 1158, 89724, 70789, 14886, 64823, 56675, 97747, 23990, 58495, 82064, 17062, 90258, 86854, 93304, 12925, 49975, 45074, 87155, 72223, 67344, 42733, 42516, 40110, 15444, 88285, 39371, 23198, 61544, 90205, 6192, 15718, 19803, 92712, 20081, 31397, 5555, 70463, 19521, 80401, 74097, 32060, 26495, 20507, 40473, 1449, 57215, 46142, 39303, 50359, 35898, 46908, 90752, 7823, 27416, 73770, 98790, 17907, 29999, 76417, 49926, 76752, 21608, 26524, 88209, 6000, 88897, 19541, 41451, 59538, 56560, 1456, 67828, 82407, 45722, 93344, 54279, 78594, 38354, 93807, 10929, 91560, 60681, 70615, 32527, 10108, 48303, 63134, 28500, 18257, 57081, 24801, 99077, 52197, 15390, 52300, 57116, 417, 7503, 20054, 75315, 81359, 69091, 18853, 2465, 25600, 13522, 74575, 12661, 83071, 15191, 27543, 21730, 60853, 18961, 14773, 89185, 33694, 51143, 1449, 68831, 78062, 65173, 32697, 41674, 9429, 22156, 96022, 46305, 97534, 5685, 48870, 89988, 20686, 66705, 6865, 94250, 16872, 13178, 7420, 73531, 92723, 60620, 48843, 74207, 60016, 50943, 62699, 63507, 76537, 87066, 76922, 24711, 34809, 5021, 31293, 53854, 77607, 52322, 10934, 50284, 87804, 36730, 86946, 80749, 43325, 97958, 7362, 39582, 10042, 42053, 66236, 69931, 23463, 87996, 33563, 4468, 32905, 50815, 79478, 28658, 46018, 23186, 26080, 13494, 6237, 42762, 86440, 77407, 10426, 62902, 73251, 36861, 92357, 98754, 1839, 46391, 11420, 27132, 93028, 39609, 42015, 68218, 54228, 5456, 38705, 64307, 49483, 878, 54360, 54480, 66684, 55089, 4537, 82073, 72602, 96238, 56708, 58625, 32991, 74205, 72868, 79086, 64250, 56376, 10621, 76607, 47706, 72760, 70303, 60715, 14644, 44186, 36264, 29489, 14184, 62699, 30567, 16700, 31222, 15650, 1500, 22950, 54628, 41004, 96094, 70028, 74178, 65328, 26605, 63076, 75271, 79285, 8151, 42101, 56362, 25961, 87864, 972, 29510, 2747, 8877, 9780, 61052, 84105, 15573, 27475, 44570, 25334, 18517, 44237, 84094, 67524, 76761, 65678, 79284, 2462, 42631, 22696, 19223, 29728, 67742, 11883, 59027, 12377, 80538, 2165, 17377, 15030, 49838, 23920, 26025, 68179, 75894, 43783, 97106, 75558, 35528, 52081, 16951, 68855, 402, 21459, 97550, 16948, 5369, 4641, 2663, 15233, 79974, 71093, 15234, 42690, 22322, 54282, 95845, 90010, 40530, 88298, 41885, 7079, 6098, 72786, 36603, 77378, 48393, 45723, 41996, 96025, 89297, 75586, 8422, 24360, 170, 46036, 46725, 67944, 74029, 73069, 45371, 99916, 71085, 42608, 89904, 6393, 51274, 42729, 58924, 82497, 64143, 88622, 18818, 89041, 56090, 21369, 78224, 90450, 45488, 58830, 4133, 98062, 81113, 11285, 51457, 3183, 38800, 65278, 42169, 28602, 52648, 44683, 75647, 11778, 32151, 33528, 23773, 68268, 23367, 70964, 23548,
+    35575, 67570, 77681, 74158, 25374, 62714, 43100, 4977, 51678, 83460, 29755, 15890, 64626, 54044, 14793, 64339, 94008, 97126, 49202, 33889, 12601, 12275, 56123, 94557, 68226, 67200, 9374, 70687, 29211, 8039, 14598, 74548, 37433, 98991, 29933, 37203, 23973, 96482, 64774, 58350, 61781, 31824, 57193, 26476, 21814, 32297, 32627, 44277, 33876, 55468, 81715, 82505, 61462, 20324, 84293, 40116, 51087, 43594, 6854, 59077, 39841, 26023, 22777, 66859, 82460, 89515, 41712, 33711, 71875, 10685, 12655, 50138, 31063, 37040, 95819, 38919, 27391, 29833, 34350, 65646, 7697, 2688, 41146, 13241, 50305, 86568, 24487, 78741, 96370, 21015, 31719, 39750, 25014, 72415, 8486, 90668, 51143, 49488, 21057, 92803, 53528, 39550, 76039, 44185, 32404, 30217, 19796, 38084, 49161, 80140, 20241, 39357, 68908, 93083, 77231, 6952, 36322, 50790, 623, 29730, 13616, 57546, 17434, 93811, 35148, 81419, 40250, 40329, 89126, 72402, 16053, 27107, 28919, 16829, 96582, 65057, 28416, 30801, 77742, 27420, 73118, 89352, 54706, 23035, 88413, 64608, 61930, 15037, 47327, 59596, 18700, 57576, 63628, 56823, 60091, 68209, 21001, 14962, 72257, 83802, 33721, 86343, 11133, 65737, 68477, 90725, 86869, 98403, 47393, 25356, 61372, 8873, 19888, 48836, 66005, 23531, 72520, 26461, 78508, 28213, 96394, 22983, 37856, 71814, 27425, 72753, 27511, 65471, 38592, 3683, 24652, 64505, 92543, 53201, 40639, 99542, 53425, 35321, 47669, 14134, 47727, 48202, 71931, 32119, 50086, 50266, 67159, 89317, 81905, 30315, 49154, 8690, 69365, 56881, 46473, 64100, 38365, 59377, 65630, 54871, 52745, 91536, 16106, 70066, 62063, 84530, 88103, 33599, 51063, 87299, 41880, 25335, 51252, 42788, 13568, 1721, 62424, 83308, 36787, 91536, 92555, 27600, 24030, 12267, 66336, 30242, 7183, 67624, 28471, 48593, 79766, 31178, 47818, 94522, 88855, 45262, 43670, 18065, 25062, 44558, 37189, 69225, 35216, 42683, 26289, 72816, 31947, 65871, 45715, 59452, 22014, 56669, 60331, 33450, 60601, 95047, 30789, 90107, 81565, 32266, 3252, 5446, 58756, 55370, 34034, 81071, 2560, 39054, 39564, 15010, 5389, 60002, 53320, 49545, 48444, 31415, 39278, 79879, 30148, 10186, 60358, 29011, 14419, 95159, 94815, 55251, 90910, 80582, 92304, 11697, 60061, 38577, 84439, 76196, 34542, 50963, 36294, 11123, 59763, 29873, 47383, 12979, 22119, 21723, 64725, 48377, 77132, 9817, 79920, 47653, 60069, 12924, 53808, 55962, 66969, 13757, 60615, 10994, 9138, 34119, 58436, 64407, 75170, 73524, 51864, 94183, 86847, 15585, 57616, 96267, 5340, 52929, 49096, 50291, 5559, 32382, 84077, 6598, 87921, 59719, 31726, 44772, 63373, 75420, 66829, 47275, 98264, 61387, 94945, 44540, 50098, 13078, 44729, 95332, 63555, 30782, 63203, 15071, 60996, 72812, 17418, 80215, 37610, 30670, 44674, 74822, 15471, 25236, 16266, 76213, 35820, 19567, 8715, 72003, 90606, 1434, 53545, 88170, 75014, 62287, 35436, 38669, 12927, 83877, 38622, 28313, 82884, 73969, 38671, 10450, 24158, 22941, 73162, 86548, 42482, 95315, 92016, 96156, 44012, 35962, 6366, 3881, 74300, 26248, 30182, 19164, 67105, 66771, 52587, 69894, 61820, 16551, 50743, 10096, 69030, 24451, 89165, 23929, 96291, 30685, 64413, 19913, 9049, 71383, 61684, 45384, 45927, 81840, 49521, 89594, 30055, 83430, 14930, 60316, 86585, 99375, 80170, 14207, 19584, 20067, 82874, 30159, 46647, 6942, 66777, 32638, 55662, 75470, 77622, 26893, 96149, 14373, 33252, 50574, 7945, 20696, 56662, 94348, 3384, 20956, 89668, 99052, 65131, 56847, 17589, 16419, 2670, 10705, 59587, 92902, 92424, 48570, 11034, 69149, 35733, 17315, 84966, 69353, 69590, 52834, 32561, 6049, 50156, 71676, 76423, 32361, 61509, 8845, 75709, 35956, 21912, 31188, 59083, 43459, 38614, 92206, 55645, 38737, 34193, 6451, 94163, 24326, 49976, 71600, 58024, 67160, 4365, 38270, 59558, 80834, 60739, 54318, 19738, 42196, 43191, 13463, 88914, 99239, 66869, 75691, 33085, 4323, 7170, 46184, 41423, 89835, 46877, 20349, 14365, 32727, 35322, 841, 23597, 43370, 57527, 73250, 32553, 71489, 44617, 98323, 37672, 59549, 96023, 63176, 13524, 15621, 30448, 28136, 45549, 3513, 64153, 19839, 24219, 41987, 51083, 90268, 52052, 31430, 4727, 99409, 43595, 82374, 61251, 51470, 66562, 98724, 23529, 53895, 67562, 87573, 89964, 30821, 15733, 33062, 86963, 33450, 75338, 32570, 14453, 38080, 36335, 84226, 52790, 42883, 61156, 42789, 57846, 60096, 29946, 80178, 15882, 1971, 60722, 62458, 8754, 59991, 89321, 584, 70565, 36458, 21226, 23561, 9837, 39364, 23065, 30675, 9306, 40085, 52082, 89976, 73283, 77851, 36174, 54470, 63250, 72111, 70853, 26723, 42590, 91230, 47512, 13983, 70898, 70927, 40721, 30642, 41628, 90010, 27306, 1933, 43304, 44499, 87890, 22201, 89249, 63935, 48438, 58588, 1061, 70061, 63075, 9676, 65820, 82156, 82668, 111, 54350, 10328, 23466, 98936, 18285, 53919, 32422, 84859, 58387, 24022, 32423, 6010, 56417, 49452, 69999, 14885, 47102, 59577, 24999, 75984, 96464, 59088, 85987, 71442, 88789, 4753, 8229, 76883, 15284, 90610, 40507, 78882, 55575, 25315, 7214, 70602, 4796, 35767, 54657, 42153, 16050, 93607, 99249, 77236, 59949, 52871, 47837, 33534, 30023, 89137, 99938, 35824, 50775, 30282, 82798, 53312, 65277, 68375, 91445, 58166, 43344, 6589, 82515, 34632, 78588, 152, 67554, 15877, 74334, 32783, 45147, 39483, 92067, 59029, 38298, 55229, 28268, 85140, 33451, 15424, 46695, 23201, 83329, 28372, 19518, 89198, 33305, 43892, 470, 37662, 9407, 14376, 80310, 21459, 72381, 80414, 88305, 69073, 63101, 91054, 47190, 48595, 24696, 41426, 35133, 94399, 21790, 55040, 73279, 20809, 67805, 94115, 58633, 78053, 89444, 4112, 8, 34517, 22106, 85934, 86814, 53333, 93437, 85062, 32791, 72744, 99843, 51161, 22730, 34908, 82918, 92566, 22467, 41226, 98518, 29235, 94042, 84371, 79100, 25214, 7764, 59427, 47891, 61092, 23775, 13641, 30837, 77377, 43032, 38441, 29462, 20300, 19070, 20982, 73987, 87836, 68062, 6419, 51563, 40084, 85694, 86677, 47142, 27222, 17844, 19158, 45120, 88524, 74724, 73229, 42470, 38751, 1132, 28603, 61188, 55021, 88825, 58005, 62411, 8843, 94852, 93664, 39253, 27473, 247, 43824, 1804, 8905, 11509, 95659, 7811, 80691, 15779, 49794, 8991, 76099, 29223, 36060, 85399, 41369, 22885, 38473, 22376, 50446, 89578, 25818, 61333, 78787, 47605, 83654, 99068, 52120, 48367, 86381, 19803, 72600, 31998, 37755, 88031, 83969, 42319, 27974, 35780, 93662, 46808, 60529, 15491, 10447, 48829, 33886, 68333, 44855, 86554, 64794, 66376, 58222, 14021, 52043, 56375, 1300, 38105, 89159, 97456, 26800, 93124, 3673, 32279, 30658, 84475, 3708, 93952, 39245, 91980, 55333, 79440, 64407, 46559, 60759, 10688, 49872, 45810, 87405, 66932, 56530, 57751, 9619, 27361, 6356, 65848, 7524, 20273, 22362, 20504, 28042, 39475, 51677, 85733, 32426, 54558, 17222, 56485, 34928, 90917, 70528, 51732, 61014, 98420, 67265, 41383, 3883, 47642, 53324, 93679, 93088, 57534, 44449, 46779, 81482, 54279, 80135, 11216, 92545, 18426, 96005, 57801, 21898, 5104, 83467, 72015, 43783, 89674, 57468, 96686, 95167, 38507, 95187, 64923, 71214, 42834, 93219, 47342, 24476, 84834, 29080, 86533, 30687, 68400, 26933, 37396, 65169, 89767, 20642, 53843, 85167, 77306, 46723, 68501, 4243, 35044, 15950, 40388, 53630, 76125, 10816, 83285,
+    4120, 11402, 91344, 95169]</query>
+
+    <!-- The same as above, but with cast operator -->
+    <query short="1">SELECT rand() IN [41577, 83972, 51697, 50014, 37553, 93459, 87438, 95971, 83186, 74326, 67871, 50406, 83678, 29655, 18580, 83905, 61518, 29059, 56700, 82787, 98672, 30884, 81822, 39850, 80852, 57627, 91346, 64522, 17781, 49467, 41099, 41929, 85618, 91389, 68564, 91769, 81219, 52218, 37220, 97097, 2129, 9886, 52049, 34847, 25364, 36429, 76897, 71868, 58121, 71199, 84819, 69991, 34046, 64507, 34892, 24228, 36986, 28588, 51159, 53444, 80531, 9941, 20256, 48103, 32565, 62890, 5379, 60302, 46434, 3205, 18821, 31030, 19794, 71557, 71703, 15024, 14004, 82164, 95659, 40227, 83358, 24395, 9610, 19814, 48491, 66412, 16012, 71586, 42143, 51103, 24463, 89949, 35694, 39193, 63904, 40489, 77144, 94014, 84836, 9980, 46554, 43905, 25588, 25205, 72624, 10249, 35888, 98478, 99030, 26834, 31, 81499, 14847, 82997, 92357, 92893, 17426, 56630, 22252, 68119, 62710, 8740, 82144, 79916, 23391, 30192, 99271, 96435, 44237, 98327, 69481, 16691, 13643, 84554, 38571, 70926, 99283, 79000, 20926, 86495, 4834, 1222, 39486, 57697, 58002, 40790, 15623, 3999, 31515, 12694, 26143, 35951, 54085, 97534, 35329, 73535, 88715, 29572, 75799, 45166, 32066, 48023, 69523, 93150, 8740, 96790, 15534, 63252, 5142, 67045, 93992, 16663, 292, 63924, 6588, 12190, 31506, 69590, 35394, 55168, 65223, 79183, 32600, 69676, 28316, 72111, 53531, 15073, 41127, 73451, 24725, 61647, 65315, 41143, 26493, 95608, 34407, 76098, 53105, 83691, 48755, 35696, 62587, 81826, 3963, 45766, 82751, 12430, 97685, 29919, 78155, 71636, 50215, 89734, 9892, 47151, 54855, 3428, 9712, 52592, 2403, 79602, 81243, 79859, 57361, 82000, 42107, 28860, 99591, 28296, 57337, 64969, 32332, 25535, 30924, 21313, 32554, 17342, 87311, 19825, 24898, 61323, 83209, 79322, 79009, 50746, 33396, 62033, 16548, 17427, 24073, 34640, 52368, 4724, 80408, 40, 33787, 16666, 19665, 86751, 27264, 2241, 88134, 53566, 10589, 79711, 92823, 58972, 91767, 60885, 51659, 7867, 96849, 30360, 20914, 9584, 1250, 22871, 23282, 99312, 4683, 33429, 68361, 82614, 81440, 47863, 69790, 11968, 75210, 66854, 37002, 61142, 71514, 1588, 42336, 11069, 26291, 2261, 71056, 13492, 9133, 91216, 72207, 71586, 86535, 83898, 24392, 45384, 48545, 61972, 503, 80180, 35834, 97025, 70411, 55039, 35430, 27631, 82533, 96831, 74077, 42533, 14451, 26943, 53783, 69489, 71969, 8432, 37230, 61348, 19472, 59115, 9886, 50951, 57109, 7141, 1902, 84130, 4323, 55889, 47784, 2220, 75988, 66988, 63721, 8131, 95601, 95207, 2311, 26541, 50991, 6717, 2969, 71857, 51034, 65958, 94716, 90275, 21012, 46859, 7984, 31131, 46457, 69578, 44540, 7294, 80117, 9925, 60155, 90608, 82684, 32193, 87071, 28006, 87604, 24501, 79087, 2848, 29237, 11221, 81319, 40966, 87641, 35325, 78705, 88636, 78717, 62831, 56390, 99271, 43821, 14453, 17923, 62695, 77322, 21038, 67677, 41271, 4376, 65426, 46091, 19887, 97251, 55583, 58763, 3826, 35037, 73533, 64267, 82319, 9836, 42622, 96829, 16363, 10455, 49290, 99992, 98229, 66356, 59087, 73998, 25986, 4279, 56790, 69540, 588, 36620, 60358, 45056, 89297, 42740, 8323, 19245, 82417, 41431, 699, 11554, 73910, 44491, 56019, 68901, 45816, 68126, 89379, 23885, 13263, 56395, 73130, 19089, 23771, 10335, 48547, 16903, 6453, 33560, 89668, 38159, 43177, 90655, 49712, 62, 66920, 34180, 12150, 48564, 39538, 85026, 87195, 14928, 8956, 71157, 53287, 39161, 67583, 83309, 92054, 86977, 56188, 15229, 88170, 60894, 58497, 89254, 40082, 86890, 60161, 97291, 45878, 23368, 14577, 92870, 37017, 97356, 99426, 76061, 89186, 99751, 85153, 61580, 39360, 90107, 25603, 26798, 76224, 6469, 7912, 69838, 16404, 67497, 28965, 80836, 80365, 91249, 48713, 17113, 33090, 40793, 70450, 66689, 83698, 17802, 43869, 13355, 18959, 79411, 87930, 9265, 37504, 44876, 97234, 94149, 35040, 22049, 49248, 6535, 36080, 28346, 94437, 78319, 17961, 89056, 56161, 35810, 41632, 45494, 53351, 89729, 99510, 51584, 59688, 6193, 70809, 51093, 92589, 90247, 34910, 78235, 17362, 49423, 63324, 525, 37638, 72325, 89356, 15298, 59116, 17848, 65429, 27029, 84781, 70247, 8825, 35082, 70451, 22522, 58125, 91879, 90531, 2478, 463, 37902, 54405, 87267, 72688, 22803, 33134, 35177, 84551, 44974, 88375, 76407, 27774, 33849, 19915, 82014, 80434, 26380, 48777, 53811, 14838, 26829, 56441, 99869, 49574, 85476, 19723, 16907, 4018, 37338, 78510, 47912, 13030, 65277, 95716, 67363, 21393, 89887, 78842, 81650, 903, 17436, 30704, 49223, 27198, 25500, 52214, 54258, 70082, 53950, 49312, 43615, 99473, 94348, 53661, 96213, 96346, 62010, 38268, 32861, 75660, 10392, 89491, 68335, 29817, 88706, 24184, 36298, 43440, 21626, 26535, 44560, 46363, 12534, 99070, 95606, 33714, 73070, 8303, 29853, 23014, 99982, 4530, 14955, 45803, 50, 90750, 30394, 81276, 95563, 47314, 58520, 91299, 88944, 54402, 67405, 29253, 47079, 71734, 99728, 17652, 13307, 35556, 18962, 26780, 17771, 53712, 60055, 37628, 35830, 90739, 61151, 41309, 27652, 3051, 53167, 98417, 19382, 36833, 75085, 65374, 87732, 30352, 31776, 32765, 97565, 92199, 49050, 29503, 51024, 18834, 8515, 24069, 96216, 10777, 90680, 18974, 68884, 85305, 36007, 56707, 4212, 47352, 34426, 13185, 92939, 95782, 70577, 58080, 98279, 3906, 5065, 56896, 16382, 31273, 17117, 98602, 12786, 24086, 63970, 72756, 35798, 82367, 7356, 53398, 68503, 2962, 16425, 67334, 68461, 65439, 15620, 70906, 29649, 46461, 74602, 38012, 71714, 16825, 89480, 53386, 88532, 35104, 28556, 82120, 23155, 23347, 24797, 60061, 54962, 99427, 82248, 82447, 39968, 63727, 27431, 81511, 91168, 71425, 80740, 84127, 40717, 15503, 15419, 46594, 61263, 19212, 53175, 70724, 74445, 23034, 71818, 40246, 18886, 53066, 4880, 83701, 86107, 87862, 44751, 392, 73440, 90291, 93395, 20894, 38463, 32664, 55158, 20090, 50004, 79070, 98471, 85478, 96615, 68149, 78334, 97752, 73207, 71678, 91238, 96757, 82598, 194, 35797, 45120, 60782, 28721, 17676, 78066, 60957, 11826, 51563, 50516, 16485, 47053, 31738, 48923, 23554, 96850, 42033, 73701, 78607, 45979, 54571, 12415, 31693, 15356, 36902, 9126, 3767, 3295, 90402, 24005, 95350, 67033, 49137, 72606, 51899, 17522, 31957, 44641, 53982, 23767, 68257, 15766, 19995, 2107, 48788, 11765, 91055, 46576, 54651, 50381, 62827, 73636, 46606, 98753, 37631, 70441, 87916, 66983, 33870, 31125, 12904, 57040, 4874, 58632, 42037, 18782, 5998, 18974, 57949, 81010, 90407, 99874, 20462, 89949, 10952, 71454, 95130, 46115, 3518, 13384, 69039, 79482, 22076, 59782, 32042, 40930, 60243, 29298, 6790, 46985, 44398, 85631, 14380, 66179, 2629, 32126, 49833, 14118, 58492, 31493, 81172, 96638, 8745, 89663, 76842, 78633, 41373, 83721, 42886, 11123, 32739, 11051, 1303, 92314, 83324, 85600, 44276, 69064, 56125, 84650, 31028, 12628, 14502, 64764, 39405, 44855, 79046, 51716, 46824, 83389, 1941, 1257, 9280, 73176, 84729, 2579, 63366, 22606, 35541, 51096, 13447, 18355, 68037, 28436, 94116, 81070, 78355, 67897, 5296, 32742, 77645, 91853, 18767, 67949, 40963, 5792, 17278, 25597, 41884, 80829, 7099, 18645, 60295, 12082, 81800, 78415, 18082, 38789, 16295, 72377, 74949, 55583, 66853, 15402, 72977, 15123, 99434, 34999, 21687, 76049, 42987, 83748, 88256, 66688, 21766, 20304, 29271, 10069, 19822, 11792, 42526, 74143, 17289, 30253, 6367, 20888, 12975, 94073, 98639, 30134, 26320, 65507, 69002, 53120, 4550, 38893, 18954, 38283, 54863, 17698, 99670, 10521, 92467, 60994, 18052, 48673, 35811, 87282, 62706, 16061, 53112, 22652, 37780, 55662, 26331, 49410, 79074, 10623, 69577, 79613, 9491, 31229, 43922, 84231, 58409, 36386, 46875, 74431, 76735, 38776, 23350, 7314, 9079, 51519, 98544, 70216, 63380, 90381, 1295, 46901, 58225, 55339, 89918, 75522, 35431, 89460, 49552, 89302, 23068, 28493, 3042, 25194, 59520, 9810, 95706, 81297, 89638, 54794, 94527, 45262, 97932, 78685, 6947, 22818, 48700, 9153, 12289, 22011, 58825, 93854, 65438, 4509, 33741, 28208, 69061, 48578, 40247, 77725, 31837, 39003, 69363, 78113, 76398, 97262, 67795,
+    68446, 58896, 60969, 19849, 6722, 91854, 49519, 13949, 67109, 48824, 31723, 75554, 69575, 94986, 75350, 18628, 15284, 41943, 15433, 52607, 41, 22340, 29528, 24059, 34145, 72517, 46316, 10667, 54510, 19882, 47764, 69124, 41963, 84350, 48420, 4646, 24958, 69020, 97121, 26178, 62664, 50622, 32554, 49655, 45398, 11267, 72222, 73363, 89554, 89046, 57384, 29259, 37888, 24850, 74353, 57343, 34762, 2900, 11393, 42154, 94306, 70552, 75265, 921, 26003, 64352, 89857, 83171, 58249, 48940, 53512, 66335, 44865, 68729, 19299, 58003, 39854, 99122, 3860, 80173, 52242, 90966, 53183, 71982, 82325, 87842, 15000, 55627, 71132, 6354, 42402, 91719, 91644, 94533, 74925, 66278, 66911, 85576, 40495, 70919, 71797, 87835, 29845, 71832, 3390, 7994, 33499, 70715, 54897, 82710, 63077, 78105, 24758, 89585, 84607, 46477, 78618, 10989, 39222, 98749, 51685, 94664, 31008, 32823, 89521, 72160, 26952, 4001, 21421, 5737, 74027, 88179, 45553, 83743, 19913, 49435, 65616, 82641, 5149, 76959, 40681, 73023, 2670, 30845, 18863, 35094, 88400, 80963, 9154, 16571, 64192, 59694, 41317, 59942, 58856, 99281, 67260, 66971, 22716, 76089, 58047, 67071, 53707, 462, 52518, 72277, 10681, 69, 98855, 12593, 88842, 67242, 73543, 37439, 18413, 67211, 93495, 45576, 70614, 27988, 53210, 18618, 21318, 68059, 25518, 55917, 56522, 16548, 2404, 93538, 61452, 66358, 3709, 23914, 92426, 81439, 38070, 28988, 29939, 2948, 85720, 45628, 51101, 89431, 86365, 17571, 50987, 83849, 11015, 83812, 66187, 26362, 66786, 22024, 93866, 36161, 90080, 64874, 37294, 83860, 73821, 80279, 36766, 73117, 44620, 84556, 42070, 90383, 27862, 20665, 67576, 34997, 57958, 80638, 84351, 63961, 1362, 14338, 80377, 24192, 41294, 57368, 51189, 27287, 45764, 86289, 65600, 708, 84090, 96005, 55676, 84855, 72385, 70018, 9336, 82701, 3710, 52083, 74045, 96454, 30956, 67369, 78941, 81810, 71906, 23194, 33042, 50794, 61256, 24449, 48639, 22916, 78303, 13666, 40762, 43942, 51075, 89783, 95786, 90462, 6181, 36482, 40675, 4970, 6388, 91849, 72579, 94983, 86084, 20140, 68427, 48123, 43122, 98066, 37560, 6927, 72803, 5546, 62259, 98439, 6457, 98568, 70499, 33022, 28226, 29675, 20917, 75365, 20900, 8190, 56736, 99153, 77779, 49333, 50293, 97650, 4067, 47278, 42761, 71875, 13966, 11223, 46783, 18059, 61355, 29638, 75681, 24466, 89634, 20759, 83252, 37780, 15931, 74893, 6703, 64524, 80656, 85990, 78427, 18411, 20696, 86432, 93176, 69889, 15072, 15180, 9935, 10467, 60248, 42430, 62590, 89596, 27743, 26398, 79912, 60048, 50943, 38870, 69383, 72261, 98059, 55242, 74905, 5667, 54321, 70415, 39903, 49711, 85318, 79979, 59262, 82321, 15263, 17416, 74554, 94733, 72112, 49872, 54849, 73883, 78250, 74935, 68559, 57564, 50541, 45730, 41595, 5588, 83723, 42891, 11898, 14348, 99732, 14481, 85233, 21277, 94508, 52551, 74187, 7634, 42912, 25100, 43536, 35798, 48190, 86477, 22680, 48148, 59501, 56563, 16802, 81496, 97568, 68657, 51462, 67953, 99660, 39002, 54170, 57190, 68086, 52700, 6487, 55709, 70418, 62629, 70420, 35695, 36152, 45360, 53503, 46623, 76000, 50648, 97876, 44815, 29163, 1356, 64123, 71388, 17658, 99084, 58727, 59437, 38773, 71254, 81286, 97545, 18786, 56834, 20346, 36401, 62316, 58082, 67959, 99876, 69895, 80099, 62747, 20517, 99777, 6472, 49189, 31321, 39992, 68073, 13378, 51806, 21776, 52060, 96983, 25754, 93709, 96627, 8644, 93726, 14002, 37716, 87620, 34507, 76339, 24491, 5849, 44110, 522, 66521, 12776, 44887, 80535, 14548, 75248, 671, 73071, 35715, 59474, 7061, 82243, 56170, 20179, 59717, 1725, 24634, 11270, 77023, 63840, 46608, 44667, 22422, 59771, 94768, 73033, 82905, 16463, 40971, 22204, 58366, 28721, 14907, 76468, 81872, 38418, 36989, 61439, 10610, 131, 44296, 35453, 10117, 75856, 94603, 99602, 68075, 35949, 13599, 50030, 69633, 55956, 85465, 16429, 86081, 11145, 6195, 82207, 90598, 92814, 23725, 83204, 80346, 71542, 46634, 15820, 54123, 45397, 15322, 61743, 9273, 71347, 6835, 64006, 91718, 43677, 32923, 21486, 17098, 61694, 43347, 40019, 4071, 52443, 42386, 56839, 83514, 27633, 40780, 51749, 92101, 62384, 92206, 56044, 66174, 11137, 73966, 78471, 30468, 31643, 33197, 6888, 8066, 86603, 74383, 6098, 54411, 98819, 89862, 88639, 94422, 89371, 80526, 91747, 91220, 64944, 76658, 42046, 58518, 27249, 6646, 3028, 1346, 33763, 9734, 31737, 65527, 5892, 60813, 3410, 35464, 43009, 98382, 70580, 93898, 56404, 32995, 62771, 71556, 40538, 55612, 45656, 10758, 20268, 33603, 38310, 14242, 74397, 10722, 71575, 22590, 49043, 91439, 9055, 23668, 9101, 5268, 64133, 77501, 64684, 11337, 47575, 50732, 88680, 93730, 46785, 17589, 3520, 57595, 71241, 34994, 8753, 36147, 88844, 41914, 11250, 94632, 71927, 4624, 86279, 7664, 2659, 94853, 65386, 30438, 86005, 92883, 84629, 59910, 44484, 1306, 8404, 56962, 29990, 38445, 96191, 73013, 66590, 40951, 24712, 18825, 37268, 87843, 18972, 12154, 7779, 52149, 76152, 65799, 86011, 35475, 78083, 88232, 91551, 65532, 93516, 73827, 24227, 44687, 55759, 83819, 45088, 10856, 60488, 39051, 14103, 76650, 81181, 46731, 737, 58788, 78945, 42096, 66731, 66740, 72273, 88969, 5655, 86590, 41096, 80038, 32430, 51877, 23970, 91900, 13082, 45880, 94367, 19739, 61998, 71665, 16083, 57035, 26916, 10166, 18834, 46798, 66881, 28444, 68840, 10459, 81087, 4728, 76224, 39257, 23470, 93524, 37345, 30074, 49856, 22022, 55279, 5159, 5193, 58030, 57539, 12514, 49759, 96222, 52597, 67192, 88187, 53614, 16084, 79915, 28212, 79334, 85283, 32306, 31058, 43113, 74707, 74869, 2213, 32134, 6379, 85426, 87098, 35984, 51105, 69287, 16803, 83337, 14913, 62531, 58098, 7914, 20105, 28850, 1384, 43173, 62983, 87113, 76066, 86320, 77684, 45191, 95225, 41503, 36713, 48404, 91228, 53865, 98981, 59161, 61237, 84561, 17455, 14379, 57789, 80895, 99260, 84595, 72942, 53220, 84448, 81332, 49437, 83086, 93414, 54519, 52288, 74772, 22460, 49324, 11168, 96071, 61985, 38284, 6405, 54698, 71727, 60093, 37340, 87884, 83403, 4542, 94949, 19636, 15855, 39105, 10424, 67418, 91022, 69254, 8481, 38411, 3832, 44354, 93548, 57172, 28481, 372, 81497, 52179, 41060, 72141, 41396, 65590, 70432, 82819, 93814, 26118, 84780, 88485, 70821, 8222, 83000, 47067, 38516, 33347, 47681, 48202, 60749, 52112, 7937, 28105, 11394, 45746, 43252, 34494, 2979, 69715, 42486, 82315, 71760, 97413, 66137, 94487, 7429, 74434, 22964, 55251, 3448, 53534, 2574, 9693, 96157, 2955, 4348, 19566, 56930, 83319, 31310, 53905, 1148, 41726, 22233, 76045, 37351, 10545, 17581, 28047, 30199, 4741, 58111, 33497, 67796, 67730, 31247, 43772, 29461, 45970, 73353, 22534, 53962, 32147, 71392, 62579, 66345, 58246, 33442, 9581, 29705, 14058, 86471, 76125, 59363, 94982, 74810, 89149, 20066, 3366, 3568, 25752, 80036, 64119, 27270, 40061, 91052, 69022, 9852, 77112, 83075, 43924, 61661, 56133, 96652, 57944, 72576, 82170, 79236, 55745, 15309, 88878, 72761, 37647, 67465, 12777, 97309, 93202, 41470, 8787, 64920, 48514, 18917, 35157, 59151, 4640, 5317, 38134, 76548, 82788, 9214, 58418, 73185, 90554, 10543, 47182, 62936, 91765, 89751, 68931, 48865, 64607, 7150, 77862, 14297, 14828, 33013, 91698, 67593, 98096, 16595, 51639, 86531, 24719, 1703, 78788, 43810, 38918, 95491, 99903, 82671, 8291, 68288, 31224, 39863, 4265, 77798, 7698, 33804, 92286, 4744, 37038, 44203, 98212, 17369, 77442, 62879, 4145, 96881, 15646, 36824, 19959, 45451, 76049, 54272, 97577, 95298, 81115, 30204, 82041, 8037, 10052, 8756, 76833, 82851, 24276, 75574, 36037, 78079, 92807, 29064, 90000, 84150, 17102, 75092, 49424, 35597, 4693, 82853, 42511, 16119, 23478, 65240, 55585, 91762, 71671, 46682, 72479, 97696, 24615, 12579, 30274, 48255, 2336, 90202, 5808, 45426, 76308, 74639, 31245, 99894, 89638, 6233, 33893, 71899, 85273, 89429, 29761, 50231, 57249, 99347, 22642, 66972, 86221, 47514, 88274, 10819, 73150, 53754, 13304, 20478, 38099, 619, 14669, 8011, 97657, 26569, 65430, 13467, 38180, 23675, 72350, 42257, 39875, 23529, 53407, 11833,
+    29599, 95621, 7727, 59527, 86846, 22860, 5358, 3730, 87555, 362, 95755, 54565, 29935, 68950, 52349, 98344, 86576, 7420, 12236, 15844, 48099, 97535, 97081, 50261, 31187, 60496, 24123, 24042, 6376, 6679, 99806, 20306, 60676, 36881, 77309, 5247, 96569, 53417, 73252, 64179, 35318, 75732, 65119, 32621, 40464, 22887, 96152, 65161, 83381, 8915, 68142, 7328, 85031, 15688, 72519, 93992, 86927, 75538, 38205, 50877, 70039, 97538, 94822, 52131, 49643, 85206, 1347, 14574, 88736, 53442, 49991, 64925, 72283, 82213, 60905, 36118, 62963, 16983, 79185, 15111, 26059, 17792, 98218, 33214, 1094, 41754, 77275, 65173, 13190, 91004, 90422, 44387, 92672, 98641, 54609, 83295, 37395, 70104, 32986, 72524, 82478, 5837, 83916, 52736, 57112, 55985, 42642, 42136, 89642, 35712, 49489, 19726, 65824, 24384, 48112, 15366, 99206, 68384, 51389, 529, 21475, 75749, 95182, 60110, 70571, 74174, 38105, 78107, 4101, 8982, 11215, 23987, 3303, 28706, 54629, 98000, 67510, 30036, 99140, 48896, 40971, 7735, 79984, 50134, 94928, 57023, 52880, 83067, 41940, 62994, 89213, 38593, 19283, 68206, 22234, 19245, 26266, 32403, 65889, 17022, 64280, 42797, 27161, 57675, 42313, 93606, 93082, 20659, 90824, 1226, 66266, 12503, 57104, 15247, 51160, 92398, 71967, 59476, 44465, 35765, 10787, 47737, 45792, 2292, 47599, 89612, 8162, 87622, 69410, 45727, 31158, 99791, 89544, 27214, 99588, 40516, 75616, 36505, 46079, 95448, 97999, 47462, 47799, 82729, 34038, 60789, 96938, 22682, 79062, 93307, 36038, 49016, 90983, 48219, 50889, 32517, 72219, 71229, 82643, 1195, 70543, 17, 22178, 23544, 72371, 1163, 28527, 7336, 39846, 31956, 80963, 41804, 59791, 41831, 1940, 52377, 79494, 12531, 81112, 44320, 18746, 5774, 63869, 4085, 59922, 12751, 99443, 13530, 23872, 36026, 83360, 32711, 92980, 11140, 99323, 57263, 98149, 29265, 25548, 65995, 4818, 15593, 8535, 37863, 12217, 14474, 66584, 89272, 86690, 58777, 39666, 44756, 18442, 52586, 98030, 40850, 38708, 49304, 68923, 65008, 84388, 83639, 29866, 63675, 26793, 49227, 82099, 24090, 57535, 24201, 65776, 74054, 89833, 62979, 26613, 5851, 99766, 63484, 66605, 37179, 90760, 59336, 58390, 93239, 84578, 11396, 93994, 73818, 23972, 37720, 72369, 25063, 32952, 71036, 76612, 31285, 34090, 19136, 53783, 66436, 61478, 96749, 43658, 7399, 31574, 67073, 40480, 20727, 70993, 65549, 30800, 21507, 53785, 89574, 86381, 56492, 62603, 44856, 68687, 63794, 70996, 7475, 84238, 71939, 86886, 94792, 15036, 36936, 95722, 17771, 67850, 33371, 49314, 40744, 5432, 81057, 41201, 75986, 22961, 15323, 1570, 18657, 95219, 19130, 53127, 15867, 81135, 73206, 76668, 36386, 48828, 31417, 56916, 70891, 60534, 95777, 10022, 94053, 2928, 56326, 16559, 79656, 6414, 81247, 78270, 55687, 19151, 61597, 99857, 81142, 27725, 53493, 12185, 1455, 48501, 59425, 20591, 24900, 66079, 84889, 32024, 18919, 2043, 7076, 71201, 88258, 86521, 93348, 26395, 39646, 44145, 33911, 46231, 67054, 39979, 11630, 23020, 76278, 88056, 11480, 4723, 78612, 70211, 60622, 84687, 59092, 65675, 38479, 64399, 64699, 95964, 42764, 69060, 28189, 4193, 95805, 75462, 17245, 59640, 94773, 84292, 53092, 98507, 61353, 32483, 53027, 48912, 87221, 47788, 59263, 65196, 35567, 17494, 64253, 50223, 7057, 87467, 62414, 2523, 50910, 72353, 78986, 78104, 47719, 29108, 12957, 5114, 64435, 66707, 37449, 70399, 45334, 71606, 55338, 55072, 58765, 12151, 22012, 16954, 87366, 14240, 98041, 72296, 47408, 56879, 99584, 63172, 92316, 28071, 29880, 19608, 13839, 87484, 56541, 88662, 87098, 72124, 78282, 27653, 38993, 31870, 67239, 99445, 7376, 78487, 98880, 12180, 86773, 67773, 15416, 58172, 13075, 67559, 97510, 29705, 86985, 57024, 11827, 31236, 91920, 26116, 94614, 14486, 46252, 78847, 43786, 70048, 96739, 35240, 39933, 58209, 27852, 65669, 47323, 58150, 84444, 44344, 95882, 41258, 31314, 69060, 19916, 6979, 19436, 45572, 16259, 74566, 6306, 24705, 53422, 593, 97031, 22308, 26875, 23042, 78035, 34229, 61976, 23175, 50072, 90896, 50810, 71730, 86468, 94807, 8218, 36032, 58628, 60560, 51206, 37943, 27987, 15014, 49905, 70018, 66799, 80851, 23594, 29982, 6438, 97381, 47715, 96294, 17985, 48545, 12672, 5250, 9988, 24601, 3736, 97815, 54363, 64703, 44167, 68376, 16595, 38073, 29630, 59630, 1858, 71823, 75580, 70083, 14493, 93821, 93394, 85369, 3818, 8435, 59988, 43966, 13961, 15855, 83332, 80312, 27299, 88840, 76964, 56173, 62794, 79389, 82642, 85843, 47116, 43064, 16061, 28905, 54415, 72832, 91252, 93488, 79457, 99336, 70744, 80432, 6487, 880, 87701, 154, 86574, 86677, 17892, 81488, 95260, 12515, 43189, 9211, 55403, 41417, 60046, 54785, 83655, 28274, 65745, 63062, 44549, 36391, 48051, 7328, 3572, 33226, 49177, 25123, 59065, 19691, 15109, 10172, 95578, 29497, 48152, 20276, 36270, 78866, 48309, 53209, 55475, 30073, 19717, 16004, 45692, 83430, 9291, 45935, 57030, 92613, 91656, 67697, 34915, 28156, 56594, 3273, 11194, 98270, 34370, 2621, 66679, 97451, 97717, 87923, 48310, 37725, 69743, 75103, 84956, 75163, 16069, 65304, 19397, 18071, 27273, 49823, 57595, 98324, 82174, 10293, 80943, 64184, 19472, 4198, 9410, 25927, 65961, 33155, 95168, 33692, 61712, 69877, 13308, 17415, 10022, 2491, 67310, 96140, 68050, 76272, 17143, 76805, 57176, 7539, 22690, 95483, 87592, 27221, 90821, 51154, 99828, 68998, 54581, 74222, 10269, 65057, 45467, 96089, 55058, 89779, 60837, 74122, 52886, 58055, 14880, 93208, 66652, 68830, 24121, 62407, 87257, 18802, 14925, 45423, 98624, 55195, 59072, 41414, 77840, 66075, 62705, 26549, 19063, 57552, 2507, 52069, 57620, 66688, 14833, 33700, 90666, 98052, 5367, 2268, 43093, 69063, 22030, 85564, 92258, 1847, 24446, 65835, 38660, 91899, 87732, 52396, 31952, 36000, 86944, 16109, 80729, 53757, 60226, 59103, 84187, 36674, 72823, 29884, 4654, 69139, 20440, 57413, 3651, 39639, 44564, 57492, 84159, 751, 99748, 9659, 72661, 39220, 99742, 74734, 75729, 38071, 69934, 73640, 65294, 54524, 64372, 37927, 17187, 7863, 12732, 40296, 36197, 15821, 76831, 4400, 71933, 4040, 22072, 33064, 25702, 13324, 91275, 27388, 97729, 14620, 45989, 80737, 17934, 4219, 3032, 43457, 31051, 24469, 67041, 29328, 75499, 80951, 88212, 92595, 49969, 24612, 58732, 2718, 3805, 50918, 99426, 8614, 35580, 93273, 989, 24385, 41185, 25687, 47146, 25227, 95839, 56355, 98536, 79824, 31725, 46447, 26690, 68418, 47783, 33725, 21729, 70797, 59038, 60376, 25087, 68332, 67950, 12411, 95918, 64736, 65336, 74947, 64605, 4106, 42712, 96640, 28492, 28648, 42429, 821, 24333, 69677, 38959, 23484, 92005, 29352, 29159, 52873, 99947, 21834, 85347, 93479, 28298, 55608, 3226, 69714, 80283, 6577, 18849, 44605, 75286, 28139, 26541, 12867, 57500, 86617, 33005, 57498, 60223, 74954, 51401, 55246, 5648, 16513, 40930, 43821, 32090, 66002, 65530, 76083, 6047, 6879, 94987, 80787, 11688, 77161, 92670, 6696, 400, 28572, 47234, 51375, 88518, 762, 92617, 54260, 7560, 60180, 43331, 64059, 27616, 75839, 21392, 47756, 46254, 19486, 88533, 30130, 93694, 8557, 66534, 94447, 16910, 6480, 77440, 24366, 6195, 48946, 28597, 44429, 50300, 73556, 40638, 98709, 94413, 15987, 43860, 64871, 93953, 34506, 7296, 31753, 30626, 77510, 39829, 25696, 39776, 69185, 36540, 65413, 31528, 43446, 73532, 49776, 30282, 30004, 26725, 15200, 33958, 90320, 71836, 48051, 31970, 5326, 96194, 69695, 60898, 60945, 18271, 50868, 61468, 23593, 68985, 20628, 58044, 8942, 34849, 7384, 50500, 62895, 78780, 48946, 65278, 4067, 973, 34761, 15512, 73739, 23138, 47322, 55568, 32259, 71816, 49277, 75218, 76104, 19579, 68312, 67904, 33886, 53888, 26421, 43859, 40291, 39068, 31711, 36542, 10195, 39781, 72352, 13188, 34113, 9428, 60443, 4987, 13783, 80744, 63483, 18266, 11961, 87167, 46987, 28480, 74214, 39191, 8146, 38090, 75727, 79245, 47720, 52547, 45321, 4972, 49701, 74354, 69672, 63455, 41902, 5667, 54166, 4962, 25873, 44509, 73332, 73383, 29438, 21455, 12320, 11997, 16921, 49379, 63027, 86175, 8110, 76149, 2520, 11256, 25863, 50518, 69001,
+    79113, 9447, 91840, 5242, 10998, 46496, 2448, 56058, 20970, 10517, 17783, 25723, 97137, 62840, 1264, 78691, 81020, 55335, 48524, 2088, 90413, 76651, 26855, 16177, 14954, 62914, 21344, 5708, 75560, 39311, 95865, 28783, 64902, 95657, 46276, 33426, 4799, 11588, 57513, 73689, 77677, 63011, 97795, 34954, 76866, 32043, 32697, 26643, 36890, 53476, 3011, 13963, 49551, 87671, 67761, 17488, 94770, 50599, 33272, 23091, 38079, 41177, 22395, 91656, 79679, 38687, 57384, 80118, 42507, 4098, 78949, 45669, 48802, 83915, 78292, 4369, 57657, 49146, 45192, 98491, 72457, 46331, 207, 81601, 7409, 70856, 91605, 70295, 9171, 72293, 32997, 78025, 16795, 73534, 68780, 21284, 31767, 94381, 86439, 12420, 53285, 99563, 60502, 67954, 55012, 99809, 5431, 69978, 99712, 14401, 79498, 4495, 3045, 528, 72542, 91604, 72725, 39378, 80378, 41996, 20138, 54545, 59730, 36951, 45157, 37964, 97690, 12184, 4944, 53803, 93605, 60851, 68938, 46285, 89663, 90309, 6907, 87239, 81791, 83292, 90013, 68927, 14725, 81840, 63836, 52068, 43830, 4794, 931, 59255, 8263, 99057, 94401, 69033, 7437, 20364, 92884, 28193, 43932, 37629, 59426, 18891, 8583, 79551, 87242, 1483, 6725, 65786, 16844, 12650, 99305, 42841, 9811, 18800, 39313, 51373, 31874, 84558, 27831, 48614, 48975, 55509, 83363, 31854, 64001, 94028, 76125, 79314, 24893, 81132, 9441, 86015, 28356, 40358, 10160, 23328, 7330, 76538, 37611, 89351, 84132, 97047, 26109, 95222, 35130, 75600, 88602, 15073, 87835, 71649, 28948, 81615, 37498, 28674, 59776, 44095, 65924, 64368, 94536, 12518, 61711, 55619, 82949, 4114, 21540, 70544, 28022, 79983, 28781, 7749, 97873, 4951, 50076, 47611, 99522, 56820, 38653, 49047, 36283, 83908, 72452, 85625, 10811, 36998, 44083, 34864, 44975, 39057, 4551, 68450, 24781, 1503, 9871, 46885, 11424, 21259, 54900, 97669, 85669, 6015, 2521, 37661, 14915, 57423, 91903, 94789, 32059, 64972, 4600, 61465, 27118, 79785, 13547, 49766, 38410, 68860, 63756, 23621, 64387, 46255, 63408, 11297, 41081, 56326, 58349, 98703, 72268, 73574, 32098, 42534, 91502, 38083, 11241, 56828, 12098, 25377, 37054, 56328, 30034, 26922, 68401, 93478, 63275, 62650, 81407, 773, 79499, 14970, 47217, 1187, 57428, 69980, 77764, 74791, 22107, 54363, 39247, 56028, 56982, 84244, 21464, 18716, 25533, 94589, 94768, 21537, 18436, 81135, 27654, 79713, 56630, 61571, 58453, 26758, 68450, 68449, 2994, 15347, 83954, 71823, 6428, 44210, 79597, 95144, 32871, 1991, 320, 77157, 63607, 31154, 48846, 71125, 61750, 59608, 33038, 35733, 68915, 94127, 50383, 64242, 49708, 57270, 65019, 8581, 12111, 18487, 50013, 58664, 22214, 19033, 33681, 44754, 28830, 10381, 52318, 34959, 20682, 55453, 53800, 65774, 99164, 72102, 36986, 44157, 56716, 7974, 81475, 25926, 39402, 33688, 99671, 95312, 42268, 26536, 14482, 67377, 57993, 89147, 15834, 64995, 4700, 18714, 30221, 39095, 32749, 69257, 55204, 30497, 31839, 63045, 30009, 62683, 31232, 77680, 93551, 63589, 6989, 77246, 42169, 46117, 73226, 37427, 1858, 83649, 37410, 86369, 4641, 74481, 66168, 48041, 22597, 14670, 27464, 57165, 20939, 36282, 76940, 73358, 50521, 69603, 8895, 81793, 57743, 81903, 64025, 91641, 25276, 34040, 62642, 64015, 57657, 84890, 73832, 782, 60160, 16998, 40023, 24590, 88613, 76640, 53091, 67600, 80183, 45674, 64464, 25163, 42384, 66972, 13953, 41966, 66048, 15135, 73745, 19466, 53657, 34619, 13462, 15905, 48257, 73297, 238, 93525, 80556, 5942, 5411, 66169, 9090, 95130, 74316, 57321, 48083, 62355, 68113, 15239, 36644, 80326, 65817, 54428, 61955, 58849, 77206, 16073, 98261, 92091, 39178, 35464, 85109, 85452, 21128, 25665, 81860, 44664, 24024, 56960, 95124, 39786, 18836, 11121, 44163, 81074, 79064, 46219, 94694, 44233, 81469, 24642, 15030, 21995, 13587, 40755, 6669, 81093, 74305, 1881, 55649, 37273, 80827, 98643, 46694, 59281, 79231, 42813, 84984, 7052, 98113, 17296, 84434, 31205, 46894, 71219, 74530, 44686, 70744, 91388, 20692, 96853, 73803, 15836, 18126, 49686, 4179, 47588, 87892, 65425, 68012, 97468, 92510, 99271, 58694, 11918, 37051, 18644, 57228, 14265, 57572, 57022, 52186, 30193, 93570, 87872, 5257, 26784, 6476, 61746, 68559, 1720, 26202, 16519, 27688, 10645, 87174, 60845, 73385, 82075, 6933, 98828, 56895, 17344, 84253, 36561, 51648, 24939, 63470, 31034, 95052, 51090, 51465, 87979, 68650, 30181, 29598, 19137, 43221, 81353, 90170, 96985, 61115, 17385, 92314, 80650, 55821, 17874, 84333, 93272, 48260, 87272, 22764, 59957, 51870, 85988, 39222, 77241, 62535, 28344, 6011, 80831, 64551, 46299, 75195, 71177, 8660, 58943, 57003, 3306, 74413, 74068, 15073, 89016, 93140, 13911, 57170, 19880, 41870, 9131, 57495, 73032, 86979, 60094, 87026, 30880, 4736, 86301, 92707, 21689, 83565, 71275, 47665, 65687, 71184, 89897, 32490, 97577, 38723, 79113, 37531, 97500, 94450, 15699, 58019, 84423, 27057, 56017, 97148, 47365, 30669, 33818, 80406, 99690, 33012, 95178, 46809, 48448, 79350, 9146, 99701, 98976, 71197, 44161, 75069, 36602, 79650, 97301, 12020, 56658, 25701, 46392, 78609, 63073, 69419, 57736, 20102, 42415, 79044, 20277, 56280, 47903, 94311, 25558, 40336, 91305, 90505, 66769, 64562, 83737, 62892, 10375, 71024, 19988, 56946, 76110, 21847, 43162, 50578, 46086, 54167, 61722, 53463, 63134, 69288, 12838, 14116, 71687, 50846, 59810, 24826, 84138, 82885, 91496, 98600, 82769, 40049, 4125, 50694, 1294, 2805, 29691, 82321, 76462, 85945, 115, 29188, 66918, 71340, 31585, 61638, 95472, 52978, 50622, 81990, 60955, 70519, 22270, 35610, 95871, 89222, 41038, 52546, 1163, 67943, 1793, 92010, 35755, 74509, 66665, 95759, 8568, 44299, 67822, 5806, 85839, 13895, 87675, 31357, 88014, 40026, 53050, 28951, 31992, 42495, 82892, 51567, 2869, 45808, 20238, 20781, 56098, 66307, 95701, 614, 60833, 3091, 81339, 24195, 65639, 85976, 28116, 66224, 51502, 73637, 13207, 88302, 36488, 65518, 98187, 26, 74367, 64706, 53943, 86760, 25783, 82112, 34958, 86621, 20848, 63459, 14049, 84943, 91873, 50238, 77773, 64109, 8602, 87934, 47583, 66053, 30287, 5507, 80312, 37464, 57457, 86200, 17806, 16522, 38843, 94334, 59958, 63864, 53427, 74506, 33980, 90449, 30842, 53616, 36738, 52, 13595, 53051, 13174, 60163, 71420, 73835, 67119, 79018, 42782, 45059, 952, 46360, 85879, 71552, 84741, 29746, 32577, 10041, 7208, 97528, 51256, 916, 55973, 17684, 99046, 38782, 58660, 97798, 66032, 48339, 51329, 12532, 97904, 95454, 42737, 62541, 96702, 82953, 94610, 26645, 86813, 25480, 99713, 26078, 23028, 93056, 21445, 73209, 89318, 69987, 34705, 30064, 17094, 51135, 54141, 26625, 1086, 13082, 30843, 98672, 56864, 42605, 5833, 60850, 69366, 27351, 16456, 92609, 48030, 54322, 69891, 46502, 34578, 77918, 63276, 75958, 42519, 60266, 85576, 4855, 14258, 67017, 10545, 35078, 53012, 71922, 85784, 73402, 74363, 58457, 94102, 23510, 51559, 39482, 87057, 9377, 10106, 82985, 33931, 16523, 6484, 97749, 83172, 53753, 27466, 23073, 96083, 67302, 57465, 21877, 18013, 99804, 32873, 43123, 72365, 53197, 80578, 69770, 97471, 86954, 67183, 98497, 78474, 28450, 63183, 98699, 42738, 61433, 3491, 27304, 49311, 94980, 92740, 43272, 86549, 11406, 79636, 85582, 38086, 657, 2354, 26567, 77450, 42086, 21600, 49011, 44059, 47872, 75761, 96577, 11642, 83471, 79616, 23749, 77082, 96876, 65302, 84027, 48955, 59887, 20657, 75090, 9058, 50347, 66088, 70745, 76342, 58026, 95568, 61504, 93473, 84590, 47089, 74717, 93090, 46334, 68273, 59500, 54345, 72608, 54048, 86156, 40296, 74046, 6813, 36369, 74543, 18305, 85236, 31316, 37061, 96893, 23112, 5529, 10166, 19037, 1467, 70810, 30932, 18410, 92837, 81324, 12268, 54705, 25207, 90366, 56528, 3392, 88747, 39951, 97957, 99404, 23685, 13533, 15640, 11434, 66516, 71025, 65770, 88000, 52232, 32360, 10787, 37438, 2264, 94460, 80214, 42288, 59062, 29010, 64093, 21225, 22297, 36935, 19202, 5925, 85373, 27414, 28991, 9191, 42273, 56587, 89719, 77191, 64334, 61542, 28763, 28978, 79184, 59815, 95200, 30246, 54022, 287, 91808, 66347, 50833, 15356, 78614,
+    65087, 9664, 67555, 58222, 20787, 72382, 83712, 15858, 72040, 59451, 7428, 47586, 83509, 45969, 28759, 94033, 88618, 46, 1753, 28290, 71934, 99070, 52517, 65865, 15904, 68134, 87595, 39779, 99174, 13366, 50847, 69037, 77911, 19709, 84404, 24370, 18920, 1746, 28059, 4653, 6892, 25496, 48810, 82943, 7069, 44018, 1617, 56497, 27582, 29576, 47883, 8385, 54975, 96245, 77257, 31194, 34512, 19198, 50926, 50886, 91577, 49260, 49604, 58464, 18198, 90887, 15379, 74883, 36644, 63967, 34545, 20539, 12884, 6010, 98636, 94832, 47702, 98318, 6078, 42517, 97030, 93707, 39286, 10245, 66230, 99574, 74563, 81937, 22153, 10659, 67579, 85147, 69686, 32017, 8199, 20027, 64266, 60707, 55426, 22027, 13823, 81404, 86757, 3754, 197, 45469, 68736, 17656, 92453, 6784, 35531, 33538, 27558, 35825, 13471, 16377, 66978, 44601, 69943, 84635, 7335, 67725, 88064, 78201, 64380, 66771, 62221, 60427, 32028, 37857, 5491, 2757, 10537, 2199, 60244, 14726, 29734, 34433, 81241, 39778, 65831, 56153, 81696, 25113, 17371, 79022, 3587, 60439, 96582, 37801, 82496, 68242, 19561, 53140, 17171, 13165, 58750, 80612, 19818, 16753, 70009, 75290, 48846, 89851, 25190, 35525, 84348, 65298, 23161, 60583, 89611, 18798, 85422, 60713, 17660, 41915, 65757, 4781, 48374, 10712, 40330, 2409, 41020, 28042, 51857, 81224, 93917, 90366, 58848, 8012, 92070, 75349, 80066, 83228, 55170, 78376, 94127, 29418, 58660, 74006, 63909, 59502, 63255, 32318, 28904, 26117, 88103, 50656, 58517, 16372, 43392, 77876, 65997, 63501, 45927, 17444, 84021, 54886, 57082, 47456, 73816, 66900, 82958, 49722, 95843, 23458, 4560, 67276, 59080, 81486, 2967, 26133, 87694, 74183, 22100, 45306, 33895, 26512, 71426, 54994, 47367, 10171, 45681, 36268, 3166, 2179, 64197, 90037, 4641, 96073, 72989, 55123, 48825, 2862, 66974, 30115, 41554, 26727, 54025, 69504, 38284, 7816, 36370, 75764, 69774, 43208, 43598, 39461, 21655, 12169, 77790, 44578, 70959, 13500, 40823, 52952, 88095, 82193, 66424, 79814, 25651, 58125, 42724, 11752, 64533, 34827, 72755, 96727, 82066, 60268, 55535, 4230, 73018, 69602, 16912, 66088, 21859, 38654, 38638, 51444, 37999, 18595, 15209, 21801, 21130, 53741, 54954, 91590, 83660, 74071, 82627, 4311, 45268, 94735, 65747, 72428, 22621, 70828, 64394, 647, 23570, 17677, 84377, 63993, 10268, 47426, 72750, 83772, 29090, 73284, 36683, 91143, 64546, 99836, 21999, 61793, 41557, 16714, 20586, 14251, 56633, 46146, 84730, 5445, 8367, 52621, 79252, 89737, 18431, 32134, 86975, 58939, 63385, 8504, 25998, 79549, 70558, 4870, 57604, 48374, 32388, 97871, 75590, 10919, 43825, 82858, 25807, 50366, 2841, 2716, 51315, 79719, 33159, 63382, 11327, 65184, 87243, 17850, 40149, 12171, 48486, 26380, 85432, 35427, 59256, 57601, 29529, 20553, 3006, 69997, 87919, 47626, 96026, 37445, 51735, 89296, 26702, 22837, 61279, 85193, 30624, 10676, 83075, 21477, 54708, 47485, 80297, 86204, 25192, 55197, 81177, 70551, 11003, 7001, 55017, 487, 40926, 99463, 79514, 69697, 52854, 88640, 44464, 66314, 48240, 49787, 81333, 14914, 12919, 51037, 88609, 25572, 61019, 85184, 12051, 61246, 52108, 98895, 24549, 86944, 73303, 9012, 25151, 97424, 43531, 44790, 63034, 86713, 76483, 17499, 86891, 3267, 45091, 39126, 94419, 35750, 35239, 49413, 62381, 92010, 7246, 26997, 47446, 26930, 22668, 43961, 51741, 63058, 41977, 62933, 9197, 94303, 29044, 53755, 22391, 85373, 66572, 74650, 7824, 49712, 40021, 99958, 60404, 37370, 89264, 52343, 90901, 44730, 4252, 5811, 22283, 25102, 86636, 75509, 47088, 62971, 85519, 7495, 16798, 25708, 59258, 89361, 43455, 86768, 29961, 4362, 60956, 81059, 87604, 46241, 98362, 21030, 76182, 83545, 59150, 99333, 68271, 32629, 3364, 96467, 40427, 307, 84267, 239, 11711, 40933, 24518, 33854, 60291, 94179, 5564, 33196, 73818, 22201, 97078, 69360, 94513, 42623, 6510, 67378, 79468, 10394, 96430, 87701, 2667, 64162, 93266, 48941, 55345, 56127, 22704, 8793, 57008, 36920, 80845, 81203, 98715, 84158, 49194, 72718, 52919, 4951, 8715, 82384, 8570, 26733, 62399, 27297, 79038, 57916, 46155, 82381, 1027, 20541, 40580, 44836, 17336, 55548, 87454, 63549, 61401, 88819, 23326, 37546, 49089, 50707, 23099, 20724, 67184, 3394, 95941, 76045, 20523, 30393, 14157, 69381, 94104, 15406, 46707, 36234, 9136, 96805, 4904, 20310, 77164, 15400, 87198, 48310, 59729, 35230, 61503, 42015, 86910, 23264, 23542, 49105, 58334, 52855, 78865, 73516, 43820, 96593, 33168, 26170, 88241, 4016, 79862, 39617, 95329, 57881, 71750, 89690, 22519, 59367, 19825, 12638, 36100, 14355, 79540, 8411, 94571, 80462, 11953, 55629, 14598, 81066, 48968, 74149, 36938, 4564, 59157, 75517, 14309, 64905, 59893, 62803, 6968, 33003, 40894, 48816, 77710, 16692, 19135, 98381, 49397, 24048, 17804, 26829, 24046, 44546, 28174, 2639, 27957, 38625, 85902, 9908, 77666, 14096, 89851, 23600, 20717, 32860, 44070, 67853, 85907, 23761, 789, 73370, 15649, 26472, 9174, 20081, 49415, 97463, 14565, 19834, 94738, 68045, 67542, 3552, 77093, 99071, 16832, 95177, 49571, 85821, 9368, 85170, 58449, 89633, 99302, 94158, 50274, 50223, 51128, 52847, 53598, 47826, 2883, 28192, 84324, 9530, 14385, 37292, 74795, 16821, 5010, 77101, 96596, 72384, 41399, 83046, 37927, 48213, 84574, 55438, 79315, 71005, 45190, 56133, 14016, 92180, 28365, 34307, 90665, 74758, 45080, 38017, 80599, 91174, 47907, 19299, 9707, 92260, 36784, 55855, 25939, 74472, 47402, 12352, 75591, 31459, 76711, 57940, 95535, 55231, 80645, 84613, 90280, 3500, 83695, 42992, 77226, 25326, 8093, 49838, 6457, 44814, 82819, 94986, 81818, 65186, 21378, 49711, 66248, 72391, 65826, 21284, 41399, 72858, 32223, 35915, 45221, 36871, 16193, 2522, 52963, 24506, 98239, 56752, 15192, 8451, 62802, 54777, 67983, 82177, 7303, 71445, 40559, 58655, 73468, 40491, 52864, 81558, 36789, 53134, 38801, 90600, 36385, 90996, 20526, 13627, 62253, 96989, 88864, 11928, 14681, 77082, 95659, 47182, 16085, 26894, 39758, 32803, 26458, 65779, 66110, 38888, 15490, 48120, 90238, 8736, 233, 76851, 86938, 8873, 95387, 33400, 50788, 13568, 43139, 29821, 70427, 21022, 93285, 57243, 51675, 77459, 33170, 81485, 85303, 44133, 203, 44175, 89151, 26705, 32990, 10885, 10208, 58477, 97729, 699, 40581, 8065, 95864, 89797, 47506, 19160, 85728, 58599, 96271, 75849, 30736, 18808, 25828, 52011, 66179, 70244, 81312, 19570, 14287, 61078, 81922, 63361, 80858, 306, 22156, 82923, 53176, 24864, 49193, 2961, 96536, 62449, 13213, 85347, 11442, 76615, 43037, 86122, 99676, 74309, 46017, 16175, 12685, 53550, 19080, 37283, 44921, 34991, 4433, 99561, 38215, 35662, 13892, 7814, 41718, 41231, 85589, 74048, 72169, 26946, 61732, 9135, 39009, 63534, 4114, 40417, 83412, 22562, 65546, 720, 90064, 73027, 50736, 71086, 12445, 3681, 65140, 56291, 47452, 48916, 65136, 53941, 15484, 21038, 47251, 78461, 31031, 4838, 87483, 732, 16111, 68263, 4811, 65979, 44283, 51659, 29997, 11280, 3880, 12399, 63450, 93862, 50981, 62790, 76784, 76696, 40906, 49261, 35863, 43747, 65954, 36125, 73713, 98678, 13409, 38773, 59417, 9763, 429, 66203, 7350, 32754, 36079, 72447, 63925, 12958, 65292, 80270, 78432, 50925, 74946, 7649, 13689, 68001, 52318, 5804, 51584, 63637, 85697, 50929, 25279, 20963, 83038, 31199, 64189, 17152, 20459, 66108, 66005, 53159, 53971, 32528, 77145, 52981, 88941, 68593, 86343, 97770, 25625, 17598, 55249, 89640, 94162, 65874, 36511, 21906, 70401, 30914, 24085, 42945, 55597, 78393, 98120, 38283, 44967, 76077, 45739, 92432, 11846, 59131, 26322, 82651, 94792, 37726, 23301, 11275, 98813, 34229, 65440, 51369, 55580, 35207, 84314, 35696, 50231, 9399, 18679, 27219, 22519, 26725, 63451, 79357, 55915, 77027, 30354, 45890, 10745, 60035, 7914, 43562, 12219, 30220, 29382, 72520, 87475, 83634, 15163, 32468, 72904, 18200, 84666, 43560, 58483, 64613, 52170, 55490, 45954, 99323, 26401, 61210, 10450, 70360, 42906, 32851, 70022, 49966, 62331, 84249, 98093, 62146, 88171, 73246, 48314, 45730, 56348, 59081, 16642, 57872, 81564, 32305, 4158, 47263,
+    97234, 74415, 36159, 30014, 22241, 77574, 27990, 67395, 81471, 18512, 47546, 23386, 6156, 72893, 15332, 57667, 92657, 35148, 45316, 90482, 93819, 38065, 74899, 10850, 63285, 50968, 88081, 42486, 56089, 43288, 11239, 55127, 26637, 85974, 93879, 78540, 42451, 35082, 93809, 63793, 51039, 13518, 20239, 26933, 19322, 26648, 83711, 93163, 95951, 77389, 43771, 36873, 66976, 38082, 59476, 53984, 6951, 42615, 80733, 1120, 80595, 10500, 67420, 38885, 8892, 36205, 17170, 46564, 66415, 36372, 68305, 41470, 38699, 60900, 23468, 6927, 498, 55896, 4005, 50692, 67984, 91012, 97314, 94177, 57676, 36734, 32671, 44733, 34981, 52186, 15599, 75642, 82652, 22773, 97106, 20691, 38085, 50368, 74916, 76281, 54002, 85721, 99186, 78438, 27865, 34827, 61315, 8817, 93105, 71539, 35484, 58033, 17540, 32806, 87253, 15780, 80123, 34241, 70383, 95515, 27998, 47682, 32682, 93658, 15116, 93030, 71866, 35516, 70161, 7556, 64122, 54622, 14312, 64375, 28863, 27886, 34040, 10010, 1460, 58765, 71496, 37785, 5616, 84850, 2194, 55514, 33636, 7138, 36937, 44763, 61308, 63574, 8069, 24109, 17821, 82144, 53309, 26183, 84238, 36684, 45285, 41353, 29380, 93726, 59560, 96422, 34218, 66851, 49001, 4855, 46849, 19877, 76540, 61415, 32053, 38801, 74623, 92808, 6660, 85031, 97706, 34417, 51085, 72292, 30903, 45126, 69978, 11572, 68622, 64123, 59344, 67118, 46014, 59248, 69321, 31897, 72232, 48016, 36455, 87125, 85356, 96888, 28316, 23149, 34823, 29944, 18522, 14045, 973, 49472, 89165, 84112, 94087, 47881, 87600, 86330, 13384, 4528, 94572, 30634, 86728, 48525, 53243, 35911, 96382, 22525, 89914, 52213, 23007, 54827, 35721, 49121, 40203, 99040, 55039, 94543, 85440, 75098, 12566, 15579, 40603, 51321, 28805, 46550, 42499, 69794, 51322, 37286, 72035, 15494, 39787, 97639, 24343, 36299, 72759, 96672, 58801, 57467, 97185, 19493, 4431, 33940, 950, 46713, 12503, 35185, 31106, 93821, 1086, 31767, 17484, 52751, 70411, 12196, 502, 45391, 70720, 27507, 1282, 18633, 45031, 10475, 83570, 29539, 16753, 63494, 17010, 76069, 38913, 53948, 34175, 36761, 37575, 73655, 76272, 1069, 74456, 10440, 65502, 95286, 39384, 83461, 76477, 4167, 46503, 22373, 24523, 46024, 28959, 83219, 27807, 80905, 88626, 70234, 86888, 60954, 95397, 47973, 47944, 30154, 42698, 15144, 53223, 21123, 19281, 62933, 24952, 84744, 58456, 38446, 26768, 40797, 107, 52101, 8348, 8531, 17772, 97826, 34009, 15825, 48977, 54939, 78886, 31784, 42842, 22773, 9095, 25113, 65362, 83953, 55921, 92797, 26776, 59312, 56428, 52218, 50141, 52535, 22564, 50708, 50384, 16261, 529, 31406, 46452, 30954, 5385, 60190, 38790, 65440, 11891, 2196, 83560, 68884, 72400, 47795, 7501, 8916, 63267, 35567, 39889, 61818, 94343, 46612, 75029, 46988, 12411, 6123, 60904, 43704, 31143, 72544, 45919, 67953, 97776, 49517, 60476, 54437, 46261, 99778, 18541, 77626, 12537, 68459, 12688, 36284, 54901, 89375, 10538, 38415, 33160, 78777, 33532, 82538, 21329, 34359, 29544, 57035, 61945, 49098, 32484, 68236, 11088, 57533, 11044, 96786, 58861, 51390, 9582, 24229, 32604, 66195, 7311, 46441, 73383, 58033, 41866, 19293, 73085, 50627, 19818, 40498, 56436, 99865, 55516, 38917, 89889, 49571, 99408, 20144, 76122, 49593, 47906, 94763, 26488, 86343, 98334, 70112, 85244, 45622, 47828, 35306, 86838, 57186, 69907, 90594, 68206, 25118, 75445, 71715, 15800, 67558, 17783, 56525, 22970, 17354, 17139, 76827, 50325, 95314, 65432, 44045, 57928, 66247, 10673, 69744, 99485, 57467, 66889, 55246, 15095, 23540, 32890, 22959, 59472, 62237, 6956, 34669, 16547, 54868, 22598, 65120, 48525, 72750, 70559, 75706, 61831, 14032, 36146, 90211, 36082, 79712, 43018, 53903, 82490, 45698, 54202, 83079, 4867, 18044, 55144, 49189, 33278, 48387, 68822, 73057, 58118, 89796, 47318, 98383, 58759, 172, 56627, 79861, 86734, 25758, 80779, 55741, 40924, 24568, 23090, 62934, 94264, 58331, 18747, 15802, 81585, 92542, 97426, 18205, 11820, 62702, 16439, 18613, 45918, 47584, 98743, 39808, 33357, 16033, 87378, 87036, 88920, 99300, 89343, 7384, 36867, 36712, 96947, 92141, 85779, 81735, 86121, 19511, 70519, 62537, 10398, 99308, 63922, 45419, 17708, 2093, 85127, 55753, 97149, 82877, 64642, 30417, 151, 75464, 75992, 99440, 58040, 32083, 90604, 47830, 40087, 78899, 43638, 59066, 46579, 44828, 35130, 10670, 62051, 94127, 32024, 85455, 80408, 18295, 8106, 89380, 90499, 3196, 3826, 63462, 64317, 55570, 77162, 48564, 59842, 80241, 76221, 57327, 48049, 74336, 43168, 19559, 32059, 99226, 46384, 48111, 56013, 58953, 68426, 22, 72641, 16207, 595, 71706, 61213, 65921, 67517, 92618, 57660, 76414, 60998, 1829, 90176, 62932, 15052, 94997, 41, 58848, 56411, 18129, 86542, 16330, 2803, 5651, 47351, 57866, 3560, 97530, 8338, 59434, 50183, 39076, 2516, 16293, 6559, 31189, 83713, 58214, 32016, 56581, 46226, 74599, 33513, 51530, 20163, 56512, 1694, 8165, 17370, 2510, 46015, 80417, 77195, 69062, 717, 33699, 37638, 82238, 5436, 67991, 98554, 26668, 19565, 26500, 30133, 54349, 36668, 56773, 55187, 25458, 54126, 11833, 32007, 38881, 20038, 42186, 67850, 12001, 96089, 63397, 75035, 16744, 45208, 84186, 82044, 34818, 55858, 1623, 41600, 34753, 92242, 16416, 49800, 45309, 56520, 38893, 42865, 37476, 78860, 32503, 18086, 55004, 65795, 82926, 75725, 52917, 75463, 82202, 35158, 67065, 38454, 90106, 79681, 57317, 68357, 66487, 99640, 13182, 68684, 96739, 89887, 54307, 98357, 4597, 47645, 38560, 17334, 46291, 91096, 22675, 12995, 35767, 76173, 54754, 75206, 13345, 78860, 19929, 12740, 13007, 69737, 52454, 6784, 77198, 59565, 44548, 22924, 38773, 9522, 59392, 45244, 64754, 39640, 75795, 22725, 78314, 24738, 83167, 31049, 92122, 62117, 47314, 34032, 76951, 63164, 22515, 46057, 81625, 72164, 60013, 26171, 55608, 50486, 51422, 18277, 13682, 70130, 49689, 32278, 25430, 84394, 57371, 93398, 14139, 461, 37302, 25705, 25642, 70311, 81778, 66948, 51187, 99649, 44509, 12753, 39827, 57393, 40288, 26496, 1500, 32979, 62062, 5170, 25273, 26343, 21058, 66749, 52257, 26335, 4347, 82427, 51381, 66857, 58330, 15097, 23881, 93865, 97929, 11233, 67910, 22731, 70911, 93941, 46169, 31920, 16027, 1635, 16338, 49712, 29345, 26316, 15221, 54771, 34715, 35399, 80287, 90881, 33758, 46569, 52450, 40564, 34885, 5679, 53232, 85632, 87510, 4008, 87014, 49611, 94569, 96432, 57394, 66064, 34144, 67269, 83546, 5901, 25386, 57588, 55055, 6940, 8414, 31432, 75407, 86922, 33925, 24600, 48261, 94439, 34234, 69028, 37145, 32386, 68275, 13237, 3521, 57395, 55029, 16426, 87797, 18559, 72744, 1155, 30384, 19799, 50001, 85831, 19583, 83898, 13465, 58160, 51160, 89216, 90725, 37151, 32241, 6319, 95146, 10376, 55137, 64094, 14990, 19747, 85852, 50692, 63214, 53123, 97058, 60203, 29272, 14439, 69712, 13023, 75808, 67150, 76276, 54521, 46621, 78807, 89302, 30273, 85103, 63180, 75468, 98474, 37749, 66275, 61712, 39381, 2740, 83025, 18083, 42030, 3391, 56204, 3960, 34780, 22476, 50074, 79854, 89447, 3695, 2986, 85090, 71529, 77995, 51572, 60278, 69314, 70777, 46754, 22085, 94517, 98052, 5700, 43157, 12345, 34663, 40350, 5739, 84384, 8354, 81566, 75500, 88934, 67062, 52877, 30428, 95593, 13288, 51836, 25264, 19278, 81290, 47555, 7606, 46694, 29735, 25723, 81597, 26221, 24545, 98576, 63395, 36061, 58752, 8486, 97817, 27235, 18579, 2387, 88017, 42855, 5111, 49094, 28448, 82227, 63436, 89135, 86591, 2922, 72163, 83000, 14378, 81829, 5610, 93513, 78135, 55292, 80776, 21212, 40604, 44442, 50505, 22750, 47985, 19367, 63494, 4363, 64500, 79444, 36504, 43418, 72523, 85981, 13740, 302, 76267, 14962, 79643, 26144, 27125, 13364, 82935, 8936, 8340, 38025, 80742, 42829, 95357, 11131, 6806, 10497, 70527, 3004, 54217, 51051, 34722, 57348, 50489, 76514, 76546, 29498, 40587, 52697, 37808, 32509, 68927, 68051, 53328, 41926, 9344, 67795, 98626, 44058, 46817, 95773, 57539, 13352, 96292, 72647, 47111, 48595, 82684, 43566, 93381, 3081, 27653, 25045, 34753, 80870, 92013, 21935, 89454, 14127, 73278, 87015,
+    65232, 97216, 26840, 21272, 8226, 42347, 44358, 26715, 7860, 31989, 14091, 15648, 85801, 20463, 85221, 77969, 87196, 28563, 69663, 55169, 11372, 38915, 74678, 1183, 14845, 85696, 54995, 62342, 83227, 73536, 64251, 46556, 78421, 89058, 41036, 79746, 42148, 77720, 33923, 24979, 98428, 80202, 36845, 20584, 13506, 97375, 48434, 14863, 29237, 99014, 20650, 48496, 61825, 89100, 51501, 22632, 89030, 22901, 54072, 68093, 98140, 1631, 43266, 34532, 35780, 17763, 41731, 19580, 72266, 66530, 55650, 51506, 92256, 5332, 85143, 65002, 30530, 21358, 88420, 81349, 94086, 68143, 95343, 30490, 61605, 40296, 61665, 21032, 498, 67165, 3151, 94788, 36502, 77434, 88776, 67565, 4404, 51177, 49030, 88502, 92552, 31170, 92051, 79960, 43784, 17864, 54179, 91590, 39153, 75017, 11161, 31100, 27964, 30263, 54908, 57991, 89272, 14642, 40576, 20224, 48887, 93479, 87862, 19858, 78238, 4113, 32369, 70072, 82752, 85122, 72450, 53113, 53806, 45347, 55032, 77242, 70401, 83685, 41229, 47489, 36964, 40556, 2619, 64080, 7354, 10159, 74827, 11846, 64587, 88667, 20940, 93594, 43669, 38592, 20211, 96055, 65995, 89957, 18941, 82750, 90753, 49989, 63331, 52911, 1675, 98447, 35516, 28539, 91592, 80615, 68066, 63922, 52509, 26025, 14634, 69439, 19820, 89983, 38306, 84048, 66264, 26855, 3634, 92094, 61088, 28293, 11428, 68748, 10665, 27114, 20151, 65883, 86423, 77069, 74997, 147, 41427, 26124, 22163, 82452, 61186, 89370, 58583, 2692, 54969, 84679, 26237, 46229, 16041, 28473, 38684, 43587, 37886, 68790, 92030, 85066, 13673, 30280, 91844, 43115, 10005, 1481, 84393, 10008, 60291, 90687, 99338, 95570, 39916, 68643, 41309, 24724, 57188, 75473, 21647, 50206, 6820, 73756, 51102, 76169, 99840, 32863, 17306, 43063, 90483, 15894, 59042, 53797, 93961, 12248, 12125, 39393, 17056, 11576, 6145, 43960, 74245, 86805, 95665, 58855, 50039, 14867, 85076, 3939, 55501, 18184, 62019, 16312, 37518, 18544, 67431, 68250, 70766, 74635, 41835, 74538, 77822, 47918, 90863, 17526, 78930, 47473, 67945, 70385, 19404, 45030, 13476, 46186, 28191, 22019, 18700, 90915, 41408, 63333, 52902, 87336, 72833, 47707, 46692, 47873, 82012, 22597, 46379, 69109, 72108, 47439, 51130, 41894, 29827, 88403, 75040, 37504, 69925, 19034, 57998, 46633, 1021, 48358, 55923, 3536, 26350, 36696, 29658, 25247, 65614, 19042, 34463, 85938, 26155, 49801, 74604, 17581, 91632, 12935, 97966, 14947, 71196, 32270, 51915, 41692, 83274, 6608, 37190, 35363, 85313, 97545, 5696, 23700, 39334, 38434, 20192, 27349, 71340, 19732, 96142, 17152, 32995, 34829, 71157, 36376, 11522, 26646, 19239, 34033, 4200, 39023, 64291, 7931, 42807, 2800, 75490, 4515, 84571, 59557, 13421, 69465, 69121, 82358, 18134, 18536, 74294, 24013, 43777, 94192, 77031, 33341, 98070, 27534, 34419, 40107, 17826, 48196, 82843, 37592, 40484, 49019, 59822, 26118, 89788, 5990, 99595, 35178, 49473, 54699, 81618, 23497, 87025, 29421, 1685, 31406, 54115, 25193, 44525, 44886, 4885, 74482, 63280, 57532, 29773, 83104, 5354, 35313, 12558, 16165, 52712, 82282, 73541, 97334, 7283, 29405, 87694, 64717, 98840, 2868, 17727, 61847, 32417, 91009, 12117, 35077, 36279, 87552, 12441, 70576, 505, 57332, 56191, 33846, 78645, 58506, 48692, 27712, 86722, 46677, 81512, 14807, 30337, 7863, 457, 71893, 32256, 21897, 95811, 73552, 24929, 4893, 49448, 33836, 24781, 43236, 30853, 81985, 60625, 20087, 30674, 39280, 10779, 97785, 11298, 65057, 17589, 44085, 10126, 72351, 4165, 30539, 97124, 20545, 50087, 13490, 4055, 62365, 24046, 63110, 99045, 47122, 74389, 29843, 89082, 71686, 40321, 15789, 63062, 23403, 27718, 72550, 36098, 47309, 60568, 22266, 20542, 59018, 76386, 89381, 9164, 42093, 19931, 90426, 73695, 26948, 17363, 15727, 75439, 45425, 42518, 32966, 80703, 4659, 74566, 22464, 49383, 53167, 80720, 45464, 179, 29789, 19444, 97663, 6466, 51290, 56374, 17869, 97520, 45148, 92149, 54757, 94455, 80125, 98584, 70174, 77708, 59260, 50275, 49211, 60730, 29875, 90935, 29676, 95390, 18263, 73189, 41364, 39707, 75110, 59156, 11770, 38655, 55173, 62547, 16328, 70585, 81958, 61191, 90906, 45978, 59134, 24609, 32956, 30518, 27341, 84512, 24987, 65295, 75210, 97931, 56717, 6751, 83338, 82808, 96570, 27038, 93274, 399, 9330, 54319, 24848, 39269, 92692, 50625, 52306, 93262, 48756, 66694, 50517, 41763, 42231, 8589, 41923, 87839, 9579, 5104, 41634, 63030, 15100, 59593, 38288, 88852, 81957, 84267, 56380, 89329, 74372, 16026, 15795, 29456, 93173, 76367, 37598, 68153, 72405, 55181, 77543, 30730, 27564, 98764, 48711, 22180, 51352, 80150, 50091, 19481, 97962, 74879, 75369, 84410, 54712, 68399, 60910, 57922, 8896, 94118, 5276, 54049, 11614, 98854, 65979, 75156, 39456, 30226, 27357, 71087, 30814, 6416, 56480, 70259, 56525, 69945, 63874, 87262, 97398, 77972, 76745, 97191, 26739, 10957, 48743, 18175, 74688, 49853, 83675, 79232, 72211, 77255, 44445, 81053, 5506, 21366, 99015, 57598, 9467, 65131, 73794, 25679, 3609, 70041, 14653, 93792, 7076, 87326, 12978, 20886, 24089, 82187, 55203, 96649, 51205, 26250, 98219, 64275, 18634, 94004, 50999, 99611, 72380, 28685, 33246, 49116, 44972, 44273, 26558, 84799, 51310, 39480, 16713, 34371, 94308, 38743, 14592, 47430, 74505, 38866, 69596, 84705, 20236, 49353, 28259, 16255, 27665, 94271, 98652, 18279, 4805, 57471, 7944, 72567, 55603, 47327, 32268, 1256, 47608, 80225, 15744, 75492, 74652, 96812, 77976, 72595, 86791, 97736, 83149, 57030, 58553, 7121, 53544, 94894, 57236, 55850, 52762, 36303, 97740, 25314, 43196, 74248, 52320, 60448, 10606, 7010, 21765, 20357, 61825, 34331, 15898, 67485, 70353, 41657, 49212, 21628, 11783, 90514, 33883, 85668, 73432, 55374, 53880, 864, 66975, 51190, 18268, 45344, 99680, 91098, 3893, 90773, 55611, 5914, 14977, 29463, 38339, 94390, 15379, 74717, 78721, 10689, 90966, 33191, 32384, 4363, 61992, 37456, 28402, 51633, 14358, 99226, 23024, 22114, 86438, 70682, 27242, 46237, 92467, 83997, 71994, 59256, 44728, 51372, 50328, 66925, 16487, 7348, 69501, 23328, 55945, 98064, 92561, 5275, 67097, 37616, 8561, 14378, 83858, 44306, 60514, 89238, 28781, 11864, 31540, 3809, 16629, 4336, 70961, 10787, 58719, 39587, 46840, 48993, 18578, 30890, 71438, 29672, 54785, 77570, 25012, 70696, 25935, 279, 74327, 33944, 55060, 72194, 28269, 47600, 2132, 56618, 77029, 26410, 25682, 13744, 31968, 27115, 57065, 49313, 31237, 70475, 38549, 33723, 66622, 19646, 93518, 4052, 29390, 10163, 19879, 10765, 71024, 71339, 69114, 78385, 64440, 79577, 48109, 81114, 4708, 44863, 72410, 71161, 55491, 3433, 88675, 48496, 97875, 17184, 840, 16960, 32880, 48533, 82430, 44005, 36654, 96011, 16158, 21530, 88485, 91231, 77831, 39266, 9833, 96154, 89200, 2021, 57813, 897, 27643, 65750, 27447, 29043, 50691, 74683, 78027, 99590, 6052, 22867, 4567, 3918, 27143, 77750, 32003, 14011, 59006, 33140, 12165, 72413, 89931, 59389, 45281, 52596, 31993, 88613, 85332, 8016, 34419, 80901, 76317, 34932, 71099, 23354, 19296, 42671, 12646, 47189, 67982, 79803, 28449, 6229, 44873, 48970, 10012, 6871, 88240, 1277, 71039, 47959, 45051, 74358, 68394, 49093, 78063, 26981, 8704, 18470, 14458, 38195, 75691, 64683, 44910, 93423, 67591, 36833, 63204, 29507, 38894, 59524, 12141, 36543, 86914, 91250, 45459, 30156, 119, 95390, 75872, 28827, 67609, 99869, 91237, 70358, 60292, 3499, 3133, 45478, 5800, 47576, 50558, 71500, 65579, 84252, 68999, 59495, 79395, 28634, 44121, 26503, 11922, 22058, 34164, 32668, 10422, 62793, 41303, 2030, 76875, 17151, 42101, 22133, 82998, 19499, 14247, 95259, 746, 38449, 72450, 99138, 61259, 65623, 13439, 45597, 55234, 19347, 70266, 4828, 79316, 16983, 49723, 95468, 9747, 81126, 31999, 33796, 15270, 60644, 61048, 98848, 26685, 40980, 23733, 13676, 98363, 17970, 76451, 42657, 13165, 27870, 49193, 56279, 34647, 1652, 47674, 95555, 80556, 52419, 61110, 26124, 49097, 90600, 53605, 97544, 8694, 94739, 59652, 41807, 87155, 83539, 61468, 20614, 12652, 86562, 82894, 94360, 56182, 30513, 65379, 6522, 86486,
+    37674, 44977, 54370, 97381, 60218, 2423, 99591, 69913, 26507, 19708, 6279, 58955, 20126, 1495, 57894, 7638, 38700, 77148, 36844, 7539, 91452, 6914, 74349, 66850, 49104, 6516, 58535, 20851, 27859, 32881, 72919, 28203, 32882, 2419, 77583, 63822, 37703, 66793, 65784, 62281, 55867, 70703, 89344, 1498, 33770, 87176, 95636, 64891, 90736, 95521, 10989, 5237, 99010, 21106, 11422, 1831, 67239, 52557, 36468, 71713, 39637, 49574, 50455, 14953, 96900, 70852, 96982, 4341, 44585, 95651, 79669, 29652, 87294, 74692, 16221, 768, 35380, 21352, 50907, 27259, 11718, 5017, 55964, 94137, 52347, 10595, 12968, 85602, 97965, 18836, 90511, 70960, 97336, 44575, 23791, 42195, 64776, 29363, 42379, 1805, 28919, 6772, 78143, 54797, 27362, 56149, 59048, 38567, 6339, 27787, 42167, 45990, 95532, 54839, 26572, 38496, 89797, 6634, 16468, 24898, 66814, 98126, 31762, 36133, 64539, 43167, 87022, 61295, 30364, 89249, 25756, 63570, 91484, 10564, 79648, 5756, 41376, 61897, 40388, 88927, 62891, 79708, 25495, 22204, 33892, 36871, 19879, 58646, 57061, 73100, 75831, 20029, 67462, 54675, 7766, 2409, 24506, 7877, 11720, 86252, 9897, 8080, 70684, 74497, 2242, 24604, 31969, 83999, 56635, 5283, 64971, 79152, 27470, 89042, 22835, 21476, 50292, 56081, 96342, 32763, 84487, 64856, 79152, 64656, 72169, 69971, 93094, 52804, 80917, 53152, 56016, 28496, 79110, 17133, 12581, 91742, 78929, 2676, 46700, 59528, 93808, 4535, 54035, 40161, 62796, 3598, 97088, 13599, 36337, 73395, 17494, 86275, 62058, 61937, 87747, 94883, 90677, 88544, 72553, 50210, 75481, 64378, 74464, 21659, 30970, 71989, 84846, 72289, 88716, 39143, 8487, 4912, 91013, 18623, 19122, 36507, 76438, 7516, 67970, 72350, 69873, 33635, 55983, 69008, 49545, 3134, 60056, 52509, 63304, 15560, 23651, 81090, 7027, 8317, 33060, 37295, 51961, 53037, 97431, 40512, 23536, 25168, 78455, 85613, 12304, 40733, 99890, 51238, 55439, 96201, 73559, 92533, 90173, 16721, 6078, 29854, 38894, 31117, 63040, 86795, 81786, 21149, 38998, 61811, 48622, 73019, 59296, 13576, 92559, 36300, 77294, 26794, 50912, 98380, 13176, 57746, 75286, 15330, 40921, 7337, 4664, 20384, 4674, 44516, 27633, 31950, 88210, 54536, 9839, 80137, 77491, 18434, 45152, 96942, 41005, 76103, 34825, 86869, 14772, 13384, 21051, 37348, 34434, 97210, 54960, 26598, 60981, 41889, 6446, 64492, 95310, 86236, 81885, 35684, 16539, 98476, 32028, 96470, 6318, 99576, 93935, 48609, 86090, 2476, 65576, 80636, 44817, 99646, 98963, 20486, 26261, 27334, 72946, 82023, 33506, 80193, 13762, 98133, 21134, 33268, 63477, 74609, 30454, 51477, 93391, 96805, 68653, 2714, 63642, 51520, 22972, 13305, 96058, 42336, 74461, 31597, 12050, 81712, 37977, 25718, 4834, 56608, 75731, 406, 28585, 63924, 23702, 29849, 16941, 91921, 65842, 76525, 68534, 50902, 17609, 23852, 53703, 31286, 58526, 9633, 87596, 10654, 2085, 52766, 22135, 76524, 32295, 90072, 70078, 77786, 93741, 87320, 70309, 44024, 95286, 12361, 29682, 59766, 26685, 90686, 81691, 49704, 23431, 53955, 39023, 47261, 1530, 58265, 80065, 95620, 90621, 63760, 90676, 81653, 36397, 20252, 81754, 20256, 67098, 7838, 49408, 88400, 87941, 84533, 6570, 22567, 18850, 55472, 40129, 48425, 23497, 39308, 34698, 53092, 89480, 47785, 57282, 25508, 19006, 50604, 86917, 9436, 88921, 3168, 70537, 3185, 34988, 5462, 69482, 45768, 91955, 56898, 15307, 99731, 89292, 19356, 20646, 66712, 7281, 12856, 31174, 19577, 8726, 62971, 33008, 37118, 59055, 84101, 68445, 91957, 47526, 15627, 79914, 20013, 26147, 80821, 56372, 74205, 28531, 25352, 51775, 93948, 55212, 17863, 91521, 74911, 88160, 2360, 98260, 18294, 62402, 84268, 9580, 42668, 1467, 40059, 5221, 4216, 9917, 35420, 16496, 34369, 50253, 95234, 95114, 84193, 28322, 37031, 81284, 88628, 36782, 42572, 73347, 66188, 43342, 77285, 16513, 89064, 63066, 72645, 67075, 48208, 18181, 77898, 65795, 53707, 39856, 92883, 92567, 49733, 30236, 10273, 53029, 69773, 78379, 72108, 47696, 97557, 95184, 14688, 29853, 62694, 70431, 88435, 58799, 21883, 99866, 69178, 55870, 14414, 85274, 27321, 55555, 613, 15067, 88217, 73655, 99548, 13631, 78789, 36690, 7952, 60830, 77438, 40059, 95602, 43097, 3429, 93731, 90537, 2932, 35702, 16125, 6652, 39632, 39349, 9910, 38103, 78608, 73565, 48556, 28978, 7128, 82326, 53980, 28059, 28212, 87101, 77752, 99170, 56753, 30484, 71470, 32607, 24674, 32687, 25098, 94712, 64024, 48239, 90408, 17316, 99243, 3656, 67402, 48009, 98427, 52800, 56024, 4417, 89747, 93338, 18758, 56411, 44810, 82456, 30808, 75470, 67115, 66876, 53906, 78403, 56059, 34383, 60056, 89136, 7237, 11129, 21351, 78662, 43606, 37454, 45465, 9292, 38099, 81699, 50195, 49368, 47503, 44605, 6523, 81478, 37910, 397, 20256, 6835, 2787, 80383, 4241, 65986, 83870, 21205, 10879, 26593, 44357, 72604, 56131, 43423, 80206, 26240, 87198, 99445, 53504, 10632, 2465, 31793, 89575, 64184, 39988, 60049, 87100, 37151, 61585, 82180, 52065, 72519, 72935, 3201, 5862, 20560, 95339, 21661, 17533, 17182, 71189, 91564, 57999, 35490, 94773, 95056, 51583, 59394, 10727, 8655, 48123, 10701, 25314, 20100, 6533, 46435, 43188, 23001, 23018, 76637, 32018, 36603, 18701, 9550, 61550, 47541, 36500, 67507, 81574, 95490, 69169, 32584, 30045, 64699, 83539, 89396, 42517, 61979, 41528, 8271, 88377, 61423, 1158, 89724, 70789, 14886, 64823, 56675, 97747, 23990, 58495, 82064, 17062, 90258, 86854, 93304, 12925, 49975, 45074, 87155, 72223, 67344, 42733, 42516, 40110, 15444, 88285, 39371, 23198, 61544, 90205, 6192, 15718, 19803, 92712, 20081, 31397, 5555, 70463, 19521, 80401, 74097, 32060, 26495, 20507, 40473, 1449, 57215, 46142, 39303, 50359, 35898, 46908, 90752, 7823, 27416, 73770, 98790, 17907, 29999, 76417, 49926, 76752, 21608, 26524, 88209, 6000, 88897, 19541, 41451, 59538, 56560, 1456, 67828, 82407, 45722, 93344, 54279, 78594, 38354, 93807, 10929, 91560, 60681, 70615, 32527, 10108, 48303, 63134, 28500, 18257, 57081, 24801, 99077, 52197, 15390, 52300, 57116, 417, 7503, 20054, 75315, 81359, 69091, 18853, 2465, 25600, 13522, 74575, 12661, 83071, 15191, 27543, 21730, 60853, 18961, 14773, 89185, 33694, 51143, 1449, 68831, 78062, 65173, 32697, 41674, 9429, 22156, 96022, 46305, 97534, 5685, 48870, 89988, 20686, 66705, 6865, 94250, 16872, 13178, 7420, 73531, 92723, 60620, 48843, 74207, 60016, 50943, 62699, 63507, 76537, 87066, 76922, 24711, 34809, 5021, 31293, 53854, 77607, 52322, 10934, 50284, 87804, 36730, 86946, 80749, 43325, 97958, 7362, 39582, 10042, 42053, 66236, 69931, 23463, 87996, 33563, 4468, 32905, 50815, 79478, 28658, 46018, 23186, 26080, 13494, 6237, 42762, 86440, 77407, 10426, 62902, 73251, 36861, 92357, 98754, 1839, 46391, 11420, 27132, 93028, 39609, 42015, 68218, 54228, 5456, 38705, 64307, 49483, 878, 54360, 54480, 66684, 55089, 4537, 82073, 72602, 96238, 56708, 58625, 32991, 74205, 72868, 79086, 64250, 56376, 10621, 76607, 47706, 72760, 70303, 60715, 14644, 44186, 36264, 29489, 14184, 62699, 30567, 16700, 31222, 15650, 1500, 22950, 54628, 41004, 96094, 70028, 74178, 65328, 26605, 63076, 75271, 79285, 8151, 42101, 56362, 25961, 87864, 972, 29510, 2747, 8877, 9780, 61052, 84105, 15573, 27475, 44570, 25334, 18517, 44237, 84094, 67524, 76761, 65678, 79284, 2462, 42631, 22696, 19223, 29728, 67742, 11883, 59027, 12377, 80538, 2165, 17377, 15030, 49838, 23920, 26025, 68179, 75894, 43783, 97106, 75558, 35528, 52081, 16951, 68855, 402, 21459, 97550, 16948, 5369, 4641, 2663, 15233, 79974, 71093, 15234, 42690, 22322, 54282, 95845, 90010, 40530, 88298, 41885, 7079, 6098, 72786, 36603, 77378, 48393, 45723, 41996, 96025, 89297, 75586, 8422, 24360, 170, 46036, 46725, 67944, 74029, 73069, 45371, 99916, 71085, 42608, 89904, 6393, 51274, 42729, 58924, 82497, 64143, 88622, 18818, 89041, 56090, 21369, 78224, 90450, 45488, 58830, 4133, 98062, 81113, 11285, 51457, 3183, 38800, 65278, 42169, 28602, 52648, 44683, 75647, 11778, 32151, 33528, 23773, 68268, 23367, 70964, 23548,
+    35575, 67570, 77681, 74158, 25374, 62714, 43100, 4977, 51678, 83460, 29755, 15890, 64626, 54044, 14793, 64339, 94008, 97126, 49202, 33889, 12601, 12275, 56123, 94557, 68226, 67200, 9374, 70687, 29211, 8039, 14598, 74548, 37433, 98991, 29933, 37203, 23973, 96482, 64774, 58350, 61781, 31824, 57193, 26476, 21814, 32297, 32627, 44277, 33876, 55468, 81715, 82505, 61462, 20324, 84293, 40116, 51087, 43594, 6854, 59077, 39841, 26023, 22777, 66859, 82460, 89515, 41712, 33711, 71875, 10685, 12655, 50138, 31063, 37040, 95819, 38919, 27391, 29833, 34350, 65646, 7697, 2688, 41146, 13241, 50305, 86568, 24487, 78741, 96370, 21015, 31719, 39750, 25014, 72415, 8486, 90668, 51143, 49488, 21057, 92803, 53528, 39550, 76039, 44185, 32404, 30217, 19796, 38084, 49161, 80140, 20241, 39357, 68908, 93083, 77231, 6952, 36322, 50790, 623, 29730, 13616, 57546, 17434, 93811, 35148, 81419, 40250, 40329, 89126, 72402, 16053, 27107, 28919, 16829, 96582, 65057, 28416, 30801, 77742, 27420, 73118, 89352, 54706, 23035, 88413, 64608, 61930, 15037, 47327, 59596, 18700, 57576, 63628, 56823, 60091, 68209, 21001, 14962, 72257, 83802, 33721, 86343, 11133, 65737, 68477, 90725, 86869, 98403, 47393, 25356, 61372, 8873, 19888, 48836, 66005, 23531, 72520, 26461, 78508, 28213, 96394, 22983, 37856, 71814, 27425, 72753, 27511, 65471, 38592, 3683, 24652, 64505, 92543, 53201, 40639, 99542, 53425, 35321, 47669, 14134, 47727, 48202, 71931, 32119, 50086, 50266, 67159, 89317, 81905, 30315, 49154, 8690, 69365, 56881, 46473, 64100, 38365, 59377, 65630, 54871, 52745, 91536, 16106, 70066, 62063, 84530, 88103, 33599, 51063, 87299, 41880, 25335, 51252, 42788, 13568, 1721, 62424, 83308, 36787, 91536, 92555, 27600, 24030, 12267, 66336, 30242, 7183, 67624, 28471, 48593, 79766, 31178, 47818, 94522, 88855, 45262, 43670, 18065, 25062, 44558, 37189, 69225, 35216, 42683, 26289, 72816, 31947, 65871, 45715, 59452, 22014, 56669, 60331, 33450, 60601, 95047, 30789, 90107, 81565, 32266, 3252, 5446, 58756, 55370, 34034, 81071, 2560, 39054, 39564, 15010, 5389, 60002, 53320, 49545, 48444, 31415, 39278, 79879, 30148, 10186, 60358, 29011, 14419, 95159, 94815, 55251, 90910, 80582, 92304, 11697, 60061, 38577, 84439, 76196, 34542, 50963, 36294, 11123, 59763, 29873, 47383, 12979, 22119, 21723, 64725, 48377, 77132, 9817, 79920, 47653, 60069, 12924, 53808, 55962, 66969, 13757, 60615, 10994, 9138, 34119, 58436, 64407, 75170, 73524, 51864, 94183, 86847, 15585, 57616, 96267, 5340, 52929, 49096, 50291, 5559, 32382, 84077, 6598, 87921, 59719, 31726, 44772, 63373, 75420, 66829, 47275, 98264, 61387, 94945, 44540, 50098, 13078, 44729, 95332, 63555, 30782, 63203, 15071, 60996, 72812, 17418, 80215, 37610, 30670, 44674, 74822, 15471, 25236, 16266, 76213, 35820, 19567, 8715, 72003, 90606, 1434, 53545, 88170, 75014, 62287, 35436, 38669, 12927, 83877, 38622, 28313, 82884, 73969, 38671, 10450, 24158, 22941, 73162, 86548, 42482, 95315, 92016, 96156, 44012, 35962, 6366, 3881, 74300, 26248, 30182, 19164, 67105, 66771, 52587, 69894, 61820, 16551, 50743, 10096, 69030, 24451, 89165, 23929, 96291, 30685, 64413, 19913, 9049, 71383, 61684, 45384, 45927, 81840, 49521, 89594, 30055, 83430, 14930, 60316, 86585, 99375, 80170, 14207, 19584, 20067, 82874, 30159, 46647, 6942, 66777, 32638, 55662, 75470, 77622, 26893, 96149, 14373, 33252, 50574, 7945, 20696, 56662, 94348, 3384, 20956, 89668, 99052, 65131, 56847, 17589, 16419, 2670, 10705, 59587, 92902, 92424, 48570, 11034, 69149, 35733, 17315, 84966, 69353, 69590, 52834, 32561, 6049, 50156, 71676, 76423, 32361, 61509, 8845, 75709, 35956, 21912, 31188, 59083, 43459, 38614, 92206, 55645, 38737, 34193, 6451, 94163, 24326, 49976, 71600, 58024, 67160, 4365, 38270, 59558, 80834, 60739, 54318, 19738, 42196, 43191, 13463, 88914, 99239, 66869, 75691, 33085, 4323, 7170, 46184, 41423, 89835, 46877, 20349, 14365, 32727, 35322, 841, 23597, 43370, 57527, 73250, 32553, 71489, 44617, 98323, 37672, 59549, 96023, 63176, 13524, 15621, 30448, 28136, 45549, 3513, 64153, 19839, 24219, 41987, 51083, 90268, 52052, 31430, 4727, 99409, 43595, 82374, 61251, 51470, 66562, 98724, 23529, 53895, 67562, 87573, 89964, 30821, 15733, 33062, 86963, 33450, 75338, 32570, 14453, 38080, 36335, 84226, 52790, 42883, 61156, 42789, 57846, 60096, 29946, 80178, 15882, 1971, 60722, 62458, 8754, 59991, 89321, 584, 70565, 36458, 21226, 23561, 9837, 39364, 23065, 30675, 9306, 40085, 52082, 89976, 73283, 77851, 36174, 54470, 63250, 72111, 70853, 26723, 42590, 91230, 47512, 13983, 70898, 70927, 40721, 30642, 41628, 90010, 27306, 1933, 43304, 44499, 87890, 22201, 89249, 63935, 48438, 58588, 1061, 70061, 63075, 9676, 65820, 82156, 82668, 111, 54350, 10328, 23466, 98936, 18285, 53919, 32422, 84859, 58387, 24022, 32423, 6010, 56417, 49452, 69999, 14885, 47102, 59577, 24999, 75984, 96464, 59088, 85987, 71442, 88789, 4753, 8229, 76883, 15284, 90610, 40507, 78882, 55575, 25315, 7214, 70602, 4796, 35767, 54657, 42153, 16050, 93607, 99249, 77236, 59949, 52871, 47837, 33534, 30023, 89137, 99938, 35824, 50775, 30282, 82798, 53312, 65277, 68375, 91445, 58166, 43344, 6589, 82515, 34632, 78588, 152, 67554, 15877, 74334, 32783, 45147, 39483, 92067, 59029, 38298, 55229, 28268, 85140, 33451, 15424, 46695, 23201, 83329, 28372, 19518, 89198, 33305, 43892, 470, 37662, 9407, 14376, 80310, 21459, 72381, 80414, 88305, 69073, 63101, 91054, 47190, 48595, 24696, 41426, 35133, 94399, 21790, 55040, 73279, 20809, 67805, 94115, 58633, 78053, 89444, 4112, 8, 34517, 22106, 85934, 86814, 53333, 93437, 85062, 32791, 72744, 99843, 51161, 22730, 34908, 82918, 92566, 22467, 41226, 98518, 29235, 94042, 84371, 79100, 25214, 7764, 59427, 47891, 61092, 23775, 13641, 30837, 77377, 43032, 38441, 29462, 20300, 19070, 20982, 73987, 87836, 68062, 6419, 51563, 40084, 85694, 86677, 47142, 27222, 17844, 19158, 45120, 88524, 74724, 73229, 42470, 38751, 1132, 28603, 61188, 55021, 88825, 58005, 62411, 8843, 94852, 93664, 39253, 27473, 247, 43824, 1804, 8905, 11509, 95659, 7811, 80691, 15779, 49794, 8991, 76099, 29223, 36060, 85399, 41369, 22885, 38473, 22376, 50446, 89578, 25818, 61333, 78787, 47605, 83654, 99068, 52120, 48367, 86381, 19803, 72600, 31998, 37755, 88031, 83969, 42319, 27974, 35780, 93662, 46808, 60529, 15491, 10447, 48829, 33886, 68333, 44855, 86554, 64794, 66376, 58222, 14021, 52043, 56375, 1300, 38105, 89159, 97456, 26800, 93124, 3673, 32279, 30658, 84475, 3708, 93952, 39245, 91980, 55333, 79440, 64407, 46559, 60759, 10688, 49872, 45810, 87405, 66932, 56530, 57751, 9619, 27361, 6356, 65848, 7524, 20273, 22362, 20504, 28042, 39475, 51677, 85733, 32426, 54558, 17222, 56485, 34928, 90917, 70528, 51732, 61014, 98420, 67265, 41383, 3883, 47642, 53324, 93679, 93088, 57534, 44449, 46779, 81482, 54279, 80135, 11216, 92545, 18426, 96005, 57801, 21898, 5104, 83467, 72015, 43783, 89674, 57468, 96686, 95167, 38507, 95187, 64923, 71214, 42834, 93219, 47342, 24476, 84834, 29080, 86533, 30687, 68400, 26933, 37396, 65169, 89767, 20642, 53843, 85167, 77306, 46723, 68501, 4243, 35044, 15950, 40388, 53630, 76125, 10816, 83285,
+    4120, 11402, 91344, 95169]::Array(UInt32)</query>
+
     <!--
         Test with explicitly defined large set (10000 elemnets), but with tuples.
         Ditto the above comment.
@@ -61,35 +85,36 @@
     (81277, 26395), (57176, 69906), (55080, 20726), (65843, 9495), (27703, 24879), (60594, 53447), (72896, 95513), (87884, 50244), (25281, 16427), (14122, 6399), (65765, 45679), (38160, 38650), (76820, 91595), (74663, 37143), (35220, 16865), (54664, 88840), (7671, 19781), (7255, 87276), (92182, 47030), (98922, 49381), (21954, 20742), (54674, 19730), (74694, 81672), (31070, 97794), (22759, 3530), (6085, 72621), (17392, 26996), (82220, 41192), (48225, 41272), (42850, 54369), (10817, 25978), (18889, 81907), (33157, 51203), (64325, 5137), (54695, 50597), (32244, 99170), (64264, 23137), (22912, 47267), (70570, 51635), (96224, 20571), (91110, 65969), (2598, 66368), (80926, 52434), (1538, 77141), (10149, 21484), (4981, 58501), (5154, 55414), (66791, 35619), (9905, 90667), (83595, 75525), (31989, 37492), (41740, 48920), (33876, 10878), (48654, 50120), (85890, 46200), (67100, 30387), (76475, 38916), (1654, 1657), (93842, 71472), (14560, 97747), (24866, 74187), (11477, 2492), (94590, 95965), (29363, 58015), (58783, 5304), (27337, 87412), (17695, 41885), (91837, 75700), (271, 49400), (33438, 84607), (78520, 46982), (38817, 66995), (2031, 58147), (80354, 75561), (7752, 55141), (22715, 29219), (10069, 69521), (1711, 23325), (88218, 94290), (44895, 32844), (62152, 964), (32945, 57419), (19030, 51353), (53097, 36525), (76592, 2389), (53949, 27282), (10569, 90204), (94318, 48527), (13855, 27099), (41107, 11962), (39143, 81444), (66004, 38387), (55906, 61394), (34933, 33952), (53868, 82829), (86213, 80445), (40351, 56305), (97656, 90533), (48021, 7262), (49406, 38294), (57170, 7675), (7040, 8039), (65129, 76668), (7554, 74457), (65930, 2421), (12739, 37328), (17174, 68325), (63207, 21315), (70066, 44503), (19112, 8081), (80329, 65152), (76480, 39600), (75262, 45432), (24382, 67054), (75360, 90438), (21786, 19182), (2050, 82428), (34831, 92670), (69746, 44939), (6130, 58630), (62478, 14374), (35730, 71761), (20641, 66145), (86551, 64076), (37559, 79379), (8215, 82203), (33701, 9187), (22679, 38196), (17476, 25994), (4391, 62658), (87726, 32997), (22552, 65818), (18115, 42587), (64374, 97689), (64896, 49572), (98479, 75547), (881, 32287), (25305, 16000), (295, 67454), (67642, 87363), (50945, 31544), (95966, 9972), (44139, 28252), (83682, 88471), (34615, 665), (13190, 85527), (32195, 81130), (22310, 12209), (27910, 60272), (40133, 5905), (29352, 36686), (76443, 64096), (79522, 79616), (63465, 96631), (95604, 90216), (88548, 12411), (63732, 50843), (1478, 11113), (41472, 43329), (35207, 78855), (95093, 22581), (67812, 1348), (96472, 75947), (18984, 63538), (84782, 72178), (53524, 46634), (95525, 15476), (82732, 89272), (59603, 2032), (74431, 78243), (47712, 51835), (82671, 67076), (63302, 96469), (77655, 95524), (11099, 31832), (77967, 32724), (85070, 36190), (93260, 32825), (51348, 34162), (40912, 26841), (27227, 21822), (15979, 96933), (76990, 90541), (36121, 90437), (85571, 9605), (85987, 46881), (86738, 82375), (80188, 48238), (64608, 41916), (79866, 9442), (28100, 95607), (10136, 19628), (6078, 59019), (8971, 11986), (75703, 209), (81982, 98701), (30455, 66367), (92825, 84403), (73144, 4923), (62835, 75533), (90925, 56381), (83853, 86786), (66906, 28576), (69683, 74216), (2171, 22531), (6591, 52559), (59362, 88732), (49865, 38016), (82881, 9151), (71356, 27365), (91463, 45944), (71040, 12264), (62116, 27681), (84941, 82284), (57515, 60713), (45227, 74196), (77502, 17765), (54055, 29484), (33708, 46220), (37344, 75102), (80480, 37942), (95782, 36781), (14092, 82457), (25284, 82297), (85150, 50659), (90037, 99122), (49584, 48321), (8028, 65210), (8162, 32091), (1609, 22211), (38548, 1023), (35864, 43021), (54196, 30754), (88535, 90185), (5518, 97226), (79272, 57758), (61381, 86419), (38344, 86877), (72629, 24694), (12563, 11747), (81456, 44023), (55536, 65195), (67741, 12182), (64250, 29636), (45252, 9834), (16576, 40098), (65924, 11123), (14090, 83443), (95180, 92697), (92452, 7957), (21244, 29717), (50253, 62030), (21401, 70735), (86803, 89625), (17066, 52757), (74570, 89660), (11647, 74336), (22463, 68191), (41693, 67542), (12994, 21955), (3180, 27966), (37236, 51099), (68568, 62778), (2671, 68542), (42771, 4268), (7578, 12919), (33838, 61136), (87904, 48076), (3781, 57164), (83289, 14414), (29626, 91409), (92536, 13946), (88125, 34961), (71541, 41249), (21045, 85183), (21628, 62294), (17768, 22390), (5892, 10231), (85902, 84414), (44078, 87944), (64981, 31018), (85690, 11077), (4711, 9309), (39077, 26339), (85313, 99603), (20267, 31090), (92684, 11726), (17887, 17415), (23064, 83141), (40925, 87246), (17575, 71065), (29396, 86192), (10859, 2881), (50457, 42309), (86972, 41824), (80954, 76970), (11664, 94322), (4286, 93562), (9093, 32589), (81261, 96519), (67886, 3086), (74132, 43197), (94549, 26192), (55498, 75374), (93813, 32911), (6727, 51629), (93543, 55373), (48682, 83316), (32468, 77339), (60028, 4896), (34177, 67214), (35429, 16686), (72814, 39944), (82791, 97364), (21249, 36007), (85536, 84815), (32784, 34349), (2391, 45661), (62595, 30434), (56513, 65051), (22536, 99421), (80603, 62636), (23609, 19082), (33262, 63428), (45307, 96049), (75079, 62835), (52361, 19400), (43845, 89033), (54257, 33298), (31133, 35836), (56725, 10158), (73650, 10456), (77548, 28249), (57998, 79546), (97895, 93196), (472, 18004), (67178, 2684), (34612, 36352), (84970, 98816), (32474, 5895), (60388, 75957), (81643, 26457), (30070, 55744), (14725, 58396), (66451, 69932), (59264, 59569), (98045, 63704), (11925, 87468), (24701, 6280), (47797, 84240), (998, 13575), (37865, 72036), (71339, 10339), (28248, 7481), (33945, 97829), (85194, 8904), (39669, 73192), (24326, 65934), (14438, 72729), (76676, 35176), (97604, 95931), (36032, 61056), (65788, 20291), (73067, 60718), (75742, 27362), (45393, 74792), (49586, 13048), (57961, 68534), (78171, 47271), (76064, 41030), (88738, 10155), (87757, 63134), (95783, 76438), (77935, 85529), (79345, 69555), (94483, 58668), (9432, 40485), (43585, 376), (61737, 97784), (1593, 37078), (11129, 23793), (94341, 64063), (41896, 70446), (77473, 33532), (66748, 65844), (17802, 27920), (22891, 12901), (40435, 43348), (27956, 16989), (29550, 63725), (49453, 61216), (25570, 97985), (39599, 83449), (96373, 12817), (48357, 40473), (99949, 33182), (85434, 45421), (28033, 46182), (80932, 26691), (99522, 29180), (70868, 31903), (63217, 51504), (70267, 29484), (36096, 28371), (45710, 2823), (85697, 3912), (25410, 70358), (73558, 82834), (28617, 80585), (81874, 57512), (76797, 45045), (22091, 84124), (68372, 42189), (66320, 83215), (23013, 22530), (33735, 97800), (54318, 99061), (18025, 39513), (69059, 39780), (58425, 39790), (10222, 96791), (17061, 3138), (92416, 5773), (20023, 31736), (47846, 74511), (52598, 26398), (3738, 44490), (53346, 79223), (31991, 57557), (34592, 98693), (86926, 20881), (14108, 87654), (4889, 34982), (77283, 73201), (13668, 22633), (50763, 95152), (97292, 54613), (22782, 30081), (21536, 46551), (45965, 4172), (75537, 79254), (41267, 86819), (57723, 75200), (60404, 27252), (80305, 57892), (50103, 24015), (69409, 13132), (30717, 56384), (54568, 79877), (8584, 8359), (41416, 64392), (32898, 92944), (5262, 35907), (88652, 77951), (16619, 2797), (42494, 65581), (21009, 18555), (29084, 28068), (29464, 35568), (7288, 52066), (32378, 48725), (95300, 62168), (52295, 97110), (36862, 87786), (12224, 86684), (85883, 34167), (45369, 76651), (95460, 42855), (34354, 87238), (7214, 96375), (58720, 87947), (55009, 10506), (98506, 6081), (46068, 81113), (99065, 58657), (81820, 28081), (90611, 57235), (7661, 72835), (93195, 90418), (34452, 20146), (39857, 78712), (47185, 52074), (9879, 51807), (92457, 92377), (36082, 17723), (21905, 43398), (35902, 54380), (21791, 6804), (50774, 35200), (11540, 83934), (54574, 57602), (99878, 35568), (28171, 68210), (58132, 17222), (91755, 80585), (18944, 65785), (78535, 70725), (42599, 65291), (62274, 97160), (76487, 23798), (34741, 36988), (7286, 61119), (36824, 29665), (82478, 60722), (90995, 28025), (71438, 40230), (83152, 45104), (1812, 91619))
     </query>
 
-    <!-- The same as above, but interpret tuple as function -->
-    <query>SELECT (rand(), rand()) IN tuple(tuple(17258, 93148), tuple(4508, 52749), tuple(68660, 70017), tuple(77797, 23528), tuple(1136, 37393), tuple(53237, 15379), tuple(68370, 73211), tuple(15782, 54962), tuple(59432, 45415), tuple(68396, 920), tuple(96154, 21016), tuple(12700, 26887), tuple(88016, 43191), tuple(68153, 51575), tuple(91315, 40005), tuple(18070, 73178), tuple(86, 631), tuple(77717, 20324), tuple(3227, 76188), tuple(74960, 43147), tuple(77538, 19628), tuple(82292, 6525), tuple(24293, 12566), tuple(85244, 96287), tuple(93982, 1329), tuple(38064, 54723), tuple(83999, 45810), tuple(71921, 53673), tuple(88638, 9669), tuple(1959, 39535), tuple(82235, 95796), tuple(27907, 90975), tuple(42383, 91015), tuple(9948, 91514), tuple(81712, 47309), tuple(400, 25808), tuple(31791, 46948), tuple(39740, 36098), tuple(25943, 84598), tuple(99598, 52939), tuple(77134, 15845), tuple(40313, 72174), tuple(85017, 94036), tuple(36595, 14303), tuple(83961, 68078), tuple(55792, 72759), tuple(73574, 43606), tuple(9853, 63560), tuple(28580, 56721), tuple(74804, 41025), tuple(32095, 55657), tuple(52881, 63416), tuple(91368, 90310), tuple(23922, 38883), tuple(30592, 10758), tuple(66448, 61183), tuple(31880, 96697), tuple(11362, 20633), tuple(75331, 2015), tuple(71129, 8785), tuple(1115, 70955), tuple(7886, 83698), tuple(18961, 84556), tuple(16677, 43028), tuple(37347, 70220), tuple(31699, 71244), tuple(10578, 96159), tuple(67600, 39041), tuple(78791, 86687), tuple(21545, 54174), tuple(68774, 37637), tuple(46132, 81768), tuple(98413, 20605), tuple(2960, 23665), tuple(31507, 35719), tuple(96209, 18368), tuple(60558, 38035), tuple(21952, 3264), tuple(11834, 86458), tuple(21651, 17650), tuple(86276, 36087), tuple(18818, 24849), tuple(61951, 3390), tuple(59637, 62545), tuple(30346, 72253), tuple(36281, 2992), tuple(78340, 49872), tuple(94326, 93723), tuple(3416, 94405), tuple(12272, 8741), tuple(22600, 22095), tuple(57636, 37106), tuple(38702, 14889), tuple(70238, 11276), tuple(17325, 60648), tuple(16492, 41271), tuple(52100, 1304), tuple(93416, 7795), tuple(57209, 71008), tuple(48010, 36078), tuple(20384, 74420), tuple(77440, 34439), tuple(69224, 45099), tuple(30374, 33884), tuple(49038, 90140), tuple(1154, 84725), tuple(64926, 86985), tuple(91746, 73472), tuple(59757, 75755), tuple(45860, 71557), tuple(45833, 36526), tuple(74618, 73598), tuple(91360, 65168), tuple(58029, 30793), tuple(56332, 14973), tuple(99943, 96877), tuple(97454, 6450), tuple(64502, 77301), tuple(73182, 31853), tuple(76809, 83964), tuple(82916, 86188), tuple(78736, 65427), tuple(36495, 7422), tuple(76196, 2804), tuple(96117, 61093), tuple(9177, 26099), tuple(52942, 63007), tuple(48578, 47876), tuple(50638, 89903), tuple(7113, 97316), tuple(35301, 12750), tuple(47807, 7254), tuple(38217, 55418), tuple(56970, 41687), tuple(20527, 62886), tuple(358, 14021), tuple(64018, 18582), tuple(91740, 21683), tuple(81967, 53589), tuple(45437, 38450), tuple(45476, 67752), tuple(76851, 72072), tuple(7304, 60091), tuple(40097, 12897), tuple(39906, 29247), tuple(84262, 58734), tuple(30857, 43791), tuple(56087, 78929), tuple(20498, 45954), tuple(48726, 500), tuple(62723, 43763), tuple(28368, 30756), tuple(74048, 52403), tuple(15045, 95926), tuple(75542, 55384), tuple(52543, 22525), tuple(56001, 6935), tuple(11431, 46745), tuple(77731, 7310), tuple(36718, 59909), tuple(32235, 91254), tuple(92417, 25917), tuple(21782, 79277), tuple(46378, 87536), tuple(35324, 26075), tuple(6310, 76915), tuple(1551, 69473), tuple(50642, 68865), tuple(55190, 72934), tuple(49780, 21873), tuple(99466, 29686), tuple(90761, 13179), tuple(72959, 57033), tuple(20020, 90200), tuple(46186, 79105), tuple(73871, 52382), tuple(59559, 38801), tuple(59916, 16082), tuple(33610, 94966), tuple(46001, 45225), tuple(86679, 26469), tuple(77245, 91929), tuple(32887, 36623), tuple(11179, 46898), tuple(87881, 68087), tuple(45438, 47991), tuple(24950, 94525), tuple(91664, 51656), tuple(43914, 47805), tuple(15736, 96156), tuple(56346, 20283), tuple(85053, 48931), tuple(17790, 26179), tuple(96195, 55728), tuple(43765, 54807), tuple(44988, 89269), tuple(55911, 99411), tuple(52446, 47397), tuple(28346, 65442), tuple(96669, 68226), tuple(66194, 26848), tuple(37276, 55864), tuple(14116, 41583), tuple(18058, 16317), tuple(93136, 85318), tuple(35616, 86252), tuple(29222, 29969), tuple(33386, 85372), tuple(71094, 44238), tuple(27733, 31838), tuple(64626, 16692), tuple(52904, 97899), tuple(97619, 12663), tuple(50165, 4688), tuple(67557, 44053), tuple(69184, 66269), tuple(73164, 89705), tuple(39822, 15169), tuple(65499, 72808), tuple(30068, 63697), tuple(30154, 64235), tuple(97016, 58716), tuple(94366, 36592), tuple(1592, 16261), tuple(87985, 52102), tuple(12554, 23652), tuple(15909, 25292), tuple(2527, 91531), tuple(92139, 36031), tuple(28986, 30032), tuple(3038, 56314), tuple(32239, 26707), tuple(15973, 34901), tuple(70246, 39680), tuple(82529, 38132), tuple(45827, 74783), tuple(53665, 64111), tuple(55218, 84170), tuple(20466, 16130), tuple(55734, 71203), tuple(31438, 96906), tuple(66338, 85858), tuple(35988, 68511), tuple(78391, 15191), tuple(80747, 59213), tuple(5357, 11546), tuple(16822, 16607), tuple(36607, 41106), tuple(74949, 30739), tuple(45726, 64887), tuple(1524, 54847), tuple(37371, 89195), tuple(28726, 27788), tuple(22600, 44777), tuple(53999, 63625), tuple(84304, 98338), tuple(49260, 76480), tuple(74564, 53907), tuple(89867, 97096), tuple(60157, 61299), tuple(17165, 10146), tuple(56334, 36268), tuple(62114, 49222), tuple(22715, 23620), tuple(42830, 11539), tuple(41091, 69151), tuple(75471, 68364), tuple(18681, 43249), tuple(42738, 63219), tuple(35474, 98454), tuple(76815, 46024), tuple(66310, 36521), tuple(86095, 77013), tuple(63693, 77319), tuple(80731, 63031), tuple(95478, 92387), tuple(23787, 63724), tuple(46299, 68994), tuple(4800, 2460), tuple(9663, 80639), tuple(77231, 85814), tuple(81615, 11311), tuple(35638, 27340), tuple(13598, 14322), tuple(30657, 17238), tuple(90957, 96846), tuple(69962, 52140), tuple(41681, 65962), tuple(96836, 58177), tuple(36190, 11623), tuple(4231, 40500), tuple(43049, 41949), tuple(71177, 98492), tuple(30193, 39750), tuple(19744, 33204), tuple(63358, 30210), tuple(45638, 58918), tuple(43641, 38741), tuple(35598, 40932), tuple(33238, 36236), tuple(50835, 20968), tuple(25099, 34071), tuple(84986, 88456), tuple(35333, 1529), tuple(79771, 23985), tuple(647, 61658), tuple(9424, 11743), tuple(77766, 31528), tuple(77811, 86973), tuple(76403, 74377), tuple(55568, 79251), tuple(68858, 20762), tuple(68520, 66773), tuple(93598, 89823), tuple(8080, 82539), tuple(87760, 52247), tuple(25191, 16905), tuple(17837, 8339), tuple(85177, 59050), tuple(51680, 77374), tuple(3287, 43018), tuple(43479, 62141), tuple(34909, 46322), tuple(11869, 5885), tuple(96193, 58417), tuple(101, 47460), tuple(34937, 88582), tuple(83216, 88388), tuple(28571, 15292), tuple(66683, 62613), tuple(34478, 8924), tuple(2680, 89973), tuple(62438, 44460), tuple(11724, 4791), tuple(5383, 72888), tuple(88206, 67586), tuple(8124, 21690), tuple(28779, 75789), tuple(66791, 4757), tuple(6176, 47760), tuple(6403, 78084), tuple(78122, 35446), tuple(99494, 73608), tuple(39691, 89098), tuple(59182, 19484), tuple(25389, 98963), tuple(96487, 3692), tuple(76222, 67381), tuple(21199, 50358), tuple(95998, 58137), tuple(28777, 43913), tuple(14176, 60117), tuple(52257, 81703), tuple(14604, 13438), tuple(71301, 14401), tuple(19758, 66914), tuple(15506, 29873), tuple(87205, 29449), tuple(93295, 15930), tuple(63651, 11287), tuple(19785, 15966), tuple(30795, 75112), tuple(69462, 37655), tuple(18793, 85764), tuple(36240, 31236), tuple(98153, 73724), tuple(72491, 4223), tuple(66930, 35048), tuple(25686, 13269), tuple(13940, 13259), tuple(69163, 11235), tuple(1183, 86961), tuple(54323, 67315), tuple(85044, 60872), tuple(48875, 3683), tuple(43052, 92861), tuple(87574, 32969), tuple(92552, 80564), tuple(94832, 47682), tuple(72011, 80994), tuple(60182, 917), tuple(97788, 34169), tuple(66432, 47940), tuple(87468, 80954), tuple(35385, 68758), tuple(50555, 63710), tuple(55311, 44337), tuple(87065, 26514), tuple(84581, 98736), tuple(23212, 56499), tuple(75120, 72447), tuple(56087, 38285), tuple(58171, 45629), tuple(28401, 44319), tuple(70432, 27883), tuple(18891, 14646), tuple(26206, 49924), tuple(79957, 44914), tuple(56064, 27529), tuple(99090, 29197), tuple(49435, 340), tuple(53525, 65601), tuple(76998, 88349), tuple(50416, 70860), tuple(42506, 75290), tuple(34024, 13295), tuple(86663, 46523), tuple(88814, 231), tuple(57809, 21), tuple(84914, 84771), tuple(43042, 66892), tuple(17288, 33908), tuple(4934, 63195), tuple(50590, 1516), tuple(97843, 80208), tuple(20091, 86717), tuple(71566, 15929), tuple(19531, 23634), tuple(41646, 45549), tuple(89226, 82902), tuple(96683, 63386), tuple(31072, 53788), tuple(51135, 41099), tuple(78912, 65609), tuple(36094, 23603), tuple(88403, 51455), tuple(73795, 47066), tuple(26448, 82852), tuple(22829, 2894), tuple(30041, 92548), tuple(27733, 20608), tuple(70180, 19892), tuple(51650, 63440), tuple(76328, 13666), tuple(40514, 6677), tuple(2786, 51059), tuple(40809, 16499), tuple(10857, 82541), tuple(78221, 61067), tuple(17982, 51969), tuple(85369, 66965), tuple(47153, 47149), tuple(43965, 75796), tuple(82725, 60767), tuple(42407, 97249), tuple(51475, 81224), tuple(60957, 89414), tuple(33065, 21663), tuple(36601, 5290), tuple(95842, 67301), tuple(64630, 60398), tuple(55212, 35638), tuple(41750, 44235), tuple(75260, 82400), tuple(91291, 25843), tuple(6477, 8311), tuple(14919, 52306), tuple(66220, 33180), tuple(45736, 2313), tuple(37450, 64444), tuple(98614, 61344), tuple(75007, 50946), tuple(56701, 28117), tuple(66632, 5174), tuple(92323, 76613), tuple(6796, 73695), tuple(33696, 76280), tuple(86876, 5614), tuple(50863, 67993), tuple(36068, 17049), tuple(91912, 34271), tuple(70706, 1904), tuple(97798, 41117), tuple(68154, 72483), tuple(83862, 25578), tuple(61643, 17204), tuple(69974, 64232), tuple(77926, 19637), 
+    <!-- The same as above, but interpret tuple as function. It's about 200ms,
+        so we can't mark it as short.-->
+    <query>SELECT (rand(), rand()) IN tuple(tuple(17258, 93148), tuple(4508, 52749), tuple(68660, 70017), tuple(77797, 23528), tuple(1136, 37393), tuple(53237, 15379), tuple(68370, 73211), tuple(15782, 54962), tuple(59432, 45415), tuple(68396, 920), tuple(96154, 21016), tuple(12700, 26887), tuple(88016, 43191), tuple(68153, 51575), tuple(91315, 40005), tuple(18070, 73178), tuple(86, 631), tuple(77717, 20324), tuple(3227, 76188), tuple(74960, 43147), tuple(77538, 19628), tuple(82292, 6525), tuple(24293, 12566), tuple(85244, 96287), tuple(93982, 1329), tuple(38064, 54723), tuple(83999, 45810), tuple(71921, 53673), tuple(88638, 9669), tuple(1959, 39535), tuple(82235, 95796), tuple(27907, 90975), tuple(42383, 91015), tuple(9948, 91514), tuple(81712, 47309), tuple(400, 25808), tuple(31791, 46948), tuple(39740, 36098), tuple(25943, 84598), tuple(99598, 52939), tuple(77134, 15845), tuple(40313, 72174), tuple(85017, 94036), tuple(36595, 14303), tuple(83961, 68078), tuple(55792, 72759), tuple(73574, 43606), tuple(9853, 63560), tuple(28580, 56721), tuple(74804, 41025), tuple(32095, 55657), tuple(52881, 63416), tuple(91368, 90310), tuple(23922, 38883), tuple(30592, 10758), tuple(66448, 61183), tuple(31880, 96697), tuple(11362, 20633), tuple(75331, 2015), tuple(71129, 8785), tuple(1115, 70955), tuple(7886, 83698), tuple(18961, 84556), tuple(16677, 43028), tuple(37347, 70220), tuple(31699, 71244), tuple(10578, 96159), tuple(67600, 39041), tuple(78791, 86687), tuple(21545, 54174), tuple(68774, 37637), tuple(46132, 81768), tuple(98413, 20605), tuple(2960, 23665), tuple(31507, 35719), tuple(96209, 18368), tuple(60558, 38035), tuple(21952, 3264), tuple(11834, 86458), tuple(21651, 17650), tuple(86276, 36087), tuple(18818, 24849), tuple(61951, 3390), tuple(59637, 62545), tuple(30346, 72253), tuple(36281, 2992), tuple(78340, 49872), tuple(94326, 93723), tuple(3416, 94405), tuple(12272, 8741), tuple(22600, 22095), tuple(57636, 37106), tuple(38702, 14889), tuple(70238, 11276), tuple(17325, 60648), tuple(16492, 41271), tuple(52100, 1304), tuple(93416, 7795), tuple(57209, 71008), tuple(48010, 36078), tuple(20384, 74420), tuple(77440, 34439), tuple(69224, 45099), tuple(30374, 33884), tuple(49038, 90140), tuple(1154, 84725), tuple(64926, 86985), tuple(91746, 73472), tuple(59757, 75755), tuple(45860, 71557), tuple(45833, 36526), tuple(74618, 73598), tuple(91360, 65168), tuple(58029, 30793), tuple(56332, 14973), tuple(99943, 96877), tuple(97454, 6450), tuple(64502, 77301), tuple(73182, 31853), tuple(76809, 83964), tuple(82916, 86188), tuple(78736, 65427), tuple(36495, 7422), tuple(76196, 2804), tuple(96117, 61093), tuple(9177, 26099), tuple(52942, 63007), tuple(48578, 47876), tuple(50638, 89903), tuple(7113, 97316), tuple(35301, 12750), tuple(47807, 7254), tuple(38217, 55418), tuple(56970, 41687), tuple(20527, 62886), tuple(358, 14021), tuple(64018, 18582), tuple(91740, 21683), tuple(81967, 53589), tuple(45437, 38450), tuple(45476, 67752), tuple(76851, 72072), tuple(7304, 60091), tuple(40097, 12897), tuple(39906, 29247), tuple(84262, 58734), tuple(30857, 43791), tuple(56087, 78929), tuple(20498, 45954), tuple(48726, 500), tuple(62723, 43763), tuple(28368, 30756), tuple(74048, 52403), tuple(15045, 95926), tuple(75542, 55384), tuple(52543, 22525), tuple(56001, 6935), tuple(11431, 46745), tuple(77731, 7310), tuple(36718, 59909), tuple(32235, 91254), tuple(92417, 25917), tuple(21782, 79277), tuple(46378, 87536), tuple(35324, 26075), tuple(6310, 76915), tuple(1551, 69473), tuple(50642, 68865), tuple(55190, 72934), tuple(49780, 21873), tuple(99466, 29686), tuple(90761, 13179), tuple(72959, 57033), tuple(20020, 90200), tuple(46186, 79105), tuple(73871, 52382), tuple(59559, 38801), tuple(59916, 16082), tuple(33610, 94966), tuple(46001, 45225), tuple(86679, 26469), tuple(77245, 91929), tuple(32887, 36623), tuple(11179, 46898), tuple(87881, 68087), tuple(45438, 47991), tuple(24950, 94525), tuple(91664, 51656), tuple(43914, 47805), tuple(15736, 96156), tuple(56346, 20283), tuple(85053, 48931), tuple(17790, 26179), tuple(96195, 55728), tuple(43765, 54807), tuple(44988, 89269), tuple(55911, 99411), tuple(52446, 47397), tuple(28346, 65442), tuple(96669, 68226), tuple(66194, 26848), tuple(37276, 55864), tuple(14116, 41583), tuple(18058, 16317), tuple(93136, 85318), tuple(35616, 86252), tuple(29222, 29969), tuple(33386, 85372), tuple(71094, 44238), tuple(27733, 31838), tuple(64626, 16692), tuple(52904, 97899), tuple(97619, 12663), tuple(50165, 4688), tuple(67557, 44053), tuple(69184, 66269), tuple(73164, 89705), tuple(39822, 15169), tuple(65499, 72808), tuple(30068, 63697), tuple(30154, 64235), tuple(97016, 58716), tuple(94366, 36592), tuple(1592, 16261), tuple(87985, 52102), tuple(12554, 23652), tuple(15909, 25292), tuple(2527, 91531), tuple(92139, 36031), tuple(28986, 30032), tuple(3038, 56314), tuple(32239, 26707), tuple(15973, 34901), tuple(70246, 39680), tuple(82529, 38132), tuple(45827, 74783), tuple(53665, 64111), tuple(55218, 84170), tuple(20466, 16130), tuple(55734, 71203), tuple(31438, 96906), tuple(66338, 85858), tuple(35988, 68511), tuple(78391, 15191), tuple(80747, 59213), tuple(5357, 11546), tuple(16822, 16607), tuple(36607, 41106), tuple(74949, 30739), tuple(45726, 64887), tuple(1524, 54847), tuple(37371, 89195), tuple(28726, 27788), tuple(22600, 44777), tuple(53999, 63625), tuple(84304, 98338), tuple(49260, 76480), tuple(74564, 53907), tuple(89867, 97096), tuple(60157, 61299), tuple(17165, 10146), tuple(56334, 36268), tuple(62114, 49222), tuple(22715, 23620), tuple(42830, 11539), tuple(41091, 69151), tuple(75471, 68364), tuple(18681, 43249), tuple(42738, 63219), tuple(35474, 98454), tuple(76815, 46024), tuple(66310, 36521), tuple(86095, 77013), tuple(63693, 77319), tuple(80731, 63031), tuple(95478, 92387), tuple(23787, 63724), tuple(46299, 68994), tuple(4800, 2460), tuple(9663, 80639), tuple(77231, 85814), tuple(81615, 11311), tuple(35638, 27340), tuple(13598, 14322), tuple(30657, 17238), tuple(90957, 96846), tuple(69962, 52140), tuple(41681, 65962), tuple(96836, 58177), tuple(36190, 11623), tuple(4231, 40500), tuple(43049, 41949), tuple(71177, 98492), tuple(30193, 39750), tuple(19744, 33204), tuple(63358, 30210), tuple(45638, 58918), tuple(43641, 38741), tuple(35598, 40932), tuple(33238, 36236), tuple(50835, 20968), tuple(25099, 34071), tuple(84986, 88456), tuple(35333, 1529), tuple(79771, 23985), tuple(647, 61658), tuple(9424, 11743), tuple(77766, 31528), tuple(77811, 86973), tuple(76403, 74377), tuple(55568, 79251), tuple(68858, 20762), tuple(68520, 66773), tuple(93598, 89823), tuple(8080, 82539), tuple(87760, 52247), tuple(25191, 16905), tuple(17837, 8339), tuple(85177, 59050), tuple(51680, 77374), tuple(3287, 43018), tuple(43479, 62141), tuple(34909, 46322), tuple(11869, 5885), tuple(96193, 58417), tuple(101, 47460), tuple(34937, 88582), tuple(83216, 88388), tuple(28571, 15292), tuple(66683, 62613), tuple(34478, 8924), tuple(2680, 89973), tuple(62438, 44460), tuple(11724, 4791), tuple(5383, 72888), tuple(88206, 67586), tuple(8124, 21690), tuple(28779, 75789), tuple(66791, 4757), tuple(6176, 47760), tuple(6403, 78084), tuple(78122, 35446), tuple(99494, 73608), tuple(39691, 89098), tuple(59182, 19484), tuple(25389, 98963), tuple(96487, 3692), tuple(76222, 67381), tuple(21199, 50358), tuple(95998, 58137), tuple(28777, 43913), tuple(14176, 60117), tuple(52257, 81703), tuple(14604, 13438), tuple(71301, 14401), tuple(19758, 66914), tuple(15506, 29873), tuple(87205, 29449), tuple(93295, 15930), tuple(63651, 11287), tuple(19785, 15966), tuple(30795, 75112), tuple(69462, 37655), tuple(18793, 85764), tuple(36240, 31236), tuple(98153, 73724), tuple(72491, 4223), tuple(66930, 35048), tuple(25686, 13269), tuple(13940, 13259), tuple(69163, 11235), tuple(1183, 86961), tuple(54323, 67315), tuple(85044, 60872), tuple(48875, 3683), tuple(43052, 92861), tuple(87574, 32969), tuple(92552, 80564), tuple(94832, 47682), tuple(72011, 80994), tuple(60182, 917), tuple(97788, 34169), tuple(66432, 47940), tuple(87468, 80954), tuple(35385, 68758), tuple(50555, 63710), tuple(55311, 44337), tuple(87065, 26514), tuple(84581, 98736), tuple(23212, 56499), tuple(75120, 72447), tuple(56087, 38285), tuple(58171, 45629), tuple(28401, 44319), tuple(70432, 27883), tuple(18891, 14646), tuple(26206, 49924), tuple(79957, 44914), tuple(56064, 27529), tuple(99090, 29197), tuple(49435, 340), tuple(53525, 65601), tuple(76998, 88349), tuple(50416, 70860), tuple(42506, 75290), tuple(34024, 13295), tuple(86663, 46523), tuple(88814, 231), tuple(57809, 21), tuple(84914, 84771), tuple(43042, 66892), tuple(17288, 33908), tuple(4934, 63195), tuple(50590, 1516), tuple(97843, 80208), tuple(20091, 86717), tuple(71566, 15929), tuple(19531, 23634), tuple(41646, 45549), tuple(89226, 82902), tuple(96683, 63386), tuple(31072, 53788), tuple(51135, 41099), tuple(78912, 65609), tuple(36094, 23603), tuple(88403, 51455), tuple(73795, 47066), tuple(26448, 82852), tuple(22829, 2894), tuple(30041, 92548), tuple(27733, 20608), tuple(70180, 19892), tuple(51650, 63440), tuple(76328, 13666), tuple(40514, 6677), tuple(2786, 51059), tuple(40809, 16499), tuple(10857, 82541), tuple(78221, 61067), tuple(17982, 51969), tuple(85369, 66965), tuple(47153, 47149), tuple(43965, 75796), tuple(82725, 60767), tuple(42407, 97249), tuple(51475, 81224), tuple(60957, 89414), tuple(33065, 21663), tuple(36601, 5290), tuple(95842, 67301), tuple(64630, 60398), tuple(55212, 35638), tuple(41750, 44235), tuple(75260, 82400), tuple(91291, 25843), tuple(6477, 8311), tuple(14919, 52306), tuple(66220, 33180), tuple(45736, 2313), tuple(37450, 64444), tuple(98614, 61344), tuple(75007, 50946), tuple(56701, 28117), tuple(66632, 5174), tuple(92323, 76613), tuple(6796, 73695), tuple(33696, 76280), tuple(86876, 5614), tuple(50863, 67993), tuple(36068, 17049), tuple(91912, 34271), tuple(70706, 1904), tuple(97798, 41117), tuple(68154, 72483), tuple(83862, 25578), tuple(61643, 17204), tuple(69974, 64232), tuple(77926, 19637),
     tuple(64901, 88988), tuple(71424, 91703), tuple(91655, 17147), tuple(46872, 56530), tuple(44189, 98087), tuple(95939, 54420), tuple(72651, 68785), tuple(67624, 84875), tuple(92587, 87663), tuple(65275, 81256), tuple(53798, 2506), tuple(14702, 3638), tuple(71291, 50452), tuple(14909, 13903), tuple(66965, 26606), tuple(14127, 60345), tuple(35306, 1738), tuple(77234, 10468), tuple(53521, 41218), tuple(80681, 82583), tuple(44227, 26521), tuple(32263, 21482), tuple(82270, 56963), tuple(50580, 80567), tuple(11593, 22346), tuple(20074, 26867), tuple(73126, 28667), tuple(62996, 24317), tuple(20295, 57163), tuple(1506, 57668), tuple(69567, 45236), tuple(43366, 26001), tuple(88052, 40181), tuple(1599, 89349), tuple(36789, 1579), tuple(39895, 46673), tuple(30381, 3206), tuple(31723, 5625), tuple(19252, 31317), tuple(16932, 77149), tuple(48794, 34409), tuple(55986, 30328), tuple(47551, 75088), tuple(57363, 78365), tuple(95221, 63385), tuple(26449, 5733), tuple(96588, 53077), tuple(52980, 41140), tuple(8187, 85947), tuple(36723, 26520), tuple(23579, 38909), tuple(33350, 19275), tuple(63930, 19357), tuple(43536, 59941), tuple(31117, 77322), tuple(44638, 94812), tuple(44730, 99097), tuple(95108, 48170), tuple(57813, 49503), tuple(79959, 89436), tuple(86980, 62031), tuple(8275, 44009), tuple(36666, 94645), tuple(22064, 38882), tuple(40471, 16939), tuple(31156, 11337), tuple(13101, 96977), tuple(17906, 26835), tuple(89861, 51405), tuple(73369, 67946), tuple(99141, 58572), tuple(27131, 98703), tuple(15900, 43412), tuple(51768, 93125), tuple(78579, 46689), tuple(23029, 13895), tuple(60870, 55830), tuple(22553, 8236), tuple(76449, 96207), tuple(83766, 51024), tuple(27630, 50614), tuple(53484, 90104), tuple(77626, 21944), tuple(46755, 41583), tuple(53616, 34240), tuple(94159, 44415), tuple(13914, 90059), tuple(44387, 89012), tuple(27499, 64579), tuple(83415, 30809), tuple(77558, 82619), tuple(88880, 9814), tuple(8466, 4424), tuple(43598, 91921), tuple(24695, 3349), tuple(46295, 65208), tuple(51256, 82461), tuple(49126, 93012), tuple(16186, 96585), tuple(43284, 22655), tuple(93130, 90393), tuple(77495, 34372), tuple(85509, 65856), tuple(86662, 61906), tuple(50988, 44393), tuple(29828, 17737), tuple(91651, 35308), tuple(29796, 49716), tuple(14019, 87751), tuple(29688, 71207), tuple(82845, 19100), tuple(11989, 50132), tuple(21158, 99905), tuple(54732, 42547), tuple(32314, 12851), tuple(46405, 43794), tuple(87849, 45643), tuple(53524, 21212), tuple(61925, 75491), tuple(12498, 21937), tuple(30185, 69475), tuple(48421, 52487), tuple(15112, 90935), tuple(33187, 17801), tuple(61704, 25514), tuple(17889, 23917), tuple(18758, 57197), tuple(7693, 47232), tuple(47905, 24618), tuple(11494, 78950), tuple(95662, 54561), tuple(8075, 33909), tuple(90427, 46065), tuple(73962, 19821), tuple(50691, 79400), tuple(58218, 4881), tuple(94106, 2509), tuple(60633, 55169), tuple(49600, 83054), tuple(23339, 13270), tuple(70262, 58946), tuple(48417, 97266), tuple(27629, 46905), tuple(74465, 75514), tuple(41687, 2564), tuple(12814, 19492), tuple(78899, 30168), tuple(17745, 35206), tuple(37972, 35296), tuple(22288, 80001), tuple(68026, 36558), tuple(40187, 12234), tuple(92380, 22866), tuple(56488, 64402), tuple(41404, 62562), tuple(47802, 45287), tuple(83302, 85215), tuple(58999, 85776), tuple(35158, 16804), tuple(13416, 94146), tuple(62953, 28243), tuple(83290, 19103), tuple(4564, 21789), tuple(64468, 20927), tuple(25582, 47206), tuple(57810, 18693), tuple(28938, 97986), tuple(61704, 14838), tuple(19214, 3232), tuple(12911, 25438), tuple(85802, 28837), tuple(56506, 89458), tuple(66392, 47773), tuple(68190, 43841), tuple(43044, 52214), tuple(57886, 32830), tuple(15943, 59771), tuple(37081, 89294), tuple(4032, 32960), tuple(46931, 85790), tuple(69656, 72737), tuple(28217, 39872), tuple(86170, 42776), tuple(55116, 51495), tuple(90485, 45274), tuple(60773, 36788), tuple(2193, 2636), tuple(70222, 62086), tuple(75720, 70712), tuple(17549, 51460), tuple(23609, 31515), tuple(70254, 39825), tuple(63762, 11061), tuple(13107, 15394), tuple(45916, 72130), tuple(91558, 86662), tuple(99524, 69106), tuple(93073, 29881), tuple(31724, 3007), tuple(69051, 59452), tuple(59701, 86760), tuple(4967, 82028), tuple(57404, 48226), tuple(71829, 79910), tuple(23714, 62439), tuple(73881, 67618), tuple(63269, 40085), tuple(6164, 23415), tuple(48156, 93907), tuple(18627, 16570), tuple(6676, 22991), tuple(36916, 41488), tuple(99079, 13264), tuple(32533, 99243), tuple(55505, 63339), tuple(89564, 3290), tuple(24886, 34916), tuple(91310, 9343), tuple(49779, 12740), tuple(26320, 3406), tuple(57661, 5702), tuple(10765, 57881), tuple(5518, 47638), tuple(93148, 27438), tuple(73451, 24477), tuple(84075, 96822), tuple(58883, 58883), tuple(96812, 82388), tuple(30659, 59654), tuple(24498, 95808), tuple(25591, 21834), tuple(13090, 87704), tuple(76495, 17249), tuple(75975, 84318), tuple(55459, 70426), tuple(84256, 88604), tuple(79438, 43104), tuple(45331, 7495), tuple(63619, 11123), tuple(24772, 2601), tuple(63343, 14138), tuple(39957, 98339), tuple(55595, 17823), tuple(97676, 53933), tuple(91867, 25023), tuple(64677, 67859), tuple(43737, 34315), tuple(24800, 53968), tuple(93157, 17507), tuple(24264, 35273), tuple(33889, 507), tuple(10207, 40542), tuple(40213, 57800), tuple(38321, 74160), tuple(42391, 7651), tuple(80267, 94736), tuple(52473, 79634), tuple(17075, 2531), tuple(8595, 75890), tuple(31496, 50367), tuple(16069, 79896), tuple(70067, 200), tuple(23420, 49517), tuple(1628, 45646), tuple(8916, 36794), tuple(72294, 88976), tuple(40603, 86008), tuple(91871, 71098), tuple(5447, 70998), tuple(24152, 17561), tuple(65046, 34951), tuple(56950, 9292), tuple(19244, 31385), tuple(74693, 31813), tuple(97343, 21572), tuple(38834, 135), tuple(79717, 62486), tuple(38, 10308), tuple(58035, 71344), tuple(85802, 81079), tuple(5943, 156), tuple(38735, 38867), tuple(3803, 99366), tuple(15853, 19408), tuple(62988, 62008), tuple(8316, 44684), tuple(17035, 71012), tuple(48584, 2117), tuple(75425, 37336), tuple(2405, 50420), tuple(43653, 28836), tuple(12394, 69430), tuple(54522, 4954), tuple(33359, 148), tuple(41018, 82851), tuple(79995, 55417), tuple(65008, 32342), tuple(36547, 88185), tuple(8131, 7054), tuple(38980, 20146), tuple(27976, 63039), tuple(53119, 67009), tuple(40043, 98393), tuple(29333, 51980), tuple(85818, 98405), tuple(77956, 20099), tuple(99747, 16916), tuple(11597, 50181), tuple(40961, 8262), tuple(75103, 13912), tuple(62339, 69155), tuple(3869, 85481), tuple(7053, 30956), tuple(33563, 53272), tuple(96178, 81751), tuple(99365, 88728), tuple(34447, 11164), tuple(62856, 30939), tuple(92486, 3357), tuple(56605, 35330), tuple(42180, 15137), tuple(83946, 62984), tuple(61869, 55711), tuple(52880, 49871), tuple(44588, 27387), tuple(16332, 24496), tuple(1781, 13508), tuple(56674, 95773), tuple(21328, 19628), tuple(96455, 24155), tuple(14302, 74435), tuple(54053, 24590), tuple(86642, 22177), tuple(24089, 16186), tuple(70281, 4601), tuple(18552, 70708), tuple(95442, 5895), tuple(96714, 6293), tuple(43803, 45857), tuple(93257, 18497), tuple(90032, 85086), tuple(40566, 87233), tuple(32674, 73822), tuple(95599, 49334), tuple(62745, 51898), tuple(8245, 93882), tuple(14093, 40977), tuple(47215, 53001), tuple(59737, 68452), tuple(90937, 25354), tuple(43805, 82571), tuple(81953, 68572), tuple(37298, 96262), tuple(94899, 65066), tuple(34772, 80762), tuple(55469, 1186), tuple(8734, 91665), tuple(18622, 51150), tuple(85200, 39575), tuple(65381, 15979), tuple(89734, 89656), tuple(64712, 53691), tuple(87187, 58256), tuple(8476, 89694), tuple(49935, 35239), tuple(63730, 34982), tuple(27687, 91571), tuple(87543, 15350), tuple(85208, 18781), tuple(14783, 2574), tuple(44699, 666), tuple(56440, 87617), tuple(32732, 49301), tuple(76725, 3895), tuple(10419, 90580), tuple(34725, 69476), tuple(14831, 81588), tuple(93924, 38057), tuple(38528, 99060), tuple(57136, 44206), tuple(74685, 99559), tuple(43083, 87511), tuple(43105, 35474), tuple(35582, 17560), tuple(5578, 98727), tuple(78947, 53865), tuple(32013, 95029), tuple(61552, 42674), tuple(52191, 49975), tuple(71566, 16403), tuple(78534, 16350), tuple(18520, 80501), tuple(29114, 46547), tuple(11488, 5069), tuple(89591, 82384), tuple(13741, 42318), tuple(74385, 58849), tuple(49739, 63421), tuple(83821, 6676), tuple(51997, 93321), tuple(36677, 81768), tuple(37915, 73495), tuple(47175, 6086), tuple(39989, 83110), tuple(6489, 48112), tuple(88822, 20370), tuple(12846, 13952), tuple(28930, 20879), tuple(25139, 84552), tuple(76434, 2665), tuple(55145, 31523), tuple(21177, 18630), tuple(81077, 96275), tuple(61006, 30845), tuple(77722, 62651), tuple(61181, 72545), tuple(93838, 84287), tuple(59300, 19014), tuple(75076, 97980), tuple(76979, 1473), tuple(48409, 13097), tuple(51718, 5325), tuple(36522, 72119), tuple(60917, 18995), tuple(61469, 42853), tuple(34387, 37322), tuple(38684, 28120), tuple(64136, 8559), tuple(15368, 99424), tuple(97824, 7864), tuple(33833, 72029), tuple(7024, 9961), tuple(49400, 66220), tuple(63025, 97179), tuple(6135, 98878), tuple(19873, 8438), tuple(3963, 35670), tuple(65186, 89423), tuple(26653, 65943), tuple(83132, 67000), tuple(82578, 35007), tuple(42680, 60479), tuple(71102, 98589), tuple(74842, 94010), tuple(22931, 33725), tuple(46537, 42629), tuple(75793, 48115), tuple(21630, 92454), tuple(97993, 81332), tuple(25747, 31814), tuple(91231, 65953), tuple(91981, 12219), tuple(64719, 16254), tuple(60914, 8334), tuple(15887, 96432), tuple(42110, 28837), tuple(7295, 83147), tuple(50334, 7053), tuple(3949, 33594), tuple(1524, 98230), tuple(17265, 98024), tuple(75969, 36232), tuple(89538, 5212), tuple(13444, 55946), tuple(69823, 81848), tuple(32578, 74024), tuple(52018, 98290), tuple(59118, 40186), tuple(61002, 16977), tuple(69537, 44780), tuple(92, 13937), tuple(33715, 42663), tuple(46347, 8312), tuple(86196, 59301), tuple(17128, 85014), tuple(26429, 57682), tuple(45888, 99588), tuple(22750, 96110), tuple(46809, 49251), tuple(24521, 40071), tuple(287, 22115),
-    tuple(11741, 36315), tuple(22742, 17581), tuple(35808, 3110), tuple(98904, 30407), tuple(4584, 13383), tuple(28585, 69669), tuple(94823, 29715), tuple(9551, 36389), tuple(77997, 45746), tuple(49894, 55722), tuple(23415, 69459), tuple(58246, 85144), tuple(74136, 18102), tuple(97366, 85724), tuple(34271, 51601), tuple(47535, 70883), tuple(59443, 90103), tuple(45213, 45811), tuple(62741, 86898), tuple(17324, 50034), tuple(62080, 25193), tuple(89524, 4421), tuple(13476, 51456), tuple(69198, 56718), tuple(58024, 22969), tuple(65210, 67941), tuple(32561, 44881), tuple(62295, 67448), tuple(66135, 95453), tuple(9417, 20443), tuple(82486, 23745), tuple(19185, 99041), tuple(40662, 91714), tuple(3423, 58624), tuple(4512, 74502), tuple(67772, 98023), tuple(69575, 75779), tuple(69107, 62805), tuple(517, 33801), tuple(47406, 7581), tuple(81108, 10546), tuple(12976, 47001), tuple(16742, 83811), tuple(44593, 82124), tuple(52731, 34642), tuple(81725, 20555), tuple(94126, 91919), tuple(24800, 59302), tuple(97253, 39249), tuple(71692, 10769), tuple(88721, 56321), tuple(7019, 69771), tuple(31464, 61774), tuple(29597, 19263), tuple(65557, 31875), tuple(28653, 69636), tuple(58074, 76848), tuple(15906, 80620), tuple(18259, 40193), tuple(99991, 4769), tuple(98935, 99269), tuple(12123, 60124), tuple(20787, 47346), tuple(13526, 33592), tuple(95370, 40350), tuple(17479, 42884), tuple(58368, 83218), tuple(63290, 74406), tuple(97030, 35102), tuple(45298, 27660), tuple(64593, 21262), tuple(76268, 82641), tuple(1107, 44044), tuple(21427, 79959), tuple(85180, 62412), tuple(7359, 1318), tuple(83618, 9762), tuple(1425, 55804), tuple(32874, 97943), tuple(68191, 38742), tuple(41715, 17902), tuple(3771, 15032), tuple(7848, 74950), tuple(33881, 40904), tuple(75295, 26151), tuple(75775, 13760), tuple(90262, 89822), tuple(88169, 18679), tuple(57506, 32356), tuple(94983, 44281), tuple(37385, 37432), tuple(18248, 48162), tuple(45573, 66278), tuple(25277, 72788), tuple(26977, 36778), tuple(26254, 61758), tuple(12860, 48026), tuple(96819, 3339), tuple(13134, 1173), tuple(26822, 53374), tuple(15989, 29698), tuple(11258, 54515), tuple(37866, 34928), tuple(22996, 26577), tuple(39952, 42732), tuple(6754, 70595), tuple(86245, 44669), tuple(47044, 34170), tuple(6789, 45220), tuple(31706, 2090), tuple(42582, 40023), tuple(35147, 46591), tuple(88210, 11307), tuple(53644, 7680), tuple(11280, 91075), tuple(42961, 65122), tuple(40066, 52185), tuple(20050, 6154), tuple(98440, 20393), tuple(88992, 75432), tuple(32386, 66731), tuple(36952, 34149), tuple(18453, 32715), tuple(84413, 10378), tuple(59440, 2374), tuple(45354, 85009), tuple(50382, 66510), tuple(64428, 95401), tuple(9336, 41760), tuple(26317, 91416), tuple(81941, 99504), tuple(26600, 53522), tuple(81069, 40236), tuple(51126, 27911), tuple(97144, 14243), tuple(62738, 50287), tuple(37372, 28962), tuple(12053, 9090), tuple(69492, 95524), tuple(68141, 52931), tuple(17276, 16487), tuple(69227, 25949), tuple(14143, 70193), tuple(7077, 53032), tuple(65463, 74082), tuple(94997, 66496), tuple(80443, 55832), tuple(66796, 5970), tuple(15852, 95662), tuple(81559, 97272), tuple(55851, 18977), tuple(91142, 48976), tuple(91143, 950), tuple(79225, 31004), tuple(61310, 20760), tuple(74541, 90842), tuple(80322, 11630), tuple(84631, 544), tuple(66785, 86591), tuple(25650, 63252), tuple(59635, 18586), tuple(2964, 6741), tuple(37091, 71148), tuple(11984, 43077), tuple(87505, 62049), tuple(61925, 92290), tuple(18808, 3937), tuple(8300, 33268), tuple(70850, 50661), tuple(86024, 73730), tuple(85161, 47116), tuple(50193, 89155), tuple(37773, 40845), tuple(9251, 41688), tuple(6940, 65399), tuple(42479, 95630), tuple(19401, 43102), tuple(48069, 36040), tuple(62760, 95013), tuple(394, 2641), tuple(32567, 29306), tuple(13870, 58835), tuple(98248, 47291), tuple(49803, 4523), tuple(40222, 12883), tuple(53576, 73105), tuple(88265, 23629), tuple(67865, 67875), tuple(33473, 27144), tuple(80219, 53893), tuple(74878, 47341), tuple(78070, 84803), tuple(30003, 5600), tuple(41103, 6145), tuple(83490, 81076), tuple(55059, 66736), tuple(45015, 10239), tuple(79555, 85819), tuple(81808, 34970), tuple(19235, 85480), tuple(91807, 52177), tuple(40887, 87009), tuple(5003, 2687), tuple(64964, 88122), tuple(765, 94893), tuple(93573, 20504), tuple(28854, 38438), tuple(94244, 93475), tuple(72996, 84801), tuple(75427, 81692), tuple(63161, 98637), tuple(18814, 61343), tuple(22863, 60110), tuple(8949, 12694), tuple(19675, 94313), tuple(43857, 74073), tuple(15737, 58218), tuple(48895, 68474), tuple(22220, 92926), tuple(69055, 50282), tuple(40532, 74934), tuple(59062, 66405), tuple(85784, 87704), tuple(58494, 88222), tuple(2260, 20401), tuple(73112, 99666), tuple(46739, 95433), tuple(21179, 85119), tuple(11545, 38801), tuple(59993, 50866), tuple(10086, 4709), tuple(70560, 29611), tuple(27095, 89017), tuple(6896, 2279), tuple(92506, 5013), tuple(48600, 90491), tuple(18782, 54638), tuple(54337, 82734), tuple(52054, 13481), tuple(38297, 56559), tuple(15998, 30591), tuple(89789, 7522), tuple(18149, 28725), tuple(3532, 28625), tuple(70934, 49617), tuple(84599, 55664), tuple(74229, 52269), tuple(55431, 11893), tuple(32807, 72543), tuple(83882, 53025), tuple(11490, 83442), tuple(14844, 88612), tuple(12526, 45953), tuple(906, 2231), tuple(68240, 95612), tuple(18818, 31535), tuple(57774, 91290), tuple(67250, 67400), tuple(77332, 23550), tuple(42332, 57775), tuple(28792, 11539), tuple(19108, 34608), tuple(12399, 38591), tuple(7329, 10740), tuple(84288, 50928), tuple(29461, 17629), tuple(63884, 88489), tuple(47479, 61085), tuple(75357, 57255), tuple(60107, 94046), tuple(32934, 66312), tuple(28615, 42600), tuple(55553, 85213), tuple(57838, 91426), tuple(9783, 11513), tuple(73677, 28821), tuple(75408, 75561), tuple(22995, 59224), tuple(74874, 54145), tuple(18513, 75901), tuple(46440, 69414), tuple(36072, 22263), tuple(60560, 73325), tuple(69967, 93358), tuple(75949, 98634), tuple(3688, 57991), tuple(43482, 94541), tuple(40922, 31011), tuple(57763, 74497), tuple(93576, 96392), tuple(83038, 80656), tuple(47757, 87045), tuple(14061, 53465), tuple(65619, 33775), tuple(11341, 6702), tuple(6249, 87358), tuple(15766, 85937), tuple(13135, 93945), tuple(24495, 95900), tuple(80359, 1739), tuple(15468, 73426), tuple(49240, 44999), tuple(82839, 90808), tuple(87438, 75613), tuple(348, 73144), tuple(99523, 85853), tuple(21557, 70210), tuple(64933, 1672), tuple(38154, 17477), tuple(97136, 67363), tuple(96491, 8038), tuple(97981, 3434), tuple(54372, 27038), tuple(88480, 86675), tuple(21028, 21083), tuple(43197, 4440), tuple(31702, 78290), tuple(66631, 24438), tuple(11482, 17922), tuple(90351, 39503), tuple(46186, 32439), tuple(73828, 6640), tuple(56916, 26029), tuple(62840, 1815), tuple(20281, 28488), tuple(18211, 30043), tuple(65211, 93012), tuple(43614, 58012), tuple(90322, 77343), tuple(64293, 94525), tuple(59489, 39760), tuple(93219, 78440), tuple(74613, 9732), tuple(38085, 19191), tuple(58029, 48186), tuple(88762, 1764), tuple(28627, 21993), tuple(49975, 41225), tuple(70486, 43480), tuple(82764, 96425), tuple(27218, 78327), tuple(17844, 73333), tuple(70463, 37629), tuple(10500, 33826), tuple(97343, 66575), tuple(82833, 51210), tuple(77353, 45073), tuple(27163, 39728), tuple(78076, 46691), tuple(80302, 39342), tuple(77142, 1319), tuple(87403, 80110), tuple(53805, 27786), tuple(50558, 74264), tuple(83146, 31358), tuple(11567, 4438), tuple(30041, 54287), tuple(91731, 18496), tuple(57591, 93894), tuple(72534, 59009), tuple(98064, 59148), tuple(69626, 66615), tuple(20951, 43949), tuple(61960, 68060), tuple(48892, 67918), tuple(61321, 56222), tuple(75424, 77260), tuple(4916, 81929), tuple(68892, 81531), tuple(28096, 28548), tuple(62016, 107), tuple(8593, 12030), tuple(66743, 36772), tuple(60174, 15106), tuple(52844, 1923), tuple(34768, 22065), tuple(88988, 62910), tuple(79214, 2998), tuple(25675, 31376), tuple(69959, 3614), tuple(43885, 31708), tuple(12206, 46548), tuple(69924, 19343), tuple(12984, 38980), tuple(58250, 69438), tuple(2580, 48684), tuple(38112, 37124), tuple(21842, 43150), tuple(59384, 21921), tuple(19908, 46678), tuple(73396, 79529), tuple(8274, 1557), tuple(36975, 65519), tuple(81069, 18712), tuple(13692, 9148), tuple(60617, 84762), tuple(75749, 66154), tuple(80375, 24553), tuple(4257, 47056), tuple(76880, 7687), tuple(40714, 43448), tuple(79112, 74791), tuple(33119, 72730), tuple(17670, 89183), tuple(51614, 3921), tuple(21247, 39857), tuple(86756, 67673), tuple(32792, 70035), tuple(5917, 7197), tuple(1762, 23130), tuple(6455, 63664), tuple(32806, 3729), tuple(60469, 20511), tuple(12522, 15149), tuple(98106, 79338), tuple(84754, 11162), tuple(52058, 17973), tuple(28789, 1521), tuple(32766, 36325), tuple(78914, 40453), tuple(70297, 71854), tuple(9313, 45190), tuple(54559, 66227), tuple(22342, 43860), tuple(44152, 84294), tuple(36913, 93173), tuple(88523, 36338), tuple(82234, 71140), tuple(8328, 22947), tuple(73250, 88125), tuple(74356, 16820), tuple(94472, 37349), tuple(23126, 87806), tuple(40315, 88729), tuple(19935, 19145), tuple(93312, 65719), tuple(8477, 33108), tuple(86660, 69525), tuple(75557, 66964), tuple(60437, 57494), tuple(94419, 42524), tuple(95372, 72274), tuple(49866, 85685), tuple(96808, 39404), tuple(62961, 72507), tuple(38634, 70815), tuple(91379, 42430), tuple(66359, 98699), tuple(24382, 4186), tuple(4003, 77760), tuple(87840, 75265), tuple(57641, 68871), tuple(9773, 15942), tuple(5664, 51289), tuple(47923, 31308), tuple(58632, 82468), tuple(14097, 71829), tuple(1838, 97710), tuple(70433, 11364), tuple(82363, 97879), tuple(25257, 20615), tuple(18249, 6758), tuple(98581, 13639), tuple(3290, 72449), tuple(74546, 79380), tuple(97254, 44448), tuple(80316, 31760), tuple(40516, 94809), tuple(14444, 88981), tuple(9693, 10259), tuple(83795, 95485), tuple(70201, 81014), tuple(66644, 16761), tuple(35529, 82718), tuple(75774, 73476), tuple(80139, 3957), tuple(34803, 80689), tuple(92085, 46499), tuple(97871, 8004), tuple(67369, 11354), tuple(43578, 81596), 
+    tuple(11741, 36315), tuple(22742, 17581), tuple(35808, 3110), tuple(98904, 30407), tuple(4584, 13383), tuple(28585, 69669), tuple(94823, 29715), tuple(9551, 36389), tuple(77997, 45746), tuple(49894, 55722), tuple(23415, 69459), tuple(58246, 85144), tuple(74136, 18102), tuple(97366, 85724), tuple(34271, 51601), tuple(47535, 70883), tuple(59443, 90103), tuple(45213, 45811), tuple(62741, 86898), tuple(17324, 50034), tuple(62080, 25193), tuple(89524, 4421), tuple(13476, 51456), tuple(69198, 56718), tuple(58024, 22969), tuple(65210, 67941), tuple(32561, 44881), tuple(62295, 67448), tuple(66135, 95453), tuple(9417, 20443), tuple(82486, 23745), tuple(19185, 99041), tuple(40662, 91714), tuple(3423, 58624), tuple(4512, 74502), tuple(67772, 98023), tuple(69575, 75779), tuple(69107, 62805), tuple(517, 33801), tuple(47406, 7581), tuple(81108, 10546), tuple(12976, 47001), tuple(16742, 83811), tuple(44593, 82124), tuple(52731, 34642), tuple(81725, 20555), tuple(94126, 91919), tuple(24800, 59302), tuple(97253, 39249), tuple(71692, 10769), tuple(88721, 56321), tuple(7019, 69771), tuple(31464, 61774), tuple(29597, 19263), tuple(65557, 31875), tuple(28653, 69636), tuple(58074, 76848), tuple(15906, 80620), tuple(18259, 40193), tuple(99991, 4769), tuple(98935, 99269), tuple(12123, 60124), tuple(20787, 47346), tuple(13526, 33592), tuple(95370, 40350), tuple(17479, 42884), tuple(58368, 83218), tuple(63290, 74406), tuple(97030, 35102), tuple(45298, 27660), tuple(64593, 21262), tuple(76268, 82641), tuple(1107, 44044), tuple(21427, 79959), tuple(85180, 62412), tuple(7359, 1318), tuple(83618, 9762), tuple(1425, 55804), tuple(32874, 97943), tuple(68191, 38742), tuple(41715, 17902), tuple(3771, 15032), tuple(7848, 74950), tuple(33881, 40904), tuple(75295, 26151), tuple(75775, 13760), tuple(90262, 89822), tuple(88169, 18679), tuple(57506, 32356), tuple(94983, 44281), tuple(37385, 37432), tuple(18248, 48162), tuple(45573, 66278), tuple(25277, 72788), tuple(26977, 36778), tuple(26254, 61758), tuple(12860, 48026), tuple(96819, 3339), tuple(13134, 1173), tuple(26822, 53374), tuple(15989, 29698), tuple(11258, 54515), tuple(37866, 34928), tuple(22996, 26577), tuple(39952, 42732), tuple(6754, 70595), tuple(86245, 44669), tuple(47044, 34170), tuple(6789, 45220), tuple(31706, 2090), tuple(42582, 40023), tuple(35147, 46591), tuple(88210, 11307), tuple(53644, 7680), tuple(11280, 91075), tuple(42961, 65122), tuple(40066, 52185), tuple(20050, 6154), tuple(98440, 20393), tuple(88992, 75432), tuple(32386, 66731), tuple(36952, 34149), tuple(18453, 32715), tuple(84413, 10378), tuple(59440, 2374), tuple(45354, 85009), tuple(50382, 66510), tuple(64428, 95401), tuple(9336, 41760), tuple(26317, 91416), tuple(81941, 99504), tuple(26600, 53522), tuple(81069, 40236), tuple(51126, 27911), tuple(97144, 14243), tuple(62738, 50287), tuple(37372, 28962), tuple(12053, 9090), tuple(69492, 95524), tuple(68141, 52931), tuple(17276, 16487), tuple(69227, 25949), tuple(14143, 70193), tuple(7077, 53032), tuple(65463, 74082), tuple(94997, 66496), tuple(80443, 55832), tuple(66796, 5970), tuple(15852, 95662), tuple(81559, 97272), tuple(55851, 18977), tuple(91142, 48976), tuple(91143, 950), tuple(79225, 31004), tuple(61310, 20760), tuple(74541, 90842), tuple(80322, 11630), tuple(84631, 544), tuple(66785, 86591), tuple(25650, 63252), tuple(59635, 18586), tuple(2964, 6741), tuple(37091, 71148), tuple(11984, 43077), tuple(87505, 62049), tuple(61925, 92290), tuple(18808, 3937), tuple(8300, 33268), tuple(70850, 50661), tuple(86024, 73730), tuple(85161, 47116), tuple(50193, 89155), tuple(37773, 40845), tuple(9251, 41688), tuple(6940, 65399), tuple(42479, 95630), tuple(19401, 43102), tuple(48069, 36040), tuple(62760, 95013), tuple(394, 2641), tuple(32567, 29306), tuple(13870, 58835), tuple(98248, 47291), tuple(49803, 4523), tuple(40222, 12883), tuple(53576, 73105), tuple(88265, 23629), tuple(67865, 67875), tuple(33473, 27144), tuple(80219, 53893), tuple(74878, 47341), tuple(78070, 84803), tuple(30003, 5600), tuple(41103, 6145), tuple(83490, 81076), tuple(55059, 66736), tuple(45015, 10239), tuple(79555, 85819), tuple(81808, 34970), tuple(19235, 85480), tuple(91807, 52177), tuple(40887, 87009), tuple(5003, 2687), tuple(64964, 88122), tuple(765, 94893), tuple(93573, 20504), tuple(28854, 38438), tuple(94244, 93475), tuple(72996, 84801), tuple(75427, 81692), tuple(63161, 98637), tuple(18814, 61343), tuple(22863, 60110), tuple(8949, 12694), tuple(19675, 94313), tuple(43857, 74073), tuple(15737, 58218), tuple(48895, 68474), tuple(22220, 92926), tuple(69055, 50282), tuple(40532, 74934), tuple(59062, 66405), tuple(85784, 87704), tuple(58494, 88222), tuple(2260, 20401), tuple(73112, 99666), tuple(46739, 95433), tuple(21179, 85119), tuple(11545, 38801), tuple(59993, 50866), tuple(10086, 4709), tuple(70560, 29611), tuple(27095, 89017), tuple(6896, 2279), tuple(92506, 5013), tuple(48600, 90491), tuple(18782, 54638), tuple(54337, 82734), tuple(52054, 13481), tuple(38297, 56559), tuple(15998, 30591), tuple(89789, 7522), tuple(18149, 28725), tuple(3532, 28625), tuple(70934, 49617), tuple(84599, 55664), tuple(74229, 52269), tuple(55431, 11893), tuple(32807, 72543), tuple(83882, 53025), tuple(11490, 83442), tuple(14844, 88612), tuple(12526, 45953), tuple(906, 2231), tuple(68240, 95612), tuple(18818, 31535), tuple(57774, 91290), tuple(67250, 67400), tuple(77332, 23550), tuple(42332, 57775), tuple(28792, 11539), tuple(19108, 34608), tuple(12399, 38591), tuple(7329, 10740), tuple(84288, 50928), tuple(29461, 17629), tuple(63884, 88489), tuple(47479, 61085), tuple(75357, 57255), tuple(60107, 94046), tuple(32934, 66312), tuple(28615, 42600), tuple(55553, 85213), tuple(57838, 91426), tuple(9783, 11513), tuple(73677, 28821), tuple(75408, 75561), tuple(22995, 59224), tuple(74874, 54145), tuple(18513, 75901), tuple(46440, 69414), tuple(36072, 22263), tuple(60560, 73325), tuple(69967, 93358), tuple(75949, 98634), tuple(3688, 57991), tuple(43482, 94541), tuple(40922, 31011), tuple(57763, 74497), tuple(93576, 96392), tuple(83038, 80656), tuple(47757, 87045), tuple(14061, 53465), tuple(65619, 33775), tuple(11341, 6702), tuple(6249, 87358), tuple(15766, 85937), tuple(13135, 93945), tuple(24495, 95900), tuple(80359, 1739), tuple(15468, 73426), tuple(49240, 44999), tuple(82839, 90808), tuple(87438, 75613), tuple(348, 73144), tuple(99523, 85853), tuple(21557, 70210), tuple(64933, 1672), tuple(38154, 17477), tuple(97136, 67363), tuple(96491, 8038), tuple(97981, 3434), tuple(54372, 27038), tuple(88480, 86675), tuple(21028, 21083), tuple(43197, 4440), tuple(31702, 78290), tuple(66631, 24438), tuple(11482, 17922), tuple(90351, 39503), tuple(46186, 32439), tuple(73828, 6640), tuple(56916, 26029), tuple(62840, 1815), tuple(20281, 28488), tuple(18211, 30043), tuple(65211, 93012), tuple(43614, 58012), tuple(90322, 77343), tuple(64293, 94525), tuple(59489, 39760), tuple(93219, 78440), tuple(74613, 9732), tuple(38085, 19191), tuple(58029, 48186), tuple(88762, 1764), tuple(28627, 21993), tuple(49975, 41225), tuple(70486, 43480), tuple(82764, 96425), tuple(27218, 78327), tuple(17844, 73333), tuple(70463, 37629), tuple(10500, 33826), tuple(97343, 66575), tuple(82833, 51210), tuple(77353, 45073), tuple(27163, 39728), tuple(78076, 46691), tuple(80302, 39342), tuple(77142, 1319), tuple(87403, 80110), tuple(53805, 27786), tuple(50558, 74264), tuple(83146, 31358), tuple(11567, 4438), tuple(30041, 54287), tuple(91731, 18496), tuple(57591, 93894), tuple(72534, 59009), tuple(98064, 59148), tuple(69626, 66615), tuple(20951, 43949), tuple(61960, 68060), tuple(48892, 67918), tuple(61321, 56222), tuple(75424, 77260), tuple(4916, 81929), tuple(68892, 81531), tuple(28096, 28548), tuple(62016, 107), tuple(8593, 12030), tuple(66743, 36772), tuple(60174, 15106), tuple(52844, 1923), tuple(34768, 22065), tuple(88988, 62910), tuple(79214, 2998), tuple(25675, 31376), tuple(69959, 3614), tuple(43885, 31708), tuple(12206, 46548), tuple(69924, 19343), tuple(12984, 38980), tuple(58250, 69438), tuple(2580, 48684), tuple(38112, 37124), tuple(21842, 43150), tuple(59384, 21921), tuple(19908, 46678), tuple(73396, 79529), tuple(8274, 1557), tuple(36975, 65519), tuple(81069, 18712), tuple(13692, 9148), tuple(60617, 84762), tuple(75749, 66154), tuple(80375, 24553), tuple(4257, 47056), tuple(76880, 7687), tuple(40714, 43448), tuple(79112, 74791), tuple(33119, 72730), tuple(17670, 89183), tuple(51614, 3921), tuple(21247, 39857), tuple(86756, 67673), tuple(32792, 70035), tuple(5917, 7197), tuple(1762, 23130), tuple(6455, 63664), tuple(32806, 3729), tuple(60469, 20511), tuple(12522, 15149), tuple(98106, 79338), tuple(84754, 11162), tuple(52058, 17973), tuple(28789, 1521), tuple(32766, 36325), tuple(78914, 40453), tuple(70297, 71854), tuple(9313, 45190), tuple(54559, 66227), tuple(22342, 43860), tuple(44152, 84294), tuple(36913, 93173), tuple(88523, 36338), tuple(82234, 71140), tuple(8328, 22947), tuple(73250, 88125), tuple(74356, 16820), tuple(94472, 37349), tuple(23126, 87806), tuple(40315, 88729), tuple(19935, 19145), tuple(93312, 65719), tuple(8477, 33108), tuple(86660, 69525), tuple(75557, 66964), tuple(60437, 57494), tuple(94419, 42524), tuple(95372, 72274), tuple(49866, 85685), tuple(96808, 39404), tuple(62961, 72507), tuple(38634, 70815), tuple(91379, 42430), tuple(66359, 98699), tuple(24382, 4186), tuple(4003, 77760), tuple(87840, 75265), tuple(57641, 68871), tuple(9773, 15942), tuple(5664, 51289), tuple(47923, 31308), tuple(58632, 82468), tuple(14097, 71829), tuple(1838, 97710), tuple(70433, 11364), tuple(82363, 97879), tuple(25257, 20615), tuple(18249, 6758), tuple(98581, 13639), tuple(3290, 72449), tuple(74546, 79380), tuple(97254, 44448), tuple(80316, 31760), tuple(40516, 94809), tuple(14444, 88981), tuple(9693, 10259), tuple(83795, 95485), tuple(70201, 81014), tuple(66644, 16761), tuple(35529, 82718), tuple(75774, 73476), tuple(80139, 3957), tuple(34803, 80689), tuple(92085, 46499), tuple(97871, 8004), tuple(67369, 11354), tuple(43578, 81596),
     tuple(94695, 44963), tuple(93741, 41629), tuple(16005, 96652), tuple(37918, 69012), tuple(89832, 56041), tuple(51798, 32386), tuple(89749, 27647), tuple(76279, 7990), tuple(31746, 1346), tuple(40841, 20480), tuple(99942, 24473), tuple(78495, 99194), tuple(13588, 57088), tuple(22183, 42297), tuple(82707, 34435), tuple(45026, 12747), tuple(8000, 93211), tuple(40453, 13025), tuple(44100, 39880), tuple(83900, 56474), tuple(87691, 42802), tuple(82000, 63867), tuple(76627, 84731), tuple(112, 92774), tuple(34749, 97737), tuple(59262, 57169), tuple(95571, 44144), tuple(74310, 68970), tuple(63232, 92744), tuple(53698, 21610), tuple(39969, 75475), tuple(39942, 28713), tuple(81230, 50140), tuple(97953, 96528), tuple(86144, 48041), tuple(96677, 49677), tuple(22051, 48183), tuple(33436, 54784), tuple(5553, 11920), tuple(67057, 17115), tuple(57736, 72309), tuple(8086, 85329), tuple(72623, 94949), tuple(13096, 48992), tuple(63153, 56337), tuple(30462, 1036), tuple(75000, 24048), tuple(62635, 50128), tuple(91480, 83131), tuple(25929, 79809), tuple(96237, 76974), tuple(59645, 20603), tuple(31850, 29754), tuple(91070, 36568), tuple(30191, 33785), tuple(86776, 67259), tuple(49073, 39179), tuple(16121, 73834), tuple(84217, 52951), tuple(95866, 47244), tuple(63326, 73460), tuple(134, 91953), tuple(48189, 86069), tuple(42971, 3700), tuple(28643, 10479), tuple(80151, 7446), tuple(78798, 2655), tuple(39135, 69364), tuple(80244, 24904), tuple(22818, 74964), tuple(26753, 82419), tuple(16858, 5212), tuple(79891, 11215), tuple(785, 46103), tuple(12559, 24617), tuple(73601, 71490), tuple(70342, 7099), tuple(73330, 6665), tuple(11903, 28194), tuple(16375, 37746), tuple(86132, 51788), tuple(90345, 68366), tuple(5464, 78338), tuple(23569, 83141), tuple(17904, 94046), tuple(35868, 60017), tuple(22591, 93373), tuple(70584, 72116), tuple(49331, 34312), tuple(16180, 91286), tuple(58494, 65441), tuple(9336, 52671), tuple(32523, 26734), tuple(40205, 83549), tuple(28810, 96876), tuple(44703, 38944), tuple(46981, 37157), tuple(8582, 7529), tuple(59718, 71700), tuple(62545, 73716), tuple(6531, 23200), tuple(30528, 59720), tuple(57152, 84660), tuple(16232, 67946), tuple(60446, 45983), tuple(68737, 54959), tuple(57795, 73107), tuple(26930, 35938), tuple(9844, 44760), tuple(3716, 79020), tuple(99126, 8264), tuple(66120, 16151), tuple(50616, 25765), tuple(93340, 95875), tuple(34103, 88003), tuple(14879, 99758), tuple(49188, 6087), tuple(89858, 42861), tuple(36730, 72076), tuple(25069, 26403), tuple(98183, 48108), tuple(3229, 5367), tuple(59306, 80078), tuple(61144, 58598), tuple(72600, 98765), tuple(57701, 23177), tuple(10176, 11553), tuple(82964, 13697), tuple(7788, 28538), tuple(39943, 97491), tuple(56261, 17781), tuple(2458, 1892), tuple(6679, 45554), tuple(42171, 66222), tuple(24420, 44115), tuple(35852, 41965), tuple(50196, 49555), tuple(34718, 60734), tuple(6932, 61638), tuple(69472, 56723), tuple(489, 97620), tuple(41335, 90578), tuple(1333, 92787), tuple(97883, 64754), tuple(14208, 22097), tuple(75776, 5938), tuple(67446, 61518), tuple(58743, 45162), tuple(34749, 81243), tuple(71451, 91991), tuple(27804, 41836), tuple(45274, 8039), tuple(17593, 24498), tuple(8801, 38559), tuple(87460, 7109), tuple(50075, 18284), tuple(84043, 82146), tuple(62932, 25018), tuple(89647, 56768), tuple(59920, 80801), tuple(56357, 35142), tuple(97376, 58181), tuple(70715, 91103), tuple(90829, 78985), tuple(29776, 13275), tuple(30546, 42320), tuple(99266, 35340), tuple(21234, 61062), tuple(39239, 10745), tuple(45990, 715), tuple(47047, 6619), tuple(4270, 94575), tuple(90009, 72203), tuple(25629, 2691), tuple(67926, 89112), tuple(46990, 61101), tuple(22355, 69536), tuple(1977, 56723), tuple(54681, 34041), tuple(83819, 7024), tuple(81235, 7093), tuple(16659, 87135), tuple(49384, 32135), tuple(42204, 17362), tuple(90585, 70374), tuple(51255, 1), tuple(31600, 70085), tuple(90189, 95778), tuple(57349, 87789), tuple(83384, 93771), tuple(20718, 15529), tuple(10644, 53591), tuple(84103, 62101), tuple(91340, 48382), tuple(82854, 84420), tuple(12561, 53517), tuple(64835, 45362), tuple(54154, 75841), tuple(46498, 31175), tuple(75035, 49552), tuple(9306, 53403), tuple(68851, 49139), tuple(13463, 42107), tuple(2322, 36695), tuple(55953, 12098), tuple(60656, 80482), tuple(78987, 19632), tuple(31228, 18523), tuple(98972, 80489), tuple(32367, 98405), tuple(25139, 5164), tuple(5692, 60610), tuple(36535, 70097), tuple(80542, 74320), tuple(87984, 46750), tuple(98201, 41341), tuple(35217, 46813), tuple(81795, 69057), tuple(83927, 41032), tuple(60149, 26087), tuple(39954, 48361), tuple(64485, 61448), tuple(87185, 14580), tuple(74559, 93251), tuple(88544, 83366), tuple(74015, 15864), tuple(78623, 69719), tuple(16941, 80710), tuple(16315, 58313), tuple(47277, 59107), tuple(16067, 66290), tuple(63906, 59891), tuple(20754, 67817), tuple(44428, 10652), tuple(95960, 99045), tuple(52163, 26221), tuple(65566, 22057), tuple(26836, 38898), tuple(57107, 79274), tuple(39020, 74857), tuple(53540, 84159), tuple(76646, 44324), tuple(27967, 40171), tuple(28710, 56332), tuple(84036, 28711), tuple(68742, 57241), tuple(40535, 34737), tuple(62681, 85386), tuple(30472, 58405), tuple(85086, 33013), tuple(67059, 47481), tuple(30441, 55098), tuple(97892, 71991), tuple(90296, 42905), tuple(22441, 18863), tuple(19606, 77242), tuple(11206, 58380), tuple(23901, 49962), tuple(84094, 33761), tuple(64400, 28093), tuple(64228, 94543), tuple(71874, 20871), tuple(25385, 73117), tuple(63398, 20999), tuple(77547, 51893), tuple(80783, 65858), tuple(39807, 80754), tuple(10336, 90318), tuple(7826, 55346), tuple(30206, 10711), tuple(94411, 67364), tuple(33509, 14329), tuple(65350, 17006), tuple(65999, 55699), tuple(82753, 61081), tuple(38851, 11896), tuple(15155, 48635), tuple(19985, 75204), tuple(37144, 5344), tuple(26173, 39587), tuple(61111, 30966), tuple(16180, 22987), tuple(60707, 43599), tuple(30136, 74118), tuple(7880, 43857), tuple(97445, 30233), tuple(62700, 24828), tuple(90914, 89452), tuple(64131, 56925), tuple(25259, 39132), tuple(47104, 43950), tuple(93891, 21913), tuple(84573, 91029), tuple(8604, 79858), tuple(33141, 25534), tuple(12468, 90413), tuple(97063, 76359), tuple(80826, 26061), tuple(64013, 99099), tuple(82158, 38882), tuple(25799, 7564), tuple(25477, 69847), tuple(73374, 58520), tuple(48230, 9453), tuple(91424, 72273), tuple(64893, 11750), tuple(46753, 48434), tuple(15974, 94633), tuple(14872, 27027), tuple(14527, 21313), tuple(25660, 64644), tuple(54196, 15138), tuple(6313, 10911), tuple(36168, 47170), tuple(45346, 76), tuple(10305, 60286), tuple(65283, 39977), tuple(21804, 37972), tuple(65389, 86954), tuple(90674, 64458), tuple(15838, 22392), tuple(43540, 42503), tuple(49584, 67828), tuple(56711, 87887), tuple(40075, 73696), tuple(23832, 91552), tuple(39002, 65562), tuple(20451, 64664), tuple(70783, 92171), tuple(29319, 57694), tuple(56217, 44247), tuple(52856, 57873), tuple(80560, 90902), tuple(31068, 11280), tuple(46996, 34739), tuple(57527, 4554), tuple(8410, 25816), tuple(12269, 38319), tuple(88054, 49939), tuple(337, 13231), tuple(56432, 68236), tuple(74841, 21476), tuple(96006, 15712), tuple(87145, 91660), tuple(58090, 55111), tuple(10310, 79789), tuple(5734, 79710), tuple(98992, 69026), tuple(77033, 5734), tuple(43338, 42635), tuple(23898, 28669), tuple(62708, 81652), tuple(41279, 51722), tuple(93444, 26355), tuple(62046, 52199), tuple(71492, 58736), tuple(7379, 62581), tuple(8592, 71885), tuple(75026, 40387), tuple(46696, 3939), tuple(9787, 88907), tuple(86356, 363), tuple(97479, 20358), tuple(77363, 65553), tuple(44036, 22178), tuple(98279, 64612), tuple(3615, 411), tuple(77003, 93018), tuple(41605, 88489), tuple(55992, 83614), tuple(19493, 21633), tuple(34639, 97064), tuple(94602, 89289), tuple(45853, 26299), tuple(84170, 73386), tuple(9221, 51439), tuple(41513, 68166), tuple(37170, 17690), tuple(82511, 59246), tuple(96674, 27574), tuple(99301, 45675), tuple(42716, 41520), tuple(56623, 49130), tuple(84100, 76804), tuple(73855, 97007), tuple(73303, 26912), tuple(37151, 23837), tuple(49190, 97104), tuple(23487, 45628), tuple(87763, 46550), tuple(65111, 92605), tuple(80481, 8151), tuple(83949, 18930), tuple(81749, 27244), tuple(37449, 3023), tuple(28303, 51545), tuple(96441, 93242), tuple(22082, 43254), tuple(35135, 68407), tuple(37712, 48709), tuple(5111, 26774), tuple(15532, 74246), tuple(93605, 83583), tuple(21491, 66472), tuple(38922, 53076), tuple(55455, 54432), tuple(955, 44063), tuple(311, 91630), tuple(53554, 4522), tuple(29927, 65668), tuple(7525, 16035), tuple(44093, 76745), tuple(21481, 78198), tuple(76875, 5306), tuple(56126, 76437), tuple(96534, 16880), tuple(85600, 68336), tuple(4479, 81002), tuple(80414, 11593), tuple(8186, 61147), tuple(5624, 32879), tuple(79312, 20995), tuple(40407, 41512), tuple(91261, 66022), tuple(93228, 75364), tuple(21136, 40111), tuple(92148, 60681), tuple(42549, 7944), tuple(60157, 15040), tuple(63562, 88365), tuple(69056, 72713), tuple(78263, 89223), tuple(3776, 33039), tuple(30042, 59984), tuple(64567, 20977), tuple(24720, 39157), tuple(63582, 75653), tuple(45363, 20249), tuple(58093, 53833), tuple(27918, 93306), tuple(25791, 92686), tuple(15904, 862), tuple(72093, 19257), tuple(64125, 88986), tuple(41717, 27989), tuple(43165, 98675), tuple(76840, 48170), tuple(64508, 3535), tuple(91964, 33435), tuple(96686, 88673), tuple(66648, 64594), tuple(17927, 30539), tuple(73615, 22800), tuple(18580, 48077), tuple(59803, 48202),
     tuple(76805, 89886), tuple(2744, 52965), tuple(55596, 22519), tuple(35358, 11629), tuple(83029, 80047), tuple(36120, 91930), tuple(26066, 23035), tuple(48857, 14268), tuple(63020, 26197), tuple(60623, 23252), tuple(34911, 72754), tuple(34808, 21593), tuple(64067, 58963), tuple(34509, 8739), tuple(52686, 96405), tuple(98282, 10463), tuple(6495, 64680), tuple(59016, 86968), tuple(33928, 51222), tuple(39609, 84992), tuple(67603, 89875), tuple(14723, 16144), tuple(30751, 46856), tuple(76874, 75024), tuple(89584, 58806), tuple(51278, 4113), tuple(27187, 93483), tuple(80039, 52159), tuple(6132, 25127), tuple(42358, 77498), tuple(33838, 79064), tuple(74147, 76851), tuple(39752, 27366), tuple(44888, 9809), tuple(10887, 4135), tuple(22303, 36417), tuple(58690, 34613), tuple(53998, 74014), tuple(71567, 32438), tuple(65110, 93406), tuple(77365, 41299), tuple(18044, 70636), tuple(77346, 21236), tuple(78408, 245), tuple(57704, 34662), tuple(75258, 64730), tuple(96992, 15533), tuple(56010, 60769), tuple(69163, 4826), tuple(88709, 20725), tuple(33197, 69743), tuple(97169, 83194), tuple(75277, 53343), tuple(14531, 64740), tuple(19997, 4752), tuple(74016, 55946), tuple(55290, 63626), tuple(32533, 32920), tuple(32946, 74610), tuple(12386, 33853), tuple(34825, 35374), tuple(28772, 32716), tuple(17280, 42683), tuple(54184, 34332), tuple(29964, 16203), tuple(65767, 61448), tuple(29133, 35728), tuple(6861, 14160), tuple(65483, 40224), tuple(78335, 76002), tuple(3061, 40615), tuple(11780, 87517), tuple(46135, 73448), tuple(10920, 72592), tuple(15696, 28810), tuple(44154, 64134), tuple(59365, 27248), tuple(76601, 39862), tuple(68264, 30019), tuple(48572, 54575), tuple(59499, 85796), tuple(35064, 23789), tuple(57028, 83545), tuple(33911, 8463), tuple(21827, 67966), tuple(15983, 69649), tuple(13919, 20584), tuple(82742, 67956), tuple(75457, 45767), tuple(55394, 62309), tuple(6099, 67510), tuple(58078, 9594), tuple(24511, 83149), tuple(24781, 79624), tuple(39745, 777), tuple(92023, 40085), tuple(22889, 37179), tuple(17919, 28607), tuple(79865, 72682), tuple(99829, 38190), tuple(21273, 21278), tuple(88299, 23433), tuple(88887, 48163), tuple(62993, 61567), tuple(82107, 84224), tuple(65049, 61245), tuple(75113, 93564), tuple(81562, 7874), tuple(32314, 32313), tuple(3979, 46996), tuple(40558, 93278), tuple(58758, 68163), tuple(40502, 58941), tuple(76961, 65762), tuple(48032, 36117), tuple(64712, 9137), tuple(12092, 56665), tuple(12315, 66581), tuple(20954, 29083), tuple(57317, 48290), tuple(23534, 86828), tuple(4869, 35950), tuple(26993, 24840), tuple(93007, 45049), tuple(18009, 20350), tuple(43053, 71248), tuple(47320, 66119), tuple(50898, 96627), tuple(669, 40018), tuple(89236, 44039), tuple(47375, 63306), tuple(61906, 6658), tuple(2672, 84546), tuple(59778, 72319), tuple(14497, 71952), tuple(42420, 87023), tuple(96465, 46140), tuple(32857, 22772), tuple(4985, 35125), tuple(61918, 28016), tuple(90275, 24406), tuple(49799, 10811), tuple(74137, 63345), tuple(26135, 86306), tuple(92971, 65541), tuple(40134, 95892), tuple(38554, 46307), tuple(48113, 16343), tuple(63990, 66283), tuple(17793, 49570), tuple(21736, 79819), tuple(13831, 27523), tuple(8939, 93929), tuple(96577, 4909), tuple(38583, 32781), tuple(13701, 24436), tuple(43444, 56054), tuple(17166, 32346), tuple(57202, 26264), tuple(82858, 75049), tuple(46317, 95666), tuple(54911, 68161), tuple(3894, 38521), tuple(26456, 30270), tuple(65214, 35331), tuple(41143, 13109), tuple(85441, 48899), tuple(93226, 25027), tuple(77045, 81171), tuple(30345, 79232), tuple(71167, 40854), tuple(58761, 56824), tuple(89047, 85314), tuple(31686, 81947), tuple(74946, 60661), tuple(49903, 13625), tuple(76341, 69067), tuple(46963, 88891), tuple(97223, 5921), tuple(52143, 9828), tuple(17413, 42731), tuple(30236, 93426), tuple(14540, 17652), tuple(52251, 97233), tuple(41581, 30097), tuple(28771, 46426), tuple(36260, 45179), tuple(4068, 16410), tuple(3146, 95055), tuple(5993, 88855), tuple(46103, 30022), tuple(26667, 18756), tuple(54576, 13438), tuple(12800, 11258), tuple(80761, 44979), tuple(59811, 76627), tuple(77917, 87270), tuple(46286, 28657), tuple(30609, 86852), tuple(15200, 28936), tuple(86331, 34195), tuple(98461, 55054), tuple(91760, 62792), tuple(91551, 70192), tuple(96030, 78205), tuple(8254, 27057), tuple(600, 37830), tuple(58635, 65506), tuple(81661, 73708), tuple(11225, 24255), tuple(15830, 9029), tuple(84384, 46190), tuple(31344, 25765), tuple(25670, 30716), tuple(88507, 19484), tuple(28207, 45941), tuple(91874, 15786), tuple(10094, 10934), tuple(38013, 2179), tuple(14558, 36415), tuple(65079, 48850), tuple(65486, 85046), tuple(54958, 60275), tuple(99800, 96623), tuple(68895, 99829), tuple(3708, 75830), tuple(96368, 22631), tuple(99411, 50094), tuple(56888, 3883), tuple(87288, 45604), tuple(64512, 84543), tuple(45565, 14170), tuple(77114, 15132), tuple(31800, 70333), tuple(57775, 40548), tuple(31788, 67511), tuple(51929, 13684), tuple(53736, 81543), tuple(84251, 86303), tuple(63823, 83258), tuple(77539, 61381), tuple(43570, 39418), tuple(79859, 34773), tuple(8595, 64524), tuple(97242, 9283), tuple(15530, 84591), tuple(75535, 65546), tuple(16516, 50162), tuple(58815, 1815), tuple(34897, 82920), tuple(66215, 81262), tuple(81487, 4902), tuple(64039, 25703), tuple(78006, 90468), tuple(3081, 26910), tuple(58159, 4777), tuple(73715, 36375), tuple(69189, 60971), tuple(18169, 39587), tuple(57960, 57668), tuple(6582, 63707), tuple(11155, 47930), tuple(70829, 92266), tuple(6294, 92305), tuple(2188, 6419), tuple(17141, 54972), tuple(60240, 35276), tuple(10788, 29414), tuple(17464, 76377), tuple(3994, 17227), tuple(12039, 24992), tuple(1340, 77467), tuple(1212, 41758), tuple(52186, 80763), tuple(970, 78819), tuple(92897, 68714), tuple(6349, 77016), tuple(22069, 77732), tuple(78209, 72708), tuple(71986, 56770), tuple(8580, 87225), tuple(97505, 63546), tuple(67459, 39771), tuple(50707, 57066), tuple(68226, 54176), tuple(65425, 27407), tuple(57723, 19288), tuple(56974, 90449), tuple(55878, 1264), tuple(46939, 79863), tuple(34868, 4652), tuple(39872, 78482), tuple(92657, 20961), tuple(99690, 28825), tuple(33761, 52922), tuple(73738, 64995), tuple(92092, 3237), tuple(2463, 45045), tuple(43984, 69864), tuple(60146, 5333), tuple(58127, 79082), tuple(84395, 73949), tuple(50818, 68457), tuple(48585, 47420), tuple(60878, 67337), tuple(16573, 30621), tuple(46524, 14168), tuple(87995, 44854), tuple(73143, 77177), tuple(33967, 37276), tuple(95038, 17670), tuple(69022, 16038), tuple(58485, 90526), tuple(1705, 1443), tuple(97969, 40011), tuple(14719, 42770), tuple(8695, 27192), tuple(47546, 51349), tuple(75263, 24419), tuple(25420, 66286), tuple(39198, 41401), tuple(77896, 85583), tuple(28265, 76766), tuple(88836, 48759), tuple(47768, 39582), tuple(65103, 3167), tuple(92171, 85360), tuple(1549, 79296), tuple(71725, 16645), tuple(87349, 29290), tuple(66201, 61712), tuple(43525, 70338), tuple(99025, 63090), tuple(3687, 79963), tuple(63600, 92088), tuple(2480, 1359), tuple(31384, 63603), tuple(29650, 24391), tuple(8552, 82260), tuple(16729, 29139), tuple(26503, 4767), tuple(88945, 19824), tuple(66695, 95696), tuple(84016, 35417), tuple(71521, 22206), tuple(88433, 55606), tuple(66380, 81316), tuple(30573, 36000), tuple(85223, 20494), tuple(99672, 82813), tuple(65500, 78258), tuple(55817, 98414), tuple(43248, 53800), tuple(62787, 21018), tuple(48981, 36258), tuple(41216, 98585), tuple(18576, 18004), tuple(27272, 72860), tuple(76774, 87664), tuple(26737, 11514), tuple(24472, 42538), tuple(5860, 81355), tuple(29066, 10012), tuple(75308, 28561), tuple(23609, 10007), tuple(10007, 19146), tuple(15568, 1487), tuple(80743, 85294), tuple(11207, 90623), tuple(61258, 63879), tuple(34363, 59005), tuple(74884, 2528), tuple(26604, 52738), tuple(33304, 1202), tuple(20381, 18984), tuple(81968, 92425), tuple(4407, 84677), tuple(2112, 79756), tuple(46970, 4367), tuple(36854, 23482), tuple(88346, 75107), tuple(10643, 31806), tuple(21351, 5590), tuple(69317, 53292), tuple(76711, 10085), tuple(70333, 90592), tuple(88818, 822), tuple(23927, 48141), tuple(84710, 33870), tuple(96932, 22686), tuple(5783, 87468), tuple(7785, 11585), tuple(49497, 33764), tuple(13506, 55969), tuple(37840, 78455), tuple(21532, 22292), tuple(97306, 42065), tuple(6579, 40749), tuple(2593, 4995), tuple(81985, 23611), tuple(63888, 98317), tuple(44975, 83777), tuple(57688, 42688), tuple(641, 45787), tuple(7316, 1967), tuple(43837, 18274), tuple(89994, 32770), tuple(4285, 50388), tuple(84699, 41841), tuple(19564, 20683), tuple(76027, 62278), tuple(26140, 11288), tuple(39656, 79954), tuple(16718, 17335), tuple(11583, 21283), tuple(55441, 32178), tuple(6810, 87225), tuple(27191, 54323), tuple(53406, 31512), tuple(48003, 80077), tuple(78497, 29570), tuple(39140, 66619), tuple(12651, 44576), tuple(1761, 88410), tuple(47139, 20766), tuple(39183, 69367), tuple(80479, 23285), tuple(1568, 78535), tuple(18476, 35058), tuple(93551, 81063), tuple(12059, 60021), tuple(23356, 26572), tuple(79975, 35434), tuple(82230, 67436), tuple(20243, 92343), tuple(47809, 10634), tuple(69537, 60167), tuple(3873, 77404), tuple(1136, 27956), tuple(17470, 24156), tuple(35849, 19150), tuple(74760, 37961), tuple(36660, 44448), tuple(36009, 96619), tuple(87110, 84921), tuple(16080, 60637), tuple(36046, 17351), tuple(96403, 99978), tuple(11060, 68629), tuple(36081, 23464), tuple(4684, 11817), tuple(50126, 82936), tuple(55262, 54135), tuple(53717, 66293), tuple(58028, 28065), tuple(92791, 99766), tuple(46266, 77711), tuple(61912, 65782), tuple(38677, 41158), tuple(4001, 46340), tuple(70987, 12784), tuple(14819, 42857), tuple(78985, 99956), tuple(79737, 42497), tuple(55305, 7329), tuple(64103, 24170), tuple(49093, 22115), tuple(2465, 97282), tuple(29009, 15663), tuple(80976, 86477), tuple(16439, 56685), tuple(53482, 15293), tuple(5038, 5991), tuple(67060, 84201), tuple(54350, 38095), tuple(67539, 68292), tuple(26464, 64908), tuple(92909, 12867), tuple(83517, 26474), tuple(76081, 85247), tuple(23250, 66616),
     tuple(20783, 34330), tuple(43074, 10165), tuple(93968, 70375), tuple(83802, 70820), tuple(19871, 63094), tuple(35699, 36506), tuple(23905, 2401), tuple(27847, 31968), tuple(76714, 44112), tuple(62599, 32720), tuple(10362, 81985), tuple(35708, 2090), tuple(13071, 39035), tuple(71851, 59493), tuple(62833, 48082), tuple(77164, 22804), tuple(6469, 43229), tuple(92051, 3719), tuple(51910, 77689), tuple(91470, 63253), tuple(57914, 57836), tuple(98819, 97813), tuple(35975, 488), tuple(51431, 34061), tuple(45414, 85971), tuple(56563, 93517), tuple(40789, 53103), tuple(9242, 20814), tuple(784, 22584), tuple(8740, 56894), tuple(28504, 378), tuple(8287, 96930), tuple(74232, 97496), tuple(61565, 7904), tuple(9779, 45122), tuple(33767, 48471), tuple(16766, 10722), tuple(47764, 478), tuple(14374, 30099), tuple(89134, 19977), tuple(60860, 93201), tuple(71123, 29840), tuple(57159, 34410), tuple(82411, 99537), tuple(11307, 3733), tuple(70264, 43028), tuple(30418, 19372), tuple(46543, 31506), tuple(33043, 98980), tuple(21137, 63374), tuple(85640, 36957), tuple(6790, 60751), tuple(78771, 43700), tuple(33808, 38263), tuple(27232, 35152), tuple(39925, 5062), tuple(3120, 65621), tuple(39319, 6795), tuple(77468, 94964), tuple(10481, 43009), tuple(24237, 2103), tuple(16837, 55667), tuple(43846, 2874), tuple(78786, 66811), tuple(92185, 62395), tuple(26318, 87942), tuple(6208, 80815), tuple(66952, 71885), tuple(51435, 25450), tuple(21443, 69801), tuple(92554, 81977), tuple(58912, 82288), tuple(59681, 46177), tuple(60397, 65866), tuple(72065, 13318), tuple(2848, 73852), tuple(7577, 83238), tuple(209, 40659), tuple(72103, 15266), tuple(23365, 67286), tuple(14600, 29269), tuple(85541, 63289), tuple(25427, 54812), tuple(22967, 54965), tuple(81525, 27126), tuple(20473, 55455), tuple(84067, 25794), tuple(46798, 79332), tuple(93825, 74677), tuple(447, 5904), tuple(65661, 92916), tuple(54428, 76482), tuple(1025, 34415), tuple(63761, 30038), tuple(93025, 15090), tuple(98807, 93426), tuple(57562, 59615), tuple(84884, 30620), tuple(75066, 71824), tuple(51199, 37934), tuple(95530, 15260), tuple(513, 98278), tuple(62995, 28267), tuple(47535, 69776), tuple(39266, 4696), tuple(14742, 13225), tuple(44268, 16548), tuple(45976, 41680), tuple(99638, 30285), tuple(85609, 5578), tuple(28156, 12884), tuple(76188, 86573), tuple(44639, 15480), tuple(86789, 72636), tuple(18702, 13337), tuple(96638, 59398), tuple(90988, 26909), tuple(85069, 95193), tuple(67262, 38337), tuple(51694, 19659), tuple(93341, 80988), tuple(48733, 88460), tuple(55630, 22866), tuple(96203, 10316), tuple(30644, 68318), tuple(79292, 63136), tuple(60185, 73681), tuple(60474, 19078), tuple(48721, 82811), tuple(19713, 99527), tuple(17537, 55235), tuple(296, 8353), tuple(58691, 72158), tuple(66734, 92490), tuple(87642, 7174), tuple(78285, 35337), tuple(19503, 14273), tuple(10713, 64116), tuple(85966, 98738), tuple(56561, 99347), tuple(14869, 89963), tuple(95126, 30748), tuple(89272, 79060), tuple(69888, 7193), tuple(32583, 74564), tuple(95542, 52128), tuple(78360, 42675), tuple(86062, 68404), tuple(38732, 21411), tuple(92935, 45415), tuple(99027, 83925), tuple(73232, 37405),
     tuple(97079, 87722), tuple(49453, 61633), tuple(53860, 29672), tuple(29513, 42837), tuple(47802, 37592), tuple(12469, 34249), tuple(42792, 53643), tuple(62613, 70068), tuple(82526, 73215), tuple(72285, 11113), tuple(42500, 55478), tuple(43717, 95240), tuple(43797, 75361), tuple(24335, 33138), tuple(38245, 66964), tuple(20717, 95342), tuple(64691, 18064), tuple(48154, 59381), tuple(25699, 77506), tuple(67122, 65358), tuple(4706, 47639), tuple(39616, 49499), tuple(81811, 43780), tuple(835, 85236), tuple(55259, 36091), tuple(66392, 64552), tuple(18111, 14142), tuple(3313, 24306), tuple(16039, 50370), tuple(13767, 95591), tuple(3619, 17285), tuple(91602, 86378), tuple(65370, 31997), tuple(73103, 79544), tuple(56207, 1833), tuple(83803, 12639), tuple(99772, 62410), tuple(48525, 27025), tuple(4843, 17363), tuple(90649, 69831), tuple(38294, 83908), tuple(62986, 50254), tuple(80915, 86505), tuple(77831, 38427), tuple(65269, 10998), tuple(18364, 35533), tuple(90495, 89902), tuple(18124, 73639), tuple(37972, 64523), tuple(59756, 55630), tuple(96021, 46676), tuple(62423, 13536), tuple(57039, 79285), tuple(22584, 69218), tuple(82257, 47164), tuple(85219, 84268), tuple(99430, 87817), tuple(54061, 57126), tuple(95756, 20489), tuple(27341, 67329), tuple(26826, 81082), tuple(86892, 10021), tuple(76753, 35118), tuple(45122, 27808), tuple(16706, 37697), tuple(54734, 85826), tuple(61753, 99199), tuple(54920, 42265), tuple(79397, 32234), tuple(95638, 71031), tuple(66412, 11193), tuple(1874, 46395), tuple(43748, 82517), tuple(99596, 63908), tuple(83987, 8436), tuple(52027, 64590), tuple(2821, 71063), tuple(38625, 47246), tuple(64890, 18073), tuple(78221, 45134), tuple(51729, 8336), tuple(7235, 32732), tuple(69849, 4355), tuple(66632, 29817), tuple(87115, 20363), tuple(95882, 30431), tuple(56386, 94579), tuple(90145, 75474), tuple(41608, 31413), tuple(9284, 22127), tuple(60184, 97820), tuple(70813, 48129), tuple(84426, 2932), tuple(74599, 76277), tuple(19551, 2074), tuple(83741, 31228), tuple(24540, 69367), tuple(66373, 48734), tuple(1043, 52758), tuple(55207, 67301), tuple(68930, 95643), tuple(60576, 84717), tuple(87418, 61921), tuple(40078, 11839), tuple(26131, 84239), tuple(57553, 30194), tuple(85992, 83655), tuple(9469, 26355), tuple(7871, 58669), tuple(66599, 94551), tuple(73474, 91775), tuple(49288, 37125), tuple(64459, 41703), tuple(20761, 11140), tuple(18453, 75828), tuple(7666, 3242), tuple(3851, 64702), tuple(99727, 5458), tuple(66247, 1430), tuple(53801, 94055), tuple(18633, 22045), tuple(5594, 41215), tuple(23845, 66849), tuple(51801, 46932), tuple(63960, 28483), tuple(41699, 56219), tuple(40125, 68122), tuple(1809, 49948), tuple(39206, 71380), tuple(29721, 38251), tuple(10858, 91494), tuple(33459, 29030), tuple(230, 28395), tuple(45666, 41675), tuple(31763, 68954), tuple(28498, 58275), tuple(27329, 14755), tuple(98543, 32649), tuple(26836, 19108), tuple(31349, 45705), tuple(89891, 19691), tuple(42716, 14912), tuple(34712, 4213), tuple(72574, 37957), tuple(29648, 54691), tuple(77851, 61441), tuple(62360, 25693), tuple(78942, 30840), tuple(58808, 36761), tuple(39400, 96765), tuple(77844, 33261), tuple(98738, 80688), tuple(99234, 82018), tuple(49364, 46291), tuple(12030, 32499), tuple(42946, 19435), tuple(34021, 40823), tuple(54070, 84294), tuple(76238, 50858), tuple(94576, 62781), tuple(4823, 17885), tuple(55861, 33029), tuple(43468, 78885), tuple(15775, 25990), tuple(2481, 64154), tuple(65398, 30074), tuple(85540, 50290), tuple(28926, 8236), tuple(75476, 56523), tuple(51363, 82037), tuple(97952, 75624), tuple(71526, 55313), tuple(55143, 49146), tuple(11616, 79576), tuple(83981, 24799), tuple(30197, 96196), tuple(46658, 64430), tuple(34062, 422), tuple(91483, 37099), tuple(88286, 27917), tuple(92932, 21740), tuple(66567, 3590), tuple(35787, 37973), tuple(22601, 93171), tuple(91215, 51041), tuple(41702, 3198), tuple(78731, 89390), tuple(46850, 34544), tuple(49404, 10082), tuple(6393, 62145), tuple(39241, 12836), tuple(10383, 56740), tuple(50850, 84828), tuple(39908, 95738), tuple(78309, 9041), tuple(7898, 34833), tuple(80987, 44693), tuple(66170, 90006), tuple(57599, 82993), tuple(33458, 68423), tuple(67786, 72838), tuple(20364, 89240), tuple(66760, 10965), tuple(77090, 39427), tuple(8706, 77011), tuple(76225, 66045), tuple(24829, 16580), tuple(29040, 10745), tuple(25973, 68024), tuple(42886, 90000), tuple(5125, 90725), tuple(71675, 42961), tuple(88074, 15503), tuple(7096, 77238), tuple(12467, 7224), tuple(94344, 88876), tuple(91643, 6834), tuple(99776, 88805), tuple(88992, 21613), tuple(27629, 72345), tuple(99262, 53013), tuple(84894, 7422), tuple(86469, 44852), tuple(44709, 82358), tuple(90338, 63426), tuple(70093, 65813), tuple(18014, 91297), tuple(38135, 18842), tuple(83643, 25418), tuple(61985, 23996), tuple(63495, 91872), tuple(65518, 85038), tuple(19747, 18165), tuple(60916, 55986), tuple(73826, 68279), tuple(26147, 73224), tuple(79606, 35342), tuple(84063, 47648), tuple(41115, 19541), tuple(3710, 46873), tuple(79926, 96227), tuple(77885, 38548), tuple(31121, 40100), tuple(17197, 42700), tuple(89898, 65060), tuple(70854, 69897), tuple(47212, 78340), tuple(8871, 20368), tuple(81502, 76700), tuple(6251, 92364), tuple(20652, 81152), tuple(60197, 15839), tuple(57972, 74525), tuple(51527, 19454), tuple(43081, 37404), tuple(11551, 38858), tuple(73710, 36789), tuple(99064, 62900), tuple(16292, 61362), tuple(5438, 13708), tuple(65610, 23813), tuple(14701, 66586), tuple(96560, 25606), tuple(6101, 50386), tuple(76171, 13159), tuple(453, 51097), tuple(80871, 29995), tuple(65414, 10781), tuple(56201, 59852), tuple(57872, 29305), tuple(85387, 49642), tuple(98332, 45308), tuple(78934, 88320), tuple(27288, 84343), tuple(71539, 48945), tuple(17348, 35121), tuple(51107, 73807), tuple(60739, 89966), tuple(49803, 53931), tuple(91339, 18943), tuple(66923, 8421), tuple(1314, 61554), tuple(56175, 73062), tuple(1215, 51606), tuple(16335, 1289), tuple(62888, 62858), tuple(26620, 51572), tuple(19757, 93782), tuple(95016, 49464), tuple(77323, 61370), tuple(14358, 40637), tuple(75344, 25972), tuple(12606, 53465), tuple(22258, 96976), tuple(36276, 85574), tuple(93544, 82426), tuple(50554, 1078), tuple(54132, 59093), tuple(83143, 37847), tuple(36778, 7827), tuple(42525, 47562), tuple(48399, 16894), tuple(48812, 94330), tuple(2197, 63615), tuple(16681, 83461), tuple(61452, 74775), tuple(33179, 39047), tuple(11357, 45663), tuple(34429, 3118), tuple(97453, 71262), tuple(76788, 9452), tuple(42050, 94414), tuple(62412, 57976), tuple(10366, 59637), tuple(91804, 41509), tuple(66410, 60144), tuple(20517, 85756), tuple(16402, 50019), tuple(33062, 94128), tuple(66717, 95079), tuple(80801, 53200), tuple(43638, 16443), tuple(68690, 30310), tuple(78330, 31709), tuple(53288, 51831), tuple(59612, 15340), tuple(69197, 67661), tuple(25729, 54544), tuple(61292, 3077), tuple(91198, 68925), tuple(94243, 84911), tuple(81175, 41496), tuple(56087, 30799), tuple(19192, 5965), tuple(6401, 98593), tuple(90599, 40564), tuple(99636, 3224), tuple(13595, 15079), tuple(81758, 98510), tuple(31894, 87256), tuple(32717, 15856), tuple(58045, 25722), tuple(80820, 39359), tuple(89127, 50007), tuple(57129, 30173), tuple(143, 82490), tuple(67320, 89298), tuple(78031, 70771), tuple(56372, 13856), tuple(53792, 93923), tuple(77536, 97686), tuple(34281, 88893), tuple(7720, 38598), tuple(42577, 15445), tuple(97049, 25292), tuple(5755, 75274), tuple(68500, 88440), tuple(65460, 91968), tuple(82251, 62700), tuple(58737, 28221), tuple(33966, 31858), tuple(89283, 6137), tuple(95713, 57892), tuple(64716, 41893), tuple(23226, 72596), tuple(77494, 1226), tuple(57456, 97085), tuple(56638, 73195), tuple(86791, 95487), tuple(38616, 3710), tuple(27612, 88402), tuple(86211, 61383), tuple(74751, 67963), tuple(35294, 45969), tuple(20040, 65633), tuple(46379, 55793), tuple(5254, 33070), tuple(96039, 46828), tuple(53169, 86515), tuple(61456, 32728), tuple(19306, 28894), tuple(266, 73943), tuple(6298, 78481), tuple(55429, 72954), tuple(4013, 62916), tuple(19413, 82227), tuple(97767, 41262), tuple(1754, 66034), tuple(62168, 95138), tuple(8502, 1232), tuple(87736, 22730), tuple(94519, 57526), tuple(47840, 52733), tuple(57430, 11063), tuple(48203, 88666), tuple(94187, 17306), tuple(51254, 3414), tuple(42847, 70850), tuple(30517, 37298), tuple(51002, 3187), tuple(69065, 57819), tuple(28158, 31948), tuple(28641, 57066), tuple(64401, 41541), tuple(16769, 93104), tuple(36026, 40379), tuple(89972, 21007), tuple(23129, 3532), tuple(25076, 78327), tuple(91716, 52771), tuple(85414, 74704), tuple(25078, 29180), tuple(82397, 27229), tuple(71809, 86957), tuple(84698, 34879), tuple(28573, 40238), tuple(79803, 740), tuple(9445, 37484), tuple(30310, 44337), tuple(48396, 61468), tuple(55206, 32145), tuple(85429, 8394), tuple(57022, 16754), tuple(20686, 31181), tuple(49381, 90708), tuple(86368, 80026), tuple(12503, 98384), tuple(17987, 17590), tuple(87975, 47488), tuple(1917, 40089), tuple(28921, 51966), tuple(75061, 47560), tuple(47682, 85166), tuple(44983, 43829), tuple(65132, 39721), tuple(63156, 48271), tuple(43469, 44812), tuple(92402, 52827), tuple(93574, 93874), tuple(49160, 14154), tuple(17068, 32747), tuple(24013, 48763), tuple(44388, 91612), tuple(50092, 46361), tuple(12638, 67958), tuple(22733, 48580), tuple(89692, 17614), tuple(76259, 80333), tuple(60667, 81071), tuple(11866, 60670), tuple(44127, 52256), tuple(91538, 16284), tuple(3947, 5775), tuple(24013, 87274), tuple(61890, 35907), tuple(40033, 65872), tuple(82217, 28133), tuple(92448, 66250), tuple(69722, 79165), tuple(45642, 94585), tuple(19332, 52617), tuple(68376, 74661), tuple(67538, 36822), tuple(44251, 51303), tuple(21737, 91360), tuple(89816, 80022), tuple(62003, 95863), tuple(91553, 89883), tuple(81327, 60251), tuple(79081, 77218), tuple(83875, 50172), tuple(64753, 45810), tuple(31661, 24768), tuple(37225, 43323), tuple(7290, 90747), tuple(83726, 40577), tuple(67955, 25873), tuple(64937, 91179), tuple(43298, 1399), tuple(63408, 89816), tuple(7356, 46305), tuple(45184, 57862), tuple(53297, 20667), tuple(31709, 43903), tuple(62673, 94822), tuple(27913, 75493), tuple(24687, 80894), tuple(98262, 61113), tuple(53123, 55460), tuple(35147, 99271), tuple(27646, 34622), tuple(73077, 30910), tuple(20512, 11203), tuple(33770, 99560), tuple(34580, 35708), tuple(67059, 99164), tuple(72256, 23281), tuple(92534, 87165), tuple(52774, 85396), tuple(56154, 92895), tuple(24460, 62535), tuple(56634, 4948), tuple(26182, 65572), tuple(99426, 1748), tuple(31410, 43026), tuple(24172, 44480), tuple(9426, 61375), tuple(21718, 32700), tuple(91428, 80453), tuple(27315, 90992), tuple(2743, 10613), tuple(31248, 75906), tuple(99086, 51477), tuple(44829, 14817), tuple(89794, 9674), tuple(88775, 1393), tuple(94268, 66168), tuple(76314, 51601), tuple(30142, 76441), tuple(39895, 74493), tuple(67323, 13617), tuple(54056, 77441), tuple(64209, 30237), tuple(81819, 2685), tuple(74961, 36558), tuple(54405, 11789), tuple(47419, 18927), tuple(95646, 97923), tuple(6793, 98367), tuple(84729, 55346), tuple(26209, 51661), tuple(88902, 47479), tuple(29248, 6257), tuple(90293, 56023), tuple(13659, 85240), tuple(33402, 22946), tuple(98715, 46806), tuple(59061, 14084), tuple(63647, 85523), tuple(16920, 66956), tuple(33806, 17029), tuple(5921, 55022), tuple(56918, 8478), tuple(26353, 8772), tuple(73846, 62583), tuple(66724, 13905), tuple(81927, 13344), tuple(8535, 73788), tuple(42475, 864), tuple(43233, 31055), tuple(25826, 92107), tuple(58400, 93558), tuple(76480, 27917), tuple(11783, 45463), tuple(1994, 30049), tuple(69277, 48157), tuple(64234, 49337), tuple(71741, 56314), tuple(2005, 69772), tuple(49003, 37695), tuple(39968, 77681), tuple(832, 10155), tuple(57104, 19308), tuple(96734, 11547), tuple(30184, 42421), tuple(48375, 44830), tuple(93937, 72937), tuple(90182, 73901), tuple(15777, 13356), tuple(23590, 41957), tuple(28339, 72344), tuple(57738, 11792), tuple(46981, 22885), tuple(89701, 63079), tuple(18853, 8142), tuple(71023, 86607), tuple(43044, 84076), tuple(15504, 63914), tuple(10852, 24752), tuple(84420, 8955), tuple(52478, 86472), tuple(31493, 34784), tuple(63120, 80839), tuple(99483, 7075), tuple(63463, 9701), tuple(72217, 81768), tuple(92665, 41759), tuple(61299, 30348), tuple(75839, 10811), tuple(40924, 73497), tuple(16847, 11969), tuple(62221, 40296), tuple(86514, 6737), tuple(71717, 21760), tuple(72280, 22605), tuple(84073, 26361), tuple(35313, 38026), tuple(88244, 41921), tuple(2395, 44993), tuple(43095, 4491), tuple(65029, 92486), tuple(77825, 37626), tuple(86268, 93758), tuple(12282, 96669), tuple(70109, 3854), tuple(88201, 48985), tuple(67432, 22291), tuple(71226, 78916), tuple(93242, 69896), tuple(45961, 28858), tuple(37543, 83277), tuple(33989, 19303), tuple(75997, 92827), tuple(81996, 50401), tuple(47766, 89974), tuple(6969, 58504), tuple(57495, 67704), tuple(42186, 15837), tuple(16266, 31543), tuple(53482, 57047), tuple(6741, 53863), tuple(69708, 62402), tuple(47622, 71680), tuple(56407, 59557), tuple(35497, 43626), tuple(94382, 72849), tuple(85322, 82494), tuple(48283, 84203), tuple(60187, 43506), tuple(30227, 72397), tuple(8179, 46362), tuple(91848, 6724),
-    tuple(44252, 49652), tuple(62329, 71957), tuple(48136, 53803), tuple(29408, 16811), tuple(2807, 35831), tuple(3982, 42400), tuple(31819, 922), tuple(60411, 29397), tuple(63298, 32886), tuple(56696, 94800), tuple(40452, 78058), tuple(72632, 46188), tuple(6187, 49011), tuple(41030, 50745), tuple(37287, 2821), tuple(85833, 58997), tuple(69513, 2449), tuple(67890, 79660), tuple(10510, 65067), tuple(81559, 31412), tuple(55173, 70275), tuple(30720, 65244), tuple(39362, 55066), tuple(82509, 54146), tuple(37012, 50941), tuple(7777, 73746), tuple(55324, 68529), tuple(64001, 14553), tuple(75092, 7732), tuple(30396, 68267), tuple(17785, 63304), tuple(60691, 75626), tuple(73360, 24028), tuple(49094, 44015), tuple(38186, 58436), tuple(85214, 87107), tuple(28851, 30981), tuple(97558, 16884), tuple(50485, 61227), tuple(66390, 14523), tuple(91346, 12746), tuple(27417, 80041), tuple(70675, 62543), tuple(30493, 34005), tuple(93733, 65419), tuple(84518, 73912), tuple(95889, 56587), tuple(25811, 87640), tuple(67088, 17670), tuple(61030, 10236), tuple(63615, 23071), tuple(95064, 2080), tuple(67171, 84194), tuple(29917, 74112), tuple(69466, 26813), tuple(65199, 34701), tuple(73665, 70408), tuple(79992, 52475), tuple(85736, 3601), tuple(37979, 55469), tuple(19825, 77218), tuple(31666, 7906), tuple(74130, 1569), tuple(51690, 48772), tuple(17872, 80141), tuple(26340, 29232), tuple(5680, 4004), tuple(72841, 60873), tuple(65725, 86711), tuple(39659, 76703), tuple(72206, 4834), tuple(25126, 62083), tuple(85881, 81324), tuple(36485, 89451), tuple(66626, 2033), tuple(23961, 13900), tuple(68404, 32573), tuple(6568, 75904), tuple(5463, 40836), tuple(82243, 72476), tuple(41469, 85222), tuple(53063, 80905), tuple(89420, 89405), tuple(64438, 54748), tuple(84609, 19925), tuple(58071, 76697), tuple(92927, 37184), tuple(86525, 43159), tuple(90683, 47762), tuple(4221, 94429), tuple(68456, 34730), tuple(5303, 27512), tuple(3857, 87130), tuple(25963, 49542), tuple(68981, 6398), tuple(16900, 38579), tuple(44288, 3921), tuple(41848, 6266), tuple(14235, 18205), tuple(93114, 74697), tuple(31693, 12438), tuple(93873, 3135), tuple(39867, 42033), tuple(39257, 83168), tuple(91557, 2168), tuple(25761, 99686), tuple(33891, 81917), tuple(69185, 25496), tuple(32937, 32667), tuple(53201, 77822), tuple(41625, 73595), tuple(75159, 2574), tuple(41500, 24049), tuple(18998, 17778), tuple(55319, 14793), tuple(98343, 55538), tuple(50306, 92789), tuple(8111, 36989), tuple(12332, 90370), tuple(50098, 64743), tuple(518, 42569), tuple(53218, 75332), tuple(37930, 85988), tuple(26622, 30733), tuple(72656, 87213), tuple(62011, 83799), tuple(74325, 39325), tuple(61424, 29292), tuple(38885, 35172), tuple(48893, 53493), tuple(5365, 46863), tuple(35192, 50130), tuple(67377, 31556), tuple(89291, 38089), tuple(7639, 18196), tuple(66102, 23782), tuple(94128, 13012), tuple(14739, 40637), tuple(38124, 70538), tuple(21143, 9114), tuple(81628, 1281), tuple(2385, 12814), tuple(97713, 12931), tuple(15392, 71469), tuple(285, 2139), tuple(75082, 86935), tuple(53815, 6664), tuple(21102, 26350), tuple(7191, 63079), tuple(77811, 54178), tuple(94993, 43113), tuple(23712, 9041), tuple(5151, 47040), tuple(48565, 21701), tuple(68877, 29339), tuple(41207, 91567), tuple(52928, 39020), tuple(90950, 13773), tuple(9269, 45202), tuple(76822, 23962), tuple(66347, 97641), tuple(39410, 6179), tuple(544, 78664), tuple(6168, 22720), tuple(41653, 97913), tuple(17421, 50726), tuple(7841, 71433), tuple(54395, 26607), tuple(4269, 30336), tuple(34319, 79247), tuple(95612, 91933), tuple(25657, 23904), tuple(19990, 4678), tuple(87858, 51586), tuple(5060, 74367), tuple(56282, 50346), tuple(24967, 12978), tuple(5413, 84898), tuple(83630, 81450), tuple(4445, 3246), tuple(8686, 37833), tuple(25753, 491), tuple(64949, 79083), tuple(91227, 99361), tuple(15478, 9776), tuple(19138, 1197), tuple(90231, 21775), tuple(1603, 3420), tuple(80483, 91945), tuple(26254, 47364), tuple(39956, 39011), tuple(21944, 68718), tuple(17476, 26688), tuple(35124, 95520), tuple(80675, 86048), tuple(37802, 24654), tuple(35991, 30501), tuple(58201, 32076), tuple(73425, 48851), tuple(32081, 62678), tuple(43890, 72473), tuple(55420, 55864), tuple(92730, 83636), tuple(98991, 57739), tuple(16554, 8671), tuple(97393, 74717), tuple(52946, 40432), tuple(54038, 57550), tuple(28407, 59994), tuple(51960, 69485), tuple(54362, 59837), tuple(56608, 44803), tuple(87765, 65240), tuple(83537, 20410), tuple(12462, 63600), tuple(29652, 60603), tuple(33694, 86009), tuple(6328, 2247), tuple(1163, 66579), tuple(14339, 11994), tuple(84291, 50111), tuple(68889, 88342), tuple(10269, 72875), tuple(66319, 32677), tuple(13064, 29930), tuple(32190, 83783), tuple(45970, 36250), tuple(76934, 56387), tuple(86991, 52198), tuple(595, 49931), tuple(56487, 35023), tuple(64301, 3898), tuple(62751, 16083), tuple(76962, 42724), tuple(25144, 84082), tuple(42577, 55365), tuple(35491, 62043), tuple(98690, 95354), tuple(78142, 63556), tuple(43994, 19756), tuple(44371, 88026), tuple(79528, 38378), tuple(60538, 95096), tuple(94043, 64914), tuple(56328, 52212), tuple(23125, 3718), tuple(68265, 31800), tuple(50257, 30242), tuple(90023, 16264), tuple(26536, 54846), tuple(56408, 26069), tuple(48835, 90685), tuple(41440, 85486), tuple(50439, 28977), tuple(57270, 58062), tuple(93385, 81991), tuple(41747, 90412), tuple(4397, 54135), tuple(27833, 63238), tuple(30047, 54689), tuple(97424, 22639), tuple(38666, 7212), tuple(11002, 23871), tuple(94214, 17282), tuple(38570, 36544), tuple(21281, 2550), tuple(18772, 9450), tuple(21573, 89501), tuple(72980, 3658), tuple(4270, 75217), tuple(84311, 52335), tuple(50238, 7027), tuple(79880, 13083), tuple(4453, 53612), tuple(42094, 83535), tuple(26820, 29389), tuple(68926, 37356), tuple(41068, 99341), tuple(17804, 36252), tuple(95293, 20765), tuple(16191, 10046), tuple(97430, 9242), tuple(8161, 65278), tuple(57448, 35098), tuple(94391, 77130), tuple(98916, 39103), tuple(20350, 32970), tuple(90646, 11890), tuple(75362, 5602), tuple(27639, 77663), tuple(43360, 46034), tuple(22402, 35513), tuple(8137, 28845), tuple(85004, 55522), tuple(41422, 53954), tuple(31450, 3352), tuple(43577, 62316), tuple(2055, 68345), tuple(81241, 88166), tuple(99688, 49801), tuple(34150, 62685), tuple(61452, 89940), tuple(17271, 17048), tuple(35360, 54074), tuple(24514, 86758), tuple(65291, 94634), tuple(56371, 29354), tuple(17017, 58323), tuple(97782, 38903), tuple(64924, 7863), tuple(26686, 44764), tuple(6946, 65671), tuple(19164, 55697), tuple(53736, 61363), tuple(16698, 88605), tuple(68917, 45223), tuple(61620, 71030), tuple(36833, 87), tuple(25499, 92341), tuple(64999, 60843), tuple(10332, 23741), tuple(44183, 74772), tuple(5876, 83182), tuple(2777, 13943), tuple(30518, 90419), tuple(95186, 2879), tuple(67770, 28915), tuple(63386, 30643), tuple(32598, 27470), tuple(22690, 14598), tuple(33055, 49882), tuple(66771, 87914), tuple(1528, 77971), tuple(35398, 19178), tuple(66537, 4756), tuple(45085, 80236), tuple(67054, 78236), tuple(98986, 54864), tuple(22249, 20937), tuple(63417, 4603), tuple(77613, 1198), tuple(6611, 68649), tuple(73627, 56112), tuple(73633, 97606), tuple(99775, 39893), tuple(56752, 97490), tuple(32399, 69269), tuple(62186, 76302), tuple(94184, 83140), tuple(75653, 83050), tuple(61775, 15249), tuple(47463, 90032), tuple(21937, 11962), tuple(62241, 55183), tuple(98504, 4933), tuple(66272, 28609), tuple(67746, 30488), tuple(54196, 35321), tuple(26259, 63765), tuple(11312, 41065), tuple(15815, 63183), tuple(18767, 28578), tuple(88996, 89259), tuple(5635, 82121), tuple(82835, 33221), tuple(23282, 57401), tuple(32823, 83397), tuple(9333, 22645), tuple(93949, 88014), tuple(53441, 1659), tuple(7606, 35735), tuple(52971, 83457), tuple(77912, 97683), tuple(33195, 462), tuple(36642, 84826), tuple(14627, 39789), tuple(35158, 74576), tuple(31178, 3298), tuple(78999, 38000), tuple(58392, 70574), tuple(32797, 9393), tuple(31745, 73068), tuple(3463, 99157), tuple(85198, 99633), tuple(69136, 61700), tuple(90269, 56346), tuple(54888, 30161), tuple(69578, 67718), tuple(31362, 88940), tuple(72151, 69802), tuple(10518, 42128), tuple(10389, 85928), tuple(79024, 46427), tuple(75298, 320), tuple(61374, 92005), tuple(52693, 92872), tuple(90677, 97987), tuple(4977, 7002), tuple(34950, 40356), tuple(1286, 84570), tuple(83587, 44056), tuple(60303, 67073), tuple(90693, 54889), tuple(3665, 65556), tuple(36965, 91476), tuple(36018, 1114), tuple(64173, 73176), tuple(74375, 37973), tuple(40226, 4894), tuple(15708, 44097), tuple(58497, 62654), tuple(88190, 8945), tuple(89623, 42745), tuple(34666, 46515), tuple(69908, 60462), tuple(85257, 89711), tuple(95343, 25345), tuple(9671, 68154), tuple(43560, 12783), tuple(56946, 86701), tuple(97027, 16286), tuple(73465, 82933), tuple(60864, 98196), tuple(65681, 78455), tuple(95949, 98824), tuple(60427, 79639), tuple(62125, 96638), tuple(44349, 55436), tuple(23889, 98287), tuple(7982, 57100), tuple(89134, 62354), tuple(90345, 13136), tuple(87117, 55670), tuple(87142, 56737), tuple(12166, 62622), tuple(25757, 83242), tuple(22839, 70866), tuple(55230, 87710), tuple(52836, 58660), tuple(52001, 11928), tuple(32300, 43940), tuple(82815, 15966), tuple(25995, 35077), tuple(85590, 71892), tuple(65700, 97621), tuple(93120, 45889), tuple(39090, 18624), tuple(40711, 54078), tuple(21512, 71018), tuple(84273, 83224), tuple(94455, 11165), tuple(44762, 81935), tuple(32383, 12092), tuple(57681, 45595), tuple(34900, 10701), tuple(75918, 15671), tuple(80894, 47445), tuple(84887, 65029), tuple(20046, 53478), tuple(35117, 350), tuple(58605, 95757), tuple(41129, 70721), tuple(17956, 60019), tuple(92256, 31486), tuple(25628, 39061), tuple(46442, 95181), tuple(99796, 98961), tuple(84447, 67126), tuple(90905, 35020), tuple(44920, 85041), tuple(29355, 81130), tuple(27574, 74365), tuple(18795, 87608), tuple(9134, 94033), tuple(40788, 33406), tuple(66374, 27589), tuple(35828, 79467), tuple(63337, 21310), tuple(19850, 91859), tuple(8457, 46910), tuple(17247, 54352),          
+    tuple(44252, 49652), tuple(62329, 71957), tuple(48136, 53803), tuple(29408, 16811), tuple(2807, 35831), tuple(3982, 42400), tuple(31819, 922), tuple(60411, 29397), tuple(63298, 32886), tuple(56696, 94800), tuple(40452, 78058), tuple(72632, 46188), tuple(6187, 49011), tuple(41030, 50745), tuple(37287, 2821), tuple(85833, 58997), tuple(69513, 2449), tuple(67890, 79660), tuple(10510, 65067), tuple(81559, 31412), tuple(55173, 70275), tuple(30720, 65244), tuple(39362, 55066), tuple(82509, 54146), tuple(37012, 50941), tuple(7777, 73746), tuple(55324, 68529), tuple(64001, 14553), tuple(75092, 7732), tuple(30396, 68267), tuple(17785, 63304), tuple(60691, 75626), tuple(73360, 24028), tuple(49094, 44015), tuple(38186, 58436), tuple(85214, 87107), tuple(28851, 30981), tuple(97558, 16884), tuple(50485, 61227), tuple(66390, 14523), tuple(91346, 12746), tuple(27417, 80041), tuple(70675, 62543), tuple(30493, 34005), tuple(93733, 65419), tuple(84518, 73912), tuple(95889, 56587), tuple(25811, 87640), tuple(67088, 17670), tuple(61030, 10236), tuple(63615, 23071), tuple(95064, 2080), tuple(67171, 84194), tuple(29917, 74112), tuple(69466, 26813), tuple(65199, 34701), tuple(73665, 70408), tuple(79992, 52475), tuple(85736, 3601), tuple(37979, 55469), tuple(19825, 77218), tuple(31666, 7906), tuple(74130, 1569), tuple(51690, 48772), tuple(17872, 80141), tuple(26340, 29232), tuple(5680, 4004), tuple(72841, 60873), tuple(65725, 86711), tuple(39659, 76703), tuple(72206, 4834), tuple(25126, 62083), tuple(85881, 81324), tuple(36485, 89451), tuple(66626, 2033), tuple(23961, 13900), tuple(68404, 32573), tuple(6568, 75904), tuple(5463, 40836), tuple(82243, 72476), tuple(41469, 85222), tuple(53063, 80905), tuple(89420, 89405), tuple(64438, 54748), tuple(84609, 19925), tuple(58071, 76697), tuple(92927, 37184), tuple(86525, 43159), tuple(90683, 47762), tuple(4221, 94429), tuple(68456, 34730), tuple(5303, 27512), tuple(3857, 87130), tuple(25963, 49542), tuple(68981, 6398), tuple(16900, 38579), tuple(44288, 3921), tuple(41848, 6266), tuple(14235, 18205), tuple(93114, 74697), tuple(31693, 12438), tuple(93873, 3135), tuple(39867, 42033), tuple(39257, 83168), tuple(91557, 2168), tuple(25761, 99686), tuple(33891, 81917), tuple(69185, 25496), tuple(32937, 32667), tuple(53201, 77822), tuple(41625, 73595), tuple(75159, 2574), tuple(41500, 24049), tuple(18998, 17778), tuple(55319, 14793), tuple(98343, 55538), tuple(50306, 92789), tuple(8111, 36989), tuple(12332, 90370), tuple(50098, 64743), tuple(518, 42569), tuple(53218, 75332), tuple(37930, 85988), tuple(26622, 30733), tuple(72656, 87213), tuple(62011, 83799), tuple(74325, 39325), tuple(61424, 29292), tuple(38885, 35172), tuple(48893, 53493), tuple(5365, 46863), tuple(35192, 50130), tuple(67377, 31556), tuple(89291, 38089), tuple(7639, 18196), tuple(66102, 23782), tuple(94128, 13012), tuple(14739, 40637), tuple(38124, 70538), tuple(21143, 9114), tuple(81628, 1281), tuple(2385, 12814), tuple(97713, 12931), tuple(15392, 71469), tuple(285, 2139), tuple(75082, 86935), tuple(53815, 6664), tuple(21102, 26350), tuple(7191, 63079), tuple(77811, 54178), tuple(94993, 43113), tuple(23712, 9041), tuple(5151, 47040), tuple(48565, 21701), tuple(68877, 29339), tuple(41207, 91567), tuple(52928, 39020), tuple(90950, 13773), tuple(9269, 45202), tuple(76822, 23962), tuple(66347, 97641), tuple(39410, 6179), tuple(544, 78664), tuple(6168, 22720), tuple(41653, 97913), tuple(17421, 50726), tuple(7841, 71433), tuple(54395, 26607), tuple(4269, 30336), tuple(34319, 79247), tuple(95612, 91933), tuple(25657, 23904), tuple(19990, 4678), tuple(87858, 51586), tuple(5060, 74367), tuple(56282, 50346), tuple(24967, 12978), tuple(5413, 84898), tuple(83630, 81450), tuple(4445, 3246), tuple(8686, 37833), tuple(25753, 491), tuple(64949, 79083), tuple(91227, 99361), tuple(15478, 9776), tuple(19138, 1197), tuple(90231, 21775), tuple(1603, 3420), tuple(80483, 91945), tuple(26254, 47364), tuple(39956, 39011), tuple(21944, 68718), tuple(17476, 26688), tuple(35124, 95520), tuple(80675, 86048), tuple(37802, 24654), tuple(35991, 30501), tuple(58201, 32076), tuple(73425, 48851), tuple(32081, 62678), tuple(43890, 72473), tuple(55420, 55864), tuple(92730, 83636), tuple(98991, 57739), tuple(16554, 8671), tuple(97393, 74717), tuple(52946, 40432), tuple(54038, 57550), tuple(28407, 59994), tuple(51960, 69485), tuple(54362, 59837), tuple(56608, 44803), tuple(87765, 65240), tuple(83537, 20410), tuple(12462, 63600), tuple(29652, 60603), tuple(33694, 86009), tuple(6328, 2247), tuple(1163, 66579), tuple(14339, 11994), tuple(84291, 50111), tuple(68889, 88342), tuple(10269, 72875), tuple(66319, 32677), tuple(13064, 29930), tuple(32190, 83783), tuple(45970, 36250), tuple(76934, 56387), tuple(86991, 52198), tuple(595, 49931), tuple(56487, 35023), tuple(64301, 3898), tuple(62751, 16083), tuple(76962, 42724), tuple(25144, 84082), tuple(42577, 55365), tuple(35491, 62043), tuple(98690, 95354), tuple(78142, 63556), tuple(43994, 19756), tuple(44371, 88026), tuple(79528, 38378), tuple(60538, 95096), tuple(94043, 64914), tuple(56328, 52212), tuple(23125, 3718), tuple(68265, 31800), tuple(50257, 30242), tuple(90023, 16264), tuple(26536, 54846), tuple(56408, 26069), tuple(48835, 90685), tuple(41440, 85486), tuple(50439, 28977), tuple(57270, 58062), tuple(93385, 81991), tuple(41747, 90412), tuple(4397, 54135), tuple(27833, 63238), tuple(30047, 54689), tuple(97424, 22639), tuple(38666, 7212), tuple(11002, 23871), tuple(94214, 17282), tuple(38570, 36544), tuple(21281, 2550), tuple(18772, 9450), tuple(21573, 89501), tuple(72980, 3658), tuple(4270, 75217), tuple(84311, 52335), tuple(50238, 7027), tuple(79880, 13083), tuple(4453, 53612), tuple(42094, 83535), tuple(26820, 29389), tuple(68926, 37356), tuple(41068, 99341), tuple(17804, 36252), tuple(95293, 20765), tuple(16191, 10046), tuple(97430, 9242), tuple(8161, 65278), tuple(57448, 35098), tuple(94391, 77130), tuple(98916, 39103), tuple(20350, 32970), tuple(90646, 11890), tuple(75362, 5602), tuple(27639, 77663), tuple(43360, 46034), tuple(22402, 35513), tuple(8137, 28845), tuple(85004, 55522), tuple(41422, 53954), tuple(31450, 3352), tuple(43577, 62316), tuple(2055, 68345), tuple(81241, 88166), tuple(99688, 49801), tuple(34150, 62685), tuple(61452, 89940), tuple(17271, 17048), tuple(35360, 54074), tuple(24514, 86758), tuple(65291, 94634), tuple(56371, 29354), tuple(17017, 58323), tuple(97782, 38903), tuple(64924, 7863), tuple(26686, 44764), tuple(6946, 65671), tuple(19164, 55697), tuple(53736, 61363), tuple(16698, 88605), tuple(68917, 45223), tuple(61620, 71030), tuple(36833, 87), tuple(25499, 92341), tuple(64999, 60843), tuple(10332, 23741), tuple(44183, 74772), tuple(5876, 83182), tuple(2777, 13943), tuple(30518, 90419), tuple(95186, 2879), tuple(67770, 28915), tuple(63386, 30643), tuple(32598, 27470), tuple(22690, 14598), tuple(33055, 49882), tuple(66771, 87914), tuple(1528, 77971), tuple(35398, 19178), tuple(66537, 4756), tuple(45085, 80236), tuple(67054, 78236), tuple(98986, 54864), tuple(22249, 20937), tuple(63417, 4603), tuple(77613, 1198), tuple(6611, 68649), tuple(73627, 56112), tuple(73633, 97606), tuple(99775, 39893), tuple(56752, 97490), tuple(32399, 69269), tuple(62186, 76302), tuple(94184, 83140), tuple(75653, 83050), tuple(61775, 15249), tuple(47463, 90032), tuple(21937, 11962), tuple(62241, 55183), tuple(98504, 4933), tuple(66272, 28609), tuple(67746, 30488), tuple(54196, 35321), tuple(26259, 63765), tuple(11312, 41065), tuple(15815, 63183), tuple(18767, 28578), tuple(88996, 89259), tuple(5635, 82121), tuple(82835, 33221), tuple(23282, 57401), tuple(32823, 83397), tuple(9333, 22645), tuple(93949, 88014), tuple(53441, 1659), tuple(7606, 35735), tuple(52971, 83457), tuple(77912, 97683), tuple(33195, 462), tuple(36642, 84826), tuple(14627, 39789), tuple(35158, 74576), tuple(31178, 3298), tuple(78999, 38000), tuple(58392, 70574), tuple(32797, 9393), tuple(31745, 73068), tuple(3463, 99157), tuple(85198, 99633), tuple(69136, 61700), tuple(90269, 56346), tuple(54888, 30161), tuple(69578, 67718), tuple(31362, 88940), tuple(72151, 69802), tuple(10518, 42128), tuple(10389, 85928), tuple(79024, 46427), tuple(75298, 320), tuple(61374, 92005), tuple(52693, 92872), tuple(90677, 97987), tuple(4977, 7002), tuple(34950, 40356), tuple(1286, 84570), tuple(83587, 44056), tuple(60303, 67073), tuple(90693, 54889), tuple(3665, 65556), tuple(36965, 91476), tuple(36018, 1114), tuple(64173, 73176), tuple(74375, 37973), tuple(40226, 4894), tuple(15708, 44097), tuple(58497, 62654), tuple(88190, 8945), tuple(89623, 42745), tuple(34666, 46515), tuple(69908, 60462), tuple(85257, 89711), tuple(95343, 25345), tuple(9671, 68154), tuple(43560, 12783), tuple(56946, 86701), tuple(97027, 16286), tuple(73465, 82933), tuple(60864, 98196), tuple(65681, 78455), tuple(95949, 98824), tuple(60427, 79639), tuple(62125, 96638), tuple(44349, 55436), tuple(23889, 98287), tuple(7982, 57100), tuple(89134, 62354), tuple(90345, 13136), tuple(87117, 55670), tuple(87142, 56737), tuple(12166, 62622), tuple(25757, 83242), tuple(22839, 70866), tuple(55230, 87710), tuple(52836, 58660), tuple(52001, 11928), tuple(32300, 43940), tuple(82815, 15966), tuple(25995, 35077), tuple(85590, 71892), tuple(65700, 97621), tuple(93120, 45889), tuple(39090, 18624), tuple(40711, 54078), tuple(21512, 71018), tuple(84273, 83224), tuple(94455, 11165), tuple(44762, 81935), tuple(32383, 12092), tuple(57681, 45595), tuple(34900, 10701), tuple(75918, 15671), tuple(80894, 47445), tuple(84887, 65029), tuple(20046, 53478), tuple(35117, 350), tuple(58605, 95757), tuple(41129, 70721), tuple(17956, 60019), tuple(92256, 31486), tuple(25628, 39061), tuple(46442, 95181), tuple(99796, 98961), tuple(84447, 67126), tuple(90905, 35020), tuple(44920, 85041), tuple(29355, 81130), tuple(27574, 74365), tuple(18795, 87608), tuple(9134, 94033), tuple(40788, 33406), tuple(66374, 27589), tuple(35828, 79467), tuple(63337, 21310), tuple(19850, 91859), tuple(8457, 46910), tuple(17247, 54352),
     tuple(78157, 12984), tuple(19014, 95404), tuple(33696, 61297), tuple(84179, 86141), tuple(88420, 35793), tuple(56841, 54309), tuple(61086, 51639), tuple(51422, 42981), tuple(24495, 8959), tuple(44560, 17680), tuple(5010, 310), tuple(7658, 47071), tuple(99542, 84835), tuple(32524, 20855), tuple(74043, 44891), tuple(86735, 20535), tuple(73782, 59995), tuple(93939, 67476), tuple(3553, 2160), tuple(28263, 96116), tuple(43233, 84344), tuple(82394, 41116), tuple(94208, 54259), tuple(19293, 78307), tuple(97691, 89913), tuple(69180, 92822), tuple(54514, 17070), tuple(41565, 19577), tuple(56860, 57944), tuple(79429, 90334), tuple(14209, 63872), tuple(8193, 47375), tuple(84457, 5729), tuple(35499, 29880), tuple(71046, 96629), tuple(78320, 16678), tuple(52171, 9008), tuple(10285, 77600), tuple(89222, 56452), tuple(74877, 45130), tuple(45122, 7477), tuple(27680, 36119), tuple(53572, 67978), tuple(84553, 96126), tuple(79947, 45957), tuple(62290, 6001), tuple(24885, 66150), tuple(74756, 8350), tuple(19600, 26665), tuple(26140, 12798), tuple(346, 52401), tuple(55107, 64736), tuple(55227, 20192), tuple(5250, 75970), tuple(22597, 36117), tuple(46057, 6297), tuple(146, 34226), tuple(62101, 45872), tuple(50973, 81711), tuple(28437, 90316), tuple(87949, 33752), tuple(97761, 97260), tuple(33866, 10748), tuple(43546, 29031), tuple(94371, 94717), tuple(23676, 36834), tuple(78530, 40195), tuple(9449, 90868), tuple(4688, 18113), tuple(6478, 91149), tuple(5770, 53359), tuple(67467, 45123), tuple(99961, 85269), tuple(16771, 9423), tuple(86093, 12345), tuple(57781, 91310), tuple(64235, 75090), tuple(44983, 14518), tuple(97295, 86692), tuple(9084, 63091), tuple(95536, 58091), tuple(19196, 84870), tuple(30135, 5353), tuple(8031, 34065), tuple(30428, 11126), tuple(64190, 14178), tuple(31159, 97833), tuple(52514, 36312), tuple(39470, 95767), tuple(56521, 58481), tuple(67491, 58112), tuple(93348, 30378), tuple(68108, 71570), tuple(1098, 967), tuple(38546, 81282), tuple(56825, 65979), tuple(59069, 72390), tuple(2824, 13703), tuple(48333, 14500), tuple(9893, 25478), tuple(2911, 47477), tuple(58177, 26157), tuple(82958, 11140), tuple(29280, 90771), tuple(87961, 77195), tuple(41212, 31814), tuple(57596, 21467), tuple(95701, 96920), tuple(42264, 95301), tuple(40893, 490), tuple(85295, 66203), tuple(82996, 55114), tuple(7692, 97829), tuple(29833, 90468), tuple(11917, 11893), tuple(29516, 81375), tuple(89726, 44500), tuple(8932, 49236), tuple(46908, 11625), tuple(37562, 86013), tuple(77455, 10903), tuple(71128, 96631), tuple(14398, 25421), tuple(22273, 24791), tuple(53432, 89441), tuple(65639, 13703), tuple(87847, 91934), tuple(79196, 83398), tuple(93841, 8300), tuple(98217, 31103), tuple(74206, 10777), tuple(87556, 26040), tuple(3488, 46363), tuple(5052, 37977), tuple(13148, 84770), tuple(57802, 44741), tuple(52562, 89370), tuple(45417, 28092), tuple(10850, 53735), tuple(55528, 13265), tuple(49639, 60069), tuple(24297, 65409), tuple(17691, 74780), tuple(14056, 91384), tuple(26678, 79745), tuple(20819, 65318), tuple(5109, 36921), tuple(32429, 44351), tuple(49300, 87487), tuple(91490, 17942), tuple(91165, 36259), tuple(19889, 92478), tuple(32525, 24314),
-    tuple(32207, 12383), tuple(18946, 80847), tuple(26629, 99576), tuple(23663, 33753), tuple(78661, 43289), tuple(42971, 85652), tuple(13148, 37633), tuple(7460, 31621), tuple(7106, 19344), tuple(56623, 40597), tuple(3931, 46383), tuple(40928, 80864), tuple(54411, 42893), tuple(97994, 37208), tuple(98704, 34056), tuple(28221, 65071), tuple(17035, 74621), tuple(44980, 99037), tuple(74685, 40941), tuple(51689, 87959), tuple(1603, 88894), tuple(58816, 80911), tuple(6600, 88186), tuple(51598, 56572), tuple(94570, 53971), tuple(36829, 22411), tuple(78272, 19485), tuple(27782, 91187), tuple(50738, 34908), tuple(77246, 37199), tuple(54696, 25448), tuple(22518, 20075), tuple(93517, 9215), tuple(63893, 61738), tuple(1803, 66542), tuple(8740, 44384), tuple(50214, 2536), tuple(82978, 22366), tuple(30379, 1906), tuple(69739, 14688), tuple(32367, 37176), tuple(94639, 5870), tuple(28089, 44553), tuple(23425, 12581), tuple(55612, 25746), tuple(10872, 85235), tuple(78490, 47300), tuple(53808, 99715), tuple(73003, 81707), tuple(69544, 44704), tuple(49921, 45937), tuple(53055, 64486), tuple(29788, 41235), tuple(66977, 32399), tuple(14272, 19156), tuple(52628, 43512), tuple(84512, 95549), tuple(37407, 73000), tuple(97454, 5645), tuple(94560, 22177), tuple(43121, 24751), tuple(16392, 71632), tuple(57061, 95049), tuple(78509, 12622), tuple(19152, 31950), tuple(60772, 58980), tuple(80874, 81688), tuple(57277, 94240), tuple(72106, 83377), tuple(96685, 38772), tuple(67254, 25148), tuple(55927, 21049), tuple(60288, 62456), tuple(70931, 77751), tuple(79197, 16179), tuple(3655, 47431), tuple(46830, 73545), tuple(45050, 41379), tuple(27458, 17406), tuple(39099, 99237), tuple(67490, 80382), tuple(62723, 79115), tuple(8353, 32032), tuple(23488, 12738), tuple(4013, 67892), tuple(26464, 50462), tuple(35943, 94375), tuple(44186, 34987), tuple(60927, 88755), tuple(8465, 63630), tuple(66062, 34368), tuple(88036, 58046), tuple(58249, 81975), tuple(18237, 47105), tuple(6733, 82935), tuple(78749, 39033), tuple(15131, 26574), tuple(33524, 8929), tuple(41839, 16312), tuple(55673, 27094), tuple(49538, 11713), tuple(88371, 69776), tuple(94252, 13464), tuple(5832, 84375), tuple(89357, 64815), tuple(46801, 11748), tuple(30666, 81254), tuple(16789, 10599), tuple(42935, 98646), tuple(66143, 20772), tuple(44556, 23422), tuple(46018, 16312), tuple(22259, 77171), tuple(56983, 86832), tuple(49921, 22125), tuple(92296, 45486), tuple(69764, 34023), tuple(9637, 96817), tuple(51206, 30615), tuple(10348, 92983), tuple(14472, 99323), tuple(40262, 97192), tuple(2191, 68285), tuple(22924, 25679), tuple(5067, 66212), tuple(69487, 49838), tuple(20052, 16120), tuple(95935, 71293), tuple(1776, 51796), tuple(23090, 30667), tuple(52957, 44078), tuple(91342, 24546), tuple(50425, 89005), tuple(53426, 47583), tuple(6584, 10139), tuple(3118, 13516), tuple(55369, 99320), tuple(63349, 89873), tuple(64571, 74984), tuple(26517, 2840), tuple(33325, 27702), tuple(43660, 87008), tuple(25645, 63104), tuple(26144, 93808), tuple(38030, 8593), tuple(46594, 22518), tuple(17472, 60358), tuple(23471, 75904), tuple(64653, 25665), tuple(58930, 2800), tuple(9714, 21659), tuple(90877, 15172), tuple(24169, 33165), tuple(40301, 28982), tuple(5835, 58106), tuple(47425, 55922), tuple(85182, 8833), tuple(54791, 76061), tuple(43334, 95233), tuple(88895, 11611), tuple(67974, 99700), tuple(42359, 7619), tuple(46091, 3188), tuple(96126, 1150), tuple(67300, 70263), tuple(15504, 6792), tuple(43488, 51128), tuple(59882, 82061), tuple(53674, 82213), tuple(13942, 71867), tuple(37229, 44172), tuple(8234, 10116), tuple(63955, 93663), tuple(90556, 81422), tuple(36156, 23916), tuple(80004, 32883), tuple(97483, 91439), tuple(40380, 75895), tuple(49030, 13388), tuple(10112, 23706), tuple(12693, 54634), tuple(89114, 44239), tuple(79449, 97096), tuple(93945, 17715), tuple(84610, 91409), tuple(77676, 32755), tuple(96528, 43811), tuple(32771, 17368), tuple(72726, 51584), tuple(68373, 27912), tuple(13120, 2918), tuple(32440, 89244), tuple(94188, 42530), tuple(47136, 16569), tuple(38629, 72378), tuple(6704, 33393), tuple(29123, 2559), tuple(4782, 19801), tuple(67017, 24504), tuple(10924, 38797), tuple(8704, 22146), tuple(32103, 77336), tuple(38053, 7912), tuple(6562, 22610), tuple(27942, 63645), tuple(40426, 37003), tuple(21523, 64033), tuple(46299, 23083), tuple(48752, 46938), tuple(28350, 22135), tuple(14308, 14980), tuple(14573, 24398), tuple(7228, 37742), tuple(82025, 86225), tuple(53716, 36196), tuple(81985, 16387), tuple(57584, 81974), tuple(99131, 7574), tuple(62847, 67483), tuple(86114, 25787), tuple(53211, 78386), tuple(80778, 49571), tuple(32747, 39211), tuple(71223, 56413), tuple(60888, 54163), tuple(7192, 51136), tuple(53334, 59228), tuple(4421, 66662), tuple(33413, 84705), tuple(56666, 78956), tuple(61801, 42678), tuple(43053, 77774), tuple(63820, 28596), tuple(1077, 97015), tuple(64021, 64781), tuple(92706, 3502), tuple(10677, 85713), tuple(25226, 89936), tuple(72837, 6353), tuple(48761, 89256), tuple(65947, 66655), tuple(72098, 73523), tuple(90795, 85045), tuple(55030, 92320), tuple(55194, 86101), tuple(10745, 5734), tuple(88677, 87133), tuple(73661, 34366), tuple(45949, 27357), tuple(88662, 12417), tuple(8489, 13536), tuple(27549, 4543), tuple(92939, 3478), tuple(54350, 80071), tuple(18846, 12230), tuple(44026, 16272), tuple(61412, 29030), tuple(19174, 95986), tuple(95690, 96752), tuple(89204, 59178), tuple(88740, 16634), tuple(86216, 73138), tuple(78274, 75895), tuple(33616, 9671), tuple(34033, 95200), tuple(34068, 66630), tuple(86998, 11248), tuple(33926, 18414), tuple(70477, 34726), tuple(78159, 51516), tuple(39498, 51001), tuple(8129, 45722), tuple(80034, 74923), tuple(72313, 14607), tuple(24587, 66307), tuple(1705, 17417), tuple(72039, 30982), tuple(38633, 26195), tuple(28199, 39357), tuple(38581, 11807), tuple(86457, 96618), tuple(26962, 65955), tuple(91876, 59903), tuple(73754, 98220), tuple(52133, 25146), tuple(66110, 69603), tuple(1793, 33205), tuple(15034, 44701), tuple(51124, 76916), tuple(39534, 36662), tuple(25979, 69668), tuple(57384, 67311), tuple(18545, 60762), tuple(19046, 92399), tuple(38249, 4653), tuple(72527, 59270), tuple(33966, 37148), tuple(27590, 117), tuple(70374, 4742), tuple(16192, 75527), tuple(80174, 75518), tuple(48577, 98517), tuple(94414, 14445), tuple(67138, 13404), tuple(92294, 29477), tuple(20990, 61280), tuple(6082, 29420), tuple(43509, 34811), tuple(58769, 96326), tuple(47885, 53134), tuple(85917, 57373), tuple(64717, 50457), tuple(91239, 92881), tuple(76074, 79095), tuple(59275, 17799), tuple(75883, 62491), tuple(39406, 78272), tuple(70235, 10333), tuple(42309, 18408), tuple(53739, 27090), tuple(98800, 48751), tuple(99156, 65930), tuple(6271, 73084), tuple(83758, 55709), tuple(76940, 71591), tuple(37834, 27418), tuple(46486, 84091), tuple(82677, 5668), tuple(55483, 14400), tuple(64749, 41246), tuple(56980, 81320), tuple(46656, 22155), tuple(85260, 3342), tuple(56103, 57517), tuple(15434, 77526), tuple(90927, 99005), tuple(30948, 35441), tuple(75700, 35428), tuple(46759, 50091), tuple(58497, 88465), tuple(4893, 48180), tuple(69671, 63922), tuple(53917, 42248), tuple(49692, 75520), tuple(70709, 69868), tuple(54172, 66609), tuple(61142, 39487), tuple(70390, 96503), tuple(70529, 96890), tuple(50848, 54706), tuple(62574, 78585), tuple(40976, 40546), tuple(61448, 25487), tuple(58813, 79694), tuple(7978, 46692), tuple(84810, 47407), tuple(93301, 86788), tuple(63513, 40417), tuple(50816, 14830), tuple(40051, 22510), tuple(58231, 10222), tuple(22087, 58099), tuple(9757, 76220), tuple(75890, 86576), tuple(78978, 41357), tuple(93283, 24850), tuple(97099, 31675), tuple(73642, 95617), tuple(12154, 57246), tuple(67695, 45009), tuple(24512, 19561), tuple(32912, 57975), tuple(67101, 86402), tuple(97078, 61699), tuple(35404, 84433), tuple(18387, 5574), tuple(1180, 56954), tuple(31887, 11863), tuple(35632, 74282), tuple(97946, 71382), tuple(6358, 42197), tuple(3005, 63694), tuple(33955, 21482), tuple(81930, 4333), tuple(91114, 65927), tuple(47204, 48539), tuple(79942, 34686), tuple(77140, 46671), tuple(24959, 43593), tuple(26774, 12024), tuple(17931, 38033), tuple(18367, 18250), tuple(40538, 12655), tuple(10024, 2337), tuple(13012, 93366), tuple(33214, 99392), tuple(48339, 83815), tuple(2573, 98741), tuple(82426, 99315), tuple(29161, 8227), tuple(75276, 43314), tuple(11764, 85873), tuple(67647, 12433), tuple(31911, 90471), tuple(9087, 22041), tuple(10617, 3373), tuple(82133, 44117), tuple(31131, 3256), tuple(99076, 13086), tuple(96657, 56552), tuple(23455, 55109), tuple(5669, 90191), tuple(63460, 25790), tuple(85510, 22302), tuple(12906, 98397), tuple(18329, 44604), tuple(15748, 14050), tuple(21155, 62893), tuple(37100, 83871), tuple(25674, 92250), tuple(53171, 44750), tuple(46127, 54563), tuple(44166, 66056), tuple(64908, 74534), tuple(78505, 79266), tuple(93470, 55884), tuple(11989, 62985), tuple(37465, 50339), tuple(22878, 79000), tuple(95605, 98821), tuple(99575, 49974), tuple(41632, 45612), tuple(12260, 36028), tuple(50671, 19437), tuple(91453, 49879), tuple(12875, 83736), tuple(64102, 71173), tuple(48782, 46491), tuple(83745, 47638), tuple(88148, 76992), tuple(48165, 43667), tuple(92415, 18463), tuple(21414, 88902), tuple(78393, 87130), tuple(98155, 18890), tuple(58021, 92700), tuple(44621, 68966), tuple(7039, 68126), tuple(56673, 25907), tuple(33837, 57344), tuple(87382, 7033), tuple(67819, 29142), tuple(15461, 61937), tuple(5731, 90942), tuple(95838, 74174), tuple(82453, 30836), tuple(77643, 4537), tuple(70433, 44347), tuple(31774, 69412), tuple(72181, 53595), tuple(92692, 68594), tuple(18251, 47790), tuple(58848, 6565), tuple(1826, 80845), tuple(44441, 73811), tuple(16752, 29291), tuple(96792, 64536), tuple(18171, 37623), tuple(55235, 61816), tuple(20040, 83863), tuple(32432, 85684), tuple(4782, 77614), tuple(63342, 59121), tuple(38926, 85577), tuple(84429, 6450), tuple(95889, 92209), tuple(79472, 39518), tuple(30545, 68613), tuple(16797, 18913),                   
+    tuple(32207, 12383), tuple(18946, 80847), tuple(26629, 99576), tuple(23663, 33753), tuple(78661, 43289), tuple(42971, 85652), tuple(13148, 37633), tuple(7460, 31621), tuple(7106, 19344), tuple(56623, 40597), tuple(3931, 46383), tuple(40928, 80864), tuple(54411, 42893), tuple(97994, 37208), tuple(98704, 34056), tuple(28221, 65071), tuple(17035, 74621), tuple(44980, 99037), tuple(74685, 40941), tuple(51689, 87959), tuple(1603, 88894), tuple(58816, 80911), tuple(6600, 88186), tuple(51598, 56572), tuple(94570, 53971), tuple(36829, 22411), tuple(78272, 19485), tuple(27782, 91187), tuple(50738, 34908), tuple(77246, 37199), tuple(54696, 25448), tuple(22518, 20075), tuple(93517, 9215), tuple(63893, 61738), tuple(1803, 66542), tuple(8740, 44384), tuple(50214, 2536), tuple(82978, 22366), tuple(30379, 1906), tuple(69739, 14688), tuple(32367, 37176), tuple(94639, 5870), tuple(28089, 44553), tuple(23425, 12581), tuple(55612, 25746), tuple(10872, 85235), tuple(78490, 47300), tuple(53808, 99715), tuple(73003, 81707), tuple(69544, 44704), tuple(49921, 45937), tuple(53055, 64486), tuple(29788, 41235), tuple(66977, 32399), tuple(14272, 19156), tuple(52628, 43512), tuple(84512, 95549), tuple(37407, 73000), tuple(97454, 5645), tuple(94560, 22177), tuple(43121, 24751), tuple(16392, 71632), tuple(57061, 95049), tuple(78509, 12622), tuple(19152, 31950), tuple(60772, 58980), tuple(80874, 81688), tuple(57277, 94240), tuple(72106, 83377), tuple(96685, 38772), tuple(67254, 25148), tuple(55927, 21049), tuple(60288, 62456), tuple(70931, 77751), tuple(79197, 16179), tuple(3655, 47431), tuple(46830, 73545), tuple(45050, 41379), tuple(27458, 17406), tuple(39099, 99237), tuple(67490, 80382), tuple(62723, 79115), tuple(8353, 32032), tuple(23488, 12738), tuple(4013, 67892), tuple(26464, 50462), tuple(35943, 94375), tuple(44186, 34987), tuple(60927, 88755), tuple(8465, 63630), tuple(66062, 34368), tuple(88036, 58046), tuple(58249, 81975), tuple(18237, 47105), tuple(6733, 82935), tuple(78749, 39033), tuple(15131, 26574), tuple(33524, 8929), tuple(41839, 16312), tuple(55673, 27094), tuple(49538, 11713), tuple(88371, 69776), tuple(94252, 13464), tuple(5832, 84375), tuple(89357, 64815), tuple(46801, 11748), tuple(30666, 81254), tuple(16789, 10599), tuple(42935, 98646), tuple(66143, 20772), tuple(44556, 23422), tuple(46018, 16312), tuple(22259, 77171), tuple(56983, 86832), tuple(49921, 22125), tuple(92296, 45486), tuple(69764, 34023), tuple(9637, 96817), tuple(51206, 30615), tuple(10348, 92983), tuple(14472, 99323), tuple(40262, 97192), tuple(2191, 68285), tuple(22924, 25679), tuple(5067, 66212), tuple(69487, 49838), tuple(20052, 16120), tuple(95935, 71293), tuple(1776, 51796), tuple(23090, 30667), tuple(52957, 44078), tuple(91342, 24546), tuple(50425, 89005), tuple(53426, 47583), tuple(6584, 10139), tuple(3118, 13516), tuple(55369, 99320), tuple(63349, 89873), tuple(64571, 74984), tuple(26517, 2840), tuple(33325, 27702), tuple(43660, 87008), tuple(25645, 63104), tuple(26144, 93808), tuple(38030, 8593), tuple(46594, 22518), tuple(17472, 60358), tuple(23471, 75904), tuple(64653, 25665), tuple(58930, 2800), tuple(9714, 21659), tuple(90877, 15172), tuple(24169, 33165), tuple(40301, 28982), tuple(5835, 58106), tuple(47425, 55922), tuple(85182, 8833), tuple(54791, 76061), tuple(43334, 95233), tuple(88895, 11611), tuple(67974, 99700), tuple(42359, 7619), tuple(46091, 3188), tuple(96126, 1150), tuple(67300, 70263), tuple(15504, 6792), tuple(43488, 51128), tuple(59882, 82061), tuple(53674, 82213), tuple(13942, 71867), tuple(37229, 44172), tuple(8234, 10116), tuple(63955, 93663), tuple(90556, 81422), tuple(36156, 23916), tuple(80004, 32883), tuple(97483, 91439), tuple(40380, 75895), tuple(49030, 13388), tuple(10112, 23706), tuple(12693, 54634), tuple(89114, 44239), tuple(79449, 97096), tuple(93945, 17715), tuple(84610, 91409), tuple(77676, 32755), tuple(96528, 43811), tuple(32771, 17368), tuple(72726, 51584), tuple(68373, 27912), tuple(13120, 2918), tuple(32440, 89244), tuple(94188, 42530), tuple(47136, 16569), tuple(38629, 72378), tuple(6704, 33393), tuple(29123, 2559), tuple(4782, 19801), tuple(67017, 24504), tuple(10924, 38797), tuple(8704, 22146), tuple(32103, 77336), tuple(38053, 7912), tuple(6562, 22610), tuple(27942, 63645), tuple(40426, 37003), tuple(21523, 64033), tuple(46299, 23083), tuple(48752, 46938), tuple(28350, 22135), tuple(14308, 14980), tuple(14573, 24398), tuple(7228, 37742), tuple(82025, 86225), tuple(53716, 36196), tuple(81985, 16387), tuple(57584, 81974), tuple(99131, 7574), tuple(62847, 67483), tuple(86114, 25787), tuple(53211, 78386), tuple(80778, 49571), tuple(32747, 39211), tuple(71223, 56413), tuple(60888, 54163), tuple(7192, 51136), tuple(53334, 59228), tuple(4421, 66662), tuple(33413, 84705), tuple(56666, 78956), tuple(61801, 42678), tuple(43053, 77774), tuple(63820, 28596), tuple(1077, 97015), tuple(64021, 64781), tuple(92706, 3502), tuple(10677, 85713), tuple(25226, 89936), tuple(72837, 6353), tuple(48761, 89256), tuple(65947, 66655), tuple(72098, 73523), tuple(90795, 85045), tuple(55030, 92320), tuple(55194, 86101), tuple(10745, 5734), tuple(88677, 87133), tuple(73661, 34366), tuple(45949, 27357), tuple(88662, 12417), tuple(8489, 13536), tuple(27549, 4543), tuple(92939, 3478), tuple(54350, 80071), tuple(18846, 12230), tuple(44026, 16272), tuple(61412, 29030), tuple(19174, 95986), tuple(95690, 96752), tuple(89204, 59178), tuple(88740, 16634), tuple(86216, 73138), tuple(78274, 75895), tuple(33616, 9671), tuple(34033, 95200), tuple(34068, 66630), tuple(86998, 11248), tuple(33926, 18414), tuple(70477, 34726), tuple(78159, 51516), tuple(39498, 51001), tuple(8129, 45722), tuple(80034, 74923), tuple(72313, 14607), tuple(24587, 66307), tuple(1705, 17417), tuple(72039, 30982), tuple(38633, 26195), tuple(28199, 39357), tuple(38581, 11807), tuple(86457, 96618), tuple(26962, 65955), tuple(91876, 59903), tuple(73754, 98220), tuple(52133, 25146), tuple(66110, 69603), tuple(1793, 33205), tuple(15034, 44701), tuple(51124, 76916), tuple(39534, 36662), tuple(25979, 69668), tuple(57384, 67311), tuple(18545, 60762), tuple(19046, 92399), tuple(38249, 4653), tuple(72527, 59270), tuple(33966, 37148), tuple(27590, 117), tuple(70374, 4742), tuple(16192, 75527), tuple(80174, 75518), tuple(48577, 98517), tuple(94414, 14445), tuple(67138, 13404), tuple(92294, 29477), tuple(20990, 61280), tuple(6082, 29420), tuple(43509, 34811), tuple(58769, 96326), tuple(47885, 53134), tuple(85917, 57373), tuple(64717, 50457), tuple(91239, 92881), tuple(76074, 79095), tuple(59275, 17799), tuple(75883, 62491), tuple(39406, 78272), tuple(70235, 10333), tuple(42309, 18408), tuple(53739, 27090), tuple(98800, 48751), tuple(99156, 65930), tuple(6271, 73084), tuple(83758, 55709), tuple(76940, 71591), tuple(37834, 27418), tuple(46486, 84091), tuple(82677, 5668), tuple(55483, 14400), tuple(64749, 41246), tuple(56980, 81320), tuple(46656, 22155), tuple(85260, 3342), tuple(56103, 57517), tuple(15434, 77526), tuple(90927, 99005), tuple(30948, 35441), tuple(75700, 35428), tuple(46759, 50091), tuple(58497, 88465), tuple(4893, 48180), tuple(69671, 63922), tuple(53917, 42248), tuple(49692, 75520), tuple(70709, 69868), tuple(54172, 66609), tuple(61142, 39487), tuple(70390, 96503), tuple(70529, 96890), tuple(50848, 54706), tuple(62574, 78585), tuple(40976, 40546), tuple(61448, 25487), tuple(58813, 79694), tuple(7978, 46692), tuple(84810, 47407), tuple(93301, 86788), tuple(63513, 40417), tuple(50816, 14830), tuple(40051, 22510), tuple(58231, 10222), tuple(22087, 58099), tuple(9757, 76220), tuple(75890, 86576), tuple(78978, 41357), tuple(93283, 24850), tuple(97099, 31675), tuple(73642, 95617), tuple(12154, 57246), tuple(67695, 45009), tuple(24512, 19561), tuple(32912, 57975), tuple(67101, 86402), tuple(97078, 61699), tuple(35404, 84433), tuple(18387, 5574), tuple(1180, 56954), tuple(31887, 11863), tuple(35632, 74282), tuple(97946, 71382), tuple(6358, 42197), tuple(3005, 63694), tuple(33955, 21482), tuple(81930, 4333), tuple(91114, 65927), tuple(47204, 48539), tuple(79942, 34686), tuple(77140, 46671), tuple(24959, 43593), tuple(26774, 12024), tuple(17931, 38033), tuple(18367, 18250), tuple(40538, 12655), tuple(10024, 2337), tuple(13012, 93366), tuple(33214, 99392), tuple(48339, 83815), tuple(2573, 98741), tuple(82426, 99315), tuple(29161, 8227), tuple(75276, 43314), tuple(11764, 85873), tuple(67647, 12433), tuple(31911, 90471), tuple(9087, 22041), tuple(10617, 3373), tuple(82133, 44117), tuple(31131, 3256), tuple(99076, 13086), tuple(96657, 56552), tuple(23455, 55109), tuple(5669, 90191), tuple(63460, 25790), tuple(85510, 22302), tuple(12906, 98397), tuple(18329, 44604), tuple(15748, 14050), tuple(21155, 62893), tuple(37100, 83871), tuple(25674, 92250), tuple(53171, 44750), tuple(46127, 54563), tuple(44166, 66056), tuple(64908, 74534), tuple(78505, 79266), tuple(93470, 55884), tuple(11989, 62985), tuple(37465, 50339), tuple(22878, 79000), tuple(95605, 98821), tuple(99575, 49974), tuple(41632, 45612), tuple(12260, 36028), tuple(50671, 19437), tuple(91453, 49879), tuple(12875, 83736), tuple(64102, 71173), tuple(48782, 46491), tuple(83745, 47638), tuple(88148, 76992), tuple(48165, 43667), tuple(92415, 18463), tuple(21414, 88902), tuple(78393, 87130), tuple(98155, 18890), tuple(58021, 92700), tuple(44621, 68966), tuple(7039, 68126), tuple(56673, 25907), tuple(33837, 57344), tuple(87382, 7033), tuple(67819, 29142), tuple(15461, 61937), tuple(5731, 90942), tuple(95838, 74174), tuple(82453, 30836), tuple(77643, 4537), tuple(70433, 44347), tuple(31774, 69412), tuple(72181, 53595), tuple(92692, 68594), tuple(18251, 47790), tuple(58848, 6565), tuple(1826, 80845), tuple(44441, 73811), tuple(16752, 29291), tuple(96792, 64536), tuple(18171, 37623), tuple(55235, 61816), tuple(20040, 83863), tuple(32432, 85684), tuple(4782, 77614), tuple(63342, 59121), tuple(38926, 85577), tuple(84429, 6450), tuple(95889, 92209), tuple(79472, 39518), tuple(30545, 68613), tuple(16797, 18913),
     tuple(57243, 45824), tuple(8263, 41386), tuple(44982, 25137), tuple(51794, 44064), tuple(40504, 59817), tuple(11905, 14718), tuple(68061, 89924), tuple(43733, 93778), tuple(16215, 98598), tuple(84708, 29188), tuple(63541, 86310), tuple(44070, 14118), tuple(289, 75590), tuple(45870, 49980), tuple(18753, 17336), tuple(24732, 68239), tuple(27871, 52742), tuple(14696, 68693), tuple(99672, 72079), tuple(71245, 39241), tuple(67389, 16601), tuple(21752, 72806), tuple(96913, 30350), tuple(54185, 84992), tuple(57931, 11103), tuple(48704, 71007), tuple(99423, 36848), tuple(41315, 42065), tuple(87326, 72929), tuple(25384, 89587), tuple(59014, 60053), tuple(62267, 54542), tuple(12610, 32715), tuple(68975, 19985), tuple(44486, 69639), tuple(82302, 6338), tuple(63215, 87639), tuple(96904, 81511), tuple(69636, 10922), tuple(88663, 59485), tuple(59135, 3754), tuple(75988, 60625), tuple(64120, 45694), tuple(70324, 80636), tuple(15785, 77984), tuple(51352, 57485), tuple(2805, 39888), tuple(74622, 13408), tuple(20818, 1699), tuple(52553, 75450), tuple(10931, 27164), tuple(25541, 66990), tuple(40600, 10237), tuple(37780, 18746), tuple(58451, 29777), tuple(99485, 87814), tuple(35490, 54578), tuple(27880, 7151), tuple(5621, 11448), tuple(16276, 60088), tuple(80061, 79868), tuple(79495, 85729), tuple(5786, 28078), tuple(7505, 68947), tuple(3754, 73982), tuple(83095, 13882), tuple(13625, 48305), tuple(65566, 46143), tuple(28436, 47606), tuple(41318, 73446), tuple(70295, 17014), tuple(70052, 53076), tuple(75069, 22060), tuple(38749, 80432), tuple(5609, 18240), tuple(73251, 78035), tuple(44085, 34842), tuple(64413, 19036), tuple(76628, 13364), tuple(77620, 44200), tuple(51408, 58569), tuple(63273, 12356), tuple(73860, 29016), tuple(1540, 65413), tuple(4154, 73503), tuple(8522, 57385), tuple(24021, 60714), tuple(53183, 28103), tuple(9298, 20623), tuple(35572, 72750), tuple(20062, 88412), tuple(53090, 54056), tuple(75500, 24693), tuple(63463, 23751), tuple(17602, 18766), tuple(36512, 54793), tuple(83806, 80218), tuple(13965, 576), tuple(18995, 7730), tuple(28727, 8773), tuple(90604, 21980), tuple(89414, 40461), tuple(61108, 29240), tuple(30381, 96560), tuple(32285, 26545), tuple(38149, 85647), tuple(51471, 24524), tuple(42153, 32188), tuple(12747, 84522), tuple(96507, 99501), tuple(39908, 54706), tuple(37524, 46449), tuple(98286, 72361), tuple(32855, 96561), tuple(67644, 50836), tuple(73095, 33548), tuple(3239, 57909), tuple(59527, 51138), tuple(61862, 15544), tuple(84048, 4884), tuple(17440, 53732), tuple(3534, 42048), tuple(66894, 37347), tuple(34323, 11139), tuple(64183, 38919), tuple(87672, 76883), tuple(99127, 44364), tuple(41417, 86134), tuple(51181, 7902), tuple(55456, 98977), tuple(52953, 51347), tuple(54164, 45398), tuple(36894, 60364), tuple(16911, 44245), tuple(92377, 11522), tuple(22925, 43609), tuple(52979, 70952), tuple(98059, 42838), tuple(18178, 76534), tuple(8036, 92888), tuple(88589, 19468), tuple(35901, 19860), tuple(65686, 87008), tuple(32387, 43037), tuple(87245, 20229), tuple(316, 46084), tuple(4111, 2785), tuple(89736, 56537), tuple(5724, 30008), tuple(82292, 28294), tuple(38892, 21915), tuple(51202, 50642), tuple(99865, 33343),
-    tuple(95804, 70967), tuple(12070, 43458), tuple(6220, 56015), tuple(74329, 56204), tuple(21399, 75467), tuple(88203, 43858), tuple(38704, 47055), tuple(19362, 60219), tuple(14634, 72618), tuple(41448, 6543), tuple(87651, 18534), tuple(34327, 75539), tuple(3541, 25818), tuple(20404, 80339), tuple(44944, 55964), tuple(45651, 49213), tuple(65846, 85412), tuple(51675, 22001), tuple(74879, 97711), tuple(32455, 26455), tuple(5056, 69437), tuple(46238, 41978), tuple(11156, 81627), tuple(40029, 70165), tuple(87185, 7409), tuple(53171, 90875), tuple(38789, 40512), tuple(61386, 8745), tuple(81736, 4812), tuple(71196, 92427), tuple(13554, 32085), tuple(41154, 59222), tuple(58043, 66198), tuple(21838, 40563), tuple(33897, 65211), tuple(28903, 30143), tuple(21409, 47493), tuple(26059, 95417), tuple(73900, 48368), tuple(18774, 30490), tuple(73012, 44125), tuple(58456, 61155), tuple(60554, 28996), tuple(8827, 36373), tuple(30404, 97981), tuple(30881, 46098), tuple(13258, 80907), tuple(72012, 13691), tuple(23651, 30968), tuple(2969, 50097), tuple(33733, 79191), tuple(10223, 90306), tuple(98149, 11670), tuple(45547, 25317), tuple(77139, 63654), tuple(55598, 73329), tuple(22887, 43966), tuple(73233, 39855), tuple(71344, 61217), tuple(4060, 79956), tuple(73925, 30838), tuple(7635, 14926), tuple(53804, 37839), tuple(69335, 59926), tuple(34807, 32895), tuple(78509, 73239), tuple(36494, 91580), tuple(66250, 40428), tuple(92495, 92721), tuple(13503, 8974), tuple(1533, 7446), tuple(84074, 88477), tuple(17188, 48916), tuple(88681, 88849), tuple(96162, 65641), tuple(71517, 35507), tuple(53803, 30244), tuple(54097, 55628), tuple(58528, 34100), tuple(15910, 46623), tuple(89311, 69918), tuple(34706, 33424), tuple(52525, 7174), tuple(36409, 22829), tuple(16575, 59807), tuple(26247, 36935), tuple(58999, 98875), tuple(73380, 90788), tuple(11800, 64690), tuple(71312, 64235), tuple(35708, 76049), tuple(65621, 59223), tuple(94220, 15399), tuple(32073, 46262), tuple(38017, 57787), tuple(85453, 57087), tuple(57354, 18076), tuple(15620, 9885), tuple(54585, 11470), tuple(86532, 11214), tuple(90392, 36339), tuple(41222, 63156), tuple(41956, 46957), tuple(11257, 59047), tuple(7904, 91165), tuple(33757, 89829), tuple(36561, 76484), tuple(24535, 70034), tuple(58932, 52035), tuple(44009, 86647), tuple(21710, 66730), tuple(19750, 19959), tuple(12488, 23120), tuple(3857, 92163), tuple(1605, 57740), tuple(9460, 45243), tuple(63737, 91447), tuple(97379, 73859), tuple(24109, 75972), tuple(88375, 99620), tuple(11175, 97854), tuple(78504, 60445), tuple(63669, 89304), tuple(37661, 27971), tuple(56797, 37186), tuple(49704, 37165), tuple(58568, 72097), tuple(66051, 28778), tuple(37075, 75947), tuple(38543, 51647), tuple(75077, 39030), tuple(77878, 37117), tuple(75140, 60743), tuple(18900, 6472), tuple(48578, 88913), tuple(26467, 92904), tuple(55006, 10313), tuple(20860, 923), tuple(96408, 80209), tuple(68515, 29809), tuple(11686, 36655), tuple(37673, 68001), tuple(71190, 98343), tuple(9866, 26660), tuple(52912, 14692), tuple(71503, 17364), tuple(22754, 80041), tuple(20097, 45934), tuple(85767, 40813), tuple(8326, 21813), tuple(71122, 42467), tuple(11149, 52952), tuple(99239, 73844), tuple(46925, 31154), tuple(4219, 6051), tuple(4349, 18054), tuple(57355, 88606), tuple(79627, 89547), tuple(35391, 52278), tuple(7921, 5095), tuple(84435, 58925), tuple(23209, 80993), tuple(6392, 64395), tuple(26778, 62624), tuple(4484, 76470), tuple(85595, 21682), tuple(43801, 57907), tuple(21360, 55981), tuple(90765, 19734), tuple(59965, 32734), tuple(21698, 54400), tuple(3202, 51301), tuple(50398, 27389), tuple(11195, 59086), tuple(80810, 68107), tuple(80246, 86109), tuple(8264, 67640), tuple(45129, 49779), tuple(3741, 39591), tuple(92596, 44524), tuple(61323, 7060), tuple(85650, 4974), tuple(57933, 64074), tuple(82675, 91822), tuple(88157, 69528), tuple(15295, 64351), tuple(38370, 6787), tuple(32886, 73349), tuple(64461, 91272), tuple(61885, 12074), tuple(66868, 69079), tuple(97050, 88063), tuple(17423, 65097), tuple(98155, 52111), tuple(30406, 53315), tuple(77111, 31673), tuple(88833, 29556), tuple(17834, 49818), tuple(93996, 77258), tuple(27859, 8227), tuple(50422, 99996), tuple(72852, 25549), tuple(50960, 30223), tuple(26847, 86597), tuple(57065, 75358), tuple(17500, 59618), tuple(71963, 7160), tuple(82261, 26132), tuple(57310, 33759), tuple(74850, 36130), tuple(80679, 12358), tuple(25146, 69695), tuple(51169, 36809), tuple(34345, 42666), tuple(25529, 79964), tuple(16957, 2056), tuple(11384, 73397), tuple(87339, 16821), tuple(36838, 38944), tuple(33609, 29887), tuple(81930, 27309), tuple(85427, 98289), tuple(56553, 34578), tuple(28022, 64719), tuple(48137, 50016), tuple(64006, 99858), tuple(96683, 2581), tuple(64215, 63294), tuple(80480, 59268), tuple(37552, 74897), tuple(68924, 33400), tuple(12320, 3485), tuple(46342, 47198), tuple(10486, 84214), tuple(10637, 37979), tuple(82102, 8674), tuple(45272, 18937), tuple(85813, 9828), tuple(42952, 81515), tuple(36109, 60929), tuple(49908, 81308), tuple(77480, 79720), tuple(47309, 93694), tuple(92133, 64187), tuple(59797, 76215), tuple(57715, 88948), tuple(34251, 75387), tuple(98032, 9443), tuple(82908, 50870), tuple(36667, 90760), tuple(11497, 70446), tuple(55263, 9996), tuple(95530, 15624), tuple(61374, 49255), tuple(47466, 11077), tuple(42810, 44265), tuple(78332, 84057), tuple(95033, 41926), tuple(24384, 51662), tuple(47128, 47040), tuple(14895, 37303), tuple(6995, 23571), tuple(30773, 73534), tuple(69169, 94373), tuple(29022, 92890), tuple(46660, 69109), tuple(39814, 75285), tuple(57314, 90534), tuple(63237, 59127), tuple(69470, 9152), tuple(71565, 81652), tuple(42371, 77809), tuple(66206, 24490), tuple(53101, 69390), tuple(56648, 69898), tuple(25813, 5835), tuple(82233, 2630), tuple(8386, 52693), tuple(85310, 85937), tuple(87403, 83920), tuple(290, 80083), tuple(9562, 46994), tuple(15806, 73988), tuple(54094, 2149), tuple(6324, 79545), tuple(97932, 65717), tuple(33267, 33685), tuple(49599, 23793), tuple(97471, 77574), tuple(36005, 7441), tuple(80654, 94174), tuple(63236, 7016), tuple(93694, 87168), tuple(14169, 63653), tuple(79452, 21186), tuple(6879, 93530), tuple(44992, 4491), tuple(55716, 78989), tuple(81229, 83954), tuple(63203, 84403), tuple(50575, 77597), tuple(97412, 87338), tuple(26386, 54156), tuple(35465, 54200), tuple(42993, 1096), tuple(19501, 87529), tuple(23563, 89524), tuple(85276, 24678), tuple(28839, 73007), tuple(54050, 80260), tuple(41862, 45747), tuple(45532, 4796), tuple(59766, 78513), tuple(42873, 27842), tuple(14066, 14788), tuple(42226, 19459), tuple(66168, 97420), tuple(73275, 78209), tuple(755, 75149), tuple(10424, 17589), tuple(59752, 5362), tuple(16612, 48631), tuple(97558, 55845), tuple(77602, 94389), tuple(17033, 91672), tuple(81010, 47646), tuple(8792, 74197), tuple(62409, 86387), tuple(23940, 73202), tuple(74326, 93461), tuple(99700, 28417), tuple(12373, 31471), tuple(19780, 82462), tuple(84100, 66414), tuple(33739, 27879), tuple(65869, 19590), tuple(53768, 80619), tuple(7632, 72890), tuple(13016, 2777), tuple(28709, 51472), tuple(64803, 48135), tuple(2016, 6998), tuple(32601, 51082), tuple(58866, 23304), tuple(87096, 82571), tuple(54567, 12251), tuple(60574, 64548), tuple(32946, 20929), tuple(95087, 91320), tuple(32702, 51680), tuple(71934, 62082), tuple(7598, 45620), tuple(25713, 83796), tuple(22509, 59083), tuple(99368, 66914), tuple(22928, 984), tuple(74309, 35226), tuple(38296, 93051), tuple(28362, 36277), tuple(81873, 9185), tuple(79122, 50838), tuple(31448, 35443), tuple(25046, 97283), tuple(51849, 76572), tuple(83722, 31233), tuple(75316, 70515), tuple(67359, 69686), tuple(80368, 87585), tuple(51714, 92098), tuple(5772, 72330), tuple(96652, 97645), tuple(10531, 86149), tuple(4378, 65728), tuple(80551, 93867), tuple(46660, 8809), tuple(83039, 80501), tuple(38249, 12848), tuple(48679, 54119), tuple(77295, 29795), tuple(65702, 69250), tuple(87195, 3131), tuple(26611, 29868), tuple(88164, 4187), tuple(42078, 63303), tuple(46501, 95311), tuple(7063, 38185), tuple(94346, 35287), tuple(75324, 16799), tuple(49000, 44453), tuple(309, 54608), tuple(16024, 77175), tuple(75300, 29332), tuple(45928, 81737), tuple(28049, 97890), tuple(87565, 86417), tuple(25253, 22620), tuple(77837, 33503), tuple(19857, 67728), tuple(6316, 72927), tuple(33001, 15626), tuple(79133, 25621), tuple(23468, 29945), tuple(10889, 13574), tuple(84771, 66067), tuple(22974, 59756), tuple(25169, 32080), tuple(2763, 69489), tuple(95845, 1960), tuple(8989, 53327), tuple(68781, 39147), tuple(90201, 88456), tuple(59526, 93326), tuple(52344, 75391), tuple(85184, 31369), tuple(94710, 93662), tuple(54889, 49149), tuple(29952, 55792), tuple(33265, 8947), tuple(44096, 26042), tuple(56712, 53763), tuple(55427, 14296), tuple(8731, 11564), tuple(62987, 83), tuple(53575, 58165), tuple(63627, 82316), tuple(50117, 30149), tuple(20026, 57072), tuple(83807, 29051), tuple(77431, 60892), tuple(89918, 41830), tuple(80530, 98080), tuple(98699, 33390), tuple(86743, 62505), tuple(22963, 23417), tuple(76581, 89370), tuple(3725, 51427), tuple(26360, 93305), tuple(65141, 27209), tuple(7445, 52852), tuple(56158, 4399), tuple(87204, 7475), tuple(82189, 11735), tuple(62875, 99644), tuple(94415, 59283), tuple(79059, 42636), tuple(27095, 24606), tuple(22228, 41626), tuple(15766, 33419), tuple(36090, 64191), tuple(33858, 28804), tuple(40697, 70965), tuple(1895, 48621), tuple(55078, 8926), tuple(84940, 99519), tuple(50750, 83936), tuple(63108, 59256), tuple(88855, 52935), tuple(62544, 38446), tuple(76256, 21365), tuple(86161, 70307), tuple(9247, 80836), tuple(91204, 88378), tuple(88362, 91302), tuple(69563, 58603), tuple(76583, 5971), tuple(59824, 38885), tuple(40338, 61292), tuple(99653, 64086), tuple(52198, 77598), tuple(19667, 6), tuple(30378, 41690), tuple(5130, 21465), tuple(32633, 80628), tuple(69869, 59610), tuple(30453, 13017), tuple(59836, 37885), tuple(58131, 42797), tuple(3428, 5984), tuple(17299, 13377), tuple(68491, 26265),                
+    tuple(95804, 70967), tuple(12070, 43458), tuple(6220, 56015), tuple(74329, 56204), tuple(21399, 75467), tuple(88203, 43858), tuple(38704, 47055), tuple(19362, 60219), tuple(14634, 72618), tuple(41448, 6543), tuple(87651, 18534), tuple(34327, 75539), tuple(3541, 25818), tuple(20404, 80339), tuple(44944, 55964), tuple(45651, 49213), tuple(65846, 85412), tuple(51675, 22001), tuple(74879, 97711), tuple(32455, 26455), tuple(5056, 69437), tuple(46238, 41978), tuple(11156, 81627), tuple(40029, 70165), tuple(87185, 7409), tuple(53171, 90875), tuple(38789, 40512), tuple(61386, 8745), tuple(81736, 4812), tuple(71196, 92427), tuple(13554, 32085), tuple(41154, 59222), tuple(58043, 66198), tuple(21838, 40563), tuple(33897, 65211), tuple(28903, 30143), tuple(21409, 47493), tuple(26059, 95417), tuple(73900, 48368), tuple(18774, 30490), tuple(73012, 44125), tuple(58456, 61155), tuple(60554, 28996), tuple(8827, 36373), tuple(30404, 97981), tuple(30881, 46098), tuple(13258, 80907), tuple(72012, 13691), tuple(23651, 30968), tuple(2969, 50097), tuple(33733, 79191), tuple(10223, 90306), tuple(98149, 11670), tuple(45547, 25317), tuple(77139, 63654), tuple(55598, 73329), tuple(22887, 43966), tuple(73233, 39855), tuple(71344, 61217), tuple(4060, 79956), tuple(73925, 30838), tuple(7635, 14926), tuple(53804, 37839), tuple(69335, 59926), tuple(34807, 32895), tuple(78509, 73239), tuple(36494, 91580), tuple(66250, 40428), tuple(92495, 92721), tuple(13503, 8974), tuple(1533, 7446), tuple(84074, 88477), tuple(17188, 48916), tuple(88681, 88849), tuple(96162, 65641), tuple(71517, 35507), tuple(53803, 30244), tuple(54097, 55628), tuple(58528, 34100), tuple(15910, 46623), tuple(89311, 69918), tuple(34706, 33424), tuple(52525, 7174), tuple(36409, 22829), tuple(16575, 59807), tuple(26247, 36935), tuple(58999, 98875), tuple(73380, 90788), tuple(11800, 64690), tuple(71312, 64235), tuple(35708, 76049), tuple(65621, 59223), tuple(94220, 15399), tuple(32073, 46262), tuple(38017, 57787), tuple(85453, 57087), tuple(57354, 18076), tuple(15620, 9885), tuple(54585, 11470), tuple(86532, 11214), tuple(90392, 36339), tuple(41222, 63156), tuple(41956, 46957), tuple(11257, 59047), tuple(7904, 91165), tuple(33757, 89829), tuple(36561, 76484), tuple(24535, 70034), tuple(58932, 52035), tuple(44009, 86647), tuple(21710, 66730), tuple(19750, 19959), tuple(12488, 23120), tuple(3857, 92163), tuple(1605, 57740), tuple(9460, 45243), tuple(63737, 91447), tuple(97379, 73859), tuple(24109, 75972), tuple(88375, 99620), tuple(11175, 97854), tuple(78504, 60445), tuple(63669, 89304), tuple(37661, 27971), tuple(56797, 37186), tuple(49704, 37165), tuple(58568, 72097), tuple(66051, 28778), tuple(37075, 75947), tuple(38543, 51647), tuple(75077, 39030), tuple(77878, 37117), tuple(75140, 60743), tuple(18900, 6472), tuple(48578, 88913), tuple(26467, 92904), tuple(55006, 10313), tuple(20860, 923), tuple(96408, 80209), tuple(68515, 29809), tuple(11686, 36655), tuple(37673, 68001), tuple(71190, 98343), tuple(9866, 26660), tuple(52912, 14692), tuple(71503, 17364), tuple(22754, 80041), tuple(20097, 45934), tuple(85767, 40813), tuple(8326, 21813), tuple(71122, 42467), tuple(11149, 52952), tuple(99239, 73844), tuple(46925, 31154), tuple(4219, 6051), tuple(4349, 18054), tuple(57355, 88606), tuple(79627, 89547), tuple(35391, 52278), tuple(7921, 5095), tuple(84435, 58925), tuple(23209, 80993), tuple(6392, 64395), tuple(26778, 62624), tuple(4484, 76470), tuple(85595, 21682), tuple(43801, 57907), tuple(21360, 55981), tuple(90765, 19734), tuple(59965, 32734), tuple(21698, 54400), tuple(3202, 51301), tuple(50398, 27389), tuple(11195, 59086), tuple(80810, 68107), tuple(80246, 86109), tuple(8264, 67640), tuple(45129, 49779), tuple(3741, 39591), tuple(92596, 44524), tuple(61323, 7060), tuple(85650, 4974), tuple(57933, 64074), tuple(82675, 91822), tuple(88157, 69528), tuple(15295, 64351), tuple(38370, 6787), tuple(32886, 73349), tuple(64461, 91272), tuple(61885, 12074), tuple(66868, 69079), tuple(97050, 88063), tuple(17423, 65097), tuple(98155, 52111), tuple(30406, 53315), tuple(77111, 31673), tuple(88833, 29556), tuple(17834, 49818), tuple(93996, 77258), tuple(27859, 8227), tuple(50422, 99996), tuple(72852, 25549), tuple(50960, 30223), tuple(26847, 86597), tuple(57065, 75358), tuple(17500, 59618), tuple(71963, 7160), tuple(82261, 26132), tuple(57310, 33759), tuple(74850, 36130), tuple(80679, 12358), tuple(25146, 69695), tuple(51169, 36809), tuple(34345, 42666), tuple(25529, 79964), tuple(16957, 2056), tuple(11384, 73397), tuple(87339, 16821), tuple(36838, 38944), tuple(33609, 29887), tuple(81930, 27309), tuple(85427, 98289), tuple(56553, 34578), tuple(28022, 64719), tuple(48137, 50016), tuple(64006, 99858), tuple(96683, 2581), tuple(64215, 63294), tuple(80480, 59268), tuple(37552, 74897), tuple(68924, 33400), tuple(12320, 3485), tuple(46342, 47198), tuple(10486, 84214), tuple(10637, 37979), tuple(82102, 8674), tuple(45272, 18937), tuple(85813, 9828), tuple(42952, 81515), tuple(36109, 60929), tuple(49908, 81308), tuple(77480, 79720), tuple(47309, 93694), tuple(92133, 64187), tuple(59797, 76215), tuple(57715, 88948), tuple(34251, 75387), tuple(98032, 9443), tuple(82908, 50870), tuple(36667, 90760), tuple(11497, 70446), tuple(55263, 9996), tuple(95530, 15624), tuple(61374, 49255), tuple(47466, 11077), tuple(42810, 44265), tuple(78332, 84057), tuple(95033, 41926), tuple(24384, 51662), tuple(47128, 47040), tuple(14895, 37303), tuple(6995, 23571), tuple(30773, 73534), tuple(69169, 94373), tuple(29022, 92890), tuple(46660, 69109), tuple(39814, 75285), tuple(57314, 90534), tuple(63237, 59127), tuple(69470, 9152), tuple(71565, 81652), tuple(42371, 77809), tuple(66206, 24490), tuple(53101, 69390), tuple(56648, 69898), tuple(25813, 5835), tuple(82233, 2630), tuple(8386, 52693), tuple(85310, 85937), tuple(87403, 83920), tuple(290, 80083), tuple(9562, 46994), tuple(15806, 73988), tuple(54094, 2149), tuple(6324, 79545), tuple(97932, 65717), tuple(33267, 33685), tuple(49599, 23793), tuple(97471, 77574), tuple(36005, 7441), tuple(80654, 94174), tuple(63236, 7016), tuple(93694, 87168), tuple(14169, 63653), tuple(79452, 21186), tuple(6879, 93530), tuple(44992, 4491), tuple(55716, 78989), tuple(81229, 83954), tuple(63203, 84403), tuple(50575, 77597), tuple(97412, 87338), tuple(26386, 54156), tuple(35465, 54200), tuple(42993, 1096), tuple(19501, 87529), tuple(23563, 89524), tuple(85276, 24678), tuple(28839, 73007), tuple(54050, 80260), tuple(41862, 45747), tuple(45532, 4796), tuple(59766, 78513), tuple(42873, 27842), tuple(14066, 14788), tuple(42226, 19459), tuple(66168, 97420), tuple(73275, 78209), tuple(755, 75149), tuple(10424, 17589), tuple(59752, 5362), tuple(16612, 48631), tuple(97558, 55845), tuple(77602, 94389), tuple(17033, 91672), tuple(81010, 47646), tuple(8792, 74197), tuple(62409, 86387), tuple(23940, 73202), tuple(74326, 93461), tuple(99700, 28417), tuple(12373, 31471), tuple(19780, 82462), tuple(84100, 66414), tuple(33739, 27879), tuple(65869, 19590), tuple(53768, 80619), tuple(7632, 72890), tuple(13016, 2777), tuple(28709, 51472), tuple(64803, 48135), tuple(2016, 6998), tuple(32601, 51082), tuple(58866, 23304), tuple(87096, 82571), tuple(54567, 12251), tuple(60574, 64548), tuple(32946, 20929), tuple(95087, 91320), tuple(32702, 51680), tuple(71934, 62082), tuple(7598, 45620), tuple(25713, 83796), tuple(22509, 59083), tuple(99368, 66914), tuple(22928, 984), tuple(74309, 35226), tuple(38296, 93051), tuple(28362, 36277), tuple(81873, 9185), tuple(79122, 50838), tuple(31448, 35443), tuple(25046, 97283), tuple(51849, 76572), tuple(83722, 31233), tuple(75316, 70515), tuple(67359, 69686), tuple(80368, 87585), tuple(51714, 92098), tuple(5772, 72330), tuple(96652, 97645), tuple(10531, 86149), tuple(4378, 65728), tuple(80551, 93867), tuple(46660, 8809), tuple(83039, 80501), tuple(38249, 12848), tuple(48679, 54119), tuple(77295, 29795), tuple(65702, 69250), tuple(87195, 3131), tuple(26611, 29868), tuple(88164, 4187), tuple(42078, 63303), tuple(46501, 95311), tuple(7063, 38185), tuple(94346, 35287), tuple(75324, 16799), tuple(49000, 44453), tuple(309, 54608), tuple(16024, 77175), tuple(75300, 29332), tuple(45928, 81737), tuple(28049, 97890), tuple(87565, 86417), tuple(25253, 22620), tuple(77837, 33503), tuple(19857, 67728), tuple(6316, 72927), tuple(33001, 15626), tuple(79133, 25621), tuple(23468, 29945), tuple(10889, 13574), tuple(84771, 66067), tuple(22974, 59756), tuple(25169, 32080), tuple(2763, 69489), tuple(95845, 1960), tuple(8989, 53327), tuple(68781, 39147), tuple(90201, 88456), tuple(59526, 93326), tuple(52344, 75391), tuple(85184, 31369), tuple(94710, 93662), tuple(54889, 49149), tuple(29952, 55792), tuple(33265, 8947), tuple(44096, 26042), tuple(56712, 53763), tuple(55427, 14296), tuple(8731, 11564), tuple(62987, 83), tuple(53575, 58165), tuple(63627, 82316), tuple(50117, 30149), tuple(20026, 57072), tuple(83807, 29051), tuple(77431, 60892), tuple(89918, 41830), tuple(80530, 98080), tuple(98699, 33390), tuple(86743, 62505), tuple(22963, 23417), tuple(76581, 89370), tuple(3725, 51427), tuple(26360, 93305), tuple(65141, 27209), tuple(7445, 52852), tuple(56158, 4399), tuple(87204, 7475), tuple(82189, 11735), tuple(62875, 99644), tuple(94415, 59283), tuple(79059, 42636), tuple(27095, 24606), tuple(22228, 41626), tuple(15766, 33419), tuple(36090, 64191), tuple(33858, 28804), tuple(40697, 70965), tuple(1895, 48621), tuple(55078, 8926), tuple(84940, 99519), tuple(50750, 83936), tuple(63108, 59256), tuple(88855, 52935), tuple(62544, 38446), tuple(76256, 21365), tuple(86161, 70307), tuple(9247, 80836), tuple(91204, 88378), tuple(88362, 91302), tuple(69563, 58603), tuple(76583, 5971), tuple(59824, 38885), tuple(40338, 61292), tuple(99653, 64086), tuple(52198, 77598), tuple(19667, 6), tuple(30378, 41690), tuple(5130, 21465), tuple(32633, 80628), tuple(69869, 59610), tuple(30453, 13017), tuple(59836, 37885), tuple(58131, 42797), tuple(3428, 5984), tuple(17299, 13377), tuple(68491, 26265),
     tuple(75600, 36301), tuple(79469, 65256), tuple(98438, 92022), tuple(40135, 69628), tuple(52373, 11613), tuple(12460, 96481), tuple(36740, 9873), tuple(92746, 96113), tuple(32532, 75810), tuple(45871, 37825), tuple(13323, 92457), tuple(11853, 716), tuple(59161, 91872), tuple(33609, 76950), tuple(50145, 9040), tuple(82818, 64780), tuple(92700, 31810), tuple(5745, 30311), tuple(19252, 34721), tuple(91678, 50602), tuple(48847, 98284), tuple(55640, 96281), tuple(60726, 42098), tuple(4494, 48219), tuple(61428, 76363), tuple(91534, 87454), tuple(73201, 9683), tuple(72379, 68604), tuple(30607, 71891), tuple(71963, 41250), tuple(17585, 79804), tuple(64529, 84544), tuple(44429, 46924), tuple(30658, 76431), tuple(18422, 23472), tuple(88171, 11830), tuple(66762, 7895), tuple(74476, 53181), tuple(15386, 51972), tuple(55536, 25039), tuple(68166, 15362), tuple(24986, 96477), tuple(88289, 76764), tuple(48193, 92905), tuple(95456, 25805), tuple(78131, 37308), tuple(32236, 81885), tuple(3083, 33218), tuple(29652, 41185), tuple(42417, 13339), tuple(71362, 33608), tuple(25475, 24287), tuple(20460, 82673), tuple(94769, 76462), tuple(12527, 82290), tuple(21183, 45096), tuple(20544, 30257), tuple(69721, 12886), tuple(4, 36149), tuple(23696, 29088), tuple(86144, 92852), tuple(66152, 22322), tuple(22307, 63335), tuple(25128, 35257), tuple(11046, 4279), tuple(32665, 25699), tuple(28784, 44818), tuple(59793, 40459), tuple(13846, 39333), tuple(59816, 7467), tuple(40106, 36228), tuple(13565, 33667), tuple(17482, 80138), tuple(37698, 95869), tuple(16491, 96398), tuple(53057, 48448), tuple(71592, 23507), tuple(98947, 62014), tuple(85328, 91232), tuple(94951, 11033), tuple(38509, 57252), tuple(70111, 63297), tuple(36914, 97310), tuple(86662, 26580), tuple(36754, 49831), tuple(35316, 42861), tuple(49326, 47462), tuple(47854, 49167), tuple(61206, 69078), tuple(67416, 3064), tuple(33631, 27193), tuple(56786, 41757), tuple(14000, 63627), tuple(98455, 72204), tuple(11796, 3153), tuple(49366, 6099), tuple(16114, 6729), tuple(59942, 41512), tuple(85308, 60723), tuple(60186, 8930), tuple(28450, 20028), tuple(54132, 40793), tuple(20190, 39153), tuple(91793, 59468), tuple(48855, 49249), tuple(3252, 88308), tuple(55024, 19544), tuple(47999, 98668), tuple(3625, 66538), tuple(27774, 17048), tuple(49182, 25298), tuple(10689, 72768), tuple(64034, 38635), tuple(23327, 65875), tuple(18376, 42416), tuple(15686, 35974), tuple(22283, 56738), tuple(14419, 36171), tuple(397, 11730), tuple(50136, 7806), tuple(37842, 47683), tuple(606, 5298), tuple(66652, 8471), tuple(23268, 88344), tuple(8181, 42348), tuple(30015, 82155), tuple(65670, 4409), tuple(29161, 1269), tuple(62267, 51181), tuple(38076, 3852), tuple(14048, 61904), tuple(6132, 3284), tuple(22486, 26772), tuple(76678, 2511), tuple(16212, 13228), tuple(51402, 46487), tuple(99360, 11669), tuple(36934, 58173), tuple(71427, 76232), tuple(14509, 22573), tuple(98403, 76905), tuple(24839, 32100), tuple(71097, 7056), tuple(47286, 70888), tuple(90192, 33568), tuple(38798, 54148), tuple(20350, 66499), tuple(93010, 48622), tuple(13510, 34716), tuple(92779, 14508), tuple(57010, 91250), tuple(25212, 10989), tuple(65459, 91132),
-    tuple(66251, 59146), tuple(28920, 29336), tuple(86273, 50897), tuple(81311, 53009), tuple(22278, 85352), tuple(54231, 26356), tuple(94250, 51117), tuple(21152, 38875), tuple(39286, 22339), tuple(10290, 37852), tuple(43426, 20385), tuple(13603, 2341), tuple(2314, 12288), tuple(48785, 80096), tuple(16762, 92809), tuple(1689, 16006), tuple(46828, 44433), tuple(58147, 68612), tuple(31702, 34921), tuple(23807, 72511), tuple(63437, 35834), tuple(40643, 62303), tuple(78198, 57748), tuple(11496, 43030), tuple(91150, 85333), tuple(91817, 95369), tuple(1792, 59975), tuple(14816, 41573), tuple(9355, 32450), tuple(77243, 5352), tuple(17681, 11128), tuple(69700, 89110), tuple(37695, 98303), tuple(23160, 29924), tuple(83829, 29122), tuple(13009, 81770), tuple(64481, 60303), tuple(6842, 78532), tuple(16282, 32405), tuple(14204, 67463), tuple(41795, 83324), tuple(98134, 38132), tuple(93686, 89418), tuple(83031, 18065), tuple(96431, 28312), tuple(15488, 90870), tuple(90914, 35142), tuple(96174, 98411), tuple(93075, 61533), tuple(47394, 30134), tuple(46309, 98014), tuple(8574, 38881), tuple(42376, 78153), tuple(45938, 95700), tuple(14026, 14059), tuple(94138, 70460), tuple(62882, 3321), tuple(52628, 25566), tuple(42145, 97919), tuple(57580, 8897), tuple(1766, 74887), tuple(68391, 51311), tuple(16485, 36095), tuple(55867, 988), tuple(34600, 46771), tuple(35786, 23210), tuple(78683, 62604), tuple(11002, 87427), tuple(29747, 6771), tuple(53803, 50526), tuple(52691, 75371), tuple(58028, 36198), tuple(98041, 28071), tuple(81822, 4121), tuple(90995, 93843), tuple(3709, 74313), tuple(23318, 28167), tuple(60162, 87145), tuple(53243, 31382), tuple(69762, 54059), tuple(25151, 95865), tuple(55550, 62947), tuple(45463, 8036), tuple(59949, 91675), tuple(55331, 79612), tuple(13806, 57517), tuple(41328, 94361), tuple(8388, 210), tuple(43458, 1327), tuple(16416, 50975), tuple(64370, 86524), tuple(97121, 65142), tuple(82878, 64545), tuple(58547, 33372), tuple(67494, 4130), tuple(59446, 79185), tuple(83812, 58833), tuple(32172, 93730), tuple(10095, 30319), tuple(94135, 92795), tuple(64893, 12870), tuple(14634, 70083), tuple(23344, 42836), tuple(19624, 29135), tuple(28755, 57738), tuple(58401, 49863), tuple(76809, 91787), tuple(51952, 33167), tuple(31717, 78538), tuple(64811, 55131), tuple(61969, 12339), tuple(4900, 48310), tuple(67609, 55369), tuple(37333, 37245), tuple(91492, 19704), tuple(77592, 62200), tuple(1017, 41815), tuple(41362, 13627), tuple(46703, 92040), tuple(4664, 46637), tuple(25430, 87837), tuple(10270, 32932), tuple(46025, 34792), tuple(80621, 38362), tuple(79949, 31518), tuple(77767, 59212), tuple(11080, 69948), tuple(17376, 92279), tuple(73871, 86715), tuple(83524, 21178), tuple(94368, 61971), tuple(11262, 30062), tuple(12840, 52656), tuple(15300, 64176), tuple(70094, 42565), tuple(84503, 66968), tuple(65824, 63349), tuple(74306, 82791), tuple(85701, 1655), tuple(25190, 70557), tuple(82208, 58145), tuple(97669, 92489), tuple(62730, 52924), tuple(46970, 15748), tuple(71217, 57505), tuple(57336, 87380), tuple(13982, 71979), tuple(55899, 1192), tuple(6890, 69297), tuple(39849, 72896), tuple(60213, 22499), tuple(53820, 79877), tuple(61389, 24954), tuple(1021, 81047), tuple(95389, 90605), tuple(8590, 26855), tuple(92881, 46825), tuple(59567, 91455), tuple(87297, 1567), tuple(86333, 82913), tuple(16285, 32370), tuple(38900, 77251), tuple(96301, 92302), tuple(2799, 91579), tuple(59757, 56681), tuple(49229, 38404), tuple(16880, 51290), tuple(38700, 80456), tuple(51440, 32556), tuple(4507, 83325), tuple(29924, 40923), tuple(9937, 58356), tuple(70895, 52611), tuple(80488, 49196), tuple(93118, 6112), tuple(44058, 20923), tuple(70808, 72928), tuple(78269, 76351), tuple(81081, 63186), tuple(12406, 50247), tuple(91769, 37875), tuple(36197, 11434), tuple(72225, 93141), tuple(59295, 54160), tuple(39342, 10117), tuple(12920, 23240), tuple(91877, 61524), tuple(84807, 5431), tuple(63163, 52152), tuple(90320, 97456), tuple(14899, 12941), tuple(90079, 98004), tuple(46096, 68208), tuple(12176, 72405), tuple(28451, 61964), tuple(89254, 1676), tuple(76242, 5438), tuple(29756, 92658), tuple(14855, 41944), tuple(1519, 65495), tuple(74052, 65006), tuple(1075, 31521), tuple(84877, 98988), tuple(91426, 69442), tuple(39694, 43391), tuple(68328, 3447), tuple(50508, 61610), tuple(30890, 18792), tuple(60706, 87518), tuple(6692, 83260), tuple(92044, 79399), tuple(86846, 53543), tuple(28606, 61656), tuple(35449, 52965), tuple(43421, 13117), tuple(67404, 55238), tuple(80817, 79927), tuple(8908, 46083), tuple(22583, 19705), tuple(13, 25509), tuple(79771, 21210), tuple(42719, 19320), tuple(94091, 35389), tuple(95995, 42652), tuple(6417, 13464), tuple(22290, 34089), tuple(27119, 33408), tuple(7, 68019), tuple(55405, 50766), tuple(6331, 50009), tuple(33, 48235), tuple(3162, 85313), tuple(25897, 91775), tuple(30813, 83408), tuple(36062, 46449), tuple(78820, 78894), tuple(92054, 23008), tuple(10637, 4237), tuple(90702, 62678), tuple(80427, 98641), tuple(20834, 48068), tuple(74443, 29196), tuple(76088, 91823), tuple(39151, 48574), tuple(54050, 5374), tuple(60643, 1979), tuple(4535, 95086), tuple(82101, 67586), tuple(55746, 92488), tuple(88192, 22615), tuple(93282, 87547), tuple(37804, 61180), tuple(13445, 56654), tuple(38913, 10130), tuple(23472, 83441), tuple(94125, 56393), tuple(2967, 25078), tuple(76652, 84599), tuple(3586, 83503), tuple(46272, 62119), tuple(26002, 55790), tuple(75085, 55875), tuple(73786, 22608), tuple(63101, 59758), tuple(9688, 11910), tuple(54041, 38376), tuple(75595, 95722), tuple(36047, 59518), tuple(55041, 69102), tuple(42836, 48225), tuple(30046, 61157), tuple(60608, 94951), tuple(80257, 70300), tuple(40282, 67847), tuple(90735, 56299), tuple(82814, 89675), tuple(2998, 52357), tuple(86333, 5088), tuple(3414, 67855), tuple(28134, 64041), tuple(56871, 38384), tuple(51335, 28574), tuple(73451, 40395), tuple(59696, 49729), tuple(73379, 78187), tuple(67561, 79682), tuple(66114, 9153), tuple(4613, 41137), tuple(96832, 77637), tuple(64216, 22050), tuple(69871, 69883), tuple(78030, 8142), tuple(88000, 98796), tuple(24965, 60211), tuple(61727, 82326), tuple(64623, 21387), tuple(27307, 39907), tuple(47314, 29509), tuple(14676, 73902), tuple(48864, 28948), tuple(15974, 66359), tuple(68154, 2013), tuple(44016, 51609), tuple(95421, 89481), tuple(39985, 22127), tuple(88096, 18483), tuple(18539, 98797), tuple(83613, 26308), tuple(93997, 84284), tuple(35958, 46289), tuple(79263, 50800), tuple(4873, 92142), tuple(69509, 97567), tuple(17733, 9050), tuple(14632, 79901), tuple(94211, 83353), tuple(72112, 79110), tuple(13974, 83858), tuple(76735, 38529), tuple(67084, 67183), tuple(97827, 95135), tuple(55771, 88062), tuple(94630, 45565), tuple(20922, 85088), tuple(9180, 39703), tuple(86146, 21086), tuple(65955, 51015), tuple(77660, 57572), tuple(31577, 56429), tuple(52636, 56363), tuple(74365, 62124), tuple(60971, 13103), tuple(75234, 35529), tuple(26035, 39091), tuple(1145, 38641), tuple(24088, 49898), tuple(83610, 25448), tuple(8868, 32413), tuple(20877, 9306), tuple(40824, 73012), tuple(63105, 93113), tuple(21170, 21234), tuple(6564, 21210), tuple(27020, 39734), tuple(7431, 11643), tuple(56609, 23596), tuple(2023, 39429), tuple(63574, 88918), tuple(5188, 46658), tuple(3290, 24577), tuple(33271, 95049), tuple(72950, 94811), tuple(74876, 73210), tuple(6294, 42155), tuple(13767, 27366), tuple(86746, 54073), tuple(13001, 93376), tuple(13517, 96879), tuple(24380, 59684), tuple(49105, 55403), tuple(90533, 2745), tuple(48651, 23491), tuple(21409, 71113), tuple(7142, 71273), tuple(62952, 88544), tuple(82865, 10938), tuple(65089, 17672), tuple(43173, 47506), tuple(13708, 32610), tuple(26547, 77317), tuple(8676, 7117), tuple(62512, 39512), tuple(42233, 81433), tuple(45416, 63643), tuple(32392, 33632), tuple(83887, 402), tuple(53596, 54897), tuple(59707, 85005), tuple(96343, 20979), tuple(30344, 65226), tuple(34513, 24150), tuple(38715, 11205), tuple(20649, 7679), tuple(27948, 80080), tuple(77430, 49123), tuple(42437, 4729), tuple(90176, 34827), tuple(11039, 59573), tuple(47042, 38460), tuple(48086, 34987), tuple(65457, 5585), tuple(45956, 6198), tuple(22786, 24937), tuple(54287, 77515), tuple(12113, 84710), tuple(29543, 36869), tuple(8388, 60473), tuple(2771, 53359), tuple(35299, 64874), tuple(34132, 86266), tuple(37594, 64297), tuple(33390, 65843), tuple(53057, 46715), tuple(41874, 83250), tuple(26061, 30352), tuple(93351, 16651), tuple(25890, 16570), tuple(67403, 19546), tuple(8608, 51991), tuple(90616, 10018), tuple(46870, 54345), tuple(81919, 3577), tuple(99462, 3562), tuple(83193, 66098), tuple(92054, 70338), tuple(11383, 90149), tuple(42458, 2302), tuple(77850, 47281), tuple(62433, 4959), tuple(52392, 33711), tuple(2033, 4096), tuple(91460, 6795), tuple(27462, 76972), tuple(73087, 40511), tuple(42563, 5924), tuple(21819, 53017), tuple(31309, 62793), tuple(19798, 60725), tuple(90987, 77178), tuple(9949, 43079), tuple(13773, 40312), tuple(97080, 61184), tuple(59679, 78611), tuple(22361, 83227), tuple(70120, 95483), tuple(15529, 5672), tuple(25893, 99672), tuple(61722, 69201), tuple(55012, 37509), tuple(77999, 85866), tuple(77835, 83627), tuple(36792, 80218), tuple(54232, 58138), tuple(74593, 485), tuple(45698, 4153), tuple(96513, 738), tuple(33060, 53078), tuple(4439, 25097), tuple(62007, 64140), tuple(86128, 99499), tuple(66141, 4433), tuple(41032, 54527), tuple(59831, 61170), tuple(1189, 68117), tuple(63914, 26798), tuple(72045, 2999), tuple(6016, 42337), tuple(40611, 39747), tuple(88328, 44836), tuple(88939, 25365), tuple(40010, 43971), tuple(21419, 31975), tuple(27725, 21929), tuple(49459, 74763), tuple(32059, 96546), tuple(70985, 98967), tuple(33034, 36073), tuple(19600, 80524), tuple(59150, 56734), tuple(30433, 38795), tuple(55387, 47581), tuple(45109, 73833), tuple(59487, 5428), tuple(23140, 57618), tuple(36367, 31008), tuple(45983, 85518), tuple(28234, 83843), tuple(73005, 5096), tuple(65602, 83431), tuple(97198, 10971), tuple(4873, 51104),      
+    tuple(66251, 59146), tuple(28920, 29336), tuple(86273, 50897), tuple(81311, 53009), tuple(22278, 85352), tuple(54231, 26356), tuple(94250, 51117), tuple(21152, 38875), tuple(39286, 22339), tuple(10290, 37852), tuple(43426, 20385), tuple(13603, 2341), tuple(2314, 12288), tuple(48785, 80096), tuple(16762, 92809), tuple(1689, 16006), tuple(46828, 44433), tuple(58147, 68612), tuple(31702, 34921), tuple(23807, 72511), tuple(63437, 35834), tuple(40643, 62303), tuple(78198, 57748), tuple(11496, 43030), tuple(91150, 85333), tuple(91817, 95369), tuple(1792, 59975), tuple(14816, 41573), tuple(9355, 32450), tuple(77243, 5352), tuple(17681, 11128), tuple(69700, 89110), tuple(37695, 98303), tuple(23160, 29924), tuple(83829, 29122), tuple(13009, 81770), tuple(64481, 60303), tuple(6842, 78532), tuple(16282, 32405), tuple(14204, 67463), tuple(41795, 83324), tuple(98134, 38132), tuple(93686, 89418), tuple(83031, 18065), tuple(96431, 28312), tuple(15488, 90870), tuple(90914, 35142), tuple(96174, 98411), tuple(93075, 61533), tuple(47394, 30134), tuple(46309, 98014), tuple(8574, 38881), tuple(42376, 78153), tuple(45938, 95700), tuple(14026, 14059), tuple(94138, 70460), tuple(62882, 3321), tuple(52628, 25566), tuple(42145, 97919), tuple(57580, 8897), tuple(1766, 74887), tuple(68391, 51311), tuple(16485, 36095), tuple(55867, 988), tuple(34600, 46771), tuple(35786, 23210), tuple(78683, 62604), tuple(11002, 87427), tuple(29747, 6771), tuple(53803, 50526), tuple(52691, 75371), tuple(58028, 36198), tuple(98041, 28071), tuple(81822, 4121), tuple(90995, 93843), tuple(3709, 74313), tuple(23318, 28167), tuple(60162, 87145), tuple(53243, 31382), tuple(69762, 54059), tuple(25151, 95865), tuple(55550, 62947), tuple(45463, 8036), tuple(59949, 91675), tuple(55331, 79612), tuple(13806, 57517), tuple(41328, 94361), tuple(8388, 210), tuple(43458, 1327), tuple(16416, 50975), tuple(64370, 86524), tuple(97121, 65142), tuple(82878, 64545), tuple(58547, 33372), tuple(67494, 4130), tuple(59446, 79185), tuple(83812, 58833), tuple(32172, 93730), tuple(10095, 30319), tuple(94135, 92795), tuple(64893, 12870), tuple(14634, 70083), tuple(23344, 42836), tuple(19624, 29135), tuple(28755, 57738), tuple(58401, 49863), tuple(76809, 91787), tuple(51952, 33167), tuple(31717, 78538), tuple(64811, 55131), tuple(61969, 12339), tuple(4900, 48310), tuple(67609, 55369), tuple(37333, 37245), tuple(91492, 19704), tuple(77592, 62200), tuple(1017, 41815), tuple(41362, 13627), tuple(46703, 92040), tuple(4664, 46637), tuple(25430, 87837), tuple(10270, 32932), tuple(46025, 34792), tuple(80621, 38362), tuple(79949, 31518), tuple(77767, 59212), tuple(11080, 69948), tuple(17376, 92279), tuple(73871, 86715), tuple(83524, 21178), tuple(94368, 61971), tuple(11262, 30062), tuple(12840, 52656), tuple(15300, 64176), tuple(70094, 42565), tuple(84503, 66968), tuple(65824, 63349), tuple(74306, 82791), tuple(85701, 1655), tuple(25190, 70557), tuple(82208, 58145), tuple(97669, 92489), tuple(62730, 52924), tuple(46970, 15748), tuple(71217, 57505), tuple(57336, 87380), tuple(13982, 71979), tuple(55899, 1192), tuple(6890, 69297), tuple(39849, 72896), tuple(60213, 22499), tuple(53820, 79877), tuple(61389, 24954), tuple(1021, 81047), tuple(95389, 90605), tuple(8590, 26855), tuple(92881, 46825), tuple(59567, 91455), tuple(87297, 1567), tuple(86333, 82913), tuple(16285, 32370), tuple(38900, 77251), tuple(96301, 92302), tuple(2799, 91579), tuple(59757, 56681), tuple(49229, 38404), tuple(16880, 51290), tuple(38700, 80456), tuple(51440, 32556), tuple(4507, 83325), tuple(29924, 40923), tuple(9937, 58356), tuple(70895, 52611), tuple(80488, 49196), tuple(93118, 6112), tuple(44058, 20923), tuple(70808, 72928), tuple(78269, 76351), tuple(81081, 63186), tuple(12406, 50247), tuple(91769, 37875), tuple(36197, 11434), tuple(72225, 93141), tuple(59295, 54160), tuple(39342, 10117), tuple(12920, 23240), tuple(91877, 61524), tuple(84807, 5431), tuple(63163, 52152), tuple(90320, 97456), tuple(14899, 12941), tuple(90079, 98004), tuple(46096, 68208), tuple(12176, 72405), tuple(28451, 61964), tuple(89254, 1676), tuple(76242, 5438), tuple(29756, 92658), tuple(14855, 41944), tuple(1519, 65495), tuple(74052, 65006), tuple(1075, 31521), tuple(84877, 98988), tuple(91426, 69442), tuple(39694, 43391), tuple(68328, 3447), tuple(50508, 61610), tuple(30890, 18792), tuple(60706, 87518), tuple(6692, 83260), tuple(92044, 79399), tuple(86846, 53543), tuple(28606, 61656), tuple(35449, 52965), tuple(43421, 13117), tuple(67404, 55238), tuple(80817, 79927), tuple(8908, 46083), tuple(22583, 19705), tuple(13, 25509), tuple(79771, 21210), tuple(42719, 19320), tuple(94091, 35389), tuple(95995, 42652), tuple(6417, 13464), tuple(22290, 34089), tuple(27119, 33408), tuple(7, 68019), tuple(55405, 50766), tuple(6331, 50009), tuple(33, 48235), tuple(3162, 85313), tuple(25897, 91775), tuple(30813, 83408), tuple(36062, 46449), tuple(78820, 78894), tuple(92054, 23008), tuple(10637, 4237), tuple(90702, 62678), tuple(80427, 98641), tuple(20834, 48068), tuple(74443, 29196), tuple(76088, 91823), tuple(39151, 48574), tuple(54050, 5374), tuple(60643, 1979), tuple(4535, 95086), tuple(82101, 67586), tuple(55746, 92488), tuple(88192, 22615), tuple(93282, 87547), tuple(37804, 61180), tuple(13445, 56654), tuple(38913, 10130), tuple(23472, 83441), tuple(94125, 56393), tuple(2967, 25078), tuple(76652, 84599), tuple(3586, 83503), tuple(46272, 62119), tuple(26002, 55790), tuple(75085, 55875), tuple(73786, 22608), tuple(63101, 59758), tuple(9688, 11910), tuple(54041, 38376), tuple(75595, 95722), tuple(36047, 59518), tuple(55041, 69102), tuple(42836, 48225), tuple(30046, 61157), tuple(60608, 94951), tuple(80257, 70300), tuple(40282, 67847), tuple(90735, 56299), tuple(82814, 89675), tuple(2998, 52357), tuple(86333, 5088), tuple(3414, 67855), tuple(28134, 64041), tuple(56871, 38384), tuple(51335, 28574), tuple(73451, 40395), tuple(59696, 49729), tuple(73379, 78187), tuple(67561, 79682), tuple(66114, 9153), tuple(4613, 41137), tuple(96832, 77637), tuple(64216, 22050), tuple(69871, 69883), tuple(78030, 8142), tuple(88000, 98796), tuple(24965, 60211), tuple(61727, 82326), tuple(64623, 21387), tuple(27307, 39907), tuple(47314, 29509), tuple(14676, 73902), tuple(48864, 28948), tuple(15974, 66359), tuple(68154, 2013), tuple(44016, 51609), tuple(95421, 89481), tuple(39985, 22127), tuple(88096, 18483), tuple(18539, 98797), tuple(83613, 26308), tuple(93997, 84284), tuple(35958, 46289), tuple(79263, 50800), tuple(4873, 92142), tuple(69509, 97567), tuple(17733, 9050), tuple(14632, 79901), tuple(94211, 83353), tuple(72112, 79110), tuple(13974, 83858), tuple(76735, 38529), tuple(67084, 67183), tuple(97827, 95135), tuple(55771, 88062), tuple(94630, 45565), tuple(20922, 85088), tuple(9180, 39703), tuple(86146, 21086), tuple(65955, 51015), tuple(77660, 57572), tuple(31577, 56429), tuple(52636, 56363), tuple(74365, 62124), tuple(60971, 13103), tuple(75234, 35529), tuple(26035, 39091), tuple(1145, 38641), tuple(24088, 49898), tuple(83610, 25448), tuple(8868, 32413), tuple(20877, 9306), tuple(40824, 73012), tuple(63105, 93113), tuple(21170, 21234), tuple(6564, 21210), tuple(27020, 39734), tuple(7431, 11643), tuple(56609, 23596), tuple(2023, 39429), tuple(63574, 88918), tuple(5188, 46658), tuple(3290, 24577), tuple(33271, 95049), tuple(72950, 94811), tuple(74876, 73210), tuple(6294, 42155), tuple(13767, 27366), tuple(86746, 54073), tuple(13001, 93376), tuple(13517, 96879), tuple(24380, 59684), tuple(49105, 55403), tuple(90533, 2745), tuple(48651, 23491), tuple(21409, 71113), tuple(7142, 71273), tuple(62952, 88544), tuple(82865, 10938), tuple(65089, 17672), tuple(43173, 47506), tuple(13708, 32610), tuple(26547, 77317), tuple(8676, 7117), tuple(62512, 39512), tuple(42233, 81433), tuple(45416, 63643), tuple(32392, 33632), tuple(83887, 402), tuple(53596, 54897), tuple(59707, 85005), tuple(96343, 20979), tuple(30344, 65226), tuple(34513, 24150), tuple(38715, 11205), tuple(20649, 7679), tuple(27948, 80080), tuple(77430, 49123), tuple(42437, 4729), tuple(90176, 34827), tuple(11039, 59573), tuple(47042, 38460), tuple(48086, 34987), tuple(65457, 5585), tuple(45956, 6198), tuple(22786, 24937), tuple(54287, 77515), tuple(12113, 84710), tuple(29543, 36869), tuple(8388, 60473), tuple(2771, 53359), tuple(35299, 64874), tuple(34132, 86266), tuple(37594, 64297), tuple(33390, 65843), tuple(53057, 46715), tuple(41874, 83250), tuple(26061, 30352), tuple(93351, 16651), tuple(25890, 16570), tuple(67403, 19546), tuple(8608, 51991), tuple(90616, 10018), tuple(46870, 54345), tuple(81919, 3577), tuple(99462, 3562), tuple(83193, 66098), tuple(92054, 70338), tuple(11383, 90149), tuple(42458, 2302), tuple(77850, 47281), tuple(62433, 4959), tuple(52392, 33711), tuple(2033, 4096), tuple(91460, 6795), tuple(27462, 76972), tuple(73087, 40511), tuple(42563, 5924), tuple(21819, 53017), tuple(31309, 62793), tuple(19798, 60725), tuple(90987, 77178), tuple(9949, 43079), tuple(13773, 40312), tuple(97080, 61184), tuple(59679, 78611), tuple(22361, 83227), tuple(70120, 95483), tuple(15529, 5672), tuple(25893, 99672), tuple(61722, 69201), tuple(55012, 37509), tuple(77999, 85866), tuple(77835, 83627), tuple(36792, 80218), tuple(54232, 58138), tuple(74593, 485), tuple(45698, 4153), tuple(96513, 738), tuple(33060, 53078), tuple(4439, 25097), tuple(62007, 64140), tuple(86128, 99499), tuple(66141, 4433), tuple(41032, 54527), tuple(59831, 61170), tuple(1189, 68117), tuple(63914, 26798), tuple(72045, 2999), tuple(6016, 42337), tuple(40611, 39747), tuple(88328, 44836), tuple(88939, 25365), tuple(40010, 43971), tuple(21419, 31975), tuple(27725, 21929), tuple(49459, 74763), tuple(32059, 96546), tuple(70985, 98967), tuple(33034, 36073), tuple(19600, 80524), tuple(59150, 56734), tuple(30433, 38795), tuple(55387, 47581), tuple(45109, 73833), tuple(59487, 5428), tuple(23140, 57618), tuple(36367, 31008), tuple(45983, 85518), tuple(28234, 83843), tuple(73005, 5096), tuple(65602, 83431), tuple(97198, 10971), tuple(4873, 51104),
     tuple(49700, 89396), tuple(18900, 20447), tuple(76400, 68088), tuple(28055, 59547), tuple(94737, 96052), tuple(57933, 96132), tuple(26945, 6293), tuple(18559, 1317), tuple(66327, 78332), tuple(47194, 67979), tuple(78039, 58735), tuple(26666, 96144), tuple(91574, 52530), tuple(3216, 43850), tuple(48367, 78987), tuple(78296, 89800), tuple(25015, 1497), tuple(70292, 37629), tuple(39657, 59240), tuple(22576, 93232), tuple(70102, 98407), tuple(35051, 5762), tuple(13700, 82540), tuple(36857, 7528), tuple(84536, 86107), tuple(1258, 90702), tuple(9152, 1127), tuple(3136, 57298), tuple(73203, 93120), tuple(61897, 32903), tuple(20284, 49358), tuple(49444, 65481), tuple(91260, 84792), tuple(5360, 37164), tuple(79212, 26499), tuple(59456, 37025), tuple(67953, 53566), tuple(50253, 71742), tuple(68181, 90923), tuple(88522, 71071), tuple(89615, 46115), tuple(31661, 17673), tuple(37699, 90994), tuple(41974, 9481), tuple(51974, 46364), tuple(47470, 75958), tuple(38427, 78267), tuple(90226, 16121), tuple(33257, 3088), tuple(73044, 79701), tuple(14149, 36868), tuple(6421, 63653), tuple(35772, 56493), tuple(46665, 83651), tuple(82299, 56268), tuple(77397, 71795), tuple(15180, 87135), tuple(73936, 38858), tuple(27060, 14829), tuple(85847, 76756), tuple(63068, 61864), tuple(92040, 43753), tuple(53882, 60715), tuple(12648, 18276), tuple(17873, 94081), tuple(55982, 24983), tuple(52686, 32111), tuple(22555, 13144), tuple(37190, 15039), tuple(47304, 86179), tuple(56214, 83657), tuple(53838, 78111), tuple(80530, 1686), tuple(2976, 26711), tuple(55713, 3487), tuple(21157, 5923), tuple(74613, 76555), tuple(61736, 7322), tuple(99017, 13779), tuple(64133, 61706), tuple(8276, 97269), tuple(99641, 87447), tuple(26292, 62924), tuple(96267, 37877), tuple(98635, 88685), tuple(65598, 68210), tuple(34885, 1063), tuple(42880, 15694), tuple(4058, 72666), tuple(1319, 91582), tuple(41749, 822), tuple(82490, 42783), tuple(17489, 17617), tuple(81109, 16778), tuple(86262, 53756), tuple(15547, 21144), tuple(89799, 70465), tuple(99358, 87334), tuple(65501, 81932), tuple(30351, 64230), tuple(55974, 46985), tuple(24343, 93628), tuple(4624, 56038), tuple(15183, 38765), tuple(21562, 5240), tuple(36215, 51533), tuple(49649, 74392), tuple(7607, 91204), tuple(86233, 85341), tuple(35494, 44178), tuple(78808, 11896), tuple(45446, 12897), tuple(4810, 20096), tuple(3643, 10550), tuple(12022, 14391), tuple(99014, 87891), tuple(67214, 29437), tuple(7015, 54810), tuple(84991, 75251), tuple(45526, 82687), tuple(43608, 89083), tuple(96191, 12911), tuple(36902, 50415), tuple(90548, 66839), tuple(54007, 5480), tuple(57191, 39709), tuple(73364, 73556), tuple(12671, 64072), tuple(5047, 12887), tuple(22326, 88360), tuple(59259, 63167), tuple(39237, 9311), tuple(47043, 11512), tuple(32399, 22634), tuple(89485, 95279), tuple(30489, 43327), tuple(70966, 18184), tuple(28514, 12686), tuple(1717, 89938), tuple(14871, 76911), tuple(47862, 97093), tuple(97572, 77612), tuple(88600, 36501), tuple(9240, 96264), tuple(96629, 98292), tuple(4838, 72694), tuple(52835, 73039), tuple(63836, 26228), tuple(26035, 74526), tuple(23617, 6104), tuple(6243, 54603), tuple(20038, 81195), tuple(56789, 96284),
-    tuple(97009, 18989), tuple(36765, 94831), tuple(42002, 40820), tuple(31838, 16186), tuple(91127, 70783), tuple(1684, 38076), tuple(40928, 41294), tuple(97107, 76517), tuple(1797, 24093), tuple(99175, 29445), tuple(5788, 64502), tuple(66972, 23772), tuple(97394, 95256), tuple(26705, 92412), tuple(10676, 6686), tuple(28464, 74051), tuple(17598, 51675), tuple(76449, 50050), tuple(98812, 59818), tuple(92058, 6625), tuple(49804, 99637), tuple(28545, 32790), tuple(72167, 93636), tuple(29012, 95623), tuple(58249, 54541), tuple(98926, 71489), tuple(75062, 9546), tuple(47555, 5802), tuple(61606, 30979), tuple(10467, 46108), tuple(30491, 52750), tuple(52934, 38533), tuple(54616, 37276), tuple(55118, 2330), tuple(60402, 14806), tuple(25730, 88759), tuple(5209, 30946), tuple(92017, 41987), tuple(59747, 62415), tuple(6306, 53297), tuple(35770, 31254), tuple(13106, 99865), tuple(63519, 41637), tuple(7416, 68154), tuple(70874, 95983), tuple(20074, 2173), tuple(33740, 86880), tuple(45020, 65869), tuple(7302, 53494), tuple(98814, 2118), tuple(88287, 80646), tuple(18771, 30449), tuple(44557, 37984), tuple(45415, 36032), tuple(36584, 58485), tuple(57843, 52354), tuple(85647, 12150), tuple(33990, 89380), tuple(98597, 41936), tuple(19427, 53990), tuple(1457, 69269), tuple(68438, 14471), tuple(67175, 16881), tuple(82982, 78546), tuple(47661, 36294), tuple(63229, 48108), tuple(34390, 76095), tuple(32101, 57268), tuple(25322, 3312), tuple(17037, 2900), tuple(14342, 70149), tuple(10518, 1377), tuple(13553, 89073), tuple(97084, 80365), tuple(48340, 87192), tuple(84969, 21195), tuple(1031, 72944), tuple(78322, 68583), tuple(67238, 48374), tuple(77366, 55850), tuple(4383, 46759), tuple(51088, 76488), tuple(92049, 55847), tuple(32750, 16422), tuple(51788, 53619), tuple(56976, 88951), tuple(73323, 78435), tuple(3489, 15945), tuple(84231, 22302), tuple(25695, 881), tuple(19391, 11660), tuple(92578, 78349), tuple(52677, 17339), tuple(99132, 35975), tuple(25089, 70476), tuple(34144, 66544), tuple(59589, 59839), tuple(47333, 87623), tuple(4200, 6542), tuple(91781, 77813), tuple(77419, 17342), tuple(388, 90753), tuple(43401, 7351), tuple(81829, 74989), tuple(22381, 95695), tuple(90302, 61687), tuple(13534, 54534), tuple(43527, 47703), tuple(47856, 1186), tuple(10112, 16747), tuple(9508, 26179), tuple(96536, 57565), tuple(91052, 48922), tuple(38575, 45523), tuple(11602, 85317), tuple(22595, 21610), tuple(97849, 15638), tuple(95060, 20111), tuple(96011, 27148), tuple(37596, 10426), tuple(68667, 49057), tuple(68657, 90882), tuple(52704, 33574), tuple(54727, 59704), tuple(15853, 48283), tuple(47021, 60021), tuple(96208, 11440), tuple(6068, 49421), tuple(50363, 17684), tuple(53218, 19), tuple(82568, 3816), tuple(51, 7612), tuple(7073, 59063), tuple(92318, 38587), tuple(72388, 64952), tuple(33318, 5594), tuple(72806, 18573), tuple(1175, 88747), tuple(67044, 86039), tuple(17376, 41265), tuple(26356, 89524), tuple(55678, 15627), tuple(61156, 15723), tuple(43239, 59010), tuple(29054, 15261), tuple(57669, 21395), tuple(68469, 14849), tuple(92654, 69664), tuple(23975, 20021), tuple(73688, 12134), tuple(58053, 23849), tuple(56234, 18559), tuple(25051, 68957), tuple(15181, 91615), tuple(87633, 31040), tuple(17494, 78515), tuple(71971, 60923), tuple(44170, 21724), tuple(7088, 72107), tuple(12924, 47933), tuple(98139, 6819), tuple(57842, 2906), tuple(90278, 3534), tuple(61695, 82885), tuple(58831, 15129), tuple(32033, 34634), tuple(63477, 31357), tuple(29077, 28166), tuple(86531, 89574), tuple(46943, 79113), tuple(15667, 63523), tuple(65818, 93225), tuple(83392, 50497), tuple(7157, 88909), tuple(95101, 17111), tuple(8981, 35791), tuple(28328, 82722), tuple(70215, 66862), tuple(23442, 39128), tuple(21218, 27773), tuple(76215, 39265), tuple(56858, 62397), tuple(3610, 8766), tuple(7423, 48886), tuple(12235, 88792), tuple(44839, 55196), tuple(4896, 10080), tuple(87090, 73997), tuple(56745, 71875), tuple(58478, 57472), tuple(79423, 8771), tuple(76202, 95733), tuple(81635, 48857), tuple(82519, 5321), tuple(48756, 37198), tuple(20101, 61177), tuple(79047, 81682), tuple(23287, 88578), tuple(50984, 80946), tuple(855, 49074), tuple(11452, 56655), tuple(6289, 8916), tuple(33570, 636), tuple(28703, 80592), tuple(11820, 92299), tuple(75590, 80188), tuple(91365, 2787), tuple(22963, 43710), tuple(3996, 48007), tuple(59047, 96418), tuple(96710, 52447), tuple(65677, 99927), tuple(60727, 15115), tuple(8161, 65729), tuple(75253, 45731), tuple(88130, 79264), tuple(52087, 32657), tuple(89678, 22834), tuple(49244, 36835), tuple(74032, 5096), tuple(94142, 39297), tuple(51061, 21311), tuple(59391, 43458), tuple(90918, 95081), tuple(6058, 37018), tuple(29917, 54214), tuple(65986, 5543), tuple(99777, 69683), tuple(9447, 11273), tuple(54873, 47138), tuple(1306, 68306), tuple(15316, 55995), tuple(69280, 73432), tuple(63054, 28502), tuple(67161, 11333), tuple(40800, 26415), tuple(72350, 50225), tuple(7232, 67500), tuple(60631, 40338), tuple(96765, 51671), tuple(29375, 11235), tuple(52707, 93742), tuple(1317, 55926), tuple(51844, 29351), tuple(35754, 16733), tuple(23014, 56950), tuple(33119, 47531), tuple(27806, 39940), tuple(20119, 73119), tuple(18458, 45982), tuple(16605, 28759), tuple(43488, 86201), tuple(43560, 82883), tuple(85085, 1977), tuple(7129, 64077), tuple(36070, 80679), tuple(78638, 97212), tuple(71251, 5268), tuple(33610, 63341), tuple(16722, 15882), tuple(53876, 11734), tuple(35855, 14481), tuple(55072, 7889), tuple(37213, 73390), tuple(28899, 55948), tuple(51996, 77777), tuple(26621, 51914), tuple(44492, 36420), tuple(36437, 24452), tuple(158, 77935), tuple(3730, 7692), tuple(81372, 29050), tuple(29491, 3912), tuple(57098, 73393), tuple(55630, 53165), tuple(79003, 19421), tuple(47306, 40128), tuple(96332, 49995), tuple(54107, 83940), tuple(11203, 76678), tuple(53854, 284), tuple(96087, 22398), tuple(25481, 69301), tuple(2770, 77586), tuple(53004, 44915), tuple(56264, 41165), tuple(12335, 22090), tuple(47188, 40678), tuple(41823, 71805), tuple(81810, 47825), tuple(98892, 50696), tuple(74323, 93133), tuple(82867, 40800), tuple(28884, 29276), tuple(55697, 20888), tuple(96901, 37428), tuple(95509, 78780), tuple(6443, 65188), tuple(17669, 43924), tuple(29933, 97244), tuple(1024, 71265), tuple(47229, 99610), tuple(72546, 40811), tuple(43407, 41566), tuple(44692, 53743), tuple(76823, 95950), tuple(2509, 57091), tuple(85077, 96439), tuple(87650, 87716), tuple(3822, 84513), tuple(90864, 75439), tuple(22043, 21770), tuple(98371, 75482), tuple(63823, 48100), tuple(29999, 40875), tuple(97696, 33865), tuple(50880, 16402), tuple(21412, 70936), tuple(7150, 85970), tuple(73104, 57073), tuple(40099, 89138), tuple(6430, 36791), tuple(47677, 23485), tuple(21073, 86912), tuple(65018, 6092), tuple(89932, 58178), tuple(1264, 51681), tuple(42044, 40135), tuple(21774, 12190), tuple(13844, 87188), tuple(25807, 89548), tuple(74682, 31603), tuple(18482, 41232), tuple(906, 21841), tuple(10897, 39238), tuple(62134, 6083), tuple(80871, 66850), tuple(49659, 28587), tuple(61260, 22769), tuple(53795, 66637), tuple(89211, 32453), tuple(4271, 69472), tuple(1082, 32636), tuple(62012, 47870), tuple(7376, 77166), tuple(13150, 73275), tuple(66410, 85959), tuple(19018, 57311), tuple(30561, 58838), tuple(19981, 32087), tuple(91580, 42990), tuple(77139, 23774), tuple(10055, 99890), tuple(92160, 54537), tuple(75088, 70397), tuple(2361, 61066), tuple(81368, 40411), tuple(84946, 42564), tuple(41591, 42929), tuple(50399, 26116), tuple(51504, 63772), tuple(99828, 69531), tuple(19977, 17806), tuple(71259, 76567), tuple(78606, 25105), tuple(8859, 46469), tuple(19542, 73988), tuple(49804, 17349), tuple(65360, 96632), tuple(57740, 30812), tuple(9258, 26185), tuple(90573, 4815), tuple(39397, 10229), tuple(35300, 81687), tuple(5681, 22828), tuple(6274, 38340), tuple(44281, 67912), tuple(38385, 26507), tuple(95324, 84765), tuple(39288, 79779), tuple(4513, 28158), tuple(46060, 40293), tuple(70348, 87460), tuple(67754, 19569), tuple(70481, 94407), tuple(67636, 69316), tuple(14167, 81744), tuple(18928, 29706), tuple(32034, 45677), tuple(19801, 5902), tuple(42401, 62712), tuple(35220, 22823), tuple(33690, 22046), tuple(91281, 55953), tuple(4197, 96279), tuple(32901, 27074), tuple(35861, 5478), tuple(99166, 36251), tuple(70898, 80994), tuple(87491, 52808), tuple(59681, 30266), tuple(2944, 18646), tuple(77874, 7536), tuple(24534, 5416), tuple(90962, 47145), tuple(95367, 34461), tuple(10075, 74120), tuple(74276, 1837), tuple(38399, 63918), tuple(10526, 42662), tuple(33001, 37773), tuple(13642, 25741), tuple(5373, 82728), tuple(9830, 54625), tuple(13, 18937), tuple(90113, 52300), tuple(20973, 89640), tuple(44930, 1598), tuple(8100, 47745), tuple(80659, 78877), tuple(74154, 33417), tuple(18691, 37573), tuple(12477, 76628), tuple(73018, 89583), tuple(59029, 24879), tuple(85237, 31017), tuple(27701, 11025), tuple(24010, 76942), tuple(15627, 25276), tuple(89050, 16118), tuple(19776, 19318), tuple(24620, 1487), tuple(50157, 95158), tuple(53030, 72020), tuple(85571, 10817), tuple(29196, 92799), tuple(63501, 22445), tuple(26241, 54318), tuple(33769, 80112), tuple(25312, 50574), tuple(70583, 56662), tuple(74366, 82575), tuple(48461, 80545), tuple(18834, 39444), tuple(36597, 42715), tuple(86547, 38453), tuple(41067, 60718), tuple(33350, 25404), tuple(5532, 41438), tuple(45918, 84038), tuple(39040, 63724), tuple(37629, 66002), tuple(58037, 36196), tuple(21400, 17330), tuple(46491, 22602), tuple(88057, 89249), tuple(34188, 35948), tuple(8555, 42479), tuple(32961, 76606), tuple(22395, 93711), tuple(8058, 19591), tuple(72063, 64136), tuple(83360, 12607), tuple(20671, 78285), tuple(51887, 65373), tuple(71966, 39341), tuple(55953, 99780), tuple(56205, 98138), tuple(45986, 44708), tuple(62541, 28259), tuple(49450, 12641), tuple(5192, 36601), tuple(55295, 44352), tuple(83762, 4343), tuple(96203, 8870), tuple(21786, 73828), tuple(88830, 43827), tuple(96669, 84761), tuple(53061, 50061), tuple(52150, 47463), tuple(32090, 17570),            
+    tuple(97009, 18989), tuple(36765, 94831), tuple(42002, 40820), tuple(31838, 16186), tuple(91127, 70783), tuple(1684, 38076), tuple(40928, 41294), tuple(97107, 76517), tuple(1797, 24093), tuple(99175, 29445), tuple(5788, 64502), tuple(66972, 23772), tuple(97394, 95256), tuple(26705, 92412), tuple(10676, 6686), tuple(28464, 74051), tuple(17598, 51675), tuple(76449, 50050), tuple(98812, 59818), tuple(92058, 6625), tuple(49804, 99637), tuple(28545, 32790), tuple(72167, 93636), tuple(29012, 95623), tuple(58249, 54541), tuple(98926, 71489), tuple(75062, 9546), tuple(47555, 5802), tuple(61606, 30979), tuple(10467, 46108), tuple(30491, 52750), tuple(52934, 38533), tuple(54616, 37276), tuple(55118, 2330), tuple(60402, 14806), tuple(25730, 88759), tuple(5209, 30946), tuple(92017, 41987), tuple(59747, 62415), tuple(6306, 53297), tuple(35770, 31254), tuple(13106, 99865), tuple(63519, 41637), tuple(7416, 68154), tuple(70874, 95983), tuple(20074, 2173), tuple(33740, 86880), tuple(45020, 65869), tuple(7302, 53494), tuple(98814, 2118), tuple(88287, 80646), tuple(18771, 30449), tuple(44557, 37984), tuple(45415, 36032), tuple(36584, 58485), tuple(57843, 52354), tuple(85647, 12150), tuple(33990, 89380), tuple(98597, 41936), tuple(19427, 53990), tuple(1457, 69269), tuple(68438, 14471), tuple(67175, 16881), tuple(82982, 78546), tuple(47661, 36294), tuple(63229, 48108), tuple(34390, 76095), tuple(32101, 57268), tuple(25322, 3312), tuple(17037, 2900), tuple(14342, 70149), tuple(10518, 1377), tuple(13553, 89073), tuple(97084, 80365), tuple(48340, 87192), tuple(84969, 21195), tuple(1031, 72944), tuple(78322, 68583), tuple(67238, 48374), tuple(77366, 55850), tuple(4383, 46759), tuple(51088, 76488), tuple(92049, 55847), tuple(32750, 16422), tuple(51788, 53619), tuple(56976, 88951), tuple(73323, 78435), tuple(3489, 15945), tuple(84231, 22302), tuple(25695, 881), tuple(19391, 11660), tuple(92578, 78349), tuple(52677, 17339), tuple(99132, 35975), tuple(25089, 70476), tuple(34144, 66544), tuple(59589, 59839), tuple(47333, 87623), tuple(4200, 6542), tuple(91781, 77813), tuple(77419, 17342), tuple(388, 90753), tuple(43401, 7351), tuple(81829, 74989), tuple(22381, 95695), tuple(90302, 61687), tuple(13534, 54534), tuple(43527, 47703), tuple(47856, 1186), tuple(10112, 16747), tuple(9508, 26179), tuple(96536, 57565), tuple(91052, 48922), tuple(38575, 45523), tuple(11602, 85317), tuple(22595, 21610), tuple(97849, 15638), tuple(95060, 20111), tuple(96011, 27148), tuple(37596, 10426), tuple(68667, 49057), tuple(68657, 90882), tuple(52704, 33574), tuple(54727, 59704), tuple(15853, 48283), tuple(47021, 60021), tuple(96208, 11440), tuple(6068, 49421), tuple(50363, 17684), tuple(53218, 19), tuple(82568, 3816), tuple(51, 7612), tuple(7073, 59063), tuple(92318, 38587), tuple(72388, 64952), tuple(33318, 5594), tuple(72806, 18573), tuple(1175, 88747), tuple(67044, 86039), tuple(17376, 41265), tuple(26356, 89524), tuple(55678, 15627), tuple(61156, 15723), tuple(43239, 59010), tuple(29054, 15261), tuple(57669, 21395), tuple(68469, 14849), tuple(92654, 69664), tuple(23975, 20021), tuple(73688, 12134), tuple(58053, 23849), tuple(56234, 18559), tuple(25051, 68957), tuple(15181, 91615), tuple(87633, 31040), tuple(17494, 78515), tuple(71971, 60923), tuple(44170, 21724), tuple(7088, 72107), tuple(12924, 47933), tuple(98139, 6819), tuple(57842, 2906), tuple(90278, 3534), tuple(61695, 82885), tuple(58831, 15129), tuple(32033, 34634), tuple(63477, 31357), tuple(29077, 28166), tuple(86531, 89574), tuple(46943, 79113), tuple(15667, 63523), tuple(65818, 93225), tuple(83392, 50497), tuple(7157, 88909), tuple(95101, 17111), tuple(8981, 35791), tuple(28328, 82722), tuple(70215, 66862), tuple(23442, 39128), tuple(21218, 27773), tuple(76215, 39265), tuple(56858, 62397), tuple(3610, 8766), tuple(7423, 48886), tuple(12235, 88792), tuple(44839, 55196), tuple(4896, 10080), tuple(87090, 73997), tuple(56745, 71875), tuple(58478, 57472), tuple(79423, 8771), tuple(76202, 95733), tuple(81635, 48857), tuple(82519, 5321), tuple(48756, 37198), tuple(20101, 61177), tuple(79047, 81682), tuple(23287, 88578), tuple(50984, 80946), tuple(855, 49074), tuple(11452, 56655), tuple(6289, 8916), tuple(33570, 636), tuple(28703, 80592), tuple(11820, 92299), tuple(75590, 80188), tuple(91365, 2787), tuple(22963, 43710), tuple(3996, 48007), tuple(59047, 96418), tuple(96710, 52447), tuple(65677, 99927), tuple(60727, 15115), tuple(8161, 65729), tuple(75253, 45731), tuple(88130, 79264), tuple(52087, 32657), tuple(89678, 22834), tuple(49244, 36835), tuple(74032, 5096), tuple(94142, 39297), tuple(51061, 21311), tuple(59391, 43458), tuple(90918, 95081), tuple(6058, 37018), tuple(29917, 54214), tuple(65986, 5543), tuple(99777, 69683), tuple(9447, 11273), tuple(54873, 47138), tuple(1306, 68306), tuple(15316, 55995), tuple(69280, 73432), tuple(63054, 28502), tuple(67161, 11333), tuple(40800, 26415), tuple(72350, 50225), tuple(7232, 67500), tuple(60631, 40338), tuple(96765, 51671), tuple(29375, 11235), tuple(52707, 93742), tuple(1317, 55926), tuple(51844, 29351), tuple(35754, 16733), tuple(23014, 56950), tuple(33119, 47531), tuple(27806, 39940), tuple(20119, 73119), tuple(18458, 45982), tuple(16605, 28759), tuple(43488, 86201), tuple(43560, 82883), tuple(85085, 1977), tuple(7129, 64077), tuple(36070, 80679), tuple(78638, 97212), tuple(71251, 5268), tuple(33610, 63341), tuple(16722, 15882), tuple(53876, 11734), tuple(35855, 14481), tuple(55072, 7889), tuple(37213, 73390), tuple(28899, 55948), tuple(51996, 77777), tuple(26621, 51914), tuple(44492, 36420), tuple(36437, 24452), tuple(158, 77935), tuple(3730, 7692), tuple(81372, 29050), tuple(29491, 3912), tuple(57098, 73393), tuple(55630, 53165), tuple(79003, 19421), tuple(47306, 40128), tuple(96332, 49995), tuple(54107, 83940), tuple(11203, 76678), tuple(53854, 284), tuple(96087, 22398), tuple(25481, 69301), tuple(2770, 77586), tuple(53004, 44915), tuple(56264, 41165), tuple(12335, 22090), tuple(47188, 40678), tuple(41823, 71805), tuple(81810, 47825), tuple(98892, 50696), tuple(74323, 93133), tuple(82867, 40800), tuple(28884, 29276), tuple(55697, 20888), tuple(96901, 37428), tuple(95509, 78780), tuple(6443, 65188), tuple(17669, 43924), tuple(29933, 97244), tuple(1024, 71265), tuple(47229, 99610), tuple(72546, 40811), tuple(43407, 41566), tuple(44692, 53743), tuple(76823, 95950), tuple(2509, 57091), tuple(85077, 96439), tuple(87650, 87716), tuple(3822, 84513), tuple(90864, 75439), tuple(22043, 21770), tuple(98371, 75482), tuple(63823, 48100), tuple(29999, 40875), tuple(97696, 33865), tuple(50880, 16402), tuple(21412, 70936), tuple(7150, 85970), tuple(73104, 57073), tuple(40099, 89138), tuple(6430, 36791), tuple(47677, 23485), tuple(21073, 86912), tuple(65018, 6092), tuple(89932, 58178), tuple(1264, 51681), tuple(42044, 40135), tuple(21774, 12190), tuple(13844, 87188), tuple(25807, 89548), tuple(74682, 31603), tuple(18482, 41232), tuple(906, 21841), tuple(10897, 39238), tuple(62134, 6083), tuple(80871, 66850), tuple(49659, 28587), tuple(61260, 22769), tuple(53795, 66637), tuple(89211, 32453), tuple(4271, 69472), tuple(1082, 32636), tuple(62012, 47870), tuple(7376, 77166), tuple(13150, 73275), tuple(66410, 85959), tuple(19018, 57311), tuple(30561, 58838), tuple(19981, 32087), tuple(91580, 42990), tuple(77139, 23774), tuple(10055, 99890), tuple(92160, 54537), tuple(75088, 70397), tuple(2361, 61066), tuple(81368, 40411), tuple(84946, 42564), tuple(41591, 42929), tuple(50399, 26116), tuple(51504, 63772), tuple(99828, 69531), tuple(19977, 17806), tuple(71259, 76567), tuple(78606, 25105), tuple(8859, 46469), tuple(19542, 73988), tuple(49804, 17349), tuple(65360, 96632), tuple(57740, 30812), tuple(9258, 26185), tuple(90573, 4815), tuple(39397, 10229), tuple(35300, 81687), tuple(5681, 22828), tuple(6274, 38340), tuple(44281, 67912), tuple(38385, 26507), tuple(95324, 84765), tuple(39288, 79779), tuple(4513, 28158), tuple(46060, 40293), tuple(70348, 87460), tuple(67754, 19569), tuple(70481, 94407), tuple(67636, 69316), tuple(14167, 81744), tuple(18928, 29706), tuple(32034, 45677), tuple(19801, 5902), tuple(42401, 62712), tuple(35220, 22823), tuple(33690, 22046), tuple(91281, 55953), tuple(4197, 96279), tuple(32901, 27074), tuple(35861, 5478), tuple(99166, 36251), tuple(70898, 80994), tuple(87491, 52808), tuple(59681, 30266), tuple(2944, 18646), tuple(77874, 7536), tuple(24534, 5416), tuple(90962, 47145), tuple(95367, 34461), tuple(10075, 74120), tuple(74276, 1837), tuple(38399, 63918), tuple(10526, 42662), tuple(33001, 37773), tuple(13642, 25741), tuple(5373, 82728), tuple(9830, 54625), tuple(13, 18937), tuple(90113, 52300), tuple(20973, 89640), tuple(44930, 1598), tuple(8100, 47745), tuple(80659, 78877), tuple(74154, 33417), tuple(18691, 37573), tuple(12477, 76628), tuple(73018, 89583), tuple(59029, 24879), tuple(85237, 31017), tuple(27701, 11025), tuple(24010, 76942), tuple(15627, 25276), tuple(89050, 16118), tuple(19776, 19318), tuple(24620, 1487), tuple(50157, 95158), tuple(53030, 72020), tuple(85571, 10817), tuple(29196, 92799), tuple(63501, 22445), tuple(26241, 54318), tuple(33769, 80112), tuple(25312, 50574), tuple(70583, 56662), tuple(74366, 82575), tuple(48461, 80545), tuple(18834, 39444), tuple(36597, 42715), tuple(86547, 38453), tuple(41067, 60718), tuple(33350, 25404), tuple(5532, 41438), tuple(45918, 84038), tuple(39040, 63724), tuple(37629, 66002), tuple(58037, 36196), tuple(21400, 17330), tuple(46491, 22602), tuple(88057, 89249), tuple(34188, 35948), tuple(8555, 42479), tuple(32961, 76606), tuple(22395, 93711), tuple(8058, 19591), tuple(72063, 64136), tuple(83360, 12607), tuple(20671, 78285), tuple(51887, 65373), tuple(71966, 39341), tuple(55953, 99780), tuple(56205, 98138), tuple(45986, 44708), tuple(62541, 28259), tuple(49450, 12641), tuple(5192, 36601), tuple(55295, 44352), tuple(83762, 4343), tuple(96203, 8870), tuple(21786, 73828), tuple(88830, 43827), tuple(96669, 84761), tuple(53061, 50061), tuple(52150, 47463), tuple(32090, 17570),
     tuple(71495, 45027), tuple(30215, 23717), tuple(37599, 19789), tuple(85208, 48465), tuple(83599, 78596), tuple(82141, 37105), tuple(74943, 37580), tuple(10322, 11520), tuple(550, 55062), tuple(80506, 57713), tuple(55489, 80453), tuple(64174, 49274), tuple(75521, 51005), tuple(26033, 58801), tuple(78661, 50218), tuple(31043, 17090), tuple(70612, 88736), tuple(42991, 49396), tuple(86331, 2300), tuple(66156, 6331), tuple(34534, 78649), tuple(9828, 40937), tuple(35852, 46533), tuple(68435, 12070), tuple(26443, 75772), tuple(50802, 16400), tuple(69413, 89875), tuple(2372, 97252), tuple(88334, 76754), tuple(29504, 25950), tuple(10792, 12935), tuple(3655, 90667), tuple(35951, 16244), tuple(73312, 82435), tuple(60914, 58748), tuple(89407, 86955), tuple(47210, 84195), tuple(77084, 4213), tuple(15419, 5719), tuple(12483, 39092), tuple(61890, 83360), tuple(94785, 37525), tuple(69219, 83790), tuple(79946, 42672), tuple(36898, 9693), tuple(10103, 82234), tuple(71679, 18297), tuple(88171, 43635), tuple(94828, 71283), tuple(76485, 56217), tuple(70048, 92642), tuple(12567, 8082), tuple(10011, 76160), tuple(31060, 30787), tuple(199, 65728), tuple(371, 74295), tuple(25505, 76411), tuple(70522, 8776), tuple(58390, 48835), tuple(88649, 10695), tuple(21754, 5143), tuple(62512, 77235), tuple(837, 57129), tuple(86979, 33448), tuple(21219, 78593), tuple(10048, 22504), tuple(82658, 80394), tuple(79451, 81707), tuple(5940, 72284), tuple(1555, 70284), tuple(65988, 40439), tuple(48165, 92837), tuple(33680, 39653), tuple(96852, 38612), tuple(72548, 82912), tuple(78383, 68910), tuple(69985, 12164), tuple(24334, 14856), tuple(27180, 67558), tuple(62131, 29120), tuple(28744, 40472), tuple(79896, 25579), tuple(7172, 42815), tuple(81070, 85827), tuple(76227, 51604), tuple(70056, 61128), tuple(58609, 12641), tuple(30207, 33772), tuple(7940, 82930), tuple(45176, 28620), tuple(43176, 9513), tuple(55515, 5743), tuple(92762, 34063), tuple(26540, 95690), tuple(69518, 13909), tuple(24403, 65731), tuple(41317, 12732), tuple(78020, 50738), tuple(64622, 2001), tuple(43604, 83548), tuple(46739, 79104), tuple(57132, 2737), tuple(16823, 37703), tuple(59239, 68217), tuple(49630, 75156), tuple(19535, 63429), tuple(19685, 63032), tuple(93214, 97701), tuple(21809, 44089), tuple(42700, 64026), tuple(37310, 12041), tuple(84416, 39080), tuple(70589, 59876), tuple(14692, 82526), tuple(36230, 38375), tuple(7345, 48208), tuple(65006, 85251), tuple(31754, 26359), tuple(65198, 7876), tuple(38917, 16682), tuple(39527, 24043), tuple(28543, 48728), tuple(38065, 98259), tuple(57509, 71565), tuple(7706, 85866), tuple(13059, 22966), tuple(91722, 83066), tuple(45269, 68810), tuple(82194, 85898), tuple(78369, 11390), tuple(79637, 70777), tuple(87544, 74018), tuple(73661, 4252), tuple(98305, 21715), tuple(19375, 35375), tuple(28324, 48444), tuple(97548, 89589), tuple(73031, 60766), tuple(34818, 1986), tuple(6206, 26488), tuple(67681, 6380), tuple(98946, 84665), tuple(98568, 37447), tuple(48649, 89141), tuple(72561, 2077), tuple(47055, 63199), tuple(3956, 93341), tuple(69392, 51121), tuple(71277, 40181), tuple(8509, 18405), tuple(77921, 54923), tuple(92137, 60652), tuple(30271, 32980),
-    tuple(60001, 93265), tuple(69240, 45514), tuple(57985, 21681), tuple(35096, 6101), tuple(49506, 76284), tuple(57253, 21325), tuple(98280, 15826), tuple(1605, 80735), tuple(74930, 30151), tuple(58035, 93534), tuple(17384, 31491), tuple(10971, 7060), tuple(73339, 68186), tuple(88781, 52103), tuple(11265, 46720), tuple(5115, 30293), tuple(75078, 87304), tuple(43439, 10072), tuple(27578, 33361), tuple(90981, 10158), tuple(24465, 57967), tuple(49938, 61510), tuple(55637, 44188), tuple(93963, 32210), tuple(68414, 40035), tuple(77261, 88709), tuple(55900, 34360), tuple(39675, 19672), tuple(66218, 19215), tuple(74660, 74886), tuple(82862, 19255), tuple(78221, 82950), tuple(71132, 13770), tuple(3866, 56030), tuple(78929, 78110), tuple(48142, 5965), tuple(80128, 31846), tuple(72670, 2531), tuple(14391, 67079), tuple(60542, 10720), tuple(91632, 40402), tuple(607, 14720), tuple(49500, 13967), tuple(70778, 83672), tuple(46041, 37708), tuple(83720, 574), tuple(57212, 80758), tuple(28854, 46858), tuple(39588, 19052), tuple(50803, 71521), tuple(66830, 71799), tuple(21002, 61070), tuple(96634, 39051), tuple(4459, 26782), tuple(63650, 82860), tuple(24099, 69429), tuple(80492, 18147), tuple(41087, 995), tuple(41768, 79625), tuple(48190, 75710), tuple(43300, 78132), tuple(53778, 79772), tuple(30657, 89149), tuple(75840, 5676), tuple(75810, 52995), tuple(36563, 23231), tuple(25721, 55136), tuple(15, 23168), tuple(63731, 64535), tuple(67136, 4648), tuple(25464, 28946), tuple(95215, 98695), tuple(64093, 28899), tuple(62809, 40760), tuple(44188, 52915), tuple(82358, 98065), tuple(24244, 56401), tuple(61636, 63848), tuple(95428, 93970), tuple(93539, 88332), tuple(57401, 68773), tuple(53502, 33067), tuple(3147, 65487), tuple(75811, 11287), tuple(58826, 7349), tuple(57494, 66861), tuple(99762, 33031), tuple(68299, 20951), tuple(26524, 96915), tuple(14698, 22392), tuple(55683, 85344), tuple(25084, 10755), tuple(52343, 73138), tuple(99839, 61148), tuple(33383, 66190), tuple(18810, 10835), tuple(918, 55695), tuple(2664, 46566), tuple(93105, 21138), tuple(27088, 16730), tuple(70156, 4974), tuple(10294, 62096), tuple(30808, 18639), tuple(25091, 43231), tuple(17920, 90076), tuple(40104, 54257), tuple(98729, 93113), tuple(92419, 16006), tuple(14446, 8769), tuple(24875, 34761), tuple(99525, 34543), tuple(67461, 47601), tuple(91998, 5899), tuple(19623, 58521), tuple(97278, 63650), tuple(8396, 20069), tuple(29854, 22735), tuple(33695, 25257), tuple(70338, 3989), tuple(14296, 96530), tuple(13790, 1350), tuple(33144, 55649), tuple(29072, 26337), tuple(68611, 7960), tuple(81765, 15614), tuple(16633, 80649), tuple(89942, 31234), tuple(50827, 73426), tuple(2282, 12998), tuple(8566, 65109), tuple(65979, 23638), tuple(24802, 56043), tuple(15638, 54100), tuple(51431, 80669), tuple(30744, 9349), tuple(80148, 87322), tuple(49673, 22775), tuple(2096, 72107), tuple(29876, 11845), tuple(99687, 4215), tuple(68797, 41891), tuple(11363, 79333), tuple(22351, 68211), tuple(41273, 34990), tuple(11414, 58625), tuple(83047, 28825), tuple(44579, 31219), tuple(8753, 35994), tuple(8321, 20399), tuple(97524, 48382), tuple(81485, 69822), tuple(38382, 42853), tuple(97045, 81294), tuple(95109, 9825), tuple(24648, 92398), tuple(23245, 28557), tuple(9114, 30750), tuple(66151, 5307), tuple(28704, 42997), tuple(76185, 18506), tuple(39182, 28385), tuple(12660, 487), tuple(81939, 70723), tuple(78752, 4369), tuple(49729, 16078), tuple(27760, 78394), tuple(27935, 65985), tuple(97170, 17974), tuple(45484, 51849), tuple(37792, 42775), tuple(50788, 50243), tuple(29730, 5771), tuple(8337, 32970), tuple(87282, 34536), tuple(82654, 40374), tuple(25936, 99591), tuple(87105, 44686), tuple(61326, 23201), tuple(48961, 39310), tuple(72404, 34074), tuple(47084, 53440), tuple(44566, 21551), tuple(27348, 31756), tuple(14445, 57694), tuple(3090, 78935), tuple(37165, 19519), tuple(42821, 24648), tuple(4987, 91817), tuple(15902, 33578), tuple(63028, 39291), tuple(9567, 41818), tuple(68851, 3311), tuple(1641, 59714), tuple(51932, 83190), tuple(40656, 19271), tuple(44882, 35988), tuple(94241, 78634), tuple(15970, 79214), tuple(11262, 56304), tuple(46638, 79764), tuple(9206, 54131), tuple(77132, 24211), tuple(38417, 34891), tuple(55196, 29011), tuple(64734, 42845), tuple(33857, 44248), tuple(40460, 66582), tuple(34542, 273), tuple(84169, 65245), tuple(83434, 25030), tuple(10937, 1189), tuple(35213, 89760), tuple(48231, 5149), tuple(49920, 97597), tuple(56463, 13926), tuple(35160, 4587), tuple(91526, 85881), tuple(38624, 54542), tuple(17138, 93601), tuple(16139, 72928), tuple(93357, 75097), tuple(84733, 99796), tuple(39474, 98875), tuple(97908, 58734), tuple(97237, 91217), tuple(77132, 32920), tuple(85467, 32730), tuple(83289, 18742), tuple(2980, 4330), tuple(44920, 11778), tuple(30191, 82779), tuple(34431, 45207), tuple(75529, 10325), tuple(4657, 36429), tuple(97464, 18604), tuple(29451, 14997), tuple(40066, 22598), tuple(49471, 66259), tuple(65164, 98515), tuple(64098, 47692), tuple(87542, 84786), tuple(41170, 49570), tuple(11476, 14536), tuple(82271, 79916), tuple(45889, 42059), tuple(84965, 90533), tuple(88733, 20381), tuple(86349, 66190), tuple(83280, 32409), tuple(38436, 35910), tuple(94362, 2535), tuple(13565, 12567), tuple(72551, 58564), tuple(886, 87999), tuple(73958, 94309), tuple(34030, 60715), tuple(25432, 92697), tuple(85922, 24244), tuple(46779, 52990), tuple(33807, 44621), tuple(39513, 51405), tuple(16668, 32353), tuple(60629, 14813), tuple(73095, 12227), tuple(17801, 38366), tuple(65927, 52833), tuple(33630, 50134), tuple(19975, 71026), tuple(93145, 90036), tuple(73555, 6383), tuple(71789, 81791), tuple(67429, 79036), tuple(20944, 39911), tuple(75838, 56480), tuple(29835, 80194), tuple(19570, 28901), tuple(16023, 82165), tuple(74259, 15283), tuple(11749, 92274), tuple(73537, 52362), tuple(54537, 37595), tuple(79004, 72436), tuple(49229, 21498), tuple(24364, 97373), tuple(81149, 61392), tuple(22421, 6442), tuple(62138, 86081), tuple(16098, 23700), tuple(66604, 86467), tuple(66505, 26263), tuple(57215, 12659), tuple(61267, 77421), tuple(58024, 98298), tuple(44273, 89699), tuple(62339, 73107), tuple(32540, 17768), tuple(31574, 77296), tuple(63336, 23439), tuple(26723, 45141), tuple(61380, 58474), tuple(6188, 2084), tuple(88225, 6631), tuple(10970, 70428), tuple(91223, 64312), tuple(89643, 76635), tuple(42796, 77154), tuple(34827, 21131), tuple(83014, 2253), tuple(34547, 12384), tuple(53922, 57591), tuple(12066, 44400), tuple(89686, 21284), tuple(81875, 3306), tuple(45972, 11207), tuple(96807, 28447), tuple(87662, 42334), tuple(68578, 37404), tuple(21195, 35583), tuple(97730, 41852), tuple(76425, 22959), tuple(63724, 64143), tuple(79182, 50739), tuple(81472, 79682), tuple(26980, 62332), tuple(60691, 50596), tuple(38526, 10488), tuple(74569, 46431), tuple(62677, 60189), tuple(35133, 21147), tuple(3271, 93368), tuple(14651, 76080), tuple(91349, 87952), tuple(7873, 51144), tuple(72431, 54715), tuple(15600, 69868), tuple(46998, 23805), tuple(7519, 75777), tuple(71758, 71673), tuple(23282, 37297), tuple(35646, 89327), tuple(44890, 58293), tuple(34223, 99155), tuple(87015, 18477), tuple(20511, 30210), tuple(82120, 13850), tuple(6382, 41946), tuple(97741, 86276), tuple(15521, 44501), tuple(87240, 57472), tuple(65334, 51695), tuple(34599, 97721), tuple(45366, 9007), tuple(91971, 7384), tuple(74698, 40735), tuple(73706, 9025), tuple(42569, 18928), tuple(62946, 62362), tuple(89350, 83255), tuple(26044, 85080), tuple(27725, 3814), tuple(45787, 32352), tuple(16115, 51701), tuple(3339, 72851), tuple(60161, 34406), tuple(24699, 43473), tuple(28681, 573), tuple(95106, 16784), tuple(74232, 5831), tuple(55361, 1366), tuple(7020, 37807), tuple(52490, 8558), tuple(91203, 64944), tuple(90783, 64700), tuple(76499, 12592), tuple(97070, 9395), tuple(46602, 12688), tuple(79052, 31675), tuple(29316, 93503), tuple(14095, 3100), tuple(15066, 86579), tuple(24651, 10981), tuple(90683, 70162), tuple(60604, 89175), tuple(55172, 34997), tuple(61098, 17843), tuple(2376, 21399), tuple(38186, 60680), tuple(58637, 11541), tuple(11101, 69351), tuple(70200, 67918), tuple(49245, 85252), tuple(4201, 24436), tuple(56636, 87099), tuple(21406, 33757), tuple(29044, 43846), tuple(93900, 68223), tuple(34429, 92683), tuple(76720, 79334), tuple(4035, 30364), tuple(20145, 44853), tuple(46689, 21352), tuple(49446, 77224), tuple(71241, 85720), tuple(27177, 88332), tuple(60151, 49376), tuple(67102, 74396), tuple(242, 26346), tuple(22004, 95064), tuple(2709, 71452), tuple(71673, 86838), tuple(36918, 17777), tuple(37414, 88149), tuple(2356, 70290), tuple(84416, 35509), tuple(32285, 54585), tuple(9937, 23465), tuple(3385, 25949), tuple(97379, 87409), tuple(72714, 43570), tuple(54831, 64883), tuple(80885, 81082), tuple(89673, 5765), tuple(84585, 51627), tuple(64497, 72931), tuple(71948, 60922), tuple(70011, 37446), tuple(81022, 43696), tuple(11413, 58709), tuple(89710, 85350), tuple(96004, 36589), tuple(99270, 82834), tuple(52367, 12117), tuple(62108, 56693), tuple(69090, 34612), tuple(56109, 22008), tuple(36036, 34493), tuple(88561, 4651), tuple(44403, 60712), tuple(91912, 19116), tuple(40545, 94625), tuple(47973, 46963), tuple(30704, 99285), tuple(9596, 21976), tuple(84723, 81323), tuple(98123, 90434), tuple(35842, 29225), tuple(91271, 14003), tuple(42320, 16108), tuple(14171, 88861), tuple(15139, 84030), tuple(31008, 58743), tuple(86149, 98215), tuple(59768, 15217), tuple(85628, 82450), tuple(14256, 2254), tuple(44961, 44326), tuple(86313, 69953), tuple(99151, 37777), tuple(46152, 77035), tuple(36868, 62695), tuple(37233, 49305), tuple(20706, 56446), tuple(75773, 90240), tuple(88130, 91556), tuple(89753, 38172), tuple(31191, 98583), tuple(31412, 81334), tuple(57662, 15890), tuple(9195, 3322), tuple(94618, 22144), tuple(24709, 24446), tuple(54382, 68062), tuple(17085, 30960), tuple(53538, 12827), tuple(12512, 56172), tuple(26611, 90242), tuple(92812, 98619), tuple(82930, 90399), tuple(2299, 45362), tuple(48505, 88997),            
+    tuple(60001, 93265), tuple(69240, 45514), tuple(57985, 21681), tuple(35096, 6101), tuple(49506, 76284), tuple(57253, 21325), tuple(98280, 15826), tuple(1605, 80735), tuple(74930, 30151), tuple(58035, 93534), tuple(17384, 31491), tuple(10971, 7060), tuple(73339, 68186), tuple(88781, 52103), tuple(11265, 46720), tuple(5115, 30293), tuple(75078, 87304), tuple(43439, 10072), tuple(27578, 33361), tuple(90981, 10158), tuple(24465, 57967), tuple(49938, 61510), tuple(55637, 44188), tuple(93963, 32210), tuple(68414, 40035), tuple(77261, 88709), tuple(55900, 34360), tuple(39675, 19672), tuple(66218, 19215), tuple(74660, 74886), tuple(82862, 19255), tuple(78221, 82950), tuple(71132, 13770), tuple(3866, 56030), tuple(78929, 78110), tuple(48142, 5965), tuple(80128, 31846), tuple(72670, 2531), tuple(14391, 67079), tuple(60542, 10720), tuple(91632, 40402), tuple(607, 14720), tuple(49500, 13967), tuple(70778, 83672), tuple(46041, 37708), tuple(83720, 574), tuple(57212, 80758), tuple(28854, 46858), tuple(39588, 19052), tuple(50803, 71521), tuple(66830, 71799), tuple(21002, 61070), tuple(96634, 39051), tuple(4459, 26782), tuple(63650, 82860), tuple(24099, 69429), tuple(80492, 18147), tuple(41087, 995), tuple(41768, 79625), tuple(48190, 75710), tuple(43300, 78132), tuple(53778, 79772), tuple(30657, 89149), tuple(75840, 5676), tuple(75810, 52995), tuple(36563, 23231), tuple(25721, 55136), tuple(15, 23168), tuple(63731, 64535), tuple(67136, 4648), tuple(25464, 28946), tuple(95215, 98695), tuple(64093, 28899), tuple(62809, 40760), tuple(44188, 52915), tuple(82358, 98065), tuple(24244, 56401), tuple(61636, 63848), tuple(95428, 93970), tuple(93539, 88332), tuple(57401, 68773), tuple(53502, 33067), tuple(3147, 65487), tuple(75811, 11287), tuple(58826, 7349), tuple(57494, 66861), tuple(99762, 33031), tuple(68299, 20951), tuple(26524, 96915), tuple(14698, 22392), tuple(55683, 85344), tuple(25084, 10755), tuple(52343, 73138), tuple(99839, 61148), tuple(33383, 66190), tuple(18810, 10835), tuple(918, 55695), tuple(2664, 46566), tuple(93105, 21138), tuple(27088, 16730), tuple(70156, 4974), tuple(10294, 62096), tuple(30808, 18639), tuple(25091, 43231), tuple(17920, 90076), tuple(40104, 54257), tuple(98729, 93113), tuple(92419, 16006), tuple(14446, 8769), tuple(24875, 34761), tuple(99525, 34543), tuple(67461, 47601), tuple(91998, 5899), tuple(19623, 58521), tuple(97278, 63650), tuple(8396, 20069), tuple(29854, 22735), tuple(33695, 25257), tuple(70338, 3989), tuple(14296, 96530), tuple(13790, 1350), tuple(33144, 55649), tuple(29072, 26337), tuple(68611, 7960), tuple(81765, 15614), tuple(16633, 80649), tuple(89942, 31234), tuple(50827, 73426), tuple(2282, 12998), tuple(8566, 65109), tuple(65979, 23638), tuple(24802, 56043), tuple(15638, 54100), tuple(51431, 80669), tuple(30744, 9349), tuple(80148, 87322), tuple(49673, 22775), tuple(2096, 72107), tuple(29876, 11845), tuple(99687, 4215), tuple(68797, 41891), tuple(11363, 79333), tuple(22351, 68211), tuple(41273, 34990), tuple(11414, 58625), tuple(83047, 28825), tuple(44579, 31219), tuple(8753, 35994), tuple(8321, 20399), tuple(97524, 48382), tuple(81485, 69822), tuple(38382, 42853), tuple(97045, 81294), tuple(95109, 9825), tuple(24648, 92398), tuple(23245, 28557), tuple(9114, 30750), tuple(66151, 5307), tuple(28704, 42997), tuple(76185, 18506), tuple(39182, 28385), tuple(12660, 487), tuple(81939, 70723), tuple(78752, 4369), tuple(49729, 16078), tuple(27760, 78394), tuple(27935, 65985), tuple(97170, 17974), tuple(45484, 51849), tuple(37792, 42775), tuple(50788, 50243), tuple(29730, 5771), tuple(8337, 32970), tuple(87282, 34536), tuple(82654, 40374), tuple(25936, 99591), tuple(87105, 44686), tuple(61326, 23201), tuple(48961, 39310), tuple(72404, 34074), tuple(47084, 53440), tuple(44566, 21551), tuple(27348, 31756), tuple(14445, 57694), tuple(3090, 78935), tuple(37165, 19519), tuple(42821, 24648), tuple(4987, 91817), tuple(15902, 33578), tuple(63028, 39291), tuple(9567, 41818), tuple(68851, 3311), tuple(1641, 59714), tuple(51932, 83190), tuple(40656, 19271), tuple(44882, 35988), tuple(94241, 78634), tuple(15970, 79214), tuple(11262, 56304), tuple(46638, 79764), tuple(9206, 54131), tuple(77132, 24211), tuple(38417, 34891), tuple(55196, 29011), tuple(64734, 42845), tuple(33857, 44248), tuple(40460, 66582), tuple(34542, 273), tuple(84169, 65245), tuple(83434, 25030), tuple(10937, 1189), tuple(35213, 89760), tuple(48231, 5149), tuple(49920, 97597), tuple(56463, 13926), tuple(35160, 4587), tuple(91526, 85881), tuple(38624, 54542), tuple(17138, 93601), tuple(16139, 72928), tuple(93357, 75097), tuple(84733, 99796), tuple(39474, 98875), tuple(97908, 58734), tuple(97237, 91217), tuple(77132, 32920), tuple(85467, 32730), tuple(83289, 18742), tuple(2980, 4330), tuple(44920, 11778), tuple(30191, 82779), tuple(34431, 45207), tuple(75529, 10325), tuple(4657, 36429), tuple(97464, 18604), tuple(29451, 14997), tuple(40066, 22598), tuple(49471, 66259), tuple(65164, 98515), tuple(64098, 47692), tuple(87542, 84786), tuple(41170, 49570), tuple(11476, 14536), tuple(82271, 79916), tuple(45889, 42059), tuple(84965, 90533), tuple(88733, 20381), tuple(86349, 66190), tuple(83280, 32409), tuple(38436, 35910), tuple(94362, 2535), tuple(13565, 12567), tuple(72551, 58564), tuple(886, 87999), tuple(73958, 94309), tuple(34030, 60715), tuple(25432, 92697), tuple(85922, 24244), tuple(46779, 52990), tuple(33807, 44621), tuple(39513, 51405), tuple(16668, 32353), tuple(60629, 14813), tuple(73095, 12227), tuple(17801, 38366), tuple(65927, 52833), tuple(33630, 50134), tuple(19975, 71026), tuple(93145, 90036), tuple(73555, 6383), tuple(71789, 81791), tuple(67429, 79036), tuple(20944, 39911), tuple(75838, 56480), tuple(29835, 80194), tuple(19570, 28901), tuple(16023, 82165), tuple(74259, 15283), tuple(11749, 92274), tuple(73537, 52362), tuple(54537, 37595), tuple(79004, 72436), tuple(49229, 21498), tuple(24364, 97373), tuple(81149, 61392), tuple(22421, 6442), tuple(62138, 86081), tuple(16098, 23700), tuple(66604, 86467), tuple(66505, 26263), tuple(57215, 12659), tuple(61267, 77421), tuple(58024, 98298), tuple(44273, 89699), tuple(62339, 73107), tuple(32540, 17768), tuple(31574, 77296), tuple(63336, 23439), tuple(26723, 45141), tuple(61380, 58474), tuple(6188, 2084), tuple(88225, 6631), tuple(10970, 70428), tuple(91223, 64312), tuple(89643, 76635), tuple(42796, 77154), tuple(34827, 21131), tuple(83014, 2253), tuple(34547, 12384), tuple(53922, 57591), tuple(12066, 44400), tuple(89686, 21284), tuple(81875, 3306), tuple(45972, 11207), tuple(96807, 28447), tuple(87662, 42334), tuple(68578, 37404), tuple(21195, 35583), tuple(97730, 41852), tuple(76425, 22959), tuple(63724, 64143), tuple(79182, 50739), tuple(81472, 79682), tuple(26980, 62332), tuple(60691, 50596), tuple(38526, 10488), tuple(74569, 46431), tuple(62677, 60189), tuple(35133, 21147), tuple(3271, 93368), tuple(14651, 76080), tuple(91349, 87952), tuple(7873, 51144), tuple(72431, 54715), tuple(15600, 69868), tuple(46998, 23805), tuple(7519, 75777), tuple(71758, 71673), tuple(23282, 37297), tuple(35646, 89327), tuple(44890, 58293), tuple(34223, 99155), tuple(87015, 18477), tuple(20511, 30210), tuple(82120, 13850), tuple(6382, 41946), tuple(97741, 86276), tuple(15521, 44501), tuple(87240, 57472), tuple(65334, 51695), tuple(34599, 97721), tuple(45366, 9007), tuple(91971, 7384), tuple(74698, 40735), tuple(73706, 9025), tuple(42569, 18928), tuple(62946, 62362), tuple(89350, 83255), tuple(26044, 85080), tuple(27725, 3814), tuple(45787, 32352), tuple(16115, 51701), tuple(3339, 72851), tuple(60161, 34406), tuple(24699, 43473), tuple(28681, 573), tuple(95106, 16784), tuple(74232, 5831), tuple(55361, 1366), tuple(7020, 37807), tuple(52490, 8558), tuple(91203, 64944), tuple(90783, 64700), tuple(76499, 12592), tuple(97070, 9395), tuple(46602, 12688), tuple(79052, 31675), tuple(29316, 93503), tuple(14095, 3100), tuple(15066, 86579), tuple(24651, 10981), tuple(90683, 70162), tuple(60604, 89175), tuple(55172, 34997), tuple(61098, 17843), tuple(2376, 21399), tuple(38186, 60680), tuple(58637, 11541), tuple(11101, 69351), tuple(70200, 67918), tuple(49245, 85252), tuple(4201, 24436), tuple(56636, 87099), tuple(21406, 33757), tuple(29044, 43846), tuple(93900, 68223), tuple(34429, 92683), tuple(76720, 79334), tuple(4035, 30364), tuple(20145, 44853), tuple(46689, 21352), tuple(49446, 77224), tuple(71241, 85720), tuple(27177, 88332), tuple(60151, 49376), tuple(67102, 74396), tuple(242, 26346), tuple(22004, 95064), tuple(2709, 71452), tuple(71673, 86838), tuple(36918, 17777), tuple(37414, 88149), tuple(2356, 70290), tuple(84416, 35509), tuple(32285, 54585), tuple(9937, 23465), tuple(3385, 25949), tuple(97379, 87409), tuple(72714, 43570), tuple(54831, 64883), tuple(80885, 81082), tuple(89673, 5765), tuple(84585, 51627), tuple(64497, 72931), tuple(71948, 60922), tuple(70011, 37446), tuple(81022, 43696), tuple(11413, 58709), tuple(89710, 85350), tuple(96004, 36589), tuple(99270, 82834), tuple(52367, 12117), tuple(62108, 56693), tuple(69090, 34612), tuple(56109, 22008), tuple(36036, 34493), tuple(88561, 4651), tuple(44403, 60712), tuple(91912, 19116), tuple(40545, 94625), tuple(47973, 46963), tuple(30704, 99285), tuple(9596, 21976), tuple(84723, 81323), tuple(98123, 90434), tuple(35842, 29225), tuple(91271, 14003), tuple(42320, 16108), tuple(14171, 88861), tuple(15139, 84030), tuple(31008, 58743), tuple(86149, 98215), tuple(59768, 15217), tuple(85628, 82450), tuple(14256, 2254), tuple(44961, 44326), tuple(86313, 69953), tuple(99151, 37777), tuple(46152, 77035), tuple(36868, 62695), tuple(37233, 49305), tuple(20706, 56446), tuple(75773, 90240), tuple(88130, 91556), tuple(89753, 38172), tuple(31191, 98583), tuple(31412, 81334), tuple(57662, 15890), tuple(9195, 3322), tuple(94618, 22144), tuple(24709, 24446), tuple(54382, 68062), tuple(17085, 30960), tuple(53538, 12827), tuple(12512, 56172), tuple(26611, 90242), tuple(92812, 98619), tuple(82930, 90399), tuple(2299, 45362), tuple(48505, 88997),
     tuple(58709, 77683), tuple(85901, 33672), tuple(45070, 24491), tuple(79005, 44787), tuple(7154, 14290), tuple(56684, 35166), tuple(76459, 60609), tuple(6006, 47402), tuple(54755, 19015), tuple(5139, 33177), tuple(13725, 50051), tuple(95929, 58683), tuple(91114, 68401), tuple(88846, 23283), tuple(37153, 36426), tuple(36564, 32035), tuple(49852, 49501), tuple(2052, 59285), tuple(69847, 54966), tuple(82614, 10395), tuple(72068, 35582), tuple(50427, 19892), tuple(75612, 3545), tuple(75480, 26985), tuple(24227, 50112), tuple(22718, 52206), tuple(35801, 41679), tuple(17753, 44416), tuple(4688, 82170), tuple(36935, 6606), tuple(71549, 86720), tuple(53592, 68769), tuple(92671, 84617), tuple(97726, 13655), tuple(65006, 17474), tuple(25287, 80826), tuple(22202, 25703), tuple(98743, 71876), tuple(72914, 31392), tuple(54184, 1294), tuple(9353, 10518), tuple(93822, 74538), tuple(85863, 56357), tuple(56088, 14448), tuple(12427, 27727), tuple(1846, 350), tuple(96301, 21623), tuple(55225, 23813), tuple(76947, 60946), tuple(65400, 17489), tuple(80586, 79099), tuple(56913, 46914), tuple(49218, 53295), tuple(14085, 52313), tuple(71158, 14144), tuple(3641, 69327), tuple(43705, 93045), tuple(67880, 95849), tuple(88054, 66156), tuple(17425, 69320), tuple(16391, 271), tuple(31768, 8817), tuple(63156, 21471), tuple(97831, 43504), tuple(54300, 54402), tuple(8740, 27894), tuple(93805, 30183), tuple(76233, 26322), tuple(60307, 8348), tuple(63019, 32334), tuple(7086, 44838), tuple(93127, 94482), tuple(20146, 84889), tuple(33674, 2513), tuple(66860, 65753), tuple(69174, 35906), tuple(93800, 41975), tuple(31206, 93599), tuple(75620, 60674), tuple(77082, 60773), tuple(75564, 20627), tuple(53060, 67879), tuple(52568, 22722), tuple(4102, 42037), tuple(66549, 71191), tuple(20817, 80946), tuple(13469, 96144), tuple(29852, 713), tuple(72644, 98510), tuple(12567, 54057), tuple(28746, 72197), tuple(80235, 51566), tuple(11953, 73225), tuple(42732, 91659), tuple(19673, 29661), tuple(94438, 41029), tuple(21884, 91078), tuple(29280, 68018), tuple(973, 75825), tuple(83476, 79334), tuple(99077, 625), tuple(63309, 91304), tuple(11626, 33709), tuple(33735, 6897), tuple(12585, 17114), tuple(45256, 57549), tuple(65150, 2524), tuple(10399, 34571), tuple(32783, 6045), tuple(11900, 12875), tuple(4393, 3129), tuple(61420, 63521), tuple(11799, 9092), tuple(45887, 36931), tuple(84256, 71195), tuple(51949, 32406), tuple(34640, 11424), tuple(84866, 46109), tuple(23449, 51873), tuple(22371, 86773), tuple(32155, 25902), tuple(75058, 66016), tuple(21217, 19002), tuple(44067, 59363), tuple(55901, 87102), tuple(71213, 82390), tuple(88408, 22154), tuple(18231, 86852), tuple(96803, 72776), tuple(58608, 53500), tuple(40747, 8542), tuple(60870, 41475), tuple(39578, 66560), tuple(49522, 25492), tuple(3485, 13917), tuple(60177, 43310), tuple(70317, 69166), tuple(71910, 92946), tuple(14427, 320), tuple(5224, 79108), tuple(20986, 81899), tuple(34637, 53572), tuple(14919, 27426), tuple(8052, 10082), tuple(27936, 24128), tuple(73732, 97758), tuple(31869, 5719), tuple(22135, 86985), tuple(85977, 79381), tuple(41587, 34012), tuple(75912, 66428), tuple(62117, 37249), tuple(70197, 91261),
-    tuple(99703, 96452), tuple(33036, 30249), tuple(33709, 99448), tuple(30343, 2962), tuple(54245, 80785), tuple(13866, 99804), tuple(49392, 62886), tuple(8530, 38228), tuple(86249, 60394), tuple(96787, 88788), tuple(42724, 88066), tuple(97051, 85589), tuple(41414, 88972), tuple(4384, 2025), tuple(46524, 87620), tuple(5823, 36079), tuple(78720, 13519), tuple(59092, 88699), tuple(24120, 6388), tuple(51664, 71039), tuple(28756, 43890), tuple(13729, 27176), tuple(86717, 82448), tuple(65598, 34805), tuple(74975, 52791), tuple(65429, 97173), tuple(92472, 53334), tuple(18778, 40576), tuple(72776, 48956), tuple(61833, 85936), tuple(81344, 48055), tuple(89467, 91099), tuple(82333, 15367), tuple(6019, 98391), tuple(52943, 15338), tuple(29662, 21975), tuple(71935, 47606), tuple(54633, 72216), tuple(51648, 52203), tuple(84649, 31791), tuple(26281, 82065), tuple(83163, 43394), tuple(79859, 55897), tuple(84706, 38368), tuple(97175, 88009), tuple(92800, 82164), tuple(79819, 13645), tuple(42754, 6273), tuple(97025, 79579), tuple(35694, 44160), tuple(96053, 24801), tuple(60315, 14411), tuple(25961, 82303), tuple(1791, 53355), tuple(15508, 43236), tuple(35667, 84655), tuple(73764, 82190), tuple(14465, 72390), tuple(92464, 30555), tuple(14121, 31360), tuple(27630, 78672), tuple(35483, 47439), tuple(79467, 73233), tuple(33010, 49718), tuple(43095, 2002), tuple(3755, 4070), tuple(25460, 21281), tuple(52718, 27575), tuple(97091, 78423), tuple(76536, 86761), tuple(10682, 27325), tuple(55401, 99488), tuple(34196, 88793), tuple(88024, 37693), tuple(4586, 62614), tuple(74857, 37796), tuple(19724, 59109), tuple(17642, 34748), tuple(87983, 11996), tuple(6814, 68602), tuple(63566, 16836), tuple(21026, 42675), tuple(3528, 81994), tuple(58141, 81954), tuple(79520, 99518), tuple(52627, 62974), tuple(42056, 1000), tuple(85464, 63420), tuple(30434, 86139), tuple(59754, 88493), tuple(41386, 76058), tuple(27894, 78093), tuple(63842, 72458), tuple(6928, 37187), tuple(34478, 5193), tuple(57116, 24009), tuple(24858, 84226), tuple(462, 93589), tuple(86510, 80240), tuple(78044, 98234), tuple(30812, 40060), tuple(423, 46196), tuple(47139, 89017), tuple(26066, 21081), tuple(45463, 37260), tuple(34366, 23814), tuple(45937, 79795), tuple(89975, 20405), tuple(21792, 43980), tuple(13675, 11145), tuple(98902, 47577), tuple(20383, 49241), tuple(97905, 16457), tuple(85839, 23279), tuple(33931, 13532), tuple(91486, 54207), tuple(46981, 41204), tuple(49524, 10080), tuple(21201, 3854), tuple(70178, 71393), tuple(26825, 35670), tuple(91350, 92038), tuple(82297, 81201), tuple(47908, 26073), tuple(6456, 40194), tuple(45104, 62038), tuple(75781, 55421), tuple(49561, 35610), tuple(47838, 93109), tuple(25109, 10837), tuple(16666, 99790), tuple(54882, 29259), tuple(28169, 76030), tuple(99605, 78334), tuple(19151, 86372), tuple(48747, 64053), tuple(78764, 38705), tuple(43762, 3756), tuple(22725, 14026), tuple(85174, 6263), tuple(76327, 1072), tuple(92817, 63030), tuple(59923, 28851), tuple(39614, 77354), tuple(54467, 80792), tuple(37309, 8679), tuple(42247, 28830), tuple(60892, 36834), tuple(54108, 62952), tuple(33682, 52992), tuple(87318, 63605), tuple(3180, 91762), tuple(24774, 12744), tuple(4431, 74084), tuple(11712, 7577), tuple(31451, 18294), tuple(68722, 16450), tuple(52185, 92005), tuple(97312, 33963), tuple(43882, 84266), tuple(39958, 52806), tuple(4759, 32862), tuple(33017, 81530), tuple(88475, 9613), tuple(72656, 43214), tuple(27288, 91542), tuple(67232, 47120), tuple(12714, 59507), tuple(17175, 58197), tuple(1719, 97181), tuple(2806, 5682), tuple(22373, 80608), tuple(72129, 33750), tuple(97168, 75472), tuple(16157, 5484), tuple(93177, 59589), tuple(7019, 19832), tuple(63810, 80313), tuple(23551, 45065), tuple(59657, 37189), tuple(12995, 84512), tuple(44630, 12434), tuple(28833, 8088), tuple(56795, 10570), tuple(22385, 4138), tuple(39502, 41865), tuple(67720, 31597), tuple(54837, 8933), tuple(19906, 12496), tuple(69993, 30745), tuple(94886, 98186), tuple(6474, 37743), tuple(62063, 5596), tuple(52064, 33592), tuple(57476, 84891), tuple(88798, 43044), tuple(55029, 97222), tuple(73911, 11862), tuple(1205, 76381), tuple(13388, 4303), tuple(73635, 55410), tuple(97777, 32985), tuple(94358, 49709), tuple(62607, 76061), tuple(62525, 8598), tuple(10327, 11235), tuple(18778, 991), tuple(16602, 1008), tuple(6311, 36329), tuple(6464, 33473), tuple(71418, 15828), tuple(49777, 9630), tuple(67644, 45616), tuple(97118, 54851), tuple(79498, 75515), tuple(45056, 12838), tuple(51110, 53572), tuple(4941, 80166), tuple(16052, 81909), tuple(24336, 25459), tuple(60437, 70317), tuple(51544, 8762), tuple(44978, 27145), tuple(78113, 27193), tuple(45148, 7278), tuple(78858, 90800), tuple(29864, 14191), tuple(67835, 78395), tuple(45893, 74512), tuple(81523, 270), tuple(51436, 75334), tuple(39456, 65552), tuple(89548, 42368), tuple(8953, 17953), tuple(47296, 52855), tuple(36236, 70545), tuple(99705, 30645), tuple(58038, 43017), tuple(95851, 60592), tuple(50658, 98282), tuple(48614, 74538), tuple(29026, 6898), tuple(57506, 97917), tuple(33553, 11205), tuple(92292, 53328), tuple(37861, 10865), tuple(70306, 43839), tuple(52283, 94600), tuple(68802, 95126), tuple(92765, 91310), tuple(2574, 45229), tuple(12463, 45681), tuple(73331, 83847), tuple(22565, 66014), tuple(52454, 22571), tuple(17530, 55911), tuple(7358, 36106), tuple(54186, 27674), tuple(55476, 166), tuple(12926, 8902), tuple(63782, 1616), tuple(60085, 35021), tuple(86605, 99026), tuple(7432, 57161), tuple(37268, 11832), tuple(3860, 95662), tuple(30339, 54518), tuple(26163, 96043), tuple(26092, 71977), tuple(63899, 7792), tuple(9804, 66302), tuple(81779, 54515), tuple(2861, 42418), tuple(44736, 75647), tuple(50912, 53848), tuple(72120, 3651), tuple(91526, 72999), tuple(71642, 69795), tuple(40664, 37695), tuple(57357, 83958), tuple(41666, 52277), tuple(49209, 99223), tuple(47274, 75571), tuple(64326, 88981), tuple(67848, 52903), tuple(44013, 43796), tuple(21678, 8103), tuple(74827, 132), tuple(88279, 49672), tuple(10747, 85149), tuple(74506, 99115), tuple(89615, 95102), tuple(14077, 79858), tuple(55139, 17814), tuple(5519, 48761), tuple(62278, 39931), tuple(58406, 38267), tuple(58705, 86071), tuple(63443, 11013), tuple(53144, 22114), tuple(78535, 70561), tuple(85423, 36012), tuple(3285, 72479), tuple(73658, 19340), tuple(18511, 10477), tuple(60780, 75674), tuple(88032, 88205), tuple(35386, 23855), tuple(49977, 32673), tuple(93206, 71515), tuple(3482, 73115), tuple(48423, 52857), tuple(11899, 30649), tuple(59730, 15323), tuple(89442, 87402), tuple(439, 50184), tuple(98106, 42819), tuple(25941, 82842), tuple(82980, 56368), tuple(71420, 11196), tuple(20860, 78799), tuple(71131, 53182), tuple(45795, 85122), tuple(34635, 83218), tuple(78160, 79377), tuple(8534, 26595), tuple(35248, 17819), tuple(54060, 99480), tuple(36087, 84130), tuple(16001, 59701), tuple(63490, 15318), tuple(41259, 62966), tuple(79583, 94979), tuple(49892, 92957), tuple(8542, 94075), tuple(66339, 33975), tuple(21084, 67889), tuple(14718, 20930), tuple(1760, 60204), tuple(42318, 36873), tuple(2306, 42786), tuple(1667, 59179), tuple(29425, 64430), tuple(64436, 4268), tuple(52666, 79958), tuple(11248, 35590), tuple(37352, 72786), tuple(79273, 24409), tuple(47965, 59976), tuple(61729, 87562), tuple(22673, 52091), tuple(58668, 33485), tuple(60556, 6194), tuple(9974, 17532), tuple(91645, 12490), tuple(16690, 75552), tuple(30983, 79572), tuple(73896, 87577), tuple(82325, 6966), tuple(46769, 19266), tuple(6691, 2816), tuple(65074, 51276), tuple(83174, 210), tuple(38395, 19191), tuple(83871, 939), tuple(9543, 23700), tuple(18316, 3882), tuple(18604, 6191), tuple(53431, 2917), tuple(71291, 3352), tuple(46424, 29885), tuple(44395, 57382), tuple(95028, 33049), tuple(96372, 2057), tuple(26911, 14241), tuple(35535, 27007), tuple(25527, 36480), tuple(13612, 95407), tuple(56176, 82284), tuple(28597, 48562), tuple(76438, 43785), tuple(17631, 15131), tuple(18728, 76676), tuple(49606, 60663), tuple(64878, 57243), tuple(10925, 14798), tuple(72592, 95876), tuple(8144, 58293), tuple(36923, 57214), tuple(82893, 42678), tuple(15533, 63570), tuple(66619, 96607), tuple(32491, 70158), tuple(25175, 70456), tuple(54365, 64639), tuple(56529, 44275), tuple(85598, 13051), tuple(82052, 78051), tuple(6802, 14950), tuple(18964, 77404), tuple(69285, 33899), tuple(42496, 817), tuple(80092, 73354), tuple(44095, 57405), tuple(6715, 98298), tuple(82698, 65201), tuple(25536, 48241), tuple(60721, 38389), tuple(72591, 3716), tuple(76974, 58694), tuple(39723, 66127), tuple(21781, 27885), tuple(57871, 26565), tuple(57327, 1713), tuple(43406, 68141), tuple(65690, 21025), tuple(77459, 59220), tuple(78038, 40571), tuple(44248, 86386), tuple(17714, 38469), tuple(14993, 99711), tuple(18231, 62648), tuple(8081, 2797), tuple(73996, 60186), tuple(98808, 9291), tuple(93219, 32512), tuple(45831, 71316), tuple(9315, 81476), tuple(31933, 97130), tuple(20920, 2404), tuple(31015, 11982), tuple(1251, 81196), tuple(35575, 4027), tuple(81650, 61732), tuple(10241, 79907), tuple(53046, 95973), tuple(68668, 48509), tuple(656, 1992), tuple(10061, 89424), tuple(11047, 71227), tuple(10089, 90496), tuple(57613, 95766), tuple(38775, 44707), tuple(10140, 62292), tuple(91276, 50321), tuple(75890, 59520), tuple(32977, 39392), tuple(43150, 88441), tuple(51314, 81453), tuple(57440, 53885), tuple(85712, 10329), tuple(52723, 17377), tuple(29648, 83895), tuple(41142, 80706), tuple(4167, 43740), tuple(49249, 91247), tuple(15721, 53638), tuple(95764, 35654), tuple(21318, 81252), tuple(97676, 77111), tuple(27613, 35504), tuple(20973, 47975), tuple(60292, 36376), tuple(78092, 59608), tuple(53682, 29368), tuple(95342, 22174), tuple(2289, 80842), tuple(97276, 49917), tuple(21421, 37624), tuple(50678, 98609), tuple(49240, 25174), tuple(64603, 13614), tuple(75402, 61541), tuple(80112, 45397), tuple(14289, 87479), tuple(16888, 98577), tuple(14999, 80972), tuple(64689, 57967), tuple(79391, 54976), tuple(37446, 39412), tuple(86682, 70785),       
+    tuple(99703, 96452), tuple(33036, 30249), tuple(33709, 99448), tuple(30343, 2962), tuple(54245, 80785), tuple(13866, 99804), tuple(49392, 62886), tuple(8530, 38228), tuple(86249, 60394), tuple(96787, 88788), tuple(42724, 88066), tuple(97051, 85589), tuple(41414, 88972), tuple(4384, 2025), tuple(46524, 87620), tuple(5823, 36079), tuple(78720, 13519), tuple(59092, 88699), tuple(24120, 6388), tuple(51664, 71039), tuple(28756, 43890), tuple(13729, 27176), tuple(86717, 82448), tuple(65598, 34805), tuple(74975, 52791), tuple(65429, 97173), tuple(92472, 53334), tuple(18778, 40576), tuple(72776, 48956), tuple(61833, 85936), tuple(81344, 48055), tuple(89467, 91099), tuple(82333, 15367), tuple(6019, 98391), tuple(52943, 15338), tuple(29662, 21975), tuple(71935, 47606), tuple(54633, 72216), tuple(51648, 52203), tuple(84649, 31791), tuple(26281, 82065), tuple(83163, 43394), tuple(79859, 55897), tuple(84706, 38368), tuple(97175, 88009), tuple(92800, 82164), tuple(79819, 13645), tuple(42754, 6273), tuple(97025, 79579), tuple(35694, 44160), tuple(96053, 24801), tuple(60315, 14411), tuple(25961, 82303), tuple(1791, 53355), tuple(15508, 43236), tuple(35667, 84655), tuple(73764, 82190), tuple(14465, 72390), tuple(92464, 30555), tuple(14121, 31360), tuple(27630, 78672), tuple(35483, 47439), tuple(79467, 73233), tuple(33010, 49718), tuple(43095, 2002), tuple(3755, 4070), tuple(25460, 21281), tuple(52718, 27575), tuple(97091, 78423), tuple(76536, 86761), tuple(10682, 27325), tuple(55401, 99488), tuple(34196, 88793), tuple(88024, 37693), tuple(4586, 62614), tuple(74857, 37796), tuple(19724, 59109), tuple(17642, 34748), tuple(87983, 11996), tuple(6814, 68602), tuple(63566, 16836), tuple(21026, 42675), tuple(3528, 81994), tuple(58141, 81954), tuple(79520, 99518), tuple(52627, 62974), tuple(42056, 1000), tuple(85464, 63420), tuple(30434, 86139), tuple(59754, 88493), tuple(41386, 76058), tuple(27894, 78093), tuple(63842, 72458), tuple(6928, 37187), tuple(34478, 5193), tuple(57116, 24009), tuple(24858, 84226), tuple(462, 93589), tuple(86510, 80240), tuple(78044, 98234), tuple(30812, 40060), tuple(423, 46196), tuple(47139, 89017), tuple(26066, 21081), tuple(45463, 37260), tuple(34366, 23814), tuple(45937, 79795), tuple(89975, 20405), tuple(21792, 43980), tuple(13675, 11145), tuple(98902, 47577), tuple(20383, 49241), tuple(97905, 16457), tuple(85839, 23279), tuple(33931, 13532), tuple(91486, 54207), tuple(46981, 41204), tuple(49524, 10080), tuple(21201, 3854), tuple(70178, 71393), tuple(26825, 35670), tuple(91350, 92038), tuple(82297, 81201), tuple(47908, 26073), tuple(6456, 40194), tuple(45104, 62038), tuple(75781, 55421), tuple(49561, 35610), tuple(47838, 93109), tuple(25109, 10837), tuple(16666, 99790), tuple(54882, 29259), tuple(28169, 76030), tuple(99605, 78334), tuple(19151, 86372), tuple(48747, 64053), tuple(78764, 38705), tuple(43762, 3756), tuple(22725, 14026), tuple(85174, 6263), tuple(76327, 1072), tuple(92817, 63030), tuple(59923, 28851), tuple(39614, 77354), tuple(54467, 80792), tuple(37309, 8679), tuple(42247, 28830), tuple(60892, 36834), tuple(54108, 62952), tuple(33682, 52992), tuple(87318, 63605), tuple(3180, 91762), tuple(24774, 12744), tuple(4431, 74084), tuple(11712, 7577), tuple(31451, 18294), tuple(68722, 16450), tuple(52185, 92005), tuple(97312, 33963), tuple(43882, 84266), tuple(39958, 52806), tuple(4759, 32862), tuple(33017, 81530), tuple(88475, 9613), tuple(72656, 43214), tuple(27288, 91542), tuple(67232, 47120), tuple(12714, 59507), tuple(17175, 58197), tuple(1719, 97181), tuple(2806, 5682), tuple(22373, 80608), tuple(72129, 33750), tuple(97168, 75472), tuple(16157, 5484), tuple(93177, 59589), tuple(7019, 19832), tuple(63810, 80313), tuple(23551, 45065), tuple(59657, 37189), tuple(12995, 84512), tuple(44630, 12434), tuple(28833, 8088), tuple(56795, 10570), tuple(22385, 4138), tuple(39502, 41865), tuple(67720, 31597), tuple(54837, 8933), tuple(19906, 12496), tuple(69993, 30745), tuple(94886, 98186), tuple(6474, 37743), tuple(62063, 5596), tuple(52064, 33592), tuple(57476, 84891), tuple(88798, 43044), tuple(55029, 97222), tuple(73911, 11862), tuple(1205, 76381), tuple(13388, 4303), tuple(73635, 55410), tuple(97777, 32985), tuple(94358, 49709), tuple(62607, 76061), tuple(62525, 8598), tuple(10327, 11235), tuple(18778, 991), tuple(16602, 1008), tuple(6311, 36329), tuple(6464, 33473), tuple(71418, 15828), tuple(49777, 9630), tuple(67644, 45616), tuple(97118, 54851), tuple(79498, 75515), tuple(45056, 12838), tuple(51110, 53572), tuple(4941, 80166), tuple(16052, 81909), tuple(24336, 25459), tuple(60437, 70317), tuple(51544, 8762), tuple(44978, 27145), tuple(78113, 27193), tuple(45148, 7278), tuple(78858, 90800), tuple(29864, 14191), tuple(67835, 78395), tuple(45893, 74512), tuple(81523, 270), tuple(51436, 75334), tuple(39456, 65552), tuple(89548, 42368), tuple(8953, 17953), tuple(47296, 52855), tuple(36236, 70545), tuple(99705, 30645), tuple(58038, 43017), tuple(95851, 60592), tuple(50658, 98282), tuple(48614, 74538), tuple(29026, 6898), tuple(57506, 97917), tuple(33553, 11205), tuple(92292, 53328), tuple(37861, 10865), tuple(70306, 43839), tuple(52283, 94600), tuple(68802, 95126), tuple(92765, 91310), tuple(2574, 45229), tuple(12463, 45681), tuple(73331, 83847), tuple(22565, 66014), tuple(52454, 22571), tuple(17530, 55911), tuple(7358, 36106), tuple(54186, 27674), tuple(55476, 166), tuple(12926, 8902), tuple(63782, 1616), tuple(60085, 35021), tuple(86605, 99026), tuple(7432, 57161), tuple(37268, 11832), tuple(3860, 95662), tuple(30339, 54518), tuple(26163, 96043), tuple(26092, 71977), tuple(63899, 7792), tuple(9804, 66302), tuple(81779, 54515), tuple(2861, 42418), tuple(44736, 75647), tuple(50912, 53848), tuple(72120, 3651), tuple(91526, 72999), tuple(71642, 69795), tuple(40664, 37695), tuple(57357, 83958), tuple(41666, 52277), tuple(49209, 99223), tuple(47274, 75571), tuple(64326, 88981), tuple(67848, 52903), tuple(44013, 43796), tuple(21678, 8103), tuple(74827, 132), tuple(88279, 49672), tuple(10747, 85149), tuple(74506, 99115), tuple(89615, 95102), tuple(14077, 79858), tuple(55139, 17814), tuple(5519, 48761), tuple(62278, 39931), tuple(58406, 38267), tuple(58705, 86071), tuple(63443, 11013), tuple(53144, 22114), tuple(78535, 70561), tuple(85423, 36012), tuple(3285, 72479), tuple(73658, 19340), tuple(18511, 10477), tuple(60780, 75674), tuple(88032, 88205), tuple(35386, 23855), tuple(49977, 32673), tuple(93206, 71515), tuple(3482, 73115), tuple(48423, 52857), tuple(11899, 30649), tuple(59730, 15323), tuple(89442, 87402), tuple(439, 50184), tuple(98106, 42819), tuple(25941, 82842), tuple(82980, 56368), tuple(71420, 11196), tuple(20860, 78799), tuple(71131, 53182), tuple(45795, 85122), tuple(34635, 83218), tuple(78160, 79377), tuple(8534, 26595), tuple(35248, 17819), tuple(54060, 99480), tuple(36087, 84130), tuple(16001, 59701), tuple(63490, 15318), tuple(41259, 62966), tuple(79583, 94979), tuple(49892, 92957), tuple(8542, 94075), tuple(66339, 33975), tuple(21084, 67889), tuple(14718, 20930), tuple(1760, 60204), tuple(42318, 36873), tuple(2306, 42786), tuple(1667, 59179), tuple(29425, 64430), tuple(64436, 4268), tuple(52666, 79958), tuple(11248, 35590), tuple(37352, 72786), tuple(79273, 24409), tuple(47965, 59976), tuple(61729, 87562), tuple(22673, 52091), tuple(58668, 33485), tuple(60556, 6194), tuple(9974, 17532), tuple(91645, 12490), tuple(16690, 75552), tuple(30983, 79572), tuple(73896, 87577), tuple(82325, 6966), tuple(46769, 19266), tuple(6691, 2816), tuple(65074, 51276), tuple(83174, 210), tuple(38395, 19191), tuple(83871, 939), tuple(9543, 23700), tuple(18316, 3882), tuple(18604, 6191), tuple(53431, 2917), tuple(71291, 3352), tuple(46424, 29885), tuple(44395, 57382), tuple(95028, 33049), tuple(96372, 2057), tuple(26911, 14241), tuple(35535, 27007), tuple(25527, 36480), tuple(13612, 95407), tuple(56176, 82284), tuple(28597, 48562), tuple(76438, 43785), tuple(17631, 15131), tuple(18728, 76676), tuple(49606, 60663), tuple(64878, 57243), tuple(10925, 14798), tuple(72592, 95876), tuple(8144, 58293), tuple(36923, 57214), tuple(82893, 42678), tuple(15533, 63570), tuple(66619, 96607), tuple(32491, 70158), tuple(25175, 70456), tuple(54365, 64639), tuple(56529, 44275), tuple(85598, 13051), tuple(82052, 78051), tuple(6802, 14950), tuple(18964, 77404), tuple(69285, 33899), tuple(42496, 817), tuple(80092, 73354), tuple(44095, 57405), tuple(6715, 98298), tuple(82698, 65201), tuple(25536, 48241), tuple(60721, 38389), tuple(72591, 3716), tuple(76974, 58694), tuple(39723, 66127), tuple(21781, 27885), tuple(57871, 26565), tuple(57327, 1713), tuple(43406, 68141), tuple(65690, 21025), tuple(77459, 59220), tuple(78038, 40571), tuple(44248, 86386), tuple(17714, 38469), tuple(14993, 99711), tuple(18231, 62648), tuple(8081, 2797), tuple(73996, 60186), tuple(98808, 9291), tuple(93219, 32512), tuple(45831, 71316), tuple(9315, 81476), tuple(31933, 97130), tuple(20920, 2404), tuple(31015, 11982), tuple(1251, 81196), tuple(35575, 4027), tuple(81650, 61732), tuple(10241, 79907), tuple(53046, 95973), tuple(68668, 48509), tuple(656, 1992), tuple(10061, 89424), tuple(11047, 71227), tuple(10089, 90496), tuple(57613, 95766), tuple(38775, 44707), tuple(10140, 62292), tuple(91276, 50321), tuple(75890, 59520), tuple(32977, 39392), tuple(43150, 88441), tuple(51314, 81453), tuple(57440, 53885), tuple(85712, 10329), tuple(52723, 17377), tuple(29648, 83895), tuple(41142, 80706), tuple(4167, 43740), tuple(49249, 91247), tuple(15721, 53638), tuple(95764, 35654), tuple(21318, 81252), tuple(97676, 77111), tuple(27613, 35504), tuple(20973, 47975), tuple(60292, 36376), tuple(78092, 59608), tuple(53682, 29368), tuple(95342, 22174), tuple(2289, 80842), tuple(97276, 49917), tuple(21421, 37624), tuple(50678, 98609), tuple(49240, 25174), tuple(64603, 13614), tuple(75402, 61541), tuple(80112, 45397), tuple(14289, 87479), tuple(16888, 98577), tuple(14999, 80972), tuple(64689, 57967), tuple(79391, 54976), tuple(37446, 39412), tuple(86682, 70785),
     tuple(21709, 57340), tuple(53757, 39880), tuple(33201, 94136), tuple(27854, 30229), tuple(14865, 56637), tuple(75573, 68915), tuple(84594, 1520), tuple(71261, 69867), tuple(84203, 43708), tuple(76407, 88476), tuple(84395, 77050), tuple(53934, 83635), tuple(32870, 27302), tuple(46646, 46399), tuple(26417, 60940), tuple(87513, 88720), tuple(12542, 32018), tuple(45969, 62284), tuple(26733, 90539), tuple(50556, 13388), tuple(60882, 56222), tuple(48253, 22792), tuple(68209, 18501), tuple(58073, 48960), tuple(6360, 4482), tuple(53997, 31868), tuple(15727, 78331), tuple(81299, 84008), tuple(99495, 89688), tuple(504, 3147), tuple(93985, 77265), tuple(78723, 60673), tuple(30278, 63220), tuple(33434, 26642), tuple(71481, 73333), tuple(49805, 59269), tuple(90657, 93630), tuple(28814, 83954), tuple(91466, 63542), tuple(43843, 69657), tuple(11466, 24136), tuple(63826, 6209), tuple(29687, 95777), tuple(65616, 74144), tuple(62798, 883), tuple(54174, 88934), tuple(35129, 40939), tuple(42224, 54784), tuple(80876, 68479), tuple(80812, 51383), tuple(39443, 11689), tuple(15438, 66488), tuple(32856, 96950), tuple(80525, 99128), tuple(25968, 28334), tuple(91925, 37414), tuple(84823, 58164), tuple(17795, 78409), tuple(29912, 53931), tuple(1369, 92329), tuple(36176, 34133), tuple(79057, 62016), tuple(74457, 51743), tuple(90604, 95280), tuple(18107, 81811), tuple(26994, 78521), tuple(4762, 53724), tuple(8229, 90056), tuple(60962, 1202), tuple(80485, 44934), tuple(58917, 36716), tuple(71770, 42524), tuple(94551, 98259), tuple(39500, 41373), tuple(50410, 70615), tuple(63782, 25832), tuple(74940, 15450), tuple(90724, 44531), tuple(69088, 22535), tuple(40581, 3354), tuple(1756, 86005), tuple(93128, 31200), tuple(14139, 8370), tuple(65646, 40141), tuple(31537, 89271), tuple(7635, 66721), tuple(67463, 97745), tuple(12391, 36807), tuple(6311, 30232), tuple(20818, 91220), tuple(53449, 11632), tuple(21802, 93687), tuple(75581, 79739), tuple(5514, 57540), tuple(67063, 99383), tuple(98230, 18983), tuple(50929, 35978), tuple(16069, 59906), tuple(93594, 94696), tuple(13344, 34575), tuple(30331, 84457), tuple(78047, 97558), tuple(5507, 41722), tuple(81016, 8762), tuple(91323, 59598), tuple(67184, 8555), tuple(76659, 67276), tuple(6511, 94844), tuple(1063, 39110), tuple(40795, 16854), tuple(40694, 32666), tuple(14734, 95257), tuple(6818, 30227), tuple(32211, 56294), tuple(31129, 97716), tuple(93866, 6117), tuple(42144, 91974), tuple(64560, 9708), tuple(5803, 92811), tuple(7240, 42166), tuple(97514, 19116), tuple(59904, 64965), tuple(73031, 69137), tuple(63313, 82886), tuple(58529, 84361), tuple(47365, 96118), tuple(27999, 83969), tuple(98211, 52135), tuple(86460, 86408), tuple(21315, 59646), tuple(98469, 99928), tuple(24453, 79050), tuple(97595, 41780), tuple(35575, 22842), tuple(18219, 72673), tuple(4001, 89495), tuple(19563, 18097), tuple(566, 5304), tuple(37517, 63100), tuple(11251, 58908), tuple(2474, 55788), tuple(83078, 65059), tuple(68185, 94587), tuple(33305, 36706), tuple(81350, 72951), tuple(37115, 41580), tuple(6005, 44393), tuple(4318, 67309), tuple(21346, 75943), tuple(57955, 33395), tuple(75723, 89514), tuple(2661, 42938), tuple(89643, 48828),
-    tuple(3409, 13157), tuple(13667, 78006), tuple(56518, 86796), tuple(38971, 28234), tuple(38060, 77284), tuple(68626, 83168), tuple(69324, 67649), tuple(48994, 40388), tuple(87024, 14379), tuple(12475, 27192), tuple(41271, 41939), tuple(50304, 38146), tuple(8682, 25307), tuple(93898, 48129), tuple(34600, 25005), tuple(48022, 22298), tuple(25683, 46046), tuple(24839, 69086), tuple(50505, 93439), tuple(90497, 50297), tuple(16054, 68182), tuple(69768, 67239), tuple(35909, 84118), tuple(64986, 21267), tuple(32550, 33801), tuple(8884, 66830), tuple(10690, 75679), tuple(59327, 9389), tuple(16594, 37706), tuple(54110, 76448), tuple(22052, 90416), tuple(18104, 20971), tuple(78917, 19589), tuple(48799, 38897), tuple(55663, 11112), tuple(24255, 19761), tuple(90224, 59023), tuple(51893, 61626), tuple(57840, 2070), tuple(37436, 84968), tuple(55242, 52606), tuple(71391, 70783), tuple(84796, 72467), tuple(61673, 90112), tuple(61880, 10015), tuple(84560, 21382), tuple(91734, 52105), tuple(94237, 68942), tuple(36055, 26633), tuple(43694, 33404), tuple(60266, 17069), tuple(63045, 2539), tuple(39314, 49430), tuple(66845, 42602), tuple(76834, 50742), tuple(26684, 64231), tuple(83102, 88337), tuple(43541, 16088), tuple(53516, 23759), tuple(21092, 43649), tuple(71242, 31515), tuple(62253, 81538), tuple(19670, 48947), tuple(24097, 83600), tuple(11636, 70960), tuple(55314, 99976), tuple(56296, 68456), tuple(25537, 64586), tuple(45649, 53747), tuple(9712, 85370), tuple(82073, 71622), tuple(97381, 26322), tuple(4927, 47703), tuple(8999, 33464), tuple(5875, 80932), tuple(88591, 63062), tuple(40824, 93164), tuple(55753, 10733), tuple(56196, 8875), tuple(13427, 66714), tuple(22780, 69557), tuple(37212, 13763), tuple(61668, 95614), tuple(79050, 55391), tuple(92892, 94037), tuple(4942, 23252), tuple(34025, 31194), tuple(96074, 59364), tuple(11520, 11652), tuple(94439, 19618), tuple(64758, 41196), tuple(73397, 72389), tuple(57282, 73894), tuple(79700, 78450), tuple(65052, 54392), tuple(72453, 23422), tuple(49093, 48337), tuple(9863, 89449), tuple(60397, 40836), tuple(18147, 51195), tuple(39787, 61479), tuple(63062, 62242), tuple(67547, 5426), tuple(25316, 76298), tuple(16168, 12116), tuple(91884, 94406), tuple(57385, 89464), tuple(93062, 71189), tuple(97612, 38802), tuple(85128, 1852), tuple(80643, 41827), tuple(59109, 50692), tuple(28077, 24715), tuple(67583, 40643), tuple(54073, 32408), tuple(97704, 17820), tuple(15884, 69143), tuple(66420, 36961), tuple(60442, 34685), tuple(3109, 47213), tuple(27157, 42282), tuple(18909, 52184), tuple(16638, 51215), tuple(66044, 40079), tuple(67856, 15021), tuple(26942, 58162), tuple(76866, 73547), tuple(3999, 47414), tuple(5114, 74975), tuple(85820, 10632), tuple(71972, 59810), tuple(66488, 16840), tuple(50779, 93807), tuple(40068, 12260), tuple(67715, 72553), tuple(45275, 57705), tuple(45019, 86665), tuple(97033, 97611), tuple(69136, 54593), tuple(1879, 87594), tuple(49292, 92238), tuple(69064, 7240), tuple(60753, 5294), tuple(36350, 67918), tuple(48440, 43264), tuple(70554, 79751), tuple(40310, 64039), tuple(48171, 75441), tuple(53305, 72396), tuple(44027, 58150), tuple(67485, 38325), tuple(87333, 75101), tuple(2509, 54526), tuple(40794, 18097), tuple(17674, 84451), tuple(30175, 65221), tuple(71744, 57300), tuple(91603, 35695), tuple(33369, 1387), tuple(51808, 2008), tuple(42659, 11574), tuple(39492, 79947), tuple(95089, 47048), tuple(57022, 73399), tuple(72707, 8845), tuple(66843, 61434), tuple(7174, 16342), tuple(50709, 76713), tuple(45560, 1378), tuple(80907, 97774), tuple(651, 93255), tuple(42650, 82788), tuple(2875, 24267), tuple(73437, 67551), tuple(6685, 81749), tuple(43495, 12190), tuple(63932, 69464), tuple(86694, 91717), tuple(91608, 59712), tuple(50833, 91382), tuple(18301, 39265), tuple(48304, 34276), tuple(24633, 56311), tuple(10463, 40342), tuple(17645, 64242), tuple(52245, 96838), tuple(6606, 87413), tuple(75088, 39449), tuple(6247, 97599), tuple(57124, 39047), tuple(49579, 80395), tuple(52959, 14523), tuple(73129, 3675), tuple(78880, 16111), tuple(90870, 27122), tuple(11166, 67671), tuple(48048, 41486), tuple(65329, 98702), tuple(4801, 92915), tuple(88765, 51873), tuple(59370, 1440), tuple(41316, 88008), tuple(92238, 79140), tuple(18523, 32178), tuple(36124, 49818), tuple(84251, 37274), tuple(92085, 96091), tuple(65382, 7189), tuple(30130, 32066), tuple(86434, 46207), tuple(5500, 11160), tuple(88366, 36983), tuple(48685, 47634), tuple(93314, 57448), tuple(95978, 97924), tuple(20017, 85908), tuple(82568, 31256), tuple(44633, 78762), tuple(41625, 11793), tuple(77646, 2315), tuple(67604, 29898), tuple(1492, 55783), tuple(33177, 5891), tuple(93884, 41363), tuple(90527, 43977), tuple(36905, 59152), tuple(37750, 19264), tuple(58020, 1360), tuple(22974, 3246), tuple(41403, 80614), tuple(4479, 37045), tuple(27477, 47093), tuple(79899, 65264), tuple(12625, 46993), tuple(78884, 10896), tuple(49043, 36064), tuple(22725, 18991), tuple(4279, 11656), tuple(58193, 27118), tuple(48315, 26221), tuple(86372, 4638), tuple(86413, 43777), tuple(74216, 60197), tuple(89547, 68700), tuple(618, 62861), tuple(88483, 17054), tuple(59378, 75565), tuple(15001, 59042), tuple(15858, 10735), tuple(42583, 57159), tuple(27836, 12597), tuple(87465, 37449), tuple(95717, 59515), tuple(63369, 36932), tuple(14736, 61367), tuple(14779, 30481), tuple(33108, 95749), tuple(5304, 7878), tuple(74344, 65457), tuple(3519, 98197), tuple(34669, 96365), tuple(31376, 21260), tuple(75715, 11580), tuple(14317, 29528), tuple(10151, 13185), tuple(6975, 59407), tuple(7910, 71250), tuple(21761, 8936), tuple(11683, 43452), tuple(97556, 87506), tuple(87371, 16179), tuple(46806, 74511), tuple(737, 82723), tuple(1197, 77799), tuple(9835, 85745), tuple(66026, 16556), tuple(24784, 20015), tuple(53234, 58687), tuple(4393, 27429), tuple(11484, 48640), tuple(24376, 998), tuple(76115, 38), tuple(72364, 3765), tuple(97109, 9842), tuple(36814, 37745), tuple(58829, 16139), tuple(4165, 93524), tuple(51052, 5215), tuple(69771, 11456), tuple(13263, 75724), tuple(60779, 11359), tuple(9924, 2846), tuple(70887, 4526), tuple(66054, 93309), tuple(15486, 40658), tuple(18780, 1579), tuple(89386, 24351), tuple(33682, 62095), tuple(661, 84125), tuple(13480, 97300), tuple(2408, 25599), tuple(99168, 10687), tuple(84860, 17842), tuple(38292, 12704), tuple(97468, 83719), tuple(38360, 25940), tuple(97314, 65483), tuple(95688, 44394), tuple(47420, 96156), tuple(66394, 61773), tuple(98637, 46400), tuple(69962, 57775), tuple(83857, 45874), tuple(74811, 5741), tuple(96157, 62317), tuple(57902, 79905), tuple(73760, 21345), tuple(58109, 65145), tuple(58678, 5406), tuple(96538, 16329), tuple(42244, 63758), tuple(17613, 66642), tuple(72398, 5307), tuple(12872, 94227), tuple(65046, 1439), tuple(90217, 10756), tuple(58185, 63169), tuple(50247, 86728), tuple(98822, 4390), tuple(82566, 26006), tuple(3574, 42077), tuple(43701, 59837), tuple(85579, 48641), tuple(47792, 34429), tuple(77410, 8515), tuple(97749, 11160), tuple(57462, 33927), tuple(32836, 57768), tuple(26898, 80133), tuple(52210, 57444), tuple(33639, 288), tuple(30309, 29233), tuple(14867, 24307), tuple(67420, 29214), tuple(29889, 86125), tuple(68662, 93027), tuple(30716, 64262), tuple(9145, 66627), tuple(83817, 78000), tuple(49074, 52390), tuple(52974, 72121), tuple(84006, 2545), tuple(27803, 68907), tuple(79008, 5828), tuple(74872, 89207), tuple(26302, 23622), tuple(26263, 25254), tuple(65652, 38273), tuple(11673, 21629), tuple(70494, 86207), tuple(59074, 85729), tuple(2011, 38108), tuple(70239, 9100), tuple(37062, 67038), tuple(52681, 44407), tuple(79718, 59481), tuple(39506, 32648), tuple(76903, 76789), tuple(45162, 63035), tuple(13344, 3835), tuple(96239, 59063), tuple(24507, 82181), tuple(77403, 89247), tuple(73887, 41747), tuple(5639, 27352), tuple(46718, 96169), tuple(94630, 83108), tuple(37999, 68318), tuple(97717, 53272), tuple(80506, 42486), tuple(7677, 75413), tuple(45129, 2230), tuple(11721, 21720), tuple(88499, 48784), tuple(23501, 58439), tuple(70767, 72086), tuple(78533, 90007), tuple(72580, 80411), tuple(36564, 98451), tuple(89444, 69448), tuple(48038, 26523), tuple(5123, 78026), tuple(29168, 41429), tuple(36287, 72619), tuple(75350, 27908), tuple(7381, 96048), tuple(30090, 51055), tuple(73670, 11691), tuple(39082, 72957), tuple(84785, 52400), tuple(80436, 94637), tuple(17776, 61224), tuple(36848, 71607), tuple(90182, 50522), tuple(78350, 71698), tuple(91120, 27247), tuple(39638, 38298), tuple(22945, 23976), tuple(52034, 72847), tuple(97888, 33382), tuple(20825, 5844), tuple(303, 5273), tuple(62672, 96465), tuple(46951, 93410), tuple(57258, 108), tuple(11116, 34876), tuple(40588, 20691), tuple(61906, 68626), tuple(48319, 90189), tuple(20255, 4601), tuple(80998, 30793), tuple(28741, 2714), tuple(42195, 25873), tuple(17046, 46739), tuple(15319, 54014), tuple(11773, 11673), tuple(73012, 41575), tuple(21747, 59925), tuple(16088, 24272), tuple(38326, 8140), tuple(68006, 23594), tuple(78052, 77991), tuple(45820, 79226), tuple(11143, 88881), tuple(59251, 76272), tuple(18953, 10412), tuple(67075, 57195), tuple(1386, 54226), tuple(42759, 59791), tuple(5696, 15215), tuple(79633, 55487), tuple(3546, 11417), tuple(97976, 8323), tuple(55197, 53843), tuple(12182, 16579), tuple(55706, 87702), tuple(88871, 45930), tuple(98978, 50942), tuple(55874, 87465), tuple(53256, 28916), tuple(90605, 43673), tuple(23906, 75994), tuple(12746, 66785), tuple(91372, 53574), tuple(72302, 69561), tuple(38833, 59338), tuple(98528, 22616), tuple(10045, 25111), tuple(34397, 69161), tuple(86106, 23720), tuple(82705, 67810), tuple(48691, 14861), tuple(41392, 64552), tuple(83105, 6557), tuple(62123, 39827), tuple(94840, 54871), tuple(35778, 26572), tuple(16194, 14615), tuple(27, 8380), tuple(33704, 44750), tuple(86884, 51173), tuple(60330, 80082), tuple(56180, 47098), tuple(6249, 36349), tuple(32268, 12733), tuple(86808, 40162), tuple(27643, 75454), tuple(36783, 30874), tuple(54827, 7607), tuple(54697, 57582), tuple(83316, 18631),   
+    tuple(3409, 13157), tuple(13667, 78006), tuple(56518, 86796), tuple(38971, 28234), tuple(38060, 77284), tuple(68626, 83168), tuple(69324, 67649), tuple(48994, 40388), tuple(87024, 14379), tuple(12475, 27192), tuple(41271, 41939), tuple(50304, 38146), tuple(8682, 25307), tuple(93898, 48129), tuple(34600, 25005), tuple(48022, 22298), tuple(25683, 46046), tuple(24839, 69086), tuple(50505, 93439), tuple(90497, 50297), tuple(16054, 68182), tuple(69768, 67239), tuple(35909, 84118), tuple(64986, 21267), tuple(32550, 33801), tuple(8884, 66830), tuple(10690, 75679), tuple(59327, 9389), tuple(16594, 37706), tuple(54110, 76448), tuple(22052, 90416), tuple(18104, 20971), tuple(78917, 19589), tuple(48799, 38897), tuple(55663, 11112), tuple(24255, 19761), tuple(90224, 59023), tuple(51893, 61626), tuple(57840, 2070), tuple(37436, 84968), tuple(55242, 52606), tuple(71391, 70783), tuple(84796, 72467), tuple(61673, 90112), tuple(61880, 10015), tuple(84560, 21382), tuple(91734, 52105), tuple(94237, 68942), tuple(36055, 26633), tuple(43694, 33404), tuple(60266, 17069), tuple(63045, 2539), tuple(39314, 49430), tuple(66845, 42602), tuple(76834, 50742), tuple(26684, 64231), tuple(83102, 88337), tuple(43541, 16088), tuple(53516, 23759), tuple(21092, 43649), tuple(71242, 31515), tuple(62253, 81538), tuple(19670, 48947), tuple(24097, 83600), tuple(11636, 70960), tuple(55314, 99976), tuple(56296, 68456), tuple(25537, 64586), tuple(45649, 53747), tuple(9712, 85370), tuple(82073, 71622), tuple(97381, 26322), tuple(4927, 47703), tuple(8999, 33464), tuple(5875, 80932), tuple(88591, 63062), tuple(40824, 93164), tuple(55753, 10733), tuple(56196, 8875), tuple(13427, 66714), tuple(22780, 69557), tuple(37212, 13763), tuple(61668, 95614), tuple(79050, 55391), tuple(92892, 94037), tuple(4942, 23252), tuple(34025, 31194), tuple(96074, 59364), tuple(11520, 11652), tuple(94439, 19618), tuple(64758, 41196), tuple(73397, 72389), tuple(57282, 73894), tuple(79700, 78450), tuple(65052, 54392), tuple(72453, 23422), tuple(49093, 48337), tuple(9863, 89449), tuple(60397, 40836), tuple(18147, 51195), tuple(39787, 61479), tuple(63062, 62242), tuple(67547, 5426), tuple(25316, 76298), tuple(16168, 12116), tuple(91884, 94406), tuple(57385, 89464), tuple(93062, 71189), tuple(97612, 38802), tuple(85128, 1852), tuple(80643, 41827), tuple(59109, 50692), tuple(28077, 24715), tuple(67583, 40643), tuple(54073, 32408), tuple(97704, 17820), tuple(15884, 69143), tuple(66420, 36961), tuple(60442, 34685), tuple(3109, 47213), tuple(27157, 42282), tuple(18909, 52184), tuple(16638, 51215), tuple(66044, 40079), tuple(67856, 15021), tuple(26942, 58162), tuple(76866, 73547), tuple(3999, 47414), tuple(5114, 74975), tuple(85820, 10632), tuple(71972, 59810), tuple(66488, 16840), tuple(50779, 93807), tuple(40068, 12260), tuple(67715, 72553), tuple(45275, 57705), tuple(45019, 86665), tuple(97033, 97611), tuple(69136, 54593), tuple(1879, 87594), tuple(49292, 92238), tuple(69064, 7240), tuple(60753, 5294), tuple(36350, 67918), tuple(48440, 43264), tuple(70554, 79751), tuple(40310, 64039), tuple(48171, 75441), tuple(53305, 72396), tuple(44027, 58150), tuple(67485, 38325), tuple(87333, 75101), tuple(2509, 54526), tuple(40794, 18097), tuple(17674, 84451), tuple(30175, 65221), tuple(71744, 57300), tuple(91603, 35695), tuple(33369, 1387), tuple(51808, 2008), tuple(42659, 11574), tuple(39492, 79947), tuple(95089, 47048), tuple(57022, 73399), tuple(72707, 8845), tuple(66843, 61434), tuple(7174, 16342), tuple(50709, 76713), tuple(45560, 1378), tuple(80907, 97774), tuple(651, 93255), tuple(42650, 82788), tuple(2875, 24267), tuple(73437, 67551), tuple(6685, 81749), tuple(43495, 12190), tuple(63932, 69464), tuple(86694, 91717), tuple(91608, 59712), tuple(50833, 91382), tuple(18301, 39265), tuple(48304, 34276), tuple(24633, 56311), tuple(10463, 40342), tuple(17645, 64242), tuple(52245, 96838), tuple(6606, 87413), tuple(75088, 39449), tuple(6247, 97599), tuple(57124, 39047), tuple(49579, 80395), tuple(52959, 14523), tuple(73129, 3675), tuple(78880, 16111), tuple(90870, 27122), tuple(11166, 67671), tuple(48048, 41486), tuple(65329, 98702), tuple(4801, 92915), tuple(88765, 51873), tuple(59370, 1440), tuple(41316, 88008), tuple(92238, 79140), tuple(18523, 32178), tuple(36124, 49818), tuple(84251, 37274), tuple(92085, 96091), tuple(65382, 7189), tuple(30130, 32066), tuple(86434, 46207), tuple(5500, 11160), tuple(88366, 36983), tuple(48685, 47634), tuple(93314, 57448), tuple(95978, 97924), tuple(20017, 85908), tuple(82568, 31256), tuple(44633, 78762), tuple(41625, 11793), tuple(77646, 2315), tuple(67604, 29898), tuple(1492, 55783), tuple(33177, 5891), tuple(93884, 41363), tuple(90527, 43977), tuple(36905, 59152), tuple(37750, 19264), tuple(58020, 1360), tuple(22974, 3246), tuple(41403, 80614), tuple(4479, 37045), tuple(27477, 47093), tuple(79899, 65264), tuple(12625, 46993), tuple(78884, 10896), tuple(49043, 36064), tuple(22725, 18991), tuple(4279, 11656), tuple(58193, 27118), tuple(48315, 26221), tuple(86372, 4638), tuple(86413, 43777), tuple(74216, 60197), tuple(89547, 68700), tuple(618, 62861), tuple(88483, 17054), tuple(59378, 75565), tuple(15001, 59042), tuple(15858, 10735), tuple(42583, 57159), tuple(27836, 12597), tuple(87465, 37449), tuple(95717, 59515), tuple(63369, 36932), tuple(14736, 61367), tuple(14779, 30481), tuple(33108, 95749), tuple(5304, 7878), tuple(74344, 65457), tuple(3519, 98197), tuple(34669, 96365), tuple(31376, 21260), tuple(75715, 11580), tuple(14317, 29528), tuple(10151, 13185), tuple(6975, 59407), tuple(7910, 71250), tuple(21761, 8936), tuple(11683, 43452), tuple(97556, 87506), tuple(87371, 16179), tuple(46806, 74511), tuple(737, 82723), tuple(1197, 77799), tuple(9835, 85745), tuple(66026, 16556), tuple(24784, 20015), tuple(53234, 58687), tuple(4393, 27429), tuple(11484, 48640), tuple(24376, 998), tuple(76115, 38), tuple(72364, 3765), tuple(97109, 9842), tuple(36814, 37745), tuple(58829, 16139), tuple(4165, 93524), tuple(51052, 5215), tuple(69771, 11456), tuple(13263, 75724), tuple(60779, 11359), tuple(9924, 2846), tuple(70887, 4526), tuple(66054, 93309), tuple(15486, 40658), tuple(18780, 1579), tuple(89386, 24351), tuple(33682, 62095), tuple(661, 84125), tuple(13480, 97300), tuple(2408, 25599), tuple(99168, 10687), tuple(84860, 17842), tuple(38292, 12704), tuple(97468, 83719), tuple(38360, 25940), tuple(97314, 65483), tuple(95688, 44394), tuple(47420, 96156), tuple(66394, 61773), tuple(98637, 46400), tuple(69962, 57775), tuple(83857, 45874), tuple(74811, 5741), tuple(96157, 62317), tuple(57902, 79905), tuple(73760, 21345), tuple(58109, 65145), tuple(58678, 5406), tuple(96538, 16329), tuple(42244, 63758), tuple(17613, 66642), tuple(72398, 5307), tuple(12872, 94227), tuple(65046, 1439), tuple(90217, 10756), tuple(58185, 63169), tuple(50247, 86728), tuple(98822, 4390), tuple(82566, 26006), tuple(3574, 42077), tuple(43701, 59837), tuple(85579, 48641), tuple(47792, 34429), tuple(77410, 8515), tuple(97749, 11160), tuple(57462, 33927), tuple(32836, 57768), tuple(26898, 80133), tuple(52210, 57444), tuple(33639, 288), tuple(30309, 29233), tuple(14867, 24307), tuple(67420, 29214), tuple(29889, 86125), tuple(68662, 93027), tuple(30716, 64262), tuple(9145, 66627), tuple(83817, 78000), tuple(49074, 52390), tuple(52974, 72121), tuple(84006, 2545), tuple(27803, 68907), tuple(79008, 5828), tuple(74872, 89207), tuple(26302, 23622), tuple(26263, 25254), tuple(65652, 38273), tuple(11673, 21629), tuple(70494, 86207), tuple(59074, 85729), tuple(2011, 38108), tuple(70239, 9100), tuple(37062, 67038), tuple(52681, 44407), tuple(79718, 59481), tuple(39506, 32648), tuple(76903, 76789), tuple(45162, 63035), tuple(13344, 3835), tuple(96239, 59063), tuple(24507, 82181), tuple(77403, 89247), tuple(73887, 41747), tuple(5639, 27352), tuple(46718, 96169), tuple(94630, 83108), tuple(37999, 68318), tuple(97717, 53272), tuple(80506, 42486), tuple(7677, 75413), tuple(45129, 2230), tuple(11721, 21720), tuple(88499, 48784), tuple(23501, 58439), tuple(70767, 72086), tuple(78533, 90007), tuple(72580, 80411), tuple(36564, 98451), tuple(89444, 69448), tuple(48038, 26523), tuple(5123, 78026), tuple(29168, 41429), tuple(36287, 72619), tuple(75350, 27908), tuple(7381, 96048), tuple(30090, 51055), tuple(73670, 11691), tuple(39082, 72957), tuple(84785, 52400), tuple(80436, 94637), tuple(17776, 61224), tuple(36848, 71607), tuple(90182, 50522), tuple(78350, 71698), tuple(91120, 27247), tuple(39638, 38298), tuple(22945, 23976), tuple(52034, 72847), tuple(97888, 33382), tuple(20825, 5844), tuple(303, 5273), tuple(62672, 96465), tuple(46951, 93410), tuple(57258, 108), tuple(11116, 34876), tuple(40588, 20691), tuple(61906, 68626), tuple(48319, 90189), tuple(20255, 4601), tuple(80998, 30793), tuple(28741, 2714), tuple(42195, 25873), tuple(17046, 46739), tuple(15319, 54014), tuple(11773, 11673), tuple(73012, 41575), tuple(21747, 59925), tuple(16088, 24272), tuple(38326, 8140), tuple(68006, 23594), tuple(78052, 77991), tuple(45820, 79226), tuple(11143, 88881), tuple(59251, 76272), tuple(18953, 10412), tuple(67075, 57195), tuple(1386, 54226), tuple(42759, 59791), tuple(5696, 15215), tuple(79633, 55487), tuple(3546, 11417), tuple(97976, 8323), tuple(55197, 53843), tuple(12182, 16579), tuple(55706, 87702), tuple(88871, 45930), tuple(98978, 50942), tuple(55874, 87465), tuple(53256, 28916), tuple(90605, 43673), tuple(23906, 75994), tuple(12746, 66785), tuple(91372, 53574), tuple(72302, 69561), tuple(38833, 59338), tuple(98528, 22616), tuple(10045, 25111), tuple(34397, 69161), tuple(86106, 23720), tuple(82705, 67810), tuple(48691, 14861), tuple(41392, 64552), tuple(83105, 6557), tuple(62123, 39827), tuple(94840, 54871), tuple(35778, 26572), tuple(16194, 14615), tuple(27, 8380), tuple(33704, 44750), tuple(86884, 51173), tuple(60330, 80082), tuple(56180, 47098), tuple(6249, 36349), tuple(32268, 12733), tuple(86808, 40162), tuple(27643, 75454), tuple(36783, 30874), tuple(54827, 7607), tuple(54697, 57582), tuple(83316, 18631),
     tuple(44081, 33952), tuple(89780, 86498), tuple(63456, 27382), tuple(5654, 13927), tuple(41301, 35640), tuple(4502, 70840), tuple(4238, 62879), tuple(66516, 67091), tuple(96156, 8355), tuple(2902, 23789), tuple(98837, 77623), tuple(86898, 91764), tuple(75147, 6127), tuple(8274, 46182), tuple(7422, 18222), tuple(86509, 25754), tuple(72400, 55881), tuple(84459, 68079), tuple(5654, 76270), tuple(43017, 78770), tuple(45609, 55504), tuple(67256, 51832), tuple(42204, 15653), tuple(52363, 44095), tuple(11760, 24927), tuple(53286, 20903), tuple(97482, 76094), tuple(43809, 8144), tuple(82974, 74859), tuple(65921, 42364), tuple(11938, 55421), tuple(92195, 10809), tuple(91371, 77402), tuple(17644, 86490), tuple(4424, 27504), tuple(56380, 99969), tuple(1731, 80243), tuple(8879, 23354), tuple(94574, 42743), tuple(78875, 2965), tuple(1029, 61788), tuple(64768, 61914), tuple(54149, 90155), tuple(83048, 46305), tuple(80640, 10062), tuple(12372, 94961), tuple(84549, 84061), tuple(99122, 78998), tuple(91039, 95054), tuple(19628, 18651), tuple(52348, 42569), tuple(58086, 76882), tuple(49881, 13151), tuple(8064, 47655), tuple(4457, 63438), tuple(35500, 82994), tuple(47962, 43653), tuple(5050, 36247), tuple(96631, 67316), tuple(49101, 96157), tuple(15785, 96404), tuple(56283, 36312), tuple(31695, 24307), tuple(81897, 59720), tuple(51016, 45776), tuple(92118, 47354), tuple(16024, 38406), tuple(57737, 68887), tuple(28408, 46608), tuple(65055, 1161), tuple(60430, 21682), tuple(22659, 74001), tuple(35202, 60211), tuple(38308, 52926), tuple(74264, 26330), tuple(17038, 41144), tuple(27775, 24875), tuple(49666, 73774), tuple(28516, 34297), tuple(21873, 11504), tuple(3676, 38168), tuple(90003, 25107), tuple(45103, 7031), tuple(71883, 40867), tuple(6274, 71251), tuple(60307, 49056), tuple(58402, 76742), tuple(10010, 36003), tuple(67059, 75300), tuple(36996, 57460), tuple(61413, 54691), tuple(99608, 49572), tuple(87512, 44123), tuple(43942, 87151), tuple(18543, 43029), tuple(886, 83140), tuple(75529, 69749), tuple(54090, 8088), tuple(43094, 35468), tuple(76460, 45310), tuple(64690, 46953), tuple(29561, 93370), tuple(97598, 21618), tuple(28166, 8888), tuple(12234, 771), tuple(65670, 1561), tuple(85467, 97276), tuple(98868, 57050), tuple(14619, 53684), tuple(924, 82181), tuple(65602, 36977), tuple(7888, 8938), tuple(32792, 1046), tuple(18719, 99863), tuple(34993, 11678), tuple(28837, 64924), tuple(83079, 48559), tuple(5806, 92117), tuple(79239, 8754), tuple(89819, 16162), tuple(99505, 94650), tuple(8636, 27356), tuple(6056, 5682), tuple(1921, 15164), tuple(45536, 10747), tuple(56628, 62991), tuple(51456, 54815), tuple(13030, 47920), tuple(27330, 48623), tuple(21393, 96651), tuple(51282, 5317), tuple(78200, 42975), tuple(18082, 38478), tuple(32594, 4205), tuple(49208, 22593), tuple(80079, 11765), tuple(65186, 60836), tuple(11601, 9377), tuple(95550, 52242), tuple(86838, 96932), tuple(17508, 91440), tuple(73427, 92075), tuple(70969, 37180), tuple(7091, 48708), tuple(35444, 42181), tuple(91735, 29746), tuple(11924, 89935), tuple(34418, 61018), tuple(68065, 96782), tuple(30869, 53390), tuple(99315, 78165), tuple(97205, 90309), tuple(88481, 24681),
-    tuple(17847, 75359), tuple(73636, 11167), tuple(91431, 62190), tuple(28478, 6770), tuple(97305, 77873), tuple(56987, 22599), tuple(40879, 63647), tuple(1974, 67839), tuple(88651, 99581), tuple(67087, 51740), tuple(24861, 74794), tuple(92730, 14161), tuple(52639, 78795), tuple(37163, 80079), tuple(87445, 7053), tuple(27234, 79447), tuple(43352, 66903), tuple(96267, 10657), tuple(57181, 24266), tuple(84236, 83872), tuple(56551, 30387), tuple(4972, 87269), tuple(98922, 1624), tuple(48398, 19886), tuple(40570, 79648), tuple(92239, 98232), tuple(86789, 55696), tuple(64626, 44726), tuple(82391, 95837), tuple(74414, 93972), tuple(97542, 73957), tuple(76038, 54044), tuple(66087, 24170), tuple(25731, 50138), tuple(39800, 75428), tuple(21730, 88783), tuple(53518, 83466), tuple(50784, 72242), tuple(23969, 85392), tuple(43772, 70437), tuple(87869, 33052), tuple(15531, 61368), tuple(22519, 38591), tuple(37709, 35030), tuple(74030, 5134), tuple(18667, 50524), tuple(84691, 21182), tuple(50932, 66070), tuple(27898, 10408), tuple(79554, 49192), tuple(2517, 7746), tuple(71312, 22108), tuple(15511, 37874), tuple(21623, 77591), tuple(10809, 46240), tuple(40913, 29935), tuple(78969, 56158), tuple(46274, 75491), tuple(87163, 49581), tuple(88417, 86223), tuple(41666, 28061), tuple(17503, 13021), tuple(16476, 50547), tuple(56184, 32943), tuple(89243, 61225), tuple(89844, 81092), tuple(19846, 44485), tuple(25999, 46684), tuple(67283, 76235), tuple(64393, 53397), tuple(41565, 93212), tuple(82296, 54617), tuple(62466, 54078), tuple(97942, 92201), tuple(18205, 67342), tuple(44364, 51466), tuple(72744, 4796), tuple(72526, 68979), tuple(50015, 88033), tuple(19680, 47415), tuple(65486, 46344), tuple(21531, 42236), tuple(3452, 94720), tuple(44902, 89762), tuple(13814, 85842), tuple(98337, 42500), tuple(74870, 31262), tuple(72964, 10884), tuple(64408, 43927), tuple(97024, 66176), tuple(55999, 75231), tuple(72794, 37516), tuple(67787, 70137), tuple(4960, 2377), tuple(22048, 86320), tuple(9964, 86377), tuple(30766, 39958), tuple(68684, 29197), tuple(43864, 72887), tuple(90838, 11639), tuple(97183, 10594), tuple(99649, 22933), tuple(91770, 4554), tuple(97882, 60479), tuple(91041, 72702), tuple(47685, 56715), tuple(51900, 61103), tuple(90821, 27638), tuple(95748, 57574), tuple(79106, 14366), tuple(10560, 97465), tuple(12009, 55707), tuple(65879, 34837), tuple(67934, 69351), tuple(58075, 96424), tuple(26898, 13830), tuple(2074, 46887), tuple(47317, 28361), tuple(97566, 43461), tuple(8150, 8518), tuple(21546, 42240), tuple(75546, 59160), tuple(65267, 35547), tuple(32762, 8539), tuple(31559, 21127), tuple(31913, 36056), tuple(80988, 11524), tuple(41145, 62648), tuple(23225, 40076), tuple(17544, 39206), tuple(1553, 91048), tuple(16940, 78156), tuple(7990, 70275), tuple(14929, 46391), tuple(92515, 27289), tuple(77071, 8542), tuple(29061, 27539), tuple(61002, 28411), tuple(88830, 96749), tuple(52211, 71717), tuple(19450, 46195), tuple(5895, 47099), tuple(29098, 35266), tuple(75499, 90090), tuple(76936, 30217), tuple(97220, 51472), tuple(63272, 35659), tuple(62885, 64591), tuple(95983, 97721), tuple(63118, 93206), tuple(98618, 82875), tuple(89990, 44842), tuple(75664, 44348), tuple(86664, 44960), tuple(50835, 42026), tuple(26637, 6312), tuple(99637, 96642), tuple(59176, 14821), tuple(50542, 9553), tuple(76633, 65029), tuple(25409, 65198), tuple(3352, 69819), tuple(63711, 60406), tuple(95437, 53364), tuple(37840, 77585), tuple(46865, 9097), tuple(19420, 46524), tuple(88308, 21695), tuple(32788, 12773), tuple(42860, 16774), tuple(20890, 85130), tuple(91438, 59944), tuple(18399, 28949), tuple(20946, 76691), tuple(46617, 83686), tuple(34107, 99019), tuple(49597, 44158), tuple(33564, 36586), tuple(87590, 72014), tuple(59107, 18546), tuple(44421, 43424), tuple(21333, 27720), tuple(1135, 18434), tuple(69321, 80520), tuple(28921, 41288), tuple(18914, 53626), tuple(63676, 98378), tuple(29612, 9956), tuple(3908, 2160), tuple(78213, 53772), tuple(45709, 90664), tuple(77042, 41054), tuple(86883, 36641), tuple(99497, 83975), tuple(98822, 39177), tuple(38175, 78142), tuple(8236, 62618), tuple(11422, 92281), tuple(24292, 13446), tuple(14489, 14652), tuple(89100, 73028), tuple(84314, 64770), tuple(93912, 25955), tuple(33612, 87481), tuple(12263, 39940), tuple(38184, 58202), tuple(77635, 79922), tuple(78339, 97371), tuple(47955, 29169), tuple(51554, 40923), tuple(74047, 67244), tuple(85365, 31911), tuple(56786, 6734), tuple(82342, 51354), tuple(82818, 80508), tuple(61409, 85614), tuple(25675, 10634), tuple(17091, 62250), tuple(84446, 23721), tuple(267, 14486), tuple(71998, 69455), tuple(46656, 67266), tuple(32788, 84839), tuple(42014, 98189), tuple(49293, 8851), tuple(66248, 62924), tuple(19458, 74293), tuple(90351, 62521), tuple(83067, 20364), tuple(47665, 30564), tuple(4391, 85292), tuple(96286, 26682), tuple(38393, 19001), tuple(54383, 21667), tuple(57586, 88071), tuple(61809, 69649), tuple(52249, 43209), tuple(43878, 30047), tuple(85943, 32125), tuple(14229, 12697), tuple(92247, 72822), tuple(97179, 86933), tuple(63243, 84200), tuple(42053, 43557), tuple(95748, 9682), tuple(43850, 72883), tuple(3576, 48689), tuple(1517, 48614), tuple(52726, 32475), tuple(93527, 61058), tuple(96804, 21108), tuple(78109, 63584), tuple(23551, 15738), tuple(38196, 68934), tuple(48406, 42638), tuple(52135, 73232), tuple(64063, 91934), tuple(16822, 37151), tuple(14686, 92843), tuple(11115, 26382), tuple(98109, 99834), tuple(86192, 45754), tuple(43093, 97836), tuple(34061, 5654), tuple(71966, 21209), tuple(34289, 45307), tuple(24639, 91324), tuple(58483, 71864), tuple(88435, 91876), tuple(31995, 36723), tuple(60461, 90431), tuple(81765, 37792), tuple(44888, 29738), tuple(76600, 12587), tuple(37134, 48440), tuple(69151, 38382), tuple(51397, 43750), tuple(4293, 98001), tuple(27450, 28456), tuple(99384, 24614), tuple(981, 89456), tuple(59721, 47304), tuple(60616, 98154), tuple(98744, 11293), tuple(83417, 71831), tuple(32729, 41250), tuple(46234, 15350), tuple(39317, 40016), tuple(10667, 89674), tuple(50749, 56788), tuple(2889, 90006), tuple(20397, 68884), tuple(32976, 67095), tuple(72045, 90810), tuple(73914, 29464), tuple(36641, 44630), tuple(21878, 385), tuple(95246, 23783), tuple(57354, 29305), tuple(26745, 84026), tuple(36892, 58119), tuple(1149, 95862), tuple(86209, 56761), tuple(84711, 48878), tuple(25394, 56006), tuple(31581, 30386), tuple(34987, 34411), tuple(41423, 44982), tuple(74735, 61128), tuple(58589, 76665), tuple(42483, 94983), tuple(54883, 69038), tuple(4802, 55544), tuple(47092, 31410), tuple(6642, 91583), tuple(93798, 25259), tuple(58424, 38132), tuple(43946, 97030), tuple(93700, 68673), tuple(99034, 34439), tuple(66998, 75560), tuple(64453, 50462), tuple(12208, 87262), tuple(8175, 69014), tuple(91514, 85630), tuple(23685, 748), tuple(88106, 51369), tuple(27510, 26419), tuple(83983, 5604), tuple(66703, 57061), tuple(72865, 67896), tuple(94029, 2147), tuple(95321, 30188), tuple(24240, 67512), tuple(21532, 29481), tuple(69257, 9492), tuple(59958, 62068), tuple(18491, 93721), tuple(37525, 12039), tuple(95626, 86236), tuple(49136, 11328), tuple(71565, 98832), tuple(77767, 34118), tuple(64925, 21897), tuple(73541, 79422), tuple(92001, 79259), tuple(8309, 34891), tuple(66449, 55242), tuple(85889, 88359), tuple(90559, 87521), tuple(92585, 92004), tuple(21799, 17117), tuple(98134, 53406), tuple(40978, 17010), tuple(55063, 73235), tuple(7601, 13970), tuple(46646, 31351), tuple(7085, 97956), tuple(45998, 98665), tuple(40992, 82168), tuple(4552, 54096), tuple(77766, 7561), tuple(66864, 26750), tuple(88596, 49245), tuple(82930, 33251), tuple(36666, 90013), tuple(71198, 85282), tuple(30600, 59309), tuple(20617, 9735), tuple(96180, 42996), tuple(71846, 84832), tuple(10602, 94421), tuple(83237, 85278), tuple(63713, 14908), tuple(10950, 42931), tuple(33645, 74769), tuple(69501, 8603), tuple(63596, 44221), tuple(75895, 36447), tuple(43990, 4721), tuple(19047, 91357), tuple(35225, 30088), tuple(78898, 87190), tuple(9961, 52820), tuple(6085, 61213), tuple(98275, 84058), tuple(61081, 91315), tuple(28381, 30910), tuple(15828, 72673), tuple(79008, 65337), tuple(60317, 77055), tuple(78534, 50282), tuple(9752, 74831), tuple(62049, 63249), tuple(31455, 74843), tuple(2530, 28581), tuple(68894, 84015), tuple(12791, 14820), tuple(37148, 48411), tuple(88220, 90241), tuple(60582, 70112), tuple(49890, 26900), tuple(94049, 49226), tuple(19582, 98549), tuple(87964, 73614), tuple(54195, 95007), tuple(73593, 29007), tuple(35362, 47461), tuple(93549, 82201), tuple(74305, 49248), tuple(7030, 46073), tuple(69488, 56250), tuple(63045, 25229), tuple(44038, 24680), tuple(65848, 36124), tuple(53985, 95308), tuple(65103, 82209), tuple(26563, 58468), tuple(33153, 12174), tuple(29634, 21978), tuple(26461, 3090), tuple(88683, 4514), tuple(45782, 83561), tuple(56318, 92969), tuple(5587, 61631), tuple(92117, 78865), tuple(78775, 72654), tuple(47395, 49073), tuple(20541, 46928), tuple(71357, 58929), tuple(45184, 76268), tuple(59359, 77092), tuple(5298, 10020), tuple(580, 98499), tuple(9119, 16986), tuple(45518, 86386), tuple(63375, 76589), tuple(31660, 86697), tuple(35851, 65479), tuple(69920, 42815), tuple(30208, 56290), tuple(26343, 37505), tuple(56509, 63902), tuple(85757, 64286), tuple(78627, 79973), tuple(53080, 73913), tuple(49000, 2312), tuple(47315, 57178), tuple(13033, 26209), tuple(53799, 58615), tuple(54508, 22862), tuple(33971, 13889), tuple(22815, 37914), tuple(37426, 99282), tuple(54022, 81696), tuple(17550, 28739), tuple(99122, 99584), tuple(97931, 6054), tuple(46163, 94552), tuple(58328, 70123), tuple(79181, 99242), tuple(64725, 8569), tuple(69146, 39323), tuple(63563, 27537), tuple(96076, 21338), tuple(22936, 20737), tuple(69747, 58505), tuple(52140, 91592), tuple(17198, 19845), tuple(11003, 48066), tuple(1758, 76734), tuple(39891, 17323), tuple(25673, 35578), tuple(83704, 61339), tuple(71674, 51463), tuple(20522, 73773), tuple(37708, 70488), tuple(55492, 76397), tuple(36380, 58022),         
+    tuple(17847, 75359), tuple(73636, 11167), tuple(91431, 62190), tuple(28478, 6770), tuple(97305, 77873), tuple(56987, 22599), tuple(40879, 63647), tuple(1974, 67839), tuple(88651, 99581), tuple(67087, 51740), tuple(24861, 74794), tuple(92730, 14161), tuple(52639, 78795), tuple(37163, 80079), tuple(87445, 7053), tuple(27234, 79447), tuple(43352, 66903), tuple(96267, 10657), tuple(57181, 24266), tuple(84236, 83872), tuple(56551, 30387), tuple(4972, 87269), tuple(98922, 1624), tuple(48398, 19886), tuple(40570, 79648), tuple(92239, 98232), tuple(86789, 55696), tuple(64626, 44726), tuple(82391, 95837), tuple(74414, 93972), tuple(97542, 73957), tuple(76038, 54044), tuple(66087, 24170), tuple(25731, 50138), tuple(39800, 75428), tuple(21730, 88783), tuple(53518, 83466), tuple(50784, 72242), tuple(23969, 85392), tuple(43772, 70437), tuple(87869, 33052), tuple(15531, 61368), tuple(22519, 38591), tuple(37709, 35030), tuple(74030, 5134), tuple(18667, 50524), tuple(84691, 21182), tuple(50932, 66070), tuple(27898, 10408), tuple(79554, 49192), tuple(2517, 7746), tuple(71312, 22108), tuple(15511, 37874), tuple(21623, 77591), tuple(10809, 46240), tuple(40913, 29935), tuple(78969, 56158), tuple(46274, 75491), tuple(87163, 49581), tuple(88417, 86223), tuple(41666, 28061), tuple(17503, 13021), tuple(16476, 50547), tuple(56184, 32943), tuple(89243, 61225), tuple(89844, 81092), tuple(19846, 44485), tuple(25999, 46684), tuple(67283, 76235), tuple(64393, 53397), tuple(41565, 93212), tuple(82296, 54617), tuple(62466, 54078), tuple(97942, 92201), tuple(18205, 67342), tuple(44364, 51466), tuple(72744, 4796), tuple(72526, 68979), tuple(50015, 88033), tuple(19680, 47415), tuple(65486, 46344), tuple(21531, 42236), tuple(3452, 94720), tuple(44902, 89762), tuple(13814, 85842), tuple(98337, 42500), tuple(74870, 31262), tuple(72964, 10884), tuple(64408, 43927), tuple(97024, 66176), tuple(55999, 75231), tuple(72794, 37516), tuple(67787, 70137), tuple(4960, 2377), tuple(22048, 86320), tuple(9964, 86377), tuple(30766, 39958), tuple(68684, 29197), tuple(43864, 72887), tuple(90838, 11639), tuple(97183, 10594), tuple(99649, 22933), tuple(91770, 4554), tuple(97882, 60479), tuple(91041, 72702), tuple(47685, 56715), tuple(51900, 61103), tuple(90821, 27638), tuple(95748, 57574), tuple(79106, 14366), tuple(10560, 97465), tuple(12009, 55707), tuple(65879, 34837), tuple(67934, 69351), tuple(58075, 96424), tuple(26898, 13830), tuple(2074, 46887), tuple(47317, 28361), tuple(97566, 43461), tuple(8150, 8518), tuple(21546, 42240), tuple(75546, 59160), tuple(65267, 35547), tuple(32762, 8539), tuple(31559, 21127), tuple(31913, 36056), tuple(80988, 11524), tuple(41145, 62648), tuple(23225, 40076), tuple(17544, 39206), tuple(1553, 91048), tuple(16940, 78156), tuple(7990, 70275), tuple(14929, 46391), tuple(92515, 27289), tuple(77071, 8542), tuple(29061, 27539), tuple(61002, 28411), tuple(88830, 96749), tuple(52211, 71717), tuple(19450, 46195), tuple(5895, 47099), tuple(29098, 35266), tuple(75499, 90090), tuple(76936, 30217), tuple(97220, 51472), tuple(63272, 35659), tuple(62885, 64591), tuple(95983, 97721), tuple(63118, 93206), tuple(98618, 82875), tuple(89990, 44842), tuple(75664, 44348), tuple(86664, 44960), tuple(50835, 42026), tuple(26637, 6312), tuple(99637, 96642), tuple(59176, 14821), tuple(50542, 9553), tuple(76633, 65029), tuple(25409, 65198), tuple(3352, 69819), tuple(63711, 60406), tuple(95437, 53364), tuple(37840, 77585), tuple(46865, 9097), tuple(19420, 46524), tuple(88308, 21695), tuple(32788, 12773), tuple(42860, 16774), tuple(20890, 85130), tuple(91438, 59944), tuple(18399, 28949), tuple(20946, 76691), tuple(46617, 83686), tuple(34107, 99019), tuple(49597, 44158), tuple(33564, 36586), tuple(87590, 72014), tuple(59107, 18546), tuple(44421, 43424), tuple(21333, 27720), tuple(1135, 18434), tuple(69321, 80520), tuple(28921, 41288), tuple(18914, 53626), tuple(63676, 98378), tuple(29612, 9956), tuple(3908, 2160), tuple(78213, 53772), tuple(45709, 90664), tuple(77042, 41054), tuple(86883, 36641), tuple(99497, 83975), tuple(98822, 39177), tuple(38175, 78142), tuple(8236, 62618), tuple(11422, 92281), tuple(24292, 13446), tuple(14489, 14652), tuple(89100, 73028), tuple(84314, 64770), tuple(93912, 25955), tuple(33612, 87481), tuple(12263, 39940), tuple(38184, 58202), tuple(77635, 79922), tuple(78339, 97371), tuple(47955, 29169), tuple(51554, 40923), tuple(74047, 67244), tuple(85365, 31911), tuple(56786, 6734), tuple(82342, 51354), tuple(82818, 80508), tuple(61409, 85614), tuple(25675, 10634), tuple(17091, 62250), tuple(84446, 23721), tuple(267, 14486), tuple(71998, 69455), tuple(46656, 67266), tuple(32788, 84839), tuple(42014, 98189), tuple(49293, 8851), tuple(66248, 62924), tuple(19458, 74293), tuple(90351, 62521), tuple(83067, 20364), tuple(47665, 30564), tuple(4391, 85292), tuple(96286, 26682), tuple(38393, 19001), tuple(54383, 21667), tuple(57586, 88071), tuple(61809, 69649), tuple(52249, 43209), tuple(43878, 30047), tuple(85943, 32125), tuple(14229, 12697), tuple(92247, 72822), tuple(97179, 86933), tuple(63243, 84200), tuple(42053, 43557), tuple(95748, 9682), tuple(43850, 72883), tuple(3576, 48689), tuple(1517, 48614), tuple(52726, 32475), tuple(93527, 61058), tuple(96804, 21108), tuple(78109, 63584), tuple(23551, 15738), tuple(38196, 68934), tuple(48406, 42638), tuple(52135, 73232), tuple(64063, 91934), tuple(16822, 37151), tuple(14686, 92843), tuple(11115, 26382), tuple(98109, 99834), tuple(86192, 45754), tuple(43093, 97836), tuple(34061, 5654), tuple(71966, 21209), tuple(34289, 45307), tuple(24639, 91324), tuple(58483, 71864), tuple(88435, 91876), tuple(31995, 36723), tuple(60461, 90431), tuple(81765, 37792), tuple(44888, 29738), tuple(76600, 12587), tuple(37134, 48440), tuple(69151, 38382), tuple(51397, 43750), tuple(4293, 98001), tuple(27450, 28456), tuple(99384, 24614), tuple(981, 89456), tuple(59721, 47304), tuple(60616, 98154), tuple(98744, 11293), tuple(83417, 71831), tuple(32729, 41250), tuple(46234, 15350), tuple(39317, 40016), tuple(10667, 89674), tuple(50749, 56788), tuple(2889, 90006), tuple(20397, 68884), tuple(32976, 67095), tuple(72045, 90810), tuple(73914, 29464), tuple(36641, 44630), tuple(21878, 385), tuple(95246, 23783), tuple(57354, 29305), tuple(26745, 84026), tuple(36892, 58119), tuple(1149, 95862), tuple(86209, 56761), tuple(84711, 48878), tuple(25394, 56006), tuple(31581, 30386), tuple(34987, 34411), tuple(41423, 44982), tuple(74735, 61128), tuple(58589, 76665), tuple(42483, 94983), tuple(54883, 69038), tuple(4802, 55544), tuple(47092, 31410), tuple(6642, 91583), tuple(93798, 25259), tuple(58424, 38132), tuple(43946, 97030), tuple(93700, 68673), tuple(99034, 34439), tuple(66998, 75560), tuple(64453, 50462), tuple(12208, 87262), tuple(8175, 69014), tuple(91514, 85630), tuple(23685, 748), tuple(88106, 51369), tuple(27510, 26419), tuple(83983, 5604), tuple(66703, 57061), tuple(72865, 67896), tuple(94029, 2147), tuple(95321, 30188), tuple(24240, 67512), tuple(21532, 29481), tuple(69257, 9492), tuple(59958, 62068), tuple(18491, 93721), tuple(37525, 12039), tuple(95626, 86236), tuple(49136, 11328), tuple(71565, 98832), tuple(77767, 34118), tuple(64925, 21897), tuple(73541, 79422), tuple(92001, 79259), tuple(8309, 34891), tuple(66449, 55242), tuple(85889, 88359), tuple(90559, 87521), tuple(92585, 92004), tuple(21799, 17117), tuple(98134, 53406), tuple(40978, 17010), tuple(55063, 73235), tuple(7601, 13970), tuple(46646, 31351), tuple(7085, 97956), tuple(45998, 98665), tuple(40992, 82168), tuple(4552, 54096), tuple(77766, 7561), tuple(66864, 26750), tuple(88596, 49245), tuple(82930, 33251), tuple(36666, 90013), tuple(71198, 85282), tuple(30600, 59309), tuple(20617, 9735), tuple(96180, 42996), tuple(71846, 84832), tuple(10602, 94421), tuple(83237, 85278), tuple(63713, 14908), tuple(10950, 42931), tuple(33645, 74769), tuple(69501, 8603), tuple(63596, 44221), tuple(75895, 36447), tuple(43990, 4721), tuple(19047, 91357), tuple(35225, 30088), tuple(78898, 87190), tuple(9961, 52820), tuple(6085, 61213), tuple(98275, 84058), tuple(61081, 91315), tuple(28381, 30910), tuple(15828, 72673), tuple(79008, 65337), tuple(60317, 77055), tuple(78534, 50282), tuple(9752, 74831), tuple(62049, 63249), tuple(31455, 74843), tuple(2530, 28581), tuple(68894, 84015), tuple(12791, 14820), tuple(37148, 48411), tuple(88220, 90241), tuple(60582, 70112), tuple(49890, 26900), tuple(94049, 49226), tuple(19582, 98549), tuple(87964, 73614), tuple(54195, 95007), tuple(73593, 29007), tuple(35362, 47461), tuple(93549, 82201), tuple(74305, 49248), tuple(7030, 46073), tuple(69488, 56250), tuple(63045, 25229), tuple(44038, 24680), tuple(65848, 36124), tuple(53985, 95308), tuple(65103, 82209), tuple(26563, 58468), tuple(33153, 12174), tuple(29634, 21978), tuple(26461, 3090), tuple(88683, 4514), tuple(45782, 83561), tuple(56318, 92969), tuple(5587, 61631), tuple(92117, 78865), tuple(78775, 72654), tuple(47395, 49073), tuple(20541, 46928), tuple(71357, 58929), tuple(45184, 76268), tuple(59359, 77092), tuple(5298, 10020), tuple(580, 98499), tuple(9119, 16986), tuple(45518, 86386), tuple(63375, 76589), tuple(31660, 86697), tuple(35851, 65479), tuple(69920, 42815), tuple(30208, 56290), tuple(26343, 37505), tuple(56509, 63902), tuple(85757, 64286), tuple(78627, 79973), tuple(53080, 73913), tuple(49000, 2312), tuple(47315, 57178), tuple(13033, 26209), tuple(53799, 58615), tuple(54508, 22862), tuple(33971, 13889), tuple(22815, 37914), tuple(37426, 99282), tuple(54022, 81696), tuple(17550, 28739), tuple(99122, 99584), tuple(97931, 6054), tuple(46163, 94552), tuple(58328, 70123), tuple(79181, 99242), tuple(64725, 8569), tuple(69146, 39323), tuple(63563, 27537), tuple(96076, 21338), tuple(22936, 20737), tuple(69747, 58505), tuple(52140, 91592), tuple(17198, 19845), tuple(11003, 48066), tuple(1758, 76734), tuple(39891, 17323), tuple(25673, 35578), tuple(83704, 61339), tuple(71674, 51463), tuple(20522, 73773), tuple(37708, 70488), tuple(55492, 76397), tuple(36380, 58022),
     tuple(31085, 23886), tuple(84428, 56183), tuple(61034, 65835), tuple(78297, 58728), tuple(992, 11080), tuple(26764, 59393), tuple(3987, 81148), tuple(57894, 50133), tuple(57393, 54819), tuple(639, 83329), tuple(37777, 47517), tuple(15526, 79423), tuple(88248, 9629), tuple(84464, 59890), tuple(56601, 14257), tuple(67283, 14213), tuple(16041, 41528), tuple(43407, 69763), tuple(51687, 8960), tuple(12121, 10409), tuple(60598, 29848), tuple(7839, 25189), tuple(40941, 3224), tuple(96406, 58803), tuple(61378, 82788), tuple(34541, 19703), tuple(98061, 97148), tuple(742, 7655), tuple(61975, 65313), tuple(64854, 93019), tuple(80244, 18168), tuple(92943, 6105), tuple(73969, 74411), tuple(47856, 26644), tuple(94126, 18220), tuple(81074, 61925), tuple(26953, 28483), tuple(65894, 12345), tuple(54749, 51964), tuple(14147, 41570), tuple(47147, 41809), tuple(8340, 35829), tuple(18897, 32342), tuple(36808, 22226), tuple(18644, 68853), tuple(4559, 12594), tuple(96970, 17395), tuple(50909, 77942), tuple(72027, 49411), tuple(98425, 79478), tuple(45899, 24474), tuple(46824, 48975), tuple(15479, 28870), tuple(45397, 76361), tuple(11420, 22096), tuple(74134, 37467), tuple(25579, 59803), tuple(74687, 44244), tuple(71744, 71562), tuple(49666, 32239), tuple(34931, 56027), tuple(50850, 78241), tuple(71040, 91240), tuple(61550, 47475), tuple(26200, 78373), tuple(54646, 87616), tuple(28950, 6489), tuple(51887, 75308), tuple(3912, 42532), tuple(82742, 42016), tuple(94497, 36681), tuple(62494, 3933), tuple(81131, 18766), tuple(51641, 94651), tuple(72285, 53143), tuple(73943, 73716), tuple(66264, 17309), tuple(43156, 99528), tuple(43697, 78216), tuple(84733, 50821), tuple(75899, 63920), tuple(18455, 7660), tuple(30431, 879), tuple(92204, 44911), tuple(30237, 57641), tuple(33407, 98166), tuple(47862, 73576), tuple(68097, 8833), tuple(2454, 49159), tuple(85772, 67530), tuple(19732, 4536), tuple(93827, 39013), tuple(47927, 1682), tuple(69143, 51598), tuple(87471, 99956), tuple(66362, 70450), tuple(34353, 94326), tuple(15692, 81083), tuple(36376, 91470), tuple(71608, 32098), tuple(38115, 56236), tuple(38822, 64266), tuple(87707, 52553), tuple(97973, 23102), tuple(49267, 68907), tuple(22649, 95175), tuple(33001, 75648), tuple(39808, 55971), tuple(5608, 41816), tuple(40313, 20564), tuple(72994, 53489), tuple(16983, 19806), tuple(46114, 57880), tuple(78622, 59284), tuple(78285, 63449), tuple(84552, 19702), tuple(34234, 63531), tuple(50848, 34774), tuple(87144, 18212), tuple(68214, 1005), tuple(60080, 42398), tuple(60514, 65965), tuple(75134, 65529), tuple(74107, 21666), tuple(59817, 68782), tuple(58940, 16958), tuple(19975, 92583), tuple(38480, 83257), tuple(44510, 44997), tuple(59488, 37263), tuple(71209, 47719), tuple(52080, 94252), tuple(87128, 14831), tuple(74001, 37313), tuple(47448, 76625), tuple(20205, 93608), tuple(30249, 75697), tuple(82584, 44654), tuple(54091, 4298), tuple(47736, 84084), tuple(34052, 55781), tuple(76012, 73648), tuple(63204, 52778), tuple(33692, 54616), tuple(91839, 55044), tuple(71674, 28475), tuple(8517, 3272), tuple(35810, 89905), tuple(35146, 62215), tuple(77262, 18227), tuple(34439, 87732), tuple(82690, 83051),
-    tuple(13687, 19633), tuple(66238, 44809), tuple(53103, 29620), tuple(93365, 87319), tuple(50385, 4755), tuple(89627, 50902), tuple(51790, 15255), tuple(48989, 19631), tuple(16759, 3431), tuple(90814, 19064), tuple(27831, 70254), tuple(75037, 52472), tuple(35010, 24454), tuple(31155, 22730), tuple(87603, 59121), tuple(1323, 23506), tuple(56458, 11866), tuple(21201, 50026), tuple(66671, 36029), tuple(21700, 69519), tuple(85239, 77201), tuple(95141, 57606), tuple(3242, 19997), tuple(52852, 15715), tuple(49676, 70126), tuple(73970, 9214), tuple(86637, 18585), tuple(14571, 65017), tuple(65446, 43663), tuple(20121, 50571), tuple(88634, 87895), tuple(65246, 62716), tuple(27591, 85239), tuple(33623, 14256), tuple(66412, 77902), tuple(16008, 6217), tuple(979, 1666), tuple(22123, 54052), tuple(21596, 7241), tuple(42224, 60675), tuple(23345, 4908), tuple(33780, 16632), tuple(45087, 11756), tuple(10951, 69020), tuple(46138, 47932), tuple(69936, 20048), tuple(5871, 96808), tuple(45595, 67151), tuple(11993, 21010), tuple(20462, 16667), tuple(41417, 88964), tuple(97285, 44958), tuple(20062, 41444), tuple(50808, 18976), tuple(43350, 88847), tuple(34906, 58686), tuple(18132, 2775), tuple(45165, 45298), tuple(75000, 4332), tuple(62157, 9375), tuple(88002, 89214), tuple(84772, 59883), tuple(78078, 35447), tuple(37222, 79319), tuple(43545, 20731), tuple(30761, 13677), tuple(27691, 25767), tuple(97750, 154), tuple(87313, 16187), tuple(78338, 15942), tuple(61168, 16886), tuple(73848, 48436), tuple(74553, 13738), tuple(50645, 37279), tuple(11352, 63404), tuple(85650, 43058), tuple(9553, 2374), tuple(5443, 50670), tuple(55599, 64207), tuple(74136, 41008), tuple(12098, 83456), tuple(98240, 65916), tuple(59743, 64811), tuple(53244, 68834), tuple(66230, 81024), tuple(13734, 83786), tuple(40505, 76939), tuple(93029, 55536), tuple(29943, 53386), tuple(33838, 94514), tuple(71750, 96644), tuple(30017, 8255), tuple(4931, 38730), tuple(2317, 55953), tuple(52389, 67128), tuple(70794, 44324), tuple(24102, 85008), tuple(46435, 65609), tuple(19704, 92026), tuple(99929, 86339), tuple(67622, 13853), tuple(95573, 72963), tuple(99732, 75024), tuple(60437, 5554), tuple(78047, 64444), tuple(95426, 63150), tuple(45798, 26879), tuple(45561, 12951), tuple(95873, 14825), tuple(36695, 13697), tuple(88796, 31855), tuple(52103, 53754), tuple(34496, 56371), tuple(33575, 17436), tuple(39528, 83385), tuple(36153, 48372), tuple(15, 80583), tuple(39015, 36980), tuple(44747, 11011), tuple(7314, 54178), tuple(37252, 52551), tuple(92128, 52377), tuple(66571, 16799), tuple(35841, 92438), tuple(85840, 1365), tuple(39413, 15660), tuple(14759, 58002), tuple(40158, 36685), tuple(68936, 15130), tuple(69488, 30639), tuple(40633, 23355), tuple(93700, 49305), tuple(23456, 96541), tuple(24357, 99667), tuple(25072, 2364), tuple(34734, 17869), tuple(72064, 40226), tuple(22712, 41911), tuple(77545, 19335), tuple(33945, 13408), tuple(63813, 44097), tuple(21816, 77633), tuple(93359, 9036), tuple(47001, 85666), tuple(21934, 56004), tuple(19148, 75033), tuple(88715, 15387), tuple(79158, 53971), tuple(59300, 19502), tuple(66517, 80891), tuple(13859, 63857), tuple(81036, 38595), tuple(8876, 37315), tuple(26819, 54318), tuple(32428, 13471), tuple(2615, 24036), tuple(56894, 82103), tuple(59056, 50983), tuple(15479, 66848), tuple(75766, 27048), tuple(52141, 81023), tuple(94385, 34233), tuple(93361, 79520), tuple(30867, 80795), tuple(46204, 9262), tuple(7946, 4084), tuple(78272, 87422), tuple(33639, 20782), tuple(31276, 45969), tuple(77720, 1335), tuple(16701, 70082), tuple(64963, 19854), tuple(7812, 8856), tuple(16170, 81834), tuple(22877, 7520), tuple(7132, 80996), tuple(1917, 27657), tuple(24737, 91605), tuple(8195, 31354), tuple(22561, 70343), tuple(67166, 74828), tuple(39705, 79118), tuple(43241, 67180), tuple(63526, 22190), tuple(67442, 18172), tuple(38470, 51567), tuple(48664, 43895), tuple(90585, 51544), tuple(11842, 9287), tuple(4231, 61462), tuple(13104, 65739), tuple(52455, 27122), tuple(32318, 92494), tuple(77028, 57920), tuple(52314, 80381), tuple(96749, 22065), tuple(50502, 39753), tuple(99787, 70903), tuple(97786, 28008), tuple(30462, 94898), tuple(59403, 38638), tuple(29827, 16423), tuple(23066, 87865), tuple(61889, 7941), tuple(23948, 78242), tuple(32395, 9480), tuple(36150, 31784), tuple(83146, 10647), tuple(68557, 26863), tuple(93482, 94228), tuple(28512, 89595), tuple(89424, 17693), tuple(68947, 47792), tuple(77918, 25182), tuple(31272, 59863), tuple(10836, 23758), tuple(76913, 75785), tuple(97969, 35902), tuple(55507, 58629), tuple(918, 8356), tuple(66592, 31055), tuple(95309, 59336), tuple(51917, 63380), tuple(79369, 21373), tuple(82766, 76689), tuple(90893, 53940), tuple(31697, 95784), tuple(78683, 89271), tuple(29009, 41573), tuple(9294, 6063), tuple(80573, 79144), tuple(59240, 77056), tuple(99089, 4209), tuple(90406, 92148), tuple(48879, 74391), tuple(22792, 13661), tuple(52282, 74677), tuple(48330, 54418), tuple(6927, 75154), tuple(35007, 12002), tuple(86885, 50845), tuple(74200, 7643), tuple(57915, 3525), tuple(89763, 13455), tuple(98115, 11696), tuple(56291, 17002), tuple(22153, 27947), tuple(85961, 14263), tuple(74214, 58127), tuple(21084, 3965), tuple(86912, 49029), tuple(43018, 83709), tuple(67265, 85823), tuple(68600, 15226), tuple(25932, 81914), tuple(73795, 41791), tuple(3158, 90348), tuple(7664, 81621), tuple(81479, 60118), tuple(93519, 76982), tuple(75440, 3594), tuple(88965, 91886), tuple(92353, 12231), tuple(39378, 69012), tuple(71183, 88536), tuple(36041, 65794), tuple(6724, 26825), tuple(5123, 57858), tuple(2529, 85540), tuple(33448, 94400), tuple(30462, 37765), tuple(30025, 78210), tuple(74349, 5545), tuple(73389, 88842), tuple(78939, 62188), tuple(27948, 62059), tuple(90829, 67200), tuple(44234, 57891), tuple(30700, 61417), tuple(44025, 71190), tuple(22931, 17654), tuple(23476, 87369), tuple(9619, 78967), tuple(24405, 67927), tuple(84754, 91358), tuple(14649, 71404), tuple(4410, 74364), tuple(61417, 87647), tuple(73297, 46647), tuple(32082, 33309), tuple(44590, 47039), tuple(67518, 99908), tuple(22881, 99699), tuple(36657, 17859), tuple(17556, 91128), tuple(58478, 75834), tuple(57048, 73419), tuple(90902, 11840), tuple(4126, 69894), tuple(30361, 54290), tuple(31297, 28595), tuple(54659, 98844), tuple(71265, 86805), tuple(49708, 38180), tuple(24851, 15906), tuple(86094, 67606), tuple(13603, 68975), tuple(3601, 93501), tuple(93480, 17205), tuple(82020, 17859), tuple(68339, 66849), tuple(66423, 9217), tuple(84188, 55471), tuple(28167, 29187), tuple(51166, 46084), tuple(88799, 39664), tuple(67897, 91643), tuple(43015, 68398), tuple(7181, 78174), tuple(6810, 46804), tuple(6034, 55550), tuple(51391, 29469), tuple(76157, 96247), tuple(54973, 75826), tuple(83858, 53576), tuple(87315, 76427), tuple(44051, 44348), tuple(78313, 73128), tuple(44289, 62279), tuple(61897, 87062), tuple(40767, 93761), tuple(91660, 32072), tuple(5223, 36184), tuple(30709, 51066), tuple(40581, 38123), tuple(27886, 39104), tuple(40119, 20754), tuple(27423, 22588), tuple(57235, 49005), tuple(88733, 11711), tuple(4282, 60158), tuple(18632, 3837), tuple(68953, 17510), tuple(21256, 60637), tuple(71727, 176), tuple(25865, 77991), tuple(71032, 40412), tuple(91622, 20288), tuple(49014, 99799), tuple(13599, 5764), tuple(30979, 2454), tuple(40338, 41233), tuple(57336, 50430), tuple(72959, 57286), tuple(85827, 44852), tuple(71907, 33794), tuple(95577, 89084), tuple(72485, 24104), tuple(20306, 76152), tuple(26079, 29381), tuple(46907, 70771), tuple(50365, 90449), tuple(47884, 95986), tuple(88953, 37962), tuple(17407, 91977), tuple(91616, 97270), tuple(85966, 44410), tuple(90389, 12295), tuple(80529, 64553), tuple(21003, 37956), tuple(32923, 30387), tuple(78916, 68050), tuple(15505, 9628), tuple(59050, 38770), tuple(30091, 35499), tuple(30658, 70636), tuple(3160, 24877), tuple(8277, 49676), tuple(74352, 93399), tuple(54074, 53202), tuple(1643, 13321), tuple(71865, 70329), tuple(15251, 5871), tuple(63695, 36988), tuple(96887, 2370), tuple(43098, 14907), tuple(51946, 670), tuple(53294, 72621), tuple(57964, 99634), tuple(17761, 42977), tuple(77571, 38986), tuple(50417, 76385), tuple(80499, 52080), tuple(24301, 56623), tuple(43462, 34196), tuple(49381, 50953), tuple(34053, 74119), tuple(62887, 15142), tuple(69260, 13561), tuple(42848, 87275), tuple(91274, 37268), tuple(87880, 18740), tuple(61314, 8320), tuple(59707, 95633), tuple(38875, 94226), tuple(1415, 62574), tuple(25521, 90678), tuple(48366, 41803), tuple(497, 78256), tuple(26209, 34736), tuple(32946, 44203), tuple(85348, 59409), tuple(25037, 86769), tuple(12753, 78083), tuple(7901, 34859), tuple(70495, 40252), tuple(93318, 95446), tuple(64601, 60123), tuple(18929, 93512), tuple(90647, 85301), tuple(24280, 1900), tuple(82057, 44496), tuple(72227, 33583), tuple(7109, 24591), tuple(37709, 22897), tuple(1237, 16650), tuple(3383, 97434), tuple(72245, 64486), tuple(10201, 46701), tuple(70246, 27545), tuple(98647, 31169), tuple(21901, 75927), tuple(50188, 21441), tuple(89577, 37821), tuple(98823, 69937), tuple(19263, 97734), tuple(92937, 44136), tuple(626, 95680), tuple(12956, 24497), tuple(454, 41351), tuple(40585, 99858), tuple(26190, 82119), tuple(83467, 58869), tuple(39533, 27469), tuple(84276, 26501), tuple(29838, 24478), tuple(78589, 73649), tuple(85241, 37456), tuple(37739, 27890), tuple(30935, 18054), tuple(44388, 47592), tuple(46287, 11414), tuple(41275, 7284), tuple(61172, 59962), tuple(69172, 14436), tuple(11827, 43746), tuple(70455, 93926), tuple(35662, 19338), tuple(24436, 53824), tuple(28435, 33323), tuple(54767, 30980), tuple(91379, 46216), tuple(2656, 98555), tuple(17703, 75278), tuple(52299, 81894), tuple(88460, 76874), tuple(29298, 37649), tuple(87510, 3320), tuple(55513, 94080), tuple(77940, 95554), tuple(15605, 18918), tuple(49452, 85395), tuple(85737, 18109), tuple(73279, 56989), tuple(17461, 32967), tuple(19605, 43424), tuple(93999, 7945), tuple(29865, 94947), tuple(39164, 19448), tuple(88080, 7422),              
+    tuple(13687, 19633), tuple(66238, 44809), tuple(53103, 29620), tuple(93365, 87319), tuple(50385, 4755), tuple(89627, 50902), tuple(51790, 15255), tuple(48989, 19631), tuple(16759, 3431), tuple(90814, 19064), tuple(27831, 70254), tuple(75037, 52472), tuple(35010, 24454), tuple(31155, 22730), tuple(87603, 59121), tuple(1323, 23506), tuple(56458, 11866), tuple(21201, 50026), tuple(66671, 36029), tuple(21700, 69519), tuple(85239, 77201), tuple(95141, 57606), tuple(3242, 19997), tuple(52852, 15715), tuple(49676, 70126), tuple(73970, 9214), tuple(86637, 18585), tuple(14571, 65017), tuple(65446, 43663), tuple(20121, 50571), tuple(88634, 87895), tuple(65246, 62716), tuple(27591, 85239), tuple(33623, 14256), tuple(66412, 77902), tuple(16008, 6217), tuple(979, 1666), tuple(22123, 54052), tuple(21596, 7241), tuple(42224, 60675), tuple(23345, 4908), tuple(33780, 16632), tuple(45087, 11756), tuple(10951, 69020), tuple(46138, 47932), tuple(69936, 20048), tuple(5871, 96808), tuple(45595, 67151), tuple(11993, 21010), tuple(20462, 16667), tuple(41417, 88964), tuple(97285, 44958), tuple(20062, 41444), tuple(50808, 18976), tuple(43350, 88847), tuple(34906, 58686), tuple(18132, 2775), tuple(45165, 45298), tuple(75000, 4332), tuple(62157, 9375), tuple(88002, 89214), tuple(84772, 59883), tuple(78078, 35447), tuple(37222, 79319), tuple(43545, 20731), tuple(30761, 13677), tuple(27691, 25767), tuple(97750, 154), tuple(87313, 16187), tuple(78338, 15942), tuple(61168, 16886), tuple(73848, 48436), tuple(74553, 13738), tuple(50645, 37279), tuple(11352, 63404), tuple(85650, 43058), tuple(9553, 2374), tuple(5443, 50670), tuple(55599, 64207), tuple(74136, 41008), tuple(12098, 83456), tuple(98240, 65916), tuple(59743, 64811), tuple(53244, 68834), tuple(66230, 81024), tuple(13734, 83786), tuple(40505, 76939), tuple(93029, 55536), tuple(29943, 53386), tuple(33838, 94514), tuple(71750, 96644), tuple(30017, 8255), tuple(4931, 38730), tuple(2317, 55953), tuple(52389, 67128), tuple(70794, 44324), tuple(24102, 85008), tuple(46435, 65609), tuple(19704, 92026), tuple(99929, 86339), tuple(67622, 13853), tuple(95573, 72963), tuple(99732, 75024), tuple(60437, 5554), tuple(78047, 64444), tuple(95426, 63150), tuple(45798, 26879), tuple(45561, 12951), tuple(95873, 14825), tuple(36695, 13697), tuple(88796, 31855), tuple(52103, 53754), tuple(34496, 56371), tuple(33575, 17436), tuple(39528, 83385), tuple(36153, 48372), tuple(15, 80583), tuple(39015, 36980), tuple(44747, 11011), tuple(7314, 54178), tuple(37252, 52551), tuple(92128, 52377), tuple(66571, 16799), tuple(35841, 92438), tuple(85840, 1365), tuple(39413, 15660), tuple(14759, 58002), tuple(40158, 36685), tuple(68936, 15130), tuple(69488, 30639), tuple(40633, 23355), tuple(93700, 49305), tuple(23456, 96541), tuple(24357, 99667), tuple(25072, 2364), tuple(34734, 17869), tuple(72064, 40226), tuple(22712, 41911), tuple(77545, 19335), tuple(33945, 13408), tuple(63813, 44097), tuple(21816, 77633), tuple(93359, 9036), tuple(47001, 85666), tuple(21934, 56004), tuple(19148, 75033), tuple(88715, 15387), tuple(79158, 53971), tuple(59300, 19502), tuple(66517, 80891), tuple(13859, 63857), tuple(81036, 38595), tuple(8876, 37315), tuple(26819, 54318), tuple(32428, 13471), tuple(2615, 24036), tuple(56894, 82103), tuple(59056, 50983), tuple(15479, 66848), tuple(75766, 27048), tuple(52141, 81023), tuple(94385, 34233), tuple(93361, 79520), tuple(30867, 80795), tuple(46204, 9262), tuple(7946, 4084), tuple(78272, 87422), tuple(33639, 20782), tuple(31276, 45969), tuple(77720, 1335), tuple(16701, 70082), tuple(64963, 19854), tuple(7812, 8856), tuple(16170, 81834), tuple(22877, 7520), tuple(7132, 80996), tuple(1917, 27657), tuple(24737, 91605), tuple(8195, 31354), tuple(22561, 70343), tuple(67166, 74828), tuple(39705, 79118), tuple(43241, 67180), tuple(63526, 22190), tuple(67442, 18172), tuple(38470, 51567), tuple(48664, 43895), tuple(90585, 51544), tuple(11842, 9287), tuple(4231, 61462), tuple(13104, 65739), tuple(52455, 27122), tuple(32318, 92494), tuple(77028, 57920), tuple(52314, 80381), tuple(96749, 22065), tuple(50502, 39753), tuple(99787, 70903), tuple(97786, 28008), tuple(30462, 94898), tuple(59403, 38638), tuple(29827, 16423), tuple(23066, 87865), tuple(61889, 7941), tuple(23948, 78242), tuple(32395, 9480), tuple(36150, 31784), tuple(83146, 10647), tuple(68557, 26863), tuple(93482, 94228), tuple(28512, 89595), tuple(89424, 17693), tuple(68947, 47792), tuple(77918, 25182), tuple(31272, 59863), tuple(10836, 23758), tuple(76913, 75785), tuple(97969, 35902), tuple(55507, 58629), tuple(918, 8356), tuple(66592, 31055), tuple(95309, 59336), tuple(51917, 63380), tuple(79369, 21373), tuple(82766, 76689), tuple(90893, 53940), tuple(31697, 95784), tuple(78683, 89271), tuple(29009, 41573), tuple(9294, 6063), tuple(80573, 79144), tuple(59240, 77056), tuple(99089, 4209), tuple(90406, 92148), tuple(48879, 74391), tuple(22792, 13661), tuple(52282, 74677), tuple(48330, 54418), tuple(6927, 75154), tuple(35007, 12002), tuple(86885, 50845), tuple(74200, 7643), tuple(57915, 3525), tuple(89763, 13455), tuple(98115, 11696), tuple(56291, 17002), tuple(22153, 27947), tuple(85961, 14263), tuple(74214, 58127), tuple(21084, 3965), tuple(86912, 49029), tuple(43018, 83709), tuple(67265, 85823), tuple(68600, 15226), tuple(25932, 81914), tuple(73795, 41791), tuple(3158, 90348), tuple(7664, 81621), tuple(81479, 60118), tuple(93519, 76982), tuple(75440, 3594), tuple(88965, 91886), tuple(92353, 12231), tuple(39378, 69012), tuple(71183, 88536), tuple(36041, 65794), tuple(6724, 26825), tuple(5123, 57858), tuple(2529, 85540), tuple(33448, 94400), tuple(30462, 37765), tuple(30025, 78210), tuple(74349, 5545), tuple(73389, 88842), tuple(78939, 62188), tuple(27948, 62059), tuple(90829, 67200), tuple(44234, 57891), tuple(30700, 61417), tuple(44025, 71190), tuple(22931, 17654), tuple(23476, 87369), tuple(9619, 78967), tuple(24405, 67927), tuple(84754, 91358), tuple(14649, 71404), tuple(4410, 74364), tuple(61417, 87647), tuple(73297, 46647), tuple(32082, 33309), tuple(44590, 47039), tuple(67518, 99908), tuple(22881, 99699), tuple(36657, 17859), tuple(17556, 91128), tuple(58478, 75834), tuple(57048, 73419), tuple(90902, 11840), tuple(4126, 69894), tuple(30361, 54290), tuple(31297, 28595), tuple(54659, 98844), tuple(71265, 86805), tuple(49708, 38180), tuple(24851, 15906), tuple(86094, 67606), tuple(13603, 68975), tuple(3601, 93501), tuple(93480, 17205), tuple(82020, 17859), tuple(68339, 66849), tuple(66423, 9217), tuple(84188, 55471), tuple(28167, 29187), tuple(51166, 46084), tuple(88799, 39664), tuple(67897, 91643), tuple(43015, 68398), tuple(7181, 78174), tuple(6810, 46804), tuple(6034, 55550), tuple(51391, 29469), tuple(76157, 96247), tuple(54973, 75826), tuple(83858, 53576), tuple(87315, 76427), tuple(44051, 44348), tuple(78313, 73128), tuple(44289, 62279), tuple(61897, 87062), tuple(40767, 93761), tuple(91660, 32072), tuple(5223, 36184), tuple(30709, 51066), tuple(40581, 38123), tuple(27886, 39104), tuple(40119, 20754), tuple(27423, 22588), tuple(57235, 49005), tuple(88733, 11711), tuple(4282, 60158), tuple(18632, 3837), tuple(68953, 17510), tuple(21256, 60637), tuple(71727, 176), tuple(25865, 77991), tuple(71032, 40412), tuple(91622, 20288), tuple(49014, 99799), tuple(13599, 5764), tuple(30979, 2454), tuple(40338, 41233), tuple(57336, 50430), tuple(72959, 57286), tuple(85827, 44852), tuple(71907, 33794), tuple(95577, 89084), tuple(72485, 24104), tuple(20306, 76152), tuple(26079, 29381), tuple(46907, 70771), tuple(50365, 90449), tuple(47884, 95986), tuple(88953, 37962), tuple(17407, 91977), tuple(91616, 97270), tuple(85966, 44410), tuple(90389, 12295), tuple(80529, 64553), tuple(21003, 37956), tuple(32923, 30387), tuple(78916, 68050), tuple(15505, 9628), tuple(59050, 38770), tuple(30091, 35499), tuple(30658, 70636), tuple(3160, 24877), tuple(8277, 49676), tuple(74352, 93399), tuple(54074, 53202), tuple(1643, 13321), tuple(71865, 70329), tuple(15251, 5871), tuple(63695, 36988), tuple(96887, 2370), tuple(43098, 14907), tuple(51946, 670), tuple(53294, 72621), tuple(57964, 99634), tuple(17761, 42977), tuple(77571, 38986), tuple(50417, 76385), tuple(80499, 52080), tuple(24301, 56623), tuple(43462, 34196), tuple(49381, 50953), tuple(34053, 74119), tuple(62887, 15142), tuple(69260, 13561), tuple(42848, 87275), tuple(91274, 37268), tuple(87880, 18740), tuple(61314, 8320), tuple(59707, 95633), tuple(38875, 94226), tuple(1415, 62574), tuple(25521, 90678), tuple(48366, 41803), tuple(497, 78256), tuple(26209, 34736), tuple(32946, 44203), tuple(85348, 59409), tuple(25037, 86769), tuple(12753, 78083), tuple(7901, 34859), tuple(70495, 40252), tuple(93318, 95446), tuple(64601, 60123), tuple(18929, 93512), tuple(90647, 85301), tuple(24280, 1900), tuple(82057, 44496), tuple(72227, 33583), tuple(7109, 24591), tuple(37709, 22897), tuple(1237, 16650), tuple(3383, 97434), tuple(72245, 64486), tuple(10201, 46701), tuple(70246, 27545), tuple(98647, 31169), tuple(21901, 75927), tuple(50188, 21441), tuple(89577, 37821), tuple(98823, 69937), tuple(19263, 97734), tuple(92937, 44136), tuple(626, 95680), tuple(12956, 24497), tuple(454, 41351), tuple(40585, 99858), tuple(26190, 82119), tuple(83467, 58869), tuple(39533, 27469), tuple(84276, 26501), tuple(29838, 24478), tuple(78589, 73649), tuple(85241, 37456), tuple(37739, 27890), tuple(30935, 18054), tuple(44388, 47592), tuple(46287, 11414), tuple(41275, 7284), tuple(61172, 59962), tuple(69172, 14436), tuple(11827, 43746), tuple(70455, 93926), tuple(35662, 19338), tuple(24436, 53824), tuple(28435, 33323), tuple(54767, 30980), tuple(91379, 46216), tuple(2656, 98555), tuple(17703, 75278), tuple(52299, 81894), tuple(88460, 76874), tuple(29298, 37649), tuple(87510, 3320), tuple(55513, 94080), tuple(77940, 95554), tuple(15605, 18918), tuple(49452, 85395), tuple(85737, 18109), tuple(73279, 56989), tuple(17461, 32967), tuple(19605, 43424), tuple(93999, 7945), tuple(29865, 94947), tuple(39164, 19448), tuple(88080, 7422),
     tuple(436, 99800), tuple(27482, 44994), tuple(73495, 66844), tuple(47160, 66210), tuple(98801, 18553), tuple(33222, 8808), tuple(31037, 15092), tuple(92621, 47184), tuple(54888, 65801), tuple(30873, 33071), tuple(61182, 77132), tuple(81992, 40879), tuple(10268, 38847), tuple(26012, 24149), tuple(85131, 81923), tuple(10950, 55371), tuple(17788, 48443), tuple(39646, 51743), tuple(36019, 76895), tuple(9763, 36927), tuple(19582, 16771), tuple(68211, 84210), tuple(9412, 55904), tuple(44002, 9077), tuple(36583, 1638), tuple(97906, 20583), tuple(12863, 74173), tuple(29698, 34767), tuple(34469, 78263), tuple(87561, 58797), tuple(77844, 10556), tuple(68239, 63155), tuple(41560, 93635), tuple(52548, 95710), tuple(11161, 632), tuple(91657, 97784), tuple(93088, 89618), tuple(42604, 94389), tuple(4198, 51324), tuple(96597, 97093), tuple(77382, 89074), tuple(41381, 89801), tuple(25857, 67775), tuple(41422, 59757), tuple(39574, 93308), tuple(85990, 91621), tuple(49182, 92967), tuple(84187, 73625), tuple(92495, 93334), tuple(12471, 33289), tuple(49105, 76813), tuple(26330, 94103), tuple(70805, 33031), tuple(49193, 18360), tuple(18002, 29159), tuple(70447, 50454), tuple(44081, 3675), tuple(96495, 16455), tuple(98675, 5876), tuple(2913, 30032), tuple(91048, 91939), tuple(50496, 3621), tuple(7244, 20490), tuple(89364, 30152), tuple(43588, 25656), tuple(42086, 70055), tuple(90150, 95763), tuple(31727, 49598), tuple(92625, 29569), tuple(54148, 81753), tuple(77721, 57094), tuple(67706, 83472), tuple(26935, 9073), tuple(29554, 1952), tuple(33394, 13797), tuple(77797, 84190), tuple(65692, 40517), tuple(86640, 91307), tuple(56461, 17709), tuple(30204, 2620), tuple(72787, 87380), tuple(51439, 56294), tuple(25033, 30268), tuple(27379, 59569), tuple(11651, 62401), tuple(69998, 96886), tuple(17278, 56849), tuple(71326, 41808), tuple(50372, 4986), tuple(1711, 73335), tuple(71837, 63661), tuple(78810, 60882), tuple(62918, 6111), tuple(76267, 27414), tuple(12536, 747), tuple(24221, 44906), tuple(2136, 84763), tuple(7736, 18765), tuple(71822, 70209), tuple(55828, 97876), tuple(27029, 80557), tuple(47068, 2260), tuple(47441, 81681), tuple(95204, 83508), tuple(94992, 98690), tuple(86479, 34930), tuple(51759, 64962), tuple(23363, 25795), tuple(50675, 29266), tuple(54059, 35176), tuple(37985, 70844), tuple(270, 33485), tuple(88135, 28988), tuple(97160, 54235), tuple(71087, 50356), tuple(42552, 11173), tuple(58508, 4623), tuple(15663, 61919), tuple(7672, 63865), tuple(14458, 76549), tuple(94036, 65780), tuple(76076, 98795), tuple(65158, 94233), tuple(38869, 33986), tuple(25926, 48043), tuple(8196, 61978), tuple(93547, 83000), tuple(13218, 70869), tuple(40220, 153), tuple(40683, 8335), tuple(38208, 71925), tuple(63199, 70045), tuple(3199, 10537), tuple(16665, 29551), tuple(91333, 59035), tuple(60598, 74055), tuple(18820, 76617), tuple(31822, 14637), tuple(1508, 13279), tuple(99959, 73482), tuple(69854, 34920), tuple(59650, 1074), tuple(1538, 52026), tuple(84941, 6002), tuple(82892, 20921), tuple(88023, 79990), tuple(6945, 92700), tuple(2389, 62469), tuple(38515, 78260), tuple(34721, 56417), tuple(37208, 71058), tuple(78134, 76540), tuple(18831, 53863),
-    tuple(81277, 26395), tuple(57176, 69906), tuple(55080, 20726), tuple(65843, 9495), tuple(27703, 24879), tuple(60594, 53447), tuple(72896, 95513), tuple(87884, 50244), tuple(25281, 16427), tuple(14122, 6399), tuple(65765, 45679), tuple(38160, 38650), tuple(76820, 91595), tuple(74663, 37143), tuple(35220, 16865), tuple(54664, 88840), tuple(7671, 19781), tuple(7255, 87276), tuple(92182, 47030), tuple(98922, 49381), tuple(21954, 20742), tuple(54674, 19730), tuple(74694, 81672), tuple(31070, 97794), tuple(22759, 3530), tuple(6085, 72621), tuple(17392, 26996), tuple(82220, 41192), tuple(48225, 41272), tuple(42850, 54369), tuple(10817, 25978), tuple(18889, 81907), tuple(33157, 51203), tuple(64325, 5137), tuple(54695, 50597), tuple(32244, 99170), tuple(64264, 23137), tuple(22912, 47267), tuple(70570, 51635), tuple(96224, 20571), tuple(91110, 65969), tuple(2598, 66368), tuple(80926, 52434), tuple(1538, 77141), tuple(10149, 21484), tuple(4981, 58501), tuple(5154, 55414), tuple(66791, 35619), tuple(9905, 90667), tuple(83595, 75525), tuple(31989, 37492), tuple(41740, 48920), tuple(33876, 10878), tuple(48654, 50120), tuple(85890, 46200), tuple(67100, 30387), tuple(76475, 38916), tuple(1654, 1657), tuple(93842, 71472), tuple(14560, 97747), tuple(24866, 74187), tuple(11477, 2492), tuple(94590, 95965), tuple(29363, 58015), tuple(58783, 5304), tuple(27337, 87412), tuple(17695, 41885), tuple(91837, 75700), tuple(271, 49400), tuple(33438, 84607), tuple(78520, 46982), tuple(38817, 66995), tuple(2031, 58147), tuple(80354, 75561), tuple(7752, 55141), tuple(22715, 29219), tuple(10069, 69521), tuple(1711, 23325), tuple(88218, 94290), tuple(44895, 32844), tuple(62152, 964), tuple(32945, 57419), tuple(19030, 51353), tuple(53097, 36525), tuple(76592, 2389), tuple(53949, 27282), tuple(10569, 90204), tuple(94318, 48527), tuple(13855, 27099), tuple(41107, 11962), tuple(39143, 81444), tuple(66004, 38387), tuple(55906, 61394), tuple(34933, 33952), tuple(53868, 82829), tuple(86213, 80445), tuple(40351, 56305), tuple(97656, 90533), tuple(48021, 7262), tuple(49406, 38294), tuple(57170, 7675), tuple(7040, 8039), tuple(65129, 76668), tuple(7554, 74457), tuple(65930, 2421), tuple(12739, 37328), tuple(17174, 68325), tuple(63207, 21315), tuple(70066, 44503), tuple(19112, 8081), tuple(80329, 65152), tuple(76480, 39600), tuple(75262, 45432), tuple(24382, 67054), tuple(75360, 90438), tuple(21786, 19182), tuple(2050, 82428), tuple(34831, 92670), tuple(69746, 44939), tuple(6130, 58630), tuple(62478, 14374), tuple(35730, 71761), tuple(20641, 66145), tuple(86551, 64076), tuple(37559, 79379), tuple(8215, 82203), tuple(33701, 9187), tuple(22679, 38196), tuple(17476, 25994), tuple(4391, 62658), tuple(87726, 32997), tuple(22552, 65818), tuple(18115, 42587), tuple(64374, 97689), tuple(64896, 49572), tuple(98479, 75547), tuple(881, 32287), tuple(25305, 16000), tuple(295, 67454), tuple(67642, 87363), tuple(50945, 31544), tuple(95966, 9972), tuple(44139, 28252), tuple(83682, 88471), tuple(34615, 665), tuple(13190, 85527), tuple(32195, 81130), tuple(22310, 12209), tuple(27910, 60272), tuple(40133, 5905), tuple(29352, 36686), tuple(76443, 64096), tuple(79522, 79616), tuple(63465, 96631), tuple(95604, 90216), tuple(88548, 12411), tuple(63732, 50843), tuple(1478, 11113), tuple(41472, 43329), tuple(35207, 78855), tuple(95093, 22581), tuple(67812, 1348), tuple(96472, 75947), tuple(18984, 63538), tuple(84782, 72178), tuple(53524, 46634), tuple(95525, 15476), tuple(82732, 89272), tuple(59603, 2032), tuple(74431, 78243), tuple(47712, 51835), tuple(82671, 67076), tuple(63302, 96469), tuple(77655, 95524), tuple(11099, 31832), tuple(77967, 32724), tuple(85070, 36190), tuple(93260, 32825), tuple(51348, 34162), tuple(40912, 26841), tuple(27227, 21822), tuple(15979, 96933), tuple(76990, 90541), tuple(36121, 90437), tuple(85571, 9605), tuple(85987, 46881), tuple(86738, 82375), tuple(80188, 48238), tuple(64608, 41916), tuple(79866, 9442), tuple(28100, 95607), tuple(10136, 19628), tuple(6078, 59019), tuple(8971, 11986), tuple(75703, 209), tuple(81982, 98701), tuple(30455, 66367), tuple(92825, 84403), tuple(73144, 4923), tuple(62835, 75533), tuple(90925, 56381), tuple(83853, 86786), tuple(66906, 28576), tuple(69683, 74216), tuple(2171, 22531), tuple(6591, 52559), tuple(59362, 88732), tuple(49865, 38016), tuple(82881, 9151), tuple(71356, 27365), tuple(91463, 45944), tuple(71040, 12264), tuple(62116, 27681), tuple(84941, 82284), tuple(57515, 60713), tuple(45227, 74196), tuple(77502, 17765), tuple(54055, 29484), tuple(33708, 46220), tuple(37344, 75102), tuple(80480, 37942), tuple(95782, 36781), tuple(14092, 82457), tuple(25284, 82297), tuple(85150, 50659), tuple(90037, 99122), tuple(49584, 48321), tuple(8028, 65210), tuple(8162, 32091), tuple(1609, 22211), tuple(38548, 1023), tuple(35864, 43021), tuple(54196, 30754), tuple(88535, 90185), tuple(5518, 97226), tuple(79272, 57758), tuple(61381, 86419), tuple(38344, 86877), tuple(72629, 24694), tuple(12563, 11747), tuple(81456, 44023), tuple(55536, 65195), tuple(67741, 12182), tuple(64250, 29636), tuple(45252, 9834), tuple(16576, 40098), tuple(65924, 11123), tuple(14090, 83443), tuple(95180, 92697), tuple(92452, 7957), tuple(21244, 29717), tuple(50253, 62030), tuple(21401, 70735), tuple(86803, 89625), tuple(17066, 52757), tuple(74570, 89660), tuple(11647, 74336), tuple(22463, 68191), tuple(41693, 67542), tuple(12994, 21955), tuple(3180, 27966), tuple(37236, 51099), tuple(68568, 62778), tuple(2671, 68542), tuple(42771, 4268), tuple(7578, 12919), tuple(33838, 61136), tuple(87904, 48076), tuple(3781, 57164), tuple(83289, 14414), tuple(29626, 91409), tuple(92536, 13946), tuple(88125, 34961), tuple(71541, 41249), tuple(21045, 85183), tuple(21628, 62294), tuple(17768, 22390), tuple(5892, 10231), tuple(85902, 84414), tuple(44078, 87944), tuple(64981, 31018), tuple(85690, 11077), tuple(4711, 9309), tuple(39077, 26339), tuple(85313, 99603), tuple(20267, 31090), tuple(92684, 11726), tuple(17887, 17415), tuple(23064, 83141), tuple(40925, 87246), tuple(17575, 71065), tuple(29396, 86192), tuple(10859, 2881), tuple(50457, 42309), tuple(86972, 41824), tuple(80954, 76970), tuple(11664, 94322), tuple(4286, 93562), tuple(9093, 32589), tuple(81261, 96519), tuple(67886, 3086), tuple(74132, 43197), tuple(94549, 26192), tuple(55498, 75374), tuple(93813, 32911), tuple(6727, 51629), tuple(93543, 55373), tuple(48682, 83316), tuple(32468, 77339), tuple(60028, 4896), tuple(34177, 67214), tuple(35429, 16686), tuple(72814, 39944), tuple(82791, 97364), tuple(21249, 36007), tuple(85536, 84815), tuple(32784, 34349), tuple(2391, 45661), tuple(62595, 30434), tuple(56513, 65051), tuple(22536, 99421), tuple(80603, 62636), tuple(23609, 19082), tuple(33262, 63428), tuple(45307, 96049), tuple(75079, 62835), tuple(52361, 19400), tuple(43845, 89033), tuple(54257, 33298), tuple(31133, 35836), tuple(56725, 10158), tuple(73650, 10456), tuple(77548, 28249), tuple(57998, 79546), tuple(97895, 93196), tuple(472, 18004), tuple(67178, 2684), tuple(34612, 36352), tuple(84970, 98816), tuple(32474, 5895), tuple(60388, 75957), tuple(81643, 26457), tuple(30070, 55744), tuple(14725, 58396), tuple(66451, 69932), tuple(59264, 59569), tuple(98045, 63704), tuple(11925, 87468), tuple(24701, 6280), tuple(47797, 84240), tuple(998, 13575), tuple(37865, 72036), tuple(71339, 10339), tuple(28248, 7481), tuple(33945, 97829), tuple(85194, 8904), tuple(39669, 73192), tuple(24326, 65934), tuple(14438, 72729), tuple(76676, 35176), tuple(97604, 95931), tuple(36032, 61056), tuple(65788, 20291), tuple(73067, 60718), tuple(75742, 27362), tuple(45393, 74792), tuple(49586, 13048), tuple(57961, 68534), tuple(78171, 47271), tuple(76064, 41030), tuple(88738, 10155), tuple(87757, 63134), tuple(95783, 76438), tuple(77935, 85529), tuple(79345, 69555), tuple(94483, 58668), tuple(9432, 40485), tuple(43585, 376), tuple(61737, 97784), tuple(1593, 37078), tuple(11129, 23793), tuple(94341, 64063), tuple(41896, 70446), tuple(77473, 33532), tuple(66748, 65844), tuple(17802, 27920), tuple(22891, 12901), tuple(40435, 43348), tuple(27956, 16989), tuple(29550, 63725), tuple(49453, 61216), tuple(25570, 97985), tuple(39599, 83449), tuple(96373, 12817), tuple(48357, 40473), tuple(99949, 33182), tuple(85434, 45421), tuple(28033, 46182), tuple(80932, 26691), tuple(99522, 29180), tuple(70868, 31903), tuple(63217, 51504), tuple(70267, 29484), tuple(36096, 28371), tuple(45710, 2823), tuple(85697, 3912), tuple(25410, 70358), tuple(73558, 82834), tuple(28617, 80585), tuple(81874, 57512), tuple(76797, 45045), tuple(22091, 84124), tuple(68372, 42189), tuple(66320, 83215), tuple(23013, 22530), tuple(33735, 97800), tuple(54318, 99061), tuple(18025, 39513), tuple(69059, 39780), tuple(58425, 39790), tuple(10222, 96791), tuple(17061, 3138), tuple(92416, 5773), tuple(20023, 31736), tuple(47846, 74511), tuple(52598, 26398), tuple(3738, 44490), tuple(53346, 79223), tuple(31991, 57557), tuple(34592, 98693), tuple(86926, 20881), tuple(14108, 87654), tuple(4889, 34982), tuple(77283, 73201), tuple(13668, 22633), tuple(50763, 95152), tuple(97292, 54613), tuple(22782, 30081), tuple(21536, 46551), tuple(45965, 4172), tuple(75537, 79254), tuple(41267, 86819), tuple(57723, 75200), tuple(60404, 27252), tuple(80305, 57892), tuple(50103, 24015), tuple(69409, 13132), tuple(30717, 56384), tuple(54568, 79877), tuple(8584, 8359), tuple(41416, 64392), tuple(32898, 92944), tuple(5262, 35907), tuple(88652, 77951), tuple(16619, 2797), tuple(42494, 65581), tuple(21009, 18555), tuple(29084, 28068), tuple(29464, 35568), tuple(7288, 52066), tuple(32378, 48725), tuple(95300, 62168), tuple(52295, 97110), tuple(36862, 87786), tuple(12224, 86684), tuple(85883, 34167), tuple(45369, 76651), tuple(95460, 42855), tuple(34354, 87238), tuple(7214, 96375), tuple(58720, 87947), tuple(55009, 10506), tuple(98506, 6081), tuple(46068, 81113), tuple(99065, 58657), tuple(81820, 28081), tuple(90611, 57235), tuple(7661, 72835), tuple(93195, 90418), tuple(34452, 20146),                
+    tuple(81277, 26395), tuple(57176, 69906), tuple(55080, 20726), tuple(65843, 9495), tuple(27703, 24879), tuple(60594, 53447), tuple(72896, 95513), tuple(87884, 50244), tuple(25281, 16427), tuple(14122, 6399), tuple(65765, 45679), tuple(38160, 38650), tuple(76820, 91595), tuple(74663, 37143), tuple(35220, 16865), tuple(54664, 88840), tuple(7671, 19781), tuple(7255, 87276), tuple(92182, 47030), tuple(98922, 49381), tuple(21954, 20742), tuple(54674, 19730), tuple(74694, 81672), tuple(31070, 97794), tuple(22759, 3530), tuple(6085, 72621), tuple(17392, 26996), tuple(82220, 41192), tuple(48225, 41272), tuple(42850, 54369), tuple(10817, 25978), tuple(18889, 81907), tuple(33157, 51203), tuple(64325, 5137), tuple(54695, 50597), tuple(32244, 99170), tuple(64264, 23137), tuple(22912, 47267), tuple(70570, 51635), tuple(96224, 20571), tuple(91110, 65969), tuple(2598, 66368), tuple(80926, 52434), tuple(1538, 77141), tuple(10149, 21484), tuple(4981, 58501), tuple(5154, 55414), tuple(66791, 35619), tuple(9905, 90667), tuple(83595, 75525), tuple(31989, 37492), tuple(41740, 48920), tuple(33876, 10878), tuple(48654, 50120), tuple(85890, 46200), tuple(67100, 30387), tuple(76475, 38916), tuple(1654, 1657), tuple(93842, 71472), tuple(14560, 97747), tuple(24866, 74187), tuple(11477, 2492), tuple(94590, 95965), tuple(29363, 58015), tuple(58783, 5304), tuple(27337, 87412), tuple(17695, 41885), tuple(91837, 75700), tuple(271, 49400), tuple(33438, 84607), tuple(78520, 46982), tuple(38817, 66995), tuple(2031, 58147), tuple(80354, 75561), tuple(7752, 55141), tuple(22715, 29219), tuple(10069, 69521), tuple(1711, 23325), tuple(88218, 94290), tuple(44895, 32844), tuple(62152, 964), tuple(32945, 57419), tuple(19030, 51353), tuple(53097, 36525), tuple(76592, 2389), tuple(53949, 27282), tuple(10569, 90204), tuple(94318, 48527), tuple(13855, 27099), tuple(41107, 11962), tuple(39143, 81444), tuple(66004, 38387), tuple(55906, 61394), tuple(34933, 33952), tuple(53868, 82829), tuple(86213, 80445), tuple(40351, 56305), tuple(97656, 90533), tuple(48021, 7262), tuple(49406, 38294), tuple(57170, 7675), tuple(7040, 8039), tuple(65129, 76668), tuple(7554, 74457), tuple(65930, 2421), tuple(12739, 37328), tuple(17174, 68325), tuple(63207, 21315), tuple(70066, 44503), tuple(19112, 8081), tuple(80329, 65152), tuple(76480, 39600), tuple(75262, 45432), tuple(24382, 67054), tuple(75360, 90438), tuple(21786, 19182), tuple(2050, 82428), tuple(34831, 92670), tuple(69746, 44939), tuple(6130, 58630), tuple(62478, 14374), tuple(35730, 71761), tuple(20641, 66145), tuple(86551, 64076), tuple(37559, 79379), tuple(8215, 82203), tuple(33701, 9187), tuple(22679, 38196), tuple(17476, 25994), tuple(4391, 62658), tuple(87726, 32997), tuple(22552, 65818), tuple(18115, 42587), tuple(64374, 97689), tuple(64896, 49572), tuple(98479, 75547), tuple(881, 32287), tuple(25305, 16000), tuple(295, 67454), tuple(67642, 87363), tuple(50945, 31544), tuple(95966, 9972), tuple(44139, 28252), tuple(83682, 88471), tuple(34615, 665), tuple(13190, 85527), tuple(32195, 81130), tuple(22310, 12209), tuple(27910, 60272), tuple(40133, 5905), tuple(29352, 36686), tuple(76443, 64096), tuple(79522, 79616), tuple(63465, 96631), tuple(95604, 90216), tuple(88548, 12411), tuple(63732, 50843), tuple(1478, 11113), tuple(41472, 43329), tuple(35207, 78855), tuple(95093, 22581), tuple(67812, 1348), tuple(96472, 75947), tuple(18984, 63538), tuple(84782, 72178), tuple(53524, 46634), tuple(95525, 15476), tuple(82732, 89272), tuple(59603, 2032), tuple(74431, 78243), tuple(47712, 51835), tuple(82671, 67076), tuple(63302, 96469), tuple(77655, 95524), tuple(11099, 31832), tuple(77967, 32724), tuple(85070, 36190), tuple(93260, 32825), tuple(51348, 34162), tuple(40912, 26841), tuple(27227, 21822), tuple(15979, 96933), tuple(76990, 90541), tuple(36121, 90437), tuple(85571, 9605), tuple(85987, 46881), tuple(86738, 82375), tuple(80188, 48238), tuple(64608, 41916), tuple(79866, 9442), tuple(28100, 95607), tuple(10136, 19628), tuple(6078, 59019), tuple(8971, 11986), tuple(75703, 209), tuple(81982, 98701), tuple(30455, 66367), tuple(92825, 84403), tuple(73144, 4923), tuple(62835, 75533), tuple(90925, 56381), tuple(83853, 86786), tuple(66906, 28576), tuple(69683, 74216), tuple(2171, 22531), tuple(6591, 52559), tuple(59362, 88732), tuple(49865, 38016), tuple(82881, 9151), tuple(71356, 27365), tuple(91463, 45944), tuple(71040, 12264), tuple(62116, 27681), tuple(84941, 82284), tuple(57515, 60713), tuple(45227, 74196), tuple(77502, 17765), tuple(54055, 29484), tuple(33708, 46220), tuple(37344, 75102), tuple(80480, 37942), tuple(95782, 36781), tuple(14092, 82457), tuple(25284, 82297), tuple(85150, 50659), tuple(90037, 99122), tuple(49584, 48321), tuple(8028, 65210), tuple(8162, 32091), tuple(1609, 22211), tuple(38548, 1023), tuple(35864, 43021), tuple(54196, 30754), tuple(88535, 90185), tuple(5518, 97226), tuple(79272, 57758), tuple(61381, 86419), tuple(38344, 86877), tuple(72629, 24694), tuple(12563, 11747), tuple(81456, 44023), tuple(55536, 65195), tuple(67741, 12182), tuple(64250, 29636), tuple(45252, 9834), tuple(16576, 40098), tuple(65924, 11123), tuple(14090, 83443), tuple(95180, 92697), tuple(92452, 7957), tuple(21244, 29717), tuple(50253, 62030), tuple(21401, 70735), tuple(86803, 89625), tuple(17066, 52757), tuple(74570, 89660), tuple(11647, 74336), tuple(22463, 68191), tuple(41693, 67542), tuple(12994, 21955), tuple(3180, 27966), tuple(37236, 51099), tuple(68568, 62778), tuple(2671, 68542), tuple(42771, 4268), tuple(7578, 12919), tuple(33838, 61136), tuple(87904, 48076), tuple(3781, 57164), tuple(83289, 14414), tuple(29626, 91409), tuple(92536, 13946), tuple(88125, 34961), tuple(71541, 41249), tuple(21045, 85183), tuple(21628, 62294), tuple(17768, 22390), tuple(5892, 10231), tuple(85902, 84414), tuple(44078, 87944), tuple(64981, 31018), tuple(85690, 11077), tuple(4711, 9309), tuple(39077, 26339), tuple(85313, 99603), tuple(20267, 31090), tuple(92684, 11726), tuple(17887, 17415), tuple(23064, 83141), tuple(40925, 87246), tuple(17575, 71065), tuple(29396, 86192), tuple(10859, 2881), tuple(50457, 42309), tuple(86972, 41824), tuple(80954, 76970), tuple(11664, 94322), tuple(4286, 93562), tuple(9093, 32589), tuple(81261, 96519), tuple(67886, 3086), tuple(74132, 43197), tuple(94549, 26192), tuple(55498, 75374), tuple(93813, 32911), tuple(6727, 51629), tuple(93543, 55373), tuple(48682, 83316), tuple(32468, 77339), tuple(60028, 4896), tuple(34177, 67214), tuple(35429, 16686), tuple(72814, 39944), tuple(82791, 97364), tuple(21249, 36007), tuple(85536, 84815), tuple(32784, 34349), tuple(2391, 45661), tuple(62595, 30434), tuple(56513, 65051), tuple(22536, 99421), tuple(80603, 62636), tuple(23609, 19082), tuple(33262, 63428), tuple(45307, 96049), tuple(75079, 62835), tuple(52361, 19400), tuple(43845, 89033), tuple(54257, 33298), tuple(31133, 35836), tuple(56725, 10158), tuple(73650, 10456), tuple(77548, 28249), tuple(57998, 79546), tuple(97895, 93196), tuple(472, 18004), tuple(67178, 2684), tuple(34612, 36352), tuple(84970, 98816), tuple(32474, 5895), tuple(60388, 75957), tuple(81643, 26457), tuple(30070, 55744), tuple(14725, 58396), tuple(66451, 69932), tuple(59264, 59569), tuple(98045, 63704), tuple(11925, 87468), tuple(24701, 6280), tuple(47797, 84240), tuple(998, 13575), tuple(37865, 72036), tuple(71339, 10339), tuple(28248, 7481), tuple(33945, 97829), tuple(85194, 8904), tuple(39669, 73192), tuple(24326, 65934), tuple(14438, 72729), tuple(76676, 35176), tuple(97604, 95931), tuple(36032, 61056), tuple(65788, 20291), tuple(73067, 60718), tuple(75742, 27362), tuple(45393, 74792), tuple(49586, 13048), tuple(57961, 68534), tuple(78171, 47271), tuple(76064, 41030), tuple(88738, 10155), tuple(87757, 63134), tuple(95783, 76438), tuple(77935, 85529), tuple(79345, 69555), tuple(94483, 58668), tuple(9432, 40485), tuple(43585, 376), tuple(61737, 97784), tuple(1593, 37078), tuple(11129, 23793), tuple(94341, 64063), tuple(41896, 70446), tuple(77473, 33532), tuple(66748, 65844), tuple(17802, 27920), tuple(22891, 12901), tuple(40435, 43348), tuple(27956, 16989), tuple(29550, 63725), tuple(49453, 61216), tuple(25570, 97985), tuple(39599, 83449), tuple(96373, 12817), tuple(48357, 40473), tuple(99949, 33182), tuple(85434, 45421), tuple(28033, 46182), tuple(80932, 26691), tuple(99522, 29180), tuple(70868, 31903), tuple(63217, 51504), tuple(70267, 29484), tuple(36096, 28371), tuple(45710, 2823), tuple(85697, 3912), tuple(25410, 70358), tuple(73558, 82834), tuple(28617, 80585), tuple(81874, 57512), tuple(76797, 45045), tuple(22091, 84124), tuple(68372, 42189), tuple(66320, 83215), tuple(23013, 22530), tuple(33735, 97800), tuple(54318, 99061), tuple(18025, 39513), tuple(69059, 39780), tuple(58425, 39790), tuple(10222, 96791), tuple(17061, 3138), tuple(92416, 5773), tuple(20023, 31736), tuple(47846, 74511), tuple(52598, 26398), tuple(3738, 44490), tuple(53346, 79223), tuple(31991, 57557), tuple(34592, 98693), tuple(86926, 20881), tuple(14108, 87654), tuple(4889, 34982), tuple(77283, 73201), tuple(13668, 22633), tuple(50763, 95152), tuple(97292, 54613), tuple(22782, 30081), tuple(21536, 46551), tuple(45965, 4172), tuple(75537, 79254), tuple(41267, 86819), tuple(57723, 75200), tuple(60404, 27252), tuple(80305, 57892), tuple(50103, 24015), tuple(69409, 13132), tuple(30717, 56384), tuple(54568, 79877), tuple(8584, 8359), tuple(41416, 64392), tuple(32898, 92944), tuple(5262, 35907), tuple(88652, 77951), tuple(16619, 2797), tuple(42494, 65581), tuple(21009, 18555), tuple(29084, 28068), tuple(29464, 35568), tuple(7288, 52066), tuple(32378, 48725), tuple(95300, 62168), tuple(52295, 97110), tuple(36862, 87786), tuple(12224, 86684), tuple(85883, 34167), tuple(45369, 76651), tuple(95460, 42855), tuple(34354, 87238), tuple(7214, 96375), tuple(58720, 87947), tuple(55009, 10506), tuple(98506, 6081), tuple(46068, 81113), tuple(99065, 58657), tuple(81820, 28081), tuple(90611, 57235), tuple(7661, 72835), tuple(93195, 90418), tuple(34452, 20146),
     tuple(39857, 78712), tuple(47185, 52074), tuple(9879, 51807), tuple(92457, 92377), tuple(36082, 17723), tuple(21905, 43398), tuple(35902, 54380), tuple(21791, 6804), tuple(50774, 35200), tuple(11540, 83934), tuple(54574, 57602), tuple(99878, 35568), tuple(28171, 68210), tuple(58132, 17222), tuple(91755, 80585), tuple(18944, 65785), tuple(78535, 70725), tuple(42599, 65291), tuple(62274, 97160), tuple(76487, 23798), tuple(34741, 36988), tuple(7286, 61119), tuple(36824, 29665), tuple(82478, 60722), tuple(90995, 28025), tuple(71438, 40230), tuple(83152, 45104), tuple(1812, 91619))
     </query>
 
diff --git a/tests/performance/single_fixed_string_groupby.xml b/tests/performance/single_fixed_string_groupby.xml
index 6bf5821707f..8e166a124ff 100644
--- a/tests/performance/single_fixed_string_groupby.xml
+++ b/tests/performance/single_fixed_string_groupby.xml
@@ -10,8 +10,8 @@
         INSERT INTO perf_lc_fixed_str_groupby SELECT ('number key ' || toString(number % 400)) AS a, ('number key ' || toString(number % 20)) AS b FROM numbers(30000000)
     </fill_query>
 
-    <query short="1">SELECT count() FROM perf_lc_fixed_str_groupby GROUP BY a</query>
-    <query short="1">SELECT count() FROM perf_lc_fixed_str_groupby GROUP BY b</query>
+    <query short="1">SELECT count() FROM perf_lc_fixed_str_groupby GROUP BY a FORMAT Null</query>
+    <query short="1">SELECT count() FROM perf_lc_fixed_str_groupby GROUP BY b FORMAT Null</query>
 
     <drop_query>DROP TABLE IF EXISTS perf_lc_fixed_str_groupby</drop_query>
 </test>
diff --git a/tests/performance/string_join.xml b/tests/performance/string_join.xml
index 80ee0b37654..e4f9979bc09 100644
--- a/tests/performance/string_join.xml
+++ b/tests/performance/string_join.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
 
 
diff --git a/tests/performance/string_set.xml b/tests/performance/string_set.xml
index 4d128787d1f..bbbfe2d3c2b 100644
--- a/tests/performance/string_set.xml
+++ b/tests/performance/string_set.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
 
 
diff --git a/tests/performance/string_to_int.xml b/tests/performance/string_to_int.xml
new file mode 100644
index 00000000000..f231a4554d4
--- /dev/null
+++ b/tests/performance/string_to_int.xml
@@ -0,0 +1,12 @@
+<test>
+    <create_query>DROP TABLE IF EXISTS numeric_strings</create_query>
+    <create_query>CREATE TABLE numeric_strings(num String) ENGINE Memory</create_query>
+
+    <fill_query>
+        INSERT INTO numeric_strings SELECT number FROM numbers(30000000)
+    </fill_query>
+
+    <query short="1">SELECT count(num::Int64) FROM numeric_strings FORMAT Null</query>
+
+    <drop_query>DROP TABLE IF EXISTS numeric_strings</drop_query>
+</test>
diff --git a/tests/performance/sum_map.xml b/tests/performance/sum_map.xml
index b732c150220..bc9f9be2a18 100644
--- a/tests/performance/sum_map.xml
+++ b/tests/performance/sum_map.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <settings>
         <max_threads>1</max_threads>
     </settings>
diff --git a/tests/performance/synthetic_hardware_benchmark.xml b/tests/performance/synthetic_hardware_benchmark.xml
index ffcf30db5cb..d4d93447265 100644
--- a/tests/performance/synthetic_hardware_benchmark.xml
+++ b/tests/performance/synthetic_hardware_benchmark.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <settings>
         <max_memory_usage>30000000000</max_memory_usage>
     </settings>
diff --git a/tests/performance/uniq.xml b/tests/performance/uniq.xml
index b4e73733769..d4521961b9a 100644
--- a/tests/performance/uniq.xml
+++ b/tests/performance/uniq.xml
@@ -1,14 +1,21 @@
 <test>
-
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
         <ram_size>30000000000</ram_size>
     </preconditions>
 
-
-
     <settings>
         <max_memory_usage>30000000000</max_memory_usage>
+        <!--
+            Because of random distribution of data between threads, the number
+            of unique keys per thread might differ. This means that sometimes
+            we switch to two-level aggregation, and sometimes we don't, based on
+            the "bytes" threshold. Two-level aggregation turns out to be twice
+            as fast, because it merges aggregation states in multiple threads.
+            Lower the threshold here, to avoid jitter. It is unclear whether it
+            would be beneficial to lower the default as well.
+        -->
+        <group_by_two_level_threshold_bytes>10000000</group_by_two_level_threshold_bytes>
     </settings>
 
     <substitutions>
@@ -26,7 +33,7 @@
                <value>SearchPhrase</value>
                <value>ClientIP</value>
            </values>
-       </substitution>
+        </substitution>
         <substitution>
            <name>func</name>
            <values>
diff --git a/tests/performance/url_hits.xml b/tests/performance/url_hits.xml
index 1813b2a72cb..a699ef6ba97 100644
--- a/tests/performance/url_hits.xml
+++ b/tests/performance/url_hits.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
     <preconditions>
         <table_exists>hits_100m_single</table_exists>
         <table_exists>hits_10m_single</table_exists>
diff --git a/tests/performance/visit_param_extract_raw.xml b/tests/performance/visit_param_extract_raw.xml
index 358dcc9cc0e..fea7c96a955 100644
--- a/tests/performance/visit_param_extract_raw.xml
+++ b/tests/performance/visit_param_extract_raw.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.3">
+<test>
     <substitutions>
         <substitution>
            <name>param</name>
diff --git a/tests/performance/website.xml b/tests/performance/website.xml
index 06148850470..ab33291fc8d 100644
--- a/tests/performance/website.xml
+++ b/tests/performance/website.xml
@@ -1,4 +1,4 @@
-<test max_ignored_relative_change="0.2">
+<test>
 
     <preconditions>
         <table_exists>hits_10m_single</table_exists>
diff --git a/tests/queries/0_stateless/00027_argMinMax.reference b/tests/queries/0_stateless/00027_argMinMax.reference
index 5ba447dd04b..101e8c16044 100644
--- a/tests/queries/0_stateless/00027_argMinMax.reference
+++ b/tests/queries/0_stateless/00027_argMinMax.reference
@@ -1,5 +1,5 @@
-0	(0,1)	9	(9,10)
-0	('0',1)	9	('9',10)
-1970-01-01	('1970-01-01','1970-01-01 00:00:01')	1970-01-10	('1970-01-10','1970-01-01 00:00:10')
-0.00	(0.00,1.00)	9.00	(9.00,10.00)
+0	9
+0	9
+1970-01-01	1970-01-10
+0.00	9.00
 4	1
diff --git a/tests/queries/0_stateless/00027_argMinMax.sql b/tests/queries/0_stateless/00027_argMinMax.sql
index 2bb3b507df5..2b67b99ec77 100644
--- a/tests/queries/0_stateless/00027_argMinMax.sql
+++ b/tests/queries/0_stateless/00027_argMinMax.sql
@@ -1,8 +1,8 @@
 -- types
-select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (number, number + 1) as x from numbers(10));
-select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (toString(number), toInt32(number) + 1) as x from numbers(10));
-select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (toDate(number, 'UTC'), toDateTime(number, 'UTC') + 1) as x from numbers(10));
-select argMin(x.1, x.2), argMin(x), argMax(x.1, x.2), argMax(x) from (select (toDecimal32(number, 2), toDecimal64(number, 2) + 1) as x from numbers(10));
+select argMin(x.1, x.2), argMax(x.1, x.2) from (select (number, number + 1) as x from numbers(10));
+select argMin(x.1, x.2), argMax(x.1, x.2) from (select (toString(number), toInt32(number) + 1) as x from numbers(10));
+select argMin(x.1, x.2), argMax(x.1, x.2) from (select (toDate(number, 'UTC'), toDateTime(number, 'UTC') + 1) as x from numbers(10));
+select argMin(x.1, x.2), argMax(x.1, x.2) from (select (toDecimal32(number, 2), toDecimal64(number, 2) + 1) as x from numbers(10));
 
 -- array
 SELECT argMinArray(id, num), argMaxArray(id, num)  FROM (SELECT arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num, arrayJoin([[1, 2, 4], [2, 3, 3]]) AS id);
diff --git a/tests/queries/0_stateless/00027_simple_argMinArray.reference b/tests/queries/0_stateless/00027_simple_argMinArray.reference
new file mode 100644
index 00000000000..4482956b706
--- /dev/null
+++ b/tests/queries/0_stateless/00027_simple_argMinArray.reference
@@ -0,0 +1 @@
+4	1
diff --git a/tests/queries/0_stateless/00027_simple_argMinArray.sql b/tests/queries/0_stateless/00027_simple_argMinArray.sql
new file mode 100644
index 00000000000..b681a2c53cf
--- /dev/null
+++ b/tests/queries/0_stateless/00027_simple_argMinArray.sql
@@ -0,0 +1 @@
+SELECT argMinArray(id, num), argMaxArray(id, num)  FROM (SELECT arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num, arrayJoin([[1, 2, 4], [2, 3, 3]]) AS id)
diff --git a/tests/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.sql b/tests/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.sql
index 02f0a6648a8..fe6a0cefd31 100644
--- a/tests/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.sql
+++ b/tests/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.sql
@@ -1,6 +1,6 @@
 SET max_block_size = 1000;
 
-SELECT number FROM 
+SELECT number FROM
 (
     SELECT * FROM system.numbers LIMIT 10000
 ) 
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 b3a3ddd63c8..efb7ccf5f71 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
@@ -25,6 +25,6 @@ DROP DATABASE IF EXISTS test_DatabaseMemory;
 CREATE DATABASE test_DatabaseMemory ENGINE = Memory;
 CREATE TABLE test_DatabaseMemory.A (A UInt8) ENGINE = Null;
 
-SELECT sum(ignore(*, metadata_modification_time, engine_full, create_table_query)) FROM system.tables;
+SELECT sum(ignore(*, metadata_modification_time, engine_full, create_table_query)) FROM system.tables WHERE database = 'test_DatabaseMemory';
 
 DROP DATABASE test_DatabaseMemory;
diff --git a/tests/queries/0_stateless/00106_totals_after_having.sql b/tests/queries/0_stateless/00106_totals_after_having.sql
index 5ec2bbb9d02..b9e5b793383 100644
--- a/tests/queries/0_stateless/00106_totals_after_having.sql
+++ b/tests/queries/0_stateless/00106_totals_after_having.sql
@@ -1,6 +1,13 @@
 SET max_rows_to_group_by = 100000;
 SET group_by_overflow_mode = 'any';
 
+-- 'any' overflow mode might select different values for two-level and
+-- single-level GROUP BY, so we set a big enough threshold here to ensure that
+-- the switch doesn't happen, we only use single-level GROUP BY and get a
+-- predictable result.
+SET group_by_two_level_threshold_bytes = 100000000;
+SET group_by_two_level_threshold = 1000000;
+
 SET totals_mode = 'after_having_auto';
 SELECT dummy, count() GROUP BY dummy WITH TOTALS;
 
diff --git a/tests/queries/0_stateless/00107_totals_after_having.sql b/tests/queries/0_stateless/00107_totals_after_having.sql
index 2f63ef4123c..40a598a194d 100644
--- a/tests/queries/0_stateless/00107_totals_after_having.sql
+++ b/tests/queries/0_stateless/00107_totals_after_having.sql
@@ -4,6 +4,13 @@ SET max_rows_to_group_by = 100000;
 SET max_block_size = 100001;
 SET group_by_overflow_mode = 'any';
 
+-- 'any' overflow mode might select different values for two-level and
+-- single-level GROUP BY, so we set a big enough threshold here to ensure that
+-- the switch doesn't happen, we only use single-level GROUP BY and get a
+-- predictable result.
+SET group_by_two_level_threshold_bytes = 100000000;
+SET group_by_two_level_threshold = 1000000;
+
 SELECT '**** totals_mode = after_having_auto';
 SET totals_mode = 'after_having_auto';
 SELECT intDiv(number, 2) AS k, count(), argMax(toString(number), number) FROM (SELECT number FROM system.numbers LIMIT 500000) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
diff --git a/tests/queries/0_stateless/00118_storage_join.reference b/tests/queries/0_stateless/00118_storage_join.reference
index dad5b94e47b..56920b290e6 100644
--- a/tests/queries/0_stateless/00118_storage_join.reference
+++ b/tests/queries/0_stateless/00118_storage_join.reference
@@ -18,3 +18,49 @@
 7	
 8	
 9	
+0	0	
+1	1	abc
+2	2	def
+3	3	
+4	4	
+5	5	
+6	6	ghi
+7	7	
+8	8	
+9	9	
+0	0	0	
+1	1	1	abc
+2	2	2	def
+3	0	3	
+4	0	4	
+5	0	5	
+6	6	6	ghi
+7	0	7	
+8	0	8	
+9	0	9	
+0	3	
+3	9	
+2	21	def
+1	12	abc
+
+0	45	
+0	0	
+1	1	abc
+2	2	def
+3	3	
+4	4	
+5	5	
+6	6	ghi
+7	7	
+8	8	
+9	9	
+0	0	0	
+1	1	1	abc
+2	2	2	def
+3	0	3	
+4	0	4	
+5	0	5	
+6	6	6	ghi
+7	0	7	
+8	0	8	
+9	0	9	
diff --git a/tests/queries/0_stateless/00118_storage_join.sql b/tests/queries/0_stateless/00118_storage_join.sql
index 9da8829e5c7..47896d3316c 100644
--- a/tests/queries/0_stateless/00118_storage_join.sql
+++ b/tests/queries/0_stateless/00118_storage_join.sql
@@ -1,11 +1,19 @@
-DROP TABLE IF EXISTS join;
+DROP TABLE IF EXISTS t2;
 
-CREATE TABLE join (k UInt64, s String) ENGINE = Join(ANY, LEFT, k);
+CREATE TABLE t2 (k UInt64, s String) ENGINE = Join(ANY, LEFT, k);
 
-INSERT INTO join VALUES (1, 'abc'), (2, 'def');
-SELECT k, s FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN join USING k;
+INSERT INTO t2 VALUES (1, 'abc'), (2, 'def');
+SELECT k, s FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 USING k;
 
-INSERT INTO join VALUES (6, 'ghi');
-SELECT k, s FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN join USING k;
+INSERT INTO t2 VALUES (6, 'ghi');
+SELECT k, s FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 USING k;
 
-DROP TABLE join;
+SELECT k, js1.s, t2.s FROM (SELECT number AS k, number as s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 USING 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 USING k;
+
+SELECT k, js1.s, t2.s FROM (SELECT toUInt64(number / 3) AS k, sum(number) as s FROM numbers(10) GROUP BY toUInt64(number / 3) WITH TOTALS) js1 ANY LEFT JOIN t2 USING 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;
+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;
+
+DROP TABLE t2;
diff --git a/tests/queries/0_stateless/00119_storage_join.reference b/tests/queries/0_stateless/00119_storage_join.reference
index 2689dadfb42..9b1dfe11616 100644
--- a/tests/queries/0_stateless/00119_storage_join.reference
+++ b/tests/queries/0_stateless/00119_storage_join.reference
@@ -38,3 +38,7 @@ ghi	[]
 1	[]	2		3	7	4
 1	[]	2		3	8	4
 1	[]	2		3	9	4
+0	a	[]
+1	a	[0]
+
+0	a	[]
diff --git a/tests/queries/0_stateless/00119_storage_join.sql b/tests/queries/0_stateless/00119_storage_join.sql
index 735ef2da16a..2569a64d2c3 100644
--- a/tests/queries/0_stateless/00119_storage_join.sql
+++ b/tests/queries/0_stateless/00119_storage_join.sql
@@ -1,14 +1,18 @@
-DROP TABLE IF EXISTS join;
+DROP TABLE IF EXISTS t2;
 
-CREATE TABLE join (s String, x Array(UInt8), k UInt64) ENGINE = Join(ANY, LEFT, k);
+CREATE TABLE t2 (s String, x Array(UInt8), k UInt64) ENGINE = Join(ANY, LEFT, k);
 
-INSERT INTO join VALUES ('abc', [0], 1), ('def', [1, 2], 2);
-INSERT INTO join (k, s) VALUES (3, 'ghi');
-INSERT INTO join (x, k) VALUES ([3, 4, 5], 4);
+INSERT INTO t2 VALUES ('abc', [0], 1), ('def', [1, 2], 2);
+INSERT INTO t2 (k, s) VALUES (3, 'ghi');
+INSERT INTO t2 (x, k) VALUES ([3, 4, 5], 4);
 
-SELECT k, s FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN join USING k;
-SELECT s, x FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN join USING k;
-SELECT x, s, k FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN join USING k;
-SELECT 1, x, 2, s, 3, k, 4 FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN join USING k;
+SELECT k, s FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 USING k;
+SELECT s, x FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 USING k;
+SELECT x, s, k FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 USING k;
+SELECT 1, x, 2, s, 3, k, 4 FROM (SELECT number AS k FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 USING k;
 
-DROP TABLE join;
+SELECT t1.k, t1.s, t2.x
+FROM ( SELECT number AS k, 'a' AS s FROM numbers(2) GROUP BY number WITH TOTALS ) AS t1
+ANY LEFT JOIN t2 AS t2 USING(k);
+
+DROP TABLE t2;
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 453c7fb5af0..b667c57a14c 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
@@ -39,3 +39,5 @@ GROUP BY w/ ALIAS
 1
 ORDER BY w/ ALIAS
 0
+func(aggregate function) GROUP BY
+0
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 9912e083777..cce10312e8f 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
@@ -39,4 +39,7 @@ SELECT n FROM remote('127.0.0.{2,3}', currentDatabase(), data_00184) GROUP BY nu
 SELECT 'ORDER BY w/ ALIAS';
 SELECT n FROM remote('127.0.0.{2,3}', currentDatabase(), data_00184) ORDER BY number AS n LIMIT 1 SETTINGS distributed_group_by_no_merge=2;
 
+SELECT 'func(aggregate function) GROUP BY';
+SELECT assumeNotNull(argMax(dummy, 1)) FROM remote('127.1', system.one) SETTINGS distributed_group_by_no_merge=2;
+
 drop table data_00184;
diff --git a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.reference b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
similarity index 100%
rename from tests/queries/0_stateless/00212_shard_aggregate_function_uniq.reference
rename to tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
index 63686e2e352..33a2bb5437f 100644
--- a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.reference
+++ b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
@@ -52,110 +52,110 @@ uniqHLL12
 35	54328
 36	52997
 uniqHLL12 round(float)
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	161
-0.125	160
-0.5	164
-0.05	164
-0.143	162
-0.091	81
-0.056	163
-0.048	159
-0.083	158
-0.25	165
-1	159
-0.1	164
-0.028	160
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	161
+0.028	160
 0.031	164
-0.067	160
-0.043	159
 0.037	160
+0.043	159
+0.045	161
+0.048	159
+0.05	164
+0.056	163
+0.067	160
 0.071	161
+0.083	158
+0.091	81
+0.1	164
+0.125	160
+0.143	162
+0.25	165
+0.5	164
+1	159
+0.027	52997
+0.028	54328
+0.031	54151
+0.037	53394
+0.043	54620
 0.045	54268
-0.125	54011
-0.5	55013
-0.05	55115
-0.143	52353
-0.091	26870
-0.056	55227
 0.048	54370
+0.05	55115
+0.056	55227
+0.067	53396
+0.071	53951
 0.083	54554
+0.091	26870
+0.1	54138
+0.125	54011
+0.143	52353
 0.25	52912
+0.5	55013
 1	54571
-0.1	54138
-0.028	54328
-0.027	52997
-0.031	54151
-0.067	53396
-0.043	54620
-0.037	53394
-0.071	53951
 uniqHLL12 round(toFloat32())
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	164
-0.05	164
-0.25	165
-0.048	159
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	161
+0.028	160
+0.031	164
+0.037	160
 0.043	159
+0.045	161
+0.048	159
+0.05	164
+0.056	163
+0.067	160
 0.071	161
 0.083	158
-0.125	160
-0.031	164
-0.143	162
-0.028	160
-0.067	160
-0.045	161
-0.027	161
-0.056	163
-0.037	160
+0.091	81
 0.1	164
+0.125	160
+0.143	162
+0.25	165
+0.5	164
 1	159
-0.5	55013
-0.05	55115
-0.25	52912
-0.048	54370
-0.091	26870
+0.027	52997
+0.028	54328
+0.031	54151
+0.037	53394
 0.043	54620
+0.045	54268
+0.048	54370
+0.05	55115
+0.056	55227
+0.067	53396
 0.071	53951
 0.083	54554
-0.125	54011
-0.031	54151
-0.143	52353
-0.028	54328
-0.067	53396
-0.045	54268
-0.027	52997
-0.056	55227
-0.037	53394
+0.091	26870
 0.1	54138
+0.125	54011
+0.143	52353
+0.25	52912
+0.5	55013
 1	54571
 uniqHLL12 IPv4NumToString
 1	1
@@ -425,428 +425,428 @@ uniqCombined(20)
 35	54054
 36	54054
 uniqCombined(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
-0.045	54117
-0.125	54213
-0.5	54056
-0.05	53923
-0.143	54129
-0.091	26975
-0.056	54129
-0.048	53958
-0.083	54064
-0.25	53999
-1	53901
-0.1	53853
-0.028	53931
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
 0.027	53982
+0.028	53931
 0.031	53948
-0.067	53997
-0.043	54150
 0.037	54047
+0.043	54150
+0.045	54117
+0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
 0.071	53963
+0.083	54064
+0.091	26975
+0.1	53853
+0.125	54213
+0.143	54129
+0.25	53999
+0.5	54056
+1	53901
 uniqCombined(12)(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
-0.045	53928
-0.125	52275
-0.5	53721
-0.05	54123
-0.143	54532
-0.091	26931
-0.056	55120
-0.048	53293
-0.083	54428
-0.25	53226
-1	54708
-0.1	53417
-0.028	54635
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
 0.027	53155
+0.028	54635
 0.031	53763
-0.067	53188
-0.043	53827
 0.037	53920
+0.043	53827
+0.045	53928
+0.048	53293
+0.05	54123
+0.056	55120
+0.067	53188
 0.071	53409
+0.083	54428
+0.091	26931
+0.1	53417
+0.125	52275
+0.143	54532
+0.25	53226
+0.5	53721
+1	54708
 uniqCombined(17)(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
+0.027	53982
+0.028	53931
+0.031	53948
+0.037	54047
+0.043	54150
 0.045	54117
-0.125	54213
-0.5	54056
-0.05	53923
-0.143	54129
-0.091	26975
-0.056	54129
 0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
+0.071	53963
 0.083	54064
+0.091	26975
+0.1	53853
+0.125	54213
+0.143	54129
 0.25	53999
+0.5	54056
 1	53901
-0.1	53853
-0.028	53931
-0.027	53982
-0.031	53948
-0.067	53997
-0.043	54150
-0.037	54047
-0.071	53963
 uniqCombined(20)(round(float))
-0.125	1
-0.5	1
-0.05	1
-0.143	1
-0.056	1
-0.048	2
-0.083	1
-0.25	1
-0.1	1
-0.028	1
 0.027	1
+0.028	1
 0.031	1
-0.067	1
 0.037	1
-0.045	162
-0.125	163
-0.5	162
-0.05	162
-0.143	162
-0.091	81
-0.056	162
-0.048	162
-0.083	163
-0.25	162
-1	162
-0.1	163
-0.028	162
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
+0.1	1
+0.125	1
+0.143	1
+0.25	1
+0.5	1
 0.027	162
+0.028	162
 0.031	162
-0.067	162
-0.043	162
 0.037	162
+0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
-0.045	54054
-0.125	54053
-0.5	54054
-0.05	54053
-0.143	54054
-0.091	27027
-0.056	54054
-0.048	54053
-0.083	54055
-0.25	54054
-1	54054
-0.1	54053
-0.028	54054
+0.083	163
+0.091	81
+0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
+1	162
 0.027	54054
+0.028	54054
 0.031	54054
-0.067	54054
-0.043	54053
 0.037	54053
+0.043	54053
+0.045	54054
+0.048	54053
+0.05	54053
+0.056	54054
+0.067	54054
 0.071	54054
+0.083	54055
+0.091	27027
+0.1	54053
+0.125	54053
+0.143	54054
+0.25	54054
+0.5	54054
+1	54054
 uniqCombined(X)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	54056
-0.05	53923
-0.25	53999
-0.048	53958
-0.091	26975
+0.027	53982
+0.028	53931
+0.031	53948
+0.037	54047
 0.043	54150
+0.045	54117
+0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
 0.071	53963
 0.083	54064
-0.125	54213
-0.031	53948
-0.143	54129
-0.028	53931
-0.067	53997
-0.045	54117
-0.027	53982
-0.056	54129
-0.037	54047
+0.091	26975
 0.1	53853
+0.125	54213
+0.143	54129
+0.25	53999
+0.5	54056
 1	53901
 uniqCombined(12)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	53721
-0.05	54123
-0.25	53226
-0.048	53293
-0.091	26931
+0.027	53155
+0.028	54635
+0.031	53763
+0.037	53920
 0.043	53827
+0.045	53928
+0.048	53293
+0.05	54123
+0.056	55120
+0.067	53188
 0.071	53409
 0.083	54428
-0.125	52275
-0.031	53763
-0.143	54532
-0.028	54635
-0.067	53188
-0.045	53928
-0.027	53155
-0.056	55120
-0.037	53920
+0.091	26931
 0.1	53417
+0.125	52275
+0.143	54532
+0.25	53226
+0.5	53721
 1	54708
 uniqCombined(17)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	54056
-0.05	53923
-0.25	53999
-0.048	53958
-0.091	26975
+0.027	53982
+0.028	53931
+0.031	53948
+0.037	54047
 0.043	54150
+0.045	54117
+0.048	53958
+0.05	53923
+0.056	54129
+0.067	53997
 0.071	53963
 0.083	54064
-0.125	54213
-0.031	53948
-0.143	54129
-0.028	53931
-0.067	53997
-0.045	54117
-0.027	53982
-0.056	54129
-0.037	54047
+0.091	26975
 0.1	53853
+0.125	54213
+0.143	54129
+0.25	53999
+0.5	54056
 1	53901
 uniqCombined(20)(round(toFloat32()))
-0.5	1
-0.05	1
-0.25	1
-0.048	2
-0.083	1
-0.125	1
-0.031	1
-0.143	1
-0.028	1
-0.067	1
 0.027	1
-0.056	1
+0.028	1
+0.031	1
 0.037	1
+0.048	2
+0.05	1
+0.056	1
+0.067	1
+0.083	1
 0.1	1
-0.5	162
-0.05	162
-0.25	162
-0.048	162
-0.091	81
+0.125	1
+0.143	1
+0.25	1
+0.5	1
+0.027	162
+0.028	162
+0.031	162
+0.037	162
 0.043	162
+0.045	162
+0.048	162
+0.05	162
+0.056	162
+0.067	162
 0.071	162
 0.083	163
-0.125	163
-0.031	162
-0.143	162
-0.028	162
-0.067	162
-0.045	162
-0.027	162
-0.056	162
-0.037	162
+0.091	81
 0.1	163
+0.125	163
+0.143	162
+0.25	162
+0.5	162
 1	162
-0.5	54054
-0.05	54053
-0.25	54054
-0.048	54053
-0.091	27027
+0.027	54054
+0.028	54054
+0.031	54054
+0.037	54053
 0.043	54053
+0.045	54054
+0.048	54053
+0.05	54053
+0.056	54054
+0.067	54054
 0.071	54054
 0.083	54055
-0.125	54053
-0.031	54054
-0.143	54054
-0.028	54054
-0.067	54054
-0.045	54054
-0.027	54054
-0.056	54054
-0.037	54053
+0.091	27027
 0.1	54053
+0.125	54053
+0.143	54054
+0.25	54054
+0.5	54054
 1	54054
 uniqCombined(Z)(IPv4NumToString)
 1	1
diff --git a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.sql b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
similarity index 75%
rename from tests/queries/0_stateless/00212_shard_aggregate_function_uniq.sql
rename to tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
index afef71ae06d..f1b3c82fec3 100644
--- a/tests/queries/0_stateless/00212_shard_aggregate_function_uniq.sql
+++ b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
@@ -2,27 +2,27 @@
 
 SELECT 'uniqHLL12';
 
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 round(float)';
 
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 round(toFloat32())';
 
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 IPv4NumToString';
 
-SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqHLL12(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqHLL12 remote()';
 
@@ -32,99 +32,99 @@ SELECT uniqHLL12(dummy) FROM remote('127.0.0.{2,3}', system.one);
 
 SELECT 'uniqCombined';
 
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)';
 
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)';
 
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)';
 
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(round(float))';
 
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)(round(float))';
 
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)(round(float))';
 
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)(round(float))';
 
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(X)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)(round(toFloat32()))';
 
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(Z)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(12)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(12)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(17)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(17)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined(20)(IPv4NumToString)';
 
-SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
-SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
-SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y ORDER BY Y;
+SELECT Y, uniqCombined(20)(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y ORDER BY Y;
 
 SELECT 'uniqCombined remote()';
 
diff --git a/tests/queries/0_stateless/00232_format_readable_size.reference b/tests/queries/0_stateless/00232_format_readable_size.reference
index 0f723e968d9..b9b9b467b50 100644
--- a/tests/queries/0_stateless/00232_format_readable_size.reference
+++ b/tests/queries/0_stateless/00232_format_readable_size.reference
@@ -20,51 +20,51 @@
 170.21 MiB	170.21 MiB	170.21 MiB
 462.69 MiB	462.69 MiB	462.69 MiB
 1.23 GiB	1.23 GiB	1.23 GiB
-3.34 GiB	3.34 GiB	-2.00 GiB
-9.08 GiB	9.08 GiB	-2.00 GiB
-24.67 GiB	24.67 GiB	-2.00 GiB
-67.06 GiB	67.06 GiB	-2.00 GiB
-182.29 GiB	182.29 GiB	-2.00 GiB
-495.51 GiB	495.51 GiB	-2.00 GiB
-1.32 TiB	1.32 TiB	-2.00 GiB
-3.58 TiB	3.58 TiB	-2.00 GiB
-9.72 TiB	9.72 TiB	-2.00 GiB
-26.42 TiB	26.42 TiB	-2.00 GiB
-71.82 TiB	71.82 TiB	-2.00 GiB
-195.22 TiB	195.22 TiB	-2.00 GiB
-530.66 TiB	530.66 TiB	-2.00 GiB
-1.41 PiB	1.41 PiB	-2.00 GiB
-3.83 PiB	3.83 PiB	-2.00 GiB
-10.41 PiB	10.41 PiB	-2.00 GiB
-28.29 PiB	28.29 PiB	-2.00 GiB
-76.91 PiB	76.91 PiB	-2.00 GiB
-209.06 PiB	209.06 PiB	-2.00 GiB
-568.30 PiB	568.30 PiB	-2.00 GiB
-1.51 EiB	1.51 EiB	-2.00 GiB
-4.10 EiB	4.10 EiB	-2.00 GiB
-11.15 EiB	11.15 EiB	-2.00 GiB
-30.30 EiB	0.00 B	-2.00 GiB
-82.37 EiB	0.00 B	-2.00 GiB
-223.89 EiB	0.00 B	-2.00 GiB
-608.60 EiB	0.00 B	-2.00 GiB
-1.62 ZiB	0.00 B	-2.00 GiB
-4.39 ZiB	0.00 B	-2.00 GiB
-11.94 ZiB	0.00 B	-2.00 GiB
-32.45 ZiB	0.00 B	-2.00 GiB
-88.21 ZiB	0.00 B	-2.00 GiB
-239.77 ZiB	0.00 B	-2.00 GiB
-651.77 ZiB	0.00 B	-2.00 GiB
-1.73 YiB	0.00 B	-2.00 GiB
-4.70 YiB	0.00 B	-2.00 GiB
-12.78 YiB	0.00 B	-2.00 GiB
-34.75 YiB	0.00 B	-2.00 GiB
-94.46 YiB	0.00 B	-2.00 GiB
-256.78 YiB	0.00 B	-2.00 GiB
-698.00 YiB	0.00 B	-2.00 GiB
-1897.37 YiB	0.00 B	-2.00 GiB
-5157.59 YiB	0.00 B	-2.00 GiB
-14019.80 YiB	0.00 B	-2.00 GiB
-38109.75 YiB	0.00 B	-2.00 GiB
-103593.05 YiB	0.00 B	-2.00 GiB
-281595.11 YiB	0.00 B	-2.00 GiB
-765454.88 YiB	0.00 B	-2.00 GiB
+3.34 GiB	3.34 GiB	2.00 GiB
+9.08 GiB	9.08 GiB	2.00 GiB
+24.67 GiB	24.67 GiB	2.00 GiB
+67.06 GiB	67.06 GiB	2.00 GiB
+182.29 GiB	182.29 GiB	2.00 GiB
+495.51 GiB	495.51 GiB	2.00 GiB
+1.32 TiB	1.32 TiB	2.00 GiB
+3.58 TiB	3.58 TiB	2.00 GiB
+9.72 TiB	9.72 TiB	2.00 GiB
+26.42 TiB	26.42 TiB	2.00 GiB
+71.82 TiB	71.82 TiB	2.00 GiB
+195.22 TiB	195.22 TiB	2.00 GiB
+530.66 TiB	530.66 TiB	2.00 GiB
+1.41 PiB	1.41 PiB	2.00 GiB
+3.83 PiB	3.83 PiB	2.00 GiB
+10.41 PiB	10.41 PiB	2.00 GiB
+28.29 PiB	28.29 PiB	2.00 GiB
+76.91 PiB	76.91 PiB	2.00 GiB
+209.06 PiB	209.06 PiB	2.00 GiB
+568.30 PiB	568.30 PiB	2.00 GiB
+1.51 EiB	1.51 EiB	2.00 GiB
+4.10 EiB	4.10 EiB	2.00 GiB
+11.15 EiB	11.15 EiB	2.00 GiB
+30.30 EiB	16.00 EiB	2.00 GiB
+82.37 EiB	16.00 EiB	2.00 GiB
+223.89 EiB	16.00 EiB	2.00 GiB
+608.60 EiB	16.00 EiB	2.00 GiB
+1.62 ZiB	16.00 EiB	2.00 GiB
+4.39 ZiB	16.00 EiB	2.00 GiB
+11.94 ZiB	16.00 EiB	2.00 GiB
+32.45 ZiB	16.00 EiB	2.00 GiB
+88.21 ZiB	16.00 EiB	2.00 GiB
+239.77 ZiB	16.00 EiB	2.00 GiB
+651.77 ZiB	16.00 EiB	2.00 GiB
+1.73 YiB	16.00 EiB	2.00 GiB
+4.70 YiB	16.00 EiB	2.00 GiB
+12.78 YiB	16.00 EiB	2.00 GiB
+34.75 YiB	16.00 EiB	2.00 GiB
+94.46 YiB	16.00 EiB	2.00 GiB
+256.78 YiB	16.00 EiB	2.00 GiB
+698.00 YiB	16.00 EiB	2.00 GiB
+1897.37 YiB	16.00 EiB	2.00 GiB
+5157.59 YiB	16.00 EiB	2.00 GiB
+14019.80 YiB	16.00 EiB	2.00 GiB
+38109.75 YiB	16.00 EiB	2.00 GiB
+103593.05 YiB	16.00 EiB	2.00 GiB
+281595.11 YiB	16.00 EiB	2.00 GiB
+765454.88 YiB	16.00 EiB	2.00 GiB
diff --git a/tests/queries/0_stateless/00232_format_readable_size.sql b/tests/queries/0_stateless/00232_format_readable_size.sql
index 952ee82b81a..e96f7ebeb20 100644
--- a/tests/queries/0_stateless/00232_format_readable_size.sql
+++ b/tests/queries/0_stateless/00232_format_readable_size.sql
@@ -1,4 +1,4 @@
-WITH round(exp(number), 6) AS x, toUInt64(x) AS y, toInt32(x) AS z
+WITH round(exp(number), 6) AS x, x > 0xFFFFFFFFFFFFFFFF ? 0xFFFFFFFFFFFFFFFF : toUInt64(x) AS y, x > 0x7FFFFFFF ? 0x7FFFFFFF : toInt32(x) AS z
 SELECT formatReadableSize(x), formatReadableSize(y), formatReadableSize(z)
 FROM system.numbers
 LIMIT 70;
diff --git a/tests/queries/0_stateless/00273_quantiles.reference b/tests/queries/0_stateless/00273_quantiles.reference
index 616e06841e4..aefb0084648 100644
--- a/tests/queries/0_stateless/00273_quantiles.reference
+++ b/tests/queries/0_stateless/00273_quantiles.reference
@@ -4,7 +4,7 @@
 [500]
 [0,1,10,50,100,200,300,400,500,600,700,800,900,950,990,999,1000]
 [0,1,10,50,100,200,300,400,500,600,700,800,900,950,990,999,1000]
-[0,0.50100005,9.51,49.55,99.6,199.7,299.8,399.9,500,600.1,700.2,800.3,900.4,950.45,990.49,999.499,1000]
+[0,1,10,50,99.6,199.7,299.8,399.9,500,600.1,700.2,800.3,900.4,950,990,999,1000]
 [0,1,10,50,100,200,300,400,500,600,700,800,900,950,990,999,1000]
 1	333334	[699144.2,835663,967429.2]	[699999,833333,966666]
 2	266667	[426549.5,536255.5,638957.6]	[426665,533332,639999]
diff --git a/tests/queries/0_stateless/00304_http_external_data.reference b/tests/queries/0_stateless/00304_http_external_data.reference
index 93428f8768e..85909107584 100644
--- a/tests/queries/0_stateless/00304_http_external_data.reference
+++ b/tests/queries/0_stateless/00304_http_external_data.reference
@@ -2,3 +2,5 @@
 2	World
 1	Hello
 2	World
+1
+2
diff --git a/tests/queries/0_stateless/00304_http_external_data.sh b/tests/queries/0_stateless/00304_http_external_data.sh
index 41a9dea1ebb..4a097249cca 100755
--- a/tests/queries/0_stateless/00304_http_external_data.sh
+++ b/tests/queries/0_stateless/00304_http_external_data.sh
@@ -6,3 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 echo -ne '1,Hello\n2,World\n' | ${CLICKHOUSE_CURL} -sSF 'file=@-' "${CLICKHOUSE_URL}&query=SELECT+*+FROM+file&file_format=CSV&file_types=UInt8,String";
 echo -ne '1@Hello\n2@World\n' | ${CLICKHOUSE_CURL} -sSF 'file=@-' "${CLICKHOUSE_URL}&query=SELECT+*+FROM+file&file_format=CSV&file_types=UInt8,String&format_csv_delimiter=@";
+echo -ne '\x01\x00\x00\x00\x02\x00\x00\x00' | ${CLICKHOUSE_CURL} -sSF "tmp=@-" "${CLICKHOUSE_URL}&query=SELECT+*+FROM+tmp&tmp_structure=TaskID+UInt32&tmp_format=RowBinary";
diff --git a/tests/queries/0_stateless/00316_rounding_functions_and_empty_block.sql b/tests/queries/0_stateless/00316_rounding_functions_and_empty_block.sql
index 9f91cd713ae..08c30324da4 100644
--- a/tests/queries/0_stateless/00316_rounding_functions_and_empty_block.sql
+++ b/tests/queries/0_stateless/00316_rounding_functions_and_empty_block.sql
@@ -2,7 +2,7 @@ SET any_join_distinct_right_table_keys = 1;
 
 SELECT
     floor((ReferrerTimestamp - InstallTimestamp) / 86400) AS DaysSinceInstallations
-FROM 
+FROM
 (
     SELECT 6534090703218709881 AS DeviceIDHash, 1458586663 AS InstallTimestamp
     UNION ALL SELECT 2697418689476658272, 1458561552
diff --git a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app.reference b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app.reference
rename to tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.reference
diff --git a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app.sh b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
similarity index 96%
rename from tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app.sh
rename to tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
index ef0ec1ae842..a09e9a4adb2 100755
--- a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app.sh
+++ b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
@@ -57,7 +57,8 @@ ${CLICKHOUSE_LOCAL} -q "CREATE TABLE sophisticated_default
     a UInt8 DEFAULT 3,
     b UInt8 ALIAS a + 5,
     c UInt8
-) ENGINE = Memory; SELECT count() FROM system.tables WHERE name='sophisticated_default';"
+) ENGINE = Memory;
+SELECT count() FROM system.tables WHERE name='sophisticated_default' AND database = currentDatabase();"
 
 # Help is not skipped
 [[ $(${CLICKHOUSE_LOCAL} --help | wc -l) -gt 100 ]]
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
index 53cdf1e9393..bc8e5e14552 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
@@ -1 +1,124 @@
-PASSED
+0	0.000000000	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1
+0	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	1.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	2251799813685248.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	4503599627370496.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740991.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740994.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	104.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	0.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	1.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	2251799813685247.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	2251799813685248.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	1152921504606846976.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+0	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+0	9223372036854786048.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	0.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-1.000000000	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1
+-1	1.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	2251799813685248.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	4503599627370496.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740991.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740994.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	104.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-0.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	0.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	1.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	2251799813685247.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	2251799813685248.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	1152921504606846976.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+-1	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+-1	9223372036854786048.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	0.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	1.000000000	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1	1	0	0	1	0	1
+1	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	9223372036854775808.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	2251799813685248.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	4503599627370496.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740991.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740994.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	104.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	1.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	9007199254740992.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	2251799813685247.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	2251799813685248.500000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	1152921504606846976.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+1	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+1	9223372036854786048.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+18446744073709551615	0.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
+18446744073709551615	9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9223372036854775808.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	2251799813685248.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740991.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9007199254740994.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	104.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-4503599627370496.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	0.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	1.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9007199254740992.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	2251799813685247.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	2251799813685248.500000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-1152921504606846976.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	-9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+18446744073709551615	9223372036854786048.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	0.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	-1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	1.000000000	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0
+9223372036854775808	18446744073709551616.000000000	0	1	1	1	0	0	0	1	0	0	1	1	0	1	1	1	0	0	0	1	0	0	1	1
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
new file mode 100644
index 00000000000..16245c42a7a
--- /dev/null
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
@@ -0,0 +1,127 @@
+-- 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.
+
+SELECT '0', '0.000000000', 0 = 0.000000000, 0 != 0.000000000, 0 < 0.000000000, 0 <= 0.000000000, 0 > 0.000000000, 0 >= 0.000000000,	0.000000000 = 0, 0.000000000 != 0, 0.000000000 < 0, 0.000000000 <= 0, 0.000000000 > 0, 0.000000000 >= 0 , toUInt8(0) = 0.000000000, toUInt8(0) != 0.000000000, toUInt8(0) < 0.000000000, toUInt8(0) <= 0.000000000, toUInt8(0) > 0.000000000, toUInt8(0) >= 0.000000000,	0.000000000 = toUInt8(0), 0.000000000 != toUInt8(0), 0.000000000 < toUInt8(0), 0.000000000 <= toUInt8(0), 0.000000000 > toUInt8(0), 0.000000000 >= toUInt8(0) , toInt8(0) = 0.000000000, toInt8(0) != 0.000000000, toInt8(0) < 0.000000000, toInt8(0) <= 0.000000000, toInt8(0) > 0.000000000, toInt8(0) >= 0.000000000,	0.000000000 = toInt8(0), 0.000000000 != toInt8(0), 0.000000000 < toInt8(0), 0.000000000 <= toInt8(0), 0.000000000 > toInt8(0), 0.000000000 >= toInt8(0) , toUInt16(0) = 0.000000000, toUInt16(0) != 0.000000000, toUInt16(0) < 0.000000000, toUInt16(0) <= 0.000000000, toUInt16(0) > 0.000000000, toUInt16(0) >= 0.000000000,	0.000000000 = toUInt16(0), 0.000000000 != toUInt16(0), 0.000000000 < toUInt16(0), 0.000000000 <= toUInt16(0), 0.000000000 > toUInt16(0), 0.000000000 >= toUInt16(0) , toInt16(0) = 0.000000000, toInt16(0) != 0.000000000, toInt16(0) < 0.000000000, toInt16(0) <= 0.000000000, toInt16(0) > 0.000000000, toInt16(0) >= 0.000000000,	0.000000000 = toInt16(0), 0.000000000 != toInt16(0), 0.000000000 < toInt16(0), 0.000000000 <= toInt16(0), 0.000000000 > toInt16(0), 0.000000000 >= toInt16(0) , toUInt32(0) = 0.000000000, toUInt32(0) != 0.000000000, toUInt32(0) < 0.000000000, toUInt32(0) <= 0.000000000, toUInt32(0) > 0.000000000, toUInt32(0) >= 0.000000000,	0.000000000 = toUInt32(0), 0.000000000 != toUInt32(0), 0.000000000 < toUInt32(0), 0.000000000 <= toUInt32(0), 0.000000000 > toUInt32(0), 0.000000000 >= toUInt32(0) , toInt32(0) = 0.000000000, toInt32(0) != 0.000000000, toInt32(0) < 0.000000000, toInt32(0) <= 0.000000000, toInt32(0) > 0.000000000, toInt32(0) >= 0.000000000,	0.000000000 = toInt32(0), 0.000000000 != toInt32(0), 0.000000000 < toInt32(0), 0.000000000 <= toInt32(0), 0.000000000 > toInt32(0), 0.000000000 >= toInt32(0) , toUInt64(0) = 0.000000000, toUInt64(0) != 0.000000000, toUInt64(0) < 0.000000000, toUInt64(0) <= 0.000000000, toUInt64(0) > 0.000000000, toUInt64(0) >= 0.000000000,	0.000000000 = toUInt64(0), 0.000000000 != toUInt64(0), 0.000000000 < toUInt64(0), 0.000000000 <= toUInt64(0), 0.000000000 > toUInt64(0), 0.000000000 >= toUInt64(0) , toInt64(0) = 0.000000000, toInt64(0) != 0.000000000, toInt64(0) < 0.000000000, toInt64(0) <= 0.000000000, toInt64(0) > 0.000000000, toInt64(0) >= 0.000000000,	0.000000000 = toInt64(0), 0.000000000 != toInt64(0), 0.000000000 < toInt64(0), 0.000000000 <= toInt64(0), 0.000000000 > toInt64(0), 0.000000000 >= toInt64(0) ;
+SELECT '0', '-1.000000000', 0 = -1.000000000, 0 != -1.000000000, 0 < -1.000000000, 0 <= -1.000000000, 0 > -1.000000000, 0 >= -1.000000000,	-1.000000000 = 0, -1.000000000 != 0, -1.000000000 < 0, -1.000000000 <= 0, -1.000000000 > 0, -1.000000000 >= 0 , toUInt8(0) = -1.000000000, toUInt8(0) != -1.000000000, toUInt8(0) < -1.000000000, toUInt8(0) <= -1.000000000, toUInt8(0) > -1.000000000, toUInt8(0) >= -1.000000000,	-1.000000000 = toUInt8(0), -1.000000000 != toUInt8(0), -1.000000000 < toUInt8(0), -1.000000000 <= toUInt8(0), -1.000000000 > toUInt8(0), -1.000000000 >= toUInt8(0) , toInt8(0) = -1.000000000, toInt8(0) != -1.000000000, toInt8(0) < -1.000000000, toInt8(0) <= -1.000000000, toInt8(0) > -1.000000000, toInt8(0) >= -1.000000000,	-1.000000000 = toInt8(0), -1.000000000 != toInt8(0), -1.000000000 < toInt8(0), -1.000000000 <= toInt8(0), -1.000000000 > toInt8(0), -1.000000000 >= toInt8(0) , toUInt16(0) = -1.000000000, toUInt16(0) != -1.000000000, toUInt16(0) < -1.000000000, toUInt16(0) <= -1.000000000, toUInt16(0) > -1.000000000, toUInt16(0) >= -1.000000000,	-1.000000000 = toUInt16(0), -1.000000000 != toUInt16(0), -1.000000000 < toUInt16(0), -1.000000000 <= toUInt16(0), -1.000000000 > toUInt16(0), -1.000000000 >= toUInt16(0) , toInt16(0) = -1.000000000, toInt16(0) != -1.000000000, toInt16(0) < -1.000000000, toInt16(0) <= -1.000000000, toInt16(0) > -1.000000000, toInt16(0) >= -1.000000000,	-1.000000000 = toInt16(0), -1.000000000 != toInt16(0), -1.000000000 < toInt16(0), -1.000000000 <= toInt16(0), -1.000000000 > toInt16(0), -1.000000000 >= toInt16(0) , toUInt32(0) = -1.000000000, toUInt32(0) != -1.000000000, toUInt32(0) < -1.000000000, toUInt32(0) <= -1.000000000, toUInt32(0) > -1.000000000, toUInt32(0) >= -1.000000000,	-1.000000000 = toUInt32(0), -1.000000000 != toUInt32(0), -1.000000000 < toUInt32(0), -1.000000000 <= toUInt32(0), -1.000000000 > toUInt32(0), -1.000000000 >= toUInt32(0) , toInt32(0) = -1.000000000, toInt32(0) != -1.000000000, toInt32(0) < -1.000000000, toInt32(0) <= -1.000000000, toInt32(0) > -1.000000000, toInt32(0) >= -1.000000000,	-1.000000000 = toInt32(0), -1.000000000 != toInt32(0), -1.000000000 < toInt32(0), -1.000000000 <= toInt32(0), -1.000000000 > toInt32(0), -1.000000000 >= toInt32(0) , toUInt64(0) = -1.000000000, toUInt64(0) != -1.000000000, toUInt64(0) < -1.000000000, toUInt64(0) <= -1.000000000, toUInt64(0) > -1.000000000, toUInt64(0) >= -1.000000000,	-1.000000000 = toUInt64(0), -1.000000000 != toUInt64(0), -1.000000000 < toUInt64(0), -1.000000000 <= toUInt64(0), -1.000000000 > toUInt64(0), -1.000000000 >= toUInt64(0) , toInt64(0) = -1.000000000, toInt64(0) != -1.000000000, toInt64(0) < -1.000000000, toInt64(0) <= -1.000000000, toInt64(0) > -1.000000000, toInt64(0) >= -1.000000000,	-1.000000000 = toInt64(0), -1.000000000 != toInt64(0), -1.000000000 < toInt64(0), -1.000000000 <= toInt64(0), -1.000000000 > toInt64(0), -1.000000000 >= toInt64(0) ;
+SELECT '0', '1.000000000', 0 = 1.000000000, 0 != 1.000000000, 0 < 1.000000000, 0 <= 1.000000000, 0 > 1.000000000, 0 >= 1.000000000,	1.000000000 = 0, 1.000000000 != 0, 1.000000000 < 0, 1.000000000 <= 0, 1.000000000 > 0, 1.000000000 >= 0 , toUInt8(0) = 1.000000000, toUInt8(0) != 1.000000000, toUInt8(0) < 1.000000000, toUInt8(0) <= 1.000000000, toUInt8(0) > 1.000000000, toUInt8(0) >= 1.000000000,	1.000000000 = toUInt8(0), 1.000000000 != toUInt8(0), 1.000000000 < toUInt8(0), 1.000000000 <= toUInt8(0), 1.000000000 > toUInt8(0), 1.000000000 >= toUInt8(0) , toInt8(0) = 1.000000000, toInt8(0) != 1.000000000, toInt8(0) < 1.000000000, toInt8(0) <= 1.000000000, toInt8(0) > 1.000000000, toInt8(0) >= 1.000000000,	1.000000000 = toInt8(0), 1.000000000 != toInt8(0), 1.000000000 < toInt8(0), 1.000000000 <= toInt8(0), 1.000000000 > toInt8(0), 1.000000000 >= toInt8(0) , toUInt16(0) = 1.000000000, toUInt16(0) != 1.000000000, toUInt16(0) < 1.000000000, toUInt16(0) <= 1.000000000, toUInt16(0) > 1.000000000, toUInt16(0) >= 1.000000000,	1.000000000 = toUInt16(0), 1.000000000 != toUInt16(0), 1.000000000 < toUInt16(0), 1.000000000 <= toUInt16(0), 1.000000000 > toUInt16(0), 1.000000000 >= toUInt16(0) , toInt16(0) = 1.000000000, toInt16(0) != 1.000000000, toInt16(0) < 1.000000000, toInt16(0) <= 1.000000000, toInt16(0) > 1.000000000, toInt16(0) >= 1.000000000,	1.000000000 = toInt16(0), 1.000000000 != toInt16(0), 1.000000000 < toInt16(0), 1.000000000 <= toInt16(0), 1.000000000 > toInt16(0), 1.000000000 >= toInt16(0) , toUInt32(0) = 1.000000000, toUInt32(0) != 1.000000000, toUInt32(0) < 1.000000000, toUInt32(0) <= 1.000000000, toUInt32(0) > 1.000000000, toUInt32(0) >= 1.000000000,	1.000000000 = toUInt32(0), 1.000000000 != toUInt32(0), 1.000000000 < toUInt32(0), 1.000000000 <= toUInt32(0), 1.000000000 > toUInt32(0), 1.000000000 >= toUInt32(0) , toInt32(0) = 1.000000000, toInt32(0) != 1.000000000, toInt32(0) < 1.000000000, toInt32(0) <= 1.000000000, toInt32(0) > 1.000000000, toInt32(0) >= 1.000000000,	1.000000000 = toInt32(0), 1.000000000 != toInt32(0), 1.000000000 < toInt32(0), 1.000000000 <= toInt32(0), 1.000000000 > toInt32(0), 1.000000000 >= toInt32(0) , toUInt64(0) = 1.000000000, toUInt64(0) != 1.000000000, toUInt64(0) < 1.000000000, toUInt64(0) <= 1.000000000, toUInt64(0) > 1.000000000, toUInt64(0) >= 1.000000000,	1.000000000 = toUInt64(0), 1.000000000 != toUInt64(0), 1.000000000 < toUInt64(0), 1.000000000 <= toUInt64(0), 1.000000000 > toUInt64(0), 1.000000000 >= toUInt64(0) , toInt64(0) = 1.000000000, toInt64(0) != 1.000000000, toInt64(0) < 1.000000000, toInt64(0) <= 1.000000000, toInt64(0) > 1.000000000, toInt64(0) >= 1.000000000,	1.000000000 = toInt64(0), 1.000000000 != toInt64(0), 1.000000000 < toInt64(0), 1.000000000 <= toInt64(0), 1.000000000 > toInt64(0), 1.000000000 >= toInt64(0) ;
+SELECT '0', '18446744073709551616.000000000', 0 = 18446744073709551616.000000000, 0 != 18446744073709551616.000000000, 0 < 18446744073709551616.000000000, 0 <= 18446744073709551616.000000000, 0 > 18446744073709551616.000000000, 0 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 0, 18446744073709551616.000000000 != 0, 18446744073709551616.000000000 < 0, 18446744073709551616.000000000 <= 0, 18446744073709551616.000000000 > 0, 18446744073709551616.000000000 >= 0 , toUInt8(0) = 18446744073709551616.000000000, toUInt8(0) != 18446744073709551616.000000000, toUInt8(0) < 18446744073709551616.000000000, toUInt8(0) <= 18446744073709551616.000000000, toUInt8(0) > 18446744073709551616.000000000, toUInt8(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt8(0), 18446744073709551616.000000000 != toUInt8(0), 18446744073709551616.000000000 < toUInt8(0), 18446744073709551616.000000000 <= toUInt8(0), 18446744073709551616.000000000 > toUInt8(0), 18446744073709551616.000000000 >= toUInt8(0) , toInt8(0) = 18446744073709551616.000000000, toInt8(0) != 18446744073709551616.000000000, toInt8(0) < 18446744073709551616.000000000, toInt8(0) <= 18446744073709551616.000000000, toInt8(0) > 18446744073709551616.000000000, toInt8(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt8(0), 18446744073709551616.000000000 != toInt8(0), 18446744073709551616.000000000 < toInt8(0), 18446744073709551616.000000000 <= toInt8(0), 18446744073709551616.000000000 > toInt8(0), 18446744073709551616.000000000 >= toInt8(0) , toUInt16(0) = 18446744073709551616.000000000, toUInt16(0) != 18446744073709551616.000000000, toUInt16(0) < 18446744073709551616.000000000, toUInt16(0) <= 18446744073709551616.000000000, toUInt16(0) > 18446744073709551616.000000000, toUInt16(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt16(0), 18446744073709551616.000000000 != toUInt16(0), 18446744073709551616.000000000 < toUInt16(0), 18446744073709551616.000000000 <= toUInt16(0), 18446744073709551616.000000000 > toUInt16(0), 18446744073709551616.000000000 >= toUInt16(0) , toInt16(0) = 18446744073709551616.000000000, toInt16(0) != 18446744073709551616.000000000, toInt16(0) < 18446744073709551616.000000000, toInt16(0) <= 18446744073709551616.000000000, toInt16(0) > 18446744073709551616.000000000, toInt16(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt16(0), 18446744073709551616.000000000 != toInt16(0), 18446744073709551616.000000000 < toInt16(0), 18446744073709551616.000000000 <= toInt16(0), 18446744073709551616.000000000 > toInt16(0), 18446744073709551616.000000000 >= toInt16(0) , toUInt32(0) = 18446744073709551616.000000000, toUInt32(0) != 18446744073709551616.000000000, toUInt32(0) < 18446744073709551616.000000000, toUInt32(0) <= 18446744073709551616.000000000, toUInt32(0) > 18446744073709551616.000000000, toUInt32(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt32(0), 18446744073709551616.000000000 != toUInt32(0), 18446744073709551616.000000000 < toUInt32(0), 18446744073709551616.000000000 <= toUInt32(0), 18446744073709551616.000000000 > toUInt32(0), 18446744073709551616.000000000 >= toUInt32(0) , toInt32(0) = 18446744073709551616.000000000, toInt32(0) != 18446744073709551616.000000000, toInt32(0) < 18446744073709551616.000000000, toInt32(0) <= 18446744073709551616.000000000, toInt32(0) > 18446744073709551616.000000000, toInt32(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt32(0), 18446744073709551616.000000000 != toInt32(0), 18446744073709551616.000000000 < toInt32(0), 18446744073709551616.000000000 <= toInt32(0), 18446744073709551616.000000000 > toInt32(0), 18446744073709551616.000000000 >= toInt32(0) , toUInt64(0) = 18446744073709551616.000000000, toUInt64(0) != 18446744073709551616.000000000, toUInt64(0) < 18446744073709551616.000000000, toUInt64(0) <= 18446744073709551616.000000000, toUInt64(0) > 18446744073709551616.000000000, toUInt64(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(0), 18446744073709551616.000000000 != toUInt64(0), 18446744073709551616.000000000 < toUInt64(0), 18446744073709551616.000000000 <= toUInt64(0), 18446744073709551616.000000000 > toUInt64(0), 18446744073709551616.000000000 >= toUInt64(0) , toInt64(0) = 18446744073709551616.000000000, toInt64(0) != 18446744073709551616.000000000, toInt64(0) < 18446744073709551616.000000000, toInt64(0) <= 18446744073709551616.000000000, toInt64(0) > 18446744073709551616.000000000, toInt64(0) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt64(0), 18446744073709551616.000000000 != toInt64(0), 18446744073709551616.000000000 < toInt64(0), 18446744073709551616.000000000 <= toInt64(0), 18446744073709551616.000000000 > toInt64(0), 18446744073709551616.000000000 >= toInt64(0) ;
+SELECT '0', '9223372036854775808.000000000', 0 = 9223372036854775808.000000000, 0 != 9223372036854775808.000000000, 0 < 9223372036854775808.000000000, 0 <= 9223372036854775808.000000000, 0 > 9223372036854775808.000000000, 0 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 0, 9223372036854775808.000000000 != 0, 9223372036854775808.000000000 < 0, 9223372036854775808.000000000 <= 0, 9223372036854775808.000000000 > 0, 9223372036854775808.000000000 >= 0 , toUInt8(0) = 9223372036854775808.000000000, toUInt8(0) != 9223372036854775808.000000000, toUInt8(0) < 9223372036854775808.000000000, toUInt8(0) <= 9223372036854775808.000000000, toUInt8(0) > 9223372036854775808.000000000, toUInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(0), 9223372036854775808.000000000 != toUInt8(0), 9223372036854775808.000000000 < toUInt8(0), 9223372036854775808.000000000 <= toUInt8(0), 9223372036854775808.000000000 > toUInt8(0), 9223372036854775808.000000000 >= toUInt8(0) , toInt8(0) = 9223372036854775808.000000000, toInt8(0) != 9223372036854775808.000000000, toInt8(0) < 9223372036854775808.000000000, toInt8(0) <= 9223372036854775808.000000000, toInt8(0) > 9223372036854775808.000000000, toInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(0), 9223372036854775808.000000000 != toInt8(0), 9223372036854775808.000000000 < toInt8(0), 9223372036854775808.000000000 <= toInt8(0), 9223372036854775808.000000000 > toInt8(0), 9223372036854775808.000000000 >= toInt8(0) , toUInt16(0) = 9223372036854775808.000000000, toUInt16(0) != 9223372036854775808.000000000, toUInt16(0) < 9223372036854775808.000000000, toUInt16(0) <= 9223372036854775808.000000000, toUInt16(0) > 9223372036854775808.000000000, toUInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(0), 9223372036854775808.000000000 != toUInt16(0), 9223372036854775808.000000000 < toUInt16(0), 9223372036854775808.000000000 <= toUInt16(0), 9223372036854775808.000000000 > toUInt16(0), 9223372036854775808.000000000 >= toUInt16(0) , toInt16(0) = 9223372036854775808.000000000, toInt16(0) != 9223372036854775808.000000000, toInt16(0) < 9223372036854775808.000000000, toInt16(0) <= 9223372036854775808.000000000, toInt16(0) > 9223372036854775808.000000000, toInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(0), 9223372036854775808.000000000 != toInt16(0), 9223372036854775808.000000000 < toInt16(0), 9223372036854775808.000000000 <= toInt16(0), 9223372036854775808.000000000 > toInt16(0), 9223372036854775808.000000000 >= toInt16(0) , toUInt32(0) = 9223372036854775808.000000000, toUInt32(0) != 9223372036854775808.000000000, toUInt32(0) < 9223372036854775808.000000000, toUInt32(0) <= 9223372036854775808.000000000, toUInt32(0) > 9223372036854775808.000000000, toUInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(0), 9223372036854775808.000000000 != toUInt32(0), 9223372036854775808.000000000 < toUInt32(0), 9223372036854775808.000000000 <= toUInt32(0), 9223372036854775808.000000000 > toUInt32(0), 9223372036854775808.000000000 >= toUInt32(0) , toInt32(0) = 9223372036854775808.000000000, toInt32(0) != 9223372036854775808.000000000, toInt32(0) < 9223372036854775808.000000000, toInt32(0) <= 9223372036854775808.000000000, toInt32(0) > 9223372036854775808.000000000, toInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(0), 9223372036854775808.000000000 != toInt32(0), 9223372036854775808.000000000 < toInt32(0), 9223372036854775808.000000000 <= toInt32(0), 9223372036854775808.000000000 > toInt32(0), 9223372036854775808.000000000 >= toInt32(0) , toUInt64(0) = 9223372036854775808.000000000, toUInt64(0) != 9223372036854775808.000000000, toUInt64(0) < 9223372036854775808.000000000, toUInt64(0) <= 9223372036854775808.000000000, toUInt64(0) > 9223372036854775808.000000000, toUInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(0), 9223372036854775808.000000000 != toUInt64(0), 9223372036854775808.000000000 < toUInt64(0), 9223372036854775808.000000000 <= toUInt64(0), 9223372036854775808.000000000 > toUInt64(0), 9223372036854775808.000000000 >= toUInt64(0) , toInt64(0) = 9223372036854775808.000000000, toInt64(0) != 9223372036854775808.000000000, toInt64(0) < 9223372036854775808.000000000, toInt64(0) <= 9223372036854775808.000000000, toInt64(0) > 9223372036854775808.000000000, toInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(0), 9223372036854775808.000000000 != toInt64(0), 9223372036854775808.000000000 < toInt64(0), 9223372036854775808.000000000 <= toInt64(0), 9223372036854775808.000000000 > toInt64(0), 9223372036854775808.000000000 >= toInt64(0) ;
+SELECT '0', '-9223372036854775808.000000000', 0 = -9223372036854775808.000000000, 0 != -9223372036854775808.000000000, 0 < -9223372036854775808.000000000, 0 <= -9223372036854775808.000000000, 0 > -9223372036854775808.000000000, 0 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = 0, -9223372036854775808.000000000 != 0, -9223372036854775808.000000000 < 0, -9223372036854775808.000000000 <= 0, -9223372036854775808.000000000 > 0, -9223372036854775808.000000000 >= 0 , toUInt8(0) = -9223372036854775808.000000000, toUInt8(0) != -9223372036854775808.000000000, toUInt8(0) < -9223372036854775808.000000000, toUInt8(0) <= -9223372036854775808.000000000, toUInt8(0) > -9223372036854775808.000000000, toUInt8(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt8(0), -9223372036854775808.000000000 != toUInt8(0), -9223372036854775808.000000000 < toUInt8(0), -9223372036854775808.000000000 <= toUInt8(0), -9223372036854775808.000000000 > toUInt8(0), -9223372036854775808.000000000 >= toUInt8(0) , toInt8(0) = -9223372036854775808.000000000, toInt8(0) != -9223372036854775808.000000000, toInt8(0) < -9223372036854775808.000000000, toInt8(0) <= -9223372036854775808.000000000, toInt8(0) > -9223372036854775808.000000000, toInt8(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt8(0), -9223372036854775808.000000000 != toInt8(0), -9223372036854775808.000000000 < toInt8(0), -9223372036854775808.000000000 <= toInt8(0), -9223372036854775808.000000000 > toInt8(0), -9223372036854775808.000000000 >= toInt8(0) , toUInt16(0) = -9223372036854775808.000000000, toUInt16(0) != -9223372036854775808.000000000, toUInt16(0) < -9223372036854775808.000000000, toUInt16(0) <= -9223372036854775808.000000000, toUInt16(0) > -9223372036854775808.000000000, toUInt16(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt16(0), -9223372036854775808.000000000 != toUInt16(0), -9223372036854775808.000000000 < toUInt16(0), -9223372036854775808.000000000 <= toUInt16(0), -9223372036854775808.000000000 > toUInt16(0), -9223372036854775808.000000000 >= toUInt16(0) , toInt16(0) = -9223372036854775808.000000000, toInt16(0) != -9223372036854775808.000000000, toInt16(0) < -9223372036854775808.000000000, toInt16(0) <= -9223372036854775808.000000000, toInt16(0) > -9223372036854775808.000000000, toInt16(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt16(0), -9223372036854775808.000000000 != toInt16(0), -9223372036854775808.000000000 < toInt16(0), -9223372036854775808.000000000 <= toInt16(0), -9223372036854775808.000000000 > toInt16(0), -9223372036854775808.000000000 >= toInt16(0) , toUInt32(0) = -9223372036854775808.000000000, toUInt32(0) != -9223372036854775808.000000000, toUInt32(0) < -9223372036854775808.000000000, toUInt32(0) <= -9223372036854775808.000000000, toUInt32(0) > -9223372036854775808.000000000, toUInt32(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt32(0), -9223372036854775808.000000000 != toUInt32(0), -9223372036854775808.000000000 < toUInt32(0), -9223372036854775808.000000000 <= toUInt32(0), -9223372036854775808.000000000 > toUInt32(0), -9223372036854775808.000000000 >= toUInt32(0) , toInt32(0) = -9223372036854775808.000000000, toInt32(0) != -9223372036854775808.000000000, toInt32(0) < -9223372036854775808.000000000, toInt32(0) <= -9223372036854775808.000000000, toInt32(0) > -9223372036854775808.000000000, toInt32(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt32(0), -9223372036854775808.000000000 != toInt32(0), -9223372036854775808.000000000 < toInt32(0), -9223372036854775808.000000000 <= toInt32(0), -9223372036854775808.000000000 > toInt32(0), -9223372036854775808.000000000 >= toInt32(0) , toUInt64(0) = -9223372036854775808.000000000, toUInt64(0) != -9223372036854775808.000000000, toUInt64(0) < -9223372036854775808.000000000, toUInt64(0) <= -9223372036854775808.000000000, toUInt64(0) > -9223372036854775808.000000000, toUInt64(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt64(0), -9223372036854775808.000000000 != toUInt64(0), -9223372036854775808.000000000 < toUInt64(0), -9223372036854775808.000000000 <= toUInt64(0), -9223372036854775808.000000000 > toUInt64(0), -9223372036854775808.000000000 >= toUInt64(0) , toInt64(0) = -9223372036854775808.000000000, toInt64(0) != -9223372036854775808.000000000, toInt64(0) < -9223372036854775808.000000000, toInt64(0) <= -9223372036854775808.000000000, toInt64(0) > -9223372036854775808.000000000, toInt64(0) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt64(0), -9223372036854775808.000000000 != toInt64(0), -9223372036854775808.000000000 < toInt64(0), -9223372036854775808.000000000 <= toInt64(0), -9223372036854775808.000000000 > toInt64(0), -9223372036854775808.000000000 >= toInt64(0) ;
+SELECT '0', '9223372036854775808.000000000', 0 = 9223372036854775808.000000000, 0 != 9223372036854775808.000000000, 0 < 9223372036854775808.000000000, 0 <= 9223372036854775808.000000000, 0 > 9223372036854775808.000000000, 0 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 0, 9223372036854775808.000000000 != 0, 9223372036854775808.000000000 < 0, 9223372036854775808.000000000 <= 0, 9223372036854775808.000000000 > 0, 9223372036854775808.000000000 >= 0 , toUInt8(0) = 9223372036854775808.000000000, toUInt8(0) != 9223372036854775808.000000000, toUInt8(0) < 9223372036854775808.000000000, toUInt8(0) <= 9223372036854775808.000000000, toUInt8(0) > 9223372036854775808.000000000, toUInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(0), 9223372036854775808.000000000 != toUInt8(0), 9223372036854775808.000000000 < toUInt8(0), 9223372036854775808.000000000 <= toUInt8(0), 9223372036854775808.000000000 > toUInt8(0), 9223372036854775808.000000000 >= toUInt8(0) , toInt8(0) = 9223372036854775808.000000000, toInt8(0) != 9223372036854775808.000000000, toInt8(0) < 9223372036854775808.000000000, toInt8(0) <= 9223372036854775808.000000000, toInt8(0) > 9223372036854775808.000000000, toInt8(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(0), 9223372036854775808.000000000 != toInt8(0), 9223372036854775808.000000000 < toInt8(0), 9223372036854775808.000000000 <= toInt8(0), 9223372036854775808.000000000 > toInt8(0), 9223372036854775808.000000000 >= toInt8(0) , toUInt16(0) = 9223372036854775808.000000000, toUInt16(0) != 9223372036854775808.000000000, toUInt16(0) < 9223372036854775808.000000000, toUInt16(0) <= 9223372036854775808.000000000, toUInt16(0) > 9223372036854775808.000000000, toUInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(0), 9223372036854775808.000000000 != toUInt16(0), 9223372036854775808.000000000 < toUInt16(0), 9223372036854775808.000000000 <= toUInt16(0), 9223372036854775808.000000000 > toUInt16(0), 9223372036854775808.000000000 >= toUInt16(0) , toInt16(0) = 9223372036854775808.000000000, toInt16(0) != 9223372036854775808.000000000, toInt16(0) < 9223372036854775808.000000000, toInt16(0) <= 9223372036854775808.000000000, toInt16(0) > 9223372036854775808.000000000, toInt16(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(0), 9223372036854775808.000000000 != toInt16(0), 9223372036854775808.000000000 < toInt16(0), 9223372036854775808.000000000 <= toInt16(0), 9223372036854775808.000000000 > toInt16(0), 9223372036854775808.000000000 >= toInt16(0) , toUInt32(0) = 9223372036854775808.000000000, toUInt32(0) != 9223372036854775808.000000000, toUInt32(0) < 9223372036854775808.000000000, toUInt32(0) <= 9223372036854775808.000000000, toUInt32(0) > 9223372036854775808.000000000, toUInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(0), 9223372036854775808.000000000 != toUInt32(0), 9223372036854775808.000000000 < toUInt32(0), 9223372036854775808.000000000 <= toUInt32(0), 9223372036854775808.000000000 > toUInt32(0), 9223372036854775808.000000000 >= toUInt32(0) , toInt32(0) = 9223372036854775808.000000000, toInt32(0) != 9223372036854775808.000000000, toInt32(0) < 9223372036854775808.000000000, toInt32(0) <= 9223372036854775808.000000000, toInt32(0) > 9223372036854775808.000000000, toInt32(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(0), 9223372036854775808.000000000 != toInt32(0), 9223372036854775808.000000000 < toInt32(0), 9223372036854775808.000000000 <= toInt32(0), 9223372036854775808.000000000 > toInt32(0), 9223372036854775808.000000000 >= toInt32(0) , toUInt64(0) = 9223372036854775808.000000000, toUInt64(0) != 9223372036854775808.000000000, toUInt64(0) < 9223372036854775808.000000000, toUInt64(0) <= 9223372036854775808.000000000, toUInt64(0) > 9223372036854775808.000000000, toUInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(0), 9223372036854775808.000000000 != toUInt64(0), 9223372036854775808.000000000 < toUInt64(0), 9223372036854775808.000000000 <= toUInt64(0), 9223372036854775808.000000000 > toUInt64(0), 9223372036854775808.000000000 >= toUInt64(0) , toInt64(0) = 9223372036854775808.000000000, toInt64(0) != 9223372036854775808.000000000, toInt64(0) < 9223372036854775808.000000000, toInt64(0) <= 9223372036854775808.000000000, toInt64(0) > 9223372036854775808.000000000, toInt64(0) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(0), 9223372036854775808.000000000 != toInt64(0), 9223372036854775808.000000000 < toInt64(0), 9223372036854775808.000000000 <= toInt64(0), 9223372036854775808.000000000 > toInt64(0), 9223372036854775808.000000000 >= toInt64(0) ;
+SELECT '0', '2251799813685248.000000000', 0 = 2251799813685248.000000000, 0 != 2251799813685248.000000000, 0 < 2251799813685248.000000000, 0 <= 2251799813685248.000000000, 0 > 2251799813685248.000000000, 0 >= 2251799813685248.000000000,	2251799813685248.000000000 = 0, 2251799813685248.000000000 != 0, 2251799813685248.000000000 < 0, 2251799813685248.000000000 <= 0, 2251799813685248.000000000 > 0, 2251799813685248.000000000 >= 0 , toUInt8(0) = 2251799813685248.000000000, toUInt8(0) != 2251799813685248.000000000, toUInt8(0) < 2251799813685248.000000000, toUInt8(0) <= 2251799813685248.000000000, toUInt8(0) > 2251799813685248.000000000, toUInt8(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt8(0), 2251799813685248.000000000 != toUInt8(0), 2251799813685248.000000000 < toUInt8(0), 2251799813685248.000000000 <= toUInt8(0), 2251799813685248.000000000 > toUInt8(0), 2251799813685248.000000000 >= toUInt8(0) , toInt8(0) = 2251799813685248.000000000, toInt8(0) != 2251799813685248.000000000, toInt8(0) < 2251799813685248.000000000, toInt8(0) <= 2251799813685248.000000000, toInt8(0) > 2251799813685248.000000000, toInt8(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt8(0), 2251799813685248.000000000 != toInt8(0), 2251799813685248.000000000 < toInt8(0), 2251799813685248.000000000 <= toInt8(0), 2251799813685248.000000000 > toInt8(0), 2251799813685248.000000000 >= toInt8(0) , toUInt16(0) = 2251799813685248.000000000, toUInt16(0) != 2251799813685248.000000000, toUInt16(0) < 2251799813685248.000000000, toUInt16(0) <= 2251799813685248.000000000, toUInt16(0) > 2251799813685248.000000000, toUInt16(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt16(0), 2251799813685248.000000000 != toUInt16(0), 2251799813685248.000000000 < toUInt16(0), 2251799813685248.000000000 <= toUInt16(0), 2251799813685248.000000000 > toUInt16(0), 2251799813685248.000000000 >= toUInt16(0) , toInt16(0) = 2251799813685248.000000000, toInt16(0) != 2251799813685248.000000000, toInt16(0) < 2251799813685248.000000000, toInt16(0) <= 2251799813685248.000000000, toInt16(0) > 2251799813685248.000000000, toInt16(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt16(0), 2251799813685248.000000000 != toInt16(0), 2251799813685248.000000000 < toInt16(0), 2251799813685248.000000000 <= toInt16(0), 2251799813685248.000000000 > toInt16(0), 2251799813685248.000000000 >= toInt16(0) , toUInt32(0) = 2251799813685248.000000000, toUInt32(0) != 2251799813685248.000000000, toUInt32(0) < 2251799813685248.000000000, toUInt32(0) <= 2251799813685248.000000000, toUInt32(0) > 2251799813685248.000000000, toUInt32(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt32(0), 2251799813685248.000000000 != toUInt32(0), 2251799813685248.000000000 < toUInt32(0), 2251799813685248.000000000 <= toUInt32(0), 2251799813685248.000000000 > toUInt32(0), 2251799813685248.000000000 >= toUInt32(0) , toInt32(0) = 2251799813685248.000000000, toInt32(0) != 2251799813685248.000000000, toInt32(0) < 2251799813685248.000000000, toInt32(0) <= 2251799813685248.000000000, toInt32(0) > 2251799813685248.000000000, toInt32(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt32(0), 2251799813685248.000000000 != toInt32(0), 2251799813685248.000000000 < toInt32(0), 2251799813685248.000000000 <= toInt32(0), 2251799813685248.000000000 > toInt32(0), 2251799813685248.000000000 >= toInt32(0) , toUInt64(0) = 2251799813685248.000000000, toUInt64(0) != 2251799813685248.000000000, toUInt64(0) < 2251799813685248.000000000, toUInt64(0) <= 2251799813685248.000000000, toUInt64(0) > 2251799813685248.000000000, toUInt64(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt64(0), 2251799813685248.000000000 != toUInt64(0), 2251799813685248.000000000 < toUInt64(0), 2251799813685248.000000000 <= toUInt64(0), 2251799813685248.000000000 > toUInt64(0), 2251799813685248.000000000 >= toUInt64(0) , toInt64(0) = 2251799813685248.000000000, toInt64(0) != 2251799813685248.000000000, toInt64(0) < 2251799813685248.000000000, toInt64(0) <= 2251799813685248.000000000, toInt64(0) > 2251799813685248.000000000, toInt64(0) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt64(0), 2251799813685248.000000000 != toInt64(0), 2251799813685248.000000000 < toInt64(0), 2251799813685248.000000000 <= toInt64(0), 2251799813685248.000000000 > toInt64(0), 2251799813685248.000000000 >= toInt64(0) ;
+SELECT '0', '4503599627370496.000000000', 0 = 4503599627370496.000000000, 0 != 4503599627370496.000000000, 0 < 4503599627370496.000000000, 0 <= 4503599627370496.000000000, 0 > 4503599627370496.000000000, 0 >= 4503599627370496.000000000,	4503599627370496.000000000 = 0, 4503599627370496.000000000 != 0, 4503599627370496.000000000 < 0, 4503599627370496.000000000 <= 0, 4503599627370496.000000000 > 0, 4503599627370496.000000000 >= 0 , toUInt8(0) = 4503599627370496.000000000, toUInt8(0) != 4503599627370496.000000000, toUInt8(0) < 4503599627370496.000000000, toUInt8(0) <= 4503599627370496.000000000, toUInt8(0) > 4503599627370496.000000000, toUInt8(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt8(0), 4503599627370496.000000000 != toUInt8(0), 4503599627370496.000000000 < toUInt8(0), 4503599627370496.000000000 <= toUInt8(0), 4503599627370496.000000000 > toUInt8(0), 4503599627370496.000000000 >= toUInt8(0) , toInt8(0) = 4503599627370496.000000000, toInt8(0) != 4503599627370496.000000000, toInt8(0) < 4503599627370496.000000000, toInt8(0) <= 4503599627370496.000000000, toInt8(0) > 4503599627370496.000000000, toInt8(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt8(0), 4503599627370496.000000000 != toInt8(0), 4503599627370496.000000000 < toInt8(0), 4503599627370496.000000000 <= toInt8(0), 4503599627370496.000000000 > toInt8(0), 4503599627370496.000000000 >= toInt8(0) , toUInt16(0) = 4503599627370496.000000000, toUInt16(0) != 4503599627370496.000000000, toUInt16(0) < 4503599627370496.000000000, toUInt16(0) <= 4503599627370496.000000000, toUInt16(0) > 4503599627370496.000000000, toUInt16(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt16(0), 4503599627370496.000000000 != toUInt16(0), 4503599627370496.000000000 < toUInt16(0), 4503599627370496.000000000 <= toUInt16(0), 4503599627370496.000000000 > toUInt16(0), 4503599627370496.000000000 >= toUInt16(0) , toInt16(0) = 4503599627370496.000000000, toInt16(0) != 4503599627370496.000000000, toInt16(0) < 4503599627370496.000000000, toInt16(0) <= 4503599627370496.000000000, toInt16(0) > 4503599627370496.000000000, toInt16(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt16(0), 4503599627370496.000000000 != toInt16(0), 4503599627370496.000000000 < toInt16(0), 4503599627370496.000000000 <= toInt16(0), 4503599627370496.000000000 > toInt16(0), 4503599627370496.000000000 >= toInt16(0) , toUInt32(0) = 4503599627370496.000000000, toUInt32(0) != 4503599627370496.000000000, toUInt32(0) < 4503599627370496.000000000, toUInt32(0) <= 4503599627370496.000000000, toUInt32(0) > 4503599627370496.000000000, toUInt32(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt32(0), 4503599627370496.000000000 != toUInt32(0), 4503599627370496.000000000 < toUInt32(0), 4503599627370496.000000000 <= toUInt32(0), 4503599627370496.000000000 > toUInt32(0), 4503599627370496.000000000 >= toUInt32(0) , toInt32(0) = 4503599627370496.000000000, toInt32(0) != 4503599627370496.000000000, toInt32(0) < 4503599627370496.000000000, toInt32(0) <= 4503599627370496.000000000, toInt32(0) > 4503599627370496.000000000, toInt32(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt32(0), 4503599627370496.000000000 != toInt32(0), 4503599627370496.000000000 < toInt32(0), 4503599627370496.000000000 <= toInt32(0), 4503599627370496.000000000 > toInt32(0), 4503599627370496.000000000 >= toInt32(0) , toUInt64(0) = 4503599627370496.000000000, toUInt64(0) != 4503599627370496.000000000, toUInt64(0) < 4503599627370496.000000000, toUInt64(0) <= 4503599627370496.000000000, toUInt64(0) > 4503599627370496.000000000, toUInt64(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt64(0), 4503599627370496.000000000 != toUInt64(0), 4503599627370496.000000000 < toUInt64(0), 4503599627370496.000000000 <= toUInt64(0), 4503599627370496.000000000 > toUInt64(0), 4503599627370496.000000000 >= toUInt64(0) , toInt64(0) = 4503599627370496.000000000, toInt64(0) != 4503599627370496.000000000, toInt64(0) < 4503599627370496.000000000, toInt64(0) <= 4503599627370496.000000000, toInt64(0) > 4503599627370496.000000000, toInt64(0) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt64(0), 4503599627370496.000000000 != toInt64(0), 4503599627370496.000000000 < toInt64(0), 4503599627370496.000000000 <= toInt64(0), 4503599627370496.000000000 > toInt64(0), 4503599627370496.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740991.000000000', 0 = 9007199254740991.000000000, 0 != 9007199254740991.000000000, 0 < 9007199254740991.000000000, 0 <= 9007199254740991.000000000, 0 > 9007199254740991.000000000, 0 >= 9007199254740991.000000000,	9007199254740991.000000000 = 0, 9007199254740991.000000000 != 0, 9007199254740991.000000000 < 0, 9007199254740991.000000000 <= 0, 9007199254740991.000000000 > 0, 9007199254740991.000000000 >= 0 , toUInt8(0) = 9007199254740991.000000000, toUInt8(0) != 9007199254740991.000000000, toUInt8(0) < 9007199254740991.000000000, toUInt8(0) <= 9007199254740991.000000000, toUInt8(0) > 9007199254740991.000000000, toUInt8(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt8(0), 9007199254740991.000000000 != toUInt8(0), 9007199254740991.000000000 < toUInt8(0), 9007199254740991.000000000 <= toUInt8(0), 9007199254740991.000000000 > toUInt8(0), 9007199254740991.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740991.000000000, toInt8(0) != 9007199254740991.000000000, toInt8(0) < 9007199254740991.000000000, toInt8(0) <= 9007199254740991.000000000, toInt8(0) > 9007199254740991.000000000, toInt8(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt8(0), 9007199254740991.000000000 != toInt8(0), 9007199254740991.000000000 < toInt8(0), 9007199254740991.000000000 <= toInt8(0), 9007199254740991.000000000 > toInt8(0), 9007199254740991.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740991.000000000, toUInt16(0) != 9007199254740991.000000000, toUInt16(0) < 9007199254740991.000000000, toUInt16(0) <= 9007199254740991.000000000, toUInt16(0) > 9007199254740991.000000000, toUInt16(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt16(0), 9007199254740991.000000000 != toUInt16(0), 9007199254740991.000000000 < toUInt16(0), 9007199254740991.000000000 <= toUInt16(0), 9007199254740991.000000000 > toUInt16(0), 9007199254740991.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740991.000000000, toInt16(0) != 9007199254740991.000000000, toInt16(0) < 9007199254740991.000000000, toInt16(0) <= 9007199254740991.000000000, toInt16(0) > 9007199254740991.000000000, toInt16(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt16(0), 9007199254740991.000000000 != toInt16(0), 9007199254740991.000000000 < toInt16(0), 9007199254740991.000000000 <= toInt16(0), 9007199254740991.000000000 > toInt16(0), 9007199254740991.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740991.000000000, toUInt32(0) != 9007199254740991.000000000, toUInt32(0) < 9007199254740991.000000000, toUInt32(0) <= 9007199254740991.000000000, toUInt32(0) > 9007199254740991.000000000, toUInt32(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt32(0), 9007199254740991.000000000 != toUInt32(0), 9007199254740991.000000000 < toUInt32(0), 9007199254740991.000000000 <= toUInt32(0), 9007199254740991.000000000 > toUInt32(0), 9007199254740991.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740991.000000000, toInt32(0) != 9007199254740991.000000000, toInt32(0) < 9007199254740991.000000000, toInt32(0) <= 9007199254740991.000000000, toInt32(0) > 9007199254740991.000000000, toInt32(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt32(0), 9007199254740991.000000000 != toInt32(0), 9007199254740991.000000000 < toInt32(0), 9007199254740991.000000000 <= toInt32(0), 9007199254740991.000000000 > toInt32(0), 9007199254740991.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740991.000000000, toUInt64(0) != 9007199254740991.000000000, toUInt64(0) < 9007199254740991.000000000, toUInt64(0) <= 9007199254740991.000000000, toUInt64(0) > 9007199254740991.000000000, toUInt64(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt64(0), 9007199254740991.000000000 != toUInt64(0), 9007199254740991.000000000 < toUInt64(0), 9007199254740991.000000000 <= toUInt64(0), 9007199254740991.000000000 > toUInt64(0), 9007199254740991.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740991.000000000, toInt64(0) != 9007199254740991.000000000, toInt64(0) < 9007199254740991.000000000, toInt64(0) <= 9007199254740991.000000000, toInt64(0) > 9007199254740991.000000000, toInt64(0) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt64(0), 9007199254740991.000000000 != toInt64(0), 9007199254740991.000000000 < toInt64(0), 9007199254740991.000000000 <= toInt64(0), 9007199254740991.000000000 > toInt64(0), 9007199254740991.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740992.000000000', 0 = 9007199254740992.000000000, 0 != 9007199254740992.000000000, 0 < 9007199254740992.000000000, 0 <= 9007199254740992.000000000, 0 > 9007199254740992.000000000, 0 >= 9007199254740992.000000000,	9007199254740992.000000000 = 0, 9007199254740992.000000000 != 0, 9007199254740992.000000000 < 0, 9007199254740992.000000000 <= 0, 9007199254740992.000000000 > 0, 9007199254740992.000000000 >= 0 , toUInt8(0) = 9007199254740992.000000000, toUInt8(0) != 9007199254740992.000000000, toUInt8(0) < 9007199254740992.000000000, toUInt8(0) <= 9007199254740992.000000000, toUInt8(0) > 9007199254740992.000000000, toUInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(0), 9007199254740992.000000000 != toUInt8(0), 9007199254740992.000000000 < toUInt8(0), 9007199254740992.000000000 <= toUInt8(0), 9007199254740992.000000000 > toUInt8(0), 9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740992.000000000, toInt8(0) != 9007199254740992.000000000, toInt8(0) < 9007199254740992.000000000, toInt8(0) <= 9007199254740992.000000000, toInt8(0) > 9007199254740992.000000000, toInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(0), 9007199254740992.000000000 != toInt8(0), 9007199254740992.000000000 < toInt8(0), 9007199254740992.000000000 <= toInt8(0), 9007199254740992.000000000 > toInt8(0), 9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740992.000000000, toUInt16(0) != 9007199254740992.000000000, toUInt16(0) < 9007199254740992.000000000, toUInt16(0) <= 9007199254740992.000000000, toUInt16(0) > 9007199254740992.000000000, toUInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(0), 9007199254740992.000000000 != toUInt16(0), 9007199254740992.000000000 < toUInt16(0), 9007199254740992.000000000 <= toUInt16(0), 9007199254740992.000000000 > toUInt16(0), 9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740992.000000000, toInt16(0) != 9007199254740992.000000000, toInt16(0) < 9007199254740992.000000000, toInt16(0) <= 9007199254740992.000000000, toInt16(0) > 9007199254740992.000000000, toInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(0), 9007199254740992.000000000 != toInt16(0), 9007199254740992.000000000 < toInt16(0), 9007199254740992.000000000 <= toInt16(0), 9007199254740992.000000000 > toInt16(0), 9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740992.000000000, toUInt32(0) != 9007199254740992.000000000, toUInt32(0) < 9007199254740992.000000000, toUInt32(0) <= 9007199254740992.000000000, toUInt32(0) > 9007199254740992.000000000, toUInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(0), 9007199254740992.000000000 != toUInt32(0), 9007199254740992.000000000 < toUInt32(0), 9007199254740992.000000000 <= toUInt32(0), 9007199254740992.000000000 > toUInt32(0), 9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740992.000000000, toInt32(0) != 9007199254740992.000000000, toInt32(0) < 9007199254740992.000000000, toInt32(0) <= 9007199254740992.000000000, toInt32(0) > 9007199254740992.000000000, toInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(0), 9007199254740992.000000000 != toInt32(0), 9007199254740992.000000000 < toInt32(0), 9007199254740992.000000000 <= toInt32(0), 9007199254740992.000000000 > toInt32(0), 9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740992.000000000, toUInt64(0) != 9007199254740992.000000000, toUInt64(0) < 9007199254740992.000000000, toUInt64(0) <= 9007199254740992.000000000, toUInt64(0) > 9007199254740992.000000000, toUInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(0), 9007199254740992.000000000 != toUInt64(0), 9007199254740992.000000000 < toUInt64(0), 9007199254740992.000000000 <= toUInt64(0), 9007199254740992.000000000 > toUInt64(0), 9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740992.000000000, toInt64(0) != 9007199254740992.000000000, toInt64(0) < 9007199254740992.000000000, toInt64(0) <= 9007199254740992.000000000, toInt64(0) > 9007199254740992.000000000, toInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(0), 9007199254740992.000000000 != toInt64(0), 9007199254740992.000000000 < toInt64(0), 9007199254740992.000000000 <= toInt64(0), 9007199254740992.000000000 > toInt64(0), 9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740992.000000000', 0 = 9007199254740992.000000000, 0 != 9007199254740992.000000000, 0 < 9007199254740992.000000000, 0 <= 9007199254740992.000000000, 0 > 9007199254740992.000000000, 0 >= 9007199254740992.000000000,	9007199254740992.000000000 = 0, 9007199254740992.000000000 != 0, 9007199254740992.000000000 < 0, 9007199254740992.000000000 <= 0, 9007199254740992.000000000 > 0, 9007199254740992.000000000 >= 0 , toUInt8(0) = 9007199254740992.000000000, toUInt8(0) != 9007199254740992.000000000, toUInt8(0) < 9007199254740992.000000000, toUInt8(0) <= 9007199254740992.000000000, toUInt8(0) > 9007199254740992.000000000, toUInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(0), 9007199254740992.000000000 != toUInt8(0), 9007199254740992.000000000 < toUInt8(0), 9007199254740992.000000000 <= toUInt8(0), 9007199254740992.000000000 > toUInt8(0), 9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740992.000000000, toInt8(0) != 9007199254740992.000000000, toInt8(0) < 9007199254740992.000000000, toInt8(0) <= 9007199254740992.000000000, toInt8(0) > 9007199254740992.000000000, toInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(0), 9007199254740992.000000000 != toInt8(0), 9007199254740992.000000000 < toInt8(0), 9007199254740992.000000000 <= toInt8(0), 9007199254740992.000000000 > toInt8(0), 9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740992.000000000, toUInt16(0) != 9007199254740992.000000000, toUInt16(0) < 9007199254740992.000000000, toUInt16(0) <= 9007199254740992.000000000, toUInt16(0) > 9007199254740992.000000000, toUInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(0), 9007199254740992.000000000 != toUInt16(0), 9007199254740992.000000000 < toUInt16(0), 9007199254740992.000000000 <= toUInt16(0), 9007199254740992.000000000 > toUInt16(0), 9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740992.000000000, toInt16(0) != 9007199254740992.000000000, toInt16(0) < 9007199254740992.000000000, toInt16(0) <= 9007199254740992.000000000, toInt16(0) > 9007199254740992.000000000, toInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(0), 9007199254740992.000000000 != toInt16(0), 9007199254740992.000000000 < toInt16(0), 9007199254740992.000000000 <= toInt16(0), 9007199254740992.000000000 > toInt16(0), 9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740992.000000000, toUInt32(0) != 9007199254740992.000000000, toUInt32(0) < 9007199254740992.000000000, toUInt32(0) <= 9007199254740992.000000000, toUInt32(0) > 9007199254740992.000000000, toUInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(0), 9007199254740992.000000000 != toUInt32(0), 9007199254740992.000000000 < toUInt32(0), 9007199254740992.000000000 <= toUInt32(0), 9007199254740992.000000000 > toUInt32(0), 9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740992.000000000, toInt32(0) != 9007199254740992.000000000, toInt32(0) < 9007199254740992.000000000, toInt32(0) <= 9007199254740992.000000000, toInt32(0) > 9007199254740992.000000000, toInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(0), 9007199254740992.000000000 != toInt32(0), 9007199254740992.000000000 < toInt32(0), 9007199254740992.000000000 <= toInt32(0), 9007199254740992.000000000 > toInt32(0), 9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740992.000000000, toUInt64(0) != 9007199254740992.000000000, toUInt64(0) < 9007199254740992.000000000, toUInt64(0) <= 9007199254740992.000000000, toUInt64(0) > 9007199254740992.000000000, toUInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(0), 9007199254740992.000000000 != toUInt64(0), 9007199254740992.000000000 < toUInt64(0), 9007199254740992.000000000 <= toUInt64(0), 9007199254740992.000000000 > toUInt64(0), 9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740992.000000000, toInt64(0) != 9007199254740992.000000000, toInt64(0) < 9007199254740992.000000000, toInt64(0) <= 9007199254740992.000000000, toInt64(0) > 9007199254740992.000000000, toInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(0), 9007199254740992.000000000 != toInt64(0), 9007199254740992.000000000 < toInt64(0), 9007199254740992.000000000 <= toInt64(0), 9007199254740992.000000000 > toInt64(0), 9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '9007199254740994.000000000', 0 = 9007199254740994.000000000, 0 != 9007199254740994.000000000, 0 < 9007199254740994.000000000, 0 <= 9007199254740994.000000000, 0 > 9007199254740994.000000000, 0 >= 9007199254740994.000000000,	9007199254740994.000000000 = 0, 9007199254740994.000000000 != 0, 9007199254740994.000000000 < 0, 9007199254740994.000000000 <= 0, 9007199254740994.000000000 > 0, 9007199254740994.000000000 >= 0 , toUInt8(0) = 9007199254740994.000000000, toUInt8(0) != 9007199254740994.000000000, toUInt8(0) < 9007199254740994.000000000, toUInt8(0) <= 9007199254740994.000000000, toUInt8(0) > 9007199254740994.000000000, toUInt8(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt8(0), 9007199254740994.000000000 != toUInt8(0), 9007199254740994.000000000 < toUInt8(0), 9007199254740994.000000000 <= toUInt8(0), 9007199254740994.000000000 > toUInt8(0), 9007199254740994.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740994.000000000, toInt8(0) != 9007199254740994.000000000, toInt8(0) < 9007199254740994.000000000, toInt8(0) <= 9007199254740994.000000000, toInt8(0) > 9007199254740994.000000000, toInt8(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt8(0), 9007199254740994.000000000 != toInt8(0), 9007199254740994.000000000 < toInt8(0), 9007199254740994.000000000 <= toInt8(0), 9007199254740994.000000000 > toInt8(0), 9007199254740994.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740994.000000000, toUInt16(0) != 9007199254740994.000000000, toUInt16(0) < 9007199254740994.000000000, toUInt16(0) <= 9007199254740994.000000000, toUInt16(0) > 9007199254740994.000000000, toUInt16(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt16(0), 9007199254740994.000000000 != toUInt16(0), 9007199254740994.000000000 < toUInt16(0), 9007199254740994.000000000 <= toUInt16(0), 9007199254740994.000000000 > toUInt16(0), 9007199254740994.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740994.000000000, toInt16(0) != 9007199254740994.000000000, toInt16(0) < 9007199254740994.000000000, toInt16(0) <= 9007199254740994.000000000, toInt16(0) > 9007199254740994.000000000, toInt16(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt16(0), 9007199254740994.000000000 != toInt16(0), 9007199254740994.000000000 < toInt16(0), 9007199254740994.000000000 <= toInt16(0), 9007199254740994.000000000 > toInt16(0), 9007199254740994.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740994.000000000, toUInt32(0) != 9007199254740994.000000000, toUInt32(0) < 9007199254740994.000000000, toUInt32(0) <= 9007199254740994.000000000, toUInt32(0) > 9007199254740994.000000000, toUInt32(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt32(0), 9007199254740994.000000000 != toUInt32(0), 9007199254740994.000000000 < toUInt32(0), 9007199254740994.000000000 <= toUInt32(0), 9007199254740994.000000000 > toUInt32(0), 9007199254740994.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740994.000000000, toInt32(0) != 9007199254740994.000000000, toInt32(0) < 9007199254740994.000000000, toInt32(0) <= 9007199254740994.000000000, toInt32(0) > 9007199254740994.000000000, toInt32(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt32(0), 9007199254740994.000000000 != toInt32(0), 9007199254740994.000000000 < toInt32(0), 9007199254740994.000000000 <= toInt32(0), 9007199254740994.000000000 > toInt32(0), 9007199254740994.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740994.000000000, toUInt64(0) != 9007199254740994.000000000, toUInt64(0) < 9007199254740994.000000000, toUInt64(0) <= 9007199254740994.000000000, toUInt64(0) > 9007199254740994.000000000, toUInt64(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt64(0), 9007199254740994.000000000 != toUInt64(0), 9007199254740994.000000000 < toUInt64(0), 9007199254740994.000000000 <= toUInt64(0), 9007199254740994.000000000 > toUInt64(0), 9007199254740994.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740994.000000000, toInt64(0) != 9007199254740994.000000000, toInt64(0) < 9007199254740994.000000000, toInt64(0) <= 9007199254740994.000000000, toInt64(0) > 9007199254740994.000000000, toInt64(0) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt64(0), 9007199254740994.000000000 != toInt64(0), 9007199254740994.000000000 < toInt64(0), 9007199254740994.000000000 <= toInt64(0), 9007199254740994.000000000 > toInt64(0), 9007199254740994.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740991.000000000', 0 = -9007199254740991.000000000, 0 != -9007199254740991.000000000, 0 < -9007199254740991.000000000, 0 <= -9007199254740991.000000000, 0 > -9007199254740991.000000000, 0 >= -9007199254740991.000000000,	-9007199254740991.000000000 = 0, -9007199254740991.000000000 != 0, -9007199254740991.000000000 < 0, -9007199254740991.000000000 <= 0, -9007199254740991.000000000 > 0, -9007199254740991.000000000 >= 0 , toUInt8(0) = -9007199254740991.000000000, toUInt8(0) != -9007199254740991.000000000, toUInt8(0) < -9007199254740991.000000000, toUInt8(0) <= -9007199254740991.000000000, toUInt8(0) > -9007199254740991.000000000, toUInt8(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt8(0), -9007199254740991.000000000 != toUInt8(0), -9007199254740991.000000000 < toUInt8(0), -9007199254740991.000000000 <= toUInt8(0), -9007199254740991.000000000 > toUInt8(0), -9007199254740991.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740991.000000000, toInt8(0) != -9007199254740991.000000000, toInt8(0) < -9007199254740991.000000000, toInt8(0) <= -9007199254740991.000000000, toInt8(0) > -9007199254740991.000000000, toInt8(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt8(0), -9007199254740991.000000000 != toInt8(0), -9007199254740991.000000000 < toInt8(0), -9007199254740991.000000000 <= toInt8(0), -9007199254740991.000000000 > toInt8(0), -9007199254740991.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740991.000000000, toUInt16(0) != -9007199254740991.000000000, toUInt16(0) < -9007199254740991.000000000, toUInt16(0) <= -9007199254740991.000000000, toUInt16(0) > -9007199254740991.000000000, toUInt16(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt16(0), -9007199254740991.000000000 != toUInt16(0), -9007199254740991.000000000 < toUInt16(0), -9007199254740991.000000000 <= toUInt16(0), -9007199254740991.000000000 > toUInt16(0), -9007199254740991.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740991.000000000, toInt16(0) != -9007199254740991.000000000, toInt16(0) < -9007199254740991.000000000, toInt16(0) <= -9007199254740991.000000000, toInt16(0) > -9007199254740991.000000000, toInt16(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt16(0), -9007199254740991.000000000 != toInt16(0), -9007199254740991.000000000 < toInt16(0), -9007199254740991.000000000 <= toInt16(0), -9007199254740991.000000000 > toInt16(0), -9007199254740991.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740991.000000000, toUInt32(0) != -9007199254740991.000000000, toUInt32(0) < -9007199254740991.000000000, toUInt32(0) <= -9007199254740991.000000000, toUInt32(0) > -9007199254740991.000000000, toUInt32(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt32(0), -9007199254740991.000000000 != toUInt32(0), -9007199254740991.000000000 < toUInt32(0), -9007199254740991.000000000 <= toUInt32(0), -9007199254740991.000000000 > toUInt32(0), -9007199254740991.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740991.000000000, toInt32(0) != -9007199254740991.000000000, toInt32(0) < -9007199254740991.000000000, toInt32(0) <= -9007199254740991.000000000, toInt32(0) > -9007199254740991.000000000, toInt32(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt32(0), -9007199254740991.000000000 != toInt32(0), -9007199254740991.000000000 < toInt32(0), -9007199254740991.000000000 <= toInt32(0), -9007199254740991.000000000 > toInt32(0), -9007199254740991.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740991.000000000, toUInt64(0) != -9007199254740991.000000000, toUInt64(0) < -9007199254740991.000000000, toUInt64(0) <= -9007199254740991.000000000, toUInt64(0) > -9007199254740991.000000000, toUInt64(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt64(0), -9007199254740991.000000000 != toUInt64(0), -9007199254740991.000000000 < toUInt64(0), -9007199254740991.000000000 <= toUInt64(0), -9007199254740991.000000000 > toUInt64(0), -9007199254740991.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740991.000000000, toInt64(0) != -9007199254740991.000000000, toInt64(0) < -9007199254740991.000000000, toInt64(0) <= -9007199254740991.000000000, toInt64(0) > -9007199254740991.000000000, toInt64(0) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt64(0), -9007199254740991.000000000 != toInt64(0), -9007199254740991.000000000 < toInt64(0), -9007199254740991.000000000 <= toInt64(0), -9007199254740991.000000000 > toInt64(0), -9007199254740991.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740992.000000000', 0 = -9007199254740992.000000000, 0 != -9007199254740992.000000000, 0 < -9007199254740992.000000000, 0 <= -9007199254740992.000000000, 0 > -9007199254740992.000000000, 0 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 0, -9007199254740992.000000000 != 0, -9007199254740992.000000000 < 0, -9007199254740992.000000000 <= 0, -9007199254740992.000000000 > 0, -9007199254740992.000000000 >= 0 , toUInt8(0) = -9007199254740992.000000000, toUInt8(0) != -9007199254740992.000000000, toUInt8(0) < -9007199254740992.000000000, toUInt8(0) <= -9007199254740992.000000000, toUInt8(0) > -9007199254740992.000000000, toUInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(0), -9007199254740992.000000000 != toUInt8(0), -9007199254740992.000000000 < toUInt8(0), -9007199254740992.000000000 <= toUInt8(0), -9007199254740992.000000000 > toUInt8(0), -9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740992.000000000, toInt8(0) != -9007199254740992.000000000, toInt8(0) < -9007199254740992.000000000, toInt8(0) <= -9007199254740992.000000000, toInt8(0) > -9007199254740992.000000000, toInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(0), -9007199254740992.000000000 != toInt8(0), -9007199254740992.000000000 < toInt8(0), -9007199254740992.000000000 <= toInt8(0), -9007199254740992.000000000 > toInt8(0), -9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740992.000000000, toUInt16(0) != -9007199254740992.000000000, toUInt16(0) < -9007199254740992.000000000, toUInt16(0) <= -9007199254740992.000000000, toUInt16(0) > -9007199254740992.000000000, toUInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(0), -9007199254740992.000000000 != toUInt16(0), -9007199254740992.000000000 < toUInt16(0), -9007199254740992.000000000 <= toUInt16(0), -9007199254740992.000000000 > toUInt16(0), -9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740992.000000000, toInt16(0) != -9007199254740992.000000000, toInt16(0) < -9007199254740992.000000000, toInt16(0) <= -9007199254740992.000000000, toInt16(0) > -9007199254740992.000000000, toInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(0), -9007199254740992.000000000 != toInt16(0), -9007199254740992.000000000 < toInt16(0), -9007199254740992.000000000 <= toInt16(0), -9007199254740992.000000000 > toInt16(0), -9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740992.000000000, toUInt32(0) != -9007199254740992.000000000, toUInt32(0) < -9007199254740992.000000000, toUInt32(0) <= -9007199254740992.000000000, toUInt32(0) > -9007199254740992.000000000, toUInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(0), -9007199254740992.000000000 != toUInt32(0), -9007199254740992.000000000 < toUInt32(0), -9007199254740992.000000000 <= toUInt32(0), -9007199254740992.000000000 > toUInt32(0), -9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740992.000000000, toInt32(0) != -9007199254740992.000000000, toInt32(0) < -9007199254740992.000000000, toInt32(0) <= -9007199254740992.000000000, toInt32(0) > -9007199254740992.000000000, toInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(0), -9007199254740992.000000000 != toInt32(0), -9007199254740992.000000000 < toInt32(0), -9007199254740992.000000000 <= toInt32(0), -9007199254740992.000000000 > toInt32(0), -9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740992.000000000, toUInt64(0) != -9007199254740992.000000000, toUInt64(0) < -9007199254740992.000000000, toUInt64(0) <= -9007199254740992.000000000, toUInt64(0) > -9007199254740992.000000000, toUInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(0), -9007199254740992.000000000 != toUInt64(0), -9007199254740992.000000000 < toUInt64(0), -9007199254740992.000000000 <= toUInt64(0), -9007199254740992.000000000 > toUInt64(0), -9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740992.000000000, toInt64(0) != -9007199254740992.000000000, toInt64(0) < -9007199254740992.000000000, toInt64(0) <= -9007199254740992.000000000, toInt64(0) > -9007199254740992.000000000, toInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(0), -9007199254740992.000000000 != toInt64(0), -9007199254740992.000000000 < toInt64(0), -9007199254740992.000000000 <= toInt64(0), -9007199254740992.000000000 > toInt64(0), -9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740992.000000000', 0 = -9007199254740992.000000000, 0 != -9007199254740992.000000000, 0 < -9007199254740992.000000000, 0 <= -9007199254740992.000000000, 0 > -9007199254740992.000000000, 0 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 0, -9007199254740992.000000000 != 0, -9007199254740992.000000000 < 0, -9007199254740992.000000000 <= 0, -9007199254740992.000000000 > 0, -9007199254740992.000000000 >= 0 , toUInt8(0) = -9007199254740992.000000000, toUInt8(0) != -9007199254740992.000000000, toUInt8(0) < -9007199254740992.000000000, toUInt8(0) <= -9007199254740992.000000000, toUInt8(0) > -9007199254740992.000000000, toUInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(0), -9007199254740992.000000000 != toUInt8(0), -9007199254740992.000000000 < toUInt8(0), -9007199254740992.000000000 <= toUInt8(0), -9007199254740992.000000000 > toUInt8(0), -9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740992.000000000, toInt8(0) != -9007199254740992.000000000, toInt8(0) < -9007199254740992.000000000, toInt8(0) <= -9007199254740992.000000000, toInt8(0) > -9007199254740992.000000000, toInt8(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(0), -9007199254740992.000000000 != toInt8(0), -9007199254740992.000000000 < toInt8(0), -9007199254740992.000000000 <= toInt8(0), -9007199254740992.000000000 > toInt8(0), -9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740992.000000000, toUInt16(0) != -9007199254740992.000000000, toUInt16(0) < -9007199254740992.000000000, toUInt16(0) <= -9007199254740992.000000000, toUInt16(0) > -9007199254740992.000000000, toUInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(0), -9007199254740992.000000000 != toUInt16(0), -9007199254740992.000000000 < toUInt16(0), -9007199254740992.000000000 <= toUInt16(0), -9007199254740992.000000000 > toUInt16(0), -9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740992.000000000, toInt16(0) != -9007199254740992.000000000, toInt16(0) < -9007199254740992.000000000, toInt16(0) <= -9007199254740992.000000000, toInt16(0) > -9007199254740992.000000000, toInt16(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(0), -9007199254740992.000000000 != toInt16(0), -9007199254740992.000000000 < toInt16(0), -9007199254740992.000000000 <= toInt16(0), -9007199254740992.000000000 > toInt16(0), -9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740992.000000000, toUInt32(0) != -9007199254740992.000000000, toUInt32(0) < -9007199254740992.000000000, toUInt32(0) <= -9007199254740992.000000000, toUInt32(0) > -9007199254740992.000000000, toUInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(0), -9007199254740992.000000000 != toUInt32(0), -9007199254740992.000000000 < toUInt32(0), -9007199254740992.000000000 <= toUInt32(0), -9007199254740992.000000000 > toUInt32(0), -9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740992.000000000, toInt32(0) != -9007199254740992.000000000, toInt32(0) < -9007199254740992.000000000, toInt32(0) <= -9007199254740992.000000000, toInt32(0) > -9007199254740992.000000000, toInt32(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(0), -9007199254740992.000000000 != toInt32(0), -9007199254740992.000000000 < toInt32(0), -9007199254740992.000000000 <= toInt32(0), -9007199254740992.000000000 > toInt32(0), -9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740992.000000000, toUInt64(0) != -9007199254740992.000000000, toUInt64(0) < -9007199254740992.000000000, toUInt64(0) <= -9007199254740992.000000000, toUInt64(0) > -9007199254740992.000000000, toUInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(0), -9007199254740992.000000000 != toUInt64(0), -9007199254740992.000000000 < toUInt64(0), -9007199254740992.000000000 <= toUInt64(0), -9007199254740992.000000000 > toUInt64(0), -9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740992.000000000, toInt64(0) != -9007199254740992.000000000, toInt64(0) < -9007199254740992.000000000, toInt64(0) <= -9007199254740992.000000000, toInt64(0) > -9007199254740992.000000000, toInt64(0) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(0), -9007199254740992.000000000 != toInt64(0), -9007199254740992.000000000 < toInt64(0), -9007199254740992.000000000 <= toInt64(0), -9007199254740992.000000000 > toInt64(0), -9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '-9007199254740994.000000000', 0 = -9007199254740994.000000000, 0 != -9007199254740994.000000000, 0 < -9007199254740994.000000000, 0 <= -9007199254740994.000000000, 0 > -9007199254740994.000000000, 0 >= -9007199254740994.000000000,	-9007199254740994.000000000 = 0, -9007199254740994.000000000 != 0, -9007199254740994.000000000 < 0, -9007199254740994.000000000 <= 0, -9007199254740994.000000000 > 0, -9007199254740994.000000000 >= 0 , toUInt8(0) = -9007199254740994.000000000, toUInt8(0) != -9007199254740994.000000000, toUInt8(0) < -9007199254740994.000000000, toUInt8(0) <= -9007199254740994.000000000, toUInt8(0) > -9007199254740994.000000000, toUInt8(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt8(0), -9007199254740994.000000000 != toUInt8(0), -9007199254740994.000000000 < toUInt8(0), -9007199254740994.000000000 <= toUInt8(0), -9007199254740994.000000000 > toUInt8(0), -9007199254740994.000000000 >= toUInt8(0) , toInt8(0) = -9007199254740994.000000000, toInt8(0) != -9007199254740994.000000000, toInt8(0) < -9007199254740994.000000000, toInt8(0) <= -9007199254740994.000000000, toInt8(0) > -9007199254740994.000000000, toInt8(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt8(0), -9007199254740994.000000000 != toInt8(0), -9007199254740994.000000000 < toInt8(0), -9007199254740994.000000000 <= toInt8(0), -9007199254740994.000000000 > toInt8(0), -9007199254740994.000000000 >= toInt8(0) , toUInt16(0) = -9007199254740994.000000000, toUInt16(0) != -9007199254740994.000000000, toUInt16(0) < -9007199254740994.000000000, toUInt16(0) <= -9007199254740994.000000000, toUInt16(0) > -9007199254740994.000000000, toUInt16(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt16(0), -9007199254740994.000000000 != toUInt16(0), -9007199254740994.000000000 < toUInt16(0), -9007199254740994.000000000 <= toUInt16(0), -9007199254740994.000000000 > toUInt16(0), -9007199254740994.000000000 >= toUInt16(0) , toInt16(0) = -9007199254740994.000000000, toInt16(0) != -9007199254740994.000000000, toInt16(0) < -9007199254740994.000000000, toInt16(0) <= -9007199254740994.000000000, toInt16(0) > -9007199254740994.000000000, toInt16(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt16(0), -9007199254740994.000000000 != toInt16(0), -9007199254740994.000000000 < toInt16(0), -9007199254740994.000000000 <= toInt16(0), -9007199254740994.000000000 > toInt16(0), -9007199254740994.000000000 >= toInt16(0) , toUInt32(0) = -9007199254740994.000000000, toUInt32(0) != -9007199254740994.000000000, toUInt32(0) < -9007199254740994.000000000, toUInt32(0) <= -9007199254740994.000000000, toUInt32(0) > -9007199254740994.000000000, toUInt32(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt32(0), -9007199254740994.000000000 != toUInt32(0), -9007199254740994.000000000 < toUInt32(0), -9007199254740994.000000000 <= toUInt32(0), -9007199254740994.000000000 > toUInt32(0), -9007199254740994.000000000 >= toUInt32(0) , toInt32(0) = -9007199254740994.000000000, toInt32(0) != -9007199254740994.000000000, toInt32(0) < -9007199254740994.000000000, toInt32(0) <= -9007199254740994.000000000, toInt32(0) > -9007199254740994.000000000, toInt32(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt32(0), -9007199254740994.000000000 != toInt32(0), -9007199254740994.000000000 < toInt32(0), -9007199254740994.000000000 <= toInt32(0), -9007199254740994.000000000 > toInt32(0), -9007199254740994.000000000 >= toInt32(0) , toUInt64(0) = -9007199254740994.000000000, toUInt64(0) != -9007199254740994.000000000, toUInt64(0) < -9007199254740994.000000000, toUInt64(0) <= -9007199254740994.000000000, toUInt64(0) > -9007199254740994.000000000, toUInt64(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt64(0), -9007199254740994.000000000 != toUInt64(0), -9007199254740994.000000000 < toUInt64(0), -9007199254740994.000000000 <= toUInt64(0), -9007199254740994.000000000 > toUInt64(0), -9007199254740994.000000000 >= toUInt64(0) , toInt64(0) = -9007199254740994.000000000, toInt64(0) != -9007199254740994.000000000, toInt64(0) < -9007199254740994.000000000, toInt64(0) <= -9007199254740994.000000000, toInt64(0) > -9007199254740994.000000000, toInt64(0) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt64(0), -9007199254740994.000000000 != toInt64(0), -9007199254740994.000000000 < toInt64(0), -9007199254740994.000000000 <= toInt64(0), -9007199254740994.000000000 > toInt64(0), -9007199254740994.000000000 >= toInt64(0) ;
+SELECT '0', '104.000000000', 0 = 104.000000000, 0 != 104.000000000, 0 < 104.000000000, 0 <= 104.000000000, 0 > 104.000000000, 0 >= 104.000000000,	104.000000000 = 0, 104.000000000 != 0, 104.000000000 < 0, 104.000000000 <= 0, 104.000000000 > 0, 104.000000000 >= 0 , toUInt8(0) = 104.000000000, toUInt8(0) != 104.000000000, toUInt8(0) < 104.000000000, toUInt8(0) <= 104.000000000, toUInt8(0) > 104.000000000, toUInt8(0) >= 104.000000000,	104.000000000 = toUInt8(0), 104.000000000 != toUInt8(0), 104.000000000 < toUInt8(0), 104.000000000 <= toUInt8(0), 104.000000000 > toUInt8(0), 104.000000000 >= toUInt8(0) , toInt8(0) = 104.000000000, toInt8(0) != 104.000000000, toInt8(0) < 104.000000000, toInt8(0) <= 104.000000000, toInt8(0) > 104.000000000, toInt8(0) >= 104.000000000,	104.000000000 = toInt8(0), 104.000000000 != toInt8(0), 104.000000000 < toInt8(0), 104.000000000 <= toInt8(0), 104.000000000 > toInt8(0), 104.000000000 >= toInt8(0) , toUInt16(0) = 104.000000000, toUInt16(0) != 104.000000000, toUInt16(0) < 104.000000000, toUInt16(0) <= 104.000000000, toUInt16(0) > 104.000000000, toUInt16(0) >= 104.000000000,	104.000000000 = toUInt16(0), 104.000000000 != toUInt16(0), 104.000000000 < toUInt16(0), 104.000000000 <= toUInt16(0), 104.000000000 > toUInt16(0), 104.000000000 >= toUInt16(0) , toInt16(0) = 104.000000000, toInt16(0) != 104.000000000, toInt16(0) < 104.000000000, toInt16(0) <= 104.000000000, toInt16(0) > 104.000000000, toInt16(0) >= 104.000000000,	104.000000000 = toInt16(0), 104.000000000 != toInt16(0), 104.000000000 < toInt16(0), 104.000000000 <= toInt16(0), 104.000000000 > toInt16(0), 104.000000000 >= toInt16(0) , toUInt32(0) = 104.000000000, toUInt32(0) != 104.000000000, toUInt32(0) < 104.000000000, toUInt32(0) <= 104.000000000, toUInt32(0) > 104.000000000, toUInt32(0) >= 104.000000000,	104.000000000 = toUInt32(0), 104.000000000 != toUInt32(0), 104.000000000 < toUInt32(0), 104.000000000 <= toUInt32(0), 104.000000000 > toUInt32(0), 104.000000000 >= toUInt32(0) , toInt32(0) = 104.000000000, toInt32(0) != 104.000000000, toInt32(0) < 104.000000000, toInt32(0) <= 104.000000000, toInt32(0) > 104.000000000, toInt32(0) >= 104.000000000,	104.000000000 = toInt32(0), 104.000000000 != toInt32(0), 104.000000000 < toInt32(0), 104.000000000 <= toInt32(0), 104.000000000 > toInt32(0), 104.000000000 >= toInt32(0) , toUInt64(0) = 104.000000000, toUInt64(0) != 104.000000000, toUInt64(0) < 104.000000000, toUInt64(0) <= 104.000000000, toUInt64(0) > 104.000000000, toUInt64(0) >= 104.000000000,	104.000000000 = toUInt64(0), 104.000000000 != toUInt64(0), 104.000000000 < toUInt64(0), 104.000000000 <= toUInt64(0), 104.000000000 > toUInt64(0), 104.000000000 >= toUInt64(0) , toInt64(0) = 104.000000000, toInt64(0) != 104.000000000, toInt64(0) < 104.000000000, toInt64(0) <= 104.000000000, toInt64(0) > 104.000000000, toInt64(0) >= 104.000000000,	104.000000000 = toInt64(0), 104.000000000 != toInt64(0), 104.000000000 < toInt64(0), 104.000000000 <= toInt64(0), 104.000000000 > toInt64(0), 104.000000000 >= toInt64(0) ;
+SELECT '0', '-4503599627370496.000000000', 0 = -4503599627370496.000000000, 0 != -4503599627370496.000000000, 0 < -4503599627370496.000000000, 0 <= -4503599627370496.000000000, 0 > -4503599627370496.000000000, 0 >= -4503599627370496.000000000,	-4503599627370496.000000000 = 0, -4503599627370496.000000000 != 0, -4503599627370496.000000000 < 0, -4503599627370496.000000000 <= 0, -4503599627370496.000000000 > 0, -4503599627370496.000000000 >= 0 , toUInt8(0) = -4503599627370496.000000000, toUInt8(0) != -4503599627370496.000000000, toUInt8(0) < -4503599627370496.000000000, toUInt8(0) <= -4503599627370496.000000000, toUInt8(0) > -4503599627370496.000000000, toUInt8(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt8(0), -4503599627370496.000000000 != toUInt8(0), -4503599627370496.000000000 < toUInt8(0), -4503599627370496.000000000 <= toUInt8(0), -4503599627370496.000000000 > toUInt8(0), -4503599627370496.000000000 >= toUInt8(0) , toInt8(0) = -4503599627370496.000000000, toInt8(0) != -4503599627370496.000000000, toInt8(0) < -4503599627370496.000000000, toInt8(0) <= -4503599627370496.000000000, toInt8(0) > -4503599627370496.000000000, toInt8(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt8(0), -4503599627370496.000000000 != toInt8(0), -4503599627370496.000000000 < toInt8(0), -4503599627370496.000000000 <= toInt8(0), -4503599627370496.000000000 > toInt8(0), -4503599627370496.000000000 >= toInt8(0) , toUInt16(0) = -4503599627370496.000000000, toUInt16(0) != -4503599627370496.000000000, toUInt16(0) < -4503599627370496.000000000, toUInt16(0) <= -4503599627370496.000000000, toUInt16(0) > -4503599627370496.000000000, toUInt16(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt16(0), -4503599627370496.000000000 != toUInt16(0), -4503599627370496.000000000 < toUInt16(0), -4503599627370496.000000000 <= toUInt16(0), -4503599627370496.000000000 > toUInt16(0), -4503599627370496.000000000 >= toUInt16(0) , toInt16(0) = -4503599627370496.000000000, toInt16(0) != -4503599627370496.000000000, toInt16(0) < -4503599627370496.000000000, toInt16(0) <= -4503599627370496.000000000, toInt16(0) > -4503599627370496.000000000, toInt16(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt16(0), -4503599627370496.000000000 != toInt16(0), -4503599627370496.000000000 < toInt16(0), -4503599627370496.000000000 <= toInt16(0), -4503599627370496.000000000 > toInt16(0), -4503599627370496.000000000 >= toInt16(0) , toUInt32(0) = -4503599627370496.000000000, toUInt32(0) != -4503599627370496.000000000, toUInt32(0) < -4503599627370496.000000000, toUInt32(0) <= -4503599627370496.000000000, toUInt32(0) > -4503599627370496.000000000, toUInt32(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt32(0), -4503599627370496.000000000 != toUInt32(0), -4503599627370496.000000000 < toUInt32(0), -4503599627370496.000000000 <= toUInt32(0), -4503599627370496.000000000 > toUInt32(0), -4503599627370496.000000000 >= toUInt32(0) , toInt32(0) = -4503599627370496.000000000, toInt32(0) != -4503599627370496.000000000, toInt32(0) < -4503599627370496.000000000, toInt32(0) <= -4503599627370496.000000000, toInt32(0) > -4503599627370496.000000000, toInt32(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt32(0), -4503599627370496.000000000 != toInt32(0), -4503599627370496.000000000 < toInt32(0), -4503599627370496.000000000 <= toInt32(0), -4503599627370496.000000000 > toInt32(0), -4503599627370496.000000000 >= toInt32(0) , toUInt64(0) = -4503599627370496.000000000, toUInt64(0) != -4503599627370496.000000000, toUInt64(0) < -4503599627370496.000000000, toUInt64(0) <= -4503599627370496.000000000, toUInt64(0) > -4503599627370496.000000000, toUInt64(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt64(0), -4503599627370496.000000000 != toUInt64(0), -4503599627370496.000000000 < toUInt64(0), -4503599627370496.000000000 <= toUInt64(0), -4503599627370496.000000000 > toUInt64(0), -4503599627370496.000000000 >= toUInt64(0) , toInt64(0) = -4503599627370496.000000000, toInt64(0) != -4503599627370496.000000000, toInt64(0) < -4503599627370496.000000000, toInt64(0) <= -4503599627370496.000000000, toInt64(0) > -4503599627370496.000000000, toInt64(0) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt64(0), -4503599627370496.000000000 != toInt64(0), -4503599627370496.000000000 < toInt64(0), -4503599627370496.000000000 <= toInt64(0), -4503599627370496.000000000 > toInt64(0), -4503599627370496.000000000 >= toInt64(0) ;
+SELECT '0', '-0.500000000', 0 = -0.500000000, 0 != -0.500000000, 0 < -0.500000000, 0 <= -0.500000000, 0 > -0.500000000, 0 >= -0.500000000,	-0.500000000 = 0, -0.500000000 != 0, -0.500000000 < 0, -0.500000000 <= 0, -0.500000000 > 0, -0.500000000 >= 0 , toUInt8(0) = -0.500000000, toUInt8(0) != -0.500000000, toUInt8(0) < -0.500000000, toUInt8(0) <= -0.500000000, toUInt8(0) > -0.500000000, toUInt8(0) >= -0.500000000,	-0.500000000 = toUInt8(0), -0.500000000 != toUInt8(0), -0.500000000 < toUInt8(0), -0.500000000 <= toUInt8(0), -0.500000000 > toUInt8(0), -0.500000000 >= toUInt8(0) , toInt8(0) = -0.500000000, toInt8(0) != -0.500000000, toInt8(0) < -0.500000000, toInt8(0) <= -0.500000000, toInt8(0) > -0.500000000, toInt8(0) >= -0.500000000,	-0.500000000 = toInt8(0), -0.500000000 != toInt8(0), -0.500000000 < toInt8(0), -0.500000000 <= toInt8(0), -0.500000000 > toInt8(0), -0.500000000 >= toInt8(0) , toUInt16(0) = -0.500000000, toUInt16(0) != -0.500000000, toUInt16(0) < -0.500000000, toUInt16(0) <= -0.500000000, toUInt16(0) > -0.500000000, toUInt16(0) >= -0.500000000,	-0.500000000 = toUInt16(0), -0.500000000 != toUInt16(0), -0.500000000 < toUInt16(0), -0.500000000 <= toUInt16(0), -0.500000000 > toUInt16(0), -0.500000000 >= toUInt16(0) , toInt16(0) = -0.500000000, toInt16(0) != -0.500000000, toInt16(0) < -0.500000000, toInt16(0) <= -0.500000000, toInt16(0) > -0.500000000, toInt16(0) >= -0.500000000,	-0.500000000 = toInt16(0), -0.500000000 != toInt16(0), -0.500000000 < toInt16(0), -0.500000000 <= toInt16(0), -0.500000000 > toInt16(0), -0.500000000 >= toInt16(0) , toUInt32(0) = -0.500000000, toUInt32(0) != -0.500000000, toUInt32(0) < -0.500000000, toUInt32(0) <= -0.500000000, toUInt32(0) > -0.500000000, toUInt32(0) >= -0.500000000,	-0.500000000 = toUInt32(0), -0.500000000 != toUInt32(0), -0.500000000 < toUInt32(0), -0.500000000 <= toUInt32(0), -0.500000000 > toUInt32(0), -0.500000000 >= toUInt32(0) , toInt32(0) = -0.500000000, toInt32(0) != -0.500000000, toInt32(0) < -0.500000000, toInt32(0) <= -0.500000000, toInt32(0) > -0.500000000, toInt32(0) >= -0.500000000,	-0.500000000 = toInt32(0), -0.500000000 != toInt32(0), -0.500000000 < toInt32(0), -0.500000000 <= toInt32(0), -0.500000000 > toInt32(0), -0.500000000 >= toInt32(0) , toUInt64(0) = -0.500000000, toUInt64(0) != -0.500000000, toUInt64(0) < -0.500000000, toUInt64(0) <= -0.500000000, toUInt64(0) > -0.500000000, toUInt64(0) >= -0.500000000,	-0.500000000 = toUInt64(0), -0.500000000 != toUInt64(0), -0.500000000 < toUInt64(0), -0.500000000 <= toUInt64(0), -0.500000000 > toUInt64(0), -0.500000000 >= toUInt64(0) , toInt64(0) = -0.500000000, toInt64(0) != -0.500000000, toInt64(0) < -0.500000000, toInt64(0) <= -0.500000000, toInt64(0) > -0.500000000, toInt64(0) >= -0.500000000,	-0.500000000 = toInt64(0), -0.500000000 != toInt64(0), -0.500000000 < toInt64(0), -0.500000000 <= toInt64(0), -0.500000000 > toInt64(0), -0.500000000 >= toInt64(0) ;
+SELECT '0', '0.500000000', 0 = 0.500000000, 0 != 0.500000000, 0 < 0.500000000, 0 <= 0.500000000, 0 > 0.500000000, 0 >= 0.500000000,	0.500000000 = 0, 0.500000000 != 0, 0.500000000 < 0, 0.500000000 <= 0, 0.500000000 > 0, 0.500000000 >= 0 , toUInt8(0) = 0.500000000, toUInt8(0) != 0.500000000, toUInt8(0) < 0.500000000, toUInt8(0) <= 0.500000000, toUInt8(0) > 0.500000000, toUInt8(0) >= 0.500000000,	0.500000000 = toUInt8(0), 0.500000000 != toUInt8(0), 0.500000000 < toUInt8(0), 0.500000000 <= toUInt8(0), 0.500000000 > toUInt8(0), 0.500000000 >= toUInt8(0) , toInt8(0) = 0.500000000, toInt8(0) != 0.500000000, toInt8(0) < 0.500000000, toInt8(0) <= 0.500000000, toInt8(0) > 0.500000000, toInt8(0) >= 0.500000000,	0.500000000 = toInt8(0), 0.500000000 != toInt8(0), 0.500000000 < toInt8(0), 0.500000000 <= toInt8(0), 0.500000000 > toInt8(0), 0.500000000 >= toInt8(0) , toUInt16(0) = 0.500000000, toUInt16(0) != 0.500000000, toUInt16(0) < 0.500000000, toUInt16(0) <= 0.500000000, toUInt16(0) > 0.500000000, toUInt16(0) >= 0.500000000,	0.500000000 = toUInt16(0), 0.500000000 != toUInt16(0), 0.500000000 < toUInt16(0), 0.500000000 <= toUInt16(0), 0.500000000 > toUInt16(0), 0.500000000 >= toUInt16(0) , toInt16(0) = 0.500000000, toInt16(0) != 0.500000000, toInt16(0) < 0.500000000, toInt16(0) <= 0.500000000, toInt16(0) > 0.500000000, toInt16(0) >= 0.500000000,	0.500000000 = toInt16(0), 0.500000000 != toInt16(0), 0.500000000 < toInt16(0), 0.500000000 <= toInt16(0), 0.500000000 > toInt16(0), 0.500000000 >= toInt16(0) , toUInt32(0) = 0.500000000, toUInt32(0) != 0.500000000, toUInt32(0) < 0.500000000, toUInt32(0) <= 0.500000000, toUInt32(0) > 0.500000000, toUInt32(0) >= 0.500000000,	0.500000000 = toUInt32(0), 0.500000000 != toUInt32(0), 0.500000000 < toUInt32(0), 0.500000000 <= toUInt32(0), 0.500000000 > toUInt32(0), 0.500000000 >= toUInt32(0) , toInt32(0) = 0.500000000, toInt32(0) != 0.500000000, toInt32(0) < 0.500000000, toInt32(0) <= 0.500000000, toInt32(0) > 0.500000000, toInt32(0) >= 0.500000000,	0.500000000 = toInt32(0), 0.500000000 != toInt32(0), 0.500000000 < toInt32(0), 0.500000000 <= toInt32(0), 0.500000000 > toInt32(0), 0.500000000 >= toInt32(0) , toUInt64(0) = 0.500000000, toUInt64(0) != 0.500000000, toUInt64(0) < 0.500000000, toUInt64(0) <= 0.500000000, toUInt64(0) > 0.500000000, toUInt64(0) >= 0.500000000,	0.500000000 = toUInt64(0), 0.500000000 != toUInt64(0), 0.500000000 < toUInt64(0), 0.500000000 <= toUInt64(0), 0.500000000 > toUInt64(0), 0.500000000 >= toUInt64(0) , toInt64(0) = 0.500000000, toInt64(0) != 0.500000000, toInt64(0) < 0.500000000, toInt64(0) <= 0.500000000, toInt64(0) > 0.500000000, toInt64(0) >= 0.500000000,	0.500000000 = toInt64(0), 0.500000000 != toInt64(0), 0.500000000 < toInt64(0), 0.500000000 <= toInt64(0), 0.500000000 > toInt64(0), 0.500000000 >= toInt64(0) ;
+SELECT '0', '-1.500000000', 0 = -1.500000000, 0 != -1.500000000, 0 < -1.500000000, 0 <= -1.500000000, 0 > -1.500000000, 0 >= -1.500000000,	-1.500000000 = 0, -1.500000000 != 0, -1.500000000 < 0, -1.500000000 <= 0, -1.500000000 > 0, -1.500000000 >= 0 , toUInt8(0) = -1.500000000, toUInt8(0) != -1.500000000, toUInt8(0) < -1.500000000, toUInt8(0) <= -1.500000000, toUInt8(0) > -1.500000000, toUInt8(0) >= -1.500000000,	-1.500000000 = toUInt8(0), -1.500000000 != toUInt8(0), -1.500000000 < toUInt8(0), -1.500000000 <= toUInt8(0), -1.500000000 > toUInt8(0), -1.500000000 >= toUInt8(0) , toInt8(0) = -1.500000000, toInt8(0) != -1.500000000, toInt8(0) < -1.500000000, toInt8(0) <= -1.500000000, toInt8(0) > -1.500000000, toInt8(0) >= -1.500000000,	-1.500000000 = toInt8(0), -1.500000000 != toInt8(0), -1.500000000 < toInt8(0), -1.500000000 <= toInt8(0), -1.500000000 > toInt8(0), -1.500000000 >= toInt8(0) , toUInt16(0) = -1.500000000, toUInt16(0) != -1.500000000, toUInt16(0) < -1.500000000, toUInt16(0) <= -1.500000000, toUInt16(0) > -1.500000000, toUInt16(0) >= -1.500000000,	-1.500000000 = toUInt16(0), -1.500000000 != toUInt16(0), -1.500000000 < toUInt16(0), -1.500000000 <= toUInt16(0), -1.500000000 > toUInt16(0), -1.500000000 >= toUInt16(0) , toInt16(0) = -1.500000000, toInt16(0) != -1.500000000, toInt16(0) < -1.500000000, toInt16(0) <= -1.500000000, toInt16(0) > -1.500000000, toInt16(0) >= -1.500000000,	-1.500000000 = toInt16(0), -1.500000000 != toInt16(0), -1.500000000 < toInt16(0), -1.500000000 <= toInt16(0), -1.500000000 > toInt16(0), -1.500000000 >= toInt16(0) , toUInt32(0) = -1.500000000, toUInt32(0) != -1.500000000, toUInt32(0) < -1.500000000, toUInt32(0) <= -1.500000000, toUInt32(0) > -1.500000000, toUInt32(0) >= -1.500000000,	-1.500000000 = toUInt32(0), -1.500000000 != toUInt32(0), -1.500000000 < toUInt32(0), -1.500000000 <= toUInt32(0), -1.500000000 > toUInt32(0), -1.500000000 >= toUInt32(0) , toInt32(0) = -1.500000000, toInt32(0) != -1.500000000, toInt32(0) < -1.500000000, toInt32(0) <= -1.500000000, toInt32(0) > -1.500000000, toInt32(0) >= -1.500000000,	-1.500000000 = toInt32(0), -1.500000000 != toInt32(0), -1.500000000 < toInt32(0), -1.500000000 <= toInt32(0), -1.500000000 > toInt32(0), -1.500000000 >= toInt32(0) , toUInt64(0) = -1.500000000, toUInt64(0) != -1.500000000, toUInt64(0) < -1.500000000, toUInt64(0) <= -1.500000000, toUInt64(0) > -1.500000000, toUInt64(0) >= -1.500000000,	-1.500000000 = toUInt64(0), -1.500000000 != toUInt64(0), -1.500000000 < toUInt64(0), -1.500000000 <= toUInt64(0), -1.500000000 > toUInt64(0), -1.500000000 >= toUInt64(0) , toInt64(0) = -1.500000000, toInt64(0) != -1.500000000, toInt64(0) < -1.500000000, toInt64(0) <= -1.500000000, toInt64(0) > -1.500000000, toInt64(0) >= -1.500000000,	-1.500000000 = toInt64(0), -1.500000000 != toInt64(0), -1.500000000 < toInt64(0), -1.500000000 <= toInt64(0), -1.500000000 > toInt64(0), -1.500000000 >= toInt64(0) ;
+SELECT '0', '1.500000000', 0 = 1.500000000, 0 != 1.500000000, 0 < 1.500000000, 0 <= 1.500000000, 0 > 1.500000000, 0 >= 1.500000000,	1.500000000 = 0, 1.500000000 != 0, 1.500000000 < 0, 1.500000000 <= 0, 1.500000000 > 0, 1.500000000 >= 0 , toUInt8(0) = 1.500000000, toUInt8(0) != 1.500000000, toUInt8(0) < 1.500000000, toUInt8(0) <= 1.500000000, toUInt8(0) > 1.500000000, toUInt8(0) >= 1.500000000,	1.500000000 = toUInt8(0), 1.500000000 != toUInt8(0), 1.500000000 < toUInt8(0), 1.500000000 <= toUInt8(0), 1.500000000 > toUInt8(0), 1.500000000 >= toUInt8(0) , toInt8(0) = 1.500000000, toInt8(0) != 1.500000000, toInt8(0) < 1.500000000, toInt8(0) <= 1.500000000, toInt8(0) > 1.500000000, toInt8(0) >= 1.500000000,	1.500000000 = toInt8(0), 1.500000000 != toInt8(0), 1.500000000 < toInt8(0), 1.500000000 <= toInt8(0), 1.500000000 > toInt8(0), 1.500000000 >= toInt8(0) , toUInt16(0) = 1.500000000, toUInt16(0) != 1.500000000, toUInt16(0) < 1.500000000, toUInt16(0) <= 1.500000000, toUInt16(0) > 1.500000000, toUInt16(0) >= 1.500000000,	1.500000000 = toUInt16(0), 1.500000000 != toUInt16(0), 1.500000000 < toUInt16(0), 1.500000000 <= toUInt16(0), 1.500000000 > toUInt16(0), 1.500000000 >= toUInt16(0) , toInt16(0) = 1.500000000, toInt16(0) != 1.500000000, toInt16(0) < 1.500000000, toInt16(0) <= 1.500000000, toInt16(0) > 1.500000000, toInt16(0) >= 1.500000000,	1.500000000 = toInt16(0), 1.500000000 != toInt16(0), 1.500000000 < toInt16(0), 1.500000000 <= toInt16(0), 1.500000000 > toInt16(0), 1.500000000 >= toInt16(0) , toUInt32(0) = 1.500000000, toUInt32(0) != 1.500000000, toUInt32(0) < 1.500000000, toUInt32(0) <= 1.500000000, toUInt32(0) > 1.500000000, toUInt32(0) >= 1.500000000,	1.500000000 = toUInt32(0), 1.500000000 != toUInt32(0), 1.500000000 < toUInt32(0), 1.500000000 <= toUInt32(0), 1.500000000 > toUInt32(0), 1.500000000 >= toUInt32(0) , toInt32(0) = 1.500000000, toInt32(0) != 1.500000000, toInt32(0) < 1.500000000, toInt32(0) <= 1.500000000, toInt32(0) > 1.500000000, toInt32(0) >= 1.500000000,	1.500000000 = toInt32(0), 1.500000000 != toInt32(0), 1.500000000 < toInt32(0), 1.500000000 <= toInt32(0), 1.500000000 > toInt32(0), 1.500000000 >= toInt32(0) , toUInt64(0) = 1.500000000, toUInt64(0) != 1.500000000, toUInt64(0) < 1.500000000, toUInt64(0) <= 1.500000000, toUInt64(0) > 1.500000000, toUInt64(0) >= 1.500000000,	1.500000000 = toUInt64(0), 1.500000000 != toUInt64(0), 1.500000000 < toUInt64(0), 1.500000000 <= toUInt64(0), 1.500000000 > toUInt64(0), 1.500000000 >= toUInt64(0) , toInt64(0) = 1.500000000, toInt64(0) != 1.500000000, toInt64(0) < 1.500000000, toInt64(0) <= 1.500000000, toInt64(0) > 1.500000000, toInt64(0) >= 1.500000000,	1.500000000 = toInt64(0), 1.500000000 != toInt64(0), 1.500000000 < toInt64(0), 1.500000000 <= toInt64(0), 1.500000000 > toInt64(0), 1.500000000 >= toInt64(0) ;
+SELECT '0', '9007199254740992.000000000', 0 = 9007199254740992.000000000, 0 != 9007199254740992.000000000, 0 < 9007199254740992.000000000, 0 <= 9007199254740992.000000000, 0 > 9007199254740992.000000000, 0 >= 9007199254740992.000000000,	9007199254740992.000000000 = 0, 9007199254740992.000000000 != 0, 9007199254740992.000000000 < 0, 9007199254740992.000000000 <= 0, 9007199254740992.000000000 > 0, 9007199254740992.000000000 >= 0 , toUInt8(0) = 9007199254740992.000000000, toUInt8(0) != 9007199254740992.000000000, toUInt8(0) < 9007199254740992.000000000, toUInt8(0) <= 9007199254740992.000000000, toUInt8(0) > 9007199254740992.000000000, toUInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(0), 9007199254740992.000000000 != toUInt8(0), 9007199254740992.000000000 < toUInt8(0), 9007199254740992.000000000 <= toUInt8(0), 9007199254740992.000000000 > toUInt8(0), 9007199254740992.000000000 >= toUInt8(0) , toInt8(0) = 9007199254740992.000000000, toInt8(0) != 9007199254740992.000000000, toInt8(0) < 9007199254740992.000000000, toInt8(0) <= 9007199254740992.000000000, toInt8(0) > 9007199254740992.000000000, toInt8(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(0), 9007199254740992.000000000 != toInt8(0), 9007199254740992.000000000 < toInt8(0), 9007199254740992.000000000 <= toInt8(0), 9007199254740992.000000000 > toInt8(0), 9007199254740992.000000000 >= toInt8(0) , toUInt16(0) = 9007199254740992.000000000, toUInt16(0) != 9007199254740992.000000000, toUInt16(0) < 9007199254740992.000000000, toUInt16(0) <= 9007199254740992.000000000, toUInt16(0) > 9007199254740992.000000000, toUInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(0), 9007199254740992.000000000 != toUInt16(0), 9007199254740992.000000000 < toUInt16(0), 9007199254740992.000000000 <= toUInt16(0), 9007199254740992.000000000 > toUInt16(0), 9007199254740992.000000000 >= toUInt16(0) , toInt16(0) = 9007199254740992.000000000, toInt16(0) != 9007199254740992.000000000, toInt16(0) < 9007199254740992.000000000, toInt16(0) <= 9007199254740992.000000000, toInt16(0) > 9007199254740992.000000000, toInt16(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(0), 9007199254740992.000000000 != toInt16(0), 9007199254740992.000000000 < toInt16(0), 9007199254740992.000000000 <= toInt16(0), 9007199254740992.000000000 > toInt16(0), 9007199254740992.000000000 >= toInt16(0) , toUInt32(0) = 9007199254740992.000000000, toUInt32(0) != 9007199254740992.000000000, toUInt32(0) < 9007199254740992.000000000, toUInt32(0) <= 9007199254740992.000000000, toUInt32(0) > 9007199254740992.000000000, toUInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(0), 9007199254740992.000000000 != toUInt32(0), 9007199254740992.000000000 < toUInt32(0), 9007199254740992.000000000 <= toUInt32(0), 9007199254740992.000000000 > toUInt32(0), 9007199254740992.000000000 >= toUInt32(0) , toInt32(0) = 9007199254740992.000000000, toInt32(0) != 9007199254740992.000000000, toInt32(0) < 9007199254740992.000000000, toInt32(0) <= 9007199254740992.000000000, toInt32(0) > 9007199254740992.000000000, toInt32(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(0), 9007199254740992.000000000 != toInt32(0), 9007199254740992.000000000 < toInt32(0), 9007199254740992.000000000 <= toInt32(0), 9007199254740992.000000000 > toInt32(0), 9007199254740992.000000000 >= toInt32(0) , toUInt64(0) = 9007199254740992.000000000, toUInt64(0) != 9007199254740992.000000000, toUInt64(0) < 9007199254740992.000000000, toUInt64(0) <= 9007199254740992.000000000, toUInt64(0) > 9007199254740992.000000000, toUInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(0), 9007199254740992.000000000 != toUInt64(0), 9007199254740992.000000000 < toUInt64(0), 9007199254740992.000000000 <= toUInt64(0), 9007199254740992.000000000 > toUInt64(0), 9007199254740992.000000000 >= toUInt64(0) , toInt64(0) = 9007199254740992.000000000, toInt64(0) != 9007199254740992.000000000, toInt64(0) < 9007199254740992.000000000, toInt64(0) <= 9007199254740992.000000000, toInt64(0) > 9007199254740992.000000000, toInt64(0) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(0), 9007199254740992.000000000 != toInt64(0), 9007199254740992.000000000 < toInt64(0), 9007199254740992.000000000 <= toInt64(0), 9007199254740992.000000000 > toInt64(0), 9007199254740992.000000000 >= toInt64(0) ;
+SELECT '0', '2251799813685247.500000000', 0 = 2251799813685247.500000000, 0 != 2251799813685247.500000000, 0 < 2251799813685247.500000000, 0 <= 2251799813685247.500000000, 0 > 2251799813685247.500000000, 0 >= 2251799813685247.500000000,	2251799813685247.500000000 = 0, 2251799813685247.500000000 != 0, 2251799813685247.500000000 < 0, 2251799813685247.500000000 <= 0, 2251799813685247.500000000 > 0, 2251799813685247.500000000 >= 0 , toUInt8(0) = 2251799813685247.500000000, toUInt8(0) != 2251799813685247.500000000, toUInt8(0) < 2251799813685247.500000000, toUInt8(0) <= 2251799813685247.500000000, toUInt8(0) > 2251799813685247.500000000, toUInt8(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt8(0), 2251799813685247.500000000 != toUInt8(0), 2251799813685247.500000000 < toUInt8(0), 2251799813685247.500000000 <= toUInt8(0), 2251799813685247.500000000 > toUInt8(0), 2251799813685247.500000000 >= toUInt8(0) , toInt8(0) = 2251799813685247.500000000, toInt8(0) != 2251799813685247.500000000, toInt8(0) < 2251799813685247.500000000, toInt8(0) <= 2251799813685247.500000000, toInt8(0) > 2251799813685247.500000000, toInt8(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt8(0), 2251799813685247.500000000 != toInt8(0), 2251799813685247.500000000 < toInt8(0), 2251799813685247.500000000 <= toInt8(0), 2251799813685247.500000000 > toInt8(0), 2251799813685247.500000000 >= toInt8(0) , toUInt16(0) = 2251799813685247.500000000, toUInt16(0) != 2251799813685247.500000000, toUInt16(0) < 2251799813685247.500000000, toUInt16(0) <= 2251799813685247.500000000, toUInt16(0) > 2251799813685247.500000000, toUInt16(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt16(0), 2251799813685247.500000000 != toUInt16(0), 2251799813685247.500000000 < toUInt16(0), 2251799813685247.500000000 <= toUInt16(0), 2251799813685247.500000000 > toUInt16(0), 2251799813685247.500000000 >= toUInt16(0) , toInt16(0) = 2251799813685247.500000000, toInt16(0) != 2251799813685247.500000000, toInt16(0) < 2251799813685247.500000000, toInt16(0) <= 2251799813685247.500000000, toInt16(0) > 2251799813685247.500000000, toInt16(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt16(0), 2251799813685247.500000000 != toInt16(0), 2251799813685247.500000000 < toInt16(0), 2251799813685247.500000000 <= toInt16(0), 2251799813685247.500000000 > toInt16(0), 2251799813685247.500000000 >= toInt16(0) , toUInt32(0) = 2251799813685247.500000000, toUInt32(0) != 2251799813685247.500000000, toUInt32(0) < 2251799813685247.500000000, toUInt32(0) <= 2251799813685247.500000000, toUInt32(0) > 2251799813685247.500000000, toUInt32(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt32(0), 2251799813685247.500000000 != toUInt32(0), 2251799813685247.500000000 < toUInt32(0), 2251799813685247.500000000 <= toUInt32(0), 2251799813685247.500000000 > toUInt32(0), 2251799813685247.500000000 >= toUInt32(0) , toInt32(0) = 2251799813685247.500000000, toInt32(0) != 2251799813685247.500000000, toInt32(0) < 2251799813685247.500000000, toInt32(0) <= 2251799813685247.500000000, toInt32(0) > 2251799813685247.500000000, toInt32(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt32(0), 2251799813685247.500000000 != toInt32(0), 2251799813685247.500000000 < toInt32(0), 2251799813685247.500000000 <= toInt32(0), 2251799813685247.500000000 > toInt32(0), 2251799813685247.500000000 >= toInt32(0) , toUInt64(0) = 2251799813685247.500000000, toUInt64(0) != 2251799813685247.500000000, toUInt64(0) < 2251799813685247.500000000, toUInt64(0) <= 2251799813685247.500000000, toUInt64(0) > 2251799813685247.500000000, toUInt64(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt64(0), 2251799813685247.500000000 != toUInt64(0), 2251799813685247.500000000 < toUInt64(0), 2251799813685247.500000000 <= toUInt64(0), 2251799813685247.500000000 > toUInt64(0), 2251799813685247.500000000 >= toUInt64(0) , toInt64(0) = 2251799813685247.500000000, toInt64(0) != 2251799813685247.500000000, toInt64(0) < 2251799813685247.500000000, toInt64(0) <= 2251799813685247.500000000, toInt64(0) > 2251799813685247.500000000, toInt64(0) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt64(0), 2251799813685247.500000000 != toInt64(0), 2251799813685247.500000000 < toInt64(0), 2251799813685247.500000000 <= toInt64(0), 2251799813685247.500000000 > toInt64(0), 2251799813685247.500000000 >= toInt64(0) ;
+SELECT '0', '2251799813685248.500000000', 0 = 2251799813685248.500000000, 0 != 2251799813685248.500000000, 0 < 2251799813685248.500000000, 0 <= 2251799813685248.500000000, 0 > 2251799813685248.500000000, 0 >= 2251799813685248.500000000,	2251799813685248.500000000 = 0, 2251799813685248.500000000 != 0, 2251799813685248.500000000 < 0, 2251799813685248.500000000 <= 0, 2251799813685248.500000000 > 0, 2251799813685248.500000000 >= 0 , toUInt8(0) = 2251799813685248.500000000, toUInt8(0) != 2251799813685248.500000000, toUInt8(0) < 2251799813685248.500000000, toUInt8(0) <= 2251799813685248.500000000, toUInt8(0) > 2251799813685248.500000000, toUInt8(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt8(0), 2251799813685248.500000000 != toUInt8(0), 2251799813685248.500000000 < toUInt8(0), 2251799813685248.500000000 <= toUInt8(0), 2251799813685248.500000000 > toUInt8(0), 2251799813685248.500000000 >= toUInt8(0) , toInt8(0) = 2251799813685248.500000000, toInt8(0) != 2251799813685248.500000000, toInt8(0) < 2251799813685248.500000000, toInt8(0) <= 2251799813685248.500000000, toInt8(0) > 2251799813685248.500000000, toInt8(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt8(0), 2251799813685248.500000000 != toInt8(0), 2251799813685248.500000000 < toInt8(0), 2251799813685248.500000000 <= toInt8(0), 2251799813685248.500000000 > toInt8(0), 2251799813685248.500000000 >= toInt8(0) , toUInt16(0) = 2251799813685248.500000000, toUInt16(0) != 2251799813685248.500000000, toUInt16(0) < 2251799813685248.500000000, toUInt16(0) <= 2251799813685248.500000000, toUInt16(0) > 2251799813685248.500000000, toUInt16(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt16(0), 2251799813685248.500000000 != toUInt16(0), 2251799813685248.500000000 < toUInt16(0), 2251799813685248.500000000 <= toUInt16(0), 2251799813685248.500000000 > toUInt16(0), 2251799813685248.500000000 >= toUInt16(0) , toInt16(0) = 2251799813685248.500000000, toInt16(0) != 2251799813685248.500000000, toInt16(0) < 2251799813685248.500000000, toInt16(0) <= 2251799813685248.500000000, toInt16(0) > 2251799813685248.500000000, toInt16(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt16(0), 2251799813685248.500000000 != toInt16(0), 2251799813685248.500000000 < toInt16(0), 2251799813685248.500000000 <= toInt16(0), 2251799813685248.500000000 > toInt16(0), 2251799813685248.500000000 >= toInt16(0) , toUInt32(0) = 2251799813685248.500000000, toUInt32(0) != 2251799813685248.500000000, toUInt32(0) < 2251799813685248.500000000, toUInt32(0) <= 2251799813685248.500000000, toUInt32(0) > 2251799813685248.500000000, toUInt32(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt32(0), 2251799813685248.500000000 != toUInt32(0), 2251799813685248.500000000 < toUInt32(0), 2251799813685248.500000000 <= toUInt32(0), 2251799813685248.500000000 > toUInt32(0), 2251799813685248.500000000 >= toUInt32(0) , toInt32(0) = 2251799813685248.500000000, toInt32(0) != 2251799813685248.500000000, toInt32(0) < 2251799813685248.500000000, toInt32(0) <= 2251799813685248.500000000, toInt32(0) > 2251799813685248.500000000, toInt32(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt32(0), 2251799813685248.500000000 != toInt32(0), 2251799813685248.500000000 < toInt32(0), 2251799813685248.500000000 <= toInt32(0), 2251799813685248.500000000 > toInt32(0), 2251799813685248.500000000 >= toInt32(0) , toUInt64(0) = 2251799813685248.500000000, toUInt64(0) != 2251799813685248.500000000, toUInt64(0) < 2251799813685248.500000000, toUInt64(0) <= 2251799813685248.500000000, toUInt64(0) > 2251799813685248.500000000, toUInt64(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt64(0), 2251799813685248.500000000 != toUInt64(0), 2251799813685248.500000000 < toUInt64(0), 2251799813685248.500000000 <= toUInt64(0), 2251799813685248.500000000 > toUInt64(0), 2251799813685248.500000000 >= toUInt64(0) , toInt64(0) = 2251799813685248.500000000, toInt64(0) != 2251799813685248.500000000, toInt64(0) < 2251799813685248.500000000, toInt64(0) <= 2251799813685248.500000000, toInt64(0) > 2251799813685248.500000000, toInt64(0) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt64(0), 2251799813685248.500000000 != toInt64(0), 2251799813685248.500000000 < toInt64(0), 2251799813685248.500000000 <= toInt64(0), 2251799813685248.500000000 > toInt64(0), 2251799813685248.500000000 >= toInt64(0) ;
+SELECT '0', '1152921504606846976.000000000', 0 = 1152921504606846976.000000000, 0 != 1152921504606846976.000000000, 0 < 1152921504606846976.000000000, 0 <= 1152921504606846976.000000000, 0 > 1152921504606846976.000000000, 0 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = 0, 1152921504606846976.000000000 != 0, 1152921504606846976.000000000 < 0, 1152921504606846976.000000000 <= 0, 1152921504606846976.000000000 > 0, 1152921504606846976.000000000 >= 0 , toUInt8(0) = 1152921504606846976.000000000, toUInt8(0) != 1152921504606846976.000000000, toUInt8(0) < 1152921504606846976.000000000, toUInt8(0) <= 1152921504606846976.000000000, toUInt8(0) > 1152921504606846976.000000000, toUInt8(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt8(0), 1152921504606846976.000000000 != toUInt8(0), 1152921504606846976.000000000 < toUInt8(0), 1152921504606846976.000000000 <= toUInt8(0), 1152921504606846976.000000000 > toUInt8(0), 1152921504606846976.000000000 >= toUInt8(0) , toInt8(0) = 1152921504606846976.000000000, toInt8(0) != 1152921504606846976.000000000, toInt8(0) < 1152921504606846976.000000000, toInt8(0) <= 1152921504606846976.000000000, toInt8(0) > 1152921504606846976.000000000, toInt8(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt8(0), 1152921504606846976.000000000 != toInt8(0), 1152921504606846976.000000000 < toInt8(0), 1152921504606846976.000000000 <= toInt8(0), 1152921504606846976.000000000 > toInt8(0), 1152921504606846976.000000000 >= toInt8(0) , toUInt16(0) = 1152921504606846976.000000000, toUInt16(0) != 1152921504606846976.000000000, toUInt16(0) < 1152921504606846976.000000000, toUInt16(0) <= 1152921504606846976.000000000, toUInt16(0) > 1152921504606846976.000000000, toUInt16(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt16(0), 1152921504606846976.000000000 != toUInt16(0), 1152921504606846976.000000000 < toUInt16(0), 1152921504606846976.000000000 <= toUInt16(0), 1152921504606846976.000000000 > toUInt16(0), 1152921504606846976.000000000 >= toUInt16(0) , toInt16(0) = 1152921504606846976.000000000, toInt16(0) != 1152921504606846976.000000000, toInt16(0) < 1152921504606846976.000000000, toInt16(0) <= 1152921504606846976.000000000, toInt16(0) > 1152921504606846976.000000000, toInt16(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt16(0), 1152921504606846976.000000000 != toInt16(0), 1152921504606846976.000000000 < toInt16(0), 1152921504606846976.000000000 <= toInt16(0), 1152921504606846976.000000000 > toInt16(0), 1152921504606846976.000000000 >= toInt16(0) , toUInt32(0) = 1152921504606846976.000000000, toUInt32(0) != 1152921504606846976.000000000, toUInt32(0) < 1152921504606846976.000000000, toUInt32(0) <= 1152921504606846976.000000000, toUInt32(0) > 1152921504606846976.000000000, toUInt32(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt32(0), 1152921504606846976.000000000 != toUInt32(0), 1152921504606846976.000000000 < toUInt32(0), 1152921504606846976.000000000 <= toUInt32(0), 1152921504606846976.000000000 > toUInt32(0), 1152921504606846976.000000000 >= toUInt32(0) , toInt32(0) = 1152921504606846976.000000000, toInt32(0) != 1152921504606846976.000000000, toInt32(0) < 1152921504606846976.000000000, toInt32(0) <= 1152921504606846976.000000000, toInt32(0) > 1152921504606846976.000000000, toInt32(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt32(0), 1152921504606846976.000000000 != toInt32(0), 1152921504606846976.000000000 < toInt32(0), 1152921504606846976.000000000 <= toInt32(0), 1152921504606846976.000000000 > toInt32(0), 1152921504606846976.000000000 >= toInt32(0) , toUInt64(0) = 1152921504606846976.000000000, toUInt64(0) != 1152921504606846976.000000000, toUInt64(0) < 1152921504606846976.000000000, toUInt64(0) <= 1152921504606846976.000000000, toUInt64(0) > 1152921504606846976.000000000, toUInt64(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt64(0), 1152921504606846976.000000000 != toUInt64(0), 1152921504606846976.000000000 < toUInt64(0), 1152921504606846976.000000000 <= toUInt64(0), 1152921504606846976.000000000 > toUInt64(0), 1152921504606846976.000000000 >= toUInt64(0) , toInt64(0) = 1152921504606846976.000000000, toInt64(0) != 1152921504606846976.000000000, toInt64(0) < 1152921504606846976.000000000, toInt64(0) <= 1152921504606846976.000000000, toInt64(0) > 1152921504606846976.000000000, toInt64(0) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt64(0), 1152921504606846976.000000000 != toInt64(0), 1152921504606846976.000000000 < toInt64(0), 1152921504606846976.000000000 <= toInt64(0), 1152921504606846976.000000000 > toInt64(0), 1152921504606846976.000000000 >= toInt64(0) ;
+SELECT '0', '-1152921504606846976.000000000', 0 = -1152921504606846976.000000000, 0 != -1152921504606846976.000000000, 0 < -1152921504606846976.000000000, 0 <= -1152921504606846976.000000000, 0 > -1152921504606846976.000000000, 0 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = 0, -1152921504606846976.000000000 != 0, -1152921504606846976.000000000 < 0, -1152921504606846976.000000000 <= 0, -1152921504606846976.000000000 > 0, -1152921504606846976.000000000 >= 0 , toUInt8(0) = -1152921504606846976.000000000, toUInt8(0) != -1152921504606846976.000000000, toUInt8(0) < -1152921504606846976.000000000, toUInt8(0) <= -1152921504606846976.000000000, toUInt8(0) > -1152921504606846976.000000000, toUInt8(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt8(0), -1152921504606846976.000000000 != toUInt8(0), -1152921504606846976.000000000 < toUInt8(0), -1152921504606846976.000000000 <= toUInt8(0), -1152921504606846976.000000000 > toUInt8(0), -1152921504606846976.000000000 >= toUInt8(0) , toInt8(0) = -1152921504606846976.000000000, toInt8(0) != -1152921504606846976.000000000, toInt8(0) < -1152921504606846976.000000000, toInt8(0) <= -1152921504606846976.000000000, toInt8(0) > -1152921504606846976.000000000, toInt8(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt8(0), -1152921504606846976.000000000 != toInt8(0), -1152921504606846976.000000000 < toInt8(0), -1152921504606846976.000000000 <= toInt8(0), -1152921504606846976.000000000 > toInt8(0), -1152921504606846976.000000000 >= toInt8(0) , toUInt16(0) = -1152921504606846976.000000000, toUInt16(0) != -1152921504606846976.000000000, toUInt16(0) < -1152921504606846976.000000000, toUInt16(0) <= -1152921504606846976.000000000, toUInt16(0) > -1152921504606846976.000000000, toUInt16(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt16(0), -1152921504606846976.000000000 != toUInt16(0), -1152921504606846976.000000000 < toUInt16(0), -1152921504606846976.000000000 <= toUInt16(0), -1152921504606846976.000000000 > toUInt16(0), -1152921504606846976.000000000 >= toUInt16(0) , toInt16(0) = -1152921504606846976.000000000, toInt16(0) != -1152921504606846976.000000000, toInt16(0) < -1152921504606846976.000000000, toInt16(0) <= -1152921504606846976.000000000, toInt16(0) > -1152921504606846976.000000000, toInt16(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt16(0), -1152921504606846976.000000000 != toInt16(0), -1152921504606846976.000000000 < toInt16(0), -1152921504606846976.000000000 <= toInt16(0), -1152921504606846976.000000000 > toInt16(0), -1152921504606846976.000000000 >= toInt16(0) , toUInt32(0) = -1152921504606846976.000000000, toUInt32(0) != -1152921504606846976.000000000, toUInt32(0) < -1152921504606846976.000000000, toUInt32(0) <= -1152921504606846976.000000000, toUInt32(0) > -1152921504606846976.000000000, toUInt32(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt32(0), -1152921504606846976.000000000 != toUInt32(0), -1152921504606846976.000000000 < toUInt32(0), -1152921504606846976.000000000 <= toUInt32(0), -1152921504606846976.000000000 > toUInt32(0), -1152921504606846976.000000000 >= toUInt32(0) , toInt32(0) = -1152921504606846976.000000000, toInt32(0) != -1152921504606846976.000000000, toInt32(0) < -1152921504606846976.000000000, toInt32(0) <= -1152921504606846976.000000000, toInt32(0) > -1152921504606846976.000000000, toInt32(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt32(0), -1152921504606846976.000000000 != toInt32(0), -1152921504606846976.000000000 < toInt32(0), -1152921504606846976.000000000 <= toInt32(0), -1152921504606846976.000000000 > toInt32(0), -1152921504606846976.000000000 >= toInt32(0) , toUInt64(0) = -1152921504606846976.000000000, toUInt64(0) != -1152921504606846976.000000000, toUInt64(0) < -1152921504606846976.000000000, toUInt64(0) <= -1152921504606846976.000000000, toUInt64(0) > -1152921504606846976.000000000, toUInt64(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt64(0), -1152921504606846976.000000000 != toUInt64(0), -1152921504606846976.000000000 < toUInt64(0), -1152921504606846976.000000000 <= toUInt64(0), -1152921504606846976.000000000 > toUInt64(0), -1152921504606846976.000000000 >= toUInt64(0) , toInt64(0) = -1152921504606846976.000000000, toInt64(0) != -1152921504606846976.000000000, toInt64(0) < -1152921504606846976.000000000, toInt64(0) <= -1152921504606846976.000000000, toInt64(0) > -1152921504606846976.000000000, toInt64(0) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt64(0), -1152921504606846976.000000000 != toInt64(0), -1152921504606846976.000000000 < toInt64(0), -1152921504606846976.000000000 <= toInt64(0), -1152921504606846976.000000000 > toInt64(0), -1152921504606846976.000000000 >= toInt64(0) ;
+SELECT '0', '-9223372036854786048.000000000', 0 = -9223372036854786048.000000000, 0 != -9223372036854786048.000000000, 0 < -9223372036854786048.000000000, 0 <= -9223372036854786048.000000000, 0 > -9223372036854786048.000000000, 0 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = 0, -9223372036854786048.000000000 != 0, -9223372036854786048.000000000 < 0, -9223372036854786048.000000000 <= 0, -9223372036854786048.000000000 > 0, -9223372036854786048.000000000 >= 0 , toUInt8(0) = -9223372036854786048.000000000, toUInt8(0) != -9223372036854786048.000000000, toUInt8(0) < -9223372036854786048.000000000, toUInt8(0) <= -9223372036854786048.000000000, toUInt8(0) > -9223372036854786048.000000000, toUInt8(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt8(0), -9223372036854786048.000000000 != toUInt8(0), -9223372036854786048.000000000 < toUInt8(0), -9223372036854786048.000000000 <= toUInt8(0), -9223372036854786048.000000000 > toUInt8(0), -9223372036854786048.000000000 >= toUInt8(0) , toInt8(0) = -9223372036854786048.000000000, toInt8(0) != -9223372036854786048.000000000, toInt8(0) < -9223372036854786048.000000000, toInt8(0) <= -9223372036854786048.000000000, toInt8(0) > -9223372036854786048.000000000, toInt8(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt8(0), -9223372036854786048.000000000 != toInt8(0), -9223372036854786048.000000000 < toInt8(0), -9223372036854786048.000000000 <= toInt8(0), -9223372036854786048.000000000 > toInt8(0), -9223372036854786048.000000000 >= toInt8(0) , toUInt16(0) = -9223372036854786048.000000000, toUInt16(0) != -9223372036854786048.000000000, toUInt16(0) < -9223372036854786048.000000000, toUInt16(0) <= -9223372036854786048.000000000, toUInt16(0) > -9223372036854786048.000000000, toUInt16(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt16(0), -9223372036854786048.000000000 != toUInt16(0), -9223372036854786048.000000000 < toUInt16(0), -9223372036854786048.000000000 <= toUInt16(0), -9223372036854786048.000000000 > toUInt16(0), -9223372036854786048.000000000 >= toUInt16(0) , toInt16(0) = -9223372036854786048.000000000, toInt16(0) != -9223372036854786048.000000000, toInt16(0) < -9223372036854786048.000000000, toInt16(0) <= -9223372036854786048.000000000, toInt16(0) > -9223372036854786048.000000000, toInt16(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt16(0), -9223372036854786048.000000000 != toInt16(0), -9223372036854786048.000000000 < toInt16(0), -9223372036854786048.000000000 <= toInt16(0), -9223372036854786048.000000000 > toInt16(0), -9223372036854786048.000000000 >= toInt16(0) , toUInt32(0) = -9223372036854786048.000000000, toUInt32(0) != -9223372036854786048.000000000, toUInt32(0) < -9223372036854786048.000000000, toUInt32(0) <= -9223372036854786048.000000000, toUInt32(0) > -9223372036854786048.000000000, toUInt32(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt32(0), -9223372036854786048.000000000 != toUInt32(0), -9223372036854786048.000000000 < toUInt32(0), -9223372036854786048.000000000 <= toUInt32(0), -9223372036854786048.000000000 > toUInt32(0), -9223372036854786048.000000000 >= toUInt32(0) , toInt32(0) = -9223372036854786048.000000000, toInt32(0) != -9223372036854786048.000000000, toInt32(0) < -9223372036854786048.000000000, toInt32(0) <= -9223372036854786048.000000000, toInt32(0) > -9223372036854786048.000000000, toInt32(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt32(0), -9223372036854786048.000000000 != toInt32(0), -9223372036854786048.000000000 < toInt32(0), -9223372036854786048.000000000 <= toInt32(0), -9223372036854786048.000000000 > toInt32(0), -9223372036854786048.000000000 >= toInt32(0) , toUInt64(0) = -9223372036854786048.000000000, toUInt64(0) != -9223372036854786048.000000000, toUInt64(0) < -9223372036854786048.000000000, toUInt64(0) <= -9223372036854786048.000000000, toUInt64(0) > -9223372036854786048.000000000, toUInt64(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt64(0), -9223372036854786048.000000000 != toUInt64(0), -9223372036854786048.000000000 < toUInt64(0), -9223372036854786048.000000000 <= toUInt64(0), -9223372036854786048.000000000 > toUInt64(0), -9223372036854786048.000000000 >= toUInt64(0) , toInt64(0) = -9223372036854786048.000000000, toInt64(0) != -9223372036854786048.000000000, toInt64(0) < -9223372036854786048.000000000, toInt64(0) <= -9223372036854786048.000000000, toInt64(0) > -9223372036854786048.000000000, toInt64(0) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt64(0), -9223372036854786048.000000000 != toInt64(0), -9223372036854786048.000000000 < toInt64(0), -9223372036854786048.000000000 <= toInt64(0), -9223372036854786048.000000000 > toInt64(0), -9223372036854786048.000000000 >= toInt64(0) ;
+SELECT '0', '9223372036854786048.000000000', 0 = 9223372036854786048.000000000, 0 != 9223372036854786048.000000000, 0 < 9223372036854786048.000000000, 0 <= 9223372036854786048.000000000, 0 > 9223372036854786048.000000000, 0 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = 0, 9223372036854786048.000000000 != 0, 9223372036854786048.000000000 < 0, 9223372036854786048.000000000 <= 0, 9223372036854786048.000000000 > 0, 9223372036854786048.000000000 >= 0 , toUInt8(0) = 9223372036854786048.000000000, toUInt8(0) != 9223372036854786048.000000000, toUInt8(0) < 9223372036854786048.000000000, toUInt8(0) <= 9223372036854786048.000000000, toUInt8(0) > 9223372036854786048.000000000, toUInt8(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt8(0), 9223372036854786048.000000000 != toUInt8(0), 9223372036854786048.000000000 < toUInt8(0), 9223372036854786048.000000000 <= toUInt8(0), 9223372036854786048.000000000 > toUInt8(0), 9223372036854786048.000000000 >= toUInt8(0) , toInt8(0) = 9223372036854786048.000000000, toInt8(0) != 9223372036854786048.000000000, toInt8(0) < 9223372036854786048.000000000, toInt8(0) <= 9223372036854786048.000000000, toInt8(0) > 9223372036854786048.000000000, toInt8(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt8(0), 9223372036854786048.000000000 != toInt8(0), 9223372036854786048.000000000 < toInt8(0), 9223372036854786048.000000000 <= toInt8(0), 9223372036854786048.000000000 > toInt8(0), 9223372036854786048.000000000 >= toInt8(0) , toUInt16(0) = 9223372036854786048.000000000, toUInt16(0) != 9223372036854786048.000000000, toUInt16(0) < 9223372036854786048.000000000, toUInt16(0) <= 9223372036854786048.000000000, toUInt16(0) > 9223372036854786048.000000000, toUInt16(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt16(0), 9223372036854786048.000000000 != toUInt16(0), 9223372036854786048.000000000 < toUInt16(0), 9223372036854786048.000000000 <= toUInt16(0), 9223372036854786048.000000000 > toUInt16(0), 9223372036854786048.000000000 >= toUInt16(0) , toInt16(0) = 9223372036854786048.000000000, toInt16(0) != 9223372036854786048.000000000, toInt16(0) < 9223372036854786048.000000000, toInt16(0) <= 9223372036854786048.000000000, toInt16(0) > 9223372036854786048.000000000, toInt16(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt16(0), 9223372036854786048.000000000 != toInt16(0), 9223372036854786048.000000000 < toInt16(0), 9223372036854786048.000000000 <= toInt16(0), 9223372036854786048.000000000 > toInt16(0), 9223372036854786048.000000000 >= toInt16(0) , toUInt32(0) = 9223372036854786048.000000000, toUInt32(0) != 9223372036854786048.000000000, toUInt32(0) < 9223372036854786048.000000000, toUInt32(0) <= 9223372036854786048.000000000, toUInt32(0) > 9223372036854786048.000000000, toUInt32(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt32(0), 9223372036854786048.000000000 != toUInt32(0), 9223372036854786048.000000000 < toUInt32(0), 9223372036854786048.000000000 <= toUInt32(0), 9223372036854786048.000000000 > toUInt32(0), 9223372036854786048.000000000 >= toUInt32(0) , toInt32(0) = 9223372036854786048.000000000, toInt32(0) != 9223372036854786048.000000000, toInt32(0) < 9223372036854786048.000000000, toInt32(0) <= 9223372036854786048.000000000, toInt32(0) > 9223372036854786048.000000000, toInt32(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt32(0), 9223372036854786048.000000000 != toInt32(0), 9223372036854786048.000000000 < toInt32(0), 9223372036854786048.000000000 <= toInt32(0), 9223372036854786048.000000000 > toInt32(0), 9223372036854786048.000000000 >= toInt32(0) , toUInt64(0) = 9223372036854786048.000000000, toUInt64(0) != 9223372036854786048.000000000, toUInt64(0) < 9223372036854786048.000000000, toUInt64(0) <= 9223372036854786048.000000000, toUInt64(0) > 9223372036854786048.000000000, toUInt64(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt64(0), 9223372036854786048.000000000 != toUInt64(0), 9223372036854786048.000000000 < toUInt64(0), 9223372036854786048.000000000 <= toUInt64(0), 9223372036854786048.000000000 > toUInt64(0), 9223372036854786048.000000000 >= toUInt64(0) , toInt64(0) = 9223372036854786048.000000000, toInt64(0) != 9223372036854786048.000000000, toInt64(0) < 9223372036854786048.000000000, toInt64(0) <= 9223372036854786048.000000000, toInt64(0) > 9223372036854786048.000000000, toInt64(0) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt64(0), 9223372036854786048.000000000 != toInt64(0), 9223372036854786048.000000000 < toInt64(0), 9223372036854786048.000000000 <= toInt64(0), 9223372036854786048.000000000 > toInt64(0), 9223372036854786048.000000000 >= toInt64(0) ;
+SELECT '-1', '0.000000000', -1 = 0.000000000, -1 != 0.000000000, -1 < 0.000000000, -1 <= 0.000000000, -1 > 0.000000000, -1 >= 0.000000000,	0.000000000 = -1, 0.000000000 != -1, 0.000000000 < -1, 0.000000000 <= -1, 0.000000000 > -1, 0.000000000 >= -1 , toInt8(-1) = 0.000000000, toInt8(-1) != 0.000000000, toInt8(-1) < 0.000000000, toInt8(-1) <= 0.000000000, toInt8(-1) > 0.000000000, toInt8(-1) >= 0.000000000,	0.000000000 = toInt8(-1), 0.000000000 != toInt8(-1), 0.000000000 < toInt8(-1), 0.000000000 <= toInt8(-1), 0.000000000 > toInt8(-1), 0.000000000 >= toInt8(-1) , toInt16(-1) = 0.000000000, toInt16(-1) != 0.000000000, toInt16(-1) < 0.000000000, toInt16(-1) <= 0.000000000, toInt16(-1) > 0.000000000, toInt16(-1) >= 0.000000000,	0.000000000 = toInt16(-1), 0.000000000 != toInt16(-1), 0.000000000 < toInt16(-1), 0.000000000 <= toInt16(-1), 0.000000000 > toInt16(-1), 0.000000000 >= toInt16(-1) , toInt32(-1) = 0.000000000, toInt32(-1) != 0.000000000, toInt32(-1) < 0.000000000, toInt32(-1) <= 0.000000000, toInt32(-1) > 0.000000000, toInt32(-1) >= 0.000000000,	0.000000000 = toInt32(-1), 0.000000000 != toInt32(-1), 0.000000000 < toInt32(-1), 0.000000000 <= toInt32(-1), 0.000000000 > toInt32(-1), 0.000000000 >= toInt32(-1) , toInt64(-1) = 0.000000000, toInt64(-1) != 0.000000000, toInt64(-1) < 0.000000000, toInt64(-1) <= 0.000000000, toInt64(-1) > 0.000000000, toInt64(-1) >= 0.000000000,	0.000000000 = toInt64(-1), 0.000000000 != toInt64(-1), 0.000000000 < toInt64(-1), 0.000000000 <= toInt64(-1), 0.000000000 > toInt64(-1), 0.000000000 >= toInt64(-1) ;
+SELECT '-1', '-1.000000000', -1 = -1.000000000, -1 != -1.000000000, -1 < -1.000000000, -1 <= -1.000000000, -1 > -1.000000000, -1 >= -1.000000000,	-1.000000000 = -1, -1.000000000 != -1, -1.000000000 < -1, -1.000000000 <= -1, -1.000000000 > -1, -1.000000000 >= -1 , toInt8(-1) = -1.000000000, toInt8(-1) != -1.000000000, toInt8(-1) < -1.000000000, toInt8(-1) <= -1.000000000, toInt8(-1) > -1.000000000, toInt8(-1) >= -1.000000000,	-1.000000000 = toInt8(-1), -1.000000000 != toInt8(-1), -1.000000000 < toInt8(-1), -1.000000000 <= toInt8(-1), -1.000000000 > toInt8(-1), -1.000000000 >= toInt8(-1) , toInt16(-1) = -1.000000000, toInt16(-1) != -1.000000000, toInt16(-1) < -1.000000000, toInt16(-1) <= -1.000000000, toInt16(-1) > -1.000000000, toInt16(-1) >= -1.000000000,	-1.000000000 = toInt16(-1), -1.000000000 != toInt16(-1), -1.000000000 < toInt16(-1), -1.000000000 <= toInt16(-1), -1.000000000 > toInt16(-1), -1.000000000 >= toInt16(-1) , toInt32(-1) = -1.000000000, toInt32(-1) != -1.000000000, toInt32(-1) < -1.000000000, toInt32(-1) <= -1.000000000, toInt32(-1) > -1.000000000, toInt32(-1) >= -1.000000000,	-1.000000000 = toInt32(-1), -1.000000000 != toInt32(-1), -1.000000000 < toInt32(-1), -1.000000000 <= toInt32(-1), -1.000000000 > toInt32(-1), -1.000000000 >= toInt32(-1) , toInt64(-1) = -1.000000000, toInt64(-1) != -1.000000000, toInt64(-1) < -1.000000000, toInt64(-1) <= -1.000000000, toInt64(-1) > -1.000000000, toInt64(-1) >= -1.000000000,	-1.000000000 = toInt64(-1), -1.000000000 != toInt64(-1), -1.000000000 < toInt64(-1), -1.000000000 <= toInt64(-1), -1.000000000 > toInt64(-1), -1.000000000 >= toInt64(-1) ;
+SELECT '-1', '1.000000000', -1 = 1.000000000, -1 != 1.000000000, -1 < 1.000000000, -1 <= 1.000000000, -1 > 1.000000000, -1 >= 1.000000000,	1.000000000 = -1, 1.000000000 != -1, 1.000000000 < -1, 1.000000000 <= -1, 1.000000000 > -1, 1.000000000 >= -1 , toInt8(-1) = 1.000000000, toInt8(-1) != 1.000000000, toInt8(-1) < 1.000000000, toInt8(-1) <= 1.000000000, toInt8(-1) > 1.000000000, toInt8(-1) >= 1.000000000,	1.000000000 = toInt8(-1), 1.000000000 != toInt8(-1), 1.000000000 < toInt8(-1), 1.000000000 <= toInt8(-1), 1.000000000 > toInt8(-1), 1.000000000 >= toInt8(-1) , toInt16(-1) = 1.000000000, toInt16(-1) != 1.000000000, toInt16(-1) < 1.000000000, toInt16(-1) <= 1.000000000, toInt16(-1) > 1.000000000, toInt16(-1) >= 1.000000000,	1.000000000 = toInt16(-1), 1.000000000 != toInt16(-1), 1.000000000 < toInt16(-1), 1.000000000 <= toInt16(-1), 1.000000000 > toInt16(-1), 1.000000000 >= toInt16(-1) , toInt32(-1) = 1.000000000, toInt32(-1) != 1.000000000, toInt32(-1) < 1.000000000, toInt32(-1) <= 1.000000000, toInt32(-1) > 1.000000000, toInt32(-1) >= 1.000000000,	1.000000000 = toInt32(-1), 1.000000000 != toInt32(-1), 1.000000000 < toInt32(-1), 1.000000000 <= toInt32(-1), 1.000000000 > toInt32(-1), 1.000000000 >= toInt32(-1) , toInt64(-1) = 1.000000000, toInt64(-1) != 1.000000000, toInt64(-1) < 1.000000000, toInt64(-1) <= 1.000000000, toInt64(-1) > 1.000000000, toInt64(-1) >= 1.000000000,	1.000000000 = toInt64(-1), 1.000000000 != toInt64(-1), 1.000000000 < toInt64(-1), 1.000000000 <= toInt64(-1), 1.000000000 > toInt64(-1), 1.000000000 >= toInt64(-1) ;
+SELECT '-1', '18446744073709551616.000000000', -1 = 18446744073709551616.000000000, -1 != 18446744073709551616.000000000, -1 < 18446744073709551616.000000000, -1 <= 18446744073709551616.000000000, -1 > 18446744073709551616.000000000, -1 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = -1, 18446744073709551616.000000000 != -1, 18446744073709551616.000000000 < -1, 18446744073709551616.000000000 <= -1, 18446744073709551616.000000000 > -1, 18446744073709551616.000000000 >= -1 , toInt8(-1) = 18446744073709551616.000000000, toInt8(-1) != 18446744073709551616.000000000, toInt8(-1) < 18446744073709551616.000000000, toInt8(-1) <= 18446744073709551616.000000000, toInt8(-1) > 18446744073709551616.000000000, toInt8(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt8(-1), 18446744073709551616.000000000 != toInt8(-1), 18446744073709551616.000000000 < toInt8(-1), 18446744073709551616.000000000 <= toInt8(-1), 18446744073709551616.000000000 > toInt8(-1), 18446744073709551616.000000000 >= toInt8(-1) , toInt16(-1) = 18446744073709551616.000000000, toInt16(-1) != 18446744073709551616.000000000, toInt16(-1) < 18446744073709551616.000000000, toInt16(-1) <= 18446744073709551616.000000000, toInt16(-1) > 18446744073709551616.000000000, toInt16(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt16(-1), 18446744073709551616.000000000 != toInt16(-1), 18446744073709551616.000000000 < toInt16(-1), 18446744073709551616.000000000 <= toInt16(-1), 18446744073709551616.000000000 > toInt16(-1), 18446744073709551616.000000000 >= toInt16(-1) , toInt32(-1) = 18446744073709551616.000000000, toInt32(-1) != 18446744073709551616.000000000, toInt32(-1) < 18446744073709551616.000000000, toInt32(-1) <= 18446744073709551616.000000000, toInt32(-1) > 18446744073709551616.000000000, toInt32(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt32(-1), 18446744073709551616.000000000 != toInt32(-1), 18446744073709551616.000000000 < toInt32(-1), 18446744073709551616.000000000 <= toInt32(-1), 18446744073709551616.000000000 > toInt32(-1), 18446744073709551616.000000000 >= toInt32(-1) , toInt64(-1) = 18446744073709551616.000000000, toInt64(-1) != 18446744073709551616.000000000, toInt64(-1) < 18446744073709551616.000000000, toInt64(-1) <= 18446744073709551616.000000000, toInt64(-1) > 18446744073709551616.000000000, toInt64(-1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt64(-1), 18446744073709551616.000000000 != toInt64(-1), 18446744073709551616.000000000 < toInt64(-1), 18446744073709551616.000000000 <= toInt64(-1), 18446744073709551616.000000000 > toInt64(-1), 18446744073709551616.000000000 >= toInt64(-1) ;
+SELECT '-1', '9223372036854775808.000000000', -1 = 9223372036854775808.000000000, -1 != 9223372036854775808.000000000, -1 < 9223372036854775808.000000000, -1 <= 9223372036854775808.000000000, -1 > 9223372036854775808.000000000, -1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = -1, 9223372036854775808.000000000 != -1, 9223372036854775808.000000000 < -1, 9223372036854775808.000000000 <= -1, 9223372036854775808.000000000 > -1, 9223372036854775808.000000000 >= -1 , toInt8(-1) = 9223372036854775808.000000000, toInt8(-1) != 9223372036854775808.000000000, toInt8(-1) < 9223372036854775808.000000000, toInt8(-1) <= 9223372036854775808.000000000, toInt8(-1) > 9223372036854775808.000000000, toInt8(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(-1), 9223372036854775808.000000000 != toInt8(-1), 9223372036854775808.000000000 < toInt8(-1), 9223372036854775808.000000000 <= toInt8(-1), 9223372036854775808.000000000 > toInt8(-1), 9223372036854775808.000000000 >= toInt8(-1) , toInt16(-1) = 9223372036854775808.000000000, toInt16(-1) != 9223372036854775808.000000000, toInt16(-1) < 9223372036854775808.000000000, toInt16(-1) <= 9223372036854775808.000000000, toInt16(-1) > 9223372036854775808.000000000, toInt16(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(-1), 9223372036854775808.000000000 != toInt16(-1), 9223372036854775808.000000000 < toInt16(-1), 9223372036854775808.000000000 <= toInt16(-1), 9223372036854775808.000000000 > toInt16(-1), 9223372036854775808.000000000 >= toInt16(-1) , toInt32(-1) = 9223372036854775808.000000000, toInt32(-1) != 9223372036854775808.000000000, toInt32(-1) < 9223372036854775808.000000000, toInt32(-1) <= 9223372036854775808.000000000, toInt32(-1) > 9223372036854775808.000000000, toInt32(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(-1), 9223372036854775808.000000000 != toInt32(-1), 9223372036854775808.000000000 < toInt32(-1), 9223372036854775808.000000000 <= toInt32(-1), 9223372036854775808.000000000 > toInt32(-1), 9223372036854775808.000000000 >= toInt32(-1) , toInt64(-1) = 9223372036854775808.000000000, toInt64(-1) != 9223372036854775808.000000000, toInt64(-1) < 9223372036854775808.000000000, toInt64(-1) <= 9223372036854775808.000000000, toInt64(-1) > 9223372036854775808.000000000, toInt64(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(-1), 9223372036854775808.000000000 != toInt64(-1), 9223372036854775808.000000000 < toInt64(-1), 9223372036854775808.000000000 <= toInt64(-1), 9223372036854775808.000000000 > toInt64(-1), 9223372036854775808.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9223372036854775808.000000000', -1 = -9223372036854775808.000000000, -1 != -9223372036854775808.000000000, -1 < -9223372036854775808.000000000, -1 <= -9223372036854775808.000000000, -1 > -9223372036854775808.000000000, -1 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = -1, -9223372036854775808.000000000 != -1, -9223372036854775808.000000000 < -1, -9223372036854775808.000000000 <= -1, -9223372036854775808.000000000 > -1, -9223372036854775808.000000000 >= -1 , toInt8(-1) = -9223372036854775808.000000000, toInt8(-1) != -9223372036854775808.000000000, toInt8(-1) < -9223372036854775808.000000000, toInt8(-1) <= -9223372036854775808.000000000, toInt8(-1) > -9223372036854775808.000000000, toInt8(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt8(-1), -9223372036854775808.000000000 != toInt8(-1), -9223372036854775808.000000000 < toInt8(-1), -9223372036854775808.000000000 <= toInt8(-1), -9223372036854775808.000000000 > toInt8(-1), -9223372036854775808.000000000 >= toInt8(-1) , toInt16(-1) = -9223372036854775808.000000000, toInt16(-1) != -9223372036854775808.000000000, toInt16(-1) < -9223372036854775808.000000000, toInt16(-1) <= -9223372036854775808.000000000, toInt16(-1) > -9223372036854775808.000000000, toInt16(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt16(-1), -9223372036854775808.000000000 != toInt16(-1), -9223372036854775808.000000000 < toInt16(-1), -9223372036854775808.000000000 <= toInt16(-1), -9223372036854775808.000000000 > toInt16(-1), -9223372036854775808.000000000 >= toInt16(-1) , toInt32(-1) = -9223372036854775808.000000000, toInt32(-1) != -9223372036854775808.000000000, toInt32(-1) < -9223372036854775808.000000000, toInt32(-1) <= -9223372036854775808.000000000, toInt32(-1) > -9223372036854775808.000000000, toInt32(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt32(-1), -9223372036854775808.000000000 != toInt32(-1), -9223372036854775808.000000000 < toInt32(-1), -9223372036854775808.000000000 <= toInt32(-1), -9223372036854775808.000000000 > toInt32(-1), -9223372036854775808.000000000 >= toInt32(-1) , toInt64(-1) = -9223372036854775808.000000000, toInt64(-1) != -9223372036854775808.000000000, toInt64(-1) < -9223372036854775808.000000000, toInt64(-1) <= -9223372036854775808.000000000, toInt64(-1) > -9223372036854775808.000000000, toInt64(-1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt64(-1), -9223372036854775808.000000000 != toInt64(-1), -9223372036854775808.000000000 < toInt64(-1), -9223372036854775808.000000000 <= toInt64(-1), -9223372036854775808.000000000 > toInt64(-1), -9223372036854775808.000000000 >= toInt64(-1) ;
+SELECT '-1', '9223372036854775808.000000000', -1 = 9223372036854775808.000000000, -1 != 9223372036854775808.000000000, -1 < 9223372036854775808.000000000, -1 <= 9223372036854775808.000000000, -1 > 9223372036854775808.000000000, -1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = -1, 9223372036854775808.000000000 != -1, 9223372036854775808.000000000 < -1, 9223372036854775808.000000000 <= -1, 9223372036854775808.000000000 > -1, 9223372036854775808.000000000 >= -1 , toInt8(-1) = 9223372036854775808.000000000, toInt8(-1) != 9223372036854775808.000000000, toInt8(-1) < 9223372036854775808.000000000, toInt8(-1) <= 9223372036854775808.000000000, toInt8(-1) > 9223372036854775808.000000000, toInt8(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(-1), 9223372036854775808.000000000 != toInt8(-1), 9223372036854775808.000000000 < toInt8(-1), 9223372036854775808.000000000 <= toInt8(-1), 9223372036854775808.000000000 > toInt8(-1), 9223372036854775808.000000000 >= toInt8(-1) , toInt16(-1) = 9223372036854775808.000000000, toInt16(-1) != 9223372036854775808.000000000, toInt16(-1) < 9223372036854775808.000000000, toInt16(-1) <= 9223372036854775808.000000000, toInt16(-1) > 9223372036854775808.000000000, toInt16(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(-1), 9223372036854775808.000000000 != toInt16(-1), 9223372036854775808.000000000 < toInt16(-1), 9223372036854775808.000000000 <= toInt16(-1), 9223372036854775808.000000000 > toInt16(-1), 9223372036854775808.000000000 >= toInt16(-1) , toInt32(-1) = 9223372036854775808.000000000, toInt32(-1) != 9223372036854775808.000000000, toInt32(-1) < 9223372036854775808.000000000, toInt32(-1) <= 9223372036854775808.000000000, toInt32(-1) > 9223372036854775808.000000000, toInt32(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(-1), 9223372036854775808.000000000 != toInt32(-1), 9223372036854775808.000000000 < toInt32(-1), 9223372036854775808.000000000 <= toInt32(-1), 9223372036854775808.000000000 > toInt32(-1), 9223372036854775808.000000000 >= toInt32(-1) , toInt64(-1) = 9223372036854775808.000000000, toInt64(-1) != 9223372036854775808.000000000, toInt64(-1) < 9223372036854775808.000000000, toInt64(-1) <= 9223372036854775808.000000000, toInt64(-1) > 9223372036854775808.000000000, toInt64(-1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(-1), 9223372036854775808.000000000 != toInt64(-1), 9223372036854775808.000000000 < toInt64(-1), 9223372036854775808.000000000 <= toInt64(-1), 9223372036854775808.000000000 > toInt64(-1), 9223372036854775808.000000000 >= toInt64(-1) ;
+SELECT '-1', '2251799813685248.000000000', -1 = 2251799813685248.000000000, -1 != 2251799813685248.000000000, -1 < 2251799813685248.000000000, -1 <= 2251799813685248.000000000, -1 > 2251799813685248.000000000, -1 >= 2251799813685248.000000000,	2251799813685248.000000000 = -1, 2251799813685248.000000000 != -1, 2251799813685248.000000000 < -1, 2251799813685248.000000000 <= -1, 2251799813685248.000000000 > -1, 2251799813685248.000000000 >= -1 , toInt8(-1) = 2251799813685248.000000000, toInt8(-1) != 2251799813685248.000000000, toInt8(-1) < 2251799813685248.000000000, toInt8(-1) <= 2251799813685248.000000000, toInt8(-1) > 2251799813685248.000000000, toInt8(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt8(-1), 2251799813685248.000000000 != toInt8(-1), 2251799813685248.000000000 < toInt8(-1), 2251799813685248.000000000 <= toInt8(-1), 2251799813685248.000000000 > toInt8(-1), 2251799813685248.000000000 >= toInt8(-1) , toInt16(-1) = 2251799813685248.000000000, toInt16(-1) != 2251799813685248.000000000, toInt16(-1) < 2251799813685248.000000000, toInt16(-1) <= 2251799813685248.000000000, toInt16(-1) > 2251799813685248.000000000, toInt16(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt16(-1), 2251799813685248.000000000 != toInt16(-1), 2251799813685248.000000000 < toInt16(-1), 2251799813685248.000000000 <= toInt16(-1), 2251799813685248.000000000 > toInt16(-1), 2251799813685248.000000000 >= toInt16(-1) , toInt32(-1) = 2251799813685248.000000000, toInt32(-1) != 2251799813685248.000000000, toInt32(-1) < 2251799813685248.000000000, toInt32(-1) <= 2251799813685248.000000000, toInt32(-1) > 2251799813685248.000000000, toInt32(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt32(-1), 2251799813685248.000000000 != toInt32(-1), 2251799813685248.000000000 < toInt32(-1), 2251799813685248.000000000 <= toInt32(-1), 2251799813685248.000000000 > toInt32(-1), 2251799813685248.000000000 >= toInt32(-1) , toInt64(-1) = 2251799813685248.000000000, toInt64(-1) != 2251799813685248.000000000, toInt64(-1) < 2251799813685248.000000000, toInt64(-1) <= 2251799813685248.000000000, toInt64(-1) > 2251799813685248.000000000, toInt64(-1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt64(-1), 2251799813685248.000000000 != toInt64(-1), 2251799813685248.000000000 < toInt64(-1), 2251799813685248.000000000 <= toInt64(-1), 2251799813685248.000000000 > toInt64(-1), 2251799813685248.000000000 >= toInt64(-1) ;
+SELECT '-1', '4503599627370496.000000000', -1 = 4503599627370496.000000000, -1 != 4503599627370496.000000000, -1 < 4503599627370496.000000000, -1 <= 4503599627370496.000000000, -1 > 4503599627370496.000000000, -1 >= 4503599627370496.000000000,	4503599627370496.000000000 = -1, 4503599627370496.000000000 != -1, 4503599627370496.000000000 < -1, 4503599627370496.000000000 <= -1, 4503599627370496.000000000 > -1, 4503599627370496.000000000 >= -1 , toInt8(-1) = 4503599627370496.000000000, toInt8(-1) != 4503599627370496.000000000, toInt8(-1) < 4503599627370496.000000000, toInt8(-1) <= 4503599627370496.000000000, toInt8(-1) > 4503599627370496.000000000, toInt8(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt8(-1), 4503599627370496.000000000 != toInt8(-1), 4503599627370496.000000000 < toInt8(-1), 4503599627370496.000000000 <= toInt8(-1), 4503599627370496.000000000 > toInt8(-1), 4503599627370496.000000000 >= toInt8(-1) , toInt16(-1) = 4503599627370496.000000000, toInt16(-1) != 4503599627370496.000000000, toInt16(-1) < 4503599627370496.000000000, toInt16(-1) <= 4503599627370496.000000000, toInt16(-1) > 4503599627370496.000000000, toInt16(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt16(-1), 4503599627370496.000000000 != toInt16(-1), 4503599627370496.000000000 < toInt16(-1), 4503599627370496.000000000 <= toInt16(-1), 4503599627370496.000000000 > toInt16(-1), 4503599627370496.000000000 >= toInt16(-1) , toInt32(-1) = 4503599627370496.000000000, toInt32(-1) != 4503599627370496.000000000, toInt32(-1) < 4503599627370496.000000000, toInt32(-1) <= 4503599627370496.000000000, toInt32(-1) > 4503599627370496.000000000, toInt32(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt32(-1), 4503599627370496.000000000 != toInt32(-1), 4503599627370496.000000000 < toInt32(-1), 4503599627370496.000000000 <= toInt32(-1), 4503599627370496.000000000 > toInt32(-1), 4503599627370496.000000000 >= toInt32(-1) , toInt64(-1) = 4503599627370496.000000000, toInt64(-1) != 4503599627370496.000000000, toInt64(-1) < 4503599627370496.000000000, toInt64(-1) <= 4503599627370496.000000000, toInt64(-1) > 4503599627370496.000000000, toInt64(-1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt64(-1), 4503599627370496.000000000 != toInt64(-1), 4503599627370496.000000000 < toInt64(-1), 4503599627370496.000000000 <= toInt64(-1), 4503599627370496.000000000 > toInt64(-1), 4503599627370496.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740991.000000000', -1 = 9007199254740991.000000000, -1 != 9007199254740991.000000000, -1 < 9007199254740991.000000000, -1 <= 9007199254740991.000000000, -1 > 9007199254740991.000000000, -1 >= 9007199254740991.000000000,	9007199254740991.000000000 = -1, 9007199254740991.000000000 != -1, 9007199254740991.000000000 < -1, 9007199254740991.000000000 <= -1, 9007199254740991.000000000 > -1, 9007199254740991.000000000 >= -1 , toInt8(-1) = 9007199254740991.000000000, toInt8(-1) != 9007199254740991.000000000, toInt8(-1) < 9007199254740991.000000000, toInt8(-1) <= 9007199254740991.000000000, toInt8(-1) > 9007199254740991.000000000, toInt8(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt8(-1), 9007199254740991.000000000 != toInt8(-1), 9007199254740991.000000000 < toInt8(-1), 9007199254740991.000000000 <= toInt8(-1), 9007199254740991.000000000 > toInt8(-1), 9007199254740991.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740991.000000000, toInt16(-1) != 9007199254740991.000000000, toInt16(-1) < 9007199254740991.000000000, toInt16(-1) <= 9007199254740991.000000000, toInt16(-1) > 9007199254740991.000000000, toInt16(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt16(-1), 9007199254740991.000000000 != toInt16(-1), 9007199254740991.000000000 < toInt16(-1), 9007199254740991.000000000 <= toInt16(-1), 9007199254740991.000000000 > toInt16(-1), 9007199254740991.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740991.000000000, toInt32(-1) != 9007199254740991.000000000, toInt32(-1) < 9007199254740991.000000000, toInt32(-1) <= 9007199254740991.000000000, toInt32(-1) > 9007199254740991.000000000, toInt32(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt32(-1), 9007199254740991.000000000 != toInt32(-1), 9007199254740991.000000000 < toInt32(-1), 9007199254740991.000000000 <= toInt32(-1), 9007199254740991.000000000 > toInt32(-1), 9007199254740991.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740991.000000000, toInt64(-1) != 9007199254740991.000000000, toInt64(-1) < 9007199254740991.000000000, toInt64(-1) <= 9007199254740991.000000000, toInt64(-1) > 9007199254740991.000000000, toInt64(-1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt64(-1), 9007199254740991.000000000 != toInt64(-1), 9007199254740991.000000000 < toInt64(-1), 9007199254740991.000000000 <= toInt64(-1), 9007199254740991.000000000 > toInt64(-1), 9007199254740991.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740992.000000000', -1 = 9007199254740992.000000000, -1 != 9007199254740992.000000000, -1 < 9007199254740992.000000000, -1 <= 9007199254740992.000000000, -1 > 9007199254740992.000000000, -1 >= 9007199254740992.000000000,	9007199254740992.000000000 = -1, 9007199254740992.000000000 != -1, 9007199254740992.000000000 < -1, 9007199254740992.000000000 <= -1, 9007199254740992.000000000 > -1, 9007199254740992.000000000 >= -1 , toInt8(-1) = 9007199254740992.000000000, toInt8(-1) != 9007199254740992.000000000, toInt8(-1) < 9007199254740992.000000000, toInt8(-1) <= 9007199254740992.000000000, toInt8(-1) > 9007199254740992.000000000, toInt8(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(-1), 9007199254740992.000000000 != toInt8(-1), 9007199254740992.000000000 < toInt8(-1), 9007199254740992.000000000 <= toInt8(-1), 9007199254740992.000000000 > toInt8(-1), 9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740992.000000000, toInt16(-1) != 9007199254740992.000000000, toInt16(-1) < 9007199254740992.000000000, toInt16(-1) <= 9007199254740992.000000000, toInt16(-1) > 9007199254740992.000000000, toInt16(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(-1), 9007199254740992.000000000 != toInt16(-1), 9007199254740992.000000000 < toInt16(-1), 9007199254740992.000000000 <= toInt16(-1), 9007199254740992.000000000 > toInt16(-1), 9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740992.000000000, toInt32(-1) != 9007199254740992.000000000, toInt32(-1) < 9007199254740992.000000000, toInt32(-1) <= 9007199254740992.000000000, toInt32(-1) > 9007199254740992.000000000, toInt32(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(-1), 9007199254740992.000000000 != toInt32(-1), 9007199254740992.000000000 < toInt32(-1), 9007199254740992.000000000 <= toInt32(-1), 9007199254740992.000000000 > toInt32(-1), 9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740992.000000000, toInt64(-1) != 9007199254740992.000000000, toInt64(-1) < 9007199254740992.000000000, toInt64(-1) <= 9007199254740992.000000000, toInt64(-1) > 9007199254740992.000000000, toInt64(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(-1), 9007199254740992.000000000 != toInt64(-1), 9007199254740992.000000000 < toInt64(-1), 9007199254740992.000000000 <= toInt64(-1), 9007199254740992.000000000 > toInt64(-1), 9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740992.000000000', -1 = 9007199254740992.000000000, -1 != 9007199254740992.000000000, -1 < 9007199254740992.000000000, -1 <= 9007199254740992.000000000, -1 > 9007199254740992.000000000, -1 >= 9007199254740992.000000000,	9007199254740992.000000000 = -1, 9007199254740992.000000000 != -1, 9007199254740992.000000000 < -1, 9007199254740992.000000000 <= -1, 9007199254740992.000000000 > -1, 9007199254740992.000000000 >= -1 , toInt8(-1) = 9007199254740992.000000000, toInt8(-1) != 9007199254740992.000000000, toInt8(-1) < 9007199254740992.000000000, toInt8(-1) <= 9007199254740992.000000000, toInt8(-1) > 9007199254740992.000000000, toInt8(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(-1), 9007199254740992.000000000 != toInt8(-1), 9007199254740992.000000000 < toInt8(-1), 9007199254740992.000000000 <= toInt8(-1), 9007199254740992.000000000 > toInt8(-1), 9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740992.000000000, toInt16(-1) != 9007199254740992.000000000, toInt16(-1) < 9007199254740992.000000000, toInt16(-1) <= 9007199254740992.000000000, toInt16(-1) > 9007199254740992.000000000, toInt16(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(-1), 9007199254740992.000000000 != toInt16(-1), 9007199254740992.000000000 < toInt16(-1), 9007199254740992.000000000 <= toInt16(-1), 9007199254740992.000000000 > toInt16(-1), 9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740992.000000000, toInt32(-1) != 9007199254740992.000000000, toInt32(-1) < 9007199254740992.000000000, toInt32(-1) <= 9007199254740992.000000000, toInt32(-1) > 9007199254740992.000000000, toInt32(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(-1), 9007199254740992.000000000 != toInt32(-1), 9007199254740992.000000000 < toInt32(-1), 9007199254740992.000000000 <= toInt32(-1), 9007199254740992.000000000 > toInt32(-1), 9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740992.000000000, toInt64(-1) != 9007199254740992.000000000, toInt64(-1) < 9007199254740992.000000000, toInt64(-1) <= 9007199254740992.000000000, toInt64(-1) > 9007199254740992.000000000, toInt64(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(-1), 9007199254740992.000000000 != toInt64(-1), 9007199254740992.000000000 < toInt64(-1), 9007199254740992.000000000 <= toInt64(-1), 9007199254740992.000000000 > toInt64(-1), 9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740994.000000000', -1 = 9007199254740994.000000000, -1 != 9007199254740994.000000000, -1 < 9007199254740994.000000000, -1 <= 9007199254740994.000000000, -1 > 9007199254740994.000000000, -1 >= 9007199254740994.000000000,	9007199254740994.000000000 = -1, 9007199254740994.000000000 != -1, 9007199254740994.000000000 < -1, 9007199254740994.000000000 <= -1, 9007199254740994.000000000 > -1, 9007199254740994.000000000 >= -1 , toInt8(-1) = 9007199254740994.000000000, toInt8(-1) != 9007199254740994.000000000, toInt8(-1) < 9007199254740994.000000000, toInt8(-1) <= 9007199254740994.000000000, toInt8(-1) > 9007199254740994.000000000, toInt8(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt8(-1), 9007199254740994.000000000 != toInt8(-1), 9007199254740994.000000000 < toInt8(-1), 9007199254740994.000000000 <= toInt8(-1), 9007199254740994.000000000 > toInt8(-1), 9007199254740994.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740994.000000000, toInt16(-1) != 9007199254740994.000000000, toInt16(-1) < 9007199254740994.000000000, toInt16(-1) <= 9007199254740994.000000000, toInt16(-1) > 9007199254740994.000000000, toInt16(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt16(-1), 9007199254740994.000000000 != toInt16(-1), 9007199254740994.000000000 < toInt16(-1), 9007199254740994.000000000 <= toInt16(-1), 9007199254740994.000000000 > toInt16(-1), 9007199254740994.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740994.000000000, toInt32(-1) != 9007199254740994.000000000, toInt32(-1) < 9007199254740994.000000000, toInt32(-1) <= 9007199254740994.000000000, toInt32(-1) > 9007199254740994.000000000, toInt32(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt32(-1), 9007199254740994.000000000 != toInt32(-1), 9007199254740994.000000000 < toInt32(-1), 9007199254740994.000000000 <= toInt32(-1), 9007199254740994.000000000 > toInt32(-1), 9007199254740994.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740994.000000000, toInt64(-1) != 9007199254740994.000000000, toInt64(-1) < 9007199254740994.000000000, toInt64(-1) <= 9007199254740994.000000000, toInt64(-1) > 9007199254740994.000000000, toInt64(-1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt64(-1), 9007199254740994.000000000 != toInt64(-1), 9007199254740994.000000000 < toInt64(-1), 9007199254740994.000000000 <= toInt64(-1), 9007199254740994.000000000 > toInt64(-1), 9007199254740994.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740991.000000000', -1 = -9007199254740991.000000000, -1 != -9007199254740991.000000000, -1 < -9007199254740991.000000000, -1 <= -9007199254740991.000000000, -1 > -9007199254740991.000000000, -1 >= -9007199254740991.000000000,	-9007199254740991.000000000 = -1, -9007199254740991.000000000 != -1, -9007199254740991.000000000 < -1, -9007199254740991.000000000 <= -1, -9007199254740991.000000000 > -1, -9007199254740991.000000000 >= -1 , toInt8(-1) = -9007199254740991.000000000, toInt8(-1) != -9007199254740991.000000000, toInt8(-1) < -9007199254740991.000000000, toInt8(-1) <= -9007199254740991.000000000, toInt8(-1) > -9007199254740991.000000000, toInt8(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt8(-1), -9007199254740991.000000000 != toInt8(-1), -9007199254740991.000000000 < toInt8(-1), -9007199254740991.000000000 <= toInt8(-1), -9007199254740991.000000000 > toInt8(-1), -9007199254740991.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740991.000000000, toInt16(-1) != -9007199254740991.000000000, toInt16(-1) < -9007199254740991.000000000, toInt16(-1) <= -9007199254740991.000000000, toInt16(-1) > -9007199254740991.000000000, toInt16(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt16(-1), -9007199254740991.000000000 != toInt16(-1), -9007199254740991.000000000 < toInt16(-1), -9007199254740991.000000000 <= toInt16(-1), -9007199254740991.000000000 > toInt16(-1), -9007199254740991.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740991.000000000, toInt32(-1) != -9007199254740991.000000000, toInt32(-1) < -9007199254740991.000000000, toInt32(-1) <= -9007199254740991.000000000, toInt32(-1) > -9007199254740991.000000000, toInt32(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt32(-1), -9007199254740991.000000000 != toInt32(-1), -9007199254740991.000000000 < toInt32(-1), -9007199254740991.000000000 <= toInt32(-1), -9007199254740991.000000000 > toInt32(-1), -9007199254740991.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740991.000000000, toInt64(-1) != -9007199254740991.000000000, toInt64(-1) < -9007199254740991.000000000, toInt64(-1) <= -9007199254740991.000000000, toInt64(-1) > -9007199254740991.000000000, toInt64(-1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt64(-1), -9007199254740991.000000000 != toInt64(-1), -9007199254740991.000000000 < toInt64(-1), -9007199254740991.000000000 <= toInt64(-1), -9007199254740991.000000000 > toInt64(-1), -9007199254740991.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740992.000000000', -1 = -9007199254740992.000000000, -1 != -9007199254740992.000000000, -1 < -9007199254740992.000000000, -1 <= -9007199254740992.000000000, -1 > -9007199254740992.000000000, -1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = -1, -9007199254740992.000000000 != -1, -9007199254740992.000000000 < -1, -9007199254740992.000000000 <= -1, -9007199254740992.000000000 > -1, -9007199254740992.000000000 >= -1 , toInt8(-1) = -9007199254740992.000000000, toInt8(-1) != -9007199254740992.000000000, toInt8(-1) < -9007199254740992.000000000, toInt8(-1) <= -9007199254740992.000000000, toInt8(-1) > -9007199254740992.000000000, toInt8(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(-1), -9007199254740992.000000000 != toInt8(-1), -9007199254740992.000000000 < toInt8(-1), -9007199254740992.000000000 <= toInt8(-1), -9007199254740992.000000000 > toInt8(-1), -9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740992.000000000, toInt16(-1) != -9007199254740992.000000000, toInt16(-1) < -9007199254740992.000000000, toInt16(-1) <= -9007199254740992.000000000, toInt16(-1) > -9007199254740992.000000000, toInt16(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(-1), -9007199254740992.000000000 != toInt16(-1), -9007199254740992.000000000 < toInt16(-1), -9007199254740992.000000000 <= toInt16(-1), -9007199254740992.000000000 > toInt16(-1), -9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740992.000000000, toInt32(-1) != -9007199254740992.000000000, toInt32(-1) < -9007199254740992.000000000, toInt32(-1) <= -9007199254740992.000000000, toInt32(-1) > -9007199254740992.000000000, toInt32(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(-1), -9007199254740992.000000000 != toInt32(-1), -9007199254740992.000000000 < toInt32(-1), -9007199254740992.000000000 <= toInt32(-1), -9007199254740992.000000000 > toInt32(-1), -9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740992.000000000, toInt64(-1) != -9007199254740992.000000000, toInt64(-1) < -9007199254740992.000000000, toInt64(-1) <= -9007199254740992.000000000, toInt64(-1) > -9007199254740992.000000000, toInt64(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(-1), -9007199254740992.000000000 != toInt64(-1), -9007199254740992.000000000 < toInt64(-1), -9007199254740992.000000000 <= toInt64(-1), -9007199254740992.000000000 > toInt64(-1), -9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740992.000000000', -1 = -9007199254740992.000000000, -1 != -9007199254740992.000000000, -1 < -9007199254740992.000000000, -1 <= -9007199254740992.000000000, -1 > -9007199254740992.000000000, -1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = -1, -9007199254740992.000000000 != -1, -9007199254740992.000000000 < -1, -9007199254740992.000000000 <= -1, -9007199254740992.000000000 > -1, -9007199254740992.000000000 >= -1 , toInt8(-1) = -9007199254740992.000000000, toInt8(-1) != -9007199254740992.000000000, toInt8(-1) < -9007199254740992.000000000, toInt8(-1) <= -9007199254740992.000000000, toInt8(-1) > -9007199254740992.000000000, toInt8(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(-1), -9007199254740992.000000000 != toInt8(-1), -9007199254740992.000000000 < toInt8(-1), -9007199254740992.000000000 <= toInt8(-1), -9007199254740992.000000000 > toInt8(-1), -9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740992.000000000, toInt16(-1) != -9007199254740992.000000000, toInt16(-1) < -9007199254740992.000000000, toInt16(-1) <= -9007199254740992.000000000, toInt16(-1) > -9007199254740992.000000000, toInt16(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(-1), -9007199254740992.000000000 != toInt16(-1), -9007199254740992.000000000 < toInt16(-1), -9007199254740992.000000000 <= toInt16(-1), -9007199254740992.000000000 > toInt16(-1), -9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740992.000000000, toInt32(-1) != -9007199254740992.000000000, toInt32(-1) < -9007199254740992.000000000, toInt32(-1) <= -9007199254740992.000000000, toInt32(-1) > -9007199254740992.000000000, toInt32(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(-1), -9007199254740992.000000000 != toInt32(-1), -9007199254740992.000000000 < toInt32(-1), -9007199254740992.000000000 <= toInt32(-1), -9007199254740992.000000000 > toInt32(-1), -9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740992.000000000, toInt64(-1) != -9007199254740992.000000000, toInt64(-1) < -9007199254740992.000000000, toInt64(-1) <= -9007199254740992.000000000, toInt64(-1) > -9007199254740992.000000000, toInt64(-1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(-1), -9007199254740992.000000000 != toInt64(-1), -9007199254740992.000000000 < toInt64(-1), -9007199254740992.000000000 <= toInt64(-1), -9007199254740992.000000000 > toInt64(-1), -9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9007199254740994.000000000', -1 = -9007199254740994.000000000, -1 != -9007199254740994.000000000, -1 < -9007199254740994.000000000, -1 <= -9007199254740994.000000000, -1 > -9007199254740994.000000000, -1 >= -9007199254740994.000000000,	-9007199254740994.000000000 = -1, -9007199254740994.000000000 != -1, -9007199254740994.000000000 < -1, -9007199254740994.000000000 <= -1, -9007199254740994.000000000 > -1, -9007199254740994.000000000 >= -1 , toInt8(-1) = -9007199254740994.000000000, toInt8(-1) != -9007199254740994.000000000, toInt8(-1) < -9007199254740994.000000000, toInt8(-1) <= -9007199254740994.000000000, toInt8(-1) > -9007199254740994.000000000, toInt8(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt8(-1), -9007199254740994.000000000 != toInt8(-1), -9007199254740994.000000000 < toInt8(-1), -9007199254740994.000000000 <= toInt8(-1), -9007199254740994.000000000 > toInt8(-1), -9007199254740994.000000000 >= toInt8(-1) , toInt16(-1) = -9007199254740994.000000000, toInt16(-1) != -9007199254740994.000000000, toInt16(-1) < -9007199254740994.000000000, toInt16(-1) <= -9007199254740994.000000000, toInt16(-1) > -9007199254740994.000000000, toInt16(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt16(-1), -9007199254740994.000000000 != toInt16(-1), -9007199254740994.000000000 < toInt16(-1), -9007199254740994.000000000 <= toInt16(-1), -9007199254740994.000000000 > toInt16(-1), -9007199254740994.000000000 >= toInt16(-1) , toInt32(-1) = -9007199254740994.000000000, toInt32(-1) != -9007199254740994.000000000, toInt32(-1) < -9007199254740994.000000000, toInt32(-1) <= -9007199254740994.000000000, toInt32(-1) > -9007199254740994.000000000, toInt32(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt32(-1), -9007199254740994.000000000 != toInt32(-1), -9007199254740994.000000000 < toInt32(-1), -9007199254740994.000000000 <= toInt32(-1), -9007199254740994.000000000 > toInt32(-1), -9007199254740994.000000000 >= toInt32(-1) , toInt64(-1) = -9007199254740994.000000000, toInt64(-1) != -9007199254740994.000000000, toInt64(-1) < -9007199254740994.000000000, toInt64(-1) <= -9007199254740994.000000000, toInt64(-1) > -9007199254740994.000000000, toInt64(-1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt64(-1), -9007199254740994.000000000 != toInt64(-1), -9007199254740994.000000000 < toInt64(-1), -9007199254740994.000000000 <= toInt64(-1), -9007199254740994.000000000 > toInt64(-1), -9007199254740994.000000000 >= toInt64(-1) ;
+SELECT '-1', '104.000000000', -1 = 104.000000000, -1 != 104.000000000, -1 < 104.000000000, -1 <= 104.000000000, -1 > 104.000000000, -1 >= 104.000000000,	104.000000000 = -1, 104.000000000 != -1, 104.000000000 < -1, 104.000000000 <= -1, 104.000000000 > -1, 104.000000000 >= -1 , toInt8(-1) = 104.000000000, toInt8(-1) != 104.000000000, toInt8(-1) < 104.000000000, toInt8(-1) <= 104.000000000, toInt8(-1) > 104.000000000, toInt8(-1) >= 104.000000000,	104.000000000 = toInt8(-1), 104.000000000 != toInt8(-1), 104.000000000 < toInt8(-1), 104.000000000 <= toInt8(-1), 104.000000000 > toInt8(-1), 104.000000000 >= toInt8(-1) , toInt16(-1) = 104.000000000, toInt16(-1) != 104.000000000, toInt16(-1) < 104.000000000, toInt16(-1) <= 104.000000000, toInt16(-1) > 104.000000000, toInt16(-1) >= 104.000000000,	104.000000000 = toInt16(-1), 104.000000000 != toInt16(-1), 104.000000000 < toInt16(-1), 104.000000000 <= toInt16(-1), 104.000000000 > toInt16(-1), 104.000000000 >= toInt16(-1) , toInt32(-1) = 104.000000000, toInt32(-1) != 104.000000000, toInt32(-1) < 104.000000000, toInt32(-1) <= 104.000000000, toInt32(-1) > 104.000000000, toInt32(-1) >= 104.000000000,	104.000000000 = toInt32(-1), 104.000000000 != toInt32(-1), 104.000000000 < toInt32(-1), 104.000000000 <= toInt32(-1), 104.000000000 > toInt32(-1), 104.000000000 >= toInt32(-1) , toInt64(-1) = 104.000000000, toInt64(-1) != 104.000000000, toInt64(-1) < 104.000000000, toInt64(-1) <= 104.000000000, toInt64(-1) > 104.000000000, toInt64(-1) >= 104.000000000,	104.000000000 = toInt64(-1), 104.000000000 != toInt64(-1), 104.000000000 < toInt64(-1), 104.000000000 <= toInt64(-1), 104.000000000 > toInt64(-1), 104.000000000 >= toInt64(-1) ;
+SELECT '-1', '-4503599627370496.000000000', -1 = -4503599627370496.000000000, -1 != -4503599627370496.000000000, -1 < -4503599627370496.000000000, -1 <= -4503599627370496.000000000, -1 > -4503599627370496.000000000, -1 >= -4503599627370496.000000000,	-4503599627370496.000000000 = -1, -4503599627370496.000000000 != -1, -4503599627370496.000000000 < -1, -4503599627370496.000000000 <= -1, -4503599627370496.000000000 > -1, -4503599627370496.000000000 >= -1 , toInt8(-1) = -4503599627370496.000000000, toInt8(-1) != -4503599627370496.000000000, toInt8(-1) < -4503599627370496.000000000, toInt8(-1) <= -4503599627370496.000000000, toInt8(-1) > -4503599627370496.000000000, toInt8(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt8(-1), -4503599627370496.000000000 != toInt8(-1), -4503599627370496.000000000 < toInt8(-1), -4503599627370496.000000000 <= toInt8(-1), -4503599627370496.000000000 > toInt8(-1), -4503599627370496.000000000 >= toInt8(-1) , toInt16(-1) = -4503599627370496.000000000, toInt16(-1) != -4503599627370496.000000000, toInt16(-1) < -4503599627370496.000000000, toInt16(-1) <= -4503599627370496.000000000, toInt16(-1) > -4503599627370496.000000000, toInt16(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt16(-1), -4503599627370496.000000000 != toInt16(-1), -4503599627370496.000000000 < toInt16(-1), -4503599627370496.000000000 <= toInt16(-1), -4503599627370496.000000000 > toInt16(-1), -4503599627370496.000000000 >= toInt16(-1) , toInt32(-1) = -4503599627370496.000000000, toInt32(-1) != -4503599627370496.000000000, toInt32(-1) < -4503599627370496.000000000, toInt32(-1) <= -4503599627370496.000000000, toInt32(-1) > -4503599627370496.000000000, toInt32(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt32(-1), -4503599627370496.000000000 != toInt32(-1), -4503599627370496.000000000 < toInt32(-1), -4503599627370496.000000000 <= toInt32(-1), -4503599627370496.000000000 > toInt32(-1), -4503599627370496.000000000 >= toInt32(-1) , toInt64(-1) = -4503599627370496.000000000, toInt64(-1) != -4503599627370496.000000000, toInt64(-1) < -4503599627370496.000000000, toInt64(-1) <= -4503599627370496.000000000, toInt64(-1) > -4503599627370496.000000000, toInt64(-1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt64(-1), -4503599627370496.000000000 != toInt64(-1), -4503599627370496.000000000 < toInt64(-1), -4503599627370496.000000000 <= toInt64(-1), -4503599627370496.000000000 > toInt64(-1), -4503599627370496.000000000 >= toInt64(-1) ;
+SELECT '-1', '-0.500000000', -1 = -0.500000000, -1 != -0.500000000, -1 < -0.500000000, -1 <= -0.500000000, -1 > -0.500000000, -1 >= -0.500000000,	-0.500000000 = -1, -0.500000000 != -1, -0.500000000 < -1, -0.500000000 <= -1, -0.500000000 > -1, -0.500000000 >= -1 , toInt8(-1) = -0.500000000, toInt8(-1) != -0.500000000, toInt8(-1) < -0.500000000, toInt8(-1) <= -0.500000000, toInt8(-1) > -0.500000000, toInt8(-1) >= -0.500000000,	-0.500000000 = toInt8(-1), -0.500000000 != toInt8(-1), -0.500000000 < toInt8(-1), -0.500000000 <= toInt8(-1), -0.500000000 > toInt8(-1), -0.500000000 >= toInt8(-1) , toInt16(-1) = -0.500000000, toInt16(-1) != -0.500000000, toInt16(-1) < -0.500000000, toInt16(-1) <= -0.500000000, toInt16(-1) > -0.500000000, toInt16(-1) >= -0.500000000,	-0.500000000 = toInt16(-1), -0.500000000 != toInt16(-1), -0.500000000 < toInt16(-1), -0.500000000 <= toInt16(-1), -0.500000000 > toInt16(-1), -0.500000000 >= toInt16(-1) , toInt32(-1) = -0.500000000, toInt32(-1) != -0.500000000, toInt32(-1) < -0.500000000, toInt32(-1) <= -0.500000000, toInt32(-1) > -0.500000000, toInt32(-1) >= -0.500000000,	-0.500000000 = toInt32(-1), -0.500000000 != toInt32(-1), -0.500000000 < toInt32(-1), -0.500000000 <= toInt32(-1), -0.500000000 > toInt32(-1), -0.500000000 >= toInt32(-1) , toInt64(-1) = -0.500000000, toInt64(-1) != -0.500000000, toInt64(-1) < -0.500000000, toInt64(-1) <= -0.500000000, toInt64(-1) > -0.500000000, toInt64(-1) >= -0.500000000,	-0.500000000 = toInt64(-1), -0.500000000 != toInt64(-1), -0.500000000 < toInt64(-1), -0.500000000 <= toInt64(-1), -0.500000000 > toInt64(-1), -0.500000000 >= toInt64(-1) ;
+SELECT '-1', '0.500000000', -1 = 0.500000000, -1 != 0.500000000, -1 < 0.500000000, -1 <= 0.500000000, -1 > 0.500000000, -1 >= 0.500000000,	0.500000000 = -1, 0.500000000 != -1, 0.500000000 < -1, 0.500000000 <= -1, 0.500000000 > -1, 0.500000000 >= -1 , toInt8(-1) = 0.500000000, toInt8(-1) != 0.500000000, toInt8(-1) < 0.500000000, toInt8(-1) <= 0.500000000, toInt8(-1) > 0.500000000, toInt8(-1) >= 0.500000000,	0.500000000 = toInt8(-1), 0.500000000 != toInt8(-1), 0.500000000 < toInt8(-1), 0.500000000 <= toInt8(-1), 0.500000000 > toInt8(-1), 0.500000000 >= toInt8(-1) , toInt16(-1) = 0.500000000, toInt16(-1) != 0.500000000, toInt16(-1) < 0.500000000, toInt16(-1) <= 0.500000000, toInt16(-1) > 0.500000000, toInt16(-1) >= 0.500000000,	0.500000000 = toInt16(-1), 0.500000000 != toInt16(-1), 0.500000000 < toInt16(-1), 0.500000000 <= toInt16(-1), 0.500000000 > toInt16(-1), 0.500000000 >= toInt16(-1) , toInt32(-1) = 0.500000000, toInt32(-1) != 0.500000000, toInt32(-1) < 0.500000000, toInt32(-1) <= 0.500000000, toInt32(-1) > 0.500000000, toInt32(-1) >= 0.500000000,	0.500000000 = toInt32(-1), 0.500000000 != toInt32(-1), 0.500000000 < toInt32(-1), 0.500000000 <= toInt32(-1), 0.500000000 > toInt32(-1), 0.500000000 >= toInt32(-1) , toInt64(-1) = 0.500000000, toInt64(-1) != 0.500000000, toInt64(-1) < 0.500000000, toInt64(-1) <= 0.500000000, toInt64(-1) > 0.500000000, toInt64(-1) >= 0.500000000,	0.500000000 = toInt64(-1), 0.500000000 != toInt64(-1), 0.500000000 < toInt64(-1), 0.500000000 <= toInt64(-1), 0.500000000 > toInt64(-1), 0.500000000 >= toInt64(-1) ;
+SELECT '-1', '-1.500000000', -1 = -1.500000000, -1 != -1.500000000, -1 < -1.500000000, -1 <= -1.500000000, -1 > -1.500000000, -1 >= -1.500000000,	-1.500000000 = -1, -1.500000000 != -1, -1.500000000 < -1, -1.500000000 <= -1, -1.500000000 > -1, -1.500000000 >= -1 , toInt8(-1) = -1.500000000, toInt8(-1) != -1.500000000, toInt8(-1) < -1.500000000, toInt8(-1) <= -1.500000000, toInt8(-1) > -1.500000000, toInt8(-1) >= -1.500000000,	-1.500000000 = toInt8(-1), -1.500000000 != toInt8(-1), -1.500000000 < toInt8(-1), -1.500000000 <= toInt8(-1), -1.500000000 > toInt8(-1), -1.500000000 >= toInt8(-1) , toInt16(-1) = -1.500000000, toInt16(-1) != -1.500000000, toInt16(-1) < -1.500000000, toInt16(-1) <= -1.500000000, toInt16(-1) > -1.500000000, toInt16(-1) >= -1.500000000,	-1.500000000 = toInt16(-1), -1.500000000 != toInt16(-1), -1.500000000 < toInt16(-1), -1.500000000 <= toInt16(-1), -1.500000000 > toInt16(-1), -1.500000000 >= toInt16(-1) , toInt32(-1) = -1.500000000, toInt32(-1) != -1.500000000, toInt32(-1) < -1.500000000, toInt32(-1) <= -1.500000000, toInt32(-1) > -1.500000000, toInt32(-1) >= -1.500000000,	-1.500000000 = toInt32(-1), -1.500000000 != toInt32(-1), -1.500000000 < toInt32(-1), -1.500000000 <= toInt32(-1), -1.500000000 > toInt32(-1), -1.500000000 >= toInt32(-1) , toInt64(-1) = -1.500000000, toInt64(-1) != -1.500000000, toInt64(-1) < -1.500000000, toInt64(-1) <= -1.500000000, toInt64(-1) > -1.500000000, toInt64(-1) >= -1.500000000,	-1.500000000 = toInt64(-1), -1.500000000 != toInt64(-1), -1.500000000 < toInt64(-1), -1.500000000 <= toInt64(-1), -1.500000000 > toInt64(-1), -1.500000000 >= toInt64(-1) ;
+SELECT '-1', '1.500000000', -1 = 1.500000000, -1 != 1.500000000, -1 < 1.500000000, -1 <= 1.500000000, -1 > 1.500000000, -1 >= 1.500000000,	1.500000000 = -1, 1.500000000 != -1, 1.500000000 < -1, 1.500000000 <= -1, 1.500000000 > -1, 1.500000000 >= -1 , toInt8(-1) = 1.500000000, toInt8(-1) != 1.500000000, toInt8(-1) < 1.500000000, toInt8(-1) <= 1.500000000, toInt8(-1) > 1.500000000, toInt8(-1) >= 1.500000000,	1.500000000 = toInt8(-1), 1.500000000 != toInt8(-1), 1.500000000 < toInt8(-1), 1.500000000 <= toInt8(-1), 1.500000000 > toInt8(-1), 1.500000000 >= toInt8(-1) , toInt16(-1) = 1.500000000, toInt16(-1) != 1.500000000, toInt16(-1) < 1.500000000, toInt16(-1) <= 1.500000000, toInt16(-1) > 1.500000000, toInt16(-1) >= 1.500000000,	1.500000000 = toInt16(-1), 1.500000000 != toInt16(-1), 1.500000000 < toInt16(-1), 1.500000000 <= toInt16(-1), 1.500000000 > toInt16(-1), 1.500000000 >= toInt16(-1) , toInt32(-1) = 1.500000000, toInt32(-1) != 1.500000000, toInt32(-1) < 1.500000000, toInt32(-1) <= 1.500000000, toInt32(-1) > 1.500000000, toInt32(-1) >= 1.500000000,	1.500000000 = toInt32(-1), 1.500000000 != toInt32(-1), 1.500000000 < toInt32(-1), 1.500000000 <= toInt32(-1), 1.500000000 > toInt32(-1), 1.500000000 >= toInt32(-1) , toInt64(-1) = 1.500000000, toInt64(-1) != 1.500000000, toInt64(-1) < 1.500000000, toInt64(-1) <= 1.500000000, toInt64(-1) > 1.500000000, toInt64(-1) >= 1.500000000,	1.500000000 = toInt64(-1), 1.500000000 != toInt64(-1), 1.500000000 < toInt64(-1), 1.500000000 <= toInt64(-1), 1.500000000 > toInt64(-1), 1.500000000 >= toInt64(-1) ;
+SELECT '-1', '9007199254740992.000000000', -1 = 9007199254740992.000000000, -1 != 9007199254740992.000000000, -1 < 9007199254740992.000000000, -1 <= 9007199254740992.000000000, -1 > 9007199254740992.000000000, -1 >= 9007199254740992.000000000,	9007199254740992.000000000 = -1, 9007199254740992.000000000 != -1, 9007199254740992.000000000 < -1, 9007199254740992.000000000 <= -1, 9007199254740992.000000000 > -1, 9007199254740992.000000000 >= -1 , toInt8(-1) = 9007199254740992.000000000, toInt8(-1) != 9007199254740992.000000000, toInt8(-1) < 9007199254740992.000000000, toInt8(-1) <= 9007199254740992.000000000, toInt8(-1) > 9007199254740992.000000000, toInt8(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(-1), 9007199254740992.000000000 != toInt8(-1), 9007199254740992.000000000 < toInt8(-1), 9007199254740992.000000000 <= toInt8(-1), 9007199254740992.000000000 > toInt8(-1), 9007199254740992.000000000 >= toInt8(-1) , toInt16(-1) = 9007199254740992.000000000, toInt16(-1) != 9007199254740992.000000000, toInt16(-1) < 9007199254740992.000000000, toInt16(-1) <= 9007199254740992.000000000, toInt16(-1) > 9007199254740992.000000000, toInt16(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(-1), 9007199254740992.000000000 != toInt16(-1), 9007199254740992.000000000 < toInt16(-1), 9007199254740992.000000000 <= toInt16(-1), 9007199254740992.000000000 > toInt16(-1), 9007199254740992.000000000 >= toInt16(-1) , toInt32(-1) = 9007199254740992.000000000, toInt32(-1) != 9007199254740992.000000000, toInt32(-1) < 9007199254740992.000000000, toInt32(-1) <= 9007199254740992.000000000, toInt32(-1) > 9007199254740992.000000000, toInt32(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(-1), 9007199254740992.000000000 != toInt32(-1), 9007199254740992.000000000 < toInt32(-1), 9007199254740992.000000000 <= toInt32(-1), 9007199254740992.000000000 > toInt32(-1), 9007199254740992.000000000 >= toInt32(-1) , toInt64(-1) = 9007199254740992.000000000, toInt64(-1) != 9007199254740992.000000000, toInt64(-1) < 9007199254740992.000000000, toInt64(-1) <= 9007199254740992.000000000, toInt64(-1) > 9007199254740992.000000000, toInt64(-1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(-1), 9007199254740992.000000000 != toInt64(-1), 9007199254740992.000000000 < toInt64(-1), 9007199254740992.000000000 <= toInt64(-1), 9007199254740992.000000000 > toInt64(-1), 9007199254740992.000000000 >= toInt64(-1) ;
+SELECT '-1', '2251799813685247.500000000', -1 = 2251799813685247.500000000, -1 != 2251799813685247.500000000, -1 < 2251799813685247.500000000, -1 <= 2251799813685247.500000000, -1 > 2251799813685247.500000000, -1 >= 2251799813685247.500000000,	2251799813685247.500000000 = -1, 2251799813685247.500000000 != -1, 2251799813685247.500000000 < -1, 2251799813685247.500000000 <= -1, 2251799813685247.500000000 > -1, 2251799813685247.500000000 >= -1 , toInt8(-1) = 2251799813685247.500000000, toInt8(-1) != 2251799813685247.500000000, toInt8(-1) < 2251799813685247.500000000, toInt8(-1) <= 2251799813685247.500000000, toInt8(-1) > 2251799813685247.500000000, toInt8(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt8(-1), 2251799813685247.500000000 != toInt8(-1), 2251799813685247.500000000 < toInt8(-1), 2251799813685247.500000000 <= toInt8(-1), 2251799813685247.500000000 > toInt8(-1), 2251799813685247.500000000 >= toInt8(-1) , toInt16(-1) = 2251799813685247.500000000, toInt16(-1) != 2251799813685247.500000000, toInt16(-1) < 2251799813685247.500000000, toInt16(-1) <= 2251799813685247.500000000, toInt16(-1) > 2251799813685247.500000000, toInt16(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt16(-1), 2251799813685247.500000000 != toInt16(-1), 2251799813685247.500000000 < toInt16(-1), 2251799813685247.500000000 <= toInt16(-1), 2251799813685247.500000000 > toInt16(-1), 2251799813685247.500000000 >= toInt16(-1) , toInt32(-1) = 2251799813685247.500000000, toInt32(-1) != 2251799813685247.500000000, toInt32(-1) < 2251799813685247.500000000, toInt32(-1) <= 2251799813685247.500000000, toInt32(-1) > 2251799813685247.500000000, toInt32(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt32(-1), 2251799813685247.500000000 != toInt32(-1), 2251799813685247.500000000 < toInt32(-1), 2251799813685247.500000000 <= toInt32(-1), 2251799813685247.500000000 > toInt32(-1), 2251799813685247.500000000 >= toInt32(-1) , toInt64(-1) = 2251799813685247.500000000, toInt64(-1) != 2251799813685247.500000000, toInt64(-1) < 2251799813685247.500000000, toInt64(-1) <= 2251799813685247.500000000, toInt64(-1) > 2251799813685247.500000000, toInt64(-1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt64(-1), 2251799813685247.500000000 != toInt64(-1), 2251799813685247.500000000 < toInt64(-1), 2251799813685247.500000000 <= toInt64(-1), 2251799813685247.500000000 > toInt64(-1), 2251799813685247.500000000 >= toInt64(-1) ;
+SELECT '-1', '2251799813685248.500000000', -1 = 2251799813685248.500000000, -1 != 2251799813685248.500000000, -1 < 2251799813685248.500000000, -1 <= 2251799813685248.500000000, -1 > 2251799813685248.500000000, -1 >= 2251799813685248.500000000,	2251799813685248.500000000 = -1, 2251799813685248.500000000 != -1, 2251799813685248.500000000 < -1, 2251799813685248.500000000 <= -1, 2251799813685248.500000000 > -1, 2251799813685248.500000000 >= -1 , toInt8(-1) = 2251799813685248.500000000, toInt8(-1) != 2251799813685248.500000000, toInt8(-1) < 2251799813685248.500000000, toInt8(-1) <= 2251799813685248.500000000, toInt8(-1) > 2251799813685248.500000000, toInt8(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt8(-1), 2251799813685248.500000000 != toInt8(-1), 2251799813685248.500000000 < toInt8(-1), 2251799813685248.500000000 <= toInt8(-1), 2251799813685248.500000000 > toInt8(-1), 2251799813685248.500000000 >= toInt8(-1) , toInt16(-1) = 2251799813685248.500000000, toInt16(-1) != 2251799813685248.500000000, toInt16(-1) < 2251799813685248.500000000, toInt16(-1) <= 2251799813685248.500000000, toInt16(-1) > 2251799813685248.500000000, toInt16(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt16(-1), 2251799813685248.500000000 != toInt16(-1), 2251799813685248.500000000 < toInt16(-1), 2251799813685248.500000000 <= toInt16(-1), 2251799813685248.500000000 > toInt16(-1), 2251799813685248.500000000 >= toInt16(-1) , toInt32(-1) = 2251799813685248.500000000, toInt32(-1) != 2251799813685248.500000000, toInt32(-1) < 2251799813685248.500000000, toInt32(-1) <= 2251799813685248.500000000, toInt32(-1) > 2251799813685248.500000000, toInt32(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt32(-1), 2251799813685248.500000000 != toInt32(-1), 2251799813685248.500000000 < toInt32(-1), 2251799813685248.500000000 <= toInt32(-1), 2251799813685248.500000000 > toInt32(-1), 2251799813685248.500000000 >= toInt32(-1) , toInt64(-1) = 2251799813685248.500000000, toInt64(-1) != 2251799813685248.500000000, toInt64(-1) < 2251799813685248.500000000, toInt64(-1) <= 2251799813685248.500000000, toInt64(-1) > 2251799813685248.500000000, toInt64(-1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt64(-1), 2251799813685248.500000000 != toInt64(-1), 2251799813685248.500000000 < toInt64(-1), 2251799813685248.500000000 <= toInt64(-1), 2251799813685248.500000000 > toInt64(-1), 2251799813685248.500000000 >= toInt64(-1) ;
+SELECT '-1', '1152921504606846976.000000000', -1 = 1152921504606846976.000000000, -1 != 1152921504606846976.000000000, -1 < 1152921504606846976.000000000, -1 <= 1152921504606846976.000000000, -1 > 1152921504606846976.000000000, -1 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = -1, 1152921504606846976.000000000 != -1, 1152921504606846976.000000000 < -1, 1152921504606846976.000000000 <= -1, 1152921504606846976.000000000 > -1, 1152921504606846976.000000000 >= -1 , toInt8(-1) = 1152921504606846976.000000000, toInt8(-1) != 1152921504606846976.000000000, toInt8(-1) < 1152921504606846976.000000000, toInt8(-1) <= 1152921504606846976.000000000, toInt8(-1) > 1152921504606846976.000000000, toInt8(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt8(-1), 1152921504606846976.000000000 != toInt8(-1), 1152921504606846976.000000000 < toInt8(-1), 1152921504606846976.000000000 <= toInt8(-1), 1152921504606846976.000000000 > toInt8(-1), 1152921504606846976.000000000 >= toInt8(-1) , toInt16(-1) = 1152921504606846976.000000000, toInt16(-1) != 1152921504606846976.000000000, toInt16(-1) < 1152921504606846976.000000000, toInt16(-1) <= 1152921504606846976.000000000, toInt16(-1) > 1152921504606846976.000000000, toInt16(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt16(-1), 1152921504606846976.000000000 != toInt16(-1), 1152921504606846976.000000000 < toInt16(-1), 1152921504606846976.000000000 <= toInt16(-1), 1152921504606846976.000000000 > toInt16(-1), 1152921504606846976.000000000 >= toInt16(-1) , toInt32(-1) = 1152921504606846976.000000000, toInt32(-1) != 1152921504606846976.000000000, toInt32(-1) < 1152921504606846976.000000000, toInt32(-1) <= 1152921504606846976.000000000, toInt32(-1) > 1152921504606846976.000000000, toInt32(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt32(-1), 1152921504606846976.000000000 != toInt32(-1), 1152921504606846976.000000000 < toInt32(-1), 1152921504606846976.000000000 <= toInt32(-1), 1152921504606846976.000000000 > toInt32(-1), 1152921504606846976.000000000 >= toInt32(-1) , toInt64(-1) = 1152921504606846976.000000000, toInt64(-1) != 1152921504606846976.000000000, toInt64(-1) < 1152921504606846976.000000000, toInt64(-1) <= 1152921504606846976.000000000, toInt64(-1) > 1152921504606846976.000000000, toInt64(-1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt64(-1), 1152921504606846976.000000000 != toInt64(-1), 1152921504606846976.000000000 < toInt64(-1), 1152921504606846976.000000000 <= toInt64(-1), 1152921504606846976.000000000 > toInt64(-1), 1152921504606846976.000000000 >= toInt64(-1) ;
+SELECT '-1', '-1152921504606846976.000000000', -1 = -1152921504606846976.000000000, -1 != -1152921504606846976.000000000, -1 < -1152921504606846976.000000000, -1 <= -1152921504606846976.000000000, -1 > -1152921504606846976.000000000, -1 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = -1, -1152921504606846976.000000000 != -1, -1152921504606846976.000000000 < -1, -1152921504606846976.000000000 <= -1, -1152921504606846976.000000000 > -1, -1152921504606846976.000000000 >= -1 , toInt8(-1) = -1152921504606846976.000000000, toInt8(-1) != -1152921504606846976.000000000, toInt8(-1) < -1152921504606846976.000000000, toInt8(-1) <= -1152921504606846976.000000000, toInt8(-1) > -1152921504606846976.000000000, toInt8(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt8(-1), -1152921504606846976.000000000 != toInt8(-1), -1152921504606846976.000000000 < toInt8(-1), -1152921504606846976.000000000 <= toInt8(-1), -1152921504606846976.000000000 > toInt8(-1), -1152921504606846976.000000000 >= toInt8(-1) , toInt16(-1) = -1152921504606846976.000000000, toInt16(-1) != -1152921504606846976.000000000, toInt16(-1) < -1152921504606846976.000000000, toInt16(-1) <= -1152921504606846976.000000000, toInt16(-1) > -1152921504606846976.000000000, toInt16(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt16(-1), -1152921504606846976.000000000 != toInt16(-1), -1152921504606846976.000000000 < toInt16(-1), -1152921504606846976.000000000 <= toInt16(-1), -1152921504606846976.000000000 > toInt16(-1), -1152921504606846976.000000000 >= toInt16(-1) , toInt32(-1) = -1152921504606846976.000000000, toInt32(-1) != -1152921504606846976.000000000, toInt32(-1) < -1152921504606846976.000000000, toInt32(-1) <= -1152921504606846976.000000000, toInt32(-1) > -1152921504606846976.000000000, toInt32(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt32(-1), -1152921504606846976.000000000 != toInt32(-1), -1152921504606846976.000000000 < toInt32(-1), -1152921504606846976.000000000 <= toInt32(-1), -1152921504606846976.000000000 > toInt32(-1), -1152921504606846976.000000000 >= toInt32(-1) , toInt64(-1) = -1152921504606846976.000000000, toInt64(-1) != -1152921504606846976.000000000, toInt64(-1) < -1152921504606846976.000000000, toInt64(-1) <= -1152921504606846976.000000000, toInt64(-1) > -1152921504606846976.000000000, toInt64(-1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt64(-1), -1152921504606846976.000000000 != toInt64(-1), -1152921504606846976.000000000 < toInt64(-1), -1152921504606846976.000000000 <= toInt64(-1), -1152921504606846976.000000000 > toInt64(-1), -1152921504606846976.000000000 >= toInt64(-1) ;
+SELECT '-1', '-9223372036854786048.000000000', -1 = -9223372036854786048.000000000, -1 != -9223372036854786048.000000000, -1 < -9223372036854786048.000000000, -1 <= -9223372036854786048.000000000, -1 > -9223372036854786048.000000000, -1 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = -1, -9223372036854786048.000000000 != -1, -9223372036854786048.000000000 < -1, -9223372036854786048.000000000 <= -1, -9223372036854786048.000000000 > -1, -9223372036854786048.000000000 >= -1 , toInt8(-1) = -9223372036854786048.000000000, toInt8(-1) != -9223372036854786048.000000000, toInt8(-1) < -9223372036854786048.000000000, toInt8(-1) <= -9223372036854786048.000000000, toInt8(-1) > -9223372036854786048.000000000, toInt8(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt8(-1), -9223372036854786048.000000000 != toInt8(-1), -9223372036854786048.000000000 < toInt8(-1), -9223372036854786048.000000000 <= toInt8(-1), -9223372036854786048.000000000 > toInt8(-1), -9223372036854786048.000000000 >= toInt8(-1) , toInt16(-1) = -9223372036854786048.000000000, toInt16(-1) != -9223372036854786048.000000000, toInt16(-1) < -9223372036854786048.000000000, toInt16(-1) <= -9223372036854786048.000000000, toInt16(-1) > -9223372036854786048.000000000, toInt16(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt16(-1), -9223372036854786048.000000000 != toInt16(-1), -9223372036854786048.000000000 < toInt16(-1), -9223372036854786048.000000000 <= toInt16(-1), -9223372036854786048.000000000 > toInt16(-1), -9223372036854786048.000000000 >= toInt16(-1) , toInt32(-1) = -9223372036854786048.000000000, toInt32(-1) != -9223372036854786048.000000000, toInt32(-1) < -9223372036854786048.000000000, toInt32(-1) <= -9223372036854786048.000000000, toInt32(-1) > -9223372036854786048.000000000, toInt32(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt32(-1), -9223372036854786048.000000000 != toInt32(-1), -9223372036854786048.000000000 < toInt32(-1), -9223372036854786048.000000000 <= toInt32(-1), -9223372036854786048.000000000 > toInt32(-1), -9223372036854786048.000000000 >= toInt32(-1) , toInt64(-1) = -9223372036854786048.000000000, toInt64(-1) != -9223372036854786048.000000000, toInt64(-1) < -9223372036854786048.000000000, toInt64(-1) <= -9223372036854786048.000000000, toInt64(-1) > -9223372036854786048.000000000, toInt64(-1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt64(-1), -9223372036854786048.000000000 != toInt64(-1), -9223372036854786048.000000000 < toInt64(-1), -9223372036854786048.000000000 <= toInt64(-1), -9223372036854786048.000000000 > toInt64(-1), -9223372036854786048.000000000 >= toInt64(-1) ;
+SELECT '-1', '9223372036854786048.000000000', -1 = 9223372036854786048.000000000, -1 != 9223372036854786048.000000000, -1 < 9223372036854786048.000000000, -1 <= 9223372036854786048.000000000, -1 > 9223372036854786048.000000000, -1 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = -1, 9223372036854786048.000000000 != -1, 9223372036854786048.000000000 < -1, 9223372036854786048.000000000 <= -1, 9223372036854786048.000000000 > -1, 9223372036854786048.000000000 >= -1 , toInt8(-1) = 9223372036854786048.000000000, toInt8(-1) != 9223372036854786048.000000000, toInt8(-1) < 9223372036854786048.000000000, toInt8(-1) <= 9223372036854786048.000000000, toInt8(-1) > 9223372036854786048.000000000, toInt8(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt8(-1), 9223372036854786048.000000000 != toInt8(-1), 9223372036854786048.000000000 < toInt8(-1), 9223372036854786048.000000000 <= toInt8(-1), 9223372036854786048.000000000 > toInt8(-1), 9223372036854786048.000000000 >= toInt8(-1) , toInt16(-1) = 9223372036854786048.000000000, toInt16(-1) != 9223372036854786048.000000000, toInt16(-1) < 9223372036854786048.000000000, toInt16(-1) <= 9223372036854786048.000000000, toInt16(-1) > 9223372036854786048.000000000, toInt16(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt16(-1), 9223372036854786048.000000000 != toInt16(-1), 9223372036854786048.000000000 < toInt16(-1), 9223372036854786048.000000000 <= toInt16(-1), 9223372036854786048.000000000 > toInt16(-1), 9223372036854786048.000000000 >= toInt16(-1) , toInt32(-1) = 9223372036854786048.000000000, toInt32(-1) != 9223372036854786048.000000000, toInt32(-1) < 9223372036854786048.000000000, toInt32(-1) <= 9223372036854786048.000000000, toInt32(-1) > 9223372036854786048.000000000, toInt32(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt32(-1), 9223372036854786048.000000000 != toInt32(-1), 9223372036854786048.000000000 < toInt32(-1), 9223372036854786048.000000000 <= toInt32(-1), 9223372036854786048.000000000 > toInt32(-1), 9223372036854786048.000000000 >= toInt32(-1) , toInt64(-1) = 9223372036854786048.000000000, toInt64(-1) != 9223372036854786048.000000000, toInt64(-1) < 9223372036854786048.000000000, toInt64(-1) <= 9223372036854786048.000000000, toInt64(-1) > 9223372036854786048.000000000, toInt64(-1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt64(-1), 9223372036854786048.000000000 != toInt64(-1), 9223372036854786048.000000000 < toInt64(-1), 9223372036854786048.000000000 <= toInt64(-1), 9223372036854786048.000000000 > toInt64(-1), 9223372036854786048.000000000 >= toInt64(-1) ;
+SELECT '1', '0.000000000', 1 = 0.000000000, 1 != 0.000000000, 1 < 0.000000000, 1 <= 0.000000000, 1 > 0.000000000, 1 >= 0.000000000,	0.000000000 = 1, 0.000000000 != 1, 0.000000000 < 1, 0.000000000 <= 1, 0.000000000 > 1, 0.000000000 >= 1 , toUInt8(1) = 0.000000000, toUInt8(1) != 0.000000000, toUInt8(1) < 0.000000000, toUInt8(1) <= 0.000000000, toUInt8(1) > 0.000000000, toUInt8(1) >= 0.000000000,	0.000000000 = toUInt8(1), 0.000000000 != toUInt8(1), 0.000000000 < toUInt8(1), 0.000000000 <= toUInt8(1), 0.000000000 > toUInt8(1), 0.000000000 >= toUInt8(1) , toInt8(1) = 0.000000000, toInt8(1) != 0.000000000, toInt8(1) < 0.000000000, toInt8(1) <= 0.000000000, toInt8(1) > 0.000000000, toInt8(1) >= 0.000000000,	0.000000000 = toInt8(1), 0.000000000 != toInt8(1), 0.000000000 < toInt8(1), 0.000000000 <= toInt8(1), 0.000000000 > toInt8(1), 0.000000000 >= toInt8(1) , toUInt16(1) = 0.000000000, toUInt16(1) != 0.000000000, toUInt16(1) < 0.000000000, toUInt16(1) <= 0.000000000, toUInt16(1) > 0.000000000, toUInt16(1) >= 0.000000000,	0.000000000 = toUInt16(1), 0.000000000 != toUInt16(1), 0.000000000 < toUInt16(1), 0.000000000 <= toUInt16(1), 0.000000000 > toUInt16(1), 0.000000000 >= toUInt16(1) , toInt16(1) = 0.000000000, toInt16(1) != 0.000000000, toInt16(1) < 0.000000000, toInt16(1) <= 0.000000000, toInt16(1) > 0.000000000, toInt16(1) >= 0.000000000,	0.000000000 = toInt16(1), 0.000000000 != toInt16(1), 0.000000000 < toInt16(1), 0.000000000 <= toInt16(1), 0.000000000 > toInt16(1), 0.000000000 >= toInt16(1) , toUInt32(1) = 0.000000000, toUInt32(1) != 0.000000000, toUInt32(1) < 0.000000000, toUInt32(1) <= 0.000000000, toUInt32(1) > 0.000000000, toUInt32(1) >= 0.000000000,	0.000000000 = toUInt32(1), 0.000000000 != toUInt32(1), 0.000000000 < toUInt32(1), 0.000000000 <= toUInt32(1), 0.000000000 > toUInt32(1), 0.000000000 >= toUInt32(1) , toInt32(1) = 0.000000000, toInt32(1) != 0.000000000, toInt32(1) < 0.000000000, toInt32(1) <= 0.000000000, toInt32(1) > 0.000000000, toInt32(1) >= 0.000000000,	0.000000000 = toInt32(1), 0.000000000 != toInt32(1), 0.000000000 < toInt32(1), 0.000000000 <= toInt32(1), 0.000000000 > toInt32(1), 0.000000000 >= toInt32(1) , toUInt64(1) = 0.000000000, toUInt64(1) != 0.000000000, toUInt64(1) < 0.000000000, toUInt64(1) <= 0.000000000, toUInt64(1) > 0.000000000, toUInt64(1) >= 0.000000000,	0.000000000 = toUInt64(1), 0.000000000 != toUInt64(1), 0.000000000 < toUInt64(1), 0.000000000 <= toUInt64(1), 0.000000000 > toUInt64(1), 0.000000000 >= toUInt64(1) , toInt64(1) = 0.000000000, toInt64(1) != 0.000000000, toInt64(1) < 0.000000000, toInt64(1) <= 0.000000000, toInt64(1) > 0.000000000, toInt64(1) >= 0.000000000,	0.000000000 = toInt64(1), 0.000000000 != toInt64(1), 0.000000000 < toInt64(1), 0.000000000 <= toInt64(1), 0.000000000 > toInt64(1), 0.000000000 >= toInt64(1) ;
+SELECT '1', '-1.000000000', 1 = -1.000000000, 1 != -1.000000000, 1 < -1.000000000, 1 <= -1.000000000, 1 > -1.000000000, 1 >= -1.000000000,	-1.000000000 = 1, -1.000000000 != 1, -1.000000000 < 1, -1.000000000 <= 1, -1.000000000 > 1, -1.000000000 >= 1 , toUInt8(1) = -1.000000000, toUInt8(1) != -1.000000000, toUInt8(1) < -1.000000000, toUInt8(1) <= -1.000000000, toUInt8(1) > -1.000000000, toUInt8(1) >= -1.000000000,	-1.000000000 = toUInt8(1), -1.000000000 != toUInt8(1), -1.000000000 < toUInt8(1), -1.000000000 <= toUInt8(1), -1.000000000 > toUInt8(1), -1.000000000 >= toUInt8(1) , toInt8(1) = -1.000000000, toInt8(1) != -1.000000000, toInt8(1) < -1.000000000, toInt8(1) <= -1.000000000, toInt8(1) > -1.000000000, toInt8(1) >= -1.000000000,	-1.000000000 = toInt8(1), -1.000000000 != toInt8(1), -1.000000000 < toInt8(1), -1.000000000 <= toInt8(1), -1.000000000 > toInt8(1), -1.000000000 >= toInt8(1) , toUInt16(1) = -1.000000000, toUInt16(1) != -1.000000000, toUInt16(1) < -1.000000000, toUInt16(1) <= -1.000000000, toUInt16(1) > -1.000000000, toUInt16(1) >= -1.000000000,	-1.000000000 = toUInt16(1), -1.000000000 != toUInt16(1), -1.000000000 < toUInt16(1), -1.000000000 <= toUInt16(1), -1.000000000 > toUInt16(1), -1.000000000 >= toUInt16(1) , toInt16(1) = -1.000000000, toInt16(1) != -1.000000000, toInt16(1) < -1.000000000, toInt16(1) <= -1.000000000, toInt16(1) > -1.000000000, toInt16(1) >= -1.000000000,	-1.000000000 = toInt16(1), -1.000000000 != toInt16(1), -1.000000000 < toInt16(1), -1.000000000 <= toInt16(1), -1.000000000 > toInt16(1), -1.000000000 >= toInt16(1) , toUInt32(1) = -1.000000000, toUInt32(1) != -1.000000000, toUInt32(1) < -1.000000000, toUInt32(1) <= -1.000000000, toUInt32(1) > -1.000000000, toUInt32(1) >= -1.000000000,	-1.000000000 = toUInt32(1), -1.000000000 != toUInt32(1), -1.000000000 < toUInt32(1), -1.000000000 <= toUInt32(1), -1.000000000 > toUInt32(1), -1.000000000 >= toUInt32(1) , toInt32(1) = -1.000000000, toInt32(1) != -1.000000000, toInt32(1) < -1.000000000, toInt32(1) <= -1.000000000, toInt32(1) > -1.000000000, toInt32(1) >= -1.000000000,	-1.000000000 = toInt32(1), -1.000000000 != toInt32(1), -1.000000000 < toInt32(1), -1.000000000 <= toInt32(1), -1.000000000 > toInt32(1), -1.000000000 >= toInt32(1) , toUInt64(1) = -1.000000000, toUInt64(1) != -1.000000000, toUInt64(1) < -1.000000000, toUInt64(1) <= -1.000000000, toUInt64(1) > -1.000000000, toUInt64(1) >= -1.000000000,	-1.000000000 = toUInt64(1), -1.000000000 != toUInt64(1), -1.000000000 < toUInt64(1), -1.000000000 <= toUInt64(1), -1.000000000 > toUInt64(1), -1.000000000 >= toUInt64(1) , toInt64(1) = -1.000000000, toInt64(1) != -1.000000000, toInt64(1) < -1.000000000, toInt64(1) <= -1.000000000, toInt64(1) > -1.000000000, toInt64(1) >= -1.000000000,	-1.000000000 = toInt64(1), -1.000000000 != toInt64(1), -1.000000000 < toInt64(1), -1.000000000 <= toInt64(1), -1.000000000 > toInt64(1), -1.000000000 >= toInt64(1) ;
+SELECT '1', '1.000000000', 1 = 1.000000000, 1 != 1.000000000, 1 < 1.000000000, 1 <= 1.000000000, 1 > 1.000000000, 1 >= 1.000000000,	1.000000000 = 1, 1.000000000 != 1, 1.000000000 < 1, 1.000000000 <= 1, 1.000000000 > 1, 1.000000000 >= 1 , toUInt8(1) = 1.000000000, toUInt8(1) != 1.000000000, toUInt8(1) < 1.000000000, toUInt8(1) <= 1.000000000, toUInt8(1) > 1.000000000, toUInt8(1) >= 1.000000000,	1.000000000 = toUInt8(1), 1.000000000 != toUInt8(1), 1.000000000 < toUInt8(1), 1.000000000 <= toUInt8(1), 1.000000000 > toUInt8(1), 1.000000000 >= toUInt8(1) , toInt8(1) = 1.000000000, toInt8(1) != 1.000000000, toInt8(1) < 1.000000000, toInt8(1) <= 1.000000000, toInt8(1) > 1.000000000, toInt8(1) >= 1.000000000,	1.000000000 = toInt8(1), 1.000000000 != toInt8(1), 1.000000000 < toInt8(1), 1.000000000 <= toInt8(1), 1.000000000 > toInt8(1), 1.000000000 >= toInt8(1) , toUInt16(1) = 1.000000000, toUInt16(1) != 1.000000000, toUInt16(1) < 1.000000000, toUInt16(1) <= 1.000000000, toUInt16(1) > 1.000000000, toUInt16(1) >= 1.000000000,	1.000000000 = toUInt16(1), 1.000000000 != toUInt16(1), 1.000000000 < toUInt16(1), 1.000000000 <= toUInt16(1), 1.000000000 > toUInt16(1), 1.000000000 >= toUInt16(1) , toInt16(1) = 1.000000000, toInt16(1) != 1.000000000, toInt16(1) < 1.000000000, toInt16(1) <= 1.000000000, toInt16(1) > 1.000000000, toInt16(1) >= 1.000000000,	1.000000000 = toInt16(1), 1.000000000 != toInt16(1), 1.000000000 < toInt16(1), 1.000000000 <= toInt16(1), 1.000000000 > toInt16(1), 1.000000000 >= toInt16(1) , toUInt32(1) = 1.000000000, toUInt32(1) != 1.000000000, toUInt32(1) < 1.000000000, toUInt32(1) <= 1.000000000, toUInt32(1) > 1.000000000, toUInt32(1) >= 1.000000000,	1.000000000 = toUInt32(1), 1.000000000 != toUInt32(1), 1.000000000 < toUInt32(1), 1.000000000 <= toUInt32(1), 1.000000000 > toUInt32(1), 1.000000000 >= toUInt32(1) , toInt32(1) = 1.000000000, toInt32(1) != 1.000000000, toInt32(1) < 1.000000000, toInt32(1) <= 1.000000000, toInt32(1) > 1.000000000, toInt32(1) >= 1.000000000,	1.000000000 = toInt32(1), 1.000000000 != toInt32(1), 1.000000000 < toInt32(1), 1.000000000 <= toInt32(1), 1.000000000 > toInt32(1), 1.000000000 >= toInt32(1) , toUInt64(1) = 1.000000000, toUInt64(1) != 1.000000000, toUInt64(1) < 1.000000000, toUInt64(1) <= 1.000000000, toUInt64(1) > 1.000000000, toUInt64(1) >= 1.000000000,	1.000000000 = toUInt64(1), 1.000000000 != toUInt64(1), 1.000000000 < toUInt64(1), 1.000000000 <= toUInt64(1), 1.000000000 > toUInt64(1), 1.000000000 >= toUInt64(1) , toInt64(1) = 1.000000000, toInt64(1) != 1.000000000, toInt64(1) < 1.000000000, toInt64(1) <= 1.000000000, toInt64(1) > 1.000000000, toInt64(1) >= 1.000000000,	1.000000000 = toInt64(1), 1.000000000 != toInt64(1), 1.000000000 < toInt64(1), 1.000000000 <= toInt64(1), 1.000000000 > toInt64(1), 1.000000000 >= toInt64(1) ;
+SELECT '1', '18446744073709551616.000000000', 1 = 18446744073709551616.000000000, 1 != 18446744073709551616.000000000, 1 < 18446744073709551616.000000000, 1 <= 18446744073709551616.000000000, 1 > 18446744073709551616.000000000, 1 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 1, 18446744073709551616.000000000 != 1, 18446744073709551616.000000000 < 1, 18446744073709551616.000000000 <= 1, 18446744073709551616.000000000 > 1, 18446744073709551616.000000000 >= 1 , toUInt8(1) = 18446744073709551616.000000000, toUInt8(1) != 18446744073709551616.000000000, toUInt8(1) < 18446744073709551616.000000000, toUInt8(1) <= 18446744073709551616.000000000, toUInt8(1) > 18446744073709551616.000000000, toUInt8(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt8(1), 18446744073709551616.000000000 != toUInt8(1), 18446744073709551616.000000000 < toUInt8(1), 18446744073709551616.000000000 <= toUInt8(1), 18446744073709551616.000000000 > toUInt8(1), 18446744073709551616.000000000 >= toUInt8(1) , toInt8(1) = 18446744073709551616.000000000, toInt8(1) != 18446744073709551616.000000000, toInt8(1) < 18446744073709551616.000000000, toInt8(1) <= 18446744073709551616.000000000, toInt8(1) > 18446744073709551616.000000000, toInt8(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt8(1), 18446744073709551616.000000000 != toInt8(1), 18446744073709551616.000000000 < toInt8(1), 18446744073709551616.000000000 <= toInt8(1), 18446744073709551616.000000000 > toInt8(1), 18446744073709551616.000000000 >= toInt8(1) , toUInt16(1) = 18446744073709551616.000000000, toUInt16(1) != 18446744073709551616.000000000, toUInt16(1) < 18446744073709551616.000000000, toUInt16(1) <= 18446744073709551616.000000000, toUInt16(1) > 18446744073709551616.000000000, toUInt16(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt16(1), 18446744073709551616.000000000 != toUInt16(1), 18446744073709551616.000000000 < toUInt16(1), 18446744073709551616.000000000 <= toUInt16(1), 18446744073709551616.000000000 > toUInt16(1), 18446744073709551616.000000000 >= toUInt16(1) , toInt16(1) = 18446744073709551616.000000000, toInt16(1) != 18446744073709551616.000000000, toInt16(1) < 18446744073709551616.000000000, toInt16(1) <= 18446744073709551616.000000000, toInt16(1) > 18446744073709551616.000000000, toInt16(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt16(1), 18446744073709551616.000000000 != toInt16(1), 18446744073709551616.000000000 < toInt16(1), 18446744073709551616.000000000 <= toInt16(1), 18446744073709551616.000000000 > toInt16(1), 18446744073709551616.000000000 >= toInt16(1) , toUInt32(1) = 18446744073709551616.000000000, toUInt32(1) != 18446744073709551616.000000000, toUInt32(1) < 18446744073709551616.000000000, toUInt32(1) <= 18446744073709551616.000000000, toUInt32(1) > 18446744073709551616.000000000, toUInt32(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt32(1), 18446744073709551616.000000000 != toUInt32(1), 18446744073709551616.000000000 < toUInt32(1), 18446744073709551616.000000000 <= toUInt32(1), 18446744073709551616.000000000 > toUInt32(1), 18446744073709551616.000000000 >= toUInt32(1) , toInt32(1) = 18446744073709551616.000000000, toInt32(1) != 18446744073709551616.000000000, toInt32(1) < 18446744073709551616.000000000, toInt32(1) <= 18446744073709551616.000000000, toInt32(1) > 18446744073709551616.000000000, toInt32(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt32(1), 18446744073709551616.000000000 != toInt32(1), 18446744073709551616.000000000 < toInt32(1), 18446744073709551616.000000000 <= toInt32(1), 18446744073709551616.000000000 > toInt32(1), 18446744073709551616.000000000 >= toInt32(1) , toUInt64(1) = 18446744073709551616.000000000, toUInt64(1) != 18446744073709551616.000000000, toUInt64(1) < 18446744073709551616.000000000, toUInt64(1) <= 18446744073709551616.000000000, toUInt64(1) > 18446744073709551616.000000000, toUInt64(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(1), 18446744073709551616.000000000 != toUInt64(1), 18446744073709551616.000000000 < toUInt64(1), 18446744073709551616.000000000 <= toUInt64(1), 18446744073709551616.000000000 > toUInt64(1), 18446744073709551616.000000000 >= toUInt64(1) , toInt64(1) = 18446744073709551616.000000000, toInt64(1) != 18446744073709551616.000000000, toInt64(1) < 18446744073709551616.000000000, toInt64(1) <= 18446744073709551616.000000000, toInt64(1) > 18446744073709551616.000000000, toInt64(1) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toInt64(1), 18446744073709551616.000000000 != toInt64(1), 18446744073709551616.000000000 < toInt64(1), 18446744073709551616.000000000 <= toInt64(1), 18446744073709551616.000000000 > toInt64(1), 18446744073709551616.000000000 >= toInt64(1) ;
+SELECT '1', '9223372036854775808.000000000', 1 = 9223372036854775808.000000000, 1 != 9223372036854775808.000000000, 1 < 9223372036854775808.000000000, 1 <= 9223372036854775808.000000000, 1 > 9223372036854775808.000000000, 1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 1, 9223372036854775808.000000000 != 1, 9223372036854775808.000000000 < 1, 9223372036854775808.000000000 <= 1, 9223372036854775808.000000000 > 1, 9223372036854775808.000000000 >= 1 , toUInt8(1) = 9223372036854775808.000000000, toUInt8(1) != 9223372036854775808.000000000, toUInt8(1) < 9223372036854775808.000000000, toUInt8(1) <= 9223372036854775808.000000000, toUInt8(1) > 9223372036854775808.000000000, toUInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(1), 9223372036854775808.000000000 != toUInt8(1), 9223372036854775808.000000000 < toUInt8(1), 9223372036854775808.000000000 <= toUInt8(1), 9223372036854775808.000000000 > toUInt8(1), 9223372036854775808.000000000 >= toUInt8(1) , toInt8(1) = 9223372036854775808.000000000, toInt8(1) != 9223372036854775808.000000000, toInt8(1) < 9223372036854775808.000000000, toInt8(1) <= 9223372036854775808.000000000, toInt8(1) > 9223372036854775808.000000000, toInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(1), 9223372036854775808.000000000 != toInt8(1), 9223372036854775808.000000000 < toInt8(1), 9223372036854775808.000000000 <= toInt8(1), 9223372036854775808.000000000 > toInt8(1), 9223372036854775808.000000000 >= toInt8(1) , toUInt16(1) = 9223372036854775808.000000000, toUInt16(1) != 9223372036854775808.000000000, toUInt16(1) < 9223372036854775808.000000000, toUInt16(1) <= 9223372036854775808.000000000, toUInt16(1) > 9223372036854775808.000000000, toUInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(1), 9223372036854775808.000000000 != toUInt16(1), 9223372036854775808.000000000 < toUInt16(1), 9223372036854775808.000000000 <= toUInt16(1), 9223372036854775808.000000000 > toUInt16(1), 9223372036854775808.000000000 >= toUInt16(1) , toInt16(1) = 9223372036854775808.000000000, toInt16(1) != 9223372036854775808.000000000, toInt16(1) < 9223372036854775808.000000000, toInt16(1) <= 9223372036854775808.000000000, toInt16(1) > 9223372036854775808.000000000, toInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(1), 9223372036854775808.000000000 != toInt16(1), 9223372036854775808.000000000 < toInt16(1), 9223372036854775808.000000000 <= toInt16(1), 9223372036854775808.000000000 > toInt16(1), 9223372036854775808.000000000 >= toInt16(1) , toUInt32(1) = 9223372036854775808.000000000, toUInt32(1) != 9223372036854775808.000000000, toUInt32(1) < 9223372036854775808.000000000, toUInt32(1) <= 9223372036854775808.000000000, toUInt32(1) > 9223372036854775808.000000000, toUInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(1), 9223372036854775808.000000000 != toUInt32(1), 9223372036854775808.000000000 < toUInt32(1), 9223372036854775808.000000000 <= toUInt32(1), 9223372036854775808.000000000 > toUInt32(1), 9223372036854775808.000000000 >= toUInt32(1) , toInt32(1) = 9223372036854775808.000000000, toInt32(1) != 9223372036854775808.000000000, toInt32(1) < 9223372036854775808.000000000, toInt32(1) <= 9223372036854775808.000000000, toInt32(1) > 9223372036854775808.000000000, toInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(1), 9223372036854775808.000000000 != toInt32(1), 9223372036854775808.000000000 < toInt32(1), 9223372036854775808.000000000 <= toInt32(1), 9223372036854775808.000000000 > toInt32(1), 9223372036854775808.000000000 >= toInt32(1) , toUInt64(1) = 9223372036854775808.000000000, toUInt64(1) != 9223372036854775808.000000000, toUInt64(1) < 9223372036854775808.000000000, toUInt64(1) <= 9223372036854775808.000000000, toUInt64(1) > 9223372036854775808.000000000, toUInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(1), 9223372036854775808.000000000 != toUInt64(1), 9223372036854775808.000000000 < toUInt64(1), 9223372036854775808.000000000 <= toUInt64(1), 9223372036854775808.000000000 > toUInt64(1), 9223372036854775808.000000000 >= toUInt64(1) , toInt64(1) = 9223372036854775808.000000000, toInt64(1) != 9223372036854775808.000000000, toInt64(1) < 9223372036854775808.000000000, toInt64(1) <= 9223372036854775808.000000000, toInt64(1) > 9223372036854775808.000000000, toInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(1), 9223372036854775808.000000000 != toInt64(1), 9223372036854775808.000000000 < toInt64(1), 9223372036854775808.000000000 <= toInt64(1), 9223372036854775808.000000000 > toInt64(1), 9223372036854775808.000000000 >= toInt64(1) ;
+SELECT '1', '-9223372036854775808.000000000', 1 = -9223372036854775808.000000000, 1 != -9223372036854775808.000000000, 1 < -9223372036854775808.000000000, 1 <= -9223372036854775808.000000000, 1 > -9223372036854775808.000000000, 1 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = 1, -9223372036854775808.000000000 != 1, -9223372036854775808.000000000 < 1, -9223372036854775808.000000000 <= 1, -9223372036854775808.000000000 > 1, -9223372036854775808.000000000 >= 1 , toUInt8(1) = -9223372036854775808.000000000, toUInt8(1) != -9223372036854775808.000000000, toUInt8(1) < -9223372036854775808.000000000, toUInt8(1) <= -9223372036854775808.000000000, toUInt8(1) > -9223372036854775808.000000000, toUInt8(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt8(1), -9223372036854775808.000000000 != toUInt8(1), -9223372036854775808.000000000 < toUInt8(1), -9223372036854775808.000000000 <= toUInt8(1), -9223372036854775808.000000000 > toUInt8(1), -9223372036854775808.000000000 >= toUInt8(1) , toInt8(1) = -9223372036854775808.000000000, toInt8(1) != -9223372036854775808.000000000, toInt8(1) < -9223372036854775808.000000000, toInt8(1) <= -9223372036854775808.000000000, toInt8(1) > -9223372036854775808.000000000, toInt8(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt8(1), -9223372036854775808.000000000 != toInt8(1), -9223372036854775808.000000000 < toInt8(1), -9223372036854775808.000000000 <= toInt8(1), -9223372036854775808.000000000 > toInt8(1), -9223372036854775808.000000000 >= toInt8(1) , toUInt16(1) = -9223372036854775808.000000000, toUInt16(1) != -9223372036854775808.000000000, toUInt16(1) < -9223372036854775808.000000000, toUInt16(1) <= -9223372036854775808.000000000, toUInt16(1) > -9223372036854775808.000000000, toUInt16(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt16(1), -9223372036854775808.000000000 != toUInt16(1), -9223372036854775808.000000000 < toUInt16(1), -9223372036854775808.000000000 <= toUInt16(1), -9223372036854775808.000000000 > toUInt16(1), -9223372036854775808.000000000 >= toUInt16(1) , toInt16(1) = -9223372036854775808.000000000, toInt16(1) != -9223372036854775808.000000000, toInt16(1) < -9223372036854775808.000000000, toInt16(1) <= -9223372036854775808.000000000, toInt16(1) > -9223372036854775808.000000000, toInt16(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt16(1), -9223372036854775808.000000000 != toInt16(1), -9223372036854775808.000000000 < toInt16(1), -9223372036854775808.000000000 <= toInt16(1), -9223372036854775808.000000000 > toInt16(1), -9223372036854775808.000000000 >= toInt16(1) , toUInt32(1) = -9223372036854775808.000000000, toUInt32(1) != -9223372036854775808.000000000, toUInt32(1) < -9223372036854775808.000000000, toUInt32(1) <= -9223372036854775808.000000000, toUInt32(1) > -9223372036854775808.000000000, toUInt32(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt32(1), -9223372036854775808.000000000 != toUInt32(1), -9223372036854775808.000000000 < toUInt32(1), -9223372036854775808.000000000 <= toUInt32(1), -9223372036854775808.000000000 > toUInt32(1), -9223372036854775808.000000000 >= toUInt32(1) , toInt32(1) = -9223372036854775808.000000000, toInt32(1) != -9223372036854775808.000000000, toInt32(1) < -9223372036854775808.000000000, toInt32(1) <= -9223372036854775808.000000000, toInt32(1) > -9223372036854775808.000000000, toInt32(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt32(1), -9223372036854775808.000000000 != toInt32(1), -9223372036854775808.000000000 < toInt32(1), -9223372036854775808.000000000 <= toInt32(1), -9223372036854775808.000000000 > toInt32(1), -9223372036854775808.000000000 >= toInt32(1) , toUInt64(1) = -9223372036854775808.000000000, toUInt64(1) != -9223372036854775808.000000000, toUInt64(1) < -9223372036854775808.000000000, toUInt64(1) <= -9223372036854775808.000000000, toUInt64(1) > -9223372036854775808.000000000, toUInt64(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt64(1), -9223372036854775808.000000000 != toUInt64(1), -9223372036854775808.000000000 < toUInt64(1), -9223372036854775808.000000000 <= toUInt64(1), -9223372036854775808.000000000 > toUInt64(1), -9223372036854775808.000000000 >= toUInt64(1) , toInt64(1) = -9223372036854775808.000000000, toInt64(1) != -9223372036854775808.000000000, toInt64(1) < -9223372036854775808.000000000, toInt64(1) <= -9223372036854775808.000000000, toInt64(1) > -9223372036854775808.000000000, toInt64(1) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toInt64(1), -9223372036854775808.000000000 != toInt64(1), -9223372036854775808.000000000 < toInt64(1), -9223372036854775808.000000000 <= toInt64(1), -9223372036854775808.000000000 > toInt64(1), -9223372036854775808.000000000 >= toInt64(1) ;
+SELECT '1', '9223372036854775808.000000000', 1 = 9223372036854775808.000000000, 1 != 9223372036854775808.000000000, 1 < 9223372036854775808.000000000, 1 <= 9223372036854775808.000000000, 1 > 9223372036854775808.000000000, 1 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 1, 9223372036854775808.000000000 != 1, 9223372036854775808.000000000 < 1, 9223372036854775808.000000000 <= 1, 9223372036854775808.000000000 > 1, 9223372036854775808.000000000 >= 1 , toUInt8(1) = 9223372036854775808.000000000, toUInt8(1) != 9223372036854775808.000000000, toUInt8(1) < 9223372036854775808.000000000, toUInt8(1) <= 9223372036854775808.000000000, toUInt8(1) > 9223372036854775808.000000000, toUInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt8(1), 9223372036854775808.000000000 != toUInt8(1), 9223372036854775808.000000000 < toUInt8(1), 9223372036854775808.000000000 <= toUInt8(1), 9223372036854775808.000000000 > toUInt8(1), 9223372036854775808.000000000 >= toUInt8(1) , toInt8(1) = 9223372036854775808.000000000, toInt8(1) != 9223372036854775808.000000000, toInt8(1) < 9223372036854775808.000000000, toInt8(1) <= 9223372036854775808.000000000, toInt8(1) > 9223372036854775808.000000000, toInt8(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt8(1), 9223372036854775808.000000000 != toInt8(1), 9223372036854775808.000000000 < toInt8(1), 9223372036854775808.000000000 <= toInt8(1), 9223372036854775808.000000000 > toInt8(1), 9223372036854775808.000000000 >= toInt8(1) , toUInt16(1) = 9223372036854775808.000000000, toUInt16(1) != 9223372036854775808.000000000, toUInt16(1) < 9223372036854775808.000000000, toUInt16(1) <= 9223372036854775808.000000000, toUInt16(1) > 9223372036854775808.000000000, toUInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt16(1), 9223372036854775808.000000000 != toUInt16(1), 9223372036854775808.000000000 < toUInt16(1), 9223372036854775808.000000000 <= toUInt16(1), 9223372036854775808.000000000 > toUInt16(1), 9223372036854775808.000000000 >= toUInt16(1) , toInt16(1) = 9223372036854775808.000000000, toInt16(1) != 9223372036854775808.000000000, toInt16(1) < 9223372036854775808.000000000, toInt16(1) <= 9223372036854775808.000000000, toInt16(1) > 9223372036854775808.000000000, toInt16(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt16(1), 9223372036854775808.000000000 != toInt16(1), 9223372036854775808.000000000 < toInt16(1), 9223372036854775808.000000000 <= toInt16(1), 9223372036854775808.000000000 > toInt16(1), 9223372036854775808.000000000 >= toInt16(1) , toUInt32(1) = 9223372036854775808.000000000, toUInt32(1) != 9223372036854775808.000000000, toUInt32(1) < 9223372036854775808.000000000, toUInt32(1) <= 9223372036854775808.000000000, toUInt32(1) > 9223372036854775808.000000000, toUInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt32(1), 9223372036854775808.000000000 != toUInt32(1), 9223372036854775808.000000000 < toUInt32(1), 9223372036854775808.000000000 <= toUInt32(1), 9223372036854775808.000000000 > toUInt32(1), 9223372036854775808.000000000 >= toUInt32(1) , toInt32(1) = 9223372036854775808.000000000, toInt32(1) != 9223372036854775808.000000000, toInt32(1) < 9223372036854775808.000000000, toInt32(1) <= 9223372036854775808.000000000, toInt32(1) > 9223372036854775808.000000000, toInt32(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt32(1), 9223372036854775808.000000000 != toInt32(1), 9223372036854775808.000000000 < toInt32(1), 9223372036854775808.000000000 <= toInt32(1), 9223372036854775808.000000000 > toInt32(1), 9223372036854775808.000000000 >= toInt32(1) , toUInt64(1) = 9223372036854775808.000000000, toUInt64(1) != 9223372036854775808.000000000, toUInt64(1) < 9223372036854775808.000000000, toUInt64(1) <= 9223372036854775808.000000000, toUInt64(1) > 9223372036854775808.000000000, toUInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(1), 9223372036854775808.000000000 != toUInt64(1), 9223372036854775808.000000000 < toUInt64(1), 9223372036854775808.000000000 <= toUInt64(1), 9223372036854775808.000000000 > toUInt64(1), 9223372036854775808.000000000 >= toUInt64(1) , toInt64(1) = 9223372036854775808.000000000, toInt64(1) != 9223372036854775808.000000000, toInt64(1) < 9223372036854775808.000000000, toInt64(1) <= 9223372036854775808.000000000, toInt64(1) > 9223372036854775808.000000000, toInt64(1) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toInt64(1), 9223372036854775808.000000000 != toInt64(1), 9223372036854775808.000000000 < toInt64(1), 9223372036854775808.000000000 <= toInt64(1), 9223372036854775808.000000000 > toInt64(1), 9223372036854775808.000000000 >= toInt64(1) ;
+SELECT '1', '2251799813685248.000000000', 1 = 2251799813685248.000000000, 1 != 2251799813685248.000000000, 1 < 2251799813685248.000000000, 1 <= 2251799813685248.000000000, 1 > 2251799813685248.000000000, 1 >= 2251799813685248.000000000,	2251799813685248.000000000 = 1, 2251799813685248.000000000 != 1, 2251799813685248.000000000 < 1, 2251799813685248.000000000 <= 1, 2251799813685248.000000000 > 1, 2251799813685248.000000000 >= 1 , toUInt8(1) = 2251799813685248.000000000, toUInt8(1) != 2251799813685248.000000000, toUInt8(1) < 2251799813685248.000000000, toUInt8(1) <= 2251799813685248.000000000, toUInt8(1) > 2251799813685248.000000000, toUInt8(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt8(1), 2251799813685248.000000000 != toUInt8(1), 2251799813685248.000000000 < toUInt8(1), 2251799813685248.000000000 <= toUInt8(1), 2251799813685248.000000000 > toUInt8(1), 2251799813685248.000000000 >= toUInt8(1) , toInt8(1) = 2251799813685248.000000000, toInt8(1) != 2251799813685248.000000000, toInt8(1) < 2251799813685248.000000000, toInt8(1) <= 2251799813685248.000000000, toInt8(1) > 2251799813685248.000000000, toInt8(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt8(1), 2251799813685248.000000000 != toInt8(1), 2251799813685248.000000000 < toInt8(1), 2251799813685248.000000000 <= toInt8(1), 2251799813685248.000000000 > toInt8(1), 2251799813685248.000000000 >= toInt8(1) , toUInt16(1) = 2251799813685248.000000000, toUInt16(1) != 2251799813685248.000000000, toUInt16(1) < 2251799813685248.000000000, toUInt16(1) <= 2251799813685248.000000000, toUInt16(1) > 2251799813685248.000000000, toUInt16(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt16(1), 2251799813685248.000000000 != toUInt16(1), 2251799813685248.000000000 < toUInt16(1), 2251799813685248.000000000 <= toUInt16(1), 2251799813685248.000000000 > toUInt16(1), 2251799813685248.000000000 >= toUInt16(1) , toInt16(1) = 2251799813685248.000000000, toInt16(1) != 2251799813685248.000000000, toInt16(1) < 2251799813685248.000000000, toInt16(1) <= 2251799813685248.000000000, toInt16(1) > 2251799813685248.000000000, toInt16(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt16(1), 2251799813685248.000000000 != toInt16(1), 2251799813685248.000000000 < toInt16(1), 2251799813685248.000000000 <= toInt16(1), 2251799813685248.000000000 > toInt16(1), 2251799813685248.000000000 >= toInt16(1) , toUInt32(1) = 2251799813685248.000000000, toUInt32(1) != 2251799813685248.000000000, toUInt32(1) < 2251799813685248.000000000, toUInt32(1) <= 2251799813685248.000000000, toUInt32(1) > 2251799813685248.000000000, toUInt32(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt32(1), 2251799813685248.000000000 != toUInt32(1), 2251799813685248.000000000 < toUInt32(1), 2251799813685248.000000000 <= toUInt32(1), 2251799813685248.000000000 > toUInt32(1), 2251799813685248.000000000 >= toUInt32(1) , toInt32(1) = 2251799813685248.000000000, toInt32(1) != 2251799813685248.000000000, toInt32(1) < 2251799813685248.000000000, toInt32(1) <= 2251799813685248.000000000, toInt32(1) > 2251799813685248.000000000, toInt32(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt32(1), 2251799813685248.000000000 != toInt32(1), 2251799813685248.000000000 < toInt32(1), 2251799813685248.000000000 <= toInt32(1), 2251799813685248.000000000 > toInt32(1), 2251799813685248.000000000 >= toInt32(1) , toUInt64(1) = 2251799813685248.000000000, toUInt64(1) != 2251799813685248.000000000, toUInt64(1) < 2251799813685248.000000000, toUInt64(1) <= 2251799813685248.000000000, toUInt64(1) > 2251799813685248.000000000, toUInt64(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt64(1), 2251799813685248.000000000 != toUInt64(1), 2251799813685248.000000000 < toUInt64(1), 2251799813685248.000000000 <= toUInt64(1), 2251799813685248.000000000 > toUInt64(1), 2251799813685248.000000000 >= toUInt64(1) , toInt64(1) = 2251799813685248.000000000, toInt64(1) != 2251799813685248.000000000, toInt64(1) < 2251799813685248.000000000, toInt64(1) <= 2251799813685248.000000000, toInt64(1) > 2251799813685248.000000000, toInt64(1) >= 2251799813685248.000000000,	2251799813685248.000000000 = toInt64(1), 2251799813685248.000000000 != toInt64(1), 2251799813685248.000000000 < toInt64(1), 2251799813685248.000000000 <= toInt64(1), 2251799813685248.000000000 > toInt64(1), 2251799813685248.000000000 >= toInt64(1) ;
+SELECT '1', '4503599627370496.000000000', 1 = 4503599627370496.000000000, 1 != 4503599627370496.000000000, 1 < 4503599627370496.000000000, 1 <= 4503599627370496.000000000, 1 > 4503599627370496.000000000, 1 >= 4503599627370496.000000000,	4503599627370496.000000000 = 1, 4503599627370496.000000000 != 1, 4503599627370496.000000000 < 1, 4503599627370496.000000000 <= 1, 4503599627370496.000000000 > 1, 4503599627370496.000000000 >= 1 , toUInt8(1) = 4503599627370496.000000000, toUInt8(1) != 4503599627370496.000000000, toUInt8(1) < 4503599627370496.000000000, toUInt8(1) <= 4503599627370496.000000000, toUInt8(1) > 4503599627370496.000000000, toUInt8(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt8(1), 4503599627370496.000000000 != toUInt8(1), 4503599627370496.000000000 < toUInt8(1), 4503599627370496.000000000 <= toUInt8(1), 4503599627370496.000000000 > toUInt8(1), 4503599627370496.000000000 >= toUInt8(1) , toInt8(1) = 4503599627370496.000000000, toInt8(1) != 4503599627370496.000000000, toInt8(1) < 4503599627370496.000000000, toInt8(1) <= 4503599627370496.000000000, toInt8(1) > 4503599627370496.000000000, toInt8(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt8(1), 4503599627370496.000000000 != toInt8(1), 4503599627370496.000000000 < toInt8(1), 4503599627370496.000000000 <= toInt8(1), 4503599627370496.000000000 > toInt8(1), 4503599627370496.000000000 >= toInt8(1) , toUInt16(1) = 4503599627370496.000000000, toUInt16(1) != 4503599627370496.000000000, toUInt16(1) < 4503599627370496.000000000, toUInt16(1) <= 4503599627370496.000000000, toUInt16(1) > 4503599627370496.000000000, toUInt16(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt16(1), 4503599627370496.000000000 != toUInt16(1), 4503599627370496.000000000 < toUInt16(1), 4503599627370496.000000000 <= toUInt16(1), 4503599627370496.000000000 > toUInt16(1), 4503599627370496.000000000 >= toUInt16(1) , toInt16(1) = 4503599627370496.000000000, toInt16(1) != 4503599627370496.000000000, toInt16(1) < 4503599627370496.000000000, toInt16(1) <= 4503599627370496.000000000, toInt16(1) > 4503599627370496.000000000, toInt16(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt16(1), 4503599627370496.000000000 != toInt16(1), 4503599627370496.000000000 < toInt16(1), 4503599627370496.000000000 <= toInt16(1), 4503599627370496.000000000 > toInt16(1), 4503599627370496.000000000 >= toInt16(1) , toUInt32(1) = 4503599627370496.000000000, toUInt32(1) != 4503599627370496.000000000, toUInt32(1) < 4503599627370496.000000000, toUInt32(1) <= 4503599627370496.000000000, toUInt32(1) > 4503599627370496.000000000, toUInt32(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt32(1), 4503599627370496.000000000 != toUInt32(1), 4503599627370496.000000000 < toUInt32(1), 4503599627370496.000000000 <= toUInt32(1), 4503599627370496.000000000 > toUInt32(1), 4503599627370496.000000000 >= toUInt32(1) , toInt32(1) = 4503599627370496.000000000, toInt32(1) != 4503599627370496.000000000, toInt32(1) < 4503599627370496.000000000, toInt32(1) <= 4503599627370496.000000000, toInt32(1) > 4503599627370496.000000000, toInt32(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt32(1), 4503599627370496.000000000 != toInt32(1), 4503599627370496.000000000 < toInt32(1), 4503599627370496.000000000 <= toInt32(1), 4503599627370496.000000000 > toInt32(1), 4503599627370496.000000000 >= toInt32(1) , toUInt64(1) = 4503599627370496.000000000, toUInt64(1) != 4503599627370496.000000000, toUInt64(1) < 4503599627370496.000000000, toUInt64(1) <= 4503599627370496.000000000, toUInt64(1) > 4503599627370496.000000000, toUInt64(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt64(1), 4503599627370496.000000000 != toUInt64(1), 4503599627370496.000000000 < toUInt64(1), 4503599627370496.000000000 <= toUInt64(1), 4503599627370496.000000000 > toUInt64(1), 4503599627370496.000000000 >= toUInt64(1) , toInt64(1) = 4503599627370496.000000000, toInt64(1) != 4503599627370496.000000000, toInt64(1) < 4503599627370496.000000000, toInt64(1) <= 4503599627370496.000000000, toInt64(1) > 4503599627370496.000000000, toInt64(1) >= 4503599627370496.000000000,	4503599627370496.000000000 = toInt64(1), 4503599627370496.000000000 != toInt64(1), 4503599627370496.000000000 < toInt64(1), 4503599627370496.000000000 <= toInt64(1), 4503599627370496.000000000 > toInt64(1), 4503599627370496.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740991.000000000', 1 = 9007199254740991.000000000, 1 != 9007199254740991.000000000, 1 < 9007199254740991.000000000, 1 <= 9007199254740991.000000000, 1 > 9007199254740991.000000000, 1 >= 9007199254740991.000000000,	9007199254740991.000000000 = 1, 9007199254740991.000000000 != 1, 9007199254740991.000000000 < 1, 9007199254740991.000000000 <= 1, 9007199254740991.000000000 > 1, 9007199254740991.000000000 >= 1 , toUInt8(1) = 9007199254740991.000000000, toUInt8(1) != 9007199254740991.000000000, toUInt8(1) < 9007199254740991.000000000, toUInt8(1) <= 9007199254740991.000000000, toUInt8(1) > 9007199254740991.000000000, toUInt8(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt8(1), 9007199254740991.000000000 != toUInt8(1), 9007199254740991.000000000 < toUInt8(1), 9007199254740991.000000000 <= toUInt8(1), 9007199254740991.000000000 > toUInt8(1), 9007199254740991.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740991.000000000, toInt8(1) != 9007199254740991.000000000, toInt8(1) < 9007199254740991.000000000, toInt8(1) <= 9007199254740991.000000000, toInt8(1) > 9007199254740991.000000000, toInt8(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt8(1), 9007199254740991.000000000 != toInt8(1), 9007199254740991.000000000 < toInt8(1), 9007199254740991.000000000 <= toInt8(1), 9007199254740991.000000000 > toInt8(1), 9007199254740991.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740991.000000000, toUInt16(1) != 9007199254740991.000000000, toUInt16(1) < 9007199254740991.000000000, toUInt16(1) <= 9007199254740991.000000000, toUInt16(1) > 9007199254740991.000000000, toUInt16(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt16(1), 9007199254740991.000000000 != toUInt16(1), 9007199254740991.000000000 < toUInt16(1), 9007199254740991.000000000 <= toUInt16(1), 9007199254740991.000000000 > toUInt16(1), 9007199254740991.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740991.000000000, toInt16(1) != 9007199254740991.000000000, toInt16(1) < 9007199254740991.000000000, toInt16(1) <= 9007199254740991.000000000, toInt16(1) > 9007199254740991.000000000, toInt16(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt16(1), 9007199254740991.000000000 != toInt16(1), 9007199254740991.000000000 < toInt16(1), 9007199254740991.000000000 <= toInt16(1), 9007199254740991.000000000 > toInt16(1), 9007199254740991.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740991.000000000, toUInt32(1) != 9007199254740991.000000000, toUInt32(1) < 9007199254740991.000000000, toUInt32(1) <= 9007199254740991.000000000, toUInt32(1) > 9007199254740991.000000000, toUInt32(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt32(1), 9007199254740991.000000000 != toUInt32(1), 9007199254740991.000000000 < toUInt32(1), 9007199254740991.000000000 <= toUInt32(1), 9007199254740991.000000000 > toUInt32(1), 9007199254740991.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740991.000000000, toInt32(1) != 9007199254740991.000000000, toInt32(1) < 9007199254740991.000000000, toInt32(1) <= 9007199254740991.000000000, toInt32(1) > 9007199254740991.000000000, toInt32(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt32(1), 9007199254740991.000000000 != toInt32(1), 9007199254740991.000000000 < toInt32(1), 9007199254740991.000000000 <= toInt32(1), 9007199254740991.000000000 > toInt32(1), 9007199254740991.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740991.000000000, toUInt64(1) != 9007199254740991.000000000, toUInt64(1) < 9007199254740991.000000000, toUInt64(1) <= 9007199254740991.000000000, toUInt64(1) > 9007199254740991.000000000, toUInt64(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt64(1), 9007199254740991.000000000 != toUInt64(1), 9007199254740991.000000000 < toUInt64(1), 9007199254740991.000000000 <= toUInt64(1), 9007199254740991.000000000 > toUInt64(1), 9007199254740991.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740991.000000000, toInt64(1) != 9007199254740991.000000000, toInt64(1) < 9007199254740991.000000000, toInt64(1) <= 9007199254740991.000000000, toInt64(1) > 9007199254740991.000000000, toInt64(1) >= 9007199254740991.000000000,	9007199254740991.000000000 = toInt64(1), 9007199254740991.000000000 != toInt64(1), 9007199254740991.000000000 < toInt64(1), 9007199254740991.000000000 <= toInt64(1), 9007199254740991.000000000 > toInt64(1), 9007199254740991.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740992.000000000', 1 = 9007199254740992.000000000, 1 != 9007199254740992.000000000, 1 < 9007199254740992.000000000, 1 <= 9007199254740992.000000000, 1 > 9007199254740992.000000000, 1 >= 9007199254740992.000000000,	9007199254740992.000000000 = 1, 9007199254740992.000000000 != 1, 9007199254740992.000000000 < 1, 9007199254740992.000000000 <= 1, 9007199254740992.000000000 > 1, 9007199254740992.000000000 >= 1 , toUInt8(1) = 9007199254740992.000000000, toUInt8(1) != 9007199254740992.000000000, toUInt8(1) < 9007199254740992.000000000, toUInt8(1) <= 9007199254740992.000000000, toUInt8(1) > 9007199254740992.000000000, toUInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(1), 9007199254740992.000000000 != toUInt8(1), 9007199254740992.000000000 < toUInt8(1), 9007199254740992.000000000 <= toUInt8(1), 9007199254740992.000000000 > toUInt8(1), 9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740992.000000000, toInt8(1) != 9007199254740992.000000000, toInt8(1) < 9007199254740992.000000000, toInt8(1) <= 9007199254740992.000000000, toInt8(1) > 9007199254740992.000000000, toInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(1), 9007199254740992.000000000 != toInt8(1), 9007199254740992.000000000 < toInt8(1), 9007199254740992.000000000 <= toInt8(1), 9007199254740992.000000000 > toInt8(1), 9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740992.000000000, toUInt16(1) != 9007199254740992.000000000, toUInt16(1) < 9007199254740992.000000000, toUInt16(1) <= 9007199254740992.000000000, toUInt16(1) > 9007199254740992.000000000, toUInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(1), 9007199254740992.000000000 != toUInt16(1), 9007199254740992.000000000 < toUInt16(1), 9007199254740992.000000000 <= toUInt16(1), 9007199254740992.000000000 > toUInt16(1), 9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740992.000000000, toInt16(1) != 9007199254740992.000000000, toInt16(1) < 9007199254740992.000000000, toInt16(1) <= 9007199254740992.000000000, toInt16(1) > 9007199254740992.000000000, toInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(1), 9007199254740992.000000000 != toInt16(1), 9007199254740992.000000000 < toInt16(1), 9007199254740992.000000000 <= toInt16(1), 9007199254740992.000000000 > toInt16(1), 9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740992.000000000, toUInt32(1) != 9007199254740992.000000000, toUInt32(1) < 9007199254740992.000000000, toUInt32(1) <= 9007199254740992.000000000, toUInt32(1) > 9007199254740992.000000000, toUInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(1), 9007199254740992.000000000 != toUInt32(1), 9007199254740992.000000000 < toUInt32(1), 9007199254740992.000000000 <= toUInt32(1), 9007199254740992.000000000 > toUInt32(1), 9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740992.000000000, toInt32(1) != 9007199254740992.000000000, toInt32(1) < 9007199254740992.000000000, toInt32(1) <= 9007199254740992.000000000, toInt32(1) > 9007199254740992.000000000, toInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(1), 9007199254740992.000000000 != toInt32(1), 9007199254740992.000000000 < toInt32(1), 9007199254740992.000000000 <= toInt32(1), 9007199254740992.000000000 > toInt32(1), 9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740992.000000000, toUInt64(1) != 9007199254740992.000000000, toUInt64(1) < 9007199254740992.000000000, toUInt64(1) <= 9007199254740992.000000000, toUInt64(1) > 9007199254740992.000000000, toUInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(1), 9007199254740992.000000000 != toUInt64(1), 9007199254740992.000000000 < toUInt64(1), 9007199254740992.000000000 <= toUInt64(1), 9007199254740992.000000000 > toUInt64(1), 9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740992.000000000, toInt64(1) != 9007199254740992.000000000, toInt64(1) < 9007199254740992.000000000, toInt64(1) <= 9007199254740992.000000000, toInt64(1) > 9007199254740992.000000000, toInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(1), 9007199254740992.000000000 != toInt64(1), 9007199254740992.000000000 < toInt64(1), 9007199254740992.000000000 <= toInt64(1), 9007199254740992.000000000 > toInt64(1), 9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740992.000000000', 1 = 9007199254740992.000000000, 1 != 9007199254740992.000000000, 1 < 9007199254740992.000000000, 1 <= 9007199254740992.000000000, 1 > 9007199254740992.000000000, 1 >= 9007199254740992.000000000,	9007199254740992.000000000 = 1, 9007199254740992.000000000 != 1, 9007199254740992.000000000 < 1, 9007199254740992.000000000 <= 1, 9007199254740992.000000000 > 1, 9007199254740992.000000000 >= 1 , toUInt8(1) = 9007199254740992.000000000, toUInt8(1) != 9007199254740992.000000000, toUInt8(1) < 9007199254740992.000000000, toUInt8(1) <= 9007199254740992.000000000, toUInt8(1) > 9007199254740992.000000000, toUInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(1), 9007199254740992.000000000 != toUInt8(1), 9007199254740992.000000000 < toUInt8(1), 9007199254740992.000000000 <= toUInt8(1), 9007199254740992.000000000 > toUInt8(1), 9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740992.000000000, toInt8(1) != 9007199254740992.000000000, toInt8(1) < 9007199254740992.000000000, toInt8(1) <= 9007199254740992.000000000, toInt8(1) > 9007199254740992.000000000, toInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(1), 9007199254740992.000000000 != toInt8(1), 9007199254740992.000000000 < toInt8(1), 9007199254740992.000000000 <= toInt8(1), 9007199254740992.000000000 > toInt8(1), 9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740992.000000000, toUInt16(1) != 9007199254740992.000000000, toUInt16(1) < 9007199254740992.000000000, toUInt16(1) <= 9007199254740992.000000000, toUInt16(1) > 9007199254740992.000000000, toUInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(1), 9007199254740992.000000000 != toUInt16(1), 9007199254740992.000000000 < toUInt16(1), 9007199254740992.000000000 <= toUInt16(1), 9007199254740992.000000000 > toUInt16(1), 9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740992.000000000, toInt16(1) != 9007199254740992.000000000, toInt16(1) < 9007199254740992.000000000, toInt16(1) <= 9007199254740992.000000000, toInt16(1) > 9007199254740992.000000000, toInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(1), 9007199254740992.000000000 != toInt16(1), 9007199254740992.000000000 < toInt16(1), 9007199254740992.000000000 <= toInt16(1), 9007199254740992.000000000 > toInt16(1), 9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740992.000000000, toUInt32(1) != 9007199254740992.000000000, toUInt32(1) < 9007199254740992.000000000, toUInt32(1) <= 9007199254740992.000000000, toUInt32(1) > 9007199254740992.000000000, toUInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(1), 9007199254740992.000000000 != toUInt32(1), 9007199254740992.000000000 < toUInt32(1), 9007199254740992.000000000 <= toUInt32(1), 9007199254740992.000000000 > toUInt32(1), 9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740992.000000000, toInt32(1) != 9007199254740992.000000000, toInt32(1) < 9007199254740992.000000000, toInt32(1) <= 9007199254740992.000000000, toInt32(1) > 9007199254740992.000000000, toInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(1), 9007199254740992.000000000 != toInt32(1), 9007199254740992.000000000 < toInt32(1), 9007199254740992.000000000 <= toInt32(1), 9007199254740992.000000000 > toInt32(1), 9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740992.000000000, toUInt64(1) != 9007199254740992.000000000, toUInt64(1) < 9007199254740992.000000000, toUInt64(1) <= 9007199254740992.000000000, toUInt64(1) > 9007199254740992.000000000, toUInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(1), 9007199254740992.000000000 != toUInt64(1), 9007199254740992.000000000 < toUInt64(1), 9007199254740992.000000000 <= toUInt64(1), 9007199254740992.000000000 > toUInt64(1), 9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740992.000000000, toInt64(1) != 9007199254740992.000000000, toInt64(1) < 9007199254740992.000000000, toInt64(1) <= 9007199254740992.000000000, toInt64(1) > 9007199254740992.000000000, toInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(1), 9007199254740992.000000000 != toInt64(1), 9007199254740992.000000000 < toInt64(1), 9007199254740992.000000000 <= toInt64(1), 9007199254740992.000000000 > toInt64(1), 9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '9007199254740994.000000000', 1 = 9007199254740994.000000000, 1 != 9007199254740994.000000000, 1 < 9007199254740994.000000000, 1 <= 9007199254740994.000000000, 1 > 9007199254740994.000000000, 1 >= 9007199254740994.000000000,	9007199254740994.000000000 = 1, 9007199254740994.000000000 != 1, 9007199254740994.000000000 < 1, 9007199254740994.000000000 <= 1, 9007199254740994.000000000 > 1, 9007199254740994.000000000 >= 1 , toUInt8(1) = 9007199254740994.000000000, toUInt8(1) != 9007199254740994.000000000, toUInt8(1) < 9007199254740994.000000000, toUInt8(1) <= 9007199254740994.000000000, toUInt8(1) > 9007199254740994.000000000, toUInt8(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt8(1), 9007199254740994.000000000 != toUInt8(1), 9007199254740994.000000000 < toUInt8(1), 9007199254740994.000000000 <= toUInt8(1), 9007199254740994.000000000 > toUInt8(1), 9007199254740994.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740994.000000000, toInt8(1) != 9007199254740994.000000000, toInt8(1) < 9007199254740994.000000000, toInt8(1) <= 9007199254740994.000000000, toInt8(1) > 9007199254740994.000000000, toInt8(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt8(1), 9007199254740994.000000000 != toInt8(1), 9007199254740994.000000000 < toInt8(1), 9007199254740994.000000000 <= toInt8(1), 9007199254740994.000000000 > toInt8(1), 9007199254740994.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740994.000000000, toUInt16(1) != 9007199254740994.000000000, toUInt16(1) < 9007199254740994.000000000, toUInt16(1) <= 9007199254740994.000000000, toUInt16(1) > 9007199254740994.000000000, toUInt16(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt16(1), 9007199254740994.000000000 != toUInt16(1), 9007199254740994.000000000 < toUInt16(1), 9007199254740994.000000000 <= toUInt16(1), 9007199254740994.000000000 > toUInt16(1), 9007199254740994.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740994.000000000, toInt16(1) != 9007199254740994.000000000, toInt16(1) < 9007199254740994.000000000, toInt16(1) <= 9007199254740994.000000000, toInt16(1) > 9007199254740994.000000000, toInt16(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt16(1), 9007199254740994.000000000 != toInt16(1), 9007199254740994.000000000 < toInt16(1), 9007199254740994.000000000 <= toInt16(1), 9007199254740994.000000000 > toInt16(1), 9007199254740994.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740994.000000000, toUInt32(1) != 9007199254740994.000000000, toUInt32(1) < 9007199254740994.000000000, toUInt32(1) <= 9007199254740994.000000000, toUInt32(1) > 9007199254740994.000000000, toUInt32(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt32(1), 9007199254740994.000000000 != toUInt32(1), 9007199254740994.000000000 < toUInt32(1), 9007199254740994.000000000 <= toUInt32(1), 9007199254740994.000000000 > toUInt32(1), 9007199254740994.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740994.000000000, toInt32(1) != 9007199254740994.000000000, toInt32(1) < 9007199254740994.000000000, toInt32(1) <= 9007199254740994.000000000, toInt32(1) > 9007199254740994.000000000, toInt32(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt32(1), 9007199254740994.000000000 != toInt32(1), 9007199254740994.000000000 < toInt32(1), 9007199254740994.000000000 <= toInt32(1), 9007199254740994.000000000 > toInt32(1), 9007199254740994.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740994.000000000, toUInt64(1) != 9007199254740994.000000000, toUInt64(1) < 9007199254740994.000000000, toUInt64(1) <= 9007199254740994.000000000, toUInt64(1) > 9007199254740994.000000000, toUInt64(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt64(1), 9007199254740994.000000000 != toUInt64(1), 9007199254740994.000000000 < toUInt64(1), 9007199254740994.000000000 <= toUInt64(1), 9007199254740994.000000000 > toUInt64(1), 9007199254740994.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740994.000000000, toInt64(1) != 9007199254740994.000000000, toInt64(1) < 9007199254740994.000000000, toInt64(1) <= 9007199254740994.000000000, toInt64(1) > 9007199254740994.000000000, toInt64(1) >= 9007199254740994.000000000,	9007199254740994.000000000 = toInt64(1), 9007199254740994.000000000 != toInt64(1), 9007199254740994.000000000 < toInt64(1), 9007199254740994.000000000 <= toInt64(1), 9007199254740994.000000000 > toInt64(1), 9007199254740994.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740991.000000000', 1 = -9007199254740991.000000000, 1 != -9007199254740991.000000000, 1 < -9007199254740991.000000000, 1 <= -9007199254740991.000000000, 1 > -9007199254740991.000000000, 1 >= -9007199254740991.000000000,	-9007199254740991.000000000 = 1, -9007199254740991.000000000 != 1, -9007199254740991.000000000 < 1, -9007199254740991.000000000 <= 1, -9007199254740991.000000000 > 1, -9007199254740991.000000000 >= 1 , toUInt8(1) = -9007199254740991.000000000, toUInt8(1) != -9007199254740991.000000000, toUInt8(1) < -9007199254740991.000000000, toUInt8(1) <= -9007199254740991.000000000, toUInt8(1) > -9007199254740991.000000000, toUInt8(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt8(1), -9007199254740991.000000000 != toUInt8(1), -9007199254740991.000000000 < toUInt8(1), -9007199254740991.000000000 <= toUInt8(1), -9007199254740991.000000000 > toUInt8(1), -9007199254740991.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740991.000000000, toInt8(1) != -9007199254740991.000000000, toInt8(1) < -9007199254740991.000000000, toInt8(1) <= -9007199254740991.000000000, toInt8(1) > -9007199254740991.000000000, toInt8(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt8(1), -9007199254740991.000000000 != toInt8(1), -9007199254740991.000000000 < toInt8(1), -9007199254740991.000000000 <= toInt8(1), -9007199254740991.000000000 > toInt8(1), -9007199254740991.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740991.000000000, toUInt16(1) != -9007199254740991.000000000, toUInt16(1) < -9007199254740991.000000000, toUInt16(1) <= -9007199254740991.000000000, toUInt16(1) > -9007199254740991.000000000, toUInt16(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt16(1), -9007199254740991.000000000 != toUInt16(1), -9007199254740991.000000000 < toUInt16(1), -9007199254740991.000000000 <= toUInt16(1), -9007199254740991.000000000 > toUInt16(1), -9007199254740991.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740991.000000000, toInt16(1) != -9007199254740991.000000000, toInt16(1) < -9007199254740991.000000000, toInt16(1) <= -9007199254740991.000000000, toInt16(1) > -9007199254740991.000000000, toInt16(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt16(1), -9007199254740991.000000000 != toInt16(1), -9007199254740991.000000000 < toInt16(1), -9007199254740991.000000000 <= toInt16(1), -9007199254740991.000000000 > toInt16(1), -9007199254740991.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740991.000000000, toUInt32(1) != -9007199254740991.000000000, toUInt32(1) < -9007199254740991.000000000, toUInt32(1) <= -9007199254740991.000000000, toUInt32(1) > -9007199254740991.000000000, toUInt32(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt32(1), -9007199254740991.000000000 != toUInt32(1), -9007199254740991.000000000 < toUInt32(1), -9007199254740991.000000000 <= toUInt32(1), -9007199254740991.000000000 > toUInt32(1), -9007199254740991.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740991.000000000, toInt32(1) != -9007199254740991.000000000, toInt32(1) < -9007199254740991.000000000, toInt32(1) <= -9007199254740991.000000000, toInt32(1) > -9007199254740991.000000000, toInt32(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt32(1), -9007199254740991.000000000 != toInt32(1), -9007199254740991.000000000 < toInt32(1), -9007199254740991.000000000 <= toInt32(1), -9007199254740991.000000000 > toInt32(1), -9007199254740991.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740991.000000000, toUInt64(1) != -9007199254740991.000000000, toUInt64(1) < -9007199254740991.000000000, toUInt64(1) <= -9007199254740991.000000000, toUInt64(1) > -9007199254740991.000000000, toUInt64(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt64(1), -9007199254740991.000000000 != toUInt64(1), -9007199254740991.000000000 < toUInt64(1), -9007199254740991.000000000 <= toUInt64(1), -9007199254740991.000000000 > toUInt64(1), -9007199254740991.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740991.000000000, toInt64(1) != -9007199254740991.000000000, toInt64(1) < -9007199254740991.000000000, toInt64(1) <= -9007199254740991.000000000, toInt64(1) > -9007199254740991.000000000, toInt64(1) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toInt64(1), -9007199254740991.000000000 != toInt64(1), -9007199254740991.000000000 < toInt64(1), -9007199254740991.000000000 <= toInt64(1), -9007199254740991.000000000 > toInt64(1), -9007199254740991.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740992.000000000', 1 = -9007199254740992.000000000, 1 != -9007199254740992.000000000, 1 < -9007199254740992.000000000, 1 <= -9007199254740992.000000000, 1 > -9007199254740992.000000000, 1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 1, -9007199254740992.000000000 != 1, -9007199254740992.000000000 < 1, -9007199254740992.000000000 <= 1, -9007199254740992.000000000 > 1, -9007199254740992.000000000 >= 1 , toUInt8(1) = -9007199254740992.000000000, toUInt8(1) != -9007199254740992.000000000, toUInt8(1) < -9007199254740992.000000000, toUInt8(1) <= -9007199254740992.000000000, toUInt8(1) > -9007199254740992.000000000, toUInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(1), -9007199254740992.000000000 != toUInt8(1), -9007199254740992.000000000 < toUInt8(1), -9007199254740992.000000000 <= toUInt8(1), -9007199254740992.000000000 > toUInt8(1), -9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740992.000000000, toInt8(1) != -9007199254740992.000000000, toInt8(1) < -9007199254740992.000000000, toInt8(1) <= -9007199254740992.000000000, toInt8(1) > -9007199254740992.000000000, toInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(1), -9007199254740992.000000000 != toInt8(1), -9007199254740992.000000000 < toInt8(1), -9007199254740992.000000000 <= toInt8(1), -9007199254740992.000000000 > toInt8(1), -9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740992.000000000, toUInt16(1) != -9007199254740992.000000000, toUInt16(1) < -9007199254740992.000000000, toUInt16(1) <= -9007199254740992.000000000, toUInt16(1) > -9007199254740992.000000000, toUInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(1), -9007199254740992.000000000 != toUInt16(1), -9007199254740992.000000000 < toUInt16(1), -9007199254740992.000000000 <= toUInt16(1), -9007199254740992.000000000 > toUInt16(1), -9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740992.000000000, toInt16(1) != -9007199254740992.000000000, toInt16(1) < -9007199254740992.000000000, toInt16(1) <= -9007199254740992.000000000, toInt16(1) > -9007199254740992.000000000, toInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(1), -9007199254740992.000000000 != toInt16(1), -9007199254740992.000000000 < toInt16(1), -9007199254740992.000000000 <= toInt16(1), -9007199254740992.000000000 > toInt16(1), -9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740992.000000000, toUInt32(1) != -9007199254740992.000000000, toUInt32(1) < -9007199254740992.000000000, toUInt32(1) <= -9007199254740992.000000000, toUInt32(1) > -9007199254740992.000000000, toUInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(1), -9007199254740992.000000000 != toUInt32(1), -9007199254740992.000000000 < toUInt32(1), -9007199254740992.000000000 <= toUInt32(1), -9007199254740992.000000000 > toUInt32(1), -9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740992.000000000, toInt32(1) != -9007199254740992.000000000, toInt32(1) < -9007199254740992.000000000, toInt32(1) <= -9007199254740992.000000000, toInt32(1) > -9007199254740992.000000000, toInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(1), -9007199254740992.000000000 != toInt32(1), -9007199254740992.000000000 < toInt32(1), -9007199254740992.000000000 <= toInt32(1), -9007199254740992.000000000 > toInt32(1), -9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740992.000000000, toUInt64(1) != -9007199254740992.000000000, toUInt64(1) < -9007199254740992.000000000, toUInt64(1) <= -9007199254740992.000000000, toUInt64(1) > -9007199254740992.000000000, toUInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(1), -9007199254740992.000000000 != toUInt64(1), -9007199254740992.000000000 < toUInt64(1), -9007199254740992.000000000 <= toUInt64(1), -9007199254740992.000000000 > toUInt64(1), -9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740992.000000000, toInt64(1) != -9007199254740992.000000000, toInt64(1) < -9007199254740992.000000000, toInt64(1) <= -9007199254740992.000000000, toInt64(1) > -9007199254740992.000000000, toInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(1), -9007199254740992.000000000 != toInt64(1), -9007199254740992.000000000 < toInt64(1), -9007199254740992.000000000 <= toInt64(1), -9007199254740992.000000000 > toInt64(1), -9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740992.000000000', 1 = -9007199254740992.000000000, 1 != -9007199254740992.000000000, 1 < -9007199254740992.000000000, 1 <= -9007199254740992.000000000, 1 > -9007199254740992.000000000, 1 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 1, -9007199254740992.000000000 != 1, -9007199254740992.000000000 < 1, -9007199254740992.000000000 <= 1, -9007199254740992.000000000 > 1, -9007199254740992.000000000 >= 1 , toUInt8(1) = -9007199254740992.000000000, toUInt8(1) != -9007199254740992.000000000, toUInt8(1) < -9007199254740992.000000000, toUInt8(1) <= -9007199254740992.000000000, toUInt8(1) > -9007199254740992.000000000, toUInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt8(1), -9007199254740992.000000000 != toUInt8(1), -9007199254740992.000000000 < toUInt8(1), -9007199254740992.000000000 <= toUInt8(1), -9007199254740992.000000000 > toUInt8(1), -9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740992.000000000, toInt8(1) != -9007199254740992.000000000, toInt8(1) < -9007199254740992.000000000, toInt8(1) <= -9007199254740992.000000000, toInt8(1) > -9007199254740992.000000000, toInt8(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt8(1), -9007199254740992.000000000 != toInt8(1), -9007199254740992.000000000 < toInt8(1), -9007199254740992.000000000 <= toInt8(1), -9007199254740992.000000000 > toInt8(1), -9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740992.000000000, toUInt16(1) != -9007199254740992.000000000, toUInt16(1) < -9007199254740992.000000000, toUInt16(1) <= -9007199254740992.000000000, toUInt16(1) > -9007199254740992.000000000, toUInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt16(1), -9007199254740992.000000000 != toUInt16(1), -9007199254740992.000000000 < toUInt16(1), -9007199254740992.000000000 <= toUInt16(1), -9007199254740992.000000000 > toUInt16(1), -9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740992.000000000, toInt16(1) != -9007199254740992.000000000, toInt16(1) < -9007199254740992.000000000, toInt16(1) <= -9007199254740992.000000000, toInt16(1) > -9007199254740992.000000000, toInt16(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt16(1), -9007199254740992.000000000 != toInt16(1), -9007199254740992.000000000 < toInt16(1), -9007199254740992.000000000 <= toInt16(1), -9007199254740992.000000000 > toInt16(1), -9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740992.000000000, toUInt32(1) != -9007199254740992.000000000, toUInt32(1) < -9007199254740992.000000000, toUInt32(1) <= -9007199254740992.000000000, toUInt32(1) > -9007199254740992.000000000, toUInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt32(1), -9007199254740992.000000000 != toUInt32(1), -9007199254740992.000000000 < toUInt32(1), -9007199254740992.000000000 <= toUInt32(1), -9007199254740992.000000000 > toUInt32(1), -9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740992.000000000, toInt32(1) != -9007199254740992.000000000, toInt32(1) < -9007199254740992.000000000, toInt32(1) <= -9007199254740992.000000000, toInt32(1) > -9007199254740992.000000000, toInt32(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt32(1), -9007199254740992.000000000 != toInt32(1), -9007199254740992.000000000 < toInt32(1), -9007199254740992.000000000 <= toInt32(1), -9007199254740992.000000000 > toInt32(1), -9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740992.000000000, toUInt64(1) != -9007199254740992.000000000, toUInt64(1) < -9007199254740992.000000000, toUInt64(1) <= -9007199254740992.000000000, toUInt64(1) > -9007199254740992.000000000, toUInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(1), -9007199254740992.000000000 != toUInt64(1), -9007199254740992.000000000 < toUInt64(1), -9007199254740992.000000000 <= toUInt64(1), -9007199254740992.000000000 > toUInt64(1), -9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740992.000000000, toInt64(1) != -9007199254740992.000000000, toInt64(1) < -9007199254740992.000000000, toInt64(1) <= -9007199254740992.000000000, toInt64(1) > -9007199254740992.000000000, toInt64(1) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toInt64(1), -9007199254740992.000000000 != toInt64(1), -9007199254740992.000000000 < toInt64(1), -9007199254740992.000000000 <= toInt64(1), -9007199254740992.000000000 > toInt64(1), -9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '-9007199254740994.000000000', 1 = -9007199254740994.000000000, 1 != -9007199254740994.000000000, 1 < -9007199254740994.000000000, 1 <= -9007199254740994.000000000, 1 > -9007199254740994.000000000, 1 >= -9007199254740994.000000000,	-9007199254740994.000000000 = 1, -9007199254740994.000000000 != 1, -9007199254740994.000000000 < 1, -9007199254740994.000000000 <= 1, -9007199254740994.000000000 > 1, -9007199254740994.000000000 >= 1 , toUInt8(1) = -9007199254740994.000000000, toUInt8(1) != -9007199254740994.000000000, toUInt8(1) < -9007199254740994.000000000, toUInt8(1) <= -9007199254740994.000000000, toUInt8(1) > -9007199254740994.000000000, toUInt8(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt8(1), -9007199254740994.000000000 != toUInt8(1), -9007199254740994.000000000 < toUInt8(1), -9007199254740994.000000000 <= toUInt8(1), -9007199254740994.000000000 > toUInt8(1), -9007199254740994.000000000 >= toUInt8(1) , toInt8(1) = -9007199254740994.000000000, toInt8(1) != -9007199254740994.000000000, toInt8(1) < -9007199254740994.000000000, toInt8(1) <= -9007199254740994.000000000, toInt8(1) > -9007199254740994.000000000, toInt8(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt8(1), -9007199254740994.000000000 != toInt8(1), -9007199254740994.000000000 < toInt8(1), -9007199254740994.000000000 <= toInt8(1), -9007199254740994.000000000 > toInt8(1), -9007199254740994.000000000 >= toInt8(1) , toUInt16(1) = -9007199254740994.000000000, toUInt16(1) != -9007199254740994.000000000, toUInt16(1) < -9007199254740994.000000000, toUInt16(1) <= -9007199254740994.000000000, toUInt16(1) > -9007199254740994.000000000, toUInt16(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt16(1), -9007199254740994.000000000 != toUInt16(1), -9007199254740994.000000000 < toUInt16(1), -9007199254740994.000000000 <= toUInt16(1), -9007199254740994.000000000 > toUInt16(1), -9007199254740994.000000000 >= toUInt16(1) , toInt16(1) = -9007199254740994.000000000, toInt16(1) != -9007199254740994.000000000, toInt16(1) < -9007199254740994.000000000, toInt16(1) <= -9007199254740994.000000000, toInt16(1) > -9007199254740994.000000000, toInt16(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt16(1), -9007199254740994.000000000 != toInt16(1), -9007199254740994.000000000 < toInt16(1), -9007199254740994.000000000 <= toInt16(1), -9007199254740994.000000000 > toInt16(1), -9007199254740994.000000000 >= toInt16(1) , toUInt32(1) = -9007199254740994.000000000, toUInt32(1) != -9007199254740994.000000000, toUInt32(1) < -9007199254740994.000000000, toUInt32(1) <= -9007199254740994.000000000, toUInt32(1) > -9007199254740994.000000000, toUInt32(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt32(1), -9007199254740994.000000000 != toUInt32(1), -9007199254740994.000000000 < toUInt32(1), -9007199254740994.000000000 <= toUInt32(1), -9007199254740994.000000000 > toUInt32(1), -9007199254740994.000000000 >= toUInt32(1) , toInt32(1) = -9007199254740994.000000000, toInt32(1) != -9007199254740994.000000000, toInt32(1) < -9007199254740994.000000000, toInt32(1) <= -9007199254740994.000000000, toInt32(1) > -9007199254740994.000000000, toInt32(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt32(1), -9007199254740994.000000000 != toInt32(1), -9007199254740994.000000000 < toInt32(1), -9007199254740994.000000000 <= toInt32(1), -9007199254740994.000000000 > toInt32(1), -9007199254740994.000000000 >= toInt32(1) , toUInt64(1) = -9007199254740994.000000000, toUInt64(1) != -9007199254740994.000000000, toUInt64(1) < -9007199254740994.000000000, toUInt64(1) <= -9007199254740994.000000000, toUInt64(1) > -9007199254740994.000000000, toUInt64(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt64(1), -9007199254740994.000000000 != toUInt64(1), -9007199254740994.000000000 < toUInt64(1), -9007199254740994.000000000 <= toUInt64(1), -9007199254740994.000000000 > toUInt64(1), -9007199254740994.000000000 >= toUInt64(1) , toInt64(1) = -9007199254740994.000000000, toInt64(1) != -9007199254740994.000000000, toInt64(1) < -9007199254740994.000000000, toInt64(1) <= -9007199254740994.000000000, toInt64(1) > -9007199254740994.000000000, toInt64(1) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toInt64(1), -9007199254740994.000000000 != toInt64(1), -9007199254740994.000000000 < toInt64(1), -9007199254740994.000000000 <= toInt64(1), -9007199254740994.000000000 > toInt64(1), -9007199254740994.000000000 >= toInt64(1) ;
+SELECT '1', '104.000000000', 1 = 104.000000000, 1 != 104.000000000, 1 < 104.000000000, 1 <= 104.000000000, 1 > 104.000000000, 1 >= 104.000000000,	104.000000000 = 1, 104.000000000 != 1, 104.000000000 < 1, 104.000000000 <= 1, 104.000000000 > 1, 104.000000000 >= 1 , toUInt8(1) = 104.000000000, toUInt8(1) != 104.000000000, toUInt8(1) < 104.000000000, toUInt8(1) <= 104.000000000, toUInt8(1) > 104.000000000, toUInt8(1) >= 104.000000000,	104.000000000 = toUInt8(1), 104.000000000 != toUInt8(1), 104.000000000 < toUInt8(1), 104.000000000 <= toUInt8(1), 104.000000000 > toUInt8(1), 104.000000000 >= toUInt8(1) , toInt8(1) = 104.000000000, toInt8(1) != 104.000000000, toInt8(1) < 104.000000000, toInt8(1) <= 104.000000000, toInt8(1) > 104.000000000, toInt8(1) >= 104.000000000,	104.000000000 = toInt8(1), 104.000000000 != toInt8(1), 104.000000000 < toInt8(1), 104.000000000 <= toInt8(1), 104.000000000 > toInt8(1), 104.000000000 >= toInt8(1) , toUInt16(1) = 104.000000000, toUInt16(1) != 104.000000000, toUInt16(1) < 104.000000000, toUInt16(1) <= 104.000000000, toUInt16(1) > 104.000000000, toUInt16(1) >= 104.000000000,	104.000000000 = toUInt16(1), 104.000000000 != toUInt16(1), 104.000000000 < toUInt16(1), 104.000000000 <= toUInt16(1), 104.000000000 > toUInt16(1), 104.000000000 >= toUInt16(1) , toInt16(1) = 104.000000000, toInt16(1) != 104.000000000, toInt16(1) < 104.000000000, toInt16(1) <= 104.000000000, toInt16(1) > 104.000000000, toInt16(1) >= 104.000000000,	104.000000000 = toInt16(1), 104.000000000 != toInt16(1), 104.000000000 < toInt16(1), 104.000000000 <= toInt16(1), 104.000000000 > toInt16(1), 104.000000000 >= toInt16(1) , toUInt32(1) = 104.000000000, toUInt32(1) != 104.000000000, toUInt32(1) < 104.000000000, toUInt32(1) <= 104.000000000, toUInt32(1) > 104.000000000, toUInt32(1) >= 104.000000000,	104.000000000 = toUInt32(1), 104.000000000 != toUInt32(1), 104.000000000 < toUInt32(1), 104.000000000 <= toUInt32(1), 104.000000000 > toUInt32(1), 104.000000000 >= toUInt32(1) , toInt32(1) = 104.000000000, toInt32(1) != 104.000000000, toInt32(1) < 104.000000000, toInt32(1) <= 104.000000000, toInt32(1) > 104.000000000, toInt32(1) >= 104.000000000,	104.000000000 = toInt32(1), 104.000000000 != toInt32(1), 104.000000000 < toInt32(1), 104.000000000 <= toInt32(1), 104.000000000 > toInt32(1), 104.000000000 >= toInt32(1) , toUInt64(1) = 104.000000000, toUInt64(1) != 104.000000000, toUInt64(1) < 104.000000000, toUInt64(1) <= 104.000000000, toUInt64(1) > 104.000000000, toUInt64(1) >= 104.000000000,	104.000000000 = toUInt64(1), 104.000000000 != toUInt64(1), 104.000000000 < toUInt64(1), 104.000000000 <= toUInt64(1), 104.000000000 > toUInt64(1), 104.000000000 >= toUInt64(1) , toInt64(1) = 104.000000000, toInt64(1) != 104.000000000, toInt64(1) < 104.000000000, toInt64(1) <= 104.000000000, toInt64(1) > 104.000000000, toInt64(1) >= 104.000000000,	104.000000000 = toInt64(1), 104.000000000 != toInt64(1), 104.000000000 < toInt64(1), 104.000000000 <= toInt64(1), 104.000000000 > toInt64(1), 104.000000000 >= toInt64(1) ;
+SELECT '1', '-4503599627370496.000000000', 1 = -4503599627370496.000000000, 1 != -4503599627370496.000000000, 1 < -4503599627370496.000000000, 1 <= -4503599627370496.000000000, 1 > -4503599627370496.000000000, 1 >= -4503599627370496.000000000,	-4503599627370496.000000000 = 1, -4503599627370496.000000000 != 1, -4503599627370496.000000000 < 1, -4503599627370496.000000000 <= 1, -4503599627370496.000000000 > 1, -4503599627370496.000000000 >= 1 , toUInt8(1) = -4503599627370496.000000000, toUInt8(1) != -4503599627370496.000000000, toUInt8(1) < -4503599627370496.000000000, toUInt8(1) <= -4503599627370496.000000000, toUInt8(1) > -4503599627370496.000000000, toUInt8(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt8(1), -4503599627370496.000000000 != toUInt8(1), -4503599627370496.000000000 < toUInt8(1), -4503599627370496.000000000 <= toUInt8(1), -4503599627370496.000000000 > toUInt8(1), -4503599627370496.000000000 >= toUInt8(1) , toInt8(1) = -4503599627370496.000000000, toInt8(1) != -4503599627370496.000000000, toInt8(1) < -4503599627370496.000000000, toInt8(1) <= -4503599627370496.000000000, toInt8(1) > -4503599627370496.000000000, toInt8(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt8(1), -4503599627370496.000000000 != toInt8(1), -4503599627370496.000000000 < toInt8(1), -4503599627370496.000000000 <= toInt8(1), -4503599627370496.000000000 > toInt8(1), -4503599627370496.000000000 >= toInt8(1) , toUInt16(1) = -4503599627370496.000000000, toUInt16(1) != -4503599627370496.000000000, toUInt16(1) < -4503599627370496.000000000, toUInt16(1) <= -4503599627370496.000000000, toUInt16(1) > -4503599627370496.000000000, toUInt16(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt16(1), -4503599627370496.000000000 != toUInt16(1), -4503599627370496.000000000 < toUInt16(1), -4503599627370496.000000000 <= toUInt16(1), -4503599627370496.000000000 > toUInt16(1), -4503599627370496.000000000 >= toUInt16(1) , toInt16(1) = -4503599627370496.000000000, toInt16(1) != -4503599627370496.000000000, toInt16(1) < -4503599627370496.000000000, toInt16(1) <= -4503599627370496.000000000, toInt16(1) > -4503599627370496.000000000, toInt16(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt16(1), -4503599627370496.000000000 != toInt16(1), -4503599627370496.000000000 < toInt16(1), -4503599627370496.000000000 <= toInt16(1), -4503599627370496.000000000 > toInt16(1), -4503599627370496.000000000 >= toInt16(1) , toUInt32(1) = -4503599627370496.000000000, toUInt32(1) != -4503599627370496.000000000, toUInt32(1) < -4503599627370496.000000000, toUInt32(1) <= -4503599627370496.000000000, toUInt32(1) > -4503599627370496.000000000, toUInt32(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt32(1), -4503599627370496.000000000 != toUInt32(1), -4503599627370496.000000000 < toUInt32(1), -4503599627370496.000000000 <= toUInt32(1), -4503599627370496.000000000 > toUInt32(1), -4503599627370496.000000000 >= toUInt32(1) , toInt32(1) = -4503599627370496.000000000, toInt32(1) != -4503599627370496.000000000, toInt32(1) < -4503599627370496.000000000, toInt32(1) <= -4503599627370496.000000000, toInt32(1) > -4503599627370496.000000000, toInt32(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt32(1), -4503599627370496.000000000 != toInt32(1), -4503599627370496.000000000 < toInt32(1), -4503599627370496.000000000 <= toInt32(1), -4503599627370496.000000000 > toInt32(1), -4503599627370496.000000000 >= toInt32(1) , toUInt64(1) = -4503599627370496.000000000, toUInt64(1) != -4503599627370496.000000000, toUInt64(1) < -4503599627370496.000000000, toUInt64(1) <= -4503599627370496.000000000, toUInt64(1) > -4503599627370496.000000000, toUInt64(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt64(1), -4503599627370496.000000000 != toUInt64(1), -4503599627370496.000000000 < toUInt64(1), -4503599627370496.000000000 <= toUInt64(1), -4503599627370496.000000000 > toUInt64(1), -4503599627370496.000000000 >= toUInt64(1) , toInt64(1) = -4503599627370496.000000000, toInt64(1) != -4503599627370496.000000000, toInt64(1) < -4503599627370496.000000000, toInt64(1) <= -4503599627370496.000000000, toInt64(1) > -4503599627370496.000000000, toInt64(1) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toInt64(1), -4503599627370496.000000000 != toInt64(1), -4503599627370496.000000000 < toInt64(1), -4503599627370496.000000000 <= toInt64(1), -4503599627370496.000000000 > toInt64(1), -4503599627370496.000000000 >= toInt64(1) ;
+SELECT '1', '-0.500000000', 1 = -0.500000000, 1 != -0.500000000, 1 < -0.500000000, 1 <= -0.500000000, 1 > -0.500000000, 1 >= -0.500000000,	-0.500000000 = 1, -0.500000000 != 1, -0.500000000 < 1, -0.500000000 <= 1, -0.500000000 > 1, -0.500000000 >= 1 , toUInt8(1) = -0.500000000, toUInt8(1) != -0.500000000, toUInt8(1) < -0.500000000, toUInt8(1) <= -0.500000000, toUInt8(1) > -0.500000000, toUInt8(1) >= -0.500000000,	-0.500000000 = toUInt8(1), -0.500000000 != toUInt8(1), -0.500000000 < toUInt8(1), -0.500000000 <= toUInt8(1), -0.500000000 > toUInt8(1), -0.500000000 >= toUInt8(1) , toInt8(1) = -0.500000000, toInt8(1) != -0.500000000, toInt8(1) < -0.500000000, toInt8(1) <= -0.500000000, toInt8(1) > -0.500000000, toInt8(1) >= -0.500000000,	-0.500000000 = toInt8(1), -0.500000000 != toInt8(1), -0.500000000 < toInt8(1), -0.500000000 <= toInt8(1), -0.500000000 > toInt8(1), -0.500000000 >= toInt8(1) , toUInt16(1) = -0.500000000, toUInt16(1) != -0.500000000, toUInt16(1) < -0.500000000, toUInt16(1) <= -0.500000000, toUInt16(1) > -0.500000000, toUInt16(1) >= -0.500000000,	-0.500000000 = toUInt16(1), -0.500000000 != toUInt16(1), -0.500000000 < toUInt16(1), -0.500000000 <= toUInt16(1), -0.500000000 > toUInt16(1), -0.500000000 >= toUInt16(1) , toInt16(1) = -0.500000000, toInt16(1) != -0.500000000, toInt16(1) < -0.500000000, toInt16(1) <= -0.500000000, toInt16(1) > -0.500000000, toInt16(1) >= -0.500000000,	-0.500000000 = toInt16(1), -0.500000000 != toInt16(1), -0.500000000 < toInt16(1), -0.500000000 <= toInt16(1), -0.500000000 > toInt16(1), -0.500000000 >= toInt16(1) , toUInt32(1) = -0.500000000, toUInt32(1) != -0.500000000, toUInt32(1) < -0.500000000, toUInt32(1) <= -0.500000000, toUInt32(1) > -0.500000000, toUInt32(1) >= -0.500000000,	-0.500000000 = toUInt32(1), -0.500000000 != toUInt32(1), -0.500000000 < toUInt32(1), -0.500000000 <= toUInt32(1), -0.500000000 > toUInt32(1), -0.500000000 >= toUInt32(1) , toInt32(1) = -0.500000000, toInt32(1) != -0.500000000, toInt32(1) < -0.500000000, toInt32(1) <= -0.500000000, toInt32(1) > -0.500000000, toInt32(1) >= -0.500000000,	-0.500000000 = toInt32(1), -0.500000000 != toInt32(1), -0.500000000 < toInt32(1), -0.500000000 <= toInt32(1), -0.500000000 > toInt32(1), -0.500000000 >= toInt32(1) , toUInt64(1) = -0.500000000, toUInt64(1) != -0.500000000, toUInt64(1) < -0.500000000, toUInt64(1) <= -0.500000000, toUInt64(1) > -0.500000000, toUInt64(1) >= -0.500000000,	-0.500000000 = toUInt64(1), -0.500000000 != toUInt64(1), -0.500000000 < toUInt64(1), -0.500000000 <= toUInt64(1), -0.500000000 > toUInt64(1), -0.500000000 >= toUInt64(1) , toInt64(1) = -0.500000000, toInt64(1) != -0.500000000, toInt64(1) < -0.500000000, toInt64(1) <= -0.500000000, toInt64(1) > -0.500000000, toInt64(1) >= -0.500000000,	-0.500000000 = toInt64(1), -0.500000000 != toInt64(1), -0.500000000 < toInt64(1), -0.500000000 <= toInt64(1), -0.500000000 > toInt64(1), -0.500000000 >= toInt64(1) ;
+SELECT '1', '0.500000000', 1 = 0.500000000, 1 != 0.500000000, 1 < 0.500000000, 1 <= 0.500000000, 1 > 0.500000000, 1 >= 0.500000000,	0.500000000 = 1, 0.500000000 != 1, 0.500000000 < 1, 0.500000000 <= 1, 0.500000000 > 1, 0.500000000 >= 1 , toUInt8(1) = 0.500000000, toUInt8(1) != 0.500000000, toUInt8(1) < 0.500000000, toUInt8(1) <= 0.500000000, toUInt8(1) > 0.500000000, toUInt8(1) >= 0.500000000,	0.500000000 = toUInt8(1), 0.500000000 != toUInt8(1), 0.500000000 < toUInt8(1), 0.500000000 <= toUInt8(1), 0.500000000 > toUInt8(1), 0.500000000 >= toUInt8(1) , toInt8(1) = 0.500000000, toInt8(1) != 0.500000000, toInt8(1) < 0.500000000, toInt8(1) <= 0.500000000, toInt8(1) > 0.500000000, toInt8(1) >= 0.500000000,	0.500000000 = toInt8(1), 0.500000000 != toInt8(1), 0.500000000 < toInt8(1), 0.500000000 <= toInt8(1), 0.500000000 > toInt8(1), 0.500000000 >= toInt8(1) , toUInt16(1) = 0.500000000, toUInt16(1) != 0.500000000, toUInt16(1) < 0.500000000, toUInt16(1) <= 0.500000000, toUInt16(1) > 0.500000000, toUInt16(1) >= 0.500000000,	0.500000000 = toUInt16(1), 0.500000000 != toUInt16(1), 0.500000000 < toUInt16(1), 0.500000000 <= toUInt16(1), 0.500000000 > toUInt16(1), 0.500000000 >= toUInt16(1) , toInt16(1) = 0.500000000, toInt16(1) != 0.500000000, toInt16(1) < 0.500000000, toInt16(1) <= 0.500000000, toInt16(1) > 0.500000000, toInt16(1) >= 0.500000000,	0.500000000 = toInt16(1), 0.500000000 != toInt16(1), 0.500000000 < toInt16(1), 0.500000000 <= toInt16(1), 0.500000000 > toInt16(1), 0.500000000 >= toInt16(1) , toUInt32(1) = 0.500000000, toUInt32(1) != 0.500000000, toUInt32(1) < 0.500000000, toUInt32(1) <= 0.500000000, toUInt32(1) > 0.500000000, toUInt32(1) >= 0.500000000,	0.500000000 = toUInt32(1), 0.500000000 != toUInt32(1), 0.500000000 < toUInt32(1), 0.500000000 <= toUInt32(1), 0.500000000 > toUInt32(1), 0.500000000 >= toUInt32(1) , toInt32(1) = 0.500000000, toInt32(1) != 0.500000000, toInt32(1) < 0.500000000, toInt32(1) <= 0.500000000, toInt32(1) > 0.500000000, toInt32(1) >= 0.500000000,	0.500000000 = toInt32(1), 0.500000000 != toInt32(1), 0.500000000 < toInt32(1), 0.500000000 <= toInt32(1), 0.500000000 > toInt32(1), 0.500000000 >= toInt32(1) , toUInt64(1) = 0.500000000, toUInt64(1) != 0.500000000, toUInt64(1) < 0.500000000, toUInt64(1) <= 0.500000000, toUInt64(1) > 0.500000000, toUInt64(1) >= 0.500000000,	0.500000000 = toUInt64(1), 0.500000000 != toUInt64(1), 0.500000000 < toUInt64(1), 0.500000000 <= toUInt64(1), 0.500000000 > toUInt64(1), 0.500000000 >= toUInt64(1) , toInt64(1) = 0.500000000, toInt64(1) != 0.500000000, toInt64(1) < 0.500000000, toInt64(1) <= 0.500000000, toInt64(1) > 0.500000000, toInt64(1) >= 0.500000000,	0.500000000 = toInt64(1), 0.500000000 != toInt64(1), 0.500000000 < toInt64(1), 0.500000000 <= toInt64(1), 0.500000000 > toInt64(1), 0.500000000 >= toInt64(1) ;
+SELECT '1', '-1.500000000', 1 = -1.500000000, 1 != -1.500000000, 1 < -1.500000000, 1 <= -1.500000000, 1 > -1.500000000, 1 >= -1.500000000,	-1.500000000 = 1, -1.500000000 != 1, -1.500000000 < 1, -1.500000000 <= 1, -1.500000000 > 1, -1.500000000 >= 1 , toUInt8(1) = -1.500000000, toUInt8(1) != -1.500000000, toUInt8(1) < -1.500000000, toUInt8(1) <= -1.500000000, toUInt8(1) > -1.500000000, toUInt8(1) >= -1.500000000,	-1.500000000 = toUInt8(1), -1.500000000 != toUInt8(1), -1.500000000 < toUInt8(1), -1.500000000 <= toUInt8(1), -1.500000000 > toUInt8(1), -1.500000000 >= toUInt8(1) , toInt8(1) = -1.500000000, toInt8(1) != -1.500000000, toInt8(1) < -1.500000000, toInt8(1) <= -1.500000000, toInt8(1) > -1.500000000, toInt8(1) >= -1.500000000,	-1.500000000 = toInt8(1), -1.500000000 != toInt8(1), -1.500000000 < toInt8(1), -1.500000000 <= toInt8(1), -1.500000000 > toInt8(1), -1.500000000 >= toInt8(1) , toUInt16(1) = -1.500000000, toUInt16(1) != -1.500000000, toUInt16(1) < -1.500000000, toUInt16(1) <= -1.500000000, toUInt16(1) > -1.500000000, toUInt16(1) >= -1.500000000,	-1.500000000 = toUInt16(1), -1.500000000 != toUInt16(1), -1.500000000 < toUInt16(1), -1.500000000 <= toUInt16(1), -1.500000000 > toUInt16(1), -1.500000000 >= toUInt16(1) , toInt16(1) = -1.500000000, toInt16(1) != -1.500000000, toInt16(1) < -1.500000000, toInt16(1) <= -1.500000000, toInt16(1) > -1.500000000, toInt16(1) >= -1.500000000,	-1.500000000 = toInt16(1), -1.500000000 != toInt16(1), -1.500000000 < toInt16(1), -1.500000000 <= toInt16(1), -1.500000000 > toInt16(1), -1.500000000 >= toInt16(1) , toUInt32(1) = -1.500000000, toUInt32(1) != -1.500000000, toUInt32(1) < -1.500000000, toUInt32(1) <= -1.500000000, toUInt32(1) > -1.500000000, toUInt32(1) >= -1.500000000,	-1.500000000 = toUInt32(1), -1.500000000 != toUInt32(1), -1.500000000 < toUInt32(1), -1.500000000 <= toUInt32(1), -1.500000000 > toUInt32(1), -1.500000000 >= toUInt32(1) , toInt32(1) = -1.500000000, toInt32(1) != -1.500000000, toInt32(1) < -1.500000000, toInt32(1) <= -1.500000000, toInt32(1) > -1.500000000, toInt32(1) >= -1.500000000,	-1.500000000 = toInt32(1), -1.500000000 != toInt32(1), -1.500000000 < toInt32(1), -1.500000000 <= toInt32(1), -1.500000000 > toInt32(1), -1.500000000 >= toInt32(1) , toUInt64(1) = -1.500000000, toUInt64(1) != -1.500000000, toUInt64(1) < -1.500000000, toUInt64(1) <= -1.500000000, toUInt64(1) > -1.500000000, toUInt64(1) >= -1.500000000,	-1.500000000 = toUInt64(1), -1.500000000 != toUInt64(1), -1.500000000 < toUInt64(1), -1.500000000 <= toUInt64(1), -1.500000000 > toUInt64(1), -1.500000000 >= toUInt64(1) , toInt64(1) = -1.500000000, toInt64(1) != -1.500000000, toInt64(1) < -1.500000000, toInt64(1) <= -1.500000000, toInt64(1) > -1.500000000, toInt64(1) >= -1.500000000,	-1.500000000 = toInt64(1), -1.500000000 != toInt64(1), -1.500000000 < toInt64(1), -1.500000000 <= toInt64(1), -1.500000000 > toInt64(1), -1.500000000 >= toInt64(1) ;
+SELECT '1', '1.500000000', 1 = 1.500000000, 1 != 1.500000000, 1 < 1.500000000, 1 <= 1.500000000, 1 > 1.500000000, 1 >= 1.500000000,	1.500000000 = 1, 1.500000000 != 1, 1.500000000 < 1, 1.500000000 <= 1, 1.500000000 > 1, 1.500000000 >= 1 , toUInt8(1) = 1.500000000, toUInt8(1) != 1.500000000, toUInt8(1) < 1.500000000, toUInt8(1) <= 1.500000000, toUInt8(1) > 1.500000000, toUInt8(1) >= 1.500000000,	1.500000000 = toUInt8(1), 1.500000000 != toUInt8(1), 1.500000000 < toUInt8(1), 1.500000000 <= toUInt8(1), 1.500000000 > toUInt8(1), 1.500000000 >= toUInt8(1) , toInt8(1) = 1.500000000, toInt8(1) != 1.500000000, toInt8(1) < 1.500000000, toInt8(1) <= 1.500000000, toInt8(1) > 1.500000000, toInt8(1) >= 1.500000000,	1.500000000 = toInt8(1), 1.500000000 != toInt8(1), 1.500000000 < toInt8(1), 1.500000000 <= toInt8(1), 1.500000000 > toInt8(1), 1.500000000 >= toInt8(1) , toUInt16(1) = 1.500000000, toUInt16(1) != 1.500000000, toUInt16(1) < 1.500000000, toUInt16(1) <= 1.500000000, toUInt16(1) > 1.500000000, toUInt16(1) >= 1.500000000,	1.500000000 = toUInt16(1), 1.500000000 != toUInt16(1), 1.500000000 < toUInt16(1), 1.500000000 <= toUInt16(1), 1.500000000 > toUInt16(1), 1.500000000 >= toUInt16(1) , toInt16(1) = 1.500000000, toInt16(1) != 1.500000000, toInt16(1) < 1.500000000, toInt16(1) <= 1.500000000, toInt16(1) > 1.500000000, toInt16(1) >= 1.500000000,	1.500000000 = toInt16(1), 1.500000000 != toInt16(1), 1.500000000 < toInt16(1), 1.500000000 <= toInt16(1), 1.500000000 > toInt16(1), 1.500000000 >= toInt16(1) , toUInt32(1) = 1.500000000, toUInt32(1) != 1.500000000, toUInt32(1) < 1.500000000, toUInt32(1) <= 1.500000000, toUInt32(1) > 1.500000000, toUInt32(1) >= 1.500000000,	1.500000000 = toUInt32(1), 1.500000000 != toUInt32(1), 1.500000000 < toUInt32(1), 1.500000000 <= toUInt32(1), 1.500000000 > toUInt32(1), 1.500000000 >= toUInt32(1) , toInt32(1) = 1.500000000, toInt32(1) != 1.500000000, toInt32(1) < 1.500000000, toInt32(1) <= 1.500000000, toInt32(1) > 1.500000000, toInt32(1) >= 1.500000000,	1.500000000 = toInt32(1), 1.500000000 != toInt32(1), 1.500000000 < toInt32(1), 1.500000000 <= toInt32(1), 1.500000000 > toInt32(1), 1.500000000 >= toInt32(1) , toUInt64(1) = 1.500000000, toUInt64(1) != 1.500000000, toUInt64(1) < 1.500000000, toUInt64(1) <= 1.500000000, toUInt64(1) > 1.500000000, toUInt64(1) >= 1.500000000,	1.500000000 = toUInt64(1), 1.500000000 != toUInt64(1), 1.500000000 < toUInt64(1), 1.500000000 <= toUInt64(1), 1.500000000 > toUInt64(1), 1.500000000 >= toUInt64(1) , toInt64(1) = 1.500000000, toInt64(1) != 1.500000000, toInt64(1) < 1.500000000, toInt64(1) <= 1.500000000, toInt64(1) > 1.500000000, toInt64(1) >= 1.500000000,	1.500000000 = toInt64(1), 1.500000000 != toInt64(1), 1.500000000 < toInt64(1), 1.500000000 <= toInt64(1), 1.500000000 > toInt64(1), 1.500000000 >= toInt64(1) ;
+SELECT '1', '9007199254740992.000000000', 1 = 9007199254740992.000000000, 1 != 9007199254740992.000000000, 1 < 9007199254740992.000000000, 1 <= 9007199254740992.000000000, 1 > 9007199254740992.000000000, 1 >= 9007199254740992.000000000,	9007199254740992.000000000 = 1, 9007199254740992.000000000 != 1, 9007199254740992.000000000 < 1, 9007199254740992.000000000 <= 1, 9007199254740992.000000000 > 1, 9007199254740992.000000000 >= 1 , toUInt8(1) = 9007199254740992.000000000, toUInt8(1) != 9007199254740992.000000000, toUInt8(1) < 9007199254740992.000000000, toUInt8(1) <= 9007199254740992.000000000, toUInt8(1) > 9007199254740992.000000000, toUInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt8(1), 9007199254740992.000000000 != toUInt8(1), 9007199254740992.000000000 < toUInt8(1), 9007199254740992.000000000 <= toUInt8(1), 9007199254740992.000000000 > toUInt8(1), 9007199254740992.000000000 >= toUInt8(1) , toInt8(1) = 9007199254740992.000000000, toInt8(1) != 9007199254740992.000000000, toInt8(1) < 9007199254740992.000000000, toInt8(1) <= 9007199254740992.000000000, toInt8(1) > 9007199254740992.000000000, toInt8(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt8(1), 9007199254740992.000000000 != toInt8(1), 9007199254740992.000000000 < toInt8(1), 9007199254740992.000000000 <= toInt8(1), 9007199254740992.000000000 > toInt8(1), 9007199254740992.000000000 >= toInt8(1) , toUInt16(1) = 9007199254740992.000000000, toUInt16(1) != 9007199254740992.000000000, toUInt16(1) < 9007199254740992.000000000, toUInt16(1) <= 9007199254740992.000000000, toUInt16(1) > 9007199254740992.000000000, toUInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt16(1), 9007199254740992.000000000 != toUInt16(1), 9007199254740992.000000000 < toUInt16(1), 9007199254740992.000000000 <= toUInt16(1), 9007199254740992.000000000 > toUInt16(1), 9007199254740992.000000000 >= toUInt16(1) , toInt16(1) = 9007199254740992.000000000, toInt16(1) != 9007199254740992.000000000, toInt16(1) < 9007199254740992.000000000, toInt16(1) <= 9007199254740992.000000000, toInt16(1) > 9007199254740992.000000000, toInt16(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt16(1), 9007199254740992.000000000 != toInt16(1), 9007199254740992.000000000 < toInt16(1), 9007199254740992.000000000 <= toInt16(1), 9007199254740992.000000000 > toInt16(1), 9007199254740992.000000000 >= toInt16(1) , toUInt32(1) = 9007199254740992.000000000, toUInt32(1) != 9007199254740992.000000000, toUInt32(1) < 9007199254740992.000000000, toUInt32(1) <= 9007199254740992.000000000, toUInt32(1) > 9007199254740992.000000000, toUInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt32(1), 9007199254740992.000000000 != toUInt32(1), 9007199254740992.000000000 < toUInt32(1), 9007199254740992.000000000 <= toUInt32(1), 9007199254740992.000000000 > toUInt32(1), 9007199254740992.000000000 >= toUInt32(1) , toInt32(1) = 9007199254740992.000000000, toInt32(1) != 9007199254740992.000000000, toInt32(1) < 9007199254740992.000000000, toInt32(1) <= 9007199254740992.000000000, toInt32(1) > 9007199254740992.000000000, toInt32(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt32(1), 9007199254740992.000000000 != toInt32(1), 9007199254740992.000000000 < toInt32(1), 9007199254740992.000000000 <= toInt32(1), 9007199254740992.000000000 > toInt32(1), 9007199254740992.000000000 >= toInt32(1) , toUInt64(1) = 9007199254740992.000000000, toUInt64(1) != 9007199254740992.000000000, toUInt64(1) < 9007199254740992.000000000, toUInt64(1) <= 9007199254740992.000000000, toUInt64(1) > 9007199254740992.000000000, toUInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(1), 9007199254740992.000000000 != toUInt64(1), 9007199254740992.000000000 < toUInt64(1), 9007199254740992.000000000 <= toUInt64(1), 9007199254740992.000000000 > toUInt64(1), 9007199254740992.000000000 >= toUInt64(1) , toInt64(1) = 9007199254740992.000000000, toInt64(1) != 9007199254740992.000000000, toInt64(1) < 9007199254740992.000000000, toInt64(1) <= 9007199254740992.000000000, toInt64(1) > 9007199254740992.000000000, toInt64(1) >= 9007199254740992.000000000,	9007199254740992.000000000 = toInt64(1), 9007199254740992.000000000 != toInt64(1), 9007199254740992.000000000 < toInt64(1), 9007199254740992.000000000 <= toInt64(1), 9007199254740992.000000000 > toInt64(1), 9007199254740992.000000000 >= toInt64(1) ;
+SELECT '1', '2251799813685247.500000000', 1 = 2251799813685247.500000000, 1 != 2251799813685247.500000000, 1 < 2251799813685247.500000000, 1 <= 2251799813685247.500000000, 1 > 2251799813685247.500000000, 1 >= 2251799813685247.500000000,	2251799813685247.500000000 = 1, 2251799813685247.500000000 != 1, 2251799813685247.500000000 < 1, 2251799813685247.500000000 <= 1, 2251799813685247.500000000 > 1, 2251799813685247.500000000 >= 1 , toUInt8(1) = 2251799813685247.500000000, toUInt8(1) != 2251799813685247.500000000, toUInt8(1) < 2251799813685247.500000000, toUInt8(1) <= 2251799813685247.500000000, toUInt8(1) > 2251799813685247.500000000, toUInt8(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt8(1), 2251799813685247.500000000 != toUInt8(1), 2251799813685247.500000000 < toUInt8(1), 2251799813685247.500000000 <= toUInt8(1), 2251799813685247.500000000 > toUInt8(1), 2251799813685247.500000000 >= toUInt8(1) , toInt8(1) = 2251799813685247.500000000, toInt8(1) != 2251799813685247.500000000, toInt8(1) < 2251799813685247.500000000, toInt8(1) <= 2251799813685247.500000000, toInt8(1) > 2251799813685247.500000000, toInt8(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt8(1), 2251799813685247.500000000 != toInt8(1), 2251799813685247.500000000 < toInt8(1), 2251799813685247.500000000 <= toInt8(1), 2251799813685247.500000000 > toInt8(1), 2251799813685247.500000000 >= toInt8(1) , toUInt16(1) = 2251799813685247.500000000, toUInt16(1) != 2251799813685247.500000000, toUInt16(1) < 2251799813685247.500000000, toUInt16(1) <= 2251799813685247.500000000, toUInt16(1) > 2251799813685247.500000000, toUInt16(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt16(1), 2251799813685247.500000000 != toUInt16(1), 2251799813685247.500000000 < toUInt16(1), 2251799813685247.500000000 <= toUInt16(1), 2251799813685247.500000000 > toUInt16(1), 2251799813685247.500000000 >= toUInt16(1) , toInt16(1) = 2251799813685247.500000000, toInt16(1) != 2251799813685247.500000000, toInt16(1) < 2251799813685247.500000000, toInt16(1) <= 2251799813685247.500000000, toInt16(1) > 2251799813685247.500000000, toInt16(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt16(1), 2251799813685247.500000000 != toInt16(1), 2251799813685247.500000000 < toInt16(1), 2251799813685247.500000000 <= toInt16(1), 2251799813685247.500000000 > toInt16(1), 2251799813685247.500000000 >= toInt16(1) , toUInt32(1) = 2251799813685247.500000000, toUInt32(1) != 2251799813685247.500000000, toUInt32(1) < 2251799813685247.500000000, toUInt32(1) <= 2251799813685247.500000000, toUInt32(1) > 2251799813685247.500000000, toUInt32(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt32(1), 2251799813685247.500000000 != toUInt32(1), 2251799813685247.500000000 < toUInt32(1), 2251799813685247.500000000 <= toUInt32(1), 2251799813685247.500000000 > toUInt32(1), 2251799813685247.500000000 >= toUInt32(1) , toInt32(1) = 2251799813685247.500000000, toInt32(1) != 2251799813685247.500000000, toInt32(1) < 2251799813685247.500000000, toInt32(1) <= 2251799813685247.500000000, toInt32(1) > 2251799813685247.500000000, toInt32(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt32(1), 2251799813685247.500000000 != toInt32(1), 2251799813685247.500000000 < toInt32(1), 2251799813685247.500000000 <= toInt32(1), 2251799813685247.500000000 > toInt32(1), 2251799813685247.500000000 >= toInt32(1) , toUInt64(1) = 2251799813685247.500000000, toUInt64(1) != 2251799813685247.500000000, toUInt64(1) < 2251799813685247.500000000, toUInt64(1) <= 2251799813685247.500000000, toUInt64(1) > 2251799813685247.500000000, toUInt64(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt64(1), 2251799813685247.500000000 != toUInt64(1), 2251799813685247.500000000 < toUInt64(1), 2251799813685247.500000000 <= toUInt64(1), 2251799813685247.500000000 > toUInt64(1), 2251799813685247.500000000 >= toUInt64(1) , toInt64(1) = 2251799813685247.500000000, toInt64(1) != 2251799813685247.500000000, toInt64(1) < 2251799813685247.500000000, toInt64(1) <= 2251799813685247.500000000, toInt64(1) > 2251799813685247.500000000, toInt64(1) >= 2251799813685247.500000000,	2251799813685247.500000000 = toInt64(1), 2251799813685247.500000000 != toInt64(1), 2251799813685247.500000000 < toInt64(1), 2251799813685247.500000000 <= toInt64(1), 2251799813685247.500000000 > toInt64(1), 2251799813685247.500000000 >= toInt64(1) ;
+SELECT '1', '2251799813685248.500000000', 1 = 2251799813685248.500000000, 1 != 2251799813685248.500000000, 1 < 2251799813685248.500000000, 1 <= 2251799813685248.500000000, 1 > 2251799813685248.500000000, 1 >= 2251799813685248.500000000,	2251799813685248.500000000 = 1, 2251799813685248.500000000 != 1, 2251799813685248.500000000 < 1, 2251799813685248.500000000 <= 1, 2251799813685248.500000000 > 1, 2251799813685248.500000000 >= 1 , toUInt8(1) = 2251799813685248.500000000, toUInt8(1) != 2251799813685248.500000000, toUInt8(1) < 2251799813685248.500000000, toUInt8(1) <= 2251799813685248.500000000, toUInt8(1) > 2251799813685248.500000000, toUInt8(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt8(1), 2251799813685248.500000000 != toUInt8(1), 2251799813685248.500000000 < toUInt8(1), 2251799813685248.500000000 <= toUInt8(1), 2251799813685248.500000000 > toUInt8(1), 2251799813685248.500000000 >= toUInt8(1) , toInt8(1) = 2251799813685248.500000000, toInt8(1) != 2251799813685248.500000000, toInt8(1) < 2251799813685248.500000000, toInt8(1) <= 2251799813685248.500000000, toInt8(1) > 2251799813685248.500000000, toInt8(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt8(1), 2251799813685248.500000000 != toInt8(1), 2251799813685248.500000000 < toInt8(1), 2251799813685248.500000000 <= toInt8(1), 2251799813685248.500000000 > toInt8(1), 2251799813685248.500000000 >= toInt8(1) , toUInt16(1) = 2251799813685248.500000000, toUInt16(1) != 2251799813685248.500000000, toUInt16(1) < 2251799813685248.500000000, toUInt16(1) <= 2251799813685248.500000000, toUInt16(1) > 2251799813685248.500000000, toUInt16(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt16(1), 2251799813685248.500000000 != toUInt16(1), 2251799813685248.500000000 < toUInt16(1), 2251799813685248.500000000 <= toUInt16(1), 2251799813685248.500000000 > toUInt16(1), 2251799813685248.500000000 >= toUInt16(1) , toInt16(1) = 2251799813685248.500000000, toInt16(1) != 2251799813685248.500000000, toInt16(1) < 2251799813685248.500000000, toInt16(1) <= 2251799813685248.500000000, toInt16(1) > 2251799813685248.500000000, toInt16(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt16(1), 2251799813685248.500000000 != toInt16(1), 2251799813685248.500000000 < toInt16(1), 2251799813685248.500000000 <= toInt16(1), 2251799813685248.500000000 > toInt16(1), 2251799813685248.500000000 >= toInt16(1) , toUInt32(1) = 2251799813685248.500000000, toUInt32(1) != 2251799813685248.500000000, toUInt32(1) < 2251799813685248.500000000, toUInt32(1) <= 2251799813685248.500000000, toUInt32(1) > 2251799813685248.500000000, toUInt32(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt32(1), 2251799813685248.500000000 != toUInt32(1), 2251799813685248.500000000 < toUInt32(1), 2251799813685248.500000000 <= toUInt32(1), 2251799813685248.500000000 > toUInt32(1), 2251799813685248.500000000 >= toUInt32(1) , toInt32(1) = 2251799813685248.500000000, toInt32(1) != 2251799813685248.500000000, toInt32(1) < 2251799813685248.500000000, toInt32(1) <= 2251799813685248.500000000, toInt32(1) > 2251799813685248.500000000, toInt32(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt32(1), 2251799813685248.500000000 != toInt32(1), 2251799813685248.500000000 < toInt32(1), 2251799813685248.500000000 <= toInt32(1), 2251799813685248.500000000 > toInt32(1), 2251799813685248.500000000 >= toInt32(1) , toUInt64(1) = 2251799813685248.500000000, toUInt64(1) != 2251799813685248.500000000, toUInt64(1) < 2251799813685248.500000000, toUInt64(1) <= 2251799813685248.500000000, toUInt64(1) > 2251799813685248.500000000, toUInt64(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt64(1), 2251799813685248.500000000 != toUInt64(1), 2251799813685248.500000000 < toUInt64(1), 2251799813685248.500000000 <= toUInt64(1), 2251799813685248.500000000 > toUInt64(1), 2251799813685248.500000000 >= toUInt64(1) , toInt64(1) = 2251799813685248.500000000, toInt64(1) != 2251799813685248.500000000, toInt64(1) < 2251799813685248.500000000, toInt64(1) <= 2251799813685248.500000000, toInt64(1) > 2251799813685248.500000000, toInt64(1) >= 2251799813685248.500000000,	2251799813685248.500000000 = toInt64(1), 2251799813685248.500000000 != toInt64(1), 2251799813685248.500000000 < toInt64(1), 2251799813685248.500000000 <= toInt64(1), 2251799813685248.500000000 > toInt64(1), 2251799813685248.500000000 >= toInt64(1) ;
+SELECT '1', '1152921504606846976.000000000', 1 = 1152921504606846976.000000000, 1 != 1152921504606846976.000000000, 1 < 1152921504606846976.000000000, 1 <= 1152921504606846976.000000000, 1 > 1152921504606846976.000000000, 1 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = 1, 1152921504606846976.000000000 != 1, 1152921504606846976.000000000 < 1, 1152921504606846976.000000000 <= 1, 1152921504606846976.000000000 > 1, 1152921504606846976.000000000 >= 1 , toUInt8(1) = 1152921504606846976.000000000, toUInt8(1) != 1152921504606846976.000000000, toUInt8(1) < 1152921504606846976.000000000, toUInt8(1) <= 1152921504606846976.000000000, toUInt8(1) > 1152921504606846976.000000000, toUInt8(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt8(1), 1152921504606846976.000000000 != toUInt8(1), 1152921504606846976.000000000 < toUInt8(1), 1152921504606846976.000000000 <= toUInt8(1), 1152921504606846976.000000000 > toUInt8(1), 1152921504606846976.000000000 >= toUInt8(1) , toInt8(1) = 1152921504606846976.000000000, toInt8(1) != 1152921504606846976.000000000, toInt8(1) < 1152921504606846976.000000000, toInt8(1) <= 1152921504606846976.000000000, toInt8(1) > 1152921504606846976.000000000, toInt8(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt8(1), 1152921504606846976.000000000 != toInt8(1), 1152921504606846976.000000000 < toInt8(1), 1152921504606846976.000000000 <= toInt8(1), 1152921504606846976.000000000 > toInt8(1), 1152921504606846976.000000000 >= toInt8(1) , toUInt16(1) = 1152921504606846976.000000000, toUInt16(1) != 1152921504606846976.000000000, toUInt16(1) < 1152921504606846976.000000000, toUInt16(1) <= 1152921504606846976.000000000, toUInt16(1) > 1152921504606846976.000000000, toUInt16(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt16(1), 1152921504606846976.000000000 != toUInt16(1), 1152921504606846976.000000000 < toUInt16(1), 1152921504606846976.000000000 <= toUInt16(1), 1152921504606846976.000000000 > toUInt16(1), 1152921504606846976.000000000 >= toUInt16(1) , toInt16(1) = 1152921504606846976.000000000, toInt16(1) != 1152921504606846976.000000000, toInt16(1) < 1152921504606846976.000000000, toInt16(1) <= 1152921504606846976.000000000, toInt16(1) > 1152921504606846976.000000000, toInt16(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt16(1), 1152921504606846976.000000000 != toInt16(1), 1152921504606846976.000000000 < toInt16(1), 1152921504606846976.000000000 <= toInt16(1), 1152921504606846976.000000000 > toInt16(1), 1152921504606846976.000000000 >= toInt16(1) , toUInt32(1) = 1152921504606846976.000000000, toUInt32(1) != 1152921504606846976.000000000, toUInt32(1) < 1152921504606846976.000000000, toUInt32(1) <= 1152921504606846976.000000000, toUInt32(1) > 1152921504606846976.000000000, toUInt32(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt32(1), 1152921504606846976.000000000 != toUInt32(1), 1152921504606846976.000000000 < toUInt32(1), 1152921504606846976.000000000 <= toUInt32(1), 1152921504606846976.000000000 > toUInt32(1), 1152921504606846976.000000000 >= toUInt32(1) , toInt32(1) = 1152921504606846976.000000000, toInt32(1) != 1152921504606846976.000000000, toInt32(1) < 1152921504606846976.000000000, toInt32(1) <= 1152921504606846976.000000000, toInt32(1) > 1152921504606846976.000000000, toInt32(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt32(1), 1152921504606846976.000000000 != toInt32(1), 1152921504606846976.000000000 < toInt32(1), 1152921504606846976.000000000 <= toInt32(1), 1152921504606846976.000000000 > toInt32(1), 1152921504606846976.000000000 >= toInt32(1) , toUInt64(1) = 1152921504606846976.000000000, toUInt64(1) != 1152921504606846976.000000000, toUInt64(1) < 1152921504606846976.000000000, toUInt64(1) <= 1152921504606846976.000000000, toUInt64(1) > 1152921504606846976.000000000, toUInt64(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt64(1), 1152921504606846976.000000000 != toUInt64(1), 1152921504606846976.000000000 < toUInt64(1), 1152921504606846976.000000000 <= toUInt64(1), 1152921504606846976.000000000 > toUInt64(1), 1152921504606846976.000000000 >= toUInt64(1) , toInt64(1) = 1152921504606846976.000000000, toInt64(1) != 1152921504606846976.000000000, toInt64(1) < 1152921504606846976.000000000, toInt64(1) <= 1152921504606846976.000000000, toInt64(1) > 1152921504606846976.000000000, toInt64(1) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toInt64(1), 1152921504606846976.000000000 != toInt64(1), 1152921504606846976.000000000 < toInt64(1), 1152921504606846976.000000000 <= toInt64(1), 1152921504606846976.000000000 > toInt64(1), 1152921504606846976.000000000 >= toInt64(1) ;
+SELECT '1', '-1152921504606846976.000000000', 1 = -1152921504606846976.000000000, 1 != -1152921504606846976.000000000, 1 < -1152921504606846976.000000000, 1 <= -1152921504606846976.000000000, 1 > -1152921504606846976.000000000, 1 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = 1, -1152921504606846976.000000000 != 1, -1152921504606846976.000000000 < 1, -1152921504606846976.000000000 <= 1, -1152921504606846976.000000000 > 1, -1152921504606846976.000000000 >= 1 , toUInt8(1) = -1152921504606846976.000000000, toUInt8(1) != -1152921504606846976.000000000, toUInt8(1) < -1152921504606846976.000000000, toUInt8(1) <= -1152921504606846976.000000000, toUInt8(1) > -1152921504606846976.000000000, toUInt8(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt8(1), -1152921504606846976.000000000 != toUInt8(1), -1152921504606846976.000000000 < toUInt8(1), -1152921504606846976.000000000 <= toUInt8(1), -1152921504606846976.000000000 > toUInt8(1), -1152921504606846976.000000000 >= toUInt8(1) , toInt8(1) = -1152921504606846976.000000000, toInt8(1) != -1152921504606846976.000000000, toInt8(1) < -1152921504606846976.000000000, toInt8(1) <= -1152921504606846976.000000000, toInt8(1) > -1152921504606846976.000000000, toInt8(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt8(1), -1152921504606846976.000000000 != toInt8(1), -1152921504606846976.000000000 < toInt8(1), -1152921504606846976.000000000 <= toInt8(1), -1152921504606846976.000000000 > toInt8(1), -1152921504606846976.000000000 >= toInt8(1) , toUInt16(1) = -1152921504606846976.000000000, toUInt16(1) != -1152921504606846976.000000000, toUInt16(1) < -1152921504606846976.000000000, toUInt16(1) <= -1152921504606846976.000000000, toUInt16(1) > -1152921504606846976.000000000, toUInt16(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt16(1), -1152921504606846976.000000000 != toUInt16(1), -1152921504606846976.000000000 < toUInt16(1), -1152921504606846976.000000000 <= toUInt16(1), -1152921504606846976.000000000 > toUInt16(1), -1152921504606846976.000000000 >= toUInt16(1) , toInt16(1) = -1152921504606846976.000000000, toInt16(1) != -1152921504606846976.000000000, toInt16(1) < -1152921504606846976.000000000, toInt16(1) <= -1152921504606846976.000000000, toInt16(1) > -1152921504606846976.000000000, toInt16(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt16(1), -1152921504606846976.000000000 != toInt16(1), -1152921504606846976.000000000 < toInt16(1), -1152921504606846976.000000000 <= toInt16(1), -1152921504606846976.000000000 > toInt16(1), -1152921504606846976.000000000 >= toInt16(1) , toUInt32(1) = -1152921504606846976.000000000, toUInt32(1) != -1152921504606846976.000000000, toUInt32(1) < -1152921504606846976.000000000, toUInt32(1) <= -1152921504606846976.000000000, toUInt32(1) > -1152921504606846976.000000000, toUInt32(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt32(1), -1152921504606846976.000000000 != toUInt32(1), -1152921504606846976.000000000 < toUInt32(1), -1152921504606846976.000000000 <= toUInt32(1), -1152921504606846976.000000000 > toUInt32(1), -1152921504606846976.000000000 >= toUInt32(1) , toInt32(1) = -1152921504606846976.000000000, toInt32(1) != -1152921504606846976.000000000, toInt32(1) < -1152921504606846976.000000000, toInt32(1) <= -1152921504606846976.000000000, toInt32(1) > -1152921504606846976.000000000, toInt32(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt32(1), -1152921504606846976.000000000 != toInt32(1), -1152921504606846976.000000000 < toInt32(1), -1152921504606846976.000000000 <= toInt32(1), -1152921504606846976.000000000 > toInt32(1), -1152921504606846976.000000000 >= toInt32(1) , toUInt64(1) = -1152921504606846976.000000000, toUInt64(1) != -1152921504606846976.000000000, toUInt64(1) < -1152921504606846976.000000000, toUInt64(1) <= -1152921504606846976.000000000, toUInt64(1) > -1152921504606846976.000000000, toUInt64(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt64(1), -1152921504606846976.000000000 != toUInt64(1), -1152921504606846976.000000000 < toUInt64(1), -1152921504606846976.000000000 <= toUInt64(1), -1152921504606846976.000000000 > toUInt64(1), -1152921504606846976.000000000 >= toUInt64(1) , toInt64(1) = -1152921504606846976.000000000, toInt64(1) != -1152921504606846976.000000000, toInt64(1) < -1152921504606846976.000000000, toInt64(1) <= -1152921504606846976.000000000, toInt64(1) > -1152921504606846976.000000000, toInt64(1) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toInt64(1), -1152921504606846976.000000000 != toInt64(1), -1152921504606846976.000000000 < toInt64(1), -1152921504606846976.000000000 <= toInt64(1), -1152921504606846976.000000000 > toInt64(1), -1152921504606846976.000000000 >= toInt64(1) ;
+SELECT '1', '-9223372036854786048.000000000', 1 = -9223372036854786048.000000000, 1 != -9223372036854786048.000000000, 1 < -9223372036854786048.000000000, 1 <= -9223372036854786048.000000000, 1 > -9223372036854786048.000000000, 1 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = 1, -9223372036854786048.000000000 != 1, -9223372036854786048.000000000 < 1, -9223372036854786048.000000000 <= 1, -9223372036854786048.000000000 > 1, -9223372036854786048.000000000 >= 1 , toUInt8(1) = -9223372036854786048.000000000, toUInt8(1) != -9223372036854786048.000000000, toUInt8(1) < -9223372036854786048.000000000, toUInt8(1) <= -9223372036854786048.000000000, toUInt8(1) > -9223372036854786048.000000000, toUInt8(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt8(1), -9223372036854786048.000000000 != toUInt8(1), -9223372036854786048.000000000 < toUInt8(1), -9223372036854786048.000000000 <= toUInt8(1), -9223372036854786048.000000000 > toUInt8(1), -9223372036854786048.000000000 >= toUInt8(1) , toInt8(1) = -9223372036854786048.000000000, toInt8(1) != -9223372036854786048.000000000, toInt8(1) < -9223372036854786048.000000000, toInt8(1) <= -9223372036854786048.000000000, toInt8(1) > -9223372036854786048.000000000, toInt8(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt8(1), -9223372036854786048.000000000 != toInt8(1), -9223372036854786048.000000000 < toInt8(1), -9223372036854786048.000000000 <= toInt8(1), -9223372036854786048.000000000 > toInt8(1), -9223372036854786048.000000000 >= toInt8(1) , toUInt16(1) = -9223372036854786048.000000000, toUInt16(1) != -9223372036854786048.000000000, toUInt16(1) < -9223372036854786048.000000000, toUInt16(1) <= -9223372036854786048.000000000, toUInt16(1) > -9223372036854786048.000000000, toUInt16(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt16(1), -9223372036854786048.000000000 != toUInt16(1), -9223372036854786048.000000000 < toUInt16(1), -9223372036854786048.000000000 <= toUInt16(1), -9223372036854786048.000000000 > toUInt16(1), -9223372036854786048.000000000 >= toUInt16(1) , toInt16(1) = -9223372036854786048.000000000, toInt16(1) != -9223372036854786048.000000000, toInt16(1) < -9223372036854786048.000000000, toInt16(1) <= -9223372036854786048.000000000, toInt16(1) > -9223372036854786048.000000000, toInt16(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt16(1), -9223372036854786048.000000000 != toInt16(1), -9223372036854786048.000000000 < toInt16(1), -9223372036854786048.000000000 <= toInt16(1), -9223372036854786048.000000000 > toInt16(1), -9223372036854786048.000000000 >= toInt16(1) , toUInt32(1) = -9223372036854786048.000000000, toUInt32(1) != -9223372036854786048.000000000, toUInt32(1) < -9223372036854786048.000000000, toUInt32(1) <= -9223372036854786048.000000000, toUInt32(1) > -9223372036854786048.000000000, toUInt32(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt32(1), -9223372036854786048.000000000 != toUInt32(1), -9223372036854786048.000000000 < toUInt32(1), -9223372036854786048.000000000 <= toUInt32(1), -9223372036854786048.000000000 > toUInt32(1), -9223372036854786048.000000000 >= toUInt32(1) , toInt32(1) = -9223372036854786048.000000000, toInt32(1) != -9223372036854786048.000000000, toInt32(1) < -9223372036854786048.000000000, toInt32(1) <= -9223372036854786048.000000000, toInt32(1) > -9223372036854786048.000000000, toInt32(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt32(1), -9223372036854786048.000000000 != toInt32(1), -9223372036854786048.000000000 < toInt32(1), -9223372036854786048.000000000 <= toInt32(1), -9223372036854786048.000000000 > toInt32(1), -9223372036854786048.000000000 >= toInt32(1) , toUInt64(1) = -9223372036854786048.000000000, toUInt64(1) != -9223372036854786048.000000000, toUInt64(1) < -9223372036854786048.000000000, toUInt64(1) <= -9223372036854786048.000000000, toUInt64(1) > -9223372036854786048.000000000, toUInt64(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt64(1), -9223372036854786048.000000000 != toUInt64(1), -9223372036854786048.000000000 < toUInt64(1), -9223372036854786048.000000000 <= toUInt64(1), -9223372036854786048.000000000 > toUInt64(1), -9223372036854786048.000000000 >= toUInt64(1) , toInt64(1) = -9223372036854786048.000000000, toInt64(1) != -9223372036854786048.000000000, toInt64(1) < -9223372036854786048.000000000, toInt64(1) <= -9223372036854786048.000000000, toInt64(1) > -9223372036854786048.000000000, toInt64(1) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toInt64(1), -9223372036854786048.000000000 != toInt64(1), -9223372036854786048.000000000 < toInt64(1), -9223372036854786048.000000000 <= toInt64(1), -9223372036854786048.000000000 > toInt64(1), -9223372036854786048.000000000 >= toInt64(1) ;
+SELECT '1', '9223372036854786048.000000000', 1 = 9223372036854786048.000000000, 1 != 9223372036854786048.000000000, 1 < 9223372036854786048.000000000, 1 <= 9223372036854786048.000000000, 1 > 9223372036854786048.000000000, 1 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = 1, 9223372036854786048.000000000 != 1, 9223372036854786048.000000000 < 1, 9223372036854786048.000000000 <= 1, 9223372036854786048.000000000 > 1, 9223372036854786048.000000000 >= 1 , toUInt8(1) = 9223372036854786048.000000000, toUInt8(1) != 9223372036854786048.000000000, toUInt8(1) < 9223372036854786048.000000000, toUInt8(1) <= 9223372036854786048.000000000, toUInt8(1) > 9223372036854786048.000000000, toUInt8(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt8(1), 9223372036854786048.000000000 != toUInt8(1), 9223372036854786048.000000000 < toUInt8(1), 9223372036854786048.000000000 <= toUInt8(1), 9223372036854786048.000000000 > toUInt8(1), 9223372036854786048.000000000 >= toUInt8(1) , toInt8(1) = 9223372036854786048.000000000, toInt8(1) != 9223372036854786048.000000000, toInt8(1) < 9223372036854786048.000000000, toInt8(1) <= 9223372036854786048.000000000, toInt8(1) > 9223372036854786048.000000000, toInt8(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt8(1), 9223372036854786048.000000000 != toInt8(1), 9223372036854786048.000000000 < toInt8(1), 9223372036854786048.000000000 <= toInt8(1), 9223372036854786048.000000000 > toInt8(1), 9223372036854786048.000000000 >= toInt8(1) , toUInt16(1) = 9223372036854786048.000000000, toUInt16(1) != 9223372036854786048.000000000, toUInt16(1) < 9223372036854786048.000000000, toUInt16(1) <= 9223372036854786048.000000000, toUInt16(1) > 9223372036854786048.000000000, toUInt16(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt16(1), 9223372036854786048.000000000 != toUInt16(1), 9223372036854786048.000000000 < toUInt16(1), 9223372036854786048.000000000 <= toUInt16(1), 9223372036854786048.000000000 > toUInt16(1), 9223372036854786048.000000000 >= toUInt16(1) , toInt16(1) = 9223372036854786048.000000000, toInt16(1) != 9223372036854786048.000000000, toInt16(1) < 9223372036854786048.000000000, toInt16(1) <= 9223372036854786048.000000000, toInt16(1) > 9223372036854786048.000000000, toInt16(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt16(1), 9223372036854786048.000000000 != toInt16(1), 9223372036854786048.000000000 < toInt16(1), 9223372036854786048.000000000 <= toInt16(1), 9223372036854786048.000000000 > toInt16(1), 9223372036854786048.000000000 >= toInt16(1) , toUInt32(1) = 9223372036854786048.000000000, toUInt32(1) != 9223372036854786048.000000000, toUInt32(1) < 9223372036854786048.000000000, toUInt32(1) <= 9223372036854786048.000000000, toUInt32(1) > 9223372036854786048.000000000, toUInt32(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt32(1), 9223372036854786048.000000000 != toUInt32(1), 9223372036854786048.000000000 < toUInt32(1), 9223372036854786048.000000000 <= toUInt32(1), 9223372036854786048.000000000 > toUInt32(1), 9223372036854786048.000000000 >= toUInt32(1) , toInt32(1) = 9223372036854786048.000000000, toInt32(1) != 9223372036854786048.000000000, toInt32(1) < 9223372036854786048.000000000, toInt32(1) <= 9223372036854786048.000000000, toInt32(1) > 9223372036854786048.000000000, toInt32(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt32(1), 9223372036854786048.000000000 != toInt32(1), 9223372036854786048.000000000 < toInt32(1), 9223372036854786048.000000000 <= toInt32(1), 9223372036854786048.000000000 > toInt32(1), 9223372036854786048.000000000 >= toInt32(1) , toUInt64(1) = 9223372036854786048.000000000, toUInt64(1) != 9223372036854786048.000000000, toUInt64(1) < 9223372036854786048.000000000, toUInt64(1) <= 9223372036854786048.000000000, toUInt64(1) > 9223372036854786048.000000000, toUInt64(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt64(1), 9223372036854786048.000000000 != toUInt64(1), 9223372036854786048.000000000 < toUInt64(1), 9223372036854786048.000000000 <= toUInt64(1), 9223372036854786048.000000000 > toUInt64(1), 9223372036854786048.000000000 >= toUInt64(1) , toInt64(1) = 9223372036854786048.000000000, toInt64(1) != 9223372036854786048.000000000, toInt64(1) < 9223372036854786048.000000000, toInt64(1) <= 9223372036854786048.000000000, toInt64(1) > 9223372036854786048.000000000, toInt64(1) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toInt64(1), 9223372036854786048.000000000 != toInt64(1), 9223372036854786048.000000000 < toInt64(1), 9223372036854786048.000000000 <= toInt64(1), 9223372036854786048.000000000 > toInt64(1), 9223372036854786048.000000000 >= toInt64(1) ;
+SELECT '18446744073709551615', '0.000000000', 18446744073709551615 = 0.000000000, 18446744073709551615 != 0.000000000, 18446744073709551615 < 0.000000000, 18446744073709551615 <= 0.000000000, 18446744073709551615 > 0.000000000, 18446744073709551615 >= 0.000000000,	0.000000000 = 18446744073709551615, 0.000000000 != 18446744073709551615, 0.000000000 < 18446744073709551615, 0.000000000 <= 18446744073709551615, 0.000000000 > 18446744073709551615, 0.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 0.000000000, toUInt64(18446744073709551615) != 0.000000000, toUInt64(18446744073709551615) < 0.000000000, toUInt64(18446744073709551615) <= 0.000000000, toUInt64(18446744073709551615) > 0.000000000, toUInt64(18446744073709551615) >= 0.000000000,	0.000000000 = toUInt64(18446744073709551615), 0.000000000 != toUInt64(18446744073709551615), 0.000000000 < toUInt64(18446744073709551615), 0.000000000 <= toUInt64(18446744073709551615), 0.000000000 > toUInt64(18446744073709551615), 0.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-1.000000000', 18446744073709551615 = -1.000000000, 18446744073709551615 != -1.000000000, 18446744073709551615 < -1.000000000, 18446744073709551615 <= -1.000000000, 18446744073709551615 > -1.000000000, 18446744073709551615 >= -1.000000000,	-1.000000000 = 18446744073709551615, -1.000000000 != 18446744073709551615, -1.000000000 < 18446744073709551615, -1.000000000 <= 18446744073709551615, -1.000000000 > 18446744073709551615, -1.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -1.000000000, toUInt64(18446744073709551615) != -1.000000000, toUInt64(18446744073709551615) < -1.000000000, toUInt64(18446744073709551615) <= -1.000000000, toUInt64(18446744073709551615) > -1.000000000, toUInt64(18446744073709551615) >= -1.000000000,	-1.000000000 = toUInt64(18446744073709551615), -1.000000000 != toUInt64(18446744073709551615), -1.000000000 < toUInt64(18446744073709551615), -1.000000000 <= toUInt64(18446744073709551615), -1.000000000 > toUInt64(18446744073709551615), -1.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '1.000000000', 18446744073709551615 = 1.000000000, 18446744073709551615 != 1.000000000, 18446744073709551615 < 1.000000000, 18446744073709551615 <= 1.000000000, 18446744073709551615 > 1.000000000, 18446744073709551615 >= 1.000000000,	1.000000000 = 18446744073709551615, 1.000000000 != 18446744073709551615, 1.000000000 < 18446744073709551615, 1.000000000 <= 18446744073709551615, 1.000000000 > 18446744073709551615, 1.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 1.000000000, toUInt64(18446744073709551615) != 1.000000000, toUInt64(18446744073709551615) < 1.000000000, toUInt64(18446744073709551615) <= 1.000000000, toUInt64(18446744073709551615) > 1.000000000, toUInt64(18446744073709551615) >= 1.000000000,	1.000000000 = toUInt64(18446744073709551615), 1.000000000 != toUInt64(18446744073709551615), 1.000000000 < toUInt64(18446744073709551615), 1.000000000 <= toUInt64(18446744073709551615), 1.000000000 > toUInt64(18446744073709551615), 1.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '18446744073709551616.000000000', 18446744073709551615 = 18446744073709551616.000000000, 18446744073709551615 != 18446744073709551616.000000000, 18446744073709551615 < 18446744073709551616.000000000, 18446744073709551615 <= 18446744073709551616.000000000, 18446744073709551615 > 18446744073709551616.000000000, 18446744073709551615 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 18446744073709551615, 18446744073709551616.000000000 != 18446744073709551615, 18446744073709551616.000000000 < 18446744073709551615, 18446744073709551616.000000000 <= 18446744073709551615, 18446744073709551616.000000000 > 18446744073709551615, 18446744073709551616.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 18446744073709551616.000000000, toUInt64(18446744073709551615) != 18446744073709551616.000000000, toUInt64(18446744073709551615) < 18446744073709551616.000000000, toUInt64(18446744073709551615) <= 18446744073709551616.000000000, toUInt64(18446744073709551615) > 18446744073709551616.000000000, toUInt64(18446744073709551615) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(18446744073709551615), 18446744073709551616.000000000 != toUInt64(18446744073709551615), 18446744073709551616.000000000 < toUInt64(18446744073709551615), 18446744073709551616.000000000 <= toUInt64(18446744073709551615), 18446744073709551616.000000000 > toUInt64(18446744073709551615), 18446744073709551616.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9223372036854775808.000000000', 18446744073709551615 = 9223372036854775808.000000000, 18446744073709551615 != 9223372036854775808.000000000, 18446744073709551615 < 9223372036854775808.000000000, 18446744073709551615 <= 9223372036854775808.000000000, 18446744073709551615 > 9223372036854775808.000000000, 18446744073709551615 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 18446744073709551615, 9223372036854775808.000000000 != 18446744073709551615, 9223372036854775808.000000000 < 18446744073709551615, 9223372036854775808.000000000 <= 18446744073709551615, 9223372036854775808.000000000 > 18446744073709551615, 9223372036854775808.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9223372036854775808.000000000, toUInt64(18446744073709551615) != 9223372036854775808.000000000, toUInt64(18446744073709551615) < 9223372036854775808.000000000, toUInt64(18446744073709551615) <= 9223372036854775808.000000000, toUInt64(18446744073709551615) > 9223372036854775808.000000000, toUInt64(18446744073709551615) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(18446744073709551615), 9223372036854775808.000000000 != toUInt64(18446744073709551615), 9223372036854775808.000000000 < toUInt64(18446744073709551615), 9223372036854775808.000000000 <= toUInt64(18446744073709551615), 9223372036854775808.000000000 > toUInt64(18446744073709551615), 9223372036854775808.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9223372036854775808.000000000', 18446744073709551615 = -9223372036854775808.000000000, 18446744073709551615 != -9223372036854775808.000000000, 18446744073709551615 < -9223372036854775808.000000000, 18446744073709551615 <= -9223372036854775808.000000000, 18446744073709551615 > -9223372036854775808.000000000, 18446744073709551615 >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = 18446744073709551615, -9223372036854775808.000000000 != 18446744073709551615, -9223372036854775808.000000000 < 18446744073709551615, -9223372036854775808.000000000 <= 18446744073709551615, -9223372036854775808.000000000 > 18446744073709551615, -9223372036854775808.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9223372036854775808.000000000, toUInt64(18446744073709551615) != -9223372036854775808.000000000, toUInt64(18446744073709551615) < -9223372036854775808.000000000, toUInt64(18446744073709551615) <= -9223372036854775808.000000000, toUInt64(18446744073709551615) > -9223372036854775808.000000000, toUInt64(18446744073709551615) >= -9223372036854775808.000000000,	-9223372036854775808.000000000 = toUInt64(18446744073709551615), -9223372036854775808.000000000 != toUInt64(18446744073709551615), -9223372036854775808.000000000 < toUInt64(18446744073709551615), -9223372036854775808.000000000 <= toUInt64(18446744073709551615), -9223372036854775808.000000000 > toUInt64(18446744073709551615), -9223372036854775808.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9223372036854775808.000000000', 18446744073709551615 = 9223372036854775808.000000000, 18446744073709551615 != 9223372036854775808.000000000, 18446744073709551615 < 9223372036854775808.000000000, 18446744073709551615 <= 9223372036854775808.000000000, 18446744073709551615 > 9223372036854775808.000000000, 18446744073709551615 >= 9223372036854775808.000000000,	9223372036854775808.000000000 = 18446744073709551615, 9223372036854775808.000000000 != 18446744073709551615, 9223372036854775808.000000000 < 18446744073709551615, 9223372036854775808.000000000 <= 18446744073709551615, 9223372036854775808.000000000 > 18446744073709551615, 9223372036854775808.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9223372036854775808.000000000, toUInt64(18446744073709551615) != 9223372036854775808.000000000, toUInt64(18446744073709551615) < 9223372036854775808.000000000, toUInt64(18446744073709551615) <= 9223372036854775808.000000000, toUInt64(18446744073709551615) > 9223372036854775808.000000000, toUInt64(18446744073709551615) >= 9223372036854775808.000000000,	9223372036854775808.000000000 = toUInt64(18446744073709551615), 9223372036854775808.000000000 != toUInt64(18446744073709551615), 9223372036854775808.000000000 < toUInt64(18446744073709551615), 9223372036854775808.000000000 <= toUInt64(18446744073709551615), 9223372036854775808.000000000 > toUInt64(18446744073709551615), 9223372036854775808.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '2251799813685248.000000000', 18446744073709551615 = 2251799813685248.000000000, 18446744073709551615 != 2251799813685248.000000000, 18446744073709551615 < 2251799813685248.000000000, 18446744073709551615 <= 2251799813685248.000000000, 18446744073709551615 > 2251799813685248.000000000, 18446744073709551615 >= 2251799813685248.000000000,	2251799813685248.000000000 = 18446744073709551615, 2251799813685248.000000000 != 18446744073709551615, 2251799813685248.000000000 < 18446744073709551615, 2251799813685248.000000000 <= 18446744073709551615, 2251799813685248.000000000 > 18446744073709551615, 2251799813685248.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 2251799813685248.000000000, toUInt64(18446744073709551615) != 2251799813685248.000000000, toUInt64(18446744073709551615) < 2251799813685248.000000000, toUInt64(18446744073709551615) <= 2251799813685248.000000000, toUInt64(18446744073709551615) > 2251799813685248.000000000, toUInt64(18446744073709551615) >= 2251799813685248.000000000,	2251799813685248.000000000 = toUInt64(18446744073709551615), 2251799813685248.000000000 != toUInt64(18446744073709551615), 2251799813685248.000000000 < toUInt64(18446744073709551615), 2251799813685248.000000000 <= toUInt64(18446744073709551615), 2251799813685248.000000000 > toUInt64(18446744073709551615), 2251799813685248.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '4503599627370496.000000000', 18446744073709551615 = 4503599627370496.000000000, 18446744073709551615 != 4503599627370496.000000000, 18446744073709551615 < 4503599627370496.000000000, 18446744073709551615 <= 4503599627370496.000000000, 18446744073709551615 > 4503599627370496.000000000, 18446744073709551615 >= 4503599627370496.000000000,	4503599627370496.000000000 = 18446744073709551615, 4503599627370496.000000000 != 18446744073709551615, 4503599627370496.000000000 < 18446744073709551615, 4503599627370496.000000000 <= 18446744073709551615, 4503599627370496.000000000 > 18446744073709551615, 4503599627370496.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 4503599627370496.000000000, toUInt64(18446744073709551615) != 4503599627370496.000000000, toUInt64(18446744073709551615) < 4503599627370496.000000000, toUInt64(18446744073709551615) <= 4503599627370496.000000000, toUInt64(18446744073709551615) > 4503599627370496.000000000, toUInt64(18446744073709551615) >= 4503599627370496.000000000,	4503599627370496.000000000 = toUInt64(18446744073709551615), 4503599627370496.000000000 != toUInt64(18446744073709551615), 4503599627370496.000000000 < toUInt64(18446744073709551615), 4503599627370496.000000000 <= toUInt64(18446744073709551615), 4503599627370496.000000000 > toUInt64(18446744073709551615), 4503599627370496.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740991.000000000', 18446744073709551615 = 9007199254740991.000000000, 18446744073709551615 != 9007199254740991.000000000, 18446744073709551615 < 9007199254740991.000000000, 18446744073709551615 <= 9007199254740991.000000000, 18446744073709551615 > 9007199254740991.000000000, 18446744073709551615 >= 9007199254740991.000000000,	9007199254740991.000000000 = 18446744073709551615, 9007199254740991.000000000 != 18446744073709551615, 9007199254740991.000000000 < 18446744073709551615, 9007199254740991.000000000 <= 18446744073709551615, 9007199254740991.000000000 > 18446744073709551615, 9007199254740991.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740991.000000000, toUInt64(18446744073709551615) != 9007199254740991.000000000, toUInt64(18446744073709551615) < 9007199254740991.000000000, toUInt64(18446744073709551615) <= 9007199254740991.000000000, toUInt64(18446744073709551615) > 9007199254740991.000000000, toUInt64(18446744073709551615) >= 9007199254740991.000000000,	9007199254740991.000000000 = toUInt64(18446744073709551615), 9007199254740991.000000000 != toUInt64(18446744073709551615), 9007199254740991.000000000 < toUInt64(18446744073709551615), 9007199254740991.000000000 <= toUInt64(18446744073709551615), 9007199254740991.000000000 > toUInt64(18446744073709551615), 9007199254740991.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740992.000000000', 18446744073709551615 = 9007199254740992.000000000, 18446744073709551615 != 9007199254740992.000000000, 18446744073709551615 < 9007199254740992.000000000, 18446744073709551615 <= 9007199254740992.000000000, 18446744073709551615 > 9007199254740992.000000000, 18446744073709551615 >= 9007199254740992.000000000,	9007199254740992.000000000 = 18446744073709551615, 9007199254740992.000000000 != 18446744073709551615, 9007199254740992.000000000 < 18446744073709551615, 9007199254740992.000000000 <= 18446744073709551615, 9007199254740992.000000000 > 18446744073709551615, 9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740992.000000000, toUInt64(18446744073709551615) != 9007199254740992.000000000, toUInt64(18446744073709551615) < 9007199254740992.000000000, toUInt64(18446744073709551615) <= 9007199254740992.000000000, toUInt64(18446744073709551615) > 9007199254740992.000000000, toUInt64(18446744073709551615) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(18446744073709551615), 9007199254740992.000000000 != toUInt64(18446744073709551615), 9007199254740992.000000000 < toUInt64(18446744073709551615), 9007199254740992.000000000 <= toUInt64(18446744073709551615), 9007199254740992.000000000 > toUInt64(18446744073709551615), 9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740992.000000000', 18446744073709551615 = 9007199254740992.000000000, 18446744073709551615 != 9007199254740992.000000000, 18446744073709551615 < 9007199254740992.000000000, 18446744073709551615 <= 9007199254740992.000000000, 18446744073709551615 > 9007199254740992.000000000, 18446744073709551615 >= 9007199254740992.000000000,	9007199254740992.000000000 = 18446744073709551615, 9007199254740992.000000000 != 18446744073709551615, 9007199254740992.000000000 < 18446744073709551615, 9007199254740992.000000000 <= 18446744073709551615, 9007199254740992.000000000 > 18446744073709551615, 9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740992.000000000, toUInt64(18446744073709551615) != 9007199254740992.000000000, toUInt64(18446744073709551615) < 9007199254740992.000000000, toUInt64(18446744073709551615) <= 9007199254740992.000000000, toUInt64(18446744073709551615) > 9007199254740992.000000000, toUInt64(18446744073709551615) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(18446744073709551615), 9007199254740992.000000000 != toUInt64(18446744073709551615), 9007199254740992.000000000 < toUInt64(18446744073709551615), 9007199254740992.000000000 <= toUInt64(18446744073709551615), 9007199254740992.000000000 > toUInt64(18446744073709551615), 9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740994.000000000', 18446744073709551615 = 9007199254740994.000000000, 18446744073709551615 != 9007199254740994.000000000, 18446744073709551615 < 9007199254740994.000000000, 18446744073709551615 <= 9007199254740994.000000000, 18446744073709551615 > 9007199254740994.000000000, 18446744073709551615 >= 9007199254740994.000000000,	9007199254740994.000000000 = 18446744073709551615, 9007199254740994.000000000 != 18446744073709551615, 9007199254740994.000000000 < 18446744073709551615, 9007199254740994.000000000 <= 18446744073709551615, 9007199254740994.000000000 > 18446744073709551615, 9007199254740994.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740994.000000000, toUInt64(18446744073709551615) != 9007199254740994.000000000, toUInt64(18446744073709551615) < 9007199254740994.000000000, toUInt64(18446744073709551615) <= 9007199254740994.000000000, toUInt64(18446744073709551615) > 9007199254740994.000000000, toUInt64(18446744073709551615) >= 9007199254740994.000000000,	9007199254740994.000000000 = toUInt64(18446744073709551615), 9007199254740994.000000000 != toUInt64(18446744073709551615), 9007199254740994.000000000 < toUInt64(18446744073709551615), 9007199254740994.000000000 <= toUInt64(18446744073709551615), 9007199254740994.000000000 > toUInt64(18446744073709551615), 9007199254740994.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740991.000000000', 18446744073709551615 = -9007199254740991.000000000, 18446744073709551615 != -9007199254740991.000000000, 18446744073709551615 < -9007199254740991.000000000, 18446744073709551615 <= -9007199254740991.000000000, 18446744073709551615 > -9007199254740991.000000000, 18446744073709551615 >= -9007199254740991.000000000,	-9007199254740991.000000000 = 18446744073709551615, -9007199254740991.000000000 != 18446744073709551615, -9007199254740991.000000000 < 18446744073709551615, -9007199254740991.000000000 <= 18446744073709551615, -9007199254740991.000000000 > 18446744073709551615, -9007199254740991.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740991.000000000, toUInt64(18446744073709551615) != -9007199254740991.000000000, toUInt64(18446744073709551615) < -9007199254740991.000000000, toUInt64(18446744073709551615) <= -9007199254740991.000000000, toUInt64(18446744073709551615) > -9007199254740991.000000000, toUInt64(18446744073709551615) >= -9007199254740991.000000000,	-9007199254740991.000000000 = toUInt64(18446744073709551615), -9007199254740991.000000000 != toUInt64(18446744073709551615), -9007199254740991.000000000 < toUInt64(18446744073709551615), -9007199254740991.000000000 <= toUInt64(18446744073709551615), -9007199254740991.000000000 > toUInt64(18446744073709551615), -9007199254740991.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740992.000000000', 18446744073709551615 = -9007199254740992.000000000, 18446744073709551615 != -9007199254740992.000000000, 18446744073709551615 < -9007199254740992.000000000, 18446744073709551615 <= -9007199254740992.000000000, 18446744073709551615 > -9007199254740992.000000000, 18446744073709551615 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 18446744073709551615, -9007199254740992.000000000 != 18446744073709551615, -9007199254740992.000000000 < 18446744073709551615, -9007199254740992.000000000 <= 18446744073709551615, -9007199254740992.000000000 > 18446744073709551615, -9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740992.000000000, toUInt64(18446744073709551615) != -9007199254740992.000000000, toUInt64(18446744073709551615) < -9007199254740992.000000000, toUInt64(18446744073709551615) <= -9007199254740992.000000000, toUInt64(18446744073709551615) > -9007199254740992.000000000, toUInt64(18446744073709551615) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(18446744073709551615), -9007199254740992.000000000 != toUInt64(18446744073709551615), -9007199254740992.000000000 < toUInt64(18446744073709551615), -9007199254740992.000000000 <= toUInt64(18446744073709551615), -9007199254740992.000000000 > toUInt64(18446744073709551615), -9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740992.000000000', 18446744073709551615 = -9007199254740992.000000000, 18446744073709551615 != -9007199254740992.000000000, 18446744073709551615 < -9007199254740992.000000000, 18446744073709551615 <= -9007199254740992.000000000, 18446744073709551615 > -9007199254740992.000000000, 18446744073709551615 >= -9007199254740992.000000000,	-9007199254740992.000000000 = 18446744073709551615, -9007199254740992.000000000 != 18446744073709551615, -9007199254740992.000000000 < 18446744073709551615, -9007199254740992.000000000 <= 18446744073709551615, -9007199254740992.000000000 > 18446744073709551615, -9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740992.000000000, toUInt64(18446744073709551615) != -9007199254740992.000000000, toUInt64(18446744073709551615) < -9007199254740992.000000000, toUInt64(18446744073709551615) <= -9007199254740992.000000000, toUInt64(18446744073709551615) > -9007199254740992.000000000, toUInt64(18446744073709551615) >= -9007199254740992.000000000,	-9007199254740992.000000000 = toUInt64(18446744073709551615), -9007199254740992.000000000 != toUInt64(18446744073709551615), -9007199254740992.000000000 < toUInt64(18446744073709551615), -9007199254740992.000000000 <= toUInt64(18446744073709551615), -9007199254740992.000000000 > toUInt64(18446744073709551615), -9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9007199254740994.000000000', 18446744073709551615 = -9007199254740994.000000000, 18446744073709551615 != -9007199254740994.000000000, 18446744073709551615 < -9007199254740994.000000000, 18446744073709551615 <= -9007199254740994.000000000, 18446744073709551615 > -9007199254740994.000000000, 18446744073709551615 >= -9007199254740994.000000000,	-9007199254740994.000000000 = 18446744073709551615, -9007199254740994.000000000 != 18446744073709551615, -9007199254740994.000000000 < 18446744073709551615, -9007199254740994.000000000 <= 18446744073709551615, -9007199254740994.000000000 > 18446744073709551615, -9007199254740994.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9007199254740994.000000000, toUInt64(18446744073709551615) != -9007199254740994.000000000, toUInt64(18446744073709551615) < -9007199254740994.000000000, toUInt64(18446744073709551615) <= -9007199254740994.000000000, toUInt64(18446744073709551615) > -9007199254740994.000000000, toUInt64(18446744073709551615) >= -9007199254740994.000000000,	-9007199254740994.000000000 = toUInt64(18446744073709551615), -9007199254740994.000000000 != toUInt64(18446744073709551615), -9007199254740994.000000000 < toUInt64(18446744073709551615), -9007199254740994.000000000 <= toUInt64(18446744073709551615), -9007199254740994.000000000 > toUInt64(18446744073709551615), -9007199254740994.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '104.000000000', 18446744073709551615 = 104.000000000, 18446744073709551615 != 104.000000000, 18446744073709551615 < 104.000000000, 18446744073709551615 <= 104.000000000, 18446744073709551615 > 104.000000000, 18446744073709551615 >= 104.000000000,	104.000000000 = 18446744073709551615, 104.000000000 != 18446744073709551615, 104.000000000 < 18446744073709551615, 104.000000000 <= 18446744073709551615, 104.000000000 > 18446744073709551615, 104.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 104.000000000, toUInt64(18446744073709551615) != 104.000000000, toUInt64(18446744073709551615) < 104.000000000, toUInt64(18446744073709551615) <= 104.000000000, toUInt64(18446744073709551615) > 104.000000000, toUInt64(18446744073709551615) >= 104.000000000,	104.000000000 = toUInt64(18446744073709551615), 104.000000000 != toUInt64(18446744073709551615), 104.000000000 < toUInt64(18446744073709551615), 104.000000000 <= toUInt64(18446744073709551615), 104.000000000 > toUInt64(18446744073709551615), 104.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-4503599627370496.000000000', 18446744073709551615 = -4503599627370496.000000000, 18446744073709551615 != -4503599627370496.000000000, 18446744073709551615 < -4503599627370496.000000000, 18446744073709551615 <= -4503599627370496.000000000, 18446744073709551615 > -4503599627370496.000000000, 18446744073709551615 >= -4503599627370496.000000000,	-4503599627370496.000000000 = 18446744073709551615, -4503599627370496.000000000 != 18446744073709551615, -4503599627370496.000000000 < 18446744073709551615, -4503599627370496.000000000 <= 18446744073709551615, -4503599627370496.000000000 > 18446744073709551615, -4503599627370496.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -4503599627370496.000000000, toUInt64(18446744073709551615) != -4503599627370496.000000000, toUInt64(18446744073709551615) < -4503599627370496.000000000, toUInt64(18446744073709551615) <= -4503599627370496.000000000, toUInt64(18446744073709551615) > -4503599627370496.000000000, toUInt64(18446744073709551615) >= -4503599627370496.000000000,	-4503599627370496.000000000 = toUInt64(18446744073709551615), -4503599627370496.000000000 != toUInt64(18446744073709551615), -4503599627370496.000000000 < toUInt64(18446744073709551615), -4503599627370496.000000000 <= toUInt64(18446744073709551615), -4503599627370496.000000000 > toUInt64(18446744073709551615), -4503599627370496.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-0.500000000', 18446744073709551615 = -0.500000000, 18446744073709551615 != -0.500000000, 18446744073709551615 < -0.500000000, 18446744073709551615 <= -0.500000000, 18446744073709551615 > -0.500000000, 18446744073709551615 >= -0.500000000,	-0.500000000 = 18446744073709551615, -0.500000000 != 18446744073709551615, -0.500000000 < 18446744073709551615, -0.500000000 <= 18446744073709551615, -0.500000000 > 18446744073709551615, -0.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -0.500000000, toUInt64(18446744073709551615) != -0.500000000, toUInt64(18446744073709551615) < -0.500000000, toUInt64(18446744073709551615) <= -0.500000000, toUInt64(18446744073709551615) > -0.500000000, toUInt64(18446744073709551615) >= -0.500000000,	-0.500000000 = toUInt64(18446744073709551615), -0.500000000 != toUInt64(18446744073709551615), -0.500000000 < toUInt64(18446744073709551615), -0.500000000 <= toUInt64(18446744073709551615), -0.500000000 > toUInt64(18446744073709551615), -0.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '0.500000000', 18446744073709551615 = 0.500000000, 18446744073709551615 != 0.500000000, 18446744073709551615 < 0.500000000, 18446744073709551615 <= 0.500000000, 18446744073709551615 > 0.500000000, 18446744073709551615 >= 0.500000000,	0.500000000 = 18446744073709551615, 0.500000000 != 18446744073709551615, 0.500000000 < 18446744073709551615, 0.500000000 <= 18446744073709551615, 0.500000000 > 18446744073709551615, 0.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 0.500000000, toUInt64(18446744073709551615) != 0.500000000, toUInt64(18446744073709551615) < 0.500000000, toUInt64(18446744073709551615) <= 0.500000000, toUInt64(18446744073709551615) > 0.500000000, toUInt64(18446744073709551615) >= 0.500000000,	0.500000000 = toUInt64(18446744073709551615), 0.500000000 != toUInt64(18446744073709551615), 0.500000000 < toUInt64(18446744073709551615), 0.500000000 <= toUInt64(18446744073709551615), 0.500000000 > toUInt64(18446744073709551615), 0.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-1.500000000', 18446744073709551615 = -1.500000000, 18446744073709551615 != -1.500000000, 18446744073709551615 < -1.500000000, 18446744073709551615 <= -1.500000000, 18446744073709551615 > -1.500000000, 18446744073709551615 >= -1.500000000,	-1.500000000 = 18446744073709551615, -1.500000000 != 18446744073709551615, -1.500000000 < 18446744073709551615, -1.500000000 <= 18446744073709551615, -1.500000000 > 18446744073709551615, -1.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -1.500000000, toUInt64(18446744073709551615) != -1.500000000, toUInt64(18446744073709551615) < -1.500000000, toUInt64(18446744073709551615) <= -1.500000000, toUInt64(18446744073709551615) > -1.500000000, toUInt64(18446744073709551615) >= -1.500000000,	-1.500000000 = toUInt64(18446744073709551615), -1.500000000 != toUInt64(18446744073709551615), -1.500000000 < toUInt64(18446744073709551615), -1.500000000 <= toUInt64(18446744073709551615), -1.500000000 > toUInt64(18446744073709551615), -1.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '1.500000000', 18446744073709551615 = 1.500000000, 18446744073709551615 != 1.500000000, 18446744073709551615 < 1.500000000, 18446744073709551615 <= 1.500000000, 18446744073709551615 > 1.500000000, 18446744073709551615 >= 1.500000000,	1.500000000 = 18446744073709551615, 1.500000000 != 18446744073709551615, 1.500000000 < 18446744073709551615, 1.500000000 <= 18446744073709551615, 1.500000000 > 18446744073709551615, 1.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 1.500000000, toUInt64(18446744073709551615) != 1.500000000, toUInt64(18446744073709551615) < 1.500000000, toUInt64(18446744073709551615) <= 1.500000000, toUInt64(18446744073709551615) > 1.500000000, toUInt64(18446744073709551615) >= 1.500000000,	1.500000000 = toUInt64(18446744073709551615), 1.500000000 != toUInt64(18446744073709551615), 1.500000000 < toUInt64(18446744073709551615), 1.500000000 <= toUInt64(18446744073709551615), 1.500000000 > toUInt64(18446744073709551615), 1.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9007199254740992.000000000', 18446744073709551615 = 9007199254740992.000000000, 18446744073709551615 != 9007199254740992.000000000, 18446744073709551615 < 9007199254740992.000000000, 18446744073709551615 <= 9007199254740992.000000000, 18446744073709551615 > 9007199254740992.000000000, 18446744073709551615 >= 9007199254740992.000000000,	9007199254740992.000000000 = 18446744073709551615, 9007199254740992.000000000 != 18446744073709551615, 9007199254740992.000000000 < 18446744073709551615, 9007199254740992.000000000 <= 18446744073709551615, 9007199254740992.000000000 > 18446744073709551615, 9007199254740992.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9007199254740992.000000000, toUInt64(18446744073709551615) != 9007199254740992.000000000, toUInt64(18446744073709551615) < 9007199254740992.000000000, toUInt64(18446744073709551615) <= 9007199254740992.000000000, toUInt64(18446744073709551615) > 9007199254740992.000000000, toUInt64(18446744073709551615) >= 9007199254740992.000000000,	9007199254740992.000000000 = toUInt64(18446744073709551615), 9007199254740992.000000000 != toUInt64(18446744073709551615), 9007199254740992.000000000 < toUInt64(18446744073709551615), 9007199254740992.000000000 <= toUInt64(18446744073709551615), 9007199254740992.000000000 > toUInt64(18446744073709551615), 9007199254740992.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '2251799813685247.500000000', 18446744073709551615 = 2251799813685247.500000000, 18446744073709551615 != 2251799813685247.500000000, 18446744073709551615 < 2251799813685247.500000000, 18446744073709551615 <= 2251799813685247.500000000, 18446744073709551615 > 2251799813685247.500000000, 18446744073709551615 >= 2251799813685247.500000000,	2251799813685247.500000000 = 18446744073709551615, 2251799813685247.500000000 != 18446744073709551615, 2251799813685247.500000000 < 18446744073709551615, 2251799813685247.500000000 <= 18446744073709551615, 2251799813685247.500000000 > 18446744073709551615, 2251799813685247.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 2251799813685247.500000000, toUInt64(18446744073709551615) != 2251799813685247.500000000, toUInt64(18446744073709551615) < 2251799813685247.500000000, toUInt64(18446744073709551615) <= 2251799813685247.500000000, toUInt64(18446744073709551615) > 2251799813685247.500000000, toUInt64(18446744073709551615) >= 2251799813685247.500000000,	2251799813685247.500000000 = toUInt64(18446744073709551615), 2251799813685247.500000000 != toUInt64(18446744073709551615), 2251799813685247.500000000 < toUInt64(18446744073709551615), 2251799813685247.500000000 <= toUInt64(18446744073709551615), 2251799813685247.500000000 > toUInt64(18446744073709551615), 2251799813685247.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '2251799813685248.500000000', 18446744073709551615 = 2251799813685248.500000000, 18446744073709551615 != 2251799813685248.500000000, 18446744073709551615 < 2251799813685248.500000000, 18446744073709551615 <= 2251799813685248.500000000, 18446744073709551615 > 2251799813685248.500000000, 18446744073709551615 >= 2251799813685248.500000000,	2251799813685248.500000000 = 18446744073709551615, 2251799813685248.500000000 != 18446744073709551615, 2251799813685248.500000000 < 18446744073709551615, 2251799813685248.500000000 <= 18446744073709551615, 2251799813685248.500000000 > 18446744073709551615, 2251799813685248.500000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 2251799813685248.500000000, toUInt64(18446744073709551615) != 2251799813685248.500000000, toUInt64(18446744073709551615) < 2251799813685248.500000000, toUInt64(18446744073709551615) <= 2251799813685248.500000000, toUInt64(18446744073709551615) > 2251799813685248.500000000, toUInt64(18446744073709551615) >= 2251799813685248.500000000,	2251799813685248.500000000 = toUInt64(18446744073709551615), 2251799813685248.500000000 != toUInt64(18446744073709551615), 2251799813685248.500000000 < toUInt64(18446744073709551615), 2251799813685248.500000000 <= toUInt64(18446744073709551615), 2251799813685248.500000000 > toUInt64(18446744073709551615), 2251799813685248.500000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '1152921504606846976.000000000', 18446744073709551615 = 1152921504606846976.000000000, 18446744073709551615 != 1152921504606846976.000000000, 18446744073709551615 < 1152921504606846976.000000000, 18446744073709551615 <= 1152921504606846976.000000000, 18446744073709551615 > 1152921504606846976.000000000, 18446744073709551615 >= 1152921504606846976.000000000,	1152921504606846976.000000000 = 18446744073709551615, 1152921504606846976.000000000 != 18446744073709551615, 1152921504606846976.000000000 < 18446744073709551615, 1152921504606846976.000000000 <= 18446744073709551615, 1152921504606846976.000000000 > 18446744073709551615, 1152921504606846976.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 1152921504606846976.000000000, toUInt64(18446744073709551615) != 1152921504606846976.000000000, toUInt64(18446744073709551615) < 1152921504606846976.000000000, toUInt64(18446744073709551615) <= 1152921504606846976.000000000, toUInt64(18446744073709551615) > 1152921504606846976.000000000, toUInt64(18446744073709551615) >= 1152921504606846976.000000000,	1152921504606846976.000000000 = toUInt64(18446744073709551615), 1152921504606846976.000000000 != toUInt64(18446744073709551615), 1152921504606846976.000000000 < toUInt64(18446744073709551615), 1152921504606846976.000000000 <= toUInt64(18446744073709551615), 1152921504606846976.000000000 > toUInt64(18446744073709551615), 1152921504606846976.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-1152921504606846976.000000000', 18446744073709551615 = -1152921504606846976.000000000, 18446744073709551615 != -1152921504606846976.000000000, 18446744073709551615 < -1152921504606846976.000000000, 18446744073709551615 <= -1152921504606846976.000000000, 18446744073709551615 > -1152921504606846976.000000000, 18446744073709551615 >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = 18446744073709551615, -1152921504606846976.000000000 != 18446744073709551615, -1152921504606846976.000000000 < 18446744073709551615, -1152921504606846976.000000000 <= 18446744073709551615, -1152921504606846976.000000000 > 18446744073709551615, -1152921504606846976.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -1152921504606846976.000000000, toUInt64(18446744073709551615) != -1152921504606846976.000000000, toUInt64(18446744073709551615) < -1152921504606846976.000000000, toUInt64(18446744073709551615) <= -1152921504606846976.000000000, toUInt64(18446744073709551615) > -1152921504606846976.000000000, toUInt64(18446744073709551615) >= -1152921504606846976.000000000,	-1152921504606846976.000000000 = toUInt64(18446744073709551615), -1152921504606846976.000000000 != toUInt64(18446744073709551615), -1152921504606846976.000000000 < toUInt64(18446744073709551615), -1152921504606846976.000000000 <= toUInt64(18446744073709551615), -1152921504606846976.000000000 > toUInt64(18446744073709551615), -1152921504606846976.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '-9223372036854786048.000000000', 18446744073709551615 = -9223372036854786048.000000000, 18446744073709551615 != -9223372036854786048.000000000, 18446744073709551615 < -9223372036854786048.000000000, 18446744073709551615 <= -9223372036854786048.000000000, 18446744073709551615 > -9223372036854786048.000000000, 18446744073709551615 >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = 18446744073709551615, -9223372036854786048.000000000 != 18446744073709551615, -9223372036854786048.000000000 < 18446744073709551615, -9223372036854786048.000000000 <= 18446744073709551615, -9223372036854786048.000000000 > 18446744073709551615, -9223372036854786048.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = -9223372036854786048.000000000, toUInt64(18446744073709551615) != -9223372036854786048.000000000, toUInt64(18446744073709551615) < -9223372036854786048.000000000, toUInt64(18446744073709551615) <= -9223372036854786048.000000000, toUInt64(18446744073709551615) > -9223372036854786048.000000000, toUInt64(18446744073709551615) >= -9223372036854786048.000000000,	-9223372036854786048.000000000 = toUInt64(18446744073709551615), -9223372036854786048.000000000 != toUInt64(18446744073709551615), -9223372036854786048.000000000 < toUInt64(18446744073709551615), -9223372036854786048.000000000 <= toUInt64(18446744073709551615), -9223372036854786048.000000000 > toUInt64(18446744073709551615), -9223372036854786048.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '18446744073709551615', '9223372036854786048.000000000', 18446744073709551615 = 9223372036854786048.000000000, 18446744073709551615 != 9223372036854786048.000000000, 18446744073709551615 < 9223372036854786048.000000000, 18446744073709551615 <= 9223372036854786048.000000000, 18446744073709551615 > 9223372036854786048.000000000, 18446744073709551615 >= 9223372036854786048.000000000,	9223372036854786048.000000000 = 18446744073709551615, 9223372036854786048.000000000 != 18446744073709551615, 9223372036854786048.000000000 < 18446744073709551615, 9223372036854786048.000000000 <= 18446744073709551615, 9223372036854786048.000000000 > 18446744073709551615, 9223372036854786048.000000000 >= 18446744073709551615 , toUInt64(18446744073709551615) = 9223372036854786048.000000000, toUInt64(18446744073709551615) != 9223372036854786048.000000000, toUInt64(18446744073709551615) < 9223372036854786048.000000000, toUInt64(18446744073709551615) <= 9223372036854786048.000000000, toUInt64(18446744073709551615) > 9223372036854786048.000000000, toUInt64(18446744073709551615) >= 9223372036854786048.000000000,	9223372036854786048.000000000 = toUInt64(18446744073709551615), 9223372036854786048.000000000 != toUInt64(18446744073709551615), 9223372036854786048.000000000 < toUInt64(18446744073709551615), 9223372036854786048.000000000 <= toUInt64(18446744073709551615), 9223372036854786048.000000000 > toUInt64(18446744073709551615), 9223372036854786048.000000000 >= toUInt64(18446744073709551615) ;
+SELECT '9223372036854775808', '0.000000000', 9223372036854775808 = 0.000000000, 9223372036854775808 != 0.000000000, 9223372036854775808 < 0.000000000, 9223372036854775808 <= 0.000000000, 9223372036854775808 > 0.000000000, 9223372036854775808 >= 0.000000000,	0.000000000 = 9223372036854775808, 0.000000000 != 9223372036854775808, 0.000000000 < 9223372036854775808, 0.000000000 <= 9223372036854775808, 0.000000000 > 9223372036854775808, 0.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = 0.000000000, toUInt64(9223372036854775808) != 0.000000000, toUInt64(9223372036854775808) < 0.000000000, toUInt64(9223372036854775808) <= 0.000000000, toUInt64(9223372036854775808) > 0.000000000, toUInt64(9223372036854775808) >= 0.000000000,	0.000000000 = toUInt64(9223372036854775808), 0.000000000 != toUInt64(9223372036854775808), 0.000000000 < toUInt64(9223372036854775808), 0.000000000 <= toUInt64(9223372036854775808), 0.000000000 > toUInt64(9223372036854775808), 0.000000000 >= toUInt64(9223372036854775808) ;
+SELECT '9223372036854775808', '-1.000000000', 9223372036854775808 = -1.000000000, 9223372036854775808 != -1.000000000, 9223372036854775808 < -1.000000000, 9223372036854775808 <= -1.000000000, 9223372036854775808 > -1.000000000, 9223372036854775808 >= -1.000000000,	-1.000000000 = 9223372036854775808, -1.000000000 != 9223372036854775808, -1.000000000 < 9223372036854775808, -1.000000000 <= 9223372036854775808, -1.000000000 > 9223372036854775808, -1.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = -1.000000000, toUInt64(9223372036854775808) != -1.000000000, toUInt64(9223372036854775808) < -1.000000000, toUInt64(9223372036854775808) <= -1.000000000, toUInt64(9223372036854775808) > -1.000000000, toUInt64(9223372036854775808) >= -1.000000000,	-1.000000000 = toUInt64(9223372036854775808), -1.000000000 != toUInt64(9223372036854775808), -1.000000000 < toUInt64(9223372036854775808), -1.000000000 <= toUInt64(9223372036854775808), -1.000000000 > toUInt64(9223372036854775808), -1.000000000 >= toUInt64(9223372036854775808) ;
+SELECT '9223372036854775808', '1.000000000', 9223372036854775808 = 1.000000000, 9223372036854775808 != 1.000000000, 9223372036854775808 < 1.000000000, 9223372036854775808 <= 1.000000000, 9223372036854775808 > 1.000000000, 9223372036854775808 >= 1.000000000,	1.000000000 = 9223372036854775808, 1.000000000 != 9223372036854775808, 1.000000000 < 9223372036854775808, 1.000000000 <= 9223372036854775808, 1.000000000 > 9223372036854775808, 1.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = 1.000000000, toUInt64(9223372036854775808) != 1.000000000, toUInt64(9223372036854775808) < 1.000000000, toUInt64(9223372036854775808) <= 1.000000000, toUInt64(9223372036854775808) > 1.000000000, toUInt64(9223372036854775808) >= 1.000000000,	1.000000000 = toUInt64(9223372036854775808), 1.000000000 != toUInt64(9223372036854775808), 1.000000000 < toUInt64(9223372036854775808), 1.000000000 <= toUInt64(9223372036854775808), 1.000000000 > toUInt64(9223372036854775808), 1.000000000 >= toUInt64(9223372036854775808) ;
+SELECT '9223372036854775808', '18446744073709551616.000000000', 9223372036854775808 = 18446744073709551616.000000000, 9223372036854775808 != 18446744073709551616.000000000, 9223372036854775808 < 18446744073709551616.000000000, 9223372036854775808 <= 18446744073709551616.000000000, 9223372036854775808 > 18446744073709551616.000000000, 9223372036854775808 >= 18446744073709551616.000000000,	18446744073709551616.000000000 = 9223372036854775808, 18446744073709551616.000000000 != 9223372036854775808, 18446744073709551616.000000000 < 9223372036854775808, 18446744073709551616.000000000 <= 9223372036854775808, 18446744073709551616.000000000 > 9223372036854775808, 18446744073709551616.000000000 >= 9223372036854775808 , toUInt64(9223372036854775808) = 18446744073709551616.000000000, toUInt64(9223372036854775808) != 18446744073709551616.000000000, toUInt64(9223372036854775808) < 18446744073709551616.000000000, toUInt64(9223372036854775808) <= 18446744073709551616.000000000, toUInt64(9223372036854775808) > 18446744073709551616.000000000, toUInt64(9223372036854775808) >= 18446744073709551616.000000000,	18446744073709551616.000000000 = toUInt64(9223372036854775808), 18446744073709551616.000000000 != toUInt64(9223372036854775808), 18446744073709551616.000000000 < toUInt64(9223372036854775808), 18446744073709551616.000000000 <= toUInt64(9223372036854775808), 18446744073709551616.000000000 > toUInt64(9223372036854775808), 18446744073709551616.000000000 >= toUInt64(9223372036854775808) ;
diff --git a/tests/queries/0_stateless/00417_system_build_options.reference b/tests/queries/0_stateless/00417_system_build_options.reference
index 2b2c8f1df33..5decd8ca4ec 100644
--- a/tests/queries/0_stateless/00417_system_build_options.reference
+++ b/tests/queries/0_stateless/00417_system_build_options.reference
@@ -1,4 +1,3 @@
-BUILD_DATE
 BUILD_TYPE
 CXX_COMPILER
 CXX_FLAGS
diff --git a/tests/queries/0_stateless/00417_system_build_options.sh b/tests/queries/0_stateless/00417_system_build_options.sh
index bfdfa7d14ce..36c9e9d3885 100755
--- a/tests/queries/0_stateless/00417_system_build_options.sh
+++ b/tests/queries/0_stateless/00417_system_build_options.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_DATE|BUILD_TYPE|CXX_COMPILER)\s+\S+/ || /(CXX_FLAGS|LINK_FLAGS|TZDATA_VERSION)/';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_TYPE|CXX_COMPILER)\s+\S+/ || /(CXX_FLAGS|LINK_FLAGS|TZDATA_VERSION)/';
diff --git a/tests/queries/0_stateless/00506_union_distributed.reference b/tests/queries/0_stateless/00506_union_distributed.reference
index 4a2dcd69dc2..3324c3d5675 100644
--- a/tests/queries/0_stateless/00506_union_distributed.reference
+++ b/tests/queries/0_stateless/00506_union_distributed.reference
@@ -1,16 +1,16 @@
 3	8
+13	28
 23	48
 33	68
-13	28
 3	8
+13	28
 23	48
 33	68
-13	28
 3	8
+13	28
 23	48
 33	68
-13	28
 3	8
+13	28
 23	48
 33	68
-13	28
diff --git a/tests/queries/0_stateless/00506_union_distributed.sql b/tests/queries/0_stateless/00506_union_distributed.sql
index 3f631b8da56..4c5fd9a1743 100644
--- a/tests/queries/0_stateless/00506_union_distributed.sql
+++ b/tests/queries/0_stateless/00506_union_distributed.sql
@@ -15,10 +15,10 @@ INSERT INTO union1 VALUES (11,12,13,14,15);
 INSERT INTO union2 VALUES (21,22,23,24,25);
 INSERT INTO union3 VALUES (31,32,33,34,35);
 
-select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b ) as a group by b;
-select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b ) as a group by b;
-select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union1 where b>1 group by a, b ) as a group by b;
-select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union3 where b>1 group by a, b ) as a group by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b  order by a, b) as a group by b order by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union2 where b>1 group by a, b order by a, b) as a group by b order by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union1 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union1 where b>1 group by a, b order by a, b) as a group by b order by b;
+select b, sum(c) from ( select a, b, sum(c) as c from union2 where a>1 group by a,b UNION ALL select a, b, sum(c) as c from union3 where b>1 group by a, b order by a, b) as a group by b order by b;
 
 DROP TABLE union1;
 DROP TABLE union2;
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments4.reference b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00534_functions_bad_arguments4.reference
rename to tests/queries/0_stateless/00534_functions_bad_arguments4_long.reference
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments4.sh b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
similarity index 100%
rename from tests/queries/0_stateless/00534_functions_bad_arguments4.sh
rename to tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
diff --git a/tests/queries/0_stateless/00536_int_exp.sql b/tests/queries/0_stateless/00536_int_exp.sql
index c78a326a3b3..80b88e8f4f8 100644
--- a/tests/queries/0_stateless/00536_int_exp.sql
+++ b/tests/queries/0_stateless/00536_int_exp.sql
@@ -1 +1 @@
-SELECT exp2(number) AS e2d, intExp2(number) AS e2i, e2d = e2i AS e2eq, exp10(number) AS e10d, intExp10(number) AS e10i, e10d = e10i AS e10eq FROM system.numbers LIMIT 64;
+SELECT exp2(number) AS e2d, intExp2(number) AS e2i, toUInt64(e2d) = e2i AS e2eq, exp10(number) AS e10d, intExp10(number) AS e10i, toString(e10d) = toString(e10i) AS e10eq FROM system.numbers LIMIT 64;
diff --git a/tests/queries/0_stateless/00555_hasAll_hasAny.reference b/tests/queries/0_stateless/00555_hasAll_hasAny.reference
index b33700bfa02..5608f7b970e 100644
--- a/tests/queries/0_stateless/00555_hasAll_hasAny.reference
+++ b/tests/queries/0_stateless/00555_hasAll_hasAny.reference
@@ -34,10 +34,6 @@
 1
 0
 -
-0
-0
-0
-0
 -
 0
 1
diff --git a/tests/queries/0_stateless/00555_hasAll_hasAny.sql b/tests/queries/0_stateless/00555_hasAll_hasAny.sql
index 9df356dce2e..c8a6c3cecbd 100644
--- a/tests/queries/0_stateless/00555_hasAll_hasAny.sql
+++ b/tests/queries/0_stateless/00555_hasAll_hasAny.sql
@@ -39,10 +39,10 @@ select hasAny(['a', 'b'], ['a', 'c']);
 select hasAll(['a', 'b'], ['a', 'c']);
 select '-';
 
-select hasAny([1], ['a']);
-select hasAll([1], ['a']);
-select hasAll([[1, 2], [3, 4]], ['a', 'c']);
-select hasAny([[1, 2], [3, 4]], ['a', 'c']);
+select hasAny([1], ['a']); -- { serverError 386 }
+select hasAll([1], ['a']); -- { serverError 386 }
+select hasAll([[1, 2], [3, 4]], ['a', 'c']); -- { serverError 386 }
+select hasAny([[1, 2], [3, 4]], ['a', 'c']); -- { serverError 386 }
 select '-';
 
 select hasAll([[1, 2], [3, 4]], [[1, 2], [3, 5]]);
diff --git a/tests/queries/0_stateless/00555_hasSubstr.reference b/tests/queries/0_stateless/00555_hasSubstr.reference
index 1051fa28d6c..de97d19c932 100644
--- a/tests/queries/0_stateless/00555_hasSubstr.reference
+++ b/tests/queries/0_stateless/00555_hasSubstr.reference
@@ -20,8 +20,6 @@
 0
 1
 -
-0
-0
 1
 1
 0
diff --git a/tests/queries/0_stateless/00555_hasSubstr.sql b/tests/queries/0_stateless/00555_hasSubstr.sql
index 04c70e4a43b..5f90a69c546 100644
--- a/tests/queries/0_stateless/00555_hasSubstr.sql
+++ b/tests/queries/0_stateless/00555_hasSubstr.sql
@@ -25,8 +25,8 @@ select hasSubstr(['a', 'b'], ['a', 'c']);
 select hasSubstr(['a', 'c', 'b'], ['a', 'c']);
 select '-';
 
-select hasSubstr([1], ['a']);
-select hasSubstr([[1, 2], [3, 4]], ['a', 'c']);
+select hasSubstr([1], ['a']); -- { serverError 386 }
+select hasSubstr([[1, 2], [3, 4]], ['a', 'c']); -- { serverError 386 }
 select hasSubstr([[1, 2], [3, 4], [5, 8]], [[3, 4]]);
 select hasSubstr([[1, 2], [3, 4], [5, 8]], [[3, 4], [5, 8]]);
 select hasSubstr([[1, 2], [3, 4], [5, 8]], [[1, 2], [5, 8]]);
diff --git a/tests/queries/0_stateless/00574_empty_strings_deserialization.sh b/tests/queries/0_stateless/00574_empty_strings_deserialization.sh
index 1cbc9456ab0..fecb6ee17e6 100755
--- a/tests/queries/0_stateless/00574_empty_strings_deserialization.sh
+++ b/tests/queries/0_stateless/00574_empty_strings_deserialization.sh
@@ -8,8 +8,8 @@ $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS empty_strings_deserialization"
 $CLICKHOUSE_CLIENT -q "CREATE TABLE empty_strings_deserialization(s String, i Int32, f Float32) ENGINE Memory"
 
 echo ',,' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
-echo 'aaa,-,' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
-echo 'bbb,,-' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
+echo 'aaa,,' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
+echo 'bbb,,-0' | $CLICKHOUSE_CLIENT -q "INSERT INTO empty_strings_deserialization FORMAT CSV"
 
 $CLICKHOUSE_CLIENT -q "SELECT * FROM empty_strings_deserialization ORDER BY s"
 
diff --git a/tests/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.sql b/tests/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.sql
index bf5d2251470..49975daaa7e 100644
--- a/tests/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.sql
+++ b/tests/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.sql
@@ -11,7 +11,7 @@ INSERT INTO transactions VALUES ('facebook.com'), ('yandex.ru'), ('baidu.com');
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -36,7 +36,7 @@ FORMAT JSONEachRow;
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -63,7 +63,7 @@ SELECT DISTINCT * FROM
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -88,7 +88,7 @@ UNION ALL
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -116,7 +116,7 @@ SELECT
     sum(total_count) AS total, 
     sum(facebookHits) AS facebook,
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -142,7 +142,7 @@ SELECT
     sum(total_count) AS total, 
     max(facebookHits) AS facebook,
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -170,7 +170,7 @@ SELECT * FROM
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -195,7 +195,7 @@ ALL FULL OUTER JOIN
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -224,7 +224,7 @@ SELECT total FROM
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -249,7 +249,7 @@ ALL FULL OUTER JOIN
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -278,7 +278,7 @@ SELECT domain FROM
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
@@ -303,7 +303,7 @@ ALL FULL OUTER JOIN
 SELECT
     sum(total_count) AS total, 
     domain
-FROM 
+FROM
 (
     SELECT
         COUNT(*) AS total_count, 
diff --git a/tests/queries/0_stateless/00597_push_down_predicate.reference b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
similarity index 94%
rename from tests/queries/0_stateless/00597_push_down_predicate.reference
rename to tests/queries/0_stateless/00597_push_down_predicate_long.reference
index 59313c35b81..bd7d3cd81d4 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate.reference
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
@@ -5,7 +5,7 @@
 2000-01-01	1	test string 1	1
 -------Forbid push down-------
 SELECT count()
-FROM 
+FROM
 (
     SELECT
         [number] AS a,
@@ -21,11 +21,11 @@ WHERE NOT ignore(a + b)
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT 1 AS a
 )
-ANY LEFT JOIN 
+ANY LEFT JOIN
 (
     SELECT
         1 AS a,
@@ -35,13 +35,13 @@ WHERE b = 0
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT
         1 AS a,
         1 AS b
 )
-ANY RIGHT JOIN 
+ANY RIGHT JOIN
 (
     SELECT 1 AS a
 ) USING (a)
@@ -49,11 +49,11 @@ WHERE b = 0
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT 1 AS a
 )
-ANY FULL OUTER JOIN 
+ANY FULL OUTER JOIN
 (
     SELECT
         1 AS a,
@@ -63,26 +63,26 @@ WHERE b = 0
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT
         1 AS a,
         1 AS b
 )
-ANY FULL OUTER JOIN 
+ANY FULL OUTER JOIN
 (
     SELECT 1 AS a
 ) USING (a)
 WHERE b = 0
 -------Need push down-------
 SELECT toString(value) AS value
-FROM 
+FROM
 (
     SELECT 1 AS value
 )
 1
 SELECT id
-FROM 
+FROM
 (
     SELECT 1 AS id
     UNION ALL
@@ -92,7 +92,7 @@ FROM
 WHERE id = 1
 1
 SELECT id
-FROM 
+FROM
 (
     SELECT arrayJoin([1, 2, 3]) AS id
     WHERE id = 1
@@ -100,7 +100,7 @@ FROM
 WHERE id = 1
 1
 SELECT id
-FROM 
+FROM
 (
     SELECT arrayJoin([1, 2, 3]) AS id
     WHERE id = 1
@@ -110,7 +110,7 @@ WHERE id = 1
 SELECT
     id,
     subquery
-FROM 
+FROM
 (
     SELECT
         1 AS id,
@@ -122,7 +122,7 @@ WHERE subquery = 1
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT
         toUInt64(sum(id) AS b) AS a,
@@ -137,7 +137,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -156,7 +156,7 @@ WHERE id = 1
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT
         toUInt64(sum(id) AS b) AS a,
@@ -171,7 +171,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -188,14 +188,14 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
         id,
         name,
         value
-    FROM 
+    FROM
     (
         SELECT
             date,
@@ -214,14 +214,14 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
         id,
         name,
         value
-    FROM 
+    FROM
     (
         SELECT
             date,
@@ -240,7 +240,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -257,14 +257,14 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
         id,
         name,
         value
-    FROM 
+    FROM
     (
         SELECT
             date,
@@ -283,7 +283,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -300,14 +300,14 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
         id,
         name,
         value
-    FROM 
+    FROM
     (
         SELECT
             date,
@@ -325,7 +325,7 @@ SELECT
     id,
     date,
     value
-FROM 
+FROM
 (
     SELECT
         id,
@@ -344,7 +344,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -373,7 +373,7 @@ SELECT
     date,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -383,7 +383,7 @@ FROM
     FROM test_00597
     WHERE id = 1
 )
-ANY LEFT JOIN 
+ANY LEFT JOIN
 (
     SELECT id
     FROM test_00597
@@ -395,11 +395,11 @@ SELECT
     date,
     name,
     value
-FROM 
+FROM
 (
     SELECT toInt8(1) AS id
 )
-ANY LEFT JOIN 
+ANY LEFT JOIN
 (
     SELECT
         date,
@@ -411,7 +411,7 @@ ANY LEFT JOIN
 WHERE value = 1
 1	2000-01-01	test string 1	1
 SELECT value
-FROM 
+FROM
 (
     SELECT toInt8(1) AS id
 )
@@ -423,7 +423,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -433,7 +433,7 @@ FROM
         date,
         name,
         value
-    FROM 
+    FROM
     (
         SELECT
             date,
@@ -443,7 +443,7 @@ FROM
         FROM test_00597
         WHERE id = 1
     )
-    ANY LEFT JOIN 
+    ANY LEFT JOIN
     (
         SELECT id
         FROM test_00597
@@ -460,7 +460,7 @@ SELECT
     b.date,
     b.name,
     b.value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -469,7 +469,7 @@ FROM
         value
     FROM test_00597
 )
-ANY LEFT JOIN 
+ANY LEFT JOIN
 (
     SELECT
         date,
@@ -485,7 +485,7 @@ SELECT
     date,
     name,
     value
-FROM 
+FROM
 (
     SELECT
         toInt8(1) AS id,
@@ -493,7 +493,7 @@ FROM
     FROM system.numbers
     LIMIT 1
 )
-ANY LEFT JOIN 
+ANY LEFT JOIN
 (
     SELECT
         date,
@@ -513,7 +513,7 @@ SELECT
     `b.id`,
     `b.name`,
     `b.value`
-FROM 
+FROM
 (
     SELECT
         date,
@@ -524,7 +524,7 @@ FROM
         b.id,
         b.name,
         b.value
-    FROM 
+    FROM
     (
         SELECT
             date,
@@ -534,7 +534,7 @@ FROM
         FROM test_00597
         WHERE id = 1
     ) AS a
-    ANY LEFT JOIN 
+    ANY LEFT JOIN
     (
         SELECT
             date,
@@ -555,7 +555,7 @@ SELECT
     r.date,
     r.name,
     r.value
-FROM 
+FROM
 (
     SELECT
         date,
@@ -564,14 +564,14 @@ FROM
         value
     FROM test_00597
 )
-SEMI LEFT JOIN 
+SEMI LEFT JOIN
 (
     SELECT
         date,
         id,
         name,
         value
-    FROM 
+    FROM
     (
         SELECT
             date,
@@ -586,7 +586,7 @@ SEMI LEFT JOIN
 WHERE r.id = 1
 2000-01-01	1	test string 1	1	2000-01-01	test string 1	1
 SELECT value + t1.value AS expr
-FROM 
+FROM
 (
     SELECT
         value,
diff --git a/tests/queries/0_stateless/00597_push_down_predicate.sql b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
similarity index 100%
rename from tests/queries/0_stateless/00597_push_down_predicate.sql
rename to tests/queries/0_stateless/00597_push_down_predicate_long.sql
diff --git a/tests/queries/0_stateless/00599_create_view_with_subquery.reference b/tests/queries/0_stateless/00599_create_view_with_subquery.reference
index d83d2837a18..0458f650fd0 100644
--- a/tests/queries/0_stateless/00599_create_view_with_subquery.reference
+++ b/tests/queries/0_stateless/00599_create_view_with_subquery.reference
@@ -1 +1 @@
-CREATE VIEW default.test_view_00599\n(\n    `id` UInt64\n) AS\nSELECT *\nFROM default.test_00599\nWHERE id = \n(\n    SELECT 1\n)
+CREATE VIEW default.test_view_00599\n(\n    `id` UInt64\n) AS\nSELECT *\nFROM default.test_00599\nWHERE id = (\n    SELECT 1\n)
diff --git a/tests/queries/0_stateless/00618_nullable_in.sql b/tests/queries/0_stateless/00618_nullable_in.sql
index 72e166dc0f5..f039f1fb9d5 100644
--- a/tests/queries/0_stateless/00618_nullable_in.sql
+++ b/tests/queries/0_stateless/00618_nullable_in.sql
@@ -5,7 +5,7 @@ SELECT
     uniqExact(x) AS u, 
     uniqExactIf(x, name = 'a') AS ue, 
     uniqExactIf(x, name IN ('a', 'b')) AS ui
-FROM 
+FROM
 (
     SELECT
         toNullable('a') AS name, 
diff --git a/tests/queries/0_stateless/00632_aggregation_window_funnel.sql b/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
index d9991be5583..aa0dc804238 100644
--- a/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
+++ b/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
@@ -87,3 +87,5 @@ select 5 = windowFunnel(10000)(timestamp, event = 1000, event = 1001, event = 10
 select 2 = windowFunnel(10000, 'strict_increase')(timestamp, event = 1000, event = 1001, event = 1002, event = 1003, event = 1004) from funnel_test_strict_increase;
 select 3 = windowFunnel(10000)(timestamp, event = 1004, event = 1004, event = 1004) from funnel_test_strict_increase;
 select 1 = windowFunnel(10000, 'strict_increase')(timestamp, event = 1004, event = 1004, event = 1004) from funnel_test_strict_increase;
+
+drop table funnel_test_strict_increase;
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 9415952e0b3..1d6abf7b252 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 @@
+-- NOTE: database = currentDatabase() is not mandatory
+
 SELECT avg(blockSize()) <= 10 FROM system.tables SETTINGS max_block_size = 10;
 SELECT avg(blockSize()) <= 10 FROM system.tables LIMIT 10 SETTINGS max_block_size = 10;
 SELECT (SELECT count() FROM system.tables SETTINGS max_block_size = 10) = (SELECT count() FROM system.tables SETTINGS max_block_size = 9);
diff --git a/tests/queries/0_stateless/00696_system_columns_limit.sql b/tests/queries/0_stateless/00696_system_columns_limit.sql
index 007fac06053..c7bb53f4cb7 100644
--- a/tests/queries/0_stateless/00696_system_columns_limit.sql
+++ b/tests/queries/0_stateless/00696_system_columns_limit.sql
@@ -1,3 +1,5 @@
+-- NOTE: database = currentDatabase() is not mandatory
+
 SELECT count() > 0 FROM (SELECT * FROM system.columns LIMIT 0);
 SELECT count() > 0 FROM (SELECT * FROM system.columns LIMIT 1);
 SELECT count() > 0 FROM (SELECT * FROM system.columns LIMIT 2);
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.reference b/tests/queries/0_stateless/00700_decimal_arithm.reference
index d0040ff5ae2..9de0d4cbf9a 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.reference
+++ b/tests/queries/0_stateless/00700_decimal_arithm.reference
@@ -3,11 +3,13 @@
 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
 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
@@ -15,6 +17,7 @@
 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
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.sql b/tests/queries/0_stateless/00700_decimal_arithm.sql
index 3fa2aade743..c305a850e5b 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.sql
+++ b/tests/queries/0_stateless/00700_decimal_arithm.sql
@@ -31,7 +31,7 @@ SELECT f + f, f - f, f * f, f / f, intDiv(f, f), intDivOrZero(f, f) FROM decimal
 SELECT g + g, g - g, g * g, g / g, intDiv(g, g), intDivOrZero(g, g) FROM decimal WHERE g > 0;
 SELECT h + h, h - h, h * h, h / h, intDiv(h, h), intDivOrZero(h, h) FROM decimal WHERE h > 0; -- { serverError 407 }
 SELECT h + h, h - h FROM decimal WHERE h > 0;
-SELECT i + i, i - i, i * i, i / i, intDiv(i, i), intDivOrZero(i, i) FROM decimal WHERE i > 0; -- { serverError 407 }
+SELECT i + i, i - i, i * i, i / i, intDiv(i, i), intDivOrZero(i, i) FROM decimal WHERE i > 0;
 SELECT i + i, i - i FROM decimal WHERE i > 0;
 SELECT j + j, j - j, j * j, j / j, intDiv(j, j), intDivOrZero(j, j) FROM decimal WHERE j > 0;
 
@@ -39,7 +39,7 @@ SELECT a + 21, a - 21, a - 84, a * 21, a * -21, a / 21, a / 84, intDiv(a, 21), i
 SELECT b + 21, b - 21, b - 84, b * 21, b * -21, b / 21, b / 84, intDiv(b, 21), intDivOrZero(b, 84) FROM decimal WHERE b = 42;
 SELECT c + 21, c - 21, c - 84, c * 21, c * -21, c / 21, c / 84, intDiv(c, 21), intDivOrZero(c, 84) FROM decimal WHERE c = 42;
 SELECT e + 21, e - 21, e - 84, e * 21, e * -21, e / 21, e / 84 FROM decimal WHERE e > 0; -- { serverError 407 }
-SELECT f + 21, f - 21, f - 84, f * 21, f * -21, f / 21, f / 84 FROM decimal WHERE f > 0; -- { serverError 407 }
+SELECT f + 21, f - 21, f - 84, f * 21, f * -21, f / 21, f / 84 FROM decimal WHERE f > 0;
 SELECT g + 21, g - 21, g - 84, g * 21, g * -21, g / 21, g / 84, intDiv(g, 21), intDivOrZero(g, 84) FROM decimal WHERE g > 0;
 SELECT h + 21, h - 21, h - 84, h * 21, h * -21, h / 21, h / 84, intDiv(h, 21), intDivOrZero(h, 84) FROM decimal WHERE h > 0;
 SELECT i + 21, i - 21, i - 84, i * 21, i * -21, i / 21, i / 84, intDiv(i, 21), intDivOrZero(i, 84) FROM decimal WHERE i > 0;
@@ -49,7 +49,7 @@ SELECT 21 + a, 21 - a, 84 - a, 21 * a, -21 * a, 21 / a, 84 / a, intDiv(21, a), i
 SELECT 21 + b, 21 - b, 84 - b, 21 * b, -21 * b, 21 / b, 84 / b, intDiv(21, b), intDivOrZero(84, b) FROM decimal WHERE b = 42;
 SELECT 21 + c, 21 - c, 84 - c, 21 * c, -21 * c, 21 / c, 84 / c, intDiv(21, c), intDivOrZero(84, c) FROM decimal WHERE c = 42;
 SELECT 21 + e, 21 - e, 84 - e, 21 * e, -21 * e, 21 / e, 84 / e FROM decimal WHERE e > 0; -- { serverError 407 }
-SELECT 21 + f, 21 - f, 84 - f, 21 * f, -21 * f, 21 / f, 84 / f FROM decimal WHERE f > 0; -- { serverError 407 }
+SELECT 21 + f, 21 - f, 84 - f, 21 * f, -21 * f, 21 / f, 84 / f FROM decimal WHERE f > 0;
 SELECT 21 + g, 21 - g, 84 - g, 21 * g, -21 * g, 21 / g, 84 / g, intDiv(21, g), intDivOrZero(84, g) FROM decimal WHERE g > 0;
 SELECT 21 + h, 21 - h, 84 - h, 21 * h, -21 * h, 21 / h, 84 / h FROM decimal WHERE h > 0; -- { serverError 407 }
 SELECT 21 + h, 21 - h, 84 - h, 21 * h, -21 * h FROM decimal WHERE h > 0;
diff --git a/tests/queries/0_stateless/00700_decimal_casts.reference b/tests/queries/0_stateless/00700_decimal_casts.reference
index 8832c2109f9..99d8b949398 100644
--- a/tests/queries/0_stateless/00700_decimal_casts.reference
+++ b/tests/queries/0_stateless/00700_decimal_casts.reference
@@ -157,39 +157,3 @@
 0.12345678
 0.12345678912345678
 0.1234567890123456789012345678901234567
-1234567890.0000000000000000000000000000	1234567890.00000000000000000000000000000	1234567890.00000000000000000000000000000
-1234567890.00000000	1234567890.000000000	1234567890.000000000
-12345678.0	12345678.00	12345678.00
-9223372036854775807.000000	9223372036854775807	-9223372036854775807
-9223372036854775800	9223372036854775800	-9223372036854775800
-92233720368547758.00	92233720368547758	-92233720368547758
-2147483647.0000000000	2147483647	-2147483647
-2147483647.00	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
-18446744073709551615	18446744073709551615
-18446744073709551615.00000000	18446744073709551615
-4294967295	4294967295
-4294967295.0000000000	4294967295
-4294967295	4294967295
-4294967295.0000	4294967295
-65535	65535
-65535.0000000000	65535
-65535	65535
-65535.0000	65535
-2147483647	2147483647
--2147483647	-2147483647
-2147483647	2147483647
-9223372036854775807	9223372036854775807
diff --git a/tests/queries/0_stateless/00700_decimal_casts.sql b/tests/queries/0_stateless/00700_decimal_casts.sql
index 602ee02bc07..8c752565fee 100644
--- a/tests/queries/0_stateless/00700_decimal_casts.sql
+++ b/tests/queries/0_stateless/00700_decimal_casts.sql
@@ -146,123 +146,3 @@ SELECT CAST('0.12345678901234567890123456789012345678', 'Decimal(38,38)');
 SELECT CAST('0.123456789', 'Decimal(9,8)');
 SELECT CAST('0.123456789123456789', 'Decimal(18,17)');
 SELECT CAST('0.12345678901234567890123456789012345678', 'Decimal(38,37)');
-
-SELECT toDecimal128('1234567890', 28) AS x, toDecimal128(x, 29), toDecimal128(toDecimal128('1234567890', 28), 29);
-SELECT toDecimal128(toDecimal128('1234567890', 28), 30); -- { serverError 407 }
-
-SELECT toDecimal64('1234567890', 8) AS x, toDecimal64(x, 9), toDecimal64(toDecimal64('1234567890', 8), 9);
-SELECT toDecimal64(toDecimal64('1234567890', 8), 10); -- { serverError 407 }
-
-SELECT toDecimal32('12345678', 1) AS x, toDecimal32(x, 2), toDecimal32(toDecimal32('12345678', 1), 2);
-SELECT toDecimal32(toDecimal32('12345678', 1), 3); -- { serverError 407 }
-
-SELECT toDecimal64(toDecimal64('92233720368547758.1', 1), 2); -- { serverError 407 }
-SELECT toDecimal64(toDecimal64('-92233720368547758.1', 1), 2); -- { serverError 407 }
-
-SELECT toDecimal128('9223372036854775807', 6) AS x, toInt64(x), toInt64(-x);
-SELECT toDecimal128('9223372036854775809', 6) AS x, toInt64(x); -- { serverError 407 }
-SELECT toDecimal128('9223372036854775809', 6) AS x, toInt64(-x); -- { serverError 407 }
-SELECT toDecimal64('922337203685477580', 0) * 10 AS x, toInt64(x), toInt64(-x);
-SELECT toDecimal64(toDecimal64('92233720368547758.0', 1), 2) AS x, toInt64(x), toInt64(-x);
-
-SELECT toDecimal128('2147483647', 10) AS x, toInt32(x), toInt32(-x);
-SELECT toDecimal128('2147483649', 10) AS x, toInt32(x), toInt32(-x); -- { serverError 407 }
-SELECT toDecimal64('2147483647', 2) AS x, toInt32(x), toInt32(-x);
-SELECT toDecimal64('2147483649', 2) AS x, toInt32(x), toInt32(-x); -- { serverError 407 }
-
-SELECT toDecimal128('92233720368547757.99', 2) AS x, toInt64(x), toInt64(-x);
-SELECT toDecimal64('2147483640.99', 2) AS x, toInt32(x), toInt32(-x);
-
-SELECT toDecimal128('-0.9', 8) AS x, toUInt64(x);
-SELECT toDecimal64('-0.9', 8) AS x, toUInt64(x);
-SELECT toDecimal32('-0.9', 8) AS x, toUInt64(x);
-
-SELECT toDecimal128('-0.8', 4) AS x, toUInt32(x);
-SELECT toDecimal64('-0.8', 4) AS x, toUInt32(x);
-SELECT toDecimal32('-0.8', 4) AS x, toUInt32(x);
-
-SELECT toDecimal128('-0.7', 2) AS x, toUInt16(x);
-SELECT toDecimal64('-0.7', 2) AS x, toUInt16(x);
-SELECT toDecimal32('-0.7', 2) AS x, toUInt16(x);
-
-SELECT toDecimal128('-0.6', 6) AS x, toUInt8(x);
-SELECT toDecimal64('-0.6', 6) AS x, toUInt8(x);
-SELECT toDecimal32('-0.6', 6) AS x, toUInt8(x);
-
-SELECT toDecimal128('-1', 7) AS x, toUInt64(x); -- { serverError 407 }
-SELECT toDecimal128('-1', 7) AS x, toUInt32(x); -- { serverError 407 }
-SELECT toDecimal128('-1', 7) AS x, toUInt16(x); -- { serverError 407 }
-SELECT toDecimal128('-1', 7) AS x, toUInt8(x); -- { serverError 407 }
-
-SELECT toDecimal64('-1', 5) AS x, toUInt64(x); -- { serverError 407 }
-SELECT toDecimal64('-1', 5) AS x, toUInt32(x); -- { serverError 407 }
-SELECT toDecimal64('-1', 5) AS x, toUInt16(x); -- { serverError 407 }
-SELECT toDecimal64('-1', 5) AS x, toUInt8(x); -- { serverError 407 }
-
-SELECT toDecimal32('-1', 3) AS x, toUInt64(x); -- { serverError 407 }
-SELECT toDecimal32('-1', 3) AS x, toUInt32(x); -- { serverError 407 }
-SELECT toDecimal32('-1', 3) AS x, toUInt16(x); -- { serverError 407 }
-SELECT toDecimal32('-1', 3) AS x, toUInt8(x); -- { serverError 407 }
-
-SELECT toDecimal128('18446744073709551615', 0) AS x, toUInt64(x);
-SELECT toDecimal128('18446744073709551616', 0) AS x, toUInt64(x); -- { serverError 407 }
-SELECT toDecimal128('18446744073709551615', 8) AS x, toUInt64(x);
-SELECT toDecimal128('18446744073709551616', 8) AS x, toUInt64(x); -- { serverError 407 }
-
-SELECT toDecimal128('4294967295', 0) AS x, toUInt32(x);
-SELECT toDecimal128('4294967296', 0) AS x, toUInt32(x); -- { serverError 407 }
-SELECT toDecimal128('4294967295', 10) AS x, toUInt32(x);
-SELECT toDecimal128('4294967296', 10) AS x, toUInt32(x); -- { serverError 407 }
-SELECT toDecimal64('4294967295', 0) AS x, toUInt32(x);
-SELECT toDecimal64('4294967296', 0) AS x, toUInt32(x); -- { serverError 407 }
-SELECT toDecimal64('4294967295', 4) AS x, toUInt32(x);
-SELECT toDecimal64('4294967296', 4) AS x, toUInt32(x); -- { serverError 407 }
-
-SELECT toDecimal128('65535', 0) AS x, toUInt16(x);
-SELECT toDecimal128('65536', 0) AS x, toUInt16(x); -- { serverError 407 }
-SELECT toDecimal128('65535', 10) AS x, toUInt16(x);
-SELECT toDecimal128('65536', 10) AS x, toUInt16(x); -- { serverError 407 }
-SELECT toDecimal64('65535', 0) AS x, toUInt16(x);
-SELECT toDecimal64('65536', 0) AS x, toUInt16(x); -- { serverError 407 }
-SELECT toDecimal64('65535', 4) AS x, toUInt16(x);
-SELECT toDecimal64('65536', 4) AS x, toUInt16(x); -- { serverError 407 }
-
-SELECT toInt64('2147483647') AS x, toDecimal32(x, 0);
-SELECT toInt64('-2147483647') AS x, toDecimal32(x, 0);
-SELECT toUInt64('2147483647') AS x, toDecimal32(x, 0);
-SELECT toInt64('2147483649') AS x, toDecimal32(x, 0); -- { serverError 407 }
-SELECT toInt64('-2147483649') AS x, toDecimal32(x, 0); -- { serverError 407 }
-SELECT toUInt64('2147483649') AS x, toDecimal32(x, 0); -- { serverError 407 }
-
-SELECT toUInt64('9223372036854775807') AS x, toDecimal64(x, 0);
-SELECT toUInt64('9223372036854775809') AS x, toDecimal64(x, 0); -- { serverError 407 }
-
-SELECT toDecimal32(0, rowNumberInBlock()); -- { serverError 44 }
-SELECT toDecimal64(0, rowNumberInBlock()); -- { serverError 44 }
-SELECT toDecimal128(0, rowNumberInBlock()); -- { serverError 44 }
-
-SELECT toDecimal32(1/0, 0); -- { serverError 407 }
-SELECT toDecimal64(1/0, 1); -- { serverError 407 }
-SELECT toDecimal128(0/0, 2); -- { serverError 407 }
-SELECT CAST(1/0, 'Decimal(9, 0)'); -- { serverError 407 }
-SELECT CAST(1/0, 'Decimal(18, 1)'); -- { serverError 407 }
-SELECT CAST(1/0, 'Decimal(38, 2)'); -- { serverError 407 }
-SELECT CAST(0/0, 'Decimal(9, 3)'); -- { serverError 407 }
-SELECT CAST(0/0, 'Decimal(18, 4)'); -- { serverError 407 }
-SELECT CAST(0/0, 'Decimal(38, 5)'); -- { serverError 407 }
-
-select toDecimal32(10000.1, 6); -- { serverError 407 }
-select toDecimal64(10000.1, 18); -- { serverError 407 }
-select toDecimal128(1000000000000000000000.1, 18); -- { serverError 407 }
-
-select toDecimal32(-10000.1, 6); -- { serverError 407 }
-select toDecimal64(-10000.1, 18); -- { serverError 407 }
-select toDecimal128(-1000000000000000000000.1, 18); -- { serverError 407 }
-
-select toDecimal32(2147483647.0 + 1.0, 0); -- { serverError 407 }
-select toDecimal64(9223372036854775807.0, 0); -- { serverError 407 }
-select toDecimal128(170141183460469231731687303715884105729.0, 0); -- { serverError 407 }
-
-select toDecimal32(-2147483647.0 - 1.0, 0); -- { serverError 407 }
-select toDecimal64(-9223372036854775807.0, 0); -- { serverError 407 }
-select toDecimal128(-170141183460469231731687303715884105729.0, 0); -- { serverError 407 }
diff --git a/tests/queries/0_stateless/00700_decimal_casts_2.reference b/tests/queries/0_stateless/00700_decimal_casts_2.reference
new file mode 100644
index 00000000000..393baae6c47
--- /dev/null
+++ b/tests/queries/0_stateless/00700_decimal_casts_2.reference
@@ -0,0 +1,37 @@
+1234567890.0000000000000000000000000000	1234567890.00000000000000000000000000000	1234567890.00000000000000000000000000000
+-126561577.683753853853498429727072845824
+1234567890.00000000	1234567890.000000000	1234567890.000000000
+12345678.0	12345678.00	12345678.00
+9223372036854775807.000000	9223372036854775807	-9223372036854775807
+9223372036854775800	9223372036854775800	-9223372036854775800
+92233720368547758.00	92233720368547758	-92233720368547758
+2147483647.0000000000	2147483647	-2147483647
+2147483647.00	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
+18446744073709551615	18446744073709551615
+18446744073709551615.00000000	18446744073709551615
+4294967295	4294967295
+4294967295.0000000000	4294967295
+4294967295	4294967295
+4294967295.0000	4294967295
+65535	65535
+65535.0000000000	65535
+65535	65535
+65535.0000	65535
+2147483647	2147483647
+-2147483647	-2147483647
+2147483647	2147483647
+9223372036854775807	9223372036854775807
diff --git a/tests/queries/0_stateless/00700_decimal_casts_2.sql b/tests/queries/0_stateless/00700_decimal_casts_2.sql
new file mode 100644
index 00000000000..89c95fed271
--- /dev/null
+++ b/tests/queries/0_stateless/00700_decimal_casts_2.sql
@@ -0,0 +1,119 @@
+SELECT toDecimal128('1234567890', 28) AS x, toDecimal128(x, 29), toDecimal128(toDecimal128('1234567890', 28), 29);
+SELECT toDecimal128(toDecimal128('1234567890', 28), 30);
+
+SELECT toDecimal64('1234567890', 8) AS x, toDecimal64(x, 9), toDecimal64(toDecimal64('1234567890', 8), 9);
+SELECT toDecimal64(toDecimal64('1234567890', 8), 10); -- { serverError 407 }
+
+SELECT toDecimal32('12345678', 1) AS x, toDecimal32(x, 2), toDecimal32(toDecimal32('12345678', 1), 2);
+SELECT toDecimal32(toDecimal32('12345678', 1), 3); -- { serverError 407 }
+
+SELECT toDecimal64(toDecimal64('92233720368547758.1', 1), 2); -- { serverError 407 }
+SELECT toDecimal64(toDecimal64('-92233720368547758.1', 1), 2); -- { serverError 407 }
+
+SELECT toDecimal128('9223372036854775807', 6) AS x, toInt64(x), toInt64(-x);
+SELECT toDecimal128('9223372036854775809', 6) AS x, toInt64(x); -- { serverError 407 }
+SELECT toDecimal128('9223372036854775809', 6) AS x, toInt64(-x); -- { serverError 407 }
+SELECT toDecimal64('922337203685477580', 0) * 10 AS x, toInt64(x), toInt64(-x);
+SELECT toDecimal64(toDecimal64('92233720368547758.0', 1), 2) AS x, toInt64(x), toInt64(-x);
+
+SELECT toDecimal128('2147483647', 10) AS x, toInt32(x), toInt32(-x);
+SELECT toDecimal128('2147483649', 10) AS x, toInt32(x), toInt32(-x); -- { serverError 407 }
+SELECT toDecimal64('2147483647', 2) AS x, toInt32(x), toInt32(-x);
+SELECT toDecimal64('2147483649', 2) AS x, toInt32(x), toInt32(-x); -- { serverError 407 }
+
+SELECT toDecimal128('92233720368547757.99', 2) AS x, toInt64(x), toInt64(-x);
+SELECT toDecimal64('2147483640.99', 2) AS x, toInt32(x), toInt32(-x);
+
+SELECT toDecimal128('-0.9', 8) AS x, toUInt64(x);
+SELECT toDecimal64('-0.9', 8) AS x, toUInt64(x);
+SELECT toDecimal32('-0.9', 8) AS x, toUInt64(x);
+
+SELECT toDecimal128('-0.8', 4) AS x, toUInt32(x);
+SELECT toDecimal64('-0.8', 4) AS x, toUInt32(x);
+SELECT toDecimal32('-0.8', 4) AS x, toUInt32(x);
+
+SELECT toDecimal128('-0.7', 2) AS x, toUInt16(x);
+SELECT toDecimal64('-0.7', 2) AS x, toUInt16(x);
+SELECT toDecimal32('-0.7', 2) AS x, toUInt16(x);
+
+SELECT toDecimal128('-0.6', 6) AS x, toUInt8(x);
+SELECT toDecimal64('-0.6', 6) AS x, toUInt8(x);
+SELECT toDecimal32('-0.6', 6) AS x, toUInt8(x);
+
+SELECT toDecimal128('-1', 7) AS x, toUInt64(x); -- { serverError 407 }
+SELECT toDecimal128('-1', 7) AS x, toUInt32(x); -- { serverError 407 }
+SELECT toDecimal128('-1', 7) AS x, toUInt16(x); -- { serverError 407 }
+SELECT toDecimal128('-1', 7) AS x, toUInt8(x); -- { serverError 407 }
+
+SELECT toDecimal64('-1', 5) AS x, toUInt64(x); -- { serverError 407 }
+SELECT toDecimal64('-1', 5) AS x, toUInt32(x); -- { serverError 407 }
+SELECT toDecimal64('-1', 5) AS x, toUInt16(x); -- { serverError 407 }
+SELECT toDecimal64('-1', 5) AS x, toUInt8(x); -- { serverError 407 }
+
+SELECT toDecimal32('-1', 3) AS x, toUInt64(x); -- { serverError 407 }
+SELECT toDecimal32('-1', 3) AS x, toUInt32(x); -- { serverError 407 }
+SELECT toDecimal32('-1', 3) AS x, toUInt16(x); -- { serverError 407 }
+SELECT toDecimal32('-1', 3) AS x, toUInt8(x); -- { serverError 407 }
+
+SELECT toDecimal128('18446744073709551615', 0) AS x, toUInt64(x);
+SELECT toDecimal128('18446744073709551616', 0) AS x, toUInt64(x); -- { serverError 407 }
+SELECT toDecimal128('18446744073709551615', 8) AS x, toUInt64(x);
+SELECT toDecimal128('18446744073709551616', 8) AS x, toUInt64(x); -- { serverError 407 }
+
+SELECT toDecimal128('4294967295', 0) AS x, toUInt32(x);
+SELECT toDecimal128('4294967296', 0) AS x, toUInt32(x); -- { serverError 407 }
+SELECT toDecimal128('4294967295', 10) AS x, toUInt32(x);
+SELECT toDecimal128('4294967296', 10) AS x, toUInt32(x); -- { serverError 407 }
+SELECT toDecimal64('4294967295', 0) AS x, toUInt32(x);
+SELECT toDecimal64('4294967296', 0) AS x, toUInt32(x); -- { serverError 407 }
+SELECT toDecimal64('4294967295', 4) AS x, toUInt32(x);
+SELECT toDecimal64('4294967296', 4) AS x, toUInt32(x); -- { serverError 407 }
+
+SELECT toDecimal128('65535', 0) AS x, toUInt16(x);
+SELECT toDecimal128('65536', 0) AS x, toUInt16(x); -- { serverError 407 }
+SELECT toDecimal128('65535', 10) AS x, toUInt16(x);
+SELECT toDecimal128('65536', 10) AS x, toUInt16(x); -- { serverError 407 }
+SELECT toDecimal64('65535', 0) AS x, toUInt16(x);
+SELECT toDecimal64('65536', 0) AS x, toUInt16(x); -- { serverError 407 }
+SELECT toDecimal64('65535', 4) AS x, toUInt16(x);
+SELECT toDecimal64('65536', 4) AS x, toUInt16(x); -- { serverError 407 }
+
+SELECT toInt64('2147483647') AS x, toDecimal32(x, 0);
+SELECT toInt64('-2147483647') AS x, toDecimal32(x, 0);
+SELECT toUInt64('2147483647') AS x, toDecimal32(x, 0);
+SELECT toInt64('2147483649') AS x, toDecimal32(x, 0); -- { serverError 407 }
+SELECT toInt64('-2147483649') AS x, toDecimal32(x, 0); -- { serverError 407 }
+SELECT toUInt64('2147483649') AS x, toDecimal32(x, 0); -- { serverError 407 }
+
+SELECT toUInt64('9223372036854775807') AS x, toDecimal64(x, 0);
+SELECT toUInt64('9223372036854775809') AS x, toDecimal64(x, 0); -- { serverError 407 }
+
+SELECT toDecimal32(0, rowNumberInBlock()); -- { serverError 44 }
+SELECT toDecimal64(0, rowNumberInBlock()); -- { serverError 44 }
+SELECT toDecimal128(0, rowNumberInBlock()); -- { serverError 44 }
+
+SELECT toDecimal32(1/0, 0); -- { serverError 407 }
+SELECT toDecimal64(1/0, 1); -- { serverError 407 }
+SELECT toDecimal128(0/0, 2); -- { serverError 407 }
+SELECT CAST(1/0, 'Decimal(9, 0)'); -- { serverError 407 }
+SELECT CAST(1/0, 'Decimal(18, 1)'); -- { serverError 407 }
+SELECT CAST(1/0, 'Decimal(38, 2)'); -- { serverError 407 }
+SELECT CAST(0/0, 'Decimal(9, 3)'); -- { serverError 407 }
+SELECT CAST(0/0, 'Decimal(18, 4)'); -- { serverError 407 }
+SELECT CAST(0/0, 'Decimal(38, 5)'); -- { serverError 407 }
+
+select toDecimal32(10000.1, 6); -- { serverError 407 }
+select toDecimal64(10000.1, 18); -- { serverError 407 }
+select toDecimal128(1000000000000000000000.1, 18); -- { serverError 407 }
+
+select toDecimal32(-10000.1, 6); -- { serverError 407 }
+select toDecimal64(-10000.1, 18); -- { serverError 407 }
+select toDecimal128(-1000000000000000000000.1, 18); -- { serverError 407 }
+
+select toDecimal32(2147483647.0 + 1.0, 0); -- { serverError 407 }
+select toDecimal64(9223372036854775807.0, 0); -- { serverError 407 }
+select toDecimal128(170141183460469231731687303715884105729.0, 0); -- { serverError 407 }
+
+select toDecimal32(-2147483647.0 - 1.0, 0); -- { serverError 407 }
+select toDecimal64(-9223372036854775807.0, 0); -- { serverError 407 }
+select toDecimal128(-170141183460469231731687303715884105729.0, 0); -- { serverError 407 }
diff --git a/tests/queries/0_stateless/00700_decimal_complex_types.reference b/tests/queries/0_stateless/00700_decimal_complex_types.reference
index e81dd94513f..9c7c6fefefd 100644
--- a/tests/queries/0_stateless/00700_decimal_complex_types.reference
+++ b/tests/queries/0_stateless/00700_decimal_complex_types.reference
@@ -39,9 +39,33 @@ Tuple(Decimal(9, 1), Decimal(18, 1), Decimal(38, 1))	Decimal(9, 1)	Decimal(18, 1
 1	0
 1	0
 1	0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
 1	0
 2	0
 3	0
+1
+1
+1
+1
+1
+1
+1
+1
+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))
diff --git a/tests/queries/0_stateless/00700_decimal_complex_types.sql b/tests/queries/0_stateless/00700_decimal_complex_types.sql
index 2d506b124a2..f4b29e77be9 100644
--- a/tests/queries/0_stateless/00700_decimal_complex_types.sql
+++ b/tests/queries/0_stateless/00700_decimal_complex_types.sql
@@ -58,35 +58,35 @@ SELECT has(a, toDecimal32(0.1, 3)), has(a, toDecimal32(1.0, 3)) FROM decimal;
 SELECT has(b, toDecimal64(0.4, 3)), has(b, toDecimal64(1.0, 3)) FROM decimal;
 SELECT has(c, toDecimal128(0.7, 3)), has(c, toDecimal128(1.0, 3)) FROM decimal;
 
-SELECT has(a, toDecimal32(0.1, 2)) FROM decimal; -- { serverError 43 }
-SELECT has(a, toDecimal32(0.1, 4)) FROM decimal; -- { serverError 43 }
-SELECT has(a, toDecimal64(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(a, toDecimal128(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal32(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal64(0.4, 2)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal64(0.4, 4)) FROM decimal; -- { serverError 43 }
-SELECT has(b, toDecimal128(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal32(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal64(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal128(0.7, 2)) FROM decimal; -- { serverError 43 }
-SELECT has(c, toDecimal128(0.7, 4)) FROM decimal; -- { serverError 43 }
+SELECT has(a, toDecimal32(0.1, 2)) FROM decimal;
+SELECT has(a, toDecimal32(0.1, 4)) FROM decimal;
+SELECT has(a, toDecimal64(0.1, 3)) FROM decimal;
+SELECT has(a, toDecimal128(0.1, 3)) FROM decimal;
+SELECT has(b, toDecimal32(0.4, 3)) FROM decimal;
+SELECT has(b, toDecimal64(0.4, 2)) FROM decimal;
+SELECT has(b, toDecimal64(0.4, 4)) FROM decimal;
+SELECT has(b, toDecimal128(0.4, 3)) FROM decimal;
+SELECT has(c, toDecimal32(0.7, 3)) FROM decimal;
+SELECT has(c, toDecimal64(0.7, 3)) FROM decimal;
+SELECT has(c, toDecimal128(0.7, 2)) FROM decimal;
+SELECT has(c, toDecimal128(0.7, 4)) FROM decimal;
 
 SELECT indexOf(a, toDecimal32(0.1, 3)), indexOf(a, toDecimal32(1.0, 3)) FROM decimal;
 SELECT indexOf(b, toDecimal64(0.5, 3)), indexOf(b, toDecimal64(1.0, 3)) FROM decimal;
 SELECT indexOf(c, toDecimal128(0.9, 3)), indexOf(c, toDecimal128(1.0, 3)) FROM decimal;
 
-SELECT indexOf(a, toDecimal32(0.1, 2)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(a, toDecimal32(0.1, 4)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(a, toDecimal64(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(a, toDecimal128(0.1, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal32(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal64(0.4, 2)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal64(0.4, 4)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(b, toDecimal128(0.4, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal32(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal64(0.7, 3)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal128(0.7, 2)) FROM decimal; -- { serverError 43 }
-SELECT indexOf(c, toDecimal128(0.7, 4)) FROM decimal; -- { serverError 43 }
+SELECT indexOf(a, toDecimal32(0.1, 2)) FROM decimal;
+SELECT indexOf(a, toDecimal32(0.1, 4)) FROM decimal;
+SELECT indexOf(a, toDecimal64(0.1, 3)) FROM decimal;
+SELECT indexOf(a, toDecimal128(0.1, 3)) FROM decimal;
+SELECT indexOf(b, toDecimal32(0.4, 3)) FROM decimal;
+SELECT indexOf(b, toDecimal64(0.4, 2)) FROM decimal;
+SELECT indexOf(b, toDecimal64(0.4, 4)) FROM decimal;
+SELECT indexOf(b, toDecimal128(0.4, 3)) FROM decimal;
+SELECT indexOf(c, toDecimal32(0.7, 3)) FROM decimal;
+SELECT indexOf(c, toDecimal64(0.7, 3)) FROM decimal;
+SELECT indexOf(c, toDecimal128(0.7, 2)) FROM decimal;
+SELECT indexOf(c, toDecimal128(0.7, 4)) FROM decimal;
 
 SELECT arrayConcat(a, b) AS x, toTypeName(x) FROM decimal;
 SELECT arrayConcat(a, c) AS x, toTypeName(x) FROM decimal;
diff --git a/tests/queries/0_stateless/00700_decimal_math.reference b/tests/queries/0_stateless/00700_decimal_math.reference
index 88917004702..f58e08dc1fb 100644
--- a/tests/queries/0_stateless/00700_decimal_math.reference
+++ b/tests/queries/0_stateless/00700_decimal_math.reference
@@ -26,5 +26,5 @@
 1.00000	0.8427007929497149	0.15729920705028513
 42.4200	115.60113124678627	1.6029995567009473e50
 0.00	0	1	0
-3.1415926535897927981986333033020522496	0	-1	-0
+3.14159265358979	0	-1	-0
 1.00	1.5707963267948966	0	0.7853981633974483
diff --git a/tests/queries/0_stateless/00700_decimal_math.sql b/tests/queries/0_stateless/00700_decimal_math.sql
index a6c1ab2f393..237bee1c691 100644
--- a/tests/queries/0_stateless/00700_decimal_math.sql
+++ b/tests/queries/0_stateless/00700_decimal_math.sql
@@ -36,7 +36,7 @@ SELECT toDecimal128('1.0', 5) AS x, erf(x), erfc(x);
 SELECT toDecimal128('42.42', 4) AS x, lgamma(x), tgamma(x);
 
 SELECT toDecimal128('0.0', 2) AS x, round(sin(x), 8), round(cos(x), 8), round(tan(x), 8);
-SELECT toDecimal128(pi(), 37) AS x, round(sin(x), 8), round(cos(x), 8), round(tan(x), 8);
+SELECT toDecimal128(pi(), 14) AS x, round(sin(x), 8), round(cos(x), 8), round(tan(x), 8);
 SELECT toDecimal128('1.0', 2) AS x, asin(x), acos(x), atan(x);
 
 
diff --git a/tests/queries/0_stateless/00700_decimal_round.reference b/tests/queries/0_stateless/00700_decimal_round.reference
index 11281cdeeb6..230b6863411 100644
--- a/tests/queries/0_stateless/00700_decimal_round.reference
+++ b/tests/queries/0_stateless/00700_decimal_round.reference
@@ -58,18 +58,18 @@
 -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.123456784	-123456789.123456784	123456789.000000000	-123456789.000000000	123456789.123460000	-123456789.123460000	123500000.000000000	-123500000.000000000
-123456789.123456784	-123456789.123456784	123456789.000000000	-123456789.000000000	123456789.123460000	-123456789.123460000	123500000.000000000	-123500000.000000000
-123456789.123456784	-123456789.123456784	123456790.000000000	-123456789.000000000	123456789.123460000	-123456789.123450000	123500000.000000000	-123400000.000000000
-123456789.123456784	-123456789.123456784	123456789.000000000	-123456790.000000000	123456789.123450000	-123456789.123460000	123400000.000000000	-123500000.000000000
-123456789.123456784	-123456789.123456784	123456789.000000000	-123456789.000000000	123456789.123450000	-123456789.123450000	123400000.000000000	-123400000.000000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324607.000000000	-12345678901234567525491324607.000000000	12345678901234567525491324606.797000000	-12345678901234567525491324606.797000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324607.000000000	-12345678901234567525491324607.000000000	12345678901234567525491324606.797000000	-12345678901234567525491324606.797000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324607.000000000	-12345678901234567525491324606.000000000	12345678901234567525491324606.798000000	-12345678901234567525491324606.797000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324606.000000000	-12345678901234567525491324607.000000000	12345678901234567525491324606.797000000	-12345678901234567525491324606.798000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324606.000000000	-12345678901234567525491324606.000000000	12345678901234567525491324606.797000000	-12345678901234567525491324606.797000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324607.000000000	-12345678901234567525491324607.000000000	12345678901234567525491325000.000000000	-12345678901234567525491325000.000000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324607.000000000	-12345678901234567525491324607.000000000	12345678901234567525491325000.000000000	-12345678901234567525491325000.000000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324607.000000000	-12345678901234567525491324606.000000000	12345678901234567525491325000.000000000	-12345678901234567525491324000.000000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324606.000000000	-12345678901234567525491324607.000000000	12345678901234567525491324000.000000000	-12345678901234567525491325000.000000000
-12345678901234567525491324606.797053952	-12345678901234567525491324606.797053952	12345678901234567525491324606.000000000	-12345678901234567525491324606.000000000	12345678901234567525491324000.000000000	-12345678901234567525491324000.000000000
+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
diff --git a/tests/queries/0_stateless/00700_decimal_round.sql b/tests/queries/0_stateless/00700_decimal_round.sql
index 318a7718de9..c5b8dbb520b 100644
--- a/tests/queries/0_stateless/00700_decimal_round.sql
+++ b/tests/queries/0_stateless/00700_decimal_round.sql
@@ -61,20 +61,20 @@ SELECT toDecimal128(-12345.6789, 4) AS x, ceil(x, -1), ceil(x, -2), ceil(x, -3),
 SELECT toDecimal128(-12345.6789, 4) AS x, floor(x, -1), floor(x, -2), floor(x, -3), floor(x, -4), floor(x, -5);
 SELECT toDecimal128(-12345.6789, 4) AS x, trunc(x, -1), trunc(x, -2), trunc(x, -3), trunc(x, -4), trunc(x, -5);
 
-SELECT toDecimal64(123456789.123456789, 9) AS x, -x AS y, round(x), round(y), round(x, 5), round(y, 5), round(x, -5), round(y, -5);
-SELECT toDecimal64(123456789.123456789, 9) AS x, -x AS y, roundBankers(x), roundBankers(y), roundBankers(x, 5), roundBankers(y, 5), roundBankers(x, -5), roundBankers(y, -5);
-SELECT toDecimal64(123456789.123456789, 9) AS x, -x AS y, ceil(x), ceil(y), ceil(x, 5), ceil(y, 5), ceil(x, -5), ceil(y, -5);
-SELECT toDecimal64(123456789.123456789, 9) AS x, -x AS y, floor(x), floor(y), floor(x, 5), floor(y, 5), floor(x, -5), floor(y, -5);
-SELECT toDecimal64(123456789.123456789, 9) AS x, -x AS y, trunc(x), trunc(y), trunc(x, 5), trunc(y, 5), trunc(x, -5), trunc(y, -5);
+SELECT toDecimal64('123456789.123456789', 9) AS x, -x AS y, round(x), round(y), round(x, 5), round(y, 5), round(x, -5), round(y, -5);
+SELECT toDecimal64('123456789.123456789', 9) AS x, -x AS y, roundBankers(x), roundBankers(y), roundBankers(x, 5), roundBankers(y, 5), roundBankers(x, -5), roundBankers(y, -5);
+SELECT toDecimal64('123456789.123456789', 9) AS x, -x AS y, ceil(x), ceil(y), ceil(x, 5), ceil(y, 5), ceil(x, -5), ceil(y, -5);
+SELECT toDecimal64('123456789.123456789', 9) AS x, -x AS y, floor(x), floor(y), floor(x, 5), floor(y, 5), floor(x, -5), floor(y, -5);
+SELECT toDecimal64('123456789.123456789', 9) AS x, -x AS y, trunc(x), trunc(y), trunc(x, 5), trunc(y, 5), trunc(x, -5), trunc(y, -5);
 
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, round(x), round(y), round(x, 3), round(y, 3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, roundBankers(x), roundBankers(y), roundBankers(x, 3), roundBankers(y, 3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, ceil(x), ceil(y), ceil(x, 3), ceil(y, 3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, floor(x), floor(y), floor(x, 3), floor(y, 3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, trunc(x), trunc(y), trunc(x, 3), trunc(y, 3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, round(x), round(y), round(x, 3), round(y, 3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, roundBankers(x), roundBankers(y), roundBankers(x, 3), roundBankers(y, 3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, ceil(x), ceil(y), ceil(x, 3), ceil(y, 3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, floor(x), floor(y), floor(x, 3), floor(y, 3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, trunc(x), trunc(y), trunc(x, 3), trunc(y, 3);
 
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, round(x), round(y), round(x, -3), round(y, -3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, roundBankers(x), roundBankers(y), roundBankers(x, -3), roundBankers(y, -3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, ceil(x), ceil(y), ceil(x, -3), ceil(y, -3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, floor(x), floor(y), floor(x, -3), floor(y, -3);
-SELECT toDecimal128(12345678901234567890123456789.123456789, 9) AS x, -x AS y, trunc(x), trunc(y), trunc(x, -3), trunc(y, -3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, round(x), round(y), round(x, -3), round(y, -3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, roundBankers(x), roundBankers(y), roundBankers(x, -3), roundBankers(y, -3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, ceil(x), ceil(y), ceil(x, -3), ceil(y, -3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, floor(x), floor(y), floor(x, -3), floor(y, -3);
+SELECT toDecimal128('12345678901234567890123456789.123456789', 9) AS x, -x AS y, trunc(x), trunc(y), trunc(x, -3), trunc(y, -3);
diff --git a/tests/queries/0_stateless/00717_merge_and_distributed.sql b/tests/queries/0_stateless/00717_merge_and_distributed.sql
index f0d34b5165f..35dad18937a 100644
--- a/tests/queries/0_stateless/00717_merge_and_distributed.sql
+++ b/tests/queries/0_stateless/00717_merge_and_distributed.sql
@@ -18,9 +18,9 @@ SELECT * FROM merge(currentDatabase(), 'test_local_1');
 SELECT *, _table FROM merge(currentDatabase(), 'test_local_1') ORDER BY _table;
 SELECT sum(value), _table FROM merge(currentDatabase(), 'test_local_1') GROUP BY _table ORDER BY _table;
 SELECT * FROM merge(currentDatabase(), 'test_local_1') WHERE _table = 'test_local_1';
-SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table = 'test_local_1'; -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table = 'test_local_1'; -- { serverError 10 }
 SELECT * FROM merge(currentDatabase(), 'test_local_1') WHERE _table in ('test_local_1', 'test_local_2');
-SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table in ('test_local_1', 'test_local_2'); -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1') PREWHERE _table in ('test_local_1', 'test_local_2'); -- { serverError 10 }
 
 SELECT '--------------Single Distributed------------';
 SELECT * FROM merge(currentDatabase(), 'test_distributed_1');
@@ -36,9 +36,9 @@ SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') ORDER BY _ta
 SELECT *, _table FROM merge(currentDatabase(), 'test_local_1|test_local_2') ORDER BY _table;
 SELECT sum(value), _table FROM merge(currentDatabase(), 'test_local_1|test_local_2') GROUP BY _table ORDER BY _table;
 SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') WHERE _table = 'test_local_1';
-SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table = 'test_local_1'; -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table = 'test_local_1'; -- { serverError 10 }
 SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') WHERE _table in ('test_local_1', 'test_local_2') ORDER BY value;
-SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table in ('test_local_1', 'test_local_2') ORDER BY value; -- { serverError 16 }
+SELECT * FROM merge(currentDatabase(), 'test_local_1|test_local_2') PREWHERE _table in ('test_local_1', 'test_local_2') ORDER BY value; -- { serverError 10 }
 
 SELECT '--------------Local Merge Distributed------------';
 SELECT * FROM merge(currentDatabase(), 'test_local_1|test_distributed_2') ORDER BY _table;
diff --git a/tests/queries/0_stateless/00725_quantiles_shard.reference b/tests/queries/0_stateless/00725_quantiles_shard.reference
index 6974bee9735..ec404bb89a1 100644
--- a/tests/queries/0_stateless/00725_quantiles_shard.reference
+++ b/tests/queries/0_stateless/00725_quantiles_shard.reference
@@ -1,4 +1,4 @@
 [4.5,8.100000000000001]
 [5,9]
-[4.5,8.5]
+[4,8]
 [4.5,8.100000000000001]
diff --git a/tests/queries/0_stateless/00743_limit_by_not_found_column.sql b/tests/queries/0_stateless/00743_limit_by_not_found_column.sql
index d20b3b0209e..831d67f624b 100644
--- a/tests/queries/0_stateless/00743_limit_by_not_found_column.sql
+++ b/tests/queries/0_stateless/00743_limit_by_not_found_column.sql
@@ -22,7 +22,7 @@ DROP TABLE installation_stats;
 CREATE TEMPORARY TABLE Accounts (AccountID UInt64, Currency String);
 
 SELECT AccountID
-FROM 
+FROM
 (
     SELECT
         AccountID, 
diff --git a/tests/queries/0_stateless/00751_default_databasename_for_view.reference b/tests/queries/0_stateless/00751_default_databasename_for_view.reference
index 76d5cee02e2..b3f1875ae91 100644
--- a/tests/queries/0_stateless/00751_default_databasename_for_view.reference
+++ b/tests/queries/0_stateless/00751_default_databasename_for_view.reference
@@ -12,14 +12,11 @@ SELECT
     platform,
     app
 FROM test_00751.t_00751
-WHERE (app = 
-(
+WHERE (app = (
     SELECT min(app)
     FROM test_00751.u_00751
-)) AND (platform = 
-(
-    SELECT 
-        (
+)) AND (platform = (
+    SELECT (
             SELECT min(platform)
             FROM test_00751.v_00751
         )
diff --git a/tests/queries/0_stateless/00753_quantile_format.reference b/tests/queries/0_stateless/00753_quantile_format.reference
index 04bb0000b3e..d3503745e4b 100644
--- a/tests/queries/0_stateless/00753_quantile_format.reference
+++ b/tests/queries/0_stateless/00753_quantile_format.reference
@@ -10,7 +10,9 @@
 [30000]
 30000
 [30000]
-2016-06-15 23:01:04
-['2016-06-15 23:01:04']
-2016-06-15 23:01:04
-['2016-06-15 23:01:04']
+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']
diff --git a/tests/queries/0_stateless/00753_quantile_format.sql b/tests/queries/0_stateless/00753_quantile_format.sql
index 24cf0e4bf90..f72ecc8a49f 100644
--- a/tests/queries/0_stateless/00753_quantile_format.sql
+++ b/tests/queries/0_stateless/00753_quantile_format.sql
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS datetime;
 
-CREATE TABLE datetime (d DateTime) ENGINE = Memory;
-INSERT INTO datetime(d) VALUES(toDateTime('2016-06-15 23:00:00'));
+CREATE TABLE datetime (d DateTime('UTC')) ENGINE = Memory;
+INSERT INTO datetime(d) VALUES(toDateTime('2016-06-15 23:00:00', 'UTC'));
 
 SELECT quantile(0.2)(d) FROM datetime;
 SELECT quantiles(0.2)(d) FROM datetime;
@@ -27,4 +27,7 @@ SELECT quantilesTDigest(0.2)(d) FROM datetime;
 SELECT quantileTDigestWeighted(0.2)(d, 1) FROM datetime;
 SELECT quantilesTDigestWeighted(0.2)(d, 1) FROM datetime;
 
+SELECT quantileBFloat16(0.2)(d) FROM datetime;
+SELECT quantilesBFloat16(0.2)(d) FROM datetime;
+
 DROP TABLE datetime;
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables.reference b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00753_system_columns_and_system_tables.reference
rename to tests/queries/0_stateless/00753_system_columns_and_system_tables_long.reference
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables.sql b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
similarity index 75%
rename from tests/queries/0_stateless/00753_system_columns_and_system_tables.sql
rename to tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
index 862e3693f0e..1037b5a6381 100644
--- a/tests/queries/0_stateless/00753_system_columns_and_system_tables.sql
+++ b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
@@ -13,17 +13,15 @@ CREATE TABLE check_system_tables
     SETTINGS min_bytes_for_wide_part = 0;
 
 SELECT name, partition_key, sorting_key, primary_key, sampling_key, storage_policy, total_rows
-FROM system.tables
-WHERE name = 'check_system_tables'
+FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase()
 FORMAT PrettyCompactNoEscapes;
 
 SELECT name, is_in_partition_key, is_in_sorting_key, is_in_primary_key, is_in_sampling_key
-FROM system.columns
-WHERE table = 'check_system_tables'
+FROM system.columns WHERE table = 'check_system_tables' AND database = currentDatabase()
 FORMAT PrettyCompactNoEscapes;
 
 INSERT INTO check_system_tables VALUES (1, 1, 1);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 
 DROP TABLE IF EXISTS check_system_tables;
 
@@ -39,13 +37,11 @@ CREATE TABLE check_system_tables
     ORDER BY date;
 
 SELECT name, partition_key, sorting_key, primary_key, sampling_key
-FROM system.tables
-WHERE name = 'check_system_tables'
+FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase()
 FORMAT PrettyCompactNoEscapes;
 
 SELECT name, is_in_partition_key, is_in_sorting_key, is_in_primary_key, is_in_sampling_key
-FROM system.columns
-WHERE table = 'check_system_tables'
+FROM system.columns WHERE table = 'check_system_tables' AND database = currentDatabase()
 FORMAT PrettyCompactNoEscapes;
 
 DROP TABLE IF EXISTS check_system_tables;
@@ -59,29 +55,27 @@ CREATE TABLE check_system_tables
   ) ENGINE = MergeTree(Event, intHash32(UserId), (Counter, Event, intHash32(UserId)), 8192);
 
 SELECT name, partition_key, sorting_key, primary_key, sampling_key
-FROM system.tables
-WHERE name = 'check_system_tables'
+FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase()
 FORMAT PrettyCompactNoEscapes;
 
 SELECT name, is_in_partition_key, is_in_sorting_key, is_in_primary_key, is_in_sampling_key
-FROM system.columns
-WHERE table = 'check_system_tables'
+FROM system.columns WHERE table = 'check_system_tables' AND database = currentDatabase()
 FORMAT PrettyCompactNoEscapes;
 
 DROP TABLE IF EXISTS check_system_tables;
 
 SELECT 'Check total_bytes/total_rows for TinyLog';
 CREATE TABLE check_system_tables (key UInt8) ENGINE = TinyLog();
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 INSERT INTO check_system_tables VALUES (1);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 DROP TABLE check_system_tables;
 
 SELECT 'Check total_bytes/total_rows for Memory';
 CREATE TABLE check_system_tables (key UInt16) ENGINE = Memory();
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 INSERT INTO check_system_tables VALUES (1);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 DROP TABLE check_system_tables;
 
 SELECT 'Check total_bytes/total_rows for Buffer';
@@ -96,33 +90,33 @@ CREATE TABLE check_system_tables (key UInt16) ENGINE = Buffer(
     100, 100, /* min_rows /max_rows */
     0,   1e6  /* min_bytes/max_bytes */
 );
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 INSERT INTO check_system_tables SELECT * FROM numbers_mt(50);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 
 SELECT 'Check lifetime_bytes/lifetime_rows for Buffer';
-SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 OPTIMIZE TABLE check_system_tables; -- flush
-SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 INSERT INTO check_system_tables SELECT * FROM numbers_mt(50);
-SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 OPTIMIZE TABLE check_system_tables; -- flush
-SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 INSERT INTO check_system_tables SELECT * FROM numbers_mt(101); -- direct block write (due to min_rows exceeded)
-SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT lifetime_bytes, lifetime_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 DROP TABLE check_system_tables;
 DROP TABLE check_system_tables_null;
 
 SELECT 'Check total_bytes/total_rows for Set';
 CREATE TABLE check_system_tables Engine=Set() AS SELECT * FROM numbers(50);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 INSERT INTO check_system_tables SELECT number+50 FROM numbers(50);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 DROP TABLE check_system_tables;
 
 SELECT 'Check total_bytes/total_rows for Join';
 CREATE TABLE check_system_tables Engine=Join(ANY, LEFT, number) AS SELECT * FROM numbers(50);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 INSERT INTO check_system_tables SELECT number+50 FROM numbers(50);
-SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables';
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'check_system_tables' AND database = currentDatabase();
 DROP TABLE check_system_tables;
diff --git a/tests/queries/0_stateless/00800_versatile_storage_join.reference b/tests/queries/0_stateless/00800_versatile_storage_join.reference
index f1d3f98e32a..0a143f8bc12 100644
--- a/tests/queries/0_stateless/00800_versatile_storage_join.reference
+++ b/tests/queries/0_stateless/00800_versatile_storage_join.reference
@@ -1,5 +1,4 @@
 --------read--------
-def	[1,2]	2
 abc	[0]	1
 def	[1,2]	2
 abc	[0]	1
@@ -7,6 +6,7 @@ def	[1,2]	2
 abc	[0]	1
 def	[1,2]	2
 abc	[0]	1
+def	[1,2]	2
 --------joinGet--------
 
 abc
diff --git a/tests/queries/0_stateless/00800_versatile_storage_join.sql b/tests/queries/0_stateless/00800_versatile_storage_join.sql
index c1e325ce9aa..b0ec6f69f93 100644
--- a/tests/queries/0_stateless/00800_versatile_storage_join.sql
+++ b/tests/queries/0_stateless/00800_versatile_storage_join.sql
@@ -22,10 +22,10 @@ INSERT INTO join_all_left VALUES ('abc', [0], 1), ('def', [1, 2], 2);
 -- read from StorageJoin
 
 SELECT '--------read--------';
-SELECT * from join_any_inner;
-SELECT * from join_any_left;
-SELECT * from join_all_inner;
-SELECT * from join_all_left;
+SELECT * from join_any_inner ORDER BY k;
+SELECT * from join_any_left ORDER BY k;
+SELECT * from join_all_inner ORDER BY k;
+SELECT * from join_all_left ORDER BY k;
 
 -- create StorageJoin tables with customized settings
 
diff --git a/tests/queries/0_stateless/00804_rollup_with_having.reference b/tests/queries/0_stateless/00804_rollup_with_having.reference
index 62de36a36ba..0f708e8d900 100644
--- a/tests/queries/0_stateless/00804_rollup_with_having.reference
+++ b/tests/queries/0_stateless/00804_rollup_with_having.reference
@@ -1,4 +1,4 @@
-a	\N	1
 a	b	1
 a	\N	2
+a	\N	1
 a	b	1
diff --git a/tests/queries/0_stateless/00804_rollup_with_having.sql b/tests/queries/0_stateless/00804_rollup_with_having.sql
index cddaa8b6451..29b9ae19041 100644
--- a/tests/queries/0_stateless/00804_rollup_with_having.sql
+++ b/tests/queries/0_stateless/00804_rollup_with_having.sql
@@ -8,7 +8,7 @@ INSERT INTO rollup_having VALUES (NULL, NULL);
 INSERT INTO rollup_having VALUES ('a', NULL);
 INSERT INTO rollup_having VALUES ('a', 'b');
 
-SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL;
-SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL and b IS NOT NULL;
+SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL ORDER BY a, b;
+SELECT a, b, count(*) FROM rollup_having GROUP BY a, b WITH ROLLUP HAVING a IS NOT NULL and b IS NOT NULL ORDER BY a, b;
 
 DROP TABLE rollup_having;
diff --git a/tests/queries/0_stateless/00808_not_optimize_predicate.reference b/tests/queries/0_stateless/00808_not_optimize_predicate.reference
index d8ab9425aab..647c6d91890 100644
--- a/tests/queries/0_stateless/00808_not_optimize_predicate.reference
+++ b/tests/queries/0_stateless/00808_not_optimize_predicate.reference
@@ -18,7 +18,7 @@
 SELECT
     n,
     `finalizeAggregation(s)`
-FROM 
+FROM
 (
     SELECT
         n,
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 63b687d072d..b0244991b3c 100755
--- a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
+++ b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
@@ -60,16 +60,10 @@ wait
 
 echo "DROP TABLE concurrent_alter_column NO DELAY" | ${CLICKHOUSE_CLIENT}   # NO DELAY has effect only for Atomic database
 
-db_engine=`$CLICKHOUSE_CLIENT -q "SELECT engine FROM system.databases WHERE name='$CLICKHOUSE_DATABASE'"`
-if [[ $db_engine == "Atomic" ]]; then
-    # DROP is non-blocking, so wait for alters
-    while true; do
-        $CLICKHOUSE_CLIENT -q "SELECT c = 0 FROM (SELECT count() as c FROM system.processes WHERE query_id LIKE 'alter_00816_%')" | grep 1 > /dev/null && break;
-        sleep 1;
-    done
-fi
-
-# Check for deadlocks
-echo "SELECT * FROM system.processes WHERE query_id LIKE 'alter_00816_%'" | ${CLICKHOUSE_CLIENT}
+# Wait for alters and check for deadlocks (in case of deadlock this loop will not finish)
+while true; do
+    echo "SELECT * FROM system.processes WHERE query_id LIKE 'alter\\_00816\\_%'" | ${CLICKHOUSE_CLIENT} | grep -q -F 'alter' || break
+    sleep 1;
+done
 
 echo 'did not crash'
diff --git a/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql b/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
index 9e87c739928..f84c20feaea 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 @@
+-- NOTE: database = currentDatabase() is not mandatory
+
 DROP TABLE IF EXISTS table1;
 DROP TABLE IF EXISTS table2;
 
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 9b630d0d391..973c5b078a3 100644
--- a/tests/queries/0_stateless/00826_cross_to_inner_join.reference
+++ b/tests/queries/0_stateless/00826_cross_to_inner_join.reference
@@ -109,7 +109,7 @@ SELECT
     t2_00826.a,
     t2_00826.b
 FROM t1_00826
-ALL INNER JOIN t2_00826 ON (((a = t2_00826.a) AND (a = t2_00826.a)) AND (a = t2_00826.a)) AND (b = t2_00826.b)
+ALL INNER JOIN t2_00826 ON (a = t2_00826.a) AND (a = t2_00826.a) AND (a = t2_00826.a) AND (b = t2_00826.b)
 WHERE (a = t2_00826.a) AND ((a = t2_00826.a) AND ((a = t2_00826.a) AND (b = t2_00826.b)))
 --- cross split conjunction ---
 SELECT
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 60a2d8eb9a0..448e7ad076c 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,15 +1,35 @@
 #!/usr/bin/env bash
 
+# NOTE: database = $CLICKHOUSE_DATABASE is unwanted
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-for _ in {1..200}; do echo "drop table if exists view_00840" | $CLICKHOUSE_CLIENT; echo "create view view_00840 as select count(*),database,table from system.columns group by database,table" | $CLICKHOUSE_CLIENT; done &
-for _ in {1..500}; do echo "select * from view_00840 order by table" | $CLICKHOUSE_CLIENT >/dev/null 2>&1 || true; done &
+function cleanup()
+{
+    echo Failed
+    wait
+}
+
+trap cleanup EXIT
+
+$CLICKHOUSE_CLIENT -q "create view view_00840 as select count(*),database,table from system.columns group by database,table"
+
+for _ in {1..200}; do
+    $CLICKHOUSE_CLIENT -nm -q "
+        drop table if exists view_00840;
+        create view view_00840 as select count(*),database,table from system.columns group by database,table;
+    "
+done &
+for _ in {1..500}; do
+    $CLICKHOUSE_CLIENT -q "select * from view_00840 order by table" >/dev/null 2>&1 || true
+done &
 
 wait
+trap '' EXIT
 
 echo "drop table view_00840" | $CLICKHOUSE_CLIENT
 
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 4db65b0b795..5709db44eb1 100644
--- a/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
+++ b/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
@@ -10,7 +10,7 @@ FROM t1
 ALL INNER JOIN t2 ON b = t2.b
 WHERE b = t2.b
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         a AS `--t1.a`,
@@ -21,7 +21,7 @@ FROM
 ALL INNER JOIN t3 ON `--t1.a` = a
 WHERE (`--t1.a` = `--t2.a`) AND (`--t1.a` = a)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         b AS `--t1.b`,
@@ -33,13 +33,13 @@ FROM
 ALL INNER JOIN t3 ON `--t1.b` = b
 WHERE (`--t1.b` = `--t2.b`) AND (`--t1.b` = b)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         `--t1.a`,
         `--t2.a`,
         a AS `--t3.a`
-    FROM 
+    FROM
     (
         SELECT
             a AS `--t1.a`,
@@ -52,14 +52,14 @@ FROM
 ALL INNER JOIN t4 ON `--t1.a` = a
 WHERE (`--t1.a` = `--t2.a`) AND (`--t1.a` = `--t3.a`) AND (`--t1.a` = a)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         `--t1.b`,
         `--t1.a`,
         `--t2.b`,
         b AS `--t3.b`
-    FROM 
+    FROM
     (
         SELECT
             b AS `--t1.b`,
@@ -73,13 +73,13 @@ FROM
 ALL INNER JOIN t4 ON `--t1.b` = b
 WHERE (`--t1.b` = `--t2.b`) AND (`--t1.b` = `--t3.b`) AND (`--t1.b` = b)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         `--t1.a`,
         `--t2.a`,
         a AS `--t3.a`
-    FROM 
+    FROM
     (
         SELECT
             a AS `--t1.a`,
@@ -92,13 +92,13 @@ FROM
 ALL INNER JOIN t4 ON `--t2.a` = a
 WHERE (`--t2.a` = `--t1.a`) AND (`--t2.a` = `--t3.a`) AND (`--t2.a` = a)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         `--t1.a`,
         `--t2.a`,
         a AS `--t3.a`
-    FROM 
+    FROM
     (
         SELECT
             a AS `--t1.a`,
@@ -111,13 +111,13 @@ FROM
 ALL INNER JOIN t4 ON `--t3.a` = a
 WHERE (`--t3.a` = `--t1.a`) AND (`--t3.a` = `--t2.a`) AND (`--t3.a` = a)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         `--t1.a`,
         `--t2.a`,
         a AS `--t3.a`
-    FROM 
+    FROM
     (
         SELECT
             a AS `--t1.a`,
@@ -127,16 +127,16 @@ FROM
     ) AS `--.s`
     CROSS JOIN t3
 ) AS `--.s`
-ALL INNER JOIN t4 ON ((a = `--t1.a`) AND (a = `--t2.a`)) AND (a = `--t3.a`)
+ALL INNER JOIN t4 ON (a = `--t1.a`) AND (a = `--t2.a`) AND (a = `--t3.a`)
 WHERE (a = `--t1.a`) AND (a = `--t2.a`) AND (a = `--t3.a`)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         `--t1.a`,
         `--t2.a`,
         a AS `--t3.a`
-    FROM 
+    FROM
     (
         SELECT
             a AS `--t1.a`,
@@ -149,10 +149,10 @@ FROM
 ALL INNER JOIN t4 ON `--t3.a` = a
 WHERE (`--t1.a` = `--t2.a`) AND (`--t2.a` = `--t3.a`) AND (`--t3.a` = a)
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT `--t1.a`
-    FROM 
+    FROM
     (
         SELECT a AS `--t1.a`
         FROM t1
@@ -162,10 +162,10 @@ FROM
 ) AS `--.s`
 CROSS JOIN t4
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT `--t1.a`
-    FROM 
+    FROM
     (
         SELECT a AS `--t1.a`
         FROM t1
@@ -175,7 +175,7 @@ FROM
 ) AS `--.s`
 CROSS JOIN t4
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT a AS `--t1.a`
     FROM t1
@@ -183,7 +183,7 @@ FROM
 ) AS `--.s`
 CROSS JOIN t3
 SELECT `--t1.a` AS `t1.a`
-FROM 
+FROM
 (
     SELECT
         a AS `--t1.a`,
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 386bde518ea..88f9253500c 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.reference
+++ b/tests/queries/0_stateless/00855_join_with_array_join.reference
@@ -4,3 +4,8 @@
 4	0
 5	0
 6	0
+-
+1	0	
+2	2	a2
+1	0	
+2	2	a2
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 10b03fec062..506d9479110 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.sql
+++ b/tests/queries/0_stateless/00855_join_with_array_join.sql
@@ -1,10 +1,35 @@
 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 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 FROM (SELECT [101,102] ax, 0 c) s1
+JOIN system.one s2 ON s1.c = s2.dummy
+JOIN system.one s3 ON s1.c = s3.dummy
+ARRAY JOIN ax; -- { serverError 48 }
+
+SELECT '-';
+
+SET joined_subquery_requires_alias = 1;
+
+DROP TABLE IF EXISTS f;
+DROP TABLE IF EXISTS d;
+
+CREATE TABLE f (`d_ids` Array(Int64) ) ENGINE = TinyLog;
+INSERT INTO f VALUES ([1, 2]);
+
+CREATE TABLE d (`id` Int64, `name` String ) ENGINE = TinyLog;
+
+INSERT INTO d VALUES (2, 'a2'), (3, 'a3');
+
+SELECT d_ids, id, name FROM f LEFT ARRAY JOIN d_ids LEFT JOIN d ON d.id = d_ids ORDER BY id;
+SELECT did, id, name FROM f LEFT ARRAY JOIN d_ids as did LEFT JOIN d ON d.id = did ORDER BY id;
+
+-- 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 }
+
+DROP TABLE IF EXISTS f;
+DROP TABLE IF EXISTS d;
 
-select ax, c from (select [7,8] ax, 0 c) s1
-join system.one s2 ON s1.c = s2.dummy
-join system.one s3 ON s1.c = s3.dummy
-array join ax; -- { serverError 48 }
diff --git a/tests/queries/0_stateless/00878_join_unexpected_results.reference b/tests/queries/0_stateless/00878_join_unexpected_results.reference
index 65fcbc257ca..a389cb47a96 100644
--- a/tests/queries/0_stateless/00878_join_unexpected_results.reference
+++ b/tests/queries/0_stateless/00878_join_unexpected_results.reference
@@ -23,8 +23,6 @@ join_use_nulls = 1
 -
 \N	\N
 -
-1	1	\N	\N
-2	2	\N	\N
 -
 1	1	1	1
 2	2	\N	\N
@@ -51,8 +49,6 @@ join_use_nulls = 0
 -
 -
 -
-1	1	0	0
-2	2	0	0
 -
 1	1	1	1
 2	2	0	0
diff --git a/tests/queries/0_stateless/00878_join_unexpected_results.sql b/tests/queries/0_stateless/00878_join_unexpected_results.sql
index 6f6cd6e6479..0aef5208b26 100644
--- a/tests/queries/0_stateless/00878_join_unexpected_results.sql
+++ b/tests/queries/0_stateless/00878_join_unexpected_results.sql
@@ -30,11 +30,11 @@ select * from t left outer join s on (t.a=s.a and t.b=s.b) where s.a is null;
 select '-';
 select s.* from t left outer join s on (t.a=s.a and t.b=s.b) where s.a is null;
 select '-';
-select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a;
+select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a; -- {serverError 403 }
 select '-';
 select t.*, s.* from t left join s on (s.a=t.a) order by t.a;
 select '-';
-select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2;
+select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2; -- {serverError 403 }
 
 select 'join_use_nulls = 0';
 set join_use_nulls = 0;
@@ -58,11 +58,11 @@ select '-';
 select '-';
 -- select s.* from t left outer join s on (t.a=s.a and t.b=s.b) where s.a is null; -- TODO
 select '-';
-select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a;
+select t.*, s.* from t left join s on (s.a=t.a and t.b=s.b and t.a=toInt64(2)) order by t.a; -- {serverError 403 }
 select '-';
 select t.*, s.* from t left join s on (s.a=t.a) order by t.a;
 select '-';
-select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2;
+select t.*, s.* from t left join s on (t.b=toInt64(2) and s.a=t.a) where s.b=2; -- {serverError 403 }
 
 drop table t;
 drop table s;
diff --git a/tests/queries/0_stateless/00882_multiple_join_no_alias.reference b/tests/queries/0_stateless/00882_multiple_join_no_alias.reference
index a3723bc9976..523063f8a3c 100644
--- a/tests/queries/0_stateless/00882_multiple_join_no_alias.reference
+++ b/tests/queries/0_stateless/00882_multiple_join_no_alias.reference
@@ -1,8 +1,8 @@
 1	1	1	1
 0	0	0	0
-0
 1
+0
 1	1	1	1	1	1
 2	2	0	0	0	0
-2	2	0
 1	1	1
+2	2	0
diff --git a/tests/queries/0_stateless/00882_multiple_join_no_alias.sql b/tests/queries/0_stateless/00882_multiple_join_no_alias.sql
index bd3a2a19913..4a96e73c679 100644
--- a/tests/queries/0_stateless/00882_multiple_join_no_alias.sql
+++ b/tests/queries/0_stateless/00882_multiple_join_no_alias.sql
@@ -13,22 +13,22 @@ insert into y values (1,1);
 select s.a, s.a, s.b as s_b, s.b from t
 left join s on s.a = t.a
 left join y on s.b = y.b
-order by t.a;
+order by t.a, s.a, s.b;
 
 select max(s.a) from t
 left join s on s.a = t.a
 left join y on s.b = y.b
-group by t.a;
+group by t.a order by t.a;
 
 select t.a, t.a as t_a, s.a, s.a as s_a, y.a, y.a as y_a from t
 left join s on t.a = s.a
 left join y on y.b = s.b
-order by t.a;
+order by t.a, s.a, y.a;
 
 select t.a, t.a as t_a, max(s.a) from t
 left join s on t.a = s.a
 left join y on y.b = s.b
-group by t.a;
+group by t.a order by t.a;
 
 drop table t;
 drop table s;
diff --git a/tests/queries/0_stateless/00900_parquet.reference b/tests/queries/0_stateless/00900_long_parquet.reference
similarity index 63%
rename from tests/queries/0_stateless/00900_parquet.reference
rename to tests/queries/0_stateless/00900_long_parquet.reference
index 0f4be2c74a0..230d1f5ca48 100644
--- a/tests/queries/0_stateless/00900_parquet.reference
+++ b/tests/queries/0_stateless/00900_long_parquet.reference
@@ -60,3 +60,15 @@ 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]
+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]
+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],[]]
diff --git a/tests/queries/0_stateless/00900_parquet.sh b/tests/queries/0_stateless/00900_long_parquet.sh
similarity index 80%
rename from tests/queries/0_stateless/00900_parquet.sh
rename to tests/queries/0_stateless/00900_long_parquet.sh
index 4b06001429f..8c19c7cecab 100755
--- a/tests/queries/0_stateless/00900_parquet.sh
+++ b/tests/queries/0_stateless/00900_long_parquet.sh
@@ -127,6 +127,7 @@ ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types1 ORDER BY int8 FORMAT
 echo dest from null:
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_types6 ORDER BY int8"
 
+
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types5"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types6"
 
@@ -135,3 +136,33 @@ ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types2"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types3"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_types4"
+
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_arrays"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_arrays (id UInt32, a1 Array(Int8), a2 Array(UInt8), a3 Array(Int16), a4 Array(UInt16), a5 Array(Int32), a6 Array(UInt32), a7 Array(Int64), a8 Array(UInt64), a9 Array(String), a10 Array(FixedString(4)), a11 Array(Float32), a12 Array(Float64), a13 Array(Date), a14 Array(Datetime), a15 Array(Decimal(4, 2)), a16 Array(Decimal(10, 2)), a17 Array(Decimal(25, 2))) engine=Memory()"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_arrays VALUES (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', '2001-01-01', '2002-01-01'], [0.2, 10.003, 4.002], [4.000000001, 10000.10000, 10000.100001], [1000000000.000000001123, 90.0000000010010101, 0101001.0112341001])"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_arrays VALUES (2, [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [])"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_arrays FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_arrays FORMAT Parquet"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_arrays ORDER BY id"
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_arrays"
+
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_nullable_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_nullable_arrays (id UInt32, a1 Array(Nullable(UInt32)), a2 Array(Nullable(String)), a3 Array(Nullable(Decimal(4, 2)))) engine=Memory()"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nullable_arrays VALUES (1, [1, Null, 2], [Null, 'Some string', Null], [0.001, Null, 42.42]), (2, [Null], [Null], [Null]), (3, [], [], [])"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nullable_arrays FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nullable_arrays FORMAT Parquet"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nullable_arrays ORDER BY id"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_nullable_arrays"
+
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS parquet_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_nested_arrays (a1 Array(Array(Array(UInt32))), a2 Array(Array(Array(String))), a3 Array(Array(Nullable(UInt32))), a4 Array(Array(Nullable(String)))) engine=Memory() "
+${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nested_arrays VALUES ([[[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], []])"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nested_arrays FORMAT Parquet" | ${CLICKHOUSE_CLIENT} --query="INSERT INTO parquet_nested_arrays FORMAT Parquet"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE parquet_nested_arrays"
diff --git a/tests/queries/0_stateless/00900_parquet_decimal.reference b/tests/queries/0_stateless/00900_long_parquet_decimal.reference
similarity index 100%
rename from tests/queries/0_stateless/00900_parquet_decimal.reference
rename to tests/queries/0_stateless/00900_long_parquet_decimal.reference
diff --git a/tests/queries/0_stateless/00900_parquet_decimal.sh b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
similarity index 100%
rename from tests/queries/0_stateless/00900_parquet_decimal.sh
rename to tests/queries/0_stateless/00900_long_parquet_decimal.sh
diff --git a/tests/queries/0_stateless/00900_parquet_load.reference b/tests/queries/0_stateless/00900_long_parquet_load.reference
similarity index 96%
rename from tests/queries/0_stateless/00900_parquet_load.reference
rename to tests/queries/0_stateless/00900_long_parquet_load.reference
index 1c890119486..4bd699f40fe 100644
--- a/tests/queries/0_stateless/00900_parquet_load.reference
+++ b/tests/queries/0_stateless/00900_long_parquet_load.reference
@@ -1,6 +1,10 @@
 === Try load data from alltypes_dictionary.parquet
 0	1	0	0	0	0	0	0	01/01/09	0	1230768000
 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]
 === 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
@@ -13,6 +17,39 @@
 === Try load data from alltypes_plain.snappy.parquet
 6	1	0	0	0	0	0	0	04/01/09	0	1238544000
 7	0	1	1	1	10	1.1	10.1	04/01/09	1	1238544060
+=== Try load data from array_float.parquet
+idx1	[]
+idx2	[10.2,8.2,7.2]
+idx3	[10.2,8.2]
+idx4	[10.2]
+idx5	[10.2,8.2]
+idx6	[10.2]
+idx7	[10.2,8.2]
+idx8	[10.2,8.2]
+idx9	[10.2]
+idx10	[10.2,8.2]
+=== Try load data from array_int.parquet
+idx1	[100,101,102]
+idx2	[100,101]
+idx3	[100,101,102,101]
+idx4	[100]
+idx5	[100,101]
+idx6	[100,101]
+idx7	[100,101]
+idx8	[100,101]
+idx9	[100,101,102]
+idx10	[100,101,102]
+=== Try load data from array_string.parquet
+idx1	['This','is','a','test']
+idx2	['cigarette','smoke']
+idx3	['the','grocery','clerks']
+idx4	[]
+idx5	['wants','to','get','out']
+idx6	['me','up?']
+idx7	['then','I','put','him','back']
+idx8	['make','a','man']
+idx9	['Which','Heaven','to','gaudy','day','denies']
+idx10	['This','is','a','test']
 === Try load data from binary.parquet
 \0
 

@@ -225,8 +262,9 @@ Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not y
 23.00
 24.00
 === Try load data from list_columns.parquet
-Code: 70. DB::Ex---tion: The type "list" of an input column "int64_list" is not supported for conversion from a Parquet data format: data for INSERT was parsed from stdin
-
+[1,2,3]	['abc','efg','hij']
+[NULL,1]	[]
+[4]	['efg',NULL,'hij','xyz']
 === Try load data from nation.dict-malformed.parquet
 0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai
 1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon
@@ -253,9 +291,12 @@ Code: 70. DB::Ex---tion: The type "list" of an input column "int64_list" is not
 22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint
 23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull
 24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
+=== Try load data from nested_lists.parquet
+[[[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],[]]
 === Try load data from nested_lists.snappy.parquet
-Code: 70. DB::Ex---tion: The type "list" of an input column "a" is not supported for conversion from a Parquet data format: data for INSERT was parsed from stdin
-
+[[['a','b'],['c']],[[],['d']]]	1
+[[['a','b'],['c','d']],[[],['e']]]	1
+[[['a','b'],['c','d'],['e']],[[],['f']]]	1
 === Try load data from nested_maps.snappy.parquet
 Code: 70. DB::Ex---tion: The type "map" of an input column "a" is not supported for conversion from a Parquet data format: data for INSERT was parsed from stdin
 
@@ -268,6 +309,10 @@ Code: 70. DB::Ex---tion: The type "map" of an input column "a" is not supported
 ../contrib/arrow/cpp/src/arrow/array/array_nested.cc:192:  Check failed: (self->list_type_->value_type()->id()) == (data->child_data[0]->type->id()) 
 === Try load data from nullable.impala.parquet
 ../contrib/arrow/cpp/src/arrow/array/array_nested.cc:192:  Check failed: (self->list_type_->value_type()->id()) == (data->child_data[0]->type->id()) 
+=== Try load data from nullable_list.parquet
+[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,NULL,42.42]
+[NULL]	[NULL]	[NULL]
+[]	[]	[]
 === Try load data from nulls.snappy.parquet
 Code: 70. DB::Ex---tion: The type "struct" of an input column "b_struct" is not supported for conversion from a Parquet data format: data for INSERT was parsed from stdin
 
diff --git a/tests/queries/0_stateless/00900_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
similarity index 100%
rename from tests/queries/0_stateless/00900_parquet_load.sh
rename to tests/queries/0_stateless/00900_long_parquet_load.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrays_load.reference b/tests/queries/0_stateless/00900_orc_arrays_load.reference
new file mode 100644
index 00000000000..9b20ef98164
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_arrays_load.reference
@@ -0,0 +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.20,10.00,4.00]	[4.00,10000.10,10000.10]	[1000000000.00,90.00,101001.01]
+[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
diff --git a/tests/queries/0_stateless/00900_orc_arrays_load.sh b/tests/queries/0_stateless/00900_orc_arrays_load.sh
new file mode 100755
index 00000000000..410945b31eb
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_arrays_load.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+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 orc_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE orc_arrays (arr1 Array(Int8), arr2 Array(UInt8), arr3 Array(Int16), arr4 Array(UInt16), arr5 Array(Int32), arr6 Array(UInt32), arr7 Array(Int64), arr8 Array(UInt64), arr9 Array(String), arr10 Array(FixedString(4)), arr11 Array(Float32), arr12 Array(Float64), arr13 Array(Date), arr14 Array(Datetime), arr15 Array(Decimal(4, 2)), arr16 Array(Decimal(10, 2)), arr17 Array(Decimal(25, 2))) ENGINE=Memory()"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO orc_arrays VALUES ([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]),([],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[])"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM orc_arrays FORMAT ORC" > "${CLICKHOUSE_TMP}"/arrays.orc
+
+cat "${CLICKHOUSE_TMP}"/arrays.orc | ${CLICKHOUSE_CLIENT} -q "INSERT INTO orc_arrays FORMAT ORC"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM orc_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE orc_arrays"
diff --git a/tests/queries/0_stateless/00900_orc_nested_arrays_load.reference b/tests/queries/0_stateless/00900_orc_nested_arrays_load.reference
new file mode 100644
index 00000000000..dd9c9900684
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_nested_arrays_load.reference
@@ -0,0 +1,2 @@
+[[[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],[]]
diff --git a/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
new file mode 100755
index 00000000000..81d2aeed4bd
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+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 orc_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE orc_nested_arrays (arr1 Array(Array(Array(UInt32))), arr2 Array(Array(Array(String))), arr3 Array(Array(Nullable(UInt32))), arr4 Array(Array(Nullable(String)))) engine=Memory()"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO orc_nested_arrays VALUES ([[[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],[]])"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM orc_nested_arrays FORMAT ORC" > "${CLICKHOUSE_TMP}"/nested_arrays.orc
+
+cat "${CLICKHOUSE_TMP}"/nested_arrays.orc | ${CLICKHOUSE_CLIENT} -q "INSERT INTO orc_nested_arrays FORMAT ORC"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM orc_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP table orc_nested_arrays"
diff --git a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.reference b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.reference
new file mode 100644
index 00000000000..62e95652040
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.reference
@@ -0,0 +1,6 @@
+[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,NULL,42.42]
+[NULL]	[NULL]	[NULL]
+[]	[]	[]
+[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,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
new file mode 100755
index 00000000000..61829d0709b
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+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 orc_nullable_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE orc_nullable_arrays (arr1 Array(Nullable(UInt32)), arr2 Array(Nullable(String)), arr3 Array(Nullable(Decimal(4, 2)))) ENGINE=Memory()"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO orc_nullable_arrays VALUES ([1,NULL,2],[NULL,'Some string',NULL],[0.00,NULL,42.42]), ([NULL],[NULL],[NULL]), ([],[],[])"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM orc_nullable_arrays FORMAT ORC" > "${CLICKHOUSE_TMP}"/nullable_arrays.orc
+
+cat "${CLICKHOUSE_TMP}"/nullable_arrays.orc | ${CLICKHOUSE_CLIENT} -q "INSERT INTO orc_nullable_arrays FORMAT ORC"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM orc_nullable_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE orc_nullable_arrays"
diff --git a/tests/queries/0_stateless/00906_low_cardinality_rollup.reference b/tests/queries/0_stateless/00906_low_cardinality_rollup.reference
index 3e287311126..257605d9006 100644
--- a/tests/queries/0_stateless/00906_low_cardinality_rollup.reference
+++ b/tests/queries/0_stateless/00906_low_cardinality_rollup.reference
@@ -1,18 +1,18 @@
-c	d	1
 a	b	1
-c	\N	1
 a	\N	1
+c	d	1
+c	\N	1
 \N	\N	2
-c	1
 a	1
+c	1
 \N	2
-c	d	1
 a	b	1
-c	\N	1
 a	\N	1
+c	d	1
+c	\N	1
 \N	b	1
 \N	d	1
 \N	\N	2
-c	1
 a	1
+c	1
 \N	2
diff --git a/tests/queries/0_stateless/00906_low_cardinality_rollup.sql b/tests/queries/0_stateless/00906_low_cardinality_rollup.sql
index 3b8be7b9ac6..125529ad383 100644
--- a/tests/queries/0_stateless/00906_low_cardinality_rollup.sql
+++ b/tests/queries/0_stateless/00906_low_cardinality_rollup.sql
@@ -3,10 +3,10 @@ CREATE TABLE lc (a LowCardinality(Nullable(String)), b LowCardinality(Nullable(S
 INSERT INTO lc VALUES ('a', 'b');
 INSERT INTO lc VALUES ('c', 'd');
 
-SELECT a, b, count(a) FROM lc GROUP BY a, b WITH ROLLUP;
-SELECT a, count(a) FROM lc GROUP BY a WITH ROLLUP;
+SELECT a, b, count(a) FROM lc GROUP BY a, b WITH ROLLUP ORDER BY a, b;
+SELECT a, count(a) FROM lc GROUP BY a WITH ROLLUP ORDER BY a;
 
-SELECT a, b, count(a) FROM lc GROUP BY a, b WITH CUBE;
-SELECT a, count(a) FROM lc GROUP BY a WITH CUBE;
+SELECT a, b, count(a) FROM lc GROUP BY a, b WITH CUBE ORDER BY a, b;
+SELECT a, count(a) FROM lc GROUP BY a WITH CUBE ORDER BY a;
 
 DROP TABLE if exists lc;
diff --git a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
index 29ec19a6efe..cf0e0bac3dd 100644
--- a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
+++ b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
@@ -28,7 +28,7 @@ SELECT `time`, groupArray((sensor_id, volume)) AS groupArr FROM (
     WHERE received_at BETWEEN '2018-12-12 00:00:00' AND '2018-12-30 00:00:00'
     GROUP BY `time`,sensor_id
     ORDER BY `time`
-) GROUP BY `time`;
+) GROUP BY `time` ORDER BY `time`;
 
 DROP TABLE sensor_value;
 
@@ -59,4 +59,4 @@ select s.a, s.b, max(s.dt1) dt1, s.c, s.d, s.f, s.i, max(s.dt2) dt2 from (
         , toDecimal128(268.970000000000, 12)   f
         , toDecimal128(0.000000000000, 12)     i
         , toDateTime('2018-11-02 00:00:00', 'Europe/Moscow')    dt2
-) s group by s.a, s.b, s.c, s.d, s.f, s.i;
+) s group by s.a, s.b, s.c, s.d, s.f, s.i ORDER BY s.a, s.b, s.c, s.d, s.f, s.i;
diff --git a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.reference b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.reference
rename to tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.reference
diff --git a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.sql b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
similarity index 73%
rename from tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.sql
rename to tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
index 0108bb68743..548f26eadd0 100644
--- a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
@@ -7,12 +7,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/alter_compression_codecs', '1') PARTITION BY somedate ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/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/alter_compression_codecs', '2') PARTITION BY somedate ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/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);
@@ -25,8 +25,8 @@ ALTER TABLE alter_compression_codec1 ADD COLUMN alter_column String DEFAULT 'def
 SYSTEM SYNC REPLICA alter_compression_codec1;
 SYSTEM SYNC REPLICA alter_compression_codec2;
 
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column';
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column';
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column' AND database = currentDatabase();
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column' AND database = currentDatabase();
 
 INSERT INTO alter_compression_codec1 VALUES('2018-01-01', 3, '3');
 INSERT INTO alter_compression_codec1 VALUES('2018-01-01', 4, '4');
@@ -37,8 +37,8 @@ SELECT * FROM alter_compression_codec1 ORDER BY id;
 SELECT * FROM alter_compression_codec2 ORDER BY id;
 
 ALTER TABLE alter_compression_codec1 MODIFY COLUMN alter_column CODEC(NONE);
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column';
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column';
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column' AND database = currentDatabase();
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column' AND database = currentDatabase();
 
 INSERT INTO alter_compression_codec2 VALUES('2018-01-01', 5, '5');
 INSERT INTO alter_compression_codec2 VALUES('2018-01-01', 6, '6');
@@ -50,8 +50,8 @@ SET allow_suspicious_codecs = 1;
 ALTER TABLE alter_compression_codec1 MODIFY COLUMN alter_column CODEC(ZSTD, LZ4HC, LZ4, LZ4, NONE);
 SYSTEM SYNC REPLICA alter_compression_codec1;
 SYSTEM SYNC REPLICA alter_compression_codec2;
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column';
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column';
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column' AND database = currentDatabase();
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column' AND database = currentDatabase();
 
 INSERT INTO alter_compression_codec1 VALUES('2018-01-01', 7, '7');
 INSERT INTO alter_compression_codec2 VALUES('2018-01-01', 8, '8');
@@ -62,8 +62,8 @@ SELECT * FROM alter_compression_codec2 ORDER BY id;
 
 ALTER TABLE alter_compression_codec1 MODIFY COLUMN alter_column FixedString(100);
 SYSTEM SYNC REPLICA alter_compression_codec2;
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column';
-SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column';
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec1' AND name = 'alter_column' AND database = currentDatabase();
+SELECT compression_codec FROM system.columns WHERE table = 'alter_compression_codec2' AND name = 'alter_column' AND database = currentDatabase();
 
 DROP TABLE IF EXISTS alter_compression_codec1;
 DROP TABLE IF EXISTS alter_compression_codec2;
diff --git a/tests/queries/0_stateless/00911_tautological_compare.reference b/tests/queries/0_stateless/00911_tautological_compare.reference
index 405d3348775..e69de29bb2d 100644
--- a/tests/queries/0_stateless/00911_tautological_compare.reference
+++ b/tests/queries/0_stateless/00911_tautological_compare.reference
@@ -1,8 +0,0 @@
-0
-0
-0
-0
-0
-0
-0
-0
diff --git a/tests/queries/0_stateless/00911_tautological_compare.sql b/tests/queries/0_stateless/00911_tautological_compare.sql
index 34c95d73716..bcbbbeb514b 100644
--- a/tests/queries/0_stateless/00911_tautological_compare.sql
+++ b/tests/queries/0_stateless/00911_tautological_compare.sql
@@ -1,10 +1,49 @@
-SELECT count() FROM system.numbers WHERE number != number;
-SELECT count() FROM system.numbers WHERE number < number;
-SELECT count() FROM system.numbers WHERE number > number;
+-- 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
+-- and equals(tuple(NULL), tuple(NULL)) have same hash code, but should not be optimized.
+-- Return this test after refactoring of InterpreterSelectQuery.
 
-SELECT count() FROM system.numbers WHERE NOT (number = number);
-SELECT count() FROM system.numbers WHERE NOT (number <= number);
-SELECT count() FROM system.numbers WHERE NOT (number >= number);
+-- SELECT count() FROM system.numbers WHERE number != number;
+-- SELECT count() FROM system.numbers WHERE number < number;
+-- SELECT count() FROM system.numbers WHERE number > number;
 
-SELECT count() FROM system.numbers WHERE SHA256(toString(number)) != SHA256(toString(number));
-SELECT count() FROM system.numbers WHERE SHA256(toString(number)) != SHA256(toString(number)) AND rand() > 10;
+-- SELECT count() FROM system.numbers WHERE NOT (number = number);
+-- SELECT count() FROM system.numbers WHERE NOT (number <= number);
+-- SELECT count() FROM system.numbers WHERE NOT (number >= number);
+
+-- SELECT count() FROM system.numbers WHERE SHA256(toString(number)) != SHA256(toString(number));
+-- SELECT count() FROM system.numbers WHERE SHA256(toString(number)) != SHA256(toString(number)) AND rand() > 10;
+
+-- column_column_comparison.xml
+-- <test>
+--     <tags>
+--         <tag>comparison</tag>
+--     </tags>
+
+--     <preconditions>
+--         <table_exists>hits_100m_single</table_exists>
+--     </preconditions>
+
+
+--     <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE URL < URL]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE URL < PageCharset]]></query>
+--     <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE SearchPhrase < SearchPhrase SETTINGS max_threads = 2]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE SearchPhrase < URL]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE SearchPhrase < PageCharset SETTINGS max_threads = 2]]></query>
+--     <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(SearchPhrase) AND SearchPhrase < SearchPhrase SETTINGS max_threads = 2]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(SearchPhrase) AND SearchPhrase < URL]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(SearchPhrase) AND SearchPhrase < PageCharset SETTINGS max_threads = 2]]></query>
+--     <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE MobilePhoneModel < MobilePhoneModel SETTINGS max_threads = 1]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE MobilePhoneModel < URL]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE MobilePhoneModel < PageCharset SETTINGS max_threads = 2]]></query>
+--     <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(MobilePhoneModel) AND MobilePhoneModel < MobilePhoneModel SETTINGS max_threads = 1]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(MobilePhoneModel) AND MobilePhoneModel < URL]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE notEmpty(MobilePhoneModel) AND MobilePhoneModel < PageCharset SETTINGS max_threads = 2]]></query>
+--     <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE PageCharset < PageCharset SETTINGS max_threads = 2]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE PageCharset < URL]]></query>
+--     <query short="1"><![CDATA[SELECT count() FROM hits_100m_single WHERE Title < Title]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE Title < URL]]></query>
+--     <query><![CDATA[SELECT count() FROM hits_100m_single WHERE Title < PageCharset]]></query>
+
+-- </test>
diff --git a/tests/queries/0_stateless/00915_simple_aggregate_function.reference b/tests/queries/0_stateless/00915_simple_aggregate_function.reference
index 8d5d8340f17..6bbe9b1e8b3 100644
--- a/tests/queries/0_stateless/00915_simple_aggregate_function.reference
+++ b/tests/queries/0_stateless/00915_simple_aggregate_function.reference
@@ -39,7 +39,7 @@ SimpleAggregateFunction(sum, Float64)
 7	14
 8	16
 9	18
-1	1	2	2.2.2.2	3	([1,2,3],[2,1,1])	([1,2,3],[1,1,2])	([1,2,3],[2,1,2])	[1,2,2,3,4]	[4,2,1,3]	(1,1)	(2,2)
-10	2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222	20	20.20.20.20	5	([2,3,4],[2,1,1])	([2,3,4],[3,3,4])	([2,3,4],[4,3,4])	[]	[]	(3,3)	(4,4)
-SimpleAggregateFunction(anyLast, Nullable(String))	SimpleAggregateFunction(anyLast, LowCardinality(Nullable(String)))	SimpleAggregateFunction(anyLast, IPv4)	SimpleAggregateFunction(groupBitOr, UInt32)	SimpleAggregateFunction(sumMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(minMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(maxMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(groupArrayArray, Array(Int32))	SimpleAggregateFunction(groupUniqArrayArray, Array(Int32))	SimpleAggregateFunction(argMin, Tuple(Int32, Int64))	SimpleAggregateFunction(argMax, Tuple(Int32, Int64))
+1	1	2	2.2.2.2	3	([1,2,3],[2,1,1])	([1,2,3],[1,1,2])	([1,2,3],[2,1,2])	[1,2,2,3,4]	[4,2,1,3]
+10	2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222	20	20.20.20.20	5	([2,3,4],[2,1,1])	([2,3,4],[3,3,4])	([2,3,4],[4,3,4])	[]	[]
+SimpleAggregateFunction(anyLast, Nullable(String))	SimpleAggregateFunction(anyLast, LowCardinality(Nullable(String)))	SimpleAggregateFunction(anyLast, IPv4)	SimpleAggregateFunction(groupBitOr, UInt32)	SimpleAggregateFunction(sumMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(minMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(maxMap, Tuple(Array(Int32), Array(Int64)))	SimpleAggregateFunction(groupArrayArray, Array(Int32))	SimpleAggregateFunction(groupUniqArrayArray, Array(Int32))
 with_overflow	1	0
diff --git a/tests/queries/0_stateless/00915_simple_aggregate_function.sql b/tests/queries/0_stateless/00915_simple_aggregate_function.sql
index c669f810312..82a7aa2152f 100644
--- a/tests/queries/0_stateless/00915_simple_aggregate_function.sql
+++ b/tests/queries/0_stateless/00915_simple_aggregate_function.sql
@@ -31,22 +31,16 @@ create table simple (
     tup_min SimpleAggregateFunction(minMap, Tuple(Array(Int32), Array(Int64))),
     tup_max SimpleAggregateFunction(maxMap, Tuple(Array(Int32), Array(Int64))),
     arr SimpleAggregateFunction(groupArrayArray, Array(Int32)),
-    uniq_arr SimpleAggregateFunction(groupUniqArrayArray, Array(Int32)),
-    arg_min SimpleAggregateFunction(argMin, Tuple(Int32, Int64)),
-    arg_max SimpleAggregateFunction(argMax, Tuple(Int32, Int64))
+    uniq_arr SimpleAggregateFunction(groupUniqArrayArray, Array(Int32))
 ) engine=AggregatingMergeTree order by id;
-
-insert into simple values(1,'1','1','1.1.1.1', 1, ([1,2], [1,1]), ([1,2], [1,1]), ([1,2], [1,1]), [1,2], [1,2], (1,1), (1,1));
-insert into simple values(1,null,'2','2.2.2.2', 2, ([1,3], [1,1]), ([1,3], [2,2]), ([1,3], [2,2]), [2,3,4], [2,3,4], (2,2), (2,2));
+insert into simple values(1,'1','1','1.1.1.1', 1, ([1,2], [1,1]), ([1,2], [1,1]), ([1,2], [1,1]), [1,2], [1,2]);
+insert into simple values(1,null,'2','2.2.2.2', 2, ([1,3], [1,1]), ([1,3], [2,2]), ([1,3], [2,2]), [2,3,4], [2,3,4]);
 -- String longer then MAX_SMALL_STRING_SIZE (actual string length is 100)
-insert into simple values(10,'10','10','10.10.10.10', 4, ([2,3], [1,1]), ([2,3], [3,3]), ([2,3], [3,3]), [], [], (3,3), (3,3));
-insert into simple values(10,'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222','20','20.20.20.20', 1, ([2, 4], [1,1]), ([2, 4], [4,4]), ([2, 4], [4,4]), [], [], (4,4), (4,4));
+insert into simple values(10,'10','10','10.10.10.10', 4, ([2,3], [1,1]), ([2,3], [3,3]), ([2,3], [3,3]), [], []);
+insert into simple values(10,'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222','20','20.20.20.20', 1, ([2, 4], [1,1]), ([2, 4], [4,4]), ([2, 4], [4,4]), [], []);
 
 select * from simple final order by id;
-select toTypeName(nullable_str), toTypeName(low_str), toTypeName(ip), toTypeName(status),
-    toTypeName(tup), toTypeName(tup_min), toTypeName(tup_max), toTypeName(arr),
-    toTypeName(uniq_arr), toTypeName(arg_min), toTypeName(arg_max)
-from simple limit 1;
+select toTypeName(nullable_str),toTypeName(low_str),toTypeName(ip),toTypeName(status), toTypeName(tup), toTypeName(tup_min), toTypeName(tup_max), toTypeName(arr), toTypeName(uniq_arr) from simple limit 1;
 
 optimize table simple final;
 
diff --git a/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference b/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference
index 7938dcdde86..b261da18d51 100644
--- a/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference
+++ b/tests/queries/0_stateless/00918_has_unsufficient_type_check.reference
@@ -1,3 +1,2 @@
-0
 1
 0
diff --git a/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql b/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql
index f76fd446a8e..c40419e4d56 100644
--- a/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql
+++ b/tests/queries/0_stateless/00918_has_unsufficient_type_check.sql
@@ -1,3 +1,3 @@
-SELECT hasAny([['Hello, world']], [[[]]]);
+SELECT hasAny([['Hello, world']], [[[]]]); -- { serverError 386 }
 SELECT hasAny([['Hello, world']], [['Hello', 'world'], ['Hello, world']]);
 SELECT hasAll([['Hello, world']], [['Hello', 'world'], ['Hello, world']]);
diff --git a/tests/queries/0_stateless/00921_datetime64_basic.reference b/tests/queries/0_stateless/00921_datetime64_basic.reference
index ab2b602412f..d5ed02629f1 100644
--- a/tests/queries/0_stateless/00921_datetime64_basic.reference
+++ b/tests/queries/0_stateless/00921_datetime64_basic.reference
@@ -1,3 +1,5 @@
+UTC	1
+Europe/Minsk	1
 2019-09-16 19:20:11.000
 2019-05-03 11:25:25.123	2019-05-03	2019-05-03 00:00:00	2019-04-01	1970-01-02 11:25:25	2019-05-03 11:25:00
 2019-09-16 19:20:11.234
diff --git a/tests/queries/0_stateless/00921_datetime64_basic.sql b/tests/queries/0_stateless/00921_datetime64_basic.sql
index 2d7cb975cfc..28205c72ef0 100644
--- a/tests/queries/0_stateless/00921_datetime64_basic.sql
+++ b/tests/queries/0_stateless/00921_datetime64_basic.sql
@@ -13,6 +13,11 @@ SELECT toDateTime64('2019-09-16 19:20:11.234', 3, 'qqq'); -- { serverError 1000
 SELECT ignore(now64(gccMurmurHash())); -- { serverError 43 } # Illegal argument type
 SELECT ignore(now64('abcd')); -- { serverError 43 } # Illegal argument type
 SELECT ignore(now64(number)) FROM system.numbers LIMIT 10; -- { serverError 43 } # Illegal argument type
+SELECT ignore(now64(3, 'invalid timezone')); -- { serverError 1000 }
+SELECT ignore(now64(3, 1111)); -- { serverError 44 } # invalid timezone parameter type
+
+WITH 'UTC' as timezone SELECT timezone, timeZoneOf(now64(3, timezone)) == timezone;
+WITH 'Europe/Minsk' as timezone SELECT timezone, timeZoneOf(now64(3, timezone)) == timezone;
 
 SELECT toDateTime64('2019-09-16 19:20:11', 3, 'UTC'); -- this now works OK and produces timestamp with no subsecond part
 
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 a418a89ccc5..5d5f3af28ab 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,7 +1,7 @@
 4
 4
 8
-7
+8
 -----
 4
 2
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
index 7a08495654c..f1839bae259 100644
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
@@ -1 +1 @@
-0	36	13
+0	0	13
diff --git a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.reference b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00938_fix_rwlock_segfault.sh b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
similarity index 86%
rename from tests/queries/0_stateless/00938_fix_rwlock_segfault.sh
rename to tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
index 5c4253e682b..01519f7a598 100755
--- a/tests/queries/0_stateless/00938_fix_rwlock_segfault.sh
+++ b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
@@ -8,6 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 set -e
 
+# NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 for _ in {1..100}; do \
 $CLICKHOUSE_CLIENT -q "SELECT name FROM system.tables UNION ALL SELECT name FROM system.columns format Null";
 done
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 0a3fc7f3b3f..1b34abc50d7 100755
--- a/tests/queries/0_stateless/00941_system_columns_race_condition.sh
+++ b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
@@ -13,6 +13,7 @@ $CLICKHOUSE_CLIENT -q "CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d
 
 function thread1()
 {
+    # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
     while true; do $CLICKHOUSE_CLIENT --query "SELECT name FROM system.columns UNION ALL SELECT name FROM system.columns FORMAT Null"; done
 }
 
diff --git a/tests/queries/0_stateless/00950_test_double_delta_codec.sql b/tests/queries/0_stateless/00950_test_double_delta_codec.sql
index a71264910ac..6bf9b2628ad 100644
--- a/tests/queries/0_stateless/00950_test_double_delta_codec.sql
+++ b/tests/queries/0_stateless/00950_test_double_delta_codec.sql
@@ -22,144 +22,145 @@ CREATE TABLE codecTest (
     valueI8  Int8     CODEC(DoubleDelta),
     valueDT  DateTime CODEC(DoubleDelta),
     valueD   Date     CODEC(DoubleDelta)
-) Engine = MergeTree ORDER BY key;
+) Engine = MergeTree ORDER BY key SETTINGS min_bytes_for_wide_part = 0;
 
 
 -- checking for overflow
 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);
+    VALUES (1, 18446744073709551615, 18446744073709551615, 9223372036854775807, 9223372036854775807), (2, 0, 0, -9223372036854775808, -9223372036854775808), (3, 18446744073709551615, 18446744073709551615, 9223372036854775807, 9223372036854775807);
 
 -- n^3 covers all double delta storage cases, from small difference between neighbouref_values (stride) to big.
 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;
+    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;
 
 -- best case - constant stride
 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;
+    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;
 
 
 -- worst case - random stride
 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 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 'U64';
 SELECT
-	key,
-	ref_valueU64, valueU64, ref_valueU64 - valueU64 as dU64
+    key,
+    ref_valueU64, valueU64, ref_valueU64 - valueU64 as dU64
 FROM codecTest
 WHERE
-	dU64 != 0
+    dU64 != 0
 LIMIT 10;
 
 
 SELECT 'U32';
 SELECT
-	key,
-	ref_valueU32, valueU32, ref_valueU32 - valueU32 as dU32
+    key,
+    ref_valueU32, valueU32, ref_valueU32 - valueU32 as dU32
 FROM codecTest
 WHERE
-	dU32 != 0
+    dU32 != 0
 LIMIT 10;
 
 
 SELECT 'U16';
 SELECT
-	key,
-	ref_valueU16, valueU16, ref_valueU16 - valueU16 as dU16
+    key,
+    ref_valueU16, valueU16, ref_valueU16 - valueU16 as dU16
 FROM codecTest
 WHERE
-	dU16 != 0
+    dU16 != 0
 LIMIT 10;
 
 
 SELECT 'U8';
 SELECT
-	key,
-	ref_valueU8, valueU8, ref_valueU8 - valueU8 as dU8
+    key,
+    ref_valueU8, valueU8, ref_valueU8 - valueU8 as dU8
 FROM codecTest
 WHERE
-	dU8 != 0
+    dU8 != 0
 LIMIT 10;
 
 
 SELECT 'I64';
 SELECT
-	key,
-	ref_valueI64, valueI64, ref_valueI64 - valueI64 as dI64
+    key,
+    ref_valueI64, valueI64, ref_valueI64 - valueI64 as dI64
 FROM codecTest
 WHERE
-	dI64 != 0
+    dI64 != 0
 LIMIT 10;
 
 
 SELECT 'I32';
 SELECT
-	key,
-	ref_valueI32, valueI32, ref_valueI32 - valueI32 as dI32
+    key,
+    ref_valueI32, valueI32, ref_valueI32 - valueI32 as dI32
 FROM codecTest
 WHERE
-	dI32 != 0
+    dI32 != 0
 LIMIT 10;
 
 
 SELECT 'I16';
 SELECT
-	key,
-	ref_valueI16, valueI16, ref_valueI16 - valueI16 as dI16
+    key,
+    ref_valueI16, valueI16, ref_valueI16 - valueI16 as dI16
 FROM codecTest
 WHERE
-	dI16 != 0
+    dI16 != 0
 LIMIT 10;
 
 
 SELECT 'I8';
 SELECT
-	key,
-	ref_valueI8, valueI8, ref_valueI8 - valueI8 as dI8
+    key,
+    ref_valueI8, valueI8, ref_valueI8 - valueI8 as dI8
 FROM codecTest
 WHERE
-	dI8 != 0
+    dI8 != 0
 LIMIT 10;
 
 
 SELECT 'DT';
 SELECT
-	key,
-	ref_valueDT, valueDT, ref_valueDT - valueDT as dDT
+    key,
+    ref_valueDT, valueDT, ref_valueDT - valueDT as dDT
 FROM codecTest
 WHERE
-	dDT != 0
+    dDT != 0
 LIMIT 10;
 
 
 SELECT 'D';
 SELECT
-	key,
-	ref_valueD, valueD, ref_valueD - valueD as dD
+    key,
+    ref_valueD, valueD, ref_valueD - valueD as dD
 FROM codecTest
 WHERE
-	dD != 0
+    dD != 0
 LIMIT 10;
 
 SELECT 'Compression:';
 SELECT
-	table, name, type,
-	compression_codec,
-	data_uncompressed_bytes u,
-	data_compressed_bytes c,
-	round(u/c,3) ratio
+    table, name, type,
+    compression_codec,
+    data_uncompressed_bytes u,
+    data_compressed_bytes c,
+    round(u/c,3) ratio
 FROM system.columns
 WHERE
-	table == 'codecTest'
+    table = 'codecTest'
+    AND database = currentDatabase()
 AND
-	compression_codec != ''
+    compression_codec != ''
 AND
-	ratio <= 1
+    ratio <= 1
 ORDER BY
-	table, name, type;
+    table, name, type;
 
 DROP TABLE IF EXISTS codecTest;
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 baa2b0cf53f..ca3f4efe743 100755
--- a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
+++ b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
@@ -6,6 +6,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+CLICKHOUSE_TEST_ZOOKEEPER_PREFIX="${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}/${CLICKHOUSE_DATABASE}"
+
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS elog;"
 
@@ -21,15 +23,12 @@ ORDER BY (engine_id)
 SETTINGS replicated_deduplication_window = 2, cleanup_delay_period=4, cleanup_delay_period_random_add=0;"
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 1, 'hello')"
-sleep 1
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'hello')"
-sleep 1
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 3, 'hello')"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 3 rows
 
 count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
-
 while [[ $count != 2 ]]
 do
     sleep 1
@@ -39,9 +38,8 @@ done
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 1, 'hello')"
 
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 4 rows
+
 count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
-
-
 while [[ $count != 2 ]]
 do
     sleep 1
@@ -53,12 +51,10 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'h
 $CLICKHOUSE_CLIENT --query="SELECT count(*) from elog" # 5 rows
 
 count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
-
 while [[ $count != 2 ]]
 do
     sleep 1
     count=$($CLICKHOUSE_CLIENT --query="SELECT COUNT(*) FROM system.zookeeper where path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/elog/s1/blocks'")
-
 done
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO elog VALUES (toDate('2018-10-01'), 2, 'hello')"
diff --git a/tests/queries/0_stateless/00957_format_with_clashed_aliases.reference b/tests/queries/0_stateless/00957_format_with_clashed_aliases.reference
index d6e53c8b48b..cffcb8482ad 100644
--- a/tests/queries/0_stateless/00957_format_with_clashed_aliases.reference
+++ b/tests/queries/0_stateless/00957_format_with_clashed_aliases.reference
@@ -1,7 +1,7 @@
 SELECT
     1 AS x,
     x.y
-FROM 
+FROM
 (
     SELECT 'Hello, world' AS y
 ) AS x
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 a3ac5692caa..22c404c7712 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
@@ -21,6 +21,7 @@ CREATE TABLE indices_mutaions1
 PARTITION BY i32
 ORDER BY u64
 SETTINGS index_granularity = 2;
+
 CREATE TABLE indices_mutaions2
 (
     u64 UInt64,
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 7924aa15d0c..5f5f4d7a960 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
@@ -30,7 +30,6 @@ with client(name='client1>', log=log) as client1, client(name='client2>', log=lo
     client1.send('CREATE LIVE VIEW test.lv AS SELECT toStartOfDay(time) AS day, location, avg(temperature) FROM test.mt GROUP BY day, location ORDER BY day, location')
     client1.expect(prompt)
     client1.send('WATCH test.lv FORMAT CSVWithNames')
-    client1.expect(r'_version')
     client2.send("INSERT INTO test.mt VALUES ('2019-01-01 00:00:00','New York',60),('2019-01-01 00:10:00','New York',70)")
     client2.expect(prompt)
     client1.expect(r'"2019-01-01 00:00:00","New York",65')
@@ -60,7 +59,7 @@ with client(name='client1>', log=log) as client1, client(name='client2>', log=lo
     match = client1.expect('(%s)|([#\$] )' % prompt)
     if match.groups()[1]:
         client1.send(client1.command)
-        client1.expect(prompt)    
+        client1.expect(prompt)
     client1.send('DROP TABLE test.lv')
     client1.expect(prompt)
     client1.send('DROP TABLE test.mt')
diff --git a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
index 4baa6969b31..d2e2b8f37ef 100644
--- a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
+++ b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
@@ -5,13 +5,13 @@ 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 306 }
+SELECT * FROM distr0; -- { serverError 581 }
 
 CREATE TABLE distr1 (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr2);
 CREATE TABLE distr2 (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr1);
 
-SELECT * FROM distr1; -- { serverError 306 }
-SELECT * FROM distr2; -- { serverError 306 }
+SELECT * FROM distr1; -- { serverError 581 }
+SELECT * FROM distr2; -- { serverError 581 }
 
 DROP TABLE distr0;
 DROP TABLE distr1;
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition_long.reference b/tests/queries/0_stateless/00991_system_parts_race_condition_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition.sh b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
similarity index 97%
rename from tests/queries/0_stateless/00991_system_parts_race_condition.sh
rename to tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
index 55ff4d97149..f1b12a319c0 100755
--- a/tests/queries/0_stateless/00991_system_parts_race_condition.sh
+++ b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
@@ -15,6 +15,7 @@ $CLICKHOUSE_CLIENT -q "CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d
 
 function thread1()
 {
+    # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
     while true; do $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null"; done
 }
 
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 fe6246e02f6..793fc8e9575 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
@@ -16,6 +16,7 @@ $CLICKHOUSE_CLIENT -n -q "
 
 function thread1()
 {
+    # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
     while true; do $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null"; done
 }
 
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 d960d8ff91d..32fe31f68c6 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
@@ -8,7 +8,8 @@ set -e
 
 function thread1()
 {
-    while true; do 
+    # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
+    while true; do
         $CLICKHOUSE_CLIENT --query "SELECT * FROM system.parts FORMAT Null";
     done
 }
diff --git a/tests/queries/0_stateless/01004_rename_deadlock.sh b/tests/queries/0_stateless/01004_rename_deadlock.sh
index aa9e6f8a5bc..2bde9256bba 100755
--- a/tests/queries/0_stateless/01004_rename_deadlock.sh
+++ b/tests/queries/0_stateless/01004_rename_deadlock.sh
@@ -28,6 +28,7 @@ function thread2()
 function thread3()
 {
     while true; do
+        # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
         $CLICKHOUSE_CLIENT --query "SELECT * FROM system.tables" --format Null
     done
 }
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 8773a180822..8936d8da775 100755
--- a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
+++ b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
@@ -15,14 +15,16 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE b (x UInt8) ENGINE = MergeTree ORDER BY
 
 function thread1()
 {
-    while true; do 
+    while true; do
+        # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
         seq 1 100 | awk '{ print "SELECT x FROM a WHERE x IN (SELECT toUInt8(count()) FROM system.tables);" }' | $CLICKHOUSE_CLIENT -n
     done
 }
 
 function thread2()
 {
-    while true; do 
+    while true; do
+        # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
         seq 1 100 | awk '{ print "SELECT x FROM b WHERE x IN (SELECT toUInt8(count()) FROM system.tables);" }' | $CLICKHOUSE_CLIENT -n
     done
 }
diff --git a/tests/queries/0_stateless/01018_Distributed__shard_num.reference b/tests/queries/0_stateless/01018_Distributed__shard_num.reference
index f4b92011759..b2c8b77554b 100644
--- a/tests/queries/0_stateless/01018_Distributed__shard_num.reference
+++ b/tests/queries/0_stateless/01018_Distributed__shard_num.reference
@@ -27,8 +27,8 @@ remote(Distributed)
 1	100
 1	100
 JOIN system.clusters
-1	10	localhost	::1	9000
-1	20	localhost	::1	9000
+1	10	localhost	1	9000
+1	20	localhost	1	9000
 dist_3
 100	foo
 foo	100	foo
diff --git a/tests/queries/0_stateless/01018_Distributed__shard_num.sql b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
index f6d5f23eca8..7d4aaf42473 100644
--- a/tests/queries/0_stateless/01018_Distributed__shard_num.sql
+++ b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
@@ -43,13 +43,13 @@ SELECT _shard_num, key FROM remote('127.0.0.1', currentDatabase(), dist_2) order
 -- JOIN system.clusters
 SELECT 'JOIN system.clusters';
 
-SELECT a._shard_num, a.key, b.host_name, b.host_address, b.port
+SELECT a._shard_num, a.key, b.host_name, b.host_address IN ('::1', '127.0.0.1'), b.port
 FROM (SELECT *, _shard_num FROM dist_1) a
 JOIN system.clusters b
 ON a._shard_num = b.shard_num
 WHERE b.cluster = 'test_cluster_two_shards_localhost';
 
-SELECT _shard_num, key, b.host_name, b.host_address, b.port
+SELECT _shard_num, key, b.host_name, b.host_address IN ('::1', '127.0.0.1'), b.port
 FROM dist_1 a
 JOIN system.clusters b
 ON _shard_num = b.shard_num
@@ -58,7 +58,7 @@ WHERE b.cluster = 'test_cluster_two_shards_localhost'; -- { serverError 403 }
 -- rewrite does not work with aliases, hence Missing columns (47)
 SELECT a._shard_num, key FROM dist_1 a; -- { serverError 47; }
 -- the same with JOIN, just in case
-SELECT a._shard_num, a.key, b.host_name, b.host_address, b.port
+SELECT a._shard_num, a.key, b.host_name, b.host_address IN ('::1', '127.0.0.1'), b.port
 FROM dist_1 a
 JOIN system.clusters b
 ON a._shard_num = b.shard_num
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference b/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference
index e591300eddc..a4e2f380eb8 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_create.reference
@@ -12,7 +12,10 @@ db_01018	dict1
 ==DROP DICTIONARY
 0
 =DICTIONARY in Memory DB
-0
+CREATE DICTIONARY memory_db.dict2\n(\n    `key_column` UInt64 DEFAULT 0 INJECTIVE,\n    `second_column` UInt8 DEFAULT 1 EXPRESSION rand() % 222,\n    `third_column` String DEFAULT \'qqq\'\n)\nPRIMARY KEY key_column\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT tcpPort() USER \'default\' TABLE \'table_for_dict\' PASSWORD \'\' DB \'database_for_dict_01018\'))\nLIFETIME(MIN 1 MAX 10)\nLAYOUT(FLAT())
+dict2
+1
+memory_db	dict2
 =DICTIONARY in Lazy DB
 =DROP DATABASE WITH DICTIONARY
 dict4
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
index f7d34071eb0..dd62f1451a8 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
@@ -89,9 +89,9 @@ CREATE DICTIONARY memory_db.dict2
 PRIMARY KEY key_column
 SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict_01018'))
 LIFETIME(MIN 1 MAX 10)
-LAYOUT(FLAT()); -- {serverError 48}
+LAYOUT(FLAT());
 
-SHOW CREATE DICTIONARY memory_db.dict2; -- {serverError 487}
+SHOW CREATE DICTIONARY memory_db.dict2;
 
 SHOW DICTIONARIES FROM memory_db LIKE 'dict2';
 
@@ -114,7 +114,7 @@ CREATE DICTIONARY lazy_db.dict3
 PRIMARY KEY key_column, second_column
 SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB 'database_for_dict_01018'))
 LIFETIME(MIN 1 MAX 10)
-LAYOUT(COMPLEX_KEY_HASHED()); -- {serverError 48}
+LAYOUT(COMPLEX_KEY_HASHED()); --{serverError 1}
 
 DROP DATABASE IF EXISTS lazy_db;
 
diff --git a/tests/queries/0_stateless/01019_materialized_view_select_extra_columns.sql b/tests/queries/0_stateless/01019_materialized_view_select_extra_columns.sql
index 10bda34e6b9..4b7ea127190 100644
--- a/tests/queries/0_stateless/01019_materialized_view_select_extra_columns.sql
+++ b/tests/queries/0_stateless/01019_materialized_view_select_extra_columns.sql
@@ -28,7 +28,7 @@ FROM mv_extra_columns_src;
 INSERT INTO mv_extra_columns_src VALUES (0, 0), (1, 1), (2, 2);
 
 SELECT * FROM mv_extra_columns_dst ORDER by v;
-SELECT * FROM mv_extra_columns_view; -- { serverError 16 }
+SELECT * FROM mv_extra_columns_view; -- { serverError 10 }
 
 DROP TABLE mv_extra_columns_view;
 DROP TABLE mv_extra_columns_src;
diff --git a/tests/queries/0_stateless/01029_early_constant_folding.reference b/tests/queries/0_stateless/01029_early_constant_folding.reference
index 8a2d7e6c61a..6063e08afe0 100644
--- a/tests/queries/0_stateless/01029_early_constant_folding.reference
+++ b/tests/queries/0_stateless/01029_early_constant_folding.reference
@@ -4,8 +4,7 @@ SELECT 1
 SELECT 1
 WHERE (1 IN (0, 2)) AND (2 = (identity(CAST(2, \'UInt8\')) AS subquery))
 SELECT 1
-WHERE 1 IN (
-(
+WHERE 1 IN ((
     SELECT arrayJoin([1, 2, 3])
 ) AS subquery)
 SELECT 1
diff --git a/tests/queries/0_stateless/01033_quota_dcl.reference b/tests/queries/0_stateless/01033_quota_dcl.reference
index 2ad3c3ad784..7478adac441 100644
--- a/tests/queries/0_stateless/01033_quota_dcl.reference
+++ b/tests/queries/0_stateless/01033_quota_dcl.reference
@@ -1,2 +1 @@
-default
 CREATE QUOTA default KEYED BY user_name FOR INTERVAL 1 hour TRACKING ONLY TO default, readonly
diff --git a/tests/queries/0_stateless/01033_quota_dcl.sql b/tests/queries/0_stateless/01033_quota_dcl.sql
index 8832846a945..a7796402bc2 100644
--- a/tests/queries/0_stateless/01033_quota_dcl.sql
+++ b/tests/queries/0_stateless/01033_quota_dcl.sql
@@ -1,2 +1 @@
-SHOW QUOTAS;
 SHOW CREATE QUOTA default;
diff --git a/tests/queries/0_stateless/01035_avg.reference b/tests/queries/0_stateless/01035_avg.reference
index ec79205c6f8..a9f31de57e1 100644
--- a/tests/queries/0_stateless/01035_avg.reference
+++ b/tests/queries/0_stateless/01035_avg.reference
@@ -1,5 +1,5 @@
-nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan
--0.5	-0.5	-0.5	-0.5	-0.5	-0.5	127.493856	32355.57552	499999.5	499999.5	499999.5	499999.5	499999.5	-0.000500002	0.49999949943727	-0.000005	-0.000005257366687274546
+nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan	nan
+-0.5	-0.5	-0.5	-0.5	-0.5	-0.5	127.493856	32355.57552	499999.5	499999.5	499999.5	499999.5	499999.5	499999.5	-0.000500002	0.49999949943727	-0.000005026740899901579	-0.000005257366687274546
 -2767.546272
 999999
--0.50000449943727
+-0.5000045261781699
diff --git a/tests/queries/0_stateless/01035_avg.sql b/tests/queries/0_stateless/01035_avg.sql
index a185ce816fb..7ad08373917 100644
--- a/tests/queries/0_stateless/01035_avg.sql
+++ b/tests/queries/0_stateless/01035_avg.sql
@@ -1,6 +1,5 @@
 SET allow_experimental_bigint_types=1;
 
--- no UInt128 as for now
 CREATE TABLE IF NOT EXISTS test_01035_avg (
     i8 Int8         DEFAULT i64,
     i16 Int16       DEFAULT i64,
@@ -13,6 +12,7 @@ CREATE TABLE IF NOT EXISTS test_01035_avg (
     u16 UInt16      DEFAULT u64,
     u32 UInt32      DEFAULT u64,
     u64 UInt64,
+    u128 UInt128    DEFAULT u64,
     u256 UInt256    DEFAULT u64,
 
     f32 Float32     DEFAULT u64,
@@ -25,14 +25,14 @@ CREATE TABLE IF NOT EXISTS test_01035_avg (
 ) ENGINE = MergeTree() ORDER BY i64;
 
 SELECT avg(i8), avg(i16), avg(i32), avg(i64), avg(i128), avg(i256),
-       avg(u8), avg(u16), avg(u32), avg(u64), avg(u256),
+       avg(u8), avg(u16), avg(u32), avg(u64), avg(u128), avg(u256),
        avg(f32), avg(f64),
        avg(d32), avg(d64), avg(d128), avg(d256) FROM test_01035_avg;
 
 INSERT INTO test_01035_avg (u64) SELECT number FROM system.numbers LIMIT 1000000;
 
 SELECT avg(i8), avg(i16), avg(i32), avg(i64), avg(i128), avg(i256),
-       avg(u8), avg(u16), avg(u32), avg(u64), avg(u256),
+       avg(u8), avg(u16), avg(u32), avg(u64), avg(u128), avg(u256),
        avg(f32), avg(f64),
        avg(d32), avg(d64), avg(d128), avg(d256) FROM test_01035_avg;
 
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sh b/tests/queries/0_stateless/01039_row_policy_dcl.sh
similarity index 50%
rename from tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sh
rename to tests/queries/0_stateless/01039_row_policy_dcl.sh
index d03e02efc55..8c2249f2981 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sh
+++ b/tests/queries/0_stateless/01039_row_policy_dcl.sh
@@ -4,6 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# We should have correct env vars from shell_config.sh to run this test
-
-python3 "$CURDIR"/00411_long_accurate_number_comparison.python float
+${CLICKHOUSE_CLIENT} -q "SHOW POLICIES ON $CLICKHOUSE_DATABASE.*"
diff --git a/tests/queries/0_stateless/01039_row_policy_dcl.sql b/tests/queries/0_stateless/01039_row_policy_dcl.sql
deleted file mode 100644
index 14742a72914..00000000000
--- a/tests/queries/0_stateless/01039_row_policy_dcl.sql
+++ /dev/null
@@ -1 +0,0 @@
-SHOW POLICIES;
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug.reference b/tests/queries/0_stateless/01049_join_low_card_bug.reference
index ece76c99662..b4ed8176652 100644
--- a/tests/queries/0_stateless/01049_join_low_card_bug.reference
+++ b/tests/queries/0_stateless/01049_join_low_card_bug.reference
@@ -38,22 +38,22 @@ str	Nullable(String)
 \N	str	Nullable(String)	LowCardinality(String)
 \N	str	Nullable(String)	LowCardinality(String)
 \N	str	Nullable(String)	LowCardinality(String)
-	LowCardinality(String)
-str	LowCardinality(String)
-	LowCardinality(String)
-str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
-	LowCardinality(String)
-str	LowCardinality(String)
-	LowCardinality(String)
-str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
+\N	LowCardinality(Nullable(String))
+str	LowCardinality(Nullable(String))
+\N	LowCardinality(Nullable(String))
+str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	LowCardinality(Nullable(String))
+str	LowCardinality(Nullable(String))
+\N	LowCardinality(Nullable(String))
+str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
 \N	Nullable(String)
 str	Nullable(String)
 \N	Nullable(String)
@@ -62,14 +62,14 @@ str	Nullable(String)
 \N	str	Nullable(String)
 \N	str	Nullable(String)
 \N	str	Nullable(String)
-	LowCardinality(String)
-str	LowCardinality(String)
-	LowCardinality(String)
-str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
-	str	LowCardinality(String)
+\N	LowCardinality(Nullable(String))
+str	LowCardinality(Nullable(String))
+\N	LowCardinality(Nullable(String))
+str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
+\N	str	LowCardinality(Nullable(String))
 \N	Nullable(String)
 str	Nullable(String)
 \N	Nullable(String)
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug.sql b/tests/queries/0_stateless/01049_join_low_card_bug.sql
index dee7f5923aa..07558770abf 100644
--- a/tests/queries/0_stateless/01049_join_low_card_bug.sql
+++ b/tests/queries/0_stateless/01049_join_low_card_bug.sql
@@ -76,7 +76,6 @@ SELECT l.lc, r.lc, toTypeName(l.lc), toTypeName(materialize(r.lc)) FROM nl AS l
 SELECT l.lc, r.lc, toTypeName(l.lc), toTypeName(materialize(r.lc)) FROM nl AS l FULL JOIN r_lc AS r USING (x);
 SELECT l.lc, r.lc, toTypeName(l.lc), toTypeName(materialize(r.lc)) FROM nl AS l FULL JOIN r_lc AS r USING (lc);
 
--- TODO: LC nullability
 SET join_use_nulls = 1;
 
 SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x);
diff --git a/tests/queries/0_stateless/01053_ssd_dictionary.sh b/tests/queries/0_stateless/01053_ssd_dictionary.sh
new file mode 100755
index 00000000000..9cdd391ec5a
--- /dev/null
+++ b/tests/queries/0_stateless/01053_ssd_dictionary.sh
@@ -0,0 +1,155 @@
+#!/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}')
+
+$CLICKHOUSE_CLIENT -n --query="
+  DROP DATABASE IF EXISTS 01053_db;
+
+  CREATE DATABASE 01053_db Engine = Ordinary;
+
+  DROP TABLE IF EXISTS 01053_db.table_for_dict;
+
+  CREATE TABLE 01053_db.table_for_dict
+  (
+    id UInt64,
+    a UInt64,
+    b Int32,
+    c String
+  )
+  ENGINE = MergeTree()
+  ORDER BY id;
+
+  INSERT INTO 01053_db.table_for_dict VALUES (1, 100, -100, 'clickhouse'), (2, 3, 4, 'database'), (5, 6, 7, 'columns'), (10, 9, 8, '');
+  INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
+  INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
+  INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
+
+  DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
+
+  -- Probably we need rewrite it to integration test
+  CREATE DICTIONARY 01053_db.ssd_dict
+  (
+      id UInt64,
+      a UInt64 DEFAULT 0,
+      b Int32 DEFAULT -1,
+      c String DEFAULT 'none'
+  )
+  PRIMARY KEY id
+  SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
+  LIFETIME(MIN 1000 MAX 2000)
+  LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));
+
+  SELECT 'TEST_SMALL';
+  SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1));
+  SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(4));
+  SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(5));
+  SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(6));
+  SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(2));
+  SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(3));
+
+  SELECT * FROM 01053_db.ssd_dict ORDER BY id;
+  DROP DICTIONARY 01053_db.ssd_dict;
+
+  DROP TABLE IF EXISTS 01053_db.keys_table;
+
+  CREATE TABLE 01053_db.keys_table
+  (
+    id UInt64
+  )
+  ENGINE = StripeLog();
+
+  INSERT INTO 01053_db.keys_table VALUES (1);
+  INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
+  INSERT INTO 01053_db.keys_table VALUES (2);
+  INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
+  INSERT INTO 01053_db.keys_table VALUES (5);
+  INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
+  INSERT INTO 01053_db.keys_table VALUES (10);
+
+  DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
+
+  CREATE DICTIONARY 01053_db.ssd_dict
+  (
+      id UInt64,
+      a UInt64 DEFAULT 0,
+      b Int32 DEFAULT -1,
+      c String DEFAULT 'none'
+  )
+  PRIMARY KEY id
+  SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
+  LIFETIME(MIN 1000 MAX 2000)
+  LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '$USER_FILES_PATH/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096));
+
+  SELECT 'UPDATE DICTIONARY';
+  SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
+
+  SELECT 'VALUE FROM DISK';
+  SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1));
+
+  SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(1));
+
+  SELECT 'VALUE FROM RAM BUFFER';
+  SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(10));
+  SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(10));
+
+  SELECT 'VALUES FROM DISK AND RAM BUFFER';
+  SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
+
+  SELECT 'HAS';
+  SELECT count() FROM 01053_db.keys_table WHERE dictHas('01053_db.ssd_dict', toUInt64(id));
+
+  SELECT 'VALUES NOT FROM TABLE';
+
+  SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1000000)), dictGetString('01053_db.ssd_dict', 'c', toUInt64(1000000));
+  SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1000000)), dictGetString('01053_db.ssd_dict', 'c', toUInt64(1000000));
+
+  SELECT 'DUPLICATE KEYS';
+  SELECT arrayJoin([1, 2, 3, 3, 2, 1]) AS id, dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(id));
+  --SELECT
+  DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
+
+  DROP TABLE IF EXISTS 01053_db.keys_table;
+
+  CREATE TABLE 01053_db.keys_table
+  (
+    id UInt64
+  )
+  ENGINE = MergeTree()
+  ORDER BY id;
+
+  INSERT INTO 01053_db.keys_table VALUES (1);
+  INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370;
+  INSERT INTO 01053_db.keys_table VALUES (2);
+  INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370, 370;
+  INSERT INTO 01053_db.keys_table VALUES (5);
+  INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 700, 370;
+  INSERT INTO 01053_db.keys_table VALUES (10);
+
+  OPTIMIZE TABLE 01053_db.keys_table;
+
+  CREATE DICTIONARY 01053_db.ssd_dict
+  (
+      id UInt64,
+      a UInt64 DEFAULT 0,
+      b Int32 DEFAULT -1
+  )
+  PRIMARY KEY id
+  SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
+  LIFETIME(MIN 1000 MAX 2000)
+  LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '$USER_FILES_PATH/2d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 1024));
+
+  SELECT 'UPDATE DICTIONARY (MT)';
+  SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
+
+  SELECT 'VALUES FROM DISK AND RAM BUFFER (MT)';
+  SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
+
+  DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
+
+  DROP TABLE IF EXISTS 01053_db.table_for_dict;
+
+  DROP DATABASE IF EXISTS 01053_db;"
diff --git a/tests/queries/0_stateless/01053_ssd_dictionary.sql b/tests/queries/0_stateless/01053_ssd_dictionary.sql
deleted file mode 100644
index 23a369cc8a6..00000000000
--- a/tests/queries/0_stateless/01053_ssd_dictionary.sql
+++ /dev/null
@@ -1,159 +0,0 @@
-SET send_logs_level = 'none';
-
-DROP DATABASE IF EXISTS 01053_db;
-
-CREATE DATABASE 01053_db Engine = Ordinary;
-
-DROP TABLE IF EXISTS 01053_db.table_for_dict;
-
-CREATE TABLE 01053_db.table_for_dict
-(
-  id UInt64,
-  a UInt64,
-  b Int32,
-  c String
-)
-ENGINE = MergeTree()
-ORDER BY id;
-
-INSERT INTO 01053_db.table_for_dict VALUES (1, 100, -100, 'clickhouse'), (2, 3, 4, 'database'), (5, 6, 7, 'columns'), (10, 9, 8, '');
-INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
-INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
-INSERT INTO 01053_db.table_for_dict SELECT number, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
-
-DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
-
--- FIXME filesystem error: in create_directory: Permission denied [/var/lib/clickhouse]
--- Probably we need rewrite it to integration test
-CREATE DICTIONARY 01053_db.ssd_dict
-(
-    id UInt64,
-    a UInt64 DEFAULT 0,
-    b Int32 DEFAULT -1,
-    c String DEFAULT 'none'
-)
-PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
-LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
-
-SELECT 'TEST_SMALL';
-SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1));
-SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(4));
-SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(5));
-SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(6));
-SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(2));
-SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(3));
-
-SELECT * FROM 01053_db.ssd_dict ORDER BY id;
-DROP DICTIONARY 01053_db.ssd_dict;
-
-DROP TABLE IF EXISTS 01053_db.keys_table;
-
-CREATE TABLE 01053_db.keys_table
-(
-  id UInt64
-)
-ENGINE = StripeLog();
-
-INSERT INTO 01053_db.keys_table VALUES (1);
-INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
-INSERT INTO 01053_db.keys_table VALUES (2);
-INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
-INSERT INTO 01053_db.keys_table VALUES (5);
-INSERT INTO 01053_db.keys_table SELECT 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
-INSERT INTO 01053_db.keys_table VALUES (10);
-
-DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
-
-CREATE DICTIONARY 01053_db.ssd_dict
-(
-    id UInt64,
-    a UInt64 DEFAULT 0,
-    b Int32 DEFAULT -1,
-    c String DEFAULT 'none'
-)
-PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
-LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096));
-
-SELECT 'UPDATE DICTIONARY';
--- 118
-SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
-
-SELECT 'VALUE FROM DISK';
--- -100
-SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1));
-
--- 'clickhouse'
-SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(1));
-
-SELECT 'VALUE FROM RAM BUFFER';
--- 8
-SELECT dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(10));
-
--- ''
-SELECT dictGetString('01053_db.ssd_dict', 'c', toUInt64(10));
-
-SELECT 'VALUES FROM DISK AND RAM BUFFER';
--- 118
-SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
-
-SELECT 'HAS';
--- 1006
-SELECT count() FROM 01053_db.keys_table WHERE dictHas('01053_db.ssd_dict', toUInt64(id));
-
-SELECT 'VALUES NOT FROM TABLE';
--- 0 -1 none
-SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1000000)), dictGetString('01053_db.ssd_dict', 'c', toUInt64(1000000));
-SELECT dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(1000000)), dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(1000000)), dictGetString('01053_db.ssd_dict', 'c', toUInt64(1000000));
-
-SELECT 'DUPLICATE KEYS';
-SELECT arrayJoin([1, 2, 3, 3, 2, 1]) AS id, dictGetInt32('01053_db.ssd_dict', 'b', toUInt64(id));
---SELECT
-DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
-
-DROP TABLE IF EXISTS 01053_db.keys_table;
-
-CREATE TABLE 01053_db.keys_table
-(
-  id UInt64
-)
-ENGINE = MergeTree()
-ORDER BY id;
-
-INSERT INTO 01053_db.keys_table VALUES (1);
-INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370;
-INSERT INTO 01053_db.keys_table VALUES (2);
-INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 370, 370;
-INSERT INTO 01053_db.keys_table VALUES (5);
-INSERT INTO 01053_db.keys_table SELECT intHash64(number) FROM system.numbers LIMIT 700, 370;
-INSERT INTO 01053_db.keys_table VALUES (10);
-
-OPTIMIZE TABLE 01053_db.keys_table;
-
-CREATE DICTIONARY 01053_db.ssd_dict
-(
-    id UInt64,
-    a UInt64 DEFAULT 0,
-    b Int32 DEFAULT -1
-)
-PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01053_db'))
-LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/2d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 1024));
-
-SELECT 'UPDATE DICTIONARY (MT)';
--- 118
-SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
-
-SELECT 'VALUES FROM DISK AND RAM BUFFER (MT)';
--- 118
-SELECT sum(dictGetUInt64('01053_db.ssd_dict', 'a', toUInt64(id))) FROM 01053_db.keys_table;
-
-DROP DICTIONARY IF EXISTS 01053_db.ssd_dict;
-
-DROP TABLE IF EXISTS 01053_db.table_for_dict;
-
-DROP DATABASE IF EXISTS 01053_db;
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 b040a0e7a50..d8d1d61be63 100644
--- a/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
+++ b/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
@@ -48,7 +48,7 @@ dictGet('one_cell_cache_ints_overflow', 'i8', toUInt64(19)),
 dictGet('one_cell_cache_ints_overflow', 'i8', toUInt64(20));
 
 SELECT arrayMap(x -> dictGet('one_cell_cache_ints_overflow', 'i8', toUInt64(x)), array)
-FROM 
+FROM
 (
     SELECT [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20] AS array
 );
diff --git a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
index 4227af86be7..7df4dc7ead5 100644
--- a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
+++ b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
@@ -3,14 +3,14 @@ SELECT
     v,
     d,
     i
-FROM 
+FROM
 (
     SELECT
         t.1 AS k,
         t.2 AS v,
         runningDifference(v) AS d,
         runningDifference(cityHash64(t.1)) AS i
-    FROM 
+    FROM
     (
         SELECT arrayJoin([(\'a\', 1), (\'a\', 2), (\'a\', 3), (\'b\', 11), (\'b\', 13), (\'b\', 15)]) AS t
     )
@@ -26,14 +26,14 @@ SELECT
     co2,
     co3,
     num
-FROM 
+FROM
 (
     SELECT
         co,
         co2,
         co3,
         count() AS num
-    FROM 
+    FROM
     (
         SELECT
             1 AS co,
@@ -51,13 +51,13 @@ WHERE (co != 0) AND (co2 != 2)
 1	0	3	1
 1	0	0	1
 SELECT alias AS name
-FROM 
+FROM
 (
     SELECT name AS alias
     FROM system.settings
     WHERE alias = \'enable_optimize_predicate_expression\'
 )
-ANY INNER JOIN 
+ANY INNER JOIN
 (
     SELECT name
     FROM system.settings
@@ -66,17 +66,17 @@ WHERE name = \'enable_optimize_predicate_expression\'
 enable_optimize_predicate_expression
 1	val11	val21	val31
 SELECT ccc
-FROM 
+FROM
 (
     SELECT 1 AS ccc
     WHERE 0
     UNION ALL
     SELECT ccc
-    FROM 
+    FROM
     (
         SELECT 2 AS ccc
     )
-    ANY INNER JOIN 
+    ANY INNER JOIN
     (
         SELECT 2 AS ccc
     ) USING (ccc)
@@ -91,7 +91,7 @@ SELECT
     b.ts,
     b.id,
     id_c
-FROM 
+FROM
 (
     SELECT
         ts,
@@ -109,7 +109,7 @@ SELECT
     b.ts AS `--b.ts`,
     b.id AS `--b.id`,
     id_c AS `--b.id_c`
-FROM 
+FROM
 (
     SELECT
         ts,
@@ -129,7 +129,7 @@ WHERE `--a.ts` <= toDateTime(\'1970-01-01 03:00:00\')
 2	3
 4	5
 SELECT dummy
-FROM 
+FROM
 (
     SELECT dummy
     FROM system.one
@@ -141,13 +141,13 @@ SELECT
     id,
     value,
     value_1
-FROM 
+FROM
 (
     SELECT
         1 AS id,
         2 AS value
 )
-ALL INNER JOIN 
+ALL INNER JOIN
 (
     SELECT
         1 AS id,
diff --git a/tests/queries/0_stateless/01062_max_parser_depth.sh b/tests/queries/0_stateless/01062_max_parser_depth.sh
index 6a0a8b24a91..27593272f92 100755
--- a/tests/queries/0_stateless/01062_max_parser_depth.sh
+++ b/tests/queries/0_stateless/01062_max_parser_depth.sh
@@ -4,7 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-echo 'select 1' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&max_parser_depth=42" -d @- 2>&1 | grep -oP "Maximum parse depth .* exceeded."
+echo 'select 1' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&max_parser_depth=45" -d @- 2>&1 | grep -oP "Maximum parse depth .* exceeded."
 echo -
 echo 'select (1+1)*(2+1)' | ${CLICKHOUSE_CURL} -sSg "${CLICKHOUSE_URL}&max_parser_depth=42" -d @- 2>&1 | grep -oP "Maximum parse depth .* exceeded."
 echo -
diff --git a/tests/queries/0_stateless/01067_join_null.sql b/tests/queries/0_stateless/01067_join_null.sql
index bc888fe01ba..a00c345128c 100644
--- a/tests/queries/0_stateless/01067_join_null.sql
+++ b/tests/queries/0_stateless/01067_join_null.sql
@@ -1,5 +1,5 @@
 SELECT id
-FROM 
+FROM
 (
     SELECT 1 AS id
     UNION ALL
@@ -20,7 +20,7 @@ ORDER BY id;
 SELECT '---';
 
 SELECT *
-FROM 
+FROM
 (
     SELECT NULL AS x
 ) js1
@@ -32,7 +32,7 @@ INNER JOIN
 SELECT '---';
 
 SELECT *
-FROM 
+FROM
 (
     SELECT NULL AS x
 ) js1
diff --git a/tests/queries/0_stateless/01072_nullable_jit.sql b/tests/queries/0_stateless/01072_nullable_jit.sql
index 45e9f110bcb..ae220fda475 100644
--- a/tests/queries/0_stateless/01072_nullable_jit.sql
+++ b/tests/queries/0_stateless/01072_nullable_jit.sql
@@ -1,3 +1,5 @@
+SET compile_expressions = 1;
+
 DROP TABLE IF EXISTS foo;
 
 CREATE TABLE foo (
@@ -12,7 +14,7 @@ CREATE TABLE foo (
 
 INSERT INTO foo VALUES (1, 0.5, 0.2, 0.3, 0.8);
 
-SELECT divide(sum(a) + sum(b), nullIf(sum(c) + sum(d), 0)) FROM foo SETTINGS compile_expressions = 1;
-SELECT divide(sum(a) + sum(b), nullIf(sum(c) + sum(d), 0)) FROM foo SETTINGS compile_expressions = 1;
+SELECT divide(sum(a) + sum(b), nullIf(sum(c) + sum(d), 0)) FROM foo;
+SELECT divide(sum(a) + sum(b), nullIf(sum(c) + sum(d), 0)) FROM foo;
 
 DROP TABLE foo;
diff --git a/tests/queries/0_stateless/01076_predicate_optimizer_with_view.reference b/tests/queries/0_stateless/01076_predicate_optimizer_with_view.reference
index dfab41b5e4c..620c5c7c8d1 100644
--- a/tests/queries/0_stateless/01076_predicate_optimizer_with_view.reference
+++ b/tests/queries/0_stateless/01076_predicate_optimizer_with_view.reference
@@ -3,7 +3,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT *
     FROM default.test
@@ -15,7 +15,7 @@ SELECT
     id,
     name,
     value
-FROM 
+FROM
 (
     SELECT *
     FROM default.test
@@ -23,7 +23,7 @@ FROM
 ) AS test_view
 WHERE id = 2
 SELECT id
-FROM 
+FROM
 (
     SELECT *
     FROM default.test
@@ -31,7 +31,7 @@ FROM
 ) AS test_view
 WHERE id = 1
 SELECT id
-FROM 
+FROM
 (
     SELECT *
     FROM default.test
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 6452b830f38..6e79be90046 100755
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
@@ -21,7 +21,7 @@ $CLICKHOUSE_CLIENT --query "ALTER TABLE table_for_bad_alters MODIFY COLUMN value
 
 sleep 2
 
-while [[ $($CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='0000000000'" 2>&1) ]]; do
+while [[ $($CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='0000000000' and database = '$CLICKHOUSE_DATABASE'" 2>&1) ]]; do
     sleep 1
 done
 
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 7a3e3cf155f..fd0b53cf122 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
@@ -82,14 +82,14 @@ wait
 
 echo "Finishing alters"
 
-columns1=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_1'" 2> /dev/null)
-columns2=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_2'" 2> /dev/null)
-columns3=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_3'" 2> /dev/null)
+columns1=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_1' and database='$CLICKHOUSE_DATABASE'" 2> /dev/null)
+columns2=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_2' and database='$CLICKHOUSE_DATABASE'" 2> /dev/null)
+columns3=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_3' and database='$CLICKHOUSE_DATABASE'" 2> /dev/null)
 
 while [ "$columns1" != "$columns2" ] || [ "$columns2" != "$columns3" ]; do
-    columns1=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_1'" 2> /dev/null)
-    columns2=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_2'" 2> /dev/null)
-    columns3=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_3'" 2> /dev/null)
+    columns1=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_1' and database='$CLICKHOUSE_DATABASE'" 2> /dev/null)
+    columns2=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_2' and database='$CLICKHOUSE_DATABASE'" 2> /dev/null)
+    columns3=$($CLICKHOUSE_CLIENT --query "select count() from system.columns where table='concurrent_alter_add_drop_3' and database='$CLICKHOUSE_DATABASE'" 2> /dev/null)
 
     sleep 1
 done
diff --git a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference
index 2a5d7e6da32..b25cfadd0ec 100644
--- a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference
+++ b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference
@@ -6,6 +6,6 @@ CREATE TABLE default.distributed\n(\n    `n` Int8\n)\nENGINE = Distributed(\'tes
 CREATE TABLE default.distributed_tf\n(\n    `n` Int8\n) AS cluster(\'test_shard_localhost\', \'default\', \'buffer\')
 CREATE TABLE default.url\n(\n    `n` UInt64,\n    `col` String\n)\nENGINE = URL(\'https://localhost:8443/?query=select+n,+_table+from+default.merge+format+CSV\', \'CSV\')
 CREATE TABLE default.rich_syntax\n(\n    `n` Int64\n) AS remote(\'localhos{x|y|t}\', cluster(\'test_shard_localhost\', remote(\'127.0.0.{1..4}\', \'default\', \'view\')))
-CREATE VIEW default.view\n(\n    `n` Int64\n) AS\nSELECT toInt64(n) AS n\nFROM \n(\n    SELECT toString(n) AS n\n    FROM default.merge\n    WHERE _table != \'qwerty\'\n    ORDER BY _table ASC\n)\nUNION ALL\nSELECT *\nFROM default.file
+CREATE VIEW default.view\n(\n    `n` Int64\n) AS\nSELECT toInt64(n) AS n\nFROM\n(\n    SELECT toString(n) AS n\n    FROM default.merge\n    WHERE _table != \'qwerty\'\n    ORDER BY _table ASC\n)\nUNION ALL\nSELECT *\nFROM default.file
 CREATE DICTIONARY default.dict\n(\n    `n` UInt64,\n    `col` String DEFAULT \'42\'\n)\nPRIMARY KEY n\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT 9440 SECURE 1 USER \'default\' TABLE \'url\'))\nLIFETIME(MIN 0 MAX 1)\nLAYOUT(CACHE(SIZE_IN_CELLS 1))
 16
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections.reference b/tests/queries/0_stateless/01085_max_distributed_connections.reference
index bc6ff2b709c..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01085_max_distributed_connections.reference
+++ b/tests/queries/0_stateless/01085_max_distributed_connections.reference
@@ -1,9 +0,0 @@
-0
-0
-0
-0
-0
-0
-0
-0
-0
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections.sh b/tests/queries/0_stateless/01085_max_distributed_connections.sh
index c63c671f7fc..1c42cd1a7e0 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections.sh
@@ -4,11 +4,18 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-opts=(
-    --max_distributed_connections 9
-    --max_threads 1
-    --query "SELECT sleepEachRow(1) FROM remote('127.{2..10}', system.one)"
-)
-# 5 less then 9 seconds (9 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[@]}" "$@"
+# 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
+    opts=(
+        --max_distributed_connections 9
+        --max_threads 1
+        --query "SELECT sleepEachRow(1) FROM remote('127.{2..10}', system.one)"
+        --format Null
+    )
+    # 5 less then 9 seconds (9 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
+done
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections_http.reference b/tests/queries/0_stateless/01085_max_distributed_connections_http.reference
index aa47d0d46d4..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01085_max_distributed_connections_http.reference
+++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.reference
@@ -1,2 +0,0 @@
-0
-0
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 d7eb75e717a..1aa9939407c 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
@@ -4,6 +4,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-query="SELECT sleepEachRow(1) FROM remote('127.{2,3}', system.one)"
-# 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"
+# 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
+    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
+done
diff --git a/tests/queries/0_stateless/01087_table_function_generate.reference b/tests/queries/0_stateless/01087_table_function_generate.reference
index d8886945caa..c04fa831328 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.reference
+++ b/tests/queries/0_stateless/01087_table_function_generate.reference
@@ -1,14 +1,14 @@
 UInt64	Int64	UInt32	Int32	UInt16	Int16	UInt8	Int8
-2804162938822577320	-2776833771540858	3467776823	1163715250	23903	-2916	220	-117
-7885388429666205427	-1363628932535403038	484159052	-308788249	44305	13638	143	-105
-4357435422797280898	1355609803008819271	4126129912	-852056475	58858	9166	49	33
-5935810273536892891	-804738887697332962	3109335413	-80126721	13655	-31421	186	-77
-368066018677693974	-4927165984347126295	1015254922	2026080544	21973	-29626	240	108
-8124171311239967992	-1179703908046100129	1720727300	-138469036	36175	-12819	138	16
-15657812979985370729	-5733276247123822513	3254757884	-500590428	13193	30527	3	-81
-18371568619324220532	-6793779541583578394	1686821450	-455892108	52282	2284	252	-90
-821735343441964030	3148260644406230976	256251035	-885069056	55255	11455	176	90
-9558594037060121162	-2907172753635797124	4276198376	1947296644	48701	26632	97	43
+2804162938822577320	-2776833771540858	3467776823	1163715250	23903	13655	137	-41
+7885388429666205427	-1363628932535403038	484159052	-308788249	56810	-22227	51	-41
+4357435422797280898	1355609803008819271	4126129912	-852056475	64304	-11401	139	86
+5935810273536892891	-804738887697332962	3109335413	-80126721	258	12889	18	88
+368066018677693974	-4927165984347126295	1015254922	2026080544	44305	21973	16	0
+8124171311239967992	-1179703908046100129	1720727300	-138469036	61343	10573	252	-32
+15657812979985370729	-5733276247123822513	3254757884	-500590428	45913	19153	105	-102
+18371568619324220532	-6793779541583578394	1686821450	-455892108	49050	-28603	248	80
+821735343441964030	3148260644406230976	256251035	-885069056	58858	-29361	58	61
+9558594037060121162	-2907172753635797124	4276198376	1947296644	26801	-13531	204	-66
 -
 Enum8(\'hello\' = 1, \'world\' = 5)
 hello
@@ -47,16 +47,16 @@ h
 o
 -
 Date	DateTime	DateTime(\'Europe/Moscow\')
-2113-06-12	1970-10-09 02:30:14	2074-08-12 11:31:27
-2103-11-03	2106-01-30 21:52:44	2097-05-25 07:54:35
-2008-03-16	2096-12-12 00:40:50	1988-08-10 11:16:31
-2126-11-26	2096-01-15 16:31:33	2063-10-20 08:48:17
-1991-02-02	2103-02-11 16:44:39	2036-10-09 04:29:10
-2096-11-03	1980-01-02 05:18:22	2055-12-23 12:33:52
-2024-12-16	2079-06-11 16:29:02	2000-12-05 17:46:24
-2085-04-07	2100-03-01 18:50:22	1993-03-25 01:19:12
-2135-05-30	2034-08-25 19:46:33	2045-12-10 16:47:40
-2094-12-18	2069-09-30 16:07:48	2084-08-26 03:33:12
+2113-06-12	2050-12-17 02:46:35	2096-02-16 22:18:22
+2141-08-09	2013-10-17 23:35:26	1976-01-24 12:52:48
+2039-08-16	1974-11-17 23:22:46	1980-03-04 21:02:50
+1997-04-11	1972-09-18 23:44:08	2040-07-10 14:46:42
+2103-11-03	2044-11-23 20:57:12	1970-10-09 02:30:14
+2066-11-19	2029-12-10 03:13:55	2106-01-30 21:52:44
+2064-08-14	2016-07-14 11:33:45	2096-12-12 00:40:50
+2046-09-13	2085-07-10 18:51:14	2096-01-15 16:31:33
+2008-03-16	2047-05-16 23:28:36	2103-02-11 16:44:39
+2000-07-07	2105-07-19 19:29:06	1980-01-02 05:18:22
 -
 DateTime64(3)	DateTime64(6)	DateTime64(6, \'Europe/Moscow\')
 1978-06-07 23:50:57.320	2013-08-28 10:21:54.010758	1991-08-25 16:23:26.140215
@@ -225,14 +225,14 @@ RL,{Xs\\tw
 [114]	-84125.1554	('2023-06-06 06:55:06.492','bf9ab359-ef9f-ad11-7e6c-160368b1e5ea')
 [124]	-114719.5228	('2010-11-11 22:57:23.722','c1046ffb-3415-cc3a-509a-e0005856d7d7')
 -
-[]	1900051923	{	-189530.5846	h	-5.6279699579452485e47	('1984-12-06','2090-10-31 19:35:45','2038-07-15 05:22:51.805','63d9a12d-d1cf-1f3a-57c6-9bc6dddd0975')	8502
-[-102,-118]	392272782	Eb	-14818.0200	o	-2.664492247169164e59	('2024-01-16','1994-07-16 00:40:02','2034-02-02 05:30:44.960','4fa09948-d32e-8903-63df-43ad759e43f7')	DA61
-[-71]	775049089	\N	-158115.1178	w	4.1323844687113747e-305	('2103-08-04','2062-08-12 23:41:53','2074-02-13 10:29:40.749','c4a44dd7-d009-6f65-1494-9daedfa8a124')	83A7
-[-28,100]	3675466147	{	-146685.1749	h	3.6676044396877755e142	('2119-02-01','2002-06-26 03:33:41','2002-12-02 05:46:03.455','98714b2c-65e7-b5cb-a040-421e260c6d8d')	4B94
-[-23]	2514120753	(`u,	-119659.6174	w	1.3231258347475906e34	('2017-10-25','2080-03-28 08:11:25','2073-07-10 12:19:58.146','003b3b6b-088f-f941-aeb9-c26e0ee72b8e')	6B1F
-[11,-36]	3308237300	\N	171205.1896	\N	5.634708707075817e195	('2084-01-01','2041-11-11 13:19:44','2044-03-18 17:34:17.814','9e60f4cb-6e55-1deb-5ac4-d66a86a8886d')	1964
-[39]	1614362420	`4A8P	157144.0630	o	-1.1843143253872814e-255	('2061-03-10','2066-03-02 11:07:49','1997-10-22 20:14:13.755','97685503-2609-d2b9-981c-02fd75d106cb')	A35B
-[48,-120]	3848918261	1<Lu3	91487.2852	h	-1.9300793134783347e263	('2081-06-01','2031-08-07 11:29:42','2085-03-11 15:17:17.374','af838873-48b2-f609-6483-f5c08733364c')	8E7C
-[55]	3047524030	li&lF	93462.3661	h	2.8979254388809897e54	('2108-04-19','2058-07-14 01:47:30','2055-10-14 06:36:20.056','e932a7b5-173a-1304-e522-b794b8fa3f11')	35D9
-[100,-42]	3999367674		-112975.9852	h	2.658098863752086e-160	('2005-08-26','2029-04-21 12:27:59','2068-08-27 07:49:41.825','802b2a96-319b-8e60-63d9-99b88ccae237')	074E
+[]	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
+[-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
+[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/01098_temporary_and_external_tables.sh b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
index bdac3c6fae3..17683852f2b 100755
--- a/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
+++ b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
@@ -10,6 +10,7 @@ url="${url_without_session}session_id=test_01098"
 ${CLICKHOUSE_CURL} -m 30 -sSk "$url" --data "DROP TEMPORARY TABLE IF EXISTS tmp_table"
 ${CLICKHOUSE_CURL} -m 30 -sSk "$url" --data "CREATE TEMPORARY TABLE tmp_table AS SELECT number AS n FROM numbers(42)"
 
+# NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 id=$(echo "SELECT uuid FROM system.tables WHERE name='tmp_table' AND is_temporary" | ${CLICKHOUSE_CURL} -m 31 -sSgk "$url" -d @-)
 internal_table_name="_temporary_and_external_tables.\`_tmp_$id\`"
 
diff --git a/tests/queries/0_stateless/01109_exchange_tables.sql b/tests/queries/0_stateless/01109_exchange_tables.sql
index 7fbb36e8ce9..f2b8e4adb1d 100644
--- a/tests/queries/0_stateless/01109_exchange_tables.sql
+++ b/tests/queries/0_stateless/01109_exchange_tables.sql
@@ -4,6 +4,7 @@ CREATE DATABASE test_01109 ENGINE=Atomic;
 USE test_01109;
 
 CREATE TABLE t0 ENGINE=MergeTree() ORDER BY tuple() AS SELECT rowNumberInAllBlocks(), * FROM (SELECT toLowCardinality(arrayJoin(['exchange', 'tables'])));
+-- NOTE: database = currentDatabase() is not mandatory
 CREATE TABLE t1 ENGINE=Log() AS SELECT * FROM system.tables AS t JOIN system.databases AS d ON t.database=d.name;
 CREATE TABLE t2 ENGINE=MergeTree() ORDER BY tuple() AS SELECT rowNumberInAllBlocks() + (SELECT count() FROM t0), * FROM (SELECT arrayJoin(['hello', 'world']));
 
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.reference b/tests/queries/0_stateless/01115_join_with_dictionary.reference
index fbff63d1777..77f7ba193c0 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.reference
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.reference
@@ -101,3 +101,38 @@ not optimized (smoke)
 -
 2	2	2	2
 3	3	3	3
+issue 23002
+-
+0	0	0	0	0
+1	1	1	1	1
+2	2	2	2	2
+3	3	3	3	3
+4	0	0		0
+-
+0	0	0	0
+1	1	1	1
+2	2	2	2
+3	3	3	3
+4	0		0
+-
+0	0	0	0	0
+1	1	1	1	1
+0	2	2	2	2
+0	3	3	3	3
+-
+0	0	0	0	0
+1	1	1	1	1
+2	2	2	2	2
+3	3	3	3	3
+4	0	0		0
+-
+0	0	0	0
+1	1	1	1
+2	2	2	2
+3	3	3	3
+4	0		0
+-
+0	0	0	0	0
+1	1	1	1	1
+0	2	2	2	2
+0	3	3	3	3
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index a5714169641..d2c42bb6f75 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -82,6 +82,27 @@ SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 SEMI RIGHT JOIN dict_fla
 SELECT '-';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 ANTI RIGHT JOIN dict_flat d USING(key) ORDER BY s1.key;
 
+SET join_use_nulls = 0;
+
+SELECT 'issue 23002';
+
+SET join_algorithm = 'auto';
+SELECT '-';
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d ON s1.key = d.key ORDER BY s1.key;
+SELECT '-';
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key;
+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;
+
+SET join_algorithm = 'partial_merge';
+SELECT '-';
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d ON s1.key = d.key ORDER BY s1.key;
+SELECT '-';
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key;
+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;
diff --git a/tests/queries/0_stateless/01125_generate_random_qoega.reference b/tests/queries/0_stateless/01125_generate_random_qoega.reference
index af3f8c99896..22bc4946401 100644
--- a/tests/queries/0_stateless/01125_generate_random_qoega.reference
+++ b/tests/queries/0_stateless/01125_generate_random_qoega.reference
@@ -1 +1 @@
-100	663736399314727673
+100	9702509002514908721
diff --git a/tests/queries/0_stateless/01128_generate_random_nested.reference b/tests/queries/0_stateless/01128_generate_random_nested.reference
index 6d2e90d8193..12701aed1ab 100644
--- a/tests/queries/0_stateless/01128_generate_random_nested.reference
+++ b/tests/queries/0_stateless/01128_generate_random_nested.reference
@@ -1,2 +1,2 @@
-100	12122376849981951205
-109	6180823897498688294
+100	8533268631048830017
+99	923254289621389072
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 d1b29b46df6..c6bdcb773b2 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
@@ -14,16 +14,16 @@
 1	l	\N	Nullable(String)
 -
 1	l	\N	Nullable(String)
-2		\N	Nullable(String)
+2	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
-2		\N	Nullable(String)
+2	\N	\N	Nullable(String)
 -
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
 -
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
diff --git a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
index d1b29b46df6..c6bdcb773b2 100644
--- a/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
+++ b/tests/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
@@ -14,16 +14,16 @@
 1	l	\N	Nullable(String)
 -
 1	l	\N	Nullable(String)
-2		\N	Nullable(String)
+2	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
-2		\N	Nullable(String)
+2	\N	\N	Nullable(String)
 -
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
 -
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
-\N		\N	Nullable(String)
+\N	\N	\N	Nullable(String)
diff --git a/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference
new file mode 100644
index 00000000000..90755b06aa9
--- /dev/null
+++ b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference
@@ -0,0 +1,7 @@
+30	4995
+20	4950
+15	4700
+20	495
+20	4545
+15	470
+15	4520
diff --git a/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql
new file mode 100644
index 00000000000..2a250725654
--- /dev/null
+++ b/tests/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql
@@ -0,0 +1,26 @@
+drop table if exists src_table_1;
+drop table if exists src_table_2;
+drop table if exists src_table_3;
+drop table if exists set;
+
+create table src_table_1 (n UInt64) engine=Memory as select * from numbers(10);
+create table src_table_2 (n UInt64) engine=Log as select number * 10 from numbers(10);
+create table src_table_3 (n UInt64) engine=MergeTree order by n as select number * 100 from numbers(10);
+create table set (s String) engine=Set as select arrayJoin(['src_table_1', 'src_table_2']);
+
+create temporary table tmp (s String);
+insert into tmp values ('src_table_1'), ('src_table_3');
+
+select count(), sum(n) from merge(currentDatabase(), 'src_table');
+-- FIXME #21401 select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table = 'src_table_1' or toInt8(substr(_table, 11, 1)) = 2;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in ('src_table_2', 'src_table_3');
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in ('src_table_2', 'src_table_3') and n % 20 = 0;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in set;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in tmp;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where _table in set and n % 2 = 0;
+select count(), sum(n) from merge(currentDatabase(), 'src_table') where n % 2 = 0 and _table in tmp;
+
+drop table src_table_1;
+drop table src_table_2;
+drop table src_table_3;
+drop table set;
diff --git a/tests/queries/0_stateless/01152_cross_replication.reference b/tests/queries/0_stateless/01152_cross_replication.reference
new file mode 100644
index 00000000000..389d14ff28b
--- /dev/null
+++ b/tests/queries/0_stateless/01152_cross_replication.reference
@@ -0,0 +1,10 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+demo_loan_01568
+demo_loan_01568
+CREATE TABLE shard_0.demo_loan_01568\n(\n    `id` Int64 COMMENT \'id\',\n    `date_stat` Date COMMENT \'date of stat\',\n    `customer_no` String COMMENT \'customer no\',\n    `loan_principal` Float64 COMMENT \'loan principal\'\n)\nENGINE = ReplacingMergeTree\nPARTITION BY toYYYYMM(date_stat)\nORDER BY id\nSETTINGS index_granularity = 8192
+CREATE TABLE shard_1.demo_loan_01568\n(\n    `id` Int64 COMMENT \'id\',\n    `date_stat` Date COMMENT \'date of stat\',\n    `customer_no` String COMMENT \'customer no\',\n    `loan_principal` Float64 COMMENT \'loan principal\'\n)\nENGINE = ReplacingMergeTree\nPARTITION BY toYYYYMM(date_stat)\nORDER BY id\nSETTINGS index_granularity = 8192
+1	2021-04-13	qwerty	3.14159
+2	2021-04-14	asdfgh	2.71828
+2	2021-04-14	asdfgh	2.71828
+1	2021-04-13	qwerty	3.14159
diff --git a/tests/queries/0_stateless/01152_cross_replication.sql b/tests/queries/0_stateless/01152_cross_replication.sql
new file mode 100644
index 00000000000..23507c41fd0
--- /dev/null
+++ b/tests/queries/0_stateless/01152_cross_replication.sql
@@ -0,0 +1,30 @@
+DROP DATABASE IF EXISTS shard_0;
+DROP DATABASE IF EXISTS shard_1;
+SET distributed_ddl_output_mode='none';
+DROP TABLE IF EXISTS demo_loan_01568_dist;
+
+CREATE DATABASE shard_0;
+CREATE DATABASE shard_1;
+
+CREATE TABLE demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat); -- { serverError 371 }
+SET distributed_ddl_output_mode='throw';
+CREATE TABLE shard_0.demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat);
+CREATE TABLE shard_1.demo_loan_01568 ON CLUSTER test_cluster_two_shards_different_databases ( `id` Int64 COMMENT 'id', `date_stat` Date COMMENT 'date of stat', `customer_no` String COMMENT 'customer no', `loan_principal` Float64 COMMENT 'loan principal' ) ENGINE=ReplacingMergeTree() ORDER BY id PARTITION BY toYYYYMM(date_stat);
+SET distributed_ddl_output_mode='none';
+
+SHOW TABLES FROM shard_0;
+SHOW TABLES FROM shard_1;
+SHOW CREATE TABLE shard_0.demo_loan_01568;
+SHOW CREATE TABLE shard_1.demo_loan_01568;
+
+CREATE TABLE demo_loan_01568_dist AS shard_0.demo_loan_01568 ENGINE=Distributed('test_cluster_two_shards_different_databases', '', 'demo_loan_01568', id % 2);
+INSERT INTO demo_loan_01568_dist VALUES (1, '2021-04-13', 'qwerty', 3.14159), (2, '2021-04-14', 'asdfgh', 2.71828);
+SYSTEM FLUSH DISTRIBUTED demo_loan_01568_dist;
+SELECT * FROM demo_loan_01568_dist ORDER BY id;
+
+SELECT * FROM shard_0.demo_loan_01568;
+SELECT * FROM shard_1.demo_loan_01568;
+
+DROP DATABASE shard_0;
+DROP DATABASE shard_1;
+DROP TABLE demo_loan_01568_dist;
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.reference b/tests/queries/0_stateless/01153_attach_mv_uuid.reference
new file mode 100644
index 00000000000..e37fe28e303
--- /dev/null
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.reference
@@ -0,0 +1,22 @@
+1	1
+2	4
+1	1
+2	4
+3	9
+4	16
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+3	9
+4	16
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+1	1
+2	4
+3	9
+4	16
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.sql b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
new file mode 100644
index 00000000000..86d768d94a7
--- /dev/null
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS src;
+DROP TABLE IF EXISTS mv;
+DROP TABLE IF EXISTS ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2";
+
+CREATE TABLE src (n UInt64) ENGINE=MergeTree ORDER BY n;
+CREATE MATERIALIZED VIEW mv (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src;
+INSERT INTO src VALUES (1), (2);
+SELECT * FROM mv ORDER BY n;
+DETACH TABLE mv;
+ATTACH TABLE mv;
+INSERT INTO src VALUES (3), (4);
+SELECT * FROM mv ORDER BY n;
+DROP TABLE mv SYNC;
+
+SET show_table_uuid_in_table_create_query_if_not_nil=1;
+CREATE TABLE ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2" (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n;
+ATTACH MATERIALIZED VIEW mv UUID 'e15f3ab5-6cae-4df3-b879-f40deafd82c2' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (1), (2);
+SELECT * FROM mv ORDER BY n;
+DETACH TABLE mv;
+ATTACH TABLE mv;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (3), (4);
+SELECT * FROM mv ORDER BY n;
+DROP TABLE mv SYNC;
+
+CREATE TABLE ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2" UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n;
+ATTACH MATERIALIZED VIEW mv UUID 'e15f3ab5-6cae-4df3-b879-f40deafd82c2' TO INNER UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (1), (2);
+SELECT * FROM mv ORDER BY n;
+DETACH TABLE mv;
+ATTACH TABLE mv;
+SHOW CREATE TABLE mv;
+INSERT INTO src VALUES (3), (4);
+SELECT * FROM mv ORDER BY n;
+DROP TABLE mv SYNC;
+
+ATTACH MATERIALIZED VIEW mv UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' TO INNER UUID '3bd68e3c-2693-4352-ad66-a66eba9e345e' (n Int32, n2 Int64) ENGINE = MergeTree PARTITION BY n % 10 ORDER BY n AS SELECT n, n * n AS n2 FROM src; -- { serverError 36 }
+
+DROP TABLE src;
diff --git a/tests/queries/0_stateless/01154_move_partition_long.reference b/tests/queries/0_stateless/01154_move_partition_long.reference
new file mode 100644
index 00000000000..c6d9204ed02
--- /dev/null
+++ b/tests/queries/0_stateless/01154_move_partition_long.reference
@@ -0,0 +1 @@
+Replication did not hang
diff --git a/tests/queries/0_stateless/01154_move_partition_long.sh b/tests/queries/0_stateless/01154_move_partition_long.sh
new file mode 100755
index 00000000000..66ebbacee42
--- /dev/null
+++ b/tests/queries/0_stateless/01154_move_partition_long.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+declare -A engines
+engines[0]="MergeTree"
+engines[1]="ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{shard}/src', '{replica}_' || toString(randConstant()))"
+engines[2]="ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/{shard}/src_' || toString(randConstant()), '{replica}')"
+
+for ((i=0; i<16; i++)) do
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE dst_$i (p UInt64, k UInt64, v UInt64)
+          ENGINE=ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/dst', '$i')
+          PARTITION BY p % 10 ORDER BY k" 2>&1| grep -Pv "Retrying createReplica|created by another server at the same moment, will retry" &
+    engine=${engines[$((i % ${#engines[@]}))]}
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE src_$i (p UInt64, k UInt64, v UInt64) ENGINE=$engine
+          PARTITION BY p % 10 ORDER BY k" 2>&1| grep -Pv "Retrying createReplica|created by another server at the same moment, will retry" &
+done
+wait
+
+#function create_drop_thread()
+#{
+#    while true; do
+#        REPLICA=$(($RANDOM % 16))
+#        $CLICKHOUSE_CLIENT -q "DROP TABLE src_$REPLICA;"
+#        arr=("$@")
+#        engine=${arr[$RANDOM % ${#arr[@]}]}
+#        $CLICKHOUSE_CLIENT -q "CREATE TABLE src_$REPLICA (p UInt64, k UInt64, v UInt64) ENGINE=$engine PARTITION BY p % 10 ORDER BY k"
+#        sleep 0.$RANDOM;
+#    done
+#}
+
+function insert_thread()
+{
+    while true; do
+        REPLICA=$(($RANDOM % 16))
+        LIMIT=$(($RANDOM % 100))
+        $CLICKHOUSE_CLIENT -q "INSERT INTO $1_$REPLICA SELECT * FROM generateRandom('p UInt64, k UInt64, v UInt64') LIMIT $LIMIT" 2>/dev/null
+    done
+}
+
+function move_partition_src_dst_thread()
+{
+    while true; do
+        FROM_REPLICA=$(($RANDOM % 16))
+        TO_REPLICA=$(($RANDOM % 16))
+        PARTITION=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE src_$FROM_REPLICA MOVE PARTITION $PARTITION TO TABLE dst_$TO_REPLICA" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
+}
+
+function replace_partition_src_src_thread()
+{
+    while true; do
+        FROM_REPLICA=$(($RANDOM % 16))
+        TO_REPLICA=$(($RANDOM % 16))
+        PARTITION=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE src_$TO_REPLICA REPLACE PARTITION $PARTITION FROM src_$FROM_REPLICA" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
+}
+
+function drop_partition_thread()
+{
+    while true; do
+        REPLICA=$(($RANDOM % 16))
+        PARTITION=$(($RANDOM % 10))
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE dst_$REPLICA DROP PARTITION $PARTITION" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
+}
+
+function optimize_thread()
+{
+  while true; do
+        REPLICA=$(($RANDOM % 16))
+        TABLE="src"
+        if (( RANDOM % 2 )); then
+            TABLE="dst"
+        fi
+        $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE ${TABLE}_$REPLICA" 2>/dev/null
+        sleep 0.$RANDOM;
+    done
+}
+
+#export -f create_drop_thread;
+export -f insert_thread;
+export -f move_partition_src_dst_thread;
+export -f replace_partition_src_src_thread;
+export -f drop_partition_thread;
+export -f optimize_thread;
+
+TIMEOUT=60
+
+#timeout $TIMEOUT bash -c "create_drop_thread ${engines[@]}" &
+timeout $TIMEOUT bash -c 'insert_thread src' &
+timeout $TIMEOUT bash -c 'insert_thread src' &
+timeout $TIMEOUT bash -c 'insert_thread dst' &
+timeout $TIMEOUT bash -c move_partition_src_dst_thread &
+timeout $TIMEOUT bash -c replace_partition_src_src_thread &
+timeout $TIMEOUT bash -c drop_partition_thread &
+timeout $TIMEOUT bash -c optimize_thread &
+wait
+
+for ((i=0; i<16; i++)) do
+    $CLICKHOUSE_CLIENT -q "SYSTEM SYNC REPLICA dst_$i" &
+    $CLICKHOUSE_CLIENT -q "SYSTEM SYNC REPLICA src_$i" 2>/dev/null &
+done
+wait
+echo "Replication did not hang"
+
+for ((i=0; i<16; i++)) do
+    $CLICKHOUSE_CLIENT -q "DROP TABLE dst_$i" &
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS src_$i" &
+done
+wait
diff --git a/tests/queries/0_stateless/01155_old_mutation_parts_to_do.reference b/tests/queries/0_stateless/01155_old_mutation_parts_to_do.reference
new file mode 100644
index 00000000000..725b16fe1be
--- /dev/null
+++ b/tests/queries/0_stateless/01155_old_mutation_parts_to_do.reference
@@ -0,0 +1,7 @@
+waiting	default	rmt	0000000002	UPDATE m = m * toInt8(s) WHERE n = 3
+1	4	2
+2	15	5
+3	7	fail
+4	11	13
+0000000000	UPDATE m = m * toInt8(s) WHERE 1	[]	0	1
+0000000001	UPDATE m = m * toInt8(s) WHERE 1	[]	0	1
diff --git a/tests/queries/0_stateless/01155_old_mutation_parts_to_do.sh b/tests/queries/0_stateless/01155_old_mutation_parts_to_do.sh
new file mode 100755
index 00000000000..0354da26f4f
--- /dev/null
+++ b/tests/queries/0_stateless/01155_old_mutation_parts_to_do.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+# shellcheck source=./mergetree_mutations.lib
+. "$CURDIR"/mergetree_mutations.lib
+
+
+${CLICKHOUSE_CLIENT} -q "drop table if exists rmt;"
+
+${CLICKHOUSE_CLIENT} -q "create table rmt (n int, m int, s String) engine=ReplicatedMergeTree('/test/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rmt', '1')
+order by n settings max_replicated_mutations_in_queue=0;"
+
+${CLICKHOUSE_CLIENT} -q "insert into rmt values (1, 1, '2');"     # 0_0_0_0
+${CLICKHOUSE_CLIENT} --mutations_sync=0 -q "alter table rmt update m = m*toInt8(s) where 1;"  # 0000000000
+${CLICKHOUSE_CLIENT} -q "insert into rmt values (2, 3, '5');"     # 0_2_2_0
+${CLICKHOUSE_CLIENT} --mutations_sync=0 -q "alter table rmt update m = m*toInt8(s) where 1;"  # 0000000001
+${CLICKHOUSE_CLIENT} -q "insert into rmt values (3, 7, 'fail');"  # 0_4_4_0
+${CLICKHOUSE_CLIENT} --mutations_sync=0 -q "alter table rmt update m = m*toInt8(s) where n=3;"  # 0000000002, will fail to mutate 0_4_4_0 to 0_4_4_0_5
+${CLICKHOUSE_CLIENT} -q "insert into rmt values (4, 11, '13');"   # 0_6_6_0
+
+${CLICKHOUSE_CLIENT} -q "alter table rmt modify setting max_replicated_mutations_in_queue=1;"
+sleep 5 # test does not rely on this, but it may help to reproduce a bug
+
+${CLICKHOUSE_CLIENT} -q "kill mutation where database=currentDatabase() and table='rmt' and mutation_id='0000000002'";
+${CLICKHOUSE_CLIENT} -q "system sync replica rmt;"
+
+# now check that mutations 0 and 1 are finished
+wait_for_mutation "rmt" "0000000001"
+${CLICKHOUSE_CLIENT} -q "select * from rmt order by n;"
+${CLICKHOUSE_CLIENT} -q "select mutation_id, command, parts_to_do_names, parts_to_do, is_done from system.mutations where database=currentDatabase() and table='rmt';"
+
+${CLICKHOUSE_CLIENT} -q "drop table rmt;"
diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.reference b/tests/queries/0_stateless/01155_rename_move_materialized_view.reference
new file mode 100644
index 00000000000..942cedf8696
--- /dev/null
+++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.reference
@@ -0,0 +1,58 @@
+1	.inner.mv1	before moving tablesmv1
+1	dst	before moving tablesmv2
+1	mv1	before moving tablesmv1
+1	mv2	before moving tablesmv2
+1	src	before moving tables
+ordinary:
+.inner.mv1
+dst
+mv1
+mv2
+src
+ordinary after rename:
+atomic after rename:
+.inner_id.
+dst
+mv1
+mv2
+src
+3	.inner_id.	after renaming databasemv1
+3	.inner_id.	before moving tablesmv1
+3	dst	after renaming databasemv2
+3	dst	before moving tablesmv2
+3	mv1	after renaming databasemv1
+3	mv1	before moving tablesmv1
+3	mv2	after renaming databasemv2
+3	mv2	before moving tablesmv2
+3	src	after moving tables
+3	src	after renaming database
+3	src	before moving tables
+.inner_id.
+dst
+mv1
+mv2
+src
+CREATE DATABASE test_01155_atomic\nENGINE = Atomic
+4	.inner.mv1	after renaming databasemv1
+4	.inner.mv1	after renaming tablesmv1
+4	.inner.mv1	before moving tablesmv1
+4	dst	after renaming databasemv2
+4	dst	after renaming tablesmv2
+4	dst	before moving tablesmv2
+4	mv1	after renaming databasemv1
+4	mv1	after renaming tablesmv1
+4	mv1	before moving tablesmv1
+4	mv2	after renaming databasemv2
+4	mv2	after renaming tablesmv2
+4	mv2	before moving tablesmv2
+4	src	after moving tables
+4	src	after renaming database
+4	src	after renaming tables
+4	src	before moving tables
+test_01155_ordinary:
+.inner.mv1
+dst
+mv1
+mv2
+src
+test_01155_atomic:
diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
new file mode 100644
index 00000000000..2ede0fbcedf
--- /dev/null
+++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
@@ -0,0 +1,59 @@
+DROP DATABASE IF EXISTS test_01155_ordinary;
+DROP DATABASE IF EXISTS test_01155_atomic;
+
+CREATE DATABASE test_01155_ordinary ENGINE=Ordinary;
+CREATE DATABASE test_01155_atomic ENGINE=Atomic;
+
+USE test_01155_ordinary;
+CREATE TABLE src (s String) ENGINE=MergeTree() PARTITION BY tuple() ORDER BY s;
+CREATE MATERIALIZED VIEW mv1 (s String) ENGINE=MergeTree() PARTITION BY tuple() ORDER BY s AS SELECT (*,).1 || 'mv1' as s FROM src;
+CREATE TABLE dst (s String) ENGINE=MergeTree() PARTITION BY tuple() ORDER BY s;
+CREATE MATERIALIZED VIEW mv2 TO dst (s String) AS SELECT (*,).1 || 'mv2' as s FROM src;
+INSERT INTO src VALUES ('before moving tables');
+SELECT 1, substr(_table, 1, 10), s FROM merge('test_01155_ordinary', '') ORDER BY _table, s;
+
+-- Move tables with materialized views from Ordinary to Atomic
+SELECT 'ordinary:';
+SHOW TABLES FROM test_01155_ordinary;
+RENAME TABLE test_01155_ordinary.mv1 TO test_01155_atomic.mv1;
+RENAME TABLE test_01155_ordinary.mv2 TO test_01155_atomic.mv2;
+RENAME TABLE test_01155_ordinary.dst TO test_01155_atomic.dst;
+RENAME TABLE test_01155_ordinary.src TO test_01155_atomic.src;
+SELECT 'ordinary after rename:';
+SELECT substr(name, 1, 10) FROM system.tables WHERE database='test_01155_ordinary';
+SELECT 'atomic after rename:';
+SELECT substr(name, 1, 10) FROM system.tables WHERE database='test_01155_atomic';
+DROP DATABASE test_01155_ordinary;
+USE default;
+
+INSERT INTO test_01155_atomic.src VALUES ('after moving tables');
+SELECT 2, substr(_table, 1, 10), s FROM merge('test_01155_atomic', '') ORDER BY _table, s; -- { serverError 81 }
+
+RENAME DATABASE test_01155_atomic TO test_01155_ordinary;
+USE test_01155_ordinary;
+
+INSERT INTO src VALUES ('after renaming database');
+SELECT 3, substr(_table, 1, 10), s FROM merge('test_01155_ordinary', '') ORDER BY _table, s;
+
+SELECT substr(name, 1, 10) FROM system.tables WHERE database='test_01155_ordinary';
+
+-- Move tables back
+RENAME DATABASE test_01155_ordinary TO test_01155_atomic;
+
+CREATE DATABASE test_01155_ordinary ENGINE=Ordinary;
+SHOW CREATE DATABASE test_01155_atomic;
+
+RENAME TABLE test_01155_atomic.mv1 TO test_01155_ordinary.mv1;
+RENAME TABLE test_01155_atomic.mv2 TO test_01155_ordinary.mv2;
+RENAME TABLE test_01155_atomic.dst TO test_01155_ordinary.dst;
+RENAME TABLE test_01155_atomic.src TO test_01155_ordinary.src;
+
+INSERT INTO src VALUES ('after renaming tables');
+SELECT 4, substr(_table, 1, 10), s FROM merge('test_01155_ordinary', '') ORDER BY _table, s;
+SELECT 'test_01155_ordinary:';
+SHOW TABLES FROM test_01155_ordinary;
+SELECT 'test_01155_atomic:';
+SHOW TABLES FROM test_01155_atomic;
+
+DROP DATABASE IF EXISTS test_01155_atomic;
+DROP DATABASE IF EXISTS test_01155_ordinary;
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 ca393c36617..24283a0e8e3 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,5 +1,4 @@
 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;
 ATTACH TABLE test_repl ON CLUSTER test_shard_localhost;
diff --git a/tests/queries/0_stateless/01184_insert_values_huge_strings.sh b/tests/queries/0_stateless/01184_insert_values_huge_strings.sh
deleted file mode 100755
index 9b63f401a59..00000000000
--- a/tests/queries/0_stateless/01184_insert_values_huge_strings.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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 huge_strings"
-$CLICKHOUSE_CLIENT -q "create table huge_strings (n UInt64, l UInt64, s String, h UInt64) engine=MergeTree order by n"
-
-for _ in {1..10}; do
-  $CLICKHOUSE_CLIENT -q "select number, (rand() % 100*1000*1000) as l, repeat(randomString(l/1000/1000), 1000*1000) as s, cityHash64(s) from numbers(10) format Values" | $CLICKHOUSE_CLIENT -q "insert into huge_strings values" &
-  $CLICKHOUSE_CLIENT -q "select number % 10, (rand() % 100) as l, randomString(l) as s, cityHash64(s) from numbers(100000)" | $CLICKHOUSE_CLIENT -q "insert into huge_strings format TSV" &
-done;
-wait
-
-$CLICKHOUSE_CLIENT -q "select count() from huge_strings"
-$CLICKHOUSE_CLIENT -q "select sum(l = length(s)) from huge_strings"
-$CLICKHOUSE_CLIENT -q "select sum(h = cityHash64(s)) from huge_strings"
-
-$CLICKHOUSE_CLIENT -q "drop table huge_strings"
diff --git a/tests/queries/0_stateless/01184_insert_values_huge_strings.reference b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.reference
similarity index 100%
rename from tests/queries/0_stateless/01184_insert_values_huge_strings.reference
rename to tests/queries/0_stateless/01184_long_insert_values_huge_strings.reference
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
new file mode 100755
index 00000000000..f3b3431dffe
--- /dev/null
+++ b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.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
+
+$CLICKHOUSE_CLIENT -q "drop table if exists huge_strings"
+$CLICKHOUSE_CLIENT -q "create table huge_strings (n UInt64, l UInt64, s String, h UInt64) engine=MergeTree order by n"
+
+# Timeouts are increased, because test can be slow with sanitizers and parallel runs.
+
+for _ in {1..10}; do
+  $CLICKHOUSE_CLIENT --receive_timeout 100 --send_timeout 100 --connect_timeout 100 --query "select number, (rand() % 10*1000*1000) as l, repeat(randomString(l/1000/1000), 1000*1000) as s, cityHash64(s) from numbers(10) format Values" | $CLICKHOUSE_CLIENT --receive_timeout 100 --send_timeout 100 --connect_timeout 100 --query "insert into huge_strings values" &
+  $CLICKHOUSE_CLIENT --receive_timeout 100 --send_timeout 100 --connect_timeout 100 --query "select number % 10, (rand() % 10) as l, randomString(l) as s, cityHash64(s) from numbers(100000)" | $CLICKHOUSE_CLIENT --receive_timeout 100 --send_timeout 100 --connect_timeout 100 --query "insert into huge_strings format TSV" &
+done;
+wait
+
+$CLICKHOUSE_CLIENT -q "select count() from huge_strings"
+$CLICKHOUSE_CLIENT -q "select sum(l = length(s)) from huge_strings"
+$CLICKHOUSE_CLIENT -q "select sum(h = cityHash64(s)) from huge_strings"
+
+$CLICKHOUSE_CLIENT -q "drop table huge_strings"
diff --git a/tests/queries/0_stateless/01190_full_attach_syntax.sql b/tests/queries/0_stateless/01190_full_attach_syntax.sql
index 62e77f9870e..eb739782e5f 100644
--- a/tests/queries/0_stateless/01190_full_attach_syntax.sql
+++ b/tests/queries/0_stateless/01190_full_attach_syntax.sql
@@ -18,7 +18,7 @@ SHOW CREATE DICTIONARY test_01190.dict;
 CREATE TABLE log ENGINE = Log AS SELECT 'test' AS s;
 SHOW CREATE log;
 DETACH TABLE log;
-ATTACH DICTIONARY log; -- { serverError 487 }
+ATTACH DICTIONARY log; -- { serverError 80 }
 ATTACH TABLE log (s String) ENGINE = Log();
 SHOW CREATE log;
 SELECT * FROM log;
diff --git a/tests/queries/0_stateless/01191_rename_dictionary.sql b/tests/queries/0_stateless/01191_rename_dictionary.sql
index 3656d49f6e6..264c527ccca 100644
--- a/tests/queries/0_stateless/01191_rename_dictionary.sql
+++ b/tests/queries/0_stateless/01191_rename_dictionary.sql
@@ -13,11 +13,15 @@ INSERT INTO test_01191._ VALUES (42, 'test');
 SELECT name, status FROM system.dictionaries WHERE database='test_01191';
 SELECT name, engine FROM system.tables WHERE database='test_01191' ORDER BY name;
 
-RENAME DICTIONARY test_01191.table TO test_01191.table1; -- {serverError 80}
-EXCHANGE TABLES test_01191.table AND test_01191.dict; -- {serverError 48}
+RENAME DICTIONARY test_01191.table TO test_01191.table1; -- {serverError 60}
+EXCHANGE TABLES test_01191.table AND test_01191.dict; -- {serverError 60}
 EXCHANGE TABLES test_01191.dict AND test_01191.table; -- {serverError 80}
 RENAME TABLE test_01191.dict TO test_01191.dict1; -- {serverError 80}
-RENAME DICTIONARY test_01191.dict TO default.dict1; -- {serverError 48}
+
+CREATE DATABASE dummy_db ENGINE=Atomic;
+RENAME DICTIONARY test_01191.dict TO dummy_db.dict1;
+RENAME DICTIONARY dummy_db.dict1 TO test_01191.dict;
+DROP DATABASE dummy_db;
 
 RENAME DICTIONARY test_01191.dict TO test_01191.dict1;
 
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.reference
similarity index 59%
rename from tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
rename to tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.reference
index 35385731ad3..059dcebbb37 100644
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.reference
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.reference
@@ -1,7 +1,7 @@
 1
-CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01213_alter_rename_column_zookeeper_default/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01213_alter_rename_column_zookeeper_long_default/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 renamed_value1
-CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `renamed_value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01213_alter_rename_column_zookeeper_default/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename_replicated\n(\n    `date` Date,\n    `key` UInt64,\n    `renamed_value1` String,\n    `value2` String,\n    `value3` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01213_alter_rename_column_zookeeper_long_default/table_for_rename_replicated\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 1
 date	key	renamed_value1	value2	value3
 2019-10-02	1	1	1	1
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
similarity index 95%
rename from tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
rename to tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
index 5da8de70c46..b82b132be05 100755
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
@@ -32,11 +32,11 @@ $CLICKHOUSE_CLIENT --query "SHOW CREATE TABLE table_for_rename_replicated;"
 $CLICKHOUSE_CLIENT --query "ALTER TABLE table_for_rename_replicated RENAME COLUMN value1 to renamed_value1" --replication_alter_partitions_sync=0
 
 
-while [[ -z $($CLICKHOUSE_CLIENT --query "SELECT name FROM system.columns WHERE name = 'renamed_value1' and table = 'table_for_rename_replicated'" 2>/dev/null) ]]; do
+while [[ -z $($CLICKHOUSE_CLIENT --query "SELECT name FROM system.columns WHERE name = 'renamed_value1' and table = 'table_for_rename_replicated' AND database = '$CLICKHOUSE_DATABASE'" 2>/dev/null) ]]; do
     sleep 0.5
 done
 
-$CLICKHOUSE_CLIENT --query "SELECT name FROM system.columns WHERE name = 'renamed_value1' and table = 'table_for_rename_replicated'"
+$CLICKHOUSE_CLIENT --query "SELECT name FROM system.columns WHERE name = 'renamed_value1' and table = 'table_for_rename_replicated' AND database = '$CLICKHOUSE_DATABASE'"
 
 # SHOW CREATE TABLE takes query from .sql file on disk.
 # previous select take metadata from memory. So, when previous select says, that return renamed_value1 already exists in table, it's still can have old version on disk.
diff --git a/tests/queries/0_stateless/01231_markdown_format.reference b/tests/queries/0_stateless/01231_markdown_format.reference
index e2ec03b401a..55cf44381ad 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 | 
-|-:|:-|:-:|
-| 1 | name1 | [1,2,3] |
-| 2 | name2 | [4,5,6] |
-| 3 | name3 | [7,8,9] |
+| id | name | array | nullable | low_cardinality | decimal |
+|-:|:-|:-|:-|:-|-:|
+| 1 | name1 | [1,2,3] | Some long string | name1 | 1.110000 |
+| 2 | name2 | [4,5,60000] | \N | Another long string | 222.222222 |
+| 30000 | One more long string | [7,8,9] | name3 | name3 | 3.330000 |
diff --git a/tests/queries/0_stateless/01231_markdown_format.sql b/tests/queries/0_stateless/01231_markdown_format.sql
index 693664be1ab..65c65389e12 100644
--- a/tests/queries/0_stateless/01231_markdown_format.sql
+++ b/tests/queries/0_stateless/01231_markdown_format.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS makrdown;
-CREATE TABLE markdown (id UInt32, name String, array Array(Int8)) ENGINE = Memory;
-INSERT INTO markdown VALUES (1, 'name1', [1,2,3]), (2, 'name2', [4,5,6]), (3, 'name3', [7,8,9]);
+CREATE TABLE markdown (id UInt32, name String, array Array(Int32), nullable Nullable(String), low_cardinality LowCardinality(String), decimal Decimal32(6)) ENGINE = Memory;
+INSERT INTO markdown VALUES (1, 'name1', [1,2,3], 'Some long string', 'name1', 1.11), (2, 'name2', [4,5,60000], Null, 'Another long string', 222.222222), (30000, 'One more long string', [7,8,9], 'name3', 'name3', 3.33);
 
 SELECT * FROM markdown FORMAT Markdown;
 DROP TABLE IF EXISTS markdown
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 d1697bd2310..acaf6531101 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
@@ -123,3 +123,6 @@ GROUP BY sharding_key, ...
 GROUP BY ..., sharding_key
 0	0
 1	0
+window functions
+0	0
+1	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 2f77155cc54..6b6300a4871 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
@@ -106,5 +106,9 @@ select * from dist_01247 group by key, value;
 select 'GROUP BY ..., sharding_key';
 select * from dist_01247 group by value, key;
 
+-- window functions
+select 'window functions';
+select key, sum(sum(value)) over (rows unbounded preceding) from dist_01247 group by key settings allow_experimental_window_functions=1;
+
 drop table dist_01247;
 drop table data_01247;
diff --git a/tests/queries/0_stateless/01245_limit_infinite_sources.sql b/tests/queries/0_stateless/01245_limit_infinite_sources.sql
index 803a2d14c39..05680d86a33 100644
--- a/tests/queries/0_stateless/01245_limit_infinite_sources.sql
+++ b/tests/queries/0_stateless/01245_limit_infinite_sources.sql
@@ -1,5 +1,5 @@
 SELECT number
-FROM 
+FROM
 (
     SELECT zero AS number
     FROM remote('127.0.0.2', system.zeros)
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 0f7c6965b7b..193d23999be 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
@@ -25,6 +25,8 @@ with client(name='client1>', log=log) as client1, client(name='client2>', log=lo
 
     client1.send('DROP TABLE IF EXISTS test.lv')
     client1.expect(prompt)
+    client1.send('DROP TABLE IF EXISTS test.lv_sums')
+    client1.expect(prompt)
     client1.send('DROP TABLE IF EXISTS test.mt')
     client1.expect(prompt)
     client1.send('DROP TABLE IF EXISTS test.sums')
@@ -39,12 +41,10 @@ with client(name='client1>', log=log) as client1, client(name='client2>', log=lo
     client3.expect(prompt)
 
     client3.send("WATCH test.lv_sums FORMAT CSVWithNames")
-    client3.expect('_version')
 
     client1.send('INSERT INTO test.sums WATCH test.lv')
     client1.expect(r'INSERT INTO')
-    client1.expect(r'Progress')
-    
+
     client3.expect('0,1.*\r\n')
 
     client2.send('INSERT INTO test.mt VALUES (1),(2),(3)')
@@ -67,7 +67,7 @@ with client(name='client1>', log=log) as client1, client(name='client2>', log=lo
     match = client1.expect('(%s)|([#\$] )' % prompt)
     if match.groups()[1]:
         client1.send(client1.command)
-        client1.expect(prompt)    
+        client1.expect(prompt)
 
     client2.send('DROP TABLE test.lv')
     client2.expect(prompt)
diff --git a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference
index 09b593dad3d..97c766822ac 100644
--- a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference
+++ b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.reference
@@ -3,5 +3,3 @@
 a
 a
 ---
-a
-a
diff --git a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql
index e3d66e9cdba..0eeb97e2b2d 100644
--- a/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql
+++ b/tests/queries/0_stateless/01263_type_conversion_nvartolomei.sql
@@ -43,7 +43,7 @@ SELECT * FROM d;
 SELECT '---';
 
 INSERT INTO m VALUES ('b');
-SELECT v FROM d ORDER BY v; -- { clientError 36 }
+SELECT toString(v) FROM (SELECT v FROM d ORDER BY v) FORMAT Null; -- { serverError 36 }
 
 
 DROP TABLE m;
diff --git a/tests/queries/0_stateless/01269_create_with_null.reference b/tests/queries/0_stateless/01269_create_with_null.reference
index 86be41bc06a..73f834da75a 100644
--- a/tests/queries/0_stateless/01269_create_with_null.reference
+++ b/tests/queries/0_stateless/01269_create_with_null.reference
@@ -2,3 +2,6 @@ Nullable(Int32)	Int32	Nullable(Int32)	Int32
 CREATE TABLE default.data_null\n(\n    `a` Nullable(Int32),\n    `b` Int32,\n    `c` Nullable(Int32),\n    `d` Int32\n)\nENGINE = Memory
 Nullable(Int32)	Int32	Nullable(Int32)	Nullable(Int32)
 CREATE TABLE default.set_null\n(\n    `a` Nullable(Int32),\n    `b` Int32,\n    `c` Nullable(Int32),\n    `d` Nullable(Int32)\n)\nENGINE = Memory
+CREATE TABLE default.set_null\n(\n    `a` Nullable(Int32),\n    `b` Int32,\n    `c` Nullable(Int32),\n    `d` Nullable(Int32)\n)\nENGINE = Memory
+CREATE TABLE default.cannot_be_nullable\n(\n    `n` Nullable(Int8),\n    `a` Array(UInt8)\n)\nENGINE = Memory
+CREATE TABLE default.cannot_be_nullable\n(\n    `n` Nullable(Int8),\n    `a` Array(UInt8)\n)\nENGINE = Memory
diff --git a/tests/queries/0_stateless/01269_create_with_null.sql b/tests/queries/0_stateless/01269_create_with_null.sql
index 856b6ea75f4..faa6b84e9e4 100644
--- a/tests/queries/0_stateless/01269_create_with_null.sql
+++ b/tests/queries/0_stateless/01269_create_with_null.sql
@@ -1,5 +1,6 @@
 DROP TABLE IF EXISTS data_null;
 DROP TABLE IF EXISTS set_null;
+DROP TABLE IF EXISTS cannot_be_nullable;
 
 SET data_type_default_nullable='false';
 
@@ -45,6 +46,17 @@ INSERT INTO set_null VALUES (NULL, 2, NULL, NULL);
 SELECT toTypeName(a), toTypeName(b), toTypeName(c), toTypeName(d) FROM set_null;
 
 SHOW CREATE TABLE set_null;
+DETACH TABLE set_null;
+ATTACH TABLE set_null;
+SHOW CREATE TABLE set_null;
+
+CREATE TABLE cannot_be_nullable (n Int8, a Array(UInt8)) ENGINE=Memory; -- { serverError 43 }
+CREATE TABLE cannot_be_nullable (n Int8, a Array(UInt8) NOT NULL) ENGINE=Memory;
+SHOW CREATE TABLE cannot_be_nullable;
+DETACH TABLE cannot_be_nullable;
+ATTACH TABLE cannot_be_nullable;
+SHOW CREATE TABLE cannot_be_nullable;
 
 DROP TABLE data_null;
 DROP TABLE set_null;
+DROP TABLE cannot_be_nullable;
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func.reference b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
similarity index 96%
rename from tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func.reference
rename to tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
index 669221005f4..b50519b9b3a 100644
--- a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func.reference
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
@@ -3,7 +3,7 @@ SELECT
     sum(1 + n),
     sum(n - 1),
     sum(1 - n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -13,7 +13,7 @@ SELECT
     2 * sum(n),
     sum(n) / 2,
     sum(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -23,7 +23,7 @@ SELECT
     1 + min(n),
     min(n) - 1,
     1 - min(n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -33,7 +33,7 @@ SELECT
     2 * min(n),
     min(n) / 2,
     min(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -43,7 +43,7 @@ SELECT
     1 + max(n),
     max(n) - 1,
     1 - max(n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -53,7 +53,7 @@ SELECT
     2 * max(n),
     max(n) / 2,
     max(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -63,7 +63,7 @@ SELECT
     sum(-1 + n),
     sum(n - -1),
     sum(-1 - n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -73,7 +73,7 @@ SELECT
     -2 * sum(n),
     sum(n) / -2,
     sum(-1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -83,7 +83,7 @@ SELECT
     -1 + min(n),
     min(n) - -1,
     -1 - min(n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -93,7 +93,7 @@ SELECT
     -2 * max(n),
     max(n) / -2,
     min(-1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -103,7 +103,7 @@ SELECT
     -1 + max(n),
     max(n) - -1,
     -1 - max(n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -113,7 +113,7 @@ SELECT
     -2 * min(n),
     min(n) / -2,
     max(-1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -123,7 +123,7 @@ SELECT
     sum(abs(2) + n),
     sum(n - abs(2)),
     sum(1 - abs(2))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -133,7 +133,7 @@ SELECT
     sum(abs(2) * n),
     sum(n / abs(2)),
     sum(1 / abs(2))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -143,7 +143,7 @@ SELECT
     min(abs(2) + n),
     min(n - abs(2)),
     1 - min(abs(2))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -153,7 +153,7 @@ SELECT
     min(abs(2) * n),
     min(n / abs(2)),
     min(1 / abs(2))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -163,7 +163,7 @@ SELECT
     max(abs(2) + n),
     max(n - abs(2)),
     1 - max(abs(2))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -173,7 +173,7 @@ SELECT
     max(abs(2) * n),
     max(n / abs(2)),
     max(1 / abs(2))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -183,7 +183,7 @@ SELECT
     sum(abs(n) + n),
     sum(n - abs(n)),
     sum(1 - abs(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -193,7 +193,7 @@ SELECT
     sum(abs(n) * n),
     sum(n / abs(n)),
     sum(1 / abs(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -203,7 +203,7 @@ SELECT
     min(abs(n) + n),
     min(n - abs(n)),
     1 - min(abs(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -213,7 +213,7 @@ SELECT
     min(abs(n) * n),
     min(n / abs(n)),
     min(1 / abs(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -223,7 +223,7 @@ SELECT
     max(abs(n) + n),
     max(n - abs(n)),
     1 - max(abs(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -233,7 +233,7 @@ SELECT
     max(abs(n) * n),
     max(n / abs(n)),
     max(1 / abs(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -243,7 +243,7 @@ SELECT
     sum(1 + (n * n)),
     sum((n * n) - 1),
     sum(1 - (n * n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -253,7 +253,7 @@ SELECT
     sum((2 * n) * n),
     sum(n * n) / 2,
     sum((1 / n) * n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -263,7 +263,7 @@ SELECT
     1 + min(n * n),
     min(n * n) - 1,
     1 - min(n * n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -273,7 +273,7 @@ SELECT
     min((2 * n) * n),
     min(n * n) / 2,
     min((1 / n) * n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -283,7 +283,7 @@ SELECT
     1 + max(n * n),
     max(n * n) - 1,
     1 - max(n * n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -293,7 +293,7 @@ SELECT
     max((2 * n) * n),
     max(n * n) / 2,
     max((1 / n) * n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -303,7 +303,7 @@ SELECT
     sum((1 + 1) + n),
     sum((1 + n) - 1),
     sum((1 + 1) - n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -313,7 +313,7 @@ SELECT
     sum(1 + (2 * n)),
     sum(1 + (n / 2)),
     sum(1 + (1 / n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -323,7 +323,7 @@ SELECT
     min((1 + 1) + n),
     (1 + min(n)) - 1,
     min((1 + 1) - n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -333,7 +333,7 @@ SELECT
     1 + min(2 * n),
     1 + min(n / 2),
     1 + min(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -343,7 +343,7 @@ SELECT
     max((1 + 1) + n),
     (1 + max(n)) - 1,
     max((1 + 1) - n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -353,7 +353,7 @@ SELECT
     1 + max(2 * n),
     1 + max(n / 2),
     1 + max(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -363,7 +363,7 @@ SELECT
     sum((-1 + n) + -1),
     sum((n - -1) + -1),
     sum((-1 - n) + -1)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -373,7 +373,7 @@ SELECT
     (-2 * sum(n)) * -1,
     (sum(n) / -2) / -1,
     sum(-1 / n) / -1
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -383,7 +383,7 @@ SELECT
     (-1 + min(n)) + -1,
     (min(n) - -1) + -1,
     (-1 - min(n)) + -1
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -393,7 +393,7 @@ SELECT
     (-2 * min(n)) * -1,
     (min(n) / -2) / -1,
     max(-1 / n) / -1
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -403,7 +403,7 @@ SELECT
     (-1 + max(n)) + -1,
     (max(n) - -1) + -1,
     (-1 - max(n)) + -1
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
@@ -413,43 +413,43 @@ SELECT
     (-2 * max(n)) * -1,
     (max(n) / -2) / -1,
     min(-1 / n) / -1
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
 )
 SELECT ((sum(n + 1) + sum(1 + n)) + sum(n - 1)) + sum(1 - n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
 )
 SELECT (((sum(n) * 2) + (2 * sum(n))) + (sum(n) / 2)) + sum(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
 )
 SELECT (((min(n) + 1) + (1 + min(n))) + (min(n) - 1)) + (1 - min(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
 )
 SELECT (((min(n) * 2) + (2 * min(n))) + (min(n) / 2)) + min(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
 )
 SELECT (((max(n) + 1) + (1 + max(n))) + (max(n) - 1)) + (1 - max(n))
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
 )
 SELECT (((max(n) * 2) + (2 * max(n))) + (max(n) / 2)) + max(1 / n)
-FROM 
+FROM
 (
     SELECT number AS n
     FROM numbers(10)
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func.sql b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
similarity index 100%
rename from tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func.sql
rename to tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index 7928f531a7d..59b37369739 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -21,6 +21,11 @@ ALTER DROP INDEX	['DROP INDEX']	TABLE	ALTER INDEX
 ALTER MATERIALIZE INDEX	['MATERIALIZE INDEX']	TABLE	ALTER INDEX
 ALTER CLEAR INDEX	['CLEAR INDEX']	TABLE	ALTER INDEX
 ALTER INDEX	['INDEX']	\N	ALTER TABLE
+ALTER ADD PROJECTION	['ADD PROJECTION']	TABLE	ALTER PROJECTION
+ALTER DROP PROJECTION	['DROP PROJECTION']	TABLE	ALTER PROJECTION
+ALTER MATERIALIZE PROJECTION	['MATERIALIZE PROJECTION']	TABLE	ALTER PROJECTION
+ALTER CLEAR PROJECTION	['CLEAR PROJECTION']	TABLE	ALTER PROJECTION
+ALTER PROJECTION	['PROJECTION']	\N	ALTER TABLE
 ALTER ADD CONSTRAINT	['ADD CONSTRAINT']	TABLE	ALTER CONSTRAINT
 ALTER DROP CONSTRAINT	['DROP CONSTRAINT']	TABLE	ALTER CONSTRAINT
 ALTER CONSTRAINT	['CONSTRAINT']	\N	ALTER TABLE
@@ -28,7 +33,7 @@ ALTER TTL	['ALTER MODIFY TTL','MODIFY TTL']	TABLE	ALTER TABLE
 ALTER MATERIALIZE TTL	['MATERIALIZE TTL']	TABLE	ALTER TABLE
 ALTER SETTINGS	['ALTER SETTING','ALTER MODIFY SETTING','MODIFY SETTING']	TABLE	ALTER TABLE
 ALTER MOVE PARTITION	['ALTER MOVE PART','MOVE PARTITION','MOVE PART']	TABLE	ALTER TABLE
-ALTER FETCH PARTITION	['FETCH PARTITION']	TABLE	ALTER TABLE
+ALTER FETCH PARTITION	['ALTER FETCH PART','FETCH PARTITION']	TABLE	ALTER TABLE
 ALTER FREEZE PARTITION	['FREEZE PARTITION','UNFREEZE']	TABLE	ALTER TABLE
 ALTER TABLE	[]	\N	ALTER
 ALTER VIEW REFRESH	['ALTER LIVE VIEW REFRESH','REFRESH VIEW']	VIEW	ALTER VIEW
@@ -82,8 +87,10 @@ SYSTEM DROP CACHE	['DROP CACHE']	\N	SYSTEM
 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 EMBEDDED DICTIONARIES	['RELOAD EMBEDDED DICTIONARIES']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD	[]	\N	SYSTEM
+SYSTEM RESTART DISK	['SYSTEM RESTART DISK']	GLOBAL	SYSTEM
 SYSTEM MERGES	['SYSTEM STOP MERGES','SYSTEM START MERGES','STOP_MERGES','START MERGES']	TABLE	SYSTEM
 SYSTEM TTL MERGES	['SYSTEM STOP TTL MERGES','SYSTEM START TTL MERGES','STOP TTL MERGES','START TTL MERGES']	TABLE	SYSTEM
 SYSTEM FETCHES	['SYSTEM STOP FETCHES','SYSTEM START FETCHES','STOP FETCHES','START FETCHES']	TABLE	SYSTEM
diff --git a/tests/queries/0_stateless/01273_arrow_arrays_load.reference b/tests/queries/0_stateless/01273_arrow_arrays_load.reference
new file mode 100644
index 00000000000..edb6ba617a1
--- /dev/null
+++ b/tests/queries/0_stateless/01273_arrow_arrays_load.reference
@@ -0,0 +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']
+[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
+[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']
+[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
diff --git a/tests/queries/0_stateless/01273_arrow_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
new file mode 100755
index 00000000000..b8d1a85921d
--- /dev/null
+++ b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+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 orc_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE arrow_arrays (arr1 Array(Int8), arr2 Array(UInt8), arr3 Array(Int16), arr4 Array(UInt16), arr5 Array(Int32), arr6 Array(UInt32), arr7 Array(Int64), arr8 Array(UInt64), arr9 Array(String), arr10 Array(FixedString(4)), arr11 Array(Float32), arr12 Array(Float64), arr13 Array(Date), arr14 Array(Datetime)) ENGINE=Memory()"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO arrow_arrays VALUES ([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']),([],[],[],[],[],[],[],[],[],[],[],[],[],[])"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM arrow_arrays FORMAT Arrow" > "${CLICKHOUSE_TMP}"/arrays.arrow
+
+cat "${CLICKHOUSE_TMP}"/arrays.arrow | ${CLICKHOUSE_CLIENT} -q "INSERT INTO arrow_arrays FORMAT Arrow"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM arrow_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE arrow_arrays"
diff --git a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.reference b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.reference
new file mode 100644
index 00000000000..dd9c9900684
--- /dev/null
+++ b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.reference
@@ -0,0 +1,2 @@
+[[[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],[]]
diff --git a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
new file mode 100755
index 00000000000..cd2040260e9
--- /dev/null
+++ b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+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 arrow_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE arrow_nested_arrays (arr1 Array(Array(Array(UInt32))), arr2 Array(Array(Array(String))), arr3 Array(Array(Nullable(UInt32))), arr4 Array(Array(Nullable(String)))) engine=Memory()"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO arrow_nested_arrays VALUES ([[[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],[]])"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM arrow_nested_arrays FORMAT Arrow" > "${CLICKHOUSE_TMP}"/nested_arrays.arrow
+
+cat "${CLICKHOUSE_TMP}"/nested_arrays.arrow | ${CLICKHOUSE_CLIENT} -q "INSERT INTO arrow_nested_arrays FORMAT Arrow"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM arrow_nested_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP table arrow_nested_arrays"
diff --git a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.reference b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.reference
new file mode 100644
index 00000000000..44b19f616d0
--- /dev/null
+++ b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.reference
@@ -0,0 +1,6 @@
+[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
+[NULL]	[NULL]	[NULL]
+[]	[]	[]
+[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
+[NULL]	[NULL]	[NULL]
+[]	[]	[]
diff --git a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
new file mode 100755
index 00000000000..d780cc6d06a
--- /dev/null
+++ b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+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 arrow_nullable_arrays"
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE arrow_nullable_arrays (arr1 Array(Nullable(UInt32)), arr2 Array(Nullable(String)), arr3 Array(Nullable(Float32))) ENGINE=Memory()"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO arrow_nullable_arrays VALUES ([1,NULL,2],[NULL,'Some string',NULL],[0.00,NULL,42.42]), ([NULL],[NULL],[NULL]), ([],[],[])"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM arrow_nullable_arrays FORMAT Arrow" > "${CLICKHOUSE_TMP}"/nullable_arrays.arrow
+
+cat "${CLICKHOUSE_TMP}"/nullable_arrays.arrow | ${CLICKHOUSE_CLIENT} -q "INSERT INTO arrow_nullable_arrays FORMAT Arrow"
+
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM arrow_nullable_arrays"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE arrow_nullable_arrays"
diff --git a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
new file mode 100755
index 00000000000..ff62b70c184
--- /dev/null
+++ b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
@@ -0,0 +1,124 @@
+#!/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}')
+
+$CLICKHOUSE_CLIENT -n --query="
+    DROP DATABASE IF EXISTS 01280_db;
+    CREATE DATABASE 01280_db Engine = Ordinary;
+    DROP TABLE IF EXISTS 01280_db.table_for_dict;
+    CREATE TABLE 01280_db.table_for_dict
+    (
+        k1 String,
+        k2 Int32,
+        a UInt64,
+        b Int32,
+        c String
+    )
+    ENGINE = MergeTree()
+    ORDER BY (k1, k2);
+
+    INSERT INTO 01280_db.table_for_dict VALUES (toString(1), 3, 100, -100, 'clickhouse'), (toString(2), -1, 3, 4, 'database'), (toString(5), -3, 6, 7, 'columns'), (toString(10), -20, 9, 8, '');
+    INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 1, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
+    INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 10, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
+    INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 100, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
+
+    DROP DICTIONARY IF EXISTS 01280_db.ssd_dict;
+    CREATE DICTIONARY 01280_db.ssd_dict
+    (
+        k1 String,
+        k2 Int32,
+        a UInt64 DEFAULT 0,
+        b Int32 DEFAULT -1,
+        c String DEFAULT 'none'
+    )
+    PRIMARY KEY k1, k2
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01280_db'))
+    LIFETIME(MIN 1000 MAX 2000)
+    LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));"
+
+$CLICKHOUSE_CLIENT --testmode -nq "SELECT dictHas('01280_db.ssd_dict', 'a', tuple('1')); -- { serverError 43 }"
+
+$CLICKHOUSE_CLIENT -n --query="
+    SELECT 'TEST_SMALL';
+    SELECT 'VALUE FROM RAM BUFFER';
+    SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('1', toInt32(3)));
+    SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('1', toInt32(3)));
+    SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('1', toInt32(3)));
+    SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('1', toInt32(3)));
+    SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('1', toInt32(3)));
+    SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('1', toInt32(3)));
+
+    SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('2', toInt32(-1)));
+    SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('2', toInt32(-1)));
+    SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('2', toInt32(-1)));
+
+    SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('5', toInt32(-3)));
+    SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('5', toInt32(-3)));
+    SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('5', toInt32(-3)));
+
+    SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('10', toInt32(-20)));
+    SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('10', toInt32(-20)));
+    SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('10', toInt32(-20)));"
+
+$CLICKHOUSE_CLIENT --testmode -nq "SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple(toInt32(3))); -- { serverError 53 }"
+
+$CLICKHOUSE_CLIENT -n --query="DROP DICTIONARY 01280_db.ssd_dict;
+    DROP TABLE IF EXISTS 01280_db.keys_table;
+    CREATE TABLE 01280_db.keys_table
+    (
+        k1 String,
+        k2 Int32
+    )
+    ENGINE = StripeLog();
+
+    INSERT INTO 01280_db.keys_table VALUES ('1', 3);
+    INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
+    INSERT INTO 01280_db.keys_table VALUES ('2', -1);
+    INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
+    INSERT INTO 01280_db.keys_table VALUES ('5', -3);
+    INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
+    INSERT INTO 01280_db.keys_table VALUES ('10', -20);
+
+    DROP DICTIONARY IF EXISTS 01280_db.ssd_dict;CREATE DICTIONARY 01280_db.ssd_dict
+    (
+        k1 String,
+        k2 Int32,
+        a UInt64 DEFAULT 0,
+        b Int32 DEFAULT -1,
+        c String DEFAULT 'none'
+    )
+    PRIMARY KEY k1, k2
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01280_db'))
+    LIFETIME(MIN 1000 MAX 2000)
+    LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '$USER_FILES_PATH/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096));
+
+    SELECT 'UPDATE DICTIONARY';
+
+    SELECT sum(dictGetUInt64('01280_db.ssd_dict', 'a', (k1, k2))) FROM 01280_db.keys_table;
+
+    SELECT 'VALUE FROM DISK';
+    SELECT dictGetInt32('01280_db.ssd_dict', 'b', ('1', toInt32(3)));
+    SELECT dictGetString('01280_db.ssd_dict', 'c', ('1', toInt32(3)));
+
+    SELECT 'VALUE FROM RAM BUFFER';
+    SELECT dictGetInt32('01280_db.ssd_dict', 'b', ('10', toInt32(-20)));
+    SELECT dictGetString('01280_db.ssd_dict', 'c', ('10', toInt32(-20)));
+
+    SELECT 'VALUES FROM DISK AND RAM BUFFER';
+    SELECT sum(dictGetUInt64('01280_db.ssd_dict', 'a', (k1, k2))) FROM 01280_db.keys_table;
+
+    SELECT 'HAS';
+    SELECT count() FROM 01280_db.keys_table WHERE dictHas('01280_db.ssd_dict', (k1, k2));
+
+    SELECT 'VALUES NOT FROM TABLE';
+    SELECT dictGetUInt64('01280_db.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('01280_db.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('01280_db.ssd_dict', 'c', ('unknown', toInt32(0)));
+    SELECT dictGetUInt64('01280_db.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('01280_db.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('01280_db.ssd_dict', 'c', ('unknown', toInt32(0)));
+
+    SELECT 'DUPLICATE KEYS';
+    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;"
diff --git a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sql b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sql
deleted file mode 100644
index cd3e52c9691..00000000000
--- a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sql
+++ /dev/null
@@ -1,139 +0,0 @@
-SET send_logs_level = 'none';
-
-DROP DATABASE IF EXISTS 01280_db;
-
-CREATE DATABASE 01280_db Engine = Ordinary;
-
-DROP TABLE IF EXISTS 01280_db.table_for_dict;
-
-CREATE TABLE 01280_db.table_for_dict
-(
-  k1 String,
-  k2 Int32,
-  a UInt64,
-  b Int32,
-  c String
-)
-ENGINE = MergeTree()
-ORDER BY (k1, k2);
-
-INSERT INTO 01280_db.table_for_dict VALUES (toString(1), 3, 100, -100, 'clickhouse'), (toString(2), -1, 3, 4, 'database'), (toString(5), -3, 6, 7, 'columns'), (toString(10), -20, 9, 8, '');
-INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 1, 0, -1, 'a' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370;
-INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 10, 0, -1, 'b' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 370, 370;
-INSERT INTO 01280_db.table_for_dict SELECT toString(number), number + 100, 0, -1, 'c' FROM system.numbers WHERE number NOT IN (1, 2, 5, 10) LIMIT 700, 370;
-
-DROP DICTIONARY IF EXISTS 01280_db.ssd_dict;
-
--- FIXME filesystem error: in create_directory: Permission denied [/var/lib/clickhouse]
--- Probably we need rewrite it to integration test
-CREATE DICTIONARY 01280_db.ssd_dict
-(
-    k1 String,
-    k2 Int32,
-    a UInt64 DEFAULT 0,
-    b Int32 DEFAULT -1,
-    c String DEFAULT 'none'
-)
-PRIMARY KEY k1, k2
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01280_db'))
-LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
-
-SELECT 'TEST_SMALL';
-SELECT 'VALUE FROM RAM BUFFER';
-
-SELECT dictHas('01280_db.ssd_dict', 'a', tuple('1')); -- { serverError 43 }
-
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('1', toInt32(3)));
-SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('1', toInt32(3)));
-SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('1', toInt32(3)));
-
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('1', toInt32(3)));
-SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('1', toInt32(3)));
-SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('1', toInt32(3)));
-
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('2', toInt32(-1)));
-SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('2', toInt32(-1)));
-SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('2', toInt32(-1)));
-
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('5', toInt32(-3)));
-SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('5', toInt32(-3)));
-SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('5', toInt32(-3)));
-
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple('10', toInt32(-20)));
-SELECT dictGetInt32('01280_db.ssd_dict', 'b', tuple('10', toInt32(-20)));
-SELECT dictGetString('01280_db.ssd_dict', 'c', tuple('10', toInt32(-20)));
-
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', tuple(toInt32(3))); --{serverError 53}
-
-DROP DICTIONARY 01280_db.ssd_dict;
-
-DROP TABLE IF EXISTS 01280_db.keys_table;
-
-CREATE TABLE 01280_db.keys_table
-(
-    k1 String,
-    k2 Int32
-)
-ENGINE = StripeLog();
-
-INSERT INTO 01280_db.keys_table VALUES ('1', 3);
-INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370;
-INSERT INTO 01280_db.keys_table VALUES ('2', -1);
-INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 370, 370;
-INSERT INTO 01280_db.keys_table VALUES ('5', -3);
-INSERT INTO 01280_db.keys_table SELECT toString(intHash64(number + 1) % 1200), 11 + intHash64(number) % 1200 FROM system.numbers LIMIT 700, 370;
-INSERT INTO 01280_db.keys_table VALUES ('10', -20);
-
-DROP DICTIONARY IF EXISTS 01280_db.ssd_dict;
-
-CREATE DICTIONARY 01280_db.ssd_dict
-(
-    k1 String,
-    k2 Int32,
-    a UInt64 DEFAULT 0,
-    b Int32 DEFAULT -1,
-    c String DEFAULT 'none'
-)
-PRIMARY KEY k1, k2
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' PASSWORD '' DB '01280_db'))
-LIFETIME(MIN 1000 MAX 2000)
-LAYOUT(COMPLEX_KEY_SSD_CACHE(FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d' BLOCK_SIZE 512 WRITE_BUFFER_SIZE 4096));
-
-SELECT 'UPDATE DICTIONARY';
--- 118
-SELECT sum(dictGetUInt64('01280_db.ssd_dict', 'a', (k1, k2))) FROM 01280_db.keys_table;
-
-SELECT 'VALUE FROM DISK';
--- -100
-SELECT dictGetInt32('01280_db.ssd_dict', 'b', ('1', toInt32(3)));
-
--- 'clickhouse'
-SELECT dictGetString('01280_db.ssd_dict', 'c', ('1', toInt32(3)));
-
-SELECT 'VALUE FROM RAM BUFFER';
--- 8
-SELECT dictGetInt32('01280_db.ssd_dict', 'b', ('10', toInt32(-20)));
-
--- ''
-SELECT dictGetString('01280_db.ssd_dict', 'c', ('10', toInt32(-20)));
-
-SELECT 'VALUES FROM DISK AND RAM BUFFER';
--- 118
-SELECT sum(dictGetUInt64('01280_db.ssd_dict', 'a', (k1, k2))) FROM 01280_db.keys_table;
-
-SELECT 'HAS';
--- 6
-SELECT count() FROM 01280_db.keys_table WHERE dictHas('01280_db.ssd_dict', (k1, k2));
-
-SELECT 'VALUES NOT FROM TABLE';
--- 0 -1 none
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('01280_db.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('01280_db.ssd_dict', 'c', ('unknown', toInt32(0)));
-SELECT dictGetUInt64('01280_db.ssd_dict', 'a', ('unknown', toInt32(0))), dictGetInt32('01280_db.ssd_dict', 'b', ('unknown', toInt32(0))), dictGetString('01280_db.ssd_dict', 'c', ('unknown', toInt32(0)));
-
-SELECT 'DUPLICATE KEYS';
-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;
diff --git a/tests/queries/0_stateless/01293_system_distribution_queue.reference b/tests/queries/0_stateless/01293_system_distribution_queue.reference
index a2c1e5f2a7b..4a51abdb745 100644
--- a/tests/queries/0_stateless/01293_system_distribution_queue.reference
+++ b/tests/queries/0_stateless/01293_system_distribution_queue.reference
@@ -1,6 +1,6 @@
 INSERT
-1	0	1	1
+1	0	1	1	0	0
 FLUSH
-1	0	0	0
+1	0	0	0	0	0
 UNBLOCK
-0	0	0	0
+0	0	0	0	0	0
diff --git a/tests/queries/0_stateless/01293_system_distribution_queue.sql b/tests/queries/0_stateless/01293_system_distribution_queue.sql
index dc63dece960..b16433029bf 100644
--- a/tests/queries/0_stateless/01293_system_distribution_queue.sql
+++ b/tests/queries/0_stateless/01293_system_distribution_queue.sql
@@ -10,15 +10,15 @@ select * from system.distribution_queue;
 select 'INSERT';
 system stop distributed sends dist_01293;
 insert into dist_01293 select * from numbers(10);
-select is_blocked, error_count, data_files, data_compressed_bytes>100 from system.distribution_queue where database = currentDatabase();
+select is_blocked, error_count, data_files, data_compressed_bytes>100, broken_data_files, broken_data_compressed_bytes from system.distribution_queue where database = currentDatabase();
 system flush distributed dist_01293;
 
 select 'FLUSH';
-select is_blocked, error_count, data_files, data_compressed_bytes from system.distribution_queue where database = currentDatabase();
+select is_blocked, error_count, data_files, data_compressed_bytes, broken_data_files, broken_data_compressed_bytes from system.distribution_queue where database = currentDatabase();
 
 select 'UNBLOCK';
 system start distributed sends dist_01293;
-select is_blocked, error_count, data_files, data_compressed_bytes from system.distribution_queue where database = currentDatabase();
+select is_blocked, error_count, data_files, data_compressed_bytes, broken_data_files, broken_data_compressed_bytes from system.distribution_queue where database = currentDatabase();
 
 drop table null_01293;
 drop table dist_01293;
diff --git a/tests/queries/0_stateless/01294_create_settings_profile.reference b/tests/queries/0_stateless/01294_create_settings_profile.reference
index ab1b3833419..da47b084070 100644
--- a/tests/queries/0_stateless/01294_create_settings_profile.reference
+++ b/tests/queries/0_stateless/01294_create_settings_profile.reference
@@ -38,8 +38,12 @@ CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 5000000
 CREATE SETTINGS PROFILE s3_01294 TO ALL
 CREATE SETTINGS PROFILE s4_01294 TO ALL
 CREATE SETTINGS PROFILE s1_01294 SETTINGS max_memory_usage = 6000000
+CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 6000000
+CREATE SETTINGS PROFILE s3_01294 TO ALL
+CREATE SETTINGS PROFILE s4_01294 TO ALL
+CREATE SETTINGS PROFILE s1_01294 SETTINGS max_memory_usage = 6000000
 CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 6000000 TO r1_01294
-CREATE SETTINGS PROFILE s3_01294 SETTINGS max_memory_usage = 6000000 TO r1_01294
+CREATE SETTINGS PROFILE s3_01294 TO r1_01294
 CREATE SETTINGS PROFILE s4_01294 TO r1_01294
 -- readonly ambiguity
 CREATE SETTINGS PROFILE s1_01294 SETTINGS readonly = 1
@@ -53,7 +57,8 @@ s1_01294	local directory	0	0	[]	[]
 s2_01294	local directory	1	0	['r1_01294']	[]
 s3_01294	local directory	1	0	['r1_01294']	[]
 s4_01294	local directory	1	0	['r1_01294']	[]
-s5_01294	local directory	3	1	[]	['r1_01294']
+s5_01294	local directory	3	0	['u1_01294']	[]
+s6_01294	local directory	0	1	[]	['r1_01294','u1_01294']
 -- system.settings_profile_elements
 s2_01294	\N	\N	0	readonly	0	\N	\N	\N	\N
 s3_01294	\N	\N	0	max_memory_usage	5000000	4000000	6000000	1	\N
diff --git a/tests/queries/0_stateless/01294_create_settings_profile.sql b/tests/queries/0_stateless/01294_create_settings_profile.sql
index 9dbabd3f068..b7dd91ad6ed 100644
--- a/tests/queries/0_stateless/01294_create_settings_profile.sql
+++ b/tests/queries/0_stateless/01294_create_settings_profile.sql
@@ -82,7 +82,8 @@ SELECT '-- multiple profiles in one command';
 CREATE PROFILE s1_01294, s2_01294 SETTINGS max_memory_usage=5000000;
 CREATE PROFILE s3_01294, s4_01294 TO ALL;
 SHOW CREATE PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
-ALTER PROFILE s1_01294, s2_01294, s3_01294 SETTINGS max_memory_usage=6000000;
+ALTER PROFILE s1_01294, s2_01294 SETTINGS max_memory_usage=6000000;
+SHOW CREATE PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
 ALTER PROFILE s2_01294, s3_01294, s4_01294 TO r1_01294;
 SHOW CREATE PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
 DROP PROFILE s1_01294, s2_01294, s3_01294, s4_01294;
@@ -107,12 +108,13 @@ CREATE PROFILE s1_01294;
 CREATE PROFILE s2_01294 SETTINGS readonly=0 TO r1_01294;;
 CREATE PROFILE s3_01294 SETTINGS max_memory_usage=5000000 MIN 4000000 MAX 6000000 READONLY TO r1_01294;
 CREATE PROFILE s4_01294 SETTINGS max_memory_usage=5000000 TO r1_01294;
-CREATE PROFILE s5_01294 SETTINGS INHERIT default, readonly=0, max_memory_usage MAX 6000000 WRITABLE TO ALL EXCEPT r1_01294;
+CREATE PROFILE s5_01294 SETTINGS INHERIT default, readonly=0, max_memory_usage MAX 6000000 WRITABLE TO u1_01294;
+CREATE PROFILE s6_01294 TO ALL EXCEPT u1_01294, r1_01294;
 SELECT name, storage, num_elements, apply_to_all, apply_to_list, apply_to_except FROM system.settings_profiles WHERE name LIKE 's%\_01294' ORDER BY name;
 
 SELECT '-- system.settings_profile_elements';
 SELECT * FROM system.settings_profile_elements WHERE profile_name LIKE 's%\_01294' ORDER BY profile_name, index;
-DROP PROFILE s1_01294, s2_01294, s3_01294, s4_01294, s5_01294;
+DROP PROFILE s1_01294, s2_01294, s3_01294, s4_01294, s5_01294, s6_01294;
 
 DROP ROLE r1_01294;
 DROP USER u1_01294;
diff --git a/tests/queries/0_stateless/01300_read_wkt.sql b/tests/queries/0_stateless/01300_read_wkt.sql
index 590305fddae..8121bdf6084 100644
--- a/tests/queries/0_stateless/01300_read_wkt.sql
+++ b/tests/queries/0_stateless/01300_read_wkt.sql
@@ -26,3 +26,5 @@ INSERT INTO geo VALUES ('MULTIPOLYGON(((1 0,10 0,10 10,0 10,1 0),(4 4,5 4,5 5,4
 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;
+
+DROP TABLE geo;
diff --git a/tests/queries/0_stateless/01300_svg.sql b/tests/queries/0_stateless/01300_svg.sql
index 3e70182023b..a1deb1745c3 100644
--- a/tests/queries/0_stateless/01300_svg.sql
+++ b/tests/queries/0_stateless/01300_svg.sql
@@ -46,3 +46,5 @@ 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/01300_wkt.sql b/tests/queries/0_stateless/01300_wkt.sql
index 7047bb698bb..00063d0a612 100644
--- a/tests/queries/0_stateless/01300_wkt.sql
+++ b/tests/queries/0_stateless/01300_wkt.sql
@@ -30,3 +30,5 @@ INSERT INTO geo VALUES ([[[(0, 0), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4),
 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)]]], 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)]]], 3);
 SELECT wkt(p) FROM geo ORDER BY id;
+
+DROP TABLE geo;
diff --git a/tests/queries/0_stateless/01302_polygons_distance.sql b/tests/queries/0_stateless/01302_polygons_distance.sql
index fdbd0254983..a69b5017a5f 100644
--- a/tests/queries/0_stateless/01302_polygons_distance.sql
+++ b/tests/queries/0_stateless/01302_polygons_distance.sql
@@ -6,3 +6,5 @@ drop table if exists polygon_01302;
 create table polygon_01302 (x Array(Array(Array(Tuple(Float64, Float64)))), y Array(Array(Array(Tuple(Float64, Float64))))) engine=Memory();
 insert into polygon_01302 values ([[[(23.725750, 37.971536)]]], [[[(4.3826169, 50.8119483)]]]);
 select polygonsDistanceSpherical(x, y) from polygon_01302;
+
+drop table polygon_01302;
diff --git a/tests/queries/0_stateless/01305_duplicate_order_by_and_distinct.reference b/tests/queries/0_stateless/01305_duplicate_order_by_and_distinct.reference
index c076e56a91b..10f8bbfd392 100644
--- a/tests/queries/0_stateless/01305_duplicate_order_by_and_distinct.reference
+++ b/tests/queries/0_stateless/01305_duplicate_order_by_and_distinct.reference
@@ -1,8 +1,8 @@
 SELECT number
-FROM 
+FROM
 (
     SELECT number
-    FROM 
+    FROM
     (
         SELECT DISTINCT number
         FROM numbers(3)
@@ -13,10 +13,10 @@ ORDER BY number ASC
 1
 2
 SELECT DISTINCT number
-FROM 
+FROM
 (
     SELECT DISTINCT number
-    FROM 
+    FROM
     (
         SELECT DISTINCT number
         FROM numbers(3)
@@ -29,10 +29,10 @@ ORDER BY number ASC
 1
 2
 SELECT number
-FROM 
+FROM
 (
     SELECT number
-    FROM 
+    FROM
     (
         SELECT DISTINCT number % 2 AS number
         FROM numbers(3)
@@ -42,10 +42,10 @@ ORDER BY number ASC
 0
 1
 SELECT DISTINCT number
-FROM 
+FROM
 (
     SELECT DISTINCT number
-    FROM 
+    FROM
     (
         SELECT DISTINCT number % 2 AS number
         FROM numbers(3)
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 01bb9af461c..6248813c9ba 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -8,24 +8,13 @@ set -e
 
 function thread()
 {
-    db_engine=`$CLICKHOUSE_CLIENT -q "SELECT engine FROM system.databases WHERE name='$CLICKHOUSE_DATABASE'"`
-    if [[ $db_engine == "Atomic" ]]; then
-        # Ignore "Replica already exists" exception
-        while true; do
-            $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 NO DELAY;
-                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|is already finished removing by another replica right now|Removing leftovers from table|Another replica was suddenly created|was successfully removed from ZooKeeper|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|already exists'
-            done
-    else
-        while true; do
-            $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1;
-                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|is already finished removing by another replica right now|Removing leftovers from table|Another replica was suddenly created|was successfully removed from ZooKeeper|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time'
-            done
-    fi
+    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'
+    done
 }
 
-
 # https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
 export -f thread;
 
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 a05304c670c..13250e82079 100755
--- a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
+++ b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
@@ -47,7 +47,7 @@ done
 
 echo "$query_result"
 
-$CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$first_mutation_id'"
+$CLICKHOUSE_CLIENT --query "KILL MUTATION WHERE mutation_id='$first_mutation_id' and database='$CLICKHOUSE_DATABASE'"
 
 check_query="SELECT sum(parts_to_do) FROM system.mutations WHERE table='mutation_table' and database='$CLICKHOUSE_DATABASE'"
 
diff --git a/tests/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.reference b/tests/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.reference
index 5eaaf24208e..555593d04bc 100644
--- a/tests/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.reference
+++ b/tests/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.reference
@@ -74,7 +74,7 @@ GROUP BY
     number % 5
 ORDER BY a ASC
 SELECT foo
-FROM 
+FROM
 (
     SELECT number AS foo
     FROM numbers(1)
@@ -155,7 +155,7 @@ GROUP BY
     number % 5
 ORDER BY a ASC
 SELECT foo
-FROM 
+FROM
 (
     SELECT anyLast(number) AS foo
     FROM numbers(1)
diff --git a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
index c8421b9869e..b32ad433730 100644
--- a/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
+++ b/tests/queries/0_stateless/01323_redundant_functions_in_order_by.reference
@@ -16,21 +16,21 @@
 2	2
 3	3
 SELECT groupArray(x)
-FROM 
+FROM
 (
     SELECT number AS x
     FROM numbers(3)
     ORDER BY x ASC
 )
 SELECT groupArray(x)
-FROM 
+FROM
 (
     SELECT number AS x
     FROM numbers(3)
     ORDER BY x ASC
 )
 SELECT groupArray(x)
-FROM 
+FROM
 (
     SELECT number AS x
     FROM numbers(3)
@@ -43,7 +43,7 @@ SELECT
     a,
     b,
     c
-FROM 
+FROM
 (
     SELECT number + 2 AS key
     FROM numbers(4)
@@ -84,7 +84,7 @@ ORDER BY
 2	2
 3	3
 SELECT groupArray(x)
-FROM 
+FROM
 (
     SELECT number AS x
     FROM numbers(3)
@@ -93,7 +93,7 @@ FROM
         exp(x) ASC
 )
 SELECT groupArray(x)
-FROM 
+FROM
 (
     SELECT number AS x
     FROM numbers(3)
@@ -102,7 +102,7 @@ FROM
         exp(exp(x)) ASC
 )
 SELECT groupArray(x)
-FROM 
+FROM
 (
     SELECT number AS x
     FROM numbers(3)
@@ -115,7 +115,7 @@ SELECT
     a,
     b,
     c
-FROM 
+FROM
 (
     SELECT number + 2 AS key
     FROM numbers(4)
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 50ef009dee9..a6d52b39918 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
@@ -23,7 +23,7 @@ set is_done 0
 while {$is_done == 0} {
     send -- "\t"
     expect {
-        "_connections" {
+        "_" {
             set is_done 1
         }
         default {
diff --git a/tests/queries/0_stateless/01372_wrong_order_by_removal.reference b/tests/queries/0_stateless/01372_wrong_order_by_removal.reference
index f1f1bcef6e5..0c4d92a26b9 100644
--- a/tests/queries/0_stateless/01372_wrong_order_by_removal.reference
+++ b/tests/queries/0_stateless/01372_wrong_order_by_removal.reference
@@ -1,7 +1,7 @@
 SELECT
     k,
     groupArrayMovingSum(v)
-FROM 
+FROM
 (
     SELECT
         k,
diff --git a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference
index 44e0be8e356..bb0b1cf658d 100644
--- a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference
+++ b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.reference
@@ -1,4 +1,3 @@
 0
 0
 0
-0
diff --git a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql
index 216f43c4285..c2191d6ab96 100644
--- a/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql
+++ b/tests/queries/0_stateless/01386_negative_float_constant_key_condition.sql
@@ -12,7 +12,7 @@ SETTINGS index_granularity = 8192;
 INSERT INTO t0 VALUES (0, 0);
 
 SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND -1524532316));
-SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND -1.0));
+SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND -1.0)); -- { serverError 70 }
 SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND inf));
 SELECT t0.c1 FROM t0 WHERE NOT (t0.c1 OR (t0.c0 AND nan));
 
diff --git a/tests/queries/0_stateless/01390_remove_injective_in_uniq.reference b/tests/queries/0_stateless/01390_remove_injective_in_uniq.reference
index 94e1dbc5da7..eaff98b39cb 100644
--- a/tests/queries/0_stateless/01390_remove_injective_in_uniq.reference
+++ b/tests/queries/0_stateless/01390_remove_injective_in_uniq.reference
@@ -4,7 +4,7 @@ SELECT
     uniqHLL12(x),
     uniqCombined(x),
     uniqCombined64(x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -15,7 +15,7 @@ SELECT
     uniqHLL12(x + y),
     uniqCombined(x + y),
     uniqCombined64(x + y)
-FROM 
+FROM
 (
     SELECT
         number % 2 AS x,
@@ -28,7 +28,7 @@ SELECT
     uniqHLL12(x),
     uniqCombined(x),
     uniqCombined64(x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -39,7 +39,7 @@ SELECT
     uniqHLL12(x),
     uniqCombined(x),
     uniqCombined64(x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -50,7 +50,7 @@ SELECT
     uniqHLL12(x),
     uniqCombined(x),
     uniqCombined64(x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -61,13 +61,13 @@ SELECT
     uniqHLL12(x),
     uniqCombined(x),
     uniqCombined64(x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
 )
 SELECT uniqExact(x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -80,7 +80,7 @@ SELECT
     uniqHLL12(x),
     uniqCombined(x),
     uniqCombined64(x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -91,7 +91,7 @@ SELECT
     uniqHLL12(x + y),
     uniqCombined(x + y),
     uniqCombined64(x + y)
-FROM 
+FROM
 (
     SELECT
         number % 2 AS x,
@@ -104,7 +104,7 @@ SELECT
     uniqHLL12(-x),
     uniqCombined(-x),
     uniqCombined64(-x)
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -115,7 +115,7 @@ SELECT
     uniqHLL12(bitNot(x)),
     uniqCombined(bitNot(x)),
     uniqCombined64(bitNot(x))
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -126,7 +126,7 @@ SELECT
     uniqHLL12(bitNot(-x)),
     uniqCombined(bitNot(-x)),
     uniqCombined64(bitNot(-x))
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
@@ -137,13 +137,13 @@ SELECT
     uniqHLL12(-bitNot(-x)),
     uniqCombined(-bitNot(-x)),
     uniqCombined64(-bitNot(-x))
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
 )
 SELECT uniqExact(-bitNot(-x))
-FROM 
+FROM
 (
     SELECT number % 2 AS x
     FROM numbers(10)
diff --git a/tests/queries/0_stateless/01399_http_request_headers.reference b/tests/queries/0_stateless/01399_http_request_headers.reference
index 99ba2b1787f..90a10a9818d 100644
--- a/tests/queries/0_stateless/01399_http_request_headers.reference
+++ b/tests/queries/0_stateless/01399_http_request_headers.reference
@@ -1,4 +1,5 @@
 1
+1
 Code: 516
 1
 Code: 516
diff --git a/tests/queries/0_stateless/01399_http_request_headers.sh b/tests/queries/0_stateless/01399_http_request_headers.sh
index 9b07f018230..f06e7ffc32b 100755
--- a/tests/queries/0_stateless/01399_http_request_headers.sh
+++ b/tests/queries/0_stateless/01399_http_request_headers.sh
@@ -4,6 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'EmptyHeader;' -d 'SELECT 1'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'X-ClickHouse-User: default' -d 'SELECT 1'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'X-ClickHouse-User: header_test' -d 'SELECT 1' | grep -o 'Code: 516'
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'X-ClickHouse-Key: ' -d 'SELECT 1'
diff --git a/tests/queries/0_stateless/01412_row_from_totals.sql b/tests/queries/0_stateless/01412_row_from_totals.sql
index 170eb06721a..63c2a111369 100644
--- a/tests/queries/0_stateless/01412_row_from_totals.sql
+++ b/tests/queries/0_stateless/01412_row_from_totals.sql
@@ -11,7 +11,7 @@ insert into tracking_events_tmp select 2, '2020-07-10' from numbers(1881);
 insert into tracking_events_tmp select 2, '2020-07-11' from numbers(1623);
 
 SELECT EventDate
-FROM 
+FROM
 (
     SELECT EventDate
     FROM tracking_events_tmp AS t1
diff --git a/tests/queries/0_stateless/01414_mutations_and_errors.reference b/tests/queries/0_stateless/01414_mutations_and_errors.reference
index 166a9c6b7b8..a1edd6ab649 100644
--- a/tests/queries/0_stateless/01414_mutations_and_errors.reference
+++ b/tests/queries/0_stateless/01414_mutations_and_errors.reference
@@ -1,4 +1,5 @@
 42
 Hello
+waiting	default	mutation_table	mutation_3.txt	MODIFY COLUMN `value` UInt64
 42
 Hello
diff --git a/tests/queries/0_stateless/01414_push_predicate_when_contains_with_clause.reference b/tests/queries/0_stateless/01414_push_predicate_when_contains_with_clause.reference
index 13c8fe551c7..bbda231662e 100644
--- a/tests/queries/0_stateless/01414_push_predicate_when_contains_with_clause.reference
+++ b/tests/queries/0_stateless/01414_push_predicate_when_contains_with_clause.reference
@@ -3,7 +3,7 @@
 SELECT
     number,
     square_number
-FROM 
+FROM
 (
     WITH number * 2 AS square_number
     SELECT
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 7f276d1f8d4..7d0993c1bfc 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 6 }
+SELECT '-1E9-1E9-1E9-1E9' AS x, toDecimal32(x, 0); -- { serverError 72 }
 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/01445_create_table_as_table_function.sh b/tests/queries/0_stateless/01445_create_table_as_table_function.sh
index f963c700779..6df5b7d70d1 100755
--- a/tests/queries/0_stateless/01445_create_table_as_table_function.sh
+++ b/tests/queries/0_stateless/01445_create_table_as_table_function.sh
@@ -6,6 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
+# NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE system.columns AS numbers(10);" 2>&1 | grep -F "Code: 57" > /dev/null && echo 'OK' || echo 'FAIL'
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE system.columns engine=Memory AS numbers(10);" 2>&1 | grep -F "Code: 62" > /dev/null && echo 'OK' || echo 'FAIL'
 ${CLICKHOUSE_CLIENT} --query "CREATE TABLE system.columns AS numbers(10) engine=Memory;" 2>&1 | grep -F "Code: 62" > /dev/null && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/01451_detach_drop_part.sql b/tests/queries/0_stateless/01451_detach_drop_part.sql
index d70f4e37de4..a285730e45f 100644
--- a/tests/queries/0_stateless/01451_detach_drop_part.sql
+++ b/tests/queries/0_stateless/01451_detach_drop_part.sql
@@ -15,13 +15,13 @@ ALTER TABLE mt_01451 DETACH PART 'all_2_2_0';
 
 SELECT v FROM mt_01451 ORDER BY v;
 
-SELECT name FROM system.detached_parts WHERE table = 'mt_01451';
+SELECT name FROM system.detached_parts WHERE table = 'mt_01451' AND database = currentDatabase();
 
 ALTER TABLE mt_01451 ATTACH PART 'all_2_2_0';
 
 SELECT v FROM mt_01451 ORDER BY v;
 
-SELECT name FROM system.detached_parts WHERE table = 'mt_01451';
+SELECT name FROM system.detached_parts WHERE table = 'mt_01451' AND database = currentDatabase();
 
 SELECT '-- drop part --';
 
@@ -37,6 +37,6 @@ OPTIMIZE TABLE mt_01451 FINAL;
 
 SELECT v FROM mt_01451 ORDER BY v;
 
-SELECT name FROM system.parts WHERE table = 'mt_01451' AND active;
+SELECT name FROM system.parts WHERE table = 'mt_01451' AND active AND database = currentDatabase();
 
 DROP TABLE mt_01451;
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_part.reference b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01451_replicated_detach_drop_part.reference
rename to tests/queries/0_stateless/01451_replicated_detach_drop_part_long.reference
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_part.sql b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
similarity index 69%
rename from tests/queries/0_stateless/01451_replicated_detach_drop_part.sql
rename to tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
index 3cd9fc7bc7e..cd8267ce59a 100644
--- a/tests/queries/0_stateless/01451_replicated_detach_drop_part.sql
+++ b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
@@ -3,8 +3,8 @@ 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/attach', 'r1') order by tuple() settings max_replicated_merges_in_queue = 0;
-CREATE TABLE replica2 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/01451/attach', 'r2') order by tuple() settings max_replicated_merges_in_queue = 0;
+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;
 
 INSERT INTO replica1 VALUES (0);
 INSERT INTO replica1 VALUES (1);
@@ -19,14 +19,14 @@ ALTER TABLE replica2 DETACH PART 'all_1_1_0';
 
 SELECT v FROM replica1 ORDER BY v;
 
-SELECT name FROM system.detached_parts WHERE table = 'replica2';
+SELECT name FROM system.detached_parts WHERE table = 'replica2' AND database = currentDatabase();
 
 ALTER TABLE replica2 ATTACH PART 'all_1_1_0';
 
 SYSTEM SYNC REPLICA replica1;
 SELECT v FROM replica1 ORDER BY v;
 
-SELECT name FROM system.detached_parts WHERE table = 'replica2';
+SELECT name FROM system.detached_parts WHERE table = 'replica2' AND database = currentDatabase();
 
 SELECT '-- drop part --';
 
@@ -43,7 +43,7 @@ OPTIMIZE TABLE replica1 FINAL;
 
 SELECT v FROM replica1 ORDER BY v;
 
-SELECT name FROM system.parts WHERE table = 'replica2' AND active;
+SELECT name FROM system.parts WHERE table = 'replica2' AND active AND database = currentDatabase();
 
 DROP TABLE replica1;
 DROP TABLE replica2;
diff --git a/tests/queries/0_stateless/01455_duplicate_distinct_optimization.reference b/tests/queries/0_stateless/01455_duplicate_distinct_optimization.reference
index 2c54899f9f5..82e887e1b92 100644
--- a/tests/queries/0_stateless/01455_duplicate_distinct_optimization.reference
+++ b/tests/queries/0_stateless/01455_duplicate_distinct_optimization.reference
@@ -1,13 +1,13 @@
 SELECT DISTINCT number
 FROM numbers(1)
 SELECT number
-FROM 
+FROM
 (
     SELECT DISTINCT number
     FROM numbers(1)
 )
 SELECT DISTINCT number * 2
-FROM 
+FROM
 (
     SELECT DISTINCT
         number * 2,
@@ -15,7 +15,7 @@ FROM
     FROM numbers(1)
 )
 SELECT number
-FROM 
+FROM
 (
     SELECT DISTINCT number * 2 AS number
     FROM numbers(1)
@@ -23,7 +23,7 @@ FROM
 SELECT
     b,
     a
-FROM 
+FROM
 (
     SELECT DISTINCT
         number % 2 AS a,
@@ -31,7 +31,7 @@ FROM
     FROM numbers(100)
 )
 SELECT DISTINCT a
-FROM 
+FROM
 (
     SELECT DISTINCT
         number % 2 AS a,
@@ -39,10 +39,10 @@ FROM
     FROM numbers(100)
 )
 SELECT a
-FROM 
+FROM
 (
     SELECT DISTINCT a
-    FROM 
+    FROM
     (
         SELECT DISTINCT
             number % 2 AS a,
@@ -51,12 +51,12 @@ FROM
     )
 )
 SELECT DISTINCT a
-FROM 
+FROM
 (
     SELECT
         a,
         b
-    FROM 
+    FROM
     (
         SELECT DISTINCT
             number % 2 AS a,
@@ -67,12 +67,12 @@ FROM
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT
         b,
         a
-    FROM 
+    FROM
     (
         SELECT DISTINCT
             number AS a,
@@ -83,13 +83,13 @@ FROM
 SELECT
     a,
     b
-FROM 
+FROM
 (
     SELECT
         b,
         a,
         a + b
-    FROM 
+    FROM
     (
         SELECT DISTINCT
             number % 2 AS a,
@@ -98,10 +98,10 @@ FROM
     )
 )
 SELECT DISTINCT a
-FROM 
+FROM
 (
     SELECT a
-    FROM 
+    FROM
     (
         SELECT DISTINCT
             number % 2 AS a,
@@ -110,21 +110,21 @@ FROM
     )
 )
 SELECT DISTINCT number
-FROM 
+FROM
 (
     SELECT DISTINCT number
     FROM numbers(1)
 ) AS t1
 CROSS JOIN numbers(2) AS t2
 SELECT number
-FROM 
+FROM
 (
     SELECT DISTINCT number
     FROM numbers(1) AS t1
     CROSS JOIN numbers(2) AS t2
 )
 SELECT DISTINCT number
-FROM 
+FROM
 (
     SELECT DISTINCT number
     FROM numbers(1)
diff --git a/tests/queries/0_stateless/01461_query_start_time_microseconds.sql b/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
index 678b9b3d85e..be1d9897053 100644
--- a/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
+++ b/tests/queries/0_stateless/01461_query_start_time_microseconds.sql
@@ -7,6 +7,8 @@ WITH (
           SELECT query_start_time_microseconds
           FROM system.query_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS time_with_microseconds,
@@ -14,6 +16,8 @@ WITH (
           SELECT query_start_time
           FROM system.query_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS t)
@@ -27,6 +31,8 @@ WITH (
           SELECT query_start_time_microseconds
           FROM system.query_thread_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS time_with_microseconds,
@@ -34,6 +40,8 @@ WITH (
           SELECT query_start_time
           FROM system.query_thread_log
           WHERE current_database = currentDatabase()
+            AND query like 'SELECT \'01461_query%'
+            AND event_date >= yesterday()
           ORDER BY query_start_time DESC
           LIMIT 1
       ) AS t)
diff --git a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
index 0612b4ca23e..ac4d0a3d21a 100644
--- a/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
+++ b/tests/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
@@ -19,17 +19,17 @@
 1	\N	l	Nullable(String)	LowCardinality(String)
 -
 1	l	\N	LowCardinality(String)	Nullable(String)
-2		\N	LowCardinality(String)	Nullable(String)
-1	l	\N	LowCardinality(String)	Nullable(String)
-2		\N	LowCardinality(String)	Nullable(String)
+2	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
+1	l	\N	LowCardinality(Nullable(String))	Nullable(String)
+2	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
 -
-\N	\N		Nullable(String)	LowCardinality(String)
+\N	\N	\N	Nullable(String)	LowCardinality(Nullable(String))
 1	\N	l	Nullable(String)	LowCardinality(String)
-1	\N	l	Nullable(String)	LowCardinality(String)
-\N	\N		Nullable(String)	LowCardinality(String)
+1	\N	l	Nullable(String)	LowCardinality(Nullable(String))
+\N	\N	\N	Nullable(String)	LowCardinality(Nullable(String))
 -
 1	l	\N	LowCardinality(String)	Nullable(String)
-\N		\N	LowCardinality(String)	Nullable(String)
-1	l	\N	LowCardinality(String)	Nullable(String)
-\N		\N	LowCardinality(String)	Nullable(String)
+\N	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
+1	l	\N	LowCardinality(Nullable(String))	Nullable(String)
+\N	\N	\N	LowCardinality(Nullable(String))	Nullable(String)
 -
diff --git a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference
index b2c3ea56b7f..4261ccd8a1f 100644
--- a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference
+++ b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.reference
@@ -5,3 +5,5 @@
 1
 0	1
 0	1
+1	0
+1
diff --git a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql
index a6678ca9040..68b4e7d4015 100644
--- a/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql
+++ b/tests/queries/0_stateless/01483_merge_table_join_and_group_by.sql
@@ -17,6 +17,9 @@ SELECT ID FROM m INNER JOIN b USING(key) GROUP BY ID;
 SELECT * FROM m INNER JOIN b USING(key) WHERE ID = 1 HAVING ID = 1 ORDER BY ID;
 SELECT * FROM m INNER JOIN b USING(key) WHERE ID = 1 GROUP BY ID, key HAVING ID = 1 ORDER BY ID;
 
+SELECT sum(b.ID), sum(m.key) FROM m FULL JOIN b ON (m.key == b.key) GROUP BY key;
+SELECT sum(b.ID + m.key) FROM m FULL JOIN b ON (m.key == b.key) GROUP BY key;
+
 DROP TABLE IF EXISTS a;
 DROP TABLE IF EXISTS b;
 DROP TABLE IF EXISTS m;
diff --git a/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference b/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
index 6a713b14181..c83f681fc54 100644
--- a/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
+++ b/tests/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
@@ -1,5 +1,5 @@
 0	0
-WITH it AS 
+WITH it AS
     (
         SELECT *
         FROM numbers(1)
@@ -7,4 +7,5 @@ WITH it AS
 SELECT
     number,
     number
-FROM it AS i
+FROM
+it AS i
diff --git a/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.reference b/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.reference
index 5aaf21f9137..29777b0c05c 100644
--- a/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.reference
+++ b/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.reference
@@ -8,7 +8,9 @@
 3	3
 4	4
 5	5
+5
 2	2
 3	3
 4	4
 5	5
+4
diff --git a/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.sql b/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.sql
index 408487ed205..0e2861b8e94 100644
--- a/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.sql
+++ b/tests/queries/0_stateless/01497_mutation_support_for_storage_memory.sql
@@ -13,8 +13,12 @@ ALTER TABLE defaults UPDATE n = 100 WHERE s = '1';
 
 SELECT * FROM defaults;
 
+SELECT count(*) FROM defaults;
+
 ALTER TABLE defaults DELETE WHERE n = 100;
 
 SELECT * FROM defaults;
 
+SELECT count(*) FROM defaults;
+
 DROP TABLE defaults;
diff --git a/tests/queries/0_stateless/01504_rocksdb.sql b/tests/queries/0_stateless/01504_rocksdb.sql
index 0e1917a95f2..9e30263c6b3 100644
--- a/tests/queries/0_stateless/01504_rocksdb.sql
+++ b/tests/queries/0_stateless/01504_rocksdb.sql
@@ -1,47 +1,46 @@
-DROP TABLE IF EXISTS test;
+DROP TABLE IF EXISTS 01504_test;
 
-CREATE TABLE test (key String, value UInt32) Engine=EmbeddedRocksDB; -- { serverError 36 }
-CREATE TABLE test (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key2); -- { serverError 47 }
-CREATE TABLE test (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key, value); -- { serverError 36 }
-CREATE TABLE test (key Tuple(String, UInt32), value UInt64) Engine=EmbeddedRocksDB PRIMARY KEY(key);
+CREATE TABLE 01504_test (key String, value UInt32) Engine=EmbeddedRocksDB; -- { serverError 36 }
+CREATE TABLE 01504_test (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key2); -- { serverError 47 }
+CREATE TABLE 01504_test (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key, value); -- { serverError 36 }
+CREATE TABLE 01504_test (key Tuple(String, UInt32), value UInt64) Engine=EmbeddedRocksDB PRIMARY KEY(key);
 
-DROP TABLE IF EXISTS test;
-CREATE TABLE test (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key);
+DROP TABLE IF EXISTS 01504_test;
+CREATE TABLE 01504_test (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key);
 
-INSERT INTO test SELECT '1_1', number FROM numbers(10000);
-SELECT COUNT(1) == 1 FROM test;
+INSERT INTO 01504_test SELECT '1_1', number FROM numbers(10000);
+SELECT COUNT(1) == 1 FROM 01504_test;
 
-INSERT INTO test SELECT concat(toString(number), '_1'), number FROM numbers(10000);
-SELECT COUNT(1) == 10000 FROM test;
-SELECT uniqExact(key) == 32 FROM (SELECT * FROM test LIMIT 32 SETTINGS max_block_size = 1);
-SELECT SUM(value) == 1 + 99 + 900 FROM test WHERE key IN ('1_1', '99_1', '900_1');
+INSERT INTO 01504_test SELECT concat(toString(number), '_1'), number FROM numbers(10000);
+SELECT COUNT(1) == 10000 FROM 01504_test;
+SELECT uniqExact(key) == 32 FROM (SELECT * FROM 01504_test LIMIT 32 SETTINGS max_block_size = 1);
+SELECT SUM(value) == 1 + 99 + 900 FROM 01504_test WHERE key IN ('1_1', '99_1', '900_1');
 
 
-DROP TABLE IF EXISTS test;
-DROP TABLE IF EXISTS test_memory;
+DROP TABLE IF EXISTS 01504_test;
+DROP TABLE IF EXISTS 01504_test_memory;
 
-CREATE TABLE test (k UInt32, value UInt64, dummy Tuple(UInt32, Float64), bm AggregateFunction(groupBitmap, UInt64)) Engine=EmbeddedRocksDB PRIMARY KEY(k);
-CREATE TABLE test_memory AS test Engine = Memory;
+CREATE TABLE 01504_test (k UInt32, value UInt64, dummy Tuple(UInt32, Float64), bm AggregateFunction(groupBitmap, UInt64)) Engine=EmbeddedRocksDB PRIMARY KEY(k);
+CREATE TABLE 01504_test_memory AS 01504_test Engine = Memory;
 
-INSERT INTO test SELECT number % 77 AS k, SUM(number) AS value, (1, 1.2), bitmapBuild(groupArray(number)) FROM numbers(10000000) group by k;
+INSERT INTO 01504_test SELECT number % 77 AS k, SUM(number) AS value, (1, 1.2), bitmapBuild(groupArray(number)) FROM numbers(10000000) group by k;
 
-INSERT INTO test_memory SELECT number % 77 AS k, SUM(number) AS value, (1, 1.2), bitmapBuild(groupArray(number)) FROM numbers(10000000) group by k;
+INSERT INTO 01504_test_memory SELECT number % 77 AS k, SUM(number) AS value, (1, 1.2), bitmapBuild(groupArray(number)) FROM numbers(10000000) group by k;
 
 
-SELECT  A.a = B.a, A.b = B.b, A.c = B.c, A.d = B.d, A.e = B.e FROM ( SELECT 0 AS a, groupBitmapMerge(bm) AS b , SUM(k) AS c, SUM(value) AS d, SUM(dummy.1) AS e FROM test) A  ANY LEFT JOIN  (SELECT 0 AS a, groupBitmapMerge(bm) AS b , SUM(k) AS c, SUM(value) AS d, SUM(dummy.1) AS e FROM test_memory) B USING a ORDER BY a;
+SELECT  A.a = B.a, A.b = B.b, A.c = B.c, A.d = B.d, A.e = B.e FROM ( SELECT 0 AS a, groupBitmapMerge(bm) AS b , SUM(k) AS c, SUM(value) AS d, SUM(dummy.1) AS e FROM 01504_test) A  ANY LEFT JOIN  (SELECT 0 AS a, groupBitmapMerge(bm) AS b , SUM(k) AS c, SUM(value) AS d, SUM(dummy.1) AS e FROM 01504_test_memory) B USING a ORDER BY a;
 
 CREATE TEMPORARY TABLE keys AS SELECT * FROM numbers(1000);
 
 SET max_rows_to_read = 2;
-SELECT dummy == (1,1.2) FROM test WHERE k IN (1, 3) OR k IN (1) OR k IN (3, 1) OR k IN [1] OR k IN [1, 3] ;
-SELECT k == 4 FROM test WHERE k = 4 OR k IN [4] OR k in (4, 10000001, 10000002) AND value > 0;
-SELECT k == 4 FROM test WHERE k IN (SELECT toUInt32(number) FROM keys WHERE number = 4);
-SELECT k, value FROM test WHERE k = 0 OR value > 0; -- { serverError 158 }
-SELECT k, value FROM test WHERE k = 0 AND k IN (1, 3) OR k > 8; -- { serverError 158 }
+SELECT dummy == (1,1.2) FROM 01504_test WHERE k IN (1, 3) OR k IN (1) OR k IN (3, 1) OR k IN [1] OR k IN [1, 3] ;
+SELECT k == 4 FROM 01504_test WHERE k = 4 OR k IN [4] OR k in (4, 10000001, 10000002) AND value > 0;
+SELECT k == 4 FROM 01504_test WHERE k IN (SELECT toUInt32(number) FROM keys WHERE number = 4);
+SELECT k, value FROM 01504_test WHERE k = 0 OR value > 0; -- { serverError 158 }
+SELECT k, value FROM 01504_test WHERE k = 0 AND k IN (1, 3) OR k > 8; -- { serverError 158 }
 
-TRUNCATE TABLE test;
-SELECT 0 == COUNT(1) FROM test;
-
-DROP TABLE IF EXISTS test;
-DROP TABLE IF EXISTS test_memory;
+TRUNCATE TABLE 01504_test;
+SELECT 0 == COUNT(1) FROM 01504_test;
 
+DROP TABLE IF EXISTS 01504_test;
+DROP TABLE IF EXISTS 01504_test_memory;
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.reference b/tests/queries/0_stateless/01508_partition_pruning_long.reference
index 70f529c6058..334ecb63164 100644
--- a/tests/queries/0_stateless/01508_partition_pruning_long.reference
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.reference
@@ -5,11 +5,11 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from tMM where toDate(d)=toDate('2020-09-01');
 2	2880
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toDate(d)=toDate('2020-10-15');
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toDate(d)='2020-09-15';
 0	0
@@ -17,27 +17,27 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)=202009;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMMDD(d)=20200816;
 2	2880
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMMDD(d)=20201015;
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toDate(d)='2020-10-15';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where d >= '2020-09-01 00:00:00' and d<'2020-10-15 00:00:00';
 3	15000
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where d >= '2020-01-16 00:00:00' and d < toDateTime('2021-08-17 00:00:00');
 6	30000
-Selected 6/6 parts by partition key, 6 parts by primary key, 6/12 marks by primary key, 6 marks to read from 6 ranges
+Selected 6/6 parts by partition key, 6 parts by primary key, 6/6 marks by primary key, 6 marks to read from 6 ranges
 
 select uniqExact(_part), count() from tMM where d >= '2020-09-16 00:00:00' and d < toDateTime('2020-10-01 00:00:00');
 0	0
@@ -45,117 +45,117 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from tMM where d >= '2020-09-12 00:00:00' and d < '2020-10-16 00:00:00';
 2	6440
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) >= '2020-09-12 00:00:00';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) = '2020-09-01 00:00:00';
 2	2880
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) = '2020-10-01 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfDay(d) >= '2020-09-15 00:00:00' and d < '2020-10-16 00:00:00';
 2	6440
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202010;
 4	20000
-Selected 4/6 parts by partition key, 4 parts by primary key, 4/8 marks by primary key, 4 marks to read from 4 ranges
+Selected 4/6 parts by partition key, 4 parts by primary key, 4/4 marks by primary key, 4 marks to read from 4 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202009;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202010 and toStartOfDay(d) = '2020-10-01 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) >= 202009 and toStartOfDay(d) < '2020-10-02 00:00:00';
 3	11440
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) > 202009 and toStartOfDay(d) < '2020-10-02 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202009 and toStartOfDay(d) < '2020-10-02 00:00:00';
 3	11440
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202010 and toStartOfDay(d) < '2020-10-02 00:00:00';
 1	1440
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202010;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d-1)+1 = 202010;
 3	9999
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfMonth(d) >= '2020-09-15';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfMonth(d) >= '2020-09-01';
 4	20000
-Selected 4/6 parts by partition key, 4 parts by primary key, 4/8 marks by primary key, 4 marks to read from 4 ranges
+Selected 4/6 parts by partition key, 4 parts by primary key, 4/4 marks by primary key, 4 marks to read from 4 ranges
 
 select uniqExact(_part), count() from tMM where toStartOfMonth(d) >= '2020-09-01' and toStartOfMonth(d) < '2020-10-01';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d-1)+1 = 202010;
 2	9999
-Selected 2/3 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/3 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d)+1 > 202010;
 1	10000
-Selected 1/3 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/3 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from tMM where toYYYYMM(d) between 202009 and 202010;
 2	20000
-Selected 2/3 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/3 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 --------- tDD ----------------------------
 select uniqExact(_part), count() from tDD where toDate(d)=toDate('2020-09-24');
 1	10000
-Selected 1/4 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/4 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toDate(d) = toDate('2020-09-24');
 1	10000
-Selected 1/4 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/4 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toDate(d) = '2020-09-24';
 1	10000
-Selected 1/4 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/4 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toDate(d) >= '2020-09-23' and toDate(d) <= '2020-09-26';
 3	40000
-Selected 3/4 parts by partition key, 3 parts by primary key, 4/7 marks by primary key, 4 marks to read from 3 ranges
+Selected 3/4 parts by partition key, 3 parts by primary key, 4/4 marks by primary key, 4 marks to read from 3 ranges
 
 select uniqExact(_part), count() FROM tDD WHERE toYYYYMMDD(d) >= 20200923 and toDate(d) <= '2020-09-26';
 3	40000
-Selected 3/4 parts by partition key, 3 parts by primary key, 4/7 marks by primary key, 4 marks to read from 3 ranges
+Selected 3/4 parts by partition key, 3 parts by primary key, 4/4 marks by primary key, 4 marks to read from 3 ranges
 
 --------- sDD ----------------------------
 select uniqExact(_part), count() from sDD;
 6	30000
-Selected 6/6 parts by partition key, 6 parts by primary key, 6/12 marks by primary key, 6 marks to read from 6 ranges
+Selected 6/6 parts by partition key, 6 parts by primary key, 6/6 marks by primary key, 6 marks to read from 6 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1)+1 = 202010;
 3	9999
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1) = 202010;
 2	9999
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1) = 202110;
 0	0
@@ -163,52 +163,52 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC'))+1 > 202009 and toStartOfDay(toDateTime(intDiv(d,1000),'UTC')) < toDateTime('2020-10-02 00:00:00','UTC');
 3	11440
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from sDD where toYYYYMM(toDateTime(intDiv(d,1000),'UTC'))+1 > 202009 and toDateTime(intDiv(d,1000),'UTC') < toDateTime('2020-10-01 00:00:00','UTC');
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from sDD where d >= 1598918400000;
 4	20000
-Selected 4/6 parts by partition key, 4 parts by primary key, 4/8 marks by primary key, 4 marks to read from 4 ranges
+Selected 4/6 parts by partition key, 4 parts by primary key, 4/4 marks by primary key, 4 marks to read from 4 ranges
 
 select uniqExact(_part), count() from sDD where d >= 1598918400000 and toYYYYMM(toDateTime(intDiv(d,1000),'UTC')-1) < 202010;
 3	10001
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 --------- xMM ----------------------------
 select uniqExact(_part), count() from xMM where toStartOfDay(d) >= '2020-10-01 00:00:00';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00';
 3	10001
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-10-01 00:00:00';
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00' and a=1;
 1	1
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00' and a<>3;
 2	5001
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-10-01 00:00:00' and a<>3;
 1	5000
-Selected 1/6 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/6 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-11-01 00:00:00' and a = 1;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where a = 1;
 3	15000
-Selected 3/6 parts by partition key, 3 parts by primary key, 3/6 marks by primary key, 3 marks to read from 3 ranges
+Selected 3/6 parts by partition key, 3 parts by primary key, 3/3 marks by primary key, 3 marks to read from 3 ranges
 
 select uniqExact(_part), count() from xMM where a = 66;
 0	0
@@ -216,29 +216,29 @@ Selected 0/6 parts by partition key, 0 parts by primary key, 0/0 marks by primar
 
 select uniqExact(_part), count() from xMM where a <> 66;
 6	30000
-Selected 6/6 parts by partition key, 6 parts by primary key, 6/12 marks by primary key, 6 marks to read from 6 ranges
+Selected 6/6 parts by partition key, 6 parts by primary key, 6/6 marks by primary key, 6 marks to read from 6 ranges
 
 select uniqExact(_part), count() from xMM where a = 2;
 2	10000
-Selected 2/6 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/6 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where a = 1;
 2	15000
-Selected 2/5 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/5 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where toStartOfDay(d) >= '2020-10-01 00:00:00';
 1	10000
-Selected 1/5 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/5 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
 select uniqExact(_part), count() from xMM where a <> 66;
 5	30000
-Selected 5/5 parts by partition key, 5 parts by primary key, 5/10 marks by primary key, 5 marks to read from 5 ranges
+Selected 5/5 parts by partition key, 5 parts by primary key, 5/5 marks by primary key, 5 marks to read from 5 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d <= '2020-10-01 00:00:00' and a<>3;
 2	5001
-Selected 2/5 parts by partition key, 2 parts by primary key, 2/4 marks by primary key, 2 marks to read from 2 ranges
+Selected 2/5 parts by partition key, 2 parts by primary key, 2/2 marks by primary key, 2 marks to read from 2 ranges
 
 select uniqExact(_part), count() from xMM where d >= '2020-09-01 00:00:00' and d < '2020-10-01 00:00:00' and a<>3;
 1	5000
-Selected 1/5 parts by partition key, 1 parts by primary key, 1/2 marks by primary key, 1 marks to read from 1 ranges
+Selected 1/5 parts by partition key, 1 parts by primary key, 1/1 marks by primary key, 1 marks to read from 1 ranges
 
diff --git a/tests/queries/0_stateless/01509_dictionary_preallocate.reference b/tests/queries/0_stateless/01509_dictionary_preallocate.reference
index b072d6673db..2f1e1d2c386 100644
--- a/tests/queries/0_stateless/01509_dictionary_preallocate.reference
+++ b/tests/queries/0_stateless/01509_dictionary_preallocate.reference
@@ -1,4 +1,9 @@
-CREATE DICTIONARY db_01509.dict\n(\n    `key` UInt64,\n    `value` String DEFAULT \'-\'\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT tcpPort() USER \'default\' TABLE \'data\' PASSWORD \'\' DB \'db_01509\'))\nLIFETIME(MIN 0 MAX 0)\nLAYOUT(SPARSE_HASHED())
+CREATE DICTIONARY default.dict_01509\n(\n    `key` UInt64,\n    `value` String DEFAULT \'-\'\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT tcpPort() TABLE \'data_01509\'))\nLIFETIME(MIN 0 MAX 0)\nLAYOUT(SPARSE_HASHED(PREALLOCATE 0))
+CREATE DICTIONARY default.dict_01509_preallocate\n(\n    `key` UInt64,\n    `value` String DEFAULT \'-\'\n)\nPRIMARY KEY key\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT tcpPort() TABLE \'data_01509\'))\nLIFETIME(MIN 0 MAX 0)\nLAYOUT(SPARSE_HASHED(PREALLOCATE 1))
+HashedDictionary: Preallocated 10000 elements
 -
 0
-1000
+10000
+-
+0
+10000
diff --git a/tests/queries/0_stateless/01509_dictionary_preallocate.sh b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
new file mode 100755
index 00000000000..f2bc17d2e90
--- /dev/null
+++ b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+# shellcheck disable=SC2031
+# shellcheck disable=SC2030
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "
+    DROP TABLE IF EXISTS data_01509;
+    DROP DICTIONARY IF EXISTS dict_01509;
+    DROP DICTIONARY IF EXISTS dict_01509_preallocate;
+
+    CREATE TABLE data_01509
+    (
+      key   UInt64,
+      value String
+    )
+    ENGINE = MergeTree()
+    ORDER BY key;
+    INSERT INTO data_01509 SELECT number key, toString(number) value FROM numbers(10e3);
+"
+
+# regular
+$CLICKHOUSE_CLIENT -nm -q "
+    CREATE DICTIONARY dict_01509
+    (
+      key   UInt64,
+      value String DEFAULT '-'
+    )
+    PRIMARY KEY key
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'data_01509'))
+    LAYOUT(SPARSE_HASHED(PREALLOCATE 0))
+    LIFETIME(0);
+    SHOW CREATE DICTIONARY dict_01509;
+"
+(
+    # start new shell to avoid overriding variables for other client invocation
+    CLICKHOUSE_CLIENT=${CLICKHOUSE_CLIENT/--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}/--send_logs_level=trace}
+    $CLICKHOUSE_CLIENT -nm -q "SYSTEM RELOAD DICTIONARY dict_01509" |& grep -o "HashedDictionary.*"
+)
+
+# with preallocation
+$CLICKHOUSE_CLIENT -nm -q "
+    CREATE DICTIONARY dict_01509_preallocate
+    (
+      key   UInt64,
+      value String DEFAULT '-'
+    )
+    PRIMARY KEY key
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'data_01509'))
+    LAYOUT(SPARSE_HASHED(PREALLOCATE 1))
+    LIFETIME(0);
+    SHOW CREATE DICTIONARY dict_01509_preallocate;
+    SYSTEM RELOAD DICTIONARY dict_01509_preallocate;
+"
+(
+    # start new shell to avoid overriding variables for other client invocation
+    CLICKHOUSE_CLIENT=${CLICKHOUSE_CLIENT/--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}/--send_logs_level=trace}
+    $CLICKHOUSE_CLIENT -nm -q "SYSTEM RELOAD DICTIONARY dict_01509_preallocate" |& grep -o "HashedDictionary.*"
+)
+
+$CLICKHOUSE_CLIENT -nm -q "
+    SELECT dictGet('dict_01509', 'value', toUInt64(1e12));
+    SELECT dictGet('dict_01509', 'value', toUInt64(0));
+    SELECT count() FROM dict_01509;
+
+    SELECT dictGet('dict_01509_preallocate', 'value', toUInt64(1e12));
+    SELECT dictGet('dict_01509_preallocate', 'value', toUInt64(0));
+    SELECT count() FROM dict_01509_preallocate;
+"
+
+$CLICKHOUSE_CLIENT -nm -q "
+    DROP TABLE data_01509;
+    DROP DICTIONARY dict_01509;
+    DROP DICTIONARY dict_01509_preallocate;
+"
diff --git a/tests/queries/0_stateless/01509_dictionary_preallocate.sql b/tests/queries/0_stateless/01509_dictionary_preallocate.sql
deleted file mode 100644
index c5ed0e1fbde..00000000000
--- a/tests/queries/0_stateless/01509_dictionary_preallocate.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- The test itself does not test does preallocation works
--- It simply check SPARSE_HASHED dictionary with bunch of dictGet()
--- (since at the moment of writing there were no such test)
-
-DROP DATABASE IF EXISTS db_01509;
-CREATE DATABASE db_01509;
-
-CREATE TABLE db_01509.data
-(
-  key   UInt64,
-  value String
-)
-ENGINE = MergeTree()
-ORDER BY key;
-INSERT INTO db_01509.data SELECT number key, toString(number) value FROM numbers(1000);
-
-DROP DICTIONARY IF EXISTS db_01509.dict;
-CREATE DICTIONARY db_01509.dict
-(
-  key   UInt64,
-  value String DEFAULT '-'
-)
-PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'data' PASSWORD '' DB 'db_01509'))
-LAYOUT(SPARSE_HASHED())
-LIFETIME(0);
-
-SHOW CREATE DICTIONARY db_01509.dict;
-
-SYSTEM RELOAD DICTIONARY db_01509.dict;
-
-SELECT dictGet('db_01509.dict', 'value', toUInt64(1e12));
-SELECT dictGet('db_01509.dict', 'value', toUInt64(0));
-SELECT count() FROM db_01509.dict;
-
-DROP DATABASE IF EXISTS db_01509;
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.sql
index 1b680cf26c1..16c4a4df936 100644
--- a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
+++ b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
@@ -1,16 +1,16 @@
-DROP TABLE IF EXISTS r1;
-DROP TABLE IF EXISTS r2;
+DROP TABLE IF EXISTS r1 SYNC;
+DROP TABLE IF EXISTS r2 SYNC;
 
 CREATE TABLE r1 (
     key UInt64, value String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/01509_no_repliacs', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/01509_parallel_quorum_insert_no_replicas', '1')
 ORDER BY tuple();
 
 CREATE TABLE r2 (
     key UInt64, value String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/01509_no_repliacs', '2')
+ENGINE = ReplicatedMergeTree('/clickhouse/01509_parallel_quorum_insert_no_replicas', '2')
 ORDER BY tuple();
 
 SET insert_quorum_parallel=1;
@@ -18,8 +18,13 @@ SET insert_quorum_parallel=1;
 SET insert_quorum=3;
 INSERT INTO r1 VALUES(1, '1'); --{serverError 285}
 
+-- retry should still fail despite the insert_deduplicate enabled
+INSERT INTO r1 VALUES(1, '1'); --{serverError 285}
+INSERT INTO r1 VALUES(1, '1'); --{serverError 285}
+
 SELECT 'insert to two replicas works';
 SET insert_quorum=2, insert_quorum_parallel=1;
+
 INSERT INTO r1 VALUES(1, '1');
 
 SELECT COUNT() FROM r1;
@@ -29,12 +34,18 @@ DETACH TABLE r2;
 
 INSERT INTO r1 VALUES(2, '2'); --{serverError 285}
 
+-- retry should fail despite the insert_deduplicate enabled
+INSERT INTO r1 VALUES(2, '2'); --{serverError 285}
+INSERT INTO r1 VALUES(2, '2'); --{serverError 285}
+
 SET insert_quorum=1, insert_quorum_parallel=1;
 SELECT 'insert to single replica works';
 INSERT INTO r1 VALUES(2, '2');
 
 ATTACH TABLE r2;
 
+INSERT INTO r2 VALUES(2, '2');
+
 SYSTEM SYNC REPLICA r2;
 
 SET insert_quorum=2, insert_quorum_parallel=1;
@@ -47,6 +58,17 @@ SELECT COUNT() FROM r2;
 SELECT 'deduplication works';
 INSERT INTO r2 VALUES(3, '3');
 
+-- still works if we relax quorum
+SET insert_quorum=1, insert_quorum_parallel=1;
+INSERT INTO r2 VALUES(3, '3');
+INSERT INTO r1 VALUES(3, '3');
+-- will start failing if we increase quorum
+SET insert_quorum=3, insert_quorum_parallel=1;
+INSERT INTO r1 VALUES(3, '3'); --{serverError 285}
+-- work back ok when quorum=2
+SET insert_quorum=2, insert_quorum_parallel=1;
+INSERT INTO r2 VALUES(3, '3');
+
 SELECT COUNT() FROM r1;
 SELECT COUNT() FROM r2;
 
@@ -56,8 +78,18 @@ SET insert_quorum_timeout=0;
 
 INSERT INTO r1 VALUES (4, '4'); -- { serverError 319 }
 
+-- retry should fail despite the insert_deduplicate enabled
+INSERT INTO r1 VALUES (4, '4'); -- { serverError 319 }
+INSERT INTO r1 VALUES (4, '4'); -- { serverError 319 }
+SELECT * FROM r2 WHERE key=4;
+
 SYSTEM START FETCHES r2;
 
+SET insert_quorum_timeout=6000000;
+
+-- now retry should be successful
+INSERT INTO r1 VALUES (4, '4');
+
 SYSTEM SYNC REPLICA r2;
 
 SELECT 'insert happened';
diff --git a/tests/queries/0_stateless/01515_force_data_skipping_indices.reference b/tests/queries/0_stateless/01515_force_data_skipping_indices.reference
index e69de29bb2d..d43017edcc5 100644
--- a/tests/queries/0_stateless/01515_force_data_skipping_indices.reference
+++ b/tests/queries/0_stateless/01515_force_data_skipping_indices.reference
@@ -0,0 +1 @@
+1	2	3
diff --git a/tests/queries/0_stateless/01515_force_data_skipping_indices.sql b/tests/queries/0_stateless/01515_force_data_skipping_indices.sql
index 53d3e5c736f..40b66b0ff7b 100644
--- a/tests/queries/0_stateless/01515_force_data_skipping_indices.sql
+++ b/tests/queries/0_stateless/01515_force_data_skipping_indices.sql
@@ -10,6 +10,8 @@ CREATE TABLE data_01515
 Engine=MergeTree()
 ORDER BY key;
 
+INSERT INTO data_01515 VALUES (1, 2, 3);
+
 SELECT * FROM data_01515;
 SELECT * FROM data_01515 SETTINGS force_data_skipping_indices=''; -- { serverError 6 }
 SELECT * FROM data_01515 SETTINGS force_data_skipping_indices='d1_idx'; -- { serverError 277 }
diff --git a/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference b/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference
index 76c46dd798f..dd611b45ccd 100644
--- a/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference
+++ b/tests/queries/0_stateless/01515_with_global_and_with_propagation.reference
@@ -13,7 +13,7 @@ WITH 1 AS x
 SELECT x
 WITH 1 AS x
 SELECT x
-FROM 
+FROM
 (
     WITH 1 AS x
     SELECT x
@@ -22,7 +22,7 @@ WITH 1 AS x
 SELECT
     y,
     x
-FROM 
+FROM
 (
     WITH 2 AS x
     SELECT 2 AS y
@@ -39,7 +39,7 @@ WITH 2 AS x
 SELECT x
 WITH
     5 AS q1,
-    x AS 
+    x AS
     (
         WITH 5 AS q1
         SELECT
@@ -51,4 +51,5 @@ WITH
 SELECT
     b,
     a
-FROM x
+FROM
+x
diff --git a/tests/queries/0_stateless/01518_cast_nullable_virtual_system_column.sql b/tests/queries/0_stateless/01518_cast_nullable_virtual_system_column.sql
index 6366bae7b37..9f4ab03e941 100644
--- a/tests/queries/0_stateless/01518_cast_nullable_virtual_system_column.sql
+++ b/tests/queries/0_stateless/01518_cast_nullable_virtual_system_column.sql
@@ -1,7 +1,8 @@
+-- NOTE: database = currentDatabase() is not mandatory
+
 SELECT database FROM system.tables WHERE database LIKE '%' format Null;
 SELECT database AS db FROM system.tables WHERE db LIKE '%' format Null;
 SELECT CAST(database, 'String') AS db FROM system.tables WHERE db LIKE '%' format Null;
 SELECT CAST('a string', 'Nullable(String)') AS str WHERE str LIKE '%' format Null;
 SELECT CAST(database, 'Nullable(String)') AS ndb FROM system.tables WHERE ndb LIKE '%' format Null;
 SELECT 'all tests passed';
-
diff --git a/tests/queries/0_stateless/01532_having_with_totals.sql b/tests/queries/0_stateless/01532_having_with_totals.sql
index 10f55c8c135..290799c1354 100644
--- a/tests/queries/0_stateless/01532_having_with_totals.sql
+++ b/tests/queries/0_stateless/01532_having_with_totals.sql
@@ -3,7 +3,7 @@ create table local_t engine Log as select 1 a;
 
 SELECT '127.0.0.{1,2}';
 SELECT *
-FROM 
+FROM
 (
     SELECT a
     FROM remote('127.0.0.{1,2}', currentDatabase(), local_t)
@@ -17,7 +17,7 @@ WHERE a IN
 
 SELECT '127.0.0.1';
 SELECT *
-FROM 
+FROM
 (
     SELECT a
     FROM remote('127.0.0.1', currentDatabase(), local_t)
diff --git a/tests/queries/0_stateless/01532_min_max_with_modifiers.sql b/tests/queries/0_stateless/01532_min_max_with_modifiers.sql
index 0c8651c0f01..364b110d8c1 100644
--- a/tests/queries/0_stateless/01532_min_max_with_modifiers.sql
+++ b/tests/queries/0_stateless/01532_min_max_with_modifiers.sql
@@ -11,7 +11,7 @@ SELECT
     min(x) AS lower,
     max(x) + 1 AS upper,
     upper - lower AS range
-FROM 
+FROM
 (
     SELECT arrayJoin([1, 2]) AS x
 ) 
diff --git a/tests/queries/0_stateless/01533_optimize_skip_merged_partitions.sql b/tests/queries/0_stateless/01533_optimize_skip_merged_partitions.sql
index 63bbbd2d721..3e9e5cda23e 100644
--- a/tests/queries/0_stateless/01533_optimize_skip_merged_partitions.sql
+++ b/tests/queries/0_stateless/01533_optimize_skip_merged_partitions.sql
@@ -14,7 +14,7 @@ INSERT INTO optimize_final SELECT toDate('2000-01-01'), number + 5 FROM numbers(
 
 OPTIMIZE TABLE optimize_final FINAL;
 
-SELECT table, partition, active, level from system.parts where table = 'optimize_final' and active = 1;
+SELECT table, partition, active, level from system.parts where table = 'optimize_final' and database = currentDatabase() and active = 1;
 
 DROP TABLE optimize_final;
 
diff --git a/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference b/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference
index b9338e6a9c4..3310ffe7de4 100644
--- a/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference
+++ b/tests/queries/0_stateless/01540_verbatim_partition_pruning.reference
@@ -2,3 +2,5 @@
 9	5
 8	4
 1	2	3
+2020-01-02	1	
+2021-01-02	2	
diff --git a/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql b/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql
index 16ab51d1160..2d227856be4 100644
--- a/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql
+++ b/tests/queries/0_stateless/01540_verbatim_partition_pruning.sql
@@ -28,3 +28,22 @@ create table xyz(x int, y int, z int) engine MergeTree partition by if(toUInt8(x
 insert into xyz values (1, 2, 3);
 select * from xyz where y = 2;
 drop table if exists xyz;
+
+-- Test if we obey strict rules when facing NOT contitions
+drop table if exists test;
+create table test(d Date, k Int64, s String) Engine=MergeTree partition by (toYYYYMM(d),k) order by (d, k);
+
+insert into test values ('2020-01-01', 1, '');
+insert into test values ('2020-01-02', 1, '');
+
+select * from test where d != '2020-01-01';
+drop table test;
+
+-- Test if single value partition pruning works correctly for Date = String
+drop table if exists myTable;
+CREATE TABLE myTable (myDay Date, myOrder Int32, someData String) ENGINE = ReplacingMergeTree PARTITION BY floor(toYYYYMMDD(myDay), -1) ORDER BY (myOrder);
+INSERT INTO myTable (myDay, myOrder) VALUES ('2021-01-01', 1);
+INSERT INTO myTable (myDay, myOrder) VALUES ('2021-01-02', 2); // This row should be returned
+INSERT INTO myTable (myDay, myOrder) VALUES ('2021-01-03', 3);
+SELECT * FROM myTable mt WHERE myDay = '2021-01-02';
+drop table myTable;
diff --git a/tests/queries/0_stateless/01548_query_log_query_execution_ms.reference b/tests/queries/0_stateless/01548_query_log_query_execution_ms.reference
index 6ed281c757a..e69de29bb2d 100644
--- a/tests/queries/0_stateless/01548_query_log_query_execution_ms.reference
+++ b/tests/queries/0_stateless/01548_query_log_query_execution_ms.reference
@@ -1,2 +0,0 @@
-1
-1
diff --git a/tests/queries/0_stateless/01548_query_log_query_execution_ms.sh b/tests/queries/0_stateless/01548_query_log_query_execution_ms.sh
new file mode 100755
index 00000000000..c973612c80d
--- /dev/null
+++ b/tests/queries/0_stateless/01548_query_log_query_execution_ms.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+function random_str()
+{
+    local n=$1 && shift
+    tr -cd '[:lower:]' < /dev/urandom | head -c"$n"
+}
+function test_query_duration_ms()
+{
+    local query_id
+    query_id="01548_query_log_query_execution_ms-$SECONDS-$(random_str 6)"
+    local query_opts=(
+        "--log_query_threads=1"
+        "--log_queries_min_type=QUERY_FINISH"
+        "--log_queries=1"
+        "--query_id=$query_id"
+        "--format=Null"
+    )
+    $CLICKHOUSE_CLIENT "${query_opts[@]}" -q "select sleep(0.4)" || exit 1
+    $CLICKHOUSE_CLIENT -q "system flush logs" || exit 1
+
+    $CLICKHOUSE_CLIENT -q "
+        select count()
+        from system.query_log
+        where
+            query_id = '$query_id'
+            and current_database = currentDatabase()
+            and query_duration_ms between 400 and 800
+            and event_date >= yesterday()
+            and event_time >= now() - interval 1 minute;
+    " || exit 1
+
+    $CLICKHOUSE_CLIENT -q "
+        -- at least two threads for processing
+        -- (but one just waits for another, sigh)
+        select count() == 2
+        from system.query_thread_log
+        where
+            query_id = '$query_id'
+            and current_database = currentDatabase()
+            and query_duration_ms between 400 and 800
+            and event_date >= yesterday()
+            and event_time >= now() - interval 1 minute;
+    " || exit 1
+}
+
+function main()
+{
+    # retries, since there is no guarantee that every time query will take ~0.4 second.
+    local retries=20 i=0
+    while [ "$(test_query_duration_ms | xargs)" != '1 1' ] && [[ $i < $retries ]]; do
+        ((++i))
+    done
+}
+main "$@"
diff --git a/tests/queries/0_stateless/01548_query_log_query_execution_ms.sql b/tests/queries/0_stateless/01548_query_log_query_execution_ms.sql
deleted file mode 100644
index 028b3400d01..00000000000
--- a/tests/queries/0_stateless/01548_query_log_query_execution_ms.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-set log_query_threads=1;
-set log_queries_min_type='QUERY_FINISH';
-set log_queries=1;
-select '01548_query_log_query_execution_ms', sleep(0.4) format Null;
-set log_queries=0;
-set log_query_threads=0;
-
-system flush logs;
-
-select count()
-from system.query_log
-where
-    query like '%01548_query_log_query_execution_ms%'
-    and current_database = currentDatabase()
-    and query_duration_ms between 100 and 800
-    and event_date >= yesterday();
-
--- at least two threads for processing
--- (but one just waits for another, sigh)
-select count() == 2
-from system.query_thread_log
-where
-    query like '%01548_query_log_query_execution_ms%'
-    and current_database = currentDatabase()
-    and query_duration_ms between 100 and 800
-    and event_date = today()
-    and event_time >= now() - interval 1 minute;
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 becc626c1bb..2843b305f0a 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
@@ -7,22 +7,11 @@ ExpressionTransform
         (Expression)
         ExpressionTransform × 3
           (SettingQuotaAndLimits)
-            (Expression)
-            ExpressionTransform × 3
-              (Union)
-                (MergingSorted)
-                  (Expression)
-                  ExpressionTransform
-                    (ReadFromStorage)
-                    MergeTree 0 → 1
-                (MergingSorted)
+            (ReadFromMergeTree)
+            ExpressionTransform × 4
+              MergeTree 0 → 1
                 MergingSortedTransform 2 → 1
-                  (Expression)
                   ExpressionTransform × 2
-                    (ReadFromStorage)
                     MergeTree × 2 0 → 1
-                (MergingSorted)
-                  (Expression)
-                  ExpressionTransform
-                    (ReadFromStorage)
-                    MergeTree 0 → 1
+                      ExpressionTransform
+                        MergeTree 0 → 1
diff --git a/tests/queries/0_stateless/01559_aggregate_null_for_empty_fix.sql b/tests/queries/0_stateless/01559_aggregate_null_for_empty_fix.sql
index 5955dee37f8..3434a049073 100644
--- a/tests/queries/0_stateless/01559_aggregate_null_for_empty_fix.sql
+++ b/tests/queries/0_stateless/01559_aggregate_null_for_empty_fix.sql
@@ -1,5 +1,5 @@
 SELECT MAX(aggr)
-FROM 
+FROM
 (
 	SELECT MAX(-1) AS aggr
 	FROM system.one
@@ -11,7 +11,7 @@ FROM
 
 );
 SELECT MaX(aggr)
-FROM 
+FROM
 (
     SELECT mAX(-1) AS aggr
     FROM system.one
@@ -22,7 +22,7 @@ FROM
     WHERE 1
 );
 SELECT MaX(aggr)
-FROM 
+FROM
 (
     SELECT mAX(-1) AS aggr
     FROM system.one
@@ -33,7 +33,7 @@ FROM
     WHERE 1
 );
 SELECT MaX(aggr)
-FROM 
+FROM
 (
     SELECT mAX(-1) AS aggr
     FROM system.one
@@ -45,7 +45,7 @@ FROM
 );
 SET aggregate_functions_null_for_empty=1;
 SELECT MAX(aggr)
-FROM 
+FROM
 (
 	SELECT MAX(-1) AS aggr
 	FROM system.one
@@ -57,7 +57,7 @@ FROM
 
 );
 SELECT MaX(aggr)
-FROM 
+FROM
 (
     SELECT mAX(-1) AS aggr
     FROM system.one
@@ -68,7 +68,7 @@ FROM
     WHERE 1
 );
 SELECT MaX(aggr)
-FROM 
+FROM
 (
     SELECT mAX(-1) AS aggr
     FROM system.one
@@ -79,7 +79,7 @@ FROM
     WHERE 1
 );
 SELECT MaX(aggr)
-FROM 
+FROM
 (
     SELECT mAX(-1) AS aggr
     FROM system.one
diff --git a/tests/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.sql b/tests/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.sql
index c5e677570ea..2c3ae41864e 100644
--- a/tests/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.sql
+++ b/tests/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.sql
@@ -31,7 +31,7 @@ SELECT
     dt64 != dt,
     toDateTime(dt64) != dt,
     dt64 != toDateTime64(dt, 1, 'UTC')
-FROM 
+FROM
 (
     WITH toDateTime('2015-05-18 07:40:11') as value
     SELECT
diff --git a/tests/queries/0_stateless/01560_mann_whitney.sql b/tests/queries/0_stateless/01560_mann_whitney.sql
index 6e1ac55349d..e3a9b4ecd03 100644
--- a/tests/queries/0_stateless/01560_mann_whitney.sql
+++ b/tests/queries/0_stateless/01560_mann_whitney.sql
@@ -6,4 +6,5 @@ SELECT '223.0', '0.5426959774289482';
 WITH mannWhitneyUTest(left, right) AS pair SELECT roundBankers(pair.1, 16) as t_stat, roundBankers(pair.2, 16) as p_value from mann_whitney_test;
 WITH mannWhitneyUTest('two-sided', 1)(left, right) as pair SELECT roundBankers(pair.1, 16) as t_stat, roundBankers(pair.2, 16) as p_value from mann_whitney_test;
 WITH mannWhitneyUTest('two-sided')(left, right) as pair SELECT roundBankers(pair.1, 16) as t_stat, roundBankers(pair.2, 16) as p_value from mann_whitney_test;
+WITH mannWhitneyUTest('two-sided')(1, right) AS pair SELECT roundBankers(pair.1, 16) AS t_stat, roundBankers(pair.2, 16) AS p_value FROM mann_whitney_test; --{serverError 36}
 DROP TABLE IF EXISTS mann_whitney_test;
diff --git a/tests/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.sql b/tests/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.sql
index befc13be8eb..b475a5bdd3c 100644
--- a/tests/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.sql
+++ b/tests/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.sql
@@ -1,7 +1,7 @@
 WITH arrayJoin(range(2)) AS delta
 SELECT
     toDate(time) + toIntervalDay(delta) AS dt
-FROM 
+FROM
 (
     SELECT toDateTime('2020.11.12 19:02:04') AS time
 )
@@ -10,7 +10,7 @@ ORDER BY dt ASC;
 WITH arrayJoin([0, 1]) AS delta
 SELECT
     toDate(time) + toIntervalDay(delta) AS dt
-FROM 
+FROM
 (
     SELECT toDateTime('2020.11.12 19:02:04') AS time
 )
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert.reference b/tests/queries/0_stateless/01560_optimize_on_insert_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01560_optimize_on_insert.reference
rename to tests/queries/0_stateless/01560_optimize_on_insert_long.reference
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert.sql b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
similarity index 97%
rename from tests/queries/0_stateless/01560_optimize_on_insert.sql
rename to tests/queries/0_stateless/01560_optimize_on_insert_long.sql
index f64f4c75cfe..1c6418a50df 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
@@ -38,5 +38,5 @@ DROP TABLE IF EXISTS empty;
 CREATE TABLE empty (key UInt32, val UInt32, date Datetime) ENGINE=SummingMergeTree(val) PARTITION BY date ORDER BY key;
 INSERT INTO empty VALUES (1, 1, '2020-01-01'), (1, 1, '2020-01-01'), (1, -2, '2020-01-01');
 SELECT * FROM empty ORDER BY key;
-SELECT table, partition, active FROM system.parts where table = 'empty' and active = 1;
+SELECT table, partition, active FROM system.parts where table = 'empty' and active = 1 and database = currentDatabase();
 DROP TABLE empty;
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 a1a1814a581..0eb7e06f724 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
@@ -11,7 +11,7 @@ Expression (Projection)
         PartialSorting (Sort each block for ORDER BY)
           Expression (Before ORDER BY)
             SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromStorage (MergeTree)
+              ReadFromMergeTree
 SELECT
     timestamp,
     key
@@ -23,7 +23,7 @@ Expression (Projection)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 SELECT
     timestamp,
     key
@@ -37,7 +37,7 @@ Expression (Projection)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 SELECT
     timestamp,
     key
diff --git a/tests/queries/0_stateless/01566_negate_formatting.reference b/tests/queries/0_stateless/01566_negate_formatting.reference
index b955d4cbbc5..69d79cf929a 100644
--- a/tests/queries/0_stateless/01566_negate_formatting.reference
+++ b/tests/queries/0_stateless/01566_negate_formatting.reference
@@ -9,12 +9,26 @@ SELECT
 explain syntax select negate(1.), negate(-1.), - -1., -(-1.), (-1.) in (-1.);
 SELECT
     -1.,
-    1,
-    1,
-    1,
+    1.,
+    1.,
+    1.,
     -1. IN (-1.)
 explain syntax select negate(-9223372036854775808), -(-9223372036854775808), - -9223372036854775808;
 SELECT
     -9223372036854775808,
     -9223372036854775808,
     -9223372036854775808
+explain syntax select negate(0), negate(-0), - -0, -(-0), (-0) in (-0);
+SELECT
+    0,
+    0,
+    0,
+    0,
+    0 IN (0)
+explain syntax select negate(0.), negate(-0.), - -0., -(-0.), (-0.) in (-0.);
+SELECT
+    -0.,
+    0.,
+    0.,
+    0.,
+    -0. IN (-0.)
diff --git a/tests/queries/0_stateless/01566_negate_formatting.sql b/tests/queries/0_stateless/01566_negate_formatting.sql
index 035ff80e8d8..65e983fbdd1 100644
--- a/tests/queries/0_stateless/01566_negate_formatting.sql
+++ b/tests/queries/0_stateless/01566_negate_formatting.sql
@@ -2,3 +2,5 @@
 explain syntax select negate(1), negate(-1), - -1, -(-1), (-1) in (-1);
 explain syntax select negate(1.), negate(-1.), - -1., -(-1.), (-1.) in (-1.);
 explain syntax select negate(-9223372036854775808), -(-9223372036854775808), - -9223372036854775808;
+explain syntax select negate(0), negate(-0), - -0, -(-0), (-0) in (-0);
+explain syntax select negate(0.), negate(-0.), - -0., -(-0.), (-0.) in (-0.);
diff --git a/tests/queries/0_stateless/01568_window_functions_distributed.reference b/tests/queries/0_stateless/01568_window_functions_distributed.reference
new file mode 100644
index 00000000000..483e84a2bee
--- /dev/null
+++ b/tests/queries/0_stateless/01568_window_functions_distributed.reference
@@ -0,0 +1,84 @@
+-- { echo }
+set allow_experimental_window_functions = 1;
+select row_number() over (order by dummy) from (select * from remote('127.0.0.{1,2}', system, one));
+1
+2
+select row_number() over (order by dummy) from remote('127.0.0.{1,2}', system, one);
+1
+2
+select max(identity(dummy + 1)) over () from remote('127.0.0.{1,2}', system, one);
+1
+1
+drop table if exists t_01568;
+create table t_01568 engine Memory as
+select intDiv(number, 3) p, modulo(number, 3) o, number
+from numbers(9);
+select sum(number) over w, max(number) over w from t_01568 window w as (partition by p);
+3	2
+3	2
+3	2
+12	5
+12	5
+12	5
+21	8
+21	8
+21	8
+select sum(number) over w, max(number) over w from remote('127.0.0.{1,2}', '', t_01568) window w as (partition by p);
+6	2
+6	2
+6	2
+6	2
+6	2
+6	2
+24	5
+24	5
+24	5
+24	5
+24	5
+24	5
+42	8
+42	8
+42	8
+42	8
+42	8
+42	8
+select distinct sum(number) over w, max(number) over w from remote('127.0.0.{1,2}', '', t_01568) window w as (partition by p);
+6	2
+24	5
+42	8
+-- window functions + aggregation w/shards
+select groupArray(groupArray(number)) over (rows unbounded preceding) from remote('127.0.0.{1,2}', '', t_01568) group by mod(number, 3);
+[[0,3,6,0,3,6]]
+[[0,3,6,0,3,6],[1,4,7,1,4,7]]
+[[0,3,6,0,3,6],[1,4,7,1,4,7],[2,5,8,2,5,8]]
+select groupArray(groupArray(number)) over (rows unbounded preceding) from remote('127.0.0.{1,2}', '', t_01568) group by mod(number, 3) settings distributed_group_by_no_merge=1;
+[[0,3,6]]
+[[0,3,6],[1,4,7]]
+[[0,3,6],[1,4,7],[2,5,8]]
+[[0,3,6]]
+[[0,3,6],[1,4,7]]
+[[0,3,6],[1,4,7],[2,5,8]]
+select groupArray(groupArray(number)) over (rows unbounded preceding) from remote('127.0.0.{1,2}', '', t_01568) group by mod(number, 3) settings distributed_group_by_no_merge=2; -- { serverError 48 }
+-- proper ORDER BY w/window functions
+select p, o, count() over (partition by p)
+from remote('127.0.0.{1,2}', '',  t_01568)
+order by p, o;
+0	0	6
+0	0	6
+0	1	6
+0	1	6
+0	2	6
+0	2	6
+1	0	6
+1	0	6
+1	1	6
+1	1	6
+1	2	6
+1	2	6
+2	0	6
+2	0	6
+2	1	6
+2	1	6
+2	2	6
+2	2	6
+drop table t_01568;
diff --git a/tests/queries/0_stateless/01568_window_functions_distributed.sql b/tests/queries/0_stateless/01568_window_functions_distributed.sql
new file mode 100644
index 00000000000..6f38597a7a3
--- /dev/null
+++ b/tests/queries/0_stateless/01568_window_functions_distributed.sql
@@ -0,0 +1,32 @@
+-- { echo }
+set allow_experimental_window_functions = 1;
+
+select row_number() over (order by dummy) from (select * from remote('127.0.0.{1,2}', system, one));
+
+select row_number() over (order by dummy) from remote('127.0.0.{1,2}', system, one);
+
+select max(identity(dummy + 1)) over () from remote('127.0.0.{1,2}', system, one);
+
+drop table if exists t_01568;
+
+create table t_01568 engine Memory as
+select intDiv(number, 3) p, modulo(number, 3) o, number
+from numbers(9);
+
+select sum(number) over w, max(number) over w from t_01568 window w as (partition by p);
+
+select sum(number) over w, max(number) over w from remote('127.0.0.{1,2}', '', t_01568) window w as (partition by p);
+
+select distinct sum(number) over w, max(number) over w from remote('127.0.0.{1,2}', '', t_01568) window w as (partition by p);
+
+-- window functions + aggregation w/shards
+select groupArray(groupArray(number)) over (rows unbounded preceding) from remote('127.0.0.{1,2}', '', t_01568) group by mod(number, 3);
+select groupArray(groupArray(number)) over (rows unbounded preceding) from remote('127.0.0.{1,2}', '', t_01568) group by mod(number, 3) settings distributed_group_by_no_merge=1;
+select groupArray(groupArray(number)) over (rows unbounded preceding) from remote('127.0.0.{1,2}', '', t_01568) group by mod(number, 3) settings distributed_group_by_no_merge=2; -- { serverError 48 }
+
+-- proper ORDER BY w/window functions
+select p, o, count() over (partition by p)
+from remote('127.0.0.{1,2}', '',  t_01568)
+order by p, o;
+
+drop table t_01568;
diff --git a/tests/queries/0_stateless/01569_query_profiler_big_query_id.reference b/tests/queries/0_stateless/01569_query_profiler_big_query_id.reference
new file mode 100644
index 00000000000..0d66ea1aee9
--- /dev/null
+++ b/tests/queries/0_stateless/01569_query_profiler_big_query_id.reference
@@ -0,0 +1,2 @@
+0
+1
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
new file mode 100755
index 00000000000..98e85e9b196
--- /dev/null
+++ b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+query_id="aggregating_merge_tree_simple_aggregate_function_string_query100_profile100_$CLICKHOUSE_DATABASE"
+${CLICKHOUSE_CLIENT} --query="select sleep(1)" --query_id="$query_id" --query_profiler_real_time_period_ns=10000000
+${CLICKHOUSE_CLIENT} --query="system flush logs"
+${CLICKHOUSE_CLIENT} --query="select count(*) > 1 from system.trace_log where query_id = '$query_id'"
+
diff --git a/tests/queries/0_stateless/01576_alias_column_rewrite.reference b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
index 334ebc7eb1f..9d3db8c1d00 100644
--- a/tests/queries/0_stateless/01576_alias_column_rewrite.reference
+++ b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
@@ -28,47 +28,35 @@ Expression (Projection)
         PartialSorting (Sort each block for ORDER BY)
           Expression ((Before ORDER BY + Add table aliases))
             SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromStorage (MergeTree)
+              ReadFromMergeTree
 Expression (Projection)
   Limit (preliminary LIMIT)
     FinishSorting
       Expression ((Before ORDER BY + Add table aliases))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          Union
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 Expression (Projection)
   Limit (preliminary LIMIT)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          Union
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 optimize_aggregation_in_order
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression ((Before GROUP BY + Add table aliases))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
-        ReadFromStorage (MergeTree)
+        ReadFromMergeTree
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression ((Before GROUP BY + Add table aliases))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
-        Union
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
+        ReadFromMergeTree
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression (Before GROUP BY)
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
-        Union
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
+        ReadFromMergeTree
 second-index
 1
 1
diff --git a/tests/queries/0_stateless/01582_deterministic_function_with_predicate.reference b/tests/queries/0_stateless/01582_deterministic_function_with_predicate.reference
index a1b4bfdcc03..b764691f5b6 100644
--- a/tests/queries/0_stateless/01582_deterministic_function_with_predicate.reference
+++ b/tests/queries/0_stateless/01582_deterministic_function_with_predicate.reference
@@ -1,8 +1,8 @@
 SELECT count()
-FROM 
+FROM
 (
     SELECT number
-    FROM 
+    FROM
     (
         SELECT number
         FROM numbers(1000000)
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index 9067ee8d955..fa909972678 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -942,8 +942,9 @@ FROM numbers(2)
 ;
 1	0
 1	1
--- optimize_read_in_order conflicts with sorting for window functions, must
--- be disabled.
+-- optimize_read_in_order conflicts with sorting for window functions, check that
+-- it is disabled.
+drop table if exists window_mt;
 create table window_mt engine MergeTree order by number
     as select number, mod(number, 3) p from numbers(100);
 select number, count(*) over (partition by p)
@@ -970,6 +971,7 @@ select number, count(*) over (partition by p)
 7	33
 8	33
 9	34
+drop table window_mt;
 -- some true window functions -- rank and friends
 select number, p, o,
     count(*) over w,
@@ -1052,6 +1054,12 @@ settings max_block_size = 3;
 13	2	10	12	10	10	143
 14	2	10	13	10	10	154
 15	3	15	0	15	15	15
+-- careful with auto-application of Null combinator
+select lagInFrame(toNullable(1)) over ();
+0
+select lagInFrameOrNull(1) over (); -- { serverError 36 }
+select intDiv(1, NULL) x, toTypeName(x), max(x) over ();
+\N	Nullable(Nothing)	\N
 -- case-insensitive SQL-standard synonyms for any and anyLast
 select
     number,
@@ -1096,7 +1104,7 @@ select count() over (order by toInt64(number) range between -1 preceding and unb
 select count() over (order by toInt64(number) range between -1 following and unbounded following) from numbers(1); -- { serverError 36 }
 select count() over (order by toInt64(number) range between unbounded preceding and -1 preceding) from numbers(1); -- { serverError 36 }
 select count() over (order by toInt64(number) range between unbounded preceding and -1 following) from numbers(1); -- { serverError 36 }
----- a test with aggregate function that allocates memory in arena
+-- a test with aggregate function that allocates memory in arena
 select sum(a[length(a)])
 from (
     select groupArray(number) over (partition by modulo(number, 11)
@@ -1104,3 +1112,39 @@ from (
     from numbers_mt(10000)
 ) settings max_block_size = 7;
 49995000
+-- -INT_MIN row offset that can lead to problems with negation, found when fuzzing
+-- under UBSan. Should be limited to at most INT_MAX.
+select count() over (rows between 2147483648 preceding and 2147493648 following) from numbers(2); -- { serverError 36 }
+-- Somehow in this case WindowTransform gets empty input chunks not marked as
+-- input end, and then two (!) empty input chunks marked as input end. Whatever.
+select count() over () from (select 1 a) l inner join (select 2 a) r using a;
+-- This case works as expected, one empty input chunk marked as input end.
+select count() over () where null;
+-- Inheriting another window.
+select number, count() over (w1 rows unbounded preceding) from numbers(10)
+window
+    w0 as (partition by intDiv(number, 5) as p),
+    w1 as (w0 order by mod(number, 3) as o)
+order by p, o, number
+;
+0	1
+3	2
+1	3
+4	4
+2	5
+6	1
+9	2
+7	3
+5	4
+8	5
+-- can't redefine PARTITION BY
+select count() over (w partition by number) from numbers(1) window w as (partition by intDiv(number, 5)); -- { serverError 36 }
+-- can't redefine existing ORDER BY
+select count() over (w order by number) from numbers(1) window w as (partition by intDiv(number, 5) order by mod(number, 3)); -- { serverError 36 }
+-- parent window can't have frame
+select count() over (w range unbounded preceding) from numbers(1) window w as (partition by intDiv(number, 5) order by mod(number, 3) rows unbounded preceding); -- { serverError 36 }
+-- looks weird but probably should work -- this is a window that inherits and changes nothing
+select count() over (w) from numbers(1) window w as ();
+1
+-- nonexistent parent window
+select count() over (w2 rows unbounded preceding); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 85856dd797d..05f4cb49252 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -329,8 +329,9 @@ SELECT
 FROM numbers(2)
 ;
 
--- optimize_read_in_order conflicts with sorting for window functions, must
--- be disabled.
+-- optimize_read_in_order conflicts with sorting for window functions, check that
+-- it is disabled.
+drop table if exists window_mt;
 create table window_mt engine MergeTree order by number
     as select number, mod(number, 3) p from numbers(100);
 
@@ -340,6 +341,8 @@ select number, count(*) over (partition by p)
 select number, count(*) over (partition by p)
     from window_mt order by number limit 10 settings optimize_read_in_order = 1;
 
+drop table window_mt;
+
 -- some true window functions -- rank and friends
 select number, p, o,
     count(*) over w,
@@ -373,6 +376,11 @@ order by number
 settings max_block_size = 3;
 ;
 
+-- careful with auto-application of Null combinator
+select lagInFrame(toNullable(1)) over ();
+select lagInFrameOrNull(1) over (); -- { serverError 36 }
+select intDiv(1, NULL) x, toTypeName(x), max(x) over ();
+
 -- case-insensitive SQL-standard synonyms for any and anyLast
 select
     number,
@@ -402,10 +410,43 @@ select count() over (order by toInt64(number) range between -1 following and unb
 select count() over (order by toInt64(number) range between unbounded preceding and -1 preceding) from numbers(1); -- { serverError 36 }
 select count() over (order by toInt64(number) range between unbounded preceding and -1 following) from numbers(1); -- { serverError 36 }
 
----- a test with aggregate function that allocates memory in arena
+-- a test with aggregate function that allocates memory in arena
 select sum(a[length(a)])
 from (
     select groupArray(number) over (partition by modulo(number, 11)
             order by modulo(number, 1111), number) a
     from numbers_mt(10000)
 ) settings max_block_size = 7;
+
+-- -INT_MIN row offset that can lead to problems with negation, found when fuzzing
+-- under UBSan. Should be limited to at most INT_MAX.
+select count() over (rows between 2147483648 preceding and 2147493648 following) from numbers(2); -- { serverError 36 }
+
+-- Somehow in this case WindowTransform gets empty input chunks not marked as
+-- input end, and then two (!) empty input chunks marked as input end. Whatever.
+select count() over () from (select 1 a) l inner join (select 2 a) r using a;
+-- This case works as expected, one empty input chunk marked as input end.
+select count() over () where null;
+
+-- Inheriting another window.
+select number, count() over (w1 rows unbounded preceding) from numbers(10)
+window
+    w0 as (partition by intDiv(number, 5) as p),
+    w1 as (w0 order by mod(number, 3) as o)
+order by p, o, number
+;
+
+-- can't redefine PARTITION BY
+select count() over (w partition by number) from numbers(1) window w as (partition by intDiv(number, 5)); -- { serverError 36 }
+
+-- can't redefine existing ORDER BY
+select count() over (w order by number) from numbers(1) window w as (partition by intDiv(number, 5) order by mod(number, 3)); -- { serverError 36 }
+
+-- parent window can't have frame
+select count() over (w range unbounded preceding) from numbers(1) window w as (partition by intDiv(number, 5) order by mod(number, 3) rows unbounded preceding); -- { serverError 36 }
+
+-- looks weird but probably should work -- this is a window that inherits and changes nothing
+select count() over (w) from numbers(1) window w as ();
+
+-- nonexistent parent window
+select count() over (w2 rows unbounded preceding); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01593_functions_in_order_by.reference b/tests/queries/0_stateless/01593_functions_in_order_by.reference
index 534b29af3e6..4f4ea02f95c 100644
--- a/tests/queries/0_stateless/01593_functions_in_order_by.reference
+++ b/tests/queries/0_stateless/01593_functions_in_order_by.reference
@@ -1,7 +1,7 @@
 SELECT
     msg,
     toDateTime(intDiv(ms, 1000)) AS time
-FROM 
+FROM
 (
     SELECT
         \'hello\' AS msg,
diff --git a/tests/queries/0_stateless/01593_functions_in_order_by.sql b/tests/queries/0_stateless/01593_functions_in_order_by.sql
index 2d38e45fff7..5aa6aef9e12 100644
--- a/tests/queries/0_stateless/01593_functions_in_order_by.sql
+++ b/tests/queries/0_stateless/01593_functions_in_order_by.sql
@@ -1,6 +1,6 @@
 EXPLAIN SYNTAX
 SELECT msg, toDateTime(intDiv(ms, 1000)) AS time
-FROM 
+FROM
 (
     SELECT
         'hello' AS msg,
diff --git a/tests/queries/0_stateless/01598_memory_limit_zeros.sql b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
index e90d7bbccb7..a07ce0bcca3 100644
--- a/tests/queries/0_stateless/01598_memory_limit_zeros.sql
+++ b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
@@ -1,2 +1,2 @@
-SET max_memory_usage = 1;
+SET max_memory_usage = 1, max_untracked_memory = 1000000;
 select 'test', count(*) from zeros_mt(1000000) where not ignore(zero); -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics.reference b/tests/queries/0_stateless/01600_parts_states_metrics_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01600_parts_states_metrics.reference
rename to tests/queries/0_stateless/01600_parts_states_metrics_long.reference
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics.sh b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
similarity index 96%
rename from tests/queries/0_stateless/01600_parts_states_metrics.sh
rename to tests/queries/0_stateless/01600_parts_states_metrics_long.sh
index e32210633bb..634cb403f85 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
@@ -4,6 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+# NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 verify_sql="SELECT
     (SELECT sumIf(value, metric = 'PartsCommitted'), sumIf(value, metric = 'PartsOutdated') FROM system.metrics)
     = (SELECT sum(active), sum(NOT active) FROM system.parts)"
diff --git a/tests/queries/0_stateless/01600_parts_types_metrics.reference b/tests/queries/0_stateless/01600_parts_types_metrics_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01600_parts_types_metrics.reference
rename to tests/queries/0_stateless/01600_parts_types_metrics_long.reference
diff --git a/tests/queries/0_stateless/01600_parts_types_metrics.sh b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
similarity index 97%
rename from tests/queries/0_stateless/01600_parts_types_metrics.sh
rename to tests/queries/0_stateless/01600_parts_types_metrics_long.sh
index 1a1942be32a..67d2c0c306d 100755
--- a/tests/queries/0_stateless/01600_parts_types_metrics.sh
+++ b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
@@ -7,6 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 set -e
 set -o pipefail
 
+# NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 verify_sql="SELECT
     (SELECT sumIf(value, metric = 'PartsInMemory'), sumIf(value, metric = 'PartsCompact'), sumIf(value, metric = 'PartsWide') FROM system.metrics) =
     (SELECT countIf(part_type == 'InMemory'), countIf(part_type == 'Compact'), countIf(part_type == 'Wide') FROM system.parts)"
diff --git a/tests/queries/0_stateless/01601_detach_permanently.reference b/tests/queries/0_stateless/01601_detach_permanently.reference
index 6683603c972..0232c1694e4 100644
--- a/tests/queries/0_stateless/01601_detach_permanently.reference
+++ b/tests/queries/0_stateless/01601_detach_permanently.reference
@@ -50,7 +50,7 @@ After database reattachement the table is still absent (it was detached permamen
 And we can not detach it permanently
 But we can attach it back
 And detach permanently again to check how database drop will behave
-DROP database - Directory not empty error, but database deteched
+DROP database - Directory not empty error, but database detached
 DROP database - now success
 -----------------------
 database lazy tests
diff --git a/tests/queries/0_stateless/01601_detach_permanently.sql b/tests/queries/0_stateless/01601_detach_permanently.sql
index 0e21fd8f463..3af8ed573ef 100644
--- a/tests/queries/0_stateless/01601_detach_permanently.sql
+++ b/tests/queries/0_stateless/01601_detach_permanently.sql
@@ -128,8 +128,8 @@ ATTACH TABLE test1601_detach_permanently_ordinary.test_name_reuse;
 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 deteched';
-DROP DATABASE test1601_detach_permanently_ordinary; -- { serverError 1000 }
+SELECT 'DROP database - Directory not empty error, but database detached';
+DROP DATABASE test1601_detach_permanently_ordinary; -- { serverError 1001 }
 
 ATTACH DATABASE test1601_detach_permanently_ordinary;
 
@@ -203,7 +203,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 1000 }
+DROP DATABASE test1601_detach_permanently_lazy; -- { serverError 1001 }
 
 ATTACH DATABASE test1601_detach_permanently_lazy;
 
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.reference b/tests/queries/0_stateless/01602_max_distributed_connections.reference
index e69de29bb2d..7326d960397 100644
--- a/tests/queries/0_stateless/01602_max_distributed_connections.reference
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.reference
@@ -0,0 +1 @@
+Ok
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.sh b/tests/queries/0_stateless/01602_max_distributed_connections.sh
index 93c6071c091..772acb39344 100755
--- a/tests/queries/0_stateless/01602_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.sh
@@ -4,13 +4,31 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-common_opts=(
-    "--format=Null"
+# We check that even if max_threads is small, the setting max_distributed_connections
+# will allow to process queries on multiple shards concurrently.
 
-    "--max_threads=1"
-    "--max_distributed_connections=3"
-)
+# We do sleep 1.5 seconds on ten machines.
+# If concurrency is one (bad) the query will take at least 15 seconds and the following loops are guaranteed to be infinite.
+# 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.
 
-# NOTE: the test use higher timeout to avoid flakiness.
-timeout 9s ${CLICKHOUSE_CLIENT} "$@" "${common_opts[@]}" -q "select sleep(3) from remote('127.{1,2,3,4,5}', system.one)" --prefer_localhost_replica=0
-timeout 9s ${CLICKHOUSE_CLIENT} "$@" "${common_opts[@]}" -q "select sleep(3) from remote('127.{1,2,3,4,5}', system.one)" --prefer_localhost_replica=1
+while true; 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
+done
+
+while true; 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
+done
+
+# If max_distributed_connections is low and async_socket_for_remote is disabled,
+#  the concurrency of distributed queries will be also low.
+
+timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
+    SELECT sleep(0.15) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=0 && echo 'Fail'
+
+timeout 1 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 1 --async_socket_for_remote 0 --query "
+    SELECT sleep(0.15) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=1 && echo 'Fail'
+
+echo 'Ok'
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 6ae67d7d9ad..8863d3b57c7 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 27 (children 1)
+  AlterCommand 30 (children 1)
    Function equals (children 1)
     ExpressionList (children 2)
      Identifier date
diff --git a/tests/queries/0_stateless/01635_nullable_fuzz.sql b/tests/queries/0_stateless/01635_nullable_fuzz.sql
index c134578b221..f49fe39d350 100644
--- a/tests/queries/0_stateless/01635_nullable_fuzz.sql
+++ b/tests/queries/0_stateless/01635_nullable_fuzz.sql
@@ -4,7 +4,7 @@ SELECT
     '',
     number,
     NULL AS k
-FROM 
+FROM
 (
     SELECT
         materialize(NULL) OR materialize(-9223372036854775808),
diff --git a/tests/queries/0_stateless/01636_nullable_fuzz2.sql b/tests/queries/0_stateless/01636_nullable_fuzz2.sql
index a40da51c38c..49ee7626b4e 100644
--- a/tests/queries/0_stateless/01636_nullable_fuzz2.sql
+++ b/tests/queries/0_stateless/01636_nullable_fuzz2.sql
@@ -13,7 +13,7 @@ insert into tracking_events_tmp select 2, '2020-07-10' from numbers(1881);
 insert into tracking_events_tmp select 2, '2020-07-11' from numbers(1623);
 
 SELECT EventDate
-FROM 
+FROM
 (
     SELECT EventDate
     FROM tracking_events_tmp AS t1
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize_long.sql b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize_long.sql
deleted file mode 100644
index 7a92f40b3f0..00000000000
--- a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize_long.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-drop table if exists data_01641;
-
-create table data_01641 (key Int, value String) engine=MergeTree order by (key, repeat(value, 10)) settings old_parts_lifetime=0, min_bytes_for_wide_part=0;
-
--- peak memory usage is 170MiB
-set max_memory_usage='200Mi';
-system stop merges data_01641;
-insert into data_01641 select number, toString(number) from numbers(120e6);
-
--- peak:
--- - is 21MiB if background merges already scheduled
--- - is ~60MiB otherwise
-set max_memory_usage='80Mi';
-system start merges data_01641;
-optimize table data_01641 final;
-
--- definitely should fail
-set max_memory_usage='1Mi';
-optimize table data_01641 final; -- { serverError 241 }
-
-drop table data_01641;
diff --git a/tests/queries/0_stateless/01645_system_table_engines.reference b/tests/queries/0_stateless/01645_system_table_engines.reference
index afe0584bea1..e19e6e035a6 100644
--- a/tests/queries/0_stateless/01645_system_table_engines.reference
+++ b/tests/queries/0_stateless/01645_system_table_engines.reference
@@ -1,4 +1,4 @@
-┌─name──────────────────────────┬─supports_settings─┬─supports_skipping_indices─┬─supports_sort_order─┬─supports_ttl─┬─supports_replication─┬─supports_deduplication─┬─supports_parallel_insert─┐
-│ MergeTree                     │                 1 │                         1 │                   1 │            1 │                    0 │                      0 │                        1 │
-│ ReplicatedCollapsingMergeTree │                 1 │                         1 │                   1 │            1 │                    1 │                      1 │                        1 │
-└───────────────────────────────┴───────────────────┴───────────────────────────┴─────────────────────┴──────────────┴──────────────────────┴────────────────────────┴──────────────────────────┘
+┌─name──────────────────────────┬─supports_settings─┬─supports_skipping_indices─┬─supports_projections─┬─supports_sort_order─┬─supports_ttl─┬─supports_replication─┬─supports_deduplication─┬─supports_parallel_insert─┐
+│ MergeTree                     │                 1 │                         1 │                    1 │                   1 │            1 │                    0 │                      0 │                        1 │
+│ ReplicatedCollapsingMergeTree │                 1 │                         1 │                    1 │                   1 │            1 │                    1 │                      1 │                        1 │
+└───────────────────────────────┴───────────────────┴───────────────────────────┴──────────────────────┴─────────────────────┴──────────────┴──────────────────────┴────────────────────────┴──────────────────────────┘
diff --git a/tests/queries/0_stateless/01650_expressions_merge_bug.sql b/tests/queries/0_stateless/01650_expressions_merge_bug.sql
index f28f663b2d4..3cab4dbd5a6 100644
--- a/tests/queries/0_stateless/01650_expressions_merge_bug.sql
+++ b/tests/queries/0_stateless/01650_expressions_merge_bug.sql
@@ -7,7 +7,7 @@ SELECT
             9223372036854775807
     ),
     NULL
-FROM 
+FROM
 (
     SELECT DISTINCT
         NULL,
diff --git a/tests/queries/0_stateless/01651_bugs_from_15889.reference b/tests/queries/0_stateless/01651_bugs_from_15889.reference
index 28271a697e2..77ac542d4fb 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.reference
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.reference
@@ -1,3 +1,2 @@
 0
-0
 
diff --git a/tests/queries/0_stateless/01651_bugs_from_15889.sql b/tests/queries/0_stateless/01651_bugs_from_15889.sql
index 97da4d78ab6..2764ed61291 100644
--- a/tests/queries/0_stateless/01651_bugs_from_15889.sql
+++ b/tests/queries/0_stateless/01651_bugs_from_15889.sql
@@ -8,7 +8,7 @@ INSERT INTO xp SELECT '2020-01-01', number, '' FROM numbers(100000);
 
 CREATE TABLE xp_d AS xp ENGINE = Distributed(test_shard_localhost, currentDatabase(), xp);
 
-SELECT count(7 = (SELECT number FROM numbers(0) ORDER BY number ASC NULLS FIRST LIMIT 7)) FROM xp_d PREWHERE toYYYYMM(A) GLOBAL IN (SELECT NULL = (SELECT number FROM numbers(1) ORDER BY number DESC NULLS LAST LIMIT 1), toYYYYMM(min(A)) FROM xp_d) WHERE B > NULL; -- B > NULL is evaluated to 0 and this works
+SELECT count(7 = (SELECT number FROM numbers(0) ORDER BY number ASC NULLS FIRST LIMIT 7)) FROM xp_d PREWHERE toYYYYMM(A) GLOBAL IN (SELECT NULL = (SELECT number FROM numbers(1) ORDER BY number DESC NULLS LAST LIMIT 1), toYYYYMM(min(A)) FROM xp_d) WHERE B > NULL; -- { serverError 8 }
 
 SELECT count() FROM xp_d WHERE A GLOBAL IN (SELECT NULL); -- { serverError 53 }
 
@@ -45,7 +45,7 @@ SYSTEM FLUSH LOGS;
 WITH concat(addressToLine(arrayJoin(trace) AS addr), '#') AS symbol
 SELECT count() > 7
 FROM trace_log AS t
-WHERE (query_id = 
+WHERE (query_id =
 (
     SELECT
         [NULL, NULL, NULL, NULL, 0.00009999999747378752, NULL, NULL, NULL, NULL, NULL],
@@ -60,7 +60,7 @@ WHERE (query_id =
 WITH addressToSymbol(arrayJoin(trace)) AS symbol
 SELECT count() > 0
 FROM trace_log AS t
-WHERE greaterOrEquals(event_date, ignore(ignore(ignore(NULL, '')), 256), yesterday()) AND (trace_type = 'Memory') AND (query_id = 
+WHERE greaterOrEquals(event_date, ignore(ignore(ignore(NULL, '')), 256), yesterday()) AND (trace_type = 'Memory') AND (query_id =
 (
     SELECT
         ignore(ignore(ignore(ignore(65536)), ignore(65537), ignore(2)), ''),
@@ -82,7 +82,7 @@ WITH (
         WHERE current_database = currentDatabase()
         ORDER BY query_start_time DESC
         LIMIT 1
-    ) AS time_with_microseconds, 
+    ) AS time_with_microseconds,
     (
         SELECT
             inf,
@@ -101,7 +101,7 @@ WITH (
         WHERE current_database = currentDatabase()
         ORDER BY query_start_time DESC
         LIMIT 1
-    ) AS time_with_microseconds, 
+    ) AS time_with_microseconds,
     (
         SELECT query_start_time
         FROM system.query_log
diff --git a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.reference b/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.reference
deleted file mode 100644
index 19487c9f942..00000000000
--- a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.reference
+++ /dev/null
@@ -1,140 +0,0 @@
----------Q1----------
-2	2	2	20
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = table2.a
-WHERE table2.b = toUInt32(20)
----------Q2----------
-2	2	2	20
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = table2.a
-WHERE (table2.a < table2.b) AND (table2.b = toUInt32(20))
----------Q3----------
----------Q4----------
-6	40
-SELECT
-    a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = toUInt32(10 - table2.a)
-WHERE (b = 6) AND (table2.b > 20)
----------Q5----------
-SELECT
-    a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-    WHERE 0
-) AS table2 ON a = table2.a
-WHERE 0
----------Q6----------
----------Q7----------
-0	0	0	0
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL INNER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON a = table2.a
-WHERE (table2.b < toUInt32(40)) AND (b < 1)
----------Q8----------
----------Q9---will not be optimized----------
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL LEFT JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (b = toUInt32(10))
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL RIGHT JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (b = toUInt32(10))
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL FULL OUTER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (b = toUInt32(10))
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-ALL FULL OUTER JOIN 
-(
-    SELECT
-        a,
-        b
-    FROM table2
-) AS table2 ON (a = table2.a) AND (table2.b = toUInt32(10))
-WHERE a < toUInt32(20)
-SELECT
-    a,
-    b,
-    table2.a,
-    table2.b
-FROM table1
-CROSS JOIN table2
diff --git a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.sql b/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.sql
deleted file mode 100644
index 23871a9c47c..00000000000
--- a/tests/queries/0_stateless/01653_move_conditions_from_join_on_to_where.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-DROP TABLE IF EXISTS table1;
-DROP TABLE IF EXISTS table2;
-
-CREATE TABLE table1 (a UInt32, b UInt32) ENGINE = Memory;
-CREATE TABLE table2 (a UInt32, b UInt32) ENGINE = Memory;
-
-INSERT INTO table1 SELECT number, number FROM numbers(10);
-INSERT INTO table2 SELECT number * 2, number * 20 FROM numbers(6);
-
-SELECT '---------Q1----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b = toUInt32(20));
-EXPLAIN SYNTAX SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b = toUInt32(20));
-
-SELECT '---------Q2----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.a < table2.b) AND (table2.b = toUInt32(20));
-EXPLAIN SYNTAX SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.a < table2.b) AND (table2.b = toUInt32(20));
-
-SELECT '---------Q3----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = toUInt32(table2.a + 5)) AND (table2.a < table1.b) AND (table2.b > toUInt32(20)); -- { serverError 48 }
-
-SELECT '---------Q4----------';
-SELECT table1.a, table2.b FROM table1 INNER JOIN table2 ON (table1.a = toUInt32(10 - table2.a)) AND (table1.b = 6) AND (table2.b > 20);
-EXPLAIN SYNTAX SELECT table1.a, table2.b FROM table1 INNER JOIN table2 ON (table1.a = toUInt32(10 - table2.a)) AND (table1.b = 6) AND (table2.b > 20);
-
-SELECT '---------Q5----------';
-SELECT table1.a, table2.b FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table1.b = 6) AND (table2.b > 20) AND (10 < 6);
-EXPLAIN SYNTAX SELECT table1.a, table2.b FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table1.b = 6) AND (table2.b > 20) AND (10 < 6);
-
-SELECT '---------Q6----------';
-SELECT table1.a, table2.b FROM table1 JOIN table2 ON (table1.b = 6) AND (table2.b > 20); -- { serverError 403 } 
-
-SELECT '---------Q7----------';
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(40)) where table1.b < 1;
-EXPLAIN SYNTAX SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(40)) where table1.b < 1;
-SELECT * FROM table1 JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(40)) where table1.b > 10;
-
-SELECT '---------Q8----------';
-SELECT * FROM table1 INNER JOIN table2 ON (table1.a = table2.a) AND (table2.b < toUInt32(table1, 10)); -- { serverError 47 }
-
-SELECT '---------Q9---will not be optimized----------';
-EXPLAIN SYNTAX SELECT * FROM table1 LEFT JOIN table2 ON (table1.a = table2.a) AND (table1.b = toUInt32(10));
-EXPLAIN SYNTAX SELECT * FROM table1 RIGHT JOIN table2 ON (table1.a = table2.a) AND (table1.b = toUInt32(10));
-EXPLAIN SYNTAX SELECT * FROM table1 FULL JOIN table2 ON (table1.a = table2.a) AND (table1.b = toUInt32(10));
-EXPLAIN SYNTAX SELECT * FROM table1 FULL JOIN table2 ON (table1.a = table2.a) AND (table2.b = toUInt32(10)) WHERE table1.a < toUInt32(20);
-EXPLAIN SYNTAX SELECT * FROM table1 , table2;
-
-DROP TABLE table1;
-DROP TABLE table2;
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.reference b/tests/queries/0_stateless/01655_plan_optimizations.reference
index 99b32b74ca7..22f5a2e73e3 100644
--- a/tests/queries/0_stateless/01655_plan_optimizations.reference
+++ b/tests/queries/0_stateless/01655_plan_optimizations.reference
@@ -123,3 +123,26 @@ Filter column: notEquals(y, 2)
 3	10
 
 0	37
+> filter is pushed down before CreatingSets
+CreatingSets
+Filter
+Filter
+1
+3
+> one condition of filter is pushed down before LEFT JOIN
+Join
+Filter column: notEquals(number, 1)
+Join
+0	0
+3	3
+> one condition of filter is pushed down before INNER JOIN
+Join
+Filter column: notEquals(number, 1)
+Join
+3	3
+> filter is pushed down before UNION
+Union
+Filter
+Filter
+2	3
+2	3
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.sh b/tests/queries/0_stateless/01655_plan_optimizations.sh
index 3148dc4a597..148e6157773 100755
--- a/tests/queries/0_stateless/01655_plan_optimizations.sh
+++ b/tests/queries/0_stateless/01655_plan_optimizations.sh
@@ -150,3 +150,49 @@ $CLICKHOUSE_CLIENT -q "
     select * from (
         select y, sum(x) from (select number as x, number % 4 as y from numbers(10)) group by y with totals
     ) where y != 2"
+
+echo "> filter is pushed down before CreatingSets"
+$CLICKHOUSE_CLIENT -q "
+    explain select number from (
+        select number from numbers(5) where number in (select 1 + number from numbers(3))
+    ) where number != 2 settings enable_optimize_predicate_expression=0" |
+    grep -o "CreatingSets\|Filter"
+$CLICKHOUSE_CLIENT -q "
+    select number from (
+        select number from numbers(5) where number in (select 1 + number from numbers(3))
+    ) where number != 2 settings enable_optimize_predicate_expression=0"
+
+echo "> one condition of filter is pushed down before LEFT JOIN"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1
+    select number as a, r.b from numbers(4) as l any left join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0" |
+    grep -o "Join\|Filter column: notEquals(number, 1)"
+$CLICKHOUSE_CLIENT -q "
+    select number as a, r.b from numbers(4) as l any left join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0"
+
+echo "> one condition of filter is pushed down before INNER JOIN"
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1
+    select number as a, r.b from numbers(4) as l any inner join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0" |
+    grep -o "Join\|Filter column: notEquals(number, 1)"
+$CLICKHOUSE_CLIENT -q "
+    select number as a, r.b from numbers(4) as l any inner join (
+        select number + 2 as b from numbers(3)
+    ) as r on a = r.b where a != 1 and b != 2 settings enable_optimize_predicate_expression = 0"
+
+echo "> filter is pushed down before UNION"
+$CLICKHOUSE_CLIENT -q "
+    explain select a, b from (
+        select number + 1 as a, number + 2 as b from numbers(2) union all select number + 1 as b, number + 2 as a from numbers(2)
+    ) where a != 1 settings enable_optimize_predicate_expression = 0" |
+    grep -o "Union\|Filter"
+$CLICKHOUSE_CLIENT -q "
+    select a, b from (
+        select number + 1 as a, number + 2 as b from numbers(2) union all select number + 1 as b, number + 2 as a from numbers(2)
+    ) where a != 1 settings enable_optimize_predicate_expression = 0"
diff --git a/tests/queries/0_stateless/01656_sequence_next_node_long.reference b/tests/queries/0_stateless/01656_sequence_next_node_long.reference
new file mode 100644
index 00000000000..739f19818a6
--- /dev/null
+++ b/tests/queries/0_stateless/01656_sequence_next_node_long.reference
@@ -0,0 +1,491 @@
+(forward, head, A)	1	B
+(forward, head, A)	2	\N
+(forward, head, A)	3	B
+(forward, head, A)	4	A
+(forward, head, A)	5	B
+(forward, head, A)	6	B
+(forward, head, B)	1	\N
+(forward, head, B)	2	B
+(forward, head, B)	3	\N
+(forward, head, B)	4	\N
+(forward, head, B)	5	\N
+(forward, head, B)	6	\N
+(forward, head, C)	1	\N
+(forward, head, C)	2	\N
+(forward, head, C)	3	\N
+(forward, head, C)	4	\N
+(forward, head, C)	5	\N
+(forward, head, C)	6	\N
+(forward, head, D)	1	\N
+(forward, head, D)	2	\N
+(forward, head, D)	3	\N
+(forward, head, D)	4	\N
+(forward, head, D)	5	\N
+(forward, head, D)	6	\N
+(forward, head, E)	1	\N
+(forward, head, E)	2	\N
+(forward, head, E)	3	\N
+(forward, head, E)	4	\N
+(forward, head, E)	5	\N
+(forward, head, E)	6	\N
+(backward, tail, A)	1	\N
+(backward, tail, A)	2	\N
+(backward, tail, A)	3	\N
+(backward, tail, A)	4	\N
+(backward, tail, A)	5	\N
+(backward, tail, A)	6	\N
+(backward, tail, B)	1	\N
+(backward, tail, B)	2	\N
+(backward, tail, B)	3	A
+(backward, tail, B)	4	\N
+(backward, tail, B)	5	\N
+(backward, tail, B)	6	\N
+(backward, tail, C)	1	\N
+(backward, tail, C)	2	D
+(backward, tail, C)	3	\N
+(backward, tail, C)	4	B
+(backward, tail, C)	5	A
+(backward, tail, C)	6	B
+(backward, tail, D)	1	C
+(backward, tail, D)	2	\N
+(backward, tail, D)	3	\N
+(backward, tail, D)	4	\N
+(backward, tail, D)	5	\N
+(backward, tail, D)	6	\N
+(backward, tail, E)	1	\N
+(backward, tail, E)	2	\N
+(backward, tail, E)	3	\N
+(backward, tail, E)	4	\N
+(backward, tail, E)	5	\N
+(backward, tail, E)	6	\N
+(forward, head, A->B)	1	C
+(forward, head, A->B)	2	\N
+(forward, head, A->B)	3	\N
+(forward, head, A->B)	4	\N
+(forward, head, A->B)	5	A
+(forward, head, A->B)	6	A
+(forward, head, A->C)	1	\N
+(forward, head, A->C)	2	\N
+(forward, head, A->C)	3	\N
+(forward, head, A->C)	4	\N
+(forward, head, A->C)	5	\N
+(forward, head, A->C)	6	\N
+(forward, head, B->A)	1	\N
+(forward, head, B->A)	2	\N
+(forward, head, B->A)	3	\N
+(forward, head, B->A)	4	\N
+(forward, head, B->A)	5	\N
+(forward, head, B->A)	6	\N
+(backward, tail, A->B)	1	\N
+(backward, tail, A->B)	2	\N
+(backward, tail, A->B)	3	\N
+(backward, tail, A->B)	4	\N
+(backward, tail, A->B)	5	\N
+(backward, tail, A->B)	6	\N
+(backward, tail, A->C)	1	\N
+(backward, tail, A->C)	2	\N
+(backward, tail, A->C)	3	\N
+(backward, tail, A->C)	4	\N
+(backward, tail, A->C)	5	\N
+(backward, tail, A->C)	6	\N
+(backward, tail, B->A)	1	\N
+(backward, tail, B->A)	2	\N
+(backward, tail, B->A)	3	\N
+(backward, tail, B->A)	4	\N
+(backward, tail, B->A)	5	\N
+(backward, tail, B->A)	6	\N
+(forward, head, A->A->B)	1	\N
+(forward, head, A->A->B)	2	\N
+(forward, head, A->A->B)	3	\N
+(forward, head, A->A->B)	4	\N
+(forward, head, A->A->B)	5	\N
+(forward, head, A->A->B)	6	\N
+(forward, head, B->A->A)	1	\N
+(forward, head, B->A->A)	2	\N
+(forward, head, B->A->A)	3	\N
+(forward, head, B->A->A)	4	\N
+(forward, head, B->A->A)	5	\N
+(forward, head, B->A->A)	6	\N
+(backward, tail, A->A->B)	1	\N
+(backward, tail, A->A->B)	2	\N
+(backward, tail, A->A->B)	3	\N
+(backward, tail, A->A->B)	4	\N
+(backward, tail, A->A->B)	5	\N
+(backward, tail, A->A->B)	6	\N
+(backward, tail, B->A->A)	1	\N
+(backward, tail, B->A->A)	2	\N
+(backward, tail, B->A->A)	3	\N
+(backward, tail, B->A->A)	4	\N
+(backward, tail, B->A->A)	5	\N
+(backward, tail, B->A->A)	6	\N
+(forward, head, A) id >= 10	10	B
+(forward, head, A) id >= 10	10	C
+(forward, head, A) id >= 10	10	\N
+(forward, head, A) id >= 10	10	\N
+(backward, tail, A) id >= 10	10	B
+(backward, tail, A) id >= 10	10	A
+(0, A) id = 11	1
+(0, C) id = 11	0
+(0, B->C) id = 11	0
+(0, A->B->C) id = 11	1
+(0, A) id = 11	1
+(0, C) id = 11	0
+(0, C->B) id = 11	0
+(0, C->B->A) id = 11	1
+(forward, head) id < 10	1	A
+(forward, head) id < 10	2	B
+(forward, head) id < 10	3	A
+(forward, head) id < 10	4	A
+(forward, head) id < 10	5	A
+(forward, head) id < 10	6	A
+(backward, tail) id < 10	1	D
+(backward, tail) id < 10	2	C
+(backward, tail) id < 10	3	B
+(backward, tail) id < 10	4	C
+(backward, tail) id < 10	5	C
+(backward, tail) id < 10	6	C
+(forward, first_match, A)	1	B
+(forward, first_match, A)	2	\N
+(forward, first_match, A)	3	B
+(forward, first_match, A)	4	A
+(forward, first_match, A)	5	B
+(forward, first_match, A)	6	B
+(forward, first_match, A)	10	B
+(forward, first_match, A)	11	B
+(forward, first_match, A->B)	1	C
+(forward, first_match, A->B)	2	\N
+(forward, first_match, A->B)	3	\N
+(forward, first_match, A->B)	4	\N
+(forward, first_match, A->B)	5	A
+(forward, first_match, A->B)	6	A
+(forward, first_match, A->B)	10	C
+(forward, first_match, A->B)	11	C
+(forward, first_match, A->B->C)	1	D
+(forward, first_match, A->B->C)	2	\N
+(forward, first_match, A->B->C)	3	\N
+(forward, first_match, A->B->C)	4	\N
+(forward, first_match, A->B->C)	5	\N
+(forward, first_match, A->B->C)	6	\N
+(forward, first_match, A->B->C)	10	D
+(forward, first_match, A->B->C)	11	D
+(forward, first_match, B)	1	C
+(forward, first_match, B)	2	B
+(forward, first_match, B)	3	\N
+(forward, first_match, B)	4	C
+(forward, first_match, B)	5	A
+(forward, first_match, B)	6	A
+(forward, first_match, B)	10	C
+(forward, first_match, B)	11	C
+(forward, first_match, B->B)	1	\N
+(forward, first_match, B->B)	2	D
+(forward, first_match, B->B)	3	\N
+(forward, first_match, B->B)	4	\N
+(forward, first_match, B->B)	5	\N
+(forward, first_match, B->B)	6	\N
+(forward, first_match, B->B)	10	\N
+(forward, first_match, B->B)	11	\N
+(forward, first_match, B->A)	1	\N
+(forward, first_match, B->A)	2	\N
+(forward, first_match, B->A)	3	\N
+(forward, first_match, B->A)	4	\N
+(forward, first_match, B->A)	5	C
+(forward, first_match, B->A)	6	B
+(forward, first_match, B->A)	10	\N
+(forward, first_match, B->A)	11	\N
+(backward, first_match, A)	1	\N
+(backward, first_match, A)	2	\N
+(backward, first_match, A)	3	\N
+(backward, first_match, A)	4	\N
+(backward, first_match, A)	5	\N
+(backward, first_match, A)	6	\N
+(backward, first_match, A)	10	\N
+(backward, first_match, A)	11	\N
+(backward, first_match, B)	1	A
+(backward, first_match, B)	2	\N
+(backward, first_match, B)	3	A
+(backward, first_match, B)	4	A
+(backward, first_match, B)	5	A
+(backward, first_match, B)	6	A
+(backward, first_match, B)	10	A
+(backward, first_match, B)	11	A
+(backward, first_match, B->A)	1	\N
+(backward, first_match, B->A)	2	\N
+(backward, first_match, B->A)	3	\N
+(backward, first_match, B->A)	4	A
+(backward, first_match, B->A)	5	\N
+(backward, first_match, B->A)	6	\N
+(backward, first_match, B->A)	10	\N
+(backward, first_match, B->A)	11	\N
+(backward, first_match, B->B)	1	\N
+(backward, first_match, B->B)	2	\N
+(backward, first_match, B->B)	3	\N
+(backward, first_match, B->B)	4	\N
+(backward, first_match, B->B)	5	\N
+(backward, first_match, B->B)	6	\N
+(backward, first_match, B->B)	10	\N
+(backward, first_match, B->B)	11	\N
+(forward, head, A)	1	B
+(forward, head, A)	2	\N
+(forward, head, A)	3	B
+(forward, head, A)	4	A
+(forward, head, A)	5	B
+(forward, head, A)	6	B
+(forward, head, B)	1	\N
+(forward, head, B)	2	B
+(forward, head, B)	3	\N
+(forward, head, B)	4	\N
+(forward, head, B)	5	\N
+(forward, head, B)	6	\N
+(forward, head, C)	1	\N
+(forward, head, C)	2	\N
+(forward, head, C)	3	\N
+(forward, head, C)	4	\N
+(forward, head, C)	5	\N
+(forward, head, C)	6	\N
+(forward, head, D)	1	\N
+(forward, head, D)	2	\N
+(forward, head, D)	3	\N
+(forward, head, D)	4	\N
+(forward, head, D)	5	\N
+(forward, head, D)	6	\N
+(forward, head, E)	1	\N
+(forward, head, E)	2	\N
+(forward, head, E)	3	\N
+(forward, head, E)	4	\N
+(forward, head, E)	5	\N
+(forward, head, E)	6	\N
+(backward, tail, A)	1	\N
+(backward, tail, A)	2	\N
+(backward, tail, A)	3	\N
+(backward, tail, A)	4	\N
+(backward, tail, A)	5	\N
+(backward, tail, A)	6	\N
+(backward, tail, B)	1	\N
+(backward, tail, B)	2	\N
+(backward, tail, B)	3	A
+(backward, tail, B)	4	\N
+(backward, tail, B)	5	\N
+(backward, tail, B)	6	\N
+(backward, tail, C)	1	\N
+(backward, tail, C)	2	D
+(backward, tail, C)	3	\N
+(backward, tail, C)	4	B
+(backward, tail, C)	5	A
+(backward, tail, C)	6	B
+(backward, tail, D)	1	C
+(backward, tail, D)	2	\N
+(backward, tail, D)	3	\N
+(backward, tail, D)	4	\N
+(backward, tail, D)	5	\N
+(backward, tail, D)	6	\N
+(backward, tail, E)	1	\N
+(backward, tail, E)	2	\N
+(backward, tail, E)	3	\N
+(backward, tail, E)	4	\N
+(backward, tail, E)	5	\N
+(backward, tail, E)	6	\N
+(forward, head, A->B)	1	C
+(forward, head, A->B)	2	\N
+(forward, head, A->B)	3	\N
+(forward, head, A->B)	4	\N
+(forward, head, A->B)	5	A
+(forward, head, A->B)	6	A
+(forward, head, A->C)	1	\N
+(forward, head, A->C)	2	\N
+(forward, head, A->C)	3	\N
+(forward, head, A->C)	4	\N
+(forward, head, A->C)	5	\N
+(forward, head, A->C)	6	\N
+(forward, head, B->A)	1	\N
+(forward, head, B->A)	2	\N
+(forward, head, B->A)	3	\N
+(forward, head, B->A)	4	\N
+(forward, head, B->A)	5	\N
+(forward, head, B->A)	6	\N
+(backward, tail, A->B)	1	\N
+(backward, tail, A->B)	2	\N
+(backward, tail, A->B)	3	\N
+(backward, tail, A->B)	4	\N
+(backward, tail, A->B)	5	\N
+(backward, tail, A->B)	6	\N
+(backward, tail, A->C)	1	\N
+(backward, tail, A->C)	2	\N
+(backward, tail, A->C)	3	\N
+(backward, tail, A->C)	4	\N
+(backward, tail, A->C)	5	\N
+(backward, tail, A->C)	6	\N
+(backward, tail, B->A)	1	\N
+(backward, tail, B->A)	2	\N
+(backward, tail, B->A)	3	\N
+(backward, tail, B->A)	4	\N
+(backward, tail, B->A)	5	\N
+(backward, tail, B->A)	6	\N
+(forward, head, A->A->B)	1	\N
+(forward, head, A->A->B)	2	\N
+(forward, head, A->A->B)	3	\N
+(forward, head, A->A->B)	4	\N
+(forward, head, A->A->B)	5	\N
+(forward, head, A->A->B)	6	\N
+(forward, head, B->A->A)	1	\N
+(forward, head, B->A->A)	2	\N
+(forward, head, B->A->A)	3	\N
+(forward, head, B->A->A)	4	\N
+(forward, head, B->A->A)	5	\N
+(forward, head, B->A->A)	6	\N
+(backward, tail, A->A->B)	1	\N
+(backward, tail, A->A->B)	2	\N
+(backward, tail, A->A->B)	3	\N
+(backward, tail, A->A->B)	4	\N
+(backward, tail, A->A->B)	5	\N
+(backward, tail, A->A->B)	6	\N
+(backward, tail, B->A->A)	1	\N
+(backward, tail, B->A->A)	2	\N
+(backward, tail, B->A->A)	3	\N
+(backward, tail, B->A->A)	4	\N
+(backward, tail, B->A->A)	5	\N
+(backward, tail, B->A->A)	6	\N
+(forward, head, A) id >= 10	10	B
+(forward, head, A) id >= 10	10	C
+(forward, head, A) id >= 10	10	\N
+(forward, head, A) id >= 10	10	\N
+(backward, tail, A) id >= 10	10	B
+(backward, tail, A) id >= 10	10	A
+(0, A) id = 11	1
+(0, C) id = 11	0
+(0, B->C) id = 11	0
+(0, A->B->C) id = 11	1
+(0, A) id = 11	1
+(0, C) id = 11	0
+(0, C->B) id = 11	0
+(0, C->B->A) id = 11	1
+(forward, head) id < 10	1	A
+(forward, head) id < 10	2	B
+(forward, head) id < 10	3	A
+(forward, head) id < 10	4	A
+(forward, head) id < 10	5	A
+(forward, head) id < 10	6	A
+(backward, tail) id < 10	1	D
+(backward, tail) id < 10	2	C
+(backward, tail) id < 10	3	B
+(backward, tail) id < 10	4	C
+(backward, tail) id < 10	5	C
+(backward, tail) id < 10	6	C
+(forward, first_match, A)	1	B
+(forward, first_match, A)	2	\N
+(forward, first_match, A)	3	B
+(forward, first_match, A)	4	A
+(forward, first_match, A)	5	B
+(forward, first_match, A)	6	B
+(forward, first_match, A)	10	B
+(forward, first_match, A)	11	B
+(forward, first_match, A->B)	1	C
+(forward, first_match, A->B)	2	\N
+(forward, first_match, A->B)	3	\N
+(forward, first_match, A->B)	4	\N
+(forward, first_match, A->B)	5	A
+(forward, first_match, A->B)	6	A
+(forward, first_match, A->B)	10	C
+(forward, first_match, A->B)	11	C
+(forward, first_match, A->B->C)	1	D
+(forward, first_match, A->B->C)	2	\N
+(forward, first_match, A->B->C)	3	\N
+(forward, first_match, A->B->C)	4	\N
+(forward, first_match, A->B->C)	5	\N
+(forward, first_match, A->B->C)	6	\N
+(forward, first_match, A->B->C)	10	D
+(forward, first_match, A->B->C)	11	D
+(forward, first_match, B)	1	C
+(forward, first_match, B)	2	B
+(forward, first_match, B)	3	\N
+(forward, first_match, B)	4	C
+(forward, first_match, B)	5	A
+(forward, first_match, B)	6	A
+(forward, first_match, B)	10	C
+(forward, first_match, B)	11	C
+(forward, first_match, B->B)	1	\N
+(forward, first_match, B->B)	2	D
+(forward, first_match, B->B)	3	\N
+(forward, first_match, B->B)	4	\N
+(forward, first_match, B->B)	5	\N
+(forward, first_match, B->B)	6	\N
+(forward, first_match, B->B)	10	\N
+(forward, first_match, B->B)	11	\N
+(forward, first_match, B->A)	1	\N
+(forward, first_match, B->A)	2	\N
+(forward, first_match, B->A)	3	\N
+(forward, first_match, B->A)	4	\N
+(forward, first_match, B->A)	5	C
+(forward, first_match, B->A)	6	B
+(forward, first_match, B->A)	10	\N
+(forward, first_match, B->A)	11	\N
+(backward, first_match, A)	1	\N
+(backward, first_match, A)	2	\N
+(backward, first_match, A)	3	\N
+(backward, first_match, A)	4	\N
+(backward, first_match, A)	5	\N
+(backward, first_match, A)	6	\N
+(backward, first_match, A)	10	\N
+(backward, first_match, A)	11	\N
+(backward, first_match, B)	1	A
+(backward, first_match, B)	2	\N
+(backward, first_match, B)	3	A
+(backward, first_match, B)	4	A
+(backward, first_match, B)	5	A
+(backward, first_match, B)	6	A
+(backward, first_match, B)	10	A
+(backward, first_match, B)	11	A
+(backward, first_match, B->A)	1	\N
+(backward, first_match, B->A)	2	\N
+(backward, first_match, B->A)	3	\N
+(backward, first_match, B->A)	4	A
+(backward, first_match, B->A)	5	\N
+(backward, first_match, B->A)	6	\N
+(backward, first_match, B->A)	10	\N
+(backward, first_match, B->A)	11	\N
+(backward, first_match, B->B)	1	\N
+(backward, first_match, B->B)	2	\N
+(backward, first_match, B->B)	3	\N
+(backward, first_match, B->B)	4	\N
+(backward, first_match, B->B)	5	\N
+(backward, first_match, B->B)	6	\N
+(backward, first_match, B->B)	10	\N
+(backward, first_match, B->B)	11	\N
+(max_args)	1	\N
+(max_args)	2	\N
+(max_args)	3	\N
+(max_args)	4	\N
+(max_args)	5	\N
+(max_args)	6	\N
+(max_args)	10	\N
+(max_args)	11	\N
+(forward, head, A) id = 12	A
+(forward, head, 1)	1	A
+(forward, head, 1)	2	\N
+(forward, head, 1)	3	\N
+(forward, head, 1, A)	1	B
+(forward, head, 1, A)	2	\N
+(forward, head, 1, A)	3	\N
+(forward, head, 1, A->B)	1	C
+(forward, head, 1, A->B)	2	\N
+(forward, head, 1, A->B)	3	\N
+(backward, tail, 1)	1	\N
+(backward, tail, 1)	2	A
+(backward, tail, 1)	3	\N
+(backward, tail, 1, A)	1	\N
+(backward, tail, 1, A)	2	B
+(backward, tail, 1, A)	3	\N
+(backward, tail, 1, A->B)	1	\N
+(backward, tail, 1, A->B)	2	C
+(backward, tail, 1, A->B)	3	\N
+(forward, first_match, 1, B)	1	C
+(forward, first_match, 1, B)	2	A
+(forward, first_match, 1, B)	3	D
+(forward, first_match, 1, B->C)	1	D
+(forward, first_match, 1, B->C)	2	\N
+(forward, first_match, 1, B->C)	3	\N
+(backward, first_match, 1, B)	1	A
+(backward, first_match, 1, B)	2	C
+(backward, first_match, 1, B)	3	B
+(backward, first_match, 1, B->C)	1	\N
+(backward, first_match, 1, B->C)	2	\N
+(backward, first_match, 1, B->C)	3	\N
diff --git a/tests/queries/0_stateless/01656_sequence_next_node_long.sql b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
new file mode 100644
index 00000000000..d0d01e989b8
--- /dev/null
+++ b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
@@ -0,0 +1,233 @@
+SET allow_experimental_funnel_functions = 1;
+
+DROP TABLE IF EXISTS test_sequenceNextNode_Nullable;
+
+CREATE TABLE IF NOT EXISTS test_sequenceNextNode_Nullable (dt DateTime, id int, action Nullable(String)) ENGINE = MergeTree() PARTITION BY dt ORDER BY id;
+
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',1,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',1,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:03',1,'C');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:04',1,'D');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',2,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',2,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:03',2,'D');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:04',2,'C');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',3,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',3,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',4,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',4,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:03',4,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:04',4,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:05',4,'C');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',5,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',5,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:03',5,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:04',5,'C');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',6,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',6,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:03',6,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:04',6,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:05',6,'C');
+
+SELECT '(forward, head, A)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, B)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, C)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, D)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'D') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, E)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'E') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, B)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, C)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, D)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'D') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, E)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'E') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, A->B)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, A->C)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'C') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, B->A)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A->B)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A->C)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A', action = 'C') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, B->A)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, A->A->B)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, head, B->A->A)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action = 'A', action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A->A->B)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A', action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, tail, B->A->A)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'B', action = 'A', action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',10,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',10,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:02',10,NULL);
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:03',10,'C');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:04',10,'D');
+
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode_Nullable WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action = 'C') AS next_node FROM test_sequenceNextNode_Nullable WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode_Nullable WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A) id >= 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'D', action = 'C') AS next_node FROM test_sequenceNextNode_Nullable WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A) id >= 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'D', action = 'C', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable WHERE id >= 10 GROUP BY id ORDER BY id;
+
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',11,'A');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',11,'B');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',11,'C');
+INSERT INTO test_sequenceNextNode_Nullable values ('1970-01-01 09:00:01',11,'D');
+
+SELECT '(0, A) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node  = 'B');
+SELECT '(0, C) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node = 'D');
+SELECT '(0, B->C) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action ='C') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node = 'D');
+SELECT '(0, A->B->C) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'B', action = 'C') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node = 'D');
+SELECT '(0, A) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node is NULL);
+SELECT '(0, C) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node = 'B');
+SELECT '(0, C->B) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C', action ='B') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node = 'A');
+SELECT '(0, C->B->A) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C', action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode_Nullable WHERE id = 11 GROUP BY id HAVING next_node is null);
+
+SELECT '(forward, head) id < 10', id, sequenceNextNode('forward', 'head')(dt, action, 1) AS next_node FROM test_sequenceNextNode_Nullable WHERE id < 10 GROUP BY id ORDER BY id;
+SELECT '(backward, tail) id < 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1) AS next_node FROM test_sequenceNextNode_Nullable WHERE id < 10 GROUP BY id ORDER BY id;
+
+SELECT '(forward, first_match, A)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, A->B)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, A->B->C)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'A', action = 'B', action = 'C') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, B)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, B->B)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'B', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, B->A)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+
+SELECT '(backward, first_match, A)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, first_match, B)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, first_match, B->A)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+SELECT '(backward, first_match, B->B)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'B', action = 'B') AS next_node FROM test_sequenceNextNode_Nullable GROUP BY id ORDER BY id;
+
+DROP TABLE IF EXISTS test_sequenceNextNode_Nullable;
+
+-- The same testcases for a non-null type.
+
+DROP TABLE IF EXISTS test_sequenceNextNode;
+
+CREATE TABLE IF NOT EXISTS test_sequenceNextNode (dt DateTime, id int, action String) ENGINE = MergeTree() PARTITION BY dt ORDER BY id;
+
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',1,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:02',1,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:03',1,'C');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:04',1,'D');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',2,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:02',2,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:03',2,'D');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:04',2,'C');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',3,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:02',3,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',4,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:02',4,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:03',4,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:04',4,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:05',4,'C');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',5,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:02',5,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:03',5,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:04',5,'C');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',6,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:02',6,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:03',6,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:04',6,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:05',6,'C');
+
+SELECT '(forward, head, A)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, B)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, C)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, D)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'D') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, E)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'E') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, B)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, C)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, D)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'D') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, E)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'E') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, A->B)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, A->C)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'C') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, B->A)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A->B)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A->C)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A', action = 'C') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, B->A)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, A->A->B)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, head, B->A->A)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action = 'A', action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A->A->B)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A', action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, tail, B->A->A)', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'B', action = 'A', action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',10,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:02',10,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:03',10,'C');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:04',10,'D');
+
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action = 'C') AS next_node FROM test_sequenceNextNode WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(forward, head, A) id >= 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A) id >= 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'D', action = 'C') AS next_node FROM test_sequenceNextNode WHERE id >= 10 GROUP BY id ORDER BY id;
+SELECT '(backward, tail, A) id >= 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'D', action = 'C', action = 'B') AS next_node FROM test_sequenceNextNode WHERE id >= 10 GROUP BY id ORDER BY id;
+
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',11,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',11,'B');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',11,'C');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',11,'D');
+
+SELECT '(0, A) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node  = 'B');
+SELECT '(0, C) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node = 'D');
+SELECT '(0, B->C) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'B', action ='C') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node = 'D');
+SELECT '(0, A->B->C) id = 11', count() FROM (SELECT id, sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A', action = 'B', action = 'C') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node = 'D');
+SELECT '(0, A) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node is NULL);
+SELECT '(0, C) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node = 'B');
+SELECT '(0, C->B) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C', action ='B') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node = 'A');
+SELECT '(0, C->B->A) id = 11', count() FROM (SELECT id, sequenceNextNode('backward', 'tail')(dt, action, 1, action = 'C', action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode WHERE id = 11 GROUP BY id HAVING next_node is null);
+
+SELECT '(forward, head) id < 10', id, sequenceNextNode('forward', 'head')(dt, action, 1) AS next_node FROM test_sequenceNextNode WHERE id < 10 GROUP BY id ORDER BY id;
+SELECT '(backward, tail) id < 10', id, sequenceNextNode('backward', 'tail')(dt, action, 1) AS next_node FROM test_sequenceNextNode WHERE id < 10 GROUP BY id ORDER BY id;
+
+SELECT '(forward, first_match, A)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, A->B)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'A', action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, A->B->C)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'A', action = 'B', action = 'C') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, B)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, B->B)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'B', action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, B->A)', id, sequenceNextNode('forward', 'first_match')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+
+SELECT '(backward, first_match, A)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, first_match, B)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, first_match, B->A)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'B', action = 'A') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+SELECT '(backward, first_match, B->B)', id, sequenceNextNode('backward', 'first_match')(dt, action, 1, action = 'B', action = 'B') AS next_node FROM test_sequenceNextNode GROUP BY id ORDER BY id;
+
+SELECT '(max_args)', id, sequenceNextNode('forward', 'head')(dt, action, 1, action = '0', action = '1', action = '2', action = '3', action = '4', action = '5', action = '6', action = '7', action = '8', action = '9', action = '10', action = '11', action = '12', action = '13', action = '14', action = '15', action = '16', action = '17', action = '18', action = '19', action = '20', action = '21', action = '22', action = '23', action = '24', action = '25', action = '26', action = '27', action = '28', action = '29', action = '30', action = '31', action = '32', action = '33', action = '34', action = '35', action = '36', action = '37', action = '38', action = '39', action = '40', action = '41', action = '42', action = '43', action = '44', action = '45', action = '46', action = '47', action = '48', action = '49', action = '50', action = '51', action = '52', action = '53', action = '54', action = '55', action = '56', action = '57', action = '58', action = '59', action = '60', action = '61', action = '62', action = '63') from test_sequenceNextNode GROUP BY id ORDER BY id;
+
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',12,'A');
+INSERT INTO test_sequenceNextNode values ('1970-01-01 09:00:01',12,'A');
+
+SELECT '(forward, head, A) id = 12', sequenceNextNode('forward', 'head')(dt, action, 1, action = 'A') AS next_node FROM test_sequenceNextNode WHERE id = 12;
+
+DROP TABLE IF EXISTS test_sequenceNextNode;
+
+DROP TABLE IF EXISTS test_base_condition;
+
+CREATE TABLE IF NOT EXISTS test_base_condition (dt DateTime, id int, action String, referrer String) ENGINE = MergeTree() PARTITION BY dt ORDER BY id;
+
+INSERT INTO test_base_condition values ('1970-01-01 09:00:01',1,'A','1');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:02',1,'B','2');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:03',1,'C','3');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:04',1,'D','4');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:01',2,'D','4');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:02',2,'C','3');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:03',2,'B','2');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:04',2,'A','1');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:01',3,'B','10');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:02',3,'B','2');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:03',3,'D','3');
+INSERT INTO test_base_condition values ('1970-01-01 09:00:04',3,'C','4');
+
+SELECT '(forward, head, 1)', id, sequenceNextNode('forward', 'head')(dt, action, referrer = '1') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+SELECT '(forward, head, 1, A)', id, sequenceNextNode('forward', 'head')(dt, action, referrer = '1', action = 'A') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+SELECT '(forward, head, 1, A->B)', id, sequenceNextNode('forward', 'head')(dt, action, referrer = '1', action = 'A', action = 'B') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+
+SELECT '(backward, tail, 1)', id, sequenceNextNode('backward', 'tail')(dt, action, referrer = '1') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+SELECT '(backward, tail, 1, A)', id, sequenceNextNode('backward', 'tail')(dt, action, referrer = '1', action = 'A') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+SELECT '(backward, tail, 1, A->B)', id, sequenceNextNode('backward', 'tail')(dt, action, referrer = '1', action = 'A', action = 'B') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+
+SELECT '(forward, first_match, 1, B)', id, sequenceNextNode('forward', 'first_match')(dt, action, referrer = '2', action = 'B') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+SELECT '(forward, first_match, 1, B->C)', id, sequenceNextNode('forward', 'first_match')(dt, action, referrer = '2', action = 'B', action = 'C') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+
+SELECT '(backward, first_match, 1, B)', id, sequenceNextNode('backward', 'first_match')(dt, action, referrer = '2', action = 'B') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+SELECT '(backward, first_match, 1, B->C)', id, sequenceNextNode('backward', 'first_match')(dt, action, referrer = '2', action = 'B', action = 'A') AS next_node FROM test_base_condition GROUP BY id ORDER BY id;
+
+SET allow_experimental_funnel_functions = 0;
+SELECT '(backward, first_match, 1, B->C)', id, sequenceNextNode('backward', 'first_match')(dt, action, referrer = '2', action = 'B', action = 'A') AS next_node FROM test_base_condition GROUP BY id ORDER BY id; -- { serverError 63 }
+
+DROP TABLE IF EXISTS test_base_condition;
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 87659c32e39..1d0901cf9f6 100644
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.reference
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.reference
@@ -8,11 +8,11 @@ ccccccccc	aaaaaaaaa	bbbbbbbbb
 aaaaaaaaa
 bbbbbbbbb
 ccccccccc
-:107
+:233
 :79
 :35
 :35
-:35
+:233
 699415
 aaaaaaaaa	bbbbbbbbb
 ccccccccc	aaaaaaaaa	bbbbbbbbb
@@ -21,5 +21,5 @@ ccccccccc	aaaaaaaaa	bbbbbbbbb
 ccccccccc	aaaaaaaaa	bbbbbbbbb
 699415	0
 :0
-:107
+:70
 :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 593f0e59ea7..072e8d75f52 100755
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # 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}')
+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}/
 echo -n aaaaaaaaa > ${user_files_path}/a.txt
diff --git a/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql b/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
index 48d3baba0c5..a056d77896c 100644
--- a/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
+++ b/tests/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
@@ -1 +1,2 @@
 SELECT repeat('abcdefghijklmnopqrstuvwxyz', number * 100) AS haystack, extractAllGroupsHorizontal(haystack, '(\\w)') AS matches FROM numbers(1023); -- { serverError 128 }
+SELECT count(extractAllGroupsHorizontal(materialize('a'), '(a)')) FROM numbers(1000000) FORMAT Null; -- shouldn't fail
diff --git a/tests/queries/0_stateless/01666_gcd_ubsan.reference b/tests/queries/0_stateless/01666_gcd_ubsan.reference
index af041bdcbde..37b1968542e 100644
--- a/tests/queries/0_stateless/01666_gcd_ubsan.reference
+++ b/tests/queries/0_stateless/01666_gcd_ubsan.reference
@@ -5,8 +5,10 @@ SELECT gcd(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
 SELECT gcd(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
 SELECT gcd(9223372036854775808, -1); -- { serverError 407 }
 SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 43 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728));
+170141183460469231722463931679029329921
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720));
+170141183460469231722463931679029329921
 SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
 170141183460469231731687303715884105720
 SELECT gcd(-9223372036854775806, -9223372036854775806);
diff --git a/tests/queries/0_stateless/01666_gcd_ubsan.sql b/tests/queries/0_stateless/01666_gcd_ubsan.sql
index a1f501cda0b..da41022ddeb 100644
--- a/tests/queries/0_stateless/01666_gcd_ubsan.sql
+++ b/tests/queries/0_stateless/01666_gcd_ubsan.sql
@@ -5,7 +5,7 @@ SELECT gcd(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
 SELECT gcd(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
 SELECT gcd(9223372036854775808, -1); -- { serverError 407 }
 SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 43 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728));
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720));
 SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
 SELECT gcd(-9223372036854775806, -9223372036854775806);
diff --git a/tests/queries/0_stateless/01666_lcm_ubsan.reference b/tests/queries/0_stateless/01666_lcm_ubsan.reference
index d8ed13191d3..bd1972e8a6d 100644
--- a/tests/queries/0_stateless/01666_lcm_ubsan.reference
+++ b/tests/queries/0_stateless/01666_lcm_ubsan.reference
@@ -5,8 +5,10 @@ SELECT lcm(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
 SELECT lcm(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
 SELECT lcm(9223372036854775808, -1); -- { serverError 407 }
 SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 43 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728));
+170141183460469231722463931679029329921
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720));
+170141183460469231722463931679029329921
 SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
 170141183460469231731687303715884105720
 SELECT lcm(-9223372036854775806, -9223372036854775806);
diff --git a/tests/queries/0_stateless/01666_lcm_ubsan.sql b/tests/queries/0_stateless/01666_lcm_ubsan.sql
index b3b869c80ed..8ebdf148a65 100644
--- a/tests/queries/0_stateless/01666_lcm_ubsan.sql
+++ b/tests/queries/0_stateless/01666_lcm_ubsan.sql
@@ -5,7 +5,7 @@ SELECT lcm(-9223372036854775808, 9223372036854775807); -- { serverError 407 }
 SELECT lcm(-9223372036854775807, 9223372036854775808); -- { serverError 407 }
 SELECT lcm(9223372036854775808, -1); -- { serverError 407 }
 SELECT lcm(-170141183460469231731687303715884105728, -170141183460469231731687303715884105728); -- { serverError 43 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728)); -- { serverError 407 }
-SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720)); -- { serverError 407 }
+SELECT lcm(toInt128(-170141183460469231731687303715884105728), toInt128(-170141183460469231731687303715884105728));
+SELECT lcm(toInt128(-170141183460469231731687303715884105720), toInt128(-170141183460469231731687303715884105720));
 SELECT lcm(toInt128('-170141183460469231731687303715884105720'), toInt128('-170141183460469231731687303715884105720'));
 SELECT lcm(-9223372036854775806, -9223372036854775806);
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 5bb93371483..c5fbb35a9cd 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
@@ -15,13 +15,13 @@ drop table if exists simple;
 create table simple (i int, j int) engine = MergeTree order by i
 settings index_granularity = 1, max_concurrent_queries = 1, min_marks_to_honor_max_concurrent_queries = 2;
 
-insert into simple select number, number + 100 from numbers(1000);
+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.01) 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
diff --git a/tests/queries/0_stateless/01670_log_comment.sql b/tests/queries/0_stateless/01670_log_comment.sql
index c1496273784..2fb61eb5812 100644
--- a/tests/queries/0_stateless/01670_log_comment.sql
+++ b/tests/queries/0_stateless/01670_log_comment.sql
@@ -1,5 +1,5 @@
 SET log_comment = 'log_comment test', log_queries = 1;
 SELECT 1;
 SYSTEM FLUSH LOGS;
-SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND event_date >= yesterday() AND type = 1 ORDER BY event_time DESC LIMIT 1;
-SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;
+SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND query LIKE 'SELECT 1%' AND event_date >= yesterday() AND type = 1 ORDER BY event_time_microseconds DESC LIMIT 1;
+SELECT type, query FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = 'log_comment test' AND query LIKE 'SELECT 1%' AND event_date >= yesterday() AND type = 2 ORDER BY event_time_microseconds DESC LIMIT 1;
diff --git a/tests/queries/0_stateless/01670_neighbor_lc_bug.sql b/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
index de9afcf1495..2d99225aa89 100644
--- a/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
+++ b/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
@@ -33,7 +33,7 @@ SELECT
     val_low,
     neighbor(val_low, -1) AS low_m1,
     neighbor(val_low, 1) AS low_p1
-FROM 
+FROM
 (
     SELECT *
     FROM neighbor_test
diff --git a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.sh b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.sh
deleted file mode 100755
index bad12e4cd58..00000000000
--- a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env bash
-
-# NOTE: $SECONDS accuracy is second, so we need some delta, hence -1 in time conditions.
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-max_delay_to_insert=5
-
-${CLICKHOUSE_CLIENT} -nq "
-drop table if exists dist_01675;
-drop table if exists data_01675;
-"
-
-${CLICKHOUSE_CLIENT} -nq "
-create table data_01675 (key Int) engine=Null();
-create table dist_01675 (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data_01675) settings bytes_to_delay_insert=1, max_delay_to_insert=$max_delay_to_insert;
-system stop distributed sends dist_01675;
-"
-
-#
-# Case 1: max_delay_to_insert will throw.
-#
-echo "max_delay_to_insert will throw"
-
-start_seconds=$SECONDS
-${CLICKHOUSE_CLIENT} --testmode -nq "
--- first batch is always OK, since there is no pending bytes yet
-insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
--- second will fail, because of bytes_to_delay_insert=1 and max_delay_to_insert=5,
--- while distributed sends is stopped.
---
--- (previous block definitelly takes more, since it has header)
-insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0; -- { serverError 574 }
-system flush distributed dist_01675;
-"
-end_seconds=$SECONDS
-
-if (( (end_seconds-start_seconds)<(max_delay_to_insert-1) )); then
-    echo "max_delay_to_insert was not satisfied ($end_seconds-$start_seconds)"
-fi
-
-#
-# Case 2: max_delay_to_insert will finally finished.
-#
-echo "max_delay_to_insert will succeed"
-
-max_delay_to_insert=10
-${CLICKHOUSE_CLIENT} -nq "
-drop table dist_01675;
-create table dist_01675 (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data_01675) settings bytes_to_delay_insert=1, max_delay_to_insert=$max_delay_to_insert;
-system stop distributed sends dist_01675;
-"
-
-flush_delay=4
-function flush_distributed_worker()
-{
-    sleep $flush_delay
-    ${CLICKHOUSE_CLIENT} -q "system flush distributed dist_01675"
-    echo flushed
-}
-flush_distributed_worker &
-
-start_seconds=$SECONDS
-${CLICKHOUSE_CLIENT} --testmode -nq "
--- first batch is always OK, since there is no pending bytes yet
-insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
--- second will succcedd, due to SYSTEM FLUSH DISTRIBUTED in background.
-insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
-"
-end_seconds=$SECONDS
-wait
-
-if (( (end_seconds-start_seconds)<(flush_delay-1) )); then
-    echo "max_delay_to_insert was not wait flush_delay ($end_seconds-$start_seconds)"
-fi
-if (( (end_seconds-start_seconds)>=(max_delay_to_insert-1) )); then
-    echo "max_delay_to_insert was overcommited ($end_seconds-$start_seconds)"
-fi
-
-
-${CLICKHOUSE_CLIENT} -nq "
-drop table dist_01675;
-drop table data_01675;
-"
diff --git a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.reference b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.reference
similarity index 88%
rename from tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.reference
rename to tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.reference
index d8c50c741ea..343d1f3639f 100644
--- a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert.reference
+++ b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.reference
@@ -1,3 +1,2 @@
 max_delay_to_insert will throw
 max_delay_to_insert will succeed
-flushed
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
new file mode 100755
index 00000000000..5687fe323d0
--- /dev/null
+++ b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
@@ -0,0 +1,129 @@
+#!/usr/bin/env bash
+
+# NOTE: $SECONDS accuracy is second, so we need some delta, hence -1 in time conditions.
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function drop_tables()
+{
+    ${CLICKHOUSE_CLIENT} -nq "
+        drop table if exists dist_01675;
+        drop table if exists data_01675;
+    "
+}
+
+#
+# Case 1: max_delay_to_insert will throw.
+#
+function test_max_delay_to_insert_will_throw()
+{
+    echo "max_delay_to_insert will throw"
+
+    local max_delay_to_insert=2
+    ${CLICKHOUSE_CLIENT} -nq "
+        create table data_01675 (key Int) engine=Null();
+        create table dist_01675 (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data_01675) settings bytes_to_delay_insert=1, max_delay_to_insert=$max_delay_to_insert;
+        system stop distributed sends dist_01675;
+    "
+
+    local start_seconds=$SECONDS
+    ${CLICKHOUSE_CLIENT} --testmode -nq "
+        -- first batch is always OK, since there is no pending bytes yet
+        insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
+        -- second will fail, because of bytes_to_delay_insert=1 and max_delay_to_insert>0,
+        -- while distributed sends is stopped.
+        --
+        -- (previous block definitelly takes more, since it has header)
+        insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0; -- { serverError 574 }
+        system flush distributed dist_01675;
+    "
+    local end_seconds=$SECONDS
+
+    if (( (end_seconds-start_seconds)<(max_delay_to_insert-1) )); then
+        echo "max_delay_to_insert was not satisfied ($end_seconds-$start_seconds)"
+    fi
+}
+
+#
+# Case 2: max_delay_to_insert will finally finished.
+#
+function test_max_delay_to_insert_will_succeed_once()
+{
+    local max_delay_to_insert=4
+    local flush_delay=2
+
+    drop_tables
+
+    ${CLICKHOUSE_CLIENT} -nq "
+        create table data_01675 (key Int) engine=Null();
+        create table dist_01675 (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data_01675) settings bytes_to_delay_insert=1, max_delay_to_insert=$max_delay_to_insert;
+        system stop distributed sends dist_01675;
+    "
+
+    function flush_distributed_worker()
+    {
+        sleep $flush_delay
+        ${CLICKHOUSE_CLIENT} -q "system flush distributed dist_01675"
+    }
+    flush_distributed_worker &
+
+    local start_seconds=$SECONDS
+    # ignore stderr, since it may produce exception if flushing thread will be too slow
+    # (this is possible on CI)
+    ${CLICKHOUSE_CLIENT} --testmode -nq "
+        -- first batch is always OK, since there is no pending bytes yet
+        insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
+        -- second will succeed, due to SYSTEM FLUSH DISTRIBUTED in background.
+        insert into dist_01675 select * from numbers(1) settings prefer_localhost_replica=0;
+    " >& /dev/null
+    local end_seconds=$SECONDS
+    wait
+
+    local diff=$(( end_seconds-start_seconds ))
+
+    if (( diff<(flush_delay-1) )); then
+        # this is fatal error, that should not be retriable
+        echo "max_delay_to_insert was not wait flush_delay ($diff)"
+        exit 1
+    fi
+
+    # retry the test until the diff will be satisfied
+    # (since we cannot assume that there will be no other lags)
+    if (( diff>=(max_delay_to_insert-1) )); then
+        return 1
+    fi
+
+    return 0
+}
+function test_max_delay_to_insert_will_succeed()
+{
+    echo "max_delay_to_insert will succeed"
+
+    local retries=20 i=0
+    while (( (i++) < retries )); do
+        if test_max_delay_to_insert_will_succeed_once; then
+            return
+        fi
+    done
+
+    echo failed
+}
+
+function run_test()
+{
+    local test_case=$1 && shift
+
+    drop_tables
+    $test_case
+}
+
+function main()
+{
+    run_test test_max_delay_to_insert_will_throw
+    run_test test_max_delay_to_insert_will_succeed
+
+    drop_tables
+}
+main "$@"
diff --git a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.reference b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
similarity index 78%
rename from tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
rename to tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
index 08e07044841..8e13f2dcaee 100755
--- a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
+++ b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
@@ -4,6 +4,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+# NOTE: database = $CLICKHOUSE_DATABASE is superfluous
+
 function test_completion_word()
 {
     local w=$1 && shift
@@ -13,7 +15,7 @@ function test_completion_word()
     local compword_end=${w:$((w_len-3))}
 
     # NOTE: here and below you should escape variables of the expect.
-    timeout 22s expect << EOF
+    timeout 60s expect << EOF
 log_user 0
 set timeout 3
 match_max 100000
@@ -69,18 +71,6 @@ compwords_positive=(
     max_concurrent_queries_for_all_users
     # system.clusters
     test_shard_localhost
-    # system.errors, also it is very rare to cover system_events_show_zero_values
-    CONDITIONAL_TREE_PARENT_NOT_FOUND
-    # system.events, also it is very rare to cover system_events_show_zero_values
-    WriteBufferFromFileDescriptorWriteFailed
-    # system.asynchronous_metrics, also this metric has zero value
-    #
-    # NOTE: that there is no ability to complete metrics like
-    # jemalloc.background_thread.num_runs, due to "." is used as a word breaker
-    # (and this cannot be changed -- db.table)
-    ReplicasMaxAbsoluteDelay
-    # system.metrics
-    PartsPreCommitted
     # system.macros
     default_path_test
     # system.storage_policies, egh not uniq
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
new file mode 100755
index 00000000000..3e6b5146a80
--- /dev/null
+++ b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
@@ -0,0 +1,132 @@
+#!/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}')
+
+$CLICKHOUSE_CLIENT -n --query="
+    DROP DATABASE IF EXISTS 01684_database_for_cache_dictionary;
+    CREATE DATABASE 01684_database_for_cache_dictionary;
+
+    CREATE TABLE 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table
+    (
+    id UInt64,
+    value_first String,
+    value_second String
+    )
+    ENGINE = TinyLog;
+
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+    CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
+    LIFETIME(MIN 1 MAX 1000)
+    LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));
+
+    SELECT 'Dictionary cache_dictionary_simple_key_simple_attributes';
+    SELECT 'dictGet existing value';
+    SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+        dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+    SELECT 'dictGet with non existing value';
+    SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+        dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+    SELECT 'dictGetOrDefault existing value';
+    SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+        dictGetOrDefault('01684_database_for_cache_dictionary.cache_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('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+        dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+    SELECT 'dictHas';
+    SELECT dictHas('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+    SELECT 'select all values as input stream';
+    SELECT * FROM 01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes ORDER BY id;
+
+    DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes;
+    DROP TABLE 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table;
+
+    CREATE TABLE 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table
+    (
+    id UInt64,
+    value_first String,
+    value_second Nullable(String)
+    )
+    ENGINE = TinyLog;
+
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+    CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
+    LIFETIME(MIN 1 MAX 1000)
+    LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/1d'));
+
+    SELECT 'Dictionary cache_dictionary_simple_key_complex_attributes';
+    SELECT 'dictGet existing value';
+    SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+        dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+    SELECT 'dictGet with non existing value';
+    SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+        dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+    SELECT 'dictGetOrDefault existing value';
+    SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+        dictGetOrDefault('01684_database_for_cache_dictionary.cache_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('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+        dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+    SELECT 'dictHas';
+    SELECT dictHas('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+    SELECT 'select all values as input stream';
+    SELECT * FROM 01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes ORDER BY id;
+
+    DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes;
+    DROP TABLE 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table;
+
+    CREATE TABLE 01684_database_for_cache_dictionary.simple_key_hierarchy_table
+    (
+        id UInt64,
+        parent_id UInt64
+    ) ENGINE = TinyLog();
+
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (1, 0);
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (2, 1);
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (3, 1);
+    INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (4, 2);
+
+    CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_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'))
+    LIFETIME(MIN 1 MAX 1000)
+    LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/2d'));
+
+    SELECT 'Dictionary cache_dictionary_simple_key_hierarchy';
+    SELECT 'dictGet';
+    SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+    SELECT 'dictGetHierarchy';
+    SELECT dictGetHierarchy('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(1));
+    SELECT dictGetHierarchy('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(4));
+
+    DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy;
+    DROP TABLE 01684_database_for_cache_dictionary.simple_key_hierarchy_table;
+
+    DROP DATABASE 01684_database_for_cache_dictionary;"
diff --git a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sql b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sql
deleted file mode 100644
index 9dbad1289f1..00000000000
--- a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sql
+++ /dev/null
@@ -1,123 +0,0 @@
-DROP DATABASE IF EXISTS 01684_database_for_cache_dictionary;
-CREATE DATABASE 01684_database_for_cache_dictionary;
-
-CREATE TABLE 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table
-(
-   id UInt64,
-   value_first String,
-   value_second String
-)
-ENGINE = TinyLog;
-
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
-
-CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_simple_attributes_source_table'))
-LIFETIME(MIN 1 MAX 1000)
-LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
-
-SELECT 'Dictionary cache_dictionary_simple_key_simple_attributes';
-SELECT 'dictGet existing value';
-SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
-    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
-SELECT 'dictGet with non existing value';
-SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
-    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
-SELECT 'dictGetOrDefault existing value';
-SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
-    dictGetOrDefault('01684_database_for_cache_dictionary.cache_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('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
-    dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
-SELECT 'dictHas';
-SELECT dictHas('01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
-SELECT 'select all values as input stream';
-SELECT * FROM 01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes ORDER BY id;
-
-DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_simple_attributes;
-DROP TABLE 01684_database_for_cache_dictionary.simple_key_simple_attributes_source_table;
-
-CREATE TABLE 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table
-(
-   id UInt64,
-   value_first String,
-   value_second Nullable(String)
-)
-ENGINE = TinyLog;
-
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
-
-CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_complex_attributes_source_table'))
-LIFETIME(MIN 1 MAX 1000)
-LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d'));
-
-SELECT 'Dictionary cache_dictionary_simple_key_complex_attributes';
-SELECT 'dictGet existing value';
-SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
-    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
-SELECT 'dictGet with non existing value';
-SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
-    dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
-SELECT 'dictGetOrDefault existing value';
-SELECT dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
-    dictGetOrDefault('01684_database_for_cache_dictionary.cache_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('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
-    dictGetOrDefault('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
-SELECT 'dictHas';
-SELECT dictHas('01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
-SELECT 'select all values as input stream';
-SELECT * FROM 01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes ORDER BY id;
-
-DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_complex_attributes;
-DROP TABLE 01684_database_for_cache_dictionary.simple_key_complex_attributes_source_table;
-
-CREATE TABLE 01684_database_for_cache_dictionary.simple_key_hierarchy_table
-(
-    id UInt64,
-    parent_id UInt64
-) ENGINE = TinyLog();
-
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (1, 0);
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (2, 1);
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (3, 1);
-INSERT INTO 01684_database_for_cache_dictionary.simple_key_hierarchy_table VALUES (4, 2);
-
-CREATE DICTIONARY 01684_database_for_cache_dictionary.cache_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'))
-LIFETIME(MIN 1 MAX 1000)
-LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/2d'));
-
-SELECT 'Dictionary cache_dictionary_simple_key_hierarchy';
-SELECT 'dictGet';
-SELECT dictGet('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
-SELECT 'dictGetHierarchy';
-SELECT dictGetHierarchy('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(1));
-SELECT dictGetHierarchy('01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy', toUInt64(4));
-
-DROP DICTIONARY 01684_database_for_cache_dictionary.cache_dictionary_simple_key_hierarchy;
-DROP TABLE 01684_database_for_cache_dictionary.simple_key_hierarchy_table;
-
-DROP DATABASE 01684_database_for_cache_dictionary;
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
new file mode 100755
index 00000000000..82344a64e99
--- /dev/null
+++ b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
@@ -0,0 +1,106 @@
+#!/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}')
+
+$CLICKHOUSE_CLIENT -n --query="
+    DROP DATABASE IF EXISTS 01685_database_for_cache_dictionary;
+    CREATE DATABASE 01685_database_for_cache_dictionary;
+
+    CREATE TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table
+    (
+    id UInt64,
+    id_key String,
+    value_first String,
+    value_second String
+    )
+    ENGINE = TinyLog;
+
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+    CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table' DB '01685_database_for_cache_dictionary'))
+    LIFETIME(MIN 1 MAX 1000)
+    LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));
+
+    SELECT 'Dictionary cache_dictionary_complex_key_simple_attributes';
+    SELECT 'dictGet existing value';
+    SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_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 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes ORDER BY id;
+
+    DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes;
+    DROP TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table;
+
+    CREATE TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table
+    (
+    id UInt64,
+    id_key String,
+    value_first String,
+    value_second Nullable(String)
+    )
+    ENGINE = TinyLog;
+
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
+    INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+    CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table' DB '01685_database_for_cache_dictionary'))
+    LIFETIME(MIN 1 MAX 1000)
+    LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/1d'));
+
+    SELECT 'Dictionary cache_dictionary_complex_key_complex_attributes';
+    SELECT 'dictGet existing value';
+    SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+        dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+        dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_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 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes ORDER BY id;
+
+    DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes;
+    DROP TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table;
+
+    DROP DATABASE 01685_database_for_cache_dictionary;"
diff --git a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sql b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sql
deleted file mode 100644
index 03a7e1d80df..00000000000
--- a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sql
+++ /dev/null
@@ -1,98 +0,0 @@
-DROP DATABASE IF EXISTS 01685_database_for_cache_dictionary;
-CREATE DATABASE 01685_database_for_cache_dictionary;
-
-CREATE TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table
-(
-   id UInt64,
-   id_key String,
-   value_first String,
-   value_second String
-)
-ENGINE = TinyLog;
-
-INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
-INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
-INSERT INTO 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
-
-CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_simple_attributes_source_table' DB '01685_database_for_cache_dictionary'))
-LIFETIME(MIN 1 MAX 1000)
-LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/0d'));
-
-SELECT 'Dictionary cache_dictionary_complex_key_simple_attributes';
-SELECT 'dictGet existing value';
-SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-    dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-    dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-    dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-    dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_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 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes ORDER BY id;
-
-DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_simple_attributes;
-DROP TABLE 01685_database_for_cache_dictionary.complex_key_simple_attributes_source_table;
-
-CREATE TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table
-(
-   id UInt64,
-   id_key String,
-   value_first String,
-   value_second Nullable(String)
-)
-ENGINE = TinyLog;
-
-INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
-INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
-INSERT INTO 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
-
-CREATE DICTIONARY 01685_database_for_cache_dictionary.cache_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(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'complex_key_complex_attributes_source_table' DB '01685_database_for_cache_dictionary'))
-LIFETIME(MIN 1 MAX 1000)
-LAYOUT(COMPLEX_KEY_SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '/var/lib/clickhouse/clickhouse_dicts/1d'));
-
-SELECT 'Dictionary cache_dictionary_complex_key_complex_attributes';
-SELECT 'dictGet existing value';
-SELECT dictGet('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-    dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
-    dictGet('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-    dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
-    dictGetOrDefault('01685_database_for_cache_dictionary.cache_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('01685_database_for_cache_dictionary.cache_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 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes ORDER BY id;
-
-DROP DICTIONARY 01685_database_for_cache_dictionary.cache_dictionary_complex_key_complex_attributes;
-DROP TABLE 01685_database_for_cache_dictionary.complex_key_complex_attributes_source_table;
-
-DROP DATABASE 01685_database_for_cache_dictionary;
-
diff --git a/tests/queries/0_stateless/01686_rocksdb.sql b/tests/queries/0_stateless/01686_rocksdb.sql
index c9b133acff3..9a8662453c1 100644
--- a/tests/queries/0_stateless/01686_rocksdb.sql
+++ b/tests/queries/0_stateless/01686_rocksdb.sql
@@ -1,27 +1,26 @@
-DROP TABLE IF EXISTS test;
+DROP TABLE IF EXISTS 01686_test;
 
-CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
+CREATE TABLE 01686_test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
 
-INSERT INTO test SELECT number, format('Hello, world ({})', toString(number)) FROM numbers(10000);
+INSERT INTO 01686_test SELECT number, format('Hello, world ({})', toString(number)) FROM numbers(10000);
 
-SELECT * FROM test WHERE key = 123;
+SELECT * FROM 01686_test WHERE key = 123;
 SELECT '--';
-SELECT * FROM test WHERE key = -123;
+SELECT * FROM 01686_test WHERE key = -123;
 SELECT '--';
-SELECT * FROM test WHERE key = 123 OR key = 4567 ORDER BY key;
+SELECT * FROM 01686_test WHERE key = 123 OR key = 4567 ORDER BY key;
 SELECT '--';
-SELECT * FROM test WHERE key = NULL;
+SELECT * FROM 01686_test WHERE key = NULL;
 SELECT '--';
-SELECT * FROM test WHERE key = NULL OR key = 0;
+SELECT * FROM 01686_test WHERE key = NULL OR key = 0;
 SELECT '--';
-SELECT * FROM test WHERE key IN (123, 456, -123) ORDER BY key;
+SELECT * FROM 01686_test WHERE key IN (123, 456, -123) ORDER BY key;
 SELECT '--';
-SELECT * FROM test WHERE key = 'Hello'; -- { serverError 53 }
+SELECT * FROM 01686_test WHERE key = 'Hello'; -- { serverError 53 }
 
-DETACH TABLE test NO DELAY;
-ATTACH TABLE test;
+DETACH TABLE 01686_test NO DELAY;
+ATTACH TABLE 01686_test;
 
-SELECT * FROM test WHERE key IN (99, 999, 9999, -123) ORDER BY key;
-
-DROP TABLE IF EXISTS test;
+SELECT * FROM 01686_test WHERE key IN (99, 999, 9999, -123) ORDER BY key;
 
+DROP TABLE IF EXISTS 01686_test;
diff --git a/tests/queries/0_stateless/01700_deltasum.reference b/tests/queries/0_stateless/01700_deltasum.reference
index be5b176c627..6be953e2b2d 100644
--- a/tests/queries/0_stateless/01700_deltasum.reference
+++ b/tests/queries/0_stateless/01700_deltasum.reference
@@ -7,3 +7,4 @@
 2
 2.25
 6.5
+7
diff --git a/tests/queries/0_stateless/01700_deltasum.sql b/tests/queries/0_stateless/01700_deltasum.sql
index 93edb2e477d..83d5e0439d2 100644
--- a/tests/queries/0_stateless/01700_deltasum.sql
+++ b/tests/queries/0_stateless/01700_deltasum.sql
@@ -7,3 +7,4 @@ select deltaSumMerge(rows) from (select deltaSumState(arrayJoin([0, 1])) as rows
 select deltaSumMerge(rows) from (select deltaSumState(arrayJoin([4, 5])) as rows union all select deltaSumState(arrayJoin([0, 1])) as rows);
 select deltaSum(arrayJoin([2.25, 3, 4.5]));
 select deltaSumMerge(rows) from (select deltaSumState(arrayJoin([0.1, 0.3, 0.5])) as rows union all select deltaSumState(arrayJoin([4.1, 5.1, 6.6])) as rows);
+select deltaSumMerge(rows) from (select deltaSumState(arrayJoin([3, 5])) as rows union all select deltaSumState(arrayJoin([1, 2])) as rows union all select deltaSumState(arrayJoin([4, 6])) as rows);
diff --git a/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh b/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
index d3e634eb560..edc4f6916ff 100755
--- a/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
+++ b/tests/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
@@ -1,9 +1,11 @@
-#!/usr/bin/env bash                                                                                                                                                                                                                                           
-                                                                                                                                                                                                                                                              
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)                                                                                                                                                                                                          
-# shellcheck source=../shell_config.sh                                                                                                                                                                                                                        
-. "$CURDIR"/../shell_config.sh   
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
 
 ${CLICKHOUSE_CLIENT} -q "create table insert_big_json(a String, b String) engine=MergeTree() order by tuple()";
 
-python3 -c "[print('{{\"a\":\"{}\", \"b\":\"{}\"'.format('clickhouse'* 1000000, 'dbms' * 1000000)) for i in range(10)]; [print('{{\"a\":\"{}\", \"b\":\"{}\"}}'.format('clickhouse'* 100000, 'dbms' * 100000)) for i in range(10)]" 2>/dev/null  | ${CLICKHOUSE_CLIENT} --input_format_parallel_parsing=1 --max_memory_usage=0 -q "insert into insert_big_json FORMAT JSONEachRow" 2>&1 | grep -q "min_chunk_bytes_for_parallel_parsing" && echo "Ok." || echo "FAIL" ||:
\ No newline at end of file
+python3 -c "[print('{{\"a\":\"{}\", \"b\":\"{}\"'.format('clickhouse'* 1000000, 'dbms' * 1000000)) for i in range(10)]; [print('{{\"a\":\"{}\", \"b\":\"{}\"}}'.format('clickhouse'* 100000, 'dbms' * 100000)) for i in range(10)]" 2>/dev/null  | ${CLICKHOUSE_CLIENT} --input_format_parallel_parsing=1 --max_memory_usage=0 -q "insert into insert_big_json FORMAT JSONEachRow" 2>&1 | grep -q "min_chunk_bytes_for_parallel_parsing" && echo "Ok." || echo "FAIL" ||:
+
+${CLICKHOUSE_CLIENT} -q "drop table insert_big_json"
diff --git a/tests/queries/0_stateless/01702_system_query_log.reference b/tests/queries/0_stateless/01702_system_query_log.reference
index 6d8908249bf..1f329feac22 100644
--- a/tests/queries/0_stateless/01702_system_query_log.reference
+++ b/tests/queries/0_stateless/01702_system_query_log.reference
@@ -42,23 +42,17 @@ 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 RELOAD EMBEDDED DICTIONARIES;
-System	SYSTEM RELOAD DICTIONARIES;
-System	SYSTEM DROP DNS CACHE;
-System	SYSTEM DROP MARK CACHE;
-System	SYSTEM DROP UNCOMPRESSED CACHE;
 System	SYSTEM FLUSH LOGS;
-System	SYSTEM RELOAD CONFIG;
-System	SYSTEM STOP MERGES;
-System	SYSTEM START MERGES;
-System	SYSTEM STOP TTL MERGES;
-System	SYSTEM START TTL MERGES;
-System	SYSTEM STOP MOVES;
-System	SYSTEM START MOVES;
-System	SYSTEM STOP FETCHES;
-System	SYSTEM START FETCHES;
-System	SYSTEM STOP REPLICATED SENDS;
-System	SYSTEM START REPLICATED SENDS;
+System	SYSTEM STOP MERGES sqllt.table
+System	SYSTEM START MERGES sqllt.table
+System	SYSTEM STOP TTL MERGES sqllt.table
+System	SYSTEM START TTL MERGES sqllt.table
+System	SYSTEM STOP MOVES sqllt.table
+System	SYSTEM START MOVES sqllt.table
+System	SYSTEM STOP FETCHES sqllt.table
+System	SYSTEM START FETCHES sqllt.table
+System	SYSTEM STOP REPLICATED SENDS sqllt.table
+System	SYSTEM START REPLICATED SENDS sqllt.table
 Select	-- SYSTEM RELOAD DICTIONARY sqllt.dictionary; -- temporary out of order: Code: 210, Connection refused (localhost:9001) (version 21.3.1.1)\n-- DROP REPLICA\n-- haha, no\n-- SYSTEM KILL;\n-- SYSTEM SHUTDOWN;\n\n-- Since we don\'t really care about the actual output, suppress it with `FORMAT Null`.\nSELECT \'SHOW queries\';
 	SHOW CREATE TABLE sqllt.table FORMAT Null;
 	SHOW CREATE DICTIONARY sqllt.dictionary FORMAT Null;
diff --git a/tests/queries/0_stateless/01702_system_query_log.sql b/tests/queries/0_stateless/01702_system_query_log.sql
index 5c3de9cf912..e3ebf97edb7 100644
--- a/tests/queries/0_stateless/01702_system_query_log.sql
+++ b/tests/queries/0_stateless/01702_system_query_log.sql
@@ -64,23 +64,17 @@ ALTER TABLE sqllt.table DELETE WHERE i > 65535;
 -- SETTINGS PROFILE
 
 SELECT 'SYSTEM queries';
-SYSTEM RELOAD EMBEDDED DICTIONARIES;
-SYSTEM RELOAD DICTIONARIES;
-SYSTEM DROP DNS CACHE;
-SYSTEM DROP MARK CACHE;
-SYSTEM DROP UNCOMPRESSED CACHE;
 SYSTEM FLUSH LOGS;
-SYSTEM RELOAD CONFIG;
-SYSTEM STOP MERGES;
-SYSTEM START MERGES;
-SYSTEM STOP TTL MERGES;
-SYSTEM START TTL MERGES;
-SYSTEM STOP MOVES;
-SYSTEM START MOVES;
-SYSTEM STOP FETCHES;
-SYSTEM START FETCHES;
-SYSTEM STOP REPLICATED SENDS;
-SYSTEM START REPLICATED SENDS;
+SYSTEM STOP MERGES sqllt.table;
+SYSTEM START MERGES sqllt.table;
+SYSTEM STOP TTL MERGES sqllt.table;
+SYSTEM START TTL MERGES sqllt.table;
+SYSTEM STOP MOVES sqllt.table;
+SYSTEM START MOVES sqllt.table;
+SYSTEM STOP FETCHES sqllt.table;
+SYSTEM START FETCHES sqllt.table;
+SYSTEM STOP REPLICATED SENDS sqllt.table;
+SYSTEM START REPLICATED SENDS sqllt.table;
 
 -- SYSTEM RELOAD DICTIONARY sqllt.dictionary; -- temporary out of order: Code: 210, Connection refused (localhost:9001) (version 21.3.1.1)
 -- DROP REPLICA
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.sql b/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.sql
deleted file mode 100644
index fad890c4807..00000000000
--- a/tests/queries/0_stateless/01709_inactive_parts_to_delay_throw.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-drop table if exists x;
-
-create table x (i int) engine MergeTree order by i settings old_parts_lifetime = 10000000000, min_bytes_for_wide_part = 0, inactive_parts_to_throw_insert = 1;
-
-insert into x values (1);
-insert into x values (2);
-
-optimize table x final;
-
-insert into x values (3); -- { serverError 252; }
-
-drop table if exists x;
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.reference b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
new file mode 100644
index 00000000000..6de0d4f4e0c
--- /dev/null
+++ b/tests/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
@@ -0,0 +1,12 @@
+drop table if exists data_01709;
+
+create table data_01709 (i int) engine MergeTree order by i settings old_parts_lifetime = 10000000000, min_bytes_for_wide_part = 0, inactive_parts_to_throw_insert = 1;
+
+insert into data_01709 values (1);
+insert into data_01709 values (2);
+
+optimize table data_01709 final;
+
+insert into data_01709 values (3); -- { serverError 252; }
+
+drop table data_01709;
diff --git a/tests/queries/0_stateless/01710_aggregate_projections.reference b/tests/queries/0_stateless/01710_aggregate_projections.reference
new file mode 100644
index 00000000000..f7cd6f29d9f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_aggregate_projections.reference
@@ -0,0 +1,36 @@
+15	480
+14	450
+13	420
+12	390
+11	360
+		"rows_read": 18,
+30	960
+28	900
+26	840
+24	780
+22	720
+		"rows_read": 18,
+6	4	810
+5	3	690
+7	5	480
+3	2	450
+7	4	450
+		"rows_read": 18,
+16	22080
+15	19350
+14	16800
+13	14430
+12	12240
+		"rows_read": 18,
+16	-34	480
+15	-32	450
+14	-30	420
+13	-28	390
+12	-26	360
+		"rows_read": 100,
+15	480
+13	420
+11	360
+9	300
+7	240
+		"rows_read": 18,
diff --git a/tests/queries/0_stateless/01710_aggregate_projections.sh b/tests/queries/0_stateless/01710_aggregate_projections.sh
new file mode 100755
index 00000000000..1b09a3f1383
--- /dev/null
+++ b/tests/queries/0_stateless/01710_aggregate_projections.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
+
+
+$CLICKHOUSE_CLIENT -q "CREATE TABLE test_agg_proj (x Int32, y Int32, PROJECTION x_plus_y (SELECT sum(x - y), argMax(x, y) group by x + y)) ENGINE = MergeTree ORDER BY tuple() settings index_granularity = 1"
+$CLICKHOUSE_CLIENT -q "insert into test_agg_proj select intDiv(number, 2), -intDiv(number,3) - 1 from numbers(100)"
+
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1"
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+
+$CLICKHOUSE_CLIENT -q "select (x + y) * 2, sum(x - y) * 2 as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1"
+$CLICKHOUSE_CLIENT -q "select (x + y) * 2, sum(x - y) * 2 as s from test_agg_proj group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+
+$CLICKHOUSE_CLIENT -q "select intDiv(x + y, 2), intDiv(x + y, 3), sum(x - y) as s from test_agg_proj group by intDiv(x + y, 2), intDiv(x + y, 3) order by s desc limit 5 settings allow_experimental_projection_optimization=1"
+$CLICKHOUSE_CLIENT -q "select intDiv(x + y, 2), intDiv(x + y, 3), sum(x - y) as s from test_agg_proj group by intDiv(x + y, 2), intDiv(x + y, 3) order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(x, y) * sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1"
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(x, y) * sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(y, x), sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1"
+$CLICKHOUSE_CLIENT -q "select x + y + 1, argMax(y, x), sum(x - y) as s from test_agg_proj group by x + y + 1 order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
+
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj prewhere (x + y) % 2 = 1 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1"
+$CLICKHOUSE_CLIENT -q "select x + y, sum(x - y) as s from test_agg_proj prewhere (x + y) % 2 = 1 group by x + y order by s desc limit 5 settings allow_experimental_projection_optimization=1 format JSON" | grep "rows_read"
diff --git a/tests/queries/0_stateless/01710_force_use_projection.reference b/tests/queries/0_stateless/01710_force_use_projection.reference
new file mode 100644
index 00000000000..f1ad7de51f0
--- /dev/null
+++ b/tests/queries/0_stateless/01710_force_use_projection.reference
@@ -0,0 +1 @@
+3	1
diff --git a/tests/queries/0_stateless/01710_force_use_projection.sql b/tests/queries/0_stateless/01710_force_use_projection.sql
new file mode 100644
index 00000000000..8931c65e34e
--- /dev/null
+++ b/tests/queries/0_stateless/01710_force_use_projection.sql
@@ -0,0 +1,17 @@
+drop table if exists tp;
+
+create table tp (d1 Int32, d2 Int32, eventcnt Int64, projection p (select sum(eventcnt) group by d1)) engine = MergeTree order by (d1, d2);
+
+set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+
+select sum(eventcnt) eventcnt, d1 from tp group by d1;
+
+select avg(eventcnt) eventcnt, d1 from tp group by d1;
+
+insert into tp values (1, 2, 3);
+
+select sum(eventcnt) eventcnt, d1 from tp group by d1;
+
+select avg(eventcnt) eventcnt, d1 from tp group by d1; -- { serverError 584 }
+
+drop table tp;
diff --git a/tests/queries/0_stateless/01710_normal_projections.reference b/tests/queries/0_stateless/01710_normal_projections.reference
new file mode 100644
index 00000000000..a935f5b71d8
--- /dev/null
+++ b/tests/queries/0_stateless/01710_normal_projections.reference
@@ -0,0 +1,102 @@
+select where x < 10
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+9	4294967286
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+9	4294967286
+optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+9	4294967286
+optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+9	4294967286
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+		"rows_read": 100,
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+		"rows_read": 100,
+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,
+select where y > 4294967286
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
+0	4294967295
+1	4294967294
+2	4294967293
+3	4294967292
+4	4294967291
+5	4294967290
+6	4294967289
+7	4294967288
+8	4294967287
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0
+		"rows_read": 100,
+optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1
+		"rows_read": 100,
+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,
diff --git a/tests/queries/0_stateless/01710_normal_projections.sh b/tests/queries/0_stateless/01710_normal_projections.sh
new file mode 100755
index 00000000000..89795d12bc9
--- /dev/null
+++ b/tests/queries/0_stateless/01710_normal_projections.sh
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "CREATE TABLE test_sort_proj (x UInt32, y UInt32, PROJECTION p (SELECT x, y ORDER BY y)) ENGINE = MergeTree ORDER BY x"
+$CLICKHOUSE_CLIENT -q "insert into test_sort_proj select number, toUInt32(-number - 1) from numbers(100)"
+
+echo "select where x < 10"
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
+                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x
+                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0" | grep rows_read
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1" | grep rows_read
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
+                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0" | grep rows_read
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE x < 10 order by x FORMAT JSON
+                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1" | grep rows_read
+
+
+echo "select where y > 4294967286"
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
+                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x
+                       SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 0" | grep rows_read
+
+echo "optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
+                       SETTINGS optimize_move_to_prewhere = 0, allow_experimental_projection_optimization = 1" | grep rows_read
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0"
+$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 = 0" | grep rows_read
+
+echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1"
+$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
+
diff --git a/tests/queries/0_stateless/01710_projection_drop_if_exists.reference b/tests/queries/0_stateless/01710_projection_drop_if_exists.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_drop_if_exists.sql b/tests/queries/0_stateless/01710_projection_drop_if_exists.sql
new file mode 100644
index 00000000000..f21092e5491
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_drop_if_exists.sql
@@ -0,0 +1,11 @@
+drop table if exists tp;
+
+create table tp (x Int32, y Int32, projection p (select x, y order by x)) engine = MergeTree order by y;
+
+alter table tp drop projection pp; -- { serverError 582 }
+alter table tp drop projection if exists pp;
+alter table tp drop projection if exists p;
+alter table tp drop projection p;  -- { serverError 582 }
+alter table tp drop projection if exists p;
+
+drop table tp;
diff --git a/tests/queries/0_stateless/01710_projection_fetch.reference b/tests/queries/0_stateless/01710_projection_fetch.reference
new file mode 100644
index 00000000000..abce5410b26
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_fetch.reference
@@ -0,0 +1,17 @@
+0	0
+1	1
+2	2
+0	0
+0	0
+1	1
+1	1
+2	2
+2	2
+3	3
+4	4
+0
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
+2
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    ),\n    PROJECTION pp\n    (\n        SELECT \n            x,\n            count()\n        GROUP BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
+CREATE TABLE default.tp_2\n(\n    `x` Int32,\n    `y` Int32,\n    PROJECTION p\n    (\n        SELECT \n            x,\n            y\n        ORDER BY x\n    )\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/{shard}/01710_projection_fetch_default\', \'2_{replica}\')\nORDER BY y\nSETTINGS min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32, index_granularity = 8192
diff --git a/tests/queries/0_stateless/01710_projection_fetch.sql b/tests/queries/0_stateless/01710_projection_fetch.sql
new file mode 100644
index 00000000000..7e4f6cc1d9a
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_fetch.sql
@@ -0,0 +1,41 @@
+drop table if exists tp_1;
+drop table if exists tp_2;
+
+create table tp_1 (x Int32, y Int32, projection p (select x, y order by x)) engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/01710_projection_fetch_' || currentDatabase(), '1_{replica}') order by y settings min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32;
+
+create table tp_2 (x Int32, y Int32, projection p (select x, y order by x)) engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/01710_projection_fetch_' || currentDatabase(), '2_{replica}') order by y settings min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32;
+
+insert into tp_1 select number, number from numbers(3);
+
+system sync replica tp_2;
+select * from tp_2 order by x;
+
+insert into tp_1 select number, number from numbers(5);
+
+system sync replica tp_2;
+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;
+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;
+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;
+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;
+show create table tp_2;
+
+drop table if exists tp_1;
+drop table if exists tp_2;
diff --git a/tests/queries/0_stateless/01710_projection_group_by_order_by.reference b/tests/queries/0_stateless/01710_projection_group_by_order_by.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_group_by_order_by.sql b/tests/queries/0_stateless/01710_projection_group_by_order_by.sql
new file mode 100644
index 00000000000..9370e9d36ce
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_group_by_order_by.sql
@@ -0,0 +1,5 @@
+drop table if exists tp;
+
+create table tp (type Int32, eventcnt UInt64, projection p (select sum(eventcnt), type group by type order by sum(eventcnt))) engine = MergeTree order by type; -- { serverError 583 }
+
+drop table if exists tp;
diff --git a/tests/queries/0_stateless/01710_projection_part_check.reference b/tests/queries/0_stateless/01710_projection_part_check.reference
new file mode 100644
index 00000000000..2f7ad3359c0
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_part_check.reference
@@ -0,0 +1,2 @@
+all_1_1_0	1	
+all_2_2_0	1	
diff --git a/tests/queries/0_stateless/01710_projection_part_check.sql b/tests/queries/0_stateless/01710_projection_part_check.sql
new file mode 100644
index 00000000000..39fb6a89fc8
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_part_check.sql
@@ -0,0 +1,10 @@
+drop table if exists tp;
+
+create table tp (x Int32, y Int32, projection p (select x, y order by x)) engine = MergeTree order by y settings min_rows_for_compact_part = 2, min_rows_for_wide_part = 4, min_bytes_for_compact_part = 16, min_bytes_for_wide_part = 32;
+
+insert into tp select number, number from numbers(3);
+insert into tp select number, number from numbers(5);
+
+check table tp settings check_query_single_value_result=0;
+
+drop table if exists tp;
diff --git a/tests/queries/0_stateless/01710_projections.reference b/tests/queries/0_stateless/01710_projections.reference
new file mode 100644
index 00000000000..1e4f659c639
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections.reference
@@ -0,0 +1,7 @@
+2020-10-24 00:00:00	0	-0.2906208323366036
+2020-10-24 00:00:00	1000	-0.3856164567802157	1.2352100180287104
+2020-10-24 00:00:00	1.3619605237696326	0.16794469697335793	0.7637956767025532	0.8899329799574005	0.6227685185389797	0.30795997278638165	0.7637956767025532
+2020-10-24 00:00:00	19	-1.9455094931672063	0.7759802460082872	0.6	0
+2020-10-24 00:00:00	852	894
+2	-1
+999
diff --git a/tests/queries/0_stateless/01710_projections.sql b/tests/queries/0_stateless/01710_projections.sql
new file mode 100644
index 00000000000..c929bfaa273
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections.sql
@@ -0,0 +1,51 @@
+drop table if exists projection_test;
+
+create table projection_test (`sum(block_count)` UInt64, domain_alias UInt64 alias length(domain), datetime DateTime, domain LowCardinality(String), x_id String, y_id String, block_count Int64, retry_count Int64, duration Int64, kbytes Int64, buffer_time Int64, first_time Int64, total_bytes Nullable(UInt64), valid_bytes Nullable(UInt64), completed_bytes Nullable(UInt64), fixed_bytes Nullable(UInt64), force_bytes Nullable(UInt64), projection p (select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration), count(), sum(block_count) / sum(duration), avg(block_count / duration), sum(buffer_time) / sum(duration), avg(buffer_time / duration), sum(valid_bytes) / sum(total_bytes), sum(completed_bytes) / sum(total_bytes), sum(fixed_bytes) / sum(total_bytes), sum(force_bytes) / sum(total_bytes), sum(valid_bytes) / sum(total_bytes), sum(retry_count) / sum(duration), avg(retry_count / duration), countIf(block_count > 0) / count(), countIf(first_time = 0) / count(), uniqHLL12(x_id), uniqHLL12(y_id) group by dt_m, domain)) engine MergeTree partition by toDate(datetime) order by (toStartOfTenMinutes(datetime), domain);
+
+insert into projection_test with rowNumberInAllBlocks() as id select 1, toDateTime('2020-10-24 00:00:00') + (id / 20), toString(id % 100), * from generateRandom('x_id String, y_id String, block_count Int64, retry_count Int64, duration Int64, kbytes Int64, buffer_time Int64, first_time Int64, total_bytes Nullable(UInt64), valid_bytes Nullable(UInt64), completed_bytes Nullable(UInt64), fixed_bytes Nullable(UInt64), force_bytes Nullable(UInt64)', 10, 10, 1) limit 1000 settings max_threads = 1;
+
+set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+
+select * from projection_test; -- { serverError 584 }
+select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) from projection_test join (select 1) x using (1) where domain = '1' group by dt_m order by dt_m; -- { serverError 584 }
+
+select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration) from projection_test where domain = '1' group by dt_m order by dt_m;
+
+-- prewhere with alias
+select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration) from projection_test prewhere domain_alias = 3 where domain = '1' group by dt_m order by dt_m;
+
+drop row policy if exists filter on projection_test;
+create row policy filter on projection_test using (domain = 'non_existing_domain') to all;
+-- prewhere with alias with row policy (non existing)
+select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration) from projection_test prewhere domain_alias = 1 where domain = '1' group by dt_m order by dt_m;
+drop row policy filter on projection_test;
+
+-- TODO There is a bug in row policy filter (not related to projections, crash in master)
+-- drop row policy if exists filter on projection_test;
+-- create row policy filter on projection_test using (domain != '1') to all;
+-- prewhere with alias with row policy (existing)
+-- select toStartOfMinute(datetime) dt_m, countIf(first_time = 0) / count(), avg((kbytes * 8) / duration) from projection_test prewhere domain_alias = 1 where domain = '1' group by dt_m order by dt_m;
+-- drop row policy filter on projection_test;
+
+select toStartOfMinute(datetime) dt_m, count(), sum(block_count) / sum(duration), avg(block_count / duration) from projection_test group by dt_m order by dt_m;
+
+-- TODO figure out how to deal with conflict column names
+-- select toStartOfMinute(datetime) dt_m, count(), sum(block_count) / sum(duration), avg(block_count / duration) from projection_test where `sum(block_count)` = 1 group by dt_m order by dt_m;
+
+select toStartOfMinute(datetime) dt_m, sum(buffer_time) / sum(duration), avg(buffer_time / duration), sum(valid_bytes) / sum(total_bytes), sum(completed_bytes) / sum(total_bytes), sum(fixed_bytes) / sum(total_bytes), sum(force_bytes) / sum(total_bytes), sum(valid_bytes) / sum(total_bytes) from projection_test where domain in ('12', '14') group by dt_m order by dt_m;
+
+select toStartOfMinute(datetime) dt_m, domain, sum(retry_count) / sum(duration), avg(retry_count / duration), countIf(block_count > 0) / count(), countIf(first_time = 0) / count() from projection_test group by dt_m, domain having domain = '19' order by dt_m, domain;
+
+select toStartOfHour(toStartOfMinute(datetime)) dt_h, uniqHLL12(x_id), uniqHLL12(y_id) from projection_test group by dt_h order by dt_h;
+
+-- found by fuzzer
+SELECT 2, -1 FROM projection_test PREWHERE domain_alias = 1. WHERE domain = NULL GROUP BY -9223372036854775808 ORDER BY countIf(first_time = 0) / count(-2147483649) DESC NULLS LAST, 1048576 DESC NULLS LAST;
+
+drop table if exists projection_test;
+
+drop table if exists projection_without_key;
+create table projection_without_key (key UInt32, PROJECTION x (SELECT max(key))) engine MergeTree order by key;
+insert into projection_without_key select number from numbers(1000);
+set force_optimize_projection = 1, allow_experimental_projection_optimization = 1;
+select max(key) from projection_without_key;
+drop table projection_without_key;
diff --git a/tests/queries/0_stateless/01710_projections_in_distributed_query.reference b/tests/queries/0_stateless/01710_projections_in_distributed_query.reference
new file mode 100644
index 00000000000..27aaf6330f4
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections_in_distributed_query.reference
@@ -0,0 +1,4 @@
+2020-10-24 00:00:00	-93943555724557365
+-93943555724557365
+2020-10-24 00:00:00	-187887111449114730
+-187887111449114730
diff --git a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
new file mode 100644
index 00000000000..475e8372fc6
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
@@ -0,0 +1,20 @@
+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;
+
+insert into projection_test with rowNumberInAllBlocks() as id select toDateTime('2020-10-24 00:00:00') + (id / 20), * from generateRandom('cost Int64', 10, 10, 1) limit 1000 settings max_threads = 1;
+
+set allow_experimental_projection_optimization = 1, force_optimize_projection = 1;
+
+select toStartOfMinute(dt) dt_m, sum(cost) from projection_test group by dt_m;
+select sum(cost) from projection_test;
+
+drop table if exists projection_test_d;
+
+create table projection_test_d (dt DateTime, cost Int64) engine Distributed(test_cluster_two_shards, currentDatabase(), projection_test);
+
+select toStartOfMinute(dt) dt_m, sum(cost) from projection_test_d group by dt_m;
+select sum(cost) from projection_test_d;
+
+drop table projection_test;
+drop table projection_test_d;
diff --git a/tests/queries/0_stateless/01711_cte_subquery_fix.sql b/tests/queries/0_stateless/01711_cte_subquery_fix.sql
index ddea548eada..10ad9019209 100644
--- a/tests/queries/0_stateless/01711_cte_subquery_fix.sql
+++ b/tests/queries/0_stateless/01711_cte_subquery_fix.sql
@@ -1,3 +1,7 @@
 drop table if exists t;
 create table t engine = Memory as with cte as (select * from numbers(10)) select * from cte;
 drop table t;
+
+drop table if exists view1;
+create view view1 as with t as (select number n from numbers(3)) select n from t;
+drop table view1;
diff --git a/tests/queries/0_stateless/01715_table_function_view_fix.sql b/tests/queries/0_stateless/01715_table_function_view_fix.sql
index de5150b7b70..b96609391b5 100644
--- a/tests/queries/0_stateless/01715_table_function_view_fix.sql
+++ b/tests/queries/0_stateless/01715_table_function_view_fix.sql
@@ -1 +1,3 @@
 SELECT view(SELECT 1); -- { clientError 62 }
+
+SELECT sumIf(dummy, dummy) FROM remote('127.0.0.{1,2}', numbers(2, 100), view(SELECT CAST(NULL, 'Nullable(UInt8)') AS dummy FROM system.one)); -- { serverError 183 }
diff --git a/tests/queries/0_stateless/01720_country_perimeter_and_area.sh b/tests/queries/0_stateless/01720_country_perimeter_and_area.sh
index 76dc403fb2f..75016ee1d1f 100755
--- a/tests/queries/0_stateless/01720_country_perimeter_and_area.sh
+++ b/tests/queries/0_stateless/01720_country_perimeter_and_area.sh
@@ -22,4 +22,6 @@ ${CLICKHOUSE_CLIENT} -q "SELECT name, polygonPerimeterSpherical(p) from country_
 ${CLICKHOUSE_CLIENT} -q "SELECT '-------------------------------------'"
 ${CLICKHOUSE_CLIENT} -q "SELECT name, polygonAreaSpherical(p) from country_rings"
 ${CLICKHOUSE_CLIENT} -q "SELECT '-------------------------------------'"
-${CLICKHOUSE_CLIENT} -q "drop table if exists country_rings;"
\ No newline at end of file
+${CLICKHOUSE_CLIENT} -q "drop table if exists country_rings;"
+
+${CLICKHOUSE_CLIENT} -q "drop table country_polygons"
diff --git a/tests/queries/0_stateless/01720_type_map_and_casts.reference b/tests/queries/0_stateless/01720_type_map_and_casts.reference
index 590bdedd7f2..760624d7f40 100644
--- a/tests/queries/0_stateless/01720_type_map_and_casts.reference
+++ b/tests/queries/0_stateless/01720_type_map_and_casts.reference
@@ -32,7 +32,7 @@ Map(UUID, UInt16)
 {'00001192-0000-4000-8000-000000000001':1,'00001192-0000-4000-7000-000000000001':2}
 0	2	1
 Map(Int128, String)
-{-1:'a',0:'b',1234567898765432193024000:'c',-1234567898765432193024000:'d'}
+{-1:'a',0:'b',1234567898765432123456789:'c',-1234567898765432123456789:'d'}
 a	b	c	d
 
 a
diff --git a/tests/queries/0_stateless/01720_type_map_and_casts.sql b/tests/queries/0_stateless/01720_type_map_and_casts.sql
index d7991999ef7..f03773d9084 100644
--- a/tests/queries/0_stateless/01720_type_map_and_casts.sql
+++ b/tests/queries/0_stateless/01720_type_map_and_casts.sql
@@ -65,15 +65,15 @@ CREATE TABLE table_map_with_key_integer (d DATE, m Map(Int128, String))
 ENGINE = MergeTree() ORDER BY d;
 
 
-INSERT INTO table_map_with_key_integer SELECT '2020-01-01', map(-1, 'a', 0, 'b', toInt128(1234567898765432123456789), 'c', toInt128(-1234567898765432123456789), 'd');
+INSERT INTO table_map_with_key_integer SELECT '2020-01-01', map(-1, 'a', 0, 'b', toInt128('1234567898765432123456789'), 'c', toInt128('-1234567898765432123456789'), 'd');
 
 SELECT 'Map(Int128, String)';
 
 SELECT m FROM table_map_with_key_integer;
-SELECT m[toInt128(-1)], m[toInt128(0)], m[toInt128(1234567898765432123456789)], m[toInt128(-1234567898765432123456789)] FROM table_map_with_key_integer;
+SELECT m[toInt128(-1)], m[toInt128(0)], m[toInt128('1234567898765432123456789')], m[toInt128('-1234567898765432123456789')] FROM table_map_with_key_integer;
 SELECT m[toInt128(number - 2)] FROM table_map_with_key_integer ARRAY JOIN [0, 1, 2, 3] AS number;
 
-SELECT m[-1], m[0], m[toInt128(1234567898765432123456789)], m[toInt128(-1234567898765432123456789)] FROM table_map_with_key_integer;
+SELECT m[-1], m[0], m[toInt128('1234567898765432123456789')], m[toInt128('-1234567898765432123456789')] FROM table_map_with_key_integer;
 SELECT m[toUInt64(0)], m[toInt64(0)], m[toUInt8(0)], m[toUInt16(0)] FROM table_map_with_key_integer;
 
 DROP TABLE IF EXISTS table_map_with_key_integer;
diff --git a/tests/queries/0_stateless/01732_explain_syntax_union_query.reference b/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
index fe5eb01a7ed..ccafa916b9f 100644
--- a/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
+++ b/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
@@ -7,7 +7,7 @@ UNION ALL
 SELECT 1
 UNION ALL
 SELECT 1
- 
+-
 SELECT 1
 UNION ALL
 (
@@ -19,9 +19,9 @@ UNION ALL
 )
 UNION ALL
 SELECT 1
- 
+-
 SELECT x
-FROM 
+FROM
 (
     SELECT 1 AS x
     UNION ALL
@@ -35,9 +35,9 @@ FROM
     UNION ALL
     SELECT 1
 )
- 
+-
 SELECT x
-FROM 
+FROM
 (
     SELECT 1 AS x
     UNION ALL
@@ -45,15 +45,15 @@ FROM
     UNION ALL
     SELECT 1
 )
- 
+-
 SELECT 1
 UNION DISTINCT
 SELECT 1
 UNION DISTINCT
 SELECT 1
- 
+-
 SELECT 1
- 
+-
 
 (
     SELECT 1
diff --git a/tests/queries/0_stateless/01732_explain_syntax_union_query.sql b/tests/queries/0_stateless/01732_explain_syntax_union_query.sql
index 0dd1e19e765..c35021090f1 100644
--- a/tests/queries/0_stateless/01732_explain_syntax_union_query.sql
+++ b/tests/queries/0_stateless/01732_explain_syntax_union_query.sql
@@ -13,7 +13,7 @@ UNION ALL
     SELECT 1
 );
 
-SELECT ' ';
+SELECT '-';
 
 EXPLAIN SYNTAX
 SELECT 1
@@ -30,7 +30,7 @@ UNION ALL
     SELECT 1
 );
 
-SELECT ' ';
+SELECT '-';
 
 EXPLAIN SYNTAX
 SELECT x
@@ -51,11 +51,11 @@ FROM
     )
 );
 
-SELECT ' ';
+SELECT '-';
 
 EXPLAIN SYNTAX
 SELECT x
-FROM 
+FROM
 (
     SELECT 1 AS x
     UNION ALL
@@ -66,7 +66,7 @@ FROM
     )
 );
 
-SELECT ' ';
+SELECT '-';
 
 EXPLAIN SYNTAX
 SELECT 1
@@ -75,12 +75,12 @@ SELECT 1
 UNION DISTINCT
 SELECT 1;
 
-SELECT ' ';
+SELECT '-';
 
 EXPLAIN SYNTAX
 (((((((((((((((SELECT 1)))))))))))))));
 
-SELECT ' ';
+SELECT '-';
 
 EXPLAIN SYNTAX
 (((((((((((((((SELECT 1 UNION DISTINCT SELECT 1))) UNION DISTINCT SELECT 1)))) UNION ALL SELECT 1))))))));
diff --git a/tests/queries/0_stateless/01736_null_as_default.sql b/tests/queries/0_stateless/01736_null_as_default.sql
index f9a4bc69acf..a00011b06d4 100644
--- a/tests/queries/0_stateless/01736_null_as_default.sql
+++ b/tests/queries/0_stateless/01736_null_as_default.sql
@@ -1,5 +1,5 @@
-drop table if exists test_num;
+drop table if exists test_enum;
 create table test_enum (c Nullable(Enum16('A' = 1, 'B' = 2))) engine Log;
 insert into test_enum values (1), (NULL);
 select * from test_enum;
-drop table if exists test_num;
+drop table test_enum;
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
new file mode 100644
index 00000000000..2d0a480a375
--- /dev/null
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<yandex>
+    <logger>
+        <level>trace</level>
+        <console>true</console>
+    </logger>
+
+    <tcp_port>9000</tcp_port>
+
+    <path>./</path>
+
+    <mark_cache_size>0</mark_cache_size>
+
+    <users>
+        <default>
+            <password></password>
+
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+
+            <profile>default</profile>
+            <quota>default</quota>
+            <access_management>1</access_management>
+        </default>
+    </users>
+
+    <profiles>
+        <default/>
+    </profiles>
+
+    <quotas>
+        <default />
+    </quotas>
+</yandex>
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.reference b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
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
new file mode 100755
index 00000000000..a4fd7529ab2
--- /dev/null
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+server_opts=(
+    "--config-file=$CUR_DIR/$(basename "${BASH_SOURCE[0]}" .sh).config.xml"
+    "--"
+    # to avoid multiple listen sockets (complexity for port discovering)
+    "--listen_host=127.1"
+    # we will discover the real port later.
+    "--tcp_port=0"
+    "--shutdown_wait_unfinished=0"
+)
+CLICKHOUSE_WATCHDOG_ENABLE=0 $CLICKHOUSE_SERVER_BINARY "${server_opts[@]}" >& clickhouse-server.log &
+server_pid=$!
+
+trap cleanup EXIT
+function cleanup()
+{
+    kill -9 $server_pid
+    kill -9 $client_pid
+
+    echo "Test failed. Server log:"
+    cat clickhouse-server.log
+    rm -f clickhouse-server.log
+
+    exit 1
+}
+
+server_port=
+i=0 retries=300
+# wait until server will start to listen (max 30 seconds)
+while [[ -z $server_port ]] && [[ $i -lt $retries ]]; do
+    server_port=$(lsof -n -a -P -i tcp -s tcp:LISTEN -p $server_pid 2>/dev/null | awk -F'[ :]' '/LISTEN/ { print $(NF-1) }')
+    ((++i))
+    sleep 0.1
+done
+if [[ -z $server_port ]]; then
+    echo "Cannot wait for LISTEN socket" >&2
+    exit 1
+fi
+
+# wait for the server to start accepting tcp connections (max 30 seconds)
+i=0 retries=300
+while ! $CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'select 1' 2>/dev/null && [[ $i -lt $retries ]]; do
+    sleep 0.1
+done
+if ! $CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" --format Null -q 'select 1'; then
+    echo "Cannot wait until server will start accepting connections on <tcp_port>" >&2
+    exit 1
+fi
+
+query_id="$CLICKHOUSE_DATABASE-$SECONDS"
+$CLICKHOUSE_CLIENT_BINARY --query_id "$query_id" --host 127.1 --port "$server_port" --format Null -q 'select sleepEachRow(1) from numbers(10)' 2>/dev/null &
+client_pid=$!
+
+# wait until the query will appear in processlist (max 10 second)
+# (it is enough to trigger the problem)
+i=0 retries=1000
+while [[ $($CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" -q "select count() from system.processes where query_id = '$query_id'") != "1" ]] && [[ $i -lt $retries ]]; do
+    sleep 0.01
+done
+if [[ $($CLICKHOUSE_CLIENT_BINARY --host 127.1 --port "$server_port" -q "select count() from system.processes where query_id = '$query_id'") != "1" ]]; then
+    echo "Cannot wait until the query will start" >&2
+    exit 1
+fi
+
+# send TERM and save the error code to ensure that it is 0 (EXIT_SUCCESS)
+kill $server_pid
+wait $server_pid
+return_code=$?
+
+wait $client_pid
+
+trap '' EXIT
+if [ $return_code != 0 ]; then
+    cat clickhouse-server.log
+fi
+rm -f clickhouse-server.log
+
+exit $return_code
diff --git a/tests/queries/0_stateless/01739_index_hint.reference b/tests/queries/0_stateless/01739_index_hint.reference
new file mode 100644
index 00000000000..6aa40c5d302
--- /dev/null
+++ b/tests/queries/0_stateless/01739_index_hint.reference
@@ -0,0 +1,35 @@
+-- { echo }
+
+drop table if exists tbl;
+create table tbl (p Int64, t Int64, f Float64) Engine=MergeTree partition by p order by t settings index_granularity=1;
+insert into tbl select number / 4, number, 0 from numbers(16);
+select * from tbl WHERE indexHint(t = 1) order by t;
+0	0	0
+0	1	0
+select * from tbl WHERE indexHint(t in (select toInt64(number) + 2 from numbers(3))) order by t;
+0	1	0
+0	2	0
+0	3	0
+1	4	0
+select * from tbl WHERE indexHint(p = 2) order by t;
+2	8	0
+2	9	0
+2	10	0
+2	11	0
+select * from tbl WHERE indexHint(p in (select toInt64(number) - 2 from numbers(3))) order by t;
+0	0	0
+0	1	0
+0	2	0
+0	3	0
+drop table tbl;
+drop table if exists XXXX;
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=128;
+insert into XXXX select number*60, 0 from numbers(100000);
+SELECT count() FROM XXXX WHERE indexHint(t = 42);
+128
+drop table if exists XXXX;
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=8192;
+insert into XXXX select number*60, 0 from numbers(100000);
+SELECT count() FROM XXXX WHERE indexHint(t = toDateTime(0));
+100000
+drop table XXXX;
diff --git a/tests/queries/0_stateless/01739_index_hint.sql b/tests/queries/0_stateless/01739_index_hint.sql
new file mode 100644
index 00000000000..28395c2dc1d
--- /dev/null
+++ b/tests/queries/0_stateless/01739_index_hint.sql
@@ -0,0 +1,35 @@
+-- { echo }
+
+drop table if exists tbl;
+
+create table tbl (p Int64, t Int64, f Float64) Engine=MergeTree partition by p order by t settings index_granularity=1;
+
+insert into tbl select number / 4, number, 0 from numbers(16);
+
+select * from tbl WHERE indexHint(t = 1) order by t;
+
+select * from tbl WHERE indexHint(t in (select toInt64(number) + 2 from numbers(3))) order by t;
+
+select * from tbl WHERE indexHint(p = 2) order by t;
+
+select * from tbl WHERE indexHint(p in (select toInt64(number) - 2 from numbers(3))) order by t;
+
+drop table tbl;
+
+drop table if exists XXXX;
+
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=128;
+
+insert into XXXX select number*60, 0 from numbers(100000);
+
+SELECT count() FROM XXXX WHERE indexHint(t = 42);
+
+drop table if exists XXXX;
+
+create table XXXX (t Int64, f Float64) Engine=MergeTree order by t settings index_granularity=8192;
+
+insert into XXXX select number*60, 0 from numbers(100000);
+
+SELECT count() FROM XXXX WHERE indexHint(t = toDateTime(0));
+
+drop table XXXX;
diff --git a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.reference b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.reference
new file mode 100644
index 00000000000..70c19fc8ced
--- /dev/null
+++ b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.reference
@@ -0,0 +1,12 @@
+210	230	20
+SELECT
+    sum(a),
+    sumCount(b).1,
+    sumCount(b).2
+FROM fuse_tbl
+---------NOT trigger fuse--------
+210	11.5
+SELECT
+    sum(a),
+    avg(b)
+FROM fuse_tbl
diff --git a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
new file mode 100644
index 00000000000..cad7b5803d4
--- /dev/null
+++ b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
@@ -0,0 +1,11 @@
+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;
+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--------';
+SELECT sum(a), avg(b) from fuse_tbl;
+EXPLAIN SYNTAX SELECT sum(a), avg(b) from fuse_tbl;
+DROP TABLE fuse_tbl;
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.reference b/tests/queries/0_stateless/01748_partition_id_pruning.reference
index 192e33c03c9..c1e4e2c78ef 100644
--- a/tests/queries/0_stateless/01748_partition_id_pruning.reference
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.reference
@@ -5,3 +5,13 @@
 1	2
 1	3
 3
+1
+11
+21
+31
+41
+51
+61
+71
+81
+91
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.sql b/tests/queries/0_stateless/01748_partition_id_pruning.sql
index 0a3f7d2713c..17a405e17ad 100644
--- a/tests/queries/0_stateless/01748_partition_id_pruning.sql
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.sql
@@ -17,3 +17,15 @@ set max_rows_to_read = 1; -- one row for subquery
 select count() from x where _partition_id in (select partitionId(number + 1) from numbers(1));
 
 drop table x;
+
+drop table if exists mt;
+
+create table mt (n UInt64) engine=MergeTree order by n partition by n % 10;
+
+set max_rows_to_read = 200;
+
+insert into mt select * from numbers(100);
+
+select * from mt where toUInt64(substr(_part, 1, position(_part, '_') - 1)) = 1;
+
+drop table mt;
diff --git a/tests/queries/0_stateless/01753_max_uri_size.sh b/tests/queries/0_stateless/01753_max_uri_size.sh
index 5c63d9274fd..62bc4f2c26f 100755
--- a/tests/queries/0_stateless/01753_max_uri_size.sh
+++ b/tests/queries/0_stateless/01753_max_uri_size.sh
@@ -4,8 +4,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# NOTE: since 'max_uri_size' doesn't affect the request itself, this test hardly depends on the default value of this setting (16Kb).
+# NOTE: since 'max_uri_size' doesn't affect the request itself, this test hardly depends on the default value of this setting (1 MiB).
 
-LONG_REQUEST=$(python3 -c "print('&max_uri_size=1'*2000, end='')")  # ~30K
+python3 -c "
+print('${CLICKHOUSE_URL}', end='')
+print('&hello=world'*100000, end='')
+print('&query=SELECT+1')
+" > "${CLICKHOUSE_TMP}/url.txt"
 
-${CLICKHOUSE_CURL} -sSv "${CLICKHOUSE_URL}${LONG_REQUEST}&query=SELECT+1" 2>&1 | grep -Fc "HTTP/1.1 400 Bad Request"
+wget --input-file "${CLICKHOUSE_TMP}/url.txt" 2>&1 | grep -Fc "400: Bad Request"
+
+rm "${CLICKHOUSE_TMP}/url.txt"
diff --git a/tests/queries/0_stateless/01754_clickhouse_format_backslash.reference b/tests/queries/0_stateless/01754_clickhouse_format_backslash.reference
index 328483d9867..28519b2f92f 100644
--- a/tests/queries/0_stateless/01754_clickhouse_format_backslash.reference
+++ b/tests/queries/0_stateless/01754_clickhouse_format_backslash.reference
@@ -1,5 +1,5 @@
 SELECT * \
-FROM  \
+FROM \
 ( \
     SELECT 1 AS x \
     UNION ALL \
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
new file mode 100644
index 00000000000..a1bfcf043da
--- /dev/null
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
@@ -0,0 +1,25 @@
+(0, 2)
+0	0
+0	0
+WITH CAST(\'default\', \'String\') AS id_no SELECT one.dummy, ignore(id_no) FROM system.one WHERE dummy IN (0, 2)
+WITH CAST(\'default\', \'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\', \'String\') AS id_02 SELECT one.dummy, ignore(id_02) FROM system.one WHERE dummy IN tuple(0)
+WITH CAST(\'default\', \'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\', \'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\', \'String\') AS id_0 SELECT one.dummy, ignore(id_0) FROM system.one WHERE dummy IN tuple(0)
+errors
+others
+0
+0
+0
+different types -- prohibited
+different types -- conversion
+0
+optimize_skip_unused_shards_limit
+0
+0
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
new file mode 100644
index 00000000000..dc481ccca72
--- /dev/null
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
@@ -0,0 +1,138 @@
+-- NOTE: this test cannot use 'current_database = currentDatabase()',
+-- because it does not propagated via remote queries,
+-- hence it uses 'with (select currentDatabase()) as X'
+-- (with subquery to expand it on the initiator).
+
+drop table if exists dist_01756;
+drop table if exists dist_01756_str;
+drop table if exists dist_01756_column;
+drop table if exists data_01756_str;
+
+-- SELECT
+--     intHash64(0) % 2,
+--     intHash64(2) % 2
+-- ┌─modulo(intHash64(0), 2)─┬─modulo(intHash64(2), 2)─┐
+-- │                       0 │                       1 │
+-- └─────────────────────────┴─────────────────────────┘
+create table dist_01756 as system.one engine=Distributed(test_cluster_two_shards, system, one, intHash64(dummy));
+
+-- separate log entry for localhost queries
+set prefer_localhost_replica=0;
+set force_optimize_skip_unused_shards=2;
+set optimize_skip_unused_shards=1;
+set optimize_skip_unused_shards_rewrite_in=0;
+set log_queries=1;
+
+--
+-- w/o optimize_skip_unused_shards_rewrite_in=1
+--
+select '(0, 2)';
+with (select currentDatabase()) as id_no select *, ignore(id_no) from dist_01756 where dummy in (0, 2);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_no %') and
+    type = 'QueryFinish'
+order by query;
+
+--
+-- w/ optimize_skip_unused_shards_rewrite_in=1
+--
+
+set optimize_skip_unused_shards_rewrite_in=1;
+
+-- detailed coverage for realistic examples
+select 'optimize_skip_unused_shards_rewrite_in(0, 2)';
+with (select currentDatabase()) as id_02 select *, ignore(id_02) from dist_01756 where dummy in (0, 2);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_02 %') and
+    type = 'QueryFinish'
+order by query;
+
+select 'optimize_skip_unused_shards_rewrite_in(2,)';
+with (select currentDatabase()) as id_2 select *, ignore(id_2) from dist_01756 where dummy in (2,);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_2 %') and
+    type = 'QueryFinish'
+order by query;
+
+select 'optimize_skip_unused_shards_rewrite_in(0,)';
+with (select currentDatabase()) as id_0 select *, ignore(id_0) from dist_01756 where dummy in (0,);
+system flush logs;
+select query from system.query_log where
+    event_date = today() and
+    event_time > now() - interval 1 hour and
+    not is_initial_query and
+    query not like '%system.query_log%' and
+    query like concat('WITH%', currentDatabase(), '%AS id_0 %') and
+    type = 'QueryFinish'
+order by query;
+
+--
+-- errors
+--
+select 'errors';
+
+-- not tuple
+select * from dist_01756 where dummy in (0); -- { serverError 507 }
+-- optimize_skip_unused_shards does not support non-constants
+select * from dist_01756 where dummy in (select * from system.one); -- { serverError 507 }
+select * from dist_01756 where dummy in (toUInt8(0)); -- { serverError 507 }
+-- wrong type (tuple)
+select * from dist_01756 where dummy in ('0'); -- { serverError 507 }
+-- intHash64 does not accept string
+select * from dist_01756 where dummy in ('0', '2'); -- { serverError 43 }
+-- NOT IN does not supported
+select * from dist_01756 where dummy not in (0, 2); -- { serverError 507 }
+
+--
+-- others
+--
+select 'others';
+
+select * from dist_01756 where dummy not in (2, 3) and dummy in (0, 2);
+select * from dist_01756 where dummy in tuple(0, 2);
+select * from dist_01756 where dummy in tuple(0);
+select * from dist_01756 where dummy in tuple(2);
+-- Identifier is NULL
+select (2 IN (2,)), * from dist_01756 where dummy in (0, 2) format Null;
+-- Literal is NULL
+select (dummy IN (toUInt8(2),)), * from dist_01756 where dummy in (0, 2) format Null;
+
+-- different type
+select 'different types -- prohibited';
+create table data_01756_str (key String) engine=Memory();
+create table dist_01756_str as data_01756_str engine=Distributed(test_cluster_two_shards, currentDatabase(), data_01756_str, cityHash64(key));
+select * from dist_01756_str where key in ('0', '2');
+select * from dist_01756_str where key in ('0', Null); -- { serverError 507 }
+select * from dist_01756_str where key in (0, 2); -- { serverError 53 }
+select * from dist_01756_str where key in (0, Null); -- { serverError 53 }
+
+-- different type #2
+select 'different types -- conversion';
+create table dist_01756_column as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
+select * from dist_01756_column where dummy in (0, '255');
+select * from dist_01756_column where dummy in (0, '255foo'); -- { serverError 53 }
+
+-- optimize_skip_unused_shards_limit
+select 'optimize_skip_unused_shards_limit';
+select * from dist_01756 where dummy in (0, 2) settings optimize_skip_unused_shards_limit=1; -- { serverError 507 }
+select * from dist_01756 where dummy in (0, 2) settings optimize_skip_unused_shards_limit=1, force_optimize_skip_unused_shards=0;
+
+drop table dist_01756;
+drop table dist_01756_str;
+drop table dist_01756_column;
+drop table data_01756_str;
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 b26961eda8e..d18ea8694a9 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
@@ -10,3 +10,5 @@ $CLICKHOUSE_CLIENT --optimize_skip_unused_shards=1 -nm -q "
 create table dist_01758 as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
 select * from dist_01758 where dummy = 0 format Null;
 " |& grep -o "StorageDistributed (dist_01758).*"
+
+$CLICKHOUSE_CLIENT -q "drop table dist_01758" 2>/dev/null
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 b95d640ca1a..2ddf318313f 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,2 +1,3 @@
 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
+select ignore(1), * from dist_01756 where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
+drop table dist_01756;
diff --git a/tests/queries/0_stateless/01760_polygon_dictionaries.sql b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
index 5e26d2fc306..406e9af27ea 100644
--- a/tests/queries/0_stateless/01760_polygon_dictionaries.sql
+++ b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
@@ -65,3 +65,5 @@ SELECT tuple(inf, inf) as key, dictGet('01760_db.dict_array', 'name', key); --{s
 DROP DICTIONARY 01760_db.dict_array;
 DROP TABLE 01760_db.points;
 DROP TABLE 01760_db.polygons;
+
+DROP DATABASE 01760_db;
diff --git a/tests/queries/0_stateless/01762_deltasumtimestamp.reference b/tests/queries/0_stateless/01762_deltasumtimestamp.reference
new file mode 100644
index 00000000000..563ef5c412d
--- /dev/null
+++ b/tests/queries/0_stateless/01762_deltasumtimestamp.reference
@@ -0,0 +1,5 @@
+10
+10
+8
+8
+13
diff --git a/tests/queries/0_stateless/01762_deltasumtimestamp.sql b/tests/queries/0_stateless/01762_deltasumtimestamp.sql
new file mode 100644
index 00000000000..a0098ccc2ee
--- /dev/null
+++ b/tests/queries/0_stateless/01762_deltasumtimestamp.sql
@@ -0,0 +1,5 @@
+select deltaSumTimestampMerge(state) from (select deltaSumTimestampState(value, timestamp) as state from (select toDate(number) as timestamp, [4, 5, 5, 5][number-4] as value from numbers(5, 4)) UNION ALL select deltaSumTimestampState(value, timestamp) as state from (select toDate(number) as timestamp, [0, 4, 8, 3][number] as value from numbers(1, 4)));
+select deltaSumTimestampMerge(state) from (select deltaSumTimestampState(value, timestamp) as state from (select number as timestamp, [0, 4, 8, 3][number] as value from numbers(1, 4)) UNION ALL select deltaSumTimestampState(value, timestamp) as state from (select number as timestamp, [4, 5, 5, 5][number-4] as value from numbers(5, 4)));
+select deltaSumTimestamp(value, timestamp) from (select toDateTime(number) as timestamp, [0, 4, 8, 3][number] as value from numbers(1, 4));
+select deltaSumTimestamp(value, timestamp) from (select toDateTime(number) as timestamp, [0, 4.5, 8, 3][number] as value from numbers(1, 4));
+select deltaSumTimestamp(value, timestamp) from (select number as timestamp, [0, 4, 8, 3, 0, 0, 0, 1, 3, 5][number] as value from numbers(1, 10));
diff --git a/tests/queries/0_stateless/01763_max_distributed_depth.reference b/tests/queries/0_stateless/01763_max_distributed_depth.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01763_max_distributed_depth.sql b/tests/queries/0_stateless/01763_max_distributed_depth.sql
new file mode 100644
index 00000000000..d1bb9e4be90
--- /dev/null
+++ b/tests/queries/0_stateless/01763_max_distributed_depth.sql
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS tt6;
+
+CREATE TABLE tt6
+(
+	`id` UInt32,
+	`first_column` UInt32,
+	`second_column` UInt32,
+	`third_column` UInt32,
+	`status` String
+
+)
+ENGINE = Distributed('test_shard_localhost', '', 'tt6', rand());
+
+INSERT INTO tt6 VALUES (1, 1, 1, 1, 'ok'); -- { serverError 581 }
+
+SELECT * FROM tt6; -- { serverError 581 }
+
+SET max_distributed_depth = 0;
+
+-- stack overflow
+INSERT INTO tt6 VALUES (1, 1, 1, 1, 'ok'); -- { serverError 306}
+
+-- stack overflow
+SELECT * FROM tt6; -- { serverError 306 }
+
+DROP TABLE tt6;
diff --git a/tests/queries/0_stateless/01764_prefer_column_name_to_alias.reference b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.reference
index 6fde46c38a4..8ee34598a59 100644
--- a/tests/queries/0_stateless/01764_prefer_column_name_to_alias.reference
+++ b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.reference
@@ -1,3 +1,5 @@
 4.5	9
 3	2
 3	3
+3	1	1	2
+3	1	1	2
diff --git a/tests/queries/0_stateless/01764_prefer_column_name_to_alias.sql b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.sql
index 5524712c3c6..194d2b90854 100644
--- a/tests/queries/0_stateless/01764_prefer_column_name_to_alias.sql
+++ b/tests/queries/0_stateless/01764_prefer_column_name_to_alias.sql
@@ -6,3 +6,13 @@ set prefer_column_name_to_alias  = 1;
 SELECT avg(number) AS number, max(number) FROM numbers(10);
 SELECT sum(x) AS x, max(x) FROM (SELECT 1 AS x UNION ALL SELECT 2 AS x) t settings prefer_column_name_to_alias = 1;
 select sum(C1) as C1, count(C1) as C2 from (select number as C1 from numbers(3)) as ITBL settings prefer_column_name_to_alias = 1;
+
+DROP TABLE IF EXISTS mytable;
+CREATE TABLE IF NOT EXISTS mytable (start_ts UInt32, end_ts UInt32, uuid String) ENGINE = MergeTree() ORDER BY start_ts;
+INSERT INTO mytable VALUES (1, 2, 3);
+
+SELECT any(uuid) AS id, max(end_ts) - any(start_ts) AS time_delta, any(start_ts) AS start_ts, max(end_ts) AS end_ts FROM mytable GROUP BY uuid HAVING max(end_ts) < 1620141001 ORDER BY any(start_ts) DESC;
+
+SELECT any(uuid) AS id, max(end_ts) - any(start_ts) AS time_delta, any(start_ts) AS start_ts, max(end_ts) AS end_ts FROM mytable GROUP BY uuid HAVING max(end_ts) < 1620141001 ORDER BY any(start_ts) DESC SETTINGS prefer_column_name_to_alias=1;
+
+DROP TABLE mytable;
diff --git a/tests/queries/0_stateless/01768_array_product.reference b/tests/queries/0_stateless/01768_array_product.reference
new file mode 100644
index 00000000000..af2508e1aff
--- /dev/null
+++ b/tests/queries/0_stateless/01768_array_product.reference
@@ -0,0 +1,18 @@
+Array product with constant column
+720	Float64
+24	Float64
+3.5	Float64
+6	Float64
+Array product with non constant column
+24
+0
+6
+24
+0
+6
+Types of aggregation result array product
+Float64	Float64	Float64	Float64
+Float64	Float64	Float64	Float64
+Float64	Float64	Float64
+Float64	Float64
+Float64	Float64	Float64
diff --git a/tests/queries/0_stateless/01768_array_product.sql b/tests/queries/0_stateless/01768_array_product.sql
new file mode 100644
index 00000000000..75056888ef2
--- /dev/null
+++ b/tests/queries/0_stateless/01768_array_product.sql
@@ -0,0 +1,26 @@
+SELECT 'Array product with constant column';
+
+SELECT arrayProduct([1,2,3,4,5,6]) as a, toTypeName(a);
+SELECT arrayProduct(array(1.0,2.0,3.0,4.0)) as a, toTypeName(a);
+SELECT arrayProduct(array(1,3.5)) as a, toTypeName(a);
+SELECT arrayProduct([toDecimal64(1,8), toDecimal64(2,8), toDecimal64(3,8)]) as a, toTypeName(a);
+
+SELECT 'Array product with non constant column';
+
+DROP TABLE IF EXISTS test_aggregation;
+CREATE TABLE test_aggregation (x Array(Int)) ENGINE=TinyLog;
+INSERT INTO test_aggregation VALUES ([1,2,3,4]), ([]), ([1,2,3]);
+SELECT arrayProduct(x) FROM test_aggregation;
+DROP TABLE test_aggregation;
+
+CREATE TABLE test_aggregation (x Array(Decimal64(8))) ENGINE=TinyLog;
+INSERT INTO test_aggregation VALUES ([1,2,3,4]), ([]), ([1,2,3]);
+SELECT arrayProduct(x) FROM test_aggregation;
+DROP TABLE test_aggregation;
+
+SELECT 'Types of aggregation result array product';
+SELECT toTypeName(arrayProduct([toInt8(0)])), toTypeName(arrayProduct([toInt16(0)])), toTypeName(arrayProduct([toInt32(0)])), toTypeName(arrayProduct([toInt64(0)]));
+SELECT toTypeName(arrayProduct([toUInt8(0)])), toTypeName(arrayProduct([toUInt16(0)])), toTypeName(arrayProduct([toUInt32(0)])), toTypeName(arrayProduct([toUInt64(0)]));
+SELECT toTypeName(arrayProduct([toInt128(0)])), toTypeName(arrayProduct([toInt256(0)])), toTypeName(arrayProduct([toUInt256(0)]));
+SELECT toTypeName(arrayProduct([toFloat32(0)])), toTypeName(arrayProduct([toFloat64(0)]));
+SELECT toTypeName(arrayProduct([toDecimal32(0, 8)])), toTypeName(arrayProduct([toDecimal64(0, 8)])), toTypeName(arrayProduct([toDecimal128(0, 8)]));
diff --git a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference
new file mode 100644
index 00000000000..0cfb83aa2f2
--- /dev/null
+++ b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference
@@ -0,0 +1,3 @@
+1	1
+2	2
+3	3
diff --git a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
new file mode 100644
index 00000000000..5673e646a47
--- /dev/null
+++ b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
@@ -0,0 +1,53 @@
+DROP DATABASE IF EXISTS 01780_db;
+CREATE DATABASE 01780_db;
+
+DROP DICTIONARY IF EXISTS dict1;
+CREATE DICTIONARY dict1
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 TABLE 'dict1'))
+LAYOUT(DIRECT());
+
+SELECT * FROM dict1; --{serverError 36}
+
+DROP DICTIONARY dict1;
+
+DROP DICTIONARY IF EXISTS dict2;
+CREATE DICTIONARY 01780_db.dict2
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 DATABASE '01780_db' TABLE 'dict2'))
+LAYOUT(DIRECT());
+
+SELECT * FROM 01780_db.dict2; --{serverError 36}
+DROP DICTIONARY 01780_db.dict2;
+
+DROP TABLE IF EXISTS 01780_db.dict3_source;
+CREATE TABLE 01780_db.dict3_source
+(
+    id UInt64,
+    value String
+) ENGINE = TinyLog;
+
+INSERT INTO 01780_db.dict3_source VALUES (1, '1'), (2, '2'), (3, '3');
+
+CREATE DICTIONARY 01780_db.dict3
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 TABLE 'dict3_source' DATABASE '01780_db'))
+LAYOUT(DIRECT());
+
+SELECT * FROM 01780_db.dict3;
+
+DROP DICTIONARY 01780_db.dict3;
+
+DROP DATABASE 01780_db;
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.reference b/tests/queries/0_stateless/01781_merge_tree_deduplication.reference
new file mode 100644
index 00000000000..cb5a3f1ff52
--- /dev/null
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.reference
@@ -0,0 +1,85 @@
+1	1
+1	1
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+===============
+10	10
+12	12
+===============
+1	1
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+8	8
+9	9
+11	11
+12	12
+===============
+88	11	11
+77	11	11
+77	12	12
+===============
+1	1	33
+1	1	33
+2	2	33
+3	3	33
+===============
+1	1	33
+1	1	33
+1	1	33
+1	1	33
+2	2	33
+3	3	33
+===============
+1	1	33
+1	1	33
+1	1	33
+1	1	33
+1	1	33
+2	2	33
+3	3	33
+===============
+1	1	44
+2	2	44
+3	3	44
+4	4	44
+===============
+1	1
+1	1
+===============
+1	1
+1	1
+1	1
+2	2
+3	3
+4	4
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
new file mode 100644
index 00000000000..236f7b35b80
--- /dev/null
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
@@ -0,0 +1,187 @@
+DROP TABLE IF EXISTS merge_tree_deduplication;
+
+CREATE TABLE merge_tree_deduplication
+(
+    key UInt64,
+    value String,
+    part UInt8 DEFAULT 77
+)
+ENGINE=MergeTree()
+ORDER BY key
+PARTITION BY part
+SETTINGS non_replicated_deduplication_window=3;
+
+SYSTEM STOP MERGES merge_tree_deduplication;
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (1, '1');
+
+SELECT key, value FROM merge_tree_deduplication;
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (1, '1');
+
+SELECT key, value FROM merge_tree_deduplication;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (2, '2');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (3, '3');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (4, '4');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (1, '1');
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (5, '5');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (6, '6');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (7, '7');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (5, '5');
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (8, '8');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (9, '9');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (10, '10');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12');
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (10, '10');
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11');
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12');
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_deduplication DROP PART '77_9_9_0'; -- some old part
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (10, '10');
+
+SELECT key, value FROM merge_tree_deduplication WHERE key = 10;
+
+ALTER TABLE merge_tree_deduplication DROP PART '77_13_13_0'; -- fresh part
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12');
+
+SELECT key, value FROM merge_tree_deduplication WHERE key = 12;
+
+DETACH TABLE merge_tree_deduplication;
+ATTACH TABLE merge_tree_deduplication;
+
+OPTIMIZE TABLE  merge_tree_deduplication FINAL;
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11'); -- deduplicated
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12'); -- deduplicated
+
+SELECT '===============';
+
+SELECT key, value FROM merge_tree_deduplication ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (11, '11', 88);
+
+ALTER TABLE merge_tree_deduplication DROP PARTITION 77;
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (11, '11', 88); --deduplicated
+
+INSERT INTO merge_tree_deduplication (key, value) VALUES (11, '11'); -- not deduplicated
+INSERT INTO merge_tree_deduplication (key, value) VALUES (12, '12'); -- not deduplicated
+
+SELECT part, key, value FROM merge_tree_deduplication ORDER BY key;
+
+-- Alters....
+
+ALTER TABLE merge_tree_deduplication MODIFY SETTING non_replicated_deduplication_window = 2;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (2, '2', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (3, '3', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+
+SELECT * FROM merge_tree_deduplication WHERE part = 33 ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_deduplication MODIFY SETTING non_replicated_deduplication_window = 0;
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+
+DETACH TABLE merge_tree_deduplication;
+ATTACH TABLE merge_tree_deduplication;
+
+SELECT * FROM merge_tree_deduplication WHERE part = 33 ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_deduplication MODIFY SETTING non_replicated_deduplication_window = 3;
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 33);
+
+SELECT * FROM merge_tree_deduplication WHERE part = 33 ORDER BY key;
+
+SELECT '===============';
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 44);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (2, '2', 44);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (3, '3', 44);
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (1, '1', 44);
+
+INSERT INTO merge_tree_deduplication (key, value, part) VALUES (4, '4', 44);
+
+DETACH TABLE merge_tree_deduplication;
+ATTACH TABLE merge_tree_deduplication;
+
+SELECT * FROM merge_tree_deduplication WHERE part = 44 ORDER BY key;
+
+DROP TABLE IF EXISTS merge_tree_deduplication;
+
+SELECT '===============';
+
+DROP TABLE IF EXISTS merge_tree_no_deduplication;
+
+CREATE TABLE merge_tree_no_deduplication
+(
+    key UInt64,
+    value String
+)
+ENGINE=MergeTree()
+ORDER BY key;
+
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+
+SELECT * FROM merge_tree_no_deduplication ORDER BY key;
+
+SELECT '===============';
+
+ALTER TABLE merge_tree_no_deduplication MODIFY SETTING non_replicated_deduplication_window = 3;
+
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (2, '2');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (3, '3');
+
+DETACH TABLE merge_tree_no_deduplication;
+ATTACH TABLE merge_tree_no_deduplication;
+
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (1, '1');
+INSERT INTO merge_tree_no_deduplication (key, value) VALUES (4, '4');
+
+SELECT * FROM merge_tree_no_deduplication ORDER BY key;
+
+DROP TABLE IF EXISTS merge_tree_no_deduplication;
diff --git a/tests/queries/0_stateless/01783_merge_engine_join_key_condition.reference b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.reference
new file mode 100644
index 00000000000..4068a6e00dd
--- /dev/null
+++ b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.reference
@@ -0,0 +1,5 @@
+3	3
+1	4
+1	4
+1	4
+1	4
diff --git a/tests/queries/0_stateless/01783_merge_engine_join_key_condition.sql b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.sql
new file mode 100644
index 00000000000..372c1bd3572
--- /dev/null
+++ b/tests/queries/0_stateless/01783_merge_engine_join_key_condition.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS foo;
+DROP TABLE IF EXISTS foo_merge;
+DROP TABLE IF EXISTS t2;
+
+CREATE TABLE foo(Id Int32, Val Int32) Engine=MergeTree PARTITION BY Val ORDER BY Id;
+INSERT INTO foo SELECT number, number%5 FROM numbers(100000);
+
+CREATE TABLE foo_merge as foo ENGINE=Merge(currentDatabase(), '^foo');
+
+CREATE TABLE t2 (Id Int32, Val Int32, X Int32) Engine=Memory;
+INSERT INTO t2 values (4, 3, 4);
+
+SET force_primary_key = 1, force_index_by_date=1;
+
+SELECT * FROM foo_merge WHERE Val = 3 AND Id = 3;
+SELECT count(), X FROM foo_merge JOIN t2 USING Val WHERE Val = 3 AND Id = 3 AND t2.X == 4 GROUP BY X;
+SELECT count(), X FROM foo_merge JOIN t2 USING Val WHERE Val = 3 AND (Id = 3 AND t2.X == 4) GROUP BY X;
+SELECT count(), X FROM foo_merge JOIN t2 USING Val WHERE Val = 3 AND Id = 3 GROUP BY X;
+SELECT count(), X FROM (SELECT * FROM foo_merge) f JOIN t2 USING Val WHERE Val = 3 AND Id = 3 GROUP BY X;
+
+DROP TABLE IF EXISTS foo;
+DROP TABLE IF EXISTS foo_merge;
+DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/01785_dictionary_element_count.reference b/tests/queries/0_stateless/01785_dictionary_element_count.reference
new file mode 100644
index 00000000000..4b79788b4d4
--- /dev/null
+++ b/tests/queries/0_stateless/01785_dictionary_element_count.reference
@@ -0,0 +1,8 @@
+1	First
+simple_key_flat_dictionary	01785_db	1
+1	First
+simple_key_hashed_dictionary	01785_db	1
+1	First
+simple_key_cache_dictionary	01785_db	1
+1	FirstKey	First
+complex_key_hashed_dictionary	01785_db	1
diff --git a/tests/queries/0_stateless/01785_dictionary_element_count.sql b/tests/queries/0_stateless/01785_dictionary_element_count.sql
new file mode 100644
index 00000000000..6db65152a56
--- /dev/null
+++ b/tests/queries/0_stateless/01785_dictionary_element_count.sql
@@ -0,0 +1,91 @@
+DROP DATABASE IF EXISTS 01785_db;
+CREATE DATABASE 01785_db;
+
+DROP TABLE IF EXISTS 01785_db.simple_key_source_table;
+CREATE TABLE 01785_db.simple_key_source_table
+(
+    id UInt64,
+    value String
+) ENGINE = TinyLog();
+
+INSERT INTO 01785_db.simple_key_source_table VALUES (1, 'First');
+INSERT INTO 01785_db.simple_key_source_table VALUES (1, 'First');
+
+DROP DICTIONARY IF EXISTS 01785_db.simple_key_flat_dictionary;
+CREATE DICTIONARY 01785_db.simple_key_flat_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'simple_key_source_table'))
+LAYOUT(FLAT())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT * FROM 01785_db.simple_key_flat_dictionary;
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'simple_key_flat_dictionary';
+
+DROP DICTIONARY 01785_db.simple_key_flat_dictionary;
+
+CREATE DICTIONARY 01785_db.simple_key_hashed_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'simple_key_source_table'))
+LAYOUT(HASHED())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT * FROM 01785_db.simple_key_hashed_dictionary;
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'simple_key_hashed_dictionary';
+
+DROP DICTIONARY 01785_db.simple_key_hashed_dictionary;
+
+CREATE DICTIONARY 01785_db.simple_key_cache_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'simple_key_source_table'))
+LAYOUT(CACHE(SIZE_IN_CELLS 100000))
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT toUInt64(1) as key, dictGet('01785_db.simple_key_cache_dictionary', 'value', key);
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'simple_key_cache_dictionary';
+
+DROP DICTIONARY 01785_db.simple_key_cache_dictionary;
+
+DROP TABLE 01785_db.simple_key_source_table;
+
+DROP TABLE IF EXISTS 01785_db.complex_key_source_table;
+CREATE TABLE 01785_db.complex_key_source_table
+(
+    id UInt64,
+    id_key String,
+    value String
+) ENGINE = TinyLog();
+
+INSERT INTO 01785_db.complex_key_source_table VALUES (1, 'FirstKey', 'First');
+INSERT INTO 01785_db.complex_key_source_table VALUES (1, 'FirstKey', 'First');
+
+CREATE DICTIONARY 01785_db.complex_key_hashed_dictionary
+(
+    id UInt64,
+    id_key String,
+    value String
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01785_db' TABLE 'complex_key_source_table'))
+LAYOUT(COMPLEX_KEY_HASHED())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT * FROM 01785_db.complex_key_hashed_dictionary;
+SELECT name, database, element_count FROM system.dictionaries WHERE database = '01785_db' AND name = 'complex_key_hashed_dictionary';
+
+DROP DICTIONARY 01785_db.complex_key_hashed_dictionary;
+
+DROP TABLE 01785_db.complex_key_source_table;
+
+DROP DATABASE 01785_db;
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.reference b/tests/queries/0_stateless/01786_explain_merge_tree.reference
new file mode 100644
index 00000000000..7a0a0af3e05
--- /dev/null
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.reference
@@ -0,0 +1,109 @@
+      ReadFromMergeTree
+      Indexes:
+        MinMax
+          Keys: 
+            y
+          Condition: (y in [1, +inf))
+          Parts: 4/5
+          Granules: 11/12
+        Partition
+          Keys: 
+            y
+            bitAnd(z, 3)
+          Condition: and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +inf)), (bitAnd(z, 3) not in [1, 1])))
+          Parts: 3/4
+          Granules: 10/11
+        PrimaryKey
+          Keys: 
+            x
+            y
+          Condition: and((x in [11, +inf)), (y in [1, +inf)))
+          Parts: 2/3
+          Granules: 6/10
+        Skip
+          Name: t_minmax
+          Description: minmax GRANULARITY 2
+          Parts: 1/2
+          Granules: 2/6
+        Skip
+          Name: t_set
+          Description: set GRANULARITY 2
+          Parts: 1/1
+          Granules: 1/2
+-----------------
+                  "Node Type": "ReadFromMergeTree",
+                  "Indexes": [
+                    {
+                      "Type": "MinMax",
+                      "Keys": ["y"],
+                      "Condition": "(y in [1, +inf))",
+                      "Initial Parts": 5,
+                      "Selected Parts": 4,
+                      "Initial Granules": 12,
+                      "Selected Granules": 11
+                    },
+                    {
+                      "Type": "Partition",
+                      "Keys": ["y", "bitAnd(z, 3)"],
+                      "Condition": "and((bitAnd(z, 3) not in [1, 1]), and((y in [1, +inf)), (bitAnd(z, 3) not in [1, 1])))",
+                      "Initial Parts": 4,
+                      "Selected Parts": 3,
+                      "Initial Granules": 11,
+                      "Selected Granules": 10
+                    },
+                    {
+                      "Type": "PrimaryKey",
+                      "Keys": ["x", "y"],
+                      "Condition": "and((x in [11, +inf)), (y in [1, +inf)))",
+                      "Initial Parts": 3,
+                      "Selected Parts": 2,
+                      "Initial Granules": 10,
+                      "Selected Granules": 6
+                    },
+                    {
+                      "Type": "Skip",
+                      "Name": "t_minmax",
+                      "Description": "minmax GRANULARITY 2",
+                      "Initial Parts": 2,
+                      "Selected Parts": 1,
+                      "Initial Granules": 6,
+                      "Selected Granules": 2
+                    },
+                    {
+                      "Type": "Skip",
+                      "Name": "t_set",
+                      "Description": "set GRANULARITY 2",
+                      "Initial Parts": 1,
+                      "Selected Parts": 1,
+                      "Initial Granules": 2,
+                      "Selected Granules": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+-----------------
+          ReadFromMergeTree
+          ReadType: InOrder
+          Parts: 1
+          Granules: 3
+-----------------
+          ReadFromMergeTree
+          ReadType: InReverseOrder
+          Parts: 1
+          Granules: 3
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            x
+            plus(x, y)
+          Condition: or((x in 2-element set), (plus(plus(x, y), 1) in (-inf, 2]))
+          Parts: 1/1
+          Granules: 1/1
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.sh b/tests/queries/0_stateless/01786_explain_merge_tree.sh
new file mode 100755
index 00000000000..6be86f9ce02
--- /dev/null
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.sh
@@ -0,0 +1,43 @@
+#!/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 test_index"
+$CLICKHOUSE_CLIENT -q "drop table if exists idx"
+
+$CLICKHOUSE_CLIENT -q "create table test_index (x UInt32, y UInt32, z UInt32, t UInt32, index t_minmax t % 20 TYPE minmax GRANULARITY 2, index t_set t % 19 type set(4) granularity 2) engine = MergeTree order by (x, y) partition by (y, bitAnd(z, 3), intDiv(t, 15)) settings index_granularity = 2, min_bytes_for_wide_part = 0"
+$CLICKHOUSE_CLIENT -q "insert into test_index select number, number > 3 ? 3 : number, number = 1 ? 1 : 0, number from numbers(20)"
+
+$CLICKHOUSE_CLIENT -q "
+    explain indexes = 1 select *, _part from test_index where t % 19 = 16 and y > 0 and bitAnd(z, 3) != 1 and x > 10 and t % 20 > 14;
+    " | grep -A 100 "ReadFromMergeTree" # | grep -v "Description"
+
+echo "-----------------"
+
+$CLICKHOUSE_CLIENT -q "
+    explain indexes = 1, json = 1 select *, _part from test_index where t % 19 = 16 and y > 0 and bitAnd(z, 3) != 1 and x > 10 and t % 20 > 14 format TSVRaw;
+    " | grep -A 100 "ReadFromMergeTree" # | grep -v "Description"
+
+echo "-----------------"
+
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select x from test_index where x > 15 order by x;
+    " | grep -A 100 "ReadFromMergeTree"
+
+echo "-----------------"
+
+$CLICKHOUSE_CLIENT -q "
+    explain actions = 1 select x from test_index where x > 15 order by x desc;
+    " | grep -A 100 "ReadFromMergeTree"
+
+$CLICKHOUSE_CLIENT -q "CREATE TABLE idx (x UInt32, y UInt32, z UInt32) ENGINE = MergeTree ORDER BY (x, x + y) settings min_bytes_for_wide_part = 0"
+$CLICKHOUSE_CLIENT -q "insert into idx select number, number, number from numbers(10)"
+
+$CLICKHOUSE_CLIENT -q "
+    explain indexes = 1 select z from idx where not(x + y + 1 > 2 and x not in (4, 5))
+    " | grep -A 100 "ReadFromMergeTree"
+
+$CLICKHOUSE_CLIENT -q "drop table if exists test_index"
+$CLICKHOUSE_CLIENT -q "drop table if exists idx"
diff --git a/tests/queries/0_stateless/01786_group_by_pk_many_streams.reference b/tests/queries/0_stateless/01786_group_by_pk_many_streams.reference
new file mode 100644
index 00000000000..b8809e746a5
--- /dev/null
+++ b/tests/queries/0_stateless/01786_group_by_pk_many_streams.reference
@@ -0,0 +1,11 @@
+94950
+84950
+74950
+64950
+54950
+=======
+94950
+84950
+74950
+64950
+54950
diff --git a/tests/queries/0_stateless/01786_group_by_pk_many_streams.sql b/tests/queries/0_stateless/01786_group_by_pk_many_streams.sql
new file mode 100644
index 00000000000..e555aa4d6e6
--- /dev/null
+++ b/tests/queries/0_stateless/01786_group_by_pk_many_streams.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS group_by_pk;
+
+CREATE TABLE group_by_pk (k UInt64, v UInt64)
+ENGINE = MergeTree ORDER BY k PARTITION BY v % 50;
+
+INSERT INTO group_by_pk SELECT number / 100, number FROM numbers(1000);
+
+SELECT sum(v) AS s FROM group_by_pk GROUP BY k ORDER BY s DESC LIMIT 5
+SETTINGS optimize_aggregation_in_order = 1, max_block_size = 1;
+
+SELECT '=======';
+
+SELECT sum(v) AS s FROM group_by_pk GROUP BY k ORDER BY s DESC LIMIT 5
+SETTINGS optimize_aggregation_in_order = 0, max_block_size = 1;
+
+DROP TABLE IF EXISTS group_by_pk;
diff --git a/tests/queries/0_stateless/01787_arena_assert_column_nothing.reference b/tests/queries/0_stateless/01787_arena_assert_column_nothing.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01787_arena_assert_column_nothing.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01787_arena_assert_column_nothing.sql b/tests/queries/0_stateless/01787_arena_assert_column_nothing.sql
new file mode 100644
index 00000000000..de6374a1bc3
--- /dev/null
+++ b/tests/queries/0_stateless/01787_arena_assert_column_nothing.sql
@@ -0,0 +1 @@
+SELECT 1 GROUP BY emptyArrayToSingle(arrayFilter(x -> 1, []));
diff --git a/tests/queries/0_stateless/01787_map_remote.reference b/tests/queries/0_stateless/01787_map_remote.reference
new file mode 100644
index 00000000000..1c488d4418e
--- /dev/null
+++ b/tests/queries/0_stateless/01787_map_remote.reference
@@ -0,0 +1,2 @@
+{'a':1,'b':2}
+{'a':1,'b':2}
diff --git a/tests/queries/0_stateless/01787_map_remote.sql b/tests/queries/0_stateless/01787_map_remote.sql
new file mode 100644
index 00000000000..854eafa0a50
--- /dev/null
+++ b/tests/queries/0_stateless/01787_map_remote.sql
@@ -0,0 +1 @@
+SELECT map('a', 1, 'b', 2) FROM remote('127.0.0.{1,2}', system, one);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference
new file mode 100644
index 00000000000..48c30f97cd6
--- /dev/null
+++ b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference
@@ -0,0 +1,29 @@
+********* test 1 **********
+1	[100,200]	['aa','bb']	[1,2]
+0	[0,1]	['aa','bb']	[0,0]
+1	[100,200]	['aa','bb']	[1,2]
+2	[100,200,300]	['a','b','c']	[10,20,30]
+3	[3,4]	['aa','bb']	[3,6]
+4	[4,5]	['aa','bb']	[4,8]
+0	[0,1]	['aa','bb']	[0,0]
+1	[100,200]	['aa','bb']	[1,2]
+2	[100,200,300]	['a','b','c']	[100,200,300]
+3	[3,4]	['aa','bb']	[3,6]
+4	[4,5]	['aa','bb']	[4,8]
+0	[0,1]	['aa','bb']	[0,0]
+1	[100,200]	['aa','bb']	[1,2]
+2	[100,200,300]	['a','b','c']	[100,200,300]
+3	[68,72]	['aa','bb']	[68,72]
+4	[4,5]	['aa','bb']	[4,8]
+********* test 2 **********
+0	[0,1]	['aa','bb']	[0,0]	[0,1]	['aa','bb']
+1	[1,2]	['aa','bb']	[1,2]	[1,2]	['aa','bb']
+2	[2,3]	['aa','bb']	[2,4]	[2,3]	['aa','bb']
+3	[3,4]	['aa','bb']	[3,6]	[3,4]	['aa','bb']
+4	[4,5]	['aa','bb']	[4,8]	[4,5]	['aa','bb']
+********* test 3 **********
+0	0	aa	0
+1	1	bb	2
+2	2	aa	4
+3	3	aa	6
+4	4	aa	8
diff --git a/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql
new file mode 100644
index 00000000000..accb785ba03
--- /dev/null
+++ b/tests/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql
@@ -0,0 +1,77 @@
+DROP TABLE IF EXISTS test_wide_nested;
+
+CREATE TABLE test_wide_nested
+(
+    `id` Int,
+    `info.id` Array(Int),
+    `info.name` Array(String),
+    `info.age` Array(Int)
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+SELECT '********* test 1 **********';
+set mutations_sync = 1;
+
+INSERT INTO test_wide_nested SELECT number, [number,number + 1], ['aa','bb'], [number,number * 2] FROM numbers(5);
+
+alter table test_wide_nested update `info.id` = [100,200] where id = 1;
+select * from test_wide_nested where id = 1 order by id;
+
+alter table test_wide_nested update `info.id` = [100,200,300], `info.age` = [10,20,30], `info.name` = ['a','b','c'] where id = 2;
+select * from test_wide_nested;
+
+alter table test_wide_nested update `info.id` = [100,200,300], `info.age` = `info.id`, `info.name` = ['a','b','c'] where id = 2;
+select * from test_wide_nested;
+
+alter table test_wide_nested update `info.id` = [100,200], `info.age`=[68,72] where id = 3;
+alter table test_wide_nested update `info.id` = `info.age` where id = 3;
+select * from test_wide_nested;
+
+alter table test_wide_nested update `info.id` = [100,200], `info.age` = [10,20,30], `info.name` = ['a','b','c']  where id = 0; -- { serverError 341 }
+
+-- Recreate table, because KILL MUTATION is not suitable for parallel tests execution.
+SELECT '********* test 2 **********';
+DROP TABLE test_wide_nested;
+
+CREATE TABLE test_wide_nested
+(
+    `id` Int,
+    `info.id` Array(Int),
+    `info.name` Array(String),
+    `info.age` Array(Int)
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO test_wide_nested SELECT number, [number,number + 1], ['aa','bb'], [number,number * 2] FROM numbers(5);
+ALTER TABLE test_wide_nested ADD COLUMN `info2.id` Array(Int);
+ALTER TABLE test_wide_nested ADD COLUMN `info2.name` Array(String);
+ALTER table test_wide_nested update `info2.id` = `info.id`, `info2.name` = `info.name` where 1;
+select * from test_wide_nested;
+
+alter table test_wide_nested update `info.id` = [100,200,300], `info.age` = [10,20,30] where id = 1; -- { serverError 341 }
+
+DROP TABLE test_wide_nested;
+
+SELECT '********* test 3 **********';
+DROP TABLE IF EXISTS test_wide_not_nested;
+
+CREATE TABLE test_wide_not_nested
+(
+  `id` Int,
+  `info.id` Int,
+  `info.name` String,
+  `info.age` Int
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO test_wide_not_nested SELECT number, number, 'aa', number * 2 FROM numbers(5);
+ALTER TABLE test_wide_not_nested UPDATE `info.name` = 'bb' WHERE id = 1;
+SELECT * FROM test_wide_not_nested ORDER BY id;
+
+DROP TABLE test_wide_not_nested;
diff --git a/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.reference b/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql b/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql
new file mode 100644
index 00000000000..e921460ccfc
--- /dev/null
+++ b/tests/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS tmp_01781;
+DROP TABLE IF EXISTS dist_01781;
+
+SET prefer_localhost_replica=0;
+
+CREATE TABLE tmp_01781 (n LowCardinality(String)) ENGINE=Memory;
+CREATE TABLE dist_01781 (n LowCardinality(String)) Engine=Distributed(test_cluster_two_shards, currentDatabase(), tmp_01781, cityHash64(n));
+
+SET insert_distributed_sync=1;
+INSERT INTO dist_01781 VALUES ('1'),('2');
+-- different LowCardinality size
+INSERT INTO dist_01781 SELECT * FROM numbers(1000);
+
+SET insert_distributed_sync=0;
+SYSTEM STOP DISTRIBUTED SENDS dist_01781;
+INSERT INTO dist_01781 VALUES ('1'),('2');
+-- different LowCardinality size
+INSERT INTO dist_01781 SELECT * FROM numbers(1000);
+SYSTEM FLUSH DISTRIBUTED dist_01781;
+
+DROP TABLE tmp_01781;
+DROP TABLE dist_01781;
diff --git a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
new file mode 100644
index 00000000000..3bba1ac23c0
--- /dev/null
+++ b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
@@ -0,0 +1,6 @@
+<Warning> DistributedBlockOutputStream: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
+<Warning> DistributedBlockOutputStream: Structure does not match (remote: n Int8 Int8(size = 0), local: n UInt64 UInt64(size = 1)), implicit conversion will be done.
+1
+1
+2
+2
diff --git a/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
new file mode 100755
index 00000000000..e989696da03
--- /dev/null
+++ b/tests/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
@@ -0,0 +1,30 @@
+#!/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 --prefer_localhost_replica=0 -nm -q "
+    DROP TABLE IF EXISTS tmp_01683;
+    DROP TABLE IF EXISTS dist_01683;
+
+    CREATE TABLE tmp_01683 (n Int8) ENGINE=Memory;
+    CREATE TABLE dist_01683 (n UInt64) Engine=Distributed(test_cluster_two_shards, currentDatabase(), tmp_01683, n);
+
+    SET insert_distributed_sync=1;
+    INSERT INTO dist_01683 VALUES (1),(2);
+
+    SET insert_distributed_sync=0;
+    INSERT INTO dist_01683 VALUES (1),(2);
+    SYSTEM FLUSH DISTRIBUTED dist_01683;
+
+    -- TODO: cover distributed_directory_monitor_batch_inserts=1
+
+    SELECT * FROM tmp_01683 ORDER BY n;
+
+    DROP TABLE tmp_01683;
+    DROP TABLE dist_01683;
+" |& sed 's/^.*</</g'
diff --git a/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.reference b/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.sql b/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.sql
new file mode 100644
index 00000000000..7afa2b7e164
--- /dev/null
+++ b/tests/queries/0_stateless/01795_TinyLog_rwlock_ub.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS underlying_01795;
+CREATE TABLE underlying_01795 (key UInt64) Engine=TinyLog();
+INSERT INTO FUNCTION remote('127.1', currentDatabase(), underlying_01795) SELECT toUInt64(number) FROM system.numbers LIMIT 1;
+SELECT * FROM underlying_01795 FORMAT Null;
+DROP TABLE underlying_01795;
diff --git a/tests/queries/0_stateless/01796_Log_rwlock_ub.reference b/tests/queries/0_stateless/01796_Log_rwlock_ub.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01796_Log_rwlock_ub.sql b/tests/queries/0_stateless/01796_Log_rwlock_ub.sql
new file mode 100644
index 00000000000..4f95dbc14e5
--- /dev/null
+++ b/tests/queries/0_stateless/01796_Log_rwlock_ub.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS underlying_01796;
+CREATE TABLE underlying_01796 (key UInt64) Engine=Log();
+INSERT INTO FUNCTION remote('127.1', currentDatabase(), underlying_01796) SELECT toUInt64(number) FROM system.numbers LIMIT 1;
+SELECT * FROM underlying_01796 FORMAT Null;
+DROP TABLE underlying_01796;
diff --git a/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.reference b/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.sql b/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.sql
new file mode 100644
index 00000000000..18cadf0a227
--- /dev/null
+++ b/tests/queries/0_stateless/01797_StripeLog_rwlock_ub.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS underlying_01797;
+CREATE TABLE underlying_01797 (key UInt64) Engine=StripeLog();
+INSERT INTO FUNCTION remote('127.1', currentDatabase(), underlying_01797) SELECT toUInt64(number) FROM system.numbers LIMIT 1;
+SELECT * FROM underlying_01797 FORMAT Null;
+DROP TABLE underlying_01797;
diff --git a/tests/queries/0_stateless/01798_having_push_down.reference b/tests/queries/0_stateless/01798_having_push_down.reference
new file mode 100644
index 00000000000..3d6a36b087d
--- /dev/null
+++ b/tests/queries/0_stateless/01798_having_push_down.reference
@@ -0,0 +1,2 @@
+1	1	2
+1	\N
diff --git a/tests/queries/0_stateless/01798_having_push_down.sql b/tests/queries/0_stateless/01798_having_push_down.sql
new file mode 100644
index 00000000000..28b97b7f065
--- /dev/null
+++ b/tests/queries/0_stateless/01798_having_push_down.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS t_having;
+
+CREATE TABLE t_having (c0 Int32, c1 UInt64) ENGINE = Memory;
+
+INSERT INTO t_having SELECT number, number FROM numbers(1000);
+
+SELECT sum(c0 = 0), min(c0 + 1), sum(c0 + 2) FROM t_having
+GROUP BY c0 HAVING c0 = 0
+SETTINGS enable_optimize_predicate_expression=0;
+
+SELECT c0 + -1, sum(intDivOrZero(intDivOrZero(NULL, NULL), '2'), intDivOrZero(10000000000., intDivOrZero(intDivOrZero(intDivOrZero(NULL, NULL), 10), NULL))) FROM t_having GROUP BY c0 = 2, c0 = 10, intDivOrZero(intDivOrZero(intDivOrZero(NULL, NULL), NULL), NULL), c0 HAVING c0 = 2 SETTINGS enable_optimize_predicate_expression = 0;
+
+SELECT sum(c0 + 257) FROM t_having GROUP BY c0 = -9223372036854775808, NULL, -2147483649, c0 HAVING c0 = -9223372036854775808 SETTINGS enable_optimize_predicate_expression = 0;
+
+SELECT c0 + -2, c0 + -9223372036854775807, c0 = NULL FROM t_having GROUP BY c0 = 0.9998999834060669, 1023, c0 HAVING c0 = 0.9998999834060669 SETTINGS enable_optimize_predicate_expression = 0;
+
+DROP TABLE t_having;
diff --git a/tests/queries/0_stateless/01798_uniq_theta_sketch.reference b/tests/queries/0_stateless/01798_uniq_theta_sketch.reference
new file mode 100644
index 00000000000..0455a06036f
--- /dev/null
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.reference
@@ -0,0 +1,230 @@
+uniqTheta many agrs
+10	10	100	100	1000	1000
+17	10	10	100	100	610	610	766
+52	10	10	100	100	608	608	766
+5	10	10	100	100	608	608	765
+9	10	10	100	100	608	608	765
+13	10	10	100	100	607	607	765
+46	10	10	100	100	607	607	765
+48	10	10	100	100	609	609	765
+50	10	10	100	100	608	608	765
+54	10	10	100	100	609	609	765
+56	10	10	100	100	608	608	765
+uniqTheta distinct
+123
+143
+uniqTheta arrays
+2
+3
+3
+uniqTheta complex types
+3
+3
+3
+3
+3
+3
+3
+3
+3
+uniqTheta decimals
+(0,0,0)
+(101,101,101)
+uniqTheta remove injective
+SELECT uniqTheta(x)
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(x + y)
+FROM
+(
+    SELECT
+        number % 2 AS x,
+        number % 3 AS y
+    FROM numbers(10)
+)
+SELECT uniqTheta(x)
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(x)
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(x)
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(x)
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(x)
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(x + y)
+FROM
+(
+    SELECT
+        number % 2 AS x,
+        number % 3 AS y
+    FROM numbers(10)
+)
+SELECT uniqTheta(-x)
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(bitNot(x))
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(bitNot(-x))
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+SELECT uniqTheta(-bitNot(-x))
+FROM
+(
+    SELECT number % 2 AS x
+    FROM numbers(10)
+)
+1000	1000
+2014-06-01	1000	1000
+1000	1000
+2014-06-01	1000	1000
+2014-06-01	0	0	7	7
+2014-06-01	0	1	7	7
+2014-06-01	0	2	7	7
+2014-06-01	0	3	7	7
+2014-06-01	0	4	7	7
+2014-06-01	0	5	7	7
+2014-06-01	0	6	7	7
+2014-06-01	0	7	7	7
+2014-06-01	0	8	7	7
+2014-06-01	0	9	7	7
+2014-06-01	1	10	7	7
+2014-06-01	1	11	7	7
+2014-06-01	1	12	7	7
+2014-06-01	1	13	7	7
+2014-06-01	1	14	7	7
+2014-06-01	1	15	7	7
+2014-06-01	1	16	7	7
+2014-06-01	1	17	7	7
+2014-06-01	1	18	7	7
+2014-06-01	1	19	7	7
+2014-06-01	2	20	7	7
+2014-06-01	2	21	7	7
+2014-06-01	2	22	7	7
+2014-06-01	2	23	7	7
+2014-06-01	2	24	7	7
+2014-06-01	2	25	7	7
+2014-06-01	2	26	7	7
+2014-06-01	2	27	7	7
+2014-06-01	2	28	7	7
+2014-06-01	2	29	7	7
+2014-06-01	3	30	7	7
+2014-06-01	3	31	7	7
+2014-06-01	3	32	7	7
+2014-06-01	3	33	7	7
+2014-06-01	3	34	7	7
+2014-06-01	3	35	7	7
+2014-06-01	3	36	7	7
+2014-06-01	3	37	7	7
+2014-06-01	3	38	7	7
+2014-06-01	3	39	7	7
+2014-06-01	4	40	7	7
+2014-06-01	4	41	7	7
+2014-06-01	4	42	7	7
+2014-06-01	4	43	7	7
+2014-06-01	4	44	7	7
+2014-06-01	4	45	7	7
+2014-06-01	4	46	7	7
+2014-06-01	4	47	7	7
+2014-06-01	4	48	7	7
+2014-06-01	4	49	7	7
+2014-06-01	5	50	7	7
+2014-06-01	5	51	7	7
+2014-06-01	5	52	7	7
+2014-06-01	5	53	7	7
+2014-06-01	5	54	7	7
+2014-06-01	5	55	7	7
+2014-06-01	5	56	7	7
+2014-06-01	5	57	7	7
+2014-06-01	5	58	7	7
+2014-06-01	5	59	7	7
+2014-06-01	6	60	7	7
+2014-06-01	6	61	7	7
+2014-06-01	6	62	7	7
+2014-06-01	6	63	7	7
+2014-06-01	6	64	7	7
+2014-06-01	6	65	7	7
+2014-06-01	6	66	7	7
+2014-06-01	6	67	7	7
+2014-06-01	6	68	7	7
+2014-06-01	6	69	7	7
+2014-06-01	7	70	7	7
+2014-06-01	7	71	7	7
+2014-06-01	7	72	7	7
+2014-06-01	7	73	7	7
+2014-06-01	7	74	7	7
+2014-06-01	7	75	7	7
+2014-06-01	7	76	7	7
+2014-06-01	7	77	7	7
+2014-06-01	7	78	7	7
+2014-06-01	7	79	7	7
+2014-06-01	8	80	7	7
+2014-06-01	8	81	7	7
+2014-06-01	8	82	7	7
+2014-06-01	8	83	7	7
+2014-06-01	8	84	7	7
+2014-06-01	8	85	7	7
+2014-06-01	8	86	7	7
+2014-06-01	8	87	7	7
+2014-06-01	8	88	7	7
+2014-06-01	8	89	7	7
+2014-06-01	9	90	7	7
+2014-06-01	9	91	7	7
+2014-06-01	9	92	7	7
+2014-06-01	9	93	7	7
+2014-06-01	9	94	7	7
+2014-06-01	9	95	7	7
+2014-06-01	9	96	7	7
+2014-06-01	9	97	7	7
+2014-06-01	9	98	7	7
+2014-06-01	9	99	7	7
+2014-06-01	0	7	7
+2014-06-01	1	7	7
+2014-06-01	2	7	7
+2014-06-01	3	7	7
+2014-06-01	4	7	7
+2014-06-01	5	7	7
+2014-06-01	6	7	7
+2014-06-01	7	7	7
+2014-06-01	8	7	7
+2014-06-01	9	7	7
+2014-06-01	7	7
+0	333333	53	53
+1	333333	53	53
+2	333333	53	53
+0	333333	53	53
+1	333333	53	53
+2	333333	53	53
diff --git a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
new file mode 100644
index 00000000000..0b728d690d2
--- /dev/null
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
@@ -0,0 +1,211 @@
+SELECT 'uniqTheta many agrs';
+
+SELECT
+    uniqTheta(x), uniqTheta((x)), uniqTheta(x, y), uniqTheta((x, y)), uniqTheta(x, y, z), uniqTheta((x, y, z))
+FROM
+(
+    SELECT
+        number % 10 AS x,
+        intDiv(number, 10) % 10 AS y,
+        toString(intDiv(number, 100) % 10) AS z
+    FROM system.numbers LIMIT 1000
+);
+
+
+SELECT k,
+    uniqTheta(x), uniqTheta((x)), uniqTheta(x, y), uniqTheta((x, y)), uniqTheta(x, y, z), uniqTheta((x, y, z)),
+    count() AS c
+FROM
+(
+    SELECT
+        (number + 0x8ffcbd8257219a26) * 0x66bb3430c06d2353 % 131 AS k,
+        number % 10 AS x,
+        intDiv(number, 10) % 10 AS y,
+        toString(intDiv(number, 100) % 10) AS z
+    FROM system.numbers LIMIT 100000
+)
+GROUP BY k
+ORDER BY c DESC, k ASC
+LIMIT 10;
+
+
+SELECT 'uniqTheta distinct';
+
+SET count_distinct_implementation = 'uniqTheta';
+SELECT count(DISTINCT x) FROM (SELECT number % 123 AS x FROM system.numbers LIMIT 1000);
+SELECT count(DISTINCT x, y) FROM (SELECT number % 11 AS x, number % 13 AS y FROM system.numbers LIMIT 1000);
+
+
+SELECT 'uniqTheta arrays';
+
+SELECT uniqThetaArray([0, 1, 1], [0, 1, 1], [0, 1, 1]);
+SELECT uniqThetaArray([0, 1, 1], [0, 1, 1], [0, 1, 0]);
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[1, 2], [1, 2], [1, 2, 3], []]) AS x);
+
+
+SELECT 'uniqTheta complex types';
+
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[[]], [['a', 'b']], [['a'], ['b']], [['a', 'b']]]) AS x);
+SELECT uniqTheta(x, x) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x, arrayMap(elem -> [elem, elem], x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x, toString(x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta((x, x)) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta((x, arrayMap(elem -> [elem, elem], x))) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta((x, toString(x))) FROM (SELECT arrayJoin([[], ['a'], ['a', 'b'], []]) AS x);
+SELECT uniqTheta(x) FROM (SELECT arrayJoin([[], ['a'], ['a', NULL, 'b'], []]) AS x);
+
+
+SELECT 'uniqTheta decimals';
+
+DROP TABLE IF EXISTS decimal;
+CREATE TABLE decimal
+(
+    a Decimal32(4),
+    b Decimal64(8),
+    c Decimal128(8)
+) ENGINE = Memory;
+
+SELECT (uniqTheta(a), uniqTheta(b), uniqTheta(c))
+FROM (SELECT * FROM decimal ORDER BY a);
+
+INSERT INTO decimal (a, b, c)
+SELECT toDecimal32(number - 50, 4), toDecimal64(number - 50, 8) / 3, toDecimal128(number - 50, 8) / 5
+FROM system.numbers LIMIT 101;
+
+SELECT (uniqTheta(a), uniqTheta(b), uniqTheta(c))
+FROM (SELECT * FROM decimal ORDER BY a);
+
+DROP TABLE decimal;
+
+
+SELECT 'uniqTheta remove injective';
+
+set optimize_injective_functions_inside_uniq = 1;
+
+EXPLAIN SYNTAX select uniqTheta(x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(x + y) from (select number % 2 as x, number % 3 y from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(-x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-bitNot(-x)) from (select number % 2 as x from numbers(10));
+
+set optimize_injective_functions_inside_uniq = 0;
+
+EXPLAIN SYNTAX select uniqTheta(x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(x + y) from (select number % 2 as x, number % 3 y from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-x) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(bitNot(-x)) from (select number % 2 as x from numbers(10));
+EXPLAIN SYNTAX select uniqTheta(-bitNot(-x)) from (select number % 2 as x from numbers(10));
+
+
+DROP TABLE IF EXISTS stored_aggregates;
+
+-- simple
+CREATE TABLE stored_aggregates
+(
+    d Date,
+    Uniq AggregateFunction(uniq, UInt64),
+    UniqThetaSketch AggregateFunction(uniqTheta, UInt64)
+)
+ENGINE = AggregatingMergeTree(d, d, 8192);
+
+INSERT INTO stored_aggregates
+SELECT
+    toDate('2014-06-01') AS d,
+    uniqState(number) AS Uniq,
+    uniqThetaState(number) AS UniqThetaSketch
+FROM
+(
+    SELECT * FROM system.numbers LIMIT 1000
+);
+
+SELECT uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates;
+
+SELECT d, uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates GROUP BY d ORDER BY d;
+
+OPTIMIZE TABLE stored_aggregates;
+
+SELECT uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates;
+
+SELECT d, uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch) FROM stored_aggregates GROUP BY d ORDER BY d;
+
+DROP TABLE stored_aggregates;
+
+-- complex
+CREATE TABLE stored_aggregates
+(
+	d	Date,
+	k1 	UInt64,
+	k2 	String,
+	Uniq 			AggregateFunction(uniq, UInt64),
+    UniqThetaSketch	AggregateFunction(uniqTheta, UInt64)
+)
+ENGINE = AggregatingMergeTree(d, (d, k1, k2), 8192);
+
+INSERT INTO stored_aggregates
+SELECT
+	toDate('2014-06-01') AS d,
+	intDiv(number, 100) AS k1,
+	toString(intDiv(number, 10)) AS k2,
+	uniqState(toUInt64(number % 7)) AS Uniq,
+    uniqThetaState(toUInt64(number % 7)) AS UniqThetaSketch
+FROM
+(
+	SELECT * FROM system.numbers LIMIT 1000
+)
+GROUP BY d, k1, k2
+ORDER BY d, k1, k2;
+
+SELECT d, k1, k2,
+	uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch)
+FROM stored_aggregates
+GROUP BY d, k1, k2
+ORDER BY d, k1, k2;
+
+SELECT d, k1,
+	uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch)
+FROM stored_aggregates
+GROUP BY d, k1
+ORDER BY d, k1;
+
+SELECT d,
+	uniqMerge(Uniq), uniqThetaMerge(UniqThetaSketch)
+FROM stored_aggregates
+GROUP BY d
+ORDER BY d;
+
+DROP TABLE stored_aggregates;
+
+---- sum + uniq with more data
+drop table if exists summing_merge_tree_null;
+drop table if exists summing_merge_tree_aggregate_function;
+create table summing_merge_tree_null (
+    d materialized today(),
+    k UInt64,
+    c UInt64,
+    u UInt64
+) engine=Null;
+
+create materialized view summing_merge_tree_aggregate_function (
+    d Date,
+    k UInt64,
+    c UInt64,
+    un AggregateFunction(uniq, UInt64),
+    ut AggregateFunction(uniqTheta, UInt64)
+) engine=SummingMergeTree(d, k, 8192)
+as select d, k, sum(c) as c, uniqState(u) as un, uniqThetaState(u) as ut
+from summing_merge_tree_null
+group by d, k;
+
+-- prime number 53 to avoid resonanse between %3 and %53
+insert into summing_merge_tree_null select number % 3, 1, number % 53 from numbers(999999);
+
+select k, sum(c), uniqMerge(un), uniqThetaMerge(ut) from summing_merge_tree_aggregate_function group by k order by k;
+optimize table summing_merge_tree_aggregate_function;
+select k, sum(c), uniqMerge(un), uniqThetaMerge(ut) from summing_merge_tree_aggregate_function group by k order by k;
+
+drop table summing_merge_tree_aggregate_function;
+drop table summing_merge_tree_null;
+
diff --git a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.reference b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.reference
new file mode 100644
index 00000000000..2bba987fa79
--- /dev/null
+++ b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.reference
@@ -0,0 +1,219 @@
+uniqTheta
+1	1
+3	1
+6	1
+7	1
+9	1
+11	1
+14	1
+17	1
+19	1
+20	2
+26	1
+31	1
+35	1
+36	1
+0	162
+1	162
+3	162
+6	162
+7	163
+9	163
+10	81
+11	163
+13	162
+14	162
+17	162
+19	162
+20	162
+21	162
+22	162
+26	162
+31	162
+35	162
+36	162
+0	55018
+1	54020
+3	53774
+6	53947
+7	53839
+9	54408
+10	26876
+11	54985
+13	53479
+14	53516
+17	53331
+19	53680
+20	54211
+21	53054
+22	54690
+26	53716
+31	54139
+35	52331
+36	53766
+uniqTheta round(float)
+0.125	1
+0.5	1
+0.05	1
+0.143	1
+0.056	1
+0.048	2
+0.083	1
+0.25	1
+0.1	1
+0.028	1
+0.027	1
+0.031	1
+0.067	1
+0.037	1
+0.045	162
+0.125	163
+0.5	162
+0.05	162
+0.143	162
+0.091	81
+0.056	162
+0.048	162
+0.083	163
+0.25	162
+1	162
+0.1	163
+0.028	162
+0.027	162
+0.031	162
+0.067	162
+0.043	162
+0.037	162
+0.071	162
+0.045	53054
+0.125	53839
+0.5	54020
+0.05	53680
+0.143	53947
+0.091	26876
+0.056	53331
+0.048	54211
+0.083	54985
+0.25	53774
+1	55018
+0.1	54408
+0.028	52331
+0.027	53766
+0.031	54139
+0.067	53516
+0.043	54690
+0.037	53716
+0.071	53479
+uniqTheta round(toFloat32())
+0.5	1
+0.05	1
+0.25	1
+0.048	2
+0.083	1
+0.125	1
+0.031	1
+0.143	1
+0.028	1
+0.067	1
+0.027	1
+0.056	1
+0.037	1
+0.1	1
+0.5	162
+0.05	162
+0.25	162
+0.048	162
+0.091	81
+0.043	162
+0.071	162
+0.083	163
+0.125	163
+0.031	162
+0.143	162
+0.028	162
+0.067	162
+0.045	162
+0.027	162
+0.056	162
+0.037	162
+0.1	163
+1	162
+0.5	54020
+0.05	53680
+0.25	53774
+0.048	54211
+0.091	26876
+0.043	54690
+0.071	53479
+0.083	54985
+0.125	53839
+0.031	54139
+0.143	53947
+0.028	52331
+0.067	53516
+0.045	53054
+0.027	53766
+0.056	53331
+0.037	53716
+0.1	54408
+1	55018
+uniqTheta IPv4NumToString
+1	1
+3	1
+6	1
+7	1
+9	1
+11	1
+14	1
+17	1
+19	1
+20	2
+26	1
+31	1
+35	1
+36	1
+0	162
+1	162
+3	162
+6	162
+7	163
+9	163
+10	81
+11	163
+13	162
+14	162
+17	162
+19	162
+20	162
+21	162
+22	162
+26	162
+31	162
+35	162
+36	162
+0	54929
+1	53802
+3	54706
+6	54700
+7	53592
+9	54036
+10	27392
+11	53768
+13	54566
+14	53104
+17	54243
+19	55003
+20	53398
+21	53831
+22	54603
+26	54607
+31	54012
+35	54826
+36	54910
+uniqTheta remote()
+1
+uniqTheta precise
+10000000
+10021957
+10021969
+10094819
diff --git a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
new file mode 100644
index 00000000000..8f0b096a11d
--- /dev/null
+++ b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
@@ -0,0 +1,35 @@
+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;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+
+SELECT 'uniqTheta round(float)';
+
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(1/(1 + (3*X*X - 7*X + 11) % 37), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+
+SELECT 'uniqTheta round(toFloat32())';
+
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(X) FROM (SELECT number AS X, round(toFloat32(1/(1 + (3*X*X - 7*X + 11) % 37)), 3) AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+
+SELECT 'uniqTheta IPv4NumToString';
+
+SELECT Y, uniqTheta(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
+SELECT Y, uniqTheta(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 3000) GROUP BY Y;
+SELECT Y, uniqTheta(Z) FROM (SELECT number AS X, IPv4NumToString(toUInt32(X)) AS Z, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 1000000) GROUP BY Y;
+
+SELECT 'uniqTheta remote()';
+
+SELECT uniqTheta(dummy) FROM remote('127.0.0.{2,3}', system.one);
+
+
+SELECT 'uniqTheta precise';
+SELECT uniqExact(number) FROM numbers(1e7);
+SELECT uniqCombined(number) FROM numbers(1e7);
+SELECT uniqCombined64(number) FROM numbers(1e7);
+SELECT uniqTheta(number) FROM numbers(1e7);
+
diff --git a/tests/queries/0_stateless/01800_log_nested.reference b/tests/queries/0_stateless/01800_log_nested.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01800_log_nested.sql b/tests/queries/0_stateless/01800_log_nested.sql
new file mode 100644
index 00000000000..eb74b8707e4
--- /dev/null
+++ b/tests/queries/0_stateless/01800_log_nested.sql
@@ -0,0 +1,20 @@
+-- TinyLog
+DROP TABLE IF EXISTS nested_01800_tiny_log;
+CREATE TABLE nested_01800_tiny_log (`column` Nested(name String, names Array(String), types Array(Enum8('PU' = 1, 'US' = 2, 'OTHER' = 3)))) ENGINE = TinyLog;
+INSERT INTO nested_01800_tiny_log VALUES (['Hello', 'World'], [['a'], ['b', 'c']], [['PU', 'US'], ['OTHER']]);
+SELECT 10 FROM nested_01800_tiny_log FORMAT Null;
+DROP TABLE nested_01800_tiny_log;
+
+-- StripeLog
+DROP TABLE IF EXISTS nested_01800_stripe_log;
+CREATE TABLE nested_01800_stripe_log (`column` Nested(name String, names Array(String), types Array(Enum8('PU' = 1, 'US' = 2, 'OTHER' = 3)))) ENGINE = StripeLog;
+INSERT INTO nested_01800_stripe_log VALUES (['Hello', 'World'], [['a'], ['b', 'c']], [['PU', 'US'], ['OTHER']]);
+SELECT 10 FROM nested_01800_stripe_log FORMAT Null;
+DROP TABLE nested_01800_stripe_log;
+
+-- Log
+DROP TABLE IF EXISTS nested_01800_log;
+CREATE TABLE nested_01800_log (`column` Nested(name String, names Array(String), types Array(Enum8('PU' = 1, 'US' = 2, 'OTHER' = 3)))) ENGINE = Log;
+INSERT INTO nested_01800_log VALUES (['Hello', 'World'], [['a'], ['b', 'c']], [['PU', 'US'], ['OTHER']]);
+SELECT 10 FROM nested_01800_log FORMAT Null;
+DROP TABLE nested_01800_log;
diff --git a/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.reference b/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql b/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql
new file mode 100644
index 00000000000..8809bf67a4c
--- /dev/null
+++ b/tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql
@@ -0,0 +1,10 @@
+drop table if exists data_01801;
+create table data_01801 (key Int) engine=MergeTree() order by key settings index_granularity=10 as select number/10 from numbers(100);
+
+select * from data_01801 where key = 0 order by key settings max_rows_to_read=9 format Null; -- { serverError 158 }
+select * from data_01801 where key = 0 order by key desc settings max_rows_to_read=9 format Null; -- { serverError 158 }
+
+select * from data_01801 where key = 0 order by key settings max_rows_to_read=10 format Null;
+select * from data_01801 where key = 0 order by key desc settings max_rows_to_read=10 format Null;
+
+drop table data_01801;
diff --git a/tests/queries/0_stateless/01801_dateDiff_DateTime64.reference b/tests/queries/0_stateless/01801_dateDiff_DateTime64.reference
new file mode 100644
index 00000000000..f28cf4dc58e
--- /dev/null
+++ b/tests/queries/0_stateless/01801_dateDiff_DateTime64.reference
@@ -0,0 +1,113 @@
+-- { echo }
+
+-- DateTime64 vs DateTime64 same scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+10
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:00:00', 0, 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:10:10', 0, 'UTC'));
+4210
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+10
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+600
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+10
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-02 00:00:00', 0, 'UTC'));
+1
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-02-01 00:00:00', 0, 'UTC'));
+1
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1928-01-01 00:00:00', 0, 'UTC'));
+1
+-- DateTime64 vs DateTime64 different scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:00:00', 3, 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:10:10', 3, 'UTC'));
+4210
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+10
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+600
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+10
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-02 00:00:00', 3, 'UTC'));
+1
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-02-01 00:00:00', 3, 'UTC'));
+1
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1928-01-01 00:00:00', 3, 'UTC'));
+1
+-- With DateTime
+-- DateTime64 vs DateTime
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:00', 'UTC'));
+0
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:10', 'UTC'));
+10
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:10:00', 'UTC'));
+600
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:00:00', 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:10:10', 'UTC'));
+4210
+-- DateTime vs DateTime64
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:00', 3, 'UTC'));
+0
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:10:00', 3, 'UTC'));
+600
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:00:00', 3, 'UTC'));
+3600
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:10:10', 3, 'UTC'));
+4210
+-- With Date
+-- DateTime64 vs Date
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDate('2015-08-19', 'UTC'));
+1
+-- Date vs DateTime64
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+1
+-- Same thing but const vs non-const columns
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+10
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+10
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDate('2015-08-19', 'UTC')));
+1
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
+1
+-- Same thing but non-const vs const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+10
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDateTime('2015-08-18 00:00:10', 'UTC'));
+10
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+10
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDate('2015-08-19', 'UTC'));
+1
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+1
+-- Same thing but non-const vs non-const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+10
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+10
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+10
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDate('2015-08-19', 'UTC')));
+1
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
+1
diff --git a/tests/queries/0_stateless/01801_dateDiff_DateTime64.sql b/tests/queries/0_stateless/01801_dateDiff_DateTime64.sql
new file mode 100644
index 00000000000..020559f4e62
--- /dev/null
+++ b/tests/queries/0_stateless/01801_dateDiff_DateTime64.sql
@@ -0,0 +1,77 @@
+-- { echo }
+
+-- DateTime64 vs DateTime64 same scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:00:00', 0, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 01:10:10', 0, 'UTC'));
+
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 00:10:00', 0, 'UTC'));
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-01 10:00:00', 0, 'UTC'));
+
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-01-02 00:00:00', 0, 'UTC'));
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1927-02-01 00:00:00', 0, 'UTC'));
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), toDateTime64('1928-01-01 00:00:00', 0, 'UTC'));
+
+-- DateTime64 vs DateTime64 different scale
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:00:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 01:10:10', 3, 'UTC'));
+
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 00:10:00', 3, 'UTC'));
+SELECT dateDiff('minute', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+
+SELECT dateDiff('hour', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-01 10:00:00', 3, 'UTC'));
+
+SELECT dateDiff('day', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-01-02 00:00:00', 3, 'UTC'));
+SELECT dateDiff('month', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1927-02-01 00:00:00', 3, 'UTC'));
+SELECT dateDiff('year', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), toDateTime64('1928-01-01 00:00:00', 3, 'UTC'));
+
+-- With DateTime
+-- DateTime64 vs DateTime
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:00', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:00:10', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 00:10:00', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:00:00', 'UTC'));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDateTime('2015-08-18 01:10:10', 'UTC'));
+
+-- DateTime vs DateTime64
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 00:10:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:00:00', 3, 'UTC'));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), toDateTime64('2015-08-18 01:10:10', 3, 'UTC'));
+
+-- With Date
+-- DateTime64 vs Date
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), toDate('2015-08-19', 'UTC'));
+
+-- Date vs DateTime64
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+
+-- Same thing but const vs non-const columns
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 0, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+SELECT dateDiff('second', toDateTime64('1927-01-01 00:00:00', 6, 'UTC'), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+SELECT dateDiff('second', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+SELECT dateDiff('second', toDateTime('2015-08-18 00:00:00', 'UTC'), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+SELECT dateDiff('day', toDateTime64('2015-08-18 00:00:00', 0, 'UTC'), materialize(toDate('2015-08-19', 'UTC')));
+SELECT dateDiff('day', toDate('2015-08-18', 'UTC'), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
+
+-- Same thing but non-const vs const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), toDateTime64('1927-01-01 00:00:10', 0, 'UTC'));
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), toDateTime64('1927-01-01 00:00:10', 3, 'UTC'));
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDateTime('2015-08-18 00:00:10', 'UTC'));
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), toDateTime64('2015-08-18 00:00:10', 3, 'UTC'));
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), toDate('2015-08-19', 'UTC'));
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), toDateTime64('2015-08-19 00:00:00', 3, 'UTC'));
+
+-- Same thing but non-const vs non-const columns
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 0, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 0, 'UTC')));
+SELECT dateDiff('second', materialize(toDateTime64('1927-01-01 00:00:00', 6, 'UTC')), materialize(toDateTime64('1927-01-01 00:00:10', 3, 'UTC')));
+SELECT dateDiff('second', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDateTime('2015-08-18 00:00:10', 'UTC')));
+SELECT dateDiff('second', materialize(toDateTime('2015-08-18 00:00:00', 'UTC')), materialize(toDateTime64('2015-08-18 00:00:10', 3, 'UTC')));
+SELECT dateDiff('day', materialize(toDateTime64('2015-08-18 00:00:00', 0, 'UTC')), materialize(toDate('2015-08-19', 'UTC')));
+SELECT dateDiff('day', materialize(toDate('2015-08-18', 'UTC')), materialize(toDateTime64('2015-08-19 00:00:00', 3, 'UTC')));
diff --git a/tests/queries/0_stateless/01801_distinct_group_by_shard.reference b/tests/queries/0_stateless/01801_distinct_group_by_shard.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01801_distinct_group_by_shard.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
new file mode 100644
index 00000000000..ca6572b91ee
--- /dev/null
+++ b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
@@ -0,0 +1 @@
+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_nullable_low_cardinality_tsv.reference b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
new file mode 100755
index 00000000000..935bfe18cfc
--- /dev/null
+++ b/tests/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+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 nullable_low_cardinality_tsv_test;";
+$CLICKHOUSE_CLIENT --multiquery --query="CREATE TABLE nullable_low_cardinality_tsv_test
+(
+    A Date,
+    S LowCardinality(Nullable(String)),
+    X Int32,
+    S1 LowCardinality(Nullable(String)),
+    S2 Array(String)
+) ENGINE=TinyLog";
+
+printf '2020-01-01\t\N\t32\t\N\n' | $CLICKHOUSE_CLIENT -q 'insert into nullable_low_cardinality_tsv_test format TSV' 2>&1 \
+    | grep -q "Code: 27"
+
+echo $?;
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE nullable_low_cardinality_tsv_test";
diff --git a/tests/queries/0_stateless/01801_s3_cluster.reference b/tests/queries/0_stateless/01801_s3_cluster.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01801_s3_cluster.sh b/tests/queries/0_stateless/01801_s3_cluster.sh
new file mode 100755
index 00000000000..215d5500be5
--- /dev/null
+++ b/tests/queries/0_stateless/01801_s3_cluster.sh
@@ -0,0 +1,12 @@
+#!/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/01802_formatDateTime_DateTime64_century.reference b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
new file mode 100644
index 00000000000..75c114cdd74
--- /dev/null
+++ b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
@@ -0,0 +1,27 @@
+-- { echo }
+
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+20
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+21
+SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+22
+-- non-zero scale
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+19
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+20
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+21
+SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+22
diff --git a/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
new file mode 100644
index 00000000000..e368f45cbda
--- /dev/null
+++ b/tests/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
@@ -0,0 +1,16 @@
+-- { echo }
+
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow'), '%C');
+
+-- non-zero scale
+SELECT formatDateTime(toDateTime64('1935-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1969-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('1989-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2019-09-16 19:20:12', 0, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2105-12-12 12:12:12', 6, 'Europe/Moscow'), '%C');
+SELECT formatDateTime(toDateTime64('2205-01-12 12:12:12', 6, 'Europe/Moscow'), '%C');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.reference b/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql b/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql
new file mode 100644
index 00000000000..24ee9282ac0
--- /dev/null
+++ b/tests/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS 01802_empsalary;
+
+SET allow_experimental_window_functions=1;
+
+CREATE TABLE 01802_empsalary
+(
+    `depname` LowCardinality(String),
+    `empno` UInt64,
+    `salary` Int32,
+    `enroll_date` Date
+)
+ENGINE = MergeTree
+ORDER BY enroll_date
+SETTINGS index_granularity = 8192;
+
+INSERT INTO 01802_empsalary VALUES ('sales', 1, 5000, '2006-10-01'), ('develop', 8, 6000, '2006-10-01'), ('personnel', 2, 3900, '2006-12-23'), ('develop', 10, 5200, '2007-08-01'), ('sales', 3, 4800, '2007-08-01'), ('sales', 4, 4801, '2007-08-08'), ('develop', 11, 5200, '2007-08-15'), ('personnel', 5, 3500, '2007-12-10'), ('develop', 7, 4200, '2008-01-01'), ('develop', 9, 4500, '2008-01-01');
+
+SELECT mannWhitneyUTest(salary, salary) OVER (ORDER BY salary ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS func FROM 01802_empsalary; -- {serverError 36}
+
+SELECT rankCorr(salary, 0.5) OVER (ORDER BY salary ASC ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS func FROM 01802_empsalary; -- {serverError 36}
+
+DROP TABLE IF EXISTS 01802_empsalary;
diff --git a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference
new file mode 100644
index 00000000000..729d93bf322
--- /dev/null
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference
@@ -0,0 +1,24 @@
+before row policy
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+
+after row policy with no password
+ val 
+-----
+   2
+(1 row)
+
+after row policy with plaintext_password
+ val 
+-----
+   2
+(1 row)
+
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
new file mode 100755
index 00000000000..edd73131020
--- /dev/null
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+echo "
+CREATE DATABASE IF NOT EXISTS db01802;
+DROP TABLE IF EXISTS db01802.postgresql;
+DROP ROW POLICY IF EXISTS test_policy ON db01802.postgresql;
+
+CREATE TABLE db01802.postgresql (val UInt32) ENGINE=MergeTree ORDER BY val;
+INSERT INTO db01802.postgresql SELECT number FROM numbers(10);
+
+SELECT 'before row policy';
+SELECT * FROM db01802.postgresql;
+" | $CLICKHOUSE_CLIENT -n
+
+
+echo "
+DROP USER IF EXISTS postgresql_user;
+CREATE USER postgresql_user HOST IP '127.0.0.1' IDENTIFIED WITH no_password;
+GRANT SELECT(val) ON db01802.postgresql TO postgresql_user;
+CREATE ROW POLICY IF NOT EXISTS test_policy ON db01802.postgresql FOR SELECT USING val = 2 TO postgresql_user;
+
+SELECT '';
+SELECT 'after row policy with no password';
+" | $CLICKHOUSE_CLIENT -n
+
+psql --host localhost --port ${CLICKHOUSE_PORT_POSTGRESQL} db01802 --user postgresql_user -c "SELECT * FROM postgresql;"
+
+echo "
+DROP USER IF EXISTS postgresql_user;
+DROP ROW POLICY IF EXISTS test_policy ON db01802.postgresql;
+CREATE USER postgresql_user HOST IP '127.0.0.1' IDENTIFIED WITH plaintext_password BY 'qwerty';
+GRANT SELECT(val) ON db01802.postgresql TO postgresql_user;
+CREATE ROW POLICY IF NOT EXISTS test_policy ON db01802.postgresql FOR SELECT USING val = 2 TO postgresql_user;
+
+SELECT 'after row policy with plaintext_password';
+" | $CLICKHOUSE_CLIENT -n
+
+psql "postgresql://postgresql_user:qwerty@localhost:${CLICKHOUSE_PORT_POSTGRESQL}/db01802" -c "SELECT * FROM postgresql;"
+
diff --git a/tests/queries/0_stateless/01802_toDateTime64_large_values.reference b/tests/queries/0_stateless/01802_toDateTime64_large_values.reference
new file mode 100644
index 00000000000..c44c61ab93a
--- /dev/null
+++ b/tests/queries/0_stateless/01802_toDateTime64_large_values.reference
@@ -0,0 +1,10 @@
+-- { echo }
+
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'UTC');
+2205-12-12 12:12:12
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow');
+2205-12-12 12:12:12
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+2205-12-12 12:12:12.000000
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+2205-12-12 12:12:12.000000
diff --git a/tests/queries/0_stateless/01802_toDateTime64_large_values.sql b/tests/queries/0_stateless/01802_toDateTime64_large_values.sql
new file mode 100644
index 00000000000..299111f43bc
--- /dev/null
+++ b/tests/queries/0_stateless/01802_toDateTime64_large_values.sql
@@ -0,0 +1,7 @@
+-- { echo }
+
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'UTC');
+SELECT toDateTime64('2205-12-12 12:12:12', 0, 'Europe/Moscow');
+
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
+SELECT toDateTime64('2205-12-12 12:12:12', 6, 'Europe/Moscow');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01803_const_nullable_map.reference b/tests/queries/0_stateless/01803_const_nullable_map.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01803_const_nullable_map.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01803_const_nullable_map.sql b/tests/queries/0_stateless/01803_const_nullable_map.sql
new file mode 100644
index 00000000000..4ac9f925e24
--- /dev/null
+++ b/tests/queries/0_stateless/01803_const_nullable_map.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS t_map_null;
+
+SET allow_experimental_map_type = 1;
+
+CREATE TABLE t_map_null (a Map(String, String), b String) engine = MergeTree() ORDER BY a;
+INSERT INTO t_map_null VALUES (map('a', 'b', 'c', 'd'), 'foo');
+SELECT count() FROM t_map_null WHERE a = map('name', NULL, '', NULL);
+
+DROP TABLE t_map_null;
diff --git a/tests/queries/0_stateless/01803_untuple_subquery.reference b/tests/queries/0_stateless/01803_untuple_subquery.reference
new file mode 100644
index 00000000000..838ff3aa952
--- /dev/null
+++ b/tests/queries/0_stateless/01803_untuple_subquery.reference
@@ -0,0 +1,2 @@
+(0.5,'92233720368547758.07',NULL)		1.00	256	\N	\N
+\N
diff --git a/tests/queries/0_stateless/01803_untuple_subquery.sql b/tests/queries/0_stateless/01803_untuple_subquery.sql
new file mode 100644
index 00000000000..512b4c561af
--- /dev/null
+++ b/tests/queries/0_stateless/01803_untuple_subquery.sql
@@ -0,0 +1,3 @@
+SELECT (0.5, '92233720368547758.07', NULL), '', '1.00', untuple(('256', NULL)), NULL FROM (SELECT untuple(((NULL, untuple((('0.0000000100', (65536, NULL, (65535, 9223372036854775807), '25.7', (0.00009999999747378752, '10.25', 1048577), 65536)), '0.0000001024', '65537', NULL))), untuple((9223372036854775807, -inf, 0.5)), NULL, -9223372036854775808)), 257, 7, ('0.0001048575', (1024, NULL, (7, 3), (untuple(tuple(-NULL)), NULL, '0.0001048577', NULL), 0)), 0, (0, 0.9998999834060669, '65537'), untuple(tuple('10.25')));
+
+SELECT NULL FROM (SELECT untuple((NULL, dummy)));
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference b/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference
new file mode 100644
index 00000000000..e9803f2f9f2
--- /dev/null
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference
@@ -0,0 +1,12 @@
+Flat dictionary
+5.00000
+Hashed dictionary
+5.00000
+Cache dictionary
+5.00000
+Direct dictionary
+5.00000
+IPTrie dictionary
+5.00000
+Polygon dictionary
+5.00000
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
new file mode 100644
index 00000000000..1aba8ef7596
--- /dev/null
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
@@ -0,0 +1,125 @@
+SET allow_experimental_bigint_types = 1;
+
+DROP TABLE IF EXISTS dictionary_decimal_source_table;
+CREATE TABLE dictionary_decimal_source_table
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+) ENGINE = TinyLog;
+
+INSERT INTO dictionary_decimal_source_table VALUES (1, 5.0);
+
+DROP DICTIONARY IF EXISTS flat_dictionary;
+CREATE DICTIONARY flat_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(FLAT());
+
+SELECT 'Flat dictionary';
+SELECT dictGet('flat_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY IF EXISTS hashed_dictionary;
+CREATE DICTIONARY hashed_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(HASHED());
+
+SELECT 'Hashed dictionary';
+SELECT dictGet('hashed_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY hashed_dictionary;
+
+DROP DICTIONARY IF EXISTS cache_dictionary;
+CREATE DICTIONARY cache_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Cache dictionary';
+SELECT dictGet('cache_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY cache_dictionary;
+
+DROP DICTIONARY IF EXISTS direct_dictionary;
+CREATE DICTIONARY direct_dictionary
+(
+    id UInt64,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+LAYOUT(DIRECT());
+
+SELECT 'Direct dictionary';
+SELECT dictGet('direct_dictionary', 'decimal_value', toUInt64(1));
+
+DROP DICTIONARY direct_dictionary;
+
+DROP TABLE dictionary_decimal_source_table;
+
+DROP TABLE IF EXISTS ip_trie_dictionary_decimal_source_table;
+CREATE TABLE ip_trie_dictionary_decimal_source_table
+(
+    prefix String,
+    decimal_value Decimal256(5)
+) ENGINE = TinyLog;
+
+INSERT INTO ip_trie_dictionary_decimal_source_table VALUES ('127.0.0.0', 5.0);
+
+DROP DICTIONARY IF EXISTS ip_trie_dictionary;
+CREATE DICTIONARY ip_trie_dictionary
+(
+    prefix String,
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY prefix
+SOURCE(CLICKHOUSE(HOST 'localhost' port tcpPort() TABLE 'ip_trie_dictionary_decimal_source_table'))
+LIFETIME(MIN 10 MAX 1000)
+LAYOUT(IP_TRIE());
+
+SELECT 'IPTrie dictionary';
+SELECT dictGet('ip_trie_dictionary', 'decimal_value', tuple(IPv4StringToNum('127.0.0.0')));
+
+DROP DICTIONARY ip_trie_dictionary;
+DROP TABLE ip_trie_dictionary_decimal_source_table;
+
+DROP TABLE IF EXISTS dictionary_decimal_polygons_source_table;
+CREATE TABLE dictionary_decimal_polygons_source_table
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    decimal_value Decimal256(5)
+) ENGINE = TinyLog;
+
+INSERT INTO dictionary_decimal_polygons_source_table VALUES ([[[(0, 0), (0, 1), (1, 1), (1, 0)]]], 5.0);
+
+DROP DICTIONARY IF EXISTS polygon_dictionary;
+CREATE DICTIONARY polygon_dictionary
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    decimal_value Decimal256(5)
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_polygons_source_table'))
+LIFETIME(MIN 0 MAX 1000)
+LAYOUT(POLYGON());
+
+SELECT 'Polygon dictionary';
+SELECT dictGet('polygon_dictionary', 'decimal_value', tuple(0.5, 0.5));
+
+DROP DICTIONARY polygon_dictionary;
+DROP TABLE dictionary_decimal_polygons_source_table;
diff --git a/tests/queries/0_stateless/01804_uniq_up_to_ubsan.reference b/tests/queries/0_stateless/01804_uniq_up_to_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01804_uniq_up_to_ubsan.sql b/tests/queries/0_stateless/01804_uniq_up_to_ubsan.sql
new file mode 100644
index 00000000000..fcbe585b70a
--- /dev/null
+++ b/tests/queries/0_stateless/01804_uniq_up_to_ubsan.sql
@@ -0,0 +1,2 @@
+SELECT uniqUpTo(1e100)(number) FROM numbers(5); -- { serverError 70 }
+SELECT uniqUpTo(-1e100)(number) FROM numbers(5); -- { serverError 70 }
diff --git a/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.reference b/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql b/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql
new file mode 100644
index 00000000000..e9bbfe69421
--- /dev/null
+++ b/tests/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql
@@ -0,0 +1,12 @@
+drop table if exists data_01809;
+
+create table data_01809 (i int) engine MergeTree order by i settings old_parts_lifetime = 10000000000, min_bytes_for_wide_part = 0, inactive_parts_to_throw_insert = 0, inactive_parts_to_delay_insert = 1;
+
+insert into data_01809 values (1);
+insert into data_01809 values (2);
+
+optimize table data_01809 final;
+
+insert into data_01809 values (3);
+
+drop table data_01809;
diff --git a/tests/queries/0_stateless/01810_max_part_removal_threads_long.reference b/tests/queries/0_stateless/01810_max_part_removal_threads_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
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
new file mode 100755
index 00000000000..f2aa1f63197
--- /dev/null
+++ b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# NOTE: this done as not .sql since we need to Ordinary database
+# (to account threads in query_log for DROP TABLE query)
+# and we can do it compatible with parallel run only in .sh
+# (via $CLICKHOUSE_DATABASE)
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -nm -q "create database ordinary_$CLICKHOUSE_DATABASE engine=Ordinary"
+
+# MergeTree
+$CLICKHOUSE_CLIENT -nm -q """
+    use ordinary_$CLICKHOUSE_DATABASE;
+    drop table if exists data_01810;
+    create table data_01810 (key Int) Engine=MergeTree() order by key partition by key settings max_part_removal_threads=10, concurrent_part_removal_threshold=49;
+    insert into data_01810 select * from numbers(50);
+    drop table data_01810 settings log_queries=1;
+    system flush logs;
+    select throwIf(length(thread_ids)<50) from system.query_log where event_date = today() and current_database = currentDatabase() and query = 'drop table data_01810 settings log_queries=1;' and type = 'QueryFinish' format Null;
+"""
+
+# ReplicatedMergeTree
+$CLICKHOUSE_CLIENT -nm -q """
+    use ordinary_$CLICKHOUSE_DATABASE;
+    drop table if exists rep_data_01810;
+    create table rep_data_01810 (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/rep_data_01810', '1') order by key partition by key settings max_part_removal_threads=10, concurrent_part_removal_threshold=49;
+    insert into rep_data_01810 select * from numbers(50);
+    drop table rep_data_01810 settings log_queries=1;
+    system flush logs;
+    select throwIf(length(thread_ids)<50) from system.query_log where event_date = today() and current_database = currentDatabase() and query = 'drop table rep_data_01810 settings log_queries=1;' and type = 'QueryFinish' format Null;
+"""
+
+$CLICKHOUSE_CLIENT -nm -q "drop database ordinary_$CLICKHOUSE_DATABASE"
diff --git a/tests/queries/0_stateless/01811_filter_by_null.reference b/tests/queries/0_stateless/01811_filter_by_null.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01811_filter_by_null.sql b/tests/queries/0_stateless/01811_filter_by_null.sql
new file mode 100644
index 00000000000..496faf428ab
--- /dev/null
+++ b/tests/queries/0_stateless/01811_filter_by_null.sql
@@ -0,0 +1,9 @@
+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');
+SELECT NULL FROM test_01344 WHERE ignore(1) = NULL;
+SELECT NULL FROM test_01344 WHERE encrypt(ignore(encrypt(NULL, '0.0001048577', lcm(2, 65537), NULL, inf, NULL), lcm(-2, 1048575)), '-0.0000000001', lcm(NULL, NULL)) = NULL;
+SELECT NULL FROM test_01344 WHERE ignore(x, lcm(NULL, 1048576), -2) = NULL;
+
+DROP TABLE test_01344;
diff --git a/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.reference b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.reference
new file mode 100644
index 00000000000..209e3ef4b62
--- /dev/null
+++ b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.reference
@@ -0,0 +1 @@
+20
diff --git a/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
new file mode 100644
index 00000000000..dac68ad4ae8
--- /dev/null
+++ b/tests/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
@@ -0,0 +1,22 @@
+drop table if exists data_01811;
+drop table if exists buffer_01811;
+
+create table data_01811 (key Int) Engine=Memory();
+/* Buffer with flush_rows=1000 */
+create table buffer_01811 (key Int) Engine=Buffer(currentDatabase(), data_01811,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6,
+    /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0
+);
+
+insert into buffer_01811 select * from numbers(10);
+insert into buffer_01811 select * from numbers(10);
+
+-- wait for background buffer flush
+select sleep(3) format Null;
+select count() from data_01811;
+
+drop table buffer_01811;
+drop table data_01811;
diff --git a/tests/queries/0_stateless/01812_basic_auth_http_server.reference b/tests/queries/0_stateless/01812_basic_auth_http_server.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01812_basic_auth_http_server.sh b/tests/queries/0_stateless/01812_basic_auth_http_server.sh
new file mode 100755
index 00000000000..4b993137bbd
--- /dev/null
+++ b/tests/queries/0_stateless/01812_basic_auth_http_server.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2046
+
+# In very old (e.g. 1.1.54385) versions of ClickHouse there was a bug in Poco HTTP library:
+# Basic HTTP authentication headers was not parsed if the size of URL is exactly 4077 + something bytes.
+# So, the user may get authentication error if valid credentials are passed.
+# This is a minor issue because it does not have security implications (at worse the user will be not allowed to access).
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# In this test we do the opposite: passing the invalid credentials while server is accepting default user without a password.
+# And if the bug exists, they will be ignored (treat as empty credentials) and query succeed.
+
+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
diff --git a/tests/queries/0_stateless/01812_has_generic.reference b/tests/queries/0_stateless/01812_has_generic.reference
new file mode 100644
index 00000000000..e8183f05f5d
--- /dev/null
+++ b/tests/queries/0_stateless/01812_has_generic.reference
@@ -0,0 +1,3 @@
+1
+1
+1
diff --git a/tests/queries/0_stateless/01812_has_generic.sql b/tests/queries/0_stateless/01812_has_generic.sql
new file mode 100644
index 00000000000..9ab5b655102
--- /dev/null
+++ b/tests/queries/0_stateless/01812_has_generic.sql
@@ -0,0 +1,3 @@
+SELECT has([(1, 2), (3, 4)], (toUInt16(3), 4));
+SELECT hasAny([(1, 2), (3, 4)], [(toUInt16(3), 4)]);
+SELECT hasAll([(1, 2), (3, 4)], [(toNullable(1), toUInt64(2)), (toUInt16(3), 4)]);
diff --git a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.reference b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.reference
new file mode 100644
index 00000000000..e69de29bb2d
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
new file mode 100644
index 00000000000..c39947f2c04
--- /dev/null
+++ b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
@@ -0,0 +1,3 @@
+-- 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.reference b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.reference
new file mode 100644
index 00000000000..5565ed6787f
--- /dev/null
+++ b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.reference
@@ -0,0 +1,4 @@
+0
+1
+0
+1
diff --git a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
new file mode 100644
index 00000000000..722bd4af5bb
--- /dev/null
+++ b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS data;
+CREATE TABLE data (a Int64, b Int64) ENGINE = TinyLog();
+
+DROP TABLE IF EXISTS data_distributed;
+CREATE TABLE data_distributed (a Int64, b Int64) ENGINE = Distributed(test_shard_localhost, currentDatabase(), 'data');
+
+INSERT INTO data VALUES (0, 0);
+
+SET prefer_localhost_replica = 1;
+SELECT a / (SELECT sum(number) FROM numbers(10)) FROM data_distributed;
+SELECT a < (SELECT 1) FROM data_distributed;
+
+SET prefer_localhost_replica = 0;
+SELECT a / (SELECT sum(number) FROM numbers(10)) FROM data_distributed;
+SELECT a < (SELECT 1) FROM data_distributed;
+
+DROP TABLE data_distributed;
+DROP TABLE data;
diff --git a/tests/queries/0_stateless/01813_quantileBfloat16_nans.reference b/tests/queries/0_stateless/01813_quantileBfloat16_nans.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01813_quantileBfloat16_nans.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01813_quantileBfloat16_nans.sql b/tests/queries/0_stateless/01813_quantileBfloat16_nans.sql
new file mode 100644
index 00000000000..1f823f0b990
--- /dev/null
+++ b/tests/queries/0_stateless/01813_quantileBfloat16_nans.sql
@@ -0,0 +1,16 @@
+SELECT DISTINCT
+    eq
+FROM
+    (
+        WITH
+            range(2 + number % 10) AS arr, -- minimum two elements, to avoid nan result --
+            arrayMap(x -> x = intDiv(number, 10) ? nan : x, arr) AS arr_with_nan,
+            arrayFilter(x -> x != intDiv(number, 10), arr) AS arr_filtered
+        SELECT
+            number,
+            arrayReduce('quantileBFloat16', arr_with_nan) AS q1,
+            arrayReduce('quantileBFloat16', arr_filtered) AS q2,
+            q1 = q2 AS eq
+        FROM
+            numbers(100)
+    );
diff --git a/tests/queries/0_stateless/01817_storage_buffer_parameters.reference b/tests/queries/0_stateless/01817_storage_buffer_parameters.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01817_storage_buffer_parameters.sql b/tests/queries/0_stateless/01817_storage_buffer_parameters.sql
new file mode 100644
index 00000000000..84727bc5d6b
--- /dev/null
+++ b/tests/queries/0_stateless/01817_storage_buffer_parameters.sql
@@ -0,0 +1,42 @@
+drop table if exists data_01817;
+drop table if exists buffer_01817;
+
+create table data_01817 (key Int) Engine=Null();
+
+-- w/ flush_*
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6,
+    /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0
+);
+drop table buffer_01817;
+
+-- w/o flush_*
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6
+);
+drop table buffer_01817;
+
+-- not enough args
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0      /* max_bytes= 4e6  */
+); -- { serverError 42 }
+-- too much args
+create table buffer_01817 (key Int) Engine=Buffer(currentDatabase(), data_01817,
+    /* num_layers= */ 1,
+    /* min_time= */   1,     /* max_time= */  86400,
+    /* min_rows= */   1e9,   /* max_rows= */  1e6,
+    /* min_bytes= */  0,     /* max_bytes= */ 4e6,
+    /* flush_time= */ 86400, /* flush_rows= */ 10, /* flush_bytes= */0,
+    0
+); -- { serverError 42 }
+
+drop table data_01817;
diff --git a/tests/queries/0_stateless/01818_case_float_value_fangyc.reference b/tests/queries/0_stateless/01818_case_float_value_fangyc.reference
new file mode 100644
index 00000000000..61780798228
--- /dev/null
+++ b/tests/queries/0_stateless/01818_case_float_value_fangyc.reference
@@ -0,0 +1 @@
+b
diff --git a/tests/queries/0_stateless/01818_case_float_value_fangyc.sql b/tests/queries/0_stateless/01818_case_float_value_fangyc.sql
new file mode 100644
index 00000000000..3cdb8503e64
--- /dev/null
+++ b/tests/queries/0_stateless/01818_case_float_value_fangyc.sql
@@ -0,0 +1 @@
+select case 1.1 when 0.1 then 'a' when 1.1 then 'b' when 2.1 then 'c' else 'default' end as f;
diff --git a/tests/queries/0_stateless/01818_input_format_with_names_use_header.reference b/tests/queries/0_stateless/01818_input_format_with_names_use_header.reference
new file mode 100644
index 00000000000..b7b577c4685
--- /dev/null
+++ b/tests/queries/0_stateless/01818_input_format_with_names_use_header.reference
@@ -0,0 +1,2 @@
+testdata1
+testdata2
diff --git a/tests/queries/0_stateless/01818_input_format_with_names_use_header.sh b/tests/queries/0_stateless/01818_input_format_with_names_use_header.sh
new file mode 100755
index 00000000000..953c39a40a2
--- /dev/null
+++ b/tests/queries/0_stateless/01818_input_format_with_names_use_header.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS \`01818_with_names\`;"
+
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE \`01818_with_names\` (t String) ENGINE = MergeTree ORDER BY t;"
+
+echo -ne "t\ntestdata1\ntestdata2" | ${CLICKHOUSE_CLIENT} --input_format_with_names_use_header 0 --query "INSERT INTO \`01818_with_names\` FORMAT CSVWithNames"
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM \`01818_with_names\`;"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS \`01818_with_names\`;"
diff --git a/tests/queries/0_stateless/01818_move_partition_simple.reference b/tests/queries/0_stateless/01818_move_partition_simple.reference
new file mode 100644
index 00000000000..d5aea68e9f9
--- /dev/null
+++ b/tests/queries/0_stateless/01818_move_partition_simple.reference
@@ -0,0 +1,12 @@
+INSERT INTO main_table_01818
+INSERT INTO tmp_table_01818
+INSERT INTO tmp_table_01818
+ALL tmp_table_01818	200
+ALL main_table_01818	100
+tmp_table_01818	100
+main_table_01818	100
+Executing ALTER TABLE MOVE PARTITION...
+ALL tmp_table_01818	100
+ALL main_table_01818	200
+tmp_table_01818	0
+main_table_01818	200
diff --git a/tests/queries/0_stateless/01818_move_partition_simple.sql b/tests/queries/0_stateless/01818_move_partition_simple.sql
new file mode 100644
index 00000000000..6ca3ae75efc
--- /dev/null
+++ b/tests/queries/0_stateless/01818_move_partition_simple.sql
@@ -0,0 +1,122 @@
+DROP TABLE IF EXISTS main_table_01818;
+DROP TABLE IF EXISTS tmp_table_01818;
+
+
+CREATE TABLE main_table_01818
+(
+    `id` UInt32,
+    `advertiser_id` String,
+    `campaign_id` String,
+    `name` String,
+    `budget` Float64,
+    `budget_mode` String,
+    `landing_type` String,
+    `status` String,
+    `modify_time` String,
+    `campaign_type` String,
+    `campaign_create_time` DateTime,
+    `campaign_modify_time` DateTime,
+    `create_time` DateTime,
+    `update_time` DateTime
+)
+ENGINE = MergeTree
+PARTITION BY advertiser_id
+ORDER BY campaign_id
+SETTINGS index_granularity = 8192;
+
+CREATE TABLE tmp_table_01818
+(
+    `id` UInt32,
+    `advertiser_id` String,
+    `campaign_id` String,
+    `name` String,
+    `budget` Float64,
+    `budget_mode` String,
+    `landing_type` String,
+    `status` String,
+    `modify_time` String,
+    `campaign_type` String,
+    `campaign_create_time` DateTime,
+    `campaign_modify_time` DateTime,
+    `create_time` DateTime,
+    `update_time` DateTime
+)
+ENGINE = MergeTree
+PARTITION BY advertiser_id
+ORDER BY campaign_id
+SETTINGS index_granularity = 8192;
+
+SELECT 'INSERT INTO main_table_01818';
+INSERT INTO main_table_01818 SELECT 1 as `id`, 'ClickHouse' as `advertiser_id`, * EXCEPT (`id`, `advertiser_id`)
+FROM generateRandom(
+    '`id` UInt32,
+    `advertiser_id` String,
+    `campaign_id` String,
+    `name` String,
+    `budget` Float64,
+    `budget_mode` String,
+    `landing_type` String,
+    `status` String,
+    `modify_time` String,
+    `campaign_type` String,
+    `campaign_create_time` DateTime,
+    `campaign_modify_time` DateTime,
+    `create_time` DateTime,
+    `update_time` DateTime', 10, 10, 10) 
+LIMIT 100;
+
+SELECT 'INSERT INTO tmp_table_01818';
+INSERT INTO tmp_table_01818 SELECT 2 as `id`, 'Database' as `advertiser_id`, * EXCEPT (`id`, `advertiser_id`)
+FROM generateRandom(
+    '`id` UInt32,
+    `advertiser_id` String,
+    `campaign_id` String,
+    `name` String,
+    `budget` Float64,
+    `budget_mode` String,
+    `landing_type` String,
+    `status` String,
+    `modify_time` String,
+    `campaign_type` String,
+    `campaign_create_time` DateTime,
+    `campaign_modify_time` DateTime,
+    `create_time` DateTime,
+    `update_time` DateTime', 10, 10, 10) 
+LIMIT 100;
+
+SELECT 'INSERT INTO tmp_table_01818';
+INSERT INTO tmp_table_01818 SELECT 3 as `id`, 'ClickHouse' as `advertiser_id`, * EXCEPT (`id`, `advertiser_id`)
+FROM generateRandom(
+    '`id` UInt32,
+    `advertiser_id` String,
+    `campaign_id` String,
+    `name` String,
+    `budget` Float64,
+    `budget_mode` String,
+    `landing_type` String,
+    `status` String,
+    `modify_time` String,
+    `campaign_type` String,
+    `campaign_create_time` DateTime,
+    `campaign_modify_time` DateTime,
+    `create_time` DateTime,
+    `update_time` DateTime', 10, 10, 10) 
+LIMIT 100;
+
+SELECT 'ALL tmp_table_01818', count() FROM tmp_table_01818;
+SELECT 'ALL main_table_01818', count() FROM main_table_01818;
+SELECT 'tmp_table_01818', count() FROM tmp_table_01818 WHERE `advertiser_id` = 'ClickHouse';
+SELECT 'main_table_01818', count() FROM main_table_01818 WHERE `advertiser_id` = 'ClickHouse';
+
+SELECT 'Executing ALTER TABLE MOVE PARTITION...';
+ALTER TABLE tmp_table_01818 MOVE PARTITION 'ClickHouse' TO TABLE main_table_01818;
+
+
+SELECT 'ALL tmp_table_01818', count() FROM tmp_table_01818;
+SELECT 'ALL main_table_01818', count() FROM main_table_01818;
+SELECT 'tmp_table_01818', count() FROM tmp_table_01818 WHERE `advertiser_id` = 'ClickHouse';
+SELECT 'main_table_01818', count() FROM main_table_01818 WHERE `advertiser_id` = 'ClickHouse';
+
+
+DROP TABLE IF EXISTS main_table_01818;
+DROP TABLE IF EXISTS tmp_table_01818;
diff --git a/tests/queries/0_stateless/01820_unhex_case_insensitive.reference b/tests/queries/0_stateless/01820_unhex_case_insensitive.reference
new file mode 100644
index 00000000000..e692ee54787
--- /dev/null
+++ b/tests/queries/0_stateless/01820_unhex_case_insensitive.reference
@@ -0,0 +1 @@
+012	MySQL
diff --git a/tests/queries/0_stateless/01820_unhex_case_insensitive.sql b/tests/queries/0_stateless/01820_unhex_case_insensitive.sql
new file mode 100644
index 00000000000..99d8031eeda
--- /dev/null
+++ b/tests/queries/0_stateless/01820_unhex_case_insensitive.sql
@@ -0,0 +1,2 @@
+-- MySQL has function `unhex`, so we will make our function `unhex` also case insensitive for compatibility.
+SELECT unhex('303132'), UNHEX('4D7953514C');
diff --git a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference
new file mode 100644
index 00000000000..9833cbcc9b6
--- /dev/null
+++ b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference
@@ -0,0 +1 @@
+1	20
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
new file mode 100644
index 00000000000..636426fcc91
--- /dev/null
+++ b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS dictionary_primary_key_source_table;
+CREATE TABLE dictionary_primary_key_source_table
+(
+    identifier UInt64,
+    v UInt64
+) ENGINE = TinyLog;
+
+INSERT INTO dictionary_primary_key_source_table VALUES (20, 1);
+
+DROP DICTIONARY IF EXISTS flat_dictionary;
+CREATE DICTIONARY flat_dictionary
+(
+    identifier UInt64,
+    v UInt64
+)
+PRIMARY KEY v
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_primary_key_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(FLAT());
+
+SELECT * FROM flat_dictionary;
+
+DROP DICTIONARY flat_dictionary;
+DROP TABLE dictionary_primary_key_source_table;
diff --git a/tests/queries/0_stateless/01821_join_table_mutation.reference b/tests/queries/0_stateless/01821_join_table_mutation.reference
new file mode 100644
index 00000000000..8c446c806b5
--- /dev/null
+++ b/tests/queries/0_stateless/01821_join_table_mutation.reference
@@ -0,0 +1,7 @@
+100
+10
+99
+m10
+50
+48
+0
diff --git a/tests/queries/0_stateless/01821_join_table_mutation.sql b/tests/queries/0_stateless/01821_join_table_mutation.sql
new file mode 100644
index 00000000000..78903ebd6ec
--- /dev/null
+++ b/tests/queries/0_stateless/01821_join_table_mutation.sql
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS join_table_mutation;
+
+CREATE TABLE join_table_mutation(id Int32, name String) ENGINE = Join(ANY, LEFT, id);
+
+INSERT INTO join_table_mutation select number, toString(number) from numbers(100);
+
+SELECT count() FROM join_table_mutation;
+
+SELECT name FROM join_table_mutation WHERE id = 10;
+
+ALTER TABLE join_table_mutation DELETE WHERE id = 10;
+
+SELECT count() FROM join_table_mutation;
+
+SELECT name FROM join_table_mutation WHERE id = 10;
+
+INSERT INTO join_table_mutation VALUES (10, 'm10');
+
+SELECT name FROM join_table_mutation WHERE id = 10;
+
+ALTER TABLE join_table_mutation DELETE WHERE id % 2 = 0;
+
+ALTER TABLE join_table_mutation UPDATE name = 'some' WHERE 1; -- {serverError 48}
+
+SELECT count() FROM join_table_mutation;
+
+ALTER TABLE join_table_mutation DELETE WHERE name IN ('1', '2', '3', '4');
+
+SELECT count() FROM join_table_mutation;
+
+ALTER TABLE join_table_mutation DELETE WHERE 1;
+
+SELECT count() FROM join_table_mutation;
+
+DROP TABLE join_table_mutation;
diff --git a/tests/queries/0_stateless/01821_join_table_race_long.reference b/tests/queries/0_stateless/01821_join_table_race_long.reference
new file mode 100644
index 00000000000..f2018833bc6
--- /dev/null
+++ b/tests/queries/0_stateless/01821_join_table_race_long.reference
@@ -0,0 +1 @@
+1	foo
diff --git a/tests/queries/0_stateless/01821_join_table_race_long.sh b/tests/queries/0_stateless/01821_join_table_race_long.sh
new file mode 100755
index 00000000000..7c56bf77bfd
--- /dev/null
+++ b/tests/queries/0_stateless/01821_join_table_race_long.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
+
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS join_table_race"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE join_table_race(id Int32, name String) ENGINE = Join(ANY, LEFT, id)"
+
+for _ in {0..100}; do $CLICKHOUSE_CLIENT -q "INSERT INTO join_table_race VALUES ($RANDOM, '$RANDOM')" > /dev/null 2> /dev/null; done &
+
+for _ in {0..200}; do $CLICKHOUSE_CLIENT -q "SELECT count() FROM join_table_race FORMAT Null" > /dev/null 2> /dev/null; done &
+
+for _ in {0..100}; do $CLICKHOUSE_CLIENT -q "TRUNCATE TABLE join_table_race" > /dev/null 2> /dev/null; done &
+
+for _ in {0..100}; do $CLICKHOUSE_CLIENT -q "ALTER TABLE join_table_race DELETE WHERE id % 2 = 0" > /dev/null 2> /dev/null; done &
+
+wait
+
+$CLICKHOUSE_CLIENT -q "TRUNCATE TABLE join_table_race"
+$CLICKHOUSE_CLIENT -q "INSERT INTO join_table_race VALUES (1, 'foo')"
+$CLICKHOUSE_CLIENT -q "SELECT id, name FROM join_table_race"
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE join_table_race"
diff --git a/tests/queries/0_stateless/01821_table_comment.reference b/tests/queries/0_stateless/01821_table_comment.reference
new file mode 100644
index 00000000000..05acabae3d4
--- /dev/null
+++ b/tests/queries/0_stateless/01821_table_comment.reference
@@ -0,0 +1,4 @@
+t1	this is a temtorary table
+t2	this is a MergeTree table
+t3	this is a Log table
+CREATE TABLE default.t1\n(\n    `n` Int8\n)\nENGINE = Memory\nCOMMENT \'this is a temtorary table\'
diff --git a/tests/queries/0_stateless/01821_table_comment.sql b/tests/queries/0_stateless/01821_table_comment.sql
new file mode 100644
index 00000000000..6d9218d5a42
--- /dev/null
+++ b/tests/queries/0_stateless/01821_table_comment.sql
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+CREATE TABLE t1
+(
+    `n` Int8
+)
+ENGINE = Memory
+COMMENT 'this is a temtorary table';
+
+CREATE TABLE t2
+(
+    `n` Int8
+)
+ENGINE = MergeTree
+ORDER BY n
+COMMENT 'this is a MergeTree table';
+
+CREATE TABLE t3
+(
+    `n` Int8
+)
+ENGINE = Log
+COMMENT 'this is a Log table';
+
+SELECT
+    name,
+    comment
+FROM system.tables
+WHERE name IN ('t1', 't2', 't3') AND database = currentDatabase() order by name;
+
+SHOW CREATE TABLE t1;
+
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
diff --git a/tests/queries/0_stateless/01821_to_date_time_ubsan.reference b/tests/queries/0_stateless/01821_to_date_time_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01821_to_date_time_ubsan.sql b/tests/queries/0_stateless/01821_to_date_time_ubsan.sql
new file mode 100644
index 00000000000..74226fc221f
--- /dev/null
+++ b/tests/queries/0_stateless/01821_to_date_time_ubsan.sql
@@ -0,0 +1,2 @@
+SELECT toDateTime('9223372036854775806', 7); -- { serverError 407 }
+SELECT toDateTime('9223372036854775806', 8); -- { serverError 407 }
diff --git a/tests/queries/0_stateless/01822_async_read_from_socket_crash.reference b/tests/queries/0_stateless/01822_async_read_from_socket_crash.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01822_async_read_from_socket_crash.sh b/tests/queries/0_stateless/01822_async_read_from_socket_crash.sh
new file mode 100755
index 00000000000..b4bb2228a91
--- /dev/null
+++ b/tests/queries/0_stateless/01822_async_read_from_socket_crash.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
+
+
+
+for _ in {1..10}; do $CLICKHOUSE_CLIENT -q "select number from remote('127.0.0.{2,3}', numbers(20)) limit 8 settings max_block_size = 2, unknown_packet_in_send_data=4, sleep_in_send_data_ms=100, async_socket_for_remote=1 format Null" > /dev/null 2>&1 || true; done
diff --git a/tests/queries/0_stateless/01822_union_and_constans_error.reference b/tests/queries/0_stateless/01822_union_and_constans_error.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01822_union_and_constans_error.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01822_union_and_constans_error.sql b/tests/queries/0_stateless/01822_union_and_constans_error.sql
new file mode 100644
index 00000000000..38b7df700cd
--- /dev/null
+++ b/tests/queries/0_stateless/01822_union_and_constans_error.sql
@@ -0,0 +1,20 @@
+drop table if exists t0;
+CREATE TABLE t0 (c0 String) ENGINE = Log();
+
+SELECT isNull(t0.c0) OR COUNT('\n?pVa')
+FROM t0
+GROUP BY t0.c0
+HAVING isNull(t0.c0)
+UNION ALL
+SELECT isNull(t0.c0) OR COUNT('\n?pVa')
+FROM t0
+GROUP BY t0.c0
+HAVING NOT isNull(t0.c0)
+UNION ALL
+SELECT isNull(t0.c0) OR COUNT('\n?pVa')
+FROM t0
+GROUP BY t0.c0
+HAVING isNull(isNull(t0.c0))
+SETTINGS aggregate_functions_null_for_empty = 1, enable_optimize_predicate_expression = 0;
+
+drop table if exists t0;
diff --git a/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference
new file mode 100644
index 00000000000..2439021d2e0
--- /dev/null
+++ b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference
@@ -0,0 +1 @@
+[['a'],['b','c']]
diff --git a/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql
new file mode 100644
index 00000000000..528a3b464b3
--- /dev/null
+++ b/tests/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql
@@ -0,0 +1,7 @@
+create temporary table test (
+    arr Array(Array(LowCardinality(String)))
+);
+
+insert into test(arr) values ([['a'], ['b', 'c']]);
+
+select arrayFilter(x -> 1, arr) from test;
diff --git a/tests/queries/0_stateless/01823_explain_json.reference b/tests/queries/0_stateless/01823_explain_json.reference
new file mode 100644
index 00000000000..5c7845a22d5
--- /dev/null
+++ b/tests/queries/0_stateless/01823_explain_json.reference
@@ -0,0 +1,141 @@
+[
+  {
+    "Plan": {
+      "Node Type": "Union",
+      "Plans": [
+        {
+          "Node Type": "Expression",
+          "Plans": [
+            {
+              "Node Type": "SettingQuotaAndLimits",
+              "Plans": [
+                {
+                  "Node Type": "ReadFromStorage"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "Node Type": "Expression",
+          "Plans": [
+            {
+              "Node Type": "SettingQuotaAndLimits",
+              "Plans": [
+                {
+                  "Node Type": "ReadFromStorage"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+]
+--------
+      "Header": [
+        {
+          "Name": "1",
+          "Type": "UInt8"
+        },
+        {
+          "Name": "plus(2, dummy)",
+          "Type": "UInt16"
+        }
+--------
+          "Node Type": "Aggregating",
+          "Header": [
+            {
+              "Name": "number",
+              "Type": "UInt64"
+            },
+            {
+              "Name": "plus(number, 1)",
+              "Type": "UInt64"
+            },
+            {
+              "Name": "quantile(0.2)(number)",
+              "Type": "Float64"
+            },
+            {
+              "Name": "sumIf(number, greater(number, 0))",
+              "Type": "UInt64"
+            }
+          ],
+          "Keys": ["number", "plus(number, 1)"],
+          "Aggregates": [
+            {
+              "Name": "quantile(0.2)(number)",
+              "Function": {
+                "Name": "quantile",
+                "Parameters": ["0.2"],
+                "Argument Types": ["UInt64"],
+                "Result Type": "Float64"
+              },
+              "Arguments": ["number"],
+              "Argument Positions": [0]
+            },
+            {
+              "Name": "sumIf(number, greater(number, 0))",
+              "Function": {
+                "Name": "sumIf",
+                "Argument Types": ["UInt64", "UInt8"],
+                "Result Type": "UInt64"
+              },
+              "Arguments": ["number", "greater(number, 0)"],
+              "Argument Positions": [0, 2]
+            }
+          ],
+--------
+          "Node Type": "ArrayJoin",
+          "Left": false,
+          "Columns": ["x", "y"],
+--------
+          "Node Type": "Distinct",
+          "Columns": ["intDiv(number, 3)", "intDiv(number, 2)"],
+--
+              "Node Type": "Distinct",
+              "Columns": ["intDiv(number, 3)", "intDiv(number, 2)"],
+--------
+              "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,
+--
+                      "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
new file mode 100755
index 00000000000..004e85cd965
--- /dev/null
+++ b/tests/queries/0_stateless/01823_explain_json.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, description = 0 SELECT 1 UNION ALL SELECT 2 FORMAT TSVRaw"
+echo "--------"
+$CLICKHOUSE_CLIENT -q "explain json = 1, description = 0, header = 1 select 1, 2 + dummy FORMAT TSVRaw" | grep Header -m 1 -A 8
+
+echo "--------"
+$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, header = 1, description = 0
+                       SELECT quantile(0.2)(number), sumIf(number, number > 0) from numbers(2) group by number, number + 1 FORMAT TSVRaw
+                      " | grep Aggregating -A 42
+
+echo "--------"
+$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, description = 0
+                       SELECT x, y from numbers(2) array join [number, 1] as x, [number + 1] as y  FORMAT TSVRaw
+                      " | grep ArrayJoin -A 2
+
+echo "--------"
+$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, description = 0
+                       SELECT distinct intDiv(number, 2), intDiv(number, 3) from numbers(10) FORMAT TSVRaw
+                      " | grep Distinct -A 1
+
+echo "--------"
+$CLICKHOUSE_CLIENT -q "EXPLAIN json = 1, actions = 1, description = 0
+                       SELECT number + 1 from numbers(10) order by number desc, number + 1 limit 3 FORMAT TSVRaw
+                      " | grep "Sort Description" -A 12
diff --git a/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.reference b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.reference
new file mode 100644
index 00000000000..adce19321d5
--- /dev/null
+++ b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.reference
@@ -0,0 +1,14 @@
+1	Wide
+2	Compact
+35
+SELECT count()
+FROM t_move_to_prewhere
+PREWHERE a AND b AND c
+WHERE (a AND b AND c) AND (NOT ignore(fat_string))
+1	Compact
+2	Compact
+35
+SELECT count()
+FROM t_move_to_prewhere
+PREWHERE a
+WHERE a AND (b AND c AND (NOT ignore(fat_string)))
diff --git a/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.sql b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.sql
new file mode 100644
index 00000000000..e03972e818d
--- /dev/null
+++ b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.sql
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS t_move_to_prewhere;
+
+CREATE TABLE t_move_to_prewhere (id UInt32, a UInt8, b UInt8, c UInt8, fat_string String)
+ENGINE = MergeTree ORDER BY id PARTITION BY id
+SETTINGS min_rows_for_wide_part = 100, min_bytes_for_wide_part = 0;
+
+INSERT INTO t_move_to_prewhere SELECT 1, number % 2 = 0, number % 3 = 0, number % 5 = 0, repeat('a', 1000) FROM numbers(1000);
+INSERT INTO t_move_to_prewhere SELECT 2, number % 2 = 0, number % 3 = 0, number % 5 = 0, repeat('a', 1000) FROM numbers(10);
+
+SELECT partition, part_type FROM system.parts
+WHERE table = 't_move_to_prewhere' AND database = currentDatabase()
+ORDER BY partition;
+
+SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
+EXPLAIN SYNTAX SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
+
+DROP TABLE IF EXISTS t_move_to_prewhere;
+
+-- With only compact parts, we cannot move 3 conditions to PREWHERE,
+-- because we don't know sizes and we can use only number of columns in conditions.
+-- Sometimes moving a lot of columns to prewhere may be harmful.
+
+CREATE TABLE t_move_to_prewhere (id UInt32, a UInt8, b UInt8, c UInt8, fat_string String)
+ENGINE = MergeTree ORDER BY id PARTITION BY id
+SETTINGS min_rows_for_wide_part = 10000, min_bytes_for_wide_part = 100000000;
+
+INSERT INTO t_move_to_prewhere SELECT 1, number % 2 = 0, number % 3 = 0, number % 5 = 0, repeat('a', 1000) FROM numbers(1000);
+INSERT INTO t_move_to_prewhere SELECT 2, number % 2 = 0, number % 3 = 0, number % 5 = 0, repeat('a', 1000) FROM numbers(10);
+
+SELECT partition, part_type FROM system.parts
+WHERE table = 't_move_to_prewhere' AND database = currentDatabase()
+ORDER BY partition;
+
+SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
+EXPLAIN SYNTAX SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
+
+DROP TABLE IF EXISTS t_move_to_prewhere;
diff --git a/tests/queries/0_stateless/01825_replacing_vertical_merge.reference b/tests/queries/0_stateless/01825_replacing_vertical_merge.reference
new file mode 100644
index 00000000000..18fcfcd8f8e
--- /dev/null
+++ b/tests/queries/0_stateless/01825_replacing_vertical_merge.reference
@@ -0,0 +1,4 @@
+1720	32
+220	17
+33558527	8193
+33550336	8192
diff --git a/tests/queries/0_stateless/01825_replacing_vertical_merge.sql b/tests/queries/0_stateless/01825_replacing_vertical_merge.sql
new file mode 100644
index 00000000000..0048f8d7b24
--- /dev/null
+++ b/tests/queries/0_stateless/01825_replacing_vertical_merge.sql
@@ -0,0 +1,48 @@
+SET optimize_on_insert = 0;
+
+DROP TABLE IF EXISTS replacing_table;
+
+CREATE TABLE replacing_table (a UInt32, b UInt32, c UInt32)
+ENGINE = ReplacingMergeTree ORDER BY a
+SETTINGS vertical_merge_algorithm_min_rows_to_activate = 1,
+    vertical_merge_algorithm_min_columns_to_activate = 1,
+    index_granularity = 16,
+    min_bytes_for_wide_part = 0,
+    merge_max_block_size = 16;
+
+SYSTEM STOP MERGES replacing_table;
+
+INSERT INTO replacing_table SELECT number, number, number from numbers(16);
+INSERT INTO replacing_table SELECT 100, number, number from numbers(16);
+
+SELECT sum(a), count() FROM replacing_table;
+
+SYSTEM START MERGES replacing_table;
+
+OPTIMIZE TABLE replacing_table FINAL;
+
+SELECT sum(a), count() FROM replacing_table;
+
+DROP TABLE IF EXISTS replacing_table;
+
+CREATE TABLE replacing_table
+(
+    key UInt64,
+    value UInt64
+)
+ENGINE = ReplacingMergeTree
+ORDER BY key
+SETTINGS
+    vertical_merge_algorithm_min_rows_to_activate=0,
+    vertical_merge_algorithm_min_columns_to_activate=0,
+    min_bytes_for_wide_part = 0;
+
+INSERT INTO replacing_table SELECT if(number == 8192, 8191, number), 1 FROM numbers(8193);
+
+SELECT sum(key), count() from replacing_table;
+
+OPTIMIZE TABLE replacing_table FINAL;
+
+SELECT sum(key), count() from replacing_table;
+
+DROP TABLE IF EXISTS replacing_table;
diff --git a/tests/queries/0_stateless/01831_max_streams.reference b/tests/queries/0_stateless/01831_max_streams.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01831_max_streams.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01831_max_streams.sql b/tests/queries/0_stateless/01831_max_streams.sql
new file mode 100644
index 00000000000..aa835dea5ac
--- /dev/null
+++ b/tests/queries/0_stateless/01831_max_streams.sql
@@ -0,0 +1 @@
+select * from remote('127.1', system.one) settings max_distributed_connections=0;
diff --git a/tests/queries/0_stateless/01832_memory_write_suffix.reference b/tests/queries/0_stateless/01832_memory_write_suffix.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01832_memory_write_suffix.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01832_memory_write_suffix.sql b/tests/queries/0_stateless/01832_memory_write_suffix.sql
new file mode 100644
index 00000000000..718a4e4ac9d
--- /dev/null
+++ b/tests/queries/0_stateless/01832_memory_write_suffix.sql
@@ -0,0 +1,7 @@
+drop table if exists data_01832;
+
+-- Memory writes from the writeSuffix() and if it will be called twice two rows
+-- will be written (since it does not reset the block).
+create table data_01832 (key Int) Engine=Memory;
+insert into data_01832 values (1);
+select * from data_01832;
diff --git a/tests/queries/0_stateless/01833_test_collation_alvarotuso.reference b/tests/queries/0_stateless/01833_test_collation_alvarotuso.reference
new file mode 100644
index 00000000000..c55134e07d3
--- /dev/null
+++ b/tests/queries/0_stateless/01833_test_collation_alvarotuso.reference
@@ -0,0 +1,6 @@
+a	a
+A	A
+b	b
+B	B
+c	c
+C	C
diff --git a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
new file mode 100644
index 00000000000..65422731711
--- /dev/null
+++ b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS test_collation;
+
+CREATE TABLE test_collation
+(
+    `v` String,
+    `v2` String
+)
+ENGINE = MergeTree
+ORDER BY v
+SETTINGS index_granularity = 8192;
+
+insert into test_collation values ('A', 'A');
+insert into test_collation values ('B', 'B');
+insert into test_collation values ('C', 'C');
+insert into test_collation values ('a', 'a');
+insert into test_collation values ('b', 'b');
+insert into test_collation values ('c', 'c');
+
+SELECT * FROM test_collation ORDER BY v ASC COLLATE 'en';
+
+DROP TABLE test_collation;
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
new file mode 100644
index 00000000000..7326d960397
--- /dev/null
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
@@ -0,0 +1 @@
+Ok
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
new file mode 100755
index 00000000000..793f477b3cb
--- /dev/null
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --multiquery --query "
+drop table if exists aliases_lazyness;
+create table aliases_lazyness (x UInt32, y ALIAS sleepEachRow(0.1)) Engine=MergeTree ORDER BY x;
+insert into aliases_lazyness(x) select * from numbers(40);
+"
+
+# In very old ClickHouse versions alias column was calculated for every row.
+# If it works this way, the query will take at least 0.1 * 40 = 4 seconds.
+# If the issue does not exist, the query should take slightly more than 0.1 seconds.
+# 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
+    timeout 1 ${CLICKHOUSE_CLIENT} --query "SELECT x, y FROM aliases_lazyness WHERE x = 1 FORMAT Null" && break
+done
+
+${CLICKHOUSE_CLIENT} --multiquery --query "
+drop table aliases_lazyness;
+SELECT 'Ok';
+"
diff --git a/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference
new file mode 100644
index 00000000000..1f49e6b362b
--- /dev/null
+++ b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference
@@ -0,0 +1,2 @@
+2017-12-15	1	1
+2017-12-15	1	1
diff --git a/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql
new file mode 100644
index 00000000000..54ffb7b4c1f
--- /dev/null
+++ b/tests/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS db;
+
+CREATE TABLE tb
+(
+    date Date,
+    `index` Int32,
+    value Int32,
+    idx Int32 ALIAS `index`
+)
+ENGINE = MergeTree
+PARTITION BY date
+ORDER BY (date, `index`);
+
+insert into tb values ('2017-12-15', 1, 1);
+
+SET force_primary_key = 1;
+
+select * from tb where `index` >= 0 AND `index` <= 2;
+select * from tb where idx >= 0 AND idx <= 2;
+
+DROP TABLE tb;
diff --git a/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference
new file mode 100644
index 00000000000..fc624e3510f
--- /dev/null
+++ b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference
@@ -0,0 +1,6 @@
+DateTime
+DateTime
+DateTime(\'UTC\')
+DateTime64(3)
+DateTime64(3)
+DateTime64(3, \'UTC\')
diff --git a/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.sql b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.sql
new file mode 100644
index 00000000000..be47cfb0411
--- /dev/null
+++ b/tests/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.sql
@@ -0,0 +1,26 @@
+SELECT toTypeName(now());
+SELECT toTypeName(now() - 1);
+SELECT toTypeName(now('UTC') - 1);
+
+SELECT toTypeName(now64(3));
+SELECT toTypeName(now64(3) - 1);
+SELECT toTypeName(toTimeZone(now64(3), 'UTC') - 1);
+
+DROP TABLE IF EXISTS tt_null;
+DROP TABLE IF EXISTS tt;
+DROP TABLE IF EXISTS tt_mv;
+
+create table tt_null(p String) engine = Null;
+
+create table tt(p String,tmin AggregateFunction(min, DateTime)) 
+engine = AggregatingMergeTree  order by p;
+
+create materialized view tt_mv to tt as 
+select p, minState(now() - interval 30 minute) as tmin
+from tt_null group by p;
+
+insert into tt_null values('x');
+
+DROP TABLE tt_null;
+DROP TABLE tt;
+DROP TABLE tt_mv;
diff --git a/tests/queries/0_stateless/01837_cast_to_array_from_empty_array.reference b/tests/queries/0_stateless/01837_cast_to_array_from_empty_array.reference
new file mode 100644
index 00000000000..c71bf50e82f
--- /dev/null
+++ b/tests/queries/0_stateless/01837_cast_to_array_from_empty_array.reference
@@ -0,0 +1,2 @@
+[]
+[]
diff --git a/tests/queries/0_stateless/01837_cast_to_array_from_empty_array.sql b/tests/queries/0_stateless/01837_cast_to_array_from_empty_array.sql
new file mode 100644
index 00000000000..f3aa595f6d5
--- /dev/null
+++ b/tests/queries/0_stateless/01837_cast_to_array_from_empty_array.sql
@@ -0,0 +1,2 @@
+SELECT CAST([] AS Array(Array(String)));
+SELECT CAST([] AS Array(Array(Array(String))));
diff --git a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.reference b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.reference
new file mode 100644
index 00000000000..71c4a605031
--- /dev/null
+++ b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.reference
@@ -0,0 +1,3 @@
+1	First
+2	Second
+3	Third
diff --git a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
new file mode 100644
index 00000000000..baba8b5188e
--- /dev/null
+++ b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
@@ -0,0 +1,30 @@
+DROP DATABASE IF EXISTS 01837_db;
+CREATE DATABASE 01837_db ENGINE = Memory;
+
+DROP TABLE IF EXISTS 01837_db.simple_key_dictionary_source;
+CREATE TABLE 01837_db.simple_key_dictionary_source
+(
+    id UInt64,
+    value String
+) ENGINE = TinyLog;
+
+INSERT INTO 01837_db.simple_key_dictionary_source VALUES (1, 'First');
+INSERT INTO 01837_db.simple_key_dictionary_source VALUES (2, 'Second');
+INSERT INTO 01837_db.simple_key_dictionary_source VALUES (3, 'Third');
+
+DROP DICTIONARY IF EXISTS 01837_db.simple_key_direct_dictionary;
+CREATE DICTIONARY 01837_db.simple_key_direct_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() DB '01837_db' TABLE 'simple_key_dictionary_source'))
+LAYOUT(DIRECT());
+
+SELECT * FROM 01837_db.simple_key_direct_dictionary;
+
+DROP DICTIONARY 01837_db.simple_key_direct_dictionary;
+DROP TABLE 01837_db.simple_key_dictionary_source;
+
+DROP DATABASE 01837_db;
diff --git a/tests/queries/0_stateless/01838_system_dictionaries_virtual_key_column.reference b/tests/queries/0_stateless/01838_system_dictionaries_virtual_key_column.reference
new file mode 100644
index 00000000000..f0543d9221e
--- /dev/null
+++ b/tests/queries/0_stateless/01838_system_dictionaries_virtual_key_column.reference
@@ -0,0 +1,4 @@
+simple key
+example_simple_key_dictionary	UInt64
+complex key
+example_complex_key_dictionary	(UInt64, String)
diff --git a/tests/queries/0_stateless/01838_system_dictionaries_virtual_key_column.sql b/tests/queries/0_stateless/01838_system_dictionaries_virtual_key_column.sql
new file mode 100644
index 00000000000..97d96f643cf
--- /dev/null
+++ b/tests/queries/0_stateless/01838_system_dictionaries_virtual_key_column.sql
@@ -0,0 +1,26 @@
+DROP DICTIONARY IF EXISTS example_simple_key_dictionary;
+CREATE DICTIONARY example_simple_key_dictionary (
+    id UInt64,
+    value UInt64
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE '' DATABASE currentDatabase()))
+LAYOUT(DIRECT());
+
+SELECT 'simple key';
+
+SELECT name, key FROM system.dictionaries WHERE name='example_simple_key_dictionary' AND database=currentDatabase();
+
+DROP DICTIONARY IF EXISTS example_complex_key_dictionary;
+CREATE DICTIONARY example_complex_key_dictionary (
+    id UInt64,
+    id_key String,
+    value UInt64
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE '' DATABASE currentDatabase()))
+LAYOUT(COMPLEX_KEY_DIRECT());
+
+SELECT 'complex key';
+
+SELECT name, key FROM system.dictionaries WHERE name='example_complex_key_dictionary' AND database=currentDatabase();
diff --git a/tests/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.reference b/tests/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.reference
new file mode 100644
index 00000000000..8e1a7a2271f
--- /dev/null
+++ b/tests/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.reference
@@ -0,0 +1 @@
+a	b	c
diff --git a/tests/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.sql b/tests/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.sql
new file mode 100644
index 00000000000..979debbcbb8
--- /dev/null
+++ b/tests/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.sql
@@ -0,0 +1,4 @@
+SELECT COLUMNS('test') FROM
+    (SELECT 1 AS id, 'a' AS test) a
+    LEFT JOIN (SELECT 1 AS id, 'b' AS test) b ON b.id = a.id
+    LEFT JOIN (SELECT 1 AS id, 'c' AS test) c ON c.id = a.id;
diff --git a/tests/queries/0_stateless/01840_tupleElement_formatting_fuzzer.reference b/tests/queries/0_stateless/01840_tupleElement_formatting_fuzzer.reference
new file mode 100644
index 00000000000..3ae98fdb188
--- /dev/null
+++ b/tests/queries/0_stateless/01840_tupleElement_formatting_fuzzer.reference
@@ -0,0 +1,17 @@
+SelectWithUnionQuery (children 1)
+ ExpressionList (children 1)
+  SelectQuery (children 1)
+   ExpressionList (children 1)
+    Function tupleElement (children 1)
+     ExpressionList (children 2)
+      Literal UInt64_255
+      Literal UInt64_100
+SelectWithUnionQuery (children 1)
+ ExpressionList (children 1)
+  SelectQuery (children 1)
+   ExpressionList (children 1)
+    Function tupleElement (children 1)
+     ExpressionList (children 2)
+      Literal Tuple_(UInt64_255, UInt64_1)
+      Literal UInt64_1
+255
diff --git a/tests/queries/0_stateless/01840_tupleElement_formatting_fuzzer.sql b/tests/queries/0_stateless/01840_tupleElement_formatting_fuzzer.sql
new file mode 100644
index 00000000000..e7ef7b158a3
--- /dev/null
+++ b/tests/queries/0_stateless/01840_tupleElement_formatting_fuzzer.sql
@@ -0,0 +1,3 @@
+explain ast select tupleElement(255, 100);
+explain ast select tupleElement((255, 1), 1);
+select tupleElement((255, 1), 1);
diff --git a/tests/queries/0_stateless/01845_add_testcase_for_arrayElement.reference b/tests/queries/0_stateless/01845_add_testcase_for_arrayElement.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01845_add_testcase_for_arrayElement.sql b/tests/queries/0_stateless/01845_add_testcase_for_arrayElement.sql
new file mode 100644
index 00000000000..6aeb71b8511
--- /dev/null
+++ b/tests/queries/0_stateless/01845_add_testcase_for_arrayElement.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (`key` UInt32, `arr` ALIAS [1, 2], `xx` MATERIALIZED arr[1]) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple(); 
+DROP TABLE test;
+
+CREATE TABLE test (`key` UInt32, `arr` Array(UInt32) ALIAS [1, 2], `xx` MATERIALIZED arr[1]) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple();
+DROP TABLE test;
+
+CREATE TABLE test (`key` UInt32, `arr` Array(UInt32) ALIAS [1, 2], `xx` UInt32 MATERIALIZED arr[1]) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple();
+DROP TABLE test;
+
+CREATE TABLE test (`key` UInt32, `arr` ALIAS [1, 2]) ENGINE = MergeTree PARTITION BY tuple() ORDER BY tuple();
+ALTER TABLE test ADD COLUMN `xx` UInt32 MATERIALIZED arr[1];
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/01846_alter_column_without_type_bugfix.reference b/tests/queries/0_stateless/01846_alter_column_without_type_bugfix.reference
new file mode 100644
index 00000000000..849ac80b365
--- /dev/null
+++ b/tests/queries/0_stateless/01846_alter_column_without_type_bugfix.reference
@@ -0,0 +1 @@
+CREATE TABLE default.alter_test\n(\n    `a` Int32,\n    `b` DateTime DEFAULT now() + 1\n)\nENGINE = ReplacingMergeTree(b)\nORDER BY a\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01846_alter_column_without_type_bugfix.sql b/tests/queries/0_stateless/01846_alter_column_without_type_bugfix.sql
new file mode 100644
index 00000000000..5df8daedbe6
--- /dev/null
+++ b/tests/queries/0_stateless/01846_alter_column_without_type_bugfix.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS alter_test;
+CREATE TABLE alter_test (a Int32, b DateTime) ENGINE = ReplacingMergeTree(b) ORDER BY a;
+ALTER TABLE alter_test MODIFY COLUMN `b` DateTime DEFAULT now();
+ALTER TABLE alter_test MODIFY COLUMN `b` DEFAULT now() + 1;
+SHOW CREATE TABLE alter_test;
+DROP TABLE alter_test;
diff --git a/tests/queries/0_stateless/01846_null_as_default_for_insert_select.reference b/tests/queries/0_stateless/01846_null_as_default_for_insert_select.reference
new file mode 100644
index 00000000000..a50af17a63f
--- /dev/null
+++ b/tests/queries/0_stateless/01846_null_as_default_for_insert_select.reference
@@ -0,0 +1,15 @@
+HELLO
+WORLD
+
+HELLO
+WORLD
+WORLD
+
+HELLO	PEOPLE
+WORLD	PEOPLE
+
+1	1001
+2	1002
+
+1	501	1001
+2	502	1002
diff --git a/tests/queries/0_stateless/01846_null_as_default_for_insert_select.sql b/tests/queries/0_stateless/01846_null_as_default_for_insert_select.sql
new file mode 100644
index 00000000000..d6f3b8a2136
--- /dev/null
+++ b/tests/queries/0_stateless/01846_null_as_default_for_insert_select.sql
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS test_null_as_default;
+CREATE TABLE test_null_as_default (a String DEFAULT 'WORLD') ENGINE = Memory;
+
+INSERT INTO test_null_as_default SELECT 'HELLO' UNION ALL SELECT NULL;
+SELECT * FROM test_null_as_default ORDER BY a;
+SELECT '';
+
+INSERT INTO test_null_as_default SELECT NULL;
+SELECT * FROM test_null_as_default ORDER BY a;
+SELECT '';
+
+DROP TABLE IF EXISTS test_null_as_default;
+CREATE TABLE test_null_as_default (a String DEFAULT 'WORLD', b String DEFAULT 'PEOPLE') ENGINE = Memory;
+
+INSERT INTO test_null_as_default(a) SELECT 'HELLO' UNION ALL SELECT NULL;
+SELECT * FROM test_null_as_default ORDER BY a;
+SELECT '';
+
+DROP TABLE IF EXISTS test_null_as_default;
+CREATE TABLE test_null_as_default (a Int8, b Int64 DEFAULT a + 1000) ENGINE = Memory;
+
+INSERT INTO test_null_as_default SELECT 1, NULL UNION ALL SELECT 2, NULL;
+SELECT * FROM test_null_as_default ORDER BY a;
+SELECT '';
+
+DROP TABLE IF EXISTS test_null_as_default;
+CREATE TABLE test_null_as_default (a Int8, b Int64 DEFAULT c - 500, c Int32 DEFAULT a + 1000) ENGINE = Memory;
+
+INSERT INTO test_null_as_default(a, c) SELECT 1, NULL UNION ALL SELECT 2, NULL;
+SELECT * FROM test_null_as_default ORDER BY a;
diff --git a/tests/queries/0_stateless/01847_bad_like.reference b/tests/queries/0_stateless/01847_bad_like.reference
new file mode 100644
index 00000000000..06f4e8a840d
--- /dev/null
+++ b/tests/queries/0_stateless/01847_bad_like.reference
@@ -0,0 +1,25 @@
+1
+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/01847_bad_like.sql b/tests/queries/0_stateless/01847_bad_like.sql
new file mode 100644
index 00000000000..c7dedacc600
--- /dev/null
+++ b/tests/queries/0_stateless/01847_bad_like.sql
@@ -0,0 +1,30 @@
+SELECT '\w' LIKE '%\w%';
+SELECT '\w' LIKE '\w%';
+SELECT '\w' LIKE '%\w';
+SELECT '\w' LIKE '\w';
+
+SELECT '\\w' LIKE '%\\w%';
+SELECT '\\w' LIKE '\\w%';
+SELECT '\\w' LIKE '%\\w';
+SELECT '\\w' LIKE '\\w';
+
+SELECT '\i' LIKE '%\i%';
+SELECT '\i' LIKE '\i%';
+SELECT '\i' LIKE '%\i';
+SELECT '\i' LIKE '\i';
+
+SELECT '\\i' LIKE '%\\i%';
+SELECT '\\i' LIKE '\\i%';
+SELECT '\\i' LIKE '%\\i';
+SELECT '\\i' LIKE '\\i';
+
+SELECT '\\' LIKE '%\\\\%';
+SELECT '\\' LIKE '\\\\%';
+SELECT '\\' LIKE '%\\\\';
+SELECT '\\' LIKE '\\\\';
+SELECT '\\' LIKE '\\';
+
+SELECT '\\xyz\\' LIKE '\\\\%\\\\';
+SELECT '\\xyz\\' LIKE '\\\\___\\\\';
+SELECT '\\xyz\\' LIKE '\\\\_%_\\\\';
+SELECT '\\xyz\\' LIKE '\\\\%_%\\\\';
diff --git a/tests/queries/0_stateless/01848_http_insert_segfault.reference b/tests/queries/0_stateless/01848_http_insert_segfault.reference
new file mode 100644
index 00000000000..587579af915
--- /dev/null
+++ b/tests/queries/0_stateless/01848_http_insert_segfault.reference
@@ -0,0 +1 @@
+Ok.
diff --git a/tests/queries/0_stateless/01848_http_insert_segfault.sh b/tests/queries/0_stateless/01848_http_insert_segfault.sh
new file mode 100755
index 00000000000..a263ded44eb
--- /dev/null
+++ b/tests/queries/0_stateless/01848_http_insert_segfault.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+ # shellcheck source=../shell_config.sh
+ . "$CUR_DIR"/../shell_config.sh
+
+ ${CLICKHOUSE_LOCAL} -q "select col1, initializeAggregation('argMaxState', col2, insertTime) as col2, now() as insertTime FROM generateRandom('col1 String, col2 Array(Float64)') LIMIT 1000000 FORMAT CSV"  | curl -s 'http://localhost:8123/?query=INSERT%20INTO%20non_existing_table%20SELECT%20col1%2C%20initializeAggregation(%27argMaxState%27%2C%20col2%2C%20insertTime)%20as%20col2%2C%20now()%20as%20insertTime%20FROM%20input(%27col1%20String%2C%20col2%20Array(Float64)%27)%20FORMAT%20CSV' --data-binary @- | grep -q "Table default.non_existing_table doesn't exist" && echo 'Ok.' || echo 'FAIL' ||:
+
diff --git a/tests/queries/0_stateless/01848_partition_value_column.reference b/tests/queries/0_stateless/01848_partition_value_column.reference
new file mode 100644
index 00000000000..e83beda6895
--- /dev/null
+++ b/tests/queries/0_stateless/01848_partition_value_column.reference
@@ -0,0 +1,4 @@
+1
+4
+4
+1
diff --git a/tests/queries/0_stateless/01848_partition_value_column.sql b/tests/queries/0_stateless/01848_partition_value_column.sql
new file mode 100644
index 00000000000..0fc4fbe2802
--- /dev/null
+++ b/tests/queries/0_stateless/01848_partition_value_column.sql
@@ -0,0 +1,18 @@
+drop table if exists tbl;
+drop table if exists tbl2;
+
+create table tbl(dt DateTime, i int, j String, v Float64) engine MergeTree partition by (toDate(dt), i % 2, length(j)) order by i settings index_granularity = 1;
+
+insert into tbl values ('2021-04-01 00:01:02', 1, '123', 4), ('2021-04-01 01:01:02', 1, '12', 4), ('2021-04-01 02:11:02', 2, '345', 4), ('2021-04-01 04:31:02', 2, '2', 4), ('2021-04-02 00:01:02', 1, '1234', 4), ('2021-04-02 00:01:02', 2, '123', 4), ('2021-04-02 00:01:02', 3, '12', 4), ('2021-04-02 00:01:02', 4, '1', 4);
+
+select count() from tbl where _partition_value = ('2021-04-01', 1, 2) settings max_rows_to_read = 1;
+select count() from tbl where _partition_value.1 = '2021-04-01' settings max_rows_to_read = 4;
+select count() from tbl where _partition_value.2 = 0 settings max_rows_to_read = 4;
+select count() from tbl where _partition_value.3 = 4 settings max_rows_to_read = 1;
+
+create table tbl2(i int) engine MergeTree order by i;
+insert into tbl2 values (1);
+select _partition_value from tbl2; -- { serverError 16 }
+
+drop table tbl;
+drop table tbl2;
diff --git a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.reference b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
new file mode 100644
index 00000000000..6ed4eafcc8f
--- /dev/null
+++ b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
@@ -0,0 +1,15 @@
+create database if not exists shard_0;
+create database if not exists shard_1;
+
+drop table if exists dist_01850;
+drop table if exists shard_0.data_01850;
+
+create table shard_0.data_01850 (key Int) engine=Memory();
+create table dist_01850 (key Int) engine=Distributed('test_cluster_two_replicas_different_databases', /* default_database= */ '', data_01850, key);
+
+set insert_distributed_sync=1;
+set prefer_localhost_replica=0;
+insert into dist_01850 values (1); -- { serverError 60 }
+
+drop table if exists dist_01850;
+drop table shard_0.data_01850;
diff --git a/tests/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.reference b/tests/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.sql b/tests/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.sql
new file mode 100644
index 00000000000..ebf2efda4f1
--- /dev/null
+++ b/tests/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.sql
@@ -0,0 +1 @@
+SELECT arrayDifference([toDecimal32(100.0000991821289, 0), -2147483647]) AS x; --{serverError 407}
diff --git a/tests/queries/0_stateless/01851_clear_column_referenced_by_mv.reference b/tests/queries/0_stateless/01851_clear_column_referenced_by_mv.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01851_clear_column_referenced_by_mv.sql b/tests/queries/0_stateless/01851_clear_column_referenced_by_mv.sql
new file mode 100644
index 00000000000..a0239ff482c
--- /dev/null
+++ b/tests/queries/0_stateless/01851_clear_column_referenced_by_mv.sql
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS `01851_merge_tree`;
+CREATE TABLE `01851_merge_tree`
+(
+    `n1` Int8,
+    `n2` Int8,
+    `n3` Int8,
+    `n4` Int8
+)
+ENGINE = MergeTree
+ORDER BY n1;
+
+DROP TABLE IF EXISTS `001851_merge_tree_mv`;
+CREATE MATERIALIZED VIEW `01851_merge_tree_mv`
+ENGINE = Memory AS
+SELECT
+    n2,
+    n3
+FROM `01851_merge_tree`;
+
+ALTER TABLE `01851_merge_tree`
+    DROP COLUMN n3;  -- { serverError 524 }
+
+ALTER TABLE `01851_merge_tree`
+    DROP COLUMN n2;  -- { serverError 524 }
+
+-- ok
+ALTER TABLE `01851_merge_tree`
+    DROP COLUMN n4;
+
+-- CLEAR COLUMN is OK
+ALTER TABLE `01851_merge_tree`
+    CLEAR COLUMN n2;
+
+DROP TABLE `01851_merge_tree`;
+DROP TABLE `01851_merge_tree_mv`;
diff --git a/tests/queries/0_stateless/01851_fix_row_policy_empty_result.reference b/tests/queries/0_stateless/01851_fix_row_policy_empty_result.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01851_fix_row_policy_empty_result.sql b/tests/queries/0_stateless/01851_fix_row_policy_empty_result.sql
new file mode 100644
index 00000000000..f28426bb651
--- /dev/null
+++ b/tests/queries/0_stateless/01851_fix_row_policy_empty_result.sql
@@ -0,0 +1,12 @@
+drop table if exists tbl;
+create table tbl (s String, i int) engine MergeTree order by i;
+
+insert into tbl values ('123', 123);
+
+drop row policy if exists filter on tbl;
+create row policy filter on tbl using (s = 'non_existing_domain') to all;
+
+select * from tbl prewhere s = '123' where i = 123;
+
+drop row policy filter on tbl;
+drop table tbl;
diff --git a/tests/queries/0_stateless/01851_hedged_connections_external_tables.reference b/tests/queries/0_stateless/01851_hedged_connections_external_tables.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/01851_hedged_connections_external_tables.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/01851_hedged_connections_external_tables.sql b/tests/queries/0_stateless/01851_hedged_connections_external_tables.sql
new file mode 100644
index 00000000000..c4625720e59
--- /dev/null
+++ b/tests/queries/0_stateless/01851_hedged_connections_external_tables.sql
@@ -0,0 +1 @@
+select number from remote('127.0.0.{3|2}', numbers(2)) where number global in (select number from numbers(1))　settings async_socket_for_remote=1, use_hedged_requests = 1, sleep_in_send_data_ms=10, receive_data_timeout_ms=1;
diff --git a/tests/queries/0_stateless/01852_cast_operator.reference b/tests/queries/0_stateless/01852_cast_operator.reference
new file mode 100644
index 00000000000..8b4069ab2b8
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator.reference
@@ -0,0 +1,34 @@
+0.10000000000000000000000000000000000000
+SELECT CAST(\'0.1\', \'Decimal(38, 38)\') AS c
+[1,2,3]
+SELECT CAST(\'[1, 2, 3]\', \'Array(UInt32)\') AS c
+abc
+SELECT CAST(\'abc\', \'FixedString(3)\') AS c
+123
+SELECT CAST(\'123\', \'String\') AS c
+1
+SELECT CAST(\'1\', \'Int8\') AS c
+[1,2,3]
+SELECT CAST([1, 1 + 1, 1 + 2], \'Array(UInt32)\') AS c
+2010-10-10
+SELECT CAST(\'2010-10-10\', \'Date\') AS c
+2010-10-10 00:00:00
+SELECT CAST(\'2010-10-10\', \'DateTime\') AS c
+['2010-10-10','2010-10-10']
+SELECT CAST(\'[\\\'2010-10-10\\\', \\\'2010-10-10\\\']\', \'Array(Date)\')
+3
+SELECT CAST(1 + 2, \'UInt32\') AS c
+0.5
+SELECT CAST(CAST(\'0.1\', \'Decimal(4, 4)\') * 5, \'Float64\') AS c
+0	UInt8
+SELECT
+    CAST(number, \'UInt8\') AS c,
+    toTypeName(c)
+FROM numbers(1)
+1970-01-11
+SELECT CAST((((0 + 1) + 2) + 3) + 4, \'Date\') AS c
+0.6000
+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.sql b/tests/queries/0_stateless/01852_cast_operator.sql
new file mode 100644
index 00000000000..98ac7ee73e7
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator.sql
@@ -0,0 +1,45 @@
+SELECT 0.1::Decimal(38, 38) AS c;
+EXPLAIN SYNTAX SELECT 0.1::Decimal(38, 38) AS c;
+
+SELECT [1, 2, 3]::Array(UInt32) AS c;
+EXPLAIN SYNTAX SELECT [1, 2, 3]::Array(UInt32) AS c;
+
+SELECT 'abc'::FixedString(3) AS c;
+EXPLAIN SYNTAX SELECT 'abc'::FixedString(3) AS c;
+
+SELECT 123::String AS c;
+EXPLAIN SYNTAX SELECT 123::String AS c;
+
+SELECT 1::Int8 AS c;
+EXPLAIN SYNTAX SELECT 1::Int8 AS c;
+
+SELECT [1, 1 + 1, 1 + 2]::Array(UInt32) AS c;
+EXPLAIN SYNTAX SELECT [1, 1 + 1, 1 + 2]::Array(UInt32) AS c;
+
+SELECT '2010-10-10'::Date AS c;
+EXPLAIN SYNTAX SELECT '2010-10-10'::Date AS c;
+
+SELECT '2010-10-10'::DateTime AS c;
+EXPLAIN SYNTAX SELECT '2010-10-10'::DateTime AS c;
+
+SELECT ['2010-10-10', '2010-10-10']::Array(Date) AS c;
+EXPLAIN SYNTAX SELECT ['2010-10-10', '2010-10-10']::Array(Date);
+
+SELECT (1 + 2)::UInt32 AS c;
+EXPLAIN SYNTAX SELECT (1 + 2)::UInt32 AS c;
+
+SELECT (0.1::Decimal(4, 4) * 5)::Float64 AS c;
+EXPLAIN SYNTAX SELECT (0.1::Decimal(4, 4) * 5)::Float64 AS c;
+
+SELECT number::UInt8 AS c, toTypeName(c) FROM numbers(1);
+EXPLAIN SYNTAX SELECT number::UInt8 AS c, toTypeName(c) FROM numbers(1);
+
+SELECT (0 + 1 + 2 + 3 + 4)::Date AS c;
+EXPLAIN SYNTAX SELECT (0 + 1 + 2 + 3 + 4)::Date AS c;
+
+SELECT (0.1::Decimal(4, 4) + 0.2::Decimal(4, 4) + 0.3::Decimal(4, 4))::Decimal(4, 4) AS c;
+EXPLAIN SYNTAX SELECT (0.1::Decimal(4, 4) + 0.2::Decimal(4, 4) + 0.3::Decimal(4, 4))::Decimal(4, 4) AS c;
+
+SELECT [[1][1]]::Array(UInt32);
+SELECT [[1, 2, 3], [], [1]]::Array(Array(UInt32));
+SELECT [[], []]::Array(Array(UInt32));
diff --git a/tests/queries/0_stateless/01852_cast_operator_2.reference b/tests/queries/0_stateless/01852_cast_operator_2.reference
new file mode 100644
index 00000000000..438eabda142
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator_2.reference
@@ -0,0 +1,13 @@
+(0.1000000000000000000000000000000000000000000000000000000000000000000000,0.2000000000000000000000000000000000000000000000000000000000000000000000)
+SELECT CAST(\'(0.1, 0.2)\', \'Tuple(Decimal(75, 70), Decimal(75, 70))\')
+0.1000
+SELECT CAST(\'0.1\', \'Decimal(4, 4)\')
+[1,2,3]
+SELECT CAST(\'[1, 2, 3]\', \'Array(Int32)\')
+[1,2]
+SELECT CAST([CAST(\'1\', \'UInt32\'), CAST(\'2\', \'UInt32\')], \'Array(UInt64)\')
+[[1,2],[3]]
+SELECT CAST([CAST(\'[1, 2]\', \'Array(UInt32)\'), [3]], \'Array(Array(UInt64))\')
+[[1,2],[3]]
+SELECT CAST([CAST([CAST(\'1\', \'UInt16\'), CAST(\'2\', \'UInt16\')], \'Array(UInt32)\'), [3]], \'Array(Array(UInt64))\')
+[(1,'a'),(3,'b')]	Nested(u UInt8, s String)
diff --git a/tests/queries/0_stateless/01852_cast_operator_2.sql b/tests/queries/0_stateless/01852_cast_operator_2.sql
new file mode 100644
index 00000000000..859d33a381a
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator_2.sql
@@ -0,0 +1,19 @@
+SELECT (0.1, 0.2)::Tuple(Decimal(75, 70), Decimal(75, 70));
+EXPLAIN SYNTAX SELECT (0.1, 0.2)::Tuple(Decimal(75, 70), Decimal(75, 70));
+
+SELECT 0.1 :: Decimal(4, 4);
+EXPLAIN SYNTAX SELECT 0.1 :: Decimal(4, 4);
+
+SELECT [1, 2, 3] :: Array(Int32);
+EXPLAIN SYNTAX SELECT [1, 2, 3] :: Array(Int32);
+
+SELECT [1::UInt32, 2::UInt32]::Array(UInt64);
+EXPLAIN SYNTAX SELECT [1::UInt32, 2::UInt32]::Array(UInt64);
+
+SELECT [[1, 2]::Array(UInt32), [3]]::Array(Array(UInt64));
+EXPLAIN SYNTAX SELECT [[1, 2]::Array(UInt32), [3]]::Array(Array(UInt64));
+
+SELECT [[1::UInt16, 2::UInt16]::Array(UInt32), [3]]::Array(Array(UInt64));
+EXPLAIN SYNTAX SELECT [[1::UInt16, 2::UInt16]::Array(UInt32), [3]]::Array(Array(UInt64));
+
+SELECT [(1, 'a'), (3, 'b')]::Nested(u UInt8, s String) AS t, toTypeName(t);
diff --git a/tests/queries/0_stateless/01852_cast_operator_bad_cases.reference b/tests/queries/0_stateless/01852_cast_operator_bad_cases.reference
new file mode 100644
index 00000000000..2c4517e0eda
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator_bad_cases.reference
@@ -0,0 +1,10 @@
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Code: 6
diff --git a/tests/queries/0_stateless/01852_cast_operator_bad_cases.sh b/tests/queries/0_stateless/01852_cast_operator_bad_cases.sh
new file mode 100755
index 00000000000..f2f566b78c4
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator_bad_cases.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="SELECT [1,]::Array(UInt8)"  2>&1 | grep -o -m1 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [1, 2]]::Array(UInt8)"  2>&1 | grep -o -m1 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [[1, 2]::Array(UInt8)"  2>&1 | grep -o -m1 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [[1, 2],, []]::Array(Array(UInt8))"  2>&1 | grep -o -m1 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [[1, 2][]]::Array(Array(UInt8))"  2>&1 | grep -o -m1 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [1,,2]::Array(UInt8)"  2>&1 | grep -o -m1 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [1 2]::Array(UInt8)"  2>&1 | grep -o -m1 'Syntax error'
+
+$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'
diff --git a/tests/queries/0_stateless/01852_dictionary_found_rate_long.reference b/tests/queries/0_stateless/01852_dictionary_found_rate_long.reference
new file mode 100644
index 00000000000..9e898591f58
--- /dev/null
+++ b/tests/queries/0_stateless/01852_dictionary_found_rate_long.reference
@@ -0,0 +1,33 @@
+simple_key_flat_dictionary_01862	1
+simple_key_flat_dictionary_01862	1
+simple_key_flat_dictionary_01862	0.67
+simple_key_direct_dictionary_01862	0
+simple_key_direct_dictionary_01862	0
+simple_key_direct_dictionary_01862	1
+simple_key_direct_dictionary_01862	0.5
+simple_key_hashed_dictionary_01862	0
+simple_key_hashed_dictionary_01862	1
+simple_key_hashed_dictionary_01862	0.5
+simple_key_sparse_hashed_dictionary_01862	0
+simple_key_sparse_hashed_dictionary_01862	1
+simple_key_sparse_hashed_dictionary_01862	0.5
+simple_key_cache_dictionary_01862	0
+simple_key_cache_dictionary_01862	1
+simple_key_cache_dictionary_01862	0.5
+complex_key_hashed_dictionary_01862	0
+complex_key_hashed_dictionary_01862	1
+complex_key_hashed_dictionary_01862	0.5
+complex_key_direct_dictionary_01862	0
+complex_key_direct_dictionary_01862	1
+complex_key_direct_dictionary_01862	0.5
+complex_key_cache_dictionary_01862	0
+complex_key_cache_dictionary_01862	1
+complex_key_cache_dictionary_01862	0.5
+simple_key_range_hashed_dictionary_01862	0
+simple_key_range_hashed_dictionary_01862	1
+simple_key_range_hashed_dictionary_01862	0.5
+ip_trie_dictionary_01862	0
+ip_trie_dictionary_01862	1
+ip_trie_dictionary_01862	0.5
+polygon_dictionary_01862	0
+polygon_dictionary_01862	0.8
diff --git a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
new file mode 100644
index 00000000000..2501e21b95e
--- /dev/null
+++ b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
@@ -0,0 +1,309 @@
+--
+-- Simple key
+--
+
+DROP TABLE IF EXISTS simple_key_source_table_01862;
+CREATE TABLE simple_key_source_table_01862
+(
+    id UInt64,
+    value String
+) ENGINE = Memory();
+
+INSERT INTO simple_key_source_table_01862 VALUES (1, 'First');
+INSERT INTO simple_key_source_table_01862 VALUES (1, 'First');
+
+-- simple flat
+DROP DICTIONARY IF EXISTS simple_key_flat_dictionary_01862;
+CREATE DICTIONARY simple_key_flat_dictionary_01862
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+LAYOUT(FLAT())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT * FROM simple_key_flat_dictionary_01862 FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_flat_dictionary_01862';
+SELECT * FROM simple_key_flat_dictionary_01862 WHERE id = 0 FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_flat_dictionary_01862';
+SELECT dictGet('simple_key_flat_dictionary_01862', 'value', toUInt64(2)) FORMAT Null;
+SELECT name, round(found_rate, 2) FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_flat_dictionary_01862';
+
+DROP DICTIONARY simple_key_flat_dictionary_01862;
+
+-- simple direct
+DROP DICTIONARY IF EXISTS simple_key_direct_dictionary_01862;
+CREATE DICTIONARY simple_key_direct_dictionary_01862
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+LAYOUT(DIRECT());
+
+-- check that found_rate is 0, not nan
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_direct_dictionary_01862';
+SELECT * FROM simple_key_direct_dictionary_01862 FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_direct_dictionary_01862';
+SELECT dictGet('simple_key_direct_dictionary_01862', 'value', toUInt64(1)) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_direct_dictionary_01862';
+SELECT dictGet('simple_key_direct_dictionary_01862', 'value', toUInt64(2)) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_direct_dictionary_01862';
+
+DROP DICTIONARY simple_key_direct_dictionary_01862;
+
+-- simple hashed
+DROP DICTIONARY IF EXISTS simple_key_hashed_dictionary_01862;
+CREATE DICTIONARY simple_key_hashed_dictionary_01862
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+LAYOUT(HASHED())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_hashed_dictionary_01862';
+SELECT dictGet('simple_key_hashed_dictionary_01862', 'value', toUInt64(1)) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_hashed_dictionary_01862';
+SELECT dictGet('simple_key_hashed_dictionary_01862', 'value', toUInt64(2)) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_hashed_dictionary_01862';
+
+DROP DICTIONARY simple_key_hashed_dictionary_01862;
+
+-- simple sparse_hashed
+DROP DICTIONARY IF EXISTS simple_key_sparse_hashed_dictionary_01862;
+CREATE DICTIONARY simple_key_sparse_hashed_dictionary_01862
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+LAYOUT(SPARSE_HASHED())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_sparse_hashed_dictionary_01862';
+SELECT dictGet('simple_key_sparse_hashed_dictionary_01862', 'value', toUInt64(1)) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_sparse_hashed_dictionary_01862';
+SELECT dictGet('simple_key_sparse_hashed_dictionary_01862', 'value', toUInt64(2)) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_sparse_hashed_dictionary_01862';
+
+DROP DICTIONARY simple_key_sparse_hashed_dictionary_01862;
+
+-- simple cache
+DROP DICTIONARY IF EXISTS simple_key_cache_dictionary_01862;
+CREATE DICTIONARY simple_key_cache_dictionary_01862
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+LAYOUT(CACHE(SIZE_IN_CELLS 100000))
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_cache_dictionary_01862';
+SELECT toUInt64(1) as key, dictGet('simple_key_cache_dictionary_01862', 'value', key) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_cache_dictionary_01862';
+SELECT toUInt64(2) as key, dictGet('simple_key_cache_dictionary_01862', 'value', key) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_cache_dictionary_01862';
+
+DROP DICTIONARY simple_key_cache_dictionary_01862;
+
+DROP TABLE simple_key_source_table_01862;
+
+--
+-- Complex key
+--
+
+DROP TABLE IF EXISTS complex_key_source_table_01862;
+CREATE TABLE complex_key_source_table_01862
+(
+    id UInt64,
+    id_key String,
+    value String
+) ENGINE = Memory();
+
+INSERT INTO complex_key_source_table_01862 VALUES (1, 'FirstKey', 'First');
+INSERT INTO complex_key_source_table_01862 VALUES (1, 'FirstKey', 'First');
+
+-- complex hashed
+DROP DICTIONARY IF EXISTS complex_key_hashed_dictionary_01862;
+CREATE DICTIONARY complex_key_hashed_dictionary_01862
+(
+    id UInt64,
+    id_key String,
+    value String
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'complex_key_source_table_01862'))
+LAYOUT(COMPLEX_KEY_HASHED())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_hashed_dictionary_01862';
+SELECT dictGet('complex_key_hashed_dictionary_01862', 'value', (toUInt64(1), 'FirstKey')) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_hashed_dictionary_01862';
+SELECT dictGet('complex_key_hashed_dictionary_01862', 'value', (toUInt64(2), 'FirstKey')) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_hashed_dictionary_01862';
+
+DROP DICTIONARY complex_key_hashed_dictionary_01862;
+
+-- complex direct
+DROP DICTIONARY IF EXISTS complex_key_direct_dictionary_01862;
+CREATE DICTIONARY complex_key_direct_dictionary_01862
+(
+    id UInt64,
+    id_key String,
+    value String
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'complex_key_source_table_01862'))
+LAYOUT(COMPLEX_KEY_DIRECT());
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_direct_dictionary_01862';
+SELECT dictGet('complex_key_direct_dictionary_01862', 'value', (toUInt64(1), 'FirstKey')) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_direct_dictionary_01862';
+SELECT dictGet('complex_key_direct_dictionary_01862', 'value', (toUInt64(2), 'FirstKey')) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_direct_dictionary_01862';
+
+DROP DICTIONARY complex_key_direct_dictionary_01862;
+
+-- complex cache
+DROP DICTIONARY IF EXISTS complex_key_cache_dictionary_01862;
+CREATE DICTIONARY complex_key_cache_dictionary_01862
+(
+    id UInt64,
+    id_key String,
+    value String
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'complex_key_source_table_01862'))
+LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 100000))
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_cache_dictionary_01862';
+SELECT dictGet('complex_key_cache_dictionary_01862', 'value', (toUInt64(1), 'FirstKey')) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_cache_dictionary_01862';
+SELECT dictGet('complex_key_cache_dictionary_01862', 'value', (toUInt64(2), 'FirstKey')) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_cache_dictionary_01862';
+
+DROP DICTIONARY complex_key_cache_dictionary_01862;
+
+DROP TABLE complex_key_source_table_01862;
+
+--
+-- Range
+--
+DROP TABLE IF EXISTS range_key_source_table_01862;
+CREATE TABLE range_key_source_table_01862
+(
+    id UInt64,
+    value String,
+    first Date,
+    last Date
+) ENGINE = Memory();
+
+INSERT INTO range_key_source_table_01862 VALUES (1, 'First', today(), today());
+INSERT INTO range_key_source_table_01862 VALUES (1, 'First', today(), today());
+
+-- simple range_hashed
+DROP DICTIONARY IF EXISTS simple_key_range_hashed_dictionary_01862;
+CREATE DICTIONARY simple_key_range_hashed_dictionary_01862
+(
+    id UInt64,
+    value String,
+    first Date,
+    last Date
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'range_key_source_table_01862'))
+LAYOUT(RANGE_HASHED())
+RANGE(MIN first MAX last)
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_range_hashed_dictionary_01862';
+SELECT dictGet('simple_key_range_hashed_dictionary_01862', 'value', toUInt64(1), today()) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_range_hashed_dictionary_01862';
+SELECT dictGet('simple_key_range_hashed_dictionary_01862', 'value', toUInt64(2), today()) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'simple_key_range_hashed_dictionary_01862';
+
+DROP DICTIONARY simple_key_range_hashed_dictionary_01862;
+
+DROP TABLE range_key_source_table_01862;
+
+--
+-- IP Trie
+--
+DROP TABLE IF EXISTS ip_trie_source_table_01862;
+CREATE TABLE ip_trie_source_table_01862
+(
+    prefix String,
+    value String
+) ENGINE = Memory();
+
+INSERT INTO ip_trie_source_table_01862 VALUES ('127.0.0.0/8', 'First');
+INSERT INTO ip_trie_source_table_01862 VALUES ('127.0.0.0/8', 'First');
+
+-- ip_trie
+DROP DICTIONARY IF EXISTS ip_trie_dictionary_01862;
+CREATE DICTIONARY ip_trie_dictionary_01862
+(
+    prefix String,
+    value String
+)
+PRIMARY KEY prefix
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'ip_trie_source_table_01862'))
+LAYOUT(IP_TRIE())
+LIFETIME(MIN 0 MAX 1000);
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'ip_trie_dictionary_01862';
+SELECT dictGet('ip_trie_dictionary_01862', 'value', tuple(toIPv4('127.0.0.1'))) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'ip_trie_dictionary_01862';
+SELECT dictGet('ip_trie_dictionary_01862', 'value', tuple(toIPv4('1.1.1.1'))) FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'ip_trie_dictionary_01862';
+
+DROP DICTIONARY ip_trie_dictionary_01862;
+
+DROP TABLE ip_trie_source_table_01862;
+
+-- Polygon
+DROP TABLE IF EXISTS polygons_01862;
+CREATE TABLE polygons_01862 (
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String
+) ENGINE = Memory;
+INSERT INTO polygons_01862 VALUES ([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'Click East');
+INSERT INTO polygons_01862 VALUES ([[[(-1, 1), (1, 1), (1, 3), (-1, 3)]]], 'Click North');
+INSERT INTO polygons_01862 VALUES ([[[(-3, 1), (-3, -1), (0, -1), (0, 1)]]], 'Click South');
+INSERT INTO polygons_01862 VALUES ([[[(-1, -1), (1, -1), (1, -3), (-1, -3)]]], 'Click West');
+
+DROP TABLE IF EXISTS points_01862;
+CREATE TABLE points_01862 (x Float64, y Float64) ENGINE = Memory;
+INSERT INTO points_01862 VALUES ( 0.1,  0.0);
+INSERT INTO points_01862 VALUES (-0.1,  0.0);
+INSERT INTO points_01862 VALUES ( 0.0,  1.1);
+INSERT INTO points_01862 VALUES ( 0.0, -1.1);
+INSERT INTO points_01862 VALUES ( 3.0,  3.0);
+
+DROP DICTIONARY IF EXISTS polygon_dictionary_01862;
+CREATE DICTIONARY polygon_dictionary_01862
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'polygons_01862'))
+LIFETIME(0)
+LAYOUT(POLYGON());
+
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'polygon_dictionary_01862';
+SELECT tuple(x, y) as key, dictGet('polygon_dictionary_01862', 'name', key) FROM points_01862 FORMAT Null;
+SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'polygon_dictionary_01862';
+
+DROP TABLE polygons_01862;
+DROP TABLE points_01862;
diff --git a/tests/queries/0_stateless/01852_hints_enum_name.reference b/tests/queries/0_stateless/01852_hints_enum_name.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/01852_hints_enum_name.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/01852_hints_enum_name.sh b/tests/queries/0_stateless/01852_hints_enum_name.sh
new file mode 100755
index 00000000000..1e7d09602e9
--- /dev/null
+++ b/tests/queries/0_stateless/01852_hints_enum_name.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_CLIENT --query="SELECT CAST('Helo' AS Enum('Hello' = 1, 'World' = 2))" 2>&1 | grep -q -F "maybe you meant: ['Hello']" && echo 'OK' || echo 'FAIL'
+
diff --git a/tests/queries/0_stateless/01852_jit_if.reference b/tests/queries/0_stateless/01852_jit_if.reference
new file mode 100644
index 00000000000..907ee5cd66d
--- /dev/null
+++ b/tests/queries/0_stateless/01852_jit_if.reference
@@ -0,0 +1,7 @@
+test_jit_nonnull
+0	0	0
+1	2	1
+test_jit_nullable
+0	0	0
+1	2	1
+\N	0	0
diff --git a/tests/queries/0_stateless/01852_jit_if.sql b/tests/queries/0_stateless/01852_jit_if.sql
new file mode 100644
index 00000000000..cdfeba5b895
--- /dev/null
+++ b/tests/queries/0_stateless/01852_jit_if.sql
@@ -0,0 +1,16 @@
+SET compile_expressions = 1;
+SET min_count_to_compile_expression = 0;
+
+DROP TABLE IF EXISTS test_jit_nonnull;
+CREATE TABLE test_jit_nonnull (value UInt8) ENGINE = TinyLog;
+INSERT INTO test_jit_nonnull VALUES (0), (1);
+
+SELECT 'test_jit_nonnull';
+SELECT value, multiIf(value = 1, 2, value, 1, 0), if (value, 1, 0) FROM test_jit_nonnull;
+
+DROP TABLE IF EXISTS test_jit_nullable;
+CREATE TABLE test_jit_nullable (value Nullable(UInt8)) ENGINE = TinyLog;
+INSERT INTO test_jit_nullable VALUES (0), (1), (NULL);
+
+SELECT 'test_jit_nullable';
+SELECT value, multiIf(value = 1, 2, value, 1, 0), if (value, 1, 0) FROM test_jit_nullable;
diff --git a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.reference b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
new file mode 100755
index 00000000000..a585785d710
--- /dev/null
+++ b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+function run_test_once()
+{
+    $CLICKHOUSE_CLIENT -nm -q "
+        DROP TABLE IF EXISTS simple_key_source_table_01863;
+        CREATE TABLE simple_key_source_table_01863
+        (
+            id UInt64,
+            value String
+        ) ENGINE = TinyLog();
+
+        INSERT INTO simple_key_source_table_01863 VALUES (1, 'First');
+        INSERT INTO simple_key_source_table_01863 VALUES (1, 'First');
+
+        CREATE DICTIONARY simple_key_cache_dictionary_01863
+        (
+            id UInt64,
+            value String
+        )
+        PRIMARY KEY id
+        SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01863'))
+        LAYOUT(CACHE(SIZE_IN_CELLS 100000))
+        LIFETIME(MIN 0 MAX 1000);
+    "
+
+    prev=$($CLICKHOUSE_CLIENT -nm -q "SELECT value FROM system.events WHERE event = 'DictCacheKeysRequestedMiss' SETTINGS system_events_show_zero_values=1")
+    curr=$($CLICKHOUSE_CLIENT -nm -q "
+        SELECT toUInt64(1) as key, dictGet('simple_key_cache_dictionary_01863', 'value', key) FORMAT Null;
+        SELECT value FROM system.events WHERE event = 'DictCacheKeysRequestedMiss' SETTINGS system_events_show_zero_values=1
+    ")
+
+    $CLICKHOUSE_CLIENT -nm -q "
+        DROP DICTIONARY simple_key_cache_dictionary_01863;
+    "
+
+    if [ "$prev" == "$curr" ]; then
+        echo OK
+        return 0
+    fi
+    return 1
+}
+function main()
+{
+    # 200 retries since we look at global event DictCacheKeysRequestedMiss
+    # NOTE: there is 100 runs of the particular test under flaky check
+    for _ in {1..200}; do
+        run_test_once && break
+    done
+}
+main "$@"
diff --git a/tests/queries/0_stateless/01854_HTTP_dict_decompression.python b/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
new file mode 100644
index 00000000000..98581a1e47c
--- /dev/null
+++ b/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
@@ -0,0 +1,168 @@
+#!/usr/bin/env python3
+
+from http.server import SimpleHTTPRequestHandler,HTTPServer
+import socket
+import csv
+import sys
+import tempfile
+import threading
+import os
+import gzip
+import traceback
+import urllib.request
+import subprocess
+import lzma
+
+def get_local_port(host):
+    with socket.socket() as fd:
+        fd.bind((host, 0))
+        return fd.getsockname()[1]
+
+CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
+CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
+
+#####################################################################################
+# This test starts an HTTP server and serves data to clickhouse url-engine based table.
+# The main goal of this test is checking that compress methods are working.
+# In order for it to work ip+port of http server (given below) should be
+# accessible from clickhouse server.
+#####################################################################################
+
+# IP-address of this host accessible from outside world.
+HTTP_SERVER_HOST = subprocess.check_output(['hostname', '-i']).decode('utf-8').strip()
+HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST)
+
+# 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) + "/"
+
+# Because we need to check 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"
+
+
+# Choose compression method 
+# (Will change during test, need to check standart data sending, to make sure that nothing broke)
+COMPRESS_METHOD = 'none'
+ADDING_ENDING = ''
+ENDINGS = ['.gz', '.xz']
+SEND_ENCODING = True
+
+def get_ch_answer(query):
+    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()
+
+def check_answers(query, answer):
+    ch_answer = get_ch_answer(query)
+    if ch_answer.strip() != answer.strip():
+        print("FAIL on query:", query, file=sys.stderr)
+        print("Expected answer:", answer, file=sys.stderr)
+        print("Fetched answer :", ch_answer, file=sys.stderr)
+        raise Exception("Fail on query")
+
+# Server with head method which is useful for debuging by hands
+class HttpProcessor(SimpleHTTPRequestHandler):
+    def _set_headers(self):
+        self.send_response(200)
+        if SEND_ENCODING:
+            self.send_header('Content-Encoding', COMPRESS_METHOD)
+        if COMPRESS_METHOD == 'none':
+            self.send_header('Content-Length', len(CSV_DATA.encode()))
+        else:
+            self.compress_data()
+            self.send_header('Content-Length', len(self.data))
+        self.send_header('Content-Type', 'text/csv')
+        self.end_headers()
+
+    def do_HEAD(self):
+        self._set_headers()
+        return
+
+    def compress_data(self):
+        if COMPRESS_METHOD == 'gzip':
+            self.data = gzip.compress((CSV_DATA).encode())
+        elif COMPRESS_METHOD == 'lzma':
+            self.data = lzma.compress((CSV_DATA).encode())
+        else:
+            self.data = 'WRONG CONVERSATION'.encode()
+
+
+    def do_GET(self):
+        self._set_headers()
+    
+        if COMPRESS_METHOD == 'none':
+            self.wfile.write(CSV_DATA.encode())
+        else:
+            self.wfile.write(self.data)
+        return
+
+    def log_message(self, format, *args):
+        return
+
+def start_server(requests_amount):
+    httpd = HTTPServer(HTTP_SERVER_ADDRESS, HttpProcessor)
+
+    def real_func():
+        for i in range(requests_amount):
+            httpd.handle_request()
+
+    t = threading.Thread(target=real_func)
+    return t
+
+#####################################################################
+# Testing area.
+#####################################################################
+
+def test_select(dict_name="", schema="word String, counter UInt32", requests=[], answers=[], test_data=""):
+    global ADDING_ENDING
+    global SEND_ENCODING
+    global COMPRESS_METHOD
+    for i in range(len(requests)):
+        if i > 2:
+            ADDING_ENDING = ENDINGS[i-3]
+            SEND_ENCODING = False
+        
+        if dict_name:
+            get_ch_answer("drop dictionary if exists {}".format(dict_name))
+            get_ch_answer('''CREATE DICTIONARY {} ({})
+            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))
+
+        COMPRESS_METHOD = requests[i]
+        print(i, COMPRESS_METHOD, ADDING_ENDING, SEND_ENCODING)
+        check_answers("select * from {}".format(dict_name), answers[i])
+
+def main():
+    # first three for encoding, second three for url
+    insert_requests = [
+            'none',
+            'gzip',
+            'lzma',
+            'gzip',
+            'lzma'
+    ]
+
+    # This answers got experemently in non compressed mode and they are correct
+    answers = ['''This	152\nHello	1\nis	9283\ndata	555\nWorld	2\ntesting	2313213'''] * 5
+
+    t = start_server(len(insert_requests))
+    t.start()
+    test_select(dict_name="test_table_select", requests=insert_requests, answers=answers)
+    t.join()
+    print("PASSED")
+
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except Exception as ex:
+        exc_type, exc_value, exc_traceback = sys.exc_info()
+        traceback.print_tb(exc_traceback, file=sys.stderr)
+        print(ex, file=sys.stderr)
+        sys.stderr.flush()
+
+        os._exit(1)
+
+
diff --git a/tests/queries/0_stateless/01854_HTTP_dict_decompression.reference b/tests/queries/0_stateless/01854_HTTP_dict_decompression.reference
new file mode 100644
index 00000000000..61bde4a9736
--- /dev/null
+++ b/tests/queries/0_stateless/01854_HTTP_dict_decompression.reference
@@ -0,0 +1,6 @@
+0 none  True
+1 gzip  True
+2 lzma  True
+3 gzip .gz False
+4 lzma .xz False
+PASSED
diff --git a/tests/queries/0_stateless/01854_HTTP_dict_decompression.sh b/tests/queries/0_stateless/01854_HTTP_dict_decompression.sh
new file mode 100755
index 00000000000..cca710e85cf
--- /dev/null
+++ b/tests/queries/0_stateless/01854_HTTP_dict_decompression.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
+
+python3 "$CURDIR"/01854_HTTP_dict_decompression.python
diff --git a/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.reference b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.reference
new file mode 100644
index 00000000000..e69de29bb2d
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
new file mode 100644
index 00000000000..f6a9d6aa25c
--- /dev/null
+++ b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
@@ -0,0 +1,11 @@
+DROP DICTIONARY IF EXISTS dict_01864;
+CREATE DICTIONARY dict_01864
+(
+    `id` UInt64,
+    `value` String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'does_not_exists'))
+LIFETIME(MIN 0 MAX 1000)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN first MAX last) -- { serverError 489 }
diff --git a/tests/queries/0_stateless/01855_jit_comparison_constant_result.reference b/tests/queries/0_stateless/01855_jit_comparison_constant_result.reference
new file mode 100644
index 00000000000..e97edac16d6
--- /dev/null
+++ b/tests/queries/0_stateless/01855_jit_comparison_constant_result.reference
@@ -0,0 +1,14 @@
+ComparisionOperator column with same column
+1
+1
+1
+1
+1
+1
+ComparisionOperator column with alias on same column
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/01855_jit_comparison_constant_result.sql b/tests/queries/0_stateless/01855_jit_comparison_constant_result.sql
new file mode 100644
index 00000000000..51cf9aa1d17
--- /dev/null
+++ b/tests/queries/0_stateless/01855_jit_comparison_constant_result.sql
@@ -0,0 +1,36 @@
+SET compile_expressions = 1;
+SET min_count_to_compile_expression = 0;
+
+SELECT 'ComparisionOperator column with same column';
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table (a UInt64) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO test_table VALUES (1);
+
+SELECT test_table.a FROM test_table ORDER BY (test_table.a > test_table.a) + 1;
+SELECT test_table.a FROM test_table ORDER BY (test_table.a >= test_table.a) + 1;
+
+SELECT test_table.a FROM test_table ORDER BY (test_table.a < test_table.a) + 1;
+SELECT test_table.a FROM test_table ORDER BY (test_table.a <= test_table.a) + 1;
+
+SELECT test_table.a FROM test_table ORDER BY (test_table.a == test_table.a) + 1;
+SELECT test_table.a FROM test_table ORDER BY (test_table.a != test_table.a) + 1;
+
+DROP TABLE test_table;
+
+SELECT 'ComparisionOperator column with alias on same column';
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table (a UInt64, b ALIAS a, c ALIAS b) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO test_table VALUES (1);
+
+SELECT test_table.a FROM test_table ORDER BY (test_table.a > test_table.b) + 1 AND (test_table.a > test_table.c) + 1;
+SELECT test_table.a FROM test_table ORDER BY (test_table.a >= test_table.b) + 1 AND (test_table.a >= test_table.c) + 1;
+
+SELECT test_table.a FROM test_table ORDER BY (test_table.a < test_table.b) + 1 AND (test_table.a < test_table.c) + 1;
+SELECT test_table.a FROM test_table ORDER BY (test_table.a <= test_table.b) + 1 AND (test_table.a <= test_table.c) + 1;
+
+SELECT test_table.a FROM test_table ORDER BY (test_table.a == test_table.b) + 1 AND (test_table.a == test_table.c) + 1;
+SELECT test_table.a FROM test_table ORDER BY (test_table.a != test_table.b) + 1 AND (test_table.a != test_table.c) + 1;
+
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.reference b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.reference
new file mode 100644
index 00000000000..fa0301316ae
--- /dev/null
+++ b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.reference
@@ -0,0 +1,18 @@
+1	1
+2	1
+1	1
+2	1
+2	1
+3	1
+2	1
+3	1
+1	1
+2	1
+1	1
+2	1
+1
+2
+1
+2
+1	1
+2	1
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
new file mode 100644
index 00000000000..91215fd8ee6
--- /dev/null
+++ b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
@@ -0,0 +1,16 @@
+-- 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;
+
+SELECT _shard_num + 1, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num + 1 ORDER BY _shard_num + 1;
+SELECT _shard_num + 1 s, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num + 1 ORDER BY _shard_num + 1;
+
+SELECT _shard_num + dummy, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num + dummy ORDER BY _shard_num + dummy;
+SELECT _shard_num + dummy s, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num + dummy ORDER BY _shard_num + dummy;
+
+SELECT _shard_num FROM remote('127.0.0.{1,2}', system.one) ORDER BY _shard_num;
+SELECT _shard_num s FROM remote('127.0.0.{1,2}', system.one) ORDER BY _shard_num;
+
+SELECT _shard_num s, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY s order by s;
+
+select materialize(_shard_num), * from remote('127.{1,2}', system.one) limit 1 by dummy format Null;
diff --git a/tests/queries/0_stateless/01861_explain_pipeline.reference b/tests/queries/0_stateless/01861_explain_pipeline.reference
new file mode 100644
index 00000000000..9d62fb9f6b8
--- /dev/null
+++ b/tests/queries/0_stateless/01861_explain_pipeline.reference
@@ -0,0 +1,25 @@
+(Expression)
+ExpressionTransform
+  (SettingQuotaAndLimits)
+    (ReadFromMergeTree)
+    ExpressionTransform
+      ReplacingSorted 2 → 1
+        ExpressionTransform × 2
+          MergeTree × 2 0 → 1
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+(Expression)
+ExpressionTransform × 2
+  (SettingQuotaAndLimits)
+    (ReadFromMergeTree)
+    ExpressionTransform × 2
+      ReplacingSorted × 2 2 → 1
+        Copy × 2 1 → 2
+          AddingSelector × 2
+            ExpressionTransform × 2
+              MergeTree × 2 0 → 1
diff --git a/tests/queries/0_stateless/01861_explain_pipeline.sql b/tests/queries/0_stateless/01861_explain_pipeline.sql
new file mode 100644
index 00000000000..aafecf57af1
--- /dev/null
+++ b/tests/queries/0_stateless/01861_explain_pipeline.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS test;
+CREATE TABLE test(a Int, b Int) Engine=ReplacingMergeTree order by a;
+INSERT INTO test select number, number from numbers(5);
+INSERT INTO test select number, number from numbers(5,2);
+set max_threads =1;
+explain pipeline select * from test final;
+select * from test final;
+set max_threads =2;
+explain pipeline select * from test final;
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/01865_aggregator_overflow_row.reference b/tests/queries/0_stateless/01865_aggregator_overflow_row.reference
new file mode 100644
index 00000000000..b6cfb5c6eee
--- /dev/null
+++ b/tests/queries/0_stateless/01865_aggregator_overflow_row.reference
@@ -0,0 +1,12 @@
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+
+10020
diff --git a/tests/queries/0_stateless/01865_aggregator_overflow_row.sql b/tests/queries/0_stateless/01865_aggregator_overflow_row.sql
new file mode 100644
index 00000000000..bd7e431ec13
--- /dev/null
+++ b/tests/queries/0_stateless/01865_aggregator_overflow_row.sql
@@ -0,0 +1,20 @@
+SELECT uniqCombined(number)
+FROM numbers(10000)
+GROUP BY number
+    WITH TOTALS
+ORDER BY number DESC
+LIMIT 10
+SETTINGS
+    /* force aggregates serialization to trigger the issue with */
+    max_bytes_before_external_group_by=1,
+    /* overflow row: */
+    max_rows_to_group_by=10000000000,
+    group_by_overflow_mode='any',
+    totals_mode='before_having',
+    /* this is to account memory under 4MB (for max_bytes_before_external_group_by) to use less rows */
+    max_untracked_memory=0,
+    group_by_two_level_threshold=10000,
+    /* explicitly */
+    max_block_size=1000,
+    max_threads=1
+;
diff --git a/tests/queries/0_stateless/01866_aggregate_function_segment_length_sum.reference b/tests/queries/0_stateless/01866_aggregate_function_segment_length_sum.reference
new file mode 100644
index 00000000000..17448ee4ac3
--- /dev/null
+++ b/tests/queries/0_stateless/01866_aggregate_function_segment_length_sum.reference
@@ -0,0 +1,6 @@
+a	5	UInt64
+b	8	UInt64
+c	3	UInt64
+a	1	Float64
+a	7201	UInt64
+a	7	UInt64
diff --git a/tests/queries/0_stateless/01866_aggregate_function_segment_length_sum.sql b/tests/queries/0_stateless/01866_aggregate_function_segment_length_sum.sql
new file mode 100644
index 00000000000..c4e4f8afa85
--- /dev/null
+++ b/tests/queries/0_stateless/01866_aggregate_function_segment_length_sum.sql
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS segment;
+DROP TABLE IF EXISTS fl_segment;
+DROP TABLE IF EXISTS dt_segment;
+DROP TABLE IF EXISTS date_segment;
+
+CREATE TABLE segment ( `id` String, `start` Int64, `end` Int64 ) ENGINE = MergeTree ORDER BY start;
+INSERT INTO segment VALUES ('a', 1, 3), ('a', 1, 3), ('a', 2, 4), ('a', 1, 1), ('a', 5, 6), ('a', 5, 7), ('b', 10, 12), ('b', 13, 19), ('b', 14, 16), ('c', -1, 1), ('c', -2, -1);
+
+CREATE TABLE fl_segment ( `id` String, `start` Float, `end` Float ) ENGINE = MergeTree ORDER BY start;
+INSERT INTO fl_segment VALUES ('a', 1.1, 3.2), ('a', 1.5, 3.6), ('a', 4.0, 5.0);
+
+CREATE TABLE dt_segment ( `id` String, `start` DateTime, `end` DateTime ) ENGINE = MergeTree ORDER BY start;
+INSERT INTO dt_segment VALUES ('a', '2020-01-01 02:11:22', '2020-01-01 03:12:31'), ('a', '2020-01-01 01:12:30', '2020-01-01 02:50:11');
+
+CREATE TABLE date_segment ( `id` String, `start` Date, `end` Date ) ENGINE = MergeTree ORDER BY start;
+INSERT INTO date_segment VALUES ('a', '2020-01-01', '2020-01-04'), ('a', '2020-01-03', '2020-01-08 02:50:11');
+
+SELECT id, segmentLengthSum(start, end), toTypeName(segmentLengthSum(start, end)) FROM segment GROUP BY id ORDER BY id;
+SELECT id, 3.4 < segmentLengthSum(start, end) AND segmentLengthSum(start, end) < 3.6, toTypeName(segmentLengthSum(start, end)) FROM fl_segment GROUP BY id ORDER BY id;
+SELECT id, segmentLengthSum(start, end), toTypeName(segmentLengthSum(start, end)) FROM dt_segment GROUP BY id ORDER BY id;
+SELECT id, segmentLengthSum(start, end), toTypeName(segmentLengthSum(start, end)) FROM date_segment GROUP BY id ORDER BY id;
+
+DROP TABLE segment;
+DROP TABLE fl_segment;
+DROP TABLE dt_segment;
+DROP TABLE date_segment;
diff --git a/tests/queries/0_stateless/01866_datetime64_cmp_with_constant.reference b/tests/queries/0_stateless/01866_datetime64_cmp_with_constant.reference
new file mode 100644
index 00000000000..db516fa83d4
--- /dev/null
+++ b/tests/queries/0_stateless/01866_datetime64_cmp_with_constant.reference
@@ -0,0 +1,12 @@
+dt64 <= const dt
+dt64 <= dt
+dt <= const dt64
+dt <= dt64
+dt64 = const dt
+dt64 = dt
+dt = const dt64
+dt = dt64
+dt64 >= const dt
+dt64 >= dt
+dt >= const dt64
+dt >= dt64
diff --git a/tests/queries/0_stateless/01866_datetime64_cmp_with_constant.sql b/tests/queries/0_stateless/01866_datetime64_cmp_with_constant.sql
new file mode 100644
index 00000000000..e6782656887
--- /dev/null
+++ b/tests/queries/0_stateless/01866_datetime64_cmp_with_constant.sql
@@ -0,0 +1,40 @@
+CREATE TABLE dt64test
+(
+    `dt64_column` DateTime64(3),
+    `dt_column` DateTime DEFAULT toDateTime(dt64_column)
+)
+ENGINE = MergeTree
+PARTITION BY toYYYYMM(dt64_column)
+ORDER BY dt64_column;
+
+INSERT INTO dt64test (`dt64_column`) VALUES ('2020-01-13 13:37:00');
+
+SELECT 'dt64 < const dt' FROM dt64test WHERE dt64_column < toDateTime('2020-01-13 13:37:00');
+SELECT 'dt64 < dt' FROM dt64test WHERE dt64_column < materialize(toDateTime('2020-01-13 13:37:00'));
+SELECT 'dt < const dt64' FROM dt64test WHERE dt_column < toDateTime64('2020-01-13 13:37:00', 3);
+SELECT 'dt < dt64' FROM dt64test WHERE dt_column < materialize(toDateTime64('2020-01-13 13:37:00', 3));
+
+SELECT 'dt64 <= const dt' FROM dt64test WHERE dt64_column <= toDateTime('2020-01-13 13:37:00');
+SELECT 'dt64 <= dt' FROM dt64test WHERE dt64_column <= materialize(toDateTime('2020-01-13 13:37:00'));
+SELECT 'dt <= const dt64' FROM dt64test WHERE dt_column <= toDateTime64('2020-01-13 13:37:00', 3);
+SELECT 'dt <= dt64' FROM dt64test WHERE dt_column <= materialize(toDateTime64('2020-01-13 13:37:00', 3));
+
+SELECT 'dt64 = const dt' FROM dt64test WHERE dt64_column = toDateTime('2020-01-13 13:37:00');
+SELECT 'dt64 = dt' FROM dt64test WHERE dt64_column = materialize(toDateTime('2020-01-13 13:37:00'));
+SELECT 'dt = const dt64' FROM dt64test WHERE dt_column = toDateTime64('2020-01-13 13:37:00', 3);
+SELECT 'dt = dt64' FROM dt64test WHERE dt_column = materialize(toDateTime64('2020-01-13 13:37:00', 3));
+
+SELECT 'dt64 >= const dt' FROM dt64test WHERE dt64_column >= toDateTime('2020-01-13 13:37:00');
+SELECT 'dt64 >= dt' FROM dt64test WHERE dt64_column >= materialize(toDateTime('2020-01-13 13:37:00'));
+SELECT 'dt >= const dt64' FROM dt64test WHERE dt_column >= toDateTime64('2020-01-13 13:37:00', 3);
+SELECT 'dt >= dt64' FROM dt64test WHERE dt_column >= materialize(toDateTime64('2020-01-13 13:37:00', 3));
+
+SELECT 'dt64 > const dt' FROM dt64test WHERE dt64_column > toDateTime('2020-01-13 13:37:00');
+SELECT 'dt64 > dt' FROM dt64test WHERE dt64_column > materialize(toDateTime('2020-01-13 13:37:00'));
+SELECT 'dt > const dt64' FROM dt64test WHERE dt_column > toDateTime64('2020-01-13 13:37:00', 3);
+SELECT 'dt > dt64' FROM dt64test WHERE dt_column > materialize(toDateTime64('2020-01-13 13:37:00', 3));
+
+SELECT 'dt64 != const dt' FROM dt64test WHERE dt64_column != toDateTime('2020-01-13 13:37:00');
+SELECT 'dt64 != dt' FROM dt64test WHERE dt64_column != materialize(toDateTime('2020-01-13 13:37:00'));
+SELECT 'dt != const dt64' FROM dt64test WHERE dt_column != toDateTime64('2020-01-13 13:37:00', 3);
+SELECT 'dt != dt64' FROM dt64test WHERE dt_column != materialize(toDateTime64('2020-01-13 13:37:00', 3));
diff --git a/tests/queries/0_stateless/01866_split_by_regexp.reference b/tests/queries/0_stateless/01866_split_by_regexp.reference
new file mode 100644
index 00000000000..a3ae2f35a5f
--- /dev/null
+++ b/tests/queries/0_stateless/01866_split_by_regexp.reference
@@ -0,0 +1,7 @@
+['a','ba','ba','b']
+['a','ba','ba','b']
+['a','b','c','d','e']
+['','hello','world','','']
+['gbye','bug']
+['']
+[]
diff --git a/tests/queries/0_stateless/01866_split_by_regexp.sql b/tests/queries/0_stateless/01866_split_by_regexp.sql
new file mode 100644
index 00000000000..e472fb68d94
--- /dev/null
+++ b/tests/queries/0_stateless/01866_split_by_regexp.sql
@@ -0,0 +1,5 @@
+select splitByRegexp('\\d+', x) from (select arrayJoin(['a1ba5ba8b', 'a11ba5689ba891011b']) x);
+select splitByRegexp('', 'abcde');
+select splitByRegexp('<[^<>]*>', x) from (select arrayJoin(['<h1>hello<h2>world</h2></h1>', 'gbye<split>bug']) x);
+select splitByRegexp('ab', '');
+select splitByRegexp('', '');
diff --git a/tests/queries/0_stateless/01867_fix_storage_memory_mutation.reference b/tests/queries/0_stateless/01867_fix_storage_memory_mutation.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01867_fix_storage_memory_mutation.sql b/tests/queries/0_stateless/01867_fix_storage_memory_mutation.sql
new file mode 100644
index 00000000000..4cb80036d73
--- /dev/null
+++ b/tests/queries/0_stateless/01867_fix_storage_memory_mutation.sql
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS mem_test;
+
+CREATE TABLE mem_test
+(
+    `a` Int64,
+    `b` Int64
+)
+ENGINE = Memory;
+
+SET max_block_size = 3;
+
+INSERT INTO mem_test SELECT
+    number,
+    number
+FROM numbers(100);
+
+ALTER TABLE mem_test
+    UPDATE a = 0 WHERE b = 99;
+ALTER TABLE mem_test
+    UPDATE a = 0 WHERE b = 99;
+ALTER TABLE mem_test
+    UPDATE a = 0 WHERE b = 99;
+ALTER TABLE mem_test
+    UPDATE a = 0 WHERE b = 99;
+ALTER TABLE mem_test
+    UPDATE a = 0 WHERE b = 99;
+
+SELECT *
+FROM mem_test
+FORMAT Null;
+
+DROP TABLE mem_test;
diff --git a/tests/queries/0_stateless/01867_support_datetime64_version_column.reference b/tests/queries/0_stateless/01867_support_datetime64_version_column.reference
new file mode 100644
index 00000000000..3a6dbdc870c
--- /dev/null
+++ b/tests/queries/0_stateless/01867_support_datetime64_version_column.reference
@@ -0,0 +1,3 @@
+1	1970-01-01 08:25:46.300800003	a1
+2	1970-01-01 08:25:46.300800005	a1
+3	1970-01-01 08:25:46.300800005	c1
diff --git a/tests/queries/0_stateless/01867_support_datetime64_version_column.sql b/tests/queries/0_stateless/01867_support_datetime64_version_column.sql
new file mode 100644
index 00000000000..f4427be635a
--- /dev/null
+++ b/tests/queries/0_stateless/01867_support_datetime64_version_column.sql
@@ -0,0 +1,16 @@
+drop table if exists replacing;
+create table replacing(    `A` Int64,    `D` DateTime64(9),    `S` String)    ENGINE = ReplacingMergeTree(D) ORDER BY A;
+
+insert into replacing values (1,'1970-01-01 08:25:46.300800000','a');
+insert into replacing values (2,'1970-01-01 08:25:46.300800002','b');
+insert into replacing values (1,'1970-01-01 08:25:46.300800003','a1');
+insert into replacing values (1,'1970-01-01 08:25:46.300800002','a2');
+insert into replacing values (2,'1970-01-01 08:25:46.300800004','b1');
+insert into replacing values (3,'1970-01-01 08:25:46.300800005','c1');
+insert into replacing values (2,'1970-01-01 08:25:46.300800005','a1');
+
+OPTIMIZE TABLE replacing FINAL;
+
+select * from replacing;
+
+drop table replacing;
diff --git a/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.reference b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.reference
new file mode 100644
index 00000000000..1b3a86ea2c4
--- /dev/null
+++ b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.reference
@@ -0,0 +1,14 @@
+1970-01-01 03:16:40.000	original
+1970-01-01 03:33:20.000	
+1970-01-01 03:50:00.000	
+1970-01-01 04:06:40.000	original
+1970-01-01 04:23:20.000	
+1970-01-01 04:40:00.000	
+1970-01-01 04:56:40.000	original
+1970-01-01 03:16:40.000000000	original
+1970-01-01 03:33:20.000000000	
+1970-01-01 03:50:00.000000000	
+1970-01-01 04:06:40.000000000	original
+1970-01-01 04:23:20.000000000	
+1970-01-01 04:40:00.000000000	
+1970-01-01 04:56:40.000000000	original
diff --git a/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.sql b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.sql
new file mode 100644
index 00000000000..ff3134d37ed
--- /dev/null
+++ b/tests/queries/0_stateless/01868_order_by_fill_with_datetime64.sql
@@ -0,0 +1,2 @@
+SELECT n, source FROM (SELECT  toDateTime64(number * 1000, 3,'Europe/Moscow') AS n, 'original' AS source  FROM numbers(10)  WHERE (number % 3) = 1 ) ORDER BY n ASC WITH FILL STEP toDateTime64(1000, 3);
+SELECT n, source FROM (SELECT  toDateTime64(number * 1000, 9,'Europe/Moscow') AS n, 'original' AS source  FROM numbers(10)  WHERE (number % 3) = 1 ) ORDER BY n ASC WITH FILL STEP toDateTime64(1000, 9);
diff --git a/tests/queries/0_stateless/01869_function_modulo_legacy.reference b/tests/queries/0_stateless/01869_function_modulo_legacy.reference
new file mode 100644
index 00000000000..f6c9a31de37
--- /dev/null
+++ b/tests/queries/0_stateless/01869_function_modulo_legacy.reference
@@ -0,0 +1,2 @@
+199
+57
diff --git a/tests/queries/0_stateless/01869_function_modulo_legacy.sql b/tests/queries/0_stateless/01869_function_modulo_legacy.sql
new file mode 100644
index 00000000000..66e2edddd0c
--- /dev/null
+++ b/tests/queries/0_stateless/01869_function_modulo_legacy.sql
@@ -0,0 +1,2 @@
+SELECT moduloLegacy(199, 200);
+SELECT moduloLegacy(-199, 200);
diff --git a/tests/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.reference b/tests/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.reference
new file mode 100644
index 00000000000..d9ca990623e
--- /dev/null
+++ b/tests/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.reference
@@ -0,0 +1 @@
+E711B35C04C4F061A0DBD36A00A67B90
diff --git a/tests/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.sql b/tests/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.sql
new file mode 100644
index 00000000000..f6cf90c372c
--- /dev/null
+++ b/tests/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.sql
@@ -0,0 +1 @@
+SELECT hex(reinterpretAsFixedString(toUUID('61f0c404-5cb3-11e7-907b-a6006ad3dba0')));
diff --git a/tests/queries/0_stateless/01870_buffer_flush.reference b/tests/queries/0_stateless/01870_buffer_flush.reference
new file mode 100644
index 00000000000..fd3306644d5
--- /dev/null
+++ b/tests/queries/0_stateless/01870_buffer_flush.reference
@@ -0,0 +1,2 @@
+0
+5
diff --git a/tests/queries/0_stateless/01870_buffer_flush.sql b/tests/queries/0_stateless/01870_buffer_flush.sql
new file mode 100644
index 00000000000..55ec79325dc
--- /dev/null
+++ b/tests/queries/0_stateless/01870_buffer_flush.sql
@@ -0,0 +1,26 @@
+-- Check that Buffer will be flushed before shutdown
+-- (via DETACH DATABASE)
+
+drop database if exists db_01870;
+create database db_01870;
+
+-- Right now the order for shutdown is defined and it is:
+-- (prefixes are important, to define the order)
+-- - a_data_01870
+-- - z_buffer_01870
+-- so on DETACH DATABASE the following error will be printed:
+--
+--     Destination table default.a_data_01870 doesn't exist. Block of data is discarded.
+create table db_01870.a_data_01870 as system.numbers Engine=TinyLog();
+create table db_01870.z_buffer_01870 as system.numbers Engine=Buffer(db_01870, a_data_01870, 1,
+    100, 100, /* time */
+    100, 100, /* rows */
+    100, 1e6  /* bytes */
+);
+insert into db_01870.z_buffer_01870 select * from system.numbers limit 5;
+select count() from db_01870.a_data_01870;
+detach database db_01870;
+attach database db_01870;
+select count() from db_01870.a_data_01870;
+
+drop database db_01870;
diff --git a/tests/queries/0_stateless/01870_modulo_partition_key.reference b/tests/queries/0_stateless/01870_modulo_partition_key.reference
new file mode 100644
index 00000000000..51c629e0a50
--- /dev/null
+++ b/tests/queries/0_stateless/01870_modulo_partition_key.reference
@@ -0,0 +1,130 @@
+simple partition key:
+-61
+-60
+-59
+-58
+-57
+-5
+-4
+-3
+-2
+-1
+0
+0
+1
+2
+3
+4
+57
+58
+59
+60
+where id % 200 = +-2:
+-202
+202
+where id % 200 > 0:
+195
+196
+197
+198
+199
+201
+202
+203
+204
+where id % 200 < 0:
+-205
+-204
+-203
+-202
+-201
+-199
+-198
+-197
+-196
+tuple as partition key:
+(-1,-1)
+(-1,0)
+(-2,-2)
+(-2,-3)
+(-2,59)
+(-2,60)
+(0,-4)
+(0,-5)
+(0,-57)
+(0,-58)
+(0,4)
+(0,57)
+(0,58)
+(1,-61)
+(1,0)
+(1,1)
+(2,-59)
+(2,-60)
+(2,2)
+(2,3)
+recursive modulo partition key:
+(-1,-1,0)
+(-2,-2,-1)
+(-3,-3,-2)
+(-4,-4,-2)
+(-5,-5,-2)
+(-57,-7,-28)
+(-58,-8,-29)
+(-59,-9,-30)
+(-60,0,-30)
+(-61,-1,-30)
+(0,0,0)
+(0,0,0)
+(1,1,0)
+(2,2,1)
+(3,3,2)
+(4,4,2)
+(57,7,28)
+(58,8,29)
+(59,9,30)
+(60,0,30)
+After detach:
+(-1,-1,0)
+(-2,-2,-1)
+(-3,-3,-2)
+(-4,-4,-2)
+(-5,-5,-2)
+(-57,-7,-28)
+(-58,-8,-29)
+(-59,-9,-30)
+(-60,0,-30)
+(-61,-1,-30)
+(0,0,0)
+(0,0,0)
+(1,1,0)
+(2,2,1)
+(3,3,2)
+(4,4,2)
+(57,7,28)
+(58,8,29)
+(59,9,30)
+(60,0,30)
+Indexes:
+100
+comparison:
+0	-205	-5	-5
+1	-204	-4	-4
+2	-203	-3	-3
+3	-202	-2	-2
+4	-201	-1	-1
+5	-200	0	0
+6	-199	-199	57
+7	-198	-198	58
+8	-197	-197	59
+9	-196	-196	60
+400	195	195	-61
+401	196	196	-60
+402	197	197	-59
+403	198	198	-58
+404	199	199	-57
+405	200	0	0
+406	201	1	1
+407	202	2	2
+408	203	3	3
+409	204	4	4
diff --git a/tests/queries/0_stateless/01870_modulo_partition_key.sql b/tests/queries/0_stateless/01870_modulo_partition_key.sql
new file mode 100644
index 00000000000..344b32659a8
--- /dev/null
+++ b/tests/queries/0_stateless/01870_modulo_partition_key.sql
@@ -0,0 +1,50 @@
+SELECT 'simple partition key:';
+DROP TABLE IF EXISTS table1 SYNC;
+CREATE TABLE table1 (id Int64, v UInt64)
+ENGINE = ReplicatedReplacingMergeTree('/clickhouse/test/tables/table12', '1', v)
+PARTITION BY id % 200 ORDER BY id;
+INSERT INTO table1 SELECT number-205, number FROM numbers(10);
+INSERT INTO table1 SELECT number-205, number FROM numbers(400, 10);
+SELECT toInt64(partition) as p FROM system.parts WHERE table='table1' and database=currentDatabase() ORDER BY p;
+
+select 'where id % 200 = +-2:';
+select id from table1 where id % 200 = 2 OR id % 200 = -2 order by id;
+select 'where id % 200 > 0:';
+select id from table1 where id % 200 > 0 order by id;
+select 'where id % 200 < 0:';
+select id from table1 where id % 200 < 0 order by id;
+
+SELECT 'tuple as partition key:';
+DROP TABLE IF EXISTS table2;
+CREATE TABLE table2 (id Int64, v UInt64)
+ENGINE = MergeTree()
+PARTITION BY (toInt32(id / 2) % 3, id % 200) ORDER BY id;
+INSERT INTO table2 SELECT number-205, number FROM numbers(10);
+INSERT INTO table2 SELECT number-205, number FROM numbers(400, 10);
+SELECT partition as p FROM system.parts WHERE table='table2' and database=currentDatabase() ORDER BY p;
+
+SELECT 'recursive modulo partition key:';
+DROP TABLE IF EXISTS table3;
+CREATE TABLE table3 (id Int64, v UInt64)
+ENGINE = MergeTree()
+PARTITION BY (id % 200, (id % 200) % 10, toInt32(round((id % 200) / 2, 0))) ORDER BY id;
+INSERT INTO table3 SELECT number-205, number FROM numbers(10);
+INSERT INTO table3 SELECT number-205, number FROM numbers(400, 10);
+SELECT partition as p FROM system.parts WHERE table='table3' and database=currentDatabase() ORDER BY p;
+
+DETACH TABLE table3;
+ATTACH TABLE table3;
+SELECT 'After detach:';
+SELECT partition as p FROM system.parts WHERE table='table3' and database=currentDatabase() ORDER BY p;
+
+SELECT 'Indexes:';
+DROP TABLE IF EXISTS table4;
+CREATE TABLE table4 (id Int64, v UInt64, s String,
+INDEX a (id * 2, s) TYPE minmax GRANULARITY 3
+) ENGINE = MergeTree() PARTITION BY id % 10 ORDER BY v;
+INSERT INTO table4 SELECT number, number, toString(number) FROM numbers(1000);
+SELECT count() FROM table4 WHERE id % 10 = 7;
+
+SELECT 'comparison:';
+SELECT v, v-205 as vv, modulo(vv, 200), moduloLegacy(vv, 200) FROM table1 ORDER BY v;
+
diff --git a/tests/queries/0_stateless/01871_merge_tree_compile_expressions.reference b/tests/queries/0_stateless/01871_merge_tree_compile_expressions.reference
new file mode 100644
index 00000000000..a6905f8ba44
--- /dev/null
+++ b/tests/queries/0_stateless/01871_merge_tree_compile_expressions.reference
@@ -0,0 +1 @@
+999
diff --git a/tests/queries/0_stateless/01871_merge_tree_compile_expressions.sql b/tests/queries/0_stateless/01871_merge_tree_compile_expressions.sql
new file mode 100644
index 00000000000..ea1e26b1f00
--- /dev/null
+++ b/tests/queries/0_stateless/01871_merge_tree_compile_expressions.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS data_01875_1;
+DROP TABLE IF EXISTS data_01875_2;
+DROP TABLE IF EXISTS data_01875_3;
+
+SET compile_expressions=true;
+
+-- CREATE TABLE will use global profile with default min_count_to_compile_expression=3
+-- so retry 3 times
+CREATE TABLE data_01875_1 Engine=MergeTree ORDER BY number PARTITION BY bitShiftRight(number, 8) + 1 AS SELECT * FROM numbers(16384);
+CREATE TABLE data_01875_2 Engine=MergeTree ORDER BY number PARTITION BY bitShiftRight(number, 8) + 1 AS SELECT * FROM numbers(16384);
+CREATE TABLE data_01875_3 Engine=MergeTree ORDER BY number PARTITION BY bitShiftRight(number, 8) + 1 AS SELECT * FROM numbers(16384);
+
+SELECT number FROM data_01875_3 WHERE number = 999;
+
+DROP TABLE data_01875_1;
+DROP TABLE data_01875_2;
+DROP TABLE data_01875_3;
diff --git a/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.reference b/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.reference
new file mode 100644
index 00000000000..a52505659d1
--- /dev/null
+++ b/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.reference
@@ -0,0 +1,114 @@
+# select * from system.one a
+SELECT *
+FROM system.one AS a
+# /* oneline */ select * from system.one a
+SELECT * FROM system.one AS a
+# select * from (select * from system.one) b, system.one a
+SELECT *
+FROM
+(
+    SELECT *
+    FROM system.one
+) AS b, system.one AS a
+# /* oneline */ select * from (select * from system.one) b, system.one a
+SELECT * FROM (SELECT * FROM system.one) AS b, system.one AS a
+# select * from system.one a, (select * from system.one) b, system.one c
+SELECT *
+FROM system.one AS a,
+(
+    SELECT *
+    FROM system.one
+) AS b, system.one AS c
+# /* oneline */ select * from system.one a, (select * from system.one) b, system.one c
+SELECT * FROM system.one AS a, (SELECT * FROM system.one) AS b, system.one AS c
+# select * from system.one a, (select * from system.one) b, system.one c, (select * from system.one) d
+SELECT *
+FROM system.one AS a,
+(
+    SELECT *
+    FROM system.one
+) AS b, system.one AS c,
+(
+    SELECT *
+    FROM system.one
+) AS d
+# /* oneline */ select * from system.one a, (select * from system.one) b, system.one c, (select * from system.one) d
+SELECT * FROM system.one AS a, (SELECT * FROM system.one) AS b, system.one AS c, (SELECT * FROM system.one) AS d
+# select * from system.one union all select * from system.one
+SELECT *
+FROM system.one
+UNION ALL
+SELECT *
+FROM system.one
+# /* oneline */ select * from system.one union all select * from system.one
+SELECT * FROM system.one UNION ALL SELECT * FROM system.one
+# select * from system.one union all (select * from system.one)
+SELECT *
+FROM system.one
+UNION ALL
+SELECT *
+FROM system.one
+# /* oneline */ select * from system.one union all (select * from system.one)
+SELECT * FROM system.one UNION ALL SELECT * FROM system.one
+# select 1 union all (select 1 union distinct select 1)
+SELECT 1
+UNION ALL
+(
+    SELECT 1
+    UNION DISTINCT
+    SELECT 1
+)
+# /* oneline */ select 1 union all (select 1 union distinct select 1)
+SELECT 1 UNION ALL (SELECT 1 UNION DISTINCT SELECT 1)
+# select * from system.one array join arr as row
+SELECT *
+FROM system.one
+ARRAY JOIN arr AS row
+# /* oneline */ select * from system.one array join arr as row
+SELECT * FROM system.one ARRAY JOIN arr AS row
+# select 1 in 1
+SELECT 1 IN (1)
+# /* oneline */ select 1 in 1
+SELECT 1 IN (1)
+# select 1 in (select 1)
+SELECT 1 IN (
+        SELECT 1
+    )
+# /* oneline */ select 1 in (select 1)
+SELECT 1 IN (SELECT 1)
+# select 1 in f(1)
+SELECT 1 IN f(1)
+# /* oneline */ select 1 in f(1)
+SELECT 1 IN f(1)
+# select 1 in ((select 1) as sub)
+SELECT 1 IN ((
+        SELECT 1
+    ) AS sub)
+# /* oneline */ select 1 in ((select 1) as sub)
+SELECT 1 IN ((SELECT 1) AS sub)
+# with it as ( select * from numbers(1) ) select it.number, i.number from it as i
+WITH it AS
+    (
+        SELECT *
+        FROM numbers(1)
+    )
+SELECT
+    it.number,
+    i.number
+FROM it AS i
+# /* oneline */ with it as ( select * from numbers(1) ) select it.number, i.number from it as i
+WITH it AS (SELECT * FROM numbers(1)) SELECT it.number, i.number FROM it AS i
+# SELECT x FROM ( SELECT 1 AS x UNION ALL ( SELECT 1 UNION ALL SELECT 1))
+SELECT x
+FROM
+(
+    SELECT 1 AS x
+    UNION ALL
+    (
+        SELECT 1
+        UNION ALL
+        SELECT 1
+    )
+)
+# /* oneline */ SELECT x FROM ( SELECT 1 AS x UNION ALL ( SELECT 1 UNION ALL SELECT 1))
+SELECT x FROM (SELECT 1 AS x UNION ALL (SELECT 1 UNION ALL SELECT 1))
diff --git a/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.sh b/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.sh
new file mode 100755
index 00000000000..f416ac33d69
--- /dev/null
+++ b/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+queries=(
+    "select * from system.one a"
+    "select * from (select * from system.one) b, system.one a"
+    "select * from system.one a, (select * from system.one) b, system.one c"
+    "select * from system.one a, (select * from system.one) b, system.one c, (select * from system.one) d"
+    "select * from system.one union all select * from system.one"
+    "select * from system.one union all (select * from system.one)"
+    "select 1 union all (select 1 union distinct select 1)"
+    "select * from system.one array join arr as row"
+    "select 1 in 1"
+    "select 1 in (select 1)"
+    "select 1 in f(1)"
+    "select 1 in ((select 1) as sub)"
+    "with it as ( select * from numbers(1) ) select it.number, i.number from it as i"
+    "SELECT x FROM ( SELECT 1 AS x UNION ALL ( SELECT 1 UNION ALL SELECT 1))"
+)
+for q in "${queries[@]}"; do
+    echo "# $q"
+    $CLICKHOUSE_FORMAT <<<"$q"
+    echo "# /* oneline */ $q"
+    $CLICKHOUSE_FORMAT --oneline <<<"$q"
+done
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
new file mode 100644
index 00000000000..9b3c41ac646
--- /dev/null
+++ b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.reference
@@ -0,0 +1,2 @@
+SSDCache dictionary
+5.00000
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
new file mode 100755
index 00000000000..51c47d4ad14
--- /dev/null
+++ b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
@@ -0,0 +1,35 @@
+#!/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}')
+
+$CLICKHOUSE_CLIENT -n --query="
+    SET allow_experimental_bigint_types = 1;
+
+    DROP TABLE IF EXISTS dictionary_decimal_source_table;
+    CREATE TABLE dictionary_decimal_source_table
+    (
+        id UInt64,
+        decimal_value Decimal256(5)
+    ) ENGINE = TinyLog;
+
+    INSERT INTO dictionary_decimal_source_table VALUES (1, 5.0);
+
+    DROP DICTIONARY IF EXISTS ssd_cache_dictionary;
+    CREATE DICTIONARY ssd_cache_dictionary
+    (
+        id UInt64,
+        decimal_value Decimal256(5)
+    )
+    PRIMARY KEY id
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'dictionary_decimal_source_table'))
+    LIFETIME(MIN 1 MAX 1000)
+    LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));
+
+    SELECT 'SSDCache dictionary';
+    SELECT dictGet('ssd_cache_dictionary', 'decimal_value', toUInt64(1));
+
+    DROP DICTIONARY ssd_cache_dictionary;"
diff --git a/tests/queries/0_stateless/01880_remote_ipv6.reference b/tests/queries/0_stateless/01880_remote_ipv6.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01880_remote_ipv6.sql b/tests/queries/0_stateless/01880_remote_ipv6.sql
new file mode 100644
index 00000000000..057b3ad7ec6
--- /dev/null
+++ b/tests/queries/0_stateless/01880_remote_ipv6.sql
@@ -0,0 +1,12 @@
+SET connections_with_failover_max_tries=0;
+
+SELECT * FROM remote('[::1]', system.one) FORMAT Null;
+SELECT * FROM remote('[::1]:9000', system.one) FORMAT Null;
+
+SELECT * FROM remote('[::1', system.one) FORMAT Null; -- { serverError 36 }
+SELECT * FROM remote('::1]', system.one) FORMAT Null; -- { serverError 36 }
+SELECT * FROM remote('::1', system.one) FORMAT Null; -- { serverError 36 }
+
+SELECT * FROM remote('[::1][::1]', system.one) FORMAT Null; -- { serverError 36 }
+SELECT * FROM remote('[::1][::1', system.one) FORMAT Null; -- { serverError 36 }
+SELECT * FROM remote('[::1]::1]', system.one) FORMAT Null; -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01881_create_as_tuple.reference b/tests/queries/0_stateless/01881_create_as_tuple.reference
new file mode 100644
index 00000000000..76109462c59
--- /dev/null
+++ b/tests/queries/0_stateless/01881_create_as_tuple.reference
@@ -0,0 +1,6 @@
+0	[('string',0)]
+1	[('string',1)]
+2	[('string',2)]
+0	[('string',0)]
+1	[('string',1)]
+2	[('string',2)]
diff --git a/tests/queries/0_stateless/01881_create_as_tuple.sql b/tests/queries/0_stateless/01881_create_as_tuple.sql
new file mode 100644
index 00000000000..cf370fe4633
--- /dev/null
+++ b/tests/queries/0_stateless/01881_create_as_tuple.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS t_create_as_tuple;
+
+CREATE TABLE t_create_as_tuple ENGINE = MergeTree()
+ORDER BY number AS
+SELECT number, [('string',number)] AS array FROM numbers(3);
+
+SELECT * FROM t_create_as_tuple ORDER BY number;
+
+DETACH TABLE t_create_as_tuple;
+ATTACH TABLE t_create_as_tuple;
+
+SELECT * FROM t_create_as_tuple ORDER BY number;
+
+DROP TABLE t_create_as_tuple;
diff --git a/tests/queries/0_stateless/01881_to_week_monotonic_fix.reference b/tests/queries/0_stateless/01881_to_week_monotonic_fix.reference
new file mode 100644
index 00000000000..c8139ded0dc
--- /dev/null
+++ b/tests/queries/0_stateless/01881_to_week_monotonic_fix.reference
@@ -0,0 +1,4 @@
+1	2020-11-11
+1	2021-01-01
+1	2020-11-11
+1	2021-01-01
diff --git a/tests/queries/0_stateless/01881_to_week_monotonic_fix.sql b/tests/queries/0_stateless/01881_to_week_monotonic_fix.sql
new file mode 100644
index 00000000000..c73a7909faf
--- /dev/null
+++ b/tests/queries/0_stateless/01881_to_week_monotonic_fix.sql
@@ -0,0 +1,11 @@
+drop table if exists test_tbl;
+
+create table test_tbl (vend_nm String, ship_dt Date) engine MergeTree partition by toWeek(ship_dt) order by vend_nm;
+
+insert into test_tbl values('1', '2020-11-11'), ('1', '2021-01-01');
+
+select * From test_tbl where ship_dt >= toDate('2020-11-01') and ship_dt <= toDate('2021-05-05') order by ship_dt;
+
+select * From test_tbl where ship_dt >= toDate('2020-01-01') and ship_dt <= toDate('2021-05-05') order by ship_dt;
+
+drop table test_tbl;
diff --git a/tests/queries/0_stateless/01881_total_bytes_storage_buffer.reference b/tests/queries/0_stateless/01881_total_bytes_storage_buffer.reference
new file mode 100644
index 00000000000..eaa9e9259df
--- /dev/null
+++ b/tests/queries/0_stateless/01881_total_bytes_storage_buffer.reference
@@ -0,0 +1,5 @@
+0
+8192
+32
+8192
+32
diff --git a/tests/queries/0_stateless/01881_total_bytes_storage_buffer.sql b/tests/queries/0_stateless/01881_total_bytes_storage_buffer.sql
new file mode 100644
index 00000000000..1fd9ea56e8f
--- /dev/null
+++ b/tests/queries/0_stateless/01881_total_bytes_storage_buffer.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS test_buffer_table;
+
+CREATE TABLE test_buffer_table
+(
+    `a` Int64
+)
+ENGINE = Buffer('', '', 1, 1000000, 1000000, 1000000, 1000000, 1000000, 1000000);
+
+SELECT total_bytes FROM system.tables WHERE name = 'test_buffer_table' and database = currentDatabase();
+
+INSERT INTO test_buffer_table SELECT number FROM numbers(1000);
+SELECT total_bytes FROM system.tables WHERE name = 'test_buffer_table' and database = currentDatabase();
+
+OPTIMIZE TABLE test_buffer_table;
+SELECT total_bytes FROM system.tables WHERE name = 'test_buffer_table' and database = currentDatabase();
+
+INSERT INTO test_buffer_table SELECT number FROM numbers(1000);
+SELECT total_bytes FROM system.tables WHERE name = 'test_buffer_table' and database = currentDatabase();
+
+OPTIMIZE TABLE test_buffer_table;
+SELECT total_bytes FROM system.tables WHERE name = 'test_buffer_table' and database = currentDatabase();
+
+DROP TABLE test_buffer_table;
diff --git a/tests/queries/0_stateless/01881_union_header_mismatch_bug.reference b/tests/queries/0_stateless/01881_union_header_mismatch_bug.reference
new file mode 100644
index 00000000000..fbec53380d2
--- /dev/null
+++ b/tests/queries/0_stateless/01881_union_header_mismatch_bug.reference
@@ -0,0 +1,11 @@
+table	10	101
+a	0
+a	1
+a	2
+a	3
+a	4
+b	0
+b	1
+b	2
+b	3
+b	4
diff --git a/tests/queries/0_stateless/01881_union_header_mismatch_bug.sql b/tests/queries/0_stateless/01881_union_header_mismatch_bug.sql
new file mode 100644
index 00000000000..9a220ffd49f
--- /dev/null
+++ b/tests/queries/0_stateless/01881_union_header_mismatch_bug.sql
@@ -0,0 +1,30 @@
+select *　from (　select 'table' as table, toInt64(10) as rows, toInt64(101) as elements　union all　select 'another table' as table, toInt64(0) as rows, toInt64(0) as elements　)　where rows - elements <> 0;
+
+SELECT
+    label,
+    number
+FROM
+(
+    SELECT
+        'a' AS label,
+        number
+    FROM
+    (
+        SELECT number
+        FROM numbers(10)
+    )
+    UNION ALL
+    SELECT
+        'b' AS label,
+        number
+    FROM
+    (
+        SELECT number
+        FROM numbers(10)
+    )
+)
+WHERE number IN
+(
+    SELECT number
+    FROM numbers(5)
+) order by label, number;
diff --git a/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference
new file mode 100644
index 00000000000..30a4d52afe1
--- /dev/null
+++ b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference
@@ -0,0 +1,2 @@
+100
+1
diff --git a/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql
new file mode 100644
index 00000000000..d6cde1ef7a8
--- /dev/null
+++ b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS limited_merge_table;
+
+SET max_threads = 1;
+SET max_block_size = 1;
+SET min_insert_block_size_rows = 1;
+
+CREATE TABLE limited_merge_table
+(
+    key UInt64
+)
+ENGINE = MergeTree()
+ORDER BY key
+SETTINGS max_parts_to_merge_at_once = 3;
+
+SYSTEM STOP MERGES limited_merge_table;
+
+INSERT INTO limited_merge_table SELECT number FROM numbers(100);
+
+SYSTEM START MERGES limited_merge_table;
+
+OPTIMIZE TABLE limited_merge_table FINAL;
+
+SYSTEM FLUSH LOGS;
+
+SELECT COUNT() FROM limited_merge_table;
+
+-- final optimize FINAL will merge all parts, but all previous merges must merge <= 3 parts.
+-- During concurrent run only one final merge can happen, thats why we have this `if`.
+SELECT if(length(topK(2)(length(merged_from))) == 2, arrayMin(topK(2)(length(merged_from))) <= 3, 1)
+FROM system.part_log WHERE table = 'limited_merge_table' and database = currentDatabase() and event_type = 'MergeParts';
+
+DROP TABLE IF EXISTS limited_merge_table;
diff --git a/tests/queries/0_stateless/01882_scalar_subquery_exception.reference b/tests/queries/0_stateless/01882_scalar_subquery_exception.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01882_scalar_subquery_exception.sql b/tests/queries/0_stateless/01882_scalar_subquery_exception.sql
new file mode 100644
index 00000000000..c7a4555d876
--- /dev/null
+++ b/tests/queries/0_stateless/01882_scalar_subquery_exception.sql
@@ -0,0 +1,16 @@
+drop table if exists nums_in_mem;
+drop table if exists nums_in_mem_dist;
+
+create table nums_in_mem(v UInt64) engine=Memory;
+insert into nums_in_mem select * from system.numbers limit 1000000;
+
+create table nums_in_mem_dist as nums_in_mem engine=Distributed('test_shard_localhost', currentDatabase(), nums_in_mem);
+
+set prefer_localhost_replica = 0;
+set max_rows_to_read = 100;
+
+select
+  count()
+    /
+  (select count() from nums_in_mem_dist where rand() > 0)
+from system.one; -- { serverError 158 }
diff --git a/tests/queries/0_stateless/01882_total_rows_approx.reference b/tests/queries/0_stateless/01882_total_rows_approx.reference
new file mode 100644
index 00000000000..7f2070fc9cb
--- /dev/null
+++ b/tests/queries/0_stateless/01882_total_rows_approx.reference
@@ -0,0 +1,8 @@
+Waiting for query to be started...
+Query started.
+Checking total_rows_approx.
+10
+10
+10
+10
+10
diff --git a/tests/queries/0_stateless/01882_total_rows_approx.sh b/tests/queries/0_stateless/01882_total_rows_approx.sh
new file mode 100755
index 00000000000..2c03298b324
--- /dev/null
+++ b/tests/queries/0_stateless/01882_total_rows_approx.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+# Check that total_rows_approx (via system.processes) includes all rows from
+# all parts at the query start.
+#
+# At some point total_rows_approx was accounted only when the query starts
+# reading the part, and so total_rows_approx wasn't reliable, even for simple
+# SELECT FROM MergeTree()
+# It was fixed by take total_rows_approx into account as soon as possible.
+#
+# To check total_rows_approx this query starts the query in background,
+# that sleep's 1 second for each part, and by using max_threads=1 the query
+# reads parts sequentially and sleeps 1 second between parts.
+# Also the test spawns background process to check total_rows_approx for this
+# query.
+# It checks multiple times since at first few iterations the query may not
+# start yet (since there are 3 excessive sleep calls - 1 for primary key
+# analysis and 2 for partition pruning), and get only last 5 total_rows_approx
+# rows (one row is not enough since when the query finishes total_rows_approx
+# will be set to 10 anyway, regardless proper accounting).
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "drop table if exists data_01882"
+$CLICKHOUSE_CLIENT -q "create table data_01882 (key Int) Engine=MergeTree() partition by key order by key as select * from numbers(10)"
+QUERY_ID="$CLICKHOUSE_TEST_NAME-$(tr -cd '[:lower:]' < /dev/urandom | head -c10)"
+
+function check_background_query()
+{
+    echo "Waiting for query to be started..."
+    while [[ $($CLICKHOUSE_CLIENT --param_query_id="$QUERY_ID" -q 'select count() from system.processes where query_id = {query_id:String}') != 1 ]]; do
+        sleep 0.01
+    done
+    echo "Query started."
+
+    echo "Checking total_rows_approx."
+    # check total_rows_approx multiple times
+    # (to make test more reliable to what it covers)
+    local i=0
+    for ((i = 0; i < 20; ++i)); do
+        $CLICKHOUSE_CLIENT --param_query_id="$QUERY_ID" -q 'select total_rows_approx from system.processes where query_id = {query_id:String}'
+        (( ++i ))
+        sleep 1
+    done | tail -n5
+}
+check_background_query &
+
+# this query will sleep 10 seconds in total, 1 seconds for each part (10 parts).
+$CLICKHOUSE_CLIENT -q "select *, sleepEachRow(1) from data_01882" --max_threads=1 --format Null --query_id="$QUERY_ID" --max_block_size=1
+
+wait
diff --git a/tests/queries/0_stateless/01883_subcolumns_distributed.reference b/tests/queries/0_stateless/01883_subcolumns_distributed.reference
new file mode 100644
index 00000000000..459f90ada98
--- /dev/null
+++ b/tests/queries/0_stateless/01883_subcolumns_distributed.reference
@@ -0,0 +1,2 @@
+3	0	bbb	ccc
+3	0	bbb	ccc
diff --git a/tests/queries/0_stateless/01883_subcolumns_distributed.sql b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
new file mode 100644
index 00000000000..5593dc60251
--- /dev/null
+++ b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS t_subcolumns_local;
+DROP TABLE IF EXISTS t_subcolumns_dist;
+
+CREATE TABLE t_subcolumns_local (arr Array(UInt32), n Nullable(String), t Tuple(s1 String, s2 String))
+ENGINE = MergeTree ORDER BY tuple();
+
+CREATE TABLE t_subcolumns_dist AS t_subcolumns_local ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), t_subcolumns_local);
+
+INSERT INTO t_subcolumns_local VALUES ([1, 2, 3], 'aaa', ('bbb', 'ccc'));
+
+SELECT arr.size0, n.null, t.s1, t.s2 FROM t_subcolumns_dist;
+
+DROP TABLE t_subcolumns_local;
+
+-- StripeLog doesn't support subcolumns.
+CREATE TABLE t_subcolumns_local (arr Array(UInt32), n Nullable(String), t Tuple(s1 String, s2 String)) ENGINE = StripeLog;
+
+SELECT arr.size0, n.null, t.s1, t.s2 FROM t_subcolumns_dist; -- { serverError 47 }
+
+DROP TABLE t_subcolumns_local;
+DROP TABLE t_subcolumns_dist;
diff --git a/tests/queries/0_stateless/01888_read_int_safe.reference b/tests/queries/0_stateless/01888_read_int_safe.reference
new file mode 100644
index 00000000000..94d36aad185
--- /dev/null
+++ b/tests/queries/0_stateless/01888_read_int_safe.reference
@@ -0,0 +1,2 @@
+1
+-1
diff --git a/tests/queries/0_stateless/01888_read_int_safe.sql b/tests/queries/0_stateless/01888_read_int_safe.sql
new file mode 100644
index 00000000000..3caa4878aba
--- /dev/null
+++ b/tests/queries/0_stateless/01888_read_int_safe.sql
@@ -0,0 +1,10 @@
+select toInt64('--1'); -- { serverError 72; }
+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(''); -- { serverError 32; }
+select toInt64('1');
+select toInt64('-1');
diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
index 1b333a6baec..a59c1a72a52 100644
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ b/tests/queries/0_stateless/arcadia_skip_list.txt
@@ -91,6 +91,7 @@
 01125_dict_ddl_cannot_add_column
 01129_dict_get_join_lose_constness
 01138_join_on_distributed_and_tmp
+01153_attach_mv_uuid
 01191_rename_dictionary
 01200_mutations_memory_consumption
 01211_optimize_skip_unused_shards_type_mismatch
@@ -223,4 +224,19 @@
 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
+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
diff --git a/tests/queries/0_stateless/data_parquet/alltypes_list.parquet b/tests/queries/0_stateless/data_parquet/alltypes_list.parquet
new file mode 100644
index 00000000000..40b9e6f4195
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/alltypes_list.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns b/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
new file mode 100644
index 00000000000..b633ca86bbf
--- /dev/null
+++ b/tests/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
@@ -0,0 +1 @@
+`a1` Array(Int8), `a2` Array(UInt8), `a3` Array(Int16), `a4` Array(UInt16), `a5` Array(Int32), `a6` Array(UInt32), `a7` Array(Int64), `a8` Array(UInt64), `a9` Array(String), `a10` Array(FixedString(4)), `a11` Array(Float32), `a12` Array(Float64), `a13` Array(Date), `a14` Array(Datetime), `a15` Array(Decimal(4, 2)), `a16` Array(Decimal(10, 2)), `a17` Array(Decimal(25, 2))
diff --git a/tests/queries/0_stateless/data_parquet/array_float.parquet b/tests/queries/0_stateless/data_parquet/array_float.parquet
new file mode 100755
index 00000000000..8eef101a478
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/array_float.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/array_float.parquet.columns b/tests/queries/0_stateless/data_parquet/array_float.parquet.columns
new file mode 100644
index 00000000000..19f950d2b77
--- /dev/null
+++ b/tests/queries/0_stateless/data_parquet/array_float.parquet.columns
@@ -0,0 +1 @@
+idx String, lst Array(Float32)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/array_int.parquet b/tests/queries/0_stateless/data_parquet/array_int.parquet
new file mode 100755
index 00000000000..eb613b9c2ff
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/array_int.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/array_int.parquet.columns b/tests/queries/0_stateless/data_parquet/array_int.parquet.columns
new file mode 100644
index 00000000000..3b9395715d7
--- /dev/null
+++ b/tests/queries/0_stateless/data_parquet/array_int.parquet.columns
@@ -0,0 +1 @@
+`idx` String, `lst` Array(Int32)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/array_string.parquet b/tests/queries/0_stateless/data_parquet/array_string.parquet
new file mode 100755
index 00000000000..556c15fda8c
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/array_string.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/array_string.parquet.columns b/tests/queries/0_stateless/data_parquet/array_string.parquet.columns
new file mode 100644
index 00000000000..67a7b6bc04d
--- /dev/null
+++ b/tests/queries/0_stateless/data_parquet/array_string.parquet.columns
@@ -0,0 +1 @@
+`idx` String, `lst` Array(String)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/data_parquet/list_columns.parquet.columns b/tests/queries/0_stateless/data_parquet/list_columns.parquet.columns
index 86745c2f074..1a488ee6e00 100644
--- a/tests/queries/0_stateless/data_parquet/list_columns.parquet.columns
+++ b/tests/queries/0_stateless/data_parquet/list_columns.parquet.columns
@@ -1 +1 @@
-`int64_list` Nullable(Int64), `utf8_list` Nullable(String)
+`int64_list` Array(Nullable(Int64)), `utf8_list` Array(Nullable(String))
diff --git a/tests/queries/0_stateless/data_parquet/nested_lists.parquet b/tests/queries/0_stateless/data_parquet/nested_lists.parquet
new file mode 100644
index 00000000000..0e9b9998ab6
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/nested_lists.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/nested_lists.parquet.columns b/tests/queries/0_stateless/data_parquet/nested_lists.parquet.columns
new file mode 100644
index 00000000000..c4ca4443236
--- /dev/null
+++ b/tests/queries/0_stateless/data_parquet/nested_lists.parquet.columns
@@ -0,0 +1 @@
+`a1` Array(Array(Array(UInt32))), `a2` Array(Array(Array(String))), `a3` Array(Array(Nullable(UInt32))), `a4` Array(Array(Nullable(String)))
diff --git a/tests/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns b/tests/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns
index 6d55d46dd5b..99310769309 100644
--- a/tests/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns
+++ b/tests/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns
@@ -1 +1 @@
-`a` Nullable(String), `b` Nullable(Int32)
+`a` Array(Array(Array(Nullable(String)))), `b` Nullable(Int32)
diff --git a/tests/queries/0_stateless/data_parquet/nullable_list.parquet b/tests/queries/0_stateless/data_parquet/nullable_list.parquet
new file mode 100644
index 00000000000..f42cf1beb46
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/nullable_list.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/nullable_list.parquet.columns b/tests/queries/0_stateless/data_parquet/nullable_list.parquet.columns
new file mode 100644
index 00000000000..2f308030da6
--- /dev/null
+++ b/tests/queries/0_stateless/data_parquet/nullable_list.parquet.columns
@@ -0,0 +1 @@
+`a1` Array(Nullable(UInt32)), `a2` Array(Nullable(String)), `a3` Array(Nullable(Decimal(4, 2)))
diff --git a/tests/queries/1_stateful/00031_array_enumerate_uniq.sql b/tests/queries/1_stateful/00031_array_enumerate_uniq.sql
index 1898fc20579..f0392a17024 100644
--- a/tests/queries/1_stateful/00031_array_enumerate_uniq.sql
+++ b/tests/queries/1_stateful/00031_array_enumerate_uniq.sql
@@ -1,5 +1,5 @@
 SELECT UserID, arrayEnumerateUniq(groupArray(SearchPhrase)) AS arr
-FROM 
+FROM
 (
     SELECT UserID, SearchPhrase
     FROM test.hits
diff --git a/tests/queries/1_stateful/00063_loyalty_joins.sql b/tests/queries/1_stateful/00063_loyalty_joins.sql
index 7713c65838c..1e7011ea909 100644
--- a/tests/queries/1_stateful/00063_loyalty_joins.sql
+++ b/tests/queries/1_stateful/00063_loyalty_joins.sql
@@ -23,7 +23,7 @@ ORDER BY loyalty ASC;
 SELECT
     loyalty, 
     count()
-FROM 
+FROM
 (
     SELECT UserID
     FROM test.hits
@@ -46,12 +46,12 @@ ORDER BY loyalty ASC;
 SELECT
     loyalty, 
     count()
-FROM 
+FROM
 (
     SELECT
         loyalty, 
         UserID
-    FROM 
+    FROM
     (
         SELECT UserID
         FROM test.hits
@@ -81,7 +81,7 @@ FROM test.hits ANY INNER JOIN
     SELECT
         UserID, 
         toInt8(if(yandex > google, yandex / (yandex + google), -google / (yandex + google)) * 10) AS loyalty
-    FROM 
+    FROM
     (
         SELECT
             UserID, 
diff --git a/tests/queries/1_stateful/00076_system_columns_bytes.sql b/tests/queries/1_stateful/00076_system_columns_bytes.sql
index 434054b6980..dc0858e3de6 100644
--- a/tests/queries/1_stateful/00076_system_columns_bytes.sql
+++ b/tests/queries/1_stateful/00076_system_columns_bytes.sql
@@ -1 +1,2 @@
+-- NOTE: database = currentDatabase() is not mandatory
 SELECT sum(data_compressed_bytes) > 0, sum(data_uncompressed_bytes) > 0, sum(marks_bytes) > 0 FROM system.columns;
diff --git a/tests/queries/1_stateful/00163_column_oriented_formats.reference b/tests/queries/1_stateful/00163_column_oriented_formats.reference
new file mode 100644
index 00000000000..cb20aca4392
--- /dev/null
+++ b/tests/queries/1_stateful/00163_column_oriented_formats.reference
@@ -0,0 +1,12 @@
+Parquet
+6b397d4643bc1f920f3eb8aa87ee180c  -
+7fe6d8c57ddc5fe37bbdcb7f73c5fa78  -
+d8746733270cbeff7ab3550c9b944fb6  -
+Arrow
+6b397d4643bc1f920f3eb8aa87ee180c  -
+7fe6d8c57ddc5fe37bbdcb7f73c5fa78  -
+d8746733270cbeff7ab3550c9b944fb6  -
+ORC
+6b397d4643bc1f920f3eb8aa87ee180c  -
+7fe6d8c57ddc5fe37bbdcb7f73c5fa78  -
+d8746733270cbeff7ab3550c9b944fb6  -
diff --git a/tests/queries/1_stateful/00163_column_oriented_formats.sh b/tests/queries/1_stateful/00163_column_oriented_formats.sh
new file mode 100755
index 00000000000..1363ccf3c00
--- /dev/null
+++ b/tests/queries/1_stateful/00163_column_oriented_formats.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
+
+
+FORMATS=('Parquet' 'Arrow' 'ORC')
+
+for format in "${FORMATS[@]}"
+do
+    echo $format
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS 00163_column_oriented SYNC"
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE 00163_column_oriented(ClientEventTime DateTime, MobilePhoneModel String, ClientIP6 FixedString(16)) ENGINE=File($format)"
+    $CLICKHOUSE_CLIENT -q "INSERT INTO 00163_column_oriented SELECT ClientEventTime, MobilePhoneModel, ClientIP6 FROM test.hits ORDER BY ClientEventTime, MobilePhoneModel, ClientIP6 LIMIT 100"
+    $CLICKHOUSE_CLIENT -q "SELECT ClientEventTime from 00163_column_oriented" | md5sum
+    $CLICKHOUSE_CLIENT -q "SELECT MobilePhoneModel from 00163_column_oriented" | md5sum
+    $CLICKHOUSE_CLIENT -q "SELECT ClientIP6 from 00163_column_oriented" | md5sum
+    $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS 00163_column_oriented SYNC"
+done
diff --git a/tests/queries/1_stateful/00164_quantileBfloat16.reference b/tests/queries/1_stateful/00164_quantileBfloat16.reference
new file mode 100644
index 00000000000..f0aaff5cef6
--- /dev/null
+++ b/tests/queries/1_stateful/00164_quantileBfloat16.reference
@@ -0,0 +1,40 @@
+1704509	1384
+732797	1336
+598875	1384
+792887	1336
+3807842	1336
+25703952	1336
+716829	1384
+59183	1336
+33010362	1336
+800784	1336
+1704509	[1296,1384,1840,1960,3696]
+732797	[1232,1336,1840,1944,3664]
+598875	[1232,1384,1840,1944,3536]
+792887	[1296,1336,1840,1888,3696]
+3807842	[1232,1336,1840,1936,2032]
+25703952	[1012,1336,1840,1944,3696]
+716829	[1232,1384,1840,1944,3696]
+59183	[316,1336,1840,2008,2032]
+33010362	[1232,1336,1840,1936,2032]
+800784	[1232,1336,1840,1928,2032]
+1704509	1384
+732797	1336
+598875	1384
+792887	1336
+3807842	1336
+25703952	1336
+716829	1384
+59183	1336
+33010362	1336
+800784	1336
+1704509	[1296,1384,1840,1960,3696]
+732797	[1232,1336,1840,1944,3664]
+598875	[1232,1384,1840,1944,3536]
+792887	[1296,1336,1840,1888,3696]
+3807842	[1232,1336,1840,1936,2032]
+25703952	[1012,1336,1840,1944,3696]
+716829	[1232,1384,1840,1944,3696]
+59183	[316,1336,1840,2008,2032]
+33010362	[1232,1336,1840,1936,2032]
+800784	[1232,1336,1840,1928,2032]
diff --git a/tests/queries/1_stateful/00164_quantileBfloat16.sql b/tests/queries/1_stateful/00164_quantileBfloat16.sql
new file mode 100644
index 00000000000..b39bae3803c
--- /dev/null
+++ b/tests/queries/1_stateful/00164_quantileBfloat16.sql
@@ -0,0 +1,6 @@
+SELECT CounterID AS k, quantileBFloat16(0.5)(ResolutionWidth) FROM test.hits GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
+SELECT CounterID AS k, quantilesBFloat16(0.1, 0.5, 0.9, 0.99, 0.999)(ResolutionWidth) FROM test.hits GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
+
+
+SELECT CounterID AS k, quantileBFloat16(0.5)(ResolutionWidth) FROM remote('127.0.0.{1,2}', test.hits) GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
+SELECT CounterID AS k, quantilesBFloat16(0.1, 0.5, 0.9, 0.99, 0.999)(ResolutionWidth) FROM remote('127.0.0.{1,2}', test.hits) GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
diff --git a/tests/queries/query_test.py b/tests/queries/query_test.py
index b747ac2944e..6ebeccbeeac 100644
--- a/tests/queries/query_test.py
+++ b/tests/queries/query_test.py
@@ -1,5 +1,3 @@
-import pytest
-
 import difflib
 import os
 import random
@@ -7,6 +5,8 @@ import string
 import subprocess
 import sys
 
+import pytest
+
 
 SKIP_LIST = [
     # these couple of tests hangs everything
@@ -14,44 +14,63 @@ SKIP_LIST = [
     "00987_distributed_stack_overflow",
 
     # just fail
+    "00133_long_shard_memory_tracker_and_exception_safety",
     "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",
+    "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",
     "01114_database_atomic",
     "01148_zookeeper_path_macros_unfolding",
+    "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_system_distribution_queue",  # FLAKY
     "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
     "01320_create_sync_race_condition_zookeeper",
     "01355_CSV_input_format_allow_errors",
     "01370_client_autocomplete_word_break_characters",  # expect-test
@@ -66,18 +85,33 @@ SKIP_LIST = [
     "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",
     "01599_multiline_input_and_singleline_comments",  # expect-test
     "01601_custom_tld",
+    "01606_git_import",
     "01610_client_spawn_editor",  # expect-test
+    "01658_read_file_to_stringcolumn",
+    "01666_merge_tree_max_query_limit",
+    "01674_unicode_asan",
     "01676_clickhouse_client_autocomplete",  # expect-test (partially)
     "01683_text_log_deadlock",  # secure tcp
+    "01684_ssd_cache_dictionary_simple_key",
+    "01685_ssd_cache_dictionary_complex_key",
+    "01746_executable_pool_dictionary",
+    "01747_executable_pool_dictionary_implicit_key",
+    "01747_join_view_filter_dictionary",
+    "01748_dictionary_table_dot",
+    "01754_cluster_all_replicas_shard_num",
+    "01759_optimize_skip_unused_shards_zero_shards",
 ]
 
 
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index 5b942a95d02..ea7fa2e7921 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -23,14 +23,21 @@ export CLICKHOUSE_TEST_ZOOKEEPER_PREFIX="${CLICKHOUSE_TEST_NAME}_${CLICKHOUSE_DA
 [ -v CLICKHOUSE_LOG_COMMENT ] && CLICKHOUSE_BENCHMARK_OPT0+=" --log_comment='${CLICKHOUSE_LOG_COMMENT}' "
 
 export CLICKHOUSE_BINARY=${CLICKHOUSE_BINARY:="clickhouse"}
+# client
 [ -x "$CLICKHOUSE_BINARY-client" ] && CLICKHOUSE_CLIENT_BINARY=${CLICKHOUSE_CLIENT_BINARY:=$CLICKHOUSE_BINARY-client}
 [ -x "$CLICKHOUSE_BINARY" ] && CLICKHOUSE_CLIENT_BINARY=${CLICKHOUSE_CLIENT_BINARY:=$CLICKHOUSE_BINARY client}
 export CLICKHOUSE_CLIENT_BINARY=${CLICKHOUSE_CLIENT_BINARY:=$CLICKHOUSE_BINARY-client}
 export CLICKHOUSE_CLIENT_OPT="${CLICKHOUSE_CLIENT_OPT0:-} ${CLICKHOUSE_CLIENT_OPT:-}"
 export CLICKHOUSE_CLIENT=${CLICKHOUSE_CLIENT:="$CLICKHOUSE_CLIENT_BINARY ${CLICKHOUSE_CLIENT_OPT:-}"}
+# local
 [ -x "${CLICKHOUSE_BINARY}-local" ] && CLICKHOUSE_LOCAL=${CLICKHOUSE_LOCAL:="${CLICKHOUSE_BINARY}-local"}
 [ -x "${CLICKHOUSE_BINARY}" ] && CLICKHOUSE_LOCAL=${CLICKHOUSE_LOCAL:="${CLICKHOUSE_BINARY} local"}
 export CLICKHOUSE_LOCAL=${CLICKHOUSE_LOCAL:="${CLICKHOUSE_BINARY}-local"}
+# server
+[ -x "${CLICKHOUSE_BINARY}-server" ] && CLICKHOUSE_SERVER_BINARY=${CLICKHOUSE_SERVER_BINARY:="${CLICKHOUSE_BINARY}-server"}
+[ -x "${CLICKHOUSE_BINARY}" ] && CLICKHOUSE_SERVER_BINARY=${CLICKHOUSE_SERVER_BINARY:="${CLICKHOUSE_BINARY} server"}
+export CLICKHOUSE_SERVER_BINARY=${CLICKHOUSE_SERVER_BINARY:="${CLICKHOUSE_BINARY}-server"}
+# others
 export CLICKHOUSE_OBFUSCATOR=${CLICKHOUSE_OBFUSCATOR:="${CLICKHOUSE_BINARY}-obfuscator"}
 export CLICKHOUSE_COMPRESSOR=${CLICKHOUSE_COMPRESSOR:="${CLICKHOUSE_BINARY}-compressor"}
 export CLICKHOUSE_BENCHMARK=${CLICKHOUSE_BENCHMARK:="${CLICKHOUSE_BINARY}-benchmark ${CLICKHOUSE_BENCHMARK_OPT0:-}"}
@@ -63,6 +70,8 @@ export CLICKHOUSE_PORT_HTTPS=${CLICKHOUSE_PORT_HTTPS:="8443"}
 export CLICKHOUSE_PORT_HTTP_PROTO=${CLICKHOUSE_PORT_HTTP_PROTO:="http"}
 export CLICKHOUSE_PORT_MYSQL=${CLICKHOUSE_PORT_MYSQL:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=mysql_port 2>/dev/null)} 2>/dev/null
 export CLICKHOUSE_PORT_MYSQL=${CLICKHOUSE_PORT_MYSQL:="9004"}
+export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:=$(${CLICKHOUSE_EXTRACT_CONFIG} --try --key=postgresql_port 2>/dev/null)} 2>/dev/null
+export CLICKHOUSE_PORT_POSTGRESQL=${CLICKHOUSE_PORT_POSTGRESQL:="9005"}
 
 # Add database and log comment to url params
 if [ -v CLICKHOUSE_URL_PARAMS ]
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index 4759fb95602..d3fec057c2a 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -105,9 +105,11 @@
         "00604_show_create_database",
         "00609_mv_index_in_in",
         "00510_materizlized_view_and_deduplication_zookeeper",
-        "00738_lock_for_inner_table"
+        "00738_lock_for_inner_table",
+        "01153_attach_mv_uuid"
     ],
     "database-replicated": [
+        /// Unclassified
         "memory_tracking",
         "memory_usage",
         "live_view",
@@ -148,6 +150,7 @@
         "00626_replace_partition_from_table",
         "00152_insert_different_granularity",
         "00054_merge_tree_partitions",
+        "01781_merge_tree_deduplication",
         /// Old syntax is not allowed
         "01062_alter_on_mutataion_zookeeper",
         "00925_zookeeper_empty_replicated_merge_tree_optimize_final",
@@ -165,6 +168,8 @@
         /// Does not support renaming of multiple tables in single query
         "00634_rename_view",
         "00140_rename",
+        /// Requires investigation
+        "00953_zookeeper_suetin_deduplication_bug",
         "01783_http_chunk_size"
     ],
     "polymorphic-parts": [
@@ -269,6 +274,7 @@
         "01145_with_fill_const",
         "01149_zookeeper_mutation_stuck_after_replace_partition",
         "01150_ddl_guard_rwr",
+        "01155_old_mutation_parts_to_do",
         "01185_create_or_replace_table",
         "01187_set_profile_as_setting",
         "01188_attach_table_from_path",
@@ -346,6 +352,7 @@
         "01508_partition_pruning_long",
         "01509_check_parallel_quorum_inserts_long",
         "01509_parallel_quorum_and_merge_long",
+        "01509_dictionary_preallocate",
         "01515_mv_and_array_join_optimisation_bag",
         "01516_create_table_primary_key",
         "01517_drop_mv_with_inner_table",
@@ -389,7 +396,17 @@
         "01655_plan_optimizations",
         "01475_read_subcolumns_storages",
         "01674_clickhouse_client_query_param_cte",
-        "01666_merge_tree_max_query_limit"
+        "01666_merge_tree_max_query_limit",
+        "01786_explain_merge_tree",
+        "01666_merge_tree_max_query_limit",
+        "01802_test_postgresql_protocol_with_row_policy", /// It cannot parse DROP ROW POLICY
+        "01823_explain_json",
+        "01852_cast_operator",
+        "01852_cast_operator_bad_cases",
+        "01053_ssd_dictionary",
+        "01280_ssd_complex_key_dictionary",
+        "01684_ssd_cache_dictionary_simple_key",
+        "01685_ssd_cache_dictionary_complex_key"
     ],
     "parallel":
     [
@@ -556,6 +573,10 @@
         "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",
@@ -675,6 +696,8 @@
         "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",
@@ -693,8 +716,18 @@
         "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.
         "01760_system_dictionaries",
         "01760_polygon_dictionaries",
-        "01778_hierarchical_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",
+        "01870_modulo_partition_key",
+        "01870_buffer_flush" // creates database
     ]
 }
diff --git a/tests/testflows/aes_encryption/docker-compose/clickhouse-service.yml b/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
similarity index 100%
rename from tests/testflows/aes_encryption/docker-compose/clickhouse-service.yml
rename to tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
diff --git a/tests/testflows/aes_encryption/docker-compose/docker-compose.yml b/tests/testflows/aes_encryption/aes_encryption_env/docker-compose.yml
similarity index 100%
rename from tests/testflows/aes_encryption/docker-compose/docker-compose.yml
rename to tests/testflows/aes_encryption/aes_encryption_env/docker-compose.yml
diff --git a/tests/testflows/aes_encryption/docker-compose/mysql-service.yml b/tests/testflows/aes_encryption/aes_encryption_env/mysql-service.yml
similarity index 100%
rename from tests/testflows/aes_encryption/docker-compose/mysql-service.yml
rename to tests/testflows/aes_encryption/aes_encryption_env/mysql-service.yml
diff --git a/tests/testflows/aes_encryption/docker-compose/zookeeper-service.yml b/tests/testflows/aes_encryption/aes_encryption_env/zookeeper-service.yml
similarity index 100%
rename from tests/testflows/aes_encryption/docker-compose/zookeeper-service.yml
rename to tests/testflows/aes_encryption/aes_encryption_env/zookeeper-service.yml
diff --git a/tests/testflows/aes_encryption/regression.py b/tests/testflows/aes_encryption/regression.py
index f3321489b76..60f42ece509 100755
--- a/tests/testflows/aes_encryption/regression.py
+++ b/tests/testflows/aes_encryption/regression.py
@@ -1,16 +1,19 @@
 #!/usr/bin/env python3
+import os
 import sys
 from testflows.core import *
 
 append_path(sys.path, "..")
 
 from helpers.cluster import Cluster
+from helpers.common import Pool, join, run_scenario
 from helpers.argparser import argparser
 from aes_encryption.requirements import *
 
 issue_18249 = "https://github.com/ClickHouse/ClickHouse/issues/18249"
 issue_18250 = "https://github.com/ClickHouse/ClickHouse/issues/18250"
 issue_18251 = "https://github.com/ClickHouse/ClickHouse/issues/18251"
+issue_24029 = "https://github.com/ClickHouse/ClickHouse/issues/24029"
 
 xfails = {
     # encrypt
@@ -48,7 +51,20 @@ xfails = {
     "compatibility/mysql/:engine/encrypt/mysql_datatype='TEXT'/:":
      [(Fail, issue_18250)],
     "compatibility/mysql/:engine/encrypt/mysql_datatype='VARCHAR(100)'/:":
-     [(Fail, issue_18250)]
+     [(Fail, issue_18250)],
+    # reinterpretAsFixedString for UUID stopped working 
+    "decrypt/decryption/mode=:datatype=UUID:":
+     [(Fail, issue_24029)], 
+    "encrypt/:/mode=:datatype=UUID:":
+     [(Fail, issue_24029)], 
+    "decrypt/invalid ciphertext/mode=:/invalid ciphertext=reinterpretAsFixedString(toUUID:": 
+     [(Fail, issue_24029)], 
+    "encrypt_mysql/encryption/mode=:datatype=UUID:":
+     [(Fail, issue_24029)], 
+    "decrypt_mysql/decryption/mode=:datatype=UUID:":
+     [(Fail, issue_24029)], 
+    "decrypt_mysql/invalid ciphertext/mode=:/invalid ciphertext=reinterpretAsFixedString(toUUID:":
+     [(Fail, issue_24029)], 
 }
 
 @TestFeature
@@ -63,18 +79,30 @@ xfails = {
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """ClickHouse AES encryption functions regression module.
     """
+    top().terminating = False
     nodes = {
         "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
     }
 
-    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "aes_encryption_env")) as cluster:
         self.context.cluster = cluster
 
-        Feature(run=load("aes_encryption.tests.encrypt", "feature"), flags=TE)
-        Feature(run=load("aes_encryption.tests.decrypt", "feature"), flags=TE)
-        Feature(run=load("aes_encryption.tests.encrypt_mysql", "feature"), flags=TE)
-        Feature(run=load("aes_encryption.tests.decrypt_mysql", "feature"), flags=TE)
-        Feature(run=load("aes_encryption.tests.compatibility.feature", "feature"), flags=TE)
+        tasks = []
+        with Pool(5) as pool:
+            try:
+                run_scenario(pool, tasks, Feature(test=load("aes_encryption.tests.encrypt", "feature"), flags=TE))
+                run_scenario(pool, tasks, Feature(test=load("aes_encryption.tests.decrypt", "feature"), flags=TE))
+                run_scenario(pool, tasks, Feature(test=load("aes_encryption.tests.encrypt_mysql", "feature"), flags=TE))
+                run_scenario(pool, tasks, Feature(test=load("aes_encryption.tests.decrypt_mysql", "feature"), flags=TE))
+                run_scenario(pool, tasks, Feature(test=load("aes_encryption.tests.compatibility.feature", "feature"), flags=TE))
+            finally:
+                join(tasks)
 
 if main():
     regression()
diff --git a/tests/testflows/aes_encryption/tests/common.py b/tests/testflows/aes_encryption/tests/common.py
index 5a6e34f59fd..be1c0b98851 100644
--- a/tests/testflows/aes_encryption/tests/common.py
+++ b/tests/testflows/aes_encryption/tests/common.py
@@ -1,4 +1,10 @@
 # -*- coding: utf-8 -*-
+import uuid
+
+from testflows._core.testtype import TestSubType
+from testflows.core.name import basename, parentname
+from testflows.core import current
+
 modes = [
     # mode, key_len, iv_len, aad
     ("'aes-128-ecb'", 16, None, None),
@@ -130,3 +136,10 @@ def hex(s):
     if isinstance(s, bytes):
         return "".join(['%X' % c for c in s])
     return _hex(s)
+
+def getuid():
+    if current().subtype == TestSubType.Example:
+        testname = f"{basename(parentname(current().name)).replace(' ', '_').replace(',','')}"
+    else:
+        testname = f"{basename(current().name).replace(' ', '_').replace(',','')}"
+    return testname + "_" + str(uuid.uuid1()).replace('-', '_')
diff --git a/tests/testflows/clean b/tests/testflows/clean
new file mode 100755
index 00000000000..6d424343d04
--- /dev/null
+++ b/tests/testflows/clean
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Clean up all the _instances folders where
+# ClickHouse services store their data.
+#
+# Note: needs root privilege because Docker mounts
+# these folders into containers.
+#
+find . -type d -name _instances | sudo xargs rm -rf
diff --git a/tests/testflows/datetime64_extended_range/__init__.py b/tests/testflows/datetime64_extended_range/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/datetime64_extended_range/common.py b/tests/testflows/datetime64_extended_range/common.py
new file mode 100644
index 00000000000..7aaa8519693
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/common.py
@@ -0,0 +1,2 @@
+from testflows.core import *
+from helpers.common import *
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/common.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/common.xml
new file mode 100644
index 00000000000..df952b28c82
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/common.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <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>
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
new file mode 100644
index 00000000000..bdf1bbc11c1
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/logs.xml
@@ -0,0 +1,17 @@
+<yandex>
+    <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>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+        <flush_interval_milliseconds>500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
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
new file mode 100644
index 00000000000..fbc6cea74c0
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ports.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<yandex>
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+</yandex>
\ 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
new file mode 100644
index 00000000000..51be2a6e8e3
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/remote.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<yandex>
+    <remote_servers>
+        <replicated_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </replicated_cluster>
+        <!--
+        <replicated_cluster_readonly>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                    <user>readonly</user>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                    <user>readonly</user>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                    <user>readonly</user>
+                </replica>
+            </shard>
+        </replicated_cluster_readonly>
+        -->
+        <replicated_cluster_secure>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </replicated_cluster_secure>
+        <sharded_cluster>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </sharded_cluster>
+        <sharded_cluster_secure>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </sharded_cluster_secure>
+    </remote_servers>
+</yandex>
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
new file mode 100644
index 00000000000..ca65ffd5e04
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ssl.xml
@@ -0,0 +1,17 @@
+<yandex>
+    <openSSL>
+        <server>
+            <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/ssl/server.key</privateKeyFile>
+            <verificationMode>none</verificationMode>
+            <cacheSessions>true</cacheSessions>
+        </server>
+        <client>
+            <cacheSessions>true</cacheSessions>
+            <verificationMode>none</verificationMode>
+            <invalidCertificateHandler>
+                <name>AcceptCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+</yandex>
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
new file mode 100644
index 00000000000..618fd6b6d24
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/storage.xml
@@ -0,0 +1,20 @@
+<yandex>
+
+<storage_configuration>
+    <disks>
+        <default>
+            <keep_free_space_bytes>1024</keep_free_space_bytes>
+        </default>
+    </disks>
+    <policies>
+        <default>
+            <volumes>
+                <default>
+                    <disk>default</disk>
+                </default>
+            </volumes>
+        </default>
+    </policies>
+</storage_configuration>
+
+</yandex>
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
new file mode 100644
index 00000000000..96270e7b645
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/zookeeper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<yandex>
+    <zookeeper>
+	    <node index="1">
+		    <host>zookeeper</host>
+		    <port>2181</port>
+	    </node>
+        <session_timeout_ms>15000</session_timeout_ms>
+    </zookeeper>
+</yandex>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml
new file mode 100644
index 00000000000..d34d2c35253
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml
@@ -0,0 +1,436 @@
+<?xml version="1.0"?>
+<!--
+  NOTE: User and query level settings are set up in "users.xml" file.
+-->
+<yandex>
+    <logger>
+        <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+    <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+
+    <!-- For HTTPS and SSL over native protocol. -->
+    <!--
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+    -->
+
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <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>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
+            <dhParamsFile>/etc/clickhouse-server/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 -->
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <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>
+    -->
+
+    <!-- Port for communication between replicas. Used for data exchange. -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analoguous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface.
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- Listen specified host. use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere. -->
+    <!-- <listen_host>::</listen_host> -->
+    <!-- Same for hosts with disabled ipv6: -->
+    <!-- <listen_host>0.0.0.0</listen_host> -->
+
+    <!-- Default values - try listen localhost on ipv4 and ipv6: -->
+    <!--
+    <listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host>
+    -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!-- <listen_try>0</listen_try> -->
+
+    <!-- Allow listen on same address:port -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Path to folder where users and roles created by SQL commands are stored. -->
+    <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+
+    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
+    <users_config>users.xml</users_config>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- System profile of settings. This settings are used by internal processes (Buffer storage, Distibuted DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Perform mlockall after startup to lower first queries latency
+          and to prevent clickhouse executable from being paged out under high IO load.
+         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+    -->
+    <mlock_executable>false</mlock_executable>
+
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.yandex/docs/en/table_engines/distributed/
+      -->
+    <remote_servers incl="remote" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+         </test_cluster_two_shards_localhost>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </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.
+      -->
+
+    <!-- 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/
+      -->
+    <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
+      -->
+    <macros incl="macros" optional="true" />
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+
+    <!-- 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.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <!-- Trace log. Stores stack traces collected by query profilers.
+         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <!-- Query thread log. Has information about all threads participated in query execution.
+         Used only for queries with setting log_query_threads = 1. -->
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </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>
+        <database>system</database>
+        <table>part_log</table>
+        <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.
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+    -->
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <compression incl="compression">
+    <!--
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    -->
+    </compression>
+
+    <!-- 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. -->
+    <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> -->
+    </distributed_ddl>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to restart clickhouse-server, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/dhparam.pem b/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/dhparam.pem
new file mode 100644
index 00000000000..2e6cee0798d
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/dhparam.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAua92DDli13gJ+//ZXyGaggjIuidqB0crXfhUlsrBk9BV1hH3i7fR
+XGP9rUdk2ubnB3k2ejBStL5oBrkHm9SzUFSQHqfDjLZjKoUpOEmuDc4cHvX1XTR5
+Pr1vf5cd0yEncJWG5W4zyUB8k++SUdL2qaeslSs+f491HBLDYn/h8zCgRbBvxhxb
+9qeho1xcbnWeqkN6Kc9bgGozA16P9NLuuLttNnOblkH+lMBf42BSne/TWt3AlGZf
+slKmmZcySUhF8aKfJnLKbkBCFqOtFRh8zBA9a7g+BT/lSANATCDPaAk1YVih2EKb
+dpc3briTDbRsiqg2JKMI7+VdULY9bh3EawIBAg==
+-----END DH PARAMETERS-----
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/server.crt b/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/server.crt
new file mode 100644
index 00000000000..7ade2d96273
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/server.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/TCCAeWgAwIBAgIJANjx1QSR77HBMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDAgFw0xODA3MzAxODE2MDhaGA8yMjkyMDUxNDE4MTYwOFow
+FDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs9uSo6lJG8o8pw0fbVGVu0tPOljSWcVSXH9uiJBwlZLQnhN4SFSFohfI
+4K8U1tBDTnxPLUo/V1K9yzoLiRDGMkwVj6+4+hE2udS2ePTQv5oaMeJ9wrs+5c9T
+4pOtlq3pLAdm04ZMB1nbrEysceVudHRkQbGHzHp6VG29Fw7Ga6YpqyHQihRmEkTU
+7UCYNA+Vk7aDPdMS/khweyTpXYZimaK9f0ECU3/VOeG3fH6Sp2X6FN4tUj/aFXEj
+sRmU5G2TlYiSIUMF2JPdhSihfk1hJVALrHPTU38SOL+GyyBRWdNcrIwVwbpvsvPg
+pryMSNxnpr0AK0dFhjwnupIv5hJIOQIDAQABo1AwTjAdBgNVHQ4EFgQUjPLb3uYC
+kcamyZHK4/EV8jAP0wQwHwYDVR0jBBgwFoAUjPLb3uYCkcamyZHK4/EV8jAP0wQw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAM/ocuDvfPus/KpMVD51j
+4IdlU8R0vmnYLQ+ygzOAo7+hUWP5j0yvq4ILWNmQX6HNvUggCgFv9bjwDFhb/5Vr
+85ieWfTd9+LTjrOzTw4avdGwpX9G+6jJJSSq15tw5ElOIFb/qNA9O4dBiu8vn03C
+L/zRSXrARhSqTW5w/tZkUcSTT+M5h28+Lgn9ysx4Ff5vi44LJ1NnrbJbEAIYsAAD
++UA+4MBFKx1r6hHINULev8+lCfkpwIaeS8RL+op4fr6kQPxnULw8wT8gkuc8I4+L
+P9gg/xDHB44T3ADGZ5Ib6O0DJaNiToO6rnoaaxs0KkotbvDWvRoxEytSbXKoYjYp
+0g==
+-----END CERTIFICATE-----
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/server.key b/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/server.key
new file mode 100644
index 00000000000..f0fb61ac443
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/ssl/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCz25KjqUkbyjyn
+DR9tUZW7S086WNJZxVJcf26IkHCVktCeE3hIVIWiF8jgrxTW0ENOfE8tSj9XUr3L
+OguJEMYyTBWPr7j6ETa51LZ49NC/mhox4n3Cuz7lz1Pik62WreksB2bThkwHWdus
+TKxx5W50dGRBsYfMenpUbb0XDsZrpimrIdCKFGYSRNTtQJg0D5WTtoM90xL+SHB7
+JOldhmKZor1/QQJTf9U54bd8fpKnZfoU3i1SP9oVcSOxGZTkbZOViJIhQwXYk92F
+KKF+TWElUAusc9NTfxI4v4bLIFFZ01ysjBXBum+y8+CmvIxI3GemvQArR0WGPCe6
+ki/mEkg5AgMBAAECggEATrbIBIxwDJOD2/BoUqWkDCY3dGevF8697vFuZKIiQ7PP
+TX9j4vPq0DfsmDjHvAPFkTHiTQXzlroFik3LAp+uvhCCVzImmHq0IrwvZ9xtB43f
+7Pkc5P6h1l3Ybo8HJ6zRIY3TuLtLxuPSuiOMTQSGRL0zq3SQ5DKuGwkz+kVjHXUN
+MR2TECFwMHKQ5VLrC+7PMpsJYyOMlDAWhRfUalxC55xOXTpaN8TxNnwQ8K2ISVY5
+212Jz/a4hn4LdwxSz3Tiu95PN072K87HLWx3EdT6vW4Ge5P/A3y+smIuNAlanMnu
+plHBRtpATLiTxZt/n6npyrfQVbYjSH7KWhB8hBHtaQKBgQDh9Cq1c/KtqDtE0Ccr
+/r9tZNTUwBE6VP+3OJeKdEdtsfuxjOCkS1oAjgBJiSDOiWPh1DdoDeVZjPKq6pIu
+Mq12OE3Doa8znfCXGbkSzEKOb2unKZMJxzrz99kXt40W5DtrqKPNb24CNqTiY8Aa
+CjtcX+3weat82VRXvph6U8ltMwKBgQDLxjiQQzNoY7qvg7CwJCjf9qq8jmLK766g
+1FHXopqS+dTxDLM8eJSRrpmxGWJvNeNc1uPhsKsKgotqAMdBUQTf7rSTbt4MyoH5
+bUcRLtr+0QTK9hDWMOOvleqNXha68vATkohWYfCueNsC60qD44o8RZAS6UNy3ENq
+cM1cxqe84wKBgQDKkHutWnooJtajlTxY27O/nZKT/HA1bDgniMuKaz4R4Gr1PIez
+on3YW3V0d0P7BP6PWRIm7bY79vkiMtLEKdiKUGWeyZdo3eHvhDb/3DCawtau8L2K
+GZsHVp2//mS1Lfz7Qh8/L/NedqCQ+L4iWiPnZ3THjjwn3CoZ05ucpvrAMwKBgB54
+nay039MUVq44Owub3KDg+dcIU62U+cAC/9oG7qZbxYPmKkc4oL7IJSNecGHA5SbU
+2268RFdl/gLz6tfRjbEOuOHzCjFPdvAdbysanpTMHLNc6FefJ+zxtgk9sJh0C4Jh
+vxFrw9nTKKzfEl12gQ1SOaEaUIO0fEBGbe8ZpauRAoGAMAlGV+2/K4ebvAJKOVTa
+dKAzQ+TD2SJmeR1HZmKDYddNqwtZlzg3v4ZhCk4eaUmGeC1Bdh8MDuB3QQvXz4Dr
+vOIP4UVaOr+uM+7TgAgVnP4/K6IeJGzUDhX93pmpWhODfdu/oojEKVcpCojmEmS1
+KCBtmIrQLqzMpnBpLNuSY+Q=
+-----END PRIVATE KEY-----
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/users.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/users.xml
new file mode 100644
index 00000000000..86b2cd9e1e3
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/users.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<yandex>
+    <!-- Profiles of settings. -->
+    <profiles>
+        <!-- Default settings. -->
+        <default>
+            <!-- Maximum memory usage for processing single query, in bytes. -->
+            <max_memory_usage>10000000000</max_memory_usage>
+
+            <!-- Use cache of uncompressed blocks of data. Meaningful only for processing many of very short queries. -->
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+
+            <!-- How to choose between replicas during distributed query processing.
+                 random - choose random replica from set of replicas with minimum number of errors
+                 nearest_hostname - from set of replicas with minimum number of errors, choose replica
+                  with minimum number of different symbols between replica's hostname and local hostname
+                  (Hamming distance).
+                 in_order - first live replica is chosen in specified order.
+                 first_or_random - if first replica one has higher number of errors, pick a random one from replicas with minimum number of errors.
+            -->
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <!-- Profile that allows only read queries. -->
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <!-- Users and ACL. -->
+    <users>
+        <!-- If user name was not specified, 'default' user is used. -->
+        <default>
+            <!-- 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>.
+                 Password could be empty.
+
+                 If you want to specify SHA256, place it in 'password_sha256_hex' element.
+                 Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
+                 Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
+
+                 If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
+                 Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
+
+                 How to generate decent password:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+                 In first line will be password and in second - corresponding SHA256.
+
+                 How to generate double SHA1:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | openssl dgst -sha1 -binary | openssl dgst -sha1
+                 In first line will be password and in second - corresponding double SHA1.
+            -->
+            <password></password>
+
+            <!-- List of networks with open access.
+
+                 To open access from everywhere, specify:
+                    <ip>::/0</ip>
+
+                 To open access only from localhost, specify:
+                    <ip>::1</ip>
+                    <ip>127.0.0.1</ip>
+
+                 Each element of list has one of the following forms:
+                 <ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+                     2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+                 <host> Hostname. Example: server01.yandex.ru.
+                     To check access, DNS query is performed, and all received addresses compared to peer address.
+                 <host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+                     To check access, DNS PTR query is performed for peer address and then regexp is applied.
+                     Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+                     Strongly recommended that regexp is ends with $
+                 All results of DNS requests are cached till server restart.
+            -->
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+
+            <!-- Settings profile for user. -->
+            <profile>default</profile>
+
+            <!-- Quota for user. -->
+            <quota>default</quota>
+
+            <!-- Allow access management -->
+            <access_management>1</access_management>
+
+            <!-- Example of row level security policy. -->
+            <!-- <databases>
+                <test>
+                    <filtered_table1>
+                        <filter>a = 1</filter>
+                    </filtered_table1>
+                    <filtered_table2>
+                        <filter>a + b &lt; 1 or c - d &gt; 5</filter>
+                    </filtered_table2>
+                </test>
+            </databases> -->
+        </default>
+
+        <!-- Example of user with readonly access. -->
+        <!-- <readonly>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>readonly</profile>
+            <quota>default</quota>
+        </readonly> -->
+    </users>
+
+    <!-- Quotas. -->
+    <quotas>
+        <!-- Name of quota. -->
+        <default>
+            <!-- Limits for time interval. You could specify many intervals with different limits. -->
+            <interval>
+                <!-- Length of interval. -->
+                <duration>3600</duration>
+
+                <!-- No limits. Just calculate resource usage for time interval. -->
+                <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>
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
new file mode 100644
index 00000000000..6cdcc1b440c
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse1/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse1</replica>
+        <shard>01</shard>
+        <shard2>01</shard2>
+    </macros>
+</yandex>
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
new file mode 100644
index 00000000000..a114a9ce4ab
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse2/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse2</replica>
+        <shard>01</shard>
+        <shard2>02</shard2>
+    </macros>
+</yandex>
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
new file mode 100644
index 00000000000..904a27b0172
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse3/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse3</replica>
+        <shard>01</shard>
+        <shard2>03</shard2>
+    </macros>
+</yandex>
diff --git a/tests/testflows/example/docker-compose/clickhouse-service.yml b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
similarity index 100%
rename from tests/testflows/example/docker-compose/clickhouse-service.yml
rename to tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
diff --git a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/docker-compose.yml b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/docker-compose.yml
new file mode 100644
index 00000000000..665e355d51e
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/docker-compose.yml
@@ -0,0 +1,61 @@
+version: '2.3'
+
+services:
+    zookeeper:
+        extends:
+            file: zookeeper-service.yml
+            service: zookeeper
+
+    clickhouse1:
+        extends:
+            file: clickhouse-service.yml
+            service: clickhouse
+        hostname: clickhouse1
+        volumes:
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/config.d:/etc/clickhouse-server/config.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/users.d:/etc/clickhouse-server/users.d"
+        depends_on:
+            zookeeper:
+                condition: service_healthy
+
+    clickhouse2:
+        extends:
+            file: clickhouse-service.yml
+            service: clickhouse
+        hostname: clickhouse2
+        volumes:
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d:/etc/clickhouse-server/config.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/users.d:/etc/clickhouse-server/users.d"
+        depends_on:
+            zookeeper:
+                condition: service_healthy
+
+    clickhouse3:
+        extends:
+            file: clickhouse-service.yml
+            service: clickhouse
+        hostname: clickhouse3
+        volumes:
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
+            - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d:/etc/clickhouse-server/config.d"
+            - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/users.d:/etc/clickhouse-server/users.d"
+        depends_on:
+            zookeeper:
+                condition: service_healthy
+
+    all_services_ready:
+        image: hello-world
+        depends_on:
+            clickhouse1:
+                condition: service_healthy
+            clickhouse2:
+                condition: service_healthy
+            clickhouse3:
+                condition: service_healthy
+            zookeeper:
+                condition: service_healthy
diff --git a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/zookeeper-service.yml b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/zookeeper-service.yml
new file mode 100644
index 00000000000..f27405b97a2
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/zookeeper-service.yml
@@ -0,0 +1,18 @@
+version: '2.3'
+
+services:
+  zookeeper:
+    image: zookeeper:3.6.2
+    expose:
+      - "2181"
+    environment:
+      ZOO_TICK_TIME: 500
+      ZOO_MY_ID: 1
+    healthcheck:
+      test: echo stat | nc localhost 2181
+      interval: 3s
+      timeout: 2s
+      retries: 5
+      start_period: 2s
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/datetime64_extended_range/regression.py b/tests/testflows/datetime64_extended_range/regression.py
new file mode 100755
index 00000000000..f8db9c74c9e
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/regression.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+import os
+import sys
+from testflows.core import *
+
+append_path(sys.path, "..")
+
+from helpers.cluster import Cluster
+from helpers.argparser import argparser
+from datetime64_extended_range.requirements import *
+from datetime64_extended_range.common import *
+
+# cross-outs
+# https://github.com/ClickHouse/ClickHouse/issues/16581#issuecomment-804360350: 128 and 256-bit types are not supported for now
+# https://github.com/ClickHouse/ClickHouse/issues/17079#issuecomment-783396589 : leap seconds unsupported
+# https://github.com/ClickHouse/ClickHouse/issues/22824 : dateDiff not working woth dt64
+# https://github.com/ClickHouse/ClickHouse/issues/22852 : formatDateTime wrong value
+# https://github.com/ClickHouse/ClickHouse/issues/22854 : timeSlot(), toMonday() wrong when out of normal
+# https://github.com/ClickHouse/ClickHouse/issues/16260 : timeSlots(), dateDiff() not working with DT64
+# https://github.com/ClickHouse/ClickHouse/issues/22927#issuecomment-816574952 : toRelative...Num() wrong when out of normal range
+# https://github.com/ClickHouse/ClickHouse/issues/22928 : toStartOf...() wrong when out of normal range
+# https://github.com/ClickHouse/ClickHouse/issues/22929 : toUnixTimestamp() exception when out of normal
+# https://github.com/ClickHouse/ClickHouse/issues/22930 : toWeek()
+# https://github.com/ClickHouse/ClickHouse/issues/22948 : toYearWeek()
+# https://github.com/ClickHouse/ClickHouse/issues/22959 : toUnixTimestamp64*() wrong fractal seconds treatment
+
+# For `reference times` test it is unclear how to evaluate correctness - majority of test cases are correct, and ONLY
+# Juba and Monrovia timezones are damaged - probably, due to wrong DST shifts lookup tables
+
+xfails = {
+    "type conversion/to int 8 16 32 64 128 256/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/16581#issuecomment-804360350")],
+    "type conversion/to uint 8 16 32 64 256/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/16581#issuecomment-804360350")],
+    "non existent time/leap seconds/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/17079#issuecomment-783396589")],
+    "date time funcs/date diff/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22824")],
+    "date time funcs/format date time/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22852")],
+    "date time funcs/time slot/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22854")],
+    "date time funcs/to monday/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22854")],
+    "date time funcs/time slots/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/16260")],
+    "date time funcs/to relative :/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22927#issuecomment-816574952")],
+    "date time funcs/to start of :/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22928")],
+    "date time funcs/to unix timestamp/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22929")],
+    "date time funcs/to week/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22930")],
+    "date time funcs/to year week/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22948")],
+    "type conversion/to unix timestamp64 */:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22959")],
+    "type conversion/from unix timestamp64 */:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22959")],
+    "type conversion/to int 8 16 32 64 128 256/:": [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/16581#issuecomment-804360350")],
+    "reference times/:": [(Fail, "check procedure unclear")],
+    # need to investigate
+    "type conversion/to datetime/cast=True": [(Fail, "need to investigate")],
+    "date time funcs/today": [(Fail, "need to investigate")]
+}
+
+
+@TestModule
+@Name("datetime64 extended range")
+@ArgumentParser(argparser)
+@Specifications(
+    SRS_010_ClickHouse_DateTime64_Extended_Range
+)
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange("1.0"),
+)
+@XFails(xfails)
+def regression(self, local, clickhouse_binary_path, parallel=False, stress=False):
+    """ClickHouse DateTime64 Extended Range regression module.
+    """
+    top().terminating = False
+    nodes = {
+        "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
+    }
+
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "datetime64_extended_range_env")) as cluster:
+        self.context.cluster = cluster
+
+        tasks = []
+        with Pool(2) as pool:
+            try:
+                run_scenario(pool, tasks, Scenario(test=load("datetime64_extended_range.tests.generic", "generic")))
+                run_scenario(pool, tasks, Scenario(test=load("datetime64_extended_range.tests.non_existent_time", "feature")))
+                run_scenario(pool, tasks, Scenario(test=load("datetime64_extended_range.tests.reference_times", "reference_times")))
+                run_scenario(pool, tasks, Scenario(test=load("datetime64_extended_range.tests.date_time_functions", "date_time_funcs")))
+                run_scenario(pool, tasks, Scenario(test=load("datetime64_extended_range.tests.type_conversion", "type_conversion")))
+            finally:
+                join(tasks)
+
+if main():
+    regression()
diff --git a/tests/testflows/datetime64_extended_range/requirements/__init__.py b/tests/testflows/datetime64_extended_range/requirements/__init__.py
new file mode 100644
index 00000000000..02f7d430154
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/requirements/__init__.py
@@ -0,0 +1 @@
+from .requirements import *
diff --git a/tests/testflows/datetime64_extended_range/requirements/requirements.md b/tests/testflows/datetime64_extended_range/requirements/requirements.md
new file mode 100644
index 00000000000..0c2b0abb14c
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/requirements/requirements.md
@@ -0,0 +1,805 @@
+# SRS-010 ClickHouse DateTime64 Extended Range
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+  * 3.1 [SRS](#srs)
+  * 3.2 [Normal Date Range](#normal-date-range)
+  * 3.3 [Extended Date Range](#extended-date-range)
+* 4 [Requirements](#requirements)
+  * 4.1 [Generic](#generic)
+      * 4.1.0.1 [RQ.SRS-010.DateTime64.ExtendedRange](#rqsrs-010datetime64extendedrange)
+      * 4.1.0.2 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start](#rqsrs-010datetime64extendedrangenormalrangestart)
+      * 4.1.0.3 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start.BeforeEpochForTimeZone](#rqsrs-010datetime64extendedrangenormalrangestartbeforeepochfortimezone)
+      * 4.1.0.4 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End](#rqsrs-010datetime64extendedrangenormalrangeend)
+      * 4.1.0.5 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End.AfterEpochForTimeZone](#rqsrs-010datetime64extendedrangenormalrangeendafterepochfortimezone)
+      * 4.1.0.6 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions](#rqsrs-010datetime64extendedrangetypeconversionfunctions)
+      * 4.1.0.7 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions](#rqsrs-010datetime64extendedrangedatesandtimesfunctions)
+      * 4.1.0.8 [RQ.SRS-010.DateTime64.ExtendedRange.TimeZones](#rqsrs-010datetime64extendedrangetimezones)
+      * 4.1.0.9 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime](#rqsrs-010datetime64extendedrangenonexistenttime)
+      * 4.1.0.10 [RQ.SRS-010.DateTime64.ExtendedRange.Comparison](#rqsrs-010datetime64extendedrangecomparison)
+      * 4.1.0.11 [RQ.SRS-010.DateTime64.ExtendedRange.SpecificTimestamps](#rqsrs-010datetime64extendedrangespecifictimestamps)
+  * 4.2 [Specific](#specific)
+      * 4.2.0.1 [RQ.SRS-010.DateTime64.ExtendedRange.Start](#rqsrs-010datetime64extendedrangestart)
+      * 4.2.0.2 [RQ.SRS-010.DateTime64.ExtendedRange.End](#rqsrs-010datetime64extendedrangeend)
+      * 4.2.0.3 [Non-Existent Time](#non-existent-time)
+        * 4.2.0.3.1 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidDate](#rqsrs-010datetime64extendedrangenonexistenttimeinvaliddate)
+        * 4.2.0.3.2 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidTime](#rqsrs-010datetime64extendedrangenonexistenttimeinvalidtime)
+        * 4.2.0.3.3 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.TimeZoneSwitch](#rqsrs-010datetime64extendedrangenonexistenttimetimezoneswitch)
+        * 4.2.0.3.4 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime](#rqsrs-010datetime64extendedrangenonexistenttimedaylightsavingtime)
+        * 4.2.0.3.5 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime.Disappeared](#rqsrs-010datetime64extendedrangenonexistenttimedaylightsavingtimedisappeared)
+        * 4.2.0.3.6 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.LeapSeconds](#rqsrs-010datetime64extendedrangenonexistenttimeleapseconds)
+      * 4.2.0.4 [Dates And Times Functions](#dates-and-times-functions)
+        * 4.2.0.4.1 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTimeZone](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstotimezone)
+        * 4.2.0.4.2 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyear)
+        * 4.2.0.4.3 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toQuarter](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoquarter)
+        * 4.2.0.4.4 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonth](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstomonth)
+        * 4.2.0.4.5 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstodayofyear)
+        * 4.2.0.4.6 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfMonth](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstodayofmonth)
+        * 4.2.0.4.7 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstodayofweek)
+        * 4.2.0.4.8 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toHour](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstohour)
+        * 4.2.0.4.9 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMinute](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstominute)
+        * 4.2.0.4.10 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toSecond](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstosecond)
+        * 4.2.0.4.11 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toUnixTimestamp](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstounixtimestamp)
+        * 4.2.0.4.12 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofyear)
+        * 4.2.0.4.13 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfISOYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofisoyear)
+        * 4.2.0.4.14 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfQuarter](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofquarter)
+        * 4.2.0.4.15 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMonth](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofmonth)
+        * 4.2.0.4.16 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonday](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstomonday)
+        * 4.2.0.4.17 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofweek)
+        * 4.2.0.4.18 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfDay](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofday)
+        * 4.2.0.4.19 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfHour](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofhour)
+        * 4.2.0.4.20 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMinute](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofminute)
+        * 4.2.0.4.21 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfSecond](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofsecond)
+        * 4.2.0.4.22 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFiveMinute](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartoffiveminute)
+        * 4.2.0.4.23 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfTenMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartoftenminutes)
+        * 4.2.0.4.24 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFifteenMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartoffifteenminutes)
+        * 4.2.0.4.25 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfInterval](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofinterval)
+        * 4.2.0.4.26 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTime](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstotime)
+        * 4.2.0.4.27 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeYearNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativeyearnum)
+        * 4.2.0.4.28 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeQuarterNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativequarternum)
+        * 4.2.0.4.29 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMonthNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativemonthnum)
+        * 4.2.0.4.30 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeWeekNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativeweeknum)
+        * 4.2.0.4.31 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeDayNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativedaynum)
+        * 4.2.0.4.32 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeHourNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativehournum)
+        * 4.2.0.4.33 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMinuteNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativeminutenum)
+        * 4.2.0.4.34 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeSecondNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativesecondnum)
+        * 4.2.0.4.35 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoisoyear)
+        * 4.2.0.4.36 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoisoweek)
+        * 4.2.0.4.37 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoweek)
+        * 4.2.0.4.38 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYearWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyearweek)
+        * 4.2.0.4.39 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.now](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsnow)
+        * 4.2.0.4.40 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.today](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoday)
+        * 4.2.0.4.41 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.yesterday](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsyesterday)
+        * 4.2.0.4.42 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlot](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstimeslot)
+        * 4.2.0.4.43 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMM](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyyyymm)
+        * 4.2.0.4.44 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDD](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyyyymmdd)
+        * 4.2.0.4.45 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDDhhmmss](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyyyymmddhhmmss)
+        * 4.2.0.4.46 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addYears](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddyears)
+        * 4.2.0.4.47 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMonths](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddmonths)
+        * 4.2.0.4.48 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addWeeks](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddweeks)
+        * 4.2.0.4.49 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addDays](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsadddays)
+        * 4.2.0.4.50 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addHours](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddhours)
+        * 4.2.0.4.51 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddminutes)
+        * 4.2.0.4.52 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addSeconds](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddseconds)
+        * 4.2.0.4.53 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addQuarters](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddquarters)
+        * 4.2.0.4.54 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractYears](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractyears)
+        * 4.2.0.4.55 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMonths](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractmonths)
+        * 4.2.0.4.56 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractWeeks](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractweeks)
+        * 4.2.0.4.57 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractDays](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractdays)
+        * 4.2.0.4.58 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractHours](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtracthours)
+        * 4.2.0.4.59 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractminutes)
+        * 4.2.0.4.60 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractSeconds](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractseconds)
+        * 4.2.0.4.61 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractQuarters](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractquarters)
+        * 4.2.0.4.62 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.dateDiff](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsdatediff)
+        * 4.2.0.4.63 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlots](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstimeslots)
+        * 4.2.0.4.64 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.formatDateTime](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsformatdatetime)
+    * 4.2.1 [Type Conversion Functions](#type-conversion-functions)
+        * 4.2.1.4.1 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toInt(8|16|32|64|128|256)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstoint8163264128256)
+        * 4.2.1.4.2 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUInt(8|16|32|64|256)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstouint8163264256)
+        * 4.2.1.4.3 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toFloat(32|64)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstofloat3264)
+        * 4.2.1.4.4 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDate](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodate)
+        * 4.2.1.4.5 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodatetime)
+        * 4.2.1.4.6 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodatetime64)
+        * 4.2.1.4.7 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64.FromString.MissingTime](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodatetime64fromstringmissingtime)
+        * 4.2.1.4.8 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDecimal(32|64|128|256)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodecimal3264128256)
+        * 4.2.1.4.9 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toString](#rqsrs-010datetime64extendedrangetypeconversionfunctionstostring)
+        * 4.2.1.4.10 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.CAST(x,T)](#rqsrs-010datetime64extendedrangetypeconversionfunctionscastxt)
+        * 4.2.1.4.11 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Milli](#rqsrs-010datetime64extendedrangetypeconversionfunctionstounixtimestamp64milli)
+        * 4.2.1.4.12 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Micro](#rqsrs-010datetime64extendedrangetypeconversionfunctionstounixtimestamp64micro)
+        * 4.2.1.4.13 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Nano](#rqsrs-010datetime64extendedrangetypeconversionfunctionstounixtimestamp64nano)
+        * 4.2.1.4.14 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Milli](#rqsrs-010datetime64extendedrangetypeconversionfunctionsfromunixtimestamp64milli)
+        * 4.2.1.4.15 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Micro](#rqsrs-010datetime64extendedrangetypeconversionfunctionsfromunixtimestamp64micro)
+        * 4.2.1.4.16 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Nano](#rqsrs-010datetime64extendedrangetypeconversionfunctionsfromunixtimestamp64nano)
+* 5 [References](#references)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This document will cover requirements to support extended range for the [DateTime64] data type
+that is outside the normal **1970** (1970-01-02 00:00:00 UTC) to **2105** (2105-12-31 23:59:59.99999 UTC) date range.
+
+## Terminology
+
+### SRS
+
+Software Requirements Specification
+
+### Normal Date Range
+
+**1970** `1970-01-02T00:00:00.000000` to **2105** `2105-12-31T23:59:59.99999`
+
+### Extended Date Range
+
+**1925** `1925-01-01T00:00:00.000000` to **2238** `2238-12-31 23:59:59.99999`
+
+## Requirements
+
+### Generic
+
+##### RQ.SRS-010.DateTime64.ExtendedRange
+version: 1.0
+
+[ClickHouse] SHALL support extended range for the [DateTime64] data type that includes dates from the year **1925** to **2238**.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the normal date range that starts at `1970-01-01 00:00:00.000`
+expressed using the [ISO 8601 format].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start.BeforeEpochForTimeZone
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the start of the [normal date range]
+when this time for the time zone is before the start of the [normal date range].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the normal date range that ends at `2105-12-31T23:59:59.99999`
+expressed using the [ISO 8601 format].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End.AfterEpochForTimeZone
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the end of the [normal date range]
+when this time for the time zone is after the end of the [normal date range].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions
+version: 1.0
+
+[ClickHouse] SHALL support proper conversion to and from [DateTime64] data type from other data types.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions
+version: 1.0
+
+[ClickHouse] SHALL support correct operation of the [Dates and Times Functions] with the [DateTime64] data type
+when it stores dates within the [normal date range] and the [extended date range].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.TimeZones
+version: 1.0
+
+[ClickHouse] SHALL support correct operation with the [DateTime64] extended range data type
+when combined with a supported time zone.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of non-existent times when using [DateTime64] extended range data type.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.Comparison
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of time comparison when using [DateTime64] extended range data type.
+For example, `SELECT toDateTime64('2019-05-05 20:20:12.050', 3) < now()`.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.SpecificTimestamps
+version: 1.0
+
+[ClickHouse] SHALL properly work with the following timestamps in all supported timezones:
+```
+[9961200,73476000,325666800,354675600,370400400,386125200,388566010,401850000,417574811,496803600,528253200,624423614,636516015,671011200,717555600,752047218,859683600,922582800,1018173600,1035705600,1143334800,1162105223,1174784400,1194156000,1206838823,1224982823,1236495624,1319936400,1319936424,1425798025,1459040400,1509872400,2090451627,2140668000]
+```
+
+
+### Specific
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.Start
+version: 1.0
+
+[ClickHouse] SHALL support extended range for the [DateTime64] data type that starts at `1925-01-01T00:00:00.000000`
+expressed using the [ISO 8601 format].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.End
+version: 1.0
+
+[ClickHouse] SHALL support extended range for the [DateTime64] data type that ends at `2238-12-31T23:59:59.999999`
+expressed using the [ISO 8601 format].
+
+##### Non-Existent Time
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidDate
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid dates when using [DateTime64] extended range data type,
+such as:
+
+* `YYYY-04-31, YYYY-06-31, YYYY-09-31, YYYY-11-31`
+* `1990-02-30 00:00:02`
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidTime
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time for a timezone
+when using [DateTime64] extended range data type, for example,
+
+* `2002-04-07 02:30:00` never happened at all in the US/Eastern timezone ([Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime))
+
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.TimeZoneSwitch
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type
+when the invalid time is caused when *countries switch timezone definitions with no
+daylight savings time switch* [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime).
+
+>
+> For example, in 1915 Warsaw switched from Warsaw time to Central European time with
+> no daylight savings transition. So at the stroke of midnight on August 5th 1915 the clocks
+> were wound back 24 minutes creating an ambiguous time period that cannot be specified without
+> referring to the timezone abbreviation or the actual UTC offset. In this case midnight happened twice,
+> neither time during a daylight saving time period. pytz handles this transition by treating the ambiguous
+> period before the switch as daylight savings time, and the ambiguous period after as standard time.
+>
+> [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime)
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type
+when for a given timezone time switches from standard to daylight saving.
+
+> For example, in the US/Eastern timezone on the last Sunday morning in October, the following sequence happens:
+>
+> 01:00 EDT occurs
+> 1 hour later, instead of 2:00am the clock is turned back 1 hour and 01:00 happens again (this time 01:00 EST)
+> In fact, every instant between 01:00 and 02:00 occurs twice.
+> [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime)
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime.Disappeared
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type
+for a given timezone when transition from the standard to daylight saving time causes an hour to disappear.
+
+Expected behavior: if DateTime64 initialized by a skipped time value, it is being treated as DST and resulting value will be an hour earlier, e.g. `SELECT toDateTime64('2020-03-08 02:34:00', 0, 'America/Denver')` returns `2020-03-08 01:34:00`.
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.LeapSeconds
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of leap seconds adjustments when using [DateTime64] extended range data type.
+
+##### Dates And Times Functions
+
+###### 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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
+
+
+#### Type Conversion Functions
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toInt(8|16|32|64|128|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 integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.tech/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.
+
+###### 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.
+
+###### 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.
+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.
+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
+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
+when value of the string is missing the `hh:mm-ss.sss` part.
+For example, `toDateTime64('2020-01-01', 3)`.
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDecimal(32|64|128|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 [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.
+
+###### 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.
+
+###### 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.
+
+###### 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.
+
+###### 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.
+
+###### 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.
+
+###### 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
+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.
+
+###### 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
+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.
+
+###### 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
+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.
+
+## References
+
+* **DateTime64**: https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/
+* **ISO 8601 format**: https://en.wikipedia.org/wiki/ISO_8601
+* **ClickHouse:** https://clickhouse.tech
+* **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/
+
+[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/
+[ISO 8601 format]: https://en.wikipedia.org/wiki/ISO_8601
+[ClickHouse]: https://clickhouse.tech
+[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/
+[GitHub]: https://github.com
diff --git a/tests/testflows/datetime64_extended_range/requirements/requirements.py b/tests/testflows/datetime64_extended_range/requirements/requirements.py
new file mode 100644
index 00000000000..0d013e57ff4
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/requirements/requirements.py
@@ -0,0 +1,2668 @@
+# These requirements were auto generated
+# from software requirements specification (SRS)
+# document by TestFlows v1.6.210505.1133630.
+# Do not edit by hand but re-generate instead
+# using 'tfs requirements generate' command.
+from testflows.core import Specification
+from testflows.core import Requirement
+
+Heading = Specification.Heading
+
+RQ_SRS_010_DateTime64_ExtendedRange = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support extended range for the [DateTime64] data type that includes dates from the year **1925** to **2238**.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.1')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_Start = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper time handling around the normal date range that starts at `1970-01-01 00:00:00.000`\n'
+        'expressed using the [ISO 8601 format].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.2')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_Start_BeforeEpochForTimeZone = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start.BeforeEpochForTimeZone',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper time handling around the start of the [normal date range]\n'
+        'when this time for the time zone is before the start of the [normal date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.3')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_End = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper time handling around the normal date range that ends at `2105-12-31T23:59:59.99999`\n'
+        'expressed using the [ISO 8601 format].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.4')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_End_AfterEpochForTimeZone = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End.AfterEpochForTimeZone',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper time handling around the end of the [normal date range]\n'
+        'when this time for the time zone is after the end of the [normal date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.5')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper conversion to and from [DateTime64] data type from other data types.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.6')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support correct operation of the [Dates and Times Functions] with the [DateTime64] data type\n'
+        'when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.7')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TimeZones = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TimeZones',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support correct operation with the [DateTime64] extended range data type\n'
+        'when combined with a supported time zone.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.8')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of non-existent times when using [DateTime64] extended range data type.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.9')
+
+RQ_SRS_010_DateTime64_ExtendedRange_Comparison = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.Comparison',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of time comparison when using [DateTime64] extended range data type.\n'
+        "For example, `SELECT toDateTime64('2019-05-05 20:20:12.050', 3) < now()`.\n"
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.10')
+
+RQ_SRS_010_DateTime64_ExtendedRange_SpecificTimestamps = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.SpecificTimestamps',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL properly work with the following timestamps in all supported timezones:\n'
+        '```\n'
+        '[9961200,73476000,325666800,354675600,370400400,386125200,388566010,401850000,417574811,496803600,528253200,624423614,636516015,671011200,717555600,752047218,859683600,922582800,1018173600,1035705600,1143334800,1162105223,1174784400,1194156000,1206838823,1224982823,1236495624,1319936400,1319936424,1425798025,1459040400,1509872400,2090451627,2140668000]\n'
+        '```\n'
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.1.0.11')
+
+RQ_SRS_010_DateTime64_ExtendedRange_Start = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.Start',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support extended range for the [DateTime64] data type that starts at `1925-01-01T00:00:00.000000`\n'
+        'expressed using the [ISO 8601 format].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.2.0.1')
+
+RQ_SRS_010_DateTime64_ExtendedRange_End = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.End',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support extended range for the [DateTime64] data type that ends at `2238-12-31T23:59:59.999999`\n'
+        'expressed using the [ISO 8601 format].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.2.0.2')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_InvalidDate = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidDate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of invalid dates when using [DateTime64] extended range data type,\n'
+        'such as:\n'
+        '\n'
+        '* `YYYY-04-31, YYYY-06-31, YYYY-09-31, YYYY-11-31`\n'
+        '* `1990-02-30 00:00:02`\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.3.1')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_InvalidTime = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of invalid time for a timezone\n'
+        'when using [DateTime64] extended range data type, for example,\n'
+        '\n'
+        '* `2002-04-07 02:30:00` never happened at all in the US/Eastern timezone ([Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime))\n'
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.3.2')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_TimeZoneSwitch = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.TimeZoneSwitch',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type\n'
+        'when the invalid time is caused when *countries switch timezone definitions with no\n'
+        'daylight savings time switch* [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime).\n'
+        '\n'
+        '>\n'
+        '> For example, in 1915 Warsaw switched from Warsaw time to Central European time with\n'
+        '> no daylight savings transition. So at the stroke of midnight on August 5th 1915 the clocks\n'
+        '> were wound back 24 minutes creating an ambiguous time period that cannot be specified without\n'
+        '> referring to the timezone abbreviation or the actual UTC offset. In this case midnight happened twice,\n'
+        '> neither time during a daylight saving time period. pytz handles this transition by treating the ambiguous\n'
+        '> period before the switch as daylight savings time, and the ambiguous period after as standard time.\n'
+        '>\n'
+        '> [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime)\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.3.3')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_DaylightSavingTime = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type\n'
+        'when for a given timezone time switches from standard to daylight saving.\n'
+        '\n'
+        '> For example, in the US/Eastern timezone on the last Sunday morning in October, the following sequence happens:\n'
+        '>\n'
+        '> 01:00 EDT occurs\n'
+        '> 1 hour later, instead of 2:00am the clock is turned back 1 hour and 01:00 happens again (this time 01:00 EST)\n'
+        '> In fact, every instant between 01:00 and 02:00 occurs twice.\n'
+        '> [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime)\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.3.4')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_DaylightSavingTime_Disappeared = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime.Disappeared',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type\n'
+        'for a given timezone when transition from the standard to daylight saving time causes an hour to disappear.\n'
+        '\n'
+        "Expected behavior: if DateTime64 initialized by a skipped time value, it is being treated as DST and resulting value will be an hour earlier, e.g. `SELECT toDateTime64('2020-03-08 02:34:00', 0, 'America/Denver')` returns `2020-03-08 01:34:00`.\n"
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.3.5')
+
+RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_LeapSeconds = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.LeapSeconds',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support proper handling of leap seconds adjustments when using [DateTime64] extended range data type.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.3.6')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTimeZone = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTimeZone',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.1')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYear = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYear',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.2')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toQuarter = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toQuarter',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.3')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonth = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonth',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.4')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfYear = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfYear',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.5')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfMonth = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfMonth',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.6')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfWeek = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfWeek',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.7')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toHour = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toHour',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.8')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMinute = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMinute',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.9')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toSecond = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toSecond',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.10')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toUnixTimestamp = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toUnixTimestamp',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        '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'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.11')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfYear = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfYear',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.12')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfISOYear = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfISOYear',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.13')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfQuarter = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfQuarter',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.14')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMonth = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMonth',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.15')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonday = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonday',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.16')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfWeek = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfWeek',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.17')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfDay = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfDay',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.18')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfHour = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfHour',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.19')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMinute = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMinute',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.20')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfSecond = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfSecond',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.21')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFiveMinute = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFiveMinute',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.22')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfTenMinutes = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfTenMinutes',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.23')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFifteenMinutes = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFifteenMinutes',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.24')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfInterval = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfInterval',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        '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'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.25')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTime = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.26')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeYearNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeYearNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.27')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeQuarterNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeQuarterNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.28')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMonthNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMonthNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.29')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeWeekNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeWeekNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.30')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeDayNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeDayNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.31')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeHourNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeHourNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.32')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMinuteNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMinuteNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.33')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeSecondNum = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeSecondNum',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.34')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOYear = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOYear',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.35')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOWeek = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOWeek',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.36')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toWeek = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toWeek',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.37')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYearWeek = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYearWeek',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.38')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_now = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.now',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.39')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_today = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.today',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.40')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_yesterday = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.yesterday',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.41')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlot = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlot',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.42')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMM = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMM',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.43')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDD = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDD',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.44')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDDhhmmss = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDDhhmmss',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.45')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addYears = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addYears',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.46')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMonths = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMonths',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.47')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addWeeks = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addWeeks',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.48')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addDays = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addDays',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.49')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addHours = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addHours',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.50')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMinutes = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMinutes',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.51')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addSeconds = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addSeconds',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.52')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addQuarters = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addQuarters',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.53')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractYears = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractYears',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.54')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMonths = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMonths',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.55')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractWeeks = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractWeeks',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.56')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractDays = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractDays',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.57')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractHours = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractHours',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.58')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMinutes = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMinutes',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.59')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractSeconds = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractSeconds',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.60')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractQuarters = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractQuarters',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.61')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_dateDiff = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.dateDiff',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.62')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlots = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlots',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.63')
+
+RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_formatDateTime = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.formatDateTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.0.4.64')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toInt_8_16_32_64_128_256_ = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toInt(8|16|32|64|128|256)',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.1')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUInt_8_16_32_64_256_ = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUInt(8|16|32|64|256)',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.2')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toFloat_32_64_ = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toFloat(32|64)',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.3')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDate = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDate',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        'This function is ONLY supposed to work in NORMAL RANGE.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.4')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        'This function is ONLY supposed to work in NORMAL RANGE.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.5')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64 = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.6')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64_FromString_MissingTime = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64.FromString.MissingTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        'when value of the string is missing the `hh:mm-ss.sss` part.\n'
+        "For example, `toDateTime64('2020-01-01', 3)`.\n"
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.7')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDecimal_32_64_128_256_ = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDecimal(32|64|128|256)',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.8')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toString = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toString',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.9')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_ = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.CAST(x,T)',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.10')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Milli = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Milli',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.11')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Micro = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Micro',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.12')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Nano = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Nano',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.13')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Milli = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Milli',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        '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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.14')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Micro = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Micro',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        '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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.15')
+
+RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Nano = Requirement(
+    name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Nano',
+    version='1.0',
+    priority=None,
+    group=None,
+    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'
+        '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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='4.2.1.4.16')
+
+SRS_010_ClickHouse_DateTime64_Extended_Range = Specification(
+    name='SRS-010 ClickHouse DateTime64 Extended Range', 
+    description=None,
+    author=None,
+    date=None, 
+    status=None, 
+    approved_by=None,
+    approved_date=None,
+    approved_version=None,
+    version=None,
+    group=None,
+    type=None,
+    link=None,
+    uid=None,
+    parent=None,
+    children=None,
+    headings=(
+        Heading(name='Revision History', level=1, num='1'),
+        Heading(name='Introduction', level=1, num='2'),
+        Heading(name='Terminology', level=1, num='3'),
+        Heading(name='SRS', level=2, num='3.1'),
+        Heading(name='Normal Date Range', level=2, num='3.2'),
+        Heading(name='Extended Date Range', level=2, num='3.3'),
+        Heading(name='Requirements', level=1, num='4'),
+        Heading(name='Generic', level=2, num='4.1'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange', level=4, num='4.1.0.1'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start', level=4, num='4.1.0.2'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start.BeforeEpochForTimeZone', level=4, num='4.1.0.3'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End', level=4, num='4.1.0.4'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End.AfterEpochForTimeZone', level=4, num='4.1.0.5'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions', level=4, num='4.1.0.6'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions', level=4, num='4.1.0.7'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TimeZones', level=4, num='4.1.0.8'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime', level=4, num='4.1.0.9'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.Comparison', level=4, num='4.1.0.10'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.SpecificTimestamps', level=4, num='4.1.0.11'),
+        Heading(name='Specific', level=2, num='4.2'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.Start', level=4, num='4.2.0.1'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.End', level=4, num='4.2.0.2'),
+        Heading(name='Non-Existent Time', level=4, num='4.2.0.3'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidDate', level=5, num='4.2.0.3.1'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidTime', level=5, num='4.2.0.3.2'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.TimeZoneSwitch', level=5, num='4.2.0.3.3'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime', level=5, num='4.2.0.3.4'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime.Disappeared', level=5, num='4.2.0.3.5'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.LeapSeconds', level=5, num='4.2.0.3.6'),
+        Heading(name='Dates And Times Functions', level=4, num='4.2.0.4'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTimeZone', level=5, num='4.2.0.4.1'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYear', level=5, num='4.2.0.4.2'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toQuarter', level=5, num='4.2.0.4.3'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonth', level=5, num='4.2.0.4.4'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfYear', level=5, num='4.2.0.4.5'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfMonth', level=5, num='4.2.0.4.6'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfWeek', level=5, num='4.2.0.4.7'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toHour', level=5, num='4.2.0.4.8'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMinute', level=5, num='4.2.0.4.9'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toSecond', level=5, num='4.2.0.4.10'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toUnixTimestamp', level=5, num='4.2.0.4.11'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfYear', level=5, num='4.2.0.4.12'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfISOYear', level=5, num='4.2.0.4.13'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfQuarter', level=5, num='4.2.0.4.14'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMonth', level=5, num='4.2.0.4.15'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonday', level=5, num='4.2.0.4.16'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfWeek', level=5, num='4.2.0.4.17'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfDay', level=5, num='4.2.0.4.18'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfHour', level=5, num='4.2.0.4.19'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMinute', level=5, num='4.2.0.4.20'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfSecond', level=5, num='4.2.0.4.21'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFiveMinute', level=5, num='4.2.0.4.22'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfTenMinutes', level=5, num='4.2.0.4.23'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFifteenMinutes', level=5, num='4.2.0.4.24'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfInterval', level=5, num='4.2.0.4.25'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTime', level=5, num='4.2.0.4.26'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeYearNum', level=5, num='4.2.0.4.27'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeQuarterNum', level=5, num='4.2.0.4.28'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMonthNum', level=5, num='4.2.0.4.29'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeWeekNum', level=5, num='4.2.0.4.30'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeDayNum', level=5, num='4.2.0.4.31'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeHourNum', level=5, num='4.2.0.4.32'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMinuteNum', level=5, num='4.2.0.4.33'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeSecondNum', level=5, num='4.2.0.4.34'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOYear', level=5, num='4.2.0.4.35'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOWeek', level=5, num='4.2.0.4.36'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toWeek', level=5, num='4.2.0.4.37'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYearWeek', level=5, num='4.2.0.4.38'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.now', level=5, num='4.2.0.4.39'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.today', level=5, num='4.2.0.4.40'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.yesterday', level=5, num='4.2.0.4.41'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlot', level=5, num='4.2.0.4.42'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMM', level=5, num='4.2.0.4.43'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDD', level=5, num='4.2.0.4.44'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDDhhmmss', level=5, num='4.2.0.4.45'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addYears', level=5, num='4.2.0.4.46'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMonths', level=5, num='4.2.0.4.47'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addWeeks', level=5, num='4.2.0.4.48'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addDays', level=5, num='4.2.0.4.49'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addHours', level=5, num='4.2.0.4.50'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMinutes', level=5, num='4.2.0.4.51'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addSeconds', level=5, num='4.2.0.4.52'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addQuarters', level=5, num='4.2.0.4.53'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractYears', level=5, num='4.2.0.4.54'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMonths', level=5, num='4.2.0.4.55'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractWeeks', level=5, num='4.2.0.4.56'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractDays', level=5, num='4.2.0.4.57'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractHours', level=5, num='4.2.0.4.58'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMinutes', level=5, num='4.2.0.4.59'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractSeconds', level=5, num='4.2.0.4.60'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractQuarters', level=5, num='4.2.0.4.61'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.dateDiff', level=5, num='4.2.0.4.62'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlots', level=5, num='4.2.0.4.63'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.formatDateTime', level=5, num='4.2.0.4.64'),
+        Heading(name='Type Conversion Functions', level=3, num='4.2.1'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toInt(8|16|32|64|128|256)', level=5, num='4.2.1.4.1'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUInt(8|16|32|64|256)', level=5, num='4.2.1.4.2'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toFloat(32|64)', level=5, num='4.2.1.4.3'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDate', level=5, num='4.2.1.4.4'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime', level=5, num='4.2.1.4.5'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64', level=5, num='4.2.1.4.6'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64.FromString.MissingTime', level=5, num='4.2.1.4.7'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDecimal(32|64|128|256)', level=5, num='4.2.1.4.8'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toString', level=5, num='4.2.1.4.9'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.CAST(x,T)', level=5, num='4.2.1.4.10'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Milli', level=5, num='4.2.1.4.11'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Micro', level=5, num='4.2.1.4.12'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Nano', level=5, num='4.2.1.4.13'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Milli', level=5, num='4.2.1.4.14'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Micro', level=5, num='4.2.1.4.15'),
+        Heading(name='RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Nano', level=5, num='4.2.1.4.16'),
+        Heading(name='References', level=1, num='5'),
+        ),
+    requirements=(
+        RQ_SRS_010_DateTime64_ExtendedRange,
+        RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_Start,
+        RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_Start_BeforeEpochForTimeZone,
+        RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_End,
+        RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_End_AfterEpochForTimeZone,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions,
+        RQ_SRS_010_DateTime64_ExtendedRange_TimeZones,
+        RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime,
+        RQ_SRS_010_DateTime64_ExtendedRange_Comparison,
+        RQ_SRS_010_DateTime64_ExtendedRange_SpecificTimestamps,
+        RQ_SRS_010_DateTime64_ExtendedRange_Start,
+        RQ_SRS_010_DateTime64_ExtendedRange_End,
+        RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_InvalidDate,
+        RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_InvalidTime,
+        RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_TimeZoneSwitch,
+        RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_DaylightSavingTime,
+        RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_DaylightSavingTime_Disappeared,
+        RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_LeapSeconds,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTimeZone,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYear,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toQuarter,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonth,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfYear,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfMonth,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfWeek,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toHour,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMinute,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toSecond,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toUnixTimestamp,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfYear,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfISOYear,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfQuarter,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMonth,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonday,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfWeek,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfDay,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfHour,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMinute,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfSecond,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFiveMinute,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfTenMinutes,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFifteenMinutes,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfInterval,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTime,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeYearNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeQuarterNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMonthNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeWeekNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeDayNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeHourNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMinuteNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeSecondNum,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOYear,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOWeek,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toWeek,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYearWeek,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_now,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_today,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_yesterday,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlot,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMM,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDD,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDDhhmmss,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addYears,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMonths,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addWeeks,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addDays,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addHours,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMinutes,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addSeconds,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addQuarters,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractYears,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMonths,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractWeeks,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractDays,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractHours,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMinutes,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractSeconds,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractQuarters,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_dateDiff,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlots,
+        RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_formatDateTime,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toInt_8_16_32_64_128_256_,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUInt_8_16_32_64_256_,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toFloat_32_64_,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDate,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64_FromString_MissingTime,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDecimal_32_64_128_256_,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toString,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Milli,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Micro,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Nano,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Milli,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Micro,
+        RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Nano,
+        ),
+    content='''
+# SRS-010 ClickHouse DateTime64 Extended Range
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+  * 3.1 [SRS](#srs)
+  * 3.2 [Normal Date Range](#normal-date-range)
+  * 3.3 [Extended Date Range](#extended-date-range)
+* 4 [Requirements](#requirements)
+  * 4.1 [Generic](#generic)
+      * 4.1.0.1 [RQ.SRS-010.DateTime64.ExtendedRange](#rqsrs-010datetime64extendedrange)
+      * 4.1.0.2 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start](#rqsrs-010datetime64extendedrangenormalrangestart)
+      * 4.1.0.3 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start.BeforeEpochForTimeZone](#rqsrs-010datetime64extendedrangenormalrangestartbeforeepochfortimezone)
+      * 4.1.0.4 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End](#rqsrs-010datetime64extendedrangenormalrangeend)
+      * 4.1.0.5 [RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End.AfterEpochForTimeZone](#rqsrs-010datetime64extendedrangenormalrangeendafterepochfortimezone)
+      * 4.1.0.6 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions](#rqsrs-010datetime64extendedrangetypeconversionfunctions)
+      * 4.1.0.7 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions](#rqsrs-010datetime64extendedrangedatesandtimesfunctions)
+      * 4.1.0.8 [RQ.SRS-010.DateTime64.ExtendedRange.TimeZones](#rqsrs-010datetime64extendedrangetimezones)
+      * 4.1.0.9 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime](#rqsrs-010datetime64extendedrangenonexistenttime)
+      * 4.1.0.10 [RQ.SRS-010.DateTime64.ExtendedRange.Comparison](#rqsrs-010datetime64extendedrangecomparison)
+      * 4.1.0.11 [RQ.SRS-010.DateTime64.ExtendedRange.SpecificTimestamps](#rqsrs-010datetime64extendedrangespecifictimestamps)
+  * 4.2 [Specific](#specific)
+      * 4.2.0.1 [RQ.SRS-010.DateTime64.ExtendedRange.Start](#rqsrs-010datetime64extendedrangestart)
+      * 4.2.0.2 [RQ.SRS-010.DateTime64.ExtendedRange.End](#rqsrs-010datetime64extendedrangeend)
+      * 4.2.0.3 [Non-Existent Time](#non-existent-time)
+        * 4.2.0.3.1 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidDate](#rqsrs-010datetime64extendedrangenonexistenttimeinvaliddate)
+        * 4.2.0.3.2 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidTime](#rqsrs-010datetime64extendedrangenonexistenttimeinvalidtime)
+        * 4.2.0.3.3 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.TimeZoneSwitch](#rqsrs-010datetime64extendedrangenonexistenttimetimezoneswitch)
+        * 4.2.0.3.4 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime](#rqsrs-010datetime64extendedrangenonexistenttimedaylightsavingtime)
+        * 4.2.0.3.5 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime.Disappeared](#rqsrs-010datetime64extendedrangenonexistenttimedaylightsavingtimedisappeared)
+        * 4.2.0.3.6 [RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.LeapSeconds](#rqsrs-010datetime64extendedrangenonexistenttimeleapseconds)
+      * 4.2.0.4 [Dates And Times Functions](#dates-and-times-functions)
+        * 4.2.0.4.1 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTimeZone](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstotimezone)
+        * 4.2.0.4.2 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyear)
+        * 4.2.0.4.3 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toQuarter](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoquarter)
+        * 4.2.0.4.4 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonth](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstomonth)
+        * 4.2.0.4.5 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstodayofyear)
+        * 4.2.0.4.6 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfMonth](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstodayofmonth)
+        * 4.2.0.4.7 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstodayofweek)
+        * 4.2.0.4.8 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toHour](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstohour)
+        * 4.2.0.4.9 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMinute](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstominute)
+        * 4.2.0.4.10 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toSecond](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstosecond)
+        * 4.2.0.4.11 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toUnixTimestamp](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstounixtimestamp)
+        * 4.2.0.4.12 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofyear)
+        * 4.2.0.4.13 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfISOYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofisoyear)
+        * 4.2.0.4.14 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfQuarter](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofquarter)
+        * 4.2.0.4.15 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMonth](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofmonth)
+        * 4.2.0.4.16 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonday](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstomonday)
+        * 4.2.0.4.17 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofweek)
+        * 4.2.0.4.18 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfDay](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofday)
+        * 4.2.0.4.19 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfHour](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofhour)
+        * 4.2.0.4.20 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMinute](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofminute)
+        * 4.2.0.4.21 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfSecond](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofsecond)
+        * 4.2.0.4.22 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFiveMinute](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartoffiveminute)
+        * 4.2.0.4.23 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfTenMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartoftenminutes)
+        * 4.2.0.4.24 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFifteenMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartoffifteenminutes)
+        * 4.2.0.4.25 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfInterval](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstostartofinterval)
+        * 4.2.0.4.26 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTime](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstotime)
+        * 4.2.0.4.27 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeYearNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativeyearnum)
+        * 4.2.0.4.28 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeQuarterNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativequarternum)
+        * 4.2.0.4.29 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMonthNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativemonthnum)
+        * 4.2.0.4.30 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeWeekNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativeweeknum)
+        * 4.2.0.4.31 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeDayNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativedaynum)
+        * 4.2.0.4.32 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeHourNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativehournum)
+        * 4.2.0.4.33 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMinuteNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativeminutenum)
+        * 4.2.0.4.34 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeSecondNum](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstorelativesecondnum)
+        * 4.2.0.4.35 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOYear](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoisoyear)
+        * 4.2.0.4.36 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoisoweek)
+        * 4.2.0.4.37 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoweek)
+        * 4.2.0.4.38 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYearWeek](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyearweek)
+        * 4.2.0.4.39 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.now](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsnow)
+        * 4.2.0.4.40 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.today](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoday)
+        * 4.2.0.4.41 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.yesterday](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsyesterday)
+        * 4.2.0.4.42 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlot](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstimeslot)
+        * 4.2.0.4.43 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMM](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyyyymm)
+        * 4.2.0.4.44 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDD](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyyyymmdd)
+        * 4.2.0.4.45 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDDhhmmss](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstoyyyymmddhhmmss)
+        * 4.2.0.4.46 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addYears](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddyears)
+        * 4.2.0.4.47 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMonths](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddmonths)
+        * 4.2.0.4.48 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addWeeks](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddweeks)
+        * 4.2.0.4.49 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addDays](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsadddays)
+        * 4.2.0.4.50 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addHours](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddhours)
+        * 4.2.0.4.51 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddminutes)
+        * 4.2.0.4.52 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addSeconds](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddseconds)
+        * 4.2.0.4.53 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addQuarters](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsaddquarters)
+        * 4.2.0.4.54 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractYears](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractyears)
+        * 4.2.0.4.55 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMonths](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractmonths)
+        * 4.2.0.4.56 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractWeeks](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractweeks)
+        * 4.2.0.4.57 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractDays](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractdays)
+        * 4.2.0.4.58 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractHours](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtracthours)
+        * 4.2.0.4.59 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMinutes](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractminutes)
+        * 4.2.0.4.60 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractSeconds](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractseconds)
+        * 4.2.0.4.61 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractQuarters](#rqsrs-010datetime64extendedrangedatesandtimesfunctionssubtractquarters)
+        * 4.2.0.4.62 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.dateDiff](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsdatediff)
+        * 4.2.0.4.63 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlots](#rqsrs-010datetime64extendedrangedatesandtimesfunctionstimeslots)
+        * 4.2.0.4.64 [RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.formatDateTime](#rqsrs-010datetime64extendedrangedatesandtimesfunctionsformatdatetime)
+    * 4.2.1 [Type Conversion Functions](#type-conversion-functions)
+        * 4.2.1.4.1 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toInt(8|16|32|64|128|256)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstoint8163264128256)
+        * 4.2.1.4.2 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUInt(8|16|32|64|256)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstouint8163264256)
+        * 4.2.1.4.3 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toFloat(32|64)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstofloat3264)
+        * 4.2.1.4.4 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDate](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodate)
+        * 4.2.1.4.5 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodatetime)
+        * 4.2.1.4.6 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodatetime64)
+        * 4.2.1.4.7 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64.FromString.MissingTime](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodatetime64fromstringmissingtime)
+        * 4.2.1.4.8 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDecimal(32|64|128|256)](#rqsrs-010datetime64extendedrangetypeconversionfunctionstodecimal3264128256)
+        * 4.2.1.4.9 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toString](#rqsrs-010datetime64extendedrangetypeconversionfunctionstostring)
+        * 4.2.1.4.10 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.CAST(x,T)](#rqsrs-010datetime64extendedrangetypeconversionfunctionscastxt)
+        * 4.2.1.4.11 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Milli](#rqsrs-010datetime64extendedrangetypeconversionfunctionstounixtimestamp64milli)
+        * 4.2.1.4.12 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Micro](#rqsrs-010datetime64extendedrangetypeconversionfunctionstounixtimestamp64micro)
+        * 4.2.1.4.13 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Nano](#rqsrs-010datetime64extendedrangetypeconversionfunctionstounixtimestamp64nano)
+        * 4.2.1.4.14 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Milli](#rqsrs-010datetime64extendedrangetypeconversionfunctionsfromunixtimestamp64milli)
+        * 4.2.1.4.15 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Micro](#rqsrs-010datetime64extendedrangetypeconversionfunctionsfromunixtimestamp64micro)
+        * 4.2.1.4.16 [RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Nano](#rqsrs-010datetime64extendedrangetypeconversionfunctionsfromunixtimestamp64nano)
+* 5 [References](#references)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This document will cover requirements to support extended range for the [DateTime64] data type
+that is outside the normal **1970** (1970-01-02 00:00:00 UTC) to **2105** (2105-12-31 23:59:59.99999 UTC) date range.
+
+## Terminology
+
+### SRS
+
+Software Requirements Specification
+
+### Normal Date Range
+
+**1970** `1970-01-02T00:00:00.000000` to **2105** `2105-12-31T23:59:59.99999`
+
+### Extended Date Range
+
+**1925** `1925-01-01T00:00:00.000000` to **2238** `2238-12-31 23:59:59.99999`
+
+## Requirements
+
+### Generic
+
+##### RQ.SRS-010.DateTime64.ExtendedRange
+version: 1.0
+
+[ClickHouse] SHALL support extended range for the [DateTime64] data type that includes dates from the year **1925** to **2238**.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the normal date range that starts at `1970-01-01 00:00:00.000`
+expressed using the [ISO 8601 format].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.Start.BeforeEpochForTimeZone
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the start of the [normal date range]
+when this time for the time zone is before the start of the [normal date range].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the normal date range that ends at `2105-12-31T23:59:59.99999`
+expressed using the [ISO 8601 format].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NormalRange.End.AfterEpochForTimeZone
+version: 1.0
+
+[ClickHouse] SHALL support proper time handling around the end of the [normal date range]
+when this time for the time zone is after the end of the [normal date range].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions
+version: 1.0
+
+[ClickHouse] SHALL support proper conversion to and from [DateTime64] data type from other data types.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions
+version: 1.0
+
+[ClickHouse] SHALL support correct operation of the [Dates and Times Functions] with the [DateTime64] data type
+when it stores dates within the [normal date range] and the [extended date range].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.TimeZones
+version: 1.0
+
+[ClickHouse] SHALL support correct operation with the [DateTime64] extended range data type
+when combined with a supported time zone.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of non-existent times when using [DateTime64] extended range data type.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.Comparison
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of time comparison when using [DateTime64] extended range data type.
+For example, `SELECT toDateTime64('2019-05-05 20:20:12.050', 3) < now()`.
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.SpecificTimestamps
+version: 1.0
+
+[ClickHouse] SHALL properly work with the following timestamps in all supported timezones:
+```
+[9961200,73476000,325666800,354675600,370400400,386125200,388566010,401850000,417574811,496803600,528253200,624423614,636516015,671011200,717555600,752047218,859683600,922582800,1018173600,1035705600,1143334800,1162105223,1174784400,1194156000,1206838823,1224982823,1236495624,1319936400,1319936424,1425798025,1459040400,1509872400,2090451627,2140668000]
+```
+
+
+### Specific
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.Start
+version: 1.0
+
+[ClickHouse] SHALL support extended range for the [DateTime64] data type that starts at `1925-01-01T00:00:00.000000`
+expressed using the [ISO 8601 format].
+
+##### RQ.SRS-010.DateTime64.ExtendedRange.End
+version: 1.0
+
+[ClickHouse] SHALL support extended range for the [DateTime64] data type that ends at `2238-12-31T23:59:59.999999`
+expressed using the [ISO 8601 format].
+
+##### Non-Existent Time
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidDate
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid dates when using [DateTime64] extended range data type,
+such as:
+
+* `YYYY-04-31, YYYY-06-31, YYYY-09-31, YYYY-11-31`
+* `1990-02-30 00:00:02`
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.InvalidTime
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time for a timezone
+when using [DateTime64] extended range data type, for example,
+
+* `2002-04-07 02:30:00` never happened at all in the US/Eastern timezone ([Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime))
+
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.TimeZoneSwitch
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type
+when the invalid time is caused when *countries switch timezone definitions with no
+daylight savings time switch* [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime).
+
+>
+> For example, in 1915 Warsaw switched from Warsaw time to Central European time with
+> no daylight savings transition. So at the stroke of midnight on August 5th 1915 the clocks
+> were wound back 24 minutes creating an ambiguous time period that cannot be specified without
+> referring to the timezone abbreviation or the actual UTC offset. In this case midnight happened twice,
+> neither time during a daylight saving time period. pytz handles this transition by treating the ambiguous
+> period before the switch as daylight savings time, and the ambiguous period after as standard time.
+>
+> [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime)
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type
+when for a given timezone time switches from standard to daylight saving.
+
+> For example, in the US/Eastern timezone on the last Sunday morning in October, the following sequence happens:
+>
+> 01:00 EDT occurs
+> 1 hour later, instead of 2:00am the clock is turned back 1 hour and 01:00 happens again (this time 01:00 EST)
+> In fact, every instant between 01:00 and 02:00 occurs twice.
+> [Stuart Bishop: pytz library](http://pytz.sourceforge.net/#problems-with-localtime)
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.DaylightSavingTime.Disappeared
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of invalid time when using [DateTime64] extended range data type
+for a given timezone when transition from the standard to daylight saving time causes an hour to disappear.
+
+Expected behavior: if DateTime64 initialized by a skipped time value, it is being treated as DST and resulting value will be an hour earlier, e.g. `SELECT toDateTime64('2020-03-08 02:34:00', 0, 'America/Denver')` returns `2020-03-08 01:34:00`.
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.NonExistentTime.LeapSeconds
+version: 1.0
+
+[ClickHouse] SHALL support proper handling of leap seconds adjustments when using [DateTime64] extended range data type.
+
+##### Dates And Times Functions
+
+###### 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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
+
+
+#### Type Conversion Functions
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toInt(8|16|32|64|128|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 integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.tech/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.
+
+###### 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.
+
+###### 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.
+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.
+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
+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
+when value of the string is missing the `hh:mm-ss.sss` part.
+For example, `toDateTime64('2020-01-01', 3)`.
+
+###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDecimal(32|64|128|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 [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.
+
+###### 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.
+
+###### 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.
+
+###### 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.
+
+###### 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.
+
+###### 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.
+
+###### 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
+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.
+
+###### 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
+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.
+
+###### 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
+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.
+
+## References
+
+* **DateTime64**: https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/
+* **ISO 8601 format**: https://en.wikipedia.org/wiki/ISO_8601
+* **ClickHouse:** https://clickhouse.tech
+* **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/
+
+[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/
+[ISO 8601 format]: https://en.wikipedia.org/wiki/ISO_8601
+[ClickHouse]: https://clickhouse.tech
+[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/
+[GitHub]: https://github.com
+''')
diff --git a/tests/testflows/datetime64_extended_range/tests/common.py b/tests/testflows/datetime64_extended_range/tests/common.py
new file mode 100644
index 00000000000..f30381d2f9e
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/tests/common.py
@@ -0,0 +1,176 @@
+import pytz
+import datetime
+
+from testflows.core import *
+from testflows.asserts import error
+from contextlib import contextmanager
+from datetime64_extended_range.common import *
+
+
+def in_normal_range(dt: datetime.datetime):
+    """Check if DateTime is in normal range
+    """
+    return dt <= datetime.datetime(2105, 12, 31, 23, 59, 59, 999999) and dt >= datetime.datetime(1970, 1, 1, 0, 0, 0)
+
+
+def years_range(stress=False, padding=(0, 0)):
+    """Returns a set of year values used for testing.
+    """
+    return range(1925+padding[0], 2283-padding[1]) if stress else (1927, 2000, 2281)
+
+
+def timezones_range(stress=False):
+    """Returns a set of timezone values used for testing.
+    """
+    if stress:
+        return pytz.all_timezones
+    else:
+        return ['UTC', 'Asia/Novosibirsk', 'America/Denver']
+
+
+@contextmanager
+def create_table(timezone, node):
+    try:
+        node.query(f"CREATE TABLE dt(timestamp DateTime64(3, {timezone})) Engine = TinyLog")
+        yield
+    finally:
+        node.query("DROP TABLE dt")
+
+
+@TestOutline
+def insert_check_datetime(self, datetime, expected, precision=0, timezone="UTC"):
+    """Check how a particular datetime value works with different
+    functions that accept DateTime64 data type.
+
+    :param datetime: datetime string
+    :param expected: expected result
+    :param precision: time precision, default: 0
+    :param timezone: timezone, default: UTC
+    """
+    with create_table(timezone, self.context.node):
+        with When("I use toDateTime64"):
+            r = self.context.node.query(f"SELECT toDateTime64('{datetime}', {precision}, '{timezone}')")
+
+    with Then(f"I expect {expected}"):
+        assert r.output == expected, error()
+
+
+def datetime_generator(year, microseconds=False):
+    """Helper generator
+    """
+    date = datetime.datetime(year, 1, 1, 0, 0, 0)
+    if microseconds:
+        date = datetime.datetime(year, 1, 1, 0, 0, 0, 123000)
+    while not (date.month == 12 and date.day == 31):
+        yield date
+        date = date + datetime.timedelta(days=1, hours=1, minutes=1, seconds=1)
+
+
+def select_dates_in_year(year, stress=False, microseconds=False):
+    """Returns various datetimes in a year that are to be checked
+    """
+    if not stress:
+        dates = [datetime.datetime(year, 1, 1, 0, 0, 0), datetime.datetime(year, 12, 31, 23, 59, 59)]
+        if microseconds:
+            dates = [datetime.datetime(year, 1, 1, 0, 0, 0, 123000), datetime.datetime(year, 12, 31, 23, 59, 59, 123000)]
+        if year % 4 == 0 and (year % 100 != 0 or year % 400 == 0):
+            dates.append(datetime.datetime(year, 2, 29, 11, 11, 11, 123000))
+        return dates
+    else:
+        return datetime_generator(year)
+
+
+@TestOutline
+def select_check_datetime(self, datetime, expected, precision=0, timezone="UTC"):
+    """Check how a particular datetime value works with different
+    functions that accept DateTime64 data type.
+
+    :param datetime: datetime string
+    :param expected: expected result
+    :param precision: time precision, default: 0
+    :param timezone: timezone, default: UTC
+    """
+    with When("I use toDateTime64"):
+        r = self.context.node.query(f"SELECT toDateTime64('{datetime}', {precision}, '{timezone}')")
+
+    with Then(f"I expect {expected}"):
+        assert r.output == expected, error()
+
+
+@TestStep(When)
+def exec_query(self, request, expected=None, exitcode=None):
+    """Execute a query and check expected result.
+    :param request: query string
+    :param expected: result string
+    :param exitcode: exitcode
+    """
+    r = self.context.node.query(request)
+
+    if expected is not None:
+        with Then(f"output should match the expected", description=f"{expected}"):
+            assert r.output == expected, error()
+
+    elif exitcode is not None:
+        with Then(f"output exitcode should match expected", description=f"{exitcode}"):
+            assert r.exitcode == exitcode, error()
+
+
+@TestStep
+def walk_datetime_in_incrementing_steps(self, date, hrs_range=(0, 24), step=1, timezone="UTC", precision=0):
+    """Sweep time starting from some start date. The time is incremented
+    in steps specified by the `step` parameter
+    (default: 1 min).
+
+    :param hrs_range: range in hours
+    :param step: step in minutes
+    """
+
+    stress = self.context.stress
+    secs = f"00{'.' * (precision > 0)}{'0' * precision}"
+
+    tasks = []
+    with Pool(2) as pool:
+        try:
+            with When(f"I loop through datetime range {hrs_range} starting from {date} in {step}min increments"):
+                for hrs in range(*hrs_range) if stress else (hrs_range[0], hrs_range[1]-1):
+                    for mins in range(0, 60, step) if stress else (0, 59):
+                        datetime = f"{date} {str(hrs).zfill(2)}:{str(mins).zfill(2)}:{secs}"
+                        expected = datetime
+
+                        with When(f"time is {datetime}"):
+                            run_scenario(pool, tasks, Test(name=f"{hrs}:{mins}:{secs}", test=select_check_datetime),
+                                         kwargs=dict(datetime=datetime, precision=precision, timezone=timezone,
+                                                     expected=expected))
+        finally:
+            join(tasks)
+
+
+@TestStep
+def walk_datetime_in_decrementing_steps(self, date, hrs_range=(23, 0), step=1, timezone="UTC", precision=0):
+    """Sweep time starting from some start date. The time is decremented
+    in steps specified by the `step` parameter
+    (default: 1 min).
+
+    :param date: string
+    :param hrs_range: range in hours
+    :param step: step in minutes
+    :param timezone: String
+    """
+    stress = self.context.stress
+    secs = f"00{'.' * (precision > 0)}{'0' * precision}"
+
+    tasks = []
+    with Pool(2) as pool:
+        try:
+            with When(f"I loop through datetime range {hrs_range} starting from {date} in {step}min decrements"):
+                for hrs in range(*hrs_range, -1) if stress else (hrs_range[1], hrs_range[0]):
+                    for mins in range(59, 0, -step) if stress else (59, 0):
+                        datetime = f"{date} {str(hrs).zfill(2)}:{str(mins).zfill(2)}:{secs}"
+                        expected = datetime
+
+                        with When(f"time is {datetime}"):
+                            run_scenario(pool, tasks, Test(name=f"{hrs}:{mins}:{secs}", test=select_check_datetime),
+                                         kwargs=dict(datetime=datetime, precision=precision, timezone=timezone,
+                                                     expected=expected))
+        finally:
+            join(tasks)
diff --git a/tests/testflows/datetime64_extended_range/tests/date_time_functions.py b/tests/testflows/datetime64_extended_range/tests/date_time_functions.py
new file mode 100644
index 00000000000..b0b22f82452
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/tests/date_time_functions.py
@@ -0,0 +1,1545 @@
+import time
+import pytz
+import itertools
+from testflows.core import *
+import dateutil.relativedelta as rd
+from datetime import datetime, timedelta
+
+from datetime64_extended_range.requirements.requirements import *
+from datetime64_extended_range.common import *
+from datetime64_extended_range.tests.common import *
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTimeZone("1.0")
+)
+def to_time_zone(self):
+    """Check the toTimeZone() function with DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for dt in datetimes:
+            for tz1, tz2 in itertools.product(timezones, timezones):
+                with Step(f"{dt} {tz1} -> {tz2}"):
+                    with By("Computing expected output using pytz"):
+                        dt_local = pytz.timezone(tz1).localize(dt)
+                        dt_transformed = dt_local.astimezone(pytz.timezone(tz2))
+                        tz2_expected = dt_transformed.strftime("%Y-%m-%d %H:%M:%S")
+                    with And("Forming a toTimeZone ClickHouse query"):
+                        tz1_query = dt_local.strftime("%Y-%m-%d %H:%M:%S")
+                        query = f"SELECT toTimeZone(toDateTime64('{tz1_query}', 0, '{tz1}'), '{tz2}')"
+                    with Then(f"I execute query", flags=TE):
+                        exec_query(request=query, expected=f"{tz2_expected}")
+
+
+@TestOutline
+def to_date_part(self, py_func, ch_func):
+    """Check the toYear/toMonth/toQuarter functions with DateTime64 extended range.
+    """
+    stress = self.context.stress
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+            timezones = timezones_range(stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    with Step(f"{dt} {tz1}, {tz2}"):
+                        with Given("I compute expected output using pytz"):
+                            with By(f"localizing {dt} using {tz1} timezone"):
+                                time_tz1 = pytz.timezone(tz1).localize(dt)
+                            with And(f"converting {tz1} local datetime {dt} to {tz2} timezone"):
+                                time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                            with And(f"calling the '{py_func}' method of the datetime object to get expected result"):
+                                result = eval(f"(time_tz2.{py_func}")
+                            expected = f"{result}"
+                        with And(f"Forming a {ch_func} ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT {ch_func}(toDateTime64('{dt_str}', 0, '{tz1}'), '{tz2}')"
+                        with Then(f"I execute query that uses '{ch_func}' function"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYear("1.0"),
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeYearNum("1.0")
+)
+def to_year(self):
+    """Check the toYear() and toRelativeYearNum() [which is just an alias for toYear]
+    function with DateTime64 extended range.
+    """
+    to_date_part(py_func="year)", ch_func="toYear")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonth("1.0")
+)
+def to_month(self):
+    """Check the toMonth() function with DateTime64 extended range.
+    """
+    to_date_part(py_func="month)", ch_func="toMonth")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toQuarter("1.0")
+)
+def to_quarter(self):
+    """Check the toQuarter() function with DateTime64 extended range
+    by comparing the output of the toQuarter() function with
+    the value of the 'month' attribute of the datetime object
+    divided by 3 (because each quarter has 3 month) plus 1
+    (because we starting the count from 1).
+    """
+    to_date_part(py_func="month - 1)//3 + 1", ch_func="toQuarter")
+
+
+@TestOutline
+def to_day_of(self, py_func, ch_func):
+    """Check the toDayOf....() functions with DateTime64 extended range.
+    """
+    stress = self.context.stress
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+            timezones = timezones_range(stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    with When(f"{dt} {tz1} -> {tz2}"):
+                        with By("Computing expected result using pytz"):
+                            time_tz1 = pytz.timezone(tz1).localize(dt)
+                            time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                            result = eval(f"time_tz2.timetuple().{py_func}")
+                            if py_func == "tm_wday":
+                                result += 1
+                            expected = f"{result}"
+                        with And(f"Forming a {ch_func} ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT {ch_func}(toDateTime64('{dt_str}', 0, '{tz1}'), '{tz2}')"
+                        with Then(f"I execute {ch_func} query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfYear("1.0")
+)
+def to_day_of_year(self):
+    """Check toDayOfYear() function with DateTime64 extended range date time.
+    """
+    to_day_of(py_func="tm_yday", ch_func="toDayOfYear")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfMonth("1.0")
+)
+def to_day_of_month(self):
+    """Check toDayOfMonth() function with DateTime64 extended range date time.
+    """
+    to_day_of(py_func="tm_mday", ch_func="toDayOfMonth")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfWeek("1.0")
+)
+def to_day_of_week(self):
+    """Check toDayOfWeek() function with DateTime64 extended range date time.
+    """
+    to_day_of(py_func="tm_wday", ch_func="toDayOfWeek")
+
+
+@TestOutline
+def to_time_part(self, py_func, ch_func):
+    """Check the functions like toHour/toMinute/toSecond with DateTime64 extended range.
+    """
+    stress = self.context.stress
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+            timezones = timezones_range(stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    with Step(f"{dt} {tz1} -> {tz2}"):
+                        with By("computing expected result using pytz"):
+                            time_tz1 = pytz.timezone(tz1).localize(dt)
+                            time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                            result = eval(f"time_tz2.{py_func}")
+                            expected = f"{result}"
+                        with And("forming a ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT {ch_func}(toDateTime64('{dt_str}', 0, '{tz1}'), '{tz2}')"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toHour("1.0")
+)
+def to_hour(self):
+    """Check toHour() function with DateTime64 extended range date time.
+    """
+    to_time_part(py_func="hour", ch_func="toHour")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMinute("1.0")
+)
+def to_minute(self):
+    """Check toMinute() function with DateTime64 extended range date time.
+    """
+    to_time_part(py_func="minute", ch_func="toMinute")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toSecond("1.0")
+)
+def to_second(self):
+    """Check toSecond() function with DateTime64 extended range date time.
+    """
+    to_time_part(py_func="second", ch_func="toSecond")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toUnixTimestamp("1.0")
+)
+def to_unix_timestamp(self):
+    """Check the toUnixTimestamp() function with DateTime64 extended range
+    """
+    stress = self.context.stress
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+            timezones = timezones_range(stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result using python"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            expected = f"{int(time.mktime(datetime.datetime.now().timetuple()))}"
+                        with And("forming a ClickHouse query"):
+                            query = f"SELECT toUnixTimestamp(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=expected)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfYear("1.0")
+)
+def to_start_of_year(self):
+    """Check the functions toStartOfYear with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    with Step(f"{dt} {tz1} -> {tz2}"):
+                        with By("computing expected time using python"):
+                            time_tz1 = pytz.timezone(tz1).localize(dt)
+                            time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                            expected = f"{time_tz2.year}-01-01"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toStartOfYear(toDateTime64('{dt_str}', 0, '{tz1}'), '{tz2}')"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+def iso_year_start(dt):
+    """Helper to find the beginning of iso year."""
+    dt_s = datetime.datetime(dt.year-1, 12, 23, 0, 0, 0)
+    while dt_s.isocalendar()[0] != dt.year:
+        dt_s += datetime.timedelta(days=1)
+    return dt_s
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfISOYear("1.0")
+)
+def to_start_of_iso_year(self):
+    """Check the functions toStartOfISOYear with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("Computing expected result using Python"):
+                            expected = iso_year_start(dt)
+                        with And("Forming a toStartOfISOYear ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toStartOfISOYear(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute toStartOfISOYear query"):
+                            exec_query(request=query, expected=f"{expected.strftime('%Y-%m-%d')}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfQuarter("1.0")
+)
+def to_start_of_quarter(self):
+    """Check the functions toStartOfQuarter with
+    DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    with Step(f"{dt} {tz1} -> {tz2}"):
+                        with By("computing expected result with python"):
+                            time_tz1 = pytz.timezone(tz1).localize(dt)
+                            time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                            expected = f"{year}-{str(time_tz2.month//3 * 3 + 1).zfill(2)}-01"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toStartOfQuarter(toDateTime64('{dt_str}', 0, '{tz1}'), '{tz2}')"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMonth("1.0")
+)
+def to_start_of_month(self):
+    """Check the functions toStartOfMonth with
+    DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    with Step(f"{dt} {tz1} -> {tz2}"):
+                        with By("computing expected result with python"):
+                            time_tz1 = pytz.timezone(tz1).localize(dt)
+                            time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                            expected = f"{time_tz2.strftime('%Y-%m')}-01"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toStartOfQuarter(toDateTime64('{dt_str}', 0, '{tz1}'), '{tz2}')"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonday("1.0")
+)
+def to_monday(self):
+    """Check the functions toMonday with
+    DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    with Step(f"{dt} {tz1} -> {tz2}"):
+                        with By("computing expected result with python"):
+                            time_tz1 = pytz.timezone(tz1).localize(dt)
+                            time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                            expected_date = time_tz2 + datetime.timedelta(days=(-dt.weekday() if dt.weekday() <= 3 else 7 - dt.weekday()))
+                            expected = f"{expected_date.strftime('%Y-%m-%d')}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toMonday(toDateTime64('{dt_str}', 0, '{tz1}'), '{tz2}')"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfWeek("1.0")
+)
+def to_start_of_week(self):
+    """Check the functions toStartOfWeek with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz1, tz2 in itertools.product(timezones, timezones):
+                    for mode in (0, 1):   # mode - week beginning, either 0 (Sunday) or 1 (Monday)
+                        with Step(f"{dt} {tz1} -> {tz2}"):
+                            with By("computing expected result with python"):
+                                time_tz1 = pytz.timezone(tz1).localize(dt)
+                                time_tz2 = time_tz1.astimezone(pytz.timezone(tz2))
+                                expected_date = time_tz2 + datetime.timedelta(
+                                        days=(mode - dt.weekday() if dt.weekday() <= (3+mode) else (mode + 7) - dt.weekday()))
+                                expected = f"{expected_date.strftime('%Y-%m-%d')}"
+                            with And("forming ClickHouse query"):
+                                dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                                query = f"SELECT toStartOfWeek(toDateTime64('{dt_str}', 0, '{tz1}'), {mode}, '{tz2}')"
+                            with Then("I execute query"):
+                                exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfDay("1.0")
+)
+def to_start_of_day(self):
+    """Check the functions toStartOfDay with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result with python"):
+                            expected = f"{dt.strftime('%Y-%m-%d')} 00:00:00"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toStartOfDay(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfHour("1.0")
+)
+def to_start_of_hour(self):
+    """Check the functions toStartOfHour with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result with python"):
+                            expected = f"{dt.strftime('%Y-%m-%d %H')}:00:00"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toStartOfHour(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMinute("1.0")
+)
+def to_start_of_minute(self):
+    """Check the functions toStartOfMinute with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result with python"):
+                            expected = f"{dt.strftime('%Y-%m-%d %H:%M')}:00"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toStartOfMinute(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfSecond("1.0")
+)
+def to_start_of_second(self):
+    """Check the functions toStartOfSecond with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result with python"):
+                            expected = f"{dt.strftime('%Y-%m-%d %H:%M:%S')}.000000"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S.%f")
+                            query = f"SELECT toStartOfSecond(toDateTime64('{dt_str}', 6, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline
+def to_start_of_minutes_interval(self, interval, func):
+    """Check the functions like toStartOf....Minute with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("Computing expected result using python"):
+                            mins = dt.minute // interval * interval
+                            expected = f"{dt.strftime('%Y-%m-%d %H:')}{str(mins).zfill(2)}:00"
+                        with And(f"Forming a {func} query to ClickHouse"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT {func}(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then(f"I execute {func} query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFiveMinute("1.0")
+)
+def to_start_of_five_minute(self):
+    """Check the toStartOfFiveMinute with DateTime64 extended range."""
+    to_start_of_minutes_interval(interval=5, func="toStartOfFiveMinute")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfTenMinutes("1.0")
+)
+def to_start_of_ten_minutes(self):
+    """Check the toStartOfTenMinutes with DateTime64 extended range."""
+    to_start_of_minutes_interval(interval=10, func="toStartOfTenMinutes")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFifteenMinutes("1.0")
+)
+def to_start_of_fifteen_minutes(self):
+    """Check the toStartOfFifteenMinutes with DateTime64 extended range."""
+    to_start_of_minutes_interval(interval=15, func="toStartOfFifteenMinutes")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlot("1.0")
+)
+def time_slot(self):
+    """Check the timeSlot with DateTime64 extended range."""
+    to_start_of_minutes_interval(interval=30, func="timeSlot")
+
+
+def to_start_of_interval_helper(dt: datetime.datetime, interval_type, interval_value):
+    """A helper to switch through all possible intervals. Computes the interval beginning depending on
+    interval_type and interval_value, returns string expected to be returned by ClickHouse.
+    :param dt: datetime to be checked, datetime.datetime
+    :param interval_type: interval type selector, String
+    :param interval_value: interval size, int
+    """
+    intervals_in_seconds = {"SECOND": 1, "MINUTE": 60, "HOUR": 3600, "DAY": 68400, "WEEK": 604800}
+    zero_datetime = datetime.datetime(1970, 1, 1, 0, 0, 0)
+    delta = dt - zero_datetime
+
+    if interval_type in intervals_in_seconds.keys():
+        divisor = interval_value * intervals_in_seconds[interval_type]
+        retval = (zero_datetime + datetime.timedelta(seconds=(delta.seconds // divisor * divisor)))
+        if interval_type == "WEEK":
+            return retval.strftime("%Y-%m-%d")
+        return retval.strftime("%Y-%m-%d %H:%M:%S")
+
+    elif interval_type == "MONTH":
+        diff = (dt.year - zero_datetime.year) * 12 + (dt.month - zero_datetime.month)
+        result_diff = diff // interval_value * interval_value
+        return (zero_datetime + rd.relativedelta(months=result_diff)).strftime("%Y-%m-%d")
+
+    elif interval_type == "QUARTER":
+        diff = (dt.year - zero_datetime.year) * 4 + (dt.month // 4 - zero_datetime.month // 4)
+        result_diff = diff // interval_value * interval_value
+        return (zero_datetime + rd.relativedelta(months=result_diff*4)).strftime("%Y-%m-%d")
+
+    elif interval_type == "YEAR":
+        result_diff = (dt.year - zero_datetime.year) // interval_value * interval_value
+        return (zero_datetime + rd.relativedelta(years=result_diff)).strftime("%Y-%m-%d")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfInterval("1.0")
+)
+def to_start_of_interval(self):
+    """Check the toStartOfInterval with DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    intervals_testing_ranges = {"SECOND": range(1, 15), "MINUTE": range(1, 15), "HOUR": range(1, 10), "DAY": (1, 5, 10),
+                                "WEEK": range(1, 5), "MONTH": range(1, 6), "QUARTER": range(1, 4), "YEAR": range(1, 5)}
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    for interval in intervals_testing_ranges.keys():
+                        for value in intervals_testing_ranges[interval]:
+                            with Step(f"{dt} {tz} {interval}: {value}"):
+                                with By("Computing expected result using python"):
+                                    expected = to_start_of_interval_helper(dt, interval, value)
+                                with And(f"Forming a toStartOfInterval() query to ClickHouse"):
+                                    dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                                    query = f"SELECT toStartOfInterval(toDateTime64('{dt_str}', 0, '{tz}'), INTERVAL {value} {interval})"
+                                with Then(f"I execute toStartOfInterval() query"):
+                                    exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline
+def to_iso(self, func, isocalendar_pos):
+    """Check the toISOYear/Week functions with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computimg expected result uning python"):
+                            expected = f"{dt.isocalendar()[isocalendar_pos]}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT {func}(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOYear("1.0")
+)
+def to_iso_year(self):
+    """Check the toISOYear function with DateTime64 extended range."""
+    to_iso(func="toISOYear", isocalendar_pos=0)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOWeek("1.0")
+)
+def to_iso_week(self):
+    """Check the toISOWeek function with DateTime64 extended range."""
+    to_iso(func="toISOWeek", isocalendar_pos=1)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTime("1.0")
+)
+def to_time(self):
+    """Check the toTime function with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with When(f"{dt} {tz}"):
+                        with By("computing expected result using python"):
+                            expected = f"1970-01-02 {dt.strftime('%H:%M:%S')}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toTime(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeQuarterNum("1.0")
+)
+def to_relative_quarter_num(self):
+    """Check the toRelativeQuarterNum function with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with When(f"{dt} {tz}"):
+                        with By("computing expected result using python"):
+                            expected = f"{(year-1970)*4 + (dt.month - 1) // 3}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toRelativeQuarterNum(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeWeekNum("1.0")
+)
+def to_relative_week_num(self):
+    """Check the toRelativeWeekNum function with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with When(f"{dt} {tz}"):
+                        with By("computing expected result using python"):
+                            week_num = ((dt + datetime.timedelta(days=8) - datetime.timedelta(days=dt.weekday())) - datetime.datetime(1970, 1, 1, 0, 0, 0)).days // 7
+                            expected = f"{week_num}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toRelativeWeekNum(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMonthNum("1.0")
+)
+def to_relative_month_num(self):
+    """Check the toRelativeMonthNum function with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with When(f"{dt} {tz}"):
+                        with By("computing expected result using python"):
+                            month_num = (year - 1970) * 12 + dt.month
+                            expected = f"{month_num}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toRelativeMonthNum(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeDayNum("1.0")
+)
+def to_relative_day_num(self):
+    """Check the toRelativeDayNum function with DateTime64 extended range."""
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with When(f"{dt} {tz}"):
+                        with By("Computing the expected result using python"):
+                            day_num = (dt - datetime.datetime(1970, 1, 1, 0, 0, 0)).days
+                            expected = f"{day_num}"
+                        with And(f"Forming a toRelativeDayNum query to ClickHouse"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toRelativeDayNum(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute toRelativeDayNum query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline
+def to_relative_time(self, divisor, func):
+    """Check the toRelative[Hour/Minute/Second]Num functions
+    with DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with When(f"{dt} {tz}"):
+                        with By("Computing the expected result using python"):
+                            result = (dt - datetime.datetime(1970, 1, 1, 0, 0, 0)).total_seconds() // divisor
+                            expected = f"{result}"
+                        with And(f"Forming a {func} query to ClickHouse"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT {func}(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then(f"I execute {func} query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeHourNum("1.0")
+)
+def to_relative_hour_num(self):
+    """Check the toRelativeHourNum function
+    with DateTime64 extended range.
+    """
+    to_relative_time(func="toRelativeHourNum", divisor=3600)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMinuteNum("1.0")
+)
+def to_relative_minute_num(self):
+    """Check the toRelativeMinuteNum function
+    with DateTime64 extended range.
+    """
+    to_relative_time(func="toRelativeMinuteNum", divisor=60)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeSecondNum("1.0")
+)
+def to_relative_second_num(self):
+    """Check the toRelativeSecondNum function
+    with DateTime64 extended range.
+    """
+    to_relative_time(func="toRelativeSecondNum", divisor=1)
+
+
+def to_week_compute_expected(dt: datetime.datetime, mode: int, ret_year=False):
+    """Helper to get the expected value for testing toWeek().
+    Due to necessity to manually check 10 workmodes, the subroutine was removed from to_week()
+    """
+    year = dt.year
+
+    ex = datetime.datetime(year, 1, 1)
+    j1_weekday = ex.weekday()
+
+    while ex.weekday() != 0:
+        ex += datetime.timedelta(days=1)
+    first_monday = ex.day-1
+
+    ex = datetime.datetime(year, 1, 1)
+    while ex.weekday() != 6:
+        ex += datetime.timedelta(days=1)
+    first_sunday = ex.day-1
+
+    if mode == 0:
+        # First day of week: Sunday, Week 1 is the first week with Sunday, range 0-53
+        expected = (dt - datetime.datetime(year, 1, 1) - datetime.timedelta(days=first_sunday)).days // 7 + 1
+
+    elif mode == 1:
+        # First day of week: Monday, Week 1 is the first week containing 4 or more days, range 0-53
+        if j1_weekday <= 3:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=7+j1_weekday)).days // 7
+        else:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=j1_weekday)).days // 7
+
+    elif mode == 2:
+        # First day of week: Sunday, Week 1 is the first week with Sunday, range 1-53
+        expected = (dt - datetime.datetime(year, 1, 1) - datetime.timedelta(days=first_sunday)).days // 7 + 1
+        if expected == 0:
+            return to_week_compute_expected(datetime.datetime(dt.year-1, 12, 31), 2)
+
+    elif mode == 3:
+        # First day of week: Monday, Week 1 is the first week containing 4 or more days, range 1-53
+        if j1_weekday <= 3:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=7+j1_weekday)).days // 7
+        else:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=j1_weekday)).days // 7
+        if expected == 0:
+            return to_week_compute_expected(datetime.datetime(dt.year-1, 12, 31), 3)
+
+    elif mode == 4:
+        # First day of week: Sunday, Week 1 is the first week containing 4 or more days, range 0-53
+        if j1_weekday <= 3:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=8+j1_weekday)).days // 7
+        else:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=j1_weekday+1)).days // 7
+
+    elif mode == 5:
+        # First day of week: Monday, Week 1 is the first week with a Monday, range 0-53
+        expected = (dt - datetime.datetime(year, 1, 1) - datetime.timedelta(days=first_monday)).days // 7 + 1
+
+    elif mode == 6:
+        # First day of week: Sunday, Week 1 is the first week containing 4 or more days, range 1-53
+        if j1_weekday <= 3:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=8+j1_weekday)).days // 7
+        else:
+            expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=j1_weekday+1)).days // 7
+        if expected == 0:
+            return to_week_compute_expected(datetime.datetime(dt.year-1, 12, 31), 6)
+
+    elif mode == 7:
+        # First day of week: Monday, Week 1 is the first week with a Monday, range 1-53
+        expected = (dt - datetime.datetime(year, 1, 1) - datetime.timedelta(days=first_monday)).days // 7 + 1
+        if expected == 0:
+            return to_week_compute_expected(datetime.datetime(dt.year-1, 12, 31), 7)
+
+    elif mode == 8:
+        # First day of week: Sunday, Week 1 is the week containing January 1, range 1-53
+        expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=(j1_weekday+1)%7)).days // 7 + 1
+
+    elif mode == 9:
+        # First day of week: Monday, Week 1 is the week containing January 1, range 1-53
+        expected = (dt - datetime.datetime(year, 1, 1) + datetime.timedelta(days=j1_weekday%7)).days // 7 + 1
+
+    return f"{dt.year}{str(expected).zfill(2)}" if ret_year else f"{expected}"
+
+
+@TestOutline
+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
+    :param self: current test
+    :param clh_func: ClickHouse function to be called, string
+    :param ret_year: toWeek/toYearWeek selector, Boolean
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    for mode in range(0, 10):
+                        with When(f"{dt} {tz}, mode={mode}"):
+                            with By("Computing expected output using python"):
+                                expected = to_week_compute_expected(dt=dt, mode=mode, ret_year=ret_year)
+                            with And(f"Forming a {clh_func} query"):
+                                dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                                query = f"SELECT {clh_func}(toDateTime64('{dt_str}', 0, '{tz}'), {mode})"
+                            with When(f"I execute the {clh_func} query"):
+                                exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toWeek("1.0")
+)
+def to_week(self):
+    """Check the toWeek function with DateTime64 extended range."""
+    to_week_year_week(clh_func="toWeek", ret_year=False)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYearWeek("1.0")
+)
+def to_year_week(self):
+    """Check the toYearWeek function with DateTime64 extended range."""
+    to_week_year_week(clh_func="toYearWeek", ret_year=True)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMM("1.0")
+)
+def to_yyyymm(self):
+    """Check the toYYYYMM() function with
+    DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result in python"):
+                            expected = f"{dt.strftime('%Y%m')}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toYYYYMM(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDD("1.0")
+)
+def to_yyyymmdd(self):
+    """Check the toYYYYMMDD() function with
+    DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result in python"):
+                            expected = f"{dt.strftime('%Y%m%d')}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toYYYYMMDD(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query", description=f"expected {expected}", flags=TE):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDDhhmmss("1.0")
+)
+def to_yyyymmddhhmmss(self):
+    """Check the toYYYYMMDDhhmmss() function with
+    DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    with Step(f"{dt} {tz}"):
+                        with By("computing expected result in python"):
+                            expected = f"{dt.strftime('%Y%m%d%H%M%S')}"
+                        with And("forming ClickHouse query"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            query = f"SELECT toYYYYMMDDhhmmss(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with Then("I execute query"):
+                            exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_now("1.0")
+)
+def now(self):
+    """Check the now() conversion to DateTime64 extended range.
+    In this test, we cannot assure that pytz now() and ClickHouse now() will be executed at the same time, so we need
+    a 30-second error tolerance to test this functionality
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for tz in timezones:
+        with Given(f"I record current time and localize it for {tz}"):
+            dt = datetime.datetime.now()
+            dt = dt.astimezone(pytz.timezone(tz))
+
+        with Step(f"{dt} in {tz}"):
+            with When("I execute query and format its result to string"):
+                r = self.context.node.query(f"SELECT toDateTime64(now(), 0, '{tz}')")
+                query_result = r.output
+                received_dt = datetime.datetime.strptime(query_result, '%Y-%m-%d %H:%M:%S')
+
+            with Then("I compute the difference between ClickHouse query result and pytz result"):
+                dt = dt.replace(tzinfo=None)
+                if dt < received_dt:
+                    diff = (received_dt - dt).total_seconds()
+                else:
+                    diff = (dt - received_dt).total_seconds()
+
+            with Finally(f"I expect {diff} < 30 seconds"):
+                assert diff < 30, error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_today("1.0")
+)
+def today(self):
+    """Check the today() conversion to DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for tz in timezones:
+        with Given(f"I record current time and localize it for {tz}"):
+            dt = datetime.datetime.now()
+            dt = dt.astimezone(pytz.timezone(tz))
+
+        with Step(f"{dt} {tz}"):
+            with When("I execute query and format its result to string"):
+                r = self.context.node.query(f"SELECT toDateTime64(today(), 0, '{tz}')")
+                query_result = r.output
+                received_dt = datetime.datetime.strptime(query_result, '%Y-%m-%d %H:%M:%S')
+
+            with Then("I compute the difference between ClickHouse query result and pytz result"):
+                dt = dt.replace(tzinfo=None)
+                if dt < received_dt:
+                    diff = (received_dt - dt).total_seconds()
+                else:
+                    diff = (dt - received_dt).total_seconds()
+
+            with Finally(f"I expect {diff} < 24 hours"):
+                assert diff < 86400, error()
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_yesterday("1.0")
+)
+def yesterday(self):
+    """Check the yesterday() conversion to DateTime64 extended range.
+    """
+
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for tz in timezones:
+        with Given(f"I record current time and localize it for {tz}"):
+            dt = datetime.datetime.now()
+            dt = dt.astimezone(pytz.timezone(tz))
+
+        with Step(f"{dt} {tz}"):
+            with When("I execute query and format its result to string"):
+                r = self.context.node.query(f"SELECT toDateTime64(yesterday(), 0, '{tz}')")
+                query_result = r.output
+                received_dt = datetime.datetime.strptime(query_result, '%Y-%m-%d %H:%M:%S')
+
+            with Then("I compute the difference between ClickHouse query result and pytz result"):
+                dt = dt.replace(tzinfo=None)
+                dt -= datetime.timedelta(days=1)
+                if dt < received_dt:
+                    diff = (received_dt - dt).total_seconds()
+                else:
+                    diff = (dt - received_dt).total_seconds()
+
+            with Finally(f"I expect {diff} < 48 hours (172800 seconds)"):
+                assert diff < 172800, error()
+
+
+@TestOutline
+def add_subtract_functions(self, clh_func, py_key, test_range, years_padding=(1, 1), modifier=1, mult=1):
+    """Check the addYears/addMonths/addWeeks/addDays/addHours/addMinutes/addSeconds with DateTime64 extended range.
+    Calculating expected result using eval() to avoid writing 9000+ comparisons and just parse string as object field name.
+    :param self: self
+    :param clh_func: ClickHouse function to be called, string
+    :param py_key: relativedelta parameter used to modify datetime, string
+    :param test_range: range of increments to be used, any iterable ints structure
+    :param years_padding: a number of years to be padded from the border, tuple[int, int]
+    :param modifier: a modifier to calculate [add/subtract]Quarters(), [add/subtract]Weeks()
+    :param mult: +/- selector
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress=stress, padding=years_padding):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for tz in timezones:
+                    for incr in test_range:
+                        with Step(f"{dt} {tz}"):
+                            with By("converting datetime to string"):
+                                dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            with And("computing the expected result using pytz"):
+                                dt_new = dt + rd.relativedelta(**{py_key: mult*incr*modifier})
+                                tzone = pytz.timezone(tz)
+                                dt_norm = tzone.normalize(tzone.localize(dt_new))
+                                expected = f"{dt_norm.strftime('%Y-%m-%d %H:%M:%S')}"
+                            with And("making a query string for ClickHouse"):
+                                query = f"SELECT {clh_func}(toDateTime64('{dt_str}', 0, '{tz}'), {incr})"
+                            with Then("I execute query"):
+                                exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addYears("1.0")
+)
+def add_years(self):
+    """Check the addYears function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="addYears", py_key="years", test_range=(0, 1), years_padding=(0, 1))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractYears("1.0")
+)
+def subtract_years(self):
+    """Check the subtractYears function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="subtractYears", py_key="years", test_range=(0, 1), years_padding=(1, 0), mult=-1)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addQuarters("1.0")
+)
+def add_quarters(self):
+    """Check the addQuarters function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="addQuarters", py_key="months", test_range=range(1, 5), years_padding=(0, 1), modifier=3)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractQuarters("1.0")
+)
+def subtract_quarters(self):
+    """Check the subtractQuarters function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="subtractQuarters", py_key="months", test_range=range(1, 5), years_padding=(1, 0), modifier=3, mult=-1)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMonths("1.0")
+)
+def add_months(self):
+    """Check the addMonths function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="addMonths", py_key="months", test_range=range(1, 13), years_padding=(0, 1))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMonths("1.0")
+)
+def subtract_months(self):
+    """Check the subtractMonths function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="subtractMonths", py_key="months", test_range=range(1, 13), years_padding=(1, 0), mult=-1)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addWeeks("1.0")
+)
+def add_weeks(self):
+    """Check the addWeeks function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="addWeeks", py_key="days", test_range=range(6), years_padding=(0, 1), modifier=7)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractWeeks("1.0")
+)
+def subtract_weeks(self):
+    """Check the subtractWeeks function with DateTime64 extended range."""
+    add_subtract_functions(clh_func="subtractWeeks", py_key="days", test_range=range(6), years_padding=(1, 0), modifier=7, mult=-1)
+
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addDays("1.0")
+)
+def add_days(self):
+    """Check the addDays function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="addDays", py_key="days", test_range=range(50))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractDays("1.0")
+)
+def subtract_days(self):
+    """Check the subtractDays function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="subtractDays", py_key="days", test_range=range(50), mult=-1)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addHours("1.0")
+)
+def add_hours(self):
+    """Check the addHours function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="addHours", py_key="hours", test_range=range(25))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractHours("1.0")
+)
+def subtract_hours(self):
+    """Check the subtractHours function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="subtractHours", py_key="hours", test_range=range(25), mult=-1)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMinutes("1.0")
+)
+def add_minutes(self):
+    """Check the addMinutes function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="addMinutes", py_key="minutes", test_range=range(60))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMinutes("1.0")
+)
+def subtract_minutes(self):
+    """Check the subtractMinutes function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="subtractMinutes", py_key="minutes", test_range=range(60), mult=-1)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addSeconds("1.0")
+)
+def add_seconds(self):
+    """Check the addSeconds function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="addSeconds", py_key="seconds", test_range=range(60))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractSeconds("1.0")
+)
+def subtract_seconds(self):
+    """Check the subtractSeconds function work with DateTime64 extended range"""
+    add_subtract_functions(clh_func="subtractSeconds", py_key="seconds", test_range=range(60), mult=-1)
+
+
+def date_diff_helper(dt1, dt2: datetime.datetime, unit: str):
+    """Helper for computing dateDiff expected result using Python.
+    """
+    delta = dt2 - dt1
+    if unit == "second":
+        return delta.total_seconds()
+    elif unit == "minute":
+        return delta.total_seconds() // 60
+    elif unit == "hour":
+        return delta.total_seconds() // 3600
+    elif unit == "day":
+        return delta.total_seconds() // 86400
+    elif unit == "week":
+        return delta.total_seconds() // 604800
+    elif unit == "month":
+        return (dt2.year - dt1.year) * 12 + (dt2.month - dt1.month)
+    elif unit == "quarter":
+        return ((dt2.year - dt1.year) * 12 + (dt2.month - dt1.month)) // 3
+    elif unit == "year":
+        return dt2.year - dt1.year
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_dateDiff("1.0")
+)
+def date_diff(self):
+    """Check how dateDiff works with DateTime64 extended range.
+    """
+    stress = self.context.stress
+    compare_units = ("second", "minute", "hour", "day", "week", "month", "quarter", "year")
+    timezones = timezones_range(stress=stress)
+
+    with Background("I select a set of datetimes to be compared"):
+        datetimes = []
+        for year in years_range(stress=stress):
+            datetimes += list(select_dates_in_year(year=year, stress=stress))
+
+    for dt_1, dt_2 in itertools.product(datetimes, datetimes):
+        for tz in timezones:
+            dt1_str = dt_1.strftime("%Y-%m-%d %H:%M:%S")
+            dt2_str = dt_2.strftime("%Y-%m-%d %H:%M:%S")
+            dt1 = pytz.timezone(tz).localize(dt_1)
+            dt2 = pytz.timezone(tz).localize(dt_2)
+
+            for unit in compare_units:
+                with Given(f"{unit}: {dt1_str} {dt2_str}, {tz}"):
+                    with When("I compute expected result with Pythons"):
+                        expected = date_diff_helper(dt1=dt1, dt2=dt2, unit=unit)
+                    with Then(f"I check dateDiff {dt1_str} {dt2_str} in {unit}"):
+                        query = f"SELECT dateDiff('{unit}', toDateTime64('{dt1_str}', 0, '{tz}'), toDateTime64('{dt2_str}', 0, '{tz}'))"
+                        exec_query(request=query, expected=expected)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_formatDateTime("1.0")
+)
+def format_date_time(self):
+    """Test formatDateTime() when DateTime64 is out of normal range.
+     This function formats DateTime according to a given Format string.
+     """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    modes = ('C', 'd', 'D', 'e', 'F', 'G', 'g', 'H', 'I', 'j', 'm', 'M', 'n',
+             'p', 'R', 'S', 't', 'T', 'u', 'V', 'w', 'y', 'Y', '%')
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I format the datetimes in {year} in every possible way"):
+            for dt in datetimes:
+                for tz in timezones:
+                    for mode in modes:
+                        with When(f"{dt} {tz}, format '%{mode}"):
+                            with By("converting datetime to string"):
+                                dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                            with And("computing the expected result using python"):
+                                expected = f"{dt.strftime(f'%{mode}')}"
+                            with And("making a query string for ClickHouse"):
+                                query = f"SELECT formatDateTime(toDateTime64('{dt_str}', 0, '{tz}'), '%{mode}')"
+                            with Then("I execute formatDateTime() query"):
+                                exec_query(request=query, expected=f"{expected}")
+
+
+def time_slots_get_expected(dt: datetime.datetime, duration, size=1800):
+    """Helper to compute expected array for timeSlots().
+    """
+    zero_time = datetime.datetime(1970, 1, 1, 0, 0, 0)
+
+    result = [(zero_time + datetime.timedelta(seconds=((dt - zero_time).total_seconds() // size * size))).strftime("%Y-%m-%d %H:%M:%S")]
+
+    s = 1
+    while s <= duration:
+        delta = dt - zero_time + datetime.timedelta(seconds=s)
+        seconds_rounded = delta.total_seconds() // size * size
+        r = zero_time + datetime.timedelta(seconds=seconds_rounded)
+        r_str = r.strftime("%Y-%m-%d %H:%M:%S")
+        if r_str not in result:
+            result.append(r_str)
+            s += size
+        else:
+            s += 1
+    return result
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlots("1.0")
+)
+def time_slots(self):
+    """Check the timeSlots function with DateTime64 extended range.
+    syntax: timeSlots(StartTime, Duration _seconds_ [, Size _seconds_])
+    """
+    stress = self.context.stress
+
+    for year in years_range(stress=stress):
+        with Given(f"I choose datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        with When(f"I check each of the datetimes in {year}"):
+            for dt in datetimes:
+                for duration in range(1, 100, 9):
+                    for size in range(1, 50, 3):
+                        with Step(f"{dt}, dur={duration}, size={size}"):
+                            with By("getting an expected array using python"):
+                                expected = time_slots_get_expected(dt=dt, duration=duration, size=size)
+                            with And("forming a ClickHouse query"):
+                                dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                                query = f"SELECT timeSlots(toDateTime64('{dt_str}', 0, 'UTC'), toUInt32({duration}), {size})"
+                            with Then("I execute query"):
+                                try:
+                                    assert eval(self.context.node.query(query).output) == expected, error()
+                                except SyntaxError:
+                                    assert False
+
+
+@TestFeature
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions("1.0")
+)
+def date_time_funcs(self, node="clickhouse1"):
+    """Check the basic operations with DateTime64
+    """
+    self.context.node = self.context.cluster.node(node)
+
+    tasks = []
+    with Pool(4) as pool:
+        try:
+            for scenario in loads(current_module(), Scenario):
+                run_scenario(pool, tasks, Scenario(test=scenario))
+        finally:
+            join(tasks)
diff --git a/tests/testflows/datetime64_extended_range/tests/generic.py b/tests/testflows/datetime64_extended_range/tests/generic.py
new file mode 100644
index 00000000000..8cb56b99545
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/tests/generic.py
@@ -0,0 +1,147 @@
+from testflows.core import *
+
+from datetime64_extended_range.requirements.requirements import *
+from datetime64_extended_range.common import *
+from datetime64_extended_range.tests.common import *
+
+import pytz
+import datetime
+import itertools
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_Start("1.0"),
+)
+def normal_range_start(self):
+    """Check DateTime64 can accept a dates around the start of the normal range that begins at 1970-01-01 00:00:00.000.
+    """
+    with When("I do incrementing time sweep", description="check different time points in the first 24 hours at given date"):
+        walk_datetime_in_incrementing_steps(date="1970-01-01", precision=3, hrs_range=(0, 24))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_End("1.0")
+)
+def normal_range_end(self):
+    """Check DateTime64 can accept a dates around the end of the normal range that ends at 2105-12-31 23:59:59.99999.
+    """
+    with When("I do decrementing time sweep",
+            description="check different time points in the last 24 hours at given date"):
+        walk_datetime_in_decrementing_steps(date="2105-12-31", precision=3, hrs_range=(23, 0))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_Start("1.0")
+)
+def extended_range_start(self):
+    """Check DateTime64 supports dates around the beginning of the extended range that begins at 1698-01-01 00:00:00.000000.
+    """
+    with When("I do incrementing time sweep",
+            description="check different time points in the first 24 hours at given date"):
+        walk_datetime_in_incrementing_steps(date="1925-01-01", precision=5, hrs_range=(0, 24))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_End("1.0")
+)
+def extended_range_end(self, precision=3):
+    """Check DateTime64 supports dates around the beginning of the extended range that ends at 2377-12-31T23:59:59.999999.
+    """
+    with When("I do decrementing time sweep",
+            description="check different time points in the last 24 hours at given date"):
+        walk_datetime_in_decrementing_steps(date="2238-12-31", precision=5, hrs_range=(23, 0))
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_Start_BeforeEpochForTimeZone("1.0")
+)
+def timezone_local_below_normal_range(self):
+    """Check how UTC normal range time value treated
+    when current timezone time value is out of normal range.
+    """
+    with When("I do incrementing time sweep",
+            description="check different time points when UTC datetime fits normal range but below it for local datetime"):
+        walk_datetime_in_incrementing_steps(date="1969-12-31", hrs_range=(17, 24), timezone='America/Phoenix')
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NormalRange_End_AfterEpochForTimeZone("1.0")
+)
+def timezone_local_above_normal_range(self):
+    """Check how UTC normal range time value treated
+    when current timezone time value is out of normal range.
+    """
+    with When("I do decrementing time sweep",
+              description="check different time points when UTC datetime fits normal range but above it for local datetime"):
+        walk_datetime_in_decrementing_steps(date="2106-01-01", hrs_range=(6, 0), timezone='Asia/Novosibirsk')
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_Comparison("1.0")
+)
+def comparison_check(self):
+    """Check how comparison works with DateTime64 extended range.
+    """
+    stress = self.context.stress
+    comparators = (">", "<", "==", "<=", ">=", "!=")
+    timezones = timezones_range(stress=stress)
+    datetimes = []
+
+    for year in years_range(stress=stress):
+        datetimes += list(select_dates_in_year(year=year, stress=stress))
+
+    for dt_1, dt_2 in itertools.product(datetimes, datetimes):
+        for tz1, tz2 in itertools.product(timezones, timezones):
+            dt1_str = dt_1.strftime("%Y-%m-%d %H:%M:%S")
+            dt2_str = dt_2.strftime("%Y-%m-%d %H:%M:%S")
+            dt1 = pytz.timezone(tz1).localize(dt_1)
+            dt2 = pytz.timezone(tz2).localize(dt_2)
+
+            with When(f"{dt1_str} {tz1}, {dt2_str} {tz2}"):
+                for c in comparators:
+                    expr = f"dt1 {c} dt2"
+                    expected = str(int(eval(expr)))
+                    with Then(f"I check {dt1_str} {c} {dt2_str}"):
+                        query = f"SELECT toDateTime64('{dt1_str}', 0, '{tz1}') {c} toDateTime64('{dt2_str}', 0, '{tz2}')"
+                        exec_query(request=query, expected=expected)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TimeZones("1.0")
+)
+def timezones_support(self):
+    """Check how timezones work with DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress=stress)
+
+    for year in years_range(stress):
+        with Given("I select datetimes in a year"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for dt in datetimes:
+            for tz in timezones:
+                with Step(f"{dt} {tz}"):
+                    with By("computing expected output using python"):
+                        dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                    with And("forming a toTimeZone ClickHouse query"):
+                        query = f"SELECT toDateTime64('{dt_str}', 0, '{tz}')"
+                    with Then(f"I execute query", flags=TE):
+                        exec_query(request=query, expected=f"{dt_str}")
+
+
+@TestFeature
+def generic(self, node="clickhouse1"):
+    """Check the basic operations with DateTime64
+    """
+    self.context.node = self.context.cluster.node(node)
+
+    for scenario in loads(current_module(), Scenario, Suite):
+        Scenario(run=scenario)
diff --git a/tests/testflows/datetime64_extended_range/tests/non_existent_time.py b/tests/testflows/datetime64_extended_range/tests/non_existent_time.py
new file mode 100644
index 00000000000..1036302b61b
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/tests/non_existent_time.py
@@ -0,0 +1,162 @@
+from testflows.core import *
+import datetime
+
+from datetime64_extended_range.requirements.requirements import *
+from datetime64_extended_range.tests.common import *
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_InvalidDate("1.0")
+)
+def invalid_date(self):
+    """Check how non-existent date is treated.
+    For example, check 31st day in month that only has 30 days.
+    """
+    date_range = [1930, 1980, 2230]
+
+    if self.context.stress:
+        date_range = range(1925, 2238)
+
+    with When("I check 31st day of a 30-day month"):
+        for year in date_range:
+            for month in (4, 6, 9, 11):
+                datetime = f"{year}-{str(month).zfill(2)}-31 12:23:34"
+                expected = f"{year}-{str(month + 1).zfill(2)}-01 12:23:34"
+
+                with Then(f"{datetime}", description=f"expected {expected}", flags=TE):
+                    select_check_datetime(datetime=datetime, expected=expected)
+
+
+@TestOutline(Suite)
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_InvalidTime("1.0")
+)
+@Examples(
+    "datetime expected timezone", [
+        ('2002-04-07 02:30:00', '2002-04-07 01:30:00', 'America/New_York'),
+        ('2020-03-29 02:30:00', '2020-03-29 01:30:00', 'Europe/Zurich'),
+        ('2017-03-26 02:30:00', '2017-03-26 01:30:00', 'Europe/Berlin')
+    ])
+def invalid_time(self, datetime, expected, timezone='UTC'):
+    """proper handling of invalid time for a timezone
+    when using DateTime64 extended range data type, for example,
+    2:30am on 7th April 2002 never happened at all in the US/Eastern timezone,
+    """
+    with When(f"I check non-existent datetime {datetime}"):
+        select_check_datetime(datetime=datetime, expected=expected, timezone=timezone)
+
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_DaylightSavingTime("1.0"),
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_DaylightSavingTime_Disappeared("1.0")
+)
+@Examples(
+    "tz time_dates", [
+        ('America/Denver', {'02:30:00': ('2018-03-11', '2020-03-08', '1980-04-27', '1942-02-09')}),
+        ('Europe/Zurich', {'02:30:00': ('2016-03-27', '2020-03-29', '1981-03-29'), '01:30:00': ('1942-05-04', )})
+])
+def dst_disappeared(self, tz, time_dates):
+    """Proper handling of switching DST, when an hour is being skipped.
+    Testing in 2 steps: first, try to make a DateTime64 with skipped time value.
+    Second, adding interval so that result is in the skipped time.
+    """
+    for time, dates in time_dates.items():
+        for date in dates:
+            with Given(f"forming a datetime"):
+                dt_str = f"{date} {time}"
+                dt = datetime.datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S")
+            with Step("Assignment test"):
+                with When("computing expected result"):
+                    dt -= datetime.timedelta(hours=1)
+                    expected = dt.strftime("%Y-%m-%d %H:%M:%S")
+                with Then(f"I check skipped hour"):
+                    select_check_datetime(datetime=dt_str, expected=expected, timezone=tz)
+            with Step("Addition test"):
+                with When("computing expected result"):
+                    dt += datetime.timedelta(hours=2)
+                    expected = dt.strftime("%Y-%m-%d %H:%M:%S")
+                with Then(f"I check skipped hour"):
+                    query = f"SELECT addHours(toDateTime64('{dt_str}', 0, '{tz}'), 1)"
+                    exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_LeapSeconds("1.0")
+)
+@Examples(
+    "datet years", [
+        ("06-30 23:59:55", [1972, 1981, 1982, 1983, 1985, 1992, 1993, 1994, 1997, 2012, 2015]),
+        ("12-31 23:59:55", [1972, 1973, 1974, 1975, 1976, 1977, 1978, 1979, 1987, 1989, 1990, 1995, 1998, 2005, 2008, 2016])
+])
+def leap_seconds(self, datet, years):
+    """Test proper handling of leap seconds. Read more: https://de.wikipedia.org/wiki/Schaltsekunde
+    Being checked by selecting a timestamp prior to leap second and adding seconds so that the result is after it.
+    """
+    for year in years:
+        with When(f"{datet}, {year}"):
+            with By("forming an expected result using python"):
+                dt_str = f"{year}-{datet}"
+                dt = datetime.datetime.strptime(dt_str, '%Y-%m-%d %H:%M:%S')
+                dt += datetime.timedelta(seconds=9)
+                expected = dt.strftime("%Y-%m-%d %H:%M:%S")
+            with And(f"forming a query"):
+                query = f"SELECT addSeconds(toDateTime64('{dt_str}', 0, 'UTC'), 10)"
+            with Then("executing query"):
+                exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_DaylightSavingTime("1.0"),
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime_TimeZoneSwitch("1.0")
+)
+def dst_time_zone_switch(self):
+    """Check how ClickHouse supports handling of invalid time when using DateTime64 extended range data type
+    when the invalid time is caused when countries switch timezone definitions with no daylight savings time switch.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+    utc = pytz.timezone("UTC")
+
+    for timezone in timezones:
+        if timezone == 'UTC':
+            continue
+        with Step(f"{timezone}"):
+            tz = pytz.timezone(timezone)
+            transition_times = tz._utc_transition_times
+            transition_info = tz._transition_info
+
+            for i in range(len(transition_times)-1, 0, -1):
+                if (transition_times[i] > datetime.datetime.now()) or (transition_times[i].year < 1925) or (transition_times[i].year > 2238):
+                    continue
+                with Step(f"{transition_times[i]}"):
+                    with By("localize python datetime"):
+                        dt = transition_times[i]
+                        dt0 = dt - datetime.timedelta(hours=4)
+                        dt0 = utc.localize(dt0).astimezone(tz).replace(tzinfo=None)
+                    with And("compute expected result using Pytz"):
+                        seconds_shift = transition_info[i][0] - transition_info[i-1][0]
+                        dt1 = dt0 + datetime.timedelta(hours=8) + seconds_shift
+                        dt0_str = dt0.strftime("%Y-%m-%d %H:%M:%S")
+                        dt1_str = dt1.strftime("%Y-%m-%d %H:%M:%S")
+                    with And("forming a ClickHouse query"):
+                        query = f"SELECT addHours(toDateTime64('{dt0_str}', 0, '{timezone}'), 8)"
+                    with Then("executing the query"):
+                        exec_query(request=query, expected=f"{dt1_str}")
+
+
+@TestFeature
+@Name("non existent time")
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_NonExistentTime("1.0")
+)
+def feature(self, node="clickhouse1"):
+    """Check how ClickHouse treats non-existent time in DateTime64 data type.
+    """
+    self.context.node = self.context.cluster.node(node)
+
+    for scenario in loads(current_module(), Scenario, Suite):
+        Scenario(run=scenario)
diff --git a/tests/testflows/datetime64_extended_range/tests/reference_times.py b/tests/testflows/datetime64_extended_range/tests/reference_times.py
new file mode 100644
index 00000000000..4d4762cc756
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/tests/reference_times.py
@@ -0,0 +1,38 @@
+import pytz
+from datetime import datetime
+
+from testflows.core import *
+from datetime64_extended_range.common import *
+from datetime64_extended_range.tests.common import select_check_datetime
+from datetime64_extended_range.requirements.requirements import *
+from datetime64_extended_range.tests.common import *
+
+
+@TestSuite
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_SpecificTimestamps("1.0")
+)
+def reference_times(self, node="clickhouse1"):
+    """Check how ClickHouse converts a set of particular timestamps
+    to DateTime64 for all timezones and compare the result to pytz.
+    """
+    self.context.node = self.context.cluster.node(node)
+
+    timestamps = [9961200, 73476000, 325666800, 354675600, 370400400, 386125200, 388566010, 401850000, 417574811,
+        496803600, 528253200, 624423614, 636516015, 671011200, 717555600, 752047218, 859683600, 922582800,
+        1018173600, 1035705600, 1143334800, 1162105223, 1174784400, 1194156000, 1206838823, 1224982823,
+        1236495624, 1319936400, 1319936424, 1425798025, 1459040400, 1509872400, 2090451627, 2140668000]
+
+    query = ""
+
+    for tz in pytz.all_timezones:
+        timezone = pytz.timezone(tz)
+        query += f"select '{tz}', arrayJoin(arrayFilter(x -> x.2 <> x.3, arrayMap(x -> tuple(x.1, x.2, toString(toDateTime64(x.1, 0, '{tz}'))), ["
+        need_comma = 0
+        for timestamp in timestamps:
+            for reference_timestamp in [timestamp - 1, timestamp, timestamp + 1]:
+                query += f"{',' if need_comma else ''}tuple({reference_timestamp},'{datetime.datetime.fromtimestamp(reference_timestamp, timezone).strftime('%Y-%m-%d %H:%M:%S')}')"
+                need_comma = 1
+        query += "] ) ) );"
+
+    exec_query(request=query, expected="")
diff --git a/tests/testflows/datetime64_extended_range/tests/type_conversion.py b/tests/testflows/datetime64_extended_range/tests/type_conversion.py
new file mode 100644
index 00000000000..85582b82d7b
--- /dev/null
+++ b/tests/testflows/datetime64_extended_range/tests/type_conversion.py
@@ -0,0 +1,477 @@
+import time
+import pytz
+import decimal
+import itertools
+import numpy as np
+from dateutil.tz import tzlocal
+from datetime import datetime, timedelta
+import dateutil.relativedelta as rd
+from testflows.core import *
+
+from datetime64_extended_range.requirements.requirements import *
+from datetime64_extended_range.common import *
+from datetime64_extended_range.tests.common import *
+
+
+@TestOutline(Scenario)
+@Examples("cast", [
+    (False, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toInt_8_16_32_64_128_256_("1.0"))),
+    (True, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_("1.0")))
+])
+def to_int_8_16_32_64_128_256(self, cast):
+    """Check the toInt(8|16|32|64|128|256) functions with DateTime64 extended range
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for d in datetimes:
+            for tz in timezones:
+                dt = pytz.timezone(tz).localize(d)
+                for int_type in (8, 16, 32, 64, 128, 256):
+                    with When(f"{dt} {tz}, int{int_type}"):
+                        with By("converting datetime to string"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                        with And("computing the expected result using python"):
+                            py_res = int(time.mktime(dt.timetuple()))
+                            expected = f"{py_res}"
+                            if not (int_type == 128 or int_type == 256):
+                                """ALL dates fit into int128 and int256, so no need to check"""
+                                np_res = exec(f"np.int{int_type}({py_res})")
+                            else:
+                                np_res = py_res
+                        if np_res == py_res:
+                            with Given(f"{py_res} fits int{int_type}"):
+                                with When(f"making a query string for ClickHouse if py_res fits int{int_type}"):
+                                    if cast:
+                                        query = f"SELECT cast(toDateTime64('{dt_str}', 0, '{tz}'), 'Int{int_type}')"
+                                    else:
+                                        query = f"SELECT toInt{int_type}(toDateTime64('{dt_str}', 0, '{tz}'))"
+                                with Then(f"I execute toInt{int_type}() query"):
+                                    exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline(Scenario)
+@Examples("cast", [
+    (False, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUInt_8_16_32_64_256_("1.0"))),
+    (True, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_("1.0")))
+])
+def to_uint_8_16_32_64_256(self, cast):
+    """Check the toUInt(8|16|32|64|256) functions with DateTime64 extended range
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for d in datetimes:
+            for tz in timezones:
+                dt = pytz.timezone(tz).localize(d)
+                for int_type in (8, 16, 32, 64, 256):
+                    with Step(f"{dt} {tz}, int{int_type}"):
+                        with By("converting datetime to string"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                        with And("computing the expected result using python"):
+                            py_res = int(time.mktime(dt.timetuple()))
+                            expected = f"{py_res}"
+                            if int_type != 256:
+                                """ALL dates fit into uint256, so no need to check"""
+                                np_res = exec(f"np.uint{int_type}({py_res})")
+                            else:
+                                np_res = py_res
+                        if np_res == py_res:
+                            with Given(f"{py_res} fits int{int_type}"):
+                                with When(f"making a query string for ClickHouse if py_res fits int{int_type}"):
+                                    if cast:
+                                        query = f"SELECT cast(toDateTime64('{dt_str}', 0, '{tz}'), 'UInt{int_type}')"
+                                    else:
+                                        query = f"SELECT toUInt{int_type}(toDateTime64('{dt_str}', 0, '{tz}'))"
+                                with Then(f"I execute toInt{int_type}() query"):
+                                    exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline(Scenario)
+@Examples("cast", [
+    (False, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toFloat_32_64_("1.0"))),
+    (True, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_("1.0")))
+])
+def to_float_32_64(self, cast):
+    """Check the toFloat(32|64) functions with DateTime64 extended range
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for d in datetimes:
+            for tz in timezones:
+                dt = pytz.timezone(tz).localize(d)
+                for float_type in (32, 64):
+                    with Step(f"{dt} {tz}, int{float_type}"):
+                        with By("converting datetime to string"):
+                            dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                        with And("computing the expected result using python"):
+                            py_res = int(time.mktime(dt.timetuple()))
+                            expected = f"{py_res}"
+                            np_res = exec(f"np.float{float_type}({py_res})")
+                        if np_res == py_res:
+                            with When(f"making a query string for ClickHouse"):
+                                if cast:
+                                    query = f"SELECT cast(toDateTime64('{dt_str}', 0, '{tz}'), 'Float{float_type}')"
+                                else:
+                                    query = f"SELECT toFloat{float_type}(toDateTime64('{dt_str}', 0, '{tz}'))"
+                            with Then(f"I execute toFloat{float_type}() query"):
+                                exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64_FromString_MissingTime("1.0")
+)
+def to_datetime64_from_string_missing_time(self):
+    """Check the toDateTime64() with DateTime64 extended range conversion when string is missing the time part.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for dt in datetimes:
+            for tz in timezones:
+                with Step(f"{dt} {tz}"):
+                    with By("converting datetime to string"):
+                        dt_str = dt.strftime("%Y-%m-%d")
+                    with And("figure out expected result in python"):
+                        expected = f"{dt.strftime('%Y-%m-%d')} 00:00:00"
+                    with When(f"making a query string for ClickHouse"):
+                        query = f"SELECT toDateTime64('{dt_str}', 0, '{tz}')"
+                    with Then(f"I execute toDateTime64() query"):
+                        exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64("1.0")
+)
+def to_datetime64(self):
+    """Check the toDateTime64() conversion with DateTime64. This is supposed to work in normal range ONLY.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for dt in datetimes:
+            for tz in timezones:
+                with By("converting datetime to string"):
+                    dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                with And(f"making a query string for ClickHouse"):
+                    query = f"SELECT toDateTime64('{dt_str}', 0, '{tz}')"
+                with When("figure out expected result in python"):
+                    expected = f"{dt.strftime('%Y-%m-%d %H:%M:%S')}"
+                with Then(f"I execute toDateTime64() query"):
+                    exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline(Scenario)
+@Examples("cast", [
+    (False, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDate("1.0"))),
+    (True, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_("1.0")))
+])
+def to_date(self, cast):
+    """Check the toDate() conversion with DateTime64. This is supposed to work in normal range ONLY.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for dt in datetimes:
+            for tz in timezones:
+                with Step(f"{dt} {tz}"):
+                    expected = None # by default - not checked, checking the exitcode
+                    with By("converting datetime to string"):
+                        dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+
+                    if in_normal_range(dt):
+                        with And("DateTime64 fits normal range, change its value"):
+                            expected = f"{dt.strftime('%Y-%m-%d')}"  # being checked in case DateTime64 fits normal range
+
+                    with Given(f"I make a query string for ClickHouse"):
+                        if cast:
+                            query = f"SELECT CAST(toDateTime64('{dt_str}', 0, '{tz}'), 'Date')"
+                        else:
+                            query = f"SELECT toDate(toDateTime64('{dt_str}', 0, '{tz}'))"
+
+                    with Then(f"I execute toDate() query and check return/exitcode"):
+                        exec_query(request=query, expected=expected, exitcode=0)
+
+
+@TestOutline(Scenario)
+@Examples("cast", [
+    (False, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime("1.0"))),
+    (True, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_("1.0")))
+])
+def to_datetime(self, cast):
+    """Check the toDateTime() conversion with DateTime64. This is supposed to work in normal range ONLY.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for dt in datetimes:
+            for tz in timezones:
+                with By("converting datetime to string"):
+                    dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                with And(f"making a query string for ClickHouse"):
+                    if cast:
+                        query = f"SELECT CAST(toDateTime64('{dt_str}', 0, '{tz}'), 'DateTime')"
+                        with When("figure out expected result in python"):
+                            dt_local = pytz.timezone(tz).localize(dt)
+                            dt_transformed = dt_local.astimezone(tzlocal())
+                            expected = f"{dt_transformed.strftime('%Y-%m-%d %H:%M:%S')}"
+                    else:
+                        query = f"SELECT toDateTime(toDateTime64('{dt_str}', 0, '{tz}'))"
+                        with When("figure out expected result in python"):
+                            expected = f"{dt.strftime('%Y-%m-%d %H:%M:%S')}"
+
+                if not in_normal_range(dt):
+                    with When(f"I execute toDateTime() query out of normal range"):
+                        exec_query(request=query, exitcode=0)
+                else:
+                    with When(f"I execute toDateTime() query"):
+                        exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline(Scenario)
+@Examples("cast", [
+    (False, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toString("1.0"))),
+    (True, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_("1.0")))
+])
+def to_string(self, cast):
+    """Check the toString() with DateTime64 extended range.
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for dt in datetimes:
+            for tz in timezones:
+                with Step(f"{dt} {tz}"):
+                    with By("converting datetime to string"):
+                        dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                    with When(f"making a query string for ClickHouse"):
+                        if cast:
+                            query = f"SELECT cast(toDateTime64('{dt_str}', 0, '{tz}'), 'String')"
+                        else:
+                            query = f"SELECT toString(toDateTime64('{dt_str}', 0, '{tz}'))"
+                    with Then(f"I execute toDateTime64() query"):
+                        exec_query(request=query, expected=f"{dt_str}")
+
+
+def valid_decimal_range(bit_depth, S):
+    """A helper to find valid range for Decimal(32|64|128|256) with given scale (S)"""
+    return {32: -1 * 10 ** (9 - S), 64: -1 * 10 ** (18 - S), 128: -1 * 10 ** (38 - S), 256: -1 * 10 ** (76 - S)}[
+        bit_depth]
+
+
+@TestOutline(Scenario)
+@Examples("cast", [
+    (False, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDecimal_32_64_128_256_("1.0"))),
+    (True, Requirements(RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_("1.0")))
+])
+def to_decimal_32_64_128_256(self, cast):
+    """Check the toDecimal(32|64|128|256) functions with DateTime64 extended range.
+    Decimal32(S) - ( -1 * 10^(9 - S), 1 * 10^(9 - S) )
+    Decimal64(S) - ( -1 * 10^(18 - S), 1 * 10^(18 - S) )
+    Decimal128(S) - ( -1 * 10^(38 - S), 1 * 10^(38 - S) )
+    Decimal256(S) - ( -1 * 10^(76 - S), 1 * 10^(76 - S) )
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+    scales = {32: 9, 64: 18, 128: 38, 256: 76}
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress)
+
+        for d in datetimes:
+            for tz in timezones:
+                dt = pytz.timezone(tz).localize(d)
+                for decimal_type in (32, 64, 128, 256):
+                    for scale in range(scales[decimal_type]):
+                        with When(f"{dt} {tz}, Decimal{decimal_type}({scale})"):
+                            valid_range = valid_decimal_range(bit_depth=decimal_type, S=scale)
+                            with By("computing the expected result using python"):
+                                expected = decimal.Decimal(time.mktime(dt.timetuple()))
+                            if -valid_range < expected < valid_range:
+                                with And("converting datetime to string"):
+                                    dt_str = dt.strftime("%Y-%m-%d %H:%M:%S")
+                                with When(f"making a query string for ClickHouse"):
+                                    if cast:
+                                        query = f"SELECT cast(toDateTime64('{dt_str}', 0, '{tz}'), 'Decimal({decimal_type}, {scale})')"
+                                    else:
+                                        query = f"SELECT toDecimal{decimal_type}(toDateTime64('{dt_str}', 0, '{tz}'))"
+                                with Then(f"I execute toDecimal{decimal_type}() query"):
+                                    exec_query(request=query, expected=f"{expected}")
+
+
+@TestOutline
+def to_unix_timestamp64_milli_micro_nano(self, scale):
+    """Check the toUnixTimestamp64[Milli/Micro/Nano] functions with DateTime64 extended range.
+    :param scale: 3 for milli, 6 for micro, 9 for nano; int
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+    func = {3: 'Milli', 6: 'Micro', 9: 'Nano'}
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        for d in datetimes:
+            for tz in timezones:
+                dt = pytz.timezone(tz).localize(d)
+                with When(f"{dt} {tz}"):
+                    with By("converting datetime to string"):
+                        dt_str = dt.strftime("%Y-%m-%d %H:%M:%S.%f")
+                    with And("converting DateTime to UTC"):
+                        dt = dt.astimezone(pytz.timezone('UTC'))
+                    with And("computing the expected result using python"):
+                        expected = int(dt.timestamp() * (10**scale))
+                        if expected >= 0:
+                            expected += dt.microsecond * 10 ** (scale - 6)
+                        else:
+                            expected -= dt.microsecond * 10 ** (scale - 6)
+                    with When(f"making a query string for ClickHouse"):
+                        query = f"SELECT toUnixTimestamp64{func[scale]}(toDateTime64('{dt_str}', {scale}, '{tz}'))"
+                    with Then(f"I execute toUnixTimestamp64{func[scale]}() query"):
+                        exec_query(request=query, expected=f"{expected}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Milli("1.0")
+)
+def to_unix_timestamp64_milli(self):
+    """Check the toUnixTimestamp64Milli functions with DateTime64 extended range.
+    """
+    to_unix_timestamp64_milli_micro_nano(scale=3)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Micro("1.0")
+)
+def to_unix_timestamp64_micro(self):
+    """Check the toUnixTimestamp64Micro functions with DateTime64 extended range.
+    """
+    to_unix_timestamp64_milli_micro_nano(scale=6)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Nano("1.0")
+)
+def to_unix_timestamp64_nano(self):
+    """Check the toUnixTimestamp64Nano functions with DateTime64 extended range.
+    """
+    to_unix_timestamp64_milli_micro_nano(scale=9)
+
+
+@TestOutline
+def from_unix_timestamp64_milli_micro_nano(self, scale):
+    """Check the fromUnixTimestamp64[Milli/Micro/Nano] functions with DateTime64 extended range.
+    :param scale: 3 for milli, 6 for micro, 9 for nano; int
+    """
+    stress = self.context.stress
+    timezones = timezones_range(stress)
+    func = {3: 'Milli', 6: 'Micro', 9: 'Nano'}
+
+    for year in years_range(stress):
+        with Given(f"I select datetimes in {year}"):
+            datetimes = select_dates_in_year(year=year, stress=stress, microseconds=True)
+
+        for d in datetimes:
+            for tz in timezones:
+                dt = pytz.timezone(tz).localize(d)
+                with When(f"{dt} {tz}"):
+                    with By("converting datetime to string"):
+                        d_str = d.strftime("%Y-%m-%d %H:%M:%S.%f")
+                        d_str += "0" * (scale-3)
+                    with And("converting DateTime64 to UTC"):
+                        dt = dt.astimezone(pytz.timezone('UTC'))
+                    with And("computing the expected result using python"):
+                        ts = int(dt.timestamp() * (10**scale))
+                        if ts >= 0:
+                            ts += dt.microsecond * 10 ** (scale - 6)
+                        else:
+                            ts -= dt.microsecond * 10 ** (scale - 6)
+                    with And(f"making a query string for ClickHouse"):
+                        query = f"SELECT fromUnixTimestamp64{func[scale]}(CAST({ts}, 'Int64'), '{tz}')"
+                    with Then(f"I execute fromUnixTimestamp64{func[scale]}() query"):
+                        exec_query(request=query, expected=f"{d_str}")
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Milli("1.0")
+)
+def from_unix_timestamp64_milli(self):
+    """Check the fromUnixTimestamp64Milli functions with DateTime64 extended range.
+    """
+    from_unix_timestamp64_milli_micro_nano(scale=3)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Micro("1.0")
+)
+def from_unix_timestamp64_micro(self):
+    """Check the fromUnixTimestamp64Micro functions with DateTime64 extended range.
+    """
+    from_unix_timestamp64_milli_micro_nano(scale=6)
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64Nano("1.0")
+)
+def from_unix_timestamp64_nano(self):
+    """Check the fromUnixTimestamp64Nano functions with DateTime64 extended range.
+    """
+    from_unix_timestamp64_milli_micro_nano(scale=9)
+
+
+@TestFeature
+@Requirements(
+    RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions("1.0")
+)
+def type_conversion(self, node="clickhouse1"):
+    """Check the type conversion operations with DateTime64.
+    Cast can be set as Requirement thereby as the module
+    tests exactly what CAST does.
+    """
+    self.context.node = self.context.cluster.node(node)
+
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario)
diff --git a/tests/testflows/ldap/authentication/docker-compose/clickhouse-service.yml b/tests/testflows/example/example_env/clickhouse-service.yml
similarity index 100%
rename from tests/testflows/ldap/authentication/docker-compose/clickhouse-service.yml
rename to tests/testflows/example/example_env/clickhouse-service.yml
diff --git a/tests/testflows/example/docker-compose/docker-compose.yml b/tests/testflows/example/example_env/docker-compose.yml
similarity index 100%
rename from tests/testflows/example/docker-compose/docker-compose.yml
rename to tests/testflows/example/example_env/docker-compose.yml
diff --git a/tests/testflows/example/docker-compose/zookeeper-service.yml b/tests/testflows/example/example_env/zookeeper-service.yml
similarity index 100%
rename from tests/testflows/example/docker-compose/zookeeper-service.yml
rename to tests/testflows/example/example_env/zookeeper-service.yml
diff --git a/tests/testflows/example/regression.py b/tests/testflows/example/regression.py
index cb58b42ba4c..4e7ed1025e4 100755
--- a/tests/testflows/example/regression.py
+++ b/tests/testflows/example/regression.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import os
 import sys
 from testflows.core import *
 
@@ -13,11 +14,18 @@ from helpers.argparser import argparser
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """Simple example of how you can use TestFlows to test ClickHouse.
     """
+    top().terminating = False
     nodes = {
         "clickhouse": ("clickhouse1",),
     }
 
-    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "example_env")) as cluster:
         self.context.cluster = cluster
 
         Scenario(run=load("example.tests.example", "scenario"))
diff --git a/tests/testflows/extended_precision_data_types/common.py b/tests/testflows/extended_precision_data_types/common.py
new file mode 100644
index 00000000000..1c852bbf935
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/common.py
@@ -0,0 +1,118 @@
+import uuid
+
+from contextlib import contextmanager
+
+from testflows.core.name import basename, parentname
+from testflows._core.testtype import TestSubType
+from testflows.asserts import values, error, snapshot
+
+from helpers.common import *
+
+@contextmanager
+def allow_experimental_bigint(node):
+    """Enable experimental big int setting in Clickhouse.
+    """
+    setting = ("allow_experimental_bigint_types", 1)
+    default_query_settings = None
+
+    try:
+        with Given("I add allow_experimental_bigint to the default query settings"):
+            default_query_settings = getsattr(current().context, "default_query_settings", [])
+            default_query_settings.append(setting)
+        yield
+    finally:
+        with Finally("I remove allow_experimental_bigint from the default query settings"):
+            if default_query_settings:
+                try:
+                    default_query_settings.pop(default_query_settings.index(setting))
+                except ValueError:
+                    pass
+
+@TestStep(Given)
+def allow_experimental_map_type(self):
+    """Set allow_experimental_map_type = 1
+    """
+    setting = ("allow_experimental_map_type", 1)
+    default_query_settings = None
+
+    try:
+        with By("adding allow_experimental_map_type to the default query settings"):
+            default_query_settings = getsattr(current().context, "default_query_settings", [])
+            default_query_settings.append(setting)
+        yield
+    finally:
+        with Finally("I remove allow_experimental_map_type from the default query settings"):
+            if default_query_settings:
+                try:
+                    default_query_settings.pop(default_query_settings.index(setting))
+                except ValueError:
+                    pass
+
+def execute_query(sql, expected=None, format="TabSeparatedWithNames", compare_func=None):
+    """Execute SQL query and compare the output to the snapshot.
+    """
+    name = basename(current().name)
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql + " FORMAT " + format)
+
+    if expected is not None:
+        with Then("I check output against expected"):
+
+            if compare_func is None:
+                assert r.output.strip() == expected, error()
+
+            else:
+                assert compare_func(r.output.strip(), expected), error()
+
+    else:
+        with Then("I check output against snapshot"):
+            with values() as that:
+                assert that(snapshot("\n" + r.output.strip() + "\n", "tests", name=name, encoder=str)), error()
+
+@TestStep(Given)
+def table(self, data_type, name="table0"):
+    """Create a table.
+    """
+    node = current().context.node
+
+    try:
+        with By("creating table"):
+            node.query(f"CREATE TABLE {name}(a {data_type}) ENGINE = Memory")
+        yield
+
+    finally:
+        with Finally("drop the table"):
+            node.query(f"DROP TABLE IF EXISTS {name}")
+
+def getuid():
+    """Create a unique variable name based on the test it is called from.
+    """
+    if current().subtype == TestSubType.Example:
+        testname = f"{basename(parentname(current().name)).replace(' ', '_').replace(',','')}"
+    else:
+        testname = f"{basename(current().name).replace(' ', '_').replace(',','')}"
+
+    for char in ['(', ')', '[', ']','\'']:
+        testname = testname.replace(f'{char}', '')
+
+    return testname + "_" + str(uuid.uuid1()).replace('-', '_')
+
+def to_data_type(data_type, value):
+    """Return a conversion statement based on the data type provided
+    """
+    if data_type in ['Decimal256(0)']:
+        return f'toDecimal256(\'{value}\',0)'
+
+    else:
+        return f'to{data_type}(\'{value}\')'
+
+
+data_types = [
+    ('Int128', '-170141183460469231731687303715884105728', '170141183460469231731687303715884105727'),
+    ('Int256', '-57896044618658097711785492504343953926634992332820282019728792003956564819968', '57896044618658097711785492504343953926634992332820282019728792003956564819967'),
+    ('UInt128','0','340282366920938463463374607431768211455'),
+    ('UInt256', '0', '115792089237316195423570985008687907853269984665640564039457584007913129639935'),
+]
+
+Decimal256_min_max = -1000000000000000000000000000000000000000000000000000000000000000000000000000,1000000000000000000000000000000000000000000000000000000000000000000000000000
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/common.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/common.xml
new file mode 100644
index 00000000000..567c8c05e32
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/common.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <timezone>Europe/Moscow</timezone>
+    <listen_host replace="replace">::</listen_host>
+    <path>/var/lib/clickhouse/</path>
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+</yandex>
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
new file mode 100644
index 00000000000..bdf1bbc11c1
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/logs.xml
@@ -0,0 +1,17 @@
+<yandex>
+    <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>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+        <flush_interval_milliseconds>500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
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
new file mode 100644
index 00000000000..618fd6b6d24
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/storage.xml
@@ -0,0 +1,20 @@
+<yandex>
+
+<storage_configuration>
+    <disks>
+        <default>
+            <keep_free_space_bytes>1024</keep_free_space_bytes>
+        </default>
+    </disks>
+    <policies>
+        <default>
+            <volumes>
+                <default>
+                    <disk>default</disk>
+                </default>
+            </volumes>
+        </default>
+    </policies>
+</storage_configuration>
+
+</yandex>
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml
new file mode 100644
index 00000000000..4ec12232539
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0"?>
+<!--
+  NOTE: User and query level settings are set up in "users.xml" file.
+-->
+<yandex>
+    <logger>
+        <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+    <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+
+    <!-- For HTTPS and SSL over native protocol. -->
+    <!--
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+    -->
+
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <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>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
+            <dhParamsFile>/etc/clickhouse-server/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 -->
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <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>
+    -->
+
+    <!-- Port for communication between replicas. Used for data exchange. -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analoguous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface.
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- Listen specified host. use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere. -->
+    <!-- <listen_host>::</listen_host> -->
+    <!-- Same for hosts with disabled ipv6: -->
+    <listen_host>0.0.0.0</listen_host>
+
+    <!-- Default values - try listen localhost on ipv4 and ipv6: -->
+    <!--
+    <listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host>
+    -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!-- <listen_try>0</listen_try> -->
+
+    <!-- Allow listen on same address:port -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Path to folder where users and roles created by SQL commands are stored. -->
+    <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories>
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+
+    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
+    <users_config>users.xml</users_config>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- System profile of settings. This settings are used by internal processes (Buffer storage, Distibuted DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Perform mlockall after startup to lower first queries latency
+          and to prevent clickhouse executable from being paged out under high IO load.
+         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+    -->
+    <mlock_executable>false</mlock_executable>
+
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.yandex/docs/en/table_engines/distributed/
+      -->
+    <remote_servers incl="clickhouse_remote_servers" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+         </test_cluster_two_shards_localhost>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </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.
+      -->
+
+    <!-- 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/
+      -->
+    <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
+      -->
+    <macros incl="macros" optional="true" />
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+
+    <!-- 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.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <!-- Trace log. Stores stack traces collected by query profilers.
+         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <!-- Query thread log. Has information about all threads participated in query execution.
+         Used only for queries with setting log_query_threads = 1. -->
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </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>
+        <database>system</database>
+        <table>part_log</table>
+        <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.
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+    -->
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <compression incl="clickhouse_compression">
+    <!--
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    -->
+    </compression>
+
+    <!-- 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. -->
+    <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> -->
+    </distributed_ddl>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to restart clickhouse-server, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/users.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/users.xml
new file mode 100644
index 00000000000..86b2cd9e1e3
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/users.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<yandex>
+    <!-- Profiles of settings. -->
+    <profiles>
+        <!-- Default settings. -->
+        <default>
+            <!-- Maximum memory usage for processing single query, in bytes. -->
+            <max_memory_usage>10000000000</max_memory_usage>
+
+            <!-- Use cache of uncompressed blocks of data. Meaningful only for processing many of very short queries. -->
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+
+            <!-- How to choose between replicas during distributed query processing.
+                 random - choose random replica from set of replicas with minimum number of errors
+                 nearest_hostname - from set of replicas with minimum number of errors, choose replica
+                  with minimum number of different symbols between replica's hostname and local hostname
+                  (Hamming distance).
+                 in_order - first live replica is chosen in specified order.
+                 first_or_random - if first replica one has higher number of errors, pick a random one from replicas with minimum number of errors.
+            -->
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <!-- Profile that allows only read queries. -->
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <!-- Users and ACL. -->
+    <users>
+        <!-- If user name was not specified, 'default' user is used. -->
+        <default>
+            <!-- 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>.
+                 Password could be empty.
+
+                 If you want to specify SHA256, place it in 'password_sha256_hex' element.
+                 Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
+                 Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
+
+                 If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
+                 Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
+
+                 How to generate decent password:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+                 In first line will be password and in second - corresponding SHA256.
+
+                 How to generate double SHA1:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | openssl dgst -sha1 -binary | openssl dgst -sha1
+                 In first line will be password and in second - corresponding double SHA1.
+            -->
+            <password></password>
+
+            <!-- List of networks with open access.
+
+                 To open access from everywhere, specify:
+                    <ip>::/0</ip>
+
+                 To open access only from localhost, specify:
+                    <ip>::1</ip>
+                    <ip>127.0.0.1</ip>
+
+                 Each element of list has one of the following forms:
+                 <ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+                     2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+                 <host> Hostname. Example: server01.yandex.ru.
+                     To check access, DNS query is performed, and all received addresses compared to peer address.
+                 <host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+                     To check access, DNS PTR query is performed for peer address and then regexp is applied.
+                     Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+                     Strongly recommended that regexp is ends with $
+                 All results of DNS requests are cached till server restart.
+            -->
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+
+            <!-- Settings profile for user. -->
+            <profile>default</profile>
+
+            <!-- Quota for user. -->
+            <quota>default</quota>
+
+            <!-- Allow access management -->
+            <access_management>1</access_management>
+
+            <!-- Example of row level security policy. -->
+            <!-- <databases>
+                <test>
+                    <filtered_table1>
+                        <filter>a = 1</filter>
+                    </filtered_table1>
+                    <filtered_table2>
+                        <filter>a + b &lt; 1 or c - d &gt; 5</filter>
+                    </filtered_table2>
+                </test>
+            </databases> -->
+        </default>
+
+        <!-- Example of user with readonly access. -->
+        <!-- <readonly>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>readonly</profile>
+            <quota>default</quota>
+        </readonly> -->
+    </users>
+
+    <!-- Quotas. -->
+    <quotas>
+        <!-- Name of quota. -->
+        <default>
+            <!-- Limits for time interval. You could specify many intervals with different limits. -->
+            <interval>
+                <!-- Length of interval. -->
+                <duration>3600</duration>
+
+                <!-- No limits. Just calculate resource usage for time interval. -->
+                <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>
diff --git a/tests/testflows/extended_precision_data_types/errors.py b/tests/testflows/extended_precision_data_types/errors.py
new file mode 100644
index 00000000000..63b82f3368d
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/errors.py
@@ -0,0 +1,11 @@
+def not_implemented_bigints(name):
+    return(48, f"Exception: {name} is not implemented for big integers")
+
+def bigints_not_implements(name):
+    return(48, f'Exception: {name} for big integers is not implemented')
+
+def illegal_type():
+    return(43, 'Exception: Illegal type')
+
+def illegal_column():
+    return(44, 'Exception: Illegal column')
\ No newline at end of file
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
new file mode 100644
index 00000000000..fdd4a8057a9
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
@@ -0,0 +1,27 @@
+version: '2.3'
+
+services:
+  clickhouse:
+    image: yandex/clickhouse-integration-test
+    expose:
+      - "9000"
+      - "9009"
+      - "8123"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d:/etc/clickhouse-server/users.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
+      - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
+      - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
+    entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
+    healthcheck:
+      test: clickhouse client --query='select 1'
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/docker-compose.yml b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/docker-compose.yml
new file mode 100644
index 00000000000..74d17d40e66
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/docker-compose.yml
@@ -0,0 +1,30 @@
+version: '2.3'
+
+services:
+
+  mysql1:
+    extends:
+      file: mysql-service.yml
+      service: mysql
+    hostname: mysql1
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/mysql1/database:/var/lib/mysql"
+
+  clickhouse1:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse1
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
+
+  # dummy service which does nothing, but allows to postpone
+  # 'docker-compose up -d' till all dependecies will go healthy
+  all_services_ready:
+    image: hello-world
+    depends_on:
+      clickhouse1:
+        condition: service_healthy
+      mysql1:
+        condition: service_healthy
diff --git a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/mysql-service.yml b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/mysql-service.yml
new file mode 100644
index 00000000000..6924bccfad5
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/mysql-service.yml
@@ -0,0 +1,19 @@
+version: '2.3'
+
+services:
+  mysql:
+    image: mysql:5.7.30
+    restart: always
+    environment:
+      MYSQL_DATABASE: 'db'
+      MYSQL_USER: 'user'
+      MYSQL_PASSWORD: 'password'
+      MYSQL_ROOT_PASSWORD: 'password'
+    expose:
+      - '3306'
+    healthcheck:
+      test: mysql -D db -u user --password=password -e "select 1;"
+      interval: 3s
+      timeout: 2s
+      retries: 40
+      start_period: 2s
diff --git a/tests/testflows/extended_precision_data_types/regression.py b/tests/testflows/extended_precision_data_types/regression.py
new file mode 100755
index 00000000000..a0c3186c961
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/regression.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+from testflows.core import *
+
+append_path(sys.path, "..")
+
+from helpers.cluster import Cluster
+from helpers.argparser import argparser
+from extended_precision_data_types.requirements import *
+
+xfails = {
+}
+
+xflags = {
+}
+
+@TestModule
+@ArgumentParser(argparser)
+@XFails(xfails)
+@XFlags(xflags)
+@Name("extended precision data types")
+@Specifications(
+    QA_SRS020_ClickHouse_Extended_Precision_Data_Types
+)
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision("1.0"),
+)
+def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
+    """Extended precision data type regression.
+    """
+
+    top().terminating = False
+
+    nodes = {
+        "clickhouse":
+            ("clickhouse1",)
+    }
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "extended-precision-data-type_env")) as cluster:
+
+        self.context.cluster = cluster
+        self.context.stress = stress
+
+        if parallel is not None:
+            self.context.parallel = parallel
+
+        Feature(run=load("extended_precision_data_types.tests.feature", "feature"))
+
+if main():
+    regression()
diff --git a/tests/testflows/extended_precision_data_types/requirements/__init__.py b/tests/testflows/extended_precision_data_types/requirements/__init__.py
new file mode 100644
index 00000000000..75e9d5b4bb8
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/requirements/__init__.py
@@ -0,0 +1 @@
+from .requirements import *
\ No newline at end of file
diff --git a/tests/testflows/extended_precision_data_types/requirements/requirements.md b/tests/testflows/extended_precision_data_types/requirements/requirements.md
new file mode 100644
index 00000000000..9bbd59a14d5
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/requirements/requirements.md
@@ -0,0 +1,565 @@
+# QA-SRS020 ClickHouse Extended Precision Data Types
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+  * 3.1 [Extended Precision Data Types](#extended-precision-data-types)
+* 4 [Requirements](#requirements)
+  * 4.1 [RQ.SRS-020.ClickHouse.Extended.Precision](#rqsrs-020clickhouseextendedprecision)
+  * 4.2 [Conversion](#conversion)
+    * 4.2.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt128](#rqsrs-020clickhouseextendedprecisionconversiontoint128)
+    * 4.2.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt128](#rqsrs-020clickhouseextendedprecisionconversiontouint128)
+    * 4.2.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt256](#rqsrs-020clickhouseextendedprecisionconversiontoint256)
+    * 4.2.4 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt256](#rqsrs-020clickhouseextendedprecisionconversiontouint256)
+    * 4.2.5 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toDecimal256](#rqsrs-020clickhouseextendedprecisionconversiontodecimal256)
+    * 4.2.6 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.FromMySQL](#rqsrs-020clickhouseextendedprecisionconversionfrommysql)
+    * 4.2.7 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.ToMySQL](#rqsrs-020clickhouseextendedprecisionconversiontomysql)
+  * 4.3 [Arithmetic](#arithmetic)
+    * 4.3.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Int.Supported](#rqsrs-020clickhouseextendedprecisionarithmeticintsupported)
+    * 4.3.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.Supported](#rqsrs-020clickhouseextendedprecisionarithmeticdecsupported)
+    * 4.3.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionarithmeticdecnotsupported)
+  * 4.4 [Arrays](#arrays)
+    * 4.4.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.Supported](#rqsrs-020clickhouseextendedprecisionarraysintsupported)
+    * 4.4.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.NotSupported](#rqsrs-020clickhouseextendedprecisionarraysintnotsupported)
+    * 4.4.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.Supported](#rqsrs-020clickhouseextendedprecisionarraysdecsupported)
+    * 4.4.4 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionarraysdecnotsupported)
+  * 4.5 [Comparison](#comparison)
+    * 4.5.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Comparison](#rqsrs-020clickhouseextendedprecisioncomparison)
+  * 4.6 [Logical Functions](#logical-functions)
+    * 4.6.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Logical](#rqsrs-020clickhouseextendedprecisionlogical)
+  * 4.7 [Mathematical Functions](#mathematical-functions)
+    * 4.7.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.Supported](#rqsrs-020clickhouseextendedprecisionmathematicalsupported)
+    * 4.7.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.NotSupported](#rqsrs-020clickhouseextendedprecisionmathematicalnotsupported)
+  * 4.8 [Rounding Functions](#rounding-functions)
+    * 4.8.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.Supported](#rqsrs-020clickhouseextendedprecisionroundingintsupported)
+    * 4.8.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.NotSupported](#rqsrs-020clickhouseextendedprecisionroundingintnotsupported)
+    * 4.8.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.Supported](#rqsrs-020clickhouseextendedprecisionroundingdecsupported)
+    * 4.8.4 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionroundingdecnotsupported)
+  * 4.9 [Bit Functions](#bit-functions)
+    * 4.9.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.Supported](#rqsrs-020clickhouseextendedprecisionbitintsupported)
+    * 4.9.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.NotSupported](#rqsrs-020clickhouseextendedprecisionbitintnotsupported)
+    * 4.9.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionbitdecnotsupported)
+  * 4.10 [Null Functions](#null-functions)
+    * 4.10.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Null](#rqsrs-020clickhouseextendedprecisionnull)
+  * 4.11 [Tuple Functions](#tuple-functions)
+    * 4.11.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Tuple](#rqsrs-020clickhouseextendedprecisiontuple)
+  * 4.12 [Map Functions](#map-functions)
+    * 4.12.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Map.Supported](#rqsrs-020clickhouseextendedprecisionmapsupported)
+    * 4.12.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Map.NotSupported](#rqsrs-020clickhouseextendedprecisionmapnotsupported)
+  * 4.13 [Create](#create)
+    * 4.13.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Create.Table](#rqsrs-020clickhouseextendedprecisioncreatetable)
+* 5 [References](#references)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This software requirements specification covers requirements related to [ClickHouse]
+using extended precision data types.
+
+## Terminology
+
+### Extended Precision Data Types
+
+Inclusive bounds:
+* Int128 - [-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727]
+* UInt128 - [0 : 340282366920938463463374607431768211455]
+* Int256 - [-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967]
+* UInt256 - [0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935]
+
+Exclusive bounds:
+* Decimal256 - (10^(76 - S): 10^(76 - S)), where S is the scale.
+
+## Requirements
+
+### RQ.SRS-020.ClickHouse.Extended.Precision
+version: 1.0
+
+[ClickHouse] SHALL support using [Extended Precision Data Types].
+
+### Conversion
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt128
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `Int128` using the `toInt128` function.
+
+For example,
+
+```sql
+SELECT toInt128(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt128
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `UInt128` format using `toUInt128` function.
+
+For example,
+
+```sql
+SELECT toUInt128(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt256
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `Int256` using `toInt256` function.
+
+For example,
+
+```sql
+SELECT toInt256(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt256
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `UInt256` format using `toUInt256` function.
+
+For example,
+
+```sql
+SELECT toUInt256(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toDecimal256
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `Decimal256` format using `toDecimal256` function.
+
+For example,
+
+```sql
+SELECT toDecimal256(1,2)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.FromMySQL
+version: 1.0
+
+[ClickHouse] SHALL support converting to [Extended Precision Data Types] from MySQL.
+
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.ToMySQL
+version: 1.0
+
+[ClickHouse] MAY not support converting from [Extended Precision Data Types] to MySQL.
+
+### Arithmetic
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using [Arithmetic functions] with Int128, UInt128, Int256, and UInt256.
+
+Arithmetic functions:
+* plus
+* minus
+* multiply
+* divide
+* intDiv
+* intDivOrZero
+* modulo
+* moduloOrZero
+* negate
+* abs
+* gcd
+* lcm
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Arithmetic functions] with Decimal256:
+
+* plus
+* minus
+* multiply
+* divide
+* intDiv
+* intDivOrZero
+* negate
+* abs
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Arithmetic functions] with Decimal256:
+
+* modulo
+* moduloOrZero
+* gcd
+* lcm
+
+### Arrays
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Array functions] with Int128, UInt128, Int256, and UInt256.
+
+* empty
+* notEmpty
+* length
+* arrayCount
+* arrayPopBack
+* arrayPopFront
+* arraySort
+* arrayReverseSort
+* arrayUniq
+* arrayJoin
+* arrayDistinct
+* arrayEnumerate
+* arrayEnumerateDense
+* arrayEnumerateUniq
+* arrayReverse
+* reverse
+* arrayFlatten
+* arrayCompact
+* arrayExists
+* arrayAll
+* arrayMin
+* arrayMax
+* arraySum
+* arrayAvg
+* arrayReduce
+* arrayReduceInRanges
+* arrayZip
+* arrayMap
+* arrayFilter
+* arrayFill
+* arrayReverseFill
+* arraySplit
+* arrayFirst
+* arrayFirstIndex
+* arrayConcat
+* hasAll
+* hasAny
+* hasSubstr
+* arrayElement
+* has
+* indexOf
+* countEqual
+* arrayPushBack
+* arrayPushFront
+* arrayResize
+* arraySlice
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Array functions] with Int128, UInt128, Int256, and UInt256:
+
+* arrayDifference
+* arrayCumSum
+* arrayCumSumNonNegative
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Array functions] with Decimal256:
+
+* empty
+* notEmpty
+* length
+* arrayCount
+* arrayPopBack
+* arrayPopFront
+* arraySort
+* arrayReverseSort
+* arrayUniq
+* arrayJoin
+* arrayDistinct
+* arrayEnumerate
+* arrayEnumerateDense
+* arrayEnumerateUniq
+* arrayReverse
+* reverse
+* arrayFlatten
+* arrayCompact
+* arrayExists
+* arrayAll
+* arrayReduce
+* arrayReduceInRanges
+* arrayZip
+* arrayMap
+* arrayFilter
+* arrayFill
+* arrayReverseFill
+* arraySplit
+* arrayFirst
+* arrayFirstIndex
+* arrayConcat
+* hasAll
+* hasAny
+* hasSubstr
+* arrayElement
+* has
+* indexOf
+* countEqual
+* arrayPushBack
+* arrayPushFront
+* arrayResize
+* arraySlice
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Array functions] with Decimal256:
+
+* arrayMin
+* arrayMax
+* arraaySum
+* arrayAvg
+* arrayDifference
+* arrayCumSum
+* arrayCumSumNonNegative
+
+### Comparison
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Comparison
+version: 1.0
+
+[ClickHouse] SHALL support using [Comparison functions] with [Extended Precision Data Types].
+
+Comparison functions:
+* equals
+* notEquals
+* less
+* greater
+* lessOrEquals
+* greaterOrEquals
+
+### Logical Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Logical
+version: 1.0
+
+[ClickHouse] MAY not support using [Logical functions] with [Extended Precision Data Types].
+
+Logical functions:
+* and
+* or
+* not
+* xor
+
+### Mathematical Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Mathematical functions] with [Extended Precision Data Types]:
+
+* exp
+* log, ln
+* exp2
+* log2
+* exp10
+* log10
+* sqrt
+* cbrt
+* erf
+* erfc
+* lgamma
+* tgamma
+* sin
+* cos
+* tan
+* asin
+* acos
+* atan
+* cosh
+* acosh
+* sinh
+* asinh
+* tanh
+* atanh
+* log1p
+* sign
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Mathematical functions] with [Extended Precision Data Types]:
+
+* pow, power
+* intExp2
+* intExp10
+* atan2
+* hypot
+
+### Rounding Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Rounding functions] with Int128, UInt128, Int256, and UInt256:
+
+* floor
+* ceil
+* trunc
+* round
+* roundBankers
+* roundDuration
+* roundAge
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Rounding functions] with Int128, UInt128, Int256, and UInt256:
+
+* roundDown
+* roundToExp2
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Rounding functions] with Decimal256:
+
+* floor
+* ceil
+* trunc
+* round
+* roundBankers
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Rounding functions] with Decimal256:
+
+* roundDuration
+* roundAge
+* roundDown
+* roundToExp2
+
+### Bit Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Bit functions] with Int128, UInt128, Int256, and UInt256:
+
+* bitAnd
+* bitOr
+* bitXor
+* bitNot
+* bitShiftLeft
+* bitShiftRight
+* bitCount
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Bit functions] with Int128, UInt128, Int256, and UInt256:
+
+* bitRotateLeft
+* bitRotateRight
+* bitTest
+* bitTestAll
+* bitTestAny
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using [Bit functions] with Decimal256.
+
+Bit functions:
+* bitAnd
+* bitOr
+* bitXor
+* bitNot
+* bitShiftLeft
+* bitShiftRight
+* bitCount
+* bitRotateLeft
+* bitRotateRight
+* bitTest
+* bitTestAll
+* bitTestAny
+
+### Null Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Null
+version: 1.0
+
+[ClickHouse] SHALL support using [Null functions] with [Extended Precision Data Types].
+
+Null functions:
+* isNull
+* isNotNull
+* coalesce
+* ifNull
+* nullIf
+* assumeNotNull
+* toNullable
+
+### Tuple Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Tuple
+version: 1.0
+
+[ClickHouse] SHALL support using [Tuple functions] with [Extended Precision Data Types].
+
+Tuple functions:
+* tuple
+* tupleElement
+* untuple
+
+### Map Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Map.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Map functions] with [Extended Precision Data Types]:
+
+* map
+* mapContains
+* mapKeys
+* mapValues
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Map.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Map functions] with [Extended Precision Data Types]:
+
+* mapAdd
+* mapSubtract
+* mapPopulateSeries
+
+### Create
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Create.Table
+version: 1.0
+
+[ClickHouse] SHALL support creating table with columns that use [Extended Precision Data Types].
+
+## References
+
+* **ClickHouse:** https://clickhouse.tech
+* **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/
+[SRS]: #srs
+[ClickHouse]: https://clickhouse.tech
+[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/
+[GitHub]: https://github.com
diff --git a/tests/testflows/extended_precision_data_types/requirements/requirements.py b/tests/testflows/extended_precision_data_types/requirements/requirements.py
new file mode 100644
index 00000000000..3fcf7798651
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/requirements/requirements.py
@@ -0,0 +1,1423 @@
+# These requirements were auto generated
+# from software requirements specification (SRS)
+# document by TestFlows v1.6.210505.1133630.
+# Do not edit by hand but re-generate instead
+# using 'tfs requirements generate' command.
+from testflows.core import Specification
+from testflows.core import Requirement
+
+Heading = Specification.Heading
+
+RQ_SRS_020_ClickHouse_Extended_Precision = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using [Extended Precision Data Types].\n'
+        '\n'
+        ),
+    link=None,
+    level=2,
+    num='4.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toInt128 = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt128',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting values to `Int128` using the `toInt128` function.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT toInt128(1)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toUInt128 = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt128',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting values to `UInt128` format using `toUInt128` function.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT toUInt128(1)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.2')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toInt256 = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt256',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting values to `Int256` using `toInt256` function.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT toInt256(1)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.3')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toUInt256 = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt256',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting values to `UInt256` format using `toUInt256` function.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT toUInt256(1)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.4')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toDecimal256 = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toDecimal256',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting values to `Decimal256` format using `toDecimal256` function.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT toDecimal256(1,2)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.5')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_FromMySQL = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.FromMySQL',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting to [Extended Precision Data Types] from MySQL.\n'
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.6')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_ToMySQL = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.ToMySQL',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support converting from [Extended Precision Data Types] to MySQL.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.2.7')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Int_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Int.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using [Arithmetic functions] with Int128, UInt128, Int256, and UInt256.\n'
+        '\n'
+        'Arithmetic functions:\n'
+        '* plus\n'
+        '* minus\n'
+        '* multiply\n'
+        '* divide\n'
+        '* intDiv\n'
+        '* intDivOrZero\n'
+        '* modulo\n'
+        '* moduloOrZero\n'
+        '* negate\n'
+        '* abs\n'
+        '* gcd\n'
+        '* lcm\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.3.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Dec_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Arithmetic functions] with Decimal256:\n'
+        '\n'
+        '* plus\n'
+        '* minus\n'
+        '* multiply\n'
+        '* divide\n'
+        '* intDiv\n'
+        '* intDivOrZero\n'
+        '* negate\n'
+        '* abs\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.3.2')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Dec_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Arithmetic functions] with Decimal256:\n'
+        '\n'
+        '* modulo\n'
+        '* moduloOrZero\n'
+        '* gcd\n'
+        '* lcm\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.3.3')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Int_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Array functions] with Int128, UInt128, Int256, and UInt256.\n'
+        '\n'
+        '* empty\n'
+        '* notEmpty\n'
+        '* length\n'
+        '* arrayCount\n'
+        '* arrayPopBack\n'
+        '* arrayPopFront\n'
+        '* arraySort\n'
+        '* arrayReverseSort\n'
+        '* arrayUniq\n'
+        '* arrayJoin\n'
+        '* arrayDistinct\n'
+        '* arrayEnumerate\n'
+        '* arrayEnumerateDense\n'
+        '* arrayEnumerateUniq\n'
+        '* arrayReverse\n'
+        '* reverse\n'
+        '* arrayFlatten\n'
+        '* arrayCompact\n'
+        '* arrayExists\n'
+        '* arrayAll\n'
+        '* arrayMin\n'
+        '* arrayMax\n'
+        '* arraySum\n'
+        '* arrayAvg\n'
+        '* arrayReduce\n'
+        '* arrayReduceInRanges\n'
+        '* arrayZip\n'
+        '* arrayMap\n'
+        '* arrayFilter\n'
+        '* arrayFill\n'
+        '* arrayReverseFill\n'
+        '* arraySplit\n'
+        '* arrayFirst\n'
+        '* arrayFirstIndex\n'
+        '* arrayConcat\n'
+        '* hasAll\n'
+        '* hasAny\n'
+        '* hasSubstr\n'
+        '* arrayElement\n'
+        '* has\n'
+        '* indexOf\n'
+        '* countEqual\n'
+        '* arrayPushBack\n'
+        '* arrayPushFront\n'
+        '* arrayResize\n'
+        '* arraySlice\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Int_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Array functions] with Int128, UInt128, Int256, and UInt256:\n'
+        '\n'
+        '* arrayDifference\n'
+        '* arrayCumSum\n'
+        '* arrayCumSumNonNegative\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.2')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Dec_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Array functions] with Decimal256:\n'
+        '\n'
+        '* empty\n'
+        '* notEmpty\n'
+        '* length\n'
+        '* arrayCount\n'
+        '* arrayPopBack\n'
+        '* arrayPopFront\n'
+        '* arraySort\n'
+        '* arrayReverseSort\n'
+        '* arrayUniq\n'
+        '* arrayJoin\n'
+        '* arrayDistinct\n'
+        '* arrayEnumerate\n'
+        '* arrayEnumerateDense\n'
+        '* arrayEnumerateUniq\n'
+        '* arrayReverse\n'
+        '* reverse\n'
+        '* arrayFlatten\n'
+        '* arrayCompact\n'
+        '* arrayExists\n'
+        '* arrayAll\n'
+        '* arrayReduce\n'
+        '* arrayReduceInRanges\n'
+        '* arrayZip\n'
+        '* arrayMap\n'
+        '* arrayFilter\n'
+        '* arrayFill\n'
+        '* arrayReverseFill\n'
+        '* arraySplit\n'
+        '* arrayFirst\n'
+        '* arrayFirstIndex\n'
+        '* arrayConcat\n'
+        '* hasAll\n'
+        '* hasAny\n'
+        '* hasSubstr\n'
+        '* arrayElement\n'
+        '* has\n'
+        '* indexOf\n'
+        '* countEqual\n'
+        '* arrayPushBack\n'
+        '* arrayPushFront\n'
+        '* arrayResize\n'
+        '* arraySlice\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.3')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Dec_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Array functions] with Decimal256:\n'
+        '\n'
+        '* arrayMin\n'
+        '* arrayMax\n'
+        '* arraaySum\n'
+        '* arrayAvg\n'
+        '* arrayDifference\n'
+        '* arrayCumSum\n'
+        '* arrayCumSumNonNegative\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.4.4')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Comparison = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Comparison',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using [Comparison functions] with [Extended Precision Data Types].\n'
+        '\n'
+        'Comparison functions:\n'
+        '* equals\n'
+        '* notEquals\n'
+        '* less\n'
+        '* greater\n'
+        '* lessOrEquals\n'
+        '* greaterOrEquals\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.5.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Logical = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Logical',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using [Logical functions] with [Extended Precision Data Types].\n'
+        '\n'
+        'Logical functions:\n'
+        '* and\n'
+        '* or\n'
+        '* not\n'
+        '* xor\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.6.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Mathematical_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Mathematical functions] with [Extended Precision Data Types]:\n'
+        '\n'
+        '* exp\n'
+        '* log, ln\n'
+        '* exp2\n'
+        '* log2\n'
+        '* exp10\n'
+        '* log10\n'
+        '* sqrt\n'
+        '* cbrt\n'
+        '* erf\n'
+        '* erfc\n'
+        '* lgamma\n'
+        '* tgamma\n'
+        '* sin\n'
+        '* cos\n'
+        '* tan\n'
+        '* asin\n'
+        '* acos\n'
+        '* atan\n'
+        '* cosh\n'
+        '* acosh\n'
+        '* sinh\n'
+        '* asinh\n'
+        '* tanh\n'
+        '* atanh\n'
+        '* log1p\n'
+        '* sign\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.7.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Mathematical_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Mathematical functions] with [Extended Precision Data Types]:\n'
+        '\n'
+        '* pow, power\n'
+        '* intExp2\n'
+        '* intExp10\n'
+        '* atan2\n'
+        '* hypot\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.7.2')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Int_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Rounding functions] with Int128, UInt128, Int256, and UInt256:\n'
+        '\n'
+        '* floor\n'
+        '* ceil\n'
+        '* trunc\n'
+        '* round\n'
+        '* roundBankers\n'
+        '* roundDuration\n'
+        '* roundAge\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Int_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Rounding functions] with Int128, UInt128, Int256, and UInt256:\n'
+        '\n'
+        '* roundDown\n'
+        '* roundToExp2\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.2')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Dec_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Rounding functions] with Decimal256:\n'
+        '\n'
+        '* floor\n'
+        '* ceil\n'
+        '* trunc\n'
+        '* round\n'
+        '* roundBankers\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.3')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Dec_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Rounding functions] with Decimal256:\n'
+        '\n'
+        '* roundDuration\n'
+        '* roundAge\n'
+        '* roundDown\n'
+        '* roundToExp2\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.8.4')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Int_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Bit functions] with Int128, UInt128, Int256, and UInt256:\n'
+        '\n'
+        '* bitAnd\n'
+        '* bitOr\n'
+        '* bitXor\n'
+        '* bitNot\n'
+        '* bitShiftLeft\n'
+        '* bitShiftRight\n'
+        '* bitCount\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.9.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Int_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Bit functions] with Int128, UInt128, Int256, and UInt256:\n'
+        '\n'
+        '* bitRotateLeft\n'
+        '* bitRotateRight\n'
+        '* bitTest\n'
+        '* bitTestAll\n'
+        '* bitTestAny\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.9.2')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Dec_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Dec.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using [Bit functions] with Decimal256.\n'
+        '\n'
+        'Bit functions:\n'
+        '* bitAnd\n'
+        '* bitOr\n'
+        '* bitXor\n'
+        '* bitNot\n'
+        '* bitShiftLeft\n'
+        '* bitShiftRight\n'
+        '* bitCount\n'
+        '* bitRotateLeft\n'
+        '* bitRotateRight\n'
+        '* bitTest\n'
+        '* bitTestAll\n'
+        '* bitTestAny\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.9.3')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Null = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Null',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using [Null functions] with [Extended Precision Data Types].\n'
+        '\n'
+        'Null functions:\n'
+        '* isNull\n'
+        '* isNotNull\n'
+        '* coalesce\n'
+        '* ifNull\n'
+        '* nullIf\n'
+        '* assumeNotNull\n'
+        '* toNullable\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.10.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Tuple = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Tuple',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using [Tuple functions] with [Extended Precision Data Types].\n'
+        '\n'
+        'Tuple functions:\n'
+        '* tuple\n'
+        '* tupleElement\n'
+        '* untuple\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.11.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Map_Supported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Map.Supported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using the following [Map functions] with [Extended Precision Data Types]:\n'
+        '\n'
+        '* map\n'
+        '* mapContains\n'
+        '* mapKeys\n'
+        '* mapValues\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.12.1')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Map_NotSupported = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Map.NotSupported',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using the following [Map functions] with [Extended Precision Data Types]:\n'
+        '\n'
+        '* mapAdd\n'
+        '* mapSubtract\n'
+        '* mapPopulateSeries\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.12.2')
+
+RQ_SRS_020_ClickHouse_Extended_Precision_Create_Table = Requirement(
+    name='RQ.SRS-020.ClickHouse.Extended.Precision.Create.Table',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support creating table with columns that use [Extended Precision Data Types].\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='4.13.1')
+
+QA_SRS020_ClickHouse_Extended_Precision_Data_Types = Specification(
+    name='QA-SRS020 ClickHouse Extended Precision Data Types', 
+    description=None,
+    author=None,
+    date=None, 
+    status=None, 
+    approved_by=None,
+    approved_date=None,
+    approved_version=None,
+    version=None,
+    group=None,
+    type=None,
+    link=None,
+    uid=None,
+    parent=None,
+    children=None,
+    headings=(
+        Heading(name='Revision History', level=1, num='1'),
+        Heading(name='Introduction', level=1, num='2'),
+        Heading(name='Terminology', level=1, num='3'),
+        Heading(name='Extended Precision Data Types', level=2, num='3.1'),
+        Heading(name='Requirements', level=1, num='4'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision', level=2, num='4.1'),
+        Heading(name='Conversion', level=2, num='4.2'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt128', level=3, num='4.2.1'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt128', level=3, num='4.2.2'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt256', level=3, num='4.2.3'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt256', level=3, num='4.2.4'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toDecimal256', level=3, num='4.2.5'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.FromMySQL', level=3, num='4.2.6'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.ToMySQL', level=3, num='4.2.7'),
+        Heading(name='Arithmetic', level=2, num='4.3'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Int.Supported', level=3, num='4.3.1'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.Supported', level=3, num='4.3.2'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.NotSupported', level=3, num='4.3.3'),
+        Heading(name='Arrays', level=2, num='4.4'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.Supported', level=3, num='4.4.1'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.NotSupported', level=3, num='4.4.2'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.Supported', level=3, num='4.4.3'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.NotSupported', level=3, num='4.4.4'),
+        Heading(name='Comparison', level=2, num='4.5'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Comparison', level=3, num='4.5.1'),
+        Heading(name='Logical Functions', level=2, num='4.6'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Logical', level=3, num='4.6.1'),
+        Heading(name='Mathematical Functions', level=2, num='4.7'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.Supported', level=3, num='4.7.1'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.NotSupported', level=3, num='4.7.2'),
+        Heading(name='Rounding Functions', level=2, num='4.8'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.Supported', level=3, num='4.8.1'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.NotSupported', level=3, num='4.8.2'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.Supported', level=3, num='4.8.3'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.NotSupported', level=3, num='4.8.4'),
+        Heading(name='Bit Functions', level=2, num='4.9'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.Supported', level=3, num='4.9.1'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.NotSupported', level=3, num='4.9.2'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Dec.NotSupported', level=3, num='4.9.3'),
+        Heading(name='Null Functions', level=2, num='4.10'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Null', level=3, num='4.10.1'),
+        Heading(name='Tuple Functions', level=2, num='4.11'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Tuple', level=3, num='4.11.1'),
+        Heading(name='Map Functions', level=2, num='4.12'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Map.Supported', level=3, num='4.12.1'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Map.NotSupported', level=3, num='4.12.2'),
+        Heading(name='Create', level=2, num='4.13'),
+        Heading(name='RQ.SRS-020.ClickHouse.Extended.Precision.Create.Table', level=3, num='4.13.1'),
+        Heading(name='References', level=1, num='5'),
+        ),
+    requirements=(
+        RQ_SRS_020_ClickHouse_Extended_Precision,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toInt128,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toUInt128,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toInt256,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toUInt256,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toDecimal256,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_FromMySQL,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_ToMySQL,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Int_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Dec_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Dec_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Int_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Int_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Dec_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Dec_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Comparison,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Logical,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Mathematical_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Mathematical_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Int_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Int_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Dec_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Dec_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Int_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Int_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Dec_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Null,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Tuple,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Map_Supported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Map_NotSupported,
+        RQ_SRS_020_ClickHouse_Extended_Precision_Create_Table,
+        ),
+    content='''
+# QA-SRS020 ClickHouse Extended Precision Data Types
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Terminology](#terminology)
+  * 3.1 [Extended Precision Data Types](#extended-precision-data-types)
+* 4 [Requirements](#requirements)
+  * 4.1 [RQ.SRS-020.ClickHouse.Extended.Precision](#rqsrs-020clickhouseextendedprecision)
+  * 4.2 [Conversion](#conversion)
+    * 4.2.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt128](#rqsrs-020clickhouseextendedprecisionconversiontoint128)
+    * 4.2.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt128](#rqsrs-020clickhouseextendedprecisionconversiontouint128)
+    * 4.2.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt256](#rqsrs-020clickhouseextendedprecisionconversiontoint256)
+    * 4.2.4 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt256](#rqsrs-020clickhouseextendedprecisionconversiontouint256)
+    * 4.2.5 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toDecimal256](#rqsrs-020clickhouseextendedprecisionconversiontodecimal256)
+    * 4.2.6 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.FromMySQL](#rqsrs-020clickhouseextendedprecisionconversionfrommysql)
+    * 4.2.7 [RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.ToMySQL](#rqsrs-020clickhouseextendedprecisionconversiontomysql)
+  * 4.3 [Arithmetic](#arithmetic)
+    * 4.3.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Int.Supported](#rqsrs-020clickhouseextendedprecisionarithmeticintsupported)
+    * 4.3.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.Supported](#rqsrs-020clickhouseextendedprecisionarithmeticdecsupported)
+    * 4.3.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionarithmeticdecnotsupported)
+  * 4.4 [Arrays](#arrays)
+    * 4.4.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.Supported](#rqsrs-020clickhouseextendedprecisionarraysintsupported)
+    * 4.4.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.NotSupported](#rqsrs-020clickhouseextendedprecisionarraysintnotsupported)
+    * 4.4.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.Supported](#rqsrs-020clickhouseextendedprecisionarraysdecsupported)
+    * 4.4.4 [RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionarraysdecnotsupported)
+  * 4.5 [Comparison](#comparison)
+    * 4.5.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Comparison](#rqsrs-020clickhouseextendedprecisioncomparison)
+  * 4.6 [Logical Functions](#logical-functions)
+    * 4.6.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Logical](#rqsrs-020clickhouseextendedprecisionlogical)
+  * 4.7 [Mathematical Functions](#mathematical-functions)
+    * 4.7.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.Supported](#rqsrs-020clickhouseextendedprecisionmathematicalsupported)
+    * 4.7.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.NotSupported](#rqsrs-020clickhouseextendedprecisionmathematicalnotsupported)
+  * 4.8 [Rounding Functions](#rounding-functions)
+    * 4.8.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.Supported](#rqsrs-020clickhouseextendedprecisionroundingintsupported)
+    * 4.8.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.NotSupported](#rqsrs-020clickhouseextendedprecisionroundingintnotsupported)
+    * 4.8.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.Supported](#rqsrs-020clickhouseextendedprecisionroundingdecsupported)
+    * 4.8.4 [RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionroundingdecnotsupported)
+  * 4.9 [Bit Functions](#bit-functions)
+    * 4.9.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.Supported](#rqsrs-020clickhouseextendedprecisionbitintsupported)
+    * 4.9.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.NotSupported](#rqsrs-020clickhouseextendedprecisionbitintnotsupported)
+    * 4.9.3 [RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Dec.NotSupported](#rqsrs-020clickhouseextendedprecisionbitdecnotsupported)
+  * 4.10 [Null Functions](#null-functions)
+    * 4.10.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Null](#rqsrs-020clickhouseextendedprecisionnull)
+  * 4.11 [Tuple Functions](#tuple-functions)
+    * 4.11.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Tuple](#rqsrs-020clickhouseextendedprecisiontuple)
+  * 4.12 [Map Functions](#map-functions)
+    * 4.12.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Map.Supported](#rqsrs-020clickhouseextendedprecisionmapsupported)
+    * 4.12.2 [RQ.SRS-020.ClickHouse.Extended.Precision.Map.NotSupported](#rqsrs-020clickhouseextendedprecisionmapnotsupported)
+  * 4.13 [Create](#create)
+    * 4.13.1 [RQ.SRS-020.ClickHouse.Extended.Precision.Create.Table](#rqsrs-020clickhouseextendedprecisioncreatetable)
+* 5 [References](#references)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This software requirements specification covers requirements related to [ClickHouse]
+using extended precision data types.
+
+## Terminology
+
+### Extended Precision Data Types
+
+Inclusive bounds:
+* Int128 - [-170141183460469231731687303715884105728 : 170141183460469231731687303715884105727]
+* UInt128 - [0 : 340282366920938463463374607431768211455]
+* Int256 - [-57896044618658097711785492504343953926634992332820282019728792003956564819968 : 57896044618658097711785492504343953926634992332820282019728792003956564819967]
+* UInt256 - [0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935]
+
+Exclusive bounds:
+* Decimal256 - (10^(76 - S): 10^(76 - S)), where S is the scale.
+
+## Requirements
+
+### RQ.SRS-020.ClickHouse.Extended.Precision
+version: 1.0
+
+[ClickHouse] SHALL support using [Extended Precision Data Types].
+
+### Conversion
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt128
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `Int128` using the `toInt128` function.
+
+For example,
+
+```sql
+SELECT toInt128(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt128
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `UInt128` format using `toUInt128` function.
+
+For example,
+
+```sql
+SELECT toUInt128(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toInt256
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `Int256` using `toInt256` function.
+
+For example,
+
+```sql
+SELECT toInt256(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toUInt256
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `UInt256` format using `toUInt256` function.
+
+For example,
+
+```sql
+SELECT toUInt256(1)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.toDecimal256
+version: 1.0
+
+[ClickHouse] SHALL support converting values to `Decimal256` format using `toDecimal256` function.
+
+For example,
+
+```sql
+SELECT toDecimal256(1,2)
+```
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.FromMySQL
+version: 1.0
+
+[ClickHouse] SHALL support converting to [Extended Precision Data Types] from MySQL.
+
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Conversion.ToMySQL
+version: 1.0
+
+[ClickHouse] MAY not support converting from [Extended Precision Data Types] to MySQL.
+
+### Arithmetic
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using [Arithmetic functions] with Int128, UInt128, Int256, and UInt256.
+
+Arithmetic functions:
+* plus
+* minus
+* multiply
+* divide
+* intDiv
+* intDivOrZero
+* modulo
+* moduloOrZero
+* negate
+* abs
+* gcd
+* lcm
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Arithmetic functions] with Decimal256:
+
+* plus
+* minus
+* multiply
+* divide
+* intDiv
+* intDivOrZero
+* negate
+* abs
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arithmetic.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Arithmetic functions] with Decimal256:
+
+* modulo
+* moduloOrZero
+* gcd
+* lcm
+
+### Arrays
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Array functions] with Int128, UInt128, Int256, and UInt256.
+
+* empty
+* notEmpty
+* length
+* arrayCount
+* arrayPopBack
+* arrayPopFront
+* arraySort
+* arrayReverseSort
+* arrayUniq
+* arrayJoin
+* arrayDistinct
+* arrayEnumerate
+* arrayEnumerateDense
+* arrayEnumerateUniq
+* arrayReverse
+* reverse
+* arrayFlatten
+* arrayCompact
+* arrayExists
+* arrayAll
+* arrayMin
+* arrayMax
+* arraySum
+* arrayAvg
+* arrayReduce
+* arrayReduceInRanges
+* arrayZip
+* arrayMap
+* arrayFilter
+* arrayFill
+* arrayReverseFill
+* arraySplit
+* arrayFirst
+* arrayFirstIndex
+* arrayConcat
+* hasAll
+* hasAny
+* hasSubstr
+* arrayElement
+* has
+* indexOf
+* countEqual
+* arrayPushBack
+* arrayPushFront
+* arrayResize
+* arraySlice
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Int.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Array functions] with Int128, UInt128, Int256, and UInt256:
+
+* arrayDifference
+* arrayCumSum
+* arrayCumSumNonNegative
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Array functions] with Decimal256:
+
+* empty
+* notEmpty
+* length
+* arrayCount
+* arrayPopBack
+* arrayPopFront
+* arraySort
+* arrayReverseSort
+* arrayUniq
+* arrayJoin
+* arrayDistinct
+* arrayEnumerate
+* arrayEnumerateDense
+* arrayEnumerateUniq
+* arrayReverse
+* reverse
+* arrayFlatten
+* arrayCompact
+* arrayExists
+* arrayAll
+* arrayReduce
+* arrayReduceInRanges
+* arrayZip
+* arrayMap
+* arrayFilter
+* arrayFill
+* arrayReverseFill
+* arraySplit
+* arrayFirst
+* arrayFirstIndex
+* arrayConcat
+* hasAll
+* hasAny
+* hasSubstr
+* arrayElement
+* has
+* indexOf
+* countEqual
+* arrayPushBack
+* arrayPushFront
+* arrayResize
+* arraySlice
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Arrays.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Array functions] with Decimal256:
+
+* arrayMin
+* arrayMax
+* arraaySum
+* arrayAvg
+* arrayDifference
+* arrayCumSum
+* arrayCumSumNonNegative
+
+### Comparison
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Comparison
+version: 1.0
+
+[ClickHouse] SHALL support using [Comparison functions] with [Extended Precision Data Types].
+
+Comparison functions:
+* equals
+* notEquals
+* less
+* greater
+* lessOrEquals
+* greaterOrEquals
+
+### Logical Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Logical
+version: 1.0
+
+[ClickHouse] MAY not support using [Logical functions] with [Extended Precision Data Types].
+
+Logical functions:
+* and
+* or
+* not
+* xor
+
+### Mathematical Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Mathematical functions] with [Extended Precision Data Types]:
+
+* exp
+* log, ln
+* exp2
+* log2
+* exp10
+* log10
+* sqrt
+* cbrt
+* erf
+* erfc
+* lgamma
+* tgamma
+* sin
+* cos
+* tan
+* asin
+* acos
+* atan
+* cosh
+* acosh
+* sinh
+* asinh
+* tanh
+* atanh
+* log1p
+* sign
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Mathematical.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Mathematical functions] with [Extended Precision Data Types]:
+
+* pow, power
+* intExp2
+* intExp10
+* atan2
+* hypot
+
+### Rounding Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Rounding functions] with Int128, UInt128, Int256, and UInt256:
+
+* floor
+* ceil
+* trunc
+* round
+* roundBankers
+* roundDuration
+* roundAge
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Int.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Rounding functions] with Int128, UInt128, Int256, and UInt256:
+
+* roundDown
+* roundToExp2
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Rounding functions] with Decimal256:
+
+* floor
+* ceil
+* trunc
+* round
+* roundBankers
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Rounding.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Rounding functions] with Decimal256:
+
+* roundDuration
+* roundAge
+* roundDown
+* roundToExp2
+
+### Bit Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Bit functions] with Int128, UInt128, Int256, and UInt256:
+
+* bitAnd
+* bitOr
+* bitXor
+* bitNot
+* bitShiftLeft
+* bitShiftRight
+* bitCount
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Int.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Bit functions] with Int128, UInt128, Int256, and UInt256:
+
+* bitRotateLeft
+* bitRotateRight
+* bitTest
+* bitTestAll
+* bitTestAny
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Bit.Dec.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using [Bit functions] with Decimal256.
+
+Bit functions:
+* bitAnd
+* bitOr
+* bitXor
+* bitNot
+* bitShiftLeft
+* bitShiftRight
+* bitCount
+* bitRotateLeft
+* bitRotateRight
+* bitTest
+* bitTestAll
+* bitTestAny
+
+### Null Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Null
+version: 1.0
+
+[ClickHouse] SHALL support using [Null functions] with [Extended Precision Data Types].
+
+Null functions:
+* isNull
+* isNotNull
+* coalesce
+* ifNull
+* nullIf
+* assumeNotNull
+* toNullable
+
+### Tuple Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Tuple
+version: 1.0
+
+[ClickHouse] SHALL support using [Tuple functions] with [Extended Precision Data Types].
+
+Tuple functions:
+* tuple
+* tupleElement
+* untuple
+
+### Map Functions
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Map.Supported
+version: 1.0
+
+[ClickHouse] SHALL support using the following [Map functions] with [Extended Precision Data Types]:
+
+* map
+* mapContains
+* mapKeys
+* mapValues
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Map.NotSupported
+version: 1.0
+
+[ClickHouse] MAY not support using the following [Map functions] with [Extended Precision Data Types]:
+
+* mapAdd
+* mapSubtract
+* mapPopulateSeries
+
+### Create
+
+#### RQ.SRS-020.ClickHouse.Extended.Precision.Create.Table
+version: 1.0
+
+[ClickHouse] SHALL support creating table with columns that use [Extended Precision Data Types].
+
+## References
+
+* **ClickHouse:** https://clickhouse.tech
+* **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/
+[SRS]: #srs
+[ClickHouse]: https://clickhouse.tech
+[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/
+[GitHub]: https://github.com
+''')
diff --git a/tests/testflows/extended_precision_data_types/tests/__init__.py b/tests/testflows/extended_precision_data_types/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/extended_precision_data_types/tests/arithmetic.py b/tests/testflows/extended_precision_data_types/tests/arithmetic.py
new file mode 100644
index 00000000000..d939569d5a7
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/arithmetic.py
@@ -0,0 +1,217 @@
+import os
+import textwrap
+
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+funcs = [
+    ('plus', '2'),
+    ('minus', '0'),
+    ('multiply', '1'),
+    ('divide', '1'),
+    ('intDiv', '1'),
+    ('intDivOrZero', '1'),
+    ('modulo', '0'),
+    ('moduloOrZero', '0'),
+    ('negate', '-1'),
+    ('abs', '1'),
+    ('gcd', '1'),
+    ('lcm', '1'),
+]
+
+Examples_list =  [tuple(list(func)+list(data_type)+[Name(f'{func[0]} - {data_type[0]}')]) for func in funcs for data_type in data_types]
+Examples_dec_list =  [tuple(list(func)+[Name(f'{func[0]} - Decimal256')]) for func in funcs]
+
+@TestOutline
+@Examples('arithmetic_func expected_result int_type min max', Examples_list)
+def inline_check(self, arithmetic_func, expected_result, int_type, min, max, node=None):
+    """Check that arithmetic functions work using inline tests with Int128, UInt128, Int256, and UInt256.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    if arithmetic_func in ['negate','abs']:
+
+        with When(f"I check {arithmetic_func} with {int_type}"):
+            output = node.query(f"SELECT {arithmetic_func}(to{int_type}(1))").output
+            assert output == expected_result, error()
+
+        with When(f"I check {arithmetic_func} with {int_type} max and min value"):
+            execute_query(f"""
+                SELECT {arithmetic_func}(to{int_type}(\'{max}\')), {arithmetic_func}(to{int_type}(\'{min}\'))
+                """)
+
+    else:
+
+        with When(f"I check {arithmetic_func} with {int_type}"):
+            output = node.query(f"SELECT {arithmetic_func}(to{int_type}(1), to{int_type}(1))").output
+            assert output == expected_result, error()
+
+        if arithmetic_func in ['gcd','lcm']:
+
+            if int_type in ['UInt128','UInt256']:
+                exitcode=153
+            else:
+                exitcode=151
+
+            with When(f"I check {arithmetic_func} with {int_type} max and min value"):
+                node.query(f"SELECT {arithmetic_func}(to{int_type}(\'{max}\'), to{int_type}(1)), {arithmetic_func}(to{int_type}(\'{min}\'), to{int_type}(1))",
+                    exitcode = exitcode, message = 'Exception:')
+
+        else:
+
+            with When(f"I check {arithmetic_func} with {int_type} max and min value"):
+                execute_query(f"""
+                    SELECT {arithmetic_func}(to{int_type}(\'{max}\'), to{int_type}(1)), {arithmetic_func}(to{int_type}(\'{min}\'), to{int_type}(1))
+                    """)
+
+@TestOutline
+@Examples('arithmetic_func expected_result int_type min max', Examples_list)
+def table_check(self, arithmetic_func, expected_result, int_type, min, max, node=None):
+    """Check that arithmetic functions work using tables with Int128, UInt128, Int256, and UInt256.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = int_type)
+
+    if arithmetic_func in ['negate','abs']:
+
+        for value in [1, min, max]:
+
+            with When(f"I insert {arithmetic_func} with {int_type} {value} into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(to{int_type}(\'{value}\'))")
+
+        with Then(f"I check the table output of {arithmetic_func} with {int_type}"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    else:
+
+        with When(f"I insert {arithmetic_func} with {int_type} into the table"):
+            node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(to{int_type}(1), to{int_type}(1))")
+
+        with Then("I check that the output matches the expected value"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert output == expected_result, error()
+
+        if arithmetic_func in ['gcd', 'lcm']:
+
+            if int_type in ['UInt128', 'UInt256']:
+
+                with When(f"I insert {arithmetic_func} with {int_type} {min} into the table"):
+                    node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(to{int_type}(\'{min}\'), to{int_type}(1))",
+                        exitcode = 153, message = 'Exception:')
+
+                with And(f"I insert {arithmetic_func} with {int_type} {max} into the table"):
+                    node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(to{int_type}(\'{max}\'), to{int_type}(1))")
+
+            else:
+
+                for value in [min, max]:
+
+                    with When(f"I insert {arithmetic_func} with {int_type} {value} into the table"):
+                        node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(to{int_type}(\'{value}\'), to{int_type}(1))",
+                            exitcode = 151, message = 'Exception:')
+
+        else:
+
+            for value in [min, max]:
+
+                with When(f"I insert {arithmetic_func} with {int_type} {value} into the table"):
+                    node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(to{int_type}(\'{value}\'), to{int_type}(1))")
+
+        with Then(f"I check the table output of {arithmetic_func} with {int_type}"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+@TestOutline
+@Examples('arithmetic_func expected_result', Examples_dec_list)
+def inline_check_dec(self, arithmetic_func, expected_result, node=None):
+    """Check that arithmetic functions work using inline with Decimal256.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    if arithmetic_func is 'negate' or arithmetic_func is 'abs':
+
+        with When(f"I check {arithmetic_func} with toDecimal256"):
+            output = node.query(f"SELECT {arithmetic_func}(toDecimal256(1,0))").output
+            assert output == expected_result, error()
+
+    elif arithmetic_func in ['modulo', 'moduloOrZero', 'gcd', 'lcm']:
+
+        with When(f"I check {arithmetic_func} with toDecimal256"):
+            node.query(f"SELECT {arithmetic_func}(toDecimal256(1,0), toDecimal256(1,0))",
+                exitcode=43, message = 'Exception:')
+
+    else:
+
+        with When(f"I check {arithmetic_func} with toDecimal256"):
+            output = node.query(f"SELECT {arithmetic_func}(toDecimal256(1,0), toDecimal256(1,0))").output
+            assert output == expected_result, error()
+
+@TestOutline
+@Examples('arithmetic_func expected_result', Examples_dec_list)
+def table_check_dec(self, arithmetic_func, expected_result, node=None):
+    """Check that arithmetic functions work using tables with Decimal256.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = 'Decimal256(0)')
+
+    if arithmetic_func in ['negate','abs']:
+
+        with When(f"I insert {arithmetic_func} with toDecimal256 into the table"):
+            node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(toDecimal256(1,0))")
+
+        with Then(f"I check the table for output of {arithmetic_func} with Decimal256"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    elif arithmetic_func in ['modulo', 'moduloOrZero', 'gcd', 'lcm']:
+
+        with When(f"I check {arithmetic_func} with toDecimal256"):
+            node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(toDecimal256(1,0), toDecimal256(1,0))",
+                exitcode=43, message = 'Exception:')
+
+    else:
+        with When(f"I insert {arithmetic_func} with toDecimal256 into the table"):
+            node.query(f"INSERT INTO {table_name} SELECT {arithmetic_func}(toDecimal256(1,0), toDecimal256(1,0))")
+
+        with Then("I check that the output matches the expected value"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert output == expected_result, error()
+
+@TestFeature
+@Name("arithmetic")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Int_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Dec_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Arithmetic_Dec_NotSupported("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that arithmetic functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    with allow_experimental_bigint(self.context.node):
+        Scenario(run = inline_check)
+        Scenario(run = table_check)
+        Scenario(run = inline_check_dec)
+        Scenario(run = table_check_dec)
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
new file mode 100644
index 00000000000..6efa122ffdf
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/array_tuple_map.py
@@ -0,0 +1,484 @@
+import uuid
+
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+def get_table_name():
+    return "table" + "_" + str(uuid.uuid1()).replace('-', '_')
+
+@TestOutline(Suite)
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Int_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Int_NotSupported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Dec_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Arrays_Dec_NotSupported("1.0"),
+)
+def array_func(self, data_type, node=None):
+    """Check array functions with extended precision data types.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    for func in ['arrayPopBack(',
+        'arrayPopFront(',
+        'arraySort(',
+        'arrayReverseSort(',
+        'arrayDistinct(',
+        'arrayEnumerate(',
+        'arrayEnumerateDense(',
+        'arrayEnumerateUniq(',
+        'arrayReverse(',
+        'reverse(',
+        'arrayFlatten(',
+        'arrayCompact(',
+        'arrayReduceInRanges(\'sum\', [(1, 5)],',
+        'arrayMap(x -> (x + 2),',
+        'arrayFill(x -> x=3,',
+        'arrayReverseFill(x -> x=3,',
+        f'arrayConcat([{to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}],',
+        'arrayFilter(x -> x == 1, ']:
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+            execute_query(f"""
+                SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))
+                """)
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = f'Array({data_type})')
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))")
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    for func in ['arraySplit((x, y) -> x=y, [0, 0, 0],']:
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+            execute_query(f"""
+                SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))
+                """)
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = f'Array(Array({data_type}))')
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))")
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    for func in [f'arrayZip([{to_data_type(data_type,1)}],']:
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+            execute_query(f"""
+                SELECT {func}array({to_data_type(data_type,3)}))
+                """)
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = f'Array(Tuple({data_type}, {data_type}))')
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}array({to_data_type(data_type,1)}))")
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    for func in ['empty(',
+        'notEmpty(',
+        'length(',
+        'arrayCount(x -> x == 1, ',
+        'arrayUniq(',
+        'arrayJoin(',
+        'arrayExists(x -> x==1,',
+        'arrayAll(x -> x==1,',
+        'arrayMin(',
+        'arrayMax(',
+        'arraySum(',
+        'arrayAvg(',
+        'arrayReduce(\'max\', ',
+        'arrayFirst(x -> x==3,',
+        'arrayFirstIndex(x -> x==3,',
+        f'hasAll([{to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}], ',
+        f'hasAny([{to_data_type(data_type,2)}, {to_data_type(data_type,1)}], ',
+        f'hasSubstr([{to_data_type(data_type,2)}, {to_data_type(data_type,1)}], ']:
+
+        if func in ['arrayMin(','arrayMax(','arraySum(', 'arrayAvg('] and data_type in ['Decimal256(0)']:
+
+            with Scenario(f"Inline - {data_type} - {func}"):
+                node.query(f"SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))",
+                    exitcode = 44, message = 'Exception:')
+
+            with Scenario(f"Table - {data_type} - {func}"):
+                table_name = get_table_name()
+
+                table(name = table_name, data_type = data_type)
+
+                with When("I insert the output into the table"):
+                    node.query(f"INSERT INTO {table_name} SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))",
+                        exitcode = 44, message = 'Exception:')
+
+                execute_query(f"""
+                    SELECT * FROM {table_name} ORDER BY a ASC
+                    """)
+
+        else:
+
+            with Scenario(f"Inline - {data_type} - {func}"):
+
+                execute_query(f"""
+                    SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))
+                    """)
+
+            with Scenario(f"Table - {data_type} - {func}"):
+                table_name = get_table_name()
+
+                table(name = table_name, data_type = data_type)
+
+                with When("I insert the output into the table"):
+                    node.query(f"INSERT INTO {table_name} SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))")
+
+                execute_query(f"""
+                    SELECT * FROM {table_name} ORDER BY a ASC
+                    """)
+
+    for func in ['arrayDifference(',
+        'arrayCumSum(',
+        'arrayCumSumNonNegative(']:
+
+        if data_type in ['Decimal256(0)']:
+            exitcode = 44
+        else:
+            exitcode = 43
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+            node.query(f"SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))",
+                exitcode = exitcode, message = 'Exception:')
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = data_type)
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}))",
+                    exitcode = exitcode, message = 'Exception:')
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    for func in ['arrayElement']:
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+
+            execute_query(f"""
+                SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), 1)
+                """)
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = data_type)
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), 1)")
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    for func in ['arrayPushBack',
+        'arrayPushFront']:
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+
+            execute_query(f"""
+                SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), {to_data_type(data_type,1)})
+                """)
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = f'Array({data_type})')
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), {to_data_type(data_type,1)})")
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    for func in ['arrayResize',
+        'arraySlice']:
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+
+            execute_query(f"""
+                SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), 1)
+                """)
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = f'Array({data_type})')
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), 1)")
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    for func in ['has',
+        'indexOf',
+        'countEqual']:
+
+        with Scenario(f"Inline - {data_type} - {func}"):
+            execute_query(f"""
+                SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), NULL)
+                """)
+
+        with Scenario(f"Table - {data_type} - {func}"):
+            table_name = get_table_name()
+
+            table(name = table_name, data_type = data_type)
+
+            with When("I insert the output into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(array({to_data_type(data_type,3)}, {to_data_type(data_type,2)}, {to_data_type(data_type,1)}), NULL)")
+
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+@TestOutline(Suite)
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Tuple("1.0"),
+)
+def tuple_func(self, data_type, node=None):
+    """Check tuple functions with extended precision data types.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    with Scenario(f"Creating a tuple with {data_type}"):
+        node.query(f"SELECT tuple({to_data_type(data_type,1)}, {to_data_type(data_type,1)}, {to_data_type(data_type,1)})")
+
+    with Scenario(f"Creating a tuple with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = f'Tuple({data_type}, {data_type}, {data_type})')
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT tuple({to_data_type(data_type,1)}, {to_data_type(data_type,1)}, {to_data_type(data_type,1)})")
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+    with Scenario(f"tupleElement with {data_type}"):
+        node.query(f"SELECT tupleElement(({to_data_type(data_type,1)}, {to_data_type(data_type,1)}), 1)")
+
+    with Scenario(f"tupleElement with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = data_type)
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT tupleElement(({to_data_type(data_type,1)}, {to_data_type(data_type,1)}), 1)")
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+    with Scenario(f"untuple with {data_type}"):
+        node.query(f"SELECT untuple(({to_data_type(data_type,1)},))")
+
+    with Scenario(f"untuple with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = data_type)
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT untuple(({to_data_type(data_type,1)},))")
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+    with Scenario(f"tupleHammingDistance with {data_type}"):
+        node.query(f"SELECT tupleHammingDistance(({to_data_type(data_type,1)}, {to_data_type(data_type,1)}), ({to_data_type(data_type,2)}, {to_data_type(data_type,2)}))")
+
+    with Scenario(f"tupleHammingDistance with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = data_type)
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT tupleHammingDistance(({to_data_type(data_type,1)}, {to_data_type(data_type,1)}), ({to_data_type(data_type,2)}, {to_data_type(data_type,2)}))")
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+@TestOutline(Suite)
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Map_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Map_NotSupported("1.0"),
+)
+def map_func(self, data_type, node=None):
+    """Check Map functions with extended precision data types.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    with Scenario(f"Creating a map with {data_type}"):
+        node.query(f"SELECT map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)})")
+
+    with Scenario(f"Creating a map with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = f'Map(String, {data_type})')
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)})")
+
+        execute_query(f"""
+            SELECT * FROM {table_name}
+            """)
+
+    with Scenario(f"mapAdd with {data_type}"):
+        node.query(f"SELECT mapAdd(([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]), ([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]))",
+            exitcode = 44, message='Exception:')
+
+    with Scenario(f"mapAdd with {data_type} on a table"):
+        table_name = get_table_name()
+
+        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 mapAdd(([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]), ([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]))",
+                exitcode = 44, message='Exception:')
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+    with Scenario(f"mapSubtract with {data_type}"):
+        node.query(f"SELECT mapSubtract(([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]), ([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]))",
+            exitcode = 44, message='Exception:')
+
+    with Scenario(f"mapSubtract with {data_type} on a table"):
+        table_name = get_table_name()
+
+        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 mapSubtract(([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]), ([{to_data_type(data_type,1)}, {to_data_type(data_type,2)}], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}]))",
+                exitcode = 44, message='Exception:')
+
+        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)}, {to_data_type(data_type,2)}, {to_data_type(data_type,3)}], 5)",
+            exitcode = 44, message='Exception:')
+
+    with Scenario(f"mapPopulateSeries with {data_type} on a table"):
+        table_name = get_table_name()
+
+        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], [{to_data_type(data_type,1)}, {to_data_type(data_type,2)}, {to_data_type(data_type,3)}], 5)",
+                exitcode = 44, message='Exception:')
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+    with Scenario(f"mapContains with {data_type}"):
+        node.query(f"SELECT mapContains( map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)}), 'key1')")
+
+    with Scenario(f"mapContains with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = data_type)
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT mapContains( map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)}), 'key1')")
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+    with Scenario(f"mapKeys with {data_type}"):
+        node.query(f"SELECT mapKeys( map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)}))")
+
+    with Scenario(f"mapKeys with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = 'Array(String)')
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT mapKeys( map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)}))")
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+    with Scenario(f"mapValues with {data_type}"):
+        node.query(f"SELECT mapValues( map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)}))")
+
+    with Scenario(f"mapValues with {data_type} on a table"):
+        table_name = get_table_name()
+
+        table(name = table_name, data_type = f'Array({data_type})')
+
+        with When("I insert the output into a table"):
+            node.query(f"INSERT INTO {table_name} SELECT mapValues( map('key1', {to_data_type(data_type,1)}, 'key2', {to_data_type(data_type,2)}))")
+
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+@TestFeature
+@Name("array, tuple, map")
+@Examples("data_type",[
+    ('Int128',),
+    ('Int256',),
+    ('UInt128',),
+    ('UInt256',),
+    ('Decimal256(0)',),
+])
+def feature(self, node="clickhouse1", stress=None, parallel=None):
+    """Check that array, tuple, and map functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+
+    with allow_experimental_bigint(self.context.node):
+        for example in self.examples:
+            data_type, = example
+
+            with Feature(data_type):
+
+                Suite(test=array_func)(data_type=data_type)
+                Suite(test=tuple_func)(data_type=data_type)
+
+                with Given("I allow experimental map type"):
+                    allow_experimental_map_type()
+
+                    Suite(test=map_func)(data_type=data_type)
diff --git a/tests/testflows/extended_precision_data_types/tests/bit.py b/tests/testflows/extended_precision_data_types/tests/bit.py
new file mode 100644
index 00000000000..24f63532c74
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/bit.py
@@ -0,0 +1,179 @@
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+from extended_precision_data_types.errors import *
+
+funcs = [
+    ('bitAnd', True, None),
+    ('bitOr', True, None),
+    ('bitXor', True, None),
+    ('bitShiftLeft', True, None),
+    ('bitShiftRight', True, None),
+    ('bitRotateLeft', False, not_implemented_bigints('Bit rotate')),
+    ('bitRotateRight', False, not_implemented_bigints('Bit rotate')),
+    ('bitTest', False, not_implemented_bigints('bitTest')),
+    ('bitTestAll', False, illegal_column()),
+    ('bitTestAny', False, illegal_column()),
+    ('bitNot', True, None),
+    ('bitCount', True, None)
+]
+
+Examples_list =  [tuple(list(func)+list(data_type)+[Name(f'{func[0]} - {data_type[0]}')]) for func in funcs for data_type in data_types]
+Examples_dec_list =  [tuple(list(func)+[Name(f'{func[0]} - Decimal256')]) for func in funcs]
+
+@TestOutline(Scenario)
+@Examples('func supported error int_type min max', Examples_list)
+def bit_int_inline(self, func, supported, error, int_type, min, max, node=None):
+    """ Check bit functions with Int128, UInt128, Int256, and UInt256 using inline tests.
+    """
+
+    if error is not None:
+        exitcode,message = error
+
+    if node is None:
+        node = self.context.node
+
+    if func in ["bitNot", "bitCount"]:
+
+        with When(f"Check {func} with {int_type}"):
+            execute_query(f"""
+                SELECT {func}(to{int_type}(1)), {func}(to{int_type}(\'{max}\')), {func}(to{int_type}(\'{min}\'))
+                """)
+
+    elif supported:
+
+        with When(f"I check {func} with {int_type}"):
+            execute_query(f"""
+                SELECT {func}(to{int_type}(1), 1), {func}(to{int_type}(\'{max}\'), 1), {func}(to{int_type}(\'{min}\'), 1)
+                """)
+
+    else:
+
+        with When(f"I check {func} with {int_type}"):
+            node.query(f"SELECT {func}(to{int_type}(1), 1), {func}(to{int_type}(\'{max}\'), 1), {func}(to{int_type}(\'{min}\'), 1)",
+                exitcode=exitcode, message = message)
+
+@TestOutline(Scenario)
+@Examples('func supported error int_type min max', Examples_list)
+def bit_int_table(self, func, supported, error, int_type, min, max, node=None):
+    """ Check bit functions with Int128, UInt128, Int256, and UInt256 using table tests.
+    """
+
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    if error is not None:
+        exitcode,message = error
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = int_type)
+
+    if func in ["bitNot", "bitCount"]:
+
+        for value in [1, min, max]:
+
+            with When(f"I insert the output of {func} with {int_type} and {value}"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(to{int_type}(\'{value}\'))")
+
+        with Then(f"I check the table with values of {func} and {int_type}"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    elif supported:
+
+        for value in [1, min, max]:
+
+            with When(f"I insert the output of {func} with {int_type} and {value}"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(to{int_type}(\'{value}\'), 1)")
+
+        with Then(f"I check the table with values of {func} and {int_type}"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    else:
+
+        for value in [1, min, max]:
+
+            with When(f"I insert the output of {func} with {int_type} and {value}"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(to{int_type}(\'{value}\'), 1)",
+                    exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Examples('func supported error', Examples_dec_list)
+def bit_dec_inline(self, func, supported, error, node=None):
+    """ Check bit functions with Decimal256 using inline tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    exitcode, message = illegal_type()
+
+    if node is None:
+        node = self.context.node
+
+    if func in ["bitNot", "bitCount"]:
+
+        with When(f"Check {func} with Decimal256"):
+            node.query(f"SELECT {func}(toDecimal256(1,0)), {func}(toDecimal256(\'{max}\',0)), {func}(toDecimal256(\'{min}\',0))",
+                exitcode=exitcode, message = message)
+
+    else:
+
+        with When(f"I check {func} with Decimal256"):
+            node.query(f"SELECT {func}(toDecimal256(1,0), 1), {func}(toDecimal256(\'{max}\',0), 1), {func}(toDecimal256(\'{min}\',0), 1)",
+                exitcode=exitcode, message = message)
+
+@TestOutline(Scenario)
+@Examples('func supported error', Examples_dec_list)
+def bit_dec_table(self, func, supported, error, node=None):
+    """ Check bit functions with Decimal256 using table tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    table_name = f"table_{getuid()}"
+    exitcode, message = illegal_type()
+
+    if node is None:
+        node = self.context.node
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = 'Decimal256(0)')
+
+    if func in ["bitNot", "bitCount"]:
+
+        for value in [1, min, max]:
+
+            with When(f"I insert the output of {func} with Decimal256 and {value}"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(toDecimal256(\'{value}\',0))",
+                    exitcode=exitcode, message = message)
+
+    else:
+
+        for value in [1, min, max]:
+
+            with When(f"I insert the output of {func} with Decimal256 and {value}"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(toDecimal256(\'{value}\',0), 1)",
+                    exitcode=exitcode, message=message)
+
+@TestFeature
+@Name("bit")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Int_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Int_NotSupported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Bit_Dec_NotSupported("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that bit functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    with allow_experimental_bigint(self.context.node):
+        Scenario(run=bit_int_inline)
+        Scenario(run=bit_int_table)
+        Scenario(run=bit_dec_inline)
+        Scenario(run=bit_dec_table)
diff --git a/tests/testflows/extended_precision_data_types/tests/comparison.py b/tests/testflows/extended_precision_data_types/tests/comparison.py
new file mode 100644
index 00000000000..d3e5dcc0dbd
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/comparison.py
@@ -0,0 +1,110 @@
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+funcs = [
+    ('equals',),
+    ('notEquals',),
+    ('less',),
+    ('greater',),
+    ('lessOrEquals',),
+    ('greaterOrEquals',)
+]
+
+Examples_list =  [tuple(list(func)+list(data_type)+[Name(f'{func[0]} - {data_type[0]}')]) for func in funcs for data_type in data_types]
+
+@TestOutline(Scenario)
+@Examples('func int_type min max', Examples_list)
+def comp_int_inline(self, func, int_type, min, max, node=None):
+    """Check comparison functions with Int128, UInt128, Int256, and UInt256 using inline tests.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    with When(f"I check {func} with {int_type}"):
+        execute_query(f"""
+            SELECT {func}(to{int_type}(1), to{int_type}(1)), {func}(to{int_type}(\'{max}\'), to{int_type}(\'{min}\'))
+            """)
+
+@TestOutline(Scenario)
+@Examples('func int_type min max', Examples_list)
+def comp_int_table(self, func, int_type, min, max, node=None):
+    """Check comparison functions with Int128, UInt128, Int256, and UInt256 using table tests.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = int_type)
+
+    for value in [1, max, min]:
+
+        with When(f"I insert into a table the output {func} with {int_type} and {value}"):
+            node.query(f"INSERT INTO {table_name} SELECT {func}(to{int_type}(\'{value}\'), to{int_type}(1))")
+
+    with Then(f"I check the table for the output of {func} with {int_type}"):
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+@TestOutline(Scenario)
+@Examples('func', funcs)
+def comp_dec_inline(self, func, node=None):
+    """Check comparison functions with Decimal256 using inline tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    with When(f"I check {func} with Decimal256"):
+        execute_query(f"""
+            SELECT {func}(toDecimal256(1,0), toDecimal256(1,0)), {func}(toDecimal256(\'{max}\',0), toDecimal256(\'{min}\',0))
+            """)
+
+@TestOutline(Scenario)
+@Examples('func', funcs)
+def comp_dec_table(self, func, node=None):
+    """Check comparison functions with Decimal256 using table tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = 'Decimal256(0)')
+
+    for value in [1, max, min]:
+
+        with When(f"I insert into a table the output {func} with Decimal256 and {value}"):
+            node.query(f"INSERT INTO {table_name} SELECT {func}(toDecimal256(\'{value}\',0), toDecimal256(1,0))")
+
+    with Then(f"I check the table for the output of {func} with Decimal256"):
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+@TestFeature
+@Name("comparison")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Comparison("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that comparison functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    with allow_experimental_bigint(self.context.node):
+        Scenario(run=comp_int_inline)
+        Scenario(run=comp_int_table)
+        Scenario(run=comp_dec_inline)
+        Scenario(run=comp_dec_table)
diff --git a/tests/testflows/extended_precision_data_types/tests/conversion.py b/tests/testflows/extended_precision_data_types/tests/conversion.py
new file mode 100644
index 00000000000..e46031ad29f
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/conversion.py
@@ -0,0 +1,275 @@
+import os
+import textwrap
+
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+@contextmanager
+def dictionary(name, node, mysql_node):
+    """Create a table in MySQL and use it a source for a dictionary.
+    """
+    try:
+        with Given("table in MySQL"):
+            sql = f"""
+                CREATE TABLE {name}(
+                    id INT NOT NULL AUTO_INCREMENT,
+                    int128 BIGINT,
+                    uint128 BIGINT,
+                    int256 BIGINT,
+                    uint256 BIGINT,
+                    dec256 DECIMAL,
+                    PRIMARY KEY ( id )
+                );
+                """
+            with When("I drop the table if exists"):
+                mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user -e \"DROP TABLE IF EXISTS {name};\"", exitcode=0)
+            with And("I create a table"):
+                mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user <<'EOF'{textwrap.dedent(sql)}\nEOF", exitcode=0)
+
+        with And("dictionary that uses MySQL table as the external source"):
+            with When("I drop the dictionary if exists"):
+                node.query(f"DROP DICTIONARY IF EXISTS dict_{name}")
+            with And("I create the dictionary"):
+                sql = f"""
+                CREATE DICTIONARY dict_{name}
+                (
+                    id UInt8,
+                    int128 Int128,
+                    uint128 UInt128,
+                    int256 Int256,
+                    uint256 UInt256,
+                    dec256 Decimal256(0)
+                )
+                PRIMARY KEY id
+                SOURCE(MYSQL(
+                    USER 'user'
+                    PASSWORD 'password'
+                    DB 'db'
+                    TABLE '{name}'
+                    REPLICA(PRIORITY 1 HOST '{mysql_node.name}' PORT 3306)
+                ))
+                LAYOUT(HASHED())
+                LIFETIME(0)
+                """
+                node.query(textwrap.dedent(sql))
+
+        yield f"dict_{name}"
+
+    finally:
+        with Finally("I drop the dictionary", flags=TE):
+            node.query(f"DROP DICTIONARY IF EXISTS dict_{name}")
+
+        with And("I drop a table in MySQL", flags=TE):
+            mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user -e \"DROP TABLE IF EXISTS {name};\"", exitcode=0)
+
+@contextmanager
+def table(name, node, mysql_node):
+    """Create a table in MySQL and use it a source for a table in ClickHouse.
+    """
+    try:
+        with Given("table in MySQL"):
+            sql = f"""
+                CREATE TABLE {name}(
+                    id INT NOT NULL AUTO_INCREMENT,
+                    int128 BIGINT,
+                    uint128 BIGINT,
+                    int256 BIGINT,
+                    uint256 BIGINT,
+                    dec256 DECIMAL,
+                    PRIMARY KEY ( id )
+                );
+                """
+            with When("I drop the table if exists"):
+                mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user -e \"DROP TABLE IF EXISTS {name};\"", exitcode=0)
+
+            with And("I create a table"):
+                mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user <<'EOF'{textwrap.dedent(sql)}\nEOF", exitcode=0)
+
+        with And("table that uses MySQL table as the external source"):
+
+            with When("I drop the table if exists"):
+                node.query(f"DROP TABLE IF EXISTS {name}")
+            with And("I create the table"):
+                sql = f"""
+                CREATE TABLE {name}
+                (
+                    id UInt8,
+                    int128 Int128,
+                    uint128 UInt128,
+                    int256 Int256,
+                    uint256 UInt256,
+                    dec256 Decimal256(0)
+                )
+                ENGINE = MySQL('{mysql_node.name}:3306', 'default', '{name}', 'default', 'password')
+                """
+                node.query(textwrap.dedent(sql))
+
+        yield f"table_{name}"
+
+    finally:
+        with Finally("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {name}")
+
+        with And("I drop a table in MySQL", flags=TE):
+            mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user -e \"DROP TABLE IF EXISTS {name};\"", exitcode=0)
+
+@contextmanager
+def table_func(name, node, mysql_node):
+    """Create a table in MySQL and use it a source for a table using mysql table function.
+    """
+    try:
+        with Given("table in MySQL"):
+            sql = f"""
+                CREATE TABLE {name}(
+                    id INT NOT NULL AUTO_INCREMENT,
+                    int128 BIGINT,
+                    uint128 BIGINT,
+                    int256 BIGINT,
+                    uint256 BIGINT,
+                    dec256 DECIMAL,
+                    PRIMARY KEY ( id )
+                );
+                """
+            with When("I drop the table if exists"):
+                mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user -e \"DROP TABLE IF EXISTS {name};\"", exitcode=0)
+            with And("I create a table"):
+                mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user <<'EOF'{textwrap.dedent(sql)}\nEOF", exitcode=0)
+
+        yield f"mysql('{mysql_node.name}:3306', 'db', '{name}', 'user', 'password')"
+
+    finally:
+
+        with Finally("I drop the table", flags=TE):
+            node.query(f"DROP TABLE IF EXISTS {name}")
+
+        with And("I drop a table in MySQL", flags=TE):
+            mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user -e \"DROP TABLE IF EXISTS {name};\"", exitcode=0)
+
+@TestOutline(Scenario)
+@Examples('int_type min max',[
+    ('Int128', '-170141183460469231731687303715884105728', '170141183460469231731687303715884105727', Requirements(RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toInt128("1.0")), Name('Int128')),
+    ('Int256', '-57896044618658097711785492504343953926634992332820282019728792003956564819968', '57896044618658097711785492504343953926634992332820282019728792003956564819967', Requirements(RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toInt256("1.0")), Name('Int256')),
+    ('UInt128','0','340282366920938463463374607431768211455', Requirements(RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toUInt128("1.0")), Name('UInt128')),
+    ('UInt256', '0', '115792089237316195423570985008687907853269984665640564039457584007913129639935', Requirements(RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toUInt256("1.0")), Name('UInt256')),
+])
+def int_conversion(self, int_type, min, max, node=None):
+    """Check that ClickHouse converts values to Int128.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    with When(f"I convert {min}, {max}, 1 to {int_type}"):
+        output = node.query(f"SELECT to{int_type}(\'{min}\'), to{int_type}(\'{max}\'), to{int_type}(1) format TabSeparatedRaw").output
+        assert output == f'{min}\t{max}\t1', error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_toDecimal256("1.0"),
+)
+def to_decimal256(self, node=None):
+    """Check that ClickHouse converts values to Int128.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    for value in [1,min,max]:
+        output = node.query(f"SELECT toDecimal256(\'{value}\',0)").output
+        assert output == str(value), error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_ToMySQL("1.0"),
+)
+def MySQL_table(self, node=None):
+    """Check that ClickHouse converts MySQL values from MySQL table into ClickHouse table.
+    """
+    table_name = f'table_{getuid()}'
+
+    node = self.context.node
+    mysql_node = self.context.mysql_node
+
+    with table(table_name, node, mysql_node):
+
+        with When("I insert parameters values in MySQL"):
+            sql = f"""
+                INSERT INTO {table_name}(int128, uint128, int256, uint256, dec256) VALUES (1,1,1,1,1);
+            """
+            mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user <<'EOF'{textwrap.dedent(sql)}\nEOF", exitcode=0)
+
+        with Then("I select from the table on top of the mysql table"):
+            node.query(f"SELECT * FROM {table_name}",
+                exitcode=50, message='Exception:')
+
+@TestScenario
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_FromMySQL("1.0"),
+)
+def MySQL_func(self, node=None):
+    """Check that ClickHouse converts MySQL values into a ClickHouse table using the MySQL table function.
+    """
+    table_name = f'table_{getuid()}'
+
+    node = self.context.node
+    mysql_node = self.context.mysql_node
+
+    with table_func(table_name, node, mysql_node) as table_function:
+
+        with When("I insert parameters values in MySQL"):
+            sql = f"""
+                INSERT INTO {table_name}(int128, uint128, int256, uint256, dec256) VALUES (1,1,1,1,1);
+            """
+            mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user <<'EOF'{textwrap.dedent(sql)}\nEOF", exitcode=0)
+
+        with And("I make sure the table doesn't exist"):
+            node.query(f"DROP TABLE IF EXISTS {table_name}")
+
+        with And("I create the table"):
+            node.query(f"CREATE TABLE {table_name} (id UInt8, int128 Int128, uint128 UInt128, int256 Int256, uint256 UInt256, dec256 Decimal256(0)) Engine = Memory")
+
+        with And("I insert into the clickhouse table from the mysql table"):
+            node.query(f"INSERT INTO {table_name} SELECT * FROM {table_function}")
+
+        with Then("I select from the clickhouse table"):
+            output = node.query(f"SELECT * FROM {table_name}").output
+            assert output ==  '1\t1\t1\t1\t1\t1', error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Conversion_ToMySQL("1.0"),
+)
+def MySQL_dict(self, node=None):
+    """Check that ClickHouse converts MySQL values from MySQL table into ClickHouse dictionary.
+    """
+
+    node = self.context.node
+    mysql_node = self.context.mysql_node
+
+    table_name = f'table_{getuid()}'
+
+    with dictionary(table_name, node, mysql_node):
+
+        with When("I insert parameters values in MySQL"):
+            sql = f"""
+                INSERT INTO {table_name}(int128, uint128, int256, uint256, dec256) VALUES (1,1,1,1,1);
+            """
+            mysql_node.command(f"MYSQL_PWD=password mysql -D db -u user <<'EOF'{textwrap.dedent(sql)}\nEOF", exitcode=0)
+
+        with Then("I select from the table on top of the mysql table"):
+            node.query(f"SELECT * FROM dict_{table_name}",
+                exitcode=50, message='Exception:')
+
+@TestFeature
+@Name("conversion")
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check the conversion of extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    for scenario in loads(current_module(), Scenario):
+        with allow_experimental_bigint(self.context.node):
+            Scenario(run=scenario)
diff --git a/tests/testflows/extended_precision_data_types/tests/feature.py b/tests/testflows/extended_precision_data_types/tests/feature.py
new file mode 100644
index 00000000000..83293b61f35
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/feature.py
@@ -0,0 +1,19 @@
+from testflows.core import *
+from testflows.core.name import basename, parentname
+from testflows._core.testtype import TestSubType
+
+@TestFeature
+@Name("tests")
+def feature(self):
+    """Check functions with Int128, Int256, UInt256, and Decimal256.
+    """
+    Feature(run=load("extended_precision_data_types.tests.conversion", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.arithmetic", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.array_tuple_map", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.comparison", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.logical", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.mathematical", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.rounding", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.bit", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.null", "feature"))
+    Feature(run=load("extended_precision_data_types.tests.table", "feature"))
diff --git a/tests/testflows/extended_precision_data_types/tests/logical.py b/tests/testflows/extended_precision_data_types/tests/logical.py
new file mode 100644
index 00000000000..36dbc97da97
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/logical.py
@@ -0,0 +1,99 @@
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+funcs = [
+    ('and',),
+    ('or',),
+    ('not',),
+    ('xor',),
+]
+
+Examples_list =  [tuple(list(func)+list(data_type)+[Name(f'{func[0]} - {data_type[0]}')]) for func in funcs for data_type in data_types]
+
+@TestOutline(Scenario)
+@Examples('func int_type min max', Examples_list)
+def log_int_inline(self, func, int_type, min, max, node=None):
+    """Check logical functions with Int128, Int256, and UInt256 using inline tests.
+    """
+    table_name = f'table_{getuid()}'
+
+    if node is None:
+        node = self.context.node
+
+    with When(f"Check {func} with {int_type}"):
+        node.query(f"SELECT {func}(to{int_type}(1), to{int_type}(1)), {func}(to{int_type}(\'{max}\'), to{int_type}(1)), {func}(to{int_type}(\'{min}\'), to{int_type}(1))",
+            exitcode=43, message = 'Exception: Illegal type ')
+
+@TestOutline(Scenario)
+@Examples('func int_type min max', Examples_list)
+def log_int_table(self, func, int_type, min, max, node=None):
+    """Check logical functions with Int128, Int256, and UInt256 using table tests.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = int_type)
+
+    for value in [1, min, max]:
+
+        with When(f"Check {func} with {int_type} and {value}"):
+            node.query(f"INSERT INTO {table_name} SELECT {func}(to{int_type}(\'{value}\'), to{int_type}(\'{value}\'))",
+                exitcode=43, message = 'Exception: Illegal type')
+
+@TestOutline(Scenario)
+@Examples('func', funcs)
+def log_dec_inline(self, func, node=None):
+    """Check logical functions with Decimal256 using inline tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    with When(f"Check {func} with Decimal256"):
+        node.query(f"SELECT {func}(toDecimal256(1,0), toDecimal256(1,0)), {func}(toDecimal256(\'{max}\',0), toDecimal256(1)), {func}(toDecimal256(\'{min}\',0), toDecimal256(1))",
+            exitcode=43, message = 'Exception: Illegal type ')
+
+@TestOutline(Scenario)
+@Examples('func', funcs)
+def log_dec_table(self, func, node=None):
+    """Check logical functions with Decimal256 using table tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = 'Decimal256(0)')
+
+    for value in [1, min, max]:
+
+        with When(f"Check {func} with Decimal256 and {value}"):
+            node.query(f"INSERT INTO {table_name} SELECT {func}(toDecimal256(\'{value}\',0), toDecimal256(\'{value}\',0))",
+                exitcode=43, message = 'Exception: Illegal type ')
+
+@TestFeature
+@Name("logical")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Logical("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that comparison functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    with allow_experimental_bigint(self.context.node):
+        Scenario(run=log_int_inline)
+        Scenario(run=log_int_table)
+        Scenario(run=log_dec_inline)
+        Scenario(run=log_dec_table)
diff --git a/tests/testflows/extended_precision_data_types/tests/mathematical.py b/tests/testflows/extended_precision_data_types/tests/mathematical.py
new file mode 100644
index 00000000000..6062a00a7c9
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/mathematical.py
@@ -0,0 +1,187 @@
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+funcs = [
+    ('exp(', 3, 0),
+    ('log(', 0, 0),
+    ('ln(', 0, 0),
+    ('exp2(', 2, 0),
+    ('log2(', 0, 0),
+    ('exp10(', 10, 0),
+    ('log10(', 0, 0),
+    ('sqrt(', 1, 0),
+    ('cbrt(', 1, 0),
+    ('erf(', 1, 0),
+    ('erfc(', 0, 0),
+    ('lgamma(', 0, 0),
+    ('tgamma(', 1, 0),
+    ('sin(', 1, 0),
+    ('cos(', 1, 0),
+    ('tan(', 2, 0),
+    ('asin(', 2, 0),
+    ('acos(', 0, 0),
+    ('atan(', 1, 0),
+    ('intExp2(', 2, 48),
+    ('intExp10(', 10, 48),
+    ('cosh(', 2, 0),
+    ('acosh(', 0, 0),
+    ('sinh(', 1, 0),
+    ('asinh(', 1, 0),
+    ('tanh(', 1, 0),
+    ('atanh(', 'inf', 0),
+    ('log1p(', 1, 0),
+    ('sign(', 1, 0),
+    ('pow(1,', 1, 43),
+    ('power(1,', 1, 43),
+    ('atan2(1,', 1, 43),
+    ('hypot(1,', 1, 43),
+]
+
+Examples_list =  [tuple(list(func)+list(data_type)+[Name(f'{func[0]} - {data_type[0]}')]) for func in funcs for data_type in data_types]
+Examples_dec_list = [tuple(list(func)+[Name(f'{func[0]} - Decimal256')]) for func in funcs]
+
+@TestOutline(Scenario)
+@Examples('func expected_result exitcode int_type min max', Examples_list)
+def math_int_inline(self, func, expected_result, exitcode, int_type, min, max, node=None):
+    """Check mathematical functions with Int128, UInt128, Int256, and UInt256 using inline tests.
+    """
+    if node is None:
+        node = self.context.node
+
+    if func in ['intExp2(', 'intExp10(', 'pow(1,', 'power(1,', 'atan2(1,', 'hypot(1,']:
+
+        with When(f"I check {func} with {int_type} using 1, max, and min"):
+            node.query(f"SELECT {func} to{int_type}(1)), {func} to{int_type}(\'{max}\')), {func} to{int_type}(\'{min}\'))",
+                exitcode=exitcode, message = 'Exception:')
+
+    else:
+
+        with When(f"I check {func} with {int_type} using 1"):
+            output = node.query(f"SELECT {func} to{int_type}(1))").output
+            if output == 'inf':
+                pass
+            else:
+                assert round(float(output)) == expected_result, error()
+
+        with And(f"I check {func} with {int_type} using max and min"):
+            execute_query(f"""
+                SELECT {func} to{int_type}(\'{max}\')), {func} to{int_type}(\'{min}\'))
+                """)
+
+@TestOutline(Scenario)
+@Examples('func expected_result exitcode int_type min max', Examples_list)
+def math_int_table(self, func, expected_result, exitcode, int_type, min, max, node=None):
+    """Check mathematical functions with Int128, UInt128, Int256, and UInt256 using table tests.
+    """
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = f'Nullable({int_type})')
+
+    if func in ['intExp2(', 'intExp10(', 'pow(1,', 'power(1,', 'atan2(1,', 'hypot(1,']:
+
+        for value in [1, max, min]:
+
+            with When(f"I insert the output of {func} with {int_type} using {value} into a table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func} to{int_type}(\'{value}\'))",
+                    exitcode=exitcode, message = 'Exception:')
+
+    else:
+
+        for value in [1, max, min]:
+
+            with And(f"I insert the output of {func} with {int_type} using {value} into a table"):
+                node.query(f"INSERT INTO {table_name} SELECT to{int_type}OrZero( toString({func} to{int_type}(\'{value}\'))))")
+
+        with Then(f"I check the outputs of {func} with {int_type}"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+@TestOutline(Scenario)
+@Examples('func expected_result exitcode', Examples_dec_list)
+def math_dec_inline(self, func, expected_result, exitcode, node=None):
+    """Check mathematical functions with Decimal256 using inline tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    if func in ['intExp2(', 'intExp10(', 'pow(1,', 'power(1,', 'atan2(1,', 'hypot(1,']:
+
+        with When(f"I check {func} with Decimal256 using 1, max, and min"):
+            node.query(f"SELECT {func} toDecimal256(1,0)), {func} toDecimal256(\'{max}\',0)), {func} toDecimal256(\'{min}\',0))",
+                exitcode=43, message = 'Exception: Illegal type ')
+
+    else:
+
+        with When(f"I check {func} with Decimal256 using 1"):
+            output = node.query(f"SELECT {func} toDecimal256(1,0))").output
+            if output == 'inf':
+                pass
+            else:
+                assert round(float(output)) == expected_result, error()
+
+        with And(f"I check {func} with Decimal256 using max and min"):
+            execute_query(f"""
+                SELECT {func} toDecimal256(\'{max}\',0)), {func} toDecimal256(\'{min}\',0))
+                """)
+
+@TestOutline(Scenario)
+@Examples('func expected_result exitcode', Examples_dec_list)
+def math_dec_table(self, func, expected_result, exitcode, node=None):
+    """Check mathematical functions with Decimal256 using table tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    table_name = f'table_{getuid()}'
+
+    with Given(f"I have a table"):
+        table(name = table_name, data_type = 'Decimal256(0)')
+
+    if func in ['intExp2(', 'intExp10(', 'pow(1,', 'power(1,', 'atan2(1,', 'hypot(1,']:
+
+        for value in [1, max, min]:
+
+            with When(f"I insert the output of {func} with Decimal256 using {value} into a table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func} toDecimal256(\'{value}\',0))",
+                    exitcode=43, message = 'Exception: Illegal type ')
+
+    else:
+
+        for value in [1, max, min]:
+
+            with When(f"I insert the output of {func} with Decimal256 using {value} into a table"):
+                node.query(f"INSERT INTO {table_name} SELECT toDecimal256OrZero( toString({func} toDecimal256(\'{value}\',0))),0)")
+
+        with Then(f"I check the outputs of {func} with Decimal256"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+@TestFeature
+@Name("mathematical")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Mathematical_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Mathematical_NotSupported("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that mathematical functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    with allow_experimental_bigint(self.context.node):
+        Scenario(run=math_int_inline)
+        Scenario(run=math_int_table)
+        Scenario(run=math_dec_inline)
+        Scenario(run=math_dec_table)
diff --git a/tests/testflows/extended_precision_data_types/tests/null.py b/tests/testflows/extended_precision_data_types/tests/null.py
new file mode 100644
index 00000000000..9ddaa94a245
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/null.py
@@ -0,0 +1,119 @@
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+funcs = [
+    ('isNull(', 0),
+    ('isNotNull(', 1),
+    ('coalesce(', 1),
+    ('assumeNotNull(', 1),
+    ('toNullable(', 1),
+    ('ifNull(1,', 1),
+    ('nullIf(1,', '\\N'),
+]
+
+Examples_list =  [tuple(list(func)+list(data_type)+[Name(f'{func[0]} - {data_type[0]}')]) for func in funcs for data_type in data_types]
+
+@TestOutline(Scenario)
+@Examples('func expected_result int_type min max', Examples_list)
+def null_int_inline(self, func, expected_result, int_type, min, max, node=None):
+    """Check null function with Int128, UInt128, Int256, and UInt256 using inline tests.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    with When(f"I check {func} with {int_type}"):
+        output = node.query(f"SELECT {func} to{int_type}(1))").output
+        assert output == str(expected_result), error()
+
+    with And(f"I check {func} with {int_type} using min and max"):
+        execute_query(f"""
+            SELECT {func} to{int_type}(\'{min}\')), {func} to{int_type}(\'{max}\'))
+            """)
+
+@TestOutline(Scenario)
+@Examples('func expected_result int_type min max', Examples_list)
+def null_int_table(self, func, expected_result, int_type, min, max, node=None):
+    """Check null function with Int128, UInt128, Int256, and UInt256 using table tests.
+    """
+
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with Given("I have a table"):
+        table(name = table_name, data_type = f'Nullable({int_type})')
+
+    for value in [1, min, max]:
+
+        with When(f"I insert the output of {func} with {int_type} and {value}"):
+            node.query(f"INSERT INTO {table_name} SELECT {func} to{int_type}(\'{value}\'))")
+
+    with Then(f"I check {func} with {int_type} on the table"):
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+@TestOutline(Scenario)
+@Examples('func expected_result', funcs)
+def null_dec_inline(self, func, expected_result, node=None):
+    """Check null function with Decimal256 using inline tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    with When(f"I check {func} with Decimal256"):
+        output = node.query(f"SELECT {func} toDecimal256(1,0))").output
+        assert output == str(expected_result), error()
+
+    with And(f"I check {func} with Decimal256 using min and max"):
+        execute_query(f"""
+            SELECT {func} toDecimal256(\'{min}\',0)), {func} toDecimal256(\'{max}\',0))
+            """)
+
+@TestOutline(Scenario)
+@Examples('func expected_result', funcs)
+def null_dec_table(self, func, expected_result, node=None):
+    """Check null function with Decimal256 using table tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with Given("I have a table"):
+        table(name = table_name, data_type = 'Nullable(Decimal256(0))')
+
+    for value in [1, min, max]:
+
+        with When(f"I insert the output of {func} with Decimal256 and {value}"):
+            node.query(f"INSERT INTO {table_name} SELECT {func} toDecimal256(\'{value}\',0))")
+
+    with Then(f"I check {func} with Decimal256 on the table"):
+        execute_query(f"""
+            SELECT * FROM {table_name} ORDER BY a ASC
+            """)
+
+@TestFeature
+@Name("null")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Null("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that null functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    with allow_experimental_bigint(self.context.node):
+        Scenario(run=null_int_inline)
+        Scenario(run=null_int_table)
+        Scenario(run=null_dec_inline)
+        Scenario(run=null_dec_table)
diff --git a/tests/testflows/extended_precision_data_types/tests/rounding.py b/tests/testflows/extended_precision_data_types/tests/rounding.py
new file mode 100644
index 00000000000..f01d6898b32
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/rounding.py
@@ -0,0 +1,191 @@
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+funcs = [
+    ('ceil', 1, True),
+    ('floor', 1, True),
+    ('trunc', 1, True),
+    ('round', 1, True),
+    ('roundBankers', 1, True),
+    ('roundToExp2', 1, False),
+    ('roundDuration', 1, True),
+    ('roundAge', 17, True),
+    ('roundDown', 1, False)
+]
+
+Examples_list = [tuple(list(func)+list(data_type)+[Name(f'{func[0]} - {data_type[0]}')]) for func in funcs for data_type in data_types]
+Examples_dec_list = [tuple(list(func)+[Name(f'{func[0]} - Decimal256')]) for func in funcs]
+
+@TestOutline(Scenario)
+@Examples('func expected_result supported int_type min max', Examples_list)
+def round_int_inline(self, func, expected_result, supported, int_type, min, max, node=None):
+    """Check rounding functions with Int128, UInt128, Int256, and UInt256 using inline tests.
+    """
+
+    if node is None:
+        node = self.context.node
+
+    if func is 'roundDown':
+
+        with When(f"I check roundDown with {int_type}"):
+            node.query(f"SELECT roundDown(to{int_type}(1), [0,2]), roundDown(to{int_type}(\'{max}\'), [0,2]), roundDown(to{int_type}(\'{min}\'), [0,2])",
+                exitcode=44, message=f'Exception: Illegal column {int_type} of first argument of function roundDown')
+
+    elif supported:
+
+        with When(f"I check {func} with {int_type}"):
+            output = node.query(f"SELECT {func}(to{int_type}(1))").output
+            assert output == str(expected_result), error()
+
+        with And(f'I check {func} with {int_type} using min and max values'):
+            execute_query(f"""
+                SELECT {func}(to{int_type}(\'{min}\')), {func}(to{int_type}(\'{max}\'))
+                """)
+
+    else:
+
+        with When(f"I check {func} with {int_type}"):
+            node.query(f"SELECT {func}(to{int_type}(1)), {func}(to{int_type}(\'{max}\')), {func}(to{int_type}(\'{min}\'))",
+                exitcode=48, message=f'Exception: {func}() for big integers is not implemented:')
+
+@TestOutline(Scenario)
+@Examples('func expected_result supported int_type min max', Examples_list)
+def round_int_table(self, func, expected_result, supported, int_type, min, max, node=None):
+    """Check rounding functions with Int128, UInt128, Int256, and UInt256 using table tests.
+    """
+
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with Given("I have a table"):
+        table(name = table_name, data_type = int_type)
+
+    if func is 'roundDown':
+
+        for value in [1,max,min]:
+
+            with When(f"I check roundDown with {int_type} and {value}"):
+                node.query(f"INSERT INTO {table_name} SELECT roundDown(to{int_type}(\'{value}\'), [0,2])",
+                    exitcode=44, message=f'Exception: Illegal column {int_type} of first argument of function roundDown')
+
+    elif supported:
+
+        for value in [1,max,min]:
+
+            with When(f"I insert the output of {func} with {int_type} and {value} into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(to{int_type}(\'{value}\'))")
+
+        with Then(f"I select the output of {func} with {int_type} from the table"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    else:
+
+        for value in [1,max,min]:
+
+            with When(f"I insert the output of {func} with {int_type} and {value} into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(to{int_type}(1))",
+                    exitcode=48, message=f'Exception: {func}() for big integers is not implemented:')
+
+@TestOutline(Scenario)
+@Examples('func expected_result supported', Examples_dec_list)
+def round_dec_inline(self, func, expected_result, supported, node=None):
+    """Check rounding functions with Decimal256 using inline tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    if node is None:
+        node = self.context.node
+
+    if func is 'roundDown':
+
+        with When(f"I check roundDown with Decimal256"):
+            node.query(f"""SELECT roundDown(toDecimal256(1,0), [toDecimal256(0,0),toDecimal256(2,0)]),
+                roundDown(toDecimal256(\'{max}\',0), [toDecimal256(0,0),toDecimal256(2,0)]),
+                roundDown(toDecimal256(\'{min}\',0), [toDecimal256(0,0),toDecimal256(2,0)])""",
+                    exitcode=44, message=f'Exception: Illegal column Decimal256 of first argument of function roundDown')
+
+    elif func not in ['roundDuration', 'roundAge', 'roundToExp2']:
+
+        with When(f"I check {func} with Decimal256"):
+            output = node.query(f"SELECT {func}(toDecimal256(1,0))").output
+            assert output == str(expected_result), error()
+
+        with And(f'I check {func} with Decimal256 using min and max values'):
+            execute_query(f"""
+                SELECT {func}(toDecimal256(\'{min}\',0)), {func}(toDecimal256(\'{max}\',0))
+                """)
+
+    else:
+
+        with When(f"I check {func} with Decimal256"):
+            node.query(f"SELECT {func}(toDecimal256(1,0)), {func}(toDecimal256(\'{max}\',0)), {func}(toDecimal256(\'{min}\',0))",
+                exitcode=43, message=f'Exception: Illegal type Decimal(76, 0)')
+
+@TestOutline(Scenario)
+@Examples('func expected_result supported', Examples_dec_list)
+def round_dec_table(self, func, expected_result, supported, node=None):
+    """Check rounding functions with Decimal256 using table tests.
+    """
+    min = Decimal256_min_max[0]
+    max = Decimal256_min_max[1]
+
+    table_name = f"table_{getuid()}"
+
+    if node is None:
+        node = self.context.node
+
+    with Given("I have a table"):
+        table(name = table_name, data_type = 'Decimal256(0)')
+
+    if func is 'roundDown':
+
+        for value in [1, max, min]:
+
+            with When(f"I check roundDown with Decimal256 and {value}"):
+                node.query(f"INSERT INTO {table_name} SELECT roundDown(toDecimal256(\'{value}\',0), [toDecimal256(0,0),toDecimal256(2,0)])",
+                    exitcode=44, message=f'Exception: Illegal column Decimal256 of first argument of function roundDown')
+
+    elif func not in ['roundDuration', 'roundAge', 'roundToExp2']:
+
+        for value in [1, max, min]:
+
+            with When(f"I insert the output of {func} with Decimal256 and {value} into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(toDecimal256(\'{value}\',0))")
+
+        with Then(f"I select the output of {func} with Decimal256 from the table"):
+            execute_query(f"""
+                SELECT * FROM {table_name} ORDER BY a ASC
+                """)
+
+    else:
+
+        for value in [1, max, min]:
+
+            with When(f"I insert the output of {func} with Decimal256 and {value} into the table"):
+                node.query(f"INSERT INTO {table_name} SELECT {func}(toDecimal256(\'{value}\',0))",
+                    exitcode=43, message=f'Exception: Illegal type Decimal(76, 0)')
+
+@TestFeature
+@Name("rounding")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Int_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Int_NotSupported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Dec_Supported("1.0"),
+    RQ_SRS_020_ClickHouse_Extended_Precision_Rounding_Dec_NotSupported("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that rounding functions work with extended precision data types.
+    """
+    self.context.node = self.context.cluster.node(node)
+    self.context.mysql_node = self.context.cluster.node(mysql_node)
+
+    with allow_experimental_bigint(self.context.node):
+        Scenario(run=round_int_inline)
+        Scenario(run=round_int_table)
+        Scenario(run=round_dec_inline)
+        Scenario(run=round_dec_table)
diff --git a/tests/testflows/extended_precision_data_types/tests/table.py b/tests/testflows/extended_precision_data_types/tests/table.py
new file mode 100644
index 00000000000..1548d6b20c2
--- /dev/null
+++ b/tests/testflows/extended_precision_data_types/tests/table.py
@@ -0,0 +1,35 @@
+from testflows.core import *
+from testflows.asserts import error
+from contextlib import contextmanager
+
+from extended_precision_data_types.requirements import *
+from extended_precision_data_types.common import *
+
+@TestFeature
+@Name("table")
+@Requirements(
+    RQ_SRS_020_ClickHouse_Extended_Precision_Create_Table("1.0"),
+)
+def feature(self, node="clickhouse1", mysql_node="mysql1", stress=None, parallel=None):
+    """Check that clickhouse is able to create a table with extended precision data types.
+    """
+    node = self.context.cluster.node(node)
+
+    table_name = f"table_{getuid()}"
+
+    with allow_experimental_bigint(node):
+
+        try:
+            with When("I create a table with Int128, UInt128, Int256, UInt256, Decimal256"):
+                node.query(f"CREATE TABLE {table_name}(a Int128, b UInt128, c Int256, d UInt256, e Decimal256(0)) ENGINE = Memory")
+
+            with And("I insert values into the table"):
+                node.query(f"INSERT INTO {table_name} VALUES (toInt128(1), toUInt128(1), toInt256(1), toUInt256(1), toDecimal256(1,0))")
+
+            with Then("I select from the table"):
+                output = node.query(f"SELECT * FROM {table_name}").output
+                assert output == '1\t1\t1\t1\t1', error()
+
+        finally:
+            with Finally("I drop the table"):
+                node.query(f"DROP TABLE IF EXISTS {table_name}")
diff --git a/tests/testflows/helpers/cluster.py b/tests/testflows/helpers/cluster.py
index cc676134024..0b704093ff8 100755
--- a/tests/testflows/helpers/cluster.py
+++ b/tests/testflows/helpers/cluster.py
@@ -4,10 +4,31 @@ import inspect
 import threading
 import tempfile
 
+import testflows.settings as settings
+
 from testflows.core import *
 from testflows.asserts import error
-from testflows.connect import Shell
+from testflows.connect import Shell as ShellBase
 from testflows.uexpect import ExpectTimeoutError
+from testflows._core.testtype import TestSubType
+
+class Shell(ShellBase):
+    def __exit__(self, type, value, traceback):
+        # send exit and Ctrl-D repeatedly
+        # to terminate any open shell commands.
+        # This is needed for example
+        # to solve a problem with
+        # 'docker-compose exec {name} bash --noediting'
+        # that does not clean up open bash processes
+        # if not exited normally
+        for i in range(10):
+            if self.child is not None:
+                try:
+                    self.send('exit\r', eol='')
+                    self.send('\x04\r', eol='')
+                except OSError:
+                    pass
+        return super(Shell, self).__exit__(type, value, traceback)
 
 class QueryRuntimeException(Exception):
     """Exception during query execution on the server.
@@ -26,8 +47,8 @@ class Node(object):
     def repr(self):
         return f"Node(name='{self.name}')"
 
-    def restart(self, timeout=300, retries=5, safe=True):
-        """Restart node.
+    def close_bashes(self):
+        """Close all active bashes to the node.
         """
         with self.cluster.lock:
             for key in list(self.cluster._bash.keys()):
@@ -35,6 +56,11 @@ class Node(object):
                     shell = self.cluster._bash.pop(key)
                     shell.__exit__(None, None, None)
 
+    def restart(self, timeout=300, retries=5, safe=True):
+        """Restart node.
+        """
+        self.close_bashes()
+
         for retry in range(retries):
             r = self.cluster.command(None, f'{self.cluster.docker_compose} restart {self.name}', timeout=timeout)
             if r.exitcode == 0:
@@ -51,11 +77,7 @@ class Node(object):
     def stop(self, timeout=300, retries=5, safe=True):
         """Stop node.
         """
-        with self.cluster.lock:
-            for key in list(self.cluster._bash.keys()):
-                if key.endswith(f"-{self.name}"):
-                    shell = self.cluster._bash.pop(key)
-                    shell.__exit__(None, None, None)
+        self.close_bashes()
 
         for retry in range(retries):
             r = self.cluster.command(None, f'{self.cluster.docker_compose} stop {self.name}', timeout=timeout)
@@ -127,13 +149,9 @@ class ClickHouseNode(Node):
             with By("waiting for 5 sec for moves and merges to stop"):
                 time.sleep(5)
             with And("forcing to sync everything to disk"):
-                self.command("sync", timeout=30)
+                self.command("sync", timeout=300)
 
-        with self.cluster.lock:
-            for key in list(self.cluster._bash.keys()):
-                if key.endswith(f"-{self.name}"):
-                    shell = self.cluster._bash.pop(key)
-                    shell.__exit__(None, None, None)
+        self.close_bashes()
 
         for retry in range(retries):
             r = self.cluster.command(None, f'{self.cluster.docker_compose} stop {self.name}', timeout=timeout)
@@ -161,13 +179,9 @@ class ClickHouseNode(Node):
             with By("waiting for 5 sec for moves and merges to stop"):
                 time.sleep(5)
             with And("forcing to sync everything to disk"):
-                self.command("sync", timeout=30)
+                self.command("sync", timeout=300)
 
-        with self.cluster.lock:
-            for key in list(self.cluster._bash.keys()):
-                if key.endswith(f"-{self.name}"):
-                    shell = self.cluster._bash.pop(key)
-                    shell.__exit__(None, None, None)
+        self.close_bashes()
 
         for retry in range(retries):
             r = self.cluster.command(None, f'{self.cluster.docker_compose} restart {self.name}', timeout=timeout)
@@ -247,8 +261,9 @@ class Cluster(object):
             docker_compose="docker-compose", docker_compose_project_dir=None,
             docker_compose_file="docker-compose.yml"):
 
-        self.terminating = False
         self._bash = {}
+        self._control_shell = None
+        self.environ = {}
         self.clickhouse_binary_path = clickhouse_binary_path
         self.configs_dir = configs_dir
         self.local = local
@@ -278,18 +293,69 @@ class Cluster(object):
         if not os.path.exists(docker_compose_file_path):
             raise TypeError("docker compose file '{docker_compose_file_path}' does not exist")
 
-        self.docker_compose += f" --no-ansi --project-directory \"{docker_compose_project_dir}\" --file \"{docker_compose_file_path}\""
+        self.docker_compose += f" --ansi never --project-directory \"{docker_compose_project_dir}\" --file \"{docker_compose_file_path}\""
         self.lock = threading.Lock()
+    
+    @property
+    def control_shell(self, timeout=300):
+        """Must be called with self.lock.acquired.
+        """
+        if self._control_shell is not None:
+            return self._control_shell
+
+        time_start = time.time()
+        while True:
+            try:
+                shell = Shell()
+                shell.timeout = 30
+                shell("echo 1")
+                break
+            except:
+                shell.__exit__(None, None, None)
+                if time.time() - time_start > timeout:
+                    raise RuntimeError(f"failed to open control shell")
+        self._control_shell = shell
+        return self._control_shell
+
+    def node_container_id(self, node, timeout=300):
+        """Must be called with self.lock acquired.
+        """
+        container_id = None
+        time_start = time.time()
+        while True:
+            c = self.control_shell(f"{self.docker_compose} ps -q {node}")
+            container_id = c.output.strip()
+            if c.exitcode == 0 and len(container_id) > 1:
+                break
+            if time.time() - time_start > timeout:
+                raise RuntimeError(f"failed to get docker container id for the {node} service")
+        return container_id
 
     def shell(self, node, timeout=300):
         """Returns unique shell terminal to be used.
         """
-        if node is None:
-            return Shell()
+        container_id = None
 
-        shell = Shell(command=[
-                "/bin/bash", "--noediting", "-c", f"{self.docker_compose} exec {node} bash --noediting"
-            ], name=node)
+        if node is not None:
+            with self.lock:
+                container_id = self.node_container_id(node=node, timeout=timeout)
+        
+        time_start = time.time()
+        while True:
+            try:
+                if node is None:
+                    shell = Shell()
+                else:
+                    shell = Shell(command=[
+                        "/bin/bash", "--noediting", "-c", f"docker exec -it {container_id} bash --noediting"
+                    ], name=node)
+                shell.timeout = 30
+                shell("echo 1")
+                break
+            except:
+                shell.__exit__(None, None, None)
+                if time.time() - time_start > timeout:
+                    raise RuntimeError(f"failed to open bash to node {node}")
 
         shell.timeout = timeout
         return shell
@@ -301,8 +367,8 @@ class Cluster(object):
         """
         test = current()
 
-        if self.terminating:
-            if test and (test.cflags & MANDATORY):
+        if top().terminating:
+            if test and (test.cflags & MANDATORY and test.subtype is not TestSubType.Given):
                 pass
             else:
                 raise InterruptedError("terminating")
@@ -312,12 +378,29 @@ class Cluster(object):
 
         with self.lock:
             if self._bash.get(id) is None:
+                if node is not None:
+                    container_id = self.node_container_id(node=node, timeout=timeout)
+
+                time_start = time.time()
+                while True:
+                    try:
+                        if node is None:
+                            self._bash[id] = Shell()
+                        else:
+                            self._bash[id] = Shell(command=[
+                                "/bin/bash", "--noediting", "-c", f"docker exec -it {container_id} {command}"
+                            ], name=node).__enter__()
+                        self._bash[id].timeout = 30
+                        self._bash[id]("echo 1")
+                        break
+                    except:
+                        self._bash[id].__exit__(None, None, None)
+                        if time.time() - time_start > timeout:
+                            raise RuntimeError(f"failed to open bash to node {node}")
+
                 if node is None:
-                    self._bash[id] = Shell().__enter__()
-                else:
-                    self._bash[id] = Shell(command=[
-                        "/bin/bash", "--noediting", "-c", f"{self.docker_compose} exec {node} {command}"
-                    ], name=node).__enter__()
+                    for name,value in self.environ.items():
+                        self._bash[id](f"export {name}={value}")
 
                 self._bash[id].timeout = timeout
 
@@ -366,8 +449,11 @@ class Cluster(object):
 
     def down(self, timeout=300):
         """Bring cluster down by executing docker-compose down."""
-        self.terminating = True
 
+        # add message to each clickhouse-server.log
+        if settings.debug:
+            for node in self.nodes["clickhouse"]:
+                self.command(node=node, command=f"echo -e \"\n-- sending stop to: {node} --\n\" >> /var/log/clickhouse-server/clickhouse-server.log")
         try:
             bash = self.bash(None)
             with self.lock:
@@ -379,7 +465,12 @@ class Cluster(object):
                     else:
                         self._bash[id] = shell
         finally:
-            return self.command(None, f"{self.docker_compose} down --timeout 60", bash=bash, timeout=timeout)
+            cmd = self.command(None, f"{self.docker_compose} down --timeout 60", bash=bash, timeout=timeout)
+            with self.lock:
+                if self._control_shell:
+                    self._control_shell.__exit__(None, None, None)
+                    self._control_shell = None
+            return cmd
 
     def up(self, timeout=30*60):
         if self.local:
@@ -390,39 +481,54 @@ class Cluster(object):
                     assert os.path.exists(self.clickhouse_binary_path)
 
             with And("I set all the necessary environment variables"):
-                os.environ["COMPOSE_HTTP_TIMEOUT"] = "300"
-                os.environ["CLICKHOUSE_TESTS_SERVER_BIN_PATH"] = self.clickhouse_binary_path
-                os.environ["CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH"] = os.path.join(
+                self.environ["COMPOSE_HTTP_TIMEOUT"] = "300"
+                self.environ["CLICKHOUSE_TESTS_SERVER_BIN_PATH"] = self.clickhouse_binary_path
+                self.environ["CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH"] = os.path.join(
                     os.path.dirname(self.clickhouse_binary_path), "clickhouse-odbc-bridge")
-                os.environ["CLICKHOUSE_TESTS_DIR"] = self.configs_dir
+                self.environ["CLICKHOUSE_TESTS_DIR"] = self.configs_dir
 
             with And("I list environment variables to show their values"):
                 self.command(None, "env | grep CLICKHOUSE")
 
         with Given("docker-compose"):
             max_attempts = 5
+            max_up_attempts = 1
+
             for attempt in range(max_attempts):
                 with When(f"attempt {attempt}/{max_attempts}"):
                     with By("pulling images for all the services"):
                         cmd = self.command(None, f"{self.docker_compose} pull 2>&1 | tee", exitcode=None, timeout=timeout)
                         if cmd.exitcode != 0:
                             continue
+
+                    with And("checking if any containers are already running"):
+                        self.command(None, f"{self.docker_compose} ps | tee")
+
                     with And("executing docker-compose down just in case it is up"):
-                        cmd = self.command(None, f"{self.docker_compose} down --remove-orphans 2>&1 | tee", exitcode=None, timeout=timeout)
+                        cmd = self.command(None, f"{self.docker_compose} down 2>&1 | tee", exitcode=None, timeout=timeout)
                         if cmd.exitcode != 0:
                             continue
+
+                    with And("checking if any containers are still left running"):
+                        self.command(None, f"{self.docker_compose} ps | tee")
+
                     with And("executing docker-compose up"):
-                        cmd = self.command(None, f"{self.docker_compose} up -d 2>&1 | tee", timeout=timeout)
+                        for up_attempt in range(max_up_attempts):
+                            with By(f"attempt {up_attempt}/{max_up_attempts}"):
+                                cmd = self.command(None, f"{self.docker_compose} up --renew-anon-volumes --force-recreate --timeout 300 -d 2>&1 | tee", timeout=timeout)
+                                if "is unhealthy" not in cmd.output:
+                                    break
 
                     with Then("check there are no unhealthy containers"):
-                        if "is unhealthy" in cmd.output:
-                            self.command(None, f"{self.docker_compose} ps | tee")
+                        ps_cmd = self.command(None, f"{self.docker_compose} ps | tee | grep -v \"Exit 0\"")
+                        if "is unhealthy" in cmd.output or "Exit" in ps_cmd.output:
                             self.command(None, f"{self.docker_compose} logs | tee")
+                            continue
 
-                    if cmd.exitcode == 0:
+                    if cmd.exitcode == 0 and "is unhealthy" not in cmd.output and "Exit" not in ps_cmd.output:
                         break
 
-            if cmd.exitcode != 0:
+            if cmd.exitcode != 0 or "is unhealthy" in cmd.output or "Exit" in ps_cmd.output:
                 fail("could not bring up docker-compose cluster")
 
         with Then("wait all nodes report healhy"):
diff --git a/tests/testflows/helpers/common.py b/tests/testflows/helpers/common.py
new file mode 100644
index 00000000000..2afcc591f98
--- /dev/null
+++ b/tests/testflows/helpers/common.py
@@ -0,0 +1,108 @@
+import testflows.settings as settings
+
+from testflows.core import *
+
+from multiprocessing.dummy import Pool
+from multiprocessing import TimeoutError as PoolTaskTimeoutError
+
+@TestStep(Given)
+def instrument_clickhouse_server_log(self, node=None, test=None,
+        clickhouse_server_log="/var/log/clickhouse-server/clickhouse-server.log"):
+    """Instrument clickhouse-server.log for the current test (default)
+    by adding start and end messages that include test name to log 
+    of the specified node. If we are in the debug mode and the test
+    fails then dump the messages from the log for this test.
+    """
+    if test is None:
+    	test = current()
+
+    if node is None:
+        node = self.context.node
+
+    with By("getting current log size"):
+        cmd =  node.command(f"stat --format=%s {clickhouse_server_log}")
+        start_logsize = cmd.output.split(" ")[0].strip()
+
+    try:
+        with And("adding test name start message to the clickhouse-server.log"):
+            node.command(f"echo -e \"\\n-- start: {test.name} --\\n\" >> {clickhouse_server_log}")
+        yield
+
+    finally:
+        if top().terminating is True:
+            return
+
+        with Finally("adding test name end message to the clickhouse-server.log", flags=TE):
+           node.command(f"echo -e \"\\n-- end: {test.name} --\\n\" >> {clickhouse_server_log}")
+
+        with And("getting current log size at the end of the test"):
+           cmd =  node.command(f"stat --format=%s {clickhouse_server_log}")
+           end_logsize = cmd.output.split(" ")[0].strip()
+
+        with And("checking if test has failing result"):
+            if settings.debug and not self.parent.result:
+                with Then("dumping clickhouse-server.log for this test"):
+                    node.command(f"tail -c +{start_logsize} {clickhouse_server_log}"
+                    	f" | head -c {int(end_logsize) - int(start_logsize)}")
+
+def join(tasks, timeout=None, polling=5):
+    """Join all parallel tests.
+    """
+    exc = None
+
+    for task in tasks:
+        task._join_timeout = timeout
+
+    while tasks:
+        try:
+            try:
+                tasks[0].get(timeout=polling)
+                tasks.pop(0)
+
+            except PoolTaskTimeoutError as e:
+                task = tasks.pop(0)
+                if task._join_timeout is not None:
+                    task._join_timeout -= polling
+                    if task._join_timeout <= 0:
+                        raise
+                tasks.append(task)
+                continue
+
+        except KeyboardInterrupt as e:
+            top().terminating = True
+            raise
+
+        except Exception as e:
+            tasks.pop(0)
+            if exc is None:
+                exc = e
+            top().terminating = True
+
+    if exc is not None:
+        raise exc
+
+def start(pool, tasks, scenario, kwargs=None):
+    """Start parallel test.
+    """
+    if kwargs is None:
+        kwargs = {}
+
+    task = pool.apply_async(scenario, [], kwargs)
+    tasks.append(task)
+
+    return task
+
+def run_scenario(pool, tasks, scenario, kwargs=None):
+    if kwargs is None:
+        kwargs = {}
+
+    _top = top()
+    def _scenario_wrapper(**kwargs):
+        if _top.terminating:
+            return
+        return scenario(**kwargs)
+
+    if current().context.parallel:
+        start(pool, tasks, _scenario_wrapper, kwargs)
+    else:
+        scenario(**kwargs)
diff --git a/tests/testflows/kerberos/docker-compose/clickhouse-service.yml b/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
similarity index 100%
rename from tests/testflows/kerberos/docker-compose/clickhouse-service.yml
rename to tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
diff --git a/tests/testflows/kerberos/docker-compose/docker-compose.yml b/tests/testflows/kerberos/kerberos_env/docker-compose.yml
similarity index 100%
rename from tests/testflows/kerberos/docker-compose/docker-compose.yml
rename to tests/testflows/kerberos/kerberos_env/docker-compose.yml
diff --git a/tests/testflows/kerberos/docker-compose/kerberos-service.yml b/tests/testflows/kerberos/kerberos_env/kerberos-service.yml
similarity index 100%
rename from tests/testflows/kerberos/docker-compose/kerberos-service.yml
rename to tests/testflows/kerberos/kerberos_env/kerberos-service.yml
diff --git a/tests/testflows/kerberos/docker-compose/zookeeper-service.yml b/tests/testflows/kerberos/kerberos_env/zookeeper-service.yml
similarity index 100%
rename from tests/testflows/kerberos/docker-compose/zookeeper-service.yml
rename to tests/testflows/kerberos/kerberos_env/zookeeper-service.yml
diff --git a/tests/testflows/kerberos/regression.py b/tests/testflows/kerberos/regression.py
old mode 100644
new mode 100755
index 9675ba6e3c8..ca174aaff08
--- a/tests/testflows/kerberos/regression.py
+++ b/tests/testflows/kerberos/regression.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+import os
 import sys
 from testflows.core import *
 
@@ -21,12 +23,19 @@ xfails = {
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """ClickHouse Kerberos authentication test regression module.
     """
+    top().terminating = False
     nodes = {
         "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
         "kerberos": ("kerberos", ),
     }
 
-    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "kerberos_env")) as cluster:
         self.context.cluster = cluster
 
         Feature(run=load("kerberos.tests.generic", "generic"), flags=TE)
diff --git a/tests/testflows/ldap/external_user_directory/docker-compose/clickhouse-service.yml b/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
similarity index 100%
rename from tests/testflows/ldap/external_user_directory/docker-compose/clickhouse-service.yml
rename to tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
diff --git a/tests/testflows/ldap/authentication/docker-compose/docker-compose.yml b/tests/testflows/ldap/authentication/ldap_authentication_env/docker-compose.yml
similarity index 100%
rename from tests/testflows/ldap/authentication/docker-compose/docker-compose.yml
rename to tests/testflows/ldap/authentication/ldap_authentication_env/docker-compose.yml
diff --git a/tests/testflows/ldap/authentication/docker-compose/openldap-service.yml b/tests/testflows/ldap/authentication/ldap_authentication_env/openldap-service.yml
similarity index 92%
rename from tests/testflows/ldap/authentication/docker-compose/openldap-service.yml
rename to tests/testflows/ldap/authentication/ldap_authentication_env/openldap-service.yml
index e489637b8c9..606ea3f723f 100644
--- a/tests/testflows/ldap/authentication/docker-compose/openldap-service.yml
+++ b/tests/testflows/ldap/authentication/ldap_authentication_env/openldap-service.yml
@@ -21,14 +21,10 @@ services:
     security_opt:
       - label:disable
 
-
   phpldapadmin:
     image: osixia/phpldapadmin:0.9.0
-    container_name: phpldapadmin
     environment:
       PHPLDAPADMIN_HTTPS=false:
-    ports:
-      - "8080:80"
     healthcheck:
       test: echo 1
       interval: 10s
diff --git a/tests/testflows/ldap/authentication/docker-compose/zookeeper-service.yml b/tests/testflows/ldap/authentication/ldap_authentication_env/zookeeper-service.yml
similarity index 91%
rename from tests/testflows/ldap/authentication/docker-compose/zookeeper-service.yml
rename to tests/testflows/ldap/authentication/ldap_authentication_env/zookeeper-service.yml
index ca732a48dbd..6691a2df31c 100644
--- a/tests/testflows/ldap/authentication/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/ldap/authentication/ldap_authentication_env/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.6.2
+    image: zookeeper:3.4.12
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/ldap/authentication/regression.py b/tests/testflows/ldap/authentication/regression.py
index ff004a998ca..c0c4495a9b3 100755
--- a/tests/testflows/ldap/authentication/regression.py
+++ b/tests/testflows/ldap/authentication/regression.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import os
 import sys
 from testflows.core import *
 
@@ -39,17 +40,19 @@ xfails = {
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """ClickHouse integration with LDAP regression module.
     """
+    top().terminating = False
     nodes = {
         "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
     }
 
-    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
-        self.context.cluster = cluster
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
 
-        if stress is not None or not hasattr(self.context, "stress"):
-            self.context.stress = stress
-        if parallel is not None or not hasattr(self.context, "parallel"):
-            self.context.parallel = parallel
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "ldap_authentication_env")) as cluster:
+        self.context.cluster = cluster
 
         Scenario(run=load("ldap.authentication.tests.sanity", "scenario"))
         Scenario(run=load("ldap.authentication.tests.multiple_servers", "scenario"))
diff --git a/tests/testflows/ldap/authentication/tests/authentications.py b/tests/testflows/ldap/authentication/tests/authentications.py
index 909cc61cdbb..184c6bc1b84 100644
--- a/tests/testflows/ldap/authentication/tests/authentications.py
+++ b/tests/testflows/ldap/authentication/tests/authentications.py
@@ -2,7 +2,7 @@
 import random
 import time
 
-from multiprocessing.dummy import Pool
+from helpers.common import Pool, join
 from testflows.core import *
 from testflows.asserts import error
 from ldap.authentication.tests.common import *
@@ -64,7 +64,7 @@ def add_user_to_ldap_and_login(self, server, user=None, ch_user=None, login=None
     RQ_SRS_007_LDAP_Authentication_Parallel("1.0"),
     RQ_SRS_007_LDAP_Authentication_Parallel_ValidAndInvalid("1.0")
 )
-def parallel_login(self, server, user_count=10, timeout=200, rbac=False):
+def parallel_login(self, server, user_count=10, timeout=300, rbac=False):
     """Check that login of valid and invalid LDAP authenticated users works in parallel.
     """
     self.context.ldap_node = self.context.cluster.node(server)
@@ -103,17 +103,17 @@ def parallel_login(self, server, user_count=10, timeout=200, rbac=False):
                                 steps=False)
 
             with When("I login in parallel"):
-                p = Pool(15)
                 tasks = []
-                for i in range(5):
-                    tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
-
-            with Then("it should work"):
-                for task in tasks:
-                    task.get(timeout=timeout)
-
+                with Pool(4) as pool:
+                    try:
+                        for i in range(5):
+                            tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                            tasks.append(pool.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
+                            tasks.append(pool.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
+                    finally:
+                        with Then("it should work"):
+                            join(tasks, timeout=timeout)
+        
 @TestScenario
 @Requirements(
     RQ_SRS_007_LDAP_Authentication_Invalid("1.0"),
@@ -223,7 +223,7 @@ def login_after_user_cn_changed_in_ldap(self, server, rbac=False):
     RQ_SRS_007_LDAP_Authentication_Valid("1.0"),
     RQ_SRS_007_LDAP_Authentication_LDAPServerRestart("1.0")
 )
-def login_after_ldap_server_is_restarted(self, server, timeout=60, rbac=False):
+def login_after_ldap_server_is_restarted(self, server, timeout=300, rbac=False):
     """Check that login succeeds after LDAP server is restarted.
     """
     self.context.ldap_node = self.context.cluster.node(server)
@@ -259,7 +259,7 @@ def login_after_ldap_server_is_restarted(self, server, timeout=60, rbac=False):
     RQ_SRS_007_LDAP_Authentication_Valid("1.0"),
     RQ_SRS_007_LDAP_Authentication_ClickHouseServerRestart("1.0")
 )
-def login_after_clickhouse_server_is_restarted(self, server, timeout=60, rbac=False):
+def login_after_clickhouse_server_is_restarted(self, server, timeout=300, rbac=False):
     """Check that login succeeds after ClickHouse server is restarted.
     """
     self.context.ldap_node = self.context.cluster.node(server)
@@ -481,7 +481,7 @@ def empty_username_and_empty_password(self, server=None, rbac=False):
 @Requirements(
     RQ_SRS_007_LDAP_Configuration_Server_VerificationCooldown_Default("1.0")
 )
-def default_verification_cooldown_value(self, server, rbac=False, timeout=20):
+def default_verification_cooldown_value(self, server, rbac=False):
     """Check that the default value (0) for the verification cooldown parameter
     disables caching and forces contacting the LDAP server for each
     authentication request.
@@ -525,14 +525,11 @@ def default_verification_cooldown_value(self, server, rbac=False, timeout=20):
 @Requirements(
     RQ_SRS_007_LDAP_Configuration_Server_VerificationCooldown("1.0")
 )
-def valid_verification_cooldown_value_cn_change(self, server, rbac=False, timeout=20):
+def valid_verification_cooldown_value_cn_change(self, server, rbac=False):
     """Check that we can perform requests without contacting the LDAP server
     after successful authentication when the verification_cooldown parameter
     is set and the user cn is changed.
     """
-
-    error_message = "DB::Exception: testVCD: Authentication failed: password is incorrect or there is no user with such name"
-    error_exitcode = 4
     user = None
     new_user = None
 
@@ -543,7 +540,7 @@ def valid_verification_cooldown_value_cn_change(self, server, rbac=False, timeou
             "enable_tls": "no",
             "auth_dn_prefix": "cn=",
             "auth_dn_suffix": ",ou=users,dc=company,dc=com",
-            "verification_cooldown": "2"
+            "verification_cooldown": "600"
         }}
 
         self.context.ldap_node = self.context.cluster.node(server)
@@ -563,12 +560,6 @@ def valid_verification_cooldown_value_cn_change(self, server, rbac=False, timeou
 
                 with Then("when I try to login again with the old user cn it should work"):
                     login_and_execute_query(username=user["cn"], password=user["userpassword"])
-
-                with And("when I sleep for 2 seconds and try to log in, it should fail"):
-                    time.sleep(2)
-                    login_and_execute_query(username=user["cn"], password=user["userpassword"],
-                        exitcode=error_exitcode, message=error_message)
-
     finally:
         with Finally("I make sure LDAP user is deleted"):
             if new_user is not None:
@@ -579,14 +570,11 @@ def valid_verification_cooldown_value_cn_change(self, server, rbac=False, timeou
 @Requirements(
     RQ_SRS_007_LDAP_Configuration_Server_VerificationCooldown("1.0")
 )
-def valid_verification_cooldown_value_password_change(self, server, rbac=False, timeout=20):
+def valid_verification_cooldown_value_password_change(self, server, rbac=False):
     """Check that we can perform requests without contacting the LDAP server
     after successful authentication when the verification_cooldown parameter
     is set and the user password is changed.
     """
-
-    error_message = "DB::Exception: testVCD: Authentication failed: password is incorrect or there is no user with such name"
-    error_exitcode = 4
     user = None
 
     with Given("I have an LDAP configuration that sets verification_cooldown parameter to 2 sec"):
@@ -596,7 +584,7 @@ def valid_verification_cooldown_value_password_change(self, server, rbac=False,
             "enable_tls": "no",
             "auth_dn_prefix": "cn=",
             "auth_dn_suffix": ",ou=users,dc=company,dc=com",
-            "verification_cooldown": "2"
+            "verification_cooldown": "600"
         }}
 
         self.context.ldap_node = self.context.cluster.node(server)
@@ -616,12 +604,6 @@ def valid_verification_cooldown_value_password_change(self, server, rbac=False,
 
                 with Then("when I try to login again with the old password it should work"):
                     login_and_execute_query(username=user["cn"], password=user["userpassword"])
-
-                with And("when I sleep for 2 seconds and try to log in, it should fail"):
-                    time.sleep(2)
-                    login_and_execute_query(username=user["cn"], password=user["userpassword"],
-                        exitcode=error_exitcode, message=error_message)
-
     finally:
         with Finally("I make sure LDAP user is deleted"):
             if user is not None:
@@ -632,14 +614,11 @@ def valid_verification_cooldown_value_password_change(self, server, rbac=False,
 @Requirements(
     RQ_SRS_007_LDAP_Configuration_Server_VerificationCooldown("1.0")
 )
-def valid_verification_cooldown_value_ldap_unavailable(self, server, rbac=False, timeout=20):
+def valid_verification_cooldown_value_ldap_unavailable(self, server, rbac=False):
     """Check that we can perform requests without contacting the LDAP server
     after successful authentication when the verification_cooldown parameter
     is set, even when the LDAP server is offline.
     """
-
-    error_message = "DB::Exception: testVCD: Authentication failed: password is incorrect or there is no user with such name"
-    error_exitcode = 4
     user = None
 
     with Given("I have an LDAP configuration that sets verification_cooldown parameter to 2 sec"):
@@ -649,7 +628,7 @@ def valid_verification_cooldown_value_ldap_unavailable(self, server, rbac=False,
             "enable_tls": "no",
             "auth_dn_prefix": "cn=",
             "auth_dn_suffix": ",ou=users,dc=company,dc=com",
-            "verification_cooldown": "2"
+            "verification_cooldown": "600"
         }}
 
         self.context.ldap_node = self.context.cluster.node(server)
@@ -672,12 +651,6 @@ def valid_verification_cooldown_value_ldap_unavailable(self, server, rbac=False,
 
                     with Then("when I try to login again with the server offline it should work"):
                         login_and_execute_query(username=user["cn"], password=user["userpassword"])
-
-                    with And("when I sleep for 2 seconds and try to log in, it should fail"):
-                        time.sleep(2)
-                        login_and_execute_query(username=user["cn"], password=user["userpassword"],
-                            exitcode=error_exitcode, message=error_message)
-
                 finally:
                     with Finally("I start the ldap server back up"):
                         self.context.ldap_node.start()
diff --git a/tests/testflows/ldap/authentication/tests/common.py b/tests/testflows/ldap/authentication/tests/common.py
index 6b6ce0413a4..ec6a66c0257 100644
--- a/tests/testflows/ldap/authentication/tests/common.py
+++ b/tests/testflows/ldap/authentication/tests/common.py
@@ -47,7 +47,7 @@ ASCII_CHARS = string.ascii_lowercase +  string.ascii_uppercase + string.digits
 def randomword(length, chars=ASCII_CHARS):
     return ''.join(random.choice(chars) for i in range(length))
 
-def restart(node=None, safe=False, timeout=60):
+def restart(node=None, safe=False, timeout=300):
     """Restart ClickHouse server and wait for config to be reloaded.
     """
     with When("I restart ClickHouse server node"):
@@ -78,7 +78,7 @@ def restart(node=None, safe=False, timeout=60):
                     f"ConfigReloader: Loaded config '/etc/clickhouse-server/config.xml', performed update on configuration",
                     timeout=timeout)
 
-def add_config(config, timeout=60, restart=False, modify=False):
+def add_config(config, timeout=300, restart=False, modify=False):
     """Add dynamic configuration file to ClickHouse.
 
     :param node: node
@@ -86,6 +86,7 @@ def add_config(config, timeout=60, restart=False, modify=False):
     :param timeout: timeout, default: 20 sec
     """
     node = current().context.node
+    cluster = current().context.cluster
 
     def check_preprocessed_config_is_updated(after_removal=False):
         """Check that preprocessed config is updated.
@@ -123,7 +124,7 @@ def add_config(config, timeout=60, restart=False, modify=False):
 
             with And("I get the current log size"):
                 cmd = node.cluster.command(None,
-                    f"stat --format=%s {os.environ['CLICKHOUSE_TESTS_DIR']}/_instances/{node.name}/logs/clickhouse-server.log")
+                    f"stat --format=%s {cluster.environ['CLICKHOUSE_TESTS_DIR']}/_instances/{node.name}/logs/clickhouse-server.log")
                 logsize = cmd.output.split(" ")[0].strip()
 
             with And("I start ClickHouse back up"):
@@ -210,7 +211,7 @@ def modify_config(config, restart=False):
 
 @contextmanager
 def ldap_servers(servers, config_d_dir="/etc/clickhouse-server/config.d", config_file="ldap_servers.xml",
-        timeout=60, restart=False, config=None):
+        timeout=300, restart=False, config=None):
     """Add LDAP servers configuration.
     """
     if config is None:
@@ -248,7 +249,7 @@ def add_users_identified_with_ldap(*users):
     try:
         with Given("I create users"):
             for user in users:
-                node.query(f"CREATE USER '{user['username']}' IDENTIFIED WITH ldap SERVER '{user['server']}'")
+                node.query(f"CREATE USER '{user['username']}' IDENTIFIED WITH LDAP SERVER '{user['server']}'")
         yield
     finally:
         with Finally("I remove users"):
@@ -258,7 +259,7 @@ def add_users_identified_with_ldap(*users):
 
 @contextmanager
 def ldap_authenticated_users(*users, config_d_dir="/etc/clickhouse-server/users.d",
-        config_file=None, timeout=60, restart=True, config=None, rbac=False):
+        config_file=None, timeout=300, restart=True, config=None, rbac=False):
     """Add LDAP authenticated users.
     """
     if rbac:
@@ -268,9 +269,9 @@ def ldap_authenticated_users(*users, config_d_dir="/etc/clickhouse-server/users.
             config_file = f"ldap_users_{getuid()}.xml"
         if config is None:
             config = create_ldap_users_config_content(*users, config_d_dir=config_d_dir, config_file=config_file)
-        return add_config(config, restart=restart)
+        return add_config(config, timeout=timeout, restart=restart)
 
-def invalid_server_config(servers, message=None, tail=30, timeout=60):
+def invalid_server_config(servers, message=None, tail=30, timeout=300):
     """Check that ClickHouse errors when trying to load invalid LDAP servers configuration file.
     """
     node = current().context.node
@@ -299,7 +300,7 @@ def invalid_server_config(servers, message=None, tail=30, timeout=60):
             with By("removing the config file", description=config.path):
                 node.command(f"rm -rf {config.path}", exitcode=0)
 
-def invalid_user_config(servers, config, message=None, tail=30, timeout=60):
+def invalid_user_config(servers, config, message=None, tail=30, timeout=300):
     """Check that ClickHouse errors when trying to load invalid LDAP users configuration file.
     """
     node = current().context.node
diff --git a/tests/testflows/ldap/authentication/tests/server_config.py b/tests/testflows/ldap/authentication/tests/server_config.py
index 4053b5f61ed..88b6bfa0325 100644
--- a/tests/testflows/ldap/authentication/tests/server_config.py
+++ b/tests/testflows/ldap/authentication/tests/server_config.py
@@ -8,7 +8,7 @@ from ldap.authentication.requirements import *
     RQ_SRS_007_LDAP_Server_Configuration_Invalid("1.0"),
     RQ_SRS_007_LDAP_Configuration_Server_Name("1.0")
 )
-def empty_server_name(self, timeout=20):
+def empty_server_name(self, timeout=300):
     """Check that empty string as a server name is not allowed.
     """
     servers = {"": {"host": "foo", "port": "389", "enable_tls": "no",
@@ -229,7 +229,7 @@ def auth_dn_value(self):
 @Requirements(
     RQ_SRS_007_LDAP_Configuration_Server_VerificationCooldown_Invalid("1.0")
 )
-def invalid_verification_cooldown_value(self, invalid_value, timeout=20):
+def invalid_verification_cooldown_value(self, invalid_value, timeout=300):
     """Check that server returns an error when LDAP server
     verification cooldown parameter is invalid.
     """
diff --git a/tests/testflows/ldap/authentication/tests/user_config.py b/tests/testflows/ldap/authentication/tests/user_config.py
index 0f296ea31c6..ebcfb6899c2 100644
--- a/tests/testflows/ldap/authentication/tests/user_config.py
+++ b/tests/testflows/ldap/authentication/tests/user_config.py
@@ -10,7 +10,7 @@ from ldap.authentication.requirements import *
     RQ_SRS_007_LDAP_User_Configuration_Invalid("1.0"),
     RQ_SRS_007_LDAP_Configuration_User_Name_Empty("1.0")
 )
-def empty_user_name(self, timeout=20):
+def empty_user_name(self, timeout=300):
     """Check that empty string as a user name is not allowed.
     """
     servers = {"openldap1": {
@@ -26,7 +26,7 @@ def empty_user_name(self, timeout=20):
     RQ_SRS_007_LDAP_User_Configuration_Invalid("1.0"),
     RQ_SRS_007_LDAP_Configuration_User_LDAP_InvalidServerName_Empty("1.0")
 )
-def empty_server_name(self, timeout=20):
+def empty_server_name(self, timeout=300):
     """Check that if server name is an empty string then login is not allowed.
     """
     message = "Exception: LDAP server name cannot be empty for user"
@@ -46,7 +46,7 @@ def empty_server_name(self, timeout=20):
     RQ_SRS_007_LDAP_User_Configuration_Invalid("1.0"),
     RQ_SRS_007_LDAP_Configuration_User_LDAP_InvalidServerName_NotDefined("1.0")
 )
-def empty_server_not_defined(self, timeout=20):
+def empty_server_not_defined(self):
     """Check that if server is not defined then login is not allowed.
     """
     servers = {"openldap1": {
@@ -76,7 +76,7 @@ def valid_user_config(self):
 @Requirements(
     RQ_SRS_007_LDAP_Configuration_User_OnlyOneServer("1.0")
 )
-def multiple_servers(self, timeout=20):
+def multiple_servers(self):
     """Check that user configuration allows to specify only one LDAP server for a given user
     and if multiple servers are specified then the first one is used."""
     servers = {
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/clickhouse-service.yml b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
similarity index 100%
rename from tests/testflows/ldap/role_mapping/docker-compose/clickhouse-service.yml
rename to tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
diff --git a/tests/testflows/ldap/external_user_directory/docker-compose/docker-compose.yml b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/docker-compose.yml
similarity index 100%
rename from tests/testflows/ldap/external_user_directory/docker-compose/docker-compose.yml
rename to tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/docker-compose.yml
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/openldap-service.yml b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/openldap-service.yml
similarity index 92%
rename from tests/testflows/ldap/role_mapping/docker-compose/openldap-service.yml
rename to tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/openldap-service.yml
index e489637b8c9..606ea3f723f 100644
--- a/tests/testflows/ldap/role_mapping/docker-compose/openldap-service.yml
+++ b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/openldap-service.yml
@@ -21,14 +21,10 @@ services:
     security_opt:
       - label:disable
 
-
   phpldapadmin:
     image: osixia/phpldapadmin:0.9.0
-    container_name: phpldapadmin
     environment:
       PHPLDAPADMIN_HTTPS=false:
-    ports:
-      - "8080:80"
     healthcheck:
       test: echo 1
       interval: 10s
diff --git a/tests/testflows/ldap/external_user_directory/docker-compose/zookeeper-service.yml b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/zookeeper-service.yml
similarity index 91%
rename from tests/testflows/ldap/external_user_directory/docker-compose/zookeeper-service.yml
rename to tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/zookeeper-service.yml
index ca732a48dbd..6691a2df31c 100644
--- a/tests/testflows/ldap/external_user_directory/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.6.2
+    image: zookeeper:3.4.12
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/ldap/external_user_directory/regression.py b/tests/testflows/ldap/external_user_directory/regression.py
index b88c1a2a6d6..aea3eeb2f57 100755
--- a/tests/testflows/ldap/external_user_directory/regression.py
+++ b/tests/testflows/ldap/external_user_directory/regression.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import os
 import sys
 from testflows.core import *
 
@@ -39,17 +40,19 @@ xfails = {
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """ClickHouse LDAP external user directory regression module.
     """
+    top().terminating = False
     nodes = {
         "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
     }
 
-    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "ldap_external_user_directory_env")) as cluster:
         self.context.cluster = cluster
-        
-        if stress is not None or not hasattr(self.context, "stress"):
-            self.context.stress = stress
-        if parallel is not None or not hasattr(self.context, "parallel"):
-            self.context.parallel = parallel
 
         Scenario(run=load("ldap.authentication.tests.sanity", "scenario"))
         Scenario(run=load("ldap.external_user_directory.tests.simple", "scenario"))
diff --git a/tests/testflows/ldap/external_user_directory/tests/authentications.py b/tests/testflows/ldap/external_user_directory/tests/authentications.py
index b47a85e3e92..34e5d11835c 100644
--- a/tests/testflows/ldap/external_user_directory/tests/authentications.py
+++ b/tests/testflows/ldap/external_user_directory/tests/authentications.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import random
 
-from multiprocessing.dummy import Pool
+from helpers.common import Pool, join
 from testflows.core import *
 from testflows.asserts import error
 
@@ -83,7 +83,7 @@ def login_with_invalid_username_and_valid_password(users, i, iterations=10):
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel("1.0"),
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_ValidAndInvalid("1.0")
 )
-def parallel_login(self, server, user_count=10, timeout=200):
+def parallel_login(self, server, user_count=10, timeout=300):
     """Check that login of valid and invalid LDAP authenticated users works in parallel.
     """
     self.context.ldap_node = self.context.cluster.node(server)
@@ -94,28 +94,28 @@ def parallel_login(self, server, user_count=10, timeout=200):
 
     with ldap_users(*users):
         tasks = []
-        try:
-            with When("users try to login in parallel", description="""
-                * with valid username and password
-                * with invalid username and valid password
-                * with valid username and invalid password
-                """):
-                p = Pool(15)
-                for i in range(25):
-                    tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
-
-        finally:
-            with Then("it should work"):
-                join(tasks, timeout)
-
+        with Pool(4) as pool:
+            try:
+                with When("users try to login in parallel", description="""
+                    * with valid username and password
+                    * with invalid username and valid password
+                    * with valid username and invalid password
+                    """):
+                    for i in range(10):
+                        tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                        tasks.append(pool.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
+                        tasks.append(pool.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
+    
+            finally:
+                with Then("it should work"):
+                    join(tasks, timeout)
+    
 @TestScenario
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_SameUser("1.0"),
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_ValidAndInvalid("1.0")
 )
-def parallel_login_with_the_same_user(self, server, timeout=200):
+def parallel_login_with_the_same_user(self, server, timeout=300):
     """Check that valid and invalid logins of the same
     LDAP authenticated user works in parallel.
     """
@@ -127,21 +127,20 @@ def parallel_login_with_the_same_user(self, server, timeout=200):
 
     with ldap_users(*users):
         tasks = []
-        try:
-            with When("the same user tries to login in parallel", description="""
-                * with valid username and password
-                * with invalid username and valid password
-                * with valid username and invalid password
-                """):
-                p = Pool(15)
-                for i in range(25):
-                    tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
-
-        finally:
-            with Then("it should work"):
-                join(tasks, timeout)
+        with Pool(4) as pool:
+            try:
+                with When("the same user tries to login in parallel", description="""
+                    * with valid username and password
+                    * with invalid username and valid password
+                    * with valid username and invalid password
+                    """):
+                    for i in range(10):
+                        tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                        tasks.append(pool.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
+                        tasks.append(pool.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
+            finally:
+                with Then("it should work"):
+                    join(tasks, timeout)
 
 @TestScenario
 @Tags("custom config")
@@ -164,7 +163,7 @@ def login_after_ldap_external_user_directory_is_removed(self, server):
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_SameUser("1.0"),
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_ValidAndInvalid("1.0")
 )
-def parallel_login_with_the_same_user_multiple_servers(self, server, timeout=200):
+def parallel_login_with_the_same_user_multiple_servers(self, server, timeout=300):
     """Check that valid and invalid logins of the same
     user defined in multiple LDAP external user directories
     works in parallel.
@@ -185,21 +184,20 @@ def parallel_login_with_the_same_user_multiple_servers(self, server, timeout=200
         with ldap_users(*users, node=self.context.cluster.node("openldap1")):
             with ldap_users(*users, node=self.context.cluster.node("openldap2")):
                 tasks = []
-                try:
-                    with When("the same user tries to login in parallel", description="""
-                        * with valid username and password
-                        * with invalid username and valid password
-                        * with valid username and invalid password
-                        """):
-                        p = Pool(15)
-                        for i in range(25):
-                            tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                            tasks.append(p.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
-                            tasks.append(p.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
-
-                finally:
-                    with Then("it should work"):
-                        join(tasks, timeout)
+                with Pool(4) as pool:                
+                    try:
+                        with When("the same user tries to login in parallel", description="""
+                            * with valid username and password
+                            * with invalid username and valid password
+                            * with valid username and invalid password
+                            """):
+                            for i in range(10):
+                                tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                                tasks.append(pool.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
+                                tasks.append(pool.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
+                    finally:
+                        with Then("it should work"):
+                            join(tasks, timeout)
 
 @TestScenario
 @Tags("custom config")
@@ -207,7 +205,7 @@ def parallel_login_with_the_same_user_multiple_servers(self, server, timeout=200
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_MultipleServers("1.0"),
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_ValidAndInvalid("1.0")
 )
-def parallel_login_with_multiple_servers(self, server, user_count=10, timeout=200):
+def parallel_login_with_multiple_servers(self, server, user_count=10, timeout=300):
     """Check that login of valid and invalid LDAP authenticated users works in parallel
     using multiple LDAP external user directories.
     """
@@ -237,22 +235,20 @@ def parallel_login_with_multiple_servers(self, server, user_count=10, timeout=20
         with ldap_users(*user_groups["openldap1_users"], node=self.context.cluster.node("openldap1")):
             with ldap_users(*user_groups["openldap2_users"], node=self.context.cluster.node("openldap2")):
                 tasks = []
-
-                try:
-                    with When("users in each group try to login in parallel", description="""
-                        * with valid username and password
-                        * with invalid username and valid password
-                        * with valid username and invalid password
-                        """):
-                        p = Pool(15)
-                        for i in range(25):
-                            for users in user_groups.values():
-                                for check in checks:
-                                    tasks.append(p.apply_async(check, (users, i, 50,)))
-
-                finally:
-                    with Then("it should work"):
-                        join(tasks, timeout)
+                with Pool(4) as pool:
+                    try:
+                        with When("users in each group try to login in parallel", description="""
+                            * with valid username and password
+                            * with invalid username and valid password
+                            * with valid username and invalid password
+                            """):
+                            for i in range(10):
+                                for users in user_groups.values():
+                                    for check in checks:
+                                        tasks.append(pool.apply_async(check, (users, i, 50,)))
+                    finally:
+                        with Then("it should work"):
+                            join(tasks, timeout)
 
 @TestScenario
 @Tags("custom config")
@@ -260,7 +256,7 @@ def parallel_login_with_multiple_servers(self, server, user_count=10, timeout=20
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_LocalAndMultipleLDAP("1.0"),
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_ValidAndInvalid("1.0")
 )
-def parallel_login_with_rbac_and_multiple_servers(self, server, user_count=10, timeout=200):
+def parallel_login_with_rbac_and_multiple_servers(self, server, user_count=10, timeout=300):
     """Check that login of valid and invalid users works in parallel
     using local users defined using RBAC and LDAP users authenticated using
     multiple LDAP external user directories.
@@ -293,28 +289,26 @@ def parallel_login_with_rbac_and_multiple_servers(self, server, user_count=10, t
             with ldap_users(*user_groups["openldap2_users"], node=self.context.cluster.node("openldap2")):
                 with rbac_users(*user_groups["local_users"]):
                     tasks = []
-
-                    try:
-                        with When("users in each group try to login in parallel", description="""
-                            * with valid username and password
-                            * with invalid username and valid password
-                            * with valid username and invalid password
-                            """):
-                            p = Pool(15)
-                            for i in range(25):
-                                for users in user_groups.values():
-                                    for check in checks:
-                                        tasks.append(p.apply_async(check, (users, i, 50,)))
-
-                    finally:
-                        with Then("it should work"):
-                            join(tasks, timeout)
+                    with Pool(4) as pool:
+                        try:
+                            with When("users in each group try to login in parallel", description="""
+                                * with valid username and password
+                                * with invalid username and valid password
+                                * with valid username and invalid password
+                                """):
+                                for i in range(10):
+                                    for users in user_groups.values():
+                                        for check in checks:
+                                            tasks.append(pool.apply_async(check, (users, i, 50,)))
+                        finally:
+                            with Then("it should work"):
+                                join(tasks, timeout)
 
 @TestScenario
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Authentication_Parallel_LocalOnly("1.0")
 )
-def parallel_login_with_rbac_users(self, server, user_count=10, timeout=200):
+def parallel_login_with_rbac_users(self, server, user_count=10, timeout=300):
     """Check that login of only valid and invalid local users created using RBAC
     works in parallel when server configuration includes LDAP external user directory.
     """
@@ -325,16 +319,16 @@ def parallel_login_with_rbac_users(self, server, user_count=10, timeout=200):
 
     with rbac_users(*users):
         tasks = []
-        try:
-            with When("I login in parallel"):
-                p = Pool(15)
-                for i in range(25):
-                    tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
-        finally:
-            with Then("it should work"):
-                join(tasks, timeout)
+        with Pool(4) as pool:
+            try:
+                with When("I login in parallel"):
+                    for i in range(10):
+                        tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                        tasks.append(pool.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
+                        tasks.append(pool.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
+            finally:
+                with Then("it should work"):
+                    join(tasks, timeout)
 
 @TestScenario
 @Requirements(
@@ -703,7 +697,7 @@ def empty_username_and_empty_password(self, server=None):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_VerificationCooldown_Default("1.0")
 )
-def default_verification_cooldown_value(self, server, rbac=False, timeout=20):
+def default_verification_cooldown_value(self, server, rbac=False):
     """Check that the default value (0) for the verification cooldown parameter
     disables caching and forces contacting the LDAP server for each
     authentication request.
@@ -748,7 +742,7 @@ def default_verification_cooldown_value(self, server, rbac=False, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_VerificationCooldown("1.0")
 )
-def valid_verification_cooldown_value_cn_change(self, server, rbac=False, timeout=20):
+def valid_verification_cooldown_value_cn_change(self, server, rbac=False):
     """Check that we can perform requests without contacting the LDAP server
     after successful authentication when the verification_cooldown parameter
     is set and the user cn is changed.
@@ -803,7 +797,7 @@ def valid_verification_cooldown_value_cn_change(self, server, rbac=False, timeou
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_VerificationCooldown("1.0")
 )
-def valid_verification_cooldown_value_password_change(self, server, rbac=False, timeout=20):
+def valid_verification_cooldown_value_password_change(self, server, rbac=False):
     """Check that we can perform requests without contacting the LDAP server
     after successful authentication when the verification_cooldown parameter
     is set and the user password is changed.
@@ -857,7 +851,7 @@ def valid_verification_cooldown_value_password_change(self, server, rbac=False,
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_VerificationCooldown("1.0")
 )
-def valid_verification_cooldown_value_ldap_unavailable(self, server, rbac=False, timeout=20):
+def valid_verification_cooldown_value_ldap_unavailable(self, server, rbac=False):
     """Check that we can perform requests without contacting the LDAP server
     after successful authentication when the verification_cooldown parameter
     is set, even when the LDAP server is offline.
diff --git a/tests/testflows/ldap/external_user_directory/tests/common.py b/tests/testflows/ldap/external_user_directory/tests/common.py
index 23a8d68be0d..f6d1654efd6 100644
--- a/tests/testflows/ldap/external_user_directory/tests/common.py
+++ b/tests/testflows/ldap/external_user_directory/tests/common.py
@@ -12,21 +12,6 @@ from ldap.authentication.tests.common import change_user_password_in_ldap, chang
 from ldap.authentication.tests.common import create_ldap_servers_config_content
 from ldap.authentication.tests.common import randomword
 
-def join(tasks, timeout):
-    """Join async tasks by waiting for their completion.
-    """
-    task_exc = None
-
-    for task in tasks:
-        try:
-            task.get(timeout=timeout)
-        except Exception as exc:
-            if task_exc is None:
-                task_exc = exc
-
-    if task_exc is not None:
-        raise task_exc
-
 @contextmanager
 def table(name, create_statement, on_cluster=False):
     node = current().context.node
diff --git a/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py b/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py
index 9ff480426bf..3f1b8076ffa 100644
--- a/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py
+++ b/tests/testflows/ldap/external_user_directory/tests/external_user_directory_config.py
@@ -7,7 +7,7 @@ from ldap.external_user_directory.requirements import *
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_LDAPUserDirectory_MoreThanOne("2.0")
 )
-def more_than_one_user_directory(self, timeout=20):
+def more_than_one_user_directory(self):
     """Check when more than one LDAP user directory is
     defined inside a configuration file.
     """
@@ -52,7 +52,7 @@ def more_than_one_user_directory(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Server_Empty("1.0")
 )
-def empty_server(self, timeout=20):
+def empty_server(self, timeout=300):
     """Check that empty string in a `server` field is not allowed.
     """
     message = "DB::Exception: Empty 'server' field for LDAP user directory"
@@ -71,7 +71,7 @@ def empty_server(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Server_Missing("1.0")
 )
-def missing_server(self, timeout=20):
+def missing_server(self, timeout=300):
     """Check that missing `server` field is not allowed.
     """
     message = "DB::Exception: Missing 'server' field for LDAP user directory"
@@ -90,7 +90,7 @@ def missing_server(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Server_MoreThanOne("1.0")
 )
-def defined_twice_server(self, timeout=20):
+def defined_twice_server(self):
     """Check that when `server` field is defined twice that only the first
     entry is used.
     """
@@ -119,7 +119,7 @@ def defined_twice_server(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Server_Invalid("1.0")
 )
-def invalid_server(self, timeout=20):
+def invalid_server(self):
     """Check when `server` field value is invalid.
     """
     servers = {
@@ -148,7 +148,7 @@ def invalid_server(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_Empty("1.0")
 )
-def empty_roles(self, timeout=20):
+def empty_roles(self):
     """Check when `roles` parameter is empty then user can't read any tables.
     """
     message = "DB::Exception: user1: Not enough privileges."
@@ -178,7 +178,7 @@ def empty_roles(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_MoreThanOne("1.0")
 )
-def defined_twice_roles(self, timeout=20):
+def defined_twice_roles(self):
     """Check that when `roles` is defined twice then only the first entry is used.
     """
     node = self.context.node
@@ -222,7 +222,7 @@ def defined_twice_roles(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_Invalid("2.0")
 )
-def invalid_role_in_roles(self, timeout=20):
+def invalid_role_in_roles(self):
     """Check that no error is returned when LDAP users try to authenticate
     if an invalid role is specified inside the `roles` section.
     """
@@ -244,7 +244,7 @@ def invalid_role_in_roles(self, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Parameters_Roles_Missing("1.0")
 )
-def missing_roles(self, timeout=20):
+def missing_roles(self):
     """Check that when the `roles` are missing then
     LDAP users can still login but can't read from any table.
     """
diff --git a/tests/testflows/ldap/external_user_directory/tests/restart.py b/tests/testflows/ldap/external_user_directory/tests/restart.py
index 9b688909cb2..23b0911bb29 100644
--- a/tests/testflows/ldap/external_user_directory/tests/restart.py
+++ b/tests/testflows/ldap/external_user_directory/tests/restart.py
@@ -1,6 +1,6 @@
 import random
 
-from multiprocessing.dummy import Pool
+from helpers.common import Pool, join
 from testflows.core import *
 from testflows.asserts import error
 
@@ -134,7 +134,7 @@ def dynamically_added_users(self, node="clickhouse1", count=10):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Restart_Server_ParallelLogins("1.0")
 )
-def parallel_login(self, server=None, user_count=10, timeout=200):
+def parallel_login(self, server=None, user_count=10, timeout=300):
     """Check that login of valid and invalid users works in parallel
     using local users defined using RBAC and LDAP users authenticated using
     multiple LDAP external user directories when server is restarted
@@ -262,28 +262,28 @@ def parallel_login(self, server=None, user_count=10, timeout=200):
                 with ldap_users(*user_groups["openldap2_users"], node=self.context.cluster.node("openldap2")):
                     with rbac_users(*user_groups["local_users"]):
                         tasks = []
-                        try:
-                            with When("I restart the server during parallel login of users in each group"):
-                                p = Pool(10)
-                                for users in user_groups.values():
-                                    for check in checks:
-                                        tasks.append(p.apply_async(check, (users, 0, 25, True)))
-
-                                tasks.append(p.apply_async(restart))
-                        finally:
-                            with Then("logins during restart should work"):
-                                join(tasks, timeout)
+                        with Pool(4) as pool:
+                            try:
+                                with When("I restart the server during parallel login of users in each group"):
+                                    for users in user_groups.values():
+                                        for check in checks:
+                                            tasks.append(pool.apply_async(check, (users, 0, 25, True)))
+    
+                                    tasks.append(pool.apply_async(restart))
+                            finally:
+                                with Then("logins during restart should work"):
+                                    join(tasks, timeout)
 
                         tasks = []
-                        try:
-                            with When("I perform parallel login of users in each group after restart"):
-                                p = Pool(10)
-                                for users in user_groups.values():
-                                    for check in checks:
-                                        tasks.append(p.apply_async(check, (users, 0, 10, False)))
-                        finally:
-                            with Then("logins after restart should work"):
-                                join(tasks, timeout)
+                        with Pool(4) as pool:
+                            try:
+                                with When("I perform parallel login of users in each group after restart"):
+                                    for users in user_groups.values():
+                                        for check in checks:
+                                            tasks.append(pool.apply_async(check, (users, 0, 10, False)))
+                            finally:
+                                with Then("logins after restart should work"):
+                                    join(tasks, timeout)
 
 @TestOutline(Feature)
 @Name("restart")
@@ -297,4 +297,4 @@ def feature(self, servers=None, server=None, node="clickhouse1"):
     self.context.node = self.context.cluster.node(node)
 
     for scenario in loads(current_module(), Scenario):
-        Scenario(test=scenario, flags=TE)()
+        Scenario(test=scenario)()
diff --git a/tests/testflows/ldap/external_user_directory/tests/roles.py b/tests/testflows/ldap/external_user_directory/tests/roles.py
index 2b68c1da36b..364ee219e48 100644
--- a/tests/testflows/ldap/external_user_directory/tests/roles.py
+++ b/tests/testflows/ldap/external_user_directory/tests/roles.py
@@ -7,7 +7,7 @@ from ldap.external_user_directory.requirements import *
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Role_New("1.0")
 )
-def new_role(self, server, timeout=20):
+def new_role(self, server):
     """Check that new roles can't be assigned to any LDAP user
     authenticated using external user directory.
     """
@@ -50,7 +50,7 @@ def new_role(self, server, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Role_NewPrivilege("1.0")
 )
-def add_privilege(self, server, timeout=20):
+def add_privilege(self, server):
     """Check that we can add privilege to a role used
     in the external user directory configuration.
     """
@@ -95,7 +95,7 @@ def add_privilege(self, server, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Role_RemovedPrivilege("1.0")
 )
-def remove_privilege(self, server, timeout=20):
+def remove_privilege(self, server):
     """Check that we can remove privilege from a role used
     in the external user directory configuration.
     """
@@ -141,7 +141,7 @@ def remove_privilege(self, server, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Role_Removed("2.0")
 )
-def remove_role(self, server, timeout=20):
+def remove_role(self, server):
     """Check that when a role used in the external user directory configuration
     is dynamically removed then any LDAP users should still be authenticated using
     LDAP external user directory.
@@ -178,7 +178,7 @@ def remove_role(self, server, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Role_Removed_Privileges("1.0")
 )
-def remove_privilege_by_removing_role(self, server, timeout=20):
+def remove_privilege_by_removing_role(self, server):
     """Check that when the role used in the external user directory configuration
     is dynamically removed then privileges are removed from all
     LDAP users that are authenticated using external user directory.
@@ -221,7 +221,7 @@ def remove_privilege_by_removing_role(self, server, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Role_Readded_Privileges("1.0")
 )
-def readd_privilege_by_readding_role(self, server, timeout=20):
+def readd_privilege_by_readding_role(self, server):
     """Check that when the role used in the external user directory configuration
     is dynamically removed then all the privileges are removed from any
     LDAP users authenticated using external user directory but when the role is re-added
@@ -286,7 +286,7 @@ def readd_privilege_by_readding_role(self, server, timeout=20):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Role_NotPresent_Added("1.0")
 )
-def not_present_role_added(self, server, timeout=20):
+def not_present_role_added(self, server):
     """Check that when the role used in the external user directory configuration
     which was not present during LDAP user authentication
     is dynamically added then all the privileges granted by the role
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 8d0d1db976a..4bf76f373e0 100644
--- a/tests/testflows/ldap/external_user_directory/tests/server_config.py
+++ b/tests/testflows/ldap/external_user_directory/tests/server_config.py
@@ -41,7 +41,7 @@ def invalid_host(self):
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Invalid("1.0"),
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Host("1.0")
 )
-def empty_host(self, tail=30, timeout=60):
+def empty_host(self, tail=30, timeout=300):
     """Check that server returns an error when LDAP server
     host value is empty.
     """
@@ -57,7 +57,7 @@ def empty_host(self, tail=30, timeout=60):
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Invalid("1.0"),
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Host("1.0")
 )
-def missing_host(self, tail=30, timeout=60):
+def missing_host(self, tail=30, timeout=300):
     """Check that server returns an error when LDAP server
     host is missing.
     """
@@ -243,7 +243,7 @@ def auth_dn_value(self):
 @Requirements(
     RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_VerificationCooldown_Invalid("1.0")
 )
-def invalid_verification_cooldown_value(self, invalid_value, timeout=20):
+def invalid_verification_cooldown_value(self, invalid_value, timeout=300):
     """Check that server returns an error when LDAP server
     verification cooldown parameter is invalid.
     """
diff --git a/tests/testflows/ldap/regression.py b/tests/testflows/ldap/regression.py
index 579223c4b35..1e6ddc47bd1 100755
--- a/tests/testflows/ldap/regression.py
+++ b/tests/testflows/ldap/regression.py
@@ -4,6 +4,7 @@ from testflows.core import *
 
 append_path(sys.path, "..")
 
+from helpers.common import Pool, join, run_scenario
 from helpers.argparser import argparser
 
 @TestModule
@@ -12,11 +13,22 @@ from helpers.argparser import argparser
 def regression(self, local, clickhouse_binary_path, parallel=None, stress=None):
     """ClickHouse LDAP integration regression module.
     """
+    top().terminating = False
     args = {"local": local, "clickhouse_binary_path": clickhouse_binary_path}
 
-    Feature(test=load("ldap.authentication.regression", "regression"))(**args)
-    Feature(test=load("ldap.external_user_directory.regression", "regression"))(**args)
-    Feature(test=load("ldap.role_mapping.regression", "regression"))(**args)
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    tasks = []
+    with Pool(3) as pool:
+        try:
+            run_scenario(pool, tasks, Feature(test=load("ldap.authentication.regression", "regression")), args)
+            run_scenario(pool, tasks, Feature(test=load("ldap.external_user_directory.regression", "regression")), args)
+            run_scenario(pool, tasks, Feature(test=load("ldap.role_mapping.regression", "regression")), args)
+        finally:
+            join(tasks)
 
 if main():
     regression()
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
new file mode 100644
index 00000000000..0789decf022
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
@@ -0,0 +1,28 @@
+version: '2.3'
+
+services:
+  clickhouse:
+    image: yandex/clickhouse-integration-test
+    expose:
+      - "9000"
+      - "9009"
+      - "8123"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d/:/etc/clickhouse-server/users.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/ssl:/etc/clickhouse-server/ssl"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
+      - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
+      - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
+    entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
+    healthcheck:
+      test: clickhouse client --query='select 1'
+      interval: 10s
+      timeout: 10s
+      retries: 10
+      start_period: 300s
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/docker-compose.yml b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/docker-compose.yml
similarity index 100%
rename from tests/testflows/ldap/role_mapping/docker-compose/docker-compose.yml
rename to tests/testflows/ldap/role_mapping/ldap_role_mapping_env/docker-compose.yml
diff --git a/tests/testflows/ldap/external_user_directory/docker-compose/openldap-service.yml b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/openldap-service.yml
similarity index 92%
rename from tests/testflows/ldap/external_user_directory/docker-compose/openldap-service.yml
rename to tests/testflows/ldap/role_mapping/ldap_role_mapping_env/openldap-service.yml
index e489637b8c9..606ea3f723f 100644
--- a/tests/testflows/ldap/external_user_directory/docker-compose/openldap-service.yml
+++ b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/openldap-service.yml
@@ -21,14 +21,10 @@ services:
     security_opt:
       - label:disable
 
-
   phpldapadmin:
     image: osixia/phpldapadmin:0.9.0
-    container_name: phpldapadmin
     environment:
       PHPLDAPADMIN_HTTPS=false:
-    ports:
-      - "8080:80"
     healthcheck:
       test: echo 1
       interval: 10s
diff --git a/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/zookeeper-service.yml
similarity index 91%
rename from tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml
rename to tests/testflows/ldap/role_mapping/ldap_role_mapping_env/zookeeper-service.yml
index ca732a48dbd..6691a2df31c 100644
--- a/tests/testflows/ldap/role_mapping/docker-compose/zookeeper-service.yml
+++ b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/zookeeper-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   zookeeper:
-    image: zookeeper:3.6.2
+    image: zookeeper:3.4.12
     expose:
       - "2181"
     environment:
diff --git a/tests/testflows/ldap/role_mapping/regression.py b/tests/testflows/ldap/role_mapping/regression.py
index 7afb6c98713..b84fe3e827a 100755
--- a/tests/testflows/ldap/role_mapping/regression.py
+++ b/tests/testflows/ldap/role_mapping/regression.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import os
 import sys
 from testflows.core import *
 
@@ -11,6 +12,8 @@ from ldap.role_mapping.requirements import *
 # Cross-outs of known fails
 xfails = {
    "mapping/roles removed and added in parallel":
+       [(Fail, "known bug")],
+   "user dn detection/mapping/roles removed and added in parallel":
        [(Fail, "known bug")]
 }
 
@@ -27,21 +30,24 @@ xfails = {
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """ClickHouse LDAP role mapping regression module.
     """
+    top().terminating = False
     nodes = {
         "clickhouse": ("clickhouse1", "clickhouse2", "clickhouse3"),
     }
 
-    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "ldap_role_mapping_env")) as cluster:
         self.context.cluster = cluster
-        
-        if stress is not None or not hasattr(self.context, "stress"):
-            self.context.stress = stress
-        if parallel is not None or not hasattr(self.context, "parallel"):
-            self.context.parallel = parallel
 
         Scenario(run=load("ldap.authentication.tests.sanity", "scenario"), name="ldap sanity")
         Feature(run=load("ldap.role_mapping.tests.server_config", "feature"))
         Feature(run=load("ldap.role_mapping.tests.mapping", "feature"))
+        #Feature(run=load("ldap.role_mapping.tests.user_dn_detection", "feature"))
 
 if main():
     regression()
diff --git a/tests/testflows/ldap/role_mapping/requirements/requirements.md b/tests/testflows/ldap/role_mapping/requirements/requirements.md
index e79baa9cd7c..fbd772b9d29 100644
--- a/tests/testflows/ldap/role_mapping/requirements/requirements.md
+++ b/tests/testflows/ldap/role_mapping/requirements/requirements.md
@@ -44,6 +44,11 @@
     * 4.7.1 [BindDN Parameter](#binddn-parameter)
       * 4.7.1.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN](#rqsrs-014ldaprolemappingconfigurationserverbinddn)
       * 4.7.1.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN](#rqsrs-014ldaprolemappingconfigurationserverbinddnconflictwithauthdn)
+    * 4.7.2 [User DN Detection](#user-dn-detection)
+      * 4.7.2.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection](#rqsrs-014ldaprolemappingconfigurationserveruserdndetection)
+      * 4.7.2.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.BaseDN](#rqsrs-014ldaprolemappingconfigurationserveruserdndetectionbasedn)
+      * 4.7.2.3 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.Scope](#rqsrs-014ldaprolemappingconfigurationserveruserdndetectionscope)
+      * 4.7.2.4 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.SearchFilter](#rqsrs-014ldaprolemappingconfigurationserveruserdndetectionsearchfilter)
   * 4.8 [External User Directory Configuration](#external-user-directory-configuration)
     * 4.8.1 [Syntax](#syntax)
       * 4.8.1.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingsyntax)
@@ -318,6 +323,67 @@ version: 1.0
 [ClickHouse] SHALL return an error if both `<bind_dn>` and `<auth_dn_prefix>` or `<auth_dn_suffix>` parameters
 are specified as part of [LDAP] server description in the `<ldap_servers>` section of the `config.xml`.
 
+#### User DN Detection
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection
+version: 1.0
+
+[ClickHouse] SHALL support the `user_dn_detection` sub-section in the `<ldap_servers><server_name>` section
+of the `config.xml` that SHALL be used to enable detecting the actual user DN of the bound user. 
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.BaseDN
+version: 1.0
+
+[ClickHouse] SHALL support `base_dn` parameter in the `user_dn_detection` sub-section in the 
+`<ldap_servers><server_name>` section of the `config.xml` that SHALL specify how 
+to construct the base DN for the LDAP search to detect the actual user DN.
+
+For example,
+
+```xml
+<user_dn_detection>
+ ...
+ <base_dn>CN=Users,DC=example,DC=com</base_dn>
+</user_dn_detection>
+```
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.Scope
+version: 1.0
+
+[ClickHouse] SHALL support `scope` parameter in the `user_dn_detection` sub-section in the 
+`<ldap_servers><server_name>` section of the `config.xml` that SHALL the scope of the 
+LDAP search to detect the actual user DN. The `scope` parameter SHALL support the following values
+
+* `base`
+* `one_level`
+* `children`
+* `subtree`
+
+For example,
+
+```xml
+<user_dn_detection>
+ ...
+ <scope>one_level</scope>
+</user_dn_detection>
+```
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.SearchFilter
+version: 1.0
+
+[ClickHouse] SHALL support `search_filter` parameter in the `user_dn_detection` sub-section in the 
+`<ldap_servers><server_name>` section of the `config.xml` that SHALL specify the LDAP search
+filter used to detect the actual user DN.
+
+For example,
+
+```xml
+<user_dn_detection>
+ ...
+ <search_filter>(&amp;(objectClass=user)(sAMAccountName={user_name}))</search_filter>
+</user_dn_detection>
+```
+
 ### External User Directory Configuration
 
 #### Syntax
@@ -382,7 +448,7 @@ version: 1.0
 [ClickHouse] SHALL support the `<base_dn>` parameter in the `<user_directories><ldap><role_mapping>` section 
 of the `config.xml` that SHALL specify the template to be used to construct the base `DN` for the [LDAP] search.
 
-The resulting `DN` SHALL be constructed by replacing all the `{user_name}` and `{bind_dn}` substrings of 
+The resulting `DN` SHALL be constructed by replacing all the `{user_name}`, `{bind_dn}`, and `user_dn` substrings of 
 the template with the actual user name and bind `DN` during each [LDAP] search.
 
 #### Attribute Parameter
@@ -445,7 +511,7 @@ version: 1.0
 section of the `config.xml` that SHALL specify the template used to construct 
 the [LDAP filter](https://ldap.com/ldap-filters/) for the search.
 
-The resulting filter SHALL be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{base_dn}` substrings 
+The resulting filter SHALL be constructed by replacing all `{user_name}`, `{bind_dn}`, `{base_dn}`, and `{user_dn}` substrings 
 of the template with the actual user name, bind `DN`, and base `DN` during each the [LDAP] search.
  
 #### Prefix Parameter
diff --git a/tests/testflows/ldap/role_mapping/requirements/requirements.py b/tests/testflows/ldap/role_mapping/requirements/requirements.py
index b2748762e03..9c038f8b497 100644
--- a/tests/testflows/ldap/role_mapping/requirements/requirements.py
+++ b/tests/testflows/ldap/role_mapping/requirements/requirements.py
@@ -1,6 +1,6 @@
 # These requirements were auto generated
 # from software requirements specification (SRS)
-# document by TestFlows v1.6.210129.1222545.
+# document by TestFlows v1.6.210505.1133630.
 # Do not edit by hand but re-generate instead
 # using 'tfs requirements generate' command.
 from testflows.core import Specification
@@ -488,6 +488,105 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN_ConflictWith_AuthDN = Re
     level=4,
     num='4.7.1.2')
 
+RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support the `user_dn_detection` sub-section in the `<ldap_servers><server_name>` section\n'
+        'of the `config.xml` that SHALL be used to enable detecting the actual user DN of the bound user. \n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.7.2.1')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_BaseDN = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.BaseDN',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `base_dn` parameter in the `user_dn_detection` sub-section in the \n'
+        '`<ldap_servers><server_name>` section of the `config.xml` that SHALL specify how \n'
+        'to construct the base DN for the LDAP search to detect the actual user DN.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```xml\n'
+        '<user_dn_detection>\n'
+        ' ...\n'
+        ' <base_dn>CN=Users,DC=example,DC=com</base_dn>\n'
+        '</user_dn_detection>\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.7.2.2')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_Scope = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.Scope',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `scope` parameter in the `user_dn_detection` sub-section in the \n'
+        '`<ldap_servers><server_name>` section of the `config.xml` that SHALL the scope of the \n'
+        'LDAP search to detect the actual user DN. The `scope` parameter SHALL support the following values\n'
+        '\n'
+        '* `base`\n'
+        '* `one_level`\n'
+        '* `children`\n'
+        '* `subtree`\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```xml\n'
+        '<user_dn_detection>\n'
+        ' ...\n'
+        ' <scope>one_level</scope>\n'
+        '</user_dn_detection>\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.7.2.3')
+
+RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_SearchFilter = Requirement(
+    name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.SearchFilter',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `search_filter` parameter in the `user_dn_detection` sub-section in the \n'
+        '`<ldap_servers><server_name>` section of the `config.xml` that SHALL specify the LDAP search\n'
+        'filter used to detect the actual user DN.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```xml\n'
+        '<user_dn_detection>\n'
+        ' ...\n'
+        ' <search_filter>(&amp;(objectClass=user)(sAMAccountName={user_name}))</search_filter>\n'
+        '</user_dn_detection>\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='4.7.2.4')
+
 RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax = Requirement(
     name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax',
     version='1.0',
@@ -587,7 +686,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_BaseDN = Req
         '[ClickHouse] SHALL support the `<base_dn>` parameter in the `<user_directories><ldap><role_mapping>` section \n'
         'of the `config.xml` that SHALL specify the template to be used to construct the base `DN` for the [LDAP] search.\n'
         '\n'
-        'The resulting `DN` SHALL be constructed by replacing all the `{user_name}` and `{bind_dn}` substrings of \n'
+        'The resulting `DN` SHALL be constructed by replacing all the `{user_name}`, `{bind_dn}`, and `user_dn` substrings of \n'
         'the template with the actual user name and bind `DN` during each [LDAP] search.\n'
         '\n'
         ),
@@ -724,7 +823,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_SearchFilter
         'section of the `config.xml` that SHALL specify the template used to construct \n'
         'the [LDAP filter](https://ldap.com/ldap-filters/) for the search.\n'
         '\n'
-        'The resulting filter SHALL be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{base_dn}` substrings \n'
+        'The resulting filter SHALL be constructed by replacing all `{user_name}`, `{bind_dn}`, `{base_dn}`, and `{user_dn}` substrings \n'
         'of the template with the actual user name, bind `DN`, and base `DN` during each the [LDAP] search.\n'
         ' \n'
         ),
@@ -872,6 +971,11 @@ SRS_014_ClickHouse_LDAP_Role_Mapping = Specification(
         Heading(name='BindDN Parameter', level=3, num='4.7.1'),
         Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN', level=4, num='4.7.1.1'),
         Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN', level=4, num='4.7.1.2'),
+        Heading(name='User DN Detection', level=3, num='4.7.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection', level=4, num='4.7.2.1'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.BaseDN', level=4, num='4.7.2.2'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.Scope', level=4, num='4.7.2.3'),
+        Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.SearchFilter', level=4, num='4.7.2.4'),
         Heading(name='External User Directory Configuration', level=2, num='4.8'),
         Heading(name='Syntax', level=3, num='4.8.1'),
         Heading(name='RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax', level=4, num='4.8.1.1'),
@@ -930,6 +1034,10 @@ SRS_014_ClickHouse_LDAP_Role_Mapping = Specification(
         RQ_SRS_014_LDAP_RoleMapping_Authentication_Parallel_SameUser,
         RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN,
         RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN_ConflictWith_AuthDN,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_BaseDN,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_Scope,
+        RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_SearchFilter,
         RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax,
         RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_SpecialCharactersEscaping,
         RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_MultipleSections,
@@ -996,6 +1104,11 @@ SRS_014_ClickHouse_LDAP_Role_Mapping = Specification(
     * 4.7.1 [BindDN Parameter](#binddn-parameter)
       * 4.7.1.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN](#rqsrs-014ldaprolemappingconfigurationserverbinddn)
       * 4.7.1.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN](#rqsrs-014ldaprolemappingconfigurationserverbinddnconflictwithauthdn)
+    * 4.7.2 [User DN Detection](#user-dn-detection)
+      * 4.7.2.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection](#rqsrs-014ldaprolemappingconfigurationserveruserdndetection)
+      * 4.7.2.2 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.BaseDN](#rqsrs-014ldaprolemappingconfigurationserveruserdndetectionbasedn)
+      * 4.7.2.3 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.Scope](#rqsrs-014ldaprolemappingconfigurationserveruserdndetectionscope)
+      * 4.7.2.4 [RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.SearchFilter](#rqsrs-014ldaprolemappingconfigurationserveruserdndetectionsearchfilter)
   * 4.8 [External User Directory Configuration](#external-user-directory-configuration)
     * 4.8.1 [Syntax](#syntax)
       * 4.8.1.1 [RQ.SRS-014.LDAP.RoleMapping.Configuration.UserDirectory.RoleMapping.Syntax](#rqsrs-014ldaprolemappingconfigurationuserdirectoryrolemappingsyntax)
@@ -1270,6 +1383,67 @@ version: 1.0
 [ClickHouse] SHALL return an error if both `<bind_dn>` and `<auth_dn_prefix>` or `<auth_dn_suffix>` parameters
 are specified as part of [LDAP] server description in the `<ldap_servers>` section of the `config.xml`.
 
+#### User DN Detection
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection
+version: 1.0
+
+[ClickHouse] SHALL support the `user_dn_detection` sub-section in the `<ldap_servers><server_name>` section
+of the `config.xml` that SHALL be used to enable detecting the actual user DN of the bound user. 
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.BaseDN
+version: 1.0
+
+[ClickHouse] SHALL support `base_dn` parameter in the `user_dn_detection` sub-section in the 
+`<ldap_servers><server_name>` section of the `config.xml` that SHALL specify how 
+to construct the base DN for the LDAP search to detect the actual user DN.
+
+For example,
+
+```xml
+<user_dn_detection>
+ ...
+ <base_dn>CN=Users,DC=example,DC=com</base_dn>
+</user_dn_detection>
+```
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.Scope
+version: 1.0
+
+[ClickHouse] SHALL support `scope` parameter in the `user_dn_detection` sub-section in the 
+`<ldap_servers><server_name>` section of the `config.xml` that SHALL the scope of the 
+LDAP search to detect the actual user DN. The `scope` parameter SHALL support the following values
+
+* `base`
+* `one_level`
+* `children`
+* `subtree`
+
+For example,
+
+```xml
+<user_dn_detection>
+ ...
+ <scope>one_level</scope>
+</user_dn_detection>
+```
+
+##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.UserDNDetection.SearchFilter
+version: 1.0
+
+[ClickHouse] SHALL support `search_filter` parameter in the `user_dn_detection` sub-section in the 
+`<ldap_servers><server_name>` section of the `config.xml` that SHALL specify the LDAP search
+filter used to detect the actual user DN.
+
+For example,
+
+```xml
+<user_dn_detection>
+ ...
+ <search_filter>(&amp;(objectClass=user)(sAMAccountName={user_name}))</search_filter>
+</user_dn_detection>
+```
+
 ### External User Directory Configuration
 
 #### Syntax
@@ -1334,7 +1508,7 @@ version: 1.0
 [ClickHouse] SHALL support the `<base_dn>` parameter in the `<user_directories><ldap><role_mapping>` section 
 of the `config.xml` that SHALL specify the template to be used to construct the base `DN` for the [LDAP] search.
 
-The resulting `DN` SHALL be constructed by replacing all the `{user_name}` and `{bind_dn}` substrings of 
+The resulting `DN` SHALL be constructed by replacing all the `{user_name}`, `{bind_dn}`, and `user_dn` substrings of 
 the template with the actual user name and bind `DN` during each [LDAP] search.
 
 #### Attribute Parameter
@@ -1397,7 +1571,7 @@ version: 1.0
 section of the `config.xml` that SHALL specify the template used to construct 
 the [LDAP filter](https://ldap.com/ldap-filters/) for the search.
 
-The resulting filter SHALL be constructed by replacing all `{user_name}`, `{bind_dn}`, and `{base_dn}` substrings 
+The resulting filter SHALL be constructed by replacing all `{user_name}`, `{bind_dn}`, `{base_dn}`, and `{user_dn}` substrings 
 of the template with the actual user name, bind `DN`, and base `DN` during each the [LDAP] search.
  
 #### Prefix Parameter
diff --git a/tests/testflows/ldap/role_mapping/tests/common.py b/tests/testflows/ldap/role_mapping/tests/common.py
index 33ad4a46f52..565503296e3 100644
--- a/tests/testflows/ldap/role_mapping/tests/common.py
+++ b/tests/testflows/ldap/role_mapping/tests/common.py
@@ -24,11 +24,12 @@ def create_table(self, name, create_statement, on_cluster=False):
                 node.query(f"DROP TABLE IF EXISTS {name}")
 
 @TestStep(Given)
-def add_ldap_servers_configuration(self, servers, config_d_dir="/etc/clickhouse-server/config.d",
+def add_ldap_servers_configuration(self, servers, config=None, config_d_dir="/etc/clickhouse-server/config.d",
         config_file="ldap_servers.xml", timeout=60, restart=False):
     """Add LDAP servers configuration to config.xml.
     """
-    config = create_ldap_servers_config_content(servers, config_d_dir, config_file)
+    if config is None:
+        config = create_ldap_servers_config_content(servers, config_d_dir, config_file)
     return add_config(config, restart=restart)
 
 @TestStep(Given)
@@ -249,4 +250,4 @@ def create_ldap_external_user_directory_config_content(server=None, roles=None,
 def create_entries_ldap_external_user_directory_config_content(entries, **kwargs):
     """Create LDAP external user directory configuration file content.
     """
-    return create_xml_config_content(entries, **kwargs)
\ No newline at end of file
+    return create_xml_config_content(entries, **kwargs)
diff --git a/tests/testflows/ldap/role_mapping/tests/mapping.py b/tests/testflows/ldap/role_mapping/tests/mapping.py
index 97188199782..8076865ab1f 100644
--- a/tests/testflows/ldap/role_mapping/tests/mapping.py
+++ b/tests/testflows/ldap/role_mapping/tests/mapping.py
@@ -2,11 +2,11 @@
 from testflows.core import *
 from testflows.asserts import error
 
-from multiprocessing.dummy import Pool
+from helpers.common import Pool, join
 
 from ldap.role_mapping.requirements import *
 from ldap.role_mapping.tests.common import *
-from ldap.external_user_directory.tests.common import join, randomword
+from ldap.external_user_directory.tests.common import randomword
 
 from ldap.external_user_directory.tests.authentications import login_with_valid_username_and_password
 from ldap.external_user_directory.tests.authentications import login_with_invalid_username_and_valid_password
@@ -973,17 +973,16 @@ def group_removed_and_added_in_parallel(self, ldap_server, ldap_user, count=20,
                 role_mappings=role_mappings, restart=True)
 
         tasks = []
-        try:
-            with When("user try to login while LDAP groups are added and removed in parallel"):
-                p = Pool(15)
-                for i in range(15):
-                    tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                    tasks.append(p.apply_async(remove_ldap_groups_in_parallel, (groups, i, 10,)))
-                    tasks.append(p.apply_async(add_ldap_groups_in_parallel,(ldap_user, role_names, i, 10,)))
-
-        finally:
-            with Finally("it should work", flags=TE):
-                join(tasks, timeout)
+        with Pool(4) as pool:
+            try:
+                with When("user try to login while LDAP groups are added and removed in parallel"):
+                    for i in range(10):
+                        tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                        tasks.append(pool.apply_async(remove_ldap_groups_in_parallel, (groups, i, 10,)))
+                        tasks.append(pool.apply_async(add_ldap_groups_in_parallel,(ldap_user, role_names, i, 10,)))
+            finally:
+                with Finally("it should work", flags=TE):
+                    join(tasks, timeout)
     finally:
         with Finally("I clean up all LDAP groups"):
             for group in groups:
@@ -1026,17 +1025,16 @@ def user_removed_and_added_in_ldap_groups_in_parallel(self, ldap_server, ldap_us
             role_mappings=role_mappings, restart=True)
 
     tasks = []
-    try:
-        with When("user try to login while user is added and removed from LDAP groups in parallel"):
-            p = Pool(15)
-            for i in range(15):
-                tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                tasks.append(p.apply_async(remove_user_from_ldap_groups_in_parallel, (ldap_user, groups, i, 1,)))
-                tasks.append(p.apply_async(add_user_to_ldap_groups_in_parallel, (ldap_user, groups, i, 1,)))
-
-    finally:
-        with Finally("it should work", flags=TE):
-            join(tasks, timeout)
+    with Pool(4) as pool:
+        try:
+            with When("user try to login while user is added and removed from LDAP groups in parallel"):
+                for i in range(10):
+                    tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                    tasks.append(pool.apply_async(remove_user_from_ldap_groups_in_parallel, (ldap_user, groups, i, 1,)))
+                    tasks.append(pool.apply_async(add_user_to_ldap_groups_in_parallel, (ldap_user, groups, i, 1,)))
+        finally:
+            with Finally("it should work", flags=TE):
+                join(tasks, timeout)
 
 @TestScenario
 @Requirements(
@@ -1076,22 +1074,21 @@ def roles_removed_and_added_in_parallel(self, ldap_server, ldap_user, count=20,
             role_mappings=role_mappings, restart=True)
 
     tasks = []
-    try:
-        with When("user try to login while mapped roles are added and removed in parallel"):
-            p = Pool(15)
-            for i in range(15):
-                tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                tasks.append(p.apply_async(remove_roles_in_parallel, (role_names, i, 10,)))
-                tasks.append(p.apply_async(add_roles_in_parallel, (role_names, i, 10,)))
+    with Pool(4) as pool:
+        try:
+            with When("user try to login while mapped roles are added and removed in parallel"):
+                for i in range(10):
+                    tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                    tasks.append(pool.apply_async(remove_roles_in_parallel, (role_names, i, 10,)))
+                    tasks.append(pool.apply_async(add_roles_in_parallel, (role_names, i, 10,)))
+        finally:
+            with Finally("it should work", flags=TE):
+                join(tasks, timeout)
 
-    finally:
-        with Finally("it should work", flags=TE):
-            join(tasks, timeout)
-
-        with And("I clean up all the roles"):
-            for role_name in role_names:
-                with By(f"dropping role {role_name}", flags=TE):
-                    self.context.node.query(f"DROP ROLE IF EXISTS {role_name}")
+            with And("I clean up all the roles"):
+                for role_name in role_names:
+                    with By(f"dropping role {role_name}", flags=TE):
+                        self.context.node.query(f"DROP ROLE IF EXISTS {role_name}")
 
 @TestOutline
 def parallel_login(self, ldap_server, ldap_user, user_count=10, timeout=200, role_count=10):
@@ -1132,21 +1129,20 @@ def parallel_login(self, ldap_server, ldap_user, user_count=10, timeout=200, rol
             role_mappings=role_mappings, restart=True)
 
     tasks = []
-    try:
-        with When("users try to login in parallel", description="""
-            * with valid username and password
-            * with invalid username and valid password
-            * with valid username and invalid password
-            """):
-            p = Pool(15)
-            for i in range(25):
-                tasks.append(p.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
-                tasks.append(p.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
-                tasks.append(p.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
-
-    finally:
-        with Then("it should work"):
-            join(tasks, timeout)
+    with Pool(4) as pool:
+        try:
+            with When("users try to login in parallel", description="""
+                * with valid username and password
+                * with invalid username and valid password
+                * with valid username and invalid password
+                """):
+                for i in range(10):
+                    tasks.append(pool.apply_async(login_with_valid_username_and_password, (users, i, 50,)))
+                    tasks.append(pool.apply_async(login_with_valid_username_and_invalid_password, (users, i, 50,)))
+                    tasks.append(pool.apply_async(login_with_invalid_username_and_valid_password, (users, i, 50,)))
+        finally:
+            with Then("it should work"):
+                join(tasks, timeout)
 
 @TestScenario
 @Requirements(
@@ -1313,22 +1309,20 @@ def parallel_login_with_multiple_servers(self, ldap_server, ldap_user, user_coun
                     self.context.node.query(f"GRANT {role_name} TO {user['cn']}")
 
     tasks = []
-
-    try:
-        with When("users in each group try to login in parallel", description="""
-            * with valid username and password
-            * with invalid username and valid password
-            * with valid username and invalid password
-            """):
-            p = Pool(15)
-            for i in range(25):
-                for users in user_groups.values():
-                    for check in checks:
-                        tasks.append(p.apply_async(check, (users, i, 50,)))
-
-    finally:
-        with Then("it should work"):
-            join(tasks, timeout)
+    with Pool(4) as pool:
+        try:
+            with When("users in each group try to login in parallel", description="""
+                * with valid username and password
+                * with invalid username and valid password
+                * with valid username and invalid password
+                """):
+                for i in range(10):
+                    for users in user_groups.values():
+                        for check in checks:
+                            tasks.append(pool.apply_async(check, (users, i, 50,)))
+        finally:
+            with Then("it should work"):
+                join(tasks, timeout)
 
 @TestFeature
 @Name("mapping")
diff --git a/tests/testflows/ldap/role_mapping/tests/user_dn_detection.py b/tests/testflows/ldap/role_mapping/tests/user_dn_detection.py
new file mode 100644
index 00000000000..147da8a5dcc
--- /dev/null
+++ b/tests/testflows/ldap/role_mapping/tests/user_dn_detection.py
@@ -0,0 +1,474 @@
+# -*- coding: utf-8 -*-
+import importlib
+
+from testflows.core import *
+from testflows.asserts import error
+
+from ldap.role_mapping.requirements import *
+from ldap.role_mapping.tests.common import *
+
+@TestOutline
+def check_config(self, entries, valid=True, ldap_server="openldap1", user="user1", password="user1"):
+    """Apply LDAP server configuration and check login.
+    """
+    if valid:
+        exitcode = 0
+        message = "1"
+    else:
+        exitcode = 4
+        message = "DB::Exception: user1: Authentication failed: password is incorrect or there is no user with such name"
+
+    with Given("I add LDAP server configuration"):
+        config = create_xml_config_content(entries=entries, config_file="ldap_servers.xml")
+        add_ldap_servers_configuration(servers=None, config=config)
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=ldap_server,
+            role_mappings=None, restart=True)
+
+    with When(f"I login I try to login as an LDAP user"):
+        r = self.context.node.query(f"SELECT 1", settings=[
+            ("user", user), ("password", password)], exitcode=exitcode, message=message)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_BaseDN("1.0")
+)
+def config_invalid_base_dn(self):
+    """Check when invalid `base_dn` is specified in the user_dn_detection section.
+    """
+
+    with Given("I define LDAP server configuration with invalid base_dn"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "base_dn": "ou=user,dc=company,dc=com",
+                            "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))"
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=False)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_BaseDN("1.0")
+)
+def config_empty_base_dn(self):
+    """Check when empty `base_dn` is specified in the user_dn_detection section.
+    """
+    with Given("I define LDAP server configuration with invalid base_dn"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "base_dn": "",
+                            "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))"
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=False)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_BaseDN("1.0")
+)
+def config_missing_base_dn(self):
+    """Check when missing `base_dn` is specified in the user_dn_detection section.
+    """
+    with Given("I define LDAP server configuration with invalid base_dn"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))"
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=False)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    # FIXME
+)
+def config_invalid_search_filter(self):
+    """Check when invalid `search_filter` is specified in the user_dn_detection section.
+    """
+    with Given("I define LDAP server configuration with invalid search_filter"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "base_dn": "ou=users,dc=company,dc=com",
+                            "search_filter": "(&(objectClass=inetOrgPersons)(uid={user_name}))"
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=False)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_SearchFilter("1.0")
+)
+def config_missing_search_filter(self):
+    """Check when missing `search_filter` is specified in the user_dn_detection section.
+    """
+    with Given("I define LDAP server configuration with invalid search_filter"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "base_dn": "ou=users,dc=company,dc=com",
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=False)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_SearchFilter("1.0")
+)
+def config_empty_search_filter(self):
+    """Check when empty `search_filter` is specified in the user_dn_detection section.
+    """
+    with Given("I define LDAP server configuration with invalid search_filter"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "base_dn": "ou=users,dc=company,dc=com",
+                            "search_filter": ""
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=False)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_BaseDN("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_SearchFilter("1.0")
+)
+def config_valid(self):
+    """Check valid config with valid user_dn_detection section.
+    """
+    with Given("I define LDAP server configuration"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "base_dn": "ou=users,dc=company,dc=com",
+                            "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))"
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=True)
+
+@TestScenario
+@Tags("config")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_BaseDN("1.0"),
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_SearchFilter("1.0")
+)
+def config_valid_tls_connection(self):
+    """Check valid config with valid user_dn_detection section when
+    using LDAP that is configured to use TLS connection.
+    """
+    with Given("I define LDAP server configuration"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap2": {
+                        "host": "openldap2",
+                        "port": "636",
+                        "enable_tls": "yes",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "tls_require_cert": "never",
+                        "user_dn_detection": {
+                            "base_dn": "ou=users,dc=company,dc=com",
+                            "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))"
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=True, ldap_server="openldap2", user="user2", password="user2")
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection_Scope("1.0")
+)
+@Examples("scope base_dn", [
+    ("base", "cn=user1,ou=users,dc=company,dc=com"),
+    ("one_level","ou=users,dc=company,dc=com"),
+    ("children","ou=users,dc=company,dc=com"),
+    ("subtree","ou=users,dc=company,dc=com") # default value
+])
+def check_valid_scope_values(self, scope, base_dn):
+    """Check configuration with valid scope values.
+    """
+    with Given("I define LDAP server configuration"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                        "user_dn_detection": {
+                            "base_dn": base_dn,
+                            "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))",
+                            "scope": scope
+                        }
+                    }
+                }
+            ]
+        }
+
+    check_config(entries=entries, valid=True)
+
+@TestSuite
+def mapping(self):
+    """Run all role mapping tests with both
+    openldap1 and openldap2 configured to use
+    user DN detection.
+    """
+    users = [
+        {"server": "openldap1", "username": "user1", "password": "user1", "login": True,
+         "dn": "cn=user1,ou=users,dc=company,dc=com"},
+    ]
+
+    entries = {
+        "ldap_servers": [
+            {
+                "openldap1": {
+                    "host": "openldap1",
+                    "port": "389",
+                    "enable_tls": "no",
+                    "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                    "user_dn_detection": {
+                        "base_dn": "ou=users,dc=company,dc=com",
+                        "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))"
+                    }
+                },
+                "openldap2": {
+                    "host": "openldap2",
+                    "port": "636",
+                    "enable_tls": "yes",
+                    "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                    "tls_require_cert": "never",
+                    "user_dn_detection": {
+                        "base_dn": "ou=users,dc=company,dc=com",
+                        "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))"
+                    }
+                }
+            },
+        ]
+    }
+
+    with Given("I add LDAP servers configuration"):
+        config = create_xml_config_content(entries=entries, config_file="ldap_servers.xml")
+        add_ldap_servers_configuration(servers=None, config=config)
+
+    for scenario in loads(importlib.import_module("ldap.role_mapping.tests.mapping"), Scenario):
+        scenario(ldap_server="openldap1", ldap_user=users[0])
+
+@TestOutline
+def setup_different_bind_dn_and_user_dn(self, uid, map_by, user_dn_detection):
+    """Check that roles get mapped properly when bind_dn and user_dn are different
+    by creating LDAP users that have switched uid parameter values.
+    """
+    with Given("I define LDAP server configuration"):
+        entries = {
+            "ldap_servers": [
+                {
+                    "openldap1": {
+                        "host": "openldap1",
+                        "port": "389",
+                        "enable_tls": "no",
+                        "bind_dn": "cn={user_name},ou=users,dc=company,dc=com",
+                    }
+                }
+            ]
+        }
+
+    if user_dn_detection:
+        with And("I enable user dn detection"):
+            entries["ldap_servers"][0]["openldap1"]["user_dn_detection"] = {
+                "base_dn": "ou=users,dc=company,dc=com",
+                "search_filter": "(&(objectClass=inetOrgPerson)(uid={user_name}))",
+                "scope": "subtree"
+            }
+
+    with And("I define role mappings"):
+        role_mappings = [
+            {
+                "base_dn": "ou=groups,dc=company,dc=com",
+                "attribute": "cn",
+                "search_filter": f"(&(objectClass=groupOfUniqueNames)(uniquemember={{{map_by}}}))",
+                "prefix":""
+            }
+        ]
+
+    with Given("I add LDAP users"):
+        first_user = add_ldap_users(users=[
+            {"cn": f"first_user", "userpassword": "user", "uid": "second_user"}
+        ])[0]
+
+        second_user = add_ldap_users(users=[
+            {"cn": f"second_user", "userpassword": "user", "uid": "first_user"}
+        ])[0]
+
+    with Given("I add LDAP groups"):
+        groups = add_ldap_groups(groups=({"cn": f"role0_{uid}"}, {"cn": f"role1_{uid}"}))
+
+    with And("I add LDAP user to each LDAP group"):
+        with By("adding first group to first user"):
+            add_user_to_group_in_ldap(user=first_user, group=groups[0])
+        with And("adding second group to second user"):
+            add_user_to_group_in_ldap(user=second_user, group=groups[1])
+
+    with And("I add RBAC roles"):
+        roles = add_rbac_roles(roles=(f"role0_{uid}", f"role1_{uid}"))
+
+    with Given("I add LDAP server configuration"):
+        config = create_xml_config_content(entries=entries, config_file="ldap_servers.xml")
+        add_ldap_servers_configuration(servers=None, config=config)
+
+    with And("I add LDAP external user directory configuration"):
+        add_ldap_external_user_directory(server=self.context.ldap_node.name,
+            role_mappings=role_mappings, restart=True)
+
+@TestScenario
+def map_roles_by_user_dn_when_base_dn_and_user_dn_are_different(self):
+    """Check the case when we map roles using user_dn then
+    the first user has uid of second user and second user
+    has uid of first user and configuring user DN detection to
+    determine user_dn based on the uid value so that user_dn
+    for the first user will be bind_dn of the second user and
+    vice versa.
+    """
+    uid = getuid()
+
+    setup_different_bind_dn_and_user_dn(uid=uid, map_by="user_dn", user_dn_detection=True)
+
+    with When(f"I login as first LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", "first_user"), ("password", "user")])
+
+    with Then("I expect the first user to have mapped LDAP roles from second user"):
+        assert f"GRANT role1_{uid} TO first_user" in r.output, error()
+
+    with When(f"I login as second LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", "second_user"), ("password", "user")])
+
+    with Then("I expect the second user to have mapped LDAP roles from first user"):
+        assert f"GRANT role0_{uid} TO second_user" in r.output, error()
+
+@TestScenario
+def map_roles_by_bind_dn_when_base_dn_and_user_dn_are_different(self):
+    """Check the case when we map roles by bind_dn when bind_dn and user_dn
+    are different.
+    """
+    uid = getuid()
+
+    setup_different_bind_dn_and_user_dn(uid=uid, map_by="bind_dn", user_dn_detection=True)
+
+    with When(f"I login as first LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", "first_user"), ("password", "user")])
+
+    with Then("I expect the first user to have no mapped LDAP roles"):
+        assert f"GRANT role0_{uid} TO first_user" == r.output, error()
+
+    with When(f"I login as second LDAP user"):
+        r = self.context.node.query(f"SHOW GRANTS", settings=[
+            ("user", "second_user"), ("password", "user")])
+
+    with Then("I expect the second user to have no mapped LDAP roles"):
+        assert f"GRANT role1_{uid} TO second_user" in r.output, error()
+
+@TestFeature
+@Name("user dn detection")
+@Requirements(
+    RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_UserDNDetection("1.0")
+)
+def feature(self):
+    """Check LDAP user DN detection.
+    """
+    self.context.node = self.context.cluster.node("clickhouse1")
+    self.context.ldap_node = self.context.cluster.node("openldap1")
+
+    with Given("I fix LDAP access permissions"):
+        fix_ldap_permissions(node=self.context.cluster.node("openldap1"))
+        fix_ldap_permissions(node=self.context.cluster.node("openldap2"))
+
+    for scenario in ordered(loads(current_module(), Scenario)):
+        scenario()
+
+    Suite(run=mapping)
diff --git a/tests/testflows/map_type/__init__.py b/tests/testflows/map_type/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml b/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml
new file mode 100644
index 00000000000..e5077af3f49
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml
@@ -0,0 +1,16 @@
+<yandex>
+    <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>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+        <flush_interval_milliseconds>500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/macros.xml b/tests/testflows/map_type/configs/clickhouse/config.d/macros.xml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml b/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml
new file mode 100644
index 00000000000..b7d02ceeec1
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<yandex>
+    <remote_servers>
+        <replicated_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </replicated_cluster>
+        <sharded_cluster>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </sharded_cluster>
+    </remote_servers>
+</yandex>
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/map_type/configs/clickhouse/config.d/zookeeper.xml
new file mode 100644
index 00000000000..96270e7b645
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse/config.d/zookeeper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<yandex>
+    <zookeeper>
+	    <node index="1">
+		    <host>zookeeper</host>
+		    <port>2181</port>
+	    </node>
+        <session_timeout_ms>15000</session_timeout_ms>
+    </zookeeper>
+</yandex>
diff --git a/tests/testflows/map_type/configs/clickhouse/config.xml b/tests/testflows/map_type/configs/clickhouse/config.xml
new file mode 100644
index 00000000000..4ec12232539
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse/config.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0"?>
+<!--
+  NOTE: User and query level settings are set up in "users.xml" file.
+-->
+<yandex>
+    <logger>
+        <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+    <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+
+    <!-- For HTTPS and SSL over native protocol. -->
+    <!--
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+    -->
+
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <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>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
+            <dhParamsFile>/etc/clickhouse-server/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 -->
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <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>
+    -->
+
+    <!-- Port for communication between replicas. Used for data exchange. -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analoguous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface.
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- Listen specified host. use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere. -->
+    <!-- <listen_host>::</listen_host> -->
+    <!-- Same for hosts with disabled ipv6: -->
+    <listen_host>0.0.0.0</listen_host>
+
+    <!-- Default values - try listen localhost on ipv4 and ipv6: -->
+    <!--
+    <listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host>
+    -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!-- <listen_try>0</listen_try> -->
+
+    <!-- Allow listen on same address:port -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Path to folder where users and roles created by SQL commands are stored. -->
+    <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories>
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+
+    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
+    <users_config>users.xml</users_config>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- System profile of settings. This settings are used by internal processes (Buffer storage, Distibuted DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Perform mlockall after startup to lower first queries latency
+          and to prevent clickhouse executable from being paged out under high IO load.
+         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+    -->
+    <mlock_executable>false</mlock_executable>
+
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.yandex/docs/en/table_engines/distributed/
+      -->
+    <remote_servers incl="clickhouse_remote_servers" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+         </test_cluster_two_shards_localhost>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </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.
+      -->
+
+    <!-- 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/
+      -->
+    <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
+      -->
+    <macros incl="macros" optional="true" />
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+
+    <!-- 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.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <!-- Trace log. Stores stack traces collected by query profilers.
+         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <!-- Query thread log. Has information about all threads participated in query execution.
+         Used only for queries with setting log_query_threads = 1. -->
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </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>
+        <database>system</database>
+        <table>part_log</table>
+        <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.
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+    -->
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <compression incl="clickhouse_compression">
+    <!--
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    -->
+    </compression>
+
+    <!-- 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. -->
+    <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> -->
+    </distributed_ddl>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to restart clickhouse-server, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>
diff --git a/tests/testflows/map_type/configs/clickhouse/users.xml b/tests/testflows/map_type/configs/clickhouse/users.xml
new file mode 100644
index 00000000000..86b2cd9e1e3
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse/users.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<yandex>
+    <!-- Profiles of settings. -->
+    <profiles>
+        <!-- Default settings. -->
+        <default>
+            <!-- Maximum memory usage for processing single query, in bytes. -->
+            <max_memory_usage>10000000000</max_memory_usage>
+
+            <!-- Use cache of uncompressed blocks of data. Meaningful only for processing many of very short queries. -->
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+
+            <!-- How to choose between replicas during distributed query processing.
+                 random - choose random replica from set of replicas with minimum number of errors
+                 nearest_hostname - from set of replicas with minimum number of errors, choose replica
+                  with minimum number of different symbols between replica's hostname and local hostname
+                  (Hamming distance).
+                 in_order - first live replica is chosen in specified order.
+                 first_or_random - if first replica one has higher number of errors, pick a random one from replicas with minimum number of errors.
+            -->
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <!-- Profile that allows only read queries. -->
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <!-- Users and ACL. -->
+    <users>
+        <!-- If user name was not specified, 'default' user is used. -->
+        <default>
+            <!-- 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>.
+                 Password could be empty.
+
+                 If you want to specify SHA256, place it in 'password_sha256_hex' element.
+                 Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
+                 Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
+
+                 If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
+                 Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
+
+                 How to generate decent password:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+                 In first line will be password and in second - corresponding SHA256.
+
+                 How to generate double SHA1:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | openssl dgst -sha1 -binary | openssl dgst -sha1
+                 In first line will be password and in second - corresponding double SHA1.
+            -->
+            <password></password>
+
+            <!-- List of networks with open access.
+
+                 To open access from everywhere, specify:
+                    <ip>::/0</ip>
+
+                 To open access only from localhost, specify:
+                    <ip>::1</ip>
+                    <ip>127.0.0.1</ip>
+
+                 Each element of list has one of the following forms:
+                 <ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+                     2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+                 <host> Hostname. Example: server01.yandex.ru.
+                     To check access, DNS query is performed, and all received addresses compared to peer address.
+                 <host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+                     To check access, DNS PTR query is performed for peer address and then regexp is applied.
+                     Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+                     Strongly recommended that regexp is ends with $
+                 All results of DNS requests are cached till server restart.
+            -->
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+
+            <!-- Settings profile for user. -->
+            <profile>default</profile>
+
+            <!-- Quota for user. -->
+            <quota>default</quota>
+
+            <!-- Allow access management -->
+            <access_management>1</access_management>
+
+            <!-- Example of row level security policy. -->
+            <!-- <databases>
+                <test>
+                    <filtered_table1>
+                        <filter>a = 1</filter>
+                    </filtered_table1>
+                    <filtered_table2>
+                        <filter>a + b &lt; 1 or c - d &gt; 5</filter>
+                    </filtered_table2>
+                </test>
+            </databases> -->
+        </default>
+
+        <!-- Example of user with readonly access. -->
+        <!-- <readonly>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>readonly</profile>
+            <quota>default</quota>
+        </readonly> -->
+    </users>
+
+    <!-- Quotas. -->
+    <quotas>
+        <!-- Name of quota. -->
+        <default>
+            <!-- Limits for time interval. You could specify many intervals with different limits. -->
+            <interval>
+                <!-- Length of interval. -->
+                <duration>3600</duration>
+
+                <!-- No limits. Just calculate resource usage for time interval. -->
+                <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>
diff --git a/tests/testflows/map_type/configs/clickhouse1/config.d/macros.xml b/tests/testflows/map_type/configs/clickhouse1/config.d/macros.xml
new file mode 100644
index 00000000000..6cdcc1b440c
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse1/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse1</replica>
+        <shard>01</shard>
+        <shard2>01</shard2>
+    </macros>
+</yandex>
diff --git a/tests/testflows/map_type/configs/clickhouse2/config.d/macros.xml b/tests/testflows/map_type/configs/clickhouse2/config.d/macros.xml
new file mode 100644
index 00000000000..a114a9ce4ab
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse2/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse2</replica>
+        <shard>01</shard>
+        <shard2>02</shard2>
+    </macros>
+</yandex>
diff --git a/tests/testflows/map_type/configs/clickhouse3/config.d/macros.xml b/tests/testflows/map_type/configs/clickhouse3/config.d/macros.xml
new file mode 100644
index 00000000000..904a27b0172
--- /dev/null
+++ b/tests/testflows/map_type/configs/clickhouse3/config.d/macros.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse3</replica>
+        <shard>01</shard>
+        <shard2>03</shard2>
+    </macros>
+</yandex>
diff --git a/tests/testflows/map_type/map_type_env/clickhouse-service.yml b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
new file mode 100755
index 00000000000..fdd4a8057a9
--- /dev/null
+++ b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
@@ -0,0 +1,27 @@
+version: '2.3'
+
+services:
+  clickhouse:
+    image: yandex/clickhouse-integration-test
+    expose:
+      - "9000"
+      - "9009"
+      - "8123"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d:/etc/clickhouse-server/users.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
+      - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
+      - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
+    entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
+    healthcheck:
+      test: clickhouse client --query='select 1'
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/rbac/docker-compose/docker-compose.yml b/tests/testflows/map_type/map_type_env/docker-compose.yml
similarity index 100%
rename from tests/testflows/rbac/docker-compose/docker-compose.yml
rename to tests/testflows/map_type/map_type_env/docker-compose.yml
diff --git a/tests/testflows/rbac/docker-compose/zookeeper-service.yml b/tests/testflows/map_type/map_type_env/zookeeper-service.yml
similarity index 100%
rename from tests/testflows/rbac/docker-compose/zookeeper-service.yml
rename to tests/testflows/map_type/map_type_env/zookeeper-service.yml
diff --git a/tests/testflows/map_type/regression.py b/tests/testflows/map_type/regression.py
new file mode 100755
index 00000000000..b239d91ccf9
--- /dev/null
+++ b/tests/testflows/map_type/regression.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+from testflows.core import *
+
+append_path(sys.path, "..")
+
+from helpers.cluster import Cluster
+from helpers.argparser import argparser
+from map_type.requirements import SRS018_ClickHouse_Map_Data_Type
+
+xfails = {
+    "tests/table map with key integer/Int:":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21032")],
+    "tests/table map with value integer/Int:":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21032")],
+    "tests/table map with key integer/UInt256":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21031")],
+    "tests/table map with value integer/UInt256":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21031")],
+    "tests/select map with key integer/Int64":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21030")],
+    "tests/select map with value integer/Int64":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21030")],
+    "tests/cast tuple of two arrays to map/string -> int":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21029")],
+    "tests/mapcontains/null key in map":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
+    "tests/mapcontains/null key not in map":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
+    "tests/mapkeys/null key not in map":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
+    "tests/mapkeys/null key in map":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
+    "tests/mapcontains/select nullable key":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")],
+    "tests/mapkeys/select keys from column":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")],
+    "tests/table map select key with value string/LowCardinality:":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21406")],
+    "tests/table map select key with key string/FixedString":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21406")],
+    "tests/table map select key with key string/Nullable":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21406")],
+    "tests/table map select key with key string/Nullable(NULL)":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")],
+    "tests/table map select key with key string/LowCardinality:":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21406")],
+    "tests/table map select key with key integer/Int:":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21032")],
+    "tests/table map select key with key integer/UInt256":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21031")],
+    "tests/table map select key with key integer/toNullable":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21406")],
+    "tests/table map select key with key integer/toNullable(NULL)":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")],
+    "tests/select map with key integer/Int128":
+        [(Fail, "large Int128 as key not supported")],
+    "tests/select map with key integer/Int256":
+        [(Fail, "large Int256 as key not supported")],
+    "tests/select map with key integer/UInt256":
+        [(Fail, "large UInt256 as key not supported")],
+    "tests/select map with key integer/toNullable":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/select map with key integer/toNullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/select map with key string/Nullable":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/select map with key string/Nullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map queries/select map with nullable value":
+        [(Fail, "Nullable value not supported")],
+    "tests/table map with key integer/toNullable":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key integer/toNullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key string/Nullable":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key string/Nullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key string/LowCardinality(String)":
+        [(Fail, "LowCardinality(String) as key not supported")],
+    "tests/table map with key string/LowCardinality(String) cast from String":
+        [(Fail, "LowCardinality(String) as key not supported")],
+    "tests/table map with key string/LowCardinality(String) for key and value":
+        [(Fail, "LowCardinality(String) as key not supported")],
+    "tests/table map with key string/LowCardinality(FixedString)":
+        [(Fail, "LowCardinality(FixedString) as key not supported")],
+    "tests/table map with value string/LowCardinality(String) for key and value":
+        [(Fail, "LowCardinality(String) as key not supported")],
+}
+
+xflags = {
+}
+
+@TestModule
+@ArgumentParser(argparser)
+@XFails(xfails)
+@XFlags(xflags)
+@Name("map type")
+@Specifications(
+    SRS018_ClickHouse_Map_Data_Type
+)
+def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
+    """Map type regression.
+    """
+    top().terminating = False
+    nodes = {
+        "clickhouse":
+            ("clickhouse1", "clickhouse2", "clickhouse3")
+    }
+
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "map_type_env")) as cluster:
+        self.context.cluster = cluster
+
+        Feature(run=load("map_type.tests.feature", "feature"))
+
+if main():
+    regression()
diff --git a/tests/testflows/map_type/requirements/__init__.py b/tests/testflows/map_type/requirements/__init__.py
new file mode 100644
index 00000000000..02f7d430154
--- /dev/null
+++ b/tests/testflows/map_type/requirements/__init__.py
@@ -0,0 +1 @@
+from .requirements import *
diff --git a/tests/testflows/map_type/requirements/requirements.md b/tests/testflows/map_type/requirements/requirements.md
new file mode 100644
index 00000000000..f19f5a7f7bd
--- /dev/null
+++ b/tests/testflows/map_type/requirements/requirements.md
@@ -0,0 +1,512 @@
+# SRS018 ClickHouse Map Data Type
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Requirements](#requirements)
+  * 3.1 [General](#general)
+    * 3.1.1 [RQ.SRS-018.ClickHouse.Map.DataType](#rqsrs-018clickhousemapdatatype)
+  * 3.2 [Performance](#performance)
+    * 3.2.1 [RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.ArrayOfTuples](#rqsrs-018clickhousemapdatatypeperformancevsarrayoftuples)
+    * 3.2.2 [RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.TupleOfArrays](#rqsrs-018clickhousemapdatatypeperformancevstupleofarrays)
+  * 3.3 [Key Types](#key-types)
+    * 3.3.1 [RQ.SRS-018.ClickHouse.Map.DataType.Key.String](#rqsrs-018clickhousemapdatatypekeystring)
+    * 3.3.2 [RQ.SRS-018.ClickHouse.Map.DataType.Key.Integer](#rqsrs-018clickhousemapdatatypekeyinteger)
+  * 3.4 [Value Types](#value-types)
+    * 3.4.1 [RQ.SRS-018.ClickHouse.Map.DataType.Value.String](#rqsrs-018clickhousemapdatatypevaluestring)
+    * 3.4.2 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Integer](#rqsrs-018clickhousemapdatatypevalueinteger)
+    * 3.4.3 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Array](#rqsrs-018clickhousemapdatatypevaluearray)
+  * 3.5 [Invalid Types](#invalid-types)
+    * 3.5.1 [RQ.SRS-018.ClickHouse.Map.DataType.Invalid.Nullable](#rqsrs-018clickhousemapdatatypeinvalidnullable)
+    * 3.5.2 [RQ.SRS-018.ClickHouse.Map.DataType.Invalid.NothingNothing](#rqsrs-018clickhousemapdatatypeinvalidnothingnothing)
+  * 3.6 [Duplicated Keys](#duplicated-keys)
+    * 3.6.1 [RQ.SRS-018.ClickHouse.Map.DataType.DuplicatedKeys](#rqsrs-018clickhousemapdatatypeduplicatedkeys)
+  * 3.7 [Array of Maps](#array-of-maps)
+    * 3.7.1 [RQ.SRS-018.ClickHouse.Map.DataType.ArrayOfMaps](#rqsrs-018clickhousemapdatatypearrayofmaps)
+  * 3.8 [Nested With Maps](#nested-with-maps)
+    * 3.8.1 [RQ.SRS-018.ClickHouse.Map.DataType.NestedWithMaps](#rqsrs-018clickhousemapdatatypenestedwithmaps)
+  * 3.9 [Value Retrieval](#value-retrieval)
+    * 3.9.1 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval](#rqsrs-018clickhousemapdatatypevalueretrieval)
+    * 3.9.2 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyInvalid](#rqsrs-018clickhousemapdatatypevalueretrievalkeyinvalid)
+    * 3.9.3 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyNotFound](#rqsrs-018clickhousemapdatatypevalueretrievalkeynotfound)
+  * 3.10 [Converting Tuple(Array, Array) to Map](#converting-tuplearray-array-to-map)
+    * 3.10.1 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysToMap](#rqsrs-018clickhousemapdatatypeconversionfromtupleofarraystomap)
+    * 3.10.2 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysMap.Invalid](#rqsrs-018clickhousemapdatatypeconversionfromtupleofarraysmapinvalid)
+  * 3.11 [Converting Array(Tuple(K,V)) to Map](#converting-arraytuplekv-to-map)
+    * 3.11.1 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap](#rqsrs-018clickhousemapdatatypeconversionfromarrayoftuplestomap)
+    * 3.11.2 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap.Invalid](#rqsrs-018clickhousemapdatatypeconversionfromarrayoftuplestomapinvalid)
+  * 3.12 [Keys and Values Subcolumns](#keys-and-values-subcolumns)
+    * 3.12.1 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys](#rqsrs-018clickhousemapdatatypesubcolumnskeys)
+    * 3.12.2 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.ArrayFunctions](#rqsrs-018clickhousemapdatatypesubcolumnskeysarrayfunctions)
+    * 3.12.3 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.InlineDefinedMap](#rqsrs-018clickhousemapdatatypesubcolumnskeysinlinedefinedmap)
+    * 3.12.4 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values](#rqsrs-018clickhousemapdatatypesubcolumnsvalues)
+    * 3.12.5 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.ArrayFunctions](#rqsrs-018clickhousemapdatatypesubcolumnsvaluesarrayfunctions)
+    * 3.12.6 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.InlineDefinedMap](#rqsrs-018clickhousemapdatatypesubcolumnsvaluesinlinedefinedmap)
+  * 3.13 [Functions](#functions)
+    * 3.13.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.InlineDefinedMap](#rqsrs-018clickhousemapdatatypefunctionsinlinedefinedmap)
+    * 3.13.2 [`length`](#length)
+      * 3.13.2.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Length](#rqsrs-018clickhousemapdatatypefunctionslength)
+    * 3.13.3 [`empty`](#empty)
+      * 3.13.3.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Empty](#rqsrs-018clickhousemapdatatypefunctionsempty)
+    * 3.13.4 [`notEmpty`](#notempty)
+      * 3.13.4.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.NotEmpty](#rqsrs-018clickhousemapdatatypefunctionsnotempty)
+    * 3.13.5 [`map`](#map)
+      * 3.13.5.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map](#rqsrs-018clickhousemapdatatypefunctionsmap)
+      * 3.13.5.2 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.InvalidNumberOfArguments](#rqsrs-018clickhousemapdatatypefunctionsmapinvalidnumberofarguments)
+      * 3.13.5.3 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MixedKeyOrValueTypes](#rqsrs-018clickhousemapdatatypefunctionsmapmixedkeyorvaluetypes)
+      * 3.13.5.4 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapAdd](#rqsrs-018clickhousemapdatatypefunctionsmapmapadd)
+      * 3.13.5.5 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapSubstract](#rqsrs-018clickhousemapdatatypefunctionsmapmapsubstract)
+      * 3.13.5.6 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapPopulateSeries](#rqsrs-018clickhousemapdatatypefunctionsmapmappopulateseries)
+    * 3.13.6 [`mapContains`](#mapcontains)
+      * 3.13.6.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapContains](#rqsrs-018clickhousemapdatatypefunctionsmapcontains)
+    * 3.13.7 [`mapKeys`](#mapkeys)
+      * 3.13.7.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapKeys](#rqsrs-018clickhousemapdatatypefunctionsmapkeys)
+    * 3.13.8 [`mapValues`](#mapvalues)
+      * 3.13.8.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapValues](#rqsrs-018clickhousemapdatatypefunctionsmapvalues)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This software requirements specification covers requirements for `Map(key, value)` data type in [ClickHouse].
+
+## Requirements
+
+### General
+
+#### RQ.SRS-018.ClickHouse.Map.DataType
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type that stores `key:value` pairs.
+
+### Performance
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.ArrayOfTuples
+version:1.0
+
+[ClickHouse] SHALL provide comparable performance for `Map(key, value)` data type as
+compared to `Array(Tuple(K,V))` data type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.TupleOfArrays
+version:1.0
+
+[ClickHouse] SHALL provide comparable performance for `Map(key, value)` data type as
+compared to `Tuple(Array(String), Array(String))` data type where the first
+array defines an array of keys and the second array defines an array of values.
+
+### Key Types
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Key.String
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where key is of a [String] type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Key.Integer
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where key is of an [Integer] type.
+
+### Value Types
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.String
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [String] type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Integer
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [Integer] type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Array
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [Array] type.
+
+### Invalid Types
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Invalid.Nullable
+version: 1.0
+
+[ClickHouse] SHALL not support creating table columns that have `Nullable(Map(key, value))` data type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Invalid.NothingNothing
+version: 1.0
+
+[ClickHouse] SHALL not support creating table columns that have `Map(Nothing, Nothing))` data type.
+
+### Duplicated Keys
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.DuplicatedKeys
+version: 1.0
+
+[ClickHouse] MAY support `Map(key, value)` data type with duplicated keys.
+
+### Array of Maps
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.ArrayOfMaps
+version: 1.0
+
+[ClickHouse] SHALL support `Array(Map(key, value))` data type.
+
+### Nested With Maps
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.NestedWithMaps
+version: 1.0
+
+[ClickHouse] SHALL support defining `Map(key, value)` data type inside the [Nested] data type.
+
+### Value Retrieval
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval
+version: 1.0
+
+[ClickHouse] SHALL support getting the value from a `Map(key, value)` data type using `map[key]` syntax.
+If `key` has duplicates then the first `key:value` pair MAY be returned. 
+
+For example,
+
+```sql
+SELECT a['key2'] FROM table_map;
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyInvalid
+version: 1.0
+
+[ClickHouse] SHALL return an error when key does not match the key type.
+
+For example,
+
+```sql
+SELECT map(1,2) AS m, m[1024]
+```
+
+Exceptions:
+
+* when key is `NULL` the return value MAY be `NULL`
+* when key value is not valid for the key type, for example it is out of range for [Integer] type, 
+  when reading from a table column it MAY return the default value for key data type
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyNotFound
+version: 1.0
+
+[ClickHouse] SHALL return default value for the data type of the value
+when there's no corresponding `key` defined in the `Map(key, value)` data type. 
+
+
+### Converting Tuple(Array, Array) to Map
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysToMap
+version: 1.0
+
+[ClickHouse] SHALL support converting [Tuple(Array, Array)] to `Map(key, value)` using the [CAST] function.
+
+``` sql
+SELECT CAST(([1, 2, 3], ['Ready', 'Steady', 'Go']), 'Map(UInt8, String)') AS map;
+```
+
+``` text
+┌─map───────────────────────────┐
+│ {1:'Ready',2:'Steady',3:'Go'} │
+└───────────────────────────────┘
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysMap.Invalid
+version: 1.0
+
+[ClickHouse] MAY return an error when casting [Tuple(Array, Array)] to `Map(key, value)`
+
+* when arrays are not of equal size
+
+  For example,
+
+  ```sql
+  SELECT CAST(([2, 1, 1023], ['', '']), 'Map(UInt8, String)') AS map, map[10]
+  ```
+
+### Converting Array(Tuple(K,V)) to Map
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap
+version: 1.0
+
+[ClickHouse] SHALL support converting [Array(Tuple(K,V))] to `Map(key, value)` using the [CAST] function.
+
+For example,
+
+```sql
+SELECT CAST(([(1,2),(3)]), 'Map(UInt8, UInt8)') AS map
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap.Invalid
+version: 1.0
+
+[ClickHouse] MAY return an error when casting [Array(Tuple(K, V))] to `Map(key, value)`
+
+* when element is not a [Tuple]
+
+  ```sql
+  SELECT CAST(([(1,2),(3)]), 'Map(UInt8, UInt8)') AS map
+  ```
+
+* when [Tuple] does not contain two elements
+
+  ```sql
+  SELECT CAST(([(1,2),(3,)]), 'Map(UInt8, UInt8)') AS map
+  ```
+
+### Keys and Values Subcolumns
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys
+version: 1.0
+
+[ClickHouse] SHALL support `keys` subcolumn in the `Map(key, value)` type that can be used 
+to retrieve an [Array] of map keys.
+
+```sql
+SELECT m.keys FROM t_map;
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.ArrayFunctions
+version: 1.0
+
+[ClickHouse] SHALL support applying [Array] functions to the `keys` subcolumn in the `Map(key, value)` type.
+
+For example,
+
+```sql
+SELECT * FROM t_map WHERE has(m.keys, 'a');
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.InlineDefinedMap
+version: 1.0
+
+[ClickHouse] MAY not support using inline defined map to get `keys` subcolumn.
+
+For example,
+
+```sql
+SELECT map( 'aa', 4, '44' , 5) as c, c.keys
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values
+version: 1.0
+
+[ClickHouse] SHALL support `values` subcolumn in the `Map(key, value)` type that can be used 
+to retrieve an [Array] of map values.
+
+```sql
+SELECT m.values FROM t_map;
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.ArrayFunctions
+version: 1.0
+
+[ClickHouse] SHALL support applying [Array] functions to the `values` subcolumn in the `Map(key, value)` type.
+
+For example,
+
+```sql
+SELECT * FROM t_map WHERE has(m.values, 'a');
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.InlineDefinedMap
+version: 1.0
+
+[ClickHouse] MAY not support using inline defined map to get `values` subcolumn.
+
+For example,
+
+```sql
+SELECT map( 'aa', 4, '44' , 5) as c, c.values
+```
+
+### Functions
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Functions.InlineDefinedMap
+version: 1.0
+
+[ClickHouse] SHALL support using inline defined maps as an argument to map functions.
+
+For example,
+
+```sql
+SELECT map( 'aa', 4, '44' , 5) as c, mapKeys(c)
+SELECT map( 'aa', 4, '44' , 5) as c, mapValues(c)
+```
+
+#### `length`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Length
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [length] function
+that SHALL return number of keys in the map.
+
+For example,
+
+```sql
+SELECT length(map(1,2,3,4))
+SELECT length(map())
+```
+
+#### `empty`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Empty
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [empty] function
+that SHALL return 1 if number of keys in the map is 0 otherwise if the number of keys is 
+greater or equal to 1 it SHALL return 0.
+
+For example,
+
+```sql
+SELECT empty(map(1,2,3,4))
+SELECT empty(map())
+```
+
+#### `notEmpty`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.NotEmpty
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [notEmpty] function
+that SHALL return 0 if number if keys in the map is 0 otherwise if the number of keys is
+greater or equal to 1 it SHALL return 1.
+
+For example,
+
+```sql
+SELECT notEmpty(map(1,2,3,4))
+SELECT notEmpty(map())
+```
+
+#### `map`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map
+version: 1.0
+
+[ClickHouse] SHALL support arranging `key, value` pairs into `Map(key, value)` data type
+using `map` function.
+
+**Syntax** 
+
+``` sql
+map(key1, value1[, key2, value2, ...])
+```
+
+For example,
+
+``` sql
+SELECT map('key1', number, 'key2', number * 2) FROM numbers(3);
+
+┌─map('key1', number, 'key2', multiply(number, 2))─┐
+│ {'key1':0,'key2':0}                              │
+│ {'key1':1,'key2':2}                              │
+│ {'key1':2,'key2':4}                              │
+└──────────────────────────────────────────────────┘
+```
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.InvalidNumberOfArguments
+version: 1.0
+
+[ClickHouse] SHALL return an error when `map` function is called with non even number of arguments.
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MixedKeyOrValueTypes
+version: 1.0
+
+[ClickHouse] SHALL return an error when `map` function is called with mixed key or value types.
+
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapAdd
+version: 1.0
+
+[ClickHouse] SHALL support converting the results of `mapAdd` function to a `Map(key, value)` data type.
+
+For example,
+
+``` sql
+SELECT CAST(mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])), "Map(Int8,Int8)")
+```
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapSubstract
+version: 1.0
+
+[ClickHouse] SHALL support converting the results of `mapSubstract` function to a `Map(key, value)` data type.
+
+For example,
+
+```sql
+SELECT CAST(mapSubtract(([toUInt8(1), 2], [toInt32(1), 1]), ([toUInt8(1), 2], [toInt32(2), 1])), "Map(Int8,Int8)")
+```
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapPopulateSeries
+version: 1.0
+
+[ClickHouse] SHALL support converting the results of `mapPopulateSeries` function to a `Map(key, value)` data type.
+
+For example,
+
+```sql
+SELECT CAST(mapPopulateSeries([1,2,4], [11,22,44], 5), "Map(Int8,Int8)")
+```
+
+#### `mapContains`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapContains
+version: 1.0
+
+[ClickHouse] SHALL support `mapContains(map, key)` function to check weather `map.keys` contains the `key`.
+
+For example,
+
+```sql
+SELECT mapContains(a, 'abc') from table_map;
+```
+
+#### `mapKeys`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapKeys
+version: 1.0
+
+[ClickHouse] SHALL support `mapKeys(map)` function to return all the map keys in the [Array] format.
+
+For example,
+
+```sql
+SELECT mapKeys(a) from table_map;
+```
+
+#### `mapValues`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapValues
+version: 1.0
+
+[ClickHouse] SHALL support `mapValues(map)` function to return all the map values in the [Array] format.
+
+For example,
+
+```sql
+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
+[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/
+[GitHub]: https://github.com
diff --git a/tests/testflows/map_type/requirements/requirements.py b/tests/testflows/map_type/requirements/requirements.py
new file mode 100644
index 00000000000..24e8abdf15f
--- /dev/null
+++ b/tests/testflows/map_type/requirements/requirements.py
@@ -0,0 +1,1427 @@
+# These requirements were auto generated
+# from software requirements specification (SRS)
+# document by TestFlows v1.6.210226.1200017.
+# Do not edit by hand but re-generate instead
+# using 'tfs requirements generate' command.
+from testflows.core import Specification
+from testflows.core import Requirement
+
+Heading = Specification.Heading
+
+RQ_SRS_018_ClickHouse_Map_DataType = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type that stores `key:value` pairs.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.1.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Performance_Vs_ArrayOfTuples = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.ArrayOfTuples',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL provide comparable performance for `Map(key, value)` data type as\n'
+        'compared to `Array(Tuple(K,V))` data type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.2.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Performance_Vs_TupleOfArrays = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.TupleOfArrays',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL provide comparable performance for `Map(key, value)` data type as\n'
+        'compared to `Tuple(Array(String), Array(String))` data type where the first\n'
+        'array defines an array of keys and the second array defines an array of values.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.2.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Key_String = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Key.String',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type where key is of a [String] type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.3.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Key_Integer = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Key.Integer',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type where key is of an [Integer] type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.3.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Value_String = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Value.String',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [String] type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.4.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Value_Integer = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Integer',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [Integer] type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.4.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Value_Array = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Array',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [Array] type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.4.3')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Invalid_Nullable = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Invalid.Nullable',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not support creating table columns that have `Nullable(Map(key, value))` data type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.5.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Invalid_NothingNothing = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Invalid.NothingNothing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL not support creating table columns that have `Map(Nothing, Nothing))` data type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.5.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_DuplicatedKeys = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.DuplicatedKeys',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY support `Map(key, value)` data type with duplicated keys.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.6.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_ArrayOfMaps = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.ArrayOfMaps',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Array(Map(key, value))` data type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.7.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_NestedWithMaps = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.NestedWithMaps',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support defining `Map(key, value)` data type inside the [Nested] data type.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.8.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support getting the value from a `Map(key, value)` data type using `map[key]` syntax.\n'
+        'If `key` has duplicates then the first `key:value` pair MAY be returned. \n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT a['key2'] FROM table_map;\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.9.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyInvalid = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyInvalid',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when key does not match the key type.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT map(1,2) AS m, m[1024]\n'
+        '```\n'
+        '\n'
+        'Exceptions:\n'
+        '\n'
+        '* when key is `NULL` the return value MAY be `NULL`\n'
+        '* when key value is not valid for the key type, for example it is out of range for [Integer] type, \n'
+        '  when reading from a table column it MAY return the default value for key data type\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.9.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyNotFound = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyNotFound',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return default value for the data type of the value\n'
+        "when there's no corresponding `key` defined in the `Map(key, value)` data type. \n"
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.9.3')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysToMap = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysToMap',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting [Tuple(Array, Array)] to `Map(key, value)` using the [CAST] function.\n'
+        '\n'
+        '``` sql\n'
+        "SELECT CAST(([1, 2, 3], ['Ready', 'Steady', 'Go']), 'Map(UInt8, String)') AS map;\n"
+        '```\n'
+        '\n'
+        '``` text\n'
+        '┌─map───────────────────────────┐\n'
+        "│ {1:'Ready',2:'Steady',3:'Go'} │\n"
+        '└───────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.10.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysMap_Invalid = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysMap.Invalid',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY return an error when casting [Tuple(Array, Array)] to `Map(key, value)`\n'
+        '\n'
+        '* when arrays are not of equal size\n'
+        '\n'
+        '  For example,\n'
+        '\n'
+        '  ```sql\n'
+        "  SELECT CAST(([2, 1, 1023], ['', '']), 'Map(UInt8, String)') AS map, map[10]\n"
+        '  ```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.10.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting [Array(Tuple(K,V))] to `Map(key, value)` using the [CAST] function.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT CAST(([(1,2),(3)]), 'Map(UInt8, UInt8)') AS map\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.11.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap_Invalid = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap.Invalid',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY return an error when casting [Array(Tuple(K, V))] to `Map(key, value)`\n'
+        '\n'
+        '* when element is not a [Tuple]\n'
+        '\n'
+        '  ```sql\n'
+        "  SELECT CAST(([(1,2),(3)]), 'Map(UInt8, UInt8)') AS map\n"
+        '  ```\n'
+        '\n'
+        '* when [Tuple] does not contain two elements\n'
+        '\n'
+        '  ```sql\n'
+        "  SELECT CAST(([(1,2),(3,)]), 'Map(UInt8, UInt8)') AS map\n"
+        '  ```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.11.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `keys` subcolumn in the `Map(key, value)` type that can be used \n'
+        'to retrieve an [Array] of map keys.\n'
+        '\n'
+        '```sql\n'
+        'SELECT m.keys FROM t_map;\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.12.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys_ArrayFunctions = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.ArrayFunctions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support applying [Array] functions to the `keys` subcolumn in the `Map(key, value)` type.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT * FROM t_map WHERE has(m.keys, 'a');\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.12.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys_InlineDefinedMap = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.InlineDefinedMap',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using inline defined map to get `keys` subcolumn.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT map( 'aa', 4, '44' , 5) as c, c.keys\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.12.3')
+
+RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `values` subcolumn in the `Map(key, value)` type that can be used \n'
+        'to retrieve an [Array] of map values.\n'
+        '\n'
+        '```sql\n'
+        'SELECT m.values FROM t_map;\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.12.4')
+
+RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values_ArrayFunctions = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.ArrayFunctions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support applying [Array] functions to the `values` subcolumn in the `Map(key, value)` type.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT * FROM t_map WHERE has(m.values, 'a');\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.12.5')
+
+RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values_InlineDefinedMap = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.InlineDefinedMap',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] MAY not support using inline defined map to get `values` subcolumn.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT map( 'aa', 4, '44' , 5) as c, c.values\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.12.6')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_InlineDefinedMap = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.InlineDefinedMap',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using inline defined maps as an argument to map functions.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT map( 'aa', 4, '44' , 5) as c, mapKeys(c)\n"
+        "SELECT map( 'aa', 4, '44' , 5) as c, mapValues(c)\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.13.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Length = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Length',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [length] function\n'
+        'that SHALL return number of keys in the map.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT length(map(1,2,3,4))\n'
+        'SELECT length(map())\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.2.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Empty = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Empty',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [empty] function\n'
+        'that SHALL return 1 if number of keys in the map is 0 otherwise if the number of keys is \n'
+        'greater or equal to 1 it SHALL return 0.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT empty(map(1,2,3,4))\n'
+        'SELECT empty(map())\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.3.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_NotEmpty = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.NotEmpty',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [notEmpty] function\n'
+        'that SHALL return 0 if number if keys in the map is 0 otherwise if the number of keys is\n'
+        'greater or equal to 1 it SHALL return 1.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT notEmpty(map(1,2,3,4))\n'
+        'SELECT notEmpty(map())\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.4.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support arranging `key, value` pairs into `Map(key, value)` data type\n'
+        'using `map` function.\n'
+        '\n'
+        '**Syntax** \n'
+        '\n'
+        '``` sql\n'
+        'map(key1, value1[, key2, value2, ...])\n'
+        '```\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '``` sql\n'
+        "SELECT map('key1', number, 'key2', number * 2) FROM numbers(3);\n"
+        '\n'
+        "┌─map('key1', number, 'key2', multiply(number, 2))─┐\n"
+        "│ {'key1':0,'key2':0}                              │\n"
+        "│ {'key1':1,'key2':2}                              │\n"
+        "│ {'key1':2,'key2':4}                              │\n"
+        '└──────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.5.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_InvalidNumberOfArguments = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.InvalidNumberOfArguments',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `map` function is called with non even number of arguments.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.5.2')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MixedKeyOrValueTypes = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MixedKeyOrValueTypes',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `map` function is called with mixed key or value types.\n'
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.5.3')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapAdd = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapAdd',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting the results of `mapAdd` function to a `Map(key, value)` data type.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '``` sql\n'
+        'SELECT CAST(mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])), "Map(Int8,Int8)")\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.5.4')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapSubstract = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapSubstract',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting the results of `mapSubstract` function to a `Map(key, value)` data type.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT CAST(mapSubtract(([toUInt8(1), 2], [toInt32(1), 1]), ([toUInt8(1), 2], [toInt32(2), 1])), "Map(Int8,Int8)")\n'
+        '```\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.5.5')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapPopulateSeries = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapPopulateSeries',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support converting the results of `mapPopulateSeries` function to a `Map(key, value)` data type.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT CAST(mapPopulateSeries([1,2,4], [11,22,44], 5), "Map(Int8,Int8)")\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.5.6')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapContains = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapContains',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `mapContains(map, key)` function to check weather `map.keys` contains the `key`.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT mapContains(a, 'abc') from table_map;\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.6.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapKeys = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapKeys',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `mapKeys(map)` function to return all the map keys in the [Array] format.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT mapKeys(a) from table_map;\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.7.1')
+
+RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapValues = Requirement(
+    name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapValues',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `mapValues(map)` function to return all the map values in the [Array] format.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        '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'
+        '[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'
+        '[GitHub]: https://github.com\n'
+        ),
+    link=None,
+    level=4,
+    num='3.13.8.1')
+
+SRS018_ClickHouse_Map_Data_Type = Specification(
+    name='SRS018 ClickHouse Map Data Type', 
+    description=None,
+    author=None,
+    date=None, 
+    status=None, 
+    approved_by=None,
+    approved_date=None,
+    approved_version=None,
+    version=None,
+    group=None,
+    type=None,
+    link=None,
+    uid=None,
+    parent=None,
+    children=None,
+    headings=(
+        Heading(name='Revision History', level=1, num='1'),
+        Heading(name='Introduction', level=1, num='2'),
+        Heading(name='Requirements', level=1, num='3'),
+        Heading(name='General', level=2, num='3.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType', level=3, num='3.1.1'),
+        Heading(name='Performance', level=2, num='3.2'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.ArrayOfTuples', level=3, num='3.2.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.TupleOfArrays', level=3, num='3.2.2'),
+        Heading(name='Key Types', level=2, num='3.3'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Key.String', level=3, num='3.3.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Key.Integer', level=3, num='3.3.2'),
+        Heading(name='Value Types', level=2, num='3.4'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Value.String', level=3, num='3.4.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Integer', level=3, num='3.4.2'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Array', level=3, num='3.4.3'),
+        Heading(name='Invalid Types', level=2, num='3.5'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Invalid.Nullable', level=3, num='3.5.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Invalid.NothingNothing', level=3, num='3.5.2'),
+        Heading(name='Duplicated Keys', level=2, num='3.6'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.DuplicatedKeys', level=3, num='3.6.1'),
+        Heading(name='Array of Maps', level=2, num='3.7'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.ArrayOfMaps', level=3, num='3.7.1'),
+        Heading(name='Nested With Maps', level=2, num='3.8'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.NestedWithMaps', level=3, num='3.8.1'),
+        Heading(name='Value Retrieval', level=2, num='3.9'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval', level=3, num='3.9.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyInvalid', level=3, num='3.9.2'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyNotFound', level=3, num='3.9.3'),
+        Heading(name='Converting Tuple(Array, Array) to Map', level=2, num='3.10'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysToMap', level=3, num='3.10.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysMap.Invalid', level=3, num='3.10.2'),
+        Heading(name='Converting Array(Tuple(K,V)) to Map', level=2, num='3.11'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap', level=3, num='3.11.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap.Invalid', level=3, num='3.11.2'),
+        Heading(name='Keys and Values Subcolumns', level=2, num='3.12'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys', level=3, num='3.12.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.ArrayFunctions', level=3, num='3.12.2'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.InlineDefinedMap', level=3, num='3.12.3'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values', level=3, num='3.12.4'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.ArrayFunctions', level=3, num='3.12.5'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.InlineDefinedMap', level=3, num='3.12.6'),
+        Heading(name='Functions', level=2, num='3.13'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.InlineDefinedMap', level=3, num='3.13.1'),
+        Heading(name='`length`', level=3, num='3.13.2'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Length', level=4, num='3.13.2.1'),
+        Heading(name='`empty`', level=3, num='3.13.3'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Empty', level=4, num='3.13.3.1'),
+        Heading(name='`notEmpty`', level=3, num='3.13.4'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.NotEmpty', level=4, num='3.13.4.1'),
+        Heading(name='`map`', level=3, num='3.13.5'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map', level=4, num='3.13.5.1'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.InvalidNumberOfArguments', level=4, num='3.13.5.2'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MixedKeyOrValueTypes', level=4, num='3.13.5.3'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapAdd', level=4, num='3.13.5.4'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapSubstract', level=4, num='3.13.5.5'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapPopulateSeries', level=4, num='3.13.5.6'),
+        Heading(name='`mapContains`', level=3, num='3.13.6'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapContains', level=4, num='3.13.6.1'),
+        Heading(name='`mapKeys`', level=3, num='3.13.7'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapKeys', level=4, num='3.13.7.1'),
+        Heading(name='`mapValues`', level=3, num='3.13.8'),
+        Heading(name='RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapValues', level=4, num='3.13.8.1'),
+        ),
+    requirements=(
+        RQ_SRS_018_ClickHouse_Map_DataType,
+        RQ_SRS_018_ClickHouse_Map_DataType_Performance_Vs_ArrayOfTuples,
+        RQ_SRS_018_ClickHouse_Map_DataType_Performance_Vs_TupleOfArrays,
+        RQ_SRS_018_ClickHouse_Map_DataType_Key_String,
+        RQ_SRS_018_ClickHouse_Map_DataType_Key_Integer,
+        RQ_SRS_018_ClickHouse_Map_DataType_Value_String,
+        RQ_SRS_018_ClickHouse_Map_DataType_Value_Integer,
+        RQ_SRS_018_ClickHouse_Map_DataType_Value_Array,
+        RQ_SRS_018_ClickHouse_Map_DataType_Invalid_Nullable,
+        RQ_SRS_018_ClickHouse_Map_DataType_Invalid_NothingNothing,
+        RQ_SRS_018_ClickHouse_Map_DataType_DuplicatedKeys,
+        RQ_SRS_018_ClickHouse_Map_DataType_ArrayOfMaps,
+        RQ_SRS_018_ClickHouse_Map_DataType_NestedWithMaps,
+        RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval,
+        RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyInvalid,
+        RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyNotFound,
+        RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysToMap,
+        RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysMap_Invalid,
+        RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap,
+        RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap_Invalid,
+        RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys,
+        RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys_ArrayFunctions,
+        RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys_InlineDefinedMap,
+        RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values,
+        RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values_ArrayFunctions,
+        RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values_InlineDefinedMap,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_InlineDefinedMap,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Length,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Empty,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_NotEmpty,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_InvalidNumberOfArguments,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MixedKeyOrValueTypes,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapAdd,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapSubstract,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapPopulateSeries,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapContains,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapKeys,
+        RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapValues,
+        ),
+    content='''
+# SRS018 ClickHouse Map Data Type
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Requirements](#requirements)
+  * 3.1 [General](#general)
+    * 3.1.1 [RQ.SRS-018.ClickHouse.Map.DataType](#rqsrs-018clickhousemapdatatype)
+  * 3.2 [Performance](#performance)
+    * 3.2.1 [RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.ArrayOfTuples](#rqsrs-018clickhousemapdatatypeperformancevsarrayoftuples)
+    * 3.2.2 [RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.TupleOfArrays](#rqsrs-018clickhousemapdatatypeperformancevstupleofarrays)
+  * 3.3 [Key Types](#key-types)
+    * 3.3.1 [RQ.SRS-018.ClickHouse.Map.DataType.Key.String](#rqsrs-018clickhousemapdatatypekeystring)
+    * 3.3.2 [RQ.SRS-018.ClickHouse.Map.DataType.Key.Integer](#rqsrs-018clickhousemapdatatypekeyinteger)
+  * 3.4 [Value Types](#value-types)
+    * 3.4.1 [RQ.SRS-018.ClickHouse.Map.DataType.Value.String](#rqsrs-018clickhousemapdatatypevaluestring)
+    * 3.4.2 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Integer](#rqsrs-018clickhousemapdatatypevalueinteger)
+    * 3.4.3 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Array](#rqsrs-018clickhousemapdatatypevaluearray)
+  * 3.5 [Invalid Types](#invalid-types)
+    * 3.5.1 [RQ.SRS-018.ClickHouse.Map.DataType.Invalid.Nullable](#rqsrs-018clickhousemapdatatypeinvalidnullable)
+    * 3.5.2 [RQ.SRS-018.ClickHouse.Map.DataType.Invalid.NothingNothing](#rqsrs-018clickhousemapdatatypeinvalidnothingnothing)
+  * 3.6 [Duplicated Keys](#duplicated-keys)
+    * 3.6.1 [RQ.SRS-018.ClickHouse.Map.DataType.DuplicatedKeys](#rqsrs-018clickhousemapdatatypeduplicatedkeys)
+  * 3.7 [Array of Maps](#array-of-maps)
+    * 3.7.1 [RQ.SRS-018.ClickHouse.Map.DataType.ArrayOfMaps](#rqsrs-018clickhousemapdatatypearrayofmaps)
+  * 3.8 [Nested With Maps](#nested-with-maps)
+    * 3.8.1 [RQ.SRS-018.ClickHouse.Map.DataType.NestedWithMaps](#rqsrs-018clickhousemapdatatypenestedwithmaps)
+  * 3.9 [Value Retrieval](#value-retrieval)
+    * 3.9.1 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval](#rqsrs-018clickhousemapdatatypevalueretrieval)
+    * 3.9.2 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyInvalid](#rqsrs-018clickhousemapdatatypevalueretrievalkeyinvalid)
+    * 3.9.3 [RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyNotFound](#rqsrs-018clickhousemapdatatypevalueretrievalkeynotfound)
+  * 3.10 [Converting Tuple(Array, Array) to Map](#converting-tuplearray-array-to-map)
+    * 3.10.1 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysToMap](#rqsrs-018clickhousemapdatatypeconversionfromtupleofarraystomap)
+    * 3.10.2 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysMap.Invalid](#rqsrs-018clickhousemapdatatypeconversionfromtupleofarraysmapinvalid)
+  * 3.11 [Converting Array(Tuple(K,V)) to Map](#converting-arraytuplekv-to-map)
+    * 3.11.1 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap](#rqsrs-018clickhousemapdatatypeconversionfromarrayoftuplestomap)
+    * 3.11.2 [RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap.Invalid](#rqsrs-018clickhousemapdatatypeconversionfromarrayoftuplestomapinvalid)
+  * 3.12 [Keys and Values Subcolumns](#keys-and-values-subcolumns)
+    * 3.12.1 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys](#rqsrs-018clickhousemapdatatypesubcolumnskeys)
+    * 3.12.2 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.ArrayFunctions](#rqsrs-018clickhousemapdatatypesubcolumnskeysarrayfunctions)
+    * 3.12.3 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.InlineDefinedMap](#rqsrs-018clickhousemapdatatypesubcolumnskeysinlinedefinedmap)
+    * 3.12.4 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values](#rqsrs-018clickhousemapdatatypesubcolumnsvalues)
+    * 3.12.5 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.ArrayFunctions](#rqsrs-018clickhousemapdatatypesubcolumnsvaluesarrayfunctions)
+    * 3.12.6 [RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.InlineDefinedMap](#rqsrs-018clickhousemapdatatypesubcolumnsvaluesinlinedefinedmap)
+  * 3.13 [Functions](#functions)
+    * 3.13.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.InlineDefinedMap](#rqsrs-018clickhousemapdatatypefunctionsinlinedefinedmap)
+    * 3.13.2 [`length`](#length)
+      * 3.13.2.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Length](#rqsrs-018clickhousemapdatatypefunctionslength)
+    * 3.13.3 [`empty`](#empty)
+      * 3.13.3.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Empty](#rqsrs-018clickhousemapdatatypefunctionsempty)
+    * 3.13.4 [`notEmpty`](#notempty)
+      * 3.13.4.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.NotEmpty](#rqsrs-018clickhousemapdatatypefunctionsnotempty)
+    * 3.13.5 [`map`](#map)
+      * 3.13.5.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map](#rqsrs-018clickhousemapdatatypefunctionsmap)
+      * 3.13.5.2 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.InvalidNumberOfArguments](#rqsrs-018clickhousemapdatatypefunctionsmapinvalidnumberofarguments)
+      * 3.13.5.3 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MixedKeyOrValueTypes](#rqsrs-018clickhousemapdatatypefunctionsmapmixedkeyorvaluetypes)
+      * 3.13.5.4 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapAdd](#rqsrs-018clickhousemapdatatypefunctionsmapmapadd)
+      * 3.13.5.5 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapSubstract](#rqsrs-018clickhousemapdatatypefunctionsmapmapsubstract)
+      * 3.13.5.6 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapPopulateSeries](#rqsrs-018clickhousemapdatatypefunctionsmapmappopulateseries)
+    * 3.13.6 [`mapContains`](#mapcontains)
+      * 3.13.6.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapContains](#rqsrs-018clickhousemapdatatypefunctionsmapcontains)
+    * 3.13.7 [`mapKeys`](#mapkeys)
+      * 3.13.7.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapKeys](#rqsrs-018clickhousemapdatatypefunctionsmapkeys)
+    * 3.13.8 [`mapValues`](#mapvalues)
+      * 3.13.8.1 [RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapValues](#rqsrs-018clickhousemapdatatypefunctionsmapvalues)
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This software requirements specification covers requirements for `Map(key, value)` data type in [ClickHouse].
+
+## Requirements
+
+### General
+
+#### RQ.SRS-018.ClickHouse.Map.DataType
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type that stores `key:value` pairs.
+
+### Performance
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.ArrayOfTuples
+version:1.0
+
+[ClickHouse] SHALL provide comparable performance for `Map(key, value)` data type as
+compared to `Array(Tuple(K,V))` data type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Performance.Vs.TupleOfArrays
+version:1.0
+
+[ClickHouse] SHALL provide comparable performance for `Map(key, value)` data type as
+compared to `Tuple(Array(String), Array(String))` data type where the first
+array defines an array of keys and the second array defines an array of values.
+
+### Key Types
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Key.String
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where key is of a [String] type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Key.Integer
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where key is of an [Integer] type.
+
+### Value Types
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.String
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [String] type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Integer
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [Integer] type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Array
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type where value is of a [Array] type.
+
+### Invalid Types
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Invalid.Nullable
+version: 1.0
+
+[ClickHouse] SHALL not support creating table columns that have `Nullable(Map(key, value))` data type.
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Invalid.NothingNothing
+version: 1.0
+
+[ClickHouse] SHALL not support creating table columns that have `Map(Nothing, Nothing))` data type.
+
+### Duplicated Keys
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.DuplicatedKeys
+version: 1.0
+
+[ClickHouse] MAY support `Map(key, value)` data type with duplicated keys.
+
+### Array of Maps
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.ArrayOfMaps
+version: 1.0
+
+[ClickHouse] SHALL support `Array(Map(key, value))` data type.
+
+### Nested With Maps
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.NestedWithMaps
+version: 1.0
+
+[ClickHouse] SHALL support defining `Map(key, value)` data type inside the [Nested] data type.
+
+### Value Retrieval
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval
+version: 1.0
+
+[ClickHouse] SHALL support getting the value from a `Map(key, value)` data type using `map[key]` syntax.
+If `key` has duplicates then the first `key:value` pair MAY be returned. 
+
+For example,
+
+```sql
+SELECT a['key2'] FROM table_map;
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyInvalid
+version: 1.0
+
+[ClickHouse] SHALL return an error when key does not match the key type.
+
+For example,
+
+```sql
+SELECT map(1,2) AS m, m[1024]
+```
+
+Exceptions:
+
+* when key is `NULL` the return value MAY be `NULL`
+* when key value is not valid for the key type, for example it is out of range for [Integer] type, 
+  when reading from a table column it MAY return the default value for key data type
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Value.Retrieval.KeyNotFound
+version: 1.0
+
+[ClickHouse] SHALL return default value for the data type of the value
+when there's no corresponding `key` defined in the `Map(key, value)` data type. 
+
+
+### Converting Tuple(Array, Array) to Map
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysToMap
+version: 1.0
+
+[ClickHouse] SHALL support converting [Tuple(Array, Array)] to `Map(key, value)` using the [CAST] function.
+
+``` sql
+SELECT CAST(([1, 2, 3], ['Ready', 'Steady', 'Go']), 'Map(UInt8, String)') AS map;
+```
+
+``` text
+┌─map───────────────────────────┐
+│ {1:'Ready',2:'Steady',3:'Go'} │
+└───────────────────────────────┘
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.TupleOfArraysMap.Invalid
+version: 1.0
+
+[ClickHouse] MAY return an error when casting [Tuple(Array, Array)] to `Map(key, value)`
+
+* when arrays are not of equal size
+
+  For example,
+
+  ```sql
+  SELECT CAST(([2, 1, 1023], ['', '']), 'Map(UInt8, String)') AS map, map[10]
+  ```
+
+### Converting Array(Tuple(K,V)) to Map
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap
+version: 1.0
+
+[ClickHouse] SHALL support converting [Array(Tuple(K,V))] to `Map(key, value)` using the [CAST] function.
+
+For example,
+
+```sql
+SELECT CAST(([(1,2),(3)]), 'Map(UInt8, UInt8)') AS map
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Conversion.From.ArrayOfTuplesToMap.Invalid
+version: 1.0
+
+[ClickHouse] MAY return an error when casting [Array(Tuple(K, V))] to `Map(key, value)`
+
+* when element is not a [Tuple]
+
+  ```sql
+  SELECT CAST(([(1,2),(3)]), 'Map(UInt8, UInt8)') AS map
+  ```
+
+* when [Tuple] does not contain two elements
+
+  ```sql
+  SELECT CAST(([(1,2),(3,)]), 'Map(UInt8, UInt8)') AS map
+  ```
+
+### Keys and Values Subcolumns
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys
+version: 1.0
+
+[ClickHouse] SHALL support `keys` subcolumn in the `Map(key, value)` type that can be used 
+to retrieve an [Array] of map keys.
+
+```sql
+SELECT m.keys FROM t_map;
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.ArrayFunctions
+version: 1.0
+
+[ClickHouse] SHALL support applying [Array] functions to the `keys` subcolumn in the `Map(key, value)` type.
+
+For example,
+
+```sql
+SELECT * FROM t_map WHERE has(m.keys, 'a');
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Keys.InlineDefinedMap
+version: 1.0
+
+[ClickHouse] MAY not support using inline defined map to get `keys` subcolumn.
+
+For example,
+
+```sql
+SELECT map( 'aa', 4, '44' , 5) as c, c.keys
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values
+version: 1.0
+
+[ClickHouse] SHALL support `values` subcolumn in the `Map(key, value)` type that can be used 
+to retrieve an [Array] of map values.
+
+```sql
+SELECT m.values FROM t_map;
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.ArrayFunctions
+version: 1.0
+
+[ClickHouse] SHALL support applying [Array] functions to the `values` subcolumn in the `Map(key, value)` type.
+
+For example,
+
+```sql
+SELECT * FROM t_map WHERE has(m.values, 'a');
+```
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.SubColumns.Values.InlineDefinedMap
+version: 1.0
+
+[ClickHouse] MAY not support using inline defined map to get `values` subcolumn.
+
+For example,
+
+```sql
+SELECT map( 'aa', 4, '44' , 5) as c, c.values
+```
+
+### Functions
+
+#### RQ.SRS-018.ClickHouse.Map.DataType.Functions.InlineDefinedMap
+version: 1.0
+
+[ClickHouse] SHALL support using inline defined maps as an argument to map functions.
+
+For example,
+
+```sql
+SELECT map( 'aa', 4, '44' , 5) as c, mapKeys(c)
+SELECT map( 'aa', 4, '44' , 5) as c, mapValues(c)
+```
+
+#### `length`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Length
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [length] function
+that SHALL return number of keys in the map.
+
+For example,
+
+```sql
+SELECT length(map(1,2,3,4))
+SELECT length(map())
+```
+
+#### `empty`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Empty
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [empty] function
+that SHALL return 1 if number of keys in the map is 0 otherwise if the number of keys is 
+greater or equal to 1 it SHALL return 0.
+
+For example,
+
+```sql
+SELECT empty(map(1,2,3,4))
+SELECT empty(map())
+```
+
+#### `notEmpty`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.NotEmpty
+version: 1.0
+
+[ClickHouse] SHALL support `Map(key, value)` data type as an argument to the [notEmpty] function
+that SHALL return 0 if number if keys in the map is 0 otherwise if the number of keys is
+greater or equal to 1 it SHALL return 1.
+
+For example,
+
+```sql
+SELECT notEmpty(map(1,2,3,4))
+SELECT notEmpty(map())
+```
+
+#### `map`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map
+version: 1.0
+
+[ClickHouse] SHALL support arranging `key, value` pairs into `Map(key, value)` data type
+using `map` function.
+
+**Syntax** 
+
+``` sql
+map(key1, value1[, key2, value2, ...])
+```
+
+For example,
+
+``` sql
+SELECT map('key1', number, 'key2', number * 2) FROM numbers(3);
+
+┌─map('key1', number, 'key2', multiply(number, 2))─┐
+│ {'key1':0,'key2':0}                              │
+│ {'key1':1,'key2':2}                              │
+│ {'key1':2,'key2':4}                              │
+└──────────────────────────────────────────────────┘
+```
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.InvalidNumberOfArguments
+version: 1.0
+
+[ClickHouse] SHALL return an error when `map` function is called with non even number of arguments.
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MixedKeyOrValueTypes
+version: 1.0
+
+[ClickHouse] SHALL return an error when `map` function is called with mixed key or value types.
+
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapAdd
+version: 1.0
+
+[ClickHouse] SHALL support converting the results of `mapAdd` function to a `Map(key, value)` data type.
+
+For example,
+
+``` sql
+SELECT CAST(mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])), "Map(Int8,Int8)")
+```
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapSubstract
+version: 1.0
+
+[ClickHouse] SHALL support converting the results of `mapSubstract` function to a `Map(key, value)` data type.
+
+For example,
+
+```sql
+SELECT CAST(mapSubtract(([toUInt8(1), 2], [toInt32(1), 1]), ([toUInt8(1), 2], [toInt32(2), 1])), "Map(Int8,Int8)")
+```
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.Map.MapPopulateSeries
+version: 1.0
+
+[ClickHouse] SHALL support converting the results of `mapPopulateSeries` function to a `Map(key, value)` data type.
+
+For example,
+
+```sql
+SELECT CAST(mapPopulateSeries([1,2,4], [11,22,44], 5), "Map(Int8,Int8)")
+```
+
+#### `mapContains`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapContains
+version: 1.0
+
+[ClickHouse] SHALL support `mapContains(map, key)` function to check weather `map.keys` contains the `key`.
+
+For example,
+
+```sql
+SELECT mapContains(a, 'abc') from table_map;
+```
+
+#### `mapKeys`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapKeys
+version: 1.0
+
+[ClickHouse] SHALL support `mapKeys(map)` function to return all the map keys in the [Array] format.
+
+For example,
+
+```sql
+SELECT mapKeys(a) from table_map;
+```
+
+#### `mapValues`
+
+##### RQ.SRS-018.ClickHouse.Map.DataType.Functions.MapValues
+version: 1.0
+
+[ClickHouse] SHALL support `mapValues(map)` function to return all the map values in the [Array] format.
+
+For example,
+
+```sql
+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
+[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/
+[GitHub]: https://github.com
+''')
diff --git a/tests/testflows/map_type/tests/__init__.py b/tests/testflows/map_type/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/map_type/tests/common.py b/tests/testflows/map_type/tests/common.py
new file mode 100644
index 00000000000..a3a0d0ef0b1
--- /dev/null
+++ b/tests/testflows/map_type/tests/common.py
@@ -0,0 +1,49 @@
+import uuid
+from collections import namedtuple
+
+from testflows.core import *
+from testflows.core.name import basename, parentname
+from testflows._core.testtype import TestSubType
+
+def getuid():
+    if current().subtype == TestSubType.Example:
+        testname = f"{basename(parentname(current().name)).replace(' ', '_').replace(',','')}"
+    else:
+        testname = f"{basename(current().name).replace(' ', '_').replace(',','')}"
+    return testname + "_" + str(uuid.uuid1()).replace('-', '_')
+
+@TestStep(Given)
+def allow_experimental_map_type(self):
+    """Set allow_experimental_map_type = 1
+    """
+    setting = ("allow_experimental_map_type", 1)
+    default_query_settings = None
+
+    try:
+        with By("adding allow_experimental_map_type to the default query settings"):
+            default_query_settings = getsattr(current().context, "default_query_settings", [])
+            default_query_settings.append(setting)
+        yield
+    finally:
+        with Finally("I remove allow_experimental_map_type from the default query settings"):
+            if default_query_settings:
+                try:
+                    default_query_settings.pop(default_query_settings.index(setting))
+                except ValueError:
+                    pass
+
+@TestStep(Given)
+def create_table(self, name, statement, on_cluster=False):
+    """Create table.
+    """
+    node = current().context.node
+    try:
+        with Given(f"I have a {name} table"):
+            node.query(statement.format(name=name))
+        yield name
+    finally:
+        with Finally("I drop the table"):
+            if on_cluster:
+                node.query(f"DROP TABLE IF EXISTS {name} ON CLUSTER {on_cluster}")
+            else:
+                node.query(f"DROP TABLE IF EXISTS {name}")
diff --git a/tests/testflows/map_type/tests/feature.py b/tests/testflows/map_type/tests/feature.py
new file mode 100755
index 00000000000..5fd48844825
--- /dev/null
+++ b/tests/testflows/map_type/tests/feature.py
@@ -0,0 +1,1195 @@
+# -*- coding: utf-8 -*-
+import time
+
+from testflows.core import *
+from testflows.asserts import error
+
+from map_type.requirements import *
+from map_type.tests.common import *
+
+@TestOutline
+def select_map(self, map, output, exitcode=0, message=None):
+    """Create a map using select statement.
+    """
+    node = self.context.node
+
+    with When("I create a map using select", description=map):
+        r = node.query(f"SELECT {map}", exitcode=exitcode, message=message)
+
+    with Then("I expect output to match", description=output):
+        assert r.output == output, error()
+
+@TestOutline
+def table_map(self, type, data, select, filter, exitcode, message, check_insert=False, order_by=None):
+    """Check using a map column in a table.
+    """
+    uid = getuid()
+    node = self.context.node
+
+    if order_by is None:
+        order_by = "m"
+
+    with Given(f"table definition with {type}"):
+        sql = "CREATE TABLE {name} (m " + type + ") ENGINE = MergeTree() ORDER BY " + order_by
+
+    with And(f"I create a table", description=sql):
+        table = create_table(name=uid, statement=sql)
+
+    with When("I insert data into the map column"):
+        if check_insert:
+            node.query(f"INSERT INTO {table} VALUES {data}", exitcode=exitcode, message=message)
+        else:
+            node.query(f"INSERT INTO {table} VALUES {data}")
+
+    if not check_insert:
+        with And("I try to read from the table"):
+            node.query(f"SELECT {select} FROM {table} WHERE {filter} FORMAT JSONEachRow", exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Key_String("1.0")
+)
+@Examples("map output", [
+    ("map('',1)", "{'':1}", Name("empty string")),
+    ("map('hello',1)", "{'hello':1}", Name("non-empty string")),
+    ("map('Gãńdåłf_Thê_Gręât',1)", "{'Gãńdåłf_Thê_Gręât':1}", Name("utf-8 string")),
+    ("map('hello there',1)", "{'hello there':1}", Name("multi word string")),
+    ("map('hello',1,'there',2)", "{'hello':1,'there':2}", Name("multiple keys")),
+    ("map(toString(1),1)", "{'1':1}", Name("toString")),
+    ("map(toFixedString('1',1),1)", "{'1':1}", Name("toFixedString")),
+    ("map(toNullable('1'),1)", "{'1':1}", Name("Nullable")),
+    ("map(toNullable(NULL),1)", "{NULL:1}", Name("Nullable(NULL)")),
+    ("map(toLowCardinality('1'),1)", "{'1':1}", Name("LowCardinality(String)")),
+    ("map(toLowCardinality(toFixedString('1',1)),1)", "{'1':1}", Name("LowCardinality(FixedString)")),
+], row_format="%20s,%20s")
+def select_map_with_key_string(self, map, output):
+    """Create a map using select that has key string type.
+    """
+    select_map(map=map, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_String("1.0")
+)
+@Examples("map output", [
+    ("map('key','')", "{'key':''}", Name("empty string")),
+    ("map('key','hello')", "{'key':'hello'}", Name("non-empty string")),
+    ("map('key','Gãńdåłf_Thê_Gręât')", "{'key':'Gãńdåłf_Thê_Gręât'}", Name("utf-8 string")),
+    ("map('key','hello there')", "{'key':'hello there'}", Name("multi word string")),
+    ("map('key','hello','key2','there')", "{'key':'hello','key2':'there'}", Name("multiple keys")),
+    ("map('key',toString(1))", "{'key':'1'}", Name("toString")),
+    ("map('key',toFixedString('1',1))", "{'key':'1'}", Name("toFixedString")),
+    ("map('key',toNullable('1'))", "{'key':'1'}", Name("Nullable")),
+    ("map('key',toNullable(NULL))", "{'key':NULL}", Name("Nullable(NULL)")),
+    ("map('key',toLowCardinality('1'))", "{'key':'1'}", Name("LowCardinality(String)")),
+    ("map('key',toLowCardinality(toFixedString('1',1)))", "{'key':'1'}", Name("LowCardinality(FixedString)")),
+], row_format="%20s,%20s")
+def select_map_with_value_string(self, map, output):
+    """Create a map using select that has value string type.
+    """
+    select_map(map=map, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Array("1.0")
+)
+@Examples("map output", [
+    ("map('key',[])", "{'key':[]}", Name("empty Array")),
+    ("map('key',[1,2,3])", "{'key':[1,2,3]}", Name("non-empty array of ints")),
+    ("map('key',['1','2','3'])", "{'key':['1','2','3']}", Name("non-empty array of strings")),
+    ("map('key',[map(1,2),map(2,3)])", "{'key':[{1:2},{2:3}]}", Name("non-empty array of maps")),
+    ("map('key',[map(1,[map(1,[1])]),map(2,[map(2,[3])])])", "{'key':[{1:[{1:[1]}]},{2:[{2:[3]}]}]}", Name("non-empty array of maps of array of maps")),
+])
+def select_map_with_value_array(self, map, output):
+    """Create a map using select that has value array type.
+    """
+    select_map(map=map, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Integer("1.0")
+)
+@Examples("map output", [
+    ("(map(1,127,2,0,3,-128))", '{1:127,2:0,3:-128}', Name("Int8")),
+    ("(map(1,0,2,255))", '{1:0,2:255}', Name("UInt8")),
+    ("(map(1,32767,2,0,3,-32768))", '{1:32767,2:0,3:-32768}', Name("Int16")),
+    ("(map(1,0,2,65535))", '{1:0,2:65535}', Name("UInt16")),
+    ("(map(1,2147483647,2,0,3,-2147483648))", '{1:2147483647,2:0,3:-2147483648}', Name("Int32")),
+    ("(map(1,0,2,4294967295))", '{1:0,2:4294967295}', Name("UInt32")),
+    ("(map(1,9223372036854775807,2,0,3,-9223372036854775808))", '{1:"9223372036854775807",2:"0",3:"-9223372036854775808"}', Name("Int64")),
+    ("(map(1,0,2,18446744073709551615))", '{1:0,2:18446744073709551615}', Name("UInt64")),
+    ("(map(1,170141183460469231731687303715884105727,2,0,3,-170141183460469231731687303715884105728))", '{1:1.7014118346046923e38,2:0,3:-1.7014118346046923e38}', Name("Int128")),
+    ("(map(1,57896044618658097711785492504343953926634992332820282019728792003956564819967,2,0,3,-57896044618658097711785492504343953926634992332820282019728792003956564819968))", '{1:5.78960446186581e76,2:0,3:-5.78960446186581e76}', Name("Int256")),
+    ("(map(1,0,2,115792089237316195423570985008687907853269984665640564039457584007913129639935))", '{1:0,2:1.157920892373162e77}', Name("UInt256")),
+    ("(map(1,toNullable(1)))", '{1:1}', Name("toNullable")),
+    ("(map(1,toNullable(NULL)))", '{1:NULL}', Name("toNullable(NULL)")),
+])
+def select_map_with_value_integer(self, map, output):
+    """Create a map using select that has value integer type.
+    """
+    select_map(map=map, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Key_Integer("1.0")
+)
+@Examples("map output", [
+    ("(map(127,1,0,1,-128,1))", '{127:1,0:1,-128:1}', Name("Int8")),
+    ("(map(0,1,255,1))", '{0:1,255:1}', Name("UInt8")),
+    ("(map(32767,1,0,1,-32768,1))", '{32767:1,0:1,-32768:1}', Name("Int16")),
+    ("(map(0,1,65535,1))", '{0:1,65535:1}', Name("UInt16")),
+    ("(map(2147483647,1,0,1,-2147483648,1))", '{2147483647:1,0:1,-2147483648:1}', Name("Int32")),
+    ("(map(0,1,4294967295,1))", '{0:1,4294967295:1}', Name("UInt32")),
+    ("(map(9223372036854775807,1,0,1,-9223372036854775808,1))", '{"9223372036854775807":1,"0":1,"-9223372036854775808":1}', Name("Int64")),
+    ("(map(0,1,18446744073709551615,1))", '{0:1,18446744073709551615:1}', Name("UInt64")),
+    ("(map(170141183460469231731687303715884105727,1,0,1,-170141183460469231731687303715884105728,1))", '{1.7014118346046923e38:1,0:1,-1.7014118346046923e38:1}', Name("Int128")),
+    ("(map(57896044618658097711785492504343953926634992332820282019728792003956564819967,1,0,1,-57896044618658097711785492504343953926634992332820282019728792003956564819968,1))", '{5.78960446186581e76:1,0:1,-5.78960446186581e76:1}', Name("Int256")),
+    ("(map(0,1,115792089237316195423570985008687907853269984665640564039457584007913129639935,1))", '{0:1,1.157920892373162e77:1}', Name("UInt256")),
+    ("(map(toNullable(1),1))", '{1:1}', Name("toNullable")),
+    ("(map(toNullable(NULL),1))", '{NULL:1}', Name("toNullable(NULL)")),
+])
+def select_map_with_key_integer(self, map, output):
+    """Create a map using select that has key integer type.
+    """
+    select_map(map=map, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Key_String("1.0")
+)
+@Examples("type data output", [
+    ("Map(String, Int8)", "('2020-01-01', map('',1))", '{"d":"2020-01-01","m":{"":1}}', Name("empty string")),
+    ("Map(String, Int8)", "('2020-01-01', map('hello',1))", '{"d":"2020-01-01","m":{"hello":1}}', Name("non-empty string")),
+    ("Map(String, Int8)", "('2020-01-01', map('Gãńdåłf_Thê_Gręât',1))", '{"d":"2020-01-01","m":{"Gãńdåłf_Thê_Gręât":1}}', Name("utf-8 string")),
+    ("Map(String, Int8)", "('2020-01-01', map('hello there',1))", '{"d":"2020-01-01","m":{"hello there":1}}', Name("multi word string")),
+    ("Map(String, Int8)", "('2020-01-01', map('hello',1,'there',2))", '{"d":"2020-01-01","m":{"hello":1,"there":2}}', Name("multiple keys")),
+    ("Map(String, Int8)", "('2020-01-01', map(toString(1),1))", '{"d":"2020-01-01","m":{"1":1}}', Name("toString")),
+    ("Map(FixedString(1), Int8)", "('2020-01-01', map(toFixedString('1',1),1))", '{"d":"2020-01-01","m":{"1":1}}', Name("FixedString")),
+    ("Map(Nullable(String), Int8)", "('2020-01-01', map(toNullable('1'),1))", '{"d":"2020-01-01","m":{"1":1}}', Name("Nullable")),
+    ("Map(Nullable(String), Int8)", "('2020-01-01', map(toNullable(NULL),1))", '{"d":"2020-01-01","m":{null:1}}', Name("Nullable(NULL)")),
+    ("Map(LowCardinality(String), Int8)", "('2020-01-01', map(toLowCardinality('1'),1))", '{"d":"2020-01-01","m":{"1":1}}', Name("LowCardinality(String)")),
+    ("Map(LowCardinality(String), Int8)", "('2020-01-01', map('1',1))", '{"d":"2020-01-01","m":{"1":1}}', Name("LowCardinality(String) cast from String")),
+    ("Map(LowCardinality(String), LowCardinality(String))", "('2020-01-01', map('1','1'))", '{"d":"2020-01-01","m":{"1":"1"}}', Name("LowCardinality(String) for key and value")),
+    ("Map(LowCardinality(FixedString(1)), Int8)", "('2020-01-01', map(toLowCardinality(toFixedString('1',1)),1))", '{"d":"2020-01-01","m":{"1":1}}', Name("LowCardinality(FixedString)")),
+])
+def table_map_with_key_string(self, type, data, output):
+    """Check what values we can insert into map type column with key string.
+    """
+    insert_into_table(type=type, data=data, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Key_String("1.0")
+)
+@Examples("type data output select", [
+    ("Map(String, Int8)", "('2020-01-01', map('',1))", '{"m":1}', "m[''] AS m", Name("empty string")),
+    ("Map(String, Int8)", "('2020-01-01', map('hello',1))", '{"m":1}', "m['hello'] AS m", Name("non-empty string")),
+    ("Map(String, Int8)", "('2020-01-01', map('Gãńdåłf_Thê_Gręât',1))", '{"m":1}', "m['Gãńdåłf_Thê_Gręât'] AS m", Name("utf-8 string")),
+    ("Map(String, Int8)", "('2020-01-01', map('hello there',1))", '{"m":1}', "m['hello there'] AS m", Name("multi word string")),
+    ("Map(String, Int8)", "('2020-01-01', map('hello',1,'there',2))", '{"m":1}', "m['hello'] AS m", Name("multiple keys")),
+    ("Map(String, Int8)", "('2020-01-01', map(toString(1),1))", '{"m":1}', "m['1'] AS m", Name("toString")),
+    ("Map(FixedString(1), Int8)", "('2020-01-01', map(toFixedString('1',1),1))", '{"m":1}', "m['1'] AS m", Name("FixedString")),
+    ("Map(Nullable(String), Int8)", "('2020-01-01', map(toNullable('1'),1))", '{"m":1}}', "m['1'] AS m", Name("Nullable")),
+    ("Map(Nullable(String), Int8)", "('2020-01-01', map(toNullable(NULL),1))", '{"m":1}', "m[null] AS m", Name("Nullable(NULL)")),
+    ("Map(LowCardinality(String), Int8)", "('2020-01-01', map(toLowCardinality('1'),1))", '{"m":1}}', "m['1'] AS m", Name("LowCardinality(String)")),
+    ("Map(LowCardinality(String), Int8)", "('2020-01-01', map('1',1))", '{"m":1}', "m['1'] AS m", Name("LowCardinality(String) cast from String")),
+    ("Map(LowCardinality(String), LowCardinality(String))", "('2020-01-01', map('1','1'))", '{"m":"1"}', "m['1'] AS m", Name("LowCardinality(String) for key and value")),
+    ("Map(LowCardinality(FixedString(1)), Int8)", "('2020-01-01', map(toLowCardinality(toFixedString('1',1)),1))", '{"m":1}', "m['1'] AS m", Name("LowCardinality(FixedString)")),
+])
+def table_map_select_key_with_key_string(self, type, data, output, select):
+    """Check what values we can insert into map type column with key string and if key can be selected.
+    """
+    insert_into_table(type=type, data=data, output=output, select=select)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_String("1.0")
+)
+@Examples("type data output", [
+    ("Map(String, String)", "('2020-01-01', map('key',''))", '{"d":"2020-01-01","m":{"key":""}}', Name("empty string")),
+    ("Map(String, String)", "('2020-01-01', map('key','hello'))", '{"d":"2020-01-01","m":{"key":"hello"}}', Name("non-empty string")),
+    ("Map(String, String)", "('2020-01-01', map('key','Gãńdåłf_Thê_Gręât'))", '{"d":"2020-01-01","m":{"key":"Gãńdåłf_Thê_Gręât"}}', Name("utf-8 string")),
+    ("Map(String, String)", "('2020-01-01', map('key', 'hello there'))", '{"d":"2020-01-01","m":{"key":"hello there"}}', Name("multi word string")),
+    ("Map(String, String)", "('2020-01-01', map('key','hello','key2','there'))", '{"d":"2020-01-01","m":{"key":"hello","key2":"there"}}', Name("multiple keys")),
+    ("Map(String, String)", "('2020-01-01', map('key', toString(1)))", '{"d":"2020-01-01","m":{"key":"1"}}', Name("toString")),
+    ("Map(String, FixedString(1))", "('2020-01-01', map('key',toFixedString('1',1)))", '{"d":"2020-01-01","m":{"key":"1"}}', Name("FixedString")),
+    ("Map(String, Nullable(String))", "('2020-01-01', map('key',toNullable('1')))", '{"d":"2020-01-01","m":{"key":"1"}}', Name("Nullable")),
+    ("Map(String, Nullable(String))", "('2020-01-01', map('key',toNullable(NULL)))", '{"d":"2020-01-01","m":{"key":null}}', Name("Nullable(NULL)")),
+    ("Map(String, LowCardinality(String))", "('2020-01-01', map('key',toLowCardinality('1')))", '{"d":"2020-01-01","m":{"key":"1"}}', Name("LowCardinality(String)")),
+    ("Map(String, LowCardinality(String))", "('2020-01-01', map('key','1'))", '{"d":"2020-01-01","m":{"key":"1"}}', Name("LowCardinality(String) cast from String")),
+    ("Map(LowCardinality(String), LowCardinality(String))", "('2020-01-01', map('1','1'))", '{"d":"2020-01-01","m":{"1":"1"}}', Name("LowCardinality(String) for key and value")),
+    ("Map(String, LowCardinality(FixedString(1)))", "('2020-01-01', map('key',toLowCardinality(toFixedString('1',1))))", '{"d":"2020-01-01","m":{"key":"1"}}', Name("LowCardinality(FixedString)"))
+])
+def table_map_with_value_string(self, type, data, output):
+    """Check what values we can insert into map type column with value string.
+    """
+    insert_into_table(type=type, data=data, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_String("1.0")
+)
+@Examples("type data output", [
+    ("Map(String, String)", "('2020-01-01', map('key',''))", '{"m":""}', Name("empty string")),
+    ("Map(String, String)", "('2020-01-01', map('key','hello'))", '{"m":"hello"}', Name("non-empty string")),
+    ("Map(String, String)", "('2020-01-01', map('key','Gãńdåłf_Thê_Gręât'))", '{"m":"Gãńdåłf_Thê_Gręât"}', Name("utf-8 string")),
+    ("Map(String, String)", "('2020-01-01', map('key', 'hello there'))", '{"m":"hello there"}', Name("multi word string")),
+    ("Map(String, String)", "('2020-01-01', map('key','hello','key2','there'))", '{"m":"hello"}', Name("multiple keys")),
+    ("Map(String, String)", "('2020-01-01', map('key', toString(1)))", '{"m":"1"}', Name("toString")),
+    ("Map(String, FixedString(1))", "('2020-01-01', map('key',toFixedString('1',1)))", '{"m":"1"}', Name("FixedString")),
+    ("Map(String, Nullable(String))", "('2020-01-01', map('key',toNullable('1')))", '{"m":"1"}', Name("Nullable")),
+    ("Map(String, Nullable(String))", "('2020-01-01', map('key',toNullable(NULL)))", '{"m":null}', Name("Nullable(NULL)")),
+    ("Map(String, LowCardinality(String))", "('2020-01-01', map('key',toLowCardinality('1')))", '{"m":"1"}', Name("LowCardinality(String)")),
+    ("Map(String, LowCardinality(String))", "('2020-01-01', map('key','1'))", '{"m":"1"}', Name("LowCardinality(String) cast from String")),
+    ("Map(LowCardinality(String), LowCardinality(String))", "('2020-01-01', map('key','1'))", '{"m":"1"}', Name("LowCardinality(String) for key and value")),
+    ("Map(String, LowCardinality(FixedString(1)))", "('2020-01-01', map('key',toLowCardinality(toFixedString('1',1))))", '{"m":"1"}', Name("LowCardinality(FixedString)"))
+])
+def table_map_select_key_with_value_string(self, type, data, output):
+    """Check what values we can insert into map type column with value string and if it can be selected by key.
+    """
+    insert_into_table(type=type, data=data, output=output, select="m['key'] AS m")
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Integer("1.0")
+)
+@Examples("type data output", [
+    ("Map(Int8, Int8)", "('2020-01-01', map(1,127,2,0,3,-128))", '{"d":"2020-01-01","m":{1:127,2:0,3:-128}}', Name("Int8")),
+    ("Map(Int8, UInt8)", "('2020-01-01', map(1,0,2,255))", '{"d":"2020-01-01","m":{1:0,2:255}}', Name("UInt8")),
+    ("Map(Int8, Int16)", "('2020-01-01', map(1,127,2,0,3,-128))", '{"d":"2020-01-01","m":{1:32767,2:0,3:-32768}}', Name("Int16")),
+    ("Map(Int8, UInt16)", "('2020-01-01', map(1,0,2,65535))", '{"d":"2020-01-01","m":{1:0,2:65535}}', Name("UInt16")),
+    ("Map(Int8, Int32)", "('2020-01-01', map(1,127,2,0,3,-128))", '{"d":"2020-01-01","m":{1:2147483647,2:0,3:-2147483648}}', Name("Int32")),
+    ("Map(Int8, UInt32)", "('2020-01-01', map(1,0,2,4294967295))", '{"d":"2020-01-01","m":{1:0,2:4294967295}}', Name("UInt32")),
+    ("Map(Int8, Int64)", "('2020-01-01', map(1,9223372036854775807,2,0,3,-9223372036854775808))", '{"d":"2020-01-01","m":{1:"9223372036854775807",2:"0",3:"-9223372036854775808"}}', Name("Int64")),
+    ("Map(Int8, UInt64)", "('2020-01-01', map(1,0,2,18446744073709551615))", '{"d":"2020-01-01","m":{1:"0",2:"18446744073709551615"}}', Name("UInt64")),
+    ("Map(Int8, Int128)", "('2020-01-01', map(1,170141183460469231731687303715884105727,2,0,3,-170141183460469231731687303715884105728))", '{"d":"2020-01-01","m":{1:"170141183460469231731687303715884105727",2:"0",3:"-170141183460469231731687303715884105728"}}', Name("Int128")),
+    ("Map(Int8, Int256)", "('2020-01-01', map(1,57896044618658097711785492504343953926634992332820282019728792003956564819967,2,0,3,-57896044618658097711785492504343953926634992332820282019728792003956564819968))", '{"d":"2020-01-01","m":{1:"57896044618658097711785492504343953926634992332820282019728792003956564819967",2:"0",3:"-57896044618658097711785492504343953926634992332820282019728792003956564819968"}}', Name("Int256")),
+    ("Map(Int8, UInt256)", "('2020-01-01', map(1,0,2,115792089237316195423570985008687907853269984665640564039457584007913129639935))", '{"d":"2020-01-01","m":{1:"0",2:"115792089237316195423570985008687907853269984665640564039457584007913129639935"}}', Name("UInt256")),
+    ("Map(Int8, Nullable(Int8))", "('2020-01-01', map(1,toNullable(1)))", '{"d":"2020-01-01","m":{1:1}}', Name("toNullable")),
+    ("Map(Int8, Nullable(Int8))", "('2020-01-01', map(1,toNullable(NULL)))", '{"d":"2020-01-01","m":{1:null}}', Name("toNullable(NULL)")),
+])
+def table_map_with_value_integer(self, type, data, output):
+    """Check what values we can insert into map type column with value integer.
+    """
+    insert_into_table(type=type, data=data, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Array("1.0")
+)
+@Examples("type data output", [
+    ("Map(String, Array(Int8))", "('2020-01-01', map('key',[]))", '{"d":"2020-01-01","m":{"key":[]}}', Name("empty array")),
+    ("Map(String, Array(Int8))", "('2020-01-01', map('key',[1,2,3]))", '{"d":"2020-01-01","m":{"key":[1,2,3]}}', Name("non-empty array of ints")),
+    ("Map(String, Array(String))", "('2020-01-01', map('key',['1','2','3']))", '{"d":"2020-01-01","m":{"key":["1","2","3"]}}', Name("non-empty array of strings")),
+    ("Map(String, Array(Map(Int8, Int8)))", "('2020-01-01', map('key',[map(1,2),map(2,3)]))", '{"d":"2020-01-01","m":{"key":[{1:2},{2:3}]}}', Name("non-empty array of maps")),
+    ("Map(String, Array(Map(Int8, Array(Map(Int8, Array(Int8))))))", "('2020-01-01', map('key',[map(1,[map(1,[1])]),map(2,[map(2,[3])])]))", '{"d":"2020-01-01","m":{"key":[{1:[{1:[1]}]},{2:[{2:[3]}]}]}}', Name("non-empty array of maps of array of maps")),
+])
+def table_map_with_value_array(self, type, data, output):
+    """Check what values we can insert into map type column with value Array.
+    """
+    insert_into_table(type=type, data=data, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Key_Integer("1.0")
+)
+@Examples("type data output", [
+    ("Map(Int8, Int8)", "('2020-01-01', map(127,1,0,1,-128,1))", '{"d":"2020-01-01","m":{127:1,0:1,-128:1}}', Name("Int8")),
+    ("Map(UInt8, Int8)", "('2020-01-01', map(0,1,255,1))", '{"d":"2020-01-01","m":{0:1,255:1}}', Name("UInt8")),
+    ("Map(Int16, Int8)", "('2020-01-01', map(127,1,0,1,-128,1))", '{"d":"2020-01-01","m":{32767:1,0:1,-32768:1}}', Name("Int16")),
+    ("Map(UInt16, Int8)", "('2020-01-01', map(0,1,65535,1))", '{"d":"2020-01-01","m":{0:1,65535:1}}', Name("UInt16")),
+    ("Map(Int32, Int8)", "('2020-01-01', map(2147483647,1,0,1,-2147483648,1))", '{"d":"2020-01-01","m":{2147483647:1,0:1,-2147483648:1}}', Name("Int32")),
+    ("Map(UInt32, Int8)", "('2020-01-01', map(0,1,4294967295,1))", '{"d":"2020-01-01","m":{0:1,4294967295:1}}', Name("UInt32")),
+    ("Map(Int64, Int8)", "('2020-01-01', map(9223372036854775807,1,0,1,-9223372036854775808,1))", '{"d":"2020-01-01","m":{"9223372036854775807":1,"0":1,"-9223372036854775808":1}}', Name("Int64")),
+    ("Map(UInt64, Int8)", "('2020-01-01', map(0,1,18446744073709551615,1))", '{"d":"2020-01-01","m":{"0":1,"18446744073709551615":1}}', Name("UInt64")),
+    ("Map(Int128, Int8)", "('2020-01-01', map(170141183460469231731687303715884105727,1,0,1,-170141183460469231731687303715884105728,1))", '{"d":"2020-01-01","m":{170141183460469231731687303715884105727:1,0:1,"-170141183460469231731687303715884105728":1}}', Name("Int128")),
+    ("Map(Int256, Int8)", "('2020-01-01', map(57896044618658097711785492504343953926634992332820282019728792003956564819967,1,0,1,-57896044618658097711785492504343953926634992332820282019728792003956564819968,1))", '{"d":"2020-01-01","m":{"57896044618658097711785492504343953926634992332820282019728792003956564819967":1,"0":1,"-57896044618658097711785492504343953926634992332820282019728792003956564819968":1}}', Name("Int256")),
+    ("Map(UInt256, Int8)", "('2020-01-01', map(0,1,115792089237316195423570985008687907853269984665640564039457584007913129639935,1))", '{"d":"2020-01-01","m":{"0":1,"115792089237316195423570985008687907853269984665640564039457584007913129639935":1}}', Name("UInt256")),
+    ("Map(Nullable(Int8), Int8)", "('2020-01-01', map(toNullable(1),1))", '{"d":"2020-01-01","m":{1:1}}', Name("toNullable")),
+    ("Map(Nullable(Int8), Int8)", "('2020-01-01', map(toNullable(NULL),1))", '{"d":"2020-01-01","m":{null:1}}', Name("toNullable(NULL)")),
+])
+def table_map_with_key_integer(self, type, data, output):
+    """Check what values we can insert into map type column with key integer.
+    """
+    insert_into_table(type=type, data=data, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Key_Integer("1.0")
+)
+@Examples("type data output select", [
+    ("Map(Int8, Int8)", "('2020-01-01', map(127,1,0,1,-128,1))", '{"m":1}', "m[127] AS m", Name("Int8")),
+    ("Map(UInt8, Int8)", "('2020-01-01', map(0,1,255,1))", '{"m":2}', "(m[255] + m[0]) AS m", Name("UInt8")),
+    ("Map(Int16, Int8)", "('2020-01-01', map(127,1,0,1,-128,1))", '{"m":3}', "(m[-128] + m[0] + m[-128]) AS m", Name("Int16")),
+    ("Map(UInt16, Int8)", "('2020-01-01', map(0,1,65535,1))", '{"m":2}', "(m[0] + m[65535]) AS m", Name("UInt16")),
+    ("Map(Int32, Int8)", "('2020-01-01', map(2147483647,1,0,1,-2147483648,1))", '{"m":3}', "(m[2147483647] + m[0] + m[-2147483648]) AS m", Name("Int32")),
+    ("Map(UInt32, Int8)", "('2020-01-01', map(0,1,4294967295,1))", '{"m":2}', "(m[0] + m[4294967295]) AS m", Name("UInt32")),
+    ("Map(Int64, Int8)", "('2020-01-01', map(9223372036854775807,1,0,1,-9223372036854775808,1))", '{"m":3}', "(m[9223372036854775807] + m[0] + m[-9223372036854775808]) AS m", Name("Int64")),
+    ("Map(UInt64, Int8)", "('2020-01-01', map(0,1,18446744073709551615,1))", '{"m":2}', "(m[0] + m[18446744073709551615]) AS m", Name("UInt64")),
+    ("Map(Int128, Int8)", "('2020-01-01', map(170141183460469231731687303715884105727,1,0,1,-170141183460469231731687303715884105728,1))", '{"m":3}', "(m[170141183460469231731687303715884105727] + m[0] + m[-170141183460469231731687303715884105728]) AS m", Name("Int128")),
+    ("Map(Int256, Int8)", "('2020-01-01', map(57896044618658097711785492504343953926634992332820282019728792003956564819967,1,0,1,-57896044618658097711785492504343953926634992332820282019728792003956564819968,1))", '{"m":3}', "(m[57896044618658097711785492504343953926634992332820282019728792003956564819967] + m[0] + m[-57896044618658097711785492504343953926634992332820282019728792003956564819968]) AS m", Name("Int256")),
+    ("Map(UInt256, Int8)", "('2020-01-01', map(0,1,115792089237316195423570985008687907853269984665640564039457584007913129639935,1))", '{"m":2}', "(m[0] + m[115792089237316195423570985008687907853269984665640564039457584007913129639935]) AS m", Name("UInt256")),
+    ("Map(Nullable(Int8), Int8)", "('2020-01-01', map(toNullable(1),1))", '{"m":1}', "m[1] AS m", Name("toNullable")),
+    ("Map(Nullable(Int8), Int8)", "('2020-01-01', map(toNullable(NULL),1))", '{"m":1}', "m[null] AS m", Name("toNullable(NULL)")),
+])
+def table_map_select_key_with_key_integer(self, type, data, output, select):
+    """Check what values we can insert into map type column with key integer and if we can use the key to select the value.
+    """
+    insert_into_table(type=type, data=data, output=output, select=select)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_ArrayOfMaps("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_NestedWithMaps("1.0")
+)
+@Examples("type data output partition_by", [
+    ("Array(Map(String, Int8))",
+        "('2020-01-01', [map('hello',1),map('hello',1,'there',2)])",
+        '{"d":"2020-01-01","m":[{"hello":1},{"hello":1,"there":2}]}',
+        "m",
+        Name("Array(Map(String, Int8))")),
+    ("Nested(x Map(String, Int8))",
+        "('2020-01-01', [map('hello',1)])",
+       '{"d":"2020-01-01","m.x":[{"hello":1}]}',
+       "m.x",
+       Name("Nested(x Map(String, Int8)"))
+])
+def table_with_map_inside_another_type(self, type, data, output, partition_by):
+    """Check what values we can insert into a type that has map type.
+    """
+    insert_into_table(type=type, data=data, output=output, partition_by=partition_by)
+
+@TestOutline
+def insert_into_table(self, type, data, output, partition_by="m", select="*"):
+    """Check we can insert data into a table.
+    """
+    uid = getuid()
+    node = self.context.node
+
+    with Given(f"table definition with {type}"):
+        sql = "CREATE TABLE {name} (d DATE, m " + type + ") ENGINE = MergeTree() PARTITION BY " + partition_by + " ORDER BY d"
+
+    with Given(f"I create a table", description=sql):
+        table = create_table(name=uid, statement=sql)
+
+    with When("I insert data", description=data):
+        sql = f"INSERT INTO {table} VALUES {data}"
+        node.query(sql)
+
+    with And("I select rows from the table"):
+        r = node.query(f"SELECT {select} FROM {table} FORMAT JSONEachRow")
+
+    with Then("I expect output to match", description=output):
+        assert r.output == output, error()
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MixedKeyOrValueTypes("1.0")
+)
+def select_map_with_invalid_mixed_key_and_value_types(self):
+    """Check that creating a map with mixed key types fails.
+    """
+    node = self.context.node
+    exitcode = 130
+    message = "DB::Exception: There is no supertype for types String, UInt8 because some of them are String/FixedString and some of them are not"
+
+    with Check("attempt to create a map using SELECT with mixed key types then it fails"):
+        node.query("SELECT map('hello',1,2,3)", exitcode=exitcode, message=message)
+
+    with Check("attempt to create a map using SELECT with mixed value types then it fails"):
+        node.query("SELECT map(1,'hello',2,2)", exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_InvalidNumberOfArguments("1.0")
+)
+def select_map_with_invalid_number_of_arguments(self):
+    """Check that creating a map with invalid number of arguments fails.
+    """
+    node = self.context.node
+    exitcode = 42
+    message = "DB::Exception: Function map requires even number of arguments"
+
+    with When("I create a map using SELECT with invalid number of arguments"):
+        node.query("SELECT map(1,2,3)", exitcode=exitcode, message=message)
+
+@TestScenario
+def select_map_empty(self):
+    """Check that we can can create a empty map by not passing any arguments.
+    """
+    node = self.context.node
+
+    with When("I create a map using SELECT with no arguments"):
+        r = node.query("SELECT map()")
+
+    with Then("it should create an empty map"):
+        assert r.output == "{}", error()
+
+@TestScenario
+def insert_invalid_mixed_key_and_value_types(self):
+    """Check that inserting a map with mixed key or value types fails.
+    """
+    uid = getuid()
+    node = self.context.node
+    exitcode = 130
+    message = "DB::Exception: There is no supertype for types String, UInt8 because some of them are String/FixedString and some of them are not"
+
+    with Given(f"table definition with {type}"):
+        sql = "CREATE TABLE {name} (d DATE, m Map(String, Int8)) ENGINE = MergeTree() PARTITION BY m ORDER BY d"
+
+    with And(f"I create a table", description=sql):
+        table = create_table(name=uid, statement=sql)
+
+    with When("I insert a map with mixed key types then it should fail"):
+        sql = f"INSERT INTO {table} VALUES ('2020-01-01', map('hello',1,2,3))"
+        node.query(sql, exitcode=exitcode, message=message)
+
+    with When("I insert a map with mixed value types then it should fail"):
+        sql = f"INSERT INTO {table} VALUES ('2020-01-01', map(1,'hello',2,2))"
+        node.query(sql, exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_DuplicatedKeys("1.0")
+)
+@Examples("type data output", [
+    ("Map(String, String)",
+        "('2020-01-01', map('hello','there','hello','over there'))",
+        '{"d":"2020-01-01","m":{"hello":"there","hello":"over there"}}',
+        Name("Map(String, String))")),
+    ("Map(Int64, String)",
+     "('2020-01-01', map(12345,'there',12345,'over there'))",
+     '{"d":"2020-01-01","m":{"12345":"there","12345":"over there"}}',
+     Name("Map(Int64, String))")),
+])
+def table_map_with_duplicated_keys(self, type, data, output):
+    """Check that map supports duplicated keys.
+    """
+    insert_into_table(type=type, data=data, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_DuplicatedKeys("1.0")
+)
+@Examples("map output", [
+    ("map('hello','there','hello','over there')", "{'hello':'there','hello':'over there'}", Name("String")),
+    ("map(12345,'there',12345,'over there')", "{12345:'there',12345:'over there'}", Name("Integer"))
+])
+def select_map_with_duplicated_keys(self, map, output):
+    """Check creating a map with duplicated keys.
+    """
+    select_map(map=map, output=output)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyNotFound("1.0")
+)
+def select_map_key_not_found(self):
+    node = self.context.node
+
+    with When("map is empty"):
+        node.query("SELECT map() AS m, m[1]", exitcode=43, message="DB::Exception: Illegal types of arguments")
+
+    with When("map has integer values"):
+        r = node.query("SELECT map(1,2) AS m, m[2] FORMAT Values")
+    with Then("zero should be returned for key that is not found"):
+        assert r.output == "({1:2},0)", error()
+
+    with When("map has string values"):
+        r = node.query("SELECT map(1,'2') AS m, m[2] FORMAT Values")
+    with Then("empty string should be returned for key that is not found"):
+        assert r.output == "({1:'2'},'')", error()
+
+    with When("map has array values"):
+        r = node.query("SELECT map(1,[2]) AS m, m[2] FORMAT Values")
+    with Then("empty array be returned for key that is not found"):
+        assert r.output == "({1:[2]},[])", error()
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyNotFound("1.0")
+)
+@Examples("type data select exitcode message", [
+    ("Map(UInt8, UInt8), y Int8", "(y) VALUES (1)", "m[1] AS v", 0, '{"v":0}', Name("empty map")),
+    ("Map(UInt8, UInt8)", "VALUES (map(1,2))", "m[2] AS v", 0, '{"v":0}', Name("map has integer values")),
+    ("Map(UInt8, String)", "VALUES (map(1,'2'))", "m[2] AS v", 0, '{"v":""}', Name("map has string values")),
+    ("Map(UInt8, Array(Int8))", "VALUES (map(1,[2]))", "m[2] AS v", 0, '{"v":[]}', Name("map has array values")),
+])
+def table_map_key_not_found(self, type, data, select, exitcode, message, order_by=None):
+    """Check values returned from a map column when key is not found.
+    """
+    uid = getuid()
+    node = self.context.node
+
+    if order_by is None:
+        order_by = "m"
+
+    with Given(f"table definition with {type}"):
+        sql = "CREATE TABLE {name} (m " + type + ") ENGINE = MergeTree() ORDER BY " + order_by
+
+    with And(f"I create a table", description=sql):
+        table = create_table(name=uid, statement=sql)
+
+    with When("I insert data into the map column"):
+        node.query(f"INSERT INTO {table} {data}")
+
+    with And("I try to read from the table"):
+        node.query(f"SELECT {select} FROM {table} FORMAT JSONEachRow", exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyInvalid("1.0")
+)
+def invalid_key(self):
+    """Check when key is not valid.
+    """
+    node = self.context.node
+
+    with When("I try to use an integer key that is too large"):
+        node.query("SELECT map(1,2) AS m, m[256]", exitcode=43, message="DB::Exception: Illegal types of arguments")
+
+    with When("I try to use an integer key that is negative when key is unsigned"):
+        node.query("SELECT map(1,2) AS m, m[-1]", exitcode=43, message="DB::Exception: Illegal types of arguments")
+
+    with When("I try to use a string key when key is an integer"):
+        node.query("SELECT map(1,2) AS m, m['1']", exitcode=43, message="DB::Exception: Illegal types of arguments")
+
+    with When("I try to use an integer key when key is a string"):
+        r = node.query("SELECT map('1',2) AS m, m[1]", exitcode=43, message="DB::Exception: Illegal types of arguments")
+
+    with When("I try to use an empty key when key is a string"):
+        r = node.query("SELECT map('1',2) AS m, m[]", exitcode=62, message="DB::Exception: Syntax error: failed at position")
+
+    with When("I try to use wrong type conversion in key"):
+        r = node.query("SELECT map(1,2) AS m, m[toInt8('1')]", exitcode=43, message="DB::Exception: Illegal types of arguments")
+
+    with When("in array of maps I try to use an integer key that is negative when key is unsigned"):
+        node.query("SELECT [map(1,2)] AS m, m[1][-1]", exitcode=43, message="DB::Exception: Illegal types of arguments")
+
+    with When("I try to use a NULL key when key is not nullable"):
+        r = node.query("SELECT map(1,2) AS m, m[NULL] FORMAT Values")
+    with Then("it should return NULL"):
+        assert r.output == "({1:2},NULL)", error()
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval_KeyInvalid("1.0")
+)
+@Examples("type data select exitcode message order_by", [
+    ("Map(UInt8, UInt8)", "(map(1,2))", "m[256] AS v", 0, '{"v":0}', "m", Name("key too large)")),
+    ("Map(UInt8, UInt8)", "(map(1,2))", "m[-1] AS v", 0, '{"v":0}', "m", Name("key is negative")),
+    ("Map(UInt8, UInt8)", "(map(1,2))", "m['1'] AS v", 43, "DB::Exception: Illegal types of arguments", "m", Name("string when key is integer")),
+    ("Map(String, UInt8)", "(map('1',2))", "m[1] AS v", 43, "DB::Exception: Illegal types of arguments", "m", Name("integer when key is string")),
+    ("Map(String, UInt8)", "(map('1',2))", "m[] AS v", 62, "DB::Exception: Syntax error: failed at position", "m", Name("empty when key is string")),
+    ("Map(UInt8, UInt8)", "(map(1,2))", "m[toInt8('1')] AS v", 0, '{"v":2}', "m", Name("wrong type conversion when key is integer")),
+    ("Map(String, UInt8)", "(map('1',2))", "m[toFixedString('1',1)] AS v", 0, '{"v":2}', "m", Name("wrong type conversion when key is string")),
+    ("Map(UInt8, UInt8)", "(map(1,2))", "m[NULL] AS v", 0, '{"v":null}', "m", Name("NULL key when key is not nullable")),
+    ("Array(Map(UInt8, UInt8))", "([map(1,2)])", "m[1]['1'] AS v", 43, "DB::Exception: Illegal types of arguments", "m", Name("string when key is integer in array of maps")),
+    ("Nested(x Map(UInt8, UInt8))", "([map(1,2)])", "m.x[1]['1'] AS v", 43, "DB::Exception: Illegal types of arguments", "m.x", Name("string when key is integer in nested map")),
+])
+def table_map_invalid_key(self, type, data, select, exitcode, message, order_by="m"):
+    """Check selecting values from a map column using an invalid key.
+    """
+    uid = getuid()
+    node = self.context.node
+
+    with Given(f"table definition with {type}"):
+        sql = "CREATE TABLE {name} (m " + type + ") ENGINE = MergeTree() ORDER BY " + order_by
+
+    with And(f"I create a table", description=sql):
+        table = create_table(name=uid, statement=sql)
+
+    with When("I insert data into the map column"):
+        node.query(f"INSERT INTO {table} VALUES {data}")
+
+    with And("I try to read from the table"):
+        node.query(f"SELECT {select} FROM {table} FORMAT JSONEachRow", exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Value_Retrieval("1.0")
+)
+@Examples("type data select filter exitcode message order_by", [
+    ("Map(UInt8, UInt8)", "(map(1,1)),(map(1,2)),(map(2,3))", "m[1] AS v", "1=1 ORDER BY m[1]", 0, '{"v":0}\n{"v":1}\n{"v":2}', None,
+        Name("select the same key from all the rows")),
+    ("Map(String, String)", "(map('a','b')),(map('c','d','e','f')),(map('e','f'))", "m", "m = map('e','f','c','d')", 0, '', None,
+        Name("filter rows by map having different pair order")),
+    ("Map(String, String)", "(map('a','b')),(map('c','d','e','f')),(map('e','f'))", "m", "m = map('c','d','e','f')", 0, '{"m":{"c":"d","e":"f"}}', None,
+        Name("filter rows by map having the same pair order")),
+    ("Map(String, String)", "(map('a','b')),(map('e','f'))", "m", "m = map()", 0, '', None,
+        Name("filter rows by empty map")),
+    ("Map(String, Int8)", "(map('a',1,'b',2)),(map('a',2)),(map('b',3))", "m", "m['a'] = 1", 0, '{"m":{"a":1,"b":2}}', None,
+        Name("filter rows by map key value")),
+    ("Map(String, Int8)", "(map('a',1,'b',2)),(map('a',2)),(map('b',3))", "m", "m['a'] = 1 AND m['b'] = 2", 0, '{"m":{"a":1,"b":2}}', None,
+        Name("filter rows by map multiple key value combined with AND")),
+    ("Map(String, Int8)", "(map('a',1,'b',2)),(map('a',2)),(map('b',3))", "m", "m['a'] = 1 OR m['b'] = 3", 0, '{"m":{"a":1,"b":2}}\n{"m":{"b":3}}', None,
+        Name("filter rows by map multiple key value combined with OR")),
+    ("Map(String, Array(Int8))", "(map('a',[])),(map('b',[1])),(map('c',[2]))", "m['b'] AS v", "m['b'] IN ([1],[2])", 0, '{"v":[1]}', None,
+        Name("filter rows by map array value using IN")),
+    ("Map(String, Nullable(String))", "(map('a',NULL)),(map('a',1))", "m", "isNull(m['a']) = 1", 0, '{"m":{"a":null}}', None,
+        Name("select map with nullable value"))
+])
+def table_map_queries(self, type, data, select, filter, exitcode, message, order_by=None):
+    """Check retrieving map values and using maps in queries.
+    """
+    uid = getuid()
+    node = self.context.node
+
+    if order_by is None:
+        order_by = "m"
+
+    with Given(f"table definition with {type}"):
+        sql = "CREATE TABLE {name} (m " + type + ") ENGINE = MergeTree() ORDER BY " + order_by
+
+    with And(f"I create a table", description=sql):
+        table = create_table(name=uid, statement=sql)
+
+    with When("I insert data into the map column"):
+        node.query(f"INSERT INTO {table} VALUES {data}")
+
+    with And("I try to read from the table"):
+        node.query(f"SELECT {select} FROM {table} WHERE {filter} FORMAT JSONEachRow", exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Invalid_Nullable("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_Invalid_NothingNothing("1.0")
+)
+@Examples("type exitcode message", [
+    ("Nullable(Map(String, String))",
+        43, "DB::Exception: Nested type Map(String,String) cannot be inside Nullable type",
+        Name("nullable map")),
+    ("Map(Nothing, Nothing)",
+        37, "DB::Exception: Column `m` with type Map(Nothing,Nothing) is not allowed in key expression, it's not comparable",
+        Name("map with nothing type for key and value"))
+])
+def table_map_unsupported_types(self, type, exitcode, message):
+    """Check creating a table with unsupported map column types.
+    """
+    uid = getuid()
+    node = self.context.node
+
+    try:
+        with When(f"I create a table definition with {type}"):
+            sql = f"CREATE TABLE {uid} (m " + type + ") ENGINE = MergeTree() ORDER BY m"
+            node.query(sql, exitcode=exitcode, message=message)
+    finally:
+        with Finally("drop table if any"):
+            node.query(f"DROP TABLE IF EXISTS {uid}")
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysToMap("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysMap_Invalid("1.0")
+)
+@Examples("tuple type exitcode message", [
+    ("([1, 2, 3], ['Ready', 'Steady', 'Go'])", "Map(UInt8, String)",
+        0, "{1:'Ready',2:'Steady',3:'Go'}", Name("int -> int")),
+    ("([1, 2, 3], ['Ready', 'Steady', 'Go'])", "Map(String, String)",
+        0, "{'1':'Ready','2':'Steady','3':'Go'}", Name("int -> string")),
+    ("(['1', '2', '3'], ['Ready', 'Steady', 'Go'])", "Map(UInt8, String)",
+        0, "{1:'Ready',187:'Steady',143:'Go'}", Name("string -> int")),
+    ("([],[])", "Map(String, String)",
+        0, "{}", Name("empty arrays to map str:str")),
+    ("([],[])", "Map(UInt8, Array(Int8))",
+        0, "{}", Name("empty arrays to map uint8:array")),
+    ("([[1]],['hello'])", "Map(String, String)",
+        0, "{'[1]':'hello'}", Name("array -> string")),
+    ("([(1,2),(3,4)])", "Map(UInt8, UInt8)",
+        0, "{1:2,3:4}", Name("array of two tuples")),
+    ("([1, 2], ['Ready', 'Steady', 'Go'])", "Map(UInt8, String)",
+        53, "DB::Exception: CAST AS Map can only be performed from tuple of arrays with equal sizes",
+        Name("unequal array sizes")),
+])
+def cast_tuple_of_two_arrays_to_map(self, tuple, type, exitcode, message):
+    """Check casting Tuple(Array, Array) to a map type.
+    """
+    node = self.context.node
+
+    with When("I try to cast tuple", description=tuple):
+        node.query(f"SELECT CAST({tuple}, '{type}') AS map", exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysToMap("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_TupleOfArraysMap_Invalid("1.0")
+)
+@Examples("tuple type exitcode message check_insert", [
+    ("(([1, 2, 3], ['Ready', 'Steady', 'Go']))", "Map(UInt8, String)",
+        0, '{"m":{1:"Ready",2:"Steady",3:"Go"}}', False,  Name("int -> int")),
+    ("(([1, 2, 3], ['Ready', 'Steady', 'Go']))", "Map(String, String)",
+        0, '{"m":{"1":"Ready","2":"Steady","3":"Go"}}', False, Name("int -> string")),
+    ("((['1', '2', '3'], ['Ready', 'Steady', 'Go']))", "Map(UInt8, String)",
+        0, '', True, Name("string -> int")),
+    ("(([],[]))", "Map(String, String)",
+         0, '{"m":{}}', False, Name("empty arrays to map str:str")),
+    ("(([],[]))", "Map(UInt8, Array(Int8))",
+         0, '{"m":{}}', False, Name("empty arrays to map uint8:array")),
+    ("(([[1]],['hello']))", "Map(String, String)",
+         53, 'DB::Exception: Type mismatch in IN or VALUES section', True, Name("array -> string")),
+    ("(([(1,2),(3,4)]))", "Map(UInt8, UInt8)",
+         0, '{"m":{1:2,3:4}}', False, Name("array of two tuples")),
+    ("(([1, 2], ['Ready', 'Steady', 'Go']))", "Map(UInt8, String)",
+        53, "DB::Exception: CAST AS Map can only be performed from tuple of arrays with equal sizes", True,
+        Name("unequal array sizes")),
+])
+def table_map_cast_tuple_of_arrays_to_map(self, tuple, type, exitcode, message, check_insert):
+    """Check converting Tuple(Array, Array) into map on insert into a map type column.
+    """
+    table_map(type=type, data=tuple, select="*", filter="1=1", exitcode=exitcode, message=message, check_insert=check_insert)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap_Invalid("1.0")
+)
+@Examples("tuple type exitcode message", [
+    ("([(1,2),(3,4)])", "Map(UInt8, UInt8)", 0, "{1:2,3:4}",
+        Name("array of two tuples")),
+    ("([(1,2),(3)])", "Map(UInt8, UInt8)", 130,
+        "DB::Exception: There is no supertype for types Tuple(UInt8, UInt8), UInt8 because some of them are Tuple and some of them are not",
+        Name("not a tuple")),
+    ("([(1,2),(3,)])", "Map(UInt8, UInt8)", 130,
+        "DB::Exception: There is no supertype for types Tuple(UInt8, UInt8), Tuple(UInt8) because Tuples have different sizes",
+        Name("invalid tuple")),
+])
+def cast_array_of_two_tuples_to_map(self, tuple, type, exitcode, message):
+    """Check casting Array(Tuple(K,V)) to a map type.
+    """
+    node = self.context.node
+
+    with When("I try to cast tuple", description=tuple):
+        node.query(f"SELECT CAST({tuple}, '{type}') AS map", exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_Conversion_From_ArrayOfTuplesToMap_Invalid("1.0")
+)
+@Examples("tuple type exitcode message check_insert", [
+    ("(([(1,2),(3,4)]))", "Map(UInt8, UInt8)", 0, '{"m":{1:2,3:4}}', False,
+        Name("array of two tuples")),
+    ("(([(1,2),(3)]))", "Map(UInt8, UInt8)", 130,
+        "DB::Exception: There is no supertype for types Tuple(UInt8, UInt8), UInt8 because some of them are Tuple and some of them are not", True,
+        Name("not a tuple")),
+    ("(([(1,2),(3,)]))", "Map(UInt8, UInt8)", 130,
+        "DB::Exception: There is no supertype for types Tuple(UInt8, UInt8), Tuple(UInt8) because Tuples have different sizes", True,
+        Name("invalid tuple")),
+])
+def table_map_cast_array_of_two_tuples_to_map(self, tuple, type, exitcode, message, check_insert):
+    """Check converting Array(Tuple(K,V),...) into map on insert into a map type column.
+    """
+    table_map(type=type, data=tuple, select="*", filter="1=1", exitcode=exitcode, message=message, check_insert=check_insert)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys_InlineDefinedMap("1.0")
+)
+def subcolumns_keys_using_inline_defined_map(self):
+    node = self.context.node
+    exitcode = 47
+    message = "DB::Exception: Missing columns: 'c.keys'"
+
+    with When("I try to access keys sub-column using an inline defined map"):
+        node.query("SELECT map( 'aa', 4, '44' , 5) as c, c.keys", exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values_InlineDefinedMap("1.0")
+)
+def subcolumns_values_using_inline_defined_map(self):
+    node = self.context.node
+    exitcode = 47
+    message = "DB::Exception: Missing columns: 'c.values'"
+
+    with When("I try to access values sub-column using an inline defined map"):
+        node.query("SELECT map( 'aa', 4, '44' , 5) as c, c.values", exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Keys_ArrayFunctions("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_SubColumns_Values_ArrayFunctions("1.0")
+)
+@Examples("type data select filter exitcode message", [
+    # keys
+    ("Map(String, String)", "(map('a','b','c','d')),(map('e','f'))", "m.keys AS keys", "1=1",
+        0, '{"keys":["a","c"]}\n{"keys":["e"]}', Name("select keys")),
+    ("Map(String, String)", "(map('a','b','c','d')),(map('e','f'))", "m.keys AS keys", "has(m.keys, 'e')",
+        0, '{"keys":["e"]}', Name("filter by using keys in an array function")),
+    ("Map(String, String)", "(map('a','b','c','d')),(map('e','f'))", "has(m.keys, 'e') AS r", "1=1",
+        0, '{"r":0}\n{"r":1}', Name("column that uses keys in an array function")),
+    # values
+    ("Map(String, String)", "(map('a','b','c','d')),(map('e','f'))", "m.values AS values", "1=1",
+     0, '{"values":["b","d"]}\n{"values":["f"]}', Name("select values")),
+    ("Map(String, String)", "(map('a','b','c','d')),(map('e','f'))", "m.values AS values", "has(m.values, 'f')",
+     0, '{"values":["f"]}', Name("filter by using values in an array function")),
+    ("Map(String, String)", "(map('a','b','c','d')),(map('e','f'))", "has(m.values, 'f') AS r", "1=1",
+     0, '{"r":0}\n{"r":1}', Name("column that uses values in an array function"))
+])
+def subcolumns(self, type, data, select, filter, exitcode, message, order_by=None):
+    """Check usage of sub-columns in queries.
+    """
+    table_map(type=type, data=data, select=select, filter=filter, exitcode=exitcode, message=message, order_by=order_by)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Length("1.0")
+)
+def length(self):
+    """Check usage of length function with map data type.
+    """
+    table_map(type="Map(String, String)",
+        data="(map('a','b','c','d')),(map('e','f'))",
+        select="length(m) AS len, m",
+        filter="length(m) = 1",
+        exitcode=0, message='{"len":"1","m":{"e":"f"}}')
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Empty("1.0")
+)
+def empty(self):
+    """Check usage of empty function with map data type.
+    """
+    table_map(type="Map(String, String)",
+        data="(map('e','f'))",
+        select="empty(m) AS em, m",
+        filter="empty(m) <> 1",
+        exitcode=0, message='{"em":0,"m":{"e":"f"}}')
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_NotEmpty("1.0")
+)
+def notempty(self):
+    """Check usage of notEmpty function with map data type.
+    """
+    table_map(type="Map(String, String)",
+        data="(map('e','f'))",
+        select="notEmpty(m) AS em, m",
+        filter="notEmpty(m) = 1",
+        exitcode=0, message='{"em":1,"m":{"e":"f"}}')
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapAdd("1.0")
+)
+def cast_from_mapadd(self):
+    """Check converting the result of mapAdd function to a map data type.
+    """
+    select_map(map="CAST(mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])), 'Map(Int8, Int8)')", output="{1:2,2:2}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapSubstract("1.0")
+)
+def cast_from_mapsubstract(self):
+    """Check converting the result of mapSubstract function to a map data type.
+    """
+    select_map(map="CAST(mapSubtract(([toUInt8(1), 2], [toInt32(1), 1]), ([toUInt8(1), 2], [toInt32(2), 1])), 'Map(Int8, Int8)')", output="{1:-1,2:0}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map_MapPopulateSeries("1.0")
+)
+def cast_from_mappopulateseries(self):
+    """Check converting the result of mapPopulateSeries function to a map data type.
+    """
+    select_map(map="CAST(mapPopulateSeries([1,2,4], [11,22,44], 5), 'Map(Int8, Int8)')", output="{1:11,2:22,3:0,4:44,5:0}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapContains("1.0")
+)
+def mapcontains(self):
+    """Check usages of mapContains function with map data type.
+    """
+    node = self.context.node
+
+    with Example("key in map"):
+        table_map(type="Map(String, String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="mapContains(m, 'a')",
+            exitcode=0, message='{"m":{"a":"b"}}')
+
+    with Example("key not in map"):
+        table_map(type="Map(String, String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="NOT mapContains(m, 'a')",
+            exitcode=0, message='{"m":{"e":"f"}}')
+
+    with Example("null key not in map"):
+        table_map(type="Map(Nullable(String), String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="mapContains(m, NULL)",
+            exitcode=0, message='')
+
+    with Example("null key in map"):
+        table_map(type="Map(Nullable(String), String)",
+            data="(map('e','f')),(map('a','b')),(map(NULL,'c'))",
+            select="m",
+            filter="mapContains(m, NULL)",
+            exitcode=0, message='{null:"c"}')
+
+    with Example("select nullable key"):
+        node.query("SELECT map(NULL, 1, 2, 3) AS m, mapContains(m, toNullable(toUInt8(2)))", exitcode=0, message="{2:3}")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapKeys("1.0")
+)
+def mapkeys(self):
+    """Check usages of mapKeys function with map data type.
+    """
+    with Example("key in map"):
+        table_map(type="Map(String, String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="has(mapKeys(m), 'a')",
+            exitcode=0, message='{"m":{"a":"b"}}')
+
+    with Example("key not in map"):
+        table_map(type="Map(String, String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="NOT has(mapKeys(m), 'a')",
+            exitcode=0, message='{"m":{"e":"f"}}')
+
+    with Example("null key not in map"):
+        table_map(type="Map(Nullable(String), String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="has(mapKeys(m), NULL)",
+            exitcode=0, message='')
+
+    with Example("null key in map"):
+        table_map(type="Map(Nullable(String), String)",
+            data="(map('e','f')),(map('a','b')),(map(NULL,'c'))",
+            select="m",
+            filter="has(mapKeys(m), NULL)",
+            exitcode=0, message='{"m":{null:"c"}}')
+
+    with Example("select keys from column"):
+        table_map(type="Map(Nullable(String), String)",
+            data="(map('e','f')),(map('a','b')),(map(NULL,'c'))",
+            select="mapKeys(m) AS keys",
+            filter="1 = 1",
+            exitcode=0, message='{"keys":["a"]}\n{"keys":["e"]}\n{"keys":[null]}')
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapValues("1.0")
+)
+def mapvalues(self):
+    """Check usages of mapValues function with map data type.
+    """
+    with Example("value in map"):
+        table_map(type="Map(String, String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="has(mapValues(m), 'b')",
+            exitcode=0, message='{"m":{"a":"b"}}')
+
+    with Example("value not in map"):
+        table_map(type="Map(String, String)",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="NOT has(mapValues(m), 'b')",
+            exitcode=0, message='{"m":{"e":"f"}}')
+
+    with Example("null value not in map"):
+        table_map(type="Map(String, Nullable(String))",
+            data="(map('e','f')),(map('a','b'))",
+            select="m",
+            filter="has(mapValues(m), NULL)",
+            exitcode=0, message='')
+
+    with Example("null value in map"):
+        table_map(type="Map(String, Nullable(String))",
+            data="(map('e','f')),(map('a','b')),(map('c',NULL))",
+            select="m",
+            filter="has(mapValues(m), NULL)",
+            exitcode=0, message='{"m":{"c":null}}')
+
+    with Example("select values from column"):
+        table_map(type="Map(String, Nullable(String))",
+            data="(map('e','f')),(map('a','b')),(map('c',NULL))",
+            select="mapValues(m) AS values",
+            filter="1 = 1",
+            exitcode=0, message='{"values":["b"]}\n{"values":[null]}\n{"values":["f"]}')
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_InlineDefinedMap("1.0")
+)
+def functions_with_inline_defined_map(self):
+    """Check that a map defined inline inside the select statement
+    can be used with functions that work with maps.
+    """
+    with Example("mapKeys"):
+        select_map(map="map(1,2,3,4) as map, mapKeys(map) AS keys", output="{1:2,3:4}\t[1,3]")
+
+    with Example("mapValyes"):
+        select_map(map="map(1,2,3,4) as map, mapValues(map) AS values", output="{1:2,3:4}\t[2,4]")
+
+    with Example("mapContains"):
+        select_map(map="map(1,2,3,4) as map, mapContains(map, 1) AS contains", output="{1:2,3:4}\t1")
+
+@TestScenario
+def empty_map(self):
+    """Check creating of an empty map `{}` using the map() function
+    when inserting data into a map type table column.
+    """
+    table_map(type="Map(String, String)",
+        data="(map('e','f')),(map())",
+        select="m",
+        filter="1=1",
+        exitcode=0, message='{"m":{}}\n{"m":{"e":"f"}}')
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Performance_Vs_TupleOfArrays("1.0")
+)
+def performance_vs_two_tuple_of_arrays(self, len=10, rows=6000000):
+    """Check performance of using map data type vs Tuple(Array, Array).
+    """
+    uid = getuid()
+    node = self.context.node
+
+    with Given(f"table with Tuple(Array(Int8),Array(Int8))"):
+        sql = "CREATE TABLE {name} (pairs Tuple(Array(Int8),Array(Int8))) ENGINE = MergeTree() ORDER BY pairs"
+        tuple_table = create_table(name=f"tuple_{uid}", statement=sql)
+
+    with And(f"table with Map(Int8,Int8)"):
+        sql = "CREATE TABLE {name} (pairs Map(Int8,Int8)) ENGINE = MergeTree() ORDER BY pairs"
+        map_table = create_table(name=f"map_{uid}", statement=sql)
+
+    with When("I insert data into table with tuples"):
+        keys = range(len)
+        values = range(len)
+        start_time = time.time()
+        node.query(f"INSERT INTO {tuple_table} SELECT ({keys},{values}) FROM numbers({rows})")
+        tuple_insert_time = time.time() - start_time
+        metric("tuple insert time", tuple_insert_time, "sec")
+
+    with When("I insert data into table with a map"):
+        keys = range(len)
+        values = range(len)
+        start_time = time.time()
+        node.query(f"INSERT INTO {map_table} SELECT ({keys},{values}) FROM numbers({rows})")
+        map_insert_time = time.time() - start_time
+        metric("map insert time", map_insert_time, "sec")
+
+    with And("I retrieve particular key value from table with tuples"):
+        start_time = time.time()
+        node.query(f"SELECT sum(arrayFirst((v, k) -> k = {len-1}, tupleElement(pairs, 2), tupleElement(pairs, 1))) AS sum FROM {tuple_table}",
+            exitcode=0, message=f"{rows*(len-1)}")
+        tuple_select_time = time.time() - start_time
+        metric("tuple(array, array) select time", tuple_select_time, "sec")
+
+    with And("I retrieve particular key value from table with map"):
+        start_time = time.time()
+        node.query(f"SELECT sum(pairs[{len-1}]) AS sum FROM {map_table}",
+            exitcode=0, message=f"{rows*(len-1)}")
+        map_select_time = time.time() - start_time
+        metric("map select time", map_select_time, "sec")
+
+    metric("insert difference", (1 - map_insert_time/tuple_insert_time) * 100, "%")
+    metric("select difference", (1 - map_select_time/tuple_select_time) * 100, "%")
+
+@TestScenario
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType_Performance_Vs_ArrayOfTuples("1.0")
+)
+def performance_vs_array_of_tuples(self, len=10, rows=6000000):
+    """Check performance of using map data type vs Array(Tuple(K,V)).
+    """
+    uid = getuid()
+    node = self.context.node
+
+    with Given(f"table with Array(Tuple(K,V))"):
+        sql = "CREATE TABLE {name} (pairs Array(Tuple(Int8, Int8))) ENGINE = MergeTree() ORDER BY pairs"
+        array_table = create_table(name=f"tuple_{uid}", statement=sql)
+
+    with And(f"table with Map(Int8,Int8)"):
+        sql = "CREATE TABLE {name} (pairs Map(Int8,Int8)) ENGINE = MergeTree() ORDER BY pairs"
+        map_table = create_table(name=f"map_{uid}", statement=sql)
+
+    with When("I insert data into table with an array of tuples"):
+        pairs = list(zip(range(len),range(len)))
+        start_time = time.time()
+        node.query(f"INSERT INTO {array_table} SELECT ({pairs}) FROM numbers({rows})")
+        array_insert_time = time.time() - start_time
+        metric("array insert time", array_insert_time, "sec")
+
+    with When("I insert data into table with a map"):
+        keys = range(len)
+        values = range(len)
+        start_time = time.time()
+        node.query(f"INSERT INTO {map_table} SELECT ({keys},{values}) FROM numbers({rows})")
+        map_insert_time = time.time() - start_time
+        metric("map insert time", map_insert_time, "sec")
+
+    with And("I retrieve particular key value from table with an array of tuples"):
+        start_time = time.time()
+        node.query(f"SELECT sum(arrayFirst((v) -> v.1 = {len-1}, pairs).2) AS sum FROM {array_table}",
+            exitcode=0, message=f"{rows*(len-1)}")
+        array_select_time = time.time() - start_time
+        metric("array(tuple(k,v)) select time", array_select_time, "sec")
+
+    with And("I retrieve particular key value from table with map"):
+        start_time = time.time()
+        node.query(f"SELECT sum(pairs[{len-1}]) AS sum FROM {map_table}",
+            exitcode=0, message=f"{rows*(len-1)}")
+        map_select_time = time.time() - start_time
+        metric("map select time", map_select_time, "sec")
+
+    metric("insert difference", (1 - map_insert_time/array_insert_time) * 100, "%")
+    metric("select difference", (1 - map_select_time/array_select_time) * 100, "%")
+
+@TestScenario
+def performance(self, len=10, rows=6000000):
+    """Check insert and select performance of using map data type.
+    """
+    uid = getuid()
+    node = self.context.node
+
+    with Given("table with Map(Int8,Int8)"):
+        sql = "CREATE TABLE {name} (pairs Map(Int8,Int8)) ENGINE = MergeTree() ORDER BY pairs"
+        map_table = create_table(name=f"map_{uid}", statement=sql)
+
+    with When("I insert data into table with a map"):
+        values = [x for pair in zip(range(len),range(len)) for x in pair]
+        start_time = time.time()
+        node.query(f"INSERT INTO {map_table} SELECT (map({','.join([str(v) for v in values])})) FROM numbers({rows})")
+        map_insert_time = time.time() - start_time
+        metric("map insert time", map_insert_time, "sec")
+
+    with And("I retrieve particular key value from table with map"):
+        start_time = time.time()
+        node.query(f"SELECT sum(pairs[{len-1}]) AS sum FROM {map_table}",
+            exitcode=0, message=f"{rows*(len-1)}")
+        map_select_time = time.time() - start_time
+        metric("map select time", map_select_time, "sec")
+
+# FIXME: add tests for different table engines
+
+@TestFeature
+@Name("tests")
+@Requirements(
+    RQ_SRS_018_ClickHouse_Map_DataType("1.0"),
+    RQ_SRS_018_ClickHouse_Map_DataType_Functions_Map("1.0")
+)
+def feature(self, node="clickhouse1"):
+    self.context.node = self.context.cluster.node(node)
+
+    with Given("I allow experimental map type"):
+        allow_experimental_map_type()
+
+    for scenario in loads(current_module(), Scenario):
+        scenario()
diff --git a/tests/testflows/rbac/helper/common.py b/tests/testflows/rbac/helper/common.py
index a234a62eabd..e47b2dfd4bf 100755
--- a/tests/testflows/rbac/helper/common.py
+++ b/tests/testflows/rbac/helper/common.py
@@ -1,99 +1,16 @@
 import uuid
 
+import testflows.settings as settings
+
 from contextlib import contextmanager
-from multiprocessing.dummy import Pool
-from multiprocessing import TimeoutError as PoolTaskTimeoutError
 
 from testflows.core.name import basename, parentname
 from testflows._core.testtype import TestSubType
 from testflows.core import *
 
+from helpers.common import Pool, join, run_scenario, instrument_clickhouse_server_log
 from rbac.helper.tables import table_types
 
-@TestStep(Given)
-def instrument_clickhouse_server_log(self, node=None, clickhouse_server_log="/var/log/clickhouse-server/clickhouse-server.log"):
-    """Instrument clickhouse-server.log for the current test
-    by adding start and end messages that include
-    current test name to the clickhouse-server.log of the specified node and
-    if the test fails then dump the messages from
-    the clickhouse-server.log for this test.
-    """
-    if node is None:
-        node = self.context.node
-
-    with By("getting current log size"):
-        cmd =  node.command(f"stat --format=%s {clickhouse_server_log}")
-        logsize = cmd.output.split(" ")[0].strip()
-
-    try:
-        with And("adding test name start message to the clickhouse-server.log"):
-            node.command(f"echo -e \"\\n-- start: {current().name} --\\n\" >> {clickhouse_server_log}")
-        with And("dump memory info"):
-            node.command(f"echo -e \"\\n-- {current().name} -- top --\\n\" && top -bn1")
-            node.command(f"echo -e \"\\n-- {current().name} -- df --\\n\" && df -h")
-            node.command(f"echo -e \"\\n-- {current().name} -- free --\\n\" && free -mh")
-        yield
-
-    finally:
-        if self.context.cluster.terminating is True:
-            return
-
-        with Finally("adding test name end message to the clickhouse-server.log", flags=TE):
-           node.command(f"echo -e \"\\n-- end: {current().name} --\\n\" >> {clickhouse_server_log}")
-
-        with And("checking if test has failing result"):
-            if not self.parent.result:
-                with Then("dumping clickhouse-server.log for this test"):
-                    node.command(f"tail -c +{logsize} {clickhouse_server_log}")
-
-def join(tasks, polling_timeout=5):
-    """Join all parallel tests.
-    """
-    exc = None
-    while tasks:
-        try:
-            try:
-                tasks[0].get(timeout=polling_timeout)
-                tasks.pop(0)
-
-            except PoolTaskTimeoutError as e:
-                task = tasks.pop(0)
-                tasks.append(task)
-                continue
-
-        except KeyboardInterrupt as e:
-            current().context.cluster.terminating = True
-            continue
-
-        except Exception as e:
-            tasks.pop(0)
-            if exc is None:
-                exc = e
-            current().context.cluster.terminating = True
-
-    if exc is not None:
-        raise exc
-
-def start(pool, tasks, scenario, kwargs=None):
-    """Start parallel test.
-    """
-    if kwargs is None:
-        kwargs = {}
-
-    task = pool.apply_async(scenario, [], kwargs)
-    tasks.append(task)
-
-    return task
-
-def run_scenario(pool, tasks, scenario, kwargs=None):
-    if kwargs is None:
-        kwargs = {}
-
-    if current().context.parallel:
-        start(pool, tasks, scenario, kwargs)
-    else:
-        scenario(**kwargs)
-
 def permutations(table_count=1):
     return [*range((1 << table_count)-1)]
 
diff --git a/tests/testflows/rbac/docker-compose/clickhouse-service.yml b/tests/testflows/rbac/rbac_env/clickhouse-service.yml
similarity index 100%
rename from tests/testflows/rbac/docker-compose/clickhouse-service.yml
rename to tests/testflows/rbac/rbac_env/clickhouse-service.yml
diff --git a/tests/testflows/rbac/rbac_env/docker-compose.yml b/tests/testflows/rbac/rbac_env/docker-compose.yml
new file mode 100755
index 00000000000..29f2ef52470
--- /dev/null
+++ b/tests/testflows/rbac/rbac_env/docker-compose.yml
@@ -0,0 +1,60 @@
+version: '2.3'
+
+services:
+  zookeeper:
+    extends:
+      file: zookeeper-service.yml
+      service: zookeeper
+
+  clickhouse1:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse1
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse2:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse2
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse3:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse3
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  # dummy service which does nothing, but allows to postpone
+  # 'docker-compose up -d' till all dependecies will go healthy
+  all_services_ready:
+    image: hello-world
+    depends_on:
+      clickhouse1:
+        condition: service_healthy
+      clickhouse2:
+        condition: service_healthy
+      clickhouse3:
+        condition: service_healthy
+      zookeeper:
+        condition: service_healthy
diff --git a/tests/testflows/rbac/rbac_env/zookeeper-service.yml b/tests/testflows/rbac/rbac_env/zookeeper-service.yml
new file mode 100755
index 00000000000..f3df33358be
--- /dev/null
+++ b/tests/testflows/rbac/rbac_env/zookeeper-service.yml
@@ -0,0 +1,18 @@
+version: '2.3'
+
+services:
+  zookeeper:
+    image: zookeeper:3.4.12
+    expose:
+      - "2181"
+    environment:
+      ZOO_TICK_TIME: 500
+      ZOO_MY_ID: 1
+    healthcheck:
+      test: echo stat | nc localhost 2181
+      interval: 3s
+      timeout: 2s
+      retries: 5
+      start_period: 2s
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/rbac/regression.py b/tests/testflows/rbac/regression.py
index a07cb8da805..549ccdf80d8 100755
--- a/tests/testflows/rbac/regression.py
+++ b/tests/testflows/rbac/regression.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import os
 import sys
 
 from testflows.core import *
@@ -137,6 +138,12 @@ xfails = {
         [(Fail, issue_21083)],
     "privileges/: row policy/nested mat:":
         [(Fail, issue_21084)],
+    "privileges/show dictionaries/:/check privilege/check privilege=SHOW DICTIONARIES/show dict/SHOW DICTIONARIES with privilege":
+        [(Fail, "new bug")],
+    "privileges/show dictionaries/:/check privilege/check privilege=CREATE DICTIONARY/show dict/SHOW DICTIONARIES with privilege":
+        [(Fail, "new bug")],
+    "privileges/show dictionaries/:/check privilege/check privilege=DROP DICTIONARY/show dict/SHOW DICTIONARIES with privilege":
+        [(Fail, "new bug")],
 }
 
 xflags = {
@@ -155,16 +162,20 @@ xflags = {
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """RBAC regression.
     """
+    top().terminating = False
     nodes = {
         "clickhouse":
             ("clickhouse1", "clickhouse2", "clickhouse3")
     }
-    with Cluster(local, clickhouse_binary_path, nodes=nodes) as cluster:
-        self.context.cluster = cluster
-        self.context.stress = stress
 
-        if parallel is not None:
-            self.context.parallel = parallel
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "rbac_env")) as cluster:
+        self.context.cluster = cluster
 
         Feature(run=load("rbac.tests.syntax.feature", "feature"))
         Feature(run=load("rbac.tests.privileges.feature", "feature"))
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_column.py b/tests/testflows/rbac/tests/privileges/alter/alter_column.py
index fe767ec15fa..91b3ab1629a 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_column.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_column.py
@@ -699,8 +699,7 @@ def user_with_privileges_on_cluster(self, permutation, table_type, node=None):
 
 @TestSuite
 def scenario_parallelization(self, table_type, permutation):
-    pool = Pool(7)
-    try:
+    with Pool(7) as pool:
         tasks = []
         try:
             for scenario in loads(current_module(), Scenario):
@@ -708,8 +707,6 @@ def scenario_parallelization(self, table_type, permutation):
                     {"table_type": table_type, "permutation": permutation})
         finally:
             join(tasks)
-    finally:
-        pool.close()
 
 @TestFeature
 @Requirements(
@@ -739,8 +736,7 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
             continue
 
         with Example(str(example)):
-            pool = Pool(10)
-            try:
+            with Pool(10) as pool:
                 tasks = []
                 try:
                     for permutation in permutations(table_type):
@@ -750,5 +746,3 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
                             {"table_type": table_type, "permutation": permutation})
                 finally:
                     join(tasks)
-            finally:
-                pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py b/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py
index 58f4349459c..697cefdf056 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_constraint.py
@@ -297,13 +297,10 @@ def feature(self, node="clickhouse1", parallel=None, stress=None):
             continue
 
         with Example(str(example)):
-            pool = Pool(5)
-            try:
+            with Pool(5) as pool:
                 tasks = []
                 try:
                     for scenario in loads(current_module(), Scenario):
                         run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
                 finally:
                     join(tasks)
-            finally:
-                pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_index.py b/tests/testflows/rbac/tests/privileges/alter/alter_index.py
index eeb126e95a5..379abd52d8c 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_index.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_index.py
@@ -469,13 +469,10 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
             continue
 
         with Example(str(example)):
-            pool = Pool(5)
-            try:
+            with Pool(5) as pool:
                 tasks = []
                 try:
                     for scenario in loads(current_module(), Scenario):
                         run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
                 finally:
                     join(tasks)
-            finally:
-                pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_move.py b/tests/testflows/rbac/tests/privileges/alter/alter_move.py
index d370edc35de..a8094716fe4 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_move.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_move.py
@@ -1,5 +1,3 @@
-from multiprocessing.dummy import Pool
-
 from testflows.core import *
 from testflows.asserts import error
 
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_settings.py b/tests/testflows/rbac/tests/privileges/alter/alter_settings.py
index c2c2110ddf0..d5a8b73534e 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_settings.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_settings.py
@@ -171,16 +171,13 @@ def user_with_privileges_on_cluster(self, privilege, table_type, node=None):
 def scenario_parallelization(self, table_type, privilege):
     """Runs all scenarios in parallel for a given privilege.
     """
-    pool = Pool(4)
-    try:
+    with Pool(4) as pool:
         tasks = []
         try:
             for scenario in loads(current_module(), Scenario):
                 run_scenario(pool, tasks, Scenario(test=scenario), {"table_type": table_type, "privilege": privilege})
         finally:
             join(tasks)
-    finally:
-        pool.close()
 
 @TestFeature
 @Requirements(
@@ -210,8 +207,7 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
             continue
 
         with Example(str(example)):
-            pool = Pool(4)
-            try:
+            with Pool(4) as pool:
                 tasks = []
                 try:
                     for alias in aliases:
@@ -220,5 +216,3 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
                                      {"table_type": table_type, "privilege": alias})
                 finally:
                     join(tasks)
-            finally:
-                pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py b/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py
index 8fa7136076e..d6dbf13c586 100755
--- a/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_ttl.py
@@ -273,13 +273,10 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
             continue
 
         with Example(str(example)):
-            pool = Pool(5)
-            try:
+            with Pool(5) as pool:
                 tasks = []
                 try:
                     for scenario in loads(current_module(), Scenario):
                         run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
                 finally:
                     join(tasks)
-            finally:
-                pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/alter/alter_update.py b/tests/testflows/rbac/tests/privileges/alter/alter_update.py
index d205740b901..9f3f4e19041 100644
--- a/tests/testflows/rbac/tests/privileges/alter/alter_update.py
+++ b/tests/testflows/rbac/tests/privileges/alter/alter_update.py
@@ -1,5 +1,3 @@
-from multiprocessing.dummy import Pool
-
 from testflows.core import *
 from testflows.asserts import error
 
diff --git a/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py b/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py
index 390a7f03aba..fbebdc0003d 100644
--- a/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py
+++ b/tests/testflows/rbac/tests/privileges/attach/attach_dictionary.py
@@ -59,7 +59,7 @@ def privilege_check(grant_target_name, user_name, node=None):
 
             with Then("I attempt to attach a dictionary"):
                 node.query(f"ATTACH DICTIONARY {dict_name}", settings = [("user", user_name)],
-                    exitcode=231, message=f"DB::Exception: Dictionary `{dict_name}` doesn't exist.")
+                    exitcode=134, message=f"DB::Exception: Table `{dict_name}` doesn't exist.")
 
         finally:
             with Finally("I drop the dictionary"):
@@ -110,7 +110,7 @@ def privilege_check(grant_target_name, user_name, node=None):
 
             with Then("I attempt to attach a dictionary"):
                 node.query(f"ATTACH DICTIONARY {dict_name}", settings = [("user", user_name)],
-                    exitcode=231, message=f"DB::Exception: Dictionary `{dict_name}` doesn't exist.")
+                    exitcode=134, message=f"DB::Exception: Table `{dict_name}` doesn't exist.")
 
         finally:
             with Finally("I drop the dictionary"):
diff --git a/tests/testflows/rbac/tests/privileges/create/create_table.py b/tests/testflows/rbac/tests/privileges/create/create_table.py
index 88d055f2915..f0978a7960f 100644
--- a/tests/testflows/rbac/tests/privileges/create/create_table.py
+++ b/tests/testflows/rbac/tests/privileges/create/create_table.py
@@ -840,13 +840,9 @@ def feature(self, stress=None, parallel=None, node="clickhouse1"):
         self.context.stress = parallel
 
     tasks = []
-    pool = Pool(10)
-
-    try:
+    with Pool(10) as pool:
         try:
             for scenario in loads(current_module(), Scenario):
                 run_scenario(pool, tasks, scenario)
         finally:
             join(tasks)
-    finally:
-        pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/dictGet.py b/tests/testflows/rbac/tests/privileges/dictGet.py
index 21de4a36b77..269998703be 100644
--- a/tests/testflows/rbac/tests/privileges/dictGet.py
+++ b/tests/testflows/rbac/tests/privileges/dictGet.py
@@ -661,8 +661,7 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    pool = Pool(20)
-    try:
+    with Pool(20) as pool:
         tasks = []
         try:
 
@@ -686,5 +685,3 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
 
         finally:
             join(tasks)
-    finally:
-        pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/distributed_table.py b/tests/testflows/rbac/tests/privileges/distributed_table.py
index ba001ea7f2c..eab3b6d34d6 100755
--- a/tests/testflows/rbac/tests/privileges/distributed_table.py
+++ b/tests/testflows/rbac/tests/privileges/distributed_table.py
@@ -1320,16 +1320,12 @@ def cluster_tests(self, cluster, node=None):
     self.context.cluster_name = cluster
 
     tasks = []
-    pool = Pool(3)
-
-    try:
+    with Pool(3) as pool:
         try:
             for suite in loads(current_module(), Suite):
                 run_scenario(pool, tasks, Suite(test=suite))
         finally:
             join(tasks)
-    finally:
-        pool.close()
 
 @TestFeature
 @Requirements(
@@ -1345,9 +1341,7 @@ def feature(self, node="clickhouse1"):
     self.context.node3 = self.context.cluster.node("clickhouse3")
 
     tasks = []
-    pool = Pool(3)
-
-    try:
+    with Pool(3) as pool:
         try:
             run_scenario(pool, tasks, Feature(test=cluster_tests))
             run_scenario(pool, tasks, Scenario(test=local_user))
@@ -1355,6 +1349,4 @@ def feature(self, node="clickhouse1"):
 
         finally:
             join(tasks)
-    finally:
-        pool.close()
 
diff --git a/tests/testflows/rbac/tests/privileges/feature.py b/tests/testflows/rbac/tests/privileges/feature.py
index 7302a971ec1..555860d8ed1 100755
--- a/tests/testflows/rbac/tests/privileges/feature.py
+++ b/tests/testflows/rbac/tests/privileges/feature.py
@@ -7,9 +7,7 @@ from rbac.helper.common import *
 def feature(self):
 
     tasks = []
-    pool = Pool(10)
-
-    try:
+    with Pool(10) as pool:
         try:
             run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.insert", "feature")), {})
             run_scenario(pool, tasks, Feature(test=load("rbac.tests.privileges.select", "feature"), ), {})
@@ -96,7 +94,5 @@ def feature(self):
 
         finally:
             join(tasks)
-    finally:
-        pool.close()
 
     Feature(test=load("rbac.tests.privileges.system.shutdown", "feature"))
diff --git a/tests/testflows/rbac/tests/privileges/grant_option.py b/tests/testflows/rbac/tests/privileges/grant_option.py
index f337aec2619..22b0118b9a4 100644
--- a/tests/testflows/rbac/tests/privileges/grant_option.py
+++ b/tests/testflows/rbac/tests/privileges/grant_option.py
@@ -1,5 +1,3 @@
-from multiprocessing.dummy import Pool
-
 from testflows.core import *
 from testflows.asserts import error
 
@@ -126,8 +124,7 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
     if stress is not None:
         self.context.stress = stress
 
-    pool = Pool(12)
-    try:
+    with Pool(12) as pool:
         tasks = []
         try:
             for example in self.examples:
@@ -135,5 +132,3 @@ def feature(self, node="clickhouse1", stress=None, parallel=None):
                 run_scenario(pool, tasks, Suite(test=grant_option, name=privilege, setup=instrument_clickhouse_server_log), {"table_type": "MergeTree", "privilege": privilege})
         finally:
             join(tasks)
-    finally:
-        pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/insert.py b/tests/testflows/rbac/tests/privileges/insert.py
index 305ce62f5e4..08c696ffc78 100755
--- a/tests/testflows/rbac/tests/privileges/insert.py
+++ b/tests/testflows/rbac/tests/privileges/insert.py
@@ -500,13 +500,9 @@ def feature(self, table_type, parallel=None, stress=None, node="clickhouse1"):
         self.context.stress = parallel
 
     tasks = []
-    pool = Pool(10)
-
-    try:
+    with Pool(10) as pool:
         try:
             for scenario in loads(current_module(), Scenario):
                 run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
         finally:
             join(tasks)
-    finally:
-        pool.close()
diff --git a/tests/testflows/rbac/tests/privileges/select.py b/tests/testflows/rbac/tests/privileges/select.py
index 036ea944ae1..b84865998bc 100755
--- a/tests/testflows/rbac/tests/privileges/select.py
+++ b/tests/testflows/rbac/tests/privileges/select.py
@@ -419,13 +419,9 @@ def feature(self, table_type, parallel=None, stress=None, node="clickhouse1"):
         self.context.stress = parallel
 
     tasks = []
-    pool = Pool(10)
-
-    try:
+    with Pool(10) as pool:
         try:
             for scenario in loads(current_module(), Scenario):
                 run_scenario(pool, tasks, Scenario(test=scenario, setup=instrument_clickhouse_server_log), {"table_type" : table_type})
         finally:
             join(tasks)
-    finally:
-        pool.close()
diff --git a/tests/testflows/rbac/tests/syntax/revoke_role.py b/tests/testflows/rbac/tests/syntax/revoke_role.py
index ea8b874ff51..0642dd6b0d4 100755
--- a/tests/testflows/rbac/tests/syntax/revoke_role.py
+++ b/tests/testflows/rbac/tests/syntax/revoke_role.py
@@ -166,10 +166,15 @@ def feature(self, node="clickhouse1"):
 
     with Scenario("I revoke a role on fake cluster, throws exception", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role_Cluster("1.0")]):
-        with setup():
-            with When("I revoke a role from user on a cluster"):
-                exitcode, message = errors.cluster_not_found("fake_cluster")
-                node.query("REVOKE ON CLUSTER fake_cluster role0 FROM user0", exitcode=exitcode, message=message)
+        with Given("I have a role and a user on a cluster"):
+            node.query("CREATE USER OR REPLACE user0")
+            node.query("CREATE ROLE OR REPLACE role0")
+        with When("I revoke a role from user on a cluster"):
+            exitcode, message = errors.cluster_not_found("fake_cluster")
+            node.query("REVOKE ON CLUSTER fake_cluster role0 FROM user0", exitcode=exitcode, message=message)
+        with Finally("I drop the user and role"):
+            node.query("DROP USER IF EXISTS user0")
+            node.query("DROP ROLE IF EXISTS role0")
 
     with Scenario("I revoke multiple roles from multiple users on cluster", requirements=[
             RQ_SRS_006_RBAC_Revoke_Role("1.0"),
@@ -196,4 +201,4 @@ def feature(self, node="clickhouse1"):
             RQ_SRS_006_RBAC_Revoke_AdminOption("1.0")]):
         with setup():
             with When("I revoke admin option for multiple roles from multiple users"):
-                node.query("REVOKE ADMIN OPTION FOR role0, role1 FROM user0, user1")
\ No newline at end of file
+                node.query("REVOKE ADMIN OPTION FOR role0, role1 FROM user0, user1")
diff --git a/tests/testflows/rbac/tests/views/feature.py b/tests/testflows/rbac/tests/views/feature.py
index f8a69e80157..fd0241f389f 100755
--- a/tests/testflows/rbac/tests/views/feature.py
+++ b/tests/testflows/rbac/tests/views/feature.py
@@ -7,14 +7,10 @@ from rbac.helper.common import *
 def feature(self):
 
     tasks = []
-    pool = Pool(3)
-
-    try:
+    with Pool(3) as pool:
         try:
             run_scenario(pool, tasks, Feature(test=load("rbac.tests.views.view", "feature")), {})
             run_scenario(pool, tasks, Feature(test=load("rbac.tests.views.live_view", "feature")), {})
             run_scenario(pool, tasks, Feature(test=load("rbac.tests.views.materialized_view", "feature")), {})
         finally:
             join(tasks)
-    finally:
-        pool.close()
\ No newline at end of file
diff --git a/tests/testflows/rbac/tests/views/live_view.py b/tests/testflows/rbac/tests/views/live_view.py
index f0bc381bd84..ebb148b66e3 100755
--- a/tests/testflows/rbac/tests/views/live_view.py
+++ b/tests/testflows/rbac/tests/views/live_view.py
@@ -1130,16 +1130,11 @@ def feature(self, stress=None, parallel=None, node="clickhouse1"):
     if parallel is not None:
         self.context.stress = parallel
 
-    tasks = []
-    pool = Pool(3)
-
-
     with allow_experimental_live_view(self.context.node):
-        try:
+        tasks = []
+        with Pool(3) as pool:
             try:
                 for suite in loads(current_module(), Suite):
                     run_scenario(pool, tasks, suite)
             finally:
                 join(tasks)
-        finally:
-            pool.close()
diff --git a/tests/testflows/rbac/tests/views/materialized_view.py b/tests/testflows/rbac/tests/views/materialized_view.py
index b2b1d19e256..26fefb23bf9 100755
--- a/tests/testflows/rbac/tests/views/materialized_view.py
+++ b/tests/testflows/rbac/tests/views/materialized_view.py
@@ -2268,13 +2268,9 @@ def feature(self, stress=None, parallel=None, node="clickhouse1"):
         self.context.stress = parallel
 
     tasks = []
-    pool = Pool(3)
-
-    try:
+    with Pool(3) as pool:
         try:
             for suite in loads(current_module(), Suite):
                 run_scenario(pool, tasks, suite)
         finally:
             join(tasks)
-    finally:
-        pool.close()
diff --git a/tests/testflows/rbac/tests/views/view.py b/tests/testflows/rbac/tests/views/view.py
index 524eda91297..3fd12164ad6 100755
--- a/tests/testflows/rbac/tests/views/view.py
+++ b/tests/testflows/rbac/tests/views/view.py
@@ -1150,13 +1150,9 @@ def feature(self, stress=None, parallel=None, node="clickhouse1"):
         self.context.stress = parallel
 
     tasks = []
-    pool = Pool(3)
-
-    try:
+    with Pool(3) as pool:
         try:
             for suite in loads(current_module(), Suite):
                 run_scenario(pool, tasks, suite)
         finally:
             join(tasks)
-    finally:
-        pool.close()
diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py
index 45f1ed64a6c..c7a264a9c27 100755
--- a/tests/testflows/regression.py
+++ b/tests/testflows/regression.py
@@ -4,6 +4,7 @@ from testflows.core import *
 
 append_path(sys.path, ".")
 
+from helpers.common import Pool, join, run_scenario
 from helpers.argparser import argparser
 
 @TestModule
@@ -12,13 +13,26 @@ from helpers.argparser import argparser
 def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
     """ClickHouse regression.
     """
+    top().terminating = False
     args = {"local": local, "clickhouse_binary_path": clickhouse_binary_path, "stress": stress, "parallel": parallel}
 
-    # Feature(test=load("example.regression", "regression"))(**args)
-    # Feature(test=load("ldap.regression", "regression"))(**args)
-    # Feature(test=load("rbac.regression", "regression"))(**args)
-    # Feature(test=load("aes_encryption.regression", "regression"))(**args)
-    # Feature(test=load("kerberos.regression", "regression"))(**args)
+    self.context.stress = stress
+    self.context.parallel = parallel
+
+    tasks = []
+    with Pool(8) as pool:
+        try:
+            run_scenario(pool, tasks, Feature(test=load("example.regression", "regression")), args)
+            #run_scenario(pool, tasks, Feature(test=load("ldap.regression", "regression")), args)
+            #run_scenario(pool, tasks, Feature(test=load("rbac.regression", "regression")), args)
+            run_scenario(pool, tasks, Feature(test=load("aes_encryption.regression", "regression")), args)
+            run_scenario(pool, tasks, Feature(test=load("map_type.regression", "regression")), args)
+            run_scenario(pool, tasks, Feature(test=load("window_functions.regression", "regression")), args)
+            run_scenario(pool, tasks, Feature(test=load("datetime64_extended_range.regression", "regression")), args)
+            #run_scenario(pool, tasks, Feature(test=load("kerberos.regression", "regression")), args)
+            run_scenario(pool, tasks, Feature(test=load("extended_precision_data_types.regression", "regression")), args)
+        finally:
+            join(tasks)
 
 if main():
     regression()
diff --git a/tests/testflows/runner b/tests/testflows/runner
index 213ff6e50d8..772a4d01a84 100755
--- a/tests/testflows/runner
+++ b/tests/testflows/runner
@@ -126,5 +126,7 @@ if __name__ == "__main__":
         move_from = os.path.join(args.clickhouse_root, 'tests/testflows')
         status = os.path.join(move_from, 'check_status.tsv')
         results = os.path.join(move_from, 'test_results.tsv')
+        clickhouse_logs = os.path.join(move_from, 'clickhouse_logs.tar.gz')
         subprocess.call("mv {} {}".format(status, result_path), shell=True)
         subprocess.call("mv {} {}".format(results, result_path), shell=True)
+        subprocess.call("mv {} {}".format(clickhouse_logs, result_path), shell=True)
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/logs.xml b/tests/testflows/window_functions/configs/clickhouse/config.d/logs.xml
new file mode 100644
index 00000000000..e5077af3f49
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse/config.d/logs.xml
@@ -0,0 +1,16 @@
+<yandex>
+    <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>
+    <part_log>
+        <database>system</database>
+        <table>part_log</table>
+        <flush_interval_milliseconds>500</flush_interval_milliseconds>
+    </part_log>
+</yandex>
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/macros.xml b/tests/testflows/window_functions/configs/clickhouse/config.d/macros.xml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/remote.xml b/tests/testflows/window_functions/configs/clickhouse/config.d/remote.xml
new file mode 100644
index 00000000000..b7d02ceeec1
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse/config.d/remote.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<yandex>
+    <remote_servers>
+        <replicated_cluster>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </replicated_cluster>
+        <sharded_cluster>
+            <shard>
+                <replica>
+                    <host>clickhouse1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>clickhouse3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </sharded_cluster>
+    </remote_servers>
+</yandex>
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/window_functions/configs/clickhouse/config.d/zookeeper.xml
new file mode 100644
index 00000000000..96270e7b645
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse/config.d/zookeeper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<yandex>
+    <zookeeper>
+	    <node index="1">
+		    <host>zookeeper</host>
+		    <port>2181</port>
+	    </node>
+        <session_timeout_ms>15000</session_timeout_ms>
+    </zookeeper>
+</yandex>
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.xml b/tests/testflows/window_functions/configs/clickhouse/config.xml
new file mode 100644
index 00000000000..4ec12232539
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse/config.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0"?>
+<!--
+  NOTE: User and query level settings are set up in "users.xml" file.
+-->
+<yandex>
+    <logger>
+        <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+    </logger>
+    <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+
+    <!-- For HTTPS and SSL over native protocol. -->
+    <!--
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+    -->
+
+    <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
+    <openSSL>
+        <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>/etc/clickhouse-server/server.crt</certificateFile>
+            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
+            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
+            <dhParamsFile>/etc/clickhouse-server/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 -->
+            <loadDefaultCAFile>true</loadDefaultCAFile>
+            <cacheSessions>true</cacheSessions>
+            <disableProtocols>sslv2,sslv3</disableProtocols>
+            <preferServerCiphers>true</preferServerCiphers>
+            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
+            <invalidCertificateHandler>
+                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
+                <name>RejectCertificateHandler</name>
+            </invalidCertificateHandler>
+        </client>
+    </openSSL>
+
+    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
+    <!--
+    <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>
+    -->
+
+    <!-- Port for communication between replicas. Used for data exchange. -->
+    <interserver_http_port>9009</interserver_http_port>
+
+    <!-- Hostname that is used by other replicas to request this server.
+         If not specified, than it is determined analoguous to 'hostname -f' command.
+         This setting could be used to switch replication to another network interface.
+      -->
+    <!--
+    <interserver_http_host>example.yandex.ru</interserver_http_host>
+    -->
+
+    <!-- Listen specified host. use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere. -->
+    <!-- <listen_host>::</listen_host> -->
+    <!-- Same for hosts with disabled ipv6: -->
+    <listen_host>0.0.0.0</listen_host>
+
+    <!-- Default values - try listen localhost on ipv4 and ipv6: -->
+    <!--
+    <listen_host>::1</listen_host>
+    <listen_host>127.0.0.1</listen_host>
+    -->
+    <!-- Don't exit if ipv6 or ipv4 unavailable, but listen_host with this protocol specified -->
+    <!-- <listen_try>0</listen_try> -->
+
+    <!-- Allow listen on same address:port -->
+    <!-- <listen_reuse_port>0</listen_reuse_port> -->
+
+    <!-- <listen_backlog>64</listen_backlog> -->
+
+    <max_connections>4096</max_connections>
+    <keep_alive_timeout>3</keep_alive_timeout>
+
+    <!-- Maximum number of concurrent queries. -->
+    <max_concurrent_queries>100</max_concurrent_queries>
+
+    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
+         correct maximum value. -->
+    <!-- <max_open_files>262144</max_open_files> -->
+
+    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
+         Uncompressed cache is advantageous only for very short queries and in rare cases.
+      -->
+    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
+
+    <!-- Approximate size of mark cache, used in tables of MergeTree family.
+         In bytes. Cache is single for server. Memory is allocated only on demand.
+         You should not lower this value.
+      -->
+    <mark_cache_size>5368709120</mark_cache_size>
+
+
+    <!-- Path to data directory, with trailing slash. -->
+    <path>/var/lib/clickhouse/</path>
+
+    <!-- Path to temporary data for processing hard queries. -->
+    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- Directory with user provided files that are accessible by 'file' table function. -->
+    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+
+    <!-- Path to folder where users and roles created by SQL commands are stored. -->
+    <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories>
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
+
+    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
+    <users_config>users.xml</users_config>
+
+    <!-- Default profile of settings. -->
+    <default_profile>default</default_profile>
+
+    <!-- System profile of settings. This settings are used by internal processes (Buffer storage, Distibuted DDL worker and so on). -->
+    <!-- <system_profile>default</system_profile> -->
+
+    <!-- Default database. -->
+    <default_database>default</default_database>
+
+    <!-- Server time zone could be set here.
+
+         Time zone is used when converting between String and DateTime types,
+          when printing DateTime in text formats and parsing DateTime from text,
+          it is used in date and time related functions, if specific time zone was not passed as an argument.
+
+         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
+         If not specified, system time zone at server startup is used.
+
+         Please note, that server could display time zone alias instead of specified name.
+         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
+    -->
+    <!-- <timezone>Europe/Moscow</timezone> -->
+
+    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
+         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
+    -->
+    <!-- <umask>022</umask> -->
+
+    <!-- Perform mlockall after startup to lower first queries latency
+          and to prevent clickhouse executable from being paged out under high IO load.
+         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
+    -->
+    <mlock_executable>false</mlock_executable>
+
+    <!-- Configuration of clusters that could be used in Distributed tables.
+         https://clickhouse.yandex/docs/en/table_engines/distributed/
+      -->
+    <remote_servers incl="clickhouse_remote_servers" >
+        <!-- Test only shard config for testing distributed storage -->
+        <test_shard_localhost>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_shard_localhost>
+        <test_cluster_two_shards_localhost>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+             <shard>
+                 <replica>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+         </test_cluster_two_shards_localhost>
+        <test_shard_localhost_secure>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9440</port>
+                    <secure>1</secure>
+                </replica>
+            </shard>
+        </test_shard_localhost_secure>
+        <test_unavailable_shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>1</port>
+                </replica>
+            </shard>
+        </test_unavailable_shard>
+    </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.
+      -->
+
+    <!-- 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/
+      -->
+    <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
+      -->
+    <macros incl="macros" optional="true" />
+
+
+    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
+    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
+
+
+    <!-- Maximum session timeout, in seconds. Default: 3600. -->
+    <max_session_timeout>3600</max_session_timeout>
+
+    <!-- Default session timeout, in seconds. Default: 60. -->
+    <default_session_timeout>60</default_session_timeout>
+
+    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
+    <!--
+        interval - send every X second
+        root_path - prefix for keys
+        hostname_in_path - append hostname to root_path (default = true)
+        metrics - send data from table system.metrics
+        events - send data from table system.events
+        asynchronous_metrics - send data from table system.asynchronous_metrics
+    -->
+    <!--
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>60</interval>
+        <root_path>one_min</root_path>
+        <hostname_in_path>true</hostname_in_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>true</asynchronous_metrics>
+    </graphite>
+    <graphite>
+        <host>localhost</host>
+        <port>42000</port>
+        <timeout>0.1</timeout>
+        <interval>1</interval>
+        <root_path>one_sec</root_path>
+
+        <metrics>true</metrics>
+        <events>true</events>
+        <asynchronous_metrics>false</asynchronous_metrics>
+    </graphite>
+    -->
+
+
+    <!-- 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.
+             When query log structure is changed after system update,
+              then old table will be renamed and new table will be created automatically.
+        -->
+        <database>system</database>
+        <table>query_log</table>
+        <!--
+            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            Example:
+                event_date
+                toMonday(event_date)
+                toYYYYMM(event_date)
+                toStartOfHour(event_time)
+        -->
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <!-- Interval of flushing data. -->
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_log>
+
+    <!-- Trace log. Stores stack traces collected by query profilers.
+         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
+    <trace_log>
+        <database>system</database>
+        <table>trace_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </trace_log>
+
+    <!-- Query thread log. Has information about all threads participated in query execution.
+         Used only for queries with setting log_query_threads = 1. -->
+    <query_thread_log>
+        <database>system</database>
+        <table>query_thread_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </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>
+        <database>system</database>
+        <table>part_log</table>
+        <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.
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </text_log>
+    -->
+
+    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
+         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+    -->
+
+    <!-- Path to file with region hierarchy. -->
+    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
+
+    <!-- Path to directory with files containing names of regions -->
+    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
+
+
+    <!-- Configuration of external dictionaries. See:
+         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+    -->
+    <dictionaries_config>*_dictionary.xml</dictionaries_config>
+
+    <!-- Uncomment if you want data to be compressed 30-100% better.
+         Don't do that if you just started using ClickHouse.
+      -->
+    <compression incl="clickhouse_compression">
+    <!--
+        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
+        <case>
+
+            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
+            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
+            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
+
+            <!- - What compression method to use. - ->
+            <method>zstd</method>
+        </case>
+    -->
+    </compression>
+
+    <!-- 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. -->
+    <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> -->
+    </distributed_ddl>
+
+    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <merge_tree>
+        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
+    </merge_tree>
+    -->
+
+    <!-- Protection from accidental DROP.
+         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
+         If you want do delete one table and don't want to restart clickhouse-server, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
+         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
+         The same for max_partition_size_to_drop.
+         Uncomment to disable protection.
+    -->
+    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
+    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
+
+    <!-- Example of parameters for GraphiteMergeTree table engine -->
+    <graphite_rollup_example>
+        <pattern>
+            <regexp>click_cost</regexp>
+            <function>any</function>
+            <retention>
+                <age>0</age>
+                <precision>3600</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>60</precision>
+            </retention>
+        </pattern>
+        <default>
+            <function>max</function>
+            <retention>
+                <age>0</age>
+                <precision>60</precision>
+            </retention>
+            <retention>
+                <age>3600</age>
+                <precision>300</precision>
+            </retention>
+            <retention>
+                <age>86400</age>
+                <precision>3600</precision>
+            </retention>
+        </default>
+    </graphite_rollup_example>
+
+    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
+         The directory will be created if it doesn't exist.
+      -->
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
+
+    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
+    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
+</yandex>
diff --git a/tests/testflows/window_functions/configs/clickhouse/users.xml b/tests/testflows/window_functions/configs/clickhouse/users.xml
new file mode 100644
index 00000000000..86b2cd9e1e3
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse/users.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<yandex>
+    <!-- Profiles of settings. -->
+    <profiles>
+        <!-- Default settings. -->
+        <default>
+            <!-- Maximum memory usage for processing single query, in bytes. -->
+            <max_memory_usage>10000000000</max_memory_usage>
+
+            <!-- Use cache of uncompressed blocks of data. Meaningful only for processing many of very short queries. -->
+            <use_uncompressed_cache>0</use_uncompressed_cache>
+
+            <!-- How to choose between replicas during distributed query processing.
+                 random - choose random replica from set of replicas with minimum number of errors
+                 nearest_hostname - from set of replicas with minimum number of errors, choose replica
+                  with minimum number of different symbols between replica's hostname and local hostname
+                  (Hamming distance).
+                 in_order - first live replica is chosen in specified order.
+                 first_or_random - if first replica one has higher number of errors, pick a random one from replicas with minimum number of errors.
+            -->
+            <load_balancing>random</load_balancing>
+        </default>
+
+        <!-- Profile that allows only read queries. -->
+        <readonly>
+            <readonly>1</readonly>
+        </readonly>
+    </profiles>
+
+    <!-- Users and ACL. -->
+    <users>
+        <!-- If user name was not specified, 'default' user is used. -->
+        <default>
+            <!-- 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>.
+                 Password could be empty.
+
+                 If you want to specify SHA256, place it in 'password_sha256_hex' element.
+                 Example: <password_sha256_hex>65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5</password_sha256_hex>
+                 Restrictions of SHA256: impossibility to connect to ClickHouse using MySQL JS client (as of July 2019).
+
+                 If you want to specify double SHA1, place it in 'password_double_sha1_hex' element.
+                 Example: <password_double_sha1_hex>e395796d6546b1b65db9d665cd43f0e858dd4303</password_double_sha1_hex>
+
+                 How to generate decent password:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | sha256sum | tr -d '-'
+                 In first line will be password and in second - corresponding SHA256.
+
+                 How to generate double SHA1:
+                 Execute: PASSWORD=$(base64 < /dev/urandom | head -c8); echo "$PASSWORD"; echo -n "$PASSWORD" | openssl dgst -sha1 -binary | openssl dgst -sha1
+                 In first line will be password and in second - corresponding double SHA1.
+            -->
+            <password></password>
+
+            <!-- List of networks with open access.
+
+                 To open access from everywhere, specify:
+                    <ip>::/0</ip>
+
+                 To open access only from localhost, specify:
+                    <ip>::1</ip>
+                    <ip>127.0.0.1</ip>
+
+                 Each element of list has one of the following forms:
+                 <ip> IP-address or network mask. Examples: 213.180.204.3 or 10.0.0.1/8 or 10.0.0.1/255.255.255.0
+                     2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff::.
+                 <host> Hostname. Example: server01.yandex.ru.
+                     To check access, DNS query is performed, and all received addresses compared to peer address.
+                 <host_regexp> Regular expression for host names. Example, ^server\d\d-\d\d-\d\.yandex\.ru$
+                     To check access, DNS PTR query is performed for peer address and then regexp is applied.
+                     Then, for result of PTR query, another DNS query is performed and all received addresses compared to peer address.
+                     Strongly recommended that regexp is ends with $
+                 All results of DNS requests are cached till server restart.
+            -->
+            <networks incl="networks" replace="replace">
+                <ip>::/0</ip>
+            </networks>
+
+            <!-- Settings profile for user. -->
+            <profile>default</profile>
+
+            <!-- Quota for user. -->
+            <quota>default</quota>
+
+            <!-- Allow access management -->
+            <access_management>1</access_management>
+
+            <!-- Example of row level security policy. -->
+            <!-- <databases>
+                <test>
+                    <filtered_table1>
+                        <filter>a = 1</filter>
+                    </filtered_table1>
+                    <filtered_table2>
+                        <filter>a + b &lt; 1 or c - d &gt; 5</filter>
+                    </filtered_table2>
+                </test>
+            </databases> -->
+        </default>
+
+        <!-- Example of user with readonly access. -->
+        <!-- <readonly>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>readonly</profile>
+            <quota>default</quota>
+        </readonly> -->
+    </users>
+
+    <!-- Quotas. -->
+    <quotas>
+        <!-- Name of quota. -->
+        <default>
+            <!-- Limits for time interval. You could specify many intervals with different limits. -->
+            <interval>
+                <!-- Length of interval. -->
+                <duration>3600</duration>
+
+                <!-- No limits. Just calculate resource usage for time interval. -->
+                <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>
diff --git a/tests/testflows/window_functions/configs/clickhouse1/config.d/macros.xml b/tests/testflows/window_functions/configs/clickhouse1/config.d/macros.xml
new file mode 100644
index 00000000000..42256946311
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse1/config.d/macros.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse1</replica>
+        <shard>01</shard>
+    </macros>
+</yandex>
diff --git a/tests/testflows/window_functions/configs/clickhouse2/config.d/macros.xml b/tests/testflows/window_functions/configs/clickhouse2/config.d/macros.xml
new file mode 100644
index 00000000000..a0c7042f04e
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse2/config.d/macros.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse2</replica>
+        <shard>02</shard>
+    </macros>
+</yandex>
diff --git a/tests/testflows/window_functions/configs/clickhouse3/config.d/macros.xml b/tests/testflows/window_functions/configs/clickhouse3/config.d/macros.xml
new file mode 100644
index 00000000000..f0afc7d307d
--- /dev/null
+++ b/tests/testflows/window_functions/configs/clickhouse3/config.d/macros.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<yandex>
+    <macros>
+        <replica>clickhouse3</replica>
+        <shard>03</shard>
+    </macros>
+</yandex>
diff --git a/tests/testflows/window_functions/regression.py b/tests/testflows/window_functions/regression.py
new file mode 100755
index 00000000000..419c025b11c
--- /dev/null
+++ b/tests/testflows/window_functions/regression.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+from testflows.core import *
+
+append_path(sys.path, "..")
+
+from helpers.cluster import Cluster
+from helpers.argparser import argparser
+from window_functions.requirements import SRS019_ClickHouse_Window_Functions, RQ_SRS_019_ClickHouse_WindowFunctions
+
+xfails = {
+    "tests/:/frame clause/range frame/between expr following and expr following without order by error":
+        [(Fail, "invalid error message")],
+    "tests/:/frame clause/range frame/between expr following and expr preceding without order by error":
+        [(Fail, "invalid error message")],
+    "tests/:/frame clause/range frame/between expr following and current row without order by error":
+        [(Fail, "invalid error message")],
+    "tests/:/frame clause/range frame/between expr following and current row zero special case":
+        [(Fail, "known bug")],
+    "tests/:/frame clause/range frame/between expr following and expr preceding with order by zero special case":
+        [(Fail, "known bug")],
+    "tests/:/funcs/lag/anyOrNull with column value as offset":
+        [(Fail, "column values are not supported as offset")],
+    "tests/:/funcs/lead/subquery as offset":
+        [(Fail, "subquery is not supported as offset")],
+    "tests/:/frame clause/range frame/between current row and unbounded following modifying named window":
+        [(Fail, "range with named window is not supported")],
+    "tests/:/frame clause/range overflow/negative overflow with Int16":
+        [(Fail, "exception on conversion")],
+    "tests/:/frame clause/range overflow/positive overflow with Int16":
+        [(Fail, "exception on conversion")],
+    "tests/:/misc/subquery expr preceding":
+        [(Fail, "subquery is not supported as offset")],
+    "tests/:/frame clause/range errors/error negative preceding offset":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22442")],
+    "tests/:/frame clause/range errors/error negative following offset":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/22442")],
+    "tests/:/misc/window functions in select expression":
+        [(Fail, "not supported, https://github.com/ClickHouse/ClickHouse/issues/19857")],
+    "tests/:/misc/window functions in subquery":
+        [(Fail, "not supported, https://github.com/ClickHouse/ClickHouse/issues/19857")],
+    "tests/:/frame clause/range frame/order by decimal":
+        [(Fail, "Exception: The RANGE OFFSET frame for 'DB::ColumnDecimal<DB::Decimal<long> >' ORDER BY column is not implemented")],
+    "tests/:/frame clause/range frame/with nulls":
+        [(Fail, "DB::Exception: The RANGE OFFSET frame for 'DB::ColumnNullable' ORDER BY column is not implemented")],
+    "tests/:/aggregate funcs/aggregate funcs over rows frame/func='mannWhitneyUTest(salary, 1)'":
+        [(Fail, "need to investigate")],
+    "tests/:/aggregate funcs/aggregate funcs over rows frame/func='rankCorr(salary, 0.5)'":
+        [(Fail, "need to investigate")],
+    "tests/distributed/misc/query with order by and one window":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/23902")],
+    "tests/distributed/over clause/empty named window":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/23902")],
+    "tests/distributed/over clause/empty":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/23902")],
+    "tests/distributed/over clause/adhoc window":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/23902")],
+    "tests/distributed/frame clause/range datetime/:":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/23902")],
+    "tests/distributed/frame clause/range frame/between expr preceding and expr following with partition by same column twice":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/23902")]
+}
+
+xflags = {
+}
+
+@TestModule
+@ArgumentParser(argparser)
+@XFails(xfails)
+@XFlags(xflags)
+@Name("window functions")
+@Specifications(
+    SRS019_ClickHouse_Window_Functions
+)
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions("1.0")
+)
+def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
+    """Window functions regression.
+    """
+    top().terminating = False
+    nodes = {
+        "clickhouse":
+            ("clickhouse1", "clickhouse2", "clickhouse3")
+    }
+
+    if stress is not None:
+        self.context.stress = stress
+    if parallel is not None:
+        self.context.parallel = parallel
+
+    with Cluster(local, clickhouse_binary_path, nodes=nodes,
+            docker_compose_project_dir=os.path.join(current_dir(), "window_functions_env")) as cluster:
+        self.context.cluster = cluster
+
+        Feature(run=load("window_functions.tests.feature", "feature"), flags=TE)
+
+if main():
+    regression()
diff --git a/tests/testflows/window_functions/requirements/__init__.py b/tests/testflows/window_functions/requirements/__init__.py
new file mode 100644
index 00000000000..02f7d430154
--- /dev/null
+++ b/tests/testflows/window_functions/requirements/__init__.py
@@ -0,0 +1 @@
+from .requirements import *
diff --git a/tests/testflows/window_functions/requirements/requirements.md b/tests/testflows/window_functions/requirements/requirements.md
new file mode 100644
index 00000000000..1d6dbc28923
--- /dev/null
+++ b/tests/testflows/window_functions/requirements/requirements.md
@@ -0,0 +1,2300 @@
+# SRS019 ClickHouse Window Functions
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Requirements](#requirements)
+  * 3.1 [General](#general)
+    * 3.1.1 [RQ.SRS-019.ClickHouse.WindowFunctions](#rqsrs-019clickhousewindowfunctions)
+    * 3.1.2 [RQ.SRS-019.ClickHouse.WindowFunctions.NonDistributedTables](#rqsrs-019clickhousewindowfunctionsnondistributedtables)
+    * 3.1.3 [RQ.SRS-019.ClickHouse.WindowFunctions.DistributedTables](#rqsrs-019clickhousewindowfunctionsdistributedtables)
+  * 3.2 [Window Specification](#window-specification)
+    * 3.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowSpec](#rqsrs-019clickhousewindowfunctionswindowspec)
+  * 3.3 [PARTITION Clause](#partition-clause)
+    * 3.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause](#rqsrs-019clickhousewindowfunctionspartitionclause)
+    * 3.3.2 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MultipleExpr](#rqsrs-019clickhousewindowfunctionspartitionclausemultipleexpr)
+    * 3.3.3 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MissingExpr.Error](#rqsrs-019clickhousewindowfunctionspartitionclausemissingexprerror)
+    * 3.3.4 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.InvalidExpr.Error](#rqsrs-019clickhousewindowfunctionspartitionclauseinvalidexprerror)
+  * 3.4 [ORDER Clause](#order-clause)
+    * 3.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause](#rqsrs-019clickhousewindowfunctionsorderclause)
+      * 3.4.1.1 [order_clause](#order_clause)
+    * 3.4.2 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MultipleExprs](#rqsrs-019clickhousewindowfunctionsorderclausemultipleexprs)
+    * 3.4.3 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MissingExpr.Error](#rqsrs-019clickhousewindowfunctionsorderclausemissingexprerror)
+    * 3.4.4 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.InvalidExpr.Error](#rqsrs-019clickhousewindowfunctionsorderclauseinvalidexprerror)
+  * 3.5 [FRAME Clause](#frame-clause)
+    * 3.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.FrameClause](#rqsrs-019clickhousewindowfunctionsframeclause)
+    * 3.5.2 [ROWS](#rows)
+      * 3.5.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame](#rqsrs-019clickhousewindowfunctionsrowsframe)
+      * 3.5.2.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.MissingFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrowsframemissingframeextenterror)
+      * 3.5.2.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.InvalidFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrowsframeinvalidframeextenterror)
+      * 3.5.2.4 [ROWS CURRENT ROW](#rows-current-row)
+        * 3.5.2.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframestartcurrentrow)
+      * 3.5.2.5 [ROWS UNBOUNDED PRECEDING](#rows-unbounded-preceding)
+        * 3.5.2.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedPreceding](#rqsrs-019clickhousewindowfunctionsrowsframestartunboundedpreceding)
+      * 3.5.2.6 [ROWS `expr` PRECEDING](#rows-expr-preceding)
+        * 3.5.2.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprPreceding](#rqsrs-019clickhousewindowfunctionsrowsframestartexprpreceding)
+      * 3.5.2.7 [ROWS UNBOUNDED FOLLOWING](#rows-unbounded-following)
+        * 3.5.2.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframestartunboundedfollowingerror)
+      * 3.5.2.8 [ROWS `expr` FOLLOWING](#rows-expr-following)
+        * 3.5.2.8.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframestartexprfollowingerror)
+      * 3.5.2.9 [ROWS BETWEEN CURRENT ROW](#rows-between-current-row)
+        * 3.5.2.9.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowcurrentrow)
+        * 3.5.2.9.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowunboundedprecedingerror)
+        * 3.5.2.9.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowexprprecedingerror)
+        * 3.5.2.9.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowunboundedfollowing)
+        * 3.5.2.9.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowexprfollowing)
+      * 3.5.2.10 [ROWS BETWEEN UNBOUNDED PRECEDING](#rows-between-unbounded-preceding)
+        * 3.5.2.10.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingcurrentrow)
+        * 3.5.2.10.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingunboundedprecedingerror)
+        * 3.5.2.10.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprPreceding](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingexprpreceding)
+        * 3.5.2.10.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingunboundedfollowing)
+        * 3.5.2.10.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingexprfollowing)
+      * 3.5.2.11 [ROWS BETWEEN UNBOUNDED FOLLOWING](#rows-between-unbounded-following)
+        * 3.5.2.11.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedfollowingerror)
+      * 3.5.2.12 [ROWS BETWEEN `expr` FOLLOWING](#rows-between-expr-following)
+        * 3.5.2.12.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingerror)
+        * 3.5.2.12.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingexprfollowingerror)
+        * 3.5.2.12.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingunboundedfollowing)
+        * 3.5.2.12.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingexprfollowing)
+      * 3.5.2.13 [ROWS BETWEEN `expr` PRECEDING](#rows-between-expr-preceding)
+        * 3.5.2.13.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingcurrentrow)
+        * 3.5.2.13.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingunboundedprecedingerror)
+        * 3.5.2.13.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingunboundedfollowing)
+        * 3.5.2.13.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingexprprecedingerror)
+        * 3.5.2.13.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingexprpreceding)
+        * 3.5.2.13.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingexprfollowing)
+    * 3.5.3 [RANGE](#range)
+      * 3.5.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame](#rqsrs-019clickhousewindowfunctionsrangeframe)
+      * 3.5.3.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.DateAndDateTime](#rqsrs-019clickhousewindowfunctionsrangeframedatatypesdateanddatetime)
+      * 3.5.3.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.IntAndUInt](#rqsrs-019clickhousewindowfunctionsrangeframedatatypesintanduint)
+      * 3.5.3.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MultipleColumnsInOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframemultiplecolumnsinorderbyerror)
+      * 3.5.3.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MissingFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrangeframemissingframeextenterror)
+      * 3.5.3.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.InvalidFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrangeframeinvalidframeextenterror)
+      * 3.5.3.7 [`CURRENT ROW` Peers](#current-row-peers)
+      * 3.5.3.8 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.CurrentRow.Peers](#rqsrs-019clickhousewindowfunctionsrangeframecurrentrowpeers)
+      * 3.5.3.9 [RANGE CURRENT ROW](#range-current-row)
+        * 3.5.3.9.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithoutOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartcurrentrowwithoutorderby)
+        * 3.5.3.9.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartcurrentrowwithorderby)
+      * 3.5.3.10 [RANGE UNBOUNDED FOLLOWING](#range-unbounded-following)
+        * 3.5.3.10.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartunboundedfollowingerror)
+      * 3.5.3.11 [RANGE UNBOUNDED PRECEDING](#range-unbounded-preceding)
+        * 3.5.3.11.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithoutOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartunboundedprecedingwithoutorderby)
+        * 3.5.3.11.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartunboundedprecedingwithorderby)
+      * 3.5.3.12 [RANGE `expr` PRECEDING](#range-expr-preceding)
+        * 3.5.3.12.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprprecedingwithoutorderbyerror)
+        * 3.5.3.12.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.OrderByNonNumericalColumn.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprprecedingorderbynonnumericalcolumnerror)
+        * 3.5.3.12.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartexprprecedingwithorderby)
+      * 3.5.3.13 [RANGE `expr` FOLLOWING](#range-expr-following)
+        * 3.5.3.13.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprfollowingwithoutorderbyerror)
+        * 3.5.3.13.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprfollowingwithorderbyerror)
+      * 3.5.3.14 [RANGE BETWEEN CURRENT ROW](#range-between-current-row)
+        * 3.5.3.14.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.CurrentRow](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowcurrentrow)
+        * 3.5.3.14.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowunboundedprecedingerror)
+        * 3.5.3.14.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowunboundedfollowing)
+        * 3.5.3.14.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowexprfollowingwithoutorderbyerror)
+        * 3.5.3.14.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowexprfollowingwithorderby)
+        * 3.5.3.14.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowexprprecedingerror)
+      * 3.5.3.15 [RANGE BETWEEN UNBOUNDED PRECEDING](#range-between-unbounded-preceding)
+        * 3.5.3.15.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.CurrentRow](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingcurrentrow)
+        * 3.5.3.15.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingunboundedprecedingerror)
+        * 3.5.3.15.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingunboundedfollowing)
+        * 3.5.3.15.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprprecedingwithoutorderbyerror)
+        * 3.5.3.15.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprprecedingwithorderby)
+        * 3.5.3.15.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprfollowingwithoutorderbyerror)
+        * 3.5.3.15.7 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprfollowingwithorderby)
+      * 3.5.3.16 [RANGE BETWEEN UNBOUNDED FOLLOWING](#range-between-unbounded-following)
+        * 3.5.3.16.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.CurrentRow.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingcurrentrowerror)
+        * 3.5.3.16.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingunboundedfollowingerror)
+        * 3.5.3.16.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingunboundedprecedingerror)
+        * 3.5.3.16.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingexprprecedingerror)
+        * 3.5.3.16.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingexprfollowingerror)
+      * 3.5.3.17 [RANGE BETWEEN expr PRECEDING](#range-between-expr-preceding)
+        * 3.5.3.17.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingcurrentrowwithorderby)
+        * 3.5.3.17.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingcurrentrowwithoutorderbyerror)
+        * 3.5.3.17.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingunboundedprecedingerror)
+        * 3.5.3.17.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingunboundedfollowingwithoutorderbyerror)
+        * 3.5.3.17.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingunboundedfollowingwithorderby)
+        * 3.5.3.17.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprfollowingwithoutorderbyerror)
+        * 3.5.3.17.7 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprfollowingwithorderby)
+        * 3.5.3.17.8 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprprecedingwithoutorderbyerror)
+        * 3.5.3.17.9 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprprecedingwithorderbyerror)
+        * 3.5.3.17.10 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprprecedingwithorderby)
+      * 3.5.3.18 [RANGE BETWEEN expr FOLLOWING](#range-between-expr-following)
+        * 3.5.3.18.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingcurrentrowwithoutorderbyerror)
+        * 3.5.3.18.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingcurrentrowwithorderbyerror)
+        * 3.5.3.18.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.ZeroSpecialCase](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingcurrentrowzerospecialcase)
+        * 3.5.3.18.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingunboundedfollowingwithoutorderbyerror)
+        * 3.5.3.18.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingunboundedfollowingwithorderby)
+        * 3.5.3.18.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingunboundedprecedingerror)
+        * 3.5.3.18.7 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprprecedingwithoutorderbyerror)
+        * 3.5.3.18.8 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprprecedingerror)
+        * 3.5.3.18.9 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithOrderBy.ZeroSpecialCase](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprprecedingwithorderbyzerospecialcase)
+        * 3.5.3.18.10 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprfollowingwithoutorderbyerror)
+        * 3.5.3.18.11 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprfollowingwithorderbyerror)
+        * 3.5.3.18.12 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprfollowingwithorderby)
+    * 3.5.4 [Frame Extent](#frame-extent)
+      * 3.5.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Extent](#rqsrs-019clickhousewindowfunctionsframeextent)
+    * 3.5.5 [Frame Start](#frame-start)
+      * 3.5.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Start](#rqsrs-019clickhousewindowfunctionsframestart)
+    * 3.5.6 [Frame Between](#frame-between)
+      * 3.5.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Between](#rqsrs-019clickhousewindowfunctionsframebetween)
+    * 3.5.7 [Frame End](#frame-end)
+      * 3.5.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.End](#rqsrs-019clickhousewindowfunctionsframeend)
+    * 3.5.8 [`CURRENT ROW`](#current-row)
+      * 3.5.8.1 [RQ.SRS-019.ClickHouse.WindowFunctions.CurrentRow](#rqsrs-019clickhousewindowfunctionscurrentrow)
+    * 3.5.9 [`UNBOUNDED PRECEDING`](#unbounded-preceding)
+      * 3.5.9.1 [RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedPreceding](#rqsrs-019clickhousewindowfunctionsunboundedpreceding)
+    * 3.5.10 [`UNBOUNDED FOLLOWING`](#unbounded-following)
+      * 3.5.10.1 [RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsunboundedfollowing)
+    * 3.5.11 [`expr PRECEDING`](#expr-preceding)
+      * 3.5.11.1 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding](#rqsrs-019clickhousewindowfunctionsexprpreceding)
+      * 3.5.11.2 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding.ExprValue](#rqsrs-019clickhousewindowfunctionsexprprecedingexprvalue)
+    * 3.5.12 [`expr FOLLOWING`](#expr-following)
+      * 3.5.12.1 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing](#rqsrs-019clickhousewindowfunctionsexprfollowing)
+      * 3.5.12.2 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing.ExprValue](#rqsrs-019clickhousewindowfunctionsexprfollowingexprvalue)
+  * 3.6 [WINDOW Clause](#window-clause)
+    * 3.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause](#rqsrs-019clickhousewindowfunctionswindowclause)
+    * 3.6.2 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MultipleWindows](#rqsrs-019clickhousewindowfunctionswindowclausemultiplewindows)
+    * 3.6.3 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MissingWindowSpec.Error](#rqsrs-019clickhousewindowfunctionswindowclausemissingwindowspecerror)
+  * 3.7 [`OVER` Clause](#over-clause)
+    * 3.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause](#rqsrs-019clickhousewindowfunctionsoverclause)
+    * 3.7.2 [Empty Clause](#empty-clause)
+      * 3.7.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.EmptyOverClause](#rqsrs-019clickhousewindowfunctionsoverclauseemptyoverclause)
+    * 3.7.3 [Ad-Hoc Window](#ad-hoc-window)
+      * 3.7.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow](#rqsrs-019clickhousewindowfunctionsoverclauseadhocwindow)
+      * 3.7.3.2 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow.MissingWindowSpec.Error](#rqsrs-019clickhousewindowfunctionsoverclauseadhocwindowmissingwindowspecerror)
+    * 3.7.4 [Named Window](#named-window)
+      * 3.7.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow](#rqsrs-019clickhousewindowfunctionsoverclausenamedwindow)
+      * 3.7.4.2 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.InvalidName.Error](#rqsrs-019clickhousewindowfunctionsoverclausenamedwindowinvalidnameerror)
+      * 3.7.4.3 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.MultipleWindows.Error](#rqsrs-019clickhousewindowfunctionsoverclausenamedwindowmultiplewindowserror)
+  * 3.8 [Window Functions](#window-functions)
+    * 3.8.1 [Nonaggregate Functions](#nonaggregate-functions)
+      * 3.8.1.1 [The `first_value(expr)` Function](#the-first_valueexpr-function)
+        * 3.8.1.1.1 [RQ.SRS-019.ClickHouse.WindowFunctions.FirstValue](#rqsrs-019clickhousewindowfunctionsfirstvalue)
+      * 3.8.1.2 [The `last_value(expr)` Function](#the-last_valueexpr-function)
+        * 3.8.1.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.LastValue](#rqsrs-019clickhousewindowfunctionslastvalue)
+      * 3.8.1.3 [The `lag(value, offset)` Function Workaround](#the-lagvalue-offset-function-workaround)
+        * 3.8.1.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Lag.Workaround](#rqsrs-019clickhousewindowfunctionslagworkaround)
+      * 3.8.1.4 [The `lead(value, offset)` Function Workaround](#the-leadvalue-offset-function-workaround)
+        * 3.8.1.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Lead.Workaround](#rqsrs-019clickhousewindowfunctionsleadworkaround)
+      * 3.8.1.5 [The `rank()` Function](#the-rank-function)
+        * 3.8.1.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Rank](#rqsrs-019clickhousewindowfunctionsrank)
+      * 3.8.1.6 [The `dense_rank()` Function](#the-dense_rank-function)
+        * 3.8.1.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.DenseRank](#rqsrs-019clickhousewindowfunctionsdenserank)
+      * 3.8.1.7 [The `row_number()` Function](#the-row_number-function)
+        * 3.8.1.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowNumber](#rqsrs-019clickhousewindowfunctionsrownumber)
+    * 3.8.2 [Aggregate Functions](#aggregate-functions)
+      * 3.8.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions](#rqsrs-019clickhousewindowfunctionsaggregatefunctions)
+      * 3.8.2.2 [Combinators](#combinators)
+        * 3.8.2.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Combinators](#rqsrs-019clickhousewindowfunctionsaggregatefunctionscombinators)
+      * 3.8.2.3 [Parametric](#parametric)
+        * 3.8.2.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Parametric](#rqsrs-019clickhousewindowfunctionsaggregatefunctionsparametric)
+* 4 [References](#references)
+
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This software requirements specification covers requirements for supporting window functions in [ClickHouse].
+Similar functionality exists in [MySQL] and [PostreSQL]. [PostreSQL] defines a window function as follows:
+
+> A window function performs a calculation across a set of table rows that are somehow related to the current row.
+> This is comparable to the type of calculation that can be done with an aggregate function.
+> But unlike regular aggregate functions, use of a window function does not cause rows to
+> become grouped into a single output row — the rows retain their separate identities.
+
+## Requirements
+
+### General
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions
+version: 1.0
+
+[ClickHouse] SHALL support [window functions] that produce a result for each row inside the window.
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.NonDistributedTables
+version: 1.0
+
+[ClickHouse] SHALL support correct operation of [window functions] on non-distributed 
+table engines such as `MergeTree`.
+
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.DistributedTables
+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.
+
+### Window Specification
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowSpec
+version: 1.0
+
+[ClickHouse] SHALL support defining a window using window specification clause.
+The [window_spec] SHALL be defined as
+
+```
+window_spec:
+   [partition_clause] [order_clause] [frame_clause]
+```
+
+that SHALL specify how to partition query rows into groups for processing by the window function.
+
+### PARTITION Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause
+version: 1.0
+
+[ClickHouse] SHALL support [partition_clause] that indicates how to divide the query rows into groups.
+The [partition_clause] SHALL be defined as
+
+```
+partition_clause:
+    PARTITION BY expr [, expr] ...
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MultipleExpr
+version: 1.0
+
+[ClickHouse] SHALL support partitioning by more than one `expr` in the [partition_clause] definition.
+
+For example,
+
+```sql
+SELECT x,s, sum(x) OVER (PARTITION BY x,s) FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))
+```
+
+```bash
+┌─x─┬─s─┬─sum(x) OVER (PARTITION BY x, s)─┐
+│ 1 │ a │                               1 │
+│ 1 │ b │                               1 │
+│ 2 │ b │                               2 │
+└───┴───┴─────────────────────────────────┘
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MissingExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is missing in the [partition_clause] definition.
+
+```sql
+SELECT sum(number) OVER (PARTITION BY) FROM numbers(1,3)
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.InvalidExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is invalid in the [partition_clause] definition.
+
+### ORDER Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause
+version: 1.0
+
+[ClickHouse] SHALL support [order_clause] that indicates how to sort rows in each window.
+
+##### order_clause
+
+The `order_clause` SHALL be defined as
+
+```
+order_clause:
+    ORDER BY expr [ASC|DESC] [, expr [ASC|DESC]] ...
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MultipleExprs
+version: 1.0
+
+[ClickHouse] SHALL return support using more than one `expr` in the [order_clause] definition.
+
+For example, 
+
+```sql
+SELECT x,s, sum(x) OVER (ORDER BY x DESC, s DESC) FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))
+```
+
+```bash
+┌─x─┬─s─┬─sum(x) OVER (ORDER BY x DESC, s DESC)─┐
+│ 2 │ b │                                     2 │
+│ 1 │ b │                                     3 │
+│ 1 │ a │                                     4 │
+└───┴───┴───────────────────────────────────────┘
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MissingExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is missing in the [order_clause] definition.
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.InvalidExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is invalid in the [order_clause] definition.
+
+### FRAME Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.FrameClause
+version: 1.0
+
+[ClickHouse] SHALL support [frame_clause] that SHALL specify a subset of the current window.
+
+The `frame_clause` SHALL be defined as
+
+```
+frame_clause:
+    {ROWS | RANGE } frame_extent
+```
+
+#### ROWS
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame
+version: 1.0
+
+[ClickHouse] SHALL support `ROWS` frame to define beginning and ending row positions.
+Offsets SHALL be differences in row numbers from the current row number.
+
+```sql
+ROWS frame_extent
+```
+
+See [frame_extent] definition.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.MissingFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `ROWS` frame clause is defined without [frame_extent].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number ROWS) FROM numbers(1,3)
+```
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.InvalidFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `ROWS` frame clause has invalid [frame_extent].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number ROWS '1') FROM numbers(1,3)
+```
+
+##### ROWS CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include only the current row in the window partition
+when `ROWS CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS CURRENT ROW) FROM numbers(1,2)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           2 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedPreceding
+version: 1.0
+
+[ClickHouse] SHALL include all rows before and including the current row in the window partition
+when `ROWS UNBOUNDED PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                   1 │
+│      2 │                                                                   3 │
+│      3 │                                                                   6 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS `expr` PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL include `expr` rows before and including the current row in the window partition 
+when `ROWS expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS 1 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           3 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+##### ROWS `expr` FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS 1 FOLLOWING) FROM numbers(1,3)
+```
+
+##### ROWS BETWEEN CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include only the current row in the window partition
+when `ROWS BETWEEN CURRENT ROW AND CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,2)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           2 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING` frame is specified.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN CURRENT ROW AND expr PRECEDING` frame is specified.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the current row and all the following rows in the window partition
+when `ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                   6 │
+│      2 │                                                                   5 │
+│      3 │                                                                   3 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the current row and the `expr` rows that are following the current row in the window partition
+when `ROWS BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)─┐
+│      1 │                                                           3 │
+│      2 │                                                           5 │
+│      3 │                                                           3 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS BETWEEN UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include all the rows before and including the current row in the window partition
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                   1 │
+│      2 │                                                                   3 │
+│      3 │                                                                   6 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL include all the rows until and including the current row minus `expr` rows preceding it
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING)─┐
+│      1 │                                                                   0 │
+│      2 │                                                                   1 │
+│      3 │                                                                   3 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition 
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                           6 │
+│      2 │                                                                           6 │
+│      3 │                                                                           6 │
+└────────┴─────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all the rows until and including the current row plus `expr` rows following it
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                                   3 │
+│      2 │                                                                   6 │
+│      3 │                                                                   6 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS BETWEEN UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `UNBOUNDED FOLLOWING` is specified as the start of the frame, including
+
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND expr PRECEDING`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND expr FOLLOWING`
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+##### ROWS BETWEEN `expr` FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `expr FOLLOWING` is specified as the start of the frame
+and it points to a row that is after the start of the frame inside the window partition such
+as the following cases
+
+* `ROWS BETWEEN expr FOLLOWING AND CURRENT ROW`
+* `ROWS BETWEEN expr FOLLOWING AND UNBOUNDED PRECEDING`
+* `ROWS BETWEEN expr FOLLOWING AND expr PRECEDING`
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN expr FOLLOWING AND expr FOLLOWING`
+is specified and the end of the frame specified by the `expr FOLLOWING` is a row that is before the row 
+specified by the frame start.
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all the rows from and including current row plus `expr` rows following it 
+until and including the last row in the window partition
+when `ROWS BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                   5 │
+│      2 │                                                                   3 │
+│      3 │                                                                   0 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row plus `expr` following it 
+until and including the row specified by the frame end when the frame end 
+is the current row plus `expr` following it is right at or after the start of the frame
+when `ROWS BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING)─┐
+│      1 │                                                           5 │
+│      2 │                                                           3 │
+│      3 │                                                           0 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS BETWEEN `expr` PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows
+preceding it until and including the current row in the window frame
+when `ROWS BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           3 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error
+when `ROWS BETWEEN expr PRECEDING AND UNBOUNDED PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows
+preceding it until and including the last row in the window partition
+when `ROWS BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                   6 │
+│      2 │                                                                   6 │
+│      3 │                                                                   5 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when the frame end specified by the `expr PRECEDING`
+evaluates to a row that is before the row specified by the frame start in the window partition
+when `ROWS BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows preceding it
+until and including the current row minus `expr` rows preceding it if the end
+of the frame is after the frame start in the window partition 
+when `ROWS BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 0 PRECEDING)─┐
+│      1 │                                                           1 │
+│      2 │                                                           3 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows preceding it
+until and including the current row plus `expr` rows following it in the window partition
+when `ROWS BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                           3 │
+│      2 │                                                           6 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+#### RANGE
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame
+version: 1.0
+
+[ClickHouse] SHALL support `RANGE` frame to define rows within a value range.
+Offsets SHALL be differences in row values from the current row value.
+
+```sql
+RANGE frame_extent
+```
+
+See [frame_extent] definition.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.DateAndDateTime
+version: 1.0
+
+[ClickHouse] SHALL support `RANGE` frame over columns with `Date` and `DateTime`
+data types.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.IntAndUInt
+version: 1.0
+
+[ClickHouse] SHALL support `RANGE` frame over columns with numerical data types
+such `IntX` and `UIntX`.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MultipleColumnsInOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `RANGE` frame definition is used with `ORDER BY`
+that uses multiple columns.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MissingFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `RANGE` frame definition is missing [frame_extent].
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.InvalidFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `RANGE` frame definition has invalid [frame_extent].
+
+##### `CURRENT ROW` Peers
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.CurrentRow.Peers
+version: 1.0
+
+[ClickHouse] for the `RANGE` frame SHALL define the `peers` of the `CURRENT ROW` to be all
+the rows that are inside the same order bucket.
+
+##### RANGE CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithoutOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition
+when `RANGE CURRENT ROW` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                            6 │
+│      2 │                                                            6 │
+│      3 │                                                            6 │
+└────────┴──────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows that are [current row peers] in the window partition
+when `RANGE CURRENT ROW` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE UNBOUNDED FOLLOWING` frame is specified with or without order by
+as `UNBOUNDED FOLLOWING` SHALL not be supported as [frame_start].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+##### RANGE UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithoutOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition
+when `RANGE UNBOUNDED PRECEDING` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                    6 │
+│      2 │                                                                    6 │
+│      3 │                                                                    6 │
+└────────┴──────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include rows with values from and including the first row 
+until and including all [current row peers] in the window partition
+when `RANGE UNBOUNDED PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                        1 │
+│      2 │                                                                                        3 │
+│      3 │                                                                                        6 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE `expr` PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr PRECEDING` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE 1 PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.OrderByNonNumericalColumn.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr PRECEDING` is used with `ORDER BY` clause
+over a non-numerical column.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include rows with values from and including current row value minus `expr`
+until and including the value for the current row 
+when `RANGE expr PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE 1 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                1 │
+│      2 │                                                                                3 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE `expr` FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr FOLLOWING` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE 1 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr FOLLOWING` frame is specified wit the `ORDER BY` clause 
+as the value for the frame start cannot be larger than the value for the frame end.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE 1 FOLLOWING) FROM numbers(1,3)
+```
+
+##### RANGE BETWEEN CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include all [current row peers] in the window partition 
+when `RANGE BETWEEN CURRENT ROW AND CURRENT ROW` frame is specified with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**  
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                            6 │
+│      2 │                                                            6 │
+│      3 │                                                            6 │
+└────────┴──────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**  
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                                                1 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING` frame is specified
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including [current row peers] until and including
+the last row in the window partition when `RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING` frame is specified
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                    6 │
+│      2 │                                                                    6 │
+│      3 │                                                                    6 │
+└────────┴──────────────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                        6 │
+│      2 │                                                                                        5 │
+│      3 │                                                                                        3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including [current row peers] until and including
+current row value plus `expr` when `RANGE BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified
+with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING)─┐
+│      1 │                                                                                4 │
+│      1 │                                                                                4 │
+│      2 │                                                                                5 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND expr PRECEDING` frame is specified
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) FROM numbers(1,3)
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) FROM numbers(1,3)
+```
+
+##### RANGE BETWEEN UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including the first row until and including
+[current row peers] in the window partition when `RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW` frame is specified
+with and without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                    7 │
+│      1 │                                                                    7 │
+│      2 │                                                                    7 │
+│      3 │                                                                    7 │
+└────────┴──────────────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                        2 │
+│      1 │                                                                                        2 │
+│      2 │                                                                                        4 │
+│      3 │                                                                                        7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return and error when `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING` frame is specified
+with and without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition when `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING` frame is specified
+with and without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                            7 │
+│      1 │                                                                            7 │
+│      2 │                                                                            7 │
+│      3 │                                                                            7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                                7 │
+│      1 │                                                                                                7 │
+│      2 │                                                                                                7 │
+│      3 │                                                                                                7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including the first row until and including
+the value of the current row minus `expr` in the window partition
+when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING)─┐
+│      1 │                                                                                        0 │
+│      1 │                                                                                        0 │
+│      2 │                                                                                        2 │
+│      3 │                                                                                        4 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including the first row until and including
+the value of the current row plus `expr` in the window partition
+when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                                                        4 │
+│      1 │                                                                                        4 │
+│      2 │                                                                                        7 │
+│      3 │                                                                                        7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE BETWEEN UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.CurrentRow.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND expr PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND expr FOLLOWING` frame is specified 
+with or without the `ORDER BY` clause.
+
+##### RANGE BETWEEN expr PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus `expr` 
+until and including [current row peers] in the window partition
+when `RANGE BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                4 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus `expr` 
+until and including the last row in the window partition when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame
+is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                        7 │
+│      1 │                                                                                        7 │
+│      2 │                                                                                        7 │
+│      3 │                                                                                        5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus preceding `expr` 
+until and including current row plus following `expr` in the window partition 
+when `RANGE BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                                                4 │
+│      1 │                                                                                4 │
+│      2 │                                                                                7 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when the value of the [frame_end] specified by the 
+current row minus preceding `expr` is greater than the value of the [frame_start] in the window partition
+when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus preceding `expr` for the [frame_start]
+until and including current row minus following `expr` for the [frame_end] in the window partition 
+when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause
+if an only if the [frame_end] value is equal or greater than [frame_start] value.
+
+For example,
+
+**Greater Than**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                4 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+or **Equal**
+
+```sql
+ SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 1 PRECEDING)─┐
+│      1 │                                                                                0 │
+│      1 │                                                                                0 │
+│      2 │                                                                                2 │
+│      3 │                                                                                2 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE BETWEEN expr FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified 
+with the `ORDER BY` clause and `expr` is greater than `0`.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.ZeroSpecialCase
+version: 1.0
+
+[ClickHouse] SHALL include all [current row peers] in the window partition
+when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified 
+with the `ORDER BY` clause if and only if the `expr` equals to `0`.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW)─┐
+│      1 │                                                            7 │
+│      1 │                                                            7 │
+│      2 │                                                            7 │
+│      3 │                                                            7 │
+└────────┴──────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row plus `expr`
+until and including the last row in the window partition 
+when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                        5 │
+│      1 │                                                                                        5 │
+│      2 │                                                                                        3 │
+│      3 │                                                                                        0 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified 
+without the `ORDER BY`.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified 
+with the `ORDER BY` clause if the value of both `expr` is not `0`.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithOrderBy.ZeroSpecialCase
+version: 1.0
+
+[ClickHouse] SHALL include all rows with value equal to [current row peers] in the window partition
+when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified 
+with the `ORDER BY` clause if and only if both `expr`'s are `0`.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING ─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified 
+with the `ORDER BY` clause but the `expr` for the [frame_end] is less than the `expr` for the [frame_start].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with value from and including current row plus `expr` for the [frame_start]
+until and including current row plus `expr` for the [frame_end] in the window partition
+when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified 
+with the `ORDER BY` clause if and only if the `expr` for the [frame_end] is greater than or equal than the 
+`expr` for the [frame_start].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND 2 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 FOLLOWING AND 2 FOLLOWING)─┐
+│      1 │                                                                                5 │
+│      1 │                                                                                5 │
+│      2 │                                                                                3 │
+│      3 │                                                                                0 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+#### Frame Extent
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Extent
+version: 1.0
+
+[ClickHouse] SHALL support [frame_extent] defined as
+
+```
+frame_extent:
+    {frame_start | frame_between}
+```
+
+#### Frame Start
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Start
+version: 1.0
+
+[ClickHouse] SHALL support [frame_start] defined as
+
+```
+frame_start: {
+    CURRENT ROW
+  | UNBOUNDED PRECEDING
+  | UNBOUNDED FOLLOWING
+  | expr PRECEDING
+  | expr FOLLOWING
+}
+```
+
+#### Frame Between
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Between
+version: 1.0
+
+[ClickHouse] SHALL support [frame_between] defined as
+
+```
+frame_between:
+    BETWEEN frame_start AND frame_end
+```
+
+#### Frame End
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.End
+version: 1.0
+
+[ClickHouse] SHALL support [frame_end] defined as
+
+```
+frame_end: {
+    CURRENT ROW
+  | UNBOUNDED PRECEDING
+  | UNBOUNDED FOLLOWING
+  | expr PRECEDING
+  | expr FOLLOWING
+}
+```
+
+#### `CURRENT ROW`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL support `CURRENT ROW` as `frame_start` or `frame_end` value.
+
+* For `ROWS` SHALL define the bound to be the current row
+* For `RANGE` SHALL define the bound to be the peers of the current row
+
+#### `UNBOUNDED PRECEDING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedPreceding
+version: 1.0
+
+[ClickHouse] SHALL support `UNBOUNDED PRECEDING` as `frame_start` or `frame_end` value
+and it SHALL define that the bound is the first partition row.
+
+#### `UNBOUNDED FOLLOWING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL support `UNBOUNDED FOLLOWING` as `frame_start` or `frame_end` value
+and it SHALL define that the bound is the last partition row.
+
+#### `expr PRECEDING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL support `expr PRECEDING` as `frame_start` or `frame_end` value
+
+* For `ROWS` it SHALL define the bound to be the `expr` rows before the current row
+* For `RANGE` it SHALL define the bound to be the rows with values equal to the current row value minus the `expr`.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding.ExprValue
+version: 1.0
+
+[ClickHouse] SHALL support only non-negative numeric literal as the value for the `expr` in the `expr PRECEDING` frame boundary.
+
+For example,
+
+```
+5 PRECEDING
+```
+
+#### `expr FOLLOWING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL support `expr FOLLOWING` as `frame_start` or `frame_end` value
+
+* For `ROWS` it SHALL define the bound to be the `expr` rows after the current row
+* For `RANGE` it SHALL define  the bound to be the rows with values equal to the current row value plus `expr`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing.ExprValue
+version: 1.0
+
+[ClickHouse] SHALL support only non-negative numeric literal as the value for the `expr` in the `expr FOLLOWING` frame boundary.
+
+For example,
+
+```
+5 FOLLOWING
+```
+
+### WINDOW Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause
+version: 1.0
+
+[ClickHouse] SHALL support `WINDOW` clause to define one or more windows.
+
+```sql
+WINDOW window_name AS (window_spec)
+    [, window_name AS (window_spec)] ..
+```
+
+The `window_name` SHALL be the name of a window defined by a `WINDOW` clause.
+
+The [window_spec] SHALL specify the window.
+
+For example,
+
+```sql
+SELECT ... FROM table WINDOW w AS (partiton by id))
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MultipleWindows
+version: 1.0
+
+[ClickHouse] SHALL support `WINDOW` clause that defines multiple windows.
+
+For example,
+
+```sql
+SELECT ... FROM table WINDOW w1 AS (partition by id), w2 AS (partition by customer)
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MissingWindowSpec.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `WINDOW` clause definition is missing [window_spec].
+
+### `OVER` Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause
+version: 1.0
+
+[ClickHouse] SHALL support `OVER` clause to either use named window defined using `WINDOW` clause
+or adhoc window defined inplace.
+
+
+```
+OVER ()|(window_spec)|named_window 
+```
+
+#### Empty Clause
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.EmptyOverClause
+version: 1.0
+
+[ClickHouse] SHALL treat the entire set of query rows as a single partition when `OVER` clause is empty.
+For example,
+
+```
+SELECT sum(x) OVER () FROM table
+```
+
+#### Ad-Hoc Window
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow
+version: 1.0
+
+[ClickHouse] SHALL support ad hoc window specification in the `OVER` clause.
+
+```
+OVER [window_spec]
+```
+
+See [window_spec] definition.
+
+For example,
+
+```sql
+(count(*) OVER (partition by id order by time desc))
+```
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow.MissingWindowSpec.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `OVER` clause has missing [window_spec].
+
+#### Named Window
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow
+version: 1.0
+
+[ClickHouse] SHALL support using a previously defined named window in the `OVER` clause.
+
+```
+OVER [window_name]
+```
+
+See [window_name] definition.
+
+For example,
+
+```sql
+SELECT count(*) OVER w FROM table WINDOW w AS (partition by id)
+```
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.InvalidName.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `OVER` clause reference invalid window name.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.MultipleWindows.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `OVER` clause references more than one window name.
+
+### Window Functions
+
+#### Nonaggregate Functions
+
+##### The `first_value(expr)` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.FirstValue
+version: 1.0
+
+[ClickHouse] SHALL support `first_value` window function that
+SHALL be synonum for the `any(value)` function
+that SHALL return the value of `expr` from first row in the window frame.
+
+```
+first_value(expr) OVER ...
+```
+
+##### The `last_value(expr)` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.LastValue
+version: 1.0
+
+[ClickHouse] SHALL support `last_value` window function that
+SHALL be synonym for the `anyLast(value)` function
+that SHALL return the value of `expr` from the last row in the window frame.
+
+```
+last_value(expr) OVER ...
+```
+
+##### The `lag(value, offset)` Function Workaround
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.Lag.Workaround
+version: 1.0
+
+[ClickHouse] SHALL support a workaround for the `lag(value, offset)` function as
+
+```
+any(value) OVER (.... ROWS BETWEEN <offset> PRECEDING AND <offset> PRECEDING)
+```
+
+The function SHALL returns the value from the row that lags (precedes) the current row
+by the `N` rows within its partition. Where `N` is the `value` passed to the `any` function.
+
+If there is no such row, the return value SHALL be default.
+
+For example, if `N` is 3, the return value is default for the first two rows.
+If N or default are missing, the defaults are 1 and NULL, respectively.
+
+`N` SHALL be a literal non-negative integer. If N is 0, the value SHALL be
+returned for the current row.
+
+##### The `lead(value, offset)` Function Workaround
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.Lead.Workaround
+version: 1.0
+
+[ClickHouse] SHALL support a workaround for the `lead(value, offset)` function as
+
+```
+any(value) OVER (.... ROWS BETWEEN <offset> FOLLOWING AND <offset> FOLLOWING)
+```
+
+The function SHALL returns the value from the row that leads (follows) the current row by
+the `N` rows within its partition. Where `N` is the `value` passed to the `any` function.
+
+If there is no such row, the return value SHALL be default.
+
+For example, if `N` is 3, the return value is default for the last two rows.
+If `N` or default are missing, the defaults are 1 and NULL, respectively.
+
+`N` SHALL be a literal non-negative integer. If `N` is 0, the value SHALL be
+returned for the current row.
+
+##### The `rank()` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.Rank
+version: 1.0
+
+[ClickHouse] SHALL support `rank` window function that SHALL
+return the rank of the current row within its partition with gaps.
+
+Peers SHALL be considered ties and receive the same rank.
+The function SHALL not assign consecutive ranks to peer groups if groups of size greater than one exist
+and the result is noncontiguous rank numbers.
+
+If the function is used without `ORDER BY` to sort partition rows into the desired order
+then all rows SHALL be peers.
+
+```
+rank() OVER ...
+```
+
+##### The `dense_rank()` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.DenseRank
+version: 1.0
+
+[ClickHouse] SHALL support `dense_rank` function over a window that SHALL
+return the rank of the current row within its partition without gaps.
+
+Peers SHALL be considered ties and receive the same rank.
+The function SHALL assign consecutive ranks to peer groups and
+the result is that groups of size greater than one do not produce noncontiguous rank numbers.
+
+If the function is used without `ORDER BY` to sort partition rows into the desired order
+then all rows SHALL be peers.
+
+```
+dense_rank() OVER ...
+```
+
+##### The `row_number()` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowNumber
+version: 1.0
+
+[ClickHouse] SHALL support `row_number` function over a window that SHALL
+returns the number of the current row within its partition.
+
+Rows numbers SHALL range from 1 to the number of partition rows.
+
+The `ORDER BY` affects the order in which rows are numbered.
+Without `ORDER BY`, row numbering MAY be nondeterministic.
+
+```
+row_number() OVER ...
+```
+
+#### Aggregate Functions
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions
+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/)
+
+##### Combinators
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Combinators
+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)
+
+##### Parametric
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Parametric
+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)
+
+## References
+
+* [ClickHouse]
+* [GitHub Repository]
+* [Revision History]
+* [Git]
+
+[current row peers]: #current-row-peers
+[frame_extent]: #frame-extent
+[frame_between]: #frame-between
+[frame_start]: #frame-start
+[frame_end]: #frame-end
+[windows_name]: #window-clause
+[window_spec]: #window-specification
+[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
+[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/
+[GitHub]: https://github.com
+[PostreSQL]: https://www.postgresql.org/docs/9.2/tutorial-window.html
+[MySQL]: https://dev.mysql.com/doc/refman/8.0/en/window-functions.html
diff --git a/tests/testflows/window_functions/requirements/requirements.py b/tests/testflows/window_functions/requirements/requirements.py
new file mode 100644
index 00000000000..42389fd5452
--- /dev/null
+++ b/tests/testflows/window_functions/requirements/requirements.py
@@ -0,0 +1,5895 @@
+# These requirements were auto generated
+# from software requirements specification (SRS)
+# document by TestFlows v1.6.210505.1133630.
+# Do not edit by hand but re-generate instead
+# using 'tfs requirements generate' command.
+from testflows.core import Specification
+from testflows.core import Requirement
+
+Heading = Specification.Heading
+
+RQ_SRS_019_ClickHouse_WindowFunctions = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [window functions] that produce a result for each row inside the window.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.1.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_NonDistributedTables = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.NonDistributedTables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support correct operation of [window functions] on non-distributed \n'
+        'table engines such as `MergeTree`.\n'
+        '\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.1.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_DistributedTables = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.DistributedTables',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.1.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_WindowSpec = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowSpec',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support defining a window using window specification clause.\n'
+        'The [window_spec] SHALL be defined as\n'
+        '\n'
+        '```\n'
+        'window_spec:\n'
+        '   [partition_clause] [order_clause] [frame_clause]\n'
+        '```\n'
+        '\n'
+        'that SHALL specify how to partition query rows into groups for processing by the window function.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.2.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [partition_clause] that indicates how to divide the query rows into groups.\n'
+        'The [partition_clause] SHALL be defined as\n'
+        '\n'
+        '```\n'
+        'partition_clause:\n'
+        '    PARTITION BY expr [, expr] ...\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.3.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_MultipleExpr = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MultipleExpr',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support partitioning by more than one `expr` in the [partition_clause] definition.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT x,s, sum(x) OVER (PARTITION BY x,s) FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─x─┬─s─┬─sum(x) OVER (PARTITION BY x, s)─┐\n'
+        '│ 1 │ a │                               1 │\n'
+        '│ 1 │ b │                               1 │\n'
+        '│ 2 │ b │                               2 │\n'
+        '└───┴───┴─────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.3.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_MissingExpr_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MissingExpr.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if `expr` is missing in the [partition_clause] definition.\n'
+        '\n'
+        '```sql\n'
+        'SELECT sum(number) OVER (PARTITION BY) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.3.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_InvalidExpr_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.InvalidExpr.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if `expr` is invalid in the [partition_clause] definition.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.3.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [order_clause] that indicates how to sort rows in each window.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.4.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MultipleExprs = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MultipleExprs',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return support using more than one `expr` in the [order_clause] definition.\n'
+        '\n'
+        'For example, \n'
+        '\n'
+        '```sql\n'
+        "SELECT x,s, sum(x) OVER (ORDER BY x DESC, s DESC) FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─x─┬─s─┬─sum(x) OVER (ORDER BY x DESC, s DESC)─┐\n'
+        '│ 2 │ b │                                     2 │\n'
+        '│ 1 │ b │                                     3 │\n'
+        '│ 1 │ a │                                     4 │\n'
+        '└───┴───┴───────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.4.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MissingExpr_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MissingExpr.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if `expr` is missing in the [order_clause] definition.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.4.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_InvalidExpr_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.InvalidExpr.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if `expr` is invalid in the [order_clause] definition.\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.4.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_FrameClause = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.FrameClause',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [frame_clause] that SHALL specify a subset of the current window.\n'
+        '\n'
+        'The `frame_clause` SHALL be defined as\n'
+        '\n'
+        '```\n'
+        'frame_clause:\n'
+        '    {ROWS | RANGE } frame_extent\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.5.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `ROWS` frame to define beginning and ending row positions.\n'
+        'Offsets SHALL be differences in row numbers from the current row number.\n'
+        '\n'
+        '```sql\n'
+        'ROWS frame_extent\n'
+        '```\n'
+        '\n'
+        'See [frame_extent] definition.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.2.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_MissingFrameExtent_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.MissingFrameExtent.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `ROWS` frame clause is defined without [frame_extent].\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number ROWS) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.2.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_InvalidFrameExtent_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.InvalidFrameExtent.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `ROWS` frame clause has invalid [frame_extent].\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number ROWS '1') FROM numbers(1,3)\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.2.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_CurrentRow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.CurrentRow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include only the current row in the window partition\n'
+        'when `ROWS CURRENT ROW` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS CURRENT ROW) FROM numbers(1,2)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW)─┐\n'
+        '│      1 │                                                           1 │\n'
+        '│      2 │                                                           2 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.4.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_UnboundedPreceding = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedPreceding',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows before and including the current row in the window partition\n'
+        'when `ROWS UNBOUNDED PRECEDING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS UNBOUNDED PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                   1 │\n'
+        '│      2 │                                                                   3 │\n'
+        '│      3 │                                                                   6 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.5.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_ExprPreceding = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprPreceding',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include `expr` rows before and including the current row in the window partition \n'
+        'when `ROWS expr PRECEDING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS 1 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                           1 │\n'
+        '│      2 │                                                           3 │\n'
+        '│      3 │                                                           5 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.6.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_UnboundedFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `ROWS UNBOUNDED FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.7.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_ExprFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `ROWS expr FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.8.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_CurrentRow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.CurrentRow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include only the current row in the window partition\n'
+        'when `ROWS BETWEEN CURRENT ROW AND CURRENT ROW` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,2)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW)─┐\n'
+        '│      1 │                                                           1 │\n'
+        '│      2 │                                                           2 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.9.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `ROWS BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING` frame is specified.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.9.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_ExprPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `ROWS BETWEEN CURRENT ROW AND expr PRECEDING` frame is specified.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.9.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_UnboundedFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include the current row and all the following rows in the window partition\n'
+        'when `ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                   6 │\n'
+        '│      2 │                                                                   5 │\n'
+        '│      3 │                                                                   3 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.9.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_ExprFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include the current row and the `expr` rows that are following the current row in the window partition\n'
+        'when `ROWS BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)─┐\n'
+        '│      1 │                                                           3 │\n'
+        '│      2 │                                                           5 │\n'
+        '│      3 │                                                           3 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.9.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_CurrentRow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.CurrentRow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all the rows before and including the current row in the window partition\n'
+        'when `ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                   1 │\n'
+        '│      2 │                                                                   3 │\n'
+        '│      3 │                                                                   6 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.10.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.10.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_ExprPreceding = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprPreceding',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all the rows until and including the current row minus `expr` rows preceding it\n'
+        'when `ROWS BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING)─┐\n'
+        '│      1 │                                                                   0 │\n'
+        '│      2 │                                                                   1 │\n'
+        '│      3 │                                                                   3 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.10.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_UnboundedFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows in the window partition \n'
+        'when `ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                           6 │\n'
+        '│      2 │                                                                           6 │\n'
+        '│      3 │                                                                           6 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.10.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_ExprFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all the rows until and including the current row plus `expr` rows following it\n'
+        'when `ROWS BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)─┐\n'
+        '│      1 │                                                                   3 │\n'
+        '│      2 │                                                                   6 │\n'
+        '│      3 │                                                                   6 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.10.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `UNBOUNDED FOLLOWING` is specified as the start of the frame, including\n'
+        '\n'
+        '* `ROWS BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW`\n'
+        '* `ROWS BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING`\n'
+        '* `ROWS BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING`\n'
+        '* `ROWS BETWEEN UNBOUNDED FOLLOWING AND expr PRECEDING`\n'
+        '* `ROWS BETWEEN UNBOUNDED FOLLOWING AND expr FOLLOWING`\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.11.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `expr FOLLOWING` is specified as the start of the frame\n'
+        'and it points to a row that is after the start of the frame inside the window partition such\n'
+        'as the following cases\n'
+        '\n'
+        '* `ROWS BETWEEN expr FOLLOWING AND CURRENT ROW`\n'
+        '* `ROWS BETWEEN expr FOLLOWING AND UNBOUNDED PRECEDING`\n'
+        '* `ROWS BETWEEN expr FOLLOWING AND expr PRECEDING`\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND CURRENT ROW) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.12.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_ExprFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `ROWS BETWEEN expr FOLLOWING AND expr FOLLOWING`\n'
+        'is specified and the end of the frame specified by the `expr FOLLOWING` is a row that is before the row \n'
+        'specified by the frame start.\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.12.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_UnboundedFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.UnboundedFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all the rows from and including current row plus `expr` rows following it \n'
+        'until and including the last row in the window partition\n'
+        'when `ROWS BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                   5 │\n'
+        '│      2 │                                                                   3 │\n'
+        '│      3 │                                                                   0 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.12.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_ExprFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include the rows from and including current row plus `expr` following it \n'
+        'until and including the row specified by the frame end when the frame end \n'
+        'is the current row plus `expr` following it is right at or after the start of the frame\n'
+        'when `ROWS BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING)─┐\n'
+        '│      1 │                                                           5 │\n'
+        '│      2 │                                                           3 │\n'
+        '│      3 │                                                           0 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.12.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_CurrentRow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.CurrentRow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include the rows from and including current row minus `expr` rows\n'
+        'preceding it until and including the current row in the window frame\n'
+        'when `ROWS BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                           1 │\n'
+        '│      2 │                                                           3 │\n'
+        '│      3 │                                                           5 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.13.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error\n'
+        'when `ROWS BETWEEN expr PRECEDING AND UNBOUNDED PRECEDING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.13.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_UnboundedFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include the rows from and including current row minus `expr` rows\n'
+        'preceding it until and including the last row in the window partition\n'
+        'when `ROWS BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                   6 │\n'
+        '│      2 │                                                                   6 │\n'
+        '│      3 │                                                                   5 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.13.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when the frame end specified by the `expr PRECEDING`\n'
+        'evaluates to a row that is before the row specified by the frame start in the window partition\n'
+        'when `ROWS BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.13.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprPreceding = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include the rows from and including current row minus `expr` rows preceding it\n'
+        'until and including the current row minus `expr` rows preceding it if the end\n'
+        'of the frame is after the frame start in the window partition \n'
+        'when `ROWS BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 0 PRECEDING)─┐\n'
+        '│      1 │                                                           1 │\n'
+        '│      2 │                                                           3 │\n'
+        '│      3 │                                                           5 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.13.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include the rows from and including current row minus `expr` rows preceding it\n'
+        'until and including the current row plus `expr` rows following it in the window partition\n'
+        'when `ROWS BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)─┐\n'
+        '│      1 │                                                           3 │\n'
+        '│      2 │                                                           6 │\n'
+        '│      3 │                                                           5 │\n'
+        '└────────┴─────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.2.13.6')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `RANGE` frame to define rows within a value range.\n'
+        'Offsets SHALL be differences in row values from the current row value.\n'
+        '\n'
+        '```sql\n'
+        'RANGE frame_extent\n'
+        '```\n'
+        '\n'
+        'See [frame_extent] definition.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.3.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_DataTypes_DateAndDateTime = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.DateAndDateTime',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `RANGE` frame over columns with `Date` and `DateTime`\n'
+        'data types.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.3.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_DataTypes_IntAndUInt = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.IntAndUInt',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `RANGE` frame over columns with numerical data types\n'
+        'such `IntX` and `UIntX`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.3.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_MultipleColumnsInOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MultipleColumnsInOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `RANGE` frame definition is used with `ORDER BY`\n'
+        'that uses multiple columns.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.3.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_MissingFrameExtent_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MissingFrameExtent.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `RANGE` frame definition is missing [frame_extent].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.3.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_InvalidFrameExtent_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.InvalidFrameExtent.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `RANGE` frame definition has invalid [frame_extent].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.3.6')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_CurrentRow_Peers = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.CurrentRow.Peers',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] for the `RANGE` frame SHALL define the `peers` of the `CURRENT ROW` to be all\n'
+        'the rows that are inside the same order bucket.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.3.8')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_CurrentRow_WithoutOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithoutOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows in the window partition\n'
+        'when `RANGE CURRENT ROW` frame is specified without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE CURRENT ROW) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐\n'
+        '│      1 │                                                            6 │\n'
+        '│      2 │                                                            6 │\n'
+        '│      3 │                                                            6 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.9.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_CurrentRow_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows that are [current row peers] in the window partition\n'
+        'when `RANGE CURRENT ROW` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                                2 │\n'
+        '│      1 │                                                                                2 │\n'
+        '│      2 │                                                                                2 │\n'
+        '│      3 │                                                                                3 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.9.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE UNBOUNDED FOLLOWING` frame is specified with or without order by\n'
+        'as `UNBOUNDED FOLLOWING` SHALL not be supported as [frame_start].\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.10.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedPreceding_WithoutOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithoutOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows in the window partition\n'
+        'when `RANGE UNBOUNDED PRECEDING` frame is specified without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE UNBOUNDED PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                    6 │\n'
+        '│      2 │                                                                    6 │\n'
+        '│      3 │                                                                    6 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.11.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedPreceding_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include rows with values from and including the first row \n'
+        'until and including all [current row peers] in the window partition\n'
+        'when `RANGE UNBOUNDED PRECEDING` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number RANGE UNBOUNDED PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                                        1 │\n'
+        '│      2 │                                                                                        3 │\n'
+        '│      3 │                                                                                        6 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.11.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE expr PRECEDING` frame is specified without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE 1 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.12.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_OrderByNonNumericalColumn_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.OrderByNonNumericalColumn.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE expr PRECEDING` is used with `ORDER BY` clause\n'
+        'over a non-numerical column.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.12.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include rows with values from and including current row value minus `expr`\n'
+        'until and including the value for the current row \n'
+        'when `RANGE expr PRECEDING` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number RANGE 1 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                                1 │\n'
+        '│      2 │                                                                                3 │\n'
+        '│      3 │                                                                                5 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.12.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprFollowing_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE expr FOLLOWING` frame is specified without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.13.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprFollowing_WithOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE expr FOLLOWING` frame is specified wit the `ORDER BY` clause \n'
+        'as the value for the frame start cannot be larger than the value for the frame end.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number RANGE 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.13.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_CurrentRow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.CurrentRow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all [current row peers] in the window partition \n'
+        'when `RANGE BETWEEN CURRENT ROW AND CURRENT ROW` frame is specified with or without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**  \n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐\n'
+        '│      1 │                                                            6 │\n'
+        '│      2 │                                                            6 │\n'
+        '│      3 │                                                            6 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**  \n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                                1 │\n'
+        '│      2 │                                                                                2 │\n'
+        '│      3 │                                                                                3 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.14.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING` frame is specified\n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.14.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_UnboundedFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including [current row peers] until and including\n'
+        'the last row in the window partition when `RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING` frame is specified\n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                    6 │\n'
+        '│      2 │                                                                    6 │\n'
+        '│      3 │                                                                    6 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                                        6 │\n'
+        '│      2 │                                                                                        5 │\n'
+        '│      3 │                                                                                        3 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.14.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprFollowing_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified\n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.14.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprFollowing_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including [current row peers] until and including\n'
+        'current row value plus `expr` when `RANGE BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified\n'
+        'with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING)─┐\n'
+        '│      1 │                                                                                4 │\n'
+        '│      1 │                                                                                4 │\n'
+        '│      2 │                                                                                5 │\n'
+        '│      3 │                                                                                3 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.14.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND expr PRECEDING` frame is specified\n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.14.6')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_CurrentRow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.CurrentRow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including the first row until and including\n'
+        '[current row peers] in the window partition when `RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW` frame is specified\n'
+        'with and without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                    7 │\n'
+        '│      1 │                                                                    7 │\n'
+        '│      2 │                                                                    7 │\n'
+        '│      3 │                                                                    7 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                                        2 │\n'
+        '│      1 │                                                                                        2 │\n'
+        '│      2 │                                                                                        4 │\n'
+        '│      3 │                                                                                        7 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.15.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return and error when `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING` frame is specified\n'
+        'with and without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.15.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_UnboundedFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows in the window partition when `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING` frame is specified\n'
+        'with and without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                            7 │\n'
+        '│      1 │                                                                            7 │\n'
+        '│      2 │                                                                            7 │\n'
+        '│      3 │                                                                            7 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                                                7 │\n'
+        '│      1 │                                                                                                7 │\n'
+        '│      2 │                                                                                                7 │\n'
+        '│      3 │                                                                                                7 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.15.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprPreceding_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified\n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.15.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprPreceding_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including the first row until and including\n'
+        'the value of the current row minus `expr` in the window partition\n'
+        'when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING)─┐\n'
+        '│      1 │                                                                                        0 │\n'
+        '│      1 │                                                                                        0 │\n'
+        '│      2 │                                                                                        2 │\n'
+        '│      3 │                                                                                        4 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.15.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprFollowing_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified\n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.15.6')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprFollowing_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including the first row until and including\n'
+        'the value of the current row plus `expr` in the window partition\n'
+        'when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)─┐\n'
+        '│      1 │                                                                                        4 │\n'
+        '│      1 │                                                                                        4 │\n'
+        '│      2 │                                                                                        7 │\n'
+        '│      3 │                                                                                        7 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.15.7')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_CurrentRow_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.CurrentRow.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW` frame is specified \n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.16.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_UnboundedFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified \n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.16.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING` frame is specified \n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.16.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_ExprPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND expr PRECEDING` frame is specified \n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.16.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_ExprFollowing_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprFollowing.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND expr FOLLOWING` frame is specified \n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.16.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_CurrentRow_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including current row minus `expr` \n'
+        'until and including [current row peers] in the window partition\n'
+        'when `RANGE BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                                2 │\n'
+        '│      1 │                                                                                2 │\n'
+        '│      2 │                                                                                4 │\n'
+        '│      3 │                                                                                5 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_CurrentRow_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified\n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED PRECEDING` frame is specified \n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedFollowing_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame is specified \n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedFollowing_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including current row minus `expr` \n'
+        'until and including the last row in the window partition when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame\n'
+        'is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                                        7 │\n'
+        '│      1 │                                                                                        7 │\n'
+        '│      2 │                                                                                        7 │\n'
+        '│      3 │                                                                                        5 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprFollowing_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified \n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.6')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprFollowing_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including current row minus preceding `expr` \n'
+        'until and including current row plus following `expr` in the window partition \n'
+        'when `RANGE BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING)─┐\n'
+        '│      1 │                                                                                4 │\n'
+        '│      1 │                                                                                4 │\n'
+        '│      2 │                                                                                7 │\n'
+        '│      3 │                                                                                5 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.7')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified \n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM numbers(1,3)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.8')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when the value of the [frame_end] specified by the \n'
+        'current row minus preceding `expr` is greater than the value of the [frame_start] in the window partition\n'
+        'when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.9')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including current row minus preceding `expr` for the [frame_start]\n'
+        'until and including current row minus following `expr` for the [frame_end] in the window partition \n'
+        'when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause\n'
+        'if an only if the [frame_end] value is equal or greater than [frame_start] value.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Greater Than**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING)─┐\n'
+        '│      1 │                                                                                2 │\n'
+        '│      1 │                                                                                2 │\n'
+        '│      2 │                                                                                4 │\n'
+        '│      3 │                                                                                5 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        'or **Equal**\n'
+        '\n'
+        '```sql\n'
+        " SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 1 PRECEDING)─┐\n'
+        '│      1 │                                                                                0 │\n'
+        '│      1 │                                                                                0 │\n'
+        '│      2 │                                                                                2 │\n'
+        '│      3 │                                                                                2 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.17.10')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified \n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_WithOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified \n'
+        'with the `ORDER BY` clause and `expr` is greater than `0`.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_ZeroSpecialCase = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.ZeroSpecialCase',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all [current row peers] in the window partition\n'
+        'when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified \n'
+        'with the `ORDER BY` clause if and only if the `expr` equals to `0`.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                            7 │\n'
+        '│      1 │                                                            7 │\n'
+        '│      2 │                                                            7 │\n'
+        '│      3 │                                                            7 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW)─┐\n'
+        '│      1 │                                                                                2 │\n'
+        '│      1 │                                                                                2 │\n'
+        '│      2 │                                                                                2 │\n'
+        '│      3 │                                                                                3 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedFollowing_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified \n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.4')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedFollowing_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with values from and including current row plus `expr`\n'
+        'until and including the last row in the window partition \n'
+        'when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified with the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING)─┐\n'
+        '│      1 │                                                                                        5 │\n'
+        '│      1 │                                                                                        5 │\n'
+        '│      2 │                                                                                        3 │\n'
+        '│      3 │                                                                                        0 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.5')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED PRECEDING` frame is specified \n'
+        'with or without the `ORDER BY` clause.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '**Without `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '**With `ORDER BY`**\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.6')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified \n'
+        'without the `ORDER BY`.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.7')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified \n'
+        'with the `ORDER BY` clause if the value of both `expr` is not `0`.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.8')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_WithOrderBy_ZeroSpecialCase = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithOrderBy.ZeroSpecialCase',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with value equal to [current row peers] in the window partition\n'
+        'when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified \n'
+        "with the `ORDER BY` clause if and only if both `expr`'s are `0`.\n"
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING ─┐\n'
+        '│      1 │                                                                                2 │\n'
+        '│      1 │                                                                                2 │\n'
+        '│      2 │                                                                                2 │\n'
+        '│      3 │                                                                                3 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.9')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithoutOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithoutOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified \n'
+        'without the `ORDER BY` clause.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.10')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithOrderBy_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified \n'
+        'with the `ORDER BY` clause but the `expr` for the [frame_end] is less than the `expr` for the [frame_start].\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.11')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithOrderBy = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL include all rows with value from and including current row plus `expr` for the [frame_start]\n'
+        'until and including current row plus `expr` for the [frame_end] in the window partition\n'
+        'when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified \n'
+        'with the `ORDER BY` clause if and only if the `expr` for the [frame_end] is greater than or equal than the \n'
+        '`expr` for the [frame_start].\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND 2 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))\n"
+        '```\n'
+        '\n'
+        '```bash\n'
+        '┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 FOLLOWING AND 2 FOLLOWING)─┐\n'
+        '│      1 │                                                                                5 │\n'
+        '│      1 │                                                                                5 │\n'
+        '│      2 │                                                                                3 │\n'
+        '│      3 │                                                                                0 │\n'
+        '└────────┴──────────────────────────────────────────────────────────────────────────────────┘\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.5.3.18.12')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Extent = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Extent',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [frame_extent] defined as\n'
+        '\n'
+        '```\n'
+        'frame_extent:\n'
+        '    {frame_start | frame_between}\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.4.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Start = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Start',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [frame_start] defined as\n'
+        '\n'
+        '```\n'
+        'frame_start: {\n'
+        '    CURRENT ROW\n'
+        '  | UNBOUNDED PRECEDING\n'
+        '  | UNBOUNDED FOLLOWING\n'
+        '  | expr PRECEDING\n'
+        '  | expr FOLLOWING\n'
+        '}\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.5.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Between = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Between',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [frame_between] defined as\n'
+        '\n'
+        '```\n'
+        'frame_between:\n'
+        '    BETWEEN frame_start AND frame_end\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.6.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_Frame_End = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.End',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support [frame_end] defined as\n'
+        '\n'
+        '```\n'
+        'frame_end: {\n'
+        '    CURRENT ROW\n'
+        '  | UNBOUNDED PRECEDING\n'
+        '  | UNBOUNDED FOLLOWING\n'
+        '  | expr PRECEDING\n'
+        '  | expr FOLLOWING\n'
+        '}\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.7.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_CurrentRow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.CurrentRow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `CURRENT ROW` as `frame_start` or `frame_end` value.\n'
+        '\n'
+        '* For `ROWS` SHALL define the bound to be the current row\n'
+        '* For `RANGE` SHALL define the bound to be the peers of the current row\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.8.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_UnboundedPreceding = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedPreceding',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `UNBOUNDED PRECEDING` as `frame_start` or `frame_end` value\n'
+        'and it SHALL define that the bound is the first partition row.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.9.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_UnboundedFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `UNBOUNDED FOLLOWING` as `frame_start` or `frame_end` value\n'
+        'and it SHALL define that the bound is the last partition row.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.10.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_ExprPreceding = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `expr PRECEDING` as `frame_start` or `frame_end` value\n'
+        '\n'
+        '* For `ROWS` it SHALL define the bound to be the `expr` rows before the current row\n'
+        '* For `RANGE` it SHALL define the bound to be the rows with values equal to the current row value minus the `expr`.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.11.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_ExprPreceding_ExprValue = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding.ExprValue',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support only non-negative numeric literal as the value for the `expr` in the `expr PRECEDING` frame boundary.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```\n'
+        '5 PRECEDING\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.11.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_ExprFollowing = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `expr FOLLOWING` as `frame_start` or `frame_end` value\n'
+        '\n'
+        '* For `ROWS` it SHALL define the bound to be the `expr` rows after the current row\n'
+        '* For `RANGE` it SHALL define  the bound to be the rows with values equal to the current row value plus `expr`\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.12.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_ExprFollowing_ExprValue = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing.ExprValue',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support only non-negative numeric literal as the value for the `expr` in the `expr FOLLOWING` frame boundary.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```\n'
+        '5 FOLLOWING\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.5.12.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `WINDOW` clause to define one or more windows.\n'
+        '\n'
+        '```sql\n'
+        'WINDOW window_name AS (window_spec)\n'
+        '    [, window_name AS (window_spec)] ..\n'
+        '```\n'
+        '\n'
+        'The `window_name` SHALL be the name of a window defined by a `WINDOW` clause.\n'
+        '\n'
+        'The [window_spec] SHALL specify the window.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT ... FROM table WINDOW w AS (partiton by id))\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.6.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause_MultipleWindows = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MultipleWindows',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `WINDOW` clause that defines multiple windows.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT ... FROM table WINDOW w1 AS (partition by id), w2 AS (partition by customer)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.6.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause_MissingWindowSpec_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MissingWindowSpec.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `WINDOW` clause definition is missing [window_spec].\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.6.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OverClause = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `OVER` clause to either use named window defined using `WINDOW` clause\n'
+        'or adhoc window defined inplace.\n'
+        '\n'
+        '\n'
+        '```\n'
+        'OVER ()|(window_spec)|named_window \n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=3,
+    num='3.7.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_EmptyOverClause = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.EmptyOverClause',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL treat the entire set of query rows as a single partition when `OVER` clause is empty.\n'
+        'For example,\n'
+        '\n'
+        '```\n'
+        'SELECT sum(x) OVER () FROM table\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.7.2.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_AdHocWindow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support ad hoc window specification in the `OVER` clause.\n'
+        '\n'
+        '```\n'
+        'OVER [window_spec]\n'
+        '```\n'
+        '\n'
+        'See [window_spec] definition.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        '(count(*) OVER (partition by id order by time desc))\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.7.3.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_AdHocWindow_MissingWindowSpec_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow.MissingWindowSpec.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `OVER` clause has missing [window_spec].\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.7.3.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support using a previously defined named window in the `OVER` clause.\n'
+        '\n'
+        '```\n'
+        'OVER [window_name]\n'
+        '```\n'
+        '\n'
+        'See [window_name] definition.\n'
+        '\n'
+        'For example,\n'
+        '\n'
+        '```sql\n'
+        'SELECT count(*) OVER w FROM table WINDOW w AS (partition by id)\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.7.4.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow_InvalidName_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.InvalidName.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `OVER` clause reference invalid window name.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.7.4.2')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow_MultipleWindows_Error = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.MultipleWindows.Error',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL return an error if the `OVER` clause references more than one window name.\n'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.7.4.3')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_FirstValue = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.FirstValue',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `first_value` window function that\n'
+        'SHALL be synonum for the `any(value)` function\n'
+        'that SHALL return the value of `expr` from first row in the window frame.\n'
+        '\n'
+        '```\n'
+        'first_value(expr) OVER ...\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.1.1.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_LastValue = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.LastValue',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `last_value` window function that\n'
+        'SHALL be synonym for the `anyLast(value)` function\n'
+        'that SHALL return the value of `expr` from the last row in the window frame.\n'
+        '\n'
+        '```\n'
+        'last_value(expr) OVER ...\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.1.2.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_Lag_Workaround = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.Lag.Workaround',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support a workaround for the `lag(value, offset)` function as\n'
+        '\n'
+        '```\n'
+        'any(value) OVER (.... ROWS BETWEEN <offset> PRECEDING AND <offset> PRECEDING)\n'
+        '```\n'
+        '\n'
+        'The function SHALL returns the value from the row that lags (precedes) the current row\n'
+        'by the `N` rows within its partition. Where `N` is the `value` passed to the `any` function.\n'
+        '\n'
+        'If there is no such row, the return value SHALL be default.\n'
+        '\n'
+        'For example, if `N` is 3, the return value is default for the first two rows.\n'
+        'If N or default are missing, the defaults are 1 and NULL, respectively.\n'
+        '\n'
+        '`N` SHALL be a literal non-negative integer. If N is 0, the value SHALL be\n'
+        'returned for the current row.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.1.3.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_Lead_Workaround = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.Lead.Workaround',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support a workaround for the `lead(value, offset)` function as\n'
+        '\n'
+        '```\n'
+        'any(value) OVER (.... ROWS BETWEEN <offset> FOLLOWING AND <offset> FOLLOWING)\n'
+        '```\n'
+        '\n'
+        'The function SHALL returns the value from the row that leads (follows) the current row by\n'
+        'the `N` rows within its partition. Where `N` is the `value` passed to the `any` function.\n'
+        '\n'
+        'If there is no such row, the return value SHALL be default.\n'
+        '\n'
+        'For example, if `N` is 3, the return value is default for the last two rows.\n'
+        'If `N` or default are missing, the defaults are 1 and NULL, respectively.\n'
+        '\n'
+        '`N` SHALL be a literal non-negative integer. If `N` is 0, the value SHALL be\n'
+        'returned for the current row.\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.1.4.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_Rank = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.Rank',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `rank` window function that SHALL\n'
+        'return the rank of the current row within its partition with gaps.\n'
+        '\n'
+        'Peers SHALL be considered ties and receive the same rank.\n'
+        'The function SHALL not assign consecutive ranks to peer groups if groups of size greater than one exist\n'
+        'and the result is noncontiguous rank numbers.\n'
+        '\n'
+        'If the function is used without `ORDER BY` to sort partition rows into the desired order\n'
+        'then all rows SHALL be peers.\n'
+        '\n'
+        '```\n'
+        'rank() OVER ...\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.1.5.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_DenseRank = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.DenseRank',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `dense_rank` function over a window that SHALL\n'
+        'return the rank of the current row within its partition without gaps.\n'
+        '\n'
+        'Peers SHALL be considered ties and receive the same rank.\n'
+        'The function SHALL assign consecutive ranks to peer groups and\n'
+        'the result is that groups of size greater than one do not produce noncontiguous rank numbers.\n'
+        '\n'
+        'If the function is used without `ORDER BY` to sort partition rows into the desired order\n'
+        'then all rows SHALL be peers.\n'
+        '\n'
+        '```\n'
+        'dense_rank() OVER ...\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.1.6.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_RowNumber = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.RowNumber',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    description=(
+        '[ClickHouse] SHALL support `row_number` function over a window that SHALL\n'
+        'returns the number of the current row within its partition.\n'
+        '\n'
+        'Rows numbers SHALL range from 1 to the number of partition rows.\n'
+        '\n'
+        'The `ORDER BY` affects the order in which rows are numbered.\n'
+        'Without `ORDER BY`, row numbering MAY be nondeterministic.\n'
+        '\n'
+        '```\n'
+        'row_number() OVER ...\n'
+        '```\n'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.1.7.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=4,
+    num='3.8.2.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions_Combinators = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Combinators',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.2.2.1')
+
+RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions_Parametric = Requirement(
+    name='RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Parametric',
+    version='1.0',
+    priority=None,
+    group=None,
+    type=None,
+    uid=None,
+    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'
+        '\n'
+        ),
+    link=None,
+    level=5,
+    num='3.8.2.3.1')
+
+SRS019_ClickHouse_Window_Functions = Specification(
+    name='SRS019 ClickHouse Window Functions', 
+    description=None,
+    author=None,
+    date=None, 
+    status=None, 
+    approved_by=None,
+    approved_date=None,
+    approved_version=None,
+    version=None,
+    group=None,
+    type=None,
+    link=None,
+    uid=None,
+    parent=None,
+    children=None,
+    headings=(
+        Heading(name='Revision History', level=1, num='1'),
+        Heading(name='Introduction', level=1, num='2'),
+        Heading(name='Requirements', level=1, num='3'),
+        Heading(name='General', level=2, num='3.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions', level=3, num='3.1.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.NonDistributedTables', level=3, num='3.1.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.DistributedTables', level=3, num='3.1.3'),
+        Heading(name='Window Specification', level=2, num='3.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowSpec', level=3, num='3.2.1'),
+        Heading(name='PARTITION Clause', level=2, num='3.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause', level=3, num='3.3.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MultipleExpr', level=3, num='3.3.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MissingExpr.Error', level=3, num='3.3.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.InvalidExpr.Error', level=3, num='3.3.4'),
+        Heading(name='ORDER Clause', level=2, num='3.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause', level=3, num='3.4.1'),
+        Heading(name='order_clause', level=4, num='3.4.1.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MultipleExprs', level=3, num='3.4.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MissingExpr.Error', level=3, num='3.4.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.InvalidExpr.Error', level=3, num='3.4.4'),
+        Heading(name='FRAME Clause', level=2, num='3.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.FrameClause', level=3, num='3.5.1'),
+        Heading(name='ROWS', level=3, num='3.5.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame', level=4, num='3.5.2.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.MissingFrameExtent.Error', level=4, num='3.5.2.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.InvalidFrameExtent.Error', level=4, num='3.5.2.3'),
+        Heading(name='ROWS CURRENT ROW', level=4, num='3.5.2.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.CurrentRow', level=5, num='3.5.2.4.1'),
+        Heading(name='ROWS UNBOUNDED PRECEDING', level=4, num='3.5.2.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedPreceding', level=5, num='3.5.2.5.1'),
+        Heading(name='ROWS `expr` PRECEDING', level=4, num='3.5.2.6'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprPreceding', level=5, num='3.5.2.6.1'),
+        Heading(name='ROWS UNBOUNDED FOLLOWING', level=4, num='3.5.2.7'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedFollowing.Error', level=5, num='3.5.2.7.1'),
+        Heading(name='ROWS `expr` FOLLOWING', level=4, num='3.5.2.8'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprFollowing.Error', level=5, num='3.5.2.8.1'),
+        Heading(name='ROWS BETWEEN CURRENT ROW', level=4, num='3.5.2.9'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.CurrentRow', level=5, num='3.5.2.9.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedPreceding.Error', level=5, num='3.5.2.9.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprPreceding.Error', level=5, num='3.5.2.9.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedFollowing', level=5, num='3.5.2.9.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprFollowing', level=5, num='3.5.2.9.5'),
+        Heading(name='ROWS BETWEEN UNBOUNDED PRECEDING', level=4, num='3.5.2.10'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.CurrentRow', level=5, num='3.5.2.10.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedPreceding.Error', level=5, num='3.5.2.10.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprPreceding', level=5, num='3.5.2.10.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedFollowing', level=5, num='3.5.2.10.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprFollowing', level=5, num='3.5.2.10.5'),
+        Heading(name='ROWS BETWEEN UNBOUNDED FOLLOWING', level=4, num='3.5.2.11'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedFollowing.Error', level=5, num='3.5.2.11.1'),
+        Heading(name='ROWS BETWEEN `expr` FOLLOWING', level=4, num='3.5.2.12'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.Error', level=5, num='3.5.2.12.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing.Error', level=5, num='3.5.2.12.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.UnboundedFollowing', level=5, num='3.5.2.12.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing', level=5, num='3.5.2.12.4'),
+        Heading(name='ROWS BETWEEN `expr` PRECEDING', level=4, num='3.5.2.13'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.CurrentRow', level=5, num='3.5.2.13.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedPreceding.Error', level=5, num='3.5.2.13.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedFollowing', level=5, num='3.5.2.13.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding.Error', level=5, num='3.5.2.13.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding', level=5, num='3.5.2.13.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprFollowing', level=5, num='3.5.2.13.6'),
+        Heading(name='RANGE', level=3, num='3.5.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame', level=4, num='3.5.3.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.DateAndDateTime', level=4, num='3.5.3.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.IntAndUInt', level=4, num='3.5.3.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MultipleColumnsInOrderBy.Error', level=4, num='3.5.3.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MissingFrameExtent.Error', level=4, num='3.5.3.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.InvalidFrameExtent.Error', level=4, num='3.5.3.6'),
+        Heading(name='`CURRENT ROW` Peers', level=4, num='3.5.3.7'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.CurrentRow.Peers', level=4, num='3.5.3.8'),
+        Heading(name='RANGE CURRENT ROW', level=4, num='3.5.3.9'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithoutOrderBy', level=5, num='3.5.3.9.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithOrderBy', level=5, num='3.5.3.9.2'),
+        Heading(name='RANGE UNBOUNDED FOLLOWING', level=4, num='3.5.3.10'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedFollowing.Error', level=5, num='3.5.3.10.1'),
+        Heading(name='RANGE UNBOUNDED PRECEDING', level=4, num='3.5.3.11'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithoutOrderBy', level=5, num='3.5.3.11.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithOrderBy', level=5, num='3.5.3.11.2'),
+        Heading(name='RANGE `expr` PRECEDING', level=4, num='3.5.3.12'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithoutOrderBy.Error', level=5, num='3.5.3.12.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.OrderByNonNumericalColumn.Error', level=5, num='3.5.3.12.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithOrderBy', level=5, num='3.5.3.12.3'),
+        Heading(name='RANGE `expr` FOLLOWING', level=4, num='3.5.3.13'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithoutOrderBy.Error', level=5, num='3.5.3.13.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithOrderBy.Error', level=5, num='3.5.3.13.2'),
+        Heading(name='RANGE BETWEEN CURRENT ROW', level=4, num='3.5.3.14'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.CurrentRow', level=5, num='3.5.3.14.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedPreceding.Error', level=5, num='3.5.3.14.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedFollowing', level=5, num='3.5.3.14.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithoutOrderBy.Error', level=5, num='3.5.3.14.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithOrderBy', level=5, num='3.5.3.14.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprPreceding.Error', level=5, num='3.5.3.14.6'),
+        Heading(name='RANGE BETWEEN UNBOUNDED PRECEDING', level=4, num='3.5.3.15'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.CurrentRow', level=5, num='3.5.3.15.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedPreceding.Error', level=5, num='3.5.3.15.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedFollowing', level=5, num='3.5.3.15.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithoutOrderBy.Error', level=5, num='3.5.3.15.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithOrderBy', level=5, num='3.5.3.15.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithoutOrderBy.Error', level=5, num='3.5.3.15.6'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithOrderBy', level=5, num='3.5.3.15.7'),
+        Heading(name='RANGE BETWEEN UNBOUNDED FOLLOWING', level=4, num='3.5.3.16'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.CurrentRow.Error', level=5, num='3.5.3.16.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedFollowing.Error', level=5, num='3.5.3.16.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedPreceding.Error', level=5, num='3.5.3.16.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprPreceding.Error', level=5, num='3.5.3.16.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprFollowing.Error', level=5, num='3.5.3.16.5'),
+        Heading(name='RANGE BETWEEN expr PRECEDING', level=4, num='3.5.3.17'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithOrderBy', level=5, num='3.5.3.17.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithoutOrderBy.Error', level=5, num='3.5.3.17.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedPreceding.Error', level=5, num='3.5.3.17.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithoutOrderBy.Error', level=5, num='3.5.3.17.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithOrderBy', level=5, num='3.5.3.17.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithoutOrderBy.Error', level=5, num='3.5.3.17.6'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithOrderBy', level=5, num='3.5.3.17.7'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithoutOrderBy.Error', level=5, num='3.5.3.17.8'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy.Error', level=5, num='3.5.3.17.9'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy', level=5, num='3.5.3.17.10'),
+        Heading(name='RANGE BETWEEN expr FOLLOWING', level=4, num='3.5.3.18'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithoutOrderBy.Error', level=5, num='3.5.3.18.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithOrderBy.Error', level=5, num='3.5.3.18.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.ZeroSpecialCase', level=5, num='3.5.3.18.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithoutOrderBy.Error', level=5, num='3.5.3.18.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithOrderBy', level=5, num='3.5.3.18.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedPreceding.Error', level=5, num='3.5.3.18.6'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithoutOrderBy.Error', level=5, num='3.5.3.18.7'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.Error', level=5, num='3.5.3.18.8'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithOrderBy.ZeroSpecialCase', level=5, num='3.5.3.18.9'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithoutOrderBy.Error', level=5, num='3.5.3.18.10'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy.Error', level=5, num='3.5.3.18.11'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy', level=5, num='3.5.3.18.12'),
+        Heading(name='Frame Extent', level=3, num='3.5.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Extent', level=4, num='3.5.4.1'),
+        Heading(name='Frame Start', level=3, num='3.5.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Start', level=4, num='3.5.5.1'),
+        Heading(name='Frame Between', level=3, num='3.5.6'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Between', level=4, num='3.5.6.1'),
+        Heading(name='Frame End', level=3, num='3.5.7'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.Frame.End', level=4, num='3.5.7.1'),
+        Heading(name='`CURRENT ROW`', level=3, num='3.5.8'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.CurrentRow', level=4, num='3.5.8.1'),
+        Heading(name='`UNBOUNDED PRECEDING`', level=3, num='3.5.9'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedPreceding', level=4, num='3.5.9.1'),
+        Heading(name='`UNBOUNDED FOLLOWING`', level=3, num='3.5.10'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedFollowing', level=4, num='3.5.10.1'),
+        Heading(name='`expr PRECEDING`', level=3, num='3.5.11'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding', level=4, num='3.5.11.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding.ExprValue', level=4, num='3.5.11.2'),
+        Heading(name='`expr FOLLOWING`', level=3, num='3.5.12'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing', level=4, num='3.5.12.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing.ExprValue', level=4, num='3.5.12.2'),
+        Heading(name='WINDOW Clause', level=2, num='3.6'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause', level=3, num='3.6.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MultipleWindows', level=3, num='3.6.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MissingWindowSpec.Error', level=3, num='3.6.3'),
+        Heading(name='`OVER` Clause', level=2, num='3.7'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause', level=3, num='3.7.1'),
+        Heading(name='Empty Clause', level=3, num='3.7.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.EmptyOverClause', level=4, num='3.7.2.1'),
+        Heading(name='Ad-Hoc Window', level=3, num='3.7.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow', level=4, num='3.7.3.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow.MissingWindowSpec.Error', level=4, num='3.7.3.2'),
+        Heading(name='Named Window', level=3, num='3.7.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow', level=4, num='3.7.4.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.InvalidName.Error', level=4, num='3.7.4.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.MultipleWindows.Error', level=4, num='3.7.4.3'),
+        Heading(name='Window Functions', level=2, num='3.8'),
+        Heading(name='Nonaggregate Functions', level=3, num='3.8.1'),
+        Heading(name='The `first_value(expr)` Function', level=4, num='3.8.1.1'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.FirstValue', level=5, num='3.8.1.1.1'),
+        Heading(name='The `last_value(expr)` Function', level=4, num='3.8.1.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.LastValue', level=5, num='3.8.1.2.1'),
+        Heading(name='The `lag(value, offset)` Function Workaround', level=4, num='3.8.1.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.Lag.Workaround', level=5, num='3.8.1.3.1'),
+        Heading(name='The `lead(value, offset)` Function Workaround', level=4, num='3.8.1.4'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.Lead.Workaround', level=5, num='3.8.1.4.1'),
+        Heading(name='The `rank()` Function', level=4, num='3.8.1.5'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.Rank', level=5, num='3.8.1.5.1'),
+        Heading(name='The `dense_rank()` Function', level=4, num='3.8.1.6'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.DenseRank', level=5, num='3.8.1.6.1'),
+        Heading(name='The `row_number()` Function', level=4, num='3.8.1.7'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.RowNumber', level=5, num='3.8.1.7.1'),
+        Heading(name='Aggregate Functions', level=3, num='3.8.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions', level=4, num='3.8.2.1'),
+        Heading(name='Combinators', level=4, num='3.8.2.2'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Combinators', level=5, num='3.8.2.2.1'),
+        Heading(name='Parametric', level=4, num='3.8.2.3'),
+        Heading(name='RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Parametric', level=5, num='3.8.2.3.1'),
+        Heading(name='References', level=1, num='4'),
+        ),
+    requirements=(
+        RQ_SRS_019_ClickHouse_WindowFunctions,
+        RQ_SRS_019_ClickHouse_WindowFunctions_NonDistributedTables,
+        RQ_SRS_019_ClickHouse_WindowFunctions_DistributedTables,
+        RQ_SRS_019_ClickHouse_WindowFunctions_WindowSpec,
+        RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause,
+        RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_MultipleExpr,
+        RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_MissingExpr_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_InvalidExpr_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MultipleExprs,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MissingExpr_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_InvalidExpr_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_FrameClause,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_MissingFrameExtent_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_InvalidFrameExtent_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_CurrentRow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_UnboundedPreceding,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_ExprPreceding,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_UnboundedFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_ExprFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_CurrentRow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_ExprPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_UnboundedFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_ExprFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_CurrentRow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_ExprPreceding,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_UnboundedFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_ExprFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_ExprFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_UnboundedFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_ExprFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_CurrentRow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_UnboundedFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprPreceding,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_DataTypes_DateAndDateTime,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_DataTypes_IntAndUInt,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_MultipleColumnsInOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_MissingFrameExtent_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_InvalidFrameExtent_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_CurrentRow_Peers,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_CurrentRow_WithoutOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_CurrentRow_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedPreceding_WithoutOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedPreceding_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_OrderByNonNumericalColumn_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprFollowing_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprFollowing_WithOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_CurrentRow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_UnboundedFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprFollowing_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprFollowing_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_CurrentRow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_UnboundedFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprPreceding_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprPreceding_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprFollowing_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprFollowing_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_CurrentRow_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_UnboundedFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_ExprPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_ExprFollowing_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_CurrentRow_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_CurrentRow_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedFollowing_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedFollowing_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprFollowing_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprFollowing_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_WithOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_ZeroSpecialCase,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedFollowing_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedFollowing_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_WithOrderBy_ZeroSpecialCase,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithoutOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithOrderBy_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithOrderBy,
+        RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Extent,
+        RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Start,
+        RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Between,
+        RQ_SRS_019_ClickHouse_WindowFunctions_Frame_End,
+        RQ_SRS_019_ClickHouse_WindowFunctions_CurrentRow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_UnboundedPreceding,
+        RQ_SRS_019_ClickHouse_WindowFunctions_UnboundedFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_ExprPreceding,
+        RQ_SRS_019_ClickHouse_WindowFunctions_ExprPreceding_ExprValue,
+        RQ_SRS_019_ClickHouse_WindowFunctions_ExprFollowing,
+        RQ_SRS_019_ClickHouse_WindowFunctions_ExprFollowing_ExprValue,
+        RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause,
+        RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause_MultipleWindows,
+        RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause_MissingWindowSpec_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OverClause,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_EmptyOverClause,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_AdHocWindow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_AdHocWindow_MissingWindowSpec_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow_InvalidName_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow_MultipleWindows_Error,
+        RQ_SRS_019_ClickHouse_WindowFunctions_FirstValue,
+        RQ_SRS_019_ClickHouse_WindowFunctions_LastValue,
+        RQ_SRS_019_ClickHouse_WindowFunctions_Lag_Workaround,
+        RQ_SRS_019_ClickHouse_WindowFunctions_Lead_Workaround,
+        RQ_SRS_019_ClickHouse_WindowFunctions_Rank,
+        RQ_SRS_019_ClickHouse_WindowFunctions_DenseRank,
+        RQ_SRS_019_ClickHouse_WindowFunctions_RowNumber,
+        RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions,
+        RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions_Combinators,
+        RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions_Parametric,
+        ),
+    content='''
+# SRS019 ClickHouse Window Functions
+# Software Requirements Specification
+
+## Table of Contents
+
+* 1 [Revision History](#revision-history)
+* 2 [Introduction](#introduction)
+* 3 [Requirements](#requirements)
+  * 3.1 [General](#general)
+    * 3.1.1 [RQ.SRS-019.ClickHouse.WindowFunctions](#rqsrs-019clickhousewindowfunctions)
+    * 3.1.2 [RQ.SRS-019.ClickHouse.WindowFunctions.NonDistributedTables](#rqsrs-019clickhousewindowfunctionsnondistributedtables)
+    * 3.1.3 [RQ.SRS-019.ClickHouse.WindowFunctions.DistributedTables](#rqsrs-019clickhousewindowfunctionsdistributedtables)
+  * 3.2 [Window Specification](#window-specification)
+    * 3.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowSpec](#rqsrs-019clickhousewindowfunctionswindowspec)
+  * 3.3 [PARTITION Clause](#partition-clause)
+    * 3.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause](#rqsrs-019clickhousewindowfunctionspartitionclause)
+    * 3.3.2 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MultipleExpr](#rqsrs-019clickhousewindowfunctionspartitionclausemultipleexpr)
+    * 3.3.3 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MissingExpr.Error](#rqsrs-019clickhousewindowfunctionspartitionclausemissingexprerror)
+    * 3.3.4 [RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.InvalidExpr.Error](#rqsrs-019clickhousewindowfunctionspartitionclauseinvalidexprerror)
+  * 3.4 [ORDER Clause](#order-clause)
+    * 3.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause](#rqsrs-019clickhousewindowfunctionsorderclause)
+      * 3.4.1.1 [order_clause](#order_clause)
+    * 3.4.2 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MultipleExprs](#rqsrs-019clickhousewindowfunctionsorderclausemultipleexprs)
+    * 3.4.3 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MissingExpr.Error](#rqsrs-019clickhousewindowfunctionsorderclausemissingexprerror)
+    * 3.4.4 [RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.InvalidExpr.Error](#rqsrs-019clickhousewindowfunctionsorderclauseinvalidexprerror)
+  * 3.5 [FRAME Clause](#frame-clause)
+    * 3.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.FrameClause](#rqsrs-019clickhousewindowfunctionsframeclause)
+    * 3.5.2 [ROWS](#rows)
+      * 3.5.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame](#rqsrs-019clickhousewindowfunctionsrowsframe)
+      * 3.5.2.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.MissingFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrowsframemissingframeextenterror)
+      * 3.5.2.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.InvalidFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrowsframeinvalidframeextenterror)
+      * 3.5.2.4 [ROWS CURRENT ROW](#rows-current-row)
+        * 3.5.2.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframestartcurrentrow)
+      * 3.5.2.5 [ROWS UNBOUNDED PRECEDING](#rows-unbounded-preceding)
+        * 3.5.2.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedPreceding](#rqsrs-019clickhousewindowfunctionsrowsframestartunboundedpreceding)
+      * 3.5.2.6 [ROWS `expr` PRECEDING](#rows-expr-preceding)
+        * 3.5.2.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprPreceding](#rqsrs-019clickhousewindowfunctionsrowsframestartexprpreceding)
+      * 3.5.2.7 [ROWS UNBOUNDED FOLLOWING](#rows-unbounded-following)
+        * 3.5.2.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframestartunboundedfollowingerror)
+      * 3.5.2.8 [ROWS `expr` FOLLOWING](#rows-expr-following)
+        * 3.5.2.8.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframestartexprfollowingerror)
+      * 3.5.2.9 [ROWS BETWEEN CURRENT ROW](#rows-between-current-row)
+        * 3.5.2.9.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowcurrentrow)
+        * 3.5.2.9.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowunboundedprecedingerror)
+        * 3.5.2.9.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowexprprecedingerror)
+        * 3.5.2.9.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowunboundedfollowing)
+        * 3.5.2.9.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweencurrentrowexprfollowing)
+      * 3.5.2.10 [ROWS BETWEEN UNBOUNDED PRECEDING](#rows-between-unbounded-preceding)
+        * 3.5.2.10.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingcurrentrow)
+        * 3.5.2.10.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingunboundedprecedingerror)
+        * 3.5.2.10.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprPreceding](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingexprpreceding)
+        * 3.5.2.10.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingunboundedfollowing)
+        * 3.5.2.10.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedprecedingexprfollowing)
+      * 3.5.2.11 [ROWS BETWEEN UNBOUNDED FOLLOWING](#rows-between-unbounded-following)
+        * 3.5.2.11.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenunboundedfollowingerror)
+      * 3.5.2.12 [ROWS BETWEEN `expr` FOLLOWING](#rows-between-expr-following)
+        * 3.5.2.12.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingerror)
+        * 3.5.2.12.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingexprfollowingerror)
+        * 3.5.2.12.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingunboundedfollowing)
+        * 3.5.2.12.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprfollowingexprfollowing)
+      * 3.5.2.13 [ROWS BETWEEN `expr` PRECEDING](#rows-between-expr-preceding)
+        * 3.5.2.13.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.CurrentRow](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingcurrentrow)
+        * 3.5.2.13.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingunboundedprecedingerror)
+        * 3.5.2.13.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingunboundedfollowing)
+        * 3.5.2.13.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingexprprecedingerror)
+        * 3.5.2.13.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingexprpreceding)
+        * 3.5.2.13.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprFollowing](#rqsrs-019clickhousewindowfunctionsrowsframebetweenexprprecedingexprfollowing)
+    * 3.5.3 [RANGE](#range)
+      * 3.5.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame](#rqsrs-019clickhousewindowfunctionsrangeframe)
+      * 3.5.3.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.DateAndDateTime](#rqsrs-019clickhousewindowfunctionsrangeframedatatypesdateanddatetime)
+      * 3.5.3.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.IntAndUInt](#rqsrs-019clickhousewindowfunctionsrangeframedatatypesintanduint)
+      * 3.5.3.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MultipleColumnsInOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframemultiplecolumnsinorderbyerror)
+      * 3.5.3.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MissingFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrangeframemissingframeextenterror)
+      * 3.5.3.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.InvalidFrameExtent.Error](#rqsrs-019clickhousewindowfunctionsrangeframeinvalidframeextenterror)
+      * 3.5.3.7 [`CURRENT ROW` Peers](#current-row-peers)
+      * 3.5.3.8 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.CurrentRow.Peers](#rqsrs-019clickhousewindowfunctionsrangeframecurrentrowpeers)
+      * 3.5.3.9 [RANGE CURRENT ROW](#range-current-row)
+        * 3.5.3.9.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithoutOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartcurrentrowwithoutorderby)
+        * 3.5.3.9.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartcurrentrowwithorderby)
+      * 3.5.3.10 [RANGE UNBOUNDED FOLLOWING](#range-unbounded-following)
+        * 3.5.3.10.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartunboundedfollowingerror)
+      * 3.5.3.11 [RANGE UNBOUNDED PRECEDING](#range-unbounded-preceding)
+        * 3.5.3.11.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithoutOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartunboundedprecedingwithoutorderby)
+        * 3.5.3.11.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartunboundedprecedingwithorderby)
+      * 3.5.3.12 [RANGE `expr` PRECEDING](#range-expr-preceding)
+        * 3.5.3.12.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprprecedingwithoutorderbyerror)
+        * 3.5.3.12.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.OrderByNonNumericalColumn.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprprecedingorderbynonnumericalcolumnerror)
+        * 3.5.3.12.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframestartexprprecedingwithorderby)
+      * 3.5.3.13 [RANGE `expr` FOLLOWING](#range-expr-following)
+        * 3.5.3.13.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprfollowingwithoutorderbyerror)
+        * 3.5.3.13.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframestartexprfollowingwithorderbyerror)
+      * 3.5.3.14 [RANGE BETWEEN CURRENT ROW](#range-between-current-row)
+        * 3.5.3.14.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.CurrentRow](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowcurrentrow)
+        * 3.5.3.14.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowunboundedprecedingerror)
+        * 3.5.3.14.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowunboundedfollowing)
+        * 3.5.3.14.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowexprfollowingwithoutorderbyerror)
+        * 3.5.3.14.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowexprfollowingwithorderby)
+        * 3.5.3.14.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweencurrentrowexprprecedingerror)
+      * 3.5.3.15 [RANGE BETWEEN UNBOUNDED PRECEDING](#range-between-unbounded-preceding)
+        * 3.5.3.15.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.CurrentRow](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingcurrentrow)
+        * 3.5.3.15.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingunboundedprecedingerror)
+        * 3.5.3.15.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingunboundedfollowing)
+        * 3.5.3.15.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprprecedingwithoutorderbyerror)
+        * 3.5.3.15.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprprecedingwithorderby)
+        * 3.5.3.15.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprfollowingwithoutorderbyerror)
+        * 3.5.3.15.7 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedprecedingexprfollowingwithorderby)
+      * 3.5.3.16 [RANGE BETWEEN UNBOUNDED FOLLOWING](#range-between-unbounded-following)
+        * 3.5.3.16.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.CurrentRow.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingcurrentrowerror)
+        * 3.5.3.16.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedFollowing.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingunboundedfollowingerror)
+        * 3.5.3.16.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingunboundedprecedingerror)
+        * 3.5.3.16.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingexprprecedingerror)
+        * 3.5.3.16.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprFollowing.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenunboundedfollowingexprfollowingerror)
+      * 3.5.3.17 [RANGE BETWEEN expr PRECEDING](#range-between-expr-preceding)
+        * 3.5.3.17.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingcurrentrowwithorderby)
+        * 3.5.3.17.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingcurrentrowwithoutorderbyerror)
+        * 3.5.3.17.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingunboundedprecedingerror)
+        * 3.5.3.17.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingunboundedfollowingwithoutorderbyerror)
+        * 3.5.3.17.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingunboundedfollowingwithorderby)
+        * 3.5.3.17.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprfollowingwithoutorderbyerror)
+        * 3.5.3.17.7 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprfollowingwithorderby)
+        * 3.5.3.17.8 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprprecedingwithoutorderbyerror)
+        * 3.5.3.17.9 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprprecedingwithorderbyerror)
+        * 3.5.3.17.10 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprprecedingexprprecedingwithorderby)
+      * 3.5.3.18 [RANGE BETWEEN expr FOLLOWING](#range-between-expr-following)
+        * 3.5.3.18.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingcurrentrowwithoutorderbyerror)
+        * 3.5.3.18.2 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingcurrentrowwithorderbyerror)
+        * 3.5.3.18.3 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.ZeroSpecialCase](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingcurrentrowzerospecialcase)
+        * 3.5.3.18.4 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingunboundedfollowingwithoutorderbyerror)
+        * 3.5.3.18.5 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingunboundedfollowingwithorderby)
+        * 3.5.3.18.6 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingunboundedprecedingerror)
+        * 3.5.3.18.7 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprprecedingwithoutorderbyerror)
+        * 3.5.3.18.8 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprprecedingerror)
+        * 3.5.3.18.9 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithOrderBy.ZeroSpecialCase](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprprecedingwithorderbyzerospecialcase)
+        * 3.5.3.18.10 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithoutOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprfollowingwithoutorderbyerror)
+        * 3.5.3.18.11 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy.Error](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprfollowingwithorderbyerror)
+        * 3.5.3.18.12 [RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy](#rqsrs-019clickhousewindowfunctionsrangeframebetweenexprfollowingexprfollowingwithorderby)
+    * 3.5.4 [Frame Extent](#frame-extent)
+      * 3.5.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Extent](#rqsrs-019clickhousewindowfunctionsframeextent)
+    * 3.5.5 [Frame Start](#frame-start)
+      * 3.5.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Start](#rqsrs-019clickhousewindowfunctionsframestart)
+    * 3.5.6 [Frame Between](#frame-between)
+      * 3.5.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Between](#rqsrs-019clickhousewindowfunctionsframebetween)
+    * 3.5.7 [Frame End](#frame-end)
+      * 3.5.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Frame.End](#rqsrs-019clickhousewindowfunctionsframeend)
+    * 3.5.8 [`CURRENT ROW`](#current-row)
+      * 3.5.8.1 [RQ.SRS-019.ClickHouse.WindowFunctions.CurrentRow](#rqsrs-019clickhousewindowfunctionscurrentrow)
+    * 3.5.9 [`UNBOUNDED PRECEDING`](#unbounded-preceding)
+      * 3.5.9.1 [RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedPreceding](#rqsrs-019clickhousewindowfunctionsunboundedpreceding)
+    * 3.5.10 [`UNBOUNDED FOLLOWING`](#unbounded-following)
+      * 3.5.10.1 [RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedFollowing](#rqsrs-019clickhousewindowfunctionsunboundedfollowing)
+    * 3.5.11 [`expr PRECEDING`](#expr-preceding)
+      * 3.5.11.1 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding](#rqsrs-019clickhousewindowfunctionsexprpreceding)
+      * 3.5.11.2 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding.ExprValue](#rqsrs-019clickhousewindowfunctionsexprprecedingexprvalue)
+    * 3.5.12 [`expr FOLLOWING`](#expr-following)
+      * 3.5.12.1 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing](#rqsrs-019clickhousewindowfunctionsexprfollowing)
+      * 3.5.12.2 [RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing.ExprValue](#rqsrs-019clickhousewindowfunctionsexprfollowingexprvalue)
+  * 3.6 [WINDOW Clause](#window-clause)
+    * 3.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause](#rqsrs-019clickhousewindowfunctionswindowclause)
+    * 3.6.2 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MultipleWindows](#rqsrs-019clickhousewindowfunctionswindowclausemultiplewindows)
+    * 3.6.3 [RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MissingWindowSpec.Error](#rqsrs-019clickhousewindowfunctionswindowclausemissingwindowspecerror)
+  * 3.7 [`OVER` Clause](#over-clause)
+    * 3.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause](#rqsrs-019clickhousewindowfunctionsoverclause)
+    * 3.7.2 [Empty Clause](#empty-clause)
+      * 3.7.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.EmptyOverClause](#rqsrs-019clickhousewindowfunctionsoverclauseemptyoverclause)
+    * 3.7.3 [Ad-Hoc Window](#ad-hoc-window)
+      * 3.7.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow](#rqsrs-019clickhousewindowfunctionsoverclauseadhocwindow)
+      * 3.7.3.2 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow.MissingWindowSpec.Error](#rqsrs-019clickhousewindowfunctionsoverclauseadhocwindowmissingwindowspecerror)
+    * 3.7.4 [Named Window](#named-window)
+      * 3.7.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow](#rqsrs-019clickhousewindowfunctionsoverclausenamedwindow)
+      * 3.7.4.2 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.InvalidName.Error](#rqsrs-019clickhousewindowfunctionsoverclausenamedwindowinvalidnameerror)
+      * 3.7.4.3 [RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.MultipleWindows.Error](#rqsrs-019clickhousewindowfunctionsoverclausenamedwindowmultiplewindowserror)
+  * 3.8 [Window Functions](#window-functions)
+    * 3.8.1 [Nonaggregate Functions](#nonaggregate-functions)
+      * 3.8.1.1 [The `first_value(expr)` Function](#the-first_valueexpr-function)
+        * 3.8.1.1.1 [RQ.SRS-019.ClickHouse.WindowFunctions.FirstValue](#rqsrs-019clickhousewindowfunctionsfirstvalue)
+      * 3.8.1.2 [The `last_value(expr)` Function](#the-last_valueexpr-function)
+        * 3.8.1.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.LastValue](#rqsrs-019clickhousewindowfunctionslastvalue)
+      * 3.8.1.3 [The `lag(value, offset)` Function Workaround](#the-lagvalue-offset-function-workaround)
+        * 3.8.1.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Lag.Workaround](#rqsrs-019clickhousewindowfunctionslagworkaround)
+      * 3.8.1.4 [The `lead(value, offset)` Function Workaround](#the-leadvalue-offset-function-workaround)
+        * 3.8.1.4.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Lead.Workaround](#rqsrs-019clickhousewindowfunctionsleadworkaround)
+      * 3.8.1.5 [The `rank()` Function](#the-rank-function)
+        * 3.8.1.5.1 [RQ.SRS-019.ClickHouse.WindowFunctions.Rank](#rqsrs-019clickhousewindowfunctionsrank)
+      * 3.8.1.6 [The `dense_rank()` Function](#the-dense_rank-function)
+        * 3.8.1.6.1 [RQ.SRS-019.ClickHouse.WindowFunctions.DenseRank](#rqsrs-019clickhousewindowfunctionsdenserank)
+      * 3.8.1.7 [The `row_number()` Function](#the-row_number-function)
+        * 3.8.1.7.1 [RQ.SRS-019.ClickHouse.WindowFunctions.RowNumber](#rqsrs-019clickhousewindowfunctionsrownumber)
+    * 3.8.2 [Aggregate Functions](#aggregate-functions)
+      * 3.8.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions](#rqsrs-019clickhousewindowfunctionsaggregatefunctions)
+      * 3.8.2.2 [Combinators](#combinators)
+        * 3.8.2.2.1 [RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Combinators](#rqsrs-019clickhousewindowfunctionsaggregatefunctionscombinators)
+      * 3.8.2.3 [Parametric](#parametric)
+        * 3.8.2.3.1 [RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Parametric](#rqsrs-019clickhousewindowfunctionsaggregatefunctionsparametric)
+* 4 [References](#references)
+
+
+## Revision History
+
+This document is stored in an electronic form using [Git] source control management software
+hosted in a [GitHub Repository].
+All the updates are tracked using the [Revision History].
+
+## Introduction
+
+This software requirements specification covers requirements for supporting window functions in [ClickHouse].
+Similar functionality exists in [MySQL] and [PostreSQL]. [PostreSQL] defines a window function as follows:
+
+> A window function performs a calculation across a set of table rows that are somehow related to the current row.
+> This is comparable to the type of calculation that can be done with an aggregate function.
+> But unlike regular aggregate functions, use of a window function does not cause rows to
+> become grouped into a single output row — the rows retain their separate identities.
+
+## Requirements
+
+### General
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions
+version: 1.0
+
+[ClickHouse] SHALL support [window functions] that produce a result for each row inside the window.
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.NonDistributedTables
+version: 1.0
+
+[ClickHouse] SHALL support correct operation of [window functions] on non-distributed 
+table engines such as `MergeTree`.
+
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.DistributedTables
+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.
+
+### Window Specification
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowSpec
+version: 1.0
+
+[ClickHouse] SHALL support defining a window using window specification clause.
+The [window_spec] SHALL be defined as
+
+```
+window_spec:
+   [partition_clause] [order_clause] [frame_clause]
+```
+
+that SHALL specify how to partition query rows into groups for processing by the window function.
+
+### PARTITION Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause
+version: 1.0
+
+[ClickHouse] SHALL support [partition_clause] that indicates how to divide the query rows into groups.
+The [partition_clause] SHALL be defined as
+
+```
+partition_clause:
+    PARTITION BY expr [, expr] ...
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MultipleExpr
+version: 1.0
+
+[ClickHouse] SHALL support partitioning by more than one `expr` in the [partition_clause] definition.
+
+For example,
+
+```sql
+SELECT x,s, sum(x) OVER (PARTITION BY x,s) FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))
+```
+
+```bash
+┌─x─┬─s─┬─sum(x) OVER (PARTITION BY x, s)─┐
+│ 1 │ a │                               1 │
+│ 1 │ b │                               1 │
+│ 2 │ b │                               2 │
+└───┴───┴─────────────────────────────────┘
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.MissingExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is missing in the [partition_clause] definition.
+
+```sql
+SELECT sum(number) OVER (PARTITION BY) FROM numbers(1,3)
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.PartitionClause.InvalidExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is invalid in the [partition_clause] definition.
+
+### ORDER Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause
+version: 1.0
+
+[ClickHouse] SHALL support [order_clause] that indicates how to sort rows in each window.
+
+##### order_clause
+
+The `order_clause` SHALL be defined as
+
+```
+order_clause:
+    ORDER BY expr [ASC|DESC] [, expr [ASC|DESC]] ...
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MultipleExprs
+version: 1.0
+
+[ClickHouse] SHALL return support using more than one `expr` in the [order_clause] definition.
+
+For example, 
+
+```sql
+SELECT x,s, sum(x) OVER (ORDER BY x DESC, s DESC) FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))
+```
+
+```bash
+┌─x─┬─s─┬─sum(x) OVER (ORDER BY x DESC, s DESC)─┐
+│ 2 │ b │                                     2 │
+│ 1 │ b │                                     3 │
+│ 1 │ a │                                     4 │
+└───┴───┴───────────────────────────────────────┘
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.MissingExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is missing in the [order_clause] definition.
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OrderClause.InvalidExpr.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if `expr` is invalid in the [order_clause] definition.
+
+### FRAME Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.FrameClause
+version: 1.0
+
+[ClickHouse] SHALL support [frame_clause] that SHALL specify a subset of the current window.
+
+The `frame_clause` SHALL be defined as
+
+```
+frame_clause:
+    {ROWS | RANGE } frame_extent
+```
+
+#### ROWS
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame
+version: 1.0
+
+[ClickHouse] SHALL support `ROWS` frame to define beginning and ending row positions.
+Offsets SHALL be differences in row numbers from the current row number.
+
+```sql
+ROWS frame_extent
+```
+
+See [frame_extent] definition.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.MissingFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `ROWS` frame clause is defined without [frame_extent].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number ROWS) FROM numbers(1,3)
+```
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.InvalidFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `ROWS` frame clause has invalid [frame_extent].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number ROWS '1') FROM numbers(1,3)
+```
+
+##### ROWS CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include only the current row in the window partition
+when `ROWS CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS CURRENT ROW) FROM numbers(1,2)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           2 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedPreceding
+version: 1.0
+
+[ClickHouse] SHALL include all rows before and including the current row in the window partition
+when `ROWS UNBOUNDED PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                   1 │
+│      2 │                                                                   3 │
+│      3 │                                                                   6 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS `expr` PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL include `expr` rows before and including the current row in the window partition 
+when `ROWS expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS 1 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           3 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+##### ROWS `expr` FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Start.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS 1 FOLLOWING) FROM numbers(1,3)
+```
+
+##### ROWS BETWEEN CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include only the current row in the window partition
+when `ROWS BETWEEN CURRENT ROW AND CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,2)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           2 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING` frame is specified.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN CURRENT ROW AND expr PRECEDING` frame is specified.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the current row and all the following rows in the window partition
+when `ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                   6 │
+│      2 │                                                                   5 │
+│      3 │                                                                   3 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.CurrentRow.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the current row and the `expr` rows that are following the current row in the window partition
+when `ROWS BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)─┐
+│      1 │                                                           3 │
+│      2 │                                                           5 │
+│      3 │                                                           3 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS BETWEEN UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include all the rows before and including the current row in the window partition
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                   1 │
+│      2 │                                                                   3 │
+│      3 │                                                                   6 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL include all the rows until and including the current row minus `expr` rows preceding it
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING)─┐
+│      1 │                                                                   0 │
+│      2 │                                                                   1 │
+│      3 │                                                                   3 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition 
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                           6 │
+│      2 │                                                                           6 │
+│      3 │                                                                           6 │
+└────────┴─────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedPreceding.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all the rows until and including the current row plus `expr` rows following it
+when `ROWS BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                                   3 │
+│      2 │                                                                   6 │
+│      3 │                                                                   6 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS BETWEEN UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `UNBOUNDED FOLLOWING` is specified as the start of the frame, including
+
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND expr PRECEDING`
+* `ROWS BETWEEN UNBOUNDED FOLLOWING AND expr FOLLOWING`
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+##### ROWS BETWEEN `expr` FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `expr FOLLOWING` is specified as the start of the frame
+and it points to a row that is after the start of the frame inside the window partition such
+as the following cases
+
+* `ROWS BETWEEN expr FOLLOWING AND CURRENT ROW`
+* `ROWS BETWEEN expr FOLLOWING AND UNBOUNDED PRECEDING`
+* `ROWS BETWEEN expr FOLLOWING AND expr PRECEDING`
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `ROWS BETWEEN expr FOLLOWING AND expr FOLLOWING`
+is specified and the end of the frame specified by the `expr FOLLOWING` is a row that is before the row 
+specified by the frame start.
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all the rows from and including current row plus `expr` rows following it 
+until and including the last row in the window partition
+when `ROWS BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                   5 │
+│      2 │                                                                   3 │
+│      3 │                                                                   0 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprFollowing.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row plus `expr` following it 
+until and including the row specified by the frame end when the frame end 
+is the current row plus `expr` following it is right at or after the start of the frame
+when `ROWS BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 2 FOLLOWING)─┐
+│      1 │                                                           5 │
+│      2 │                                                           3 │
+│      3 │                                                           0 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+##### ROWS BETWEEN `expr` PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows
+preceding it until and including the current row in the window frame
+when `ROWS BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                           1 │
+│      2 │                                                           3 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error
+when `ROWS BETWEEN expr PRECEDING AND UNBOUNDED PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows
+preceding it until and including the last row in the window partition
+when `ROWS BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                   6 │
+│      2 │                                                                   6 │
+│      3 │                                                                   5 │
+└────────┴─────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when the frame end specified by the `expr PRECEDING`
+evaluates to a row that is before the row specified by the frame start in the window partition
+when `ROWS BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows preceding it
+until and including the current row minus `expr` rows preceding it if the end
+of the frame is after the frame start in the window partition 
+when `ROWS BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 0 PRECEDING)─┐
+│      1 │                                                           1 │
+│      2 │                                                           3 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowsFrame.Between.ExprPreceding.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL include the rows from and including current row minus `expr` rows preceding it
+until and including the current row plus `expr` rows following it in the window partition
+when `ROWS BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                           3 │
+│      2 │                                                           6 │
+│      3 │                                                           5 │
+└────────┴─────────────────────────────────────────────────────────────┘
+```
+
+#### RANGE
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame
+version: 1.0
+
+[ClickHouse] SHALL support `RANGE` frame to define rows within a value range.
+Offsets SHALL be differences in row values from the current row value.
+
+```sql
+RANGE frame_extent
+```
+
+See [frame_extent] definition.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.DateAndDateTime
+version: 1.0
+
+[ClickHouse] SHALL support `RANGE` frame over columns with `Date` and `DateTime`
+data types.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.DataTypes.IntAndUInt
+version: 1.0
+
+[ClickHouse] SHALL support `RANGE` frame over columns with numerical data types
+such `IntX` and `UIntX`.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MultipleColumnsInOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `RANGE` frame definition is used with `ORDER BY`
+that uses multiple columns.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.MissingFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `RANGE` frame definition is missing [frame_extent].
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.InvalidFrameExtent.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `RANGE` frame definition has invalid [frame_extent].
+
+##### `CURRENT ROW` Peers
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.CurrentRow.Peers
+version: 1.0
+
+[ClickHouse] for the `RANGE` frame SHALL define the `peers` of the `CURRENT ROW` to be all
+the rows that are inside the same order bucket.
+
+##### RANGE CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithoutOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition
+when `RANGE CURRENT ROW` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                            6 │
+│      2 │                                                            6 │
+│      3 │                                                            6 │
+└────────┴──────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.CurrentRow.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows that are [current row peers] in the window partition
+when `RANGE CURRENT ROW` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE UNBOUNDED FOLLOWING` frame is specified with or without order by
+as `UNBOUNDED FOLLOWING` SHALL not be supported as [frame_start].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+##### RANGE UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithoutOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition
+when `RANGE UNBOUNDED PRECEDING` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                    6 │
+│      2 │                                                                    6 │
+│      3 │                                                                    6 │
+└────────┴──────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.UnboundedPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include rows with values from and including the first row 
+until and including all [current row peers] in the window partition
+when `RANGE UNBOUNDED PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                        1 │
+│      2 │                                                                                        3 │
+│      3 │                                                                                        6 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE `expr` PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr PRECEDING` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE 1 PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.OrderByNonNumericalColumn.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr PRECEDING` is used with `ORDER BY` clause
+over a non-numerical column.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include rows with values from and including current row value minus `expr`
+until and including the value for the current row 
+when `RANGE expr PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE 1 PRECEDING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                1 │
+│      2 │                                                                                3 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE `expr` FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr FOLLOWING` frame is specified without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE 1 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Start.ExprFollowing.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE expr FOLLOWING` frame is specified wit the `ORDER BY` clause 
+as the value for the frame start cannot be larger than the value for the frame end.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE 1 FOLLOWING) FROM numbers(1,3)
+```
+
+##### RANGE BETWEEN CURRENT ROW
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include all [current row peers] in the window partition 
+when `RANGE BETWEEN CURRENT ROW AND CURRENT ROW` frame is specified with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**  
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                            6 │
+│      2 │                                                            6 │
+│      3 │                                                            6 │
+└────────┴──────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**  
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND CURRENT ROW) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND CURRENT ROW)─┐
+│      1 │                                                                                1 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING` frame is specified
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including [current row peers] until and including
+the last row in the window partition when `RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING` frame is specified
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                    6 │
+│      2 │                                                                    6 │
+│      3 │                                                                    6 │
+└────────┴──────────────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                        6 │
+│      2 │                                                                                        5 │
+│      3 │                                                                                        3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including [current row peers] until and including
+current row value plus `expr` when `RANGE BETWEEN CURRENT ROW AND expr FOLLOWING` frame is specified
+with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING)─┐
+│      1 │                                                                                4 │
+│      1 │                                                                                4 │
+│      2 │                                                                                5 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.CurrentRow.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN CURRENT ROW AND expr PRECEDING` frame is specified
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) FROM numbers(1,3)
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) FROM numbers(1,3)
+```
+
+##### RANGE BETWEEN UNBOUNDED PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including the first row until and including
+[current row peers] in the window partition when `RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW` frame is specified
+with and without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                    7 │
+│      1 │                                                                    7 │
+│      2 │                                                                    7 │
+│      3 │                                                                    7 │
+└────────┴──────────────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                        2 │
+│      1 │                                                                                        2 │
+│      2 │                                                                                        4 │
+│      3 │                                                                                        7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return and error when `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING` frame is specified
+with and without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL include all rows in the window partition when `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING` frame is specified
+with and without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                            7 │
+│      1 │                                                                            7 │
+│      2 │                                                                            7 │
+│      3 │                                                                            7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                                7 │
+│      1 │                                                                                                7 │
+│      2 │                                                                                                7 │
+│      3 │                                                                                                7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including the first row until and including
+the value of the current row minus `expr` in the window partition
+when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING)─┐
+│      1 │                                                                                        0 │
+│      1 │                                                                                        0 │
+│      2 │                                                                                        2 │
+│      3 │                                                                                        4 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedPreceding.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including the first row until and including
+the value of the current row plus `expr` in the window partition
+when `RANGE BETWEEN UNBOUNDED PRECEDING AND expr FOLLOWING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                                                        4 │
+│      1 │                                                                                        4 │
+│      2 │                                                                                        7 │
+│      3 │                                                                                        7 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE BETWEEN UNBOUNDED FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.CurrentRow.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND expr PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.UnboundedFollowing.ExprFollowing.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN UNBOUNDED FOLLOWING AND expr FOLLOWING` frame is specified 
+with or without the `ORDER BY` clause.
+
+##### RANGE BETWEEN expr PRECEDING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus `expr` 
+until and including [current row peers] in the window partition
+when `RANGE BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND CURRENT ROW)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                4 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.CurrentRow.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND CURRENT ROW` frame is specified
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.UnboundedFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus `expr` 
+until and including the last row in the window partition when `RANGE BETWEEN expr PRECEDING AND UNBOUNDED FOLLOWING` frame
+is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                        7 │
+│      1 │                                                                                        7 │
+│      2 │                                                                                        7 │
+│      3 │                                                                                        5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus preceding `expr` 
+until and including current row plus following `expr` in the window partition 
+when `RANGE BETWEEN expr PRECEDING AND expr FOLLOWING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING)─┐
+│      1 │                                                                                4 │
+│      1 │                                                                                4 │
+│      2 │                                                                                7 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM numbers(1,3)
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when the value of the [frame_end] specified by the 
+current row minus preceding `expr` is greater than the value of the [frame_start] in the window partition
+when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprPreceding.ExprPreceding.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row minus preceding `expr` for the [frame_start]
+until and including current row minus following `expr` for the [frame_end] in the window partition 
+when `RANGE BETWEEN expr PRECEDING AND expr PRECEDING` frame is specified with the `ORDER BY` clause
+if an only if the [frame_end] value is equal or greater than [frame_start] value.
+
+For example,
+
+**Greater Than**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                4 │
+│      3 │                                                                                5 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+or **Equal**
+
+```sql
+ SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 PRECEDING AND 1 PRECEDING)─┐
+│      1 │                                                                                0 │
+│      1 │                                                                                0 │
+│      2 │                                                                                2 │
+│      3 │                                                                                2 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+##### RANGE BETWEEN expr FOLLOWING
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified 
+with the `ORDER BY` clause and `expr` is greater than `0`.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.CurrentRow.ZeroSpecialCase
+version: 1.0
+
+[ClickHouse] SHALL include all [current row peers] in the window partition
+when `RANGE BETWEEN expr FOLLOWING AND CURRENT ROW` frame is specified 
+with the `ORDER BY` clause if and only if the `expr` equals to `0`.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW)─┐
+│      1 │                                                            7 │
+│      1 │                                                            7 │
+│      2 │                                                            7 │
+│      3 │                                                            7 │
+└────────┴──────────────────────────────────────────────────────────────┘
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW)─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with values from and including current row plus `expr`
+until and including the last row in the window partition 
+when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED FOLLOWING` frame is specified with the `ORDER BY` clause.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING)─┐
+│      1 │                                                                                        5 │
+│      1 │                                                                                        5 │
+│      2 │                                                                                        3 │
+│      3 │                                                                                        0 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.UnboundedPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND UNBOUNDED PRECEDING` frame is specified 
+with or without the `ORDER BY` clause.
+
+For example,
+
+**Without `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+**With `ORDER BY`**
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified 
+without the `ORDER BY`.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified 
+with the `ORDER BY` clause if the value of both `expr` is not `0`.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprPreceding.WithOrderBy.ZeroSpecialCase
+version: 1.0
+
+[ClickHouse] SHALL include all rows with value equal to [current row peers] in the window partition
+when `RANGE BETWEEN expr FOLLOWING AND expr PRECEDING` frame is specified 
+with the `ORDER BY` clause if and only if both `expr`'s are `0`.
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING ─┐
+│      1 │                                                                                2 │
+│      1 │                                                                                2 │
+│      2 │                                                                                2 │
+│      3 │                                                                                3 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithoutOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified 
+without the `ORDER BY` clause.
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified 
+with the `ORDER BY` clause but the `expr` for the [frame_end] is less than the `expr` for the [frame_start].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RangeFrame.Between.ExprFollowing.ExprFollowing.WithOrderBy
+version: 1.0
+
+[ClickHouse] SHALL include all rows with value from and including current row plus `expr` for the [frame_start]
+until and including current row plus `expr` for the [frame_end] in the window partition
+when `RANGE BETWEEN expr FOLLOWING AND expr FOLLOWING` frame is specified 
+with the `ORDER BY` clause if and only if the `expr` for the [frame_end] is greater than or equal than the 
+`expr` for the [frame_start].
+
+For example,
+
+```sql
+SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND 2 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))
+```
+
+```bash
+┌─number─┬─sum(number) OVER (ORDER BY number ASC RANGE BETWEEN 1 FOLLOWING AND 2 FOLLOWING)─┐
+│      1 │                                                                                5 │
+│      1 │                                                                                5 │
+│      2 │                                                                                3 │
+│      3 │                                                                                0 │
+└────────┴──────────────────────────────────────────────────────────────────────────────────┘
+```
+
+#### Frame Extent
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Extent
+version: 1.0
+
+[ClickHouse] SHALL support [frame_extent] defined as
+
+```
+frame_extent:
+    {frame_start | frame_between}
+```
+
+#### Frame Start
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Start
+version: 1.0
+
+[ClickHouse] SHALL support [frame_start] defined as
+
+```
+frame_start: {
+    CURRENT ROW
+  | UNBOUNDED PRECEDING
+  | UNBOUNDED FOLLOWING
+  | expr PRECEDING
+  | expr FOLLOWING
+}
+```
+
+#### Frame Between
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.Between
+version: 1.0
+
+[ClickHouse] SHALL support [frame_between] defined as
+
+```
+frame_between:
+    BETWEEN frame_start AND frame_end
+```
+
+#### Frame End
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.Frame.End
+version: 1.0
+
+[ClickHouse] SHALL support [frame_end] defined as
+
+```
+frame_end: {
+    CURRENT ROW
+  | UNBOUNDED PRECEDING
+  | UNBOUNDED FOLLOWING
+  | expr PRECEDING
+  | expr FOLLOWING
+}
+```
+
+#### `CURRENT ROW`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.CurrentRow
+version: 1.0
+
+[ClickHouse] SHALL support `CURRENT ROW` as `frame_start` or `frame_end` value.
+
+* For `ROWS` SHALL define the bound to be the current row
+* For `RANGE` SHALL define the bound to be the peers of the current row
+
+#### `UNBOUNDED PRECEDING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedPreceding
+version: 1.0
+
+[ClickHouse] SHALL support `UNBOUNDED PRECEDING` as `frame_start` or `frame_end` value
+and it SHALL define that the bound is the first partition row.
+
+#### `UNBOUNDED FOLLOWING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.UnboundedFollowing
+version: 1.0
+
+[ClickHouse] SHALL support `UNBOUNDED FOLLOWING` as `frame_start` or `frame_end` value
+and it SHALL define that the bound is the last partition row.
+
+#### `expr PRECEDING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding
+version: 1.0
+
+[ClickHouse] SHALL support `expr PRECEDING` as `frame_start` or `frame_end` value
+
+* For `ROWS` it SHALL define the bound to be the `expr` rows before the current row
+* For `RANGE` it SHALL define the bound to be the rows with values equal to the current row value minus the `expr`.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprPreceding.ExprValue
+version: 1.0
+
+[ClickHouse] SHALL support only non-negative numeric literal as the value for the `expr` in the `expr PRECEDING` frame boundary.
+
+For example,
+
+```
+5 PRECEDING
+```
+
+#### `expr FOLLOWING`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing
+version: 1.0
+
+[ClickHouse] SHALL support `expr FOLLOWING` as `frame_start` or `frame_end` value
+
+* For `ROWS` it SHALL define the bound to be the `expr` rows after the current row
+* For `RANGE` it SHALL define  the bound to be the rows with values equal to the current row value plus `expr`
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.ExprFollowing.ExprValue
+version: 1.0
+
+[ClickHouse] SHALL support only non-negative numeric literal as the value for the `expr` in the `expr FOLLOWING` frame boundary.
+
+For example,
+
+```
+5 FOLLOWING
+```
+
+### WINDOW Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause
+version: 1.0
+
+[ClickHouse] SHALL support `WINDOW` clause to define one or more windows.
+
+```sql
+WINDOW window_name AS (window_spec)
+    [, window_name AS (window_spec)] ..
+```
+
+The `window_name` SHALL be the name of a window defined by a `WINDOW` clause.
+
+The [window_spec] SHALL specify the window.
+
+For example,
+
+```sql
+SELECT ... FROM table WINDOW w AS (partiton by id))
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MultipleWindows
+version: 1.0
+
+[ClickHouse] SHALL support `WINDOW` clause that defines multiple windows.
+
+For example,
+
+```sql
+SELECT ... FROM table WINDOW w1 AS (partition by id), w2 AS (partition by customer)
+```
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.WindowClause.MissingWindowSpec.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `WINDOW` clause definition is missing [window_spec].
+
+### `OVER` Clause
+
+#### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause
+version: 1.0
+
+[ClickHouse] SHALL support `OVER` clause to either use named window defined using `WINDOW` clause
+or adhoc window defined inplace.
+
+
+```
+OVER ()|(window_spec)|named_window 
+```
+
+#### Empty Clause
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.EmptyOverClause
+version: 1.0
+
+[ClickHouse] SHALL treat the entire set of query rows as a single partition when `OVER` clause is empty.
+For example,
+
+```
+SELECT sum(x) OVER () FROM table
+```
+
+#### Ad-Hoc Window
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow
+version: 1.0
+
+[ClickHouse] SHALL support ad hoc window specification in the `OVER` clause.
+
+```
+OVER [window_spec]
+```
+
+See [window_spec] definition.
+
+For example,
+
+```sql
+(count(*) OVER (partition by id order by time desc))
+```
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.AdHocWindow.MissingWindowSpec.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `OVER` clause has missing [window_spec].
+
+#### Named Window
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow
+version: 1.0
+
+[ClickHouse] SHALL support using a previously defined named window in the `OVER` clause.
+
+```
+OVER [window_name]
+```
+
+See [window_name] definition.
+
+For example,
+
+```sql
+SELECT count(*) OVER w FROM table WINDOW w AS (partition by id)
+```
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.InvalidName.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `OVER` clause reference invalid window name.
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.OverClause.NamedWindow.MultipleWindows.Error
+version: 1.0
+
+[ClickHouse] SHALL return an error if the `OVER` clause references more than one window name.
+
+### Window Functions
+
+#### Nonaggregate Functions
+
+##### The `first_value(expr)` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.FirstValue
+version: 1.0
+
+[ClickHouse] SHALL support `first_value` window function that
+SHALL be synonum for the `any(value)` function
+that SHALL return the value of `expr` from first row in the window frame.
+
+```
+first_value(expr) OVER ...
+```
+
+##### The `last_value(expr)` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.LastValue
+version: 1.0
+
+[ClickHouse] SHALL support `last_value` window function that
+SHALL be synonym for the `anyLast(value)` function
+that SHALL return the value of `expr` from the last row in the window frame.
+
+```
+last_value(expr) OVER ...
+```
+
+##### The `lag(value, offset)` Function Workaround
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.Lag.Workaround
+version: 1.0
+
+[ClickHouse] SHALL support a workaround for the `lag(value, offset)` function as
+
+```
+any(value) OVER (.... ROWS BETWEEN <offset> PRECEDING AND <offset> PRECEDING)
+```
+
+The function SHALL returns the value from the row that lags (precedes) the current row
+by the `N` rows within its partition. Where `N` is the `value` passed to the `any` function.
+
+If there is no such row, the return value SHALL be default.
+
+For example, if `N` is 3, the return value is default for the first two rows.
+If N or default are missing, the defaults are 1 and NULL, respectively.
+
+`N` SHALL be a literal non-negative integer. If N is 0, the value SHALL be
+returned for the current row.
+
+##### The `lead(value, offset)` Function Workaround
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.Lead.Workaround
+version: 1.0
+
+[ClickHouse] SHALL support a workaround for the `lead(value, offset)` function as
+
+```
+any(value) OVER (.... ROWS BETWEEN <offset> FOLLOWING AND <offset> FOLLOWING)
+```
+
+The function SHALL returns the value from the row that leads (follows) the current row by
+the `N` rows within its partition. Where `N` is the `value` passed to the `any` function.
+
+If there is no such row, the return value SHALL be default.
+
+For example, if `N` is 3, the return value is default for the last two rows.
+If `N` or default are missing, the defaults are 1 and NULL, respectively.
+
+`N` SHALL be a literal non-negative integer. If `N` is 0, the value SHALL be
+returned for the current row.
+
+##### The `rank()` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.Rank
+version: 1.0
+
+[ClickHouse] SHALL support `rank` window function that SHALL
+return the rank of the current row within its partition with gaps.
+
+Peers SHALL be considered ties and receive the same rank.
+The function SHALL not assign consecutive ranks to peer groups if groups of size greater than one exist
+and the result is noncontiguous rank numbers.
+
+If the function is used without `ORDER BY` to sort partition rows into the desired order
+then all rows SHALL be peers.
+
+```
+rank() OVER ...
+```
+
+##### The `dense_rank()` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.DenseRank
+version: 1.0
+
+[ClickHouse] SHALL support `dense_rank` function over a window that SHALL
+return the rank of the current row within its partition without gaps.
+
+Peers SHALL be considered ties and receive the same rank.
+The function SHALL assign consecutive ranks to peer groups and
+the result is that groups of size greater than one do not produce noncontiguous rank numbers.
+
+If the function is used without `ORDER BY` to sort partition rows into the desired order
+then all rows SHALL be peers.
+
+```
+dense_rank() OVER ...
+```
+
+##### The `row_number()` Function
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.RowNumber
+version: 1.0
+
+[ClickHouse] SHALL support `row_number` function over a window that SHALL
+returns the number of the current row within its partition.
+
+Rows numbers SHALL range from 1 to the number of partition rows.
+
+The `ORDER BY` affects the order in which rows are numbered.
+Without `ORDER BY`, row numbering MAY be nondeterministic.
+
+```
+row_number() OVER ...
+```
+
+#### Aggregate Functions
+
+##### RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions
+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/)
+
+##### Combinators
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Combinators
+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)
+
+##### Parametric
+
+###### RQ.SRS-019.ClickHouse.WindowFunctions.AggregateFunctions.Parametric
+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)
+
+## References
+
+* [ClickHouse]
+* [GitHub Repository]
+* [Revision History]
+* [Git]
+
+[current row peers]: #current-row-peers
+[frame_extent]: #frame-extent
+[frame_between]: #frame-between
+[frame_start]: #frame-start
+[frame_end]: #frame-end
+[windows_name]: #window-clause
+[window_spec]: #window-specification
+[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
+[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/
+[GitHub]: https://github.com
+[PostreSQL]: https://www.postgresql.org/docs/9.2/tutorial-window.html
+[MySQL]: https://dev.mysql.com/doc/refman/8.0/en/window-functions.html
+''')
diff --git a/tests/testflows/window_functions/tests/__init__.py b/tests/testflows/window_functions/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/testflows/window_functions/tests/aggregate_funcs.py b/tests/testflows/window_functions/tests/aggregate_funcs.py
new file mode 100644
index 00000000000..67a5f2cfb4f
--- /dev/null
+++ b/tests/testflows/window_functions/tests/aggregate_funcs.py
@@ -0,0 +1,331 @@
+from testflows.core import *
+from testflows.asserts import values, error, snapshot
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestOutline(Scenario)
+@Examples("func", [
+   ("count(salary)",),
+   ("min(salary)",),
+   ("max(salary)",),
+   ("sum(salary)",),
+   ("avg(salary)",),
+   ("any(salary)",),
+   ("stddevPop(salary)",),
+   ("stddevSamp(salary)",),
+   ("varPop(salary)",),
+   ("varSamp(salary)",),
+   ("covarPop(salary, 2000)",),
+   ("covarSamp(salary, 2000)",),
+   ("anyHeavy(salary)",),
+   ("anyLast(salary)",),
+   ("argMin(salary, 5000)",),
+   ("argMax(salary, 5000)",),
+   ("avgWeighted(salary, 1)",),
+   ("corr(salary, 0.5)",),
+   ("topK(salary)",),
+   ("topKWeighted(salary, 1)",),
+   ("groupArray(salary)",),
+   ("groupUniqArray(salary)",),
+   ("groupArrayInsertAt(salary, 0)",),
+   ("groupArrayMovingSum(salary)",),
+   ("groupArrayMovingAvg(salary)",),
+   ("groupArraySample(3, 1234)(salary)",),
+   ("groupBitAnd(toUInt8(salary))",),
+   ("groupBitOr(toUInt8(salary))",),
+   ("groupBitXor(toUInt8(salary))",),
+   ("groupBitmap(toUInt8(salary))",),
+   # #("groupBitmapAnd",),
+   # #("groupBitmapOr",),
+   # #("groupBitmapXor",),
+   ("sumWithOverflow(salary)",),
+   ("deltaSum(salary)",),
+   ("sumMap([5000], [salary])",),
+   ("minMap([5000], [salary])",),
+   ("maxMap([5000], [salary])",),
+   # #("initializeAggregation",),
+   ("skewPop(salary)",),
+   ("skewSamp(salary)",),
+   ("kurtPop(salary)",),
+   ("kurtSamp(salary)",),
+   ("uniq(salary)",),
+   ("uniqExact(salary)",),
+   ("uniqCombined(salary)",),
+   ("uniqCombined64(salary)",),
+   ("uniqHLL12(salary)",),
+   ("quantile(salary)",),
+   ("quantiles(0.5)(salary)",),
+   ("quantileExact(salary)",),
+   ("quantileExactWeighted(salary, 1)",),
+   ("quantileTiming(salary)",),
+   ("quantileTimingWeighted(salary, 1)",),
+   ("quantileDeterministic(salary, 1234)",),
+   ("quantileTDigest(salary)",),
+   ("quantileTDigestWeighted(salary, 1)",),
+   ("simpleLinearRegression(salary, empno)",),
+   ("stochasticLinearRegression(salary, 1)",),
+   ("stochasticLogisticRegression(salary, 1)",),
+   #("categoricalInformationValue(salary, 0)",),
+   ("studentTTest(salary, 1)",),
+   ("welchTTest(salary, 1)",),
+   ("mannWhitneyUTest(salary, 1)",),
+   ("median(salary)",),
+   ("rankCorr(salary, 0.5)",),
+])
+def aggregate_funcs_over_rows_frame(self, func):
+    """Checking aggregate funcs over rows frame.
+    """
+    execute_query(f"""
+        SELECT {func} OVER (ORDER BY salary, empno ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS func
+          FROM empsalary
+        """
+    )
+
+@TestScenario
+def avg_with_nulls(self):
+    """Check `avg` aggregate function using a window that contains NULLs.
+    """
+    expected = convert_output("""
+         i |        avg
+        ---+--------------------
+         1 | 1.5
+         2 | 2
+         3 | \\N
+         4 | \\N
+    """)
+
+    execute_query("""
+        SELECT i, avg(v) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS avg
+          FROM values('i Int32, v Nullable(Int32)', (1,1),(2,2),(3,NULL),(4,NULL))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def var_pop(self):
+    """Check `var_pop` aggregate function ove a window.
+    """
+    expected = convert_output("""
+            var_pop
+    -----------------------
+        21704
+        13868.75
+        11266.666666666666
+        4225
+        0
+    """)
+
+    execute_query("""
+        SELECT VAR_POP(n) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS var_pop
+          FROM values('i Int8, n Int32', (1,600),(2,470),(3,170),(4,430),(5,300))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def var_samp(self):
+    """Check `var_samp` aggregate function ove a window.
+    """
+    expected = convert_output("""
+          var_samp
+    -----------------------
+        27130
+        18491.666666666668
+        16900
+        8450
+        nan
+    """)
+
+    execute_query("""
+        SELECT VAR_SAMP(n) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS var_samp
+          FROM VALUES('i Int8, n Int16',(1,600),(2,470),(3,170),(4,430),(5,300))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def stddevpop(self):
+    """Check `stddevPop` aggregate function ove a window.
+    """
+    expected = convert_output("""
+             stddev_pop
+    ---------------------
+        147.32277488562318
+        147.32277488562318
+        117.76565713313877
+        106.14455552060438
+        65
+        0
+    """)
+
+    execute_query("""
+        SELECT stddevPop(n) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS stddev_pop
+          FROM VALUES('i Int8, n Nullable(Int16)',(1,NULL),(2,600),(3,470),(4,170),(5,430),(6,300))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def stddevsamp(self):
+    """Check `stddevSamp` aggregate function ove a window.
+    """
+    expected = convert_output("""
+         stddev_samp
+    ---------------------
+        164.7118696390761
+        164.7118696390761
+        135.9840676942217
+        130
+        91.92388155425118
+           nan
+    """)
+
+    execute_query("""
+        SELECT stddevSamp(n) OVER (ORDER BY i ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS stddev_samp
+          FROM VALUES('i Int8, n Nullable(Int16)',(1,NULL),(2,600),(3,470),(4,170),(5,430),(6,300))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def aggregate_function_recovers_from_nan(self):
+    """Check that aggregate function can recover from `nan` value inside a window.
+    """
+    expected = convert_output("""
+         a |  b  | sum
+        ---+-----+-----
+         1 |   1 |   1
+         2 |   2 |   3
+         3 | nan | nan
+         4 |   3 | nan
+         5 |   4 |   7
+    """)
+
+    execute_query("""
+        SELECT a, b,
+               SUM(b) OVER(ORDER BY a ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS sum
+        FROM VALUES('a Int8, b Float64',(1,1),(2,2),(3,nan),(4,3),(5,4))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def bit_functions(self):
+    """Check trying to use bitwise functions over a window.
+    """
+    expected = convert_output("""
+     i | b | bool_and | bool_or
+    ---+---+----------+---------
+     1 | 1 | 1        | 1
+     2 | 1 | 0        | 1
+     3 | 0 | 0        | 0
+     4 | 0 | 0        | 1
+     5 | 1 | 1        | 1
+    """)
+
+    execute_query("""
+        SELECT i, b, groupBitAnd(b) OVER w AS bool_and, groupBitOr(b) OVER w AS bool_or
+          FROM VALUES('i Int8, b UInt8', (1,1), (2,1), (3,0), (4,0), (5,1))
+          WINDOW w AS (ORDER BY i ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def sum(self):
+    """Check calculation of sum over a window.
+    """
+    expected = convert_output("""
+     sum_1 | ten | four
+    -------+-----+------
+         0 |   0 |    0
+         0 |   0 |    0
+         2 |   0 |    2
+         3 |   1 |    3
+         4 |   1 |    1
+         5 |   1 |    1
+         3 |   3 |    3
+         0 |   4 |    0
+         1 |   7 |    1
+         1 |   9 |    1
+    """)
+
+    execute_query(
+        "SELECT sum(four) OVER (PARTITION BY ten ORDER BY unique2) AS sum_1, ten, four FROM tenk1 WHERE unique2 < 10",
+        expected=expected
+    )
+
+@TestScenario
+def nested_aggregates(self):
+    """Check using nested aggregates over a window.
+    """
+    expected = convert_output("""
+     ten | two | gsum  |  wsum
+    -----+-----+-------+--------
+       0 |   0 | 45000 |  45000
+       2 |   0 | 47000 |  92000
+       4 |   0 | 49000 | 141000
+       6 |   0 | 51000 | 192000
+       8 |   0 | 53000 | 245000
+       1 |   1 | 46000 |  46000
+       3 |   1 | 48000 |  94000
+       5 |   1 | 50000 | 144000
+       7 |   1 | 52000 | 196000
+       9 |   1 | 54000 | 250000
+    """)
+
+    execute_query(
+        "SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum FROM tenk1 GROUP BY ten, two",
+        expected=expected
+    )
+
+@TestScenario
+def aggregate_and_window_function_in_the_same_window(self):
+    """Check using aggregate and window function in the same window.
+    """
+    expected = convert_output("""
+      sum  | rank
+    -------+------
+      6000 |    1
+     16400 |    2
+     16400 |    2
+     20900 |    4
+     25100 |    5
+      3900 |    1
+      7400 |    2
+      5000 |    1
+     14600 |    2
+     14600 |    2
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum, rank() OVER w AS rank FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary DESC)",
+        expected=expected
+    )
+
+@TestScenario
+def ungrouped_aggregate_over_empty_row_set(self):
+    """Check using window function with ungrouped aggregate over an empty row set.
+    """
+    expected = convert_output("""
+    sum
+    -----
+       0
+    """)
+
+    execute_query(
+        "SELECT SUM(COUNT(number)) OVER () AS sum FROM numbers(10) WHERE number=42",
+        expected=expected
+    )
+
+@TestFeature
+@Name("aggregate funcs")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions("1.0")
+)
+def feature(self):
+    """Check using aggregate functions over windows.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/common.py b/tests/testflows/window_functions/tests/common.py
new file mode 100644
index 00000000000..ef694b19a0e
--- /dev/null
+++ b/tests/testflows/window_functions/tests/common.py
@@ -0,0 +1,404 @@
+import os
+import re
+import uuid
+import tempfile
+
+from testflows.core import *
+from testflows.core.name import basename, parentname
+from testflows._core.testtype import TestSubType
+from testflows.asserts import values, error, snapshot
+
+def window_frame_error():
+    return (36, "Exception: Window frame")
+
+def frame_start_error():
+    return (36, "Exception: Frame start")
+
+def frame_end_error():
+    return (36, "Exception: Frame end")
+
+def frame_offset_nonnegative_error():
+    return syntax_error()
+
+def frame_end_unbounded_preceding_error():
+    return (36, "Exception: Frame end cannot be UNBOUNDED PRECEDING")
+
+def frame_range_offset_error():
+    return (48, "Exception: The RANGE OFFSET frame")
+
+def frame_requires_order_by_error():
+    return (36, "Exception: The RANGE OFFSET window frame requires exactly one ORDER BY column, 0 given")
+
+def syntax_error():
+    return (62, "Exception: Syntax error")
+
+def groups_frame_error():
+    return (48, "Exception: Window frame 'GROUPS' is not implemented")
+
+def getuid():
+    if current().subtype == TestSubType.Example:
+        testname = f"{basename(parentname(current().name)).replace(' ', '_').replace(',','')}"
+    else:
+        testname = f"{basename(current().name).replace(' ', '_').replace(',','')}"
+    return testname + "_" + str(uuid.uuid1()).replace('-', '_')
+
+def convert_output(s):
+    """Convert expected output to TSV format.
+    """
+    return '\n'.join([l.strip() for i, l in enumerate(re.sub('\s+\|\s+', '\t', s).strip().splitlines()) if i != 1])
+
+def execute_query(sql, expected=None, exitcode=None, message=None, format="TabSeparatedWithNames"):
+    """Execute SQL query and compare the output to the snapshot.
+    """
+    name = basename(current().name)
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql + " FORMAT " + format, exitcode=exitcode, message=message)
+
+    if message is None:
+        if expected is not None:
+            with Then("I check output against expected"):
+                assert r.output.strip() == expected, error()
+        else:
+            with Then("I check output against snapshot"):
+                with values() as that:
+                    assert that(snapshot("\n" + r.output.strip() + "\n", "tests", name=name, encoder=str)), error()
+
+@TestStep(Given)
+def t1_table(self, name="t1", distributed=False):
+    """Create t1 table.
+    """
+    table = None
+    data = [
+        "(1, 1)",
+        "(1, 2)",
+        "(2, 2)"
+    ]
+
+    if not distributed:
+        with By("creating table"):
+            sql = """
+                CREATE TABLE {name} (
+                    f1 Int8,
+                    f2 Int8
+                ) ENGINE = MergeTree ORDER BY tuple()
+                """
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            sql = f"INSERT INTO {name} VALUES {','.join(data)}"
+            self.context.node.query(sql)
+
+    else:
+        with By("creating table"):
+            sql = """
+                CREATE TABLE {name} ON CLUSTER sharded_cluster (
+                    f1 Int8,
+                    f2 Int8
+                ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{{shard}}/{name}', '{{replica}}') ORDER BY tuple()
+                """
+            create_table(name=name + "_source", statement=sql, on_cluster="sharded_cluster")
+
+        with And("a distributed table"):
+            sql = "CREATE TABLE {name} AS " + name + '_source' + " ENGINE = Distributed(sharded_cluster, default, " + f"{name + '_source'}, f1 % toUInt8(getMacro('shard')))"
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            for row in data:
+                sql = f"INSERT INTO {name} VALUES {row}"
+                self.context.node.query(sql)
+
+    return table
+
+@TestStep(Given)
+def datetimes_table(self, name="datetimes", distributed=False):
+    """Create datetimes table.
+    """
+    table = None
+    data = [
+        "(1, '2000-10-19 10:23:54', '2000-10-19 10:23:54')",
+        "(2, '2001-10-19 10:23:54', '2001-10-19 10:23:54')",
+        "(3, '2001-10-19 10:23:54', '2001-10-19 10:23:54')",
+        "(4, '2002-10-19 10:23:54', '2002-10-19 10:23:54')",
+        "(5, '2003-10-19 10:23:54', '2003-10-19 10:23:54')",
+        "(6, '2004-10-19 10:23:54', '2004-10-19 10:23:54')",
+        "(7, '2005-10-19 10:23:54', '2005-10-19 10:23:54')",
+        "(8, '2006-10-19 10:23:54', '2006-10-19 10:23:54')",
+        "(9, '2007-10-19 10:23:54', '2007-10-19 10:23:54')",
+        "(10, '2008-10-19 10:23:54', '2008-10-19 10:23:54')"
+    ]
+
+    if not distributed:
+        with By("creating table"):
+            sql = """
+            CREATE TABLE {name} (
+                id UInt32,
+                f_timestamptz DateTime('CET'),
+                f_timestamp DateTime
+            ) ENGINE = MergeTree() ORDER BY tuple()
+            """
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            sql = f"INSERT INTO {name} VALUES {','.join(data)}"
+            self.context.node.query(sql)
+
+    else:
+        with By("creating table"):
+            sql = """
+            CREATE TABLE {name} ON CLUSTER sharded_cluster (
+                id UInt32,
+                f_timestamptz DateTime('CET'),
+                f_timestamp DateTime
+            ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{{shard}}/{name}', '{{replica}}') ORDER BY tuple()
+            """
+            create_table(name=name + "_source", statement=sql, on_cluster="sharded_cluster")
+
+        with And("a distributed table"):
+            sql = "CREATE TABLE {name} AS " + name + '_source' + " ENGINE = Distributed(sharded_cluster, default, " + f"{name + '_source'}, id % toUInt8(getMacro('shard')))"
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            for row in data:
+                sql = f"INSERT INTO {name} VALUES {row}"
+                self.context.node.query(sql)
+
+    return table
+
+@TestStep(Given)
+def numerics_table(self, name="numerics", distributed=False):
+    """Create numerics tables.
+    """
+    table = None
+
+    data = [
+        "(0, '-infinity', '-infinity', toDecimal64(-1000,15))",
+        "(1, -3, -3, -3)",
+        "(2, -1, -1, -1)",
+        "(3, 0, 0, 0)",
+        "(4, 1.1, 1.1, 1.1)",
+        "(5, 1.12, 1.12, 1.12)",
+        "(6, 2, 2, 2)",
+        "(7, 100, 100, 100)",
+        "(8, 'infinity', 'infinity', toDecimal64(1000,15))",
+        "(9, 'NaN', 'NaN', 0)"
+    ]
+
+    if not distributed:
+        with By("creating a table"):
+            sql = """
+                CREATE TABLE {name} (
+                    id Int32,
+                    f_float4 Float32,
+                    f_float8 Float64,
+                    f_numeric Decimal64(15)
+                ) ENGINE = MergeTree() ORDER BY tuple();
+            """
+            create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            sql = f"INSERT INTO {name} VALUES {','.join(data)}"
+            self.context.node.query(sql)
+
+    else:
+        with By("creating a table"):
+            sql = """
+                CREATE TABLE {name} ON CLUSTER sharded_cluster (
+                    id Int32,
+                    f_float4 Float32,
+                    f_float8 Float64,
+                    f_numeric Decimal64(15)
+                ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{{shard}}/{name}', '{{replica}}') ORDER BY tuple();
+            """
+            create_table(name=name + "_source", statement=sql, on_cluster="sharded_cluster")
+
+        with And("a distributed table"):
+            sql = "CREATE TABLE {name} AS " + name + '_source' + " ENGINE = Distributed(sharded_cluster, default, " + f"{name + '_source'}, id % toUInt8(getMacro('shard')))"
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            for row in data:
+                sql = f"INSERT INTO {name} VALUES {row}"
+                self.context.node.query(sql)
+
+    return table
+
+@TestStep(Given)
+def tenk1_table(self, name="tenk1", distributed=False):
+    """Create tenk1 table.
+    """
+    table = None
+
+    if not distributed:
+        with By("creating a table"):
+            sql = """
+            CREATE TABLE {name} (
+                unique1             Int32,
+                unique2             Int32,
+                two                 Int32,
+                four                Int32,
+                ten                 Int32,
+                twenty              Int32,
+                hundred             Int32,
+                thousand            Int32,
+                twothousand         Int32,
+                fivethous           Int32,
+                tenthous            Int32,
+                odd                 Int32,
+                even                Int32,
+                stringu1            String,
+                stringu2            String,
+                string4             String
+            )  ENGINE = MergeTree() ORDER BY tuple()
+            """
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            datafile = os.path.join(current_dir(), "tenk.data")
+            debug(datafile)
+            self.context.cluster.command(None, f"cat \"{datafile}\" | {self.context.node.cluster.docker_compose} exec -T {self.context.node.name} clickhouse client -q \"INSERT INTO {name} FORMAT TSV\"", exitcode=0)
+    else:
+        with By("creating a table"):
+            sql = """
+            CREATE TABLE {name} ON CLUSTER sharded_cluster (
+                unique1             Int32,
+                unique2             Int32,
+                two                 Int32,
+                four                Int32,
+                ten                 Int32,
+                twenty              Int32,
+                hundred             Int32,
+                thousand            Int32,
+                twothousand         Int32,
+                fivethous           Int32,
+                tenthous            Int32,
+                odd                 Int32,
+                even                Int32,
+                stringu1            String,
+                stringu2            String,
+                string4             String
+            )  ENGINE = ReplicatedMergeTree('/clickhouse/tables/{{shard}}/{name}', '{{replica}}') ORDER BY tuple()
+            """
+            create_table(name=name + '_source', statement=sql, on_cluster="sharded_cluster")
+
+        with And("a distributed table"):
+            sql = "CREATE TABLE {name} AS " + name + '_source' + " ENGINE = Distributed(sharded_cluster, default, " + f"{name + '_source'}, unique1 % toUInt8(getMacro('shard')))"
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            datafile = os.path.join(current_dir(), "tenk.data")
+
+            with open(datafile, "r") as file:
+                lines = file.readlines()
+
+            chunks = [lines[i:i + 1000] for i in range(0, len(lines), 1000)]
+
+            for chunk in chunks:
+                with tempfile.NamedTemporaryFile() as file:
+                    file.write(''.join(chunk).encode("utf-8"))
+                    file.flush()
+                    self.context.cluster.command(None,
+                        f"cat \"{file.name}\" | {self.context.node.cluster.docker_compose} exec -T {self.context.node.name} clickhouse client -q \"INSERT INTO {table} FORMAT TSV\"",
+                        exitcode=0)
+
+    return table
+
+@TestStep(Given)
+def empsalary_table(self, name="empsalary", distributed=False):
+    """Create employee salary reference table.
+    """
+    table = None
+
+    data = [
+        "('develop', 10, 5200, '2007-08-01')",
+        "('sales', 1, 5000, '2006-10-01')",
+        "('personnel', 5, 3500, '2007-12-10')",
+        "('sales', 4, 4800, '2007-08-08')",
+        "('personnel', 2, 3900, '2006-12-23')",
+        "('develop', 7, 4200, '2008-01-01')",
+        "('develop', 9, 4500, '2008-01-01')",
+        "('sales', 3, 4800, '2007-08-01')",
+        "('develop', 8, 6000, '2006-10-01')",
+        "('develop', 11, 5200, '2007-08-15')"
+    ]
+
+    if not distributed:
+        with By("creating a table"):
+            sql = """
+            CREATE TABLE {name} (
+                depname LowCardinality(String),
+                empno  UInt64,
+                salary Int32,
+                enroll_date Date
+                )
+            ENGINE = MergeTree() ORDER BY enroll_date
+            """
+            table = create_table(name=name, statement=sql)
+
+        with And("populating table with data"):
+            sql = f"INSERT INTO {name} VALUES {','.join(data)}"
+            self.context.node.query(sql)
+
+    else:
+        with By("creating replicated source tables"):
+                sql = """
+                CREATE TABLE {name} ON CLUSTER sharded_cluster (
+                    depname LowCardinality(String),
+                    empno  UInt64,
+                    salary Int32,
+                    enroll_date Date
+                    )
+                ENGINE = ReplicatedMergeTree('/clickhouse/tables/{{shard}}/{name}', '{{replica}}') ORDER BY enroll_date
+                """
+                create_table(name=name + "_source", statement=sql, on_cluster="sharded_cluster")
+
+        with And("a distributed table"):
+            sql = "CREATE TABLE {name} AS " + name + '_source' + " ENGINE = Distributed(sharded_cluster, default, " + f"{name + '_source'}, empno % toUInt8(getMacro('shard')))"
+            table = create_table(name=name, statement=sql)
+
+        with And("populating distributed table with data"):
+            with By("inserting one data row at a time", description="so that data is sharded between nodes"):
+                for row in data:
+                    self.context.node.query(f"INSERT INTO {table} VALUES {row}",
+                                            settings=[("insert_distributed_sync", "1")])
+
+    with And("dumping all the data in the table"):
+        self.context.node.query(f"SELECT * FROM {table}")
+
+    return table
+
+@TestStep(Given)
+def create_table(self, name, statement, on_cluster=False):
+    """Create table.
+    """
+    node = current().context.node
+    try:
+        with Given(f"I have a {name} table"):
+            node.query(statement.format(name=name))
+        yield name
+    finally:
+        with Finally("I drop the table"):
+            if on_cluster:
+                node.query(f"DROP TABLE IF EXISTS {name} ON CLUSTER {on_cluster}")
+            else:
+                node.query(f"DROP TABLE IF EXISTS {name}")
+
+@TestStep(Given)
+def allow_experimental_window_functions(self):
+    """Set allow_experimental_window_functions = 1
+    """
+    setting = ("allow_experimental_window_functions", 1)
+    default_query_settings = None
+
+    try:
+        with By("adding allow_experimental_window_functions to the default query settings"):
+            default_query_settings = getsattr(current().context, "default_query_settings", [])
+            default_query_settings.append(setting)
+        yield
+    finally:
+        with Finally("I remove allow_experimental_window_functions from the default query settings"):
+            if default_query_settings:
+                try:
+                    default_query_settings.pop(default_query_settings.index(setting))
+                except ValueError:
+                    pass
diff --git a/tests/testflows/window_functions/tests/errors.py b/tests/testflows/window_functions/tests/errors.py
new file mode 100644
index 00000000000..0935c00885d
--- /dev/null
+++ b/tests/testflows/window_functions/tests/errors.py
@@ -0,0 +1,137 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def error_using_non_window_function(self):
+    """Check that trying to use non window or aggregate function over a window
+    returns an error.
+    """
+    exitcode = 63
+    message = "DB::Exception: Unknown aggregate function numbers"
+
+    sql = ("SELECT numbers(1, 100) OVER () FROM empsalary")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_order_by_another_window_function(self):
+    """Check that trying to order by another window function returns an error.
+    """
+    exitcode = 184
+    message = "DB::Exception: Window function rank() OVER (ORDER BY random() ASC) is found inside window definition in query"
+
+    sql = ("SELECT rank() OVER (ORDER BY rank() OVER (ORDER BY random()))")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_window_function_in_where(self):
+    """Check that trying to use window function in `WHERE` returns an error.
+    """
+    exitcode = 184
+    message = "DB::Exception: Window function row_number() OVER (ORDER BY salary ASC) is found in WHERE in query"
+
+    sql = ("SELECT * FROM empsalary WHERE row_number() OVER (ORDER BY salary) < 10")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_window_function_in_join(self):
+    """Check that trying to use window function in `JOIN` returns an error.
+    """
+    exitcode = 48
+    message = "DB::Exception: JOIN ON inequalities are not supported. Unexpected 'row_number() OVER (ORDER BY salary ASC) < 10"
+
+    sql = ("SELECT * FROM empsalary INNER JOIN tenk1 ON row_number() OVER (ORDER BY salary) < 10")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_window_function_in_group_by(self):
+    """Check that trying to use window function in `GROUP BY` returns an error.
+    """
+    exitcode = 47
+    message = "DB::Exception: Unknown identifier: row_number() OVER (ORDER BY salary ASC); there are columns"
+
+    sql = ("SELECT rank() OVER (ORDER BY 1), count(*) FROM empsalary GROUP BY row_number() OVER (ORDER BY salary) < 10")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_window_function_in_having(self):
+    """Check that trying to use window function in `HAVING` returns an error.
+    """
+    exitcode = 184
+    message = "DB::Exception: Window function row_number() OVER (ORDER BY salary ASC) is found in HAVING in query"
+
+    sql = ("SELECT rank() OVER (ORDER BY 1), count(*) FROM empsalary GROUP BY salary HAVING row_number() OVER (ORDER BY salary) < 10")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_select_from_window(self):
+    """Check that trying to use window function in `FROM` returns an error.
+    """
+    exitcode = 46
+    message = "DB::Exception: Unknown table function rank"
+
+    sql = ("SELECT * FROM rank() OVER (ORDER BY random())")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_window_function_in_alter_delete_where(self):
+    """Check that trying to use window function in `ALTER DELETE`'s `WHERE` clause returns an error.
+    """
+    if self.context.distributed:
+        exitcode = 48
+        message = "Exception: Table engine Distributed doesn't support mutations"
+    else:
+        exitcode = 184
+        message = "DB::Exception: Window function rank() OVER (ORDER BY random() ASC) is found in WHERE in query"
+
+    sql = ("ALTER TABLE empsalary DELETE WHERE (rank() OVER (ORDER BY random())) > 10")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_named_window_defined_twice(self):
+    """Check that trying to define named window twice.
+    """
+    exitcode = 36
+    message = "DB::Exception: Window 'w' is defined twice in the WINDOW clause"
+
+    sql = ("SELECT count(*) OVER w FROM tenk1 WINDOW w AS (ORDER BY unique1), w AS (ORDER BY unique1)")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_coma_between_partition_by_and_order_by_clause(self):
+    """Check that trying to use a coma between partition by and order by clause.
+    """
+    exitcode = 62
+    message = "DB::Exception: Syntax error"
+
+    sql = ("SELECT rank() OVER (PARTITION BY four, ORDER BY ten) FROM tenk1")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestFeature
+@Name("errors")
+def feature(self):
+    """Check different error conditions.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/feature.py b/tests/testflows/window_functions/tests/feature.py
new file mode 100755
index 00000000000..124660e8802
--- /dev/null
+++ b/tests/testflows/window_functions/tests/feature.py
@@ -0,0 +1,47 @@
+from testflows.core import *
+
+from window_functions.tests.common import *
+from window_functions.requirements import *
+
+
+@TestOutline(Feature)
+@Name("tests")
+@Examples("distributed", [
+    (False, Name("non distributed"),Requirements(RQ_SRS_019_ClickHouse_WindowFunctions_NonDistributedTables("1.0"))),
+    (True, Name("distributed"), Requirements(RQ_SRS_019_ClickHouse_WindowFunctions_DistributedTables("1.0")))
+])
+def feature(self, distributed, node="clickhouse1"):
+    """Check window functions behavior using non-distributed or
+    distributed tables.
+    """
+    self.context.distributed = distributed
+    self.context.node = self.context.cluster.node(node)
+
+    with Given("I allow experimental window functions"):
+        allow_experimental_window_functions()
+
+    with And("employee salary table"):
+        empsalary_table(distributed=distributed)
+
+    with And("tenk1 table"):
+        tenk1_table(distributed=distributed)
+
+    with And("numerics table"):
+        numerics_table(distributed=distributed)
+
+    with And("datetimes table"):
+        datetimes_table(distributed=distributed)
+
+    with And("t1 table"):
+        t1_table(distributed=distributed)
+
+    Feature(run=load("window_functions.tests.window_spec", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.partition_clause", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.order_clause", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.frame_clause", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.window_clause", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.over_clause", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.funcs", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.aggregate_funcs", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.errors", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.misc", "feature"), flags=TE)
diff --git a/tests/testflows/window_functions/tests/frame_clause.py b/tests/testflows/window_functions/tests/frame_clause.py
new file mode 100644
index 00000000000..ac3ca90abec
--- /dev/null
+++ b/tests/testflows/window_functions/tests/frame_clause.py
@@ -0,0 +1,29 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestFeature
+@Name("frame clause")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_FrameClause("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Extent("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Start("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_Frame_End("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_Frame_Between("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_CurrentRow("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_UnboundedPreceding("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_UnboundedFollowing("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_ExprPreceding("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_ExprFollowing("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_ExprPreceding_ExprValue("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_ExprFollowing_ExprValue("1.0")
+)
+def feature(self):
+    """Check defining frame clause.
+    """
+    Feature(run=load("window_functions.tests.rows_frame", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.range_frame", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.range_overflow", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.range_datetime", "feature"), flags=TE)
+    Feature(run=load("window_functions.tests.range_errors", "feature"), flags=TE)
\ No newline at end of file
diff --git a/tests/testflows/window_functions/tests/funcs.py b/tests/testflows/window_functions/tests/funcs.py
new file mode 100644
index 00000000000..c4b9f6d73c0
--- /dev/null
+++ b/tests/testflows/window_functions/tests/funcs.py
@@ -0,0 +1,456 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_FirstValue("1.0")
+)
+def first_value(self):
+    """Check `first_value` function.
+    """
+    expected = convert_output("""
+     first_value | ten | four
+    -------------+-----+------
+               0 |   0 |    0
+               0 |   0 |    0
+               0 |   4 |    0
+               1 |   1 |    1
+               1 |   1 |    1
+               1 |   7 |    1
+               1 |   9 |    1
+               0 |   0 |    2
+               1 |   1 |    3
+               1 |   3 |    3
+    """)
+
+    with Example("using first_value"):
+        execute_query(
+            "SELECT first_value(ten) OVER (PARTITION BY four ORDER BY ten) AS first_value, ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+    with Example("using any equivalent"):
+        execute_query(
+            "SELECT any(ten) OVER (PARTITION BY four ORDER BY ten) AS first_value, ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_LastValue("1.0")
+)
+def last_value(self):
+    """Check `last_value` function.
+    """
+    with Example("order by window", description="""
+        Check that last_value returns the last row of the frame that is CURRENT ROW in ORDER BY window
+        """):
+        expected = convert_output("""
+         last_value | ten | four
+        ------------+-----+------
+               0    |  0  |  0
+               0    |  0  |  0
+               2    |  0  |  2
+               1    |  1  |  1
+               1    |  1  |  1
+               3    |  1  |  3
+               3    |  3  |  3
+               0    |  4  |  0
+               1    |  7  |  1
+               1    |  9  |  1
+        """)
+
+        with Check("using last_value"):
+            execute_query(
+                "SELECT last_value(four) OVER (ORDER BY ten, four) AS last_value, ten, four FROM tenk1 WHERE unique2 < 10",
+                expected=expected
+            )
+
+        with Check("using anyLast() equivalent"):
+            execute_query(
+                "SELECT anyLast(four) OVER (ORDER BY ten, four) AS last_value, ten, four FROM tenk1 WHERE unique2 < 10",
+                expected=expected
+            )
+
+    with Example("partition by window", description="""
+            Check that last_value returns the last row of the frame that is CURRENT ROW in ORDER BY window
+            """):
+        expected = convert_output("""
+         last_value | ten | four
+        ------------+-----+------
+                  4 |   0 |    0
+                  4 |   0 |    0
+                  4 |   4 |    0
+                  9 |   1 |    1
+                  9 |   1 |    1
+                  9 |   7 |    1
+                  9 |   9 |    1
+                  0 |   0 |    2
+                  3 |   1 |    3
+                  3 |   3 |    3
+        """)
+
+        with Check("using last_value"):
+            execute_query(
+                """SELECT last_value(ten) OVER (PARTITION BY four) AS last_value, ten, four FROM
+                (SELECT * FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten)
+                ORDER BY four, ten""",
+                expected=expected
+            )
+
+        with Check("using anyLast() equivalent"):
+            execute_query(
+                """SELECT anyLast(ten) OVER (PARTITION BY four) AS last_value, ten, four FROM
+                (SELECT * FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten)
+                ORDER BY four, ten""",
+                expected=expected
+            )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_Lag_Workaround("1.0")
+)
+def lag(self):
+    """Check `lag` function workaround.
+    """
+    with Example("anyOrNull"):
+        expected = convert_output("""
+         lag | ten | four
+        -----+-----+------
+         \\N |   0 |    0
+           0 |   0 |    0
+           0 |   4 |    0
+         \\N |   1 |    1
+           1 |   1 |    1
+           1 |   7 |    1
+           7 |   9 |    1
+         \\N |   0 |    2
+         \\N |   1 |    3
+           1 |   3 |    3
+        """)
+
+        execute_query(
+            "SELECT anyOrNull(ten) OVER (PARTITION BY four ORDER BY ten ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS lag , ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+    with Example("any"):
+        expected = convert_output("""
+         lag | ten | four
+        -----+-----+------
+           0 |   0 |    0
+           0 |   0 |    0
+           0 |   4 |    0
+           0 |   1 |    1
+           1 |   1 |    1
+           1 |   7 |    1
+           7 |   9 |    1
+           0 |   0 |    2
+           0 |   1 |    3
+           1 |   3 |    3
+        """)
+
+        execute_query(
+            "SELECT any(ten) OVER (PARTITION BY four ORDER BY ten ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS lag , ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+    with Example("anyOrNull with column value as offset"):
+        expected = convert_output("""
+         lag | ten | four
+        -----+-----+------
+           0 |   0 |    0
+           0 |   0 |    0
+           4 |   4 |    0
+         \\N |   1 |    1
+           1 |   1 |    1
+           1 |   7 |    1
+           7 |   9 |    1
+         \\N |   0 |    2
+         \\N |   1 |    3
+         \\N |   3 |    3
+        """)
+
+        execute_query(
+            "SELECT any(ten) OVER (PARTITION BY four ORDER BY ten ROWS BETWEEN four PRECEDING AND four PRECEDING) AS lag , ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_Lead_Workaround("1.0")
+)
+def lead(self):
+    """Check `lead` function workaround.
+    """
+    with Example("anyOrNull"):
+        expected = convert_output("""
+         lead | ten | four
+        ------+-----+------
+            0 |   0 |    0
+            4 |   0 |    0
+          \\N |   4 |    0
+            1 |   1 |    1
+            7 |   1 |    1
+            9 |   7 |    1
+          \\N |   9 |    1
+          \\N |   0 |    2
+            3 |   1 |    3
+          \\N |   3 |    3
+        """)
+
+        execute_query(
+            "SELECT anyOrNull(ten) OVER (PARTITION BY four ORDER BY ten ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) AS lead, ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+    with Example("any"):
+        expected = convert_output("""
+         lead | ten | four
+        ------+-----+------
+            0 |   0 |    0
+            4 |   0 |    0
+            0 |   4 |    0
+            1 |   1 |    1
+            7 |   1 |    1
+            9 |   7 |    1
+            0 |   9 |    1
+            0 |   0 |    2
+            3 |   1 |    3
+            0 |   3 |    3
+        """)
+
+        execute_query(
+            "SELECT any(ten) OVER (PARTITION BY four ORDER BY ten ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) AS lead, ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+    with Example("any with arithmetic expr"):
+        expected = convert_output("""
+         lead | ten | four
+        ------+-----+------
+            0 |   0 |    0
+            8 |   0 |    0
+            0 |   4 |    0
+            2 |   1 |    1
+           14 |   1 |    1
+           18 |   7 |    1
+            0 |   9 |    1
+            0 |   0 |    2
+            6 |   1 |    3
+            0 |   3 |    3
+        """)
+
+        execute_query(
+            "SELECT any(ten * 2) OVER (PARTITION BY four ORDER BY ten ROWS BETWEEN 1 FOLLOWING AND 1 FOLLOWING) AS lead, ten, four FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+    with Example("subquery as offset"):
+        expected = convert_output("""
+         lead
+        ------
+            0
+            0
+            4
+            1
+            7
+            9
+          \\N
+            0
+            3
+          \\N
+        """)
+
+        execute_query(
+            "SELECT anyNull(ten) OVER (PARTITION BY four ORDER BY ten ROWS BETWEEN  (SELECT two FROM tenk1 WHERE unique2 = unique2) FOLLOWING AND (SELECT two FROM tenk1 WHERE unique2 = unique2) FOLLOWING) AS lead "
+            "FROM tenk1 WHERE unique2 < 10",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowNumber("1.0")
+)
+def row_number(self):
+    """Check `row_number` function.
+    """
+    expected = convert_output("""
+     row_number
+    ------------
+              1
+              2
+              3
+              4
+              5
+              6
+              7
+              8
+              9
+             10
+    """)
+
+    execute_query(
+        "SELECT row_number() OVER (ORDER BY unique2) AS row_number FROM tenk1 WHERE unique2 < 10",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_Rank("1.0")
+)
+def rank(self):
+    """Check `rank` function.
+    """
+    expected = convert_output("""
+     rank_1 | ten | four
+    --------+-----+------
+          1 |   0 |    0
+          1 |   0 |    0
+          3 |   4 |    0
+          1 |   1 |    1
+          1 |   1 |    1
+          3 |   7 |    1
+          4 |   9 |    1
+          1 |   0 |    2
+          1 |   1 |    3
+          2 |   3 |    3
+    """)
+
+    execute_query(
+        "SELECT rank() OVER (PARTITION BY four ORDER BY ten) AS rank_1, ten, four FROM tenk1 WHERE unique2 < 10",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_DenseRank("1.0")
+)
+def dense_rank(self):
+    """Check `dense_rank` function.
+    """
+    expected = convert_output("""
+     dense_rank | ten | four
+    ------------+-----+------
+              1 |   0 |    0
+              1 |   0 |    0
+              2 |   4 |    0
+              1 |   1 |    1
+              1 |   1 |    1
+              2 |   7 |    1
+              3 |   9 |    1
+              1 |   0 |    2
+              1 |   1 |    3
+              2 |   3 |    3
+    """)
+
+    execute_query(
+        "SELECT dense_rank() OVER (PARTITION BY four ORDER BY ten) AS dense_rank, ten, four FROM tenk1 WHERE unique2 < 10",
+        expected=expected
+    )
+
+@TestScenario
+def last_value_with_no_frame(self):
+    """Check last_value function with no frame.
+    """
+    expected = convert_output("""
+     four | ten | sum | last_value
+    ------+-----+-----+------------
+        0 |   0 |   0 |          0
+        0 |   2 |   2 |          2
+        0 |   4 |   6 |          4
+        0 |   6 |  12 |          6
+        0 |   8 |  20 |          8
+        1 |   1 |   1 |          1
+        1 |   3 |   4 |          3
+        1 |   5 |   9 |          5
+        1 |   7 |  16 |          7
+        1 |   9 |  25 |          9
+        2 |   0 |   0 |          0
+        2 |   2 |   2 |          2
+        2 |   4 |   6 |          4
+        2 |   6 |  12 |          6
+        2 |   8 |  20 |          8
+        3 |   1 |   1 |          1
+        3 |   3 |   4 |          3
+        3 |   5 |   9 |          5
+        3 |   7 |  16 |          7
+        3 |   9 |  25 |          9
+    """)
+
+    execute_query(
+        "SELECT four, ten, sum(ten) over (partition by four order by ten) AS sum, "
+        "last_value(ten) over (partition by four order by ten) AS last_value "
+        "FROM (select distinct ten, four from tenk1)",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_LastValue("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_Lag_Workaround("1.0"),
+)
+def last_value_with_lag_workaround(self):
+    """Check last value with lag workaround.
+    """
+    expected = convert_output("""
+     last_value | lag  | salary
+    ------------+------+--------
+           4500 |    0 |   3500
+           4800 | 3500 |   3900
+           5200 | 3900 |   4200
+           5200 | 4200 |   4500
+           5200 | 4500 |   4800
+           5200 | 4800 |   4800
+           6000 | 4800 |   5000
+           6000 | 5000 |   5200
+           6000 | 5200 |   5200
+           6000 | 5200 |   6000
+    """)
+
+    execute_query(
+        "select last_value(salary) over(order by salary range between 1000 preceding and 1000 following) AS last_value, "
+        "any(salary) over(order by salary rows between 1 preceding and 1 preceding) AS lag, "
+        "salary from empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_FirstValue("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_Lead_Workaround("1.0")
+)
+def first_value_with_lead_workaround(self):
+    """Check first value with lead workaround.
+    """
+    expected = convert_output("""
+     first_value | lead | salary
+    -------------+------+--------
+            3500 | 3900 |   3500
+            3500 | 4200 |   3900
+            3500 | 4500 |   4200
+            3500 | 4800 |   4500
+            3900 | 4800 |   4800
+            3900 | 5000 |   4800
+            4200 | 5200 |   5000
+            4200 | 5200 |   5200
+            4200 | 6000 |   5200
+            5000 |    0 |   6000
+    """)
+
+    execute_query(
+        "select first_value(salary) over(order by salary range between 1000 preceding and 1000 following) AS first_value, "
+        "any(salary) over(order by salary rows between 1 following and 1 following) AS lead,"
+        "salary from empsalary",
+        expected=expected
+    )
+
+@TestFeature
+@Name("funcs")
+def feature(self):
+    """Check true window functions.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/misc.py b/tests/testflows/window_functions/tests/misc.py
new file mode 100644
index 00000000000..8251e751ed9
--- /dev/null
+++ b/tests/testflows/window_functions/tests/misc.py
@@ -0,0 +1,396 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def subquery_expr_preceding(self):
+    """Check using subquery expr in preceding.
+    """
+    expected = convert_output("""
+     sum | unique1
+    -----+---------
+       0 |       0
+       1 |       1
+       3 |       2
+       5 |       3
+       7 |       4
+       9 |       5
+      11 |       6
+      13 |       7
+      15 |       8
+      17 |       9
+    """)
+
+    execute_query(
+        "SELECT sum(unique1) over "
+        "(order by unique1 rows (SELECT unique1 FROM tenk1 ORDER BY unique1 LIMIT 1) + 1 PRECEDING) AS sum, "
+        "unique1 "
+        "FROM tenk1 WHERE unique1 < 10",
+        expected=expected
+    )
+
+@TestScenario
+def window_functions_in_select_expression(self):
+    """Check using multiple window functions in an expression.
+    """
+    expected = convert_output("""
+     cntsum
+    --------
+     22
+     22
+     87
+     24
+     24
+     82
+     92
+     51
+     92
+     136
+    """)
+
+    execute_query(
+        "SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + "
+        "sum(hundred) OVER (PARTITION BY four ORDER BY ten)) AS cntsum "
+        "FROM tenk1 WHERE unique2 < 10",
+        expected=expected
+    )
+
+@TestScenario
+def window_functions_in_subquery(self):
+    """Check using window functions in a subquery.
+    """
+    expected = convert_output("""
+     total | fourcount | twosum
+    -------+-----------+--------
+    """)
+
+    execute_query(
+        "SELECT * FROM ("
+        "  SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + "
+        "  sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, "
+        "  count(*) OVER (PARTITION BY four ORDER BY ten) AS fourcount, "
+        "  sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS twosum "
+        "  FROM tenk1 "
+        ") WHERE total <> fourcount + twosum",
+        expected=expected
+    )
+
+@TestScenario
+def group_by_and_one_window(self):
+    """Check running window function with group by and one window.
+    """
+    expected = convert_output("""
+     four | ten | sum  |          avg
+    ------+-----+------+------------------------
+        0 |   0 |    0 |     0
+        0 |   2 |    0 |     2
+        0 |   4 |    0 |     4
+        0 |   6 |    0 |     6
+        0 |   8 |    0 |     8
+        1 |   1 | 2500 |     1
+        1 |   3 | 2500 |     3
+        1 |   5 | 2500 |     5
+        1 |   7 | 2500 |     7
+        1 |   9 | 2500 |     9
+        2 |   0 | 5000 |     0
+        2 |   2 | 5000 |     2
+        2 |   4 | 5000 |     4
+        2 |   6 | 5000 |     6
+        2 |   8 | 5000 |     8
+        3 |   1 | 7500 |     1
+        3 |   3 | 7500 |     3
+        3 |   5 | 7500 |     5
+        3 |   7 | 7500 |     7
+        3 |   9 | 7500 |     9
+    """)
+
+    execute_query(
+        "SELECT four, ten, SUM(SUM(four)) OVER (PARTITION BY four) AS sum, AVG(ten) AS avg FROM tenk1 GROUP BY four, ten ORDER BY four, ten",
+        expected=expected,
+    )
+
+@TestScenario
+def group_by_and_multiple_windows(self):
+    """Check running window function with group by and multiple windows.
+    """
+    expected = convert_output("""
+      sum1 | row_number |  sum2
+    -------+------------+-------
+     25100 |          1 | 47100
+      7400 |          2 | 22000
+     14600 |          3 | 14600
+    """)
+
+    execute_query(
+        "SELECT sum(salary) AS sum1, row_number() OVER (ORDER BY depname) AS row_number, "
+        "sum(sum(salary)) OVER (ORDER BY depname DESC) AS sum2 "
+        "FROM empsalary GROUP BY depname",
+        expected=expected,
+    )
+
+@TestScenario
+def query_with_order_by_and_one_window(self):
+    """Check using a window function in the query that has `ORDER BY` clause.
+    """
+    expected = convert_output("""
+     depname   |    empno | salary |  rank
+     ----------+----------+--------+---------
+    sales      |    3     | 4800   |    1
+    personnel  |    5     | 3500   |    1
+    develop    |    7     | 4200   |    1
+    personnel  |    2     | 3900   |    2
+    sales      |    4     | 4800   |    2
+    develop    |    9     | 4500   |    2
+    sales      |    1     | 5000   |    3
+    develop    |    10    | 5200   |    3
+    develop    |    11    | 5200   |    4
+    develop    |    8     | 6000   |    5
+    """)
+    execute_query(
+        "SELECT depname, empno, salary, rank() OVER w AS rank FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary, empno) ORDER BY rank() OVER w, empno",
+        expected=expected
+    )
+
+@TestScenario
+def with_union_all(self):
+    """Check using window over rows obtained with `UNION ALL`.
+    """
+    expected = convert_output("""
+     count
+    -------
+    """)
+
+    execute_query(
+        "SELECT count(*) OVER (PARTITION BY four) AS count FROM (SELECT * FROM tenk1 UNION ALL SELECT * FROM tenk1) LIMIT 0",
+        expected=expected
+    )
+
+@TestScenario
+def empty_table(self):
+    """Check using an empty table with a window function.
+    """
+    expected = convert_output("""
+     count
+    -------
+    """)
+
+    execute_query(
+        "SELECT count(*) OVER (PARTITION BY four) AS count FROM (SELECT * FROM tenk1 WHERE 0)",
+        expected=expected
+    )
+
+@TestScenario
+def from_subquery(self):
+    """Check using a window function over data from subquery.
+    """
+    expected = convert_output("""
+     count | four
+    -------+------
+         4 |    1
+         4 |    1
+         4 |    1
+         4 |    1
+         2 |    3
+         2 |    3
+    """)
+
+    execute_query(
+        "SELECT count(*) OVER (PARTITION BY four) AS count, four FROM (SELECT * FROM tenk1 WHERE two = 1) WHERE unique2 < 10",
+        expected=expected
+    )
+
+@TestScenario
+def groups_frame(self):
+    """Check using `GROUPS` frame.
+    """
+    exitcode, message = groups_frame_error()
+
+    expected = convert_output("""
+     sum | unique1 | four
+    -----+---------+------
+      12 |       0 |    0
+      12 |       8 |    0
+      12 |       4 |    0
+      27 |       5 |    1
+      27 |       9 |    1
+      27 |       1 |    1
+      35 |       6 |    2
+      35 |       2 |    2
+      45 |       3 |    3
+      45 |       7 |    3
+    """)
+
+    execute_query("""
+        SELECT sum(unique1) over (order by four groups between unbounded preceding and current row),
+            unique1, four
+        FROM tenk1 WHERE unique1 < 10
+        """,
+        exitcode=exitcode, message=message
+    )
+
+@TestScenario
+def count_with_empty_over_clause_without_start(self):
+    """Check that we can use `count()` window function without passing
+    `*` argument when using empty over clause.
+    """
+    exitcode = 0
+    message = "1"
+
+    sql = ("SELECT count() OVER () FROM tenk1 LIMIT 1")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+
+@TestScenario
+def subquery_multiple_window_functions(self):
+    """Check using multiple window functions is a subquery.
+    """
+    expected = convert_output("""
+    depname |   depsalary |  depminsalary
+    --------+-------------+--------------
+    sales   |     5000    |  5000
+    sales   |     9800    |  4800
+    sales   |    14600    |  4800
+    """)
+
+    execute_query("""
+        SELECT * FROM
+          (SELECT depname,
+                  sum(salary) OVER (PARTITION BY depname order by empno) AS depsalary,
+                  min(salary) OVER (PARTITION BY depname, empno order by enroll_date) AS depminsalary
+           FROM empsalary)
+        WHERE depname = 'sales'
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def windows_with_same_partitioning_but_different_ordering(self):
+    """Check using using two windows that use the same partitioning
+    but different ordering.
+    """
+    expected = convert_output("""
+    first |     last
+    ------+-----
+    7     | 7
+    7     | 9
+    7     | 10
+    7     | 11
+    7     | 8
+    5     | 5
+    5     | 2
+    3     | 3
+    3     | 4
+    3     | 1
+    """)
+
+    execute_query("""
+        SELECT
+          any(empno) OVER (PARTITION BY depname ORDER BY salary, enroll_date) AS first,
+          anyLast(empno) OVER (PARTITION BY depname ORDER BY salary,enroll_date,empno) AS last
+        FROM empsalary
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def subquery_with_multiple_windows_filtering(self):
+    """Check filtering rows from a subquery that uses multiple window functions.
+    """
+    expected = convert_output("""
+    depname   | empno |  salary  |  enroll_date |   first_emp |  last_emp
+    ----------+-------+----------+--------------+-------------+----------
+    develop   |  8    |    6000  | 2006-10-01   |      1      |  5
+    develop   |  7    |    4200  | 2008-01-01   |      4      |  1
+    personnel |  2    |    3900  | 2006-12-23   |      1      |  2
+    personnel |  5    |    3500  | 2007-12-10   |      2      |  1
+    sales     |  1    |    5000  | 2006-10-01   |      1      |  3
+    sales     |  4    |    4800  | 2007-08-08   |      3      |  1
+    """)
+
+    execute_query("""
+        SELECT * FROM
+          (SELECT depname,
+                  empno,
+                  salary,
+                  enroll_date,
+                  row_number() OVER (PARTITION BY depname ORDER BY enroll_date, empno) AS first_emp,
+                  row_number() OVER (PARTITION BY depname ORDER BY enroll_date DESC, empno) AS last_emp
+           FROM empsalary) emp
+        WHERE first_emp = 1 OR last_emp = 1
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def exclude_clause(self):
+    """Check if exclude clause is supported.
+    """
+    exitcode, message = syntax_error()
+
+    expected = convert_output("""
+     sum | unique1 | four
+    -----+---------+------
+       7 |       4 |    0
+      13 |       2 |    2
+      22 |       1 |    1
+      26 |       6 |    2
+      29 |       9 |    1
+      31 |       8 |    0
+      32 |       5 |    1
+      23 |       3 |    3
+      15 |       7 |    3
+      10 |       0 |    0
+    """)
+
+    execute_query(
+        "SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude no others) AS sum,"
+        "unique1, four "
+        "FROM tenk1 WHERE unique1 < 10",
+        exitcode=exitcode, message=message
+    )
+
+@TestScenario
+def in_view(self):
+    """Check using a window function in a view.
+    """
+    with Given("I create a view"):
+        sql = """
+        CREATE VIEW v_window AS
+        SELECT number, sum(number) over (order by number rows between 1 preceding and 1 following) as sum_rows
+        FROM numbers(1, 10)
+        """
+        create_table(name="v_window", statement=sql)
+
+    expected = convert_output("""
+     number  | sum_rows
+    ---------+----------
+      1 |        3
+      2 |        6
+      3 |        9
+      4 |       12
+      5 |       15
+      6 |       18
+      7 |       21
+      8 |       24
+      9 |       27
+     10 |       19
+    """)
+
+    execute_query(
+        "SELECT * FROM v_window",
+        expected=expected
+    )
+
+@TestFeature
+@Name("misc")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_FrameClause("1.0")
+)
+def feature(self):
+    """Check misc cases for frame clause.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/order_clause.py b/tests/testflows/window_functions/tests/order_clause.py
new file mode 100644
index 00000000000..2dafe5dafc9
--- /dev/null
+++ b/tests/testflows/window_functions/tests/order_clause.py
@@ -0,0 +1,218 @@
+from testflows.core import *
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def single_expr_asc(self):
+    """Check defining of order clause with single expr ASC.
+    """
+    expected = convert_output("""
+     x  | s | sum
+    ----+---+-----
+      1 | a | 2
+      1 | b | 2
+      2 | b | 4
+    """)
+
+    execute_query(
+        "SELECT x,s, sum(x) OVER (ORDER BY x ASC) AS sum FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))",
+        expected=expected
+    )
+
+@TestScenario
+def single_expr_desc(self):
+    """Check defining of order clause with single expr DESC.
+    """
+    expected = convert_output("""
+     x  | s | sum
+    ----+---+-----
+      2 | b | 2
+      1 | a | 4
+      1 | b | 4
+    """)
+
+    execute_query(
+        "SELECT x,s, sum(x) OVER (ORDER BY x DESC) AS sum FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MultipleExprs("1.0")
+)
+def multiple_expr_desc_desc(self):
+    """Check defining of order clause with multiple exprs.
+    """
+    expected = convert_output("""
+     x | s | sum
+     --+---+----
+     2 | b | 2
+     1 | b | 3
+     1 | a | 4
+    """)
+
+    execute_query(
+        "SELECT x,s, sum(x) OVER (ORDER BY x DESC, s DESC) AS sum FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MultipleExprs("1.0")
+)
+def multiple_expr_asc_asc(self):
+    """Check defining of order clause with multiple exprs.
+    """
+    expected = convert_output("""
+      x | s | sum
+    ----+---+------
+      1 | a |  1
+      1 | b |  2
+      2 | b |  4
+    """)
+
+    execute_query(
+        "SELECT x,s, sum(x) OVER (ORDER BY x ASC, s ASC) AS sum FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MultipleExprs("1.0")
+)
+def multiple_expr_asc_desc(self):
+    """Check defining of order clause with multiple exprs.
+    """
+    expected = convert_output("""
+      x | s | sum
+    ----+---+------
+      1 | b |   1
+      1 | a |   2
+      2 | b |   4
+    """)
+
+    execute_query(
+        "SELECT x,s, sum(x) OVER (ORDER BY x ASC, s DESC) AS sum FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_MissingExpr_Error("1.0")
+)
+def missing_expr_error(self):
+    """Check that defining of order clause with missing expr returns an error.
+    """
+    exitcode = 62
+    message = "Exception: Syntax error: failed at position"
+
+    self.context.node.query("SELECT sum(number) OVER (ORDER BY) FROM numbers(1,3)", exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause_InvalidExpr_Error("1.0")
+)
+def invalid_expr_error(self):
+    """Check that defining of order clause with invalid expr returns an error.
+    """
+    exitcode = 47
+    message = "Exception: Missing columns: 'foo'"
+
+    self.context.node.query("SELECT sum(number) OVER (ORDER BY foo) FROM numbers(1,3)", exitcode=exitcode, message=message)
+
+@TestScenario
+def by_column(self):
+    """Check order by using a single column.
+    """
+    expected = convert_output("""
+      depname  | empno | salary | rank
+    -----------+-------+--------+------
+    develop    | 7     | 4200   | 1
+    develop    | 8     | 6000   | 1
+    develop    | 9     | 4500   | 1
+    develop    | 10    | 5200   | 1
+    develop    | 11    | 5200   | 1
+    personnel  | 2     | 3900   | 1
+    personnel  | 5     | 3500   | 1
+    sales      | 1     | 5000   | 1
+    sales      | 3     | 4800   | 1
+    sales      | 4     | 4800   | 1
+    """)
+
+    execute_query(
+        "SELECT depname, empno, salary, rank() OVER (PARTITION BY depname, empno ORDER BY salary) AS rank FROM empsalary",
+        expected=expected,
+    )
+
+@TestScenario
+def by_expr(self):
+    """Check order by with expression.
+    """
+    expected = convert_output("""
+              avg
+    ------------------------
+     0
+     0
+     0
+     1
+     1
+     1
+     1
+     2
+     3
+     3
+    """)
+
+    execute_query(
+        "SELECT avg(four) OVER (PARTITION BY four ORDER BY thousand / 100) AS avg FROM tenk1 WHERE unique2 < 10",
+        expected=expected,
+    )
+
+@TestScenario
+def by_expr_with_aggregates(self):
+    expected = convert_output("""
+     ten |   res    | rank
+    -----+----------+------
+       0 |  9976146 |    4
+       1 | 10114187 |    9
+       2 | 10059554 |    8
+       3 |  9878541 |    1
+       4 |  9881005 |    2
+       5 |  9981670 |    5
+       6 |  9947099 |    3
+       7 | 10120309 |   10
+       8 |  9991305 |    6
+       9 | 10040184 |    7
+    """)
+
+    execute_query(
+        "select ten, sum(unique1) + sum(unique2) as res, rank() over (order by sum(unique1) + sum(unique2)) as rank "
+        "from tenk1 group by ten order by ten",
+        expected=expected,
+    )
+
+@TestScenario
+def by_a_non_integer_constant(self):
+    """Check if it is allowed to use a window with ordering by a non integer constant.
+    """
+    expected = convert_output("""
+     rank
+    ------
+        1
+    """)
+
+    execute_query(
+        "SELECT rank() OVER (ORDER BY length('abc')) AS rank",
+        expected=expected
+    )
+
+@TestFeature
+@Name("order clause")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OrderClause("1.0")
+)
+def feature(self):
+    """Check defining order clause.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/over_clause.py b/tests/testflows/window_functions/tests/over_clause.py
new file mode 100644
index 00000000000..d02ddcee656
--- /dev/null
+++ b/tests/testflows/window_functions/tests/over_clause.py
@@ -0,0 +1,137 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_EmptyOverClause("1.0")
+)
+def empty(self):
+    """Check using empty over clause.
+    """
+    expected = convert_output("""
+     count
+    -------
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+    """)
+
+    execute_query(
+        "SELECT COUNT(*) OVER () AS count FROM tenk1 WHERE unique2 < 10",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_EmptyOverClause("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow("1.0")
+)
+def empty_named_window(self):
+    """Check using over clause with empty window.
+    """
+    expected = convert_output("""
+     count
+    -------
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+        10
+    """)
+
+    execute_query(
+        "SELECT COUNT(*) OVER w AS count FROM tenk1 WHERE unique2 < 10 WINDOW w AS ()",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_AdHocWindow("1.0"),
+)
+def adhoc_window(self):
+    """Check running aggregating `sum` function over an adhoc window.
+    """
+    expected = convert_output("""
+      depname  | empno | salary |  sum
+    -----------+-------+--------+-------
+     develop   |     7 |   4200 | 25100
+     develop   |     9 |   4500 | 25100
+     develop   |    10 |   5200 | 25100
+     develop   |    11 |   5200 | 25100
+     develop   |     8 |   6000 | 25100
+     personnel |     5 |   3500 |  7400
+     personnel |     2 |   3900 |  7400
+     sales     |     3 |   4800 | 14600
+     sales     |     4 |   4800 | 14600
+     sales     |     1 |   5000 | 14600
+    """)
+
+    execute_query(
+        "SELECT depname, empno, salary, sum(salary) OVER (PARTITION BY depname) AS sum FROM empsalary ORDER BY depname, salary, empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_AdHocWindow_MissingWindowSpec_Error("1.0")
+)
+def missing_window_spec(self):
+    """Check missing window spec in over clause.
+    """
+    exitcode = 62
+    message = "Exception: Syntax error"
+
+    self.context.node.query("SELECT number,sum(number) OVER FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow_InvalidName_Error("1.0")
+)
+def invalid_window_name(self):
+    """Check invalid window name.
+    """
+    exitcode = 47
+    message = "Exception: Window 'w3' is not defined"
+
+    self.context.node.query("SELECT number,sum(number) OVER w3 FROM values('number Int8', (1),(1),(2),(3)) WINDOW w1 AS ()",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause_NamedWindow_MultipleWindows_Error("1.0")
+)
+def invalid_multiple_windows(self):
+    """Check invalid multiple window names.
+    """
+    exitcode = 47
+    message = "Exception: Missing columns"
+
+    self.context.node.query("SELECT number,sum(number) OVER w1, w2 FROM values('number Int8', (1),(1),(2),(3)) WINDOW w1 AS (), w2 AS (PARTITION BY number)",
+        exitcode=exitcode, message=message)
+
+
+@TestFeature
+@Name("over clause")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_OverClause("1.0")
+)
+def feature(self):
+    """Check defining frame clause.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/partition_clause.py b/tests/testflows/window_functions/tests/partition_clause.py
new file mode 100644
index 00000000000..3e9ebefe2ba
--- /dev/null
+++ b/tests/testflows/window_functions/tests/partition_clause.py
@@ -0,0 +1,77 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def single_expr(self):
+    """Check defining of partition clause with single expr.
+    """
+    expected = convert_output("""
+      x | s | sum
+    ----+---+------
+      1 | a |  2 
+      1 | b |  2 
+      2 | b |  2 
+    """)
+
+    execute_query(
+        "SELECT x,s, sum(x) OVER (PARTITION BY x) AS sum FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_MultipleExpr("1.0")
+)
+def multiple_expr(self):
+    """Check defining of partition clause with multiple exprs.
+    """
+    expected = convert_output("""
+     x | s | sum
+     --+---+----
+     1 | a | 1
+     1 | b | 1
+     2 | b | 2
+    """)
+
+    execute_query(
+        "SELECT x,s, sum(x) OVER (PARTITION BY x,s) AS sum FROM values('x Int8, s String', (1,'a'),(1,'b'),(2,'b'))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_MissingExpr_Error("1.0")
+)
+def missing_expr_error(self):
+    """Check that defining of partition clause with missing expr returns an error.
+    """
+    exitcode = 62
+    message = "Exception: Syntax error: failed at position"
+
+    self.context.node.query("SELECT sum(number) OVER (PARTITION BY) FROM numbers(1,3)", exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause_InvalidExpr_Error("1.0")
+)
+def invalid_expr_error(self):
+    """Check that defining of partition clause with invalid expr returns an error.
+    """
+    exitcode = 47
+    message = "Exception: Missing columns: 'foo'"
+
+    self.context.node.query("SELECT sum(number) OVER (PARTITION BY foo) FROM numbers(1,3)", exitcode=exitcode, message=message)
+
+
+@TestFeature
+@Name("partition clause")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_PartitionClause("1.0")
+)
+def feature(self):
+    """Check defining partition clause.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/range_datetime.py b/tests/testflows/window_functions/tests/range_datetime.py
new file mode 100644
index 00000000000..0b34fdf43d4
--- /dev/null
+++ b/tests/testflows/window_functions/tests/range_datetime.py
@@ -0,0 +1,238 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def order_by_asc_range_between_days_preceding_and_days_following(self):
+    """Check range between days preceding and days following
+    with ascending order by.
+    """
+    expected = convert_output("""
+      sum  | salary | enroll_date
+    -------+--------+-------------
+     34900 |  5000  | 2006-10-01
+     38400 |  3900  | 2006-12-23
+     47100 |  4800  | 2007-08-01
+     47100 |  4800  | 2007-08-08
+     36100 |  3500  | 2007-12-10
+     32200 |  4200  | 2008-01-01
+     34900 |  6000  | 2006-10-01
+     32200 |  4500  | 2008-01-01
+     47100 |  5200  | 2007-08-01
+     47100 |  5200  | 2007-08-15
+    """)
+
+    execute_query(
+        "select sum(salary) over (order by enroll_date range between 365 preceding and 365 following) AS sum, "
+        "salary, enroll_date from empsalary order by empno",
+        expected=expected
+    )
+
+@TestScenario
+def order_by_desc_range_between_days_preceding_and_days_following(self):
+    """Check range between days preceding and days following
+    with descending order by."""
+    expected = convert_output("""
+      sum  | salary | enroll_date
+    -------+--------+-------------
+     34900 |  5000  | 2006-10-01
+     38400 |  3900  | 2006-12-23
+     47100 |  4800  | 2007-08-01
+     47100 |  4800  | 2007-08-08
+     36100 |  3500  | 2007-12-10
+     32200 |  4200  | 2008-01-01
+     34900 |  6000  | 2006-10-01
+     32200 |  4500  | 2008-01-01
+     47100 |  5200  | 2007-08-01
+     47100 |  5200  | 2007-08-15
+    """)
+
+    execute_query(
+        "select sum(salary) over (order by enroll_date desc range between 365 preceding and 365 following) AS sum, "
+        "salary, enroll_date from empsalary order by empno",
+        expected=expected
+    )
+
+@TestScenario
+def order_by_desc_range_between_days_following_and_days_following(self):
+    """Check range between days following and days following with
+    descending order by.
+    """
+    expected = convert_output("""
+      sum  | salary | enroll_date
+    -------+--------+-------------
+       0   |  5000  | 2006-10-01
+       0   |  3900  | 2006-12-23
+       0   |  4800  | 2007-08-01
+       0   |  4800  | 2007-08-08
+       0   |  3500  | 2007-12-10
+       0   |  4200  | 2008-01-01
+       0   |  6000  | 2006-10-01
+       0   |  4500  | 2008-01-01
+       0   |  5200  | 2007-08-01
+       0   |  5200  | 2007-08-15
+    """)
+
+    execute_query(
+        "select sum(salary) over (order by enroll_date desc range between 365 following and 365 following) AS sum, "
+        "salary, enroll_date from empsalary order by empno",
+        expected=expected
+    )
+
+@TestScenario
+def order_by_desc_range_between_days_preceding_and_days_preceding(self):
+    """Check range between days preceding and days preceding with
+    descending order by.
+    """
+    expected = convert_output("""
+      sum  | salary | enroll_date
+    -------+--------+-------------
+       0   |  5000  | 2006-10-01
+       0   |  3900  | 2006-12-23
+       0   |  4800  | 2007-08-01
+       0   |  4800  | 2007-08-08
+       0   |  3500  | 2007-12-10
+       0   |  4200  | 2008-01-01
+       0   |  6000  | 2006-10-01
+       0   |  4500  | 2008-01-01
+       0   |  5200  | 2007-08-01
+       0   |  5200  | 2007-08-15
+    """)
+
+    execute_query(
+        "select sum(salary) over (order by enroll_date desc range between 365 preceding and 365 preceding) AS sum, "
+        "salary, enroll_date from empsalary order by empno",
+        expected=expected
+    )
+
+@TestScenario
+def datetime_with_timezone_order_by_asc_range_between_n_preceding_and_n_following(self):
+    """Check range between preceding and following with
+    DateTime column that has timezone using ascending order by.
+    """
+    expected = convert_output("""
+     id |        f_timestamptz         | first_value | last_value
+    ----+------------------------------+-------------+------------
+      1 | 2000-10-19 10:23:54          |           1 |          3
+      2 | 2001-10-19 10:23:54          |           1 |          4
+      3 | 2001-10-19 10:23:54          |           1 |          4
+      4 | 2002-10-19 10:23:54          |           2 |          5
+      5 | 2003-10-19 10:23:54          |           4 |          6
+      6 | 2004-10-19 10:23:54          |           5 |          7
+      7 | 2005-10-19 10:23:54          |           6 |          8
+      8 | 2006-10-19 10:23:54          |           7 |          9
+      9 | 2007-10-19 10:23:54          |           8 |         10
+     10 | 2008-10-19 10:23:54          |           9 |         10
+    """)
+
+    execute_query(
+        """
+        select id, f_timestamptz, first_value(id) over w AS first_value, last_value(id) over w AS last_value
+        from datetimes
+        window w as (order by f_timestamptz range between
+                     31622400 preceding and 31622400 following) order by id
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def datetime_with_timezone_order_by_desc_range_between_n_preceding_and_n_following(self):
+    """Check range between preceding and following with
+    DateTime column that has timezone using descending order by.
+    """
+    expected = convert_output("""
+     id |        f_timestamptz         | first_value | last_value
+    ----+------------------------------+-------------+------------
+     10 | 2008-10-19 10:23:54          |          10 |          9
+      9 | 2007-10-19 10:23:54          |          10 |          8
+      8 | 2006-10-19 10:23:54          |           9 |          7
+      7 | 2005-10-19 10:23:54          |           8 |          6
+      6 | 2004-10-19 10:23:54          |           7 |          5
+      5 | 2003-10-19 10:23:54          |           6 |          4
+      4 | 2002-10-19 10:23:54          |           5 |          3
+      3 | 2001-10-19 10:23:54          |           4 |          1
+      2 | 2001-10-19 10:23:54          |           4 |          1
+      1 | 2000-10-19 10:23:54          |           2 |          1
+    """)
+
+    execute_query(
+        """
+        select id, f_timestamptz, first_value(id) over w AS first_value, last_value(id) over w AS last_value
+        from datetimes
+        window w as (order by f_timestamptz desc range between
+                     31622400 preceding and 31622400 following) order by id desc
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def datetime_order_by_asc_range_between_n_preceding_and_n_following(self):
+    """Check range between preceding and following with
+    DateTime column and ascending order by.
+    """
+    expected = convert_output("""
+     id |        f_timestamp         | first_value | last_value
+    ----+------------------------------+-------------+------------
+      1 | 2000-10-19 10:23:54          |           1 |          3
+      2 | 2001-10-19 10:23:54          |           1 |          4
+      3 | 2001-10-19 10:23:54          |           1 |          4
+      4 | 2002-10-19 10:23:54          |           2 |          5
+      5 | 2003-10-19 10:23:54          |           4 |          6
+      6 | 2004-10-19 10:23:54          |           5 |          7
+      7 | 2005-10-19 10:23:54          |           6 |          8
+      8 | 2006-10-19 10:23:54          |           7 |          9
+      9 | 2007-10-19 10:23:54          |           8 |         10
+     10 | 2008-10-19 10:23:54          |           9 |         10
+    """)
+
+    execute_query(
+        """
+        select id, f_timestamp, first_value(id) over w AS first_value, last_value(id) over w AS last_value
+        from datetimes
+        window w as (order by f_timestamp range between
+                     31622400 preceding and 31622400 following) ORDER BY id
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def datetime_order_by_desc_range_between_n_preceding_and_n_following(self):
+    """Check range between preceding and following with
+    DateTime column and descending order by.
+    """
+    expected = convert_output("""
+     id |        f_timestamp           | first_value | last_value
+    ----+------------------------------+-------------+------------
+     10 | 2008-10-19 10:23:54          |          10 |          9
+      9 | 2007-10-19 10:23:54          |          10 |          8
+      8 | 2006-10-19 10:23:54          |           9 |          7
+      7 | 2005-10-19 10:23:54          |           8 |          6
+      6 | 2004-10-19 10:23:54          |           7 |          5
+      5 | 2003-10-19 10:23:54          |           6 |          4
+      4 | 2002-10-19 10:23:54          |           5 |          3
+      2 | 2001-10-19 10:23:54          |           4 |          1
+      3 | 2001-10-19 10:23:54          |           4 |          1
+      1 | 2000-10-19 10:23:54          |           2 |          1
+    """)
+
+    execute_query(
+        """
+        select id, f_timestamp, first_value(id) over w AS first_value, last_value(id) over w AS last_value
+        from datetimes
+        window w as (order by f_timestamp desc range between
+                     31622400 preceding and 31622400 following)
+        """,
+        expected=expected
+    )
+
+@TestFeature
+@Name("range datetime")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_DataTypes_DateAndDateTime("1.0")
+)
+def feature(self):
+    """Check `Date` and `DateTime` data time with range frames.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/range_errors.py b/tests/testflows/window_functions/tests/range_errors.py
new file mode 100644
index 00000000000..67a9cfb14c9
--- /dev/null
+++ b/tests/testflows/window_functions/tests/range_errors.py
@@ -0,0 +1,104 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_MultipleColumnsInOrderBy_Error("1.0")
+)
+def error_more_than_one_order_by_column(self):
+    """Check that using more than one column in order by with range frame
+    returns an error.
+    """
+    exitcode = 36
+    message = "DB::Exception: Received from localhost:9000. DB::Exception: The RANGE OFFSET window frame requires exactly one ORDER BY column, 2 given"
+
+    sql = ("select sum(salary) over (order by enroll_date, salary range between 1 preceding and 2 following) AS sum, "
+        "salary, enroll_date from empsalary")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_missing_order_by(self):
+    """Check that using range frame with offsets without order by returns an error.
+    """
+    exitcode = 36
+    message = "DB::Exception: The RANGE OFFSET window frame requires exactly one ORDER BY column, 0 given"
+
+    sql = ("select sum(salary) over (range between 1 preceding and 2 following) AS sum, "
+        "salary, enroll_date from empsalary")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_missing_order_by_with_partition_by_clause(self):
+    """Check that range frame with offsets used with partition by but
+    without order by returns an error.
+    """
+    exitcode = 36
+    message = "DB::Exception: The RANGE OFFSET window frame requires exactly one ORDER BY column, 0 given"
+
+    sql = ("select f1, sum(f1) over (partition by f1 range between 1 preceding and 1 following) AS sum "
+        "from t1 where f1 = f2")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+def error_range_over_non_numerical_column(self):
+    """Check that range over non numerical column returns an error.
+    """
+    exitcode = 48
+    message = "DB::Exception: The RANGE OFFSET frame for 'DB::ColumnLowCardinality' ORDER BY column is not implemented"
+
+    sql = ("select sum(salary) over (order by depname range between 1 preceding and 2 following) as sum, "
+        "salary, enroll_date from empsalary")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_ExprPreceding_ExprValue("1.0")
+)
+def error_negative_preceding_offset(self):
+    """Check that non-positive value of preceding offset returns an error.
+    """
+    exitcode = 36
+    message = "DB::Exception: Frame start offset must be greater than zero, -1 given"
+
+    sql = ("select max(enroll_date) over (order by salary range between -1 preceding and 2 following) AS max, "
+        "salary, enroll_date from empsalary")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_ExprFollowing_ExprValue("1.0")
+)
+def error_negative_following_offset(self):
+    """Check that non-positive value of following offset returns an error.
+    """
+    exitcode = 36
+    message = "DB::Exception: Frame end offset must be greater than zero, -2 given"
+
+    sql = ("select max(enroll_date) over (order by salary range between 1 preceding and -2 following) AS max, "
+        "salary, enroll_date from empsalary")
+
+    with When("I execute query", description=sql):
+        r = current().context.node.query(sql, exitcode=exitcode, message=message)
+
+@TestFeature
+@Name("range errors")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame("1.0")
+)
+def feature(self):
+    """Check different error conditions when usign range frame.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/range_frame.py b/tests/testflows/window_functions/tests/range_frame.py
new file mode 100644
index 00000000000..71f00965547
--- /dev/null
+++ b/tests/testflows/window_functions/tests/range_frame.py
@@ -0,0 +1,1410 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_MissingFrameExtent_Error("1.0")
+)
+def missing_frame_extent(self):
+    """Check that when range frame has missing frame extent then an error is returned.
+    """
+    exitcode, message = syntax_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number RANGE) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_InvalidFrameExtent_Error("1.0")
+)
+def invalid_frame_extent(self):
+    """Check that when range frame has invalid frame extent then an error is returned.
+    """
+    exitcode, message = syntax_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number RANGE '1') FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_CurrentRow_Peers("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_CurrentRow_WithoutOrderBy("1.0")
+)
+def start_current_row_without_order_by(self):
+    """Check range current row frame without order by and
+    that the peers of the current row are rows that have values in the same order bucket.
+    In this case without order by clause all rows are the peers of the current row.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+       1    | 5000   | 47100
+       2    | 3900   | 47100
+       3    | 4800   | 47100
+       4    | 4800   | 47100
+       5    | 3500   | 47100
+       7    | 4200   | 47100
+       8    | 6000   | 47100
+       9    | 4500   | 47100
+       10   | 5200   | 47100
+       11   | 5200   | 47100
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, salary, sum(salary) OVER (RANGE CURRENT ROW) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_CurrentRow_Peers("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_CurrentRow_WithOrderBy("1.0")
+)
+def start_current_row_with_order_by(self):
+    """Check range current row frame with order by and that the peers of the current row
+    are rows that have values in the same order bucket.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+       1    | sales     | 5000   | 14600
+       2    | personnel | 3900   | 7400
+       3    | sales     | 4800   | 14600
+       4    | sales     | 4800   | 14600
+       5    | personnel | 3500   | 7400
+       7    | develop   | 4200   | 25100
+       8    | develop   | 6000   | 25100
+       9    | develop   | 4500   | 25100
+       10   | develop   | 5200   | 25100
+       11   | develop   | 5200   | 25100
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY depname RANGE CURRENT ROW) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedFollowing_Error("1.0")
+)
+def start_unbounded_following_error(self):
+    """Check range current row frame with or without order by returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE UNBOUNDED FOLLOWING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE UNBOUNDED FOLLOWING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedPreceding_WithoutOrderBy("1.0")
+)
+def start_unbounded_preceding_without_order_by(self):
+    """Check range unbounded preceding frame without order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+       7    | develop   |  4200  | 25100
+       8    | develop   |  6000  | 25100
+       9    | develop   |  4500  | 25100
+       10   | develop   |  5200  | 25100
+       11   | develop   |  5200  | 25100
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (RANGE UNBOUNDED PRECEDING) AS sum FROM empsalary WHERE depname = 'develop') ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_UnboundedPreceding_WithOrderBy("1.0")
+)
+def start_unbounded_preceding_with_order_by(self):
+    """Check range unbounded preceding frame with order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+       1    | sales     | 5000   | 47100
+       2    | personnel | 3900   | 32500
+       3    | sales     | 4800   | 47100
+       4    | sales     | 4800   | 47100
+       5    | personnel | 3500   | 32500
+       7    | develop   | 4200   | 25100
+       8    | develop   | 6000   | 25100
+       9    | develop   | 4500   | 25100
+       10   | develop   | 5200   | 25100
+       11   | develop   | 5200   | 25100
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY depname RANGE UNBOUNDED PRECEDING) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprFollowing_WithoutOrderBy_Error("1.0")
+)
+def start_expr_following_without_order_by_error(self):
+    """Check range expr following frame without order by returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE 1 FOLLOWING) AS sum FROM empsalary",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprFollowing_WithOrderBy_Error("1.0")
+)
+def start_expr_following_with_order_by_error(self):
+    """Check range expr following frame with order by returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE 1 FOLLOWING) AS sum FROM empsalary",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_WithOrderBy("1.0")
+)
+def start_expr_preceding_with_order_by(self):
+    """Check range expr preceding frame with order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+        1   | sales     | 5000   | 5000
+        2   | personnel | 3900   | 3900
+        3   | sales     | 4800   | 9600
+        4   | sales     | 4800   | 9600
+        5   | personnel | 3500   | 3500
+        7   | develop   | 4200   | 4200
+        8   | develop   | 6000   | 6000
+        9   | develop   | 4500   | 4500
+        10  | develop   | 5200   | 10400
+        11  | develop   | 5200   | 10400
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE 1 PRECEDING) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_OrderByNonNumericalColumn_Error("1.0")
+)
+def start_expr_preceding_order_by_non_numerical_column_error(self):
+    """Check range expr preceding frame with order by non-numerical column returns an error.
+    """
+    exitcode, message = frame_range_offset_error()
+
+    self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY depname RANGE 1 PRECEDING) AS sum FROM empsalary",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Start_ExprPreceding_WithoutOrderBy_Error("1.0")
+)
+def start_expr_preceding_without_order_by_error(self):
+    """Check range expr preceding frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE 1 PRECEDING) AS sum FROM empsalary",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_CurrentRow("1.0")
+)
+def between_current_row_and_current_row(self):
+    """Check range between current row and current row frame with or without order by.
+    """
+    with Example("without order by"):
+        expected = convert_output("""
+          empno | depname   | salary | sum
+        --------+-----------+--------+---------
+           7    | develop   | 4200   | 25100
+           8    | develop   | 6000   | 25100
+           9    | develop   | 4500   | 25100
+           10   | develop   | 5200   | 25100
+           11   | develop   | 5200   | 25100
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN CURRENT ROW AND CURRENT ROW) AS sum FROM empsalary WHERE depname = 'develop') ORDER BY empno",
+            expected=expected
+        )
+
+    with Example("with order by"):
+        expected = convert_output("""
+          empno | depname   | salary | sum
+        --------+-----------+--------+------
+           7	| develop   |  4200  | 4200
+           8	| develop   |  6000  | 6000
+           9	| develop   |  4500  | 4500
+           10	| develop   |  5200  | 5200
+           11	| develop   |  5200  | 5200
+        """)
+
+        execute_query(
+            "SELECT empno, depname, salary, sum(salary) OVER (ORDER BY empno RANGE BETWEEN CURRENT ROW AND CURRENT ROW) AS sum FROM empsalary WHERE depname = 'develop'",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_UnboundedPreceding_Error("1.0")
+)
+def between_current_row_and_unbounded_preceding_error(self):
+    """Check range between current row and unbounded preceding frame with or without order by returns an error.
+    """
+    exitcode, message = frame_end_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_UnboundedFollowing("1.0")
+)
+def between_current_row_and_unbounded_following(self):
+    """Check range between current row and unbounded following frame with or without order by.
+    """
+    with Example("without order by"):
+        expected = convert_output("""
+          empno | depname   | salary | sum
+        --------+-----------+--------+---------
+            7   |  develop  | 4200   | 25100
+            8   |  develop  | 6000   | 25100
+            9   |  develop  | 4500   | 25100
+            10  |  develop  | 5200   | 25100
+            11  |  develop  | 5200   | 25100
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS sum FROM empsalary WHERE depname = 'develop') ORDER BY empno",
+            expected=expected
+        )
+
+    with Example("with order by"):
+        expected = convert_output("""
+          empno | depname   | salary | sum
+        --------+-----------+--------+---------
+           7    | develop   | 4200   | 25100
+           8    | develop   | 6000   | 20900
+           9    | develop   | 4500   | 14900
+           10   | develop   | 5200   | 10400
+           11   | develop   | 5200   | 5200
+        """)
+
+        execute_query(
+            "SELECT empno, depname, salary, sum(salary) OVER (ORDER BY empno RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING) AS sum FROM empsalary WHERE depname = 'develop'",
+            expected=expected
+        )
+
+    with Example("with order by from tenk1"):
+        expected = convert_output("""
+         sum | unique1 | four
+        -----+---------+------
+          45 |    0    |  0
+          33 |    1    |  1
+          18 |    2    |  2
+          10 |    3    |  3
+          45 |    4    |  0
+          33 |    5    |  1
+          18 |    6    |  2
+          10 |    7    |  3
+          45 |    8    |  0
+          33 |    9    |  1
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT sum(unique1) over (order by four range between current row and unbounded following) AS sum,"
+            "unique1, four "
+            "FROM tenk1 WHERE unique1 < 10) ORDER BY unique1",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprFollowing_WithoutOrderBy_Error("1.0")
+)
+def between_current_row_and_expr_following_without_order_by_error(self):
+    """Check range between current row and expr following frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprFollowing_WithOrderBy("1.0")
+)
+def between_current_row_and_expr_following_with_order_by(self):
+    """Check range between current row and expr following frame with order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+       1    | sales     | 5000   | 8900
+       2    | personnel | 3900   | 8700
+       3    | sales     | 4800   | 9600
+       4    | sales     | 4800   | 8300
+       5    | personnel | 3500   | 3500
+       7    | develop   | 4200   | 10200
+       8    | develop   | 6000   | 10500
+       9    | develop   | 4500   | 9700
+       10   | develop   | 5200   | 10400
+       11   | develop   | 5200   | 5200
+    """)
+
+    execute_query(
+        "SELECT empno, depname, salary, sum(salary) OVER (ORDER BY empno RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_CurrentRow_ExprPreceding_Error("1.0")
+)
+def between_current_row_and_expr_preceding_error(self):
+    """Check range between current row and expr preceding frame with or without order by returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN CURRENT ROW AND 1 PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_CurrentRow("1.0")
+)
+def between_unbounded_preceding_and_current_row(self):
+    """Check range between unbounded preceding and current row frame with and without order by.
+    """
+    with Example("with order by"):
+        expected = convert_output("""
+             four | ten | sum | last_value
+            ------+-----+-----+------------
+                0 |   0 |   0 |          0
+                0 |   2 |   2 |          2
+                0 |   4 |   6 |          4
+                0 |   6 |  12 |          6
+                0 |   8 |  20 |          8
+                1 |   1 |   1 |          1
+                1 |   3 |   4 |          3
+                1 |   5 |   9 |          5
+                1 |   7 |  16 |          7
+                1 |   9 |  25 |          9
+                2 |   0 |   0 |          0
+                2 |   2 |   2 |          2
+                2 |   4 |   6 |          4
+                2 |   6 |  12 |          6
+                2 |   8 |  20 |          8
+                3 |   1 |   1 |          1
+                3 |   3 |   4 |          3
+                3 |   5 |   9 |          5
+                3 |   7 |  16 |          7
+                3 |   9 |  25 |          9
+            """)
+
+        execute_query(
+            "SELECT four, ten,"
+            "sum(ten) over (partition by four order by ten range between unbounded preceding and current row) AS sum,"
+            "last_value(ten) over (partition by four order by ten range between unbounded preceding and current row) AS last_value "
+            "FROM (select distinct ten, four from tenk1)",
+            expected=expected
+        )
+
+    with Example("without order by"):
+        expected = convert_output("""
+          empno | depname   | salary | sum
+        --------+-----------+--------+---------
+           7    |  develop  | 4200   | 25100
+           8    |  develop  | 6000   | 25100
+           9    |  develop  | 4500   | 25100
+           10   |  develop  | 5200   | 25100
+           11   |  develop  | 5200   | 25100
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS sum FROM empsalary WHERE depname = 'develop') ORDER BY empno",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_UnboundedPreceding_Error("1.0")
+)
+def between_unbounded_preceding_and_unbounded_preceding_error(self):
+    """Check range between unbounded preceding and unbounded preceding frame with or without order by returns an error.
+    """
+    exitcode, message = frame_end_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_UnboundedFollowing("1.0")
+)
+def between_unbounded_preceding_and_unbounded_following(self):
+    """Check range between unbounded preceding and unbounded following range with and without order by.
+    """
+    with Example("with order by"):
+        expected = convert_output("""
+         four | ten | sum | last_value
+        ------+-----+-----+------------
+            0 |   0 |  20 |          8
+            0 |   2 |  20 |          8
+            0 |   4 |  20 |          8
+            0 |   6 |  20 |          8
+            0 |   8 |  20 |          8
+            1 |   1 |  25 |          9
+            1 |   3 |  25 |          9
+            1 |   5 |  25 |          9
+            1 |   7 |  25 |          9
+            1 |   9 |  25 |          9
+            2 |   0 |  20 |          8
+            2 |   2 |  20 |          8
+            2 |   4 |  20 |          8
+            2 |   6 |  20 |          8
+            2 |   8 |  20 |          8
+            3 |   1 |  25 |          9
+            3 |   3 |  25 |          9
+            3 |   5 |  25 |          9
+            3 |   7 |  25 |          9
+            3 |   9 |  25 |          9
+        """)
+
+        execute_query(
+            "SELECT four, ten, "
+            "sum(ten) over (partition by four order by ten range between unbounded preceding and unbounded following) AS sum, "
+            "last_value(ten) over (partition by four order by ten range between unbounded preceding and unbounded following) AS last_value "
+            "FROM (select distinct ten, four from tenk1)",
+            expected=expected
+        )
+
+    with Example("without order by"):
+        expected = convert_output("""
+          empno | depname   | salary | sum
+        --------+-----------+--------+---------
+           1    | sales     |  5000  | 47100
+           2    | personnel |  3900  | 47100
+           3    | sales     |  4800  | 47100
+           4    | sales     |  4800  | 47100
+           5    | personnel |  3500  | 47100
+           7    | develop   |  4200  | 47100
+           8    | develop   |  6000  | 47100
+           9    | develop   |  4500  | 47100
+           10   | develop   |  5200  | 47100
+           11   | develop   |  5200  | 47100
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS sum FROM empsalary) ORDER BY empno",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprFollowing_WithoutOrderBy_Error("1.0")
+)
+def between_unbounded_preceding_and_expr_following_without_order_by_error(self):
+    """Check range between unbounded preceding and expr following frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprPreceding_WithoutOrderBy_Error("1.0")
+)
+def between_unbounded_preceding_and_expr_preceding_without_order_by_error(self):
+    """Check range between unbounded preceding and expr preceding frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprFollowing_WithOrderBy("1.0")
+)
+def between_unbounded_preceding_and_expr_following_with_order_by(self):
+    """Check range between unbounded preceding and expr following frame with order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+      1     | sales     | 5000   | 41100
+      2     | personnel | 3900   | 11600
+      3     | sales     | 4800   | 41100
+      4     | sales     | 4800   | 41100
+      5     | personnel | 3500   | 7400
+      7     | develop   | 4200   | 16100
+      8     | develop   | 6000   | 47100
+      9     | develop   | 4500   | 30700
+      10    | develop   | 5200   | 41100
+      11    | develop   | 5200   | 41100
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED PRECEDING AND 500 FOLLOWING) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedPreceding_ExprPreceding_WithOrderBy("1.0")
+)
+def between_unbounded_preceding_and_expr_preceding_with_order_by(self):
+    """Check range between unbounded preceding and expr preceding frame with order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+      1     | sales     | 5000   | 16100
+      2     | personnel | 3900   | 0
+      3     | sales     | 4800   | 11600
+      4     | sales     | 4800   | 11600
+      5     | personnel | 3500   | 0
+      7     | develop   | 4200   | 3500
+      8     | develop   | 6000   | 41100
+      9     | develop   | 4500   | 7400
+      10    | develop   | 5200   | 16100
+      11    | develop   | 5200   | 16100
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED PRECEDING AND 500 PRECEDING) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_CurrentRow_Error("1.0")
+)
+def between_unbounded_following_and_current_row_error(self):
+    """Check range between unbounded following and current row frame with or without order by returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED FOLLOWING AND CURRENT ROW) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_UnboundedFollowing_Error("1.0")
+)
+def between_unbounded_following_and_unbounded_following_error(self):
+    """Check range between unbounded following and unbounded following frame with or without order by returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_UnboundedPreceding_Error("1.0")
+)
+def between_unbounded_following_and_unbounded_preceding_error(self):
+    """Check range between unbounded following and unbounded preceding frame with or without order by returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_ExprPreceding_Error("1.0")
+)
+def between_unbounded_following_and_expr_preceding_error(self):
+    """Check range between unbounded following and expr preceding frame with or without order by returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED FOLLOWING AND 1 PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED FOLLOWING AND 1 PRECEDING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_UnboundedFollowing_ExprFollowing_Error("1.0")
+)
+def between_unbounded_following_and_expr_following_error(self):
+    """Check range between unbounded following and expr following frame with or without order by returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (RANGE BETWEEN UNBOUNDED FOLLOWING AND 1 FOLLOWING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN UNBOUNDED FOLLOWING AND 1 FOLLOWING) AS sum FROM empsalary",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_CurrentRow_WithoutOrderBy_Error("1.0")
+)
+def between_expr_preceding_and_current_row_without_order_by_error(self):
+    """Check range between expr preceding and current row frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedFollowing_WithoutOrderBy_Error("1.0")
+)
+def between_expr_preceding_and_unbounded_following_without_order_by_error(self):
+    """Check range between expr preceding and unbounded following frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprFollowing_WithoutOrderBy_Error("1.0")
+)
+def between_expr_preceding_and_expr_following_without_order_by_error(self):
+    """Check range between expr preceding and expr following frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithoutOrderBy_Error("1.0")
+)
+def between_expr_preceding_and_expr_preceding_without_order_by_error(self):
+    """Check range between expr preceding and expr preceding frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedPreceding_Error("1.0")
+)
+def between_expr_preceding_and_unbounded_preceding_error(self):
+    """Check range between expr preceding and unbounded preceding frame with or without order by returns an error.
+    """
+    exitcode, message = frame_end_unbounded_preceding_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT number,sum(number) OVER (ORDER BY salary RANGE BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_CurrentRow_WithOrderBy("1.0")
+)
+def between_expr_preceding_and_current_row_with_order_by(self):
+    """Check range between expr preceding and current row frame with order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+        1   | sales     |  5000  | 5000
+        2   | personnel |  3900  | 8900
+        3   | sales     |  4800  | 13700
+        4   | sales     |  4800  | 18500
+        5   | personnel |  3500  | 22000
+        7   | develop   |  4200  | 26200
+        8   | develop   |  6000  | 32200
+        9   | develop   |  4500  | 36700
+        10  | develop   |  5200  | 41900
+        11  | develop   |  5200  | 47100
+    """)
+
+    execute_query(
+        "SELECT empno, depname, salary, sum(salary) OVER (ORDER BY empno RANGE BETWEEN 500 PRECEDING AND CURRENT ROW) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_UnboundedFollowing_WithOrderBy("1.0")
+)
+def between_expr_preceding_and_unbounded_following_with_order_by(self):
+    """Check range between expr preceding and unbounded following frame with order by.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+       1    | sales     | 5000   | 35500
+       2    | personnel | 3900   | 47100
+       3    | sales     | 4800   | 35500
+       4    | sales     | 4800   | 35500
+       5    | personnel | 3500   | 47100
+       7    | develop   | 4200   | 43600
+       8    | develop   | 6000   | 6000
+       9    | develop   | 4500   | 39700
+       10   | develop   | 5200   | 31000
+       11   | develop   | 5200   | 31000
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN 500 PRECEDING AND UNBOUNDED FOLLOWING) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprFollowing_WithOrderBy("1.0")
+)
+def between_expr_preceding_and_expr_following_with_order_by(self):
+    """Check range between expr preceding and expr following frame with order by.
+    """
+    with Example("empsalary"):
+        expected = convert_output("""
+          empno | depname   | salary | sum
+        --------+-----------+--------+---------
+           1    | sales     | 5000   | 29500
+           2    | personnel | 3900   | 11600
+           3    | sales     | 4800   | 29500
+           4    | sales     | 4800   | 29500
+           5    | personnel | 3500   | 7400
+           7    | develop   | 4200   | 12600
+           8    | develop   | 6000   | 6000
+           9    | develop   | 4500   | 23300
+           10   | develop   | 5200   | 25000
+           11   | develop   | 5200   | 25000
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN 500 PRECEDING AND 500 FOLLOWING) AS sum FROM empsalary) ORDER BY empno",
+            expected=expected
+        )
+
+    with Example("tenk1"):
+        expected = convert_output("""
+             sum | unique1 | four
+            -----+---------+------
+               4 |       0 |    0
+              12 |       4 |    0
+              12 |       8 |    0
+               6 |       1 |    1
+              15 |       5 |    1
+              14 |       9 |    1
+               8 |       2 |    2
+               8 |       6 |    2
+              10 |       3 |    3
+              10 |       7 |    3
+            """)
+
+        execute_query(
+            "SELECT sum(unique1) over (partition by four order by unique1 range between 5 preceding and 6 following) AS sum, "
+            "unique1, four "
+            "FROM tenk1 WHERE unique1 < 10",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithOrderBy("1.0")
+)
+def between_expr_preceding_and_expr_preceding_with_order_by(self):
+    """Check range between expr preceding and expr preceding range with order by.
+    """
+    with Example("order by asc"):
+        expected = convert_output("""
+         sum | unique1 | four
+        -----+---------+------
+          0  |   0     |  0
+          0  |   4     |  0
+          0  |   8     |  0
+          12 |   1     |  1
+          12 |   5     |  1
+          12 |   9     |  1
+          27 |   2     |  2
+          27 |   6     |  2
+          23 |   3     |  3
+          23 |   7     |  3
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT sum(unique1) over (order by four range between 2 preceding and 1 preceding) AS sum, "
+                "unique1, four "
+            "FROM tenk1 WHERE unique1 < 10) ORDER BY four, unique1",
+            expected=expected
+        )
+
+    with Example("order by desc"):
+        expected = convert_output("""
+         sum | unique1 | four
+        -----+---------+------
+          23 |   0     |  0
+          23 |   4     |  0
+          23 |   8     |  0
+          18 |   1     |  1
+          18 |   5     |  1
+          18 |   9     |  1
+          10 |   2     |  2
+          10 |   6     |  2
+          0  |   3     |  3
+          0  |   7     |  3
+        """)
+
+        execute_query(
+            "SELECT * FROM (SELECT sum(unique1) over (order by four desc range between 2 preceding and 1 preceding) AS sum, "
+            "unique1, four "
+            "FROM tenk1 WHERE unique1 < 10) ORDER BY four, unique1",
+            expected=expected
+        )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprPreceding_ExprPreceding_WithOrderBy_Error("1.0")
+)
+def between_expr_preceding_and_expr_preceding_with_order_by_error(self):
+    """Check range between expr preceding and expr preceding range with order by returns error
+    when end frame is before of start frame.
+    """
+    exitcode, message = frame_start_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_WithoutOrderBy_Error("1.0")
+)
+def between_expr_following_and_current_row_without_order_by_error(self):
+    """Check range between expr following and current row frame without order by returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedFollowing_WithoutOrderBy_Error("1.0")
+)
+def between_expr_following_and_unbounded_following_without_order_by_error(self):
+    """Check range between expr following and unbounded following frame without order by returns an error.
+    """
+    exitcode, message = frame_requires_order_by_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithoutOrderBy_Error("1.0")
+)
+def between_expr_following_and_expr_following_without_order_by_error(self):
+    """Check range between expr following and expr following frame without order by returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND 1 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_WithoutOrderBy_Error("1.0")
+)
+def between_expr_following_and_expr_preceding_without_order_by_error(self):
+    """Check range between expr following and expr preceding frame without order by returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedPreceding_Error("1.0")
+)
+def between_expr_following_and_unbounded_preceding_error(self):
+    """Check range between expr following and unbounded preceding frame with or without order by returns an error.
+    """
+    exitcode, message = frame_end_unbounded_preceding_error()
+
+    with Example("without order by"):
+        self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+            exitcode=exitcode, message=message)
+
+    with Example("with order by"):
+        self.context.node.query("SELECT number,sum(number) OVER (ORDER BY salary RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_WithOrderBy_Error("1.0")
+)
+def between_expr_following_and_current_row_with_order_by_error(self):
+    """Check range between expr following and current row frame with order by returns an error
+    when expr if greater than 0.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND CURRENT ROW) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_Error("1.0")
+)
+def between_expr_following_and_expr_preceding_error(self):
+    """Check range between expr following and expr preceding frame with order by returns an error
+    when either expr is not 0.
+    """
+    exitcode, message = frame_start_error()
+
+    with Example("1 following 0 preceding"):
+        self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 1 FOLLOWING AND 0 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+            exitcode=exitcode, message=message)
+
+    with Example("1 following 0 preceding"):
+        self.context.node.query("SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND 1 PRECEDING) FROM values('number Int8', (1),(1),(2),(3))",
+            exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithOrderBy_Error("1.0")
+)
+def between_expr_following_and_expr_following_with_order_by_error(self):
+    """Check range between expr following and expr following frame with order by returns an error
+    when the expr for the frame end is less than the expr for the framevstart.
+    """
+    exitcode, message = frame_start_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM values('number Int8', (1),(1),(2),(3))",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_CurrentRow_ZeroSpecialCase("1.0")
+)
+def between_expr_following_and_current_row_zero_special_case(self):
+    """Check range between expr following and current row frame for special case when exp is 0.
+    It is expected to work.
+    """
+    with When("I use it with order by"):
+        expected = convert_output("""
+          number |  sum
+        ---------+------
+               1 |   2
+               1 |   2
+               2 |   2
+               3 |   3
+        """)
+
+        execute_query("SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) AS sum FROM values('number Int8', (1),(1),(2),(3))",
+            expected=expected
+        )
+
+    with And("I use it without order by"):
+        expected = convert_output("""
+          number |  sum
+        ---------+------
+               1 |   7
+               1 |   7
+               2 |   7
+               3 |   7
+        """)
+
+        execute_query(
+            "SELECT number,sum(number) OVER (RANGE BETWEEN 0 FOLLOWING AND CURRENT ROW) AS sum FROM values('number Int8', (1),(1),(2),(3))",
+            expected=expected
+            )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_UnboundedFollowing_WithOrderBy("1.0")
+)
+def between_expr_following_and_unbounded_following_with_order_by(self):
+    """Check range between expr following and unbounded following range with order by.
+    """
+    expected = convert_output("""
+          number |  sum
+        ---------+------
+               1 |   5
+               1 |   5
+               2 |   3
+               3 |   0
+        """)
+
+
+    execute_query(
+        "SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) AS sum FROM values('number Int8', (1),(1),(2),(3))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprPreceding_WithOrderBy_ZeroSpecialCase("1.0")
+)
+def between_expr_following_and_expr_preceding_with_order_by_zero_special_case(self):
+    """Check range between expr following and expr preceding frame for special case when exp is 0.
+    It is expected to work.
+    """
+    expected = convert_output("""
+      number |  sum
+    ---------+------
+           1 |   2
+           1 |   2
+           2 |   2
+           3 |   3
+    """)
+
+    execute_query("SELECT number,sum(number) OVER (ORDER BY number RANGE BETWEEN 0 FOLLOWING AND 0 PRECEDING) AS sum FROM values('number Int8', (1),(1),(2),(3))",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_Between_ExprFollowing_ExprFollowing_WithOrderBy("1.0")
+)
+def between_expr_following_and_expr_following_with_order_by(self):
+    """Check range between expr following and expr following frame with order by when frame start
+    is before frame end.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum
+    --------+-----------+--------+---------
+      1     | sales     | 5000   | 6000
+      2     | personnel | 3900   | 14100
+      3     | sales     | 4800   | 0
+      4     | sales     | 4800   | 0
+      5     | personnel | 3500   | 8700
+      7     | develop   | 4200   | 25000
+      8     | develop   | 6000   | 0
+      9     | develop   | 4500   | 15400
+      10    | develop   | 5200   | 6000
+      11    | develop   | 5200   | 6000
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT empno, depname, salary, sum(salary) OVER (ORDER BY salary RANGE BETWEEN 500 FOLLOWING AND 1000 FOLLOWING) AS sum FROM empsalary) ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+def between_unbounded_preceding_and_current_row_with_expressions_in_order_by_and_aggregate(self):
+    """Check range between unbounded prceding and current row with
+    expression used in the order by clause and aggregate functions.
+    """
+    expected = convert_output("""
+     four | two | sum | last_value
+    ------+-----+-----+------------
+        0 |   0 |   0 |          0
+        0 |   0 |   0 |          0
+        0 |   1 |   2 |          1
+        0 |   1 |   2 |          1
+        0 |   2 |   4 |          2
+        1 |   0 |   0 |          0
+        1 |   0 |   0 |          0
+        1 |   1 |   2 |          1
+        1 |   1 |   2 |          1
+        1 |   2 |   4 |          2
+        2 |   0 |   0 |          0
+        2 |   0 |   0 |          0
+        2 |   1 |   2 |          1
+        2 |   1 |   2 |          1
+        2 |   2 |   4 |          2
+        3 |   0 |   0 |          0
+        3 |   0 |   0 |          0
+        3 |   1 |   2 |          1
+        3 |   1 |   2 |          1
+        3 |   2 |   4 |          2
+    """)
+
+    execute_query(
+        "SELECT four, toInt8(ten/4) as two, "
+        "sum(toInt8(ten/4)) over (partition by four order by toInt8(ten/4) range between unbounded preceding and current row) AS sum, "
+        "last_value(toInt8(ten/4)) over (partition by four order by toInt8(ten/4) range between unbounded preceding and current row) AS last_value "
+        "FROM (select distinct ten, four from tenk1)",
+        expected=expected
+    )
+
+@TestScenario
+def between_current_row_and_unbounded_following_modifying_named_window(self):
+    """Check range between current row and unbounded following when
+    modifying named window.
+    """
+    expected = convert_output("""
+     sum | unique1 | four
+    -----+---------+------
+      45 |       0 |    0
+      45 |       8 |    0
+      45 |       4 |    0
+      33 |       5 |    1
+      33 |       9 |    1
+      33 |       1 |    1
+      18 |       6 |    2
+      18 |       2 |    2
+      10 |       3 |    3
+      10 |       7 |    3
+    """)
+
+    execute_query(
+        "SELECT * FROM (SELECT sum(unique1) over (w range between current row and unbounded following) AS sum,"
+        "unique1, four "
+        "FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four)) ORDER BY unique1",
+        expected=expected
+    )
+
+@TestScenario
+def between_current_row_and_unbounded_following_in_named_window(self):
+    """Check range between current row and unbounded following in named window.
+    """
+    expected = convert_output("""
+     first_value | last_value | unique1 | four
+    -------------+------------+---------+------
+          0      |      9     |    0    |  0
+          1      |      9     |    1    |  1
+          2      |      9     |    2    |  2
+          3      |      9     |    3    |  3
+          4      |      9     |    4    |  0
+          5      |      9     |    5    |  1
+          6      |      9     |    6    |  2
+          7      |      9     |    7    |  3
+          8      |      9     |    8    |  0
+          9      |      9     |    9    |  1
+    """)
+
+    execute_query(
+        "SELECT first_value(unique1) over w AS first_value, "
+        "last_value(unique1) over w AS last_value, unique1, four "
+        "FROM tenk1 WHERE unique1 < 10 "
+        "WINDOW w AS (order by unique1 range between current row and unbounded following)",
+        expected=expected
+    )
+
+@TestScenario
+def between_expr_preceding_and_expr_following_with_partition_by_two_columns(self):
+    """Check range between n preceding and n following frame with partition
+    by two int value columns.
+    """
+    expected = convert_output("""
+     f1 | sum
+    ----+-----
+      1 |   0
+      2 |   0
+    """)
+
+    execute_query(
+        """
+        select f1, sum(f1) over (partition by f1, f2 order by f2
+                                 range between 1 following and 2 following) AS sum
+        from t1 where f1 = f2
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def between_expr_preceding_and_expr_following_with_partition_by_same_column_twice(self):
+    """Check range between n preceding and n folowing with partition
+    by the same column twice.
+    """
+    expected = convert_output("""
+     f1 | sum
+    ----+-----
+      1 |   0
+      2 |   0
+    """)
+
+    execute_query(
+        """
+        select * from (select f1, sum(f1) over (partition by f1, f1 order by f2
+                                 range between 2 preceding and 1 preceding) AS sum
+        from t1 where f1 = f2) order by f1, sum
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def between_expr_preceding_and_expr_following_with_partition_and_order_by(self):
+    """Check range between expr preceding and expr following frame used
+    with partition by and order by clauses.
+    """
+    expected = convert_output("""
+     f1 | sum
+    ----+-----
+      1 |   1
+      2 |   2
+    """)
+
+    execute_query(
+        """
+        select f1, sum(f1) over (partition by f1 order by f2
+                                 range between 1 preceding and 1 following) AS sum
+        from t1 where f1 = f2
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def order_by_decimal(self):
+    """Check using range with order by decimal column.
+    """
+    expected = convert_output("""
+     id | f_numeric | first_value | last_value
+    ----+-----------+-------------+------------
+      0 |     -1000 |           0 |          0
+      1 |        -3 |           1 |          1
+      2 |        -1 |           2 |          3
+      3 |         0 |           2 |          4
+      4 |       1.1 |           4 |          6
+      5 |      1.12 |           4 |          6
+      6 |         2 |           4 |          6
+      7 |       100 |           7 |          7
+      8 |      1000 |           8 |          8
+      9 |       0   |           9 |          9
+    """)
+
+    execute_query(
+        """
+        select id, f_numeric, first_value(id) over w AS first_value, last_value(id) over w AS last_value
+        from numerics
+        window w as (order by f_numeric range between
+                     1 preceding and 1 following)
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def order_by_float(self):
+    """Check using range with order by float column.
+    """
+    expected = convert_output("""
+     id | f_float4  | first_value | last_value
+    ----+-----------+-------------+------------
+      0 |      -inf |           0 |          0
+      1 |        -3 |           1 |          1
+      2 |        -1 |           2 |          3
+      3 |         0 |           2 |          3
+      4 |       1.1 |           4 |          6
+      5 |      1.12 |           4 |          6
+      6 |         2 |           4 |          6
+      7 |       100 |           7 |          7
+      8 |       inf |           8 |          8
+      9 |       nan |           8 |          8
+    """)
+
+    execute_query(
+        """
+        select id, f_float4, first_value(id) over w AS first_value, last_value(id) over w AS last_value
+        from numerics
+        window w as (order by f_float4 range between
+                     1 preceding and 1 following)
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def with_nulls(self):
+    """Check using range frame over window with nulls.
+    """
+    expected = convert_output("""
+     x | y  | first_value | last_value
+    ---+----+-------------+------------
+   \\N | 42 |          42 |         43
+   \\N | 43 |          42 |         43
+     1 |  1 |           1 |          3
+     2 |  2 |           1 |          4
+     3 |  3 |           1 |          5
+     4 |  4 |           2 |          5
+     5 |  5 |           3 |          5
+    """)
+
+    execute_query(
+        """
+        select x, y,
+               first_value(y) over w AS first_value,
+               last_value(y) over w AS last_value
+        from
+          (select number as x, x as y from numbers(1,5)
+           union all select null, 42
+           union all select null, 43)
+        window w as
+          (order by x asc nulls first range between 2 preceding and 2 following)
+        """,
+        expected=expected
+    )
+
+@TestFeature
+@Name("range frame")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame("1.0"),
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame_DataTypes_IntAndUInt("1.0")
+)
+def feature(self):
+    """Check defining range frame.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/range_overflow.py b/tests/testflows/window_functions/tests/range_overflow.py
new file mode 100644
index 00000000000..0c66e54c8ee
--- /dev/null
+++ b/tests/testflows/window_functions/tests/range_overflow.py
@@ -0,0 +1,135 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def positive_overflow_with_Int16(self):
+    """Check positive overflow with Int16.
+    """
+    expected = convert_output("""
+       x   | last_value 
+    -------+------------
+     32764 |          0
+     32765 |          0
+     32766 |          0
+    """)
+
+    execute_query(
+        """
+        select number as x, last_value(x) over (order by toInt16(x) range between current row and 2147450884 following) AS last_value
+        from numbers(32764, 3)
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def negative_overflow_with_Int16(self):
+    """Check negative overflow with Int16.
+    """
+    expected = convert_output("""
+       x    | last_value 
+    --------+------------
+     -32764 |          0
+     -32765 |          0
+     -32766 |          0
+    """)
+
+    execute_query(
+        """
+        select number as x, last_value(x) over (order by toInt16(x) desc range between current row and 2147450885 following) as last_value
+        from (SELECT -number - 32763 AS number FROM numbers(1, 3))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def positive_overflow_for_Int32(self):
+    """Check positive overflow for Int32.
+    """
+    expected = convert_output("""
+         x      | last_value 
+    ------------+------------
+     2147483644 | 2147483646
+     2147483645 | 2147483646
+     2147483646 | 2147483646
+    """)
+
+    execute_query(
+        """
+        select number as x, last_value(x) over (order by x range between current row and 4 following) as last_value
+        from numbers(2147483644, 3) 
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def negative_overflow_for_Int32(self):
+    """Check negative overflow for Int32.
+    """
+    expected = convert_output("""
+          x      | last_value  
+    -------------+-------------
+     -2147483644 | -2147483646
+     -2147483645 | -2147483646
+     -2147483646 | -2147483646
+    """)
+
+    execute_query(
+        """
+        select number as x, last_value(x) over (order by x desc range between current row and 5 following) as last_value
+        from (select -number-2147483643 AS number FROM numbers(1,3))
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def positive_overflow_for_Int64(self):
+    """Check positive overflow for Int64.
+    """
+    expected = convert_output("""
+              x          |     last_value      
+    ---------------------+---------------------
+     9223372036854775804 | 9223372036854775806
+     9223372036854775805 | 9223372036854775806
+     9223372036854775806 | 9223372036854775806
+    """)
+
+    execute_query(
+        """
+        select number as x, last_value(x) over (order by x range between current row and 4 following) as last_value
+        from numbers(9223372036854775804, 3) 
+        """,
+        expected=expected
+    )
+
+@TestScenario
+def negative_overflow_for_Int64(self):
+    """Check negative overflow for Int64.
+    """
+    expected = convert_output("""
+              x           |      last_value      
+    ----------------------+----------------------
+     -9223372036854775804 | -9223372036854775806
+     -9223372036854775805 | -9223372036854775806
+     -9223372036854775806 | -9223372036854775806
+    """)
+
+    execute_query(
+        """
+        select number as x, last_value(x) over (order by x desc range between current row and 5 following) as last_value
+        from (select -number-9223372036854775803 AS number from numbers(1,3)) 
+        """,
+        expected=expected
+    )
+
+@TestFeature
+@Name("range overflow")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RangeFrame("1.0")
+)
+def feature(self):
+    """Check using range frame with overflows.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/rows_frame.py b/tests/testflows/window_functions/tests/rows_frame.py
new file mode 100644
index 00000000000..07533e8d1ab
--- /dev/null
+++ b/tests/testflows/window_functions/tests/rows_frame.py
@@ -0,0 +1,688 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_MissingFrameExtent_Error("1.0")
+)
+def missing_frame_extent(self):
+    """Check that when rows frame has missing frame extent then an error is returned.
+    """
+    exitcode, message = syntax_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number ROWS) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_InvalidFrameExtent_Error("1.0")
+)
+def invalid_frame_extent(self):
+    """Check that when rows frame has invalid frame extent then an error is returned.
+    """
+    exitcode, message = frame_offset_nonnegative_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number ROWS -1) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_CurrentRow("1.0")
+)
+def start_current_row(self):
+    """Check rows current row frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+-------
+       1    |  5000  | 5000
+       2    |  3900  | 3900
+       3    |  4800  | 4800
+       4    |  4800  | 4800
+       5    |  3500  | 3500
+       7    |  4200  | 4200
+       8    |  6000  | 6000
+       9    |  4500  | 4500
+      10    |  5200  | 5200
+      11    |  5200  | 5200
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS CURRENT ROW) AS sum FROM empsalary ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_UnboundedPreceding("1.0")
+)
+def start_unbounded_preceding(self):
+    """Check rows unbounded preceding frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+-------
+        1   |  5000  | 5000
+        2   |  3900  | 8900
+        3   |  4800  | 13700
+        4   |  4800  | 18500
+        5   |  3500  | 22000
+        7   |  4200  | 26200
+        8   |  6000  | 32200
+        9   |  4500  | 36700
+        10  |  5200  | 41900
+        11  |  5200  | 47100
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS UNBOUNDED PRECEDING) AS sum FROM empsalary ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_ExprPreceding("1.0")
+)
+def start_expr_preceding(self):
+    """Check rows expr preceding frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+       1    |  5000  | 5000
+       2    |  3900  | 8900
+       3    |  4800  | 8700
+       4    |  4800  | 9600
+       5    |  3500  | 8300
+       7    |  4200  | 7700
+       8    |  6000  | 10200
+       9    |  4500  | 10500
+       10   |  5200  | 9700
+       11   |  5200  | 10400
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS 1 PRECEDING) AS sum FROM empsalary ORDER BY empno",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_UnboundedFollowing_Error("1.0")
+)
+def start_unbounded_following_error(self):
+    """Check rows unbounded following frame returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    self.context.node.query(
+        "SELECT empno, salary, sum(salary) OVER (ROWS UNBOUNDED FOLLOWING) AS sum FROM empsalary ORDER BY empno",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Start_ExprFollowing_Error("1.0")
+)
+def start_expr_following_error(self):
+    """Check rows expr following frame returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query(
+        "SELECT empno, salary, sum(salary) OVER (ROWS 1 FOLLOWING) AS sum FROM empsalary ORDER BY empno",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_CurrentRow("1.0")
+)
+def between_current_row_and_current_row(self):
+    """Check rows between current row and current row frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+        1   |  5000  | 5000
+        2   |  3900  | 3900
+        3   |  4800  | 4800
+        4   |  4800  | 4800
+        5   |  3500  | 3500
+        7   |  4200  | 4200
+        8   |  6000  | 6000
+        9   |  4500  | 4500
+        10  |  5200  | 5200
+        11  |  5200  | 5200
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN CURRENT ROW AND CURRENT ROW) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_ExprPreceding_Error("1.0")
+)
+def between_current_row_and_expr_preceding_error(self):
+    """Check rows between current row and expr preceding returns an error.
+    """
+    exitcode, message = window_frame_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number ROWS BETWEEN CURRENT ROW AND 1 PRECEDING) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_UnboundedPreceding_Error("1.0")
+)
+def between_current_row_and_unbounded_preceding_error(self):
+    """Check rows between current row and unbounded preceding returns an error.
+    """
+    exitcode, message = frame_end_unbounded_preceding_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ORDER BY number ROWS BETWEEN CURRENT ROW AND UNBOUNDED PRECEDING) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_UnboundedFollowing("1.0")
+)
+def between_current_row_and_unbounded_following(self):
+    """Check rows between current row and unbounded following.
+    """
+    expected = convert_output("""
+         sum | unique1 | four
+        -----+---------+------
+         45	 |    0    |   0
+         45	 |    1    |   1
+         44	 |    2    |   2
+         42	 |    3    |   3
+         39	 |    4    |   0
+         35	 |    5    |   1
+         30	 |    6    |   2
+         24	 |    7    |   3
+         17	 |    8    |   0
+         9   |    9    |   1
+        """)
+
+    execute_query(
+        "SELECT sum(unique1) over (order by unique1 rows between current row and unbounded following) AS sum,"
+        "unique1, four "
+        "FROM tenk1 WHERE unique1 < 10",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_CurrentRow_ExprFollowing("1.0")
+)
+def between_current_row_and_expr_following(self):
+    """Check rows between current row and expr following.
+    """
+    expected = convert_output("""
+     i | b | bool_and | bool_or
+    ---+---+----------+---------
+     1 | 1 | 1        | 1
+     2 | 1 | 0        | 1
+     3 | 0 | 0        | 0
+     4 | 0 | 0        | 1
+     5 | 1 | 1        | 1
+    """)
+
+    execute_query("""
+        SELECT i, b, groupBitAnd(b) OVER w AS bool_and, groupBitOr(b) OVER w AS bool_or
+          FROM VALUES('i Int8, b UInt8', (1,1), (2,1), (3,0), (4,0), (5,1))
+          WINDOW w AS (ORDER BY i ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING)
+        """,
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_CurrentRow("1.0")
+)
+def between_unbounded_preceding_and_current_row(self):
+    """Check rows between unbounded preceding and current row.
+    """
+    expected = convert_output("""
+         four | two | sum | last_value
+        ------+-----+-----+------------
+            0 |   0 |   0 |          0
+            0 |   0 |   0 |          0
+            0 |   1 |   1 |          1
+            0 |   1 |   2 |          1
+            0 |   2 |   4 |          2
+            1 |   0 |   0 |          0
+            1 |   0 |   0 |          0
+            1 |   1 |   1 |          1
+            1 |   1 |   2 |          1
+            1 |   2 |   4 |          2
+            2 |   0 |   0 |          0
+            2 |   0 |   0 |          0
+            2 |   1 |   1 |          1
+            2 |   1 |   2 |          1
+            2 |   2 |   4 |          2
+            3 |   0 |   0 |          0
+            3 |   0 |   0 |          0
+            3 |   1 |   1 |          1
+            3 |   1 |   2 |          1
+            3 |   2 |   4 |          2
+        """)
+
+    execute_query(
+        "SELECT four, toInt8(ten/4) as two,"
+        "sum(toInt8(ten/4)) over (partition by four order by toInt8(ten/4) rows between unbounded preceding and current row) AS sum,"
+        "last_value(toInt8(ten/4)) over (partition by four order by toInt8(ten/4) rows between unbounded preceding and current row) AS last_value "
+        "FROM (select distinct ten, four from tenk1)",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_UnboundedPreceding_Error("1.0")
+)
+def between_unbounded_preceding_and_unbounded_preceding_error(self):
+    """Check rows between unbounded preceding and unbounded preceding returns an error.
+    """
+    exitcode, message = frame_end_unbounded_preceding_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_ExprPreceding("1.0")
+)
+def between_unbounded_preceding_and_expr_preceding(self):
+    """Check rows between unbounded preceding and expr preceding frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+       1    |  5000  | 0
+       2    |  3900  | 5000
+       3    |  4800  | 8900
+       4    |  4800  | 13700
+       5    |  3500  | 18500
+       7    |  4200  | 22000
+       8    |  6000  | 26200
+       9    |  4500  | 32200
+       10   |  5200  | 36700
+       11   |  5200  | 41900
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_UnboundedFollowing("1.0")
+)
+def between_unbounded_preceding_and_unbounded_following(self):
+    """Check rows between unbounded preceding and unbounded following frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+       1    |  5000  | 47100
+       2    |  3900  | 47100
+       3    |  4800  | 47100
+       4    |  4800  | 47100
+       5    |  3500  | 47100
+       7    |  4200  | 47100
+       8    |  6000  | 47100
+       9    |  4500  | 47100
+       10   |  5200  | 47100
+       11   |  5200  | 47100
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedPreceding_ExprFollowing("1.0")
+)
+def between_unbounded_preceding_and_expr_following(self):
+    """Check rows between unbounded preceding and expr following.
+    """
+    expected = convert_output("""
+         sum | unique1 | four
+        -----+---------+------
+          1  |    0    |  0
+          3  |    1    |  1
+          6  |    2    |  2
+          10 |    3    |  3
+          15 |    4    |  0
+          21 |    5    |  1
+          28 |    6    |  2
+          36 |    7    |  3
+          45 |    8    |  0
+          45 |    9    |  1
+        """)
+
+    execute_query(
+        "SELECT sum(unique1) over (order by unique1 rows between unbounded preceding and 1 following) AS sum,"
+        "unique1, four "
+        "FROM tenk1 WHERE unique1 < 10",
+        expected=expected
+    )
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_UnboundedFollowing_Error("1.0")
+)
+@Examples("range", [
+    ("UNBOUNDED FOLLOWING AND CURRENT ROW",),
+    ("UNBOUNDED FOLLOWING AND UNBOUNDED PRECEDING",),
+    ("UNBOUNDED FOLLOWING AND UNBOUNDED FOLLOWING",),
+    ("UNBOUNDED FOLLOWING AND 1 PRECEDING",),
+    ("UNBOUNDED FOLLOWING AND 1 FOLLOWING",),
+])
+def between_unbounded_following_error(self, range):
+    """Check rows between unbounded following and any end frame returns an error.
+    """
+    exitcode, message = frame_start_error()
+
+    self.context.node.query(f"SELECT number,sum(number) OVER (ROWS BETWEEN {range}) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestOutline(Scenario)
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_Error("1.0")
+)
+@Examples("range exitcode message", [
+    ("1 FOLLOWING AND CURRENT ROW", *window_frame_error()),
+    ("1 FOLLOWING AND UNBOUNDED PRECEDING", *frame_end_unbounded_preceding_error()),
+    ("1 FOLLOWING AND 1 PRECEDING", *frame_start_error())
+])
+def between_expr_following_error(self, range, exitcode, message):
+    """Check cases when rows between expr following returns an error.
+    """
+    self.context.node.query(f"SELECT number,sum(number) OVER (ROWS BETWEEN {range}) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_ExprFollowing_Error("1.0")
+)
+def between_expr_following_and_expr_following_error(self):
+    """Check rows between expr following and expr following returns an error when frame end index is less
+    than frame start.
+    """
+    exitcode, message = frame_start_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ROWS BETWEEN 1 FOLLOWING AND 0 FOLLOWING) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_UnboundedFollowing("1.0")
+)
+def between_expr_following_and_unbounded_following(self):
+    """Check rows between exp following and unbounded following frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+        1   |  5000  | 28600
+        2   |  3900  | 25100
+        3   |  4800  | 20900
+        4   |  4800  | 14900
+        5   |  3500  | 10400
+        7   |  4200  | 5200
+        8   |  6000  | 0
+        9   |  4500  | 0
+        10  |  5200  | 0
+        11  |  5200  | 0
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN 4 FOLLOWING AND UNBOUNDED FOLLOWING) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_ExprFollowing("1.0")
+)
+def between_expr_following_and_expr_following(self):
+    """Check rows between exp following and expr following frame when end of the frame is greater than
+    the start of the frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+        1   |  5000  | 17000
+        2   |  3900  | 17300
+        3   |  4800  | 18500
+        4   |  4800  | 18200
+        5   |  3500  | 19900
+        7   |  4200  | 20900
+        8   |  6000  | 14900
+        9   |  4500  | 10400
+        10  |  5200  | 5200
+        11  |  5200  | 0
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN 1 FOLLOWING AND 4 FOLLOWING) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_CurrentRow("1.0")
+)
+def between_expr_preceding_and_current_row(self):
+    """Check rows between exp preceding and current row frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+         8  |   6000 |  6000
+        10  |   5200 | 11200
+        11  |   5200 | 10400
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN 1 PRECEDING AND CURRENT ROW) AS sum FROM empsalary WHERE salary > 5000",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_UnboundedPreceding_Error("1.0")
+)
+def between_expr_preceding_and_unbounded_preceding_error(self):
+    """Check rows between expr preceding and unbounded preceding returns an error.
+    """
+    exitcode, message = frame_end_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND UNBOUNDED PRECEDING) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_UnboundedFollowing("1.0")
+)
+def between_expr_preceding_and_unbounded_following(self):
+    """Check rows between exp preceding and unbounded following frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+        8   |   6000 | 16400
+       10   |   5200 | 16400
+       11   |   5200 | 10400
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) AS sum FROM empsalary WHERE salary > 5000",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprPreceding_Error("1.0")
+)
+def between_expr_preceding_and_expr_preceding_error(self):
+    """Check rows between expr preceding and expr preceding returns an error when frame end is
+    before frame start.
+    """
+    exitcode, message = frame_start_error()
+
+    self.context.node.query("SELECT number,sum(number) OVER (ROWS BETWEEN 1 PRECEDING AND 2 PRECEDING) FROM numbers(1,3)",
+        exitcode=exitcode, message=message)
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprPreceding("1.0")
+)
+def between_expr_preceding_and_expr_preceding(self):
+    """Check rows between expr preceding and expr preceding frame when frame end is after or at frame start.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+       1    | 5000   | 5000
+       2    | 3900   | 8900
+       3    | 4800   | 8700
+       4    | 4800   | 9600
+       5    | 3500   | 8300
+       7    | 4200   | 7700
+       8    | 6000   | 10200
+       9    | 4500   | 10500
+       10   | 5200   | 9700
+       11   | 5200   | 10400
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN 1 PRECEDING AND 0 PRECEDING) AS sum FROM empsalary",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprFollowing("1.0")
+)
+def between_expr_preceding_and_expr_following(self):
+    """Check rows between expr preceding and expr following frame.
+    """
+    expected = convert_output("""
+      empno | salary | sum
+    --------+--------+--------
+       8    |   6000 | 11200
+      10    |   5200 | 16400
+      11    |   5200 | 10400
+    """)
+
+    execute_query(
+        "SELECT empno, salary, sum(salary) OVER (ORDER BY empno ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum FROM empsalary WHERE salary > 5000",
+        expected=expected
+    )
+
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprFollowing_ExprFollowing("1.0")
+)
+def between_expr_following_and_expr_following_ref(self):
+    """Check reference result for rows between expr following and expr following range.
+    """
+    expected = convert_output("""
+     sum | unique1 | four
+    -----+---------+------
+      6  |    0    |  0
+      9  |    1    |  1
+      12 |    2    |  2
+      15 |    3    |  3
+      18 |    4    |  0
+      21 |    5    |  1
+      24 |    6    |  2
+      17 |    7    |  3
+      9  |    8    |  0
+      0  |    9    |  1
+    """)
+
+    execute_query(
+        "SELECT sum(unique1) over (order by unique1 rows between 1 following and 3 following) AS sum,"
+        "unique1, four "
+        "FROM tenk1 WHERE unique1 < 10",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprPreceding("1.0")
+)
+def between_expr_preceding_and_expr_preceding_ref(self):
+    """Check reference result for rows between expr preceding and expr preceding frame.
+    """
+    expected = convert_output("""
+     sum | unique1 | four
+    -----+---------+------
+      0  |   0     |  0
+      0  |   1     |  1
+      1  |   2     |  2
+      3  |   3     |  3
+      5  |   4     |  0
+      7  |   5     |  1
+      9  |   6     |  2
+      11 |   7     |  3
+      13 |   8     |  0
+      15 |   9     |  1
+    """)
+
+    execute_query(
+        "SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 1 preceding) AS sum,"
+        "unique1, four "
+        "FROM tenk1 WHERE unique1 < 10",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame_Between_ExprPreceding_ExprFollowing("1.0")
+)
+def between_expr_preceding_and_expr_following_ref(self):
+    """Check reference result for rows between expr preceding and expr following frame.
+    """
+    expected = convert_output("""
+     sum | unique1 | four
+    -----+---------+------
+      3  |   0     |  0
+      6  |   1     |  1
+      10 |   2     |  2
+      15 |   3     |  3
+      20 |   4     |  0
+      25 |   5     |  1
+      30 |   6     |  2
+      35 |   7     |  3
+      30 |   8     |  0
+      24 |   9     |  1
+    """)
+
+    execute_query(
+        "SELECT sum(unique1) over (order by unique1 rows between 2 preceding and 2 following) AS sum, "
+        "unique1, four "
+        "FROM tenk1 WHERE unique1 < 10",
+        expected=expected
+    )
+
+@TestFeature
+@Name("rows frame")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_RowsFrame("1.0")
+)
+def feature(self):
+    """Check defining rows frame.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/snapshots/common.py.tests.snapshot b/tests/testflows/window_functions/tests/snapshots/common.py.tests.snapshot
new file mode 100644
index 00000000000..68607f86d92
--- /dev/null
+++ b/tests/testflows/window_functions/tests/snapshots/common.py.tests.snapshot
@@ -0,0 +1,826 @@
+func__count_salary__ = r"""
+func
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
+"""
+
+func__min_salary__ = r"""
+func
+3500
+3900
+4200
+4500
+4800
+4800
+5000
+5200
+5200
+6000
+"""
+
+func__max_salary__ = r"""
+func
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+"""
+
+func__sum_salary__ = r"""
+func
+47100
+43600
+39700
+35500
+31000
+26200
+21400
+16400
+11200
+6000
+"""
+
+func__avg_salary__ = r"""
+func
+4710
+4844.444444444444
+4962.5
+5071.428571428572
+5166.666666666667
+5240
+5350
+5466.666666666667
+5600
+6000
+"""
+
+func__any_salary__ = r"""
+func
+3500
+3900
+4200
+4500
+4800
+4800
+5000
+5200
+5200
+6000
+"""
+
+func__stddevPop_salary__ = r"""
+func
+683.3008122342604
+581.3989089756045
+504.8205126577168
+443.08749769345
+406.88518719112545
+407.9215610874228
+384.0572873934304
+377.1236166328275
+400
+0
+"""
+
+func__stddevSamp_salary__ = r"""
+func
+720.2622979011034
+616.6666666666654
+539.6758286230726
+478.5891965429401
+445.720390678583
+456.0701700396552
+443.471156521669
+461.8802153517033
+565.685424949238
+nan
+"""
+
+func__varPop_salary__ = r"""
+func
+466900
+338024.6913580232
+254843.75
+196326.53061224308
+165555.55555555722
+166400
+147500
+142222.22222222388
+160000
+0
+"""
+
+func__varSamp_salary__ = r"""
+func
+518777.77777777775
+380277.7777777761
+291250
+229047.61904761693
+198666.66666666867
+208000
+196666.66666666666
+213333.33333333582
+320000
+nan
+"""
+
+func__covarPop_salary__2000__ = r"""
+func
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+"""
+
+func__covarSamp_salary__2000__ = r"""
+func
+0
+0
+0
+0
+0
+0
+0
+0
+0
+nan
+"""
+
+func__anyHeavy_salary__ = r"""
+func
+5200
+5200
+5200
+5200
+5200
+5200
+5200
+5200
+5200
+6000
+"""
+
+func__anyLast_salary__ = r"""
+func
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+6000
+"""
+
+func__argMin_salary__5000__ = r"""
+func
+3500
+3900
+4200
+4500
+4800
+4800
+5000
+5200
+5200
+6000
+"""
+
+func__argMax_salary__5000__ = r"""
+func
+3500
+3900
+4200
+4500
+4800
+4800
+5000
+5200
+5200
+6000
+"""
+
+func__avgWeighted_salary__1__ = r"""
+func
+4710
+4844.444444444444
+4962.5
+5071.428571428572
+5166.666666666667
+5240
+5350
+5466.666666666667
+5600
+6000
+"""
+
+func__corr_salary__0_5__ = r"""
+func
+nan
+nan
+nan
+nan
+nan
+nan
+nan
+nan
+nan
+nan
+"""
+
+func__topK_salary__ = r"""
+func
+[4800,5200,3500,3900,4200,4500,5000,6000]
+[4800,5200,3900,4200,4500,5000,6000]
+[4800,5200,4200,4500,5000,6000]
+[4800,5200,4500,5000,6000]
+[4800,5200,5000,6000]
+[5200,4800,5000,6000]
+[5200,5000,6000]
+[5200,6000]
+[5200,6000]
+[6000]
+"""
+
+func__topKWeighted_salary__1__ = r"""
+func
+[4800,5200,3500,3900,4200,4500,5000,6000]
+[4800,5200,3900,4200,4500,5000,6000]
+[4800,5200,4200,4500,5000,6000]
+[4800,5200,4500,5000,6000]
+[4800,5200,5000,6000]
+[5200,4800,5000,6000]
+[5200,5000,6000]
+[5200,6000]
+[5200,6000]
+[6000]
+"""
+
+func__groupArray_salary__ = r"""
+func
+[3500,3900,4200,4500,4800,4800,5000,5200,5200,6000]
+[3900,4200,4500,4800,4800,5000,5200,5200,6000]
+[4200,4500,4800,4800,5000,5200,5200,6000]
+[4500,4800,4800,5000,5200,5200,6000]
+[4800,4800,5000,5200,5200,6000]
+[4800,5000,5200,5200,6000]
+[5000,5200,5200,6000]
+[5200,5200,6000]
+[5200,6000]
+[6000]
+"""
+
+func__groupUniqArray_salary__ = r"""
+func
+[3500,5000,6000,3900,4800,5200,4200,4500]
+[5000,6000,3900,4800,5200,4200,4500]
+[5000,6000,4800,5200,4200,4500]
+[5000,6000,4800,5200,4500]
+[5000,6000,4800,5200]
+[5000,6000,4800,5200]
+[5000,6000,5200]
+[6000,5200]
+[6000,5200]
+[6000]
+"""
+
+func__groupArrayInsertAt_salary__0__ = r"""
+func
+[3500]
+[3900]
+[4200]
+[4500]
+[4800]
+[4800]
+[5000]
+[5200]
+[5200]
+[6000]
+"""
+
+func__groupArrayMovingSum_salary__ = r"""
+func
+[3500,7400,11600,16100,20900,25700,30700,35900,41100,47100]
+[3900,8100,12600,17400,22200,27200,32400,37600,43600]
+[4200,8700,13500,18300,23300,28500,33700,39700]
+[4500,9300,14100,19100,24300,29500,35500]
+[4800,9600,14600,19800,25000,31000]
+[4800,9800,15000,20200,26200]
+[5000,10200,15400,21400]
+[5200,10400,16400]
+[5200,11200]
+[6000]
+"""
+
+func__groupArrayMovingAvg_salary__ = r"""
+func
+[350,740,1160,1610,2090,2570,3070,3590,4110,4710]
+[433.3333333333333,900,1400,1933.3333333333333,2466.6666666666665,3022.222222222222,3600,4177.777777777777,4844.444444444444]
+[525,1087.5,1687.5,2287.5,2912.5,3562.5,4212.5,4962.5]
+[642.8571428571429,1328.5714285714287,2014.2857142857142,2728.5714285714284,3471.4285714285716,4214.285714285715,5071.428571428572]
+[800,1600,2433.3333333333335,3300,4166.666666666667,5166.666666666667]
+[960,1960,3000,4040,5240]
+[1250,2550,3850,5350]
+[1733.3333333333333,3466.6666666666665,5466.666666666667]
+[2600,5600]
+[6000]
+"""
+
+func__groupArraySample_3__1234__salary__ = r"""
+func
+[6000,4800,4200]
+[4800,5000,4500]
+[4800,5200,4800]
+[5000,5200,4800]
+[5200,6000,5000]
+[5200,6000,5200]
+[6000,5200,5200]
+[5200,5200,6000]
+[5200,6000]
+[6000]
+"""
+
+func__groupBitAnd_toUInt8_salary___ = r"""
+func
+0
+0
+0
+0
+0
+0
+0
+80
+80
+112
+"""
+
+func__groupBitOr_toUInt8_salary___ = r"""
+func
+252
+252
+252
+252
+248
+248
+248
+112
+112
+112
+"""
+
+func__groupBitXor_toUInt8_salary___ = r"""
+func
+148
+56
+4
+108
+248
+56
+248
+112
+32
+112
+"""
+
+func__groupBitmap_toUInt8_salary___ = r"""
+func
+8
+7
+6
+5
+4
+4
+3
+2
+2
+1
+"""
+
+func__sumWithOverflow_salary__ = r"""
+func
+47100
+43600
+39700
+35500
+31000
+26200
+21400
+16400
+11200
+6000
+"""
+
+func__deltaSum_salary__ = r"""
+func
+2500
+2100
+1800
+1500
+1200
+1200
+1000
+800
+800
+0
+"""
+
+func__sumMap__5000____salary___ = r"""
+func
+([5000],[47100])
+([5000],[43600])
+([5000],[39700])
+([5000],[35500])
+([5000],[31000])
+([5000],[26200])
+([5000],[21400])
+([5000],[16400])
+([5000],[11200])
+([5000],[6000])
+"""
+
+func__minMap__5000____salary___ = r"""
+func
+([5000],[3500])
+([5000],[3900])
+([5000],[4200])
+([5000],[4500])
+([5000],[4800])
+([5000],[4800])
+([5000],[5000])
+([5000],[5200])
+([5000],[5200])
+([5000],[6000])
+"""
+
+func__maxMap__5000____salary___ = r"""
+func
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+([5000],[6000])
+"""
+
+func__skewPop_salary__ = r"""
+func
+-0.01162261667454972
+0.2745338273905704
+0.5759615484689373
+0.9491407966637483
+1.1766149730944095
+1.0013237284459204
+0.9929662701927243
+0.7071067811864931
+0
+nan
+"""
+
+func__skewSamp_salary__ = r"""
+func
+-0.009923564086909852
+0.2300737552746305
+0.4714173586339343
+0.7532002517703689
+0.8950813364751975
+0.7164889357723577
+0.6449505113159867
+0.3849001794597209
+0
+nan
+"""
+
+func__kurtPop_salary__ = r"""
+func
+2.539217051205756
+2.7206630060048402
+2.983661891140213
+3.193064086003685
+3.1570199540482906
+2.7045118343195265
+2.235277219189888
+1.499999999988063
+1
+nan
+"""
+
+func__kurtSamp_salary__ = r"""
+func
+2.0567658114766627
+2.1496596590655526
+2.2843661354042255
+2.3459246346149527
+2.1923749680890907
+1.730887573964497
+1.2573434357943123
+0.6666666666613614
+0.25
+nan
+"""
+
+func__uniq_salary__ = r"""
+func
+8
+7
+6
+5
+4
+4
+3
+2
+2
+1
+"""
+
+func__uniqExact_salary__ = r"""
+func
+8
+7
+6
+5
+4
+4
+3
+2
+2
+1
+"""
+
+func__uniqCombined_salary__ = r"""
+func
+8
+7
+6
+5
+4
+4
+3
+2
+2
+1
+"""
+
+func__uniqCombined64_salary__ = r"""
+func
+8
+7
+6
+5
+4
+4
+3
+2
+2
+1
+"""
+
+func__uniqHLL12_salary__ = r"""
+func
+8
+7
+6
+5
+4
+4
+3
+2
+2
+1
+"""
+
+func__quantile_salary__ = r"""
+func
+4800
+4800
+4900
+5000
+5100
+5200
+5200
+5200
+5600
+6000
+"""
+
+func__quantiles_0_5__salary__ = r"""
+func
+[4800]
+[4800]
+[4900]
+[5000]
+[5100]
+[5200]
+[5200]
+[5200]
+[5600]
+[6000]
+"""
+
+func__quantileExact_salary__ = r"""
+func
+4800
+4800
+5000
+5000
+5200
+5200
+5200
+5200
+6000
+6000
+"""
+
+func__quantileExactWeighted_salary__1__ = r"""
+func
+4800
+4800
+4800
+5000
+5000
+5200
+5200
+5200
+5200
+6000
+"""
+
+func__quantileTiming_salary__ = r"""
+func
+4800
+4800
+5000
+5000
+5200
+5200
+5200
+5200
+6000
+6000
+"""
+
+func__quantileTimingWeighted_salary__1__ = r"""
+func
+4800
+4800
+5000
+5000
+5200
+5200
+5200
+5200
+6000
+6000
+"""
+
+func__quantileDeterministic_salary__1234__ = r"""
+func
+4800
+4800
+4900
+5000
+5100
+5200
+5200
+5200
+5600
+6000
+"""
+
+func__quantileTDigest_salary__ = r"""
+func
+4800
+4800
+4800
+5000
+5000
+5200
+5200
+5200
+5200
+6000
+"""
+
+func__quantileTDigestWeighted_salary__1__ = r"""
+func
+4800
+4800
+4800
+5000
+5000
+5200
+5200
+5200
+5200
+6000
+"""
+
+func__simpleLinearRegression_salary__empno__ = r"""
+func
+(0.0017991004497751124,-2.473763118440779)
+(0.0023192111029948868,-5.12417823228634)
+(0.0013182096873083997,0.08338442673206625)
+(0.0021933471933471933,-4.551975051975051)
+(0.004664429530201342,-17.93288590604027)
+(0.003894230769230769,-13.60576923076923)
+(0.00288135593220339,-7.915254237288137)
+(-0.003125,26.75)
+(-0.00375,30.5)
+(nan,nan)
+"""
+
+func__stochasticLinearRegression_salary__1__ = r"""
+func
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+"""
+
+func__stochasticLogisticRegression_salary__1__ = r"""
+func
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+[0,0]
+"""
+
+func__studentTTest_salary__1__ = r"""
+func
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+"""
+
+func__welchTTest_salary__1__ = r"""
+func
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+(nan,0)
+"""
+
+func__median_salary__ = r"""
+func
+4800
+4800
+4900
+5000
+5100
+5200
+5200
+5200
+5600
+6000
+"""
+
diff --git a/tests/testflows/window_functions/tests/tenk.data b/tests/testflows/window_functions/tests/tenk.data
new file mode 100644
index 00000000000..c9064c9c032
--- /dev/null
+++ b/tests/testflows/window_functions/tests/tenk.data
@@ -0,0 +1,10000 @@
+8800	0	0	0	0	0	0	800	800	3800	8800	0	1	MAAAAA	AAAAAA	AAAAxx
+1891	1	1	3	1	11	91	891	1891	1891	1891	182	183	TUAAAA	BAAAAA	HHHHxx
+3420	2	0	0	0	0	20	420	1420	3420	3420	40	41	OBAAAA	CAAAAA	OOOOxx
+9850	3	0	2	0	10	50	850	1850	4850	9850	100	101	WOAAAA	DAAAAA	VVVVxx
+7164	4	0	0	4	4	64	164	1164	2164	7164	128	129	OPAAAA	EAAAAA	AAAAxx
+8009	5	1	1	9	9	9	9	9	3009	8009	18	19	BWAAAA	FAAAAA	HHHHxx
+5057	6	1	1	7	17	57	57	1057	57	5057	114	115	NMAAAA	GAAAAA	OOOOxx
+6701	7	1	1	1	1	1	701	701	1701	6701	2	3	TXAAAA	HAAAAA	VVVVxx
+4321	8	1	1	1	1	21	321	321	4321	4321	42	43	FKAAAA	IAAAAA	AAAAxx
+3043	9	1	3	3	3	43	43	1043	3043	3043	86	87	BNAAAA	JAAAAA	HHHHxx
+1314	10	0	2	4	14	14	314	1314	1314	1314	28	29	OYAAAA	KAAAAA	OOOOxx
+1504	11	0	0	4	4	4	504	1504	1504	1504	8	9	WFAAAA	LAAAAA	VVVVxx
+5222	12	0	2	2	2	22	222	1222	222	5222	44	45	WSAAAA	MAAAAA	AAAAxx
+6243	13	1	3	3	3	43	243	243	1243	6243	86	87	DGAAAA	NAAAAA	HHHHxx
+5471	14	1	3	1	11	71	471	1471	471	5471	142	143	LCAAAA	OAAAAA	OOOOxx
+5006	15	0	2	6	6	6	6	1006	6	5006	12	13	OKAAAA	PAAAAA	VVVVxx
+5387	16	1	3	7	7	87	387	1387	387	5387	174	175	FZAAAA	QAAAAA	AAAAxx
+5785	17	1	1	5	5	85	785	1785	785	5785	170	171	NOAAAA	RAAAAA	HHHHxx
+6621	18	1	1	1	1	21	621	621	1621	6621	42	43	RUAAAA	SAAAAA	OOOOxx
+6969	19	1	1	9	9	69	969	969	1969	6969	138	139	BIAAAA	TAAAAA	VVVVxx
+9460	20	0	0	0	0	60	460	1460	4460	9460	120	121	WZAAAA	UAAAAA	AAAAxx
+59	21	1	3	9	19	59	59	59	59	59	118	119	HCAAAA	VAAAAA	HHHHxx
+8020	22	0	0	0	0	20	20	20	3020	8020	40	41	MWAAAA	WAAAAA	OOOOxx
+7695	23	1	3	5	15	95	695	1695	2695	7695	190	191	ZJAAAA	XAAAAA	VVVVxx
+3442	24	0	2	2	2	42	442	1442	3442	3442	84	85	KCAAAA	YAAAAA	AAAAxx
+5119	25	1	3	9	19	19	119	1119	119	5119	38	39	XOAAAA	ZAAAAA	HHHHxx
+646	26	0	2	6	6	46	646	646	646	646	92	93	WYAAAA	ABAAAA	OOOOxx
+9605	27	1	1	5	5	5	605	1605	4605	9605	10	11	LFAAAA	BBAAAA	VVVVxx
+263	28	1	3	3	3	63	263	263	263	263	126	127	DKAAAA	CBAAAA	AAAAxx
+3269	29	1	1	9	9	69	269	1269	3269	3269	138	139	TVAAAA	DBAAAA	HHHHxx
+1839	30	1	3	9	19	39	839	1839	1839	1839	78	79	TSAAAA	EBAAAA	OOOOxx
+9144	31	0	0	4	4	44	144	1144	4144	9144	88	89	SNAAAA	FBAAAA	VVVVxx
+2513	32	1	1	3	13	13	513	513	2513	2513	26	27	RSAAAA	GBAAAA	AAAAxx
+8850	33	0	2	0	10	50	850	850	3850	8850	100	101	KCAAAA	HBAAAA	HHHHxx
+236	34	0	0	6	16	36	236	236	236	236	72	73	CJAAAA	IBAAAA	OOOOxx
+3162	35	0	2	2	2	62	162	1162	3162	3162	124	125	QRAAAA	JBAAAA	VVVVxx
+4380	36	0	0	0	0	80	380	380	4380	4380	160	161	MMAAAA	KBAAAA	AAAAxx
+8095	37	1	3	5	15	95	95	95	3095	8095	190	191	JZAAAA	LBAAAA	HHHHxx
+209	38	1	1	9	9	9	209	209	209	209	18	19	BIAAAA	MBAAAA	OOOOxx
+3055	39	1	3	5	15	55	55	1055	3055	3055	110	111	NNAAAA	NBAAAA	VVVVxx
+6921	40	1	1	1	1	21	921	921	1921	6921	42	43	FGAAAA	OBAAAA	AAAAxx
+7046	41	0	2	6	6	46	46	1046	2046	7046	92	93	ALAAAA	PBAAAA	HHHHxx
+7912	42	0	0	2	12	12	912	1912	2912	7912	24	25	ISAAAA	QBAAAA	OOOOxx
+7267	43	1	3	7	7	67	267	1267	2267	7267	134	135	NTAAAA	RBAAAA	VVVVxx
+3599	44	1	3	9	19	99	599	1599	3599	3599	198	199	LIAAAA	SBAAAA	AAAAxx
+923	45	1	3	3	3	23	923	923	923	923	46	47	NJAAAA	TBAAAA	HHHHxx
+1437	46	1	1	7	17	37	437	1437	1437	1437	74	75	HDAAAA	UBAAAA	OOOOxx
+6439	47	1	3	9	19	39	439	439	1439	6439	78	79	RNAAAA	VBAAAA	VVVVxx
+6989	48	1	1	9	9	89	989	989	1989	6989	178	179	VIAAAA	WBAAAA	AAAAxx
+8798	49	0	2	8	18	98	798	798	3798	8798	196	197	KAAAAA	XBAAAA	HHHHxx
+5960	50	0	0	0	0	60	960	1960	960	5960	120	121	GVAAAA	YBAAAA	OOOOxx
+5832	51	0	0	2	12	32	832	1832	832	5832	64	65	IQAAAA	ZBAAAA	VVVVxx
+6066	52	0	2	6	6	66	66	66	1066	6066	132	133	IZAAAA	ACAAAA	AAAAxx
+322	53	0	2	2	2	22	322	322	322	322	44	45	KMAAAA	BCAAAA	HHHHxx
+8321	54	1	1	1	1	21	321	321	3321	8321	42	43	BIAAAA	CCAAAA	OOOOxx
+734	55	0	2	4	14	34	734	734	734	734	68	69	GCAAAA	DCAAAA	VVVVxx
+688	56	0	0	8	8	88	688	688	688	688	176	177	MAAAAA	ECAAAA	AAAAxx
+4212	57	0	0	2	12	12	212	212	4212	4212	24	25	AGAAAA	FCAAAA	HHHHxx
+9653	58	1	1	3	13	53	653	1653	4653	9653	106	107	HHAAAA	GCAAAA	OOOOxx
+2677	59	1	1	7	17	77	677	677	2677	2677	154	155	ZYAAAA	HCAAAA	VVVVxx
+5423	60	1	3	3	3	23	423	1423	423	5423	46	47	PAAAAA	ICAAAA	AAAAxx
+2592	61	0	0	2	12	92	592	592	2592	2592	184	185	SVAAAA	JCAAAA	HHHHxx
+3233	62	1	1	3	13	33	233	1233	3233	3233	66	67	JUAAAA	KCAAAA	OOOOxx
+5032	63	0	0	2	12	32	32	1032	32	5032	64	65	OLAAAA	LCAAAA	VVVVxx
+2525	64	1	1	5	5	25	525	525	2525	2525	50	51	DTAAAA	MCAAAA	AAAAxx
+4450	65	0	2	0	10	50	450	450	4450	4450	100	101	EPAAAA	NCAAAA	HHHHxx
+5778	66	0	2	8	18	78	778	1778	778	5778	156	157	GOAAAA	OCAAAA	OOOOxx
+5852	67	0	0	2	12	52	852	1852	852	5852	104	105	CRAAAA	PCAAAA	VVVVxx
+5404	68	0	0	4	4	4	404	1404	404	5404	8	9	WZAAAA	QCAAAA	AAAAxx
+6223	69	1	3	3	3	23	223	223	1223	6223	46	47	JFAAAA	RCAAAA	HHHHxx
+6133	70	1	1	3	13	33	133	133	1133	6133	66	67	XBAAAA	SCAAAA	OOOOxx
+9112	71	0	0	2	12	12	112	1112	4112	9112	24	25	MMAAAA	TCAAAA	VVVVxx
+7575	72	1	3	5	15	75	575	1575	2575	7575	150	151	JFAAAA	UCAAAA	AAAAxx
+7414	73	0	2	4	14	14	414	1414	2414	7414	28	29	EZAAAA	VCAAAA	HHHHxx
+9741	74	1	1	1	1	41	741	1741	4741	9741	82	83	RKAAAA	WCAAAA	OOOOxx
+3767	75	1	3	7	7	67	767	1767	3767	3767	134	135	XOAAAA	XCAAAA	VVVVxx
+9372	76	0	0	2	12	72	372	1372	4372	9372	144	145	MWAAAA	YCAAAA	AAAAxx
+8976	77	0	0	6	16	76	976	976	3976	8976	152	153	GHAAAA	ZCAAAA	HHHHxx
+4071	78	1	3	1	11	71	71	71	4071	4071	142	143	PAAAAA	ADAAAA	OOOOxx
+1311	79	1	3	1	11	11	311	1311	1311	1311	22	23	LYAAAA	BDAAAA	VVVVxx
+2604	80	0	0	4	4	4	604	604	2604	2604	8	9	EWAAAA	CDAAAA	AAAAxx
+8840	81	0	0	0	0	40	840	840	3840	8840	80	81	ACAAAA	DDAAAA	HHHHxx
+567	82	1	3	7	7	67	567	567	567	567	134	135	VVAAAA	EDAAAA	OOOOxx
+5215	83	1	3	5	15	15	215	1215	215	5215	30	31	PSAAAA	FDAAAA	VVVVxx
+5474	84	0	2	4	14	74	474	1474	474	5474	148	149	OCAAAA	GDAAAA	AAAAxx
+3906	85	0	2	6	6	6	906	1906	3906	3906	12	13	GUAAAA	HDAAAA	HHHHxx
+1769	86	1	1	9	9	69	769	1769	1769	1769	138	139	BQAAAA	IDAAAA	OOOOxx
+1454	87	0	2	4	14	54	454	1454	1454	1454	108	109	YDAAAA	JDAAAA	VVVVxx
+6877	88	1	1	7	17	77	877	877	1877	6877	154	155	NEAAAA	KDAAAA	AAAAxx
+6501	89	1	1	1	1	1	501	501	1501	6501	2	3	BQAAAA	LDAAAA	HHHHxx
+934	90	0	2	4	14	34	934	934	934	934	68	69	YJAAAA	MDAAAA	OOOOxx
+4075	91	1	3	5	15	75	75	75	4075	4075	150	151	TAAAAA	NDAAAA	VVVVxx
+3180	92	0	0	0	0	80	180	1180	3180	3180	160	161	ISAAAA	ODAAAA	AAAAxx
+7787	93	1	3	7	7	87	787	1787	2787	7787	174	175	NNAAAA	PDAAAA	HHHHxx
+6401	94	1	1	1	1	1	401	401	1401	6401	2	3	FMAAAA	QDAAAA	OOOOxx
+4244	95	0	0	4	4	44	244	244	4244	4244	88	89	GHAAAA	RDAAAA	VVVVxx
+4591	96	1	3	1	11	91	591	591	4591	4591	182	183	PUAAAA	SDAAAA	AAAAxx
+4113	97	1	1	3	13	13	113	113	4113	4113	26	27	FCAAAA	TDAAAA	HHHHxx
+5925	98	1	1	5	5	25	925	1925	925	5925	50	51	XTAAAA	UDAAAA	OOOOxx
+1987	99	1	3	7	7	87	987	1987	1987	1987	174	175	LYAAAA	VDAAAA	VVVVxx
+8248	100	0	0	8	8	48	248	248	3248	8248	96	97	GFAAAA	WDAAAA	AAAAxx
+4151	101	1	3	1	11	51	151	151	4151	4151	102	103	RDAAAA	XDAAAA	HHHHxx
+8670	102	0	2	0	10	70	670	670	3670	8670	140	141	MVAAAA	YDAAAA	OOOOxx
+6194	103	0	2	4	14	94	194	194	1194	6194	188	189	GEAAAA	ZDAAAA	VVVVxx
+88	104	0	0	8	8	88	88	88	88	88	176	177	KDAAAA	AEAAAA	AAAAxx
+4058	105	0	2	8	18	58	58	58	4058	4058	116	117	CAAAAA	BEAAAA	HHHHxx
+2742	106	0	2	2	2	42	742	742	2742	2742	84	85	MBAAAA	CEAAAA	OOOOxx
+8275	107	1	3	5	15	75	275	275	3275	8275	150	151	HGAAAA	DEAAAA	VVVVxx
+4258	108	0	2	8	18	58	258	258	4258	4258	116	117	UHAAAA	EEAAAA	AAAAxx
+6129	109	1	1	9	9	29	129	129	1129	6129	58	59	TBAAAA	FEAAAA	HHHHxx
+7243	110	1	3	3	3	43	243	1243	2243	7243	86	87	PSAAAA	GEAAAA	OOOOxx
+2392	111	0	0	2	12	92	392	392	2392	2392	184	185	AOAAAA	HEAAAA	VVVVxx
+9853	112	1	1	3	13	53	853	1853	4853	9853	106	107	ZOAAAA	IEAAAA	AAAAxx
+6064	113	0	0	4	4	64	64	64	1064	6064	128	129	GZAAAA	JEAAAA	HHHHxx
+4391	114	1	3	1	11	91	391	391	4391	4391	182	183	XMAAAA	KEAAAA	OOOOxx
+726	115	0	2	6	6	26	726	726	726	726	52	53	YBAAAA	LEAAAA	VVVVxx
+6957	116	1	1	7	17	57	957	957	1957	6957	114	115	PHAAAA	MEAAAA	AAAAxx
+3853	117	1	1	3	13	53	853	1853	3853	3853	106	107	FSAAAA	NEAAAA	HHHHxx
+4524	118	0	0	4	4	24	524	524	4524	4524	48	49	ASAAAA	OEAAAA	OOOOxx
+5330	119	0	2	0	10	30	330	1330	330	5330	60	61	AXAAAA	PEAAAA	VVVVxx
+6671	120	1	3	1	11	71	671	671	1671	6671	142	143	PWAAAA	QEAAAA	AAAAxx
+5314	121	0	2	4	14	14	314	1314	314	5314	28	29	KWAAAA	REAAAA	HHHHxx
+9202	122	0	2	2	2	2	202	1202	4202	9202	4	5	YPAAAA	SEAAAA	OOOOxx
+4596	123	0	0	6	16	96	596	596	4596	4596	192	193	UUAAAA	TEAAAA	VVVVxx
+8951	124	1	3	1	11	51	951	951	3951	8951	102	103	HGAAAA	UEAAAA	AAAAxx
+9902	125	0	2	2	2	2	902	1902	4902	9902	4	5	WQAAAA	VEAAAA	HHHHxx
+1440	126	0	0	0	0	40	440	1440	1440	1440	80	81	KDAAAA	WEAAAA	OOOOxx
+5339	127	1	3	9	19	39	339	1339	339	5339	78	79	JXAAAA	XEAAAA	VVVVxx
+3371	128	1	3	1	11	71	371	1371	3371	3371	142	143	RZAAAA	YEAAAA	AAAAxx
+4467	129	1	3	7	7	67	467	467	4467	4467	134	135	VPAAAA	ZEAAAA	HHHHxx
+6216	130	0	0	6	16	16	216	216	1216	6216	32	33	CFAAAA	AFAAAA	OOOOxx
+5364	131	0	0	4	4	64	364	1364	364	5364	128	129	IYAAAA	BFAAAA	VVVVxx
+7547	132	1	3	7	7	47	547	1547	2547	7547	94	95	HEAAAA	CFAAAA	AAAAxx
+4338	133	0	2	8	18	38	338	338	4338	4338	76	77	WKAAAA	DFAAAA	HHHHxx
+3481	134	1	1	1	1	81	481	1481	3481	3481	162	163	XDAAAA	EFAAAA	OOOOxx
+826	135	0	2	6	6	26	826	826	826	826	52	53	UFAAAA	FFAAAA	VVVVxx
+3647	136	1	3	7	7	47	647	1647	3647	3647	94	95	HKAAAA	GFAAAA	AAAAxx
+3337	137	1	1	7	17	37	337	1337	3337	3337	74	75	JYAAAA	HFAAAA	HHHHxx
+3591	138	1	3	1	11	91	591	1591	3591	3591	182	183	DIAAAA	IFAAAA	OOOOxx
+7192	139	0	0	2	12	92	192	1192	2192	7192	184	185	QQAAAA	JFAAAA	VVVVxx
+1078	140	0	2	8	18	78	78	1078	1078	1078	156	157	MPAAAA	KFAAAA	AAAAxx
+1310	141	0	2	0	10	10	310	1310	1310	1310	20	21	KYAAAA	LFAAAA	HHHHxx
+9642	142	0	2	2	2	42	642	1642	4642	9642	84	85	WGAAAA	MFAAAA	OOOOxx
+39	143	1	3	9	19	39	39	39	39	39	78	79	NBAAAA	NFAAAA	VVVVxx
+8682	144	0	2	2	2	82	682	682	3682	8682	164	165	YVAAAA	OFAAAA	AAAAxx
+1794	145	0	2	4	14	94	794	1794	1794	1794	188	189	ARAAAA	PFAAAA	HHHHxx
+5630	146	0	2	0	10	30	630	1630	630	5630	60	61	OIAAAA	QFAAAA	OOOOxx
+6748	147	0	0	8	8	48	748	748	1748	6748	96	97	OZAAAA	RFAAAA	VVVVxx
+3766	148	0	2	6	6	66	766	1766	3766	3766	132	133	WOAAAA	SFAAAA	AAAAxx
+6403	149	1	3	3	3	3	403	403	1403	6403	6	7	HMAAAA	TFAAAA	HHHHxx
+175	150	1	3	5	15	75	175	175	175	175	150	151	TGAAAA	UFAAAA	OOOOxx
+2179	151	1	3	9	19	79	179	179	2179	2179	158	159	VFAAAA	VFAAAA	VVVVxx
+7897	152	1	1	7	17	97	897	1897	2897	7897	194	195	TRAAAA	WFAAAA	AAAAxx
+2760	153	0	0	0	0	60	760	760	2760	2760	120	121	ECAAAA	XFAAAA	HHHHxx
+1675	154	1	3	5	15	75	675	1675	1675	1675	150	151	LMAAAA	YFAAAA	OOOOxx
+2564	155	0	0	4	4	64	564	564	2564	2564	128	129	QUAAAA	ZFAAAA	VVVVxx
+157	156	1	1	7	17	57	157	157	157	157	114	115	BGAAAA	AGAAAA	AAAAxx
+8779	157	1	3	9	19	79	779	779	3779	8779	158	159	RZAAAA	BGAAAA	HHHHxx
+9591	158	1	3	1	11	91	591	1591	4591	9591	182	183	XEAAAA	CGAAAA	OOOOxx
+8732	159	0	0	2	12	32	732	732	3732	8732	64	65	WXAAAA	DGAAAA	VVVVxx
+139	160	1	3	9	19	39	139	139	139	139	78	79	JFAAAA	EGAAAA	AAAAxx
+5372	161	0	0	2	12	72	372	1372	372	5372	144	145	QYAAAA	FGAAAA	HHHHxx
+1278	162	0	2	8	18	78	278	1278	1278	1278	156	157	EXAAAA	GGAAAA	OOOOxx
+4697	163	1	1	7	17	97	697	697	4697	4697	194	195	RYAAAA	HGAAAA	VVVVxx
+8610	164	0	2	0	10	10	610	610	3610	8610	20	21	ETAAAA	IGAAAA	AAAAxx
+8180	165	0	0	0	0	80	180	180	3180	8180	160	161	QCAAAA	JGAAAA	HHHHxx
+2399	166	1	3	9	19	99	399	399	2399	2399	198	199	HOAAAA	KGAAAA	OOOOxx
+615	167	1	3	5	15	15	615	615	615	615	30	31	RXAAAA	LGAAAA	VVVVxx
+7629	168	1	1	9	9	29	629	1629	2629	7629	58	59	LHAAAA	MGAAAA	AAAAxx
+7628	169	0	0	8	8	28	628	1628	2628	7628	56	57	KHAAAA	NGAAAA	HHHHxx
+4659	170	1	3	9	19	59	659	659	4659	4659	118	119	FXAAAA	OGAAAA	OOOOxx
+5865	171	1	1	5	5	65	865	1865	865	5865	130	131	PRAAAA	PGAAAA	VVVVxx
+3973	172	1	1	3	13	73	973	1973	3973	3973	146	147	VWAAAA	QGAAAA	AAAAxx
+552	173	0	0	2	12	52	552	552	552	552	104	105	GVAAAA	RGAAAA	HHHHxx
+708	174	0	0	8	8	8	708	708	708	708	16	17	GBAAAA	SGAAAA	OOOOxx
+3550	175	0	2	0	10	50	550	1550	3550	3550	100	101	OGAAAA	TGAAAA	VVVVxx
+5547	176	1	3	7	7	47	547	1547	547	5547	94	95	JFAAAA	UGAAAA	AAAAxx
+489	177	1	1	9	9	89	489	489	489	489	178	179	VSAAAA	VGAAAA	HHHHxx
+3794	178	0	2	4	14	94	794	1794	3794	3794	188	189	YPAAAA	WGAAAA	OOOOxx
+9479	179	1	3	9	19	79	479	1479	4479	9479	158	159	PAAAAA	XGAAAA	VVVVxx
+6435	180	1	3	5	15	35	435	435	1435	6435	70	71	NNAAAA	YGAAAA	AAAAxx
+5120	181	0	0	0	0	20	120	1120	120	5120	40	41	YOAAAA	ZGAAAA	HHHHxx
+3615	182	1	3	5	15	15	615	1615	3615	3615	30	31	BJAAAA	AHAAAA	OOOOxx
+8399	183	1	3	9	19	99	399	399	3399	8399	198	199	BLAAAA	BHAAAA	VVVVxx
+2155	184	1	3	5	15	55	155	155	2155	2155	110	111	XEAAAA	CHAAAA	AAAAxx
+6690	185	0	2	0	10	90	690	690	1690	6690	180	181	IXAAAA	DHAAAA	HHHHxx
+1683	186	1	3	3	3	83	683	1683	1683	1683	166	167	TMAAAA	EHAAAA	OOOOxx
+6302	187	0	2	2	2	2	302	302	1302	6302	4	5	KIAAAA	FHAAAA	VVVVxx
+516	188	0	0	6	16	16	516	516	516	516	32	33	WTAAAA	GHAAAA	AAAAxx
+3901	189	1	1	1	1	1	901	1901	3901	3901	2	3	BUAAAA	HHAAAA	HHHHxx
+6938	190	0	2	8	18	38	938	938	1938	6938	76	77	WGAAAA	IHAAAA	OOOOxx
+7484	191	0	0	4	4	84	484	1484	2484	7484	168	169	WBAAAA	JHAAAA	VVVVxx
+7424	192	0	0	4	4	24	424	1424	2424	7424	48	49	OZAAAA	KHAAAA	AAAAxx
+9410	193	0	2	0	10	10	410	1410	4410	9410	20	21	YXAAAA	LHAAAA	HHHHxx
+1714	194	0	2	4	14	14	714	1714	1714	1714	28	29	YNAAAA	MHAAAA	OOOOxx
+8278	195	0	2	8	18	78	278	278	3278	8278	156	157	KGAAAA	NHAAAA	VVVVxx
+3158	196	0	2	8	18	58	158	1158	3158	3158	116	117	MRAAAA	OHAAAA	AAAAxx
+2511	197	1	3	1	11	11	511	511	2511	2511	22	23	PSAAAA	PHAAAA	HHHHxx
+2912	198	0	0	2	12	12	912	912	2912	2912	24	25	AIAAAA	QHAAAA	OOOOxx
+2648	199	0	0	8	8	48	648	648	2648	2648	96	97	WXAAAA	RHAAAA	VVVVxx
+9385	200	1	1	5	5	85	385	1385	4385	9385	170	171	ZWAAAA	SHAAAA	AAAAxx
+7545	201	1	1	5	5	45	545	1545	2545	7545	90	91	FEAAAA	THAAAA	HHHHxx
+8407	202	1	3	7	7	7	407	407	3407	8407	14	15	JLAAAA	UHAAAA	OOOOxx
+5893	203	1	1	3	13	93	893	1893	893	5893	186	187	RSAAAA	VHAAAA	VVVVxx
+7049	204	1	1	9	9	49	49	1049	2049	7049	98	99	DLAAAA	WHAAAA	AAAAxx
+6812	205	0	0	2	12	12	812	812	1812	6812	24	25	ACAAAA	XHAAAA	HHHHxx
+3649	206	1	1	9	9	49	649	1649	3649	3649	98	99	JKAAAA	YHAAAA	OOOOxx
+9275	207	1	3	5	15	75	275	1275	4275	9275	150	151	TSAAAA	ZHAAAA	VVVVxx
+1179	208	1	3	9	19	79	179	1179	1179	1179	158	159	JTAAAA	AIAAAA	AAAAxx
+969	209	1	1	9	9	69	969	969	969	969	138	139	HLAAAA	BIAAAA	HHHHxx
+7920	210	0	0	0	0	20	920	1920	2920	7920	40	41	QSAAAA	CIAAAA	OOOOxx
+998	211	0	2	8	18	98	998	998	998	998	196	197	KMAAAA	DIAAAA	VVVVxx
+3958	212	0	2	8	18	58	958	1958	3958	3958	116	117	GWAAAA	EIAAAA	AAAAxx
+6052	213	0	0	2	12	52	52	52	1052	6052	104	105	UYAAAA	FIAAAA	HHHHxx
+8791	214	1	3	1	11	91	791	791	3791	8791	182	183	DAAAAA	GIAAAA	OOOOxx
+5191	215	1	3	1	11	91	191	1191	191	5191	182	183	RRAAAA	HIAAAA	VVVVxx
+4267	216	1	3	7	7	67	267	267	4267	4267	134	135	DIAAAA	IIAAAA	AAAAxx
+2829	217	1	1	9	9	29	829	829	2829	2829	58	59	VEAAAA	JIAAAA	HHHHxx
+6396	218	0	0	6	16	96	396	396	1396	6396	192	193	AMAAAA	KIAAAA	OOOOxx
+9413	219	1	1	3	13	13	413	1413	4413	9413	26	27	BYAAAA	LIAAAA	VVVVxx
+614	220	0	2	4	14	14	614	614	614	614	28	29	QXAAAA	MIAAAA	AAAAxx
+4660	221	0	0	0	0	60	660	660	4660	4660	120	121	GXAAAA	NIAAAA	HHHHxx
+8834	222	0	2	4	14	34	834	834	3834	8834	68	69	UBAAAA	OIAAAA	OOOOxx
+2767	223	1	3	7	7	67	767	767	2767	2767	134	135	LCAAAA	PIAAAA	VVVVxx
+2444	224	0	0	4	4	44	444	444	2444	2444	88	89	AQAAAA	QIAAAA	AAAAxx
+4129	225	1	1	9	9	29	129	129	4129	4129	58	59	VCAAAA	RIAAAA	HHHHxx
+3394	226	0	2	4	14	94	394	1394	3394	3394	188	189	OAAAAA	SIAAAA	OOOOxx
+2705	227	1	1	5	5	5	705	705	2705	2705	10	11	BAAAAA	TIAAAA	VVVVxx
+8499	228	1	3	9	19	99	499	499	3499	8499	198	199	XOAAAA	UIAAAA	AAAAxx
+8852	229	0	0	2	12	52	852	852	3852	8852	104	105	MCAAAA	VIAAAA	HHHHxx
+6174	230	0	2	4	14	74	174	174	1174	6174	148	149	MDAAAA	WIAAAA	OOOOxx
+750	231	0	2	0	10	50	750	750	750	750	100	101	WCAAAA	XIAAAA	VVVVxx
+8164	232	0	0	4	4	64	164	164	3164	8164	128	129	ACAAAA	YIAAAA	AAAAxx
+4930	233	0	2	0	10	30	930	930	4930	4930	60	61	QHAAAA	ZIAAAA	HHHHxx
+9904	234	0	0	4	4	4	904	1904	4904	9904	8	9	YQAAAA	AJAAAA	OOOOxx
+7378	235	0	2	8	18	78	378	1378	2378	7378	156	157	UXAAAA	BJAAAA	VVVVxx
+2927	236	1	3	7	7	27	927	927	2927	2927	54	55	PIAAAA	CJAAAA	AAAAxx
+7155	237	1	3	5	15	55	155	1155	2155	7155	110	111	FPAAAA	DJAAAA	HHHHxx
+1302	238	0	2	2	2	2	302	1302	1302	1302	4	5	CYAAAA	EJAAAA	OOOOxx
+5904	239	0	0	4	4	4	904	1904	904	5904	8	9	CTAAAA	FJAAAA	VVVVxx
+9687	240	1	3	7	7	87	687	1687	4687	9687	174	175	PIAAAA	GJAAAA	AAAAxx
+3553	241	1	1	3	13	53	553	1553	3553	3553	106	107	RGAAAA	HJAAAA	HHHHxx
+4447	242	1	3	7	7	47	447	447	4447	4447	94	95	BPAAAA	IJAAAA	OOOOxx
+6878	243	0	2	8	18	78	878	878	1878	6878	156	157	OEAAAA	JJAAAA	VVVVxx
+9470	244	0	2	0	10	70	470	1470	4470	9470	140	141	GAAAAA	KJAAAA	AAAAxx
+9735	245	1	3	5	15	35	735	1735	4735	9735	70	71	LKAAAA	LJAAAA	HHHHxx
+5967	246	1	3	7	7	67	967	1967	967	5967	134	135	NVAAAA	MJAAAA	OOOOxx
+6601	247	1	1	1	1	1	601	601	1601	6601	2	3	XTAAAA	NJAAAA	VVVVxx
+7631	248	1	3	1	11	31	631	1631	2631	7631	62	63	NHAAAA	OJAAAA	AAAAxx
+3559	249	1	3	9	19	59	559	1559	3559	3559	118	119	XGAAAA	PJAAAA	HHHHxx
+2247	250	1	3	7	7	47	247	247	2247	2247	94	95	LIAAAA	QJAAAA	OOOOxx
+9649	251	1	1	9	9	49	649	1649	4649	9649	98	99	DHAAAA	RJAAAA	VVVVxx
+808	252	0	0	8	8	8	808	808	808	808	16	17	CFAAAA	SJAAAA	AAAAxx
+240	253	0	0	0	0	40	240	240	240	240	80	81	GJAAAA	TJAAAA	HHHHxx
+5031	254	1	3	1	11	31	31	1031	31	5031	62	63	NLAAAA	UJAAAA	OOOOxx
+9563	255	1	3	3	3	63	563	1563	4563	9563	126	127	VDAAAA	VJAAAA	VVVVxx
+5656	256	0	0	6	16	56	656	1656	656	5656	112	113	OJAAAA	WJAAAA	AAAAxx
+3886	257	0	2	6	6	86	886	1886	3886	3886	172	173	MTAAAA	XJAAAA	HHHHxx
+2431	258	1	3	1	11	31	431	431	2431	2431	62	63	NPAAAA	YJAAAA	OOOOxx
+5560	259	0	0	0	0	60	560	1560	560	5560	120	121	WFAAAA	ZJAAAA	VVVVxx
+9065	260	1	1	5	5	65	65	1065	4065	9065	130	131	RKAAAA	AKAAAA	AAAAxx
+8130	261	0	2	0	10	30	130	130	3130	8130	60	61	SAAAAA	BKAAAA	HHHHxx
+4054	262	0	2	4	14	54	54	54	4054	4054	108	109	YZAAAA	CKAAAA	OOOOxx
+873	263	1	1	3	13	73	873	873	873	873	146	147	PHAAAA	DKAAAA	VVVVxx
+3092	264	0	0	2	12	92	92	1092	3092	3092	184	185	YOAAAA	EKAAAA	AAAAxx
+6697	265	1	1	7	17	97	697	697	1697	6697	194	195	PXAAAA	FKAAAA	HHHHxx
+2452	266	0	0	2	12	52	452	452	2452	2452	104	105	IQAAAA	GKAAAA	OOOOxx
+7867	267	1	3	7	7	67	867	1867	2867	7867	134	135	PQAAAA	HKAAAA	VVVVxx
+3753	268	1	1	3	13	53	753	1753	3753	3753	106	107	JOAAAA	IKAAAA	AAAAxx
+7834	269	0	2	4	14	34	834	1834	2834	7834	68	69	IPAAAA	JKAAAA	HHHHxx
+5846	270	0	2	6	6	46	846	1846	846	5846	92	93	WQAAAA	KKAAAA	OOOOxx
+7604	271	0	0	4	4	4	604	1604	2604	7604	8	9	MGAAAA	LKAAAA	VVVVxx
+3452	272	0	0	2	12	52	452	1452	3452	3452	104	105	UCAAAA	MKAAAA	AAAAxx
+4788	273	0	0	8	8	88	788	788	4788	4788	176	177	ECAAAA	NKAAAA	HHHHxx
+8600	274	0	0	0	0	0	600	600	3600	8600	0	1	USAAAA	OKAAAA	OOOOxx
+8511	275	1	3	1	11	11	511	511	3511	8511	22	23	JPAAAA	PKAAAA	VVVVxx
+4452	276	0	0	2	12	52	452	452	4452	4452	104	105	GPAAAA	QKAAAA	AAAAxx
+1709	277	1	1	9	9	9	709	1709	1709	1709	18	19	TNAAAA	RKAAAA	HHHHxx
+3440	278	0	0	0	0	40	440	1440	3440	3440	80	81	ICAAAA	SKAAAA	OOOOxx
+9188	279	0	0	8	8	88	188	1188	4188	9188	176	177	KPAAAA	TKAAAA	VVVVxx
+3058	280	0	2	8	18	58	58	1058	3058	3058	116	117	QNAAAA	UKAAAA	AAAAxx
+5821	281	1	1	1	1	21	821	1821	821	5821	42	43	XPAAAA	VKAAAA	HHHHxx
+3428	282	0	0	8	8	28	428	1428	3428	3428	56	57	WBAAAA	WKAAAA	OOOOxx
+3581	283	1	1	1	1	81	581	1581	3581	3581	162	163	THAAAA	XKAAAA	VVVVxx
+7523	284	1	3	3	3	23	523	1523	2523	7523	46	47	JDAAAA	YKAAAA	AAAAxx
+3131	285	1	3	1	11	31	131	1131	3131	3131	62	63	LQAAAA	ZKAAAA	HHHHxx
+2404	286	0	0	4	4	4	404	404	2404	2404	8	9	MOAAAA	ALAAAA	OOOOxx
+5453	287	1	1	3	13	53	453	1453	453	5453	106	107	TBAAAA	BLAAAA	VVVVxx
+1599	288	1	3	9	19	99	599	1599	1599	1599	198	199	NJAAAA	CLAAAA	AAAAxx
+7081	289	1	1	1	1	81	81	1081	2081	7081	162	163	JMAAAA	DLAAAA	HHHHxx
+1750	290	0	2	0	10	50	750	1750	1750	1750	100	101	IPAAAA	ELAAAA	OOOOxx
+5085	291	1	1	5	5	85	85	1085	85	5085	170	171	PNAAAA	FLAAAA	VVVVxx
+9777	292	1	1	7	17	77	777	1777	4777	9777	154	155	BMAAAA	GLAAAA	AAAAxx
+574	293	0	2	4	14	74	574	574	574	574	148	149	CWAAAA	HLAAAA	HHHHxx
+5984	294	0	0	4	4	84	984	1984	984	5984	168	169	EWAAAA	ILAAAA	OOOOxx
+7039	295	1	3	9	19	39	39	1039	2039	7039	78	79	TKAAAA	JLAAAA	VVVVxx
+7143	296	1	3	3	3	43	143	1143	2143	7143	86	87	TOAAAA	KLAAAA	AAAAxx
+5702	297	0	2	2	2	2	702	1702	702	5702	4	5	ILAAAA	LLAAAA	HHHHxx
+362	298	0	2	2	2	62	362	362	362	362	124	125	YNAAAA	MLAAAA	OOOOxx
+6997	299	1	1	7	17	97	997	997	1997	6997	194	195	DJAAAA	NLAAAA	VVVVxx
+2529	300	1	1	9	9	29	529	529	2529	2529	58	59	HTAAAA	OLAAAA	AAAAxx
+6319	301	1	3	9	19	19	319	319	1319	6319	38	39	BJAAAA	PLAAAA	HHHHxx
+954	302	0	2	4	14	54	954	954	954	954	108	109	SKAAAA	QLAAAA	OOOOxx
+3413	303	1	1	3	13	13	413	1413	3413	3413	26	27	HBAAAA	RLAAAA	VVVVxx
+9081	304	1	1	1	1	81	81	1081	4081	9081	162	163	HLAAAA	SLAAAA	AAAAxx
+5599	305	1	3	9	19	99	599	1599	599	5599	198	199	JHAAAA	TLAAAA	HHHHxx
+4772	306	0	0	2	12	72	772	772	4772	4772	144	145	OBAAAA	ULAAAA	OOOOxx
+1124	307	0	0	4	4	24	124	1124	1124	1124	48	49	GRAAAA	VLAAAA	VVVVxx
+7793	308	1	1	3	13	93	793	1793	2793	7793	186	187	TNAAAA	WLAAAA	AAAAxx
+4201	309	1	1	1	1	1	201	201	4201	4201	2	3	PFAAAA	XLAAAA	HHHHxx
+7015	310	1	3	5	15	15	15	1015	2015	7015	30	31	VJAAAA	YLAAAA	OOOOxx
+5936	311	0	0	6	16	36	936	1936	936	5936	72	73	IUAAAA	ZLAAAA	VVVVxx
+4625	312	1	1	5	5	25	625	625	4625	4625	50	51	XVAAAA	AMAAAA	AAAAxx
+4989	313	1	1	9	9	89	989	989	4989	4989	178	179	XJAAAA	BMAAAA	HHHHxx
+4949	314	1	1	9	9	49	949	949	4949	4949	98	99	JIAAAA	CMAAAA	OOOOxx
+6273	315	1	1	3	13	73	273	273	1273	6273	146	147	HHAAAA	DMAAAA	VVVVxx
+4478	316	0	2	8	18	78	478	478	4478	4478	156	157	GQAAAA	EMAAAA	AAAAxx
+8854	317	0	2	4	14	54	854	854	3854	8854	108	109	OCAAAA	FMAAAA	HHHHxx
+2105	318	1	1	5	5	5	105	105	2105	2105	10	11	ZCAAAA	GMAAAA	OOOOxx
+8345	319	1	1	5	5	45	345	345	3345	8345	90	91	ZIAAAA	HMAAAA	VVVVxx
+1941	320	1	1	1	1	41	941	1941	1941	1941	82	83	RWAAAA	IMAAAA	AAAAxx
+1765	321	1	1	5	5	65	765	1765	1765	1765	130	131	XPAAAA	JMAAAA	HHHHxx
+9592	322	0	0	2	12	92	592	1592	4592	9592	184	185	YEAAAA	KMAAAA	OOOOxx
+1694	323	0	2	4	14	94	694	1694	1694	1694	188	189	ENAAAA	LMAAAA	VVVVxx
+8940	324	0	0	0	0	40	940	940	3940	8940	80	81	WFAAAA	MMAAAA	AAAAxx
+7264	325	0	0	4	4	64	264	1264	2264	7264	128	129	KTAAAA	NMAAAA	HHHHxx
+4699	326	1	3	9	19	99	699	699	4699	4699	198	199	TYAAAA	OMAAAA	OOOOxx
+4541	327	1	1	1	1	41	541	541	4541	4541	82	83	RSAAAA	PMAAAA	VVVVxx
+5768	328	0	0	8	8	68	768	1768	768	5768	136	137	WNAAAA	QMAAAA	AAAAxx
+6183	329	1	3	3	3	83	183	183	1183	6183	166	167	VDAAAA	RMAAAA	HHHHxx
+7457	330	1	1	7	17	57	457	1457	2457	7457	114	115	VAAAAA	SMAAAA	OOOOxx
+7317	331	1	1	7	17	17	317	1317	2317	7317	34	35	LVAAAA	TMAAAA	VVVVxx
+1944	332	0	0	4	4	44	944	1944	1944	1944	88	89	UWAAAA	UMAAAA	AAAAxx
+665	333	1	1	5	5	65	665	665	665	665	130	131	PZAAAA	VMAAAA	HHHHxx
+5974	334	0	2	4	14	74	974	1974	974	5974	148	149	UVAAAA	WMAAAA	OOOOxx
+7370	335	0	2	0	10	70	370	1370	2370	7370	140	141	MXAAAA	XMAAAA	VVVVxx
+9196	336	0	0	6	16	96	196	1196	4196	9196	192	193	SPAAAA	YMAAAA	AAAAxx
+6796	337	0	0	6	16	96	796	796	1796	6796	192	193	KBAAAA	ZMAAAA	HHHHxx
+6180	338	0	0	0	0	80	180	180	1180	6180	160	161	SDAAAA	ANAAAA	OOOOxx
+8557	339	1	1	7	17	57	557	557	3557	8557	114	115	DRAAAA	BNAAAA	VVVVxx
+928	340	0	0	8	8	28	928	928	928	928	56	57	SJAAAA	CNAAAA	AAAAxx
+6275	341	1	3	5	15	75	275	275	1275	6275	150	151	JHAAAA	DNAAAA	HHHHxx
+409	342	1	1	9	9	9	409	409	409	409	18	19	TPAAAA	ENAAAA	OOOOxx
+6442	343	0	2	2	2	42	442	442	1442	6442	84	85	UNAAAA	FNAAAA	VVVVxx
+5889	344	1	1	9	9	89	889	1889	889	5889	178	179	NSAAAA	GNAAAA	AAAAxx
+5180	345	0	0	0	0	80	180	1180	180	5180	160	161	GRAAAA	HNAAAA	HHHHxx
+1629	346	1	1	9	9	29	629	1629	1629	1629	58	59	RKAAAA	INAAAA	OOOOxx
+6088	347	0	0	8	8	88	88	88	1088	6088	176	177	EAAAAA	JNAAAA	VVVVxx
+5598	348	0	2	8	18	98	598	1598	598	5598	196	197	IHAAAA	KNAAAA	AAAAxx
+1803	349	1	3	3	3	3	803	1803	1803	1803	6	7	JRAAAA	LNAAAA	HHHHxx
+2330	350	0	2	0	10	30	330	330	2330	2330	60	61	QLAAAA	MNAAAA	OOOOxx
+5901	351	1	1	1	1	1	901	1901	901	5901	2	3	ZSAAAA	NNAAAA	VVVVxx
+780	352	0	0	0	0	80	780	780	780	780	160	161	AEAAAA	ONAAAA	AAAAxx
+7171	353	1	3	1	11	71	171	1171	2171	7171	142	143	VPAAAA	PNAAAA	HHHHxx
+8778	354	0	2	8	18	78	778	778	3778	8778	156	157	QZAAAA	QNAAAA	OOOOxx
+6622	355	0	2	2	2	22	622	622	1622	6622	44	45	SUAAAA	RNAAAA	VVVVxx
+9938	356	0	2	8	18	38	938	1938	4938	9938	76	77	GSAAAA	SNAAAA	AAAAxx
+8254	357	0	2	4	14	54	254	254	3254	8254	108	109	MFAAAA	TNAAAA	HHHHxx
+1951	358	1	3	1	11	51	951	1951	1951	1951	102	103	BXAAAA	UNAAAA	OOOOxx
+1434	359	0	2	4	14	34	434	1434	1434	1434	68	69	EDAAAA	VNAAAA	VVVVxx
+7539	360	1	3	9	19	39	539	1539	2539	7539	78	79	ZDAAAA	WNAAAA	AAAAxx
+600	361	0	0	0	0	0	600	600	600	600	0	1	CXAAAA	XNAAAA	HHHHxx
+3122	362	0	2	2	2	22	122	1122	3122	3122	44	45	CQAAAA	YNAAAA	OOOOxx
+5704	363	0	0	4	4	4	704	1704	704	5704	8	9	KLAAAA	ZNAAAA	VVVVxx
+6300	364	0	0	0	0	0	300	300	1300	6300	0	1	IIAAAA	AOAAAA	AAAAxx
+4585	365	1	1	5	5	85	585	585	4585	4585	170	171	JUAAAA	BOAAAA	HHHHxx
+6313	366	1	1	3	13	13	313	313	1313	6313	26	27	VIAAAA	COAAAA	OOOOxx
+3154	367	0	2	4	14	54	154	1154	3154	3154	108	109	IRAAAA	DOAAAA	VVVVxx
+642	368	0	2	2	2	42	642	642	642	642	84	85	SYAAAA	EOAAAA	AAAAxx
+7736	369	0	0	6	16	36	736	1736	2736	7736	72	73	OLAAAA	FOAAAA	HHHHxx
+5087	370	1	3	7	7	87	87	1087	87	5087	174	175	RNAAAA	GOAAAA	OOOOxx
+5708	371	0	0	8	8	8	708	1708	708	5708	16	17	OLAAAA	HOAAAA	VVVVxx
+8169	372	1	1	9	9	69	169	169	3169	8169	138	139	FCAAAA	IOAAAA	AAAAxx
+9768	373	0	0	8	8	68	768	1768	4768	9768	136	137	SLAAAA	JOAAAA	HHHHxx
+3874	374	0	2	4	14	74	874	1874	3874	3874	148	149	ATAAAA	KOAAAA	OOOOxx
+6831	375	1	3	1	11	31	831	831	1831	6831	62	63	TCAAAA	LOAAAA	VVVVxx
+18	376	0	2	8	18	18	18	18	18	18	36	37	SAAAAA	MOAAAA	AAAAxx
+6375	377	1	3	5	15	75	375	375	1375	6375	150	151	FLAAAA	NOAAAA	HHHHxx
+7106	378	0	2	6	6	6	106	1106	2106	7106	12	13	INAAAA	OOAAAA	OOOOxx
+5926	379	0	2	6	6	26	926	1926	926	5926	52	53	YTAAAA	POAAAA	VVVVxx
+4956	380	0	0	6	16	56	956	956	4956	4956	112	113	QIAAAA	QOAAAA	AAAAxx
+7042	381	0	2	2	2	42	42	1042	2042	7042	84	85	WKAAAA	ROAAAA	HHHHxx
+6043	382	1	3	3	3	43	43	43	1043	6043	86	87	LYAAAA	SOAAAA	OOOOxx
+2084	383	0	0	4	4	84	84	84	2084	2084	168	169	ECAAAA	TOAAAA	VVVVxx
+6038	384	0	2	8	18	38	38	38	1038	6038	76	77	GYAAAA	UOAAAA	AAAAxx
+7253	385	1	1	3	13	53	253	1253	2253	7253	106	107	ZSAAAA	VOAAAA	HHHHxx
+2061	386	1	1	1	1	61	61	61	2061	2061	122	123	HBAAAA	WOAAAA	OOOOxx
+7800	387	0	0	0	0	0	800	1800	2800	7800	0	1	AOAAAA	XOAAAA	VVVVxx
+4970	388	0	2	0	10	70	970	970	4970	4970	140	141	EJAAAA	YOAAAA	AAAAxx
+8580	389	0	0	0	0	80	580	580	3580	8580	160	161	ASAAAA	ZOAAAA	HHHHxx
+9173	390	1	1	3	13	73	173	1173	4173	9173	146	147	VOAAAA	APAAAA	OOOOxx
+8558	391	0	2	8	18	58	558	558	3558	8558	116	117	ERAAAA	BPAAAA	VVVVxx
+3897	392	1	1	7	17	97	897	1897	3897	3897	194	195	XTAAAA	CPAAAA	AAAAxx
+5069	393	1	1	9	9	69	69	1069	69	5069	138	139	ZMAAAA	DPAAAA	HHHHxx
+2301	394	1	1	1	1	1	301	301	2301	2301	2	3	NKAAAA	EPAAAA	OOOOxx
+9863	395	1	3	3	3	63	863	1863	4863	9863	126	127	JPAAAA	FPAAAA	VVVVxx
+5733	396	1	1	3	13	33	733	1733	733	5733	66	67	NMAAAA	GPAAAA	AAAAxx
+2338	397	0	2	8	18	38	338	338	2338	2338	76	77	YLAAAA	HPAAAA	HHHHxx
+9639	398	1	3	9	19	39	639	1639	4639	9639	78	79	TGAAAA	IPAAAA	OOOOxx
+1139	399	1	3	9	19	39	139	1139	1139	1139	78	79	VRAAAA	JPAAAA	VVVVxx
+2293	400	1	1	3	13	93	293	293	2293	2293	186	187	FKAAAA	KPAAAA	AAAAxx
+6125	401	1	1	5	5	25	125	125	1125	6125	50	51	PBAAAA	LPAAAA	HHHHxx
+5374	402	0	2	4	14	74	374	1374	374	5374	148	149	SYAAAA	MPAAAA	OOOOxx
+7216	403	0	0	6	16	16	216	1216	2216	7216	32	33	ORAAAA	NPAAAA	VVVVxx
+2285	404	1	1	5	5	85	285	285	2285	2285	170	171	XJAAAA	OPAAAA	AAAAxx
+2387	405	1	3	7	7	87	387	387	2387	2387	174	175	VNAAAA	PPAAAA	HHHHxx
+5015	406	1	3	5	15	15	15	1015	15	5015	30	31	XKAAAA	QPAAAA	OOOOxx
+2087	407	1	3	7	7	87	87	87	2087	2087	174	175	HCAAAA	RPAAAA	VVVVxx
+4938	408	0	2	8	18	38	938	938	4938	4938	76	77	YHAAAA	SPAAAA	AAAAxx
+3635	409	1	3	5	15	35	635	1635	3635	3635	70	71	VJAAAA	TPAAAA	HHHHxx
+7737	410	1	1	7	17	37	737	1737	2737	7737	74	75	PLAAAA	UPAAAA	OOOOxx
+8056	411	0	0	6	16	56	56	56	3056	8056	112	113	WXAAAA	VPAAAA	VVVVxx
+4502	412	0	2	2	2	2	502	502	4502	4502	4	5	ERAAAA	WPAAAA	AAAAxx
+54	413	0	2	4	14	54	54	54	54	54	108	109	CCAAAA	XPAAAA	HHHHxx
+3182	414	0	2	2	2	82	182	1182	3182	3182	164	165	KSAAAA	YPAAAA	OOOOxx
+3718	415	0	2	8	18	18	718	1718	3718	3718	36	37	ANAAAA	ZPAAAA	VVVVxx
+3989	416	1	1	9	9	89	989	1989	3989	3989	178	179	LXAAAA	AQAAAA	AAAAxx
+8028	417	0	0	8	8	28	28	28	3028	8028	56	57	UWAAAA	BQAAAA	HHHHxx
+1426	418	0	2	6	6	26	426	1426	1426	1426	52	53	WCAAAA	CQAAAA	OOOOxx
+3801	419	1	1	1	1	1	801	1801	3801	3801	2	3	FQAAAA	DQAAAA	VVVVxx
+241	420	1	1	1	1	41	241	241	241	241	82	83	HJAAAA	EQAAAA	AAAAxx
+8000	421	0	0	0	0	0	0	0	3000	8000	0	1	SVAAAA	FQAAAA	HHHHxx
+8357	422	1	1	7	17	57	357	357	3357	8357	114	115	LJAAAA	GQAAAA	OOOOxx
+7548	423	0	0	8	8	48	548	1548	2548	7548	96	97	IEAAAA	HQAAAA	VVVVxx
+7307	424	1	3	7	7	7	307	1307	2307	7307	14	15	BVAAAA	IQAAAA	AAAAxx
+2275	425	1	3	5	15	75	275	275	2275	2275	150	151	NJAAAA	JQAAAA	HHHHxx
+2718	426	0	2	8	18	18	718	718	2718	2718	36	37	OAAAAA	KQAAAA	OOOOxx
+7068	427	0	0	8	8	68	68	1068	2068	7068	136	137	WLAAAA	LQAAAA	VVVVxx
+3181	428	1	1	1	1	81	181	1181	3181	3181	162	163	JSAAAA	MQAAAA	AAAAxx
+749	429	1	1	9	9	49	749	749	749	749	98	99	VCAAAA	NQAAAA	HHHHxx
+5195	430	1	3	5	15	95	195	1195	195	5195	190	191	VRAAAA	OQAAAA	OOOOxx
+6136	431	0	0	6	16	36	136	136	1136	6136	72	73	ACAAAA	PQAAAA	VVVVxx
+8012	432	0	0	2	12	12	12	12	3012	8012	24	25	EWAAAA	QQAAAA	AAAAxx
+3957	433	1	1	7	17	57	957	1957	3957	3957	114	115	FWAAAA	RQAAAA	HHHHxx
+3083	434	1	3	3	3	83	83	1083	3083	3083	166	167	POAAAA	SQAAAA	OOOOxx
+9997	435	1	1	7	17	97	997	1997	4997	9997	194	195	NUAAAA	TQAAAA	VVVVxx
+3299	436	1	3	9	19	99	299	1299	3299	3299	198	199	XWAAAA	UQAAAA	AAAAxx
+846	437	0	2	6	6	46	846	846	846	846	92	93	OGAAAA	VQAAAA	HHHHxx
+2985	438	1	1	5	5	85	985	985	2985	2985	170	171	VKAAAA	WQAAAA	OOOOxx
+9238	439	0	2	8	18	38	238	1238	4238	9238	76	77	IRAAAA	XQAAAA	VVVVxx
+1403	440	1	3	3	3	3	403	1403	1403	1403	6	7	ZBAAAA	YQAAAA	AAAAxx
+5563	441	1	3	3	3	63	563	1563	563	5563	126	127	ZFAAAA	ZQAAAA	HHHHxx
+7965	442	1	1	5	5	65	965	1965	2965	7965	130	131	JUAAAA	ARAAAA	OOOOxx
+4512	443	0	0	2	12	12	512	512	4512	4512	24	25	ORAAAA	BRAAAA	VVVVxx
+9730	444	0	2	0	10	30	730	1730	4730	9730	60	61	GKAAAA	CRAAAA	AAAAxx
+1129	445	1	1	9	9	29	129	1129	1129	1129	58	59	LRAAAA	DRAAAA	HHHHxx
+2624	446	0	0	4	4	24	624	624	2624	2624	48	49	YWAAAA	ERAAAA	OOOOxx
+8178	447	0	2	8	18	78	178	178	3178	8178	156	157	OCAAAA	FRAAAA	VVVVxx
+6468	448	0	0	8	8	68	468	468	1468	6468	136	137	UOAAAA	GRAAAA	AAAAxx
+3027	449	1	3	7	7	27	27	1027	3027	3027	54	55	LMAAAA	HRAAAA	HHHHxx
+3845	450	1	1	5	5	45	845	1845	3845	3845	90	91	XRAAAA	IRAAAA	OOOOxx
+786	451	0	2	6	6	86	786	786	786	786	172	173	GEAAAA	JRAAAA	VVVVxx
+4971	452	1	3	1	11	71	971	971	4971	4971	142	143	FJAAAA	KRAAAA	AAAAxx
+1542	453	0	2	2	2	42	542	1542	1542	1542	84	85	IHAAAA	LRAAAA	HHHHxx
+7967	454	1	3	7	7	67	967	1967	2967	7967	134	135	LUAAAA	MRAAAA	OOOOxx
+443	455	1	3	3	3	43	443	443	443	443	86	87	BRAAAA	NRAAAA	VVVVxx
+7318	456	0	2	8	18	18	318	1318	2318	7318	36	37	MVAAAA	ORAAAA	AAAAxx
+4913	457	1	1	3	13	13	913	913	4913	4913	26	27	ZGAAAA	PRAAAA	HHHHxx
+9466	458	0	2	6	6	66	466	1466	4466	9466	132	133	CAAAAA	QRAAAA	OOOOxx
+7866	459	0	2	6	6	66	866	1866	2866	7866	132	133	OQAAAA	RRAAAA	VVVVxx
+784	460	0	0	4	4	84	784	784	784	784	168	169	EEAAAA	SRAAAA	AAAAxx
+9040	461	0	0	0	0	40	40	1040	4040	9040	80	81	SJAAAA	TRAAAA	HHHHxx
+3954	462	0	2	4	14	54	954	1954	3954	3954	108	109	CWAAAA	URAAAA	OOOOxx
+4183	463	1	3	3	3	83	183	183	4183	4183	166	167	XEAAAA	VRAAAA	VVVVxx
+3608	464	0	0	8	8	8	608	1608	3608	3608	16	17	UIAAAA	WRAAAA	AAAAxx
+7630	465	0	2	0	10	30	630	1630	2630	7630	60	61	MHAAAA	XRAAAA	HHHHxx
+590	466	0	2	0	10	90	590	590	590	590	180	181	SWAAAA	YRAAAA	OOOOxx
+3453	467	1	1	3	13	53	453	1453	3453	3453	106	107	VCAAAA	ZRAAAA	VVVVxx
+7757	468	1	1	7	17	57	757	1757	2757	7757	114	115	JMAAAA	ASAAAA	AAAAxx
+7394	469	0	2	4	14	94	394	1394	2394	7394	188	189	KYAAAA	BSAAAA	HHHHxx
+396	470	0	0	6	16	96	396	396	396	396	192	193	GPAAAA	CSAAAA	OOOOxx
+7873	471	1	1	3	13	73	873	1873	2873	7873	146	147	VQAAAA	DSAAAA	VVVVxx
+1553	472	1	1	3	13	53	553	1553	1553	1553	106	107	THAAAA	ESAAAA	AAAAxx
+598	473	0	2	8	18	98	598	598	598	598	196	197	AXAAAA	FSAAAA	HHHHxx
+7191	474	1	3	1	11	91	191	1191	2191	7191	182	183	PQAAAA	GSAAAA	OOOOxx
+8116	475	0	0	6	16	16	116	116	3116	8116	32	33	EAAAAA	HSAAAA	VVVVxx
+2516	476	0	0	6	16	16	516	516	2516	2516	32	33	USAAAA	ISAAAA	AAAAxx
+7750	477	0	2	0	10	50	750	1750	2750	7750	100	101	CMAAAA	JSAAAA	HHHHxx
+6625	478	1	1	5	5	25	625	625	1625	6625	50	51	VUAAAA	KSAAAA	OOOOxx
+8838	479	0	2	8	18	38	838	838	3838	8838	76	77	YBAAAA	LSAAAA	VVVVxx
+4636	480	0	0	6	16	36	636	636	4636	4636	72	73	IWAAAA	MSAAAA	AAAAxx
+7627	481	1	3	7	7	27	627	1627	2627	7627	54	55	JHAAAA	NSAAAA	HHHHxx
+1690	482	0	2	0	10	90	690	1690	1690	1690	180	181	ANAAAA	OSAAAA	OOOOxx
+7071	483	1	3	1	11	71	71	1071	2071	7071	142	143	ZLAAAA	PSAAAA	VVVVxx
+2081	484	1	1	1	1	81	81	81	2081	2081	162	163	BCAAAA	QSAAAA	AAAAxx
+7138	485	0	2	8	18	38	138	1138	2138	7138	76	77	OOAAAA	RSAAAA	HHHHxx
+864	486	0	0	4	4	64	864	864	864	864	128	129	GHAAAA	SSAAAA	OOOOxx
+6392	487	0	0	2	12	92	392	392	1392	6392	184	185	WLAAAA	TSAAAA	VVVVxx
+7544	488	0	0	4	4	44	544	1544	2544	7544	88	89	EEAAAA	USAAAA	AAAAxx
+5438	489	0	2	8	18	38	438	1438	438	5438	76	77	EBAAAA	VSAAAA	HHHHxx
+7099	490	1	3	9	19	99	99	1099	2099	7099	198	199	BNAAAA	WSAAAA	OOOOxx
+5157	491	1	1	7	17	57	157	1157	157	5157	114	115	JQAAAA	XSAAAA	VVVVxx
+3391	492	1	3	1	11	91	391	1391	3391	3391	182	183	LAAAAA	YSAAAA	AAAAxx
+3805	493	1	1	5	5	5	805	1805	3805	3805	10	11	JQAAAA	ZSAAAA	HHHHxx
+2110	494	0	2	0	10	10	110	110	2110	2110	20	21	EDAAAA	ATAAAA	OOOOxx
+3176	495	0	0	6	16	76	176	1176	3176	3176	152	153	ESAAAA	BTAAAA	VVVVxx
+5918	496	0	2	8	18	18	918	1918	918	5918	36	37	QTAAAA	CTAAAA	AAAAxx
+1218	497	0	2	8	18	18	218	1218	1218	1218	36	37	WUAAAA	DTAAAA	HHHHxx
+6683	498	1	3	3	3	83	683	683	1683	6683	166	167	BXAAAA	ETAAAA	OOOOxx
+914	499	0	2	4	14	14	914	914	914	914	28	29	EJAAAA	FTAAAA	VVVVxx
+4737	500	1	1	7	17	37	737	737	4737	4737	74	75	FAAAAA	GTAAAA	AAAAxx
+7286	501	0	2	6	6	86	286	1286	2286	7286	172	173	GUAAAA	HTAAAA	HHHHxx
+9975	502	1	3	5	15	75	975	1975	4975	9975	150	151	RTAAAA	ITAAAA	OOOOxx
+8030	503	0	2	0	10	30	30	30	3030	8030	60	61	WWAAAA	JTAAAA	VVVVxx
+7364	504	0	0	4	4	64	364	1364	2364	7364	128	129	GXAAAA	KTAAAA	AAAAxx
+1389	505	1	1	9	9	89	389	1389	1389	1389	178	179	LBAAAA	LTAAAA	HHHHxx
+4025	506	1	1	5	5	25	25	25	4025	4025	50	51	VYAAAA	MTAAAA	OOOOxx
+4835	507	1	3	5	15	35	835	835	4835	4835	70	71	ZDAAAA	NTAAAA	VVVVxx
+8045	508	1	1	5	5	45	45	45	3045	8045	90	91	LXAAAA	OTAAAA	AAAAxx
+1864	509	0	0	4	4	64	864	1864	1864	1864	128	129	STAAAA	PTAAAA	HHHHxx
+3313	510	1	1	3	13	13	313	1313	3313	3313	26	27	LXAAAA	QTAAAA	OOOOxx
+2384	511	0	0	4	4	84	384	384	2384	2384	168	169	SNAAAA	RTAAAA	VVVVxx
+6115	512	1	3	5	15	15	115	115	1115	6115	30	31	FBAAAA	STAAAA	AAAAxx
+5705	513	1	1	5	5	5	705	1705	705	5705	10	11	LLAAAA	TTAAAA	HHHHxx
+9269	514	1	1	9	9	69	269	1269	4269	9269	138	139	NSAAAA	UTAAAA	OOOOxx
+3379	515	1	3	9	19	79	379	1379	3379	3379	158	159	ZZAAAA	VTAAAA	VVVVxx
+8205	516	1	1	5	5	5	205	205	3205	8205	10	11	PDAAAA	WTAAAA	AAAAxx
+6575	517	1	3	5	15	75	575	575	1575	6575	150	151	XSAAAA	XTAAAA	HHHHxx
+486	518	0	2	6	6	86	486	486	486	486	172	173	SSAAAA	YTAAAA	OOOOxx
+4894	519	0	2	4	14	94	894	894	4894	4894	188	189	GGAAAA	ZTAAAA	VVVVxx
+3090	520	0	2	0	10	90	90	1090	3090	3090	180	181	WOAAAA	AUAAAA	AAAAxx
+759	521	1	3	9	19	59	759	759	759	759	118	119	FDAAAA	BUAAAA	HHHHxx
+4864	522	0	0	4	4	64	864	864	4864	4864	128	129	CFAAAA	CUAAAA	OOOOxx
+4083	523	1	3	3	3	83	83	83	4083	4083	166	167	BBAAAA	DUAAAA	VVVVxx
+6918	524	0	2	8	18	18	918	918	1918	6918	36	37	CGAAAA	EUAAAA	AAAAxx
+8146	525	0	2	6	6	46	146	146	3146	8146	92	93	IBAAAA	FUAAAA	HHHHxx
+1523	526	1	3	3	3	23	523	1523	1523	1523	46	47	PGAAAA	GUAAAA	OOOOxx
+1591	527	1	3	1	11	91	591	1591	1591	1591	182	183	FJAAAA	HUAAAA	VVVVxx
+3343	528	1	3	3	3	43	343	1343	3343	3343	86	87	PYAAAA	IUAAAA	AAAAxx
+1391	529	1	3	1	11	91	391	1391	1391	1391	182	183	NBAAAA	JUAAAA	HHHHxx
+9963	530	1	3	3	3	63	963	1963	4963	9963	126	127	FTAAAA	KUAAAA	OOOOxx
+2423	531	1	3	3	3	23	423	423	2423	2423	46	47	FPAAAA	LUAAAA	VVVVxx
+1822	532	0	2	2	2	22	822	1822	1822	1822	44	45	CSAAAA	MUAAAA	AAAAxx
+8706	533	0	2	6	6	6	706	706	3706	8706	12	13	WWAAAA	NUAAAA	HHHHxx
+3001	534	1	1	1	1	1	1	1001	3001	3001	2	3	LLAAAA	OUAAAA	OOOOxx
+6707	535	1	3	7	7	7	707	707	1707	6707	14	15	ZXAAAA	PUAAAA	VVVVxx
+2121	536	1	1	1	1	21	121	121	2121	2121	42	43	PDAAAA	QUAAAA	AAAAxx
+5814	537	0	2	4	14	14	814	1814	814	5814	28	29	QPAAAA	RUAAAA	HHHHxx
+2659	538	1	3	9	19	59	659	659	2659	2659	118	119	HYAAAA	SUAAAA	OOOOxx
+2016	539	0	0	6	16	16	16	16	2016	2016	32	33	OZAAAA	TUAAAA	VVVVxx
+4286	540	0	2	6	6	86	286	286	4286	4286	172	173	WIAAAA	UUAAAA	AAAAxx
+9205	541	1	1	5	5	5	205	1205	4205	9205	10	11	BQAAAA	VUAAAA	HHHHxx
+3496	542	0	0	6	16	96	496	1496	3496	3496	192	193	MEAAAA	WUAAAA	OOOOxx
+5333	543	1	1	3	13	33	333	1333	333	5333	66	67	DXAAAA	XUAAAA	VVVVxx
+5571	544	1	3	1	11	71	571	1571	571	5571	142	143	HGAAAA	YUAAAA	AAAAxx
+1696	545	0	0	6	16	96	696	1696	1696	1696	192	193	GNAAAA	ZUAAAA	HHHHxx
+4871	546	1	3	1	11	71	871	871	4871	4871	142	143	JFAAAA	AVAAAA	OOOOxx
+4852	547	0	0	2	12	52	852	852	4852	4852	104	105	QEAAAA	BVAAAA	VVVVxx
+8483	548	1	3	3	3	83	483	483	3483	8483	166	167	HOAAAA	CVAAAA	AAAAxx
+1376	549	0	0	6	16	76	376	1376	1376	1376	152	153	YAAAAA	DVAAAA	HHHHxx
+5456	550	0	0	6	16	56	456	1456	456	5456	112	113	WBAAAA	EVAAAA	OOOOxx
+499	551	1	3	9	19	99	499	499	499	499	198	199	FTAAAA	FVAAAA	VVVVxx
+3463	552	1	3	3	3	63	463	1463	3463	3463	126	127	FDAAAA	GVAAAA	AAAAxx
+7426	553	0	2	6	6	26	426	1426	2426	7426	52	53	QZAAAA	HVAAAA	HHHHxx
+5341	554	1	1	1	1	41	341	1341	341	5341	82	83	LXAAAA	IVAAAA	OOOOxx
+9309	555	1	1	9	9	9	309	1309	4309	9309	18	19	BUAAAA	JVAAAA	VVVVxx
+2055	556	1	3	5	15	55	55	55	2055	2055	110	111	BBAAAA	KVAAAA	AAAAxx
+2199	557	1	3	9	19	99	199	199	2199	2199	198	199	PGAAAA	LVAAAA	HHHHxx
+7235	558	1	3	5	15	35	235	1235	2235	7235	70	71	HSAAAA	MVAAAA	OOOOxx
+8661	559	1	1	1	1	61	661	661	3661	8661	122	123	DVAAAA	NVAAAA	VVVVxx
+9494	560	0	2	4	14	94	494	1494	4494	9494	188	189	EBAAAA	OVAAAA	AAAAxx
+935	561	1	3	5	15	35	935	935	935	935	70	71	ZJAAAA	PVAAAA	HHHHxx
+7044	562	0	0	4	4	44	44	1044	2044	7044	88	89	YKAAAA	QVAAAA	OOOOxx
+1974	563	0	2	4	14	74	974	1974	1974	1974	148	149	YXAAAA	RVAAAA	VVVVxx
+9679	564	1	3	9	19	79	679	1679	4679	9679	158	159	HIAAAA	SVAAAA	AAAAxx
+9822	565	0	2	2	2	22	822	1822	4822	9822	44	45	UNAAAA	TVAAAA	HHHHxx
+4088	566	0	0	8	8	88	88	88	4088	4088	176	177	GBAAAA	UVAAAA	OOOOxx
+1749	567	1	1	9	9	49	749	1749	1749	1749	98	99	HPAAAA	VVAAAA	VVVVxx
+2116	568	0	0	6	16	16	116	116	2116	2116	32	33	KDAAAA	WVAAAA	AAAAxx
+976	569	0	0	6	16	76	976	976	976	976	152	153	OLAAAA	XVAAAA	HHHHxx
+8689	570	1	1	9	9	89	689	689	3689	8689	178	179	FWAAAA	YVAAAA	OOOOxx
+2563	571	1	3	3	3	63	563	563	2563	2563	126	127	PUAAAA	ZVAAAA	VVVVxx
+7195	572	1	3	5	15	95	195	1195	2195	7195	190	191	TQAAAA	AWAAAA	AAAAxx
+9985	573	1	1	5	5	85	985	1985	4985	9985	170	171	BUAAAA	BWAAAA	HHHHxx
+7699	574	1	3	9	19	99	699	1699	2699	7699	198	199	DKAAAA	CWAAAA	OOOOxx
+5311	575	1	3	1	11	11	311	1311	311	5311	22	23	HWAAAA	DWAAAA	VVVVxx
+295	576	1	3	5	15	95	295	295	295	295	190	191	JLAAAA	EWAAAA	AAAAxx
+8214	577	0	2	4	14	14	214	214	3214	8214	28	29	YDAAAA	FWAAAA	HHHHxx
+3275	578	1	3	5	15	75	275	1275	3275	3275	150	151	ZVAAAA	GWAAAA	OOOOxx
+9646	579	0	2	6	6	46	646	1646	4646	9646	92	93	AHAAAA	HWAAAA	VVVVxx
+1908	580	0	0	8	8	8	908	1908	1908	1908	16	17	KVAAAA	IWAAAA	AAAAxx
+3858	581	0	2	8	18	58	858	1858	3858	3858	116	117	KSAAAA	JWAAAA	HHHHxx
+9362	582	0	2	2	2	62	362	1362	4362	9362	124	125	CWAAAA	KWAAAA	OOOOxx
+9307	583	1	3	7	7	7	307	1307	4307	9307	14	15	ZTAAAA	LWAAAA	VVVVxx
+6124	584	0	0	4	4	24	124	124	1124	6124	48	49	OBAAAA	MWAAAA	AAAAxx
+2405	585	1	1	5	5	5	405	405	2405	2405	10	11	NOAAAA	NWAAAA	HHHHxx
+8422	586	0	2	2	2	22	422	422	3422	8422	44	45	YLAAAA	OWAAAA	OOOOxx
+393	587	1	1	3	13	93	393	393	393	393	186	187	DPAAAA	PWAAAA	VVVVxx
+8973	588	1	1	3	13	73	973	973	3973	8973	146	147	DHAAAA	QWAAAA	AAAAxx
+5171	589	1	3	1	11	71	171	1171	171	5171	142	143	XQAAAA	RWAAAA	HHHHxx
+4929	590	1	1	9	9	29	929	929	4929	4929	58	59	PHAAAA	SWAAAA	OOOOxx
+6935	591	1	3	5	15	35	935	935	1935	6935	70	71	TGAAAA	TWAAAA	VVVVxx
+8584	592	0	0	4	4	84	584	584	3584	8584	168	169	ESAAAA	UWAAAA	AAAAxx
+1035	593	1	3	5	15	35	35	1035	1035	1035	70	71	VNAAAA	VWAAAA	HHHHxx
+3734	594	0	2	4	14	34	734	1734	3734	3734	68	69	QNAAAA	WWAAAA	OOOOxx
+1458	595	0	2	8	18	58	458	1458	1458	1458	116	117	CEAAAA	XWAAAA	VVVVxx
+8746	596	0	2	6	6	46	746	746	3746	8746	92	93	KYAAAA	YWAAAA	AAAAxx
+1677	597	1	1	7	17	77	677	1677	1677	1677	154	155	NMAAAA	ZWAAAA	HHHHxx
+8502	598	0	2	2	2	2	502	502	3502	8502	4	5	APAAAA	AXAAAA	OOOOxx
+7752	599	0	0	2	12	52	752	1752	2752	7752	104	105	EMAAAA	BXAAAA	VVVVxx
+2556	600	0	0	6	16	56	556	556	2556	2556	112	113	IUAAAA	CXAAAA	AAAAxx
+6426	601	0	2	6	6	26	426	426	1426	6426	52	53	ENAAAA	DXAAAA	HHHHxx
+8420	602	0	0	0	0	20	420	420	3420	8420	40	41	WLAAAA	EXAAAA	OOOOxx
+4462	603	0	2	2	2	62	462	462	4462	4462	124	125	QPAAAA	FXAAAA	VVVVxx
+1378	604	0	2	8	18	78	378	1378	1378	1378	156	157	ABAAAA	GXAAAA	AAAAxx
+1387	605	1	3	7	7	87	387	1387	1387	1387	174	175	JBAAAA	HXAAAA	HHHHxx
+8094	606	0	2	4	14	94	94	94	3094	8094	188	189	IZAAAA	IXAAAA	OOOOxx
+7247	607	1	3	7	7	47	247	1247	2247	7247	94	95	TSAAAA	JXAAAA	VVVVxx
+4261	608	1	1	1	1	61	261	261	4261	4261	122	123	XHAAAA	KXAAAA	AAAAxx
+5029	609	1	1	9	9	29	29	1029	29	5029	58	59	LLAAAA	LXAAAA	HHHHxx
+3625	610	1	1	5	5	25	625	1625	3625	3625	50	51	LJAAAA	MXAAAA	OOOOxx
+8068	611	0	0	8	8	68	68	68	3068	8068	136	137	IYAAAA	NXAAAA	VVVVxx
+102	612	0	2	2	2	2	102	102	102	102	4	5	YDAAAA	OXAAAA	AAAAxx
+5596	613	0	0	6	16	96	596	1596	596	5596	192	193	GHAAAA	PXAAAA	HHHHxx
+5872	614	0	0	2	12	72	872	1872	872	5872	144	145	WRAAAA	QXAAAA	OOOOxx
+4742	615	0	2	2	2	42	742	742	4742	4742	84	85	KAAAAA	RXAAAA	VVVVxx
+2117	616	1	1	7	17	17	117	117	2117	2117	34	35	LDAAAA	SXAAAA	AAAAxx
+3945	617	1	1	5	5	45	945	1945	3945	3945	90	91	TVAAAA	TXAAAA	HHHHxx
+7483	618	1	3	3	3	83	483	1483	2483	7483	166	167	VBAAAA	UXAAAA	OOOOxx
+4455	619	1	3	5	15	55	455	455	4455	4455	110	111	JPAAAA	VXAAAA	VVVVxx
+609	620	1	1	9	9	9	609	609	609	609	18	19	LXAAAA	WXAAAA	AAAAxx
+9829	621	1	1	9	9	29	829	1829	4829	9829	58	59	BOAAAA	XXAAAA	HHHHxx
+4857	622	1	1	7	17	57	857	857	4857	4857	114	115	VEAAAA	YXAAAA	OOOOxx
+3314	623	0	2	4	14	14	314	1314	3314	3314	28	29	MXAAAA	ZXAAAA	VVVVxx
+5353	624	1	1	3	13	53	353	1353	353	5353	106	107	XXAAAA	AYAAAA	AAAAxx
+4909	625	1	1	9	9	9	909	909	4909	4909	18	19	VGAAAA	BYAAAA	HHHHxx
+7597	626	1	1	7	17	97	597	1597	2597	7597	194	195	FGAAAA	CYAAAA	OOOOxx
+2683	627	1	3	3	3	83	683	683	2683	2683	166	167	FZAAAA	DYAAAA	VVVVxx
+3223	628	1	3	3	3	23	223	1223	3223	3223	46	47	ZTAAAA	EYAAAA	AAAAxx
+5363	629	1	3	3	3	63	363	1363	363	5363	126	127	HYAAAA	FYAAAA	HHHHxx
+4578	630	0	2	8	18	78	578	578	4578	4578	156	157	CUAAAA	GYAAAA	OOOOxx
+5544	631	0	0	4	4	44	544	1544	544	5544	88	89	GFAAAA	HYAAAA	VVVVxx
+1589	632	1	1	9	9	89	589	1589	1589	1589	178	179	DJAAAA	IYAAAA	AAAAxx
+7412	633	0	0	2	12	12	412	1412	2412	7412	24	25	CZAAAA	JYAAAA	HHHHxx
+3803	634	1	3	3	3	3	803	1803	3803	3803	6	7	HQAAAA	KYAAAA	OOOOxx
+6179	635	1	3	9	19	79	179	179	1179	6179	158	159	RDAAAA	LYAAAA	VVVVxx
+5588	636	0	0	8	8	88	588	1588	588	5588	176	177	YGAAAA	MYAAAA	AAAAxx
+2134	637	0	2	4	14	34	134	134	2134	2134	68	69	CEAAAA	NYAAAA	HHHHxx
+4383	638	1	3	3	3	83	383	383	4383	4383	166	167	PMAAAA	OYAAAA	OOOOxx
+6995	639	1	3	5	15	95	995	995	1995	6995	190	191	BJAAAA	PYAAAA	VVVVxx
+6598	640	0	2	8	18	98	598	598	1598	6598	196	197	UTAAAA	QYAAAA	AAAAxx
+8731	641	1	3	1	11	31	731	731	3731	8731	62	63	VXAAAA	RYAAAA	HHHHxx
+7177	642	1	1	7	17	77	177	1177	2177	7177	154	155	BQAAAA	SYAAAA	OOOOxx
+6578	643	0	2	8	18	78	578	578	1578	6578	156	157	ATAAAA	TYAAAA	VVVVxx
+9393	644	1	1	3	13	93	393	1393	4393	9393	186	187	HXAAAA	UYAAAA	AAAAxx
+1276	645	0	0	6	16	76	276	1276	1276	1276	152	153	CXAAAA	VYAAAA	HHHHxx
+8766	646	0	2	6	6	66	766	766	3766	8766	132	133	EZAAAA	WYAAAA	OOOOxx
+1015	647	1	3	5	15	15	15	1015	1015	1015	30	31	BNAAAA	XYAAAA	VVVVxx
+4396	648	0	0	6	16	96	396	396	4396	4396	192	193	CNAAAA	YYAAAA	AAAAxx
+5564	649	0	0	4	4	64	564	1564	564	5564	128	129	AGAAAA	ZYAAAA	HHHHxx
+927	650	1	3	7	7	27	927	927	927	927	54	55	RJAAAA	AZAAAA	OOOOxx
+3306	651	0	2	6	6	6	306	1306	3306	3306	12	13	EXAAAA	BZAAAA	VVVVxx
+1615	652	1	3	5	15	15	615	1615	1615	1615	30	31	DKAAAA	CZAAAA	AAAAxx
+4550	653	0	2	0	10	50	550	550	4550	4550	100	101	ATAAAA	DZAAAA	HHHHxx
+2468	654	0	0	8	8	68	468	468	2468	2468	136	137	YQAAAA	EZAAAA	OOOOxx
+5336	655	0	0	6	16	36	336	1336	336	5336	72	73	GXAAAA	FZAAAA	VVVVxx
+4471	656	1	3	1	11	71	471	471	4471	4471	142	143	ZPAAAA	GZAAAA	AAAAxx
+8085	657	1	1	5	5	85	85	85	3085	8085	170	171	ZYAAAA	HZAAAA	HHHHxx
+540	658	0	0	0	0	40	540	540	540	540	80	81	UUAAAA	IZAAAA	OOOOxx
+5108	659	0	0	8	8	8	108	1108	108	5108	16	17	MOAAAA	JZAAAA	VVVVxx
+8015	660	1	3	5	15	15	15	15	3015	8015	30	31	HWAAAA	KZAAAA	AAAAxx
+2857	661	1	1	7	17	57	857	857	2857	2857	114	115	XFAAAA	LZAAAA	HHHHxx
+9472	662	0	0	2	12	72	472	1472	4472	9472	144	145	IAAAAA	MZAAAA	OOOOxx
+5666	663	0	2	6	6	66	666	1666	666	5666	132	133	YJAAAA	NZAAAA	VVVVxx
+3555	664	1	3	5	15	55	555	1555	3555	3555	110	111	TGAAAA	OZAAAA	AAAAxx
+378	665	0	2	8	18	78	378	378	378	378	156	157	OOAAAA	PZAAAA	HHHHxx
+4466	666	0	2	6	6	66	466	466	4466	4466	132	133	UPAAAA	QZAAAA	OOOOxx
+3247	667	1	3	7	7	47	247	1247	3247	3247	94	95	XUAAAA	RZAAAA	VVVVxx
+6570	668	0	2	0	10	70	570	570	1570	6570	140	141	SSAAAA	SZAAAA	AAAAxx
+5655	669	1	3	5	15	55	655	1655	655	5655	110	111	NJAAAA	TZAAAA	HHHHxx
+917	670	1	1	7	17	17	917	917	917	917	34	35	HJAAAA	UZAAAA	OOOOxx
+3637	671	1	1	7	17	37	637	1637	3637	3637	74	75	XJAAAA	VZAAAA	VVVVxx
+3668	672	0	0	8	8	68	668	1668	3668	3668	136	137	CLAAAA	WZAAAA	AAAAxx
+5644	673	0	0	4	4	44	644	1644	644	5644	88	89	CJAAAA	XZAAAA	HHHHxx
+8286	674	0	2	6	6	86	286	286	3286	8286	172	173	SGAAAA	YZAAAA	OOOOxx
+6896	675	0	0	6	16	96	896	896	1896	6896	192	193	GFAAAA	ZZAAAA	VVVVxx
+2870	676	0	2	0	10	70	870	870	2870	2870	140	141	KGAAAA	AABAAA	AAAAxx
+8041	677	1	1	1	1	41	41	41	3041	8041	82	83	HXAAAA	BABAAA	HHHHxx
+8137	678	1	1	7	17	37	137	137	3137	8137	74	75	ZAAAAA	CABAAA	OOOOxx
+4823	679	1	3	3	3	23	823	823	4823	4823	46	47	NDAAAA	DABAAA	VVVVxx
+2438	680	0	2	8	18	38	438	438	2438	2438	76	77	UPAAAA	EABAAA	AAAAxx
+6329	681	1	1	9	9	29	329	329	1329	6329	58	59	LJAAAA	FABAAA	HHHHxx
+623	682	1	3	3	3	23	623	623	623	623	46	47	ZXAAAA	GABAAA	OOOOxx
+1360	683	0	0	0	0	60	360	1360	1360	1360	120	121	IAAAAA	HABAAA	VVVVxx
+7987	684	1	3	7	7	87	987	1987	2987	7987	174	175	FVAAAA	IABAAA	AAAAxx
+9788	685	0	0	8	8	88	788	1788	4788	9788	176	177	MMAAAA	JABAAA	HHHHxx
+3212	686	0	0	2	12	12	212	1212	3212	3212	24	25	OTAAAA	KABAAA	OOOOxx
+2725	687	1	1	5	5	25	725	725	2725	2725	50	51	VAAAAA	LABAAA	VVVVxx
+7837	688	1	1	7	17	37	837	1837	2837	7837	74	75	LPAAAA	MABAAA	AAAAxx
+4746	689	0	2	6	6	46	746	746	4746	4746	92	93	OAAAAA	NABAAA	HHHHxx
+3986	690	0	2	6	6	86	986	1986	3986	3986	172	173	IXAAAA	OABAAA	OOOOxx
+9128	691	0	0	8	8	28	128	1128	4128	9128	56	57	CNAAAA	PABAAA	VVVVxx
+5044	692	0	0	4	4	44	44	1044	44	5044	88	89	AMAAAA	QABAAA	AAAAxx
+8132	693	0	0	2	12	32	132	132	3132	8132	64	65	UAAAAA	RABAAA	HHHHxx
+9992	694	0	0	2	12	92	992	1992	4992	9992	184	185	IUAAAA	SABAAA	OOOOxx
+8468	695	0	0	8	8	68	468	468	3468	8468	136	137	SNAAAA	TABAAA	VVVVxx
+6876	696	0	0	6	16	76	876	876	1876	6876	152	153	MEAAAA	UABAAA	AAAAxx
+3532	697	0	0	2	12	32	532	1532	3532	3532	64	65	WFAAAA	VABAAA	HHHHxx
+2140	698	0	0	0	0	40	140	140	2140	2140	80	81	IEAAAA	WABAAA	OOOOxx
+2183	699	1	3	3	3	83	183	183	2183	2183	166	167	ZFAAAA	XABAAA	VVVVxx
+9766	700	0	2	6	6	66	766	1766	4766	9766	132	133	QLAAAA	YABAAA	AAAAxx
+7943	701	1	3	3	3	43	943	1943	2943	7943	86	87	NTAAAA	ZABAAA	HHHHxx
+9243	702	1	3	3	3	43	243	1243	4243	9243	86	87	NRAAAA	ABBAAA	OOOOxx
+6241	703	1	1	1	1	41	241	241	1241	6241	82	83	BGAAAA	BBBAAA	VVVVxx
+9540	704	0	0	0	0	40	540	1540	4540	9540	80	81	YCAAAA	CBBAAA	AAAAxx
+7418	705	0	2	8	18	18	418	1418	2418	7418	36	37	IZAAAA	DBBAAA	HHHHxx
+1603	706	1	3	3	3	3	603	1603	1603	1603	6	7	RJAAAA	EBBAAA	OOOOxx
+8950	707	0	2	0	10	50	950	950	3950	8950	100	101	GGAAAA	FBBAAA	VVVVxx
+6933	708	1	1	3	13	33	933	933	1933	6933	66	67	RGAAAA	GBBAAA	AAAAxx
+2646	709	0	2	6	6	46	646	646	2646	2646	92	93	UXAAAA	HBBAAA	HHHHxx
+3447	710	1	3	7	7	47	447	1447	3447	3447	94	95	PCAAAA	IBBAAA	OOOOxx
+9957	711	1	1	7	17	57	957	1957	4957	9957	114	115	ZSAAAA	JBBAAA	VVVVxx
+4623	712	1	3	3	3	23	623	623	4623	4623	46	47	VVAAAA	KBBAAA	AAAAxx
+9058	713	0	2	8	18	58	58	1058	4058	9058	116	117	KKAAAA	LBBAAA	HHHHxx
+7361	714	1	1	1	1	61	361	1361	2361	7361	122	123	DXAAAA	MBBAAA	OOOOxx
+2489	715	1	1	9	9	89	489	489	2489	2489	178	179	TRAAAA	NBBAAA	VVVVxx
+7643	716	1	3	3	3	43	643	1643	2643	7643	86	87	ZHAAAA	OBBAAA	AAAAxx
+9166	717	0	2	6	6	66	166	1166	4166	9166	132	133	OOAAAA	PBBAAA	HHHHxx
+7789	718	1	1	9	9	89	789	1789	2789	7789	178	179	PNAAAA	QBBAAA	OOOOxx
+2332	719	0	0	2	12	32	332	332	2332	2332	64	65	SLAAAA	RBBAAA	VVVVxx
+1832	720	0	0	2	12	32	832	1832	1832	1832	64	65	MSAAAA	SBBAAA	AAAAxx
+8375	721	1	3	5	15	75	375	375	3375	8375	150	151	DKAAAA	TBBAAA	HHHHxx
+948	722	0	0	8	8	48	948	948	948	948	96	97	MKAAAA	UBBAAA	OOOOxx
+5613	723	1	1	3	13	13	613	1613	613	5613	26	27	XHAAAA	VBBAAA	VVVVxx
+6310	724	0	2	0	10	10	310	310	1310	6310	20	21	SIAAAA	WBBAAA	AAAAxx
+4254	725	0	2	4	14	54	254	254	4254	4254	108	109	QHAAAA	XBBAAA	HHHHxx
+4260	726	0	0	0	0	60	260	260	4260	4260	120	121	WHAAAA	YBBAAA	OOOOxx
+2060	727	0	0	0	0	60	60	60	2060	2060	120	121	GBAAAA	ZBBAAA	VVVVxx
+4831	728	1	3	1	11	31	831	831	4831	4831	62	63	VDAAAA	ACBAAA	AAAAxx
+6176	729	0	0	6	16	76	176	176	1176	6176	152	153	ODAAAA	BCBAAA	HHHHxx
+6688	730	0	0	8	8	88	688	688	1688	6688	176	177	GXAAAA	CCBAAA	OOOOxx
+5752	731	0	0	2	12	52	752	1752	752	5752	104	105	GNAAAA	DCBAAA	VVVVxx
+8714	732	0	2	4	14	14	714	714	3714	8714	28	29	EXAAAA	ECBAAA	AAAAxx
+6739	733	1	3	9	19	39	739	739	1739	6739	78	79	FZAAAA	FCBAAA	HHHHxx
+7066	734	0	2	6	6	66	66	1066	2066	7066	132	133	ULAAAA	GCBAAA	OOOOxx
+7250	735	0	2	0	10	50	250	1250	2250	7250	100	101	WSAAAA	HCBAAA	VVVVxx
+3161	736	1	1	1	1	61	161	1161	3161	3161	122	123	PRAAAA	ICBAAA	AAAAxx
+1411	737	1	3	1	11	11	411	1411	1411	1411	22	23	HCAAAA	JCBAAA	HHHHxx
+9301	738	1	1	1	1	1	301	1301	4301	9301	2	3	TTAAAA	KCBAAA	OOOOxx
+8324	739	0	0	4	4	24	324	324	3324	8324	48	49	EIAAAA	LCBAAA	VVVVxx
+9641	740	1	1	1	1	41	641	1641	4641	9641	82	83	VGAAAA	MCBAAA	AAAAxx
+7077	741	1	1	7	17	77	77	1077	2077	7077	154	155	FMAAAA	NCBAAA	HHHHxx
+9888	742	0	0	8	8	88	888	1888	4888	9888	176	177	IQAAAA	OCBAAA	OOOOxx
+9909	743	1	1	9	9	9	909	1909	4909	9909	18	19	DRAAAA	PCBAAA	VVVVxx
+2209	744	1	1	9	9	9	209	209	2209	2209	18	19	ZGAAAA	QCBAAA	AAAAxx
+6904	745	0	0	4	4	4	904	904	1904	6904	8	9	OFAAAA	RCBAAA	HHHHxx
+6608	746	0	0	8	8	8	608	608	1608	6608	16	17	EUAAAA	SCBAAA	OOOOxx
+8400	747	0	0	0	0	0	400	400	3400	8400	0	1	CLAAAA	TCBAAA	VVVVxx
+5124	748	0	0	4	4	24	124	1124	124	5124	48	49	CPAAAA	UCBAAA	AAAAxx
+5484	749	0	0	4	4	84	484	1484	484	5484	168	169	YCAAAA	VCBAAA	HHHHxx
+3575	750	1	3	5	15	75	575	1575	3575	3575	150	151	NHAAAA	WCBAAA	OOOOxx
+9723	751	1	3	3	3	23	723	1723	4723	9723	46	47	ZJAAAA	XCBAAA	VVVVxx
+360	752	0	0	0	0	60	360	360	360	360	120	121	WNAAAA	YCBAAA	AAAAxx
+1059	753	1	3	9	19	59	59	1059	1059	1059	118	119	TOAAAA	ZCBAAA	HHHHxx
+4941	754	1	1	1	1	41	941	941	4941	4941	82	83	BIAAAA	ADBAAA	OOOOxx
+2535	755	1	3	5	15	35	535	535	2535	2535	70	71	NTAAAA	BDBAAA	VVVVxx
+4119	756	1	3	9	19	19	119	119	4119	4119	38	39	LCAAAA	CDBAAA	AAAAxx
+3725	757	1	1	5	5	25	725	1725	3725	3725	50	51	HNAAAA	DDBAAA	HHHHxx
+4758	758	0	2	8	18	58	758	758	4758	4758	116	117	ABAAAA	EDBAAA	OOOOxx
+9593	759	1	1	3	13	93	593	1593	4593	9593	186	187	ZEAAAA	FDBAAA	VVVVxx
+4663	760	1	3	3	3	63	663	663	4663	4663	126	127	JXAAAA	GDBAAA	AAAAxx
+7734	761	0	2	4	14	34	734	1734	2734	7734	68	69	MLAAAA	HDBAAA	HHHHxx
+9156	762	0	0	6	16	56	156	1156	4156	9156	112	113	EOAAAA	IDBAAA	OOOOxx
+8120	763	0	0	0	0	20	120	120	3120	8120	40	41	IAAAAA	JDBAAA	VVVVxx
+4385	764	1	1	5	5	85	385	385	4385	4385	170	171	RMAAAA	KDBAAA	AAAAxx
+2926	765	0	2	6	6	26	926	926	2926	2926	52	53	OIAAAA	LDBAAA	HHHHxx
+4186	766	0	2	6	6	86	186	186	4186	4186	172	173	AFAAAA	MDBAAA	OOOOxx
+2508	767	0	0	8	8	8	508	508	2508	2508	16	17	MSAAAA	NDBAAA	VVVVxx
+4012	768	0	0	2	12	12	12	12	4012	4012	24	25	IYAAAA	ODBAAA	AAAAxx
+6266	769	0	2	6	6	66	266	266	1266	6266	132	133	AHAAAA	PDBAAA	HHHHxx
+3709	770	1	1	9	9	9	709	1709	3709	3709	18	19	RMAAAA	QDBAAA	OOOOxx
+7289	771	1	1	9	9	89	289	1289	2289	7289	178	179	JUAAAA	RDBAAA	VVVVxx
+8875	772	1	3	5	15	75	875	875	3875	8875	150	151	JDAAAA	SDBAAA	AAAAxx
+4412	773	0	0	2	12	12	412	412	4412	4412	24	25	SNAAAA	TDBAAA	HHHHxx
+3033	774	1	1	3	13	33	33	1033	3033	3033	66	67	RMAAAA	UDBAAA	OOOOxx
+1645	775	1	1	5	5	45	645	1645	1645	1645	90	91	HLAAAA	VDBAAA	VVVVxx
+3557	776	1	1	7	17	57	557	1557	3557	3557	114	115	VGAAAA	WDBAAA	AAAAxx
+6316	777	0	0	6	16	16	316	316	1316	6316	32	33	YIAAAA	XDBAAA	HHHHxx
+2054	778	0	2	4	14	54	54	54	2054	2054	108	109	ABAAAA	YDBAAA	OOOOxx
+7031	779	1	3	1	11	31	31	1031	2031	7031	62	63	LKAAAA	ZDBAAA	VVVVxx
+3405	780	1	1	5	5	5	405	1405	3405	3405	10	11	ZAAAAA	AEBAAA	AAAAxx
+5343	781	1	3	3	3	43	343	1343	343	5343	86	87	NXAAAA	BEBAAA	HHHHxx
+5240	782	0	0	0	0	40	240	1240	240	5240	80	81	OTAAAA	CEBAAA	OOOOxx
+9650	783	0	2	0	10	50	650	1650	4650	9650	100	101	EHAAAA	DEBAAA	VVVVxx
+3777	784	1	1	7	17	77	777	1777	3777	3777	154	155	HPAAAA	EEBAAA	AAAAxx
+9041	785	1	1	1	1	41	41	1041	4041	9041	82	83	TJAAAA	FEBAAA	HHHHxx
+6923	786	1	3	3	3	23	923	923	1923	6923	46	47	HGAAAA	GEBAAA	OOOOxx
+2977	787	1	1	7	17	77	977	977	2977	2977	154	155	NKAAAA	HEBAAA	VVVVxx
+5500	788	0	0	0	0	0	500	1500	500	5500	0	1	ODAAAA	IEBAAA	AAAAxx
+1044	789	0	0	4	4	44	44	1044	1044	1044	88	89	EOAAAA	JEBAAA	HHHHxx
+434	790	0	2	4	14	34	434	434	434	434	68	69	SQAAAA	KEBAAA	OOOOxx
+611	791	1	3	1	11	11	611	611	611	611	22	23	NXAAAA	LEBAAA	VVVVxx
+5760	792	0	0	0	0	60	760	1760	760	5760	120	121	ONAAAA	MEBAAA	AAAAxx
+2445	793	1	1	5	5	45	445	445	2445	2445	90	91	BQAAAA	NEBAAA	HHHHxx
+7098	794	0	2	8	18	98	98	1098	2098	7098	196	197	ANAAAA	OEBAAA	OOOOxx
+2188	795	0	0	8	8	88	188	188	2188	2188	176	177	EGAAAA	PEBAAA	VVVVxx
+4597	796	1	1	7	17	97	597	597	4597	4597	194	195	VUAAAA	QEBAAA	AAAAxx
+1913	797	1	1	3	13	13	913	1913	1913	1913	26	27	PVAAAA	REBAAA	HHHHxx
+8696	798	0	0	6	16	96	696	696	3696	8696	192	193	MWAAAA	SEBAAA	OOOOxx
+3332	799	0	0	2	12	32	332	1332	3332	3332	64	65	EYAAAA	TEBAAA	VVVVxx
+8760	800	0	0	0	0	60	760	760	3760	8760	120	121	YYAAAA	UEBAAA	AAAAxx
+3215	801	1	3	5	15	15	215	1215	3215	3215	30	31	RTAAAA	VEBAAA	HHHHxx
+1625	802	1	1	5	5	25	625	1625	1625	1625	50	51	NKAAAA	WEBAAA	OOOOxx
+4219	803	1	3	9	19	19	219	219	4219	4219	38	39	HGAAAA	XEBAAA	VVVVxx
+415	804	1	3	5	15	15	415	415	415	415	30	31	ZPAAAA	YEBAAA	AAAAxx
+4242	805	0	2	2	2	42	242	242	4242	4242	84	85	EHAAAA	ZEBAAA	HHHHxx
+8660	806	0	0	0	0	60	660	660	3660	8660	120	121	CVAAAA	AFBAAA	OOOOxx
+6525	807	1	1	5	5	25	525	525	1525	6525	50	51	ZQAAAA	BFBAAA	VVVVxx
+2141	808	1	1	1	1	41	141	141	2141	2141	82	83	JEAAAA	CFBAAA	AAAAxx
+5152	809	0	0	2	12	52	152	1152	152	5152	104	105	EQAAAA	DFBAAA	HHHHxx
+8560	810	0	0	0	0	60	560	560	3560	8560	120	121	GRAAAA	EFBAAA	OOOOxx
+9835	811	1	3	5	15	35	835	1835	4835	9835	70	71	HOAAAA	FFBAAA	VVVVxx
+2657	812	1	1	7	17	57	657	657	2657	2657	114	115	FYAAAA	GFBAAA	AAAAxx
+6085	813	1	1	5	5	85	85	85	1085	6085	170	171	BAAAAA	HFBAAA	HHHHxx
+6698	814	0	2	8	18	98	698	698	1698	6698	196	197	QXAAAA	IFBAAA	OOOOxx
+5421	815	1	1	1	1	21	421	1421	421	5421	42	43	NAAAAA	JFBAAA	VVVVxx
+6661	816	1	1	1	1	61	661	661	1661	6661	122	123	FWAAAA	KFBAAA	AAAAxx
+5645	817	1	1	5	5	45	645	1645	645	5645	90	91	DJAAAA	LFBAAA	HHHHxx
+1248	818	0	0	8	8	48	248	1248	1248	1248	96	97	AWAAAA	MFBAAA	OOOOxx
+5690	819	0	2	0	10	90	690	1690	690	5690	180	181	WKAAAA	NFBAAA	VVVVxx
+4762	820	0	2	2	2	62	762	762	4762	4762	124	125	EBAAAA	OFBAAA	AAAAxx
+1455	821	1	3	5	15	55	455	1455	1455	1455	110	111	ZDAAAA	PFBAAA	HHHHxx
+9846	822	0	2	6	6	46	846	1846	4846	9846	92	93	SOAAAA	QFBAAA	OOOOxx
+5295	823	1	3	5	15	95	295	1295	295	5295	190	191	RVAAAA	RFBAAA	VVVVxx
+2826	824	0	2	6	6	26	826	826	2826	2826	52	53	SEAAAA	SFBAAA	AAAAxx
+7496	825	0	0	6	16	96	496	1496	2496	7496	192	193	ICAAAA	TFBAAA	HHHHxx
+3024	826	0	0	4	4	24	24	1024	3024	3024	48	49	IMAAAA	UFBAAA	OOOOxx
+4945	827	1	1	5	5	45	945	945	4945	4945	90	91	FIAAAA	VFBAAA	VVVVxx
+4404	828	0	0	4	4	4	404	404	4404	4404	8	9	KNAAAA	WFBAAA	AAAAxx
+9302	829	0	2	2	2	2	302	1302	4302	9302	4	5	UTAAAA	XFBAAA	HHHHxx
+1286	830	0	2	6	6	86	286	1286	1286	1286	172	173	MXAAAA	YFBAAA	OOOOxx
+8435	831	1	3	5	15	35	435	435	3435	8435	70	71	LMAAAA	ZFBAAA	VVVVxx
+8969	832	1	1	9	9	69	969	969	3969	8969	138	139	ZGAAAA	AGBAAA	AAAAxx
+3302	833	0	2	2	2	2	302	1302	3302	3302	4	5	AXAAAA	BGBAAA	HHHHxx
+9753	834	1	1	3	13	53	753	1753	4753	9753	106	107	DLAAAA	CGBAAA	OOOOxx
+9374	835	0	2	4	14	74	374	1374	4374	9374	148	149	OWAAAA	DGBAAA	VVVVxx
+4907	836	1	3	7	7	7	907	907	4907	4907	14	15	TGAAAA	EGBAAA	AAAAxx
+1659	837	1	3	9	19	59	659	1659	1659	1659	118	119	VLAAAA	FGBAAA	HHHHxx
+5095	838	1	3	5	15	95	95	1095	95	5095	190	191	ZNAAAA	GGBAAA	OOOOxx
+9446	839	0	2	6	6	46	446	1446	4446	9446	92	93	IZAAAA	HGBAAA	VVVVxx
+8528	840	0	0	8	8	28	528	528	3528	8528	56	57	AQAAAA	IGBAAA	AAAAxx
+4890	841	0	2	0	10	90	890	890	4890	4890	180	181	CGAAAA	JGBAAA	HHHHxx
+1221	842	1	1	1	1	21	221	1221	1221	1221	42	43	ZUAAAA	KGBAAA	OOOOxx
+5583	843	1	3	3	3	83	583	1583	583	5583	166	167	TGAAAA	LGBAAA	VVVVxx
+7303	844	1	3	3	3	3	303	1303	2303	7303	6	7	XUAAAA	MGBAAA	AAAAxx
+406	845	0	2	6	6	6	406	406	406	406	12	13	QPAAAA	NGBAAA	HHHHxx
+7542	846	0	2	2	2	42	542	1542	2542	7542	84	85	CEAAAA	OGBAAA	OOOOxx
+9507	847	1	3	7	7	7	507	1507	4507	9507	14	15	RBAAAA	PGBAAA	VVVVxx
+9511	848	1	3	1	11	11	511	1511	4511	9511	22	23	VBAAAA	QGBAAA	AAAAxx
+1373	849	1	1	3	13	73	373	1373	1373	1373	146	147	VAAAAA	RGBAAA	HHHHxx
+6556	850	0	0	6	16	56	556	556	1556	6556	112	113	ESAAAA	SGBAAA	OOOOxx
+4117	851	1	1	7	17	17	117	117	4117	4117	34	35	JCAAAA	TGBAAA	VVVVxx
+7794	852	0	2	4	14	94	794	1794	2794	7794	188	189	UNAAAA	UGBAAA	AAAAxx
+7170	853	0	2	0	10	70	170	1170	2170	7170	140	141	UPAAAA	VGBAAA	HHHHxx
+5809	854	1	1	9	9	9	809	1809	809	5809	18	19	LPAAAA	WGBAAA	OOOOxx
+7828	855	0	0	8	8	28	828	1828	2828	7828	56	57	CPAAAA	XGBAAA	VVVVxx
+8046	856	0	2	6	6	46	46	46	3046	8046	92	93	MXAAAA	YGBAAA	AAAAxx
+4833	857	1	1	3	13	33	833	833	4833	4833	66	67	XDAAAA	ZGBAAA	HHHHxx
+2107	858	1	3	7	7	7	107	107	2107	2107	14	15	BDAAAA	AHBAAA	OOOOxx
+4276	859	0	0	6	16	76	276	276	4276	4276	152	153	MIAAAA	BHBAAA	VVVVxx
+9536	860	0	0	6	16	36	536	1536	4536	9536	72	73	UCAAAA	CHBAAA	AAAAxx
+5549	861	1	1	9	9	49	549	1549	549	5549	98	99	LFAAAA	DHBAAA	HHHHxx
+6427	862	1	3	7	7	27	427	427	1427	6427	54	55	FNAAAA	EHBAAA	OOOOxx
+1382	863	0	2	2	2	82	382	1382	1382	1382	164	165	EBAAAA	FHBAAA	VVVVxx
+3256	864	0	0	6	16	56	256	1256	3256	3256	112	113	GVAAAA	GHBAAA	AAAAxx
+3270	865	0	2	0	10	70	270	1270	3270	3270	140	141	UVAAAA	HHBAAA	HHHHxx
+4808	866	0	0	8	8	8	808	808	4808	4808	16	17	YCAAAA	IHBAAA	OOOOxx
+7938	867	0	2	8	18	38	938	1938	2938	7938	76	77	ITAAAA	JHBAAA	VVVVxx
+4405	868	1	1	5	5	5	405	405	4405	4405	10	11	LNAAAA	KHBAAA	AAAAxx
+2264	869	0	0	4	4	64	264	264	2264	2264	128	129	CJAAAA	LHBAAA	HHHHxx
+80	870	0	0	0	0	80	80	80	80	80	160	161	CDAAAA	MHBAAA	OOOOxx
+320	871	0	0	0	0	20	320	320	320	320	40	41	IMAAAA	NHBAAA	VVVVxx
+2383	872	1	3	3	3	83	383	383	2383	2383	166	167	RNAAAA	OHBAAA	AAAAxx
+3146	873	0	2	6	6	46	146	1146	3146	3146	92	93	ARAAAA	PHBAAA	HHHHxx
+6911	874	1	3	1	11	11	911	911	1911	6911	22	23	VFAAAA	QHBAAA	OOOOxx
+7377	875	1	1	7	17	77	377	1377	2377	7377	154	155	TXAAAA	RHBAAA	VVVVxx
+9965	876	1	1	5	5	65	965	1965	4965	9965	130	131	HTAAAA	SHBAAA	AAAAxx
+8361	877	1	1	1	1	61	361	361	3361	8361	122	123	PJAAAA	THBAAA	HHHHxx
+9417	878	1	1	7	17	17	417	1417	4417	9417	34	35	FYAAAA	UHBAAA	OOOOxx
+2483	879	1	3	3	3	83	483	483	2483	2483	166	167	NRAAAA	VHBAAA	VVVVxx
+9843	880	1	3	3	3	43	843	1843	4843	9843	86	87	POAAAA	WHBAAA	AAAAxx
+6395	881	1	3	5	15	95	395	395	1395	6395	190	191	ZLAAAA	XHBAAA	HHHHxx
+6444	882	0	0	4	4	44	444	444	1444	6444	88	89	WNAAAA	YHBAAA	OOOOxx
+1820	883	0	0	0	0	20	820	1820	1820	1820	40	41	ASAAAA	ZHBAAA	VVVVxx
+2768	884	0	0	8	8	68	768	768	2768	2768	136	137	MCAAAA	AIBAAA	AAAAxx
+5413	885	1	1	3	13	13	413	1413	413	5413	26	27	FAAAAA	BIBAAA	HHHHxx
+2923	886	1	3	3	3	23	923	923	2923	2923	46	47	LIAAAA	CIBAAA	OOOOxx
+5286	887	0	2	6	6	86	286	1286	286	5286	172	173	IVAAAA	DIBAAA	VVVVxx
+6126	888	0	2	6	6	26	126	126	1126	6126	52	53	QBAAAA	EIBAAA	AAAAxx
+8343	889	1	3	3	3	43	343	343	3343	8343	86	87	XIAAAA	FIBAAA	HHHHxx
+6010	890	0	2	0	10	10	10	10	1010	6010	20	21	EXAAAA	GIBAAA	OOOOxx
+4177	891	1	1	7	17	77	177	177	4177	4177	154	155	REAAAA	HIBAAA	VVVVxx
+5808	892	0	0	8	8	8	808	1808	808	5808	16	17	KPAAAA	IIBAAA	AAAAxx
+4859	893	1	3	9	19	59	859	859	4859	4859	118	119	XEAAAA	JIBAAA	HHHHxx
+9252	894	0	0	2	12	52	252	1252	4252	9252	104	105	WRAAAA	KIBAAA	OOOOxx
+2941	895	1	1	1	1	41	941	941	2941	2941	82	83	DJAAAA	LIBAAA	VVVVxx
+8693	896	1	1	3	13	93	693	693	3693	8693	186	187	JWAAAA	MIBAAA	AAAAxx
+4432	897	0	0	2	12	32	432	432	4432	4432	64	65	MOAAAA	NIBAAA	HHHHxx
+2371	898	1	3	1	11	71	371	371	2371	2371	142	143	FNAAAA	OIBAAA	OOOOxx
+7546	899	0	2	6	6	46	546	1546	2546	7546	92	93	GEAAAA	PIBAAA	VVVVxx
+1369	900	1	1	9	9	69	369	1369	1369	1369	138	139	RAAAAA	QIBAAA	AAAAxx
+4687	901	1	3	7	7	87	687	687	4687	4687	174	175	HYAAAA	RIBAAA	HHHHxx
+8941	902	1	1	1	1	41	941	941	3941	8941	82	83	XFAAAA	SIBAAA	OOOOxx
+226	903	0	2	6	6	26	226	226	226	226	52	53	SIAAAA	TIBAAA	VVVVxx
+3493	904	1	1	3	13	93	493	1493	3493	3493	186	187	JEAAAA	UIBAAA	AAAAxx
+6433	905	1	1	3	13	33	433	433	1433	6433	66	67	LNAAAA	VIBAAA	HHHHxx
+9189	906	1	1	9	9	89	189	1189	4189	9189	178	179	LPAAAA	WIBAAA	OOOOxx
+6027	907	1	3	7	7	27	27	27	1027	6027	54	55	VXAAAA	XIBAAA	VVVVxx
+4615	908	1	3	5	15	15	615	615	4615	4615	30	31	NVAAAA	YIBAAA	AAAAxx
+5320	909	0	0	0	0	20	320	1320	320	5320	40	41	QWAAAA	ZIBAAA	HHHHxx
+7002	910	0	2	2	2	2	2	1002	2002	7002	4	5	IJAAAA	AJBAAA	OOOOxx
+7367	911	1	3	7	7	67	367	1367	2367	7367	134	135	JXAAAA	BJBAAA	VVVVxx
+289	912	1	1	9	9	89	289	289	289	289	178	179	DLAAAA	CJBAAA	AAAAxx
+407	913	1	3	7	7	7	407	407	407	407	14	15	RPAAAA	DJBAAA	HHHHxx
+504	914	0	0	4	4	4	504	504	504	504	8	9	KTAAAA	EJBAAA	OOOOxx
+8301	915	1	1	1	1	1	301	301	3301	8301	2	3	HHAAAA	FJBAAA	VVVVxx
+1396	916	0	0	6	16	96	396	1396	1396	1396	192	193	SBAAAA	GJBAAA	AAAAxx
+4794	917	0	2	4	14	94	794	794	4794	4794	188	189	KCAAAA	HJBAAA	HHHHxx
+6400	918	0	0	0	0	0	400	400	1400	6400	0	1	EMAAAA	IJBAAA	OOOOxx
+1275	919	1	3	5	15	75	275	1275	1275	1275	150	151	BXAAAA	JJBAAA	VVVVxx
+5797	920	1	1	7	17	97	797	1797	797	5797	194	195	ZOAAAA	KJBAAA	AAAAxx
+2221	921	1	1	1	1	21	221	221	2221	2221	42	43	LHAAAA	LJBAAA	HHHHxx
+2504	922	0	0	4	4	4	504	504	2504	2504	8	9	ISAAAA	MJBAAA	OOOOxx
+2143	923	1	3	3	3	43	143	143	2143	2143	86	87	LEAAAA	NJBAAA	VVVVxx
+1083	924	1	3	3	3	83	83	1083	1083	1083	166	167	RPAAAA	OJBAAA	AAAAxx
+6148	925	0	0	8	8	48	148	148	1148	6148	96	97	MCAAAA	PJBAAA	HHHHxx
+3612	926	0	0	2	12	12	612	1612	3612	3612	24	25	YIAAAA	QJBAAA	OOOOxx
+9499	927	1	3	9	19	99	499	1499	4499	9499	198	199	JBAAAA	RJBAAA	VVVVxx
+5773	928	1	1	3	13	73	773	1773	773	5773	146	147	BOAAAA	SJBAAA	AAAAxx
+1014	929	0	2	4	14	14	14	1014	1014	1014	28	29	ANAAAA	TJBAAA	HHHHxx
+1427	930	1	3	7	7	27	427	1427	1427	1427	54	55	XCAAAA	UJBAAA	OOOOxx
+6770	931	0	2	0	10	70	770	770	1770	6770	140	141	KAAAAA	VJBAAA	VVVVxx
+9042	932	0	2	2	2	42	42	1042	4042	9042	84	85	UJAAAA	WJBAAA	AAAAxx
+9892	933	0	0	2	12	92	892	1892	4892	9892	184	185	MQAAAA	XJBAAA	HHHHxx
+1771	934	1	3	1	11	71	771	1771	1771	1771	142	143	DQAAAA	YJBAAA	OOOOxx
+7392	935	0	0	2	12	92	392	1392	2392	7392	184	185	IYAAAA	ZJBAAA	VVVVxx
+4465	936	1	1	5	5	65	465	465	4465	4465	130	131	TPAAAA	AKBAAA	AAAAxx
+278	937	0	2	8	18	78	278	278	278	278	156	157	SKAAAA	BKBAAA	HHHHxx
+7776	938	0	0	6	16	76	776	1776	2776	7776	152	153	CNAAAA	CKBAAA	OOOOxx
+3763	939	1	3	3	3	63	763	1763	3763	3763	126	127	TOAAAA	DKBAAA	VVVVxx
+7503	940	1	3	3	3	3	503	1503	2503	7503	6	7	PCAAAA	EKBAAA	AAAAxx
+3793	941	1	1	3	13	93	793	1793	3793	3793	186	187	XPAAAA	FKBAAA	HHHHxx
+6510	942	0	2	0	10	10	510	510	1510	6510	20	21	KQAAAA	GKBAAA	OOOOxx
+7641	943	1	1	1	1	41	641	1641	2641	7641	82	83	XHAAAA	HKBAAA	VVVVxx
+3228	944	0	0	8	8	28	228	1228	3228	3228	56	57	EUAAAA	IKBAAA	AAAAxx
+194	945	0	2	4	14	94	194	194	194	194	188	189	MHAAAA	JKBAAA	HHHHxx
+8555	946	1	3	5	15	55	555	555	3555	8555	110	111	BRAAAA	KKBAAA	OOOOxx
+4997	947	1	1	7	17	97	997	997	4997	4997	194	195	FKAAAA	LKBAAA	VVVVxx
+8687	948	1	3	7	7	87	687	687	3687	8687	174	175	DWAAAA	MKBAAA	AAAAxx
+6632	949	0	0	2	12	32	632	632	1632	6632	64	65	CVAAAA	NKBAAA	HHHHxx
+9607	950	1	3	7	7	7	607	1607	4607	9607	14	15	NFAAAA	OKBAAA	OOOOxx
+6201	951	1	1	1	1	1	201	201	1201	6201	2	3	NEAAAA	PKBAAA	VVVVxx
+857	952	1	1	7	17	57	857	857	857	857	114	115	ZGAAAA	QKBAAA	AAAAxx
+5623	953	1	3	3	3	23	623	1623	623	5623	46	47	HIAAAA	RKBAAA	HHHHxx
+5979	954	1	3	9	19	79	979	1979	979	5979	158	159	ZVAAAA	SKBAAA	OOOOxx
+2201	955	1	1	1	1	1	201	201	2201	2201	2	3	RGAAAA	TKBAAA	VVVVxx
+3166	956	0	2	6	6	66	166	1166	3166	3166	132	133	URAAAA	UKBAAA	AAAAxx
+6249	957	1	1	9	9	49	249	249	1249	6249	98	99	JGAAAA	VKBAAA	HHHHxx
+3271	958	1	3	1	11	71	271	1271	3271	3271	142	143	VVAAAA	WKBAAA	OOOOxx
+7777	959	1	1	7	17	77	777	1777	2777	7777	154	155	DNAAAA	XKBAAA	VVVVxx
+6732	960	0	0	2	12	32	732	732	1732	6732	64	65	YYAAAA	YKBAAA	AAAAxx
+6297	961	1	1	7	17	97	297	297	1297	6297	194	195	FIAAAA	ZKBAAA	HHHHxx
+5685	962	1	1	5	5	85	685	1685	685	5685	170	171	RKAAAA	ALBAAA	OOOOxx
+9931	963	1	3	1	11	31	931	1931	4931	9931	62	63	ZRAAAA	BLBAAA	VVVVxx
+7485	964	1	1	5	5	85	485	1485	2485	7485	170	171	XBAAAA	CLBAAA	AAAAxx
+386	965	0	2	6	6	86	386	386	386	386	172	173	WOAAAA	DLBAAA	HHHHxx
+8204	966	0	0	4	4	4	204	204	3204	8204	8	9	ODAAAA	ELBAAA	OOOOxx
+3606	967	0	2	6	6	6	606	1606	3606	3606	12	13	SIAAAA	FLBAAA	VVVVxx
+1692	968	0	0	2	12	92	692	1692	1692	1692	184	185	CNAAAA	GLBAAA	AAAAxx
+3002	969	0	2	2	2	2	2	1002	3002	3002	4	5	MLAAAA	HLBAAA	HHHHxx
+9676	970	0	0	6	16	76	676	1676	4676	9676	152	153	EIAAAA	ILBAAA	OOOOxx
+915	971	1	3	5	15	15	915	915	915	915	30	31	FJAAAA	JLBAAA	VVVVxx
+7706	972	0	2	6	6	6	706	1706	2706	7706	12	13	KKAAAA	KLBAAA	AAAAxx
+6080	973	0	0	0	0	80	80	80	1080	6080	160	161	WZAAAA	LLBAAA	HHHHxx
+1860	974	0	0	0	0	60	860	1860	1860	1860	120	121	OTAAAA	MLBAAA	OOOOxx
+1444	975	0	0	4	4	44	444	1444	1444	1444	88	89	ODAAAA	NLBAAA	VVVVxx
+7208	976	0	0	8	8	8	208	1208	2208	7208	16	17	GRAAAA	OLBAAA	AAAAxx
+8554	977	0	2	4	14	54	554	554	3554	8554	108	109	ARAAAA	PLBAAA	HHHHxx
+2028	978	0	0	8	8	28	28	28	2028	2028	56	57	AAAAAA	QLBAAA	OOOOxx
+9893	979	1	1	3	13	93	893	1893	4893	9893	186	187	NQAAAA	RLBAAA	VVVVxx
+4740	980	0	0	0	0	40	740	740	4740	4740	80	81	IAAAAA	SLBAAA	AAAAxx
+6186	981	0	2	6	6	86	186	186	1186	6186	172	173	YDAAAA	TLBAAA	HHHHxx
+6357	982	1	1	7	17	57	357	357	1357	6357	114	115	NKAAAA	ULBAAA	OOOOxx
+3699	983	1	3	9	19	99	699	1699	3699	3699	198	199	HMAAAA	VLBAAA	VVVVxx
+7620	984	0	0	0	0	20	620	1620	2620	7620	40	41	CHAAAA	WLBAAA	AAAAxx
+921	985	1	1	1	1	21	921	921	921	921	42	43	LJAAAA	XLBAAA	HHHHxx
+5506	986	0	2	6	6	6	506	1506	506	5506	12	13	UDAAAA	YLBAAA	OOOOxx
+8851	987	1	3	1	11	51	851	851	3851	8851	102	103	LCAAAA	ZLBAAA	VVVVxx
+3205	988	1	1	5	5	5	205	1205	3205	3205	10	11	HTAAAA	AMBAAA	AAAAxx
+1956	989	0	0	6	16	56	956	1956	1956	1956	112	113	GXAAAA	BMBAAA	HHHHxx
+6272	990	0	0	2	12	72	272	272	1272	6272	144	145	GHAAAA	CMBAAA	OOOOxx
+1509	991	1	1	9	9	9	509	1509	1509	1509	18	19	BGAAAA	DMBAAA	VVVVxx
+53	992	1	1	3	13	53	53	53	53	53	106	107	BCAAAA	EMBAAA	AAAAxx
+213	993	1	1	3	13	13	213	213	213	213	26	27	FIAAAA	FMBAAA	HHHHxx
+4924	994	0	0	4	4	24	924	924	4924	4924	48	49	KHAAAA	GMBAAA	OOOOxx
+2097	995	1	1	7	17	97	97	97	2097	2097	194	195	RCAAAA	HMBAAA	VVVVxx
+4607	996	1	3	7	7	7	607	607	4607	4607	14	15	FVAAAA	IMBAAA	AAAAxx
+1582	997	0	2	2	2	82	582	1582	1582	1582	164	165	WIAAAA	JMBAAA	HHHHxx
+6643	998	1	3	3	3	43	643	643	1643	6643	86	87	NVAAAA	KMBAAA	OOOOxx
+2238	999	0	2	8	18	38	238	238	2238	2238	76	77	CIAAAA	LMBAAA	VVVVxx
+2942	1000	0	2	2	2	42	942	942	2942	2942	84	85	EJAAAA	MMBAAA	AAAAxx
+1655	1001	1	3	5	15	55	655	1655	1655	1655	110	111	RLAAAA	NMBAAA	HHHHxx
+3226	1002	0	2	6	6	26	226	1226	3226	3226	52	53	CUAAAA	OMBAAA	OOOOxx
+4263	1003	1	3	3	3	63	263	263	4263	4263	126	127	ZHAAAA	PMBAAA	VVVVxx
+960	1004	0	0	0	0	60	960	960	960	960	120	121	YKAAAA	QMBAAA	AAAAxx
+1213	1005	1	1	3	13	13	213	1213	1213	1213	26	27	RUAAAA	RMBAAA	HHHHxx
+1845	1006	1	1	5	5	45	845	1845	1845	1845	90	91	ZSAAAA	SMBAAA	OOOOxx
+6944	1007	0	0	4	4	44	944	944	1944	6944	88	89	CHAAAA	TMBAAA	VVVVxx
+5284	1008	0	0	4	4	84	284	1284	284	5284	168	169	GVAAAA	UMBAAA	AAAAxx
+188	1009	0	0	8	8	88	188	188	188	188	176	177	GHAAAA	VMBAAA	HHHHxx
+748	1010	0	0	8	8	48	748	748	748	748	96	97	UCAAAA	WMBAAA	OOOOxx
+2226	1011	0	2	6	6	26	226	226	2226	2226	52	53	QHAAAA	XMBAAA	VVVVxx
+7342	1012	0	2	2	2	42	342	1342	2342	7342	84	85	KWAAAA	YMBAAA	AAAAxx
+6120	1013	0	0	0	0	20	120	120	1120	6120	40	41	KBAAAA	ZMBAAA	HHHHxx
+536	1014	0	0	6	16	36	536	536	536	536	72	73	QUAAAA	ANBAAA	OOOOxx
+3239	1015	1	3	9	19	39	239	1239	3239	3239	78	79	PUAAAA	BNBAAA	VVVVxx
+2832	1016	0	0	2	12	32	832	832	2832	2832	64	65	YEAAAA	CNBAAA	AAAAxx
+5296	1017	0	0	6	16	96	296	1296	296	5296	192	193	SVAAAA	DNBAAA	HHHHxx
+5795	1018	1	3	5	15	95	795	1795	795	5795	190	191	XOAAAA	ENBAAA	OOOOxx
+6290	1019	0	2	0	10	90	290	290	1290	6290	180	181	YHAAAA	FNBAAA	VVVVxx
+4916	1020	0	0	6	16	16	916	916	4916	4916	32	33	CHAAAA	GNBAAA	AAAAxx
+8366	1021	0	2	6	6	66	366	366	3366	8366	132	133	UJAAAA	HNBAAA	HHHHxx
+4248	1022	0	0	8	8	48	248	248	4248	4248	96	97	KHAAAA	INBAAA	OOOOxx
+6460	1023	0	0	0	0	60	460	460	1460	6460	120	121	MOAAAA	JNBAAA	VVVVxx
+9296	1024	0	0	6	16	96	296	1296	4296	9296	192	193	OTAAAA	KNBAAA	AAAAxx
+3486	1025	0	2	6	6	86	486	1486	3486	3486	172	173	CEAAAA	LNBAAA	HHHHxx
+5664	1026	0	0	4	4	64	664	1664	664	5664	128	129	WJAAAA	MNBAAA	OOOOxx
+7624	1027	0	0	4	4	24	624	1624	2624	7624	48	49	GHAAAA	NNBAAA	VVVVxx
+2790	1028	0	2	0	10	90	790	790	2790	2790	180	181	IDAAAA	ONBAAA	AAAAxx
+682	1029	0	2	2	2	82	682	682	682	682	164	165	GAAAAA	PNBAAA	HHHHxx
+6412	1030	0	0	2	12	12	412	412	1412	6412	24	25	QMAAAA	QNBAAA	OOOOxx
+6882	1031	0	2	2	2	82	882	882	1882	6882	164	165	SEAAAA	RNBAAA	VVVVxx
+1332	1032	0	0	2	12	32	332	1332	1332	1332	64	65	GZAAAA	SNBAAA	AAAAxx
+4911	1033	1	3	1	11	11	911	911	4911	4911	22	23	XGAAAA	TNBAAA	HHHHxx
+3528	1034	0	0	8	8	28	528	1528	3528	3528	56	57	SFAAAA	UNBAAA	OOOOxx
+271	1035	1	3	1	11	71	271	271	271	271	142	143	LKAAAA	VNBAAA	VVVVxx
+7007	1036	1	3	7	7	7	7	1007	2007	7007	14	15	NJAAAA	WNBAAA	AAAAxx
+2198	1037	0	2	8	18	98	198	198	2198	2198	196	197	OGAAAA	XNBAAA	HHHHxx
+4266	1038	0	2	6	6	66	266	266	4266	4266	132	133	CIAAAA	YNBAAA	OOOOxx
+9867	1039	1	3	7	7	67	867	1867	4867	9867	134	135	NPAAAA	ZNBAAA	VVVVxx
+7602	1040	0	2	2	2	2	602	1602	2602	7602	4	5	KGAAAA	AOBAAA	AAAAxx
+7521	1041	1	1	1	1	21	521	1521	2521	7521	42	43	HDAAAA	BOBAAA	HHHHxx
+7200	1042	0	0	0	0	0	200	1200	2200	7200	0	1	YQAAAA	COBAAA	OOOOxx
+4816	1043	0	0	6	16	16	816	816	4816	4816	32	33	GDAAAA	DOBAAA	VVVVxx
+1669	1044	1	1	9	9	69	669	1669	1669	1669	138	139	FMAAAA	EOBAAA	AAAAxx
+4764	1045	0	0	4	4	64	764	764	4764	4764	128	129	GBAAAA	FOBAAA	HHHHxx
+7393	1046	1	1	3	13	93	393	1393	2393	7393	186	187	JYAAAA	GOBAAA	OOOOxx
+7434	1047	0	2	4	14	34	434	1434	2434	7434	68	69	YZAAAA	HOBAAA	VVVVxx
+9079	1048	1	3	9	19	79	79	1079	4079	9079	158	159	FLAAAA	IOBAAA	AAAAxx
+9668	1049	0	0	8	8	68	668	1668	4668	9668	136	137	WHAAAA	JOBAAA	HHHHxx
+7184	1050	0	0	4	4	84	184	1184	2184	7184	168	169	IQAAAA	KOBAAA	OOOOxx
+7347	1051	1	3	7	7	47	347	1347	2347	7347	94	95	PWAAAA	LOBAAA	VVVVxx
+951	1052	1	3	1	11	51	951	951	951	951	102	103	PKAAAA	MOBAAA	AAAAxx
+4513	1053	1	1	3	13	13	513	513	4513	4513	26	27	PRAAAA	NOBAAA	HHHHxx
+2692	1054	0	0	2	12	92	692	692	2692	2692	184	185	OZAAAA	OOBAAA	OOOOxx
+9930	1055	0	2	0	10	30	930	1930	4930	9930	60	61	YRAAAA	POBAAA	VVVVxx
+4516	1056	0	0	6	16	16	516	516	4516	4516	32	33	SRAAAA	QOBAAA	AAAAxx
+1592	1057	0	0	2	12	92	592	1592	1592	1592	184	185	GJAAAA	ROBAAA	HHHHxx
+6312	1058	0	0	2	12	12	312	312	1312	6312	24	25	UIAAAA	SOBAAA	OOOOxx
+185	1059	1	1	5	5	85	185	185	185	185	170	171	DHAAAA	TOBAAA	VVVVxx
+1848	1060	0	0	8	8	48	848	1848	1848	1848	96	97	CTAAAA	UOBAAA	AAAAxx
+5844	1061	0	0	4	4	44	844	1844	844	5844	88	89	UQAAAA	VOBAAA	HHHHxx
+1666	1062	0	2	6	6	66	666	1666	1666	1666	132	133	CMAAAA	WOBAAA	OOOOxx
+5864	1063	0	0	4	4	64	864	1864	864	5864	128	129	ORAAAA	XOBAAA	VVVVxx
+1004	1064	0	0	4	4	4	4	1004	1004	1004	8	9	QMAAAA	YOBAAA	AAAAxx
+1758	1065	0	2	8	18	58	758	1758	1758	1758	116	117	QPAAAA	ZOBAAA	HHHHxx
+8823	1066	1	3	3	3	23	823	823	3823	8823	46	47	JBAAAA	APBAAA	OOOOxx
+129	1067	1	1	9	9	29	129	129	129	129	58	59	ZEAAAA	BPBAAA	VVVVxx
+5703	1068	1	3	3	3	3	703	1703	703	5703	6	7	JLAAAA	CPBAAA	AAAAxx
+3331	1069	1	3	1	11	31	331	1331	3331	3331	62	63	DYAAAA	DPBAAA	HHHHxx
+5791	1070	1	3	1	11	91	791	1791	791	5791	182	183	TOAAAA	EPBAAA	OOOOxx
+4421	1071	1	1	1	1	21	421	421	4421	4421	42	43	BOAAAA	FPBAAA	VVVVxx
+9740	1072	0	0	0	0	40	740	1740	4740	9740	80	81	QKAAAA	GPBAAA	AAAAxx
+798	1073	0	2	8	18	98	798	798	798	798	196	197	SEAAAA	HPBAAA	HHHHxx
+571	1074	1	3	1	11	71	571	571	571	571	142	143	ZVAAAA	IPBAAA	OOOOxx
+7084	1075	0	0	4	4	84	84	1084	2084	7084	168	169	MMAAAA	JPBAAA	VVVVxx
+650	1076	0	2	0	10	50	650	650	650	650	100	101	AZAAAA	KPBAAA	AAAAxx
+1467	1077	1	3	7	7	67	467	1467	1467	1467	134	135	LEAAAA	LPBAAA	HHHHxx
+5446	1078	0	2	6	6	46	446	1446	446	5446	92	93	MBAAAA	MPBAAA	OOOOxx
+830	1079	0	2	0	10	30	830	830	830	830	60	61	YFAAAA	NPBAAA	VVVVxx
+5516	1080	0	0	6	16	16	516	1516	516	5516	32	33	EEAAAA	OPBAAA	AAAAxx
+8520	1081	0	0	0	0	20	520	520	3520	8520	40	41	SPAAAA	PPBAAA	HHHHxx
+1152	1082	0	0	2	12	52	152	1152	1152	1152	104	105	ISAAAA	QPBAAA	OOOOxx
+862	1083	0	2	2	2	62	862	862	862	862	124	125	EHAAAA	RPBAAA	VVVVxx
+454	1084	0	2	4	14	54	454	454	454	454	108	109	MRAAAA	SPBAAA	AAAAxx
+9956	1085	0	0	6	16	56	956	1956	4956	9956	112	113	YSAAAA	TPBAAA	HHHHxx
+1654	1086	0	2	4	14	54	654	1654	1654	1654	108	109	QLAAAA	UPBAAA	OOOOxx
+257	1087	1	1	7	17	57	257	257	257	257	114	115	XJAAAA	VPBAAA	VVVVxx
+5469	1088	1	1	9	9	69	469	1469	469	5469	138	139	JCAAAA	WPBAAA	AAAAxx
+9075	1089	1	3	5	15	75	75	1075	4075	9075	150	151	BLAAAA	XPBAAA	HHHHxx
+7799	1090	1	3	9	19	99	799	1799	2799	7799	198	199	ZNAAAA	YPBAAA	OOOOxx
+2001	1091	1	1	1	1	1	1	1	2001	2001	2	3	ZYAAAA	ZPBAAA	VVVVxx
+9786	1092	0	2	6	6	86	786	1786	4786	9786	172	173	KMAAAA	AQBAAA	AAAAxx
+7281	1093	1	1	1	1	81	281	1281	2281	7281	162	163	BUAAAA	BQBAAA	HHHHxx
+5137	1094	1	1	7	17	37	137	1137	137	5137	74	75	PPAAAA	CQBAAA	OOOOxx
+4053	1095	1	1	3	13	53	53	53	4053	4053	106	107	XZAAAA	DQBAAA	VVVVxx
+7911	1096	1	3	1	11	11	911	1911	2911	7911	22	23	HSAAAA	EQBAAA	AAAAxx
+4298	1097	0	2	8	18	98	298	298	4298	4298	196	197	IJAAAA	FQBAAA	HHHHxx
+4805	1098	1	1	5	5	5	805	805	4805	4805	10	11	VCAAAA	GQBAAA	OOOOxx
+9038	1099	0	2	8	18	38	38	1038	4038	9038	76	77	QJAAAA	HQBAAA	VVVVxx
+8023	1100	1	3	3	3	23	23	23	3023	8023	46	47	PWAAAA	IQBAAA	AAAAxx
+6595	1101	1	3	5	15	95	595	595	1595	6595	190	191	RTAAAA	JQBAAA	HHHHxx
+9831	1102	1	3	1	11	31	831	1831	4831	9831	62	63	DOAAAA	KQBAAA	OOOOxx
+788	1103	0	0	8	8	88	788	788	788	788	176	177	IEAAAA	LQBAAA	VVVVxx
+902	1104	0	2	2	2	2	902	902	902	902	4	5	SIAAAA	MQBAAA	AAAAxx
+9137	1105	1	1	7	17	37	137	1137	4137	9137	74	75	LNAAAA	NQBAAA	HHHHxx
+1744	1106	0	0	4	4	44	744	1744	1744	1744	88	89	CPAAAA	OQBAAA	OOOOxx
+7285	1107	1	1	5	5	85	285	1285	2285	7285	170	171	FUAAAA	PQBAAA	VVVVxx
+7006	1108	0	2	6	6	6	6	1006	2006	7006	12	13	MJAAAA	QQBAAA	AAAAxx
+9236	1109	0	0	6	16	36	236	1236	4236	9236	72	73	GRAAAA	RQBAAA	HHHHxx
+5472	1110	0	0	2	12	72	472	1472	472	5472	144	145	MCAAAA	SQBAAA	OOOOxx
+7975	1111	1	3	5	15	75	975	1975	2975	7975	150	151	TUAAAA	TQBAAA	VVVVxx
+4181	1112	1	1	1	1	81	181	181	4181	4181	162	163	VEAAAA	UQBAAA	AAAAxx
+7677	1113	1	1	7	17	77	677	1677	2677	7677	154	155	HJAAAA	VQBAAA	HHHHxx
+35	1114	1	3	5	15	35	35	35	35	35	70	71	JBAAAA	WQBAAA	OOOOxx
+6813	1115	1	1	3	13	13	813	813	1813	6813	26	27	BCAAAA	XQBAAA	VVVVxx
+6618	1116	0	2	8	18	18	618	618	1618	6618	36	37	OUAAAA	YQBAAA	AAAAxx
+8069	1117	1	1	9	9	69	69	69	3069	8069	138	139	JYAAAA	ZQBAAA	HHHHxx
+3071	1118	1	3	1	11	71	71	1071	3071	3071	142	143	DOAAAA	ARBAAA	OOOOxx
+4390	1119	0	2	0	10	90	390	390	4390	4390	180	181	WMAAAA	BRBAAA	VVVVxx
+7764	1120	0	0	4	4	64	764	1764	2764	7764	128	129	QMAAAA	CRBAAA	AAAAxx
+8163	1121	1	3	3	3	63	163	163	3163	8163	126	127	ZBAAAA	DRBAAA	HHHHxx
+1961	1122	1	1	1	1	61	961	1961	1961	1961	122	123	LXAAAA	ERBAAA	OOOOxx
+1103	1123	1	3	3	3	3	103	1103	1103	1103	6	7	LQAAAA	FRBAAA	VVVVxx
+5486	1124	0	2	6	6	86	486	1486	486	5486	172	173	ADAAAA	GRBAAA	AAAAxx
+9513	1125	1	1	3	13	13	513	1513	4513	9513	26	27	XBAAAA	HRBAAA	HHHHxx
+7311	1126	1	3	1	11	11	311	1311	2311	7311	22	23	FVAAAA	IRBAAA	OOOOxx
+4144	1127	0	0	4	4	44	144	144	4144	4144	88	89	KDAAAA	JRBAAA	VVVVxx
+7901	1128	1	1	1	1	1	901	1901	2901	7901	2	3	XRAAAA	KRBAAA	AAAAxx
+4629	1129	1	1	9	9	29	629	629	4629	4629	58	59	BWAAAA	LRBAAA	HHHHxx
+6858	1130	0	2	8	18	58	858	858	1858	6858	116	117	UDAAAA	MRBAAA	OOOOxx
+125	1131	1	1	5	5	25	125	125	125	125	50	51	VEAAAA	NRBAAA	VVVVxx
+3834	1132	0	2	4	14	34	834	1834	3834	3834	68	69	MRAAAA	ORBAAA	AAAAxx
+8155	1133	1	3	5	15	55	155	155	3155	8155	110	111	RBAAAA	PRBAAA	HHHHxx
+8230	1134	0	2	0	10	30	230	230	3230	8230	60	61	OEAAAA	QRBAAA	OOOOxx
+744	1135	0	0	4	4	44	744	744	744	744	88	89	QCAAAA	RRBAAA	VVVVxx
+357	1136	1	1	7	17	57	357	357	357	357	114	115	TNAAAA	SRBAAA	AAAAxx
+2159	1137	1	3	9	19	59	159	159	2159	2159	118	119	BFAAAA	TRBAAA	HHHHxx
+8559	1138	1	3	9	19	59	559	559	3559	8559	118	119	FRAAAA	URBAAA	OOOOxx
+6866	1139	0	2	6	6	66	866	866	1866	6866	132	133	CEAAAA	VRBAAA	VVVVxx
+3863	1140	1	3	3	3	63	863	1863	3863	3863	126	127	PSAAAA	WRBAAA	AAAAxx
+4193	1141	1	1	3	13	93	193	193	4193	4193	186	187	HFAAAA	XRBAAA	HHHHxx
+3277	1142	1	1	7	17	77	277	1277	3277	3277	154	155	BWAAAA	YRBAAA	OOOOxx
+5577	1143	1	1	7	17	77	577	1577	577	5577	154	155	NGAAAA	ZRBAAA	VVVVxx
+9503	1144	1	3	3	3	3	503	1503	4503	9503	6	7	NBAAAA	ASBAAA	AAAAxx
+7642	1145	0	2	2	2	42	642	1642	2642	7642	84	85	YHAAAA	BSBAAA	HHHHxx
+6197	1146	1	1	7	17	97	197	197	1197	6197	194	195	JEAAAA	CSBAAA	OOOOxx
+8995	1147	1	3	5	15	95	995	995	3995	8995	190	191	ZHAAAA	DSBAAA	VVVVxx
+440	1148	0	0	0	0	40	440	440	440	440	80	81	YQAAAA	ESBAAA	AAAAxx
+8418	1149	0	2	8	18	18	418	418	3418	8418	36	37	ULAAAA	FSBAAA	HHHHxx
+8531	1150	1	3	1	11	31	531	531	3531	8531	62	63	DQAAAA	GSBAAA	OOOOxx
+3790	1151	0	2	0	10	90	790	1790	3790	3790	180	181	UPAAAA	HSBAAA	VVVVxx
+7610	1152	0	2	0	10	10	610	1610	2610	7610	20	21	SGAAAA	ISBAAA	AAAAxx
+1252	1153	0	0	2	12	52	252	1252	1252	1252	104	105	EWAAAA	JSBAAA	HHHHxx
+7559	1154	1	3	9	19	59	559	1559	2559	7559	118	119	TEAAAA	KSBAAA	OOOOxx
+9945	1155	1	1	5	5	45	945	1945	4945	9945	90	91	NSAAAA	LSBAAA	VVVVxx
+9023	1156	1	3	3	3	23	23	1023	4023	9023	46	47	BJAAAA	MSBAAA	AAAAxx
+3516	1157	0	0	6	16	16	516	1516	3516	3516	32	33	GFAAAA	NSBAAA	HHHHxx
+4671	1158	1	3	1	11	71	671	671	4671	4671	142	143	RXAAAA	OSBAAA	OOOOxx
+1465	1159	1	1	5	5	65	465	1465	1465	1465	130	131	JEAAAA	PSBAAA	VVVVxx
+9515	1160	1	3	5	15	15	515	1515	4515	9515	30	31	ZBAAAA	QSBAAA	AAAAxx
+3242	1161	0	2	2	2	42	242	1242	3242	3242	84	85	SUAAAA	RSBAAA	HHHHxx
+1732	1162	0	0	2	12	32	732	1732	1732	1732	64	65	QOAAAA	SSBAAA	OOOOxx
+1678	1163	0	2	8	18	78	678	1678	1678	1678	156	157	OMAAAA	TSBAAA	VVVVxx
+1464	1164	0	0	4	4	64	464	1464	1464	1464	128	129	IEAAAA	USBAAA	AAAAxx
+6546	1165	0	2	6	6	46	546	546	1546	6546	92	93	URAAAA	VSBAAA	HHHHxx
+4448	1166	0	0	8	8	48	448	448	4448	4448	96	97	CPAAAA	WSBAAA	OOOOxx
+9847	1167	1	3	7	7	47	847	1847	4847	9847	94	95	TOAAAA	XSBAAA	VVVVxx
+8264	1168	0	0	4	4	64	264	264	3264	8264	128	129	WFAAAA	YSBAAA	AAAAxx
+1620	1169	0	0	0	0	20	620	1620	1620	1620	40	41	IKAAAA	ZSBAAA	HHHHxx
+9388	1170	0	0	8	8	88	388	1388	4388	9388	176	177	CXAAAA	ATBAAA	OOOOxx
+6445	1171	1	1	5	5	45	445	445	1445	6445	90	91	XNAAAA	BTBAAA	VVVVxx
+4789	1172	1	1	9	9	89	789	789	4789	4789	178	179	FCAAAA	CTBAAA	AAAAxx
+1562	1173	0	2	2	2	62	562	1562	1562	1562	124	125	CIAAAA	DTBAAA	HHHHxx
+7305	1174	1	1	5	5	5	305	1305	2305	7305	10	11	ZUAAAA	ETBAAA	OOOOxx
+6344	1175	0	0	4	4	44	344	344	1344	6344	88	89	AKAAAA	FTBAAA	VVVVxx
+5130	1176	0	2	0	10	30	130	1130	130	5130	60	61	IPAAAA	GTBAAA	AAAAxx
+3284	1177	0	0	4	4	84	284	1284	3284	3284	168	169	IWAAAA	HTBAAA	HHHHxx
+6346	1178	0	2	6	6	46	346	346	1346	6346	92	93	CKAAAA	ITBAAA	OOOOxx
+1061	1179	1	1	1	1	61	61	1061	1061	1061	122	123	VOAAAA	JTBAAA	VVVVxx
+872	1180	0	0	2	12	72	872	872	872	872	144	145	OHAAAA	KTBAAA	AAAAxx
+123	1181	1	3	3	3	23	123	123	123	123	46	47	TEAAAA	LTBAAA	HHHHxx
+7903	1182	1	3	3	3	3	903	1903	2903	7903	6	7	ZRAAAA	MTBAAA	OOOOxx
+560	1183	0	0	0	0	60	560	560	560	560	120	121	OVAAAA	NTBAAA	VVVVxx
+4446	1184	0	2	6	6	46	446	446	4446	4446	92	93	APAAAA	OTBAAA	AAAAxx
+3909	1185	1	1	9	9	9	909	1909	3909	3909	18	19	JUAAAA	PTBAAA	HHHHxx
+669	1186	1	1	9	9	69	669	669	669	669	138	139	TZAAAA	QTBAAA	OOOOxx
+7843	1187	1	3	3	3	43	843	1843	2843	7843	86	87	RPAAAA	RTBAAA	VVVVxx
+2546	1188	0	2	6	6	46	546	546	2546	2546	92	93	YTAAAA	STBAAA	AAAAxx
+6757	1189	1	1	7	17	57	757	757	1757	6757	114	115	XZAAAA	TTBAAA	HHHHxx
+466	1190	0	2	6	6	66	466	466	466	466	132	133	YRAAAA	UTBAAA	OOOOxx
+5556	1191	0	0	6	16	56	556	1556	556	5556	112	113	SFAAAA	VTBAAA	VVVVxx
+7196	1192	0	0	6	16	96	196	1196	2196	7196	192	193	UQAAAA	WTBAAA	AAAAxx
+2947	1193	1	3	7	7	47	947	947	2947	2947	94	95	JJAAAA	XTBAAA	HHHHxx
+6493	1194	1	1	3	13	93	493	493	1493	6493	186	187	TPAAAA	YTBAAA	OOOOxx
+7203	1195	1	3	3	3	3	203	1203	2203	7203	6	7	BRAAAA	ZTBAAA	VVVVxx
+3716	1196	0	0	6	16	16	716	1716	3716	3716	32	33	YMAAAA	AUBAAA	AAAAxx
+8058	1197	0	2	8	18	58	58	58	3058	8058	116	117	YXAAAA	BUBAAA	HHHHxx
+433	1198	1	1	3	13	33	433	433	433	433	66	67	RQAAAA	CUBAAA	OOOOxx
+7649	1199	1	1	9	9	49	649	1649	2649	7649	98	99	FIAAAA	DUBAAA	VVVVxx
+6966	1200	0	2	6	6	66	966	966	1966	6966	132	133	YHAAAA	EUBAAA	AAAAxx
+553	1201	1	1	3	13	53	553	553	553	553	106	107	HVAAAA	FUBAAA	HHHHxx
+3677	1202	1	1	7	17	77	677	1677	3677	3677	154	155	LLAAAA	GUBAAA	OOOOxx
+2344	1203	0	0	4	4	44	344	344	2344	2344	88	89	EMAAAA	HUBAAA	VVVVxx
+7439	1204	1	3	9	19	39	439	1439	2439	7439	78	79	DAAAAA	IUBAAA	AAAAxx
+3910	1205	0	2	0	10	10	910	1910	3910	3910	20	21	KUAAAA	JUBAAA	HHHHxx
+3638	1206	0	2	8	18	38	638	1638	3638	3638	76	77	YJAAAA	KUBAAA	OOOOxx
+6637	1207	1	1	7	17	37	637	637	1637	6637	74	75	HVAAAA	LUBAAA	VVVVxx
+4438	1208	0	2	8	18	38	438	438	4438	4438	76	77	SOAAAA	MUBAAA	AAAAxx
+171	1209	1	3	1	11	71	171	171	171	171	142	143	PGAAAA	NUBAAA	HHHHxx
+310	1210	0	2	0	10	10	310	310	310	310	20	21	YLAAAA	OUBAAA	OOOOxx
+2714	1211	0	2	4	14	14	714	714	2714	2714	28	29	KAAAAA	PUBAAA	VVVVxx
+5199	1212	1	3	9	19	99	199	1199	199	5199	198	199	ZRAAAA	QUBAAA	AAAAxx
+8005	1213	1	1	5	5	5	5	5	3005	8005	10	11	XVAAAA	RUBAAA	HHHHxx
+3188	1214	0	0	8	8	88	188	1188	3188	3188	176	177	QSAAAA	SUBAAA	OOOOxx
+1518	1215	0	2	8	18	18	518	1518	1518	1518	36	37	KGAAAA	TUBAAA	VVVVxx
+6760	1216	0	0	0	0	60	760	760	1760	6760	120	121	AAAAAA	UUBAAA	AAAAxx
+9373	1217	1	1	3	13	73	373	1373	4373	9373	146	147	NWAAAA	VUBAAA	HHHHxx
+1938	1218	0	2	8	18	38	938	1938	1938	1938	76	77	OWAAAA	WUBAAA	OOOOxx
+2865	1219	1	1	5	5	65	865	865	2865	2865	130	131	FGAAAA	XUBAAA	VVVVxx
+3203	1220	1	3	3	3	3	203	1203	3203	3203	6	7	FTAAAA	YUBAAA	AAAAxx
+6025	1221	1	1	5	5	25	25	25	1025	6025	50	51	TXAAAA	ZUBAAA	HHHHxx
+8684	1222	0	0	4	4	84	684	684	3684	8684	168	169	AWAAAA	AVBAAA	OOOOxx
+7732	1223	0	0	2	12	32	732	1732	2732	7732	64	65	KLAAAA	BVBAAA	VVVVxx
+3218	1224	0	2	8	18	18	218	1218	3218	3218	36	37	UTAAAA	CVBAAA	AAAAxx
+525	1225	1	1	5	5	25	525	525	525	525	50	51	FUAAAA	DVBAAA	HHHHxx
+601	1226	1	1	1	1	1	601	601	601	601	2	3	DXAAAA	EVBAAA	OOOOxx
+6091	1227	1	3	1	11	91	91	91	1091	6091	182	183	HAAAAA	FVBAAA	VVVVxx
+4498	1228	0	2	8	18	98	498	498	4498	4498	196	197	ARAAAA	GVBAAA	AAAAxx
+8192	1229	0	0	2	12	92	192	192	3192	8192	184	185	CDAAAA	HVBAAA	HHHHxx
+8006	1230	0	2	6	6	6	6	6	3006	8006	12	13	YVAAAA	IVBAAA	OOOOxx
+6157	1231	1	1	7	17	57	157	157	1157	6157	114	115	VCAAAA	JVBAAA	VVVVxx
+312	1232	0	0	2	12	12	312	312	312	312	24	25	AMAAAA	KVBAAA	AAAAxx
+8652	1233	0	0	2	12	52	652	652	3652	8652	104	105	UUAAAA	LVBAAA	HHHHxx
+2787	1234	1	3	7	7	87	787	787	2787	2787	174	175	FDAAAA	MVBAAA	OOOOxx
+1782	1235	0	2	2	2	82	782	1782	1782	1782	164	165	OQAAAA	NVBAAA	VVVVxx
+23	1236	1	3	3	3	23	23	23	23	23	46	47	XAAAAA	OVBAAA	AAAAxx
+1206	1237	0	2	6	6	6	206	1206	1206	1206	12	13	KUAAAA	PVBAAA	HHHHxx
+1076	1238	0	0	6	16	76	76	1076	1076	1076	152	153	KPAAAA	QVBAAA	OOOOxx
+5379	1239	1	3	9	19	79	379	1379	379	5379	158	159	XYAAAA	RVBAAA	VVVVxx
+2047	1240	1	3	7	7	47	47	47	2047	2047	94	95	TAAAAA	SVBAAA	AAAAxx
+6262	1241	0	2	2	2	62	262	262	1262	6262	124	125	WGAAAA	TVBAAA	HHHHxx
+1840	1242	0	0	0	0	40	840	1840	1840	1840	80	81	USAAAA	UVBAAA	OOOOxx
+2106	1243	0	2	6	6	6	106	106	2106	2106	12	13	ADAAAA	VVBAAA	VVVVxx
+1307	1244	1	3	7	7	7	307	1307	1307	1307	14	15	HYAAAA	WVBAAA	AAAAxx
+735	1245	1	3	5	15	35	735	735	735	735	70	71	HCAAAA	XVBAAA	HHHHxx
+3657	1246	1	1	7	17	57	657	1657	3657	3657	114	115	RKAAAA	YVBAAA	OOOOxx
+3006	1247	0	2	6	6	6	6	1006	3006	3006	12	13	QLAAAA	ZVBAAA	VVVVxx
+1538	1248	0	2	8	18	38	538	1538	1538	1538	76	77	EHAAAA	AWBAAA	AAAAxx
+6098	1249	0	2	8	18	98	98	98	1098	6098	196	197	OAAAAA	BWBAAA	HHHHxx
+5267	1250	1	3	7	7	67	267	1267	267	5267	134	135	PUAAAA	CWBAAA	OOOOxx
+9757	1251	1	1	7	17	57	757	1757	4757	9757	114	115	HLAAAA	DWBAAA	VVVVxx
+1236	1252	0	0	6	16	36	236	1236	1236	1236	72	73	OVAAAA	EWBAAA	AAAAxx
+83	1253	1	3	3	3	83	83	83	83	83	166	167	FDAAAA	FWBAAA	HHHHxx
+9227	1254	1	3	7	7	27	227	1227	4227	9227	54	55	XQAAAA	GWBAAA	OOOOxx
+8772	1255	0	0	2	12	72	772	772	3772	8772	144	145	KZAAAA	HWBAAA	VVVVxx
+8822	1256	0	2	2	2	22	822	822	3822	8822	44	45	IBAAAA	IWBAAA	AAAAxx
+7167	1257	1	3	7	7	67	167	1167	2167	7167	134	135	RPAAAA	JWBAAA	HHHHxx
+6909	1258	1	1	9	9	9	909	909	1909	6909	18	19	TFAAAA	KWBAAA	OOOOxx
+1439	1259	1	3	9	19	39	439	1439	1439	1439	78	79	JDAAAA	LWBAAA	VVVVxx
+2370	1260	0	2	0	10	70	370	370	2370	2370	140	141	ENAAAA	MWBAAA	AAAAxx
+4577	1261	1	1	7	17	77	577	577	4577	4577	154	155	BUAAAA	NWBAAA	HHHHxx
+2575	1262	1	3	5	15	75	575	575	2575	2575	150	151	BVAAAA	OWBAAA	OOOOxx
+2795	1263	1	3	5	15	95	795	795	2795	2795	190	191	NDAAAA	PWBAAA	VVVVxx
+5520	1264	0	0	0	0	20	520	1520	520	5520	40	41	IEAAAA	QWBAAA	AAAAxx
+382	1265	0	2	2	2	82	382	382	382	382	164	165	SOAAAA	RWBAAA	HHHHxx
+6335	1266	1	3	5	15	35	335	335	1335	6335	70	71	RJAAAA	SWBAAA	OOOOxx
+8430	1267	0	2	0	10	30	430	430	3430	8430	60	61	GMAAAA	TWBAAA	VVVVxx
+4131	1268	1	3	1	11	31	131	131	4131	4131	62	63	XCAAAA	UWBAAA	AAAAxx
+9332	1269	0	0	2	12	32	332	1332	4332	9332	64	65	YUAAAA	VWBAAA	HHHHxx
+293	1270	1	1	3	13	93	293	293	293	293	186	187	HLAAAA	WWBAAA	OOOOxx
+2276	1271	0	0	6	16	76	276	276	2276	2276	152	153	OJAAAA	XWBAAA	VVVVxx
+5687	1272	1	3	7	7	87	687	1687	687	5687	174	175	TKAAAA	YWBAAA	AAAAxx
+5862	1273	0	2	2	2	62	862	1862	862	5862	124	125	MRAAAA	ZWBAAA	HHHHxx
+5073	1274	1	1	3	13	73	73	1073	73	5073	146	147	DNAAAA	AXBAAA	OOOOxx
+4170	1275	0	2	0	10	70	170	170	4170	4170	140	141	KEAAAA	BXBAAA	VVVVxx
+5039	1276	1	3	9	19	39	39	1039	39	5039	78	79	VLAAAA	CXBAAA	AAAAxx
+3294	1277	0	2	4	14	94	294	1294	3294	3294	188	189	SWAAAA	DXBAAA	HHHHxx
+6015	1278	1	3	5	15	15	15	15	1015	6015	30	31	JXAAAA	EXBAAA	OOOOxx
+9015	1279	1	3	5	15	15	15	1015	4015	9015	30	31	TIAAAA	FXBAAA	VVVVxx
+9785	1280	1	1	5	5	85	785	1785	4785	9785	170	171	JMAAAA	GXBAAA	AAAAxx
+4312	1281	0	0	2	12	12	312	312	4312	4312	24	25	WJAAAA	HXBAAA	HHHHxx
+6343	1282	1	3	3	3	43	343	343	1343	6343	86	87	ZJAAAA	IXBAAA	OOOOxx
+2161	1283	1	1	1	1	61	161	161	2161	2161	122	123	DFAAAA	JXBAAA	VVVVxx
+4490	1284	0	2	0	10	90	490	490	4490	4490	180	181	SQAAAA	KXBAAA	AAAAxx
+4454	1285	0	2	4	14	54	454	454	4454	4454	108	109	IPAAAA	LXBAAA	HHHHxx
+7647	1286	1	3	7	7	47	647	1647	2647	7647	94	95	DIAAAA	MXBAAA	OOOOxx
+1028	1287	0	0	8	8	28	28	1028	1028	1028	56	57	ONAAAA	NXBAAA	VVVVxx
+2965	1288	1	1	5	5	65	965	965	2965	2965	130	131	BKAAAA	OXBAAA	AAAAxx
+9900	1289	0	0	0	0	0	900	1900	4900	9900	0	1	UQAAAA	PXBAAA	HHHHxx
+5509	1290	1	1	9	9	9	509	1509	509	5509	18	19	XDAAAA	QXBAAA	OOOOxx
+7751	1291	1	3	1	11	51	751	1751	2751	7751	102	103	DMAAAA	RXBAAA	VVVVxx
+9594	1292	0	2	4	14	94	594	1594	4594	9594	188	189	AFAAAA	SXBAAA	AAAAxx
+7632	1293	0	0	2	12	32	632	1632	2632	7632	64	65	OHAAAA	TXBAAA	HHHHxx
+6528	1294	0	0	8	8	28	528	528	1528	6528	56	57	CRAAAA	UXBAAA	OOOOxx
+1041	1295	1	1	1	1	41	41	1041	1041	1041	82	83	BOAAAA	VXBAAA	VVVVxx
+1534	1296	0	2	4	14	34	534	1534	1534	1534	68	69	AHAAAA	WXBAAA	AAAAxx
+4229	1297	1	1	9	9	29	229	229	4229	4229	58	59	RGAAAA	XXBAAA	HHHHxx
+84	1298	0	0	4	4	84	84	84	84	84	168	169	GDAAAA	YXBAAA	OOOOxx
+2189	1299	1	1	9	9	89	189	189	2189	2189	178	179	FGAAAA	ZXBAAA	VVVVxx
+7566	1300	0	2	6	6	66	566	1566	2566	7566	132	133	AFAAAA	AYBAAA	AAAAxx
+707	1301	1	3	7	7	7	707	707	707	707	14	15	FBAAAA	BYBAAA	HHHHxx
+581	1302	1	1	1	1	81	581	581	581	581	162	163	JWAAAA	CYBAAA	OOOOxx
+6753	1303	1	1	3	13	53	753	753	1753	6753	106	107	TZAAAA	DYBAAA	VVVVxx
+8604	1304	0	0	4	4	4	604	604	3604	8604	8	9	YSAAAA	EYBAAA	AAAAxx
+373	1305	1	1	3	13	73	373	373	373	373	146	147	JOAAAA	FYBAAA	HHHHxx
+9635	1306	1	3	5	15	35	635	1635	4635	9635	70	71	PGAAAA	GYBAAA	OOOOxx
+9277	1307	1	1	7	17	77	277	1277	4277	9277	154	155	VSAAAA	HYBAAA	VVVVxx
+7117	1308	1	1	7	17	17	117	1117	2117	7117	34	35	TNAAAA	IYBAAA	AAAAxx
+8564	1309	0	0	4	4	64	564	564	3564	8564	128	129	KRAAAA	JYBAAA	HHHHxx
+1697	1310	1	1	7	17	97	697	1697	1697	1697	194	195	HNAAAA	KYBAAA	OOOOxx
+7840	1311	0	0	0	0	40	840	1840	2840	7840	80	81	OPAAAA	LYBAAA	VVVVxx
+3646	1312	0	2	6	6	46	646	1646	3646	3646	92	93	GKAAAA	MYBAAA	AAAAxx
+368	1313	0	0	8	8	68	368	368	368	368	136	137	EOAAAA	NYBAAA	HHHHxx
+4797	1314	1	1	7	17	97	797	797	4797	4797	194	195	NCAAAA	OYBAAA	OOOOxx
+5300	1315	0	0	0	0	0	300	1300	300	5300	0	1	WVAAAA	PYBAAA	VVVVxx
+7664	1316	0	0	4	4	64	664	1664	2664	7664	128	129	UIAAAA	QYBAAA	AAAAxx
+1466	1317	0	2	6	6	66	466	1466	1466	1466	132	133	KEAAAA	RYBAAA	HHHHxx
+2477	1318	1	1	7	17	77	477	477	2477	2477	154	155	HRAAAA	SYBAAA	OOOOxx
+2036	1319	0	0	6	16	36	36	36	2036	2036	72	73	IAAAAA	TYBAAA	VVVVxx
+3624	1320	0	0	4	4	24	624	1624	3624	3624	48	49	KJAAAA	UYBAAA	AAAAxx
+5099	1321	1	3	9	19	99	99	1099	99	5099	198	199	DOAAAA	VYBAAA	HHHHxx
+1308	1322	0	0	8	8	8	308	1308	1308	1308	16	17	IYAAAA	WYBAAA	OOOOxx
+3704	1323	0	0	4	4	4	704	1704	3704	3704	8	9	MMAAAA	XYBAAA	VVVVxx
+2451	1324	1	3	1	11	51	451	451	2451	2451	102	103	HQAAAA	YYBAAA	AAAAxx
+4898	1325	0	2	8	18	98	898	898	4898	4898	196	197	KGAAAA	ZYBAAA	HHHHxx
+4959	1326	1	3	9	19	59	959	959	4959	4959	118	119	TIAAAA	AZBAAA	OOOOxx
+5942	1327	0	2	2	2	42	942	1942	942	5942	84	85	OUAAAA	BZBAAA	VVVVxx
+2425	1328	1	1	5	5	25	425	425	2425	2425	50	51	HPAAAA	CZBAAA	AAAAxx
+7760	1329	0	0	0	0	60	760	1760	2760	7760	120	121	MMAAAA	DZBAAA	HHHHxx
+6294	1330	0	2	4	14	94	294	294	1294	6294	188	189	CIAAAA	EZBAAA	OOOOxx
+6785	1331	1	1	5	5	85	785	785	1785	6785	170	171	ZAAAAA	FZBAAA	VVVVxx
+3542	1332	0	2	2	2	42	542	1542	3542	3542	84	85	GGAAAA	GZBAAA	AAAAxx
+1809	1333	1	1	9	9	9	809	1809	1809	1809	18	19	PRAAAA	HZBAAA	HHHHxx
+130	1334	0	2	0	10	30	130	130	130	130	60	61	AFAAAA	IZBAAA	OOOOxx
+8672	1335	0	0	2	12	72	672	672	3672	8672	144	145	OVAAAA	JZBAAA	VVVVxx
+2125	1336	1	1	5	5	25	125	125	2125	2125	50	51	TDAAAA	KZBAAA	AAAAxx
+7683	1337	1	3	3	3	83	683	1683	2683	7683	166	167	NJAAAA	LZBAAA	HHHHxx
+7842	1338	0	2	2	2	42	842	1842	2842	7842	84	85	QPAAAA	MZBAAA	OOOOxx
+9584	1339	0	0	4	4	84	584	1584	4584	9584	168	169	QEAAAA	NZBAAA	VVVVxx
+7963	1340	1	3	3	3	63	963	1963	2963	7963	126	127	HUAAAA	OZBAAA	AAAAxx
+8581	1341	1	1	1	1	81	581	581	3581	8581	162	163	BSAAAA	PZBAAA	HHHHxx
+2135	1342	1	3	5	15	35	135	135	2135	2135	70	71	DEAAAA	QZBAAA	OOOOxx
+7352	1343	0	0	2	12	52	352	1352	2352	7352	104	105	UWAAAA	RZBAAA	VVVVxx
+5789	1344	1	1	9	9	89	789	1789	789	5789	178	179	ROAAAA	SZBAAA	AAAAxx
+8490	1345	0	2	0	10	90	490	490	3490	8490	180	181	OOAAAA	TZBAAA	HHHHxx
+2145	1346	1	1	5	5	45	145	145	2145	2145	90	91	NEAAAA	UZBAAA	OOOOxx
+7021	1347	1	1	1	1	21	21	1021	2021	7021	42	43	BKAAAA	VZBAAA	VVVVxx
+3736	1348	0	0	6	16	36	736	1736	3736	3736	72	73	SNAAAA	WZBAAA	AAAAxx
+7396	1349	0	0	6	16	96	396	1396	2396	7396	192	193	MYAAAA	XZBAAA	HHHHxx
+6334	1350	0	2	4	14	34	334	334	1334	6334	68	69	QJAAAA	YZBAAA	OOOOxx
+5461	1351	1	1	1	1	61	461	1461	461	5461	122	123	BCAAAA	ZZBAAA	VVVVxx
+5337	1352	1	1	7	17	37	337	1337	337	5337	74	75	HXAAAA	AACAAA	AAAAxx
+7440	1353	0	0	0	0	40	440	1440	2440	7440	80	81	EAAAAA	BACAAA	HHHHxx
+6879	1354	1	3	9	19	79	879	879	1879	6879	158	159	PEAAAA	CACAAA	OOOOxx
+2432	1355	0	0	2	12	32	432	432	2432	2432	64	65	OPAAAA	DACAAA	VVVVxx
+8529	1356	1	1	9	9	29	529	529	3529	8529	58	59	BQAAAA	EACAAA	AAAAxx
+7859	1357	1	3	9	19	59	859	1859	2859	7859	118	119	HQAAAA	FACAAA	HHHHxx
+15	1358	1	3	5	15	15	15	15	15	15	30	31	PAAAAA	GACAAA	OOOOxx
+7475	1359	1	3	5	15	75	475	1475	2475	7475	150	151	NBAAAA	HACAAA	VVVVxx
+717	1360	1	1	7	17	17	717	717	717	717	34	35	PBAAAA	IACAAA	AAAAxx
+250	1361	0	2	0	10	50	250	250	250	250	100	101	QJAAAA	JACAAA	HHHHxx
+4700	1362	0	0	0	0	0	700	700	4700	4700	0	1	UYAAAA	KACAAA	OOOOxx
+7510	1363	0	2	0	10	10	510	1510	2510	7510	20	21	WCAAAA	LACAAA	VVVVxx
+4562	1364	0	2	2	2	62	562	562	4562	4562	124	125	MTAAAA	MACAAA	AAAAxx
+8075	1365	1	3	5	15	75	75	75	3075	8075	150	151	PYAAAA	NACAAA	HHHHxx
+871	1366	1	3	1	11	71	871	871	871	871	142	143	NHAAAA	OACAAA	OOOOxx
+7161	1367	1	1	1	1	61	161	1161	2161	7161	122	123	LPAAAA	PACAAA	VVVVxx
+9109	1368	1	1	9	9	9	109	1109	4109	9109	18	19	JMAAAA	QACAAA	AAAAxx
+8675	1369	1	3	5	15	75	675	675	3675	8675	150	151	RVAAAA	RACAAA	HHHHxx
+1025	1370	1	1	5	5	25	25	1025	1025	1025	50	51	LNAAAA	SACAAA	OOOOxx
+4065	1371	1	1	5	5	65	65	65	4065	4065	130	131	JAAAAA	TACAAA	VVVVxx
+3511	1372	1	3	1	11	11	511	1511	3511	3511	22	23	BFAAAA	UACAAA	AAAAxx
+9840	1373	0	0	0	0	40	840	1840	4840	9840	80	81	MOAAAA	VACAAA	HHHHxx
+7495	1374	1	3	5	15	95	495	1495	2495	7495	190	191	HCAAAA	WACAAA	OOOOxx
+55	1375	1	3	5	15	55	55	55	55	55	110	111	DCAAAA	XACAAA	VVVVxx
+6151	1376	1	3	1	11	51	151	151	1151	6151	102	103	PCAAAA	YACAAA	AAAAxx
+2512	1377	0	0	2	12	12	512	512	2512	2512	24	25	QSAAAA	ZACAAA	HHHHxx
+5881	1378	1	1	1	1	81	881	1881	881	5881	162	163	FSAAAA	ABCAAA	OOOOxx
+1442	1379	0	2	2	2	42	442	1442	1442	1442	84	85	MDAAAA	BBCAAA	VVVVxx
+1270	1380	0	2	0	10	70	270	1270	1270	1270	140	141	WWAAAA	CBCAAA	AAAAxx
+959	1381	1	3	9	19	59	959	959	959	959	118	119	XKAAAA	DBCAAA	HHHHxx
+8251	1382	1	3	1	11	51	251	251	3251	8251	102	103	JFAAAA	EBCAAA	OOOOxx
+3051	1383	1	3	1	11	51	51	1051	3051	3051	102	103	JNAAAA	FBCAAA	VVVVxx
+5052	1384	0	0	2	12	52	52	1052	52	5052	104	105	IMAAAA	GBCAAA	AAAAxx
+1863	1385	1	3	3	3	63	863	1863	1863	1863	126	127	RTAAAA	HBCAAA	HHHHxx
+344	1386	0	0	4	4	44	344	344	344	344	88	89	GNAAAA	IBCAAA	OOOOxx
+3590	1387	0	2	0	10	90	590	1590	3590	3590	180	181	CIAAAA	JBCAAA	VVVVxx
+4223	1388	1	3	3	3	23	223	223	4223	4223	46	47	LGAAAA	KBCAAA	AAAAxx
+2284	1389	0	0	4	4	84	284	284	2284	2284	168	169	WJAAAA	LBCAAA	HHHHxx
+9425	1390	1	1	5	5	25	425	1425	4425	9425	50	51	NYAAAA	MBCAAA	OOOOxx
+6221	1391	1	1	1	1	21	221	221	1221	6221	42	43	HFAAAA	NBCAAA	VVVVxx
+195	1392	1	3	5	15	95	195	195	195	195	190	191	NHAAAA	OBCAAA	AAAAxx
+1517	1393	1	1	7	17	17	517	1517	1517	1517	34	35	JGAAAA	PBCAAA	HHHHxx
+3791	1394	1	3	1	11	91	791	1791	3791	3791	182	183	VPAAAA	QBCAAA	OOOOxx
+572	1395	0	0	2	12	72	572	572	572	572	144	145	AWAAAA	RBCAAA	VVVVxx
+46	1396	0	2	6	6	46	46	46	46	46	92	93	UBAAAA	SBCAAA	AAAAxx
+9451	1397	1	3	1	11	51	451	1451	4451	9451	102	103	NZAAAA	TBCAAA	HHHHxx
+3359	1398	1	3	9	19	59	359	1359	3359	3359	118	119	FZAAAA	UBCAAA	OOOOxx
+8867	1399	1	3	7	7	67	867	867	3867	8867	134	135	BDAAAA	VBCAAA	VVVVxx
+674	1400	0	2	4	14	74	674	674	674	674	148	149	YZAAAA	WBCAAA	AAAAxx
+2674	1401	0	2	4	14	74	674	674	2674	2674	148	149	WYAAAA	XBCAAA	HHHHxx
+6523	1402	1	3	3	3	23	523	523	1523	6523	46	47	XQAAAA	YBCAAA	OOOOxx
+6210	1403	0	2	0	10	10	210	210	1210	6210	20	21	WEAAAA	ZBCAAA	VVVVxx
+7564	1404	0	0	4	4	64	564	1564	2564	7564	128	129	YEAAAA	ACCAAA	AAAAxx
+4776	1405	0	0	6	16	76	776	776	4776	4776	152	153	SBAAAA	BCCAAA	HHHHxx
+2993	1406	1	1	3	13	93	993	993	2993	2993	186	187	DLAAAA	CCCAAA	OOOOxx
+2969	1407	1	1	9	9	69	969	969	2969	2969	138	139	FKAAAA	DCCAAA	VVVVxx
+1762	1408	0	2	2	2	62	762	1762	1762	1762	124	125	UPAAAA	ECCAAA	AAAAxx
+685	1409	1	1	5	5	85	685	685	685	685	170	171	JAAAAA	FCCAAA	HHHHxx
+5312	1410	0	0	2	12	12	312	1312	312	5312	24	25	IWAAAA	GCCAAA	OOOOxx
+3264	1411	0	0	4	4	64	264	1264	3264	3264	128	129	OVAAAA	HCCAAA	VVVVxx
+7008	1412	0	0	8	8	8	8	1008	2008	7008	16	17	OJAAAA	ICCAAA	AAAAxx
+5167	1413	1	3	7	7	67	167	1167	167	5167	134	135	TQAAAA	JCCAAA	HHHHxx
+3060	1414	0	0	0	0	60	60	1060	3060	3060	120	121	SNAAAA	KCCAAA	OOOOxx
+1752	1415	0	0	2	12	52	752	1752	1752	1752	104	105	KPAAAA	LCCAAA	VVVVxx
+1016	1416	0	0	6	16	16	16	1016	1016	1016	32	33	CNAAAA	MCCAAA	AAAAxx
+7365	1417	1	1	5	5	65	365	1365	2365	7365	130	131	HXAAAA	NCCAAA	HHHHxx
+4358	1418	0	2	8	18	58	358	358	4358	4358	116	117	QLAAAA	OCCAAA	OOOOxx
+2819	1419	1	3	9	19	19	819	819	2819	2819	38	39	LEAAAA	PCCAAA	VVVVxx
+6727	1420	1	3	7	7	27	727	727	1727	6727	54	55	TYAAAA	QCCAAA	AAAAxx
+1459	1421	1	3	9	19	59	459	1459	1459	1459	118	119	DEAAAA	RCCAAA	HHHHxx
+1708	1422	0	0	8	8	8	708	1708	1708	1708	16	17	SNAAAA	SCCAAA	OOOOxx
+471	1423	1	3	1	11	71	471	471	471	471	142	143	DSAAAA	TCCAAA	VVVVxx
+387	1424	1	3	7	7	87	387	387	387	387	174	175	XOAAAA	UCCAAA	AAAAxx
+1166	1425	0	2	6	6	66	166	1166	1166	1166	132	133	WSAAAA	VCCAAA	HHHHxx
+2400	1426	0	0	0	0	0	400	400	2400	2400	0	1	IOAAAA	WCCAAA	OOOOxx
+3584	1427	0	0	4	4	84	584	1584	3584	3584	168	169	WHAAAA	XCCAAA	VVVVxx
+6423	1428	1	3	3	3	23	423	423	1423	6423	46	47	BNAAAA	YCCAAA	AAAAxx
+9520	1429	0	0	0	0	20	520	1520	4520	9520	40	41	ECAAAA	ZCCAAA	HHHHxx
+8080	1430	0	0	0	0	80	80	80	3080	8080	160	161	UYAAAA	ADCAAA	OOOOxx
+5709	1431	1	1	9	9	9	709	1709	709	5709	18	19	PLAAAA	BDCAAA	VVVVxx
+1131	1432	1	3	1	11	31	131	1131	1131	1131	62	63	NRAAAA	CDCAAA	AAAAxx
+8562	1433	0	2	2	2	62	562	562	3562	8562	124	125	IRAAAA	DDCAAA	HHHHxx
+5766	1434	0	2	6	6	66	766	1766	766	5766	132	133	UNAAAA	EDCAAA	OOOOxx
+245	1435	1	1	5	5	45	245	245	245	245	90	91	LJAAAA	FDCAAA	VVVVxx
+9869	1436	1	1	9	9	69	869	1869	4869	9869	138	139	PPAAAA	GDCAAA	AAAAxx
+3533	1437	1	1	3	13	33	533	1533	3533	3533	66	67	XFAAAA	HDCAAA	HHHHxx
+5109	1438	1	1	9	9	9	109	1109	109	5109	18	19	NOAAAA	IDCAAA	OOOOxx
+977	1439	1	1	7	17	77	977	977	977	977	154	155	PLAAAA	JDCAAA	VVVVxx
+1651	1440	1	3	1	11	51	651	1651	1651	1651	102	103	NLAAAA	KDCAAA	AAAAxx
+1357	1441	1	1	7	17	57	357	1357	1357	1357	114	115	FAAAAA	LDCAAA	HHHHxx
+9087	1442	1	3	7	7	87	87	1087	4087	9087	174	175	NLAAAA	MDCAAA	OOOOxx
+3399	1443	1	3	9	19	99	399	1399	3399	3399	198	199	TAAAAA	NDCAAA	VVVVxx
+7543	1444	1	3	3	3	43	543	1543	2543	7543	86	87	DEAAAA	ODCAAA	AAAAxx
+2469	1445	1	1	9	9	69	469	469	2469	2469	138	139	ZQAAAA	PDCAAA	HHHHxx
+8305	1446	1	1	5	5	5	305	305	3305	8305	10	11	LHAAAA	QDCAAA	OOOOxx
+3265	1447	1	1	5	5	65	265	1265	3265	3265	130	131	PVAAAA	RDCAAA	VVVVxx
+9977	1448	1	1	7	17	77	977	1977	4977	9977	154	155	TTAAAA	SDCAAA	AAAAxx
+3961	1449	1	1	1	1	61	961	1961	3961	3961	122	123	JWAAAA	TDCAAA	HHHHxx
+4952	1450	0	0	2	12	52	952	952	4952	4952	104	105	MIAAAA	UDCAAA	OOOOxx
+5173	1451	1	1	3	13	73	173	1173	173	5173	146	147	ZQAAAA	VDCAAA	VVVVxx
+860	1452	0	0	0	0	60	860	860	860	860	120	121	CHAAAA	WDCAAA	AAAAxx
+4523	1453	1	3	3	3	23	523	523	4523	4523	46	47	ZRAAAA	XDCAAA	HHHHxx
+2361	1454	1	1	1	1	61	361	361	2361	2361	122	123	VMAAAA	YDCAAA	OOOOxx
+7877	1455	1	1	7	17	77	877	1877	2877	7877	154	155	ZQAAAA	ZDCAAA	VVVVxx
+3422	1456	0	2	2	2	22	422	1422	3422	3422	44	45	QBAAAA	AECAAA	AAAAxx
+5781	1457	1	1	1	1	81	781	1781	781	5781	162	163	JOAAAA	BECAAA	HHHHxx
+4752	1458	0	0	2	12	52	752	752	4752	4752	104	105	UAAAAA	CECAAA	OOOOxx
+1786	1459	0	2	6	6	86	786	1786	1786	1786	172	173	SQAAAA	DECAAA	VVVVxx
+1892	1460	0	0	2	12	92	892	1892	1892	1892	184	185	UUAAAA	EECAAA	AAAAxx
+6389	1461	1	1	9	9	89	389	389	1389	6389	178	179	TLAAAA	FECAAA	HHHHxx
+8644	1462	0	0	4	4	44	644	644	3644	8644	88	89	MUAAAA	GECAAA	OOOOxx
+9056	1463	0	0	6	16	56	56	1056	4056	9056	112	113	IKAAAA	HECAAA	VVVVxx
+1423	1464	1	3	3	3	23	423	1423	1423	1423	46	47	TCAAAA	IECAAA	AAAAxx
+4901	1465	1	1	1	1	1	901	901	4901	4901	2	3	NGAAAA	JECAAA	HHHHxx
+3859	1466	1	3	9	19	59	859	1859	3859	3859	118	119	LSAAAA	KECAAA	OOOOxx
+2324	1467	0	0	4	4	24	324	324	2324	2324	48	49	KLAAAA	LECAAA	VVVVxx
+8101	1468	1	1	1	1	1	101	101	3101	8101	2	3	PZAAAA	MECAAA	AAAAxx
+8016	1469	0	0	6	16	16	16	16	3016	8016	32	33	IWAAAA	NECAAA	HHHHxx
+5826	1470	0	2	6	6	26	826	1826	826	5826	52	53	CQAAAA	OECAAA	OOOOxx
+8266	1471	0	2	6	6	66	266	266	3266	8266	132	133	YFAAAA	PECAAA	VVVVxx
+7558	1472	0	2	8	18	58	558	1558	2558	7558	116	117	SEAAAA	QECAAA	AAAAxx
+6976	1473	0	0	6	16	76	976	976	1976	6976	152	153	IIAAAA	RECAAA	HHHHxx
+222	1474	0	2	2	2	22	222	222	222	222	44	45	OIAAAA	SECAAA	OOOOxx
+1624	1475	0	0	4	4	24	624	1624	1624	1624	48	49	MKAAAA	TECAAA	VVVVxx
+1250	1476	0	2	0	10	50	250	1250	1250	1250	100	101	CWAAAA	UECAAA	AAAAxx
+1621	1477	1	1	1	1	21	621	1621	1621	1621	42	43	JKAAAA	VECAAA	HHHHxx
+2350	1478	0	2	0	10	50	350	350	2350	2350	100	101	KMAAAA	WECAAA	OOOOxx
+5239	1479	1	3	9	19	39	239	1239	239	5239	78	79	NTAAAA	XECAAA	VVVVxx
+6681	1480	1	1	1	1	81	681	681	1681	6681	162	163	ZWAAAA	YECAAA	AAAAxx
+4983	1481	1	3	3	3	83	983	983	4983	4983	166	167	RJAAAA	ZECAAA	HHHHxx
+7149	1482	1	1	9	9	49	149	1149	2149	7149	98	99	ZOAAAA	AFCAAA	OOOOxx
+3502	1483	0	2	2	2	2	502	1502	3502	3502	4	5	SEAAAA	BFCAAA	VVVVxx
+3133	1484	1	1	3	13	33	133	1133	3133	3133	66	67	NQAAAA	CFCAAA	AAAAxx
+8342	1485	0	2	2	2	42	342	342	3342	8342	84	85	WIAAAA	DFCAAA	HHHHxx
+3041	1486	1	1	1	1	41	41	1041	3041	3041	82	83	ZMAAAA	EFCAAA	OOOOxx
+5383	1487	1	3	3	3	83	383	1383	383	5383	166	167	BZAAAA	FFCAAA	VVVVxx
+3916	1488	0	0	6	16	16	916	1916	3916	3916	32	33	QUAAAA	GFCAAA	AAAAxx
+1438	1489	0	2	8	18	38	438	1438	1438	1438	76	77	IDAAAA	HFCAAA	HHHHxx
+9408	1490	0	0	8	8	8	408	1408	4408	9408	16	17	WXAAAA	IFCAAA	OOOOxx
+5783	1491	1	3	3	3	83	783	1783	783	5783	166	167	LOAAAA	JFCAAA	VVVVxx
+683	1492	1	3	3	3	83	683	683	683	683	166	167	HAAAAA	KFCAAA	AAAAxx
+9381	1493	1	1	1	1	81	381	1381	4381	9381	162	163	VWAAAA	LFCAAA	HHHHxx
+5676	1494	0	0	6	16	76	676	1676	676	5676	152	153	IKAAAA	MFCAAA	OOOOxx
+3224	1495	0	0	4	4	24	224	1224	3224	3224	48	49	AUAAAA	NFCAAA	VVVVxx
+8332	1496	0	0	2	12	32	332	332	3332	8332	64	65	MIAAAA	OFCAAA	AAAAxx
+3372	1497	0	0	2	12	72	372	1372	3372	3372	144	145	SZAAAA	PFCAAA	HHHHxx
+7436	1498	0	0	6	16	36	436	1436	2436	7436	72	73	AAAAAA	QFCAAA	OOOOxx
+5010	1499	0	2	0	10	10	10	1010	10	5010	20	21	SKAAAA	RFCAAA	VVVVxx
+7256	1500	0	0	6	16	56	256	1256	2256	7256	112	113	CTAAAA	SFCAAA	AAAAxx
+961	1501	1	1	1	1	61	961	961	961	961	122	123	ZKAAAA	TFCAAA	HHHHxx
+4182	1502	0	2	2	2	82	182	182	4182	4182	164	165	WEAAAA	UFCAAA	OOOOxx
+639	1503	1	3	9	19	39	639	639	639	639	78	79	PYAAAA	VFCAAA	VVVVxx
+8836	1504	0	0	6	16	36	836	836	3836	8836	72	73	WBAAAA	WFCAAA	AAAAxx
+8705	1505	1	1	5	5	5	705	705	3705	8705	10	11	VWAAAA	XFCAAA	HHHHxx
+32	1506	0	0	2	12	32	32	32	32	32	64	65	GBAAAA	YFCAAA	OOOOxx
+7913	1507	1	1	3	13	13	913	1913	2913	7913	26	27	JSAAAA	ZFCAAA	VVVVxx
+229	1508	1	1	9	9	29	229	229	229	229	58	59	VIAAAA	AGCAAA	AAAAxx
+2393	1509	1	1	3	13	93	393	393	2393	2393	186	187	BOAAAA	BGCAAA	HHHHxx
+2815	1510	1	3	5	15	15	815	815	2815	2815	30	31	HEAAAA	CGCAAA	OOOOxx
+4858	1511	0	2	8	18	58	858	858	4858	4858	116	117	WEAAAA	DGCAAA	VVVVxx
+6283	1512	1	3	3	3	83	283	283	1283	6283	166	167	RHAAAA	EGCAAA	AAAAxx
+4147	1513	1	3	7	7	47	147	147	4147	4147	94	95	NDAAAA	FGCAAA	HHHHxx
+6801	1514	1	1	1	1	1	801	801	1801	6801	2	3	PBAAAA	GGCAAA	OOOOxx
+1011	1515	1	3	1	11	11	11	1011	1011	1011	22	23	XMAAAA	HGCAAA	VVVVxx
+2527	1516	1	3	7	7	27	527	527	2527	2527	54	55	FTAAAA	IGCAAA	AAAAxx
+381	1517	1	1	1	1	81	381	381	381	381	162	163	ROAAAA	JGCAAA	HHHHxx
+3366	1518	0	2	6	6	66	366	1366	3366	3366	132	133	MZAAAA	KGCAAA	OOOOxx
+9636	1519	0	0	6	16	36	636	1636	4636	9636	72	73	QGAAAA	LGCAAA	VVVVxx
+2239	1520	1	3	9	19	39	239	239	2239	2239	78	79	DIAAAA	MGCAAA	AAAAxx
+5911	1521	1	3	1	11	11	911	1911	911	5911	22	23	JTAAAA	NGCAAA	HHHHxx
+449	1522	1	1	9	9	49	449	449	449	449	98	99	HRAAAA	OGCAAA	OOOOxx
+5118	1523	0	2	8	18	18	118	1118	118	5118	36	37	WOAAAA	PGCAAA	VVVVxx
+7684	1524	0	0	4	4	84	684	1684	2684	7684	168	169	OJAAAA	QGCAAA	AAAAxx
+804	1525	0	0	4	4	4	804	804	804	804	8	9	YEAAAA	RGCAAA	HHHHxx
+8378	1526	0	2	8	18	78	378	378	3378	8378	156	157	GKAAAA	SGCAAA	OOOOxx
+9855	1527	1	3	5	15	55	855	1855	4855	9855	110	111	BPAAAA	TGCAAA	VVVVxx
+1995	1528	1	3	5	15	95	995	1995	1995	1995	190	191	TYAAAA	UGCAAA	AAAAxx
+1979	1529	1	3	9	19	79	979	1979	1979	1979	158	159	DYAAAA	VGCAAA	HHHHxx
+4510	1530	0	2	0	10	10	510	510	4510	4510	20	21	MRAAAA	WGCAAA	OOOOxx
+3792	1531	0	0	2	12	92	792	1792	3792	3792	184	185	WPAAAA	XGCAAA	VVVVxx
+3541	1532	1	1	1	1	41	541	1541	3541	3541	82	83	FGAAAA	YGCAAA	AAAAxx
+8847	1533	1	3	7	7	47	847	847	3847	8847	94	95	HCAAAA	ZGCAAA	HHHHxx
+1336	1534	0	0	6	16	36	336	1336	1336	1336	72	73	KZAAAA	AHCAAA	OOOOxx
+6780	1535	0	0	0	0	80	780	780	1780	6780	160	161	UAAAAA	BHCAAA	VVVVxx
+8711	1536	1	3	1	11	11	711	711	3711	8711	22	23	BXAAAA	CHCAAA	AAAAxx
+7839	1537	1	3	9	19	39	839	1839	2839	7839	78	79	NPAAAA	DHCAAA	HHHHxx
+677	1538	1	1	7	17	77	677	677	677	677	154	155	BAAAAA	EHCAAA	OOOOxx
+1574	1539	0	2	4	14	74	574	1574	1574	1574	148	149	OIAAAA	FHCAAA	VVVVxx
+2905	1540	1	1	5	5	5	905	905	2905	2905	10	11	THAAAA	GHCAAA	AAAAxx
+1879	1541	1	3	9	19	79	879	1879	1879	1879	158	159	HUAAAA	HHCAAA	HHHHxx
+7820	1542	0	0	0	0	20	820	1820	2820	7820	40	41	UOAAAA	IHCAAA	OOOOxx
+4308	1543	0	0	8	8	8	308	308	4308	4308	16	17	SJAAAA	JHCAAA	VVVVxx
+4474	1544	0	2	4	14	74	474	474	4474	4474	148	149	CQAAAA	KHCAAA	AAAAxx
+6985	1545	1	1	5	5	85	985	985	1985	6985	170	171	RIAAAA	LHCAAA	HHHHxx
+6929	1546	1	1	9	9	29	929	929	1929	6929	58	59	NGAAAA	MHCAAA	OOOOxx
+777	1547	1	1	7	17	77	777	777	777	777	154	155	XDAAAA	NHCAAA	VVVVxx
+8271	1548	1	3	1	11	71	271	271	3271	8271	142	143	DGAAAA	OHCAAA	AAAAxx
+2389	1549	1	1	9	9	89	389	389	2389	2389	178	179	XNAAAA	PHCAAA	HHHHxx
+946	1550	0	2	6	6	46	946	946	946	946	92	93	KKAAAA	QHCAAA	OOOOxx
+9682	1551	0	2	2	2	82	682	1682	4682	9682	164	165	KIAAAA	RHCAAA	VVVVxx
+8722	1552	0	2	2	2	22	722	722	3722	8722	44	45	MXAAAA	SHCAAA	AAAAxx
+470	1553	0	2	0	10	70	470	470	470	470	140	141	CSAAAA	THCAAA	HHHHxx
+7425	1554	1	1	5	5	25	425	1425	2425	7425	50	51	PZAAAA	UHCAAA	OOOOxx
+2372	1555	0	0	2	12	72	372	372	2372	2372	144	145	GNAAAA	VHCAAA	VVVVxx
+508	1556	0	0	8	8	8	508	508	508	508	16	17	OTAAAA	WHCAAA	AAAAxx
+163	1557	1	3	3	3	63	163	163	163	163	126	127	HGAAAA	XHCAAA	HHHHxx
+6579	1558	1	3	9	19	79	579	579	1579	6579	158	159	BTAAAA	YHCAAA	OOOOxx
+2355	1559	1	3	5	15	55	355	355	2355	2355	110	111	PMAAAA	ZHCAAA	VVVVxx
+70	1560	0	2	0	10	70	70	70	70	70	140	141	SCAAAA	AICAAA	AAAAxx
+651	1561	1	3	1	11	51	651	651	651	651	102	103	BZAAAA	BICAAA	HHHHxx
+4436	1562	0	0	6	16	36	436	436	4436	4436	72	73	QOAAAA	CICAAA	OOOOxx
+4240	1563	0	0	0	0	40	240	240	4240	4240	80	81	CHAAAA	DICAAA	VVVVxx
+2722	1564	0	2	2	2	22	722	722	2722	2722	44	45	SAAAAA	EICAAA	AAAAxx
+8937	1565	1	1	7	17	37	937	937	3937	8937	74	75	TFAAAA	FICAAA	HHHHxx
+8364	1566	0	0	4	4	64	364	364	3364	8364	128	129	SJAAAA	GICAAA	OOOOxx
+8317	1567	1	1	7	17	17	317	317	3317	8317	34	35	XHAAAA	HICAAA	VVVVxx
+8872	1568	0	0	2	12	72	872	872	3872	8872	144	145	GDAAAA	IICAAA	AAAAxx
+5512	1569	0	0	2	12	12	512	1512	512	5512	24	25	AEAAAA	JICAAA	HHHHxx
+6651	1570	1	3	1	11	51	651	651	1651	6651	102	103	VVAAAA	KICAAA	OOOOxx
+5976	1571	0	0	6	16	76	976	1976	976	5976	152	153	WVAAAA	LICAAA	VVVVxx
+3301	1572	1	1	1	1	1	301	1301	3301	3301	2	3	ZWAAAA	MICAAA	AAAAxx
+6784	1573	0	0	4	4	84	784	784	1784	6784	168	169	YAAAAA	NICAAA	HHHHxx
+573	1574	1	1	3	13	73	573	573	573	573	146	147	BWAAAA	OICAAA	OOOOxx
+3015	1575	1	3	5	15	15	15	1015	3015	3015	30	31	ZLAAAA	PICAAA	VVVVxx
+8245	1576	1	1	5	5	45	245	245	3245	8245	90	91	DFAAAA	QICAAA	AAAAxx
+5251	1577	1	3	1	11	51	251	1251	251	5251	102	103	ZTAAAA	RICAAA	HHHHxx
+2281	1578	1	1	1	1	81	281	281	2281	2281	162	163	TJAAAA	SICAAA	OOOOxx
+518	1579	0	2	8	18	18	518	518	518	518	36	37	YTAAAA	TICAAA	VVVVxx
+9839	1580	1	3	9	19	39	839	1839	4839	9839	78	79	LOAAAA	UICAAA	AAAAxx
+4526	1581	0	2	6	6	26	526	526	4526	4526	52	53	CSAAAA	VICAAA	HHHHxx
+1261	1582	1	1	1	1	61	261	1261	1261	1261	122	123	NWAAAA	WICAAA	OOOOxx
+4259	1583	1	3	9	19	59	259	259	4259	4259	118	119	VHAAAA	XICAAA	VVVVxx
+9098	1584	0	2	8	18	98	98	1098	4098	9098	196	197	YLAAAA	YICAAA	AAAAxx
+6037	1585	1	1	7	17	37	37	37	1037	6037	74	75	FYAAAA	ZICAAA	HHHHxx
+4284	1586	0	0	4	4	84	284	284	4284	4284	168	169	UIAAAA	AJCAAA	OOOOxx
+3267	1587	1	3	7	7	67	267	1267	3267	3267	134	135	RVAAAA	BJCAAA	VVVVxx
+5908	1588	0	0	8	8	8	908	1908	908	5908	16	17	GTAAAA	CJCAAA	AAAAxx
+1549	1589	1	1	9	9	49	549	1549	1549	1549	98	99	PHAAAA	DJCAAA	HHHHxx
+8736	1590	0	0	6	16	36	736	736	3736	8736	72	73	AYAAAA	EJCAAA	OOOOxx
+2008	1591	0	0	8	8	8	8	8	2008	2008	16	17	GZAAAA	FJCAAA	VVVVxx
+548	1592	0	0	8	8	48	548	548	548	548	96	97	CVAAAA	GJCAAA	AAAAxx
+8846	1593	0	2	6	6	46	846	846	3846	8846	92	93	GCAAAA	HJCAAA	HHHHxx
+8374	1594	0	2	4	14	74	374	374	3374	8374	148	149	CKAAAA	IJCAAA	OOOOxx
+7986	1595	0	2	6	6	86	986	1986	2986	7986	172	173	EVAAAA	JJCAAA	VVVVxx
+6819	1596	1	3	9	19	19	819	819	1819	6819	38	39	HCAAAA	KJCAAA	AAAAxx
+4418	1597	0	2	8	18	18	418	418	4418	4418	36	37	YNAAAA	LJCAAA	HHHHxx
+833	1598	1	1	3	13	33	833	833	833	833	66	67	BGAAAA	MJCAAA	OOOOxx
+4416	1599	0	0	6	16	16	416	416	4416	4416	32	33	WNAAAA	NJCAAA	VVVVxx
+4902	1600	0	2	2	2	2	902	902	4902	4902	4	5	OGAAAA	OJCAAA	AAAAxx
+6828	1601	0	0	8	8	28	828	828	1828	6828	56	57	QCAAAA	PJCAAA	HHHHxx
+1118	1602	0	2	8	18	18	118	1118	1118	1118	36	37	ARAAAA	QJCAAA	OOOOxx
+9993	1603	1	1	3	13	93	993	1993	4993	9993	186	187	JUAAAA	RJCAAA	VVVVxx
+1430	1604	0	2	0	10	30	430	1430	1430	1430	60	61	ADAAAA	SJCAAA	AAAAxx
+5670	1605	0	2	0	10	70	670	1670	670	5670	140	141	CKAAAA	TJCAAA	HHHHxx
+5424	1606	0	0	4	4	24	424	1424	424	5424	48	49	QAAAAA	UJCAAA	OOOOxx
+5561	1607	1	1	1	1	61	561	1561	561	5561	122	123	XFAAAA	VJCAAA	VVVVxx
+2027	1608	1	3	7	7	27	27	27	2027	2027	54	55	ZZAAAA	WJCAAA	AAAAxx
+6924	1609	0	0	4	4	24	924	924	1924	6924	48	49	IGAAAA	XJCAAA	HHHHxx
+5946	1610	0	2	6	6	46	946	1946	946	5946	92	93	SUAAAA	YJCAAA	OOOOxx
+4294	1611	0	2	4	14	94	294	294	4294	4294	188	189	EJAAAA	ZJCAAA	VVVVxx
+2936	1612	0	0	6	16	36	936	936	2936	2936	72	73	YIAAAA	AKCAAA	AAAAxx
+3855	1613	1	3	5	15	55	855	1855	3855	3855	110	111	HSAAAA	BKCAAA	HHHHxx
+455	1614	1	3	5	15	55	455	455	455	455	110	111	NRAAAA	CKCAAA	OOOOxx
+2918	1615	0	2	8	18	18	918	918	2918	2918	36	37	GIAAAA	DKCAAA	VVVVxx
+448	1616	0	0	8	8	48	448	448	448	448	96	97	GRAAAA	EKCAAA	AAAAxx
+2149	1617	1	1	9	9	49	149	149	2149	2149	98	99	REAAAA	FKCAAA	HHHHxx
+8890	1618	0	2	0	10	90	890	890	3890	8890	180	181	YDAAAA	GKCAAA	OOOOxx
+8919	1619	1	3	9	19	19	919	919	3919	8919	38	39	BFAAAA	HKCAAA	VVVVxx
+4957	1620	1	1	7	17	57	957	957	4957	4957	114	115	RIAAAA	IKCAAA	AAAAxx
+4	1621	0	0	4	4	4	4	4	4	4	8	9	EAAAAA	JKCAAA	HHHHxx
+4837	1622	1	1	7	17	37	837	837	4837	4837	74	75	BEAAAA	KKCAAA	OOOOxx
+3976	1623	0	0	6	16	76	976	1976	3976	3976	152	153	YWAAAA	LKCAAA	VVVVxx
+9459	1624	1	3	9	19	59	459	1459	4459	9459	118	119	VZAAAA	MKCAAA	AAAAxx
+7097	1625	1	1	7	17	97	97	1097	2097	7097	194	195	ZMAAAA	NKCAAA	HHHHxx
+9226	1626	0	2	6	6	26	226	1226	4226	9226	52	53	WQAAAA	OKCAAA	OOOOxx
+5803	1627	1	3	3	3	3	803	1803	803	5803	6	7	FPAAAA	PKCAAA	VVVVxx
+21	1628	1	1	1	1	21	21	21	21	21	42	43	VAAAAA	QKCAAA	AAAAxx
+5275	1629	1	3	5	15	75	275	1275	275	5275	150	151	XUAAAA	RKCAAA	HHHHxx
+3488	1630	0	0	8	8	88	488	1488	3488	3488	176	177	EEAAAA	SKCAAA	OOOOxx
+1595	1631	1	3	5	15	95	595	1595	1595	1595	190	191	JJAAAA	TKCAAA	VVVVxx
+5212	1632	0	0	2	12	12	212	1212	212	5212	24	25	MSAAAA	UKCAAA	AAAAxx
+6574	1633	0	2	4	14	74	574	574	1574	6574	148	149	WSAAAA	VKCAAA	HHHHxx
+7524	1634	0	0	4	4	24	524	1524	2524	7524	48	49	KDAAAA	WKCAAA	OOOOxx
+6100	1635	0	0	0	0	0	100	100	1100	6100	0	1	QAAAAA	XKCAAA	VVVVxx
+1198	1636	0	2	8	18	98	198	1198	1198	1198	196	197	CUAAAA	YKCAAA	AAAAxx
+7345	1637	1	1	5	5	45	345	1345	2345	7345	90	91	NWAAAA	ZKCAAA	HHHHxx
+5020	1638	0	0	0	0	20	20	1020	20	5020	40	41	CLAAAA	ALCAAA	OOOOxx
+6925	1639	1	1	5	5	25	925	925	1925	6925	50	51	JGAAAA	BLCAAA	VVVVxx
+8915	1640	1	3	5	15	15	915	915	3915	8915	30	31	XEAAAA	CLCAAA	AAAAxx
+3088	1641	0	0	8	8	88	88	1088	3088	3088	176	177	UOAAAA	DLCAAA	HHHHxx
+4828	1642	0	0	8	8	28	828	828	4828	4828	56	57	SDAAAA	ELCAAA	OOOOxx
+7276	1643	0	0	6	16	76	276	1276	2276	7276	152	153	WTAAAA	FLCAAA	VVVVxx
+299	1644	1	3	9	19	99	299	299	299	299	198	199	NLAAAA	GLCAAA	AAAAxx
+76	1645	0	0	6	16	76	76	76	76	76	152	153	YCAAAA	HLCAAA	HHHHxx
+8458	1646	0	2	8	18	58	458	458	3458	8458	116	117	INAAAA	ILCAAA	OOOOxx
+7207	1647	1	3	7	7	7	207	1207	2207	7207	14	15	FRAAAA	JLCAAA	VVVVxx
+5585	1648	1	1	5	5	85	585	1585	585	5585	170	171	VGAAAA	KLCAAA	AAAAxx
+3234	1649	0	2	4	14	34	234	1234	3234	3234	68	69	KUAAAA	LLCAAA	HHHHxx
+8001	1650	1	1	1	1	1	1	1	3001	8001	2	3	TVAAAA	MLCAAA	OOOOxx
+1319	1651	1	3	9	19	19	319	1319	1319	1319	38	39	TYAAAA	NLCAAA	VVVVxx
+6342	1652	0	2	2	2	42	342	342	1342	6342	84	85	YJAAAA	OLCAAA	AAAAxx
+9199	1653	1	3	9	19	99	199	1199	4199	9199	198	199	VPAAAA	PLCAAA	HHHHxx
+5696	1654	0	0	6	16	96	696	1696	696	5696	192	193	CLAAAA	QLCAAA	OOOOxx
+2562	1655	0	2	2	2	62	562	562	2562	2562	124	125	OUAAAA	RLCAAA	VVVVxx
+4226	1656	0	2	6	6	26	226	226	4226	4226	52	53	OGAAAA	SLCAAA	AAAAxx
+1184	1657	0	0	4	4	84	184	1184	1184	1184	168	169	OTAAAA	TLCAAA	HHHHxx
+5807	1658	1	3	7	7	7	807	1807	807	5807	14	15	JPAAAA	ULCAAA	OOOOxx
+1890	1659	0	2	0	10	90	890	1890	1890	1890	180	181	SUAAAA	VLCAAA	VVVVxx
+451	1660	1	3	1	11	51	451	451	451	451	102	103	JRAAAA	WLCAAA	AAAAxx
+1049	1661	1	1	9	9	49	49	1049	1049	1049	98	99	JOAAAA	XLCAAA	HHHHxx
+5272	1662	0	0	2	12	72	272	1272	272	5272	144	145	UUAAAA	YLCAAA	OOOOxx
+4588	1663	0	0	8	8	88	588	588	4588	4588	176	177	MUAAAA	ZLCAAA	VVVVxx
+5213	1664	1	1	3	13	13	213	1213	213	5213	26	27	NSAAAA	AMCAAA	AAAAxx
+9543	1665	1	3	3	3	43	543	1543	4543	9543	86	87	BDAAAA	BMCAAA	HHHHxx
+6318	1666	0	2	8	18	18	318	318	1318	6318	36	37	AJAAAA	CMCAAA	OOOOxx
+7992	1667	0	0	2	12	92	992	1992	2992	7992	184	185	KVAAAA	DMCAAA	VVVVxx
+4619	1668	1	3	9	19	19	619	619	4619	4619	38	39	RVAAAA	EMCAAA	AAAAxx
+7189	1669	1	1	9	9	89	189	1189	2189	7189	178	179	NQAAAA	FMCAAA	HHHHxx
+2178	1670	0	2	8	18	78	178	178	2178	2178	156	157	UFAAAA	GMCAAA	OOOOxx
+4928	1671	0	0	8	8	28	928	928	4928	4928	56	57	OHAAAA	HMCAAA	VVVVxx
+3966	1672	0	2	6	6	66	966	1966	3966	3966	132	133	OWAAAA	IMCAAA	AAAAxx
+9790	1673	0	2	0	10	90	790	1790	4790	9790	180	181	OMAAAA	JMCAAA	HHHHxx
+9150	1674	0	2	0	10	50	150	1150	4150	9150	100	101	YNAAAA	KMCAAA	OOOOxx
+313	1675	1	1	3	13	13	313	313	313	313	26	27	BMAAAA	LMCAAA	VVVVxx
+1614	1676	0	2	4	14	14	614	1614	1614	1614	28	29	CKAAAA	MMCAAA	AAAAxx
+1581	1677	1	1	1	1	81	581	1581	1581	1581	162	163	VIAAAA	NMCAAA	HHHHxx
+3674	1678	0	2	4	14	74	674	1674	3674	3674	148	149	ILAAAA	OMCAAA	OOOOxx
+3444	1679	0	0	4	4	44	444	1444	3444	3444	88	89	MCAAAA	PMCAAA	VVVVxx
+1050	1680	0	2	0	10	50	50	1050	1050	1050	100	101	KOAAAA	QMCAAA	AAAAxx
+8241	1681	1	1	1	1	41	241	241	3241	8241	82	83	ZEAAAA	RMCAAA	HHHHxx
+3382	1682	0	2	2	2	82	382	1382	3382	3382	164	165	CAAAAA	SMCAAA	OOOOxx
+7105	1683	1	1	5	5	5	105	1105	2105	7105	10	11	HNAAAA	TMCAAA	VVVVxx
+2957	1684	1	1	7	17	57	957	957	2957	2957	114	115	TJAAAA	UMCAAA	AAAAxx
+6162	1685	0	2	2	2	62	162	162	1162	6162	124	125	ADAAAA	VMCAAA	HHHHxx
+5150	1686	0	2	0	10	50	150	1150	150	5150	100	101	CQAAAA	WMCAAA	OOOOxx
+2622	1687	0	2	2	2	22	622	622	2622	2622	44	45	WWAAAA	XMCAAA	VVVVxx
+2240	1688	0	0	0	0	40	240	240	2240	2240	80	81	EIAAAA	YMCAAA	AAAAxx
+8880	1689	0	0	0	0	80	880	880	3880	8880	160	161	ODAAAA	ZMCAAA	HHHHxx
+9250	1690	0	2	0	10	50	250	1250	4250	9250	100	101	URAAAA	ANCAAA	OOOOxx
+7010	1691	0	2	0	10	10	10	1010	2010	7010	20	21	QJAAAA	BNCAAA	VVVVxx
+1098	1692	0	2	8	18	98	98	1098	1098	1098	196	197	GQAAAA	CNCAAA	AAAAxx
+648	1693	0	0	8	8	48	648	648	648	648	96	97	YYAAAA	DNCAAA	HHHHxx
+5536	1694	0	0	6	16	36	536	1536	536	5536	72	73	YEAAAA	ENCAAA	OOOOxx
+7858	1695	0	2	8	18	58	858	1858	2858	7858	116	117	GQAAAA	FNCAAA	VVVVxx
+7053	1696	1	1	3	13	53	53	1053	2053	7053	106	107	HLAAAA	GNCAAA	AAAAxx
+8681	1697	1	1	1	1	81	681	681	3681	8681	162	163	XVAAAA	HNCAAA	HHHHxx
+8832	1698	0	0	2	12	32	832	832	3832	8832	64	65	SBAAAA	INCAAA	OOOOxx
+6836	1699	0	0	6	16	36	836	836	1836	6836	72	73	YCAAAA	JNCAAA	VVVVxx
+4856	1700	0	0	6	16	56	856	856	4856	4856	112	113	UEAAAA	KNCAAA	AAAAxx
+345	1701	1	1	5	5	45	345	345	345	345	90	91	HNAAAA	LNCAAA	HHHHxx
+6559	1702	1	3	9	19	59	559	559	1559	6559	118	119	HSAAAA	MNCAAA	OOOOxx
+3017	1703	1	1	7	17	17	17	1017	3017	3017	34	35	BMAAAA	NNCAAA	VVVVxx
+4176	1704	0	0	6	16	76	176	176	4176	4176	152	153	QEAAAA	ONCAAA	AAAAxx
+2839	1705	1	3	9	19	39	839	839	2839	2839	78	79	FFAAAA	PNCAAA	HHHHxx
+6065	1706	1	1	5	5	65	65	65	1065	6065	130	131	HZAAAA	QNCAAA	OOOOxx
+7360	1707	0	0	0	0	60	360	1360	2360	7360	120	121	CXAAAA	RNCAAA	VVVVxx
+9527	1708	1	3	7	7	27	527	1527	4527	9527	54	55	LCAAAA	SNCAAA	AAAAxx
+8849	1709	1	1	9	9	49	849	849	3849	8849	98	99	JCAAAA	TNCAAA	HHHHxx
+7274	1710	0	2	4	14	74	274	1274	2274	7274	148	149	UTAAAA	UNCAAA	OOOOxx
+4368	1711	0	0	8	8	68	368	368	4368	4368	136	137	AMAAAA	VNCAAA	VVVVxx
+2488	1712	0	0	8	8	88	488	488	2488	2488	176	177	SRAAAA	WNCAAA	AAAAxx
+4674	1713	0	2	4	14	74	674	674	4674	4674	148	149	UXAAAA	XNCAAA	HHHHxx
+365	1714	1	1	5	5	65	365	365	365	365	130	131	BOAAAA	YNCAAA	OOOOxx
+5897	1715	1	1	7	17	97	897	1897	897	5897	194	195	VSAAAA	ZNCAAA	VVVVxx
+8918	1716	0	2	8	18	18	918	918	3918	8918	36	37	AFAAAA	AOCAAA	AAAAxx
+1988	1717	0	0	8	8	88	988	1988	1988	1988	176	177	MYAAAA	BOCAAA	HHHHxx
+1210	1718	0	2	0	10	10	210	1210	1210	1210	20	21	OUAAAA	COCAAA	OOOOxx
+2945	1719	1	1	5	5	45	945	945	2945	2945	90	91	HJAAAA	DOCAAA	VVVVxx
+555	1720	1	3	5	15	55	555	555	555	555	110	111	JVAAAA	EOCAAA	AAAAxx
+9615	1721	1	3	5	15	15	615	1615	4615	9615	30	31	VFAAAA	FOCAAA	HHHHxx
+9939	1722	1	3	9	19	39	939	1939	4939	9939	78	79	HSAAAA	GOCAAA	OOOOxx
+1216	1723	0	0	6	16	16	216	1216	1216	1216	32	33	UUAAAA	HOCAAA	VVVVxx
+745	1724	1	1	5	5	45	745	745	745	745	90	91	RCAAAA	IOCAAA	AAAAxx
+3326	1725	0	2	6	6	26	326	1326	3326	3326	52	53	YXAAAA	JOCAAA	HHHHxx
+953	1726	1	1	3	13	53	953	953	953	953	106	107	RKAAAA	KOCAAA	OOOOxx
+444	1727	0	0	4	4	44	444	444	444	444	88	89	CRAAAA	LOCAAA	VVVVxx
+280	1728	0	0	0	0	80	280	280	280	280	160	161	UKAAAA	MOCAAA	AAAAxx
+3707	1729	1	3	7	7	7	707	1707	3707	3707	14	15	PMAAAA	NOCAAA	HHHHxx
+1351	1730	1	3	1	11	51	351	1351	1351	1351	102	103	ZZAAAA	OOCAAA	OOOOxx
+1280	1731	0	0	0	0	80	280	1280	1280	1280	160	161	GXAAAA	POCAAA	VVVVxx
+628	1732	0	0	8	8	28	628	628	628	628	56	57	EYAAAA	QOCAAA	AAAAxx
+6198	1733	0	2	8	18	98	198	198	1198	6198	196	197	KEAAAA	ROCAAA	HHHHxx
+1957	1734	1	1	7	17	57	957	1957	1957	1957	114	115	HXAAAA	SOCAAA	OOOOxx
+9241	1735	1	1	1	1	41	241	1241	4241	9241	82	83	LRAAAA	TOCAAA	VVVVxx
+303	1736	1	3	3	3	3	303	303	303	303	6	7	RLAAAA	UOCAAA	AAAAxx
+1945	1737	1	1	5	5	45	945	1945	1945	1945	90	91	VWAAAA	VOCAAA	HHHHxx
+3634	1738	0	2	4	14	34	634	1634	3634	3634	68	69	UJAAAA	WOCAAA	OOOOxx
+4768	1739	0	0	8	8	68	768	768	4768	4768	136	137	KBAAAA	XOCAAA	VVVVxx
+9262	1740	0	2	2	2	62	262	1262	4262	9262	124	125	GSAAAA	YOCAAA	AAAAxx
+2610	1741	0	2	0	10	10	610	610	2610	2610	20	21	KWAAAA	ZOCAAA	HHHHxx
+6640	1742	0	0	0	0	40	640	640	1640	6640	80	81	KVAAAA	APCAAA	OOOOxx
+3338	1743	0	2	8	18	38	338	1338	3338	3338	76	77	KYAAAA	BPCAAA	VVVVxx
+6560	1744	0	0	0	0	60	560	560	1560	6560	120	121	ISAAAA	CPCAAA	AAAAxx
+5986	1745	0	2	6	6	86	986	1986	986	5986	172	173	GWAAAA	DPCAAA	HHHHxx
+2970	1746	0	2	0	10	70	970	970	2970	2970	140	141	GKAAAA	EPCAAA	OOOOxx
+4731	1747	1	3	1	11	31	731	731	4731	4731	62	63	ZZAAAA	FPCAAA	VVVVxx
+9486	1748	0	2	6	6	86	486	1486	4486	9486	172	173	WAAAAA	GPCAAA	AAAAxx
+7204	1749	0	0	4	4	4	204	1204	2204	7204	8	9	CRAAAA	HPCAAA	HHHHxx
+6685	1750	1	1	5	5	85	685	685	1685	6685	170	171	DXAAAA	IPCAAA	OOOOxx
+6852	1751	0	0	2	12	52	852	852	1852	6852	104	105	ODAAAA	JPCAAA	VVVVxx
+2325	1752	1	1	5	5	25	325	325	2325	2325	50	51	LLAAAA	KPCAAA	AAAAxx
+1063	1753	1	3	3	3	63	63	1063	1063	1063	126	127	XOAAAA	LPCAAA	HHHHxx
+6810	1754	0	2	0	10	10	810	810	1810	6810	20	21	YBAAAA	MPCAAA	OOOOxx
+7718	1755	0	2	8	18	18	718	1718	2718	7718	36	37	WKAAAA	NPCAAA	VVVVxx
+1680	1756	0	0	0	0	80	680	1680	1680	1680	160	161	QMAAAA	OPCAAA	AAAAxx
+7402	1757	0	2	2	2	2	402	1402	2402	7402	4	5	SYAAAA	PPCAAA	HHHHxx
+4134	1758	0	2	4	14	34	134	134	4134	4134	68	69	ADAAAA	QPCAAA	OOOOxx
+8232	1759	0	0	2	12	32	232	232	3232	8232	64	65	QEAAAA	RPCAAA	VVVVxx
+6682	1760	0	2	2	2	82	682	682	1682	6682	164	165	AXAAAA	SPCAAA	AAAAxx
+7952	1761	0	0	2	12	52	952	1952	2952	7952	104	105	WTAAAA	TPCAAA	HHHHxx
+5943	1762	1	3	3	3	43	943	1943	943	5943	86	87	PUAAAA	UPCAAA	OOOOxx
+5394	1763	0	2	4	14	94	394	1394	394	5394	188	189	MZAAAA	VPCAAA	VVVVxx
+6554	1764	0	2	4	14	54	554	554	1554	6554	108	109	CSAAAA	WPCAAA	AAAAxx
+8186	1765	0	2	6	6	86	186	186	3186	8186	172	173	WCAAAA	XPCAAA	HHHHxx
+199	1766	1	3	9	19	99	199	199	199	199	198	199	RHAAAA	YPCAAA	OOOOxx
+3386	1767	0	2	6	6	86	386	1386	3386	3386	172	173	GAAAAA	ZPCAAA	VVVVxx
+8974	1768	0	2	4	14	74	974	974	3974	8974	148	149	EHAAAA	AQCAAA	AAAAxx
+8140	1769	0	0	0	0	40	140	140	3140	8140	80	81	CBAAAA	BQCAAA	HHHHxx
+3723	1770	1	3	3	3	23	723	1723	3723	3723	46	47	FNAAAA	CQCAAA	OOOOxx
+8827	1771	1	3	7	7	27	827	827	3827	8827	54	55	NBAAAA	DQCAAA	VVVVxx
+1998	1772	0	2	8	18	98	998	1998	1998	1998	196	197	WYAAAA	EQCAAA	AAAAxx
+879	1773	1	3	9	19	79	879	879	879	879	158	159	VHAAAA	FQCAAA	HHHHxx
+892	1774	0	0	2	12	92	892	892	892	892	184	185	IIAAAA	GQCAAA	OOOOxx
+9468	1775	0	0	8	8	68	468	1468	4468	9468	136	137	EAAAAA	HQCAAA	VVVVxx
+3797	1776	1	1	7	17	97	797	1797	3797	3797	194	195	BQAAAA	IQCAAA	AAAAxx
+8379	1777	1	3	9	19	79	379	379	3379	8379	158	159	HKAAAA	JQCAAA	HHHHxx
+2817	1778	1	1	7	17	17	817	817	2817	2817	34	35	JEAAAA	KQCAAA	OOOOxx
+789	1779	1	1	9	9	89	789	789	789	789	178	179	JEAAAA	LQCAAA	VVVVxx
+3871	1780	1	3	1	11	71	871	1871	3871	3871	142	143	XSAAAA	MQCAAA	AAAAxx
+7931	1781	1	3	1	11	31	931	1931	2931	7931	62	63	BTAAAA	NQCAAA	HHHHxx
+3636	1782	0	0	6	16	36	636	1636	3636	3636	72	73	WJAAAA	OQCAAA	OOOOxx
+699	1783	1	3	9	19	99	699	699	699	699	198	199	XAAAAA	PQCAAA	VVVVxx
+6850	1784	0	2	0	10	50	850	850	1850	6850	100	101	MDAAAA	QQCAAA	AAAAxx
+6394	1785	0	2	4	14	94	394	394	1394	6394	188	189	YLAAAA	RQCAAA	HHHHxx
+3475	1786	1	3	5	15	75	475	1475	3475	3475	150	151	RDAAAA	SQCAAA	OOOOxx
+3026	1787	0	2	6	6	26	26	1026	3026	3026	52	53	KMAAAA	TQCAAA	VVVVxx
+876	1788	0	0	6	16	76	876	876	876	876	152	153	SHAAAA	UQCAAA	AAAAxx
+1992	1789	0	0	2	12	92	992	1992	1992	1992	184	185	QYAAAA	VQCAAA	HHHHxx
+3079	1790	1	3	9	19	79	79	1079	3079	3079	158	159	LOAAAA	WQCAAA	OOOOxx
+8128	1791	0	0	8	8	28	128	128	3128	8128	56	57	QAAAAA	XQCAAA	VVVVxx
+8123	1792	1	3	3	3	23	123	123	3123	8123	46	47	LAAAAA	YQCAAA	AAAAxx
+3285	1793	1	1	5	5	85	285	1285	3285	3285	170	171	JWAAAA	ZQCAAA	HHHHxx
+9315	1794	1	3	5	15	15	315	1315	4315	9315	30	31	HUAAAA	ARCAAA	OOOOxx
+9862	1795	0	2	2	2	62	862	1862	4862	9862	124	125	IPAAAA	BRCAAA	VVVVxx
+2764	1796	0	0	4	4	64	764	764	2764	2764	128	129	ICAAAA	CRCAAA	AAAAxx
+3544	1797	0	0	4	4	44	544	1544	3544	3544	88	89	IGAAAA	DRCAAA	HHHHxx
+7747	1798	1	3	7	7	47	747	1747	2747	7747	94	95	ZLAAAA	ERCAAA	OOOOxx
+7725	1799	1	1	5	5	25	725	1725	2725	7725	50	51	DLAAAA	FRCAAA	VVVVxx
+2449	1800	1	1	9	9	49	449	449	2449	2449	98	99	FQAAAA	GRCAAA	AAAAxx
+8967	1801	1	3	7	7	67	967	967	3967	8967	134	135	XGAAAA	HRCAAA	HHHHxx
+7371	1802	1	3	1	11	71	371	1371	2371	7371	142	143	NXAAAA	IRCAAA	OOOOxx
+2158	1803	0	2	8	18	58	158	158	2158	2158	116	117	AFAAAA	JRCAAA	VVVVxx
+5590	1804	0	2	0	10	90	590	1590	590	5590	180	181	AHAAAA	KRCAAA	AAAAxx
+8072	1805	0	0	2	12	72	72	72	3072	8072	144	145	MYAAAA	LRCAAA	HHHHxx
+1971	1806	1	3	1	11	71	971	1971	1971	1971	142	143	VXAAAA	MRCAAA	OOOOxx
+772	1807	0	0	2	12	72	772	772	772	772	144	145	SDAAAA	NRCAAA	VVVVxx
+3433	1808	1	1	3	13	33	433	1433	3433	3433	66	67	BCAAAA	ORCAAA	AAAAxx
+8419	1809	1	3	9	19	19	419	419	3419	8419	38	39	VLAAAA	PRCAAA	HHHHxx
+1493	1810	1	1	3	13	93	493	1493	1493	1493	186	187	LFAAAA	QRCAAA	OOOOxx
+2584	1811	0	0	4	4	84	584	584	2584	2584	168	169	KVAAAA	RRCAAA	VVVVxx
+9502	1812	0	2	2	2	2	502	1502	4502	9502	4	5	MBAAAA	SRCAAA	AAAAxx
+4673	1813	1	1	3	13	73	673	673	4673	4673	146	147	TXAAAA	TRCAAA	HHHHxx
+7403	1814	1	3	3	3	3	403	1403	2403	7403	6	7	TYAAAA	URCAAA	OOOOxx
+7103	1815	1	3	3	3	3	103	1103	2103	7103	6	7	FNAAAA	VRCAAA	VVVVxx
+7026	1816	0	2	6	6	26	26	1026	2026	7026	52	53	GKAAAA	WRCAAA	AAAAxx
+8574	1817	0	2	4	14	74	574	574	3574	8574	148	149	URAAAA	XRCAAA	HHHHxx
+1366	1818	0	2	6	6	66	366	1366	1366	1366	132	133	OAAAAA	YRCAAA	OOOOxx
+5787	1819	1	3	7	7	87	787	1787	787	5787	174	175	POAAAA	ZRCAAA	VVVVxx
+2552	1820	0	0	2	12	52	552	552	2552	2552	104	105	EUAAAA	ASCAAA	AAAAxx
+4557	1821	1	1	7	17	57	557	557	4557	4557	114	115	HTAAAA	BSCAAA	HHHHxx
+3237	1822	1	1	7	17	37	237	1237	3237	3237	74	75	NUAAAA	CSCAAA	OOOOxx
+6901	1823	1	1	1	1	1	901	901	1901	6901	2	3	LFAAAA	DSCAAA	VVVVxx
+7708	1824	0	0	8	8	8	708	1708	2708	7708	16	17	MKAAAA	ESCAAA	AAAAxx
+2011	1825	1	3	1	11	11	11	11	2011	2011	22	23	JZAAAA	FSCAAA	HHHHxx
+9455	1826	1	3	5	15	55	455	1455	4455	9455	110	111	RZAAAA	GSCAAA	OOOOxx
+5228	1827	0	0	8	8	28	228	1228	228	5228	56	57	CTAAAA	HSCAAA	VVVVxx
+4043	1828	1	3	3	3	43	43	43	4043	4043	86	87	NZAAAA	ISCAAA	AAAAxx
+8242	1829	0	2	2	2	42	242	242	3242	8242	84	85	AFAAAA	JSCAAA	HHHHxx
+6351	1830	1	3	1	11	51	351	351	1351	6351	102	103	HKAAAA	KSCAAA	OOOOxx
+5899	1831	1	3	9	19	99	899	1899	899	5899	198	199	XSAAAA	LSCAAA	VVVVxx
+4849	1832	1	1	9	9	49	849	849	4849	4849	98	99	NEAAAA	MSCAAA	AAAAxx
+9583	1833	1	3	3	3	83	583	1583	4583	9583	166	167	PEAAAA	NSCAAA	HHHHxx
+4994	1834	0	2	4	14	94	994	994	4994	4994	188	189	CKAAAA	OSCAAA	OOOOxx
+9787	1835	1	3	7	7	87	787	1787	4787	9787	174	175	LMAAAA	PSCAAA	VVVVxx
+243	1836	1	3	3	3	43	243	243	243	243	86	87	JJAAAA	QSCAAA	AAAAxx
+3931	1837	1	3	1	11	31	931	1931	3931	3931	62	63	FVAAAA	RSCAAA	HHHHxx
+5945	1838	1	1	5	5	45	945	1945	945	5945	90	91	RUAAAA	SSCAAA	OOOOxx
+1325	1839	1	1	5	5	25	325	1325	1325	1325	50	51	ZYAAAA	TSCAAA	VVVVxx
+4142	1840	0	2	2	2	42	142	142	4142	4142	84	85	IDAAAA	USCAAA	AAAAxx
+1963	1841	1	3	3	3	63	963	1963	1963	1963	126	127	NXAAAA	VSCAAA	HHHHxx
+7041	1842	1	1	1	1	41	41	1041	2041	7041	82	83	VKAAAA	WSCAAA	OOOOxx
+3074	1843	0	2	4	14	74	74	1074	3074	3074	148	149	GOAAAA	XSCAAA	VVVVxx
+3290	1844	0	2	0	10	90	290	1290	3290	3290	180	181	OWAAAA	YSCAAA	AAAAxx
+4146	1845	0	2	6	6	46	146	146	4146	4146	92	93	MDAAAA	ZSCAAA	HHHHxx
+3832	1846	0	0	2	12	32	832	1832	3832	3832	64	65	KRAAAA	ATCAAA	OOOOxx
+2217	1847	1	1	7	17	17	217	217	2217	2217	34	35	HHAAAA	BTCAAA	VVVVxx
+635	1848	1	3	5	15	35	635	635	635	635	70	71	LYAAAA	CTCAAA	AAAAxx
+6967	1849	1	3	7	7	67	967	967	1967	6967	134	135	ZHAAAA	DTCAAA	HHHHxx
+3522	1850	0	2	2	2	22	522	1522	3522	3522	44	45	MFAAAA	ETCAAA	OOOOxx
+2471	1851	1	3	1	11	71	471	471	2471	2471	142	143	BRAAAA	FTCAAA	VVVVxx
+4236	1852	0	0	6	16	36	236	236	4236	4236	72	73	YGAAAA	GTCAAA	AAAAxx
+853	1853	1	1	3	13	53	853	853	853	853	106	107	VGAAAA	HTCAAA	HHHHxx
+3754	1854	0	2	4	14	54	754	1754	3754	3754	108	109	KOAAAA	ITCAAA	OOOOxx
+796	1855	0	0	6	16	96	796	796	796	796	192	193	QEAAAA	JTCAAA	VVVVxx
+4640	1856	0	0	0	0	40	640	640	4640	4640	80	81	MWAAAA	KTCAAA	AAAAxx
+9496	1857	0	0	6	16	96	496	1496	4496	9496	192	193	GBAAAA	LTCAAA	HHHHxx
+6873	1858	1	1	3	13	73	873	873	1873	6873	146	147	JEAAAA	MTCAAA	OOOOxx
+4632	1859	0	0	2	12	32	632	632	4632	4632	64	65	EWAAAA	NTCAAA	VVVVxx
+5758	1860	0	2	8	18	58	758	1758	758	5758	116	117	MNAAAA	OTCAAA	AAAAxx
+6514	1861	0	2	4	14	14	514	514	1514	6514	28	29	OQAAAA	PTCAAA	HHHHxx
+9510	1862	0	2	0	10	10	510	1510	4510	9510	20	21	UBAAAA	QTCAAA	OOOOxx
+8411	1863	1	3	1	11	11	411	411	3411	8411	22	23	NLAAAA	RTCAAA	VVVVxx
+7762	1864	0	2	2	2	62	762	1762	2762	7762	124	125	OMAAAA	STCAAA	AAAAxx
+2225	1865	1	1	5	5	25	225	225	2225	2225	50	51	PHAAAA	TTCAAA	HHHHxx
+4373	1866	1	1	3	13	73	373	373	4373	4373	146	147	FMAAAA	UTCAAA	OOOOxx
+7326	1867	0	2	6	6	26	326	1326	2326	7326	52	53	UVAAAA	VTCAAA	VVVVxx
+8651	1868	1	3	1	11	51	651	651	3651	8651	102	103	TUAAAA	WTCAAA	AAAAxx
+9825	1869	1	1	5	5	25	825	1825	4825	9825	50	51	XNAAAA	XTCAAA	HHHHxx
+2988	1870	0	0	8	8	88	988	988	2988	2988	176	177	YKAAAA	YTCAAA	OOOOxx
+8138	1871	0	2	8	18	38	138	138	3138	8138	76	77	ABAAAA	ZTCAAA	VVVVxx
+7792	1872	0	0	2	12	92	792	1792	2792	7792	184	185	SNAAAA	AUCAAA	AAAAxx
+1232	1873	0	0	2	12	32	232	1232	1232	1232	64	65	KVAAAA	BUCAAA	HHHHxx
+8221	1874	1	1	1	1	21	221	221	3221	8221	42	43	FEAAAA	CUCAAA	OOOOxx
+4044	1875	0	0	4	4	44	44	44	4044	4044	88	89	OZAAAA	DUCAAA	VVVVxx
+1204	1876	0	0	4	4	4	204	1204	1204	1204	8	9	IUAAAA	EUCAAA	AAAAxx
+5145	1877	1	1	5	5	45	145	1145	145	5145	90	91	XPAAAA	FUCAAA	HHHHxx
+7791	1878	1	3	1	11	91	791	1791	2791	7791	182	183	RNAAAA	GUCAAA	OOOOxx
+8270	1879	0	2	0	10	70	270	270	3270	8270	140	141	CGAAAA	HUCAAA	VVVVxx
+9427	1880	1	3	7	7	27	427	1427	4427	9427	54	55	PYAAAA	IUCAAA	AAAAxx
+2152	1881	0	0	2	12	52	152	152	2152	2152	104	105	UEAAAA	JUCAAA	HHHHxx
+7790	1882	0	2	0	10	90	790	1790	2790	7790	180	181	QNAAAA	KUCAAA	OOOOxx
+5301	1883	1	1	1	1	1	301	1301	301	5301	2	3	XVAAAA	LUCAAA	VVVVxx
+626	1884	0	2	6	6	26	626	626	626	626	52	53	CYAAAA	MUCAAA	AAAAxx
+260	1885	0	0	0	0	60	260	260	260	260	120	121	AKAAAA	NUCAAA	HHHHxx
+4369	1886	1	1	9	9	69	369	369	4369	4369	138	139	BMAAAA	OUCAAA	OOOOxx
+5457	1887	1	1	7	17	57	457	1457	457	5457	114	115	XBAAAA	PUCAAA	VVVVxx
+3468	1888	0	0	8	8	68	468	1468	3468	3468	136	137	KDAAAA	QUCAAA	AAAAxx
+2257	1889	1	1	7	17	57	257	257	2257	2257	114	115	VIAAAA	RUCAAA	HHHHxx
+9318	1890	0	2	8	18	18	318	1318	4318	9318	36	37	KUAAAA	SUCAAA	OOOOxx
+8762	1891	0	2	2	2	62	762	762	3762	8762	124	125	AZAAAA	TUCAAA	VVVVxx
+9153	1892	1	1	3	13	53	153	1153	4153	9153	106	107	BOAAAA	UUCAAA	AAAAxx
+9220	1893	0	0	0	0	20	220	1220	4220	9220	40	41	QQAAAA	VUCAAA	HHHHxx
+8003	1894	1	3	3	3	3	3	3	3003	8003	6	7	VVAAAA	WUCAAA	OOOOxx
+7257	1895	1	1	7	17	57	257	1257	2257	7257	114	115	DTAAAA	XUCAAA	VVVVxx
+3930	1896	0	2	0	10	30	930	1930	3930	3930	60	61	EVAAAA	YUCAAA	AAAAxx
+2976	1897	0	0	6	16	76	976	976	2976	2976	152	153	MKAAAA	ZUCAAA	HHHHxx
+2531	1898	1	3	1	11	31	531	531	2531	2531	62	63	JTAAAA	AVCAAA	OOOOxx
+2250	1899	0	2	0	10	50	250	250	2250	2250	100	101	OIAAAA	BVCAAA	VVVVxx
+8549	1900	1	1	9	9	49	549	549	3549	8549	98	99	VQAAAA	CVCAAA	AAAAxx
+7197	1901	1	1	7	17	97	197	1197	2197	7197	194	195	VQAAAA	DVCAAA	HHHHxx
+5916	1902	0	0	6	16	16	916	1916	916	5916	32	33	OTAAAA	EVCAAA	OOOOxx
+5287	1903	1	3	7	7	87	287	1287	287	5287	174	175	JVAAAA	FVCAAA	VVVVxx
+9095	1904	1	3	5	15	95	95	1095	4095	9095	190	191	VLAAAA	GVCAAA	AAAAxx
+7137	1905	1	1	7	17	37	137	1137	2137	7137	74	75	NOAAAA	HVCAAA	HHHHxx
+7902	1906	0	2	2	2	2	902	1902	2902	7902	4	5	YRAAAA	IVCAAA	OOOOxx
+7598	1907	0	2	8	18	98	598	1598	2598	7598	196	197	GGAAAA	JVCAAA	VVVVxx
+5652	1908	0	0	2	12	52	652	1652	652	5652	104	105	KJAAAA	KVCAAA	AAAAxx
+2017	1909	1	1	7	17	17	17	17	2017	2017	34	35	PZAAAA	LVCAAA	HHHHxx
+7255	1910	1	3	5	15	55	255	1255	2255	7255	110	111	BTAAAA	MVCAAA	OOOOxx
+7999	1911	1	3	9	19	99	999	1999	2999	7999	198	199	RVAAAA	NVCAAA	VVVVxx
+5388	1912	0	0	8	8	88	388	1388	388	5388	176	177	GZAAAA	OVCAAA	AAAAxx
+8754	1913	0	2	4	14	54	754	754	3754	8754	108	109	SYAAAA	PVCAAA	HHHHxx
+5415	1914	1	3	5	15	15	415	1415	415	5415	30	31	HAAAAA	QVCAAA	OOOOxx
+8861	1915	1	1	1	1	61	861	861	3861	8861	122	123	VCAAAA	RVCAAA	VVVVxx
+2874	1916	0	2	4	14	74	874	874	2874	2874	148	149	OGAAAA	SVCAAA	AAAAxx
+9910	1917	0	2	0	10	10	910	1910	4910	9910	20	21	ERAAAA	TVCAAA	HHHHxx
+5178	1918	0	2	8	18	78	178	1178	178	5178	156	157	ERAAAA	UVCAAA	OOOOxx
+5698	1919	0	2	8	18	98	698	1698	698	5698	196	197	ELAAAA	VVCAAA	VVVVxx
+8500	1920	0	0	0	0	0	500	500	3500	8500	0	1	YOAAAA	WVCAAA	AAAAxx
+1814	1921	0	2	4	14	14	814	1814	1814	1814	28	29	URAAAA	XVCAAA	HHHHxx
+4968	1922	0	0	8	8	68	968	968	4968	4968	136	137	CJAAAA	YVCAAA	OOOOxx
+2642	1923	0	2	2	2	42	642	642	2642	2642	84	85	QXAAAA	ZVCAAA	VVVVxx
+1578	1924	0	2	8	18	78	578	1578	1578	1578	156	157	SIAAAA	AWCAAA	AAAAxx
+4774	1925	0	2	4	14	74	774	774	4774	4774	148	149	QBAAAA	BWCAAA	HHHHxx
+7062	1926	0	2	2	2	62	62	1062	2062	7062	124	125	QLAAAA	CWCAAA	OOOOxx
+5381	1927	1	1	1	1	81	381	1381	381	5381	162	163	ZYAAAA	DWCAAA	VVVVxx
+7985	1928	1	1	5	5	85	985	1985	2985	7985	170	171	DVAAAA	EWCAAA	AAAAxx
+3850	1929	0	2	0	10	50	850	1850	3850	3850	100	101	CSAAAA	FWCAAA	HHHHxx
+5624	1930	0	0	4	4	24	624	1624	624	5624	48	49	IIAAAA	GWCAAA	OOOOxx
+8948	1931	0	0	8	8	48	948	948	3948	8948	96	97	EGAAAA	HWCAAA	VVVVxx
+995	1932	1	3	5	15	95	995	995	995	995	190	191	HMAAAA	IWCAAA	AAAAxx
+5058	1933	0	2	8	18	58	58	1058	58	5058	116	117	OMAAAA	JWCAAA	HHHHxx
+9670	1934	0	2	0	10	70	670	1670	4670	9670	140	141	YHAAAA	KWCAAA	OOOOxx
+3115	1935	1	3	5	15	15	115	1115	3115	3115	30	31	VPAAAA	LWCAAA	VVVVxx
+4935	1936	1	3	5	15	35	935	935	4935	4935	70	71	VHAAAA	MWCAAA	AAAAxx
+4735	1937	1	3	5	15	35	735	735	4735	4735	70	71	DAAAAA	NWCAAA	HHHHxx
+1348	1938	0	0	8	8	48	348	1348	1348	1348	96	97	WZAAAA	OWCAAA	OOOOxx
+2380	1939	0	0	0	0	80	380	380	2380	2380	160	161	ONAAAA	PWCAAA	VVVVxx
+4246	1940	0	2	6	6	46	246	246	4246	4246	92	93	IHAAAA	QWCAAA	AAAAxx
+522	1941	0	2	2	2	22	522	522	522	522	44	45	CUAAAA	RWCAAA	HHHHxx
+1701	1942	1	1	1	1	1	701	1701	1701	1701	2	3	LNAAAA	SWCAAA	OOOOxx
+9709	1943	1	1	9	9	9	709	1709	4709	9709	18	19	LJAAAA	TWCAAA	VVVVxx
+8829	1944	1	1	9	9	29	829	829	3829	8829	58	59	PBAAAA	UWCAAA	AAAAxx
+7936	1945	0	0	6	16	36	936	1936	2936	7936	72	73	GTAAAA	VWCAAA	HHHHxx
+8474	1946	0	2	4	14	74	474	474	3474	8474	148	149	YNAAAA	WWCAAA	OOOOxx
+4676	1947	0	0	6	16	76	676	676	4676	4676	152	153	WXAAAA	XWCAAA	VVVVxx
+6303	1948	1	3	3	3	3	303	303	1303	6303	6	7	LIAAAA	YWCAAA	AAAAxx
+3485	1949	1	1	5	5	85	485	1485	3485	3485	170	171	BEAAAA	ZWCAAA	HHHHxx
+2695	1950	1	3	5	15	95	695	695	2695	2695	190	191	RZAAAA	AXCAAA	OOOOxx
+8830	1951	0	2	0	10	30	830	830	3830	8830	60	61	QBAAAA	BXCAAA	VVVVxx
+898	1952	0	2	8	18	98	898	898	898	898	196	197	OIAAAA	CXCAAA	AAAAxx
+7268	1953	0	0	8	8	68	268	1268	2268	7268	136	137	OTAAAA	DXCAAA	HHHHxx
+6568	1954	0	0	8	8	68	568	568	1568	6568	136	137	QSAAAA	EXCAAA	OOOOxx
+9724	1955	0	0	4	4	24	724	1724	4724	9724	48	49	AKAAAA	FXCAAA	VVVVxx
+3329	1956	1	1	9	9	29	329	1329	3329	3329	58	59	BYAAAA	GXCAAA	AAAAxx
+9860	1957	0	0	0	0	60	860	1860	4860	9860	120	121	GPAAAA	HXCAAA	HHHHxx
+6833	1958	1	1	3	13	33	833	833	1833	6833	66	67	VCAAAA	IXCAAA	OOOOxx
+5956	1959	0	0	6	16	56	956	1956	956	5956	112	113	CVAAAA	JXCAAA	VVVVxx
+3963	1960	1	3	3	3	63	963	1963	3963	3963	126	127	LWAAAA	KXCAAA	AAAAxx
+883	1961	1	3	3	3	83	883	883	883	883	166	167	ZHAAAA	LXCAAA	HHHHxx
+2761	1962	1	1	1	1	61	761	761	2761	2761	122	123	FCAAAA	MXCAAA	OOOOxx
+4644	1963	0	0	4	4	44	644	644	4644	4644	88	89	QWAAAA	NXCAAA	VVVVxx
+1358	1964	0	2	8	18	58	358	1358	1358	1358	116	117	GAAAAA	OXCAAA	AAAAxx
+2049	1965	1	1	9	9	49	49	49	2049	2049	98	99	VAAAAA	PXCAAA	HHHHxx
+2193	1966	1	1	3	13	93	193	193	2193	2193	186	187	JGAAAA	QXCAAA	OOOOxx
+9435	1967	1	3	5	15	35	435	1435	4435	9435	70	71	XYAAAA	RXCAAA	VVVVxx
+5890	1968	0	2	0	10	90	890	1890	890	5890	180	181	OSAAAA	SXCAAA	AAAAxx
+8149	1969	1	1	9	9	49	149	149	3149	8149	98	99	LBAAAA	TXCAAA	HHHHxx
+423	1970	1	3	3	3	23	423	423	423	423	46	47	HQAAAA	UXCAAA	OOOOxx
+7980	1971	0	0	0	0	80	980	1980	2980	7980	160	161	YUAAAA	VXCAAA	VVVVxx
+9019	1972	1	3	9	19	19	19	1019	4019	9019	38	39	XIAAAA	WXCAAA	AAAAxx
+1647	1973	1	3	7	7	47	647	1647	1647	1647	94	95	JLAAAA	XXCAAA	HHHHxx
+9495	1974	1	3	5	15	95	495	1495	4495	9495	190	191	FBAAAA	YXCAAA	OOOOxx
+3904	1975	0	0	4	4	4	904	1904	3904	3904	8	9	EUAAAA	ZXCAAA	VVVVxx
+5838	1976	0	2	8	18	38	838	1838	838	5838	76	77	OQAAAA	AYCAAA	AAAAxx
+3866	1977	0	2	6	6	66	866	1866	3866	3866	132	133	SSAAAA	BYCAAA	HHHHxx
+3093	1978	1	1	3	13	93	93	1093	3093	3093	186	187	ZOAAAA	CYCAAA	OOOOxx
+9666	1979	0	2	6	6	66	666	1666	4666	9666	132	133	UHAAAA	DYCAAA	VVVVxx
+1246	1980	0	2	6	6	46	246	1246	1246	1246	92	93	YVAAAA	EYCAAA	AAAAxx
+9759	1981	1	3	9	19	59	759	1759	4759	9759	118	119	JLAAAA	FYCAAA	HHHHxx
+7174	1982	0	2	4	14	74	174	1174	2174	7174	148	149	YPAAAA	GYCAAA	OOOOxx
+7678	1983	0	2	8	18	78	678	1678	2678	7678	156	157	IJAAAA	HYCAAA	VVVVxx
+3004	1984	0	0	4	4	4	4	1004	3004	3004	8	9	OLAAAA	IYCAAA	AAAAxx
+5607	1985	1	3	7	7	7	607	1607	607	5607	14	15	RHAAAA	JYCAAA	HHHHxx
+8510	1986	0	2	0	10	10	510	510	3510	8510	20	21	IPAAAA	KYCAAA	OOOOxx
+1483	1987	1	3	3	3	83	483	1483	1483	1483	166	167	BFAAAA	LYCAAA	VVVVxx
+2915	1988	1	3	5	15	15	915	915	2915	2915	30	31	DIAAAA	MYCAAA	AAAAxx
+1548	1989	0	0	8	8	48	548	1548	1548	1548	96	97	OHAAAA	NYCAAA	HHHHxx
+5767	1990	1	3	7	7	67	767	1767	767	5767	134	135	VNAAAA	OYCAAA	OOOOxx
+3214	1991	0	2	4	14	14	214	1214	3214	3214	28	29	QTAAAA	PYCAAA	VVVVxx
+8663	1992	1	3	3	3	63	663	663	3663	8663	126	127	FVAAAA	QYCAAA	AAAAxx
+5425	1993	1	1	5	5	25	425	1425	425	5425	50	51	RAAAAA	RYCAAA	HHHHxx
+8530	1994	0	2	0	10	30	530	530	3530	8530	60	61	CQAAAA	SYCAAA	OOOOxx
+821	1995	1	1	1	1	21	821	821	821	821	42	43	PFAAAA	TYCAAA	VVVVxx
+8816	1996	0	0	6	16	16	816	816	3816	8816	32	33	CBAAAA	UYCAAA	AAAAxx
+9367	1997	1	3	7	7	67	367	1367	4367	9367	134	135	HWAAAA	VYCAAA	HHHHxx
+4138	1998	0	2	8	18	38	138	138	4138	4138	76	77	EDAAAA	WYCAAA	OOOOxx
+94	1999	0	2	4	14	94	94	94	94	94	188	189	QDAAAA	XYCAAA	VVVVxx
+1858	2000	0	2	8	18	58	858	1858	1858	1858	116	117	MTAAAA	YYCAAA	AAAAxx
+5513	2001	1	1	3	13	13	513	1513	513	5513	26	27	BEAAAA	ZYCAAA	HHHHxx
+9620	2002	0	0	0	0	20	620	1620	4620	9620	40	41	AGAAAA	AZCAAA	OOOOxx
+4770	2003	0	2	0	10	70	770	770	4770	4770	140	141	MBAAAA	BZCAAA	VVVVxx
+5193	2004	1	1	3	13	93	193	1193	193	5193	186	187	TRAAAA	CZCAAA	AAAAxx
+198	2005	0	2	8	18	98	198	198	198	198	196	197	QHAAAA	DZCAAA	HHHHxx
+417	2006	1	1	7	17	17	417	417	417	417	34	35	BQAAAA	EZCAAA	OOOOxx
+173	2007	1	1	3	13	73	173	173	173	173	146	147	RGAAAA	FZCAAA	VVVVxx
+6248	2008	0	0	8	8	48	248	248	1248	6248	96	97	IGAAAA	GZCAAA	AAAAxx
+302	2009	0	2	2	2	2	302	302	302	302	4	5	QLAAAA	HZCAAA	HHHHxx
+8983	2010	1	3	3	3	83	983	983	3983	8983	166	167	NHAAAA	IZCAAA	OOOOxx
+4840	2011	0	0	0	0	40	840	840	4840	4840	80	81	EEAAAA	JZCAAA	VVVVxx
+2876	2012	0	0	6	16	76	876	876	2876	2876	152	153	QGAAAA	KZCAAA	AAAAxx
+5841	2013	1	1	1	1	41	841	1841	841	5841	82	83	RQAAAA	LZCAAA	HHHHxx
+2766	2014	0	2	6	6	66	766	766	2766	2766	132	133	KCAAAA	MZCAAA	OOOOxx
+9482	2015	0	2	2	2	82	482	1482	4482	9482	164	165	SAAAAA	NZCAAA	VVVVxx
+5335	2016	1	3	5	15	35	335	1335	335	5335	70	71	FXAAAA	OZCAAA	AAAAxx
+1502	2017	0	2	2	2	2	502	1502	1502	1502	4	5	UFAAAA	PZCAAA	HHHHxx
+9291	2018	1	3	1	11	91	291	1291	4291	9291	182	183	JTAAAA	QZCAAA	OOOOxx
+8655	2019	1	3	5	15	55	655	655	3655	8655	110	111	XUAAAA	RZCAAA	VVVVxx
+1687	2020	1	3	7	7	87	687	1687	1687	1687	174	175	XMAAAA	SZCAAA	AAAAxx
+8171	2021	1	3	1	11	71	171	171	3171	8171	142	143	HCAAAA	TZCAAA	HHHHxx
+5699	2022	1	3	9	19	99	699	1699	699	5699	198	199	FLAAAA	UZCAAA	OOOOxx
+1462	2023	0	2	2	2	62	462	1462	1462	1462	124	125	GEAAAA	VZCAAA	VVVVxx
+608	2024	0	0	8	8	8	608	608	608	608	16	17	KXAAAA	WZCAAA	AAAAxx
+6860	2025	0	0	0	0	60	860	860	1860	6860	120	121	WDAAAA	XZCAAA	HHHHxx
+6063	2026	1	3	3	3	63	63	63	1063	6063	126	127	FZAAAA	YZCAAA	OOOOxx
+1422	2027	0	2	2	2	22	422	1422	1422	1422	44	45	SCAAAA	ZZCAAA	VVVVxx
+1932	2028	0	0	2	12	32	932	1932	1932	1932	64	65	IWAAAA	AADAAA	AAAAxx
+5065	2029	1	1	5	5	65	65	1065	65	5065	130	131	VMAAAA	BADAAA	HHHHxx
+432	2030	0	0	2	12	32	432	432	432	432	64	65	QQAAAA	CADAAA	OOOOxx
+4680	2031	0	0	0	0	80	680	680	4680	4680	160	161	AYAAAA	DADAAA	VVVVxx
+8172	2032	0	0	2	12	72	172	172	3172	8172	144	145	ICAAAA	EADAAA	AAAAxx
+8668	2033	0	0	8	8	68	668	668	3668	8668	136	137	KVAAAA	FADAAA	HHHHxx
+256	2034	0	0	6	16	56	256	256	256	256	112	113	WJAAAA	GADAAA	OOOOxx
+2500	2035	0	0	0	0	0	500	500	2500	2500	0	1	ESAAAA	HADAAA	VVVVxx
+274	2036	0	2	4	14	74	274	274	274	274	148	149	OKAAAA	IADAAA	AAAAxx
+5907	2037	1	3	7	7	7	907	1907	907	5907	14	15	FTAAAA	JADAAA	HHHHxx
+8587	2038	1	3	7	7	87	587	587	3587	8587	174	175	HSAAAA	KADAAA	OOOOxx
+9942	2039	0	2	2	2	42	942	1942	4942	9942	84	85	KSAAAA	LADAAA	VVVVxx
+116	2040	0	0	6	16	16	116	116	116	116	32	33	MEAAAA	MADAAA	AAAAxx
+7134	2041	0	2	4	14	34	134	1134	2134	7134	68	69	KOAAAA	NADAAA	HHHHxx
+9002	2042	0	2	2	2	2	2	1002	4002	9002	4	5	GIAAAA	OADAAA	OOOOxx
+1209	2043	1	1	9	9	9	209	1209	1209	1209	18	19	NUAAAA	PADAAA	VVVVxx
+9983	2044	1	3	3	3	83	983	1983	4983	9983	166	167	ZTAAAA	QADAAA	AAAAxx
+1761	2045	1	1	1	1	61	761	1761	1761	1761	122	123	TPAAAA	RADAAA	HHHHxx
+7723	2046	1	3	3	3	23	723	1723	2723	7723	46	47	BLAAAA	SADAAA	OOOOxx
+6518	2047	0	2	8	18	18	518	518	1518	6518	36	37	SQAAAA	TADAAA	VVVVxx
+1372	2048	0	0	2	12	72	372	1372	1372	1372	144	145	UAAAAA	UADAAA	AAAAxx
+3587	2049	1	3	7	7	87	587	1587	3587	3587	174	175	ZHAAAA	VADAAA	HHHHxx
+5323	2050	1	3	3	3	23	323	1323	323	5323	46	47	TWAAAA	WADAAA	OOOOxx
+5902	2051	0	2	2	2	2	902	1902	902	5902	4	5	ATAAAA	XADAAA	VVVVxx
+3749	2052	1	1	9	9	49	749	1749	3749	3749	98	99	FOAAAA	YADAAA	AAAAxx
+5965	2053	1	1	5	5	65	965	1965	965	5965	130	131	LVAAAA	ZADAAA	HHHHxx
+663	2054	1	3	3	3	63	663	663	663	663	126	127	NZAAAA	ABDAAA	OOOOxx
+36	2055	0	0	6	16	36	36	36	36	36	72	73	KBAAAA	BBDAAA	VVVVxx
+9782	2056	0	2	2	2	82	782	1782	4782	9782	164	165	GMAAAA	CBDAAA	AAAAxx
+5412	2057	0	0	2	12	12	412	1412	412	5412	24	25	EAAAAA	DBDAAA	HHHHxx
+9961	2058	1	1	1	1	61	961	1961	4961	9961	122	123	DTAAAA	EBDAAA	OOOOxx
+6492	2059	0	0	2	12	92	492	492	1492	6492	184	185	SPAAAA	FBDAAA	VVVVxx
+4234	2060	0	2	4	14	34	234	234	4234	4234	68	69	WGAAAA	GBDAAA	AAAAxx
+4922	2061	0	2	2	2	22	922	922	4922	4922	44	45	IHAAAA	HBDAAA	HHHHxx
+6166	2062	0	2	6	6	66	166	166	1166	6166	132	133	EDAAAA	IBDAAA	OOOOxx
+7019	2063	1	3	9	19	19	19	1019	2019	7019	38	39	ZJAAAA	JBDAAA	VVVVxx
+7805	2064	1	1	5	5	5	805	1805	2805	7805	10	11	FOAAAA	KBDAAA	AAAAxx
+9808	2065	0	0	8	8	8	808	1808	4808	9808	16	17	GNAAAA	LBDAAA	HHHHxx
+2550	2066	0	2	0	10	50	550	550	2550	2550	100	101	CUAAAA	MBDAAA	OOOOxx
+8626	2067	0	2	6	6	26	626	626	3626	8626	52	53	UTAAAA	NBDAAA	VVVVxx
+5649	2068	1	1	9	9	49	649	1649	649	5649	98	99	HJAAAA	OBDAAA	AAAAxx
+3117	2069	1	1	7	17	17	117	1117	3117	3117	34	35	XPAAAA	PBDAAA	HHHHxx
+866	2070	0	2	6	6	66	866	866	866	866	132	133	IHAAAA	QBDAAA	OOOOxx
+2323	2071	1	3	3	3	23	323	323	2323	2323	46	47	JLAAAA	RBDAAA	VVVVxx
+5132	2072	0	0	2	12	32	132	1132	132	5132	64	65	KPAAAA	SBDAAA	AAAAxx
+9222	2073	0	2	2	2	22	222	1222	4222	9222	44	45	SQAAAA	TBDAAA	HHHHxx
+3934	2074	0	2	4	14	34	934	1934	3934	3934	68	69	IVAAAA	UBDAAA	OOOOxx
+4845	2075	1	1	5	5	45	845	845	4845	4845	90	91	JEAAAA	VBDAAA	VVVVxx
+7714	2076	0	2	4	14	14	714	1714	2714	7714	28	29	SKAAAA	WBDAAA	AAAAxx
+9818	2077	0	2	8	18	18	818	1818	4818	9818	36	37	QNAAAA	XBDAAA	HHHHxx
+2219	2078	1	3	9	19	19	219	219	2219	2219	38	39	JHAAAA	YBDAAA	OOOOxx
+6573	2079	1	1	3	13	73	573	573	1573	6573	146	147	VSAAAA	ZBDAAA	VVVVxx
+4555	2080	1	3	5	15	55	555	555	4555	4555	110	111	FTAAAA	ACDAAA	AAAAxx
+7306	2081	0	2	6	6	6	306	1306	2306	7306	12	13	AVAAAA	BCDAAA	HHHHxx
+9313	2082	1	1	3	13	13	313	1313	4313	9313	26	27	FUAAAA	CCDAAA	OOOOxx
+3924	2083	0	0	4	4	24	924	1924	3924	3924	48	49	YUAAAA	DCDAAA	VVVVxx
+5176	2084	0	0	6	16	76	176	1176	176	5176	152	153	CRAAAA	ECDAAA	AAAAxx
+9767	2085	1	3	7	7	67	767	1767	4767	9767	134	135	RLAAAA	FCDAAA	HHHHxx
+905	2086	1	1	5	5	5	905	905	905	905	10	11	VIAAAA	GCDAAA	OOOOxx
+8037	2087	1	1	7	17	37	37	37	3037	8037	74	75	DXAAAA	HCDAAA	VVVVxx
+8133	2088	1	1	3	13	33	133	133	3133	8133	66	67	VAAAAA	ICDAAA	AAAAxx
+2954	2089	0	2	4	14	54	954	954	2954	2954	108	109	QJAAAA	JCDAAA	HHHHxx
+7262	2090	0	2	2	2	62	262	1262	2262	7262	124	125	ITAAAA	KCDAAA	OOOOxx
+8768	2091	0	0	8	8	68	768	768	3768	8768	136	137	GZAAAA	LCDAAA	VVVVxx
+6953	2092	1	1	3	13	53	953	953	1953	6953	106	107	LHAAAA	MCDAAA	AAAAxx
+1984	2093	0	0	4	4	84	984	1984	1984	1984	168	169	IYAAAA	NCDAAA	HHHHxx
+9348	2094	0	0	8	8	48	348	1348	4348	9348	96	97	OVAAAA	OCDAAA	OOOOxx
+7769	2095	1	1	9	9	69	769	1769	2769	7769	138	139	VMAAAA	PCDAAA	VVVVxx
+2994	2096	0	2	4	14	94	994	994	2994	2994	188	189	ELAAAA	QCDAAA	AAAAxx
+5938	2097	0	2	8	18	38	938	1938	938	5938	76	77	KUAAAA	RCDAAA	HHHHxx
+556	2098	0	0	6	16	56	556	556	556	556	112	113	KVAAAA	SCDAAA	OOOOxx
+2577	2099	1	1	7	17	77	577	577	2577	2577	154	155	DVAAAA	TCDAAA	VVVVxx
+8733	2100	1	1	3	13	33	733	733	3733	8733	66	67	XXAAAA	UCDAAA	AAAAxx
+3108	2101	0	0	8	8	8	108	1108	3108	3108	16	17	OPAAAA	VCDAAA	HHHHxx
+4166	2102	0	2	6	6	66	166	166	4166	4166	132	133	GEAAAA	WCDAAA	OOOOxx
+3170	2103	0	2	0	10	70	170	1170	3170	3170	140	141	YRAAAA	XCDAAA	VVVVxx
+8118	2104	0	2	8	18	18	118	118	3118	8118	36	37	GAAAAA	YCDAAA	AAAAxx
+8454	2105	0	2	4	14	54	454	454	3454	8454	108	109	ENAAAA	ZCDAAA	HHHHxx
+5338	2106	0	2	8	18	38	338	1338	338	5338	76	77	IXAAAA	ADDAAA	OOOOxx
+402	2107	0	2	2	2	2	402	402	402	402	4	5	MPAAAA	BDDAAA	VVVVxx
+5673	2108	1	1	3	13	73	673	1673	673	5673	146	147	FKAAAA	CDDAAA	AAAAxx
+4324	2109	0	0	4	4	24	324	324	4324	4324	48	49	IKAAAA	DDDAAA	HHHHxx
+1943	2110	1	3	3	3	43	943	1943	1943	1943	86	87	TWAAAA	EDDAAA	OOOOxx
+7703	2111	1	3	3	3	3	703	1703	2703	7703	6	7	HKAAAA	FDDAAA	VVVVxx
+7180	2112	0	0	0	0	80	180	1180	2180	7180	160	161	EQAAAA	GDDAAA	AAAAxx
+5478	2113	0	2	8	18	78	478	1478	478	5478	156	157	SCAAAA	HDDAAA	HHHHxx
+5775	2114	1	3	5	15	75	775	1775	775	5775	150	151	DOAAAA	IDDAAA	OOOOxx
+6952	2115	0	0	2	12	52	952	952	1952	6952	104	105	KHAAAA	JDDAAA	VVVVxx
+9022	2116	0	2	2	2	22	22	1022	4022	9022	44	45	AJAAAA	KDDAAA	AAAAxx
+547	2117	1	3	7	7	47	547	547	547	547	94	95	BVAAAA	LDDAAA	HHHHxx
+5877	2118	1	1	7	17	77	877	1877	877	5877	154	155	BSAAAA	MDDAAA	OOOOxx
+9580	2119	0	0	0	0	80	580	1580	4580	9580	160	161	MEAAAA	NDDAAA	VVVVxx
+6094	2120	0	2	4	14	94	94	94	1094	6094	188	189	KAAAAA	ODDAAA	AAAAxx
+3398	2121	0	2	8	18	98	398	1398	3398	3398	196	197	SAAAAA	PDDAAA	HHHHxx
+4574	2122	0	2	4	14	74	574	574	4574	4574	148	149	YTAAAA	QDDAAA	OOOOxx
+3675	2123	1	3	5	15	75	675	1675	3675	3675	150	151	JLAAAA	RDDAAA	VVVVxx
+6413	2124	1	1	3	13	13	413	413	1413	6413	26	27	RMAAAA	SDDAAA	AAAAxx
+9851	2125	1	3	1	11	51	851	1851	4851	9851	102	103	XOAAAA	TDDAAA	HHHHxx
+126	2126	0	2	6	6	26	126	126	126	126	52	53	WEAAAA	UDDAAA	OOOOxx
+6803	2127	1	3	3	3	3	803	803	1803	6803	6	7	RBAAAA	VDDAAA	VVVVxx
+6949	2128	1	1	9	9	49	949	949	1949	6949	98	99	HHAAAA	WDDAAA	AAAAxx
+115	2129	1	3	5	15	15	115	115	115	115	30	31	LEAAAA	XDDAAA	HHHHxx
+4165	2130	1	1	5	5	65	165	165	4165	4165	130	131	FEAAAA	YDDAAA	OOOOxx
+201	2131	1	1	1	1	1	201	201	201	201	2	3	THAAAA	ZDDAAA	VVVVxx
+9324	2132	0	0	4	4	24	324	1324	4324	9324	48	49	QUAAAA	AEDAAA	AAAAxx
+6562	2133	0	2	2	2	62	562	562	1562	6562	124	125	KSAAAA	BEDAAA	HHHHxx
+1917	2134	1	1	7	17	17	917	1917	1917	1917	34	35	TVAAAA	CEDAAA	OOOOxx
+558	2135	0	2	8	18	58	558	558	558	558	116	117	MVAAAA	DEDAAA	VVVVxx
+8515	2136	1	3	5	15	15	515	515	3515	8515	30	31	NPAAAA	EEDAAA	AAAAxx
+6321	2137	1	1	1	1	21	321	321	1321	6321	42	43	DJAAAA	FEDAAA	HHHHxx
+6892	2138	0	0	2	12	92	892	892	1892	6892	184	185	CFAAAA	GEDAAA	OOOOxx
+1001	2139	1	1	1	1	1	1	1001	1001	1001	2	3	NMAAAA	HEDAAA	VVVVxx
+2858	2140	0	2	8	18	58	858	858	2858	2858	116	117	YFAAAA	IEDAAA	AAAAxx
+2434	2141	0	2	4	14	34	434	434	2434	2434	68	69	QPAAAA	JEDAAA	HHHHxx
+4460	2142	0	0	0	0	60	460	460	4460	4460	120	121	OPAAAA	KEDAAA	OOOOxx
+5447	2143	1	3	7	7	47	447	1447	447	5447	94	95	NBAAAA	LEDAAA	VVVVxx
+3799	2144	1	3	9	19	99	799	1799	3799	3799	198	199	DQAAAA	MEDAAA	AAAAxx
+4310	2145	0	2	0	10	10	310	310	4310	4310	20	21	UJAAAA	NEDAAA	HHHHxx
+405	2146	1	1	5	5	5	405	405	405	405	10	11	PPAAAA	OEDAAA	OOOOxx
+4573	2147	1	1	3	13	73	573	573	4573	4573	146	147	XTAAAA	PEDAAA	VVVVxx
+706	2148	0	2	6	6	6	706	706	706	706	12	13	EBAAAA	QEDAAA	AAAAxx
+7619	2149	1	3	9	19	19	619	1619	2619	7619	38	39	BHAAAA	REDAAA	HHHHxx
+7959	2150	1	3	9	19	59	959	1959	2959	7959	118	119	DUAAAA	SEDAAA	OOOOxx
+6712	2151	0	0	2	12	12	712	712	1712	6712	24	25	EYAAAA	TEDAAA	VVVVxx
+6959	2152	1	3	9	19	59	959	959	1959	6959	118	119	RHAAAA	UEDAAA	AAAAxx
+9791	2153	1	3	1	11	91	791	1791	4791	9791	182	183	PMAAAA	VEDAAA	HHHHxx
+2112	2154	0	0	2	12	12	112	112	2112	2112	24	25	GDAAAA	WEDAAA	OOOOxx
+9114	2155	0	2	4	14	14	114	1114	4114	9114	28	29	OMAAAA	XEDAAA	VVVVxx
+3506	2156	0	2	6	6	6	506	1506	3506	3506	12	13	WEAAAA	YEDAAA	AAAAxx
+5002	2157	0	2	2	2	2	2	1002	2	5002	4	5	KKAAAA	ZEDAAA	HHHHxx
+3518	2158	0	2	8	18	18	518	1518	3518	3518	36	37	IFAAAA	AFDAAA	OOOOxx
+602	2159	0	2	2	2	2	602	602	602	602	4	5	EXAAAA	BFDAAA	VVVVxx
+9060	2160	0	0	0	0	60	60	1060	4060	9060	120	121	MKAAAA	CFDAAA	AAAAxx
+3292	2161	0	0	2	12	92	292	1292	3292	3292	184	185	QWAAAA	DFDAAA	HHHHxx
+77	2162	1	1	7	17	77	77	77	77	77	154	155	ZCAAAA	EFDAAA	OOOOxx
+1420	2163	0	0	0	0	20	420	1420	1420	1420	40	41	QCAAAA	FFDAAA	VVVVxx
+6001	2164	1	1	1	1	1	1	1	1001	6001	2	3	VWAAAA	GFDAAA	AAAAxx
+7477	2165	1	1	7	17	77	477	1477	2477	7477	154	155	PBAAAA	HFDAAA	HHHHxx
+6655	2166	1	3	5	15	55	655	655	1655	6655	110	111	ZVAAAA	IFDAAA	OOOOxx
+7845	2167	1	1	5	5	45	845	1845	2845	7845	90	91	TPAAAA	JFDAAA	VVVVxx
+8484	2168	0	0	4	4	84	484	484	3484	8484	168	169	IOAAAA	KFDAAA	AAAAxx
+4345	2169	1	1	5	5	45	345	345	4345	4345	90	91	DLAAAA	LFDAAA	HHHHxx
+4250	2170	0	2	0	10	50	250	250	4250	4250	100	101	MHAAAA	MFDAAA	OOOOxx
+2391	2171	1	3	1	11	91	391	391	2391	2391	182	183	ZNAAAA	NFDAAA	VVVVxx
+6884	2172	0	0	4	4	84	884	884	1884	6884	168	169	UEAAAA	OFDAAA	AAAAxx
+7270	2173	0	2	0	10	70	270	1270	2270	7270	140	141	QTAAAA	PFDAAA	HHHHxx
+2499	2174	1	3	9	19	99	499	499	2499	2499	198	199	DSAAAA	QFDAAA	OOOOxx
+7312	2175	0	0	2	12	12	312	1312	2312	7312	24	25	GVAAAA	RFDAAA	VVVVxx
+7113	2176	1	1	3	13	13	113	1113	2113	7113	26	27	PNAAAA	SFDAAA	AAAAxx
+6695	2177	1	3	5	15	95	695	695	1695	6695	190	191	NXAAAA	TFDAAA	HHHHxx
+6521	2178	1	1	1	1	21	521	521	1521	6521	42	43	VQAAAA	UFDAAA	OOOOxx
+272	2179	0	0	2	12	72	272	272	272	272	144	145	MKAAAA	VFDAAA	VVVVxx
+9976	2180	0	0	6	16	76	976	1976	4976	9976	152	153	STAAAA	WFDAAA	AAAAxx
+992	2181	0	0	2	12	92	992	992	992	992	184	185	EMAAAA	XFDAAA	HHHHxx
+6158	2182	0	2	8	18	58	158	158	1158	6158	116	117	WCAAAA	YFDAAA	OOOOxx
+3281	2183	1	1	1	1	81	281	1281	3281	3281	162	163	FWAAAA	ZFDAAA	VVVVxx
+7446	2184	0	2	6	6	46	446	1446	2446	7446	92	93	KAAAAA	AGDAAA	AAAAxx
+4679	2185	1	3	9	19	79	679	679	4679	4679	158	159	ZXAAAA	BGDAAA	HHHHxx
+5203	2186	1	3	3	3	3	203	1203	203	5203	6	7	DSAAAA	CGDAAA	OOOOxx
+9874	2187	0	2	4	14	74	874	1874	4874	9874	148	149	UPAAAA	DGDAAA	VVVVxx
+8371	2188	1	3	1	11	71	371	371	3371	8371	142	143	ZJAAAA	EGDAAA	AAAAxx
+9086	2189	0	2	6	6	86	86	1086	4086	9086	172	173	MLAAAA	FGDAAA	HHHHxx
+430	2190	0	2	0	10	30	430	430	430	430	60	61	OQAAAA	GGDAAA	OOOOxx
+8749	2191	1	1	9	9	49	749	749	3749	8749	98	99	NYAAAA	HGDAAA	VVVVxx
+577	2192	1	1	7	17	77	577	577	577	577	154	155	FWAAAA	IGDAAA	AAAAxx
+4884	2193	0	0	4	4	84	884	884	4884	4884	168	169	WFAAAA	JGDAAA	HHHHxx
+3421	2194	1	1	1	1	21	421	1421	3421	3421	42	43	PBAAAA	KGDAAA	OOOOxx
+2812	2195	0	0	2	12	12	812	812	2812	2812	24	25	EEAAAA	LGDAAA	VVVVxx
+5958	2196	0	2	8	18	58	958	1958	958	5958	116	117	EVAAAA	MGDAAA	AAAAxx
+9901	2197	1	1	1	1	1	901	1901	4901	9901	2	3	VQAAAA	NGDAAA	HHHHxx
+8478	2198	0	2	8	18	78	478	478	3478	8478	156	157	COAAAA	OGDAAA	OOOOxx
+6545	2199	1	1	5	5	45	545	545	1545	6545	90	91	TRAAAA	PGDAAA	VVVVxx
+1479	2200	1	3	9	19	79	479	1479	1479	1479	158	159	XEAAAA	QGDAAA	AAAAxx
+1046	2201	0	2	6	6	46	46	1046	1046	1046	92	93	GOAAAA	RGDAAA	HHHHxx
+6372	2202	0	0	2	12	72	372	372	1372	6372	144	145	CLAAAA	SGDAAA	OOOOxx
+8206	2203	0	2	6	6	6	206	206	3206	8206	12	13	QDAAAA	TGDAAA	VVVVxx
+9544	2204	0	0	4	4	44	544	1544	4544	9544	88	89	CDAAAA	UGDAAA	AAAAxx
+9287	2205	1	3	7	7	87	287	1287	4287	9287	174	175	FTAAAA	VGDAAA	HHHHxx
+6786	2206	0	2	6	6	86	786	786	1786	6786	172	173	ABAAAA	WGDAAA	OOOOxx
+6511	2207	1	3	1	11	11	511	511	1511	6511	22	23	LQAAAA	XGDAAA	VVVVxx
+603	2208	1	3	3	3	3	603	603	603	603	6	7	FXAAAA	YGDAAA	AAAAxx
+2022	2209	0	2	2	2	22	22	22	2022	2022	44	45	UZAAAA	ZGDAAA	HHHHxx
+2086	2210	0	2	6	6	86	86	86	2086	2086	172	173	GCAAAA	AHDAAA	OOOOxx
+1969	2211	1	1	9	9	69	969	1969	1969	1969	138	139	TXAAAA	BHDAAA	VVVVxx
+4841	2212	1	1	1	1	41	841	841	4841	4841	82	83	FEAAAA	CHDAAA	AAAAxx
+5845	2213	1	1	5	5	45	845	1845	845	5845	90	91	VQAAAA	DHDAAA	HHHHxx
+4635	2214	1	3	5	15	35	635	635	4635	4635	70	71	HWAAAA	EHDAAA	OOOOxx
+4658	2215	0	2	8	18	58	658	658	4658	4658	116	117	EXAAAA	FHDAAA	VVVVxx
+2896	2216	0	0	6	16	96	896	896	2896	2896	192	193	KHAAAA	GHDAAA	AAAAxx
+5179	2217	1	3	9	19	79	179	1179	179	5179	158	159	FRAAAA	HHDAAA	HHHHxx
+8667	2218	1	3	7	7	67	667	667	3667	8667	134	135	JVAAAA	IHDAAA	OOOOxx
+7294	2219	0	2	4	14	94	294	1294	2294	7294	188	189	OUAAAA	JHDAAA	VVVVxx
+3706	2220	0	2	6	6	6	706	1706	3706	3706	12	13	OMAAAA	KHDAAA	AAAAxx
+8389	2221	1	1	9	9	89	389	389	3389	8389	178	179	RKAAAA	LHDAAA	HHHHxx
+2486	2222	0	2	6	6	86	486	486	2486	2486	172	173	QRAAAA	MHDAAA	OOOOxx
+8743	2223	1	3	3	3	43	743	743	3743	8743	86	87	HYAAAA	NHDAAA	VVVVxx
+2777	2224	1	1	7	17	77	777	777	2777	2777	154	155	VCAAAA	OHDAAA	AAAAxx
+2113	2225	1	1	3	13	13	113	113	2113	2113	26	27	HDAAAA	PHDAAA	HHHHxx
+2076	2226	0	0	6	16	76	76	76	2076	2076	152	153	WBAAAA	QHDAAA	OOOOxx
+2300	2227	0	0	0	0	0	300	300	2300	2300	0	1	MKAAAA	RHDAAA	VVVVxx
+6894	2228	0	2	4	14	94	894	894	1894	6894	188	189	EFAAAA	SHDAAA	AAAAxx
+6939	2229	1	3	9	19	39	939	939	1939	6939	78	79	XGAAAA	THDAAA	HHHHxx
+446	2230	0	2	6	6	46	446	446	446	446	92	93	ERAAAA	UHDAAA	OOOOxx
+6218	2231	0	2	8	18	18	218	218	1218	6218	36	37	EFAAAA	VHDAAA	VVVVxx
+1295	2232	1	3	5	15	95	295	1295	1295	1295	190	191	VXAAAA	WHDAAA	AAAAxx
+5135	2233	1	3	5	15	35	135	1135	135	5135	70	71	NPAAAA	XHDAAA	HHHHxx
+8122	2234	0	2	2	2	22	122	122	3122	8122	44	45	KAAAAA	YHDAAA	OOOOxx
+316	2235	0	0	6	16	16	316	316	316	316	32	33	EMAAAA	ZHDAAA	VVVVxx
+514	2236	0	2	4	14	14	514	514	514	514	28	29	UTAAAA	AIDAAA	AAAAxx
+7970	2237	0	2	0	10	70	970	1970	2970	7970	140	141	OUAAAA	BIDAAA	HHHHxx
+9350	2238	0	2	0	10	50	350	1350	4350	9350	100	101	QVAAAA	CIDAAA	OOOOxx
+3700	2239	0	0	0	0	0	700	1700	3700	3700	0	1	IMAAAA	DIDAAA	VVVVxx
+582	2240	0	2	2	2	82	582	582	582	582	164	165	KWAAAA	EIDAAA	AAAAxx
+9722	2241	0	2	2	2	22	722	1722	4722	9722	44	45	YJAAAA	FIDAAA	HHHHxx
+7398	2242	0	2	8	18	98	398	1398	2398	7398	196	197	OYAAAA	GIDAAA	OOOOxx
+2265	2243	1	1	5	5	65	265	265	2265	2265	130	131	DJAAAA	HIDAAA	VVVVxx
+3049	2244	1	1	9	9	49	49	1049	3049	3049	98	99	HNAAAA	IIDAAA	AAAAxx
+9121	2245	1	1	1	1	21	121	1121	4121	9121	42	43	VMAAAA	JIDAAA	HHHHxx
+4275	2246	1	3	5	15	75	275	275	4275	4275	150	151	LIAAAA	KIDAAA	OOOOxx
+6567	2247	1	3	7	7	67	567	567	1567	6567	134	135	PSAAAA	LIDAAA	VVVVxx
+6755	2248	1	3	5	15	55	755	755	1755	6755	110	111	VZAAAA	MIDAAA	AAAAxx
+4535	2249	1	3	5	15	35	535	535	4535	4535	70	71	LSAAAA	NIDAAA	HHHHxx
+7968	2250	0	0	8	8	68	968	1968	2968	7968	136	137	MUAAAA	OIDAAA	OOOOxx
+3412	2251	0	0	2	12	12	412	1412	3412	3412	24	25	GBAAAA	PIDAAA	VVVVxx
+6112	2252	0	0	2	12	12	112	112	1112	6112	24	25	CBAAAA	QIDAAA	AAAAxx
+6805	2253	1	1	5	5	5	805	805	1805	6805	10	11	TBAAAA	RIDAAA	HHHHxx
+2880	2254	0	0	0	0	80	880	880	2880	2880	160	161	UGAAAA	SIDAAA	OOOOxx
+7710	2255	0	2	0	10	10	710	1710	2710	7710	20	21	OKAAAA	TIDAAA	VVVVxx
+7949	2256	1	1	9	9	49	949	1949	2949	7949	98	99	TTAAAA	UIDAAA	AAAAxx
+7043	2257	1	3	3	3	43	43	1043	2043	7043	86	87	XKAAAA	VIDAAA	HHHHxx
+9012	2258	0	0	2	12	12	12	1012	4012	9012	24	25	QIAAAA	WIDAAA	OOOOxx
+878	2259	0	2	8	18	78	878	878	878	878	156	157	UHAAAA	XIDAAA	VVVVxx
+7930	2260	0	2	0	10	30	930	1930	2930	7930	60	61	ATAAAA	YIDAAA	AAAAxx
+667	2261	1	3	7	7	67	667	667	667	667	134	135	RZAAAA	ZIDAAA	HHHHxx
+1905	2262	1	1	5	5	5	905	1905	1905	1905	10	11	HVAAAA	AJDAAA	OOOOxx
+4958	2263	0	2	8	18	58	958	958	4958	4958	116	117	SIAAAA	BJDAAA	VVVVxx
+2973	2264	1	1	3	13	73	973	973	2973	2973	146	147	JKAAAA	CJDAAA	AAAAxx
+3631	2265	1	3	1	11	31	631	1631	3631	3631	62	63	RJAAAA	DJDAAA	HHHHxx
+5868	2266	0	0	8	8	68	868	1868	868	5868	136	137	SRAAAA	EJDAAA	OOOOxx
+2873	2267	1	1	3	13	73	873	873	2873	2873	146	147	NGAAAA	FJDAAA	VVVVxx
+6941	2268	1	1	1	1	41	941	941	1941	6941	82	83	ZGAAAA	GJDAAA	AAAAxx
+6384	2269	0	0	4	4	84	384	384	1384	6384	168	169	OLAAAA	HJDAAA	HHHHxx
+3806	2270	0	2	6	6	6	806	1806	3806	3806	12	13	KQAAAA	IJDAAA	OOOOxx
+5079	2271	1	3	9	19	79	79	1079	79	5079	158	159	JNAAAA	JJDAAA	VVVVxx
+1970	2272	0	2	0	10	70	970	1970	1970	1970	140	141	UXAAAA	KJDAAA	AAAAxx
+7810	2273	0	2	0	10	10	810	1810	2810	7810	20	21	KOAAAA	LJDAAA	HHHHxx
+4639	2274	1	3	9	19	39	639	639	4639	4639	78	79	LWAAAA	MJDAAA	OOOOxx
+6527	2275	1	3	7	7	27	527	527	1527	6527	54	55	BRAAAA	NJDAAA	VVVVxx
+8079	2276	1	3	9	19	79	79	79	3079	8079	158	159	TYAAAA	OJDAAA	AAAAxx
+2740	2277	0	0	0	0	40	740	740	2740	2740	80	81	KBAAAA	PJDAAA	HHHHxx
+2337	2278	1	1	7	17	37	337	337	2337	2337	74	75	XLAAAA	QJDAAA	OOOOxx
+6670	2279	0	2	0	10	70	670	670	1670	6670	140	141	OWAAAA	RJDAAA	VVVVxx
+2345	2280	1	1	5	5	45	345	345	2345	2345	90	91	FMAAAA	SJDAAA	AAAAxx
+401	2281	1	1	1	1	1	401	401	401	401	2	3	LPAAAA	TJDAAA	HHHHxx
+2704	2282	0	0	4	4	4	704	704	2704	2704	8	9	AAAAAA	UJDAAA	OOOOxx
+5530	2283	0	2	0	10	30	530	1530	530	5530	60	61	SEAAAA	VJDAAA	VVVVxx
+51	2284	1	3	1	11	51	51	51	51	51	102	103	ZBAAAA	WJDAAA	AAAAxx
+4282	2285	0	2	2	2	82	282	282	4282	4282	164	165	SIAAAA	XJDAAA	HHHHxx
+7336	2286	0	0	6	16	36	336	1336	2336	7336	72	73	EWAAAA	YJDAAA	OOOOxx
+8320	2287	0	0	0	0	20	320	320	3320	8320	40	41	AIAAAA	ZJDAAA	VVVVxx
+7772	2288	0	0	2	12	72	772	1772	2772	7772	144	145	YMAAAA	AKDAAA	AAAAxx
+1894	2289	0	2	4	14	94	894	1894	1894	1894	188	189	WUAAAA	BKDAAA	HHHHxx
+2320	2290	0	0	0	0	20	320	320	2320	2320	40	41	GLAAAA	CKDAAA	OOOOxx
+6232	2291	0	0	2	12	32	232	232	1232	6232	64	65	SFAAAA	DKDAAA	VVVVxx
+2833	2292	1	1	3	13	33	833	833	2833	2833	66	67	ZEAAAA	EKDAAA	AAAAxx
+8265	2293	1	1	5	5	65	265	265	3265	8265	130	131	XFAAAA	FKDAAA	HHHHxx
+4589	2294	1	1	9	9	89	589	589	4589	4589	178	179	NUAAAA	GKDAAA	OOOOxx
+8182	2295	0	2	2	2	82	182	182	3182	8182	164	165	SCAAAA	HKDAAA	VVVVxx
+8337	2296	1	1	7	17	37	337	337	3337	8337	74	75	RIAAAA	IKDAAA	AAAAxx
+8210	2297	0	2	0	10	10	210	210	3210	8210	20	21	UDAAAA	JKDAAA	HHHHxx
+1406	2298	0	2	6	6	6	406	1406	1406	1406	12	13	CCAAAA	KKDAAA	OOOOxx
+4463	2299	1	3	3	3	63	463	463	4463	4463	126	127	RPAAAA	LKDAAA	VVVVxx
+4347	2300	1	3	7	7	47	347	347	4347	4347	94	95	FLAAAA	MKDAAA	AAAAxx
+181	2301	1	1	1	1	81	181	181	181	181	162	163	ZGAAAA	NKDAAA	HHHHxx
+9986	2302	0	2	6	6	86	986	1986	4986	9986	172	173	CUAAAA	OKDAAA	OOOOxx
+661	2303	1	1	1	1	61	661	661	661	661	122	123	LZAAAA	PKDAAA	VVVVxx
+4105	2304	1	1	5	5	5	105	105	4105	4105	10	11	XBAAAA	QKDAAA	AAAAxx
+2187	2305	1	3	7	7	87	187	187	2187	2187	174	175	DGAAAA	RKDAAA	HHHHxx
+1628	2306	0	0	8	8	28	628	1628	1628	1628	56	57	QKAAAA	SKDAAA	OOOOxx
+3119	2307	1	3	9	19	19	119	1119	3119	3119	38	39	ZPAAAA	TKDAAA	VVVVxx
+6804	2308	0	0	4	4	4	804	804	1804	6804	8	9	SBAAAA	UKDAAA	AAAAxx
+9918	2309	0	2	8	18	18	918	1918	4918	9918	36	37	MRAAAA	VKDAAA	HHHHxx
+8916	2310	0	0	6	16	16	916	916	3916	8916	32	33	YEAAAA	WKDAAA	OOOOxx
+6057	2311	1	1	7	17	57	57	57	1057	6057	114	115	ZYAAAA	XKDAAA	VVVVxx
+3622	2312	0	2	2	2	22	622	1622	3622	3622	44	45	IJAAAA	YKDAAA	AAAAxx
+9168	2313	0	0	8	8	68	168	1168	4168	9168	136	137	QOAAAA	ZKDAAA	HHHHxx
+3720	2314	0	0	0	0	20	720	1720	3720	3720	40	41	CNAAAA	ALDAAA	OOOOxx
+9927	2315	1	3	7	7	27	927	1927	4927	9927	54	55	VRAAAA	BLDAAA	VVVVxx
+5616	2316	0	0	6	16	16	616	1616	616	5616	32	33	AIAAAA	CLDAAA	AAAAxx
+5210	2317	0	2	0	10	10	210	1210	210	5210	20	21	KSAAAA	DLDAAA	HHHHxx
+636	2318	0	0	6	16	36	636	636	636	636	72	73	MYAAAA	ELDAAA	OOOOxx
+9936	2319	0	0	6	16	36	936	1936	4936	9936	72	73	ESAAAA	FLDAAA	VVVVxx
+2316	2320	0	0	6	16	16	316	316	2316	2316	32	33	CLAAAA	GLDAAA	AAAAxx
+4363	2321	1	3	3	3	63	363	363	4363	4363	126	127	VLAAAA	HLDAAA	HHHHxx
+7657	2322	1	1	7	17	57	657	1657	2657	7657	114	115	NIAAAA	ILDAAA	OOOOxx
+697	2323	1	1	7	17	97	697	697	697	697	194	195	VAAAAA	JLDAAA	VVVVxx
+912	2324	0	0	2	12	12	912	912	912	912	24	25	CJAAAA	KLDAAA	AAAAxx
+8806	2325	0	2	6	6	6	806	806	3806	8806	12	13	SAAAAA	LLDAAA	HHHHxx
+9698	2326	0	2	8	18	98	698	1698	4698	9698	196	197	AJAAAA	MLDAAA	OOOOxx
+6191	2327	1	3	1	11	91	191	191	1191	6191	182	183	DEAAAA	NLDAAA	VVVVxx
+1188	2328	0	0	8	8	88	188	1188	1188	1188	176	177	STAAAA	OLDAAA	AAAAxx
+7676	2329	0	0	6	16	76	676	1676	2676	7676	152	153	GJAAAA	PLDAAA	HHHHxx
+7073	2330	1	1	3	13	73	73	1073	2073	7073	146	147	BMAAAA	QLDAAA	OOOOxx
+8019	2331	1	3	9	19	19	19	19	3019	8019	38	39	LWAAAA	RLDAAA	VVVVxx
+4726	2332	0	2	6	6	26	726	726	4726	4726	52	53	UZAAAA	SLDAAA	AAAAxx
+4648	2333	0	0	8	8	48	648	648	4648	4648	96	97	UWAAAA	TLDAAA	HHHHxx
+3227	2334	1	3	7	7	27	227	1227	3227	3227	54	55	DUAAAA	ULDAAA	OOOOxx
+7232	2335	0	0	2	12	32	232	1232	2232	7232	64	65	ESAAAA	VLDAAA	VVVVxx
+9761	2336	1	1	1	1	61	761	1761	4761	9761	122	123	LLAAAA	WLDAAA	AAAAxx
+3105	2337	1	1	5	5	5	105	1105	3105	3105	10	11	LPAAAA	XLDAAA	HHHHxx
+5266	2338	0	2	6	6	66	266	1266	266	5266	132	133	OUAAAA	YLDAAA	OOOOxx
+6788	2339	0	0	8	8	88	788	788	1788	6788	176	177	CBAAAA	ZLDAAA	VVVVxx
+2442	2340	0	2	2	2	42	442	442	2442	2442	84	85	YPAAAA	AMDAAA	AAAAxx
+8198	2341	0	2	8	18	98	198	198	3198	8198	196	197	IDAAAA	BMDAAA	HHHHxx
+5806	2342	0	2	6	6	6	806	1806	806	5806	12	13	IPAAAA	CMDAAA	OOOOxx
+8928	2343	0	0	8	8	28	928	928	3928	8928	56	57	KFAAAA	DMDAAA	VVVVxx
+1657	2344	1	1	7	17	57	657	1657	1657	1657	114	115	TLAAAA	EMDAAA	AAAAxx
+9164	2345	0	0	4	4	64	164	1164	4164	9164	128	129	MOAAAA	FMDAAA	HHHHxx
+1851	2346	1	3	1	11	51	851	1851	1851	1851	102	103	FTAAAA	GMDAAA	OOOOxx
+4744	2347	0	0	4	4	44	744	744	4744	4744	88	89	MAAAAA	HMDAAA	VVVVxx
+8055	2348	1	3	5	15	55	55	55	3055	8055	110	111	VXAAAA	IMDAAA	AAAAxx
+1533	2349	1	1	3	13	33	533	1533	1533	1533	66	67	ZGAAAA	JMDAAA	HHHHxx
+1260	2350	0	0	0	0	60	260	1260	1260	1260	120	121	MWAAAA	KMDAAA	OOOOxx
+1290	2351	0	2	0	10	90	290	1290	1290	1290	180	181	QXAAAA	LMDAAA	VVVVxx
+297	2352	1	1	7	17	97	297	297	297	297	194	195	LLAAAA	MMDAAA	AAAAxx
+4145	2353	1	1	5	5	45	145	145	4145	4145	90	91	LDAAAA	NMDAAA	HHHHxx
+863	2354	1	3	3	3	63	863	863	863	863	126	127	FHAAAA	OMDAAA	OOOOxx
+3423	2355	1	3	3	3	23	423	1423	3423	3423	46	47	RBAAAA	PMDAAA	VVVVxx
+8750	2356	0	2	0	10	50	750	750	3750	8750	100	101	OYAAAA	QMDAAA	AAAAxx
+3546	2357	0	2	6	6	46	546	1546	3546	3546	92	93	KGAAAA	RMDAAA	HHHHxx
+3678	2358	0	2	8	18	78	678	1678	3678	3678	156	157	MLAAAA	SMDAAA	OOOOxx
+5313	2359	1	1	3	13	13	313	1313	313	5313	26	27	JWAAAA	TMDAAA	VVVVxx
+6233	2360	1	1	3	13	33	233	233	1233	6233	66	67	TFAAAA	UMDAAA	AAAAxx
+5802	2361	0	2	2	2	2	802	1802	802	5802	4	5	EPAAAA	VMDAAA	HHHHxx
+7059	2362	1	3	9	19	59	59	1059	2059	7059	118	119	NLAAAA	WMDAAA	OOOOxx
+6481	2363	1	1	1	1	81	481	481	1481	6481	162	163	HPAAAA	XMDAAA	VVVVxx
+1596	2364	0	0	6	16	96	596	1596	1596	1596	192	193	KJAAAA	YMDAAA	AAAAxx
+8181	2365	1	1	1	1	81	181	181	3181	8181	162	163	RCAAAA	ZMDAAA	HHHHxx
+5368	2366	0	0	8	8	68	368	1368	368	5368	136	137	MYAAAA	ANDAAA	OOOOxx
+9416	2367	0	0	6	16	16	416	1416	4416	9416	32	33	EYAAAA	BNDAAA	VVVVxx
+9521	2368	1	1	1	1	21	521	1521	4521	9521	42	43	FCAAAA	CNDAAA	AAAAxx
+1042	2369	0	2	2	2	42	42	1042	1042	1042	84	85	COAAAA	DNDAAA	HHHHxx
+4503	2370	1	3	3	3	3	503	503	4503	4503	6	7	FRAAAA	ENDAAA	OOOOxx
+3023	2371	1	3	3	3	23	23	1023	3023	3023	46	47	HMAAAA	FNDAAA	VVVVxx
+1976	2372	0	0	6	16	76	976	1976	1976	1976	152	153	AYAAAA	GNDAAA	AAAAxx
+5610	2373	0	2	0	10	10	610	1610	610	5610	20	21	UHAAAA	HNDAAA	HHHHxx
+7410	2374	0	2	0	10	10	410	1410	2410	7410	20	21	AZAAAA	INDAAA	OOOOxx
+7872	2375	0	0	2	12	72	872	1872	2872	7872	144	145	UQAAAA	JNDAAA	VVVVxx
+8591	2376	1	3	1	11	91	591	591	3591	8591	182	183	LSAAAA	KNDAAA	AAAAxx
+1804	2377	0	0	4	4	4	804	1804	1804	1804	8	9	KRAAAA	LNDAAA	HHHHxx
+5299	2378	1	3	9	19	99	299	1299	299	5299	198	199	VVAAAA	MNDAAA	OOOOxx
+4695	2379	1	3	5	15	95	695	695	4695	4695	190	191	PYAAAA	NNDAAA	VVVVxx
+2672	2380	0	0	2	12	72	672	672	2672	2672	144	145	UYAAAA	ONDAAA	AAAAxx
+585	2381	1	1	5	5	85	585	585	585	585	170	171	NWAAAA	PNDAAA	HHHHxx
+8622	2382	0	2	2	2	22	622	622	3622	8622	44	45	QTAAAA	QNDAAA	OOOOxx
+3780	2383	0	0	0	0	80	780	1780	3780	3780	160	161	KPAAAA	RNDAAA	VVVVxx
+7941	2384	1	1	1	1	41	941	1941	2941	7941	82	83	LTAAAA	SNDAAA	AAAAxx
+3305	2385	1	1	5	5	5	305	1305	3305	3305	10	11	DXAAAA	TNDAAA	HHHHxx
+8653	2386	1	1	3	13	53	653	653	3653	8653	106	107	VUAAAA	UNDAAA	OOOOxx
+5756	2387	0	0	6	16	56	756	1756	756	5756	112	113	KNAAAA	VNDAAA	VVVVxx
+576	2388	0	0	6	16	76	576	576	576	576	152	153	EWAAAA	WNDAAA	AAAAxx
+1915	2389	1	3	5	15	15	915	1915	1915	1915	30	31	RVAAAA	XNDAAA	HHHHxx
+4627	2390	1	3	7	7	27	627	627	4627	4627	54	55	ZVAAAA	YNDAAA	OOOOxx
+920	2391	0	0	0	0	20	920	920	920	920	40	41	KJAAAA	ZNDAAA	VVVVxx
+2537	2392	1	1	7	17	37	537	537	2537	2537	74	75	PTAAAA	AODAAA	AAAAxx
+50	2393	0	2	0	10	50	50	50	50	50	100	101	YBAAAA	BODAAA	HHHHxx
+1313	2394	1	1	3	13	13	313	1313	1313	1313	26	27	NYAAAA	CODAAA	OOOOxx
+8542	2395	0	2	2	2	42	542	542	3542	8542	84	85	OQAAAA	DODAAA	VVVVxx
+6428	2396	0	0	8	8	28	428	428	1428	6428	56	57	GNAAAA	EODAAA	AAAAxx
+4351	2397	1	3	1	11	51	351	351	4351	4351	102	103	JLAAAA	FODAAA	HHHHxx
+2050	2398	0	2	0	10	50	50	50	2050	2050	100	101	WAAAAA	GODAAA	OOOOxx
+5162	2399	0	2	2	2	62	162	1162	162	5162	124	125	OQAAAA	HODAAA	VVVVxx
+8229	2400	1	1	9	9	29	229	229	3229	8229	58	59	NEAAAA	IODAAA	AAAAxx
+7782	2401	0	2	2	2	82	782	1782	2782	7782	164	165	INAAAA	JODAAA	HHHHxx
+1563	2402	1	3	3	3	63	563	1563	1563	1563	126	127	DIAAAA	KODAAA	OOOOxx
+267	2403	1	3	7	7	67	267	267	267	267	134	135	HKAAAA	LODAAA	VVVVxx
+5138	2404	0	2	8	18	38	138	1138	138	5138	76	77	QPAAAA	MODAAA	AAAAxx
+7022	2405	0	2	2	2	22	22	1022	2022	7022	44	45	CKAAAA	NODAAA	HHHHxx
+6705	2406	1	1	5	5	5	705	705	1705	6705	10	11	XXAAAA	OODAAA	OOOOxx
+6190	2407	0	2	0	10	90	190	190	1190	6190	180	181	CEAAAA	PODAAA	VVVVxx
+8226	2408	0	2	6	6	26	226	226	3226	8226	52	53	KEAAAA	QODAAA	AAAAxx
+8882	2409	0	2	2	2	82	882	882	3882	8882	164	165	QDAAAA	RODAAA	HHHHxx
+5181	2410	1	1	1	1	81	181	1181	181	5181	162	163	HRAAAA	SODAAA	OOOOxx
+4598	2411	0	2	8	18	98	598	598	4598	4598	196	197	WUAAAA	TODAAA	VVVVxx
+4882	2412	0	2	2	2	82	882	882	4882	4882	164	165	UFAAAA	UODAAA	AAAAxx
+7490	2413	0	2	0	10	90	490	1490	2490	7490	180	181	CCAAAA	VODAAA	HHHHxx
+5224	2414	0	0	4	4	24	224	1224	224	5224	48	49	YSAAAA	WODAAA	OOOOxx
+2174	2415	0	2	4	14	74	174	174	2174	2174	148	149	QFAAAA	XODAAA	VVVVxx
+3059	2416	1	3	9	19	59	59	1059	3059	3059	118	119	RNAAAA	YODAAA	AAAAxx
+8790	2417	0	2	0	10	90	790	790	3790	8790	180	181	CAAAAA	ZODAAA	HHHHxx
+2222	2418	0	2	2	2	22	222	222	2222	2222	44	45	MHAAAA	APDAAA	OOOOxx
+5473	2419	1	1	3	13	73	473	1473	473	5473	146	147	NCAAAA	BPDAAA	VVVVxx
+937	2420	1	1	7	17	37	937	937	937	937	74	75	BKAAAA	CPDAAA	AAAAxx
+2975	2421	1	3	5	15	75	975	975	2975	2975	150	151	LKAAAA	DPDAAA	HHHHxx
+9569	2422	1	1	9	9	69	569	1569	4569	9569	138	139	BEAAAA	EPDAAA	OOOOxx
+3456	2423	0	0	6	16	56	456	1456	3456	3456	112	113	YCAAAA	FPDAAA	VVVVxx
+6657	2424	1	1	7	17	57	657	657	1657	6657	114	115	BWAAAA	GPDAAA	AAAAxx
+3776	2425	0	0	6	16	76	776	1776	3776	3776	152	153	GPAAAA	HPDAAA	HHHHxx
+6072	2426	0	0	2	12	72	72	72	1072	6072	144	145	OZAAAA	IPDAAA	OOOOxx
+8129	2427	1	1	9	9	29	129	129	3129	8129	58	59	RAAAAA	JPDAAA	VVVVxx
+1085	2428	1	1	5	5	85	85	1085	1085	1085	170	171	TPAAAA	KPDAAA	AAAAxx
+2079	2429	1	3	9	19	79	79	79	2079	2079	158	159	ZBAAAA	LPDAAA	HHHHxx
+1200	2430	0	0	0	0	0	200	1200	1200	1200	0	1	EUAAAA	MPDAAA	OOOOxx
+3276	2431	0	0	6	16	76	276	1276	3276	3276	152	153	AWAAAA	NPDAAA	VVVVxx
+2608	2432	0	0	8	8	8	608	608	2608	2608	16	17	IWAAAA	OPDAAA	AAAAxx
+702	2433	0	2	2	2	2	702	702	702	702	4	5	ABAAAA	PPDAAA	HHHHxx
+5750	2434	0	2	0	10	50	750	1750	750	5750	100	101	ENAAAA	QPDAAA	OOOOxx
+2776	2435	0	0	6	16	76	776	776	2776	2776	152	153	UCAAAA	RPDAAA	VVVVxx
+9151	2436	1	3	1	11	51	151	1151	4151	9151	102	103	ZNAAAA	SPDAAA	AAAAxx
+3282	2437	0	2	2	2	82	282	1282	3282	3282	164	165	GWAAAA	TPDAAA	HHHHxx
+408	2438	0	0	8	8	8	408	408	408	408	16	17	SPAAAA	UPDAAA	OOOOxx
+3473	2439	1	1	3	13	73	473	1473	3473	3473	146	147	PDAAAA	VPDAAA	VVVVxx
+7095	2440	1	3	5	15	95	95	1095	2095	7095	190	191	XMAAAA	WPDAAA	AAAAxx
+3288	2441	0	0	8	8	88	288	1288	3288	3288	176	177	MWAAAA	XPDAAA	HHHHxx
+8215	2442	1	3	5	15	15	215	215	3215	8215	30	31	ZDAAAA	YPDAAA	OOOOxx
+6244	2443	0	0	4	4	44	244	244	1244	6244	88	89	EGAAAA	ZPDAAA	VVVVxx
+8440	2444	0	0	0	0	40	440	440	3440	8440	80	81	QMAAAA	AQDAAA	AAAAxx
+3800	2445	0	0	0	0	0	800	1800	3800	3800	0	1	EQAAAA	BQDAAA	HHHHxx
+7279	2446	1	3	9	19	79	279	1279	2279	7279	158	159	ZTAAAA	CQDAAA	OOOOxx
+9206	2447	0	2	6	6	6	206	1206	4206	9206	12	13	CQAAAA	DQDAAA	VVVVxx
+6465	2448	1	1	5	5	65	465	465	1465	6465	130	131	ROAAAA	EQDAAA	AAAAxx
+4127	2449	1	3	7	7	27	127	127	4127	4127	54	55	TCAAAA	FQDAAA	HHHHxx
+7463	2450	1	3	3	3	63	463	1463	2463	7463	126	127	BBAAAA	GQDAAA	OOOOxx
+5117	2451	1	1	7	17	17	117	1117	117	5117	34	35	VOAAAA	HQDAAA	VVVVxx
+4715	2452	1	3	5	15	15	715	715	4715	4715	30	31	JZAAAA	IQDAAA	AAAAxx
+2010	2453	0	2	0	10	10	10	10	2010	2010	20	21	IZAAAA	JQDAAA	HHHHxx
+6486	2454	0	2	6	6	86	486	486	1486	6486	172	173	MPAAAA	KQDAAA	OOOOxx
+6434	2455	0	2	4	14	34	434	434	1434	6434	68	69	MNAAAA	LQDAAA	VVVVxx
+2151	2456	1	3	1	11	51	151	151	2151	2151	102	103	TEAAAA	MQDAAA	AAAAxx
+4821	2457	1	1	1	1	21	821	821	4821	4821	42	43	LDAAAA	NQDAAA	HHHHxx
+6507	2458	1	3	7	7	7	507	507	1507	6507	14	15	HQAAAA	OQDAAA	OOOOxx
+8741	2459	1	1	1	1	41	741	741	3741	8741	82	83	FYAAAA	PQDAAA	VVVVxx
+6846	2460	0	2	6	6	46	846	846	1846	6846	92	93	IDAAAA	QQDAAA	AAAAxx
+4525	2461	1	1	5	5	25	525	525	4525	4525	50	51	BSAAAA	RQDAAA	HHHHxx
+8299	2462	1	3	9	19	99	299	299	3299	8299	198	199	FHAAAA	SQDAAA	OOOOxx
+5465	2463	1	1	5	5	65	465	1465	465	5465	130	131	FCAAAA	TQDAAA	VVVVxx
+7206	2464	0	2	6	6	6	206	1206	2206	7206	12	13	ERAAAA	UQDAAA	AAAAxx
+2616	2465	0	0	6	16	16	616	616	2616	2616	32	33	QWAAAA	VQDAAA	HHHHxx
+4440	2466	0	0	0	0	40	440	440	4440	4440	80	81	UOAAAA	WQDAAA	OOOOxx
+6109	2467	1	1	9	9	9	109	109	1109	6109	18	19	ZAAAAA	XQDAAA	VVVVxx
+7905	2468	1	1	5	5	5	905	1905	2905	7905	10	11	BSAAAA	YQDAAA	AAAAxx
+6498	2469	0	2	8	18	98	498	498	1498	6498	196	197	YPAAAA	ZQDAAA	HHHHxx
+2034	2470	0	2	4	14	34	34	34	2034	2034	68	69	GAAAAA	ARDAAA	OOOOxx
+7693	2471	1	1	3	13	93	693	1693	2693	7693	186	187	XJAAAA	BRDAAA	VVVVxx
+7511	2472	1	3	1	11	11	511	1511	2511	7511	22	23	XCAAAA	CRDAAA	AAAAxx
+7531	2473	1	3	1	11	31	531	1531	2531	7531	62	63	RDAAAA	DRDAAA	HHHHxx
+6869	2474	1	1	9	9	69	869	869	1869	6869	138	139	FEAAAA	ERDAAA	OOOOxx
+2763	2475	1	3	3	3	63	763	763	2763	2763	126	127	HCAAAA	FRDAAA	VVVVxx
+575	2476	1	3	5	15	75	575	575	575	575	150	151	DWAAAA	GRDAAA	AAAAxx
+8953	2477	1	1	3	13	53	953	953	3953	8953	106	107	JGAAAA	HRDAAA	HHHHxx
+5833	2478	1	1	3	13	33	833	1833	833	5833	66	67	JQAAAA	IRDAAA	OOOOxx
+9035	2479	1	3	5	15	35	35	1035	4035	9035	70	71	NJAAAA	JRDAAA	VVVVxx
+9123	2480	1	3	3	3	23	123	1123	4123	9123	46	47	XMAAAA	KRDAAA	AAAAxx
+206	2481	0	2	6	6	6	206	206	206	206	12	13	YHAAAA	LRDAAA	HHHHxx
+4155	2482	1	3	5	15	55	155	155	4155	4155	110	111	VDAAAA	MRDAAA	OOOOxx
+532	2483	0	0	2	12	32	532	532	532	532	64	65	MUAAAA	NRDAAA	VVVVxx
+1370	2484	0	2	0	10	70	370	1370	1370	1370	140	141	SAAAAA	ORDAAA	AAAAxx
+7656	2485	0	0	6	16	56	656	1656	2656	7656	112	113	MIAAAA	PRDAAA	HHHHxx
+7735	2486	1	3	5	15	35	735	1735	2735	7735	70	71	NLAAAA	QRDAAA	OOOOxx
+2118	2487	0	2	8	18	18	118	118	2118	2118	36	37	MDAAAA	RRDAAA	VVVVxx
+6914	2488	0	2	4	14	14	914	914	1914	6914	28	29	YFAAAA	SRDAAA	AAAAxx
+6277	2489	1	1	7	17	77	277	277	1277	6277	154	155	LHAAAA	TRDAAA	HHHHxx
+6347	2490	1	3	7	7	47	347	347	1347	6347	94	95	DKAAAA	URDAAA	OOOOxx
+4030	2491	0	2	0	10	30	30	30	4030	4030	60	61	AZAAAA	VRDAAA	VVVVxx
+9673	2492	1	1	3	13	73	673	1673	4673	9673	146	147	BIAAAA	WRDAAA	AAAAxx
+2015	2493	1	3	5	15	15	15	15	2015	2015	30	31	NZAAAA	XRDAAA	HHHHxx
+1317	2494	1	1	7	17	17	317	1317	1317	1317	34	35	RYAAAA	YRDAAA	OOOOxx
+404	2495	0	0	4	4	4	404	404	404	404	8	9	OPAAAA	ZRDAAA	VVVVxx
+1604	2496	0	0	4	4	4	604	1604	1604	1604	8	9	SJAAAA	ASDAAA	AAAAxx
+1912	2497	0	0	2	12	12	912	1912	1912	1912	24	25	OVAAAA	BSDAAA	HHHHxx
+5727	2498	1	3	7	7	27	727	1727	727	5727	54	55	HMAAAA	CSDAAA	OOOOxx
+4538	2499	0	2	8	18	38	538	538	4538	4538	76	77	OSAAAA	DSDAAA	VVVVxx
+6868	2500	0	0	8	8	68	868	868	1868	6868	136	137	EEAAAA	ESDAAA	AAAAxx
+9801	2501	1	1	1	1	1	801	1801	4801	9801	2	3	ZMAAAA	FSDAAA	HHHHxx
+1781	2502	1	1	1	1	81	781	1781	1781	1781	162	163	NQAAAA	GSDAAA	OOOOxx
+7061	2503	1	1	1	1	61	61	1061	2061	7061	122	123	PLAAAA	HSDAAA	VVVVxx
+2412	2504	0	0	2	12	12	412	412	2412	2412	24	25	UOAAAA	ISDAAA	AAAAxx
+9191	2505	1	3	1	11	91	191	1191	4191	9191	182	183	NPAAAA	JSDAAA	HHHHxx
+1958	2506	0	2	8	18	58	958	1958	1958	1958	116	117	IXAAAA	KSDAAA	OOOOxx
+2203	2507	1	3	3	3	3	203	203	2203	2203	6	7	TGAAAA	LSDAAA	VVVVxx
+9104	2508	0	0	4	4	4	104	1104	4104	9104	8	9	EMAAAA	MSDAAA	AAAAxx
+3837	2509	1	1	7	17	37	837	1837	3837	3837	74	75	PRAAAA	NSDAAA	HHHHxx
+7055	2510	1	3	5	15	55	55	1055	2055	7055	110	111	JLAAAA	OSDAAA	OOOOxx
+4612	2511	0	0	2	12	12	612	612	4612	4612	24	25	KVAAAA	PSDAAA	VVVVxx
+6420	2512	0	0	0	0	20	420	420	1420	6420	40	41	YMAAAA	QSDAAA	AAAAxx
+613	2513	1	1	3	13	13	613	613	613	613	26	27	PXAAAA	RSDAAA	HHHHxx
+1691	2514	1	3	1	11	91	691	1691	1691	1691	182	183	BNAAAA	SSDAAA	OOOOxx
+33	2515	1	1	3	13	33	33	33	33	33	66	67	HBAAAA	TSDAAA	VVVVxx
+875	2516	1	3	5	15	75	875	875	875	875	150	151	RHAAAA	USDAAA	AAAAxx
+9030	2517	0	2	0	10	30	30	1030	4030	9030	60	61	IJAAAA	VSDAAA	HHHHxx
+4285	2518	1	1	5	5	85	285	285	4285	4285	170	171	VIAAAA	WSDAAA	OOOOxx
+6236	2519	0	0	6	16	36	236	236	1236	6236	72	73	WFAAAA	XSDAAA	VVVVxx
+4702	2520	0	2	2	2	2	702	702	4702	4702	4	5	WYAAAA	YSDAAA	AAAAxx
+3441	2521	1	1	1	1	41	441	1441	3441	3441	82	83	JCAAAA	ZSDAAA	HHHHxx
+2150	2522	0	2	0	10	50	150	150	2150	2150	100	101	SEAAAA	ATDAAA	OOOOxx
+1852	2523	0	0	2	12	52	852	1852	1852	1852	104	105	GTAAAA	BTDAAA	VVVVxx
+7713	2524	1	1	3	13	13	713	1713	2713	7713	26	27	RKAAAA	CTDAAA	AAAAxx
+6849	2525	1	1	9	9	49	849	849	1849	6849	98	99	LDAAAA	DTDAAA	HHHHxx
+3425	2526	1	1	5	5	25	425	1425	3425	3425	50	51	TBAAAA	ETDAAA	OOOOxx
+4681	2527	1	1	1	1	81	681	681	4681	4681	162	163	BYAAAA	FTDAAA	VVVVxx
+1134	2528	0	2	4	14	34	134	1134	1134	1134	68	69	QRAAAA	GTDAAA	AAAAxx
+7462	2529	0	2	2	2	62	462	1462	2462	7462	124	125	ABAAAA	HTDAAA	HHHHxx
+2148	2530	0	0	8	8	48	148	148	2148	2148	96	97	QEAAAA	ITDAAA	OOOOxx
+5921	2531	1	1	1	1	21	921	1921	921	5921	42	43	TTAAAA	JTDAAA	VVVVxx
+118	2532	0	2	8	18	18	118	118	118	118	36	37	OEAAAA	KTDAAA	AAAAxx
+3065	2533	1	1	5	5	65	65	1065	3065	3065	130	131	XNAAAA	LTDAAA	HHHHxx
+6590	2534	0	2	0	10	90	590	590	1590	6590	180	181	MTAAAA	MTDAAA	OOOOxx
+4993	2535	1	1	3	13	93	993	993	4993	4993	186	187	BKAAAA	NTDAAA	VVVVxx
+6818	2536	0	2	8	18	18	818	818	1818	6818	36	37	GCAAAA	OTDAAA	AAAAxx
+1449	2537	1	1	9	9	49	449	1449	1449	1449	98	99	TDAAAA	PTDAAA	HHHHxx
+2039	2538	1	3	9	19	39	39	39	2039	2039	78	79	LAAAAA	QTDAAA	OOOOxx
+2524	2539	0	0	4	4	24	524	524	2524	2524	48	49	CTAAAA	RTDAAA	VVVVxx
+1481	2540	1	1	1	1	81	481	1481	1481	1481	162	163	ZEAAAA	STDAAA	AAAAxx
+6984	2541	0	0	4	4	84	984	984	1984	6984	168	169	QIAAAA	TTDAAA	HHHHxx
+3960	2542	0	0	0	0	60	960	1960	3960	3960	120	121	IWAAAA	UTDAAA	OOOOxx
+1983	2543	1	3	3	3	83	983	1983	1983	1983	166	167	HYAAAA	VTDAAA	VVVVxx
+6379	2544	1	3	9	19	79	379	379	1379	6379	158	159	JLAAAA	WTDAAA	AAAAxx
+8975	2545	1	3	5	15	75	975	975	3975	8975	150	151	FHAAAA	XTDAAA	HHHHxx
+1102	2546	0	2	2	2	2	102	1102	1102	1102	4	5	KQAAAA	YTDAAA	OOOOxx
+2517	2547	1	1	7	17	17	517	517	2517	2517	34	35	VSAAAA	ZTDAAA	VVVVxx
+712	2548	0	0	2	12	12	712	712	712	712	24	25	KBAAAA	AUDAAA	AAAAxx
+5419	2549	1	3	9	19	19	419	1419	419	5419	38	39	LAAAAA	BUDAAA	HHHHxx
+723	2550	1	3	3	3	23	723	723	723	723	46	47	VBAAAA	CUDAAA	OOOOxx
+8057	2551	1	1	7	17	57	57	57	3057	8057	114	115	XXAAAA	DUDAAA	VVVVxx
+7471	2552	1	3	1	11	71	471	1471	2471	7471	142	143	JBAAAA	EUDAAA	AAAAxx
+8855	2553	1	3	5	15	55	855	855	3855	8855	110	111	PCAAAA	FUDAAA	HHHHxx
+5074	2554	0	2	4	14	74	74	1074	74	5074	148	149	ENAAAA	GUDAAA	OOOOxx
+7139	2555	1	3	9	19	39	139	1139	2139	7139	78	79	POAAAA	HUDAAA	VVVVxx
+3833	2556	1	1	3	13	33	833	1833	3833	3833	66	67	LRAAAA	IUDAAA	AAAAxx
+5186	2557	0	2	6	6	86	186	1186	186	5186	172	173	MRAAAA	JUDAAA	HHHHxx
+9436	2558	0	0	6	16	36	436	1436	4436	9436	72	73	YYAAAA	KUDAAA	OOOOxx
+8859	2559	1	3	9	19	59	859	859	3859	8859	118	119	TCAAAA	LUDAAA	VVVVxx
+6943	2560	1	3	3	3	43	943	943	1943	6943	86	87	BHAAAA	MUDAAA	AAAAxx
+2315	2561	1	3	5	15	15	315	315	2315	2315	30	31	BLAAAA	NUDAAA	HHHHxx
+1394	2562	0	2	4	14	94	394	1394	1394	1394	188	189	QBAAAA	OUDAAA	OOOOxx
+8863	2563	1	3	3	3	63	863	863	3863	8863	126	127	XCAAAA	PUDAAA	VVVVxx
+8812	2564	0	0	2	12	12	812	812	3812	8812	24	25	YAAAAA	QUDAAA	AAAAxx
+7498	2565	0	2	8	18	98	498	1498	2498	7498	196	197	KCAAAA	RUDAAA	HHHHxx
+8962	2566	0	2	2	2	62	962	962	3962	8962	124	125	SGAAAA	SUDAAA	OOOOxx
+2533	2567	1	1	3	13	33	533	533	2533	2533	66	67	LTAAAA	TUDAAA	VVVVxx
+8188	2568	0	0	8	8	88	188	188	3188	8188	176	177	YCAAAA	UUDAAA	AAAAxx
+6137	2569	1	1	7	17	37	137	137	1137	6137	74	75	BCAAAA	VUDAAA	HHHHxx
+974	2570	0	2	4	14	74	974	974	974	974	148	149	MLAAAA	WUDAAA	OOOOxx
+2751	2571	1	3	1	11	51	751	751	2751	2751	102	103	VBAAAA	XUDAAA	VVVVxx
+4975	2572	1	3	5	15	75	975	975	4975	4975	150	151	JJAAAA	YUDAAA	AAAAxx
+3411	2573	1	3	1	11	11	411	1411	3411	3411	22	23	FBAAAA	ZUDAAA	HHHHxx
+3143	2574	1	3	3	3	43	143	1143	3143	3143	86	87	XQAAAA	AVDAAA	OOOOxx
+8011	2575	1	3	1	11	11	11	11	3011	8011	22	23	DWAAAA	BVDAAA	VVVVxx
+988	2576	0	0	8	8	88	988	988	988	988	176	177	AMAAAA	CVDAAA	AAAAxx
+4289	2577	1	1	9	9	89	289	289	4289	4289	178	179	ZIAAAA	DVDAAA	HHHHxx
+8105	2578	1	1	5	5	5	105	105	3105	8105	10	11	TZAAAA	EVDAAA	OOOOxx
+9885	2579	1	1	5	5	85	885	1885	4885	9885	170	171	FQAAAA	FVDAAA	VVVVxx
+1002	2580	0	2	2	2	2	2	1002	1002	1002	4	5	OMAAAA	GVDAAA	AAAAxx
+5827	2581	1	3	7	7	27	827	1827	827	5827	54	55	DQAAAA	HVDAAA	HHHHxx
+1228	2582	0	0	8	8	28	228	1228	1228	1228	56	57	GVAAAA	IVDAAA	OOOOxx
+6352	2583	0	0	2	12	52	352	352	1352	6352	104	105	IKAAAA	JVDAAA	VVVVxx
+8868	2584	0	0	8	8	68	868	868	3868	8868	136	137	CDAAAA	KVDAAA	AAAAxx
+3643	2585	1	3	3	3	43	643	1643	3643	3643	86	87	DKAAAA	LVDAAA	HHHHxx
+1468	2586	0	0	8	8	68	468	1468	1468	1468	136	137	MEAAAA	MVDAAA	OOOOxx
+8415	2587	1	3	5	15	15	415	415	3415	8415	30	31	RLAAAA	NVDAAA	VVVVxx
+9631	2588	1	3	1	11	31	631	1631	4631	9631	62	63	LGAAAA	OVDAAA	AAAAxx
+7408	2589	0	0	8	8	8	408	1408	2408	7408	16	17	YYAAAA	PVDAAA	HHHHxx
+1934	2590	0	2	4	14	34	934	1934	1934	1934	68	69	KWAAAA	QVDAAA	OOOOxx
+996	2591	0	0	6	16	96	996	996	996	996	192	193	IMAAAA	RVDAAA	VVVVxx
+8027	2592	1	3	7	7	27	27	27	3027	8027	54	55	TWAAAA	SVDAAA	AAAAxx
+8464	2593	0	0	4	4	64	464	464	3464	8464	128	129	ONAAAA	TVDAAA	HHHHxx
+5007	2594	1	3	7	7	7	7	1007	7	5007	14	15	PKAAAA	UVDAAA	OOOOxx
+8356	2595	0	0	6	16	56	356	356	3356	8356	112	113	KJAAAA	VVDAAA	VVVVxx
+4579	2596	1	3	9	19	79	579	579	4579	4579	158	159	DUAAAA	WVDAAA	AAAAxx
+8513	2597	1	1	3	13	13	513	513	3513	8513	26	27	LPAAAA	XVDAAA	HHHHxx
+383	2598	1	3	3	3	83	383	383	383	383	166	167	TOAAAA	YVDAAA	OOOOxx
+9304	2599	0	0	4	4	4	304	1304	4304	9304	8	9	WTAAAA	ZVDAAA	VVVVxx
+7224	2600	0	0	4	4	24	224	1224	2224	7224	48	49	WRAAAA	AWDAAA	AAAAxx
+6023	2601	1	3	3	3	23	23	23	1023	6023	46	47	RXAAAA	BWDAAA	HHHHxx
+2746	2602	0	2	6	6	46	746	746	2746	2746	92	93	QBAAAA	CWDAAA	OOOOxx
+137	2603	1	1	7	17	37	137	137	137	137	74	75	HFAAAA	DWDAAA	VVVVxx
+9441	2604	1	1	1	1	41	441	1441	4441	9441	82	83	DZAAAA	EWDAAA	AAAAxx
+3690	2605	0	2	0	10	90	690	1690	3690	3690	180	181	YLAAAA	FWDAAA	HHHHxx
+913	2606	1	1	3	13	13	913	913	913	913	26	27	DJAAAA	GWDAAA	OOOOxx
+1768	2607	0	0	8	8	68	768	1768	1768	1768	136	137	AQAAAA	HWDAAA	VVVVxx
+8492	2608	0	0	2	12	92	492	492	3492	8492	184	185	QOAAAA	IWDAAA	AAAAxx
+8083	2609	1	3	3	3	83	83	83	3083	8083	166	167	XYAAAA	JWDAAA	HHHHxx
+4609	2610	1	1	9	9	9	609	609	4609	4609	18	19	HVAAAA	KWDAAA	OOOOxx
+7520	2611	0	0	0	0	20	520	1520	2520	7520	40	41	GDAAAA	LWDAAA	VVVVxx
+4231	2612	1	3	1	11	31	231	231	4231	4231	62	63	TGAAAA	MWDAAA	AAAAxx
+6022	2613	0	2	2	2	22	22	22	1022	6022	44	45	QXAAAA	NWDAAA	HHHHxx
+9784	2614	0	0	4	4	84	784	1784	4784	9784	168	169	IMAAAA	OWDAAA	OOOOxx
+1343	2615	1	3	3	3	43	343	1343	1343	1343	86	87	RZAAAA	PWDAAA	VVVVxx
+7549	2616	1	1	9	9	49	549	1549	2549	7549	98	99	JEAAAA	QWDAAA	AAAAxx
+269	2617	1	1	9	9	69	269	269	269	269	138	139	JKAAAA	RWDAAA	HHHHxx
+1069	2618	1	1	9	9	69	69	1069	1069	1069	138	139	DPAAAA	SWDAAA	OOOOxx
+4610	2619	0	2	0	10	10	610	610	4610	4610	20	21	IVAAAA	TWDAAA	VVVVxx
+482	2620	0	2	2	2	82	482	482	482	482	164	165	OSAAAA	UWDAAA	AAAAxx
+3025	2621	1	1	5	5	25	25	1025	3025	3025	50	51	JMAAAA	VWDAAA	HHHHxx
+7914	2622	0	2	4	14	14	914	1914	2914	7914	28	29	KSAAAA	WWDAAA	OOOOxx
+3198	2623	0	2	8	18	98	198	1198	3198	3198	196	197	ATAAAA	XWDAAA	VVVVxx
+1187	2624	1	3	7	7	87	187	1187	1187	1187	174	175	RTAAAA	YWDAAA	AAAAxx
+4707	2625	1	3	7	7	7	707	707	4707	4707	14	15	BZAAAA	ZWDAAA	HHHHxx
+8279	2626	1	3	9	19	79	279	279	3279	8279	158	159	LGAAAA	AXDAAA	OOOOxx
+6127	2627	1	3	7	7	27	127	127	1127	6127	54	55	RBAAAA	BXDAAA	VVVVxx
+1305	2628	1	1	5	5	5	305	1305	1305	1305	10	11	FYAAAA	CXDAAA	AAAAxx
+4804	2629	0	0	4	4	4	804	804	4804	4804	8	9	UCAAAA	DXDAAA	HHHHxx
+6069	2630	1	1	9	9	69	69	69	1069	6069	138	139	LZAAAA	EXDAAA	OOOOxx
+9229	2631	1	1	9	9	29	229	1229	4229	9229	58	59	ZQAAAA	FXDAAA	VVVVxx
+4703	2632	1	3	3	3	3	703	703	4703	4703	6	7	XYAAAA	GXDAAA	AAAAxx
+6410	2633	0	2	0	10	10	410	410	1410	6410	20	21	OMAAAA	HXDAAA	HHHHxx
+944	2634	0	0	4	4	44	944	944	944	944	88	89	IKAAAA	IXDAAA	OOOOxx
+3744	2635	0	0	4	4	44	744	1744	3744	3744	88	89	AOAAAA	JXDAAA	VVVVxx
+1127	2636	1	3	7	7	27	127	1127	1127	1127	54	55	JRAAAA	KXDAAA	AAAAxx
+6693	2637	1	1	3	13	93	693	693	1693	6693	186	187	LXAAAA	LXDAAA	HHHHxx
+583	2638	1	3	3	3	83	583	583	583	583	166	167	LWAAAA	MXDAAA	OOOOxx
+2684	2639	0	0	4	4	84	684	684	2684	2684	168	169	GZAAAA	NXDAAA	VVVVxx
+6192	2640	0	0	2	12	92	192	192	1192	6192	184	185	EEAAAA	OXDAAA	AAAAxx
+4157	2641	1	1	7	17	57	157	157	4157	4157	114	115	XDAAAA	PXDAAA	HHHHxx
+6470	2642	0	2	0	10	70	470	470	1470	6470	140	141	WOAAAA	QXDAAA	OOOOxx
+8965	2643	1	1	5	5	65	965	965	3965	8965	130	131	VGAAAA	RXDAAA	VVVVxx
+1433	2644	1	1	3	13	33	433	1433	1433	1433	66	67	DDAAAA	SXDAAA	AAAAxx
+4570	2645	0	2	0	10	70	570	570	4570	4570	140	141	UTAAAA	TXDAAA	HHHHxx
+1806	2646	0	2	6	6	6	806	1806	1806	1806	12	13	MRAAAA	UXDAAA	OOOOxx
+1230	2647	0	2	0	10	30	230	1230	1230	1230	60	61	IVAAAA	VXDAAA	VVVVxx
+2283	2648	1	3	3	3	83	283	283	2283	2283	166	167	VJAAAA	WXDAAA	AAAAxx
+6456	2649	0	0	6	16	56	456	456	1456	6456	112	113	IOAAAA	XXDAAA	HHHHxx
+7427	2650	1	3	7	7	27	427	1427	2427	7427	54	55	RZAAAA	YXDAAA	OOOOxx
+8310	2651	0	2	0	10	10	310	310	3310	8310	20	21	QHAAAA	ZXDAAA	VVVVxx
+8103	2652	1	3	3	3	3	103	103	3103	8103	6	7	RZAAAA	AYDAAA	AAAAxx
+3947	2653	1	3	7	7	47	947	1947	3947	3947	94	95	VVAAAA	BYDAAA	HHHHxx
+3414	2654	0	2	4	14	14	414	1414	3414	3414	28	29	IBAAAA	CYDAAA	OOOOxx
+2043	2655	1	3	3	3	43	43	43	2043	2043	86	87	PAAAAA	DYDAAA	VVVVxx
+4393	2656	1	1	3	13	93	393	393	4393	4393	186	187	ZMAAAA	EYDAAA	AAAAxx
+6664	2657	0	0	4	4	64	664	664	1664	6664	128	129	IWAAAA	FYDAAA	HHHHxx
+4545	2658	1	1	5	5	45	545	545	4545	4545	90	91	VSAAAA	GYDAAA	OOOOxx
+7637	2659	1	1	7	17	37	637	1637	2637	7637	74	75	THAAAA	HYDAAA	VVVVxx
+1359	2660	1	3	9	19	59	359	1359	1359	1359	118	119	HAAAAA	IYDAAA	AAAAxx
+5018	2661	0	2	8	18	18	18	1018	18	5018	36	37	ALAAAA	JYDAAA	HHHHxx
+987	2662	1	3	7	7	87	987	987	987	987	174	175	ZLAAAA	KYDAAA	OOOOxx
+1320	2663	0	0	0	0	20	320	1320	1320	1320	40	41	UYAAAA	LYDAAA	VVVVxx
+9311	2664	1	3	1	11	11	311	1311	4311	9311	22	23	DUAAAA	MYDAAA	AAAAxx
+7993	2665	1	1	3	13	93	993	1993	2993	7993	186	187	LVAAAA	NYDAAA	HHHHxx
+7588	2666	0	0	8	8	88	588	1588	2588	7588	176	177	WFAAAA	OYDAAA	OOOOxx
+5983	2667	1	3	3	3	83	983	1983	983	5983	166	167	DWAAAA	PYDAAA	VVVVxx
+4070	2668	0	2	0	10	70	70	70	4070	4070	140	141	OAAAAA	QYDAAA	AAAAxx
+8349	2669	1	1	9	9	49	349	349	3349	8349	98	99	DJAAAA	RYDAAA	HHHHxx
+3810	2670	0	2	0	10	10	810	1810	3810	3810	20	21	OQAAAA	SYDAAA	OOOOxx
+6948	2671	0	0	8	8	48	948	948	1948	6948	96	97	GHAAAA	TYDAAA	VVVVxx
+7153	2672	1	1	3	13	53	153	1153	2153	7153	106	107	DPAAAA	UYDAAA	AAAAxx
+5371	2673	1	3	1	11	71	371	1371	371	5371	142	143	PYAAAA	VYDAAA	HHHHxx
+8316	2674	0	0	6	16	16	316	316	3316	8316	32	33	WHAAAA	WYDAAA	OOOOxx
+5903	2675	1	3	3	3	3	903	1903	903	5903	6	7	BTAAAA	XYDAAA	VVVVxx
+6718	2676	0	2	8	18	18	718	718	1718	6718	36	37	KYAAAA	YYDAAA	AAAAxx
+4759	2677	1	3	9	19	59	759	759	4759	4759	118	119	BBAAAA	ZYDAAA	HHHHxx
+2555	2678	1	3	5	15	55	555	555	2555	2555	110	111	HUAAAA	AZDAAA	OOOOxx
+3457	2679	1	1	7	17	57	457	1457	3457	3457	114	115	ZCAAAA	BZDAAA	VVVVxx
+9626	2680	0	2	6	6	26	626	1626	4626	9626	52	53	GGAAAA	CZDAAA	AAAAxx
+2570	2681	0	2	0	10	70	570	570	2570	2570	140	141	WUAAAA	DZDAAA	HHHHxx
+7964	2682	0	0	4	4	64	964	1964	2964	7964	128	129	IUAAAA	EZDAAA	OOOOxx
+1543	2683	1	3	3	3	43	543	1543	1543	1543	86	87	JHAAAA	FZDAAA	VVVVxx
+929	2684	1	1	9	9	29	929	929	929	929	58	59	TJAAAA	GZDAAA	AAAAxx
+9244	2685	0	0	4	4	44	244	1244	4244	9244	88	89	ORAAAA	HZDAAA	HHHHxx
+9210	2686	0	2	0	10	10	210	1210	4210	9210	20	21	GQAAAA	IZDAAA	OOOOxx
+8334	2687	0	2	4	14	34	334	334	3334	8334	68	69	OIAAAA	JZDAAA	VVVVxx
+9310	2688	0	2	0	10	10	310	1310	4310	9310	20	21	CUAAAA	KZDAAA	AAAAxx
+5024	2689	0	0	4	4	24	24	1024	24	5024	48	49	GLAAAA	LZDAAA	HHHHxx
+8794	2690	0	2	4	14	94	794	794	3794	8794	188	189	GAAAAA	MZDAAA	OOOOxx
+4091	2691	1	3	1	11	91	91	91	4091	4091	182	183	JBAAAA	NZDAAA	VVVVxx
+649	2692	1	1	9	9	49	649	649	649	649	98	99	ZYAAAA	OZDAAA	AAAAxx
+8505	2693	1	1	5	5	5	505	505	3505	8505	10	11	DPAAAA	PZDAAA	HHHHxx
+6652	2694	0	0	2	12	52	652	652	1652	6652	104	105	WVAAAA	QZDAAA	OOOOxx
+8945	2695	1	1	5	5	45	945	945	3945	8945	90	91	BGAAAA	RZDAAA	VVVVxx
+2095	2696	1	3	5	15	95	95	95	2095	2095	190	191	PCAAAA	SZDAAA	AAAAxx
+8676	2697	0	0	6	16	76	676	676	3676	8676	152	153	SVAAAA	TZDAAA	HHHHxx
+3994	2698	0	2	4	14	94	994	1994	3994	3994	188	189	QXAAAA	UZDAAA	OOOOxx
+2859	2699	1	3	9	19	59	859	859	2859	2859	118	119	ZFAAAA	VZDAAA	VVVVxx
+5403	2700	1	3	3	3	3	403	1403	403	5403	6	7	VZAAAA	WZDAAA	AAAAxx
+3254	2701	0	2	4	14	54	254	1254	3254	3254	108	109	EVAAAA	XZDAAA	HHHHxx
+7339	2702	1	3	9	19	39	339	1339	2339	7339	78	79	HWAAAA	YZDAAA	OOOOxx
+7220	2703	0	0	0	0	20	220	1220	2220	7220	40	41	SRAAAA	ZZDAAA	VVVVxx
+4154	2704	0	2	4	14	54	154	154	4154	4154	108	109	UDAAAA	AAEAAA	AAAAxx
+7570	2705	0	2	0	10	70	570	1570	2570	7570	140	141	EFAAAA	BAEAAA	HHHHxx
+2576	2706	0	0	6	16	76	576	576	2576	2576	152	153	CVAAAA	CAEAAA	OOOOxx
+5764	2707	0	0	4	4	64	764	1764	764	5764	128	129	SNAAAA	DAEAAA	VVVVxx
+4314	2708	0	2	4	14	14	314	314	4314	4314	28	29	YJAAAA	EAEAAA	AAAAxx
+2274	2709	0	2	4	14	74	274	274	2274	2274	148	149	MJAAAA	FAEAAA	HHHHxx
+9756	2710	0	0	6	16	56	756	1756	4756	9756	112	113	GLAAAA	GAEAAA	OOOOxx
+8274	2711	0	2	4	14	74	274	274	3274	8274	148	149	GGAAAA	HAEAAA	VVVVxx
+1289	2712	1	1	9	9	89	289	1289	1289	1289	178	179	PXAAAA	IAEAAA	AAAAxx
+7335	2713	1	3	5	15	35	335	1335	2335	7335	70	71	DWAAAA	JAEAAA	HHHHxx
+5351	2714	1	3	1	11	51	351	1351	351	5351	102	103	VXAAAA	KAEAAA	OOOOxx
+8978	2715	0	2	8	18	78	978	978	3978	8978	156	157	IHAAAA	LAEAAA	VVVVxx
+2	2716	0	2	2	2	2	2	2	2	2	4	5	CAAAAA	MAEAAA	AAAAxx
+8906	2717	0	2	6	6	6	906	906	3906	8906	12	13	OEAAAA	NAEAAA	HHHHxx
+6388	2718	0	0	8	8	88	388	388	1388	6388	176	177	SLAAAA	OAEAAA	OOOOxx
+5675	2719	1	3	5	15	75	675	1675	675	5675	150	151	HKAAAA	PAEAAA	VVVVxx
+255	2720	1	3	5	15	55	255	255	255	255	110	111	VJAAAA	QAEAAA	AAAAxx
+9538	2721	0	2	8	18	38	538	1538	4538	9538	76	77	WCAAAA	RAEAAA	HHHHxx
+1480	2722	0	0	0	0	80	480	1480	1480	1480	160	161	YEAAAA	SAEAAA	OOOOxx
+4015	2723	1	3	5	15	15	15	15	4015	4015	30	31	LYAAAA	TAEAAA	VVVVxx
+5166	2724	0	2	6	6	66	166	1166	166	5166	132	133	SQAAAA	UAEAAA	AAAAxx
+91	2725	1	3	1	11	91	91	91	91	91	182	183	NDAAAA	VAEAAA	HHHHxx
+2958	2726	0	2	8	18	58	958	958	2958	2958	116	117	UJAAAA	WAEAAA	OOOOxx
+9131	2727	1	3	1	11	31	131	1131	4131	9131	62	63	FNAAAA	XAEAAA	VVVVxx
+3944	2728	0	0	4	4	44	944	1944	3944	3944	88	89	SVAAAA	YAEAAA	AAAAxx
+4514	2729	0	2	4	14	14	514	514	4514	4514	28	29	QRAAAA	ZAEAAA	HHHHxx
+5661	2730	1	1	1	1	61	661	1661	661	5661	122	123	TJAAAA	ABEAAA	OOOOxx
+8724	2731	0	0	4	4	24	724	724	3724	8724	48	49	OXAAAA	BBEAAA	VVVVxx
+6408	2732	0	0	8	8	8	408	408	1408	6408	16	17	MMAAAA	CBEAAA	AAAAxx
+5013	2733	1	1	3	13	13	13	1013	13	5013	26	27	VKAAAA	DBEAAA	HHHHxx
+6156	2734	0	0	6	16	56	156	156	1156	6156	112	113	UCAAAA	EBEAAA	OOOOxx
+7350	2735	0	2	0	10	50	350	1350	2350	7350	100	101	SWAAAA	FBEAAA	VVVVxx
+9858	2736	0	2	8	18	58	858	1858	4858	9858	116	117	EPAAAA	GBEAAA	AAAAxx
+895	2737	1	3	5	15	95	895	895	895	895	190	191	LIAAAA	HBEAAA	HHHHxx
+8368	2738	0	0	8	8	68	368	368	3368	8368	136	137	WJAAAA	IBEAAA	OOOOxx
+179	2739	1	3	9	19	79	179	179	179	179	158	159	XGAAAA	JBEAAA	VVVVxx
+4048	2740	0	0	8	8	48	48	48	4048	4048	96	97	SZAAAA	KBEAAA	AAAAxx
+3073	2741	1	1	3	13	73	73	1073	3073	3073	146	147	FOAAAA	LBEAAA	HHHHxx
+321	2742	1	1	1	1	21	321	321	321	321	42	43	JMAAAA	MBEAAA	OOOOxx
+5352	2743	0	0	2	12	52	352	1352	352	5352	104	105	WXAAAA	NBEAAA	VVVVxx
+1940	2744	0	0	0	0	40	940	1940	1940	1940	80	81	QWAAAA	OBEAAA	AAAAxx
+8803	2745	1	3	3	3	3	803	803	3803	8803	6	7	PAAAAA	PBEAAA	HHHHxx
+791	2746	1	3	1	11	91	791	791	791	791	182	183	LEAAAA	QBEAAA	OOOOxx
+9809	2747	1	1	9	9	9	809	1809	4809	9809	18	19	HNAAAA	RBEAAA	VVVVxx
+5519	2748	1	3	9	19	19	519	1519	519	5519	38	39	HEAAAA	SBEAAA	AAAAxx
+7420	2749	0	0	0	0	20	420	1420	2420	7420	40	41	KZAAAA	TBEAAA	HHHHxx
+7541	2750	1	1	1	1	41	541	1541	2541	7541	82	83	BEAAAA	UBEAAA	OOOOxx
+6538	2751	0	2	8	18	38	538	538	1538	6538	76	77	MRAAAA	VBEAAA	VVVVxx
+710	2752	0	2	0	10	10	710	710	710	710	20	21	IBAAAA	WBEAAA	AAAAxx
+9488	2753	0	0	8	8	88	488	1488	4488	9488	176	177	YAAAAA	XBEAAA	HHHHxx
+3135	2754	1	3	5	15	35	135	1135	3135	3135	70	71	PQAAAA	YBEAAA	OOOOxx
+4273	2755	1	1	3	13	73	273	273	4273	4273	146	147	JIAAAA	ZBEAAA	VVVVxx
+629	2756	1	1	9	9	29	629	629	629	629	58	59	FYAAAA	ACEAAA	AAAAxx
+9167	2757	1	3	7	7	67	167	1167	4167	9167	134	135	POAAAA	BCEAAA	HHHHxx
+751	2758	1	3	1	11	51	751	751	751	751	102	103	XCAAAA	CCEAAA	OOOOxx
+1126	2759	0	2	6	6	26	126	1126	1126	1126	52	53	IRAAAA	DCEAAA	VVVVxx
+3724	2760	0	0	4	4	24	724	1724	3724	3724	48	49	GNAAAA	ECEAAA	AAAAxx
+1789	2761	1	1	9	9	89	789	1789	1789	1789	178	179	VQAAAA	FCEAAA	HHHHxx
+792	2762	0	0	2	12	92	792	792	792	792	184	185	MEAAAA	GCEAAA	OOOOxx
+2771	2763	1	3	1	11	71	771	771	2771	2771	142	143	PCAAAA	HCEAAA	VVVVxx
+4313	2764	1	1	3	13	13	313	313	4313	4313	26	27	XJAAAA	ICEAAA	AAAAxx
+9312	2765	0	0	2	12	12	312	1312	4312	9312	24	25	EUAAAA	JCEAAA	HHHHxx
+955	2766	1	3	5	15	55	955	955	955	955	110	111	TKAAAA	KCEAAA	OOOOxx
+6382	2767	0	2	2	2	82	382	382	1382	6382	164	165	MLAAAA	LCEAAA	VVVVxx
+7875	2768	1	3	5	15	75	875	1875	2875	7875	150	151	XQAAAA	MCEAAA	AAAAxx
+7491	2769	1	3	1	11	91	491	1491	2491	7491	182	183	DCAAAA	NCEAAA	HHHHxx
+8193	2770	1	1	3	13	93	193	193	3193	8193	186	187	DDAAAA	OCEAAA	OOOOxx
+968	2771	0	0	8	8	68	968	968	968	968	136	137	GLAAAA	PCEAAA	VVVVxx
+4951	2772	1	3	1	11	51	951	951	4951	4951	102	103	LIAAAA	QCEAAA	AAAAxx
+2204	2773	0	0	4	4	4	204	204	2204	2204	8	9	UGAAAA	RCEAAA	HHHHxx
+2066	2774	0	2	6	6	66	66	66	2066	2066	132	133	MBAAAA	SCEAAA	OOOOxx
+2631	2775	1	3	1	11	31	631	631	2631	2631	62	63	FXAAAA	TCEAAA	VVVVxx
+8947	2776	1	3	7	7	47	947	947	3947	8947	94	95	DGAAAA	UCEAAA	AAAAxx
+8033	2777	1	1	3	13	33	33	33	3033	8033	66	67	ZWAAAA	VCEAAA	HHHHxx
+6264	2778	0	0	4	4	64	264	264	1264	6264	128	129	YGAAAA	WCEAAA	OOOOxx
+7778	2779	0	2	8	18	78	778	1778	2778	7778	156	157	ENAAAA	XCEAAA	VVVVxx
+9701	2780	1	1	1	1	1	701	1701	4701	9701	2	3	DJAAAA	YCEAAA	AAAAxx
+5091	2781	1	3	1	11	91	91	1091	91	5091	182	183	VNAAAA	ZCEAAA	HHHHxx
+7577	2782	1	1	7	17	77	577	1577	2577	7577	154	155	LFAAAA	ADEAAA	OOOOxx
+3345	2783	1	1	5	5	45	345	1345	3345	3345	90	91	RYAAAA	BDEAAA	VVVVxx
+7329	2784	1	1	9	9	29	329	1329	2329	7329	58	59	XVAAAA	CDEAAA	AAAAxx
+7551	2785	1	3	1	11	51	551	1551	2551	7551	102	103	LEAAAA	DDEAAA	HHHHxx
+6207	2786	1	3	7	7	7	207	207	1207	6207	14	15	TEAAAA	EDEAAA	OOOOxx
+8664	2787	0	0	4	4	64	664	664	3664	8664	128	129	GVAAAA	FDEAAA	VVVVxx
+8394	2788	0	2	4	14	94	394	394	3394	8394	188	189	WKAAAA	GDEAAA	AAAAxx
+7324	2789	0	0	4	4	24	324	1324	2324	7324	48	49	SVAAAA	HDEAAA	HHHHxx
+2713	2790	1	1	3	13	13	713	713	2713	2713	26	27	JAAAAA	IDEAAA	OOOOxx
+2230	2791	0	2	0	10	30	230	230	2230	2230	60	61	UHAAAA	JDEAAA	VVVVxx
+9211	2792	1	3	1	11	11	211	1211	4211	9211	22	23	HQAAAA	KDEAAA	AAAAxx
+1296	2793	0	0	6	16	96	296	1296	1296	1296	192	193	WXAAAA	LDEAAA	HHHHxx
+8104	2794	0	0	4	4	4	104	104	3104	8104	8	9	SZAAAA	MDEAAA	OOOOxx
+6916	2795	0	0	6	16	16	916	916	1916	6916	32	33	AGAAAA	NDEAAA	VVVVxx
+2208	2796	0	0	8	8	8	208	208	2208	2208	16	17	YGAAAA	ODEAAA	AAAAxx
+3935	2797	1	3	5	15	35	935	1935	3935	3935	70	71	JVAAAA	PDEAAA	HHHHxx
+7814	2798	0	2	4	14	14	814	1814	2814	7814	28	29	OOAAAA	QDEAAA	OOOOxx
+6508	2799	0	0	8	8	8	508	508	1508	6508	16	17	IQAAAA	RDEAAA	VVVVxx
+1703	2800	1	3	3	3	3	703	1703	1703	1703	6	7	NNAAAA	SDEAAA	AAAAxx
+5640	2801	0	0	0	0	40	640	1640	640	5640	80	81	YIAAAA	TDEAAA	HHHHxx
+6417	2802	1	1	7	17	17	417	417	1417	6417	34	35	VMAAAA	UDEAAA	OOOOxx
+1713	2803	1	1	3	13	13	713	1713	1713	1713	26	27	XNAAAA	VDEAAA	VVVVxx
+5309	2804	1	1	9	9	9	309	1309	309	5309	18	19	FWAAAA	WDEAAA	AAAAxx
+4364	2805	0	0	4	4	64	364	364	4364	4364	128	129	WLAAAA	XDEAAA	HHHHxx
+619	2806	1	3	9	19	19	619	619	619	619	38	39	VXAAAA	YDEAAA	OOOOxx
+9498	2807	0	2	8	18	98	498	1498	4498	9498	196	197	IBAAAA	ZDEAAA	VVVVxx
+2804	2808	0	0	4	4	4	804	804	2804	2804	8	9	WDAAAA	AEEAAA	AAAAxx
+2220	2809	0	0	0	0	20	220	220	2220	2220	40	41	KHAAAA	BEEAAA	HHHHxx
+9542	2810	0	2	2	2	42	542	1542	4542	9542	84	85	ADAAAA	CEEAAA	OOOOxx
+3349	2811	1	1	9	9	49	349	1349	3349	3349	98	99	VYAAAA	DEEAAA	VVVVxx
+9198	2812	0	2	8	18	98	198	1198	4198	9198	196	197	UPAAAA	EEEAAA	AAAAxx
+2727	2813	1	3	7	7	27	727	727	2727	2727	54	55	XAAAAA	FEEAAA	HHHHxx
+3768	2814	0	0	8	8	68	768	1768	3768	3768	136	137	YOAAAA	GEEAAA	OOOOxx
+2334	2815	0	2	4	14	34	334	334	2334	2334	68	69	ULAAAA	HEEAAA	VVVVxx
+7770	2816	0	2	0	10	70	770	1770	2770	7770	140	141	WMAAAA	IEEAAA	AAAAxx
+5963	2817	1	3	3	3	63	963	1963	963	5963	126	127	JVAAAA	JEEAAA	HHHHxx
+4732	2818	0	0	2	12	32	732	732	4732	4732	64	65	AAAAAA	KEEAAA	OOOOxx
+2448	2819	0	0	8	8	48	448	448	2448	2448	96	97	EQAAAA	LEEAAA	VVVVxx
+5998	2820	0	2	8	18	98	998	1998	998	5998	196	197	SWAAAA	MEEAAA	AAAAxx
+8577	2821	1	1	7	17	77	577	577	3577	8577	154	155	XRAAAA	NEEAAA	HHHHxx
+266	2822	0	2	6	6	66	266	266	266	266	132	133	GKAAAA	OEEAAA	OOOOxx
+2169	2823	1	1	9	9	69	169	169	2169	2169	138	139	LFAAAA	PEEAAA	VVVVxx
+8228	2824	0	0	8	8	28	228	228	3228	8228	56	57	MEAAAA	QEEAAA	AAAAxx
+4813	2825	1	1	3	13	13	813	813	4813	4813	26	27	DDAAAA	REEAAA	HHHHxx
+2769	2826	1	1	9	9	69	769	769	2769	2769	138	139	NCAAAA	SEEAAA	OOOOxx
+8382	2827	0	2	2	2	82	382	382	3382	8382	164	165	KKAAAA	TEEAAA	VVVVxx
+1717	2828	1	1	7	17	17	717	1717	1717	1717	34	35	BOAAAA	UEEAAA	AAAAxx
+7178	2829	0	2	8	18	78	178	1178	2178	7178	156	157	CQAAAA	VEEAAA	HHHHxx
+9547	2830	1	3	7	7	47	547	1547	4547	9547	94	95	FDAAAA	WEEAAA	OOOOxx
+8187	2831	1	3	7	7	87	187	187	3187	8187	174	175	XCAAAA	XEEAAA	VVVVxx
+3168	2832	0	0	8	8	68	168	1168	3168	3168	136	137	WRAAAA	YEEAAA	AAAAxx
+2180	2833	0	0	0	0	80	180	180	2180	2180	160	161	WFAAAA	ZEEAAA	HHHHxx
+859	2834	1	3	9	19	59	859	859	859	859	118	119	BHAAAA	AFEAAA	OOOOxx
+1554	2835	0	2	4	14	54	554	1554	1554	1554	108	109	UHAAAA	BFEAAA	VVVVxx
+3567	2836	1	3	7	7	67	567	1567	3567	3567	134	135	FHAAAA	CFEAAA	AAAAxx
+5985	2837	1	1	5	5	85	985	1985	985	5985	170	171	FWAAAA	DFEAAA	HHHHxx
+1	2838	1	1	1	1	1	1	1	1	1	2	3	BAAAAA	EFEAAA	OOOOxx
+5937	2839	1	1	7	17	37	937	1937	937	5937	74	75	JUAAAA	FFEAAA	VVVVxx
+7594	2840	0	2	4	14	94	594	1594	2594	7594	188	189	CGAAAA	GFEAAA	AAAAxx
+3783	2841	1	3	3	3	83	783	1783	3783	3783	166	167	NPAAAA	HFEAAA	HHHHxx
+6841	2842	1	1	1	1	41	841	841	1841	6841	82	83	DDAAAA	IFEAAA	OOOOxx
+9694	2843	0	2	4	14	94	694	1694	4694	9694	188	189	WIAAAA	JFEAAA	VVVVxx
+4322	2844	0	2	2	2	22	322	322	4322	4322	44	45	GKAAAA	KFEAAA	AAAAxx
+6012	2845	0	0	2	12	12	12	12	1012	6012	24	25	GXAAAA	LFEAAA	HHHHxx
+108	2846	0	0	8	8	8	108	108	108	108	16	17	EEAAAA	MFEAAA	OOOOxx
+3396	2847	0	0	6	16	96	396	1396	3396	3396	192	193	QAAAAA	NFEAAA	VVVVxx
+8643	2848	1	3	3	3	43	643	643	3643	8643	86	87	LUAAAA	OFEAAA	AAAAxx
+6087	2849	1	3	7	7	87	87	87	1087	6087	174	175	DAAAAA	PFEAAA	HHHHxx
+2629	2850	1	1	9	9	29	629	629	2629	2629	58	59	DXAAAA	QFEAAA	OOOOxx
+3009	2851	1	1	9	9	9	9	1009	3009	3009	18	19	TLAAAA	RFEAAA	VVVVxx
+438	2852	0	2	8	18	38	438	438	438	438	76	77	WQAAAA	SFEAAA	AAAAxx
+2480	2853	0	0	0	0	80	480	480	2480	2480	160	161	KRAAAA	TFEAAA	HHHHxx
+936	2854	0	0	6	16	36	936	936	936	936	72	73	AKAAAA	UFEAAA	OOOOxx
+6	2855	0	2	6	6	6	6	6	6	6	12	13	GAAAAA	VFEAAA	VVVVxx
+768	2856	0	0	8	8	68	768	768	768	768	136	137	ODAAAA	WFEAAA	AAAAxx
+1564	2857	0	0	4	4	64	564	1564	1564	1564	128	129	EIAAAA	XFEAAA	HHHHxx
+3236	2858	0	0	6	16	36	236	1236	3236	3236	72	73	MUAAAA	YFEAAA	OOOOxx
+3932	2859	0	0	2	12	32	932	1932	3932	3932	64	65	GVAAAA	ZFEAAA	VVVVxx
+8914	2860	0	2	4	14	14	914	914	3914	8914	28	29	WEAAAA	AGEAAA	AAAAxx
+119	2861	1	3	9	19	19	119	119	119	119	38	39	PEAAAA	BGEAAA	HHHHxx
+6034	2862	0	2	4	14	34	34	34	1034	6034	68	69	CYAAAA	CGEAAA	OOOOxx
+5384	2863	0	0	4	4	84	384	1384	384	5384	168	169	CZAAAA	DGEAAA	VVVVxx
+6885	2864	1	1	5	5	85	885	885	1885	6885	170	171	VEAAAA	EGEAAA	AAAAxx
+232	2865	0	0	2	12	32	232	232	232	232	64	65	YIAAAA	FGEAAA	HHHHxx
+1293	2866	1	1	3	13	93	293	1293	1293	1293	186	187	TXAAAA	GGEAAA	OOOOxx
+9204	2867	0	0	4	4	4	204	1204	4204	9204	8	9	AQAAAA	HGEAAA	VVVVxx
+527	2868	1	3	7	7	27	527	527	527	527	54	55	HUAAAA	IGEAAA	AAAAxx
+6539	2869	1	3	9	19	39	539	539	1539	6539	78	79	NRAAAA	JGEAAA	HHHHxx
+3679	2870	1	3	9	19	79	679	1679	3679	3679	158	159	NLAAAA	KGEAAA	OOOOxx
+8282	2871	0	2	2	2	82	282	282	3282	8282	164	165	OGAAAA	LGEAAA	VVVVxx
+5027	2872	1	3	7	7	27	27	1027	27	5027	54	55	JLAAAA	MGEAAA	AAAAxx
+7694	2873	0	2	4	14	94	694	1694	2694	7694	188	189	YJAAAA	NGEAAA	HHHHxx
+473	2874	1	1	3	13	73	473	473	473	473	146	147	FSAAAA	OGEAAA	OOOOxx
+6325	2875	1	1	5	5	25	325	325	1325	6325	50	51	HJAAAA	PGEAAA	VVVVxx
+8761	2876	1	1	1	1	61	761	761	3761	8761	122	123	ZYAAAA	QGEAAA	AAAAxx
+6184	2877	0	0	4	4	84	184	184	1184	6184	168	169	WDAAAA	RGEAAA	HHHHxx
+419	2878	1	3	9	19	19	419	419	419	419	38	39	DQAAAA	SGEAAA	OOOOxx
+6111	2879	1	3	1	11	11	111	111	1111	6111	22	23	BBAAAA	TGEAAA	VVVVxx
+3836	2880	0	0	6	16	36	836	1836	3836	3836	72	73	ORAAAA	UGEAAA	AAAAxx
+4086	2881	0	2	6	6	86	86	86	4086	4086	172	173	EBAAAA	VGEAAA	HHHHxx
+5818	2882	0	2	8	18	18	818	1818	818	5818	36	37	UPAAAA	WGEAAA	OOOOxx
+4528	2883	0	0	8	8	28	528	528	4528	4528	56	57	ESAAAA	XGEAAA	VVVVxx
+7199	2884	1	3	9	19	99	199	1199	2199	7199	198	199	XQAAAA	YGEAAA	AAAAxx
+1847	2885	1	3	7	7	47	847	1847	1847	1847	94	95	BTAAAA	ZGEAAA	HHHHxx
+2875	2886	1	3	5	15	75	875	875	2875	2875	150	151	PGAAAA	AHEAAA	OOOOxx
+2872	2887	0	0	2	12	72	872	872	2872	2872	144	145	MGAAAA	BHEAAA	VVVVxx
+3972	2888	0	0	2	12	72	972	1972	3972	3972	144	145	UWAAAA	CHEAAA	AAAAxx
+7590	2889	0	2	0	10	90	590	1590	2590	7590	180	181	YFAAAA	DHEAAA	HHHHxx
+1914	2890	0	2	4	14	14	914	1914	1914	1914	28	29	QVAAAA	EHEAAA	OOOOxx
+1658	2891	0	2	8	18	58	658	1658	1658	1658	116	117	ULAAAA	FHEAAA	VVVVxx
+2126	2892	0	2	6	6	26	126	126	2126	2126	52	53	UDAAAA	GHEAAA	AAAAxx
+645	2893	1	1	5	5	45	645	645	645	645	90	91	VYAAAA	HHEAAA	HHHHxx
+6636	2894	0	0	6	16	36	636	636	1636	6636	72	73	GVAAAA	IHEAAA	OOOOxx
+1469	2895	1	1	9	9	69	469	1469	1469	1469	138	139	NEAAAA	JHEAAA	VVVVxx
+1377	2896	1	1	7	17	77	377	1377	1377	1377	154	155	ZAAAAA	KHEAAA	AAAAxx
+8425	2897	1	1	5	5	25	425	425	3425	8425	50	51	BMAAAA	LHEAAA	HHHHxx
+9300	2898	0	0	0	0	0	300	1300	4300	9300	0	1	STAAAA	MHEAAA	OOOOxx
+5355	2899	1	3	5	15	55	355	1355	355	5355	110	111	ZXAAAA	NHEAAA	VVVVxx
+840	2900	0	0	0	0	40	840	840	840	840	80	81	IGAAAA	OHEAAA	AAAAxx
+5185	2901	1	1	5	5	85	185	1185	185	5185	170	171	LRAAAA	PHEAAA	HHHHxx
+6467	2902	1	3	7	7	67	467	467	1467	6467	134	135	TOAAAA	QHEAAA	OOOOxx
+58	2903	0	2	8	18	58	58	58	58	58	116	117	GCAAAA	RHEAAA	VVVVxx
+5051	2904	1	3	1	11	51	51	1051	51	5051	102	103	HMAAAA	SHEAAA	AAAAxx
+8901	2905	1	1	1	1	1	901	901	3901	8901	2	3	JEAAAA	THEAAA	HHHHxx
+1550	2906	0	2	0	10	50	550	1550	1550	1550	100	101	QHAAAA	UHEAAA	OOOOxx
+1698	2907	0	2	8	18	98	698	1698	1698	1698	196	197	INAAAA	VHEAAA	VVVVxx
+802	2908	0	2	2	2	2	802	802	802	802	4	5	WEAAAA	WHEAAA	AAAAxx
+2440	2909	0	0	0	0	40	440	440	2440	2440	80	81	WPAAAA	XHEAAA	HHHHxx
+2260	2910	0	0	0	0	60	260	260	2260	2260	120	121	YIAAAA	YHEAAA	OOOOxx
+8218	2911	0	2	8	18	18	218	218	3218	8218	36	37	CEAAAA	ZHEAAA	VVVVxx
+5144	2912	0	0	4	4	44	144	1144	144	5144	88	89	WPAAAA	AIEAAA	AAAAxx
+4822	2913	0	2	2	2	22	822	822	4822	4822	44	45	MDAAAA	BIEAAA	HHHHxx
+9476	2914	0	0	6	16	76	476	1476	4476	9476	152	153	MAAAAA	CIEAAA	OOOOxx
+7535	2915	1	3	5	15	35	535	1535	2535	7535	70	71	VDAAAA	DIEAAA	VVVVxx
+8738	2916	0	2	8	18	38	738	738	3738	8738	76	77	CYAAAA	EIEAAA	AAAAxx
+7946	2917	0	2	6	6	46	946	1946	2946	7946	92	93	QTAAAA	FIEAAA	HHHHxx
+8143	2918	1	3	3	3	43	143	143	3143	8143	86	87	FBAAAA	GIEAAA	OOOOxx
+2623	2919	1	3	3	3	23	623	623	2623	2623	46	47	XWAAAA	HIEAAA	VVVVxx
+5209	2920	1	1	9	9	9	209	1209	209	5209	18	19	JSAAAA	IIEAAA	AAAAxx
+7674	2921	0	2	4	14	74	674	1674	2674	7674	148	149	EJAAAA	JIEAAA	HHHHxx
+1135	2922	1	3	5	15	35	135	1135	1135	1135	70	71	RRAAAA	KIEAAA	OOOOxx
+424	2923	0	0	4	4	24	424	424	424	424	48	49	IQAAAA	LIEAAA	VVVVxx
+942	2924	0	2	2	2	42	942	942	942	942	84	85	GKAAAA	MIEAAA	AAAAxx
+7813	2925	1	1	3	13	13	813	1813	2813	7813	26	27	NOAAAA	NIEAAA	HHHHxx
+3539	2926	1	3	9	19	39	539	1539	3539	3539	78	79	DGAAAA	OIEAAA	OOOOxx
+2909	2927	1	1	9	9	9	909	909	2909	2909	18	19	XHAAAA	PIEAAA	VVVVxx
+3748	2928	0	0	8	8	48	748	1748	3748	3748	96	97	EOAAAA	QIEAAA	AAAAxx
+2996	2929	0	0	6	16	96	996	996	2996	2996	192	193	GLAAAA	RIEAAA	HHHHxx
+1869	2930	1	1	9	9	69	869	1869	1869	1869	138	139	XTAAAA	SIEAAA	OOOOxx
+8151	2931	1	3	1	11	51	151	151	3151	8151	102	103	NBAAAA	TIEAAA	VVVVxx
+6361	2932	1	1	1	1	61	361	361	1361	6361	122	123	RKAAAA	UIEAAA	AAAAxx
+5568	2933	0	0	8	8	68	568	1568	568	5568	136	137	EGAAAA	VIEAAA	HHHHxx
+2796	2934	0	0	6	16	96	796	796	2796	2796	192	193	ODAAAA	WIEAAA	OOOOxx
+8489	2935	1	1	9	9	89	489	489	3489	8489	178	179	NOAAAA	XIEAAA	VVVVxx
+9183	2936	1	3	3	3	83	183	1183	4183	9183	166	167	FPAAAA	YIEAAA	AAAAxx
+8227	2937	1	3	7	7	27	227	227	3227	8227	54	55	LEAAAA	ZIEAAA	HHHHxx
+1844	2938	0	0	4	4	44	844	1844	1844	1844	88	89	YSAAAA	AJEAAA	OOOOxx
+3975	2939	1	3	5	15	75	975	1975	3975	3975	150	151	XWAAAA	BJEAAA	VVVVxx
+6490	2940	0	2	0	10	90	490	490	1490	6490	180	181	QPAAAA	CJEAAA	AAAAxx
+8303	2941	1	3	3	3	3	303	303	3303	8303	6	7	JHAAAA	DJEAAA	HHHHxx
+7334	2942	0	2	4	14	34	334	1334	2334	7334	68	69	CWAAAA	EJEAAA	OOOOxx
+2382	2943	0	2	2	2	82	382	382	2382	2382	164	165	QNAAAA	FJEAAA	VVVVxx
+177	2944	1	1	7	17	77	177	177	177	177	154	155	VGAAAA	GJEAAA	AAAAxx
+8117	2945	1	1	7	17	17	117	117	3117	8117	34	35	FAAAAA	HJEAAA	HHHHxx
+5485	2946	1	1	5	5	85	485	1485	485	5485	170	171	ZCAAAA	IJEAAA	OOOOxx
+6544	2947	0	0	4	4	44	544	544	1544	6544	88	89	SRAAAA	JJEAAA	VVVVxx
+8517	2948	1	1	7	17	17	517	517	3517	8517	34	35	PPAAAA	KJEAAA	AAAAxx
+2252	2949	0	0	2	12	52	252	252	2252	2252	104	105	QIAAAA	LJEAAA	HHHHxx
+4480	2950	0	0	0	0	80	480	480	4480	4480	160	161	IQAAAA	MJEAAA	OOOOxx
+4785	2951	1	1	5	5	85	785	785	4785	4785	170	171	BCAAAA	NJEAAA	VVVVxx
+9700	2952	0	0	0	0	0	700	1700	4700	9700	0	1	CJAAAA	OJEAAA	AAAAxx
+2122	2953	0	2	2	2	22	122	122	2122	2122	44	45	QDAAAA	PJEAAA	HHHHxx
+8783	2954	1	3	3	3	83	783	783	3783	8783	166	167	VZAAAA	QJEAAA	OOOOxx
+1453	2955	1	1	3	13	53	453	1453	1453	1453	106	107	XDAAAA	RJEAAA	VVVVxx
+3908	2956	0	0	8	8	8	908	1908	3908	3908	16	17	IUAAAA	SJEAAA	AAAAxx
+7707	2957	1	3	7	7	7	707	1707	2707	7707	14	15	LKAAAA	TJEAAA	HHHHxx
+9049	2958	1	1	9	9	49	49	1049	4049	9049	98	99	BKAAAA	UJEAAA	OOOOxx
+654	2959	0	2	4	14	54	654	654	654	654	108	109	EZAAAA	VJEAAA	VVVVxx
+3336	2960	0	0	6	16	36	336	1336	3336	3336	72	73	IYAAAA	WJEAAA	AAAAxx
+622	2961	0	2	2	2	22	622	622	622	622	44	45	YXAAAA	XJEAAA	HHHHxx
+8398	2962	0	2	8	18	98	398	398	3398	8398	196	197	ALAAAA	YJEAAA	OOOOxx
+9193	2963	1	1	3	13	93	193	1193	4193	9193	186	187	PPAAAA	ZJEAAA	VVVVxx
+7896	2964	0	0	6	16	96	896	1896	2896	7896	192	193	SRAAAA	AKEAAA	AAAAxx
+9798	2965	0	2	8	18	98	798	1798	4798	9798	196	197	WMAAAA	BKEAAA	HHHHxx
+2881	2966	1	1	1	1	81	881	881	2881	2881	162	163	VGAAAA	CKEAAA	OOOOxx
+672	2967	0	0	2	12	72	672	672	672	672	144	145	WZAAAA	DKEAAA	VVVVxx
+6743	2968	1	3	3	3	43	743	743	1743	6743	86	87	JZAAAA	EKEAAA	AAAAxx
+8935	2969	1	3	5	15	35	935	935	3935	8935	70	71	RFAAAA	FKEAAA	HHHHxx
+2426	2970	0	2	6	6	26	426	426	2426	2426	52	53	IPAAAA	GKEAAA	OOOOxx
+722	2971	0	2	2	2	22	722	722	722	722	44	45	UBAAAA	HKEAAA	VVVVxx
+5088	2972	0	0	8	8	88	88	1088	88	5088	176	177	SNAAAA	IKEAAA	AAAAxx
+8677	2973	1	1	7	17	77	677	677	3677	8677	154	155	TVAAAA	JKEAAA	HHHHxx
+6963	2974	1	3	3	3	63	963	963	1963	6963	126	127	VHAAAA	KKEAAA	OOOOxx
+1653	2975	1	1	3	13	53	653	1653	1653	1653	106	107	PLAAAA	LKEAAA	VVVVxx
+7295	2976	1	3	5	15	95	295	1295	2295	7295	190	191	PUAAAA	MKEAAA	AAAAxx
+6675	2977	1	3	5	15	75	675	675	1675	6675	150	151	TWAAAA	NKEAAA	HHHHxx
+7183	2978	1	3	3	3	83	183	1183	2183	7183	166	167	HQAAAA	OKEAAA	OOOOxx
+4378	2979	0	2	8	18	78	378	378	4378	4378	156	157	KMAAAA	PKEAAA	VVVVxx
+2157	2980	1	1	7	17	57	157	157	2157	2157	114	115	ZEAAAA	QKEAAA	AAAAxx
+2621	2981	1	1	1	1	21	621	621	2621	2621	42	43	VWAAAA	RKEAAA	HHHHxx
+9278	2982	0	2	8	18	78	278	1278	4278	9278	156	157	WSAAAA	SKEAAA	OOOOxx
+79	2983	1	3	9	19	79	79	79	79	79	158	159	BDAAAA	TKEAAA	VVVVxx
+7358	2984	0	2	8	18	58	358	1358	2358	7358	116	117	AXAAAA	UKEAAA	AAAAxx
+3589	2985	1	1	9	9	89	589	1589	3589	3589	178	179	BIAAAA	VKEAAA	HHHHxx
+1254	2986	0	2	4	14	54	254	1254	1254	1254	108	109	GWAAAA	WKEAAA	OOOOxx
+3490	2987	0	2	0	10	90	490	1490	3490	3490	180	181	GEAAAA	XKEAAA	VVVVxx
+7533	2988	1	1	3	13	33	533	1533	2533	7533	66	67	TDAAAA	YKEAAA	AAAAxx
+2800	2989	0	0	0	0	0	800	800	2800	2800	0	1	SDAAAA	ZKEAAA	HHHHxx
+351	2990	1	3	1	11	51	351	351	351	351	102	103	NNAAAA	ALEAAA	OOOOxx
+4359	2991	1	3	9	19	59	359	359	4359	4359	118	119	RLAAAA	BLEAAA	VVVVxx
+5788	2992	0	0	8	8	88	788	1788	788	5788	176	177	QOAAAA	CLEAAA	AAAAxx
+5521	2993	1	1	1	1	21	521	1521	521	5521	42	43	JEAAAA	DLEAAA	HHHHxx
+3351	2994	1	3	1	11	51	351	1351	3351	3351	102	103	XYAAAA	ELEAAA	OOOOxx
+5129	2995	1	1	9	9	29	129	1129	129	5129	58	59	HPAAAA	FLEAAA	VVVVxx
+315	2996	1	3	5	15	15	315	315	315	315	30	31	DMAAAA	GLEAAA	AAAAxx
+7552	2997	0	0	2	12	52	552	1552	2552	7552	104	105	MEAAAA	HLEAAA	HHHHxx
+9176	2998	0	0	6	16	76	176	1176	4176	9176	152	153	YOAAAA	ILEAAA	OOOOxx
+7458	2999	0	2	8	18	58	458	1458	2458	7458	116	117	WAAAAA	JLEAAA	VVVVxx
+279	3000	1	3	9	19	79	279	279	279	279	158	159	TKAAAA	KLEAAA	AAAAxx
+738	3001	0	2	8	18	38	738	738	738	738	76	77	KCAAAA	LLEAAA	HHHHxx
+2557	3002	1	1	7	17	57	557	557	2557	2557	114	115	JUAAAA	MLEAAA	OOOOxx
+9395	3003	1	3	5	15	95	395	1395	4395	9395	190	191	JXAAAA	NLEAAA	VVVVxx
+7214	3004	0	2	4	14	14	214	1214	2214	7214	28	29	MRAAAA	OLEAAA	AAAAxx
+6354	3005	0	2	4	14	54	354	354	1354	6354	108	109	KKAAAA	PLEAAA	HHHHxx
+4799	3006	1	3	9	19	99	799	799	4799	4799	198	199	PCAAAA	QLEAAA	OOOOxx
+1231	3007	1	3	1	11	31	231	1231	1231	1231	62	63	JVAAAA	RLEAAA	VVVVxx
+5252	3008	0	0	2	12	52	252	1252	252	5252	104	105	AUAAAA	SLEAAA	AAAAxx
+5250	3009	0	2	0	10	50	250	1250	250	5250	100	101	YTAAAA	TLEAAA	HHHHxx
+9319	3010	1	3	9	19	19	319	1319	4319	9319	38	39	LUAAAA	ULEAAA	OOOOxx
+1724	3011	0	0	4	4	24	724	1724	1724	1724	48	49	IOAAAA	VLEAAA	VVVVxx
+7947	3012	1	3	7	7	47	947	1947	2947	7947	94	95	RTAAAA	WLEAAA	AAAAxx
+1105	3013	1	1	5	5	5	105	1105	1105	1105	10	11	NQAAAA	XLEAAA	HHHHxx
+1417	3014	1	1	7	17	17	417	1417	1417	1417	34	35	NCAAAA	YLEAAA	OOOOxx
+7101	3015	1	1	1	1	1	101	1101	2101	7101	2	3	DNAAAA	ZLEAAA	VVVVxx
+1088	3016	0	0	8	8	88	88	1088	1088	1088	176	177	WPAAAA	AMEAAA	AAAAxx
+979	3017	1	3	9	19	79	979	979	979	979	158	159	RLAAAA	BMEAAA	HHHHxx
+7589	3018	1	1	9	9	89	589	1589	2589	7589	178	179	XFAAAA	CMEAAA	OOOOxx
+8952	3019	0	0	2	12	52	952	952	3952	8952	104	105	IGAAAA	DMEAAA	VVVVxx
+2864	3020	0	0	4	4	64	864	864	2864	2864	128	129	EGAAAA	EMEAAA	AAAAxx
+234	3021	0	2	4	14	34	234	234	234	234	68	69	AJAAAA	FMEAAA	HHHHxx
+7231	3022	1	3	1	11	31	231	1231	2231	7231	62	63	DSAAAA	GMEAAA	OOOOxx
+6792	3023	0	0	2	12	92	792	792	1792	6792	184	185	GBAAAA	HMEAAA	VVVVxx
+4311	3024	1	3	1	11	11	311	311	4311	4311	22	23	VJAAAA	IMEAAA	AAAAxx
+3374	3025	0	2	4	14	74	374	1374	3374	3374	148	149	UZAAAA	JMEAAA	HHHHxx
+3367	3026	1	3	7	7	67	367	1367	3367	3367	134	135	NZAAAA	KMEAAA	OOOOxx
+2598	3027	0	2	8	18	98	598	598	2598	2598	196	197	YVAAAA	LMEAAA	VVVVxx
+1033	3028	1	1	3	13	33	33	1033	1033	1033	66	67	TNAAAA	MMEAAA	AAAAxx
+7803	3029	1	3	3	3	3	803	1803	2803	7803	6	7	DOAAAA	NMEAAA	HHHHxx
+3870	3030	0	2	0	10	70	870	1870	3870	3870	140	141	WSAAAA	OMEAAA	OOOOxx
+4962	3031	0	2	2	2	62	962	962	4962	4962	124	125	WIAAAA	PMEAAA	VVVVxx
+4842	3032	0	2	2	2	42	842	842	4842	4842	84	85	GEAAAA	QMEAAA	AAAAxx
+8814	3033	0	2	4	14	14	814	814	3814	8814	28	29	ABAAAA	RMEAAA	HHHHxx
+3429	3034	1	1	9	9	29	429	1429	3429	3429	58	59	XBAAAA	SMEAAA	OOOOxx
+6550	3035	0	2	0	10	50	550	550	1550	6550	100	101	YRAAAA	TMEAAA	VVVVxx
+6317	3036	1	1	7	17	17	317	317	1317	6317	34	35	ZIAAAA	UMEAAA	AAAAxx
+5023	3037	1	3	3	3	23	23	1023	23	5023	46	47	FLAAAA	VMEAAA	HHHHxx
+5825	3038	1	1	5	5	25	825	1825	825	5825	50	51	BQAAAA	WMEAAA	OOOOxx
+5297	3039	1	1	7	17	97	297	1297	297	5297	194	195	TVAAAA	XMEAAA	VVVVxx
+8764	3040	0	0	4	4	64	764	764	3764	8764	128	129	CZAAAA	YMEAAA	AAAAxx
+5084	3041	0	0	4	4	84	84	1084	84	5084	168	169	ONAAAA	ZMEAAA	HHHHxx
+6808	3042	0	0	8	8	8	808	808	1808	6808	16	17	WBAAAA	ANEAAA	OOOOxx
+1780	3043	0	0	0	0	80	780	1780	1780	1780	160	161	MQAAAA	BNEAAA	VVVVxx
+4092	3044	0	0	2	12	92	92	92	4092	4092	184	185	KBAAAA	CNEAAA	AAAAxx
+3618	3045	0	2	8	18	18	618	1618	3618	3618	36	37	EJAAAA	DNEAAA	HHHHxx
+7299	3046	1	3	9	19	99	299	1299	2299	7299	198	199	TUAAAA	ENEAAA	OOOOxx
+8544	3047	0	0	4	4	44	544	544	3544	8544	88	89	QQAAAA	FNEAAA	VVVVxx
+2359	3048	1	3	9	19	59	359	359	2359	2359	118	119	TMAAAA	GNEAAA	AAAAxx
+1939	3049	1	3	9	19	39	939	1939	1939	1939	78	79	PWAAAA	HNEAAA	HHHHxx
+5834	3050	0	2	4	14	34	834	1834	834	5834	68	69	KQAAAA	INEAAA	OOOOxx
+1997	3051	1	1	7	17	97	997	1997	1997	1997	194	195	VYAAAA	JNEAAA	VVVVxx
+7917	3052	1	1	7	17	17	917	1917	2917	7917	34	35	NSAAAA	KNEAAA	AAAAxx
+2098	3053	0	2	8	18	98	98	98	2098	2098	196	197	SCAAAA	LNEAAA	HHHHxx
+7576	3054	0	0	6	16	76	576	1576	2576	7576	152	153	KFAAAA	MNEAAA	OOOOxx
+376	3055	0	0	6	16	76	376	376	376	376	152	153	MOAAAA	NNEAAA	VVVVxx
+8535	3056	1	3	5	15	35	535	535	3535	8535	70	71	HQAAAA	ONEAAA	AAAAxx
+5659	3057	1	3	9	19	59	659	1659	659	5659	118	119	RJAAAA	PNEAAA	HHHHxx
+2786	3058	0	2	6	6	86	786	786	2786	2786	172	173	EDAAAA	QNEAAA	OOOOxx
+8820	3059	0	0	0	0	20	820	820	3820	8820	40	41	GBAAAA	RNEAAA	VVVVxx
+1229	3060	1	1	9	9	29	229	1229	1229	1229	58	59	HVAAAA	SNEAAA	AAAAxx
+9321	3061	1	1	1	1	21	321	1321	4321	9321	42	43	NUAAAA	TNEAAA	HHHHxx
+7662	3062	0	2	2	2	62	662	1662	2662	7662	124	125	SIAAAA	UNEAAA	OOOOxx
+5535	3063	1	3	5	15	35	535	1535	535	5535	70	71	XEAAAA	VNEAAA	VVVVxx
+4889	3064	1	1	9	9	89	889	889	4889	4889	178	179	BGAAAA	WNEAAA	AAAAxx
+8259	3065	1	3	9	19	59	259	259	3259	8259	118	119	RFAAAA	XNEAAA	HHHHxx
+6789	3066	1	1	9	9	89	789	789	1789	6789	178	179	DBAAAA	YNEAAA	OOOOxx
+5411	3067	1	3	1	11	11	411	1411	411	5411	22	23	DAAAAA	ZNEAAA	VVVVxx
+6992	3068	0	0	2	12	92	992	992	1992	6992	184	185	YIAAAA	AOEAAA	AAAAxx
+7698	3069	0	2	8	18	98	698	1698	2698	7698	196	197	CKAAAA	BOEAAA	HHHHxx
+2342	3070	0	2	2	2	42	342	342	2342	2342	84	85	CMAAAA	COEAAA	OOOOxx
+1501	3071	1	1	1	1	1	501	1501	1501	1501	2	3	TFAAAA	DOEAAA	VVVVxx
+6322	3072	0	2	2	2	22	322	322	1322	6322	44	45	EJAAAA	EOEAAA	AAAAxx
+9861	3073	1	1	1	1	61	861	1861	4861	9861	122	123	HPAAAA	FOEAAA	HHHHxx
+9802	3074	0	2	2	2	2	802	1802	4802	9802	4	5	ANAAAA	GOEAAA	OOOOxx
+4750	3075	0	2	0	10	50	750	750	4750	4750	100	101	SAAAAA	HOEAAA	VVVVxx
+5855	3076	1	3	5	15	55	855	1855	855	5855	110	111	FRAAAA	IOEAAA	AAAAxx
+4304	3077	0	0	4	4	4	304	304	4304	4304	8	9	OJAAAA	JOEAAA	HHHHxx
+2605	3078	1	1	5	5	5	605	605	2605	2605	10	11	FWAAAA	KOEAAA	OOOOxx
+1802	3079	0	2	2	2	2	802	1802	1802	1802	4	5	IRAAAA	LOEAAA	VVVVxx
+9368	3080	0	0	8	8	68	368	1368	4368	9368	136	137	IWAAAA	MOEAAA	AAAAxx
+7107	3081	1	3	7	7	7	107	1107	2107	7107	14	15	JNAAAA	NOEAAA	HHHHxx
+8895	3082	1	3	5	15	95	895	895	3895	8895	190	191	DEAAAA	OOEAAA	OOOOxx
+3750	3083	0	2	0	10	50	750	1750	3750	3750	100	101	GOAAAA	POEAAA	VVVVxx
+8934	3084	0	2	4	14	34	934	934	3934	8934	68	69	QFAAAA	QOEAAA	AAAAxx
+9464	3085	0	0	4	4	64	464	1464	4464	9464	128	129	AAAAAA	ROEAAA	HHHHxx
+1928	3086	0	0	8	8	28	928	1928	1928	1928	56	57	EWAAAA	SOEAAA	OOOOxx
+3196	3087	0	0	6	16	96	196	1196	3196	3196	192	193	YSAAAA	TOEAAA	VVVVxx
+5256	3088	0	0	6	16	56	256	1256	256	5256	112	113	EUAAAA	UOEAAA	AAAAxx
+7119	3089	1	3	9	19	19	119	1119	2119	7119	38	39	VNAAAA	VOEAAA	HHHHxx
+4495	3090	1	3	5	15	95	495	495	4495	4495	190	191	XQAAAA	WOEAAA	OOOOxx
+9292	3091	0	0	2	12	92	292	1292	4292	9292	184	185	KTAAAA	XOEAAA	VVVVxx
+1617	3092	1	1	7	17	17	617	1617	1617	1617	34	35	FKAAAA	YOEAAA	AAAAxx
+481	3093	1	1	1	1	81	481	481	481	481	162	163	NSAAAA	ZOEAAA	HHHHxx
+56	3094	0	0	6	16	56	56	56	56	56	112	113	ECAAAA	APEAAA	OOOOxx
+9120	3095	0	0	0	0	20	120	1120	4120	9120	40	41	UMAAAA	BPEAAA	VVVVxx
+1306	3096	0	2	6	6	6	306	1306	1306	1306	12	13	GYAAAA	CPEAAA	AAAAxx
+7773	3097	1	1	3	13	73	773	1773	2773	7773	146	147	ZMAAAA	DPEAAA	HHHHxx
+4863	3098	1	3	3	3	63	863	863	4863	4863	126	127	BFAAAA	EPEAAA	OOOOxx
+1114	3099	0	2	4	14	14	114	1114	1114	1114	28	29	WQAAAA	FPEAAA	VVVVxx
+8124	3100	0	0	4	4	24	124	124	3124	8124	48	49	MAAAAA	GPEAAA	AAAAxx
+6254	3101	0	2	4	14	54	254	254	1254	6254	108	109	OGAAAA	HPEAAA	HHHHxx
+8109	3102	1	1	9	9	9	109	109	3109	8109	18	19	XZAAAA	IPEAAA	OOOOxx
+1747	3103	1	3	7	7	47	747	1747	1747	1747	94	95	FPAAAA	JPEAAA	VVVVxx
+6185	3104	1	1	5	5	85	185	185	1185	6185	170	171	XDAAAA	KPEAAA	AAAAxx
+3388	3105	0	0	8	8	88	388	1388	3388	3388	176	177	IAAAAA	LPEAAA	HHHHxx
+4905	3106	1	1	5	5	5	905	905	4905	4905	10	11	RGAAAA	MPEAAA	OOOOxx
+5728	3107	0	0	8	8	28	728	1728	728	5728	56	57	IMAAAA	NPEAAA	VVVVxx
+7507	3108	1	3	7	7	7	507	1507	2507	7507	14	15	TCAAAA	OPEAAA	AAAAxx
+5662	3109	0	2	2	2	62	662	1662	662	5662	124	125	UJAAAA	PPEAAA	HHHHxx
+1686	3110	0	2	6	6	86	686	1686	1686	1686	172	173	WMAAAA	QPEAAA	OOOOxx
+5202	3111	0	2	2	2	2	202	1202	202	5202	4	5	CSAAAA	RPEAAA	VVVVxx
+6905	3112	1	1	5	5	5	905	905	1905	6905	10	11	PFAAAA	SPEAAA	AAAAxx
+9577	3113	1	1	7	17	77	577	1577	4577	9577	154	155	JEAAAA	TPEAAA	HHHHxx
+7194	3114	0	2	4	14	94	194	1194	2194	7194	188	189	SQAAAA	UPEAAA	OOOOxx
+7016	3115	0	0	6	16	16	16	1016	2016	7016	32	33	WJAAAA	VPEAAA	VVVVxx
+8905	3116	1	1	5	5	5	905	905	3905	8905	10	11	NEAAAA	WPEAAA	AAAAxx
+3419	3117	1	3	9	19	19	419	1419	3419	3419	38	39	NBAAAA	XPEAAA	HHHHxx
+6881	3118	1	1	1	1	81	881	881	1881	6881	162	163	REAAAA	YPEAAA	OOOOxx
+8370	3119	0	2	0	10	70	370	370	3370	8370	140	141	YJAAAA	ZPEAAA	VVVVxx
+6117	3120	1	1	7	17	17	117	117	1117	6117	34	35	HBAAAA	AQEAAA	AAAAxx
+1636	3121	0	0	6	16	36	636	1636	1636	1636	72	73	YKAAAA	BQEAAA	HHHHxx
+6857	3122	1	1	7	17	57	857	857	1857	6857	114	115	TDAAAA	CQEAAA	OOOOxx
+7163	3123	1	3	3	3	63	163	1163	2163	7163	126	127	NPAAAA	DQEAAA	VVVVxx
+5040	3124	0	0	0	0	40	40	1040	40	5040	80	81	WLAAAA	EQEAAA	AAAAxx
+6263	3125	1	3	3	3	63	263	263	1263	6263	126	127	XGAAAA	FQEAAA	HHHHxx
+4809	3126	1	1	9	9	9	809	809	4809	4809	18	19	ZCAAAA	GQEAAA	OOOOxx
+900	3127	0	0	0	0	0	900	900	900	900	0	1	QIAAAA	HQEAAA	VVVVxx
+3199	3128	1	3	9	19	99	199	1199	3199	3199	198	199	BTAAAA	IQEAAA	AAAAxx
+4156	3129	0	0	6	16	56	156	156	4156	4156	112	113	WDAAAA	JQEAAA	HHHHxx
+3501	3130	1	1	1	1	1	501	1501	3501	3501	2	3	REAAAA	KQEAAA	OOOOxx
+164	3131	0	0	4	4	64	164	164	164	164	128	129	IGAAAA	LQEAAA	VVVVxx
+9548	3132	0	0	8	8	48	548	1548	4548	9548	96	97	GDAAAA	MQEAAA	AAAAxx
+1149	3133	1	1	9	9	49	149	1149	1149	1149	98	99	FSAAAA	NQEAAA	HHHHxx
+1962	3134	0	2	2	2	62	962	1962	1962	1962	124	125	MXAAAA	OQEAAA	OOOOxx
+4072	3135	0	0	2	12	72	72	72	4072	4072	144	145	QAAAAA	PQEAAA	VVVVxx
+4280	3136	0	0	0	0	80	280	280	4280	4280	160	161	QIAAAA	QQEAAA	AAAAxx
+1398	3137	0	2	8	18	98	398	1398	1398	1398	196	197	UBAAAA	RQEAAA	HHHHxx
+725	3138	1	1	5	5	25	725	725	725	725	50	51	XBAAAA	SQEAAA	OOOOxx
+3988	3139	0	0	8	8	88	988	1988	3988	3988	176	177	KXAAAA	TQEAAA	VVVVxx
+5059	3140	1	3	9	19	59	59	1059	59	5059	118	119	PMAAAA	UQEAAA	AAAAxx
+2632	3141	0	0	2	12	32	632	632	2632	2632	64	65	GXAAAA	VQEAAA	HHHHxx
+1909	3142	1	1	9	9	9	909	1909	1909	1909	18	19	LVAAAA	WQEAAA	OOOOxx
+6827	3143	1	3	7	7	27	827	827	1827	6827	54	55	PCAAAA	XQEAAA	VVVVxx
+8156	3144	0	0	6	16	56	156	156	3156	8156	112	113	SBAAAA	YQEAAA	AAAAxx
+1192	3145	0	0	2	12	92	192	1192	1192	1192	184	185	WTAAAA	ZQEAAA	HHHHxx
+9545	3146	1	1	5	5	45	545	1545	4545	9545	90	91	DDAAAA	AREAAA	OOOOxx
+2249	3147	1	1	9	9	49	249	249	2249	2249	98	99	NIAAAA	BREAAA	VVVVxx
+5580	3148	0	0	0	0	80	580	1580	580	5580	160	161	QGAAAA	CREAAA	AAAAxx
+8403	3149	1	3	3	3	3	403	403	3403	8403	6	7	FLAAAA	DREAAA	HHHHxx
+4024	3150	0	0	4	4	24	24	24	4024	4024	48	49	UYAAAA	EREAAA	OOOOxx
+1866	3151	0	2	6	6	66	866	1866	1866	1866	132	133	UTAAAA	FREAAA	VVVVxx
+9251	3152	1	3	1	11	51	251	1251	4251	9251	102	103	VRAAAA	GREAAA	AAAAxx
+9979	3153	1	3	9	19	79	979	1979	4979	9979	158	159	VTAAAA	HREAAA	HHHHxx
+9899	3154	1	3	9	19	99	899	1899	4899	9899	198	199	TQAAAA	IREAAA	OOOOxx
+2540	3155	0	0	0	0	40	540	540	2540	2540	80	81	STAAAA	JREAAA	VVVVxx
+8957	3156	1	1	7	17	57	957	957	3957	8957	114	115	NGAAAA	KREAAA	AAAAxx
+7702	3157	0	2	2	2	2	702	1702	2702	7702	4	5	GKAAAA	LREAAA	HHHHxx
+4211	3158	1	3	1	11	11	211	211	4211	4211	22	23	ZFAAAA	MREAAA	OOOOxx
+6684	3159	0	0	4	4	84	684	684	1684	6684	168	169	CXAAAA	NREAAA	VVVVxx
+3883	3160	1	3	3	3	83	883	1883	3883	3883	166	167	JTAAAA	OREAAA	AAAAxx
+3531	3161	1	3	1	11	31	531	1531	3531	3531	62	63	VFAAAA	PREAAA	HHHHxx
+9178	3162	0	2	8	18	78	178	1178	4178	9178	156	157	APAAAA	QREAAA	OOOOxx
+3389	3163	1	1	9	9	89	389	1389	3389	3389	178	179	JAAAAA	RREAAA	VVVVxx
+7874	3164	0	2	4	14	74	874	1874	2874	7874	148	149	WQAAAA	SREAAA	AAAAxx
+4522	3165	0	2	2	2	22	522	522	4522	4522	44	45	YRAAAA	TREAAA	HHHHxx
+9399	3166	1	3	9	19	99	399	1399	4399	9399	198	199	NXAAAA	UREAAA	OOOOxx
+9083	3167	1	3	3	3	83	83	1083	4083	9083	166	167	JLAAAA	VREAAA	VVVVxx
+1530	3168	0	2	0	10	30	530	1530	1530	1530	60	61	WGAAAA	WREAAA	AAAAxx
+2360	3169	0	0	0	0	60	360	360	2360	2360	120	121	UMAAAA	XREAAA	HHHHxx
+4908	3170	0	0	8	8	8	908	908	4908	4908	16	17	UGAAAA	YREAAA	OOOOxx
+4628	3171	0	0	8	8	28	628	628	4628	4628	56	57	AWAAAA	ZREAAA	VVVVxx
+3889	3172	1	1	9	9	89	889	1889	3889	3889	178	179	PTAAAA	ASEAAA	AAAAxx
+1331	3173	1	3	1	11	31	331	1331	1331	1331	62	63	FZAAAA	BSEAAA	HHHHxx
+1942	3174	0	2	2	2	42	942	1942	1942	1942	84	85	SWAAAA	CSEAAA	OOOOxx
+4734	3175	0	2	4	14	34	734	734	4734	4734	68	69	CAAAAA	DSEAAA	VVVVxx
+8386	3176	0	2	6	6	86	386	386	3386	8386	172	173	OKAAAA	ESEAAA	AAAAxx
+3586	3177	0	2	6	6	86	586	1586	3586	3586	172	173	YHAAAA	FSEAAA	HHHHxx
+2354	3178	0	2	4	14	54	354	354	2354	2354	108	109	OMAAAA	GSEAAA	OOOOxx
+7108	3179	0	0	8	8	8	108	1108	2108	7108	16	17	KNAAAA	HSEAAA	VVVVxx
+1857	3180	1	1	7	17	57	857	1857	1857	1857	114	115	LTAAAA	ISEAAA	AAAAxx
+2544	3181	0	0	4	4	44	544	544	2544	2544	88	89	WTAAAA	JSEAAA	HHHHxx
+819	3182	1	3	9	19	19	819	819	819	819	38	39	NFAAAA	KSEAAA	OOOOxx
+2878	3183	0	2	8	18	78	878	878	2878	2878	156	157	SGAAAA	LSEAAA	VVVVxx
+1772	3184	0	0	2	12	72	772	1772	1772	1772	144	145	EQAAAA	MSEAAA	AAAAxx
+354	3185	0	2	4	14	54	354	354	354	354	108	109	QNAAAA	NSEAAA	HHHHxx
+3259	3186	1	3	9	19	59	259	1259	3259	3259	118	119	JVAAAA	OSEAAA	OOOOxx
+2170	3187	0	2	0	10	70	170	170	2170	2170	140	141	MFAAAA	PSEAAA	VVVVxx
+1190	3188	0	2	0	10	90	190	1190	1190	1190	180	181	UTAAAA	QSEAAA	AAAAxx
+3607	3189	1	3	7	7	7	607	1607	3607	3607	14	15	TIAAAA	RSEAAA	HHHHxx
+4661	3190	1	1	1	1	61	661	661	4661	4661	122	123	HXAAAA	SSEAAA	OOOOxx
+1796	3191	0	0	6	16	96	796	1796	1796	1796	192	193	CRAAAA	TSEAAA	VVVVxx
+1561	3192	1	1	1	1	61	561	1561	1561	1561	122	123	BIAAAA	USEAAA	AAAAxx
+4336	3193	0	0	6	16	36	336	336	4336	4336	72	73	UKAAAA	VSEAAA	HHHHxx
+7550	3194	0	2	0	10	50	550	1550	2550	7550	100	101	KEAAAA	WSEAAA	OOOOxx
+3238	3195	0	2	8	18	38	238	1238	3238	3238	76	77	OUAAAA	XSEAAA	VVVVxx
+9870	3196	0	2	0	10	70	870	1870	4870	9870	140	141	QPAAAA	YSEAAA	AAAAxx
+6502	3197	0	2	2	2	2	502	502	1502	6502	4	5	CQAAAA	ZSEAAA	HHHHxx
+3903	3198	1	3	3	3	3	903	1903	3903	3903	6	7	DUAAAA	ATEAAA	OOOOxx
+2869	3199	1	1	9	9	69	869	869	2869	2869	138	139	JGAAAA	BTEAAA	VVVVxx
+5072	3200	0	0	2	12	72	72	1072	72	5072	144	145	CNAAAA	CTEAAA	AAAAxx
+1201	3201	1	1	1	1	1	201	1201	1201	1201	2	3	FUAAAA	DTEAAA	HHHHxx
+6245	3202	1	1	5	5	45	245	245	1245	6245	90	91	FGAAAA	ETEAAA	OOOOxx
+1402	3203	0	2	2	2	2	402	1402	1402	1402	4	5	YBAAAA	FTEAAA	VVVVxx
+2594	3204	0	2	4	14	94	594	594	2594	2594	188	189	UVAAAA	GTEAAA	AAAAxx
+9171	3205	1	3	1	11	71	171	1171	4171	9171	142	143	TOAAAA	HTEAAA	HHHHxx
+2620	3206	0	0	0	0	20	620	620	2620	2620	40	41	UWAAAA	ITEAAA	OOOOxx
+6309	3207	1	1	9	9	9	309	309	1309	6309	18	19	RIAAAA	JTEAAA	VVVVxx
+1285	3208	1	1	5	5	85	285	1285	1285	1285	170	171	LXAAAA	KTEAAA	AAAAxx
+5466	3209	0	2	6	6	66	466	1466	466	5466	132	133	GCAAAA	LTEAAA	HHHHxx
+168	3210	0	0	8	8	68	168	168	168	168	136	137	MGAAAA	MTEAAA	OOOOxx
+1410	3211	0	2	0	10	10	410	1410	1410	1410	20	21	GCAAAA	NTEAAA	VVVVxx
+6332	3212	0	0	2	12	32	332	332	1332	6332	64	65	OJAAAA	OTEAAA	AAAAxx
+9530	3213	0	2	0	10	30	530	1530	4530	9530	60	61	OCAAAA	PTEAAA	HHHHxx
+7749	3214	1	1	9	9	49	749	1749	2749	7749	98	99	BMAAAA	QTEAAA	OOOOxx
+3656	3215	0	0	6	16	56	656	1656	3656	3656	112	113	QKAAAA	RTEAAA	VVVVxx
+37	3216	1	1	7	17	37	37	37	37	37	74	75	LBAAAA	STEAAA	AAAAxx
+2744	3217	0	0	4	4	44	744	744	2744	2744	88	89	OBAAAA	TTEAAA	HHHHxx
+4206	3218	0	2	6	6	6	206	206	4206	4206	12	13	UFAAAA	UTEAAA	OOOOxx
+1846	3219	0	2	6	6	46	846	1846	1846	1846	92	93	ATAAAA	VTEAAA	VVVVxx
+9913	3220	1	1	3	13	13	913	1913	4913	9913	26	27	HRAAAA	WTEAAA	AAAAxx
+4078	3221	0	2	8	18	78	78	78	4078	4078	156	157	WAAAAA	XTEAAA	HHHHxx
+2080	3222	0	0	0	0	80	80	80	2080	2080	160	161	ACAAAA	YTEAAA	OOOOxx
+4169	3223	1	1	9	9	69	169	169	4169	4169	138	139	JEAAAA	ZTEAAA	VVVVxx
+2070	3224	0	2	0	10	70	70	70	2070	2070	140	141	QBAAAA	AUEAAA	AAAAxx
+4500	3225	0	0	0	0	0	500	500	4500	4500	0	1	CRAAAA	BUEAAA	HHHHxx
+4123	3226	1	3	3	3	23	123	123	4123	4123	46	47	PCAAAA	CUEAAA	OOOOxx
+5594	3227	0	2	4	14	94	594	1594	594	5594	188	189	EHAAAA	DUEAAA	VVVVxx
+9941	3228	1	1	1	1	41	941	1941	4941	9941	82	83	JSAAAA	EUEAAA	AAAAxx
+7154	3229	0	2	4	14	54	154	1154	2154	7154	108	109	EPAAAA	FUEAAA	HHHHxx
+8340	3230	0	0	0	0	40	340	340	3340	8340	80	81	UIAAAA	GUEAAA	OOOOxx
+7110	3231	0	2	0	10	10	110	1110	2110	7110	20	21	MNAAAA	HUEAAA	VVVVxx
+7795	3232	1	3	5	15	95	795	1795	2795	7795	190	191	VNAAAA	IUEAAA	AAAAxx
+132	3233	0	0	2	12	32	132	132	132	132	64	65	CFAAAA	JUEAAA	HHHHxx
+4603	3234	1	3	3	3	3	603	603	4603	4603	6	7	BVAAAA	KUEAAA	OOOOxx
+9720	3235	0	0	0	0	20	720	1720	4720	9720	40	41	WJAAAA	LUEAAA	VVVVxx
+1460	3236	0	0	0	0	60	460	1460	1460	1460	120	121	EEAAAA	MUEAAA	AAAAxx
+4677	3237	1	1	7	17	77	677	677	4677	4677	154	155	XXAAAA	NUEAAA	HHHHxx
+9272	3238	0	0	2	12	72	272	1272	4272	9272	144	145	QSAAAA	OUEAAA	OOOOxx
+2279	3239	1	3	9	19	79	279	279	2279	2279	158	159	RJAAAA	PUEAAA	VVVVxx
+4587	3240	1	3	7	7	87	587	587	4587	4587	174	175	LUAAAA	QUEAAA	AAAAxx
+2244	3241	0	0	4	4	44	244	244	2244	2244	88	89	IIAAAA	RUEAAA	HHHHxx
+742	3242	0	2	2	2	42	742	742	742	742	84	85	OCAAAA	SUEAAA	OOOOxx
+4426	3243	0	2	6	6	26	426	426	4426	4426	52	53	GOAAAA	TUEAAA	VVVVxx
+4571	3244	1	3	1	11	71	571	571	4571	4571	142	143	VTAAAA	UUEAAA	AAAAxx
+4775	3245	1	3	5	15	75	775	775	4775	4775	150	151	RBAAAA	VUEAAA	HHHHxx
+24	3246	0	0	4	4	24	24	24	24	24	48	49	YAAAAA	WUEAAA	OOOOxx
+4175	3247	1	3	5	15	75	175	175	4175	4175	150	151	PEAAAA	XUEAAA	VVVVxx
+9877	3248	1	1	7	17	77	877	1877	4877	9877	154	155	XPAAAA	YUEAAA	AAAAxx
+7271	3249	1	3	1	11	71	271	1271	2271	7271	142	143	RTAAAA	ZUEAAA	HHHHxx
+5468	3250	0	0	8	8	68	468	1468	468	5468	136	137	ICAAAA	AVEAAA	OOOOxx
+6106	3251	0	2	6	6	6	106	106	1106	6106	12	13	WAAAAA	BVEAAA	VVVVxx
+9005	3252	1	1	5	5	5	5	1005	4005	9005	10	11	JIAAAA	CVEAAA	AAAAxx
+109	3253	1	1	9	9	9	109	109	109	109	18	19	FEAAAA	DVEAAA	HHHHxx
+6365	3254	1	1	5	5	65	365	365	1365	6365	130	131	VKAAAA	EVEAAA	OOOOxx
+7437	3255	1	1	7	17	37	437	1437	2437	7437	74	75	BAAAAA	FVEAAA	VVVVxx
+7979	3256	1	3	9	19	79	979	1979	2979	7979	158	159	XUAAAA	GVEAAA	AAAAxx
+6050	3257	0	2	0	10	50	50	50	1050	6050	100	101	SYAAAA	HVEAAA	HHHHxx
+2853	3258	1	1	3	13	53	853	853	2853	2853	106	107	TFAAAA	IVEAAA	OOOOxx
+7603	3259	1	3	3	3	3	603	1603	2603	7603	6	7	LGAAAA	JVEAAA	VVVVxx
+483	3260	1	3	3	3	83	483	483	483	483	166	167	PSAAAA	KVEAAA	AAAAxx
+5994	3261	0	2	4	14	94	994	1994	994	5994	188	189	OWAAAA	LVEAAA	HHHHxx
+6708	3262	0	0	8	8	8	708	708	1708	6708	16	17	AYAAAA	MVEAAA	OOOOxx
+5090	3263	0	2	0	10	90	90	1090	90	5090	180	181	UNAAAA	NVEAAA	VVVVxx
+4608	3264	0	0	8	8	8	608	608	4608	4608	16	17	GVAAAA	OVEAAA	AAAAxx
+4551	3265	1	3	1	11	51	551	551	4551	4551	102	103	BTAAAA	PVEAAA	HHHHxx
+5437	3266	1	1	7	17	37	437	1437	437	5437	74	75	DBAAAA	QVEAAA	OOOOxx
+4130	3267	0	2	0	10	30	130	130	4130	4130	60	61	WCAAAA	RVEAAA	VVVVxx
+6363	3268	1	3	3	3	63	363	363	1363	6363	126	127	TKAAAA	SVEAAA	AAAAxx
+1499	3269	1	3	9	19	99	499	1499	1499	1499	198	199	RFAAAA	TVEAAA	HHHHxx
+384	3270	0	0	4	4	84	384	384	384	384	168	169	UOAAAA	UVEAAA	OOOOxx
+2266	3271	0	2	6	6	66	266	266	2266	2266	132	133	EJAAAA	VVEAAA	VVVVxx
+6018	3272	0	2	8	18	18	18	18	1018	6018	36	37	MXAAAA	WVEAAA	AAAAxx
+7915	3273	1	3	5	15	15	915	1915	2915	7915	30	31	LSAAAA	XVEAAA	HHHHxx
+6167	3274	1	3	7	7	67	167	167	1167	6167	134	135	FDAAAA	YVEAAA	OOOOxx
+9988	3275	0	0	8	8	88	988	1988	4988	9988	176	177	EUAAAA	ZVEAAA	VVVVxx
+6599	3276	1	3	9	19	99	599	599	1599	6599	198	199	VTAAAA	AWEAAA	AAAAxx
+1693	3277	1	1	3	13	93	693	1693	1693	1693	186	187	DNAAAA	BWEAAA	HHHHxx
+5971	3278	1	3	1	11	71	971	1971	971	5971	142	143	RVAAAA	CWEAAA	OOOOxx
+8470	3279	0	2	0	10	70	470	470	3470	8470	140	141	UNAAAA	DWEAAA	VVVVxx
+2807	3280	1	3	7	7	7	807	807	2807	2807	14	15	ZDAAAA	EWEAAA	AAAAxx
+1120	3281	0	0	0	0	20	120	1120	1120	1120	40	41	CRAAAA	FWEAAA	HHHHxx
+5924	3282	0	0	4	4	24	924	1924	924	5924	48	49	WTAAAA	GWEAAA	OOOOxx
+9025	3283	1	1	5	5	25	25	1025	4025	9025	50	51	DJAAAA	HWEAAA	VVVVxx
+9454	3284	0	2	4	14	54	454	1454	4454	9454	108	109	QZAAAA	IWEAAA	AAAAxx
+2259	3285	1	3	9	19	59	259	259	2259	2259	118	119	XIAAAA	JWEAAA	HHHHxx
+5249	3286	1	1	9	9	49	249	1249	249	5249	98	99	XTAAAA	KWEAAA	OOOOxx
+6350	3287	0	2	0	10	50	350	350	1350	6350	100	101	GKAAAA	LWEAAA	VVVVxx
+2930	3288	0	2	0	10	30	930	930	2930	2930	60	61	SIAAAA	MWEAAA	AAAAxx
+6055	3289	1	3	5	15	55	55	55	1055	6055	110	111	XYAAAA	NWEAAA	HHHHxx
+7691	3290	1	3	1	11	91	691	1691	2691	7691	182	183	VJAAAA	OWEAAA	OOOOxx
+1573	3291	1	1	3	13	73	573	1573	1573	1573	146	147	NIAAAA	PWEAAA	VVVVxx
+9943	3292	1	3	3	3	43	943	1943	4943	9943	86	87	LSAAAA	QWEAAA	AAAAxx
+3085	3293	1	1	5	5	85	85	1085	3085	3085	170	171	ROAAAA	RWEAAA	HHHHxx
+5928	3294	0	0	8	8	28	928	1928	928	5928	56	57	AUAAAA	SWEAAA	OOOOxx
+887	3295	1	3	7	7	87	887	887	887	887	174	175	DIAAAA	TWEAAA	VVVVxx
+4630	3296	0	2	0	10	30	630	630	4630	4630	60	61	CWAAAA	UWEAAA	AAAAxx
+9827	3297	1	3	7	7	27	827	1827	4827	9827	54	55	ZNAAAA	VWEAAA	HHHHxx
+8926	3298	0	2	6	6	26	926	926	3926	8926	52	53	IFAAAA	WWEAAA	OOOOxx
+5726	3299	0	2	6	6	26	726	1726	726	5726	52	53	GMAAAA	XWEAAA	VVVVxx
+1569	3300	1	1	9	9	69	569	1569	1569	1569	138	139	JIAAAA	YWEAAA	AAAAxx
+8074	3301	0	2	4	14	74	74	74	3074	8074	148	149	OYAAAA	ZWEAAA	HHHHxx
+7909	3302	1	1	9	9	9	909	1909	2909	7909	18	19	FSAAAA	AXEAAA	OOOOxx
+8367	3303	1	3	7	7	67	367	367	3367	8367	134	135	VJAAAA	BXEAAA	VVVVxx
+7217	3304	1	1	7	17	17	217	1217	2217	7217	34	35	PRAAAA	CXEAAA	AAAAxx
+5254	3305	0	2	4	14	54	254	1254	254	5254	108	109	CUAAAA	DXEAAA	HHHHxx
+1181	3306	1	1	1	1	81	181	1181	1181	1181	162	163	LTAAAA	EXEAAA	OOOOxx
+6907	3307	1	3	7	7	7	907	907	1907	6907	14	15	RFAAAA	FXEAAA	VVVVxx
+5508	3308	0	0	8	8	8	508	1508	508	5508	16	17	WDAAAA	GXEAAA	AAAAxx
+4782	3309	0	2	2	2	82	782	782	4782	4782	164	165	YBAAAA	HXEAAA	HHHHxx
+793	3310	1	1	3	13	93	793	793	793	793	186	187	NEAAAA	IXEAAA	OOOOxx
+5740	3311	0	0	0	0	40	740	1740	740	5740	80	81	UMAAAA	JXEAAA	VVVVxx
+3107	3312	1	3	7	7	7	107	1107	3107	3107	14	15	NPAAAA	KXEAAA	AAAAxx
+1197	3313	1	1	7	17	97	197	1197	1197	1197	194	195	BUAAAA	LXEAAA	HHHHxx
+4376	3314	0	0	6	16	76	376	376	4376	4376	152	153	IMAAAA	MXEAAA	OOOOxx
+6226	3315	0	2	6	6	26	226	226	1226	6226	52	53	MFAAAA	NXEAAA	VVVVxx
+5033	3316	1	1	3	13	33	33	1033	33	5033	66	67	PLAAAA	OXEAAA	AAAAxx
+5494	3317	0	2	4	14	94	494	1494	494	5494	188	189	IDAAAA	PXEAAA	HHHHxx
+3244	3318	0	0	4	4	44	244	1244	3244	3244	88	89	UUAAAA	QXEAAA	OOOOxx
+7670	3319	0	2	0	10	70	670	1670	2670	7670	140	141	AJAAAA	RXEAAA	VVVVxx
+9273	3320	1	1	3	13	73	273	1273	4273	9273	146	147	RSAAAA	SXEAAA	AAAAxx
+5248	3321	0	0	8	8	48	248	1248	248	5248	96	97	WTAAAA	TXEAAA	HHHHxx
+3381	3322	1	1	1	1	81	381	1381	3381	3381	162	163	BAAAAA	UXEAAA	OOOOxx
+4136	3323	0	0	6	16	36	136	136	4136	4136	72	73	CDAAAA	VXEAAA	VVVVxx
+4163	3324	1	3	3	3	63	163	163	4163	4163	126	127	DEAAAA	WXEAAA	AAAAxx
+4270	3325	0	2	0	10	70	270	270	4270	4270	140	141	GIAAAA	XXEAAA	HHHHxx
+1729	3326	1	1	9	9	29	729	1729	1729	1729	58	59	NOAAAA	YXEAAA	OOOOxx
+2778	3327	0	2	8	18	78	778	778	2778	2778	156	157	WCAAAA	ZXEAAA	VVVVxx
+5082	3328	0	2	2	2	82	82	1082	82	5082	164	165	MNAAAA	AYEAAA	AAAAxx
+870	3329	0	2	0	10	70	870	870	870	870	140	141	MHAAAA	BYEAAA	HHHHxx
+4192	3330	0	0	2	12	92	192	192	4192	4192	184	185	GFAAAA	CYEAAA	OOOOxx
+308	3331	0	0	8	8	8	308	308	308	308	16	17	WLAAAA	DYEAAA	VVVVxx
+6783	3332	1	3	3	3	83	783	783	1783	6783	166	167	XAAAAA	EYEAAA	AAAAxx
+7611	3333	1	3	1	11	11	611	1611	2611	7611	22	23	TGAAAA	FYEAAA	HHHHxx
+4221	3334	1	1	1	1	21	221	221	4221	4221	42	43	JGAAAA	GYEAAA	OOOOxx
+6353	3335	1	1	3	13	53	353	353	1353	6353	106	107	JKAAAA	HYEAAA	VVVVxx
+1830	3336	0	2	0	10	30	830	1830	1830	1830	60	61	KSAAAA	IYEAAA	AAAAxx
+2437	3337	1	1	7	17	37	437	437	2437	2437	74	75	TPAAAA	JYEAAA	HHHHxx
+3360	3338	0	0	0	0	60	360	1360	3360	3360	120	121	GZAAAA	KYEAAA	OOOOxx
+1829	3339	1	1	9	9	29	829	1829	1829	1829	58	59	JSAAAA	LYEAAA	VVVVxx
+9475	3340	1	3	5	15	75	475	1475	4475	9475	150	151	LAAAAA	MYEAAA	AAAAxx
+4566	3341	0	2	6	6	66	566	566	4566	4566	132	133	QTAAAA	NYEAAA	HHHHxx
+9944	3342	0	0	4	4	44	944	1944	4944	9944	88	89	MSAAAA	OYEAAA	OOOOxx
+6054	3343	0	2	4	14	54	54	54	1054	6054	108	109	WYAAAA	PYEAAA	VVVVxx
+4722	3344	0	2	2	2	22	722	722	4722	4722	44	45	QZAAAA	QYEAAA	AAAAxx
+2779	3345	1	3	9	19	79	779	779	2779	2779	158	159	XCAAAA	RYEAAA	HHHHxx
+8051	3346	1	3	1	11	51	51	51	3051	8051	102	103	RXAAAA	SYEAAA	OOOOxx
+9671	3347	1	3	1	11	71	671	1671	4671	9671	142	143	ZHAAAA	TYEAAA	VVVVxx
+6084	3348	0	0	4	4	84	84	84	1084	6084	168	169	AAAAAA	UYEAAA	AAAAxx
+3729	3349	1	1	9	9	29	729	1729	3729	3729	58	59	LNAAAA	VYEAAA	HHHHxx
+6627	3350	1	3	7	7	27	627	627	1627	6627	54	55	XUAAAA	WYEAAA	OOOOxx
+4769	3351	1	1	9	9	69	769	769	4769	4769	138	139	LBAAAA	XYEAAA	VVVVxx
+2224	3352	0	0	4	4	24	224	224	2224	2224	48	49	OHAAAA	YYEAAA	AAAAxx
+1404	3353	0	0	4	4	4	404	1404	1404	1404	8	9	ACAAAA	ZYEAAA	HHHHxx
+8532	3354	0	0	2	12	32	532	532	3532	8532	64	65	EQAAAA	AZEAAA	OOOOxx
+6759	3355	1	3	9	19	59	759	759	1759	6759	118	119	ZZAAAA	BZEAAA	VVVVxx
+6404	3356	0	0	4	4	4	404	404	1404	6404	8	9	IMAAAA	CZEAAA	AAAAxx
+3144	3357	0	0	4	4	44	144	1144	3144	3144	88	89	YQAAAA	DZEAAA	HHHHxx
+973	3358	1	1	3	13	73	973	973	973	973	146	147	LLAAAA	EZEAAA	OOOOxx
+9789	3359	1	1	9	9	89	789	1789	4789	9789	178	179	NMAAAA	FZEAAA	VVVVxx
+6181	3360	1	1	1	1	81	181	181	1181	6181	162	163	TDAAAA	GZEAAA	AAAAxx
+1519	3361	1	3	9	19	19	519	1519	1519	1519	38	39	LGAAAA	HZEAAA	HHHHxx
+9729	3362	1	1	9	9	29	729	1729	4729	9729	58	59	FKAAAA	IZEAAA	OOOOxx
+8167	3363	1	3	7	7	67	167	167	3167	8167	134	135	DCAAAA	JZEAAA	VVVVxx
+3830	3364	0	2	0	10	30	830	1830	3830	3830	60	61	IRAAAA	KZEAAA	AAAAxx
+6286	3365	0	2	6	6	86	286	286	1286	6286	172	173	UHAAAA	LZEAAA	HHHHxx
+3047	3366	1	3	7	7	47	47	1047	3047	3047	94	95	FNAAAA	MZEAAA	OOOOxx
+3183	3367	1	3	3	3	83	183	1183	3183	3183	166	167	LSAAAA	NZEAAA	VVVVxx
+6687	3368	1	3	7	7	87	687	687	1687	6687	174	175	FXAAAA	OZEAAA	AAAAxx
+2783	3369	1	3	3	3	83	783	783	2783	2783	166	167	BDAAAA	PZEAAA	HHHHxx
+9920	3370	0	0	0	0	20	920	1920	4920	9920	40	41	ORAAAA	QZEAAA	OOOOxx
+4847	3371	1	3	7	7	47	847	847	4847	4847	94	95	LEAAAA	RZEAAA	VVVVxx
+3645	3372	1	1	5	5	45	645	1645	3645	3645	90	91	FKAAAA	SZEAAA	AAAAxx
+7406	3373	0	2	6	6	6	406	1406	2406	7406	12	13	WYAAAA	TZEAAA	HHHHxx
+6003	3374	1	3	3	3	3	3	3	1003	6003	6	7	XWAAAA	UZEAAA	OOOOxx
+3408	3375	0	0	8	8	8	408	1408	3408	3408	16	17	CBAAAA	VZEAAA	VVVVxx
+4243	3376	1	3	3	3	43	243	243	4243	4243	86	87	FHAAAA	WZEAAA	AAAAxx
+1622	3377	0	2	2	2	22	622	1622	1622	1622	44	45	KKAAAA	XZEAAA	HHHHxx
+5319	3378	1	3	9	19	19	319	1319	319	5319	38	39	PWAAAA	YZEAAA	OOOOxx
+4033	3379	1	1	3	13	33	33	33	4033	4033	66	67	DZAAAA	ZZEAAA	VVVVxx
+8573	3380	1	1	3	13	73	573	573	3573	8573	146	147	TRAAAA	AAFAAA	AAAAxx
+8404	3381	0	0	4	4	4	404	404	3404	8404	8	9	GLAAAA	BAFAAA	HHHHxx
+6993	3382	1	1	3	13	93	993	993	1993	6993	186	187	ZIAAAA	CAFAAA	OOOOxx
+660	3383	0	0	0	0	60	660	660	660	660	120	121	KZAAAA	DAFAAA	VVVVxx
+1136	3384	0	0	6	16	36	136	1136	1136	1136	72	73	SRAAAA	EAFAAA	AAAAxx
+3393	3385	1	1	3	13	93	393	1393	3393	3393	186	187	NAAAAA	FAFAAA	HHHHxx
+9743	3386	1	3	3	3	43	743	1743	4743	9743	86	87	TKAAAA	GAFAAA	OOOOxx
+9705	3387	1	1	5	5	5	705	1705	4705	9705	10	11	HJAAAA	HAFAAA	VVVVxx
+6960	3388	0	0	0	0	60	960	960	1960	6960	120	121	SHAAAA	IAFAAA	AAAAxx
+2753	3389	1	1	3	13	53	753	753	2753	2753	106	107	XBAAAA	JAFAAA	HHHHxx
+906	3390	0	2	6	6	6	906	906	906	906	12	13	WIAAAA	KAFAAA	OOOOxx
+999	3391	1	3	9	19	99	999	999	999	999	198	199	LMAAAA	LAFAAA	VVVVxx
+6927	3392	1	3	7	7	27	927	927	1927	6927	54	55	LGAAAA	MAFAAA	AAAAxx
+4846	3393	0	2	6	6	46	846	846	4846	4846	92	93	KEAAAA	NAFAAA	HHHHxx
+676	3394	0	0	6	16	76	676	676	676	676	152	153	AAAAAA	OAFAAA	OOOOxx
+8612	3395	0	0	2	12	12	612	612	3612	8612	24	25	GTAAAA	PAFAAA	VVVVxx
+4111	3396	1	3	1	11	11	111	111	4111	4111	22	23	DCAAAA	QAFAAA	AAAAxx
+9994	3397	0	2	4	14	94	994	1994	4994	9994	188	189	KUAAAA	RAFAAA	HHHHxx
+4399	3398	1	3	9	19	99	399	399	4399	4399	198	199	FNAAAA	SAFAAA	OOOOxx
+4464	3399	0	0	4	4	64	464	464	4464	4464	128	129	SPAAAA	TAFAAA	VVVVxx
+7316	3400	0	0	6	16	16	316	1316	2316	7316	32	33	KVAAAA	UAFAAA	AAAAxx
+8982	3401	0	2	2	2	82	982	982	3982	8982	164	165	MHAAAA	VAFAAA	HHHHxx
+1871	3402	1	3	1	11	71	871	1871	1871	1871	142	143	ZTAAAA	WAFAAA	OOOOxx
+4082	3403	0	2	2	2	82	82	82	4082	4082	164	165	ABAAAA	XAFAAA	VVVVxx
+3949	3404	1	1	9	9	49	949	1949	3949	3949	98	99	XVAAAA	YAFAAA	AAAAxx
+9352	3405	0	0	2	12	52	352	1352	4352	9352	104	105	SVAAAA	ZAFAAA	HHHHxx
+9638	3406	0	2	8	18	38	638	1638	4638	9638	76	77	SGAAAA	ABFAAA	OOOOxx
+8177	3407	1	1	7	17	77	177	177	3177	8177	154	155	NCAAAA	BBFAAA	VVVVxx
+3499	3408	1	3	9	19	99	499	1499	3499	3499	198	199	PEAAAA	CBFAAA	AAAAxx
+4233	3409	1	1	3	13	33	233	233	4233	4233	66	67	VGAAAA	DBFAAA	HHHHxx
+1953	3410	1	1	3	13	53	953	1953	1953	1953	106	107	DXAAAA	EBFAAA	OOOOxx
+7372	3411	0	0	2	12	72	372	1372	2372	7372	144	145	OXAAAA	FBFAAA	VVVVxx
+5127	3412	1	3	7	7	27	127	1127	127	5127	54	55	FPAAAA	GBFAAA	AAAAxx
+4384	3413	0	0	4	4	84	384	384	4384	4384	168	169	QMAAAA	HBFAAA	HHHHxx
+9964	3414	0	0	4	4	64	964	1964	4964	9964	128	129	GTAAAA	IBFAAA	OOOOxx
+5392	3415	0	0	2	12	92	392	1392	392	5392	184	185	KZAAAA	JBFAAA	VVVVxx
+616	3416	0	0	6	16	16	616	616	616	616	32	33	SXAAAA	KBFAAA	AAAAxx
+591	3417	1	3	1	11	91	591	591	591	591	182	183	TWAAAA	LBFAAA	HHHHxx
+6422	3418	0	2	2	2	22	422	422	1422	6422	44	45	ANAAAA	MBFAAA	OOOOxx
+6551	3419	1	3	1	11	51	551	551	1551	6551	102	103	ZRAAAA	NBFAAA	VVVVxx
+9286	3420	0	2	6	6	86	286	1286	4286	9286	172	173	ETAAAA	OBFAAA	AAAAxx
+3817	3421	1	1	7	17	17	817	1817	3817	3817	34	35	VQAAAA	PBFAAA	HHHHxx
+7717	3422	1	1	7	17	17	717	1717	2717	7717	34	35	VKAAAA	QBFAAA	OOOOxx
+8718	3423	0	2	8	18	18	718	718	3718	8718	36	37	IXAAAA	RBFAAA	VVVVxx
+8608	3424	0	0	8	8	8	608	608	3608	8608	16	17	CTAAAA	SBFAAA	AAAAxx
+2242	3425	0	2	2	2	42	242	242	2242	2242	84	85	GIAAAA	TBFAAA	HHHHxx
+4811	3426	1	3	1	11	11	811	811	4811	4811	22	23	BDAAAA	UBFAAA	OOOOxx
+6838	3427	0	2	8	18	38	838	838	1838	6838	76	77	ADAAAA	VBFAAA	VVVVxx
+787	3428	1	3	7	7	87	787	787	787	787	174	175	HEAAAA	WBFAAA	AAAAxx
+7940	3429	0	0	0	0	40	940	1940	2940	7940	80	81	KTAAAA	XBFAAA	HHHHxx
+336	3430	0	0	6	16	36	336	336	336	336	72	73	YMAAAA	YBFAAA	OOOOxx
+9859	3431	1	3	9	19	59	859	1859	4859	9859	118	119	FPAAAA	ZBFAAA	VVVVxx
+3864	3432	0	0	4	4	64	864	1864	3864	3864	128	129	QSAAAA	ACFAAA	AAAAxx
+7162	3433	0	2	2	2	62	162	1162	2162	7162	124	125	MPAAAA	BCFAAA	HHHHxx
+2071	3434	1	3	1	11	71	71	71	2071	2071	142	143	RBAAAA	CCFAAA	OOOOxx
+7469	3435	1	1	9	9	69	469	1469	2469	7469	138	139	HBAAAA	DCFAAA	VVVVxx
+2917	3436	1	1	7	17	17	917	917	2917	2917	34	35	FIAAAA	ECFAAA	AAAAxx
+7486	3437	0	2	6	6	86	486	1486	2486	7486	172	173	YBAAAA	FCFAAA	HHHHxx
+3355	3438	1	3	5	15	55	355	1355	3355	3355	110	111	BZAAAA	GCFAAA	OOOOxx
+6998	3439	0	2	8	18	98	998	998	1998	6998	196	197	EJAAAA	HCFAAA	VVVVxx
+5498	3440	0	2	8	18	98	498	1498	498	5498	196	197	MDAAAA	ICFAAA	AAAAxx
+5113	3441	1	1	3	13	13	113	1113	113	5113	26	27	ROAAAA	JCFAAA	HHHHxx
+2846	3442	0	2	6	6	46	846	846	2846	2846	92	93	MFAAAA	KCFAAA	OOOOxx
+6834	3443	0	2	4	14	34	834	834	1834	6834	68	69	WCAAAA	LCFAAA	VVVVxx
+8925	3444	1	1	5	5	25	925	925	3925	8925	50	51	HFAAAA	MCFAAA	AAAAxx
+2757	3445	1	1	7	17	57	757	757	2757	2757	114	115	BCAAAA	NCFAAA	HHHHxx
+2775	3446	1	3	5	15	75	775	775	2775	2775	150	151	TCAAAA	OCFAAA	OOOOxx
+6182	3447	0	2	2	2	82	182	182	1182	6182	164	165	UDAAAA	PCFAAA	VVVVxx
+4488	3448	0	0	8	8	88	488	488	4488	4488	176	177	QQAAAA	QCFAAA	AAAAxx
+8523	3449	1	3	3	3	23	523	523	3523	8523	46	47	VPAAAA	RCFAAA	HHHHxx
+52	3450	0	0	2	12	52	52	52	52	52	104	105	ACAAAA	SCFAAA	OOOOxx
+7251	3451	1	3	1	11	51	251	1251	2251	7251	102	103	XSAAAA	TCFAAA	VVVVxx
+6130	3452	0	2	0	10	30	130	130	1130	6130	60	61	UBAAAA	UCFAAA	AAAAxx
+205	3453	1	1	5	5	5	205	205	205	205	10	11	XHAAAA	VCFAAA	HHHHxx
+1186	3454	0	2	6	6	86	186	1186	1186	1186	172	173	QTAAAA	WCFAAA	OOOOxx
+1738	3455	0	2	8	18	38	738	1738	1738	1738	76	77	WOAAAA	XCFAAA	VVVVxx
+9485	3456	1	1	5	5	85	485	1485	4485	9485	170	171	VAAAAA	YCFAAA	AAAAxx
+4235	3457	1	3	5	15	35	235	235	4235	4235	70	71	XGAAAA	ZCFAAA	HHHHxx
+7891	3458	1	3	1	11	91	891	1891	2891	7891	182	183	NRAAAA	ADFAAA	OOOOxx
+4960	3459	0	0	0	0	60	960	960	4960	4960	120	121	UIAAAA	BDFAAA	VVVVxx
+8911	3460	1	3	1	11	11	911	911	3911	8911	22	23	TEAAAA	CDFAAA	AAAAxx
+1219	3461	1	3	9	19	19	219	1219	1219	1219	38	39	XUAAAA	DDFAAA	HHHHxx
+9652	3462	0	0	2	12	52	652	1652	4652	9652	104	105	GHAAAA	EDFAAA	OOOOxx
+9715	3463	1	3	5	15	15	715	1715	4715	9715	30	31	RJAAAA	FDFAAA	VVVVxx
+6629	3464	1	1	9	9	29	629	629	1629	6629	58	59	ZUAAAA	GDFAAA	AAAAxx
+700	3465	0	0	0	0	0	700	700	700	700	0	1	YAAAAA	HDFAAA	HHHHxx
+9819	3466	1	3	9	19	19	819	1819	4819	9819	38	39	RNAAAA	IDFAAA	OOOOxx
+5188	3467	0	0	8	8	88	188	1188	188	5188	176	177	ORAAAA	JDFAAA	VVVVxx
+5367	3468	1	3	7	7	67	367	1367	367	5367	134	135	LYAAAA	KDFAAA	AAAAxx
+6447	3469	1	3	7	7	47	447	447	1447	6447	94	95	ZNAAAA	LDFAAA	HHHHxx
+720	3470	0	0	0	0	20	720	720	720	720	40	41	SBAAAA	MDFAAA	OOOOxx
+9157	3471	1	1	7	17	57	157	1157	4157	9157	114	115	FOAAAA	NDFAAA	VVVVxx
+1082	3472	0	2	2	2	82	82	1082	1082	1082	164	165	QPAAAA	ODFAAA	AAAAxx
+3179	3473	1	3	9	19	79	179	1179	3179	3179	158	159	HSAAAA	PDFAAA	HHHHxx
+4818	3474	0	2	8	18	18	818	818	4818	4818	36	37	IDAAAA	QDFAAA	OOOOxx
+7607	3475	1	3	7	7	7	607	1607	2607	7607	14	15	PGAAAA	RDFAAA	VVVVxx
+2352	3476	0	0	2	12	52	352	352	2352	2352	104	105	MMAAAA	SDFAAA	AAAAxx
+1170	3477	0	2	0	10	70	170	1170	1170	1170	140	141	ATAAAA	TDFAAA	HHHHxx
+4269	3478	1	1	9	9	69	269	269	4269	4269	138	139	FIAAAA	UDFAAA	OOOOxx
+8767	3479	1	3	7	7	67	767	767	3767	8767	134	135	FZAAAA	VDFAAA	VVVVxx
+3984	3480	0	0	4	4	84	984	1984	3984	3984	168	169	GXAAAA	WDFAAA	AAAAxx
+3190	3481	0	2	0	10	90	190	1190	3190	3190	180	181	SSAAAA	XDFAAA	HHHHxx
+7456	3482	0	0	6	16	56	456	1456	2456	7456	112	113	UAAAAA	YDFAAA	OOOOxx
+4348	3483	0	0	8	8	48	348	348	4348	4348	96	97	GLAAAA	ZDFAAA	VVVVxx
+3150	3484	0	2	0	10	50	150	1150	3150	3150	100	101	ERAAAA	AEFAAA	AAAAxx
+8780	3485	0	0	0	0	80	780	780	3780	8780	160	161	SZAAAA	BEFAAA	HHHHxx
+2553	3486	1	1	3	13	53	553	553	2553	2553	106	107	FUAAAA	CEFAAA	OOOOxx
+7526	3487	0	2	6	6	26	526	1526	2526	7526	52	53	MDAAAA	DEFAAA	VVVVxx
+2031	3488	1	3	1	11	31	31	31	2031	2031	62	63	DAAAAA	EEFAAA	AAAAxx
+8793	3489	1	1	3	13	93	793	793	3793	8793	186	187	FAAAAA	FEFAAA	HHHHxx
+1122	3490	0	2	2	2	22	122	1122	1122	1122	44	45	ERAAAA	GEFAAA	OOOOxx
+1855	3491	1	3	5	15	55	855	1855	1855	1855	110	111	JTAAAA	HEFAAA	VVVVxx
+6613	3492	1	1	3	13	13	613	613	1613	6613	26	27	JUAAAA	IEFAAA	AAAAxx
+3231	3493	1	3	1	11	31	231	1231	3231	3231	62	63	HUAAAA	JEFAAA	HHHHxx
+9101	3494	1	1	1	1	1	101	1101	4101	9101	2	3	BMAAAA	KEFAAA	OOOOxx
+4937	3495	1	1	7	17	37	937	937	4937	4937	74	75	XHAAAA	LEFAAA	VVVVxx
+666	3496	0	2	6	6	66	666	666	666	666	132	133	QZAAAA	MEFAAA	AAAAxx
+8943	3497	1	3	3	3	43	943	943	3943	8943	86	87	ZFAAAA	NEFAAA	HHHHxx
+6164	3498	0	0	4	4	64	164	164	1164	6164	128	129	CDAAAA	OEFAAA	OOOOxx
+1081	3499	1	1	1	1	81	81	1081	1081	1081	162	163	PPAAAA	PEFAAA	VVVVxx
+210	3500	0	2	0	10	10	210	210	210	210	20	21	CIAAAA	QEFAAA	AAAAxx
+6024	3501	0	0	4	4	24	24	24	1024	6024	48	49	SXAAAA	REFAAA	HHHHxx
+5715	3502	1	3	5	15	15	715	1715	715	5715	30	31	VLAAAA	SEFAAA	OOOOxx
+8938	3503	0	2	8	18	38	938	938	3938	8938	76	77	UFAAAA	TEFAAA	VVVVxx
+1326	3504	0	2	6	6	26	326	1326	1326	1326	52	53	AZAAAA	UEFAAA	AAAAxx
+7111	3505	1	3	1	11	11	111	1111	2111	7111	22	23	NNAAAA	VEFAAA	HHHHxx
+757	3506	1	1	7	17	57	757	757	757	757	114	115	DDAAAA	WEFAAA	OOOOxx
+8933	3507	1	1	3	13	33	933	933	3933	8933	66	67	PFAAAA	XEFAAA	VVVVxx
+6495	3508	1	3	5	15	95	495	495	1495	6495	190	191	VPAAAA	YEFAAA	AAAAxx
+3134	3509	0	2	4	14	34	134	1134	3134	3134	68	69	OQAAAA	ZEFAAA	HHHHxx
+1304	3510	0	0	4	4	4	304	1304	1304	1304	8	9	EYAAAA	AFFAAA	OOOOxx
+1835	3511	1	3	5	15	35	835	1835	1835	1835	70	71	PSAAAA	BFFAAA	VVVVxx
+7275	3512	1	3	5	15	75	275	1275	2275	7275	150	151	VTAAAA	CFFAAA	AAAAxx
+7337	3513	1	1	7	17	37	337	1337	2337	7337	74	75	FWAAAA	DFFAAA	HHHHxx
+1282	3514	0	2	2	2	82	282	1282	1282	1282	164	165	IXAAAA	EFFAAA	OOOOxx
+6566	3515	0	2	6	6	66	566	566	1566	6566	132	133	OSAAAA	FFFAAA	VVVVxx
+3786	3516	0	2	6	6	86	786	1786	3786	3786	172	173	QPAAAA	GFFAAA	AAAAxx
+5741	3517	1	1	1	1	41	741	1741	741	5741	82	83	VMAAAA	HFFAAA	HHHHxx
+6076	3518	0	0	6	16	76	76	76	1076	6076	152	153	SZAAAA	IFFAAA	OOOOxx
+9998	3519	0	2	8	18	98	998	1998	4998	9998	196	197	OUAAAA	JFFAAA	VVVVxx
+6268	3520	0	0	8	8	68	268	268	1268	6268	136	137	CHAAAA	KFFAAA	AAAAxx
+9647	3521	1	3	7	7	47	647	1647	4647	9647	94	95	BHAAAA	LFFAAA	HHHHxx
+4877	3522	1	1	7	17	77	877	877	4877	4877	154	155	PFAAAA	MFFAAA	OOOOxx
+2652	3523	0	0	2	12	52	652	652	2652	2652	104	105	AYAAAA	NFFAAA	VVVVxx
+1247	3524	1	3	7	7	47	247	1247	1247	1247	94	95	ZVAAAA	OFFAAA	AAAAxx
+2721	3525	1	1	1	1	21	721	721	2721	2721	42	43	RAAAAA	PFFAAA	HHHHxx
+5968	3526	0	0	8	8	68	968	1968	968	5968	136	137	OVAAAA	QFFAAA	OOOOxx
+9570	3527	0	2	0	10	70	570	1570	4570	9570	140	141	CEAAAA	RFFAAA	VVVVxx
+6425	3528	1	1	5	5	25	425	425	1425	6425	50	51	DNAAAA	SFFAAA	AAAAxx
+5451	3529	1	3	1	11	51	451	1451	451	5451	102	103	RBAAAA	TFFAAA	HHHHxx
+5668	3530	0	0	8	8	68	668	1668	668	5668	136	137	AKAAAA	UFFAAA	OOOOxx
+9493	3531	1	1	3	13	93	493	1493	4493	9493	186	187	DBAAAA	VFFAAA	VVVVxx
+7973	3532	1	1	3	13	73	973	1973	2973	7973	146	147	RUAAAA	WFFAAA	AAAAxx
+8250	3533	0	2	0	10	50	250	250	3250	8250	100	101	IFAAAA	XFFAAA	HHHHxx
+82	3534	0	2	2	2	82	82	82	82	82	164	165	EDAAAA	YFFAAA	OOOOxx
+6258	3535	0	2	8	18	58	258	258	1258	6258	116	117	SGAAAA	ZFFAAA	VVVVxx
+9978	3536	0	2	8	18	78	978	1978	4978	9978	156	157	UTAAAA	AGFAAA	AAAAxx
+6930	3537	0	2	0	10	30	930	930	1930	6930	60	61	OGAAAA	BGFAAA	HHHHxx
+3746	3538	0	2	6	6	46	746	1746	3746	3746	92	93	COAAAA	CGFAAA	OOOOxx
+7065	3539	1	1	5	5	65	65	1065	2065	7065	130	131	TLAAAA	DGFAAA	VVVVxx
+4281	3540	1	1	1	1	81	281	281	4281	4281	162	163	RIAAAA	EGFAAA	AAAAxx
+4367	3541	1	3	7	7	67	367	367	4367	4367	134	135	ZLAAAA	FGFAAA	HHHHxx
+9526	3542	0	2	6	6	26	526	1526	4526	9526	52	53	KCAAAA	GGFAAA	OOOOxx
+5880	3543	0	0	0	0	80	880	1880	880	5880	160	161	ESAAAA	HGFAAA	VVVVxx
+8480	3544	0	0	0	0	80	480	480	3480	8480	160	161	EOAAAA	IGFAAA	AAAAxx
+2476	3545	0	0	6	16	76	476	476	2476	2476	152	153	GRAAAA	JGFAAA	HHHHxx
+9074	3546	0	2	4	14	74	74	1074	4074	9074	148	149	ALAAAA	KGFAAA	OOOOxx
+4830	3547	0	2	0	10	30	830	830	4830	4830	60	61	UDAAAA	LGFAAA	VVVVxx
+3207	3548	1	3	7	7	7	207	1207	3207	3207	14	15	JTAAAA	MGFAAA	AAAAxx
+7894	3549	0	2	4	14	94	894	1894	2894	7894	188	189	QRAAAA	NGFAAA	HHHHxx
+3860	3550	0	0	0	0	60	860	1860	3860	3860	120	121	MSAAAA	OGFAAA	OOOOxx
+5293	3551	1	1	3	13	93	293	1293	293	5293	186	187	PVAAAA	PGFAAA	VVVVxx
+6895	3552	1	3	5	15	95	895	895	1895	6895	190	191	FFAAAA	QGFAAA	AAAAxx
+9908	3553	0	0	8	8	8	908	1908	4908	9908	16	17	CRAAAA	RGFAAA	HHHHxx
+9247	3554	1	3	7	7	47	247	1247	4247	9247	94	95	RRAAAA	SGFAAA	OOOOxx
+8110	3555	0	2	0	10	10	110	110	3110	8110	20	21	YZAAAA	TGFAAA	VVVVxx
+4716	3556	0	0	6	16	16	716	716	4716	4716	32	33	KZAAAA	UGFAAA	AAAAxx
+4979	3557	1	3	9	19	79	979	979	4979	4979	158	159	NJAAAA	VGFAAA	HHHHxx
+5280	3558	0	0	0	0	80	280	1280	280	5280	160	161	CVAAAA	WGFAAA	OOOOxx
+8326	3559	0	2	6	6	26	326	326	3326	8326	52	53	GIAAAA	XGFAAA	VVVVxx
+5572	3560	0	0	2	12	72	572	1572	572	5572	144	145	IGAAAA	YGFAAA	AAAAxx
+4665	3561	1	1	5	5	65	665	665	4665	4665	130	131	LXAAAA	ZGFAAA	HHHHxx
+3665	3562	1	1	5	5	65	665	1665	3665	3665	130	131	ZKAAAA	AHFAAA	OOOOxx
+6744	3563	0	0	4	4	44	744	744	1744	6744	88	89	KZAAAA	BHFAAA	VVVVxx
+1897	3564	1	1	7	17	97	897	1897	1897	1897	194	195	ZUAAAA	CHFAAA	AAAAxx
+1220	3565	0	0	0	0	20	220	1220	1220	1220	40	41	YUAAAA	DHFAAA	HHHHxx
+2614	3566	0	2	4	14	14	614	614	2614	2614	28	29	OWAAAA	EHFAAA	OOOOxx
+8509	3567	1	1	9	9	9	509	509	3509	8509	18	19	HPAAAA	FHFAAA	VVVVxx
+8521	3568	1	1	1	1	21	521	521	3521	8521	42	43	TPAAAA	GHFAAA	AAAAxx
+4121	3569	1	1	1	1	21	121	121	4121	4121	42	43	NCAAAA	HHFAAA	HHHHxx
+9663	3570	1	3	3	3	63	663	1663	4663	9663	126	127	RHAAAA	IHFAAA	OOOOxx
+2346	3571	0	2	6	6	46	346	346	2346	2346	92	93	GMAAAA	JHFAAA	VVVVxx
+3370	3572	0	2	0	10	70	370	1370	3370	3370	140	141	QZAAAA	KHFAAA	AAAAxx
+1498	3573	0	2	8	18	98	498	1498	1498	1498	196	197	QFAAAA	LHFAAA	HHHHxx
+7422	3574	0	2	2	2	22	422	1422	2422	7422	44	45	MZAAAA	MHFAAA	OOOOxx
+3472	3575	0	0	2	12	72	472	1472	3472	3472	144	145	ODAAAA	NHFAAA	VVVVxx
+4126	3576	0	2	6	6	26	126	126	4126	4126	52	53	SCAAAA	OHFAAA	AAAAxx
+4494	3577	0	2	4	14	94	494	494	4494	4494	188	189	WQAAAA	PHFAAA	HHHHxx
+6323	3578	1	3	3	3	23	323	323	1323	6323	46	47	FJAAAA	QHFAAA	OOOOxx
+2823	3579	1	3	3	3	23	823	823	2823	2823	46	47	PEAAAA	RHFAAA	VVVVxx
+8596	3580	0	0	6	16	96	596	596	3596	8596	192	193	QSAAAA	SHFAAA	AAAAxx
+6642	3581	0	2	2	2	42	642	642	1642	6642	84	85	MVAAAA	THFAAA	HHHHxx
+9276	3582	0	0	6	16	76	276	1276	4276	9276	152	153	USAAAA	UHFAAA	OOOOxx
+4148	3583	0	0	8	8	48	148	148	4148	4148	96	97	ODAAAA	VHFAAA	VVVVxx
+9770	3584	0	2	0	10	70	770	1770	4770	9770	140	141	ULAAAA	WHFAAA	AAAAxx
+9812	3585	0	0	2	12	12	812	1812	4812	9812	24	25	KNAAAA	XHFAAA	HHHHxx
+4419	3586	1	3	9	19	19	419	419	4419	4419	38	39	ZNAAAA	YHFAAA	OOOOxx
+3802	3587	0	2	2	2	2	802	1802	3802	3802	4	5	GQAAAA	ZHFAAA	VVVVxx
+3210	3588	0	2	0	10	10	210	1210	3210	3210	20	21	MTAAAA	AIFAAA	AAAAxx
+6794	3589	0	2	4	14	94	794	794	1794	6794	188	189	IBAAAA	BIFAAA	HHHHxx
+242	3590	0	2	2	2	42	242	242	242	242	84	85	IJAAAA	CIFAAA	OOOOxx
+962	3591	0	2	2	2	62	962	962	962	962	124	125	ALAAAA	DIFAAA	VVVVxx
+7151	3592	1	3	1	11	51	151	1151	2151	7151	102	103	BPAAAA	EIFAAA	AAAAxx
+9440	3593	0	0	0	0	40	440	1440	4440	9440	80	81	CZAAAA	FIFAAA	HHHHxx
+721	3594	1	1	1	1	21	721	721	721	721	42	43	TBAAAA	GIFAAA	OOOOxx
+2119	3595	1	3	9	19	19	119	119	2119	2119	38	39	NDAAAA	HIFAAA	VVVVxx
+9883	3596	1	3	3	3	83	883	1883	4883	9883	166	167	DQAAAA	IIFAAA	AAAAxx
+5071	3597	1	3	1	11	71	71	1071	71	5071	142	143	BNAAAA	JIFAAA	HHHHxx
+8239	3598	1	3	9	19	39	239	239	3239	8239	78	79	XEAAAA	KIFAAA	OOOOxx
+7451	3599	1	3	1	11	51	451	1451	2451	7451	102	103	PAAAAA	LIFAAA	VVVVxx
+9517	3600	1	1	7	17	17	517	1517	4517	9517	34	35	BCAAAA	MIFAAA	AAAAxx
+9180	3601	0	0	0	0	80	180	1180	4180	9180	160	161	CPAAAA	NIFAAA	HHHHxx
+9327	3602	1	3	7	7	27	327	1327	4327	9327	54	55	TUAAAA	OIFAAA	OOOOxx
+5462	3603	0	2	2	2	62	462	1462	462	5462	124	125	CCAAAA	PIFAAA	VVVVxx
+8306	3604	0	2	6	6	6	306	306	3306	8306	12	13	MHAAAA	QIFAAA	AAAAxx
+6234	3605	0	2	4	14	34	234	234	1234	6234	68	69	UFAAAA	RIFAAA	HHHHxx
+8771	3606	1	3	1	11	71	771	771	3771	8771	142	143	JZAAAA	SIFAAA	OOOOxx
+5853	3607	1	1	3	13	53	853	1853	853	5853	106	107	DRAAAA	TIFAAA	VVVVxx
+8373	3608	1	1	3	13	73	373	373	3373	8373	146	147	BKAAAA	UIFAAA	AAAAxx
+5017	3609	1	1	7	17	17	17	1017	17	5017	34	35	ZKAAAA	VIFAAA	HHHHxx
+8025	3610	1	1	5	5	25	25	25	3025	8025	50	51	RWAAAA	WIFAAA	OOOOxx
+2526	3611	0	2	6	6	26	526	526	2526	2526	52	53	ETAAAA	XIFAAA	VVVVxx
+7419	3612	1	3	9	19	19	419	1419	2419	7419	38	39	JZAAAA	YIFAAA	AAAAxx
+4572	3613	0	0	2	12	72	572	572	4572	4572	144	145	WTAAAA	ZIFAAA	HHHHxx
+7744	3614	0	0	4	4	44	744	1744	2744	7744	88	89	WLAAAA	AJFAAA	OOOOxx
+8825	3615	1	1	5	5	25	825	825	3825	8825	50	51	LBAAAA	BJFAAA	VVVVxx
+6067	3616	1	3	7	7	67	67	67	1067	6067	134	135	JZAAAA	CJFAAA	AAAAxx
+3291	3617	1	3	1	11	91	291	1291	3291	3291	182	183	PWAAAA	DJFAAA	HHHHxx
+7115	3618	1	3	5	15	15	115	1115	2115	7115	30	31	RNAAAA	EJFAAA	OOOOxx
+2626	3619	0	2	6	6	26	626	626	2626	2626	52	53	AXAAAA	FJFAAA	VVVVxx
+4109	3620	1	1	9	9	9	109	109	4109	4109	18	19	BCAAAA	GJFAAA	AAAAxx
+4056	3621	0	0	6	16	56	56	56	4056	4056	112	113	AAAAAA	HJFAAA	HHHHxx
+6811	3622	1	3	1	11	11	811	811	1811	6811	22	23	ZBAAAA	IJFAAA	OOOOxx
+680	3623	0	0	0	0	80	680	680	680	680	160	161	EAAAAA	JJFAAA	VVVVxx
+474	3624	0	2	4	14	74	474	474	474	474	148	149	GSAAAA	KJFAAA	AAAAxx
+9294	3625	0	2	4	14	94	294	1294	4294	9294	188	189	MTAAAA	LJFAAA	HHHHxx
+7555	3626	1	3	5	15	55	555	1555	2555	7555	110	111	PEAAAA	MJFAAA	OOOOxx
+8076	3627	0	0	6	16	76	76	76	3076	8076	152	153	QYAAAA	NJFAAA	VVVVxx
+3840	3628	0	0	0	0	40	840	1840	3840	3840	80	81	SRAAAA	OJFAAA	AAAAxx
+5955	3629	1	3	5	15	55	955	1955	955	5955	110	111	BVAAAA	PJFAAA	HHHHxx
+994	3630	0	2	4	14	94	994	994	994	994	188	189	GMAAAA	QJFAAA	OOOOxx
+2089	3631	1	1	9	9	89	89	89	2089	2089	178	179	JCAAAA	RJFAAA	VVVVxx
+869	3632	1	1	9	9	69	869	869	869	869	138	139	LHAAAA	SJFAAA	AAAAxx
+1223	3633	1	3	3	3	23	223	1223	1223	1223	46	47	BVAAAA	TJFAAA	HHHHxx
+1514	3634	0	2	4	14	14	514	1514	1514	1514	28	29	GGAAAA	UJFAAA	OOOOxx
+4891	3635	1	3	1	11	91	891	891	4891	4891	182	183	DGAAAA	VJFAAA	VVVVxx
+4190	3636	0	2	0	10	90	190	190	4190	4190	180	181	EFAAAA	WJFAAA	AAAAxx
+4377	3637	1	1	7	17	77	377	377	4377	4377	154	155	JMAAAA	XJFAAA	HHHHxx
+9195	3638	1	3	5	15	95	195	1195	4195	9195	190	191	RPAAAA	YJFAAA	OOOOxx
+3827	3639	1	3	7	7	27	827	1827	3827	3827	54	55	FRAAAA	ZJFAAA	VVVVxx
+7386	3640	0	2	6	6	86	386	1386	2386	7386	172	173	CYAAAA	AKFAAA	AAAAxx
+6665	3641	1	1	5	5	65	665	665	1665	6665	130	131	JWAAAA	BKFAAA	HHHHxx
+7514	3642	0	2	4	14	14	514	1514	2514	7514	28	29	ADAAAA	CKFAAA	OOOOxx
+6431	3643	1	3	1	11	31	431	431	1431	6431	62	63	JNAAAA	DKFAAA	VVVVxx
+3251	3644	1	3	1	11	51	251	1251	3251	3251	102	103	BVAAAA	EKFAAA	AAAAxx
+8439	3645	1	3	9	19	39	439	439	3439	8439	78	79	PMAAAA	FKFAAA	HHHHxx
+831	3646	1	3	1	11	31	831	831	831	831	62	63	ZFAAAA	GKFAAA	OOOOxx
+8485	3647	1	1	5	5	85	485	485	3485	8485	170	171	JOAAAA	HKFAAA	VVVVxx
+7314	3648	0	2	4	14	14	314	1314	2314	7314	28	29	IVAAAA	IKFAAA	AAAAxx
+3044	3649	0	0	4	4	44	44	1044	3044	3044	88	89	CNAAAA	JKFAAA	HHHHxx
+4283	3650	1	3	3	3	83	283	283	4283	4283	166	167	TIAAAA	KKFAAA	OOOOxx
+298	3651	0	2	8	18	98	298	298	298	298	196	197	MLAAAA	LKFAAA	VVVVxx
+7114	3652	0	2	4	14	14	114	1114	2114	7114	28	29	QNAAAA	MKFAAA	AAAAxx
+9664	3653	0	0	4	4	64	664	1664	4664	9664	128	129	SHAAAA	NKFAAA	HHHHxx
+5315	3654	1	3	5	15	15	315	1315	315	5315	30	31	LWAAAA	OKFAAA	OOOOxx
+2164	3655	0	0	4	4	64	164	164	2164	2164	128	129	GFAAAA	PKFAAA	VVVVxx
+3390	3656	0	2	0	10	90	390	1390	3390	3390	180	181	KAAAAA	QKFAAA	AAAAxx
+836	3657	0	0	6	16	36	836	836	836	836	72	73	EGAAAA	RKFAAA	HHHHxx
+3316	3658	0	0	6	16	16	316	1316	3316	3316	32	33	OXAAAA	SKFAAA	OOOOxx
+1284	3659	0	0	4	4	84	284	1284	1284	1284	168	169	KXAAAA	TKFAAA	VVVVxx
+2497	3660	1	1	7	17	97	497	497	2497	2497	194	195	BSAAAA	UKFAAA	AAAAxx
+1374	3661	0	2	4	14	74	374	1374	1374	1374	148	149	WAAAAA	VKFAAA	HHHHxx
+9525	3662	1	1	5	5	25	525	1525	4525	9525	50	51	JCAAAA	WKFAAA	OOOOxx
+2911	3663	1	3	1	11	11	911	911	2911	2911	22	23	ZHAAAA	XKFAAA	VVVVxx
+9686	3664	0	2	6	6	86	686	1686	4686	9686	172	173	OIAAAA	YKFAAA	AAAAxx
+584	3665	0	0	4	4	84	584	584	584	584	168	169	MWAAAA	ZKFAAA	HHHHxx
+5653	3666	1	1	3	13	53	653	1653	653	5653	106	107	LJAAAA	ALFAAA	OOOOxx
+4986	3667	0	2	6	6	86	986	986	4986	4986	172	173	UJAAAA	BLFAAA	VVVVxx
+6049	3668	1	1	9	9	49	49	49	1049	6049	98	99	RYAAAA	CLFAAA	AAAAxx
+9891	3669	1	3	1	11	91	891	1891	4891	9891	182	183	LQAAAA	DLFAAA	HHHHxx
+8809	3670	1	1	9	9	9	809	809	3809	8809	18	19	VAAAAA	ELFAAA	OOOOxx
+8598	3671	0	2	8	18	98	598	598	3598	8598	196	197	SSAAAA	FLFAAA	VVVVxx
+2573	3672	1	1	3	13	73	573	573	2573	2573	146	147	ZUAAAA	GLFAAA	AAAAxx
+6864	3673	0	0	4	4	64	864	864	1864	6864	128	129	AEAAAA	HLFAAA	HHHHxx
+7932	3674	0	0	2	12	32	932	1932	2932	7932	64	65	CTAAAA	ILFAAA	OOOOxx
+6605	3675	1	1	5	5	5	605	605	1605	6605	10	11	BUAAAA	JLFAAA	VVVVxx
+9500	3676	0	0	0	0	0	500	1500	4500	9500	0	1	KBAAAA	KLFAAA	AAAAxx
+8742	3677	0	2	2	2	42	742	742	3742	8742	84	85	GYAAAA	LLFAAA	HHHHxx
+9815	3678	1	3	5	15	15	815	1815	4815	9815	30	31	NNAAAA	MLFAAA	OOOOxx
+3319	3679	1	3	9	19	19	319	1319	3319	3319	38	39	RXAAAA	NLFAAA	VVVVxx
+184	3680	0	0	4	4	84	184	184	184	184	168	169	CHAAAA	OLFAAA	AAAAxx
+8886	3681	0	2	6	6	86	886	886	3886	8886	172	173	UDAAAA	PLFAAA	HHHHxx
+7050	3682	0	2	0	10	50	50	1050	2050	7050	100	101	ELAAAA	QLFAAA	OOOOxx
+9781	3683	1	1	1	1	81	781	1781	4781	9781	162	163	FMAAAA	RLFAAA	VVVVxx
+2443	3684	1	3	3	3	43	443	443	2443	2443	86	87	ZPAAAA	SLFAAA	AAAAxx
+1160	3685	0	0	0	0	60	160	1160	1160	1160	120	121	QSAAAA	TLFAAA	HHHHxx
+4600	3686	0	0	0	0	0	600	600	4600	4600	0	1	YUAAAA	ULFAAA	OOOOxx
+813	3687	1	1	3	13	13	813	813	813	813	26	27	HFAAAA	VLFAAA	VVVVxx
+5078	3688	0	2	8	18	78	78	1078	78	5078	156	157	INAAAA	WLFAAA	AAAAxx
+9008	3689	0	0	8	8	8	8	1008	4008	9008	16	17	MIAAAA	XLFAAA	HHHHxx
+9016	3690	0	0	6	16	16	16	1016	4016	9016	32	33	UIAAAA	YLFAAA	OOOOxx
+2747	3691	1	3	7	7	47	747	747	2747	2747	94	95	RBAAAA	ZLFAAA	VVVVxx
+3106	3692	0	2	6	6	6	106	1106	3106	3106	12	13	MPAAAA	AMFAAA	AAAAxx
+8235	3693	1	3	5	15	35	235	235	3235	8235	70	71	TEAAAA	BMFAAA	HHHHxx
+5582	3694	0	2	2	2	82	582	1582	582	5582	164	165	SGAAAA	CMFAAA	OOOOxx
+4334	3695	0	2	4	14	34	334	334	4334	4334	68	69	SKAAAA	DMFAAA	VVVVxx
+1612	3696	0	0	2	12	12	612	1612	1612	1612	24	25	AKAAAA	EMFAAA	AAAAxx
+5650	3697	0	2	0	10	50	650	1650	650	5650	100	101	IJAAAA	FMFAAA	HHHHxx
+6086	3698	0	2	6	6	86	86	86	1086	6086	172	173	CAAAAA	GMFAAA	OOOOxx
+9667	3699	1	3	7	7	67	667	1667	4667	9667	134	135	VHAAAA	HMFAAA	VVVVxx
+4215	3700	1	3	5	15	15	215	215	4215	4215	30	31	DGAAAA	IMFAAA	AAAAxx
+8553	3701	1	1	3	13	53	553	553	3553	8553	106	107	ZQAAAA	JMFAAA	HHHHxx
+9066	3702	0	2	6	6	66	66	1066	4066	9066	132	133	SKAAAA	KMFAAA	OOOOxx
+1092	3703	0	0	2	12	92	92	1092	1092	1092	184	185	AQAAAA	LMFAAA	VVVVxx
+2848	3704	0	0	8	8	48	848	848	2848	2848	96	97	OFAAAA	MMFAAA	AAAAxx
+2765	3705	1	1	5	5	65	765	765	2765	2765	130	131	JCAAAA	NMFAAA	HHHHxx
+6513	3706	1	1	3	13	13	513	513	1513	6513	26	27	NQAAAA	OMFAAA	OOOOxx
+6541	3707	1	1	1	1	41	541	541	1541	6541	82	83	PRAAAA	PMFAAA	VVVVxx
+9617	3708	1	1	7	17	17	617	1617	4617	9617	34	35	XFAAAA	QMFAAA	AAAAxx
+5870	3709	0	2	0	10	70	870	1870	870	5870	140	141	URAAAA	RMFAAA	HHHHxx
+8811	3710	1	3	1	11	11	811	811	3811	8811	22	23	XAAAAA	SMFAAA	OOOOxx
+4529	3711	1	1	9	9	29	529	529	4529	4529	58	59	FSAAAA	TMFAAA	VVVVxx
+161	3712	1	1	1	1	61	161	161	161	161	122	123	FGAAAA	UMFAAA	AAAAxx
+641	3713	1	1	1	1	41	641	641	641	641	82	83	RYAAAA	VMFAAA	HHHHxx
+4767	3714	1	3	7	7	67	767	767	4767	4767	134	135	JBAAAA	WMFAAA	OOOOxx
+6293	3715	1	1	3	13	93	293	293	1293	6293	186	187	BIAAAA	XMFAAA	VVVVxx
+3816	3716	0	0	6	16	16	816	1816	3816	3816	32	33	UQAAAA	YMFAAA	AAAAxx
+4748	3717	0	0	8	8	48	748	748	4748	4748	96	97	QAAAAA	ZMFAAA	HHHHxx
+9924	3718	0	0	4	4	24	924	1924	4924	9924	48	49	SRAAAA	ANFAAA	OOOOxx
+6716	3719	0	0	6	16	16	716	716	1716	6716	32	33	IYAAAA	BNFAAA	VVVVxx
+8828	3720	0	0	8	8	28	828	828	3828	8828	56	57	OBAAAA	CNFAAA	AAAAxx
+4967	3721	1	3	7	7	67	967	967	4967	4967	134	135	BJAAAA	DNFAAA	HHHHxx
+9680	3722	0	0	0	0	80	680	1680	4680	9680	160	161	IIAAAA	ENFAAA	OOOOxx
+2784	3723	0	0	4	4	84	784	784	2784	2784	168	169	CDAAAA	FNFAAA	VVVVxx
+2882	3724	0	2	2	2	82	882	882	2882	2882	164	165	WGAAAA	GNFAAA	AAAAxx
+3641	3725	1	1	1	1	41	641	1641	3641	3641	82	83	BKAAAA	HNFAAA	HHHHxx
+5537	3726	1	1	7	17	37	537	1537	537	5537	74	75	ZEAAAA	INFAAA	OOOOxx
+820	3727	0	0	0	0	20	820	820	820	820	40	41	OFAAAA	JNFAAA	VVVVxx
+5847	3728	1	3	7	7	47	847	1847	847	5847	94	95	XQAAAA	KNFAAA	AAAAxx
+566	3729	0	2	6	6	66	566	566	566	566	132	133	UVAAAA	LNFAAA	HHHHxx
+2246	3730	0	2	6	6	46	246	246	2246	2246	92	93	KIAAAA	MNFAAA	OOOOxx
+6680	3731	0	0	0	0	80	680	680	1680	6680	160	161	YWAAAA	NNFAAA	VVVVxx
+2014	3732	0	2	4	14	14	14	14	2014	2014	28	29	MZAAAA	ONFAAA	AAAAxx
+8355	3733	1	3	5	15	55	355	355	3355	8355	110	111	JJAAAA	PNFAAA	HHHHxx
+1610	3734	0	2	0	10	10	610	1610	1610	1610	20	21	YJAAAA	QNFAAA	OOOOxx
+9719	3735	1	3	9	19	19	719	1719	4719	9719	38	39	VJAAAA	RNFAAA	VVVVxx
+8498	3736	0	2	8	18	98	498	498	3498	8498	196	197	WOAAAA	SNFAAA	AAAAxx
+5883	3737	1	3	3	3	83	883	1883	883	5883	166	167	HSAAAA	TNFAAA	HHHHxx
+7380	3738	0	0	0	0	80	380	1380	2380	7380	160	161	WXAAAA	UNFAAA	OOOOxx
+8865	3739	1	1	5	5	65	865	865	3865	8865	130	131	ZCAAAA	VNFAAA	VVVVxx
+4743	3740	1	3	3	3	43	743	743	4743	4743	86	87	LAAAAA	WNFAAA	AAAAxx
+5086	3741	0	2	6	6	86	86	1086	86	5086	172	173	QNAAAA	XNFAAA	HHHHxx
+2739	3742	1	3	9	19	39	739	739	2739	2739	78	79	JBAAAA	YNFAAA	OOOOxx
+9375	3743	1	3	5	15	75	375	1375	4375	9375	150	151	PWAAAA	ZNFAAA	VVVVxx
+7876	3744	0	0	6	16	76	876	1876	2876	7876	152	153	YQAAAA	AOFAAA	AAAAxx
+453	3745	1	1	3	13	53	453	453	453	453	106	107	LRAAAA	BOFAAA	HHHHxx
+6987	3746	1	3	7	7	87	987	987	1987	6987	174	175	TIAAAA	COFAAA	OOOOxx
+2860	3747	0	0	0	0	60	860	860	2860	2860	120	121	AGAAAA	DOFAAA	VVVVxx
+8372	3748	0	0	2	12	72	372	372	3372	8372	144	145	AKAAAA	EOFAAA	AAAAxx
+2048	3749	0	0	8	8	48	48	48	2048	2048	96	97	UAAAAA	FOFAAA	HHHHxx
+9231	3750	1	3	1	11	31	231	1231	4231	9231	62	63	BRAAAA	GOFAAA	OOOOxx
+634	3751	0	2	4	14	34	634	634	634	634	68	69	KYAAAA	HOFAAA	VVVVxx
+3998	3752	0	2	8	18	98	998	1998	3998	3998	196	197	UXAAAA	IOFAAA	AAAAxx
+4728	3753	0	0	8	8	28	728	728	4728	4728	56	57	WZAAAA	JOFAAA	HHHHxx
+579	3754	1	3	9	19	79	579	579	579	579	158	159	HWAAAA	KOFAAA	OOOOxx
+815	3755	1	3	5	15	15	815	815	815	815	30	31	JFAAAA	LOFAAA	VVVVxx
+1009	3756	1	1	9	9	9	9	1009	1009	1009	18	19	VMAAAA	MOFAAA	AAAAxx
+6596	3757	0	0	6	16	96	596	596	1596	6596	192	193	STAAAA	NOFAAA	HHHHxx
+2793	3758	1	1	3	13	93	793	793	2793	2793	186	187	LDAAAA	OOFAAA	OOOOxx
+9589	3759	1	1	9	9	89	589	1589	4589	9589	178	179	VEAAAA	POFAAA	VVVVxx
+2794	3760	0	2	4	14	94	794	794	2794	2794	188	189	MDAAAA	QOFAAA	AAAAxx
+2551	3761	1	3	1	11	51	551	551	2551	2551	102	103	DUAAAA	ROFAAA	HHHHxx
+1588	3762	0	0	8	8	88	588	1588	1588	1588	176	177	CJAAAA	SOFAAA	OOOOxx
+4443	3763	1	3	3	3	43	443	443	4443	4443	86	87	XOAAAA	TOFAAA	VVVVxx
+5009	3764	1	1	9	9	9	9	1009	9	5009	18	19	RKAAAA	UOFAAA	AAAAxx
+4287	3765	1	3	7	7	87	287	287	4287	4287	174	175	XIAAAA	VOFAAA	HHHHxx
+2167	3766	1	3	7	7	67	167	167	2167	2167	134	135	JFAAAA	WOFAAA	OOOOxx
+2290	3767	0	2	0	10	90	290	290	2290	2290	180	181	CKAAAA	XOFAAA	VVVVxx
+7225	3768	1	1	5	5	25	225	1225	2225	7225	50	51	XRAAAA	YOFAAA	AAAAxx
+8992	3769	0	0	2	12	92	992	992	3992	8992	184	185	WHAAAA	ZOFAAA	HHHHxx
+1540	3770	0	0	0	0	40	540	1540	1540	1540	80	81	GHAAAA	APFAAA	OOOOxx
+2029	3771	1	1	9	9	29	29	29	2029	2029	58	59	BAAAAA	BPFAAA	VVVVxx
+2855	3772	1	3	5	15	55	855	855	2855	2855	110	111	VFAAAA	CPFAAA	AAAAxx
+3534	3773	0	2	4	14	34	534	1534	3534	3534	68	69	YFAAAA	DPFAAA	HHHHxx
+8078	3774	0	2	8	18	78	78	78	3078	8078	156	157	SYAAAA	EPFAAA	OOOOxx
+9778	3775	0	2	8	18	78	778	1778	4778	9778	156	157	CMAAAA	FPFAAA	VVVVxx
+3543	3776	1	3	3	3	43	543	1543	3543	3543	86	87	HGAAAA	GPFAAA	AAAAxx
+4778	3777	0	2	8	18	78	778	778	4778	4778	156	157	UBAAAA	HPFAAA	HHHHxx
+8931	3778	1	3	1	11	31	931	931	3931	8931	62	63	NFAAAA	IPFAAA	OOOOxx
+557	3779	1	1	7	17	57	557	557	557	557	114	115	LVAAAA	JPFAAA	VVVVxx
+5546	3780	0	2	6	6	46	546	1546	546	5546	92	93	IFAAAA	KPFAAA	AAAAxx
+7527	3781	1	3	7	7	27	527	1527	2527	7527	54	55	NDAAAA	LPFAAA	HHHHxx
+5000	3782	0	0	0	0	0	0	1000	0	5000	0	1	IKAAAA	MPFAAA	OOOOxx
+7587	3783	1	3	7	7	87	587	1587	2587	7587	174	175	VFAAAA	NPFAAA	VVVVxx
+3014	3784	0	2	4	14	14	14	1014	3014	3014	28	29	YLAAAA	OPFAAA	AAAAxx
+5276	3785	0	0	6	16	76	276	1276	276	5276	152	153	YUAAAA	PPFAAA	HHHHxx
+6457	3786	1	1	7	17	57	457	457	1457	6457	114	115	JOAAAA	QPFAAA	OOOOxx
+389	3787	1	1	9	9	89	389	389	389	389	178	179	ZOAAAA	RPFAAA	VVVVxx
+7104	3788	0	0	4	4	4	104	1104	2104	7104	8	9	GNAAAA	SPFAAA	AAAAxx
+9995	3789	1	3	5	15	95	995	1995	4995	9995	190	191	LUAAAA	TPFAAA	HHHHxx
+7368	3790	0	0	8	8	68	368	1368	2368	7368	136	137	KXAAAA	UPFAAA	OOOOxx
+3258	3791	0	2	8	18	58	258	1258	3258	3258	116	117	IVAAAA	VPFAAA	VVVVxx
+9208	3792	0	0	8	8	8	208	1208	4208	9208	16	17	EQAAAA	WPFAAA	AAAAxx
+2396	3793	0	0	6	16	96	396	396	2396	2396	192	193	EOAAAA	XPFAAA	HHHHxx
+1715	3794	1	3	5	15	15	715	1715	1715	1715	30	31	ZNAAAA	YPFAAA	OOOOxx
+1240	3795	0	0	0	0	40	240	1240	1240	1240	80	81	SVAAAA	ZPFAAA	VVVVxx
+1952	3796	0	0	2	12	52	952	1952	1952	1952	104	105	CXAAAA	AQFAAA	AAAAxx
+4403	3797	1	3	3	3	3	403	403	4403	4403	6	7	JNAAAA	BQFAAA	HHHHxx
+6333	3798	1	1	3	13	33	333	333	1333	6333	66	67	PJAAAA	CQFAAA	OOOOxx
+2492	3799	0	0	2	12	92	492	492	2492	2492	184	185	WRAAAA	DQFAAA	VVVVxx
+6543	3800	1	3	3	3	43	543	543	1543	6543	86	87	RRAAAA	EQFAAA	AAAAxx
+5548	3801	0	0	8	8	48	548	1548	548	5548	96	97	KFAAAA	FQFAAA	HHHHxx
+3458	3802	0	2	8	18	58	458	1458	3458	3458	116	117	ADAAAA	GQFAAA	OOOOxx
+2588	3803	0	0	8	8	88	588	588	2588	2588	176	177	OVAAAA	HQFAAA	VVVVxx
+1364	3804	0	0	4	4	64	364	1364	1364	1364	128	129	MAAAAA	IQFAAA	AAAAxx
+9856	3805	0	0	6	16	56	856	1856	4856	9856	112	113	CPAAAA	JQFAAA	HHHHxx
+4964	3806	0	0	4	4	64	964	964	4964	4964	128	129	YIAAAA	KQFAAA	OOOOxx
+773	3807	1	1	3	13	73	773	773	773	773	146	147	TDAAAA	LQFAAA	VVVVxx
+6402	3808	0	2	2	2	2	402	402	1402	6402	4	5	GMAAAA	MQFAAA	AAAAxx
+7213	3809	1	1	3	13	13	213	1213	2213	7213	26	27	LRAAAA	NQFAAA	HHHHxx
+3385	3810	1	1	5	5	85	385	1385	3385	3385	170	171	FAAAAA	OQFAAA	OOOOxx
+6005	3811	1	1	5	5	5	5	5	1005	6005	10	11	ZWAAAA	PQFAAA	VVVVxx
+9346	3812	0	2	6	6	46	346	1346	4346	9346	92	93	MVAAAA	QQFAAA	AAAAxx
+1831	3813	1	3	1	11	31	831	1831	1831	1831	62	63	LSAAAA	RQFAAA	HHHHxx
+5406	3814	0	2	6	6	6	406	1406	406	5406	12	13	YZAAAA	SQFAAA	OOOOxx
+2154	3815	0	2	4	14	54	154	154	2154	2154	108	109	WEAAAA	TQFAAA	VVVVxx
+3721	3816	1	1	1	1	21	721	1721	3721	3721	42	43	DNAAAA	UQFAAA	AAAAxx
+2889	3817	1	1	9	9	89	889	889	2889	2889	178	179	DHAAAA	VQFAAA	HHHHxx
+4410	3818	0	2	0	10	10	410	410	4410	4410	20	21	QNAAAA	WQFAAA	OOOOxx
+7102	3819	0	2	2	2	2	102	1102	2102	7102	4	5	ENAAAA	XQFAAA	VVVVxx
+4057	3820	1	1	7	17	57	57	57	4057	4057	114	115	BAAAAA	YQFAAA	AAAAxx
+9780	3821	0	0	0	0	80	780	1780	4780	9780	160	161	EMAAAA	ZQFAAA	HHHHxx
+9481	3822	1	1	1	1	81	481	1481	4481	9481	162	163	RAAAAA	ARFAAA	OOOOxx
+2366	3823	0	2	6	6	66	366	366	2366	2366	132	133	ANAAAA	BRFAAA	VVVVxx
+2708	3824	0	0	8	8	8	708	708	2708	2708	16	17	EAAAAA	CRFAAA	AAAAxx
+7399	3825	1	3	9	19	99	399	1399	2399	7399	198	199	PYAAAA	DRFAAA	HHHHxx
+5234	3826	0	2	4	14	34	234	1234	234	5234	68	69	ITAAAA	ERFAAA	OOOOxx
+1843	3827	1	3	3	3	43	843	1843	1843	1843	86	87	XSAAAA	FRFAAA	VVVVxx
+1006	3828	0	2	6	6	6	6	1006	1006	1006	12	13	SMAAAA	GRFAAA	AAAAxx
+7696	3829	0	0	6	16	96	696	1696	2696	7696	192	193	AKAAAA	HRFAAA	HHHHxx
+6411	3830	1	3	1	11	11	411	411	1411	6411	22	23	PMAAAA	IRFAAA	OOOOxx
+3913	3831	1	1	3	13	13	913	1913	3913	3913	26	27	NUAAAA	JRFAAA	VVVVxx
+2538	3832	0	2	8	18	38	538	538	2538	2538	76	77	QTAAAA	KRFAAA	AAAAxx
+3019	3833	1	3	9	19	19	19	1019	3019	3019	38	39	DMAAAA	LRFAAA	HHHHxx
+107	3834	1	3	7	7	7	107	107	107	107	14	15	DEAAAA	MRFAAA	OOOOxx
+427	3835	1	3	7	7	27	427	427	427	427	54	55	LQAAAA	NRFAAA	VVVVxx
+9849	3836	1	1	9	9	49	849	1849	4849	9849	98	99	VOAAAA	ORFAAA	AAAAxx
+4195	3837	1	3	5	15	95	195	195	4195	4195	190	191	JFAAAA	PRFAAA	HHHHxx
+9215	3838	1	3	5	15	15	215	1215	4215	9215	30	31	LQAAAA	QRFAAA	OOOOxx
+3165	3839	1	1	5	5	65	165	1165	3165	3165	130	131	TRAAAA	RRFAAA	VVVVxx
+3280	3840	0	0	0	0	80	280	1280	3280	3280	160	161	EWAAAA	SRFAAA	AAAAxx
+4477	3841	1	1	7	17	77	477	477	4477	4477	154	155	FQAAAA	TRFAAA	HHHHxx
+5885	3842	1	1	5	5	85	885	1885	885	5885	170	171	JSAAAA	URFAAA	OOOOxx
+3311	3843	1	3	1	11	11	311	1311	3311	3311	22	23	JXAAAA	VRFAAA	VVVVxx
+6453	3844	1	1	3	13	53	453	453	1453	6453	106	107	FOAAAA	WRFAAA	AAAAxx
+8527	3845	1	3	7	7	27	527	527	3527	8527	54	55	ZPAAAA	XRFAAA	HHHHxx
+1921	3846	1	1	1	1	21	921	1921	1921	1921	42	43	XVAAAA	YRFAAA	OOOOxx
+2427	3847	1	3	7	7	27	427	427	2427	2427	54	55	JPAAAA	ZRFAAA	VVVVxx
+3691	3848	1	3	1	11	91	691	1691	3691	3691	182	183	ZLAAAA	ASFAAA	AAAAxx
+3882	3849	0	2	2	2	82	882	1882	3882	3882	164	165	ITAAAA	BSFAAA	HHHHxx
+562	3850	0	2	2	2	62	562	562	562	562	124	125	QVAAAA	CSFAAA	OOOOxx
+377	3851	1	1	7	17	77	377	377	377	377	154	155	NOAAAA	DSFAAA	VVVVxx
+1497	3852	1	1	7	17	97	497	1497	1497	1497	194	195	PFAAAA	ESFAAA	AAAAxx
+4453	3853	1	1	3	13	53	453	453	4453	4453	106	107	HPAAAA	FSFAAA	HHHHxx
+4678	3854	0	2	8	18	78	678	678	4678	4678	156	157	YXAAAA	GSFAAA	OOOOxx
+2234	3855	0	2	4	14	34	234	234	2234	2234	68	69	YHAAAA	HSFAAA	VVVVxx
+1073	3856	1	1	3	13	73	73	1073	1073	1073	146	147	HPAAAA	ISFAAA	AAAAxx
+6479	3857	1	3	9	19	79	479	479	1479	6479	158	159	FPAAAA	JSFAAA	HHHHxx
+5665	3858	1	1	5	5	65	665	1665	665	5665	130	131	XJAAAA	KSFAAA	OOOOxx
+586	3859	0	2	6	6	86	586	586	586	586	172	173	OWAAAA	LSFAAA	VVVVxx
+1584	3860	0	0	4	4	84	584	1584	1584	1584	168	169	YIAAAA	MSFAAA	AAAAxx
+2574	3861	0	2	4	14	74	574	574	2574	2574	148	149	AVAAAA	NSFAAA	HHHHxx
+9833	3862	1	1	3	13	33	833	1833	4833	9833	66	67	FOAAAA	OSFAAA	OOOOxx
+6726	3863	0	2	6	6	26	726	726	1726	6726	52	53	SYAAAA	PSFAAA	VVVVxx
+8497	3864	1	1	7	17	97	497	497	3497	8497	194	195	VOAAAA	QSFAAA	AAAAxx
+2914	3865	0	2	4	14	14	914	914	2914	2914	28	29	CIAAAA	RSFAAA	HHHHxx
+8586	3866	0	2	6	6	86	586	586	3586	8586	172	173	GSAAAA	SSFAAA	OOOOxx
+6973	3867	1	1	3	13	73	973	973	1973	6973	146	147	FIAAAA	TSFAAA	VVVVxx
+1322	3868	0	2	2	2	22	322	1322	1322	1322	44	45	WYAAAA	USFAAA	AAAAxx
+5242	3869	0	2	2	2	42	242	1242	242	5242	84	85	QTAAAA	VSFAAA	HHHHxx
+5581	3870	1	1	1	1	81	581	1581	581	5581	162	163	RGAAAA	WSFAAA	OOOOxx
+1365	3871	1	1	5	5	65	365	1365	1365	1365	130	131	NAAAAA	XSFAAA	VVVVxx
+2818	3872	0	2	8	18	18	818	818	2818	2818	36	37	KEAAAA	YSFAAA	AAAAxx
+3758	3873	0	2	8	18	58	758	1758	3758	3758	116	117	OOAAAA	ZSFAAA	HHHHxx
+2665	3874	1	1	5	5	65	665	665	2665	2665	130	131	NYAAAA	ATFAAA	OOOOxx
+9823	3875	1	3	3	3	23	823	1823	4823	9823	46	47	VNAAAA	BTFAAA	VVVVxx
+7057	3876	1	1	7	17	57	57	1057	2057	7057	114	115	LLAAAA	CTFAAA	AAAAxx
+543	3877	1	3	3	3	43	543	543	543	543	86	87	XUAAAA	DTFAAA	HHHHxx
+4008	3878	0	0	8	8	8	8	8	4008	4008	16	17	EYAAAA	ETFAAA	OOOOxx
+4397	3879	1	1	7	17	97	397	397	4397	4397	194	195	DNAAAA	FTFAAA	VVVVxx
+8533	3880	1	1	3	13	33	533	533	3533	8533	66	67	FQAAAA	GTFAAA	AAAAxx
+9728	3881	0	0	8	8	28	728	1728	4728	9728	56	57	EKAAAA	HTFAAA	HHHHxx
+5198	3882	0	2	8	18	98	198	1198	198	5198	196	197	YRAAAA	ITFAAA	OOOOxx
+5036	3883	0	0	6	16	36	36	1036	36	5036	72	73	SLAAAA	JTFAAA	VVVVxx
+4394	3884	0	2	4	14	94	394	394	4394	4394	188	189	ANAAAA	KTFAAA	AAAAxx
+9633	3885	1	1	3	13	33	633	1633	4633	9633	66	67	NGAAAA	LTFAAA	HHHHxx
+3339	3886	1	3	9	19	39	339	1339	3339	3339	78	79	LYAAAA	MTFAAA	OOOOxx
+9529	3887	1	1	9	9	29	529	1529	4529	9529	58	59	NCAAAA	NTFAAA	VVVVxx
+4780	3888	0	0	0	0	80	780	780	4780	4780	160	161	WBAAAA	OTFAAA	AAAAxx
+4862	3889	0	2	2	2	62	862	862	4862	4862	124	125	AFAAAA	PTFAAA	HHHHxx
+8152	3890	0	0	2	12	52	152	152	3152	8152	104	105	OBAAAA	QTFAAA	OOOOxx
+9330	3891	0	2	0	10	30	330	1330	4330	9330	60	61	WUAAAA	RTFAAA	VVVVxx
+4362	3892	0	2	2	2	62	362	362	4362	4362	124	125	ULAAAA	STFAAA	AAAAxx
+4688	3893	0	0	8	8	88	688	688	4688	4688	176	177	IYAAAA	TTFAAA	HHHHxx
+1903	3894	1	3	3	3	3	903	1903	1903	1903	6	7	FVAAAA	UTFAAA	OOOOxx
+9027	3895	1	3	7	7	27	27	1027	4027	9027	54	55	FJAAAA	VTFAAA	VVVVxx
+5385	3896	1	1	5	5	85	385	1385	385	5385	170	171	DZAAAA	WTFAAA	AAAAxx
+9854	3897	0	2	4	14	54	854	1854	4854	9854	108	109	APAAAA	XTFAAA	HHHHxx
+9033	3898	1	1	3	13	33	33	1033	4033	9033	66	67	LJAAAA	YTFAAA	OOOOxx
+3185	3899	1	1	5	5	85	185	1185	3185	3185	170	171	NSAAAA	ZTFAAA	VVVVxx
+2618	3900	0	2	8	18	18	618	618	2618	2618	36	37	SWAAAA	AUFAAA	AAAAxx
+371	3901	1	3	1	11	71	371	371	371	371	142	143	HOAAAA	BUFAAA	HHHHxx
+3697	3902	1	1	7	17	97	697	1697	3697	3697	194	195	FMAAAA	CUFAAA	OOOOxx
+1682	3903	0	2	2	2	82	682	1682	1682	1682	164	165	SMAAAA	DUFAAA	VVVVxx
+3333	3904	1	1	3	13	33	333	1333	3333	3333	66	67	FYAAAA	EUFAAA	AAAAxx
+1722	3905	0	2	2	2	22	722	1722	1722	1722	44	45	GOAAAA	FUFAAA	HHHHxx
+2009	3906	1	1	9	9	9	9	9	2009	2009	18	19	HZAAAA	GUFAAA	OOOOxx
+3517	3907	1	1	7	17	17	517	1517	3517	3517	34	35	HFAAAA	HUFAAA	VVVVxx
+7640	3908	0	0	0	0	40	640	1640	2640	7640	80	81	WHAAAA	IUFAAA	AAAAxx
+259	3909	1	3	9	19	59	259	259	259	259	118	119	ZJAAAA	JUFAAA	HHHHxx
+1400	3910	0	0	0	0	0	400	1400	1400	1400	0	1	WBAAAA	KUFAAA	OOOOxx
+6663	3911	1	3	3	3	63	663	663	1663	6663	126	127	HWAAAA	LUFAAA	VVVVxx
+1576	3912	0	0	6	16	76	576	1576	1576	1576	152	153	QIAAAA	MUFAAA	AAAAxx
+8843	3913	1	3	3	3	43	843	843	3843	8843	86	87	DCAAAA	NUFAAA	HHHHxx
+9474	3914	0	2	4	14	74	474	1474	4474	9474	148	149	KAAAAA	OUFAAA	OOOOxx
+1597	3915	1	1	7	17	97	597	1597	1597	1597	194	195	LJAAAA	PUFAAA	VVVVxx
+1143	3916	1	3	3	3	43	143	1143	1143	1143	86	87	ZRAAAA	QUFAAA	AAAAxx
+4162	3917	0	2	2	2	62	162	162	4162	4162	124	125	CEAAAA	RUFAAA	HHHHxx
+1301	3918	1	1	1	1	1	301	1301	1301	1301	2	3	BYAAAA	SUFAAA	OOOOxx
+2935	3919	1	3	5	15	35	935	935	2935	2935	70	71	XIAAAA	TUFAAA	VVVVxx
+886	3920	0	2	6	6	86	886	886	886	886	172	173	CIAAAA	UUFAAA	AAAAxx
+1661	3921	1	1	1	1	61	661	1661	1661	1661	122	123	XLAAAA	VUFAAA	HHHHxx
+1026	3922	0	2	6	6	26	26	1026	1026	1026	52	53	MNAAAA	WUFAAA	OOOOxx
+7034	3923	0	2	4	14	34	34	1034	2034	7034	68	69	OKAAAA	XUFAAA	VVVVxx
+2305	3924	1	1	5	5	5	305	305	2305	2305	10	11	RKAAAA	YUFAAA	AAAAxx
+1725	3925	1	1	5	5	25	725	1725	1725	1725	50	51	JOAAAA	ZUFAAA	HHHHxx
+909	3926	1	1	9	9	9	909	909	909	909	18	19	ZIAAAA	AVFAAA	OOOOxx
+9906	3927	0	2	6	6	6	906	1906	4906	9906	12	13	ARAAAA	BVFAAA	VVVVxx
+3309	3928	1	1	9	9	9	309	1309	3309	3309	18	19	HXAAAA	CVFAAA	AAAAxx
+515	3929	1	3	5	15	15	515	515	515	515	30	31	VTAAAA	DVFAAA	HHHHxx
+932	3930	0	0	2	12	32	932	932	932	932	64	65	WJAAAA	EVFAAA	OOOOxx
+8144	3931	0	0	4	4	44	144	144	3144	8144	88	89	GBAAAA	FVFAAA	VVVVxx
+5592	3932	0	0	2	12	92	592	1592	592	5592	184	185	CHAAAA	GVFAAA	AAAAxx
+4003	3933	1	3	3	3	3	3	3	4003	4003	6	7	ZXAAAA	HVFAAA	HHHHxx
+9566	3934	0	2	6	6	66	566	1566	4566	9566	132	133	YDAAAA	IVFAAA	OOOOxx
+4556	3935	0	0	6	16	56	556	556	4556	4556	112	113	GTAAAA	JVFAAA	VVVVxx
+268	3936	0	0	8	8	68	268	268	268	268	136	137	IKAAAA	KVFAAA	AAAAxx
+8107	3937	1	3	7	7	7	107	107	3107	8107	14	15	VZAAAA	LVFAAA	HHHHxx
+5816	3938	0	0	6	16	16	816	1816	816	5816	32	33	SPAAAA	MVFAAA	OOOOxx
+8597	3939	1	1	7	17	97	597	597	3597	8597	194	195	RSAAAA	NVFAAA	VVVVxx
+9611	3940	1	3	1	11	11	611	1611	4611	9611	22	23	RFAAAA	OVFAAA	AAAAxx
+8070	3941	0	2	0	10	70	70	70	3070	8070	140	141	KYAAAA	PVFAAA	HHHHxx
+6040	3942	0	0	0	0	40	40	40	1040	6040	80	81	IYAAAA	QVFAAA	OOOOxx
+3184	3943	0	0	4	4	84	184	1184	3184	3184	168	169	MSAAAA	RVFAAA	VVVVxx
+9656	3944	0	0	6	16	56	656	1656	4656	9656	112	113	KHAAAA	SVFAAA	AAAAxx
+1577	3945	1	1	7	17	77	577	1577	1577	1577	154	155	RIAAAA	TVFAAA	HHHHxx
+1805	3946	1	1	5	5	5	805	1805	1805	1805	10	11	LRAAAA	UVFAAA	OOOOxx
+8268	3947	0	0	8	8	68	268	268	3268	8268	136	137	AGAAAA	VVFAAA	VVVVxx
+3489	3948	1	1	9	9	89	489	1489	3489	3489	178	179	FEAAAA	WVFAAA	AAAAxx
+4564	3949	0	0	4	4	64	564	564	4564	4564	128	129	OTAAAA	XVFAAA	HHHHxx
+4006	3950	0	2	6	6	6	6	6	4006	4006	12	13	CYAAAA	YVFAAA	OOOOxx
+8466	3951	0	2	6	6	66	466	466	3466	8466	132	133	QNAAAA	ZVFAAA	VVVVxx
+938	3952	0	2	8	18	38	938	938	938	938	76	77	CKAAAA	AWFAAA	AAAAxx
+5944	3953	0	0	4	4	44	944	1944	944	5944	88	89	QUAAAA	BWFAAA	HHHHxx
+8363	3954	1	3	3	3	63	363	363	3363	8363	126	127	RJAAAA	CWFAAA	OOOOxx
+5348	3955	0	0	8	8	48	348	1348	348	5348	96	97	SXAAAA	DWFAAA	VVVVxx
+71	3956	1	3	1	11	71	71	71	71	71	142	143	TCAAAA	EWFAAA	AAAAxx
+3620	3957	0	0	0	0	20	620	1620	3620	3620	40	41	GJAAAA	FWFAAA	HHHHxx
+3230	3958	0	2	0	10	30	230	1230	3230	3230	60	61	GUAAAA	GWFAAA	OOOOxx
+6132	3959	0	0	2	12	32	132	132	1132	6132	64	65	WBAAAA	HWFAAA	VVVVxx
+6143	3960	1	3	3	3	43	143	143	1143	6143	86	87	HCAAAA	IWFAAA	AAAAxx
+8781	3961	1	1	1	1	81	781	781	3781	8781	162	163	TZAAAA	JWFAAA	HHHHxx
+5522	3962	0	2	2	2	22	522	1522	522	5522	44	45	KEAAAA	KWFAAA	OOOOxx
+6320	3963	0	0	0	0	20	320	320	1320	6320	40	41	CJAAAA	LWFAAA	VVVVxx
+3923	3964	1	3	3	3	23	923	1923	3923	3923	46	47	XUAAAA	MWFAAA	AAAAxx
+2207	3965	1	3	7	7	7	207	207	2207	2207	14	15	XGAAAA	NWFAAA	HHHHxx
+966	3966	0	2	6	6	66	966	966	966	966	132	133	ELAAAA	OWFAAA	OOOOxx
+9020	3967	0	0	0	0	20	20	1020	4020	9020	40	41	YIAAAA	PWFAAA	VVVVxx
+4616	3968	0	0	6	16	16	616	616	4616	4616	32	33	OVAAAA	QWFAAA	AAAAxx
+8289	3969	1	1	9	9	89	289	289	3289	8289	178	179	VGAAAA	RWFAAA	HHHHxx
+5796	3970	0	0	6	16	96	796	1796	796	5796	192	193	YOAAAA	SWFAAA	OOOOxx
+9259	3971	1	3	9	19	59	259	1259	4259	9259	118	119	DSAAAA	TWFAAA	VVVVxx
+3710	3972	0	2	0	10	10	710	1710	3710	3710	20	21	SMAAAA	UWFAAA	AAAAxx
+251	3973	1	3	1	11	51	251	251	251	251	102	103	RJAAAA	VWFAAA	HHHHxx
+7669	3974	1	1	9	9	69	669	1669	2669	7669	138	139	ZIAAAA	WWFAAA	OOOOxx
+6304	3975	0	0	4	4	4	304	304	1304	6304	8	9	MIAAAA	XWFAAA	VVVVxx
+6454	3976	0	2	4	14	54	454	454	1454	6454	108	109	GOAAAA	YWFAAA	AAAAxx
+1489	3977	1	1	9	9	89	489	1489	1489	1489	178	179	HFAAAA	ZWFAAA	HHHHxx
+715	3978	1	3	5	15	15	715	715	715	715	30	31	NBAAAA	AXFAAA	OOOOxx
+4319	3979	1	3	9	19	19	319	319	4319	4319	38	39	DKAAAA	BXFAAA	VVVVxx
+7112	3980	0	0	2	12	12	112	1112	2112	7112	24	25	ONAAAA	CXFAAA	AAAAxx
+3726	3981	0	2	6	6	26	726	1726	3726	3726	52	53	INAAAA	DXFAAA	HHHHxx
+7727	3982	1	3	7	7	27	727	1727	2727	7727	54	55	FLAAAA	EXFAAA	OOOOxx
+8387	3983	1	3	7	7	87	387	387	3387	8387	174	175	PKAAAA	FXFAAA	VVVVxx
+6555	3984	1	3	5	15	55	555	555	1555	6555	110	111	DSAAAA	GXFAAA	AAAAxx
+1148	3985	0	0	8	8	48	148	1148	1148	1148	96	97	ESAAAA	HXFAAA	HHHHxx
+9000	3986	0	0	0	0	0	0	1000	4000	9000	0	1	EIAAAA	IXFAAA	OOOOxx
+5278	3987	0	2	8	18	78	278	1278	278	5278	156	157	AVAAAA	JXFAAA	VVVVxx
+2388	3988	0	0	8	8	88	388	388	2388	2388	176	177	WNAAAA	KXFAAA	AAAAxx
+7984	3989	0	0	4	4	84	984	1984	2984	7984	168	169	CVAAAA	LXFAAA	HHHHxx
+881	3990	1	1	1	1	81	881	881	881	881	162	163	XHAAAA	MXFAAA	OOOOxx
+6830	3991	0	2	0	10	30	830	830	1830	6830	60	61	SCAAAA	NXFAAA	VVVVxx
+7056	3992	0	0	6	16	56	56	1056	2056	7056	112	113	KLAAAA	OXFAAA	AAAAxx
+7581	3993	1	1	1	1	81	581	1581	2581	7581	162	163	PFAAAA	PXFAAA	HHHHxx
+5214	3994	0	2	4	14	14	214	1214	214	5214	28	29	OSAAAA	QXFAAA	OOOOxx
+2505	3995	1	1	5	5	5	505	505	2505	2505	10	11	JSAAAA	RXFAAA	VVVVxx
+5112	3996	0	0	2	12	12	112	1112	112	5112	24	25	QOAAAA	SXFAAA	AAAAxx
+9884	3997	0	0	4	4	84	884	1884	4884	9884	168	169	EQAAAA	TXFAAA	HHHHxx
+8040	3998	0	0	0	0	40	40	40	3040	8040	80	81	GXAAAA	UXFAAA	OOOOxx
+7033	3999	1	1	3	13	33	33	1033	2033	7033	66	67	NKAAAA	VXFAAA	VVVVxx
+9343	4000	1	3	3	3	43	343	1343	4343	9343	86	87	JVAAAA	WXFAAA	AAAAxx
+2931	4001	1	3	1	11	31	931	931	2931	2931	62	63	TIAAAA	XXFAAA	HHHHxx
+9024	4002	0	0	4	4	24	24	1024	4024	9024	48	49	CJAAAA	YXFAAA	OOOOxx
+6485	4003	1	1	5	5	85	485	485	1485	6485	170	171	LPAAAA	ZXFAAA	VVVVxx
+3465	4004	1	1	5	5	65	465	1465	3465	3465	130	131	HDAAAA	AYFAAA	AAAAxx
+3357	4005	1	1	7	17	57	357	1357	3357	3357	114	115	DZAAAA	BYFAAA	HHHHxx
+2929	4006	1	1	9	9	29	929	929	2929	2929	58	59	RIAAAA	CYFAAA	OOOOxx
+3086	4007	0	2	6	6	86	86	1086	3086	3086	172	173	SOAAAA	DYFAAA	VVVVxx
+8897	4008	1	1	7	17	97	897	897	3897	8897	194	195	FEAAAA	EYFAAA	AAAAxx
+9688	4009	0	0	8	8	88	688	1688	4688	9688	176	177	QIAAAA	FYFAAA	HHHHxx
+6522	4010	0	2	2	2	22	522	522	1522	6522	44	45	WQAAAA	GYFAAA	OOOOxx
+3241	4011	1	1	1	1	41	241	1241	3241	3241	82	83	RUAAAA	HYFAAA	VVVVxx
+8770	4012	0	2	0	10	70	770	770	3770	8770	140	141	IZAAAA	IYFAAA	AAAAxx
+2884	4013	0	0	4	4	84	884	884	2884	2884	168	169	YGAAAA	JYFAAA	HHHHxx
+9579	4014	1	3	9	19	79	579	1579	4579	9579	158	159	LEAAAA	KYFAAA	OOOOxx
+3125	4015	1	1	5	5	25	125	1125	3125	3125	50	51	FQAAAA	LYFAAA	VVVVxx
+4604	4016	0	0	4	4	4	604	604	4604	4604	8	9	CVAAAA	MYFAAA	AAAAxx
+2682	4017	0	2	2	2	82	682	682	2682	2682	164	165	EZAAAA	NYFAAA	HHHHxx
+254	4018	0	2	4	14	54	254	254	254	254	108	109	UJAAAA	OYFAAA	OOOOxx
+6569	4019	1	1	9	9	69	569	569	1569	6569	138	139	RSAAAA	PYFAAA	VVVVxx
+2686	4020	0	2	6	6	86	686	686	2686	2686	172	173	IZAAAA	QYFAAA	AAAAxx
+2123	4021	1	3	3	3	23	123	123	2123	2123	46	47	RDAAAA	RYFAAA	HHHHxx
+1745	4022	1	1	5	5	45	745	1745	1745	1745	90	91	DPAAAA	SYFAAA	OOOOxx
+247	4023	1	3	7	7	47	247	247	247	247	94	95	NJAAAA	TYFAAA	VVVVxx
+5800	4024	0	0	0	0	0	800	1800	800	5800	0	1	CPAAAA	UYFAAA	AAAAxx
+1121	4025	1	1	1	1	21	121	1121	1121	1121	42	43	DRAAAA	VYFAAA	HHHHxx
+8893	4026	1	1	3	13	93	893	893	3893	8893	186	187	BEAAAA	WYFAAA	OOOOxx
+7819	4027	1	3	9	19	19	819	1819	2819	7819	38	39	TOAAAA	XYFAAA	VVVVxx
+1339	4028	1	3	9	19	39	339	1339	1339	1339	78	79	NZAAAA	YYFAAA	AAAAxx
+5680	4029	0	0	0	0	80	680	1680	680	5680	160	161	MKAAAA	ZYFAAA	HHHHxx
+5093	4030	1	1	3	13	93	93	1093	93	5093	186	187	XNAAAA	AZFAAA	OOOOxx
+3508	4031	0	0	8	8	8	508	1508	3508	3508	16	17	YEAAAA	BZFAAA	VVVVxx
+933	4032	1	1	3	13	33	933	933	933	933	66	67	XJAAAA	CZFAAA	AAAAxx
+1106	4033	0	2	6	6	6	106	1106	1106	1106	12	13	OQAAAA	DZFAAA	HHHHxx
+4386	4034	0	2	6	6	86	386	386	4386	4386	172	173	SMAAAA	EZFAAA	OOOOxx
+5895	4035	1	3	5	15	95	895	1895	895	5895	190	191	TSAAAA	FZFAAA	VVVVxx
+2980	4036	0	0	0	0	80	980	980	2980	2980	160	161	QKAAAA	GZFAAA	AAAAxx
+4400	4037	0	0	0	0	0	400	400	4400	4400	0	1	GNAAAA	HZFAAA	HHHHxx
+7433	4038	1	1	3	13	33	433	1433	2433	7433	66	67	XZAAAA	IZFAAA	OOOOxx
+6110	4039	0	2	0	10	10	110	110	1110	6110	20	21	ABAAAA	JZFAAA	VVVVxx
+867	4040	1	3	7	7	67	867	867	867	867	134	135	JHAAAA	KZFAAA	AAAAxx
+5292	4041	0	0	2	12	92	292	1292	292	5292	184	185	OVAAAA	LZFAAA	HHHHxx
+3926	4042	0	2	6	6	26	926	1926	3926	3926	52	53	AVAAAA	MZFAAA	OOOOxx
+1107	4043	1	3	7	7	7	107	1107	1107	1107	14	15	PQAAAA	NZFAAA	VVVVxx
+7355	4044	1	3	5	15	55	355	1355	2355	7355	110	111	XWAAAA	OZFAAA	AAAAxx
+4689	4045	1	1	9	9	89	689	689	4689	4689	178	179	JYAAAA	PZFAAA	HHHHxx
+4872	4046	0	0	2	12	72	872	872	4872	4872	144	145	KFAAAA	QZFAAA	OOOOxx
+7821	4047	1	1	1	1	21	821	1821	2821	7821	42	43	VOAAAA	RZFAAA	VVVVxx
+7277	4048	1	1	7	17	77	277	1277	2277	7277	154	155	XTAAAA	SZFAAA	AAAAxx
+3268	4049	0	0	8	8	68	268	1268	3268	3268	136	137	SVAAAA	TZFAAA	HHHHxx
+8877	4050	1	1	7	17	77	877	877	3877	8877	154	155	LDAAAA	UZFAAA	OOOOxx
+343	4051	1	3	3	3	43	343	343	343	343	86	87	FNAAAA	VZFAAA	VVVVxx
+621	4052	1	1	1	1	21	621	621	621	621	42	43	XXAAAA	WZFAAA	AAAAxx
+5429	4053	1	1	9	9	29	429	1429	429	5429	58	59	VAAAAA	XZFAAA	HHHHxx
+392	4054	0	0	2	12	92	392	392	392	392	184	185	CPAAAA	YZFAAA	OOOOxx
+6004	4055	0	0	4	4	4	4	4	1004	6004	8	9	YWAAAA	ZZFAAA	VVVVxx
+6377	4056	1	1	7	17	77	377	377	1377	6377	154	155	HLAAAA	AAGAAA	AAAAxx
+3037	4057	1	1	7	17	37	37	1037	3037	3037	74	75	VMAAAA	BAGAAA	HHHHxx
+3514	4058	0	2	4	14	14	514	1514	3514	3514	28	29	EFAAAA	CAGAAA	OOOOxx
+8740	4059	0	0	0	0	40	740	740	3740	8740	80	81	EYAAAA	DAGAAA	VVVVxx
+3877	4060	1	1	7	17	77	877	1877	3877	3877	154	155	DTAAAA	EAGAAA	AAAAxx
+5731	4061	1	3	1	11	31	731	1731	731	5731	62	63	LMAAAA	FAGAAA	HHHHxx
+6407	4062	1	3	7	7	7	407	407	1407	6407	14	15	LMAAAA	GAGAAA	OOOOxx
+2044	4063	0	0	4	4	44	44	44	2044	2044	88	89	QAAAAA	HAGAAA	VVVVxx
+7362	4064	0	2	2	2	62	362	1362	2362	7362	124	125	EXAAAA	IAGAAA	AAAAxx
+5458	4065	0	2	8	18	58	458	1458	458	5458	116	117	YBAAAA	JAGAAA	HHHHxx
+6437	4066	1	1	7	17	37	437	437	1437	6437	74	75	PNAAAA	KAGAAA	OOOOxx
+1051	4067	1	3	1	11	51	51	1051	1051	1051	102	103	LOAAAA	LAGAAA	VVVVxx
+1203	4068	1	3	3	3	3	203	1203	1203	1203	6	7	HUAAAA	MAGAAA	AAAAxx
+2176	4069	0	0	6	16	76	176	176	2176	2176	152	153	SFAAAA	NAGAAA	HHHHxx
+8997	4070	1	1	7	17	97	997	997	3997	8997	194	195	BIAAAA	OAGAAA	OOOOxx
+6378	4071	0	2	8	18	78	378	378	1378	6378	156	157	ILAAAA	PAGAAA	VVVVxx
+6006	4072	0	2	6	6	6	6	6	1006	6006	12	13	AXAAAA	QAGAAA	AAAAxx
+2308	4073	0	0	8	8	8	308	308	2308	2308	16	17	UKAAAA	RAGAAA	HHHHxx
+625	4074	1	1	5	5	25	625	625	625	625	50	51	BYAAAA	SAGAAA	OOOOxx
+7298	4075	0	2	8	18	98	298	1298	2298	7298	196	197	SUAAAA	TAGAAA	VVVVxx
+5575	4076	1	3	5	15	75	575	1575	575	5575	150	151	LGAAAA	UAGAAA	AAAAxx
+3565	4077	1	1	5	5	65	565	1565	3565	3565	130	131	DHAAAA	VAGAAA	HHHHxx
+47	4078	1	3	7	7	47	47	47	47	47	94	95	VBAAAA	WAGAAA	OOOOxx
+2413	4079	1	1	3	13	13	413	413	2413	2413	26	27	VOAAAA	XAGAAA	VVVVxx
+2153	4080	1	1	3	13	53	153	153	2153	2153	106	107	VEAAAA	YAGAAA	AAAAxx
+752	4081	0	0	2	12	52	752	752	752	752	104	105	YCAAAA	ZAGAAA	HHHHxx
+4095	4082	1	3	5	15	95	95	95	4095	4095	190	191	NBAAAA	ABGAAA	OOOOxx
+2518	4083	0	2	8	18	18	518	518	2518	2518	36	37	WSAAAA	BBGAAA	VVVVxx
+3681	4084	1	1	1	1	81	681	1681	3681	3681	162	163	PLAAAA	CBGAAA	AAAAxx
+4213	4085	1	1	3	13	13	213	213	4213	4213	26	27	BGAAAA	DBGAAA	HHHHxx
+2615	4086	1	3	5	15	15	615	615	2615	2615	30	31	PWAAAA	EBGAAA	OOOOxx
+1471	4087	1	3	1	11	71	471	1471	1471	1471	142	143	PEAAAA	FBGAAA	VVVVxx
+7315	4088	1	3	5	15	15	315	1315	2315	7315	30	31	JVAAAA	GBGAAA	AAAAxx
+6013	4089	1	1	3	13	13	13	13	1013	6013	26	27	HXAAAA	HBGAAA	HHHHxx
+3077	4090	1	1	7	17	77	77	1077	3077	3077	154	155	JOAAAA	IBGAAA	OOOOxx
+2190	4091	0	2	0	10	90	190	190	2190	2190	180	181	GGAAAA	JBGAAA	VVVVxx
+528	4092	0	0	8	8	28	528	528	528	528	56	57	IUAAAA	KBGAAA	AAAAxx
+9508	4093	0	0	8	8	8	508	1508	4508	9508	16	17	SBAAAA	LBGAAA	HHHHxx
+2473	4094	1	1	3	13	73	473	473	2473	2473	146	147	DRAAAA	MBGAAA	OOOOxx
+167	4095	1	3	7	7	67	167	167	167	167	134	135	LGAAAA	NBGAAA	VVVVxx
+8448	4096	0	0	8	8	48	448	448	3448	8448	96	97	YMAAAA	OBGAAA	AAAAxx
+7538	4097	0	2	8	18	38	538	1538	2538	7538	76	77	YDAAAA	PBGAAA	HHHHxx
+7638	4098	0	2	8	18	38	638	1638	2638	7638	76	77	UHAAAA	QBGAAA	OOOOxx
+4328	4099	0	0	8	8	28	328	328	4328	4328	56	57	MKAAAA	RBGAAA	VVVVxx
+3812	4100	0	0	2	12	12	812	1812	3812	3812	24	25	QQAAAA	SBGAAA	AAAAxx
+2879	4101	1	3	9	19	79	879	879	2879	2879	158	159	TGAAAA	TBGAAA	HHHHxx
+4741	4102	1	1	1	1	41	741	741	4741	4741	82	83	JAAAAA	UBGAAA	OOOOxx
+9155	4103	1	3	5	15	55	155	1155	4155	9155	110	111	DOAAAA	VBGAAA	VVVVxx
+5151	4104	1	3	1	11	51	151	1151	151	5151	102	103	DQAAAA	WBGAAA	AAAAxx
+5591	4105	1	3	1	11	91	591	1591	591	5591	182	183	BHAAAA	XBGAAA	HHHHxx
+1034	4106	0	2	4	14	34	34	1034	1034	1034	68	69	UNAAAA	YBGAAA	OOOOxx
+765	4107	1	1	5	5	65	765	765	765	765	130	131	LDAAAA	ZBGAAA	VVVVxx
+2664	4108	0	0	4	4	64	664	664	2664	2664	128	129	MYAAAA	ACGAAA	AAAAxx
+6854	4109	0	2	4	14	54	854	854	1854	6854	108	109	QDAAAA	BCGAAA	HHHHxx
+8263	4110	1	3	3	3	63	263	263	3263	8263	126	127	VFAAAA	CCGAAA	OOOOxx
+8658	4111	0	2	8	18	58	658	658	3658	8658	116	117	AVAAAA	DCGAAA	VVVVxx
+587	4112	1	3	7	7	87	587	587	587	587	174	175	PWAAAA	ECGAAA	AAAAxx
+4553	4113	1	1	3	13	53	553	553	4553	4553	106	107	DTAAAA	FCGAAA	HHHHxx
+1368	4114	0	0	8	8	68	368	1368	1368	1368	136	137	QAAAAA	GCGAAA	OOOOxx
+1718	4115	0	2	8	18	18	718	1718	1718	1718	36	37	COAAAA	HCGAAA	VVVVxx
+140	4116	0	0	0	0	40	140	140	140	140	80	81	KFAAAA	ICGAAA	AAAAxx
+8341	4117	1	1	1	1	41	341	341	3341	8341	82	83	VIAAAA	JCGAAA	HHHHxx
+72	4118	0	0	2	12	72	72	72	72	72	144	145	UCAAAA	KCGAAA	OOOOxx
+6589	4119	1	1	9	9	89	589	589	1589	6589	178	179	LTAAAA	LCGAAA	VVVVxx
+2024	4120	0	0	4	4	24	24	24	2024	2024	48	49	WZAAAA	MCGAAA	AAAAxx
+8024	4121	0	0	4	4	24	24	24	3024	8024	48	49	QWAAAA	NCGAAA	HHHHxx
+9564	4122	0	0	4	4	64	564	1564	4564	9564	128	129	WDAAAA	OCGAAA	OOOOxx
+8625	4123	1	1	5	5	25	625	625	3625	8625	50	51	TTAAAA	PCGAAA	VVVVxx
+2680	4124	0	0	0	0	80	680	680	2680	2680	160	161	CZAAAA	QCGAAA	AAAAxx
+4323	4125	1	3	3	3	23	323	323	4323	4323	46	47	HKAAAA	RCGAAA	HHHHxx
+8981	4126	1	1	1	1	81	981	981	3981	8981	162	163	LHAAAA	SCGAAA	OOOOxx
+8909	4127	1	1	9	9	9	909	909	3909	8909	18	19	REAAAA	TCGAAA	VVVVxx
+5288	4128	0	0	8	8	88	288	1288	288	5288	176	177	KVAAAA	UCGAAA	AAAAxx
+2057	4129	1	1	7	17	57	57	57	2057	2057	114	115	DBAAAA	VCGAAA	HHHHxx
+5931	4130	1	3	1	11	31	931	1931	931	5931	62	63	DUAAAA	WCGAAA	OOOOxx
+9794	4131	0	2	4	14	94	794	1794	4794	9794	188	189	SMAAAA	XCGAAA	VVVVxx
+1012	4132	0	0	2	12	12	12	1012	1012	1012	24	25	YMAAAA	YCGAAA	AAAAxx
+5496	4133	0	0	6	16	96	496	1496	496	5496	192	193	KDAAAA	ZCGAAA	HHHHxx
+9182	4134	0	2	2	2	82	182	1182	4182	9182	164	165	EPAAAA	ADGAAA	OOOOxx
+5258	4135	0	2	8	18	58	258	1258	258	5258	116	117	GUAAAA	BDGAAA	VVVVxx
+3050	4136	0	2	0	10	50	50	1050	3050	3050	100	101	INAAAA	CDGAAA	AAAAxx
+2083	4137	1	3	3	3	83	83	83	2083	2083	166	167	DCAAAA	DDGAAA	HHHHxx
+3069	4138	1	1	9	9	69	69	1069	3069	3069	138	139	BOAAAA	EDGAAA	OOOOxx
+8459	4139	1	3	9	19	59	459	459	3459	8459	118	119	JNAAAA	FDGAAA	VVVVxx
+169	4140	1	1	9	9	69	169	169	169	169	138	139	NGAAAA	GDGAAA	AAAAxx
+4379	4141	1	3	9	19	79	379	379	4379	4379	158	159	LMAAAA	HDGAAA	HHHHxx
+5126	4142	0	2	6	6	26	126	1126	126	5126	52	53	EPAAAA	IDGAAA	OOOOxx
+1415	4143	1	3	5	15	15	415	1415	1415	1415	30	31	LCAAAA	JDGAAA	VVVVxx
+1163	4144	1	3	3	3	63	163	1163	1163	1163	126	127	TSAAAA	KDGAAA	AAAAxx
+3500	4145	0	0	0	0	0	500	1500	3500	3500	0	1	QEAAAA	LDGAAA	HHHHxx
+7202	4146	0	2	2	2	2	202	1202	2202	7202	4	5	ARAAAA	MDGAAA	OOOOxx
+747	4147	1	3	7	7	47	747	747	747	747	94	95	TCAAAA	NDGAAA	VVVVxx
+9264	4148	0	0	4	4	64	264	1264	4264	9264	128	129	ISAAAA	ODGAAA	AAAAxx
+8548	4149	0	0	8	8	48	548	548	3548	8548	96	97	UQAAAA	PDGAAA	HHHHxx
+4228	4150	0	0	8	8	28	228	228	4228	4228	56	57	QGAAAA	QDGAAA	OOOOxx
+7122	4151	0	2	2	2	22	122	1122	2122	7122	44	45	YNAAAA	RDGAAA	VVVVxx
+3395	4152	1	3	5	15	95	395	1395	3395	3395	190	191	PAAAAA	SDGAAA	AAAAxx
+5674	4153	0	2	4	14	74	674	1674	674	5674	148	149	GKAAAA	TDGAAA	HHHHxx
+7293	4154	1	1	3	13	93	293	1293	2293	7293	186	187	NUAAAA	UDGAAA	OOOOxx
+737	4155	1	1	7	17	37	737	737	737	737	74	75	JCAAAA	VDGAAA	VVVVxx
+9595	4156	1	3	5	15	95	595	1595	4595	9595	190	191	BFAAAA	WDGAAA	AAAAxx
+594	4157	0	2	4	14	94	594	594	594	594	188	189	WWAAAA	XDGAAA	HHHHxx
+5322	4158	0	2	2	2	22	322	1322	322	5322	44	45	SWAAAA	YDGAAA	OOOOxx
+2933	4159	1	1	3	13	33	933	933	2933	2933	66	67	VIAAAA	ZDGAAA	VVVVxx
+4955	4160	1	3	5	15	55	955	955	4955	4955	110	111	PIAAAA	AEGAAA	AAAAxx
+4073	4161	1	1	3	13	73	73	73	4073	4073	146	147	RAAAAA	BEGAAA	HHHHxx
+7249	4162	1	1	9	9	49	249	1249	2249	7249	98	99	VSAAAA	CEGAAA	OOOOxx
+192	4163	0	0	2	12	92	192	192	192	192	184	185	KHAAAA	DEGAAA	VVVVxx
+2617	4164	1	1	7	17	17	617	617	2617	2617	34	35	RWAAAA	EEGAAA	AAAAxx
+7409	4165	1	1	9	9	9	409	1409	2409	7409	18	19	ZYAAAA	FEGAAA	HHHHxx
+4903	4166	1	3	3	3	3	903	903	4903	4903	6	7	PGAAAA	GEGAAA	OOOOxx
+9797	4167	1	1	7	17	97	797	1797	4797	9797	194	195	VMAAAA	HEGAAA	VVVVxx
+9919	4168	1	3	9	19	19	919	1919	4919	9919	38	39	NRAAAA	IEGAAA	AAAAxx
+1878	4169	0	2	8	18	78	878	1878	1878	1878	156	157	GUAAAA	JEGAAA	HHHHxx
+4851	4170	1	3	1	11	51	851	851	4851	4851	102	103	PEAAAA	KEGAAA	OOOOxx
+5514	4171	0	2	4	14	14	514	1514	514	5514	28	29	CEAAAA	LEGAAA	VVVVxx
+2582	4172	0	2	2	2	82	582	582	2582	2582	164	165	IVAAAA	MEGAAA	AAAAxx
+3564	4173	0	0	4	4	64	564	1564	3564	3564	128	129	CHAAAA	NEGAAA	HHHHxx
+7085	4174	1	1	5	5	85	85	1085	2085	7085	170	171	NMAAAA	OEGAAA	OOOOxx
+3619	4175	1	3	9	19	19	619	1619	3619	3619	38	39	FJAAAA	PEGAAA	VVVVxx
+261	4176	1	1	1	1	61	261	261	261	261	122	123	BKAAAA	QEGAAA	AAAAxx
+7338	4177	0	2	8	18	38	338	1338	2338	7338	76	77	GWAAAA	REGAAA	HHHHxx
+4251	4178	1	3	1	11	51	251	251	4251	4251	102	103	NHAAAA	SEGAAA	OOOOxx
+5360	4179	0	0	0	0	60	360	1360	360	5360	120	121	EYAAAA	TEGAAA	VVVVxx
+5678	4180	0	2	8	18	78	678	1678	678	5678	156	157	KKAAAA	UEGAAA	AAAAxx
+9162	4181	0	2	2	2	62	162	1162	4162	9162	124	125	KOAAAA	VEGAAA	HHHHxx
+5920	4182	0	0	0	0	20	920	1920	920	5920	40	41	STAAAA	WEGAAA	OOOOxx
+7156	4183	0	0	6	16	56	156	1156	2156	7156	112	113	GPAAAA	XEGAAA	VVVVxx
+4271	4184	1	3	1	11	71	271	271	4271	4271	142	143	HIAAAA	YEGAAA	AAAAxx
+4698	4185	0	2	8	18	98	698	698	4698	4698	196	197	SYAAAA	ZEGAAA	HHHHxx
+1572	4186	0	0	2	12	72	572	1572	1572	1572	144	145	MIAAAA	AFGAAA	OOOOxx
+6974	4187	0	2	4	14	74	974	974	1974	6974	148	149	GIAAAA	BFGAAA	VVVVxx
+4291	4188	1	3	1	11	91	291	291	4291	4291	182	183	BJAAAA	CFGAAA	AAAAxx
+4036	4189	0	0	6	16	36	36	36	4036	4036	72	73	GZAAAA	DFGAAA	HHHHxx
+7473	4190	1	1	3	13	73	473	1473	2473	7473	146	147	LBAAAA	EFGAAA	OOOOxx
+4786	4191	0	2	6	6	86	786	786	4786	4786	172	173	CCAAAA	FFGAAA	VVVVxx
+2662	4192	0	2	2	2	62	662	662	2662	2662	124	125	KYAAAA	GFGAAA	AAAAxx
+916	4193	0	0	6	16	16	916	916	916	916	32	33	GJAAAA	HFGAAA	HHHHxx
+668	4194	0	0	8	8	68	668	668	668	668	136	137	SZAAAA	IFGAAA	OOOOxx
+4874	4195	0	2	4	14	74	874	874	4874	4874	148	149	MFAAAA	JFGAAA	VVVVxx
+3752	4196	0	0	2	12	52	752	1752	3752	3752	104	105	IOAAAA	KFGAAA	AAAAxx
+4865	4197	1	1	5	5	65	865	865	4865	4865	130	131	DFAAAA	LFGAAA	HHHHxx
+7052	4198	0	0	2	12	52	52	1052	2052	7052	104	105	GLAAAA	MFGAAA	OOOOxx
+5712	4199	0	0	2	12	12	712	1712	712	5712	24	25	SLAAAA	NFGAAA	VVVVxx
+31	4200	1	3	1	11	31	31	31	31	31	62	63	FBAAAA	OFGAAA	AAAAxx
+4944	4201	0	0	4	4	44	944	944	4944	4944	88	89	EIAAAA	PFGAAA	HHHHxx
+1435	4202	1	3	5	15	35	435	1435	1435	1435	70	71	FDAAAA	QFGAAA	OOOOxx
+501	4203	1	1	1	1	1	501	501	501	501	2	3	HTAAAA	RFGAAA	VVVVxx
+9401	4204	1	1	1	1	1	401	1401	4401	9401	2	3	PXAAAA	SFGAAA	AAAAxx
+5014	4205	0	2	4	14	14	14	1014	14	5014	28	29	WKAAAA	TFGAAA	HHHHxx
+9125	4206	1	1	5	5	25	125	1125	4125	9125	50	51	ZMAAAA	UFGAAA	OOOOxx
+6144	4207	0	0	4	4	44	144	144	1144	6144	88	89	ICAAAA	VFGAAA	VVVVxx
+1743	4208	1	3	3	3	43	743	1743	1743	1743	86	87	BPAAAA	WFGAAA	AAAAxx
+4316	4209	0	0	6	16	16	316	316	4316	4316	32	33	AKAAAA	XFGAAA	HHHHxx
+8212	4210	0	0	2	12	12	212	212	3212	8212	24	25	WDAAAA	YFGAAA	OOOOxx
+7344	4211	0	0	4	4	44	344	1344	2344	7344	88	89	MWAAAA	ZFGAAA	VVVVxx
+2051	4212	1	3	1	11	51	51	51	2051	2051	102	103	XAAAAA	AGGAAA	AAAAxx
+8131	4213	1	3	1	11	31	131	131	3131	8131	62	63	TAAAAA	BGGAAA	HHHHxx
+7023	4214	1	3	3	3	23	23	1023	2023	7023	46	47	DKAAAA	CGGAAA	OOOOxx
+9674	4215	0	2	4	14	74	674	1674	4674	9674	148	149	CIAAAA	DGGAAA	VVVVxx
+4984	4216	0	0	4	4	84	984	984	4984	4984	168	169	SJAAAA	EGGAAA	AAAAxx
+111	4217	1	3	1	11	11	111	111	111	111	22	23	HEAAAA	FGGAAA	HHHHxx
+2296	4218	0	0	6	16	96	296	296	2296	2296	192	193	IKAAAA	GGGAAA	OOOOxx
+5025	4219	1	1	5	5	25	25	1025	25	5025	50	51	HLAAAA	HGGAAA	VVVVxx
+1756	4220	0	0	6	16	56	756	1756	1756	1756	112	113	OPAAAA	IGGAAA	AAAAxx
+2885	4221	1	1	5	5	85	885	885	2885	2885	170	171	ZGAAAA	JGGAAA	HHHHxx
+2541	4222	1	1	1	1	41	541	541	2541	2541	82	83	TTAAAA	KGGAAA	OOOOxx
+1919	4223	1	3	9	19	19	919	1919	1919	1919	38	39	VVAAAA	LGGAAA	VVVVxx
+6496	4224	0	0	6	16	96	496	496	1496	6496	192	193	WPAAAA	MGGAAA	AAAAxx
+6103	4225	1	3	3	3	3	103	103	1103	6103	6	7	TAAAAA	NGGAAA	HHHHxx
+98	4226	0	2	8	18	98	98	98	98	98	196	197	UDAAAA	OGGAAA	OOOOxx
+3727	4227	1	3	7	7	27	727	1727	3727	3727	54	55	JNAAAA	PGGAAA	VVVVxx
+689	4228	1	1	9	9	89	689	689	689	689	178	179	NAAAAA	QGGAAA	AAAAxx
+7181	4229	1	1	1	1	81	181	1181	2181	7181	162	163	FQAAAA	RGGAAA	HHHHxx
+8447	4230	1	3	7	7	47	447	447	3447	8447	94	95	XMAAAA	SGGAAA	OOOOxx
+4569	4231	1	1	9	9	69	569	569	4569	4569	138	139	TTAAAA	TGGAAA	VVVVxx
+8844	4232	0	0	4	4	44	844	844	3844	8844	88	89	ECAAAA	UGGAAA	AAAAxx
+2436	4233	0	0	6	16	36	436	436	2436	2436	72	73	SPAAAA	VGGAAA	HHHHxx
+391	4234	1	3	1	11	91	391	391	391	391	182	183	BPAAAA	WGGAAA	OOOOxx
+3035	4235	1	3	5	15	35	35	1035	3035	3035	70	71	TMAAAA	XGGAAA	VVVVxx
+7583	4236	1	3	3	3	83	583	1583	2583	7583	166	167	RFAAAA	YGGAAA	AAAAxx
+1145	4237	1	1	5	5	45	145	1145	1145	1145	90	91	BSAAAA	ZGGAAA	HHHHxx
+93	4238	1	1	3	13	93	93	93	93	93	186	187	PDAAAA	AHGAAA	OOOOxx
+8896	4239	0	0	6	16	96	896	896	3896	8896	192	193	EEAAAA	BHGAAA	VVVVxx
+6719	4240	1	3	9	19	19	719	719	1719	6719	38	39	LYAAAA	CHGAAA	AAAAxx
+7728	4241	0	0	8	8	28	728	1728	2728	7728	56	57	GLAAAA	DHGAAA	HHHHxx
+1349	4242	1	1	9	9	49	349	1349	1349	1349	98	99	XZAAAA	EHGAAA	OOOOxx
+5349	4243	1	1	9	9	49	349	1349	349	5349	98	99	TXAAAA	FHGAAA	VVVVxx
+3040	4244	0	0	0	0	40	40	1040	3040	3040	80	81	YMAAAA	GHGAAA	AAAAxx
+2414	4245	0	2	4	14	14	414	414	2414	2414	28	29	WOAAAA	HHGAAA	HHHHxx
+5122	4246	0	2	2	2	22	122	1122	122	5122	44	45	APAAAA	IHGAAA	OOOOxx
+9553	4247	1	1	3	13	53	553	1553	4553	9553	106	107	LDAAAA	JHGAAA	VVVVxx
+5987	4248	1	3	7	7	87	987	1987	987	5987	174	175	HWAAAA	KHGAAA	AAAAxx
+5939	4249	1	3	9	19	39	939	1939	939	5939	78	79	LUAAAA	LHGAAA	HHHHxx
+3525	4250	1	1	5	5	25	525	1525	3525	3525	50	51	PFAAAA	MHGAAA	OOOOxx
+1371	4251	1	3	1	11	71	371	1371	1371	1371	142	143	TAAAAA	NHGAAA	VVVVxx
+618	4252	0	2	8	18	18	618	618	618	618	36	37	UXAAAA	OHGAAA	AAAAxx
+6529	4253	1	1	9	9	29	529	529	1529	6529	58	59	DRAAAA	PHGAAA	HHHHxx
+4010	4254	0	2	0	10	10	10	10	4010	4010	20	21	GYAAAA	QHGAAA	OOOOxx
+328	4255	0	0	8	8	28	328	328	328	328	56	57	QMAAAA	RHGAAA	VVVVxx
+6121	4256	1	1	1	1	21	121	121	1121	6121	42	43	LBAAAA	SHGAAA	AAAAxx
+3505	4257	1	1	5	5	5	505	1505	3505	3505	10	11	VEAAAA	THGAAA	HHHHxx
+2033	4258	1	1	3	13	33	33	33	2033	2033	66	67	FAAAAA	UHGAAA	OOOOxx
+4724	4259	0	0	4	4	24	724	724	4724	4724	48	49	SZAAAA	VHGAAA	VVVVxx
+8717	4260	1	1	7	17	17	717	717	3717	8717	34	35	HXAAAA	WHGAAA	AAAAxx
+5639	4261	1	3	9	19	39	639	1639	639	5639	78	79	XIAAAA	XHGAAA	HHHHxx
+3448	4262	0	0	8	8	48	448	1448	3448	3448	96	97	QCAAAA	YHGAAA	OOOOxx
+2919	4263	1	3	9	19	19	919	919	2919	2919	38	39	HIAAAA	ZHGAAA	VVVVxx
+3417	4264	1	1	7	17	17	417	1417	3417	3417	34	35	LBAAAA	AIGAAA	AAAAxx
+943	4265	1	3	3	3	43	943	943	943	943	86	87	HKAAAA	BIGAAA	HHHHxx
+775	4266	1	3	5	15	75	775	775	775	775	150	151	VDAAAA	CIGAAA	OOOOxx
+2333	4267	1	1	3	13	33	333	333	2333	2333	66	67	TLAAAA	DIGAAA	VVVVxx
+4801	4268	1	1	1	1	1	801	801	4801	4801	2	3	RCAAAA	EIGAAA	AAAAxx
+7169	4269	1	1	9	9	69	169	1169	2169	7169	138	139	TPAAAA	FIGAAA	HHHHxx
+2840	4270	0	0	0	0	40	840	840	2840	2840	80	81	GFAAAA	GIGAAA	OOOOxx
+9034	4271	0	2	4	14	34	34	1034	4034	9034	68	69	MJAAAA	HIGAAA	VVVVxx
+6154	4272	0	2	4	14	54	154	154	1154	6154	108	109	SCAAAA	IIGAAA	AAAAxx
+1412	4273	0	0	2	12	12	412	1412	1412	1412	24	25	ICAAAA	JIGAAA	HHHHxx
+2263	4274	1	3	3	3	63	263	263	2263	2263	126	127	BJAAAA	KIGAAA	OOOOxx
+7118	4275	0	2	8	18	18	118	1118	2118	7118	36	37	UNAAAA	LIGAAA	VVVVxx
+1526	4276	0	2	6	6	26	526	1526	1526	1526	52	53	SGAAAA	MIGAAA	AAAAxx
+491	4277	1	3	1	11	91	491	491	491	491	182	183	XSAAAA	NIGAAA	HHHHxx
+9732	4278	0	0	2	12	32	732	1732	4732	9732	64	65	IKAAAA	OIGAAA	OOOOxx
+7067	4279	1	3	7	7	67	67	1067	2067	7067	134	135	VLAAAA	PIGAAA	VVVVxx
+212	4280	0	0	2	12	12	212	212	212	212	24	25	EIAAAA	QIGAAA	AAAAxx
+1955	4281	1	3	5	15	55	955	1955	1955	1955	110	111	FXAAAA	RIGAAA	HHHHxx
+3303	4282	1	3	3	3	3	303	1303	3303	3303	6	7	BXAAAA	SIGAAA	OOOOxx
+2715	4283	1	3	5	15	15	715	715	2715	2715	30	31	LAAAAA	TIGAAA	VVVVxx
+8168	4284	0	0	8	8	68	168	168	3168	8168	136	137	ECAAAA	UIGAAA	AAAAxx
+6799	4285	1	3	9	19	99	799	799	1799	6799	198	199	NBAAAA	VIGAAA	HHHHxx
+5080	4286	0	0	0	0	80	80	1080	80	5080	160	161	KNAAAA	WIGAAA	OOOOxx
+4939	4287	1	3	9	19	39	939	939	4939	4939	78	79	ZHAAAA	XIGAAA	VVVVxx
+6604	4288	0	0	4	4	4	604	604	1604	6604	8	9	AUAAAA	YIGAAA	AAAAxx
+6531	4289	1	3	1	11	31	531	531	1531	6531	62	63	FRAAAA	ZIGAAA	HHHHxx
+9948	4290	0	0	8	8	48	948	1948	4948	9948	96	97	QSAAAA	AJGAAA	OOOOxx
+7923	4291	1	3	3	3	23	923	1923	2923	7923	46	47	TSAAAA	BJGAAA	VVVVxx
+9905	4292	1	1	5	5	5	905	1905	4905	9905	10	11	ZQAAAA	CJGAAA	AAAAxx
+340	4293	0	0	0	0	40	340	340	340	340	80	81	CNAAAA	DJGAAA	HHHHxx
+1721	4294	1	1	1	1	21	721	1721	1721	1721	42	43	FOAAAA	EJGAAA	OOOOxx
+9047	4295	1	3	7	7	47	47	1047	4047	9047	94	95	ZJAAAA	FJGAAA	VVVVxx
+4723	4296	1	3	3	3	23	723	723	4723	4723	46	47	RZAAAA	GJGAAA	AAAAxx
+5748	4297	0	0	8	8	48	748	1748	748	5748	96	97	CNAAAA	HJGAAA	HHHHxx
+6845	4298	1	1	5	5	45	845	845	1845	6845	90	91	HDAAAA	IJGAAA	OOOOxx
+1556	4299	0	0	6	16	56	556	1556	1556	1556	112	113	WHAAAA	JJGAAA	VVVVxx
+9505	4300	1	1	5	5	5	505	1505	4505	9505	10	11	PBAAAA	KJGAAA	AAAAxx
+3573	4301	1	1	3	13	73	573	1573	3573	3573	146	147	LHAAAA	LJGAAA	HHHHxx
+3785	4302	1	1	5	5	85	785	1785	3785	3785	170	171	PPAAAA	MJGAAA	OOOOxx
+2772	4303	0	0	2	12	72	772	772	2772	2772	144	145	QCAAAA	NJGAAA	VVVVxx
+7282	4304	0	2	2	2	82	282	1282	2282	7282	164	165	CUAAAA	OJGAAA	AAAAxx
+8106	4305	0	2	6	6	6	106	106	3106	8106	12	13	UZAAAA	PJGAAA	HHHHxx
+2847	4306	1	3	7	7	47	847	847	2847	2847	94	95	NFAAAA	QJGAAA	OOOOxx
+9803	4307	1	3	3	3	3	803	1803	4803	9803	6	7	BNAAAA	RJGAAA	VVVVxx
+7719	4308	1	3	9	19	19	719	1719	2719	7719	38	39	XKAAAA	SJGAAA	AAAAxx
+4649	4309	1	1	9	9	49	649	649	4649	4649	98	99	VWAAAA	TJGAAA	HHHHxx
+6196	4310	0	0	6	16	96	196	196	1196	6196	192	193	IEAAAA	UJGAAA	OOOOxx
+6026	4311	0	2	6	6	26	26	26	1026	6026	52	53	UXAAAA	VJGAAA	VVVVxx
+1646	4312	0	2	6	6	46	646	1646	1646	1646	92	93	ILAAAA	WJGAAA	AAAAxx
+6526	4313	0	2	6	6	26	526	526	1526	6526	52	53	ARAAAA	XJGAAA	HHHHxx
+5110	4314	0	2	0	10	10	110	1110	110	5110	20	21	OOAAAA	YJGAAA	OOOOxx
+3946	4315	0	2	6	6	46	946	1946	3946	3946	92	93	UVAAAA	ZJGAAA	VVVVxx
+445	4316	1	1	5	5	45	445	445	445	445	90	91	DRAAAA	AKGAAA	AAAAxx
+3249	4317	1	1	9	9	49	249	1249	3249	3249	98	99	ZUAAAA	BKGAAA	HHHHxx
+2501	4318	1	1	1	1	1	501	501	2501	2501	2	3	FSAAAA	CKGAAA	OOOOxx
+3243	4319	1	3	3	3	43	243	1243	3243	3243	86	87	TUAAAA	DKGAAA	VVVVxx
+4701	4320	1	1	1	1	1	701	701	4701	4701	2	3	VYAAAA	EKGAAA	AAAAxx
+472	4321	0	0	2	12	72	472	472	472	472	144	145	ESAAAA	FKGAAA	HHHHxx
+3356	4322	0	0	6	16	56	356	1356	3356	3356	112	113	CZAAAA	GKGAAA	OOOOxx
+9967	4323	1	3	7	7	67	967	1967	4967	9967	134	135	JTAAAA	HKGAAA	VVVVxx
+4292	4324	0	0	2	12	92	292	292	4292	4292	184	185	CJAAAA	IKGAAA	AAAAxx
+7005	4325	1	1	5	5	5	5	1005	2005	7005	10	11	LJAAAA	JKGAAA	HHHHxx
+6267	4326	1	3	7	7	67	267	267	1267	6267	134	135	BHAAAA	KKGAAA	OOOOxx
+6678	4327	0	2	8	18	78	678	678	1678	6678	156	157	WWAAAA	LKGAAA	VVVVxx
+6083	4328	1	3	3	3	83	83	83	1083	6083	166	167	ZZAAAA	MKGAAA	AAAAxx
+760	4329	0	0	0	0	60	760	760	760	760	120	121	GDAAAA	NKGAAA	HHHHxx
+7833	4330	1	1	3	13	33	833	1833	2833	7833	66	67	HPAAAA	OKGAAA	OOOOxx
+2877	4331	1	1	7	17	77	877	877	2877	2877	154	155	RGAAAA	PKGAAA	VVVVxx
+8810	4332	0	2	0	10	10	810	810	3810	8810	20	21	WAAAAA	QKGAAA	AAAAxx
+1560	4333	0	0	0	0	60	560	1560	1560	1560	120	121	AIAAAA	RKGAAA	HHHHxx
+1367	4334	1	3	7	7	67	367	1367	1367	1367	134	135	PAAAAA	SKGAAA	OOOOxx
+8756	4335	0	0	6	16	56	756	756	3756	8756	112	113	UYAAAA	TKGAAA	VVVVxx
+1346	4336	0	2	6	6	46	346	1346	1346	1346	92	93	UZAAAA	UKGAAA	AAAAxx
+6449	4337	1	1	9	9	49	449	449	1449	6449	98	99	BOAAAA	VKGAAA	HHHHxx
+6658	4338	0	2	8	18	58	658	658	1658	6658	116	117	CWAAAA	WKGAAA	OOOOxx
+6745	4339	1	1	5	5	45	745	745	1745	6745	90	91	LZAAAA	XKGAAA	VVVVxx
+4866	4340	0	2	6	6	66	866	866	4866	4866	132	133	EFAAAA	YKGAAA	AAAAxx
+14	4341	0	2	4	14	14	14	14	14	14	28	29	OAAAAA	ZKGAAA	HHHHxx
+4506	4342	0	2	6	6	6	506	506	4506	4506	12	13	IRAAAA	ALGAAA	OOOOxx
+1923	4343	1	3	3	3	23	923	1923	1923	1923	46	47	ZVAAAA	BLGAAA	VVVVxx
+8365	4344	1	1	5	5	65	365	365	3365	8365	130	131	TJAAAA	CLGAAA	AAAAxx
+1279	4345	1	3	9	19	79	279	1279	1279	1279	158	159	FXAAAA	DLGAAA	HHHHxx
+7666	4346	0	2	6	6	66	666	1666	2666	7666	132	133	WIAAAA	ELGAAA	OOOOxx
+7404	4347	0	0	4	4	4	404	1404	2404	7404	8	9	UYAAAA	FLGAAA	VVVVxx
+65	4348	1	1	5	5	65	65	65	65	65	130	131	NCAAAA	GLGAAA	AAAAxx
+5820	4349	0	0	0	0	20	820	1820	820	5820	40	41	WPAAAA	HLGAAA	HHHHxx
+459	4350	1	3	9	19	59	459	459	459	459	118	119	RRAAAA	ILGAAA	OOOOxx
+4787	4351	1	3	7	7	87	787	787	4787	4787	174	175	DCAAAA	JLGAAA	VVVVxx
+5631	4352	1	3	1	11	31	631	1631	631	5631	62	63	PIAAAA	KLGAAA	AAAAxx
+9717	4353	1	1	7	17	17	717	1717	4717	9717	34	35	TJAAAA	LLGAAA	HHHHxx
+2560	4354	0	0	0	0	60	560	560	2560	2560	120	121	MUAAAA	MLGAAA	OOOOxx
+8295	4355	1	3	5	15	95	295	295	3295	8295	190	191	BHAAAA	NLGAAA	VVVVxx
+3596	4356	0	0	6	16	96	596	1596	3596	3596	192	193	IIAAAA	OLGAAA	AAAAxx
+2023	4357	1	3	3	3	23	23	23	2023	2023	46	47	VZAAAA	PLGAAA	HHHHxx
+5055	4358	1	3	5	15	55	55	1055	55	5055	110	111	LMAAAA	QLGAAA	OOOOxx
+763	4359	1	3	3	3	63	763	763	763	763	126	127	JDAAAA	RLGAAA	VVVVxx
+6733	4360	1	1	3	13	33	733	733	1733	6733	66	67	ZYAAAA	SLGAAA	AAAAxx
+9266	4361	0	2	6	6	66	266	1266	4266	9266	132	133	KSAAAA	TLGAAA	HHHHxx
+4479	4362	1	3	9	19	79	479	479	4479	4479	158	159	HQAAAA	ULGAAA	OOOOxx
+1816	4363	0	0	6	16	16	816	1816	1816	1816	32	33	WRAAAA	VLGAAA	VVVVxx
+899	4364	1	3	9	19	99	899	899	899	899	198	199	PIAAAA	WLGAAA	AAAAxx
+230	4365	0	2	0	10	30	230	230	230	230	60	61	WIAAAA	XLGAAA	HHHHxx
+5362	4366	0	2	2	2	62	362	1362	362	5362	124	125	GYAAAA	YLGAAA	OOOOxx
+1609	4367	1	1	9	9	9	609	1609	1609	1609	18	19	XJAAAA	ZLGAAA	VVVVxx
+6750	4368	0	2	0	10	50	750	750	1750	6750	100	101	QZAAAA	AMGAAA	AAAAxx
+9704	4369	0	0	4	4	4	704	1704	4704	9704	8	9	GJAAAA	BMGAAA	HHHHxx
+3991	4370	1	3	1	11	91	991	1991	3991	3991	182	183	NXAAAA	CMGAAA	OOOOxx
+3959	4371	1	3	9	19	59	959	1959	3959	3959	118	119	HWAAAA	DMGAAA	VVVVxx
+9021	4372	1	1	1	1	21	21	1021	4021	9021	42	43	ZIAAAA	EMGAAA	AAAAxx
+7585	4373	1	1	5	5	85	585	1585	2585	7585	170	171	TFAAAA	FMGAAA	HHHHxx
+7083	4374	1	3	3	3	83	83	1083	2083	7083	166	167	LMAAAA	GMGAAA	OOOOxx
+7688	4375	0	0	8	8	88	688	1688	2688	7688	176	177	SJAAAA	HMGAAA	VVVVxx
+2673	4376	1	1	3	13	73	673	673	2673	2673	146	147	VYAAAA	IMGAAA	AAAAxx
+3554	4377	0	2	4	14	54	554	1554	3554	3554	108	109	SGAAAA	JMGAAA	HHHHxx
+7416	4378	0	0	6	16	16	416	1416	2416	7416	32	33	GZAAAA	KMGAAA	OOOOxx
+5672	4379	0	0	2	12	72	672	1672	672	5672	144	145	EKAAAA	LMGAAA	VVVVxx
+1355	4380	1	3	5	15	55	355	1355	1355	1355	110	111	DAAAAA	MMGAAA	AAAAxx
+3149	4381	1	1	9	9	49	149	1149	3149	3149	98	99	DRAAAA	NMGAAA	HHHHxx
+5811	4382	1	3	1	11	11	811	1811	811	5811	22	23	NPAAAA	OMGAAA	OOOOxx
+3759	4383	1	3	9	19	59	759	1759	3759	3759	118	119	POAAAA	PMGAAA	VVVVxx
+5634	4384	0	2	4	14	34	634	1634	634	5634	68	69	SIAAAA	QMGAAA	AAAAxx
+8617	4385	1	1	7	17	17	617	617	3617	8617	34	35	LTAAAA	RMGAAA	HHHHxx
+8949	4386	1	1	9	9	49	949	949	3949	8949	98	99	FGAAAA	SMGAAA	OOOOxx
+3964	4387	0	0	4	4	64	964	1964	3964	3964	128	129	MWAAAA	TMGAAA	VVVVxx
+3852	4388	0	0	2	12	52	852	1852	3852	3852	104	105	ESAAAA	UMGAAA	AAAAxx
+1555	4389	1	3	5	15	55	555	1555	1555	1555	110	111	VHAAAA	VMGAAA	HHHHxx
+6536	4390	0	0	6	16	36	536	536	1536	6536	72	73	KRAAAA	WMGAAA	OOOOxx
+4779	4391	1	3	9	19	79	779	779	4779	4779	158	159	VBAAAA	XMGAAA	VVVVxx
+1893	4392	1	1	3	13	93	893	1893	1893	1893	186	187	VUAAAA	YMGAAA	AAAAxx
+9358	4393	0	2	8	18	58	358	1358	4358	9358	116	117	YVAAAA	ZMGAAA	HHHHxx
+7438	4394	0	2	8	18	38	438	1438	2438	7438	76	77	CAAAAA	ANGAAA	OOOOxx
+941	4395	1	1	1	1	41	941	941	941	941	82	83	FKAAAA	BNGAAA	VVVVxx
+4844	4396	0	0	4	4	44	844	844	4844	4844	88	89	IEAAAA	CNGAAA	AAAAxx
+4745	4397	1	1	5	5	45	745	745	4745	4745	90	91	NAAAAA	DNGAAA	HHHHxx
+1017	4398	1	1	7	17	17	17	1017	1017	1017	34	35	DNAAAA	ENGAAA	OOOOxx
+327	4399	1	3	7	7	27	327	327	327	327	54	55	PMAAAA	FNGAAA	VVVVxx
+3152	4400	0	0	2	12	52	152	1152	3152	3152	104	105	GRAAAA	GNGAAA	AAAAxx
+4711	4401	1	3	1	11	11	711	711	4711	4711	22	23	FZAAAA	HNGAAA	HHHHxx
+141	4402	1	1	1	1	41	141	141	141	141	82	83	LFAAAA	INGAAA	OOOOxx
+1303	4403	1	3	3	3	3	303	1303	1303	1303	6	7	DYAAAA	JNGAAA	VVVVxx
+8873	4404	1	1	3	13	73	873	873	3873	8873	146	147	HDAAAA	KNGAAA	AAAAxx
+8481	4405	1	1	1	1	81	481	481	3481	8481	162	163	FOAAAA	LNGAAA	HHHHxx
+5445	4406	1	1	5	5	45	445	1445	445	5445	90	91	LBAAAA	MNGAAA	OOOOxx
+7868	4407	0	0	8	8	68	868	1868	2868	7868	136	137	QQAAAA	NNGAAA	VVVVxx
+6722	4408	0	2	2	2	22	722	722	1722	6722	44	45	OYAAAA	ONGAAA	AAAAxx
+6628	4409	0	0	8	8	28	628	628	1628	6628	56	57	YUAAAA	PNGAAA	HHHHxx
+7738	4410	0	2	8	18	38	738	1738	2738	7738	76	77	QLAAAA	QNGAAA	OOOOxx
+1018	4411	0	2	8	18	18	18	1018	1018	1018	36	37	ENAAAA	RNGAAA	VVVVxx
+3296	4412	0	0	6	16	96	296	1296	3296	3296	192	193	UWAAAA	SNGAAA	AAAAxx
+1946	4413	0	2	6	6	46	946	1946	1946	1946	92	93	WWAAAA	TNGAAA	HHHHxx
+6603	4414	1	3	3	3	3	603	603	1603	6603	6	7	ZTAAAA	UNGAAA	OOOOxx
+3562	4415	0	2	2	2	62	562	1562	3562	3562	124	125	AHAAAA	VNGAAA	VVVVxx
+1147	4416	1	3	7	7	47	147	1147	1147	1147	94	95	DSAAAA	WNGAAA	AAAAxx
+6031	4417	1	3	1	11	31	31	31	1031	6031	62	63	ZXAAAA	XNGAAA	HHHHxx
+6484	4418	0	0	4	4	84	484	484	1484	6484	168	169	KPAAAA	YNGAAA	OOOOxx
+496	4419	0	0	6	16	96	496	496	496	496	192	193	CTAAAA	ZNGAAA	VVVVxx
+4563	4420	1	3	3	3	63	563	563	4563	4563	126	127	NTAAAA	AOGAAA	AAAAxx
+1037	4421	1	1	7	17	37	37	1037	1037	1037	74	75	XNAAAA	BOGAAA	HHHHxx
+9672	4422	0	0	2	12	72	672	1672	4672	9672	144	145	AIAAAA	COGAAA	OOOOxx
+9053	4423	1	1	3	13	53	53	1053	4053	9053	106	107	FKAAAA	DOGAAA	VVVVxx
+2523	4424	1	3	3	3	23	523	523	2523	2523	46	47	BTAAAA	EOGAAA	AAAAxx
+8519	4425	1	3	9	19	19	519	519	3519	8519	38	39	RPAAAA	FOGAAA	HHHHxx
+8190	4426	0	2	0	10	90	190	190	3190	8190	180	181	ADAAAA	GOGAAA	OOOOxx
+2068	4427	0	0	8	8	68	68	68	2068	2068	136	137	OBAAAA	HOGAAA	VVVVxx
+8569	4428	1	1	9	9	69	569	569	3569	8569	138	139	PRAAAA	IOGAAA	AAAAxx
+6535	4429	1	3	5	15	35	535	535	1535	6535	70	71	JRAAAA	JOGAAA	HHHHxx
+1810	4430	0	2	0	10	10	810	1810	1810	1810	20	21	QRAAAA	KOGAAA	OOOOxx
+3099	4431	1	3	9	19	99	99	1099	3099	3099	198	199	FPAAAA	LOGAAA	VVVVxx
+7466	4432	0	2	6	6	66	466	1466	2466	7466	132	133	EBAAAA	MOGAAA	AAAAxx
+4017	4433	1	1	7	17	17	17	17	4017	4017	34	35	NYAAAA	NOGAAA	HHHHxx
+1097	4434	1	1	7	17	97	97	1097	1097	1097	194	195	FQAAAA	OOGAAA	OOOOxx
+7686	4435	0	2	6	6	86	686	1686	2686	7686	172	173	QJAAAA	POGAAA	VVVVxx
+6742	4436	0	2	2	2	42	742	742	1742	6742	84	85	IZAAAA	QOGAAA	AAAAxx
+5966	4437	0	2	6	6	66	966	1966	966	5966	132	133	MVAAAA	ROGAAA	HHHHxx
+3632	4438	0	0	2	12	32	632	1632	3632	3632	64	65	SJAAAA	SOGAAA	OOOOxx
+8837	4439	1	1	7	17	37	837	837	3837	8837	74	75	XBAAAA	TOGAAA	VVVVxx
+1667	4440	1	3	7	7	67	667	1667	1667	1667	134	135	DMAAAA	UOGAAA	AAAAxx
+8833	4441	1	1	3	13	33	833	833	3833	8833	66	67	TBAAAA	VOGAAA	HHHHxx
+9805	4442	1	1	5	5	5	805	1805	4805	9805	10	11	DNAAAA	WOGAAA	OOOOxx
+3650	4443	0	2	0	10	50	650	1650	3650	3650	100	101	KKAAAA	XOGAAA	VVVVxx
+2237	4444	1	1	7	17	37	237	237	2237	2237	74	75	BIAAAA	YOGAAA	AAAAxx
+9980	4445	0	0	0	0	80	980	1980	4980	9980	160	161	WTAAAA	ZOGAAA	HHHHxx
+2861	4446	1	1	1	1	61	861	861	2861	2861	122	123	BGAAAA	APGAAA	OOOOxx
+1334	4447	0	2	4	14	34	334	1334	1334	1334	68	69	IZAAAA	BPGAAA	VVVVxx
+842	4448	0	2	2	2	42	842	842	842	842	84	85	KGAAAA	CPGAAA	AAAAxx
+1116	4449	0	0	6	16	16	116	1116	1116	1116	32	33	YQAAAA	DPGAAA	HHHHxx
+4055	4450	1	3	5	15	55	55	55	4055	4055	110	111	ZZAAAA	EPGAAA	OOOOxx
+3842	4451	0	2	2	2	42	842	1842	3842	3842	84	85	URAAAA	FPGAAA	VVVVxx
+1886	4452	0	2	6	6	86	886	1886	1886	1886	172	173	OUAAAA	GPGAAA	AAAAxx
+8589	4453	1	1	9	9	89	589	589	3589	8589	178	179	JSAAAA	HPGAAA	HHHHxx
+5873	4454	1	1	3	13	73	873	1873	873	5873	146	147	XRAAAA	IPGAAA	OOOOxx
+7711	4455	1	3	1	11	11	711	1711	2711	7711	22	23	PKAAAA	JPGAAA	VVVVxx
+911	4456	1	3	1	11	11	911	911	911	911	22	23	BJAAAA	KPGAAA	AAAAxx
+5837	4457	1	1	7	17	37	837	1837	837	5837	74	75	NQAAAA	LPGAAA	HHHHxx
+897	4458	1	1	7	17	97	897	897	897	897	194	195	NIAAAA	MPGAAA	OOOOxx
+4299	4459	1	3	9	19	99	299	299	4299	4299	198	199	JJAAAA	NPGAAA	VVVVxx
+7774	4460	0	2	4	14	74	774	1774	2774	7774	148	149	ANAAAA	OPGAAA	AAAAxx
+7832	4461	0	0	2	12	32	832	1832	2832	7832	64	65	GPAAAA	PPGAAA	HHHHxx
+9915	4462	1	3	5	15	15	915	1915	4915	9915	30	31	JRAAAA	QPGAAA	OOOOxx
+9	4463	1	1	9	9	9	9	9	9	9	18	19	JAAAAA	RPGAAA	VVVVxx
+9675	4464	1	3	5	15	75	675	1675	4675	9675	150	151	DIAAAA	SPGAAA	AAAAxx
+7953	4465	1	1	3	13	53	953	1953	2953	7953	106	107	XTAAAA	TPGAAA	HHHHxx
+8912	4466	0	0	2	12	12	912	912	3912	8912	24	25	UEAAAA	UPGAAA	OOOOxx
+4188	4467	0	0	8	8	88	188	188	4188	4188	176	177	CFAAAA	VPGAAA	VVVVxx
+8446	4468	0	2	6	6	46	446	446	3446	8446	92	93	WMAAAA	WPGAAA	AAAAxx
+1600	4469	0	0	0	0	0	600	1600	1600	1600	0	1	OJAAAA	XPGAAA	HHHHxx
+43	4470	1	3	3	3	43	43	43	43	43	86	87	RBAAAA	YPGAAA	OOOOxx
+544	4471	0	0	4	4	44	544	544	544	544	88	89	YUAAAA	ZPGAAA	VVVVxx
+6977	4472	1	1	7	17	77	977	977	1977	6977	154	155	JIAAAA	AQGAAA	AAAAxx
+3191	4473	1	3	1	11	91	191	1191	3191	3191	182	183	TSAAAA	BQGAAA	HHHHxx
+418	4474	0	2	8	18	18	418	418	418	418	36	37	CQAAAA	CQGAAA	OOOOxx
+3142	4475	0	2	2	2	42	142	1142	3142	3142	84	85	WQAAAA	DQGAAA	VVVVxx
+5042	4476	0	2	2	2	42	42	1042	42	5042	84	85	YLAAAA	EQGAAA	AAAAxx
+2194	4477	0	2	4	14	94	194	194	2194	2194	188	189	KGAAAA	FQGAAA	HHHHxx
+2397	4478	1	1	7	17	97	397	397	2397	2397	194	195	FOAAAA	GQGAAA	OOOOxx
+4684	4479	0	0	4	4	84	684	684	4684	4684	168	169	EYAAAA	HQGAAA	VVVVxx
+34	4480	0	2	4	14	34	34	34	34	34	68	69	IBAAAA	IQGAAA	AAAAxx
+3844	4481	0	0	4	4	44	844	1844	3844	3844	88	89	WRAAAA	JQGAAA	HHHHxx
+7824	4482	0	0	4	4	24	824	1824	2824	7824	48	49	YOAAAA	KQGAAA	OOOOxx
+6177	4483	1	1	7	17	77	177	177	1177	6177	154	155	PDAAAA	LQGAAA	VVVVxx
+9657	4484	1	1	7	17	57	657	1657	4657	9657	114	115	LHAAAA	MQGAAA	AAAAxx
+4546	4485	0	2	6	6	46	546	546	4546	4546	92	93	WSAAAA	NQGAAA	HHHHxx
+599	4486	1	3	9	19	99	599	599	599	599	198	199	BXAAAA	OQGAAA	OOOOxx
+153	4487	1	1	3	13	53	153	153	153	153	106	107	XFAAAA	PQGAAA	VVVVxx
+6910	4488	0	2	0	10	10	910	910	1910	6910	20	21	UFAAAA	QQGAAA	AAAAxx
+4408	4489	0	0	8	8	8	408	408	4408	4408	16	17	ONAAAA	RQGAAA	HHHHxx
+1164	4490	0	0	4	4	64	164	1164	1164	1164	128	129	USAAAA	SQGAAA	OOOOxx
+6469	4491	1	1	9	9	69	469	469	1469	6469	138	139	VOAAAA	TQGAAA	VVVVxx
+5996	4492	0	0	6	16	96	996	1996	996	5996	192	193	QWAAAA	UQGAAA	AAAAxx
+2639	4493	1	3	9	19	39	639	639	2639	2639	78	79	NXAAAA	VQGAAA	HHHHxx
+2678	4494	0	2	8	18	78	678	678	2678	2678	156	157	AZAAAA	WQGAAA	OOOOxx
+8392	4495	0	0	2	12	92	392	392	3392	8392	184	185	UKAAAA	XQGAAA	VVVVxx
+1386	4496	0	2	6	6	86	386	1386	1386	1386	172	173	IBAAAA	YQGAAA	AAAAxx
+5125	4497	1	1	5	5	25	125	1125	125	5125	50	51	DPAAAA	ZQGAAA	HHHHxx
+8453	4498	1	1	3	13	53	453	453	3453	8453	106	107	DNAAAA	ARGAAA	OOOOxx
+2369	4499	1	1	9	9	69	369	369	2369	2369	138	139	DNAAAA	BRGAAA	VVVVxx
+1608	4500	0	0	8	8	8	608	1608	1608	1608	16	17	WJAAAA	CRGAAA	AAAAxx
+3781	4501	1	1	1	1	81	781	1781	3781	3781	162	163	LPAAAA	DRGAAA	HHHHxx
+903	4502	1	3	3	3	3	903	903	903	903	6	7	TIAAAA	ERGAAA	OOOOxx
+2099	4503	1	3	9	19	99	99	99	2099	2099	198	199	TCAAAA	FRGAAA	VVVVxx
+538	4504	0	2	8	18	38	538	538	538	538	76	77	SUAAAA	GRGAAA	AAAAxx
+9177	4505	1	1	7	17	77	177	1177	4177	9177	154	155	ZOAAAA	HRGAAA	HHHHxx
+420	4506	0	0	0	0	20	420	420	420	420	40	41	EQAAAA	IRGAAA	OOOOxx
+9080	4507	0	0	0	0	80	80	1080	4080	9080	160	161	GLAAAA	JRGAAA	VVVVxx
+2630	4508	0	2	0	10	30	630	630	2630	2630	60	61	EXAAAA	KRGAAA	AAAAxx
+5978	4509	0	2	8	18	78	978	1978	978	5978	156	157	YVAAAA	LRGAAA	HHHHxx
+9239	4510	1	3	9	19	39	239	1239	4239	9239	78	79	JRAAAA	MRGAAA	OOOOxx
+4372	4511	0	0	2	12	72	372	372	4372	4372	144	145	EMAAAA	NRGAAA	VVVVxx
+4357	4512	1	1	7	17	57	357	357	4357	4357	114	115	PLAAAA	ORGAAA	AAAAxx
+9857	4513	1	1	7	17	57	857	1857	4857	9857	114	115	DPAAAA	PRGAAA	HHHHxx
+7933	4514	1	1	3	13	33	933	1933	2933	7933	66	67	DTAAAA	QRGAAA	OOOOxx
+9574	4515	0	2	4	14	74	574	1574	4574	9574	148	149	GEAAAA	RRGAAA	VVVVxx
+8294	4516	0	2	4	14	94	294	294	3294	8294	188	189	AHAAAA	SRGAAA	AAAAxx
+627	4517	1	3	7	7	27	627	627	627	627	54	55	DYAAAA	TRGAAA	HHHHxx
+3229	4518	1	1	9	9	29	229	1229	3229	3229	58	59	FUAAAA	URGAAA	OOOOxx
+3163	4519	1	3	3	3	63	163	1163	3163	3163	126	127	RRAAAA	VRGAAA	VVVVxx
+7349	4520	1	1	9	9	49	349	1349	2349	7349	98	99	RWAAAA	WRGAAA	AAAAxx
+6889	4521	1	1	9	9	89	889	889	1889	6889	178	179	ZEAAAA	XRGAAA	HHHHxx
+2101	4522	1	1	1	1	1	101	101	2101	2101	2	3	VCAAAA	YRGAAA	OOOOxx
+6476	4523	0	0	6	16	76	476	476	1476	6476	152	153	CPAAAA	ZRGAAA	VVVVxx
+6765	4524	1	1	5	5	65	765	765	1765	6765	130	131	FAAAAA	ASGAAA	AAAAxx
+4204	4525	0	0	4	4	4	204	204	4204	4204	8	9	SFAAAA	BSGAAA	HHHHxx
+5915	4526	1	3	5	15	15	915	1915	915	5915	30	31	NTAAAA	CSGAAA	OOOOxx
+2318	4527	0	2	8	18	18	318	318	2318	2318	36	37	ELAAAA	DSGAAA	VVVVxx
+294	4528	0	2	4	14	94	294	294	294	294	188	189	ILAAAA	ESGAAA	AAAAxx
+5245	4529	1	1	5	5	45	245	1245	245	5245	90	91	TTAAAA	FSGAAA	HHHHxx
+4481	4530	1	1	1	1	81	481	481	4481	4481	162	163	JQAAAA	GSGAAA	OOOOxx
+7754	4531	0	2	4	14	54	754	1754	2754	7754	108	109	GMAAAA	HSGAAA	VVVVxx
+8494	4532	0	2	4	14	94	494	494	3494	8494	188	189	SOAAAA	ISGAAA	AAAAxx
+4014	4533	0	2	4	14	14	14	14	4014	4014	28	29	KYAAAA	JSGAAA	HHHHxx
+2197	4534	1	1	7	17	97	197	197	2197	2197	194	195	NGAAAA	KSGAAA	OOOOxx
+1297	4535	1	1	7	17	97	297	1297	1297	1297	194	195	XXAAAA	LSGAAA	VVVVxx
+1066	4536	0	2	6	6	66	66	1066	1066	1066	132	133	APAAAA	MSGAAA	AAAAxx
+5710	4537	0	2	0	10	10	710	1710	710	5710	20	21	QLAAAA	NSGAAA	HHHHxx
+4100	4538	0	0	0	0	0	100	100	4100	4100	0	1	SBAAAA	OSGAAA	OOOOxx
+7356	4539	0	0	6	16	56	356	1356	2356	7356	112	113	YWAAAA	PSGAAA	VVVVxx
+7658	4540	0	2	8	18	58	658	1658	2658	7658	116	117	OIAAAA	QSGAAA	AAAAxx
+3666	4541	0	2	6	6	66	666	1666	3666	3666	132	133	ALAAAA	RSGAAA	HHHHxx
+9713	4542	1	1	3	13	13	713	1713	4713	9713	26	27	PJAAAA	SSGAAA	OOOOxx
+691	4543	1	3	1	11	91	691	691	691	691	182	183	PAAAAA	TSGAAA	VVVVxx
+3112	4544	0	0	2	12	12	112	1112	3112	3112	24	25	SPAAAA	USGAAA	AAAAxx
+6035	4545	1	3	5	15	35	35	35	1035	6035	70	71	DYAAAA	VSGAAA	HHHHxx
+8353	4546	1	1	3	13	53	353	353	3353	8353	106	107	HJAAAA	WSGAAA	OOOOxx
+5679	4547	1	3	9	19	79	679	1679	679	5679	158	159	LKAAAA	XSGAAA	VVVVxx
+2124	4548	0	0	4	4	24	124	124	2124	2124	48	49	SDAAAA	YSGAAA	AAAAxx
+4714	4549	0	2	4	14	14	714	714	4714	4714	28	29	IZAAAA	ZSGAAA	HHHHxx
+9048	4550	0	0	8	8	48	48	1048	4048	9048	96	97	AKAAAA	ATGAAA	OOOOxx
+7692	4551	0	0	2	12	92	692	1692	2692	7692	184	185	WJAAAA	BTGAAA	VVVVxx
+4542	4552	0	2	2	2	42	542	542	4542	4542	84	85	SSAAAA	CTGAAA	AAAAxx
+8737	4553	1	1	7	17	37	737	737	3737	8737	74	75	BYAAAA	DTGAAA	HHHHxx
+4977	4554	1	1	7	17	77	977	977	4977	4977	154	155	LJAAAA	ETGAAA	OOOOxx
+9349	4555	1	1	9	9	49	349	1349	4349	9349	98	99	PVAAAA	FTGAAA	VVVVxx
+731	4556	1	3	1	11	31	731	731	731	731	62	63	DCAAAA	GTGAAA	AAAAxx
+1788	4557	0	0	8	8	88	788	1788	1788	1788	176	177	UQAAAA	HTGAAA	HHHHxx
+7830	4558	0	2	0	10	30	830	1830	2830	7830	60	61	EPAAAA	ITGAAA	OOOOxx
+3977	4559	1	1	7	17	77	977	1977	3977	3977	154	155	ZWAAAA	JTGAAA	VVVVxx
+2421	4560	1	1	1	1	21	421	421	2421	2421	42	43	DPAAAA	KTGAAA	AAAAxx
+5891	4561	1	3	1	11	91	891	1891	891	5891	182	183	PSAAAA	LTGAAA	HHHHxx
+1111	4562	1	3	1	11	11	111	1111	1111	1111	22	23	TQAAAA	MTGAAA	OOOOxx
+9224	4563	0	0	4	4	24	224	1224	4224	9224	48	49	UQAAAA	NTGAAA	VVVVxx
+9872	4564	0	0	2	12	72	872	1872	4872	9872	144	145	SPAAAA	OTGAAA	AAAAxx
+2433	4565	1	1	3	13	33	433	433	2433	2433	66	67	PPAAAA	PTGAAA	HHHHxx
+1491	4566	1	3	1	11	91	491	1491	1491	1491	182	183	JFAAAA	QTGAAA	OOOOxx
+6653	4567	1	1	3	13	53	653	653	1653	6653	106	107	XVAAAA	RTGAAA	VVVVxx
+1907	4568	1	3	7	7	7	907	1907	1907	1907	14	15	JVAAAA	STGAAA	AAAAxx
+889	4569	1	1	9	9	89	889	889	889	889	178	179	FIAAAA	TTGAAA	HHHHxx
+561	4570	1	1	1	1	61	561	561	561	561	122	123	PVAAAA	UTGAAA	OOOOxx
+7415	4571	1	3	5	15	15	415	1415	2415	7415	30	31	FZAAAA	VTGAAA	VVVVxx
+2703	4572	1	3	3	3	3	703	703	2703	2703	6	7	ZZAAAA	WTGAAA	AAAAxx
+2561	4573	1	1	1	1	61	561	561	2561	2561	122	123	NUAAAA	XTGAAA	HHHHxx
+1257	4574	1	1	7	17	57	257	1257	1257	1257	114	115	JWAAAA	YTGAAA	OOOOxx
+2390	4575	0	2	0	10	90	390	390	2390	2390	180	181	YNAAAA	ZTGAAA	VVVVxx
+3915	4576	1	3	5	15	15	915	1915	3915	3915	30	31	PUAAAA	AUGAAA	AAAAxx
+8476	4577	0	0	6	16	76	476	476	3476	8476	152	153	AOAAAA	BUGAAA	HHHHxx
+607	4578	1	3	7	7	7	607	607	607	607	14	15	JXAAAA	CUGAAA	OOOOxx
+3891	4579	1	3	1	11	91	891	1891	3891	3891	182	183	RTAAAA	DUGAAA	VVVVxx
+7269	4580	1	1	9	9	69	269	1269	2269	7269	138	139	PTAAAA	EUGAAA	AAAAxx
+9537	4581	1	1	7	17	37	537	1537	4537	9537	74	75	VCAAAA	FUGAAA	HHHHxx
+8518	4582	0	2	8	18	18	518	518	3518	8518	36	37	QPAAAA	GUGAAA	OOOOxx
+5221	4583	1	1	1	1	21	221	1221	221	5221	42	43	VSAAAA	HUGAAA	VVVVxx
+3274	4584	0	2	4	14	74	274	1274	3274	3274	148	149	YVAAAA	IUGAAA	AAAAxx
+6677	4585	1	1	7	17	77	677	677	1677	6677	154	155	VWAAAA	JUGAAA	HHHHxx
+3114	4586	0	2	4	14	14	114	1114	3114	3114	28	29	UPAAAA	KUGAAA	OOOOxx
+1966	4587	0	2	6	6	66	966	1966	1966	1966	132	133	QXAAAA	LUGAAA	VVVVxx
+5941	4588	1	1	1	1	41	941	1941	941	5941	82	83	NUAAAA	MUGAAA	AAAAxx
+9463	4589	1	3	3	3	63	463	1463	4463	9463	126	127	ZZAAAA	NUGAAA	HHHHxx
+8966	4590	0	2	6	6	66	966	966	3966	8966	132	133	WGAAAA	OUGAAA	OOOOxx
+4402	4591	0	2	2	2	2	402	402	4402	4402	4	5	INAAAA	PUGAAA	VVVVxx
+3364	4592	0	0	4	4	64	364	1364	3364	3364	128	129	KZAAAA	QUGAAA	AAAAxx
+3698	4593	0	2	8	18	98	698	1698	3698	3698	196	197	GMAAAA	RUGAAA	HHHHxx
+4651	4594	1	3	1	11	51	651	651	4651	4651	102	103	XWAAAA	SUGAAA	OOOOxx
+2127	4595	1	3	7	7	27	127	127	2127	2127	54	55	VDAAAA	TUGAAA	VVVVxx
+3614	4596	0	2	4	14	14	614	1614	3614	3614	28	29	AJAAAA	UUGAAA	AAAAxx
+5430	4597	0	2	0	10	30	430	1430	430	5430	60	61	WAAAAA	VUGAAA	HHHHxx
+3361	4598	1	1	1	1	61	361	1361	3361	3361	122	123	HZAAAA	WUGAAA	OOOOxx
+4798	4599	0	2	8	18	98	798	798	4798	4798	196	197	OCAAAA	XUGAAA	VVVVxx
+8269	4600	1	1	9	9	69	269	269	3269	8269	138	139	BGAAAA	YUGAAA	AAAAxx
+6458	4601	0	2	8	18	58	458	458	1458	6458	116	117	KOAAAA	ZUGAAA	HHHHxx
+3358	4602	0	2	8	18	58	358	1358	3358	3358	116	117	EZAAAA	AVGAAA	OOOOxx
+5898	4603	0	2	8	18	98	898	1898	898	5898	196	197	WSAAAA	BVGAAA	VVVVxx
+1880	4604	0	0	0	0	80	880	1880	1880	1880	160	161	IUAAAA	CVGAAA	AAAAxx
+782	4605	0	2	2	2	82	782	782	782	782	164	165	CEAAAA	DVGAAA	HHHHxx
+3102	4606	0	2	2	2	2	102	1102	3102	3102	4	5	IPAAAA	EVGAAA	OOOOxx
+6366	4607	0	2	6	6	66	366	366	1366	6366	132	133	WKAAAA	FVGAAA	VVVVxx
+399	4608	1	3	9	19	99	399	399	399	399	198	199	JPAAAA	GVGAAA	AAAAxx
+6773	4609	1	1	3	13	73	773	773	1773	6773	146	147	NAAAAA	HVGAAA	HHHHxx
+7942	4610	0	2	2	2	42	942	1942	2942	7942	84	85	MTAAAA	IVGAAA	OOOOxx
+6274	4611	0	2	4	14	74	274	274	1274	6274	148	149	IHAAAA	JVGAAA	VVVVxx
+7447	4612	1	3	7	7	47	447	1447	2447	7447	94	95	LAAAAA	KVGAAA	AAAAxx
+7648	4613	0	0	8	8	48	648	1648	2648	7648	96	97	EIAAAA	LVGAAA	HHHHxx
+3997	4614	1	1	7	17	97	997	1997	3997	3997	194	195	TXAAAA	MVGAAA	OOOOxx
+1759	4615	1	3	9	19	59	759	1759	1759	1759	118	119	RPAAAA	NVGAAA	VVVVxx
+1785	4616	1	1	5	5	85	785	1785	1785	1785	170	171	RQAAAA	OVGAAA	AAAAxx
+8930	4617	0	2	0	10	30	930	930	3930	8930	60	61	MFAAAA	PVGAAA	HHHHxx
+7595	4618	1	3	5	15	95	595	1595	2595	7595	190	191	DGAAAA	QVGAAA	OOOOxx
+6752	4619	0	0	2	12	52	752	752	1752	6752	104	105	SZAAAA	RVGAAA	VVVVxx
+5635	4620	1	3	5	15	35	635	1635	635	5635	70	71	TIAAAA	SVGAAA	AAAAxx
+1579	4621	1	3	9	19	79	579	1579	1579	1579	158	159	TIAAAA	TVGAAA	HHHHxx
+7743	4622	1	3	3	3	43	743	1743	2743	7743	86	87	VLAAAA	UVGAAA	OOOOxx
+5856	4623	0	0	6	16	56	856	1856	856	5856	112	113	GRAAAA	VVGAAA	VVVVxx
+7273	4624	1	1	3	13	73	273	1273	2273	7273	146	147	TTAAAA	WVGAAA	AAAAxx
+1399	4625	1	3	9	19	99	399	1399	1399	1399	198	199	VBAAAA	XVGAAA	HHHHxx
+3694	4626	0	2	4	14	94	694	1694	3694	3694	188	189	CMAAAA	YVGAAA	OOOOxx
+2782	4627	0	2	2	2	82	782	782	2782	2782	164	165	ADAAAA	ZVGAAA	VVVVxx
+6951	4628	1	3	1	11	51	951	951	1951	6951	102	103	JHAAAA	AWGAAA	AAAAxx
+6053	4629	1	1	3	13	53	53	53	1053	6053	106	107	VYAAAA	BWGAAA	HHHHxx
+1753	4630	1	1	3	13	53	753	1753	1753	1753	106	107	LPAAAA	CWGAAA	OOOOxx
+3985	4631	1	1	5	5	85	985	1985	3985	3985	170	171	HXAAAA	DWGAAA	VVVVxx
+6159	4632	1	3	9	19	59	159	159	1159	6159	118	119	XCAAAA	EWGAAA	AAAAxx
+6250	4633	0	2	0	10	50	250	250	1250	6250	100	101	KGAAAA	FWGAAA	HHHHxx
+6240	4634	0	0	0	0	40	240	240	1240	6240	80	81	AGAAAA	GWGAAA	OOOOxx
+6571	4635	1	3	1	11	71	571	571	1571	6571	142	143	TSAAAA	HWGAAA	VVVVxx
+8624	4636	0	0	4	4	24	624	624	3624	8624	48	49	STAAAA	IWGAAA	AAAAxx
+9718	4637	0	2	8	18	18	718	1718	4718	9718	36	37	UJAAAA	JWGAAA	HHHHxx
+5529	4638	1	1	9	9	29	529	1529	529	5529	58	59	REAAAA	KWGAAA	OOOOxx
+7089	4639	1	1	9	9	89	89	1089	2089	7089	178	179	RMAAAA	LWGAAA	VVVVxx
+5488	4640	0	0	8	8	88	488	1488	488	5488	176	177	CDAAAA	MWGAAA	AAAAxx
+5444	4641	0	0	4	4	44	444	1444	444	5444	88	89	KBAAAA	NWGAAA	HHHHxx
+4899	4642	1	3	9	19	99	899	899	4899	4899	198	199	LGAAAA	OWGAAA	OOOOxx
+7928	4643	0	0	8	8	28	928	1928	2928	7928	56	57	YSAAAA	PWGAAA	VVVVxx
+4736	4644	0	0	6	16	36	736	736	4736	4736	72	73	EAAAAA	QWGAAA	AAAAxx
+4317	4645	1	1	7	17	17	317	317	4317	4317	34	35	BKAAAA	RWGAAA	HHHHxx
+1174	4646	0	2	4	14	74	174	1174	1174	1174	148	149	ETAAAA	SWGAAA	OOOOxx
+6138	4647	0	2	8	18	38	138	138	1138	6138	76	77	CCAAAA	TWGAAA	VVVVxx
+3943	4648	1	3	3	3	43	943	1943	3943	3943	86	87	RVAAAA	UWGAAA	AAAAxx
+1545	4649	1	1	5	5	45	545	1545	1545	1545	90	91	LHAAAA	VWGAAA	HHHHxx
+6867	4650	1	3	7	7	67	867	867	1867	6867	134	135	DEAAAA	WWGAAA	OOOOxx
+6832	4651	0	0	2	12	32	832	832	1832	6832	64	65	UCAAAA	XWGAAA	VVVVxx
+2987	4652	1	3	7	7	87	987	987	2987	2987	174	175	XKAAAA	YWGAAA	AAAAxx
+5169	4653	1	1	9	9	69	169	1169	169	5169	138	139	VQAAAA	ZWGAAA	HHHHxx
+8998	4654	0	2	8	18	98	998	998	3998	8998	196	197	CIAAAA	AXGAAA	OOOOxx
+9347	4655	1	3	7	7	47	347	1347	4347	9347	94	95	NVAAAA	BXGAAA	VVVVxx
+4800	4656	0	0	0	0	0	800	800	4800	4800	0	1	QCAAAA	CXGAAA	AAAAxx
+4200	4657	0	0	0	0	0	200	200	4200	4200	0	1	OFAAAA	DXGAAA	HHHHxx
+4046	4658	0	2	6	6	46	46	46	4046	4046	92	93	QZAAAA	EXGAAA	OOOOxx
+7142	4659	0	2	2	2	42	142	1142	2142	7142	84	85	SOAAAA	FXGAAA	VVVVxx
+2733	4660	1	1	3	13	33	733	733	2733	2733	66	67	DBAAAA	GXGAAA	AAAAxx
+1568	4661	0	0	8	8	68	568	1568	1568	1568	136	137	IIAAAA	HXGAAA	HHHHxx
+5105	4662	1	1	5	5	5	105	1105	105	5105	10	11	JOAAAA	IXGAAA	OOOOxx
+9115	4663	1	3	5	15	15	115	1115	4115	9115	30	31	PMAAAA	JXGAAA	VVVVxx
+6475	4664	1	3	5	15	75	475	475	1475	6475	150	151	BPAAAA	KXGAAA	AAAAxx
+3796	4665	0	0	6	16	96	796	1796	3796	3796	192	193	AQAAAA	LXGAAA	HHHHxx
+5410	4666	0	2	0	10	10	410	1410	410	5410	20	21	CAAAAA	MXGAAA	OOOOxx
+4023	4667	1	3	3	3	23	23	23	4023	4023	46	47	TYAAAA	NXGAAA	VVVVxx
+8904	4668	0	0	4	4	4	904	904	3904	8904	8	9	MEAAAA	OXGAAA	AAAAxx
+450	4669	0	2	0	10	50	450	450	450	450	100	101	IRAAAA	PXGAAA	HHHHxx
+8087	4670	1	3	7	7	87	87	87	3087	8087	174	175	BZAAAA	QXGAAA	OOOOxx
+6478	4671	0	2	8	18	78	478	478	1478	6478	156	157	EPAAAA	RXGAAA	VVVVxx
+2696	4672	0	0	6	16	96	696	696	2696	2696	192	193	SZAAAA	SXGAAA	AAAAxx
+1792	4673	0	0	2	12	92	792	1792	1792	1792	184	185	YQAAAA	TXGAAA	HHHHxx
+9699	4674	1	3	9	19	99	699	1699	4699	9699	198	199	BJAAAA	UXGAAA	OOOOxx
+9160	4675	0	0	0	0	60	160	1160	4160	9160	120	121	IOAAAA	VXGAAA	VVVVxx
+9989	4676	1	1	9	9	89	989	1989	4989	9989	178	179	FUAAAA	WXGAAA	AAAAxx
+9568	4677	0	0	8	8	68	568	1568	4568	9568	136	137	AEAAAA	XXGAAA	HHHHxx
+487	4678	1	3	7	7	87	487	487	487	487	174	175	TSAAAA	YXGAAA	OOOOxx
+7863	4679	1	3	3	3	63	863	1863	2863	7863	126	127	LQAAAA	ZXGAAA	VVVVxx
+1884	4680	0	0	4	4	84	884	1884	1884	1884	168	169	MUAAAA	AYGAAA	AAAAxx
+2651	4681	1	3	1	11	51	651	651	2651	2651	102	103	ZXAAAA	BYGAAA	HHHHxx
+8285	4682	1	1	5	5	85	285	285	3285	8285	170	171	RGAAAA	CYGAAA	OOOOxx
+3927	4683	1	3	7	7	27	927	1927	3927	3927	54	55	BVAAAA	DYGAAA	VVVVxx
+4076	4684	0	0	6	16	76	76	76	4076	4076	152	153	UAAAAA	EYGAAA	AAAAxx
+6149	4685	1	1	9	9	49	149	149	1149	6149	98	99	NCAAAA	FYGAAA	HHHHxx
+6581	4686	1	1	1	1	81	581	581	1581	6581	162	163	DTAAAA	GYGAAA	OOOOxx
+8293	4687	1	1	3	13	93	293	293	3293	8293	186	187	ZGAAAA	HYGAAA	VVVVxx
+7665	4688	1	1	5	5	65	665	1665	2665	7665	130	131	VIAAAA	IYGAAA	AAAAxx
+4435	4689	1	3	5	15	35	435	435	4435	4435	70	71	POAAAA	JYGAAA	HHHHxx
+1271	4690	1	3	1	11	71	271	1271	1271	1271	142	143	XWAAAA	KYGAAA	OOOOxx
+3928	4691	0	0	8	8	28	928	1928	3928	3928	56	57	CVAAAA	LYGAAA	VVVVxx
+7045	4692	1	1	5	5	45	45	1045	2045	7045	90	91	ZKAAAA	MYGAAA	AAAAxx
+4943	4693	1	3	3	3	43	943	943	4943	4943	86	87	DIAAAA	NYGAAA	HHHHxx
+8473	4694	1	1	3	13	73	473	473	3473	8473	146	147	XNAAAA	OYGAAA	OOOOxx
+1707	4695	1	3	7	7	7	707	1707	1707	1707	14	15	RNAAAA	PYGAAA	VVVVxx
+7509	4696	1	1	9	9	9	509	1509	2509	7509	18	19	VCAAAA	QYGAAA	AAAAxx
+1593	4697	1	1	3	13	93	593	1593	1593	1593	186	187	HJAAAA	RYGAAA	HHHHxx
+9281	4698	1	1	1	1	81	281	1281	4281	9281	162	163	ZSAAAA	SYGAAA	OOOOxx
+8986	4699	0	2	6	6	86	986	986	3986	8986	172	173	QHAAAA	TYGAAA	VVVVxx
+3740	4700	0	0	0	0	40	740	1740	3740	3740	80	81	WNAAAA	UYGAAA	AAAAxx
+9265	4701	1	1	5	5	65	265	1265	4265	9265	130	131	JSAAAA	VYGAAA	HHHHxx
+1510	4702	0	2	0	10	10	510	1510	1510	1510	20	21	CGAAAA	WYGAAA	OOOOxx
+3022	4703	0	2	2	2	22	22	1022	3022	3022	44	45	GMAAAA	XYGAAA	VVVVxx
+9014	4704	0	2	4	14	14	14	1014	4014	9014	28	29	SIAAAA	YYGAAA	AAAAxx
+6816	4705	0	0	6	16	16	816	816	1816	6816	32	33	ECAAAA	ZYGAAA	HHHHxx
+5518	4706	0	2	8	18	18	518	1518	518	5518	36	37	GEAAAA	AZGAAA	OOOOxx
+4451	4707	1	3	1	11	51	451	451	4451	4451	102	103	FPAAAA	BZGAAA	VVVVxx
+8747	4708	1	3	7	7	47	747	747	3747	8747	94	95	LYAAAA	CZGAAA	AAAAxx
+4646	4709	0	2	6	6	46	646	646	4646	4646	92	93	SWAAAA	DZGAAA	HHHHxx
+7296	4710	0	0	6	16	96	296	1296	2296	7296	192	193	QUAAAA	EZGAAA	OOOOxx
+9644	4711	0	0	4	4	44	644	1644	4644	9644	88	89	YGAAAA	FZGAAA	VVVVxx
+5977	4712	1	1	7	17	77	977	1977	977	5977	154	155	XVAAAA	GZGAAA	AAAAxx
+6270	4713	0	2	0	10	70	270	270	1270	6270	140	141	EHAAAA	HZGAAA	HHHHxx
+5578	4714	0	2	8	18	78	578	1578	578	5578	156	157	OGAAAA	IZGAAA	OOOOxx
+2465	4715	1	1	5	5	65	465	465	2465	2465	130	131	VQAAAA	JZGAAA	VVVVxx
+6436	4716	0	0	6	16	36	436	436	1436	6436	72	73	ONAAAA	KZGAAA	AAAAxx
+8089	4717	1	1	9	9	89	89	89	3089	8089	178	179	DZAAAA	LZGAAA	HHHHxx
+2409	4718	1	1	9	9	9	409	409	2409	2409	18	19	ROAAAA	MZGAAA	OOOOxx
+284	4719	0	0	4	4	84	284	284	284	284	168	169	YKAAAA	NZGAAA	VVVVxx
+5576	4720	0	0	6	16	76	576	1576	576	5576	152	153	MGAAAA	OZGAAA	AAAAxx
+6534	4721	0	2	4	14	34	534	534	1534	6534	68	69	IRAAAA	PZGAAA	HHHHxx
+8848	4722	0	0	8	8	48	848	848	3848	8848	96	97	ICAAAA	QZGAAA	OOOOxx
+4305	4723	1	1	5	5	5	305	305	4305	4305	10	11	PJAAAA	RZGAAA	VVVVxx
+5574	4724	0	2	4	14	74	574	1574	574	5574	148	149	KGAAAA	SZGAAA	AAAAxx
+596	4725	0	0	6	16	96	596	596	596	596	192	193	YWAAAA	TZGAAA	HHHHxx
+1253	4726	1	1	3	13	53	253	1253	1253	1253	106	107	FWAAAA	UZGAAA	OOOOxx
+521	4727	1	1	1	1	21	521	521	521	521	42	43	BUAAAA	VZGAAA	VVVVxx
+8739	4728	1	3	9	19	39	739	739	3739	8739	78	79	DYAAAA	WZGAAA	AAAAxx
+908	4729	0	0	8	8	8	908	908	908	908	16	17	YIAAAA	XZGAAA	HHHHxx
+6937	4730	1	1	7	17	37	937	937	1937	6937	74	75	VGAAAA	YZGAAA	OOOOxx
+4515	4731	1	3	5	15	15	515	515	4515	4515	30	31	RRAAAA	ZZGAAA	VVVVxx
+8630	4732	0	2	0	10	30	630	630	3630	8630	60	61	YTAAAA	AAHAAA	AAAAxx
+7518	4733	0	2	8	18	18	518	1518	2518	7518	36	37	EDAAAA	BAHAAA	HHHHxx
+8300	4734	0	0	0	0	0	300	300	3300	8300	0	1	GHAAAA	CAHAAA	OOOOxx
+8434	4735	0	2	4	14	34	434	434	3434	8434	68	69	KMAAAA	DAHAAA	VVVVxx
+6000	4736	0	0	0	0	0	0	0	1000	6000	0	1	UWAAAA	EAHAAA	AAAAxx
+4508	4737	0	0	8	8	8	508	508	4508	4508	16	17	KRAAAA	FAHAAA	HHHHxx
+7861	4738	1	1	1	1	61	861	1861	2861	7861	122	123	JQAAAA	GAHAAA	OOOOxx
+5953	4739	1	1	3	13	53	953	1953	953	5953	106	107	ZUAAAA	HAHAAA	VVVVxx
+5063	4740	1	3	3	3	63	63	1063	63	5063	126	127	TMAAAA	IAHAAA	AAAAxx
+4501	4741	1	1	1	1	1	501	501	4501	4501	2	3	DRAAAA	JAHAAA	HHHHxx
+7092	4742	0	0	2	12	92	92	1092	2092	7092	184	185	UMAAAA	KAHAAA	OOOOxx
+4388	4743	0	0	8	8	88	388	388	4388	4388	176	177	UMAAAA	LAHAAA	VVVVxx
+1826	4744	0	2	6	6	26	826	1826	1826	1826	52	53	GSAAAA	MAHAAA	AAAAxx
+568	4745	0	0	8	8	68	568	568	568	568	136	137	WVAAAA	NAHAAA	HHHHxx
+8184	4746	0	0	4	4	84	184	184	3184	8184	168	169	UCAAAA	OAHAAA	OOOOxx
+4268	4747	0	0	8	8	68	268	268	4268	4268	136	137	EIAAAA	PAHAAA	VVVVxx
+5798	4748	0	2	8	18	98	798	1798	798	5798	196	197	APAAAA	QAHAAA	AAAAxx
+5190	4749	0	2	0	10	90	190	1190	190	5190	180	181	QRAAAA	RAHAAA	HHHHxx
+1298	4750	0	2	8	18	98	298	1298	1298	1298	196	197	YXAAAA	SAHAAA	OOOOxx
+4035	4751	1	3	5	15	35	35	35	4035	4035	70	71	FZAAAA	TAHAAA	VVVVxx
+4504	4752	0	0	4	4	4	504	504	4504	4504	8	9	GRAAAA	UAHAAA	AAAAxx
+5992	4753	0	0	2	12	92	992	1992	992	5992	184	185	MWAAAA	VAHAAA	HHHHxx
+770	4754	0	2	0	10	70	770	770	770	770	140	141	QDAAAA	WAHAAA	OOOOxx
+7502	4755	0	2	2	2	2	502	1502	2502	7502	4	5	OCAAAA	XAHAAA	VVVVxx
+824	4756	0	0	4	4	24	824	824	824	824	48	49	SFAAAA	YAHAAA	AAAAxx
+7716	4757	0	0	6	16	16	716	1716	2716	7716	32	33	UKAAAA	ZAHAAA	HHHHxx
+5749	4758	1	1	9	9	49	749	1749	749	5749	98	99	DNAAAA	ABHAAA	OOOOxx
+9814	4759	0	2	4	14	14	814	1814	4814	9814	28	29	MNAAAA	BBHAAA	VVVVxx
+350	4760	0	2	0	10	50	350	350	350	350	100	101	MNAAAA	CBHAAA	AAAAxx
+1390	4761	0	2	0	10	90	390	1390	1390	1390	180	181	MBAAAA	DBHAAA	HHHHxx
+6994	4762	0	2	4	14	94	994	994	1994	6994	188	189	AJAAAA	EBHAAA	OOOOxx
+3629	4763	1	1	9	9	29	629	1629	3629	3629	58	59	PJAAAA	FBHAAA	VVVVxx
+9937	4764	1	1	7	17	37	937	1937	4937	9937	74	75	FSAAAA	GBHAAA	AAAAxx
+5285	4765	1	1	5	5	85	285	1285	285	5285	170	171	HVAAAA	HBHAAA	HHHHxx
+3157	4766	1	1	7	17	57	157	1157	3157	3157	114	115	LRAAAA	IBHAAA	OOOOxx
+9549	4767	1	1	9	9	49	549	1549	4549	9549	98	99	HDAAAA	JBHAAA	VVVVxx
+4118	4768	0	2	8	18	18	118	118	4118	4118	36	37	KCAAAA	KBHAAA	AAAAxx
+756	4769	0	0	6	16	56	756	756	756	756	112	113	CDAAAA	LBHAAA	HHHHxx
+5964	4770	0	0	4	4	64	964	1964	964	5964	128	129	KVAAAA	MBHAAA	OOOOxx
+7701	4771	1	1	1	1	1	701	1701	2701	7701	2	3	FKAAAA	NBHAAA	VVVVxx
+1242	4772	0	2	2	2	42	242	1242	1242	1242	84	85	UVAAAA	OBHAAA	AAAAxx
+7890	4773	0	2	0	10	90	890	1890	2890	7890	180	181	MRAAAA	PBHAAA	HHHHxx
+1991	4774	1	3	1	11	91	991	1991	1991	1991	182	183	PYAAAA	QBHAAA	OOOOxx
+110	4775	0	2	0	10	10	110	110	110	110	20	21	GEAAAA	RBHAAA	VVVVxx
+9334	4776	0	2	4	14	34	334	1334	4334	9334	68	69	AVAAAA	SBHAAA	AAAAxx
+6231	4777	1	3	1	11	31	231	231	1231	6231	62	63	RFAAAA	TBHAAA	HHHHxx
+9871	4778	1	3	1	11	71	871	1871	4871	9871	142	143	RPAAAA	UBHAAA	OOOOxx
+9471	4779	1	3	1	11	71	471	1471	4471	9471	142	143	HAAAAA	VBHAAA	VVVVxx
+2697	4780	1	1	7	17	97	697	697	2697	2697	194	195	TZAAAA	WBHAAA	AAAAxx
+4761	4781	1	1	1	1	61	761	761	4761	4761	122	123	DBAAAA	XBHAAA	HHHHxx
+8493	4782	1	1	3	13	93	493	493	3493	8493	186	187	ROAAAA	YBHAAA	OOOOxx
+1045	4783	1	1	5	5	45	45	1045	1045	1045	90	91	FOAAAA	ZBHAAA	VVVVxx
+3403	4784	1	3	3	3	3	403	1403	3403	3403	6	7	XAAAAA	ACHAAA	AAAAxx
+9412	4785	0	0	2	12	12	412	1412	4412	9412	24	25	AYAAAA	BCHAAA	HHHHxx
+7652	4786	0	0	2	12	52	652	1652	2652	7652	104	105	IIAAAA	CCHAAA	OOOOxx
+5866	4787	0	2	6	6	66	866	1866	866	5866	132	133	QRAAAA	DCHAAA	VVVVxx
+6942	4788	0	2	2	2	42	942	942	1942	6942	84	85	AHAAAA	ECHAAA	AAAAxx
+9353	4789	1	1	3	13	53	353	1353	4353	9353	106	107	TVAAAA	FCHAAA	HHHHxx
+2600	4790	0	0	0	0	0	600	600	2600	2600	0	1	AWAAAA	GCHAAA	OOOOxx
+6971	4791	1	3	1	11	71	971	971	1971	6971	142	143	DIAAAA	HCHAAA	VVVVxx
+5391	4792	1	3	1	11	91	391	1391	391	5391	182	183	JZAAAA	ICHAAA	AAAAxx
+7654	4793	0	2	4	14	54	654	1654	2654	7654	108	109	KIAAAA	JCHAAA	HHHHxx
+1797	4794	1	1	7	17	97	797	1797	1797	1797	194	195	DRAAAA	KCHAAA	OOOOxx
+4530	4795	0	2	0	10	30	530	530	4530	4530	60	61	GSAAAA	LCHAAA	VVVVxx
+3130	4796	0	2	0	10	30	130	1130	3130	3130	60	61	KQAAAA	MCHAAA	AAAAxx
+9442	4797	0	2	2	2	42	442	1442	4442	9442	84	85	EZAAAA	NCHAAA	HHHHxx
+6659	4798	1	3	9	19	59	659	659	1659	6659	118	119	DWAAAA	OCHAAA	OOOOxx
+9714	4799	0	2	4	14	14	714	1714	4714	9714	28	29	QJAAAA	PCHAAA	VVVVxx
+3660	4800	0	0	0	0	60	660	1660	3660	3660	120	121	UKAAAA	QCHAAA	AAAAxx
+1906	4801	0	2	6	6	6	906	1906	1906	1906	12	13	IVAAAA	RCHAAA	HHHHxx
+7927	4802	1	3	7	7	27	927	1927	2927	7927	54	55	XSAAAA	SCHAAA	OOOOxx
+1767	4803	1	3	7	7	67	767	1767	1767	1767	134	135	ZPAAAA	TCHAAA	VVVVxx
+5523	4804	1	3	3	3	23	523	1523	523	5523	46	47	LEAAAA	UCHAAA	AAAAxx
+9289	4805	1	1	9	9	89	289	1289	4289	9289	178	179	HTAAAA	VCHAAA	HHHHxx
+2717	4806	1	1	7	17	17	717	717	2717	2717	34	35	NAAAAA	WCHAAA	OOOOxx
+4099	4807	1	3	9	19	99	99	99	4099	4099	198	199	RBAAAA	XCHAAA	VVVVxx
+4387	4808	1	3	7	7	87	387	387	4387	4387	174	175	TMAAAA	YCHAAA	AAAAxx
+8864	4809	0	0	4	4	64	864	864	3864	8864	128	129	YCAAAA	ZCHAAA	HHHHxx
+1774	4810	0	2	4	14	74	774	1774	1774	1774	148	149	GQAAAA	ADHAAA	OOOOxx
+6292	4811	0	0	2	12	92	292	292	1292	6292	184	185	AIAAAA	BDHAAA	VVVVxx
+847	4812	1	3	7	7	47	847	847	847	847	94	95	PGAAAA	CDHAAA	AAAAxx
+5954	4813	0	2	4	14	54	954	1954	954	5954	108	109	AVAAAA	DDHAAA	HHHHxx
+8032	4814	0	0	2	12	32	32	32	3032	8032	64	65	YWAAAA	EDHAAA	OOOOxx
+3295	4815	1	3	5	15	95	295	1295	3295	3295	190	191	TWAAAA	FDHAAA	VVVVxx
+8984	4816	0	0	4	4	84	984	984	3984	8984	168	169	OHAAAA	GDHAAA	AAAAxx
+7809	4817	1	1	9	9	9	809	1809	2809	7809	18	19	JOAAAA	HDHAAA	HHHHxx
+1670	4818	0	2	0	10	70	670	1670	1670	1670	140	141	GMAAAA	IDHAAA	OOOOxx
+7733	4819	1	1	3	13	33	733	1733	2733	7733	66	67	LLAAAA	JDHAAA	VVVVxx
+6187	4820	1	3	7	7	87	187	187	1187	6187	174	175	ZDAAAA	KDHAAA	AAAAxx
+9326	4821	0	2	6	6	26	326	1326	4326	9326	52	53	SUAAAA	LDHAAA	HHHHxx
+2493	4822	1	1	3	13	93	493	493	2493	2493	186	187	XRAAAA	MDHAAA	OOOOxx
+9512	4823	0	0	2	12	12	512	1512	4512	9512	24	25	WBAAAA	NDHAAA	VVVVxx
+4342	4824	0	2	2	2	42	342	342	4342	4342	84	85	ALAAAA	ODHAAA	AAAAxx
+5350	4825	0	2	0	10	50	350	1350	350	5350	100	101	UXAAAA	PDHAAA	HHHHxx
+6009	4826	1	1	9	9	9	9	9	1009	6009	18	19	DXAAAA	QDHAAA	OOOOxx
+1208	4827	0	0	8	8	8	208	1208	1208	1208	16	17	MUAAAA	RDHAAA	VVVVxx
+7014	4828	0	2	4	14	14	14	1014	2014	7014	28	29	UJAAAA	SDHAAA	AAAAxx
+2967	4829	1	3	7	7	67	967	967	2967	2967	134	135	DKAAAA	TDHAAA	HHHHxx
+5831	4830	1	3	1	11	31	831	1831	831	5831	62	63	HQAAAA	UDHAAA	OOOOxx
+3097	4831	1	1	7	17	97	97	1097	3097	3097	194	195	DPAAAA	VDHAAA	VVVVxx
+1528	4832	0	0	8	8	28	528	1528	1528	1528	56	57	UGAAAA	WDHAAA	AAAAxx
+6429	4833	1	1	9	9	29	429	429	1429	6429	58	59	HNAAAA	XDHAAA	HHHHxx
+7320	4834	0	0	0	0	20	320	1320	2320	7320	40	41	OVAAAA	YDHAAA	OOOOxx
+844	4835	0	0	4	4	44	844	844	844	844	88	89	MGAAAA	ZDHAAA	VVVVxx
+7054	4836	0	2	4	14	54	54	1054	2054	7054	108	109	ILAAAA	AEHAAA	AAAAxx
+1643	4837	1	3	3	3	43	643	1643	1643	1643	86	87	FLAAAA	BEHAAA	HHHHxx
+7626	4838	0	2	6	6	26	626	1626	2626	7626	52	53	IHAAAA	CEHAAA	OOOOxx
+8728	4839	0	0	8	8	28	728	728	3728	8728	56	57	SXAAAA	DEHAAA	VVVVxx
+8277	4840	1	1	7	17	77	277	277	3277	8277	154	155	JGAAAA	EEHAAA	AAAAxx
+189	4841	1	1	9	9	89	189	189	189	189	178	179	HHAAAA	FEHAAA	HHHHxx
+3717	4842	1	1	7	17	17	717	1717	3717	3717	34	35	ZMAAAA	GEHAAA	OOOOxx
+1020	4843	0	0	0	0	20	20	1020	1020	1020	40	41	GNAAAA	HEHAAA	VVVVxx
+9234	4844	0	2	4	14	34	234	1234	4234	9234	68	69	ERAAAA	IEHAAA	AAAAxx
+9541	4845	1	1	1	1	41	541	1541	4541	9541	82	83	ZCAAAA	JEHAAA	HHHHxx
+380	4846	0	0	0	0	80	380	380	380	380	160	161	QOAAAA	KEHAAA	OOOOxx
+397	4847	1	1	7	17	97	397	397	397	397	194	195	HPAAAA	LEHAAA	VVVVxx
+835	4848	1	3	5	15	35	835	835	835	835	70	71	DGAAAA	MEHAAA	AAAAxx
+347	4849	1	3	7	7	47	347	347	347	347	94	95	JNAAAA	NEHAAA	HHHHxx
+2490	4850	0	2	0	10	90	490	490	2490	2490	180	181	URAAAA	OEHAAA	OOOOxx
+605	4851	1	1	5	5	5	605	605	605	605	10	11	HXAAAA	PEHAAA	VVVVxx
+7960	4852	0	0	0	0	60	960	1960	2960	7960	120	121	EUAAAA	QEHAAA	AAAAxx
+9681	4853	1	1	1	1	81	681	1681	4681	9681	162	163	JIAAAA	REHAAA	HHHHxx
+5753	4854	1	1	3	13	53	753	1753	753	5753	106	107	HNAAAA	SEHAAA	OOOOxx
+1676	4855	0	0	6	16	76	676	1676	1676	1676	152	153	MMAAAA	TEHAAA	VVVVxx
+5533	4856	1	1	3	13	33	533	1533	533	5533	66	67	VEAAAA	UEHAAA	AAAAxx
+8958	4857	0	2	8	18	58	958	958	3958	8958	116	117	OGAAAA	VEHAAA	HHHHxx
+664	4858	0	0	4	4	64	664	664	664	664	128	129	OZAAAA	WEHAAA	OOOOxx
+3005	4859	1	1	5	5	5	5	1005	3005	3005	10	11	PLAAAA	XEHAAA	VVVVxx
+8576	4860	0	0	6	16	76	576	576	3576	8576	152	153	WRAAAA	YEHAAA	AAAAxx
+7304	4861	0	0	4	4	4	304	1304	2304	7304	8	9	YUAAAA	ZEHAAA	HHHHxx
+3375	4862	1	3	5	15	75	375	1375	3375	3375	150	151	VZAAAA	AFHAAA	OOOOxx
+6336	4863	0	0	6	16	36	336	336	1336	6336	72	73	SJAAAA	BFHAAA	VVVVxx
+1392	4864	0	0	2	12	92	392	1392	1392	1392	184	185	OBAAAA	CFHAAA	AAAAxx
+2925	4865	1	1	5	5	25	925	925	2925	2925	50	51	NIAAAA	DFHAAA	HHHHxx
+1217	4866	1	1	7	17	17	217	1217	1217	1217	34	35	VUAAAA	EFHAAA	OOOOxx
+3714	4867	0	2	4	14	14	714	1714	3714	3714	28	29	WMAAAA	FFHAAA	VVVVxx
+2120	4868	0	0	0	0	20	120	120	2120	2120	40	41	ODAAAA	GFHAAA	AAAAxx
+2845	4869	1	1	5	5	45	845	845	2845	2845	90	91	LFAAAA	HFHAAA	HHHHxx
+3865	4870	1	1	5	5	65	865	1865	3865	3865	130	131	RSAAAA	IFHAAA	OOOOxx
+124	4871	0	0	4	4	24	124	124	124	124	48	49	UEAAAA	JFHAAA	VVVVxx
+865	4872	1	1	5	5	65	865	865	865	865	130	131	HHAAAA	KFHAAA	AAAAxx
+9361	4873	1	1	1	1	61	361	1361	4361	9361	122	123	BWAAAA	LFHAAA	HHHHxx
+6338	4874	0	2	8	18	38	338	338	1338	6338	76	77	UJAAAA	MFHAAA	OOOOxx
+7330	4875	0	2	0	10	30	330	1330	2330	7330	60	61	YVAAAA	NFHAAA	VVVVxx
+513	4876	1	1	3	13	13	513	513	513	513	26	27	TTAAAA	OFHAAA	AAAAxx
+5001	4877	1	1	1	1	1	1	1001	1	5001	2	3	JKAAAA	PFHAAA	HHHHxx
+549	4878	1	1	9	9	49	549	549	549	549	98	99	DVAAAA	QFHAAA	OOOOxx
+1808	4879	0	0	8	8	8	808	1808	1808	1808	16	17	ORAAAA	RFHAAA	VVVVxx
+7168	4880	0	0	8	8	68	168	1168	2168	7168	136	137	SPAAAA	SFHAAA	AAAAxx
+9878	4881	0	2	8	18	78	878	1878	4878	9878	156	157	YPAAAA	TFHAAA	HHHHxx
+233	4882	1	1	3	13	33	233	233	233	233	66	67	ZIAAAA	UFHAAA	OOOOxx
+4262	4883	0	2	2	2	62	262	262	4262	4262	124	125	YHAAAA	VFHAAA	VVVVxx
+7998	4884	0	2	8	18	98	998	1998	2998	7998	196	197	QVAAAA	WFHAAA	AAAAxx
+2419	4885	1	3	9	19	19	419	419	2419	2419	38	39	BPAAAA	XFHAAA	HHHHxx
+9960	4886	0	0	0	0	60	960	1960	4960	9960	120	121	CTAAAA	YFHAAA	OOOOxx
+3523	4887	1	3	3	3	23	523	1523	3523	3523	46	47	NFAAAA	ZFHAAA	VVVVxx
+5440	4888	0	0	0	0	40	440	1440	440	5440	80	81	GBAAAA	AGHAAA	AAAAxx
+3030	4889	0	2	0	10	30	30	1030	3030	3030	60	61	OMAAAA	BGHAAA	HHHHxx
+2745	4890	1	1	5	5	45	745	745	2745	2745	90	91	PBAAAA	CGHAAA	OOOOxx
+7175	4891	1	3	5	15	75	175	1175	2175	7175	150	151	ZPAAAA	DGHAAA	VVVVxx
+640	4892	0	0	0	0	40	640	640	640	640	80	81	QYAAAA	EGHAAA	AAAAxx
+1798	4893	0	2	8	18	98	798	1798	1798	1798	196	197	ERAAAA	FGHAAA	HHHHxx
+7499	4894	1	3	9	19	99	499	1499	2499	7499	198	199	LCAAAA	GGHAAA	OOOOxx
+1924	4895	0	0	4	4	24	924	1924	1924	1924	48	49	AWAAAA	HGHAAA	VVVVxx
+1327	4896	1	3	7	7	27	327	1327	1327	1327	54	55	BZAAAA	IGHAAA	AAAAxx
+73	4897	1	1	3	13	73	73	73	73	73	146	147	VCAAAA	JGHAAA	HHHHxx
+9558	4898	0	2	8	18	58	558	1558	4558	9558	116	117	QDAAAA	KGHAAA	OOOOxx
+818	4899	0	2	8	18	18	818	818	818	818	36	37	MFAAAA	LGHAAA	VVVVxx
+9916	4900	0	0	6	16	16	916	1916	4916	9916	32	33	KRAAAA	MGHAAA	AAAAxx
+2978	4901	0	2	8	18	78	978	978	2978	2978	156	157	OKAAAA	NGHAAA	HHHHxx
+8469	4902	1	1	9	9	69	469	469	3469	8469	138	139	TNAAAA	OGHAAA	OOOOxx
+9845	4903	1	1	5	5	45	845	1845	4845	9845	90	91	ROAAAA	PGHAAA	VVVVxx
+2326	4904	0	2	6	6	26	326	326	2326	2326	52	53	MLAAAA	QGHAAA	AAAAxx
+4032	4905	0	0	2	12	32	32	32	4032	4032	64	65	CZAAAA	RGHAAA	HHHHxx
+5604	4906	0	0	4	4	4	604	1604	604	5604	8	9	OHAAAA	SGHAAA	OOOOxx
+9610	4907	0	2	0	10	10	610	1610	4610	9610	20	21	QFAAAA	TGHAAA	VVVVxx
+5101	4908	1	1	1	1	1	101	1101	101	5101	2	3	FOAAAA	UGHAAA	AAAAxx
+7246	4909	0	2	6	6	46	246	1246	2246	7246	92	93	SSAAAA	VGHAAA	HHHHxx
+1292	4910	0	0	2	12	92	292	1292	1292	1292	184	185	SXAAAA	WGHAAA	OOOOxx
+6235	4911	1	3	5	15	35	235	235	1235	6235	70	71	VFAAAA	XGHAAA	VVVVxx
+1733	4912	1	1	3	13	33	733	1733	1733	1733	66	67	ROAAAA	YGHAAA	AAAAxx
+4647	4913	1	3	7	7	47	647	647	4647	4647	94	95	TWAAAA	ZGHAAA	HHHHxx
+258	4914	0	2	8	18	58	258	258	258	258	116	117	YJAAAA	AHHAAA	OOOOxx
+8438	4915	0	2	8	18	38	438	438	3438	8438	76	77	OMAAAA	BHHAAA	VVVVxx
+7869	4916	1	1	9	9	69	869	1869	2869	7869	138	139	RQAAAA	CHHAAA	AAAAxx
+9691	4917	1	3	1	11	91	691	1691	4691	9691	182	183	TIAAAA	DHHAAA	HHHHxx
+5422	4918	0	2	2	2	22	422	1422	422	5422	44	45	OAAAAA	EHHAAA	OOOOxx
+9630	4919	0	2	0	10	30	630	1630	4630	9630	60	61	KGAAAA	FHHAAA	VVVVxx
+4439	4920	1	3	9	19	39	439	439	4439	4439	78	79	TOAAAA	GHHAAA	AAAAxx
+3140	4921	0	0	0	0	40	140	1140	3140	3140	80	81	UQAAAA	HHHAAA	HHHHxx
+9111	4922	1	3	1	11	11	111	1111	4111	9111	22	23	LMAAAA	IHHAAA	OOOOxx
+4606	4923	0	2	6	6	6	606	606	4606	4606	12	13	EVAAAA	JHHAAA	VVVVxx
+8620	4924	0	0	0	0	20	620	620	3620	8620	40	41	OTAAAA	KHHAAA	AAAAxx
+7849	4925	1	1	9	9	49	849	1849	2849	7849	98	99	XPAAAA	LHHAAA	HHHHxx
+346	4926	0	2	6	6	46	346	346	346	346	92	93	INAAAA	MHHAAA	OOOOxx
+9528	4927	0	0	8	8	28	528	1528	4528	9528	56	57	MCAAAA	NHHAAA	VVVVxx
+1811	4928	1	3	1	11	11	811	1811	1811	1811	22	23	RRAAAA	OHHAAA	AAAAxx
+6068	4929	0	0	8	8	68	68	68	1068	6068	136	137	KZAAAA	PHHAAA	HHHHxx
+6260	4930	0	0	0	0	60	260	260	1260	6260	120	121	UGAAAA	QHHAAA	OOOOxx
+5909	4931	1	1	9	9	9	909	1909	909	5909	18	19	HTAAAA	RHHAAA	VVVVxx
+4518	4932	0	2	8	18	18	518	518	4518	4518	36	37	URAAAA	SHHAAA	AAAAxx
+7530	4933	0	2	0	10	30	530	1530	2530	7530	60	61	QDAAAA	THHAAA	HHHHxx
+3900	4934	0	0	0	0	0	900	1900	3900	3900	0	1	AUAAAA	UHHAAA	OOOOxx
+3969	4935	1	1	9	9	69	969	1969	3969	3969	138	139	RWAAAA	VHHAAA	VVVVxx
+8690	4936	0	2	0	10	90	690	690	3690	8690	180	181	GWAAAA	WHHAAA	AAAAxx
+5532	4937	0	0	2	12	32	532	1532	532	5532	64	65	UEAAAA	XHHAAA	HHHHxx
+5989	4938	1	1	9	9	89	989	1989	989	5989	178	179	JWAAAA	YHHAAA	OOOOxx
+1870	4939	0	2	0	10	70	870	1870	1870	1870	140	141	YTAAAA	ZHHAAA	VVVVxx
+1113	4940	1	1	3	13	13	113	1113	1113	1113	26	27	VQAAAA	AIHAAA	AAAAxx
+5155	4941	1	3	5	15	55	155	1155	155	5155	110	111	HQAAAA	BIHAAA	HHHHxx
+7460	4942	0	0	0	0	60	460	1460	2460	7460	120	121	YAAAAA	CIHAAA	OOOOxx
+6217	4943	1	1	7	17	17	217	217	1217	6217	34	35	DFAAAA	DIHAAA	VVVVxx
+8333	4944	1	1	3	13	33	333	333	3333	8333	66	67	NIAAAA	EIHAAA	AAAAxx
+6341	4945	1	1	1	1	41	341	341	1341	6341	82	83	XJAAAA	FIHAAA	HHHHxx
+6230	4946	0	2	0	10	30	230	230	1230	6230	60	61	QFAAAA	GIHAAA	OOOOxx
+6902	4947	0	2	2	2	2	902	902	1902	6902	4	5	MFAAAA	HIHAAA	VVVVxx
+670	4948	0	2	0	10	70	670	670	670	670	140	141	UZAAAA	IIHAAA	AAAAxx
+805	4949	1	1	5	5	5	805	805	805	805	10	11	ZEAAAA	JIHAAA	HHHHxx
+1340	4950	0	0	0	0	40	340	1340	1340	1340	80	81	OZAAAA	KIHAAA	OOOOxx
+8649	4951	1	1	9	9	49	649	649	3649	8649	98	99	RUAAAA	LIHAAA	VVVVxx
+3887	4952	1	3	7	7	87	887	1887	3887	3887	174	175	NTAAAA	MIHAAA	AAAAxx
+5400	4953	0	0	0	0	0	400	1400	400	5400	0	1	SZAAAA	NIHAAA	HHHHxx
+4354	4954	0	2	4	14	54	354	354	4354	4354	108	109	MLAAAA	OIHAAA	OOOOxx
+950	4955	0	2	0	10	50	950	950	950	950	100	101	OKAAAA	PIHAAA	VVVVxx
+1544	4956	0	0	4	4	44	544	1544	1544	1544	88	89	KHAAAA	QIHAAA	AAAAxx
+3898	4957	0	2	8	18	98	898	1898	3898	3898	196	197	YTAAAA	RIHAAA	HHHHxx
+8038	4958	0	2	8	18	38	38	38	3038	8038	76	77	EXAAAA	SIHAAA	OOOOxx
+1095	4959	1	3	5	15	95	95	1095	1095	1095	190	191	DQAAAA	TIHAAA	VVVVxx
+1748	4960	0	0	8	8	48	748	1748	1748	1748	96	97	GPAAAA	UIHAAA	AAAAxx
+9154	4961	0	2	4	14	54	154	1154	4154	9154	108	109	COAAAA	VIHAAA	HHHHxx
+2182	4962	0	2	2	2	82	182	182	2182	2182	164	165	YFAAAA	WIHAAA	OOOOxx
+6797	4963	1	1	7	17	97	797	797	1797	6797	194	195	LBAAAA	XIHAAA	VVVVxx
+9149	4964	1	1	9	9	49	149	1149	4149	9149	98	99	XNAAAA	YIHAAA	AAAAxx
+7351	4965	1	3	1	11	51	351	1351	2351	7351	102	103	TWAAAA	ZIHAAA	HHHHxx
+2820	4966	0	0	0	0	20	820	820	2820	2820	40	41	MEAAAA	AJHAAA	OOOOxx
+9696	4967	0	0	6	16	96	696	1696	4696	9696	192	193	YIAAAA	BJHAAA	VVVVxx
+253	4968	1	1	3	13	53	253	253	253	253	106	107	TJAAAA	CJHAAA	AAAAxx
+3600	4969	0	0	0	0	0	600	1600	3600	3600	0	1	MIAAAA	DJHAAA	HHHHxx
+3892	4970	0	0	2	12	92	892	1892	3892	3892	184	185	STAAAA	EJHAAA	OOOOxx
+231	4971	1	3	1	11	31	231	231	231	231	62	63	XIAAAA	FJHAAA	VVVVxx
+8331	4972	1	3	1	11	31	331	331	3331	8331	62	63	LIAAAA	GJHAAA	AAAAxx
+403	4973	1	3	3	3	3	403	403	403	403	6	7	NPAAAA	HJHAAA	HHHHxx
+8642	4974	0	2	2	2	42	642	642	3642	8642	84	85	KUAAAA	IJHAAA	OOOOxx
+3118	4975	0	2	8	18	18	118	1118	3118	3118	36	37	YPAAAA	JJHAAA	VVVVxx
+3835	4976	1	3	5	15	35	835	1835	3835	3835	70	71	NRAAAA	KJHAAA	AAAAxx
+1117	4977	1	1	7	17	17	117	1117	1117	1117	34	35	ZQAAAA	LJHAAA	HHHHxx
+7024	4978	0	0	4	4	24	24	1024	2024	7024	48	49	EKAAAA	MJHAAA	OOOOxx
+2636	4979	0	0	6	16	36	636	636	2636	2636	72	73	KXAAAA	NJHAAA	VVVVxx
+3778	4980	0	2	8	18	78	778	1778	3778	3778	156	157	IPAAAA	OJHAAA	AAAAxx
+2003	4981	1	3	3	3	3	3	3	2003	2003	6	7	BZAAAA	PJHAAA	HHHHxx
+5717	4982	1	1	7	17	17	717	1717	717	5717	34	35	XLAAAA	QJHAAA	OOOOxx
+4869	4983	1	1	9	9	69	869	869	4869	4869	138	139	HFAAAA	RJHAAA	VVVVxx
+8921	4984	1	1	1	1	21	921	921	3921	8921	42	43	DFAAAA	SJHAAA	AAAAxx
+888	4985	0	0	8	8	88	888	888	888	888	176	177	EIAAAA	TJHAAA	HHHHxx
+7599	4986	1	3	9	19	99	599	1599	2599	7599	198	199	HGAAAA	UJHAAA	OOOOxx
+8621	4987	1	1	1	1	21	621	621	3621	8621	42	43	PTAAAA	VJHAAA	VVVVxx
+811	4988	1	3	1	11	11	811	811	811	811	22	23	FFAAAA	WJHAAA	AAAAxx
+9147	4989	1	3	7	7	47	147	1147	4147	9147	94	95	VNAAAA	XJHAAA	HHHHxx
+1413	4990	1	1	3	13	13	413	1413	1413	1413	26	27	JCAAAA	YJHAAA	OOOOxx
+5232	4991	0	0	2	12	32	232	1232	232	5232	64	65	GTAAAA	ZJHAAA	VVVVxx
+5912	4992	0	0	2	12	12	912	1912	912	5912	24	25	KTAAAA	AKHAAA	AAAAxx
+3418	4993	0	2	8	18	18	418	1418	3418	3418	36	37	MBAAAA	BKHAAA	HHHHxx
+3912	4994	0	0	2	12	12	912	1912	3912	3912	24	25	MUAAAA	CKHAAA	OOOOxx
+9576	4995	0	0	6	16	76	576	1576	4576	9576	152	153	IEAAAA	DKHAAA	VVVVxx
+4225	4996	1	1	5	5	25	225	225	4225	4225	50	51	NGAAAA	EKHAAA	AAAAxx
+8222	4997	0	2	2	2	22	222	222	3222	8222	44	45	GEAAAA	FKHAAA	HHHHxx
+7013	4998	1	1	3	13	13	13	1013	2013	7013	26	27	TJAAAA	GKHAAA	OOOOxx
+7037	4999	1	1	7	17	37	37	1037	2037	7037	74	75	RKAAAA	HKHAAA	VVVVxx
+1205	5000	1	1	5	5	5	205	1205	1205	1205	10	11	JUAAAA	IKHAAA	AAAAxx
+8114	5001	0	2	4	14	14	114	114	3114	8114	28	29	CAAAAA	JKHAAA	HHHHxx
+6585	5002	1	1	5	5	85	585	585	1585	6585	170	171	HTAAAA	KKHAAA	OOOOxx
+155	5003	1	3	5	15	55	155	155	155	155	110	111	ZFAAAA	LKHAAA	VVVVxx
+2841	5004	1	1	1	1	41	841	841	2841	2841	82	83	HFAAAA	MKHAAA	AAAAxx
+1996	5005	0	0	6	16	96	996	1996	1996	1996	192	193	UYAAAA	NKHAAA	HHHHxx
+4948	5006	0	0	8	8	48	948	948	4948	4948	96	97	IIAAAA	OKHAAA	OOOOxx
+3304	5007	0	0	4	4	4	304	1304	3304	3304	8	9	CXAAAA	PKHAAA	VVVVxx
+5684	5008	0	0	4	4	84	684	1684	684	5684	168	169	QKAAAA	QKHAAA	AAAAxx
+6962	5009	0	2	2	2	62	962	962	1962	6962	124	125	UHAAAA	RKHAAA	HHHHxx
+8691	5010	1	3	1	11	91	691	691	3691	8691	182	183	HWAAAA	SKHAAA	OOOOxx
+8501	5011	1	1	1	1	1	501	501	3501	8501	2	3	ZOAAAA	TKHAAA	VVVVxx
+4783	5012	1	3	3	3	83	783	783	4783	4783	166	167	ZBAAAA	UKHAAA	AAAAxx
+3762	5013	0	2	2	2	62	762	1762	3762	3762	124	125	SOAAAA	VKHAAA	HHHHxx
+4534	5014	0	2	4	14	34	534	534	4534	4534	68	69	KSAAAA	WKHAAA	OOOOxx
+4999	5015	1	3	9	19	99	999	999	4999	4999	198	199	HKAAAA	XKHAAA	VVVVxx
+4618	5016	0	2	8	18	18	618	618	4618	4618	36	37	QVAAAA	YKHAAA	AAAAxx
+4220	5017	0	0	0	0	20	220	220	4220	4220	40	41	IGAAAA	ZKHAAA	HHHHxx
+3384	5018	0	0	4	4	84	384	1384	3384	3384	168	169	EAAAAA	ALHAAA	OOOOxx
+3036	5019	0	0	6	16	36	36	1036	3036	3036	72	73	UMAAAA	BLHAAA	VVVVxx
+545	5020	1	1	5	5	45	545	545	545	545	90	91	ZUAAAA	CLHAAA	AAAAxx
+9946	5021	0	2	6	6	46	946	1946	4946	9946	92	93	OSAAAA	DLHAAA	HHHHxx
+1985	5022	1	1	5	5	85	985	1985	1985	1985	170	171	JYAAAA	ELHAAA	OOOOxx
+2310	5023	0	2	0	10	10	310	310	2310	2310	20	21	WKAAAA	FLHAAA	VVVVxx
+6563	5024	1	3	3	3	63	563	563	1563	6563	126	127	LSAAAA	GLHAAA	AAAAxx
+4886	5025	0	2	6	6	86	886	886	4886	4886	172	173	YFAAAA	HLHAAA	HHHHxx
+9359	5026	1	3	9	19	59	359	1359	4359	9359	118	119	ZVAAAA	ILHAAA	OOOOxx
+400	5027	0	0	0	0	0	400	400	400	400	0	1	KPAAAA	JLHAAA	VVVVxx
+9742	5028	0	2	2	2	42	742	1742	4742	9742	84	85	SKAAAA	KLHAAA	AAAAxx
+6736	5029	0	0	6	16	36	736	736	1736	6736	72	73	CZAAAA	LLHAAA	HHHHxx
+8166	5030	0	2	6	6	66	166	166	3166	8166	132	133	CCAAAA	MLHAAA	OOOOxx
+861	5031	1	1	1	1	61	861	861	861	861	122	123	DHAAAA	NLHAAA	VVVVxx
+7492	5032	0	0	2	12	92	492	1492	2492	7492	184	185	ECAAAA	OLHAAA	AAAAxx
+1155	5033	1	3	5	15	55	155	1155	1155	1155	110	111	LSAAAA	PLHAAA	HHHHxx
+9769	5034	1	1	9	9	69	769	1769	4769	9769	138	139	TLAAAA	QLHAAA	OOOOxx
+6843	5035	1	3	3	3	43	843	843	1843	6843	86	87	FDAAAA	RLHAAA	VVVVxx
+5625	5036	1	1	5	5	25	625	1625	625	5625	50	51	JIAAAA	SLHAAA	AAAAxx
+1910	5037	0	2	0	10	10	910	1910	1910	1910	20	21	MVAAAA	TLHAAA	HHHHxx
+9796	5038	0	0	6	16	96	796	1796	4796	9796	192	193	UMAAAA	ULHAAA	OOOOxx
+6950	5039	0	2	0	10	50	950	950	1950	6950	100	101	IHAAAA	VLHAAA	VVVVxx
+3084	5040	0	0	4	4	84	84	1084	3084	3084	168	169	QOAAAA	WLHAAA	AAAAxx
+2959	5041	1	3	9	19	59	959	959	2959	2959	118	119	VJAAAA	XLHAAA	HHHHxx
+2093	5042	1	1	3	13	93	93	93	2093	2093	186	187	NCAAAA	YLHAAA	OOOOxx
+2738	5043	0	2	8	18	38	738	738	2738	2738	76	77	IBAAAA	ZLHAAA	VVVVxx
+6406	5044	0	2	6	6	6	406	406	1406	6406	12	13	KMAAAA	AMHAAA	AAAAxx
+9082	5045	0	2	2	2	82	82	1082	4082	9082	164	165	ILAAAA	BMHAAA	HHHHxx
+8568	5046	0	0	8	8	68	568	568	3568	8568	136	137	ORAAAA	CMHAAA	OOOOxx
+3566	5047	0	2	6	6	66	566	1566	3566	3566	132	133	EHAAAA	DMHAAA	VVVVxx
+3016	5048	0	0	6	16	16	16	1016	3016	3016	32	33	AMAAAA	EMHAAA	AAAAxx
+1207	5049	1	3	7	7	7	207	1207	1207	1207	14	15	LUAAAA	FMHAAA	HHHHxx
+4045	5050	1	1	5	5	45	45	45	4045	4045	90	91	PZAAAA	GMHAAA	OOOOxx
+4173	5051	1	1	3	13	73	173	173	4173	4173	146	147	NEAAAA	HMHAAA	VVVVxx
+3939	5052	1	3	9	19	39	939	1939	3939	3939	78	79	NVAAAA	IMHAAA	AAAAxx
+9683	5053	1	3	3	3	83	683	1683	4683	9683	166	167	LIAAAA	JMHAAA	HHHHxx
+1684	5054	0	0	4	4	84	684	1684	1684	1684	168	169	UMAAAA	KMHAAA	OOOOxx
+9271	5055	1	3	1	11	71	271	1271	4271	9271	142	143	PSAAAA	LMHAAA	VVVVxx
+9317	5056	1	1	7	17	17	317	1317	4317	9317	34	35	JUAAAA	MMHAAA	AAAAxx
+5793	5057	1	1	3	13	93	793	1793	793	5793	186	187	VOAAAA	NMHAAA	HHHHxx
+352	5058	0	0	2	12	52	352	352	352	352	104	105	ONAAAA	OMHAAA	OOOOxx
+7328	5059	0	0	8	8	28	328	1328	2328	7328	56	57	WVAAAA	PMHAAA	VVVVxx
+4582	5060	0	2	2	2	82	582	582	4582	4582	164	165	GUAAAA	QMHAAA	AAAAxx
+7413	5061	1	1	3	13	13	413	1413	2413	7413	26	27	DZAAAA	RMHAAA	HHHHxx
+6772	5062	0	0	2	12	72	772	772	1772	6772	144	145	MAAAAA	SMHAAA	OOOOxx
+4973	5063	1	1	3	13	73	973	973	4973	4973	146	147	HJAAAA	TMHAAA	VVVVxx
+7480	5064	0	0	0	0	80	480	1480	2480	7480	160	161	SBAAAA	UMHAAA	AAAAxx
+5555	5065	1	3	5	15	55	555	1555	555	5555	110	111	RFAAAA	VMHAAA	HHHHxx
+4227	5066	1	3	7	7	27	227	227	4227	4227	54	55	PGAAAA	WMHAAA	OOOOxx
+4153	5067	1	1	3	13	53	153	153	4153	4153	106	107	TDAAAA	XMHAAA	VVVVxx
+4601	5068	1	1	1	1	1	601	601	4601	4601	2	3	ZUAAAA	YMHAAA	AAAAxx
+3782	5069	0	2	2	2	82	782	1782	3782	3782	164	165	MPAAAA	ZMHAAA	HHHHxx
+3872	5070	0	0	2	12	72	872	1872	3872	3872	144	145	YSAAAA	ANHAAA	OOOOxx
+893	5071	1	1	3	13	93	893	893	893	893	186	187	JIAAAA	BNHAAA	VVVVxx
+2430	5072	0	2	0	10	30	430	430	2430	2430	60	61	MPAAAA	CNHAAA	AAAAxx
+2591	5073	1	3	1	11	91	591	591	2591	2591	182	183	RVAAAA	DNHAAA	HHHHxx
+264	5074	0	0	4	4	64	264	264	264	264	128	129	EKAAAA	ENHAAA	OOOOxx
+6238	5075	0	2	8	18	38	238	238	1238	6238	76	77	YFAAAA	FNHAAA	VVVVxx
+633	5076	1	1	3	13	33	633	633	633	633	66	67	JYAAAA	GNHAAA	AAAAxx
+1029	5077	1	1	9	9	29	29	1029	1029	1029	58	59	PNAAAA	HNHAAA	HHHHxx
+5934	5078	0	2	4	14	34	934	1934	934	5934	68	69	GUAAAA	INHAAA	OOOOxx
+8694	5079	0	2	4	14	94	694	694	3694	8694	188	189	KWAAAA	JNHAAA	VVVVxx
+7401	5080	1	1	1	1	1	401	1401	2401	7401	2	3	RYAAAA	KNHAAA	AAAAxx
+1165	5081	1	1	5	5	65	165	1165	1165	1165	130	131	VSAAAA	LNHAAA	HHHHxx
+9438	5082	0	2	8	18	38	438	1438	4438	9438	76	77	AZAAAA	MNHAAA	OOOOxx
+4790	5083	0	2	0	10	90	790	790	4790	4790	180	181	GCAAAA	NNHAAA	VVVVxx
+4531	5084	1	3	1	11	31	531	531	4531	4531	62	63	HSAAAA	ONHAAA	AAAAxx
+6099	5085	1	3	9	19	99	99	99	1099	6099	198	199	PAAAAA	PNHAAA	HHHHxx
+8236	5086	0	0	6	16	36	236	236	3236	8236	72	73	UEAAAA	QNHAAA	OOOOxx
+8551	5087	1	3	1	11	51	551	551	3551	8551	102	103	XQAAAA	RNHAAA	VVVVxx
+3128	5088	0	0	8	8	28	128	1128	3128	3128	56	57	IQAAAA	SNHAAA	AAAAxx
+3504	5089	0	0	4	4	4	504	1504	3504	3504	8	9	UEAAAA	TNHAAA	HHHHxx
+9071	5090	1	3	1	11	71	71	1071	4071	9071	142	143	XKAAAA	UNHAAA	OOOOxx
+5930	5091	0	2	0	10	30	930	1930	930	5930	60	61	CUAAAA	VNHAAA	VVVVxx
+6825	5092	1	1	5	5	25	825	825	1825	6825	50	51	NCAAAA	WNHAAA	AAAAxx
+2218	5093	0	2	8	18	18	218	218	2218	2218	36	37	IHAAAA	XNHAAA	HHHHxx
+3604	5094	0	0	4	4	4	604	1604	3604	3604	8	9	QIAAAA	YNHAAA	OOOOxx
+5761	5095	1	1	1	1	61	761	1761	761	5761	122	123	PNAAAA	ZNHAAA	VVVVxx
+5414	5096	0	2	4	14	14	414	1414	414	5414	28	29	GAAAAA	AOHAAA	AAAAxx
+5892	5097	0	0	2	12	92	892	1892	892	5892	184	185	QSAAAA	BOHAAA	HHHHxx
+4080	5098	0	0	0	0	80	80	80	4080	4080	160	161	YAAAAA	COHAAA	OOOOxx
+8018	5099	0	2	8	18	18	18	18	3018	8018	36	37	KWAAAA	DOHAAA	VVVVxx
+1757	5100	1	1	7	17	57	757	1757	1757	1757	114	115	PPAAAA	EOHAAA	AAAAxx
+5854	5101	0	2	4	14	54	854	1854	854	5854	108	109	ERAAAA	FOHAAA	HHHHxx
+1335	5102	1	3	5	15	35	335	1335	1335	1335	70	71	JZAAAA	GOHAAA	OOOOxx
+3811	5103	1	3	1	11	11	811	1811	3811	3811	22	23	PQAAAA	HOHAAA	VVVVxx
+9917	5104	1	1	7	17	17	917	1917	4917	9917	34	35	LRAAAA	IOHAAA	AAAAxx
+5947	5105	1	3	7	7	47	947	1947	947	5947	94	95	TUAAAA	JOHAAA	HHHHxx
+7263	5106	1	3	3	3	63	263	1263	2263	7263	126	127	JTAAAA	KOHAAA	OOOOxx
+1730	5107	0	2	0	10	30	730	1730	1730	1730	60	61	OOAAAA	LOHAAA	VVVVxx
+5747	5108	1	3	7	7	47	747	1747	747	5747	94	95	BNAAAA	MOHAAA	AAAAxx
+3876	5109	0	0	6	16	76	876	1876	3876	3876	152	153	CTAAAA	NOHAAA	HHHHxx
+2762	5110	0	2	2	2	62	762	762	2762	2762	124	125	GCAAAA	OOHAAA	OOOOxx
+7613	5111	1	1	3	13	13	613	1613	2613	7613	26	27	VGAAAA	POHAAA	VVVVxx
+152	5112	0	0	2	12	52	152	152	152	152	104	105	WFAAAA	QOHAAA	AAAAxx
+3941	5113	1	1	1	1	41	941	1941	3941	3941	82	83	PVAAAA	ROHAAA	HHHHxx
+5614	5114	0	2	4	14	14	614	1614	614	5614	28	29	YHAAAA	SOHAAA	OOOOxx
+9279	5115	1	3	9	19	79	279	1279	4279	9279	158	159	XSAAAA	TOHAAA	VVVVxx
+3048	5116	0	0	8	8	48	48	1048	3048	3048	96	97	GNAAAA	UOHAAA	AAAAxx
+6152	5117	0	0	2	12	52	152	152	1152	6152	104	105	QCAAAA	VOHAAA	HHHHxx
+5481	5118	1	1	1	1	81	481	1481	481	5481	162	163	VCAAAA	WOHAAA	OOOOxx
+4675	5119	1	3	5	15	75	675	675	4675	4675	150	151	VXAAAA	XOHAAA	VVVVxx
+3334	5120	0	2	4	14	34	334	1334	3334	3334	68	69	GYAAAA	YOHAAA	AAAAxx
+4691	5121	1	3	1	11	91	691	691	4691	4691	182	183	LYAAAA	ZOHAAA	HHHHxx
+803	5122	1	3	3	3	3	803	803	803	803	6	7	XEAAAA	APHAAA	OOOOxx
+5409	5123	1	1	9	9	9	409	1409	409	5409	18	19	BAAAAA	BPHAAA	VVVVxx
+1054	5124	0	2	4	14	54	54	1054	1054	1054	108	109	OOAAAA	CPHAAA	AAAAxx
+103	5125	1	3	3	3	3	103	103	103	103	6	7	ZDAAAA	DPHAAA	HHHHxx
+8565	5126	1	1	5	5	65	565	565	3565	8565	130	131	LRAAAA	EPHAAA	OOOOxx
+4666	5127	0	2	6	6	66	666	666	4666	4666	132	133	MXAAAA	FPHAAA	VVVVxx
+6634	5128	0	2	4	14	34	634	634	1634	6634	68	69	EVAAAA	GPHAAA	AAAAxx
+5538	5129	0	2	8	18	38	538	1538	538	5538	76	77	AFAAAA	HPHAAA	HHHHxx
+3789	5130	1	1	9	9	89	789	1789	3789	3789	178	179	TPAAAA	IPHAAA	OOOOxx
+4641	5131	1	1	1	1	41	641	641	4641	4641	82	83	NWAAAA	JPHAAA	VVVVxx
+2458	5132	0	2	8	18	58	458	458	2458	2458	116	117	OQAAAA	KPHAAA	AAAAxx
+5667	5133	1	3	7	7	67	667	1667	667	5667	134	135	ZJAAAA	LPHAAA	HHHHxx
+6524	5134	0	0	4	4	24	524	524	1524	6524	48	49	YQAAAA	MPHAAA	OOOOxx
+9179	5135	1	3	9	19	79	179	1179	4179	9179	158	159	BPAAAA	NPHAAA	VVVVxx
+6358	5136	0	2	8	18	58	358	358	1358	6358	116	117	OKAAAA	OPHAAA	AAAAxx
+6668	5137	0	0	8	8	68	668	668	1668	6668	136	137	MWAAAA	PPHAAA	HHHHxx
+6414	5138	0	2	4	14	14	414	414	1414	6414	28	29	SMAAAA	QPHAAA	OOOOxx
+2813	5139	1	1	3	13	13	813	813	2813	2813	26	27	FEAAAA	RPHAAA	VVVVxx
+8927	5140	1	3	7	7	27	927	927	3927	8927	54	55	JFAAAA	SPHAAA	AAAAxx
+8695	5141	1	3	5	15	95	695	695	3695	8695	190	191	LWAAAA	TPHAAA	HHHHxx
+363	5142	1	3	3	3	63	363	363	363	363	126	127	ZNAAAA	UPHAAA	OOOOxx
+9966	5143	0	2	6	6	66	966	1966	4966	9966	132	133	ITAAAA	VPHAAA	VVVVxx
+1323	5144	1	3	3	3	23	323	1323	1323	1323	46	47	XYAAAA	WPHAAA	AAAAxx
+8211	5145	1	3	1	11	11	211	211	3211	8211	22	23	VDAAAA	XPHAAA	HHHHxx
+4375	5146	1	3	5	15	75	375	375	4375	4375	150	151	HMAAAA	YPHAAA	OOOOxx
+3257	5147	1	1	7	17	57	257	1257	3257	3257	114	115	HVAAAA	ZPHAAA	VVVVxx
+6239	5148	1	3	9	19	39	239	239	1239	6239	78	79	ZFAAAA	AQHAAA	AAAAxx
+3602	5149	0	2	2	2	2	602	1602	3602	3602	4	5	OIAAAA	BQHAAA	HHHHxx
+9830	5150	0	2	0	10	30	830	1830	4830	9830	60	61	COAAAA	CQHAAA	OOOOxx
+7826	5151	0	2	6	6	26	826	1826	2826	7826	52	53	APAAAA	DQHAAA	VVVVxx
+2108	5152	0	0	8	8	8	108	108	2108	2108	16	17	CDAAAA	EQHAAA	AAAAxx
+7245	5153	1	1	5	5	45	245	1245	2245	7245	90	91	RSAAAA	FQHAAA	HHHHxx
+8330	5154	0	2	0	10	30	330	330	3330	8330	60	61	KIAAAA	GQHAAA	OOOOxx
+7441	5155	1	1	1	1	41	441	1441	2441	7441	82	83	FAAAAA	HQHAAA	VVVVxx
+9848	5156	0	0	8	8	48	848	1848	4848	9848	96	97	UOAAAA	IQHAAA	AAAAxx
+1226	5157	0	2	6	6	26	226	1226	1226	1226	52	53	EVAAAA	JQHAAA	HHHHxx
+414	5158	0	2	4	14	14	414	414	414	414	28	29	YPAAAA	KQHAAA	OOOOxx
+1273	5159	1	1	3	13	73	273	1273	1273	1273	146	147	ZWAAAA	LQHAAA	VVVVxx
+9866	5160	0	2	6	6	66	866	1866	4866	9866	132	133	MPAAAA	MQHAAA	AAAAxx
+4633	5161	1	1	3	13	33	633	633	4633	4633	66	67	FWAAAA	NQHAAA	HHHHxx
+8727	5162	1	3	7	7	27	727	727	3727	8727	54	55	RXAAAA	OQHAAA	OOOOxx
+5308	5163	0	0	8	8	8	308	1308	308	5308	16	17	EWAAAA	PQHAAA	VVVVxx
+1395	5164	1	3	5	15	95	395	1395	1395	1395	190	191	RBAAAA	QQHAAA	AAAAxx
+1825	5165	1	1	5	5	25	825	1825	1825	1825	50	51	FSAAAA	RQHAAA	HHHHxx
+7606	5166	0	2	6	6	6	606	1606	2606	7606	12	13	OGAAAA	SQHAAA	OOOOxx
+9390	5167	0	2	0	10	90	390	1390	4390	9390	180	181	EXAAAA	TQHAAA	VVVVxx
+2376	5168	0	0	6	16	76	376	376	2376	2376	152	153	KNAAAA	UQHAAA	AAAAxx
+2377	5169	1	1	7	17	77	377	377	2377	2377	154	155	LNAAAA	VQHAAA	HHHHxx
+5346	5170	0	2	6	6	46	346	1346	346	5346	92	93	QXAAAA	WQHAAA	OOOOxx
+4140	5171	0	0	0	0	40	140	140	4140	4140	80	81	GDAAAA	XQHAAA	VVVVxx
+6032	5172	0	0	2	12	32	32	32	1032	6032	64	65	AYAAAA	YQHAAA	AAAAxx
+9453	5173	1	1	3	13	53	453	1453	4453	9453	106	107	PZAAAA	ZQHAAA	HHHHxx
+9297	5174	1	1	7	17	97	297	1297	4297	9297	194	195	PTAAAA	ARHAAA	OOOOxx
+6455	5175	1	3	5	15	55	455	455	1455	6455	110	111	HOAAAA	BRHAAA	VVVVxx
+4458	5176	0	2	8	18	58	458	458	4458	4458	116	117	MPAAAA	CRHAAA	AAAAxx
+9516	5177	0	0	6	16	16	516	1516	4516	9516	32	33	ACAAAA	DRHAAA	HHHHxx
+6211	5178	1	3	1	11	11	211	211	1211	6211	22	23	XEAAAA	ERHAAA	OOOOxx
+526	5179	0	2	6	6	26	526	526	526	526	52	53	GUAAAA	FRHAAA	VVVVxx
+3570	5180	0	2	0	10	70	570	1570	3570	3570	140	141	IHAAAA	GRHAAA	AAAAxx
+4885	5181	1	1	5	5	85	885	885	4885	4885	170	171	XFAAAA	HRHAAA	HHHHxx
+6390	5182	0	2	0	10	90	390	390	1390	6390	180	181	ULAAAA	IRHAAA	OOOOxx
+1606	5183	0	2	6	6	6	606	1606	1606	1606	12	13	UJAAAA	JRHAAA	VVVVxx
+7850	5184	0	2	0	10	50	850	1850	2850	7850	100	101	YPAAAA	KRHAAA	AAAAxx
+3315	5185	1	3	5	15	15	315	1315	3315	3315	30	31	NXAAAA	LRHAAA	HHHHxx
+8322	5186	0	2	2	2	22	322	322	3322	8322	44	45	CIAAAA	MRHAAA	OOOOxx
+3703	5187	1	3	3	3	3	703	1703	3703	3703	6	7	LMAAAA	NRHAAA	VVVVxx
+9489	5188	1	1	9	9	89	489	1489	4489	9489	178	179	ZAAAAA	ORHAAA	AAAAxx
+6104	5189	0	0	4	4	4	104	104	1104	6104	8	9	UAAAAA	PRHAAA	HHHHxx
+3067	5190	1	3	7	7	67	67	1067	3067	3067	134	135	ZNAAAA	QRHAAA	OOOOxx
+2521	5191	1	1	1	1	21	521	521	2521	2521	42	43	ZSAAAA	RRHAAA	VVVVxx
+2581	5192	1	1	1	1	81	581	581	2581	2581	162	163	HVAAAA	SRHAAA	AAAAxx
+595	5193	1	3	5	15	95	595	595	595	595	190	191	XWAAAA	TRHAAA	HHHHxx
+8291	5194	1	3	1	11	91	291	291	3291	8291	182	183	XGAAAA	URHAAA	OOOOxx
+1727	5195	1	3	7	7	27	727	1727	1727	1727	54	55	LOAAAA	VRHAAA	VVVVxx
+6847	5196	1	3	7	7	47	847	847	1847	6847	94	95	JDAAAA	WRHAAA	AAAAxx
+7494	5197	0	2	4	14	94	494	1494	2494	7494	188	189	GCAAAA	XRHAAA	HHHHxx
+7093	5198	1	1	3	13	93	93	1093	2093	7093	186	187	VMAAAA	YRHAAA	OOOOxx
+7357	5199	1	1	7	17	57	357	1357	2357	7357	114	115	ZWAAAA	ZRHAAA	VVVVxx
+620	5200	0	0	0	0	20	620	620	620	620	40	41	WXAAAA	ASHAAA	AAAAxx
+2460	5201	0	0	0	0	60	460	460	2460	2460	120	121	QQAAAA	BSHAAA	HHHHxx
+1598	5202	0	2	8	18	98	598	1598	1598	1598	196	197	MJAAAA	CSHAAA	OOOOxx
+4112	5203	0	0	2	12	12	112	112	4112	4112	24	25	ECAAAA	DSHAAA	VVVVxx
+2956	5204	0	0	6	16	56	956	956	2956	2956	112	113	SJAAAA	ESHAAA	AAAAxx
+3193	5205	1	1	3	13	93	193	1193	3193	3193	186	187	VSAAAA	FSHAAA	HHHHxx
+6356	5206	0	0	6	16	56	356	356	1356	6356	112	113	MKAAAA	GSHAAA	OOOOxx
+730	5207	0	2	0	10	30	730	730	730	730	60	61	CCAAAA	HSHAAA	VVVVxx
+8826	5208	0	2	6	6	26	826	826	3826	8826	52	53	MBAAAA	ISHAAA	AAAAxx
+9036	5209	0	0	6	16	36	36	1036	4036	9036	72	73	OJAAAA	JSHAAA	HHHHxx
+2085	5210	1	1	5	5	85	85	85	2085	2085	170	171	FCAAAA	KSHAAA	OOOOxx
+9007	5211	1	3	7	7	7	7	1007	4007	9007	14	15	LIAAAA	LSHAAA	VVVVxx
+6047	5212	1	3	7	7	47	47	47	1047	6047	94	95	PYAAAA	MSHAAA	AAAAxx
+3953	5213	1	1	3	13	53	953	1953	3953	3953	106	107	BWAAAA	NSHAAA	HHHHxx
+1214	5214	0	2	4	14	14	214	1214	1214	1214	28	29	SUAAAA	OSHAAA	OOOOxx
+4814	5215	0	2	4	14	14	814	814	4814	4814	28	29	EDAAAA	PSHAAA	VVVVxx
+5738	5216	0	2	8	18	38	738	1738	738	5738	76	77	SMAAAA	QSHAAA	AAAAxx
+7176	5217	0	0	6	16	76	176	1176	2176	7176	152	153	AQAAAA	RSHAAA	HHHHxx
+3609	5218	1	1	9	9	9	609	1609	3609	3609	18	19	VIAAAA	SSHAAA	OOOOxx
+592	5219	0	0	2	12	92	592	592	592	592	184	185	UWAAAA	TSHAAA	VVVVxx
+9391	5220	1	3	1	11	91	391	1391	4391	9391	182	183	FXAAAA	USHAAA	AAAAxx
+5345	5221	1	1	5	5	45	345	1345	345	5345	90	91	PXAAAA	VSHAAA	HHHHxx
+1171	5222	1	3	1	11	71	171	1171	1171	1171	142	143	BTAAAA	WSHAAA	OOOOxx
+7238	5223	0	2	8	18	38	238	1238	2238	7238	76	77	KSAAAA	XSHAAA	VVVVxx
+7561	5224	1	1	1	1	61	561	1561	2561	7561	122	123	VEAAAA	YSHAAA	AAAAxx
+5876	5225	0	0	6	16	76	876	1876	876	5876	152	153	ASAAAA	ZSHAAA	HHHHxx
+6611	5226	1	3	1	11	11	611	611	1611	6611	22	23	HUAAAA	ATHAAA	OOOOxx
+7300	5227	0	0	0	0	0	300	1300	2300	7300	0	1	UUAAAA	BTHAAA	VVVVxx
+1506	5228	0	2	6	6	6	506	1506	1506	1506	12	13	YFAAAA	CTHAAA	AAAAxx
+1153	5229	1	1	3	13	53	153	1153	1153	1153	106	107	JSAAAA	DTHAAA	HHHHxx
+3831	5230	1	3	1	11	31	831	1831	3831	3831	62	63	JRAAAA	ETHAAA	OOOOxx
+9255	5231	1	3	5	15	55	255	1255	4255	9255	110	111	ZRAAAA	FTHAAA	VVVVxx
+1841	5232	1	1	1	1	41	841	1841	1841	1841	82	83	VSAAAA	GTHAAA	AAAAxx
+5075	5233	1	3	5	15	75	75	1075	75	5075	150	151	FNAAAA	HTHAAA	HHHHxx
+101	5234	1	1	1	1	1	101	101	101	101	2	3	XDAAAA	ITHAAA	OOOOxx
+2627	5235	1	3	7	7	27	627	627	2627	2627	54	55	BXAAAA	JTHAAA	VVVVxx
+7078	5236	0	2	8	18	78	78	1078	2078	7078	156	157	GMAAAA	KTHAAA	AAAAxx
+2850	5237	0	2	0	10	50	850	850	2850	2850	100	101	QFAAAA	LTHAAA	HHHHxx
+8703	5238	1	3	3	3	3	703	703	3703	8703	6	7	TWAAAA	MTHAAA	OOOOxx
+4101	5239	1	1	1	1	1	101	101	4101	4101	2	3	TBAAAA	NTHAAA	VVVVxx
+318	5240	0	2	8	18	18	318	318	318	318	36	37	GMAAAA	OTHAAA	AAAAxx
+6452	5241	0	0	2	12	52	452	452	1452	6452	104	105	EOAAAA	PTHAAA	HHHHxx
+5558	5242	0	2	8	18	58	558	1558	558	5558	116	117	UFAAAA	QTHAAA	OOOOxx
+3127	5243	1	3	7	7	27	127	1127	3127	3127	54	55	HQAAAA	RTHAAA	VVVVxx
+535	5244	1	3	5	15	35	535	535	535	535	70	71	PUAAAA	STHAAA	AAAAxx
+270	5245	0	2	0	10	70	270	270	270	270	140	141	KKAAAA	TTHAAA	HHHHxx
+4038	5246	0	2	8	18	38	38	38	4038	4038	76	77	IZAAAA	UTHAAA	OOOOxx
+3404	5247	0	0	4	4	4	404	1404	3404	3404	8	9	YAAAAA	VTHAAA	VVVVxx
+2374	5248	0	2	4	14	74	374	374	2374	2374	148	149	INAAAA	WTHAAA	AAAAxx
+6446	5249	0	2	6	6	46	446	446	1446	6446	92	93	YNAAAA	XTHAAA	HHHHxx
+7758	5250	0	2	8	18	58	758	1758	2758	7758	116	117	KMAAAA	YTHAAA	OOOOxx
+356	5251	0	0	6	16	56	356	356	356	356	112	113	SNAAAA	ZTHAAA	VVVVxx
+9197	5252	1	1	7	17	97	197	1197	4197	9197	194	195	TPAAAA	AUHAAA	AAAAxx
+9765	5253	1	1	5	5	65	765	1765	4765	9765	130	131	PLAAAA	BUHAAA	HHHHxx
+4974	5254	0	2	4	14	74	974	974	4974	4974	148	149	IJAAAA	CUHAAA	OOOOxx
+442	5255	0	2	2	2	42	442	442	442	442	84	85	ARAAAA	DUHAAA	VVVVxx
+4349	5256	1	1	9	9	49	349	349	4349	4349	98	99	HLAAAA	EUHAAA	AAAAxx
+6119	5257	1	3	9	19	19	119	119	1119	6119	38	39	JBAAAA	FUHAAA	HHHHxx
+7574	5258	0	2	4	14	74	574	1574	2574	7574	148	149	IFAAAA	GUHAAA	OOOOxx
+4445	5259	1	1	5	5	45	445	445	4445	4445	90	91	ZOAAAA	HUHAAA	VVVVxx
+940	5260	0	0	0	0	40	940	940	940	940	80	81	EKAAAA	IUHAAA	AAAAxx
+1875	5261	1	3	5	15	75	875	1875	1875	1875	150	151	DUAAAA	JUHAAA	HHHHxx
+5951	5262	1	3	1	11	51	951	1951	951	5951	102	103	XUAAAA	KUHAAA	OOOOxx
+9132	5263	0	0	2	12	32	132	1132	4132	9132	64	65	GNAAAA	LUHAAA	VVVVxx
+6913	5264	1	1	3	13	13	913	913	1913	6913	26	27	XFAAAA	MUHAAA	AAAAxx
+3308	5265	0	0	8	8	8	308	1308	3308	3308	16	17	GXAAAA	NUHAAA	HHHHxx
+7553	5266	1	1	3	13	53	553	1553	2553	7553	106	107	NEAAAA	OUHAAA	OOOOxx
+2138	5267	0	2	8	18	38	138	138	2138	2138	76	77	GEAAAA	PUHAAA	VVVVxx
+6252	5268	0	0	2	12	52	252	252	1252	6252	104	105	MGAAAA	QUHAAA	AAAAxx
+2171	5269	1	3	1	11	71	171	171	2171	2171	142	143	NFAAAA	RUHAAA	HHHHxx
+4159	5270	1	3	9	19	59	159	159	4159	4159	118	119	ZDAAAA	SUHAAA	OOOOxx
+2401	5271	1	1	1	1	1	401	401	2401	2401	2	3	JOAAAA	TUHAAA	VVVVxx
+6553	5272	1	1	3	13	53	553	553	1553	6553	106	107	BSAAAA	UUHAAA	AAAAxx
+5217	5273	1	1	7	17	17	217	1217	217	5217	34	35	RSAAAA	VUHAAA	HHHHxx
+1405	5274	1	1	5	5	5	405	1405	1405	1405	10	11	BCAAAA	WUHAAA	OOOOxx
+1494	5275	0	2	4	14	94	494	1494	1494	1494	188	189	MFAAAA	XUHAAA	VVVVxx
+5553	5276	1	1	3	13	53	553	1553	553	5553	106	107	PFAAAA	YUHAAA	AAAAxx
+8296	5277	0	0	6	16	96	296	296	3296	8296	192	193	CHAAAA	ZUHAAA	HHHHxx
+6565	5278	1	1	5	5	65	565	565	1565	6565	130	131	NSAAAA	AVHAAA	OOOOxx
+817	5279	1	1	7	17	17	817	817	817	817	34	35	LFAAAA	BVHAAA	VVVVxx
+6947	5280	1	3	7	7	47	947	947	1947	6947	94	95	FHAAAA	CVHAAA	AAAAxx
+4184	5281	0	0	4	4	84	184	184	4184	4184	168	169	YEAAAA	DVHAAA	HHHHxx
+6577	5282	1	1	7	17	77	577	577	1577	6577	154	155	ZSAAAA	EVHAAA	OOOOxx
+6424	5283	0	0	4	4	24	424	424	1424	6424	48	49	CNAAAA	FVHAAA	VVVVxx
+2482	5284	0	2	2	2	82	482	482	2482	2482	164	165	MRAAAA	GVHAAA	AAAAxx
+6874	5285	0	2	4	14	74	874	874	1874	6874	148	149	KEAAAA	HVHAAA	HHHHxx
+7601	5286	1	1	1	1	1	601	1601	2601	7601	2	3	JGAAAA	IVHAAA	OOOOxx
+4552	5287	0	0	2	12	52	552	552	4552	4552	104	105	CTAAAA	JVHAAA	VVVVxx
+8406	5288	0	2	6	6	6	406	406	3406	8406	12	13	ILAAAA	KVHAAA	AAAAxx
+2924	5289	0	0	4	4	24	924	924	2924	2924	48	49	MIAAAA	LVHAAA	HHHHxx
+8255	5290	1	3	5	15	55	255	255	3255	8255	110	111	NFAAAA	MVHAAA	OOOOxx
+4920	5291	0	0	0	0	20	920	920	4920	4920	40	41	GHAAAA	NVHAAA	VVVVxx
+228	5292	0	0	8	8	28	228	228	228	228	56	57	UIAAAA	OVHAAA	AAAAxx
+9431	5293	1	3	1	11	31	431	1431	4431	9431	62	63	TYAAAA	PVHAAA	HHHHxx
+4021	5294	1	1	1	1	21	21	21	4021	4021	42	43	RYAAAA	QVHAAA	OOOOxx
+2966	5295	0	2	6	6	66	966	966	2966	2966	132	133	CKAAAA	RVHAAA	VVVVxx
+2862	5296	0	2	2	2	62	862	862	2862	2862	124	125	CGAAAA	SVHAAA	AAAAxx
+4303	5297	1	3	3	3	3	303	303	4303	4303	6	7	NJAAAA	TVHAAA	HHHHxx
+9643	5298	1	3	3	3	43	643	1643	4643	9643	86	87	XGAAAA	UVHAAA	OOOOxx
+3008	5299	0	0	8	8	8	8	1008	3008	3008	16	17	SLAAAA	VVHAAA	VVVVxx
+7476	5300	0	0	6	16	76	476	1476	2476	7476	152	153	OBAAAA	WVHAAA	AAAAxx
+3686	5301	0	2	6	6	86	686	1686	3686	3686	172	173	ULAAAA	XVHAAA	HHHHxx
+9051	5302	1	3	1	11	51	51	1051	4051	9051	102	103	DKAAAA	YVHAAA	OOOOxx
+6592	5303	0	0	2	12	92	592	592	1592	6592	184	185	OTAAAA	ZVHAAA	VVVVxx
+924	5304	0	0	4	4	24	924	924	924	924	48	49	OJAAAA	AWHAAA	AAAAxx
+4406	5305	0	2	6	6	6	406	406	4406	4406	12	13	MNAAAA	BWHAAA	HHHHxx
+5233	5306	1	1	3	13	33	233	1233	233	5233	66	67	HTAAAA	CWHAAA	OOOOxx
+8881	5307	1	1	1	1	81	881	881	3881	8881	162	163	PDAAAA	DWHAAA	VVVVxx
+2212	5308	0	0	2	12	12	212	212	2212	2212	24	25	CHAAAA	EWHAAA	AAAAxx
+5804	5309	0	0	4	4	4	804	1804	804	5804	8	9	GPAAAA	FWHAAA	HHHHxx
+2990	5310	0	2	0	10	90	990	990	2990	2990	180	181	ALAAAA	GWHAAA	OOOOxx
+4069	5311	1	1	9	9	69	69	69	4069	4069	138	139	NAAAAA	HWHAAA	VVVVxx
+5380	5312	0	0	0	0	80	380	1380	380	5380	160	161	YYAAAA	IWHAAA	AAAAxx
+5016	5313	0	0	6	16	16	16	1016	16	5016	32	33	YKAAAA	JWHAAA	HHHHxx
+5056	5314	0	0	6	16	56	56	1056	56	5056	112	113	MMAAAA	KWHAAA	OOOOxx
+3732	5315	0	0	2	12	32	732	1732	3732	3732	64	65	ONAAAA	LWHAAA	VVVVxx
+5527	5316	1	3	7	7	27	527	1527	527	5527	54	55	PEAAAA	MWHAAA	AAAAxx
+1151	5317	1	3	1	11	51	151	1151	1151	1151	102	103	HSAAAA	NWHAAA	HHHHxx
+7900	5318	0	0	0	0	0	900	1900	2900	7900	0	1	WRAAAA	OWHAAA	OOOOxx
+1660	5319	0	0	0	0	60	660	1660	1660	1660	120	121	WLAAAA	PWHAAA	VVVVxx
+8064	5320	0	0	4	4	64	64	64	3064	8064	128	129	EYAAAA	QWHAAA	AAAAxx
+8240	5321	0	0	0	0	40	240	240	3240	8240	80	81	YEAAAA	RWHAAA	HHHHxx
+413	5322	1	1	3	13	13	413	413	413	413	26	27	XPAAAA	SWHAAA	OOOOxx
+8311	5323	1	3	1	11	11	311	311	3311	8311	22	23	RHAAAA	TWHAAA	VVVVxx
+1065	5324	1	1	5	5	65	65	1065	1065	1065	130	131	ZOAAAA	UWHAAA	AAAAxx
+2741	5325	1	1	1	1	41	741	741	2741	2741	82	83	LBAAAA	VWHAAA	HHHHxx
+5306	5326	0	2	6	6	6	306	1306	306	5306	12	13	CWAAAA	WWHAAA	OOOOxx
+5464	5327	0	0	4	4	64	464	1464	464	5464	128	129	ECAAAA	XWHAAA	VVVVxx
+4237	5328	1	1	7	17	37	237	237	4237	4237	74	75	ZGAAAA	YWHAAA	AAAAxx
+3822	5329	0	2	2	2	22	822	1822	3822	3822	44	45	ARAAAA	ZWHAAA	HHHHxx
+2548	5330	0	0	8	8	48	548	548	2548	2548	96	97	AUAAAA	AXHAAA	OOOOxx
+2688	5331	0	0	8	8	88	688	688	2688	2688	176	177	KZAAAA	BXHAAA	VVVVxx
+8061	5332	1	1	1	1	61	61	61	3061	8061	122	123	BYAAAA	CXHAAA	AAAAxx
+9340	5333	0	0	0	0	40	340	1340	4340	9340	80	81	GVAAAA	DXHAAA	HHHHxx
+4031	5334	1	3	1	11	31	31	31	4031	4031	62	63	BZAAAA	EXHAAA	OOOOxx
+2635	5335	1	3	5	15	35	635	635	2635	2635	70	71	JXAAAA	FXHAAA	VVVVxx
+809	5336	1	1	9	9	9	809	809	809	809	18	19	DFAAAA	GXHAAA	AAAAxx
+3209	5337	1	1	9	9	9	209	1209	3209	3209	18	19	LTAAAA	HXHAAA	HHHHxx
+3825	5338	1	1	5	5	25	825	1825	3825	3825	50	51	DRAAAA	IXHAAA	OOOOxx
+1448	5339	0	0	8	8	48	448	1448	1448	1448	96	97	SDAAAA	JXHAAA	VVVVxx
+9077	5340	1	1	7	17	77	77	1077	4077	9077	154	155	DLAAAA	KXHAAA	AAAAxx
+3730	5341	0	2	0	10	30	730	1730	3730	3730	60	61	MNAAAA	LXHAAA	HHHHxx
+9596	5342	0	0	6	16	96	596	1596	4596	9596	192	193	CFAAAA	MXHAAA	OOOOxx
+3563	5343	1	3	3	3	63	563	1563	3563	3563	126	127	BHAAAA	NXHAAA	VVVVxx
+4116	5344	0	0	6	16	16	116	116	4116	4116	32	33	ICAAAA	OXHAAA	AAAAxx
+4825	5345	1	1	5	5	25	825	825	4825	4825	50	51	PDAAAA	PXHAAA	HHHHxx
+8376	5346	0	0	6	16	76	376	376	3376	8376	152	153	EKAAAA	QXHAAA	OOOOxx
+3917	5347	1	1	7	17	17	917	1917	3917	3917	34	35	RUAAAA	RXHAAA	VVVVxx
+4407	5348	1	3	7	7	7	407	407	4407	4407	14	15	NNAAAA	SXHAAA	AAAAxx
+8202	5349	0	2	2	2	2	202	202	3202	8202	4	5	MDAAAA	TXHAAA	HHHHxx
+7675	5350	1	3	5	15	75	675	1675	2675	7675	150	151	FJAAAA	UXHAAA	OOOOxx
+4104	5351	0	0	4	4	4	104	104	4104	4104	8	9	WBAAAA	VXHAAA	VVVVxx
+9225	5352	1	1	5	5	25	225	1225	4225	9225	50	51	VQAAAA	WXHAAA	AAAAxx
+2834	5353	0	2	4	14	34	834	834	2834	2834	68	69	AFAAAA	XXHAAA	HHHHxx
+1227	5354	1	3	7	7	27	227	1227	1227	1227	54	55	FVAAAA	YXHAAA	OOOOxx
+3383	5355	1	3	3	3	83	383	1383	3383	3383	166	167	DAAAAA	ZXHAAA	VVVVxx
+67	5356	1	3	7	7	67	67	67	67	67	134	135	PCAAAA	AYHAAA	AAAAxx
+1751	5357	1	3	1	11	51	751	1751	1751	1751	102	103	JPAAAA	BYHAAA	HHHHxx
+8054	5358	0	2	4	14	54	54	54	3054	8054	108	109	UXAAAA	CYHAAA	OOOOxx
+8571	5359	1	3	1	11	71	571	571	3571	8571	142	143	RRAAAA	DYHAAA	VVVVxx
+2466	5360	0	2	6	6	66	466	466	2466	2466	132	133	WQAAAA	EYHAAA	AAAAxx
+9405	5361	1	1	5	5	5	405	1405	4405	9405	10	11	TXAAAA	FYHAAA	HHHHxx
+6883	5362	1	3	3	3	83	883	883	1883	6883	166	167	TEAAAA	GYHAAA	OOOOxx
+4301	5363	1	1	1	1	1	301	301	4301	4301	2	3	LJAAAA	HYHAAA	VVVVxx
+3705	5364	1	1	5	5	5	705	1705	3705	3705	10	11	NMAAAA	IYHAAA	AAAAxx
+5420	5365	0	0	0	0	20	420	1420	420	5420	40	41	MAAAAA	JYHAAA	HHHHxx
+3692	5366	0	0	2	12	92	692	1692	3692	3692	184	185	AMAAAA	KYHAAA	OOOOxx
+6851	5367	1	3	1	11	51	851	851	1851	6851	102	103	NDAAAA	LYHAAA	VVVVxx
+9363	5368	1	3	3	3	63	363	1363	4363	9363	126	127	DWAAAA	MYHAAA	AAAAxx
+2269	5369	1	1	9	9	69	269	269	2269	2269	138	139	HJAAAA	NYHAAA	HHHHxx
+4918	5370	0	2	8	18	18	918	918	4918	4918	36	37	EHAAAA	OYHAAA	OOOOxx
+4297	5371	1	1	7	17	97	297	297	4297	4297	194	195	HJAAAA	PYHAAA	VVVVxx
+1836	5372	0	0	6	16	36	836	1836	1836	1836	72	73	QSAAAA	QYHAAA	AAAAxx
+237	5373	1	1	7	17	37	237	237	237	237	74	75	DJAAAA	RYHAAA	HHHHxx
+6131	5374	1	3	1	11	31	131	131	1131	6131	62	63	VBAAAA	SYHAAA	OOOOxx
+3174	5375	0	2	4	14	74	174	1174	3174	3174	148	149	CSAAAA	TYHAAA	VVVVxx
+9987	5376	1	3	7	7	87	987	1987	4987	9987	174	175	DUAAAA	UYHAAA	AAAAxx
+3630	5377	0	2	0	10	30	630	1630	3630	3630	60	61	QJAAAA	VYHAAA	HHHHxx
+2899	5378	1	3	9	19	99	899	899	2899	2899	198	199	NHAAAA	WYHAAA	OOOOxx
+4079	5379	1	3	9	19	79	79	79	4079	4079	158	159	XAAAAA	XYHAAA	VVVVxx
+5049	5380	1	1	9	9	49	49	1049	49	5049	98	99	FMAAAA	YYHAAA	AAAAxx
+2963	5381	1	3	3	3	63	963	963	2963	2963	126	127	ZJAAAA	ZYHAAA	HHHHxx
+3962	5382	0	2	2	2	62	962	1962	3962	3962	124	125	KWAAAA	AZHAAA	OOOOxx
+7921	5383	1	1	1	1	21	921	1921	2921	7921	42	43	RSAAAA	BZHAAA	VVVVxx
+3967	5384	1	3	7	7	67	967	1967	3967	3967	134	135	PWAAAA	CZHAAA	AAAAxx
+2752	5385	0	0	2	12	52	752	752	2752	2752	104	105	WBAAAA	DZHAAA	HHHHxx
+7944	5386	0	0	4	4	44	944	1944	2944	7944	88	89	OTAAAA	EZHAAA	OOOOxx
+2205	5387	1	1	5	5	5	205	205	2205	2205	10	11	VGAAAA	FZHAAA	VVVVxx
+5035	5388	1	3	5	15	35	35	1035	35	5035	70	71	RLAAAA	GZHAAA	AAAAxx
+1425	5389	1	1	5	5	25	425	1425	1425	1425	50	51	VCAAAA	HZHAAA	HHHHxx
+832	5390	0	0	2	12	32	832	832	832	832	64	65	AGAAAA	IZHAAA	OOOOxx
+1447	5391	1	3	7	7	47	447	1447	1447	1447	94	95	RDAAAA	JZHAAA	VVVVxx
+6108	5392	0	0	8	8	8	108	108	1108	6108	16	17	YAAAAA	KZHAAA	AAAAxx
+4936	5393	0	0	6	16	36	936	936	4936	4936	72	73	WHAAAA	LZHAAA	HHHHxx
+7704	5394	0	0	4	4	4	704	1704	2704	7704	8	9	IKAAAA	MZHAAA	OOOOxx
+142	5395	0	2	2	2	42	142	142	142	142	84	85	MFAAAA	NZHAAA	VVVVxx
+4272	5396	0	0	2	12	72	272	272	4272	4272	144	145	IIAAAA	OZHAAA	AAAAxx
+7667	5397	1	3	7	7	67	667	1667	2667	7667	134	135	XIAAAA	PZHAAA	HHHHxx
+366	5398	0	2	6	6	66	366	366	366	366	132	133	COAAAA	QZHAAA	OOOOxx
+8866	5399	0	2	6	6	66	866	866	3866	8866	132	133	ADAAAA	RZHAAA	VVVVxx
+7712	5400	0	0	2	12	12	712	1712	2712	7712	24	25	QKAAAA	SZHAAA	AAAAxx
+3880	5401	0	0	0	0	80	880	1880	3880	3880	160	161	GTAAAA	TZHAAA	HHHHxx
+4631	5402	1	3	1	11	31	631	631	4631	4631	62	63	DWAAAA	UZHAAA	OOOOxx
+2789	5403	1	1	9	9	89	789	789	2789	2789	178	179	HDAAAA	VZHAAA	VVVVxx
+7720	5404	0	0	0	0	20	720	1720	2720	7720	40	41	YKAAAA	WZHAAA	AAAAxx
+7618	5405	0	2	8	18	18	618	1618	2618	7618	36	37	AHAAAA	XZHAAA	HHHHxx
+4990	5406	0	2	0	10	90	990	990	4990	4990	180	181	YJAAAA	YZHAAA	OOOOxx
+7918	5407	0	2	8	18	18	918	1918	2918	7918	36	37	OSAAAA	ZZHAAA	VVVVxx
+5067	5408	1	3	7	7	67	67	1067	67	5067	134	135	XMAAAA	AAIAAA	AAAAxx
+6370	5409	0	2	0	10	70	370	370	1370	6370	140	141	ALAAAA	BAIAAA	HHHHxx
+2268	5410	0	0	8	8	68	268	268	2268	2268	136	137	GJAAAA	CAIAAA	OOOOxx
+1949	5411	1	1	9	9	49	949	1949	1949	1949	98	99	ZWAAAA	DAIAAA	VVVVxx
+5503	5412	1	3	3	3	3	503	1503	503	5503	6	7	RDAAAA	EAIAAA	AAAAxx
+9951	5413	1	3	1	11	51	951	1951	4951	9951	102	103	TSAAAA	FAIAAA	HHHHxx
+6823	5414	1	3	3	3	23	823	823	1823	6823	46	47	LCAAAA	GAIAAA	OOOOxx
+6287	5415	1	3	7	7	87	287	287	1287	6287	174	175	VHAAAA	HAIAAA	VVVVxx
+6016	5416	0	0	6	16	16	16	16	1016	6016	32	33	KXAAAA	IAIAAA	AAAAxx
+1977	5417	1	1	7	17	77	977	1977	1977	1977	154	155	BYAAAA	JAIAAA	HHHHxx
+8579	5418	1	3	9	19	79	579	579	3579	8579	158	159	ZRAAAA	KAIAAA	OOOOxx
+6204	5419	0	0	4	4	4	204	204	1204	6204	8	9	QEAAAA	LAIAAA	VVVVxx
+9764	5420	0	0	4	4	64	764	1764	4764	9764	128	129	OLAAAA	MAIAAA	AAAAxx
+2005	5421	1	1	5	5	5	5	5	2005	2005	10	11	DZAAAA	NAIAAA	HHHHxx
+1648	5422	0	0	8	8	48	648	1648	1648	1648	96	97	KLAAAA	OAIAAA	OOOOxx
+2457	5423	1	1	7	17	57	457	457	2457	2457	114	115	NQAAAA	PAIAAA	VVVVxx
+2698	5424	0	2	8	18	98	698	698	2698	2698	196	197	UZAAAA	QAIAAA	AAAAxx
+7730	5425	0	2	0	10	30	730	1730	2730	7730	60	61	ILAAAA	RAIAAA	HHHHxx
+7287	5426	1	3	7	7	87	287	1287	2287	7287	174	175	HUAAAA	SAIAAA	OOOOxx
+2937	5427	1	1	7	17	37	937	937	2937	2937	74	75	ZIAAAA	TAIAAA	VVVVxx
+6824	5428	0	0	4	4	24	824	824	1824	6824	48	49	MCAAAA	UAIAAA	AAAAxx
+9256	5429	0	0	6	16	56	256	1256	4256	9256	112	113	ASAAAA	VAIAAA	HHHHxx
+4810	5430	0	2	0	10	10	810	810	4810	4810	20	21	ADAAAA	WAIAAA	OOOOxx
+3869	5431	1	1	9	9	69	869	1869	3869	3869	138	139	VSAAAA	XAIAAA	VVVVxx
+1993	5432	1	1	3	13	93	993	1993	1993	1993	186	187	RYAAAA	YAIAAA	AAAAxx
+6048	5433	0	0	8	8	48	48	48	1048	6048	96	97	QYAAAA	ZAIAAA	HHHHxx
+6922	5434	0	2	2	2	22	922	922	1922	6922	44	45	GGAAAA	ABIAAA	OOOOxx
+8	5435	0	0	8	8	8	8	8	8	8	16	17	IAAAAA	BBIAAA	VVVVxx
+6706	5436	0	2	6	6	6	706	706	1706	6706	12	13	YXAAAA	CBIAAA	AAAAxx
+9159	5437	1	3	9	19	59	159	1159	4159	9159	118	119	HOAAAA	DBIAAA	HHHHxx
+7020	5438	0	0	0	0	20	20	1020	2020	7020	40	41	AKAAAA	EBIAAA	OOOOxx
+767	5439	1	3	7	7	67	767	767	767	767	134	135	NDAAAA	FBIAAA	VVVVxx
+8602	5440	0	2	2	2	2	602	602	3602	8602	4	5	WSAAAA	GBIAAA	AAAAxx
+4442	5441	0	2	2	2	42	442	442	4442	4442	84	85	WOAAAA	HBIAAA	HHHHxx
+2040	5442	0	0	0	0	40	40	40	2040	2040	80	81	MAAAAA	IBIAAA	OOOOxx
+5493	5443	1	1	3	13	93	493	1493	493	5493	186	187	HDAAAA	JBIAAA	VVVVxx
+275	5444	1	3	5	15	75	275	275	275	275	150	151	PKAAAA	KBIAAA	AAAAxx
+8876	5445	0	0	6	16	76	876	876	3876	8876	152	153	KDAAAA	LBIAAA	HHHHxx
+7381	5446	1	1	1	1	81	381	1381	2381	7381	162	163	XXAAAA	MBIAAA	OOOOxx
+1827	5447	1	3	7	7	27	827	1827	1827	1827	54	55	HSAAAA	NBIAAA	VVVVxx
+3537	5448	1	1	7	17	37	537	1537	3537	3537	74	75	BGAAAA	OBIAAA	AAAAxx
+6978	5449	0	2	8	18	78	978	978	1978	6978	156	157	KIAAAA	PBIAAA	HHHHxx
+6160	5450	0	0	0	0	60	160	160	1160	6160	120	121	YCAAAA	QBIAAA	OOOOxx
+9219	5451	1	3	9	19	19	219	1219	4219	9219	38	39	PQAAAA	RBIAAA	VVVVxx
+5034	5452	0	2	4	14	34	34	1034	34	5034	68	69	QLAAAA	SBIAAA	AAAAxx
+8463	5453	1	3	3	3	63	463	463	3463	8463	126	127	NNAAAA	TBIAAA	HHHHxx
+2038	5454	0	2	8	18	38	38	38	2038	2038	76	77	KAAAAA	UBIAAA	OOOOxx
+9562	5455	0	2	2	2	62	562	1562	4562	9562	124	125	UDAAAA	VBIAAA	VVVVxx
+2687	5456	1	3	7	7	87	687	687	2687	2687	174	175	JZAAAA	WBIAAA	AAAAxx
+5092	5457	0	0	2	12	92	92	1092	92	5092	184	185	WNAAAA	XBIAAA	HHHHxx
+539	5458	1	3	9	19	39	539	539	539	539	78	79	TUAAAA	YBIAAA	OOOOxx
+2139	5459	1	3	9	19	39	139	139	2139	2139	78	79	HEAAAA	ZBIAAA	VVVVxx
+9221	5460	1	1	1	1	21	221	1221	4221	9221	42	43	RQAAAA	ACIAAA	AAAAxx
+965	5461	1	1	5	5	65	965	965	965	965	130	131	DLAAAA	BCIAAA	HHHHxx
+6051	5462	1	3	1	11	51	51	51	1051	6051	102	103	TYAAAA	CCIAAA	OOOOxx
+5822	5463	0	2	2	2	22	822	1822	822	5822	44	45	YPAAAA	DCIAAA	VVVVxx
+6397	5464	1	1	7	17	97	397	397	1397	6397	194	195	BMAAAA	ECIAAA	AAAAxx
+2375	5465	1	3	5	15	75	375	375	2375	2375	150	151	JNAAAA	FCIAAA	HHHHxx
+9415	5466	1	3	5	15	15	415	1415	4415	9415	30	31	DYAAAA	GCIAAA	OOOOxx
+6552	5467	0	0	2	12	52	552	552	1552	6552	104	105	ASAAAA	HCIAAA	VVVVxx
+2248	5468	0	0	8	8	48	248	248	2248	2248	96	97	MIAAAA	ICIAAA	AAAAxx
+2611	5469	1	3	1	11	11	611	611	2611	2611	22	23	LWAAAA	JCIAAA	HHHHxx
+9609	5470	1	1	9	9	9	609	1609	4609	9609	18	19	PFAAAA	KCIAAA	OOOOxx
+2132	5471	0	0	2	12	32	132	132	2132	2132	64	65	AEAAAA	LCIAAA	VVVVxx
+8452	5472	0	0	2	12	52	452	452	3452	8452	104	105	CNAAAA	MCIAAA	AAAAxx
+9407	5473	1	3	7	7	7	407	1407	4407	9407	14	15	VXAAAA	NCIAAA	HHHHxx
+2814	5474	0	2	4	14	14	814	814	2814	2814	28	29	GEAAAA	OCIAAA	OOOOxx
+1889	5475	1	1	9	9	89	889	1889	1889	1889	178	179	RUAAAA	PCIAAA	VVVVxx
+7489	5476	1	1	9	9	89	489	1489	2489	7489	178	179	BCAAAA	QCIAAA	AAAAxx
+2255	5477	1	3	5	15	55	255	255	2255	2255	110	111	TIAAAA	RCIAAA	HHHHxx
+3380	5478	0	0	0	0	80	380	1380	3380	3380	160	161	AAAAAA	SCIAAA	OOOOxx
+1167	5479	1	3	7	7	67	167	1167	1167	1167	134	135	XSAAAA	TCIAAA	VVVVxx
+5369	5480	1	1	9	9	69	369	1369	369	5369	138	139	NYAAAA	UCIAAA	AAAAxx
+2378	5481	0	2	8	18	78	378	378	2378	2378	156	157	MNAAAA	VCIAAA	HHHHxx
+8315	5482	1	3	5	15	15	315	315	3315	8315	30	31	VHAAAA	WCIAAA	OOOOxx
+2934	5483	0	2	4	14	34	934	934	2934	2934	68	69	WIAAAA	XCIAAA	VVVVxx
+7924	5484	0	0	4	4	24	924	1924	2924	7924	48	49	USAAAA	YCIAAA	AAAAxx
+2867	5485	1	3	7	7	67	867	867	2867	2867	134	135	HGAAAA	ZCIAAA	HHHHxx
+9141	5486	1	1	1	1	41	141	1141	4141	9141	82	83	PNAAAA	ADIAAA	OOOOxx
+3613	5487	1	1	3	13	13	613	1613	3613	3613	26	27	ZIAAAA	BDIAAA	VVVVxx
+2461	5488	1	1	1	1	61	461	461	2461	2461	122	123	RQAAAA	CDIAAA	AAAAxx
+4567	5489	1	3	7	7	67	567	567	4567	4567	134	135	RTAAAA	DDIAAA	HHHHxx
+2906	5490	0	2	6	6	6	906	906	2906	2906	12	13	UHAAAA	EDIAAA	OOOOxx
+4848	5491	0	0	8	8	48	848	848	4848	4848	96	97	MEAAAA	FDIAAA	VVVVxx
+6614	5492	0	2	4	14	14	614	614	1614	6614	28	29	KUAAAA	GDIAAA	AAAAxx
+6200	5493	0	0	0	0	0	200	200	1200	6200	0	1	MEAAAA	HDIAAA	HHHHxx
+7895	5494	1	3	5	15	95	895	1895	2895	7895	190	191	RRAAAA	IDIAAA	OOOOxx
+6829	5495	1	1	9	9	29	829	829	1829	6829	58	59	RCAAAA	JDIAAA	VVVVxx
+4087	5496	1	3	7	7	87	87	87	4087	4087	174	175	FBAAAA	KDIAAA	AAAAxx
+8787	5497	1	3	7	7	87	787	787	3787	8787	174	175	ZZAAAA	LDIAAA	HHHHxx
+3322	5498	0	2	2	2	22	322	1322	3322	3322	44	45	UXAAAA	MDIAAA	OOOOxx
+9091	5499	1	3	1	11	91	91	1091	4091	9091	182	183	RLAAAA	NDIAAA	VVVVxx
+5268	5500	0	0	8	8	68	268	1268	268	5268	136	137	QUAAAA	ODIAAA	AAAAxx
+2719	5501	1	3	9	19	19	719	719	2719	2719	38	39	PAAAAA	PDIAAA	HHHHxx
+30	5502	0	2	0	10	30	30	30	30	30	60	61	EBAAAA	QDIAAA	OOOOxx
+1975	5503	1	3	5	15	75	975	1975	1975	1975	150	151	ZXAAAA	RDIAAA	VVVVxx
+2641	5504	1	1	1	1	41	641	641	2641	2641	82	83	PXAAAA	SDIAAA	AAAAxx
+8616	5505	0	0	6	16	16	616	616	3616	8616	32	33	KTAAAA	TDIAAA	HHHHxx
+5980	5506	0	0	0	0	80	980	1980	980	5980	160	161	AWAAAA	UDIAAA	OOOOxx
+5170	5507	0	2	0	10	70	170	1170	170	5170	140	141	WQAAAA	VDIAAA	VVVVxx
+1960	5508	0	0	0	0	60	960	1960	1960	1960	120	121	KXAAAA	WDIAAA	AAAAxx
+8141	5509	1	1	1	1	41	141	141	3141	8141	82	83	DBAAAA	XDIAAA	HHHHxx
+6692	5510	0	0	2	12	92	692	692	1692	6692	184	185	KXAAAA	YDIAAA	OOOOxx
+7621	5511	1	1	1	1	21	621	1621	2621	7621	42	43	DHAAAA	ZDIAAA	VVVVxx
+3890	5512	0	2	0	10	90	890	1890	3890	3890	180	181	QTAAAA	AEIAAA	AAAAxx
+4300	5513	0	0	0	0	0	300	300	4300	4300	0	1	KJAAAA	BEIAAA	HHHHxx
+736	5514	0	0	6	16	36	736	736	736	736	72	73	ICAAAA	CEIAAA	OOOOxx
+6626	5515	0	2	6	6	26	626	626	1626	6626	52	53	WUAAAA	DEIAAA	VVVVxx
+1800	5516	0	0	0	0	0	800	1800	1800	1800	0	1	GRAAAA	EEIAAA	AAAAxx
+3430	5517	0	2	0	10	30	430	1430	3430	3430	60	61	YBAAAA	FEIAAA	HHHHxx
+9519	5518	1	3	9	19	19	519	1519	4519	9519	38	39	DCAAAA	GEIAAA	OOOOxx
+5111	5519	1	3	1	11	11	111	1111	111	5111	22	23	POAAAA	HEIAAA	VVVVxx
+6915	5520	1	3	5	15	15	915	915	1915	6915	30	31	ZFAAAA	IEIAAA	AAAAxx
+9246	5521	0	2	6	6	46	246	1246	4246	9246	92	93	QRAAAA	JEIAAA	HHHHxx
+5141	5522	1	1	1	1	41	141	1141	141	5141	82	83	TPAAAA	KEIAAA	OOOOxx
+5922	5523	0	2	2	2	22	922	1922	922	5922	44	45	UTAAAA	LEIAAA	VVVVxx
+3087	5524	1	3	7	7	87	87	1087	3087	3087	174	175	TOAAAA	MEIAAA	AAAAxx
+1859	5525	1	3	9	19	59	859	1859	1859	1859	118	119	NTAAAA	NEIAAA	HHHHxx
+8482	5526	0	2	2	2	82	482	482	3482	8482	164	165	GOAAAA	OEIAAA	OOOOxx
+8414	5527	0	2	4	14	14	414	414	3414	8414	28	29	QLAAAA	PEIAAA	VVVVxx
+6662	5528	0	2	2	2	62	662	662	1662	6662	124	125	GWAAAA	QEIAAA	AAAAxx
+8614	5529	0	2	4	14	14	614	614	3614	8614	28	29	ITAAAA	REIAAA	HHHHxx
+42	5530	0	2	2	2	42	42	42	42	42	84	85	QBAAAA	SEIAAA	OOOOxx
+7582	5531	0	2	2	2	82	582	1582	2582	7582	164	165	QFAAAA	TEIAAA	VVVVxx
+8183	5532	1	3	3	3	83	183	183	3183	8183	166	167	TCAAAA	UEIAAA	AAAAxx
+1299	5533	1	3	9	19	99	299	1299	1299	1299	198	199	ZXAAAA	VEIAAA	HHHHxx
+7004	5534	0	0	4	4	4	4	1004	2004	7004	8	9	KJAAAA	WEIAAA	OOOOxx
+3298	5535	0	2	8	18	98	298	1298	3298	3298	196	197	WWAAAA	XEIAAA	VVVVxx
+7884	5536	0	0	4	4	84	884	1884	2884	7884	168	169	GRAAAA	YEIAAA	AAAAxx
+4191	5537	1	3	1	11	91	191	191	4191	4191	182	183	FFAAAA	ZEIAAA	HHHHxx
+7346	5538	0	2	6	6	46	346	1346	2346	7346	92	93	OWAAAA	AFIAAA	OOOOxx
+7989	5539	1	1	9	9	89	989	1989	2989	7989	178	179	HVAAAA	BFIAAA	VVVVxx
+5719	5540	1	3	9	19	19	719	1719	719	5719	38	39	ZLAAAA	CFIAAA	AAAAxx
+800	5541	0	0	0	0	0	800	800	800	800	0	1	UEAAAA	DFIAAA	HHHHxx
+6509	5542	1	1	9	9	9	509	509	1509	6509	18	19	JQAAAA	EFIAAA	OOOOxx
+4672	5543	0	0	2	12	72	672	672	4672	4672	144	145	SXAAAA	FFIAAA	VVVVxx
+4434	5544	0	2	4	14	34	434	434	4434	4434	68	69	OOAAAA	GFIAAA	AAAAxx
+8309	5545	1	1	9	9	9	309	309	3309	8309	18	19	PHAAAA	HFIAAA	HHHHxx
+5134	5546	0	2	4	14	34	134	1134	134	5134	68	69	MPAAAA	IFIAAA	OOOOxx
+5153	5547	1	1	3	13	53	153	1153	153	5153	106	107	FQAAAA	JFIAAA	VVVVxx
+1522	5548	0	2	2	2	22	522	1522	1522	1522	44	45	OGAAAA	KFIAAA	AAAAxx
+8629	5549	1	1	9	9	29	629	629	3629	8629	58	59	XTAAAA	LFIAAA	HHHHxx
+4549	5550	1	1	9	9	49	549	549	4549	4549	98	99	ZSAAAA	MFIAAA	OOOOxx
+9506	5551	0	2	6	6	6	506	1506	4506	9506	12	13	QBAAAA	NFIAAA	VVVVxx
+6542	5552	0	2	2	2	42	542	542	1542	6542	84	85	QRAAAA	OFIAAA	AAAAxx
+2579	5553	1	3	9	19	79	579	579	2579	2579	158	159	FVAAAA	PFIAAA	HHHHxx
+4664	5554	0	0	4	4	64	664	664	4664	4664	128	129	KXAAAA	QFIAAA	OOOOxx
+696	5555	0	0	6	16	96	696	696	696	696	192	193	UAAAAA	RFIAAA	VVVVxx
+7950	5556	0	2	0	10	50	950	1950	2950	7950	100	101	UTAAAA	SFIAAA	AAAAxx
+5	5557	1	1	5	5	5	5	5	5	5	10	11	FAAAAA	TFIAAA	HHHHxx
+7806	5558	0	2	6	6	6	806	1806	2806	7806	12	13	GOAAAA	UFIAAA	OOOOxx
+2770	5559	0	2	0	10	70	770	770	2770	2770	140	141	OCAAAA	VFIAAA	VVVVxx
+1344	5560	0	0	4	4	44	344	1344	1344	1344	88	89	SZAAAA	WFIAAA	AAAAxx
+511	5561	1	3	1	11	11	511	511	511	511	22	23	RTAAAA	XFIAAA	HHHHxx
+9070	5562	0	2	0	10	70	70	1070	4070	9070	140	141	WKAAAA	YFIAAA	OOOOxx
+2961	5563	1	1	1	1	61	961	961	2961	2961	122	123	XJAAAA	ZFIAAA	VVVVxx
+8031	5564	1	3	1	11	31	31	31	3031	8031	62	63	XWAAAA	AGIAAA	AAAAxx
+326	5565	0	2	6	6	26	326	326	326	326	52	53	OMAAAA	BGIAAA	HHHHxx
+183	5566	1	3	3	3	83	183	183	183	183	166	167	BHAAAA	CGIAAA	OOOOxx
+5917	5567	1	1	7	17	17	917	1917	917	5917	34	35	PTAAAA	DGIAAA	VVVVxx
+8256	5568	0	0	6	16	56	256	256	3256	8256	112	113	OFAAAA	EGIAAA	AAAAxx
+7889	5569	1	1	9	9	89	889	1889	2889	7889	178	179	LRAAAA	FGIAAA	HHHHxx
+9029	5570	1	1	9	9	29	29	1029	4029	9029	58	59	HJAAAA	GGIAAA	OOOOxx
+1316	5571	0	0	6	16	16	316	1316	1316	1316	32	33	QYAAAA	HGIAAA	VVVVxx
+7442	5572	0	2	2	2	42	442	1442	2442	7442	84	85	GAAAAA	IGIAAA	AAAAxx
+2810	5573	0	2	0	10	10	810	810	2810	2810	20	21	CEAAAA	JGIAAA	HHHHxx
+20	5574	0	0	0	0	20	20	20	20	20	40	41	UAAAAA	KGIAAA	OOOOxx
+2306	5575	0	2	6	6	6	306	306	2306	2306	12	13	SKAAAA	LGIAAA	VVVVxx
+4694	5576	0	2	4	14	94	694	694	4694	4694	188	189	OYAAAA	MGIAAA	AAAAxx
+9710	5577	0	2	0	10	10	710	1710	4710	9710	20	21	MJAAAA	NGIAAA	HHHHxx
+1791	5578	1	3	1	11	91	791	1791	1791	1791	182	183	XQAAAA	OGIAAA	OOOOxx
+6730	5579	0	2	0	10	30	730	730	1730	6730	60	61	WYAAAA	PGIAAA	VVVVxx
+359	5580	1	3	9	19	59	359	359	359	359	118	119	VNAAAA	QGIAAA	AAAAxx
+8097	5581	1	1	7	17	97	97	97	3097	8097	194	195	LZAAAA	RGIAAA	HHHHxx
+6147	5582	1	3	7	7	47	147	147	1147	6147	94	95	LCAAAA	SGIAAA	OOOOxx
+643	5583	1	3	3	3	43	643	643	643	643	86	87	TYAAAA	TGIAAA	VVVVxx
+698	5584	0	2	8	18	98	698	698	698	698	196	197	WAAAAA	UGIAAA	AAAAxx
+3881	5585	1	1	1	1	81	881	1881	3881	3881	162	163	HTAAAA	VGIAAA	HHHHxx
+7600	5586	0	0	0	0	0	600	1600	2600	7600	0	1	IGAAAA	WGIAAA	OOOOxx
+1583	5587	1	3	3	3	83	583	1583	1583	1583	166	167	XIAAAA	XGIAAA	VVVVxx
+9612	5588	0	0	2	12	12	612	1612	4612	9612	24	25	SFAAAA	YGIAAA	AAAAxx
+1032	5589	0	0	2	12	32	32	1032	1032	1032	64	65	SNAAAA	ZGIAAA	HHHHxx
+4834	5590	0	2	4	14	34	834	834	4834	4834	68	69	YDAAAA	AHIAAA	OOOOxx
+5076	5591	0	0	6	16	76	76	1076	76	5076	152	153	GNAAAA	BHIAAA	VVVVxx
+3070	5592	0	2	0	10	70	70	1070	3070	3070	140	141	COAAAA	CHIAAA	AAAAxx
+1421	5593	1	1	1	1	21	421	1421	1421	1421	42	43	RCAAAA	DHIAAA	HHHHxx
+8970	5594	0	2	0	10	70	970	970	3970	8970	140	141	AHAAAA	EHIAAA	OOOOxx
+6271	5595	1	3	1	11	71	271	271	1271	6271	142	143	FHAAAA	FHIAAA	VVVVxx
+8547	5596	1	3	7	7	47	547	547	3547	8547	94	95	TQAAAA	GHIAAA	AAAAxx
+1259	5597	1	3	9	19	59	259	1259	1259	1259	118	119	LWAAAA	HHIAAA	HHHHxx
+8328	5598	0	0	8	8	28	328	328	3328	8328	56	57	IIAAAA	IHIAAA	OOOOxx
+1503	5599	1	3	3	3	3	503	1503	1503	1503	6	7	VFAAAA	JHIAAA	VVVVxx
+2253	5600	1	1	3	13	53	253	253	2253	2253	106	107	RIAAAA	KHIAAA	AAAAxx
+7449	5601	1	1	9	9	49	449	1449	2449	7449	98	99	NAAAAA	LHIAAA	HHHHxx
+3579	5602	1	3	9	19	79	579	1579	3579	3579	158	159	RHAAAA	MHIAAA	OOOOxx
+1585	5603	1	1	5	5	85	585	1585	1585	1585	170	171	ZIAAAA	NHIAAA	VVVVxx
+5543	5604	1	3	3	3	43	543	1543	543	5543	86	87	FFAAAA	OHIAAA	AAAAxx
+8627	5605	1	3	7	7	27	627	627	3627	8627	54	55	VTAAAA	PHIAAA	HHHHxx
+8618	5606	0	2	8	18	18	618	618	3618	8618	36	37	MTAAAA	QHIAAA	OOOOxx
+1911	5607	1	3	1	11	11	911	1911	1911	1911	22	23	NVAAAA	RHIAAA	VVVVxx
+2758	5608	0	2	8	18	58	758	758	2758	2758	116	117	CCAAAA	SHIAAA	AAAAxx
+5744	5609	0	0	4	4	44	744	1744	744	5744	88	89	YMAAAA	THIAAA	HHHHxx
+4976	5610	0	0	6	16	76	976	976	4976	4976	152	153	KJAAAA	UHIAAA	OOOOxx
+6380	5611	0	0	0	0	80	380	380	1380	6380	160	161	KLAAAA	VHIAAA	VVVVxx
+1937	5612	1	1	7	17	37	937	1937	1937	1937	74	75	NWAAAA	WHIAAA	AAAAxx
+9903	5613	1	3	3	3	3	903	1903	4903	9903	6	7	XQAAAA	XHIAAA	HHHHxx
+4409	5614	1	1	9	9	9	409	409	4409	4409	18	19	PNAAAA	YHIAAA	OOOOxx
+4133	5615	1	1	3	13	33	133	133	4133	4133	66	67	ZCAAAA	ZHIAAA	VVVVxx
+5263	5616	1	3	3	3	63	263	1263	263	5263	126	127	LUAAAA	AIIAAA	AAAAxx
+7888	5617	0	0	8	8	88	888	1888	2888	7888	176	177	KRAAAA	BIIAAA	HHHHxx
+6060	5618	0	0	0	0	60	60	60	1060	6060	120	121	CZAAAA	CIIAAA	OOOOxx
+2522	5619	0	2	2	2	22	522	522	2522	2522	44	45	ATAAAA	DIIAAA	VVVVxx
+5550	5620	0	2	0	10	50	550	1550	550	5550	100	101	MFAAAA	EIIAAA	AAAAxx
+9396	5621	0	0	6	16	96	396	1396	4396	9396	192	193	KXAAAA	FIIAAA	HHHHxx
+176	5622	0	0	6	16	76	176	176	176	176	152	153	UGAAAA	GIIAAA	OOOOxx
+5148	5623	0	0	8	8	48	148	1148	148	5148	96	97	AQAAAA	HIIAAA	VVVVxx
+6691	5624	1	3	1	11	91	691	691	1691	6691	182	183	JXAAAA	IIIAAA	AAAAxx
+4652	5625	0	0	2	12	52	652	652	4652	4652	104	105	YWAAAA	JIIAAA	HHHHxx
+5096	5626	0	0	6	16	96	96	1096	96	5096	192	193	AOAAAA	KIIAAA	OOOOxx
+2408	5627	0	0	8	8	8	408	408	2408	2408	16	17	QOAAAA	LIIAAA	VVVVxx
+7322	5628	0	2	2	2	22	322	1322	2322	7322	44	45	QVAAAA	MIIAAA	AAAAxx
+6782	5629	0	2	2	2	82	782	782	1782	6782	164	165	WAAAAA	NIIAAA	HHHHxx
+4642	5630	0	2	2	2	42	642	642	4642	4642	84	85	OWAAAA	OIIAAA	OOOOxx
+5427	5631	1	3	7	7	27	427	1427	427	5427	54	55	TAAAAA	PIIAAA	VVVVxx
+4461	5632	1	1	1	1	61	461	461	4461	4461	122	123	PPAAAA	QIIAAA	AAAAxx
+8416	5633	0	0	6	16	16	416	416	3416	8416	32	33	SLAAAA	RIIAAA	HHHHxx
+2593	5634	1	1	3	13	93	593	593	2593	2593	186	187	TVAAAA	SIIAAA	OOOOxx
+6202	5635	0	2	2	2	2	202	202	1202	6202	4	5	OEAAAA	TIIAAA	VVVVxx
+3826	5636	0	2	6	6	26	826	1826	3826	3826	52	53	ERAAAA	UIIAAA	AAAAxx
+4417	5637	1	1	7	17	17	417	417	4417	4417	34	35	XNAAAA	VIIAAA	HHHHxx
+7871	5638	1	3	1	11	71	871	1871	2871	7871	142	143	TQAAAA	WIIAAA	OOOOxx
+5622	5639	0	2	2	2	22	622	1622	622	5622	44	45	GIAAAA	XIIAAA	VVVVxx
+3010	5640	0	2	0	10	10	10	1010	3010	3010	20	21	ULAAAA	YIIAAA	AAAAxx
+3407	5641	1	3	7	7	7	407	1407	3407	3407	14	15	BBAAAA	ZIIAAA	HHHHxx
+1274	5642	0	2	4	14	74	274	1274	1274	1274	148	149	AXAAAA	AJIAAA	OOOOxx
+2828	5643	0	0	8	8	28	828	828	2828	2828	56	57	UEAAAA	BJIAAA	VVVVxx
+3427	5644	1	3	7	7	27	427	1427	3427	3427	54	55	VBAAAA	CJIAAA	AAAAxx
+612	5645	0	0	2	12	12	612	612	612	612	24	25	OXAAAA	DJIAAA	HHHHxx
+8729	5646	1	1	9	9	29	729	729	3729	8729	58	59	TXAAAA	EJIAAA	OOOOxx
+1239	5647	1	3	9	19	39	239	1239	1239	1239	78	79	RVAAAA	FJIAAA	VVVVxx
+8990	5648	0	2	0	10	90	990	990	3990	8990	180	181	UHAAAA	GJIAAA	AAAAxx
+5609	5649	1	1	9	9	9	609	1609	609	5609	18	19	THAAAA	HJIAAA	HHHHxx
+4441	5650	1	1	1	1	41	441	441	4441	4441	82	83	VOAAAA	IJIAAA	OOOOxx
+9078	5651	0	2	8	18	78	78	1078	4078	9078	156	157	ELAAAA	JJIAAA	VVVVxx
+6699	5652	1	3	9	19	99	699	699	1699	6699	198	199	RXAAAA	KJIAAA	AAAAxx
+8390	5653	0	2	0	10	90	390	390	3390	8390	180	181	SKAAAA	LJIAAA	HHHHxx
+5455	5654	1	3	5	15	55	455	1455	455	5455	110	111	VBAAAA	MJIAAA	OOOOxx
+7537	5655	1	1	7	17	37	537	1537	2537	7537	74	75	XDAAAA	NJIAAA	VVVVxx
+4669	5656	1	1	9	9	69	669	669	4669	4669	138	139	PXAAAA	OJIAAA	AAAAxx
+5534	5657	0	2	4	14	34	534	1534	534	5534	68	69	WEAAAA	PJIAAA	HHHHxx
+1920	5658	0	0	0	0	20	920	1920	1920	1920	40	41	WVAAAA	QJIAAA	OOOOxx
+9465	5659	1	1	5	5	65	465	1465	4465	9465	130	131	BAAAAA	RJIAAA	VVVVxx
+4897	5660	1	1	7	17	97	897	897	4897	4897	194	195	JGAAAA	SJIAAA	AAAAxx
+1990	5661	0	2	0	10	90	990	1990	1990	1990	180	181	OYAAAA	TJIAAA	HHHHxx
+7148	5662	0	0	8	8	48	148	1148	2148	7148	96	97	YOAAAA	UJIAAA	OOOOxx
+533	5663	1	1	3	13	33	533	533	533	533	66	67	NUAAAA	VJIAAA	VVVVxx
+4339	5664	1	3	9	19	39	339	339	4339	4339	78	79	XKAAAA	WJIAAA	AAAAxx
+6450	5665	0	2	0	10	50	450	450	1450	6450	100	101	COAAAA	XJIAAA	HHHHxx
+9627	5666	1	3	7	7	27	627	1627	4627	9627	54	55	HGAAAA	YJIAAA	OOOOxx
+5539	5667	1	3	9	19	39	539	1539	539	5539	78	79	BFAAAA	ZJIAAA	VVVVxx
+6758	5668	0	2	8	18	58	758	758	1758	6758	116	117	YZAAAA	AKIAAA	AAAAxx
+3435	5669	1	3	5	15	35	435	1435	3435	3435	70	71	DCAAAA	BKIAAA	HHHHxx
+4350	5670	0	2	0	10	50	350	350	4350	4350	100	101	ILAAAA	CKIAAA	OOOOxx
+9088	5671	0	0	8	8	88	88	1088	4088	9088	176	177	OLAAAA	DKIAAA	VVVVxx
+6368	5672	0	0	8	8	68	368	368	1368	6368	136	137	YKAAAA	EKIAAA	AAAAxx
+6337	5673	1	1	7	17	37	337	337	1337	6337	74	75	TJAAAA	FKIAAA	HHHHxx
+4361	5674	1	1	1	1	61	361	361	4361	4361	122	123	TLAAAA	GKIAAA	OOOOxx
+1719	5675	1	3	9	19	19	719	1719	1719	1719	38	39	DOAAAA	HKIAAA	VVVVxx
+3109	5676	1	1	9	9	9	109	1109	3109	3109	18	19	PPAAAA	IKIAAA	AAAAxx
+7135	5677	1	3	5	15	35	135	1135	2135	7135	70	71	LOAAAA	JKIAAA	HHHHxx
+1964	5678	0	0	4	4	64	964	1964	1964	1964	128	129	OXAAAA	KKIAAA	OOOOxx
+3	5679	1	3	3	3	3	3	3	3	3	6	7	DAAAAA	LKIAAA	VVVVxx
+1868	5680	0	0	8	8	68	868	1868	1868	1868	136	137	WTAAAA	MKIAAA	AAAAxx
+5182	5681	0	2	2	2	82	182	1182	182	5182	164	165	IRAAAA	NKIAAA	HHHHxx
+7567	5682	1	3	7	7	67	567	1567	2567	7567	134	135	BFAAAA	OKIAAA	OOOOxx
+3676	5683	0	0	6	16	76	676	1676	3676	3676	152	153	KLAAAA	PKIAAA	VVVVxx
+9382	5684	0	2	2	2	82	382	1382	4382	9382	164	165	WWAAAA	QKIAAA	AAAAxx
+8645	5685	1	1	5	5	45	645	645	3645	8645	90	91	NUAAAA	RKIAAA	HHHHxx
+2018	5686	0	2	8	18	18	18	18	2018	2018	36	37	QZAAAA	SKIAAA	OOOOxx
+217	5687	1	1	7	17	17	217	217	217	217	34	35	JIAAAA	TKIAAA	VVVVxx
+6793	5688	1	1	3	13	93	793	793	1793	6793	186	187	HBAAAA	UKIAAA	AAAAxx
+7280	5689	0	0	0	0	80	280	1280	2280	7280	160	161	AUAAAA	VKIAAA	HHHHxx
+2168	5690	0	0	8	8	68	168	168	2168	2168	136	137	KFAAAA	WKIAAA	OOOOxx
+5259	5691	1	3	9	19	59	259	1259	259	5259	118	119	HUAAAA	XKIAAA	VVVVxx
+6019	5692	1	3	9	19	19	19	19	1019	6019	38	39	NXAAAA	YKIAAA	AAAAxx
+877	5693	1	1	7	17	77	877	877	877	877	154	155	THAAAA	ZKIAAA	HHHHxx
+4961	5694	1	1	1	1	61	961	961	4961	4961	122	123	VIAAAA	ALIAAA	OOOOxx
+1873	5695	1	1	3	13	73	873	1873	1873	1873	146	147	BUAAAA	BLIAAA	VVVVxx
+13	5696	1	1	3	13	13	13	13	13	13	26	27	NAAAAA	CLIAAA	AAAAxx
+1537	5697	1	1	7	17	37	537	1537	1537	1537	74	75	DHAAAA	DLIAAA	HHHHxx
+3129	5698	1	1	9	9	29	129	1129	3129	3129	58	59	JQAAAA	ELIAAA	OOOOxx
+6473	5699	1	1	3	13	73	473	473	1473	6473	146	147	ZOAAAA	FLIAAA	VVVVxx
+7865	5700	1	1	5	5	65	865	1865	2865	7865	130	131	NQAAAA	GLIAAA	AAAAxx
+7822	5701	0	2	2	2	22	822	1822	2822	7822	44	45	WOAAAA	HLIAAA	HHHHxx
+239	5702	1	3	9	19	39	239	239	239	239	78	79	FJAAAA	ILIAAA	OOOOxx
+2062	5703	0	2	2	2	62	62	62	2062	2062	124	125	IBAAAA	JLIAAA	VVVVxx
+762	5704	0	2	2	2	62	762	762	762	762	124	125	IDAAAA	KLIAAA	AAAAxx
+3764	5705	0	0	4	4	64	764	1764	3764	3764	128	129	UOAAAA	LLIAAA	HHHHxx
+465	5706	1	1	5	5	65	465	465	465	465	130	131	XRAAAA	MLIAAA	OOOOxx
+2587	5707	1	3	7	7	87	587	587	2587	2587	174	175	NVAAAA	NLIAAA	VVVVxx
+8402	5708	0	2	2	2	2	402	402	3402	8402	4	5	ELAAAA	OLIAAA	AAAAxx
+1055	5709	1	3	5	15	55	55	1055	1055	1055	110	111	POAAAA	PLIAAA	HHHHxx
+3072	5710	0	0	2	12	72	72	1072	3072	3072	144	145	EOAAAA	QLIAAA	OOOOxx
+7359	5711	1	3	9	19	59	359	1359	2359	7359	118	119	BXAAAA	RLIAAA	VVVVxx
+6558	5712	0	2	8	18	58	558	558	1558	6558	116	117	GSAAAA	SLIAAA	AAAAxx
+48	5713	0	0	8	8	48	48	48	48	48	96	97	WBAAAA	TLIAAA	HHHHxx
+5382	5714	0	2	2	2	82	382	1382	382	5382	164	165	AZAAAA	ULIAAA	OOOOxx
+947	5715	1	3	7	7	47	947	947	947	947	94	95	LKAAAA	VLIAAA	VVVVxx
+2644	5716	0	0	4	4	44	644	644	2644	2644	88	89	SXAAAA	WLIAAA	AAAAxx
+7516	5717	0	0	6	16	16	516	1516	2516	7516	32	33	CDAAAA	XLIAAA	HHHHxx
+2362	5718	0	2	2	2	62	362	362	2362	2362	124	125	WMAAAA	YLIAAA	OOOOxx
+839	5719	1	3	9	19	39	839	839	839	839	78	79	HGAAAA	ZLIAAA	VVVVxx
+2216	5720	0	0	6	16	16	216	216	2216	2216	32	33	GHAAAA	AMIAAA	AAAAxx
+7673	5721	1	1	3	13	73	673	1673	2673	7673	146	147	DJAAAA	BMIAAA	HHHHxx
+8173	5722	1	1	3	13	73	173	173	3173	8173	146	147	JCAAAA	CMIAAA	OOOOxx
+1630	5723	0	2	0	10	30	630	1630	1630	1630	60	61	SKAAAA	DMIAAA	VVVVxx
+9057	5724	1	1	7	17	57	57	1057	4057	9057	114	115	JKAAAA	EMIAAA	AAAAxx
+4392	5725	0	0	2	12	92	392	392	4392	4392	184	185	YMAAAA	FMIAAA	HHHHxx
+3695	5726	1	3	5	15	95	695	1695	3695	3695	190	191	DMAAAA	GMIAAA	OOOOxx
+5751	5727	1	3	1	11	51	751	1751	751	5751	102	103	FNAAAA	HMIAAA	VVVVxx
+5745	5728	1	1	5	5	45	745	1745	745	5745	90	91	ZMAAAA	IMIAAA	AAAAxx
+7945	5729	1	1	5	5	45	945	1945	2945	7945	90	91	PTAAAA	JMIAAA	HHHHxx
+5174	5730	0	2	4	14	74	174	1174	174	5174	148	149	ARAAAA	KMIAAA	OOOOxx
+3829	5731	1	1	9	9	29	829	1829	3829	3829	58	59	HRAAAA	LMIAAA	VVVVxx
+3317	5732	1	1	7	17	17	317	1317	3317	3317	34	35	PXAAAA	MMIAAA	AAAAxx
+4253	5733	1	1	3	13	53	253	253	4253	4253	106	107	PHAAAA	NMIAAA	HHHHxx
+1291	5734	1	3	1	11	91	291	1291	1291	1291	182	183	RXAAAA	OMIAAA	OOOOxx
+3266	5735	0	2	6	6	66	266	1266	3266	3266	132	133	QVAAAA	PMIAAA	VVVVxx
+2939	5736	1	3	9	19	39	939	939	2939	2939	78	79	BJAAAA	QMIAAA	AAAAxx
+2755	5737	1	3	5	15	55	755	755	2755	2755	110	111	ZBAAAA	RMIAAA	HHHHxx
+6844	5738	0	0	4	4	44	844	844	1844	6844	88	89	GDAAAA	SMIAAA	OOOOxx
+8594	5739	0	2	4	14	94	594	594	3594	8594	188	189	OSAAAA	TMIAAA	VVVVxx
+704	5740	0	0	4	4	4	704	704	704	704	8	9	CBAAAA	UMIAAA	AAAAxx
+1681	5741	1	1	1	1	81	681	1681	1681	1681	162	163	RMAAAA	VMIAAA	HHHHxx
+364	5742	0	0	4	4	64	364	364	364	364	128	129	AOAAAA	WMIAAA	OOOOxx
+2928	5743	0	0	8	8	28	928	928	2928	2928	56	57	QIAAAA	XMIAAA	VVVVxx
+117	5744	1	1	7	17	17	117	117	117	117	34	35	NEAAAA	YMIAAA	AAAAxx
+96	5745	0	0	6	16	96	96	96	96	96	192	193	SDAAAA	ZMIAAA	HHHHxx
+7796	5746	0	0	6	16	96	796	1796	2796	7796	192	193	WNAAAA	ANIAAA	OOOOxx
+3101	5747	1	1	1	1	1	101	1101	3101	3101	2	3	HPAAAA	BNIAAA	VVVVxx
+3397	5748	1	1	7	17	97	397	1397	3397	3397	194	195	RAAAAA	CNIAAA	AAAAxx
+1605	5749	1	1	5	5	5	605	1605	1605	1605	10	11	TJAAAA	DNIAAA	HHHHxx
+4881	5750	1	1	1	1	81	881	881	4881	4881	162	163	TFAAAA	ENIAAA	OOOOxx
+4521	5751	1	1	1	1	21	521	521	4521	4521	42	43	XRAAAA	FNIAAA	VVVVxx
+6430	5752	0	2	0	10	30	430	430	1430	6430	60	61	INAAAA	GNIAAA	AAAAxx
+282	5753	0	2	2	2	82	282	282	282	282	164	165	WKAAAA	HNIAAA	HHHHxx
+9645	5754	1	1	5	5	45	645	1645	4645	9645	90	91	ZGAAAA	INIAAA	OOOOxx
+8946	5755	0	2	6	6	46	946	946	3946	8946	92	93	CGAAAA	JNIAAA	VVVVxx
+5064	5756	0	0	4	4	64	64	1064	64	5064	128	129	UMAAAA	KNIAAA	AAAAxx
+7470	5757	0	2	0	10	70	470	1470	2470	7470	140	141	IBAAAA	LNIAAA	HHHHxx
+5886	5758	0	2	6	6	86	886	1886	886	5886	172	173	KSAAAA	MNIAAA	OOOOxx
+6280	5759	0	0	0	0	80	280	280	1280	6280	160	161	OHAAAA	NNIAAA	VVVVxx
+5247	5760	1	3	7	7	47	247	1247	247	5247	94	95	VTAAAA	ONIAAA	AAAAxx
+412	5761	0	0	2	12	12	412	412	412	412	24	25	WPAAAA	PNIAAA	HHHHxx
+5342	5762	0	2	2	2	42	342	1342	342	5342	84	85	MXAAAA	QNIAAA	OOOOxx
+2271	5763	1	3	1	11	71	271	271	2271	2271	142	143	JJAAAA	RNIAAA	VVVVxx
+849	5764	1	1	9	9	49	849	849	849	849	98	99	RGAAAA	SNIAAA	AAAAxx
+1885	5765	1	1	5	5	85	885	1885	1885	1885	170	171	NUAAAA	TNIAAA	HHHHxx
+5620	5766	0	0	0	0	20	620	1620	620	5620	40	41	EIAAAA	UNIAAA	OOOOxx
+7079	5767	1	3	9	19	79	79	1079	2079	7079	158	159	HMAAAA	VNIAAA	VVVVxx
+5819	5768	1	3	9	19	19	819	1819	819	5819	38	39	VPAAAA	WNIAAA	AAAAxx
+7497	5769	1	1	7	17	97	497	1497	2497	7497	194	195	JCAAAA	XNIAAA	HHHHxx
+5993	5770	1	1	3	13	93	993	1993	993	5993	186	187	NWAAAA	YNIAAA	OOOOxx
+3739	5771	1	3	9	19	39	739	1739	3739	3739	78	79	VNAAAA	ZNIAAA	VVVVxx
+6296	5772	0	0	6	16	96	296	296	1296	6296	192	193	EIAAAA	AOIAAA	AAAAxx
+2716	5773	0	0	6	16	16	716	716	2716	2716	32	33	MAAAAA	BOIAAA	HHHHxx
+1130	5774	0	2	0	10	30	130	1130	1130	1130	60	61	MRAAAA	COIAAA	OOOOxx
+5593	5775	1	1	3	13	93	593	1593	593	5593	186	187	DHAAAA	DOIAAA	VVVVxx
+6972	5776	0	0	2	12	72	972	972	1972	6972	144	145	EIAAAA	EOIAAA	AAAAxx
+8360	5777	0	0	0	0	60	360	360	3360	8360	120	121	OJAAAA	FOIAAA	HHHHxx
+6448	5778	0	0	8	8	48	448	448	1448	6448	96	97	AOAAAA	GOIAAA	OOOOxx
+3689	5779	1	1	9	9	89	689	1689	3689	3689	178	179	XLAAAA	HOIAAA	VVVVxx
+7951	5780	1	3	1	11	51	951	1951	2951	7951	102	103	VTAAAA	IOIAAA	AAAAxx
+2974	5781	0	2	4	14	74	974	974	2974	2974	148	149	KKAAAA	JOIAAA	HHHHxx
+6600	5782	0	0	0	0	0	600	600	1600	6600	0	1	WTAAAA	KOIAAA	OOOOxx
+4662	5783	0	2	2	2	62	662	662	4662	4662	124	125	IXAAAA	LOIAAA	VVVVxx
+4765	5784	1	1	5	5	65	765	765	4765	4765	130	131	HBAAAA	MOIAAA	AAAAxx
+355	5785	1	3	5	15	55	355	355	355	355	110	111	RNAAAA	NOIAAA	HHHHxx
+6228	5786	0	0	8	8	28	228	228	1228	6228	56	57	OFAAAA	OOIAAA	OOOOxx
+964	5787	0	0	4	4	64	964	964	964	964	128	129	CLAAAA	POIAAA	VVVVxx
+3082	5788	0	2	2	2	82	82	1082	3082	3082	164	165	OOAAAA	QOIAAA	AAAAxx
+7028	5789	0	0	8	8	28	28	1028	2028	7028	56	57	IKAAAA	ROIAAA	HHHHxx
+4505	5790	1	1	5	5	5	505	505	4505	4505	10	11	HRAAAA	SOIAAA	OOOOxx
+8961	5791	1	1	1	1	61	961	961	3961	8961	122	123	RGAAAA	TOIAAA	VVVVxx
+9571	5792	1	3	1	11	71	571	1571	4571	9571	142	143	DEAAAA	UOIAAA	AAAAxx
+9394	5793	0	2	4	14	94	394	1394	4394	9394	188	189	IXAAAA	VOIAAA	HHHHxx
+4245	5794	1	1	5	5	45	245	245	4245	4245	90	91	HHAAAA	WOIAAA	OOOOxx
+7560	5795	0	0	0	0	60	560	1560	2560	7560	120	121	UEAAAA	XOIAAA	VVVVxx
+2907	5796	1	3	7	7	7	907	907	2907	2907	14	15	VHAAAA	YOIAAA	AAAAxx
+7817	5797	1	1	7	17	17	817	1817	2817	7817	34	35	ROAAAA	ZOIAAA	HHHHxx
+5408	5798	0	0	8	8	8	408	1408	408	5408	16	17	AAAAAA	APIAAA	OOOOxx
+8092	5799	0	0	2	12	92	92	92	3092	8092	184	185	GZAAAA	BPIAAA	VVVVxx
+1309	5800	1	1	9	9	9	309	1309	1309	1309	18	19	JYAAAA	CPIAAA	AAAAxx
+6673	5801	1	1	3	13	73	673	673	1673	6673	146	147	RWAAAA	DPIAAA	HHHHxx
+1245	5802	1	1	5	5	45	245	1245	1245	1245	90	91	XVAAAA	EPIAAA	OOOOxx
+6790	5803	0	2	0	10	90	790	790	1790	6790	180	181	EBAAAA	FPIAAA	VVVVxx
+8380	5804	0	0	0	0	80	380	380	3380	8380	160	161	IKAAAA	GPIAAA	AAAAxx
+5786	5805	0	2	6	6	86	786	1786	786	5786	172	173	OOAAAA	HPIAAA	HHHHxx
+9590	5806	0	2	0	10	90	590	1590	4590	9590	180	181	WEAAAA	IPIAAA	OOOOxx
+5763	5807	1	3	3	3	63	763	1763	763	5763	126	127	RNAAAA	JPIAAA	VVVVxx
+1345	5808	1	1	5	5	45	345	1345	1345	1345	90	91	TZAAAA	KPIAAA	AAAAxx
+3480	5809	0	0	0	0	80	480	1480	3480	3480	160	161	WDAAAA	LPIAAA	HHHHxx
+7864	5810	0	0	4	4	64	864	1864	2864	7864	128	129	MQAAAA	MPIAAA	OOOOxx
+4853	5811	1	1	3	13	53	853	853	4853	4853	106	107	REAAAA	NPIAAA	VVVVxx
+1445	5812	1	1	5	5	45	445	1445	1445	1445	90	91	PDAAAA	OPIAAA	AAAAxx
+170	5813	0	2	0	10	70	170	170	170	170	140	141	OGAAAA	PPIAAA	HHHHxx
+7348	5814	0	0	8	8	48	348	1348	2348	7348	96	97	QWAAAA	QPIAAA	OOOOxx
+3920	5815	0	0	0	0	20	920	1920	3920	3920	40	41	UUAAAA	RPIAAA	VVVVxx
+3307	5816	1	3	7	7	7	307	1307	3307	3307	14	15	FXAAAA	SPIAAA	AAAAxx
+4584	5817	0	0	4	4	84	584	584	4584	4584	168	169	IUAAAA	TPIAAA	HHHHxx
+3344	5818	0	0	4	4	44	344	1344	3344	3344	88	89	QYAAAA	UPIAAA	OOOOxx
+4360	5819	0	0	0	0	60	360	360	4360	4360	120	121	SLAAAA	VPIAAA	VVVVxx
+8757	5820	1	1	7	17	57	757	757	3757	8757	114	115	VYAAAA	WPIAAA	AAAAxx
+4315	5821	1	3	5	15	15	315	315	4315	4315	30	31	ZJAAAA	XPIAAA	HHHHxx
+5243	5822	1	3	3	3	43	243	1243	243	5243	86	87	RTAAAA	YPIAAA	OOOOxx
+8550	5823	0	2	0	10	50	550	550	3550	8550	100	101	WQAAAA	ZPIAAA	VVVVxx
+159	5824	1	3	9	19	59	159	159	159	159	118	119	DGAAAA	AQIAAA	AAAAxx
+4710	5825	0	2	0	10	10	710	710	4710	4710	20	21	EZAAAA	BQIAAA	HHHHxx
+7179	5826	1	3	9	19	79	179	1179	2179	7179	158	159	DQAAAA	CQIAAA	OOOOxx
+2509	5827	1	1	9	9	9	509	509	2509	2509	18	19	NSAAAA	DQIAAA	VVVVxx
+6981	5828	1	1	1	1	81	981	981	1981	6981	162	163	NIAAAA	EQIAAA	AAAAxx
+5060	5829	0	0	0	0	60	60	1060	60	5060	120	121	QMAAAA	FQIAAA	HHHHxx
+5601	5830	1	1	1	1	1	601	1601	601	5601	2	3	LHAAAA	GQIAAA	OOOOxx
+703	5831	1	3	3	3	3	703	703	703	703	6	7	BBAAAA	HQIAAA	VVVVxx
+8719	5832	1	3	9	19	19	719	719	3719	8719	38	39	JXAAAA	IQIAAA	AAAAxx
+1570	5833	0	2	0	10	70	570	1570	1570	1570	140	141	KIAAAA	JQIAAA	HHHHxx
+1036	5834	0	0	6	16	36	36	1036	1036	1036	72	73	WNAAAA	KQIAAA	OOOOxx
+6703	5835	1	3	3	3	3	703	703	1703	6703	6	7	VXAAAA	LQIAAA	VVVVxx
+252	5836	0	0	2	12	52	252	252	252	252	104	105	SJAAAA	MQIAAA	AAAAxx
+631	5837	1	3	1	11	31	631	631	631	631	62	63	HYAAAA	NQIAAA	HHHHxx
+5098	5838	0	2	8	18	98	98	1098	98	5098	196	197	COAAAA	OQIAAA	OOOOxx
+8346	5839	0	2	6	6	46	346	346	3346	8346	92	93	AJAAAA	PQIAAA	VVVVxx
+4910	5840	0	2	0	10	10	910	910	4910	4910	20	21	WGAAAA	QQIAAA	AAAAxx
+559	5841	1	3	9	19	59	559	559	559	559	118	119	NVAAAA	RQIAAA	HHHHxx
+1477	5842	1	1	7	17	77	477	1477	1477	1477	154	155	VEAAAA	SQIAAA	OOOOxx
+5115	5843	1	3	5	15	15	115	1115	115	5115	30	31	TOAAAA	TQIAAA	VVVVxx
+8784	5844	0	0	4	4	84	784	784	3784	8784	168	169	WZAAAA	UQIAAA	AAAAxx
+4422	5845	0	2	2	2	22	422	422	4422	4422	44	45	COAAAA	VQIAAA	HHHHxx
+2702	5846	0	2	2	2	2	702	702	2702	2702	4	5	YZAAAA	WQIAAA	OOOOxx
+9599	5847	1	3	9	19	99	599	1599	4599	9599	198	199	FFAAAA	XQIAAA	VVVVxx
+2463	5848	1	3	3	3	63	463	463	2463	2463	126	127	TQAAAA	YQIAAA	AAAAxx
+498	5849	0	2	8	18	98	498	498	498	498	196	197	ETAAAA	ZQIAAA	HHHHxx
+494	5850	0	2	4	14	94	494	494	494	494	188	189	ATAAAA	ARIAAA	OOOOxx
+8632	5851	0	0	2	12	32	632	632	3632	8632	64	65	AUAAAA	BRIAAA	VVVVxx
+3449	5852	1	1	9	9	49	449	1449	3449	3449	98	99	RCAAAA	CRIAAA	AAAAxx
+5888	5853	0	0	8	8	88	888	1888	888	5888	176	177	MSAAAA	DRIAAA	HHHHxx
+2211	5854	1	3	1	11	11	211	211	2211	2211	22	23	BHAAAA	ERIAAA	OOOOxx
+2835	5855	1	3	5	15	35	835	835	2835	2835	70	71	BFAAAA	FRIAAA	VVVVxx
+4196	5856	0	0	6	16	96	196	196	4196	4196	192	193	KFAAAA	GRIAAA	AAAAxx
+2177	5857	1	1	7	17	77	177	177	2177	2177	154	155	TFAAAA	HRIAAA	HHHHxx
+1959	5858	1	3	9	19	59	959	1959	1959	1959	118	119	JXAAAA	IRIAAA	OOOOxx
+5172	5859	0	0	2	12	72	172	1172	172	5172	144	145	YQAAAA	JRIAAA	VVVVxx
+7898	5860	0	2	8	18	98	898	1898	2898	7898	196	197	URAAAA	KRIAAA	AAAAxx
+5729	5861	1	1	9	9	29	729	1729	729	5729	58	59	JMAAAA	LRIAAA	HHHHxx
+469	5862	1	1	9	9	69	469	469	469	469	138	139	BSAAAA	MRIAAA	OOOOxx
+4456	5863	0	0	6	16	56	456	456	4456	4456	112	113	KPAAAA	NRIAAA	VVVVxx
+3578	5864	0	2	8	18	78	578	1578	3578	3578	156	157	QHAAAA	ORIAAA	AAAAxx
+8623	5865	1	3	3	3	23	623	623	3623	8623	46	47	RTAAAA	PRIAAA	HHHHxx
+6749	5866	1	1	9	9	49	749	749	1749	6749	98	99	PZAAAA	QRIAAA	OOOOxx
+6735	5867	1	3	5	15	35	735	735	1735	6735	70	71	BZAAAA	RRIAAA	VVVVxx
+5197	5868	1	1	7	17	97	197	1197	197	5197	194	195	XRAAAA	SRIAAA	AAAAxx
+2067	5869	1	3	7	7	67	67	67	2067	2067	134	135	NBAAAA	TRIAAA	HHHHxx
+5600	5870	0	0	0	0	0	600	1600	600	5600	0	1	KHAAAA	URIAAA	OOOOxx
+7741	5871	1	1	1	1	41	741	1741	2741	7741	82	83	TLAAAA	VRIAAA	VVVVxx
+9925	5872	1	1	5	5	25	925	1925	4925	9925	50	51	TRAAAA	WRIAAA	AAAAxx
+9685	5873	1	1	5	5	85	685	1685	4685	9685	170	171	NIAAAA	XRIAAA	HHHHxx
+7622	5874	0	2	2	2	22	622	1622	2622	7622	44	45	EHAAAA	YRIAAA	OOOOxx
+6859	5875	1	3	9	19	59	859	859	1859	6859	118	119	VDAAAA	ZRIAAA	VVVVxx
+3094	5876	0	2	4	14	94	94	1094	3094	3094	188	189	APAAAA	ASIAAA	AAAAxx
+2628	5877	0	0	8	8	28	628	628	2628	2628	56	57	CXAAAA	BSIAAA	HHHHxx
+40	5878	0	0	0	0	40	40	40	40	40	80	81	OBAAAA	CSIAAA	OOOOxx
+1644	5879	0	0	4	4	44	644	1644	1644	1644	88	89	GLAAAA	DSIAAA	VVVVxx
+588	5880	0	0	8	8	88	588	588	588	588	176	177	QWAAAA	ESIAAA	AAAAxx
+7522	5881	0	2	2	2	22	522	1522	2522	7522	44	45	IDAAAA	FSIAAA	HHHHxx
+162	5882	0	2	2	2	62	162	162	162	162	124	125	GGAAAA	GSIAAA	OOOOxx
+3610	5883	0	2	0	10	10	610	1610	3610	3610	20	21	WIAAAA	HSIAAA	VVVVxx
+3561	5884	1	1	1	1	61	561	1561	3561	3561	122	123	ZGAAAA	ISIAAA	AAAAxx
+8185	5885	1	1	5	5	85	185	185	3185	8185	170	171	VCAAAA	JSIAAA	HHHHxx
+7237	5886	1	1	7	17	37	237	1237	2237	7237	74	75	JSAAAA	KSIAAA	OOOOxx
+4592	5887	0	0	2	12	92	592	592	4592	4592	184	185	QUAAAA	LSIAAA	VVVVxx
+7082	5888	0	2	2	2	82	82	1082	2082	7082	164	165	KMAAAA	MSIAAA	AAAAxx
+4719	5889	1	3	9	19	19	719	719	4719	4719	38	39	NZAAAA	NSIAAA	HHHHxx
+3879	5890	1	3	9	19	79	879	1879	3879	3879	158	159	FTAAAA	OSIAAA	OOOOxx
+1662	5891	0	2	2	2	62	662	1662	1662	1662	124	125	YLAAAA	PSIAAA	VVVVxx
+3995	5892	1	3	5	15	95	995	1995	3995	3995	190	191	RXAAAA	QSIAAA	AAAAxx
+5828	5893	0	0	8	8	28	828	1828	828	5828	56	57	EQAAAA	RSIAAA	HHHHxx
+4197	5894	1	1	7	17	97	197	197	4197	4197	194	195	LFAAAA	SSIAAA	OOOOxx
+5146	5895	0	2	6	6	46	146	1146	146	5146	92	93	YPAAAA	TSIAAA	VVVVxx
+753	5896	1	1	3	13	53	753	753	753	753	106	107	ZCAAAA	USIAAA	AAAAxx
+7064	5897	0	0	4	4	64	64	1064	2064	7064	128	129	SLAAAA	VSIAAA	HHHHxx
+1312	5898	0	0	2	12	12	312	1312	1312	1312	24	25	MYAAAA	WSIAAA	OOOOxx
+5573	5899	1	1	3	13	73	573	1573	573	5573	146	147	JGAAAA	XSIAAA	VVVVxx
+7634	5900	0	2	4	14	34	634	1634	2634	7634	68	69	QHAAAA	YSIAAA	AAAAxx
+2459	5901	1	3	9	19	59	459	459	2459	2459	118	119	PQAAAA	ZSIAAA	HHHHxx
+8636	5902	0	0	6	16	36	636	636	3636	8636	72	73	EUAAAA	ATIAAA	OOOOxx
+5318	5903	0	2	8	18	18	318	1318	318	5318	36	37	OWAAAA	BTIAAA	VVVVxx
+1064	5904	0	0	4	4	64	64	1064	1064	1064	128	129	YOAAAA	CTIAAA	AAAAxx
+9779	5905	1	3	9	19	79	779	1779	4779	9779	158	159	DMAAAA	DTIAAA	HHHHxx
+6512	5906	0	0	2	12	12	512	512	1512	6512	24	25	MQAAAA	ETIAAA	OOOOxx
+3572	5907	0	0	2	12	72	572	1572	3572	3572	144	145	KHAAAA	FTIAAA	VVVVxx
+816	5908	0	0	6	16	16	816	816	816	816	32	33	KFAAAA	GTIAAA	AAAAxx
+3978	5909	0	2	8	18	78	978	1978	3978	3978	156	157	AXAAAA	HTIAAA	HHHHxx
+5390	5910	0	2	0	10	90	390	1390	390	5390	180	181	IZAAAA	ITIAAA	OOOOxx
+4685	5911	1	1	5	5	85	685	685	4685	4685	170	171	FYAAAA	JTIAAA	VVVVxx
+3003	5912	1	3	3	3	3	3	1003	3003	3003	6	7	NLAAAA	KTIAAA	AAAAxx
+2638	5913	0	2	8	18	38	638	638	2638	2638	76	77	MXAAAA	LTIAAA	HHHHxx
+9716	5914	0	0	6	16	16	716	1716	4716	9716	32	33	SJAAAA	MTIAAA	OOOOxx
+9598	5915	0	2	8	18	98	598	1598	4598	9598	196	197	EFAAAA	NTIAAA	VVVVxx
+9501	5916	1	1	1	1	1	501	1501	4501	9501	2	3	LBAAAA	OTIAAA	AAAAxx
+1704	5917	0	0	4	4	4	704	1704	1704	1704	8	9	ONAAAA	PTIAAA	HHHHxx
+8609	5918	1	1	9	9	9	609	609	3609	8609	18	19	DTAAAA	QTIAAA	OOOOxx
+5211	5919	1	3	1	11	11	211	1211	211	5211	22	23	LSAAAA	RTIAAA	VVVVxx
+3605	5920	1	1	5	5	5	605	1605	3605	3605	10	11	RIAAAA	STIAAA	AAAAxx
+8730	5921	0	2	0	10	30	730	730	3730	8730	60	61	UXAAAA	TTIAAA	HHHHxx
+4208	5922	0	0	8	8	8	208	208	4208	4208	16	17	WFAAAA	UTIAAA	OOOOxx
+7784	5923	0	0	4	4	84	784	1784	2784	7784	168	169	KNAAAA	VTIAAA	VVVVxx
+7501	5924	1	1	1	1	1	501	1501	2501	7501	2	3	NCAAAA	WTIAAA	AAAAxx
+7862	5925	0	2	2	2	62	862	1862	2862	7862	124	125	KQAAAA	XTIAAA	HHHHxx
+8922	5926	0	2	2	2	22	922	922	3922	8922	44	45	EFAAAA	YTIAAA	OOOOxx
+3857	5927	1	1	7	17	57	857	1857	3857	3857	114	115	JSAAAA	ZTIAAA	VVVVxx
+6393	5928	1	1	3	13	93	393	393	1393	6393	186	187	XLAAAA	AUIAAA	AAAAxx
+506	5929	0	2	6	6	6	506	506	506	506	12	13	MTAAAA	BUIAAA	HHHHxx
+4232	5930	0	0	2	12	32	232	232	4232	4232	64	65	UGAAAA	CUIAAA	OOOOxx
+8991	5931	1	3	1	11	91	991	991	3991	8991	182	183	VHAAAA	DUIAAA	VVVVxx
+8578	5932	0	2	8	18	78	578	578	3578	8578	156	157	YRAAAA	EUIAAA	AAAAxx
+3235	5933	1	3	5	15	35	235	1235	3235	3235	70	71	LUAAAA	FUIAAA	HHHHxx
+963	5934	1	3	3	3	63	963	963	963	963	126	127	BLAAAA	GUIAAA	OOOOxx
+113	5935	1	1	3	13	13	113	113	113	113	26	27	JEAAAA	HUIAAA	VVVVxx
+8234	5936	0	2	4	14	34	234	234	3234	8234	68	69	SEAAAA	IUIAAA	AAAAxx
+2613	5937	1	1	3	13	13	613	613	2613	2613	26	27	NWAAAA	JUIAAA	HHHHxx
+5540	5938	0	0	0	0	40	540	1540	540	5540	80	81	CFAAAA	KUIAAA	OOOOxx
+9727	5939	1	3	7	7	27	727	1727	4727	9727	54	55	DKAAAA	LUIAAA	VVVVxx
+2229	5940	1	1	9	9	29	229	229	2229	2229	58	59	THAAAA	MUIAAA	AAAAxx
+6242	5941	0	2	2	2	42	242	242	1242	6242	84	85	CGAAAA	NUIAAA	HHHHxx
+2502	5942	0	2	2	2	2	502	502	2502	2502	4	5	GSAAAA	OUIAAA	OOOOxx
+6212	5943	0	0	2	12	12	212	212	1212	6212	24	25	YEAAAA	PUIAAA	VVVVxx
+3495	5944	1	3	5	15	95	495	1495	3495	3495	190	191	LEAAAA	QUIAAA	AAAAxx
+2364	5945	0	0	4	4	64	364	364	2364	2364	128	129	YMAAAA	RUIAAA	HHHHxx
+6777	5946	1	1	7	17	77	777	777	1777	6777	154	155	RAAAAA	SUIAAA	OOOOxx
+9811	5947	1	3	1	11	11	811	1811	4811	9811	22	23	JNAAAA	TUIAAA	VVVVxx
+1450	5948	0	2	0	10	50	450	1450	1450	1450	100	101	UDAAAA	UUIAAA	AAAAxx
+5008	5949	0	0	8	8	8	8	1008	8	5008	16	17	QKAAAA	VUIAAA	HHHHxx
+1318	5950	0	2	8	18	18	318	1318	1318	1318	36	37	SYAAAA	WUIAAA	OOOOxx
+3373	5951	1	1	3	13	73	373	1373	3373	3373	146	147	TZAAAA	XUIAAA	VVVVxx
+398	5952	0	2	8	18	98	398	398	398	398	196	197	IPAAAA	YUIAAA	AAAAxx
+3804	5953	0	0	4	4	4	804	1804	3804	3804	8	9	IQAAAA	ZUIAAA	HHHHxx
+9148	5954	0	0	8	8	48	148	1148	4148	9148	96	97	WNAAAA	AVIAAA	OOOOxx
+4382	5955	0	2	2	2	82	382	382	4382	4382	164	165	OMAAAA	BVIAAA	VVVVxx
+4026	5956	0	2	6	6	26	26	26	4026	4026	52	53	WYAAAA	CVIAAA	AAAAxx
+7804	5957	0	0	4	4	4	804	1804	2804	7804	8	9	EOAAAA	DVIAAA	HHHHxx
+6839	5958	1	3	9	19	39	839	839	1839	6839	78	79	BDAAAA	EVIAAA	OOOOxx
+3756	5959	0	0	6	16	56	756	1756	3756	3756	112	113	MOAAAA	FVIAAA	VVVVxx
+6734	5960	0	2	4	14	34	734	734	1734	6734	68	69	AZAAAA	GVIAAA	AAAAxx
+2228	5961	0	0	8	8	28	228	228	2228	2228	56	57	SHAAAA	HVIAAA	HHHHxx
+3273	5962	1	1	3	13	73	273	1273	3273	3273	146	147	XVAAAA	IVIAAA	OOOOxx
+3708	5963	0	0	8	8	8	708	1708	3708	3708	16	17	QMAAAA	JVIAAA	VVVVxx
+4320	5964	0	0	0	0	20	320	320	4320	4320	40	41	EKAAAA	KVIAAA	AAAAxx
+74	5965	0	2	4	14	74	74	74	74	74	148	149	WCAAAA	LVIAAA	HHHHxx
+2520	5966	0	0	0	0	20	520	520	2520	2520	40	41	YSAAAA	MVIAAA	OOOOxx
+9619	5967	1	3	9	19	19	619	1619	4619	9619	38	39	ZFAAAA	NVIAAA	VVVVxx
+1801	5968	1	1	1	1	1	801	1801	1801	1801	2	3	HRAAAA	OVIAAA	AAAAxx
+6399	5969	1	3	9	19	99	399	399	1399	6399	198	199	DMAAAA	PVIAAA	HHHHxx
+8313	5970	1	1	3	13	13	313	313	3313	8313	26	27	THAAAA	QVIAAA	OOOOxx
+7003	5971	1	3	3	3	3	3	1003	2003	7003	6	7	JJAAAA	RVIAAA	VVVVxx
+329	5972	1	1	9	9	29	329	329	329	329	58	59	RMAAAA	SVIAAA	AAAAxx
+9090	5973	0	2	0	10	90	90	1090	4090	9090	180	181	QLAAAA	TVIAAA	HHHHxx
+2299	5974	1	3	9	19	99	299	299	2299	2299	198	199	LKAAAA	UVIAAA	OOOOxx
+3925	5975	1	1	5	5	25	925	1925	3925	3925	50	51	ZUAAAA	VVIAAA	VVVVxx
+8145	5976	1	1	5	5	45	145	145	3145	8145	90	91	HBAAAA	WVIAAA	AAAAxx
+8561	5977	1	1	1	1	61	561	561	3561	8561	122	123	HRAAAA	XVIAAA	HHHHxx
+2797	5978	1	1	7	17	97	797	797	2797	2797	194	195	PDAAAA	YVIAAA	OOOOxx
+1451	5979	1	3	1	11	51	451	1451	1451	1451	102	103	VDAAAA	ZVIAAA	VVVVxx
+7977	5980	1	1	7	17	77	977	1977	2977	7977	154	155	VUAAAA	AWIAAA	AAAAxx
+112	5981	0	0	2	12	12	112	112	112	112	24	25	IEAAAA	BWIAAA	HHHHxx
+5265	5982	1	1	5	5	65	265	1265	265	5265	130	131	NUAAAA	CWIAAA	OOOOxx
+3819	5983	1	3	9	19	19	819	1819	3819	3819	38	39	XQAAAA	DWIAAA	VVVVxx
+3648	5984	0	0	8	8	48	648	1648	3648	3648	96	97	IKAAAA	EWIAAA	AAAAxx
+6306	5985	0	2	6	6	6	306	306	1306	6306	12	13	OIAAAA	FWIAAA	HHHHxx
+2385	5986	1	1	5	5	85	385	385	2385	2385	170	171	TNAAAA	GWIAAA	OOOOxx
+9084	5987	0	0	4	4	84	84	1084	4084	9084	168	169	KLAAAA	HWIAAA	VVVVxx
+4499	5988	1	3	9	19	99	499	499	4499	4499	198	199	BRAAAA	IWIAAA	AAAAxx
+1154	5989	0	2	4	14	54	154	1154	1154	1154	108	109	KSAAAA	JWIAAA	HHHHxx
+6800	5990	0	0	0	0	0	800	800	1800	6800	0	1	OBAAAA	KWIAAA	OOOOxx
+8049	5991	1	1	9	9	49	49	49	3049	8049	98	99	PXAAAA	LWIAAA	VVVVxx
+3733	5992	1	1	3	13	33	733	1733	3733	3733	66	67	PNAAAA	MWIAAA	AAAAxx
+8496	5993	0	0	6	16	96	496	496	3496	8496	192	193	UOAAAA	NWIAAA	HHHHxx
+9952	5994	0	0	2	12	52	952	1952	4952	9952	104	105	USAAAA	OWIAAA	OOOOxx
+9792	5995	0	0	2	12	92	792	1792	4792	9792	184	185	QMAAAA	PWIAAA	VVVVxx
+5081	5996	1	1	1	1	81	81	1081	81	5081	162	163	LNAAAA	QWIAAA	AAAAxx
+7908	5997	0	0	8	8	8	908	1908	2908	7908	16	17	ESAAAA	RWIAAA	HHHHxx
+5398	5998	0	2	8	18	98	398	1398	398	5398	196	197	QZAAAA	SWIAAA	OOOOxx
+8423	5999	1	3	3	3	23	423	423	3423	8423	46	47	ZLAAAA	TWIAAA	VVVVxx
+3362	6000	0	2	2	2	62	362	1362	3362	3362	124	125	IZAAAA	UWIAAA	AAAAxx
+7767	6001	1	3	7	7	67	767	1767	2767	7767	134	135	TMAAAA	VWIAAA	HHHHxx
+7063	6002	1	3	3	3	63	63	1063	2063	7063	126	127	RLAAAA	WWIAAA	OOOOxx
+8350	6003	0	2	0	10	50	350	350	3350	8350	100	101	EJAAAA	XWIAAA	VVVVxx
+6779	6004	1	3	9	19	79	779	779	1779	6779	158	159	TAAAAA	YWIAAA	AAAAxx
+5742	6005	0	2	2	2	42	742	1742	742	5742	84	85	WMAAAA	ZWIAAA	HHHHxx
+9045	6006	1	1	5	5	45	45	1045	4045	9045	90	91	XJAAAA	AXIAAA	OOOOxx
+8792	6007	0	0	2	12	92	792	792	3792	8792	184	185	EAAAAA	BXIAAA	VVVVxx
+8160	6008	0	0	0	0	60	160	160	3160	8160	120	121	WBAAAA	CXIAAA	AAAAxx
+3061	6009	1	1	1	1	61	61	1061	3061	3061	122	123	TNAAAA	DXIAAA	HHHHxx
+4721	6010	1	1	1	1	21	721	721	4721	4721	42	43	PZAAAA	EXIAAA	OOOOxx
+9817	6011	1	1	7	17	17	817	1817	4817	9817	34	35	PNAAAA	FXIAAA	VVVVxx
+9257	6012	1	1	7	17	57	257	1257	4257	9257	114	115	BSAAAA	GXIAAA	AAAAxx
+7779	6013	1	3	9	19	79	779	1779	2779	7779	158	159	FNAAAA	HXIAAA	HHHHxx
+2663	6014	1	3	3	3	63	663	663	2663	2663	126	127	LYAAAA	IXIAAA	OOOOxx
+3885	6015	1	1	5	5	85	885	1885	3885	3885	170	171	LTAAAA	JXIAAA	VVVVxx
+9469	6016	1	1	9	9	69	469	1469	4469	9469	138	139	FAAAAA	KXIAAA	AAAAxx
+6766	6017	0	2	6	6	66	766	766	1766	6766	132	133	GAAAAA	LXIAAA	HHHHxx
+7173	6018	1	1	3	13	73	173	1173	2173	7173	146	147	XPAAAA	MXIAAA	OOOOxx
+4709	6019	1	1	9	9	9	709	709	4709	4709	18	19	DZAAAA	NXIAAA	VVVVxx
+4210	6020	0	2	0	10	10	210	210	4210	4210	20	21	YFAAAA	OXIAAA	AAAAxx
+3715	6021	1	3	5	15	15	715	1715	3715	3715	30	31	XMAAAA	PXIAAA	HHHHxx
+5089	6022	1	1	9	9	89	89	1089	89	5089	178	179	TNAAAA	QXIAAA	OOOOxx
+1639	6023	1	3	9	19	39	639	1639	1639	1639	78	79	BLAAAA	RXIAAA	VVVVxx
+5757	6024	1	1	7	17	57	757	1757	757	5757	114	115	LNAAAA	SXIAAA	AAAAxx
+3545	6025	1	1	5	5	45	545	1545	3545	3545	90	91	JGAAAA	TXIAAA	HHHHxx
+709	6026	1	1	9	9	9	709	709	709	709	18	19	HBAAAA	UXIAAA	OOOOxx
+6519	6027	1	3	9	19	19	519	519	1519	6519	38	39	TQAAAA	VXIAAA	VVVVxx
+4341	6028	1	1	1	1	41	341	341	4341	4341	82	83	ZKAAAA	WXIAAA	AAAAxx
+2381	6029	1	1	1	1	81	381	381	2381	2381	162	163	PNAAAA	XXIAAA	HHHHxx
+7215	6030	1	3	5	15	15	215	1215	2215	7215	30	31	NRAAAA	YXIAAA	OOOOxx
+9323	6031	1	3	3	3	23	323	1323	4323	9323	46	47	PUAAAA	ZXIAAA	VVVVxx
+3593	6032	1	1	3	13	93	593	1593	3593	3593	186	187	FIAAAA	AYIAAA	AAAAxx
+3123	6033	1	3	3	3	23	123	1123	3123	3123	46	47	DQAAAA	BYIAAA	HHHHxx
+8673	6034	1	1	3	13	73	673	673	3673	8673	146	147	PVAAAA	CYIAAA	OOOOxx
+5094	6035	0	2	4	14	94	94	1094	94	5094	188	189	YNAAAA	DYIAAA	VVVVxx
+6477	6036	1	1	7	17	77	477	477	1477	6477	154	155	DPAAAA	EYIAAA	AAAAxx
+9734	6037	0	2	4	14	34	734	1734	4734	9734	68	69	KKAAAA	FYIAAA	HHHHxx
+2998	6038	0	2	8	18	98	998	998	2998	2998	196	197	ILAAAA	GYIAAA	OOOOxx
+7807	6039	1	3	7	7	7	807	1807	2807	7807	14	15	HOAAAA	HYIAAA	VVVVxx
+5739	6040	1	3	9	19	39	739	1739	739	5739	78	79	TMAAAA	IYIAAA	AAAAxx
+138	6041	0	2	8	18	38	138	138	138	138	76	77	IFAAAA	JYIAAA	HHHHxx
+2403	6042	1	3	3	3	3	403	403	2403	2403	6	7	LOAAAA	KYIAAA	OOOOxx
+2484	6043	0	0	4	4	84	484	484	2484	2484	168	169	ORAAAA	LYIAAA	VVVVxx
+2805	6044	1	1	5	5	5	805	805	2805	2805	10	11	XDAAAA	MYIAAA	AAAAxx
+5189	6045	1	1	9	9	89	189	1189	189	5189	178	179	PRAAAA	NYIAAA	HHHHxx
+8336	6046	0	0	6	16	36	336	336	3336	8336	72	73	QIAAAA	OYIAAA	OOOOxx
+5241	6047	1	1	1	1	41	241	1241	241	5241	82	83	PTAAAA	PYIAAA	VVVVxx
+2612	6048	0	0	2	12	12	612	612	2612	2612	24	25	MWAAAA	QYIAAA	AAAAxx
+2571	6049	1	3	1	11	71	571	571	2571	2571	142	143	XUAAAA	RYIAAA	HHHHxx
+926	6050	0	2	6	6	26	926	926	926	926	52	53	QJAAAA	SYIAAA	OOOOxx
+337	6051	1	1	7	17	37	337	337	337	337	74	75	ZMAAAA	TYIAAA	VVVVxx
+2821	6052	1	1	1	1	21	821	821	2821	2821	42	43	NEAAAA	UYIAAA	AAAAxx
+2658	6053	0	2	8	18	58	658	658	2658	2658	116	117	GYAAAA	VYIAAA	HHHHxx
+9054	6054	0	2	4	14	54	54	1054	4054	9054	108	109	GKAAAA	WYIAAA	OOOOxx
+5492	6055	0	0	2	12	92	492	1492	492	5492	184	185	GDAAAA	XYIAAA	VVVVxx
+7313	6056	1	1	3	13	13	313	1313	2313	7313	26	27	HVAAAA	YYIAAA	AAAAxx
+75	6057	1	3	5	15	75	75	75	75	75	150	151	XCAAAA	ZYIAAA	HHHHxx
+5489	6058	1	1	9	9	89	489	1489	489	5489	178	179	DDAAAA	AZIAAA	OOOOxx
+8413	6059	1	1	3	13	13	413	413	3413	8413	26	27	PLAAAA	BZIAAA	VVVVxx
+3693	6060	1	1	3	13	93	693	1693	3693	3693	186	187	BMAAAA	CZIAAA	AAAAxx
+9820	6061	0	0	0	0	20	820	1820	4820	9820	40	41	SNAAAA	DZIAAA	HHHHxx
+8157	6062	1	1	7	17	57	157	157	3157	8157	114	115	TBAAAA	EZIAAA	OOOOxx
+4161	6063	1	1	1	1	61	161	161	4161	4161	122	123	BEAAAA	FZIAAA	VVVVxx
+8339	6064	1	3	9	19	39	339	339	3339	8339	78	79	TIAAAA	GZIAAA	AAAAxx
+4141	6065	1	1	1	1	41	141	141	4141	4141	82	83	HDAAAA	HZIAAA	HHHHxx
+9001	6066	1	1	1	1	1	1	1001	4001	9001	2	3	FIAAAA	IZIAAA	OOOOxx
+8247	6067	1	3	7	7	47	247	247	3247	8247	94	95	FFAAAA	JZIAAA	VVVVxx
+1182	6068	0	2	2	2	82	182	1182	1182	1182	164	165	MTAAAA	KZIAAA	AAAAxx
+9876	6069	0	0	6	16	76	876	1876	4876	9876	152	153	WPAAAA	LZIAAA	HHHHxx
+4302	6070	0	2	2	2	2	302	302	4302	4302	4	5	MJAAAA	MZIAAA	OOOOxx
+6674	6071	0	2	4	14	74	674	674	1674	6674	148	149	SWAAAA	NZIAAA	VVVVxx
+4214	6072	0	2	4	14	14	214	214	4214	4214	28	29	CGAAAA	OZIAAA	AAAAxx
+5584	6073	0	0	4	4	84	584	1584	584	5584	168	169	UGAAAA	PZIAAA	HHHHxx
+265	6074	1	1	5	5	65	265	265	265	265	130	131	FKAAAA	QZIAAA	OOOOxx
+9207	6075	1	3	7	7	7	207	1207	4207	9207	14	15	DQAAAA	RZIAAA	VVVVxx
+9434	6076	0	2	4	14	34	434	1434	4434	9434	68	69	WYAAAA	SZIAAA	AAAAxx
+2921	6077	1	1	1	1	21	921	921	2921	2921	42	43	JIAAAA	TZIAAA	HHHHxx
+9355	6078	1	3	5	15	55	355	1355	4355	9355	110	111	VVAAAA	UZIAAA	OOOOxx
+8538	6079	0	2	8	18	38	538	538	3538	8538	76	77	KQAAAA	VZIAAA	VVVVxx
+4559	6080	1	3	9	19	59	559	559	4559	4559	118	119	JTAAAA	WZIAAA	AAAAxx
+9175	6081	1	3	5	15	75	175	1175	4175	9175	150	151	XOAAAA	XZIAAA	HHHHxx
+4489	6082	1	1	9	9	89	489	489	4489	4489	178	179	RQAAAA	YZIAAA	OOOOxx
+1485	6083	1	1	5	5	85	485	1485	1485	1485	170	171	DFAAAA	ZZIAAA	VVVVxx
+8853	6084	1	1	3	13	53	853	853	3853	8853	106	107	NCAAAA	AAJAAA	AAAAxx
+9143	6085	1	3	3	3	43	143	1143	4143	9143	86	87	RNAAAA	BAJAAA	HHHHxx
+9551	6086	1	3	1	11	51	551	1551	4551	9551	102	103	JDAAAA	CAJAAA	OOOOxx
+49	6087	1	1	9	9	49	49	49	49	49	98	99	XBAAAA	DAJAAA	VVVVxx
+8351	6088	1	3	1	11	51	351	351	3351	8351	102	103	FJAAAA	EAJAAA	AAAAxx
+9748	6089	0	0	8	8	48	748	1748	4748	9748	96	97	YKAAAA	FAJAAA	HHHHxx
+4536	6090	0	0	6	16	36	536	536	4536	4536	72	73	MSAAAA	GAJAAA	OOOOxx
+930	6091	0	2	0	10	30	930	930	930	930	60	61	UJAAAA	HAJAAA	VVVVxx
+2206	6092	0	2	6	6	6	206	206	2206	2206	12	13	WGAAAA	IAJAAA	AAAAxx
+8004	6093	0	0	4	4	4	4	4	3004	8004	8	9	WVAAAA	JAJAAA	HHHHxx
+219	6094	1	3	9	19	19	219	219	219	219	38	39	LIAAAA	KAJAAA	OOOOxx
+2724	6095	0	0	4	4	24	724	724	2724	2724	48	49	UAAAAA	LAJAAA	VVVVxx
+4868	6096	0	0	8	8	68	868	868	4868	4868	136	137	GFAAAA	MAJAAA	AAAAxx
+5952	6097	0	0	2	12	52	952	1952	952	5952	104	105	YUAAAA	NAJAAA	HHHHxx
+2094	6098	0	2	4	14	94	94	94	2094	2094	188	189	OCAAAA	OAJAAA	OOOOxx
+5707	6099	1	3	7	7	7	707	1707	707	5707	14	15	NLAAAA	PAJAAA	VVVVxx
+5200	6100	0	0	0	0	0	200	1200	200	5200	0	1	ASAAAA	QAJAAA	AAAAxx
+967	6101	1	3	7	7	67	967	967	967	967	134	135	FLAAAA	RAJAAA	HHHHxx
+1982	6102	0	2	2	2	82	982	1982	1982	1982	164	165	GYAAAA	SAJAAA	OOOOxx
+3410	6103	0	2	0	10	10	410	1410	3410	3410	20	21	EBAAAA	TAJAAA	VVVVxx
+174	6104	0	2	4	14	74	174	174	174	174	148	149	SGAAAA	UAJAAA	AAAAxx
+9217	6105	1	1	7	17	17	217	1217	4217	9217	34	35	NQAAAA	VAJAAA	HHHHxx
+9103	6106	1	3	3	3	3	103	1103	4103	9103	6	7	DMAAAA	WAJAAA	OOOOxx
+868	6107	0	0	8	8	68	868	868	868	868	136	137	KHAAAA	XAJAAA	VVVVxx
+8261	6108	1	1	1	1	61	261	261	3261	8261	122	123	TFAAAA	YAJAAA	AAAAxx
+2720	6109	0	0	0	0	20	720	720	2720	2720	40	41	QAAAAA	ZAJAAA	HHHHxx
+2999	6110	1	3	9	19	99	999	999	2999	2999	198	199	JLAAAA	ABJAAA	OOOOxx
+769	6111	1	1	9	9	69	769	769	769	769	138	139	PDAAAA	BBJAAA	VVVVxx
+4533	6112	1	1	3	13	33	533	533	4533	4533	66	67	JSAAAA	CBJAAA	AAAAxx
+2030	6113	0	2	0	10	30	30	30	2030	2030	60	61	CAAAAA	DBJAAA	HHHHxx
+5824	6114	0	0	4	4	24	824	1824	824	5824	48	49	AQAAAA	EBJAAA	OOOOxx
+2328	6115	0	0	8	8	28	328	328	2328	2328	56	57	OLAAAA	FBJAAA	VVVVxx
+9970	6116	0	2	0	10	70	970	1970	4970	9970	140	141	MTAAAA	GBJAAA	AAAAxx
+3192	6117	0	0	2	12	92	192	1192	3192	3192	184	185	USAAAA	HBJAAA	HHHHxx
+3387	6118	1	3	7	7	87	387	1387	3387	3387	174	175	HAAAAA	IBJAAA	OOOOxx
+1936	6119	0	0	6	16	36	936	1936	1936	1936	72	73	MWAAAA	JBJAAA	VVVVxx
+6934	6120	0	2	4	14	34	934	934	1934	6934	68	69	SGAAAA	KBJAAA	AAAAxx
+5615	6121	1	3	5	15	15	615	1615	615	5615	30	31	ZHAAAA	LBJAAA	HHHHxx
+2241	6122	1	1	1	1	41	241	241	2241	2241	82	83	FIAAAA	MBJAAA	OOOOxx
+1842	6123	0	2	2	2	42	842	1842	1842	1842	84	85	WSAAAA	NBJAAA	VVVVxx
+8044	6124	0	0	4	4	44	44	44	3044	8044	88	89	KXAAAA	OBJAAA	AAAAxx
+8902	6125	0	2	2	2	2	902	902	3902	8902	4	5	KEAAAA	PBJAAA	HHHHxx
+4519	6126	1	3	9	19	19	519	519	4519	4519	38	39	VRAAAA	QBJAAA	OOOOxx
+492	6127	0	0	2	12	92	492	492	492	492	184	185	YSAAAA	RBJAAA	VVVVxx
+2694	6128	0	2	4	14	94	694	694	2694	2694	188	189	QZAAAA	SBJAAA	AAAAxx
+5861	6129	1	1	1	1	61	861	1861	861	5861	122	123	LRAAAA	TBJAAA	HHHHxx
+2104	6130	0	0	4	4	4	104	104	2104	2104	8	9	YCAAAA	UBJAAA	OOOOxx
+5376	6131	0	0	6	16	76	376	1376	376	5376	152	153	UYAAAA	VBJAAA	VVVVxx
+3147	6132	1	3	7	7	47	147	1147	3147	3147	94	95	BRAAAA	WBJAAA	AAAAxx
+9880	6133	0	0	0	0	80	880	1880	4880	9880	160	161	AQAAAA	XBJAAA	HHHHxx
+6171	6134	1	3	1	11	71	171	171	1171	6171	142	143	JDAAAA	YBJAAA	OOOOxx
+1850	6135	0	2	0	10	50	850	1850	1850	1850	100	101	ETAAAA	ZBJAAA	VVVVxx
+1775	6136	1	3	5	15	75	775	1775	1775	1775	150	151	HQAAAA	ACJAAA	AAAAxx
+9261	6137	1	1	1	1	61	261	1261	4261	9261	122	123	FSAAAA	BCJAAA	HHHHxx
+9648	6138	0	0	8	8	48	648	1648	4648	9648	96	97	CHAAAA	CCJAAA	OOOOxx
+7846	6139	0	2	6	6	46	846	1846	2846	7846	92	93	UPAAAA	DCJAAA	VVVVxx
+1446	6140	0	2	6	6	46	446	1446	1446	1446	92	93	QDAAAA	ECJAAA	AAAAxx
+3139	6141	1	3	9	19	39	139	1139	3139	3139	78	79	TQAAAA	FCJAAA	HHHHxx
+6142	6142	0	2	2	2	42	142	142	1142	6142	84	85	GCAAAA	GCJAAA	OOOOxx
+5812	6143	0	0	2	12	12	812	1812	812	5812	24	25	OPAAAA	HCJAAA	VVVVxx
+6728	6144	0	0	8	8	28	728	728	1728	6728	56	57	UYAAAA	ICJAAA	AAAAxx
+4428	6145	0	0	8	8	28	428	428	4428	4428	56	57	IOAAAA	JCJAAA	HHHHxx
+502	6146	0	2	2	2	2	502	502	502	502	4	5	ITAAAA	KCJAAA	OOOOxx
+2363	6147	1	3	3	3	63	363	363	2363	2363	126	127	XMAAAA	LCJAAA	VVVVxx
+3808	6148	0	0	8	8	8	808	1808	3808	3808	16	17	MQAAAA	MCJAAA	AAAAxx
+1010	6149	0	2	0	10	10	10	1010	1010	1010	20	21	WMAAAA	NCJAAA	HHHHxx
+9565	6150	1	1	5	5	65	565	1565	4565	9565	130	131	XDAAAA	OCJAAA	OOOOxx
+1587	6151	1	3	7	7	87	587	1587	1587	1587	174	175	BJAAAA	PCJAAA	VVVVxx
+1474	6152	0	2	4	14	74	474	1474	1474	1474	148	149	SEAAAA	QCJAAA	AAAAxx
+6215	6153	1	3	5	15	15	215	215	1215	6215	30	31	BFAAAA	RCJAAA	HHHHxx
+2395	6154	1	3	5	15	95	395	395	2395	2395	190	191	DOAAAA	SCJAAA	OOOOxx
+8753	6155	1	1	3	13	53	753	753	3753	8753	106	107	RYAAAA	TCJAAA	VVVVxx
+2446	6156	0	2	6	6	46	446	446	2446	2446	92	93	CQAAAA	UCJAAA	AAAAxx
+60	6157	0	0	0	0	60	60	60	60	60	120	121	ICAAAA	VCJAAA	HHHHxx
+982	6158	0	2	2	2	82	982	982	982	982	164	165	ULAAAA	WCJAAA	OOOOxx
+6489	6159	1	1	9	9	89	489	489	1489	6489	178	179	PPAAAA	XCJAAA	VVVVxx
+5334	6160	0	2	4	14	34	334	1334	334	5334	68	69	EXAAAA	YCJAAA	AAAAxx
+8540	6161	0	0	0	0	40	540	540	3540	8540	80	81	MQAAAA	ZCJAAA	HHHHxx
+490	6162	0	2	0	10	90	490	490	490	490	180	181	WSAAAA	ADJAAA	OOOOxx
+6763	6163	1	3	3	3	63	763	763	1763	6763	126	127	DAAAAA	BDJAAA	VVVVxx
+8273	6164	1	1	3	13	73	273	273	3273	8273	146	147	FGAAAA	CDJAAA	AAAAxx
+8327	6165	1	3	7	7	27	327	327	3327	8327	54	55	HIAAAA	DDJAAA	HHHHxx
+8541	6166	1	1	1	1	41	541	541	3541	8541	82	83	NQAAAA	EDJAAA	OOOOxx
+3459	6167	1	3	9	19	59	459	1459	3459	3459	118	119	BDAAAA	FDJAAA	VVVVxx
+5557	6168	1	1	7	17	57	557	1557	557	5557	114	115	TFAAAA	GDJAAA	AAAAxx
+158	6169	0	2	8	18	58	158	158	158	158	116	117	CGAAAA	HDJAAA	HHHHxx
+1741	6170	1	1	1	1	41	741	1741	1741	1741	82	83	ZOAAAA	IDJAAA	OOOOxx
+8385	6171	1	1	5	5	85	385	385	3385	8385	170	171	NKAAAA	JDJAAA	VVVVxx
+617	6172	1	1	7	17	17	617	617	617	617	34	35	TXAAAA	KDJAAA	AAAAxx
+3560	6173	0	0	0	0	60	560	1560	3560	3560	120	121	YGAAAA	LDJAAA	HHHHxx
+5216	6174	0	0	6	16	16	216	1216	216	5216	32	33	QSAAAA	MDJAAA	OOOOxx
+8443	6175	1	3	3	3	43	443	443	3443	8443	86	87	TMAAAA	NDJAAA	VVVVxx
+2700	6176	0	0	0	0	0	700	700	2700	2700	0	1	WZAAAA	ODJAAA	AAAAxx
+3661	6177	1	1	1	1	61	661	1661	3661	3661	122	123	VKAAAA	PDJAAA	HHHHxx
+4875	6178	1	3	5	15	75	875	875	4875	4875	150	151	NFAAAA	QDJAAA	OOOOxx
+6721	6179	1	1	1	1	21	721	721	1721	6721	42	43	NYAAAA	RDJAAA	VVVVxx
+3659	6180	1	3	9	19	59	659	1659	3659	3659	118	119	TKAAAA	SDJAAA	AAAAxx
+8944	6181	0	0	4	4	44	944	944	3944	8944	88	89	AGAAAA	TDJAAA	HHHHxx
+9133	6182	1	1	3	13	33	133	1133	4133	9133	66	67	HNAAAA	UDJAAA	OOOOxx
+9882	6183	0	2	2	2	82	882	1882	4882	9882	164	165	CQAAAA	VDJAAA	VVVVxx
+2102	6184	0	2	2	2	2	102	102	2102	2102	4	5	WCAAAA	WDJAAA	AAAAxx
+9445	6185	1	1	5	5	45	445	1445	4445	9445	90	91	HZAAAA	XDJAAA	HHHHxx
+5559	6186	1	3	9	19	59	559	1559	559	5559	118	119	VFAAAA	YDJAAA	OOOOxx
+6096	6187	0	0	6	16	96	96	96	1096	6096	192	193	MAAAAA	ZDJAAA	VVVVxx
+9336	6188	0	0	6	16	36	336	1336	4336	9336	72	73	CVAAAA	AEJAAA	AAAAxx
+2162	6189	0	2	2	2	62	162	162	2162	2162	124	125	EFAAAA	BEJAAA	HHHHxx
+7459	6190	1	3	9	19	59	459	1459	2459	7459	118	119	XAAAAA	CEJAAA	OOOOxx
+3248	6191	0	0	8	8	48	248	1248	3248	3248	96	97	YUAAAA	DEJAAA	VVVVxx
+9539	6192	1	3	9	19	39	539	1539	4539	9539	78	79	XCAAAA	EEJAAA	AAAAxx
+4449	6193	1	1	9	9	49	449	449	4449	4449	98	99	DPAAAA	FEJAAA	HHHHxx
+2809	6194	1	1	9	9	9	809	809	2809	2809	18	19	BEAAAA	GEJAAA	OOOOxx
+7058	6195	0	2	8	18	58	58	1058	2058	7058	116	117	MLAAAA	HEJAAA	VVVVxx
+3512	6196	0	0	2	12	12	512	1512	3512	3512	24	25	CFAAAA	IEJAAA	AAAAxx
+2802	6197	0	2	2	2	2	802	802	2802	2802	4	5	UDAAAA	JEJAAA	HHHHxx
+6289	6198	1	1	9	9	89	289	289	1289	6289	178	179	XHAAAA	KEJAAA	OOOOxx
+1947	6199	1	3	7	7	47	947	1947	1947	1947	94	95	XWAAAA	LEJAAA	VVVVxx
+9572	6200	0	0	2	12	72	572	1572	4572	9572	144	145	EEAAAA	MEJAAA	AAAAxx
+2356	6201	0	0	6	16	56	356	356	2356	2356	112	113	QMAAAA	NEJAAA	HHHHxx
+3039	6202	1	3	9	19	39	39	1039	3039	3039	78	79	XMAAAA	OEJAAA	OOOOxx
+9452	6203	0	0	2	12	52	452	1452	4452	9452	104	105	OZAAAA	PEJAAA	VVVVxx
+6328	6204	0	0	8	8	28	328	328	1328	6328	56	57	KJAAAA	QEJAAA	AAAAxx
+7661	6205	1	1	1	1	61	661	1661	2661	7661	122	123	RIAAAA	REJAAA	HHHHxx
+2566	6206	0	2	6	6	66	566	566	2566	2566	132	133	SUAAAA	SEJAAA	OOOOxx
+6095	6207	1	3	5	15	95	95	95	1095	6095	190	191	LAAAAA	TEJAAA	VVVVxx
+6367	6208	1	3	7	7	67	367	367	1367	6367	134	135	XKAAAA	UEJAAA	AAAAxx
+3368	6209	0	0	8	8	68	368	1368	3368	3368	136	137	OZAAAA	VEJAAA	HHHHxx
+5567	6210	1	3	7	7	67	567	1567	567	5567	134	135	DGAAAA	WEJAAA	OOOOxx
+9834	6211	0	2	4	14	34	834	1834	4834	9834	68	69	GOAAAA	XEJAAA	VVVVxx
+9695	6212	1	3	5	15	95	695	1695	4695	9695	190	191	XIAAAA	YEJAAA	AAAAxx
+7291	6213	1	3	1	11	91	291	1291	2291	7291	182	183	LUAAAA	ZEJAAA	HHHHxx
+4806	6214	0	2	6	6	6	806	806	4806	4806	12	13	WCAAAA	AFJAAA	OOOOxx
+2000	6215	0	0	0	0	0	0	0	2000	2000	0	1	YYAAAA	BFJAAA	VVVVxx
+6817	6216	1	1	7	17	17	817	817	1817	6817	34	35	FCAAAA	CFJAAA	AAAAxx
+8487	6217	1	3	7	7	87	487	487	3487	8487	174	175	LOAAAA	DFJAAA	HHHHxx
+3245	6218	1	1	5	5	45	245	1245	3245	3245	90	91	VUAAAA	EFJAAA	OOOOxx
+632	6219	0	0	2	12	32	632	632	632	632	64	65	IYAAAA	FFJAAA	VVVVxx
+8067	6220	1	3	7	7	67	67	67	3067	8067	134	135	HYAAAA	GFJAAA	AAAAxx
+7140	6221	0	0	0	0	40	140	1140	2140	7140	80	81	QOAAAA	HFJAAA	HHHHxx
+6802	6222	0	2	2	2	2	802	802	1802	6802	4	5	QBAAAA	IFJAAA	OOOOxx
+3980	6223	0	0	0	0	80	980	1980	3980	3980	160	161	CXAAAA	JFJAAA	VVVVxx
+1321	6224	1	1	1	1	21	321	1321	1321	1321	42	43	VYAAAA	KFJAAA	AAAAxx
+2273	6225	1	1	3	13	73	273	273	2273	2273	146	147	LJAAAA	LFJAAA	HHHHxx
+6787	6226	1	3	7	7	87	787	787	1787	6787	174	175	BBAAAA	MFJAAA	OOOOxx
+9480	6227	0	0	0	0	80	480	1480	4480	9480	160	161	QAAAAA	NFJAAA	VVVVxx
+9404	6228	0	0	4	4	4	404	1404	4404	9404	8	9	SXAAAA	OFJAAA	AAAAxx
+3914	6229	0	2	4	14	14	914	1914	3914	3914	28	29	OUAAAA	PFJAAA	HHHHxx
+5507	6230	1	3	7	7	7	507	1507	507	5507	14	15	VDAAAA	QFJAAA	OOOOxx
+1813	6231	1	1	3	13	13	813	1813	1813	1813	26	27	TRAAAA	RFJAAA	VVVVxx
+1999	6232	1	3	9	19	99	999	1999	1999	1999	198	199	XYAAAA	SFJAAA	AAAAxx
+3848	6233	0	0	8	8	48	848	1848	3848	3848	96	97	ASAAAA	TFJAAA	HHHHxx
+9693	6234	1	1	3	13	93	693	1693	4693	9693	186	187	VIAAAA	UFJAAA	OOOOxx
+1353	6235	1	1	3	13	53	353	1353	1353	1353	106	107	BAAAAA	VFJAAA	VVVVxx
+7218	6236	0	2	8	18	18	218	1218	2218	7218	36	37	QRAAAA	WFJAAA	AAAAxx
+8223	6237	1	3	3	3	23	223	223	3223	8223	46	47	HEAAAA	XFJAAA	HHHHxx
+9982	6238	0	2	2	2	82	982	1982	4982	9982	164	165	YTAAAA	YFJAAA	OOOOxx
+8799	6239	1	3	9	19	99	799	799	3799	8799	198	199	LAAAAA	ZFJAAA	VVVVxx
+8929	6240	1	1	9	9	29	929	929	3929	8929	58	59	LFAAAA	AGJAAA	AAAAxx
+4626	6241	0	2	6	6	26	626	626	4626	4626	52	53	YVAAAA	BGJAAA	HHHHxx
+7958	6242	0	2	8	18	58	958	1958	2958	7958	116	117	CUAAAA	CGJAAA	OOOOxx
+3743	6243	1	3	3	3	43	743	1743	3743	3743	86	87	ZNAAAA	DGJAAA	VVVVxx
+8165	6244	1	1	5	5	65	165	165	3165	8165	130	131	BCAAAA	EGJAAA	AAAAxx
+7899	6245	1	3	9	19	99	899	1899	2899	7899	198	199	VRAAAA	FGJAAA	HHHHxx
+8698	6246	0	2	8	18	98	698	698	3698	8698	196	197	OWAAAA	GGJAAA	OOOOxx
+9270	6247	0	2	0	10	70	270	1270	4270	9270	140	141	OSAAAA	HGJAAA	VVVVxx
+6348	6248	0	0	8	8	48	348	348	1348	6348	96	97	EKAAAA	IGJAAA	AAAAxx
+6999	6249	1	3	9	19	99	999	999	1999	6999	198	199	FJAAAA	JGJAAA	HHHHxx
+8467	6250	1	3	7	7	67	467	467	3467	8467	134	135	RNAAAA	KGJAAA	OOOOxx
+3907	6251	1	3	7	7	7	907	1907	3907	3907	14	15	HUAAAA	LGJAAA	VVVVxx
+4738	6252	0	2	8	18	38	738	738	4738	4738	76	77	GAAAAA	MGJAAA	AAAAxx
+248	6253	0	0	8	8	48	248	248	248	248	96	97	OJAAAA	NGJAAA	HHHHxx
+8769	6254	1	1	9	9	69	769	769	3769	8769	138	139	HZAAAA	OGJAAA	OOOOxx
+9922	6255	0	2	2	2	22	922	1922	4922	9922	44	45	QRAAAA	PGJAAA	VVVVxx
+778	6256	0	2	8	18	78	778	778	778	778	156	157	YDAAAA	QGJAAA	AAAAxx
+1233	6257	1	1	3	13	33	233	1233	1233	1233	66	67	LVAAAA	RGJAAA	HHHHxx
+1183	6258	1	3	3	3	83	183	1183	1183	1183	166	167	NTAAAA	SGJAAA	OOOOxx
+2838	6259	0	2	8	18	38	838	838	2838	2838	76	77	EFAAAA	TGJAAA	VVVVxx
+3096	6260	0	0	6	16	96	96	1096	3096	3096	192	193	CPAAAA	UGJAAA	AAAAxx
+8566	6261	0	2	6	6	66	566	566	3566	8566	132	133	MRAAAA	VGJAAA	HHHHxx
+7635	6262	1	3	5	15	35	635	1635	2635	7635	70	71	RHAAAA	WGJAAA	OOOOxx
+5428	6263	0	0	8	8	28	428	1428	428	5428	56	57	UAAAAA	XGJAAA	VVVVxx
+7430	6264	0	2	0	10	30	430	1430	2430	7430	60	61	UZAAAA	YGJAAA	AAAAxx
+7210	6265	0	2	0	10	10	210	1210	2210	7210	20	21	IRAAAA	ZGJAAA	HHHHxx
+4485	6266	1	1	5	5	85	485	485	4485	4485	170	171	NQAAAA	AHJAAA	OOOOxx
+9623	6267	1	3	3	3	23	623	1623	4623	9623	46	47	DGAAAA	BHJAAA	VVVVxx
+3670	6268	0	2	0	10	70	670	1670	3670	3670	140	141	ELAAAA	CHJAAA	AAAAxx
+1575	6269	1	3	5	15	75	575	1575	1575	1575	150	151	PIAAAA	DHJAAA	HHHHxx
+5874	6270	0	2	4	14	74	874	1874	874	5874	148	149	YRAAAA	EHJAAA	OOOOxx
+673	6271	1	1	3	13	73	673	673	673	673	146	147	XZAAAA	FHJAAA	VVVVxx
+9712	6272	0	0	2	12	12	712	1712	4712	9712	24	25	OJAAAA	GHJAAA	AAAAxx
+7729	6273	1	1	9	9	29	729	1729	2729	7729	58	59	HLAAAA	HHJAAA	HHHHxx
+4318	6274	0	2	8	18	18	318	318	4318	4318	36	37	CKAAAA	IHJAAA	OOOOxx
+4143	6275	1	3	3	3	43	143	143	4143	4143	86	87	JDAAAA	JHJAAA	VVVVxx
+4932	6276	0	0	2	12	32	932	932	4932	4932	64	65	SHAAAA	KHJAAA	AAAAxx
+5835	6277	1	3	5	15	35	835	1835	835	5835	70	71	LQAAAA	LHJAAA	HHHHxx
+4966	6278	0	2	6	6	66	966	966	4966	4966	132	133	AJAAAA	MHJAAA	OOOOxx
+6711	6279	1	3	1	11	11	711	711	1711	6711	22	23	DYAAAA	NHJAAA	VVVVxx
+3990	6280	0	2	0	10	90	990	1990	3990	3990	180	181	MXAAAA	OHJAAA	AAAAxx
+990	6281	0	2	0	10	90	990	990	990	990	180	181	CMAAAA	PHJAAA	HHHHxx
+220	6282	0	0	0	0	20	220	220	220	220	40	41	MIAAAA	QHJAAA	OOOOxx
+5693	6283	1	1	3	13	93	693	1693	693	5693	186	187	ZKAAAA	RHJAAA	VVVVxx
+3662	6284	0	2	2	2	62	662	1662	3662	3662	124	125	WKAAAA	SHJAAA	AAAAxx
+7844	6285	0	0	4	4	44	844	1844	2844	7844	88	89	SPAAAA	THJAAA	HHHHxx
+5515	6286	1	3	5	15	15	515	1515	515	5515	30	31	DEAAAA	UHJAAA	OOOOxx
+5551	6287	1	3	1	11	51	551	1551	551	5551	102	103	NFAAAA	VHJAAA	VVVVxx
+2358	6288	0	2	8	18	58	358	358	2358	2358	116	117	SMAAAA	WHJAAA	AAAAxx
+8977	6289	1	1	7	17	77	977	977	3977	8977	154	155	HHAAAA	XHJAAA	HHHHxx
+7040	6290	0	0	0	0	40	40	1040	2040	7040	80	81	UKAAAA	YHJAAA	OOOOxx
+105	6291	1	1	5	5	5	105	105	105	105	10	11	BEAAAA	ZHJAAA	VVVVxx
+4496	6292	0	0	6	16	96	496	496	4496	4496	192	193	YQAAAA	AIJAAA	AAAAxx
+2254	6293	0	2	4	14	54	254	254	2254	2254	108	109	SIAAAA	BIJAAA	HHHHxx
+411	6294	1	3	1	11	11	411	411	411	411	22	23	VPAAAA	CIJAAA	OOOOxx
+2373	6295	1	1	3	13	73	373	373	2373	2373	146	147	HNAAAA	DIJAAA	VVVVxx
+3477	6296	1	1	7	17	77	477	1477	3477	3477	154	155	TDAAAA	EIJAAA	AAAAxx
+8964	6297	0	0	4	4	64	964	964	3964	8964	128	129	UGAAAA	FIJAAA	HHHHxx
+8471	6298	1	3	1	11	71	471	471	3471	8471	142	143	VNAAAA	GIJAAA	OOOOxx
+5776	6299	0	0	6	16	76	776	1776	776	5776	152	153	EOAAAA	HIJAAA	VVVVxx
+9921	6300	1	1	1	1	21	921	1921	4921	9921	42	43	PRAAAA	IIJAAA	AAAAxx
+7816	6301	0	0	6	16	16	816	1816	2816	7816	32	33	QOAAAA	JIJAAA	HHHHxx
+2439	6302	1	3	9	19	39	439	439	2439	2439	78	79	VPAAAA	KIJAAA	OOOOxx
+9298	6303	0	2	8	18	98	298	1298	4298	9298	196	197	QTAAAA	LIJAAA	VVVVxx
+9424	6304	0	0	4	4	24	424	1424	4424	9424	48	49	MYAAAA	MIJAAA	AAAAxx
+3252	6305	0	0	2	12	52	252	1252	3252	3252	104	105	CVAAAA	NIJAAA	HHHHxx
+1401	6306	1	1	1	1	1	401	1401	1401	1401	2	3	XBAAAA	OIJAAA	OOOOxx
+9632	6307	0	0	2	12	32	632	1632	4632	9632	64	65	MGAAAA	PIJAAA	VVVVxx
+370	6308	0	2	0	10	70	370	370	370	370	140	141	GOAAAA	QIJAAA	AAAAxx
+728	6309	0	0	8	8	28	728	728	728	728	56	57	ACAAAA	RIJAAA	HHHHxx
+2888	6310	0	0	8	8	88	888	888	2888	2888	176	177	CHAAAA	SIJAAA	OOOOxx
+1441	6311	1	1	1	1	41	441	1441	1441	1441	82	83	LDAAAA	TIJAAA	VVVVxx
+8308	6312	0	0	8	8	8	308	308	3308	8308	16	17	OHAAAA	UIJAAA	AAAAxx
+2165	6313	1	1	5	5	65	165	165	2165	2165	130	131	HFAAAA	VIJAAA	HHHHxx
+6359	6314	1	3	9	19	59	359	359	1359	6359	118	119	PKAAAA	WIJAAA	OOOOxx
+9637	6315	1	1	7	17	37	637	1637	4637	9637	74	75	RGAAAA	XIJAAA	VVVVxx
+5208	6316	0	0	8	8	8	208	1208	208	5208	16	17	ISAAAA	YIJAAA	AAAAxx
+4705	6317	1	1	5	5	5	705	705	4705	4705	10	11	ZYAAAA	ZIJAAA	HHHHxx
+2341	6318	1	1	1	1	41	341	341	2341	2341	82	83	BMAAAA	AJJAAA	OOOOxx
+8539	6319	1	3	9	19	39	539	539	3539	8539	78	79	LQAAAA	BJJAAA	VVVVxx
+7528	6320	0	0	8	8	28	528	1528	2528	7528	56	57	ODAAAA	CJJAAA	AAAAxx
+7969	6321	1	1	9	9	69	969	1969	2969	7969	138	139	NUAAAA	DJJAAA	HHHHxx
+6381	6322	1	1	1	1	81	381	381	1381	6381	162	163	LLAAAA	EJJAAA	OOOOxx
+4906	6323	0	2	6	6	6	906	906	4906	4906	12	13	SGAAAA	FJJAAA	VVVVxx
+8697	6324	1	1	7	17	97	697	697	3697	8697	194	195	NWAAAA	GJJAAA	AAAAxx
+6301	6325	1	1	1	1	1	301	301	1301	6301	2	3	JIAAAA	HJJAAA	HHHHxx
+7554	6326	0	2	4	14	54	554	1554	2554	7554	108	109	OEAAAA	IJJAAA	OOOOxx
+5107	6327	1	3	7	7	7	107	1107	107	5107	14	15	LOAAAA	JJJAAA	VVVVxx
+5046	6328	0	2	6	6	46	46	1046	46	5046	92	93	CMAAAA	KJJAAA	AAAAxx
+4063	6329	1	3	3	3	63	63	63	4063	4063	126	127	HAAAAA	LJJAAA	HHHHxx
+7580	6330	0	0	0	0	80	580	1580	2580	7580	160	161	OFAAAA	MJJAAA	OOOOxx
+2245	6331	1	1	5	5	45	245	245	2245	2245	90	91	JIAAAA	NJJAAA	VVVVxx
+3711	6332	1	3	1	11	11	711	1711	3711	3711	22	23	TMAAAA	OJJAAA	AAAAxx
+3220	6333	0	0	0	0	20	220	1220	3220	3220	40	41	WTAAAA	PJJAAA	HHHHxx
+6463	6334	1	3	3	3	63	463	463	1463	6463	126	127	POAAAA	QJJAAA	OOOOxx
+8196	6335	0	0	6	16	96	196	196	3196	8196	192	193	GDAAAA	RJJAAA	VVVVxx
+9875	6336	1	3	5	15	75	875	1875	4875	9875	150	151	VPAAAA	SJJAAA	AAAAxx
+1333	6337	1	1	3	13	33	333	1333	1333	1333	66	67	HZAAAA	TJJAAA	HHHHxx
+7880	6338	0	0	0	0	80	880	1880	2880	7880	160	161	CRAAAA	UJJAAA	OOOOxx
+2322	6339	0	2	2	2	22	322	322	2322	2322	44	45	ILAAAA	VJJAAA	VVVVxx
+2163	6340	1	3	3	3	63	163	163	2163	2163	126	127	FFAAAA	WJJAAA	AAAAxx
+421	6341	1	1	1	1	21	421	421	421	421	42	43	FQAAAA	XJJAAA	HHHHxx
+2042	6342	0	2	2	2	42	42	42	2042	2042	84	85	OAAAAA	YJJAAA	OOOOxx
+1424	6343	0	0	4	4	24	424	1424	1424	1424	48	49	UCAAAA	ZJJAAA	VVVVxx
+7870	6344	0	2	0	10	70	870	1870	2870	7870	140	141	SQAAAA	AKJAAA	AAAAxx
+2653	6345	1	1	3	13	53	653	653	2653	2653	106	107	BYAAAA	BKJAAA	HHHHxx
+4216	6346	0	0	6	16	16	216	216	4216	4216	32	33	EGAAAA	CKJAAA	OOOOxx
+1515	6347	1	3	5	15	15	515	1515	1515	1515	30	31	HGAAAA	DKJAAA	VVVVxx
+7860	6348	0	0	0	0	60	860	1860	2860	7860	120	121	IQAAAA	EKJAAA	AAAAxx
+2984	6349	0	0	4	4	84	984	984	2984	2984	168	169	UKAAAA	FKJAAA	HHHHxx
+6269	6350	1	1	9	9	69	269	269	1269	6269	138	139	DHAAAA	GKJAAA	OOOOxx
+2609	6351	1	1	9	9	9	609	609	2609	2609	18	19	JWAAAA	HKJAAA	VVVVxx
+3671	6352	1	3	1	11	71	671	1671	3671	3671	142	143	FLAAAA	IKJAAA	AAAAxx
+4544	6353	0	0	4	4	44	544	544	4544	4544	88	89	USAAAA	JKJAAA	HHHHxx
+4668	6354	0	0	8	8	68	668	668	4668	4668	136	137	OXAAAA	KKJAAA	OOOOxx
+2565	6355	1	1	5	5	65	565	565	2565	2565	130	131	RUAAAA	LKJAAA	VVVVxx
+3126	6356	0	2	6	6	26	126	1126	3126	3126	52	53	GQAAAA	MKJAAA	AAAAxx
+7573	6357	1	1	3	13	73	573	1573	2573	7573	146	147	HFAAAA	NKJAAA	HHHHxx
+1476	6358	0	0	6	16	76	476	1476	1476	1476	152	153	UEAAAA	OKJAAA	OOOOxx
+2146	6359	0	2	6	6	46	146	146	2146	2146	92	93	OEAAAA	PKJAAA	VVVVxx
+9990	6360	0	2	0	10	90	990	1990	4990	9990	180	181	GUAAAA	QKJAAA	AAAAxx
+2530	6361	0	2	0	10	30	530	530	2530	2530	60	61	ITAAAA	RKJAAA	HHHHxx
+9288	6362	0	0	8	8	88	288	1288	4288	9288	176	177	GTAAAA	SKJAAA	OOOOxx
+9755	6363	1	3	5	15	55	755	1755	4755	9755	110	111	FLAAAA	TKJAAA	VVVVxx
+5305	6364	1	1	5	5	5	305	1305	305	5305	10	11	BWAAAA	UKJAAA	AAAAxx
+2495	6365	1	3	5	15	95	495	495	2495	2495	190	191	ZRAAAA	VKJAAA	HHHHxx
+5443	6366	1	3	3	3	43	443	1443	443	5443	86	87	JBAAAA	WKJAAA	OOOOxx
+1930	6367	0	2	0	10	30	930	1930	1930	1930	60	61	GWAAAA	XKJAAA	VVVVxx
+9134	6368	0	2	4	14	34	134	1134	4134	9134	68	69	INAAAA	YKJAAA	AAAAxx
+2844	6369	0	0	4	4	44	844	844	2844	2844	88	89	KFAAAA	ZKJAAA	HHHHxx
+896	6370	0	0	6	16	96	896	896	896	896	192	193	MIAAAA	ALJAAA	OOOOxx
+1330	6371	0	2	0	10	30	330	1330	1330	1330	60	61	EZAAAA	BLJAAA	VVVVxx
+8980	6372	0	0	0	0	80	980	980	3980	8980	160	161	KHAAAA	CLJAAA	AAAAxx
+5940	6373	0	0	0	0	40	940	1940	940	5940	80	81	MUAAAA	DLJAAA	HHHHxx
+6494	6374	0	2	4	14	94	494	494	1494	6494	188	189	UPAAAA	ELJAAA	OOOOxx
+165	6375	1	1	5	5	65	165	165	165	165	130	131	JGAAAA	FLJAAA	VVVVxx
+2510	6376	0	2	0	10	10	510	510	2510	2510	20	21	OSAAAA	GLJAAA	AAAAxx
+9950	6377	0	2	0	10	50	950	1950	4950	9950	100	101	SSAAAA	HLJAAA	HHHHxx
+3854	6378	0	2	4	14	54	854	1854	3854	3854	108	109	GSAAAA	ILJAAA	OOOOxx
+7493	6379	1	1	3	13	93	493	1493	2493	7493	186	187	FCAAAA	JLJAAA	VVVVxx
+4124	6380	0	0	4	4	24	124	124	4124	4124	48	49	QCAAAA	KLJAAA	AAAAxx
+8563	6381	1	3	3	3	63	563	563	3563	8563	126	127	JRAAAA	LLJAAA	HHHHxx
+8735	6382	1	3	5	15	35	735	735	3735	8735	70	71	ZXAAAA	MLJAAA	OOOOxx
+9046	6383	0	2	6	6	46	46	1046	4046	9046	92	93	YJAAAA	NLJAAA	VVVVxx
+1754	6384	0	2	4	14	54	754	1754	1754	1754	108	109	MPAAAA	OLJAAA	AAAAxx
+6954	6385	0	2	4	14	54	954	954	1954	6954	108	109	MHAAAA	PLJAAA	HHHHxx
+4953	6386	1	1	3	13	53	953	953	4953	4953	106	107	NIAAAA	QLJAAA	OOOOxx
+8142	6387	0	2	2	2	42	142	142	3142	8142	84	85	EBAAAA	RLJAAA	VVVVxx
+9661	6388	1	1	1	1	61	661	1661	4661	9661	122	123	PHAAAA	SLJAAA	AAAAxx
+6415	6389	1	3	5	15	15	415	415	1415	6415	30	31	TMAAAA	TLJAAA	HHHHxx
+5782	6390	0	2	2	2	82	782	1782	782	5782	164	165	KOAAAA	ULJAAA	OOOOxx
+7721	6391	1	1	1	1	21	721	1721	2721	7721	42	43	ZKAAAA	VLJAAA	VVVVxx
+580	6392	0	0	0	0	80	580	580	580	580	160	161	IWAAAA	WLJAAA	AAAAxx
+3784	6393	0	0	4	4	84	784	1784	3784	3784	168	169	OPAAAA	XLJAAA	HHHHxx
+9810	6394	0	2	0	10	10	810	1810	4810	9810	20	21	INAAAA	YLJAAA	OOOOxx
+8488	6395	0	0	8	8	88	488	488	3488	8488	176	177	MOAAAA	ZLJAAA	VVVVxx
+6214	6396	0	2	4	14	14	214	214	1214	6214	28	29	AFAAAA	AMJAAA	AAAAxx
+9433	6397	1	1	3	13	33	433	1433	4433	9433	66	67	VYAAAA	BMJAAA	HHHHxx
+9959	6398	1	3	9	19	59	959	1959	4959	9959	118	119	BTAAAA	CMJAAA	OOOOxx
+554	6399	0	2	4	14	54	554	554	554	554	108	109	IVAAAA	DMJAAA	VVVVxx
+6646	6400	0	2	6	6	46	646	646	1646	6646	92	93	QVAAAA	EMJAAA	AAAAxx
+1138	6401	0	2	8	18	38	138	1138	1138	1138	76	77	URAAAA	FMJAAA	HHHHxx
+9331	6402	1	3	1	11	31	331	1331	4331	9331	62	63	XUAAAA	GMJAAA	OOOOxx
+7331	6403	1	3	1	11	31	331	1331	2331	7331	62	63	ZVAAAA	HMJAAA	VVVVxx
+3482	6404	0	2	2	2	82	482	1482	3482	3482	164	165	YDAAAA	IMJAAA	AAAAxx
+3795	6405	1	3	5	15	95	795	1795	3795	3795	190	191	ZPAAAA	JMJAAA	HHHHxx
+2441	6406	1	1	1	1	41	441	441	2441	2441	82	83	XPAAAA	KMJAAA	OOOOxx
+5229	6407	1	1	9	9	29	229	1229	229	5229	58	59	DTAAAA	LMJAAA	VVVVxx
+7012	6408	0	0	2	12	12	12	1012	2012	7012	24	25	SJAAAA	MMJAAA	AAAAxx
+7036	6409	0	0	6	16	36	36	1036	2036	7036	72	73	QKAAAA	NMJAAA	HHHHxx
+8243	6410	1	3	3	3	43	243	243	3243	8243	86	87	BFAAAA	OMJAAA	OOOOxx
+9320	6411	0	0	0	0	20	320	1320	4320	9320	40	41	MUAAAA	PMJAAA	VVVVxx
+4693	6412	1	1	3	13	93	693	693	4693	4693	186	187	NYAAAA	QMJAAA	AAAAxx
+6741	6413	1	1	1	1	41	741	741	1741	6741	82	83	HZAAAA	RMJAAA	HHHHxx
+2997	6414	1	1	7	17	97	997	997	2997	2997	194	195	HLAAAA	SMJAAA	OOOOxx
+4838	6415	0	2	8	18	38	838	838	4838	4838	76	77	CEAAAA	TMJAAA	VVVVxx
+6945	6416	1	1	5	5	45	945	945	1945	6945	90	91	DHAAAA	UMJAAA	AAAAxx
+8253	6417	1	1	3	13	53	253	253	3253	8253	106	107	LFAAAA	VMJAAA	HHHHxx
+8989	6418	1	1	9	9	89	989	989	3989	8989	178	179	THAAAA	WMJAAA	OOOOxx
+2640	6419	0	0	0	0	40	640	640	2640	2640	80	81	OXAAAA	XMJAAA	VVVVxx
+5647	6420	1	3	7	7	47	647	1647	647	5647	94	95	FJAAAA	YMJAAA	AAAAxx
+7186	6421	0	2	6	6	86	186	1186	2186	7186	172	173	KQAAAA	ZMJAAA	HHHHxx
+3278	6422	0	2	8	18	78	278	1278	3278	3278	156	157	CWAAAA	ANJAAA	OOOOxx
+8546	6423	0	2	6	6	46	546	546	3546	8546	92	93	SQAAAA	BNJAAA	VVVVxx
+8297	6424	1	1	7	17	97	297	297	3297	8297	194	195	DHAAAA	CNJAAA	AAAAxx
+9534	6425	0	2	4	14	34	534	1534	4534	9534	68	69	SCAAAA	DNJAAA	HHHHxx
+9618	6426	0	2	8	18	18	618	1618	4618	9618	36	37	YFAAAA	ENJAAA	OOOOxx
+8839	6427	1	3	9	19	39	839	839	3839	8839	78	79	ZBAAAA	FNJAAA	VVVVxx
+7605	6428	1	1	5	5	5	605	1605	2605	7605	10	11	NGAAAA	GNJAAA	AAAAxx
+6421	6429	1	1	1	1	21	421	421	1421	6421	42	43	ZMAAAA	HNJAAA	HHHHxx
+3582	6430	0	2	2	2	82	582	1582	3582	3582	164	165	UHAAAA	INJAAA	OOOOxx
+485	6431	1	1	5	5	85	485	485	485	485	170	171	RSAAAA	JNJAAA	VVVVxx
+1925	6432	1	1	5	5	25	925	1925	1925	1925	50	51	BWAAAA	KNJAAA	AAAAxx
+4296	6433	0	0	6	16	96	296	296	4296	4296	192	193	GJAAAA	LNJAAA	HHHHxx
+8874	6434	0	2	4	14	74	874	874	3874	8874	148	149	IDAAAA	MNJAAA	OOOOxx
+1443	6435	1	3	3	3	43	443	1443	1443	1443	86	87	NDAAAA	NNJAAA	VVVVxx
+4239	6436	1	3	9	19	39	239	239	4239	4239	78	79	BHAAAA	ONJAAA	AAAAxx
+9760	6437	0	0	0	0	60	760	1760	4760	9760	120	121	KLAAAA	PNJAAA	HHHHxx
+136	6438	0	0	6	16	36	136	136	136	136	72	73	GFAAAA	QNJAAA	OOOOxx
+6472	6439	0	0	2	12	72	472	472	1472	6472	144	145	YOAAAA	RNJAAA	VVVVxx
+4896	6440	0	0	6	16	96	896	896	4896	4896	192	193	IGAAAA	SNJAAA	AAAAxx
+9028	6441	0	0	8	8	28	28	1028	4028	9028	56	57	GJAAAA	TNJAAA	HHHHxx
+8354	6442	0	2	4	14	54	354	354	3354	8354	108	109	IJAAAA	UNJAAA	OOOOxx
+8648	6443	0	0	8	8	48	648	648	3648	8648	96	97	QUAAAA	VNJAAA	VVVVxx
+918	6444	0	2	8	18	18	918	918	918	918	36	37	IJAAAA	WNJAAA	AAAAxx
+6606	6445	0	2	6	6	6	606	606	1606	6606	12	13	CUAAAA	XNJAAA	HHHHxx
+2462	6446	0	2	2	2	62	462	462	2462	2462	124	125	SQAAAA	YNJAAA	OOOOxx
+7536	6447	0	0	6	16	36	536	1536	2536	7536	72	73	WDAAAA	ZNJAAA	VVVVxx
+1700	6448	0	0	0	0	0	700	1700	1700	1700	0	1	KNAAAA	AOJAAA	AAAAxx
+6740	6449	0	0	0	0	40	740	740	1740	6740	80	81	GZAAAA	BOJAAA	HHHHxx
+28	6450	0	0	8	8	28	28	28	28	28	56	57	CBAAAA	COJAAA	OOOOxx
+6044	6451	0	0	4	4	44	44	44	1044	6044	88	89	MYAAAA	DOJAAA	VVVVxx
+5053	6452	1	1	3	13	53	53	1053	53	5053	106	107	JMAAAA	EOJAAA	AAAAxx
+4832	6453	0	0	2	12	32	832	832	4832	4832	64	65	WDAAAA	FOJAAA	HHHHxx
+9145	6454	1	1	5	5	45	145	1145	4145	9145	90	91	TNAAAA	GOJAAA	OOOOxx
+5482	6455	0	2	2	2	82	482	1482	482	5482	164	165	WCAAAA	HOJAAA	VVVVxx
+7644	6456	0	0	4	4	44	644	1644	2644	7644	88	89	AIAAAA	IOJAAA	AAAAxx
+2128	6457	0	0	8	8	28	128	128	2128	2128	56	57	WDAAAA	JOJAAA	HHHHxx
+6583	6458	1	3	3	3	83	583	583	1583	6583	166	167	FTAAAA	KOJAAA	OOOOxx
+4224	6459	0	0	4	4	24	224	224	4224	4224	48	49	MGAAAA	LOJAAA	VVVVxx
+5253	6460	1	1	3	13	53	253	1253	253	5253	106	107	BUAAAA	MOJAAA	AAAAxx
+8219	6461	1	3	9	19	19	219	219	3219	8219	38	39	DEAAAA	NOJAAA	HHHHxx
+8113	6462	1	1	3	13	13	113	113	3113	8113	26	27	BAAAAA	OOJAAA	OOOOxx
+3616	6463	0	0	6	16	16	616	1616	3616	3616	32	33	CJAAAA	POJAAA	VVVVxx
+1361	6464	1	1	1	1	61	361	1361	1361	1361	122	123	JAAAAA	QOJAAA	AAAAxx
+949	6465	1	1	9	9	49	949	949	949	949	98	99	NKAAAA	ROJAAA	HHHHxx
+8582	6466	0	2	2	2	82	582	582	3582	8582	164	165	CSAAAA	SOJAAA	OOOOxx
+5104	6467	0	0	4	4	4	104	1104	104	5104	8	9	IOAAAA	TOJAAA	VVVVxx
+6146	6468	0	2	6	6	46	146	146	1146	6146	92	93	KCAAAA	UOJAAA	AAAAxx
+7681	6469	1	1	1	1	81	681	1681	2681	7681	162	163	LJAAAA	VOJAAA	HHHHxx
+1904	6470	0	0	4	4	4	904	1904	1904	1904	8	9	GVAAAA	WOJAAA	OOOOxx
+1989	6471	1	1	9	9	89	989	1989	1989	1989	178	179	NYAAAA	XOJAAA	VVVVxx
+4179	6472	1	3	9	19	79	179	179	4179	4179	158	159	TEAAAA	YOJAAA	AAAAxx
+1739	6473	1	3	9	19	39	739	1739	1739	1739	78	79	XOAAAA	ZOJAAA	HHHHxx
+2447	6474	1	3	7	7	47	447	447	2447	2447	94	95	DQAAAA	APJAAA	OOOOxx
+3029	6475	1	1	9	9	29	29	1029	3029	3029	58	59	NMAAAA	BPJAAA	VVVVxx
+9783	6476	1	3	3	3	83	783	1783	4783	9783	166	167	HMAAAA	CPJAAA	AAAAxx
+8381	6477	1	1	1	1	81	381	381	3381	8381	162	163	JKAAAA	DPJAAA	HHHHxx
+8755	6478	1	3	5	15	55	755	755	3755	8755	110	111	TYAAAA	EPJAAA	OOOOxx
+8384	6479	0	0	4	4	84	384	384	3384	8384	168	169	MKAAAA	FPJAAA	VVVVxx
+7655	6480	1	3	5	15	55	655	1655	2655	7655	110	111	LIAAAA	GPJAAA	AAAAxx
+4766	6481	0	2	6	6	66	766	766	4766	4766	132	133	IBAAAA	HPJAAA	HHHHxx
+3324	6482	0	0	4	4	24	324	1324	3324	3324	48	49	WXAAAA	IPJAAA	OOOOxx
+5022	6483	0	2	2	2	22	22	1022	22	5022	44	45	ELAAAA	JPJAAA	VVVVxx
+2856	6484	0	0	6	16	56	856	856	2856	2856	112	113	WFAAAA	KPJAAA	AAAAxx
+6503	6485	1	3	3	3	3	503	503	1503	6503	6	7	DQAAAA	LPJAAA	HHHHxx
+6872	6486	0	0	2	12	72	872	872	1872	6872	144	145	IEAAAA	MPJAAA	OOOOxx
+1663	6487	1	3	3	3	63	663	1663	1663	1663	126	127	ZLAAAA	NPJAAA	VVVVxx
+6964	6488	0	0	4	4	64	964	964	1964	6964	128	129	WHAAAA	OPJAAA	AAAAxx
+4622	6489	0	2	2	2	22	622	622	4622	4622	44	45	UVAAAA	PPJAAA	HHHHxx
+6089	6490	1	1	9	9	89	89	89	1089	6089	178	179	FAAAAA	QPJAAA	OOOOxx
+8567	6491	1	3	7	7	67	567	567	3567	8567	134	135	NRAAAA	RPJAAA	VVVVxx
+597	6492	1	1	7	17	97	597	597	597	597	194	195	ZWAAAA	SPJAAA	AAAAxx
+4222	6493	0	2	2	2	22	222	222	4222	4222	44	45	KGAAAA	TPJAAA	HHHHxx
+9322	6494	0	2	2	2	22	322	1322	4322	9322	44	45	OUAAAA	UPJAAA	OOOOxx
+624	6495	0	0	4	4	24	624	624	624	624	48	49	AYAAAA	VPJAAA	VVVVxx
+4329	6496	1	1	9	9	29	329	329	4329	4329	58	59	NKAAAA	WPJAAA	AAAAxx
+6781	6497	1	1	1	1	81	781	781	1781	6781	162	163	VAAAAA	XPJAAA	HHHHxx
+1673	6498	1	1	3	13	73	673	1673	1673	1673	146	147	JMAAAA	YPJAAA	OOOOxx
+6633	6499	1	1	3	13	33	633	633	1633	6633	66	67	DVAAAA	ZPJAAA	VVVVxx
+2569	6500	1	1	9	9	69	569	569	2569	2569	138	139	VUAAAA	AQJAAA	AAAAxx
+4995	6501	1	3	5	15	95	995	995	4995	4995	190	191	DKAAAA	BQJAAA	HHHHxx
+2749	6502	1	1	9	9	49	749	749	2749	2749	98	99	TBAAAA	CQJAAA	OOOOxx
+9044	6503	0	0	4	4	44	44	1044	4044	9044	88	89	WJAAAA	DQJAAA	VVVVxx
+5823	6504	1	3	3	3	23	823	1823	823	5823	46	47	ZPAAAA	EQJAAA	AAAAxx
+9366	6505	0	2	6	6	66	366	1366	4366	9366	132	133	GWAAAA	FQJAAA	HHHHxx
+1169	6506	1	1	9	9	69	169	1169	1169	1169	138	139	ZSAAAA	GQJAAA	OOOOxx
+1300	6507	0	0	0	0	0	300	1300	1300	1300	0	1	AYAAAA	HQJAAA	VVVVxx
+9973	6508	1	1	3	13	73	973	1973	4973	9973	146	147	PTAAAA	IQJAAA	AAAAxx
+2092	6509	0	0	2	12	92	92	92	2092	2092	184	185	MCAAAA	JQJAAA	HHHHxx
+9776	6510	0	0	6	16	76	776	1776	4776	9776	152	153	AMAAAA	KQJAAA	OOOOxx
+7612	6511	0	0	2	12	12	612	1612	2612	7612	24	25	UGAAAA	LQJAAA	VVVVxx
+7190	6512	0	2	0	10	90	190	1190	2190	7190	180	181	OQAAAA	MQJAAA	AAAAxx
+5147	6513	1	3	7	7	47	147	1147	147	5147	94	95	ZPAAAA	NQJAAA	HHHHxx
+3722	6514	0	2	2	2	22	722	1722	3722	3722	44	45	ENAAAA	OQJAAA	OOOOxx
+5858	6515	0	2	8	18	58	858	1858	858	5858	116	117	IRAAAA	PQJAAA	VVVVxx
+3204	6516	0	0	4	4	4	204	1204	3204	3204	8	9	GTAAAA	QQJAAA	AAAAxx
+8994	6517	0	2	4	14	94	994	994	3994	8994	188	189	YHAAAA	RQJAAA	HHHHxx
+7478	6518	0	2	8	18	78	478	1478	2478	7478	156	157	QBAAAA	SQJAAA	OOOOxx
+9624	6519	0	0	4	4	24	624	1624	4624	9624	48	49	EGAAAA	TQJAAA	VVVVxx
+6639	6520	1	3	9	19	39	639	639	1639	6639	78	79	JVAAAA	UQJAAA	AAAAxx
+369	6521	1	1	9	9	69	369	369	369	369	138	139	FOAAAA	VQJAAA	HHHHxx
+7766	6522	0	2	6	6	66	766	1766	2766	7766	132	133	SMAAAA	WQJAAA	OOOOxx
+4094	6523	0	2	4	14	94	94	94	4094	4094	188	189	MBAAAA	XQJAAA	VVVVxx
+9556	6524	0	0	6	16	56	556	1556	4556	9556	112	113	ODAAAA	YQJAAA	AAAAxx
+4887	6525	1	3	7	7	87	887	887	4887	4887	174	175	ZFAAAA	ZQJAAA	HHHHxx
+2321	6526	1	1	1	1	21	321	321	2321	2321	42	43	HLAAAA	ARJAAA	OOOOxx
+9201	6527	1	1	1	1	1	201	1201	4201	9201	2	3	XPAAAA	BRJAAA	VVVVxx
+1627	6528	1	3	7	7	27	627	1627	1627	1627	54	55	PKAAAA	CRJAAA	AAAAxx
+150	6529	0	2	0	10	50	150	150	150	150	100	101	UFAAAA	DRJAAA	HHHHxx
+8010	6530	0	2	0	10	10	10	10	3010	8010	20	21	CWAAAA	ERJAAA	OOOOxx
+8026	6531	0	2	6	6	26	26	26	3026	8026	52	53	SWAAAA	FRJAAA	VVVVxx
+5495	6532	1	3	5	15	95	495	1495	495	5495	190	191	JDAAAA	GRJAAA	AAAAxx
+6213	6533	1	1	3	13	13	213	213	1213	6213	26	27	ZEAAAA	HRJAAA	HHHHxx
+6464	6534	0	0	4	4	64	464	464	1464	6464	128	129	QOAAAA	IRJAAA	OOOOxx
+1158	6535	0	2	8	18	58	158	1158	1158	1158	116	117	OSAAAA	JRJAAA	VVVVxx
+8669	6536	1	1	9	9	69	669	669	3669	8669	138	139	LVAAAA	KRJAAA	AAAAxx
+3225	6537	1	1	5	5	25	225	1225	3225	3225	50	51	BUAAAA	LRJAAA	HHHHxx
+1294	6538	0	2	4	14	94	294	1294	1294	1294	188	189	UXAAAA	MRJAAA	OOOOxx
+2166	6539	0	2	6	6	66	166	166	2166	2166	132	133	IFAAAA	NRJAAA	VVVVxx
+9328	6540	0	0	8	8	28	328	1328	4328	9328	56	57	UUAAAA	ORJAAA	AAAAxx
+8431	6541	1	3	1	11	31	431	431	3431	8431	62	63	HMAAAA	PRJAAA	HHHHxx
+7100	6542	0	0	0	0	0	100	1100	2100	7100	0	1	CNAAAA	QRJAAA	OOOOxx
+8126	6543	0	2	6	6	26	126	126	3126	8126	52	53	OAAAAA	RRJAAA	VVVVxx
+2185	6544	1	1	5	5	85	185	185	2185	2185	170	171	BGAAAA	SRJAAA	AAAAxx
+5697	6545	1	1	7	17	97	697	1697	697	5697	194	195	DLAAAA	TRJAAA	HHHHxx
+5531	6546	1	3	1	11	31	531	1531	531	5531	62	63	TEAAAA	URJAAA	OOOOxx
+3020	6547	0	0	0	0	20	20	1020	3020	3020	40	41	EMAAAA	VRJAAA	VVVVxx
+3076	6548	0	0	6	16	76	76	1076	3076	3076	152	153	IOAAAA	WRJAAA	AAAAxx
+9228	6549	0	0	8	8	28	228	1228	4228	9228	56	57	YQAAAA	XRJAAA	HHHHxx
+1734	6550	0	2	4	14	34	734	1734	1734	1734	68	69	SOAAAA	YRJAAA	OOOOxx
+7616	6551	0	0	6	16	16	616	1616	2616	7616	32	33	YGAAAA	ZRJAAA	VVVVxx
+9059	6552	1	3	9	19	59	59	1059	4059	9059	118	119	LKAAAA	ASJAAA	AAAAxx
+323	6553	1	3	3	3	23	323	323	323	323	46	47	LMAAAA	BSJAAA	HHHHxx
+1283	6554	1	3	3	3	83	283	1283	1283	1283	166	167	JXAAAA	CSJAAA	OOOOxx
+9535	6555	1	3	5	15	35	535	1535	4535	9535	70	71	TCAAAA	DSJAAA	VVVVxx
+2580	6556	0	0	0	0	80	580	580	2580	2580	160	161	GVAAAA	ESJAAA	AAAAxx
+7633	6557	1	1	3	13	33	633	1633	2633	7633	66	67	PHAAAA	FSJAAA	HHHHxx
+9497	6558	1	1	7	17	97	497	1497	4497	9497	194	195	HBAAAA	GSJAAA	OOOOxx
+9842	6559	0	2	2	2	42	842	1842	4842	9842	84	85	OOAAAA	HSJAAA	VVVVxx
+3426	6560	0	2	6	6	26	426	1426	3426	3426	52	53	UBAAAA	ISJAAA	AAAAxx
+7650	6561	0	2	0	10	50	650	1650	2650	7650	100	101	GIAAAA	JSJAAA	HHHHxx
+9935	6562	1	3	5	15	35	935	1935	4935	9935	70	71	DSAAAA	KSJAAA	OOOOxx
+9354	6563	0	2	4	14	54	354	1354	4354	9354	108	109	UVAAAA	LSJAAA	VVVVxx
+5569	6564	1	1	9	9	69	569	1569	569	5569	138	139	FGAAAA	MSJAAA	AAAAxx
+5765	6565	1	1	5	5	65	765	1765	765	5765	130	131	TNAAAA	NSJAAA	HHHHxx
+7283	6566	1	3	3	3	83	283	1283	2283	7283	166	167	DUAAAA	OSJAAA	OOOOxx
+1068	6567	0	0	8	8	68	68	1068	1068	1068	136	137	CPAAAA	PSJAAA	VVVVxx
+1641	6568	1	1	1	1	41	641	1641	1641	1641	82	83	DLAAAA	QSJAAA	AAAAxx
+1688	6569	0	0	8	8	88	688	1688	1688	1688	176	177	YMAAAA	RSJAAA	HHHHxx
+1133	6570	1	1	3	13	33	133	1133	1133	1133	66	67	PRAAAA	SSJAAA	OOOOxx
+4493	6571	1	1	3	13	93	493	493	4493	4493	186	187	VQAAAA	TSJAAA	VVVVxx
+3354	6572	0	2	4	14	54	354	1354	3354	3354	108	109	AZAAAA	USJAAA	AAAAxx
+4029	6573	1	1	9	9	29	29	29	4029	4029	58	59	ZYAAAA	VSJAAA	HHHHxx
+6704	6574	0	0	4	4	4	704	704	1704	6704	8	9	WXAAAA	WSJAAA	OOOOxx
+3221	6575	1	1	1	1	21	221	1221	3221	3221	42	43	XTAAAA	XSJAAA	VVVVxx
+9432	6576	0	0	2	12	32	432	1432	4432	9432	64	65	UYAAAA	YSJAAA	AAAAxx
+6990	6577	0	2	0	10	90	990	990	1990	6990	180	181	WIAAAA	ZSJAAA	HHHHxx
+1760	6578	0	0	0	0	60	760	1760	1760	1760	120	121	SPAAAA	ATJAAA	OOOOxx
+4754	6579	0	2	4	14	54	754	754	4754	4754	108	109	WAAAAA	BTJAAA	VVVVxx
+7724	6580	0	0	4	4	24	724	1724	2724	7724	48	49	CLAAAA	CTJAAA	AAAAxx
+9487	6581	1	3	7	7	87	487	1487	4487	9487	174	175	XAAAAA	DTJAAA	HHHHxx
+166	6582	0	2	6	6	66	166	166	166	166	132	133	KGAAAA	ETJAAA	OOOOxx
+5479	6583	1	3	9	19	79	479	1479	479	5479	158	159	TCAAAA	FTJAAA	VVVVxx
+8744	6584	0	0	4	4	44	744	744	3744	8744	88	89	IYAAAA	GTJAAA	AAAAxx
+5746	6585	0	2	6	6	46	746	1746	746	5746	92	93	ANAAAA	HTJAAA	HHHHxx
+907	6586	1	3	7	7	7	907	907	907	907	14	15	XIAAAA	ITJAAA	OOOOxx
+3968	6587	0	0	8	8	68	968	1968	3968	3968	136	137	QWAAAA	JTJAAA	VVVVxx
+5721	6588	1	1	1	1	21	721	1721	721	5721	42	43	BMAAAA	KTJAAA	AAAAxx
+6738	6589	0	2	8	18	38	738	738	1738	6738	76	77	EZAAAA	LTJAAA	HHHHxx
+4097	6590	1	1	7	17	97	97	97	4097	4097	194	195	PBAAAA	MTJAAA	OOOOxx
+8456	6591	0	0	6	16	56	456	456	3456	8456	112	113	GNAAAA	NTJAAA	VVVVxx
+1269	6592	1	1	9	9	69	269	1269	1269	1269	138	139	VWAAAA	OTJAAA	AAAAxx
+7997	6593	1	1	7	17	97	997	1997	2997	7997	194	195	PVAAAA	PTJAAA	HHHHxx
+9457	6594	1	1	7	17	57	457	1457	4457	9457	114	115	TZAAAA	QTJAAA	OOOOxx
+1159	6595	1	3	9	19	59	159	1159	1159	1159	118	119	PSAAAA	RTJAAA	VVVVxx
+1631	6596	1	3	1	11	31	631	1631	1631	1631	62	63	TKAAAA	STJAAA	AAAAxx
+2019	6597	1	3	9	19	19	19	19	2019	2019	38	39	RZAAAA	TTJAAA	HHHHxx
+3186	6598	0	2	6	6	86	186	1186	3186	3186	172	173	OSAAAA	UTJAAA	OOOOxx
+5587	6599	1	3	7	7	87	587	1587	587	5587	174	175	XGAAAA	VTJAAA	VVVVxx
+9172	6600	0	0	2	12	72	172	1172	4172	9172	144	145	UOAAAA	WTJAAA	AAAAxx
+5589	6601	1	1	9	9	89	589	1589	589	5589	178	179	ZGAAAA	XTJAAA	HHHHxx
+5103	6602	1	3	3	3	3	103	1103	103	5103	6	7	HOAAAA	YTJAAA	OOOOxx
+3177	6603	1	1	7	17	77	177	1177	3177	3177	154	155	FSAAAA	ZTJAAA	VVVVxx
+8887	6604	1	3	7	7	87	887	887	3887	8887	174	175	VDAAAA	AUJAAA	AAAAxx
+12	6605	0	0	2	12	12	12	12	12	12	24	25	MAAAAA	BUJAAA	HHHHxx
+8575	6606	1	3	5	15	75	575	575	3575	8575	150	151	VRAAAA	CUJAAA	OOOOxx
+4335	6607	1	3	5	15	35	335	335	4335	4335	70	71	TKAAAA	DUJAAA	VVVVxx
+4581	6608	1	1	1	1	81	581	581	4581	4581	162	163	FUAAAA	EUJAAA	AAAAxx
+4444	6609	0	0	4	4	44	444	444	4444	4444	88	89	YOAAAA	FUJAAA	HHHHxx
+7978	6610	0	2	8	18	78	978	1978	2978	7978	156	157	WUAAAA	GUJAAA	OOOOxx
+3081	6611	1	1	1	1	81	81	1081	3081	3081	162	163	NOAAAA	HUJAAA	VVVVxx
+4059	6612	1	3	9	19	59	59	59	4059	4059	118	119	DAAAAA	IUJAAA	AAAAxx
+5711	6613	1	3	1	11	11	711	1711	711	5711	22	23	RLAAAA	JUJAAA	HHHHxx
+7069	6614	1	1	9	9	69	69	1069	2069	7069	138	139	XLAAAA	KUJAAA	OOOOxx
+6150	6615	0	2	0	10	50	150	150	1150	6150	100	101	OCAAAA	LUJAAA	VVVVxx
+9550	6616	0	2	0	10	50	550	1550	4550	9550	100	101	IDAAAA	MUJAAA	AAAAxx
+7087	6617	1	3	7	7	87	87	1087	2087	7087	174	175	PMAAAA	NUJAAA	HHHHxx
+9557	6618	1	1	7	17	57	557	1557	4557	9557	114	115	PDAAAA	OUJAAA	OOOOxx
+7856	6619	0	0	6	16	56	856	1856	2856	7856	112	113	EQAAAA	PUJAAA	VVVVxx
+1115	6620	1	3	5	15	15	115	1115	1115	1115	30	31	XQAAAA	QUJAAA	AAAAxx
+1086	6621	0	2	6	6	86	86	1086	1086	1086	172	173	UPAAAA	RUJAAA	HHHHxx
+5048	6622	0	0	8	8	48	48	1048	48	5048	96	97	EMAAAA	SUJAAA	OOOOxx
+5168	6623	0	0	8	8	68	168	1168	168	5168	136	137	UQAAAA	TUJAAA	VVVVxx
+6029	6624	1	1	9	9	29	29	29	1029	6029	58	59	XXAAAA	UUJAAA	AAAAxx
+546	6625	0	2	6	6	46	546	546	546	546	92	93	AVAAAA	VUJAAA	HHHHxx
+2908	6626	0	0	8	8	8	908	908	2908	2908	16	17	WHAAAA	WUJAAA	OOOOxx
+779	6627	1	3	9	19	79	779	779	779	779	158	159	ZDAAAA	XUJAAA	VVVVxx
+4202	6628	0	2	2	2	2	202	202	4202	4202	4	5	QFAAAA	YUJAAA	AAAAxx
+9984	6629	0	0	4	4	84	984	1984	4984	9984	168	169	AUAAAA	ZUJAAA	HHHHxx
+4730	6630	0	2	0	10	30	730	730	4730	4730	60	61	YZAAAA	AVJAAA	OOOOxx
+6517	6631	1	1	7	17	17	517	517	1517	6517	34	35	RQAAAA	BVJAAA	VVVVxx
+8410	6632	0	2	0	10	10	410	410	3410	8410	20	21	MLAAAA	CVJAAA	AAAAxx
+4793	6633	1	1	3	13	93	793	793	4793	4793	186	187	JCAAAA	DVJAAA	HHHHxx
+3431	6634	1	3	1	11	31	431	1431	3431	3431	62	63	ZBAAAA	EVJAAA	OOOOxx
+2481	6635	1	1	1	1	81	481	481	2481	2481	162	163	LRAAAA	FVJAAA	VVVVxx
+3905	6636	1	1	5	5	5	905	1905	3905	3905	10	11	FUAAAA	GVJAAA	AAAAxx
+8807	6637	1	3	7	7	7	807	807	3807	8807	14	15	TAAAAA	HVJAAA	HHHHxx
+2660	6638	0	0	0	0	60	660	660	2660	2660	120	121	IYAAAA	IVJAAA	OOOOxx
+4985	6639	1	1	5	5	85	985	985	4985	4985	170	171	TJAAAA	JVJAAA	VVVVxx
+3080	6640	0	0	0	0	80	80	1080	3080	3080	160	161	MOAAAA	KVJAAA	AAAAxx
+1090	6641	0	2	0	10	90	90	1090	1090	1090	180	181	YPAAAA	LVJAAA	HHHHxx
+6917	6642	1	1	7	17	17	917	917	1917	6917	34	35	BGAAAA	MVJAAA	OOOOxx
+5177	6643	1	1	7	17	77	177	1177	177	5177	154	155	DRAAAA	NVJAAA	VVVVxx
+2729	6644	1	1	9	9	29	729	729	2729	2729	58	59	ZAAAAA	OVJAAA	AAAAxx
+9706	6645	0	2	6	6	6	706	1706	4706	9706	12	13	IJAAAA	PVJAAA	HHHHxx
+9929	6646	1	1	9	9	29	929	1929	4929	9929	58	59	XRAAAA	QVJAAA	OOOOxx
+1547	6647	1	3	7	7	47	547	1547	1547	1547	94	95	NHAAAA	RVJAAA	VVVVxx
+2798	6648	0	2	8	18	98	798	798	2798	2798	196	197	QDAAAA	SVJAAA	AAAAxx
+4420	6649	0	0	0	0	20	420	420	4420	4420	40	41	AOAAAA	TVJAAA	HHHHxx
+6771	6650	1	3	1	11	71	771	771	1771	6771	142	143	LAAAAA	UVJAAA	OOOOxx
+2004	6651	0	0	4	4	4	4	4	2004	2004	8	9	CZAAAA	VVJAAA	VVVVxx
+8686	6652	0	2	6	6	86	686	686	3686	8686	172	173	CWAAAA	WVJAAA	AAAAxx
+3663	6653	1	3	3	3	63	663	1663	3663	3663	126	127	XKAAAA	XVJAAA	HHHHxx
+806	6654	0	2	6	6	6	806	806	806	806	12	13	AFAAAA	YVJAAA	OOOOxx
+4309	6655	1	1	9	9	9	309	309	4309	4309	18	19	TJAAAA	ZVJAAA	VVVVxx
+7443	6656	1	3	3	3	43	443	1443	2443	7443	86	87	HAAAAA	AWJAAA	AAAAxx
+5779	6657	1	3	9	19	79	779	1779	779	5779	158	159	HOAAAA	BWJAAA	HHHHxx
+8821	6658	1	1	1	1	21	821	821	3821	8821	42	43	HBAAAA	CWJAAA	OOOOxx
+4198	6659	0	2	8	18	98	198	198	4198	4198	196	197	MFAAAA	DWJAAA	VVVVxx
+8115	6660	1	3	5	15	15	115	115	3115	8115	30	31	DAAAAA	EWJAAA	AAAAxx
+9554	6661	0	2	4	14	54	554	1554	4554	9554	108	109	MDAAAA	FWJAAA	HHHHxx
+8956	6662	0	0	6	16	56	956	956	3956	8956	112	113	MGAAAA	GWJAAA	OOOOxx
+4733	6663	1	1	3	13	33	733	733	4733	4733	66	67	BAAAAA	HWJAAA	VVVVxx
+5417	6664	1	1	7	17	17	417	1417	417	5417	34	35	JAAAAA	IWJAAA	AAAAxx
+4792	6665	0	0	2	12	92	792	792	4792	4792	184	185	ICAAAA	JWJAAA	HHHHxx
+462	6666	0	2	2	2	62	462	462	462	462	124	125	URAAAA	KWJAAA	OOOOxx
+3687	6667	1	3	7	7	87	687	1687	3687	3687	174	175	VLAAAA	LWJAAA	VVVVxx
+2013	6668	1	1	3	13	13	13	13	2013	2013	26	27	LZAAAA	MWJAAA	AAAAxx
+5386	6669	0	2	6	6	86	386	1386	386	5386	172	173	EZAAAA	NWJAAA	HHHHxx
+2816	6670	0	0	6	16	16	816	816	2816	2816	32	33	IEAAAA	OWJAAA	OOOOxx
+7827	6671	1	3	7	7	27	827	1827	2827	7827	54	55	BPAAAA	PWJAAA	VVVVxx
+5077	6672	1	1	7	17	77	77	1077	77	5077	154	155	HNAAAA	QWJAAA	AAAAxx
+6039	6673	1	3	9	19	39	39	39	1039	6039	78	79	HYAAAA	RWJAAA	HHHHxx
+215	6674	1	3	5	15	15	215	215	215	215	30	31	HIAAAA	SWJAAA	OOOOxx
+855	6675	1	3	5	15	55	855	855	855	855	110	111	XGAAAA	TWJAAA	VVVVxx
+9692	6676	0	0	2	12	92	692	1692	4692	9692	184	185	UIAAAA	UWJAAA	AAAAxx
+8391	6677	1	3	1	11	91	391	391	3391	8391	182	183	TKAAAA	VWJAAA	HHHHxx
+8424	6678	0	0	4	4	24	424	424	3424	8424	48	49	AMAAAA	WWJAAA	OOOOxx
+6331	6679	1	3	1	11	31	331	331	1331	6331	62	63	NJAAAA	XWJAAA	VVVVxx
+6561	6680	1	1	1	1	61	561	561	1561	6561	122	123	JSAAAA	YWJAAA	AAAAxx
+8955	6681	1	3	5	15	55	955	955	3955	8955	110	111	LGAAAA	ZWJAAA	HHHHxx
+1764	6682	0	0	4	4	64	764	1764	1764	1764	128	129	WPAAAA	AXJAAA	OOOOxx
+6623	6683	1	3	3	3	23	623	623	1623	6623	46	47	TUAAAA	BXJAAA	VVVVxx
+2900	6684	0	0	0	0	0	900	900	2900	2900	0	1	OHAAAA	CXJAAA	AAAAxx
+7048	6685	0	0	8	8	48	48	1048	2048	7048	96	97	CLAAAA	DXJAAA	HHHHxx
+3843	6686	1	3	3	3	43	843	1843	3843	3843	86	87	VRAAAA	EXJAAA	OOOOxx
+4855	6687	1	3	5	15	55	855	855	4855	4855	110	111	TEAAAA	FXJAAA	VVVVxx
+7383	6688	1	3	3	3	83	383	1383	2383	7383	166	167	ZXAAAA	GXJAAA	AAAAxx
+7765	6689	1	1	5	5	65	765	1765	2765	7765	130	131	RMAAAA	HXJAAA	HHHHxx
+1125	6690	1	1	5	5	25	125	1125	1125	1125	50	51	HRAAAA	IXJAAA	OOOOxx
+755	6691	1	3	5	15	55	755	755	755	755	110	111	BDAAAA	JXJAAA	VVVVxx
+2995	6692	1	3	5	15	95	995	995	2995	2995	190	191	FLAAAA	KXJAAA	AAAAxx
+8907	6693	1	3	7	7	7	907	907	3907	8907	14	15	PEAAAA	LXJAAA	HHHHxx
+9357	6694	1	1	7	17	57	357	1357	4357	9357	114	115	XVAAAA	MXJAAA	OOOOxx
+4469	6695	1	1	9	9	69	469	469	4469	4469	138	139	XPAAAA	NXJAAA	VVVVxx
+2147	6696	1	3	7	7	47	147	147	2147	2147	94	95	PEAAAA	OXJAAA	AAAAxx
+2952	6697	0	0	2	12	52	952	952	2952	2952	104	105	OJAAAA	PXJAAA	HHHHxx
+1324	6698	0	0	4	4	24	324	1324	1324	1324	48	49	YYAAAA	QXJAAA	OOOOxx
+1173	6699	1	1	3	13	73	173	1173	1173	1173	146	147	DTAAAA	RXJAAA	VVVVxx
+3169	6700	1	1	9	9	69	169	1169	3169	3169	138	139	XRAAAA	SXJAAA	AAAAxx
+5149	6701	1	1	9	9	49	149	1149	149	5149	98	99	BQAAAA	TXJAAA	HHHHxx
+9660	6702	0	0	0	0	60	660	1660	4660	9660	120	121	OHAAAA	UXJAAA	OOOOxx
+3446	6703	0	2	6	6	46	446	1446	3446	3446	92	93	OCAAAA	VXJAAA	VVVVxx
+6988	6704	0	0	8	8	88	988	988	1988	6988	176	177	UIAAAA	WXJAAA	AAAAxx
+5829	6705	1	1	9	9	29	829	1829	829	5829	58	59	FQAAAA	XXJAAA	HHHHxx
+7166	6706	0	2	6	6	66	166	1166	2166	7166	132	133	QPAAAA	YXJAAA	OOOOxx
+3940	6707	0	0	0	0	40	940	1940	3940	3940	80	81	OVAAAA	ZXJAAA	VVVVxx
+2645	6708	1	1	5	5	45	645	645	2645	2645	90	91	TXAAAA	AYJAAA	AAAAxx
+478	6709	0	2	8	18	78	478	478	478	478	156	157	KSAAAA	BYJAAA	HHHHxx
+1156	6710	0	0	6	16	56	156	1156	1156	1156	112	113	MSAAAA	CYJAAA	OOOOxx
+2731	6711	1	3	1	11	31	731	731	2731	2731	62	63	BBAAAA	DYJAAA	VVVVxx
+5637	6712	1	1	7	17	37	637	1637	637	5637	74	75	VIAAAA	EYJAAA	AAAAxx
+7517	6713	1	1	7	17	17	517	1517	2517	7517	34	35	DDAAAA	FYJAAA	HHHHxx
+5331	6714	1	3	1	11	31	331	1331	331	5331	62	63	BXAAAA	GYJAAA	OOOOxx
+9640	6715	0	0	0	0	40	640	1640	4640	9640	80	81	UGAAAA	HYJAAA	VVVVxx
+4108	6716	0	0	8	8	8	108	108	4108	4108	16	17	ACAAAA	IYJAAA	AAAAxx
+1087	6717	1	3	7	7	87	87	1087	1087	1087	174	175	VPAAAA	JYJAAA	HHHHxx
+8017	6718	1	1	7	17	17	17	17	3017	8017	34	35	JWAAAA	KYJAAA	OOOOxx
+8795	6719	1	3	5	15	95	795	795	3795	8795	190	191	HAAAAA	LYJAAA	VVVVxx
+7060	6720	0	0	0	0	60	60	1060	2060	7060	120	121	OLAAAA	MYJAAA	AAAAxx
+9450	6721	0	2	0	10	50	450	1450	4450	9450	100	101	MZAAAA	NYJAAA	HHHHxx
+390	6722	0	2	0	10	90	390	390	390	390	180	181	APAAAA	OYJAAA	OOOOxx
+66	6723	0	2	6	6	66	66	66	66	66	132	133	OCAAAA	PYJAAA	VVVVxx
+8789	6724	1	1	9	9	89	789	789	3789	8789	178	179	BAAAAA	QYJAAA	AAAAxx
+9260	6725	0	0	0	0	60	260	1260	4260	9260	120	121	ESAAAA	RYJAAA	HHHHxx
+6679	6726	1	3	9	19	79	679	679	1679	6679	158	159	XWAAAA	SYJAAA	OOOOxx
+9052	6727	0	0	2	12	52	52	1052	4052	9052	104	105	EKAAAA	TYJAAA	VVVVxx
+9561	6728	1	1	1	1	61	561	1561	4561	9561	122	123	TDAAAA	UYJAAA	AAAAxx
+9725	6729	1	1	5	5	25	725	1725	4725	9725	50	51	BKAAAA	VYJAAA	HHHHxx
+6298	6730	0	2	8	18	98	298	298	1298	6298	196	197	GIAAAA	WYJAAA	OOOOxx
+8654	6731	0	2	4	14	54	654	654	3654	8654	108	109	WUAAAA	XYJAAA	VVVVxx
+8725	6732	1	1	5	5	25	725	725	3725	8725	50	51	PXAAAA	YYJAAA	AAAAxx
+9377	6733	1	1	7	17	77	377	1377	4377	9377	154	155	RWAAAA	ZYJAAA	HHHHxx
+3807	6734	1	3	7	7	7	807	1807	3807	3807	14	15	LQAAAA	AZJAAA	OOOOxx
+8048	6735	0	0	8	8	48	48	48	3048	8048	96	97	OXAAAA	BZJAAA	VVVVxx
+764	6736	0	0	4	4	64	764	764	764	764	128	129	KDAAAA	CZJAAA	AAAAxx
+9702	6737	0	2	2	2	2	702	1702	4702	9702	4	5	EJAAAA	DZJAAA	HHHHxx
+8060	6738	0	0	0	0	60	60	60	3060	8060	120	121	AYAAAA	EZJAAA	OOOOxx
+6371	6739	1	3	1	11	71	371	371	1371	6371	142	143	BLAAAA	FZJAAA	VVVVxx
+5237	6740	1	1	7	17	37	237	1237	237	5237	74	75	LTAAAA	GZJAAA	AAAAxx
+743	6741	1	3	3	3	43	743	743	743	743	86	87	PCAAAA	HZJAAA	HHHHxx
+7395	6742	1	3	5	15	95	395	1395	2395	7395	190	191	LYAAAA	IZJAAA	OOOOxx
+3365	6743	1	1	5	5	65	365	1365	3365	3365	130	131	LZAAAA	JZJAAA	VVVVxx
+6667	6744	1	3	7	7	67	667	667	1667	6667	134	135	LWAAAA	KZJAAA	AAAAxx
+3445	6745	1	1	5	5	45	445	1445	3445	3445	90	91	NCAAAA	LZJAAA	HHHHxx
+4019	6746	1	3	9	19	19	19	19	4019	4019	38	39	PYAAAA	MZJAAA	OOOOxx
+7035	6747	1	3	5	15	35	35	1035	2035	7035	70	71	PKAAAA	NZJAAA	VVVVxx
+5274	6748	0	2	4	14	74	274	1274	274	5274	148	149	WUAAAA	OZJAAA	AAAAxx
+519	6749	1	3	9	19	19	519	519	519	519	38	39	ZTAAAA	PZJAAA	HHHHxx
+2801	6750	1	1	1	1	1	801	801	2801	2801	2	3	TDAAAA	QZJAAA	OOOOxx
+3320	6751	0	0	0	0	20	320	1320	3320	3320	40	41	SXAAAA	RZJAAA	VVVVxx
+3153	6752	1	1	3	13	53	153	1153	3153	3153	106	107	HRAAAA	SZJAAA	AAAAxx
+7680	6753	0	0	0	0	80	680	1680	2680	7680	160	161	KJAAAA	TZJAAA	HHHHxx
+8942	6754	0	2	2	2	42	942	942	3942	8942	84	85	YFAAAA	UZJAAA	OOOOxx
+3195	6755	1	3	5	15	95	195	1195	3195	3195	190	191	XSAAAA	VZJAAA	VVVVxx
+2287	6756	1	3	7	7	87	287	287	2287	2287	174	175	ZJAAAA	WZJAAA	AAAAxx
+8325	6757	1	1	5	5	25	325	325	3325	8325	50	51	FIAAAA	XZJAAA	HHHHxx
+2603	6758	1	3	3	3	3	603	603	2603	2603	6	7	DWAAAA	YZJAAA	OOOOxx
+5871	6759	1	3	1	11	71	871	1871	871	5871	142	143	VRAAAA	ZZJAAA	VVVVxx
+1773	6760	1	1	3	13	73	773	1773	1773	1773	146	147	FQAAAA	AAKAAA	AAAAxx
+3323	6761	1	3	3	3	23	323	1323	3323	3323	46	47	VXAAAA	BAKAAA	HHHHxx
+2053	6762	1	1	3	13	53	53	53	2053	2053	106	107	ZAAAAA	CAKAAA	OOOOxx
+4062	6763	0	2	2	2	62	62	62	4062	4062	124	125	GAAAAA	DAKAAA	VVVVxx
+4611	6764	1	3	1	11	11	611	611	4611	4611	22	23	JVAAAA	EAKAAA	AAAAxx
+3451	6765	1	3	1	11	51	451	1451	3451	3451	102	103	TCAAAA	FAKAAA	HHHHxx
+1819	6766	1	3	9	19	19	819	1819	1819	1819	38	39	ZRAAAA	GAKAAA	OOOOxx
+9806	6767	0	2	6	6	6	806	1806	4806	9806	12	13	ENAAAA	HAKAAA	VVVVxx
+6619	6768	1	3	9	19	19	619	619	1619	6619	38	39	PUAAAA	IAKAAA	AAAAxx
+1031	6769	1	3	1	11	31	31	1031	1031	1031	62	63	RNAAAA	JAKAAA	HHHHxx
+1865	6770	1	1	5	5	65	865	1865	1865	1865	130	131	TTAAAA	KAKAAA	OOOOxx
+6282	6771	0	2	2	2	82	282	282	1282	6282	164	165	QHAAAA	LAKAAA	VVVVxx
+1178	6772	0	2	8	18	78	178	1178	1178	1178	156	157	ITAAAA	MAKAAA	AAAAxx
+8007	6773	1	3	7	7	7	7	7	3007	8007	14	15	ZVAAAA	NAKAAA	HHHHxx
+9126	6774	0	2	6	6	26	126	1126	4126	9126	52	53	ANAAAA	OAKAAA	OOOOxx
+9113	6775	1	1	3	13	13	113	1113	4113	9113	26	27	NMAAAA	PAKAAA	VVVVxx
+537	6776	1	1	7	17	37	537	537	537	537	74	75	RUAAAA	QAKAAA	AAAAxx
+6208	6777	0	0	8	8	8	208	208	1208	6208	16	17	UEAAAA	RAKAAA	HHHHxx
+1626	6778	0	2	6	6	26	626	1626	1626	1626	52	53	OKAAAA	SAKAAA	OOOOxx
+7188	6779	0	0	8	8	88	188	1188	2188	7188	176	177	MQAAAA	TAKAAA	VVVVxx
+9216	6780	0	0	6	16	16	216	1216	4216	9216	32	33	MQAAAA	UAKAAA	AAAAxx
+6134	6781	0	2	4	14	34	134	134	1134	6134	68	69	YBAAAA	VAKAAA	HHHHxx
+2074	6782	0	2	4	14	74	74	74	2074	2074	148	149	UBAAAA	WAKAAA	OOOOxx
+6369	6783	1	1	9	9	69	369	369	1369	6369	138	139	ZKAAAA	XAKAAA	VVVVxx
+9306	6784	0	2	6	6	6	306	1306	4306	9306	12	13	YTAAAA	YAKAAA	AAAAxx
+3155	6785	1	3	5	15	55	155	1155	3155	3155	110	111	JRAAAA	ZAKAAA	HHHHxx
+3611	6786	1	3	1	11	11	611	1611	3611	3611	22	23	XIAAAA	ABKAAA	OOOOxx
+6530	6787	0	2	0	10	30	530	530	1530	6530	60	61	ERAAAA	BBKAAA	VVVVxx
+6979	6788	1	3	9	19	79	979	979	1979	6979	158	159	LIAAAA	CBKAAA	AAAAxx
+9129	6789	1	1	9	9	29	129	1129	4129	9129	58	59	DNAAAA	DBKAAA	HHHHxx
+8013	6790	1	1	3	13	13	13	13	3013	8013	26	27	FWAAAA	EBKAAA	OOOOxx
+6926	6791	0	2	6	6	26	926	926	1926	6926	52	53	KGAAAA	FBKAAA	VVVVxx
+1877	6792	1	1	7	17	77	877	1877	1877	1877	154	155	FUAAAA	GBKAAA	AAAAxx
+1882	6793	0	2	2	2	82	882	1882	1882	1882	164	165	KUAAAA	HBKAAA	HHHHxx
+6720	6794	0	0	0	0	20	720	720	1720	6720	40	41	MYAAAA	IBKAAA	OOOOxx
+690	6795	0	2	0	10	90	690	690	690	690	180	181	OAAAAA	JBKAAA	VVVVxx
+143	6796	1	3	3	3	43	143	143	143	143	86	87	NFAAAA	KBKAAA	AAAAxx
+7241	6797	1	1	1	1	41	241	1241	2241	7241	82	83	NSAAAA	LBKAAA	HHHHxx
+6461	6798	1	1	1	1	61	461	461	1461	6461	122	123	NOAAAA	MBKAAA	OOOOxx
+2258	6799	0	2	8	18	58	258	258	2258	2258	116	117	WIAAAA	NBKAAA	VVVVxx
+2280	6800	0	0	0	0	80	280	280	2280	2280	160	161	SJAAAA	OBKAAA	AAAAxx
+7556	6801	0	0	6	16	56	556	1556	2556	7556	112	113	QEAAAA	PBKAAA	HHHHxx
+1038	6802	0	2	8	18	38	38	1038	1038	1038	76	77	YNAAAA	QBKAAA	OOOOxx
+2634	6803	0	2	4	14	34	634	634	2634	2634	68	69	IXAAAA	RBKAAA	VVVVxx
+7847	6804	1	3	7	7	47	847	1847	2847	7847	94	95	VPAAAA	SBKAAA	AAAAxx
+4415	6805	1	3	5	15	15	415	415	4415	4415	30	31	VNAAAA	TBKAAA	HHHHxx
+1933	6806	1	1	3	13	33	933	1933	1933	1933	66	67	JWAAAA	UBKAAA	OOOOxx
+8034	6807	0	2	4	14	34	34	34	3034	8034	68	69	AXAAAA	VBKAAA	VVVVxx
+9233	6808	1	1	3	13	33	233	1233	4233	9233	66	67	DRAAAA	WBKAAA	AAAAxx
+6572	6809	0	0	2	12	72	572	572	1572	6572	144	145	USAAAA	XBKAAA	HHHHxx
+1586	6810	0	2	6	6	86	586	1586	1586	1586	172	173	AJAAAA	YBKAAA	OOOOxx
+8512	6811	0	0	2	12	12	512	512	3512	8512	24	25	KPAAAA	ZBKAAA	VVVVxx
+7421	6812	1	1	1	1	21	421	1421	2421	7421	42	43	LZAAAA	ACKAAA	AAAAxx
+503	6813	1	3	3	3	3	503	503	503	503	6	7	JTAAAA	BCKAAA	HHHHxx
+5332	6814	0	0	2	12	32	332	1332	332	5332	64	65	CXAAAA	CCKAAA	OOOOxx
+2602	6815	0	2	2	2	2	602	602	2602	2602	4	5	CWAAAA	DCKAAA	VVVVxx
+2902	6816	0	2	2	2	2	902	902	2902	2902	4	5	QHAAAA	ECKAAA	AAAAxx
+2979	6817	1	3	9	19	79	979	979	2979	2979	158	159	PKAAAA	FCKAAA	HHHHxx
+1431	6818	1	3	1	11	31	431	1431	1431	1431	62	63	BDAAAA	GCKAAA	OOOOxx
+8639	6819	1	3	9	19	39	639	639	3639	8639	78	79	HUAAAA	HCKAAA	VVVVxx
+4218	6820	0	2	8	18	18	218	218	4218	4218	36	37	GGAAAA	ICKAAA	AAAAxx
+7453	6821	1	1	3	13	53	453	1453	2453	7453	106	107	RAAAAA	JCKAAA	HHHHxx
+5448	6822	0	0	8	8	48	448	1448	448	5448	96	97	OBAAAA	KCKAAA	OOOOxx
+6768	6823	0	0	8	8	68	768	768	1768	6768	136	137	IAAAAA	LCKAAA	VVVVxx
+3104	6824	0	0	4	4	4	104	1104	3104	3104	8	9	KPAAAA	MCKAAA	AAAAxx
+2297	6825	1	1	7	17	97	297	297	2297	2297	194	195	JKAAAA	NCKAAA	HHHHxx
+7994	6826	0	2	4	14	94	994	1994	2994	7994	188	189	MVAAAA	OCKAAA	OOOOxx
+550	6827	0	2	0	10	50	550	550	550	550	100	101	EVAAAA	PCKAAA	VVVVxx
+4777	6828	1	1	7	17	77	777	777	4777	4777	154	155	TBAAAA	QCKAAA	AAAAxx
+5962	6829	0	2	2	2	62	962	1962	962	5962	124	125	IVAAAA	RCKAAA	HHHHxx
+1763	6830	1	3	3	3	63	763	1763	1763	1763	126	127	VPAAAA	SCKAAA	OOOOxx
+3654	6831	0	2	4	14	54	654	1654	3654	3654	108	109	OKAAAA	TCKAAA	VVVVxx
+4106	6832	0	2	6	6	6	106	106	4106	4106	12	13	YBAAAA	UCKAAA	AAAAxx
+5156	6833	0	0	6	16	56	156	1156	156	5156	112	113	IQAAAA	VCKAAA	HHHHxx
+422	6834	0	2	2	2	22	422	422	422	422	44	45	GQAAAA	WCKAAA	OOOOxx
+5011	6835	1	3	1	11	11	11	1011	11	5011	22	23	TKAAAA	XCKAAA	VVVVxx
+218	6836	0	2	8	18	18	218	218	218	218	36	37	KIAAAA	YCKAAA	AAAAxx
+9762	6837	0	2	2	2	62	762	1762	4762	9762	124	125	MLAAAA	ZCKAAA	HHHHxx
+6074	6838	0	2	4	14	74	74	74	1074	6074	148	149	QZAAAA	ADKAAA	OOOOxx
+4060	6839	0	0	0	0	60	60	60	4060	4060	120	121	EAAAAA	BDKAAA	VVVVxx
+8680	6840	0	0	0	0	80	680	680	3680	8680	160	161	WVAAAA	CDKAAA	AAAAxx
+5863	6841	1	3	3	3	63	863	1863	863	5863	126	127	NRAAAA	DDKAAA	HHHHxx
+8042	6842	0	2	2	2	42	42	42	3042	8042	84	85	IXAAAA	EDKAAA	OOOOxx
+2964	6843	0	0	4	4	64	964	964	2964	2964	128	129	AKAAAA	FDKAAA	VVVVxx
+6931	6844	1	3	1	11	31	931	931	1931	6931	62	63	PGAAAA	GDKAAA	AAAAxx
+6715	6845	1	3	5	15	15	715	715	1715	6715	30	31	HYAAAA	HDKAAA	HHHHxx
+5859	6846	1	3	9	19	59	859	1859	859	5859	118	119	JRAAAA	IDKAAA	OOOOxx
+6173	6847	1	1	3	13	73	173	173	1173	6173	146	147	LDAAAA	JDKAAA	VVVVxx
+7788	6848	0	0	8	8	88	788	1788	2788	7788	176	177	ONAAAA	KDKAAA	AAAAxx
+9370	6849	0	2	0	10	70	370	1370	4370	9370	140	141	KWAAAA	LDKAAA	HHHHxx
+3038	6850	0	2	8	18	38	38	1038	3038	3038	76	77	WMAAAA	MDKAAA	OOOOxx
+6483	6851	1	3	3	3	83	483	483	1483	6483	166	167	JPAAAA	NDKAAA	VVVVxx
+7534	6852	0	2	4	14	34	534	1534	2534	7534	68	69	UDAAAA	ODKAAA	AAAAxx
+5769	6853	1	1	9	9	69	769	1769	769	5769	138	139	XNAAAA	PDKAAA	HHHHxx
+9152	6854	0	0	2	12	52	152	1152	4152	9152	104	105	AOAAAA	QDKAAA	OOOOxx
+6251	6855	1	3	1	11	51	251	251	1251	6251	102	103	LGAAAA	RDKAAA	VVVVxx
+9209	6856	1	1	9	9	9	209	1209	4209	9209	18	19	FQAAAA	SDKAAA	AAAAxx
+5365	6857	1	1	5	5	65	365	1365	365	5365	130	131	JYAAAA	TDKAAA	HHHHxx
+509	6858	1	1	9	9	9	509	509	509	509	18	19	PTAAAA	UDKAAA	OOOOxx
+3132	6859	0	0	2	12	32	132	1132	3132	3132	64	65	MQAAAA	VDKAAA	VVVVxx
+5373	6860	1	1	3	13	73	373	1373	373	5373	146	147	RYAAAA	WDKAAA	AAAAxx
+4247	6861	1	3	7	7	47	247	247	4247	4247	94	95	JHAAAA	XDKAAA	HHHHxx
+3491	6862	1	3	1	11	91	491	1491	3491	3491	182	183	HEAAAA	YDKAAA	OOOOxx
+495	6863	1	3	5	15	95	495	495	495	495	190	191	BTAAAA	ZDKAAA	VVVVxx
+1594	6864	0	2	4	14	94	594	1594	1594	1594	188	189	IJAAAA	AEKAAA	AAAAxx
+2243	6865	1	3	3	3	43	243	243	2243	2243	86	87	HIAAAA	BEKAAA	HHHHxx
+7780	6866	0	0	0	0	80	780	1780	2780	7780	160	161	GNAAAA	CEKAAA	OOOOxx
+5632	6867	0	0	2	12	32	632	1632	632	5632	64	65	QIAAAA	DEKAAA	VVVVxx
+2679	6868	1	3	9	19	79	679	679	2679	2679	158	159	BZAAAA	EEKAAA	AAAAxx
+1354	6869	0	2	4	14	54	354	1354	1354	1354	108	109	CAAAAA	FEKAAA	HHHHxx
+180	6870	0	0	0	0	80	180	180	180	180	160	161	YGAAAA	GEKAAA	OOOOxx
+7017	6871	1	1	7	17	17	17	1017	2017	7017	34	35	XJAAAA	HEKAAA	VVVVxx
+1867	6872	1	3	7	7	67	867	1867	1867	1867	134	135	VTAAAA	IEKAAA	AAAAxx
+2213	6873	1	1	3	13	13	213	213	2213	2213	26	27	DHAAAA	JEKAAA	HHHHxx
+8773	6874	1	1	3	13	73	773	773	3773	8773	146	147	LZAAAA	KEKAAA	OOOOxx
+1784	6875	0	0	4	4	84	784	1784	1784	1784	168	169	QQAAAA	LEKAAA	VVVVxx
+5961	6876	1	1	1	1	61	961	1961	961	5961	122	123	HVAAAA	MEKAAA	AAAAxx
+8801	6877	1	1	1	1	1	801	801	3801	8801	2	3	NAAAAA	NEKAAA	HHHHxx
+4860	6878	0	0	0	0	60	860	860	4860	4860	120	121	YEAAAA	OEKAAA	OOOOxx
+2214	6879	0	2	4	14	14	214	214	2214	2214	28	29	EHAAAA	PEKAAA	VVVVxx
+1735	6880	1	3	5	15	35	735	1735	1735	1735	70	71	TOAAAA	QEKAAA	AAAAxx
+578	6881	0	2	8	18	78	578	578	578	578	156	157	GWAAAA	REKAAA	HHHHxx
+7853	6882	1	1	3	13	53	853	1853	2853	7853	106	107	BQAAAA	SEKAAA	OOOOxx
+2215	6883	1	3	5	15	15	215	215	2215	2215	30	31	FHAAAA	TEKAAA	VVVVxx
+4704	6884	0	0	4	4	4	704	704	4704	4704	8	9	YYAAAA	UEKAAA	AAAAxx
+9379	6885	1	3	9	19	79	379	1379	4379	9379	158	159	TWAAAA	VEKAAA	HHHHxx
+9745	6886	1	1	5	5	45	745	1745	4745	9745	90	91	VKAAAA	WEKAAA	OOOOxx
+5636	6887	0	0	6	16	36	636	1636	636	5636	72	73	UIAAAA	XEKAAA	VVVVxx
+4548	6888	0	0	8	8	48	548	548	4548	4548	96	97	YSAAAA	YEKAAA	AAAAxx
+6537	6889	1	1	7	17	37	537	537	1537	6537	74	75	LRAAAA	ZEKAAA	HHHHxx
+7748	6890	0	0	8	8	48	748	1748	2748	7748	96	97	AMAAAA	AFKAAA	OOOOxx
+687	6891	1	3	7	7	87	687	687	687	687	174	175	LAAAAA	BFKAAA	VVVVxx
+1243	6892	1	3	3	3	43	243	1243	1243	1243	86	87	VVAAAA	CFKAAA	AAAAxx
+852	6893	0	0	2	12	52	852	852	852	852	104	105	UGAAAA	DFKAAA	HHHHxx
+785	6894	1	1	5	5	85	785	785	785	785	170	171	FEAAAA	EFKAAA	OOOOxx
+2002	6895	0	2	2	2	2	2	2	2002	2002	4	5	AZAAAA	FFKAAA	VVVVxx
+2748	6896	0	0	8	8	48	748	748	2748	2748	96	97	SBAAAA	GFKAAA	AAAAxx
+6075	6897	1	3	5	15	75	75	75	1075	6075	150	151	RZAAAA	HFKAAA	HHHHxx
+7029	6898	1	1	9	9	29	29	1029	2029	7029	58	59	JKAAAA	IFKAAA	OOOOxx
+7474	6899	0	2	4	14	74	474	1474	2474	7474	148	149	MBAAAA	JFKAAA	VVVVxx
+7755	6900	1	3	5	15	55	755	1755	2755	7755	110	111	HMAAAA	KFKAAA	AAAAxx
+1456	6901	0	0	6	16	56	456	1456	1456	1456	112	113	AEAAAA	LFKAAA	HHHHxx
+2808	6902	0	0	8	8	8	808	808	2808	2808	16	17	AEAAAA	MFKAAA	OOOOxx
+4089	6903	1	1	9	9	89	89	89	4089	4089	178	179	HBAAAA	NFKAAA	VVVVxx
+4718	6904	0	2	8	18	18	718	718	4718	4718	36	37	MZAAAA	OFKAAA	AAAAxx
+910	6905	0	2	0	10	10	910	910	910	910	20	21	AJAAAA	PFKAAA	HHHHxx
+2868	6906	0	0	8	8	68	868	868	2868	2868	136	137	IGAAAA	QFKAAA	OOOOxx
+2103	6907	1	3	3	3	3	103	103	2103	2103	6	7	XCAAAA	RFKAAA	VVVVxx
+2407	6908	1	3	7	7	7	407	407	2407	2407	14	15	POAAAA	SFKAAA	AAAAxx
+4353	6909	1	1	3	13	53	353	353	4353	4353	106	107	LLAAAA	TFKAAA	HHHHxx
+7988	6910	0	0	8	8	88	988	1988	2988	7988	176	177	GVAAAA	UFKAAA	OOOOxx
+2750	6911	0	2	0	10	50	750	750	2750	2750	100	101	UBAAAA	VFKAAA	VVVVxx
+2006	6912	0	2	6	6	6	6	6	2006	2006	12	13	EZAAAA	WFKAAA	AAAAxx
+4617	6913	1	1	7	17	17	617	617	4617	4617	34	35	PVAAAA	XFKAAA	HHHHxx
+1251	6914	1	3	1	11	51	251	1251	1251	1251	102	103	DWAAAA	YFKAAA	OOOOxx
+4590	6915	0	2	0	10	90	590	590	4590	4590	180	181	OUAAAA	ZFKAAA	VVVVxx
+1144	6916	0	0	4	4	44	144	1144	1144	1144	88	89	ASAAAA	AGKAAA	AAAAxx
+7131	6917	1	3	1	11	31	131	1131	2131	7131	62	63	HOAAAA	BGKAAA	HHHHxx
+95	6918	1	3	5	15	95	95	95	95	95	190	191	RDAAAA	CGKAAA	OOOOxx
+4827	6919	1	3	7	7	27	827	827	4827	4827	54	55	RDAAAA	DGKAAA	VVVVxx
+4307	6920	1	3	7	7	7	307	307	4307	4307	14	15	RJAAAA	EGKAAA	AAAAxx
+1505	6921	1	1	5	5	5	505	1505	1505	1505	10	11	XFAAAA	FGKAAA	HHHHxx
+8191	6922	1	3	1	11	91	191	191	3191	8191	182	183	BDAAAA	GGKAAA	OOOOxx
+5037	6923	1	1	7	17	37	37	1037	37	5037	74	75	TLAAAA	HGKAAA	VVVVxx
+7363	6924	1	3	3	3	63	363	1363	2363	7363	126	127	FXAAAA	IGKAAA	AAAAxx
+8427	6925	1	3	7	7	27	427	427	3427	8427	54	55	DMAAAA	JGKAAA	HHHHxx
+5231	6926	1	3	1	11	31	231	1231	231	5231	62	63	FTAAAA	KGKAAA	OOOOxx
+2943	6927	1	3	3	3	43	943	943	2943	2943	86	87	FJAAAA	LGKAAA	VVVVxx
+4624	6928	0	0	4	4	24	624	624	4624	4624	48	49	WVAAAA	MGKAAA	AAAAxx
+2020	6929	0	0	0	0	20	20	20	2020	2020	40	41	SZAAAA	NGKAAA	HHHHxx
+6155	6930	1	3	5	15	55	155	155	1155	6155	110	111	TCAAAA	OGKAAA	OOOOxx
+4381	6931	1	1	1	1	81	381	381	4381	4381	162	163	NMAAAA	PGKAAA	VVVVxx
+1057	6932	1	1	7	17	57	57	1057	1057	1057	114	115	ROAAAA	QGKAAA	AAAAxx
+9010	6933	0	2	0	10	10	10	1010	4010	9010	20	21	OIAAAA	RGKAAA	HHHHxx
+4947	6934	1	3	7	7	47	947	947	4947	4947	94	95	HIAAAA	SGKAAA	OOOOxx
+335	6935	1	3	5	15	35	335	335	335	335	70	71	XMAAAA	TGKAAA	VVVVxx
+6890	6936	0	2	0	10	90	890	890	1890	6890	180	181	AFAAAA	UGKAAA	AAAAxx
+5070	6937	0	2	0	10	70	70	1070	70	5070	140	141	ANAAAA	VGKAAA	HHHHxx
+5270	6938	0	2	0	10	70	270	1270	270	5270	140	141	SUAAAA	WGKAAA	OOOOxx
+8657	6939	1	1	7	17	57	657	657	3657	8657	114	115	ZUAAAA	XGKAAA	VVVVxx
+7625	6940	1	1	5	5	25	625	1625	2625	7625	50	51	HHAAAA	YGKAAA	AAAAxx
+5759	6941	1	3	9	19	59	759	1759	759	5759	118	119	NNAAAA	ZGKAAA	HHHHxx
+9483	6942	1	3	3	3	83	483	1483	4483	9483	166	167	TAAAAA	AHKAAA	OOOOxx
+8304	6943	0	0	4	4	4	304	304	3304	8304	8	9	KHAAAA	BHKAAA	VVVVxx
+296	6944	0	0	6	16	96	296	296	296	296	192	193	KLAAAA	CHKAAA	AAAAxx
+1176	6945	0	0	6	16	76	176	1176	1176	1176	152	153	GTAAAA	DHKAAA	HHHHxx
+2069	6946	1	1	9	9	69	69	69	2069	2069	138	139	PBAAAA	EHKAAA	OOOOxx
+1531	6947	1	3	1	11	31	531	1531	1531	1531	62	63	XGAAAA	FHKAAA	VVVVxx
+5329	6948	1	1	9	9	29	329	1329	329	5329	58	59	ZWAAAA	GHKAAA	AAAAxx
+3702	6949	0	2	2	2	2	702	1702	3702	3702	4	5	KMAAAA	HHKAAA	HHHHxx
+6520	6950	0	0	0	0	20	520	520	1520	6520	40	41	UQAAAA	IHKAAA	OOOOxx
+7310	6951	0	2	0	10	10	310	1310	2310	7310	20	21	EVAAAA	JHKAAA	VVVVxx
+1175	6952	1	3	5	15	75	175	1175	1175	1175	150	151	FTAAAA	KHKAAA	AAAAxx
+9107	6953	1	3	7	7	7	107	1107	4107	9107	14	15	HMAAAA	LHKAAA	HHHHxx
+2737	6954	1	1	7	17	37	737	737	2737	2737	74	75	HBAAAA	MHKAAA	OOOOxx
+3437	6955	1	1	7	17	37	437	1437	3437	3437	74	75	FCAAAA	NHKAAA	VVVVxx
+281	6956	1	1	1	1	81	281	281	281	281	162	163	VKAAAA	OHKAAA	AAAAxx
+6676	6957	0	0	6	16	76	676	676	1676	6676	152	153	UWAAAA	PHKAAA	HHHHxx
+145	6958	1	1	5	5	45	145	145	145	145	90	91	PFAAAA	QHKAAA	OOOOxx
+3172	6959	0	0	2	12	72	172	1172	3172	3172	144	145	ASAAAA	RHKAAA	VVVVxx
+4049	6960	1	1	9	9	49	49	49	4049	4049	98	99	TZAAAA	SHKAAA	AAAAxx
+6042	6961	0	2	2	2	42	42	42	1042	6042	84	85	KYAAAA	THKAAA	HHHHxx
+9122	6962	0	2	2	2	22	122	1122	4122	9122	44	45	WMAAAA	UHKAAA	OOOOxx
+7244	6963	0	0	4	4	44	244	1244	2244	7244	88	89	QSAAAA	VHKAAA	VVVVxx
+5361	6964	1	1	1	1	61	361	1361	361	5361	122	123	FYAAAA	WHKAAA	AAAAxx
+8647	6965	1	3	7	7	47	647	647	3647	8647	94	95	PUAAAA	XHKAAA	HHHHxx
+7956	6966	0	0	6	16	56	956	1956	2956	7956	112	113	AUAAAA	YHKAAA	OOOOxx
+7812	6967	0	0	2	12	12	812	1812	2812	7812	24	25	MOAAAA	ZHKAAA	VVVVxx
+570	6968	0	2	0	10	70	570	570	570	570	140	141	YVAAAA	AIKAAA	AAAAxx
+4115	6969	1	3	5	15	15	115	115	4115	4115	30	31	HCAAAA	BIKAAA	HHHHxx
+1856	6970	0	0	6	16	56	856	1856	1856	1856	112	113	KTAAAA	CIKAAA	OOOOxx
+9582	6971	0	2	2	2	82	582	1582	4582	9582	164	165	OEAAAA	DIKAAA	VVVVxx
+2025	6972	1	1	5	5	25	25	25	2025	2025	50	51	XZAAAA	EIKAAA	AAAAxx
+986	6973	0	2	6	6	86	986	986	986	986	172	173	YLAAAA	FIKAAA	HHHHxx
+8358	6974	0	2	8	18	58	358	358	3358	8358	116	117	MJAAAA	GIKAAA	OOOOxx
+510	6975	0	2	0	10	10	510	510	510	510	20	21	QTAAAA	HIKAAA	VVVVxx
+6101	6976	1	1	1	1	1	101	101	1101	6101	2	3	RAAAAA	IIKAAA	AAAAxx
+4167	6977	1	3	7	7	67	167	167	4167	4167	134	135	HEAAAA	JIKAAA	HHHHxx
+6139	6978	1	3	9	19	39	139	139	1139	6139	78	79	DCAAAA	KIKAAA	OOOOxx
+6912	6979	0	0	2	12	12	912	912	1912	6912	24	25	WFAAAA	LIKAAA	VVVVxx
+339	6980	1	3	9	19	39	339	339	339	339	78	79	BNAAAA	MIKAAA	AAAAxx
+8759	6981	1	3	9	19	59	759	759	3759	8759	118	119	XYAAAA	NIKAAA	HHHHxx
+246	6982	0	2	6	6	46	246	246	246	246	92	93	MJAAAA	OIKAAA	OOOOxx
+2831	6983	1	3	1	11	31	831	831	2831	2831	62	63	XEAAAA	PIKAAA	VVVVxx
+2327	6984	1	3	7	7	27	327	327	2327	2327	54	55	NLAAAA	QIKAAA	AAAAxx
+7001	6985	1	1	1	1	1	1	1001	2001	7001	2	3	HJAAAA	RIKAAA	HHHHxx
+4398	6986	0	2	8	18	98	398	398	4398	4398	196	197	ENAAAA	SIKAAA	OOOOxx
+1495	6987	1	3	5	15	95	495	1495	1495	1495	190	191	NFAAAA	TIKAAA	VVVVxx
+8522	6988	0	2	2	2	22	522	522	3522	8522	44	45	UPAAAA	UIKAAA	AAAAxx
+7090	6989	0	2	0	10	90	90	1090	2090	7090	180	181	SMAAAA	VIKAAA	HHHHxx
+8457	6990	1	1	7	17	57	457	457	3457	8457	114	115	HNAAAA	WIKAAA	OOOOxx
+4238	6991	0	2	8	18	38	238	238	4238	4238	76	77	AHAAAA	XIKAAA	VVVVxx
+6791	6992	1	3	1	11	91	791	791	1791	6791	182	183	FBAAAA	YIKAAA	AAAAxx
+1342	6993	0	2	2	2	42	342	1342	1342	1342	84	85	QZAAAA	ZIKAAA	HHHHxx
+4580	6994	0	0	0	0	80	580	580	4580	4580	160	161	EUAAAA	AJKAAA	OOOOxx
+1475	6995	1	3	5	15	75	475	1475	1475	1475	150	151	TEAAAA	BJKAAA	VVVVxx
+9184	6996	0	0	4	4	84	184	1184	4184	9184	168	169	GPAAAA	CJKAAA	AAAAxx
+1189	6997	1	1	9	9	89	189	1189	1189	1189	178	179	TTAAAA	DJKAAA	HHHHxx
+638	6998	0	2	8	18	38	638	638	638	638	76	77	OYAAAA	EJKAAA	OOOOxx
+5867	6999	1	3	7	7	67	867	1867	867	5867	134	135	RRAAAA	FJKAAA	VVVVxx
+9911	7000	1	3	1	11	11	911	1911	4911	9911	22	23	FRAAAA	GJKAAA	AAAAxx
+8147	7001	1	3	7	7	47	147	147	3147	8147	94	95	JBAAAA	HJKAAA	HHHHxx
+4492	7002	0	0	2	12	92	492	492	4492	4492	184	185	UQAAAA	IJKAAA	OOOOxx
+385	7003	1	1	5	5	85	385	385	385	385	170	171	VOAAAA	JJKAAA	VVVVxx
+5235	7004	1	3	5	15	35	235	1235	235	5235	70	71	JTAAAA	KJKAAA	AAAAxx
+4812	7005	0	0	2	12	12	812	812	4812	4812	24	25	CDAAAA	LJKAAA	HHHHxx
+9807	7006	1	3	7	7	7	807	1807	4807	9807	14	15	FNAAAA	MJKAAA	OOOOxx
+9588	7007	0	0	8	8	88	588	1588	4588	9588	176	177	UEAAAA	NJKAAA	VVVVxx
+9832	7008	0	0	2	12	32	832	1832	4832	9832	64	65	EOAAAA	OJKAAA	AAAAxx
+3757	7009	1	1	7	17	57	757	1757	3757	3757	114	115	NOAAAA	PJKAAA	HHHHxx
+9703	7010	1	3	3	3	3	703	1703	4703	9703	6	7	FJAAAA	QJKAAA	OOOOxx
+1022	7011	0	2	2	2	22	22	1022	1022	1022	44	45	INAAAA	RJKAAA	VVVVxx
+5165	7012	1	1	5	5	65	165	1165	165	5165	130	131	RQAAAA	SJKAAA	AAAAxx
+7129	7013	1	1	9	9	29	129	1129	2129	7129	58	59	FOAAAA	TJKAAA	HHHHxx
+4164	7014	0	0	4	4	64	164	164	4164	4164	128	129	EEAAAA	UJKAAA	OOOOxx
+7239	7015	1	3	9	19	39	239	1239	2239	7239	78	79	LSAAAA	VJKAAA	VVVVxx
+523	7016	1	3	3	3	23	523	523	523	523	46	47	DUAAAA	WJKAAA	AAAAxx
+4670	7017	0	2	0	10	70	670	670	4670	4670	140	141	QXAAAA	XJKAAA	HHHHxx
+8503	7018	1	3	3	3	3	503	503	3503	8503	6	7	BPAAAA	YJKAAA	OOOOxx
+714	7019	0	2	4	14	14	714	714	714	714	28	29	MBAAAA	ZJKAAA	VVVVxx
+1350	7020	0	2	0	10	50	350	1350	1350	1350	100	101	YZAAAA	AKKAAA	AAAAxx
+8318	7021	0	2	8	18	18	318	318	3318	8318	36	37	YHAAAA	BKKAAA	HHHHxx
+1834	7022	0	2	4	14	34	834	1834	1834	1834	68	69	OSAAAA	CKKAAA	OOOOxx
+4306	7023	0	2	6	6	6	306	306	4306	4306	12	13	QJAAAA	DKKAAA	VVVVxx
+8543	7024	1	3	3	3	43	543	543	3543	8543	86	87	PQAAAA	EKKAAA	AAAAxx
+9397	7025	1	1	7	17	97	397	1397	4397	9397	194	195	LXAAAA	FKKAAA	HHHHxx
+3145	7026	1	1	5	5	45	145	1145	3145	3145	90	91	ZQAAAA	GKKAAA	OOOOxx
+3942	7027	0	2	2	2	42	942	1942	3942	3942	84	85	QVAAAA	HKKAAA	VVVVxx
+8583	7028	1	3	3	3	83	583	583	3583	8583	166	167	DSAAAA	IKKAAA	AAAAxx
+8073	7029	1	1	3	13	73	73	73	3073	8073	146	147	NYAAAA	JKKAAA	HHHHxx
+4940	7030	0	0	0	0	40	940	940	4940	4940	80	81	AIAAAA	KKKAAA	OOOOxx
+9573	7031	1	1	3	13	73	573	1573	4573	9573	146	147	FEAAAA	LKKAAA	VVVVxx
+5325	7032	1	1	5	5	25	325	1325	325	5325	50	51	VWAAAA	MKKAAA	AAAAxx
+1833	7033	1	1	3	13	33	833	1833	1833	1833	66	67	NSAAAA	NKKAAA	HHHHxx
+1337	7034	1	1	7	17	37	337	1337	1337	1337	74	75	LZAAAA	OKKAAA	OOOOxx
+9749	7035	1	1	9	9	49	749	1749	4749	9749	98	99	ZKAAAA	PKKAAA	VVVVxx
+7505	7036	1	1	5	5	5	505	1505	2505	7505	10	11	RCAAAA	QKKAAA	AAAAxx
+9731	7037	1	3	1	11	31	731	1731	4731	9731	62	63	HKAAAA	RKKAAA	HHHHxx
+4098	7038	0	2	8	18	98	98	98	4098	4098	196	197	QBAAAA	SKKAAA	OOOOxx
+1418	7039	0	2	8	18	18	418	1418	1418	1418	36	37	OCAAAA	TKKAAA	VVVVxx
+63	7040	1	3	3	3	63	63	63	63	63	126	127	LCAAAA	UKKAAA	AAAAxx
+9889	7041	1	1	9	9	89	889	1889	4889	9889	178	179	JQAAAA	VKKAAA	HHHHxx
+2871	7042	1	3	1	11	71	871	871	2871	2871	142	143	LGAAAA	WKKAAA	OOOOxx
+1003	7043	1	3	3	3	3	3	1003	1003	1003	6	7	PMAAAA	XKKAAA	VVVVxx
+8796	7044	0	0	6	16	96	796	796	3796	8796	192	193	IAAAAA	YKKAAA	AAAAxx
+22	7045	0	2	2	2	22	22	22	22	22	44	45	WAAAAA	ZKKAAA	HHHHxx
+8244	7046	0	0	4	4	44	244	244	3244	8244	88	89	CFAAAA	ALKAAA	OOOOxx
+2282	7047	0	2	2	2	82	282	282	2282	2282	164	165	UJAAAA	BLKAAA	VVVVxx
+3487	7048	1	3	7	7	87	487	1487	3487	3487	174	175	DEAAAA	CLKAAA	AAAAxx
+8633	7049	1	1	3	13	33	633	633	3633	8633	66	67	BUAAAA	DLKAAA	HHHHxx
+6418	7050	0	2	8	18	18	418	418	1418	6418	36	37	WMAAAA	ELKAAA	OOOOxx
+4682	7051	0	2	2	2	82	682	682	4682	4682	164	165	CYAAAA	FLKAAA	VVVVxx
+4103	7052	1	3	3	3	3	103	103	4103	4103	6	7	VBAAAA	GLKAAA	AAAAxx
+6256	7053	0	0	6	16	56	256	256	1256	6256	112	113	QGAAAA	HLKAAA	HHHHxx
+4040	7054	0	0	0	0	40	40	40	4040	4040	80	81	KZAAAA	ILKAAA	OOOOxx
+9342	7055	0	2	2	2	42	342	1342	4342	9342	84	85	IVAAAA	JLKAAA	VVVVxx
+9969	7056	1	1	9	9	69	969	1969	4969	9969	138	139	LTAAAA	KLKAAA	AAAAxx
+223	7057	1	3	3	3	23	223	223	223	223	46	47	PIAAAA	LLKAAA	HHHHxx
+4593	7058	1	1	3	13	93	593	593	4593	4593	186	187	RUAAAA	MLKAAA	OOOOxx
+44	7059	0	0	4	4	44	44	44	44	44	88	89	SBAAAA	NLKAAA	VVVVxx
+3513	7060	1	1	3	13	13	513	1513	3513	3513	26	27	DFAAAA	OLKAAA	AAAAxx
+5771	7061	1	3	1	11	71	771	1771	771	5771	142	143	ZNAAAA	PLKAAA	HHHHxx
+5083	7062	1	3	3	3	83	83	1083	83	5083	166	167	NNAAAA	QLKAAA	OOOOxx
+3839	7063	1	3	9	19	39	839	1839	3839	3839	78	79	RRAAAA	RLKAAA	VVVVxx
+2986	7064	0	2	6	6	86	986	986	2986	2986	172	173	WKAAAA	SLKAAA	AAAAxx
+2200	7065	0	0	0	0	0	200	200	2200	2200	0	1	QGAAAA	TLKAAA	HHHHxx
+197	7066	1	1	7	17	97	197	197	197	197	194	195	PHAAAA	ULKAAA	OOOOxx
+7455	7067	1	3	5	15	55	455	1455	2455	7455	110	111	TAAAAA	VLKAAA	VVVVxx
+1379	7068	1	3	9	19	79	379	1379	1379	1379	158	159	BBAAAA	WLKAAA	AAAAxx
+4356	7069	0	0	6	16	56	356	356	4356	4356	112	113	OLAAAA	XLKAAA	HHHHxx
+6888	7070	0	0	8	8	88	888	888	1888	6888	176	177	YEAAAA	YLKAAA	OOOOxx
+9139	7071	1	3	9	19	39	139	1139	4139	9139	78	79	NNAAAA	ZLKAAA	VVVVxx
+7682	7072	0	2	2	2	82	682	1682	2682	7682	164	165	MJAAAA	AMKAAA	AAAAxx
+4873	7073	1	1	3	13	73	873	873	4873	4873	146	147	LFAAAA	BMKAAA	HHHHxx
+783	7074	1	3	3	3	83	783	783	783	783	166	167	DEAAAA	CMKAAA	OOOOxx
+6071	7075	1	3	1	11	71	71	71	1071	6071	142	143	NZAAAA	DMKAAA	VVVVxx
+5160	7076	0	0	0	0	60	160	1160	160	5160	120	121	MQAAAA	EMKAAA	AAAAxx
+2291	7077	1	3	1	11	91	291	291	2291	2291	182	183	DKAAAA	FMKAAA	HHHHxx
+187	7078	1	3	7	7	87	187	187	187	187	174	175	FHAAAA	GMKAAA	OOOOxx
+7786	7079	0	2	6	6	86	786	1786	2786	7786	172	173	MNAAAA	HMKAAA	VVVVxx
+3432	7080	0	0	2	12	32	432	1432	3432	3432	64	65	ACAAAA	IMKAAA	AAAAxx
+5450	7081	0	2	0	10	50	450	1450	450	5450	100	101	QBAAAA	JMKAAA	HHHHxx
+2699	7082	1	3	9	19	99	699	699	2699	2699	198	199	VZAAAA	KMKAAA	OOOOxx
+692	7083	0	0	2	12	92	692	692	692	692	184	185	QAAAAA	LMKAAA	VVVVxx
+6081	7084	1	1	1	1	81	81	81	1081	6081	162	163	XZAAAA	MMKAAA	AAAAxx
+4829	7085	1	1	9	9	29	829	829	4829	4829	58	59	TDAAAA	NMKAAA	HHHHxx
+238	7086	0	2	8	18	38	238	238	238	238	76	77	EJAAAA	OMKAAA	OOOOxx
+9100	7087	0	0	0	0	0	100	1100	4100	9100	0	1	AMAAAA	PMKAAA	VVVVxx
+1968	7088	0	0	8	8	68	968	1968	1968	1968	136	137	SXAAAA	QMKAAA	AAAAxx
+1872	7089	0	0	2	12	72	872	1872	1872	1872	144	145	AUAAAA	RMKAAA	HHHHxx
+7051	7090	1	3	1	11	51	51	1051	2051	7051	102	103	FLAAAA	SMKAAA	OOOOxx
+2743	7091	1	3	3	3	43	743	743	2743	2743	86	87	NBAAAA	TMKAAA	VVVVxx
+1237	7092	1	1	7	17	37	237	1237	1237	1237	74	75	PVAAAA	UMKAAA	AAAAxx
+3052	7093	0	0	2	12	52	52	1052	3052	3052	104	105	KNAAAA	VMKAAA	HHHHxx
+8021	7094	1	1	1	1	21	21	21	3021	8021	42	43	NWAAAA	WMKAAA	OOOOxx
+657	7095	1	1	7	17	57	657	657	657	657	114	115	HZAAAA	XMKAAA	VVVVxx
+2236	7096	0	0	6	16	36	236	236	2236	2236	72	73	AIAAAA	YMKAAA	AAAAxx
+7011	7097	1	3	1	11	11	11	1011	2011	7011	22	23	RJAAAA	ZMKAAA	HHHHxx
+4067	7098	1	3	7	7	67	67	67	4067	4067	134	135	LAAAAA	ANKAAA	OOOOxx
+9449	7099	1	1	9	9	49	449	1449	4449	9449	98	99	LZAAAA	BNKAAA	VVVVxx
+7428	7100	0	0	8	8	28	428	1428	2428	7428	56	57	SZAAAA	CNKAAA	AAAAxx
+1272	7101	0	0	2	12	72	272	1272	1272	1272	144	145	YWAAAA	DNKAAA	HHHHxx
+6897	7102	1	1	7	17	97	897	897	1897	6897	194	195	HFAAAA	ENKAAA	OOOOxx
+5839	7103	1	3	9	19	39	839	1839	839	5839	78	79	PQAAAA	FNKAAA	VVVVxx
+6835	7104	1	3	5	15	35	835	835	1835	6835	70	71	XCAAAA	GNKAAA	AAAAxx
+1887	7105	1	3	7	7	87	887	1887	1887	1887	174	175	PUAAAA	HNKAAA	HHHHxx
+1551	7106	1	3	1	11	51	551	1551	1551	1551	102	103	RHAAAA	INKAAA	OOOOxx
+4667	7107	1	3	7	7	67	667	667	4667	4667	134	135	NXAAAA	JNKAAA	VVVVxx
+9603	7108	1	3	3	3	3	603	1603	4603	9603	6	7	JFAAAA	KNKAAA	AAAAxx
+4332	7109	0	0	2	12	32	332	332	4332	4332	64	65	QKAAAA	LNKAAA	HHHHxx
+5681	7110	1	1	1	1	81	681	1681	681	5681	162	163	NKAAAA	MNKAAA	OOOOxx
+8062	7111	0	2	2	2	62	62	62	3062	8062	124	125	CYAAAA	NNKAAA	VVVVxx
+2302	7112	0	2	2	2	2	302	302	2302	2302	4	5	OKAAAA	ONKAAA	AAAAxx
+2825	7113	1	1	5	5	25	825	825	2825	2825	50	51	REAAAA	PNKAAA	HHHHxx
+4527	7114	1	3	7	7	27	527	527	4527	4527	54	55	DSAAAA	QNKAAA	OOOOxx
+4230	7115	0	2	0	10	30	230	230	4230	4230	60	61	SGAAAA	RNKAAA	VVVVxx
+3053	7116	1	1	3	13	53	53	1053	3053	3053	106	107	LNAAAA	SNKAAA	AAAAxx
+983	7117	1	3	3	3	83	983	983	983	983	166	167	VLAAAA	TNKAAA	HHHHxx
+9458	7118	0	2	8	18	58	458	1458	4458	9458	116	117	UZAAAA	UNKAAA	OOOOxx
+4128	7119	0	0	8	8	28	128	128	4128	4128	56	57	UCAAAA	VNKAAA	VVVVxx
+425	7120	1	1	5	5	25	425	425	425	425	50	51	JQAAAA	WNKAAA	AAAAxx
+3911	7121	1	3	1	11	11	911	1911	3911	3911	22	23	LUAAAA	XNKAAA	HHHHxx
+6607	7122	1	3	7	7	7	607	607	1607	6607	14	15	DUAAAA	YNKAAA	OOOOxx
+5431	7123	1	3	1	11	31	431	1431	431	5431	62	63	XAAAAA	ZNKAAA	VVVVxx
+6330	7124	0	2	0	10	30	330	330	1330	6330	60	61	MJAAAA	AOKAAA	AAAAxx
+3592	7125	0	0	2	12	92	592	1592	3592	3592	184	185	EIAAAA	BOKAAA	HHHHxx
+154	7126	0	2	4	14	54	154	154	154	154	108	109	YFAAAA	COKAAA	OOOOxx
+9879	7127	1	3	9	19	79	879	1879	4879	9879	158	159	ZPAAAA	DOKAAA	VVVVxx
+3202	7128	0	2	2	2	2	202	1202	3202	3202	4	5	ETAAAA	EOKAAA	AAAAxx
+3056	7129	0	0	6	16	56	56	1056	3056	3056	112	113	ONAAAA	FOKAAA	HHHHxx
+9890	7130	0	2	0	10	90	890	1890	4890	9890	180	181	KQAAAA	GOKAAA	OOOOxx
+5840	7131	0	0	0	0	40	840	1840	840	5840	80	81	QQAAAA	HOKAAA	VVVVxx
+9804	7132	0	0	4	4	4	804	1804	4804	9804	8	9	CNAAAA	IOKAAA	AAAAxx
+681	7133	1	1	1	1	81	681	681	681	681	162	163	FAAAAA	JOKAAA	HHHHxx
+3443	7134	1	3	3	3	43	443	1443	3443	3443	86	87	LCAAAA	KOKAAA	OOOOxx
+8088	7135	0	0	8	8	88	88	88	3088	8088	176	177	CZAAAA	LOKAAA	VVVVxx
+9447	7136	1	3	7	7	47	447	1447	4447	9447	94	95	JZAAAA	MOKAAA	AAAAxx
+1490	7137	0	2	0	10	90	490	1490	1490	1490	180	181	IFAAAA	NOKAAA	HHHHxx
+3684	7138	0	0	4	4	84	684	1684	3684	3684	168	169	SLAAAA	OOKAAA	OOOOxx
+3113	7139	1	1	3	13	13	113	1113	3113	3113	26	27	TPAAAA	POKAAA	VVVVxx
+9004	7140	0	0	4	4	4	4	1004	4004	9004	8	9	IIAAAA	QOKAAA	AAAAxx
+7147	7141	1	3	7	7	47	147	1147	2147	7147	94	95	XOAAAA	ROKAAA	HHHHxx
+7571	7142	1	3	1	11	71	571	1571	2571	7571	142	143	FFAAAA	SOKAAA	OOOOxx
+5545	7143	1	1	5	5	45	545	1545	545	5545	90	91	HFAAAA	TOKAAA	VVVVxx
+4558	7144	0	2	8	18	58	558	558	4558	4558	116	117	ITAAAA	UOKAAA	AAAAxx
+6206	7145	0	2	6	6	6	206	206	1206	6206	12	13	SEAAAA	VOKAAA	HHHHxx
+5695	7146	1	3	5	15	95	695	1695	695	5695	190	191	BLAAAA	WOKAAA	OOOOxx
+9600	7147	0	0	0	0	0	600	1600	4600	9600	0	1	GFAAAA	XOKAAA	VVVVxx
+5432	7148	0	0	2	12	32	432	1432	432	5432	64	65	YAAAAA	YOKAAA	AAAAxx
+9299	7149	1	3	9	19	99	299	1299	4299	9299	198	199	RTAAAA	ZOKAAA	HHHHxx
+2386	7150	0	2	6	6	86	386	386	2386	2386	172	173	UNAAAA	APKAAA	OOOOxx
+2046	7151	0	2	6	6	46	46	46	2046	2046	92	93	SAAAAA	BPKAAA	VVVVxx
+3293	7152	1	1	3	13	93	293	1293	3293	3293	186	187	RWAAAA	CPKAAA	AAAAxx
+3046	7153	0	2	6	6	46	46	1046	3046	3046	92	93	ENAAAA	DPKAAA	HHHHxx
+214	7154	0	2	4	14	14	214	214	214	214	28	29	GIAAAA	EPKAAA	OOOOxx
+7893	7155	1	1	3	13	93	893	1893	2893	7893	186	187	PRAAAA	FPKAAA	VVVVxx
+891	7156	1	3	1	11	91	891	891	891	891	182	183	HIAAAA	GPKAAA	AAAAxx
+6499	7157	1	3	9	19	99	499	499	1499	6499	198	199	ZPAAAA	HPKAAA	HHHHxx
+5003	7158	1	3	3	3	3	3	1003	3	5003	6	7	LKAAAA	IPKAAA	OOOOxx
+6487	7159	1	3	7	7	87	487	487	1487	6487	174	175	NPAAAA	JPKAAA	VVVVxx
+9403	7160	1	3	3	3	3	403	1403	4403	9403	6	7	RXAAAA	KPKAAA	AAAAxx
+945	7161	1	1	5	5	45	945	945	945	945	90	91	JKAAAA	LPKAAA	HHHHxx
+6713	7162	1	1	3	13	13	713	713	1713	6713	26	27	FYAAAA	MPKAAA	OOOOxx
+9928	7163	0	0	8	8	28	928	1928	4928	9928	56	57	WRAAAA	NPKAAA	VVVVxx
+8585	7164	1	1	5	5	85	585	585	3585	8585	170	171	FSAAAA	OPKAAA	AAAAxx
+4004	7165	0	0	4	4	4	4	4	4004	4004	8	9	AYAAAA	PPKAAA	HHHHxx
+2528	7166	0	0	8	8	28	528	528	2528	2528	56	57	GTAAAA	QPKAAA	OOOOxx
+3350	7167	0	2	0	10	50	350	1350	3350	3350	100	101	WYAAAA	RPKAAA	VVVVxx
+2160	7168	0	0	0	0	60	160	160	2160	2160	120	121	CFAAAA	SPKAAA	AAAAxx
+1521	7169	1	1	1	1	21	521	1521	1521	1521	42	43	NGAAAA	TPKAAA	HHHHxx
+5660	7170	0	0	0	0	60	660	1660	660	5660	120	121	SJAAAA	UPKAAA	OOOOxx
+5755	7171	1	3	5	15	55	755	1755	755	5755	110	111	JNAAAA	VPKAAA	VVVVxx
+7614	7172	0	2	4	14	14	614	1614	2614	7614	28	29	WGAAAA	WPKAAA	AAAAxx
+3121	7173	1	1	1	1	21	121	1121	3121	3121	42	43	BQAAAA	XPKAAA	HHHHxx
+2735	7174	1	3	5	15	35	735	735	2735	2735	70	71	FBAAAA	YPKAAA	OOOOxx
+7506	7175	0	2	6	6	6	506	1506	2506	7506	12	13	SCAAAA	ZPKAAA	VVVVxx
+2693	7176	1	1	3	13	93	693	693	2693	2693	186	187	PZAAAA	AQKAAA	AAAAxx
+2892	7177	0	0	2	12	92	892	892	2892	2892	184	185	GHAAAA	BQKAAA	HHHHxx
+3310	7178	0	2	0	10	10	310	1310	3310	3310	20	21	IXAAAA	CQKAAA	OOOOxx
+3484	7179	0	0	4	4	84	484	1484	3484	3484	168	169	AEAAAA	DQKAAA	VVVVxx
+9733	7180	1	1	3	13	33	733	1733	4733	9733	66	67	JKAAAA	EQKAAA	AAAAxx
+29	7181	1	1	9	9	29	29	29	29	29	58	59	DBAAAA	FQKAAA	HHHHxx
+9013	7182	1	1	3	13	13	13	1013	4013	9013	26	27	RIAAAA	GQKAAA	OOOOxx
+3847	7183	1	3	7	7	47	847	1847	3847	3847	94	95	ZRAAAA	HQKAAA	VVVVxx
+6724	7184	0	0	4	4	24	724	724	1724	6724	48	49	QYAAAA	IQKAAA	AAAAxx
+2559	7185	1	3	9	19	59	559	559	2559	2559	118	119	LUAAAA	JQKAAA	HHHHxx
+5326	7186	0	2	6	6	26	326	1326	326	5326	52	53	WWAAAA	KQKAAA	OOOOxx
+4802	7187	0	2	2	2	2	802	802	4802	4802	4	5	SCAAAA	LQKAAA	VVVVxx
+131	7188	1	3	1	11	31	131	131	131	131	62	63	BFAAAA	MQKAAA	AAAAxx
+1634	7189	0	2	4	14	34	634	1634	1634	1634	68	69	WKAAAA	NQKAAA	HHHHxx
+919	7190	1	3	9	19	19	919	919	919	919	38	39	JJAAAA	OQKAAA	OOOOxx
+9575	7191	1	3	5	15	75	575	1575	4575	9575	150	151	HEAAAA	PQKAAA	VVVVxx
+1256	7192	0	0	6	16	56	256	1256	1256	1256	112	113	IWAAAA	QQKAAA	AAAAxx
+9428	7193	0	0	8	8	28	428	1428	4428	9428	56	57	QYAAAA	RQKAAA	HHHHxx
+5121	7194	1	1	1	1	21	121	1121	121	5121	42	43	ZOAAAA	SQKAAA	OOOOxx
+6584	7195	0	0	4	4	84	584	584	1584	6584	168	169	GTAAAA	TQKAAA	VVVVxx
+7193	7196	1	1	3	13	93	193	1193	2193	7193	186	187	RQAAAA	UQKAAA	AAAAxx
+4047	7197	1	3	7	7	47	47	47	4047	4047	94	95	RZAAAA	VQKAAA	HHHHxx
+104	7198	0	0	4	4	4	104	104	104	104	8	9	AEAAAA	WQKAAA	OOOOxx
+1527	7199	1	3	7	7	27	527	1527	1527	1527	54	55	TGAAAA	XQKAAA	VVVVxx
+3460	7200	0	0	0	0	60	460	1460	3460	3460	120	121	CDAAAA	YQKAAA	AAAAxx
+8526	7201	0	2	6	6	26	526	526	3526	8526	52	53	YPAAAA	ZQKAAA	HHHHxx
+8959	7202	1	3	9	19	59	959	959	3959	8959	118	119	PGAAAA	ARKAAA	OOOOxx
+3633	7203	1	1	3	13	33	633	1633	3633	3633	66	67	TJAAAA	BRKAAA	VVVVxx
+1799	7204	1	3	9	19	99	799	1799	1799	1799	198	199	FRAAAA	CRKAAA	AAAAxx
+461	7205	1	1	1	1	61	461	461	461	461	122	123	TRAAAA	DRKAAA	HHHHxx
+718	7206	0	2	8	18	18	718	718	718	718	36	37	QBAAAA	ERKAAA	OOOOxx
+3219	7207	1	3	9	19	19	219	1219	3219	3219	38	39	VTAAAA	FRKAAA	VVVVxx
+3494	7208	0	2	4	14	94	494	1494	3494	3494	188	189	KEAAAA	GRKAAA	AAAAxx
+9402	7209	0	2	2	2	2	402	1402	4402	9402	4	5	QXAAAA	HRKAAA	HHHHxx
+7983	7210	1	3	3	3	83	983	1983	2983	7983	166	167	BVAAAA	IRKAAA	OOOOxx
+7919	7211	1	3	9	19	19	919	1919	2919	7919	38	39	PSAAAA	JRKAAA	VVVVxx
+8036	7212	0	0	6	16	36	36	36	3036	8036	72	73	CXAAAA	KRKAAA	AAAAxx
+5164	7213	0	0	4	4	64	164	1164	164	5164	128	129	QQAAAA	LRKAAA	HHHHxx
+4160	7214	0	0	0	0	60	160	160	4160	4160	120	121	AEAAAA	MRKAAA	OOOOxx
+5370	7215	0	2	0	10	70	370	1370	370	5370	140	141	OYAAAA	NRKAAA	VVVVxx
+5347	7216	1	3	7	7	47	347	1347	347	5347	94	95	RXAAAA	ORKAAA	AAAAxx
+7109	7217	1	1	9	9	9	109	1109	2109	7109	18	19	LNAAAA	PRKAAA	HHHHxx
+4826	7218	0	2	6	6	26	826	826	4826	4826	52	53	QDAAAA	QRKAAA	OOOOxx
+1338	7219	0	2	8	18	38	338	1338	1338	1338	76	77	MZAAAA	RRKAAA	VVVVxx
+2711	7220	1	3	1	11	11	711	711	2711	2711	22	23	HAAAAA	SRKAAA	AAAAxx
+6299	7221	1	3	9	19	99	299	299	1299	6299	198	199	HIAAAA	TRKAAA	HHHHxx
+1616	7222	0	0	6	16	16	616	1616	1616	1616	32	33	EKAAAA	URKAAA	OOOOxx
+7519	7223	1	3	9	19	19	519	1519	2519	7519	38	39	FDAAAA	VRKAAA	VVVVxx
+1262	7224	0	2	2	2	62	262	1262	1262	1262	124	125	OWAAAA	WRKAAA	AAAAxx
+7228	7225	0	0	8	8	28	228	1228	2228	7228	56	57	ASAAAA	XRKAAA	HHHHxx
+7892	7226	0	0	2	12	92	892	1892	2892	7892	184	185	ORAAAA	YRKAAA	OOOOxx
+7929	7227	1	1	9	9	29	929	1929	2929	7929	58	59	ZSAAAA	ZRKAAA	VVVVxx
+7705	7228	1	1	5	5	5	705	1705	2705	7705	10	11	JKAAAA	ASKAAA	AAAAxx
+3111	7229	1	3	1	11	11	111	1111	3111	3111	22	23	RPAAAA	BSKAAA	HHHHxx
+3066	7230	0	2	6	6	66	66	1066	3066	3066	132	133	YNAAAA	CSKAAA	OOOOxx
+9559	7231	1	3	9	19	59	559	1559	4559	9559	118	119	RDAAAA	DSKAAA	VVVVxx
+3787	7232	1	3	7	7	87	787	1787	3787	3787	174	175	RPAAAA	ESKAAA	AAAAxx
+8710	7233	0	2	0	10	10	710	710	3710	8710	20	21	AXAAAA	FSKAAA	HHHHxx
+4870	7234	0	2	0	10	70	870	870	4870	4870	140	141	IFAAAA	GSKAAA	OOOOxx
+1883	7235	1	3	3	3	83	883	1883	1883	1883	166	167	LUAAAA	HSKAAA	VVVVxx
+9689	7236	1	1	9	9	89	689	1689	4689	9689	178	179	RIAAAA	ISKAAA	AAAAxx
+9491	7237	1	3	1	11	91	491	1491	4491	9491	182	183	BBAAAA	JSKAAA	HHHHxx
+2035	7238	1	3	5	15	35	35	35	2035	2035	70	71	HAAAAA	KSKAAA	OOOOxx
+655	7239	1	3	5	15	55	655	655	655	655	110	111	FZAAAA	LSKAAA	VVVVxx
+6305	7240	1	1	5	5	5	305	305	1305	6305	10	11	NIAAAA	MSKAAA	AAAAxx
+9423	7241	1	3	3	3	23	423	1423	4423	9423	46	47	LYAAAA	NSKAAA	HHHHxx
+283	7242	1	3	3	3	83	283	283	283	283	166	167	XKAAAA	OSKAAA	OOOOxx
+2607	7243	1	3	7	7	7	607	607	2607	2607	14	15	HWAAAA	PSKAAA	VVVVxx
+7740	7244	0	0	0	0	40	740	1740	2740	7740	80	81	SLAAAA	QSKAAA	AAAAxx
+6956	7245	0	0	6	16	56	956	956	1956	6956	112	113	OHAAAA	RSKAAA	HHHHxx
+884	7246	0	0	4	4	84	884	884	884	884	168	169	AIAAAA	SSKAAA	OOOOxx
+5730	7247	0	2	0	10	30	730	1730	730	5730	60	61	KMAAAA	TSKAAA	VVVVxx
+3438	7248	0	2	8	18	38	438	1438	3438	3438	76	77	GCAAAA	USKAAA	AAAAxx
+3250	7249	0	2	0	10	50	250	1250	3250	3250	100	101	AVAAAA	VSKAAA	HHHHxx
+5470	7250	0	2	0	10	70	470	1470	470	5470	140	141	KCAAAA	WSKAAA	OOOOxx
+2037	7251	1	1	7	17	37	37	37	2037	2037	74	75	JAAAAA	XSKAAA	VVVVxx
+6593	7252	1	1	3	13	93	593	593	1593	6593	186	187	PTAAAA	YSKAAA	AAAAxx
+3893	7253	1	1	3	13	93	893	1893	3893	3893	186	187	TTAAAA	ZSKAAA	HHHHxx
+3200	7254	0	0	0	0	0	200	1200	3200	3200	0	1	CTAAAA	ATKAAA	OOOOxx
+7125	7255	1	1	5	5	25	125	1125	2125	7125	50	51	BOAAAA	BTKAAA	VVVVxx
+2295	7256	1	3	5	15	95	295	295	2295	2295	190	191	HKAAAA	CTKAAA	AAAAxx
+2056	7257	0	0	6	16	56	56	56	2056	2056	112	113	CBAAAA	DTKAAA	HHHHxx
+2962	7258	0	2	2	2	62	962	962	2962	2962	124	125	YJAAAA	ETKAAA	OOOOxx
+993	7259	1	1	3	13	93	993	993	993	993	186	187	FMAAAA	FTKAAA	VVVVxx
+9127	7260	1	3	7	7	27	127	1127	4127	9127	54	55	BNAAAA	GTKAAA	AAAAxx
+2075	7261	1	3	5	15	75	75	75	2075	2075	150	151	VBAAAA	HTKAAA	HHHHxx
+9338	7262	0	2	8	18	38	338	1338	4338	9338	76	77	EVAAAA	ITKAAA	OOOOxx
+8100	7263	0	0	0	0	0	100	100	3100	8100	0	1	OZAAAA	JTKAAA	VVVVxx
+5047	7264	1	3	7	7	47	47	1047	47	5047	94	95	DMAAAA	KTKAAA	AAAAxx
+7032	7265	0	0	2	12	32	32	1032	2032	7032	64	65	MKAAAA	LTKAAA	HHHHxx
+6374	7266	0	2	4	14	74	374	374	1374	6374	148	149	ELAAAA	MTKAAA	OOOOxx
+4137	7267	1	1	7	17	37	137	137	4137	4137	74	75	DDAAAA	NTKAAA	VVVVxx
+7132	7268	0	0	2	12	32	132	1132	2132	7132	64	65	IOAAAA	OTKAAA	AAAAxx
+3064	7269	0	0	4	4	64	64	1064	3064	3064	128	129	WNAAAA	PTKAAA	HHHHxx
+3621	7270	1	1	1	1	21	621	1621	3621	3621	42	43	HJAAAA	QTKAAA	OOOOxx
+6199	7271	1	3	9	19	99	199	199	1199	6199	198	199	LEAAAA	RTKAAA	VVVVxx
+4926	7272	0	2	6	6	26	926	926	4926	4926	52	53	MHAAAA	STKAAA	AAAAxx
+8035	7273	1	3	5	15	35	35	35	3035	8035	70	71	BXAAAA	TTKAAA	HHHHxx
+2195	7274	1	3	5	15	95	195	195	2195	2195	190	191	LGAAAA	UTKAAA	OOOOxx
+5366	7275	0	2	6	6	66	366	1366	366	5366	132	133	KYAAAA	VTKAAA	VVVVxx
+3478	7276	0	2	8	18	78	478	1478	3478	3478	156	157	UDAAAA	WTKAAA	AAAAxx
+1926	7277	0	2	6	6	26	926	1926	1926	1926	52	53	CWAAAA	XTKAAA	HHHHxx
+7265	7278	1	1	5	5	65	265	1265	2265	7265	130	131	LTAAAA	YTKAAA	OOOOxx
+7668	7279	0	0	8	8	68	668	1668	2668	7668	136	137	YIAAAA	ZTKAAA	VVVVxx
+3335	7280	1	3	5	15	35	335	1335	3335	3335	70	71	HYAAAA	AUKAAA	AAAAxx
+7660	7281	0	0	0	0	60	660	1660	2660	7660	120	121	QIAAAA	BUKAAA	HHHHxx
+9604	7282	0	0	4	4	4	604	1604	4604	9604	8	9	KFAAAA	CUKAAA	OOOOxx
+7301	7283	1	1	1	1	1	301	1301	2301	7301	2	3	VUAAAA	DUKAAA	VVVVxx
+4475	7284	1	3	5	15	75	475	475	4475	4475	150	151	DQAAAA	EUKAAA	AAAAxx
+9954	7285	0	2	4	14	54	954	1954	4954	9954	108	109	WSAAAA	FUKAAA	HHHHxx
+5723	7286	1	3	3	3	23	723	1723	723	5723	46	47	DMAAAA	GUKAAA	OOOOxx
+2669	7287	1	1	9	9	69	669	669	2669	2669	138	139	RYAAAA	HUKAAA	VVVVxx
+1685	7288	1	1	5	5	85	685	1685	1685	1685	170	171	VMAAAA	IUKAAA	AAAAxx
+2233	7289	1	1	3	13	33	233	233	2233	2233	66	67	XHAAAA	JUKAAA	HHHHxx
+8111	7290	1	3	1	11	11	111	111	3111	8111	22	23	ZZAAAA	KUKAAA	OOOOxx
+7685	7291	1	1	5	5	85	685	1685	2685	7685	170	171	PJAAAA	LUKAAA	VVVVxx
+3773	7292	1	1	3	13	73	773	1773	3773	3773	146	147	DPAAAA	MUKAAA	AAAAxx
+7172	7293	0	0	2	12	72	172	1172	2172	7172	144	145	WPAAAA	NUKAAA	HHHHxx
+1740	7294	0	0	0	0	40	740	1740	1740	1740	80	81	YOAAAA	OUKAAA	OOOOxx
+5416	7295	0	0	6	16	16	416	1416	416	5416	32	33	IAAAAA	PUKAAA	VVVVxx
+1823	7296	1	3	3	3	23	823	1823	1823	1823	46	47	DSAAAA	QUKAAA	AAAAxx
+1668	7297	0	0	8	8	68	668	1668	1668	1668	136	137	EMAAAA	RUKAAA	HHHHxx
+1795	7298	1	3	5	15	95	795	1795	1795	1795	190	191	BRAAAA	SUKAAA	OOOOxx
+8599	7299	1	3	9	19	99	599	599	3599	8599	198	199	TSAAAA	TUKAAA	VVVVxx
+5542	7300	0	2	2	2	42	542	1542	542	5542	84	85	EFAAAA	UUKAAA	AAAAxx
+5658	7301	0	2	8	18	58	658	1658	658	5658	116	117	QJAAAA	VUKAAA	HHHHxx
+9824	7302	0	0	4	4	24	824	1824	4824	9824	48	49	WNAAAA	WUKAAA	OOOOxx
+19	7303	1	3	9	19	19	19	19	19	19	38	39	TAAAAA	XUKAAA	VVVVxx
+9344	7304	0	0	4	4	44	344	1344	4344	9344	88	89	KVAAAA	YUKAAA	AAAAxx
+5900	7305	0	0	0	0	0	900	1900	900	5900	0	1	YSAAAA	ZUKAAA	HHHHxx
+7818	7306	0	2	8	18	18	818	1818	2818	7818	36	37	SOAAAA	AVKAAA	OOOOxx
+8377	7307	1	1	7	17	77	377	377	3377	8377	154	155	FKAAAA	BVKAAA	VVVVxx
+6886	7308	0	2	6	6	86	886	886	1886	6886	172	173	WEAAAA	CVKAAA	AAAAxx
+3201	7309	1	1	1	1	1	201	1201	3201	3201	2	3	DTAAAA	DVKAAA	HHHHxx
+87	7310	1	3	7	7	87	87	87	87	87	174	175	JDAAAA	EVKAAA	OOOOxx
+1089	7311	1	1	9	9	89	89	1089	1089	1089	178	179	XPAAAA	FVKAAA	VVVVxx
+3948	7312	0	0	8	8	48	948	1948	3948	3948	96	97	WVAAAA	GVKAAA	AAAAxx
+6383	7313	1	3	3	3	83	383	383	1383	6383	166	167	NLAAAA	HVKAAA	HHHHxx
+837	7314	1	1	7	17	37	837	837	837	837	74	75	FGAAAA	IVKAAA	OOOOxx
+6285	7315	1	1	5	5	85	285	285	1285	6285	170	171	THAAAA	JVKAAA	VVVVxx
+78	7316	0	2	8	18	78	78	78	78	78	156	157	ADAAAA	KVKAAA	AAAAxx
+4389	7317	1	1	9	9	89	389	389	4389	4389	178	179	VMAAAA	LVKAAA	HHHHxx
+4795	7318	1	3	5	15	95	795	795	4795	4795	190	191	LCAAAA	MVKAAA	OOOOxx
+9369	7319	1	1	9	9	69	369	1369	4369	9369	138	139	JWAAAA	NVKAAA	VVVVxx
+69	7320	1	1	9	9	69	69	69	69	69	138	139	RCAAAA	OVKAAA	AAAAxx
+7689	7321	1	1	9	9	89	689	1689	2689	7689	178	179	TJAAAA	PVKAAA	HHHHxx
+5642	7322	0	2	2	2	42	642	1642	642	5642	84	85	AJAAAA	QVKAAA	OOOOxx
+2348	7323	0	0	8	8	48	348	348	2348	2348	96	97	IMAAAA	RVKAAA	VVVVxx
+9308	7324	0	0	8	8	8	308	1308	4308	9308	16	17	AUAAAA	SVKAAA	AAAAxx
+9093	7325	1	1	3	13	93	93	1093	4093	9093	186	187	TLAAAA	TVKAAA	HHHHxx
+1199	7326	1	3	9	19	99	199	1199	1199	1199	198	199	DUAAAA	UVKAAA	OOOOxx
+307	7327	1	3	7	7	7	307	307	307	307	14	15	VLAAAA	VVKAAA	VVVVxx
+3814	7328	0	2	4	14	14	814	1814	3814	3814	28	29	SQAAAA	WVKAAA	AAAAxx
+8817	7329	1	1	7	17	17	817	817	3817	8817	34	35	DBAAAA	XVKAAA	HHHHxx
+2329	7330	1	1	9	9	29	329	329	2329	2329	58	59	PLAAAA	YVKAAA	OOOOxx
+2932	7331	0	0	2	12	32	932	932	2932	2932	64	65	UIAAAA	ZVKAAA	VVVVxx
+1986	7332	0	2	6	6	86	986	1986	1986	1986	172	173	KYAAAA	AWKAAA	AAAAxx
+5279	7333	1	3	9	19	79	279	1279	279	5279	158	159	BVAAAA	BWKAAA	HHHHxx
+5357	7334	1	1	7	17	57	357	1357	357	5357	114	115	BYAAAA	CWKAAA	OOOOxx
+6778	7335	0	2	8	18	78	778	778	1778	6778	156	157	SAAAAA	DWKAAA	VVVVxx
+2773	7336	1	1	3	13	73	773	773	2773	2773	146	147	RCAAAA	EWKAAA	AAAAxx
+244	7337	0	0	4	4	44	244	244	244	244	88	89	KJAAAA	FWKAAA	HHHHxx
+6900	7338	0	0	0	0	0	900	900	1900	6900	0	1	KFAAAA	GWKAAA	OOOOxx
+4739	7339	1	3	9	19	39	739	739	4739	4739	78	79	HAAAAA	HWKAAA	VVVVxx
+3217	7340	1	1	7	17	17	217	1217	3217	3217	34	35	TTAAAA	IWKAAA	AAAAxx
+7563	7341	1	3	3	3	63	563	1563	2563	7563	126	127	XEAAAA	JWKAAA	HHHHxx
+1807	7342	1	3	7	7	7	807	1807	1807	1807	14	15	NRAAAA	KWKAAA	OOOOxx
+4199	7343	1	3	9	19	99	199	199	4199	4199	198	199	NFAAAA	LWKAAA	VVVVxx
+1077	7344	1	1	7	17	77	77	1077	1077	1077	154	155	LPAAAA	MWKAAA	AAAAxx
+8348	7345	0	0	8	8	48	348	348	3348	8348	96	97	CJAAAA	NWKAAA	HHHHxx
+841	7346	1	1	1	1	41	841	841	841	841	82	83	JGAAAA	OWKAAA	OOOOxx
+8154	7347	0	2	4	14	54	154	154	3154	8154	108	109	QBAAAA	PWKAAA	VVVVxx
+5261	7348	1	1	1	1	61	261	1261	261	5261	122	123	JUAAAA	QWKAAA	AAAAxx
+1950	7349	0	2	0	10	50	950	1950	1950	1950	100	101	AXAAAA	RWKAAA	HHHHxx
+8472	7350	0	0	2	12	72	472	472	3472	8472	144	145	WNAAAA	SWKAAA	OOOOxx
+8745	7351	1	1	5	5	45	745	745	3745	8745	90	91	JYAAAA	TWKAAA	VVVVxx
+8715	7352	1	3	5	15	15	715	715	3715	8715	30	31	FXAAAA	UWKAAA	AAAAxx
+9708	7353	0	0	8	8	8	708	1708	4708	9708	16	17	KJAAAA	VWKAAA	HHHHxx
+5860	7354	0	0	0	0	60	860	1860	860	5860	120	121	KRAAAA	WWKAAA	OOOOxx
+9142	7355	0	2	2	2	42	142	1142	4142	9142	84	85	QNAAAA	XWKAAA	VVVVxx
+6582	7356	0	2	2	2	82	582	582	1582	6582	164	165	ETAAAA	YWKAAA	AAAAxx
+1255	7357	1	3	5	15	55	255	1255	1255	1255	110	111	HWAAAA	ZWKAAA	HHHHxx
+6459	7358	1	3	9	19	59	459	459	1459	6459	118	119	LOAAAA	AXKAAA	OOOOxx
+6327	7359	1	3	7	7	27	327	327	1327	6327	54	55	JJAAAA	BXKAAA	VVVVxx
+4692	7360	0	0	2	12	92	692	692	4692	4692	184	185	MYAAAA	CXKAAA	AAAAxx
+3772	7361	0	0	2	12	72	772	1772	3772	3772	144	145	CPAAAA	DXKAAA	HHHHxx
+4203	7362	1	3	3	3	3	203	203	4203	4203	6	7	RFAAAA	EXKAAA	OOOOxx
+2946	7363	0	2	6	6	46	946	946	2946	2946	92	93	IJAAAA	FXKAAA	VVVVxx
+3524	7364	0	0	4	4	24	524	1524	3524	3524	48	49	OFAAAA	GXKAAA	AAAAxx
+8409	7365	1	1	9	9	9	409	409	3409	8409	18	19	LLAAAA	HXKAAA	HHHHxx
+1824	7366	0	0	4	4	24	824	1824	1824	1824	48	49	ESAAAA	IXKAAA	OOOOxx
+4637	7367	1	1	7	17	37	637	637	4637	4637	74	75	JWAAAA	JXKAAA	VVVVxx
+589	7368	1	1	9	9	89	589	589	589	589	178	179	RWAAAA	KXKAAA	AAAAxx
+484	7369	0	0	4	4	84	484	484	484	484	168	169	QSAAAA	LXKAAA	HHHHxx
+8963	7370	1	3	3	3	63	963	963	3963	8963	126	127	TGAAAA	MXKAAA	OOOOxx
+5502	7371	0	2	2	2	2	502	1502	502	5502	4	5	QDAAAA	NXKAAA	VVVVxx
+6982	7372	0	2	2	2	82	982	982	1982	6982	164	165	OIAAAA	OXKAAA	AAAAxx
+8029	7373	1	1	9	9	29	29	29	3029	8029	58	59	VWAAAA	PXKAAA	HHHHxx
+4395	7374	1	3	5	15	95	395	395	4395	4395	190	191	BNAAAA	QXKAAA	OOOOxx
+2595	7375	1	3	5	15	95	595	595	2595	2595	190	191	VVAAAA	RXKAAA	VVVVxx
+2133	7376	1	1	3	13	33	133	133	2133	2133	66	67	BEAAAA	SXKAAA	AAAAxx
+1414	7377	0	2	4	14	14	414	1414	1414	1414	28	29	KCAAAA	TXKAAA	HHHHxx
+8201	7378	1	1	1	1	1	201	201	3201	8201	2	3	LDAAAA	UXKAAA	OOOOxx
+4706	7379	0	2	6	6	6	706	706	4706	4706	12	13	AZAAAA	VXKAAA	VVVVxx
+5310	7380	0	2	0	10	10	310	1310	310	5310	20	21	GWAAAA	WXKAAA	AAAAxx
+7333	7381	1	1	3	13	33	333	1333	2333	7333	66	67	BWAAAA	XXKAAA	HHHHxx
+9420	7382	0	0	0	0	20	420	1420	4420	9420	40	41	IYAAAA	YXKAAA	OOOOxx
+1383	7383	1	3	3	3	83	383	1383	1383	1383	166	167	FBAAAA	ZXKAAA	VVVVxx
+6225	7384	1	1	5	5	25	225	225	1225	6225	50	51	LFAAAA	AYKAAA	AAAAxx
+2064	7385	0	0	4	4	64	64	64	2064	2064	128	129	KBAAAA	BYKAAA	HHHHxx
+6700	7386	0	0	0	0	0	700	700	1700	6700	0	1	SXAAAA	CYKAAA	OOOOxx
+1352	7387	0	0	2	12	52	352	1352	1352	1352	104	105	AAAAAA	DYKAAA	VVVVxx
+4249	7388	1	1	9	9	49	249	249	4249	4249	98	99	LHAAAA	EYKAAA	AAAAxx
+9429	7389	1	1	9	9	29	429	1429	4429	9429	58	59	RYAAAA	FYKAAA	HHHHxx
+8090	7390	0	2	0	10	90	90	90	3090	8090	180	181	EZAAAA	GYKAAA	OOOOxx
+5378	7391	0	2	8	18	78	378	1378	378	5378	156	157	WYAAAA	HYKAAA	VVVVxx
+9085	7392	1	1	5	5	85	85	1085	4085	9085	170	171	LLAAAA	IYKAAA	AAAAxx
+7468	7393	0	0	8	8	68	468	1468	2468	7468	136	137	GBAAAA	JYKAAA	HHHHxx
+9955	7394	1	3	5	15	55	955	1955	4955	9955	110	111	XSAAAA	KYKAAA	OOOOxx
+8692	7395	0	0	2	12	92	692	692	3692	8692	184	185	IWAAAA	LYKAAA	VVVVxx
+1463	7396	1	3	3	3	63	463	1463	1463	1463	126	127	HEAAAA	MYKAAA	AAAAxx
+3577	7397	1	1	7	17	77	577	1577	3577	3577	154	155	PHAAAA	NYKAAA	HHHHxx
+5654	7398	0	2	4	14	54	654	1654	654	5654	108	109	MJAAAA	OYKAAA	OOOOxx
+7955	7399	1	3	5	15	55	955	1955	2955	7955	110	111	ZTAAAA	PYKAAA	VVVVxx
+4843	7400	1	3	3	3	43	843	843	4843	4843	86	87	HEAAAA	QYKAAA	AAAAxx
+1776	7401	0	0	6	16	76	776	1776	1776	1776	152	153	IQAAAA	RYKAAA	HHHHxx
+2223	7402	1	3	3	3	23	223	223	2223	2223	46	47	NHAAAA	SYKAAA	OOOOxx
+8442	7403	0	2	2	2	42	442	442	3442	8442	84	85	SMAAAA	TYKAAA	VVVVxx
+9738	7404	0	2	8	18	38	738	1738	4738	9738	76	77	OKAAAA	UYKAAA	AAAAxx
+4867	7405	1	3	7	7	67	867	867	4867	4867	134	135	FFAAAA	VYKAAA	HHHHxx
+2983	7406	1	3	3	3	83	983	983	2983	2983	166	167	TKAAAA	WYKAAA	OOOOxx
+3300	7407	0	0	0	0	0	300	1300	3300	3300	0	1	YWAAAA	XYKAAA	VVVVxx
+3815	7408	1	3	5	15	15	815	1815	3815	3815	30	31	TQAAAA	YYKAAA	AAAAxx
+1779	7409	1	3	9	19	79	779	1779	1779	1779	158	159	LQAAAA	ZYKAAA	HHHHxx
+1123	7410	1	3	3	3	23	123	1123	1123	1123	46	47	FRAAAA	AZKAAA	OOOOxx
+4824	7411	0	0	4	4	24	824	824	4824	4824	48	49	ODAAAA	BZKAAA	VVVVxx
+5407	7412	1	3	7	7	7	407	1407	407	5407	14	15	ZZAAAA	CZKAAA	AAAAxx
+5123	7413	1	3	3	3	23	123	1123	123	5123	46	47	BPAAAA	DZKAAA	HHHHxx
+2515	7414	1	3	5	15	15	515	515	2515	2515	30	31	TSAAAA	EZKAAA	OOOOxx
+4781	7415	1	1	1	1	81	781	781	4781	4781	162	163	XBAAAA	FZKAAA	VVVVxx
+7831	7416	1	3	1	11	31	831	1831	2831	7831	62	63	FPAAAA	GZKAAA	AAAAxx
+6946	7417	0	2	6	6	46	946	946	1946	6946	92	93	EHAAAA	HZKAAA	HHHHxx
+1215	7418	1	3	5	15	15	215	1215	1215	1215	30	31	TUAAAA	IZKAAA	OOOOxx
+7783	7419	1	3	3	3	83	783	1783	2783	7783	166	167	JNAAAA	JZKAAA	VVVVxx
+4532	7420	0	0	2	12	32	532	532	4532	4532	64	65	ISAAAA	KZKAAA	AAAAxx
+9068	7421	0	0	8	8	68	68	1068	4068	9068	136	137	UKAAAA	LZKAAA	HHHHxx
+7030	7422	0	2	0	10	30	30	1030	2030	7030	60	61	KKAAAA	MZKAAA	OOOOxx
+436	7423	0	0	6	16	36	436	436	436	436	72	73	UQAAAA	NZKAAA	VVVVxx
+6549	7424	1	1	9	9	49	549	549	1549	6549	98	99	XRAAAA	OZKAAA	AAAAxx
+3348	7425	0	0	8	8	48	348	1348	3348	3348	96	97	UYAAAA	PZKAAA	HHHHxx
+6229	7426	1	1	9	9	29	229	229	1229	6229	58	59	PFAAAA	QZKAAA	OOOOxx
+3933	7427	1	1	3	13	33	933	1933	3933	3933	66	67	HVAAAA	RZKAAA	VVVVxx
+1876	7428	0	0	6	16	76	876	1876	1876	1876	152	153	EUAAAA	SZKAAA	AAAAxx
+8920	7429	0	0	0	0	20	920	920	3920	8920	40	41	CFAAAA	TZKAAA	HHHHxx
+7926	7430	0	2	6	6	26	926	1926	2926	7926	52	53	WSAAAA	UZKAAA	OOOOxx
+8805	7431	1	1	5	5	5	805	805	3805	8805	10	11	RAAAAA	VZKAAA	VVVVxx
+6729	7432	1	1	9	9	29	729	729	1729	6729	58	59	VYAAAA	WZKAAA	AAAAxx
+7397	7433	1	1	7	17	97	397	1397	2397	7397	194	195	NYAAAA	XZKAAA	HHHHxx
+9303	7434	1	3	3	3	3	303	1303	4303	9303	6	7	VTAAAA	YZKAAA	OOOOxx
+4255	7435	1	3	5	15	55	255	255	4255	4255	110	111	RHAAAA	ZZKAAA	VVVVxx
+7229	7436	1	1	9	9	29	229	1229	2229	7229	58	59	BSAAAA	AALAAA	AAAAxx
+854	7437	0	2	4	14	54	854	854	854	854	108	109	WGAAAA	BALAAA	HHHHxx
+6723	7438	1	3	3	3	23	723	723	1723	6723	46	47	PYAAAA	CALAAA	OOOOxx
+9597	7439	1	1	7	17	97	597	1597	4597	9597	194	195	DFAAAA	DALAAA	VVVVxx
+6532	7440	0	0	2	12	32	532	532	1532	6532	64	65	GRAAAA	EALAAA	AAAAxx
+2910	7441	0	2	0	10	10	910	910	2910	2910	20	21	YHAAAA	FALAAA	HHHHxx
+6717	7442	1	1	7	17	17	717	717	1717	6717	34	35	JYAAAA	GALAAA	OOOOxx
+1790	7443	0	2	0	10	90	790	1790	1790	1790	180	181	WQAAAA	HALAAA	VVVVxx
+3761	7444	1	1	1	1	61	761	1761	3761	3761	122	123	ROAAAA	IALAAA	AAAAxx
+1565	7445	1	1	5	5	65	565	1565	1565	1565	130	131	FIAAAA	JALAAA	HHHHxx
+6205	7446	1	1	5	5	5	205	205	1205	6205	10	11	REAAAA	KALAAA	OOOOxx
+2726	7447	0	2	6	6	26	726	726	2726	2726	52	53	WAAAAA	LALAAA	VVVVxx
+799	7448	1	3	9	19	99	799	799	799	799	198	199	TEAAAA	MALAAA	AAAAxx
+3540	7449	0	0	0	0	40	540	1540	3540	3540	80	81	EGAAAA	NALAAA	HHHHxx
+5878	7450	0	2	8	18	78	878	1878	878	5878	156	157	CSAAAA	OALAAA	OOOOxx
+2542	7451	0	2	2	2	42	542	542	2542	2542	84	85	UTAAAA	PALAAA	VVVVxx
+4888	7452	0	0	8	8	88	888	888	4888	4888	176	177	AGAAAA	QALAAA	AAAAxx
+5290	7453	0	2	0	10	90	290	1290	290	5290	180	181	MVAAAA	RALAAA	HHHHxx
+7995	7454	1	3	5	15	95	995	1995	2995	7995	190	191	NVAAAA	SALAAA	OOOOxx
+3519	7455	1	3	9	19	19	519	1519	3519	3519	38	39	JFAAAA	TALAAA	VVVVxx
+3571	7456	1	3	1	11	71	571	1571	3571	3571	142	143	JHAAAA	UALAAA	AAAAxx
+7854	7457	0	2	4	14	54	854	1854	2854	7854	108	109	CQAAAA	VALAAA	HHHHxx
+5184	7458	0	0	4	4	84	184	1184	184	5184	168	169	KRAAAA	WALAAA	OOOOxx
+3498	7459	0	2	8	18	98	498	1498	3498	3498	196	197	OEAAAA	XALAAA	VVVVxx
+1264	7460	0	0	4	4	64	264	1264	1264	1264	128	129	QWAAAA	YALAAA	AAAAxx
+3159	7461	1	3	9	19	59	159	1159	3159	3159	118	119	NRAAAA	ZALAAA	HHHHxx
+5480	7462	0	0	0	0	80	480	1480	480	5480	160	161	UCAAAA	ABLAAA	OOOOxx
+1706	7463	0	2	6	6	6	706	1706	1706	1706	12	13	QNAAAA	BBLAAA	VVVVxx
+4540	7464	0	0	0	0	40	540	540	4540	4540	80	81	QSAAAA	CBLAAA	AAAAxx
+2799	7465	1	3	9	19	99	799	799	2799	2799	198	199	RDAAAA	DBLAAA	HHHHxx
+7389	7466	1	1	9	9	89	389	1389	2389	7389	178	179	FYAAAA	EBLAAA	OOOOxx
+5565	7467	1	1	5	5	65	565	1565	565	5565	130	131	BGAAAA	FBLAAA	VVVVxx
+3896	7468	0	0	6	16	96	896	1896	3896	3896	192	193	WTAAAA	GBLAAA	AAAAxx
+2100	7469	0	0	0	0	0	100	100	2100	2100	0	1	UCAAAA	HBLAAA	HHHHxx
+3507	7470	1	3	7	7	7	507	1507	3507	3507	14	15	XEAAAA	IBLAAA	OOOOxx
+7971	7471	1	3	1	11	71	971	1971	2971	7971	142	143	PUAAAA	JBLAAA	VVVVxx
+2312	7472	0	0	2	12	12	312	312	2312	2312	24	25	YKAAAA	KBLAAA	AAAAxx
+2494	7473	0	2	4	14	94	494	494	2494	2494	188	189	YRAAAA	LBLAAA	HHHHxx
+2474	7474	0	2	4	14	74	474	474	2474	2474	148	149	ERAAAA	MBLAAA	OOOOxx
+3136	7475	0	0	6	16	36	136	1136	3136	3136	72	73	QQAAAA	NBLAAA	VVVVxx
+7242	7476	0	2	2	2	42	242	1242	2242	7242	84	85	OSAAAA	OBLAAA	AAAAxx
+9430	7477	0	2	0	10	30	430	1430	4430	9430	60	61	SYAAAA	PBLAAA	HHHHxx
+1052	7478	0	0	2	12	52	52	1052	1052	1052	104	105	MOAAAA	QBLAAA	OOOOxx
+4172	7479	0	0	2	12	72	172	172	4172	4172	144	145	MEAAAA	RBLAAA	VVVVxx
+970	7480	0	2	0	10	70	970	970	970	970	140	141	ILAAAA	SBLAAA	AAAAxx
+882	7481	0	2	2	2	82	882	882	882	882	164	165	YHAAAA	TBLAAA	HHHHxx
+9799	7482	1	3	9	19	99	799	1799	4799	9799	198	199	XMAAAA	UBLAAA	OOOOxx
+5850	7483	0	2	0	10	50	850	1850	850	5850	100	101	ARAAAA	VBLAAA	VVVVxx
+9473	7484	1	1	3	13	73	473	1473	4473	9473	146	147	JAAAAA	WBLAAA	AAAAxx
+8635	7485	1	3	5	15	35	635	635	3635	8635	70	71	DUAAAA	XBLAAA	HHHHxx
+2349	7486	1	1	9	9	49	349	349	2349	2349	98	99	JMAAAA	YBLAAA	OOOOxx
+2270	7487	0	2	0	10	70	270	270	2270	2270	140	141	IJAAAA	ZBLAAA	VVVVxx
+7887	7488	1	3	7	7	87	887	1887	2887	7887	174	175	JRAAAA	ACLAAA	AAAAxx
+3091	7489	1	3	1	11	91	91	1091	3091	3091	182	183	XOAAAA	BCLAAA	HHHHxx
+3728	7490	0	0	8	8	28	728	1728	3728	3728	56	57	KNAAAA	CCLAAA	OOOOxx
+3658	7491	0	2	8	18	58	658	1658	3658	3658	116	117	SKAAAA	DCLAAA	VVVVxx
+5975	7492	1	3	5	15	75	975	1975	975	5975	150	151	VVAAAA	ECLAAA	AAAAxx
+332	7493	0	0	2	12	32	332	332	332	332	64	65	UMAAAA	FCLAAA	HHHHxx
+7990	7494	0	2	0	10	90	990	1990	2990	7990	180	181	IVAAAA	GCLAAA	OOOOxx
+8688	7495	0	0	8	8	88	688	688	3688	8688	176	177	EWAAAA	HCLAAA	VVVVxx
+9601	7496	1	1	1	1	1	601	1601	4601	9601	2	3	HFAAAA	ICLAAA	AAAAxx
+8401	7497	1	1	1	1	1	401	401	3401	8401	2	3	DLAAAA	JCLAAA	HHHHxx
+8093	7498	1	1	3	13	93	93	93	3093	8093	186	187	HZAAAA	KCLAAA	OOOOxx
+4278	7499	0	2	8	18	78	278	278	4278	4278	156	157	OIAAAA	LCLAAA	VVVVxx
+5467	7500	1	3	7	7	67	467	1467	467	5467	134	135	HCAAAA	MCLAAA	AAAAxx
+3137	7501	1	1	7	17	37	137	1137	3137	3137	74	75	RQAAAA	NCLAAA	HHHHxx
+204	7502	0	0	4	4	4	204	204	204	204	8	9	WHAAAA	OCLAAA	OOOOxx
+8224	7503	0	0	4	4	24	224	224	3224	8224	48	49	IEAAAA	PCLAAA	VVVVxx
+2944	7504	0	0	4	4	44	944	944	2944	2944	88	89	GJAAAA	QCLAAA	AAAAxx
+7593	7505	1	1	3	13	93	593	1593	2593	7593	186	187	BGAAAA	RCLAAA	HHHHxx
+814	7506	0	2	4	14	14	814	814	814	814	28	29	IFAAAA	SCLAAA	OOOOxx
+8047	7507	1	3	7	7	47	47	47	3047	8047	94	95	NXAAAA	TCLAAA	VVVVxx
+7802	7508	0	2	2	2	2	802	1802	2802	7802	4	5	COAAAA	UCLAAA	AAAAxx
+901	7509	1	1	1	1	1	901	901	901	901	2	3	RIAAAA	VCLAAA	HHHHxx
+6168	7510	0	0	8	8	68	168	168	1168	6168	136	137	GDAAAA	WCLAAA	OOOOxx
+2950	7511	0	2	0	10	50	950	950	2950	2950	100	101	MJAAAA	XCLAAA	VVVVxx
+5393	7512	1	1	3	13	93	393	1393	393	5393	186	187	LZAAAA	YCLAAA	AAAAxx
+3585	7513	1	1	5	5	85	585	1585	3585	3585	170	171	XHAAAA	ZCLAAA	HHHHxx
+9392	7514	0	0	2	12	92	392	1392	4392	9392	184	185	GXAAAA	ADLAAA	OOOOxx
+8314	7515	0	2	4	14	14	314	314	3314	8314	28	29	UHAAAA	BDLAAA	VVVVxx
+9972	7516	0	0	2	12	72	972	1972	4972	9972	144	145	OTAAAA	CDLAAA	AAAAxx
+9130	7517	0	2	0	10	30	130	1130	4130	9130	60	61	ENAAAA	DDLAAA	HHHHxx
+975	7518	1	3	5	15	75	975	975	975	975	150	151	NLAAAA	EDLAAA	OOOOxx
+5720	7519	0	0	0	0	20	720	1720	720	5720	40	41	AMAAAA	FDLAAA	VVVVxx
+3769	7520	1	1	9	9	69	769	1769	3769	3769	138	139	ZOAAAA	GDLAAA	AAAAxx
+5303	7521	1	3	3	3	3	303	1303	303	5303	6	7	ZVAAAA	HDLAAA	HHHHxx
+6564	7522	0	0	4	4	64	564	564	1564	6564	128	129	MSAAAA	IDLAAA	OOOOxx
+7855	7523	1	3	5	15	55	855	1855	2855	7855	110	111	DQAAAA	JDLAAA	VVVVxx
+8153	7524	1	1	3	13	53	153	153	3153	8153	106	107	PBAAAA	KDLAAA	AAAAxx
+2292	7525	0	0	2	12	92	292	292	2292	2292	184	185	EKAAAA	LDLAAA	HHHHxx
+3156	7526	0	0	6	16	56	156	1156	3156	3156	112	113	KRAAAA	MDLAAA	OOOOxx
+6580	7527	0	0	0	0	80	580	580	1580	6580	160	161	CTAAAA	NDLAAA	VVVVxx
+5324	7528	0	0	4	4	24	324	1324	324	5324	48	49	UWAAAA	ODLAAA	AAAAxx
+8871	7529	1	3	1	11	71	871	871	3871	8871	142	143	FDAAAA	PDLAAA	HHHHxx
+2543	7530	1	3	3	3	43	543	543	2543	2543	86	87	VTAAAA	QDLAAA	OOOOxx
+7857	7531	1	1	7	17	57	857	1857	2857	7857	114	115	FQAAAA	RDLAAA	VVVVxx
+4084	7532	0	0	4	4	84	84	84	4084	4084	168	169	CBAAAA	SDLAAA	AAAAxx
+9887	7533	1	3	7	7	87	887	1887	4887	9887	174	175	HQAAAA	TDLAAA	HHHHxx
+6940	7534	0	0	0	0	40	940	940	1940	6940	80	81	YGAAAA	UDLAAA	OOOOxx
+3415	7535	1	3	5	15	15	415	1415	3415	3415	30	31	JBAAAA	VDLAAA	VVVVxx
+5012	7536	0	0	2	12	12	12	1012	12	5012	24	25	UKAAAA	WDLAAA	AAAAxx
+3187	7537	1	3	7	7	87	187	1187	3187	3187	174	175	PSAAAA	XDLAAA	HHHHxx
+8556	7538	0	0	6	16	56	556	556	3556	8556	112	113	CRAAAA	YDLAAA	OOOOxx
+7966	7539	0	2	6	6	66	966	1966	2966	7966	132	133	KUAAAA	ZDLAAA	VVVVxx
+7481	7540	1	1	1	1	81	481	1481	2481	7481	162	163	TBAAAA	AELAAA	AAAAxx
+8524	7541	0	0	4	4	24	524	524	3524	8524	48	49	WPAAAA	BELAAA	HHHHxx
+3021	7542	1	1	1	1	21	21	1021	3021	3021	42	43	FMAAAA	CELAAA	OOOOxx
+6045	7543	1	1	5	5	45	45	45	1045	6045	90	91	NYAAAA	DELAAA	VVVVxx
+8022	7544	0	2	2	2	22	22	22	3022	8022	44	45	OWAAAA	EELAAA	AAAAxx
+3626	7545	0	2	6	6	26	626	1626	3626	3626	52	53	MJAAAA	FELAAA	HHHHxx
+1030	7546	0	2	0	10	30	30	1030	1030	1030	60	61	QNAAAA	GELAAA	OOOOxx
+8903	7547	1	3	3	3	3	903	903	3903	8903	6	7	LEAAAA	HELAAA	VVVVxx
+7488	7548	0	0	8	8	88	488	1488	2488	7488	176	177	ACAAAA	IELAAA	AAAAxx
+9293	7549	1	1	3	13	93	293	1293	4293	9293	186	187	LTAAAA	JELAAA	HHHHxx
+4586	7550	0	2	6	6	86	586	586	4586	4586	172	173	KUAAAA	KELAAA	OOOOxx
+9282	7551	0	2	2	2	82	282	1282	4282	9282	164	165	ATAAAA	LELAAA	VVVVxx
+1948	7552	0	0	8	8	48	948	1948	1948	1948	96	97	YWAAAA	MELAAA	AAAAxx
+2534	7553	0	2	4	14	34	534	534	2534	2534	68	69	MTAAAA	NELAAA	HHHHxx
+1150	7554	0	2	0	10	50	150	1150	1150	1150	100	101	GSAAAA	OELAAA	OOOOxx
+4931	7555	1	3	1	11	31	931	931	4931	4931	62	63	RHAAAA	PELAAA	VVVVxx
+2866	7556	0	2	6	6	66	866	866	2866	2866	132	133	GGAAAA	QELAAA	AAAAxx
+6172	7557	0	0	2	12	72	172	172	1172	6172	144	145	KDAAAA	RELAAA	HHHHxx
+4819	7558	1	3	9	19	19	819	819	4819	4819	38	39	JDAAAA	SELAAA	OOOOxx
+569	7559	1	1	9	9	69	569	569	569	569	138	139	XVAAAA	TELAAA	VVVVxx
+1146	7560	0	2	6	6	46	146	1146	1146	1146	92	93	CSAAAA	UELAAA	AAAAxx
+3062	7561	0	2	2	2	62	62	1062	3062	3062	124	125	UNAAAA	VELAAA	HHHHxx
+7690	7562	0	2	0	10	90	690	1690	2690	7690	180	181	UJAAAA	WELAAA	OOOOxx
+8611	7563	1	3	1	11	11	611	611	3611	8611	22	23	FTAAAA	XELAAA	VVVVxx
+1142	7564	0	2	2	2	42	142	1142	1142	1142	84	85	YRAAAA	YELAAA	AAAAxx
+1193	7565	1	1	3	13	93	193	1193	1193	1193	186	187	XTAAAA	ZELAAA	HHHHxx
+2507	7566	1	3	7	7	7	507	507	2507	2507	14	15	LSAAAA	AFLAAA	OOOOxx
+1043	7567	1	3	3	3	43	43	1043	1043	1043	86	87	DOAAAA	BFLAAA	VVVVxx
+7472	7568	0	0	2	12	72	472	1472	2472	7472	144	145	KBAAAA	CFLAAA	AAAAxx
+1817	7569	1	1	7	17	17	817	1817	1817	1817	34	35	XRAAAA	DFLAAA	HHHHxx
+3868	7570	0	0	8	8	68	868	1868	3868	3868	136	137	USAAAA	EFLAAA	OOOOxx
+9031	7571	1	3	1	11	31	31	1031	4031	9031	62	63	JJAAAA	FFLAAA	VVVVxx
+7254	7572	0	2	4	14	54	254	1254	2254	7254	108	109	ATAAAA	GFLAAA	AAAAxx
+5030	7573	0	2	0	10	30	30	1030	30	5030	60	61	MLAAAA	HFLAAA	HHHHxx
+6594	7574	0	2	4	14	94	594	594	1594	6594	188	189	QTAAAA	IFLAAA	OOOOxx
+6862	7575	0	2	2	2	62	862	862	1862	6862	124	125	YDAAAA	JFLAAA	VVVVxx
+1994	7576	0	2	4	14	94	994	1994	1994	1994	188	189	SYAAAA	KFLAAA	AAAAxx
+9017	7577	1	1	7	17	17	17	1017	4017	9017	34	35	VIAAAA	LFLAAA	HHHHxx
+5716	7578	0	0	6	16	16	716	1716	716	5716	32	33	WLAAAA	MFLAAA	OOOOxx
+1900	7579	0	0	0	0	0	900	1900	1900	1900	0	1	CVAAAA	NFLAAA	VVVVxx
+120	7580	0	0	0	0	20	120	120	120	120	40	41	QEAAAA	OFLAAA	AAAAxx
+9003	7581	1	3	3	3	3	3	1003	4003	9003	6	7	HIAAAA	PFLAAA	HHHHxx
+4178	7582	0	2	8	18	78	178	178	4178	4178	156	157	SEAAAA	QFLAAA	OOOOxx
+8777	7583	1	1	7	17	77	777	777	3777	8777	154	155	PZAAAA	RFLAAA	VVVVxx
+3653	7584	1	1	3	13	53	653	1653	3653	3653	106	107	NKAAAA	SFLAAA	AAAAxx
+1137	7585	1	1	7	17	37	137	1137	1137	1137	74	75	TRAAAA	TFLAAA	HHHHxx
+6362	7586	0	2	2	2	62	362	362	1362	6362	124	125	SKAAAA	UFLAAA	OOOOxx
+8537	7587	1	1	7	17	37	537	537	3537	8537	74	75	JQAAAA	VFLAAA	VVVVxx
+1590	7588	0	2	0	10	90	590	1590	1590	1590	180	181	EJAAAA	WFLAAA	AAAAxx
+374	7589	0	2	4	14	74	374	374	374	374	148	149	KOAAAA	XFLAAA	HHHHxx
+2597	7590	1	1	7	17	97	597	597	2597	2597	194	195	XVAAAA	YFLAAA	OOOOxx
+8071	7591	1	3	1	11	71	71	71	3071	8071	142	143	LYAAAA	ZFLAAA	VVVVxx
+9009	7592	1	1	9	9	9	9	1009	4009	9009	18	19	NIAAAA	AGLAAA	AAAAxx
+1978	7593	0	2	8	18	78	978	1978	1978	1978	156	157	CYAAAA	BGLAAA	HHHHxx
+1541	7594	1	1	1	1	41	541	1541	1541	1541	82	83	HHAAAA	CGLAAA	OOOOxx
+4998	7595	0	2	8	18	98	998	998	4998	4998	196	197	GKAAAA	DGLAAA	VVVVxx
+1649	7596	1	1	9	9	49	649	1649	1649	1649	98	99	LLAAAA	EGLAAA	AAAAxx
+5426	7597	0	2	6	6	26	426	1426	426	5426	52	53	SAAAAA	FGLAAA	HHHHxx
+1492	7598	0	0	2	12	92	492	1492	1492	1492	184	185	KFAAAA	GGLAAA	OOOOxx
+9622	7599	0	2	2	2	22	622	1622	4622	9622	44	45	CGAAAA	HGLAAA	VVVVxx
+701	7600	1	1	1	1	1	701	701	701	701	2	3	ZAAAAA	IGLAAA	AAAAxx
+2781	7601	1	1	1	1	81	781	781	2781	2781	162	163	ZCAAAA	JGLAAA	HHHHxx
+3982	7602	0	2	2	2	82	982	1982	3982	3982	164	165	EXAAAA	KGLAAA	OOOOxx
+7259	7603	1	3	9	19	59	259	1259	2259	7259	118	119	FTAAAA	LGLAAA	VVVVxx
+9868	7604	0	0	8	8	68	868	1868	4868	9868	136	137	OPAAAA	MGLAAA	AAAAxx
+564	7605	0	0	4	4	64	564	564	564	564	128	129	SVAAAA	NGLAAA	HHHHxx
+6315	7606	1	3	5	15	15	315	315	1315	6315	30	31	XIAAAA	OGLAAA	OOOOxx
+9092	7607	0	0	2	12	92	92	1092	4092	9092	184	185	SLAAAA	PGLAAA	VVVVxx
+8237	7608	1	1	7	17	37	237	237	3237	8237	74	75	VEAAAA	QGLAAA	AAAAxx
+1513	7609	1	1	3	13	13	513	1513	1513	1513	26	27	FGAAAA	RGLAAA	HHHHxx
+1922	7610	0	2	2	2	22	922	1922	1922	1922	44	45	YVAAAA	SGLAAA	OOOOxx
+5396	7611	0	0	6	16	96	396	1396	396	5396	192	193	OZAAAA	TGLAAA	VVVVxx
+2485	7612	1	1	5	5	85	485	485	2485	2485	170	171	PRAAAA	UGLAAA	AAAAxx
+5774	7613	0	2	4	14	74	774	1774	774	5774	148	149	COAAAA	VGLAAA	HHHHxx
+3983	7614	1	3	3	3	83	983	1983	3983	3983	166	167	FXAAAA	WGLAAA	OOOOxx
+221	7615	1	1	1	1	21	221	221	221	221	42	43	NIAAAA	XGLAAA	VVVVxx
+8662	7616	0	2	2	2	62	662	662	3662	8662	124	125	EVAAAA	YGLAAA	AAAAxx
+2456	7617	0	0	6	16	56	456	456	2456	2456	112	113	MQAAAA	ZGLAAA	HHHHxx
+9736	7618	0	0	6	16	36	736	1736	4736	9736	72	73	MKAAAA	AHLAAA	OOOOxx
+8936	7619	0	0	6	16	36	936	936	3936	8936	72	73	SFAAAA	BHLAAA	VVVVxx
+5395	7620	1	3	5	15	95	395	1395	395	5395	190	191	NZAAAA	CHLAAA	AAAAxx
+9523	7621	1	3	3	3	23	523	1523	4523	9523	46	47	HCAAAA	DHLAAA	HHHHxx
+6980	7622	0	0	0	0	80	980	980	1980	6980	160	161	MIAAAA	EHLAAA	OOOOxx
+2091	7623	1	3	1	11	91	91	91	2091	2091	182	183	LCAAAA	FHLAAA	VVVVxx
+6807	7624	1	3	7	7	7	807	807	1807	6807	14	15	VBAAAA	GHLAAA	AAAAxx
+8818	7625	0	2	8	18	18	818	818	3818	8818	36	37	EBAAAA	HHLAAA	HHHHxx
+5298	7626	0	2	8	18	98	298	1298	298	5298	196	197	UVAAAA	IHLAAA	OOOOxx
+1726	7627	0	2	6	6	26	726	1726	1726	1726	52	53	KOAAAA	JHLAAA	VVVVxx
+3878	7628	0	2	8	18	78	878	1878	3878	3878	156	157	ETAAAA	KHLAAA	AAAAxx
+8700	7629	0	0	0	0	0	700	700	3700	8700	0	1	QWAAAA	LHLAAA	HHHHxx
+5201	7630	1	1	1	1	1	201	1201	201	5201	2	3	BSAAAA	MHLAAA	OOOOxx
+3936	7631	0	0	6	16	36	936	1936	3936	3936	72	73	KVAAAA	NHLAAA	VVVVxx
+776	7632	0	0	6	16	76	776	776	776	776	152	153	WDAAAA	OHLAAA	AAAAxx
+5302	7633	0	2	2	2	2	302	1302	302	5302	4	5	YVAAAA	PHLAAA	HHHHxx
+3595	7634	1	3	5	15	95	595	1595	3595	3595	190	191	HIAAAA	QHLAAA	OOOOxx
+9061	7635	1	1	1	1	61	61	1061	4061	9061	122	123	NKAAAA	RHLAAA	VVVVxx
+6261	7636	1	1	1	1	61	261	261	1261	6261	122	123	VGAAAA	SHLAAA	AAAAxx
+8878	7637	0	2	8	18	78	878	878	3878	8878	156	157	MDAAAA	THLAAA	HHHHxx
+3312	7638	0	0	2	12	12	312	1312	3312	3312	24	25	KXAAAA	UHLAAA	OOOOxx
+9422	7639	0	2	2	2	22	422	1422	4422	9422	44	45	KYAAAA	VHLAAA	VVVVxx
+7321	7640	1	1	1	1	21	321	1321	2321	7321	42	43	PVAAAA	WHLAAA	AAAAxx
+3813	7641	1	1	3	13	13	813	1813	3813	3813	26	27	RQAAAA	XHLAAA	HHHHxx
+5848	7642	0	0	8	8	48	848	1848	848	5848	96	97	YQAAAA	YHLAAA	OOOOxx
+3535	7643	1	3	5	15	35	535	1535	3535	3535	70	71	ZFAAAA	ZHLAAA	VVVVxx
+1040	7644	0	0	0	0	40	40	1040	1040	1040	80	81	AOAAAA	AILAAA	AAAAxx
+8572	7645	0	0	2	12	72	572	572	3572	8572	144	145	SRAAAA	BILAAA	HHHHxx
+5435	7646	1	3	5	15	35	435	1435	435	5435	70	71	BBAAAA	CILAAA	OOOOxx
+8199	7647	1	3	9	19	99	199	199	3199	8199	198	199	JDAAAA	DILAAA	VVVVxx
+8775	7648	1	3	5	15	75	775	775	3775	8775	150	151	NZAAAA	EILAAA	AAAAxx
+7722	7649	0	2	2	2	22	722	1722	2722	7722	44	45	ALAAAA	FILAAA	HHHHxx
+3549	7650	1	1	9	9	49	549	1549	3549	3549	98	99	NGAAAA	GILAAA	OOOOxx
+2578	7651	0	2	8	18	78	578	578	2578	2578	156	157	EVAAAA	HILAAA	VVVVxx
+1695	7652	1	3	5	15	95	695	1695	1695	1695	190	191	FNAAAA	IILAAA	AAAAxx
+1902	7653	0	2	2	2	2	902	1902	1902	1902	4	5	EVAAAA	JILAAA	HHHHxx
+6058	7654	0	2	8	18	58	58	58	1058	6058	116	117	AZAAAA	KILAAA	OOOOxx
+6591	7655	1	3	1	11	91	591	591	1591	6591	182	183	NTAAAA	LILAAA	VVVVxx
+7962	7656	0	2	2	2	62	962	1962	2962	7962	124	125	GUAAAA	MILAAA	AAAAxx
+5612	7657	0	0	2	12	12	612	1612	612	5612	24	25	WHAAAA	NILAAA	HHHHxx
+3341	7658	1	1	1	1	41	341	1341	3341	3341	82	83	NYAAAA	OILAAA	OOOOxx
+5460	7659	0	0	0	0	60	460	1460	460	5460	120	121	ACAAAA	PILAAA	VVVVxx
+2368	7660	0	0	8	8	68	368	368	2368	2368	136	137	CNAAAA	QILAAA	AAAAxx
+8646	7661	0	2	6	6	46	646	646	3646	8646	92	93	OUAAAA	RILAAA	HHHHxx
+4987	7662	1	3	7	7	87	987	987	4987	4987	174	175	VJAAAA	SILAAA	OOOOxx
+9018	7663	0	2	8	18	18	18	1018	4018	9018	36	37	WIAAAA	TILAAA	VVVVxx
+8685	7664	1	1	5	5	85	685	685	3685	8685	170	171	BWAAAA	UILAAA	AAAAxx
+694	7665	0	2	4	14	94	694	694	694	694	188	189	SAAAAA	VILAAA	HHHHxx
+2012	7666	0	0	2	12	12	12	12	2012	2012	24	25	KZAAAA	WILAAA	OOOOxx
+2417	7667	1	1	7	17	17	417	417	2417	2417	34	35	ZOAAAA	XILAAA	VVVVxx
+4022	7668	0	2	2	2	22	22	22	4022	4022	44	45	SYAAAA	YILAAA	AAAAxx
+5935	7669	1	3	5	15	35	935	1935	935	5935	70	71	HUAAAA	ZILAAA	HHHHxx
+1656	7670	0	0	6	16	56	656	1656	1656	1656	112	113	SLAAAA	AJLAAA	OOOOxx
+6195	7671	1	3	5	15	95	195	195	1195	6195	190	191	HEAAAA	BJLAAA	VVVVxx
+3057	7672	1	1	7	17	57	57	1057	3057	3057	114	115	PNAAAA	CJLAAA	AAAAxx
+2852	7673	0	0	2	12	52	852	852	2852	2852	104	105	SFAAAA	DJLAAA	HHHHxx
+4634	7674	0	2	4	14	34	634	634	4634	4634	68	69	GWAAAA	EJLAAA	OOOOxx
+1689	7675	1	1	9	9	89	689	1689	1689	1689	178	179	ZMAAAA	FJLAAA	VVVVxx
+4102	7676	0	2	2	2	2	102	102	4102	4102	4	5	UBAAAA	GJLAAA	AAAAxx
+3287	7677	1	3	7	7	87	287	1287	3287	3287	174	175	LWAAAA	HJLAAA	HHHHxx
+5246	7678	0	2	6	6	46	246	1246	246	5246	92	93	UTAAAA	IJLAAA	OOOOxx
+7450	7679	0	2	0	10	50	450	1450	2450	7450	100	101	OAAAAA	JJLAAA	VVVVxx
+6548	7680	0	0	8	8	48	548	548	1548	6548	96	97	WRAAAA	KJLAAA	AAAAxx
+379	7681	1	3	9	19	79	379	379	379	379	158	159	POAAAA	LJLAAA	HHHHxx
+7435	7682	1	3	5	15	35	435	1435	2435	7435	70	71	ZZAAAA	MJLAAA	OOOOxx
+2041	7683	1	1	1	1	41	41	41	2041	2041	82	83	NAAAAA	NJLAAA	VVVVxx
+8462	7684	0	2	2	2	62	462	462	3462	8462	124	125	MNAAAA	OJLAAA	AAAAxx
+9076	7685	0	0	6	16	76	76	1076	4076	9076	152	153	CLAAAA	PJLAAA	HHHHxx
+761	7686	1	1	1	1	61	761	761	761	761	122	123	HDAAAA	QJLAAA	OOOOxx
+795	7687	1	3	5	15	95	795	795	795	795	190	191	PEAAAA	RJLAAA	VVVVxx
+1671	7688	1	3	1	11	71	671	1671	1671	1671	142	143	HMAAAA	SJLAAA	AAAAxx
+695	7689	1	3	5	15	95	695	695	695	695	190	191	TAAAAA	TJLAAA	HHHHxx
+4981	7690	1	1	1	1	81	981	981	4981	4981	162	163	PJAAAA	UJLAAA	OOOOxx
+1211	7691	1	3	1	11	11	211	1211	1211	1211	22	23	PUAAAA	VJLAAA	VVVVxx
+5914	7692	0	2	4	14	14	914	1914	914	5914	28	29	MTAAAA	WJLAAA	AAAAxx
+9356	7693	0	0	6	16	56	356	1356	4356	9356	112	113	WVAAAA	XJLAAA	HHHHxx
+1500	7694	0	0	0	0	0	500	1500	1500	1500	0	1	SFAAAA	YJLAAA	OOOOxx
+3353	7695	1	1	3	13	53	353	1353	3353	3353	106	107	ZYAAAA	ZJLAAA	VVVVxx
+1060	7696	0	0	0	0	60	60	1060	1060	1060	120	121	UOAAAA	AKLAAA	AAAAxx
+7910	7697	0	2	0	10	10	910	1910	2910	7910	20	21	GSAAAA	BKLAAA	HHHHxx
+1329	7698	1	1	9	9	29	329	1329	1329	1329	58	59	DZAAAA	CKLAAA	OOOOxx
+6011	7699	1	3	1	11	11	11	11	1011	6011	22	23	FXAAAA	DKLAAA	VVVVxx
+7146	7700	0	2	6	6	46	146	1146	2146	7146	92	93	WOAAAA	EKLAAA	AAAAxx
+4602	7701	0	2	2	2	2	602	602	4602	4602	4	5	AVAAAA	FKLAAA	HHHHxx
+6751	7702	1	3	1	11	51	751	751	1751	6751	102	103	RZAAAA	GKLAAA	OOOOxx
+2666	7703	0	2	6	6	66	666	666	2666	2666	132	133	OYAAAA	HKLAAA	VVVVxx
+2785	7704	1	1	5	5	85	785	785	2785	2785	170	171	DDAAAA	IKLAAA	AAAAxx
+5851	7705	1	3	1	11	51	851	1851	851	5851	102	103	BRAAAA	JKLAAA	HHHHxx
+2435	7706	1	3	5	15	35	435	435	2435	2435	70	71	RPAAAA	KKLAAA	OOOOxx
+7429	7707	1	1	9	9	29	429	1429	2429	7429	58	59	TZAAAA	LKLAAA	VVVVxx
+4241	7708	1	1	1	1	41	241	241	4241	4241	82	83	DHAAAA	MKLAAA	AAAAxx
+5691	7709	1	3	1	11	91	691	1691	691	5691	182	183	XKAAAA	NKLAAA	HHHHxx
+7731	7710	1	3	1	11	31	731	1731	2731	7731	62	63	JLAAAA	OKLAAA	OOOOxx
+249	7711	1	1	9	9	49	249	249	249	249	98	99	PJAAAA	PKLAAA	VVVVxx
+1731	7712	1	3	1	11	31	731	1731	1731	1731	62	63	POAAAA	QKLAAA	AAAAxx
+8716	7713	0	0	6	16	16	716	716	3716	8716	32	33	GXAAAA	RKLAAA	HHHHxx
+2670	7714	0	2	0	10	70	670	670	2670	2670	140	141	SYAAAA	SKLAAA	OOOOxx
+4654	7715	0	2	4	14	54	654	654	4654	4654	108	109	AXAAAA	TKLAAA	VVVVxx
+1027	7716	1	3	7	7	27	27	1027	1027	1027	54	55	NNAAAA	UKLAAA	AAAAxx
+1099	7717	1	3	9	19	99	99	1099	1099	1099	198	199	HQAAAA	VKLAAA	HHHHxx
+3617	7718	1	1	7	17	17	617	1617	3617	3617	34	35	DJAAAA	WKLAAA	OOOOxx
+4330	7719	0	2	0	10	30	330	330	4330	4330	60	61	OKAAAA	XKLAAA	VVVVxx
+9750	7720	0	2	0	10	50	750	1750	4750	9750	100	101	ALAAAA	YKLAAA	AAAAxx
+467	7721	1	3	7	7	67	467	467	467	467	134	135	ZRAAAA	ZKLAAA	HHHHxx
+8525	7722	1	1	5	5	25	525	525	3525	8525	50	51	XPAAAA	ALLAAA	OOOOxx
+5990	7723	0	2	0	10	90	990	1990	990	5990	180	181	KWAAAA	BLLAAA	VVVVxx
+4839	7724	1	3	9	19	39	839	839	4839	4839	78	79	DEAAAA	CLLAAA	AAAAxx
+9914	7725	0	2	4	14	14	914	1914	4914	9914	28	29	IRAAAA	DLLAAA	HHHHxx
+7047	7726	1	3	7	7	47	47	1047	2047	7047	94	95	BLAAAA	ELLAAA	OOOOxx
+874	7727	0	2	4	14	74	874	874	874	874	148	149	QHAAAA	FLLAAA	VVVVxx
+6061	7728	1	1	1	1	61	61	61	1061	6061	122	123	DZAAAA	GLLAAA	AAAAxx
+5491	7729	1	3	1	11	91	491	1491	491	5491	182	183	FDAAAA	HLLAAA	HHHHxx
+4344	7730	0	0	4	4	44	344	344	4344	4344	88	89	CLAAAA	ILLAAA	OOOOxx
+1281	7731	1	1	1	1	81	281	1281	1281	1281	162	163	HXAAAA	JLLAAA	VVVVxx
+3597	7732	1	1	7	17	97	597	1597	3597	3597	194	195	JIAAAA	KLLAAA	AAAAxx
+4992	7733	0	0	2	12	92	992	992	4992	4992	184	185	AKAAAA	LLLAAA	HHHHxx
+3849	7734	1	1	9	9	49	849	1849	3849	3849	98	99	BSAAAA	MLLAAA	OOOOxx
+2655	7735	1	3	5	15	55	655	655	2655	2655	110	111	DYAAAA	NLLAAA	VVVVxx
+147	7736	1	3	7	7	47	147	147	147	147	94	95	RFAAAA	OLLAAA	AAAAxx
+9110	7737	0	2	0	10	10	110	1110	4110	9110	20	21	KMAAAA	PLLAAA	HHHHxx
+1637	7738	1	1	7	17	37	637	1637	1637	1637	74	75	ZKAAAA	QLLAAA	OOOOxx
+9826	7739	0	2	6	6	26	826	1826	4826	9826	52	53	YNAAAA	RLLAAA	VVVVxx
+5957	7740	1	1	7	17	57	957	1957	957	5957	114	115	DVAAAA	SLLAAA	AAAAxx
+6932	7741	0	0	2	12	32	932	932	1932	6932	64	65	QGAAAA	TLLAAA	HHHHxx
+9684	7742	0	0	4	4	84	684	1684	4684	9684	168	169	MIAAAA	ULLAAA	OOOOxx
+4653	7743	1	1	3	13	53	653	653	4653	4653	106	107	ZWAAAA	VLLAAA	VVVVxx
+8065	7744	1	1	5	5	65	65	65	3065	8065	130	131	FYAAAA	WLLAAA	AAAAxx
+1202	7745	0	2	2	2	2	202	1202	1202	1202	4	5	GUAAAA	XLLAAA	HHHHxx
+9214	7746	0	2	4	14	14	214	1214	4214	9214	28	29	KQAAAA	YLLAAA	OOOOxx
+196	7747	0	0	6	16	96	196	196	196	196	192	193	OHAAAA	ZLLAAA	VVVVxx
+4486	7748	0	2	6	6	86	486	486	4486	4486	172	173	OQAAAA	AMLAAA	AAAAxx
+2585	7749	1	1	5	5	85	585	585	2585	2585	170	171	LVAAAA	BMLAAA	HHHHxx
+2464	7750	0	0	4	4	64	464	464	2464	2464	128	129	UQAAAA	CMLAAA	OOOOxx
+3467	7751	1	3	7	7	67	467	1467	3467	3467	134	135	JDAAAA	DMLAAA	VVVVxx
+9295	7752	1	3	5	15	95	295	1295	4295	9295	190	191	NTAAAA	EMLAAA	AAAAxx
+517	7753	1	1	7	17	17	517	517	517	517	34	35	XTAAAA	FMLAAA	HHHHxx
+6870	7754	0	2	0	10	70	870	870	1870	6870	140	141	GEAAAA	GMLAAA	OOOOxx
+5732	7755	0	0	2	12	32	732	1732	732	5732	64	65	MMAAAA	HMLAAA	VVVVxx
+9376	7756	0	0	6	16	76	376	1376	4376	9376	152	153	QWAAAA	IMLAAA	AAAAxx
+838	7757	0	2	8	18	38	838	838	838	838	76	77	GGAAAA	JMLAAA	HHHHxx
+9254	7758	0	2	4	14	54	254	1254	4254	9254	108	109	YRAAAA	KMLAAA	OOOOxx
+8879	7759	1	3	9	19	79	879	879	3879	8879	158	159	NDAAAA	LMLAAA	VVVVxx
+6281	7760	1	1	1	1	81	281	281	1281	6281	162	163	PHAAAA	MMLAAA	AAAAxx
+8216	7761	0	0	6	16	16	216	216	3216	8216	32	33	AEAAAA	NMLAAA	HHHHxx
+9213	7762	1	1	3	13	13	213	1213	4213	9213	26	27	JQAAAA	OMLAAA	OOOOxx
+7234	7763	0	2	4	14	34	234	1234	2234	7234	68	69	GSAAAA	PMLAAA	VVVVxx
+5692	7764	0	0	2	12	92	692	1692	692	5692	184	185	YKAAAA	QMLAAA	AAAAxx
+693	7765	1	1	3	13	93	693	693	693	693	186	187	RAAAAA	RMLAAA	HHHHxx
+9050	7766	0	2	0	10	50	50	1050	4050	9050	100	101	CKAAAA	SMLAAA	OOOOxx
+3623	7767	1	3	3	3	23	623	1623	3623	3623	46	47	JJAAAA	TMLAAA	VVVVxx
+2130	7768	0	2	0	10	30	130	130	2130	2130	60	61	YDAAAA	UMLAAA	AAAAxx
+2514	7769	0	2	4	14	14	514	514	2514	2514	28	29	SSAAAA	VMLAAA	HHHHxx
+1812	7770	0	0	2	12	12	812	1812	1812	1812	24	25	SRAAAA	WMLAAA	OOOOxx
+9037	7771	1	1	7	17	37	37	1037	4037	9037	74	75	PJAAAA	XMLAAA	VVVVxx
+5054	7772	0	2	4	14	54	54	1054	54	5054	108	109	KMAAAA	YMLAAA	AAAAxx
+7801	7773	1	1	1	1	1	801	1801	2801	7801	2	3	BOAAAA	ZMLAAA	HHHHxx
+7939	7774	1	3	9	19	39	939	1939	2939	7939	78	79	JTAAAA	ANLAAA	OOOOxx
+7374	7775	0	2	4	14	74	374	1374	2374	7374	148	149	QXAAAA	BNLAAA	VVVVxx
+1058	7776	0	2	8	18	58	58	1058	1058	1058	116	117	SOAAAA	CNLAAA	AAAAxx
+1972	7777	0	0	2	12	72	972	1972	1972	1972	144	145	WXAAAA	DNLAAA	HHHHxx
+3741	7778	1	1	1	1	41	741	1741	3741	3741	82	83	XNAAAA	ENLAAA	OOOOxx
+2227	7779	1	3	7	7	27	227	227	2227	2227	54	55	RHAAAA	FNLAAA	VVVVxx
+304	7780	0	0	4	4	4	304	304	304	304	8	9	SLAAAA	GNLAAA	AAAAxx
+4914	7781	0	2	4	14	14	914	914	4914	4914	28	29	AHAAAA	HNLAAA	HHHHxx
+2428	7782	0	0	8	8	28	428	428	2428	2428	56	57	KPAAAA	INLAAA	OOOOxx
+6660	7783	0	0	0	0	60	660	660	1660	6660	120	121	EWAAAA	JNLAAA	VVVVxx
+2676	7784	0	0	6	16	76	676	676	2676	2676	152	153	YYAAAA	KNLAAA	AAAAxx
+2454	7785	0	2	4	14	54	454	454	2454	2454	108	109	KQAAAA	LNLAAA	HHHHxx
+3798	7786	0	2	8	18	98	798	1798	3798	3798	196	197	CQAAAA	MNLAAA	OOOOxx
+1341	7787	1	1	1	1	41	341	1341	1341	1341	82	83	PZAAAA	NNLAAA	VVVVxx
+1611	7788	1	3	1	11	11	611	1611	1611	1611	22	23	ZJAAAA	ONLAAA	AAAAxx
+2681	7789	1	1	1	1	81	681	681	2681	2681	162	163	DZAAAA	PNLAAA	HHHHxx
+7292	7790	0	0	2	12	92	292	1292	2292	7292	184	185	MUAAAA	QNLAAA	OOOOxx
+7775	7791	1	3	5	15	75	775	1775	2775	7775	150	151	BNAAAA	RNLAAA	VVVVxx
+794	7792	0	2	4	14	94	794	794	794	794	188	189	OEAAAA	SNLAAA	AAAAxx
+8709	7793	1	1	9	9	9	709	709	3709	8709	18	19	ZWAAAA	TNLAAA	HHHHxx
+1901	7794	1	1	1	1	1	901	1901	1901	1901	2	3	DVAAAA	UNLAAA	OOOOxx
+3089	7795	1	1	9	9	89	89	1089	3089	3089	178	179	VOAAAA	VNLAAA	VVVVxx
+7797	7796	1	1	7	17	97	797	1797	2797	7797	194	195	XNAAAA	WNLAAA	AAAAxx
+6070	7797	0	2	0	10	70	70	70	1070	6070	140	141	MZAAAA	XNLAAA	HHHHxx
+2191	7798	1	3	1	11	91	191	191	2191	2191	182	183	HGAAAA	YNLAAA	OOOOxx
+3497	7799	1	1	7	17	97	497	1497	3497	3497	194	195	NEAAAA	ZNLAAA	VVVVxx
+8302	7800	0	2	2	2	2	302	302	3302	8302	4	5	IHAAAA	AOLAAA	AAAAxx
+4365	7801	1	1	5	5	65	365	365	4365	4365	130	131	XLAAAA	BOLAAA	HHHHxx
+3588	7802	0	0	8	8	88	588	1588	3588	3588	176	177	AIAAAA	COLAAA	OOOOxx
+8292	7803	0	0	2	12	92	292	292	3292	8292	184	185	YGAAAA	DOLAAA	VVVVxx
+4696	7804	0	0	6	16	96	696	696	4696	4696	192	193	QYAAAA	EOLAAA	AAAAxx
+5641	7805	1	1	1	1	41	641	1641	641	5641	82	83	ZIAAAA	FOLAAA	HHHHxx
+9386	7806	0	2	6	6	86	386	1386	4386	9386	172	173	AXAAAA	GOLAAA	OOOOxx
+507	7807	1	3	7	7	7	507	507	507	507	14	15	NTAAAA	HOLAAA	VVVVxx
+7201	7808	1	1	1	1	1	201	1201	2201	7201	2	3	ZQAAAA	IOLAAA	AAAAxx
+7785	7809	1	1	5	5	85	785	1785	2785	7785	170	171	LNAAAA	JOLAAA	HHHHxx
+463	7810	1	3	3	3	63	463	463	463	463	126	127	VRAAAA	KOLAAA	OOOOxx
+6656	7811	0	0	6	16	56	656	656	1656	6656	112	113	AWAAAA	LOLAAA	VVVVxx
+807	7812	1	3	7	7	7	807	807	807	807	14	15	BFAAAA	MOLAAA	AAAAxx
+7278	7813	0	2	8	18	78	278	1278	2278	7278	156	157	YTAAAA	NOLAAA	HHHHxx
+6237	7814	1	1	7	17	37	237	237	1237	6237	74	75	XFAAAA	OOLAAA	OOOOxx
+7671	7815	1	3	1	11	71	671	1671	2671	7671	142	143	BJAAAA	POLAAA	VVVVxx
+2235	7816	1	3	5	15	35	235	235	2235	2235	70	71	ZHAAAA	QOLAAA	AAAAxx
+4042	7817	0	2	2	2	42	42	42	4042	4042	84	85	MZAAAA	ROLAAA	HHHHxx
+5273	7818	1	1	3	13	73	273	1273	273	5273	146	147	VUAAAA	SOLAAA	OOOOxx
+7557	7819	1	1	7	17	57	557	1557	2557	7557	114	115	REAAAA	TOLAAA	VVVVxx
+4007	7820	1	3	7	7	7	7	7	4007	4007	14	15	DYAAAA	UOLAAA	AAAAxx
+1428	7821	0	0	8	8	28	428	1428	1428	1428	56	57	YCAAAA	VOLAAA	HHHHxx
+9739	7822	1	3	9	19	39	739	1739	4739	9739	78	79	PKAAAA	WOLAAA	OOOOxx
+7836	7823	0	0	6	16	36	836	1836	2836	7836	72	73	KPAAAA	XOLAAA	VVVVxx
+1777	7824	1	1	7	17	77	777	1777	1777	1777	154	155	JQAAAA	YOLAAA	AAAAxx
+5192	7825	0	0	2	12	92	192	1192	192	5192	184	185	SRAAAA	ZOLAAA	HHHHxx
+7236	7826	0	0	6	16	36	236	1236	2236	7236	72	73	ISAAAA	APLAAA	OOOOxx
+1623	7827	1	3	3	3	23	623	1623	1623	1623	46	47	LKAAAA	BPLAAA	VVVVxx
+8288	7828	0	0	8	8	88	288	288	3288	8288	176	177	UGAAAA	CPLAAA	AAAAxx
+2827	7829	1	3	7	7	27	827	827	2827	2827	54	55	TEAAAA	DPLAAA	HHHHxx
+458	7830	0	2	8	18	58	458	458	458	458	116	117	QRAAAA	EPLAAA	OOOOxx
+1818	7831	0	2	8	18	18	818	1818	1818	1818	36	37	YRAAAA	FPLAAA	VVVVxx
+6837	7832	1	1	7	17	37	837	837	1837	6837	74	75	ZCAAAA	GPLAAA	AAAAxx
+7825	7833	1	1	5	5	25	825	1825	2825	7825	50	51	ZOAAAA	HPLAAA	HHHHxx
+9146	7834	0	2	6	6	46	146	1146	4146	9146	92	93	UNAAAA	IPLAAA	OOOOxx
+8451	7835	1	3	1	11	51	451	451	3451	8451	102	103	BNAAAA	JPLAAA	VVVVxx
+6438	7836	0	2	8	18	38	438	438	1438	6438	76	77	QNAAAA	KPLAAA	AAAAxx
+4020	7837	0	0	0	0	20	20	20	4020	4020	40	41	QYAAAA	LPLAAA	HHHHxx
+4068	7838	0	0	8	8	68	68	68	4068	4068	136	137	MAAAAA	MPLAAA	OOOOxx
+2411	7839	1	3	1	11	11	411	411	2411	2411	22	23	TOAAAA	NPLAAA	VVVVxx
+6222	7840	0	2	2	2	22	222	222	1222	6222	44	45	IFAAAA	OPLAAA	AAAAxx
+3164	7841	0	0	4	4	64	164	1164	3164	3164	128	129	SRAAAA	PPLAAA	HHHHxx
+311	7842	1	3	1	11	11	311	311	311	311	22	23	ZLAAAA	QPLAAA	OOOOxx
+5683	7843	1	3	3	3	83	683	1683	683	5683	166	167	PKAAAA	RPLAAA	VVVVxx
+3993	7844	1	1	3	13	93	993	1993	3993	3993	186	187	PXAAAA	SPLAAA	AAAAxx
+9897	7845	1	1	7	17	97	897	1897	4897	9897	194	195	RQAAAA	TPLAAA	HHHHxx
+6609	7846	1	1	9	9	9	609	609	1609	6609	18	19	FUAAAA	UPLAAA	OOOOxx
+1362	7847	0	2	2	2	62	362	1362	1362	1362	124	125	KAAAAA	VPLAAA	VVVVxx
+3918	7848	0	2	8	18	18	918	1918	3918	3918	36	37	SUAAAA	WPLAAA	AAAAxx
+7376	7849	0	0	6	16	76	376	1376	2376	7376	152	153	SXAAAA	XPLAAA	HHHHxx
+6996	7850	0	0	6	16	96	996	996	1996	6996	192	193	CJAAAA	YPLAAA	OOOOxx
+9567	7851	1	3	7	7	67	567	1567	4567	9567	134	135	ZDAAAA	ZPLAAA	VVVVxx
+7525	7852	1	1	5	5	25	525	1525	2525	7525	50	51	LDAAAA	AQLAAA	AAAAxx
+9069	7853	1	1	9	9	69	69	1069	4069	9069	138	139	VKAAAA	BQLAAA	HHHHxx
+9999	7854	1	3	9	19	99	999	1999	4999	9999	198	199	PUAAAA	CQLAAA	OOOOxx
+9237	7855	1	1	7	17	37	237	1237	4237	9237	74	75	HRAAAA	DQLAAA	VVVVxx
+8441	7856	1	1	1	1	41	441	441	3441	8441	82	83	RMAAAA	EQLAAA	AAAAxx
+6769	7857	1	1	9	9	69	769	769	1769	6769	138	139	JAAAAA	FQLAAA	HHHHxx
+6073	7858	1	1	3	13	73	73	73	1073	6073	146	147	PZAAAA	GQLAAA	OOOOxx
+1091	7859	1	3	1	11	91	91	1091	1091	1091	182	183	ZPAAAA	HQLAAA	VVVVxx
+9886	7860	0	2	6	6	86	886	1886	4886	9886	172	173	GQAAAA	IQLAAA	AAAAxx
+3971	7861	1	3	1	11	71	971	1971	3971	3971	142	143	TWAAAA	JQLAAA	HHHHxx
+4621	7862	1	1	1	1	21	621	621	4621	4621	42	43	TVAAAA	KQLAAA	OOOOxx
+3120	7863	0	0	0	0	20	120	1120	3120	3120	40	41	AQAAAA	LQLAAA	VVVVxx
+9773	7864	1	1	3	13	73	773	1773	4773	9773	146	147	XLAAAA	MQLAAA	AAAAxx
+8712	7865	0	0	2	12	12	712	712	3712	8712	24	25	CXAAAA	NQLAAA	HHHHxx
+801	7866	1	1	1	1	1	801	801	801	801	2	3	VEAAAA	OQLAAA	OOOOxx
+9478	7867	0	2	8	18	78	478	1478	4478	9478	156	157	OAAAAA	PQLAAA	VVVVxx
+3466	7868	0	2	6	6	66	466	1466	3466	3466	132	133	IDAAAA	QQLAAA	AAAAxx
+6326	7869	0	2	6	6	26	326	326	1326	6326	52	53	IJAAAA	RQLAAA	HHHHxx
+1723	7870	1	3	3	3	23	723	1723	1723	1723	46	47	HOAAAA	SQLAAA	OOOOxx
+4978	7871	0	2	8	18	78	978	978	4978	4978	156	157	MJAAAA	TQLAAA	VVVVxx
+2311	7872	1	3	1	11	11	311	311	2311	2311	22	23	XKAAAA	UQLAAA	AAAAxx
+9532	7873	0	0	2	12	32	532	1532	4532	9532	64	65	QCAAAA	VQLAAA	HHHHxx
+3680	7874	0	0	0	0	80	680	1680	3680	3680	160	161	OLAAAA	WQLAAA	OOOOxx
+1244	7875	0	0	4	4	44	244	1244	1244	1244	88	89	WVAAAA	XQLAAA	VVVVxx
+3821	7876	1	1	1	1	21	821	1821	3821	3821	42	43	ZQAAAA	YQLAAA	AAAAxx
+9586	7877	0	2	6	6	86	586	1586	4586	9586	172	173	SEAAAA	ZQLAAA	HHHHxx
+3894	7878	0	2	4	14	94	894	1894	3894	3894	188	189	UTAAAA	ARLAAA	OOOOxx
+6169	7879	1	1	9	9	69	169	169	1169	6169	138	139	HDAAAA	BRLAAA	VVVVxx
+5919	7880	1	3	9	19	19	919	1919	919	5919	38	39	RTAAAA	CRLAAA	AAAAxx
+4187	7881	1	3	7	7	87	187	187	4187	4187	174	175	BFAAAA	DRLAAA	HHHHxx
+5477	7882	1	1	7	17	77	477	1477	477	5477	154	155	RCAAAA	ERLAAA	OOOOxx
+2806	7883	0	2	6	6	6	806	806	2806	2806	12	13	YDAAAA	FRLAAA	VVVVxx
+8158	7884	0	2	8	18	58	158	158	3158	8158	116	117	UBAAAA	GRLAAA	AAAAxx
+7130	7885	0	2	0	10	30	130	1130	2130	7130	60	61	GOAAAA	HRLAAA	HHHHxx
+7133	7886	1	1	3	13	33	133	1133	2133	7133	66	67	JOAAAA	IRLAAA	OOOOxx
+6033	7887	1	1	3	13	33	33	33	1033	6033	66	67	BYAAAA	JRLAAA	VVVVxx
+2415	7888	1	3	5	15	15	415	415	2415	2415	30	31	XOAAAA	KRLAAA	AAAAxx
+8091	7889	1	3	1	11	91	91	91	3091	8091	182	183	FZAAAA	LRLAAA	HHHHxx
+8347	7890	1	3	7	7	47	347	347	3347	8347	94	95	BJAAAA	MRLAAA	OOOOxx
+7879	7891	1	3	9	19	79	879	1879	2879	7879	158	159	BRAAAA	NRLAAA	VVVVxx
+9360	7892	0	0	0	0	60	360	1360	4360	9360	120	121	AWAAAA	ORLAAA	AAAAxx
+3369	7893	1	1	9	9	69	369	1369	3369	3369	138	139	PZAAAA	PRLAAA	HHHHxx
+8536	7894	0	0	6	16	36	536	536	3536	8536	72	73	IQAAAA	QRLAAA	OOOOxx
+8628	7895	0	0	8	8	28	628	628	3628	8628	56	57	WTAAAA	RRLAAA	VVVVxx
+1580	7896	0	0	0	0	80	580	1580	1580	1580	160	161	UIAAAA	SRLAAA	AAAAxx
+705	7897	1	1	5	5	5	705	705	705	705	10	11	DBAAAA	TRLAAA	HHHHxx
+4650	7898	0	2	0	10	50	650	650	4650	4650	100	101	WWAAAA	URLAAA	OOOOxx
+9165	7899	1	1	5	5	65	165	1165	4165	9165	130	131	NOAAAA	VRLAAA	VVVVxx
+4820	7900	0	0	0	0	20	820	820	4820	4820	40	41	KDAAAA	WRLAAA	AAAAxx
+3538	7901	0	2	8	18	38	538	1538	3538	3538	76	77	CGAAAA	XRLAAA	HHHHxx
+9947	7902	1	3	7	7	47	947	1947	4947	9947	94	95	PSAAAA	YRLAAA	OOOOxx
+4954	7903	0	2	4	14	54	954	954	4954	4954	108	109	OIAAAA	ZRLAAA	VVVVxx
+1104	7904	0	0	4	4	4	104	1104	1104	1104	8	9	MQAAAA	ASLAAA	AAAAxx
+8455	7905	1	3	5	15	55	455	455	3455	8455	110	111	FNAAAA	BSLAAA	HHHHxx
+8307	7906	1	3	7	7	7	307	307	3307	8307	14	15	NHAAAA	CSLAAA	OOOOxx
+9203	7907	1	3	3	3	3	203	1203	4203	9203	6	7	ZPAAAA	DSLAAA	VVVVxx
+7565	7908	1	1	5	5	65	565	1565	2565	7565	130	131	ZEAAAA	ESLAAA	AAAAxx
+7745	7909	1	1	5	5	45	745	1745	2745	7745	90	91	XLAAAA	FSLAAA	HHHHxx
+1787	7910	1	3	7	7	87	787	1787	1787	1787	174	175	TQAAAA	GSLAAA	OOOOxx
+4861	7911	1	1	1	1	61	861	861	4861	4861	122	123	ZEAAAA	HSLAAA	VVVVxx
+5183	7912	1	3	3	3	83	183	1183	183	5183	166	167	JRAAAA	ISLAAA	AAAAxx
+529	7913	1	1	9	9	29	529	529	529	529	58	59	JUAAAA	JSLAAA	HHHHxx
+2470	7914	0	2	0	10	70	470	470	2470	2470	140	141	ARAAAA	KSLAAA	OOOOxx
+1267	7915	1	3	7	7	67	267	1267	1267	1267	134	135	TWAAAA	LSLAAA	VVVVxx
+2059	7916	1	3	9	19	59	59	59	2059	2059	118	119	FBAAAA	MSLAAA	AAAAxx
+1862	7917	0	2	2	2	62	862	1862	1862	1862	124	125	QTAAAA	NSLAAA	HHHHxx
+7382	7918	0	2	2	2	82	382	1382	2382	7382	164	165	YXAAAA	OSLAAA	OOOOxx
+4796	7919	0	0	6	16	96	796	796	4796	4796	192	193	MCAAAA	PSLAAA	VVVVxx
+2331	7920	1	3	1	11	31	331	331	2331	2331	62	63	RLAAAA	QSLAAA	AAAAxx
+8870	7921	0	2	0	10	70	870	870	3870	8870	140	141	EDAAAA	RSLAAA	HHHHxx
+9581	7922	1	1	1	1	81	581	1581	4581	9581	162	163	NEAAAA	SSLAAA	OOOOxx
+9063	7923	1	3	3	3	63	63	1063	4063	9063	126	127	PKAAAA	TSLAAA	VVVVxx
+2192	7924	0	0	2	12	92	192	192	2192	2192	184	185	IGAAAA	USLAAA	AAAAxx
+6466	7925	0	2	6	6	66	466	466	1466	6466	132	133	SOAAAA	VSLAAA	HHHHxx
+7096	7926	0	0	6	16	96	96	1096	2096	7096	192	193	YMAAAA	WSLAAA	OOOOxx
+6257	7927	1	1	7	17	57	257	257	1257	6257	114	115	RGAAAA	XSLAAA	VVVVxx
+7009	7928	1	1	9	9	9	9	1009	2009	7009	18	19	PJAAAA	YSLAAA	AAAAxx
+8136	7929	0	0	6	16	36	136	136	3136	8136	72	73	YAAAAA	ZSLAAA	HHHHxx
+1854	7930	0	2	4	14	54	854	1854	1854	1854	108	109	ITAAAA	ATLAAA	OOOOxx
+3644	7931	0	0	4	4	44	644	1644	3644	3644	88	89	EKAAAA	BTLAAA	VVVVxx
+4437	7932	1	1	7	17	37	437	437	4437	4437	74	75	ROAAAA	CTLAAA	AAAAxx
+7209	7933	1	1	9	9	9	209	1209	2209	7209	18	19	HRAAAA	DTLAAA	HHHHxx
+1516	7934	0	0	6	16	16	516	1516	1516	1516	32	33	IGAAAA	ETLAAA	OOOOxx
+822	7935	0	2	2	2	22	822	822	822	822	44	45	QFAAAA	FTLAAA	VVVVxx
+1778	7936	0	2	8	18	78	778	1778	1778	1778	156	157	KQAAAA	GTLAAA	AAAAxx
+8161	7937	1	1	1	1	61	161	161	3161	8161	122	123	XBAAAA	HTLAAA	HHHHxx
+6030	7938	0	2	0	10	30	30	30	1030	6030	60	61	YXAAAA	ITLAAA	OOOOxx
+3515	7939	1	3	5	15	15	515	1515	3515	3515	30	31	FFAAAA	JTLAAA	VVVVxx
+1702	7940	0	2	2	2	2	702	1702	1702	1702	4	5	MNAAAA	KTLAAA	AAAAxx
+2671	7941	1	3	1	11	71	671	671	2671	2671	142	143	TYAAAA	LTLAAA	HHHHxx
+7623	7942	1	3	3	3	23	623	1623	2623	7623	46	47	FHAAAA	MTLAAA	OOOOxx
+9828	7943	0	0	8	8	28	828	1828	4828	9828	56	57	AOAAAA	NTLAAA	VVVVxx
+1888	7944	0	0	8	8	88	888	1888	1888	1888	176	177	QUAAAA	OTLAAA	AAAAxx
+4520	7945	0	0	0	0	20	520	520	4520	4520	40	41	WRAAAA	PTLAAA	HHHHxx
+3461	7946	1	1	1	1	61	461	1461	3461	3461	122	123	DDAAAA	QTLAAA	OOOOxx
+1488	7947	0	0	8	8	88	488	1488	1488	1488	176	177	GFAAAA	RTLAAA	VVVVxx
+7753	7948	1	1	3	13	53	753	1753	2753	7753	106	107	FMAAAA	STLAAA	AAAAxx
+5525	7949	1	1	5	5	25	525	1525	525	5525	50	51	NEAAAA	TTLAAA	HHHHxx
+5220	7950	0	0	0	0	20	220	1220	220	5220	40	41	USAAAA	UTLAAA	OOOOxx
+305	7951	1	1	5	5	5	305	305	305	305	10	11	TLAAAA	VTLAAA	VVVVxx
+7883	7952	1	3	3	3	83	883	1883	2883	7883	166	167	FRAAAA	WTLAAA	AAAAxx
+1222	7953	0	2	2	2	22	222	1222	1222	1222	44	45	AVAAAA	XTLAAA	HHHHxx
+8552	7954	0	0	2	12	52	552	552	3552	8552	104	105	YQAAAA	YTLAAA	OOOOxx
+6097	7955	1	1	7	17	97	97	97	1097	6097	194	195	NAAAAA	ZTLAAA	VVVVxx
+2298	7956	0	2	8	18	98	298	298	2298	2298	196	197	KKAAAA	AULAAA	AAAAxx
+956	7957	0	0	6	16	56	956	956	956	956	112	113	UKAAAA	BULAAA	HHHHxx
+9351	7958	1	3	1	11	51	351	1351	4351	9351	102	103	RVAAAA	CULAAA	OOOOxx
+6669	7959	1	1	9	9	69	669	669	1669	6669	138	139	NWAAAA	DULAAA	VVVVxx
+9383	7960	1	3	3	3	83	383	1383	4383	9383	166	167	XWAAAA	EULAAA	AAAAxx
+1607	7961	1	3	7	7	7	607	1607	1607	1607	14	15	VJAAAA	FULAAA	HHHHxx
+812	7962	0	0	2	12	12	812	812	812	812	24	25	GFAAAA	GULAAA	OOOOxx
+2109	7963	1	1	9	9	9	109	109	2109	2109	18	19	DDAAAA	HULAAA	VVVVxx
+207	7964	1	3	7	7	7	207	207	207	207	14	15	ZHAAAA	IULAAA	AAAAxx
+7124	7965	0	0	4	4	24	124	1124	2124	7124	48	49	AOAAAA	JULAAA	HHHHxx
+9333	7966	1	1	3	13	33	333	1333	4333	9333	66	67	ZUAAAA	KULAAA	OOOOxx
+3262	7967	0	2	2	2	62	262	1262	3262	3262	124	125	MVAAAA	LULAAA	VVVVxx
+1070	7968	0	2	0	10	70	70	1070	1070	1070	140	141	EPAAAA	MULAAA	AAAAxx
+7579	7969	1	3	9	19	79	579	1579	2579	7579	158	159	NFAAAA	NULAAA	HHHHxx
+9283	7970	1	3	3	3	83	283	1283	4283	9283	166	167	BTAAAA	OULAAA	OOOOxx
+4917	7971	1	1	7	17	17	917	917	4917	4917	34	35	DHAAAA	PULAAA	VVVVxx
+1328	7972	0	0	8	8	28	328	1328	1328	1328	56	57	CZAAAA	QULAAA	AAAAxx
+3042	7973	0	2	2	2	42	42	1042	3042	3042	84	85	ANAAAA	RULAAA	HHHHxx
+8352	7974	0	0	2	12	52	352	352	3352	8352	104	105	GJAAAA	SULAAA	OOOOxx
+2710	7975	0	2	0	10	10	710	710	2710	2710	20	21	GAAAAA	TULAAA	VVVVxx
+3330	7976	0	2	0	10	30	330	1330	3330	3330	60	61	CYAAAA	UULAAA	AAAAxx
+2822	7977	0	2	2	2	22	822	822	2822	2822	44	45	OEAAAA	VULAAA	HHHHxx
+5627	7978	1	3	7	7	27	627	1627	627	5627	54	55	LIAAAA	WULAAA	OOOOxx
+7848	7979	0	0	8	8	48	848	1848	2848	7848	96	97	WPAAAA	XULAAA	VVVVxx
+7384	7980	0	0	4	4	84	384	1384	2384	7384	168	169	AYAAAA	YULAAA	AAAAxx
+727	7981	1	3	7	7	27	727	727	727	727	54	55	ZBAAAA	ZULAAA	HHHHxx
+9926	7982	0	2	6	6	26	926	1926	4926	9926	52	53	URAAAA	AVLAAA	OOOOxx
+2647	7983	1	3	7	7	47	647	647	2647	2647	94	95	VXAAAA	BVLAAA	VVVVxx
+6416	7984	0	0	6	16	16	416	416	1416	6416	32	33	UMAAAA	CVLAAA	AAAAxx
+8751	7985	1	3	1	11	51	751	751	3751	8751	102	103	PYAAAA	DVLAAA	HHHHxx
+6515	7986	1	3	5	15	15	515	515	1515	6515	30	31	PQAAAA	EVLAAA	OOOOxx
+2472	7987	0	0	2	12	72	472	472	2472	2472	144	145	CRAAAA	FVLAAA	VVVVxx
+7205	7988	1	1	5	5	5	205	1205	2205	7205	10	11	DRAAAA	GVLAAA	AAAAxx
+9654	7989	0	2	4	14	54	654	1654	4654	9654	108	109	IHAAAA	HVLAAA	HHHHxx
+5646	7990	0	2	6	6	46	646	1646	646	5646	92	93	EJAAAA	IVLAAA	OOOOxx
+4217	7991	1	1	7	17	17	217	217	4217	4217	34	35	FGAAAA	JVLAAA	VVVVxx
+4484	7992	0	0	4	4	84	484	484	4484	4484	168	169	MQAAAA	KVLAAA	AAAAxx
+6654	7993	0	2	4	14	54	654	654	1654	6654	108	109	YVAAAA	LVLAAA	HHHHxx
+4876	7994	0	0	6	16	76	876	876	4876	4876	152	153	OFAAAA	MVLAAA	OOOOxx
+9690	7995	0	2	0	10	90	690	1690	4690	9690	180	181	SIAAAA	NVLAAA	VVVVxx
+2453	7996	1	1	3	13	53	453	453	2453	2453	106	107	JQAAAA	OVLAAA	AAAAxx
+829	7997	1	1	9	9	29	829	829	829	829	58	59	XFAAAA	PVLAAA	HHHHxx
+2547	7998	1	3	7	7	47	547	547	2547	2547	94	95	ZTAAAA	QVLAAA	OOOOxx
+9726	7999	0	2	6	6	26	726	1726	4726	9726	52	53	CKAAAA	RVLAAA	VVVVxx
+9267	8000	1	3	7	7	67	267	1267	4267	9267	134	135	LSAAAA	SVLAAA	AAAAxx
+7448	8001	0	0	8	8	48	448	1448	2448	7448	96	97	MAAAAA	TVLAAA	HHHHxx
+610	8002	0	2	0	10	10	610	610	610	610	20	21	MXAAAA	UVLAAA	OOOOxx
+2791	8003	1	3	1	11	91	791	791	2791	2791	182	183	JDAAAA	VVLAAA	VVVVxx
+3651	8004	1	3	1	11	51	651	1651	3651	3651	102	103	LKAAAA	WVLAAA	AAAAxx
+5206	8005	0	2	6	6	6	206	1206	206	5206	12	13	GSAAAA	XVLAAA	HHHHxx
+8774	8006	0	2	4	14	74	774	774	3774	8774	148	149	MZAAAA	YVLAAA	OOOOxx
+4753	8007	1	1	3	13	53	753	753	4753	4753	106	107	VAAAAA	ZVLAAA	VVVVxx
+4755	8008	1	3	5	15	55	755	755	4755	4755	110	111	XAAAAA	AWLAAA	AAAAxx
+686	8009	0	2	6	6	86	686	686	686	686	172	173	KAAAAA	BWLAAA	HHHHxx
+8281	8010	1	1	1	1	81	281	281	3281	8281	162	163	NGAAAA	CWLAAA	OOOOxx
+2058	8011	0	2	8	18	58	58	58	2058	2058	116	117	EBAAAA	DWLAAA	VVVVxx
+8900	8012	0	0	0	0	0	900	900	3900	8900	0	1	IEAAAA	EWLAAA	AAAAxx
+8588	8013	0	0	8	8	88	588	588	3588	8588	176	177	ISAAAA	FWLAAA	HHHHxx
+2904	8014	0	0	4	4	4	904	904	2904	2904	8	9	SHAAAA	GWLAAA	OOOOxx
+8917	8015	1	1	7	17	17	917	917	3917	8917	34	35	ZEAAAA	HWLAAA	VVVVxx
+9026	8016	0	2	6	6	26	26	1026	4026	9026	52	53	EJAAAA	IWLAAA	AAAAxx
+2416	8017	0	0	6	16	16	416	416	2416	2416	32	33	YOAAAA	JWLAAA	HHHHxx
+1053	8018	1	1	3	13	53	53	1053	1053	1053	106	107	NOAAAA	KWLAAA	OOOOxx
+7141	8019	1	1	1	1	41	141	1141	2141	7141	82	83	ROAAAA	LWLAAA	VVVVxx
+9771	8020	1	3	1	11	71	771	1771	4771	9771	142	143	VLAAAA	MWLAAA	AAAAxx
+2774	8021	0	2	4	14	74	774	774	2774	2774	148	149	SCAAAA	NWLAAA	HHHHxx
+3213	8022	1	1	3	13	13	213	1213	3213	3213	26	27	PTAAAA	OWLAAA	OOOOxx
+5694	8023	0	2	4	14	94	694	1694	694	5694	188	189	ALAAAA	PWLAAA	VVVVxx
+6631	8024	1	3	1	11	31	631	631	1631	6631	62	63	BVAAAA	QWLAAA	AAAAxx
+6638	8025	0	2	8	18	38	638	638	1638	6638	76	77	IVAAAA	RWLAAA	HHHHxx
+7407	8026	1	3	7	7	7	407	1407	2407	7407	14	15	XYAAAA	SWLAAA	OOOOxx
+8972	8027	0	0	2	12	72	972	972	3972	8972	144	145	CHAAAA	TWLAAA	VVVVxx
+2202	8028	0	2	2	2	2	202	202	2202	2202	4	5	SGAAAA	UWLAAA	AAAAxx
+6135	8029	1	3	5	15	35	135	135	1135	6135	70	71	ZBAAAA	VWLAAA	HHHHxx
+5043	8030	1	3	3	3	43	43	1043	43	5043	86	87	ZLAAAA	WWLAAA	OOOOxx
+5163	8031	1	3	3	3	63	163	1163	163	5163	126	127	PQAAAA	XWLAAA	VVVVxx
+1191	8032	1	3	1	11	91	191	1191	1191	1191	182	183	VTAAAA	YWLAAA	AAAAxx
+6576	8033	0	0	6	16	76	576	576	1576	6576	152	153	YSAAAA	ZWLAAA	HHHHxx
+3455	8034	1	3	5	15	55	455	1455	3455	3455	110	111	XCAAAA	AXLAAA	OOOOxx
+3688	8035	0	0	8	8	88	688	1688	3688	3688	176	177	WLAAAA	BXLAAA	VVVVxx
+4982	8036	0	2	2	2	82	982	982	4982	4982	164	165	QJAAAA	CXLAAA	AAAAxx
+4180	8037	0	0	0	0	80	180	180	4180	4180	160	161	UEAAAA	DXLAAA	HHHHxx
+4708	8038	0	0	8	8	8	708	708	4708	4708	16	17	CZAAAA	EXLAAA	OOOOxx
+1241	8039	1	1	1	1	41	241	1241	1241	1241	82	83	TVAAAA	FXLAAA	VVVVxx
+4921	8040	1	1	1	1	21	921	921	4921	4921	42	43	HHAAAA	GXLAAA	AAAAxx
+3197	8041	1	1	7	17	97	197	1197	3197	3197	194	195	ZSAAAA	HXLAAA	HHHHxx
+8225	8042	1	1	5	5	25	225	225	3225	8225	50	51	JEAAAA	IXLAAA	OOOOxx
+5913	8043	1	1	3	13	13	913	1913	913	5913	26	27	LTAAAA	JXLAAA	VVVVxx
+6387	8044	1	3	7	7	87	387	387	1387	6387	174	175	RLAAAA	KXLAAA	AAAAxx
+2706	8045	0	2	6	6	6	706	706	2706	2706	12	13	CAAAAA	LXLAAA	HHHHxx
+1461	8046	1	1	1	1	61	461	1461	1461	1461	122	123	FEAAAA	MXLAAA	OOOOxx
+7646	8047	0	2	6	6	46	646	1646	2646	7646	92	93	CIAAAA	NXLAAA	VVVVxx
+8066	8048	0	2	6	6	66	66	66	3066	8066	132	133	GYAAAA	OXLAAA	AAAAxx
+4171	8049	1	3	1	11	71	171	171	4171	4171	142	143	LEAAAA	PXLAAA	HHHHxx
+8008	8050	0	0	8	8	8	8	8	3008	8008	16	17	AWAAAA	QXLAAA	OOOOxx
+2088	8051	0	0	8	8	88	88	88	2088	2088	176	177	ICAAAA	RXLAAA	VVVVxx
+7907	8052	1	3	7	7	7	907	1907	2907	7907	14	15	DSAAAA	SXLAAA	AAAAxx
+2429	8053	1	1	9	9	29	429	429	2429	2429	58	59	LPAAAA	TXLAAA	HHHHxx
+9629	8054	1	1	9	9	29	629	1629	4629	9629	58	59	JGAAAA	UXLAAA	OOOOxx
+1470	8055	0	2	0	10	70	470	1470	1470	1470	140	141	OEAAAA	VXLAAA	VVVVxx
+4346	8056	0	2	6	6	46	346	346	4346	4346	92	93	ELAAAA	WXLAAA	AAAAxx
+7219	8057	1	3	9	19	19	219	1219	2219	7219	38	39	RRAAAA	XXLAAA	HHHHxx
+1185	8058	1	1	5	5	85	185	1185	1185	1185	170	171	PTAAAA	YXLAAA	OOOOxx
+8776	8059	0	0	6	16	76	776	776	3776	8776	152	153	OZAAAA	ZXLAAA	VVVVxx
+684	8060	0	0	4	4	84	684	684	684	684	168	169	IAAAAA	AYLAAA	AAAAxx
+2343	8061	1	3	3	3	43	343	343	2343	2343	86	87	DMAAAA	BYLAAA	HHHHxx
+4470	8062	0	2	0	10	70	470	470	4470	4470	140	141	YPAAAA	CYLAAA	OOOOxx
+5116	8063	0	0	6	16	16	116	1116	116	5116	32	33	UOAAAA	DYLAAA	VVVVxx
+1746	8064	0	2	6	6	46	746	1746	1746	1746	92	93	EPAAAA	EYLAAA	AAAAxx
+3216	8065	0	0	6	16	16	216	1216	3216	3216	32	33	STAAAA	FYLAAA	HHHHxx
+4594	8066	0	2	4	14	94	594	594	4594	4594	188	189	SUAAAA	GYLAAA	OOOOxx
+3013	8067	1	1	3	13	13	13	1013	3013	3013	26	27	XLAAAA	HYLAAA	VVVVxx
+2307	8068	1	3	7	7	7	307	307	2307	2307	14	15	TKAAAA	IYLAAA	AAAAxx
+7663	8069	1	3	3	3	63	663	1663	2663	7663	126	127	TIAAAA	JYLAAA	HHHHxx
+8504	8070	0	0	4	4	4	504	504	3504	8504	8	9	CPAAAA	KYLAAA	OOOOxx
+3683	8071	1	3	3	3	83	683	1683	3683	3683	166	167	RLAAAA	LYLAAA	VVVVxx
+144	8072	0	0	4	4	44	144	144	144	144	88	89	OFAAAA	MYLAAA	AAAAxx
+203	8073	1	3	3	3	3	203	203	203	203	6	7	VHAAAA	NYLAAA	HHHHxx
+5255	8074	1	3	5	15	55	255	1255	255	5255	110	111	DUAAAA	OYLAAA	OOOOxx
+4150	8075	0	2	0	10	50	150	150	4150	4150	100	101	QDAAAA	PYLAAA	VVVVxx
+5701	8076	1	1	1	1	1	701	1701	701	5701	2	3	HLAAAA	QYLAAA	AAAAxx
+7400	8077	0	0	0	0	0	400	1400	2400	7400	0	1	QYAAAA	RYLAAA	HHHHxx
+8203	8078	1	3	3	3	3	203	203	3203	8203	6	7	NDAAAA	SYLAAA	OOOOxx
+637	8079	1	1	7	17	37	637	637	637	637	74	75	NYAAAA	TYLAAA	VVVVxx
+2898	8080	0	2	8	18	98	898	898	2898	2898	196	197	MHAAAA	UYLAAA	AAAAxx
+1110	8081	0	2	0	10	10	110	1110	1110	1110	20	21	SQAAAA	VYLAAA	HHHHxx
+6255	8082	1	3	5	15	55	255	255	1255	6255	110	111	PGAAAA	WYLAAA	OOOOxx
+1071	8083	1	3	1	11	71	71	1071	1071	1071	142	143	FPAAAA	XYLAAA	VVVVxx
+541	8084	1	1	1	1	41	541	541	541	541	82	83	VUAAAA	YYLAAA	AAAAxx
+8077	8085	1	1	7	17	77	77	77	3077	8077	154	155	RYAAAA	ZYLAAA	HHHHxx
+6809	8086	1	1	9	9	9	809	809	1809	6809	18	19	XBAAAA	AZLAAA	OOOOxx
+4749	8087	1	1	9	9	49	749	749	4749	4749	98	99	RAAAAA	BZLAAA	VVVVxx
+2886	8088	0	2	6	6	86	886	886	2886	2886	172	173	AHAAAA	CZLAAA	AAAAxx
+5510	8089	0	2	0	10	10	510	1510	510	5510	20	21	YDAAAA	DZLAAA	HHHHxx
+713	8090	1	1	3	13	13	713	713	713	713	26	27	LBAAAA	EZLAAA	OOOOxx
+8388	8091	0	0	8	8	88	388	388	3388	8388	176	177	QKAAAA	FZLAAA	VVVVxx
+9524	8092	0	0	4	4	24	524	1524	4524	9524	48	49	ICAAAA	GZLAAA	AAAAxx
+9949	8093	1	1	9	9	49	949	1949	4949	9949	98	99	RSAAAA	HZLAAA	HHHHxx
+885	8094	1	1	5	5	85	885	885	885	885	170	171	BIAAAA	IZLAAA	OOOOxx
+8699	8095	1	3	9	19	99	699	699	3699	8699	198	199	PWAAAA	JZLAAA	VVVVxx
+2232	8096	0	0	2	12	32	232	232	2232	2232	64	65	WHAAAA	KZLAAA	AAAAxx
+5142	8097	0	2	2	2	42	142	1142	142	5142	84	85	UPAAAA	LZLAAA	HHHHxx
+8891	8098	1	3	1	11	91	891	891	3891	8891	182	183	ZDAAAA	MZLAAA	OOOOxx
+1881	8099	1	1	1	1	81	881	1881	1881	1881	162	163	JUAAAA	NZLAAA	VVVVxx
+3751	8100	1	3	1	11	51	751	1751	3751	3751	102	103	HOAAAA	OZLAAA	AAAAxx
+1896	8101	0	0	6	16	96	896	1896	1896	1896	192	193	YUAAAA	PZLAAA	HHHHxx
+8258	8102	0	2	8	18	58	258	258	3258	8258	116	117	QFAAAA	QZLAAA	OOOOxx
+3820	8103	0	0	0	0	20	820	1820	3820	3820	40	41	YQAAAA	RZLAAA	VVVVxx
+6617	8104	1	1	7	17	17	617	617	1617	6617	34	35	NUAAAA	SZLAAA	AAAAxx
+5100	8105	0	0	0	0	0	100	1100	100	5100	0	1	EOAAAA	TZLAAA	HHHHxx
+4277	8106	1	1	7	17	77	277	277	4277	4277	154	155	NIAAAA	UZLAAA	OOOOxx
+2498	8107	0	2	8	18	98	498	498	2498	2498	196	197	CSAAAA	VZLAAA	VVVVxx
+4343	8108	1	3	3	3	43	343	343	4343	4343	86	87	BLAAAA	WZLAAA	AAAAxx
+8319	8109	1	3	9	19	19	319	319	3319	8319	38	39	ZHAAAA	XZLAAA	HHHHxx
+4803	8110	1	3	3	3	3	803	803	4803	4803	6	7	TCAAAA	YZLAAA	OOOOxx
+3100	8111	0	0	0	0	0	100	1100	3100	3100	0	1	GPAAAA	ZZLAAA	VVVVxx
+428	8112	0	0	8	8	28	428	428	428	428	56	57	MQAAAA	AAMAAA	AAAAxx
+2811	8113	1	3	1	11	11	811	811	2811	2811	22	23	DEAAAA	BAMAAA	HHHHxx
+2989	8114	1	1	9	9	89	989	989	2989	2989	178	179	ZKAAAA	CAMAAA	OOOOxx
+1100	8115	0	0	0	0	0	100	1100	1100	1100	0	1	IQAAAA	DAMAAA	VVVVxx
+6586	8116	0	2	6	6	86	586	586	1586	6586	172	173	ITAAAA	EAMAAA	AAAAxx
+3124	8117	0	0	4	4	24	124	1124	3124	3124	48	49	EQAAAA	FAMAAA	HHHHxx
+1635	8118	1	3	5	15	35	635	1635	1635	1635	70	71	XKAAAA	GAMAAA	OOOOxx
+3888	8119	0	0	8	8	88	888	1888	3888	3888	176	177	OTAAAA	HAMAAA	VVVVxx
+8369	8120	1	1	9	9	69	369	369	3369	8369	138	139	XJAAAA	IAMAAA	AAAAxx
+3148	8121	0	0	8	8	48	148	1148	3148	3148	96	97	CRAAAA	JAMAAA	HHHHxx
+2842	8122	0	2	2	2	42	842	842	2842	2842	84	85	IFAAAA	KAMAAA	OOOOxx
+4965	8123	1	1	5	5	65	965	965	4965	4965	130	131	ZIAAAA	LAMAAA	VVVVxx
+3742	8124	0	2	2	2	42	742	1742	3742	3742	84	85	YNAAAA	MAMAAA	AAAAxx
+5196	8125	0	0	6	16	96	196	1196	196	5196	192	193	WRAAAA	NAMAAA	HHHHxx
+9105	8126	1	1	5	5	5	105	1105	4105	9105	10	11	FMAAAA	OAMAAA	OOOOxx
+6806	8127	0	2	6	6	6	806	806	1806	6806	12	13	UBAAAA	PAMAAA	VVVVxx
+5849	8128	1	1	9	9	49	849	1849	849	5849	98	99	ZQAAAA	QAMAAA	AAAAxx
+6504	8129	0	0	4	4	4	504	504	1504	6504	8	9	EQAAAA	RAMAAA	HHHHxx
+9841	8130	1	1	1	1	41	841	1841	4841	9841	82	83	NOAAAA	SAMAAA	OOOOxx
+457	8131	1	1	7	17	57	457	457	457	457	114	115	PRAAAA	TAMAAA	VVVVxx
+8856	8132	0	0	6	16	56	856	856	3856	8856	112	113	QCAAAA	UAMAAA	AAAAxx
+8043	8133	1	3	3	3	43	43	43	3043	8043	86	87	JXAAAA	VAMAAA	HHHHxx
+5933	8134	1	1	3	13	33	933	1933	933	5933	66	67	FUAAAA	WAMAAA	OOOOxx
+5725	8135	1	1	5	5	25	725	1725	725	5725	50	51	FMAAAA	XAMAAA	VVVVxx
+8607	8136	1	3	7	7	7	607	607	3607	8607	14	15	BTAAAA	YAMAAA	AAAAxx
+9280	8137	0	0	0	0	80	280	1280	4280	9280	160	161	YSAAAA	ZAMAAA	HHHHxx
+6017	8138	1	1	7	17	17	17	17	1017	6017	34	35	LXAAAA	ABMAAA	OOOOxx
+4946	8139	0	2	6	6	46	946	946	4946	4946	92	93	GIAAAA	BBMAAA	VVVVxx
+7373	8140	1	1	3	13	73	373	1373	2373	7373	146	147	PXAAAA	CBMAAA	AAAAxx
+8096	8141	0	0	6	16	96	96	96	3096	8096	192	193	KZAAAA	DBMAAA	HHHHxx
+3178	8142	0	2	8	18	78	178	1178	3178	3178	156	157	GSAAAA	EBMAAA	OOOOxx
+1849	8143	1	1	9	9	49	849	1849	1849	1849	98	99	DTAAAA	FBMAAA	VVVVxx
+8813	8144	1	1	3	13	13	813	813	3813	8813	26	27	ZAAAAA	GBMAAA	AAAAxx
+460	8145	0	0	0	0	60	460	460	460	460	120	121	SRAAAA	HBMAAA	HHHHxx
+7756	8146	0	0	6	16	56	756	1756	2756	7756	112	113	IMAAAA	IBMAAA	OOOOxx
+4425	8147	1	1	5	5	25	425	425	4425	4425	50	51	FOAAAA	JBMAAA	VVVVxx
+1602	8148	0	2	2	2	2	602	1602	1602	1602	4	5	QJAAAA	KBMAAA	AAAAxx
+5981	8149	1	1	1	1	81	981	1981	981	5981	162	163	BWAAAA	LBMAAA	HHHHxx
+8139	8150	1	3	9	19	39	139	139	3139	8139	78	79	BBAAAA	MBMAAA	OOOOxx
+754	8151	0	2	4	14	54	754	754	754	754	108	109	ADAAAA	NBMAAA	VVVVxx
+26	8152	0	2	6	6	26	26	26	26	26	52	53	ABAAAA	OBMAAA	AAAAxx
+106	8153	0	2	6	6	6	106	106	106	106	12	13	CEAAAA	PBMAAA	HHHHxx
+7465	8154	1	1	5	5	65	465	1465	2465	7465	130	131	DBAAAA	QBMAAA	OOOOxx
+1048	8155	0	0	8	8	48	48	1048	1048	1048	96	97	IOAAAA	RBMAAA	VVVVxx
+2303	8156	1	3	3	3	3	303	303	2303	2303	6	7	PKAAAA	SBMAAA	AAAAxx
+5794	8157	0	2	4	14	94	794	1794	794	5794	188	189	WOAAAA	TBMAAA	HHHHxx
+3321	8158	1	1	1	1	21	321	1321	3321	3321	42	43	TXAAAA	UBMAAA	OOOOxx
+6122	8159	0	2	2	2	22	122	122	1122	6122	44	45	MBAAAA	VBMAAA	VVVVxx
+6474	8160	0	2	4	14	74	474	474	1474	6474	148	149	APAAAA	WBMAAA	AAAAxx
+827	8161	1	3	7	7	27	827	827	827	827	54	55	VFAAAA	XBMAAA	HHHHxx
+6616	8162	0	0	6	16	16	616	616	1616	6616	32	33	MUAAAA	YBMAAA	OOOOxx
+2131	8163	1	3	1	11	31	131	131	2131	2131	62	63	ZDAAAA	ZBMAAA	VVVVxx
+5483	8164	1	3	3	3	83	483	1483	483	5483	166	167	XCAAAA	ACMAAA	AAAAxx
+606	8165	0	2	6	6	6	606	606	606	606	12	13	IXAAAA	BCMAAA	HHHHxx
+922	8166	0	2	2	2	22	922	922	922	922	44	45	MJAAAA	CCMAAA	OOOOxx
+8475	8167	1	3	5	15	75	475	475	3475	8475	150	151	ZNAAAA	DCMAAA	VVVVxx
+7645	8168	1	1	5	5	45	645	1645	2645	7645	90	91	BIAAAA	ECMAAA	AAAAxx
+5097	8169	1	1	7	17	97	97	1097	97	5097	194	195	BOAAAA	FCMAAA	HHHHxx
+5377	8170	1	1	7	17	77	377	1377	377	5377	154	155	VYAAAA	GCMAAA	OOOOxx
+6116	8171	0	0	6	16	16	116	116	1116	6116	32	33	GBAAAA	HCMAAA	VVVVxx
+8674	8172	0	2	4	14	74	674	674	3674	8674	148	149	QVAAAA	ICMAAA	AAAAxx
+8063	8173	1	3	3	3	63	63	63	3063	8063	126	127	DYAAAA	JCMAAA	HHHHxx
+5271	8174	1	3	1	11	71	271	1271	271	5271	142	143	TUAAAA	KCMAAA	OOOOxx
+1619	8175	1	3	9	19	19	619	1619	1619	1619	38	39	HKAAAA	LCMAAA	VVVVxx
+6419	8176	1	3	9	19	19	419	419	1419	6419	38	39	XMAAAA	MCMAAA	AAAAxx
+7651	8177	1	3	1	11	51	651	1651	2651	7651	102	103	HIAAAA	NCMAAA	HHHHxx
+2897	8178	1	1	7	17	97	897	897	2897	2897	194	195	LHAAAA	OCMAAA	OOOOxx
+8148	8179	0	0	8	8	48	148	148	3148	8148	96	97	KBAAAA	PCMAAA	VVVVxx
+7461	8180	1	1	1	1	61	461	1461	2461	7461	122	123	ZAAAAA	QCMAAA	AAAAxx
+9186	8181	0	2	6	6	86	186	1186	4186	9186	172	173	IPAAAA	RCMAAA	HHHHxx
+7127	8182	1	3	7	7	27	127	1127	2127	7127	54	55	DOAAAA	SCMAAA	OOOOxx
+8233	8183	1	1	3	13	33	233	233	3233	8233	66	67	REAAAA	TCMAAA	VVVVxx
+9651	8184	1	3	1	11	51	651	1651	4651	9651	102	103	FHAAAA	UCMAAA	AAAAxx
+6746	8185	0	2	6	6	46	746	746	1746	6746	92	93	MZAAAA	VCMAAA	HHHHxx
+7835	8186	1	3	5	15	35	835	1835	2835	7835	70	71	JPAAAA	WCMAAA	OOOOxx
+8815	8187	1	3	5	15	15	815	815	3815	8815	30	31	BBAAAA	XCMAAA	VVVVxx
+6398	8188	0	2	8	18	98	398	398	1398	6398	196	197	CMAAAA	YCMAAA	AAAAxx
+5344	8189	0	0	4	4	44	344	1344	344	5344	88	89	OXAAAA	ZCMAAA	HHHHxx
+8209	8190	1	1	9	9	9	209	209	3209	8209	18	19	TDAAAA	ADMAAA	OOOOxx
+8444	8191	0	0	4	4	44	444	444	3444	8444	88	89	UMAAAA	BDMAAA	VVVVxx
+5669	8192	1	1	9	9	69	669	1669	669	5669	138	139	BKAAAA	CDMAAA	AAAAxx
+2455	8193	1	3	5	15	55	455	455	2455	2455	110	111	LQAAAA	DDMAAA	HHHHxx
+6767	8194	1	3	7	7	67	767	767	1767	6767	134	135	HAAAAA	EDMAAA	OOOOxx
+135	8195	1	3	5	15	35	135	135	135	135	70	71	FFAAAA	FDMAAA	VVVVxx
+3503	8196	1	3	3	3	3	503	1503	3503	3503	6	7	TEAAAA	GDMAAA	AAAAxx
+6102	8197	0	2	2	2	2	102	102	1102	6102	4	5	SAAAAA	HDMAAA	HHHHxx
+7136	8198	0	0	6	16	36	136	1136	2136	7136	72	73	MOAAAA	IDMAAA	OOOOxx
+4933	8199	1	1	3	13	33	933	933	4933	4933	66	67	THAAAA	JDMAAA	VVVVxx
+8804	8200	0	0	4	4	4	804	804	3804	8804	8	9	QAAAAA	KDMAAA	AAAAxx
+3760	8201	0	0	0	0	60	760	1760	3760	3760	120	121	QOAAAA	LDMAAA	HHHHxx
+8603	8202	1	3	3	3	3	603	603	3603	8603	6	7	XSAAAA	MDMAAA	OOOOxx
+7411	8203	1	3	1	11	11	411	1411	2411	7411	22	23	BZAAAA	NDMAAA	VVVVxx
+834	8204	0	2	4	14	34	834	834	834	834	68	69	CGAAAA	ODMAAA	AAAAxx
+7385	8205	1	1	5	5	85	385	1385	2385	7385	170	171	BYAAAA	PDMAAA	HHHHxx
+3696	8206	0	0	6	16	96	696	1696	3696	3696	192	193	EMAAAA	QDMAAA	OOOOxx
+8720	8207	0	0	0	0	20	720	720	3720	8720	40	41	KXAAAA	RDMAAA	VVVVxx
+4539	8208	1	3	9	19	39	539	539	4539	4539	78	79	PSAAAA	SDMAAA	AAAAxx
+9837	8209	1	1	7	17	37	837	1837	4837	9837	74	75	JOAAAA	TDMAAA	HHHHxx
+8595	8210	1	3	5	15	95	595	595	3595	8595	190	191	PSAAAA	UDMAAA	OOOOxx
+3673	8211	1	1	3	13	73	673	1673	3673	3673	146	147	HLAAAA	VDMAAA	VVVVxx
+475	8212	1	3	5	15	75	475	475	475	475	150	151	HSAAAA	WDMAAA	AAAAxx
+2256	8213	0	0	6	16	56	256	256	2256	2256	112	113	UIAAAA	XDMAAA	HHHHxx
+6349	8214	1	1	9	9	49	349	349	1349	6349	98	99	FKAAAA	YDMAAA	OOOOxx
+9968	8215	0	0	8	8	68	968	1968	4968	9968	136	137	KTAAAA	ZDMAAA	VVVVxx
+7261	8216	1	1	1	1	61	261	1261	2261	7261	122	123	HTAAAA	AEMAAA	AAAAxx
+5799	8217	1	3	9	19	99	799	1799	799	5799	198	199	BPAAAA	BEMAAA	HHHHxx
+8159	8218	1	3	9	19	59	159	159	3159	8159	118	119	VBAAAA	CEMAAA	OOOOxx
+92	8219	0	0	2	12	92	92	92	92	92	184	185	ODAAAA	DEMAAA	VVVVxx
+5927	8220	1	3	7	7	27	927	1927	927	5927	54	55	ZTAAAA	EEMAAA	AAAAxx
+7925	8221	1	1	5	5	25	925	1925	2925	7925	50	51	VSAAAA	FEMAAA	HHHHxx
+5836	8222	0	0	6	16	36	836	1836	836	5836	72	73	MQAAAA	GEMAAA	OOOOxx
+7935	8223	1	3	5	15	35	935	1935	2935	7935	70	71	FTAAAA	HEMAAA	VVVVxx
+5505	8224	1	1	5	5	5	505	1505	505	5505	10	11	TDAAAA	IEMAAA	AAAAxx
+5882	8225	0	2	2	2	82	882	1882	882	5882	164	165	GSAAAA	JEMAAA	HHHHxx
+4411	8226	1	3	1	11	11	411	411	4411	4411	22	23	RNAAAA	KEMAAA	OOOOxx
+64	8227	0	0	4	4	64	64	64	64	64	128	129	MCAAAA	LEMAAA	VVVVxx
+2851	8228	1	3	1	11	51	851	851	2851	2851	102	103	RFAAAA	MEMAAA	AAAAxx
+1665	8229	1	1	5	5	65	665	1665	1665	1665	130	131	BMAAAA	NEMAAA	HHHHxx
+2895	8230	1	3	5	15	95	895	895	2895	2895	190	191	JHAAAA	OEMAAA	OOOOxx
+2210	8231	0	2	0	10	10	210	210	2210	2210	20	21	AHAAAA	PEMAAA	VVVVxx
+9873	8232	1	1	3	13	73	873	1873	4873	9873	146	147	TPAAAA	QEMAAA	AAAAxx
+5402	8233	0	2	2	2	2	402	1402	402	5402	4	5	UZAAAA	REMAAA	HHHHxx
+285	8234	1	1	5	5	85	285	285	285	285	170	171	ZKAAAA	SEMAAA	OOOOxx
+8545	8235	1	1	5	5	45	545	545	3545	8545	90	91	RQAAAA	TEMAAA	VVVVxx
+5328	8236	0	0	8	8	28	328	1328	328	5328	56	57	YWAAAA	UEMAAA	AAAAxx
+733	8237	1	1	3	13	33	733	733	733	733	66	67	FCAAAA	VEMAAA	HHHHxx
+7726	8238	0	2	6	6	26	726	1726	2726	7726	52	53	ELAAAA	WEMAAA	OOOOxx
+5418	8239	0	2	8	18	18	418	1418	418	5418	36	37	KAAAAA	XEMAAA	VVVVxx
+7761	8240	1	1	1	1	61	761	1761	2761	7761	122	123	NMAAAA	YEMAAA	AAAAxx
+9263	8241	1	3	3	3	63	263	1263	4263	9263	126	127	HSAAAA	ZEMAAA	HHHHxx
+5579	8242	1	3	9	19	79	579	1579	579	5579	158	159	PGAAAA	AFMAAA	OOOOxx
+5434	8243	0	2	4	14	34	434	1434	434	5434	68	69	ABAAAA	BFMAAA	VVVVxx
+5230	8244	0	2	0	10	30	230	1230	230	5230	60	61	ETAAAA	CFMAAA	AAAAxx
+9981	8245	1	1	1	1	81	981	1981	4981	9981	162	163	XTAAAA	DFMAAA	HHHHxx
+5830	8246	0	2	0	10	30	830	1830	830	5830	60	61	GQAAAA	EFMAAA	OOOOxx
+128	8247	0	0	8	8	28	128	128	128	128	56	57	YEAAAA	FFMAAA	VVVVxx
+2734	8248	0	2	4	14	34	734	734	2734	2734	68	69	EBAAAA	GFMAAA	AAAAxx
+4537	8249	1	1	7	17	37	537	537	4537	4537	74	75	NSAAAA	HFMAAA	HHHHxx
+3899	8250	1	3	9	19	99	899	1899	3899	3899	198	199	ZTAAAA	IFMAAA	OOOOxx
+1000	8251	0	0	0	0	0	0	1000	1000	1000	0	1	MMAAAA	JFMAAA	VVVVxx
+9896	8252	0	0	6	16	96	896	1896	4896	9896	192	193	QQAAAA	KFMAAA	AAAAxx
+3640	8253	0	0	0	0	40	640	1640	3640	3640	80	81	AKAAAA	LFMAAA	HHHHxx
+2568	8254	0	0	8	8	68	568	568	2568	2568	136	137	UUAAAA	MFMAAA	OOOOxx
+2026	8255	0	2	6	6	26	26	26	2026	2026	52	53	YZAAAA	NFMAAA	VVVVxx
+3955	8256	1	3	5	15	55	955	1955	3955	3955	110	111	DWAAAA	OFMAAA	AAAAxx
+7152	8257	0	0	2	12	52	152	1152	2152	7152	104	105	CPAAAA	PFMAAA	HHHHxx
+2402	8258	0	2	2	2	2	402	402	2402	2402	4	5	KOAAAA	QFMAAA	OOOOxx
+9522	8259	0	2	2	2	22	522	1522	4522	9522	44	45	GCAAAA	RFMAAA	VVVVxx
+4011	8260	1	3	1	11	11	11	11	4011	4011	22	23	HYAAAA	SFMAAA	AAAAxx
+3297	8261	1	1	7	17	97	297	1297	3297	3297	194	195	VWAAAA	TFMAAA	HHHHxx
+4915	8262	1	3	5	15	15	915	915	4915	4915	30	31	BHAAAA	UFMAAA	OOOOxx
+5397	8263	1	1	7	17	97	397	1397	397	5397	194	195	PZAAAA	VFMAAA	VVVVxx
+5454	8264	0	2	4	14	54	454	1454	454	5454	108	109	UBAAAA	WFMAAA	AAAAxx
+4568	8265	0	0	8	8	68	568	568	4568	4568	136	137	STAAAA	XFMAAA	HHHHxx
+5875	8266	1	3	5	15	75	875	1875	875	5875	150	151	ZRAAAA	YFMAAA	OOOOxx
+3642	8267	0	2	2	2	42	642	1642	3642	3642	84	85	CKAAAA	ZFMAAA	VVVVxx
+8506	8268	0	2	6	6	6	506	506	3506	8506	12	13	EPAAAA	AGMAAA	AAAAxx
+9621	8269	1	1	1	1	21	621	1621	4621	9621	42	43	BGAAAA	BGMAAA	HHHHxx
+7739	8270	1	3	9	19	39	739	1739	2739	7739	78	79	RLAAAA	CGMAAA	OOOOxx
+3987	8271	1	3	7	7	87	987	1987	3987	3987	174	175	JXAAAA	DGMAAA	VVVVxx
+2090	8272	0	2	0	10	90	90	90	2090	2090	180	181	KCAAAA	EGMAAA	AAAAxx
+3838	8273	0	2	8	18	38	838	1838	3838	3838	76	77	QRAAAA	FGMAAA	HHHHxx
+17	8274	1	1	7	17	17	17	17	17	17	34	35	RAAAAA	GGMAAA	OOOOxx
+3406	8275	0	2	6	6	6	406	1406	3406	3406	12	13	ABAAAA	HGMAAA	VVVVxx
+8312	8276	0	0	2	12	12	312	312	3312	8312	24	25	SHAAAA	IGMAAA	AAAAxx
+4034	8277	0	2	4	14	34	34	34	4034	4034	68	69	EZAAAA	JGMAAA	HHHHxx
+1535	8278	1	3	5	15	35	535	1535	1535	1535	70	71	BHAAAA	KGMAAA	OOOOxx
+7198	8279	0	2	8	18	98	198	1198	2198	7198	196	197	WQAAAA	LGMAAA	VVVVxx
+8885	8280	1	1	5	5	85	885	885	3885	8885	170	171	TDAAAA	MGMAAA	AAAAxx
+4081	8281	1	1	1	1	81	81	81	4081	4081	162	163	ZAAAAA	NGMAAA	HHHHxx
+980	8282	0	0	0	0	80	980	980	980	980	160	161	SLAAAA	OGMAAA	OOOOxx
+551	8283	1	3	1	11	51	551	551	551	551	102	103	FVAAAA	PGMAAA	VVVVxx
+7746	8284	0	2	6	6	46	746	1746	2746	7746	92	93	YLAAAA	QGMAAA	AAAAxx
+4756	8285	0	0	6	16	56	756	756	4756	4756	112	113	YAAAAA	RGMAAA	HHHHxx
+3655	8286	1	3	5	15	55	655	1655	3655	3655	110	111	PKAAAA	SGMAAA	OOOOxx
+7075	8287	1	3	5	15	75	75	1075	2075	7075	150	151	DMAAAA	TGMAAA	VVVVxx
+3950	8288	0	2	0	10	50	950	1950	3950	3950	100	101	YVAAAA	UGMAAA	AAAAxx
+2314	8289	0	2	4	14	14	314	314	2314	2314	28	29	ALAAAA	VGMAAA	HHHHxx
+8432	8290	0	0	2	12	32	432	432	3432	8432	64	65	IMAAAA	WGMAAA	OOOOxx
+62	8291	0	2	2	2	62	62	62	62	62	124	125	KCAAAA	XGMAAA	VVVVxx
+6920	8292	0	0	0	0	20	920	920	1920	6920	40	41	EGAAAA	YGMAAA	AAAAxx
+4077	8293	1	1	7	17	77	77	77	4077	4077	154	155	VAAAAA	ZGMAAA	HHHHxx
+9118	8294	0	2	8	18	18	118	1118	4118	9118	36	37	SMAAAA	AHMAAA	OOOOxx
+5375	8295	1	3	5	15	75	375	1375	375	5375	150	151	TYAAAA	BHMAAA	VVVVxx
+178	8296	0	2	8	18	78	178	178	178	178	156	157	WGAAAA	CHMAAA	AAAAxx
+1079	8297	1	3	9	19	79	79	1079	1079	1079	158	159	NPAAAA	DHMAAA	HHHHxx
+4279	8298	1	3	9	19	79	279	279	4279	4279	158	159	PIAAAA	EHMAAA	OOOOxx
+8436	8299	0	0	6	16	36	436	436	3436	8436	72	73	MMAAAA	FHMAAA	VVVVxx
+1931	8300	1	3	1	11	31	931	1931	1931	1931	62	63	HWAAAA	GHMAAA	AAAAxx
+2096	8301	0	0	6	16	96	96	96	2096	2096	192	193	QCAAAA	HHMAAA	HHHHxx
+1638	8302	0	2	8	18	38	638	1638	1638	1638	76	77	ALAAAA	IHMAAA	OOOOxx
+2788	8303	0	0	8	8	88	788	788	2788	2788	176	177	GDAAAA	JHMAAA	VVVVxx
+4751	8304	1	3	1	11	51	751	751	4751	4751	102	103	TAAAAA	KHMAAA	AAAAxx
+8824	8305	0	0	4	4	24	824	824	3824	8824	48	49	KBAAAA	LHMAAA	HHHHxx
+3098	8306	0	2	8	18	98	98	1098	3098	3098	196	197	EPAAAA	MHMAAA	OOOOxx
+4497	8307	1	1	7	17	97	497	497	4497	4497	194	195	ZQAAAA	NHMAAA	VVVVxx
+5223	8308	1	3	3	3	23	223	1223	223	5223	46	47	XSAAAA	OHMAAA	AAAAxx
+9212	8309	0	0	2	12	12	212	1212	4212	9212	24	25	IQAAAA	PHMAAA	HHHHxx
+4265	8310	1	1	5	5	65	265	265	4265	4265	130	131	BIAAAA	QHMAAA	OOOOxx
+6898	8311	0	2	8	18	98	898	898	1898	6898	196	197	IFAAAA	RHMAAA	VVVVxx
+8808	8312	0	0	8	8	8	808	808	3808	8808	16	17	UAAAAA	SHMAAA	AAAAxx
+5629	8313	1	1	9	9	29	629	1629	629	5629	58	59	NIAAAA	THMAAA	HHHHxx
+3779	8314	1	3	9	19	79	779	1779	3779	3779	158	159	JPAAAA	UHMAAA	OOOOxx
+4972	8315	0	0	2	12	72	972	972	4972	4972	144	145	GJAAAA	VHMAAA	VVVVxx
+4511	8316	1	3	1	11	11	511	511	4511	4511	22	23	NRAAAA	WHMAAA	AAAAxx
+6761	8317	1	1	1	1	61	761	761	1761	6761	122	123	BAAAAA	XHMAAA	HHHHxx
+2335	8318	1	3	5	15	35	335	335	2335	2335	70	71	VLAAAA	YHMAAA	OOOOxx
+732	8319	0	0	2	12	32	732	732	732	732	64	65	ECAAAA	ZHMAAA	VVVVxx
+4757	8320	1	1	7	17	57	757	757	4757	4757	114	115	ZAAAAA	AIMAAA	AAAAxx
+6624	8321	0	0	4	4	24	624	624	1624	6624	48	49	UUAAAA	BIMAAA	HHHHxx
+5869	8322	1	1	9	9	69	869	1869	869	5869	138	139	TRAAAA	CIMAAA	OOOOxx
+5842	8323	0	2	2	2	42	842	1842	842	5842	84	85	SQAAAA	DIMAAA	VVVVxx
+5735	8324	1	3	5	15	35	735	1735	735	5735	70	71	PMAAAA	EIMAAA	AAAAxx
+8276	8325	0	0	6	16	76	276	276	3276	8276	152	153	IGAAAA	FIMAAA	HHHHxx
+7227	8326	1	3	7	7	27	227	1227	2227	7227	54	55	ZRAAAA	GIMAAA	OOOOxx
+4923	8327	1	3	3	3	23	923	923	4923	4923	46	47	JHAAAA	HIMAAA	VVVVxx
+9135	8328	1	3	5	15	35	135	1135	4135	9135	70	71	JNAAAA	IIMAAA	AAAAxx
+5813	8329	1	1	3	13	13	813	1813	813	5813	26	27	PPAAAA	JIMAAA	HHHHxx
+9697	8330	1	1	7	17	97	697	1697	4697	9697	194	195	ZIAAAA	KIMAAA	OOOOxx
+3222	8331	0	2	2	2	22	222	1222	3222	3222	44	45	YTAAAA	LIMAAA	VVVVxx
+2394	8332	0	2	4	14	94	394	394	2394	2394	188	189	COAAAA	MIMAAA	AAAAxx
+5784	8333	0	0	4	4	84	784	1784	784	5784	168	169	MOAAAA	NIMAAA	HHHHxx
+3652	8334	0	0	2	12	52	652	1652	3652	3652	104	105	MKAAAA	OIMAAA	OOOOxx
+8175	8335	1	3	5	15	75	175	175	3175	8175	150	151	LCAAAA	PIMAAA	VVVVxx
+7568	8336	0	0	8	8	68	568	1568	2568	7568	136	137	CFAAAA	QIMAAA	AAAAxx
+6645	8337	1	1	5	5	45	645	645	1645	6645	90	91	PVAAAA	RIMAAA	HHHHxx
+8176	8338	0	0	6	16	76	176	176	3176	8176	152	153	MCAAAA	SIMAAA	OOOOxx
+530	8339	0	2	0	10	30	530	530	530	530	60	61	KUAAAA	TIMAAA	VVVVxx
+5439	8340	1	3	9	19	39	439	1439	439	5439	78	79	FBAAAA	UIMAAA	AAAAxx
+61	8341	1	1	1	1	61	61	61	61	61	122	123	JCAAAA	VIMAAA	HHHHxx
+3951	8342	1	3	1	11	51	951	1951	3951	3951	102	103	ZVAAAA	WIMAAA	OOOOxx
+5283	8343	1	3	3	3	83	283	1283	283	5283	166	167	FVAAAA	XIMAAA	VVVVxx
+7226	8344	0	2	6	6	26	226	1226	2226	7226	52	53	YRAAAA	YIMAAA	AAAAxx
+1954	8345	0	2	4	14	54	954	1954	1954	1954	108	109	EXAAAA	ZIMAAA	HHHHxx
+334	8346	0	2	4	14	34	334	334	334	334	68	69	WMAAAA	AJMAAA	OOOOxx
+3921	8347	1	1	1	1	21	921	1921	3921	3921	42	43	VUAAAA	BJMAAA	VVVVxx
+6276	8348	0	0	6	16	76	276	276	1276	6276	152	153	KHAAAA	CJMAAA	AAAAxx
+3378	8349	0	2	8	18	78	378	1378	3378	3378	156	157	YZAAAA	DJMAAA	HHHHxx
+5236	8350	0	0	6	16	36	236	1236	236	5236	72	73	KTAAAA	EJMAAA	OOOOxx
+7781	8351	1	1	1	1	81	781	1781	2781	7781	162	163	HNAAAA	FJMAAA	VVVVxx
+8601	8352	1	1	1	1	1	601	601	3601	8601	2	3	VSAAAA	GJMAAA	AAAAxx
+1473	8353	1	1	3	13	73	473	1473	1473	1473	146	147	REAAAA	HJMAAA	HHHHxx
+3246	8354	0	2	6	6	46	246	1246	3246	3246	92	93	WUAAAA	IJMAAA	OOOOxx
+3601	8355	1	1	1	1	1	601	1601	3601	3601	2	3	NIAAAA	JJMAAA	VVVVxx
+6861	8356	1	1	1	1	61	861	861	1861	6861	122	123	XDAAAA	KJMAAA	AAAAxx
+9032	8357	0	0	2	12	32	32	1032	4032	9032	64	65	KJAAAA	LJMAAA	HHHHxx
+216	8358	0	0	6	16	16	216	216	216	216	32	33	IIAAAA	MJMAAA	OOOOxx
+3824	8359	0	0	4	4	24	824	1824	3824	3824	48	49	CRAAAA	NJMAAA	VVVVxx
+8486	8360	0	2	6	6	86	486	486	3486	8486	172	173	KOAAAA	OJMAAA	AAAAxx
+276	8361	0	0	6	16	76	276	276	276	276	152	153	QKAAAA	PJMAAA	HHHHxx
+1838	8362	0	2	8	18	38	838	1838	1838	1838	76	77	SSAAAA	QJMAAA	OOOOxx
+6175	8363	1	3	5	15	75	175	175	1175	6175	150	151	NDAAAA	RJMAAA	VVVVxx
+3719	8364	1	3	9	19	19	719	1719	3719	3719	38	39	BNAAAA	SJMAAA	AAAAxx
+6958	8365	0	2	8	18	58	958	958	1958	6958	116	117	QHAAAA	TJMAAA	HHHHxx
+6822	8366	0	2	2	2	22	822	822	1822	6822	44	45	KCAAAA	UJMAAA	OOOOxx
+3318	8367	0	2	8	18	18	318	1318	3318	3318	36	37	QXAAAA	VJMAAA	VVVVxx
+7222	8368	0	2	2	2	22	222	1222	2222	7222	44	45	URAAAA	WJMAAA	AAAAxx
+85	8369	1	1	5	5	85	85	85	85	85	170	171	HDAAAA	XJMAAA	HHHHxx
+5158	8370	0	2	8	18	58	158	1158	158	5158	116	117	KQAAAA	YJMAAA	OOOOxx
+6360	8371	0	0	0	0	60	360	360	1360	6360	120	121	QKAAAA	ZJMAAA	VVVVxx
+2599	8372	1	3	9	19	99	599	599	2599	2599	198	199	ZVAAAA	AKMAAA	AAAAxx
+4002	8373	0	2	2	2	2	2	2	4002	4002	4	5	YXAAAA	BKMAAA	HHHHxx
+6597	8374	1	1	7	17	97	597	597	1597	6597	194	195	TTAAAA	CKMAAA	OOOOxx
+5762	8375	0	2	2	2	62	762	1762	762	5762	124	125	QNAAAA	DKMAAA	VVVVxx
+8383	8376	1	3	3	3	83	383	383	3383	8383	166	167	LKAAAA	EKMAAA	AAAAxx
+4686	8377	0	2	6	6	86	686	686	4686	4686	172	173	GYAAAA	FKMAAA	HHHHxx
+5972	8378	0	0	2	12	72	972	1972	972	5972	144	145	SVAAAA	GKMAAA	OOOOxx
+1432	8379	0	0	2	12	32	432	1432	1432	1432	64	65	CDAAAA	HKMAAA	VVVVxx
+1601	8380	1	1	1	1	1	601	1601	1601	1601	2	3	PJAAAA	IKMAAA	AAAAxx
+3012	8381	0	0	2	12	12	12	1012	3012	3012	24	25	WLAAAA	JKMAAA	HHHHxx
+9345	8382	1	1	5	5	45	345	1345	4345	9345	90	91	LVAAAA	KKMAAA	OOOOxx
+8869	8383	1	1	9	9	69	869	869	3869	8869	138	139	DDAAAA	LKMAAA	VVVVxx
+6612	8384	0	0	2	12	12	612	612	1612	6612	24	25	IUAAAA	MKMAAA	AAAAxx
+262	8385	0	2	2	2	62	262	262	262	262	124	125	CKAAAA	NKMAAA	HHHHxx
+300	8386	0	0	0	0	0	300	300	300	300	0	1	OLAAAA	OKMAAA	OOOOxx
+3045	8387	1	1	5	5	45	45	1045	3045	3045	90	91	DNAAAA	PKMAAA	VVVVxx
+7252	8388	0	0	2	12	52	252	1252	2252	7252	104	105	YSAAAA	QKMAAA	AAAAxx
+9099	8389	1	3	9	19	99	99	1099	4099	9099	198	199	ZLAAAA	RKMAAA	HHHHxx
+9006	8390	0	2	6	6	6	6	1006	4006	9006	12	13	KIAAAA	SKMAAA	OOOOxx
+3078	8391	0	2	8	18	78	78	1078	3078	3078	156	157	KOAAAA	TKMAAA	VVVVxx
+5159	8392	1	3	9	19	59	159	1159	159	5159	118	119	LQAAAA	UKMAAA	AAAAxx
+9329	8393	1	1	9	9	29	329	1329	4329	9329	58	59	VUAAAA	VKMAAA	HHHHxx
+1393	8394	1	1	3	13	93	393	1393	1393	1393	186	187	PBAAAA	WKMAAA	OOOOxx
+5894	8395	0	2	4	14	94	894	1894	894	5894	188	189	SSAAAA	XKMAAA	VVVVxx
+11	8396	1	3	1	11	11	11	11	11	11	22	23	LAAAAA	YKMAAA	AAAAxx
+5606	8397	0	2	6	6	6	606	1606	606	5606	12	13	QHAAAA	ZKMAAA	HHHHxx
+5541	8398	1	1	1	1	41	541	1541	541	5541	82	83	DFAAAA	ALMAAA	OOOOxx
+2689	8399	1	1	9	9	89	689	689	2689	2689	178	179	LZAAAA	BLMAAA	VVVVxx
+1023	8400	1	3	3	3	23	23	1023	1023	1023	46	47	JNAAAA	CLMAAA	AAAAxx
+8134	8401	0	2	4	14	34	134	134	3134	8134	68	69	WAAAAA	DLMAAA	HHHHxx
+5923	8402	1	3	3	3	23	923	1923	923	5923	46	47	VTAAAA	ELMAAA	OOOOxx
+6056	8403	0	0	6	16	56	56	56	1056	6056	112	113	YYAAAA	FLMAAA	VVVVxx
+653	8404	1	1	3	13	53	653	653	653	653	106	107	DZAAAA	GLMAAA	AAAAxx
+367	8405	1	3	7	7	67	367	367	367	367	134	135	DOAAAA	HLMAAA	HHHHxx
+1828	8406	0	0	8	8	28	828	1828	1828	1828	56	57	ISAAAA	ILMAAA	OOOOxx
+6506	8407	0	2	6	6	6	506	506	1506	6506	12	13	GQAAAA	JLMAAA	VVVVxx
+5772	8408	0	0	2	12	72	772	1772	772	5772	144	145	AOAAAA	KLMAAA	AAAAxx
+8052	8409	0	0	2	12	52	52	52	3052	8052	104	105	SXAAAA	LLMAAA	HHHHxx
+2633	8410	1	1	3	13	33	633	633	2633	2633	66	67	HXAAAA	MLMAAA	OOOOxx
+4878	8411	0	2	8	18	78	878	878	4878	4878	156	157	QFAAAA	NLMAAA	VVVVxx
+5621	8412	1	1	1	1	21	621	1621	621	5621	42	43	FIAAAA	OLMAAA	AAAAxx
+41	8413	1	1	1	1	41	41	41	41	41	82	83	PBAAAA	PLMAAA	HHHHxx
+4613	8414	1	1	3	13	13	613	613	4613	4613	26	27	LVAAAA	QLMAAA	OOOOxx
+9389	8415	1	1	9	9	89	389	1389	4389	9389	178	179	DXAAAA	RLMAAA	VVVVxx
+9414	8416	0	2	4	14	14	414	1414	4414	9414	28	29	CYAAAA	SLMAAA	AAAAxx
+3583	8417	1	3	3	3	83	583	1583	3583	3583	166	167	VHAAAA	TLMAAA	HHHHxx
+3454	8418	0	2	4	14	54	454	1454	3454	3454	108	109	WCAAAA	ULMAAA	OOOOxx
+719	8419	1	3	9	19	19	719	719	719	719	38	39	RBAAAA	VLMAAA	VVVVxx
+6188	8420	0	0	8	8	88	188	188	1188	6188	176	177	AEAAAA	WLMAAA	AAAAxx
+2288	8421	0	0	8	8	88	288	288	2288	2288	176	177	AKAAAA	XLMAAA	HHHHxx
+1287	8422	1	3	7	7	87	287	1287	1287	1287	174	175	NXAAAA	YLMAAA	OOOOxx
+1397	8423	1	1	7	17	97	397	1397	1397	1397	194	195	TBAAAA	ZLMAAA	VVVVxx
+7763	8424	1	3	3	3	63	763	1763	2763	7763	126	127	PMAAAA	AMMAAA	AAAAxx
+5194	8425	0	2	4	14	94	194	1194	194	5194	188	189	URAAAA	BMMAAA	HHHHxx
+3167	8426	1	3	7	7	67	167	1167	3167	3167	134	135	VRAAAA	CMMAAA	OOOOxx
+9218	8427	0	2	8	18	18	218	1218	4218	9218	36	37	OQAAAA	DMMAAA	VVVVxx
+2065	8428	1	1	5	5	65	65	65	2065	2065	130	131	LBAAAA	EMMAAA	AAAAxx
+9669	8429	1	1	9	9	69	669	1669	4669	9669	138	139	XHAAAA	FMMAAA	HHHHxx
+146	8430	0	2	6	6	46	146	146	146	146	92	93	QFAAAA	GMMAAA	OOOOxx
+6141	8431	1	1	1	1	41	141	141	1141	6141	82	83	FCAAAA	HMMAAA	VVVVxx
+2843	8432	1	3	3	3	43	843	843	2843	2843	86	87	JFAAAA	IMMAAA	AAAAxx
+7934	8433	0	2	4	14	34	934	1934	2934	7934	68	69	ETAAAA	JMMAAA	HHHHxx
+2536	8434	0	0	6	16	36	536	536	2536	2536	72	73	OTAAAA	KMMAAA	OOOOxx
+7088	8435	0	0	8	8	88	88	1088	2088	7088	176	177	QMAAAA	LMMAAA	VVVVxx
+2519	8436	1	3	9	19	19	519	519	2519	2519	38	39	XSAAAA	MMMAAA	AAAAxx
+6650	8437	0	2	0	10	50	650	650	1650	6650	100	101	UVAAAA	NMMAAA	HHHHxx
+3007	8438	1	3	7	7	7	7	1007	3007	3007	14	15	RLAAAA	OMMAAA	OOOOxx
+4507	8439	1	3	7	7	7	507	507	4507	4507	14	15	JRAAAA	PMMAAA	VVVVxx
+4892	8440	0	0	2	12	92	892	892	4892	4892	184	185	EGAAAA	QMMAAA	AAAAxx
+7159	8441	1	3	9	19	59	159	1159	2159	7159	118	119	JPAAAA	RMMAAA	HHHHxx
+3171	8442	1	3	1	11	71	171	1171	3171	3171	142	143	ZRAAAA	SMMAAA	OOOOxx
+1080	8443	0	0	0	0	80	80	1080	1080	1080	160	161	OPAAAA	TMMAAA	VVVVxx
+7248	8444	0	0	8	8	48	248	1248	2248	7248	96	97	USAAAA	UMMAAA	AAAAxx
+7230	8445	0	2	0	10	30	230	1230	2230	7230	60	61	CSAAAA	VMMAAA	HHHHxx
+3823	8446	1	3	3	3	23	823	1823	3823	3823	46	47	BRAAAA	WMMAAA	OOOOxx
+5517	8447	1	1	7	17	17	517	1517	517	5517	34	35	FEAAAA	XMMAAA	VVVVxx
+1482	8448	0	2	2	2	82	482	1482	1482	1482	164	165	AFAAAA	YMMAAA	AAAAxx
+9953	8449	1	1	3	13	53	953	1953	4953	9953	106	107	VSAAAA	ZMMAAA	HHHHxx
+2754	8450	0	2	4	14	54	754	754	2754	2754	108	109	YBAAAA	ANMAAA	OOOOxx
+3875	8451	1	3	5	15	75	875	1875	3875	3875	150	151	BTAAAA	BNMAAA	VVVVxx
+9800	8452	0	0	0	0	0	800	1800	4800	9800	0	1	YMAAAA	CNMAAA	AAAAxx
+8819	8453	1	3	9	19	19	819	819	3819	8819	38	39	FBAAAA	DNMAAA	HHHHxx
+8267	8454	1	3	7	7	67	267	267	3267	8267	134	135	ZFAAAA	ENMAAA	OOOOxx
+520	8455	0	0	0	0	20	520	520	520	520	40	41	AUAAAA	FNMAAA	VVVVxx
+5770	8456	0	2	0	10	70	770	1770	770	5770	140	141	YNAAAA	GNMAAA	AAAAxx
+2114	8457	0	2	4	14	14	114	114	2114	2114	28	29	IDAAAA	HNMAAA	HHHHxx
+5045	8458	1	1	5	5	45	45	1045	45	5045	90	91	BMAAAA	INMAAA	OOOOxx
+1094	8459	0	2	4	14	94	94	1094	1094	1094	188	189	CQAAAA	JNMAAA	VVVVxx
+8786	8460	0	2	6	6	86	786	786	3786	8786	172	173	YZAAAA	KNMAAA	AAAAxx
+353	8461	1	1	3	13	53	353	353	353	353	106	107	PNAAAA	LNMAAA	HHHHxx
+290	8462	0	2	0	10	90	290	290	290	290	180	181	ELAAAA	MNMAAA	OOOOxx
+3376	8463	0	0	6	16	76	376	1376	3376	3376	152	153	WZAAAA	NNMAAA	VVVVxx
+9305	8464	1	1	5	5	5	305	1305	4305	9305	10	11	XTAAAA	ONMAAA	AAAAxx
+186	8465	0	2	6	6	86	186	186	186	186	172	173	EHAAAA	PNMAAA	HHHHxx
+4817	8466	1	1	7	17	17	817	817	4817	4817	34	35	HDAAAA	QNMAAA	OOOOxx
+4638	8467	0	2	8	18	38	638	638	4638	4638	76	77	KWAAAA	RNMAAA	VVVVxx
+3558	8468	0	2	8	18	58	558	1558	3558	3558	116	117	WGAAAA	SNMAAA	AAAAxx
+9285	8469	1	1	5	5	85	285	1285	4285	9285	170	171	DTAAAA	TNMAAA	HHHHxx
+848	8470	0	0	8	8	48	848	848	848	848	96	97	QGAAAA	UNMAAA	OOOOxx
+8923	8471	1	3	3	3	23	923	923	3923	8923	46	47	FFAAAA	VNMAAA	VVVVxx
+6826	8472	0	2	6	6	26	826	826	1826	6826	52	53	OCAAAA	WNMAAA	AAAAxx
+5187	8473	1	3	7	7	87	187	1187	187	5187	174	175	NRAAAA	XNMAAA	HHHHxx
+2398	8474	0	2	8	18	98	398	398	2398	2398	196	197	GOAAAA	YNMAAA	OOOOxx
+7653	8475	1	1	3	13	53	653	1653	2653	7653	106	107	JIAAAA	ZNMAAA	VVVVxx
+8835	8476	1	3	5	15	35	835	835	3835	8835	70	71	VBAAAA	AOMAAA	AAAAxx
+5736	8477	0	0	6	16	36	736	1736	736	5736	72	73	QMAAAA	BOMAAA	HHHHxx
+1238	8478	0	2	8	18	38	238	1238	1238	1238	76	77	QVAAAA	COMAAA	OOOOxx
+6021	8479	1	1	1	1	21	21	21	1021	6021	42	43	PXAAAA	DOMAAA	VVVVxx
+6815	8480	1	3	5	15	15	815	815	1815	6815	30	31	DCAAAA	EOMAAA	AAAAxx
+2549	8481	1	1	9	9	49	549	549	2549	2549	98	99	BUAAAA	FOMAAA	HHHHxx
+5657	8482	1	1	7	17	57	657	1657	657	5657	114	115	PJAAAA	GOMAAA	OOOOxx
+6855	8483	1	3	5	15	55	855	855	1855	6855	110	111	RDAAAA	HOMAAA	VVVVxx
+1225	8484	1	1	5	5	25	225	1225	1225	1225	50	51	DVAAAA	IOMAAA	AAAAxx
+7452	8485	0	0	2	12	52	452	1452	2452	7452	104	105	QAAAAA	JOMAAA	HHHHxx
+2479	8486	1	3	9	19	79	479	479	2479	2479	158	159	JRAAAA	KOMAAA	OOOOxx
+7974	8487	0	2	4	14	74	974	1974	2974	7974	148	149	SUAAAA	LOMAAA	VVVVxx
+1212	8488	0	0	2	12	12	212	1212	1212	1212	24	25	QUAAAA	MOMAAA	AAAAxx
+8883	8489	1	3	3	3	83	883	883	3883	8883	166	167	RDAAAA	NOMAAA	HHHHxx
+8150	8490	0	2	0	10	50	150	150	3150	8150	100	101	MBAAAA	OOMAAA	OOOOxx
+3392	8491	0	0	2	12	92	392	1392	3392	3392	184	185	MAAAAA	POMAAA	VVVVxx
+6774	8492	0	2	4	14	74	774	774	1774	6774	148	149	OAAAAA	QOMAAA	AAAAxx
+904	8493	0	0	4	4	4	904	904	904	904	8	9	UIAAAA	ROMAAA	HHHHxx
+5068	8494	0	0	8	8	68	68	1068	68	5068	136	137	YMAAAA	SOMAAA	OOOOxx
+9339	8495	1	3	9	19	39	339	1339	4339	9339	78	79	FVAAAA	TOMAAA	VVVVxx
+1062	8496	0	2	2	2	62	62	1062	1062	1062	124	125	WOAAAA	UOMAAA	AAAAxx
+3841	8497	1	1	1	1	41	841	1841	3841	3841	82	83	TRAAAA	VOMAAA	HHHHxx
+8924	8498	0	0	4	4	24	924	924	3924	8924	48	49	GFAAAA	WOMAAA	OOOOxx
+9795	8499	1	3	5	15	95	795	1795	4795	9795	190	191	TMAAAA	XOMAAA	VVVVxx
+3981	8500	1	1	1	1	81	981	1981	3981	3981	162	163	DXAAAA	YOMAAA	AAAAxx
+4290	8501	0	2	0	10	90	290	290	4290	4290	180	181	AJAAAA	ZOMAAA	HHHHxx
+1067	8502	1	3	7	7	67	67	1067	1067	1067	134	135	BPAAAA	APMAAA	OOOOxx
+8679	8503	1	3	9	19	79	679	679	3679	8679	158	159	VVAAAA	BPMAAA	VVVVxx
+2894	8504	0	2	4	14	94	894	894	2894	2894	188	189	IHAAAA	CPMAAA	AAAAxx
+9248	8505	0	0	8	8	48	248	1248	4248	9248	96	97	SRAAAA	DPMAAA	HHHHxx
+1072	8506	0	0	2	12	72	72	1072	1072	1072	144	145	GPAAAA	EPMAAA	OOOOxx
+3510	8507	0	2	0	10	10	510	1510	3510	3510	20	21	AFAAAA	FPMAAA	VVVVxx
+6871	8508	1	3	1	11	71	871	871	1871	6871	142	143	HEAAAA	GPMAAA	AAAAxx
+8701	8509	1	1	1	1	1	701	701	3701	8701	2	3	RWAAAA	HPMAAA	HHHHxx
+8170	8510	0	2	0	10	70	170	170	3170	8170	140	141	GCAAAA	IPMAAA	OOOOxx
+2730	8511	0	2	0	10	30	730	730	2730	2730	60	61	ABAAAA	JPMAAA	VVVVxx
+2668	8512	0	0	8	8	68	668	668	2668	2668	136	137	QYAAAA	KPMAAA	AAAAxx
+8723	8513	1	3	3	3	23	723	723	3723	8723	46	47	NXAAAA	LPMAAA	HHHHxx
+3439	8514	1	3	9	19	39	439	1439	3439	3439	78	79	HCAAAA	MPMAAA	OOOOxx
+6219	8515	1	3	9	19	19	219	219	1219	6219	38	39	FFAAAA	NPMAAA	VVVVxx
+4264	8516	0	0	4	4	64	264	264	4264	4264	128	129	AIAAAA	OPMAAA	AAAAxx
+3929	8517	1	1	9	9	29	929	1929	3929	3929	58	59	DVAAAA	PPMAAA	HHHHxx
+7	8518	1	3	7	7	7	7	7	7	7	14	15	HAAAAA	QPMAAA	OOOOxx
+3737	8519	1	1	7	17	37	737	1737	3737	3737	74	75	TNAAAA	RPMAAA	VVVVxx
+358	8520	0	2	8	18	58	358	358	358	358	116	117	UNAAAA	SPMAAA	AAAAxx
+5128	8521	0	0	8	8	28	128	1128	128	5128	56	57	GPAAAA	TPMAAA	HHHHxx
+7353	8522	1	1	3	13	53	353	1353	2353	7353	106	107	VWAAAA	UPMAAA	OOOOxx
+8758	8523	0	2	8	18	58	758	758	3758	8758	116	117	WYAAAA	VPMAAA	VVVVxx
+7284	8524	0	0	4	4	84	284	1284	2284	7284	168	169	EUAAAA	WPMAAA	AAAAxx
+4037	8525	1	1	7	17	37	37	37	4037	4037	74	75	HZAAAA	XPMAAA	HHHHxx
+435	8526	1	3	5	15	35	435	435	435	435	70	71	TQAAAA	YPMAAA	OOOOxx
+3580	8527	0	0	0	0	80	580	1580	3580	3580	160	161	SHAAAA	ZPMAAA	VVVVxx
+4554	8528	0	2	4	14	54	554	554	4554	4554	108	109	ETAAAA	AQMAAA	AAAAxx
+4337	8529	1	1	7	17	37	337	337	4337	4337	74	75	VKAAAA	BQMAAA	HHHHxx
+512	8530	0	0	2	12	12	512	512	512	512	24	25	STAAAA	CQMAAA	OOOOxx
+2032	8531	0	0	2	12	32	32	32	2032	2032	64	65	EAAAAA	DQMAAA	VVVVxx
+1755	8532	1	3	5	15	55	755	1755	1755	1755	110	111	NPAAAA	EQMAAA	AAAAxx
+9923	8533	1	3	3	3	23	923	1923	4923	9923	46	47	RRAAAA	FQMAAA	HHHHxx
+3747	8534	1	3	7	7	47	747	1747	3747	3747	94	95	DOAAAA	GQMAAA	OOOOxx
+27	8535	1	3	7	7	27	27	27	27	27	54	55	BBAAAA	HQMAAA	VVVVxx
+3075	8536	1	3	5	15	75	75	1075	3075	3075	150	151	HOAAAA	IQMAAA	AAAAxx
+6259	8537	1	3	9	19	59	259	259	1259	6259	118	119	TGAAAA	JQMAAA	HHHHxx
+2940	8538	0	0	0	0	40	940	940	2940	2940	80	81	CJAAAA	KQMAAA	OOOOxx
+5724	8539	0	0	4	4	24	724	1724	724	5724	48	49	EMAAAA	LQMAAA	VVVVxx
+5638	8540	0	2	8	18	38	638	1638	638	5638	76	77	WIAAAA	MQMAAA	AAAAxx
+479	8541	1	3	9	19	79	479	479	479	479	158	159	LSAAAA	NQMAAA	HHHHxx
+4125	8542	1	1	5	5	25	125	125	4125	4125	50	51	RCAAAA	OQMAAA	OOOOxx
+1525	8543	1	1	5	5	25	525	1525	1525	1525	50	51	RGAAAA	PQMAAA	VVVVxx
+7529	8544	1	1	9	9	29	529	1529	2529	7529	58	59	PDAAAA	QQMAAA	AAAAxx
+931	8545	1	3	1	11	31	931	931	931	931	62	63	VJAAAA	RQMAAA	HHHHxx
+5175	8546	1	3	5	15	75	175	1175	175	5175	150	151	BRAAAA	SQMAAA	OOOOxx
+6798	8547	0	2	8	18	98	798	798	1798	6798	196	197	MBAAAA	TQMAAA	VVVVxx
+2111	8548	1	3	1	11	11	111	111	2111	2111	22	23	FDAAAA	UQMAAA	AAAAxx
+6145	8549	1	1	5	5	45	145	145	1145	6145	90	91	JCAAAA	VQMAAA	HHHHxx
+4712	8550	0	0	2	12	12	712	712	4712	4712	24	25	GZAAAA	WQMAAA	OOOOxx
+3110	8551	0	2	0	10	10	110	1110	3110	3110	20	21	QPAAAA	XQMAAA	VVVVxx
+97	8552	1	1	7	17	97	97	97	97	97	194	195	TDAAAA	YQMAAA	AAAAxx
+758	8553	0	2	8	18	58	758	758	758	758	116	117	EDAAAA	ZQMAAA	HHHHxx
+1895	8554	1	3	5	15	95	895	1895	1895	1895	190	191	XUAAAA	ARMAAA	OOOOxx
+5289	8555	1	1	9	9	89	289	1289	289	5289	178	179	LVAAAA	BRMAAA	VVVVxx
+5026	8556	0	2	6	6	26	26	1026	26	5026	52	53	ILAAAA	CRMAAA	AAAAxx
+4725	8557	1	1	5	5	25	725	725	4725	4725	50	51	TZAAAA	DRMAAA	HHHHxx
+1679	8558	1	3	9	19	79	679	1679	1679	1679	158	159	PMAAAA	ERMAAA	OOOOxx
+4433	8559	1	1	3	13	33	433	433	4433	4433	66	67	NOAAAA	FRMAAA	VVVVxx
+5340	8560	0	0	0	0	40	340	1340	340	5340	80	81	KXAAAA	GRMAAA	AAAAxx
+6340	8561	0	0	0	0	40	340	340	1340	6340	80	81	WJAAAA	HRMAAA	HHHHxx
+3261	8562	1	1	1	1	61	261	1261	3261	3261	122	123	LVAAAA	IRMAAA	OOOOxx
+8108	8563	0	0	8	8	8	108	108	3108	8108	16	17	WZAAAA	JRMAAA	VVVVxx
+8785	8564	1	1	5	5	85	785	785	3785	8785	170	171	XZAAAA	KRMAAA	AAAAxx
+7391	8565	1	3	1	11	91	391	1391	2391	7391	182	183	HYAAAA	LRMAAA	HHHHxx
+1496	8566	0	0	6	16	96	496	1496	1496	1496	192	193	OFAAAA	MRMAAA	OOOOxx
+1484	8567	0	0	4	4	84	484	1484	1484	1484	168	169	CFAAAA	NRMAAA	VVVVxx
+5884	8568	0	0	4	4	84	884	1884	884	5884	168	169	ISAAAA	ORMAAA	AAAAxx
+342	8569	0	2	2	2	42	342	342	342	342	84	85	ENAAAA	PRMAAA	HHHHxx
+7659	8570	1	3	9	19	59	659	1659	2659	7659	118	119	PIAAAA	QRMAAA	OOOOxx
+6635	8571	1	3	5	15	35	635	635	1635	6635	70	71	FVAAAA	RRMAAA	VVVVxx
+8507	8572	1	3	7	7	7	507	507	3507	8507	14	15	FPAAAA	SRMAAA	AAAAxx
+2583	8573	1	3	3	3	83	583	583	2583	2583	166	167	JVAAAA	TRMAAA	HHHHxx
+6533	8574	1	1	3	13	33	533	533	1533	6533	66	67	HRAAAA	URMAAA	OOOOxx
+5879	8575	1	3	9	19	79	879	1879	879	5879	158	159	DSAAAA	VRMAAA	VVVVxx
+5511	8576	1	3	1	11	11	511	1511	511	5511	22	23	ZDAAAA	WRMAAA	AAAAxx
+3682	8577	0	2	2	2	82	682	1682	3682	3682	164	165	QLAAAA	XRMAAA	HHHHxx
+7182	8578	0	2	2	2	82	182	1182	2182	7182	164	165	GQAAAA	YRMAAA	OOOOxx
+1409	8579	1	1	9	9	9	409	1409	1409	1409	18	19	FCAAAA	ZRMAAA	VVVVxx
+3363	8580	1	3	3	3	63	363	1363	3363	3363	126	127	JZAAAA	ASMAAA	AAAAxx
+729	8581	1	1	9	9	29	729	729	729	729	58	59	BCAAAA	BSMAAA	HHHHxx
+5857	8582	1	1	7	17	57	857	1857	857	5857	114	115	HRAAAA	CSMAAA	OOOOxx
+235	8583	1	3	5	15	35	235	235	235	235	70	71	BJAAAA	DSMAAA	VVVVxx
+193	8584	1	1	3	13	93	193	193	193	193	186	187	LHAAAA	ESMAAA	AAAAxx
+5586	8585	0	2	6	6	86	586	1586	586	5586	172	173	WGAAAA	FSMAAA	HHHHxx
+6203	8586	1	3	3	3	3	203	203	1203	6203	6	7	PEAAAA	GSMAAA	OOOOxx
+6795	8587	1	3	5	15	95	795	795	1795	6795	190	191	JBAAAA	HSMAAA	VVVVxx
+3211	8588	1	3	1	11	11	211	1211	3211	3211	22	23	NTAAAA	ISMAAA	AAAAxx
+9763	8589	1	3	3	3	63	763	1763	4763	9763	126	127	NLAAAA	JSMAAA	HHHHxx
+9043	8590	1	3	3	3	43	43	1043	4043	9043	86	87	VJAAAA	KSMAAA	OOOOxx
+2854	8591	0	2	4	14	54	854	854	2854	2854	108	109	UFAAAA	LSMAAA	VVVVxx
+565	8592	1	1	5	5	65	565	565	565	565	130	131	TVAAAA	MSMAAA	AAAAxx
+9284	8593	0	0	4	4	84	284	1284	4284	9284	168	169	CTAAAA	NSMAAA	HHHHxx
+7886	8594	0	2	6	6	86	886	1886	2886	7886	172	173	IRAAAA	OSMAAA	OOOOxx
+122	8595	0	2	2	2	22	122	122	122	122	44	45	SEAAAA	PSMAAA	VVVVxx
+4934	8596	0	2	4	14	34	934	934	4934	4934	68	69	UHAAAA	QSMAAA	AAAAxx
+1766	8597	0	2	6	6	66	766	1766	1766	1766	132	133	YPAAAA	RSMAAA	HHHHxx
+2554	8598	0	2	4	14	54	554	554	2554	2554	108	109	GUAAAA	SSMAAA	OOOOxx
+488	8599	0	0	8	8	88	488	488	488	488	176	177	USAAAA	TSMAAA	VVVVxx
+825	8600	1	1	5	5	25	825	825	825	825	50	51	TFAAAA	USMAAA	AAAAxx
+678	8601	0	2	8	18	78	678	678	678	678	156	157	CAAAAA	VSMAAA	HHHHxx
+4543	8602	1	3	3	3	43	543	543	4543	4543	86	87	TSAAAA	WSMAAA	OOOOxx
+1699	8603	1	3	9	19	99	699	1699	1699	1699	198	199	JNAAAA	XSMAAA	VVVVxx
+3771	8604	1	3	1	11	71	771	1771	3771	3771	142	143	BPAAAA	YSMAAA	AAAAxx
+1234	8605	0	2	4	14	34	234	1234	1234	1234	68	69	MVAAAA	ZSMAAA	HHHHxx
+4152	8606	0	0	2	12	52	152	152	4152	4152	104	105	SDAAAA	ATMAAA	OOOOxx
+1632	8607	0	0	2	12	32	632	1632	1632	1632	64	65	UKAAAA	BTMAAA	VVVVxx
+4988	8608	0	0	8	8	88	988	988	4988	4988	176	177	WJAAAA	CTMAAA	AAAAxx
+1980	8609	0	0	0	0	80	980	1980	1980	1980	160	161	EYAAAA	DTMAAA	HHHHxx
+7479	8610	1	3	9	19	79	479	1479	2479	7479	158	159	RBAAAA	ETMAAA	OOOOxx
+2586	8611	0	2	6	6	86	586	586	2586	2586	172	173	MVAAAA	FTMAAA	VVVVxx
+5433	8612	1	1	3	13	33	433	1433	433	5433	66	67	ZAAAAA	GTMAAA	AAAAxx
+2261	8613	1	1	1	1	61	261	261	2261	2261	122	123	ZIAAAA	HTMAAA	HHHHxx
+1180	8614	0	0	0	0	80	180	1180	1180	1180	160	161	KTAAAA	ITMAAA	OOOOxx
+3938	8615	0	2	8	18	38	938	1938	3938	3938	76	77	MVAAAA	JTMAAA	VVVVxx
+6714	8616	0	2	4	14	14	714	714	1714	6714	28	29	GYAAAA	KTMAAA	AAAAxx
+2890	8617	0	2	0	10	90	890	890	2890	2890	180	181	EHAAAA	LTMAAA	HHHHxx
+7379	8618	1	3	9	19	79	379	1379	2379	7379	158	159	VXAAAA	MTMAAA	OOOOxx
+5896	8619	0	0	6	16	96	896	1896	896	5896	192	193	USAAAA	NTMAAA	VVVVxx
+5949	8620	1	1	9	9	49	949	1949	949	5949	98	99	VUAAAA	OTMAAA	AAAAxx
+3194	8621	0	2	4	14	94	194	1194	3194	3194	188	189	WSAAAA	PTMAAA	HHHHxx
+9325	8622	1	1	5	5	25	325	1325	4325	9325	50	51	RUAAAA	QTMAAA	OOOOxx
+9531	8623	1	3	1	11	31	531	1531	4531	9531	62	63	PCAAAA	RTMAAA	VVVVxx
+711	8624	1	3	1	11	11	711	711	711	711	22	23	JBAAAA	STMAAA	AAAAxx
+2450	8625	0	2	0	10	50	450	450	2450	2450	100	101	GQAAAA	TTMAAA	HHHHxx
+1929	8626	1	1	9	9	29	929	1929	1929	1929	58	59	FWAAAA	UTMAAA	OOOOxx
+6165	8627	1	1	5	5	65	165	165	1165	6165	130	131	DDAAAA	VTMAAA	VVVVxx
+4050	8628	0	2	0	10	50	50	50	4050	4050	100	101	UZAAAA	WTMAAA	AAAAxx
+9011	8629	1	3	1	11	11	11	1011	4011	9011	22	23	PIAAAA	XTMAAA	HHHHxx
+7916	8630	0	0	6	16	16	916	1916	2916	7916	32	33	MSAAAA	YTMAAA	OOOOxx
+9136	8631	0	0	6	16	36	136	1136	4136	9136	72	73	KNAAAA	ZTMAAA	VVVVxx
+8782	8632	0	2	2	2	82	782	782	3782	8782	164	165	UZAAAA	AUMAAA	AAAAxx
+8491	8633	1	3	1	11	91	491	491	3491	8491	182	183	POAAAA	BUMAAA	HHHHxx
+5114	8634	0	2	4	14	14	114	1114	114	5114	28	29	SOAAAA	CUMAAA	OOOOxx
+5815	8635	1	3	5	15	15	815	1815	815	5815	30	31	RPAAAA	DUMAAA	VVVVxx
+5628	8636	0	0	8	8	28	628	1628	628	5628	56	57	MIAAAA	EUMAAA	AAAAxx
+810	8637	0	2	0	10	10	810	810	810	810	20	21	EFAAAA	FUMAAA	HHHHxx
+6178	8638	0	2	8	18	78	178	178	1178	6178	156	157	QDAAAA	GUMAAA	OOOOxx
+2619	8639	1	3	9	19	19	619	619	2619	2619	38	39	TWAAAA	HUMAAA	VVVVxx
+3340	8640	0	0	0	0	40	340	1340	3340	3340	80	81	MYAAAA	IUMAAA	AAAAxx
+2491	8641	1	3	1	11	91	491	491	2491	2491	182	183	VRAAAA	JUMAAA	HHHHxx
+3574	8642	0	2	4	14	74	574	1574	3574	3574	148	149	MHAAAA	KUMAAA	OOOOxx
+6754	8643	0	2	4	14	54	754	754	1754	6754	108	109	UZAAAA	LUMAAA	VVVVxx
+1566	8644	0	2	6	6	66	566	1566	1566	1566	132	133	GIAAAA	MUMAAA	AAAAxx
+9174	8645	0	2	4	14	74	174	1174	4174	9174	148	149	WOAAAA	NUMAAA	HHHHxx
+1520	8646	0	0	0	0	20	520	1520	1520	1520	40	41	MGAAAA	OUMAAA	OOOOxx
+2691	8647	1	3	1	11	91	691	691	2691	2691	182	183	NZAAAA	PUMAAA	VVVVxx
+6961	8648	1	1	1	1	61	961	961	1961	6961	122	123	THAAAA	QUMAAA	AAAAxx
+5722	8649	0	2	2	2	22	722	1722	722	5722	44	45	CMAAAA	RUMAAA	HHHHxx
+9707	8650	1	3	7	7	7	707	1707	4707	9707	14	15	JJAAAA	SUMAAA	OOOOxx
+2891	8651	1	3	1	11	91	891	891	2891	2891	182	183	FHAAAA	TUMAAA	VVVVxx
+341	8652	1	1	1	1	41	341	341	341	341	82	83	DNAAAA	UUMAAA	AAAAxx
+4690	8653	0	2	0	10	90	690	690	4690	4690	180	181	KYAAAA	VUMAAA	HHHHxx
+7841	8654	1	1	1	1	41	841	1841	2841	7841	82	83	PPAAAA	WUMAAA	OOOOxx
+6615	8655	1	3	5	15	15	615	615	1615	6615	30	31	LUAAAA	XUMAAA	VVVVxx
+9169	8656	1	1	9	9	69	169	1169	4169	9169	138	139	ROAAAA	YUMAAA	AAAAxx
+6689	8657	1	1	9	9	89	689	689	1689	6689	178	179	HXAAAA	ZUMAAA	HHHHxx
+8721	8658	1	1	1	1	21	721	721	3721	8721	42	43	LXAAAA	AVMAAA	OOOOxx
+7508	8659	0	0	8	8	8	508	1508	2508	7508	16	17	UCAAAA	BVMAAA	VVVVxx
+8631	8660	1	3	1	11	31	631	631	3631	8631	62	63	ZTAAAA	CVMAAA	AAAAxx
+480	8661	0	0	0	0	80	480	480	480	480	160	161	MSAAAA	DVMAAA	HHHHxx
+7094	8662	0	2	4	14	94	94	1094	2094	7094	188	189	WMAAAA	EVMAAA	OOOOxx
+319	8663	1	3	9	19	19	319	319	319	319	38	39	HMAAAA	FVMAAA	VVVVxx
+9421	8664	1	1	1	1	21	421	1421	4421	9421	42	43	JYAAAA	GVMAAA	AAAAxx
+4352	8665	0	0	2	12	52	352	352	4352	4352	104	105	KLAAAA	HVMAAA	HHHHxx
+5019	8666	1	3	9	19	19	19	1019	19	5019	38	39	BLAAAA	IVMAAA	OOOOxx
+3956	8667	0	0	6	16	56	956	1956	3956	3956	112	113	EWAAAA	JVMAAA	VVVVxx
+114	8668	0	2	4	14	14	114	114	114	114	28	29	KEAAAA	KVMAAA	AAAAxx
+1196	8669	0	0	6	16	96	196	1196	1196	1196	192	193	AUAAAA	LVMAAA	HHHHxx
+1407	8670	1	3	7	7	7	407	1407	1407	1407	14	15	DCAAAA	MVMAAA	OOOOxx
+7432	8671	0	0	2	12	32	432	1432	2432	7432	64	65	WZAAAA	NVMAAA	VVVVxx
+3141	8672	1	1	1	1	41	141	1141	3141	3141	82	83	VQAAAA	OVMAAA	AAAAxx
+2073	8673	1	1	3	13	73	73	73	2073	2073	146	147	TBAAAA	PVMAAA	HHHHxx
+3400	8674	0	0	0	0	0	400	1400	3400	3400	0	1	UAAAAA	QVMAAA	OOOOxx
+505	8675	1	1	5	5	5	505	505	505	505	10	11	LTAAAA	RVMAAA	VVVVxx
+1263	8676	1	3	3	3	63	263	1263	1263	1263	126	127	PWAAAA	SVMAAA	AAAAxx
+190	8677	0	2	0	10	90	190	190	190	190	180	181	IHAAAA	TVMAAA	HHHHxx
+6686	8678	0	2	6	6	86	686	686	1686	6686	172	173	EXAAAA	UVMAAA	OOOOxx
+9821	8679	1	1	1	1	21	821	1821	4821	9821	42	43	TNAAAA	VVMAAA	VVVVxx
+1119	8680	1	3	9	19	19	119	1119	1119	1119	38	39	BRAAAA	WVMAAA	AAAAxx
+2955	8681	1	3	5	15	55	955	955	2955	2955	110	111	RJAAAA	XVMAAA	HHHHxx
+224	8682	0	0	4	4	24	224	224	224	224	48	49	QIAAAA	YVMAAA	OOOOxx
+7562	8683	0	2	2	2	62	562	1562	2562	7562	124	125	WEAAAA	ZVMAAA	VVVVxx
+8845	8684	1	1	5	5	45	845	845	3845	8845	90	91	FCAAAA	AWMAAA	AAAAxx
+5405	8685	1	1	5	5	5	405	1405	405	5405	10	11	XZAAAA	BWMAAA	HHHHxx
+9192	8686	0	0	2	12	92	192	1192	4192	9192	184	185	OPAAAA	CWMAAA	OOOOxx
+4927	8687	1	3	7	7	27	927	927	4927	4927	54	55	NHAAAA	DWMAAA	VVVVxx
+997	8688	1	1	7	17	97	997	997	997	997	194	195	JMAAAA	EWMAAA	AAAAxx
+989	8689	1	1	9	9	89	989	989	989	989	178	179	BMAAAA	FWMAAA	HHHHxx
+7258	8690	0	2	8	18	58	258	1258	2258	7258	116	117	ETAAAA	GWMAAA	OOOOxx
+6899	8691	1	3	9	19	99	899	899	1899	6899	198	199	JFAAAA	HWMAAA	VVVVxx
+1770	8692	0	2	0	10	70	770	1770	1770	1770	140	141	CQAAAA	IWMAAA	AAAAxx
+4423	8693	1	3	3	3	23	423	423	4423	4423	46	47	DOAAAA	JWMAAA	HHHHxx
+5671	8694	1	3	1	11	71	671	1671	671	5671	142	143	DKAAAA	KWMAAA	OOOOxx
+8393	8695	1	1	3	13	93	393	393	3393	8393	186	187	VKAAAA	LWMAAA	VVVVxx
+4355	8696	1	3	5	15	55	355	355	4355	4355	110	111	NLAAAA	MWMAAA	AAAAxx
+3919	8697	1	3	9	19	19	919	1919	3919	3919	38	39	TUAAAA	NWMAAA	HHHHxx
+338	8698	0	2	8	18	38	338	338	338	338	76	77	ANAAAA	OWMAAA	OOOOxx
+5790	8699	0	2	0	10	90	790	1790	790	5790	180	181	SOAAAA	PWMAAA	VVVVxx
+1452	8700	0	0	2	12	52	452	1452	1452	1452	104	105	WDAAAA	QWMAAA	AAAAxx
+939	8701	1	3	9	19	39	939	939	939	939	78	79	DKAAAA	RWMAAA	HHHHxx
+8913	8702	1	1	3	13	13	913	913	3913	8913	26	27	VEAAAA	SWMAAA	OOOOxx
+7157	8703	1	1	7	17	57	157	1157	2157	7157	114	115	HPAAAA	TWMAAA	VVVVxx
+7240	8704	0	0	0	0	40	240	1240	2240	7240	80	81	MSAAAA	UWMAAA	AAAAxx
+3492	8705	0	0	2	12	92	492	1492	3492	3492	184	185	IEAAAA	VWMAAA	HHHHxx
+3464	8706	0	0	4	4	64	464	1464	3464	3464	128	129	GDAAAA	WWMAAA	OOOOxx
+388	8707	0	0	8	8	88	388	388	388	388	176	177	YOAAAA	XWMAAA	VVVVxx
+4135	8708	1	3	5	15	35	135	135	4135	4135	70	71	BDAAAA	YWMAAA	AAAAxx
+1194	8709	0	2	4	14	94	194	1194	1194	1194	188	189	YTAAAA	ZWMAAA	HHHHxx
+5476	8710	0	0	6	16	76	476	1476	476	5476	152	153	QCAAAA	AXMAAA	OOOOxx
+9844	8711	0	0	4	4	44	844	1844	4844	9844	88	89	QOAAAA	BXMAAA	VVVVxx
+9364	8712	0	0	4	4	64	364	1364	4364	9364	128	129	EWAAAA	CXMAAA	AAAAxx
+5238	8713	0	2	8	18	38	238	1238	238	5238	76	77	MTAAAA	DXMAAA	HHHHxx
+3712	8714	0	0	2	12	12	712	1712	3712	3712	24	25	UMAAAA	EXMAAA	OOOOxx
+6189	8715	1	1	9	9	89	189	189	1189	6189	178	179	BEAAAA	FXMAAA	VVVVxx
+5257	8716	1	1	7	17	57	257	1257	257	5257	114	115	FUAAAA	GXMAAA	AAAAxx
+81	8717	1	1	1	1	81	81	81	81	81	162	163	DDAAAA	HXMAAA	HHHHxx
+3289	8718	1	1	9	9	89	289	1289	3289	3289	178	179	NWAAAA	IXMAAA	OOOOxx
+1177	8719	1	1	7	17	77	177	1177	1177	1177	154	155	HTAAAA	JXMAAA	VVVVxx
+5038	8720	0	2	8	18	38	38	1038	38	5038	76	77	ULAAAA	KXMAAA	AAAAxx
+325	8721	1	1	5	5	25	325	325	325	325	50	51	NMAAAA	LXMAAA	HHHHxx
+7221	8722	1	1	1	1	21	221	1221	2221	7221	42	43	TRAAAA	MXMAAA	OOOOxx
+7123	8723	1	3	3	3	23	123	1123	2123	7123	46	47	ZNAAAA	NXMAAA	VVVVxx
+6364	8724	0	0	4	4	64	364	364	1364	6364	128	129	UKAAAA	OXMAAA	AAAAxx
+4468	8725	0	0	8	8	68	468	468	4468	4468	136	137	WPAAAA	PXMAAA	HHHHxx
+9185	8726	1	1	5	5	85	185	1185	4185	9185	170	171	HPAAAA	QXMAAA	OOOOxx
+4158	8727	0	2	8	18	58	158	158	4158	4158	116	117	YDAAAA	RXMAAA	VVVVxx
+9439	8728	1	3	9	19	39	439	1439	4439	9439	78	79	BZAAAA	SXMAAA	AAAAxx
+7759	8729	1	3	9	19	59	759	1759	2759	7759	118	119	LMAAAA	TXMAAA	HHHHxx
+3325	8730	1	1	5	5	25	325	1325	3325	3325	50	51	XXAAAA	UXMAAA	OOOOxx
+7991	8731	1	3	1	11	91	991	1991	2991	7991	182	183	JVAAAA	VXMAAA	VVVVxx
+1650	8732	0	2	0	10	50	650	1650	1650	1650	100	101	MLAAAA	WXMAAA	AAAAxx
+8395	8733	1	3	5	15	95	395	395	3395	8395	190	191	XKAAAA	XXMAAA	HHHHxx
+286	8734	0	2	6	6	86	286	286	286	286	172	173	ALAAAA	YXMAAA	OOOOxx
+1507	8735	1	3	7	7	7	507	1507	1507	1507	14	15	ZFAAAA	ZXMAAA	VVVVxx
+4122	8736	0	2	2	2	22	122	122	4122	4122	44	45	OCAAAA	AYMAAA	AAAAxx
+2625	8737	1	1	5	5	25	625	625	2625	2625	50	51	ZWAAAA	BYMAAA	HHHHxx
+1140	8738	0	0	0	0	40	140	1140	1140	1140	80	81	WRAAAA	CYMAAA	OOOOxx
+5262	8739	0	2	2	2	62	262	1262	262	5262	124	125	KUAAAA	DYMAAA	VVVVxx
+4919	8740	1	3	9	19	19	919	919	4919	4919	38	39	FHAAAA	EYMAAA	AAAAxx
+7266	8741	0	2	6	6	66	266	1266	2266	7266	132	133	MTAAAA	FYMAAA	HHHHxx
+630	8742	0	2	0	10	30	630	630	630	630	60	61	GYAAAA	GYMAAA	OOOOxx
+2129	8743	1	1	9	9	29	129	129	2129	2129	58	59	XDAAAA	HYMAAA	VVVVxx
+9552	8744	0	0	2	12	52	552	1552	4552	9552	104	105	KDAAAA	IYMAAA	AAAAxx
+3018	8745	0	2	8	18	18	18	1018	3018	3018	36	37	CMAAAA	JYMAAA	HHHHxx
+7145	8746	1	1	5	5	45	145	1145	2145	7145	90	91	VOAAAA	KYMAAA	OOOOxx
+1633	8747	1	1	3	13	33	633	1633	1633	1633	66	67	VKAAAA	LYMAAA	VVVVxx
+7957	8748	1	1	7	17	57	957	1957	2957	7957	114	115	BUAAAA	MYMAAA	AAAAxx
+774	8749	0	2	4	14	74	774	774	774	774	148	149	UDAAAA	NYMAAA	HHHHxx
+9371	8750	1	3	1	11	71	371	1371	4371	9371	142	143	LWAAAA	OYMAAA	OOOOxx
+6007	8751	1	3	7	7	7	7	7	1007	6007	14	15	BXAAAA	PYMAAA	VVVVxx
+5277	8752	1	1	7	17	77	277	1277	277	5277	154	155	ZUAAAA	QYMAAA	AAAAxx
+9426	8753	0	2	6	6	26	426	1426	4426	9426	52	53	OYAAAA	RYMAAA	HHHHxx
+9190	8754	0	2	0	10	90	190	1190	4190	9190	180	181	MPAAAA	SYMAAA	OOOOxx
+8996	8755	0	0	6	16	96	996	996	3996	8996	192	193	AIAAAA	TYMAAA	VVVVxx
+3409	8756	1	1	9	9	9	409	1409	3409	3409	18	19	DBAAAA	UYMAAA	AAAAxx
+7212	8757	0	0	2	12	12	212	1212	2212	7212	24	25	KRAAAA	VYMAAA	HHHHxx
+416	8758	0	0	6	16	16	416	416	416	416	32	33	AQAAAA	WYMAAA	OOOOxx
+7211	8759	1	3	1	11	11	211	1211	2211	7211	22	23	JRAAAA	XYMAAA	VVVVxx
+7454	8760	0	2	4	14	54	454	1454	2454	7454	108	109	SAAAAA	YYMAAA	AAAAxx
+8417	8761	1	1	7	17	17	417	417	3417	8417	34	35	TLAAAA	ZYMAAA	HHHHxx
+5562	8762	0	2	2	2	62	562	1562	562	5562	124	125	YFAAAA	AZMAAA	OOOOxx
+4996	8763	0	0	6	16	96	996	996	4996	4996	192	193	EKAAAA	BZMAAA	VVVVxx
+5718	8764	0	2	8	18	18	718	1718	718	5718	36	37	YLAAAA	CZMAAA	AAAAxx
+7838	8765	0	2	8	18	38	838	1838	2838	7838	76	77	MPAAAA	DZMAAA	HHHHxx
+7715	8766	1	3	5	15	15	715	1715	2715	7715	30	31	TKAAAA	EZMAAA	OOOOxx
+2780	8767	0	0	0	0	80	780	780	2780	2780	160	161	YCAAAA	FZMAAA	VVVVxx
+1013	8768	1	1	3	13	13	13	1013	1013	1013	26	27	ZMAAAA	GZMAAA	AAAAxx
+8465	8769	1	1	5	5	65	465	465	3465	8465	130	131	PNAAAA	HZMAAA	HHHHxx
+7976	8770	0	0	6	16	76	976	1976	2976	7976	152	153	UUAAAA	IZMAAA	OOOOxx
+7150	8771	0	2	0	10	50	150	1150	2150	7150	100	101	APAAAA	JZMAAA	VVVVxx
+6471	8772	1	3	1	11	71	471	471	1471	6471	142	143	XOAAAA	KZMAAA	AAAAxx
+1927	8773	1	3	7	7	27	927	1927	1927	1927	54	55	DWAAAA	LZMAAA	HHHHxx
+227	8774	1	3	7	7	27	227	227	227	227	54	55	TIAAAA	MZMAAA	OOOOxx
+6462	8775	0	2	2	2	62	462	462	1462	6462	124	125	OOAAAA	NZMAAA	VVVVxx
+5227	8776	1	3	7	7	27	227	1227	227	5227	54	55	BTAAAA	OZMAAA	AAAAxx
+1074	8777	0	2	4	14	74	74	1074	1074	1074	148	149	IPAAAA	PZMAAA	HHHHxx
+9448	8778	0	0	8	8	48	448	1448	4448	9448	96	97	KZAAAA	QZMAAA	OOOOxx
+4459	8779	1	3	9	19	59	459	459	4459	4459	118	119	NPAAAA	RZMAAA	VVVVxx
+2478	8780	0	2	8	18	78	478	478	2478	2478	156	157	IRAAAA	SZMAAA	AAAAxx
+5005	8781	1	1	5	5	5	5	1005	5	5005	10	11	NKAAAA	TZMAAA	HHHHxx
+2418	8782	0	2	8	18	18	418	418	2418	2418	36	37	APAAAA	UZMAAA	OOOOxx
+6991	8783	1	3	1	11	91	991	991	1991	6991	182	183	XIAAAA	VZMAAA	VVVVxx
+4729	8784	1	1	9	9	29	729	729	4729	4729	58	59	XZAAAA	WZMAAA	AAAAxx
+3548	8785	0	0	8	8	48	548	1548	3548	3548	96	97	MGAAAA	XZMAAA	HHHHxx
+9616	8786	0	0	6	16	16	616	1616	4616	9616	32	33	WFAAAA	YZMAAA	OOOOxx
+2901	8787	1	1	1	1	1	901	901	2901	2901	2	3	PHAAAA	ZZMAAA	VVVVxx
+10	8788	0	2	0	10	10	10	10	10	10	20	21	KAAAAA	AANAAA	AAAAxx
+2637	8789	1	1	7	17	37	637	637	2637	2637	74	75	LXAAAA	BANAAA	HHHHxx
+6747	8790	1	3	7	7	47	747	747	1747	6747	94	95	NZAAAA	CANAAA	OOOOxx
+797	8791	1	1	7	17	97	797	797	797	797	194	195	REAAAA	DANAAA	VVVVxx
+7609	8792	1	1	9	9	9	609	1609	2609	7609	18	19	RGAAAA	EANAAA	AAAAxx
+8290	8793	0	2	0	10	90	290	290	3290	8290	180	181	WGAAAA	FANAAA	HHHHxx
+8765	8794	1	1	5	5	65	765	765	3765	8765	130	131	DZAAAA	GANAAA	OOOOxx
+8053	8795	1	1	3	13	53	53	53	3053	8053	106	107	TXAAAA	HANAAA	VVVVxx
+5602	8796	0	2	2	2	2	602	1602	602	5602	4	5	MHAAAA	IANAAA	AAAAxx
+3672	8797	0	0	2	12	72	672	1672	3672	3672	144	145	GLAAAA	JANAAA	HHHHxx
+7513	8798	1	1	3	13	13	513	1513	2513	7513	26	27	ZCAAAA	KANAAA	OOOOxx
+3462	8799	0	2	2	2	62	462	1462	3462	3462	124	125	EDAAAA	LANAAA	VVVVxx
+4457	8800	1	1	7	17	57	457	457	4457	4457	114	115	LPAAAA	MANAAA	AAAAxx
+6547	8801	1	3	7	7	47	547	547	1547	6547	94	95	VRAAAA	NANAAA	HHHHxx
+7417	8802	1	1	7	17	17	417	1417	2417	7417	34	35	HZAAAA	OANAAA	OOOOxx
+8641	8803	1	1	1	1	41	641	641	3641	8641	82	83	JUAAAA	PANAAA	VVVVxx
+149	8804	1	1	9	9	49	149	149	149	149	98	99	TFAAAA	QANAAA	AAAAxx
+5041	8805	1	1	1	1	41	41	1041	41	5041	82	83	XLAAAA	RANAAA	HHHHxx
+9232	8806	0	0	2	12	32	232	1232	4232	9232	64	65	CRAAAA	SANAAA	OOOOxx
+3603	8807	1	3	3	3	3	603	1603	3603	3603	6	7	PIAAAA	TANAAA	VVVVxx
+2792	8808	0	0	2	12	92	792	792	2792	2792	184	185	KDAAAA	UANAAA	AAAAxx
+6620	8809	0	0	0	0	20	620	620	1620	6620	40	41	QUAAAA	VANAAA	HHHHxx
+4000	8810	0	0	0	0	0	0	0	4000	4000	0	1	WXAAAA	WANAAA	OOOOxx
+659	8811	1	3	9	19	59	659	659	659	659	118	119	JZAAAA	XANAAA	VVVVxx
+8174	8812	0	2	4	14	74	174	174	3174	8174	148	149	KCAAAA	YANAAA	AAAAxx
+4599	8813	1	3	9	19	99	599	599	4599	4599	198	199	XUAAAA	ZANAAA	HHHHxx
+7851	8814	1	3	1	11	51	851	1851	2851	7851	102	103	ZPAAAA	ABNAAA	OOOOxx
+6284	8815	0	0	4	4	84	284	284	1284	6284	168	169	SHAAAA	BBNAAA	VVVVxx
+7116	8816	0	0	6	16	16	116	1116	2116	7116	32	33	SNAAAA	CBNAAA	AAAAxx
+5595	8817	1	3	5	15	95	595	1595	595	5595	190	191	FHAAAA	DBNAAA	HHHHxx
+2903	8818	1	3	3	3	3	903	903	2903	2903	6	7	RHAAAA	EBNAAA	OOOOxx
+5948	8819	0	0	8	8	48	948	1948	948	5948	96	97	UUAAAA	FBNAAA	VVVVxx
+225	8820	1	1	5	5	25	225	225	225	225	50	51	RIAAAA	GBNAAA	AAAAxx
+524	8821	0	0	4	4	24	524	524	524	524	48	49	EUAAAA	HBNAAA	HHHHxx
+7639	8822	1	3	9	19	39	639	1639	2639	7639	78	79	VHAAAA	IBNAAA	OOOOxx
+7297	8823	1	1	7	17	97	297	1297	2297	7297	194	195	RUAAAA	JBNAAA	VVVVxx
+2606	8824	0	2	6	6	6	606	606	2606	2606	12	13	GWAAAA	KBNAAA	AAAAxx
+4771	8825	1	3	1	11	71	771	771	4771	4771	142	143	NBAAAA	LBNAAA	HHHHxx
+8162	8826	0	2	2	2	62	162	162	3162	8162	124	125	YBAAAA	MBNAAA	OOOOxx
+8999	8827	1	3	9	19	99	999	999	3999	8999	198	199	DIAAAA	NBNAAA	VVVVxx
+2309	8828	1	1	9	9	9	309	309	2309	2309	18	19	VKAAAA	OBNAAA	AAAAxx
+3594	8829	0	2	4	14	94	594	1594	3594	3594	188	189	GIAAAA	PBNAAA	HHHHxx
+6092	8830	0	0	2	12	92	92	92	1092	6092	184	185	IAAAAA	QBNAAA	OOOOxx
+7467	8831	1	3	7	7	67	467	1467	2467	7467	134	135	FBAAAA	RBNAAA	VVVVxx
+6986	8832	0	2	6	6	86	986	986	1986	6986	172	173	SIAAAA	SBNAAA	AAAAxx
+9898	8833	0	2	8	18	98	898	1898	4898	9898	196	197	SQAAAA	TBNAAA	HHHHxx
+9578	8834	0	2	8	18	78	578	1578	4578	9578	156	157	KEAAAA	UBNAAA	OOOOxx
+156	8835	0	0	6	16	56	156	156	156	156	112	113	AGAAAA	VBNAAA	VVVVxx
+5810	8836	0	2	0	10	10	810	1810	810	5810	20	21	MPAAAA	WBNAAA	AAAAxx
+790	8837	0	2	0	10	90	790	790	790	790	180	181	KEAAAA	XBNAAA	HHHHxx
+6840	8838	0	0	0	0	40	840	840	1840	6840	80	81	CDAAAA	YBNAAA	OOOOxx
+6725	8839	1	1	5	5	25	725	725	1725	6725	50	51	RYAAAA	ZBNAAA	VVVVxx
+5528	8840	0	0	8	8	28	528	1528	528	5528	56	57	QEAAAA	ACNAAA	AAAAxx
+4120	8841	0	0	0	0	20	120	120	4120	4120	40	41	MCAAAA	BCNAAA	HHHHxx
+6694	8842	0	2	4	14	94	694	694	1694	6694	188	189	MXAAAA	CCNAAA	OOOOxx
+3552	8843	0	0	2	12	52	552	1552	3552	3552	104	105	QGAAAA	DCNAAA	VVVVxx
+1478	8844	0	2	8	18	78	478	1478	1478	1478	156	157	WEAAAA	ECNAAA	AAAAxx
+8084	8845	0	0	4	4	84	84	84	3084	8084	168	169	YYAAAA	FCNAAA	HHHHxx
+7578	8846	0	2	8	18	78	578	1578	2578	7578	156	157	MFAAAA	GCNAAA	OOOOxx
+6314	8847	0	2	4	14	14	314	314	1314	6314	28	29	WIAAAA	HCNAAA	VVVVxx
+6123	8848	1	3	3	3	23	123	123	1123	6123	46	47	NBAAAA	ICNAAA	AAAAxx
+9443	8849	1	3	3	3	43	443	1443	4443	9443	86	87	FZAAAA	JCNAAA	HHHHxx
+9628	8850	0	0	8	8	28	628	1628	4628	9628	56	57	IGAAAA	KCNAAA	OOOOxx
+8508	8851	0	0	8	8	8	508	508	3508	8508	16	17	GPAAAA	LCNAAA	VVVVxx
+5552	8852	0	0	2	12	52	552	1552	552	5552	104	105	OFAAAA	MCNAAA	AAAAxx
+5327	8853	1	3	7	7	27	327	1327	327	5327	54	55	XWAAAA	NCNAAA	HHHHxx
+7771	8854	1	3	1	11	71	771	1771	2771	7771	142	143	XMAAAA	OCNAAA	OOOOxx
+8932	8855	0	0	2	12	32	932	932	3932	8932	64	65	OFAAAA	PCNAAA	VVVVxx
+3526	8856	0	2	6	6	26	526	1526	3526	3526	52	53	QFAAAA	QCNAAA	AAAAxx
+4340	8857	0	0	0	0	40	340	340	4340	4340	80	81	YKAAAA	RCNAAA	HHHHxx
+9419	8858	1	3	9	19	19	419	1419	4419	9419	38	39	HYAAAA	SCNAAA	OOOOxx
+8421	8859	1	1	1	1	21	421	421	3421	8421	42	43	XLAAAA	TCNAAA	VVVVxx
+7431	8860	1	3	1	11	31	431	1431	2431	7431	62	63	VZAAAA	UCNAAA	AAAAxx
+172	8861	0	0	2	12	72	172	172	172	172	144	145	QGAAAA	VCNAAA	HHHHxx
+3279	8862	1	3	9	19	79	279	1279	3279	3279	158	159	DWAAAA	WCNAAA	OOOOxx
+1508	8863	0	0	8	8	8	508	1508	1508	1508	16	17	AGAAAA	XCNAAA	VVVVxx
+7091	8864	1	3	1	11	91	91	1091	2091	7091	182	183	TMAAAA	YCNAAA	AAAAxx
+1419	8865	1	3	9	19	19	419	1419	1419	1419	38	39	PCAAAA	ZCNAAA	HHHHxx
+3032	8866	0	0	2	12	32	32	1032	3032	3032	64	65	QMAAAA	ADNAAA	OOOOxx
+8683	8867	1	3	3	3	83	683	683	3683	8683	166	167	ZVAAAA	BDNAAA	VVVVxx
+4763	8868	1	3	3	3	63	763	763	4763	4763	126	127	FBAAAA	CDNAAA	AAAAxx
+4424	8869	0	0	4	4	24	424	424	4424	4424	48	49	EOAAAA	DDNAAA	HHHHxx
+8640	8870	0	0	0	0	40	640	640	3640	8640	80	81	IUAAAA	EDNAAA	OOOOxx
+7187	8871	1	3	7	7	87	187	1187	2187	7187	174	175	LQAAAA	FDNAAA	VVVVxx
+6247	8872	1	3	7	7	47	247	247	1247	6247	94	95	HGAAAA	GDNAAA	AAAAxx
+7340	8873	0	0	0	0	40	340	1340	2340	7340	80	81	IWAAAA	HDNAAA	HHHHxx
+182	8874	0	2	2	2	82	182	182	182	182	164	165	AHAAAA	IDNAAA	OOOOxx
+2948	8875	0	0	8	8	48	948	948	2948	2948	96	97	KJAAAA	JDNAAA	VVVVxx
+9462	8876	0	2	2	2	62	462	1462	4462	9462	124	125	YZAAAA	KDNAAA	AAAAxx
+5997	8877	1	1	7	17	97	997	1997	997	5997	194	195	RWAAAA	LDNAAA	HHHHxx
+5608	8878	0	0	8	8	8	608	1608	608	5608	16	17	SHAAAA	MDNAAA	OOOOxx
+1472	8879	0	0	2	12	72	472	1472	1472	1472	144	145	QEAAAA	NDNAAA	VVVVxx
+277	8880	1	1	7	17	77	277	277	277	277	154	155	RKAAAA	ODNAAA	AAAAxx
+4807	8881	1	3	7	7	7	807	807	4807	4807	14	15	XCAAAA	PDNAAA	HHHHxx
+4969	8882	1	1	9	9	69	969	969	4969	4969	138	139	DJAAAA	QDNAAA	OOOOxx
+5611	8883	1	3	1	11	11	611	1611	611	5611	22	23	VHAAAA	RDNAAA	VVVVxx
+372	8884	0	0	2	12	72	372	372	372	372	144	145	IOAAAA	SDNAAA	AAAAxx
+6666	8885	0	2	6	6	66	666	666	1666	6666	132	133	KWAAAA	TDNAAA	HHHHxx
+476	8886	0	0	6	16	76	476	476	476	476	152	153	ISAAAA	UDNAAA	OOOOxx
+5225	8887	1	1	5	5	25	225	1225	225	5225	50	51	ZSAAAA	VDNAAA	VVVVxx
+5143	8888	1	3	3	3	43	143	1143	143	5143	86	87	VPAAAA	WDNAAA	AAAAxx
+1853	8889	1	1	3	13	53	853	1853	1853	1853	106	107	HTAAAA	XDNAAA	HHHHxx
+675	8890	1	3	5	15	75	675	675	675	675	150	151	ZZAAAA	YDNAAA	OOOOxx
+5643	8891	1	3	3	3	43	643	1643	643	5643	86	87	BJAAAA	ZDNAAA	VVVVxx
+5317	8892	1	1	7	17	17	317	1317	317	5317	34	35	NWAAAA	AENAAA	AAAAxx
+8102	8893	0	2	2	2	2	102	102	3102	8102	4	5	QZAAAA	BENAAA	HHHHxx
+978	8894	0	2	8	18	78	978	978	978	978	156	157	QLAAAA	CENAAA	OOOOxx
+4620	8895	0	0	0	0	20	620	620	4620	4620	40	41	SVAAAA	DENAAA	VVVVxx
+151	8896	1	3	1	11	51	151	151	151	151	102	103	VFAAAA	EENAAA	AAAAxx
+972	8897	0	0	2	12	72	972	972	972	972	144	145	KLAAAA	FENAAA	HHHHxx
+6820	8898	0	0	0	0	20	820	820	1820	6820	40	41	ICAAAA	GENAAA	OOOOxx
+7387	8899	1	3	7	7	87	387	1387	2387	7387	174	175	DYAAAA	HENAAA	VVVVxx
+9634	8900	0	2	4	14	34	634	1634	4634	9634	68	69	OGAAAA	IENAAA	AAAAxx
+6308	8901	0	0	8	8	8	308	308	1308	6308	16	17	QIAAAA	JENAAA	HHHHxx
+8323	8902	1	3	3	3	23	323	323	3323	8323	46	47	DIAAAA	KENAAA	OOOOxx
+6672	8903	0	0	2	12	72	672	672	1672	6672	144	145	QWAAAA	LENAAA	VVVVxx
+8283	8904	1	3	3	3	83	283	283	3283	8283	166	167	PGAAAA	MENAAA	AAAAxx
+7996	8905	0	0	6	16	96	996	1996	2996	7996	192	193	OVAAAA	NENAAA	HHHHxx
+6488	8906	0	0	8	8	88	488	488	1488	6488	176	177	OPAAAA	OENAAA	OOOOxx
+2365	8907	1	1	5	5	65	365	365	2365	2365	130	131	ZMAAAA	PENAAA	VVVVxx
+9746	8908	0	2	6	6	46	746	1746	4746	9746	92	93	WKAAAA	QENAAA	AAAAxx
+8605	8909	1	1	5	5	5	605	605	3605	8605	10	11	ZSAAAA	RENAAA	HHHHxx
+3342	8910	0	2	2	2	42	342	1342	3342	3342	84	85	OYAAAA	SENAAA	OOOOxx
+8429	8911	1	1	9	9	29	429	429	3429	8429	58	59	FMAAAA	TENAAA	VVVVxx
+1162	8912	0	2	2	2	62	162	1162	1162	1162	124	125	SSAAAA	UENAAA	AAAAxx
+531	8913	1	3	1	11	31	531	531	531	531	62	63	LUAAAA	VENAAA	HHHHxx
+8408	8914	0	0	8	8	8	408	408	3408	8408	16	17	KLAAAA	WENAAA	OOOOxx
+8862	8915	0	2	2	2	62	862	862	3862	8862	124	125	WCAAAA	XENAAA	VVVVxx
+5843	8916	1	3	3	3	43	843	1843	843	5843	86	87	TQAAAA	YENAAA	AAAAxx
+8704	8917	0	0	4	4	4	704	704	3704	8704	8	9	UWAAAA	ZENAAA	HHHHxx
+7070	8918	0	2	0	10	70	70	1070	2070	7070	140	141	YLAAAA	AFNAAA	OOOOxx
+9119	8919	1	3	9	19	19	119	1119	4119	9119	38	39	TMAAAA	BFNAAA	VVVVxx
+8344	8920	0	0	4	4	44	344	344	3344	8344	88	89	YIAAAA	CFNAAA	AAAAxx
+8979	8921	1	3	9	19	79	979	979	3979	8979	158	159	JHAAAA	DFNAAA	HHHHxx
+2971	8922	1	3	1	11	71	971	971	2971	2971	142	143	HKAAAA	EFNAAA	OOOOxx
+7700	8923	0	0	0	0	0	700	1700	2700	7700	0	1	EKAAAA	FFNAAA	VVVVxx
+8280	8924	0	0	0	0	80	280	280	3280	8280	160	161	MGAAAA	GFNAAA	AAAAxx
+9096	8925	0	0	6	16	96	96	1096	4096	9096	192	193	WLAAAA	HFNAAA	HHHHxx
+99	8926	1	3	9	19	99	99	99	99	99	198	199	VDAAAA	IFNAAA	OOOOxx
+6696	8927	0	0	6	16	96	696	696	1696	6696	192	193	OXAAAA	JFNAAA	VVVVxx
+9490	8928	0	2	0	10	90	490	1490	4490	9490	180	181	ABAAAA	KFNAAA	AAAAxx
+9073	8929	1	1	3	13	73	73	1073	4073	9073	146	147	ZKAAAA	LFNAAA	HHHHxx
+1861	8930	1	1	1	1	61	861	1861	1861	1861	122	123	PTAAAA	MFNAAA	OOOOxx
+4413	8931	1	1	3	13	13	413	413	4413	4413	26	27	TNAAAA	NFNAAA	VVVVxx
+6002	8932	0	2	2	2	2	2	2	1002	6002	4	5	WWAAAA	OFNAAA	AAAAxx
+439	8933	1	3	9	19	39	439	439	439	439	78	79	XQAAAA	PFNAAA	HHHHxx
+5449	8934	1	1	9	9	49	449	1449	449	5449	98	99	PBAAAA	QFNAAA	OOOOxx
+9737	8935	1	1	7	17	37	737	1737	4737	9737	74	75	NKAAAA	RFNAAA	VVVVxx
+1898	8936	0	2	8	18	98	898	1898	1898	1898	196	197	AVAAAA	SFNAAA	AAAAxx
+4189	8937	1	1	9	9	89	189	189	4189	4189	178	179	DFAAAA	TFNAAA	HHHHxx
+1408	8938	0	0	8	8	8	408	1408	1408	1408	16	17	ECAAAA	UFNAAA	OOOOxx
+394	8939	0	2	4	14	94	394	394	394	394	188	189	EPAAAA	VFNAAA	VVVVxx
+1935	8940	1	3	5	15	35	935	1935	1935	1935	70	71	LWAAAA	WFNAAA	AAAAxx
+3965	8941	1	1	5	5	65	965	1965	3965	3965	130	131	NWAAAA	XFNAAA	HHHHxx
+6821	8942	1	1	1	1	21	821	821	1821	6821	42	43	JCAAAA	YFNAAA	OOOOxx
+349	8943	1	1	9	9	49	349	349	349	349	98	99	LNAAAA	ZFNAAA	VVVVxx
+8428	8944	0	0	8	8	28	428	428	3428	8428	56	57	EMAAAA	AGNAAA	AAAAxx
+8200	8945	0	0	0	0	0	200	200	3200	8200	0	1	KDAAAA	BGNAAA	HHHHxx
+1737	8946	1	1	7	17	37	737	1737	1737	1737	74	75	VOAAAA	CGNAAA	OOOOxx
+6516	8947	0	0	6	16	16	516	516	1516	6516	32	33	QQAAAA	DGNAAA	VVVVxx
+5441	8948	1	1	1	1	41	441	1441	441	5441	82	83	HBAAAA	EGNAAA	AAAAxx
+5999	8949	1	3	9	19	99	999	1999	999	5999	198	199	TWAAAA	FGNAAA	HHHHxx
+1539	8950	1	3	9	19	39	539	1539	1539	1539	78	79	FHAAAA	GGNAAA	OOOOxx
+9067	8951	1	3	7	7	67	67	1067	4067	9067	134	135	TKAAAA	HGNAAA	VVVVxx
+4061	8952	1	1	1	1	61	61	61	4061	4061	122	123	FAAAAA	IGNAAA	AAAAxx
+1642	8953	0	2	2	2	42	642	1642	1642	1642	84	85	ELAAAA	JGNAAA	HHHHxx
+4657	8954	1	1	7	17	57	657	657	4657	4657	114	115	DXAAAA	KGNAAA	OOOOxx
+9934	8955	0	2	4	14	34	934	1934	4934	9934	68	69	CSAAAA	LGNAAA	VVVVxx
+6385	8956	1	1	5	5	85	385	385	1385	6385	170	171	PLAAAA	MGNAAA	AAAAxx
+6775	8957	1	3	5	15	75	775	775	1775	6775	150	151	PAAAAA	NGNAAA	HHHHxx
+3873	8958	1	1	3	13	73	873	1873	3873	3873	146	147	ZSAAAA	OGNAAA	OOOOxx
+3862	8959	0	2	2	2	62	862	1862	3862	3862	124	125	OSAAAA	PGNAAA	VVVVxx
+1224	8960	0	0	4	4	24	224	1224	1224	1224	48	49	CVAAAA	QGNAAA	AAAAxx
+4483	8961	1	3	3	3	83	483	483	4483	4483	166	167	LQAAAA	RGNAAA	HHHHxx
+3685	8962	1	1	5	5	85	685	1685	3685	3685	170	171	TLAAAA	SGNAAA	OOOOxx
+6082	8963	0	2	2	2	82	82	82	1082	6082	164	165	YZAAAA	TGNAAA	VVVVxx
+7798	8964	0	2	8	18	98	798	1798	2798	7798	196	197	YNAAAA	UGNAAA	AAAAxx
+9039	8965	1	3	9	19	39	39	1039	4039	9039	78	79	RJAAAA	VGNAAA	HHHHxx
+985	8966	1	1	5	5	85	985	985	985	985	170	171	XLAAAA	WGNAAA	OOOOxx
+5389	8967	1	1	9	9	89	389	1389	389	5389	178	179	HZAAAA	XGNAAA	VVVVxx
+1716	8968	0	0	6	16	16	716	1716	1716	1716	32	33	AOAAAA	YGNAAA	AAAAxx
+4209	8969	1	1	9	9	9	209	209	4209	4209	18	19	XFAAAA	ZGNAAA	HHHHxx
+746	8970	0	2	6	6	46	746	746	746	746	92	93	SCAAAA	AHNAAA	OOOOxx
+6295	8971	1	3	5	15	95	295	295	1295	6295	190	191	DIAAAA	BHNAAA	VVVVxx
+9754	8972	0	2	4	14	54	754	1754	4754	9754	108	109	ELAAAA	CHNAAA	AAAAxx
+2336	8973	0	0	6	16	36	336	336	2336	2336	72	73	WLAAAA	DHNAAA	HHHHxx
+3701	8974	1	1	1	1	1	701	1701	3701	3701	2	3	JMAAAA	EHNAAA	OOOOxx
+3551	8975	1	3	1	11	51	551	1551	3551	3551	102	103	PGAAAA	FHNAAA	VVVVxx
+8516	8976	0	0	6	16	16	516	516	3516	8516	32	33	OPAAAA	GHNAAA	AAAAxx
+9290	8977	0	2	0	10	90	290	1290	4290	9290	180	181	ITAAAA	HHNAAA	HHHHxx
+5686	8978	0	2	6	6	86	686	1686	686	5686	172	173	SKAAAA	IHNAAA	OOOOxx
+2893	8979	1	1	3	13	93	893	893	2893	2893	186	187	HHAAAA	JHNAAA	VVVVxx
+6279	8980	1	3	9	19	79	279	279	1279	6279	158	159	NHAAAA	KHNAAA	AAAAxx
+2278	8981	0	2	8	18	78	278	278	2278	2278	156	157	QJAAAA	LHNAAA	HHHHxx
+1618	8982	0	2	8	18	18	618	1618	1618	1618	36	37	GKAAAA	MHNAAA	OOOOxx
+3450	8983	0	2	0	10	50	450	1450	3450	3450	100	101	SCAAAA	NHNAAA	VVVVxx
+8857	8984	1	1	7	17	57	857	857	3857	8857	114	115	RCAAAA	OHNAAA	AAAAxx
+1005	8985	1	1	5	5	5	5	1005	1005	1005	10	11	RMAAAA	PHNAAA	HHHHxx
+4727	8986	1	3	7	7	27	727	727	4727	4727	54	55	VZAAAA	QHNAAA	OOOOxx
+7617	8987	1	1	7	17	17	617	1617	2617	7617	34	35	ZGAAAA	RHNAAA	VVVVxx
+2021	8988	1	1	1	1	21	21	21	2021	2021	42	43	TZAAAA	SHNAAA	AAAAxx
+9124	8989	0	0	4	4	24	124	1124	4124	9124	48	49	YMAAAA	THNAAA	HHHHxx
+3175	8990	1	3	5	15	75	175	1175	3175	3175	150	151	DSAAAA	UHNAAA	OOOOxx
+2949	8991	1	1	9	9	49	949	949	2949	2949	98	99	LJAAAA	VHNAAA	VVVVxx
+2424	8992	0	0	4	4	24	424	424	2424	2424	48	49	GPAAAA	WHNAAA	AAAAxx
+4791	8993	1	3	1	11	91	791	791	4791	4791	182	183	HCAAAA	XHNAAA	HHHHxx
+7500	8994	0	0	0	0	0	500	1500	2500	7500	0	1	MCAAAA	YHNAAA	OOOOxx
+4893	8995	1	1	3	13	93	893	893	4893	4893	186	187	FGAAAA	ZHNAAA	VVVVxx
+121	8996	1	1	1	1	21	121	121	121	121	42	43	REAAAA	AINAAA	AAAAxx
+1965	8997	1	1	5	5	65	965	1965	1965	1965	130	131	PXAAAA	BINAAA	HHHHxx
+2972	8998	0	0	2	12	72	972	972	2972	2972	144	145	IKAAAA	CINAAA	OOOOxx
+662	8999	0	2	2	2	62	662	662	662	662	124	125	MZAAAA	DINAAA	VVVVxx
+7074	9000	0	2	4	14	74	74	1074	2074	7074	148	149	CMAAAA	EINAAA	AAAAxx
+981	9001	1	1	1	1	81	981	981	981	981	162	163	TLAAAA	FINAAA	HHHHxx
+3520	9002	0	0	0	0	20	520	1520	3520	3520	40	41	KFAAAA	GINAAA	OOOOxx
+6540	9003	0	0	0	0	40	540	540	1540	6540	80	81	ORAAAA	HINAAA	VVVVxx
+6648	9004	0	0	8	8	48	648	648	1648	6648	96	97	SVAAAA	IINAAA	AAAAxx
+7076	9005	0	0	6	16	76	76	1076	2076	7076	152	153	EMAAAA	JINAAA	HHHHxx
+6919	9006	1	3	9	19	19	919	919	1919	6919	38	39	DGAAAA	KINAAA	OOOOxx
+1108	9007	0	0	8	8	8	108	1108	1108	1108	16	17	QQAAAA	LINAAA	VVVVxx
+317	9008	1	1	7	17	17	317	317	317	317	34	35	FMAAAA	MINAAA	AAAAxx
+3483	9009	1	3	3	3	83	483	1483	3483	3483	166	167	ZDAAAA	NINAAA	HHHHxx
+6764	9010	0	0	4	4	64	764	764	1764	6764	128	129	EAAAAA	OINAAA	OOOOxx
+1235	9011	1	3	5	15	35	235	1235	1235	1235	70	71	NVAAAA	PINAAA	VVVVxx
+7121	9012	1	1	1	1	21	121	1121	2121	7121	42	43	XNAAAA	QINAAA	AAAAxx
+426	9013	0	2	6	6	26	426	426	426	426	52	53	KQAAAA	RINAAA	HHHHxx
+6880	9014	0	0	0	0	80	880	880	1880	6880	160	161	QEAAAA	SINAAA	OOOOxx
+5401	9015	1	1	1	1	1	401	1401	401	5401	2	3	TZAAAA	TINAAA	VVVVxx
+7323	9016	1	3	3	3	23	323	1323	2323	7323	46	47	RVAAAA	UINAAA	AAAAxx
+9751	9017	1	3	1	11	51	751	1751	4751	9751	102	103	BLAAAA	VINAAA	HHHHxx
+3436	9018	0	0	6	16	36	436	1436	3436	3436	72	73	ECAAAA	WINAAA	OOOOxx
+7319	9019	1	3	9	19	19	319	1319	2319	7319	38	39	NVAAAA	XINAAA	VVVVxx
+7882	9020	0	2	2	2	82	882	1882	2882	7882	164	165	ERAAAA	YINAAA	AAAAxx
+8260	9021	0	0	0	0	60	260	260	3260	8260	120	121	SFAAAA	ZINAAA	HHHHxx
+9758	9022	0	2	8	18	58	758	1758	4758	9758	116	117	ILAAAA	AJNAAA	OOOOxx
+4205	9023	1	1	5	5	5	205	205	4205	4205	10	11	TFAAAA	BJNAAA	VVVVxx
+8884	9024	0	0	4	4	84	884	884	3884	8884	168	169	SDAAAA	CJNAAA	AAAAxx
+1112	9025	0	0	2	12	12	112	1112	1112	1112	24	25	UQAAAA	DJNAAA	HHHHxx
+2186	9026	0	2	6	6	86	186	186	2186	2186	172	173	CGAAAA	EJNAAA	OOOOxx
+8666	9027	0	2	6	6	66	666	666	3666	8666	132	133	IVAAAA	FJNAAA	VVVVxx
+4325	9028	1	1	5	5	25	325	325	4325	4325	50	51	JKAAAA	GJNAAA	AAAAxx
+4912	9029	0	0	2	12	12	912	912	4912	4912	24	25	YGAAAA	HJNAAA	HHHHxx
+6497	9030	1	1	7	17	97	497	497	1497	6497	194	195	XPAAAA	IJNAAA	OOOOxx
+9072	9031	0	0	2	12	72	72	1072	4072	9072	144	145	YKAAAA	JJNAAA	VVVVxx
+8899	9032	1	3	9	19	99	899	899	3899	8899	198	199	HEAAAA	KJNAAA	AAAAxx
+5619	9033	1	3	9	19	19	619	1619	619	5619	38	39	DIAAAA	LJNAAA	HHHHxx
+4110	9034	0	2	0	10	10	110	110	4110	4110	20	21	CCAAAA	MJNAAA	OOOOxx
+7025	9035	1	1	5	5	25	25	1025	2025	7025	50	51	FKAAAA	NJNAAA	VVVVxx
+5605	9036	1	1	5	5	5	605	1605	605	5605	10	11	PHAAAA	OJNAAA	AAAAxx
+2572	9037	0	0	2	12	72	572	572	2572	2572	144	145	YUAAAA	PJNAAA	HHHHxx
+3895	9038	1	3	5	15	95	895	1895	3895	3895	190	191	VTAAAA	QJNAAA	OOOOxx
+9138	9039	0	2	8	18	38	138	1138	4138	9138	76	77	MNAAAA	RJNAAA	VVVVxx
+4713	9040	1	1	3	13	13	713	713	4713	4713	26	27	HZAAAA	SJNAAA	AAAAxx
+6079	9041	1	3	9	19	79	79	79	1079	6079	158	159	VZAAAA	TJNAAA	HHHHxx
+8898	9042	0	2	8	18	98	898	898	3898	8898	196	197	GEAAAA	UJNAAA	OOOOxx
+2650	9043	0	2	0	10	50	650	650	2650	2650	100	101	YXAAAA	VJNAAA	VVVVxx
+5316	9044	0	0	6	16	16	316	1316	316	5316	32	33	MWAAAA	WJNAAA	AAAAxx
+5133	9045	1	1	3	13	33	133	1133	133	5133	66	67	LPAAAA	XJNAAA	HHHHxx
+2184	9046	0	0	4	4	84	184	184	2184	2184	168	169	AGAAAA	YJNAAA	OOOOxx
+2728	9047	0	0	8	8	28	728	728	2728	2728	56	57	YAAAAA	ZJNAAA	VVVVxx
+6737	9048	1	1	7	17	37	737	737	1737	6737	74	75	DZAAAA	AKNAAA	AAAAxx
+1128	9049	0	0	8	8	28	128	1128	1128	1128	56	57	KRAAAA	BKNAAA	HHHHxx
+9662	9050	0	2	2	2	62	662	1662	4662	9662	124	125	QHAAAA	CKNAAA	OOOOxx
+9384	9051	0	0	4	4	84	384	1384	4384	9384	168	169	YWAAAA	DKNAAA	VVVVxx
+4576	9052	0	0	6	16	76	576	576	4576	4576	152	153	AUAAAA	EKNAAA	AAAAxx
+9613	9053	1	1	3	13	13	613	1613	4613	9613	26	27	TFAAAA	FKNAAA	HHHHxx
+4001	9054	1	1	1	1	1	1	1	4001	4001	2	3	XXAAAA	GKNAAA	OOOOxx
+3628	9055	0	0	8	8	28	628	1628	3628	3628	56	57	OJAAAA	HKNAAA	VVVVxx
+6968	9056	0	0	8	8	68	968	968	1968	6968	136	137	AIAAAA	IKNAAA	AAAAxx
+6491	9057	1	3	1	11	91	491	491	1491	6491	182	183	RPAAAA	JKNAAA	HHHHxx
+1265	9058	1	1	5	5	65	265	1265	1265	1265	130	131	RWAAAA	KKNAAA	OOOOxx
+6128	9059	0	0	8	8	28	128	128	1128	6128	56	57	SBAAAA	LKNAAA	VVVVxx
+4274	9060	0	2	4	14	74	274	274	4274	4274	148	149	KIAAAA	MKNAAA	AAAAxx
+3598	9061	0	2	8	18	98	598	1598	3598	3598	196	197	KIAAAA	NKNAAA	HHHHxx
+7961	9062	1	1	1	1	61	961	1961	2961	7961	122	123	FUAAAA	OKNAAA	OOOOxx
+2643	9063	1	3	3	3	43	643	643	2643	2643	86	87	RXAAAA	PKNAAA	VVVVxx
+4547	9064	1	3	7	7	47	547	547	4547	4547	94	95	XSAAAA	QKNAAA	AAAAxx
+3568	9065	0	0	8	8	68	568	1568	3568	3568	136	137	GHAAAA	RKNAAA	HHHHxx
+8954	9066	0	2	4	14	54	954	954	3954	8954	108	109	KGAAAA	SKNAAA	OOOOxx
+8802	9067	0	2	2	2	2	802	802	3802	8802	4	5	OAAAAA	TKNAAA	VVVVxx
+7829	9068	1	1	9	9	29	829	1829	2829	7829	58	59	DPAAAA	UKNAAA	AAAAxx
+1008	9069	0	0	8	8	8	8	1008	1008	1008	16	17	UMAAAA	VKNAAA	HHHHxx
+3627	9070	1	3	7	7	27	627	1627	3627	3627	54	55	NJAAAA	WKNAAA	OOOOxx
+3999	9071	1	3	9	19	99	999	1999	3999	3999	198	199	VXAAAA	XKNAAA	VVVVxx
+7697	9072	1	1	7	17	97	697	1697	2697	7697	194	195	BKAAAA	YKNAAA	AAAAxx
+9380	9073	0	0	0	0	80	380	1380	4380	9380	160	161	UWAAAA	ZKNAAA	HHHHxx
+2707	9074	1	3	7	7	7	707	707	2707	2707	14	15	DAAAAA	ALNAAA	OOOOxx
+4430	9075	0	2	0	10	30	430	430	4430	4430	60	61	KOAAAA	BLNAAA	VVVVxx
+6440	9076	0	0	0	0	40	440	440	1440	6440	80	81	SNAAAA	CLNAAA	AAAAxx
+9958	9077	0	2	8	18	58	958	1958	4958	9958	116	117	ATAAAA	DLNAAA	HHHHxx
+7592	9078	0	0	2	12	92	592	1592	2592	7592	184	185	AGAAAA	ELNAAA	OOOOxx
+7852	9079	0	0	2	12	52	852	1852	2852	7852	104	105	AQAAAA	FLNAAA	VVVVxx
+9253	9080	1	1	3	13	53	253	1253	4253	9253	106	107	XRAAAA	GLNAAA	AAAAxx
+5910	9081	0	2	0	10	10	910	1910	910	5910	20	21	ITAAAA	HLNAAA	HHHHxx
+7487	9082	1	3	7	7	87	487	1487	2487	7487	174	175	ZBAAAA	ILNAAA	OOOOxx
+6324	9083	0	0	4	4	24	324	324	1324	6324	48	49	GJAAAA	JLNAAA	VVVVxx
+5792	9084	0	0	2	12	92	792	1792	792	5792	184	185	UOAAAA	KLNAAA	AAAAxx
+7390	9085	0	2	0	10	90	390	1390	2390	7390	180	181	GYAAAA	LLNAAA	HHHHxx
+8534	9086	0	2	4	14	34	534	534	3534	8534	68	69	GQAAAA	MLNAAA	OOOOxx
+2690	9087	0	2	0	10	90	690	690	2690	2690	180	181	MZAAAA	NLNAAA	VVVVxx
+3992	9088	0	0	2	12	92	992	1992	3992	3992	184	185	OXAAAA	OLNAAA	AAAAxx
+6928	9089	0	0	8	8	28	928	928	1928	6928	56	57	MGAAAA	PLNAAA	HHHHxx
+7815	9090	1	3	5	15	15	815	1815	2815	7815	30	31	POAAAA	QLNAAA	OOOOxx
+9477	9091	1	1	7	17	77	477	1477	4477	9477	154	155	NAAAAA	RLNAAA	VVVVxx
+497	9092	1	1	7	17	97	497	497	497	497	194	195	DTAAAA	SLNAAA	AAAAxx
+7532	9093	0	0	2	12	32	532	1532	2532	7532	64	65	SDAAAA	TLNAAA	HHHHxx
+9838	9094	0	2	8	18	38	838	1838	4838	9838	76	77	KOAAAA	ULNAAA	OOOOxx
+1557	9095	1	1	7	17	57	557	1557	1557	1557	114	115	XHAAAA	VLNAAA	VVVVxx
+2467	9096	1	3	7	7	67	467	467	2467	2467	134	135	XQAAAA	WLNAAA	AAAAxx
+2367	9097	1	3	7	7	67	367	367	2367	2367	134	135	BNAAAA	XLNAAA	HHHHxx
+5677	9098	1	1	7	17	77	677	1677	677	5677	154	155	JKAAAA	YLNAAA	OOOOxx
+6193	9099	1	1	3	13	93	193	193	1193	6193	186	187	FEAAAA	ZLNAAA	VVVVxx
+7126	9100	0	2	6	6	26	126	1126	2126	7126	52	53	COAAAA	AMNAAA	AAAAxx
+5264	9101	0	0	4	4	64	264	1264	264	5264	128	129	MUAAAA	BMNAAA	HHHHxx
+850	9102	0	2	0	10	50	850	850	850	850	100	101	SGAAAA	CMNAAA	OOOOxx
+4854	9103	0	2	4	14	54	854	854	4854	4854	108	109	SEAAAA	DMNAAA	VVVVxx
+4414	9104	0	2	4	14	14	414	414	4414	4414	28	29	UNAAAA	EMNAAA	AAAAxx
+8971	9105	1	3	1	11	71	971	971	3971	8971	142	143	BHAAAA	FMNAAA	HHHHxx
+9240	9106	0	0	0	0	40	240	1240	4240	9240	80	81	KRAAAA	GMNAAA	OOOOxx
+7341	9107	1	1	1	1	41	341	1341	2341	7341	82	83	JWAAAA	HMNAAA	VVVVxx
+3151	9108	1	3	1	11	51	151	1151	3151	3151	102	103	FRAAAA	IMNAAA	AAAAxx
+1742	9109	0	2	2	2	42	742	1742	1742	1742	84	85	APAAAA	JMNAAA	HHHHxx
+1347	9110	1	3	7	7	47	347	1347	1347	1347	94	95	VZAAAA	KMNAAA	OOOOxx
+9418	9111	0	2	8	18	18	418	1418	4418	9418	36	37	GYAAAA	LMNAAA	VVVVxx
+5452	9112	0	0	2	12	52	452	1452	452	5452	104	105	SBAAAA	MMNAAA	AAAAxx
+8637	9113	1	1	7	17	37	637	637	3637	8637	74	75	FUAAAA	NMNAAA	HHHHxx
+8287	9114	1	3	7	7	87	287	287	3287	8287	174	175	TGAAAA	OMNAAA	OOOOxx
+9865	9115	1	1	5	5	65	865	1865	4865	9865	130	131	LPAAAA	PMNAAA	VVVVxx
+1664	9116	0	0	4	4	64	664	1664	1664	1664	128	129	AMAAAA	QMNAAA	AAAAxx
+9933	9117	1	1	3	13	33	933	1933	4933	9933	66	67	BSAAAA	RMNAAA	HHHHxx
+3416	9118	0	0	6	16	16	416	1416	3416	3416	32	33	KBAAAA	SMNAAA	OOOOxx
+7981	9119	1	1	1	1	81	981	1981	2981	7981	162	163	ZUAAAA	TMNAAA	VVVVxx
+1981	9120	1	1	1	1	81	981	1981	1981	1981	162	163	FYAAAA	UMNAAA	AAAAxx
+441	9121	1	1	1	1	41	441	441	441	441	82	83	ZQAAAA	VMNAAA	HHHHxx
+1380	9122	0	0	0	0	80	380	1380	1380	1380	160	161	CBAAAA	WMNAAA	OOOOxx
+7325	9123	1	1	5	5	25	325	1325	2325	7325	50	51	TVAAAA	XMNAAA	VVVVxx
+5682	9124	0	2	2	2	82	682	1682	682	5682	164	165	OKAAAA	YMNAAA	AAAAxx
+1024	9125	0	0	4	4	24	24	1024	1024	1024	48	49	KNAAAA	ZMNAAA	HHHHxx
+1096	9126	0	0	6	16	96	96	1096	1096	1096	192	193	EQAAAA	ANNAAA	OOOOxx
+4717	9127	1	1	7	17	17	717	717	4717	4717	34	35	LZAAAA	BNNAAA	VVVVxx
+7948	9128	0	0	8	8	48	948	1948	2948	7948	96	97	STAAAA	CNNAAA	AAAAxx
+4074	9129	0	2	4	14	74	74	74	4074	4074	148	149	SAAAAA	DNNAAA	HHHHxx
+211	9130	1	3	1	11	11	211	211	211	211	22	23	DIAAAA	ENNAAA	OOOOxx
+8993	9131	1	1	3	13	93	993	993	3993	8993	186	187	XHAAAA	FNNAAA	VVVVxx
+4509	9132	1	1	9	9	9	509	509	4509	4509	18	19	LRAAAA	GNNAAA	AAAAxx
+823	9133	1	3	3	3	23	823	823	823	823	46	47	RFAAAA	HNNAAA	HHHHxx
+4747	9134	1	3	7	7	47	747	747	4747	4747	94	95	PAAAAA	INNAAA	OOOOxx
+6955	9135	1	3	5	15	55	955	955	1955	6955	110	111	NHAAAA	JNNAAA	VVVVxx
+7922	9136	0	2	2	2	22	922	1922	2922	7922	44	45	SSAAAA	KNNAAA	AAAAxx
+6936	9137	0	0	6	16	36	936	936	1936	6936	72	73	UGAAAA	LNNAAA	HHHHxx
+1546	9138	0	2	6	6	46	546	1546	1546	1546	92	93	MHAAAA	MNNAAA	OOOOxx
+9836	9139	0	0	6	16	36	836	1836	4836	9836	72	73	IOAAAA	NNNAAA	VVVVxx
+5626	9140	0	2	6	6	26	626	1626	626	5626	52	53	KIAAAA	ONNAAA	AAAAxx
+4879	9141	1	3	9	19	79	879	879	4879	4879	158	159	RFAAAA	PNNAAA	HHHHxx
+8590	9142	0	2	0	10	90	590	590	3590	8590	180	181	KSAAAA	QNNAAA	OOOOxx
+8842	9143	0	2	2	2	42	842	842	3842	8842	84	85	CCAAAA	RNNAAA	VVVVxx
+6505	9144	1	1	5	5	5	505	505	1505	6505	10	11	FQAAAA	SNNAAA	AAAAxx
+2803	9145	1	3	3	3	3	803	803	2803	2803	6	7	VDAAAA	TNNAAA	HHHHxx
+9258	9146	0	2	8	18	58	258	1258	4258	9258	116	117	CSAAAA	UNNAAA	OOOOxx
+741	9147	1	1	1	1	41	741	741	741	741	82	83	NCAAAA	VNNAAA	VVVVxx
+1457	9148	1	1	7	17	57	457	1457	1457	1457	114	115	BEAAAA	WNNAAA	AAAAxx
+5777	9149	1	1	7	17	77	777	1777	777	5777	154	155	FOAAAA	XNNAAA	HHHHxx
+2883	9150	1	3	3	3	83	883	883	2883	2883	166	167	XGAAAA	YNNAAA	OOOOxx
+6610	9151	0	2	0	10	10	610	610	1610	6610	20	21	GUAAAA	ZNNAAA	VVVVxx
+4331	9152	1	3	1	11	31	331	331	4331	4331	62	63	PKAAAA	AONAAA	AAAAxx
+2712	9153	0	0	2	12	12	712	712	2712	2712	24	25	IAAAAA	BONAAA	HHHHxx
+9268	9154	0	0	8	8	68	268	1268	4268	9268	136	137	MSAAAA	CONAAA	OOOOxx
+410	9155	0	2	0	10	10	410	410	410	410	20	21	UPAAAA	DONAAA	VVVVxx
+9411	9156	1	3	1	11	11	411	1411	4411	9411	22	23	ZXAAAA	EONAAA	AAAAxx
+4683	9157	1	3	3	3	83	683	683	4683	4683	166	167	DYAAAA	FONAAA	HHHHxx
+7072	9158	0	0	2	12	72	72	1072	2072	7072	144	145	AMAAAA	GONAAA	OOOOxx
+5050	9159	0	2	0	10	50	50	1050	50	5050	100	101	GMAAAA	HONAAA	VVVVxx
+5932	9160	0	0	2	12	32	932	1932	932	5932	64	65	EUAAAA	IONAAA	AAAAxx
+2756	9161	0	0	6	16	56	756	756	2756	2756	112	113	ACAAAA	JONAAA	HHHHxx
+9813	9162	1	1	3	13	13	813	1813	4813	9813	26	27	LNAAAA	KONAAA	OOOOxx
+7388	9163	0	0	8	8	88	388	1388	2388	7388	176	177	EYAAAA	LONAAA	VVVVxx
+2596	9164	0	0	6	16	96	596	596	2596	2596	192	193	WVAAAA	MONAAA	AAAAxx
+5102	9165	0	2	2	2	2	102	1102	102	5102	4	5	GOAAAA	NONAAA	HHHHxx
+208	9166	0	0	8	8	8	208	208	208	208	16	17	AIAAAA	OONAAA	OOOOxx
+86	9167	0	2	6	6	86	86	86	86	86	172	173	IDAAAA	PONAAA	VVVVxx
+8127	9168	1	3	7	7	27	127	127	3127	8127	54	55	PAAAAA	QONAAA	AAAAxx
+5154	9169	0	2	4	14	54	154	1154	154	5154	108	109	GQAAAA	RONAAA	HHHHxx
+4491	9170	1	3	1	11	91	491	491	4491	4491	182	183	TQAAAA	SONAAA	OOOOxx
+7423	9171	1	3	3	3	23	423	1423	2423	7423	46	47	NZAAAA	TONAAA	VVVVxx
+6441	9172	1	1	1	1	41	441	441	1441	6441	82	83	TNAAAA	UONAAA	AAAAxx
+2920	9173	0	0	0	0	20	920	920	2920	2920	40	41	IIAAAA	VONAAA	HHHHxx
+6386	9174	0	2	6	6	86	386	386	1386	6386	172	173	QLAAAA	WONAAA	OOOOxx
+9744	9175	0	0	4	4	44	744	1744	4744	9744	88	89	UKAAAA	XONAAA	VVVVxx
+2667	9176	1	3	7	7	67	667	667	2667	2667	134	135	PYAAAA	YONAAA	AAAAxx
+5754	9177	0	2	4	14	54	754	1754	754	5754	108	109	INAAAA	ZONAAA	HHHHxx
+4645	9178	1	1	5	5	45	645	645	4645	4645	90	91	RWAAAA	APNAAA	OOOOxx
+4327	9179	1	3	7	7	27	327	327	4327	4327	54	55	LKAAAA	BPNAAA	VVVVxx
+843	9180	1	3	3	3	43	843	843	843	843	86	87	LGAAAA	CPNAAA	AAAAxx
+4085	9181	1	1	5	5	85	85	85	4085	4085	170	171	DBAAAA	DPNAAA	HHHHxx
+2849	9182	1	1	9	9	49	849	849	2849	2849	98	99	PFAAAA	EPNAAA	OOOOxx
+5734	9183	0	2	4	14	34	734	1734	734	5734	68	69	OMAAAA	FPNAAA	VVVVxx
+5307	9184	1	3	7	7	7	307	1307	307	5307	14	15	DWAAAA	GPNAAA	AAAAxx
+8433	9185	1	1	3	13	33	433	433	3433	8433	66	67	JMAAAA	HPNAAA	HHHHxx
+3031	9186	1	3	1	11	31	31	1031	3031	3031	62	63	PMAAAA	IPNAAA	OOOOxx
+5714	9187	0	2	4	14	14	714	1714	714	5714	28	29	ULAAAA	JPNAAA	VVVVxx
+5969	9188	1	1	9	9	69	969	1969	969	5969	138	139	PVAAAA	KPNAAA	AAAAxx
+2532	9189	0	0	2	12	32	532	532	2532	2532	64	65	KTAAAA	LPNAAA	HHHHxx
+5219	9190	1	3	9	19	19	219	1219	219	5219	38	39	TSAAAA	MPNAAA	OOOOxx
+7343	9191	1	3	3	3	43	343	1343	2343	7343	86	87	LWAAAA	NPNAAA	VVVVxx
+9089	9192	1	1	9	9	89	89	1089	4089	9089	178	179	PLAAAA	OPNAAA	AAAAxx
+9337	9193	1	1	7	17	37	337	1337	4337	9337	74	75	DVAAAA	PPNAAA	HHHHxx
+5131	9194	1	3	1	11	31	131	1131	131	5131	62	63	JPAAAA	QPNAAA	OOOOxx
+6253	9195	1	1	3	13	53	253	253	1253	6253	106	107	NGAAAA	RPNAAA	VVVVxx
+5140	9196	0	0	0	0	40	140	1140	140	5140	80	81	SPAAAA	SPNAAA	AAAAxx
+2953	9197	1	1	3	13	53	953	953	2953	2953	106	107	PJAAAA	TPNAAA	HHHHxx
+4293	9198	1	1	3	13	93	293	293	4293	4293	186	187	DJAAAA	UPNAAA	OOOOxx
+9974	9199	0	2	4	14	74	974	1974	4974	9974	148	149	QTAAAA	VPNAAA	VVVVxx
+5061	9200	1	1	1	1	61	61	1061	61	5061	122	123	RMAAAA	WPNAAA	AAAAxx
+8570	9201	0	2	0	10	70	570	570	3570	8570	140	141	QRAAAA	XPNAAA	HHHHxx
+9504	9202	0	0	4	4	4	504	1504	4504	9504	8	9	OBAAAA	YPNAAA	OOOOxx
+604	9203	0	0	4	4	4	604	604	604	604	8	9	GXAAAA	ZPNAAA	VVVVxx
+4991	9204	1	3	1	11	91	991	991	4991	4991	182	183	ZJAAAA	AQNAAA	AAAAxx
+880	9205	0	0	0	0	80	880	880	880	880	160	161	WHAAAA	BQNAAA	HHHHxx
+3861	9206	1	1	1	1	61	861	1861	3861	3861	122	123	NSAAAA	CQNAAA	OOOOxx
+8262	9207	0	2	2	2	62	262	262	3262	8262	124	125	UFAAAA	DQNAAA	VVVVxx
+5689	9208	1	1	9	9	89	689	1689	689	5689	178	179	VKAAAA	EQNAAA	AAAAxx
+1793	9209	1	1	3	13	93	793	1793	1793	1793	186	187	ZQAAAA	FQNAAA	HHHHxx
+2661	9210	1	1	1	1	61	661	661	2661	2661	122	123	JYAAAA	GQNAAA	OOOOxx
+7954	9211	0	2	4	14	54	954	1954	2954	7954	108	109	YTAAAA	HQNAAA	VVVVxx
+1874	9212	0	2	4	14	74	874	1874	1874	1874	148	149	CUAAAA	IQNAAA	AAAAxx
+2982	9213	0	2	2	2	82	982	982	2982	2982	164	165	SKAAAA	JQNAAA	HHHHxx
+331	9214	1	3	1	11	31	331	331	331	331	62	63	TMAAAA	KQNAAA	OOOOxx
+5021	9215	1	1	1	1	21	21	1021	21	5021	42	43	DLAAAA	LQNAAA	VVVVxx
+9894	9216	0	2	4	14	94	894	1894	4894	9894	188	189	OQAAAA	MQNAAA	AAAAxx
+7709	9217	1	1	9	9	9	709	1709	2709	7709	18	19	NKAAAA	NQNAAA	HHHHxx
+4980	9218	0	0	0	0	80	980	980	4980	4980	160	161	OJAAAA	OQNAAA	OOOOxx
+8249	9219	1	1	9	9	49	249	249	3249	8249	98	99	HFAAAA	PQNAAA	VVVVxx
+7120	9220	0	0	0	0	20	120	1120	2120	7120	40	41	WNAAAA	QQNAAA	AAAAxx
+7464	9221	0	0	4	4	64	464	1464	2464	7464	128	129	CBAAAA	RQNAAA	HHHHxx
+8086	9222	0	2	6	6	86	86	86	3086	8086	172	173	AZAAAA	SQNAAA	OOOOxx
+3509	9223	1	1	9	9	9	509	1509	3509	3509	18	19	ZEAAAA	TQNAAA	VVVVxx
+3902	9224	0	2	2	2	2	902	1902	3902	3902	4	5	CUAAAA	UQNAAA	AAAAxx
+9907	9225	1	3	7	7	7	907	1907	4907	9907	14	15	BRAAAA	VQNAAA	HHHHxx
+6278	9226	0	2	8	18	78	278	278	1278	6278	156	157	MHAAAA	WQNAAA	OOOOxx
+9316	9227	0	0	6	16	16	316	1316	4316	9316	32	33	IUAAAA	XQNAAA	VVVVxx
+2824	9228	0	0	4	4	24	824	824	2824	2824	48	49	QEAAAA	YQNAAA	AAAAxx
+1558	9229	0	2	8	18	58	558	1558	1558	1558	116	117	YHAAAA	ZQNAAA	HHHHxx
+5436	9230	0	0	6	16	36	436	1436	436	5436	72	73	CBAAAA	ARNAAA	OOOOxx
+1161	9231	1	1	1	1	61	161	1161	1161	1161	122	123	RSAAAA	BRNAAA	VVVVxx
+7569	9232	1	1	9	9	69	569	1569	2569	7569	138	139	DFAAAA	CRNAAA	AAAAxx
+9614	9233	0	2	4	14	14	614	1614	4614	9614	28	29	UFAAAA	DRNAAA	HHHHxx
+6970	9234	0	2	0	10	70	970	970	1970	6970	140	141	CIAAAA	ERNAAA	OOOOxx
+2422	9235	0	2	2	2	22	422	422	2422	2422	44	45	EPAAAA	FRNAAA	VVVVxx
+8860	9236	0	0	0	0	60	860	860	3860	8860	120	121	UCAAAA	GRNAAA	AAAAxx
+9912	9237	0	0	2	12	12	912	1912	4912	9912	24	25	GRAAAA	HRNAAA	HHHHxx
+1109	9238	1	1	9	9	9	109	1109	1109	1109	18	19	RQAAAA	IRNAAA	OOOOxx
+3286	9239	0	2	6	6	86	286	1286	3286	3286	172	173	KWAAAA	JRNAAA	VVVVxx
+2277	9240	1	1	7	17	77	277	277	2277	2277	154	155	PJAAAA	KRNAAA	AAAAxx
+8656	9241	0	0	6	16	56	656	656	3656	8656	112	113	YUAAAA	LRNAAA	HHHHxx
+4656	9242	0	0	6	16	56	656	656	4656	4656	112	113	CXAAAA	MRNAAA	OOOOxx
+6965	9243	1	1	5	5	65	965	965	1965	6965	130	131	XHAAAA	NRNAAA	VVVVxx
+7591	9244	1	3	1	11	91	591	1591	2591	7591	182	183	ZFAAAA	ORNAAA	AAAAxx
+4883	9245	1	3	3	3	83	883	883	4883	4883	166	167	VFAAAA	PRNAAA	HHHHxx
+452	9246	0	0	2	12	52	452	452	452	452	104	105	KRAAAA	QRNAAA	OOOOxx
+4018	9247	0	2	8	18	18	18	18	4018	4018	36	37	OYAAAA	RRNAAA	VVVVxx
+4066	9248	0	2	6	6	66	66	66	4066	4066	132	133	KAAAAA	SRNAAA	AAAAxx
+6480	9249	0	0	0	0	80	480	480	1480	6480	160	161	GPAAAA	TRNAAA	HHHHxx
+8634	9250	0	2	4	14	34	634	634	3634	8634	68	69	CUAAAA	URNAAA	OOOOxx
+9387	9251	1	3	7	7	87	387	1387	4387	9387	174	175	BXAAAA	VRNAAA	VVVVxx
+3476	9252	0	0	6	16	76	476	1476	3476	3476	152	153	SDAAAA	WRNAAA	AAAAxx
+5995	9253	1	3	5	15	95	995	1995	995	5995	190	191	PWAAAA	XRNAAA	HHHHxx
+9677	9254	1	1	7	17	77	677	1677	4677	9677	154	155	FIAAAA	YRNAAA	OOOOxx
+3884	9255	0	0	4	4	84	884	1884	3884	3884	168	169	KTAAAA	ZRNAAA	VVVVxx
+6500	9256	0	0	0	0	0	500	500	1500	6500	0	1	AQAAAA	ASNAAA	AAAAxx
+7972	9257	0	0	2	12	72	972	1972	2972	7972	144	145	QUAAAA	BSNAAA	HHHHxx
+5281	9258	1	1	1	1	81	281	1281	281	5281	162	163	DVAAAA	CSNAAA	OOOOxx
+1288	9259	0	0	8	8	88	288	1288	1288	1288	176	177	OXAAAA	DSNAAA	VVVVxx
+4366	9260	0	2	6	6	66	366	366	4366	4366	132	133	YLAAAA	ESNAAA	AAAAxx
+6557	9261	1	1	7	17	57	557	557	1557	6557	114	115	FSAAAA	FSNAAA	HHHHxx
+7086	9262	0	2	6	6	86	86	1086	2086	7086	172	173	OMAAAA	GSNAAA	OOOOxx
+6588	9263	0	0	8	8	88	588	588	1588	6588	176	177	KTAAAA	HSNAAA	VVVVxx
+9062	9264	0	2	2	2	62	62	1062	4062	9062	124	125	OKAAAA	ISNAAA	AAAAxx
+9230	9265	0	2	0	10	30	230	1230	4230	9230	60	61	ARAAAA	JSNAAA	HHHHxx
+7672	9266	0	0	2	12	72	672	1672	2672	7672	144	145	CJAAAA	KSNAAA	OOOOxx
+5204	9267	0	0	4	4	4	204	1204	204	5204	8	9	ESAAAA	LSNAAA	VVVVxx
+2836	9268	0	0	6	16	36	836	836	2836	2836	72	73	CFAAAA	MSNAAA	AAAAxx
+7165	9269	1	1	5	5	65	165	1165	2165	7165	130	131	PPAAAA	NSNAAA	HHHHxx
+971	9270	1	3	1	11	71	971	971	971	971	142	143	JLAAAA	OSNAAA	OOOOxx
+3851	9271	1	3	1	11	51	851	1851	3851	3851	102	103	DSAAAA	PSNAAA	VVVVxx
+8593	9272	1	1	3	13	93	593	593	3593	8593	186	187	NSAAAA	QSNAAA	AAAAxx
+7742	9273	0	2	2	2	42	742	1742	2742	7742	84	85	ULAAAA	RSNAAA	HHHHxx
+2887	9274	1	3	7	7	87	887	887	2887	2887	174	175	BHAAAA	SSNAAA	OOOOxx
+8479	9275	1	3	9	19	79	479	479	3479	8479	158	159	DOAAAA	TSNAAA	VVVVxx
+9514	9276	0	2	4	14	14	514	1514	4514	9514	28	29	YBAAAA	USNAAA	AAAAxx
+273	9277	1	1	3	13	73	273	273	273	273	146	147	NKAAAA	VSNAAA	HHHHxx
+2938	9278	0	2	8	18	38	938	938	2938	2938	76	77	AJAAAA	WSNAAA	OOOOxx
+9793	9279	1	1	3	13	93	793	1793	4793	9793	186	187	RMAAAA	XSNAAA	VVVVxx
+8050	9280	0	2	0	10	50	50	50	3050	8050	100	101	QXAAAA	YSNAAA	AAAAxx
+6702	9281	0	2	2	2	2	702	702	1702	6702	4	5	UXAAAA	ZSNAAA	HHHHxx
+7290	9282	0	2	0	10	90	290	1290	2290	7290	180	181	KUAAAA	ATNAAA	OOOOxx
+1837	9283	1	1	7	17	37	837	1837	1837	1837	74	75	RSAAAA	BTNAAA	VVVVxx
+3206	9284	0	2	6	6	6	206	1206	3206	3206	12	13	ITAAAA	CTNAAA	AAAAxx
+4925	9285	1	1	5	5	25	925	925	4925	4925	50	51	LHAAAA	DTNAAA	HHHHxx
+5066	9286	0	2	6	6	66	66	1066	66	5066	132	133	WMAAAA	ETNAAA	OOOOxx
+3401	9287	1	1	1	1	1	401	1401	3401	3401	2	3	VAAAAA	FTNAAA	VVVVxx
+3474	9288	0	2	4	14	74	474	1474	3474	3474	148	149	QDAAAA	GTNAAA	AAAAxx
+57	9289	1	1	7	17	57	57	57	57	57	114	115	FCAAAA	HTNAAA	HHHHxx
+2082	9290	0	2	2	2	82	82	82	2082	2082	164	165	CCAAAA	ITNAAA	OOOOxx
+100	9291	0	0	0	0	0	100	100	100	100	0	1	WDAAAA	JTNAAA	VVVVxx
+9665	9292	1	1	5	5	65	665	1665	4665	9665	130	131	THAAAA	KTNAAA	AAAAxx
+8284	9293	0	0	4	4	84	284	284	3284	8284	168	169	QGAAAA	LTNAAA	HHHHxx
+958	9294	0	2	8	18	58	958	958	958	958	116	117	WKAAAA	MTNAAA	OOOOxx
+5282	9295	0	2	2	2	82	282	1282	282	5282	164	165	EVAAAA	NTNAAA	VVVVxx
+4257	9296	1	1	7	17	57	257	257	4257	4257	114	115	THAAAA	OTNAAA	AAAAxx
+3160	9297	0	0	0	0	60	160	1160	3160	3160	120	121	ORAAAA	PTNAAA	HHHHxx
+8449	9298	1	1	9	9	49	449	449	3449	8449	98	99	ZMAAAA	QTNAAA	OOOOxx
+500	9299	0	0	0	0	0	500	500	500	500	0	1	GTAAAA	RTNAAA	VVVVxx
+6432	9300	0	0	2	12	32	432	432	1432	6432	64	65	KNAAAA	STNAAA	AAAAxx
+6220	9301	0	0	0	0	20	220	220	1220	6220	40	41	GFAAAA	TTNAAA	HHHHxx
+7233	9302	1	1	3	13	33	233	1233	2233	7233	66	67	FSAAAA	UTNAAA	OOOOxx
+2723	9303	1	3	3	3	23	723	723	2723	2723	46	47	TAAAAA	VTNAAA	VVVVxx
+1899	9304	1	3	9	19	99	899	1899	1899	1899	198	199	BVAAAA	WTNAAA	AAAAxx
+7158	9305	0	2	8	18	58	158	1158	2158	7158	116	117	IPAAAA	XTNAAA	HHHHxx
+202	9306	0	2	2	2	2	202	202	202	202	4	5	UHAAAA	YTNAAA	OOOOxx
+2286	9307	0	2	6	6	86	286	286	2286	2286	172	173	YJAAAA	ZTNAAA	VVVVxx
+5356	9308	0	0	6	16	56	356	1356	356	5356	112	113	AYAAAA	AUNAAA	AAAAxx
+3809	9309	1	1	9	9	9	809	1809	3809	3809	18	19	NQAAAA	BUNAAA	HHHHxx
+3979	9310	1	3	9	19	79	979	1979	3979	3979	158	159	BXAAAA	CUNAAA	OOOOxx
+8359	9311	1	3	9	19	59	359	359	3359	8359	118	119	NJAAAA	DUNAAA	VVVVxx
+3479	9312	1	3	9	19	79	479	1479	3479	3479	158	159	VDAAAA	EUNAAA	AAAAxx
+4895	9313	1	3	5	15	95	895	895	4895	4895	190	191	HGAAAA	FUNAAA	HHHHxx
+6059	9314	1	3	9	19	59	59	59	1059	6059	118	119	BZAAAA	GUNAAA	OOOOxx
+9560	9315	0	0	0	0	60	560	1560	4560	9560	120	121	SDAAAA	HUNAAA	VVVVxx
+6756	9316	0	0	6	16	56	756	756	1756	6756	112	113	WZAAAA	IUNAAA	AAAAxx
+7504	9317	0	0	4	4	4	504	1504	2504	7504	8	9	QCAAAA	JUNAAA	HHHHxx
+6762	9318	0	2	2	2	62	762	762	1762	6762	124	125	CAAAAA	KUNAAA	OOOOxx
+5304	9319	0	0	4	4	4	304	1304	304	5304	8	9	AWAAAA	LUNAAA	VVVVxx
+9533	9320	1	1	3	13	33	533	1533	4533	9533	66	67	RCAAAA	MUNAAA	AAAAxx
+6649	9321	1	1	9	9	49	649	649	1649	6649	98	99	TVAAAA	NUNAAA	HHHHxx
+38	9322	0	2	8	18	38	38	38	38	38	76	77	MBAAAA	OUNAAA	OOOOxx
+5713	9323	1	1	3	13	13	713	1713	713	5713	26	27	TLAAAA	PUNAAA	VVVVxx
+3000	9324	0	0	0	0	0	0	1000	3000	3000	0	1	KLAAAA	QUNAAA	AAAAxx
+3738	9325	0	2	8	18	38	738	1738	3738	3738	76	77	UNAAAA	RUNAAA	HHHHxx
+3327	9326	1	3	7	7	27	327	1327	3327	3327	54	55	ZXAAAA	SUNAAA	OOOOxx
+3922	9327	0	2	2	2	22	922	1922	3922	3922	44	45	WUAAAA	TUNAAA	VVVVxx
+9245	9328	1	1	5	5	45	245	1245	4245	9245	90	91	PRAAAA	UUNAAA	AAAAxx
+2172	9329	0	0	2	12	72	172	172	2172	2172	144	145	OFAAAA	VUNAAA	HHHHxx
+7128	9330	0	0	8	8	28	128	1128	2128	7128	56	57	EOAAAA	WUNAAA	OOOOxx
+1195	9331	1	3	5	15	95	195	1195	1195	1195	190	191	ZTAAAA	XUNAAA	VVVVxx
+8445	9332	1	1	5	5	45	445	445	3445	8445	90	91	VMAAAA	YUNAAA	AAAAxx
+8638	9333	0	2	8	18	38	638	638	3638	8638	76	77	GUAAAA	ZUNAAA	HHHHxx
+1249	9334	1	1	9	9	49	249	1249	1249	1249	98	99	BWAAAA	AVNAAA	OOOOxx
+8659	9335	1	3	9	19	59	659	659	3659	8659	118	119	BVAAAA	BVNAAA	VVVVxx
+3556	9336	0	0	6	16	56	556	1556	3556	3556	112	113	UGAAAA	CVNAAA	AAAAxx
+3347	9337	1	3	7	7	47	347	1347	3347	3347	94	95	TYAAAA	DVNAAA	HHHHxx
+3260	9338	0	0	0	0	60	260	1260	3260	3260	120	121	KVAAAA	EVNAAA	OOOOxx
+5139	9339	1	3	9	19	39	139	1139	139	5139	78	79	RPAAAA	FVNAAA	VVVVxx
+9991	9340	1	3	1	11	91	991	1991	4991	9991	182	183	HUAAAA	GVNAAA	AAAAxx
+5499	9341	1	3	9	19	99	499	1499	499	5499	198	199	NDAAAA	HVNAAA	HHHHxx
+8082	9342	0	2	2	2	82	82	82	3082	8082	164	165	WYAAAA	IVNAAA	OOOOxx
+1640	9343	0	0	0	0	40	640	1640	1640	1640	80	81	CLAAAA	JVNAAA	VVVVxx
+8726	9344	0	2	6	6	26	726	726	3726	8726	52	53	QXAAAA	KVNAAA	AAAAxx
+2339	9345	1	3	9	19	39	339	339	2339	2339	78	79	ZLAAAA	LVNAAA	HHHHxx
+2601	9346	1	1	1	1	1	601	601	2601	2601	2	3	BWAAAA	MVNAAA	OOOOxx
+9940	9347	0	0	0	0	40	940	1940	4940	9940	80	81	ISAAAA	NVNAAA	VVVVxx
+4185	9348	1	1	5	5	85	185	185	4185	4185	170	171	ZEAAAA	OVNAAA	AAAAxx
+9546	9349	0	2	6	6	46	546	1546	4546	9546	92	93	EDAAAA	PVNAAA	HHHHxx
+5218	9350	0	2	8	18	18	218	1218	218	5218	36	37	SSAAAA	QVNAAA	OOOOxx
+4374	9351	0	2	4	14	74	374	374	4374	4374	148	149	GMAAAA	RVNAAA	VVVVxx
+288	9352	0	0	8	8	88	288	288	288	288	176	177	CLAAAA	SVNAAA	AAAAxx
+7445	9353	1	1	5	5	45	445	1445	2445	7445	90	91	JAAAAA	TVNAAA	HHHHxx
+1710	9354	0	2	0	10	10	710	1710	1710	1710	20	21	UNAAAA	UVNAAA	OOOOxx
+6409	9355	1	1	9	9	9	409	409	1409	6409	18	19	NMAAAA	VVNAAA	VVVVxx
+7982	9356	0	2	2	2	82	982	1982	2982	7982	164	165	AVAAAA	WVNAAA	AAAAxx
+4950	9357	0	2	0	10	50	950	950	4950	4950	100	101	KIAAAA	XVNAAA	HHHHxx
+9242	9358	0	2	2	2	42	242	1242	4242	9242	84	85	MRAAAA	YVNAAA	OOOOxx
+3272	9359	0	0	2	12	72	272	1272	3272	3272	144	145	WVAAAA	ZVNAAA	VVVVxx
+739	9360	1	3	9	19	39	739	739	739	739	78	79	LCAAAA	AWNAAA	AAAAxx
+5526	9361	0	2	6	6	26	526	1526	526	5526	52	53	OEAAAA	BWNAAA	HHHHxx
+8189	9362	1	1	9	9	89	189	189	3189	8189	178	179	ZCAAAA	CWNAAA	OOOOxx
+9106	9363	0	2	6	6	6	106	1106	4106	9106	12	13	GMAAAA	DWNAAA	VVVVxx
+9775	9364	1	3	5	15	75	775	1775	4775	9775	150	151	ZLAAAA	EWNAAA	AAAAxx
+4643	9365	1	3	3	3	43	643	643	4643	4643	86	87	PWAAAA	FWNAAA	HHHHxx
+8396	9366	0	0	6	16	96	396	396	3396	8396	192	193	YKAAAA	GWNAAA	OOOOxx
+3255	9367	1	3	5	15	55	255	1255	3255	3255	110	111	FVAAAA	HWNAAA	VVVVxx
+301	9368	1	1	1	1	1	301	301	301	301	2	3	PLAAAA	IWNAAA	AAAAxx
+6014	9369	0	2	4	14	14	14	14	1014	6014	28	29	IXAAAA	JWNAAA	HHHHxx
+6046	9370	0	2	6	6	46	46	46	1046	6046	92	93	OYAAAA	KWNAAA	OOOOxx
+984	9371	0	0	4	4	84	984	984	984	984	168	169	WLAAAA	LWNAAA	VVVVxx
+2420	9372	0	0	0	0	20	420	420	2420	2420	40	41	CPAAAA	MWNAAA	AAAAxx
+2922	9373	0	2	2	2	22	922	922	2922	2922	44	45	KIAAAA	NWNAAA	HHHHxx
+2317	9374	1	1	7	17	17	317	317	2317	2317	34	35	DLAAAA	OWNAAA	OOOOxx
+7332	9375	0	0	2	12	32	332	1332	2332	7332	64	65	AWAAAA	PWNAAA	VVVVxx
+6451	9376	1	3	1	11	51	451	451	1451	6451	102	103	DOAAAA	QWNAAA	AAAAxx
+2589	9377	1	1	9	9	89	589	589	2589	2589	178	179	PVAAAA	RWNAAA	HHHHxx
+4333	9378	1	1	3	13	33	333	333	4333	4333	66	67	RKAAAA	SWNAAA	OOOOxx
+8650	9379	0	2	0	10	50	650	650	3650	8650	100	101	SUAAAA	TWNAAA	VVVVxx
+6856	9380	0	0	6	16	56	856	856	1856	6856	112	113	SDAAAA	UWNAAA	AAAAxx
+4194	9381	0	2	4	14	94	194	194	4194	4194	188	189	IFAAAA	VWNAAA	HHHHxx
+6246	9382	0	2	6	6	46	246	246	1246	6246	92	93	GGAAAA	WWNAAA	OOOOxx
+4371	9383	1	3	1	11	71	371	371	4371	4371	142	143	DMAAAA	XWNAAA	VVVVxx
+1388	9384	0	0	8	8	88	388	1388	1388	1388	176	177	KBAAAA	YWNAAA	AAAAxx
+1056	9385	0	0	6	16	56	56	1056	1056	1056	112	113	QOAAAA	ZWNAAA	HHHHxx
+6041	9386	1	1	1	1	41	41	41	1041	6041	82	83	JYAAAA	AXNAAA	OOOOxx
+6153	9387	1	1	3	13	53	153	153	1153	6153	106	107	RCAAAA	BXNAAA	VVVVxx
+8450	9388	0	2	0	10	50	450	450	3450	8450	100	101	ANAAAA	CXNAAA	AAAAxx
+3469	9389	1	1	9	9	69	469	1469	3469	3469	138	139	LDAAAA	DXNAAA	HHHHxx
+5226	9390	0	2	6	6	26	226	1226	226	5226	52	53	ATAAAA	EXNAAA	OOOOxx
+8112	9391	0	0	2	12	12	112	112	3112	8112	24	25	AAAAAA	FXNAAA	VVVVxx
+647	9392	1	3	7	7	47	647	647	647	647	94	95	XYAAAA	GXNAAA	AAAAxx
+2567	9393	1	3	7	7	67	567	567	2567	2567	134	135	TUAAAA	HXNAAA	HHHHxx
+9064	9394	0	0	4	4	64	64	1064	4064	9064	128	129	QKAAAA	IXNAAA	OOOOxx
+5161	9395	1	1	1	1	61	161	1161	161	5161	122	123	NQAAAA	JXNAAA	VVVVxx
+5260	9396	0	0	0	0	60	260	1260	260	5260	120	121	IUAAAA	KXNAAA	AAAAxx
+8988	9397	0	0	8	8	88	988	988	3988	8988	176	177	SHAAAA	LXNAAA	HHHHxx
+9678	9398	0	2	8	18	78	678	1678	4678	9678	156	157	GIAAAA	MXNAAA	OOOOxx
+6853	9399	1	1	3	13	53	853	853	1853	6853	106	107	PDAAAA	NXNAAA	VVVVxx
+5294	9400	0	2	4	14	94	294	1294	294	5294	188	189	QVAAAA	OXNAAA	AAAAxx
+9864	9401	0	0	4	4	64	864	1864	4864	9864	128	129	KPAAAA	PXNAAA	HHHHxx
+8702	9402	0	2	2	2	2	702	702	3702	8702	4	5	SWAAAA	QXNAAA	OOOOxx
+1132	9403	0	0	2	12	32	132	1132	1132	1132	64	65	ORAAAA	RXNAAA	VVVVxx
+1524	9404	0	0	4	4	24	524	1524	1524	1524	48	49	QGAAAA	SXNAAA	AAAAxx
+4560	9405	0	0	0	0	60	560	560	4560	4560	120	121	KTAAAA	TXNAAA	HHHHxx
+2137	9406	1	1	7	17	37	137	137	2137	2137	74	75	FEAAAA	UXNAAA	OOOOxx
+3283	9407	1	3	3	3	83	283	1283	3283	3283	166	167	HWAAAA	VXNAAA	VVVVxx
+3377	9408	1	1	7	17	77	377	1377	3377	3377	154	155	XZAAAA	WXNAAA	AAAAxx
+2267	9409	1	3	7	7	67	267	267	2267	2267	134	135	FJAAAA	XXNAAA	HHHHxx
+8987	9410	1	3	7	7	87	987	987	3987	8987	174	175	RHAAAA	YXNAAA	OOOOxx
+6709	9411	1	1	9	9	9	709	709	1709	6709	18	19	BYAAAA	ZXNAAA	VVVVxx
+8059	9412	1	3	9	19	59	59	59	3059	8059	118	119	ZXAAAA	AYNAAA	AAAAxx
+3402	9413	0	2	2	2	2	402	1402	3402	3402	4	5	WAAAAA	BYNAAA	HHHHxx
+6443	9414	1	3	3	3	43	443	443	1443	6443	86	87	VNAAAA	CYNAAA	OOOOxx
+8858	9415	0	2	8	18	58	858	858	3858	8858	116	117	SCAAAA	DYNAAA	VVVVxx
+3974	9416	0	2	4	14	74	974	1974	3974	3974	148	149	WWAAAA	EYNAAA	AAAAxx
+3521	9417	1	1	1	1	21	521	1521	3521	3521	42	43	LFAAAA	FYNAAA	HHHHxx
+9509	9418	1	1	9	9	9	509	1509	4509	9509	18	19	TBAAAA	GYNAAA	OOOOxx
+5442	9419	0	2	2	2	42	442	1442	442	5442	84	85	IBAAAA	HYNAAA	VVVVxx
+8968	9420	0	0	8	8	68	968	968	3968	8968	136	137	YGAAAA	IYNAAA	AAAAxx
+333	9421	1	1	3	13	33	333	333	333	333	66	67	VMAAAA	JYNAAA	HHHHxx
+952	9422	0	0	2	12	52	952	952	952	952	104	105	QKAAAA	KYNAAA	OOOOxx
+7482	9423	0	2	2	2	82	482	1482	2482	7482	164	165	UBAAAA	LYNAAA	VVVVxx
+1486	9424	0	2	6	6	86	486	1486	1486	1486	172	173	EFAAAA	MYNAAA	AAAAxx
+1815	9425	1	3	5	15	15	815	1815	1815	1815	30	31	VRAAAA	NYNAAA	HHHHxx
+7937	9426	1	1	7	17	37	937	1937	2937	7937	74	75	HTAAAA	OYNAAA	OOOOxx
+1436	9427	0	0	6	16	36	436	1436	1436	1436	72	73	GDAAAA	PYNAAA	VVVVxx
+3470	9428	0	2	0	10	70	470	1470	3470	3470	140	141	MDAAAA	QYNAAA	AAAAxx
+8195	9429	1	3	5	15	95	195	195	3195	8195	190	191	FDAAAA	RYNAAA	HHHHxx
+6906	9430	0	2	6	6	6	906	906	1906	6906	12	13	QFAAAA	SYNAAA	OOOOxx
+2539	9431	1	3	9	19	39	539	539	2539	2539	78	79	RTAAAA	TYNAAA	VVVVxx
+5988	9432	0	0	8	8	88	988	1988	988	5988	176	177	IWAAAA	UYNAAA	AAAAxx
+8908	9433	0	0	8	8	8	908	908	3908	8908	16	17	QEAAAA	VYNAAA	HHHHxx
+2319	9434	1	3	9	19	19	319	319	2319	2319	38	39	FLAAAA	WYNAAA	OOOOxx
+3263	9435	1	3	3	3	63	263	1263	3263	3263	126	127	NVAAAA	XYNAAA	VVVVxx
+4039	9436	1	3	9	19	39	39	39	4039	4039	78	79	JZAAAA	YYNAAA	AAAAxx
+6373	9437	1	1	3	13	73	373	373	1373	6373	146	147	DLAAAA	ZYNAAA	HHHHxx
+1168	9438	0	0	8	8	68	168	1168	1168	1168	136	137	YSAAAA	AZNAAA	OOOOxx
+8338	9439	0	2	8	18	38	338	338	3338	8338	76	77	SIAAAA	BZNAAA	VVVVxx
+1172	9440	0	0	2	12	72	172	1172	1172	1172	144	145	CTAAAA	CZNAAA	AAAAxx
+200	9441	0	0	0	0	0	200	200	200	200	0	1	SHAAAA	DZNAAA	HHHHxx
+6355	9442	1	3	5	15	55	355	355	1355	6355	110	111	LKAAAA	EZNAAA	OOOOxx
+7768	9443	0	0	8	8	68	768	1768	2768	7768	136	137	UMAAAA	FZNAAA	VVVVxx
+25	9444	1	1	5	5	25	25	25	25	25	50	51	ZAAAAA	GZNAAA	AAAAxx
+7144	9445	0	0	4	4	44	144	1144	2144	7144	88	89	UOAAAA	HZNAAA	HHHHxx
+8671	9446	1	3	1	11	71	671	671	3671	8671	142	143	NVAAAA	IZNAAA	OOOOxx
+9163	9447	1	3	3	3	63	163	1163	4163	9163	126	127	LOAAAA	JZNAAA	VVVVxx
+8889	9448	1	1	9	9	89	889	889	3889	8889	178	179	XDAAAA	KZNAAA	AAAAxx
+5950	9449	0	2	0	10	50	950	1950	950	5950	100	101	WUAAAA	LZNAAA	HHHHxx
+6163	9450	1	3	3	3	63	163	163	1163	6163	126	127	BDAAAA	MZNAAA	OOOOxx
+8119	9451	1	3	9	19	19	119	119	3119	8119	38	39	HAAAAA	NZNAAA	VVVVxx
+1416	9452	0	0	6	16	16	416	1416	1416	1416	32	33	MCAAAA	OZNAAA	AAAAxx
+4132	9453	0	0	2	12	32	132	132	4132	4132	64	65	YCAAAA	PZNAAA	HHHHxx
+2294	9454	0	2	4	14	94	294	294	2294	2294	188	189	GKAAAA	QZNAAA	OOOOxx
+9094	9455	0	2	4	14	94	94	1094	4094	9094	188	189	ULAAAA	RZNAAA	VVVVxx
+4168	9456	0	0	8	8	68	168	168	4168	4168	136	137	IEAAAA	SZNAAA	AAAAxx
+9108	9457	0	0	8	8	8	108	1108	4108	9108	16	17	IMAAAA	TZNAAA	HHHHxx
+5706	9458	0	2	6	6	6	706	1706	706	5706	12	13	MLAAAA	UZNAAA	OOOOxx
+2231	9459	1	3	1	11	31	231	231	2231	2231	62	63	VHAAAA	VZNAAA	VVVVxx
+2173	9460	1	1	3	13	73	173	173	2173	2173	146	147	PFAAAA	WZNAAA	AAAAxx
+90	9461	0	2	0	10	90	90	90	90	90	180	181	MDAAAA	XZNAAA	HHHHxx
+9996	9462	0	0	6	16	96	996	1996	4996	9996	192	193	MUAAAA	YZNAAA	OOOOxx
+330	9463	0	2	0	10	30	330	330	330	330	60	61	SMAAAA	ZZNAAA	VVVVxx
+2052	9464	0	0	2	12	52	52	52	2052	2052	104	105	YAAAAA	AAOAAA	AAAAxx
+1093	9465	1	1	3	13	93	93	1093	1093	1093	186	187	BQAAAA	BAOAAA	HHHHxx
+5817	9466	1	1	7	17	17	817	1817	817	5817	34	35	TPAAAA	CAOAAA	OOOOxx
+1559	9467	1	3	9	19	59	559	1559	1559	1559	118	119	ZHAAAA	DAOAAA	VVVVxx
+8405	9468	1	1	5	5	5	405	405	3405	8405	10	11	HLAAAA	EAOAAA	AAAAxx
+9962	9469	0	2	2	2	62	962	1962	4962	9962	124	125	ETAAAA	FAOAAA	HHHHxx
+9461	9470	1	1	1	1	61	461	1461	4461	9461	122	123	XZAAAA	GAOAAA	OOOOxx
+3028	9471	0	0	8	8	28	28	1028	3028	3028	56	57	MMAAAA	HAOAAA	VVVVxx
+6814	9472	0	2	4	14	14	814	814	1814	6814	28	29	CCAAAA	IAOAAA	AAAAxx
+9587	9473	1	3	7	7	87	587	1587	4587	9587	174	175	TEAAAA	JAOAAA	HHHHxx
+6863	9474	1	3	3	3	63	863	863	1863	6863	126	127	ZDAAAA	KAOAAA	OOOOxx
+4963	9475	1	3	3	3	63	963	963	4963	4963	126	127	XIAAAA	LAOAAA	VVVVxx
+7811	9476	1	3	1	11	11	811	1811	2811	7811	22	23	LOAAAA	MAOAAA	AAAAxx
+7608	9477	0	0	8	8	8	608	1608	2608	7608	16	17	QGAAAA	NAOAAA	HHHHxx
+5321	9478	1	1	1	1	21	321	1321	321	5321	42	43	RWAAAA	OAOAAA	OOOOxx
+9971	9479	1	3	1	11	71	971	1971	4971	9971	142	143	NTAAAA	PAOAAA	VVVVxx
+6161	9480	1	1	1	1	61	161	161	1161	6161	122	123	ZCAAAA	QAOAAA	AAAAxx
+2181	9481	1	1	1	1	81	181	181	2181	2181	162	163	XFAAAA	RAOAAA	HHHHxx
+3828	9482	0	0	8	8	28	828	1828	3828	3828	56	57	GRAAAA	SAOAAA	OOOOxx
+348	9483	0	0	8	8	48	348	348	348	348	96	97	KNAAAA	TAOAAA	VVVVxx
+5459	9484	1	3	9	19	59	459	1459	459	5459	118	119	ZBAAAA	UAOAAA	AAAAxx
+9406	9485	0	2	6	6	6	406	1406	4406	9406	12	13	UXAAAA	VAOAAA	HHHHxx
+9852	9486	0	0	2	12	52	852	1852	4852	9852	104	105	YOAAAA	WAOAAA	OOOOxx
+3095	9487	1	3	5	15	95	95	1095	3095	3095	190	191	BPAAAA	XAOAAA	VVVVxx
+5597	9488	1	1	7	17	97	597	1597	597	5597	194	195	HHAAAA	YAOAAA	AAAAxx
+8841	9489	1	1	1	1	41	841	841	3841	8841	82	83	BCAAAA	ZAOAAA	HHHHxx
+3536	9490	0	0	6	16	36	536	1536	3536	3536	72	73	AGAAAA	ABOAAA	OOOOxx
+4009	9491	1	1	9	9	9	9	9	4009	4009	18	19	FYAAAA	BBOAAA	VVVVxx
+7366	9492	0	2	6	6	66	366	1366	2366	7366	132	133	IXAAAA	CBOAAA	AAAAxx
+7327	9493	1	3	7	7	27	327	1327	2327	7327	54	55	VVAAAA	DBOAAA	HHHHxx
+1613	9494	1	1	3	13	13	613	1613	1613	1613	26	27	BKAAAA	EBOAAA	OOOOxx
+8619	9495	1	3	9	19	19	619	619	3619	8619	38	39	NTAAAA	FBOAAA	VVVVxx
+4880	9496	0	0	0	0	80	880	880	4880	4880	160	161	SFAAAA	GBOAAA	AAAAxx
+1552	9497	0	0	2	12	52	552	1552	1552	1552	104	105	SHAAAA	HBOAAA	HHHHxx
+7636	9498	0	0	6	16	36	636	1636	2636	7636	72	73	SHAAAA	IBOAAA	OOOOxx
+8397	9499	1	1	7	17	97	397	397	3397	8397	194	195	ZKAAAA	JBOAAA	VVVVxx
+6224	9500	0	0	4	4	24	224	224	1224	6224	48	49	KFAAAA	KBOAAA	AAAAxx
+9102	9501	0	2	2	2	2	102	1102	4102	9102	4	5	CMAAAA	LBOAAA	HHHHxx
+7906	9502	0	2	6	6	6	906	1906	2906	7906	12	13	CSAAAA	MBOAAA	OOOOxx
+9467	9503	1	3	7	7	67	467	1467	4467	9467	134	135	DAAAAA	NBOAAA	VVVVxx
+828	9504	0	0	8	8	28	828	828	828	828	56	57	WFAAAA	OBOAAA	AAAAxx
+9585	9505	1	1	5	5	85	585	1585	4585	9585	170	171	REAAAA	PBOAAA	HHHHxx
+925	9506	1	1	5	5	25	925	925	925	925	50	51	PJAAAA	QBOAAA	OOOOxx
+7375	9507	1	3	5	15	75	375	1375	2375	7375	150	151	RXAAAA	RBOAAA	VVVVxx
+4027	9508	1	3	7	7	27	27	27	4027	4027	54	55	XYAAAA	SBOAAA	AAAAxx
+766	9509	0	2	6	6	66	766	766	766	766	132	133	MDAAAA	TBOAAA	HHHHxx
+5633	9510	1	1	3	13	33	633	1633	633	5633	66	67	RIAAAA	UBOAAA	OOOOxx
+5648	9511	0	0	8	8	48	648	1648	648	5648	96	97	GJAAAA	VBOAAA	VVVVxx
+148	9512	0	0	8	8	48	148	148	148	148	96	97	SFAAAA	WBOAAA	AAAAxx
+2072	9513	0	0	2	12	72	72	72	2072	2072	144	145	SBAAAA	XBOAAA	HHHHxx
+431	9514	1	3	1	11	31	431	431	431	431	62	63	PQAAAA	YBOAAA	OOOOxx
+1711	9515	1	3	1	11	11	711	1711	1711	1711	22	23	VNAAAA	ZBOAAA	VVVVxx
+9378	9516	0	2	8	18	78	378	1378	4378	9378	156	157	SWAAAA	ACOAAA	AAAAxx
+6776	9517	0	0	6	16	76	776	776	1776	6776	152	153	QAAAAA	BCOAAA	HHHHxx
+6842	9518	0	2	2	2	42	842	842	1842	6842	84	85	EDAAAA	CCOAAA	OOOOxx
+2656	9519	0	0	6	16	56	656	656	2656	2656	112	113	EYAAAA	DCOAAA	VVVVxx
+3116	9520	0	0	6	16	16	116	1116	3116	3116	32	33	WPAAAA	ECOAAA	AAAAxx
+7904	9521	0	0	4	4	4	904	1904	2904	7904	8	9	ASAAAA	FCOAAA	HHHHxx
+3529	9522	1	1	9	9	29	529	1529	3529	3529	58	59	TFAAAA	GCOAAA	OOOOxx
+3240	9523	0	0	0	0	40	240	1240	3240	3240	80	81	QUAAAA	HCOAAA	VVVVxx
+5801	9524	1	1	1	1	1	801	1801	801	5801	2	3	DPAAAA	ICOAAA	AAAAxx
+4090	9525	0	2	0	10	90	90	90	4090	4090	180	181	IBAAAA	JCOAAA	HHHHxx
+7687	9526	1	3	7	7	87	687	1687	2687	7687	174	175	RJAAAA	KCOAAA	OOOOxx
+9711	9527	1	3	1	11	11	711	1711	4711	9711	22	23	NJAAAA	LCOAAA	VVVVxx
+4760	9528	0	0	0	0	60	760	760	4760	4760	120	121	CBAAAA	MCOAAA	AAAAxx
+5524	9529	0	0	4	4	24	524	1524	524	5524	48	49	MEAAAA	NCOAAA	HHHHxx
+2251	9530	1	3	1	11	51	251	251	2251	2251	102	103	PIAAAA	OCOAAA	OOOOxx
+1511	9531	1	3	1	11	11	511	1511	1511	1511	22	23	DGAAAA	PCOAAA	VVVVxx
+5991	9532	1	3	1	11	91	991	1991	991	5991	182	183	LWAAAA	QCOAAA	AAAAxx
+7808	9533	0	0	8	8	8	808	1808	2808	7808	16	17	IOAAAA	RCOAAA	HHHHxx
+8708	9534	0	0	8	8	8	708	708	3708	8708	16	17	YWAAAA	SCOAAA	OOOOxx
+8939	9535	1	3	9	19	39	939	939	3939	8939	78	79	VFAAAA	TCOAAA	VVVVxx
+4295	9536	1	3	5	15	95	295	295	4295	4295	190	191	FJAAAA	UCOAAA	AAAAxx
+5905	9537	1	1	5	5	5	905	1905	905	5905	10	11	DTAAAA	VCOAAA	HHHHxx
+2649	9538	1	1	9	9	49	649	649	2649	2649	98	99	XXAAAA	WCOAAA	OOOOxx
+2347	9539	1	3	7	7	47	347	347	2347	2347	94	95	HMAAAA	XCOAAA	VVVVxx
+6339	9540	1	3	9	19	39	339	339	1339	6339	78	79	VJAAAA	YCOAAA	AAAAxx
+292	9541	0	0	2	12	92	292	292	292	292	184	185	GLAAAA	ZCOAAA	HHHHxx
+9314	9542	0	2	4	14	14	314	1314	4314	9314	28	29	GUAAAA	ADOAAA	OOOOxx
+6893	9543	1	1	3	13	93	893	893	1893	6893	186	187	DFAAAA	BDOAAA	VVVVxx
+3970	9544	0	2	0	10	70	970	1970	3970	3970	140	141	SWAAAA	CDOAAA	AAAAxx
+1652	9545	0	0	2	12	52	652	1652	1652	1652	104	105	OLAAAA	DDOAAA	HHHHxx
+4326	9546	0	2	6	6	26	326	326	4326	4326	52	53	KKAAAA	EDOAAA	OOOOxx
+7881	9547	1	1	1	1	81	881	1881	2881	7881	162	163	DRAAAA	FDOAAA	VVVVxx
+5291	9548	1	3	1	11	91	291	1291	291	5291	182	183	NVAAAA	GDOAAA	AAAAxx
+957	9549	1	1	7	17	57	957	957	957	957	114	115	VKAAAA	HDOAAA	HHHHxx
+2313	9550	1	1	3	13	13	313	313	2313	2313	26	27	ZKAAAA	IDOAAA	OOOOxx
+5463	9551	1	3	3	3	63	463	1463	463	5463	126	127	DCAAAA	JDOAAA	VVVVxx
+1268	9552	0	0	8	8	68	268	1268	1268	1268	136	137	UWAAAA	KDOAAA	AAAAxx
+5028	9553	0	0	8	8	28	28	1028	28	5028	56	57	KLAAAA	LDOAAA	HHHHxx
+656	9554	0	0	6	16	56	656	656	656	656	112	113	GZAAAA	MDOAAA	OOOOxx
+9274	9555	0	2	4	14	74	274	1274	4274	9274	148	149	SSAAAA	NDOAAA	VVVVxx
+8217	9556	1	1	7	17	17	217	217	3217	8217	34	35	BEAAAA	ODOAAA	AAAAxx
+2175	9557	1	3	5	15	75	175	175	2175	2175	150	151	RFAAAA	PDOAAA	HHHHxx
+6028	9558	0	0	8	8	28	28	28	1028	6028	56	57	WXAAAA	QDOAAA	OOOOxx
+7584	9559	0	0	4	4	84	584	1584	2584	7584	168	169	SFAAAA	RDOAAA	VVVVxx
+4114	9560	0	2	4	14	14	114	114	4114	4114	28	29	GCAAAA	SDOAAA	AAAAxx
+8894	9561	0	2	4	14	94	894	894	3894	8894	188	189	CEAAAA	TDOAAA	HHHHxx
+781	9562	1	1	1	1	81	781	781	781	781	162	163	BEAAAA	UDOAAA	OOOOxx
+133	9563	1	1	3	13	33	133	133	133	133	66	67	DFAAAA	VDOAAA	VVVVxx
+7572	9564	0	0	2	12	72	572	1572	2572	7572	144	145	GFAAAA	WDOAAA	AAAAxx
+8514	9565	0	2	4	14	14	514	514	3514	8514	28	29	MPAAAA	XDOAAA	HHHHxx
+3352	9566	0	0	2	12	52	352	1352	3352	3352	104	105	YYAAAA	YDOAAA	OOOOxx
+8098	9567	0	2	8	18	98	98	98	3098	8098	196	197	MZAAAA	ZDOAAA	VVVVxx
+9116	9568	0	0	6	16	16	116	1116	4116	9116	32	33	QMAAAA	AEOAAA	AAAAxx
+9444	9569	0	0	4	4	44	444	1444	4444	9444	88	89	GZAAAA	BEOAAA	HHHHxx
+2590	9570	0	2	0	10	90	590	590	2590	2590	180	181	QVAAAA	CEOAAA	OOOOxx
+7302	9571	0	2	2	2	2	302	1302	2302	7302	4	5	WUAAAA	DEOAAA	VVVVxx
+7444	9572	0	0	4	4	44	444	1444	2444	7444	88	89	IAAAAA	EEOAAA	AAAAxx
+8748	9573	0	0	8	8	48	748	748	3748	8748	96	97	MYAAAA	FEOAAA	HHHHxx
+7615	9574	1	3	5	15	15	615	1615	2615	7615	30	31	XGAAAA	GEOAAA	OOOOxx
+6090	9575	0	2	0	10	90	90	90	1090	6090	180	181	GAAAAA	HEOAAA	VVVVxx
+1529	9576	1	1	9	9	29	529	1529	1529	1529	58	59	VGAAAA	IEOAAA	AAAAxx
+9398	9577	0	2	8	18	98	398	1398	4398	9398	196	197	MXAAAA	JEOAAA	HHHHxx
+6114	9578	0	2	4	14	14	114	114	1114	6114	28	29	EBAAAA	KEOAAA	OOOOxx
+2736	9579	0	0	6	16	36	736	736	2736	2736	72	73	GBAAAA	LEOAAA	VVVVxx
+468	9580	0	0	8	8	68	468	468	468	468	136	137	ASAAAA	MEOAAA	AAAAxx
+1487	9581	1	3	7	7	87	487	1487	1487	1487	174	175	FFAAAA	NEOAAA	HHHHxx
+4784	9582	0	0	4	4	84	784	784	4784	4784	168	169	ACAAAA	OEOAAA	OOOOxx
+6731	9583	1	3	1	11	31	731	731	1731	6731	62	63	XYAAAA	PEOAAA	VVVVxx
+3328	9584	0	0	8	8	28	328	1328	3328	3328	56	57	AYAAAA	QEOAAA	AAAAxx
+6891	9585	1	3	1	11	91	891	891	1891	6891	182	183	BFAAAA	REOAAA	HHHHxx
+8039	9586	1	3	9	19	39	39	39	3039	8039	78	79	FXAAAA	SEOAAA	OOOOxx
+4064	9587	0	0	4	4	64	64	64	4064	4064	128	129	IAAAAA	TEOAAA	VVVVxx
+542	9588	0	2	2	2	42	542	542	542	542	84	85	WUAAAA	UEOAAA	AAAAxx
+1039	9589	1	3	9	19	39	39	1039	1039	1039	78	79	ZNAAAA	VEOAAA	HHHHxx
+5603	9590	1	3	3	3	3	603	1603	603	5603	6	7	NHAAAA	WEOAAA	OOOOxx
+6641	9591	1	1	1	1	41	641	641	1641	6641	82	83	LVAAAA	XEOAAA	VVVVxx
+6307	9592	1	3	7	7	7	307	307	1307	6307	14	15	PIAAAA	YEOAAA	AAAAxx
+5354	9593	0	2	4	14	54	354	1354	354	5354	108	109	YXAAAA	ZEOAAA	HHHHxx
+7878	9594	0	2	8	18	78	878	1878	2878	7878	156	157	ARAAAA	AFOAAA	OOOOxx
+6391	9595	1	3	1	11	91	391	391	1391	6391	182	183	VLAAAA	BFOAAA	VVVVxx
+4575	9596	1	3	5	15	75	575	575	4575	4575	150	151	ZTAAAA	CFOAAA	AAAAxx
+6644	9597	0	0	4	4	44	644	644	1644	6644	88	89	OVAAAA	DFOAAA	HHHHxx
+5207	9598	1	3	7	7	7	207	1207	207	5207	14	15	HSAAAA	EFOAAA	OOOOxx
+1736	9599	0	0	6	16	36	736	1736	1736	1736	72	73	UOAAAA	FFOAAA	VVVVxx
+3547	9600	1	3	7	7	47	547	1547	3547	3547	94	95	LGAAAA	GFOAAA	AAAAxx
+6647	9601	1	3	7	7	47	647	647	1647	6647	94	95	RVAAAA	HFOAAA	HHHHxx
+4107	9602	1	3	7	7	7	107	107	4107	4107	14	15	ZBAAAA	IFOAAA	OOOOxx
+8125	9603	1	1	5	5	25	125	125	3125	8125	50	51	NAAAAA	JFOAAA	VVVVxx
+9223	9604	1	3	3	3	23	223	1223	4223	9223	46	47	TQAAAA	KFOAAA	AAAAxx
+6903	9605	1	3	3	3	3	903	903	1903	6903	6	7	NFAAAA	LFOAAA	HHHHxx
+3639	9606	1	3	9	19	39	639	1639	3639	3639	78	79	ZJAAAA	MFOAAA	OOOOxx
+9606	9607	0	2	6	6	6	606	1606	4606	9606	12	13	MFAAAA	NFOAAA	VVVVxx
+3232	9608	0	0	2	12	32	232	1232	3232	3232	64	65	IUAAAA	OFOAAA	AAAAxx
+2063	9609	1	3	3	3	63	63	63	2063	2063	126	127	JBAAAA	PFOAAA	HHHHxx
+3731	9610	1	3	1	11	31	731	1731	3731	3731	62	63	NNAAAA	QFOAAA	OOOOxx
+2558	9611	0	2	8	18	58	558	558	2558	2558	116	117	KUAAAA	RFOAAA	VVVVxx
+2357	9612	1	1	7	17	57	357	357	2357	2357	114	115	RMAAAA	SFOAAA	AAAAxx
+6008	9613	0	0	8	8	8	8	8	1008	6008	16	17	CXAAAA	TFOAAA	HHHHxx
+8246	9614	0	2	6	6	46	246	246	3246	8246	92	93	EFAAAA	UFOAAA	OOOOxx
+8220	9615	0	0	0	0	20	220	220	3220	8220	40	41	EEAAAA	VFOAAA	VVVVxx
+1075	9616	1	3	5	15	75	75	1075	1075	1075	150	151	JPAAAA	WFOAAA	AAAAxx
+2410	9617	0	2	0	10	10	410	410	2410	2410	20	21	SOAAAA	XFOAAA	HHHHxx
+3253	9618	1	1	3	13	53	253	1253	3253	3253	106	107	DVAAAA	YFOAAA	OOOOxx
+4370	9619	0	2	0	10	70	370	370	4370	4370	140	141	CMAAAA	ZFOAAA	VVVVxx
+8426	9620	0	2	6	6	26	426	426	3426	8426	52	53	CMAAAA	AGOAAA	AAAAxx
+2262	9621	0	2	2	2	62	262	262	2262	2262	124	125	AJAAAA	BGOAAA	HHHHxx
+4149	9622	1	1	9	9	49	149	149	4149	4149	98	99	PDAAAA	CGOAAA	OOOOxx
+2732	9623	0	0	2	12	32	732	732	2732	2732	64	65	CBAAAA	DGOAAA	VVVVxx
+8606	9624	0	2	6	6	6	606	606	3606	8606	12	13	ATAAAA	EGOAAA	AAAAxx
+6311	9625	1	3	1	11	11	311	311	1311	6311	22	23	TIAAAA	FGOAAA	HHHHxx
+7223	9626	1	3	3	3	23	223	1223	2223	7223	46	47	VRAAAA	GGOAAA	OOOOxx
+3054	9627	0	2	4	14	54	54	1054	3054	3054	108	109	MNAAAA	HGOAAA	VVVVxx
+3952	9628	0	0	2	12	52	952	1952	3952	3952	104	105	AWAAAA	IGOAAA	AAAAxx
+8252	9629	0	0	2	12	52	252	252	3252	8252	104	105	KFAAAA	JGOAAA	HHHHxx
+6020	9630	0	0	0	0	20	20	20	1020	6020	40	41	OXAAAA	KGOAAA	OOOOxx
+3846	9631	0	2	6	6	46	846	1846	3846	3846	92	93	YRAAAA	LGOAAA	VVVVxx
+3755	9632	1	3	5	15	55	755	1755	3755	3755	110	111	LOAAAA	MGOAAA	AAAAxx
+3765	9633	1	1	5	5	65	765	1765	3765	3765	130	131	VOAAAA	NGOAAA	HHHHxx
+3434	9634	0	2	4	14	34	434	1434	3434	3434	68	69	CCAAAA	OGOAAA	OOOOxx
+1381	9635	1	1	1	1	81	381	1381	1381	1381	162	163	DBAAAA	PGOAAA	VVVVxx
+287	9636	1	3	7	7	87	287	287	287	287	174	175	BLAAAA	QGOAAA	AAAAxx
+4476	9637	0	0	6	16	76	476	476	4476	4476	152	153	EQAAAA	RGOAAA	HHHHxx
+2916	9638	0	0	6	16	16	916	916	2916	2916	32	33	EIAAAA	SGOAAA	OOOOxx
+4517	9639	1	1	7	17	17	517	517	4517	4517	34	35	TRAAAA	TGOAAA	VVVVxx
+4561	9640	1	1	1	1	61	561	561	4561	4561	122	123	LTAAAA	UGOAAA	AAAAxx
+5106	9641	0	2	6	6	6	106	1106	106	5106	12	13	KOAAAA	VGOAAA	HHHHxx
+2077	9642	1	1	7	17	77	77	77	2077	2077	154	155	XBAAAA	WGOAAA	OOOOxx
+5269	9643	1	1	9	9	69	269	1269	269	5269	138	139	RUAAAA	XGOAAA	VVVVxx
+5688	9644	0	0	8	8	88	688	1688	688	5688	176	177	UKAAAA	YGOAAA	AAAAxx
+8831	9645	1	3	1	11	31	831	831	3831	8831	62	63	RBAAAA	ZGOAAA	HHHHxx
+3867	9646	1	3	7	7	67	867	1867	3867	3867	134	135	TSAAAA	AHOAAA	OOOOxx
+6062	9647	0	2	2	2	62	62	62	1062	6062	124	125	EZAAAA	BHOAAA	VVVVxx
+8460	9648	0	0	0	0	60	460	460	3460	8460	120	121	KNAAAA	CHOAAA	AAAAxx
+3138	9649	0	2	8	18	38	138	1138	3138	3138	76	77	SQAAAA	DHOAAA	HHHHxx
+3173	9650	1	1	3	13	73	173	1173	3173	3173	146	147	BSAAAA	EHOAAA	OOOOxx
+7018	9651	0	2	8	18	18	18	1018	2018	7018	36	37	YJAAAA	FHOAAA	VVVVxx
+4836	9652	0	0	6	16	36	836	836	4836	4836	72	73	AEAAAA	GHOAAA	AAAAxx
+1007	9653	1	3	7	7	7	7	1007	1007	1007	14	15	TMAAAA	HHOAAA	HHHHxx
+658	9654	0	2	8	18	58	658	658	658	658	116	117	IZAAAA	IHOAAA	OOOOxx
+5205	9655	1	1	5	5	5	205	1205	205	5205	10	11	FSAAAA	JHOAAA	VVVVxx
+5805	9656	1	1	5	5	5	805	1805	805	5805	10	11	HPAAAA	KHOAAA	AAAAxx
+5959	9657	1	3	9	19	59	959	1959	959	5959	118	119	FVAAAA	LHOAAA	HHHHxx
+2863	9658	1	3	3	3	63	863	863	2863	2863	126	127	DGAAAA	MHOAAA	OOOOxx
+7272	9659	0	0	2	12	72	272	1272	2272	7272	144	145	STAAAA	NHOAAA	VVVVxx
+8437	9660	1	1	7	17	37	437	437	3437	8437	74	75	NMAAAA	OHOAAA	AAAAxx
+4900	9661	0	0	0	0	0	900	900	4900	4900	0	1	MGAAAA	PHOAAA	HHHHxx
+890	9662	0	2	0	10	90	890	890	890	890	180	181	GIAAAA	QHOAAA	OOOOxx
+3530	9663	0	2	0	10	30	530	1530	3530	3530	60	61	UFAAAA	RHOAAA	VVVVxx
+6209	9664	1	1	9	9	9	209	209	1209	6209	18	19	VEAAAA	SHOAAA	AAAAxx
+4595	9665	1	3	5	15	95	595	595	4595	4595	190	191	TUAAAA	THOAAA	HHHHxx
+5982	9666	0	2	2	2	82	982	1982	982	5982	164	165	CWAAAA	UHOAAA	OOOOxx
+1101	9667	1	1	1	1	1	101	1101	1101	1101	2	3	JQAAAA	VHOAAA	VVVVxx
+9555	9668	1	3	5	15	55	555	1555	4555	9555	110	111	NDAAAA	WHOAAA	AAAAxx
+1918	9669	0	2	8	18	18	918	1918	1918	1918	36	37	UVAAAA	XHOAAA	HHHHxx
+3527	9670	1	3	7	7	27	527	1527	3527	3527	54	55	RFAAAA	YHOAAA	OOOOxx
+7309	9671	1	1	9	9	9	309	1309	2309	7309	18	19	DVAAAA	ZHOAAA	VVVVxx
+8213	9672	1	1	3	13	13	213	213	3213	8213	26	27	XDAAAA	AIOAAA	AAAAxx
+306	9673	0	2	6	6	6	306	306	306	306	12	13	ULAAAA	BIOAAA	HHHHxx
+845	9674	1	1	5	5	45	845	845	845	845	90	91	NGAAAA	CIOAAA	OOOOxx
+16	9675	0	0	6	16	16	16	16	16	16	32	33	QAAAAA	DIOAAA	VVVVxx
+437	9676	1	1	7	17	37	437	437	437	437	74	75	VQAAAA	EIOAAA	AAAAxx
+9518	9677	0	2	8	18	18	518	1518	4518	9518	36	37	CCAAAA	FIOAAA	HHHHxx
+2142	9678	0	2	2	2	42	142	142	2142	2142	84	85	KEAAAA	GIOAAA	OOOOxx
+8121	9679	1	1	1	1	21	121	121	3121	8121	42	43	JAAAAA	HIOAAA	VVVVxx
+7354	9680	0	2	4	14	54	354	1354	2354	7354	108	109	WWAAAA	IIOAAA	AAAAxx
+1720	9681	0	0	0	0	20	720	1720	1720	1720	40	41	EOAAAA	JIOAAA	HHHHxx
+6078	9682	0	2	8	18	78	78	78	1078	6078	156	157	UZAAAA	KIOAAA	OOOOxx
+5929	9683	1	1	9	9	29	929	1929	929	5929	58	59	BUAAAA	LIOAAA	VVVVxx
+3856	9684	0	0	6	16	56	856	1856	3856	3856	112	113	ISAAAA	MIOAAA	AAAAxx
+3424	9685	0	0	4	4	24	424	1424	3424	3424	48	49	SBAAAA	NIOAAA	HHHHxx
+1712	9686	0	0	2	12	12	712	1712	1712	1712	24	25	WNAAAA	OIOAAA	OOOOxx
+2340	9687	0	0	0	0	40	340	340	2340	2340	80	81	AMAAAA	PIOAAA	VVVVxx
+5570	9688	0	2	0	10	70	570	1570	570	5570	140	141	GGAAAA	QIOAAA	AAAAxx
+8734	9689	0	2	4	14	34	734	734	3734	8734	68	69	YXAAAA	RIOAAA	HHHHxx
+6077	9690	1	1	7	17	77	77	77	1077	6077	154	155	TZAAAA	SIOAAA	OOOOxx
+2960	9691	0	0	0	0	60	960	960	2960	2960	120	121	WJAAAA	TIOAAA	VVVVxx
+5062	9692	0	2	2	2	62	62	1062	62	5062	124	125	SMAAAA	UIOAAA	AAAAxx
+1532	9693	0	0	2	12	32	532	1532	1532	1532	64	65	YGAAAA	VIOAAA	HHHHxx
+8298	9694	0	2	8	18	98	298	298	3298	8298	196	197	EHAAAA	WIOAAA	OOOOxx
+2496	9695	0	0	6	16	96	496	496	2496	2496	192	193	ASAAAA	XIOAAA	VVVVxx
+8412	9696	0	0	2	12	12	412	412	3412	8412	24	25	OLAAAA	YIOAAA	AAAAxx
+724	9697	0	0	4	4	24	724	724	724	724	48	49	WBAAAA	ZIOAAA	HHHHxx
+1019	9698	1	3	9	19	19	19	1019	1019	1019	38	39	FNAAAA	AJOAAA	OOOOxx
+6265	9699	1	1	5	5	65	265	265	1265	6265	130	131	ZGAAAA	BJOAAA	VVVVxx
+740	9700	0	0	0	0	40	740	740	740	740	80	81	MCAAAA	CJOAAA	AAAAxx
+8495	9701	1	3	5	15	95	495	495	3495	8495	190	191	TOAAAA	DJOAAA	HHHHxx
+6983	9702	1	3	3	3	83	983	983	1983	6983	166	167	PIAAAA	EJOAAA	OOOOxx
+991	9703	1	3	1	11	91	991	991	991	991	182	183	DMAAAA	FJOAAA	VVVVxx
+3189	9704	1	1	9	9	89	189	1189	3189	3189	178	179	RSAAAA	GJOAAA	AAAAxx
+4487	9705	1	3	7	7	87	487	487	4487	4487	174	175	PQAAAA	HJOAAA	HHHHxx
+5554	9706	0	2	4	14	54	554	1554	554	5554	108	109	QFAAAA	IJOAAA	OOOOxx
+1258	9707	0	2	8	18	58	258	1258	1258	1258	116	117	KWAAAA	JJOAAA	VVVVxx
+5359	9708	1	3	9	19	59	359	1359	359	5359	118	119	DYAAAA	KJOAAA	AAAAxx
+2709	9709	1	1	9	9	9	709	709	2709	2709	18	19	FAAAAA	LJOAAA	HHHHxx
+361	9710	1	1	1	1	61	361	361	361	361	122	123	XNAAAA	MJOAAA	OOOOxx
+4028	9711	0	0	8	8	28	28	28	4028	4028	56	57	YYAAAA	NJOAAA	VVVVxx
+3735	9712	1	3	5	15	35	735	1735	3735	3735	70	71	RNAAAA	OJOAAA	AAAAxx
+4427	9713	1	3	7	7	27	427	427	4427	4427	54	55	HOAAAA	PJOAAA	HHHHxx
+7540	9714	0	0	0	0	40	540	1540	2540	7540	80	81	AEAAAA	QJOAAA	OOOOxx
+3569	9715	1	1	9	9	69	569	1569	3569	3569	138	139	HHAAAA	RJOAAA	VVVVxx
+1916	9716	0	0	6	16	16	916	1916	1916	1916	32	33	SVAAAA	SJOAAA	AAAAxx
+7596	9717	0	0	6	16	96	596	1596	2596	7596	192	193	EGAAAA	TJOAAA	HHHHxx
+9721	9718	1	1	1	1	21	721	1721	4721	9721	42	43	XJAAAA	UJOAAA	OOOOxx
+4429	9719	1	1	9	9	29	429	429	4429	4429	58	59	JOAAAA	VJOAAA	VVVVxx
+3471	9720	1	3	1	11	71	471	1471	3471	3471	142	143	NDAAAA	WJOAAA	AAAAxx
+1157	9721	1	1	7	17	57	157	1157	1157	1157	114	115	NSAAAA	XJOAAA	HHHHxx
+5700	9722	0	0	0	0	0	700	1700	700	5700	0	1	GLAAAA	YJOAAA	OOOOxx
+4431	9723	1	3	1	11	31	431	431	4431	4431	62	63	LOAAAA	ZJOAAA	VVVVxx
+9409	9724	1	1	9	9	9	409	1409	4409	9409	18	19	XXAAAA	AKOAAA	AAAAxx
+8752	9725	0	0	2	12	52	752	752	3752	8752	104	105	QYAAAA	BKOAAA	HHHHxx
+9484	9726	0	0	4	4	84	484	1484	4484	9484	168	169	UAAAAA	CKOAAA	OOOOxx
+1266	9727	0	2	6	6	66	266	1266	1266	1266	132	133	SWAAAA	DKOAAA	VVVVxx
+9097	9728	1	1	7	17	97	97	1097	4097	9097	194	195	XLAAAA	EKOAAA	AAAAxx
+3068	9729	0	0	8	8	68	68	1068	3068	3068	136	137	AOAAAA	FKOAAA	HHHHxx
+5490	9730	0	2	0	10	90	490	1490	490	5490	180	181	EDAAAA	GKOAAA	OOOOxx
+1375	9731	1	3	5	15	75	375	1375	1375	1375	150	151	XAAAAA	HKOAAA	VVVVxx
+2487	9732	1	3	7	7	87	487	487	2487	2487	174	175	RRAAAA	IKOAAA	AAAAxx
+1705	9733	1	1	5	5	5	705	1705	1705	1705	10	11	PNAAAA	JKOAAA	HHHHxx
+1571	9734	1	3	1	11	71	571	1571	1571	1571	142	143	LIAAAA	KKOAAA	OOOOxx
+4005	9735	1	1	5	5	5	5	5	4005	4005	10	11	BYAAAA	LKOAAA	VVVVxx
+5497	9736	1	1	7	17	97	497	1497	497	5497	194	195	LDAAAA	MKOAAA	AAAAxx
+2144	9737	0	0	4	4	44	144	144	2144	2144	88	89	MEAAAA	NKOAAA	HHHHxx
+4052	9738	0	0	2	12	52	52	52	4052	4052	104	105	WZAAAA	OKOAAA	OOOOxx
+4942	9739	0	2	2	2	42	942	942	4942	4942	84	85	CIAAAA	PKOAAA	VVVVxx
+5504	9740	0	0	4	4	4	504	1504	504	5504	8	9	SDAAAA	QKOAAA	AAAAxx
+2913	9741	1	1	3	13	13	913	913	2913	2913	26	27	BIAAAA	RKOAAA	HHHHxx
+5617	9742	1	1	7	17	17	617	1617	617	5617	34	35	BIAAAA	SKOAAA	OOOOxx
+8179	9743	1	3	9	19	79	179	179	3179	8179	158	159	PCAAAA	TKOAAA	VVVVxx
+9437	9744	1	1	7	17	37	437	1437	4437	9437	74	75	ZYAAAA	UKOAAA	AAAAxx
+1821	9745	1	1	1	1	21	821	1821	1821	1821	42	43	BSAAAA	VKOAAA	HHHHxx
+5737	9746	1	1	7	17	37	737	1737	737	5737	74	75	RMAAAA	WKOAAA	OOOOxx
+4207	9747	1	3	7	7	7	207	207	4207	4207	14	15	VFAAAA	XKOAAA	VVVVxx
+4815	9748	1	3	5	15	15	815	815	4815	4815	30	31	FDAAAA	YKOAAA	AAAAxx
+8707	9749	1	3	7	7	7	707	707	3707	8707	14	15	XWAAAA	ZKOAAA	HHHHxx
+5970	9750	0	2	0	10	70	970	1970	970	5970	140	141	QVAAAA	ALOAAA	OOOOxx
+5501	9751	1	1	1	1	1	501	1501	501	5501	2	3	PDAAAA	BLOAAA	VVVVxx
+4013	9752	1	1	3	13	13	13	13	4013	4013	26	27	JYAAAA	CLOAAA	AAAAxx
+9235	9753	1	3	5	15	35	235	1235	4235	9235	70	71	FRAAAA	DLOAAA	HHHHxx
+2503	9754	1	3	3	3	3	503	503	2503	2503	6	7	HSAAAA	ELOAAA	OOOOxx
+9181	9755	1	1	1	1	81	181	1181	4181	9181	162	163	DPAAAA	FLOAAA	VVVVxx
+2289	9756	1	1	9	9	89	289	289	2289	2289	178	179	BKAAAA	GLOAAA	AAAAxx
+4256	9757	0	0	6	16	56	256	256	4256	4256	112	113	SHAAAA	HLOAAA	HHHHxx
+191	9758	1	3	1	11	91	191	191	191	191	182	183	JHAAAA	ILOAAA	OOOOxx
+9655	9759	1	3	5	15	55	655	1655	4655	9655	110	111	JHAAAA	JLOAAA	VVVVxx
+8615	9760	1	3	5	15	15	615	615	3615	8615	30	31	JTAAAA	KLOAAA	AAAAxx
+3011	9761	1	3	1	11	11	11	1011	3011	3011	22	23	VLAAAA	LLOAAA	HHHHxx
+6376	9762	0	0	6	16	76	376	376	1376	6376	152	153	GLAAAA	MLOAAA	OOOOxx
+68	9763	0	0	8	8	68	68	68	68	68	136	137	QCAAAA	NLOAAA	VVVVxx
+4720	9764	0	0	0	0	20	720	720	4720	4720	40	41	OZAAAA	OLOAAA	AAAAxx
+6848	9765	0	0	8	8	48	848	848	1848	6848	96	97	KDAAAA	PLOAAA	HHHHxx
+456	9766	0	0	6	16	56	456	456	456	456	112	113	ORAAAA	QLOAAA	OOOOxx
+5887	9767	1	3	7	7	87	887	1887	887	5887	174	175	LSAAAA	RLOAAA	VVVVxx
+9249	9768	1	1	9	9	49	249	1249	4249	9249	98	99	TRAAAA	SLOAAA	AAAAxx
+4041	9769	1	1	1	1	41	41	41	4041	4041	82	83	LZAAAA	TLOAAA	HHHHxx
+2304	9770	0	0	4	4	4	304	304	2304	2304	8	9	QKAAAA	ULOAAA	OOOOxx
+8763	9771	1	3	3	3	63	763	763	3763	8763	126	127	BZAAAA	VLOAAA	VVVVxx
+2115	9772	1	3	5	15	15	115	115	2115	2115	30	31	JDAAAA	WLOAAA	AAAAxx
+8014	9773	0	2	4	14	14	14	14	3014	8014	28	29	GWAAAA	XLOAAA	HHHHxx
+9895	9774	1	3	5	15	95	895	1895	4895	9895	190	191	PQAAAA	YLOAAA	OOOOxx
+671	9775	1	3	1	11	71	671	671	671	671	142	143	VZAAAA	ZLOAAA	VVVVxx
+3774	9776	0	2	4	14	74	774	1774	3774	3774	148	149	EPAAAA	AMOAAA	AAAAxx
+134	9777	0	2	4	14	34	134	134	134	134	68	69	EFAAAA	BMOAAA	HHHHxx
+534	9778	0	2	4	14	34	534	534	534	534	68	69	OUAAAA	CMOAAA	OOOOxx
+7308	9779	0	0	8	8	8	308	1308	2308	7308	16	17	CVAAAA	DMOAAA	VVVVxx
+5244	9780	0	0	4	4	44	244	1244	244	5244	88	89	STAAAA	EMOAAA	AAAAxx
+1512	9781	0	0	2	12	12	512	1512	1512	1512	24	25	EGAAAA	FMOAAA	HHHHxx
+8960	9782	0	0	0	0	60	960	960	3960	8960	120	121	QGAAAA	GMOAAA	OOOOxx
+6602	9783	0	2	2	2	2	602	602	1602	6602	4	5	YTAAAA	HMOAAA	VVVVxx
+593	9784	1	1	3	13	93	593	593	593	593	186	187	VWAAAA	IMOAAA	AAAAxx
+2353	9785	1	1	3	13	53	353	353	2353	2353	106	107	NMAAAA	JMOAAA	HHHHxx
+4139	9786	1	3	9	19	39	139	139	4139	4139	78	79	FDAAAA	KMOAAA	OOOOxx
+3063	9787	1	3	3	3	63	63	1063	3063	3063	126	127	VNAAAA	LMOAAA	VVVVxx
+652	9788	0	0	2	12	52	652	652	652	652	104	105	CZAAAA	MMOAAA	AAAAxx
+7405	9789	1	1	5	5	5	405	1405	2405	7405	10	11	VYAAAA	NMOAAA	HHHHxx
+3034	9790	0	2	4	14	34	34	1034	3034	3034	68	69	SMAAAA	OMOAAA	OOOOxx
+4614	9791	0	2	4	14	14	614	614	4614	4614	28	29	MVAAAA	PMOAAA	VVVVxx
+2351	9792	1	3	1	11	51	351	351	2351	2351	102	103	LMAAAA	QMOAAA	AAAAxx
+8208	9793	0	0	8	8	8	208	208	3208	8208	16	17	SDAAAA	RMOAAA	HHHHxx
+5475	9794	1	3	5	15	75	475	1475	475	5475	150	151	PCAAAA	SMOAAA	OOOOxx
+6875	9795	1	3	5	15	75	875	875	1875	6875	150	151	LEAAAA	TMOAAA	VVVVxx
+563	9796	1	3	3	3	63	563	563	563	563	126	127	RVAAAA	UMOAAA	AAAAxx
+3346	9797	0	2	6	6	46	346	1346	3346	3346	92	93	SYAAAA	VMOAAA	HHHHxx
+291	9798	1	3	1	11	91	291	291	291	291	182	183	FLAAAA	WMOAAA	OOOOxx
+6345	9799	1	1	5	5	45	345	345	1345	6345	90	91	BKAAAA	XMOAAA	VVVVxx
+8099	9800	1	3	9	19	99	99	99	3099	8099	198	199	NZAAAA	YMOAAA	AAAAxx
+2078	9801	0	2	8	18	78	78	78	2078	2078	156	157	YBAAAA	ZMOAAA	HHHHxx
+8238	9802	0	2	8	18	38	238	238	3238	8238	76	77	WEAAAA	ANOAAA	OOOOxx
+4482	9803	0	2	2	2	82	482	482	4482	4482	164	165	KQAAAA	BNOAAA	VVVVxx
+716	9804	0	0	6	16	16	716	716	716	716	32	33	OBAAAA	CNOAAA	AAAAxx
+7288	9805	0	0	8	8	88	288	1288	2288	7288	176	177	IUAAAA	DNOAAA	HHHHxx
+5906	9806	0	2	6	6	6	906	1906	906	5906	12	13	ETAAAA	ENOAAA	OOOOxx
+5618	9807	0	2	8	18	18	618	1618	618	5618	36	37	CIAAAA	FNOAAA	VVVVxx
+1141	9808	1	1	1	1	41	141	1141	1141	1141	82	83	XRAAAA	GNOAAA	AAAAxx
+8231	9809	1	3	1	11	31	231	231	3231	8231	62	63	PEAAAA	HNOAAA	HHHHxx
+3713	9810	1	1	3	13	13	713	1713	3713	3713	26	27	VMAAAA	INOAAA	OOOOxx
+9158	9811	0	2	8	18	58	158	1158	4158	9158	116	117	GOAAAA	JNOAAA	VVVVxx
+4051	9812	1	3	1	11	51	51	51	4051	4051	102	103	VZAAAA	KNOAAA	AAAAxx
+1973	9813	1	1	3	13	73	973	1973	1973	1973	146	147	XXAAAA	LNOAAA	HHHHxx
+6710	9814	0	2	0	10	10	710	710	1710	6710	20	21	CYAAAA	MNOAAA	OOOOxx
+1021	9815	1	1	1	1	21	21	1021	1021	1021	42	43	HNAAAA	NNOAAA	VVVVxx
+2196	9816	0	0	6	16	96	196	196	2196	2196	192	193	MGAAAA	ONOAAA	AAAAxx
+8335	9817	1	3	5	15	35	335	335	3335	8335	70	71	PIAAAA	PNOAAA	HHHHxx
+2272	9818	0	0	2	12	72	272	272	2272	2272	144	145	KJAAAA	QNOAAA	OOOOxx
+3818	9819	0	2	8	18	18	818	1818	3818	3818	36	37	WQAAAA	RNOAAA	VVVVxx
+679	9820	1	3	9	19	79	679	679	679	679	158	159	DAAAAA	SNOAAA	AAAAxx
+7512	9821	0	0	2	12	12	512	1512	2512	7512	24	25	YCAAAA	TNOAAA	HHHHxx
+493	9822	1	1	3	13	93	493	493	493	493	186	187	ZSAAAA	UNOAAA	OOOOxx
+5663	9823	1	3	3	3	63	663	1663	663	5663	126	127	VJAAAA	VNOAAA	VVVVxx
+4655	9824	1	3	5	15	55	655	655	4655	4655	110	111	BXAAAA	WNOAAA	AAAAxx
+3996	9825	0	0	6	16	96	996	1996	3996	3996	192	193	SXAAAA	XNOAAA	HHHHxx
+8797	9826	1	1	7	17	97	797	797	3797	8797	194	195	JAAAAA	YNOAAA	OOOOxx
+2991	9827	1	3	1	11	91	991	991	2991	2991	182	183	BLAAAA	ZNOAAA	VVVVxx
+7038	9828	0	2	8	18	38	38	1038	2038	7038	76	77	SKAAAA	AOOAAA	AAAAxx
+4174	9829	0	2	4	14	74	174	174	4174	4174	148	149	OEAAAA	BOOAAA	HHHHxx
+6908	9830	0	0	8	8	8	908	908	1908	6908	16	17	SFAAAA	COOAAA	OOOOxx
+8477	9831	1	1	7	17	77	477	477	3477	8477	154	155	BOAAAA	DOOAAA	VVVVxx
+3576	9832	0	0	6	16	76	576	1576	3576	3576	152	153	OHAAAA	EOOAAA	AAAAxx
+2685	9833	1	1	5	5	85	685	685	2685	2685	170	171	HZAAAA	FOOAAA	HHHHxx
+9161	9834	1	1	1	1	61	161	1161	4161	9161	122	123	JOAAAA	GOOAAA	OOOOxx
+2951	9835	1	3	1	11	51	951	951	2951	2951	102	103	NJAAAA	HOOAAA	VVVVxx
+8362	9836	0	2	2	2	62	362	362	3362	8362	124	125	QJAAAA	IOOAAA	AAAAxx
+2379	9837	1	3	9	19	79	379	379	2379	2379	158	159	NNAAAA	JOOAAA	HHHHxx
+1277	9838	1	1	7	17	77	277	1277	1277	1277	154	155	DXAAAA	KOOAAA	OOOOxx
+1728	9839	0	0	8	8	28	728	1728	1728	1728	56	57	MOAAAA	LOOAAA	VVVVxx
+9816	9840	0	0	6	16	16	816	1816	4816	9816	32	33	ONAAAA	MOOAAA	AAAAxx
+6288	9841	0	0	8	8	88	288	288	1288	6288	176	177	WHAAAA	NOOAAA	HHHHxx
+8985	9842	1	1	5	5	85	985	985	3985	8985	170	171	PHAAAA	OOOAAA	OOOOxx
+771	9843	1	3	1	11	71	771	771	771	771	142	143	RDAAAA	POOAAA	VVVVxx
+464	9844	0	0	4	4	64	464	464	464	464	128	129	WRAAAA	QOOAAA	AAAAxx
+9625	9845	1	1	5	5	25	625	1625	4625	9625	50	51	FGAAAA	ROOAAA	HHHHxx
+9608	9846	0	0	8	8	8	608	1608	4608	9608	16	17	OFAAAA	SOOAAA	OOOOxx
+9170	9847	0	2	0	10	70	170	1170	4170	9170	140	141	SOAAAA	TOOAAA	VVVVxx
+9658	9848	0	2	8	18	58	658	1658	4658	9658	116	117	MHAAAA	UOOAAA	AAAAxx
+7515	9849	1	3	5	15	15	515	1515	2515	7515	30	31	BDAAAA	VOOAAA	HHHHxx
+9400	9850	0	0	0	0	0	400	1400	4400	9400	0	1	OXAAAA	WOOAAA	OOOOxx
+2045	9851	1	1	5	5	45	45	45	2045	2045	90	91	RAAAAA	XOOAAA	VVVVxx
+324	9852	0	0	4	4	24	324	324	324	324	48	49	MMAAAA	YOOAAA	AAAAxx
+4252	9853	0	0	2	12	52	252	252	4252	4252	104	105	OHAAAA	ZOOAAA	HHHHxx
+8329	9854	1	1	9	9	29	329	329	3329	8329	58	59	JIAAAA	APOAAA	OOOOxx
+4472	9855	0	0	2	12	72	472	472	4472	4472	144	145	AQAAAA	BPOAAA	VVVVxx
+1047	9856	1	3	7	7	47	47	1047	1047	1047	94	95	HOAAAA	CPOAAA	AAAAxx
+9341	9857	1	1	1	1	41	341	1341	4341	9341	82	83	HVAAAA	DPOAAA	HHHHxx
+7000	9858	0	0	0	0	0	0	1000	2000	7000	0	1	GJAAAA	EPOAAA	OOOOxx
+1429	9859	1	1	9	9	29	429	1429	1429	1429	58	59	ZCAAAA	FPOAAA	VVVVxx
+2701	9860	1	1	1	1	1	701	701	2701	2701	2	3	XZAAAA	GPOAAA	AAAAxx
+6630	9861	0	2	0	10	30	630	630	1630	6630	60	61	AVAAAA	HPOAAA	HHHHxx
+3669	9862	1	1	9	9	69	669	1669	3669	3669	138	139	DLAAAA	IPOAAA	OOOOxx
+8613	9863	1	1	3	13	13	613	613	3613	8613	26	27	HTAAAA	JPOAAA	VVVVxx
+7080	9864	0	0	0	0	80	80	1080	2080	7080	160	161	IMAAAA	KPOAAA	AAAAxx
+8788	9865	0	0	8	8	88	788	788	3788	8788	176	177	AAAAAA	LPOAAA	HHHHxx
+6291	9866	1	3	1	11	91	291	291	1291	6291	182	183	ZHAAAA	MPOAAA	OOOOxx
+7885	9867	1	1	5	5	85	885	1885	2885	7885	170	171	HRAAAA	NPOAAA	VVVVxx
+7160	9868	0	0	0	0	60	160	1160	2160	7160	120	121	KPAAAA	OPOAAA	AAAAxx
+6140	9869	0	0	0	0	40	140	140	1140	6140	80	81	ECAAAA	PPOAAA	HHHHxx
+9881	9870	1	1	1	1	81	881	1881	4881	9881	162	163	BQAAAA	QPOAAA	OOOOxx
+9140	9871	0	0	0	0	40	140	1140	4140	9140	80	81	ONAAAA	RPOAAA	VVVVxx
+644	9872	0	0	4	4	44	644	644	644	644	88	89	UYAAAA	SPOAAA	AAAAxx
+3667	9873	1	3	7	7	67	667	1667	3667	3667	134	135	BLAAAA	TPOAAA	HHHHxx
+2675	9874	1	3	5	15	75	675	675	2675	2675	150	151	XYAAAA	UPOAAA	OOOOxx
+9492	9875	0	0	2	12	92	492	1492	4492	9492	184	185	CBAAAA	VPOAAA	VVVVxx
+5004	9876	0	0	4	4	4	4	1004	4	5004	8	9	MKAAAA	WPOAAA	AAAAxx
+9456	9877	0	0	6	16	56	456	1456	4456	9456	112	113	SZAAAA	XPOAAA	HHHHxx
+8197	9878	1	1	7	17	97	197	197	3197	8197	194	195	HDAAAA	YPOAAA	OOOOxx
+2837	9879	1	1	7	17	37	837	837	2837	2837	74	75	DFAAAA	ZPOAAA	VVVVxx
+127	9880	1	3	7	7	27	127	127	127	127	54	55	XEAAAA	AQOAAA	AAAAxx
+9772	9881	0	0	2	12	72	772	1772	4772	9772	144	145	WLAAAA	BQOAAA	HHHHxx
+5743	9882	1	3	3	3	43	743	1743	743	5743	86	87	XMAAAA	CQOAAA	OOOOxx
+2007	9883	1	3	7	7	7	7	7	2007	2007	14	15	FZAAAA	DQOAAA	VVVVxx
+7586	9884	0	2	6	6	86	586	1586	2586	7586	172	173	UFAAAA	EQOAAA	AAAAxx
+45	9885	1	1	5	5	45	45	45	45	45	90	91	TBAAAA	FQOAAA	HHHHxx
+6482	9886	0	2	2	2	82	482	482	1482	6482	164	165	IPAAAA	GQOAAA	OOOOxx
+4565	9887	1	1	5	5	65	565	565	4565	4565	130	131	PTAAAA	HQOAAA	VVVVxx
+6975	9888	1	3	5	15	75	975	975	1975	6975	150	151	HIAAAA	IQOAAA	AAAAxx
+7260	9889	0	0	0	0	60	260	1260	2260	7260	120	121	GTAAAA	JQOAAA	HHHHxx
+2830	9890	0	2	0	10	30	830	830	2830	2830	60	61	WEAAAA	KQOAAA	OOOOxx
+9365	9891	1	1	5	5	65	365	1365	4365	9365	130	131	FWAAAA	LQOAAA	VVVVxx
+8207	9892	1	3	7	7	7	207	207	3207	8207	14	15	RDAAAA	MQOAAA	AAAAxx
+2506	9893	0	2	6	6	6	506	506	2506	2506	12	13	KSAAAA	NQOAAA	HHHHxx
+8081	9894	1	1	1	1	81	81	81	3081	8081	162	163	VYAAAA	OQOAAA	OOOOxx
+8678	9895	0	2	8	18	78	678	678	3678	8678	156	157	UVAAAA	PQOAAA	VVVVxx
+9932	9896	0	0	2	12	32	932	1932	4932	9932	64	65	ASAAAA	QQOAAA	AAAAxx
+447	9897	1	3	7	7	47	447	447	447	447	94	95	FRAAAA	RQOAAA	HHHHxx
+9187	9898	1	3	7	7	87	187	1187	4187	9187	174	175	JPAAAA	SQOAAA	OOOOxx
+89	9899	1	1	9	9	89	89	89	89	89	178	179	LDAAAA	TQOAAA	VVVVxx
+7027	9900	1	3	7	7	27	27	1027	2027	7027	54	55	HKAAAA	UQOAAA	AAAAxx
+1536	9901	0	0	6	16	36	536	1536	1536	1536	72	73	CHAAAA	VQOAAA	HHHHxx
+160	9902	0	0	0	0	60	160	160	160	160	120	121	EGAAAA	WQOAAA	OOOOxx
+7679	9903	1	3	9	19	79	679	1679	2679	7679	158	159	JJAAAA	XQOAAA	VVVVxx
+5973	9904	1	1	3	13	73	973	1973	973	5973	146	147	TVAAAA	YQOAAA	AAAAxx
+4401	9905	1	1	1	1	1	401	401	4401	4401	2	3	HNAAAA	ZQOAAA	HHHHxx
+395	9906	1	3	5	15	95	395	395	395	395	190	191	FPAAAA	AROAAA	OOOOxx
+4904	9907	0	0	4	4	4	904	904	4904	4904	8	9	QGAAAA	BROAAA	VVVVxx
+2759	9908	1	3	9	19	59	759	759	2759	2759	118	119	DCAAAA	CROAAA	AAAAxx
+8713	9909	1	1	3	13	13	713	713	3713	8713	26	27	DXAAAA	DROAAA	HHHHxx
+3770	9910	0	2	0	10	70	770	1770	3770	3770	140	141	APAAAA	EROAAA	OOOOxx
+8272	9911	0	0	2	12	72	272	272	3272	8272	144	145	EGAAAA	FROAAA	VVVVxx
+5358	9912	0	2	8	18	58	358	1358	358	5358	116	117	CYAAAA	GROAAA	AAAAxx
+9747	9913	1	3	7	7	47	747	1747	4747	9747	94	95	XKAAAA	HROAAA	HHHHxx
+1567	9914	1	3	7	7	67	567	1567	1567	1567	134	135	HIAAAA	IROAAA	OOOOxx
+2136	9915	0	0	6	16	36	136	136	2136	2136	72	73	EEAAAA	JROAAA	VVVVxx
+314	9916	0	2	4	14	14	314	314	314	314	28	29	CMAAAA	KROAAA	AAAAxx
+4583	9917	1	3	3	3	83	583	583	4583	4583	166	167	HUAAAA	LROAAA	HHHHxx
+375	9918	1	3	5	15	75	375	375	375	375	150	151	LOAAAA	MROAAA	OOOOxx
+5566	9919	0	2	6	6	66	566	1566	566	5566	132	133	CGAAAA	NROAAA	VVVVxx
+6865	9920	1	1	5	5	65	865	865	1865	6865	130	131	BEAAAA	OROAAA	AAAAxx
+894	9921	0	2	4	14	94	894	894	894	894	188	189	KIAAAA	PROAAA	HHHHxx
+5399	9922	1	3	9	19	99	399	1399	399	5399	198	199	RZAAAA	QROAAA	OOOOxx
+1385	9923	1	1	5	5	85	385	1385	1385	1385	170	171	HBAAAA	RROAAA	VVVVxx
+2156	9924	0	0	6	16	56	156	156	2156	2156	112	113	YEAAAA	SROAAA	AAAAxx
+9659	9925	1	3	9	19	59	659	1659	4659	9659	118	119	NHAAAA	TROAAA	HHHHxx
+477	9926	1	1	7	17	77	477	477	477	477	154	155	JSAAAA	UROAAA	OOOOxx
+8194	9927	0	2	4	14	94	194	194	3194	8194	188	189	EDAAAA	VROAAA	VVVVxx
+3937	9928	1	1	7	17	37	937	1937	3937	3937	74	75	LVAAAA	WROAAA	AAAAxx
+3745	9929	1	1	5	5	45	745	1745	3745	3745	90	91	BOAAAA	XROAAA	HHHHxx
+4096	9930	0	0	6	16	96	96	96	4096	4096	192	193	OBAAAA	YROAAA	OOOOxx
+5487	9931	1	3	7	7	87	487	1487	487	5487	174	175	BDAAAA	ZROAAA	VVVVxx
+2475	9932	1	3	5	15	75	475	475	2475	2475	150	151	FRAAAA	ASOAAA	AAAAxx
+6105	9933	1	1	5	5	5	105	105	1105	6105	10	11	VAAAAA	BSOAAA	HHHHxx
+6036	9934	0	0	6	16	36	36	36	1036	6036	72	73	EYAAAA	CSOAAA	OOOOxx
+1315	9935	1	3	5	15	15	315	1315	1315	1315	30	31	PYAAAA	DSOAAA	VVVVxx
+4473	9936	1	1	3	13	73	473	473	4473	4473	146	147	BQAAAA	ESOAAA	AAAAxx
+4016	9937	0	0	6	16	16	16	16	4016	4016	32	33	MYAAAA	FSOAAA	HHHHxx
+8135	9938	1	3	5	15	35	135	135	3135	8135	70	71	XAAAAA	GSOAAA	OOOOxx
+8892	9939	0	0	2	12	92	892	892	3892	8892	184	185	AEAAAA	HSOAAA	VVVVxx
+4850	9940	0	2	0	10	50	850	850	4850	4850	100	101	OEAAAA	ISOAAA	AAAAxx
+2545	9941	1	1	5	5	45	545	545	2545	2545	90	91	XTAAAA	JSOAAA	HHHHxx
+3788	9942	0	0	8	8	88	788	1788	3788	3788	176	177	SPAAAA	KSOAAA	OOOOxx
+1672	9943	0	0	2	12	72	672	1672	1672	1672	144	145	IMAAAA	LSOAAA	VVVVxx
+3664	9944	0	0	4	4	64	664	1664	3664	3664	128	129	YKAAAA	MSOAAA	AAAAxx
+3775	9945	1	3	5	15	75	775	1775	3775	3775	150	151	FPAAAA	NSOAAA	HHHHxx
+3103	9946	1	3	3	3	3	103	1103	3103	3103	6	7	JPAAAA	OSOAAA	OOOOxx
+9335	9947	1	3	5	15	35	335	1335	4335	9335	70	71	BVAAAA	PSOAAA	VVVVxx
+9200	9948	0	0	0	0	0	200	1200	4200	9200	0	1	WPAAAA	QSOAAA	AAAAxx
+8665	9949	1	1	5	5	65	665	665	3665	8665	130	131	HVAAAA	RSOAAA	HHHHxx
+1356	9950	0	0	6	16	56	356	1356	1356	1356	112	113	EAAAAA	SSOAAA	OOOOxx
+6118	9951	0	2	8	18	18	118	118	1118	6118	36	37	IBAAAA	TSOAAA	VVVVxx
+4605	9952	1	1	5	5	5	605	605	4605	4605	10	11	DVAAAA	USOAAA	AAAAxx
+5651	9953	1	3	1	11	51	651	1651	651	5651	102	103	JJAAAA	VSOAAA	HHHHxx
+9055	9954	1	3	5	15	55	55	1055	4055	9055	110	111	HKAAAA	WSOAAA	OOOOxx
+8461	9955	1	1	1	1	61	461	461	3461	8461	122	123	LNAAAA	XSOAAA	VVVVxx
+6107	9956	1	3	7	7	7	107	107	1107	6107	14	15	XAAAAA	YSOAAA	AAAAxx
+1967	9957	1	3	7	7	67	967	1967	1967	1967	134	135	RXAAAA	ZSOAAA	HHHHxx
+8910	9958	0	2	0	10	10	910	910	3910	8910	20	21	SEAAAA	ATOAAA	OOOOxx
+8257	9959	1	1	7	17	57	257	257	3257	8257	114	115	PFAAAA	BTOAAA	VVVVxx
+851	9960	1	3	1	11	51	851	851	851	851	102	103	TGAAAA	CTOAAA	AAAAxx
+7823	9961	1	3	3	3	23	823	1823	2823	7823	46	47	XOAAAA	DTOAAA	HHHHxx
+3208	9962	0	0	8	8	8	208	1208	3208	3208	16	17	KTAAAA	ETOAAA	OOOOxx
+856	9963	0	0	6	16	56	856	856	856	856	112	113	YGAAAA	FTOAAA	VVVVxx
+2654	9964	0	2	4	14	54	654	654	2654	2654	108	109	CYAAAA	GTOAAA	AAAAxx
+7185	9965	1	1	5	5	85	185	1185	2185	7185	170	171	JQAAAA	HTOAAA	HHHHxx
+309	9966	1	1	9	9	9	309	309	309	309	18	19	XLAAAA	ITOAAA	OOOOxx
+9752	9967	0	0	2	12	52	752	1752	4752	9752	104	105	CLAAAA	JTOAAA	VVVVxx
+6405	9968	1	1	5	5	5	405	405	1405	6405	10	11	JMAAAA	KTOAAA	AAAAxx
+6113	9969	1	1	3	13	13	113	113	1113	6113	26	27	DBAAAA	LTOAAA	HHHHxx
+9774	9970	0	2	4	14	74	774	1774	4774	9774	148	149	YLAAAA	MTOAAA	OOOOxx
+1674	9971	0	2	4	14	74	674	1674	1674	1674	148	149	KMAAAA	NTOAAA	VVVVxx
+9602	9972	0	2	2	2	2	602	1602	4602	9602	4	5	IFAAAA	OTOAAA	AAAAxx
+1363	9973	1	3	3	3	63	363	1363	1363	1363	126	127	LAAAAA	PTOAAA	HHHHxx
+6887	9974	1	3	7	7	87	887	887	1887	6887	174	175	XEAAAA	QTOAAA	OOOOxx
+6170	9975	0	2	0	10	70	170	170	1170	6170	140	141	IDAAAA	RTOAAA	VVVVxx
+8888	9976	0	0	8	8	88	888	888	3888	8888	176	177	WDAAAA	STOAAA	AAAAxx
+2981	9977	1	1	1	1	81	981	981	2981	2981	162	163	RKAAAA	TTOAAA	HHHHxx
+7369	9978	1	1	9	9	69	369	1369	2369	7369	138	139	LXAAAA	UTOAAA	OOOOxx
+6227	9979	1	3	7	7	27	227	227	1227	6227	54	55	NFAAAA	VTOAAA	VVVVxx
+8002	9980	0	2	2	2	2	2	2	3002	8002	4	5	UVAAAA	WTOAAA	AAAAxx
+4288	9981	0	0	8	8	88	288	288	4288	4288	176	177	YIAAAA	XTOAAA	HHHHxx
+5136	9982	0	0	6	16	36	136	1136	136	5136	72	73	OPAAAA	YTOAAA	OOOOxx
+1084	9983	0	0	4	4	84	84	1084	1084	1084	168	169	SPAAAA	ZTOAAA	VVVVxx
+9117	9984	1	1	7	17	17	117	1117	4117	9117	34	35	RMAAAA	AUOAAA	AAAAxx
+2406	9985	0	2	6	6	6	406	406	2406	2406	12	13	OOAAAA	BUOAAA	HHHHxx
+1384	9986	0	0	4	4	84	384	1384	1384	1384	168	169	GBAAAA	CUOAAA	OOOOxx
+9194	9987	0	2	4	14	94	194	1194	4194	9194	188	189	QPAAAA	DUOAAA	VVVVxx
+858	9988	0	2	8	18	58	858	858	858	858	116	117	AHAAAA	EUOAAA	AAAAxx
+8592	9989	0	0	2	12	92	592	592	3592	8592	184	185	MSAAAA	FUOAAA	HHHHxx
+4773	9990	1	1	3	13	73	773	773	4773	4773	146	147	PBAAAA	GUOAAA	OOOOxx
+4093	9991	1	1	3	13	93	93	93	4093	4093	186	187	LBAAAA	HUOAAA	VVVVxx
+6587	9992	1	3	7	7	87	587	587	1587	6587	174	175	JTAAAA	IUOAAA	AAAAxx
+6093	9993	1	1	3	13	93	93	93	1093	6093	186	187	JAAAAA	JUOAAA	HHHHxx
+429	9994	1	1	9	9	29	429	429	429	429	58	59	NQAAAA	KUOAAA	OOOOxx
+5780	9995	0	0	0	0	80	780	1780	780	5780	160	161	IOAAAA	LUOAAA	VVVVxx
+1783	9996	1	3	3	3	83	783	1783	1783	1783	166	167	PQAAAA	MUOAAA	AAAAxx
+2992	9997	0	0	2	12	92	992	992	2992	2992	184	185	CLAAAA	NUOAAA	HHHHxx
+0	9998	0	0	0	0	0	0	0	0	0	0	1	AAAAAA	OUOAAA	OOOOxx
+2968	9999	0	0	8	8	68	968	968	2968	2968	136	137	EKAAAA	PUOAAA	VVVVxx
diff --git a/tests/testflows/window_functions/tests/window_clause.py b/tests/testflows/window_functions/tests/window_clause.py
new file mode 100644
index 00000000000..714fce89895
--- /dev/null
+++ b/tests/testflows/window_functions/tests/window_clause.py
@@ -0,0 +1,121 @@
+from testflows.core import *
+
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def single_window(self):
+    """Check defining a single named window using window clause.
+    """
+    expected = convert_output("""
+      depname  | empno | salary |  sum
+    -----------+-------+--------+-------
+     develop   |   7   |  4200  | 4200
+     develop   |   8   |  6000  | 10200
+     develop   |   9   |  4500  | 14700
+     develop   |   10  |  5200  | 19900
+     develop   |   11  |  5200  | 25100
+     personnel |   2   |  3900  | 3900
+     personnel |   5   |  3500  | 7400
+     sales     |   1   |  5000  | 5000
+     sales     |   3   |  4800  | 9800
+     sales     |   4   |  4800  | 14600
+    """)
+
+    execute_query(
+        "SELECT depname, empno, salary, sum(salary) OVER w AS sum FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY empno)",
+        expected=expected
+    )
+
+@TestScenario
+def unused_window(self):
+    """Check unused window.
+    """
+    expected = convert_output("""
+    four
+    -------
+    """)
+
+    execute_query(
+        "SELECT four FROM tenk1 WHERE 0 WINDOW w AS (PARTITION BY ten)",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause_MultipleWindows("1.0")
+)
+def multiple_identical_windows(self):
+    """Check defining multiple windows using window clause.
+    """
+    expected = convert_output("""
+      sum  | count
+    -------+-------
+      3500 |     1
+      7400 |     2
+     11600 |     3
+     16100 |     4
+     25700 |     6
+     25700 |     6
+     30700 |     7
+     41100 |     9
+     41100 |     9
+     47100 |    10
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w1 AS sum, count(*) OVER w2 AS count "
+        "FROM empsalary WINDOW w1 AS (ORDER BY salary), w2 AS (ORDER BY salary)",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause_MultipleWindows("1.0")
+)
+def multiple_windows(self):
+    """Check defining multiple windows using window clause.
+    """
+    expected = convert_output("""
+      empno | depname   | salary | sum1  | sum2
+    --------+-----------+--------+-------+--------
+        1   | sales     | 5000   | 5000  | 5000
+        2   | personnel | 3900   | 3900  | 8900
+        3   | sales     | 4800   | 9800  | 8700
+        4   | sales     | 4800   | 14600 | 9600
+        5   | personnel | 3500   | 7400  | 8300
+        7   | develop   | 4200   | 4200  | 7700
+        8   | develop   | 6000   | 10200 | 10200
+        9   | develop   | 4500   | 14700 | 10500
+        10  | develop   | 5200   | 19900 | 9700
+        11  | develop   | 5200   | 25100 | 10400
+    """)
+
+    execute_query("SELECT empno, depname, salary, sum(salary) OVER w1 AS sum1, sum(salary) OVER w2 AS sum2 "
+        "FROM empsalary WINDOW w1 AS (PARTITION BY depname ORDER BY empno), w2 AS (ORDER BY empno ROWS 1 PRECEDING)",
+        expected=expected
+    )
+
+@TestScenario
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause_MissingWindowSpec_Error("1.0")
+)
+def missing_window_spec(self):
+    """Check missing window spec in window clause.
+    """
+    exitcode = 62
+    message = "Exception: Syntax error"
+
+    self.context.node.query("SELECT number,sum(number) OVER w1 FROM values('number Int8', (1),(1),(2),(3)) WINDOW w1",
+        exitcode=exitcode, message=message)
+
+@TestFeature
+@Name("window clause")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_WindowClause("1.0")
+)
+def feature(self):
+    """Check defining frame clause.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/tests/window_spec.py b/tests/testflows/window_functions/tests/window_spec.py
new file mode 100644
index 00000000000..aacbc192200
--- /dev/null
+++ b/tests/testflows/window_functions/tests/window_spec.py
@@ -0,0 +1,206 @@
+from testflows.core import *
+from window_functions.requirements import *
+from window_functions.tests.common import *
+
+@TestScenario
+def partition_clause(self):
+    """Check window specification that only contains partition clause.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+    25100
+    25100
+    25100
+    25100
+    25100
+    7400
+    7400
+    14600
+    14600
+    14600
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary WINDOW w AS (PARTITION BY depname)",
+        expected=expected
+    )
+
+@TestScenario
+def orderby_clause(self):
+    """Check window specification that only contains order by clause.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+    25100
+    25100
+    25100
+    25100
+    25100
+    32500
+    32500
+    47100
+    47100
+    47100
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary WINDOW w AS (ORDER BY depname)",
+        expected=expected
+    )
+
+@TestScenario
+def frame_clause(self):
+    """Check window specification that only contains frame clause.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+    5000
+    3900
+    4800
+    4800
+    3500
+    4200
+    6000
+    4500
+    5200
+    5200
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary WINDOW w AS (ORDER BY empno ROWS CURRENT ROW)",
+        expected=expected
+    )
+
+@TestScenario
+def partition_with_order_by(self):
+    """Check window specification that contains partition and order by clauses.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+     4200
+     8700
+     19100
+     19100
+     25100
+     3500
+     7400
+     9600
+     9600
+     14600
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary)",
+        expected=expected
+    )
+
+@TestScenario
+def partition_with_frame(self):
+    """Check window specification that contains partition and frame clauses.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+    4200
+    6000
+    4500
+    5200
+    5200
+    3900
+    3500
+    5000
+    4800
+    4800
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary  WINDOW w AS (PARTITION BY depname, empno ROWS 1 PRECEDING)",
+        expected=expected
+    )
+
+@TestScenario
+def order_by_with_frame(self):
+    """Check window specification that contains order by and frame clauses.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+    4200
+    10200
+    10500
+    9700
+    10400
+    9100
+    7400
+    8500
+    9800
+    9600
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary WINDOW w AS (ORDER BY depname, empno ROWS 1 PRECEDING)",
+        expected=expected
+    )
+
+@TestScenario
+def partition_with_order_by_and_frame(self):
+    """Check window specification that contains all clauses.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+    4200
+    8700
+    9700
+    10400
+    11200
+    3500
+    7400
+    4800
+    9600
+    9800
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary WINDOW w AS (PARTITION BY depname ORDER BY salary ROWS 1 PRECEDING)",
+        expected=expected
+    )
+
+@TestScenario
+def empty(self):
+    """Check defining an empty window specification.
+    """
+    expected = convert_output("""
+     sum 
+    -------
+     47100
+     47100
+     47100
+     47100
+     47100
+     47100
+     47100
+     47100
+     47100
+     47100
+    """)
+
+    execute_query(
+        "SELECT sum(salary) OVER w AS sum FROM empsalary WINDOW w AS ()",
+        expected=expected
+    )
+
+@TestFeature
+@Name("window spec")
+@Requirements(
+    RQ_SRS_019_ClickHouse_WindowFunctions_WindowSpec("1.0")
+)
+def feature(self):
+    """Check defining window specifications.
+    """
+    for scenario in loads(current_module(), Scenario):
+        Scenario(run=scenario, flags=TE)
diff --git a/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
new file mode 100755
index 00000000000..fdd4a8057a9
--- /dev/null
+++ b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
@@ -0,0 +1,27 @@
+version: '2.3'
+
+services:
+  clickhouse:
+    image: yandex/clickhouse-integration-test
+    expose:
+      - "9000"
+      - "9009"
+      - "8123"
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.d:/etc/clickhouse-server/config.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.d:/etc/clickhouse-server/users.d"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/config.xml:/etc/clickhouse-server/config.xml"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse/users.xml:/etc/clickhouse-server/users.xml"
+      - "${CLICKHOUSE_TESTS_SERVER_BIN_PATH:-/usr/bin/clickhouse}:/usr/bin/clickhouse"
+      - "${CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH:-/usr/bin/clickhouse-odbc-bridge}:/usr/bin/clickhouse-odbc-bridge"
+    entrypoint: bash -c "clickhouse server --config-file=/etc/clickhouse-server/config.xml --log-file=/var/log/clickhouse-server/clickhouse-server.log --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
+    healthcheck:
+      test: clickhouse client --query='select 1'
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 300s
+    cap_add:
+      - SYS_PTRACE
+    security_opt:
+      - label:disable
diff --git a/tests/testflows/window_functions/window_functions_env/docker-compose.yml b/tests/testflows/window_functions/window_functions_env/docker-compose.yml
new file mode 100755
index 00000000000..29f2ef52470
--- /dev/null
+++ b/tests/testflows/window_functions/window_functions_env/docker-compose.yml
@@ -0,0 +1,60 @@
+version: '2.3'
+
+services:
+  zookeeper:
+    extends:
+      file: zookeeper-service.yml
+      service: zookeeper
+
+  clickhouse1:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse1
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse1/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse1/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse2:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse2
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse2/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse2/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  clickhouse3:
+    extends:
+      file: clickhouse-service.yml
+      service: clickhouse
+    hostname: clickhouse3
+    volumes:
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/database/:/var/lib/clickhouse/"
+      - "${CLICKHOUSE_TESTS_DIR}/_instances/clickhouse3/logs/:/var/log/clickhouse-server/"
+      - "${CLICKHOUSE_TESTS_DIR}/configs/clickhouse3/config.d/macros.xml:/etc/clickhouse-server/config.d/macros.xml"
+    depends_on:
+      zookeeper:
+        condition: service_healthy
+
+  # dummy service which does nothing, but allows to postpone
+  # 'docker-compose up -d' till all dependecies will go healthy
+  all_services_ready:
+    image: hello-world
+    depends_on:
+      clickhouse1:
+        condition: service_healthy
+      clickhouse2:
+        condition: service_healthy
+      clickhouse3:
+        condition: service_healthy
+      zookeeper:
+        condition: service_healthy
diff --git a/tests/testflows/window_functions/window_functions_env/zookeeper-service.yml b/tests/testflows/window_functions/window_functions_env/zookeeper-service.yml
new file mode 100755
index 00000000000..f3df33358be
--- /dev/null
+++ b/tests/testflows/window_functions/window_functions_env/zookeeper-service.yml
@@ -0,0 +1,18 @@
+version: '2.3'
+
+services:
+  zookeeper:
+    image: zookeeper:3.4.12
+    expose:
+      - "2181"
+    environment:
+      ZOO_TICK_TIME: 500
+      ZOO_MY_ID: 1
+    healthcheck:
+      test: echo stat | nc localhost 2181
+      interval: 3s
+      timeout: 2s
+      retries: 5
+      start_period: 2s
+    security_opt:
+      - label:disable
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index afeda751ea5..bd6453e406b 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -32,18 +32,16 @@ if (NOT DEFINED ENABLE_UTILS OR ENABLE_UTILS)
     add_subdirectory (db-generator)
     add_subdirectory (wal-dump)
     add_subdirectory (check-mysql-binlog)
+    add_subdirectory (keeper-bench)
 
     if (USE_NURAFT)
         add_subdirectory (keeper-data-dumper)
     endif ()
 
-    if (NOT OS_DARWIN)
+    # 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)
         add_subdirectory (memcpy-bench)
     endif ()
 endif ()
 
-if (ENABLE_CODE_QUALITY)
-    add_subdirectory (check-style)
-endif ()
-
 add_subdirectory (package)
diff --git a/utils/build/build_debian_unbundled.sh b/utils/build/build_debian_unbundled.sh
deleted file mode 100755
index 5b2129fc5bf..00000000000
--- a/utils/build/build_debian_unbundled.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../.. && pwd)
-
-# also possible: DIST=bionic DIST=testing
-export DIST=${DIST=unstable}
-
-cd $ROOT_DIR
-. $ROOT_DIR/debian/.pbuilderrc
-if [[ -n "$FORCE_PBUILDER_CREATE" || ! -e "$BASETGZ" ]] ; then
-    sudo --preserve-env pbuilder create --configfile $ROOT_DIR/debian/.pbuilderrc $PBUILDER_OPT
-fi
-
-env TEST_RUN=1 \
-    `# Skip tests:` \
-    `# 00281 requires internal compiler` \
-    `# 00416 requires patched poco from contrib/` \
-    TEST_OPT="--skip long compile 00416 $TEST_OPT" \
-    TEST_TRUE=false \
-    DH_VERBOSE=1 \
-    CMAKE_FLAGS="-DUNBUNDLED=1 -DUSE_STATIC_LIBRARIES=0 $CMAKE_FLAGS" \
-    `# Use all possible contrib libs from system` \
-    `# psmisc - killall` \
-    `# gdb - symbol test in pbuilder` \
-    EXTRAPACKAGES="psmisc libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-regex-dev libboost-iostreams-dev zlib1g-dev liblz4-dev libdouble-conversion-dev libsparsehash-dev librdkafka-dev libpoco-dev unixodbc-dev libsparsehash-dev libgoogle-perftools-dev libzstd-dev libre2-dev libunwind-dev googletest libcctz-dev libcapnp-dev libjemalloc-dev libssl-dev libcurl4-openssl-dev libunwind-dev libgsasl7-dev libxml2-dev libbrotli-dev libhyperscan-dev rapidjson-dev $EXTRAPACKAGES" \
-    pdebuild --configfile $ROOT_DIR/debian/.pbuilderrc $PDEBUILD_OPT
diff --git a/utils/build/build_debian_unbundled_split.sh b/utils/build/build_debian_unbundled_split.sh
deleted file mode 100755
index 5242b0f4a6f..00000000000
--- a/utils/build/build_debian_unbundled_split.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-
-CMAKE_FLAGS+=" -DCLICKHOUSE_SPLIT_BINARY=1 "
-. $CUR_DIR/build_debian_unbundled.sh
diff --git a/utils/check-style/CMakeLists.txt b/utils/check-style/CMakeLists.txt
deleted file mode 100644
index 24b315019fe..00000000000
--- a/utils/check-style/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_test(NAME check-style COMMAND bash -c "${CMAKE_CURRENT_SOURCE_DIR}/check-style")
-add_test(NAME check-include COMMAND sh -c "env RUN_DIR=${CMAKE_CURRENT_SOURCE_DIR} ROOT_DIR=${ClickHouse_SOURCE_DIR} BUILD_DIR=${ClickHouse_BINARY_DIR} CXX=${CMAKE_CXX_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR}/check-include-stat")
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index db6b33a569b..551368e5fd8 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -94,7 +94,28 @@ tests_with_query_log=( $(
         xargs grep --with-filename -e system.query_log -e system.query_thread_log | cut -d: -f1 | sort -u
 ) )
 for test_case in "${tests_with_query_log[@]}"; do
-    grep -qE current_database.*currentDatabase "$test_case" || echo "Queries to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
+    grep -qE current_database.*currentDatabase "$test_case" || {
+        grep -qE 'current_database.*\$CLICKHOUSE_DATABASE' "$test_case"
+    } || 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
+# 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' |
+        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
+) )
+for test_case in "${tests_with_database_column[@]}"; do
+    grep -qE database.*currentDatabase "$test_case" || {
+        grep -qE 'database.*\$CLICKHOUSE_DATABASE' "$test_case"
+    } || {
+        # 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"
+    }
 done
 
 # Queries with ReplicatedMergeTree
diff --git a/utils/ci/build-normal.sh b/utils/ci/build-normal.sh
index b937269c8a3..328bd2c9f51 100755
--- a/utils/ci/build-normal.sh
+++ b/utils/ci/build-normal.sh
@@ -8,11 +8,6 @@ source default-config
 mkdir -p "${WORKSPACE}/build"
 pushd "${WORKSPACE}/build"
 
-if [[ "${ENABLE_EMBEDDED_COMPILER}" == 1 ]]; then
-    [[ "$USE_LLVM_LIBRARIES_FROM_SYSTEM" == 0 ]] && CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_INTERNAL_LLVM_LIBRARY=1"
-    [[ "$USE_LLVM_LIBRARIES_FROM_SYSTEM" != 0 ]] && CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_INTERNAL_LLVM_LIBRARY=0"
-fi
-
 cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_EMBEDDED_COMPILER=${ENABLE_EMBEDDED_COMPILER} $CMAKE_FLAGS ../sources
 
 [[ "$BUILD_TARGETS" != 'all' ]] && BUILD_TARGETS_STRING="--target $BUILD_TARGETS"
diff --git a/utils/ci/default-config b/utils/ci/default-config
index cd6f25ecf9b..b66121cc757 100644
--- a/utils/ci/default-config
+++ b/utils/ci/default-config
@@ -27,7 +27,6 @@ CLANG_SOURCES_BRANCH=trunk          # or tags/RELEASE_600/final
 GCC_SOURCES_VERSION=latest          # or gcc-7.1.0
 
 # install-libraries
-USE_LLVM_LIBRARIES_FROM_SYSTEM=0    # 0 or 1
 ENABLE_EMBEDDED_COMPILER=1
 
 # build
diff --git a/utils/ci/install-libraries.sh b/utils/ci/install-libraries.sh
index d7fb856dbed..7615375fbc1 100755
--- a/utils/ci/install-libraries.sh
+++ b/utils/ci/install-libraries.sh
@@ -5,7 +5,3 @@ source default-config
 
 ./install-os-packages.sh libicu-dev
 ./install-os-packages.sh libreadline-dev
-
-if [[ "$ENABLE_EMBEDDED_COMPILER" == 1 && "$USE_LLVM_LIBRARIES_FROM_SYSTEM" == 1 ]]; then
-    ./install-os-packages.sh llvm-libs-5.0
-fi
diff --git a/utils/ci/jobs/quick-build/run.sh b/utils/ci/jobs/quick-build/run.sh
index 3d755625c8d..af977d14465 100755
--- a/utils/ci/jobs/quick-build/run.sh
+++ b/utils/ci/jobs/quick-build/run.sh
@@ -15,7 +15,6 @@ SOURCES_METHOD=local
 COMPILER=clang
 COMPILER_INSTALL_METHOD=packages
 COMPILER_PACKAGE_VERSION=6.0
-USE_LLVM_LIBRARIES_FROM_SYSTEM=0
 BUILD_METHOD=normal
 BUILD_TARGETS=clickhouse
 BUILD_TYPE=Debug
diff --git a/utils/config-processor/CMakeLists.txt b/utils/config-processor/CMakeLists.txt
index e7e15d0be53..a378d66a3d3 100644
--- a/utils/config-processor/CMakeLists.txt
+++ b/utils/config-processor/CMakeLists.txt
@@ -1,4 +1,2 @@
 add_executable (config-processor config-processor.cpp)
 target_link_libraries(config-processor PRIVATE clickhouse_common_config)
-
-INSTALL(TARGETS config-processor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT config-processor)
diff --git a/utils/corrector_utf8/CMakeLists.txt b/utils/corrector_utf8/CMakeLists.txt
index 9114f3f58a0..4784fd43e2d 100644
--- a/utils/corrector_utf8/CMakeLists.txt
+++ b/utils/corrector_utf8/CMakeLists.txt
@@ -1,6 +1,2 @@
 add_executable(corrector_utf8 corrector_utf8.cpp)
-
-# Link the executable to the library.
 target_link_libraries(corrector_utf8 PRIVATE clickhouse_common_io)
-
-install(TARGETS corrector_utf8 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT corrector_utf8)
diff --git a/utils/github/backport.py b/utils/github/backport.py
index 7fddbbee241..a28a1510694 100644
--- a/utils/github/backport.py
+++ b/utils/github/backport.py
@@ -25,24 +25,22 @@ class Backport:
     def getPullRequests(self, from_commit):
         return self._gh.get_pull_requests(from_commit)
 
-    def getBranchesWithLTS(self):
-        branches = []
-        for pull_request in self._gh.find_pull_requests("release-lts"):
-            if not pull_request['merged'] and not pull_request['closed']:
-                branches.append(pull_request['headRefName'])
+    def getBranchesWithRelease(self):
+        branches = set()
+        for pull_request in self._gh.find_pull_requests("release"):
+            branches.add(pull_request['headRefName'])
         return branches
 
-    def execute(self, repo, upstream, until_commit, number, run_cherrypick, find_lts=False):
+    def execute(self, repo, upstream, until_commit, run_cherrypick):
         repo = LocalRepo(repo, upstream, self.default_branch_name)
         all_branches = repo.get_release_branches()  # [(branch_name, base_commit)]
 
-        last_branches = set([branch[0] for branch in all_branches[-number:]])
-        lts_branches = set(self.getBranchesWithLTS() if find_lts else [])
+        release_branches = self.getBranchesWithRelease()
 
         branches = []
         # iterate over all branches to preserve their precedence.
         for branch in all_branches:
-            if branch[0] in last_branches or branch[0] in lts_branches:
+            if branch[0] in release_branches:
                 branches.append(branch)
 
         if not branches:
@@ -76,7 +74,7 @@ class Backport:
 
             # First pass. Find all must-backports
             for label in pr['labels']['nodes']:
-                if label['name'] == 'pr-bugfix':
+                if label['name'] == 'pr-bugfix' or label['name'] == 'pr-must-backport':
                     backport_map[pr['number']] = branch_set.copy()
                     continue
                 matched = RE_MUST_BACKPORT.match(label['name'])
@@ -115,8 +113,6 @@ if __name__ == "__main__":
     parser.add_argument('--token',     type=str, required=True, help='token for Github access')
     parser.add_argument('--repo',      type=str, required=True, help='path to full repository', metavar='PATH')
     parser.add_argument('--til',       type=str,                help='check PRs from HEAD til this commit', metavar='COMMIT')
-    parser.add_argument('-n',          type=int, dest='number', help='number of last release branches to consider')
-    parser.add_argument('--lts',       action='store_true',     help='consider branches with LTS')
     parser.add_argument('--dry-run',   action='store_true',     help='do not create or merge any PRs', default=False)
     parser.add_argument('--verbose', '-v', action='store_true', help='more verbose output', default=False)
     parser.add_argument('--upstream', '-u', type=str,           help='remote name of upstream in repository', default='origin')
@@ -129,4 +125,4 @@ if __name__ == "__main__":
 
     cherrypick_run = lambda token, pr, branch: CherryPick(token, 'ClickHouse', 'ClickHouse', 'core', pr, branch).execute(args.repo, args.dry_run)
     bp = Backport(args.token, 'ClickHouse', 'ClickHouse', 'core')
-    bp.execute(args.repo, args.upstream, args.til, args.number, cherrypick_run, args.lts)
+    bp.execute(args.repo, args.upstream, args.til, cherrypick_run)
diff --git a/utils/github/query.py b/utils/github/query.py
index 628d3a12dfd..39b1d0ce003 100644
--- a/utils/github/query.py
+++ b/utils/github/query.py
@@ -48,7 +48,7 @@ class Query:
         url
     '''
 
-    def __init__(self, token, owner, name, team, max_page_size=100, min_page_size=5):
+    def __init__(self, token, owner, name, team, max_page_size=100, min_page_size=10):
         self._PULL_REQUEST = Query._PULL_REQUEST.format(min_page_size=min_page_size)
 
         self._token = token
@@ -165,7 +165,7 @@ class Query:
         '''
         _QUERY = '''
             repository(owner: "{owner}" name: "{name}") {{
-                pullRequests(first: {min_page_size} labels: "{label_name}") {{
+                pullRequests(first: {min_page_size} labels: "{label_name}" states: OPEN) {{
                     nodes {{
                         {pull_request_data}
                     }}
diff --git a/utils/keeper-bench/CMakeLists.txt b/utils/keeper-bench/CMakeLists.txt
new file mode 100644
index 00000000000..2f12194d1b7
--- /dev/null
+++ b/utils/keeper-bench/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(keeper-bench Generator.cpp Runner.cpp Stats.cpp main.cpp)
+target_link_libraries(keeper-bench PRIVATE clickhouse_common_zookeeper)
diff --git a/utils/keeper-bench/Generator.cpp b/utils/keeper-bench/Generator.cpp
new file mode 100644
index 00000000000..852de07f2e1
--- /dev/null
+++ b/utils/keeper-bench/Generator.cpp
@@ -0,0 +1,238 @@
+#include "Generator.h"
+#include <random>
+#include <filesystem>
+
+using namespace Coordination;
+using namespace zkutil;
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+}
+
+namespace
+{
+std::string generateRandomString(size_t length)
+{
+    if (length == 0)
+        return "";
+
+    static const auto & chars = "0123456789"
+        "abcdefghijklmnopqrstuvwxyz"
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    static pcg64 rng(randomSeed());
+    static std::uniform_int_distribution<size_t> pick(0, sizeof(chars) - 2);
+
+    std::string s;
+
+    s.reserve(length);
+
+    while (length--)
+        s += chars[pick(rng)];
+
+    return s;
+}
+}
+
+std::string generateRandomPath(const std::string & prefix, size_t length)
+{
+    return std::filesystem::path(prefix) / generateRandomString(length);
+}
+
+std::string generateRandomData(size_t size)
+{
+    return generateRandomString(size);
+}
+
+void CreateRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+{
+    auto promise = std::make_shared<std::promise<void>>();
+    auto future = promise->get_future();
+    auto create_callback = [promise] (const CreateResponse & response)
+    {
+        if (response.error != Coordination::Error::ZOK)
+            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+        else
+            promise->set_value();
+    };
+    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
+    future.get();
+}
+
+ZooKeeperRequestPtr CreateRequestGenerator::generate()
+{
+    auto request = std::make_shared<ZooKeeperCreateRequest>();
+    request->acls = default_acls;
+    size_t plength = 5;
+    if (path_length)
+        plength = *path_length;
+    auto path_candidate = generateRandomPath(path_prefix, plength);
+
+    while (paths_created.count(path_candidate))
+        path_candidate = generateRandomPath(path_prefix, plength);
+
+    paths_created.insert(path_candidate);
+
+    request->path = path_candidate;
+    if (data_size)
+        request->data = generateRandomData(*data_size);
+
+    return request;
+}
+
+
+void GetRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+{
+    auto promise = std::make_shared<std::promise<void>>();
+    auto future = promise->get_future();
+    auto create_callback = [promise] (const CreateResponse & response)
+    {
+        if (response.error != Coordination::Error::ZOK)
+            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+        else
+            promise->set_value();
+    };
+    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
+    future.get();
+    size_t total_nodes = 1;
+    if (num_nodes)
+        total_nodes = *num_nodes;
+
+    for (size_t i = 0; i < total_nodes; ++i)
+    {
+        auto path = generateRandomPath(path_prefix, 5);
+        while (std::find(paths_to_get.begin(), paths_to_get.end(), path) != paths_to_get.end())
+            path = generateRandomPath(path_prefix, 5);
+
+        auto create_promise = std::make_shared<std::promise<void>>();
+        auto create_future = create_promise->get_future();
+        auto callback = [create_promise] (const CreateResponse & response)
+        {
+            if (response.error != Coordination::Error::ZOK)
+                create_promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+            else
+                create_promise->set_value();
+        };
+        std::string data;
+        if (nodes_data_size)
+            data = generateRandomString(*nodes_data_size);
+
+        zookeeper.create(path, data, false, false, default_acls, callback);
+        create_future.get();
+        paths_to_get.push_back(path);
+    }
+}
+
+Coordination::ZooKeeperRequestPtr GetRequestGenerator::generate()
+{
+    auto request = std::make_shared<ZooKeeperGetRequest>();
+
+    size_t path_index = distribution(rng);
+    request->path = paths_to_get[path_index];
+    return request;
+}
+
+void ListRequestGenerator::startup(Coordination::ZooKeeper & zookeeper)
+{
+    auto promise = std::make_shared<std::promise<void>>();
+    auto future = promise->get_future();
+    auto create_callback = [promise] (const CreateResponse & response)
+    {
+        if (response.error != Coordination::Error::ZOK)
+            promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+        else
+            promise->set_value();
+    };
+    zookeeper.create(path_prefix, "", false, false, default_acls, create_callback);
+    future.get();
+
+    size_t total_nodes = 1;
+    if (num_nodes)
+        total_nodes = *num_nodes;
+
+    size_t path_length = 5;
+    if (paths_length)
+        path_length = *paths_length;
+
+    for (size_t i = 0; i < total_nodes; ++i)
+    {
+        auto path = generateRandomPath(path_prefix, path_length);
+
+        auto create_promise = std::make_shared<std::promise<void>>();
+        auto create_future = create_promise->get_future();
+        auto callback = [create_promise] (const CreateResponse & response)
+        {
+            if (response.error != Coordination::Error::ZOK)
+                create_promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+            else
+                create_promise->set_value();
+        };
+        zookeeper.create(path, "", false, false, default_acls, callback);
+        create_future.get();
+    }
+}
+
+Coordination::ZooKeeperRequestPtr ListRequestGenerator::generate()
+{
+    auto request = std::make_shared<ZooKeeperListRequest>();
+    request->path = path_prefix;
+    return request;
+}
+
+std::unique_ptr<IGenerator> getGenerator(const std::string & name)
+{
+    if (name == "create_no_data")
+    {
+        return std::make_unique<CreateRequestGenerator>();
+    }
+    else if (name == "create_small_data")
+    {
+        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 32);
+    }
+    else if (name == "create_medium_data")
+    {
+        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 1024);
+    }
+    else if (name == "create_big_data")
+    {
+        return std::make_unique<CreateRequestGenerator>("/create_generator", 5, 512 * 1024);
+    }
+    else if (name == "get_no_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 0);
+    }
+    else if (name == "get_small_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 32);
+    }
+    else if (name == "get_medium_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 1024);
+    }
+    else if (name == "get_big_data")
+    {
+        return std::make_unique<GetRequestGenerator>("/get_generator", 10, 512 * 1024);
+    }
+    else if (name == "list_no_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 0, 1);
+    }
+    else if (name == "list_few_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 10, 5);
+    }
+    else if (name == "list_medium_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 1000, 5);
+    }
+    else if (name == "list_a_lot_nodes")
+    {
+        return std::make_unique<ListRequestGenerator>("/list_generator", 100000, 5);
+    }
+
+    throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Unknown generator {}", name);
+}
diff --git a/utils/keeper-bench/Generator.h b/utils/keeper-bench/Generator.h
new file mode 100644
index 00000000000..d6cc0eec335
--- /dev/null
+++ b/utils/keeper-bench/Generator.h
@@ -0,0 +1,107 @@
+#pragma once
+#include <Common/ZooKeeper/KeeperException.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeperImpl.h>
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <functional>
+#include <optional>
+#include <pcg-random/pcg_random.hpp>
+#include <Common/randomSeed.h>
+
+
+std::string generateRandomPath(const std::string & prefix, size_t length = 5);
+
+std::string generateRandomData(size_t size);
+
+class IGenerator
+{
+public:
+    IGenerator()
+    {
+        Coordination::ACL acl;
+        acl.permissions = Coordination::ACL::All;
+        acl.scheme = "world";
+        acl.id = "anyone";
+        default_acls.emplace_back(std::move(acl));
+    }
+    virtual void startup(Coordination::ZooKeeper & /*zookeeper*/) {}
+    virtual Coordination::ZooKeeperRequestPtr generate() = 0;
+
+    virtual ~IGenerator() = default;
+
+    Coordination::ACLs default_acls;
+
+};
+
+class CreateRequestGenerator final : public IGenerator
+{
+public:
+    explicit CreateRequestGenerator(
+        std::string path_prefix_ = "/create_generator",
+        std::optional<uint64_t> path_length_ = std::nullopt,
+        std::optional<uint64_t> data_size_ = std::nullopt)
+        : path_prefix(path_prefix_)
+        , path_length(path_length_)
+        , data_size(data_size_)
+    {}
+
+    void startup(Coordination::ZooKeeper & zookeeper) override;
+    Coordination::ZooKeeperRequestPtr generate() override;
+
+private:
+    std::string path_prefix;
+    std::optional<uint64_t> path_length;
+    std::optional<uint64_t> data_size;
+    std::unordered_set<std::string> paths_created;
+};
+
+
+class GetRequestGenerator final : public IGenerator
+{
+public:
+    explicit GetRequestGenerator(
+        std::string path_prefix_ = "/get_generator",
+        std::optional<uint64_t> num_nodes_ = std::nullopt,
+        std::optional<uint64_t> nodes_data_size_ = std::nullopt)
+        : path_prefix(path_prefix_)
+        , num_nodes(num_nodes_)
+        , nodes_data_size(nodes_data_size_)
+        , rng(randomSeed())
+        , distribution(0, num_nodes ? *num_nodes - 1 : 0)
+    {}
+
+    void startup(Coordination::ZooKeeper & zookeeper) override;
+    Coordination::ZooKeeperRequestPtr generate() override;
+
+private:
+    std::string path_prefix;
+    std::optional<uint64_t> num_nodes;
+    std::optional<uint64_t> nodes_data_size;
+    std::vector<std::string> paths_to_get;
+
+    pcg64 rng;
+    std::uniform_int_distribution<size_t> distribution;
+};
+
+class ListRequestGenerator final : public IGenerator
+{
+public:
+    explicit ListRequestGenerator(
+        std::string path_prefix_ = "/list_generator",
+        std::optional<uint64_t> num_nodes_ = std::nullopt,
+        std::optional<uint64_t> paths_length_ = std::nullopt)
+        : path_prefix(path_prefix_)
+        , num_nodes(num_nodes_)
+        , paths_length(paths_length_)
+    {}
+
+    void startup(Coordination::ZooKeeper & zookeeper) override;
+    Coordination::ZooKeeperRequestPtr generate() override;
+
+private:
+    std::string path_prefix;
+    std::optional<uint64_t> num_nodes;
+    std::optional<uint64_t> paths_length;
+};
+
+std::unique_ptr<IGenerator> getGenerator(const std::string & name);
diff --git a/utils/keeper-bench/Runner.cpp b/utils/keeper-bench/Runner.cpp
new file mode 100644
index 00000000000..d3f51fb2356
--- /dev/null
+++ b/utils/keeper-bench/Runner.cpp
@@ -0,0 +1,188 @@
+#include "Runner.h"
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int CANNOT_BLOCK_SIGNAL;
+}
+}
+
+void Runner::thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> & zookeepers)
+{
+    Coordination::ZooKeeperRequestPtr request;
+    /// Randomly choosing connection index
+    pcg64 rng(randomSeed());
+    std::uniform_int_distribution<size_t> distribution(0, zookeepers.size() - 1);
+
+    /// In these threads we do not accept INT signal.
+    sigset_t sig_set;
+    if (sigemptyset(&sig_set)
+        || sigaddset(&sig_set, SIGINT)
+        || pthread_sigmask(SIG_BLOCK, &sig_set, nullptr))
+    {
+        DB::throwFromErrno("Cannot block signal.", DB::ErrorCodes::CANNOT_BLOCK_SIGNAL);
+    }
+
+    while (true)
+    {
+        bool extracted = false;
+
+        while (!extracted)
+        {
+            extracted = queue.tryPop(request, 100);
+
+            if (shutdown
+                || (max_iterations && requests_executed >= max_iterations))
+            {
+                return;
+            }
+        }
+
+        const auto connection_index = distribution(rng);
+        auto & zk = zookeepers[connection_index];
+
+        auto promise = std::make_shared<std::promise<size_t>>();
+        auto future = promise->get_future();
+        Coordination::ResponseCallback callback = [promise](const Coordination::Response & response)
+        {
+            if (response.error != Coordination::Error::ZOK)
+                promise->set_exception(std::make_exception_ptr(zkutil::KeeperException(response.error)));
+            else
+                promise->set_value(response.bytesSize());
+        };
+
+        Stopwatch watch;
+
+        zk->executeGenericRequest(request, callback);
+
+        try
+        {
+            auto response_size = future.get();
+            double seconds = watch.elapsedSeconds();
+
+            std::lock_guard lock(mutex);
+
+            if (request->isReadRequest())
+                info->addRead(seconds, 1, request->bytesSize() + response_size);
+            else
+                info->addWrite(seconds, 1, request->bytesSize() + response_size);
+        }
+        catch (...)
+        {
+            if (!continue_on_error)
+            {
+                shutdown = true;
+                throw;
+            }
+            std::cerr << DB::getCurrentExceptionMessage(true, true /*check embedded stack trace*/) << std::endl;
+        }
+
+        ++requests_executed;
+    }
+}
+
+bool Runner::tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr & request, DB::InterruptListener & interrupt_listener)
+{
+    bool inserted = false;
+
+    while (!inserted)
+    {
+        inserted = queue.tryPush(request, 100);
+
+        if (shutdown)
+        {
+            /// An exception occurred in a worker
+            return false;
+        }
+
+        if (max_time > 0 && total_watch.elapsedSeconds() >= max_time)
+        {
+            std::cout << "Stopping launch of queries. Requested time limit is exhausted.\n";
+            return false;
+        }
+
+        if (interrupt_listener.check())
+        {
+            std::cout << "Stopping launch of queries. SIGINT received." << std::endl;
+            return false;
+        }
+
+        if (delay > 0 && delay_watch.elapsedSeconds() > delay)
+        {
+            printNumberOfRequestsExecuted(requests_executed);
+
+            std::lock_guard lock(mutex);
+            report(info, concurrency);
+            delay_watch.restart();
+        }
+    }
+
+    return true;
+}
+
+
+void Runner::runBenchmark()
+{
+    auto aux_connections = getConnections();
+
+    std::cerr << "Preparing to run\n";
+    generator->startup(*aux_connections[0]);
+    std::cerr << "Prepared\n";
+    try
+    {
+        for (size_t i = 0; i < concurrency; ++i)
+        {
+            auto connections = getConnections();
+            pool.scheduleOrThrowOnError([this, connections]() mutable { thread(connections); });
+        }
+    }
+    catch (...)
+    {
+        pool.wait();
+        throw;
+    }
+
+    DB::InterruptListener interrupt_listener;
+    delay_watch.restart();
+
+    /// Push queries into queue
+    for (size_t i = 0; !max_iterations || i < max_iterations; ++i)
+    {
+        if (!tryPushRequestInteractively(generator->generate(), interrupt_listener))
+        {
+            shutdown = true;
+            break;
+        }
+    }
+
+    pool.wait();
+    total_watch.stop();
+
+    printNumberOfRequestsExecuted(requests_executed);
+
+    std::lock_guard lock(mutex);
+    report(info, concurrency);
+}
+
+
+std::vector<std::shared_ptr<Coordination::ZooKeeper>> Runner::getConnections()
+{
+    std::vector<std::shared_ptr<Coordination::ZooKeeper>> zookeepers;
+    for (const auto & host_string : hosts_strings)
+    {
+        Coordination::ZooKeeper::Node node{Poco::Net::SocketAddress{host_string}, false};
+        std::vector<Coordination::ZooKeeper::Node> nodes;
+        nodes.push_back(node);
+        zookeepers.emplace_back(std::make_shared<Coordination::ZooKeeper>(
+            nodes,
+            "", /*chroot*/
+            "", /*identity type*/
+            "", /*identity*/
+            Poco::Timespan(0, 30000 * 1000),
+            Poco::Timespan(0, 1000 * 1000),
+            Poco::Timespan(0, 10000 * 1000)));
+    }
+
+    return zookeepers;
+}
diff --git a/utils/keeper-bench/Runner.h b/utils/keeper-bench/Runner.h
new file mode 100644
index 00000000000..bb83e790214
--- /dev/null
+++ b/utils/keeper-bench/Runner.h
@@ -0,0 +1,79 @@
+#pragma once
+#include <Common/ZooKeeper/ZooKeeperImpl.h>
+#include "Generator.h"
+#include <Common/ZooKeeper/IKeeper.h>
+#include <Common/ZooKeeper/ZooKeeperCommon.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
+#include <pcg-random/pcg_random.hpp>
+#include <Common/randomSeed.h>
+#include <Common/InterruptListener.h>
+
+#include <Core/Types.h>
+#include "Stats.h"
+
+using Ports = std::vector<UInt16>;
+using Strings = std::vector<std::string>;
+
+class Runner
+{
+public:
+    Runner(
+        size_t concurrency_,
+        const std::string & generator_name,
+        const Strings & hosts_strings_,
+        double max_time_,
+        double delay_,
+        bool continue_on_error_,
+        size_t max_iterations_)
+        : concurrency(concurrency_)
+        , pool(concurrency)
+        , hosts_strings(hosts_strings_)
+        , generator(getGenerator(generator_name))
+        , max_time(max_time_)
+        , delay(delay_)
+        , continue_on_error(continue_on_error_)
+        , max_iterations(max_iterations_)
+        , info(std::make_shared<Stats>())
+        , queue(concurrency)
+    {
+    }
+
+    void thread(std::vector<std::shared_ptr<Coordination::ZooKeeper>> & zookeepers);
+
+    void printNumberOfRequestsExecuted(size_t num)
+    {
+        std::cerr << "Requests executed: " << num << ".\n";
+    }
+
+    bool tryPushRequestInteractively(const Coordination::ZooKeeperRequestPtr & request, DB::InterruptListener & interrupt_listener);
+
+    void runBenchmark();
+
+
+private:
+
+    size_t concurrency = 1;
+
+    ThreadPool pool;
+    Strings hosts_strings;
+    std::unique_ptr<IGenerator> generator;
+    double max_time = 0;
+    double delay = 1;
+    bool continue_on_error = false;
+    std::atomic<size_t> max_iterations = 0;
+    std::atomic<size_t> requests_executed = 0;
+    std::atomic<bool> shutdown = false;
+
+    std::shared_ptr<Stats> info;
+
+    Stopwatch total_watch;
+    Stopwatch delay_watch;
+
+    std::mutex mutex;
+
+    using Queue = ConcurrentBoundedQueue<Coordination::ZooKeeperRequestPtr>;
+    Queue queue;
+
+    std::vector<std::shared_ptr<Coordination::ZooKeeper>> getConnections();
+};
diff --git a/utils/keeper-bench/Stats.cpp b/utils/keeper-bench/Stats.cpp
new file mode 100644
index 00000000000..1f8b02ed09d
--- /dev/null
+++ b/utils/keeper-bench/Stats.cpp
@@ -0,0 +1,67 @@
+#include "Stats.h"
+#include <iostream>
+
+void report(std::shared_ptr<Stats> & info, size_t concurrency)
+{
+    std::cerr << "\n";
+
+    /// Avoid zeros, nans or exceptions
+    if (0 == info->read_requests && 0 == info->write_requests)
+        return;
+
+    double read_seconds = info->read_work_time / concurrency;
+    double write_seconds = info->write_work_time / concurrency;
+
+    std::cerr << "read requests " << info->read_requests << ", write requests " << info->write_requests << ", ";
+    if (info->errors)
+    {
+        std::cerr << "errors " << info->errors << ", ";
+    }
+    if (0 != info->read_requests)
+    {
+        std::cerr
+            << "Read RPS: " << (info->read_requests / read_seconds) << ", "
+            << "Read MiB/s: " << (info->requests_read_bytes / read_seconds / 1048576);
+        if (0 != info->write_requests)
+            std::cerr << ", ";
+    }
+    if (0 != info->write_requests)
+    {
+        std::cerr
+            << "Write RPS: " << (info->write_requests / write_seconds) << ", "
+            << "Write MiB/s: " << (info->requests_write_bytes / write_seconds / 1048576) << ". "
+            << "\n";
+    }
+    std::cerr << "\n";
+
+    auto print_percentile = [&](double percent, Stats::Sampler & sampler)
+    {
+        std::cerr << percent << "%\t\t";
+        std::cerr << sampler.quantileNearest(percent / 100.0) << " sec.\t";
+        std::cerr << "\n";
+    };
+
+    if (0 != info->read_requests)
+    {
+        std::cerr << "Read sampler:\n";
+        for (int percent = 0; percent <= 90; percent += 10)
+            print_percentile(percent, info->read_sampler);
+
+        print_percentile(95, info->read_sampler);
+        print_percentile(99, info->read_sampler);
+        print_percentile(99.9, info->read_sampler);
+        print_percentile(99.99, info->read_sampler);
+    }
+
+    if (0 != info->write_requests)
+    {
+        std::cerr << "Write sampler:\n";
+        for (int percent = 0; percent <= 90; percent += 10)
+            print_percentile(percent, info->write_sampler);
+
+        print_percentile(95, info->write_sampler);
+        print_percentile(99, info->write_sampler);
+        print_percentile(99.9, info->write_sampler);
+        print_percentile(99.99, info->write_sampler);
+    }
+}
diff --git a/utils/keeper-bench/Stats.h b/utils/keeper-bench/Stats.h
new file mode 100644
index 00000000000..1b9a31bb734
--- /dev/null
+++ b/utils/keeper-bench/Stats.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <vector>
+#include <atomic>
+
+#include <AggregateFunctions/ReservoirSampler.h>
+
+struct Stats
+{
+    std::atomic<size_t> read_requests{0};
+    std::atomic<size_t> write_requests{0};
+    size_t errors = 0;
+    size_t requests_write_bytes = 0;
+    size_t requests_read_bytes = 0;
+    double read_work_time = 0;
+    double write_work_time = 0;
+
+    using Sampler = ReservoirSampler<double>;
+    Sampler read_sampler {1 << 16};
+    Sampler write_sampler {1 << 16};
+
+    void addRead(double seconds, size_t requests_inc, size_t bytes_inc)
+    {
+        read_work_time += seconds;
+        read_requests += requests_inc;
+        requests_read_bytes += bytes_inc;
+        read_sampler.insert(seconds);
+    }
+
+    void addWrite(double seconds, size_t requests_inc, size_t bytes_inc)
+    {
+        write_work_time += seconds;
+        write_requests += requests_inc;
+        requests_write_bytes += bytes_inc;
+        write_sampler.insert(seconds);
+    }
+
+    void clear()
+    {
+        read_requests = 0;
+        write_requests = 0;
+        read_work_time = 0;
+        write_work_time = 0;
+        requests_read_bytes = 0;
+        requests_write_bytes = 0;
+        read_sampler.clear();
+        write_sampler.clear();
+    }
+};
+
+
+void report(std::shared_ptr<Stats> & info, size_t concurrency);
diff --git a/utils/keeper-bench/main.cpp b/utils/keeper-bench/main.cpp
new file mode 100644
index 00000000000..378d7c2f6e4
--- /dev/null
+++ b/utils/keeper-bench/main.cpp
@@ -0,0 +1,61 @@
+#include <iostream>
+#include <boost/program_options.hpp>
+#include "Runner.h"
+#include "Stats.h"
+#include "Generator.h"
+#include <Common/TerminalSize.h>
+#include <Core/Types.h>
+
+using namespace std;
+
+int main(int argc, char *argv[])
+{
+
+    bool print_stacktrace = true;
+
+    try
+    {
+        using boost::program_options::value;
+
+        boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
+        desc.add_options()
+            ("help",                                                            "produce help message")
+            ("generator",     value<std::string>()->default_value("create_small_data"),             "query to execute")
+            ("concurrency,c", value<unsigned>()->default_value(1),              "number of parallel queries")
+            ("delay,d",       value<double>()->default_value(1),                "delay between intermediate reports in seconds (set 0 to disable reports)")
+            ("iterations,i",  value<size_t>()->default_value(0),                "amount of queries to be executed")
+            ("timelimit,t",   value<double>()->default_value(0.),               "stop launch of queries after specified time limit")
+            ("hosts,h",        value<Strings>()->multitoken(),                   "")
+            ("continue_on_errors", "continue testing even if a query fails")
+            ("reconnect", "establish new connection for every query")
+        ;
+
+        boost::program_options::variables_map options;
+        boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
+        boost::program_options::notify(options);
+
+        if (options.count("help"))
+        {
+            std::cout << "Usage: " << argv[0] << " [options] < queries.txt\n";
+            std::cout << desc << "\n";
+            return 1;
+        }
+
+        Runner runner(options["concurrency"].as<unsigned>(),
+            options["generator"].as<std::string>(),
+            options["hosts"].as<Strings>(),
+            options["timelimit"].as<double>(),
+            options["delay"].as<double>(),
+            options.count("continue_on_errors"),
+            options["iterations"].as<size_t>());
+
+        runner.runBenchmark();
+
+        return 0;
+    }
+    catch (...)
+    {
+        std::cerr << DB::getCurrentExceptionMessage(print_stacktrace, true) << std::endl;
+        return DB::getCurrentExceptionCode();
+    }
+}
diff --git a/utils/list-licenses/list-licenses.sh b/utils/list-licenses/list-licenses.sh
index 8eee3f97253..cdb3e3983ff 100755
--- a/utils/list-licenses/list-licenses.sh
+++ b/utils/list-licenses/list-licenses.sh
@@ -2,8 +2,9 @@
 
 ROOT_PATH="$(git rev-parse --show-toplevel)"
 LIBS_PATH="${ROOT_PATH}/contrib"
+LC_ALL=C
 
-ls -1 -d ${LIBS_PATH}/*/ | grep -F -v -- '-cmake' | while read LIB; do
+ls -1 -d ${LIBS_PATH}/*/ | grep -F -v -- '-cmake' | sort | while read LIB; do
     LIB_NAME=$(basename $LIB)
 
     LIB_LICENSE=$(
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index 3e1073b8529..e08a6ad0ffe 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,12 +1,32 @@
+v21.5.6.6-stable	2021-05-29
+v21.5.5.12-stable	2021-05-20
+v21.4.7.3-stable	2021-05-19
+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.12.2-lts	2021-05-25
+v21.3.11.5-lts	2021-05-14
+v21.3.10.1-lts	2021-05-09
+v21.3.9.83-lts	2021-04-28
+v21.3.8.76-lts	2021-04-24
+v21.3.7.62-stable	2021-04-16
+v21.3.6.55-lts	2021-04-12
+v21.3.5.42-lts	2021-04-07
 v21.3.4.25-lts	2021-03-28
 v21.3.3.14-lts	2021-03-19
 v21.3.2.5-lts	2021-03-12
+v21.2.10.48-stable	2021-04-16
+v21.2.9.41-stable	2021-04-12
+v21.2.8.31-stable	2021-04-07
 v21.2.7.11-stable	2021-03-28
 v21.2.6.1-stable	2021-03-15
 v21.2.5.5-stable	2021-03-02
 v21.2.4.6-stable	2021-02-20
 v21.2.3.15-stable	2021-02-14
 v21.2.2.8-stable	2021-02-07
+v21.1.9.41-stable	2021-04-13
+v21.1.8.30-stable	2021-04-07
 v21.1.7.1-stable	2021-03-15
 v21.1.6.13-stable	2021-03-02
 v21.1.5.4-stable	2021-02-20
@@ -39,6 +59,9 @@ v20.9.5.5-stable	2020-11-13
 v20.9.4.76-stable	2020-10-29
 v20.9.3.45-stable	2020-10-09
 v20.9.2.20-stable	2020-09-22
+v20.8.18.32-lts	2021-04-16
+v20.8.17.25-lts	2021-04-08
+v20.8.16.20-lts	2021-04-06
 v20.8.15.11-lts	2021-04-01
 v20.8.14.4-lts	2021-03-03
 v20.8.13.15-lts	2021-02-20
diff --git a/utils/memcpy-bench/CMakeLists.txt b/utils/memcpy-bench/CMakeLists.txt
index 5fcde231688..5353b6fb68e 100644
--- a/utils/memcpy-bench/CMakeLists.txt
+++ b/utils/memcpy-bench/CMakeLists.txt
@@ -15,6 +15,10 @@ 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")
+endif()
+
 set_source_files_properties(FastMemcpy.cpp PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast")
 set_source_files_properties(FastMemcpy_Avx.cpp PROPERTIES COMPILE_FLAGS "-mavx -Wno-old-style-cast -Wno-cast-qual -Wno-cast-align")
 
diff --git a/utils/memcpy-bench/memcpy-bench.cpp b/utils/memcpy-bench/memcpy-bench.cpp
index b607c45370d..025c9100f75 100644
--- a/utils/memcpy-bench/memcpy-bench.cpp
+++ b/utils/memcpy-bench/memcpy-bench.cpp
@@ -299,8 +299,8 @@ static void * memcpySSE2Unrolled8(void * __restrict destination, const void * __
 
 
 //static __attribute__((__always_inline__, __target__("sse2")))
-__attribute__((__always_inline__))
-void memcpy_my_medium_sse(uint8_t * __restrict & dst, const uint8_t * __restrict & src, size_t & size)
+__attribute__((__always_inline__)) inline void
+memcpy_my_medium_sse(uint8_t * __restrict & dst, const uint8_t * __restrict & src, size_t & size)
 {
     /// Align destination to 16 bytes boundary.
     size_t padding = (16 - (reinterpret_cast<size_t>(dst) & 15)) & 15;
diff --git a/utils/package/arch/CMakeLists.txt b/utils/package/arch/CMakeLists.txt
index e77819f6d98..4ee754fec56 100644
--- a/utils/package/arch/CMakeLists.txt
+++ b/utils/package/arch/CMakeLists.txt
@@ -1,2 +1,2 @@
-include (${ClickHouse_SOURCE_DIR}/cmake/version.cmake)
+include ("${ClickHouse_SOURCE_DIR}/cmake/version.cmake")
 configure_file (PKGBUILD.in PKGBUILD)
diff --git a/utils/release/release_lib.sh b/utils/release/release_lib.sh
index 896fa7f08a0..efa41ae22ad 100644
--- a/utils/release/release_lib.sh
+++ b/utils/release/release_lib.sh
@@ -91,9 +91,12 @@ function gen_revision_author {
 
             git_describe=`git describe`
             git_hash=`git rev-parse HEAD`
+            VERSION_DATE=`git show -s --format=%cs $git_hash`
+
             sed -i -e "s/SET(VERSION_REVISION [^) ]*/SET(VERSION_REVISION $VERSION_REVISION/g;" \
                 -e "s/SET(VERSION_DESCRIBE [^) ]*/SET(VERSION_DESCRIBE $git_describe/g;" \
                 -e "s/SET(VERSION_GITHASH [^) ]*/SET(VERSION_GITHASH $git_hash/g;" \
+                -e "s/SET(VERSION_DATE [^) ]*/SET(VERSION_DATE $VERSION_DATE/g;" \
                 -e "s/SET(VERSION_MAJOR [^) ]*/SET(VERSION_MAJOR $VERSION_MAJOR/g;" \
                 -e "s/SET(VERSION_MINOR [^) ]*/SET(VERSION_MINOR $VERSION_MINOR/g;" \
                 -e "s/SET(VERSION_PATCH [^) ]*/SET(VERSION_PATCH $VERSION_PATCH/g;" \
diff --git a/utils/zookeeper-cli/CMakeLists.txt b/utils/zookeeper-cli/CMakeLists.txt
index 96c72744d33..2199a1b38ff 100644
--- a/utils/zookeeper-cli/CMakeLists.txt
+++ b/utils/zookeeper-cli/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_executable(clickhouse-zookeeper-cli zookeeper-cli.cpp)
 target_link_libraries(clickhouse-zookeeper-cli PRIVATE clickhouse_common_zookeeper)
-INSTALL(TARGETS clickhouse-zookeeper-cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse-utils)
diff --git a/utils/zookeeper-test/CMakeLists.txt b/utils/zookeeper-test/CMakeLists.txt
index aa26c840ba3..56a1d3e380b 100644
--- a/utils/zookeeper-test/CMakeLists.txt
+++ b/utils/zookeeper-test/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_executable(zk-test main.cpp)
 target_link_libraries(zk-test PRIVATE clickhouse_common_zookeeper)
-INSTALL(TARGETS zk-test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse-utils)
diff --git a/utils/zookeeper-test/main.cpp b/utils/zookeeper-test/main.cpp
index 102c30e59a1..39a282ce258 100644
--- a/utils/zookeeper-test/main.cpp
+++ b/utils/zookeeper-test/main.cpp
@@ -73,8 +73,7 @@ void testCreateList(zkutil::ZooKeeper & zk)
 void testCreateSetVersionRequest(zkutil::ZooKeeper & zk)
 {
     zk.create("/data/check_data", "d", zkutil::CreateMode::Persistent);
-    Coordination::Stat stat;
-    std::string result = zk.get("/data/check_data", &stat);
+    Coordination::Stat stat{};
     try
     {
         zk.set("/data/check_data", "e", stat.version + 2);
@@ -224,7 +223,7 @@ std::string random_string(size_t length)
         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
         "abcdefghijklmnopqrstuvwxyz";
         const size_t max_index = (sizeof(charset) - 1);
-        return charset[rand() % max_index];
+        return charset[rand() % max_index]; /// NOLINT
     };
     std::string str(length, 0);
     std::generate_n(str.begin(), length, randchar);
@@ -259,9 +258,9 @@ void createOnPrefix(const std::string & zkhost, const String & path_prefix, size
             holder_futures.push_back(zk.asyncCreate(path, random_string(datasize), zkutil::CreateMode::Persistent));
         }
 
-        for (size_t i = 0; i < holder_futures.size(); ++i)
-            holder_futures[i].get();
-        }
+        for (auto & future : holder_futures)
+            future.get();
+    }
     catch (...)
     {
         ::exit(-1);
diff --git a/website/benchmark/dbms/queries.js b/website/benchmark/dbms/queries.js
index c92353ab0f2..f3cf25f2c8d 100644
--- a/website/benchmark/dbms/queries.js
+++ b/website/benchmark/dbms/queries.js
@@ -1,4 +1,4 @@
-var current_data_size = 1000000000;
+var current_data_size = 100000000;
 
 var current_systems = ["ClickHouse", "Vertica", "Greenplum"];
 
diff --git a/website/benchmark/hardware/index.html b/website/benchmark/hardware/index.html
index a57930b279d..71d3333432e 100644
--- a/website/benchmark/hardware/index.html
+++ b/website/benchmark/hardware/index.html
@@ -76,6 +76,7 @@ Results for Digitalocean (Storage-intesinve VMs) + (CPU/GP) are from <b>Yiğit K
 Results for 2x AMD EPYC 7F72 3.2 Ghz (Total 96 Cores, IBM Cloud's Bare Metal Service) from <b>Yiğit Konur</b> and <b>Metehan Çetinkaya</b> of seo.do.<br/>
 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/>
 </p>
     </div>
 </div>
diff --git a/website/benchmark/hardware/results/amd_ryzen_9_3950x.json b/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
index 8760a235521..caa5a443e54 100644
--- a/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
+++ b/website/benchmark/hardware/results/amd_ryzen_9_3950x.json
@@ -1,6 +1,6 @@
 [
     {
-        "system":       "AMD Ryzen 9",
+        "system":       "AMD Ryzen 9 (2020)",
         "system_full":       "AMD Ryzen 9 3950X 16-Core Processor, 64 GiB RAM, Intel Optane 900P 280 GB",
         "time":         "2020-03-14 00:00:00",
         "kind":         "desktop",
@@ -52,7 +52,7 @@
         ]
     },
     {
-        "system":       "AMD Ryzen 9",
+        "system":       "AMD Ryzen 9 (2021)",
         "system_full":       "AMD Ryzen 9 3950X 16-Core Processor, 64 GiB RAM, Samsung evo 970 plus 1TB",
         "time":         "2021-03-08 00:00:00",
         "kind":         "desktop",
diff --git a/website/benchmark/hardware/results/macbook_air_m1.json b/website/benchmark/hardware/results/macbook_air_m1.json
new file mode 100644
index 00000000000..33f15d02480
--- /dev/null
+++ b/website/benchmark/hardware/results/macbook_air_m1.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "MacBook Air M1",
+        "system_full":  "MacBook Air M1 13\" 2020, 8‑core CPU, 16 GiB RAM, 512 GB SSD",
+        "time":         "2021-04-11 00:00:00",
+        "kind":         "laptop",
+        "result":
+        [
+[0.003, 0.001, 0.001],
+[0.019, 0.014, 0.014],
+[0.042, 0.034, 0.033],
+[0.101, 0.043, 0.041],
+[0.100, 0.102, 0.101],
+[0.394, 0.283, 0.289],
+[0.029, 0.027, 0.027],
+[0.018, 0.018, 0.018],
+[0.511, 0.489, 0.494],
+[0.620, 0.615, 0.618],
+[0.217, 0.200, 0.197],
+[0.237, 0.235, 0.242],
+[0.774, 0.762, 0.761],
+[0.969, 0.982, 0.969],
+[0.896, 0.887, 0.861],
+[0.999, 0.943, 0.945],
+[3.343, 2.426, 2.366],
+[1.463, 1.414, 1.382],
+[4.958, 4.268, 4.257],
+[0.056, 0.050, 0.049],
+[1.696, 0.851, 0.846],
+[1.036, 1.104, 1.174],
+[4.326, 2.224, 2.255],
+[1.397, 1.038, 1.055],
+[0.317, 0.310, 0.305],
+[0.274, 0.284, 0.269],
+[0.317, 0.316, 0.313],
+[0.943, 0.952, 0.951],
+[2.794, 1.427, 1.433],
+[1.606, 1.600, 1.605],
+[0.751, 0.691, 0.679],
+[1.532, 1.000, 0.952],
+[9.679, 8.895, 7.967],
+[7.001, 4.472, 4.050],
+[4.790, 3.971, 3.987],
+[1.215, 1.204, 1.256],
+[0.129, 0.125, 0.119],
+[0.057, 0.061, 0.056],
+[0.045, 0.043, 0.043],
+[0.256, 0.247, 0.249],
+[0.020, 0.014, 0.013],
+[0.013, 0.011, 0.012],
+[0.009, 0.009, 0.009]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json b/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json
new file mode 100644
index 00000000000..ed25794c77b
--- /dev/null
+++ b/website/benchmark/hardware/results/qemu_aarch64_cascade_lake_80_vcpu.json
@@ -0,0 +1,55 @@
+[
+    {
+        "system":       "Intel 80vCPU, QEMU, AArch64",
+        "system_full":  "Intel Cascade Lake 80vCPU running AArch64 ClickHouse under qemu-aarch64 version 4.2.1 (userspace emulation)",
+        "cpu_vendor":   "Intel",
+        "time":         "2021-04-05 00:00:00",
+        "kind":         "cloud",
+        "result":
+        [
+[0.045, 0.006, 0.006],
+[0.366, 0.201, 0.576],
+[0.314, 0.144, 0.152],
+[0.701, 0.111, 0.110],
+[0.308, 0.259, 0.261],
+[1.009, 0.642, 0.658],
+[0.160, 0.087, 0.086],
+[0.123, 0.079, 0.080],
+[0.570, 0.458, 0.454],
+[0.708, 0.540, 0.547],
+[0.541, 0.460, 0.464],
+[0.578, 0.524, 0.531],
+[0.927, 0.908, 0.906],
+[1.075, 0.992, 1.051],
+[1.055, 0.965, 0.991],
+[0.904, 0.790, 0.781],
+[2.076, 2.134, 2.121],
+[1.668, 1.648, 1.615],
+[4.134, 3.879, 4.002],
+[0.142, 0.103, 0.105],
+[7.018, 1.479, 1.515],
+[1.618, 1.643, 1.680],
+[6.516, 3.172, 3.182],
+[6.028, 2.070, 2.076],
+[0.608, 0.559, 0.577],
+[0.548, 0.515, 0.516],
+[0.598, 0.564, 0.563],
+[1.562, 1.529, 1.537],
+[5.968, 2.311, 2.375],
+[3.263, 3.239, 3.279],
+[1.134, 0.903, 0.928],
+[2.987, 1.270, 1.284],
+[6.256, 5.665, 5.320],
+[3.020, 3.148, 3.109],
+[3.092, 3.131, 3.146],
+[1.183, 1.140, 1.185],
+[0.762, 0.704, 0.715],
+[0.412, 0.380, 0.385],
+[0.376, 0.330, 0.327],
+[1.505, 1.532, 1.503],
+[0.201, 0.133, 0.130],
+[0.173, 0.123, 0.150],
+[0.070, 0.028, 0.028]
+        ]
+    }
+]
diff --git a/website/blog/en/2021/code-review.md b/website/blog/en/2021/code-review.md
new file mode 100644
index 00000000000..dcde371629b
--- /dev/null
+++ b/website/blog/en/2021/code-review.md
@@ -0,0 +1,83 @@
+---
+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'
+date: '2021-04-14'
+author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
+tags: ['code review', 'development']
+---
+
+
+Code review is one of the few software development techniques that are consistently found to reduce the incidence of defects. Why is it effective? This article offers some wild conjecture on this topic, complete with practical advice on getting the most out of your code review.
+
+
+## Understanding Why Your Program Works
+
+As software developers, we routinely have to reason about the behaviour of software. For example, to fix a bug, we start with a test case that exhibits the behavior in question, and then read the source code to see how this behavior arises. Often we find ourselves unable to understand anything, having to resort to forensic techniques such as using a debugger or interrogating the author of the code. This situation is far from ideal. After all, if we have trouble understanding our software, how can we be sure it works at all? No surprise that it doesn't.
+
+The correct understanding is also important when modifying and extending software. A programmer must always have a precise mental model on what is going on in the program, how exactly it maps to the domain, and so on. If there are flaws in this model, the code they write won't match the domain and won't solve the problem correctly. Wrong understanding directly causes bugs.
+
+How can we make our software easier to understand? It is often said that to see if you really understand something, you have to try explaining it to somebody. For example, as a science student taking an exam, you might be expected to give an explanation to some well-known observed effect, deriving it from the basic laws of this domain. In a similar way, if we are modeling some problem in software, we can start from domain knowledge and general programming knowledge, and build an argument as to why our model is applicable to the problem, why it is correct, has optimal performance and so on. This explanation takes the form of code comments, or, at a higher level, design documents.
+
+If you have a habit of thoroughly commenting your code, you might have noticed that writing the comments is often much harder than writing the code itself. It also has an unpleasant side effect &mdash; at times, while writing a comment, it becomes increasingly clear to you that the code is incomprehensible and takes forever to explain, or maybe is downright wrong, and you have to rewrite it. This is exactly the major positive effect of writing the comments. It helps you find bugs and make the code more understandable, and you wouldn't have noticed these problems unless you tried to explain the code.
+
+Understanding why your program works is inseparable from understanding why it fails, so it's no surprise that there is a similar process for the latter, called "rubber duck debugging". To debug a particularly nasty bug, you start explaining the program logic step by step to an imaginary partner or even to an inanimate object such as a yellow rubber duck. This process is often very effective, much in excess of what one would expect given the limited conversational abilities of rubber ducks. The underlying mechanism is probably the same as with comments &mdash; you start to understand your program better by just trying to explain it, and this lets you find bugs.
+
+When working in a team, you even have a luxury of explaining your code to another developer who works on the same project. It's probably more entertaining than talking to a duck. More importantly, they are going to maintain the code you wrote, so better make sure that _they_ can understand it as well. A good formal occasion for explaining how your code works is the code review process. Let's see how you can get the most out of it, in terms of making your code understandable.
+
+## Reviewing Others Code
+
+Code review is often framed as a gatekeeping process, where each contribution is vetted by maintainers to ensure that it is in line with project direction, has acceptable quality, meets the coding guidelines and so on. This perspective might seem natural when dealing with external contributions, but makes less sense if you apply it to internal ones. After all, our fellow maintainers have perfect understanding of project goals and guidelines, probably they are more talented and experienced than us, and can be trusted to produce the best solution possible. How can an additional review be helpful?
+
+A less-obvious, but very important, part of reviewing the code is just seeing whether it can be understood by another person. It is helpful regardless of the administrative roles and programming proficiency of the parties. What should you do as a reviewer if ease of understanding is your main priority?
+
+You probably don't need to be concerned with trivia such as code style. There are automated tools for that. You might find some bugs, but this is probably a side effect. Your main task is making sense of the code.
+
+Start with checking the high-level description of the problem that the pull request is trying to solve. Read the description of the bug it fixes, or the docs for the feature it adds. For bigger features, there is normally a design document that describes the overall implementation without getting too deep into the code details. After you understand the problem, start reading the code. Does it make sense to you? You shouldn't try too hard to understand it. Imagine that you are tired and under time pressure. If you feel you have to make a lot of effort to understand the code, ask the author for clarifications. As you talk, you might discover that the code is not correct, or it may be rewritten in a more straightforward way, or it needs more comments.
+
+<img src="https://blog-images.clickhouse.tech/en/2021/code-review/hidden-items.png"/>
+
+After you get the answers, don't forget to update the code and the comments to reflect them. Don't just stop after getting it explained to you personally. If you had a question as a reviewer, chances are that other people will also have this question later, but there might be nobody around to ask. They will have to resort to `git blame` and re-reading the entire pull request or several of them. Code archaeology is sometimes fun, but it's the last thing you want to do when you are investigating an urgent bug. All the answers should be on the surface.
+
+Working with the author, you should ensure that the code is mostly obvious to anyone with basic domain and programming knowledge, and all non-obvious parts are clearly explained.
+
+### Preparing Your Code For Review
+
+As an author, you can also do some things to make your code easier to understand for the reviewer.
+
+First of all, if you are implementing a major feature, it probably needs a round of design review before you even start writing code. Skipping a design review and jumping right into the code review can be a major source of frustration, because it might turn out that even the problem you are solving was formulated incorrectly, and all your work has to be thrown away. Of course, this is not prevented completely by design review, either. Programming is an iterative, exploratory activity, and in complex cases you only begin to grasp the problem after implementing a first solution, which you then realize is incorrect and has to be thrown away.
+
+When preparing your code for review, your major objective is to make your problem and its solution clear to the reviewer. A good tool for this is code comments. Any sizable piece of logic should have an introductory comment describing its general purpose and outlining the implementation. This description can reference similar features, explain the difference to them, explain how it interfaces with other subsystems. A good place to put this general description is a function that serves as a main entry point for the feature, or other form of its public interface, or the most significant class, or the file containing the implementation, and so on.
+
+Drilling down to each block of code, you should be able to explain what it does, why it does that, why this way and not another. If there are several ways of doing the thing, why did you choose this one? Of course, for some code these things follow from the more general comments and don't have to be restated. The mechanics of data manipulation should be apparent from the code itself. If you find yourself explaining a particular feature of the language, it's probably best not to use it.
+
+Pay special attention to making the data structures apparent in the code, and their meaning and invariants well commented. The choice of data structures ultimately determines which algorithms you can apply, and sets the limits of performance, which is another reason why we should care about it as ClickHouse developers. 
+
+When explaining the code, it is important to give your reader enough context, so that they can understand you without a deep investigation of the surrounding systems and obscure test cases. Give pointers to all the things that might be relevant to the task. If you know some corner cases which your code has to handle, describe them in enough detail so that they can be reproduced. If there is a relevant standard or a design document, reference it, or even quote it inline. If you're relying on some invariant in other system, mention it. It is good practice to add programmatic checks that mirror your comments, when it is easy to do so. Your comment about an invariant should be accompanied by an assertion, and an important scenario should be reproduced by a test case.
+
+Don't worry about being too verbose. There is often not enough comments, but almost never too much of them.
+
+## Common Concerns about Code Comments
+
+It is common to hear objections to the idea of commenting the code, so let's discuss a couple of usual ones.
+
+### Self-documenting Code
+
+You can often see a perplexing idea that the source code can somehow be "self-documenting", or that the comments are a "code smell", and their presence indicates that the code is badly written. I have trouble imagining how this belief can be compatible with any experience in maintaining sufficiently complex and large software, over the years, in collaboration with others. The code and the comments describe different parts of the solution. The code describes the data structures and their transformations, but it cannot convey meaning. The names in the code serve as pointers that map the data and its transformations to the domain concepts, but they are schematic and lack nuance. It is not so difficult to write code that makes it easy to understand what's going on in terms of data manipulation. What it takes is mostly moderation, that is, stopping yourself from being too clever. For most code, it is easy to see what it does, but why? Why this way and not that way? Why is it correct? Why this fast path here helps? Why did you choose this data layout? How is this invariant guaranteed? And so on. This might be not so evident for a developer who is working alone on a short-lived project, because they have all the necessary context in their head. But when they have to work with other people (or even with themselves from past and future), or in an unfamiliar area, the importance of non-code, higher-level context becomes painfully clear. The idea that we should, or even can, somehow encode comments such as [this one](https://github.com/ClickHouse/ClickHouse/blob/26d5db32ae5c9f54b8825e2eca1f077a3b17c84a/src/Storages/MergeTree/KeyCondition.cpp#L1312-L1347) into names or control flow is just absurd.
+
+### Obsolete Comments
+
+The comments can't be checked by the compiler or the tests, so there is no automated way to make sure that they are up to date with the rest of the comments and the code. The possibility of comments gradually getting incorrect is sometimes used as an argument against having any comments at all.
+
+This problem is not exclusive to the comments &mdash; the code also can and does become obsolete. Simple cases such as dead code can be detected by static analysis or studying the test coverage of code. More complex cases can only be found by proofreading, such as maintaining an invariant that is not important anymore, or preparing some data that is not needed.
+
+While an obsolete comment can lead to a mistake, the same applies, perhaps more strongly, to the lack of comments. When you need some higher-level knowledge about the code, but it is not written down, you are forced to perform an entire investigation from first principles to understand what's going on, and this is error-prone. Even an obsolete comment likely gives a better starting point than nothing. Moreover, in a code base that makes an active use of the comments, they tend to be mostly correct. This is because the developers rely on comments, read and write them, pay attention to them during code review. The comments are routinely changed along with changing the code, and the outdated comments are soon noticed and fixed. This does require some habit. A lone comment in a vast desert of impenetrable self-documenting code is not going to fare well.
+
+
+## Conclusion
+
+Code review makes your software better, and a significant part of this probably comes from trying to understand what your software actually does. By paying attention specifically to this aspect of code review, you can make it even more efficient. You'll have less bugs, and your code will be easier to maintain &mdash; and what else could we ask for as software developers?
+
+
+_2021-04-13 [Alexander Kuzmenkov](https://github.com/akuzm). Title photo by [Nikita Mikhaylov](https://github.com/nikitamikhaylov)_
+
+_P.S. This text contains the personal opinions of the author, and is not an authoritative manual for ClickHouse maintainers._
diff --git a/website/css/blog.css b/website/css/blog.css
index 064dbf3d975..089856b8e00 100644
--- a/website/css/blog.css
+++ b/website/css/blog.css
@@ -11,14 +11,6 @@ body.blog .dropdown-item:focus {
     background: #eee;
 }
 
-.comment-even {
-  background: #fff;
-}
-
-.comment-odd, .comments-bg {
-  background: #f8f9fa;
-}
-
 @media (prefers-color-scheme: dark) {
   body.blog .dropdown-item {
     color: #fff !important;
@@ -33,12 +25,4 @@ body.blog .dropdown-item:focus {
   .blog .social-icon {
     background: #444451;
   }
-
-  .comment-even {
-    background: #111;
-  }
-
-  .comment-odd, .comments-bg {
-    background: #333;
-  }
 }
diff --git a/website/js/embedd.min.js b/website/js/embedd.min.js
deleted file mode 100644
index bda09649faa..00000000000
--- a/website/js/embedd.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=11)}([function(e,t,n){"use strict";function r(e){return"[object Array]"===E.call(e)}function o(e){return"[object ArrayBuffer]"===E.call(e)}function i(e){return"undefined"!=typeof FormData&&e instanceof FormData}function u(e){return"undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(e):e&&e.buffer&&e.buffer instanceof ArrayBuffer}function c(e){return"string"==typeof e}function a(e){return"number"==typeof e}function s(e){return void 0===e}function f(e){return null!==e&&"object"==typeof e}function l(e){return"[object Date]"===E.call(e)}function p(e){return"[object File]"===E.call(e)}function d(e){return"[object Blob]"===E.call(e)}function h(e){return"[object Function]"===E.call(e)}function m(e){return f(e)&&h(e.pipe)}function v(e){return"undefined"!=typeof URLSearchParams&&e instanceof URLSearchParams}function y(e){return e.replace(/^\s*/,"").replace(/\s*$/,"")}function g(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product)&&("undefined"!=typeof window&&"undefined"!=typeof document)}function b(e,t){if(null!==e&&void 0!==e)if("object"!=typeof e&&(e=[e]),r(e))for(var n=0,o=e.length;n<o;n++)t.call(null,e[n],n,e);else for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&t.call(null,e[i],i,e)}function w(){function e(e,n){"object"==typeof t[n]&&"object"==typeof e?t[n]=w(t[n],e):t[n]=e}for(var t={},n=0,r=arguments.length;n<r;n++)b(arguments[n],e);return t}function x(e,t,n){return b(t,function(t,r){e[r]=n&&"function"==typeof t?j(t,n):t}),e}var j=n(6),S=n(19),E=Object.prototype.toString;e.exports={isArray:r,isArrayBuffer:o,isBuffer:S,isFormData:i,isArrayBufferView:u,isString:c,isNumber:a,isObject:f,isUndefined:s,isDate:l,isFile:p,isBlob:d,isFunction:h,isStream:m,isURLSearchParams:v,isStandardBrowserEnv:g,forEach:b,merge:w,extend:x,trim:y}},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t){function n(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function o(e){if(f===setTimeout)return setTimeout(e,0);if((f===n||!f)&&setTimeout)return f=setTimeout,setTimeout(e,0);try{return f(e,0)}catch(t){try{return f.call(null,e,0)}catch(t){return f.call(this,e,0)}}}function i(e){if(l===clearTimeout)return clearTimeout(e);if((l===r||!l)&&clearTimeout)return l=clearTimeout,clearTimeout(e);try{return l(e)}catch(t){try{return l.call(null,e)}catch(t){return l.call(this,e)}}}function u(){m&&d&&(m=!1,d.length?h=d.concat(h):v=-1,h.length&&c())}function c(){if(!m){var e=o(u);m=!0;for(var t=h.length;t;){for(d=h,h=[];++v<t;)d&&d[v].run();v=-1,t=h.length}d=null,m=!1,i(e)}}function a(e,t){this.fun=e,this.array=t}function s(){}var f,l,p=e.exports={};!function(){try{f="function"==typeof setTimeout?setTimeout:n}catch(e){f=n}try{l="function"==typeof clearTimeout?clearTimeout:r}catch(e){l=r}}();var d,h=[],m=!1,v=-1;p.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];h.push(new a(e,t)),1!==h.length||m||o(c)},a.prototype.run=function(){this.fun.apply(null,this.array)},p.title="browser",p.browser=!0,p.env={},p.argv=[],p.version="",p.versions={},p.on=s,p.addListener=s,p.once=s,p.off=s,p.removeListener=s,p.removeAllListeners=s,p.emit=s,p.prependListener=s,p.prependOnceListener=s,p.listeners=function(e){return[]},p.binding=function(e){throw new Error("process.binding is not supported")},p.cwd=function(){return"/"},p.chdir=function(e){throw new Error("process.chdir is not supported")},p.umask=function(){return 0}},function(e,t,n){"use strict";(function(t){function r(e,t){!o.isUndefined(e)&&o.isUndefined(e["Content-Type"])&&(e["Content-Type"]=t)}var o=n(0),i=n(21),u={"Content-Type":"application/x-www-form-urlencoded"},c={adapter:function(){var e;return"undefined"!=typeof XMLHttpRequest?e=n(7):void 0!==t&&(e=n(7)),e}(),transformRequest:[function(e,t){return i(t,"Content-Type"),o.isFormData(e)||o.isArrayBuffer(e)||o.isBuffer(e)||o.isStream(e)||o.isFile(e)||o.isBlob(e)?e:o.isArrayBufferView(e)?e.buffer:o.isURLSearchParams(e)?(r(t,"application/x-www-form-urlencoded;charset=utf-8"),e.toString()):o.isObject(e)?(r(t,"application/json;charset=utf-8"),JSON.stringify(e)):e}],transformResponse:[function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(e){}return e}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,validateStatus:function(e){return e>=200&&e<300}};c.headers={common:{Accept:"application/json, text/plain, */*"}},o.forEach(["delete","get","head"],function(e){c.headers[e]={}}),o.forEach(["post","put","patch"],function(e){c.headers[e]=o.merge(u)}),e.exports=c}).call(t,n(2))},function(e,t,n){(function(e,n,r,o){!function(e,n){n(t)}(0,function(t){"use strict";function i(e,t){t|=0;for(var n=Math.max(e.length-t,0),r=Array(n),o=0;o<n;o++)r[o]=e[t+o];return r}function u(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}function c(e){setTimeout(e,0)}function a(e){return function(t){var n=i(arguments,1);e(function(){t.apply(null,n)})}}function s(e){return ct(function(t,n){var r;try{r=e.apply(this,t)}catch(e){return n(e)}u(r)&&"function"==typeof r.then?r.then(function(e){f(n,null,e)},function(e){f(n,e.message?e:new Error(e))}):n(null,r)})}function f(e,t,n){try{e(t,n)}catch(e){ft(l,e)}}function l(e){throw e}function p(e){return lt&&"AsyncFunction"===e[Symbol.toStringTag]}function d(e){return p(e)?s(e):e}function h(e){return function(t){var n=i(arguments,1),r=ct(function(n,r){var o=this;return e(t,function(e,t){d(e).apply(o,n.concat(t))},r)});return n.length?r.apply(this,n):r}}function m(e){var t=yt.call(e,bt),n=e[bt];try{e[bt]=void 0;var r=!0}catch(e){}var o=gt.call(e);return r&&(t?e[bt]=n:delete e[bt]),o}function v(e){return xt.call(e)}function y(e){return null==e?void 0===e?St:jt:Et&&Et in Object(e)?m(e):v(e)}function g(e){if(!u(e))return!1;var t=y(e);return t==Tt||t==Lt||t==kt||t==At}function b(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=Ot}function w(e){return null!=e&&b(e.length)&&!g(e)}function x(){}function j(e){return function(){if(null!==e){var t=e;e=null,t.apply(this,arguments)}}}function S(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}function E(e){return null!=e&&"object"==typeof e}function k(e){return E(e)&&y(e)==Ft}function T(){return!1}function L(e,t){var n=typeof e;return!!(t=null==t?$t:t)&&("number"==n||"symbol"!=n&&Xt.test(e))&&e>-1&&e%1==0&&e<t}function A(e){return E(e)&&b(e.length)&&!!Qt[y(e)]}function O(e,t){var n=Bt(e),r=!n&&Mt(e),o=!n&&!r&&zt(e),i=!n&&!r&&!o&&en(e),u=n||r||o||i,c=u?S(e.length,String):[],a=c.length;for(var s in e)!t&&!nn.call(e,s)||u&&("length"==s||o&&("offset"==s||"parent"==s)||i&&("buffer"==s||"byteLength"==s||"byteOffset"==s)||L(s,a))||c.push(s);return c}function _(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||rn)}function C(e){if(!_(e))return on(e);var t=[];for(var n in Object(e))cn.call(e,n)&&"constructor"!=n&&t.push(n);return t}function R(e){return w(e)?O(e):C(e)}function F(e){var t=-1,n=e.length;return function(){return++t<n?{value:e[t],key:t}:null}}function U(e){var t=-1;return function(){var n=e.next();return n.done?null:(t++,{value:n.value,key:t})}}function I(e){var t=R(e),n=-1,r=t.length;return function(){var o=t[++n];return n<r?{value:e[o],key:o}:null}}function q(e){if(w(e))return F(e);var t=Rt(e);return t?U(t):I(e)}function M(e){return function(){if(null===e)throw new Error("Callback was already called.");var t=e;e=null,t.apply(this,arguments)}}function B(e){return function(t,n,r){function o(e,t){if(a-=1,e)c=!0,r(e);else{if(t===_t||c&&a<=0)return c=!0,r(null);s||i()}}function i(){for(s=!0;a<e&&!c;){var t=u();if(null===t)return c=!0,void(a<=0&&r(null));a+=1,n(t.value,t.key,M(o))}s=!1}if(r=j(r||x),e<=0||!t)return r(null);var u=q(t),c=!1,a=0,s=!1;i()}}function N(e,t,n,r){B(t)(e,d(n),r)}function P(e,t){return function(n,r,o){return e(n,t,r,o)}}function D(e,t,n){function r(e,t){e?n(e):++i!==u&&t!==_t||n(null)}n=j(n||x);var o=0,i=0,u=e.length;for(0===u&&n(null);o<u;o++)t(e[o],o,M(r))}function H(e){return function(t,n,r){return e(sn,t,d(n),r)}}function V(e,t,n,r){r=r||x,t=t||[];var o=[],i=0,u=d(n);e(t,function(e,t,n){var r=i++;u(e,function(e,t){o[r]=t,n(e)})},function(e){r(e,o)})}function z(e){return function(t,n,r,o){return e(B(n),t,d(r),o)}}function $(e,t){for(var n=-1,r=null==e?0:e.length;++n<r&&!1!==t(e[n],n,e););return e}function X(e,t){return e&&mn(e,t,R)}function Q(e,t,n,r){for(var o=e.length,i=n+(r?1:-1);r?i--:++i<o;)if(t(e[i],i,e))return i;return-1}function W(e){return e!==e}function J(e,t,n){for(var r=n-1,o=e.length;++r<o;)if(e[r]===t)return r;return-1}function G(e,t,n){return t===t?J(e,t,n):Q(e,W,n)}function K(e,t){for(var n=-1,r=null==e?0:e.length,o=Array(r);++n<r;)o[n]=t(e[n],n,e);return o}function Y(e){return"symbol"==typeof e||E(e)&&y(e)==yn}function Z(e){if("string"==typeof e)return e;if(Bt(e))return K(e,Z)+"";if(Y(e))return wn?wn.call(e):"";var t=e+"";return"0"==t&&1/e==-gn?"-0":t}function ee(e,t,n){var r=-1,o=e.length;t<0&&(t=-t>o?0:o+t),n=n>o?o:n,n<0&&(n+=o),o=t>n?0:n-t>>>0,t>>>=0;for(var i=Array(o);++r<o;)i[r]=e[r+t];return i}function te(e,t,n){var r=e.length;return n=void 0===n?r:n,!t&&n>=r?e:ee(e,t,n)}function ne(e,t){for(var n=e.length;n--&&G(t,e[n],0)>-1;);return n}function re(e,t){for(var n=-1,r=e.length;++n<r&&G(t,e[n],0)>-1;);return n}function oe(e){return e.split("")}function ie(e){return xn.test(e)}function ue(e){return e.match(_n)||[]}function ce(e){return ie(e)?ue(e):oe(e)}function ae(e){return null==e?"":Z(e)}function se(e,t,n){if((e=ae(e))&&(n||void 0===t))return e.replace(Cn,"");if(!e||!(t=Z(t)))return e;var r=ce(e),o=ce(t);return te(r,re(r,o),ne(r,o)+1).join("")}function fe(e){return e=e.toString().replace(In,""),e=e.match(Rn)[2].replace(" ",""),e=e?e.split(Fn):[],e=e.map(function(e){return se(e.replace(Un,""))})}function le(e,t){var n={};X(e,function(e,t){function r(t,n){var r=K(o,function(e){return t[e]});r.push(n),d(e).apply(null,r)}var o,i=p(e),u=!i&&1===e.length||i&&0===e.length;if(Bt(e))o=e.slice(0,-1),e=e[e.length-1],n[t]=o.concat(o.length>0?r:e);else if(u)n[t]=e;else{if(o=fe(e),0===e.length&&!i&&0===o.length)throw new Error("autoInject task functions require explicit parameters.");i||o.pop(),n[t]=o.concat(r)}}),vn(n,t)}function pe(){this.head=this.tail=null,this.length=0}function de(e,t){e.length=1,e.head=e.tail=t}function he(e,t,n){function r(e,t,n){if(null!=n&&"function"!=typeof n)throw new Error("task callback must be a function");if(f.started=!0,Bt(e)||(e=[e]),0===e.length&&f.idle())return ft(function(){f.drain()});for(var r=0,o=e.length;r<o;r++){var i={data:e[r],callback:n||x};t?f._tasks.unshift(i):f._tasks.push(i)}a||(a=!0,ft(function(){a=!1,f.process()}))}function o(e){return function(t){u-=1;for(var n=0,r=e.length;n<r;n++){var o=e[n],i=G(c,o,0);0===i?c.shift():i>0&&c.splice(i,1),o.callback.apply(o,arguments),null!=t&&f.error(t,o.data)}u<=f.concurrency-f.buffer&&f.unsaturated(),f.idle()&&f.drain(),f.process()}}if(null==t)t=1;else if(0===t)throw new Error("Concurrency must not be zero");var i=d(e),u=0,c=[],a=!1,s=!1,f={_tasks:new pe,concurrency:t,payload:n,saturated:x,unsaturated:x,buffer:t/4,empty:x,drain:x,error:x,started:!1,paused:!1,push:function(e,t){r(e,!1,t)},kill:function(){f.drain=x,f._tasks.empty()},unshift:function(e,t){r(e,!0,t)},remove:function(e){f._tasks.remove(e)},process:function(){if(!s){for(s=!0;!f.paused&&u<f.concurrency&&f._tasks.length;){var e=[],t=[],n=f._tasks.length;f.payload&&(n=Math.min(n,f.payload));for(var r=0;r<n;r++){var a=f._tasks.shift();e.push(a),c.push(a),t.push(a.data)}u+=1,0===f._tasks.length&&f.empty(),u===f.concurrency&&f.saturated();var l=M(o(e));i(t,l)}s=!1}},length:function(){return f._tasks.length},running:function(){return u},workersList:function(){return c},idle:function(){return f._tasks.length+u===0},pause:function(){f.paused=!0},resume:function(){!1!==f.paused&&(f.paused=!1,ft(f.process))}};return f}function me(e,t){return he(e,1,t)}function ve(e,t,n,r){r=j(r||x);var o=d(n);Mn(e,function(e,n,r){o(t,e,function(e,n){t=n,r(e)})},function(e){r(e,t)})}function ye(){var e=K(arguments,d);return function(){var t=i(arguments),n=this,r=t[t.length-1];"function"==typeof r?t.pop():r=x,ve(e,t,function(e,t,r){t.apply(n,e.concat(function(e){var t=i(arguments,1);r(e,t)}))},function(e,t){r.apply(n,[e].concat(t))})}}function ge(e){return e}function be(e,t){return function(n,r,o,i){i=i||x;var u,c=!1;n(r,function(n,r,i){o(n,function(r,o){r?i(r):e(o)&&!u?(c=!0,u=t(!0,n),i(null,_t)):i()})},function(e){e?i(e):i(null,c?u:t(!1))})}}function we(e,t){return t}function xe(e){return function(t){var n=i(arguments,1);n.push(function(t){var n=i(arguments,1);"object"==typeof console&&(t?console.error&&console.error(t):console[e]&&$(n,function(t){console[e](t)}))}),d(t).apply(null,n)}}function je(e,t,n){function r(e){if(e)return n(e);var t=i(arguments,1);t.push(o),c.apply(this,t)}function o(e,t){return e?n(e):t?void u(r):n(null)}n=M(n||x);var u=d(e),c=d(t);o(null,!0)}function Se(e,t,n){n=M(n||x);var r=d(e),o=function(e){if(e)return n(e);var u=i(arguments,1);if(t.apply(this,u))return r(o);n.apply(null,[null].concat(u))};r(o)}function Ee(e,t,n){Se(e,function(){return!t.apply(this,arguments)},n)}function ke(e,t,n){function r(e){if(e)return n(e);u(o)}function o(e,t){return e?n(e):t?void i(r):n(null)}n=M(n||x);var i=d(t),u=d(e);u(o)}function Te(e){return function(t,n,r){return e(t,r)}}function Le(e,t,n){sn(e,Te(d(t)),n)}function Ae(e,t,n,r){B(t)(e,Te(d(n)),r)}function Oe(e){return p(e)?e:ct(function(t,n){var r=!0;t.push(function(){var e=arguments;r?ft(function(){n.apply(null,e)}):n.apply(null,e)}),e.apply(this,t),r=!1})}function _e(e){return!e}function Ce(e){return function(t){return null==t?void 0:t[e]}}function Re(e,t,n,r){var o=new Array(t.length);e(t,function(e,t,r){n(e,function(e,n){o[t]=!!n,r(e)})},function(e){if(e)return r(e);for(var n=[],i=0;i<t.length;i++)o[i]&&n.push(t[i]);r(null,n)})}function Fe(e,t,n,r){var o=[];e(t,function(e,t,r){n(e,function(n,i){n?r(n):(i&&o.push({index:t,value:e}),r())})},function(e){e?r(e):r(null,K(o.sort(function(e,t){return e.index-t.index}),Ce("value")))})}function Ue(e,t,n,r){(w(t)?Re:Fe)(e,t,d(n),r||x)}function Ie(e,t){function n(e){if(e)return r(e);o(n)}var r=M(t||x),o=d(Oe(e));n()}function qe(e,t,n,r){r=j(r||x);var o={},i=d(n);N(e,t,function(e,t,n){i(e,t,function(e,r){if(e)return n(e);o[t]=r,n()})},function(e){r(e,o)})}function Me(e,t){return t in e}function Be(e,t){var n=Object.create(null),r=Object.create(null);t=t||ge;var o=d(e),u=ct(function(e,u){var c=t.apply(null,e);Me(n,c)?ft(function(){u.apply(null,n[c])}):Me(r,c)?r[c].push(u):(r[c]=[u],o.apply(null,e.concat(function(){var e=i(arguments);n[c]=e;var t=r[c];delete r[c];for(var o=0,u=t.length;o<u;o++)t[o].apply(null,e)})))});return u.memo=n,u.unmemoized=e,u}function Ne(e,t,n){n=n||x;var r=w(t)?[]:{};e(t,function(e,t,n){d(e)(function(e,o){arguments.length>2&&(o=i(arguments,1)),r[t]=o,n(e)})},function(e){n(e,r)})}function Pe(e,t){Ne(sn,e,t)}function De(e,t,n){Ne(B(t),e,n)}function He(e,t){if(t=j(t||x),!Bt(e))return t(new TypeError("First argument to race must be an array of functions"));if(!e.length)return t();for(var n=0,r=e.length;n<r;n++)d(e[n])(t)}function Ve(e,t,n,r){ve(i(e).reverse(),t,n,r)}function ze(e){var t=d(e);return ct(function(e,n){return e.push(function(e,t){if(e)n(null,{error:e});else{var r;r=arguments.length<=2?t:i(arguments,1),n(null,{value:r})}}),t.apply(this,e)})}function $e(e){var t;return Bt(e)?t=K(e,ze):(t={},X(e,function(e,n){t[n]=ze.call(this,e)})),t}function Xe(e,t,n,r){Ue(e,t,function(e,t){n(e,function(e,n){t(e,!n)})},r)}function Qe(e){return function(){return e}}function We(e,t,n){function r(){c(function(e){e&&a++<u.times&&("function"!=typeof u.errorFilter||u.errorFilter(e))?setTimeout(r,u.intervalFunc(a)):n.apply(null,arguments)})}var o=5,i=0,u={times:o,intervalFunc:Qe(i)};if(arguments.length<3&&"function"==typeof e?(n=t||x,t=e):(!function(e,t){if("object"==typeof t)e.times=+t.times||o,e.intervalFunc="function"==typeof t.interval?t.interval:Qe(+t.interval||i),e.errorFilter=t.errorFilter;else{if("number"!=typeof t&&"string"!=typeof t)throw new Error("Invalid arguments for async.retry");e.times=+t||o}}(u,e),n=n||x),"function"!=typeof t)throw new Error("Invalid arguments for async.retry");var c=d(t),a=1;r()}function Je(e,t){Ne(Mn,e,t)}function Ge(e,t,n){function r(e,t){var n=e.criteria,r=t.criteria;return n<r?-1:n>r?1:0}var o=d(t);fn(e,function(e,t){o(e,function(n,r){if(n)return t(n);t(null,{value:e,criteria:r})})},function(e,t){if(e)return n(e);n(null,K(t.sort(r),Ce("value")))})}function Ke(e,t,n){var r=d(e);return ct(function(o,i){function u(){var t=e.name||"anonymous",r=new Error('Callback function "'+t+'" timed out.');r.code="ETIMEDOUT",n&&(r.info=n),a=!0,i(r)}var c,a=!1;o.push(function(){a||(i.apply(null,arguments),clearTimeout(c))}),c=setTimeout(u,t),r.apply(null,o)})}function Ye(e,t,n,r){for(var o=-1,i=gr(yr((t-e)/(n||1)),0),u=Array(i);i--;)u[r?i:++o]=e,e+=n;return u}function Ze(e,t,n,r){var o=d(n);pn(Ye(0,e,1),t,o,r)}function et(e,t,n,r){arguments.length<=3&&(r=n,n=t,t=Bt(e)?[]:{}),r=j(r||x);var o=d(n);sn(e,function(e,n,r){o(t,e,n,r)},function(e){r(e,t)})}function tt(e,t){var n,r=null;t=t||x,Wn(e,function(e,t){d(e)(function(e,o){n=arguments.length>2?i(arguments,1):o,r=e,t(!e)})},function(){t(r,n)})}function nt(e){return function(){return(e.unmemoized||e).apply(null,arguments)}}function rt(e,t,n){n=M(n||x);var r=d(t);if(!e())return n(null);var o=function(t){if(t)return n(t);if(e())return r(o);var u=i(arguments,1);n.apply(null,[null].concat(u))};r(o)}function ot(e,t,n){rt(function(){return!e.apply(this,arguments)},t,n)}var it,ut=function(e){var t=i(arguments,1);return function(){var n=i(arguments);return e.apply(null,t.concat(n))}},ct=function(e){return function(){var t=i(arguments),n=t.pop();e.call(this,t,n)}},at="function"==typeof e&&e,st="object"==typeof n&&"function"==typeof n.nextTick;it=at?e:st?n.nextTick:c;var ft=a(it),lt="function"==typeof Symbol,pt="object"==typeof r&&r&&r.Object===Object&&r,dt="object"==typeof self&&self&&self.Object===Object&&self,ht=pt||dt||Function("return this")(),mt=ht.Symbol,vt=Object.prototype,yt=vt.hasOwnProperty,gt=vt.toString,bt=mt?mt.toStringTag:void 0,wt=Object.prototype,xt=wt.toString,jt="[object Null]",St="[object Undefined]",Et=mt?mt.toStringTag:void 0,kt="[object AsyncFunction]",Tt="[object Function]",Lt="[object GeneratorFunction]",At="[object Proxy]",Ot=9007199254740991,_t={},Ct="function"==typeof Symbol&&Symbol.iterator,Rt=function(e){return Ct&&e[Ct]&&e[Ct]()},Ft="[object Arguments]",Ut=Object.prototype,It=Ut.hasOwnProperty,qt=Ut.propertyIsEnumerable,Mt=k(function(){return arguments}())?k:function(e){return E(e)&&It.call(e,"callee")&&!qt.call(e,"callee")},Bt=Array.isArray,Nt="object"==typeof t&&t&&!t.nodeType&&t,Pt=Nt&&"object"==typeof o&&o&&!o.nodeType&&o,Dt=Pt&&Pt.exports===Nt,Ht=Dt?ht.Buffer:void 0,Vt=Ht?Ht.isBuffer:void 0,zt=Vt||T,$t=9007199254740991,Xt=/^(?:0|[1-9]\d*)$/,Qt={};Qt["[object Float32Array]"]=Qt["[object Float64Array]"]=Qt["[object Int8Array]"]=Qt["[object Int16Array]"]=Qt["[object Int32Array]"]=Qt["[object Uint8Array]"]=Qt["[object Uint8ClampedArray]"]=Qt["[object Uint16Array]"]=Qt["[object Uint32Array]"]=!0,Qt["[object Arguments]"]=Qt["[object Array]"]=Qt["[object ArrayBuffer]"]=Qt["[object Boolean]"]=Qt["[object DataView]"]=Qt["[object Date]"]=Qt["[object Error]"]=Qt["[object Function]"]=Qt["[object Map]"]=Qt["[object Number]"]=Qt["[object Object]"]=Qt["[object RegExp]"]=Qt["[object Set]"]=Qt["[object String]"]=Qt["[object WeakMap]"]=!1;var Wt="object"==typeof t&&t&&!t.nodeType&&t,Jt=Wt&&"object"==typeof o&&o&&!o.nodeType&&o,Gt=Jt&&Jt.exports===Wt,Kt=Gt&&pt.process,Yt=function(){try{var e=Jt&&Jt.require&&Jt.require("util").types;return e||Kt&&Kt.binding&&Kt.binding("util")}catch(e){}}(),Zt=Yt&&Yt.isTypedArray,en=Zt?function(e){return function(t){return e(t)}}(Zt):A,tn=Object.prototype,nn=tn.hasOwnProperty,rn=Object.prototype,on=function(e,t){return function(n){return e(t(n))}}(Object.keys,Object),un=Object.prototype,cn=un.hasOwnProperty,an=P(N,1/0),sn=function(e,t,n){(w(e)?D:an)(e,d(t),n)},fn=H(V),ln=h(fn),pn=z(V),dn=P(pn,1),hn=h(dn),mn=function(e){return function(t,n,r){for(var o=-1,i=Object(t),u=r(t),c=u.length;c--;){var a=u[e?c:++o];if(!1===n(i[a],a,i))break}return t}}(),vn=function(e,t,n){function r(e,t){y.push(function(){a(e,t)})}function o(){if(0===y.length&&0===h)return n(null,p);for(;y.length&&h<t;){y.shift()()}}function u(e,t){var n=v[e];n||(n=v[e]=[]),n.push(t)}function c(e){$(v[e]||[],function(e){e()}),o()}function a(e,t){if(!m){var r=M(function(t,r){if(h--,arguments.length>2&&(r=i(arguments,1)),t){var o={};X(p,function(e,t){o[t]=e}),o[e]=r,m=!0,v=Object.create(null),n(t,o)}else p[e]=r,c(e)});h++;var o=d(t[t.length-1]);t.length>1?o(p,r):o(r)}}function s(t){var n=[];return X(e,function(e,r){Bt(e)&&G(e,t,0)>=0&&n.push(r)}),n}"function"==typeof t&&(n=t,t=null),n=j(n||x);var f=R(e),l=f.length;if(!l)return n(null);t||(t=l);var p={},h=0,m=!1,v=Object.create(null),y=[],g=[],b={};X(e,function(t,n){if(!Bt(t))return r(n,[t]),void g.push(n);var o=t.slice(0,t.length-1),i=o.length;if(0===i)return r(n,t),void g.push(n);b[n]=i,$(o,function(c){if(!e[c])throw new Error("async.auto task `"+n+"` has a non-existent dependency `"+c+"` in "+o.join(", "));u(c,function(){0===--i&&r(n,t)})})}),function(){for(var e,t=0;g.length;)e=g.pop(),t++,$(s(e),function(e){0==--b[e]&&g.push(e)});if(t!==l)throw new Error("async.auto cannot execute tasks due to a recursive dependency")}(),o()},yn="[object Symbol]",gn=1/0,bn=mt?mt.prototype:void 0,wn=bn?bn.toString:void 0,xn=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]"),jn="[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]",Sn="\\ud83c[\\udffb-\\udfff]",En="(?:\\ud83c[\\udde6-\\uddff]){2}",kn="[\\ud800-\\udbff][\\udc00-\\udfff]",Tn="(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?",Ln="(?:\\u200d(?:"+["[^\\ud800-\\udfff]",En,kn].join("|")+")[\\ufe0e\\ufe0f]?"+Tn+")*",An="[\\ufe0e\\ufe0f]?"+Tn+Ln,On="(?:"+["[^\\ud800-\\udfff]"+jn+"?",jn,En,kn,"[\\ud800-\\udfff]"].join("|")+")",_n=RegExp(Sn+"(?="+Sn+")|"+On+An,"g"),Cn=/^\s+|\s+$/g,Rn=/^(?:async\s+)?(function)?\s*[^\(]*\(\s*([^\)]*)\)/m,Fn=/,/,Un=/(=.+)?(\s*)$/,In=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm;pe.prototype.removeLink=function(e){return e.prev?e.prev.next=e.next:this.head=e.next,e.next?e.next.prev=e.prev:this.tail=e.prev,e.prev=e.next=null,this.length-=1,e},pe.prototype.empty=function(){for(;this.head;)this.shift();return this},pe.prototype.insertAfter=function(e,t){t.prev=e,t.next=e.next,e.next?e.next.prev=t:this.tail=t,e.next=t,this.length+=1},pe.prototype.insertBefore=function(e,t){t.prev=e.prev,t.next=e,e.prev?e.prev.next=t:this.head=t,e.prev=t,this.length+=1},pe.prototype.unshift=function(e){this.head?this.insertBefore(this.head,e):de(this,e)},pe.prototype.push=function(e){this.tail?this.insertAfter(this.tail,e):de(this,e)},pe.prototype.shift=function(){return this.head&&this.removeLink(this.head)},pe.prototype.pop=function(){return this.tail&&this.removeLink(this.tail)},pe.prototype.toArray=function(){for(var e=Array(this.length),t=this.head,n=0;n<this.length;n++)e[n]=t.data,t=t.next;return e},pe.prototype.remove=function(e){for(var t=this.head;t;){var n=t.next;e(t)&&this.removeLink(t),t=n}return this};var qn,Mn=P(N,1),Bn=function(){return ye.apply(null,i(arguments).reverse())},Nn=Array.prototype.concat,Pn=function(e,t,n,r){r=r||x;var o=d(n);pn(e,t,function(e,t){o(e,function(e){return e?t(e):t(null,i(arguments,1))})},function(e,t){for(var n=[],o=0;o<t.length;o++)t[o]&&(n=Nn.apply(n,t[o]));return r(e,n)})},Dn=P(Pn,1/0),Hn=P(Pn,1),Vn=function(){var e=i(arguments),t=[null].concat(e);return function(){return arguments[arguments.length-1].apply(this,t)}},zn=H(be(ge,we)),$n=z(be(ge,we)),Xn=P($n,1),Qn=xe("dir"),Wn=P(Ae,1),Jn=H(be(_e,_e)),Gn=z(be(_e,_e)),Kn=P(Gn,1),Yn=H(Ue),Zn=z(Ue),er=P(Zn,1),tr=function(e,t,n,r){r=r||x;var o=d(n);pn(e,t,function(e,t){o(e,function(n,r){return n?t(n):t(null,{key:r,val:e})})},function(e,t){for(var n={},o=Object.prototype.hasOwnProperty,i=0;i<t.length;i++)if(t[i]){var u=t[i].key,c=t[i].val;o.call(n,u)?n[u].push(c):n[u]=[c]}return r(e,n)})},nr=P(tr,1/0),rr=P(tr,1),or=xe("log"),ir=P(qe,1/0),ur=P(qe,1);qn=st?n.nextTick:at?e:c;var cr=a(qn),ar=function(e,t){var n=d(e);return he(function(e,t){n(e[0],t)},t,1)},sr=function(e,t){var n=ar(e,t);return n.push=function(e,t,r){if(null==r&&(r=x),"function"!=typeof r)throw new Error("task callback must be a function");if(n.started=!0,Bt(e)||(e=[e]),0===e.length)return ft(function(){n.drain()});t=t||0;for(var o=n._tasks.head;o&&t>=o.priority;)o=o.next;for(var i=0,u=e.length;i<u;i++){var c={data:e[i],priority:t,callback:r};o?n._tasks.insertBefore(o,c):n._tasks.push(c)}ft(n.process)},delete n.unshift,n},fr=H(Xe),lr=z(Xe),pr=P(lr,1),dr=function(e,t){t||(t=e,e=null);var n=d(t);return ct(function(t,r){function o(e){n.apply(null,t.concat(e))}e?We(e,o,r):We(o,r)})},hr=H(be(Boolean,ge)),mr=z(be(Boolean,ge)),vr=P(mr,1),yr=Math.ceil,gr=Math.max,br=P(Ze,1/0),wr=P(Ze,1),xr=function(e,t){function n(t){var n=d(e[o++]);t.push(M(r)),n.apply(null,t)}function r(r){if(r||o===e.length)return t.apply(null,arguments);n(i(arguments,1))}if(t=j(t||x),!Bt(e))return t(new Error("First argument to waterfall must be an array of functions"));if(!e.length)return t();var o=0;n([])},jr={apply:ut,applyEach:ln,applyEachSeries:hn,asyncify:s,auto:vn,autoInject:le,cargo:me,compose:Bn,concat:Dn,concatLimit:Pn,concatSeries:Hn,constant:Vn,detect:zn,detectLimit:$n,detectSeries:Xn,dir:Qn,doDuring:je,doUntil:Ee,doWhilst:Se,during:ke,each:Le,eachLimit:Ae,eachOf:sn,eachOfLimit:N,eachOfSeries:Mn,eachSeries:Wn,ensureAsync:Oe,every:Jn,everyLimit:Gn,everySeries:Kn,filter:Yn,filterLimit:Zn,filterSeries:er,forever:Ie,groupBy:nr,groupByLimit:tr,groupBySeries:rr,log:or,map:fn,mapLimit:pn,mapSeries:dn,mapValues:ir,mapValuesLimit:qe,mapValuesSeries:ur,memoize:Be,nextTick:cr,parallel:Pe,parallelLimit:De,priorityQueue:sr,queue:ar,race:He,reduce:ve,reduceRight:Ve,reflect:ze,reflectAll:$e,reject:fr,rejectLimit:lr,rejectSeries:pr,retry:We,retryable:dr,seq:ye,series:Je,setImmediate:ft,some:hr,someLimit:mr,someSeries:vr,sortBy:Ge,timeout:Ke,times:br,timesLimit:Ze,timesSeries:wr,transform:et,tryEach:tt,unmemoize:nt,until:ot,waterfall:xr,whilst:rt,all:Jn,allLimit:Gn,allSeries:Kn,any:hr,anyLimit:mr,anySeries:vr,find:zn,findLimit:$n,findSeries:Xn,forEach:Le,forEachSeries:Wn,forEachLimit:Ae,forEachOf:sn,forEachOfSeries:Mn,forEachOfLimit:N,inject:ve,foldl:ve,foldr:Ve,select:Yn,selectLimit:Zn,selectSeries:er,wrapSync:s};t.default=jr,t.apply=ut,t.applyEach=ln,t.applyEachSeries=hn,t.asyncify=s,t.auto=vn,t.autoInject=le,t.cargo=me,t.compose=Bn,t.concat=Dn,t.concatLimit=Pn,t.concatSeries=Hn,t.constant=Vn,t.detect=zn,t.detectLimit=$n,t.detectSeries=Xn,t.dir=Qn,t.doDuring=je,t.doUntil=Ee,t.doWhilst=Se,t.during=ke,t.each=Le,t.eachLimit=Ae,t.eachOf=sn,t.eachOfLimit=N,t.eachOfSeries=Mn,t.eachSeries=Wn,t.ensureAsync=Oe,t.every=Jn,t.everyLimit=Gn,t.everySeries=Kn,t.filter=Yn,t.filterLimit=Zn,t.filterSeries=er,t.forever=Ie,t.groupBy=nr,t.groupByLimit=tr,t.groupBySeries=rr,t.log=or,t.map=fn,t.mapLimit=pn,t.mapSeries=dn,t.mapValues=ir,t.mapValuesLimit=qe,t.mapValuesSeries=ur,t.memoize=Be,t.nextTick=cr,t.parallel=Pe,t.parallelLimit=De,t.priorityQueue=sr,t.queue=ar,t.race=He,t.reduce=ve,t.reduceRight=Ve,t.reflect=ze,t.reflectAll=$e,t.reject=fr,t.rejectLimit=lr,t.rejectSeries=pr,t.retry=We,t.retryable=dr,t.seq=ye,t.series=Je,t.setImmediate=ft,t.some=hr,t.someLimit=mr,t.someSeries=vr,t.sortBy=Ge,t.timeout=Ke,t.times=br,t.timesLimit=Ze,t.timesSeries=wr,t.transform=et,t.tryEach=tt,t.unmemoize=nt,t.until=ot,t.waterfall=xr,t.whilst=rt,t.all=Jn,t.allLimit=Gn,t.allSeries=Kn,t.any=hr,t.anyLimit=mr,t.anySeries=vr,t.find=zn,t.findLimit=$n,t.findSeries=Xn,t.forEach=Le,t.forEachSeries=Wn,t.forEachLimit=Ae,t.forEachOf=sn,t.forEachOfSeries=Mn,t.forEachOfLimit=N,t.inject=ve,t.foldl=ve,t.foldr=Ve,t.select=Yn,t.selectLimit=Zn,t.selectSeries=er,t.wrapSync=s,Object.defineProperty(t,"__esModule",{value:!0})})}).call(t,n(12).setImmediate,n(2),n(1),n(14)(e))},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e){if(!e)return!1;var t=document.createElement("textarea");return t.innerHTML=e,t.value}function i(e){var t=(new Date).getTime()/1e3;if(!e||e>t)return!1;var n=t-e,r=Math.floor(n/60),o=Math.floor(r/60),i=Math.floor(o/24);return 1===i?"1 day ago":i>0?i+" days ago":1===o?"1 hour ago":o>0?o+" hours ago":1===r?"1 minute ago":r>0?r+" minutes ago":"a few seconds ago"}function u(e){function t(e,t){if(!e)throw new Error("No URL has been specified");if(s[e])return void t(null,s[e]);f.default.get(e).then(function(n){s[e]=n.data,t(null,n.data)}).catch(t)}function n(t){var n=t.sub,r=t.id;return n&&r?e.base+"/r/"+n+"/comments/"+r+".json":!(n||!r)&&e.base+r}function r(e,r){var o=e.hits.filter(function(e){return!!e.num_comments});a.default.map(o.slice(0,10),function(e,r){var o=e.id,i=e.subreddit;if("undefined"===o)throw new Error("No ID specified");t(n({sub:i,id:o}),r)},r)}function o(t){var n=t.comment,r=t.op,i=t.depth,u=i||0,c=e.commentFmt(n);if(c.depth=u,c.subreddit=r.subreddit,r.permalink&&(c.permalink=e.base+r.permalink,c.thread=e.base+r.permalink+n.id),n.children&&n.children.length>0){var a=u+1;c.hasReplies=!0,c.replies=n.children.reduce(function(e,t){return t.author&&e.push(o({comment:t,op:r,depth:a})),e},[]),c.loadMore=c.replies.length>4}return c}function i(t,n){n(null,t.map(function(t){var n=e.threadFmt(t),r=n.children.reduce(function(e,t){return t.author&&e.push(o({comment:t,op:n})),e},[]);return{op:n,comments:r}}))}function u(t,n){var r=function e(n,r,o){if(o>t.length-1)return{score:n,threads:t.length,comments:r,multiple:function(){return this.threads>1}};var i=t[o];return e(n+=i.op.points,r.concat(i.comments),o+1)}(0,[],0),o=r.comments.sort(function(e,t){return t.score-e.score}),i=e.limit||o.length;r.comments=o.slice(0,i),r.next=o.slice(i),r.hasMore=!!r.next.length,n(null,r)}if(!e)throw new Error("No spec object has been specified");if(!e.submitUrl)throw new Error("submitUrl isnt defined");if(!e.dataFmt)throw new Error("dataFmt method isnt defined");if(!e.commentFmt)throw new Error("commentFmt method isnt defined");if(!e.threadFmt)throw new Error("threadFmt method isnt defined");0===e.limit&&(e.limit=null);var c={},s={};return c.submitUrl=e.submitUrl,c.hasComments=function(n){a.default.waterfall([a.default.apply(t,e.query),e.dataFmt],function(e,t){if(e)throw new Error(e);var r=t.hits.filter(function(e){return!!e.num_comments});n(null,!!r.length)})},c.getComments=function(n){a.default.waterfall([a.default.apply(t,e.query),e.dataFmt,r,i,u],n)},c}Object.defineProperty(t,"__esModule",{value:!0}),t.decode=o,t.parseDate=i,t.embeddConstructor=u;var c=n(4),a=r(c),s=n(17),f=r(s)},function(e,t,n){"use strict";e.exports=function(e,t){return function(){for(var n=new Array(arguments.length),r=0;r<n.length;r++)n[r]=arguments[r];return e.apply(t,n)}}},function(e,t,n){"use strict";var r=n(0),o=n(22),i=n(24),u=n(25),c=n(26),a=n(8);e.exports=function(e){return new Promise(function(t,s){var f=e.data,l=e.headers;r.isFormData(f)&&delete l["Content-Type"];var p=new XMLHttpRequest;if(e.auth){var d=e.auth.username||"",h=e.auth.password||"";l.Authorization="Basic "+btoa(d+":"+h)}if(p.open(e.method.toUpperCase(),i(e.url,e.params,e.paramsSerializer),!0),p.timeout=e.timeout,p.onreadystatechange=function(){if(p&&4===p.readyState&&(0!==p.status||p.responseURL&&0===p.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in p?u(p.getAllResponseHeaders()):null,r=e.responseType&&"text"!==e.responseType?p.response:p.responseText,i={data:r,status:p.status,statusText:p.statusText,headers:n,config:e,request:p};o(t,s,i),p=null}},p.onerror=function(){s(a("Network Error",e,null,p)),p=null},p.ontimeout=function(){s(a("timeout of "+e.timeout+"ms exceeded",e,"ECONNABORTED",p)),p=null},r.isStandardBrowserEnv()){var m=n(27),v=(e.withCredentials||c(e.url))&&e.xsrfCookieName?m.read(e.xsrfCookieName):void 0;v&&(l[e.xsrfHeaderName]=v)}if("setRequestHeader"in p&&r.forEach(l,function(e,t){void 0===f&&"content-type"===t.toLowerCase()?delete l[t]:p.setRequestHeader(t,e)}),e.withCredentials&&(p.withCredentials=!0),e.responseType)try{p.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&p.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&p.upload&&p.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then(function(e){p&&(p.abort(),s(e),p=null)}),void 0===f&&(f=null),p.send(f)})}},function(e,t,n){"use strict";var r=n(23);e.exports=function(e,t,n,o,i){var u=new Error(e);return r(u,t,n,o,i)}},function(e,t,n){"use strict";e.exports=function(e){return!(!e||!e.__CANCEL__)}},function(e,t,n){"use strict";function r(e){this.message=e}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,e.exports=r},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}var o=n(4),i=r(o),u=n(15),c=r(u),a=n(16),s=r(a),f=n(35),l=r(f),p=n(36),d=n(37);(function(){function e(e,t){var n={};for(var r in e)n[r]=e[r];for(var o in t)n[o]=t[o];return n}function t(){var e=[].slice.call(document.querySelectorAll(".embedd-container .hide-children-btn")),t=document.querySelector(".embedd-container .reddit-btn"),r=document.querySelector(".embedd-container .hn-btn"),i=[].slice.call(document.querySelectorAll(".embedd-container .view-more")),c=document.querySelector(".embedd-container .more-btn");e.forEach(function(e){e.addEventListener("click",u,!1)}),i.forEach(function(e){e.addEventListener("click",a,!1)}),t&&t.addEventListener("click",function(){h.config.service="reddit",h.config.serviceName="Reddit",h.init()},!1),r&&r.addEventListener("click",function(){h.config.service="hn",h.config.service="HackerNews",h.init()},!1),c&&c.addEventListener("click",function(){o(h)},!1),!h.config.loadMore&&h.config.infiniteScroll&&window.addEventListener("scroll",n,!1)}function n(){document.body.scrollHeight-window.innerHeight-window.scrollY<20&&(window.removeEventListener("scroll",n,!1),o(h))}function r(n){var r=e({},n);r.config=e({},n.config),r.redditActive=function(){return"reddit"===h.config.service},r.hnActive=function(){return"hn"===h.config.service},0===r.data.next.length&&(r.config.loadMore=!1);var o=c.default.render(p,r,{comment:d});h.config.debug&&console.log(r),h.config.element.innerHTML=o,t()}function o(e){var r=e.data,o=e.config,i=e.redditActive,u=document.querySelector(".embedd-container .comments");r.comments=r.next.slice(0,o.limit),r.next=r.next.slice(o.limit),r.config=o,r.hasMore=!!r.next.length,i&&(r.redditActive=i);var a=c.default.render("{{#comments}}{{> comment}}{{/comments}}",r,{comment:d});if(u.insertAdjacentHTML("beforeend",a),!r.hasMore){var s=document.querySelector(".embedd-container .more-btn");s?s.style.display="none":window.removeEventListener("scroll",n,!1)}t()}function u(e){e.target.parentNode.parentNode.parentNode.classList.toggle("closed")}function a(e){function t(e,n){e&&3!==n?e instanceof Text||"block"===f(e)?t(e.nextSibling,n):(e.style.display="block",t(e.nextSibling,n+1)):r.querySelector(".viewMore").style.display="none"}var n=e.currentTarget,r=n.parentElement;t(r.querySelector(".children").firstChild,0)}function f(e){return e.currentStyle?e.currentStyle.display:window.getComputedStyle(e,null).getPropertyValue("display")}var h={},m=document.currentScript,v=(m.parentNode,document.getElementById("embedd-comments"));if(v)return h.config={element:v,url:location.protocol+"//"+location.host+location.pathname,dark:!1,service:"hn",serviceName:"HackerNews",both:!0,loadMore:!0,infiniteScroll:!1,limit:5,debug:!1},"string"==typeof h.config.element&&(h.config.element=document.querySelector(h.config.element)),h.config.element.className="embedd-container",h.config.loadMore&&h.config.infiniteScroll&&(h.config.loadMore=!1),h.clients={},h.config.both&&(h.clients.reddit=(0,l.default)(h.config),h.clients.hn=(0,s.default)(h.config)),h.config.both||"reddit"!==h.config.service||(h.clients.reddit=(0,l.default)(h.config)),h.config.both||"hn"!==h.config.service||(h.clients.hn=(0,s.default)(h.config)),h.init=function(){var t=h.clients,n=t.reddit,o=t.hn,u=h.clients[h.config.service],c={};o&&(c.hasHn=o.hasComments),n&&(c.hasReddit=n.hasComments),c.data=u.getComments,i.default.series(c,function(t,n){if(t)throw new Error(t);n.submitUrl=u.submitUrl,h=e(h,n),r(h)})},h})().init()},function(e,t,n){(function(e){function r(e,t){this._id=e,this._clearFn=t}var o=Function.prototype.apply;t.setTimeout=function(){return new r(o.call(setTimeout,window,arguments),clearTimeout)},t.setInterval=function(){return new r(o.call(setInterval,window,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},r.prototype.unref=r.prototype.ref=function(){},r.prototype.close=function(){this._clearFn.call(window,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(13),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(t,n(1))},function(e,t,n){(function(e,t){!function(e,n){"use strict";function r(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var r={callback:e,args:t};return s[a]=r,c(a),a++}function o(e){delete s[e]}function i(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}function u(e){if(f)setTimeout(u,0,e);else{var t=s[e];if(t){f=!0;try{i(t)}finally{o(e),f=!1}}}}if(!e.setImmediate){var c,a=1,s={},f=!1,l=e.document,p=Object.getPrototypeOf&&Object.getPrototypeOf(e);p=p&&p.setTimeout?p:e,"[object process]"==={}.toString.call(e.process)?function(){c=function(e){t.nextTick(function(){u(e)})}}():function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?function(){var t="setImmediate$"+Math.random()+"$",n=function(n){n.source===e&&"string"==typeof n.data&&0===n.data.indexOf(t)&&u(+n.data.slice(t.length))};e.addEventListener?e.addEventListener("message",n,!1):e.attachEvent("onmessage",n),c=function(n){e.postMessage(t+n,"*")}}():e.MessageChannel?function(){var e=new MessageChannel;e.port1.onmessage=function(e){u(e.data)},c=function(t){e.port2.postMessage(t)}}():l&&"onreadystatechange"in l.createElement("script")?function(){var e=l.documentElement;c=function(t){var n=l.createElement("script");n.onreadystatechange=function(){u(t),n.onreadystatechange=null,e.removeChild(n),n=null},e.appendChild(n)}}():function(){c=function(e){setTimeout(u,0,e)}}(),p.setImmediate=r,p.clearImmediate=o}}("undefined"==typeof self?void 0===e?this:e:self)}).call(t,n(1),n(2))},function(e,t){e.exports=function(e){return e.webpackPolyfill||(e.deprecate=function(){},e.paths=[],e.children||(e.children=[]),Object.defineProperty(e,"loaded",{enumerable:!0,get:function(){return e.l}}),Object.defineProperty(e,"id",{enumerable:!0,get:function(){return e.i}}),e.webpackPolyfill=1),e}},function(e,t,n){var r,o,i;/*!
- * mustache.js - Logic-less {{mustache}} templates with JavaScript
- * http://github.com/janl/mustache.js
- */
-!function(n,u){"object"==typeof t&&t&&"string"!=typeof t.nodeName?u(t):(o=[t],r=u,void 0!==(i="function"==typeof r?r.apply(t,o):r)&&(e.exports=i))}(0,function(e){function t(e){return"function"==typeof e}function n(e){return m(e)?"array":typeof e}function r(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}function o(e,t){return null!=e&&"object"==typeof e&&t in e}function i(e,t){return v.call(e,t)}function u(e){return!i(y,e)}function c(e){return String(e).replace(/[&<>"'`=\/]/g,function(e){return g[e]})}function a(t,n){function o(e){if("string"==typeof e&&(e=e.split(w,2)),!m(e)||2!==e.length)throw new Error("Invalid tags: "+e);i=new RegExp(r(e[0])+"\\s*"),c=new RegExp("\\s*"+r(e[1])),a=new RegExp("\\s*"+r("}"+e[1]))}if(!t)return[];var i,c,a,p=[],d=[],h=[],v=!1,y=!1;o(n||e.tags);for(var g,E,k,T,L,A,O=new l(t);!O.eos();){if(g=O.pos,k=O.scanUntil(i))for(var _=0,C=k.length;_<C;++_)T=k.charAt(_),u(T)?h.push(d.length):y=!0,d.push(["text",T,g,g+1]),g+=1,"\n"===T&&function(){if(v&&!y)for(;h.length;)delete d[h.pop()];else h=[];v=!1,y=!1}();if(!O.scan(i))break;if(v=!0,E=O.scan(S)||"name",O.scan(b),"="===E?(k=O.scanUntil(x),O.scan(x),O.scanUntil(c)):"{"===E?(k=O.scanUntil(a),O.scan(j),O.scanUntil(c),E="&"):k=O.scanUntil(c),!O.scan(c))throw new Error("Unclosed tag at "+O.pos);if(L=[E,k,g,O.pos],d.push(L),"#"===E||"^"===E)p.push(L);else if("/"===E){if(!(A=p.pop()))throw new Error('Unopened section "'+k+'" at '+g);if(A[1]!==k)throw new Error('Unclosed section "'+A[1]+'" at '+g)}else"name"===E||"{"===E||"&"===E?y=!0:"="===E&&o(k)}if(A=p.pop())throw new Error('Unclosed section "'+A[1]+'" at '+O.pos);return f(s(d))}function s(e){for(var t,n,r=[],o=0,i=e.length;o<i;++o)(t=e[o])&&("text"===t[0]&&n&&"text"===n[0]?(n[1]+=t[1],n[3]=t[3]):(r.push(t),n=t));return r}function f(e){for(var t,n,r=[],o=r,i=[],u=0,c=e.length;u<c;++u)switch(t=e[u],t[0]){case"#":case"^":o.push(t),i.push(t),o=t[4]=[];break;case"/":n=i.pop(),n[5]=t[2],o=i.length>0?i[i.length-1][4]:r;break;default:o.push(t)}return r}function l(e){this.string=e,this.tail=e,this.pos=0}function p(e,t){this.view=e,this.cache={".":this.view},this.parent=t}function d(){this.cache={}}var h=Object.prototype.toString,m=Array.isArray||function(e){return"[object Array]"===h.call(e)},v=RegExp.prototype.test,y=/\S/,g={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;","`":"&#x60;","=":"&#x3D;"},b=/\s*/,w=/\s+/,x=/\s*=/,j=/\s*\}/,S=/#|\^|\/|>|\{|&|=|!/;l.prototype.eos=function(){return""===this.tail},l.prototype.scan=function(e){var t=this.tail.match(e);if(!t||0!==t.index)return"";var n=t[0];return this.tail=this.tail.substring(n.length),this.pos+=n.length,n},l.prototype.scanUntil=function(e){var t,n=this.tail.search(e);switch(n){case-1:t=this.tail,this.tail="";break;case 0:t="";break;default:t=this.tail.substring(0,n),this.tail=this.tail.substring(n)}return this.pos+=t.length,t},p.prototype.push=function(e){return new p(e,this)},p.prototype.lookup=function(e){var n,r=this.cache;if(r.hasOwnProperty(e))n=r[e];else{for(var i,u,c=this,a=!1;c;){if(e.indexOf(".")>0)for(n=c.view,i=e.split("."),u=0;null!=n&&u<i.length;)u===i.length-1&&(a=o(n,i[u])),n=n[i[u++]];else n=c.view[e],a=o(c.view,e);if(a)break;c=c.parent}r[e]=n}return t(n)&&(n=n.call(this.view)),n},d.prototype.clearCache=function(){this.cache={}},d.prototype.parse=function(e,t){var n=this.cache,r=n[e];return null==r&&(r=n[e]=a(e,t)),r},d.prototype.render=function(e,t,n){var r=this.parse(e),o=t instanceof p?t:new p(t);return this.renderTokens(r,o,n,e)},d.prototype.renderTokens=function(e,t,n,r){for(var o,i,u,c="",a=0,s=e.length;a<s;++a)u=void 0,o=e[a],i=o[0],"#"===i?u=this.renderSection(o,t,n,r):"^"===i?u=this.renderInverted(o,t,n,r):">"===i?u=this.renderPartial(o,t,n,r):"&"===i?u=this.unescapedValue(o,t):"name"===i?u=this.escapedValue(o,t):"text"===i&&(u=this.rawValue(o)),void 0!==u&&(c+=u);return c},d.prototype.renderSection=function(e,n,r,o){function i(e){return u.render(e,n,r)}var u=this,c="",a=n.lookup(e[1]);if(a){if(m(a))for(var s=0,f=a.length;s<f;++s)c+=this.renderTokens(e[4],n.push(a[s]),r,o);else if("object"==typeof a||"string"==typeof a||"number"==typeof a)c+=this.renderTokens(e[4],n.push(a),r,o);else if(t(a)){if("string"!=typeof o)throw new Error("Cannot use higher-order sections without the original template");a=a.call(n.view,o.slice(e[3],e[5]),i),null!=a&&(c+=a)}else c+=this.renderTokens(e[4],n,r,o);return c}},d.prototype.renderInverted=function(e,t,n,r){var o=t.lookup(e[1]);if(!o||m(o)&&0===o.length)return this.renderTokens(e[4],t,n,r)},d.prototype.renderPartial=function(e,n,r){if(r){var o=t(r)?r(e[1]):r[e[1]];return null!=o?this.renderTokens(this.parse(o),n,r,o):void 0}},d.prototype.unescapedValue=function(e,t){var n=t.lookup(e[1]);if(null!=n)return n},d.prototype.escapedValue=function(t,n){var r=n.lookup(t[1]);if(null!=r)return e.escape(r)},d.prototype.rawValue=function(e){return e[1]},e.name="mustache.js",e.version="2.3.0",e.tags=["{{","}}"];var E=new d;return e.clearCache=function(){return E.clearCache()},e.parse=function(e,t){return E.parse(e,t)},e.render=function(e,t,r){if("string"!=typeof e)throw new TypeError('Invalid template! Template should be a "string" but "'+n(e)+'" was given as the first argument for mustache#render(template, view, partials)');return E.render(e,t,r)},e.to_html=function(n,r,o,i){var u=e.render(n,r,o);if(!t(i))return u;i(u)},e.escape=c,e.Scanner=l,e.Context=p,e.Writer=d,e})},function(e,t,n){"use strict";function r(e){if(!e)throw new Error("The HN constructor requires a spec object");var t=e.url,n=e.limit,r={},i=encodeURIComponent(document.querySelector("h1").innerText),u=encodeURIComponent(t);return r.query="https://hn.algolia.com/api/v1/search?restrictSearchableAttributes=url&query="+u,r.submitUrl="https://news.ycombinator.com/submitlink?t="+i+"&u="+u,r.base="https://hn.algolia.com/api/v1/items/",r.limit=n,r.dataFmt=function(e,t){e.hits=e.hits.map(function(e){return e.id=e.objectID,e}),t(null,e)},r.commentFmt=function(e){return{author:e.author,author_link:"https://news.ycombinator.com/user?id="+e.author,body_html:(0,o.decode)(e.text),created:(0,o.parseDate)(e.created_at_i),id:e.id,thread:"https://news.ycombinator.com/item?id="+e.id,replies:null,hasReplies:!1,isEven:function(){return this.depth%2==0},isOdd:function(){return this.depth%2==1}}},r.threadFmt=function(e){return e},(0,o.embeddConstructor)(r)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var o=n(5)},function(e,t,n){e.exports=n(18)},function(e,t,n){"use strict";function r(e){var t=new u(e),n=i(u.prototype.request,t);return o.extend(n,u.prototype,t),o.extend(n,t),n}var o=n(0),i=n(6),u=n(20),c=n(3),a=r(c);a.Axios=u,a.create=function(e){return r(o.merge(c,e))},a.Cancel=n(10),a.CancelToken=n(33),a.isCancel=n(9),a.all=function(e){return Promise.all(e)},a.spread=n(34),e.exports=a,e.exports.default=a},function(e,t){/*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-e.exports=function(e){return null!=e&&null!=e.constructor&&"function"==typeof e.constructor.isBuffer&&e.constructor.isBuffer(e)}},function(e,t,n){"use strict";function r(e){this.defaults=e,this.interceptors={request:new u,response:new u}}var o=n(3),i=n(0),u=n(28),c=n(29);r.prototype.request=function(e){"string"==typeof e&&(e=i.merge({url:arguments[0]},arguments[1])),e=i.merge(o,{method:"get"},this.defaults,e),e.method=e.method.toLowerCase();var t=[c,void 0],n=Promise.resolve(e);for(this.interceptors.request.forEach(function(e){t.unshift(e.fulfilled,e.rejected)}),this.interceptors.response.forEach(function(e){t.push(e.fulfilled,e.rejected)});t.length;)n=n.then(t.shift(),t.shift());return n},i.forEach(["delete","get","head","options"],function(e){r.prototype[e]=function(t,n){return this.request(i.merge(n||{},{method:e,url:t}))}}),i.forEach(["post","put","patch"],function(e){r.prototype[e]=function(t,n,r){return this.request(i.merge(r||{},{method:e,url:t,data:n}))}}),e.exports=r},function(e,t,n){"use strict";var r=n(0);e.exports=function(e,t){r.forEach(e,function(n,r){r!==t&&r.toUpperCase()===t.toUpperCase()&&(e[t]=n,delete e[r])})}},function(e,t,n){"use strict";var r=n(8);e.exports=function(e,t,n){var o=n.config.validateStatus;n.status&&o&&!o(n.status)?t(r("Request failed with status code "+n.status,n.config,null,n.request,n)):e(n)}},function(e,t,n){"use strict";e.exports=function(e,t,n,r,o){return e.config=t,n&&(e.code=n),e.request=r,e.response=o,e}},function(e,t,n){"use strict";function r(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}var o=n(0);e.exports=function(e,t,n){if(!t)return e;var i;if(n)i=n(t);else if(o.isURLSearchParams(t))i=t.toString();else{var u=[];o.forEach(t,function(e,t){null!==e&&void 0!==e&&(o.isArray(e)?t+="[]":e=[e],o.forEach(e,function(e){o.isDate(e)?e=e.toISOString():o.isObject(e)&&(e=JSON.stringify(e)),u.push(r(t)+"="+r(e))}))}),i=u.join("&")}return i&&(e+=(-1===e.indexOf("?")?"?":"&")+i),e}},function(e,t,n){"use strict";var r=n(0),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];e.exports=function(e){var t,n,i,u={};return e?(r.forEach(e.split("\n"),function(e){if(i=e.indexOf(":"),t=r.trim(e.substr(0,i)).toLowerCase(),n=r.trim(e.substr(i+1)),t){if(u[t]&&o.indexOf(t)>=0)return;u[t]="set-cookie"===t?(u[t]?u[t]:[]).concat([n]):u[t]?u[t]+", "+n:n}}),u):u}},function(e,t,n){"use strict";var r=n(0);e.exports=r.isStandardBrowserEnv()?function(){function e(e){var t=e;return n&&(o.setAttribute("href",t),t=o.href),o.setAttribute("href",t),{href:o.href,protocol:o.protocol?o.protocol.replace(/:$/,""):"",host:o.host,search:o.search?o.search.replace(/^\?/,""):"",hash:o.hash?o.hash.replace(/^#/,""):"",hostname:o.hostname,port:o.port,pathname:"/"===o.pathname.charAt(0)?o.pathname:"/"+o.pathname}}var t,n=/(msie|trident)/i.test(navigator.userAgent),o=document.createElement("a");return t=e(window.location.href),function(n){var o=r.isString(n)?e(n):n;return o.protocol===t.protocol&&o.host===t.host}}():function(){return function(){return!0}}()},function(e,t,n){"use strict";var r=n(0);e.exports=r.isStandardBrowserEnv()?function(){return{write:function(e,t,n,o,i,u){var c=[];c.push(e+"="+encodeURIComponent(t)),r.isNumber(n)&&c.push("expires="+new Date(n).toGMTString()),r.isString(o)&&c.push("path="+o),r.isString(i)&&c.push("domain="+i),!0===u&&c.push("secure"),document.cookie=c.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}}():function(){return{write:function(){},read:function(){return null},remove:function(){}}}()},function(e,t,n){"use strict";function r(){this.handlers=[]}var o=n(0);r.prototype.use=function(e,t){return this.handlers.push({fulfilled:e,rejected:t}),this.handlers.length-1},r.prototype.eject=function(e){this.handlers[e]&&(this.handlers[e]=null)},r.prototype.forEach=function(e){o.forEach(this.handlers,function(t){null!==t&&e(t)})},e.exports=r},function(e,t,n){"use strict";function r(e){e.cancelToken&&e.cancelToken.throwIfRequested()}var o=n(0),i=n(30),u=n(9),c=n(3),a=n(31),s=n(32);e.exports=function(e){return r(e),e.baseURL&&!a(e.url)&&(e.url=s(e.baseURL,e.url)),e.headers=e.headers||{},e.data=i(e.data,e.headers,e.transformRequest),e.headers=o.merge(e.headers.common||{},e.headers[e.method]||{},e.headers||{}),o.forEach(["delete","get","head","post","put","patch","common"],function(t){delete e.headers[t]}),(e.adapter||c.adapter)(e).then(function(t){return r(e),t.data=i(t.data,t.headers,e.transformResponse),t},function(t){return u(t)||(r(e),t&&t.response&&(t.response.data=i(t.response.data,t.response.headers,e.transformResponse))),Promise.reject(t)})}},function(e,t,n){"use strict";var r=n(0);e.exports=function(e,t,n){return r.forEach(n,function(n){e=n(e,t)}),e}},function(e,t,n){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},function(e,t,n){"use strict";e.exports=function(e,t){return t?e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,""):e}},function(e,t,n){"use strict";function r(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise(function(e){t=e});var n=this;e(function(e){n.reason||(n.reason=new o(e),t(n.reason))})}var o=n(10);r.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},r.source=function(){var e;return{token:new r(function(t){e=t}),cancel:e}},e.exports=r},function(e,t,n){"use strict";e.exports=function(e){return function(t){return e.apply(null,t)}}},function(e,t,n){"use strict";function r(e){if(!e)throw new Error("The Reddit constructor requires a spec object");var t=e.url,n=e.limit,r={};return r.base="https://www.reddit.com",r.searchQs="/search.json?q=url:",r.query=r.base+r.searchQs+t,r.submitUrl="https://www.reddit.com/submit",r.limit=n,r.dataFmt=function(e,t){e.hits=e.data.children.map(function(e){return e=e.data}),t(null,e)},r.commentFmt=function(e){return{author:e.author,author_link:"https://www.reddit.com/user/"+e.author,body_html:(0,o.decode)(e.body_html),created:(0,o.parseDate)(e.created_utc),id:e.id,score:e.score,replies:null,hasReplies:!1,isEven:function(){return this.depth%2==0},isOdd:function(){return this.depth%2==1},lowScore:function(){return this.score<0}}},r.threadFmt=function(e){var t=function e(t){return t.points=t.score,t.replies&&(t.children=t.replies.data.children.map(function(t){return t=t.data,t.replies&&(t.children=e(t)),t})),t},n=e[0].data.children[0].data;return n.points=n.score,n.children=e[1].data.children.map(function(e){return e=e.data,t(e)}),n},(0,o.embeddConstructor)(r)}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var o=n(5)},function(e,t){e.exports='<section>\n  {{#data}}\n  <div class="info">\n    {{#score}}\n    <h3>{{score}} upvotes {{#multiple}}over {{threads}} threads{{/multiple}} on {{config.serviceName}}</h3>\n    {{/score}}\n    {{^score}}\n    <a target="_blank" href="{{submitUrl}}" class="no-comments btn btn-lg btn-outline-orange" rel="nofollow noreferrer external">\n      Start discussion on {{config.serviceName}}\n    </a>\n    {{/score}}\n  </div>\n\n  {{#config.both}}\n  {{#hasReddit}}\n  {{#hasHn}}\n  <div class="buttons btn-group my-3" role="group" aria-label="Comment source switch">\n    <button type="button" class="reddit-btn btn btn-outline-orange {{#redditActive}} active{{/redditActive}}">\n      Reddit\n    </button>\n\n    <button type="button" class="hn-btn btn btn-outline-orange button{{#hnActive}} active{{/hnActive}}">\n      HackerNews\n    </button>\n  </div>\n  {{/hasHn}}\n  {{/hasReddit}}\n  {{/config.both}}\n\n  <div class="comments">\n    {{#comments}}\n    {{> comment}}\n    {{/comments}}\n  </div>\n\n  {{#config.loadMore}}\n  <div class="more-btn-container text-center my-3">\n    <button class="btn btn-lg btn-outline-orange more-btn">Load more comments</button>\n  </div>\n  {{/config.loadMore}}\n\n  {{/data}}\n</section>\n'},function(e,t){e.exports='<article class="{{#isEven}}comment-even{{/isEven}}{{#isOdd}}comment-odd{{/isOdd}} {{#lowScore}}closed{{/lowScore}} p-3">\n\n  <aside>\n    <span>\n      <a class="hide-children-btn" href="javascript:void(0)"></a>\n    </span>\n\n    <span>\n      <a href="{{author_link}}" target="_blank" rel="nofollow noreferrer external">{{author}}</a>\n    </span>\n    {{#redditActive}}\n    {{#score}}<span><b>{{score}} points</b></span>{{/score}}\n    {{/redditActive}}\n\n    {{#permalink}}<span><a href="{{permalink}}" rel="nofollow noreferrer external" target="_blank">{{subreddit}}</a></span>{{/permalink}}\n\n    {{#created}}<span class="text-muted">{{created}}</span>{{/created}}\n  </aside>\n\n  {{#body_html}}\n\n  {{& body_html}}\n  {{/body_html}}\n\n  <aside class="links text-right">\n      <a href="{{thread}}" target="_blank" rel="nofollow noreferrer external" class="text-muted">View on {{config.serviceName}}</a>\n  </aside>\n\n  {{#hasReplies}}\n  <div class="children">\n    {{#replies}}\n    {{> comment}}\n    {{/replies}}\n\n    {{#loadMore}}\n    <div class="view-more my-2">\n      <a href="javascript:void(0)" class="btn btn-secondary text-white">Show more comments</a>\n    </div>\n    {{/loadMore}}\n  </div>\n\n  {{/hasReplies}}\n\n</article>\n'}]);
diff --git a/website/templates/blog/content.html b/website/templates/blog/content.html
index cd1af29c752..b14616608a6 100644
--- a/website/templates/blog/content.html
+++ b/website/templates/blog/content.html
@@ -63,21 +63,5 @@
         {% endfor %}
     {% endif %}
 </div>
-{% if not page.meta.is_index and language == 'en' %}
-</div> {## end row ##}
-</div> {## end container ##}
-<div class="comments-bg">
-    <div class="container">
-        <div class="row">
-            <section class="col-md-10 offset-md-1 my-5">
-                <div id="embedd-comments"></div>
-            </section>
-        </div>
-    </div>
-</div>
-<div class="container"> {## new container ##}
-<div class="row"> {## new row ##}
-<script async type="text/javascript" src="/js/embedd.min.js?{{ config.extra.rev_short }}"></script>
-{% endif %}
 
 {% include "templates/blog/footer.html" %}
diff --git a/website/templates/index/community.html b/website/templates/index/community.html
index 86f2259b486..a71e4097a68 100644
--- a/website/templates/index/community.html
+++ b/website/templates/index/community.html
@@ -66,7 +66,7 @@
                 </div>
                 <div class="row mb-3">
                     <div class="col w-100">
-                        <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-nwwakmk4-xOJ6cdy0sJC3It8j348~IA"
+                        <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-qfort0u8-TWqK4wIP0YSdoDE0btKa1w"
                             rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
                             <div class="bg-dark p-4">
                                 <img data-src="/images/index/slack.svg"
diff --git a/website/templates/index/hero.html b/website/templates/index/hero.html
index 55d0111ac61..efa4643e841 100644
--- a/website/templates/index/hero.html
+++ b/website/templates/index/hero.html
@@ -22,12 +22,8 @@
             <div class="row lead">
 
                 <div class="col-lg pb-2">
-                    <a href="https://play.clickhouse.tech/?file=welcome" class="btn btn-lg btn-yellow w-100 mb-2" role="button" target="_blank" rel="external nofollow">
-                        <div class="py-2">
-                            <h2>Try online demo</h2>
-                            <div class="lead">Powered by Yandex.Cloud</div>
-                        </div>
-                    </a>
+                    <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>
diff --git a/website/templates/index/quickstart.html b/website/templates/index/quickstart.html
index 454fc68151d..0d967e7b96c 100644
--- a/website/templates/index/quickstart.html
+++ b/website/templates/index/quickstart.html
@@ -36,7 +36,7 @@
            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&utm_medium=clickhouseofficialsite&utm_campaign=link1" rel="external nofollow noreferrer" target="_blank">
+        <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>